8 files changed, 23 insertions, 175 deletions
diff --git a/app-forensics/Manifest.gz b/app-forensics/Manifest.gz
index 6b5d8e81f19a..69ca8f7be5b2 100644
--- a/app-forensics/Manifest.gz
+++ b/app-forensics/Manifest.gz
diff --git a/app-forensics/afflib/Manifest b/app-forensics/afflib/Manifest
index a4a53410a153..3006a79df8ac 100644
--- a/app-forensics/afflib/Manifest
+++ b/app-forensics/afflib/Manifest
@@ -1,9 +1,9 @@
 AUX afflib-3.6.12-pyaff-header.patch 330 BLAKE2B 37b682545d6c193a5c2668bbfa81990fe4e7497fafcffe97c6e4fb01e0cb2001a3e23e522cdcc143ee6dc969e2e9782fbf378286e226d2bf45f552a17ab2903c SHA512 9d57dd60bfe933961a5df4e4be2e8bee1bca0971bbb364c7c3888bc9b54ca7073e03864d30e4401abba3fff7ff5f7435b5219299f8f781d0fbbf065bfa9c800e
 AUX afflib-3.7.1-python-module.patch 540 BLAKE2B bac33993b6a7e8933c71eeba7730a0614bd22b7db6fbebf0c13974a338cc9cddd428b283669a3cde15464709931d50dc88aa3c75a0d8b86cdce15f81e17657c6 SHA512 3309977b2b1bd716d244e76e1ab6c270dc91e7b8e9e32bbfb11f017df6e08de47f11aaf4fa91cd79153c54cad7ada09d001197da3460105dcf017d6647b39974
+DIST afflib-3.7.17.tar.gz 533720 BLAKE2B da38d29b7dedc07a7594f24e263e04645aa0f04e561af1f31e54a40c76e62d8eff0e815ee5592d1bfe2e8873fc53701f0126bf0d0b595ce2df5d61f8bb52dc8c SHA512 21067a8cb7c7b3d75f91883b2f9b1c978e055a2df6331dc68245332226d042a6b82f9f5d996e6bd1d5155de511827d5636c75ab1ee0a6957815aab3bb1cff49b
 DIST afflib-3.7.4.tar.gz 569346 BLAKE2B e296bf58499bff4d44c9f5e1dd7363b4a68581213ff04ab14ffbe35b877c8307da03fb49e967a722ad9869f6284de496b86258f1b20c7c9e6b6a6cdcf473a03f SHA512 58791388a05d614dd5f219a74173de2ff0938a1f93b21e2dd0731aca52ea544ba60cc4325f0d284937467ce600a4302b7a2f724d84710ecc7f12db1a22a8e41c
-DIST afflib-3.7.7.tar.gz 518933 BLAKE2B a32a1954acfeed4d2c8db2bb3f1ee99e5177b2f84d0037f851fda095b47a1d3ca2dc81221d9fbbb040a866f86c4aebded0cbc31353a9cda0a0e81096baada28a SHA512 8698d66ab84601e5dcd64fcedf2087d5a8227895ed4009d314958eb223c56e0e59aa3e76d57f854a911f79194ae9c1ffc8af8e686310752744b43030c9e84e80
 DIST afflib-3.7.8.tar.gz 518399 BLAKE2B 80bc168d63ff53d8f3c60aeb2a1f0d25eec39a1d850095f694a11b755d3a0cc9765be4ed076d07cb98185e8375004d12592d14c1fc370c95a15f054d02f96a55 SHA512 a547ea459c479ccba1b4805bcbbac6f670abdccf8fe6685406d0662483a2b643652e3798e6396ecb24cfeea9bf711f636aeebb64794637ee54e7dbb62c0bdbb7
+EBUILD afflib-3.7.17.ebuild 1503 BLAKE2B e022c9f7e3fd716c9c044ca03720a645874718241bce929263e70874762bb3244952aa4366f1ff514ebeb9fdf54268adaf9dfe704ec601e8d8dfcb3876abd536 SHA512 1a701fdc67e0808436e2b45ed0eef36e5e74cc9efcc1efcb53b94d5f1d443eceec6320dd04d66b08770de52f3d25db366966a281415db6d73029649d480cbb45
 EBUILD afflib-3.7.4.ebuild 1549 BLAKE2B 0ef8a65f815f5d8e37ad7c8ebf0b6a03b8a644cd96265417792a412f32228ba3e03bcfba1fe79733b3bd00bc1762215d65a6c16f1aaeb2ec05263f1bd5fe4617 SHA512 80601cd55941257eafcef2871ed27352983f5946d7a693ae42f809e7b1dca6cabb380fa6392abb29fcdf45266f991f9a2493c1eb280e84f59771a2c4d617b3da
