Removed java gen 1 ebuilds, quoted vars.

Package-Manager: portage-2.1.3.15

6 files changed, 12 insertions, 132 deletions

diff --git a/dev-java/swidgets/ChangeLog b/dev-java/swidgets/ChangeLog
index 8a1a04d626e5..af25eec72ab8 100644
--- a/dev-java/swidgets/ChangeLog
+++ b/dev-java/swidgets/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/swidgets
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/swidgets/ChangeLog,v 1.16 2007/09/28 22:46:09 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/swidgets/ChangeLog,v 1.17 2007/10/24 06:21:01 wltjr Exp $
+
+  24 Oct 2007; William L. Thomson Jr. <wltjr@gentoo.org>
+  -swidgets-0.1.ebuild, -swidgets-0.1.1.ebuild, swidgets-0.1.1-r1.ebuild:
+  Removed java gen 1 ebuilds, quoted vars.
 
   28 Sep 2007; Wulf C. Krueger <philantrop@gentoo.org>
   swidgets-0.1.1-r1.ebuild:
diff --git a/dev-java/swidgets/files/digest-swidgets-0.1 b/dev-java/swidgets/files/digest-swidgets-0.1
deleted file mode 100644
index fac85ba8a997..000000000000
--- a/dev-java/swidgets/files/digest-swidgets-0.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 67a715eb8ca04529d2e00bcacae2ffff swidgets-0.1-src.zip 56004
-RMD160 532f9a9fc10a3b608d633d242a1ed0a44750ec37 swidgets-0.1-src.zip 56004
-SHA256 5e1690b528c33a244775ae062e42c1c78fee30c9a84d85c49c23fbc4dedeb915 swidgets-0.1-src.zip 56004
diff --git a/dev-java/swidgets/files/digest-swidgets-0.1.1 b/dev-java/swidgets/files/digest-swidgets-0.1.1
deleted file mode 100644
index 576cda75d6e2..000000000000
--- a/dev-java/swidgets/files/digest-swidgets-0.1.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 4826acb70480b11e89d913608ede6be0 swidgets-0.1.1-src.zip 60925
-RMD160 0907d470d664a482f4096105f61da8c4677ba293 swidgets-0.1.1-src.zip 60925
-SHA256 adee6311304c67cba2ab9238112b941656c0ca6a9b3a3f0c526d5ef8abec0f5c swidgets-0.1.1-src.zip 60925
diff --git a/dev-java/swidgets/swidgets-0.1.1-r1.ebuild b/dev-java/swidgets/swidgets-0.1.1-r1.ebuild
index d9ea69e133e2..2dcd8f77e0f0 100644
--- a/dev-java/swidgets/swidgets-0.1.1-r1.ebuild
+++ b/dev-java/swidgets/swidgets-0.1.1-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/swidgets/swidgets-0.1.1-r1.ebuild,v 1.7 2007/09/28 22:46:09 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/swidgets/swidgets-0.1.1-r1.ebuild,v 1.8 2007/10/24 06:21:01 wltjr Exp $
 
 JAVA_PKG_IUSE="source"
 
