gentoo resync : 13.10.2019

7 files changed, 3 insertions, 221 deletions

diff --git a/sys-block/gpart/Manifest b/sys-block/gpart/Manifest
index 2bb44f32f877..40771753ed2a 100644
--- a/sys-block/gpart/Manifest
+++ b/sys-block/gpart/Manifest
@@ -1,12 +1,5 @@
 AUX gpart-0.1h-errno.patch 384 BLAKE2B 75bf8f7698a635bd3b17eaf423cb536ac74da4027a22b391a77a1675ff72fb9b909bacf12a958bc68b4b210f4b971e90e2a42661f53d1052a6e6329e40a8e41b SHA512 0b81a8a3edecb4f44907afba9364010f2920a71d7f38626e2cf5f2bf5025b27f021ee762c039718dfb6f1119956c03219b1ffd4373f9f6b3157662dfca553618
-AUX gpart-0.1h-l64seek.patch 1352 BLAKE2B b46e1f3db8124a006b817d7adb46243e9bf0a4b759adefc506bf8908f422f618f42459831fb20275249e5e9f438f3dec7e3450bcda3c43f0589072ecee05d9be SHA512 320600b849a77631a6885bd9c4f6d412c1654e3617098531d6c449a186d0cfb3b703a95f3d5a77d9c71cc33ce867e89eddb2cf5acc33ac0cedfd0cf1afcfadf4
-AUX gpart-0.1h-ntfs.patch 2430 BLAKE2B 5a7c7b7c43e9d2dc6f1c74b4bb2d00f28b5c7870e812f878059a0af66f1cda8faee020e1658c3c517eae13853ec3d093f20e1e91a8b7938c47adee5067f4b46d SHA512 d622f4429baab567d34155a45d72e88d16c26f571d6a20dd294ae8fd1d0db2a05d6b4edfaaeb804d0dc32d12086f1331e794fe719dbcb14867a998cbb316cb04
-AUX gpart-0.1h-openmode.patch 404 BLAKE2B 69d6d109d04651ec050356f9bc6dee7988f19dec45e96d1ea73640fcb98f97b0e930f58def690faeecb0df483ac3d8ae4d932e9022907b7be20fbe9a175d294a SHA512 3b7f46db58c90b0fc43b225f267250d8759b47b6b0c07457f46f549a86d322a1458f0421e1da8a481f6f486c5265caa50cb45d3c9682e91cd684fd2744f299dc
-AUX gpart-0.1h-vfat.patch 515 BLAKE2B 0003791d54d8890e53902f2b231dc274dd714d69469ad08a015f040d49844fd8eed64709920eb4c50d385866dbe09fef7324282abc6176315aebd3c3dd6b1769 SHA512 80dc8eb5e7ee2d3d413adebec63a8dcae868774a42cc27f27fb2be98ca299c4fe744f5188207e5c53a86e06e213e1a18b8f7d40b5fdf8cf6378f14d25794cb8d
 AUX gpart-0.3-build.patch 259 BLAKE2B b0c1119b4799628104672f3ce219c560374600fe9c0a9e4163d4454546a158439bb5252205808bbb4a14f0c948115b7be3ad11a6e279021ebf6d01deee851616 SHA512 05cb685691a59bdb60af306c01c3f619e88cdbf3db0d4b48c23ac740b241b80d44a03dd90e89255180c6e0c6f4cc7bb428345734da4f4ad709659aefac66a772
-DIST gpart-0.1h-reiserfs-3.6.patch.gz 3658 BLAKE2B b0c9232b54efbf61d5c7fa9ed9cfb611fdfe7266c2da2066747368f978d43bae3f88748c9034705c33361ec22b0115da49b69e6ac1f937665a1ff573be5c2da6 SHA512 c39433e1d6dc0a995322f9985cb1735e89e3c3c7230193609ab2c82fa4cc3fc921d8743b37f6fba18cdda71d29cd83afcb36870fceb88d2a26f7113022226a60
-DIST gpart-0.1h.tar.gz 52352 BLAKE2B 59e719dd62cd84ba31e89f7cd9b1e6cbb4fc2432e50059d77a95beca27143552ac100da1b3f72b0e5b3d0c88e9968eb19bad75a6470f3416de4d5f1f13b53b11 SHA512 673cc99ccc2342c18be3f6395bf7258ab1d8e2ffeac6fd68a4bd75c89825031cb9d7ae628c51bad4da47a8d0625f1608cf4c78345aae5205fd98a9a908a3d45c
 DIST gpart-0.3.tar.gz 53589 BLAKE2B fd479f05219cc3b65ac91318c294728c115dfbab684269d7b5d6dbfa7575902094d3c7e611d296214170713aa23d6909814179208c2599219e94f4bae56d0ccd SHA512 5ee8bc551050d26dc71898d3232549d2b96e0806071571b120cbf819282da0ec2246147a0dfc44576e62d68092bb0183c1a9bb71db7ddca12c0922da60aeea35
