Remove old versions and old patches. The 4.3 fix is no more needed in 0.80 either.

(Portage version: 2.1.5.5)

9 files changed, 10 insertions, 345 deletions

diff --git a/dev-libs/libcdio/ChangeLog b/dev-libs/libcdio/ChangeLog
index c6f7682224b8..13e5cd8f6d91 100644
--- a/dev-libs/libcdio/ChangeLog
+++ b/dev-libs/libcdio/ChangeLog
@@ -1,6 +1,14 @@
 # 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.96 2008/06/14 10:56:42 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libcdio/ChangeLog,v 1.97 2008/06/14 11:02:00 flameeyes Exp $
+
+  14 Jun 2008; Diego Pettenò <flameeyes@gentoo.org>
+  -files/libcdio-0.77-nocxx.patch, -files/libcdio-0.78.2-bug203777.patch,
+  -files/libcdio-0.79-gcc-4.3-include.patch, -libcdio-0.73.ebuild,
+  -libcdio-0.78.2.ebuild, -libcdio-0.78.2-r3.ebuild,
+  -libcdio-0.79-r1.ebuild, libcdio-0.80.ebuild:
+  Remove old versions and old patches. The 4.3 fix is no more needed in 0.80
+  either.
 
   14 Jun 2008; Diego Pettenò <flameeyes@gentoo.org> libcdio-0.80.ebuild:
   Disable testdefault build during src_compile phase (fixed upstream too);
