gentoo resync : 05.04.2018

3 files changed, 70 insertions, 0 deletions

diff --git a/sys-fs/ext4magic/Manifest b/sys-fs/ext4magic/Manifest
index dbb3e587caf4..9422abd51988 100644
--- a/sys-fs/ext4magic/Manifest
+++ b/sys-fs/ext4magic/Manifest
@@ -1,4 +1,6 @@
+AUX ext4magic-0.3.2-i_dir_acl.patch 1541 BLAKE2B 97a1fe34351bba96baaa963455561342a3fdbd7d0279bff9a544305f7d8d71d89f14c2f24d2246527a6eea9424e55b314ccc0c06f5edd367c7c4176f3509aa03 SHA512 d0df0f7275f6fa94d58658af9d96f059ae3bc29d47e767ee943a03b698550e52a5f9ff8ce491e617a47a2cf80ebcf20416dc54e3d0019713f387cffa2621904d
 AUX ext4magic-0.3.2-sysmacros.patch 291 BLAKE2B ef3e5d23d4438a72f090e776cf0a6019361c100f502b9ac23afb11446f82b720e5564095720acca7ba6816a8d5b08628bb4d2011736e0bad028d5d417a3b6936 SHA512 9914c9db3876194b08fe2f9752c0f49f72e88a5bbead72095dc186a3c60eef7a29326d51624381f177d31ee50ad4f9076dbef755936770fbfdf55fa7be82ab35
 DIST ext4magic-0.3.2.tar.gz 426941 BLAKE2B 7123af6a928e606980efba85e4c4b1f9284776176c4d5a2f978a4fb1639f68ebe3fccc07c972baeee661b2d26940b8dd252024b515e26bad7ed8635434288dfc SHA512 81bc9ba40dc2ea0bfb01bec160a1bbf0bf8a7983241aba34190d3571386f4d7dc63409866737b8d64516a3594eba11c819bbb721a1942c0a675d5675a7bba9a1
+EBUILD ext4magic-0.3.2-r1.ebuild 952 BLAKE2B 604d6f10995243824676cd41235892d5685ff331b7ccfc2e5be41f0f1b25542f5c7493c614f7c26ed9f19661e5558ea7b3c10e7ebf6deb861fcc5d190056d992 SHA512 1691fbcd56f71d49470f0d75e48fe28917b3cd71a4ed377930c5f9805267af99af0f9783f54077a920970446d678628dae05d26cf31ee4274a2779cfad923d71
 EBUILD ext4magic-0.3.2.ebuild 936 BLAKE2B 404e84d0c5b352d616baf45efe49790853e6e69eb6b5764c566efd11e4afb57811c392b6c8977e9b15ad9adfc40a9b1cd21f89ea423665ebaeff5c6d51595d85 SHA512 9abc859a05886a67890585fa8f5b68f3e086f0855bcd78fb9b0340c1917ba356e04d7a5d2175a29889a10fc2fd1dbad66283ab9f1012a07a02ef21a8d5e698a2
 MISC metadata.xml 686 BLAKE2B 1765b0a3550faa934493725aeb42207d1a0f3cfb7bc2c949ea8a0a704188694a3377ff0debe6449c34f4aba8614183b6b2e9f83cd911da672efea9b3fb30481b SHA512 1b525595caa1d1b839dbb3ae96b62449f6f141fdde8ad3a0d30df95d5cc8e23c2b0e645e3d91434ae7861c30852f96619d11be4c439f156ab56cbd1876ad633d
diff --git a/sys-fs/ext4magic/ext4magic-0.3.2-r1.ebuild b/sys-fs/ext4magic/ext4magic-0.3.2-r1.ebuild
new file mode 100644
index 000000000000..f26ce3b1d1d7
--- /dev/null
+++ b/sys-fs/ext4magic/ext4magic-0.3.2-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Tool for recovery of deleted or overwritten files on ext3/ext4 filesystems"
+HOMEPAGE="https://sourceforge.net/projects/ext4magic/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug +expert-mode file-attr"
+
+RDEPEND="app-arch/bzip2
+	>=sys-apps/file-5.04
+	sys-apps/util-linux
+	>=sys-fs/e2fsprogs-1.41.9
+	sys-libs/zlib"
+DEPEND="${RDEPEND}"
+
+DOCS="AUTHORS ChangeLog NEWS README TODO"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.3.2-sysmacros.patch
+	"${FILESDIR}"/${PN}-0.3.2-i_dir_acl.patch
+)
+
+src_configure() {
+	# build-system incorrectly recognizes '--disable-feature' options as enabled!
+	econf \
+		$(usex debug '--enable-debug' '') \
+		$(usex debug '--enable-debug-magic' '') \
+		$(usex expert-mode '--enable-expert-mode' '') \
+		$(usex file-attr '--enable-file-attr' '')
+}
diff --git a/sys-fs/ext4magic/files/ext4magic-0.3.2-i_dir_acl.patch b/sys-fs/ext4magic/files/ext4magic-0.3.2-i_dir_acl.patch
new file mode 100644
index 000000000000..9c7e86a2af15
--- /dev/null
+++ b/sys-fs/ext4magic/files/ext4magic-0.3.2-i_dir_acl.patch
@@ -0,0 +1,32 @@
+From: Gokturk Yuksek <gokturk@gentoo.org>
+Subject: [PATCH] src/inode: supersede i_dir_acl with i_size_high
+
+The upstream has removed the macro that defined i_dir_acl as
+i_size_high which causes a build failure with the later versions of
+e2fsprogs. Replace every reference to inode->i_dir_acl with
+inode->i_size_high.
+
+Bug: https://bugs.gentoo.org/650074
+Bug: https://sourceforge.net/p/ext4magic/tickets/10/
+
+[0] https://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git/commit/?id=578fcbfd2e61e0b13ce8c7b62804c941d6c1eb8e
+
+--- a/src/inode.c
++++ b/src/inode.c
+@@ -404,14 +404,14 @@
+         fprintf(out,
+                         "%sFile ACL: %d    Directory ACL: %d Translator: %d\n",
+                         prefix,
+-                        inode->i_file_acl, LINUX_S_ISDIR(inode->i_mode) ? inode->i_dir_acl : 0,
++                        inode->i_file_acl, LINUX_S_ISDIR(inode->i_mode) ? inode->i_size_high : 0,
+                         inode->osd1.hurd1.h_i_translator);
+         else
+                 fprintf(out, "%sFile ACL: %llu    Directory ACL: %d\n",
+                         prefix,
+                         inode->i_file_acl | ((long long)
+                                 (inode->osd2.linux2.l_i_file_acl_high) << 32),
+-                        LINUX_S_ISDIR(inode->i_mode) ? inode->i_dir_acl : 0);
++                        LINUX_S_ISDIR(inode->i_mode) ? inode->i_size_high : 0);
+         if (os == EXT2_OS_LINUX)
+                 fprintf(out, "%sLinks: %d   Blockcount: %llu\n",
+                         prefix, inode->i_links_count,