Fix musicbrainz deps again... add a revbump in ~arch for the latest version for slot deps using eapi 1

Package-Manager: portage-2.1.4_rc14

7 files changed, 97 insertions, 26 deletions

diff --git a/media-sound/sound-juicer/ChangeLog b/media-sound/sound-juicer/ChangeLog
index c2beb69bebaa..058227903b7f 100644
--- a/media-sound/sound-juicer/ChangeLog
+++ b/media-sound/sound-juicer/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-sound/sound-juicer
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/sound-juicer/ChangeLog,v 1.125 2008/01/01 22:19:50 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sound-juicer/ChangeLog,v 1.126 2008/01/02 12:22:27 aballier Exp $
+
+*sound-juicer-2.20.1-r1 (02 Jan 2008)
+
+  02 Jan 2008; Alexis Ballier <aballier@gentoo.org>
+  sound-juicer-2.16.4.ebuild, sound-juicer-2.20.0.ebuild,
+  sound-juicer-2.20.1.ebuild, +sound-juicer-2.20.1-r1.ebuild:
+  Fix musicbrainz deps again... add a revbump in ~arch for the latest version
+  for slot deps using eapi 1
 
   01 Jan 2008; Alexis Ballier <aballier@gentoo.org>
   sound-juicer-2.16.4.ebuild, sound-juicer-2.20.0.ebuild,
diff --git a/media-sound/sound-juicer/Manifest b/media-sound/sound-juicer/Manifest
index 5e2ee9a5b1e2..6b128e9609f0 100644
--- a/media-sound/sound-juicer/Manifest
+++ b/media-sound/sound-juicer/Manifest
@@ -4,22 +4,26 @@ Hash: SHA1
 DIST sound-juicer-2.16.4.tar.bz2 1270126 RMD160 b5c4335bf28b0070fd05dde5070ea50a9f38f0eb SHA1 01a9b567b29a7a5ea6888f5e892d21da5c3e65cd SHA256 db90283d1eca9e7a1cc986a13b222ad60f3b48333bce9f275dd3861c11124371
 DIST sound-juicer-2.20.0.tar.bz2 1414529 RMD160 8d6751975e624c1badc59545b0130895f8273939 SHA1 ca65f5c181de9e50e6a9f2bf033972a0c8da637b SHA256 796812d429a6a0bba8ac7ea9db4f5087447ca71921d9ed7806ecf4f1a464a2d9
 DIST sound-juicer-2.20.1.tar.bz2 1412335 RMD160 519c20c1c3d23973d93ecd4978d2dbe90967f7aa SHA1 942e4e34b83b66e9b33496f38ff95674244e33e2 SHA256 6ac84544386ef7f690330d7f92f6c2f64da752c0f5cd60501a792b23f325a9ab
