version bump, now there is also support for amd64. fixes #73359

(Portage version: 2.0.51.19)

7 files changed, 27 insertions, 78 deletions

diff --git a/dev-java/sun-java3d-bin/ChangeLog b/dev-java/sun-java3d-bin/ChangeLog
index 5294eebdac17..cab4bf49ae50 100644
--- a/dev-java/sun-java3d-bin/ChangeLog
+++ b/dev-java/sun-java3d-bin/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/sun-java3d-bin
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-java3d-bin/ChangeLog,v 1.3 2004/09/05 07:19:37 swegener Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-java3d-bin/ChangeLog,v 1.4 2005/04/04 16:32:40 luckyduck Exp $
+
+*sun-java3d-bin-1.3.2 (04 Apr 2005)
+
+  04 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  +sun-java3d-bin-1.3.2.ebuild, -sun-java3d-bin-1.32-r1.ebuild,
+  -sun-java3d-bin-1.32.ebuild:
+  version bump, now there is also support for amd64. fixes #73359
 
   05 Sep 2004; Sven Wegener <swegener@gentoo.org> :
   Fixed ChangeLog header.
diff --git a/dev-java/sun-java3d-bin/Manifest b/dev-java/sun-java3d-bin/Manifest
index 0073a6730346..05fae735c047 100644
--- a/dev-java/sun-java3d-bin/Manifest
+++ b/dev-java/sun-java3d-bin/Manifest
@@ -1,16 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 cabac12c7a6e7cb4cea8b124c1579298 sun-java3d-bin-1.3.2.ebuild 1003
+MD5 a053a145c157327905c7fee588df9e7f ChangeLog 1118
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
-MD5 cad40701c437a618aa1c3a730bbcaa07 sun-java3d-bin-1.32-r1.ebuild 1134
-MD5 eacc4967d37e88d838d58c6305c69210 sun-java3d-bin-1.32.ebuild 1207
-MD5 515a25f91c9281b62e72a9651ecda498 ChangeLog 867
-MD5 e9a77f485dbe8f673a6649caa618b675 files/digest-sun-java3d-bin-1.32 83
-MD5 e9a77f485dbe8f673a6649caa618b675 files/digest-sun-java3d-bin-1.32-r1 83
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBOr4PI1lqEGTUzyQRAkk4AJ9hWhs9e1JXU/52+9qDjAsfPmerZQCeMzUN
-JAx3DX9hMoLDF2J9sTb6Lqg=
-=B3+4
------END PGP SIGNATURE-----
+MD5 da71a7a2f87af48b34229d9e8b186899 files/digest-sun-java3d-bin-1.3.2 74
diff --git a/dev-java/sun-java3d-bin/files/digest-sun-java3d-bin-1.3.2 b/dev-java/sun-java3d-bin/files/digest-sun-java3d-bin-1.3.2
new file mode 100644
index 000000000000..d8eebbd81803
--- /dev/null
+++ b/dev-java/sun-java3d-bin/files/digest-sun-java3d-bin-1.3.2
@@ -0,0 +1 @@
+MD5 bf2f39d332299f2aceb43cbad9a70428 java3d-1_3_2-linux-amd64.zip 1241855
diff --git a/dev-java/sun-java3d-bin/files/digest-sun-java3d-bin-1.32 b/dev-java/sun-java3d-bin/files/digest-sun-java3d-bin-1.32
deleted file mode 100644
index e526c5388f42..000000000000
--- a/dev-java/sun-java3d-bin/files/digest-sun-java3d-bin-1.32
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6708e3939e5ec1bb4a294ffaedb63247 java3d-1_3_2-build4-linux-i586.tar.gz 1230611
diff --git a/dev-java/sun-java3d-bin/files/digest-sun-java3d-bin-1.32-r1 b/dev-java/sun-java3d-bin/files/digest-sun-java3d-bin-1.32-r1
deleted file mode 100644
index e526c5388f42..000000000000
--- a/dev-java/sun-java3d-bin/files/digest-sun-java3d-bin-1.32-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6708e3939e5ec1bb4a294ffaedb63247 java3d-1_3_2-build4-linux-i586.tar.gz 1230611
diff --git a/dev-java/sun-java3d-bin/sun-java3d-bin-1.32-r1.ebuild b/dev-java/sun-java3d-bin/sun-java3d-bin-1.3.2.ebuild
index 9eb797446014..7c801697a569 100644
--- a/dev-java/sun-java3d-bin/sun-java3d-bin-1.32-r1.ebuild
+++ b/dev-java/sun-java3d-bin/sun-java3d-bin-1.3.2.ebuild
@@ -1,43 +1,44 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-java3d-bin/sun-java3d-bin-1.32-r1.ebuild,v 1.2 2004/07/31 16:29:47 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-java3d-bin/sun-java3d-bin-1.3.2.ebuild,v 1.1 2005/04/04 16:32:40 luckyduck Exp $
 
 inherit java-pkg
 
