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

(Portage version: 2.1.3.16)

6 files changed, 19 insertions, 61 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/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"