Fix pkg-config installation for once. Closes bug #228185.

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.25-gentoo-r4 x86_64

4 files changed, 39 insertions, 17 deletions

diff --git a/dev-libs/libcdio/ChangeLog b/dev-libs/libcdio/ChangeLog
index 01a083a56263..c5966b93a6bd 100644
--- a/dev-libs/libcdio/ChangeLog
+++ b/dev-libs/libcdio/ChangeLog
@@ -1,6 +1,10 @@
 # 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.99 2008/06/14 11:05:39 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libcdio/ChangeLog,v 1.100 2008/06/21 10:28:36 flameeyes Exp $
+
+  21 Jun 2008; Diego Pettenò <flameeyes@gentoo.org>
+  +files/libcdio-0.80-fix-pkgconfig.patch, libcdio-0.80.ebuild:
+  Fix pkg-config installation for once. Closes bug #228185.
 
   14 Jun 2008; Diego Pettenò <flameeyes@gentoo.org> ChangeLog:
   Force manifest regen (Attic/ issue).
diff --git a/dev-libs/libcdio/Manifest b/dev-libs/libcdio/Manifest
index fa529e81888e..6706c6f4330c 100644
--- a/dev-libs/libcdio/Manifest
+++ b/dev-libs/libcdio/Manifest
@@ -4,18 +4,19 @@ Hash: SHA1
 AUX libcdio-0.78.2-bug203777-ter.patch 2879 RMD160 cb0b2d1a21adcb99f81be0be0132c6add5867c57 SHA1 ef17c76887505fc38d1bd0acc0f5896e5e2b6346 SHA256 ae2635faefbdac0c01975628c3a7bd7d4bee0c4fa9d29825f988d356a10090f8
 AUX libcdio-0.78.2-bug203777.patch 1446 RMD160 ce464bbb39f0e3ee88166df8baf42e0517373ab2 SHA1 85a782e07d8b39c464ea5bec7ab425d09e73074d SHA256 357ebdc069f1a6ae186d014ba2b41dc5dc06242c7e4dd336d457c6d10740d927
 AUX libcdio-0.78.2-gcc-4.3-includes.patch 451 RMD160 eab677d9d19437f67d9cbe94a3ee4ef247b04fb4 SHA1 66449ca1e381845e7fc4c033caa5802b1175b498 SHA256 2b977e8ee7a706ae3d97c1f3d332a51f4bfa536654d4fee49703ab7a748ca434
+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.78.2.tar.gz 2024218 RMD160 4e32dd9bb4bd19b6604ce3d3c4716b6481b6956a SHA1 6a87e49cd84b9f67192d6357524772db9ae02ecc SHA256 2792e4133a89b254644ffe526c8eab785e1de3078d3a9c1ec03653247700ebde
 DIST libcdio-0.80.tar.gz 2083287 RMD160 3ca404bffb107ad950505b8ccd9e659e306545cb SHA1 40c1558a65a9eca2b693d1951ed2664efbe7d1ed SHA256 b1a41a34db5a034649109c3328782e4e2fa438b1e2bddc458cd260f60ef7ca66
 EBUILD libcdio-0.78.2-r3.ebuild 1840 RMD160 20d8a6550b464ab8f7fae5d8b020243d23721d1f SHA1 85b43776f83a9b7c3bedba92e79ff559aed64d96 SHA256 42d63c3a9d0b9a7af5f61ec0ffa73430a0408c942dc2e5355529ffc6cc45ac62
 EBUILD libcdio-0.78.2-r4.ebuild 1840 RMD160 0927d4a8d819446c0bdf8bc2f2d265842ff2edc3 SHA1 452cd4f0f296b9564d22bd7e6f7a1b0628506677 SHA256 64624d9d036b5aba15f2e2fe35e76afb23b6265c066ae6c6d36f05431d71c830
