gentoo resync : 18.11.2019

3 files changed, 2 insertions, 51 deletions

diff --git a/media-libs/libcddb/Manifest b/media-libs/libcddb/Manifest
index e9c5c0579d91..f192dda21a3c 100644
--- a/media-libs/libcddb/Manifest
+++ b/media-libs/libcddb/Manifest
@@ -1,4 +1,3 @@
 DIST libcddb-1.3.2.tar.bz2 352909 BLAKE2B 8386ea051f23004396d53ad228a595d13c8c194361223026e901ff859f8e3d2dadb93d5e779902ec4698c164a3e06073fc82f331b22b4cf42f5ab8b1fae562e6 SHA512 0e07e7d37f2013164d75b530a5528f54847271fd20f3b7bedb192a05d1f61dcf006d10dc2927efe155a01eddcc57b940bc31d8ac88d5dfc4f1a09771caa84e0a
-EBUILD libcddb-1.3.2-r1.ebuild 1002 BLAKE2B f2bf9fa4de5013a4e1b786a067a8153a7138972b8cd65c97dc5d2d5973fcef1ab13ab3ba225370193c3aa19187d0928614f3d4391d9a47267b3bc482a0fee92b SHA512 257e242be6114d23bcb9c79b141b061568e92cbba4981600b8a34ef5596c3dbdfa31dbd311eacead50dd6d234639e3a35a43da82399af13d454380bee4808803
-EBUILD libcddb-1.3.2.ebuild 897 BLAKE2B b52827bf7e7d17d1739dcd75e51425eb6d677952d732cc6f2d0df8a46ee066ab03275049d4f3ffd56c0abff4d0b1905f55dabe0d0c456cee4306e056db1d3fbe SHA512 158bbc39b511755f48ddc86b4b113e288f1bb311c6746103d61291dbf10c48f598d374bcc0563c2dda629b1eb28494bfe301ccd208589dab1d8d528ef5403e4e
+EBUILD libcddb-1.3.2-r1.ebuild 1001 BLAKE2B 3f5e269a29b9946f3207227a9675f00003843318794375754f190235231254179e808515472a199533a065117e184bd892a5c916bcb64f0ab25eff4e28c9faf5 SHA512 b4592244edde2f59bf22d16a0dc73d95f2a6cc351c524086be8187dbe05dbe278121722e52def70cb8415866253ceba10b953b1e06cfa34f3b5a0b233d0d5367
 MISC metadata.xml 330 BLAKE2B 5a8314f4fd530d9866bfc3d9bf50a83e247705353cd3744b9bca49627e30bd683565e2abdbbdd9d04c062aa4ddc16f26deb06d4d4887b237d6fdb42142332c8e SHA512 db4acf96ddc4640b5e328063fc76160a6294aa850569c4466fa741ee0e223f9a325f563701d0d096b8a639c5ab0af1040aa2bea431981808e58bd1c2482c2b34
diff --git a/media-libs/libcddb/libcddb-1.3.2-r1.ebuild b/media-libs/libcddb/libcddb-1.3.2-r1.ebuild
index 80b267d6b131..1a025cc75571 100644
--- a/media-libs/libcddb/libcddb-1.3.2-r1.ebuild
+++ b/media-libs/libcddb/libcddb-1.3.2-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="doc static-libs"
 
 RDEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]"
diff --git a/media-libs/libcddb/libcddb-1.3.2.ebuild b/media-libs/libcddb/libcddb-1.3.2.ebuild
deleted file mode 100644
index daba49a4839e..000000000000
--- a/media-libs/libcddb/libcddb-1.3.2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit libtool
-
-DESCRIPTION="A library for accessing a CDDB server"
-HOMEPAGE="http://libcddb.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="doc static-libs"
-
-RDEPEND="virtual/libiconv"
-DEPEND="doc? ( app-doc/doxygen )"
-
-RESTRICT="test"
-
-DOCS="AUTHORS ChangeLog NEWS README THANKS TODO"
-
-src_prepare() {
-	elibtoolize # Sanitizing .so version for FreeBSD
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		--without-cdio
-}
-
-src_compile() {
-	default
-
-	if use doc; then
-		cd doc
-		doxygen doxygen.conf || die
-	fi
-}
-
-src_install() {
-	default
-
-	rm -f "${ED}"/usr/lib*/libcddb.la
-
-	use doc && dohtml doc/html/*
-}