Block cdrdao because they both install cue2toc application wrt #247387, thanks to Diego E. Pettenò.

Package-Manager: portage-2.1.6_rc2/cvs/Linux 2.6.27.7 i686

4 files changed, 14 insertions, 24 deletions

diff --git a/app-cdr/cdrdao/Manifest b/app-cdr/cdrdao/Manifest
index 79e2d0d0b01f..31d273822de3 100644
--- a/app-cdr/cdrdao/Manifest
+++ b/app-cdr/cdrdao/Manifest
@@ -1,22 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX cdrdao-1.2.1-gcc41.patch 421 RMD160 374d62319984001921f03d89ab22c736f874190e SHA1 702ba18a2d62c4166af051364ef46a933d3dec7d SHA256 bb546f4a8060a188afb346af0f34894d03afc29d4874f3b561a17211ffd4dbd5
 AUX cdrdao-1.2.2-excl.patch 2476 RMD160 71e1b06eea119141910798a3c44dddc4a0b6436c SHA1 285e1ebc2f571851c192da758a78b7614a7a3983 SHA256 c0790bfd26336427448bdd50026aad95c119a1ee23ab8c84750fba442ba8bff3
 AUX cdrdao-1.2.2-gcc43.patch 2450 RMD160 b59c8bdb0c4590cd21cefa4f2bdac059e1267122 SHA1 4dd068df0a6978e6dae8395dd07ba88b76455301 SHA256 695bc5da74689c6cc6269d73bc158835810b05b452fc55afd56e48627d596f16
 AUX cdrdao-1.2.2-nonlinux.patch 380 RMD160 d58247e7faeb12b3bf416845f41aa9a77aa6d1ef SHA1 955a6e56e3264e773241d89ac0fd603ba5bcff31 SHA256 e15d0d3302272e958d8d5df705cd4146653aff2a55b5b582f04e70814cab7cd3
 AUX cdrdao-1.2.2-use-new-sigc++-API.patch 481 RMD160 48f39ef4b6f9db81a00b6fbbe6b44c0f0cd49a5b SHA1 092bd7a492026d5dd47e9c2ff9e2b2acf3f8a3bc SHA256 3d0159dfa815c92f82d16407977fe875f005224d28ccc00238a73df2474bba63
-DIST cdrdao-1.2.1.tar.gz 1728003 RMD160 4f6cabd016af69746db6d31d58ec0a7f49c38fde SHA1 530725bd0ed29eeda97eb5fcedbf7b4b44f4e863 SHA256 740dda4c4e88754d4a5997cd5130b4569dfcb0c9123ba6acaed3c266ac998162
 DIST cdrdao-1.2.2.tar.bz2 1408344 RMD160 c537c535a4106655f89f7cfa5895ffcb5b9464e2 SHA1 2699e56e00342c1fa2a3815ed02418fe964b276b SHA256 de180041e57f8e1c88c9b6f9b6c51b0abf0dc2744c4fa37a0248d48f40e58038
-EBUILD cdrdao-1.2.1-r1.ebuild 1673 RMD160 d7c17430f7230b2f5e12af913c82ad9d1a48a38c SHA1 0b48cac9d5907cec6f179cd82b953d4ffed718dc SHA256 d3452eb637cfcbb938819589ab5480e509d83877c7d14accc14e451b986107d6
 EBUILD cdrdao-1.2.2-r2.ebuild 2078 RMD160 4f4cb9531e4b8c3a58e3b2f007d923e2ca380ce6 SHA1 16c6cf72b09be8f5f4d978390c5c6a89af01f032 SHA256 6724cb8e867f2ec36a0972bf6ab9b65c00bae31b084cf5fc02fd4417334da2c8
