Add dependency to virtual/{jdk,jre}. Make use of java-config for finding java binary path. Fix bug 550668.

Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x93491BB8

3 files changed, 28 insertions, 14 deletions

diff --git a/dev-java/jsr181/ChangeLog b/dev-java/jsr181/ChangeLog
index 45acb07491a1..7fe19ab8d9fc 100644
--- a/dev-java/jsr181/ChangeLog
+++ b/dev-java/jsr181/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/jsr181
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jsr181/ChangeLog,v 1.12 2008/03/28 18:00:13 nixnut Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jsr181/ChangeLog,v 1.13 2015/05/30 19:29:31 monsieurp Exp $
+
+  30 May 2015; Patrice Clement <monsieurp@gentoo.org> jsr181-1.0.ebuild:
+  Add dependency to virtual/{jdk,jre}. Make use of java-config for finding java
+  binary path. Fix bug 550668.
 
   28 Mar 2008; nixnut <nixnut@gentoo.org> jsr181-1.0.ebuild:
   Stable on ppc wrt bug 214778
@@ -46,4 +50,3 @@
   11 Sep 2006; Krzysiek Pawlik <nelchael@gentoo.org> +files/build.xml,
   +metadata.xml, +jsr181-0.7.ebuild:
   Initial version.
-
diff --git a/dev-java/jsr181/Manifest b/dev-java/jsr181/Manifest
index 8ce0a006acca..9d1d243db658 100644
--- a/dev-java/jsr181/Manifest
+++ b/dev-java/jsr181/Manifest
@@ -1,5 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX build.xml 683 SHA256 523884b2c6fc5087792f1387b6ced694238d5fcb4c4b2742ae249da2293995d5 SHA512 f3271462f126a4b275597d1aba66e572ec38c3b587f80061c9b953d1bf411a47514d577f44379588a329829a6db905efe5580b56f88f67aa66f3cfc9a7e19fbe WHIRLPOOL 026d3cc67922860eaf5ef8c48adc47ed89c9312e57c478856301f4ba43cd15a218ab6a95ae9634498ad5b9b43eada917f77f3d3734dd85f19d7f67ef1d4c3f26
 DIST JAXWS2.0.1m1_source_20060817.jar 8993405 SHA256 9725cfb91cecff833055d7af45c3413ca9d1a818a4cfdb86211ed82f383f3865 SHA512 55454a8270310b9778c69aad8b8ace45dc4ba3059b33ac48dcfd5d771fade2d6e4c46a5a65a522ae5cca0438f159ba84c90d8e74d54731a9c6c0caa9d84a0314 WHIRLPOOL fe0727935c592b538b7042808fffa987ea5ae47554367ea0cfc91f65d765bd234713aaa142b2297988d74eec01fce9cd4bedceb0fb7b0068eb38084a1d5f5ba7
