gentoo resync : 14.07.2018

7 files changed, 30 insertions, 99 deletions

diff --git a/sys-fs/extundelete/Manifest b/sys-fs/extundelete/Manifest
index 75f6194ccbcf..398836ded65f 100644
--- a/sys-fs/extundelete/Manifest
+++ b/sys-fs/extundelete/Manifest
@@ -1,8 +1,4 @@
-AUX extundelete-0.2.0-build.patch 1083 BLAKE2B e1c96c1e5a6b427bfb112f90a53c8a9d00b041ff7b6ddbcb9ab96dc0e7ba24d9c406b8f66e4c843326407f14e933a28a8a08ada91ef585c4e96a61821061f8ed SHA512 e7a4c9497f9c349bf6bcc04bfe643313246dce6f38b7d1e86bf6b9cacb937fb0ef5f56980c17d951a810d7f298ff2348484d8078d081cc084725ff6da50d8f1d
-DIST extundelete-0.2.0.tar.bz2 97851 BLAKE2B 2d8d1a9d96de0a450fa7afa07f3532c3df11f5de36284ebe2114127de9e8431e9d029ab51ef4a59b45bccaf029254a998013e1fcec8479ae1064fec2a907a83e SHA512 2d4b18110795a5318fab5c5889a9b516360ea420215d0a3692322b30e87d5bb3954bbba725a067322cd76e7bba06466032a1405f9fc6dbc3f318723be238b317
+AUX extundelete-0.2.4-e2fsprogs.patch 582 BLAKE2B 12176abdccb06b9ad2a55dac5dabfbef402a95ac00ca28ba951e4fcba024d5f99e0355b1f6f0bf38f6b2878cd190cde6774136c1b0b1bbba27b73fc3d0a7adee SHA512 c0df34bfdef07e931503cc8f3270cd070328b54053da1d8dbfefb8a49a81c4234cbdb4205d30cf654b5d5ca42dd27ad104f08f6ab7839d5f3d0cebc6ec6ef499
 DIST extundelete-0.2.4.tar.bz2 108472 BLAKE2B 3627c092672957e25f2bd351a6d92f6d32a0e322a0555766edc35545cccab7ee47fb0c471ebea31692779bdf44433bb98a07cab0bc26141f1f09b33601da57ea SHA512 5c896055b6fa3c38f283a043cca744513fdc1a60e212eac0c78fa868064a8eeb11f540c4cc5ca89ac68da0c1705a40fe45731c203b6748808f85e9870a207bcd
