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

(Portage version: 2.2_rc1/cvs/Linux 2.6.25-gentoo-r4 x86_64)

3 files changed, 33 insertions, 12 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/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() {