-EBUILD sound-juicer-2.16.4.ebuild 1627 RMD160 c4b3e6397752e3044787fe18779d8078f54cc87c SHA1 9dd414018d20af10efdf82739259265324801f34 SHA256 ce8bf8a54bc5d6f1d717efa0440ed0472ed98dcf84dc536ee712df9e6147ae22
-MD5 71d78d7b3accf7f0c11bca77ad9041bf sound-juicer-2.16.4.ebuild 1627
-RMD160 c4b3e6397752e3044787fe18779d8078f54cc87c sound-juicer-2.16.4.ebuild 1627
-SHA256 ce8bf8a54bc5d6f1d717efa0440ed0472ed98dcf84dc536ee712df9e6147ae22 sound-juicer-2.16.4.ebuild 1627
-EBUILD sound-juicer-2.20.0.ebuild 1636 RMD160 b351eaa079a80a40c9d72bf16db1f75ec834eb3c SHA1 034c1c1ff39be7825543020de9735fbc60f80474 SHA256 7a309baffb12263e21dcb2c81ceb770e664fa1af42432aecfdc9d4b8c771968e
-MD5 91a62db1a252ca0936e23835bc3fcf7b sound-juicer-2.20.0.ebuild 1636
-RMD160 b351eaa079a80a40c9d72bf16db1f75ec834eb3c sound-juicer-2.20.0.ebuild 1636
-SHA256 7a309baffb12263e21dcb2c81ceb770e664fa1af42432aecfdc9d4b8c771968e sound-juicer-2.20.0.ebuild 1636
-EBUILD sound-juicer-2.20.1.ebuild 1629 RMD160 25ec2d50dac0d9ee700c4510bb82354e0ca7b192 SHA1 1937a52211ddd578c2c6c484d9dc4acbac9daddc SHA256 cff9543ea55f674b648b460e66632f6f1e03a38b11d16092e52c1b1f75f23f8f
-MD5 285a8223c9cd641aaf319c9afd449d8d sound-juicer-2.20.1.ebuild 1629
-RMD160 25ec2d50dac0d9ee700c4510bb82354e0ca7b192 sound-juicer-2.20.1.ebuild 1629
-SHA256 cff9543ea55f674b648b460e66632f6f1e03a38b11d16092e52c1b1f75f23f8f sound-juicer-2.20.1.ebuild 1629
-MISC ChangeLog 17201 RMD160 c609cad3fbd179c193df2ce4d33782f22bb9047f SHA1 349bab6523b7839ce489bda7697b9bf4c68e021b SHA256 5fe19fc4b95a844bfa1bc00d423c8742c67fd247e38469ec0156f33124698ebe
-MD5 d8bbb2fcb9405ad4878a9fcbe0022db6 ChangeLog 17201
-RMD160 c609cad3fbd179c193df2ce4d33782f22bb9047f ChangeLog 17201
-SHA256 5fe19fc4b95a844bfa1bc00d423c8742c67fd247e38469ec0156f33124698ebe ChangeLog 17201
+EBUILD sound-juicer-2.16.4.ebuild 1599 RMD160 7084c1f9b998cf2a98a965edb2da4eca9c4a434f SHA1 f8255e229f0209a03987c9290f10f24a148e8ffd SHA256 3669689ee591517d57198eb7fcbbc7a53ffad5250b9128ab200a99a4a02bd35d
+MD5 6eb4c1455b11db5159450fa0250056b3 sound-juicer-2.16.4.ebuild 1599
+RMD160 7084c1f9b998cf2a98a965edb2da4eca9c4a434f sound-juicer-2.16.4.ebuild 1599
+SHA256 3669689ee591517d57198eb7fcbbc7a53ffad5250b9128ab200a99a4a02bd35d sound-juicer-2.16.4.ebuild 1599
+EBUILD sound-juicer-2.20.0.ebuild 1608 RMD160 dcde1a5c97242c338bc382a696832305ca389e18 SHA1 d203b204afffffd5b22ad1068f8aba04b65dcdf0 SHA256 e98530ec79bfa5f3b28af3dfaee1129c6078e845c4478dca12c28f62383e9e9a
+MD5 ef0aff4c94efa1c7cf2400e9af94f253 sound-juicer-2.20.0.ebuild 1608
+RMD160 dcde1a5c97242c338bc382a696832305ca389e18 sound-juicer-2.20.0.ebuild 1608
+SHA256 e98530ec79bfa5f3b28af3dfaee1129c6078e845c4478dca12c28f62383e9e9a sound-juicer-2.20.0.ebuild 1608
+EBUILD sound-juicer-2.20.1-r1.ebuild 1623 RMD160 33942d33ea952051a8be83fe19d45a7c376c72f1 SHA1 0c6453cbb22d07407e12ed2435804c7b1b472ec4 SHA256 912aedbd91006683c829c1cf16ce537585a777deaf9abcd7873d98d5c1ee1d3c
+MD5 c1ae9698a1e3c5b843c2bef59cc72e83 sound-juicer-2.20.1-r1.ebuild 1623
+RMD160 33942d33ea952051a8be83fe19d45a7c376c72f1 sound-juicer-2.20.1-r1.ebuild 1623
+SHA256 912aedbd91006683c829c1cf16ce537585a777deaf9abcd7873d98d5c1ee1d3c sound-juicer-2.20.1-r1.ebuild 1623
+EBUILD sound-juicer-2.20.1.ebuild 1601 RMD160 55352123336d8671ba873a3dc90d5944fc1062ea SHA1 b9902c1e2e9bee4090758482e47d86bb44154bb0 SHA256 760073fa052b3564547363be4da48be18577e4068231c9810151e98372aac444
+MD5 07e9438a0b3911959575b766d3986bc2 sound-juicer-2.20.1.ebuild 1601
+RMD160 55352123336d8671ba873a3dc90d5944fc1062ea sound-juicer-2.20.1.ebuild 1601
+SHA256 760073fa052b3564547363be4da48be18577e4068231c9810151e98372aac444 sound-juicer-2.20.1.ebuild 1601
+MISC ChangeLog 17520 RMD160 e2faf85ef7cafaf3002f0e4abaf9dcdef2577204 SHA1 cf89706aba3d01c1116520b23ece23ba144fcf9f SHA256 cefb266ef4e982f6db8c042ddf4c4c866a68b11673d736c0cbd7ab000b4ea84f
+MD5 fbe096a093e4880aa974f4249de8a52f ChangeLog 17520
+RMD160 e2faf85ef7cafaf3002f0e4abaf9dcdef2577204 ChangeLog 17520
+SHA256 cefb266ef4e982f6db8c042ddf4c4c866a68b11673d736c0cbd7ab000b4ea84f ChangeLog 17520
 MISC metadata.xml 177 RMD160 c4ff678488aa3bd8f3e5e4cf6e52a56caba3dad9 SHA1 73b04fb757f8a6473a2c43b0807a95381da37afc SHA256 dfb196addaf8aa212436c53c3d47cda0d10c2850c59fa2dcb7554dfa10190af2
 MD5 b263ff7675308d90b75a170acae3f5ff metadata.xml 177
 RMD160 c4ff678488aa3bd8f3e5e4cf6e52a56caba3dad9 metadata.xml 177
