net-wireless/remuco: new useflag 'client' to build the J2ME client from sources. Readd python.eclass explicit inherit. Thanks to ali_bush, hwoarang, jlec

svn path=/sunrise/; revision=10824

4 files changed, 41 insertions, 12 deletions

diff --git a/net-wireless/remuco/ChangeLog b/net-wireless/remuco/ChangeLog
index c8b875fbb..22d9eceb1 100644
--- a/net-wireless/remuco/ChangeLog
+++ b/net-wireless/remuco/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  24 Jun 2010; Laurento Frittella (mrfree) <laurento.frittella@gmail.com>
+  -remuco-0.9.3-r1.ebuild, +remuco-0.9.3-r2.ebuild, metadata.xml:
+  new useflag 'client' to build the J2ME client from sources. Readd
+  python.eclass explicit inherit. Thanks to ali_bush, hwoarang, jlec
+
   23 Jun 2010; Laurento Frittella (mrfree) <laurento.frittella@gmail.com>
   -remuco-0.9.3.ebuild, +remuco-0.9.3-r1.ebuild:
   Binary clients have been dropped
diff --git a/net-wireless/remuco/Manifest b/net-wireless/remuco/Manifest
index 94e12a749..b242e6a5a 100644
--- a/net-wireless/remuco/Manifest
+++ b/net-wireless/remuco/Manifest
@@ -1,4 +1,4 @@
 DIST remuco-source-0.9.3.tar.gz 810982 RMD160 03b072de30e3cb5efc129e7d967ca778504d9475 SHA1 088c7bbf90ab3d365d8c7387a768f86b0d514b51 SHA256 e8c8942078acb205a160dc776117b9e166f296d83cb0d46f5e4094bbf176fc7e
-EBUILD remuco-0.9.3-r1.ebuild 1772 RMD160 c3590dd09c2bccddc0eff7a0fe27fd88f526e8d3 SHA1 854fade5ef8d4894dbdeefc2c6b496de28ccf29a SHA256 e23fc7bf24684fadf0033d03f6e3df2da315a0e6b6c3eea0e4e204303c5ea38d
-MISC ChangeLog 759 RMD160 6a1d57867d2ae7b06fce62f8f4c56eb25571e0f6 SHA1 be11b981ce239d9ea96c15d3afec26b14f2da6b5 SHA256 bd8ee3ac4e62d9198ef4e64fe8a7124a534055e1c86ea840d2baa3bf360804d2
-MISC metadata.xml 883 RMD160 f41e01545b96037c79515ccd9fc8971b3671739e SHA1 f0d47d5d1c9925b433c287d47f42f7bea5612491 SHA256 3dd8f67c54ad49e7d3a331e822280ed7a277b951ec6d7f5efdbc345daba6a369
+EBUILD remuco-0.9.3-r2.ebuild 2399 RMD160 7668aa772c7c574d46cc1934ba34c380c467a2fa SHA1 4a2a5cdf548b3903377642e1ba1b205902343356 SHA256 c31066ae01740201bdcef88de9a9c0b762268dc59dc86954b1fcfc288c8ef230
+MISC ChangeLog 1037 RMD160 0953e628ff825518c5aebcae99a2bef2ef9ec723 SHA1 c8a26efbfa8dbee801f498742054cbbcb6122c8c SHA256 c24486633e43d2286da111299f0fb39056918782c4ced9f3995447497836838b
+MISC metadata.xml 941 RMD160 014b05e8e5fbc45d1f310319280bca048e14d020 SHA1 e7cad6c96c31ddb16aa48d219011b924efc6b7f8 SHA256 c957d0c7eee9e4c5c2e0c5a6021a322f061ddb03ab434e4046e5f13224413814
diff --git a/net-wireless/remuco/metadata.xml b/net-wireless/remuco/metadata.xml
index 4d9c89eb0..49f629e8c 100644
--- a/net-wireless/remuco/metadata.xml
+++ b/net-wireless/remuco/metadata.xml
@@ -7,6 +7,7 @@
 		<flag name='amarok'>Enable Amarok media player support</flag>
 		<flag name='audacious'>Enable Audacious media player support</flag>
 		<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='mpd'>Enable Music Player Daemon support</flag>
 		<flag name='quodlibet'>Enable Quod Libet media player support</flag>
