fix DEPEND for FEATURES="test" and remove old version

Package-Manager: portage-2.1.3.16

7 files changed, 45 insertions, 85 deletions

diff --git a/media-sound/sound-juicer/ChangeLog b/media-sound/sound-juicer/ChangeLog
index dda6f5792f71..7ef198f9ab1a 100644
--- a/media-sound/sound-juicer/ChangeLog
+++ b/media-sound/sound-juicer/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/sound-juicer
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/sound-juicer/ChangeLog,v 1.117 2007/10/19 08:48:08 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sound-juicer/ChangeLog,v 1.118 2007/10/28 18:14:08 eva Exp $
+
+  28 Oct 2007; Gilles Dartiguelongue <eva@gentoo.org>
+  -sound-juicer-2.16.2.ebuild, sound-juicer-2.16.4.ebuild,
+  sound-juicer-2.20.0.ebuild, sound-juicer-2.20.1.ebuild:
+  fix DEPEND to pass tests and remove old version
 
   19 Oct 2007; Roy Marples <uberlord@gentoo.org> sound-juicer-2.20.1.ebuild:
   Keyworded ~x86-fbsd
diff --git a/media-sound/sound-juicer/Manifest b/media-sound/sound-juicer/Manifest
index 75ca4d48715c..c222bb4baa73 100644
--- a/media-sound/sound-juicer/Manifest
+++ b/media-sound/sound-juicer/Manifest
@@ -1,34 +1,29 @@
-DIST sound-juicer-2.16.2.tar.bz2 1265882 RMD160 ce0d25fa6a1feda0c882e68a73f5895f466e85e1 SHA1 a8e500939ac39f5098508e0e908af1ea5299f669 SHA256 306fa035f1b6f73ee892dbb4144e21c6ed59f2e2a4999790ac723644438d7932
+-----BEGIN PGP SIGNED MESSAGE-----
+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.2.ebuild 1355 RMD160 27bad885062f92782c08a9c18235a7ee1ac54df0 SHA1 b17a435aa3ecc06d8736c61b3df447c7e19d8adb SHA256 3bbe5d3bc155252efbed9eecdbca06274f7d09d2681486dc3a8e986a8dc4a26f
-MD5 7818a9fae4d1a67886899d96d1e20263 sound-juicer-2.16.2.ebuild 1355
-RMD160 27bad885062f92782c08a9c18235a7ee1ac54df0 sound-juicer-2.16.2.ebuild 1355
-SHA256 3bbe5d3bc155252efbed9eecdbca06274f7d09d2681486dc3a8e986a8dc4a26f sound-juicer-2.16.2.ebuild 1355
-EBUILD sound-juicer-2.16.4.ebuild 1552 RMD160 f83f75b40ba5c863f757438a437db1f036b44a38 SHA1 52c2c37c7107fe3186ed2010e2fcf51f6f36ddc1 SHA256 35c64610dcc2c326a605fc10958a71d696767d8baea84147e48cce33b6db808e
-MD5 31df9157d4fae2fb7b7bb7c5618db534 sound-juicer-2.16.4.ebuild 1552
-RMD160 f83f75b40ba5c863f757438a437db1f036b44a38 sound-juicer-2.16.4.ebuild 1552
-SHA256 35c64610dcc2c326a605fc10958a71d696767d8baea84147e48cce33b6db808e sound-juicer-2.16.4.ebuild 1552
-EBUILD sound-juicer-2.20.0.ebuild 1553 RMD160 3489c6bf80c40ce626a5db47f4fc56761448ecd4 SHA1 d8e9f5bbbbd1616fe76fe343fcfe706eeadfd9f8 SHA256 eddfe53363a4d7e7fdc76479600d4a9b19182c16057b36551f2026d90c46c99a
-MD5 40486332b8080c22c9c7219c8ff754a3 sound-juicer-2.20.0.ebuild 1553
-RMD160 3489c6bf80c40ce626a5db47f4fc56761448ecd4 sound-juicer-2.20.0.ebuild 1553
-SHA256 eddfe53363a4d7e7fdc76479600d4a9b19182c16057b36551f2026d90c46c99a sound-juicer-2.20.0.ebuild 1553
-EBUILD sound-juicer-2.20.1.ebuild 1562 RMD160 1bf43822cd554907d5081d4e9e8eb4d8f70f0c21 SHA1 ca705c8d5189758b682b8b93eaee1f81ae2c73f3 SHA256 c3a6f296a42d1d72ed39d877a771e9f8a6dcd9c92fcc6cc6006c32c4d8951b7b
-MD5 43f130a5d6dc7162fb6e7d9be9844a7e sound-juicer-2.20.1.ebuild 1562
-RMD160 1bf43822cd554907d5081d4e9e8eb4d8f70f0c21 sound-juicer-2.20.1.ebuild 1562
-SHA256 c3a6f296a42d1d72ed39d877a771e9f8a6dcd9c92fcc6cc6006c32c4d8951b7b sound-juicer-2.20.1.ebuild 1562
-MISC ChangeLog 16111 RMD160 f28b66fd1867e74350356928210d3eb6046b003e SHA1 d2ba1bd9ec78225ea008a62d3f5461adae430ec8 SHA256 b8ba82b42284b05f518bc75b4f57377f22f86ab324710d7e72da0eeec08fcc3c
-MD5 33328077f8758944f7f7cec1367c7675 ChangeLog 16111
-RMD160 f28b66fd1867e74350356928210d3eb6046b003e ChangeLog 16111
-SHA256 b8ba82b42284b05f518bc75b4f57377f22f86ab324710d7e72da0eeec08fcc3c ChangeLog 16111
+EBUILD sound-juicer-2.16.4.ebuild 1594 RMD160 61aedd5435ef787241c912b6e0d9f69d867dc35b SHA1 8dc6e8b32dc7ce150ca72c65da7e0f052e27ee7a SHA256 241bf361d84960f8980b48ec8339a7a2e2ed74eba8fabd87d9400c9a8f38ac8d
+MD5 82fd915ce11e72806d4eb8c5db418976 sound-juicer-2.16.4.ebuild 1594
+RMD160 61aedd5435ef787241c912b6e0d9f69d867dc35b sound-juicer-2.16.4.ebuild 1594
+SHA256 241bf361d84960f8980b48ec8339a7a2e2ed74eba8fabd87d9400c9a8f38ac8d sound-juicer-2.16.4.ebuild 1594
+EBUILD sound-juicer-2.20.0.ebuild 1603 RMD160 98c4b7f89c475916075443696b91052393f32e7b SHA1 aed4f7e64440c4145e355f3fdb4571991a380e2d SHA256 91087716f5dd66ab6dd0deb0693ec0fc9e5fc3264899bedabb3bbf977577c7d5
+MD5 954dacfbe98661194514f37f49837191 sound-juicer-2.20.0.ebuild 1603
+RMD160 98c4b7f89c475916075443696b91052393f32e7b sound-juicer-2.20.0.ebuild 1603
+SHA256 91087716f5dd66ab6dd0deb0693ec0fc9e5fc3264899bedabb3bbf977577c7d5 sound-juicer-2.20.0.ebuild 1603
+EBUILD sound-juicer-2.20.1.ebuild 1603 RMD160 dcd503c6014e5f4be3dbaac4b1acd5fc6cbd012b SHA1 79ed88a46c3714a3f34e9b2171c2ac5ffcc1688e SHA256 0fd88b445564e7b0808752317df2f07d1bebca672185eb81941651cbe5bd8661
+MD5 4c8bccf297af41e97e7f72a3923d7e03 sound-juicer-2.20.1.ebuild 1603
+RMD160 dcd503c6014e5f4be3dbaac4b1acd5fc6cbd012b sound-juicer-2.20.1.ebuild 1603
+SHA256 0fd88b445564e7b0808752317df2f07d1bebca672185eb81941651cbe5bd8661 sound-juicer-2.20.1.ebuild 1603
+MISC ChangeLog 16328 RMD160 b1bc8199fe7429b3bc4334f1fb1718fb5aec729e SHA1 736f9a68d08759ebf618d7e5e45dd59bedd4a8d6 SHA256 ff04cf741a1e2f109c7a4dbe9dec1ce96e12865e88eafd3e699398bba76f6d1d
+MD5 5cf1082a76b90ede5844c80778d4a34e ChangeLog 16328
+RMD160 b1bc8199fe7429b3bc4334f1fb1718fb5aec729e ChangeLog 16328
+SHA256 ff04cf741a1e2f109c7a4dbe9dec1ce96e12865e88eafd3e699398bba76f6d1d ChangeLog 16328
 MISC metadata.xml 177 RMD160 c4ff678488aa3bd8f3e5e4cf6e52a56caba3dad9 SHA1 73b04fb757f8a6473a2c43b0807a95381da37afc SHA256 dfb196addaf8aa212436c53c3d47cda0d10c2850c59fa2dcb7554dfa10190af2
 MD5 b263ff7675308d90b75a170acae3f5ff metadata.xml 177
 RMD160 c4ff678488aa3bd8f3e5e4cf6e52a56caba3dad9 metadata.xml 177
 SHA256 dfb196addaf8aa212436c53c3d47cda0d10c2850c59fa2dcb7554dfa10190af2 metadata.xml 177