@@ -33,10 +37,13 @@ SHA256 47f624dda9be700f3c0d62c87f3a871a1ac459866ed730f169935bf06e425052 files/di
 MD5 9ab53fd51e92a25d1515c2d93e3bdac5 files/digest-sound-juicer-2.20.1 265
 RMD160 2f1a2040e1e9d44a7ea096a0e9b5b5ebc4f132a3 files/digest-sound-juicer-2.20.1 265
 SHA256 ad29c4864db839cb43de6b8b9eebdfad097e718bc606935504bb958a3821f8ae files/digest-sound-juicer-2.20.1 265
+MD5 9ab53fd51e92a25d1515c2d93e3bdac5 files/digest-sound-juicer-2.20.1-r1 265
+RMD160 2f1a2040e1e9d44a7ea096a0e9b5b5ebc4f132a3 files/digest-sound-juicer-2.20.1-r1 265
+SHA256 ad29c4864db839cb43de6b8b9eebdfad097e718bc606935504bb958a3821f8ae files/digest-sound-juicer-2.20.1-r1 265
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.8 (GNU/Linux)
 
-iEYEARECAAYFAkd6vJAACgkQvFcC4BYPU0qg2ACgrMATVRmUkhEZWHLtHOAUKwk/
-7q0An3BFKEUQ3HIjcbRWDO1fMY3xr+sJ
-=DbE/
+iEYEARECAAYFAkd7ghMACgkQvFcC4BYPU0q0GwCfYsuX8SWZSwOh4TajUBzyjH2L
+7fEAn3OxkKqr5THK4yGcIVyzCP0h7wVz
+=oQjV
 -----END PGP SIGNATURE-----
diff --git a/media-sound/sound-juicer/files/digest-sound-juicer-2.20.1-r1 b/media-sound/sound-juicer/files/digest-sound-juicer-2.20.1-r1
new file mode 100644
index 000000000000..3f50dd95d88a
--- /dev/null
+++ b/media-sound/sound-juicer/files/digest-sound-juicer-2.20.1-r1
@@ -0,0 +1,3 @@
+MD5 cea3c67215c99acf513ee7ea4b5eba7b sound-juicer-2.20.1.tar.bz2 1412335
+RMD160 519c20c1c3d23973d93ecd4978d2dbe90967f7aa sound-juicer-2.20.1.tar.bz2 1412335
+SHA256 6ac84544386ef7f690330d7f92f6c2f64da752c0f5cd60501a792b23f325a9ab sound-juicer-2.20.1.tar.bz2 1412335
diff --git a/media-sound/sound-juicer/sound-juicer-2.16.4.ebuild b/media-sound/sound-juicer/sound-juicer-2.16.4.ebuild
index feaa7c50759d..10ccea1718b5 100644
--- a/media-sound/sound-juicer/sound-juicer-2.16.4.ebuild
+++ b/media-sound/sound-juicer/sound-juicer-2.16.4.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/media-sound/sound-juicer/sound-juicer-2.16.4.ebuild,v 1.14 2008/01/01 22:19:50 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sound-juicer/sound-juicer-2.16.4.ebuild,v 1.15 2008/01/02 12:22:27 aballier Exp $
 
 inherit gnome2
 
@@ -22,7 +22,6 @@ RDEPEND=">=dev-libs/glib-2
 	>=media-libs/gstreamer-0.10.3
 	>=gnome-extra/gnome-media-2.11.91
 	>=media-libs/musicbrainz-2.1
-	=media-libs/musicbrainz-2*
 	>=dev-libs/libcdio-0.70
 	media-libs/taglib
 	>=media-libs/gst-plugins-base-0.10
