gentoo resync : 03.03.2019

3 files changed, 2 insertions, 35 deletions

diff --git a/media-libs/libcdaudio/Manifest b/media-libs/libcdaudio/Manifest
index f89d3f2433f4..4c48f9d603a1 100644
--- a/media-libs/libcdaudio/Manifest
+++ b/media-libs/libcdaudio/Manifest
@@ -1,6 +1,5 @@
 AUX libcdaudio-0.99-CAN-2005-0706.patch 457 BLAKE2B d1bf9fdd84e8fd66e4e66383c69a251a71d134f36365125879384bc638a4f7ae19308041658f98e27570b7e5255f945a504f520401fed44ceceb581f31abd335 SHA512 75c95893f64bb599e00ef96c303b8daad1e8d02f017deb428eb934fa1716f6736a3388e11ff5474103b1b5afafb89aff5e0ed038c8c93e90f5be0f97585c3ebb
 AUX libcdaudio-0.99.12-bug245649.patch 307 BLAKE2B 690a57ec23e24040b590b93cbff6d443f8d34a273fdb63b9aa0487cc2d3b787c6ca06294641cde3dc669dd26bf4eeda70c8e979b0400cb63793c40d59f49b3ef SHA512 693a43f3c09fa09425f06103cf2d52fbc2351fee1d37948f725103768f7f063384339e518a81be10e71d0e275582daecf5ec64aa12f12f72f370e46e4437bf33
 DIST libcdaudio-0.99.12.tar.gz 357150 BLAKE2B 406dcdeb801237e9aa88934bd7ca39bad0b121641de198b65a4137ff1d25500954f12f7f86b78912098a7acda3afb188a5965b69e99ccb0a84441b3bf1931327 SHA512 c00fbea7776e847da93bfbf4cbe74ccb3ee826da80e74eef84575fc211729e6a09599f5bfa332c91d678a31f9de5e5b333bdafe51438f266f6dea519652f5247
-EBUILD libcdaudio-0.99.12-r1.ebuild 731 BLAKE2B aef7f96f1d14a2bbf52c08f8021465a8b0853bf966ceb93302d3e3db714c11b8240b5f626b9c70563985401eb8d89c963164ce333533ff8cb003a72d8f5b7c93 SHA512 31e1a6c552b11db011297bf2da756996551beca58d117383241abc96ad6bf68d0f4390a5f2b6ea7477e4979133723634261d0a9b9fa488138921f043b4902e2b
-EBUILD libcdaudio-0.99.12-r2.ebuild 514 BLAKE2B db7dca1e534517d6cd0218a4a863b8e4ccbc439dee74c02a83e8f46bc726bef1914bf0c3168c5ea1d09b84511163372dc029e9b70cf085685e101a49c66c8300 SHA512 be3c0974d481f6d29eb3294e2766c9556bb80e740effcf7652295d4e266f09fad21691b5122989bf5895661b7c9ec99c2c11cc93461829535c8d6807c2a84e7b
+EBUILD libcdaudio-0.99.12-r2.ebuild 511 BLAKE2B be0b612e4c142ed8633b93657d486f7f9c0d17ca9a9e9913c574c149e540ad146974fe40b9a5c65e70d8c5b0e08765632d9c22765e0b637a9e5066145addfc24 SHA512 e8800ced8ce04609d86077dcd330c5eabab5952059f6f726f131c5be7df5491eee2017dc581ceebec5f3227bb5f24c806003f7b8f2ac399452bee59782e71715
 MISC metadata.xml 333 BLAKE2B f6d68462d464a5a381a3a09aa96646ecc510b0e0ddf855588b94ca2662caa4bf17112d57741d5e4b013b43ea621d856bc000c62477cc9c3273f23a6ffe2de7e8 SHA512 5ac86238b0db4069b133127f007fec468f87847cb219dc0c5dab8df5544a5e515057b4c44f44dfa843b5b81a62141a21352dec9e9a0fec98c300e9e9509cd034
diff --git a/media-libs/libcdaudio/libcdaudio-0.99.12-r1.ebuild b/media-libs/libcdaudio/libcdaudio-0.99.12-r1.ebuild
deleted file mode 100644
index eaf457e26e67..000000000000
--- a/media-libs/libcdaudio/libcdaudio-0.99.12-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils
-
-DESCRIPTION="Library of cd audio related routines"
-HOMEPAGE="http://libcdaudio.sourceforge.net/"
-SRC_URI="mirror://sourceforge/libcdaudio/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-0.99-CAN-2005-0706.patch #84936
-	epatch "${FILESDIR}"/${P}-bug245649.patch
-}
-
-src_compile() {
-	econf --enable-threads
-	emake || die "compile problem."
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS ChangeLog NEWS README TODO
-}
diff --git a/media-libs/libcdaudio/libcdaudio-0.99.12-r2.ebuild b/media-libs/libcdaudio/libcdaudio-0.99.12-r2.ebuild
index 5b1ff3330177..3938962357aa 100644
--- a/media-libs/libcdaudio/libcdaudio-0.99.12-r2.ebuild
+++ b/media-libs/libcdaudio/libcdaudio-0.99.12-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/libcdaudio/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE=""
 
 PATCHES=(