bump to r1, add patch to handle uris, bug #229745.

Package-Manager: portage-2.2_rc3/cvs/Linux 2.6.24-gentoo-r8-mactel x86_64

4 files changed, 151 insertions, 2 deletions

diff --git a/media-sound/sound-juicer/ChangeLog b/media-sound/sound-juicer/ChangeLog
index c1b6a8982efa..4e1b7dd2ffc1 100644
--- a/media-sound/sound-juicer/ChangeLog
+++ b/media-sound/sound-juicer/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/sound-juicer
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/sound-juicer/ChangeLog,v 1.142 2008/07/30 22:02:13 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sound-juicer/ChangeLog,v 1.143 2008/07/31 21:23:45 eva Exp $
+
+*sound-juicer-2.22.0-r1 (31 Jul 2008)
+
+  31 Jul 2008; Gilles Dartiguelongue <eva@gentoo.org>
+  +files/sound-juicer-2.22.0-sj-handle-uri.patch,
+  +sound-juicer-2.22.0-r1.ebuild:
+  bump to r1, add patch to handle uris, bug #229745.
 
   30 Jul 2008; Brent Baude <ranger@gentoo.org> sound-juicer-2.22.0.ebuild:
   Marking sound-juicer-2.22.0 ppc stable for bug 229709
diff --git a/media-sound/sound-juicer/Manifest b/media-sound/sound-juicer/Manifest
index 09606edbffc0..5d7281bc7536 100644
--- a/media-sound/sound-juicer/Manifest
+++ b/media-sound/sound-juicer/Manifest
@@ -1,6 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX sound-juicer-2.22.0-sj-handle-uri.patch 2483 RMD160 94ab3351fb27039773ed9a668408db444e8255a9 SHA1 ed3f52386494593803654553a153aef34d2d2086 SHA256 8683c73473c3aaa5cd52ee645f9ef800e985406ce0ef0e7a074f30e0c54b12d8
 DIST sound-juicer-2.20.1.tar.bz2 1412335 RMD160 519c20c1c3d23973d93ecd4978d2dbe90967f7aa SHA1 942e4e34b83b66e9b33496f38ff95674244e33e2 SHA256 6ac84544386ef7f690330d7f92f6c2f64da752c0f5cd60501a792b23f325a9ab
 DIST sound-juicer-2.22.0.tar.bz2 1748273 RMD160 a71c8caa472d200ea8a199442f0728849ad71149 SHA1 d710d2041f4214a80387d6518056856c6401719a SHA256 cabd3c44a3354edab4f9e112b1cc90c23ef05000bd643596a826ce5d0cfc2551
 EBUILD sound-juicer-2.20.1-r1.ebuild 1610 RMD160 f983281c41d3db299761ed226531b2bf3bee0e54 SHA1 280d7a5abf55b59aa0ae6ebf93f32ca8bb69c375 SHA256 bb2ebb7b91649f61cd40182cad174e8a9138396faa1e781fced1508e7ac97fbc
+EBUILD sound-juicer-2.22.0-r1.ebuild 1746 RMD160 3425e2b240325eab447c17fba7847bf0ef4b235e SHA1 478ee35d0e75c2792caae4dc29e2a8322df4e5cd SHA256 28c75a12a618878b2643a3a78d02bb02ee9476bddbfa08a51eebdc1b93c403c1
 EBUILD sound-juicer-2.22.0.ebuild 1625 RMD160 75c7c958a50339e1d70bf11c763ceb02a494ea5c SHA1 8368ae35873fcef062b5be16924db148393fa992 SHA256 b417b897da40cd5653118d70239ea11a8e26794027bd76ae064d89b351a51444
-MISC ChangeLog 19591 RMD160 639d5eaef23b8ed02cec6f59c97a0e699fcca4ef SHA1 73e6b4dd5c695de9346551053cd29a0983067bed SHA256 60aadbb41360eb07fb82e27c96741a31cc21a33c7fca327a4bf58cbbe45857f9
+MISC ChangeLog 19819 RMD160 f92c72419b0e8d6118c455a57f66522dc887c499 SHA1 f4e955c40480c08ec300cf736380c86196fb2306 SHA256 bdf3d5f385b9e4d0c133044b16a15f170937d65692620e3bac4647b7b93915bf
 MISC metadata.xml 177 RMD160 c4ff678488aa3bd8f3e5e4cf6e52a56caba3dad9 SHA1 73b04fb757f8a6473a2c43b0807a95381da37afc SHA256 dfb196addaf8aa212436c53c3d47cda0d10c2850c59fa2dcb7554dfa10190af2
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkiSLWsACgkQ1fmVwcYIWAZgegCg1eAV+EPgpO3gnjP1tj05kQ8g
+NywAn3JR21uaZRoEv5OZ/16umQjn5S+z
+=dtmr
+-----END PGP SIGNATURE-----
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
new file mode 100644
index 000000000000..80026e5f63a7
--- /dev/null
+++ b/media-sound/sound-juicer/files/sound-juicer-2.22.0-sj-handle-uri.patch
@@ -0,0 +1,61 @@
+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.22.0-r1.ebuild b/media-sound/sound-juicer/sound-juicer-2.22.0-r1.ebuild
new file mode 100644
index 000000000000..a41af42f269e
--- /dev/null
+++ b/media-sound/sound-juicer/sound-juicer-2.22.0-r1.ebuild
@@ -0,0 +1,69 @@
+# 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.1 2008/07/31 21:23:45 eva 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
+}