8 files changed, 6 insertions, 199 deletions
diff --git a/app-forensics/Manifest.gz b/app-forensics/Manifest.gz
index 697fc6973d49..8fe54943c433 100644
--- a/app-forensics/Manifest.gz
+++ b/app-forensics/Manifest.gz
diff --git a/app-forensics/aide/Manifest b/app-forensics/aide/Manifest
index f96b89b338f4..e4dd90e5da59 100644
--- a/app-forensics/aide/Manifest
+++ b/app-forensics/aide/Manifest
@@ -7,5 +7,4 @@ AUX aide.cron 5997 BLAKE2B 2273eb902b9ba8fc5e999375d0dfa59e2c5c56a919bf3bd06e7b6
 AUX aideinit 2949 BLAKE2B 244aaec9a38f19c6a7af706572a896e922215d6321aee4537ef5ce47326f41fd84880331a86ec71dcf7ee4e2ac2a11bf979ce66eff73dd2e8a2072e9eb7e8aab SHA512 a6bce52432251458b977fb363d5801206c273fb9404c55f7bcb82b9d5a65aa19d1660d61d457c9af87f1a8fada95e2f8203489b1876b2b2a259e6374e15cdc57
 DIST aide-0.16.tar.gz 391009 BLAKE2B 8769d8c6bdf72f307b75f3c1feaa2effdeaead00a0c65ab25bbb50dc6f7c7b53fda4d0a3a54dd5030de1444a34a81c294437d45193aeb8aec7ef0af83a173d47 SHA512 29ad97756e3e2fb21dc332ed03b494a1c73e621266f8622ec80bdba23092a38ee975b97f3cff2330e4c16e64e2f672259eea9291ca706a4009e7399b4e14e6a7
 EBUILD aide-0.16-r1.ebuild 3710 BLAKE2B 0be0b1ecc9c7bec42d475c2ccdf79b942572777af15addd5a524affd8dfd329f21ecb2b7fa18238270a9c67cf520127496056f6a7c3dba2682ca064024e3d8af SHA512 5acfa1daa419af465a3c1f2f305f4edddf38e095d18849565d7a41ba55a98c40d3f86bdf6888d48c9f05fd2d71a27086a3577bd78e9ef80947cfb0ebccc11b04
-EBUILD aide-0.16.ebuild 3664 BLAKE2B 1b936c5f6d0ea438f407b9f15d36d75430a8c8189af48980ce45fd1507e2556c7d30d6ba48cb95effe7d2f35c64ac7d353a91380d3077fa9fa2af6137c6c5fab SHA512 703646999c5c5d4826bb71da4ba0c1f60d6877b3a58d024396b1c2795b9cabf1c537a47b6c0492350f136785684e2e848d37ed087087ee4042b9ec8c9f00c552
 MISC metadata.xml 631 BLAKE2B f76bc4d2957df7f95c38c3e082ee8b2d211d4822ac7223ba5cb10d35a72e14f092d4ad455a6a96da2a1649e1c2b1f0736c9a58fa18216c3b1b87ba295fbacf51 SHA512 9f6eb547a55e72d2b75d3145282127abfdc737c68526995e628b98f2dd7930732eff9dbc492ddd4425e4090e8449a89c585b563618415d05dee6777273c5d4f6
