gentoo resync : 14.04.2018

5 files changed, 63 insertions, 55 deletions

diff --git a/app-forensics/Manifest.gz b/app-forensics/Manifest.gz
index 268909ea8e35..27ef25a4e699 100644
--- a/app-forensics/Manifest.gz
+++ b/app-forensics/Manifest.gz
diff --git a/app-forensics/libewf/Manifest b/app-forensics/libewf/Manifest
index 69c0e1de7ab1..bdb3a28117a2 100644
--- a/app-forensics/libewf/Manifest
+++ b/app-forensics/libewf/Manifest
@@ -2,7 +2,8 @@ AUX libewf-20140608-fix-tmpdir-in-tests.patch 556 BLAKE2B 6e48bfaa58a5c1230f3973
 DIST libewf-20130416.tar.gz 1968288 BLAKE2B a61cd2239bfc12b1107bf3c6f68106027a1b08ca644dd8d8ca9dda331f902d1ba2e74dc516a3ed1dbf90f2926c7f654496bf6dd103d5c3f615bab653c8616fd0 SHA512 e84e920dfe6e5a313bc165b1796ab9681c5b42fdefc7120b4f1c0f4e42b220d8192e03df2707051cf16f4cc991facdfdbd39042dcfb645ac7a27b549e02bd96e
 DIST libewf-20140608-libuna-remove-inline.patch 34909 BLAKE2B e0b4fdcdf3e791992f32bd5251d3a5e6c8d193fe33508620e040ae11c83cf0c308ffd9cce31b548be03e6ec3c0a0623eb25a1731d402296908923d2c6643bbc0 SHA512 01b82d1ebe921a3b572ba061886bddc76d57c6e13f7997ca139baf790d3be7a8e855a50a05915788a7afb85afd46f9cd638c279ba57f7c36398dadd94bc32fc7
 DIST libewf-20140608.tar.gz 2129518 BLAKE2B aaa8e95f243e887494c5a50c1706864b4613e5731aa49ec2d2510b81984be9df70eeb18c1d5c56f97894536d55a16c2496eae8c662f6ab54e29c142f460fb188 SHA512 f77f01e3452027bff71e644708744e0774e1e397c70e2ebd687983730f03ffb01b26fec782bec79971e149caac5029484f3d9073c3a8042df951bfc542fe2436
+DIST libewf-experimental-20171104.tar.gz 2243405 BLAKE2B 86e69eba5313dadbfe2cc63639e96cf964b5d72e3c98299c0262547b2d900b7a8a4a5938435bdafac3890ee05ea0079ef68809086234ff486c985d557d2c4897 SHA512 610174971b8e09385f1f51c02e7be36e7a18d21f8b22ddeb7ba7d5c20e7df97591a70de3523b2d63bed8deb5a2a170a14e825f6a80aeb0937553ecae5925ee0b
 EBUILD libewf-20130416.ebuild 1390 BLAKE2B f86f0370dcabe7fa02fe745ee3864fb9fcb45d47832ab5112219a30c4c13e49fce18e8d7df3be1957bc7ae2c79447c9f8b7659eff35bfac2676c834c35e798fa SHA512 98b8718ec6f1b25f2b33b8a73973906197cff2f505583270d4bcf301223bbfe0aceafe55395e795c7d173c27dd00ed47b2570234d5bff1a07bbd2385151369a7
 EBUILD libewf-20140608-r1.ebuild 1601 BLAKE2B a31475c4f6f3195b90092f5baa0d80d691f8ad07a4ee410fd06070d56366c77ad2bfa947b99aa32e59e8e7c00cad172efadd52efe74a35369da0fa82eb616e7b SHA512 2bf8916b14c71a5685915954d4864ab8b375ee8d09944958b3f47699a78316f45c417d67ffebdf4066e8671f3693dc5563e9246ac9a46134fde85c6c37604d3d
