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

Package-Manager: portage-2.1.5.5

10 files changed, 15 insertions, 359 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/Manifest b/dev-libs/libcdio/Manifest
index 0a4f0d355699..d5cc44ecab8e 100644
--- a/dev-libs/libcdio/Manifest
+++ b/dev-libs/libcdio/Manifest
@@ -1,28 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX libcdio-0.77-nocxx.patch 2227 RMD160 e3bc0928587c9f8752d5f7bb434847fafb8ff6fa SHA1 78cde269835c581889ccf4ef431e2bc32173816e SHA256 d016a0e4d2cc19993382d0c74e4875249d6e514c4927f20a6afca95438c9c531
 AUX libcdio-0.78.2-bug203777-ter.patch 2879 RMD160 cb0b2d1a21adcb99f81be0be0132c6add5867c57 SHA1 ef17c76887505fc38d1bd0acc0f5896e5e2b6346 SHA256 ae2635faefbdac0c01975628c3a7bd7d4bee0c4fa9d29825f988d356a10090f8
-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
 DIST libcdio-0.80.tar.gz 2083287 RMD160 3ca404bffb107ad950505b8ccd9e659e306545cb SHA1 40c1558a65a9eca2b693d1951ed2664efbe7d1ed SHA256 b1a41a34db5a034649109c3328782e4e2fa438b1e2bddc458cd260f60ef7ca66
-EBUILD libcdio-0.73.ebuild 1550 RMD160 65b9a393734eacf4496b6d562b2bf29bcadc2b4a SHA1 96c9196e38d4423f8fb68b24f041980ed4f00b07 SHA256 648722455842ce262c885728bcae8c8aac0da9d12ae6f6ff2c9851d6ed8ea12a
-EBUILD libcdio-0.78.2-r3.ebuild 1837 RMD160 f892472df974db3ddd36483ab609cff57c09a496 SHA1 b6f24080325980ec68d3a01d29d8aec9ddbc7eff SHA256 ff32f816a01a4434805694532d9538318932138aecea961f558bd26e6b9a27d4
 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 2063 RMD160 a46e9ec084a9a8a82e8c944638832012883d7011 SHA1 73e364bd4fe514ea6127a35c4525bed4a2cb78ec SHA256 5a7232a46eab14058095915f87ee29174c543e3324ebf1404f4d88917aac8e59
-MISC ChangeLog 13525 RMD160 f3fbfa6172c5590719fecaecf869cd8a2d0fcf7e SHA1 0d435f2b39f57eacd58cfe61a748d1f626ada915 SHA256 d0f5ff1fd77ddcad27dddfa39362002e4a7ecd30b04b5999a2365fd0cb459c85
+EBUILD libcdio-0.80.ebuild 2008 RMD160 de5819b7ee7e9db11d89ca49eefbb1e06a751d5d SHA1 3fa00624264099eedf935532bc3b2af7a73d19f5 SHA256 4021b61a8c80c2614e1655ac4821038e7a2771cfba8dd7f8312786de3dafc621
+MISC ChangeLog 13908 RMD160 d5d9cb14058367b11d8f8d03f3025907d408d7de SHA1 25d9d8b2e36667a9881f21f91876b28dfa9987e3 SHA256 2938fc3d5ed0fb6c93caba166dd410ac5118fd4253f627c8993d4b0b871d4800
 MISC metadata.xml 485 RMD160 d5c951e8c97324677e2bbf8e49add2890a17d0ab SHA1 5aed7d7a452fb40e1a3ba6e261122df1ce9b19d8 SHA256 0e77efb669e8a30456b44de51b9640c09a4a4e19aa1d5cc9cbd952cf6a61b3a5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkhTo/IACgkQAiZjviIA2Xi2eQCg6C0lJYOA/CagO5cxL0aVfwxy
-PMYAnjhE2kBcFqn0tAboXPZr8Y2LsVsI
-=xKZc
+iEYEARECAAYFAkhTpS8ACgkQAiZjviIA2XigRwCaA9p3eT1hUcoIcbq+2RJrgrMv
+730AoMC0pIewdHuXnSAx/mh4Me2SbnTs
+=9eqr
 -----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
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 \