Fix building with minimal USE flag enabled. Remove C++ bindings pkg-config datafiles when cxx USE flag is disabled (fixed upstream).

Package-Manager: portage-2.1.5.5

4 files changed, 101 insertions, 11 deletions

diff --git a/dev-libs/libcdio/ChangeLog b/dev-libs/libcdio/ChangeLog
index 266fde2ac1ea..fc7730d7e81e 100644
--- a/dev-libs/libcdio/ChangeLog
+++ b/dev-libs/libcdio/ChangeLog
@@ -1,6 +1,11 @@
 # 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.94 2008/06/13 13:46:30 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libcdio/ChangeLog,v 1.95 2008/06/13 14:30:20 flameeyes Exp $
+
+  13 Jun 2008; Diego Pettenò <flameeyes@gentoo.org>
+  +files/libcdio-0.80-minimal.patch, libcdio-0.80.ebuild:
+  Fix building with minimal USE flag enabled. Remove C++ bindings pkg-config
+  datafiles when cxx USE flag is disabled (fixed upstream).
 
 *libcdio-0.80 (13 Jun 2008)
 
diff --git a/dev-libs/libcdio/Manifest b/dev-libs/libcdio/Manifest
index 6130dc9c5bf3..3e35f12b1df2 100644
--- a/dev-libs/libcdio/Manifest
+++ b/dev-libs/libcdio/Manifest
@@ -6,6 +6,7 @@ AUX libcdio-0.78.2-bug203777-ter.patch 2879 RMD160 cb0b2d1a21adcb99f81be0be0132c
 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.79-gcc-4.3-include.patch 444 RMD160 6c25b09fd035d5992bcc0920469a5b67febcda72 SHA1 0dd4f3b2eb7d1850c3da49eff462d5d0bcdbae44 SHA256 696c84bc17e45aec039ed7c243b9290baa49914d7b7298ec164f26e9cade9a1a
+AUX libcdio-0.80-minimal.patch 2897 RMD160 2e2f9fc0dc26123de0048245fe7790c40cdd1cf0 SHA1 b60c9d83f112a88e458d04fbf4d73f36db1a411b SHA256 f5d5210bfacb7340292324470d8295fdcd5c865aef715fe427aa70f57dc51eaa
 DIST libcdio-0.73.tar.gz 1797060 RMD160 e51581a5d8b97d34bb09edd39ccbfcc618d74d72 SHA1 8929db4652646eb4fdfbadcf6f4385b24c1e25a1 SHA256 a9a269e50cbfb784437da8775da99a129abc965f64d8db141d23629ca42e28cf
 DIST libcdio-0.78.2.tar.gz 2024218 RMD160 4e32dd9bb4bd19b6604ce3d3c4716b6481b6956a SHA1 6a87e49cd84b9f67192d6357524772db9ae02ecc SHA256 2792e4133a89b254644ffe526c8eab785e1de3078d3a9c1ec03653247700ebde
 DIST libcdio-0.79.tar.gz 2049962 RMD160 39d0408dd51ad2714810ef48ee1aee43967ab6dd SHA1 0aab3dd1f808345a9ea4cdd7ee793977ab59c98d SHA256 1bf0e3eee6e248cc601b9536e25d891872d318ab9aaaaf5a4bfa6d0ff4fed1f5
@@ -15,13 +16,13 @@ EBUILD libcdio-0.78.2-r3.ebuild 1837 RMD160 f892472df974db3ddd36483ab609cff57c09
 EBUILD libcdio-0.78.2-r4.ebuild 1840 RMD160 0927d4a8d819446c0bdf8bc2f2d265842ff2edc3 SHA1 452cd4f0f296b9564d22bd7e6f7a1b0628506677 SHA256 64624d9d036b5aba15f2e2fe35e76afb23b6265c066ae6c6d36f05431d71c830
 EBUILD libcdio-0.78.2.ebuild 1574 RMD160 2403c7b5bddf299137a3c39bbe7d0623d2b56138 SHA1 ec608729ed4fa40128a5ba13b2dbf9b56c4a054a SHA256 78bff79511de8b09190731f96d81864fa407dbb1b5a3639d6df0755f150f5cf0
 EBUILD libcdio-0.79-r1.ebuild 1872 RMD160 a4d63addcb755838364e7f10856b0316fbc7c96e SHA1 a1783f565a4f188cef71082c32514c5d63663616 SHA256 132671c4fb546a5b3b4522ff078a02b18e7c289ef6dc62aa3a8702d977725e36