-DIST extundelete_0.2.0-2.1.debian.tar.gz 6862 BLAKE2B 0a453e9f6062064d616ce621e34ca8fc1b6235304073594475cb0f88dbe94efb72807d12cd6b4b1e9faea3025e4bec8cc2522a771732046b310a7311051943c5 SHA512 37b74347a3017edfd28714731125f968f66beac1b7b7ebd1d44e3d3dff9da06216560433f330f4a544da24f7083f6e900fbe8a5c2930e8760405cb72e6a918e3
-EBUILD extundelete-0.2.0-r1.ebuild 536 BLAKE2B 622f212ee0df186ea343b791be9c3b831ab8615e07a040944642644bb46f0fe54d720dcb2da0fa451f83980b9e06a1d4a0e2a4b13b0c539eca4b3f8b9d99bcb7 SHA512 b82f1918c06342a65f49575a01deb966d1bb54ef27b597c02f1f76f09477b721265907975f95e4d1c368095f5a6b360b9615382ada841b492a022e66a91ed072
-EBUILD extundelete-0.2.0-r2.ebuild 691 BLAKE2B 7078c336ae786be96b7451622b98d49a3cb28750da0fdf542dae9bc2d8599a98dbfd3639050591966aab82f6e1b556e08bce357f14ba641cc129e69b645786e7 SHA512 9aa727f0e2e7c6a7f4f9d40f9c0b1ef5e95c11096db8b8e1adb5eeb4dd0ddec8b84b3c16231131122701bf0cc02a951edddc09519642af2463ea57bba56e43de
-EBUILD extundelete-0.2.4.ebuild 475 BLAKE2B 356473168ddb2f13abc64692467f3fa29fe63b6d4b9668634c57f3920d4b650903ec555b1c9b6011e0f85a7cb0e5346b0ba114689a92bae9bec8b642d1ce0195 SHA512 7fe852c3762b56654c1cf17c7cfa7f27eadafc999051a12613a330c2e055c13392d61965a9e4ff902dd0e499a9ef85934a38945fef2a09c9dd0ef50b44092ae1
-MISC metadata.xml 331 BLAKE2B cbd7483af8763169e07af4ead8a51e64d110a5a1847cd1b2663d96b249665463dc3711e4661c2a974ae52f10c951bd2f537567b89fd8c0b7a65b4c1a4b412e5b SHA512 80a20fc119f4dca6944d16d590b6eea94162aa1286c6e797e5c9d29b6782696b00e64d1ec07f6e1f0cf99ce5fa02cccddadb7056abc8997d4919384b3e0b1c09
+EBUILD extundelete-0.2.4.ebuild 470 BLAKE2B 34fafb00384416683c2d2540008d02963b98ab14b08982ffc37a38ca9340cdc315eb9956403d3cfe41676d27cbae15e31425a8bedcbbfd12767bb7d2c4369d5b SHA512 8a5dfe4900521948c22d359fa24af7f7fe4f64673ebb3e716030b0ba7dec9e93420c1d70db0fa5fb9cc93078bbf006c0325db4b3ea48871675d8f3cb9d744f98
+MISC metadata.xml 406 BLAKE2B 4c2a6bafa8e20b7f14cd822c94b18bf99ebdcbfb9716b87bb1300302308d5967dccd75b27d28339846932883461f1451922e6bf42ae3c53b5a0b9746ebc330da SHA512 f09a0ee3a375c3dfe446f24f8295c9bb452dd9b79975646d2ea49ecaf8f71ddb518fbe8681e9bd5fe1265c6c9b9c7cda43d68796c297b244fc81e85da4b0e73b
diff --git a/sys-fs/extundelete/extundelete-0.2.0-r1.ebuild b/sys-fs/extundelete/extundelete-0.2.0-r1.ebuild
deleted file mode 100644
index 0e929fe3ab72..000000000000
--- a/sys-fs/extundelete/extundelete-0.2.0-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit eutils
-
-_E2FS=1.42
-
-DESCRIPTION="A utility to undelete files from an ext3 or ext4 partition"
-HOMEPAGE="http://extundelete.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=sys-fs/e2fsprogs-${_E2FS}
-	>=sys-libs/e2fsprogs-libs-${_E2FS}"
-DEPEND="${RDEPEND}"
-
-DOCS="README"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-build.patch
-}
diff --git a/sys-fs/extundelete/extundelete-0.2.0-r2.ebuild b/sys-fs/extundelete/extundelete-0.2.0-r2.ebuild
deleted file mode 100644
index 59f1f1bda6e0..000000000000
--- a/sys-fs/extundelete/extundelete-0.2.0-r2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils
-
-_UNDEL_DEB=2.1
-_UNDEL_E2FS=1.42.6
-
-DESCRIPTION="A utility to undelete files from an ext3 or ext4 partition"
-HOMEPAGE="http://extundelete.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
-	mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}-${_UNDEL_DEB}.debian.tar.gz"
-
-LICENSE="GPL-2"
-SLOT=0
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=sys-fs/e2fsprogs-${_UNDEL_E2FS}
-	>=sys-libs/e2fsprogs-libs-${_UNDEL_E2FS}"
-DEPEND=${RDEPEND}
-
-DOCS=README
-
-src_prepare() {
-	local d=${WORKDIR}/debian/patches
-	EPATCH_SOURCE=${d} epatch $(<"${d}"/series)
-}
diff --git a/sys-fs/extundelete/extundelete-0.2.4.ebuild b/sys-fs/extundelete/extundelete-0.2.4.ebuild
index c39d376e3b00..cb98d1828d50 100644
--- a/sys-fs/extundelete/extundelete-0.2.4.ebuild
+++ b/sys-fs/extundelete/extundelete-0.2.4.ebuild
@@ -1,20 +1,21 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 DESCRIPTION="A utility to undelete files from an ext3 or ext4 partition"
-HOMEPAGE="http://extundelete.sourceforge.net/"
+HOMEPAGE="https://extundelete.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT=0
 KEYWORDS="amd64 ~arm x86"
