USE="static-libs" and punt useless libcddb.la libtool archive in favour of libcddb.pc pkg-config file wrt #385127 by "Hans"

Package-Manager: portage-2.2.0_alpha89/cvs/Linux x86_64

3 files changed, 32 insertions, 22 deletions

diff --git a/media-libs/libcddb/ChangeLog b/media-libs/libcddb/ChangeLog
index 3971c3b7912c..7c7d5a6ff06b 100644
--- a/media-libs/libcddb/ChangeLog
+++ b/media-libs/libcddb/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/libcddb
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libcddb/ChangeLog,v 1.58 2010/01/15 09:28:07 fauli Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libcddb/ChangeLog,v 1.59 2012/03/02 09:57:30 ssuominen Exp $
+
+  02 Mar 2012; Samuli Suominen <ssuominen@gentoo.org> libcddb-1.3.2.ebuild:
+  USE="static-libs" and punt useless libcddb.la libtool archive in favour of
+  libcddb.pc pkg-config file wrt #385127 by "Hans"
 
   15 Jan 2010; Christian Faulhammer <fauli@gentoo.org> libcddb-1.3.2.ebuild:
   Transfer Prefix keywords
diff --git a/media-libs/libcddb/Manifest b/media-libs/libcddb/Manifest
index 1253a49ff1e8..24a6e588ec68 100644
--- a/media-libs/libcddb/Manifest
+++ b/media-libs/libcddb/Manifest
@@ -5,13 +5,17 @@ AUX libcddb-1.3.0-asneeded-nonglibc.patch 469 RMD160 0f3bc365e3b3cbf4578eab8a19f
 DIST libcddb-1.3.0.tar.bz2 329319 RMD160 d34588f416ba80ececb23ffcff3312fc0b699f30 SHA1 171618045dfa75075c6ced446d25e88f2c7ca88a SHA256 4e7d3aae339cf5037d972cd5f3ab23a3b643f6b05e4125430da4f22682770bf9
 DIST libcddb-1.3.2.tar.bz2 352909 RMD160 e38ed8c7dd5a9b4a5b2a1772a9e98f914872c397 SHA1 2a7855918689692ff5ca3316d078a859d51959ce SHA256 35ce0ee1741ea38def304ddfe84a958901413aa829698357f0bee5bb8f0a223b
 EBUILD libcddb-1.3.0-r1.ebuild 1076 RMD160 3ca7561cb4550d4a3b5d0c63c9e01ca1b4fb3117 SHA1 f9613ee17a07a7d1a5aca91ab07ba3be0de9c3c0 SHA256 c87b7992385240ee281f6142b2655c733e06080de00bd7e23b81fc3614e275ce
-EBUILD libcddb-1.3.2.ebuild 1138 RMD160 7d37344b18a571727bcdd091017578ad6b687725 SHA1 621087a943cf1eff298eee7bf1225878cc142684 SHA256 838f2ba747c670ea706aff4edabc244094e18bbe2b60ec7e742a2dd31fbb6d25
-MISC ChangeLog 6541 RMD160 1195f9faf4a14cb675099a595bba3ab369fa6935 SHA1 fd91130ecaa913e63540e09ed8145a4208c31e15 SHA256 1164609764d2619707ec46f5809776a1d438a4bee46355f4038b9d0b78d2bab5
+EBUILD libcddb-1.3.2.ebuild 1051 RMD160 c1f6e80f814b4c9da23746cf6c66bd90296533ec SHA1 14ed1724c468588117798335c47bc2ce6d282c22 SHA256 04ccc8f92da25a8c15ef51cc282f12214e1af1562486d35df6978c4105885be5
+MISC ChangeLog 6750 RMD160 fbd6905e372ab6ed0aba885da4c5d34cc660007a SHA1 fff5d08d7b6992174de3870d3edea736e8b4041c SHA256 71454a33419abbcda2d37da1291b6c9671dc312a8d35ba8b0e8e2844d4ccbac5
 MISC metadata.xml 159 RMD160 568344dc99ebe68c2e2d43d268d186757532144d SHA1 3f9589301dbaa4363c56de0f309cf792d8c38b63 SHA256 eb5b8cfa9aed067cd72d6439beac2dd0abdba30248f27e4b337012b493a18369
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAktQNSgACgkQNQqtfCuFnePhVACfZqTemNaJwWUgmN8jX84P2tbq
-YeAAoJCwZUnceDWxeEEVZONN63lxrBP9
-=2MTQ
+iQEcBAEBAgAGBQJPUJlcAAoJEEdUh39IaPFNIsUH/12J+GOJTfCWmWnG4fWpisoF
+Zh0pbjVIibN5oKp1I+3jCg0MpNrTVq01EM1WgHAVQ2HrcZWhMZ1Ot1OEqAsQxgv8
+peTOKsX7vfZReswge4BWzRigfNJ06OIOW3uW4KpPo8MGwze22FfyqNspb6CPQSUX
+WKp1xfH1WW9Pv834gUK11w+ckPi4z4kDYxv/ugWH9Z3tRmMSNSejb9/0k18Xnnu4
+3v++9/NoQ7V340ZdKxCOCONxQd5TFz5Yempccg4lc2l63GDfG3w8mGxlX5F3jl+p
+QV3qeTuy4KauIBteqmQkgzE9HFCBKMXHl1PtQE4M8iYwHMhu73TaApJNm4pZ3rs=
+=14y0
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libcddb/libcddb-1.3.2.ebuild b/media-libs/libcddb/libcddb-1.3.2.ebuild
index 95215a0b05c8..e3c9731e1224 100644
--- a/media-libs/libcddb/libcddb-1.3.2.ebuild
+++ b/media-libs/libcddb/libcddb-1.3.2.ebuild
@@ -1,47 +1,49 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libcddb/libcddb-1.3.2.ebuild,v 1.10 2010/01/15 09:28:07 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libcddb/libcddb-1.3.2.ebuild,v 1.11 2012/03/02 09:57:30 ssuominen Exp $
 
-EAPI=2
+EAPI=4
 inherit libtool
 
 DESCRIPTION="A library for accessing a CDDB server"
-HOMEPAGE="http://libcddb.sourceforge.net"
+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 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="doc"
+IUSE="doc static-libs"
 
 RDEPEND="virtual/libiconv"
 DEPEND="doc? ( app-doc/doxygen )"
 
 RESTRICT="test"
 
+DOCS="AUTHORS ChangeLog NEWS README THANKS TODO"
+
 src_prepare() {
-	# needed for sane .so versionning on FreeBSD
-	elibtoolize
+	elibtoolize # Sanitizing .so version for FreeBSD
 }
 
 src_configure() {
-	econf --without-cdio
+	econf \
+		$(use_enable static-libs static) \
+		--without-cdio
 }
 
 src_compile() {
-	emake || die "emake failed."
+	default
 
-	# Create API docs if needed and possible
 	if use doc; then
 		cd doc
-		doxygen doxygen.conf || die "doxygen failed"
+		doxygen doxygen.conf || die
 	fi
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
+	default
+
+	rm -f "${ED}"/usr/lib*/libcddb.la
 
-	# Create API docs if needed and possible
 	use doc && dohtml doc/html/*
 }