add patch to use correct gst-launch and dep on 0.10

Package-Manager: portage-2.1.3_rc3

4 files changed, 35 insertions, 12 deletions

diff --git a/gnome-extra/gnome-power-manager/ChangeLog b/gnome-extra/gnome-power-manager/ChangeLog
index 3a9b8f8c2bf5..3f8890460949 100644
--- a/gnome-extra/gnome-power-manager/ChangeLog
+++ b/gnome-extra/gnome-power-manager/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-extra/gnome-power-manager
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-power-manager/ChangeLog,v 1.50 2007/06/17 07:25:51 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-power-manager/ChangeLog,v 1.51 2007/06/17 18:02:22 compnerd Exp $
+
+  17 Jun 2007; Saleem Abdulrasool <compnerd@gentoo.org>
+  +files/gpm-2.18.3-slotted-gstreamer.patch,
+  gnome-power-manager-2.18.3.ebuild:
+  Add a patch to use the correct gst-launch command on Gentoo
 
 *gnome-power-manager-2.18.3 (17 Jun 2007)
 
diff --git a/gnome-extra/gnome-power-manager/Manifest b/gnome-extra/gnome-power-manager/Manifest
index cd6b102c438e..18eec075d3d9 100644
--- a/gnome-extra/gnome-power-manager/Manifest
+++ b/gnome-extra/gnome-power-manager/Manifest
@@ -1,3 +1,7 @@
+AUX gpm-2.18.3-slotted-gstreamer.patch 406 RMD160 a4a1acb11b57f7a0cbfc4609577cb27e26596bd7 SHA1 a8d4fb212cd97a682b7ccf64177f25740e06f953 SHA256 242b0d08cf380c5957be9d251f3135986f28131eddeb54b87af7ef683824965f
+MD5 8f4c8aa938b99a072cadb26702610958 files/gpm-2.18.3-slotted-gstreamer.patch 406
+RMD160 a4a1acb11b57f7a0cbfc4609577cb27e26596bd7 files/gpm-2.18.3-slotted-gstreamer.patch 406
+SHA256 242b0d08cf380c5957be9d251f3135986f28131eddeb54b87af7ef683824965f files/gpm-2.18.3-slotted-gstreamer.patch 406
 DIST gnome-power-manager-2.14.3.tar.gz 953547 RMD160 25c8ebaac33529e4b15faf877da60975d2a0853f SHA1 3eccde6f49c5c66a9d4a81812f33e44e24d88f60 SHA256 adddb071871ee02b506576b151f9d2515ce77bfbc1366666b4e5842404c78324
 DIST gnome-power-manager-2.16.2.tar.gz 2389790 RMD160 a926525d92fa97f46166cadbad9175685b597718 SHA1 13f1d6f8fc7dafab3fba7cb54dc6cd9fafead8a2 SHA256 8b9c27386f516f9ea2f31e42163e1e52040e07d610d769ece2274455b0a9e28e
 DIST gnome-power-manager-2.16.3.tar.gz 2382038 RMD160 97a93de5904e9c01567ba8eed6080d452ca61317 SHA1 2d9a1391b97a10bfd03829a3ea60550403b66ec5 SHA256 2e2c5b06f6c75903e48a017f7a909ef37292ffc60a9dea4877f3c61624664126
@@ -24,14 +28,14 @@ EBUILD gnome-power-manager-2.18.2.ebuild 2324 RMD160 a1196ad658cd709b033dfc54f54
 MD5 6c0994e9407ef0fe6f087585176ea1c7 gnome-power-manager-2.18.2.ebuild 2324
 RMD160 a1196ad658cd709b033dfc54f547f0b567f03103 gnome-power-manager-2.18.2.ebuild 2324
 SHA256 d9256a256db211fcdaf0f091c008c284b2108e69461d7026eed9dcb6c707498b gnome-power-manager-2.18.2.ebuild 2324
