Add patch to disable C++ bindings and nocxx useflag.

Package-Manager: portage-2.1_pre7-r2

4 files changed, 91 insertions, 15 deletions

diff --git a/dev-libs/libcdio/ChangeLog b/dev-libs/libcdio/ChangeLog
index 98e4bbfbedf2..188544b2f947 100644
--- a/dev-libs/libcdio/ChangeLog
+++ b/dev-libs/libcdio/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/libcdio
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libcdio/ChangeLog,v 1.48 2006/03/18 16:10:22 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libcdio/ChangeLog,v 1.49 2006/03/30 10:50:29 flameeyes Exp $
+
+  30 Mar 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/libcdio-0.77-nocxx.patch, libcdio-0.77.ebuild:
+  Add patch to disable C++ bindings and nocxx useflag.
 
 *libcdio-0.77 (18 Mar 2006)
 
diff --git a/dev-libs/libcdio/Manifest b/dev-libs/libcdio/Manifest
index 71b3ba3bc7c8..bfda453e9bcd 100644
--- a/dev-libs/libcdio/Manifest
+++ b/dev-libs/libcdio/Manifest
@@ -1,9 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 8ed9d2f9787c1542c52102826eb027d0 ChangeLog 6464
-RMD160 9aa1d3902d21f8f7c8fe4f80d12ecadbd6d83b5a ChangeLog 6464
-SHA256 76599c51af01f8ecca750160722dfb2fc11082ee6fe52be90edddc551538ea4c ChangeLog 6464
+MD5 6d5effb94f503f1e3b761b6e2a7a78d8 ChangeLog 6629
+RMD160 1d695871553b9aa431b1b1dd35f7e3a59441dcc2 ChangeLog 6629
+SHA256 383772ad1448e5bffba5cdd693c4dde78453e7270899d0a2538478bf36a3f1bb ChangeLog 6629
 MD5 0165911115603b51b34b8ae19ab71e2a files/digest-libcdio-0.64 65
 RMD160 62054a8147645683f92d15003fc1311cc2a852ec files/digest-libcdio-0.64 65
 SHA256 0c3ae23e88a6fccd63913a0bc67bd3a64a2bf2e85eba6627ac6bc82146d54922 files/digest-libcdio-0.64 65
@@ -43,6 +43,9 @@ SHA256 c1e0e0cc3c5ab1ac93376987294100974b40aac78110754c7af0862c79e22685 files/li
 MD5 6e3318ce4e73be555c875919d7866b52 files/libcdio-0.76-nrg-crash.patch 858
 RMD160 7c6a5c69eaefa7fa37de6603dadc7b360a8dc9d4 files/libcdio-0.76-nrg-crash.patch 858
 SHA256 896bc5e98be9125d580124b3da5b9309650b6cc2eb1bbd7fd64b4c0654834447 files/libcdio-0.76-nrg-crash.patch 858
+MD5 e1b0099368be7be3a1cbabbfbdf0f886 files/libcdio-0.77-nocxx.patch 2227
+RMD160 e3bc0928587c9f8752d5f7bb434847fafb8ff6fa files/libcdio-0.77-nocxx.patch 2227
+SHA256 d016a0e4d2cc19993382d0c74e4875249d6e514c4927f20a6afca95438c9c531 files/libcdio-0.77-nocxx.patch 2227
 MD5 3729822a13fd0904820dca96afb9288b libcdio-0.64.ebuild 552
 RMD160 3b4dc3cd33f3804fcae3fc03c9657ae2f286661d libcdio-0.64.ebuild 552
 SHA256 8841dec09b541f27855680a2b777e03d2a0c95d59b85fed1b12fc0c8d36b84f2 libcdio-0.64.ebuild 552
@@ -70,16 +73,16 @@ SHA256 ba26fd55132cc05c06e978b51a5675637b661b9267e67b75766ad85f66737375 libcdio-
 MD5 4be6f517760fa9937eed8d4f62e1a204 libcdio-0.76.ebuild 1329
 RMD160 1b72072bfdc5d3b058543f7e85cc4fcd0be05029 libcdio-0.76.ebuild 1329
 SHA256 d1d837a8e7d60ea0a319f9530f37f3ad728560d7a19e0dff5272fd8d74c88ecb libcdio-0.76.ebuild 1329
