Removed java gen 1 ebuild, quoted vars.

Package-Manager: portage-2.1.3.15

5 files changed, 18 insertions, 78 deletions

diff --git a/dev-java/jdictrayapi/ChangeLog b/dev-java/jdictrayapi/ChangeLog
index 579a21d14adc..9b2b851fbfa3 100644
--- a/dev-java/jdictrayapi/ChangeLog
+++ b/dev-java/jdictrayapi/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/jdictrayapi
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdictrayapi/ChangeLog,v 1.15 2007/10/20 22:51:59 ali_bush Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdictrayapi/ChangeLog,v 1.16 2007/10/24 05:04:38 wltjr Exp $
+
+  24 Oct 2007; William L. Thomson Jr. <wltjr@gentoo.org>
+  -jdictrayapi-0.8.7.ebuild, jdictrayapi-0.9.1-r2.ebuild:
+  Removed java gen 1 ebuild, quoted vars.
 
   20 Oct 2007; <alistair@gentoo.org> jdictrayapi-0.9.1-r3.ebuild:
   Adding blocker on =virtual/jre-1.6 as it will not run on 1.6
diff --git a/dev-java/jdictrayapi/Manifest b/dev-java/jdictrayapi/Manifest
index b4e3cc827d60..0d391ce18f1e 100644
--- a/dev-java/jdictrayapi/Manifest
+++ b/dev-java/jdictrayapi/Manifest
@@ -6,31 +6,23 @@ AUX fix-ctray-libarch.patch 517 RMD160 d4295b873c20eda20ec5e95bd343f8e7877745ec
 MD5 a7e82706eb44db1a86d8e8c5c695ec9a files/fix-ctray-libarch.patch 517
 RMD160 d4295b873c20eda20ec5e95bd343f8e7877745ec files/fix-ctray-libarch.patch 517
 SHA256 cf23b3819a6bc4a214c425efeb66ba7d2d285bf36e84a42b5780beac224db155 files/fix-ctray-libarch.patch 517
-DIST jdic-0.8.7-src.zip 177652 RMD160 29819ff72f1cd7aacbdc01a1e134e300e4a37a52 SHA1 d283829176512c815e137cb8fba62dc9d48ae72c SHA256 081f33fa454497112a827c76c6fbbcbb5aa8882530b74d4a5a25122f47ae0f75
 DIST jdic-0.9.1-src.zip 946706 RMD160 29193141fc0c2f4592bfa41fac7f73795d189e6d SHA1 f1bd1ab6305e13607008687222e9cefbf5741c1a SHA256 2b455c657c815650dd42b9a08714d561419b8da423009c710f046aadbe83e69b
-EBUILD jdictrayapi-0.8.7.ebuild 1337 RMD160 81a8aa2bed3abbcb041e9ce3763902187db204c8 SHA1 e8029ab45788a6903bb9bc7e6d5185b51addeb10 SHA256 74ce705f72e345d0ba293bf81fb9d39d396987195d67da04ad98659f120920b9
-MD5 907547ad547fa10e7e0ff404c03b120d jdictrayapi-0.8.7.ebuild 1337
-RMD160 81a8aa2bed3abbcb041e9ce3763902187db204c8 jdictrayapi-0.8.7.ebuild 1337
-SHA256 74ce705f72e345d0ba293bf81fb9d39d396987195d67da04ad98659f120920b9 jdictrayapi-0.8.7.ebuild 1337
-EBUILD jdictrayapi-0.9.1-r2.ebuild 1300 RMD160 e1e0b83cb4a465e3ad4b73ff3e59cb992e877976 SHA1 46a71af0a4469f23e83ef02d17abf01713e33f58 SHA256 c38d33065f42343cf788bdf4e7d2ef7b548eeb438a407c511562b9e0b36eb28d
-MD5 0653d38ae67f600e7c395e1be84e36b5 jdictrayapi-0.9.1-r2.ebuild 1300
-RMD160 e1e0b83cb4a465e3ad4b73ff3e59cb992e877976 jdictrayapi-0.9.1-r2.ebuild 1300
-SHA256 c38d33065f42343cf788bdf4e7d2ef7b548eeb438a407c511562b9e0b36eb28d jdictrayapi-0.9.1-r2.ebuild 1300
+EBUILD jdictrayapi-0.9.1-r2.ebuild 1307 RMD160 ea20f1283ff1dd72c7f7d0952e44d99f2318e786 SHA1 77d1fa343b65772d749d4f451ce37c14e3b41b2a SHA256 fcf3e9a229e99e4846bc2031e494c89defd0820328454253fa86e7d637cad9e3
+MD5 75c39218948c37bebd5d9d3573b4c232 jdictrayapi-0.9.1-r2.ebuild 1307
+RMD160 ea20f1283ff1dd72c7f7d0952e44d99f2318e786 jdictrayapi-0.9.1-r2.ebuild 1307
+SHA256 fcf3e9a229e99e4846bc2031e494c89defd0820328454253fa86e7d637cad9e3 jdictrayapi-0.9.1-r2.ebuild 1307
 EBUILD jdictrayapi-0.9.1-r3.ebuild 1381 RMD160 ba9e4cc56dd6b9c17ec606edf61b89aaf72993bd SHA1 3c700d0e08751aa196f85d172b15bbfc5452c7b6 SHA256 5ab61188f056f0ee937afbb45f90d950aff607e7a54c16604686fad6de595684
 MD5 43dce8381352010c0bcf57921af13fc7 jdictrayapi-0.9.1-r3.ebuild 1381
 RMD160 ba9e4cc56dd6b9c17ec606edf61b89aaf72993bd jdictrayapi-0.9.1-r3.ebuild 1381
 SHA256 5ab61188f056f0ee937afbb45f90d950aff607e7a54c16604686fad6de595684 jdictrayapi-0.9.1-r3.ebuild 1381
