New version for GNOME 2.26. Migrate to musicbrainz3, brasero, drop libgnome, use libcanberra for events. Clean up old revisions.

(Portage version: 2.2_rc31/cvs/Linux x86_64)

5 files changed, 39 insertions, 214 deletions

diff --git a/media-sound/sound-juicer/ChangeLog b/media-sound/sound-juicer/ChangeLog
index 21311754f638..f4cac3479d51 100644
--- a/media-sound/sound-juicer/ChangeLog
+++ b/media-sound/sound-juicer/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-sound/sound-juicer
 # Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/sound-juicer/ChangeLog,v 1.164 2009/04/27 14:28:36 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sound-juicer/ChangeLog,v 1.165 2009/05/02 22:13:40 eva Exp $
+
+*sound-juicer-2.26.1 (02 May 2009)
+
+  02 May 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  -files/sound-juicer-2.22.0-sj-handle-uri.patch,
+  -sound-juicer-2.20.1-r1.ebuild, -sound-juicer-2.22.0.ebuild,
+  -sound-juicer-2.22.0-r1.ebuild, +sound-juicer-2.26.1.ebuild:
+  New version for GNOME 2.26. Migrate to musicbrainz3, brasero, drop
+  libgnome, use libcanberra for events. Clean up old revisions.
 
   27 Apr 2009; Jeroen Roovers <jer@gentoo.org> sound-juicer-2.24.0:
   Stable for HPPA (bug #260063).
diff --git a/media-sound/sound-juicer/files/sound-juicer-2.22.0-sj-handle-uri.patch b/media-sound/sound-juicer/files/sound-juicer-2.22.0-sj-handle-uri.patch
deleted file mode 100644
index 80026e5f63a7..000000000000
--- a/media-sound/sound-juicer/files/sound-juicer-2.22.0-sj-handle-uri.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-Index: src/sj-main.c
-===================================================================
---- src/sj-main.c	(revision 2168)
-+++ src/sj-main.c	(working copy)
-@@ -1576,12 +1576,13 @@
-   GnomeProgram *program;
-   GError *error = NULL;
-   GtkTreeSelection *selection;
--  char *device = NULL;
-+  char *device = NULL, **uris = NULL;
-   GOptionContext *ctx;
-   const GOptionEntry entries[] = {
-     { "auto-start", 'a', 0, G_OPTION_ARG_NONE, &autostart, N_("Start extracting immediately"), NULL },
-     { "play", 'p', 0, G_OPTION_ARG_NONE, &autoplay, N_("Start playing immediately"), NULL},
-     { "device", 'd', 0, G_OPTION_ARG_FILENAME, &device, N_("What CD device to read"), N_("DEVICE") },
-+    { G_OPTION_REMAINING, '\0', 0, G_OPTION_ARG_FILENAME_ARRAY, &uris, N_("URI to the CD device to read"), NULL },
-     { NULL }
-   };
- 
-@@ -1803,10 +1804,26 @@
-   eject_changed_cb (gconf_client, -1, gconf_client_get_entry (gconf_client, GCONF_EJECT, NULL, TRUE, NULL), NULL);
-   open_changed_cb (gconf_client, -1, gconf_client_get_entry (gconf_client, GCONF_OPEN, NULL, TRUE, NULL), NULL);
-   audio_volume_changed_cb (gconf_client, -1, gconf_client_get_entry (gconf_client, GCONF_AUDIO_VOLUME, NULL, TRUE, NULL), NULL);
--  if (device == NULL) {
-+  if (device == NULL && uris == NULL) {
-     device_changed_cb (gconf_client, -1, gconf_client_get_entry (gconf_client, GCONF_DEVICE, NULL, TRUE, NULL), GINT_TO_POINTER (TRUE));
-   } else {
--    set_device (device, TRUE);
-+    if (device)
-+      set_device (device, TRUE);
-+    else {
-+      char *d;
-+
-+      /* Mash up the CDDA URIs into a device path */
-+      if (g_str_has_prefix (uris[0], "cdda://")) {
-+        guint len;
-+        d = g_strdup_printf ("/dev/%s", uris[0] + strlen ("cdda://"));
-+        len = strlen (d);
-+        d[len - 1] = '\0';
-+	set_device (d, TRUE);
-+	g_free (d);
-+      } else {
-+        device_changed_cb (gconf_client, -1, gconf_client_get_entry (gconf_client, GCONF_DEVICE, NULL, TRUE, NULL), GINT_TO_POINTER (TRUE));
-+      }
-+    }
-   }
- 
-   if (sj_extractor_supports_encoding (&error) == FALSE) {
-Index: data/sound-juicer.desktop.in.in
-===================================================================
---- data/sound-juicer.desktop.in.in	(revision 2168)
-+++ data/sound-juicer.desktop.in.in	(working copy)
-@@ -2,7 +2,7 @@
- Encoding=UTF-8
- _Name=Audio CD Extractor
- _Comment=Copy music from your CDs
--Exec=sound-juicer
-+Exec=sound-juicer %u
- Icon=sound-juicer
- StartupNotify=true
- MimeType=x-content/audio-cdda;
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
deleted file mode 100644
index 8ea2f2bb532a..000000000000
--- a/media-sound/sound-juicer/sound-juicer-2.20.1-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# 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.7 2008/02/04 04:12:13 jer 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.22.0-r1.ebuild b/media-sound/sound-juicer/sound-juicer-2.22.0-r1.ebuild
deleted file mode 100644
index 0ce89856c255..000000000000
--- a/media-sound/sound-juicer/sound-juicer-2.22.0-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# 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.22.0-r1.ebuild,v 1.7 2008/11/13 19:35:41 ranger Exp $
-
-EAPI="1"
-
-inherit eutils 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"
-
-RDEPEND=">=dev-libs/glib-2.14
-	>=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
-	dev-libs/dbus-glib
-	>=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
-		>=media-plugins/gst-plugins-cdio-0.10
-	)
-
-	>=media-plugins/gst-plugins-meta-0.10-r2:0.10"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.35
-	>=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"
-
-# needed to get around some sandboxing checks
-export GST_INSPECT=/bin/true
-
-pkg_setup() {
-	G2CONF="${G2CONF} --disable-scrollkeeper"
-}
-
-src_unpack() {
-	gnome2_src_unpack
-
-	# Handle uris, bug #229745
-	epatch "${FILESDIR}/${P}-sj-handle-uri.patch"
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	ewarn
-	ewarn "If ${PN} does not rip to some music format, please check your"
-	ewarn "USE flags on media-plugins/gst-plugins-meta"
-	ewarn
-}
diff --git a/media-sound/sound-juicer/sound-juicer-2.22.0.ebuild b/media-sound/sound-juicer/sound-juicer-2.26.1.ebuild
index 38e4e75db84e..addbad0fcf8f 100644
--- a/media-sound/sound-juicer/sound-juicer-2.22.0.ebuild
+++ b/media-sound/sound-juicer/sound-juicer-2.26.1.ebuild
@@ -1,56 +1,58 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 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.22.0.ebuild,v 1.12 2008/08/12 14:12:46 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sound-juicer/sound-juicer-2.26.1.ebuild,v 1.1 2009/05/02 22:13:40 eva Exp $
 
-EAPI="1"
+EAPI="2"
 
-inherit gnome2
+inherit eutils 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"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
 IUSE="test"
 
-RDEPEND=">=dev-libs/glib-2.14
-	>=gnome-extra/nautilus-cd-burner-2.15.3
-	>=x11-libs/gtk+-2.8
+# FIXME: possibly automagic dual slot dep on musicbrainz
+COMMON_DEPEND=">=dev-libs/glib-2.16
+	>=x11-libs/gtk+-2.14
+
 	>=gnome-base/libglade-2
 	>=gnome-base/gconf-2
-	>=gnome-base/libgnomeui-2.13
-	>=gnome-base/gnome-vfs-2.9
+	media-libs/libcanberra[gtk]
 	dev-libs/dbus-glib
-	>=media-libs/gstreamer-0.10.5
-	>=gnome-extra/gnome-media-2.11.91
-	>=media-libs/musicbrainz-2.1.3:1
+
+	>=media-libs/musicbrainz-3.0.2:3
 	>=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
-		>=media-plugins/gst-plugins-cdio-0.10
-	)
+	>=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="${RDEPEND}
+DEPEND="${COMMON_DEPEND}
 	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.35
+	>=dev-util/intltool-0.40
 	>=app-text/scrollkeeper-0.3.5
-	  app-text/gnome-doc-utils
+	app-text/gnome-doc-utils
 	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
-
 pkg_setup() {
 	G2CONF="${G2CONF} --disable-scrollkeeper"
+
+	# needed to get around some sandboxing checks
+	export GST_INSPECT=/bin/true
 }
 
 pkg_postinst() {