-MD5 45079436ba3d935d53e4ae1ca191c218 files/digest-sound-juicer-2.16.2 265
-RMD160 71350fbee6fad4ad6d6977ca8f0e4f54e6b0aa3d files/digest-sound-juicer-2.16.2 265
-SHA256 63d1ef73c9b467a6b4c7ff98011e5414ff94465749bec40f5bb0afd64fd8d7c0 files/digest-sound-juicer-2.16.2 265
 MD5 6cf9d642d3ad83fba44fa3c6713146d4 files/digest-sound-juicer-2.16.4 265
 RMD160 882adb2cee6c328feee2f3e1101e393eeb21e5dc files/digest-sound-juicer-2.16.4 265
 SHA256 92f882ef497e7ad7911e06e99973739fd8ddac5f7d8fd2eeb511d07c6f175f85 files/digest-sound-juicer-2.16.4 265
@@ -38,3 +33,10 @@ 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
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHJNF91fmVwcYIWAYRAp1kAKCqu1rGVKyLUMN/y8HAKVGdYnTvBwCgxJG/
+2We5yUjDP/QicPHhIlNCFzc=
+=Wf3E
+-----END PGP SIGNATURE-----
diff --git a/media-sound/sound-juicer/files/digest-sound-juicer-2.16.2 b/media-sound/sound-juicer/files/digest-sound-juicer-2.16.2
deleted file mode 100644
index a8d68b8779c5..000000000000
--- a/media-sound/sound-juicer/files/digest-sound-juicer-2.16.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 2427ed778ab3366b47405af349be3a33 sound-juicer-2.16.2.tar.bz2 1265882
-RMD160 ce0d25fa6a1feda0c882e68a73f5895f466e85e1 sound-juicer-2.16.2.tar.bz2 1265882
-SHA256 306fa035f1b6f73ee892dbb4144e21c6ed59f2e2a4999790ac723644438d7932 sound-juicer-2.16.2.tar.bz2 1265882
diff --git a/media-sound/sound-juicer/sound-juicer-2.16.2.ebuild b/media-sound/sound-juicer/sound-juicer-2.16.2.ebuild
deleted file mode 100644
index dfdcbd741429..000000000000
--- a/media-sound/sound-juicer/sound-juicer-2.16.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2007 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.2.ebuild,v 1.10 2007/07/11 19:30:24 mr_bones_ Exp $
-
-inherit gnome2
-
-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"
-IUSE="flac ogg"
-
-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.3
-	>=gnome-extra/gnome-media-2.11.91
-	>=media-libs/musicbrainz-2.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"
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-
-# needed to get around some sandboxing checks
-export GST_INSPECT=/bin/true
-
-pkg_setup() {
-	G2CONF="${G2CONF} --disable-scrollkeeper"
-}
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 a4f8ec98a7b0..9351406cb8d4 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-2007 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.12 2007/07/25 21:44:04 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sound-juicer/sound-juicer-2.16.4.ebuild,v 1.13 2007/10/28 18:14:08 eva Exp $
 
 inherit gnome2
 
