gentoo resync : 20.05.2018

3 files changed, 2 insertions, 54 deletions

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