diff --git a/app-forensics/aide/aide-0.16.ebuild b/app-forensics/aide/aide-0.16.ebuild
deleted file mode 100644
index cebc5fea7321..000000000000
--- a/app-forensics/aide/aide-0.16.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools readme.gentoo-r1
-
-DESCRIPTION="AIDE (Advanced Intrusion Detection Environment) is a file integrity checker"
-HOMEPAGE="http://aide.sourceforge.net/"
-SRC_URI="mirror://sourceforge/aide/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="acl audit curl e2fs mhash postgres prelink selinux static xattr zlib"
-
-COMMON_DEPEND="
-	!mhash? (
-		dev-libs/libgcrypt:0=
-		dev-libs/libgpg-error
-	)
-	mhash? ( app-crypt/mhash )
-	dev-libs/libpcre
-	acl? ( virtual/acl )
-	audit? ( sys-process/audit )
-	curl? ( net-misc/curl )
-	e2fs? ( sys-fs/e2fsprogs )
-	postgres? ( dev-db/postgresql:= )
-	prelink? ( dev-libs/elfutils )
-	selinux? ( sys-libs/libselinux )
-	xattr? ( sys-apps/attr )
-	zlib? ( sys-libs/zlib )
-"
-RDEPEND="
-	!static? ( ${COMMON_DEPEND} )
-	prelink? ( sys-devel/prelink )
-	selinux? ( sec-policy/selinux-aide )
-"
-DEPEND="${COMMON_DEPEND}
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-	static? (
-		!mhash? (
-			dev-libs/libgcrypt:0[static-libs]
-			dev-libs/libgpg-error[static-libs]
-		)
-		mhash? ( app-crypt/mhash[static-libs] )
-		dev-libs/libpcre[static-libs]
-		acl? ( virtual/acl[static-libs] )
-		e2fs? ( sys-fs/e2fsprogs[static-libs] )
-		prelink? ( dev-libs/elfutils[static-libs] )
-		selinux? ( sys-libs/libselinux[static-libs] )
-		xattr? ( sys-apps/attr[static-libs] )
-		zlib? ( sys-libs/zlib[static-libs] )
-	)
-"
-
-REQUIRED_USE="
-	postgres? ( !mhash )
-	static? ( !audit !curl !postgres )
-"
-
-HTML_DOCS=( doc/manual.html )
-
-DISABLE_AUTOFORMATTING=1
-DOC_CONTENTS="
-Example configuration file was installed at '${EPREFIX}/etc/aide/aide.conf'.
-Please edit it to meet your needs. Refer to aide.conf(5) manual page
-for more information.
-
-A helper script, aideinit, was installed and can be used to make AIDE
-management easier. Please run 'aideinit --help' for more information.
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-add-missing-include.patch"
-	"${FILESDIR}/${P}-fix-LIBS-LDFLAGS-mixing.patch"
-	"${FILESDIR}/${P}-fix-acl-configure-option.patch"
-)
-
-src_prepare() {
-	default_src_prepare
-	sed -i -e 's| -Werror||g' configure.ac || die
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--sysconfdir="${EPREFIX}/etc/${PN}"
-		--with-confighmactype="sha512"		# Override default weak MD5 hash.
-		--with-dbhmackey="sha512"			# Override default weak MD5 hash.
-		# Disable broken l10n support: https://sourceforge.net/p/aide/bugs/98/
-		# This doesn't affect anything because there are no localizations yet.
-		--without-locale
-		$(use_enable static)
-		$(use_with zlib)
-		$(use_with curl)
-		$(use_with acl posix-acl)
-		$(use_with selinux)
-		$(use_with prelink prelink "${EPREFIX}/usr/sbin/prelink")
-		$(use_with xattr)
-		$(use_with e2fs e2fsattrs)
-		$(use_with mhash mhash)
-		$(use_with !mhash gcrypt)
-		$(use_with postgres psql)
-		$(use_with audit)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default_src_install
-	readme.gentoo_create_doc
-
-	insinto /etc/${PN}
-	doins "${FILESDIR}"/aide.conf
-
-	dosbin "${FILESDIR}"/aideinit
-	dodoc "${FILESDIR}"/aide.cron
-
-	keepdir /var/{lib,log}/${PN}
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	if use postgres; then
-		elog
-		elog "Due to a bad assumption by aide, you must issue the following"
-		elog "command after the database initialization (aide --init ...):"
-		elog
-		elog 'psql -c "update pg_index set indisunique=false from pg_class \\ '
-		elog "  where pg_class.relname='TABLE_pkey' and \ "
-		elog '  pg_class.oid=pg_index.indexrelid" -h HOSTNAME -p PORT DBASE USER'
-		elog
-		elog "where TABLE, HOSTNAME, PORT, DBASE, and USER are the same as"
-		elog "in your aide.conf."
-		elog
-	fi
-}
diff --git a/app-forensics/air/Manifest b/app-forensics/air/Manifest
index aa92d69d11db..9931c382f351 100644
--- a/app-forensics/air/Manifest
+++ b/app-forensics/air/Manifest
@@ -1,4 +1,3 @@
 DIST air-2.0.0.tar.gz 82881 BLAKE2B 7cca062635243573cc8c64447e9230c463148edaac229eab9fe3b952c6a318515c159832392238716afd3ed5b1c14d53e785c8d04b6aad0bf7b2f09c0209712b SHA512 3b22b0b2f07fd5bf89b576bb1d96d9bc372534f2063e99c7a9c4931fd927b0cc5c3fe832f0c0d51ceb95fe242fd0d3e4fe6bf59339dd2971b6afcd00106ea92c
