gentoo resync : 30.06.2018

3 files changed, 2 insertions, 36 deletions

diff --git a/media-libs/aften/Manifest b/media-libs/aften/Manifest
index 184d0280df6a..0a97d137f8a3 100644
--- a/media-libs/aften/Manifest
+++ b/media-libs/aften/Manifest
@@ -2,6 +2,5 @@ AUX aften-0.0.8-multilib.patch 576 BLAKE2B c049de0a7f99ec04a7edfff591ab320c61ad7
 AUX aften-0.0.8-no-static-aften.patch 684 BLAKE2B c0df8086a8b73d155ec3175767cee9c32ba9f835b0307e880dc985602ee901b43a5bd9458a288380ef0d99981f62092d7eb9758ee52281a4250f3e5bb9d24a57 SHA512 cfd2b151a031b64cb3f09b0bfa514e220fade4372dbe37bccbb58a158053ec25715617ffbcd5fd3b5e0a348488f28d13711db5a18bd62fc67058dbee540a36a5
 AUX aften-0.0.8-ppc.patch 4066 BLAKE2B 27285a58026f95b2974f8ceb09dfeaf38d53c019c19e96ef8e8da42a7a368432a59bde54b3b72bf80202da7ce7c3f3faa279b5b5801bca7a1237c269cf7d05e3 SHA512 5022529320ae0cefbbd4124c37bdf3d2451c4733b41007f77cfcb5a26ae32ca159716ce4782b6e75767309a2057c839e467e966c8d9ad159d074c53ffdaf4ef5
 DIST aften-0.0.8.tar.bz2 80865 BLAKE2B 8746ba1f061255a6ec79a1253aede9aca8fa9bbdcb3bcc38636a99ec2f83f882cb713183483143ba0dc3852bff821d00a9029e0812b67e67540b303fb67b26b7 SHA512 1261297eac5065c6f028618d3e15e9b152ac35440c74cfb09d98cd99a90fb1c6a49585f70928834c3f6ddbcdd1d8721f7329d24f57cd30901dff09bbc0d419e3
-EBUILD aften-0.0.8-r2.ebuild 751 BLAKE2B 5c89d01269c80fb77ecbab3be72cd7e849c7a24244fb46fe4e31c575f732e837e6f413851f875ee04275dc9251b8ff48ed0dc78cbdde174b8a16c1d6011387b3 SHA512 80cfb35bd2ffd6d0622c247f654b82f9d55a6671bc8adf839d15e38224a8d907a01f4aaf9fd4355031a9401909ae6b82dd5c039896dea88bddc214fbea7d7169
-EBUILD aften-0.0.8.ebuild 739 BLAKE2B 1bd159a956fcd25e4515a3b27775bb83b05b42e1a123fe86df4c8ce72adbbadde85c07f2c5945eb3289a51037b71d66e41025fe1dd1146cfc907a48c671e96d5 SHA512 002b86d193810c8696a3fd17e6f883201503d26f49fe2daa89abaadbc20f76a4968560eee07997490cbda2887c8794569b729c3ec50f2c025e2bd989a589f7c7
+EBUILD aften-0.0.8-r2.ebuild 750 BLAKE2B 3cb48a36e12fb93ceb703bb225b88f73c5af88f96b893a2e1a26aa73fcaae96317ef8ca592d44895f86dcb7124aeda449f9c4bfc60a81c50ff7ee11bd3d96f28 SHA512 c3bff1006d7132bc268207027aedbeaca420c3ddbd70a7c0108f3e8f37f63234e936f8b92f901e7840130860f3fae8412626f5fecd53e3db008d2b83f4593b11
 MISC metadata.xml 602 BLAKE2B 87b43f5a24944d2583cc0b10dbb51babab9de77027aa6f19460e7a217e5370c7f8343610df5ada3f21827f267c2a1b84bb720afcb1221112fd112ff944001467 SHA512 6b78ecfd5eefe1ce29c875db4d487ed23fda5faf9a1bc97b75d6de9afad30be6aceffabd3031bf35badbfb8cabdb4bfa24fb2c7a3905d7a68b9ef9bc0bf0d458
diff --git a/media-libs/aften/aften-0.0.8-r2.ebuild b/media-libs/aften/aften-0.0.8-r2.ebuild
index a52cda27855c..cb3a41a38299 100644
--- a/media-libs/aften/aften-0.0.8-r2.ebuild
+++ b/media-libs/aften/aften-0.0.8-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1 BSD"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="cxx"
 
 PATCHES=(
diff --git a/media-libs/aften/aften-0.0.8.ebuild b/media-libs/aften/aften-0.0.8.ebuild
deleted file mode 100644
index 1b01dc33c91f..000000000000
--- a/media-libs/aften/aften-0.0.8.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils
-
-DESCRIPTION="An A/52 (AC-3) audio encoder"
-HOMEPAGE="http://aften.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1 BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="cxx"
-
-PATCHES=(
-	"${FILESDIR}/${P}-multilib.patch"
-	"${FILESDIR}/${P}-ppc.patch"
-)
-
-src_configure() {
-	local mycmakeargs="-DSHARED=1"
-	use cxx && mycmakeargs+=" -DBINDINGS_CXX=1"
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	dodoc README Changelog
-	# File collision with media-sound/wavbreaker, upstream informed
-	mv "${D}/usr/bin/wavinfo" "${D}/usr/bin/wavinfo-aften" || die
-}