-EBUILD libcdio-0.80.ebuild 2008 RMD160 de5819b7ee7e9db11d89ca49eefbb1e06a751d5d SHA1 3fa00624264099eedf935532bc3b2af7a73d19f5 SHA256 4021b61a8c80c2614e1655ac4821038e7a2771cfba8dd7f8312786de3dafc621
-MISC ChangeLog 14219 RMD160 0d2b36f4842502d8bc34e7b34617961609c6760d SHA1 62432e6b8af5d261d41bc1a853b8ea06b636ad05 SHA256 caa877b0c6f7b54870d1fe94cae8f381ebd0bf6680d246755a4c3023fbfb1728
+EBUILD libcdio-0.80.ebuild 1849 RMD160 36c8f36e31a8e2fb1885060c6ff4d50cb208f9e2 SHA1 f77cfdd623bdf94d606e8d77c539ed366b6c991e SHA256 341f66b44a1d43cb2ea8e1e454bc01343e80a6315fd85a6f76f17fb1cb2529d6
+MISC ChangeLog 14398 RMD160 1887b865067fc1b28b7d8f856efa85087e516161 SHA1 4dc3d44036f0950e163e5d305c86747423b61c7f SHA256 e444679341cd8290cf651d0bed4f965ee047d70737dc519e6ed0f64dd8044332
 MISC metadata.xml 485 RMD160 d5c951e8c97324677e2bbf8e49add2890a17d0ab SHA1 5aed7d7a452fb40e1a3ba6e261122df1ce9b19d8 SHA256 0e77efb669e8a30456b44de51b9640c09a4a4e19aa1d5cc9cbd952cf6a61b3a5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkhTpgoACgkQAiZjviIA2XiOjQCgqB5aLeASjjCp51lTz/OneWoo
-nZcAoLMSrpMt8vvttpcw4gSmz172JCy/
-=DpEg
+iEYEARECAAYFAkhc19oACgkQAiZjviIA2Xi09wCfU3JE42JgXLCK9QAjb2GXg+kE
+GTsAn2IjSuySnhkBVidFESxwSW0vg0Mm
+=tiU2
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/libcdio/files/libcdio-0.80-fix-pkgconfig.patch b/dev-libs/libcdio/files/libcdio-0.80-fix-pkgconfig.patch
new file mode 100644
index 000000000000..e4e8226c5911
--- /dev/null
+++ b/dev-libs/libcdio/files/libcdio-0.80-fix-pkgconfig.patch
@@ -0,0 +1,23 @@
+Index: libcdio-0.80/Makefile.am
+===================================================================
+--- libcdio-0.80.orig/Makefile.am
++++ libcdio-0.80/Makefile.am
+@@ -45,12 +45,15 @@ endif
+ # pkg-config(1) related rules
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = libcdio.pc  \
+-	         libcdio++.pc  \
+ 	         libiso9660.pc \
+-	         libiso9660++.pc \
+-	         libudf.pc
++	         libudf.pc \
+ 		 $(paranoiapcs)
+ 
++if ENABLE_CPP
++pkgconfig_DATA += \
++	libcdio++.pc \
++	libiso9660++.pc
++endif
+ 
+ $(pkgconfig_DATA): config.status
+ 
diff --git a/dev-libs/libcdio/libcdio-0.80.ebuild b/dev-libs/libcdio/libcdio-0.80.ebuild
index a18631d2c514..120e7518d44c 100644
--- a/dev-libs/libcdio/libcdio-0.80.ebuild
+++ b/dev-libs/libcdio/libcdio-0.80.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libcdio/libcdio-0.80.ebuild,v 1.4 2008/06/14 11:02:00 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libcdio/libcdio-0.80.ebuild,v 1.5 2008/06/21 10:28:36 flameeyes Exp $
 
 EAPI=1
 
@@ -13,12 +13,12 @@ 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 nls +cxx"
+IUSE="cddb minimal +cxx"
 
 RDEPEND="cddb? ( >=media-libs/libcddb-1.0.1 )
-	nls? ( virtual/libintl )"
+	virtual/libintl"
 DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
+	sys-devel/gettext
 	dev-util/pkgconfig"
 
 src_unpack() {
@@ -26,6 +26,7 @@ src_unpack() {
 	cd "${S}"
 
 	epatch "${FILESDIR}"/${P}-minimal.patch
+	epatch "${FILESDIR}"/${P}-fix-pkgconfig.patch
 
 	sed -i -e 's:noinst_PROGRAMS:EXTRA_PROGRAMS:' test/Makefile.am \
 		|| die "unable to remove testdefault build"
@@ -36,7 +37,6 @@ src_unpack() {
 
 src_compile() {
 	econf \
-		$(use_enable nls) \
 		$(use_enable cddb) \
 		$(use_with !minimal cd-drive) \
 		$(use_with !minimal cd-info) \
@@ -57,12 +57,6 @@ src_compile() {
 src_install() {
 	emake DESTDIR="${D}" install || die "make install failed"
 	dodoc AUTHORS ChangeLog NEWS README THANKS
-
-	# maybe next version is fixed
-	# yes it's a different one than before
-	if ! use cxx; then
-		rm "${D}"/usr/$(get_libdir)/pkgconfig/{libcdio,libiso9660}++.pc
-	fi
 }
 
 pkg_postinst() {