Use java-pkg-simple eclass to build just the netx.jar we need and nothing else. The...

Package-Manager: portage-2.2.0_alpha54/cvs/Linux x86_64

diff --git a/dev-java/netx/ChangeLog b/dev-java/netx/ChangeLog
index 2b55985d841a439b4fa7cb54526d358702fc4af7..866ccde6167e91ae12634eba96c40830b8534993 100644 (file)
--- a/dev-java/netx/ChangeLog
+++ b/dev-java/netx/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/netx
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/netx/ChangeLog,v 1.1 2011/09/08 11:22:15 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/netx/ChangeLog,v 1.2 2011/09/09 09:16:56 caster Exp $
+
+  09 Sep 2011; Vlastimil Babka <caster@gentoo.org> netx-1.1.2.ebuild:
+  Use java-pkg-simple eclass to build just the netx.jar we need and nothing
+  else. The included build system assumes icedtea is used, causing bug #382351.
 
 *netx-1.1.2 (08 Sep 2011)
 

diff --git a/dev-java/netx/Manifest b/dev-java/netx/Manifest
index 58af3c48bca07e06255afee72f5c1ededf753ea5..7837de28bf7dd453b40b07d921b38b5d8bc98270 100644 (file)
--- a/dev-java/netx/Manifest
+++ b/dev-java/netx/Manifest
@@ -1,4 +1,4 @@
 DIST icedtea-web-1.1.2.tar.gz 807736 RMD160 7ca33e6759aec27567a22b07f02afc775339d513 SHA1 f862220b4504e688706b743f68f62c81e57bc183 SHA256 3051f3bf1e1d07ad7aaa28b204821a7c0631848d20ba7942fc23440e774649e4
-EBUILD netx-1.1.2.ebuild 926 RMD160 25d478286d8bf8b6834f3d6d60cc5e178bba28d0 SHA1 f51b5b9c0cdffd5b0783768da0468d3439654189 SHA256 ad9d2a683e83bc978b1606e2098a8f6ce71fc31b2998f53b1a9c3a076ca2c35a
-MISC ChangeLog 331 RMD160 49481ee0a728e66ff414eb0d7045e9b6850b95fd SHA1 5f79e31bca717332dfbb50f64995e1639e851352 SHA256 dec73c82b3adf911f66ef79d5f17fabc23fff124f1bc68c616a9f8067a7a3622
+EBUILD netx-1.1.2.ebuild 984 RMD160 6ae58d1a095b7807504d0f2911029fec2eea742a SHA1 ab124db60cef5db8bfe8a7c80e32a92d71c71ae9 SHA256 a92d13a849d8a275f4237c8d335f59b1433d4e29e65884711a1ebafd419e1936
+MISC ChangeLog 556 RMD160 7de97e88a658db132a9e079e4a7b17004688ec78 SHA1 df13f71de7e434261b0145d536cd502ad6535da3 SHA256 7e11775b6897b6f96d04ac89b4646d8a37fcf06f2ef165f0557a04851b4620fd
 MISC metadata.xml 230 RMD160 65d7165ca3b5dc309dba28b91c589130c056a0da SHA1 b6d917b205f2e4c1e20c3cd914edebd53cba5aac SHA256 f4c41b0e0bbfac2c14311b6161c0231729c6261e6468556adaf372fdf5cf159a

diff --git a/dev-java/netx/netx-1.1.2.ebuild b/dev-java/netx/netx-1.1.2.ebuild
index 69f544e0504affd90f7ead419b99ff25c133cd61..f0dcd1cc730bdf9bbb8d8746d8af430eafbf931e 100644 (file)
--- a/dev-java/netx/netx-1.1.2.ebuild
+++ b/dev-java/netx/netx-1.1.2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/netx/netx-1.1.2.ebuild,v 1.1 2011/09/08 11:22:15 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/netx/netx-1.1.2.ebuild,v 1.2 2011/09/09 09:16:56 caster Exp $
 
 EAPI="4"
 JAVA_PKG_IUSE="source"
 
-inherit eutils java-pkg-2
+inherit eutils java-pkg-2 java-pkg-simple
 
-DESCRIPTION="IcedTea JNLP implementation"
+DESCRIPTION="Open-source JNLP implementation, icedtea-web fork"
 HOMEPAGE="http://icedtea.classpath.org"
 SRC_URI="http://icedtea.classpath.org/download/source/icedtea-web-${PV}.tar.gz"
 
@@ -24,15 +24,15 @@ RDEPEND=">=virtual/jre-1.6
 
 S="${WORKDIR}/icedtea-web-${PV}/"
 
-src_configure() {
-       econf --with-rhino $(java-pkg_getjar rhino-1.6 js.jar)  || die
-}
+JAVA_GENTOO_CLASSPATH="rhino-1.6"
+JAVA_SRC_DIR="netx"
 
-src_compile() {
-       emake netx-dist || die
+# we don't use the icedtea-web buildsystem because it relies on icedtea for the parts we don't need here
+src_configure() {
+       :;
 }
 
 src_install() {
-       java-pkg_newjar "${S}"/netx.build/lib/classes.jar ${PN}.jar
+       java-pkg_dojar ${PN}.jar
        use source && java-pkg_dosrc netx/*
 }