gentoo resync : 23.03.2018

3 files changed, 73 insertions, 0 deletions

diff --git a/dev-libs/libexplain/Manifest b/dev-libs/libexplain/Manifest
index d9202e1fcba9..7765194572aa 100644
--- a/dev-libs/libexplain/Manifest
+++ b/dev-libs/libexplain/Manifest
@@ -1,5 +1,7 @@
 AUX libexplain-0.45-configure.patch 385 BLAKE2B 1b88d760c97dbdb5acbc0165ced7f66c94cce817d8481e36ec03aebdc3198921352abb9b6959724d3588b65b071eae4e310fe0c35fd8661ccfcc3916061ca499 SHA512 ab85c6ba83b02b2e4ac86f5505bf8bb303176cbaab6eb9d703fa2069bc1e58c79b761778faafb01822bc3473d4a6fd04e6cbe5807d4bd83df2ce6bedf17f3e8c
+AUX libexplain-missing-defines.patch 506 BLAKE2B 7f9c27194a7662c223a60038d8ed54b363665b6def2ef2d3857a1eeb7ab1924ef08b27919f46103b6c922d79ca3b849f5c09d0e93e660bda30c25dc599e7e72f SHA512 cbe4731c4067a46f2b2d5f7d6bb01c59ee5edccae58ab0d55b04693f015003ad3953eec6a5a03c5c6edb40105d7c2c35463131c696ed95729c79f4a6ddf76e1f
 DIST libexplain-1.4.tar.gz 4770006 BLAKE2B 537829a492f24b73051f1df2865fe5851af71046a2c6b4ca40c3b06594b1b386233fa2ff47e7f4753e5fdee08ca1f8fe5141bc7b1fda815c95c8927d6747b794 SHA512 c236732f57d0688fed173c27474a00a39c9ac6d5dfbd22f3b68b5d0fff7a70fb130bcedbeb174767f4fd2c012148025e92635cc8df2b958774a3cfba58e6ff2c
 EBUILD libexplain-1.4-r1.ebuild 1008 BLAKE2B ec91bf41f39338338451a5dc60f1f1535aa8579bc2ae9d658b7b419364a5904408401f2b324cccb60d9d04822cc5ff7c5032e4f57e2930a184145c05f069264a SHA512 a0401e67628a0b35adf4067ab567a1c39e10eb675f3227a4256ef2949f1a21d562e58bfae21f088bc2043940fe75e141e3b345684cb9d0bbd6bdb51462e63d2b
+EBUILD libexplain-1.4-r2.ebuild 1057 BLAKE2B 5e5313f4ede77720d7694537945f0cb44fd21221d7c142afb77260d2bf9a017afb4bdbdfc91620125f613e5302f6367eac4d344b61d1583553e178640889c101 SHA512 cfe0976582ad89a27ad20917247c100a0cece6b7ca4141a1c9e563aa92229593aa6a00df2e8348187f4c552f19a22b484e9a07483614856a6f4d9e7bd0c93df4
 EBUILD libexplain-1.4.ebuild 1051 BLAKE2B 295191da8bb773203191cc5d7e3af769d7020ff5675d5cf2f4b4db5d0886331fdda43636988a88ab65b69f9009c9da1feaa81bbfa414a82ee3b60001aaff8fa1 SHA512 6f06630f594ca1253d8479d8c3379e554c4c71b0135cd52089299b4ba9b135b3aa116bcc676f284af762e73e81134637e62ffc260595e89aeccddc399b559634
 MISC metadata.xml 355 BLAKE2B 02b7c3efce9943f560d42215fc4b049d4915962f202090eec2ba5704fabd0886f44977d05c0bc90fbabdea5b040e4a7be7f53d7d07e13aacb928a82de9b8cb77 SHA512 da9d74fbff908b754b891941038f9f01a65641444f4d8a36502f9d967a33558ef74716ce33223be27fdb3dc80e7e65bccf51e4908d41e39ff50bbbc4aab3ed86
diff --git a/dev-libs/libexplain/files/libexplain-missing-defines.patch b/dev-libs/libexplain/files/libexplain-missing-defines.patch
new file mode 100644
index 000000000000..bb1170cbc385
--- /dev/null
+++ b/dev-libs/libexplain/files/libexplain-missing-defines.patch
@@ -0,0 +1,18 @@
+--- libexplain-1.4.D001.orig/libexplain/buffer/file_inode_flags.c
++++ libexplain-1.4.D001/libexplain/buffer/file_inode_flags.c
+@@ -28,6 +28,14 @@
+
+ #if defined(FS_IOC_GETFLAGS) || defined(FS_IOC32_GETFLAGS)
+
++#ifndef FS_ECOMPR_FL
++#define FS_ECOMPR_FL                    0x00000800 /* Compression error */
++#endif
++
++#ifndef FS_DIRECTIO_FL
++#define FS_DIRECTIO_FL                  0x00100000 /* Use direct i/o */
++#endif
++
+ void
+ explain_buffer_file_inode_flags(explain_string_buffer_t *sb, int value)
+ {
+
diff --git a/dev-libs/libexplain/libexplain-1.4-r2.ebuild b/dev-libs/libexplain/libexplain-1.4-r2.ebuild
new file mode 100644
index 000000000000..d008b1f40c18
--- /dev/null
+++ b/dev-libs/libexplain/libexplain-1.4-r2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="Library which may be used to explain Unix and Linux system call errors"
+HOMEPAGE="http://libexplain.sourceforge.net/"
+SRC_URI="http://libexplain.sourceforge.net/${P}.tar.gz"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+LICENSE="GPL-3 LGPL-3"
+IUSE="static-libs"
+
+DEPEND="
+	sys-apps/acl
+	sys-apps/groff
+	app-text/ghostscript-gpl
+	>=sys-kernel/linux-headers-2.6.35"
+
+RDEPEND="
+	${DEPEND}
+	sys-libs/libcap
+	sys-process/lsof
+	sys-libs/glibc"
+
+# Test fails with:
+# This is not a bug, but it does indicate where libexplain's ioctl support
+# could be improved.
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.45-configure.patch
+	"${FILESDIR}"/libexplain-missing-defines.patch
+)
+
+src_prepare() {
+	# Portage incompatible test
+	sed \
+		-e '/t0524a/d' \
+		-e '/t0363a/d' \
+		-i Makefile.in || die
+
+	cp -v "${S}"/etc/configure.ac "${S}" || die
+	default
+	eautoreconf
+}
+
+src_install() {
+	default
+}