EAPI 5 bump. Find correct java path with java-config. Fix bug 544000.

Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 93491BB8)

3 files changed, 53 insertions, 8 deletions

diff --git a/dev-java/sun-httpserver-bin/ChangeLog b/dev-java/sun-httpserver-bin/ChangeLog
index 0d9d0adbd599..411cbfe6dc4a 100644
--- a/dev-java/sun-httpserver-bin/ChangeLog
+++ b/dev-java/sun-httpserver-bin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/sun-httpserver-bin
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-httpserver-bin/ChangeLog,v 1.6 2008/03/28 17:59:05 nixnut Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-httpserver-bin/ChangeLog,v 1.7 2015/07/06 15:30:47 monsieurp Exp $
+
+*sun-httpserver-bin-2.0.1-r1 (06 Jul 2015)
+
+  06 Jul 2015; Patrice Clement <monsieurp@gentoo.org>
+  +sun-httpserver-bin-2.0.1-r1.ebuild, sun-httpserver-bin-2.0.1.ebuild:
+  EAPI 5 bump. Find correct java path with java-config. Fix bug 544000.
 
   28 Mar 2008; nixnut <nixnut@gentoo.org> sun-httpserver-bin-2.0.1.ebuild:
   Stable on ppc wrt bug 214778
@@ -25,4 +31,3 @@
   01 May 2007; Krzysiek Pawlik <nelchael@gentoo.org> +metadata.xml,
   +sun-httpserver-bin-2.0.1.ebuild:
   Initial commit of sun-httpserver-bin.
-
diff --git a/dev-java/sun-httpserver-bin/sun-httpserver-bin-2.0.1-r1.ebuild b/dev-java/sun-httpserver-bin/sun-httpserver-bin-2.0.1-r1.ebuild
new file mode 100644
index 000000000000..956319a9a9cd
--- /dev/null
+++ b/dev-java/sun-httpserver-bin/sun-httpserver-bin-2.0.1-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-httpserver-bin/sun-httpserver-bin-2.0.1-r1.ebuild,v 1.1 2015/07/06 15:30:47 monsieurp Exp $
+EAPI=5
+
+inherit java-pkg-2
+
+DESCRIPTION="Sun sun.net.httpserver classes"
+HOMEPAGE="http://jax-ws.dev.java.net/"
+DATE="20060817"
+MY_P="JAXWS${PV}m1_source_${DATE}.jar"
+SRC_URI="https://jax-ws.dev.java.net/jax-ws-201-m1/${MY_P}"
+
+LICENSE="CDDL"
+SLOT="2"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.5"
+DEPEND="app-arch/unzip
+	${RDEPEND}"
+
+S="${WORKDIR}/jaxws-si"
+
+src_unpack() {
+	MY_JAVA=$(java-config -J)
+
+	echo "A" | ${MY_JAVA} -jar "${DISTDIR}/${A}" -console > /dev/null || die "unpack failed"
+
+	unpack ./jaxws-src.zip || die "unzip failed"
+
+}
+
+src_compile() {
+	:
+}
+
+src_install() {
+	java-pkg_dojar lib/http.jar
+}
diff --git a/dev-java/sun-httpserver-bin/sun-httpserver-bin-2.0.1.ebuild b/dev-java/sun-httpserver-bin/sun-httpserver-bin-2.0.1.ebuild
index 107c40766905..c8ddcdbd37d4 100644
--- a/dev-java/sun-httpserver-bin/sun-httpserver-bin-2.0.1.ebuild
+++ b/dev-java/sun-httpserver-bin/sun-httpserver-bin-2.0.1.ebuild
@@ -1,6 +1,7 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-httpserver-bin/sun-httpserver-bin-2.0.1.ebuild,v 1.5 2008/03/28 17:59:05 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-httpserver-bin/sun-httpserver-bin-2.0.1.ebuild,v 1.6 2015/07/06 15:30:47 monsieurp Exp $
+EAPI=5
 
 inherit java-pkg-2
 
@@ -22,8 +23,9 @@ DEPEND="app-arch/unzip
 S="${WORKDIR}/jaxws-si"
 
 src_unpack() {
+	MY_JAVA=$(java-config -J)
 
-	echo "A" | java -jar "${DISTDIR}/${A}" -console > /dev/null || die "unpack failed"
+	echo "A" | ${MY_JAVA} -jar "${DISTDIR}/${A}" -console > /dev/null || die "unpack failed"
 
 	unpack ./jaxws-src.zip || die "unzip failed"
 
@@ -34,7 +36,5 @@ src_compile() {
 }
 
 src_install() {
-
 	java-pkg_dojar lib/http.jar
-
 }