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

Package-Manager: portage-2.1.3.19

7 files changed, 28 insertions, 84 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/Manifest b/dev-java/sun-java3d-bin/Manifest
index b6cf4d08367d..d8e4008ae5d6 100644
--- a/dev-java/sun-java3d-bin/Manifest
+++ b/dev-java/sun-java3d-bin/Manifest
@@ -2,32 +2,25 @@ DIST java3d-1_3_2-linux-amd64.zip 1241855 RMD160 e7a68e56105be0f03e322877e2be591
 DIST java3d-1_3_2-linux-i586.zip 1235329 RMD160 b8531b10d871a0544bd5cf770fcf08d0b6e61d75 SHA1 f4520464664eabcbef2210d0a0875d21cd37a217 SHA256 1fc3a02714bcfd938b5449561cee49c3ffe5f8c320591374caab4a0c2bb9f415
 DIST java3d-1_4_0-build5-linux-amd64.zip 1281828 RMD160 96453a49a14595d7f4fbac06dbd12edafbb713cf SHA1 c30aa02574f44510111897090092a3aae8e27772 SHA256 1ec9d7dc176eff6bf2c3568f452fc5b13d471d4f963090570996a635b8f8a301
 DIST java3d-1_4_0-build5-linux-i586.zip 1274577 RMD160 bda1adf4a817cb50dfe6dc22c4e75e48c175c69e SHA1 2ec02532df54c7a70c8d23f3b532499502fef079 SHA256 e03d87159b4d2cecd48f90d1373dfc496049e41888e8a545cf5bfe94a89aa4ff