@@ -10,7 +10,7 @@ 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"
+IUSE="flac ogg test"
 
 RDEPEND=">=dev-libs/glib-2
 	>=gnome-extra/nautilus-cd-burner-2.15.3
@@ -35,7 +35,8 @@ DEPEND="${RDEPEND}
 	app-text/gnome-doc-utils
 	>=dev-util/intltool-0.35
 	>=app-text/scrollkeeper-0.3.5
-	>=dev-util/pkgconfig-0.9"
+	>=dev-util/pkgconfig-0.9
+	test? ( ~app-text/docbook-xml-dtd-4.3 )"
 
 DOCS="AUTHORS ChangeLog NEWS README TODO"
 
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 9a79fc379f03..f92bebda8e3d 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-2007 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.2 2007/10/13 22:47:56 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sound-juicer/sound-juicer-2.20.0.ebuild,v 1.3 2007/10/28 18:14:08 eva Exp $
 
 inherit gnome2
 
@@ -9,8 +9,8 @@ HOMEPAGE="http://www.burtonini.com/blog/computers/sound-juicer/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="flac ogg"
+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
@@ -35,7 +35,8 @@ DEPEND="${RDEPEND}
 	app-text/gnome-doc-utils
 	>=dev-util/intltool-0.35
 	>=app-text/scrollkeeper-0.3.5
-	>=dev-util/pkgconfig-0.9"
+	>=dev-util/pkgconfig-0.9
+	test? ( ~app-text/docbook-xml-dtd-4.3 )"
 
 DOCS="AUTHORS ChangeLog NEWS README TODO"
 
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 4ff0f04e58ca..e7a016c5724e 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-2007 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.2 2007/10/19 08:48:08 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sound-juicer/sound-juicer-2.20.1.ebuild,v 1.3 2007/10/28 18:14:08 eva Exp $
 
 inherit gnome2
 
@@ -10,7 +10,7 @@ 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"
+IUSE="flac ogg test"
 
 RDEPEND=">=dev-libs/glib-2
 	>=gnome-extra/nautilus-cd-burner-2.15.3
@@ -35,7 +35,8 @@ DEPEND="${RDEPEND}
 	app-text/gnome-doc-utils
 	>=dev-util/intltool-0.35
 	>=app-text/scrollkeeper-0.3.5
-	>=dev-util/pkgconfig-0.9"
+	>=dev-util/pkgconfig-0.9
+	test? ( ~app-text/docbook-xml-dtd-4.3 )"
 
 DOCS="AUTHORS ChangeLog NEWS README TODO"