-MISC ChangeLog 2581 RMD160 ce3b168d266a27fd1ce9f9f3d1565972c0822a37 SHA1 032cbacd298a308b2348052cb4fc2bae92dd8aa9 SHA256 da90bb085fba9807dfc6ae6f3550f26f6eae0f89a02bfc2086534939d3a89de2
-MD5 c9c89076869a83b02dd16d8e5331e28b ChangeLog 2581
-RMD160 ce3b168d266a27fd1ce9f9f3d1565972c0822a37 ChangeLog 2581
-SHA256 da90bb085fba9807dfc6ae6f3550f26f6eae0f89a02bfc2086534939d3a89de2 ChangeLog 2581
+MISC ChangeLog 2736 RMD160 fafaa523131d165f37a9862c3e23c9c5eda7bb9c SHA1 2a38cbf5d55ac7ff5300ab8e2f42c3a5183e3734 SHA256 5f7826cafd07324f72a31ab41b7425761a272c0d8175a4f9b204fce7728fbbad
+MD5 bd54c7d898d5fea81b5be31121572e06 ChangeLog 2736
+RMD160 fafaa523131d165f37a9862c3e23c9c5eda7bb9c ChangeLog 2736
+SHA256 5f7826cafd07324f72a31ab41b7425761a272c0d8175a4f9b204fce7728fbbad ChangeLog 2736
 MISC metadata.xml 833 RMD160 e1762152ea2d4b27aacd22b0a51cc3ce9f9f205f SHA1 6e054486ce1f41f12a917a1eb56da718408fd4c6 SHA256 4fb15e73dcab0cb963533ef65ab1823b93d152ee40a8995e2ded27d73a8bfc5e
 MD5 d00bbcdfd833eef89c766b9c8cecba16 metadata.xml 833
 RMD160 e1762152ea2d4b27aacd22b0a51cc3ce9f9f205f metadata.xml 833
 SHA256 4fb15e73dcab0cb963533ef65ab1823b93d152ee40a8995e2ded27d73a8bfc5e metadata.xml 833
-MD5 cf66b170ae538b93769fbb71728aa33e files/digest-jdictrayapi-0.8.7 235
-RMD160 65b72a0509dd1515c922a1cd4b974d2328f1a5ea files/digest-jdictrayapi-0.8.7 235
-SHA256 dc0693959e68eb087984ff8befee36db19e61d3e6691bfa3b79944d324dc287e files/digest-jdictrayapi-0.8.7 235
 MD5 b9b3c3d056ba6ce249c40e50e5d780c9 files/digest-jdictrayapi-0.9.1-r2 235
 RMD160 3a915566cfaba80d3061607509950b91264f4410 files/digest-jdictrayapi-0.9.1-r2 235
 SHA256 5b0eeaaa5a5c815b9144d89af11359f140e3fea42f8d2774906351af08623133 files/digest-jdictrayapi-0.9.1-r2 235
