Fix build failure due to namespace collision of pause() with unistd.h

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

4 files changed, 105 insertions, 12 deletions

diff --git a/media-sound/sound-juicer/ChangeLog b/media-sound/sound-juicer/ChangeLog
index 0d4a6fcc5f5a..696da49f1530 100644
--- a/media-sound/sound-juicer/ChangeLog
+++ b/media-sound/sound-juicer/ChangeLog
@@ -1,6 +1,12 @@
 # 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.193 2010/09/11 18:53:18 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sound-juicer/ChangeLog,v 1.194 2010/09/26 22:09:40 nirbheek Exp $
+
+*sound-juicer-2.28.2-r2 (26 Sep 2010)
+
+  26 Sep 2010; <nirbheek@gentoo.org> +sound-juicer-2.28.2-r2.ebuild,
+  +files/sound-juicer-2.28.2-fix-pause-conflict.patch:
+  Fix build failure due to namespace collision of pause() with unistd.h
 
   11 Sep 2010; Joseph Jezak <josejx@gentoo.org>
   sound-juicer-2.28.2-r1.ebuild:
diff --git a/media-sound/sound-juicer/Manifest b/media-sound/sound-juicer/Manifest
index c97e0576721f..87c6f426a2ae 100644
--- a/media-sound/sound-juicer/Manifest
+++ b/media-sound/sound-juicer/Manifest
@@ -1,16 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX sound-juicer-2.28.2-fix-pause-conflict.patch 457 RMD160 ce0a4aeed67d5b4c529cbcfd1dad11cfeb9e66fa SHA1 1d7a67d400ec8cbd2c39d64b9e134c58199d83dd SHA256 cc2af2e6fd8731600020ee69052f5b27d092f4bb03a9e67c6373cb3fa6d05100
 DIST sound-juicer-2.26.2.tar.bz2 2044472 RMD160 ca086f859025edb6aa614c9378868705a8b4e845 SHA1 0c5a72bb5d3e90454e009ed4d64e1cd3cd8e9fc3 SHA256 66edbafd39d6b313e1bdbc7409796fbc34cb3c4585f123b73d86f41e98dc1dea
 DIST sound-juicer-2.28.2.tar.bz2 2193659 RMD160 7a69c08fdc8d21070e28ddcccf264c9882d182af SHA1 2f4c27fdaabb5ea4465e53aa8ecbbc4afb46b973 SHA256 f4dde2db5bfbae023ff5042257600f9acdb42626f878a079c271cc838eefae30
 EBUILD sound-juicer-2.26.2.ebuild 1723 RMD160 04dcd769859bb750273d4eb144e87528c483b58a SHA1 29fa00054106f0c1fff0a86039c0533bf36dac47 SHA256 607837484d47bc26e74f9e07faf66eacf33fa4afd4329d72d552fa7e04dc8d71
 EBUILD sound-juicer-2.28.2-r1.ebuild 1908 RMD160 d7fc40829452ae9be9335df801af7a3f7d8bfb5c SHA1 d23b4d54b407f2667c38e97c2fefd4d2a7af0000 SHA256 0f5f1e4cee4e5fd767885958ebad191d8348a32d1888516dcf44098f588acc50
-MISC ChangeLog 26486 RMD160 0997afab7d21b36882900198a324a50cc5b00b2f SHA1 4c8a369476680d23363b6826a7b972908c2637ff SHA256 27fbf7e2594a9e2e6de50569bef853c02846f4cc1a4c51d72c24891cfc7a6972
+EBUILD sound-juicer-2.28.2-r2.ebuild 2030 RMD160 8ad87f89ffa840b1c3142518c6522464623be6d3 SHA1 dffd4c47ce4fcace1000a47ee0a282ba89a4a930 SHA256 a96390773920a6937d61e3977c9978e8c89a79bfa39b69e82e1dfcdb4b8bbde4
+MISC ChangeLog 26724 RMD160 1c95dbfd152e9535910d39887cc8f1d037df2ef5 SHA1 6fb5cea634104ae3113af8f5c4a4c8f71ab9761d SHA256 b18b7a878e9dd4f62e5fe6fc5b83a4be8d8fb59f6f0d56e35a9217dc742addc1
 MISC metadata.xml 177 RMD160 c4ff678488aa3bd8f3e5e4cf6e52a56caba3dad9 SHA1 73b04fb757f8a6473a2c43b0807a95381da37afc SHA256 dfb196addaf8aa212436c53c3d47cda0d10c2850c59fa2dcb7554dfa10190af2
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iEYEARECAAYFAkyLzzIACgkQcsIHjyDViGRypgCgqzXv3t0NU142Tt1znfqdj5nS
-m6IAn0sHtWsRh0e5rhHXPfJh2JZNY5to
-=7waG
------END PGP SIGNATURE-----
diff --git a/media-sound/sound-juicer/files/sound-juicer-2.28.2-fix-pause-conflict.patch b/media-sound/sound-juicer/files/sound-juicer-2.28.2-fix-pause-conflict.patch
new file mode 100644
index 000000000000..56438871eb30
--- /dev/null
+++ b/media-sound/sound-juicer/files/sound-juicer-2.28.2-fix-pause-conflict.patch
@@ -0,0 +1,20 @@
+--- src/sj-play.c
++++ src/sj-play.c
+@@ -96,7 +96,7 @@
+  * Pause
+  */
+ static void
+-pause (void)
++do_pause (void)
+ {
+   gst_element_set_state (pipeline, GST_STATE_PAUSED);
+ }
+@@ -440,7 +440,7 @@
+   GError *err = NULL;
+ 
+   if (is_playing ()) {
+-    pause ();
++    do_pause ();
+     gtk_list_store_set (track_store, &current_iter,
+                         COLUMN_STATE, STATE_PAUSED, -1);
+  } else if (pipeline && GST_STATE (pipeline) == GST_STATE_PAUSED && 
diff --git a/media-sound/sound-juicer/sound-juicer-2.28.2-r2.ebuild b/media-sound/sound-juicer/sound-juicer-2.28.2-r2.ebuild
new file mode 100644
index 000000000000..57be97ba5805
--- /dev/null
+++ b/media-sound/sound-juicer/sound-juicer-2.28.2-r2.ebuild
@@ -0,0 +1,75 @@
+# 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-r2.ebuild,v 1.1 2010/09/26 22:09:40 nirbheek Exp $
+
+EAPI="2"
+
+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 ~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
+}
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# Fix namespace collision with pause() from unistd.h
+	epatch "${FILESDIR}/${P}-fix-pause-conflict.patch"
+
+	# Fix intltoolize broken file, see upstream #577133
+	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in \
+		|| die "sed failed"
+}
+
+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"
+}