Version bump for bug #76888.

(Portage version: 2.0.51.19)

8 files changed, 45 insertions, 61 deletions

diff --git a/media-libs/libcdaudio/ChangeLog b/media-libs/libcdaudio/ChangeLog
index 295371342bdc..84d44973c979 100644
--- a/media-libs/libcdaudio/ChangeLog
+++ b/media-libs/libcdaudio/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for media-libs/libcdaudio
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libcdaudio/ChangeLog,v 1.21 2005/04/06 07:06:08 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libcdaudio/ChangeLog,v 1.22 2005/04/07 21:45:42 eradicator Exp $
+
+*libcdaudio-0.99.12 (07 Apr 2005)
+
+  07 Apr 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  -libcdaudio-0.99.6-r2.ebuild, -libcdaudio-0.99.10.ebuild,
+  libcdaudio-0.99.10-r1.ebuild, +libcdaudio-0.99.12.ebuild:
+  Version bump for bug #76888.
+
+*libcdaudio-0.99.12 (07 Apr 2005)
+
+  07 Apr 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  -libcdaudio-0.99.6-r2.ebuild, -libcdaudio-0.99.10.ebuild,
+  libcdaudio-0.99.10-r1.ebuild, +libcdaudio-0.99.12.ebuild:
+  Version bump.  Stable amd64 for security fix.
 
   06 Apr 2005; Bryan Østergaard <kloeri@gentoo.org>
   libcdaudio-0.99.10-r1.ebuild:
diff --git a/media-libs/libcdaudio/Manifest b/media-libs/libcdaudio/Manifest
index 3d6355c3343d..602a24abf2fd 100644
--- a/media-libs/libcdaudio/Manifest
+++ b/media-libs/libcdaudio/Manifest
@@ -1,22 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 d5b94de0972fddc72e1cbc20c0b09c52 ChangeLog 2850
-MD5 e7e5a54f8a9ec5ae1b7f3bba9d2fab8e libcdaudio-0.99.10-r1.ebuild 905
-MD5 9384ae7ba3e9f56b8027ea92f607042d metadata.xml 215
-MD5 be2c922464861f631fbc4d64b489dd20 libcdaudio-0.99.6-r2.ebuild 856
+MD5 e5d49f27b46b768caa861c667a2ce400 libcdaudio-0.99.10-r1.ebuild 915
 MD5 f26cf7c2e630af89784290d798bc30c4 libcdaudio-0.99.10.ebuild 790
+MD5 be2c922464861f631fbc4d64b489dd20 libcdaudio-0.99.6-r2.ebuild 856
 MD5 084d8b30fc8ee6e65b7d16730557dc8e libcdaudio-0.99.9.ebuild 879
-MD5 a56948792d444b771d1a491245a5c2e3 files/libcdaudio-0.99.6-sanity-checks.patch 987
-MD5 fdf5fc6e4b573352260b0065d3fcc934 files/libcdaudio-0.99-CAN-2005-0706.patch 457
+MD5 9384ae7ba3e9f56b8027ea92f607042d metadata.xml 215
+MD5 e5d49f27b46b768caa861c667a2ce400 libcdaudio-0.99.12.ebuild 915
+MD5 89cb62ae5449343d57562921c5f00fd3 files/digest-libcdaudio-0.99.10 70
 MD5 89cb62ae5449343d57562921c5f00fd3 files/digest-libcdaudio-0.99.10-r1 70
-MD5 93b8c0e34cede421fc69e8380cbcc816 files/digest-libcdaudio-0.99.9 69
 MD5 b253d4d268f247d004893896ed915bd8 files/digest-libcdaudio-0.99.6-r2 69