-EBUILD gpart-0.1h-r2.ebuild 951 BLAKE2B e6985ea9170e7ecbc71e7955843c49ed1d886809200eaffdffbec1462171d6c0e8f6c127dc6ae24a45db200dcc9cd50415d10c47f86ecac37deb5833f50fbd14 SHA512 78c543921ead06858b819ec30ec64c9ff3a612505037ee752768142bd3468c7a567742f873181c958bd62b13c799b7f098d385c443376a4bbfd209fd91720cb7
-EBUILD gpart-0.3.ebuild 728 BLAKE2B 8efbfed86ea5799f74429f56ee7d70c2e3a3f4223f15d3c82c0ef49a68567634637f2546599f5a45dcf6cbdb0a5c62805f4b329504132d008d236968e1938e56 SHA512 270c2f7bfac1610dac00d0df5716b24983b78d5ca26718ab0472a226f482782b6824c47d4b2d4ab7780862e6537c02c8c6204a04889a2adc6acdf8c556fe76ab
+EBUILD gpart-0.3.ebuild 722 BLAKE2B 27a5846037102a6a8cb78a6e7c0a5408faf44ecd916086b9e0916bfbc3701477dee3b24a8299ff371c503593ba8cf774573caf2ed547ed6a6a4f80c5dea996d5 SHA512 08f42fe4eed2d53fae0ced2c68a95a36c878806996330b1f1fcbb23dbd4fbd7bdea4d08f1cc3c31326d038928d8fd1868c630d77ba65279be6abc6096967ee19
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-block/gpart/files/gpart-0.1h-l64seek.patch b/sys-block/gpart/files/gpart-0.1h-l64seek.patch
deleted file mode 100644
index 8a14411a5ccc..000000000000
--- a/sys-block/gpart/files/gpart-0.1h-l64seek.patch
+++ /dev/null
@@ -1,71 +0,0 @@
---- gpart-0.1h.orig/src/l64seek.c
-+++ gpart-0.1h/src/l64seek.c
-@@ -25,30 +25,11 @@
- } ostck[OSTACKLEN];
- static int		osptr = -1;
- 
--#if defined(__linux__) && defined(__i386__)
--_syscall5(int,_llseek,uint,fd,ulong,hi,ulong,lo,loff_t *,res,uint,wh)
--#endif
--
--
--
- off64_t l64seek(int fd,off64_t offset,int whence)
- {
- 	off64_t		ret = (off64_t)-1;
- 
--#if defined(__linux__) && defined(__i386__)
--	int		iret;
--	unsigned long	ohi, olo;
--
--	ohi = (unsigned long)((offset >> 32) & 0xFFFFFFFF);
--	olo = (unsigned long)(offset & 0xFFFFFFFF);
--	iret = _llseek(fd,ohi,olo,&ret,whence);
--	if (iret == -1)
--		ret = (off64_t)-1;
--#endif
--
--#if defined(__FreeBSD__) || (defined(__linux__) && defined(__alpha__))
- 	ret = lseek(fd,offset,whence);
--#endif
- 
- 	return (ret);
- }
---- gpart-0.1h.orig/src/l64seek.h
-+++ gpart-0.1h/src/l64seek.h
-@@ -17,6 +17,8 @@
- #ifndef _L64SEEK_H
- #define _L64SEEK_H
- 
-+#include <sys/stat.h>
-+#include <sys/types.h>
- #include <unistd.h>
- 
- /*
-@@ -25,19 +27,7 @@
-  * offsets.
-  */
- 
--
--#if defined(__linux__)
--#	include <linux/unistd.h>
--#	include <sys/types.h>
--	typedef int64_t off64_t;
--#endif
--
--
--#if defined(__FreeBSD__)
--	typedef off_t off64_t;
--#endif
--
--
-+typedef loff_t off64_t;
- typedef off64_t s64_t;
- 
- off64_t l64seek(int fd, off64_t offset, int whence);
-@@ -45,5 +35,4 @@
- int l64opush(int);
- s64_t l64opop(int);
- 
--
- #endif
diff --git a/sys-block/gpart/files/gpart-0.1h-ntfs.patch b/sys-block/gpart/files/gpart-0.1h-ntfs.patch
deleted file mode 100644
index 1f887ac47135..000000000000
--- a/sys-block/gpart/files/gpart-0.1h-ntfs.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-Ripped out of debian
-
---- gpart-0.1h.orig/src/gm_ntfs.h
-+++ gpart-0.1h/src/gm_ntfs.h
-@@ -14,6 +14,9 @@
-  *
-  */
- 
-+#include <stdint.h>
-+#include <asm/byteorder.h>
-+
- #ifndef _GM_NTFS_H
- #define _GM_NTFS_H
- 
-@@ -29,32 +32,38 @@
- /* 'NTFS' in little endian */
- #define NTFS_SUPER_MAGIC	0x5346544E
- 
--#if defined(i386) || defined(__i386__) || defined(__alpha__)
--
- /* unsigned integral types */
- #ifndef NTFS_INTEGRAL_TYPES
- #define NTFS_INTEGRAL_TYPES
--typedef unsigned char		ntfs_u8;
--typedef unsigned short		ntfs_u16;
--typedef unsigned int		ntfs_u32;
--typedef s64_t			ntfs_u64;
-+typedef uint8_t			ntfs_u8;
-+typedef uint16_t		ntfs_u16;
-+typedef uint32_t		ntfs_u32;
-+typedef uint64_t		ntfs_u64;
-+typedef int8_t			ntfs_s8;
-+typedef int16_t			ntfs_s16;
- #endif /* NTFS_INTEGRAL_TYPES */
--#endif /* defined(i386) || defined(__i386__) || defined(__alpha__) */
--
--
--/* Macros reading unsigned integers from a byte pointer */
--/* these should work for all little endian machines */
--#define NTFS_GETU8(p)		(*(ntfs_u8*)(p))
--#define NTFS_GETU16(p)		(*(ntfs_u16*)(p))
--#define NTFS_GETU24(p)		(NTFS_GETU32(p) & 0xFFFFFF)
--#define NTFS_GETU32(p)		(*(ntfs_u32*)(p))
--#define NTFS_GETU64(p)		(*(ntfs_u64*)(p))
--
--/* Macros reading signed integers, returning int */
--#define NTFS_GETS8(p)		((int)(*(char*)(p)))
--#define NTFS_GETS16(p)		((int)(*(short*)(p)))
--#define NTFS_GETS24(p)		(NTFS_GETU24(p) < 0x800000 ? (int)NTFS_GETU24(p) :
--
- 
-+#define CPU_TO_LE16(a) __cpu_to_le16(a)
-+#define CPU_TO_LE32(a) __cpu_to_le32(a)
-+#define CPU_TO_LE64(a) __cpu_to_le64(a)
-+
-+#define LE16_TO_CPU(a) __cpu_to_le16(a)
-+#define LE32_TO_CPU(a) __cpu_to_le32(a)
-+#define LE64_TO_CPU(a) __cpu_to_le64(a)
-+
-+/* Macros reading unsigned integers */
-+#define NTFS_GETU8(p)      (*(ntfs_u8*)(p))
-+#define NTFS_GETU16(p)     ((ntfs_u16)LE16_TO_CPU(*(ntfs_u16*)(p)))
-+#define NTFS_GETU24(p)     ((ntfs_u32)NTFS_GETU16(p) | \
-+		           ((ntfs_u32)NTFS_GETU8(((char*)(p)) + 2) << 16))
-+#define NTFS_GETU32(p)     ((ntfs_u32)LE32_TO_CPU(*(ntfs_u32*)(p)))
-+#define NTFS_GETU64(p)     ((ntfs_u64)LE64_TO_CPU(*(ntfs_u64*)(p)))
-+
-+/* Macros reading signed integers */
-+#define NTFS_GETS8(p)        ((*(ntfs_s8*)(p)))
-+#define NTFS_GETS16(p)       ((ntfs_s16)LE16_TO_CPU(*(short*)(p)))
-+#define NTFS_GETS24(p)       (NTFS_GETU24(p) < 0x800000 ? \
-+	                                (int)NTFS_GETU24(p) : \
-+					(int)(NTFS_GETU24(p) - 0x1000000))
- 
- #endif /* _GM_NTFS_H */
diff --git a/sys-block/gpart/files/gpart-0.1h-openmode.patch b/sys-block/gpart/files/gpart-0.1h-openmode.patch
deleted file mode 100644
index ca13cc9420e6..000000000000
--- a/sys-block/gpart/files/gpart-0.1h-openmode.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gpart.orig/src/gpart.c	2008-10-19 15:06:06.000000000 +0000
-+++ gpart/src/gpart.c	2008-11-25 07:34:47.000000000 +0000
-@@ -1221,7 +1221,7 @@ static int make_mbr_backup(disk_desc *d,
- {
- 	int		fd, ret = 0;
- 
--	if ((fd = open(bfile,O_WRONLY|O_CREAT)) < 0)
-+	if ((fd = open(bfile,O_WRONLY|O_CREAT, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH)) < 0)
- 		return (ret);
- 
- 	if (write(fd,d->d_pt.t_boot,512) == 512)
diff --git a/sys-block/gpart/files/gpart-0.1h-vfat.patch b/sys-block/gpart/files/gpart-0.1h-vfat.patch
deleted file mode 100644
index 7234ac689831..000000000000
--- a/sys-block/gpart/files/gpart-0.1h-vfat.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Ripped out of debian
-
---- gpart-0.1h.orig/src/gm_fat.h
-+++ gpart-0.1h/src/gm_fat.h
-@@ -60,6 +60,10 @@
- 	__u16	info_sector;	/* filesystem info sector */
- 	__u16	backup_boot;	/* backup boot sector */
- 	__u16	reserved2[6];	/* Unused */
--};
--
-+} __attribute__ ((packed));
-+/*  "__attribute__ ((packed))" 
-+    added by davidc@debian.org,
-+    as suggested by falk@zxmjz18.extern.uni-tuebingen.de 
-+    Fri Jul 07 18:04:15 2000
-+    in debian bug report #66893 "FAT detection broken on Alpha" */
- #endif /* _GM_FAT_H */
diff --git a/sys-block/gpart/gpart-0.1h-r2.ebuild b/sys-block/gpart/gpart-0.1h-r2.ebuild
deleted file mode 100644
index ef944c939f1a..000000000000
--- a/sys-block/gpart/gpart-0.1h-r2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils
-
-DESCRIPTION="Partition table rescue/guessing tool"
-HOMEPAGE="http://www.stud.uni-hannover.de/user/76201/gpart/"
-SRC_URI="http://www.stud.uni-hannover.de/user/76201/gpart/${P}.tar.gz
-	ftp://ftp.namesys.com/pub/misc-patches/gpart-0.1h-reiserfs-3.6.patch.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 hppa x86"
-IUSE=""
-
-RDEPEND=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-errno.patch
-	epatch "${FILESDIR}"/${P}-vfat.patch
-	epatch "${FILESDIR}"/${P}-ntfs.patch
-	epatch "${WORKDIR}"/gpart-0.1h-reiserfs-3.6.patch
-	epatch "${FILESDIR}"/${P}-l64seek.patch
-	epatch "${FILESDIR}"/${P}-openmode.patch
-	sed -i -e "/^CFLAGS/s: -O2 : ${CFLAGS} :" make.defs
-	sed -i -e "/^LDFLAGS/s:=:=${LDFLAGS} :" make.defs
-}
-
-src_install() {
-	dobin src/gpart || die
-	doman man/gpart.8
-	dodoc README Changes INSTALL LSM
-}
diff --git a/sys-block/gpart/gpart-0.3.ebuild b/sys-block/gpart/gpart-0.3.ebuild
index 7b56760641f2..fdd4b6afe204 100644
--- a/sys-block/gpart/gpart-0.3.ebuild
+++ b/sys-block/gpart/gpart-0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/baruch/gpart/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
+KEYWORDS="amd64 hppa x86"
 IUSE=""
 
 RDEPEND=""