-MY_P="java3d-1_3_2-build4-linux-i586"
-DESCRIPTION="Sun Java3D"
+DESCRIPTION="Sun Java3D API Core"
 HOMEPAGE="https://j3d-core.dev.java.net/"
-SRC_URI="https://j3d-core.dev.java.net/files/documents/1674/5613/${MY_P}.tar.gz"
-KEYWORDS="~x86 -*"
+SRC_URI="java3d-${PV//./_}-linux-${ARCH/x86/i586}.zip"
+KEYWORDS="~amd64 ~x86 -*"
 SLOT="0"
 LICENSE="sun-jrl sun-jdl"
 IUSE=""
-DEPEND=""
+DEPEND="app-arch/unzip"
 RDEPEND=">=virtual/jdk-1.3"
-RESTRICT="nomirror"
+RESTRICT="fetch"
 
-S=${WORKDIR}/${MY_P}
+S=${WORKDIR}/${A/.zip/}
 
 pkg_nofetch() {
-	einfo "Please download ${SRC_URI} from ${HOMEPAGE} and place it in ${DISTDIR}"
+	einfo "Please download ${SRC_URI} from"
+	einfo "${HOMEPAGE} and place it in ${DISTDIR}"
 }
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	jar xvf j3d-132-build4-linux-x86.jar
+	unzip -q j3d-132-linux-${ARCH}.zip
 }
+
 src_compile() { :; }
 
 src_install() {
 	dodoc COPYRIGHT.txt README.txt
 
 	java-pkg_dojar lib/ext/*.jar
-	java-pkg_doso lib/i386/*.so
+	java-pkg_doso lib/${ARCH/x86/i386}/*.so
 }
 
 pkg_postinst() {
-	einfo "This ebuild now installs into /opt/${PN} and /usr/share/${PN}"
+	einfo "This ebuild 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 sun-java3d-bin) -cp $(java-config -p sun-java3d-bin)'
 }
diff --git a/dev-java/sun-java3d-bin/sun-java3d-bin-1.32.ebuild b/dev-java/sun-java3d-bin/sun-java3d-bin-1.32.ebuild
deleted file mode 100644
index 7b33ec7d058a..000000000000
--- a/dev-java/sun-java3d-bin/sun-java3d-bin-1.32.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-java3d-bin/sun-java3d-bin-1.32.ebuild,v 1.1 2004/07/31 14:17:50 axxo Exp $
-
-MY_P="java3d-1_3_2-build4-linux-i586"
-DESCRIPTION="Sun Java3D"
-HOMEPAGE="https://j3d-core.dev.java.net/"
-SRC_URI="https://j3d-core.dev.java.net/files/documents/1674/5613/${MY_P}.tar.gz"
-KEYWORDS="~x86"
-SLOT="0"
-LICENSE="sun-jrl sun-jdl"
-IUSE=""
-DEPEND=">=virtual/jdk-1.3
-	dev-java/java-config"
-RDEPEND=">=virtual/jdk-1.3"
-RESTRICT="nomirror"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_nofetch() {
-	einfo "Please download ${SRC_URI} from ${HOMEPAGE} and place it in ${DISTDIR}"
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	jar xvf j3d-132-build4-linux-x86.jar
-}
-
-src_install() {
-	start=${D}
-	jre=""
-	java_home="$(java-config --jdk-home)"
-	if [ ! -z "${java_home}" ]; then
-		jre="jre/"
-	else
-		java_home="$(java-config --jre-home)"
-		if [ -z ${java_home} ]; then
-			die "You must have a JVM selected in order to install Java3d"
-		fi
-	fi
-	einfo "Installing Java3D into current JAVA home: ${java_home}"
-	dodir ${java_home}/${jre}
-	cp -a lib ${D}/${java_home}/${jre}
-	dodoc COPYRIGHT.txt README.txt
-}