-MD5 89cb62ae5449343d57562921c5f00fd3 files/digest-libcdaudio-0.99.10 70
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCU4qAKf2g/qXtneoRAq/yAJ95994Qy2QdDSTurAkweIiluQRFOQCfYNad
-n0n8kVBm8Q/JbK2QLeExVm0=
-=Vep3
------END PGP SIGNATURE-----
+MD5 93b8c0e34cede421fc69e8380cbcc816 files/digest-libcdaudio-0.99.9 69
+MD5 fdf5fc6e4b573352260b0065d3fcc934 files/libcdaudio-0.99-CAN-2005-0706.patch 457
+MD5 a56948792d444b771d1a491245a5c2e3 files/libcdaudio-0.99.6-sanity-checks.patch 987
+MD5 314b1b723f70b93d5b0b293f59ed6e97 files/digest-libcdaudio-0.99.12 70
diff --git a/media-libs/libcdaudio/files/digest-libcdaudio-0.99.10 b/media-libs/libcdaudio/files/digest-libcdaudio-0.99.10
deleted file mode 100644
index f425feab1a33..000000000000
--- a/media-libs/libcdaudio/files/digest-libcdaudio-0.99.10
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a437c0a937f60bbad3605496a851671a libcdaudio-0.99.10.tar.gz 353389
diff --git a/media-libs/libcdaudio/files/digest-libcdaudio-0.99.12 b/media-libs/libcdaudio/files/digest-libcdaudio-0.99.12
new file mode 100644
index 000000000000..ba08f4ce89e8
--- /dev/null
+++ b/media-libs/libcdaudio/files/digest-libcdaudio-0.99.12
@@ -0,0 +1 @@
+MD5 63b49cf14d53eed31e7a87cca17a3963 libcdaudio-0.99.12.tar.gz 357150
diff --git a/media-libs/libcdaudio/files/digest-libcdaudio-0.99.6-r2 b/media-libs/libcdaudio/files/digest-libcdaudio-0.99.6-r2
deleted file mode 100644
index 6c975b70218a..000000000000
--- a/media-libs/libcdaudio/files/digest-libcdaudio-0.99.6-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4c8f50427125497c51249d8d74bd91af libcdaudio-0.99.6.tar.gz 262260
diff --git a/media-libs/libcdaudio/libcdaudio-0.99.10-r1.ebuild b/media-libs/libcdaudio/libcdaudio-0.99.10-r1.ebuild
index c59bf925338a..6ea7b03f02c9 100644
--- a/media-libs/libcdaudio/libcdaudio-0.99.10-r1.ebuild
+++ b/media-libs/libcdaudio/libcdaudio-0.99.10-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libcdaudio/libcdaudio-0.99.10-r1.ebuild,v 1.5 2005/04/06 07:06:08 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libcdaudio/libcdaudio-0.99.10-r1.ebuild,v 1.6 2005/04/07 21:45:42 eradicator Exp $
 
 inherit flag-o-matic
 
@@ -10,11 +10,13 @@ SRC_URI="mirror://sourceforge/libcdaudio/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ppc sparc alpha ~hppa mips ~amd64 ~ia64 ppc64"
+KEYWORDS="alpha ~amd64 ~hppa ~ia64 mips ppc ppc64 sparc x86"
 IUSE=""
 
 src_unpack() {
 	unpack ${A}
+
+	cd ${S}
 	# CAN-2005-0706 (#84936)
 	epatch ${FILESDIR}/${PN}-0.99-CAN-2005-0706.patch
 }
diff --git a/media-libs/libcdaudio/libcdaudio-0.99.10.ebuild b/media-libs/libcdaudio/libcdaudio-0.99.12.ebuild
index e52fec60055a..6009af907abd 100644
--- a/media-libs/libcdaudio/libcdaudio-0.99.10.ebuild
+++ b/media-libs/libcdaudio/libcdaudio-0.99.12.ebuild
@@ -1,8 +1,10 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libcdaudio/libcdaudio-0.99.10.ebuild,v 1.5 2005/04/05 02:28:10 obz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libcdaudio/libcdaudio-0.99.12.ebuild,v 1.1 2005/04/07 21:45:42 eradicator Exp $
 
-inherit flag-o-matic
+IUSE=""
+
+inherit eutils
 
 DESCRIPTION="Library of cd audio related routines."
 HOMEPAGE="http://libcdaudio.sourceforge.net/"
@@ -10,18 +12,22 @@ SRC_URI="mirror://sourceforge/libcdaudio/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~mips ~amd64 ~ia64"
-IUSE=""
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 
-src_compile() {
-	# -fPIC is required for this library on alpha, see bug #17192
-	use alpha && append-flags -fPIC
+src_unpack() {
+	unpack ${A}
 
-	econf --enable-threads --with-gnu-ld || die "econf failed"
+	cd ${S}
+	# CAN-2005-0706 (#84936)
+	epatch ${FILESDIR}/${PN}-0.99-CAN-2005-0706.patch
+}
+
+src_compile() {
+	econf --enable-threads
 	emake || die "compile problem."
 }
 
 src_install() {
-	einstall
-	dodoc AUTHORS COPYING ChangLog INSTALL NEWS README TODO
+	make DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangLog NEWS README TODO
 }
diff --git a/media-libs/libcdaudio/libcdaudio-0.99.6-r2.ebuild b/media-libs/libcdaudio/libcdaudio-0.99.6-r2.ebuild
deleted file mode 100644
index b3ca83672480..000000000000
--- a/media-libs/libcdaudio/libcdaudio-0.99.6-r2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libcdaudio/libcdaudio-0.99.6-r2.ebuild,v 1.10 2005/04/05 02:28:10 obz Exp $
-
-inherit flag-o-matic
-
-DESCRIPTION="a library of cd audio related routines"
-SRC_URI="mirror://sourceforge/libcdaudio/${P}.tar.gz"
-HOMEPAGE="http://libcdaudio.sourceforge.net/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc ~alpha ~hppa ~mips amd64"
-IUSE=""
-
-src_compile() {
-	patch -p1 < ${FILESDIR}/${P}-sanity-checks.patch
-
-	# -fPIC is required for this library on alpha, see bug #17192
-	use alpha && append-flags -fPIC
-
-	econf --enable-threads --with-gnu-ld || die "econf failed"
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-	dodoc AUTHORS COPYING ChangLog NEWS README README.BeOS README.OSF1 TODO
-}