-EBUILD libewf-20140608.ebuild 1350 BLAKE2B c1c7625f69b1a13d96d95067e6c3b561139ffc376b4c6f93709ed3c284da095e8748101620c52de4db91d13f3aa3010977ab3e44ab2f928f24219fe3f8cb011b SHA512 c9afd58cc6581da4235beec337668b1e09c8a6be78c6d573917b8ddd72450f87291dd925e32bf23ef72d2845419cf3c88395bbd83c65a1de27f29622212ac3c5
-MISC metadata.xml 558 BLAKE2B b8581ff5b3d491a39cecc04fd50480c377c0c2593c19533c61d17cfcb0589060a57381b3ceb25fc8d15bfcd1e2de17f0c7517f9910dac5f6da4a2a763a423052 SHA512 bc1d1da35f777a5c48a03120e432b7ec09f3ae827118782db7861640f23a190ca32b464fb28e219b2494da23bf036199c8ea2cd43c56896fd068fa6cabab9ef4
+EBUILD libewf-20171104.ebuild 1362 BLAKE2B 8879db8255861c21f345abbdc3d2474da327464e41a51a00f8bf7d513d1bb4bc541c70bf406e01c0be6f1711a3fa489a5cdad8592481d288974de3f109554658 SHA512 869935cea5b53d802ae2ebb31bf5e8aeabf8f0480e9d01d13ffbbedfc90d4f43707000760844bf83065971fdaefad973d0d12522ccde9fc5dc42ef6d187140bd
+MISC metadata.xml 637 BLAKE2B c3d42f901c29baa52deae9745e42960cd5d3f8fc0dd01f530c9948806231ec2a8ef6f3fbd8f5fcaaee877167225db542af2ef0b84a6f1bb1a65db7ef617752c6 SHA512 ece6655919f7bd0dc6b2d8189e04f60114428f3ff2bc7ee6859abfa0e73527e5a37dc0816d85b368f2f0a0f139351924b9b800d680115b9a158bce9f665a9ec3
diff --git a/app-forensics/libewf/libewf-20140608.ebuild b/app-forensics/libewf/libewf-20140608.ebuild
deleted file mode 100644
index 61c47c58cf83..000000000000
--- a/app-forensics/libewf/libewf-20140608.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-utils
-
-DESCRIPTION="Implementation of the EWF (SMART and EnCase) image format"
-HOMEPAGE="https://github.com/libyal/libewf"
-SRC_URI="https://googledrive.com/host/0B3fBvzttpiiSMTdoaVExWWNsRjg/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/2"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86"
-# upstream bug #2597171, pyewf has implicit declarations
-#IUSE="debug python unicode"
-IUSE="bfio debug ewf +fuse +ssl static-libs +uuid unicode zlib"
-
-DEPEND="
-	sys-libs/zlib
-	bfio? ( =app-forensics/libbfio-0.0.20120425_alpha )
-	fuse? ( sys-fs/fuse:= )
-	uuid? ( sys-apps/util-linux )
-	ssl? ( dev-libs/openssl:0= )
-	zlib? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}"
-
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-DOCS=( AUTHORS ChangeLog NEWS README documents/header.txt documents/header2.txt )
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable debug debug-output)
-		$(use_enable debug verbose-output)
-		$(use_enable ewf v1-api)
-		$(use_enable unicode wide-character-type)
-		$(use_with zlib)
-		# autodetects bzip2 but does not use
-		--without-bzip2
-		$(use_with bfio libbfio)
-		$(use_with ssl openssl)
-		$(use_with uuid libuuid)
-		$(use_with fuse libfuse)
-	)
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install
-	doman manuals/*.1 manuals/*.3
-}
diff --git a/app-forensics/libewf/libewf-20171104.ebuild b/app-forensics/libewf/libewf-20171104.ebuild
new file mode 100644
index 000000000000..010f601384f9
--- /dev/null
+++ b/app-forensics/libewf/libewf-20171104.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Implementation of the EWF (SMART and EnCase) image format"
+HOMEPAGE="https://github.com/libyal/libewf"
+SRC_URI="https://github.com/libyal/libewf/releases/download/${PV}/${PN}-experimental-${PV}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/3"
+KEYWORDS="~amd64 ~hppa ~ppc ~x86"
+# upstream bug #2597171, pyewf has implicit declarations
+#IUSE="debug python unicode"
+IUSE="bfio bzip2 debug +fuse nls +ssl static-libs +uuid unicode zlib"
+
+# uses bundled libbfio until tree version is bumped
+RDEPEND="
+	fuse? ( sys-fs/fuse:0= )
+	nls? (
+		virtual/libintl
+		virtual/libiconv
+	)
+	uuid? ( sys-apps/util-linux )
+	ssl? ( dev-libs/openssl:0= )
+	zlib? ( sys-libs/zlib )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+
+# issues finding test executables
+RESTRICT="test"
+
+src_configure() {
+	local econfargs=(
+		$(use_enable static-libs static)
+		$(use_enable nls)
+		$(use_enable debug verbose-output)
+		$(use_enable debug debug-output)
+		$(use_enable unicode wide-character-type)
+		$(use_with bfio libbfio)
+		$(use_with zlib)
+		$(use_with bzip2)
+		$(use_with ssl openssl)
+		$(use_with uuid libuuid)
+		$(use_with fuse libfuse)
+	)
+	econf "${econfargs[@]}"
+}
+
+src_install() {
+	default
+	use static-libs || find "${ED}"/usr -name '*.la' -delete
+}
diff --git a/app-forensics/libewf/metadata.xml b/app-forensics/libewf/metadata.xml
index a4f3a69c3044..b18a991426db 100644
--- a/app-forensics/libewf/metadata.xml
+++ b/app-forensics/libewf/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>radhermit@gentoo.org</email>
+		<name>Tim Harder</name>
+	</maintainer>
 	<use>
 		<flag name="bfio">Enables libbfio for chaining file in file handling</flag>
 		<flag name="rawio">Enables raw IO handling</flag>