-EBUILD afflib-3.7.7.ebuild 1551 BLAKE2B 7179e9a0c9a98d38ef7840e9090326e6050237eb85c0a8ecaa7018694fc216bed18494a021acdc00dbe9559f8628e32ce7a08a0c217ec62c09033c8c8157132a SHA512 73c6862edb95e729bcd23c2d5b785a289bd5674b87a2f04937878db3f999f06f75b9cab1fbbaa4e808ba7b7fc87dfdf02bbafd2e7f85ba1398ebdda5d91fbdac
 EBUILD afflib-3.7.8.ebuild 1530 BLAKE2B afdfb443c4cf9df7cd590370a39b241b5be1bec9fe435aad375926892140e6aa25100d24e8f47f4bd9762b88ee212aee2f728c7262d5c2ef35a9b04d3795e2bf SHA512 75f5af879d32f7628ee2a44b848c5a449d2c79fe15628a9afd6f32ad77bf1e976e23d5a4eb70324d5f76d47dccdb95cd45111ccda3524f9489d2119bb302abfd
 MISC metadata.xml 429 BLAKE2B 64f4ca1a2220e6b7dedc1b9886c271e2cdc96013d63f2262ae7510f5189ec69fefc0b616dbe94d4cd21cf9cef13809ebec12c99e18415fb97691dec08a8da04f SHA512 172d0b4a9759b0bd5153e1cecf1a2c1b3f0927528fbc76941fe19c77f6960455628af22823c81b156b8575cacfe58d525950bafcdb31aca752752274ec989191
diff --git a/app-forensics/afflib/afflib-3.7.7.ebuild b/app-forensics/afflib/afflib-3.7.17.ebuild
index 7d55784b3ecf..b83099399703 100644
--- a/app-forensics/afflib/afflib-3.7.7.ebuild
+++ b/app-forensics/afflib/afflib-3.7.17.ebuild
@@ -1,15 +1,13 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_PRUNE_LIBTOOL_FILES=modules
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} )
 
-inherit autotools-utils python-single-r1
+inherit autotools python-single-r1
 
 MY_PN=AFFLIBv3
-MY_P=${MY_PN}-${PV}
+MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Library that implements the AFF image standard"
 HOMEPAGE="https://github.com/sshock/AFFLIBv3/"
@@ -18,25 +16,21 @@ SRC_URI="https://github.com/sshock/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~hppa ~ppc ~x86 ~x64-macos"
-IUSE="fuse ncurses python qemu readline s3 static-libs threads"
+IUSE="fuse libressl ncurses python qemu readline s3 static-libs threads"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="dev-libs/expat
-	dev-libs/openssl:0
 	sys-libs/zlib
-	fuse? ( sys-fs/fuse )
+	fuse? ( sys-fs/fuse:= )
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:= )
 	ncurses? ( sys-libs/ncurses:0= )
 	python? ( ${PYTHON_DEPS} )