-EBUILD air-2.0.0-r1.ebuild 1412 BLAKE2B 5d9f45fdc25854dd554a969e8efd9b521abd75393518e751d359f51ede9a8f676575cf97ea5515855735abb5fd7d5363b6a567a9ee830040e32c28d1cee353fd SHA512 ebdf9d91b8dfcc1f729c972670e75a070bfd8c1ac1b130603a2a6e0f0085142162729110b8afc24101ad1dffe23c529654b148c868130508bda528cc6a3a8d08
-EBUILD air-2.0.0-r2.ebuild 1328 BLAKE2B 022a996a95e5b001d10bfcc720fb440780183888375c3c213fa1fd05e3590258b2568c126d9367a496c03dc5bf657bfb53507ef4a6df227f54dcd4bb566c6e48 SHA512 26b07ac2d080a61bed07cdfc2107ac45c8192ddc480f3979a32e4ef70f701feb3972dab2e48ab198d8250cf562ec570672eb3f8b85f3f4d377244043e8230af6
+EBUILD air-2.0.0-r2.ebuild 1325 BLAKE2B d9d946e0bdb9415a35fd6699748562c65b7dc4969b881dbcdec04a5a70b4a38f33fa0cee39c200c49242b679e828e9646cdab74d718890dec2ddf74450f44fcf SHA512 2268444a384c5cc809c04f2f882129342ace23dd8570fdc7525c98deab33851744091393761f46b60ce71b8c367cf0bd7d97de85c67ba554b485be87358221b1
 MISC metadata.xml 247 BLAKE2B ca1c62f16bb2f465ec5f5221d01dca02cde36f41c1c88f947c4b7b62428dcfb2ae7802241087537df0adba6fdef1fa9caf8d9d07f5328cd1ef5c9ea44fffb120 SHA512 0600ce65cfd7da1e2c9a816788c17df8761eda2ebc979d32a6ea5959eff6e8abed700c4e0e73debbce1af3603a521a106f0fa0e6d159baba27d23deb9412161d
diff --git a/app-forensics/air/air-2.0.0-r1.ebuild b/app-forensics/air/air-2.0.0-r1.ebuild
deleted file mode 100644
index 6e26ed7c1ab4..000000000000
--- a/app-forensics/air/air-2.0.0-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-DESCRIPTION="A GUI front-end to dd/dc3dd"
-HOMEPAGE="http://air-imager.sourceforge.net/"
-SRC_URI="mirror://sourceforge/air-imager/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="crypt"
-
-# coreutils are needed for /usr/bin/split binary
-COMMON_DEPEND="userland_GNU? ( sys-apps/coreutils )"
-
-DEPEND="${COMMON_DEPEND}
-	>=dev-perl/Tk-804.27.0
-	userland_GNU? ( app-arch/sharutils )"
-
-# TODO: air can utilize dc3dd, but it is not in portage ATM
-RDEPEND="${COMMON_DEPEND}
-	app-arch/mt-st
-	net-analyzer/netcat
-	crypt? ( net-analyzer/cryptcat )"
-
-src_install() {
-	export PERLTK_VER=`perl -e 'use Tk;print "$Tk::VERSION";'`
-
-	env INTERACTIVE=no INSTALL_DIR="${D}/usr" TEMP_DIR="${T}" \
-		FINAL_INSTALL_DIR=/usr \
-		./install-${P} \
-		|| die "failed to install - please attach ${T}/air-install.log to a bug report at https://bugs.gentoo.org"
-
-	dodoc README
-
-	dodoc "${T}/air-install.log"
-
-	fowners root:users /usr/share/air/logs
-	fperms ug+rwx /usr/share/air/logs
-	fperms a+x /usr/bin/air
-
-	mkfifo "${D}usr/share/air/air-fifo" || die "pipe creation failed"
-	fperms ug+rw /usr/share/air/air-fifo
-	fowners root:users /usr/share/air/air-fifo
-}
-
-pkg_postinst() {
-	elog "The author, steve@unixgurus.com, would appreciate an email of the install file /usr/share/doc/${PF}/air-install.log"
-}
diff --git a/app-forensics/air/air-2.0.0-r2.ebuild b/app-forensics/air/air-2.0.0-r2.ebuild
index 733bedeb8e4d..72e09def0d41 100644
--- a/app-forensics/air/air-2.0.0-r2.ebuild
+++ b/app-forensics/air/air-2.0.0-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/air-imager/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="crypt"
 
 # coreutils are needed for /usr/bin/split binary
