Migrated to gen 2, removed gen 1 versions, quoted vars

(Portage version: 2.1.3.19)

6 files changed, 13 insertions, 62 deletions

diff --git a/dev-java/sun-java3d-bin/ChangeLog b/dev-java/sun-java3d-bin/ChangeLog
index ee1bc3b2b92c..22cee2234c2d 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-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-java3d-bin/ChangeLog,v 1.8 2007/01/15 11:13:44 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-java3d-bin/ChangeLog,v 1.9 2007/11/17 18:33:10 wltjr Exp $
+
+*sun-java3d-bin-1.3.2-r1 (17 Nov 2007)
+
+  17 Nov 2007; William L. Thomson Jr. <wltjr@gentoo.org>
+  -sun-java3d-bin-1.3.2.ebuild, +sun-java3d-bin-1.3.2-r1.ebuild,
+  -sun-java3d-bin-1.4.0_pre5.ebuild, sun-java3d-bin-1.4.0_pre5-r1.ebuild:
+  Migrated to gen 2, removed gen 1 versions, quoted vars
 
   15 Jan 2007; Vlastimil Babka <caster@gentoo.org>
   sun-java3d-bin-1.4.0_pre5-r1.ebuild:
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-r1
index a2ec8520f43d..49cba50c429e 100644
--- 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-r1
@@ -1,6 +1,4 @@
-MD5 bf2f39d332299f2aceb43cbad9a70428 java3d-1_3_2-linux-amd64.zip 1241855
 RMD160 e7a68e56105be0f03e322877e2be59155efa9910 java3d-1_3_2-linux-amd64.zip 1241855
 SHA256 e248fc43792db5a351540e7c1a7c4c594fee30d5a8e622dbd8290075becca8a8 java3d-1_3_2-linux-amd64.zip 1241855
-MD5 0d959d0be83eb60c9c135ae809caefb2 java3d-1_3_2-linux-i586.zip 1235329
 RMD160 b8531b10d871a0544bd5cf770fcf08d0b6e61d75 java3d-1_3_2-linux-i586.zip 1235329
 SHA256 1fc3a02714bcfd938b5449561cee49c3ffe5f8c320591374caab4a0c2bb9f415 java3d-1_3_2-linux-i586.zip 1235329
diff --git a/dev-java/sun-java3d-bin/files/digest-sun-java3d-bin-1.4.0_pre5 b/dev-java/sun-java3d-bin/files/digest-sun-java3d-bin-1.4.0_pre5
deleted file mode 100644
index 50c676230444..000000000000
--- a/dev-java/sun-java3d-bin/files/digest-sun-java3d-bin-1.4.0_pre5
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 6dbdff52f6e5ed7ef5d1e3dbb72f3ee9 java3d-1_4_0-build5-linux-amd64.zip 1281828
-RMD160 96453a49a14595d7f4fbac06dbd12edafbb713cf java3d-1_4_0-build5-linux-amd64.zip 1281828
-SHA256 1ec9d7dc176eff6bf2c3568f452fc5b13d471d4f963090570996a635b8f8a301 java3d-1_4_0-build5-linux-amd64.zip 1281828
-MD5 bb350967692574beea2f2a75a84b6f1c java3d-1_4_0-build5-linux-i586.zip 1274577
-RMD160 bda1adf4a817cb50dfe6dc22c4e75e48c175c69e java3d-1_4_0-build5-linux-i586.zip 1274577
-SHA256 e03d87159b4d2cecd48f90d1373dfc496049e41888e8a545cf5bfe94a89aa4ff java3d-1_4_0-build5-linux-i586.zip 1274577
diff --git a/dev-java/sun-java3d-bin/sun-java3d-bin-1.3.2.ebuild b/dev-java/sun-java3d-bin/sun-java3d-bin-1.3.2-r1.ebuild
index 11b57d42bda2..35366c34be18 100644
--- a/dev-java/sun-java3d-bin/sun-java3d-bin-1.3.2.ebuild
+++ b/dev-java/sun-java3d-bin/sun-java3d-bin-1.3.2-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 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.3.2.ebuild,v 1.4 2007/01/05 23:38:43 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-java3d-bin/sun-java3d-bin-1.3.2-r1.ebuild,v 1.1 2007/11/17 18:33:10 wltjr Exp $
 
-inherit java-pkg
+inherit java-pkg-2
 
 DESCRIPTION="Sun Java3D API Core"
 HOMEPAGE="https://j3d-core.dev.java.net/"
@@ -25,7 +25,7 @@ pkg_nofetch() {
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 	unzip -q j3d-132-linux-${ARCH}.zip || die
 }
 
diff --git a/dev-java/sun-java3d-bin/sun-java3d-bin-1.4.0_pre5-r1.ebuild b/dev-java/sun-java3d-bin/sun-java3d-bin-1.4.0_pre5-r1.ebuild
index 7eae4c8e7b7d..f4eb871c2b04 100644
--- a/dev-java/sun-java3d-bin/sun-java3d-bin-1.4.0_pre5-r1.ebuild
+++ b/dev-java/sun-java3d-bin/sun-java3d-bin-1.4.0_pre5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.4.0_pre5-r1.ebuild,v 1.2 2007/01/15 11:13:44 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-java3d-bin/sun-java3d-bin-1.4.0_pre5-r1.ebuild,v 1.3 2007/11/17 18:33:10 wltjr Exp $
 
 inherit java-pkg-2
 
@@ -32,7 +32,7 @@ QA_TEXTRELS_x86="
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 	unzip -q j3d-${MY_IPV}-linux-${ARCH}.zip || die
 }
 
diff --git a/dev-java/sun-java3d-bin/sun-java3d-bin-1.4.0_pre5.ebuild b/dev-java/sun-java3d-bin/sun-java3d-bin-1.4.0_pre5.ebuild
deleted file mode 100644
index 1a0db90697de..000000000000
--- a/dev-java/sun-java3d-bin/sun-java3d-bin-1.4.0_pre5.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2007 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.4.0_pre5.ebuild,v 1.2 2007/01/05 23:38:43 caster Exp $
-
-inherit java-pkg
-
-MY_PV=${PV//./_}
-MY_PV=${MY_PV//_pre/-build}
-MY_IPV=${MY_PV//_/}
-
-DESCRIPTION="Sun Java3D API Core"
-HOMEPAGE="https://j3d-core.dev.java.net/"
-SRC_URI="
-	amd64? (
-		http://download.java.net/media/java3d/builds/stable/${MY_PV}/java3d-${MY_PV}-linux-amd64.zip
-	)
-	x86? (
-		http://download.java.net/media/java3d/builds/stable/${MY_PV}/java3d-${MY_PV}-linux-i586.zip
-	)"
-KEYWORDS="~amd64 ~x86 -*"
-SLOT="0"
-LICENSE="sun-jrl sun-jdl"
-IUSE=""
-DEPEND="app-arch/unzip"
-RDEPEND=">=virtual/jre-1.3"
-
-S=${WORKDIR}/${A/.zip/}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	unzip -q j3d-${MY_IPV}-linux-${ARCH}.zip || die
-}
-
-src_compile() { :; }
-
-src_install() {
-	dodoc COPYRIGHT.txt README.txt
-
-	java-pkg_dojar lib/ext/*.jar
-	java-pkg_doso lib/${ARCH/x86/i386}/*.so
-}
-
-pkg_postinst() {
-	elog "This ebuild installs into /opt/${PN} and /usr/share/${PN}"
-	elog 'To use you need to pass the following to java'
-	elog '-Djava.library.path=$(java-config -i sun-java3d-bin) -cp $(java-config -p sun-java3d-bin)'
-}