don't install into current jdk

Package-Manager: portage-2.0.51.19

4 files changed, 33 insertions, 14 deletions

diff --git a/dev-java/blackdown-java3d-bin/ChangeLog b/dev-java/blackdown-java3d-bin/ChangeLog
index e58eb0a3fd35..63eb74ae7800 100644
--- a/dev-java/blackdown-java3d-bin/ChangeLog
+++ b/dev-java/blackdown-java3d-bin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/blackdown-java3d-bin
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-java3d-bin/ChangeLog,v 1.4 2005/01/01 18:10:10 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-java3d-bin/ChangeLog,v 1.5 2005/04/02 10:01:13 axxo Exp $
+
+*blackdown-java3d-bin-1.3.1-r1 (02 Apr 2005)
+
+  02 Apr 2005; Thomas Matthijs <axxo@gentoo.org>
+  -blackdown-java3d-bin-1.3.1.ebuild, +blackdown-java3d-bin-1.3.1-r1.ebuild:
+  don't install into current jdk
 
   05 Sep 2004; Sven Wegener <swegener@gentoo.org> :
   Fixed ChangeLog header.
diff --git a/dev-java/blackdown-java3d-bin/Manifest b/dev-java/blackdown-java3d-bin/Manifest
index 539ff5152366..6525fe35f11d 100644
--- a/dev-java/blackdown-java3d-bin/Manifest
+++ b/dev-java/blackdown-java3d-bin/Manifest
@@ -1,4 +1,14 @@
-MD5 558de114af753788583005e82f8cc2f7 ChangeLog 1437
-MD5 99832656bcc17f0a3c717983c7ebf556 blackdown-java3d-bin-1.3.1.ebuild 1653
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 4d27024116cf749b2f5ab3f48144e9b7 blackdown-java3d-bin-1.3.1-r1.ebuild 1653
+MD5 739888777d80c65e00ecc0a5b2edb26a ChangeLog 1637
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
-MD5 b35fdbb0afc61eacc3276bc5de486eb1 files/digest-blackdown-java3d-bin-1.3.1 155
+MD5 b35fdbb0afc61eacc3276bc5de486eb1 files/digest-blackdown-java3d-bin-1.3.1-r1 155
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCTm2F/rLF9B432nYRAiyQAJ9y6iX75muP7rmzbzMs3YvmcJCuMwCfWlXx
+mtkCDSPULvBYpVjTThYlpig=
+=Jl6j
+-----END PGP SIGNATURE-----
diff --git a/dev-java/blackdown-java3d-bin/blackdown-java3d-bin-1.3.1.ebuild b/dev-java/blackdown-java3d-bin/blackdown-java3d-bin-1.3.1-r1.ebuild
index f83a2fcf9a21..9ff9fee2d804 100644
--- a/dev-java/blackdown-java3d-bin/blackdown-java3d-bin-1.3.1.ebuild
+++ b/dev-java/blackdown-java3d-bin/blackdown-java3d-bin-1.3.1-r1.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-java3d-bin/blackdown-java3d-bin-1.3.1.ebuild,v 1.3 2005/01/01 18:10:10 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-java3d-bin/blackdown-java3d-bin-1.3.1-r1.ebuild,v 1.1 2005/04/02 10:01:13 axxo Exp $
+
+inherit java-pkg
 
 DESCRIPTION="Java 3D Software Development Kit"
 SRC_URI="x86? ( mirror://blackdown.org/java3d/1.3.1/i386/fcs/java3d-sdk-${PV}-linux-i386.bin )
@@ -48,16 +50,17 @@ src_unpack () {
 src_install () {
 	dodoc README-Java3D
 
-	dodir `java-config -O`/jre
-	cp -a jre/lib ${D}/`java-config -O`/jre
-	use doc && cp -a demo ${D}/`java-config -O`/demo
+	java-pkg_dojar jre/lib/ext/*.jar
+	java-pkg_doso jre/lib/i386/*.so
+
+	if use doc; then
+		insinto /usr/share/doc/${PF}
+		doins -r demo /usr/share/doc/${PF}
+	fi
 }
 
 pkg_postinst() {
-	einfo "Note: This package installs into your currently selected JDK!"
-	einfo "Your currently selected JDK path is:"
-	einfo "\t `java-config -O`"
-	einfo
-	einfo "If this is incorrect, please unmerge this package and set your desired"
-	einfo "JDK with java-config"
+	einfo "This ebuild now installs into /opt/${PN} and /usr/share/${PN}"
+	einfo 'To use you need to pass the following to java'
+	einfo "-Djava.library.path=\$(java-config -i ${PN}) -cp \$(java-config -p ${PN})"
 }
diff --git a/dev-java/blackdown-java3d-bin/files/digest-blackdown-java3d-bin-1.3.1 b/dev-java/blackdown-java3d-bin/files/digest-blackdown-java3d-bin-1.3.1-r1
index e5cd68f3286e..e5cd68f3286e 100644
--- a/dev-java/blackdown-java3d-bin/files/digest-blackdown-java3d-bin-1.3.1
+++ b/dev-java/blackdown-java3d-bin/files/digest-blackdown-java3d-bin-1.3.1-r1