-EBUILD jsr181-1.0.ebuild 811 SHA256 1cfff4a22ebd1941d5ada41bdc266cbb34805ed1e8448f2d038cd8b6d4c1eabb SHA512 64e33b6b4a4e7fc438b22ca0812965e8aea26b7a2002b6f9ac55c8d1075051313a4cb48078095863087254a97356ec2b6341d02e81738e0180fc1941c32f3b92 WHIRLPOOL 9d9415682cc273ffb66c2707904884a8e7ae4d43b51e9179fa068bba54e919395c800cff5a50dd50fcf30bb3c6008528357a5ca4bc4f1af3f269354d0aa6bbd3
-MISC ChangeLog 1643 SHA256 510575336331faaa8b0727e935be06bdec1e2ea73dc5ec18be9d0cd0cdd0397d SHA512 3fdc9a408bd8c524ee129c047bed083a90f10c4751847bc0639ab4418b3881da344e4c7c8328c6b47ae5dd2ec41b0e6fe5057d507a6fed9c938775d2e2a6631a WHIRLPOOL b01567f435afa4b77260bf62655d6bab7b7b60802a353576b3cd0b560a76cc58a62100b9cd4843ae6f5444aede14b106d8bc3eed85c9bb61a5f562a7f401a27d
+EBUILD jsr181-1.0.ebuild 855 SHA256 8b936527ae5cd392427ce8abb8a89d14d8b4dc07736ca79ed40fceeae07b8896 SHA512 648f49fe3a668648a740dc65e287ec37b91c3f27cc52d2053144eb9e1ff84bdfd0679841239c3501d13afa550c9b0c6e59da911168eafdbc31268a80f982ef09 WHIRLPOOL 327173d8b013c15dff5d091fa87347c2429587b52a2b11d204dd6abe8e9739ca7f1131f90ab51ee0f7d91356db8027cc72b5a30675db63398eacb8048c4049aa
+MISC ChangeLog 1830 SHA256 cf0fcfb9a438bc04d9c2d9d9f0f2b563269c0ba62e8de2ff5d7692e900b6982c SHA512 899e73b0265efba6385744a0edcf08bf526fc8623315ef3a7e841b995495feae86ac43efe6ceb4ab83fc13aa6bd8289bc420d2a97bd24a821beb681adac1db36 WHIRLPOOL ab113a98f41438c3f8a66da7993979521ff786aab87be3b40520d023359ca98c299b9234793899599a8eaee7b5e6423f47294549f5f14fb729018801bb5ece43
 MISC metadata.xml 159 SHA256 a4ced33e98b00e3a3f725c4c40ef8e76c338db53389465ef871105fbe6e8cbbb SHA512 74dc9ada199a90543b8e1c168c7054f2e973fbfa2551e2b959d67501f2538e269cfb4b2f0905a88a1afa04c20b33961336310ba876f80d47c8e7615b2d7c830a WHIRLPOOL a0ac49efeca233ec4d8f63eb69c8e46e1d4ecbd926693c25b1b8c7415e4c565680936aec46f0c4197116fd7a19a3bb571beee493c18bdae1e5e978e3db84f17a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQEcBAEBCAAGBQJVag8rAAoJEJGRpfGTSRu4E30H/3NuSdcmkilcIHXW0cBS+zip
+FNSkAuIqfHx8nsiyx2V1JkOof9L5jKZ1stI8SvAubFoaxS7fS74f0NwVjTJ1y4Ng
+g583jw1MrtFTeaLy9u7icxCrYDWa+4cI2/LNHgG4ot7uYKJGRPx4zkiB2pEbiN7A
+IeeXWE2/Hk1riy6BB0MipA9OLjdUjpYvuMDyPDb9Rgt678JHd40ExDVCvYAUwWrw
+wmXT4/8OUJqyZ9o0fepQWuZvvfcrRQ+LgL+UKs2o5EIOLWZhjihwP+ufuPC/sGWv
+0jKyG31iZjh8SSIw4sQ1n0/q7ZhUrTV311waZz4rEljg8xV1usg739pNhjnym1k=
+=mIUG
+-----END PGP SIGNATURE-----
diff --git a/dev-java/jsr181/jsr181-1.0.ebuild b/dev-java/jsr181/jsr181-1.0.ebuild
index d6604e625cc7..d7029eed115c 100644
--- a/dev-java/jsr181/jsr181-1.0.ebuild
+++ b/dev-java/jsr181/jsr181-1.0.ebuild
@@ -1,6 +1,6 @@
-# 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/jsr181/jsr181-1.0.ebuild,v 1.5 2008/03/28 18:00:13 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jsr181/jsr181-1.0.ebuild,v 1.6 2015/05/30 19:29:31 monsieurp Exp $
 
 inherit java-pkg-2
 
@@ -15,17 +15,16 @@ SLOT="0"
 KEYWORDS="amd64 ppc x86 ~x86-fbsd"
 IUSE=""
 
-RDEPEND=">=virtual/jre-1.5"
-DEPEND="app-arch/unzip
+RDEPEND=">=virtual/jdk-1.6"
+DEPEND=">=virtual/jre-1.6
+	app-arch/unzip
 	${RDEPEND}"
 
 S="${WORKDIR}/jaxws-si"
 
 src_unpack() {
-	echo "A" | java -jar "${DISTDIR}/${A}" -console > /dev/null || die "unpack failed"
-
+	printf '%s\n' "A" | $(java-config --java) -jar "${DISTDIR}/${A}" -console > /dev/null || die "unpack failed"
 	unpack ./jaxws-src.zip || die "unzip failed"
-
 }
 
 src_compile() {
@@ -33,7 +32,5 @@ src_compile() {
 }
 
 src_install() {
-
 	java-pkg_newjar lib/jsr181-api.jar
-
 }