gentoo resync : 23.06.2018

5 files changed, 42 insertions, 21 deletions

diff --git a/sys-fs/ext3grep/Manifest b/sys-fs/ext3grep/Manifest
index 34f4d9bc6b47..e1fd50ca113f 100644
--- a/sys-fs/ext3grep/Manifest
+++ b/sys-fs/ext3grep/Manifest
@@ -1,6 +1,7 @@
 AUX ext3grep-0.10.1-gcc44.patch 7824 BLAKE2B b0c7bb82f81f088388836d3d8c92496d164043592c97a5a97570f4db38128fb24fc8ba761e9f59f900e161214285f261bc978f3fe1341d7ec45e2cc76bb2d591 SHA512 11404bb9f606a223f328068d7b42911a49df05a0bee68e88e15b58c66964357bab1888af4a3284f3ea7ed559753ac7c80d4db59c63b53ee52117b8c92aae5607
-AUX ext3grep-0.10.2-include-unistd_h-for-sysconf.patch 267 BLAKE2B 4f6b703c74b358c7d7e3db8870063d854fd9b856add323caf3cfd0bdd4bbc126dc2bec5b15aee61c8a9fceab1d2c368cd03f3a0662b4f09fbe64acd6d5cc7eb4 SHA512 4675ec597a131f91d9452f10c2d163fa8fa0d883b3138e475992596778cfd80f0499d3dff4092f6bbf09b6e7653c8d35ff18ca98217c8856d1a85596621079ac
-AUX ext3grep-0.10.2-new-e2fsprogs.diff 1478 BLAKE2B aa7daaae9984f524b59a7391268f301d8570bf8e48ffea686cd65e98db950351ba9fe43b9da93925c636aef78749b00acf0aa72d57b08bb2817b229497019875 SHA512 f16b5ed428c7bd1bf453d331eb1c114a13a2ec7fdc19d61b9788c5f4f3e5d4d85c013c738e04dbea12967a678d81bddedb60e573ac97c801efffa3ef27774e19
+AUX ext3grep-0.10.2-include-unistd_h-for-sysconf.patch 271 BLAKE2B b06c18ab18b5b1278883155dfefc3e0b4aff93e1fcfd2a500c92ada7ad10df56823564deb0acf1bfcb0c4453c2280cb27232bbf01be6567692ba2e4b0f2e395a SHA512 ea47220fc10d18bcaa6dbd9e89c94a9248f5af11d8f314a148edb1e99c9d655f753a9d8b3a33f0f3f20bc82eaa80cfd509b6d4255ff32b4977269a05af6f8e1e
+AUX ext3grep-0.10.2-new-e2fsprogs.patch 1478 BLAKE2B aa7daaae9984f524b59a7391268f301d8570bf8e48ffea686cd65e98db950351ba9fe43b9da93925c636aef78749b00acf0aa72d57b08bb2817b229497019875 SHA512 f16b5ed428c7bd1bf453d331eb1c114a13a2ec7fdc19d61b9788c5f4f3e5d4d85c013c738e04dbea12967a678d81bddedb60e573ac97c801efffa3ef27774e19
+AUX ext3grep-0.10.2-newer-e2fsprogs.patch 1111 BLAKE2B c4343f4d8ad9d6e4c1b52f1dc41ab42d4de97e2185279cdc018ac3de7824ed2ca09eea8a9bd79d22628ccd2fb37b0e94bfaf27bfdc1e78da11a0ed0411ad432f SHA512 321d303e8f8e12270ee40f64418888e5a23347d33b978aec4979c87ceb21f70c970736087175ce141024997332f0772444cee9baab3758d2aab08d7d84b05faa
 DIST ext3grep-0.10.2.tar.gz 236364 BLAKE2B 0352e00a20c6a1486e4ddc0b80c9dcc9afa383775bb4ca6bcc83d2761b2901a9344ccd66f96e4a3e4b02177730f4e27b444695ba0644a5c42c4f3105618288ff SHA512 301a65c91d2342753a4588c40d496114067a18ceceb999f10fe3fc49c7d3a20c7836dba915575db352c89de7ff0ed3553cd8fbd2d1540109cb0ff7fa8f530b6f
-EBUILD ext3grep-0.10.2.ebuild 817 BLAKE2B 6577f9a630297ef16e2ef08608d5d6c27abe05a297e5ab3bc264400c235df71418b2bbbd0374dc7891b136281fc6ed0d285e4c954545b7445852447fdac193e9 SHA512 c748ed20bc31c81789c23653615a8f62608f6910500ab1f564d16a455b905f8274e2619a188724247ec445e51c24d8388bd164e429193f4bcf891590c308e70c
+EBUILD ext3grep-0.10.2.ebuild 733 BLAKE2B 9f93845eaee2b993c8fc47c389bf63c8d0d4cc100a8ae749a6877f79461476c4d3c3dad2520f7cc2943eb17a382ce1aad17d77a580e77618f7425410a98d8292 SHA512 462bec287c7ab79daa485b4649abca01e2cf3046a05cacd304e8db691262bf37e20a322da4d4e4c212562b1706906260ff45645c5a29b972e1375edcd7823232
 MISC metadata.xml 294 BLAKE2B ff8d54938ff70c9f253ad7d0bbaa8cb9785b7e6d0a7280722ce2276dfe7874ed05801aea1f56944fa39e8b09e02ed1977e08dce8438a872f6894aa98d7ace25c SHA512 db238ab8c6f8c7c51748dc51b47d4f34553671e36792ca466b1dceaafd41293c65af7303bf060315a826bb995ea34445b5b016918556b2d3ff2fc09077a57ae5
