diff options
author | Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-03-30 10:50:29 +0000 |
---|---|---|
committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-03-30 10:50:29 +0000 |
commit | 0f9b3d0f63072a67f2214b849e619848ffc13910 (patch) | |
tree | 62a9c02a89143ad98a8767052f2cb5cf70b9277f /dev-libs | |
parent | Remove mask from libcdio 0.77 now that nocxx useflag is added. (diff) | |
download | gentoo-2-0f9b3d0f63072a67f2214b849e619848ffc13910.tar.gz gentoo-2-0f9b3d0f63072a67f2214b849e619848ffc13910.tar.bz2 gentoo-2-0f9b3d0f63072a67f2214b849e619848ffc13910.zip |
Add patch to disable C++ bindings and nocxx useflag.
(Portage version: 2.1_pre7-r2)
Diffstat (limited to 'dev-libs')
-rw-r--r-- | dev-libs/libcdio/ChangeLog | 6 | ||||
-rw-r--r-- | dev-libs/libcdio/files/libcdio-0.77-nocxx.patch | 66 | ||||
-rw-r--r-- | dev-libs/libcdio/libcdio-0.77.ebuild | 13 |
3 files changed, 79 insertions, 6 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/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" |