removed circular dependency, see bug #70445

Package-Manager: portage-2.0.51-r15

5 files changed, 19 insertions, 24 deletions

diff --git a/dev-libs/libcdio/ChangeLog b/dev-libs/libcdio/ChangeLog
index 090d4c510d59..de8cf0da818e 100644
--- a/dev-libs/libcdio/ChangeLog
+++ b/dev-libs/libcdio/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-libs/libcdio
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libcdio/ChangeLog,v 1.22 2004/12/11 14:39:06 kloeri Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libcdio/ChangeLog,v 1.23 2005/01/29 01:16:25 luckyduck Exp $
+
+  29 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org> libcdio-0.70.ebuild:
+  removed circular dependency, see bug #70445
 
   11 Dec 2004; Bryan Østergaard <kloeri@gentoo.org> libcdio-0.69.ebuild:
   Stable on alpha.
diff --git a/dev-libs/libcdio/Manifest b/dev-libs/libcdio/Manifest
index eb8954536a7f..2d49b64f3162 100644
--- a/dev-libs/libcdio/Manifest
+++ b/dev-libs/libcdio/Manifest
@@ -1,18 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 d4cc992046cd8fe2a9ba5af9e2aca63d libcdio-0.64.ebuild 601
-MD5 5182f04b1461ba468c15f4a4ffa31921 ChangeLog 2818
+MD5 b800d5b2ce3a06e6145568536543a61d libcdio-0.69.ebuild 782
+MD5 9db9dca79d0867f61570cdeb7c8d7862 libcdio-0.64.ebuild 600
+MD5 7b6de401169e821b4913a840434ff35d libcdio-0.70.ebuild 1031
+MD5 a24a59036756ab17776bf4f7e4e2cfc3 ChangeLog 2941
 MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
-MD5 4e973644d5e392840fc312acfe8d3f68 libcdio-0.69.ebuild 778
-MD5 76af1ba4ab639f733c424347f2597f69 libcdio-0.70.ebuild 1004
 MD5 0165911115603b51b34b8ae19ab71e2a files/digest-libcdio-0.64 65
-MD5 29744769327f1087e4de0f7c5d8e9fbb files/digest-libcdio-0.70 65
 MD5 8276d2edab3e451a5639073967339ebb files/digest-libcdio-0.69 65
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBuwabugEuf3OQ0akRApxEAKCEcgIlX08nLkkzKGot9DHvhKUs/wCfbykU
-Sw7EeJl1KKP9YHWbmUq5amU=
-=HOk/
------END PGP SIGNATURE-----
+MD5 29744769327f1087e4de0f7c5d8e9fbb files/digest-libcdio-0.70 65
diff --git a/dev-libs/libcdio/libcdio-0.64.ebuild b/dev-libs/libcdio/libcdio-0.64.ebuild
index a425a46f9582..f1087ab6be2b 100644
--- a/dev-libs/libcdio/libcdio-0.64.ebuild
+++ b/dev-libs/libcdio/libcdio-0.64.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libcdio/libcdio-0.64.ebuild,v 1.11 2004/09/15 17:29:59 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libcdio/libcdio-0.64.ebuild,v 1.12 2005/01/29 01:16:25 luckyduck Exp $
 
 IUSE=""
 
diff --git a/dev-libs/libcdio/libcdio-0.69.ebuild b/dev-libs/libcdio/libcdio-0.69.ebuild
index 30e655244495..6d19bd08d399 100644
--- a/dev-libs/libcdio/libcdio-0.69.ebuild
+++ b/dev-libs/libcdio/libcdio-0.69.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libcdio/libcdio-0.69.ebuild,v 1.9 2004/12/11 14:39:06 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libcdio/libcdio-0.69.ebuild,v 1.10 2005/01/29 01:16:25 luckyduck Exp $
 
 DESCRIPTION="A library to encapsulate CD-ROM reading and control"
 HOMEPAGE="http://www.gnu.org/software/libcdio/"
diff --git a/dev-libs/libcdio/libcdio-0.70.ebuild b/dev-libs/libcdio/libcdio-0.70.ebuild
index 86e73a976342..27d963a72f12 100644
--- a/dev-libs/libcdio/libcdio-0.70.ebuild
+++ b/dev-libs/libcdio/libcdio-0.70.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libcdio/libcdio-0.70.ebuild,v 1.3 2004/12/05 03:22:25 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libcdio/libcdio-0.70.ebuild,v 1.4 2005/01/29 01:16:25 luckyduck Exp $
 
 IUSE="cddb"
 
@@ -25,7 +25,9 @@ src_unpack() {
 }
 
 src_compile() {
-	econf $(use_enable cddb) || die
+	econf \
+		$(use_enable cddb) \
+		"--disable-vcd-info"|| die
 	# had problem with parallel make (phosphan@gentoo.org)
 	emake -j1 || die
 }