-IUSE=""
 
-E2FSPROGS=1.42.6
-RDEPEND=">=sys-fs/e2fsprogs-${E2FSPROGS}
-	>=sys-libs/e2fsprogs-libs-${E2FSPROGS}"
+RDEPEND="sys-fs/e2fsprogs
+	sys-libs/e2fsprogs-libs"
+
 DEPEND=${RDEPEND}
 
 DOCS=README
+
+PATCHES=( "${FILESDIR}/${P}-e2fsprogs.patch" )
diff --git a/sys-fs/extundelete/files/extundelete-0.2.0-build.patch b/sys-fs/extundelete/files/extundelete-0.2.0-build.patch
deleted file mode 100644
index 2bd56ef2bbdf..000000000000
--- a/sys-fs/extundelete/files/extundelete-0.2.0-build.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-http://bugs.gentoo.org/402633
-http://projects.archlinux.org/svntogit/community.git/tree/trunk/extundelete-build.patch?h=packages/extundelete
-
---- src/extundelete.cc
-+++ src/extundelete.cc
-@@ -943,3 +943,3 @@
-	{
--		group_descriptor_table[n] = fs->group_desc[n];
-+		group_descriptor_table[n] = *ext2fs_group_desc(fs, fs->group_desc, n);
-	}
-@@ -2613,3 +2613,4 @@
-	inode->osd2.linux2.l_i_gid_high = le16_to_cpu( (uint16_t *) &inodebuf[item*60] );
--	inode->osd2.linux2.l_i_reserved2 = le32_to_cpu( (uint32_t *) &inodebuf[item*62] );
-+	inode->osd2.linux2.l_i_checksum_lo = le16_to_cpu( (uint16_t *) &inodebuf[item*62] );
-+	inode->osd2.linux2.l_i_reserved = le16_to_cpu( (uint16_t *) &inodebuf[item*63] );
- }
---- src/insertionops.cc
-+++ src/insertionops.cc
-@@ -65,3 +65,3 @@
-   os << "# Blocks per group: " << s_block->s_blocks_per_group << std::endl;
--  os << "# Fragments per group: " << s_block->s_frags_per_group << std::endl;
-+  os << "# Fragments per group: " << s_block->s_clusters_per_group << std::endl;
-   os << "# Inodes per group: " << s_block->s_inodes_per_group << std::endl;
diff --git a/sys-fs/extundelete/files/extundelete-0.2.4-e2fsprogs.patch b/sys-fs/extundelete/files/extundelete-0.2.4-e2fsprogs.patch
new file mode 100644
index 000000000000..ea0da14f1650
--- /dev/null
+++ b/sys-fs/extundelete/files/extundelete-0.2.4-e2fsprogs.patch
@@ -0,0 +1,11 @@
+--- a/src/insertionops.cc	2012-12-30 18:23:32.000000000 +0100
++++ b/src/insertionops.cc	2018-05-07 22:58:13.065868723 +0200
+@@ -33,7 +33,7 @@
+   os << "File flags: " << inode.i_flags << std::endl;
+   os << "File version (for NFS): " << inode.i_generation << std::endl;
+   os << "File ACL: " << inode.i_file_acl << std::endl;
+-  os << "Directory ACL: " << inode.i_dir_acl << std::endl;
++  os << "Directory ACL: " << inode.i_size_high << std::endl;
+   os << "Fragment address: " << inode.i_faddr << std::endl;
+   os << "Direct blocks: ";
+   for (int n = 0; n < EXT2_NDIR_BLOCKS; n++)
diff --git a/sys-fs/extundelete/metadata.xml b/sys-fs/extundelete/metadata.xml
index a5550604b142..458b539da8fd 100644
--- a/sys-fs/extundelete/metadata.xml
+++ b/sys-fs/extundelete/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>base-system@gentoo.org</email>
-	<name>Gentoo Base System</name>
-</maintainer>
-<upstream>
-	<remote-id type="sourceforge">extundelete</remote-id>
-</upstream>
+	<maintainer type="project">
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
+	<upstream>
+		<bugs-to>https://sourceforge.net/p/extundelete/tickets/</bugs-to>
+		<remote-id type="sourceforge">extundelete</remote-id>
+	</upstream>
 </pkgmetadata>