Fix bug #318555 and remove old and broken versions.

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

diff --git a/media-sound/sound-juicer/ChangeLog b/media-sound/sound-juicer/ChangeLog
index ad88af359361b49b6151f9c8d4432467a6122edf..1066ac8dd746a3954746411279251d91aab9d753 100644 (file)
--- 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/Manifest b/media-sound/sound-juicer/Manifest
index af236cab0b7c4fedc4a72ad36d18ef9f32647ceb..a99dd640fb914d3f2fb5e4d96769ab73198245b8 100644 (file)
--- a/media-sound/sound-juicer/Manifest
+++ b/media-sound/sound-juicer/Manifest
@@ -3,18 +3,16 @@ Hash: SHA1
 
 DIST sound-juicer-2.26.1.tar.bz2 1993986 RMD160 067dfa3c35ac13f0a594c04e2935d574061952b0 SHA1 ed8d04a4536122626910eb0217147793f632e481 SHA256 5e6220158270b5f76e6a9f74f597837b41000c695e4ae81254dd945024c0c9e5
 DIST sound-juicer-2.26.2.tar.bz2 2044472 RMD160 ca086f859025edb6aa614c9378868705a8b4e845 SHA1 0c5a72bb5d3e90454e009ed4d64e1cd3cd8e9fc3 SHA256 66edbafd39d6b313e1bdbc7409796fbc34cb3c4585f123b73d86f41e98dc1dea
-DIST sound-juicer-2.28.1.tar.bz2 2159961 RMD160 5bf6cd55161fc5f83e5f2e7a19c154d62c144816 SHA1 c12e6b4f38d5fe4ea95519bd6315f97b4c51b727 SHA256 3142cce899812c6fb8c7145d52323f07d6ecfd6ca0503f4c7a32a12c00b8910c
 DIST sound-juicer-2.28.2.tar.bz2 2193659 RMD160 7a69c08fdc8d21070e28ddcccf264c9882d182af SHA1 2f4c27fdaabb5ea4465e53aa8ecbbc4afb46b973 SHA256 f4dde2db5bfbae023ff5042257600f9acdb42626f878a079c271cc838eefae30
 EBUILD sound-juicer-2.26.1.ebuild 1694 RMD160 aac125c2c2291436a59c4fcc581351d36c42299b SHA1 c63eb2270edb820cbe9413d87f58c946a06c9cc7 SHA256 54cfd6dd365338944e781b81e641facb752488f2c32cc22a8142d674f64c0b07
 EBUILD sound-juicer-2.26.2.ebuild 1732 RMD160 4ce24e363b2880f0a3d99ad2c5e9d6efbcd37fc0 SHA1 4d18e4fe1020bd40c03f7fab766e7af327dc4792 SHA256 2e51a0f3ba13a61efc2e58c0e36190843220a85b8056fde3b0114b02694e8223
-EBUILD sound-juicer-2.28.1.ebuild 1733 RMD160 ef29cd2809d4fc784608d70d89d3ce8bc1b13f44 SHA1 0b9a7015d282bed3723b48f915209c3a47cf3d9d SHA256 ab62a5eabb0eac9ee3bd30a5fa61b5a30f51aae9ac11a488e26bda965f6b567e
-EBUILD sound-juicer-2.28.2.ebuild 1735 RMD160 e431f7a11c659dabae6564808cd2e9c22dc02773 SHA1 baf48fcf0846ae0181b917da78a91c9fe5858315 SHA256 729b258d0f2f728a4e644cdb71d827e2e7d61e061d24fb2abd487a0920d73773
-MISC ChangeLog 25350 RMD160 7dca81033dc6f560f44ec1dc5bd54660c0afdcde SHA1 aab5c80d7486a88ee7bd0eb956f16fbb5cb42eb9 SHA256 e3d8bf9ee10d890fafba118fcc686b045ec1cd9804d5af602c39e5fc0f2715b2
+EBUILD sound-juicer-2.28.2-r1.ebuild 1921 RMD160 bd3aaad2d7054e8252a2d9dace037af2d5061674 SHA1 6db7d9d7a9daac40ddd7354e09f90b8e198e726c SHA256 a350dca7946cc1547e7e613d70bfc4a72517398f18348ecb8698bb4f66814f03
+MISC ChangeLog 25707 RMD160 8d98d3d5d8f2d0992bb351623b3d4dde09f44990 SHA1 53aed4d652450546895cf7cf3b01788b86886e4f SHA256 2d6539be7218d4db70a53747d7d0186cd5be56363f957d55f612fddb55158e04
 MISC metadata.xml 177 RMD160 c4ff678488aa3bd8f3e5e4cf6e52a56caba3dad9 SHA1 73b04fb757f8a6473a2c43b0807a95381da37afc SHA256 dfb196addaf8aa212436c53c3d47cda0d10c2850c59fa2dcb7554dfa10190af2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkvgSkkACgkQmOfEJZHYOKdNPwCg6k3dLIyMp0nxDfFu9Tcnr8aB
-Uw4AoJ/ac5e5PEB/ZHj8rGA+1xtRCl1t
-=fXOR
+iEYEARECAAYFAkvhrPYACgkQCaWpQKGI+9TE0ACfSPAGuEKA2SeGI9GFvD0MTrdA
+40wAn2sF2u2qq5ITmrRK7gRNu5kvgASl
+=6asW
 -----END PGP SIGNATURE-----

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
similarity index 87%
rename from media-sound/sound-juicer/sound-juicer-2.28.1.ebuild
rename to media-sound/sound-juicer/sound-juicer-2.28.2-r1.ebuild
index cbfa271f4094f312a091960dc63bcf5e5c77d326..6901fda5245663e03a5cd21dbd415707cb27b988 100644 (file)
--- 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 (file)
index 1f6087c..0000000
--- 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"
-}