-EBUILD gnome-power-manager-2.18.3.ebuild 2350 RMD160 0347ac0cbba760b3a8540f77c703f01bf2c263de SHA1 49fdf5a589c41784b852d5318c595762e19a6be2 SHA256 2203662c65cf7f70c2391baa3ce57af64e3dcde237e4db0e2f8c57fea7952bc9
-MD5 b82e203d09bb6e4070da59ecb8d09cba gnome-power-manager-2.18.3.ebuild 2350
-RMD160 0347ac0cbba760b3a8540f77c703f01bf2c263de gnome-power-manager-2.18.3.ebuild 2350
-SHA256 2203662c65cf7f70c2391baa3ce57af64e3dcde237e4db0e2f8c57fea7952bc9 gnome-power-manager-2.18.3.ebuild 2350
-MISC ChangeLog 8067 RMD160 60ea64d25e78313fe98b11930a95e376e236e827 SHA1 52005de789850afcb45a2a18932465f7dbd16175 SHA256 f55d6bfa22b2502813c60005358fd76e290ac73c4f890936695e900ffc65b3b4
-MD5 ad3d1b6c9494ab689d0cf9d9ff4adf81 ChangeLog 8067
-RMD160 60ea64d25e78313fe98b11930a95e376e236e827 ChangeLog 8067
-SHA256 f55d6bfa22b2502813c60005358fd76e290ac73c4f890936695e900ffc65b3b4 ChangeLog 8067
+EBUILD gnome-power-manager-2.18.3.ebuild 2465 RMD160 96cbb9e53d931208e030b650d078d48cb481bc86 SHA1 3405bf558f7483d6c18f836d41caccfad16ba450 SHA256 c09d3855d35803d2e9d8dad450f1defbbb4ea257c3a177a76efcf4c6e17af0f7
+MD5 9dcf7050940f6c60def63d4b2971887a gnome-power-manager-2.18.3.ebuild 2465
+RMD160 96cbb9e53d931208e030b650d078d48cb481bc86 gnome-power-manager-2.18.3.ebuild 2465
+SHA256 c09d3855d35803d2e9d8dad450f1defbbb4ea257c3a177a76efcf4c6e17af0f7 gnome-power-manager-2.18.3.ebuild 2465
+MISC ChangeLog 8268 RMD160 ec657271420cc610eb02b42abadf4d3011e22037 SHA1 f296e9e683dae79a8b136f4a28a66ca0272f7020 SHA256 c3f20f63c22f49b28034ad1f2ef27b2afe26fe5f65728fa6aae9c11829ce365a
+MD5 a39acced699620f2de9a86546f067b55 ChangeLog 8268
+RMD160 ec657271420cc610eb02b42abadf4d3011e22037 ChangeLog 8268
+SHA256 c3f20f63c22f49b28034ad1f2ef27b2afe26fe5f65728fa6aae9c11829ce365a ChangeLog 8268
 MISC metadata.xml 328 RMD160 e83b5cef91422ece7e4991cc9f9422220d36b775 SHA1 c25df9c021e54eaf6c9add8db1c9954ac710b95e SHA256 2507b21284e65f9e7f5608d9865921192d0d6cdf46a35a705b0b2cb220583794
 MD5 a3d3afe281a135c24beb634426857a1d metadata.xml 328
 RMD160 e83b5cef91422ece7e4991cc9f9422220d36b775 metadata.xml 328
diff --git a/gnome-extra/gnome-power-manager/files/gpm-2.18.3-slotted-gstreamer.patch b/gnome-extra/gnome-power-manager/files/gpm-2.18.3-slotted-gstreamer.patch
new file mode 100644
index 000000000000..8bad8e9e69b0
--- /dev/null
+++ b/gnome-extra/gnome-power-manager/files/gpm-2.18.3-slotted-gstreamer.patch
@@ -0,0 +1,11 @@
+--- src/gpm-sound.c.orig	2007-06-17 12:55:53.000000000 -0500
++++ src/gpm-sound.c	2007-06-17 12:56:39.000000000 -0500
+@@ -78,7 +78,7 @@
+ 		g_error ("enum %i not known", action);
+ 	}
+ 
+-	command = g_strdup_printf ("gst-launch filesrc location=%s%s ! "
++	command = g_strdup_printf ("gst-launch-0.10 filesrc location=%s%s ! "
+ 				   "decodebin ! audioconvert ! gconfaudiosink",
+ 				   GPM_DATA, filename);
+ 
diff --git a/gnome-extra/gnome-power-manager/gnome-power-manager-2.18.3.ebuild b/gnome-extra/gnome-power-manager/gnome-power-manager-2.18.3.ebuild
index dec4745c1082..d5173babb235 100644
--- a/gnome-extra/gnome-power-manager/gnome-power-manager-2.18.3.ebuild
+++ b/gnome-extra/gnome-power-manager/gnome-power-manager-2.18.3.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-power-manager/gnome-power-manager-2.18.3.ebuild,v 1.1 2007/06/17 07:25:51 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-power-manager/gnome-power-manager-2.18.3.ebuild,v 1.2 2007/06/17 18:02:22 compnerd Exp $
 
-inherit gnome2
+inherit gnome2 eutils
 
 DESCRIPTION="Gnome Power Manager"
 HOMEPAGE="http://www.gnome.org/projects/gnome-power-manager/"
@@ -25,7 +25,7 @@ RDEPEND=">=dev-libs/glib-2.6.0
 		 >=x11-libs/cairo-1.0.0
 		 >=gnome-base/gnome-panel-2
 		 >=gnome-base/gconf-2
-		   media-libs/gstreamer
+		  =media-libs/gstreamer-0.10*
 		   x11-libs/libX11
 		   x11-libs/libXext"
 DEPEND="${RDEPEND}
@@ -59,6 +59,9 @@ pkg_setup() {
 src_unpack() {
 	gnome2_src_unpack
 
+	# Use gst-launch-0.10 rather than gst-launch
+	epatch ${FILESDIR}/gpm-2.18.3-slotted-gstreamer.patch
+
 	if use doc; then
 		# Actually install all html files, not just the index
 		sed -i -e 's:\(htmldoc_DATA = \).*:\1$(SPEC_HTML_FILES):' \