-EBUILD sun-java3d-bin-1.3.2.ebuild 1197 RMD160 a5a7b5d73033a381cde54351830ec5a9b8fb2134 SHA1 6573898404e42273a7545d301906fcc5407283a9 SHA256 2784ac1b29f0b2c31c2dc64679d9aa9f4e66b6af0d90383c667322c741f6906a
-MD5 3525507fde490e5a5ad38796fbf60c8c sun-java3d-bin-1.3.2.ebuild 1197
-RMD160 a5a7b5d73033a381cde54351830ec5a9b8fb2134 sun-java3d-bin-1.3.2.ebuild 1197
-SHA256 2784ac1b29f0b2c31c2dc64679d9aa9f4e66b6af0d90383c667322c741f6906a sun-java3d-bin-1.3.2.ebuild 1197
-EBUILD sun-java3d-bin-1.4.0_pre5-r1.ebuild 1385 RMD160 349cfe23d9dbc5fcee005d1f61846e5d6a99c263 SHA1 7e842f99a226c3e31057ec77d03ed2a336fecbf6 SHA256 ff273100ea7eae6b48ead2e702bba190c6c469cfffcb6ab302e03675162d264e
-MD5 a1502d86ac70b672d1bd1d3b6a287123 sun-java3d-bin-1.4.0_pre5-r1.ebuild 1385
-RMD160 349cfe23d9dbc5fcee005d1f61846e5d6a99c263 sun-java3d-bin-1.4.0_pre5-r1.ebuild 1385
-SHA256 ff273100ea7eae6b48ead2e702bba190c6c469cfffcb6ab302e03675162d264e sun-java3d-bin-1.4.0_pre5-r1.ebuild 1385
-EBUILD sun-java3d-bin-1.4.0_pre5.ebuild 1241 RMD160 a92b22e184194ab5ba6d81eae7e654088a515db9 SHA1 c920de70f8e713cc647ad1b79498bc8bd866eba2 SHA256 74b39ac8b6f594531bb2bba5ef2779c0101970afca22f7e9115fd3209a876e1e
-MD5 a3abe82a809d0d7b60361d93c70dad2d sun-java3d-bin-1.4.0_pre5.ebuild 1241
-RMD160 a92b22e184194ab5ba6d81eae7e654088a515db9 sun-java3d-bin-1.4.0_pre5.ebuild 1241
-SHA256 74b39ac8b6f594531bb2bba5ef2779c0101970afca22f7e9115fd3209a876e1e sun-java3d-bin-1.4.0_pre5.ebuild 1241
-MISC ChangeLog 1780 RMD160 4c59cb9a14d1904bc89a7dfdc467189d57a27883 SHA1 6deb23ad76461327c934f383e348274a43490ba5 SHA256 68bdbfae010beca02bd13e5f7ea30932bb8fb3677a6b4d01326db548dbba5af6
-MD5 219c73acd870cea8e0e9db7df2e39ece ChangeLog 1780
-RMD160 4c59cb9a14d1904bc89a7dfdc467189d57a27883 ChangeLog 1780
-SHA256 68bdbfae010beca02bd13e5f7ea30932bb8fb3677a6b4d01326db548dbba5af6 ChangeLog 1780
+EBUILD sun-java3d-bin-1.3.2-r1.ebuild 1203 RMD160 f4688b45d2a9734077eef32be58634fba07807ca SHA1 e534d108ad89f96556a34dc7f55e338501065dc9 SHA256 035c01724e561d65f60bd9e2694037bd25fec5d6a435ff3c495ce1b009961a2e
+MD5 6595336ac394e06393700cf4bda891c3 sun-java3d-bin-1.3.2-r1.ebuild 1203
+RMD160 f4688b45d2a9734077eef32be58634fba07807ca sun-java3d-bin-1.3.2-r1.ebuild 1203
+SHA256 035c01724e561d65f60bd9e2694037bd25fec5d6a435ff3c495ce1b009961a2e sun-java3d-bin-1.3.2-r1.ebuild 1203
+EBUILD sun-java3d-bin-1.4.0_pre5-r1.ebuild 1386 RMD160 d623afb7c8158ffb3d9bb56530279a74a5113d58 SHA1 11fc0d26795526eeacfef05796002c74651982db SHA256 c5097c37001257948a2ebccd13d25596565668953d72ddd9032eda4710b573af
+MD5 ce1c94b1a0cde5c51f2af23ac826ebe3 sun-java3d-bin-1.4.0_pre5-r1.ebuild 1386
+RMD160 d623afb7c8158ffb3d9bb56530279a74a5113d58 sun-java3d-bin-1.4.0_pre5-r1.ebuild 1386
+SHA256 c5097c37001257948a2ebccd13d25596565668953d72ddd9032eda4710b573af sun-java3d-bin-1.4.0_pre5-r1.ebuild 1386
+MISC ChangeLog 2073 RMD160 db8e181e29bc43c053ba87b3cf880029c0408273 SHA1 7cb15c536fed0156f084a4e45653e85e29f77089 SHA256 1607029d43a5c6c6ce2c8d377cebf3d6ea75629a358be28d74f077ae021ce1ad
+MD5 56080ffb54b7c8e135ea30c8f4895ad6 ChangeLog 2073
+RMD160 db8e181e29bc43c053ba87b3cf880029c0408273 ChangeLog 2073
+SHA256 1607029d43a5c6c6ce2c8d377cebf3d6ea75629a358be28d74f077ae021ce1ad ChangeLog 2073
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 metadata.xml 157
-MD5 bab94013b33134f55427453c49d03d13 files/digest-sun-java3d-bin-1.3.2 533
-RMD160 21c387e3f31716dc34543469b9f83044b60da4d4 files/digest-sun-java3d-bin-1.3.2 533
-SHA256 974d795bb652429dd7bd8d9f9e6462fc7e0bbc8f23043b8dfbd9b342a521c654 files/digest-sun-java3d-bin-1.3.2 533
-MD5 8e9ad2fadfeeee0c066e8092797534cd files/digest-sun-java3d-bin-1.4.0_pre5 575
-RMD160 ea4b0755881638832eee3d01139e156169007c48 files/digest-sun-java3d-bin-1.4.0_pre5 575
-SHA256 f0229ecb784b723d70df9bbb5c917369fbaf9461f27d388437333e55f1bb2d53 files/digest-sun-java3d-bin-1.4.0_pre5 575
+MD5 c2aea78bc2a70e38015ee13afbafb1e1 files/digest-sun-java3d-bin-1.3.2-r1 386
+RMD160 ca02eafddeaada529a75e9f8d2ed6fa2458c3b71 files/digest-sun-java3d-bin-1.3.2-r1 386
+SHA256 b35d645b4611e24c1939a0b3c25aa6a78c4b5080da100f6bdd8af47a8411cec7 files/digest-sun-java3d-bin-1.3.2-r1 386
 MD5 8e9ad2fadfeeee0c066e8092797534cd files/digest-sun-java3d-bin-1.4.0_pre5-r1 575
 RMD160 ea4b0755881638832eee3d01139e156169007c48 files/digest-sun-java3d-bin-1.4.0_pre5-r1 575
 SHA256 f0229ecb784b723d70df9bbb5c917369fbaf9461f27d388437333e55f1bb2d53 files/digest-sun-java3d-bin-1.4.0_pre5-r1 575
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)'
-}