propper java support - bug #145930

Package-Manager: portage-2.1.2_rc1-r4

3 files changed, 19 insertions, 14 deletions

diff --git a/app-emulation/libdsk/ChangeLog b/app-emulation/libdsk/ChangeLog
index b3db8f0eb677..422ba32dda89 100644
--- a/app-emulation/libdsk/ChangeLog
+++ b/app-emulation/libdsk/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emulation/libdsk
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libdsk/ChangeLog,v 1.16 2006/10/29 03:00:40 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libdsk/ChangeLog,v 1.17 2006/11/07 09:12:13 dragonheart Exp $
+
+  07 Nov 2006; Daniel Black <dragonheart@gentoo.org> libdsk-1.1.10.ebuild:
+  propper java support - bug #145930 thanks to Robin Bankhead(reporter), and
+  Vlastimil Babka and Josh Nichols from the java herd
 
   29 Oct 2006; Daniel Black <dragonheart@gentoo.org> libdsk-1.1.10.ebuild:
   added java-config compatibility - bug #145930 thanks to Robin
diff --git a/app-emulation/libdsk/Manifest b/app-emulation/libdsk/Manifest
index 8b203d21ab0b..2c9b927da9f4 100644
--- a/app-emulation/libdsk/Manifest
+++ b/app-emulation/libdsk/Manifest
@@ -4,10 +4,10 @@ Hash: SHA1
 DIST libdsk-1.1.10.tar.gz 802326 RMD160 e8356fdc3d6c49cdd2e1720883cd59e5f3dc3085 SHA1 ff25b8db40e7e6a0de77b4ef9f7eed70c612febf SHA256 bdd11105aa2235209795200c37f782e37d8798b74b173b31516f2b47a964a8e6
 DIST libdsk-1.1.5.tar.gz 773995 RMD160 09ff2f58b6e982238eeb5449b10ffa6c22ece327 SHA1 2870a600fbc453230671756de036cdae06eff194 SHA256 b08c5a0b2f1f00a9a4eca0ba6c0169d813782b9e140df363333b24290ec74281
 DIST libdsk-1.1.9.tar.gz 790019 RMD160 4e4aa11bc3768bbc1aee079f1bc89eb3e8dfdd41 SHA1 90481ea997d0d4597c889d778f7ed4f47d4ae3fe SHA256 9c69053ce1da2fc0381e6e0cafc175e41d8f7ef707a377b54cc5ebd552edddae
-EBUILD libdsk-1.1.10.ebuild 871 RMD160 956cf7ee07f589c9416f7f4a2667d7f0f7c0e1d5 SHA1 1692464243b8d37e2d535bcc0a71335a0585add2 SHA256 630820fa91cf4ea8a5ff11cb2484d2f96d44834f0bbdb8ebb844872be2362470
-MD5 2134f5c5e6b7f170994ac261c43e2d97 libdsk-1.1.10.ebuild 871
-RMD160 956cf7ee07f589c9416f7f4a2667d7f0f7c0e1d5 libdsk-1.1.10.ebuild 871
-SHA256 630820fa91cf4ea8a5ff11cb2484d2f96d44834f0bbdb8ebb844872be2362470 libdsk-1.1.10.ebuild 871
+EBUILD libdsk-1.1.10.ebuild 979 RMD160 99bc15b80610adac61cddaac33fe41100fb39611 SHA1 ea15681fe476bbc7a4507afab2d8806a6802a4d5 SHA256 1084f7a2da63df8bd5d8904ae6a1d121d7f7e0d03f5da1e13b4a907889f5233d
+MD5 850a1530518a288b79ae1b1e62dd721b libdsk-1.1.10.ebuild 979
+RMD160 99bc15b80610adac61cddaac33fe41100fb39611 libdsk-1.1.10.ebuild 979
+SHA256 1084f7a2da63df8bd5d8904ae6a1d121d7f7e0d03f5da1e13b4a907889f5233d libdsk-1.1.10.ebuild 979
 EBUILD libdsk-1.1.5.ebuild 793 RMD160 7446d01df3e43f94c9813d8bfd17f4c61560d8da SHA1 9f701d82cf35e2ed74dc17f3c38dc7e0928283f5 SHA256 e80fcdfe8ce2b9e3fb83f8c2873cb1a7c5940f10950866bcd8864f5a7bcbadf7
 MD5 59dbb0decf65ceb44f30824ee5e4dd03 libdsk-1.1.5.ebuild 793
 RMD160 7446d01df3e43f94c9813d8bfd17f4c61560d8da libdsk-1.1.5.ebuild 793
