Fix bug #318555 and remove old and broken versions.

(Portage version: 2.1.8.3/cvs/Linux x86_64)

3 files changed, 18 insertions, 66 deletions

diff --git a/media-sound/sound-juicer/ChangeLog b/media-sound/sound-juicer/ChangeLog
index ad88af359361..1066ac8dd746 100644
--- a/media-sound/sound-juicer/ChangeLog
+++ b/media-sound/sound-juicer/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-sound/sound-juicer
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/sound-juicer/ChangeLog,v 1.185 2010/05/04 16:24:31 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sound-juicer/ChangeLog,v 1.186 2010/05/05 17:37:50 pacho Exp $
+
+*sound-juicer-2.28.2-r1 (05 May 2010)
+
+  05 May 2010; Pacho Ramos <pacho@gentoo.org> -sound-juicer-2.28.1.ebuild,
+  -sound-juicer-2.28.2.ebuild, +sound-juicer-2.28.2-r1.ebuild:
+  Revision bump to fix translation due broken intltoolize file (bug #318555,
+  thanks a lot to Jeremy Guitton for reporting the problem). Remove old
+  testing and broken versions.
 
   03 May 2010; Olivier Crête <tester@gentoo.org>
   sound-juicer-2.28.2.ebuild:
diff --git a/media-sound/sound-juicer/sound-juicer-2.28.1.ebuild b/media-sound/sound-juicer/sound-juicer-2.28.2-r1.ebuild
index cbfa271f4094..6901fda52456 100644
--- a/media-sound/sound-juicer/sound-juicer-2.28.1.ebuild
+++ b/media-sound/sound-juicer/sound-juicer-2.28.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.28.1.ebuild,v 1.4 2010/03/09 00:05:14 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sound-juicer/sound-juicer-2.28.2-r1.ebuild,v 1.1 2010/05/05 17:37:50 pacho Exp $
 
 EAPI="2"
 
@@ -56,6 +56,14 @@ pkg_setup() {
 	export GST_INSPECT=/bin/true
 }
 
+src_prepare() {
+	gnome2_src_prepare
+
+	# Fix intltoolize broken file, see upstream #577133
+	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in \
+		|| die "sed 4 failed"
+}
+
 pkg_postinst() {
 	gnome2_pkg_postinst
 	echo
diff --git a/media-sound/sound-juicer/sound-juicer-2.28.2.ebuild b/media-sound/sound-juicer/sound-juicer-2.28.2.ebuild
deleted file mode 100644
index 1f6087c73c56..000000000000
--- a/media-sound/sound-juicer/sound-juicer-2.28.2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2010 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.28.2.ebuild,v 1.2 2010/05/04 16:24:31 tester Exp $
-
-EAPI="2"
-
-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 ~x86-fbsd"
-IUSE="test"
-
-# FIXME: possibly automagic dual slot dep on musicbrainz, bug #275798
-COMMON_DEPEND=">=dev-libs/glib-2.18
-	>=x11-libs/gtk+-2.14
-
-	>=gnome-base/libglade-2
-	>=gnome-base/gconf-2
-	media-libs/libcanberra[gtk]
-	dev-libs/dbus-glib
-
-	>=media-libs/musicbrainz-2.1.3:1
-	>=media-libs/musicbrainz-3.0.2:3
-	>=dev-libs/libcdio-0.70[-minimal]
-	>=gnome-extra/gnome-media-2.11.91
-	>=app-cdr/brasero-0.9.1
-
-	>=media-libs/gstreamer-0.10.15:0.10
-	>=media-libs/gst-plugins-base-0.10:0.10"
-
-RDEPEND="${COMMON_DEPEND}
-	>=media-plugins/gst-plugins-gconf-0.10:0.10
-	>=media-plugins/gst-plugins-gio-0.10:0.10
-	|| (
-		>=media-plugins/gst-plugins-cdparanoia-0.10:0.10
-		>=media-plugins/gst-plugins-cdio-0.10:0.10 )
-	>=media-plugins/gst-plugins-meta-0.10-r2:0.10"
-
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.40
-	>=app-text/scrollkeeper-0.3.5
-	app-text/gnome-doc-utils
-	test? ( ~app-text/docbook-xml-dtd-4.3 )"
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-
-pkg_setup() {
-	G2CONF="${G2CONF} --disable-scrollkeeper"
-
-	# needed to get around some sandboxing checks
-	export GST_INSPECT=/bin/true
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	echo
-	ewarn "If ${PN} does not rip to some music format, please check your"
-	ewarn "USE flags on media-plugins/gst-plugins-meta"
-}