diff --git a/sys-fs/ext3grep/ext3grep-0.10.2.ebuild b/sys-fs/ext3grep/ext3grep-0.10.2.ebuild
index 88c27978d04d..1c8c5533ad98 100644
--- a/sys-fs/ext3grep/ext3grep-0.10.2.ebuild
+++ b/sys-fs/ext3grep/ext3grep-0.10.2.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
-inherit eutils
+EAPI=6
 
 DESCRIPTION="Recover deleted files on an ext3 file system"
 HOMEPAGE="https://code.google.com/p/ext3grep/"
@@ -13,25 +12,24 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug pch"
 
-DOCS="NEWS README"
-
-RDEPEND=""
 DEPEND="sys-fs/e2fsprogs
 	virtual/os-headers
 	virtual/pkgconfig"
 
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-0.10.1-gcc44.patch \
-		"${FILESDIR}"/${P}-include-unistd_h-for-sysconf.patch
+DOCS="NEWS README"
 
-	# Fix build against latest e2fsprogs, taken from
-	# https://code.google.com/p/ext3grep/issues/detail?id=34
-	epatch "${FILESDIR}"/${P}-new-e2fsprogs.diff
-}
+PATCHES=(
+	"${FILESDIR}/${PN}-0.10.1-gcc44.patch"
+	"${FILESDIR}/${P}-include-unistd_h-for-sysconf.patch"
+	"${FILESDIR}/${P}-new-e2fsprogs.patch"
+	"${FILESDIR}/${P}-newer-e2fsprogs.patch"
+)
 
 src_configure() {
-	econf \
-		$(use_enable debug) \
+	myeconfargs=(
+		$(use_enable debug)
 		$(use_enable pch)
+	)
+
+	econf "${myeconfargs[@]}"
 }
diff --git a/sys-fs/ext3grep/files/ext3grep-0.10.2-include-unistd_h-for-sysconf.patch b/sys-fs/ext3grep/files/ext3grep-0.10.2-include-unistd_h-for-sysconf.patch
index bf38c27e7095..42588f71d6e5 100644
--- a/sys-fs/ext3grep/files/ext3grep-0.10.2-include-unistd_h-for-sysconf.patch
+++ b/sys-fs/ext3grep/files/ext3grep-0.10.2-include-unistd_h-for-sysconf.patch
@@ -1,7 +1,7 @@
 http://bugs.gentoo.org/422789
 
---- src/init_consts.cc
-+++ src/init_consts.cc
+--- a/src/init_consts.cc
++++ b/src/init_consts.cc
 @@ -27,6 +27,10 @@
  #include "debug.h"
  #endif
diff --git a/sys-fs/ext3grep/files/ext3grep-0.10.2-new-e2fsprogs.diff b/sys-fs/ext3grep/files/ext3grep-0.10.2-new-e2fsprogs.patch
index 45b54b807bd7..45b54b807bd7 100644
--- a/sys-fs/ext3grep/files/ext3grep-0.10.2-new-e2fsprogs.diff
+++ b/sys-fs/ext3grep/files/ext3grep-0.10.2-new-e2fsprogs.patch
diff --git a/sys-fs/ext3grep/files/ext3grep-0.10.2-newer-e2fsprogs.patch b/sys-fs/ext3grep/files/ext3grep-0.10.2-newer-e2fsprogs.patch
new file mode 100644
index 000000000000..8a029f9916b6
--- /dev/null
+++ b/sys-fs/ext3grep/files/ext3grep-0.10.2-newer-e2fsprogs.patch
@@ -0,0 +1,22 @@
+--- a/src/ext3.h	2008-04-09 13:20:31.000000000 +0200
++++ b/src/ext3.h	2018-05-07 23:16:35.413754674 +0200
+@@ -106,7 +106,7 @@
+     __u32 const* block(void) const { return i_block; }
+     __u32 generation(void) const { return i_generation; }
+     __u32 file_acl(void) const { return i_file_acl; }
+-    __u32 dir_acl(void) const { return i_dir_acl; }
++    __u32 size_high(void) const { return i_size_high; }
+     __u32 faddr(void) const { return i_faddr; }
+     __u16 uid_high(void) const { return i_uid_high; }
+     __u16 gid_high(void) const { return i_gid_high; }
+--- a/src/print_inode_to.cc	2008-10-17 03:27:15.000000000 +0200
++++ b/src/print_inode_to.cc	2018-05-07 23:16:54.379754601 +0200
+@@ -118,7 +118,7 @@
+     os << '\n';
+   }
+   //os << "File ACL: " << inode.file_acl() << '\n';
+-  //os << "Directory ACL: " << inode.dir_acl() << '\n';
++  //os << "Directory ACL: " << inode.size_high() << '\n';
+   //os << "Fragment address: " << inode.faddr() << '\n';
+   //os << "Fragment number: " << (int)inode.osd2.linux2.l_i_frag << '\n';
+   //os << "Fragment size: " << (int)inode.osd2.linux2.l_i_fsize << '\n';