Fixed automagic dependency on libcddb, bug #272788.

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

4 files changed, 104 insertions, 3 deletions

diff --git a/dev-libs/libcdio/ChangeLog b/dev-libs/libcdio/ChangeLog
index 4d8dbb942323..059d51efb50d 100644
--- a/dev-libs/libcdio/ChangeLog
+++ b/dev-libs/libcdio/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/libcdio
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libcdio/ChangeLog,v 1.108 2008/11/27 18:49:00 jer Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libcdio/ChangeLog,v 1.109 2009/08/28 17:51:10 pva Exp $
+
+*libcdio-0.80-r1 (28 Aug 2009)
+
+  28 Aug 2009; Peter Volkov <pva@gentoo.org> +libcdio-0.80-r1.ebuild,
+  +files/libcdio-0.80-automagic-cddb.patch:
+  Fixed automagic dependency on libcddb, bug #272788.
 
   27 Nov 2008; Jeroen Roovers <jer@gentoo.org> libcdio-0.80.ebuild:
   Stable for HPPA (bug #245252).
diff --git a/dev-libs/libcdio/Manifest b/dev-libs/libcdio/Manifest
index 88fccef6c016..5e17ec6428c8 100644
--- a/dev-libs/libcdio/Manifest
+++ b/dev-libs/libcdio/Manifest
@@ -1,7 +1,9 @@
+AUX libcdio-0.80-automagic-cddb.patch 562 RMD160 7e7b95dc2ef496f3754845b40ef170eaaa957e20 SHA1 08de102b5b65d169553a3ec8acd98ec235e264f4 SHA256 f7e4de330ced2c516f6a6d0edab2fbcb8f23055106398b6e4881965ca0dd637d
 AUX libcdio-0.80-fbsd.patch 441 RMD160 785e15161d62aaeac2fc83170426be02ec9e9d03 SHA1 b4b162e040e47d6a894c93dd6e8bbce58f68b996 SHA256 31d35d13067522cc6c1c1d6e36c0814da0527fd7d17121651919d242630c2aa2
 AUX libcdio-0.80-fix-pkgconfig.patch 552 RMD160 90c73b3177c29a7772150d72103d16ee84bfe452 SHA1 37a2f9779c19850487d807a67f9a062e254c0ee0 SHA256 c0264ea0392f705580fa852cc45fbe0bf0ef79a01beb05ff84f9376743e3a49e
 AUX libcdio-0.80-minimal.patch 2897 RMD160 2e2f9fc0dc26123de0048245fe7790c40cdd1cf0 SHA1 b60c9d83f112a88e458d04fbf4d73f36db1a411b SHA256 f5d5210bfacb7340292324470d8295fdcd5c865aef715fe427aa70f57dc51eaa
 DIST libcdio-0.80.tar.gz 2083287 RMD160 3ca404bffb107ad950505b8ccd9e659e306545cb SHA1 40c1558a65a9eca2b693d1951ed2664efbe7d1ed SHA256 b1a41a34db5a034649109c3328782e4e2fa438b1e2bddc458cd260f60ef7ca66
+EBUILD libcdio-0.80-r1.ebuild 2221 RMD160 6373938e31ba7aefa64524557015b84ff34b6cfd SHA1 39b9381dea3fa958e25ef1c3631d1e7c340f1590 SHA256 1bb5fdfb01b60919d921cc3b94a89f738e663b6bd0046573f82b34f52e18414f
 EBUILD libcdio-0.80.ebuild 2161 RMD160 87d8aefb06062b24cc5b4c1dae13b296ee6958ac SHA1 8bdd42cc6336559f679bacf57a54c613de98830f SHA256 b5cae44ece39ecf25ec1cd4b71738c211726a228720bb4f89957f19e4c663618
-MISC ChangeLog 15456 RMD160 538ca5679454c3abbb9d158a512ca17199a8d80f SHA1 292ca77ac7d5a5194dfbc1c71d5bb5ab59fef8b9 SHA256 6852c3c23ea57632c83ef83bddb4bef89fba8cefcf3b2078b471c0ac1c2b92bb
+MISC ChangeLog 15657 RMD160 9a804ce2f66f83bc00097a8ed43e7cb7a85b30fd SHA1 0690ab1983363f6d69af81f5caef56638310181f SHA256 72ab2f7e49b0f5dadc717078f6e64ffc41cbcb143616fa2ade54e75dc5d989e5
 MISC metadata.xml 485 RMD160 d5c951e8c97324677e2bbf8e49add2890a17d0ab SHA1 5aed7d7a452fb40e1a3ba6e261122df1ce9b19d8 SHA256 0e77efb669e8a30456b44de51b9640c09a4a4e19aa1d5cc9cbd952cf6a61b3a5
diff --git a/dev-libs/libcdio/files/libcdio-0.80-automagic-cddb.patch b/dev-libs/libcdio/files/libcdio-0.80-automagic-cddb.patch
new file mode 100644
index 000000000000..981ddfb246ce
--- /dev/null
+++ b/dev-libs/libcdio/files/libcdio-0.80-automagic-cddb.patch
@@ -0,0 +1,17 @@
+https://savannah.gnu.org/patch/index.php?6904
+
+--- configure.ac	2009-08-28 16:57:41 +0000
++++ configure.ac	2009-08-28 17:04:44 +0000
+@@ -582,9 +582,9 @@
+   enable_cddb=yes
+   AC_ARG_ENABLE(cddb,
+ 	[  --enable-cddb           include CDDB lookups in cd_info (default enabled)],	
+-	enable_cddb=yes, enable_cddb=no)
++	[], enable_cddb=check)
+ fi
+-if test x$enable_cddb != "no" ; then
++if test x$enable_cddb != x"no" ; then
+    PKG_CHECK_MODULES(CDDB, libcddb >= 1.0.1, [
+     HAVE_CDDB=yes 
+     AC_DEFINE(HAVE_CDDB, [], [Define this if you have libcddb installed])
+
diff --git a/dev-libs/libcdio/libcdio-0.80-r1.ebuild b/dev-libs/libcdio/libcdio-0.80-r1.ebuild
new file mode 100644
index 000000000000..90501d94f05e
--- /dev/null
+++ b/dev-libs/libcdio/libcdio-0.80-r1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libcdio/libcdio-0.80-r1.ebuild,v 1.1 2009/08/28 17:51:10 pva Exp $
+
+EAPI=1
+
+inherit eutils libtool multilib autotools
+
+DESCRIPTION="A library to encapsulate CD-ROM reading and control"
+HOMEPAGE="http://www.gnu.org/software/libcdio/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="cddb minimal +cxx"
+
+RDEPEND="cddb? ( >=media-libs/libcddb-1.0.1 )
+	virtual/libintl"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	dev-util/pkgconfig"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${P}-minimal.patch
+	epatch "${FILESDIR}"/${P}-fix-pkgconfig.patch
+	epatch "${FILESDIR}"/${P}-fbsd.patch
+	epatch "${FILESDIR}"/${P}-automagic-cddb.patch
+
+	sed -i -e 's:noinst_PROGRAMS:EXTRA_PROGRAMS:' test/Makefile.am \
+		|| die "unable to remove testdefault build"
+
+	# Fix building against libiconv
+	sed -i -e 's:@LIBICONV@:$(LTLIBICONV):' lib/driver/Makefile.am \
+		|| die "unable to fix libiconv link - part 1"
+
+	find . -name Makefile.am -print0 | xargs -0 \
+		sed -i -e 's:$(LIBICONV):$(LTLIBICONV):' \
+		|| die "unable to fix libiconv link - part 2"
+
+	eautomake
+	elibtoolize
+}
+
+src_compile() {
+	econf \
+		$(use_enable cddb) \
+		$(use_with !minimal cd-drive) \
+		$(use_with !minimal cd-info) \
+		$(use_with !minimal cd-paranoia) \
+		$(use_with !minimal cdda-player) \
+		$(use_with !minimal cd-read) \
+		$(use_with !minimal iso-info) \
+		$(use_with !minimal iso-read) \
+		$(use_enable cxx) \
+		--disable-example-progs --disable-cpp-progs \
+		--with-cd-paranoia-name=libcdio-paranoia \
+		--disable-vcd-info \
+		--disable-dependency-tracking \
+		--disable-maintainer-mode || die "configure failed"
+	emake || die "make failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+	dodoc AUTHORS ChangeLog NEWS README THANKS
+}
+
+pkg_postinst() {
+	ewarn "If you've upgraded from a previous version of ${PN}, you may need to re-emerge"
+	ewarn "packages that linked against ${PN} (vlc, vcdimager and more) by running:"
+	ewarn "\trevdep-rebuild"
+}