@@ -29,16 +29,16 @@ src_unpack() {
 	find . -name 'CVS' | xargs rmdir
 
 	# Create the directory structor
-	mkdir ${S}
+	mkdir "${S}"
 
 	# Move the broken out source file
-	mv src ${S}
-	mv LabelledLayout.java ${S}/src/org/tigris/swidgets/
+	mv src "${S}"
+	mv LabelledLayout.java "${S}"/src/org/tigris/swidgets/
 
 	# Copy the build.xml
-	cp ${FILESDIR}/build.xml ${S} || die "Unable to copy the build file!"
+	cp "${FILESDIR}"/build.xml "${S}" || die "Unable to copy the build file!"
 
-	cat > ${S}/build.properties <<- EOF
+	cat > "${S}"/build.properties <<- EOF
 		src=src
 		dest=dest
 		build=build
@@ -49,5 +49,5 @@ src_unpack() {
 
 src_install() {
 	java-pkg_newjar dest/swidgets-${PV}.jar ${PN}.jar
-	use source && java-pkg_dosrc ${S}/src/org/
+	use source && java-pkg_dosrc "${S}"/src/org/
 }
diff --git a/dev-java/swidgets/swidgets-0.1.1.ebuild b/dev-java/swidgets/swidgets-0.1.1.ebuild
deleted file mode 100644
index e57c84591b75..000000000000
--- a/dev-java/swidgets/swidgets-0.1.1.ebuild
+++ /dev/null
@@ -1,60 +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/swidgets/swidgets-0.1.1.ebuild,v 1.4 2007/02/04 14:13:05 ticho Exp $
-
-inherit java-pkg
-
-DESCRIPTION="Various reusable SWING components"
-HOMEPAGE="http://swidgets.tigris.org"
-SRC_URI="http://swidgets.tigris.org/files/documents/1472/18566/swidgets-${PV}-src.zip"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 x86"
-IUSE="jikes source"
-
-RDEPEND="virtual/jre
-		 dev-java/toolbar"
-
-DEPEND="${RDEPEND}
-		virtual/jdk
-		dev-java/ant-core
-		app-arch/unzip
-		source? ( app-arch/zip )"
-
-src_unpack() {
-	unpack ${A}
-
-	# Remove the CVS directories
-	find . -name 'CVS' | xargs rmdir
-
-	# Create the directory structor
-	mkdir ${S}
-
-	# Move the broken out source file
-	mv src ${S}
-	mv LabelledLayout.java ${S}/src/org/tigris/swidgets/
-
-	# Copy the build.xml
-	cp ${FILESDIR}/build.xml ${S} || die "Unable to copy the build file!"
-
-	cat > ${S}/build.properties <<- EOF
-		src=src
-		dest=dest
-		build=build
-		version=${PV}
-		classpath=$(java-config -p toolbar)
-	EOF
-}
-
-src_compile() {
-	local antflags=""
-	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
-
-	ant ${antflags} || die "Compile failed!"
-}
-
-src_install() {
-	java-pkg_newjar dest/swidgets-${PV}.jar ${PN}.jar
-	use source && java-pkg_dosrc ${S}/src/org/
-}
diff --git a/dev-java/swidgets/swidgets-0.1.ebuild b/dev-java/swidgets/swidgets-0.1.ebuild
deleted file mode 100644
index 2e1f1e3631e1..000000000000
--- a/dev-java/swidgets/swidgets-0.1.ebuild
+++ /dev/null
@@ -1,58 +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/swidgets/swidgets-0.1.ebuild,v 1.9 2007/01/28 19:36:52 wltjr Exp $
-
-inherit java-pkg
-
-DESCRIPTION="Various reusable SWING components"
-HOMEPAGE="http://swidgets.tigris.org"
-SRC_URI="http://swidgets.tigris.org/files/documents/1472/18566/swidgets-${PV}-src.zip"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="x86 amd64"
-IUSE="jikes source"
-
-RDEPEND=">=virtual/jre-1.4
-	 dev-java/toolbar"
-DEPEND=">=virtual/jdk-1.4
-	${RDEPEND}
-	dev-java/ant-core
-	jikes? ( dev-java/jikes )
-	app-arch/unzip
-	source? ( app-arch/zip )"
-
-src_unpack() {
-	unpack ${A}
-
-	# Remove the CVS directories
-	find . -name 'CVS' | xargs rmdir
-
-	# Remove the unneeded directory
-	mv src/org ${S}
-	rm -rf src
-
-	# Copy the build.xml
-	cp ${FILESDIR}/build.xml ${S} || die "Unable to copy the build file!"
-
-	# Create the build.properties file
-	cat > ${S}/build.properties <<- EOF
-		src=.
-		dest=dest
-		build=build
-		version=${PV}
-		classpath=$(java-pkg_getjars toolbar)
-	EOF
-}
-
-src_compile() {
-	local antflags=""
-	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
-	ant ${antflags} || die "Compile failed!"
-}
-
-src_install() {
-	java-pkg_newjar dest/swidgets-${PV}.jar ${PN}.jar
-
-	use source && java-pkg_dosrc tigris
-}