diff --git a/net-wireless/remuco/remuco-0.9.3-r1.ebuild b/net-wireless/remuco/remuco-0.9.3-r2.ebuild
index 43b63835d..9f7bda53c 100644
--- a/net-wireless/remuco/remuco-0.9.3-r1.ebuild
+++ b/net-wireless/remuco/remuco-0.9.3-r2.ebuild
@@ -5,26 +5,33 @@
 EAPI=2
 PYTHON_DEPEND="2:2.6"
 SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
+JAVA_PKG_OPT_USE="client"
 
-inherit distutils python
+inherit distutils python java-pkg-opt-2 java-ant-2
 
 MY_P=${PN}-source-${PV}
 DESCRIPTION="A server and J2ME client to control various media players"
 HOMEPAGE="http://code.google.com/p/remuco"
 SRC_URI="http://${PN}.googlecode.com/files/${MY_P}.tar.gz"
-LICENSE="GPL-3"
+
+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"
 
-DEPEND="dev-python/dbus-python
+COMMON_DEPEND="dev-python/dbus-python
 	dev-python/imaging
 	dev-python/pybluez
 	dev-python/pygobject
 	dev-python/pyxdg"
-
-RDEPEND="${DEPEND}
+DEPEND="${COMMON_DEPEND}
+	client? (
+		>=virtual/jdk-1.1
+		dev-java/ant-nodeps
+		dev-java/ant-apache-regexp
+		dev-java/proguard[ant]
+	)"
+RDEPEND="${COMMON_DEPEND}
 	amarok? ( >=media-sound/amarok-2.0 )
 	audacious? ( >=media-sound/audacious-1.5.1 )
 	banshee? ( >=media-sound/banshee-1.4 )
@@ -43,11 +50,14 @@ RDEPEND="${DEPEND}
 	tvtime? ( >=media-tv/tvtime-0.9.11 )
 	vlc? ( >=media-video/vlc-0.9[dbus] )"
 
+RESTRICT_PYTHON_ABIS="3.*"
 S=${WORKDIR}/${MY_P}
+
 DOCS="doc/AUTHORS doc/CHANGES doc/README doc/api.html"
 
 src_compile() {
 	local adapter
+	export REMUCO_CLIENT_DEST="share/${P}/client"
 	export REMUCO_COMPONENTS
 
 	for adapter in ${IUSE}; do
@@ -56,14 +66,27 @@ src_compile() {
 	REMUCO_COMPONENTS=${REMUCO_COMPONENTS%,}
 
 	distutils_src_compile
+
+	if use client; then
+		ANT_TASKS="ant-nodeps ant-apache-regexp"
+		eant -f client/midp/libgen/build.xml \
+			-Dproguard.jar=$(java-pkg_getjars proguard) \
+			setup
+
+		eant -f client/midp/build.xml dist
+	fi
 }
 
 pkg_postinst() {
 	distutils_pkg_postinst
 
-	echo
-	einfo "Both MIDP and Android clients can be found in the official binary tarball:"
-	einfo "http://${PN}.googlecode.com/files/${P}.tar.gz"
+	if use client; then
+		einfo "The JAR and JAD files for your mobile phone or other J2ME"
+		einfo "device can be found in /usr/share/${P}/client"
+	else
+		einfo "Both MIDP and Android clients can be found in the official binary tarball:"
+		einfo "http://${PN}.googlecode.com/files/${P}.tar.gz"
+	fi
 	einfo
 	einfo "For the usage info take a look at:"
 	einfo "${HOMEPAGE}/wiki/GettingStarted#Usage"