diff --git a/dev-libs/libcdio/files/libcdio-0.77-nocxx.patch b/dev-libs/libcdio/files/libcdio-0.77-nocxx.patch
deleted file mode 100644
index d530e1a718cd..000000000000
--- a/dev-libs/libcdio/files/libcdio-0.77-nocxx.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-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/files/libcdio-0.78.2-bug203777.patch b/dev-libs/libcdio/files/libcdio-0.78.2-bug203777.patch
deleted file mode 100644
index 9458eb4d3029..000000000000
--- a/dev-libs/libcdio/files/libcdio-0.78.2-bug203777.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -Naur libcdio-0.78.2-orig/work/libcdio-0.78.2/src/cd-info.c libcdio-0.78.2/work/libcdio-0.78.2/src/cd-info.c
---- libcdio-0.78.2-orig/work/libcdio-0.78.2/src/cd-info.c	2006-03-17 14:37:08.000000000 -0500
-+++ libcdio-0.78.2/work/libcdio-0.78.2/src/cd-info.c	2007-12-30 10:49:40.000000000 -0500
-@@ -539,7 +539,7 @@
-       iso9660_stat_t *p_statbuf = _cdio_list_node_data (entnode);
-       char *psz_iso_name = p_statbuf->filename;
-       char _fullname[4096] = { 0, };
--      char translated_name[MAX_ISONAME+1];
-+      char *translated_name = (char *) alloca(strlen(psz_iso_name)+1);
- 
-       if (yep != p_statbuf->rr.b3_rock || 1 == opts.no_rock_ridge) {
- 	iso9660_name_translate_ext(psz_iso_name, translated_name, 
-diff -Naur libcdio-0.78.2-orig/work/libcdio-0.78.2/src/iso-info.c libcdio-0.78.2/work/libcdio-0.78.2/src/iso-info.c
---- libcdio-0.78.2-orig/work/libcdio-0.78.2/src/iso-info.c	2006-03-17 14:37:08.000000000 -0500
-+++ libcdio-0.78.2/work/libcdio-0.78.2/src/iso-info.c	2007-12-30 10:49:50.000000000 -0500
-@@ -224,7 +224,8 @@
-       iso9660_stat_t *p_statbuf = _cdio_list_node_data (entnode);
-       char *psz_iso_name = p_statbuf->filename;
-       char _fullname[4096] = { 0, };
--      char translated_name[MAX_ISONAME+1];
-+      char *translated_name = (char *) alloca(strlen(psz_iso_name)+1);
-+
- 
-       if (yep != p_statbuf->rr.b3_rock || 1 == opts.no_rock_ridge) {
- 	iso9660_name_translate_ext(psz_iso_name, translated_name, 
diff --git a/dev-libs/libcdio/files/libcdio-0.79-gcc-4.3-include.patch b/dev-libs/libcdio/files/libcdio-0.79-gcc-4.3-include.patch
deleted file mode 100644
index d775a93d9634..000000000000
--- a/dev-libs/libcdio/files/libcdio-0.79-gcc-4.3-include.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur libcdio-0.79-orig/include/cdio++/iso9660.hpp libcdio-0.79/include/cdio++/iso9660.hpp
---- libcdio-0.79-orig/include/cdio++/iso9660.hpp	2006-03-07 15:04:01.000000000 -0600
-+++ libcdio-0.79/include/cdio++/iso9660.hpp	2008-01-05 09:32:02.000000000 -0600
-@@ -29,6 +29,7 @@
- 
- #include <cdio/iso9660.h>
- #include <cdio++/cdio.hpp>
-+#include <stdlib.h>
- #include <string.h>
- #include <vector>		// vector class library
- using namespace std;
diff --git a/dev-libs/libcdio/libcdio-0.73.ebuild b/dev-libs/libcdio/libcdio-0.73.ebuild
deleted file mode 100644
index 42647cc3d4b5..000000000000
--- a/dev-libs/libcdio/libcdio-0.73.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# 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.73.ebuild,v 1.10 2006/01/13 22:59:41 vapier Exp $
-
-inherit libtool eutils
-
-DESCRIPTION="A library to encapsulate CD-ROM reading and control"
-HOMEPAGE="http://www.gnu.org/software/libcdio/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86"
-IUSE="cddb minimal"
-
-RDEPEND="!minimal? ( dev-libs/popt )
-	cddb? ( >=media-libs/libcddb-0.9.4 )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	elibtoolize --reverse-deps
-}
-
-src_compile() {
-	econf \
-		$(use_enable cddb) \
-		$(use_with !minimal cd-drive) \
-		$(use_with !minimal cd-info) \
-		$(use_with !minimal cdda-player) \
-		$(use_with !minimal cd-read) \
-		$(use_with !minimal iso-info) \
-		$(use_with !minimal iso-read) \
-		--disable-vcd-info \
-		--disable-dependency-tracking || die
-	# had problem with parallel make (phosphan@gentoo.org)
-	emake -j1 || die
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS README THANKS
-	preserve_old_lib /usr/$(get_libdir)/libiso9660.so.0
-	preserve_old_lib /usr/$(get_libdir)/libiso9660.so.2
-	preserve_old_lib /usr/$(get_libdir)/libcdio.so.0.2.0
-}
-
-pkg_postinst() {
-	preserve_old_lib_notify /usr/$(get_libdir)/libiso9660.so.0
-	preserve_old_lib_notify /usr/$(get_libdir)/libiso9660.so.2
-	preserve_old_lib_notify /usr/$(get_libdir)/libcdio.so.0.2.0
-}
diff --git a/dev-libs/libcdio/libcdio-0.78.2-r3.ebuild b/dev-libs/libcdio/libcdio-0.78.2-r3.ebuild
deleted file mode 100644
index 54808ed0c9e5..000000000000
--- a/dev-libs/libcdio/libcdio-0.78.2-r3.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# 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.78.2-r3.ebuild,v 1.2 2008/01/10 09:00:15 vapier Exp $
-
-inherit eutils libtool multilib
-
-DESCRIPTION="A library to encapsulate CD-ROM reading and control"
-HOMEPAGE="http://www.gnu.org/software/libcdio/"
-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 nocxx"
-
-RDEPEND="cddb? ( >=media-libs/libcddb-1.0.1 )
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-	dev-util/pkgconfig"
-
-RESTRICT="test"
-
-src_unpack() {
-	unpack ${A}
-	epatch "${FILESDIR}/${P}-gcc-4.3-includes.patch"
-	epatch "${FILESDIR}/${P}-bug203777.patch"
-	elibtoolize
-}
-
-src_compile() {
-	econf \
-		$(use_enable nls) \
-		$(use_enable cddb) \
-		$(use_with !minimal cd-drive) \
-		$(use_with !minimal cd-info) \
-		$(use_with !minimal cd-paranoia) \
-		$(use_with !minimal cdda-player) \
-		$(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"
-	emake || die "make failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-	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"
-	fi
-}
-
-pkg_postinst() {
-	ewarn "If you've upgraded from a previous version of ${PN}, you may need to re-emerge"
-	ewarn "packages that linked against ${PN} (vlc, vcdimager and more) by running:"
-	ewarn "\trevdep-rebuild"
-}
diff --git a/dev-libs/libcdio/libcdio-0.78.2.ebuild b/dev-libs/libcdio/libcdio-0.78.2.ebuild
deleted file mode 100644
index 4b90393f9838..000000000000
--- a/dev-libs/libcdio/libcdio-0.78.2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libcdio/libcdio-0.78.2.ebuild,v 1.10 2007/12/31 06:14:13 jer Exp $
-
-inherit eutils libtool
-
-DESCRIPTION="A library to encapsulate CD-ROM reading and control"
-HOMEPAGE="http://www.gnu.org/software/libcdio/"
-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 nocxx"
-
-RDEPEND="cddb? ( >=media-libs/libcddb-1.0.1 )
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-	dev-util/pkgconfig"
-
-RESTRICT="test"
-
-src_unpack() {
-	unpack ${A}
-	elibtoolize
-}
-
-src_compile() {
-	econf \
-		$(use_enable nls) \
-		$(use_enable cddb) \
-		$(use_with !minimal cd-drive) \
-		$(use_with !minimal cd-info) \
-		$(use_with !minimal cd-paranoia) \
-		$(use_with !minimal cdda-player) \
-		$(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"
-	emake || die "make failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS ChangeLog NEWS README THANKS
-}
-
-pkg_postinst() {
-	ewarn "If you've upgraded from a previous version of ${PN}, you may need to re-emerge"
-	ewarn "packages that linked against ${PN} (vlc, vcdimager and more) by running:"
-	ewarn "\trevdep-rebuild"
-}
diff --git a/dev-libs/libcdio/libcdio-0.79-r1.ebuild b/dev-libs/libcdio/libcdio-0.79-r1.ebuild
deleted file mode 100644
index 0354a4a107ef..000000000000
--- a/dev-libs/libcdio/libcdio-0.79-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# 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.79-r1.ebuild,v 1.2 2008/04/20 22:35:37 dirtyepic Exp $
-
-inherit eutils libtool multilib
-
-DESCRIPTION="A library to encapsulate CD-ROM reading and control"
-HOMEPAGE="http://www.gnu.org/software/libcdio/"
-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 nocxx"
-
-RDEPEND="cddb? ( >=media-libs/libcddb-1.0.1 )
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-	dev-util/pkgconfig"
-
-RESTRICT="test"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${PN}-0.78.2-bug203777-ter.patch"
-	epatch "${FILESDIR}"/${P}-gcc-4.3-include.patch
-	elibtoolize
-}
-
-src_compile() {
-	econf \
-		$(use_enable nls) \
-		$(use_enable cddb) \
-		$(use_with !minimal cd-drive) \
-		$(use_with !minimal cd-info) \
-		$(use_with !minimal cd-paranoia) \
-		$(use_with !minimal cdda-player) \
-		$(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"
-	emake || die "make failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-	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"
-	fi
-}
-
-pkg_postinst() {
-	ewarn "If you've upgraded from a previous version of ${PN}, you may need to re-emerge"
-	ewarn "packages that linked against ${PN} (vlc, vcdimager and more) by running:"
-	ewarn "\trevdep-rebuild"
-}
diff --git a/dev-libs/libcdio/libcdio-0.80.ebuild b/dev-libs/libcdio/libcdio-0.80.ebuild
index 8f7df08f8c32..a18631d2c514 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.3 2008/06/14 10:56:42 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libcdio/libcdio-0.80.ebuild,v 1.4 2008/06/14 11:02:00 flameeyes Exp $
 
 EAPI=1
 
@@ -25,7 +25,6 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	epatch "${FILESDIR}"/${PN}-0.79-gcc-4.3-include.patch
 	epatch "${FILESDIR}"/${P}-minimal.patch
 
 	sed -i -e 's:noinst_PROGRAMS:EXTRA_PROGRAMS:' test/Makefile.am \