-EBUILD cdrdao-1.2.2.ebuild 1791 RMD160 96cd136cabf4670fb84dc554e61083f75158c187 SHA1 0340c07a8cdc242f5faba5065762d8d06f581ef1 SHA256 c68ad1994312637d8426ca28dd0f8d98e2538241582c78c74f061ca03105a385
 MISC ChangeLog 16150 RMD160 c6d5074543ec9933df134693adc17a96d90c6e67 SHA1 580653334ad2ad42b8d53a7a996d251d69e8ec5f SHA256 493fc1c8d81cf6cf83633361209723b70d477814e71655fc97f3af909af0e900
 MISC metadata.xml 500 RMD160 79fdf7f14c4f6005c79b4f676e2f48490d7a7b1c SHA1 3f3774af0497ff0d9f6d36047dec11541b9f9f26 SHA256 fe82d0fc06eec0e484da4786b5829d5d17b84e2b7f39cc5d190d86a6e376e935
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkkFVKUACgkQ67wieSYcaxclMQCeIex+gv5POOhrx/O5V++DMg39
-dNYAn3O/jxukEncWb9c3OmBnoUMccxQZ
-=kxpk
------END PGP SIGNATURE-----
diff --git a/app-cdr/cue2toc/ChangeLog b/app-cdr/cue2toc/ChangeLog
index c60e7669ea46..b5f16ed6f998 100644
--- a/app-cdr/cue2toc/ChangeLog
+++ b/app-cdr/cue2toc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-cdr/cue2toc
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cue2toc/ChangeLog,v 1.1 2006/06/24 10:56:38 sbriesen Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cue2toc/ChangeLog,v 1.2 2008/12/05 13:17:36 ssuominen Exp $
+
+  05 Dec 2008; <ssuominen@gentoo.org> cue2toc-0.4.ebuild:
+  Block cdrdao because they both install cue2toc application wrt #247387,
+  thanks to Diego E. Pettenò.
 
 *cue2toc-0.4 (24 Jun 2006)
 
diff --git a/app-cdr/cue2toc/Manifest b/app-cdr/cue2toc/Manifest
index a5df34fb0d00..41442e5beed4 100644
--- a/app-cdr/cue2toc/Manifest
+++ b/app-cdr/cue2toc/Manifest
@@ -1,4 +1,4 @@
 DIST cue2toc-0.4.tar.gz 76689 RMD160 a47ec93594a52308c5273dffc56527def526c65f SHA1 788fb267274772c932e0cfe085f0fea6c604b5e2 SHA256 368c3816f75398fb5e941ba756812e5b151b4b47c9b2789120e9e73225885a78
-EBUILD cue2toc-0.4.ebuild 566 RMD160 dbc7b1a981836f07500e75be585d238117fa3140 SHA1 e20dbf7e28a95d6bb9715870aa52d963fdd7da2d SHA256 ecb3949dc061a79ddc2fed18f36d876107df17ac0d8de47e0b83e4c92b9bb333
-MISC ChangeLog 345 RMD160 024a3c6e60356d6103ee5522118f4c7777bdae68 SHA1 b3c303c1e92d8a4e5f18d0b0700404c10df6b982 SHA256 24e980b017a83d2469cb18550a64c8f0d323920caf6ba2aee3562f8d0f7f79df
+EBUILD cue2toc-0.4.ebuild 569 RMD160 3adc8e68de401bc859795a21218ee4e2103f00a6 SHA1 d50b36a3128e152319dd7473b342c3f1c59fa375 SHA256 8b0ec01e874cf3d7228df23c1fa8b68bd98b335263dcd27a98dbb342bbc6bbf4
+MISC ChangeLog 510 RMD160 e0f4ef8a951172470db11762650fc23621a0ba84 SHA1 7b38361672294f238840cbd0452fae6a63a84bef SHA256 76a2311f860dafe0713d921670465cd1700dd90cb696b984c36d823aa97a3ff4
 MISC metadata.xml 746 RMD160 7b69f3ea924bb481de47f15950dbd21c3ebfcc97 SHA1 872c9abb91ae8b75916f4d6e4883b1c2b14b4380 SHA256 b5173dd60c666d54348ba6adcee876f260aff29803b7432bb390bdbebf7c7131
diff --git a/app-cdr/cue2toc/cue2toc-0.4.ebuild b/app-cdr/cue2toc/cue2toc-0.4.ebuild
index 7c173c86aa7e..ad26ec8bd3f3 100644
--- a/app-cdr/cue2toc/cue2toc-0.4.ebuild
+++ b/app-cdr/cue2toc/cue2toc-0.4.ebuild
@@ -1,8 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cue2toc/cue2toc-0.4.ebuild,v 1.1 2006/06/24 10:56:38 sbriesen Exp $
-
-inherit eutils
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cue2toc/cue2toc-0.4.ebuild,v 1.2 2008/12/05 13:17:36 ssuominen Exp $
 
 DESCRIPTION="Convert CUE files to cdrdao's TOC format"
 HOMEPAGE="http://cue2toc.sourceforge.net/"
@@ -12,9 +10,10 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
-DEPEND=""
 
-src_install () {
-	make DESTDIR="${D}" install || die "make install failed"
+DEPEND="!app-cdr/cdrdao"
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed."
 	dodoc AUTHORS ChangeLog NEWS README
 }