diff --git a/app-forensics/mac-robber/Manifest b/app-forensics/mac-robber/Manifest
index c55d2c399eb7..62c6e2319a4d 100644
--- a/app-forensics/mac-robber/Manifest
+++ b/app-forensics/mac-robber/Manifest
@@ -1,3 +1,3 @@
 DIST mac-robber-1.02.tar.gz 11708 BLAKE2B d6d35be3c52b5bc93eb779ca3693c4213c57dcb4ecfb24912e92f47b3f896d948c8ccadef39f49af3c455cdff3a92adbca7e3d1e35ef0ebc885034bfa3c0743b SHA512 5330f766eb08aa766ca3f430684e0a40ecf29b7230a582c30a36bbaaa481d52c2a8519fa04e82762f09259ada9e77466c1430aebdff22615a511d519916d54a7
-EBUILD mac-robber-1.02.ebuild 603 BLAKE2B fcdbb3443609fcdd956706ab7d0da172bbecdde61957d7978917382712812cacc80a96a0b7bf316f62a8beefe5b1171981e706a7aaa4b24275d7aff2dc89e967 SHA512 4f75912d8df1d080cd1aa2b48f85b440709e80681223ea67dcd49b5112f6bad8fbaa128094f5f314b7232679e782c94126a807f6578f617fca486ea07141ee3b
+EBUILD mac-robber-1.02.ebuild 612 BLAKE2B 2e24716d4da4657367314593b8293916b63db195e968bc772e3249b6235b5b1d3deac0db616b88a6f72cd29855ed803262839f3469142088378f5a268089aaf7 SHA512 e9a37e85ec1036237297036b789e4fe35f6c6b047b04a42704ccc2f87a6b00713d15bcfb4626027f007b69eda74976759600356d81588da62755d04416b09c08
 MISC metadata.xml 1423 BLAKE2B d0058ce512ae8c56122195868b0e3c921135a3335962263bf8f144d630a525f7efaaf24d4cdd9f23166ccb0bf0ecacd41d89ec32ee8a35ccb909561e789713de SHA512 3af947bce0415529c1e0af7d8362db0a7ab53d685294c6dba69868acdf920b8199a19dbd0a9272c12bd97e6aaac1da78a5a537064793859858727286e8270dfb
diff --git a/app-forensics/mac-robber/mac-robber-1.02.ebuild b/app-forensics/mac-robber/mac-robber-1.02.ebuild
index 90645ef09d5d..b8497f78d985 100644
--- a/app-forensics/mac-robber/mac-robber-1.02.ebuild
+++ b/app-forensics/mac-robber/mac-robber-1.02.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=6
 
 inherit toolchain-funcs
 
@@ -15,6 +15,7 @@ KEYWORDS="~amd64 ~ppc x86"
 IUSE=""
 
 src_prepare() {
+	default
 	sed -i -e 's:$(GCC_CFLAGS):\0 $(LDFLAGS):' Makefile || die
 }