8 files changed, 5 insertions, 101 deletions
diff --git a/app-forensics/Manifest.gz b/app-forensics/Manifest.gz
index 53e678210f2a..aabf779ed3b7 100644
--- a/app-forensics/Manifest.gz
+++ b/app-forensics/Manifest.gz
diff --git a/app-forensics/afflib/Manifest b/app-forensics/afflib/Manifest
index 236b7bdbc7be..62c75f55c515 100644
--- a/app-forensics/afflib/Manifest
+++ b/app-forensics/afflib/Manifest
@@ -1,7 +1,3 @@
-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.18.tar.gz 540371 BLAKE2B 6c1837ebcb5cca97622736f38e61c35f149c045bc1a60acea455dd9059e8c60447cd8f45304fd55aa7f2e5f783d40e266a23d09b33209f9dc5441f971b8a188d SHA512 47ab74c86bbaedc2494558962f99463066e267f7a3f583902a53e1f488085a309b0d871093c67439033272c3ebf03d213649886930b9812013e66782ea84df85
-DIST afflib-3.7.4.tar.gz 569346 BLAKE2B e296bf58499bff4d44c9f5e1dd7363b4a68581213ff04ab14ffbe35b877c8307da03fb49e967a722ad9869f6284de496b86258f1b20c7c9e6b6a6cdcf473a03f SHA512 58791388a05d614dd5f219a74173de2ff0938a1f93b21e2dd0731aca52ea544ba60cc4325f0d284937467ce600a4302b7a2f724d84710ecc7f12db1a22a8e41c
-EBUILD afflib-3.7.18.ebuild 1509 BLAKE2B b5f9bd61a735879c332e18d9401a6176fb1db35c9f04e7120a03db701f36e43453e217163c90261a5591b4fb4ebdacc162058bc7a93ceb57b1f65285eb92b83c SHA512 2d6d9514b5ef8427d3431454c658118a8e7e470826ba5806137fef10de13c8887885244140c6b5c836b1bc9bdc560738362113735bd6781e20dc0353f3c61de0
-EBUILD afflib-3.7.4.ebuild 1549 BLAKE2B 0ef8a65f815f5d8e37ad7c8ebf0b6a03b8a644cd96265417792a412f32228ba3e03bcfba1fe79733b3bd00bc1762215d65a6c16f1aaeb2ec05263f1bd5fe4617 SHA512 80601cd55941257eafcef2871ed27352983f5946d7a693ae42f809e7b1dca6cabb380fa6392abb29fcdf45266f991f9a2493c1eb280e84f59771a2c4d617b3da
+EBUILD afflib-3.7.18.ebuild 1505 BLAKE2B d5a2b7ba7e70235cf712618a239887a89305b520b3bcbf1573822c12fcd6528e46aaa6ed14778ca1aaefebe69896543030a7ae34ed6e988f1f77dd9178de0dc5 SHA512 d081beef9ad39dd6218d66d9ca2c3bb89db145fb6225d4cf767eab218a681a2554a5da58842e932aa2a5e17509910f8326912e026575b3862233d3f1e95a1bf7
 MISC metadata.xml 429 BLAKE2B 64f4ca1a2220e6b7dedc1b9886c271e2cdc96013d63f2262ae7510f5189ec69fefc0b616dbe94d4cd21cf9cef13809ebec12c99e18415fb97691dec08a8da04f SHA512 172d0b4a9759b0bd5153e1cecf1a2c1b3f0927528fbc76941fe19c77f6960455628af22823c81b156b8575cacfe58d525950bafcdb31aca752752274ec989191
diff --git a/app-forensics/afflib/afflib-3.7.18.ebuild b/app-forensics/afflib/afflib-3.7.18.ebuild
index 720fd1226f8f..431c23f03350 100644
--- a/app-forensics/afflib/afflib-3.7.18.ebuild
+++ b/app-forensics/afflib/afflib-3.7.18.ebuild
@@ -15,7 +15,7 @@ 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"
+KEYWORDS="amd64 ~arm hppa ppc x86 ~x64-macos"
 IUSE="fuse libressl ncurses python qemu readline s3 static-libs threads"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/app-forensics/afflib/afflib-3.7.4.ebuild b/app-forensics/afflib/afflib-3.7.4.ebuild