-EBUILD libcdio-0.80.ebuild 1898 RMD160 078873fd07e1fa1276f93d3709b273a4b4bd18e6 SHA1 64d525e398b866a0ca972fbf6574c43cd3e7e3b1 SHA256 2ddc1aa6b7a029bb92f80cb51366c882361138e9a85a0224acff4759fe3ea9db
-MISC ChangeLog 13075 RMD160 6188c99efbe8fe652169d5eb2f0ceace23e28d47 SHA1 80c48c66bfa05477e1b53d1348895fb9f4b30ea9 SHA256 5aedc9e466673efdb5a8156a87ad05addf7f1329678ed6436623f93da33955fb
+EBUILD libcdio-0.80.ebuild 1967 RMD160 1f6a8dfc270e8b1316e2ab5c06b9181db777fd34 SHA1 a622c7cffa6552d6e705e9d4209cf096da74db03 SHA256 51fbd94b7504e20c2ffecaf777ae01d8f66063445f646394f649bfe02260da09
+MISC ChangeLog 13324 RMD160 3781828f06eeff7d516f64ab01b18ea3b092abfa SHA1 31ad03766749b26efb8455edc732dc2878444f74 SHA256 65f8a9df5f08995ad75d4759246be9c2aa3aa735d4ea1f2fa05586226cfc89d4
 MISC metadata.xml 485 RMD160 d5c951e8c97324677e2bbf8e49add2890a17d0ab SHA1 5aed7d7a452fb40e1a3ba6e261122df1ce9b19d8 SHA256 0e77efb669e8a30456b44de51b9640c09a4a4e19aa1d5cc9cbd952cf6a61b3a5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkhSej4ACgkQAiZjviIA2XjlRgCg1Yzca6JNsEjdzWUCTRVkt5HM