@@ -16,10 +16,10 @@ EBUILD libdsk-1.1.9.ebuild 802 RMD160 5001aa91fee87e948f0d9ec757f40619276b46c8 S
 MD5 41aa09bebc2a6edbfefe4fb8a641c9bf libdsk-1.1.9.ebuild 802
 RMD160 5001aa91fee87e948f0d9ec757f40619276b46c8 libdsk-1.1.9.ebuild 802
 SHA256 d273fef9de9b024a38c4e241d64ff01701d50c16c8a364bd4d4a64a1294d0087 libdsk-1.1.9.ebuild 802
-MISC ChangeLog 1988 RMD160 9b8a80291fe50e5bee6a881b35c796abe7535438 SHA1 eb9c9d98c73649c79a2cc047f456c7bda5136654 SHA256 ad4395eddc6af2327d6aae893b34718640f5c6a05e226444ec71fa0bed47f77b
-MD5 a2d19e04c1c2ebe35231a30108828083 ChangeLog 1988
-RMD160 9b8a80291fe50e5bee6a881b35c796abe7535438 ChangeLog 1988
-SHA256 ad4395eddc6af2327d6aae893b34718640f5c6a05e226444ec71fa0bed47f77b ChangeLog 1988
+MISC ChangeLog 2195 RMD160 8ccfe7eebbfdd0500b04faa9afbc4f251b5fbe21 SHA1 87379f9958dba00de4bf54cc137db93298af32e2 SHA256 4d2ff4fbdd281c32d7d626c7003b4572819383e85b7ca87ef2466a5f402b9a90
+MD5 03cde83a9a7eec789bff76c84ff0644b ChangeLog 2195
+RMD160 8ccfe7eebbfdd0500b04faa9afbc4f251b5fbe21 ChangeLog 2195
+SHA256 4d2ff4fbdd281c32d7d626c7003b4572819383e85b7ca87ef2466a5f402b9a90 ChangeLog 2195
 MISC metadata.xml 314 RMD160 6c07bf6beb7a80688cab14b2c325d3d0e046babc SHA1 7378ee22485e7181284c4c38a145c3d08f73fe19 SHA256 f58e7d74e43d9d1375de6ee5d65fccdba45afc50f81ba6fa7b3e51f346805e74
 MD5 a92ccc9109f3bb8c36e7597064966708 metadata.xml 314
 RMD160 6c07bf6beb7a80688cab14b2c325d3d0e046babc metadata.xml 314
@@ -36,7 +36,7 @@ SHA256 a5d0e9b1948624a1d0fc0d940b9e87d3d32f780e3b42dbc1926207a54432f66c files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5-ecc0.1.6 (GNU/Linux)
 
-iD8DBQFFRBpZmdTrptrqvGERAg9kAJ9l8CpfAbn9mCChE9hlV+jws+B/nwCff8go
-hCZrbs3cyT1fTcIDRQUN2jo=
-=rJAg
+iD8DBQFFUE61mdTrptrqvGERAv0oAJ49nJD4NlZEuOrldv04f7u7QSVTMgCfSsWS
+lqapoBojIB9LrEs8zAacmXM=
+=F/ns
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/libdsk/libdsk-1.1.10.ebuild b/app-emulation/libdsk/libdsk-1.1.10.ebuild
index 9e4001795ca6..50b0a8376d0f 100644
--- a/app-emulation/libdsk/libdsk-1.1.10.ebuild
+++ b/app-emulation/libdsk/libdsk-1.1.10.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libdsk/libdsk-1.1.10.ebuild,v 1.2 2006/10/29 03:00:40 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libdsk/libdsk-1.1.10.ebuild,v 1.3 2006/11/07 09:12:13 dragonheart Exp $
 
-inherit java-pkg
+inherit java-pkg java-utils-2 flag-o-matic
 
 DESCRIPTION="Disk emulation library"
 HOMEPAGE="http://www.seasip.demon.co.uk/Unix/LibDsk/"
@@ -22,6 +22,7 @@ pkg_setup() {
 }
 
 src_compile() {
+	use java && sed -i -e "s!_JINC=\"\$_JTOPDIR/i!_JINC=\"${JAVA_HOME}/i!" configure
 	econf \
 		--with-zlib \
 		--with-bzlib \