-	readline? ( sys-libs/readline:0 )
+	readline? ( sys-libs/readline:0= )
 	s3? ( net-misc/curl )"
 DEPEND="${RDEPEND}"
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.7.1-python-module.patch
-	"${FILESDIR}"/${PN}-3.6.12-pyaff-header.patch
-)
-
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
 
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
@@ -44,9 +38,9 @@ pkg_setup() {
 
 src_prepare() {
 	sed -i '/FLAGS/s: -g::' configure.ac || die
-	sed -i '/-static/d' tools/Makefile.am || die
 
-	autotools-utils_src_prepare
+	default
+	eautoreconf
 }
 
 src_configure() {
@@ -59,7 +53,13 @@ src_configure() {
 		$(use_enable python)
 		$(use_enable qemu)
 		$(use_enable s3)
+		$(use_enable static-libs static)
 		$(use_enable threads threading)
 	)
-	autotools-utils_src_configure
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	find "${ED}" -name "*.la" -delete || die
 }
diff --git a/app-forensics/libewf/Manifest b/app-forensics/libewf/Manifest
index fd813b1d2744..33f6d3d442ae 100644
--- a/app-forensics/libewf/Manifest
+++ b/app-forensics/libewf/Manifest
@@ -1,9 +1,3 @@
-AUX libewf-20140608-fix-tmpdir-in-tests.patch 556 BLAKE2B 6e48bfaa58a5c1230f3973005c9890b371e7f97c58dd2cf97a17591b946aedb0ffa8dab0d4ccc33ded0f93b3713f2cc89ac32c6822abd9bfd3389d8a1735713b SHA512 a49cc8478016001c7739c1fee5c04254b2015a6aaa2b32cc0e521a64081290cf70b0b96651faed1e8886db4fa7ee2b474ad80f8ca732af30ea343031b48ffe22
-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-20171104.ebuild 1358 BLAKE2B 2e20bde545e01a881ffbc0df27e7295782c414447376fcf49d9e0a942aa4d7c9a19e55105618574c12babd4c3d82d3104cd09ea473d8e9ec7e57440085fce7b4 SHA512 74491aef774b9a5879e45be6562044aacd487b28a9a71b01a16e2e68cc91be164d95c43e85ee50b583193b485c6b59dcad85d6aae990c039007978e0290a78f1
-MISC metadata.xml 637 BLAKE2B c3d42f901c29baa52deae9745e42960cd5d3f8fc0dd01f530c9948806231ec2a8ef6f3fbd8f5fcaaee877167225db542af2ef0b84a6f1bb1a65db7ef617752c6 SHA512 ece6655919f7bd0dc6b2d8189e04f60114428f3ff2bc7ee6859abfa0e73527e5a37dc0816d85b368f2f0a0f139351924b9b800d680115b9a158bce9f665a9ec3
+MISC metadata.xml 540 BLAKE2B 2b706049733a8fa33e64f401f807e45bcf2f661d5de3c239f37e167ffb46c4869cb4245b0e57df41ddbe403b9d5ba61d731f890451c50c62e8b58f6c5d5e6bbe SHA512 8144789ad852df713ddf4279baa6ae5a145b4cc31d7711cb4d0e5ff3d8016fb9268ce83808aef6b61ca2dd082a2d5847d38df442fb1023c99d2d84f3beec4d8a
diff --git a/app-forensics/libewf/files/libewf-20140608-fix-tmpdir-in-tests.patch b/app-forensics/libewf/files/libewf-20140608-fix-tmpdir-in-tests.patch
deleted file mode 100644
index 09a6948d7c79..000000000000
--- a/app-forensics/libewf/files/libewf-20140608-fix-tmpdir-in-tests.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- a/tests/test_read_write.sh
-+++ b/tests/test_read_write.sh
-@@ -25,7 +25,7 @@ EXIT_FAILURE=1;
- EXIT_IGNORE=77;
- 
- INPUT="input";
--TMP="tmp";
-+TMP=$(mktemp -ut);
- 
- LS="ls";
- TR="tr";
---- a/tests/test_read_write_delta.sh
-+++ b/tests/test_read_write_delta.sh
-@@ -25,7 +25,7 @@ EXIT_FAILURE=1;
- EXIT_IGNORE=77;
- 
- INPUT="input";
--TMP="tmp";
-+TMP=$(mktemp -ut);
- 
- AWK="awk";
- CUT="cut";
---- a/tests/test_write.sh
-+++ b/tests/test_write.sh
-@@ -24,7 +24,7 @@ EXIT_SUCCESS=0;
- EXIT_FAILURE=1;
- EXIT_IGNORE=77;
- 
--TMP="tmp";
-+TMP=$(mktemp -ut);
- 
- CUT="cut";
- 
diff --git a/app-forensics/libewf/libewf-20130416.ebuild b/app-forensics/libewf/libewf-20130416.ebuild
deleted file mode 100644
index 58022bf647e1..000000000000
--- a/app-forensics/libewf/libewf-20130416.ebuild
+++ /dev/null
@@ -1,53 +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://libewf.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/2"
-KEYWORDS="amd64 hppa ppc x86"
-# upstream bug #2597171, pyewf has implicit declarations
-#IUSE="debug python rawio unicode"
-IUSE="debug ewf +fuse rawio +ssl static-libs +uuid unicode zlib"
-
-DEPEND="
-	sys-libs/zlib
-	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 rawio low-level-functions)
-		$(use_enable unicode wide-character-type)
-		$(use_with zlib)
-		# autodetects bzip2 but does not use
-		--without-bzip2
-		#if we don't force disable this then it fails to build against new libbfio
-		--without-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-20140608-r1.ebuild b/app-forensics/libewf/libewf-20140608-r1.ebuild
deleted file mode 100644
index c313c72a60ad..000000000000
--- a/app-forensics/libewf/libewf-20140608-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_IN_SOURCE_BUILD=1
-inherit eutils 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
-	https://dev.gentoo.org/~gokturk/distfiles/app-forensics/libewf/libewf-20140608-libuna-remove-inline.patch"
-
-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}"
-
-PATCHES=(
-	"${DISTDIR}"/${P}-libuna-remove-inline.patch
-	"${FILESDIR}"/${PN}-20140608-fix-tmpdir-in-tests.patch
-)
-
-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/metadata.xml b/app-forensics/libewf/metadata.xml
index b18a991426db..3ca92ec9afc3 100644
--- a/app-forensics/libewf/metadata.xml
+++ b/app-forensics/libewf/metadata.xml
@@ -7,8 +7,6 @@
 	</maintainer>
 	<use>
 		<flag name="bfio">Enables libbfio for chaining file in file handling</flag>
-		<flag name="rawio">Enables raw IO handling</flag>
-		<flag name="ewf">Enables the v1 API</flag>
 		<flag name="fuse">Enable fuse support for ewfmount</flag>
 		<flag name="uuid">Enable UUID support in the ewftools</flag>
 	</use>