diff --git a/media-sound/sound-juicer/sound-juicer-2.20.0.ebuild b/media-sound/sound-juicer/sound-juicer-2.20.0.ebuild
index 4ef680bcbd57..26de781458ed 100644
--- a/media-sound/sound-juicer/sound-juicer-2.20.0.ebuild
+++ b/media-sound/sound-juicer/sound-juicer-2.20.0.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/media-sound/sound-juicer/sound-juicer-2.20.0.ebuild,v 1.4 2008/01/01 22:19:50 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sound-juicer/sound-juicer-2.20.0.ebuild,v 1.5 2008/01/02 12:22:27 aballier Exp $
 
 inherit gnome2
 
@@ -22,7 +22,6 @@ RDEPEND=">=dev-libs/glib-2
 	>=media-libs/gstreamer-0.10.5
 	>=gnome-extra/gnome-media-2.11.91
 	>=media-libs/musicbrainz-2.1.3
-	=media-libs/musicbrainz-2*
 	>=dev-libs/libcdio-0.70
 	media-libs/taglib
 	>=media-libs/gst-plugins-base-0.10
diff --git a/media-sound/sound-juicer/sound-juicer-2.20.1-r1.ebuild b/media-sound/sound-juicer/sound-juicer-2.20.1-r1.ebuild
new file mode 100644
index 000000000000..cec739cb7a24
--- /dev/null
+++ b/media-sound/sound-juicer/sound-juicer-2.20.1-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sound-juicer/sound-juicer-2.20.1-r1.ebuild,v 1.1 2008/01/02 12:22:27 aballier Exp $
+
+inherit gnome2
+
+EAPI="1"
+
+DESCRIPTION="CD ripper for GNOME 2"
+HOMEPAGE="http://www.burtonini.com/blog/computers/sound-juicer/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="flac ogg test"
+
+RDEPEND=">=dev-libs/glib-2
+	>=gnome-extra/nautilus-cd-burner-2.15.3
+	>=x11-libs/gtk+-2.8
+	>=gnome-base/libglade-2
+	>=gnome-base/gconf-2
+	>=gnome-base/libgnomeui-2.13
+	>=gnome-base/gnome-vfs-2.9
+	>=media-libs/gstreamer-0.10.5
+	>=gnome-extra/gnome-media-2.11.91
+	>=media-libs/musicbrainz-2.1.3:1
+	>=dev-libs/libcdio-0.70
+	media-libs/taglib
+	>=media-libs/gst-plugins-base-0.10
+	>=media-plugins/gst-plugins-gconf-0.10
+	>=media-plugins/gst-plugins-gnomevfs-0.10
+	>=media-plugins/gst-plugins-cdparanoia-0.10
+	ogg? ( >=media-plugins/gst-plugins-ogg-0.10 )
+	flac? ( >=media-plugins/gst-plugins-flac-0.10 )"
+
+DEPEND="${RDEPEND}
+	app-text/gnome-doc-utils
+	>=dev-util/intltool-0.35
+	>=app-text/scrollkeeper-0.3.5
+	>=dev-util/pkgconfig-0.9
+	test? ( ~app-text/docbook-xml-dtd-4.3 )"
+
+DOCS="AUTHORS ChangeLog NEWS README TODO"
+
+# needed to get around some sandboxing checks
+export GST_INSPECT=/bin/true
+
+src_unpack() {
+	gnome2_src_unpack
+	# Fix tests. Upstream SVN has this fixed so we can probably remove it for next version
+	echo "data/sound-juicer.desktop.in" >> "${S}/po/POTFILES.skip"
+}
+
+pkg_setup() {
+	G2CONF="${G2CONF} --disable-scrollkeeper"
+}
diff --git a/media-sound/sound-juicer/sound-juicer-2.20.1.ebuild b/media-sound/sound-juicer/sound-juicer-2.20.1.ebuild
index 2d021d81dc6d..9c24828ae4c0 100644
--- a/media-sound/sound-juicer/sound-juicer-2.20.1.ebuild
+++ b/media-sound/sound-juicer/sound-juicer-2.20.1.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/media-sound/sound-juicer/sound-juicer-2.20.1.ebuild,v 1.10 2008/01/01 22:19:50 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sound-juicer/sound-juicer-2.20.1.ebuild,v 1.11 2008/01/02 12:22:27 aballier Exp $
 
 inherit gnome2
 
@@ -22,7 +22,6 @@ RDEPEND=">=dev-libs/glib-2
 	>=media-libs/gstreamer-0.10.5
 	>=gnome-extra/gnome-media-2.11.91
 	>=media-libs/musicbrainz-2.1.3
-	=media-libs/musicbrainz-2*
 	>=dev-libs/libcdio-0.70
 	media-libs/taglib
 	>=media-libs/gst-plugins-base-0.10