net-wireless/remuco: Added gmusicbrowser adapter support, added media-video/mplayer2 as alternative mplayer adapter dep

svn path=/sunrise/; revision=11855

5 files changed, 38 insertions, 10 deletions

diff --git a/net-wireless/remuco/ChangeLog b/net-wireless/remuco/ChangeLog
index 05cb7893f..ec3f0e717 100644
--- a/net-wireless/remuco/ChangeLog
+++ b/net-wireless/remuco/ChangeLog
@@ -1,7 +1,13 @@
 # ChangeLog for net-wireless/remuco
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  31 Mar 2011; Laurento Frittella (mrfree) <laurento.frittella@gmail.com>
+  -remuco-0.9.3.1.ebuild, +remuco-0.9.4.ebuild,
+  +files/gmusicbrowser-adapter.patch, metadata.xml:
+  Added gmusicbrowser adapter support, added media-video/mplayer2 as
+  alternative mplayer adapter dep
+
   08 Oct 2010; Laurento Frittella (mrfree) <laurento.frittella@gmail.com>
   -remuco-0.9.3-r2.ebuild, +remuco-0.9.3.1.ebuild:
   Version bump
diff --git a/net-wireless/remuco/Manifest b/net-wireless/remuco/Manifest
index d23b36433..c6e9ec8f2 100644
--- a/net-wireless/remuco/Manifest
+++ b/net-wireless/remuco/Manifest
@@ -1,4 +1,5 @@
-DIST remuco-source-0.9.3.1.tar.gz 809291 RMD160 7f34178c941cab4a42c3be9a03a47b36d266c982 SHA1 66582283515050c85d78a15a78653d4cac35b6a6 SHA256 728613866bd19bbdd0a1f92e32977ed22a96a0a74a276474849b3f11224be8a3
-EBUILD remuco-0.9.3.1.ebuild 2399 RMD160 7668aa772c7c574d46cc1934ba34c380c467a2fa SHA1 4a2a5cdf548b3903377642e1ba1b205902343356 SHA256 c31066ae01740201bdcef88de9a9c0b762268dc59dc86954b1fcfc288c8ef230
-MISC ChangeLog 1178 RMD160 e6f631abc38350d04fefff6c4b17efdcf6351a30 SHA1 b96f69ddde2d34a4243ae0c12b2b8290a3882e4c SHA256 91e2efeda422605ccdf4ee79563c9e569091ab404ed90c12942e470be87313d3
-MISC metadata.xml 941 RMD160 014b05e8e5fbc45d1f310319280bca048e14d020 SHA1 e7cad6c96c31ddb16aa48d219011b924efc6b7f8 SHA256 c957d0c7eee9e4c5c2e0c5a6021a322f061ddb03ab434e4046e5f13224413814
+AUX gmusicbrowser-adapter.patch 538 RMD160 02ff61d63512b62ac410d299d15692c6564f5736 SHA1 5d31ffc16d7c24265093939f2c17b62fca161d45 SHA256 746e5f2478f98abfb3260f09c7b14ccc2115b694cd1a04f474a0a0d8e111280d
+DIST remuco-source-0.9.4.tar.gz 863899 RMD160 8de13fbee3bb7461d0f3ab06fa7ac44fc7800b42 SHA1 40e4e9bc9d1cbcf0d11a2481b9eba4e4b3bf7d28 SHA256 acf2bec8cc52d53ef715717c015e91f8469a909d3aded03342b50418dcb9f574
+EBUILD remuco-0.9.4.ebuild 2563 RMD160 87b1821832357036e8c5bcb60e06a29d6f6c0be5 SHA1 07b48d55124fa9b2744e4061f9054e92717abcb6 SHA256 6ae061d13a9c3f3a00bce0196a853b10cc815d2eca88740f10c4a69f1680c350
+MISC ChangeLog 1456 RMD160 0ec18f8afda922d57151b3c47036c65e540ed044 SHA1 cc5c0c11bc6a8fc8d4633c34009134722577f52b SHA256 a6c4996eb8cb47072a6e4facb84cc6ef7738ceaaedb415b023a03a85f628eda1
+MISC metadata.xml 1019 RMD160 ea8798dd4719f9f228d775836e4d2d78ed7d556d SHA1 c2df9d68475674742cd0f0a3c311f4406f574a46 SHA256 6e689fb5fea1b120dead41e77a0b6d9e2c53d63324ea7849eb473895d50f2e81
diff --git a/net-wireless/remuco/files/gmusicbrowser-adapter.patch b/net-wireless/remuco/files/gmusicbrowser-adapter.patch
new file mode 100644
index 000000000..1a89b6200
--- /dev/null
+++ b/net-wireless/remuco/files/gmusicbrowser-adapter.patch
@@ -0,0 +1,15 @@
+--- setup.py.orig	2011-03-31 16:47:21.434005551 +0200
++++ setup.py	2011-03-31 16:48:59.602619789 +0200
+@@ -144,6 +144,12 @@
+ #    ["remuco-winamp", "winamp.py"]
+ #]
+ 
++# --- gmusicbrowser -----------------------------------------------------------
++
++pa_files["gmusicbrowser"] = [
++    ["remuco-gmusicbrowser"]
++]
++
+ # =============================================================================
+ # select player adapters to build/install (all by default)
+ # =============================================================================
diff --git a/net-wireless/remuco/metadata.xml b/net-wireless/remuco/metadata.xml
index 49f629e8c..e94131cd2 100644
--- a/net-wireless/remuco/metadata.xml
+++ b/net-wireless/remuco/metadata.xml
@@ -9,6 +9,7 @@
 		<flag name='banshee'>Enable Banshee media player support</flag>
 		<flag name='client'>Compile the MIDP J2ME client</flag>
 		<flag name='exaile'>Enable Exaile media player support</flag>