deleted file mode 100644
index 28987f4b1994..000000000000
--- a/app-forensics/afflib/afflib-3.7.4.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# 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
-
-inherit autotools-utils python-single-r1
-
-MY_PN=AFFLIBv3
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Library that implements the AFF image standard"
-HOMEPAGE="https://github.com/simsong/AFFLIBv3/"
-SRC_URI="https://github.com/simsong/${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"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="dev-libs/expat
-	dev-libs/openssl:0
-	sys-libs/zlib
-	fuse? ( sys-fs/fuse )
-	ncurses? ( sys-libs/ncurses:0= )
-	python? ( ${PYTHON_DEPS} )
-	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}
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	sed -i '/FLAGS/s: -g::' configure.ac || die
-	sed -i '/-static/d' tools/Makefile.am || die
-
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	# Hacks for automagic dependencies
-	use ncurses || export ac_cv_lib_ncurses_initscr=no
-	use readline || export ac_cv_lib_readline_readline=no
-
-	local myeconfargs=(
-		$(use_enable fuse)
-		$(use_enable python)
-		$(use_enable qemu)
-		$(use_enable s3)
-		$(use_enable threads threading)
-	)
-	autotools-utils_src_configure
-}
diff --git a/app-forensics/afflib/files/afflib-3.6.12-pyaff-header.patch b/app-forensics/afflib/files/afflib-3.6.12-pyaff-header.patch
deleted file mode 100644
index 496b02d25035..000000000000
--- a/app-forensics/afflib/files/afflib-3.6.12-pyaff-header.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Fix include location based on the include directories passed via CFLAGS.
-
---- afflib-3.6.12/pyaff/pyaff.c.orig
-+++ afflib-3.6.12/pyaff/pyaff.c
-@@ -21,7 +21,7 @@
-  ****************************************************/
- 
- #include "Python.h"
--#include "lib/afflib.h"
-+#include "afflib.h"
- 
- #include <string.h>
- #include <stdlib.h>
diff --git a/app-forensics/afflib/files/afflib-3.7.1-python-module.patch b/app-forensics/afflib/files/afflib-3.7.1-python-module.patch
deleted file mode 100644
index d89509f2f7ea..000000000000
--- a/app-forensics/afflib/files/afflib-3.7.1-python-module.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- afflib-3.7.1/pyaff/Makefile.am
-+++ afflib-3.7.1/pyaff/Makefile.am
-@@ -7,8 +7,8 @@
- pyexec_LTLIBRARIES 	= pyaff.la
- 
- pyaff_la_SOURCES	= pyaff.c
--pyaff_la_LIBADD		= ../lib/libafflib.la
-+pyaff_la_LIBADD		= @top_builddir@/lib/libafflib.la
- pyaff_la_CPPFLAGS 	= $(PYTHON_CPPFLAGS)
--pyaff_la_CFLAGS                = -fno-strict-aliasing
--pyaff_la_LDFLAGS 	= -module -avoid-version $(PYTHON_LDFLAGS)
-+pyaff_la_CFLAGS     = $(AM_CFLAGS) -shared -fno-strict-aliasing
-+pyaff_la_LDFLAGS 	= -module -avoid-version -shared $(PYTHON_LDFLAGS)
- endif
diff --git a/app-forensics/lynis/Manifest b/app-forensics/lynis/Manifest
index addef0043e3c..bc50e4144222 100644
--- a/app-forensics/lynis/Manifest
+++ b/app-forensics/lynis/Manifest
@@ -1,4 +1,4 @@
 AUX lynis.cron-new 72 BLAKE2B 1f2d683c74e9e85f142c23277f24e8c81b33e4d1691a6f171694194bd5d81a5e1473532afe2c6fca23c995d9c7bd08d18d6eed78a07661618c12e22b35e9ff81 SHA512 1cdaaee433912c2ccdec8ad7c9b88be55fe3f1d68e2fca79cc6e0e10112d465a70cfbe0a049623437f604bfc9793e0d29b709e035cbf710d4d38ba48acc5355f
-DIST lynis-2.7.0.tar.gz 276959 BLAKE2B 51f9a811f0410547c1866addd7a545a5976f5d8ab51f58b4538e1cbf93faccce7ea24e1943eb6dceda851616651619eab5f1eb88e47658e3953c60bcd0a4c0e4 SHA512 bf7fab22f762a15c2ace620731dee5a05b3c463acc7c7a4d9c2729cd5fb04639cd41faa951a9a0c99a85ed816dd531abb8f76f35d2af9ad81e6691a6f278450b
-EBUILD lynis-2.7.0.ebuild 945 BLAKE2B 582a42dca00bf4ebef46ebd1da667fe35ad394bdd2ceeeecdbcacbb2bfda9e63d98cbdfe83ee9c6b59daa3d0c10c0ef2a664b21f302123641c6b90e3af6ee810 SHA512 4550f2085e7822ce2eb0291fc9d6184bd7cb5e43ae27a8169c30c1a0e12678cf0e2e461ba5bb10a096c0eaa7195ae3db6c14a149029de0107b0fd2e020691c95
+DIST lynis-2.7.1.tar.gz 278069 BLAKE2B 0e138a4dcdb1c68373e095a134f4ef1446402ae699e7d7e6afa146d593865c2855dcf7a809b9c19b0b996722256d2d98142cc1adc9c6f08d15e79aa842d3f643 SHA512 4ad1d9b79bbb7e74f3b171b9ee76eced1bb7812c560df4ac5a8445d4a6a5a0a46d9fc3fa7969509ba54d6658c466809f3286a59c91be69e40f03e7fd5902917b
+EBUILD lynis-2.7.1.ebuild 945 BLAKE2B 4c0a17b4a85bcbf375c6ec0c7dc7b38e2431529aa4e1faa96bd4efd2d6f1876f4f2b93545d2b0264ed6241f90507e286c8fbbb4e2542609dc19fa3cf89c9ac50 SHA512 dbb5cfde02f4904b44acbf5f0e59042371d65162ba44bdc30bddd50222ca4e51f9c2c638802c659303a9ddf6bebb76c24622ac856673afe74b8bff50da0b4b9d
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-forensics/lynis/lynis-2.7.0.ebuild b/app-forensics/lynis/lynis-2.7.1.ebuild
index df4bdf19881b..1701f39cc6f0 100644
--- a/app-forensics/lynis/lynis-2.7.0.ebuild
+++ b/app-forensics/lynis/lynis-2.7.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"