-MD5 9ad3b7883ca5d8d7ab6f83970ab0b097 libcdio-0.77.ebuild 1360
-RMD160 e7f022a904b59eda183a745881920f0b26709c49 libcdio-0.77.ebuild 1360
-SHA256 e076541351cc211b8d6ccef06e5bf8b94f943df12c76d9734edb18603c9d44e6 libcdio-0.77.ebuild 1360
+MD5 e3b9c5a7ea0e57125d22063fcc8ea6a4 libcdio-0.77.ebuild 1447
+RMD160 45152bf4f43ea12f2713bb7530973c4bcc070d6e libcdio-0.77.ebuild 1447
+SHA256 1ee48b11ac2ad765748a9b48c5216ae2915763f2552643f6121600c493c4e191 libcdio-0.77.ebuild 1447
 MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
 RMD160 d91ff64b3e5f86657b8b6ba02c41a26247a2fac7 metadata.xml 158
 SHA256 f9dd4fb4a7f368e776ea0d7d394dad8f3a674e67f6103d6fb58a8a98971eeee4 metadata.xml 158
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFEHDD8AiZjviIA2XgRAr1dAJ9+Y4suy+oZqp5r0sw5D6Zd7KNjWACeLD1j
-tB2pZpalIKqvTnQe1pVSwTc=
-=xDdS
+iD8DBQFEK7gcAiZjviIA2XgRAqlIAKDuO1crHEWP9bjKPl1G/zXQU+4buwCfdyH1
+NFfL182EpU6vlfWhnmGzbXE=
+=p+U8
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/libcdio/files/libcdio-0.77-nocxx.patch b/dev-libs/libcdio/files/libcdio-0.77-nocxx.patch
new file mode 100644
index 000000000000..d530e1a718cd
--- /dev/null
+++ b/dev-libs/libcdio/files/libcdio-0.77-nocxx.patch
@@ -0,0 +1,66 @@
+Index: configure.ac
+===================================================================
+RCS file: /sources/libcdio/libcdio/configure.ac,v
+retrieving revision 1.192
+diff -u -B -r1.192 configure.ac
+--- configure.ac	25 Mar 2006 00:22:47 -0000	1.192
++++ configure.ac	30 Mar 2006 10:43:25 -0000
+@@ -79,16 +79,17 @@
+ [  --without-versioned-libs build versioned library symbols (default enabled if you have GNU ld)],
+ enable_versioned_libs="${withval}", enable_versioned_libs=yes)
+ 
+-AC_ARG_ENABLE(cpp_progs,
+-	[  --enable-cpp-progs      make C++ example programs (default enabled)],
+-		enable_cpp_progs=no,
+-		enable_cpp_progs=yes)
++AC_ARG_ENABLE([cxx],
++	AC_HELP_STRING([--disable-cxx], [Disable C++ bindings (default enabled)]))
++AM_CONDITIONAL([ENABLE_CXX_BINDINGS], [test "x$enable_cxx" != "xno"])
+ 
++AC_ARG_ENABLE(cpp_progs,
++	[  --enable-cpp-progs      make C++ example programs (default enabled)])
+ AM_CONDITIONAL(ENABLE_CPP, test x"$enable_cpp_progs" = "xyes")
+ 
+ dnl We use C 
+ AC_PROG_CC
+-dnl We also use C++ in example programs
++dnl We also use C++ in example programs and for CXX bindings
+ AC_PROG_CXX
+ 
+ dnl Checks for programs.
+Index: include/Makefile.am
+===================================================================
+RCS file: /sources/libcdio/libcdio/include/Makefile.am,v
+retrieving revision 1.2
+diff -u -B -r1.2 Makefile.am
+--- include/Makefile.am	10 Nov 2005 11:11:16 -0000	1.2
++++ include/Makefile.am	30 Mar 2006 10:43:25 -0000
+@@ -1,2 +1,5 @@
++if ENABLE_CXX_BINDINGS
++cxxdirs = cdio++
++endif
+ 
+-SUBDIRS	= cdio cdio++
++SUBDIRS	= cdio $(cxxdirs)
+Index: lib/Makefile.am
+===================================================================
+RCS file: /sources/libcdio/libcdio/lib/Makefile.am,v
+retrieving revision 1.68
+diff -u -B -r1.68 Makefile.am
+--- lib/Makefile.am	10 Nov 2005 11:11:15 -0000	1.68
++++ lib/Makefile.am	30 Mar 2006 10:43:25 -0000
+@@ -21,7 +21,11 @@
+ ########################################################
+ 
+ if BUILD_CD_PARANOIA
+-SUBDIRS =  cdio++ driver iso9660 cdda_interface paranoia udf
+-else 
+-SUBDIRS =  cdio++ driver iso9660 udf
++paranoiadirs = cdda_interface paranoia
+ endif
++
++if ENABLE_CXX_BINDINGS
++cxxdirs = cdio++
++endif
++
++SUBDIRS = driver iso9660 udf $(paranoiadirs) $(cxxdirs)
diff --git a/dev-libs/libcdio/libcdio-0.77.ebuild b/dev-libs/libcdio/libcdio-0.77.ebuild
index 554384038cbd..f97c26d6ad8d 100644
--- a/dev-libs/libcdio/libcdio-0.77.ebuild
+++ b/dev-libs/libcdio/libcdio-0.77.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libcdio/libcdio-0.77.ebuild,v 1.1 2006/03/18 16:10:22 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libcdio/libcdio-0.77.ebuild,v 1.2 2006/03/30 10:50:29 flameeyes Exp $
 
-inherit libtool
+inherit libtool autotools
 
 DESCRIPTION="A library to encapsulate CD-ROM reading and control"
 HOMEPAGE="http://www.gnu.org/software/libcdio/"
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
-IUSE="cddb minimal nls"
+IUSE="cddb minimal nls nocxx"
 
 RDEPEND="cddb? ( >=media-libs/libcddb-1.0.1 )
 	nls? ( virtual/libintl )"
@@ -21,9 +21,11 @@ DEPEND="${RDEPEND}
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 
-	elibtoolize
+	epatch "${FILESDIR}/${P}-nocxx.patch"
+
+	eautoreconf
 }
 
 src_compile() {
@@ -37,6 +39,7 @@ src_compile() {
 		$(use_with !minimal cd-read) \
 		$(use_with !minimal iso-info) \
 		$(use_with !minimal iso-read) \
+		$(use_enable !nocxx cxx) \
 		--with-cd-paranoia-name=libcdio-paranoia \
 		--disable-vcd-info \
 		--disable-dependency-tracking || die "configure failed"