-OHkAoInDYLFVeNSS++YA87mzMvk2OcGa
-=C3Yg
+iEYEARECAAYFAkhShIQACgkQAiZjviIA2XhunQCdENcFmtzQiT0NhymKeMKKxAy2
+beYAoIF9n69DibC75wCIcsOHBbcr2OQE
+=6ciJ
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/libcdio/files/libcdio-0.80-minimal.patch b/dev-libs/libcdio/files/libcdio-0.80-minimal.patch
new file mode 100644
index 000000000000..5883d22d2c15
--- /dev/null
+++ b/dev-libs/libcdio/files/libcdio-0.80-minimal.patch
@@ -0,0 +1,81 @@
+Index: Makefile.am
+===================================================================
+RCS file: /sources/libcdio/libcdio/src/Makefile.am,v
+retrieving revision 1.45
+retrieving revision 1.46
+diff -u -B -r1.45 -r1.46
+--- src/Makefile.am	20 Mar 2008 19:02:38 -0000	1.45
++++ src/Makefile.am	24 Apr 2008 07:28:00 -0000	1.46
+@@ -17,11 +17,6 @@
+ 
+ GETOPT_C = getopt.c getopt1.c
+ 
+-man_MANS = cd-drive.1 cd-info.1 cd-read.1 iso-read.1 iso-info.1 
+-EXTRA_DIST = cd-drive.help2man cd-info.help2man cd-read.help2man \
+-	     iso-info.help2man iso-read.help2man $(GETOPT_C) getopt.h \
+-             $(man_MANS)
+-
+ noinst_HEADERS = cddb.h getopt.h util.h
+ 
+ ####################################################
+@@ -35,10 +30,6 @@
+ CDDB_LIBS=@CDDB_LIBS@
+ CDDA_PLAYER_LIBS=@CDDA_PLAYER_LIBS@
+ 
+-$(man_MANS): %.1: % %.help2man
+-	-$(HELP2MAN) --opt-include=$<.help2man --no-info --output=$@ ./$<
+-MOSTLYCLEANFILES = $(man_MANS)
+-
+ if BUILD_CDDA_PLAYER
+ cdda_player_SOURCES = cdda-player.c cddb.c cddb.h $(GETOPT_C)
+ cdda_player_LDADD   = $(LIBCDIO_LIBS) $(CDDB_LIBS) $(CDDA_PLAYER_LIBS)
+@@ -49,12 +40,14 @@
+ cd_drive_SOURCES = cd-drive.c util.c util.h $(GETOPT_C)
+ cd_drive_LDADD   =  $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) $(LIBICONV)
+ bin_cd_drive     = cd-drive
++man_cd_drive         = cd-drive.1
+ endif
+ 
+ if BUILD_CDINFO
+ cd_info_SOURCES = cd-info.c cddb.c cddb.h util.c util.h $(GETOPT_C)
+ cd_info_LDADD   =  $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) $(CDDB_LIBS) $(VCDINFO_LIBS) $(LIBICONV)
+ bin_cd_info     = cd-info 
++man_cd_info     = cd-info.1
+ endif
+ 
+ if BUILD_CDINFO_LINUX
+@@ -67,18 +60,21 @@
+ cd_read_SOURCES = cd-read.c util.c util.h $(GETOPT_C)
+ cd_read_LDADD   = $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) $(LIBICONV)
+ bin_cd_read     = cd-read 
++man_cd_read     = cd-read.1
+ endif
+ 
+ if BUILD_ISO_INFO
+ iso_info_SOURCES = iso-info.c util.c util.h $(GETOPT_C)
+ iso_info_LDADD   = $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) $(LIBICONV)
+ bin_iso_info     = iso-info
++man_iso_info     = iso-info.1
+ endif
+ 
+ if BUILD_ISO_READ
+ iso_read_SOURCES = iso-read.c util.c util.h $(GETOPT_C)
+ iso_read_LDADD   = $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) $(LIBICONV)
+ bin_iso_read     = iso-read
++man_iso_read     = iso-read.1
+ endif
+ 
+ mmc_tool_SOURCES = mmc-tool.c util.c util.h $(GETOPT_C)
+@@ -88,3 +84,12 @@
+ bin_PROGRAMS = $(bin_cd_drive) $(bin_cd_info)  $(bin_cdinfo_linux) $(bin_cd_read) $(bin_iso_info) $(bin_iso_read) $(bin_cdda_player) $(bin_mmc_tool)
+ 
+ INCLUDES = -I$(top_srcdir) $(LIBCDIO_CFLAGS) $(VCDINFO_CFLAGS) $(CDDB_CFLAGS)
++
++man_MANS = $(man_cd_drive) $(man_cd_info) $(man_cd_read) $(man_iso_read) $(man_iso_info)
++EXTRA_DIST = cd-drive.help2man cd-info.help2man cd-read.help2man \
++             iso-info.help2man iso-read.help2man $(GETOPT_C) getopt.h \
++             $(man_MANS)
++
++$(man_MANS): %.1: % %.help2man
++        -$(HELP2MAN) --opt-include=$<.help2man --no-info --output=$@ ./$<
++MOSTLYCLEANFILES = $(man_MANS)
diff --git a/dev-libs/libcdio/libcdio-0.80.ebuild b/dev-libs/libcdio/libcdio-0.80.ebuild
index 6e4b5b81e8eb..129311089bb7 100644
--- a/dev-libs/libcdio/libcdio-0.80.ebuild
+++ b/dev-libs/libcdio/libcdio-0.80.ebuild
@@ -1,10 +1,10 @@
 # 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.1 2008/06/13 13:46:30 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libcdio/libcdio-0.80.ebuild,v 1.2 2008/06/13 14:30:20 flameeyes Exp $
 
 EAPI=1
 
-inherit eutils libtool multilib
+inherit eutils libtool multilib autotools
 
 DESCRIPTION="A library to encapsulate CD-ROM reading and control"
 HOMEPAGE="http://www.gnu.org/software/libcdio/"
@@ -28,6 +28,9 @@ src_unpack() {
 	cd "${S}"
 
 	epatch "${FILESDIR}"/${PN}-0.79-gcc-4.3-include.patch
+	epatch "${FILESDIR}"/${P}-minimal.patch
+
+	eautomake
 	elibtoolize
 }
 
@@ -56,9 +59,9 @@ src_install() {
 	dodoc AUTHORS ChangeLog NEWS README THANKS
 
 	# maybe next version is fixed
-	if use minimal; then
-		rm -f "${D}/usr/$(get_libdir)/pkgconfig/libcdio_cdda.pc"
-		rm -f "${D}/usr/include/cdio/cdda.h"
+	# yes it's a different one than before
+	if ! use cxx; then
+		rm "${D}"/usr/$(get_libdir)/pkgconfig/{libcdio,libiso9660}++.pc
 	fi
 }