diff --git a/dev-java/jdictrayapi/files/digest-jdictrayapi-0.8.7 b/dev-java/jdictrayapi/files/digest-jdictrayapi-0.8.7
deleted file mode 100644
index e8c690742b84..000000000000
--- a/dev-java/jdictrayapi/files/digest-jdictrayapi-0.8.7
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 e7588c6158f60ddb632f03dcda6c246a jdic-0.8.7-src.zip 177652
-RMD160 29819ff72f1cd7aacbdc01a1e134e300e4a37a52 jdic-0.8.7-src.zip 177652
-SHA256 081f33fa454497112a827c76c6fbbcbb5aa8882530b74d4a5a25122f47ae0f75 jdic-0.8.7-src.zip 177652
diff --git a/dev-java/jdictrayapi/jdictrayapi-0.8.7.ebuild b/dev-java/jdictrayapi/jdictrayapi-0.8.7.ebuild
deleted file mode 100644
index 5ebde27d6cfe..000000000000
--- a/dev-java/jdictrayapi/jdictrayapi-0.8.7.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdictrayapi/jdictrayapi-0.8.7.ebuild,v 1.4 2005/05/04 19:19:52 luckyduck Exp $
-
-inherit eutils java-pkg
-
-MY_P="jdic"
-DESCRIPTION="The JDesktop Integration Components (JDIC) tray icon API"
-HOMEPAGE="https://jdic.dev.java.net/"
-SRC_URI="https://jdic.dev.java.net/files/documents/880/9849/jdic-${PV}-src.zip"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="x86 amd64 ~ppc"
-IUSE="doc examples jikes source"
-
-DEPEND=">=virtual/jdk-1.4
-	dev-java/ant-core
-	app-arch/unzip
-	jikes? ( >=dev-java/jikes-1.21 )
-	source? ( app-arch/zip )"
-RDEPEND=">=virtual/jre-1.4"
-
-S="${WORKDIR}/${MY_P}-${PV}-src/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	epatch ${FILESDIR}/${PV}-gentoo.patch
-}
-
-src_compile() {
-	local antflags="buildtray"
-	use doc && antflags="${antflags} docs"
-	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
-	ant ${antflags} || die "ant build failed"
-}
-
-src_install() {
-	cd ${WORKDIR}/${MY_P}-${PV}-src/
-
-	cd ${S}/dist/linux
-	java-pkg_dojar jdic.jar
-	java-pkg_doso libtray.so
-
-	use doc && java-pkg_dohtml -r docs/*
-	use source && java-pkg_dosrc ${S}/src/unix/*
-	if use examples; then
-		dodir /usr/share/doc/${PF}/examples
-		cp -r ${S}/demo/* ${D}/usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/dev-java/jdictrayapi/jdictrayapi-0.9.1-r2.ebuild b/dev-java/jdictrayapi/jdictrayapi-0.9.1-r2.ebuild
index e70628420230..fc83ff6c4a61 100644
--- a/dev-java/jdictrayapi/jdictrayapi-0.9.1-r2.ebuild
+++ b/dev-java/jdictrayapi/jdictrayapi-0.9.1-r2.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/jdictrayapi/jdictrayapi-0.9.1-r2.ebuild,v 1.4 2007/09/28 22:54:08 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdictrayapi/jdictrayapi-0.9.1-r2.ebuild,v 1.5 2007/10/24 05:04:38 wltjr Exp $
 
 JAVA_PKG_IUSE="doc source"
 
@@ -39,13 +39,13 @@ src_compile() {
 }
 
 src_install() {
-	cd ${S}/dist/linux
+	cd "${S}"/dist/linux
 	java-pkg_dojar jdic.jar
 	java-pkg_doso libtray.so
-	use doc && java-pkg_dojavadoc ${S}/../docs
-	use source && java-pkg_dosrc ${S}/src/share/classes/* ${S}/src/unix/classes/*
+	use doc && java-pkg_dojavadoc "${S}"/../docs
+	use source && java-pkg_dosrc "${S}"/src/share/classes/* "${S}"/src/unix/classes/*
 	if use examples; then
 		dodir /usr/share/doc/${PF}/examples
-		cp -r ${S}/demo/Tray/* ${D}/usr/share/doc/${PF}/examples/
+		cp -r "${S}"/demo/Tray/* "${D}"/usr/share/doc/${PF}/examples/
 	fi
 }