+		<flag name='gmusicbrowser'>Enable Gmusicbrowser media player support</flag>
 		<flag name='mpd'>Enable Music Player Daemon support</flag>
 		<flag name='quodlibet'>Enable Quod Libet media player support</flag>
 		<flag name='rhythmbox'>Enable Rhythmbox media player support</flag>
diff --git a/net-wireless/remuco/remuco-0.9.3.1.ebuild b/net-wireless/remuco/remuco-0.9.4.ebuild
index 9f7bda53c..ff436a4a8 100644
--- a/net-wireless/remuco/remuco-0.9.3.1.ebuild
+++ b/net-wireless/remuco/remuco-0.9.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -7,7 +7,7 @@ PYTHON_DEPEND="2:2.6"
 SUPPORT_PYTHON_ABIS="1"
 JAVA_PKG_OPT_USE="client"
 
-inherit distutils python java-pkg-opt-2 java-ant-2
+inherit distutils eutils python java-pkg-opt-2 java-ant-2
 
 MY_P=${PN}-source-${PV}
 DESCRIPTION="A server and J2ME client to control various media players"
@@ -17,7 +17,7 @@ SRC_URI="http://${PN}.googlecode.com/files/${MY_P}.tar.gz"
 LICENSE="Apache-2.0 GPL-3 LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="amarok audacious banshee exaile mpd mplayer quodlibet rhythmbox totem tvtime vlc"
+IUSE="amarok audacious banshee exaile gmusicbrowser mpd mplayer quodlibet rhythmbox totem tvtime vlc"
 
 COMMON_DEPEND="dev-python/dbus-python
 	dev-python/imaging
@@ -34,13 +34,14 @@ DEPEND="${COMMON_DEPEND}
 RDEPEND="${COMMON_DEPEND}
 	amarok? ( >=media-sound/amarok-2.0 )
 	audacious? ( >=media-sound/audacious-1.5.1 )
-	banshee? ( >=media-sound/banshee-1.4 )
+	banshee? ( >=media-sound/banshee-1.6 )
 	exaile? ( >=media-sound/exaile-0.3 )
+	gmusicbrowser? ( media-sound/gmusicbrowser )
 	mpd? (
 		>=media-sound/mpd-0.13.2
 		>=dev-python/python-mpd-0.2
 	)
-	mplayer? ( media-video/mplayer )
+	mplayer? ( || ( media-video/mplayer media-video/mplayer2 ) )
 	quodlibet? ( >=media-sound/quodlibet-2.2 )
 	rhythmbox? (
 		>=media-sound/rhythmbox-0.11.5
@@ -55,6 +56,10 @@ S=${WORKDIR}/${MY_P}
 
 DOCS="doc/AUTHORS doc/CHANGES doc/README doc/api.html"
 
+src_prepare() {
+	epatch "${FILESDIR}/gmusicbrowser-adapter.patch"
+}
+
 src_compile() {
 	local adapter
 	export REMUCO_CLIENT_DEST="share/${P}/client"