Removed java gen 1 ebuild, quoted vars. Soon to be last rited and masked.

Package-Manager: portage-2.1.3.15

5 files changed, 21 insertions, 61 deletions

diff --git a/dev-db/xpg/ChangeLog b/dev-db/xpg/ChangeLog
index 8ae427e685e8..62d76e286785 100644
--- a/dev-db/xpg/ChangeLog
+++ b/dev-db/xpg/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-db/xpg
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/xpg/ChangeLog,v 1.6 2006/07/17 14:51:17 nichoj Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/xpg/ChangeLog,v 1.7 2007/10/24 03:51:30 wltjr Exp $
+
+  24 Oct 2007; William L. Thomson Jr. <wltjr@gentoo.org> -xpg-0.1.ebuild,
+  xpg-0.1-r1.ebuild:
+  Removed java gen 1 ebuild, quoted vars. Soon to be last rited and masked.
 
 *xpg-0.1-r1 (17 Jul 2006)
 
diff --git a/dev-db/xpg/Manifest b/dev-db/xpg/Manifest
index 34907a7b3aa2..cabacaeb97c0 100644
--- a/dev-db/xpg/Manifest
+++ b/dev-db/xpg/Manifest
@@ -1,24 +1,17 @@
 DIST xpg-current.tar.gz 634870 RMD160 45cd85d27968478a0eb0af941021fe4ab17236a3 SHA1 07020dd7b21aac1b0023d76fe44954596b557f08 SHA256 55e5aa108c49696980cc918f0975678008beff02612dac6920f770a5a8976ce6
 DIST xpg-icons.tar.gz 38039 RMD160 786a17f569eb3dc2427c6320fc119b1a279117f6 SHA1 26d0bba732b8d06263bcb315431fbab309f6ff27 SHA256 07207638d2a1638c638ebac2f0a522885fb68ba9685592c1b2fe46d581a75fd8
-EBUILD xpg-0.1-r1.ebuild 1026 RMD160 cf4a79c1f07e58c03d95be741e22137f4baa7155 SHA1 d698b83f63da59e53859b3abb01a14ecec695568 SHA256 e666f835fb9084a19136c4ce4946a1808e454f29838ec2de160473f6718da6f3
-MD5 e2696330c6092c41756c54c4cd9e4523 xpg-0.1-r1.ebuild 1026
-RMD160 cf4a79c1f07e58c03d95be741e22137f4baa7155 xpg-0.1-r1.ebuild 1026
-SHA256 e666f835fb9084a19136c4ce4946a1808e454f29838ec2de160473f6718da6f3 xpg-0.1-r1.ebuild 1026
-EBUILD xpg-0.1.ebuild 930 RMD160 f6fc5462c73ff51b4473c24c8d62a39354a17848 SHA1 dd37b67625c438393f76daaeec3f67ff3c50cce5 SHA256 d391f774101a3dbc00a927d8770d19b79785b0b3ccfa579f0e8c5d50bc41c55f
-MD5 3cea11f1034b8265bc5e45f424e1ca44 xpg-0.1.ebuild 930
-RMD160 f6fc5462c73ff51b4473c24c8d62a39354a17848 xpg-0.1.ebuild 930
-SHA256 d391f774101a3dbc00a927d8770d19b79785b0b3ccfa579f0e8c5d50bc41c55f xpg-0.1.ebuild 930
-MISC ChangeLog 773 RMD160 812126ca71ba3edd92d3719042379e0fa8cc3a5f SHA1 5e28c856ca021d5a5329337279ac94dcef244c0e SHA256 3757a937a41a626be0c1e1e5303fd940772cf952f18cd0fb0f41c962848813b0
-MD5 44db958c04c74ac56d7aee69dc381c9c ChangeLog 773
-RMD160 812126ca71ba3edd92d3719042379e0fa8cc3a5f ChangeLog 773
-SHA256 3757a937a41a626be0c1e1e5303fd940772cf952f18cd0fb0f41c962848813b0 ChangeLog 773
+EBUILD xpg-0.1-r1.ebuild 1039 RMD160 62e88c4c3a9d1297c1c6d2a42800f10e6ad88cdb SHA1 2cf1abfd4d519ed6e4e8a2baa82e8ce0103a36ea SHA256 bf42175ed75e19f42de650285a7a0cc030ebff8d12880fee8bd4852bc506118f
+MD5 fc4e368a5ee74e10320e2e76b0341582 xpg-0.1-r1.ebuild 1039
+RMD160 62e88c4c3a9d1297c1c6d2a42800f10e6ad88cdb xpg-0.1-r1.ebuild 1039
+SHA256 bf42175ed75e19f42de650285a7a0cc030ebff8d12880fee8bd4852bc506118f xpg-0.1-r1.ebuild 1039
+MISC ChangeLog 944 RMD160 79aa3e4b97d5eab9d5722f10d49d99a5937419ba SHA1 66be4ba2c2a57db627dcf286a1d023a432822ccc SHA256 8bfb7487b9f22846a35a6b1e213759c8449fda8350eda1cdcd46e26703069816
+MD5 826b0d446daa24153abe9fe1ed2589b3 ChangeLog 944
+RMD160 79aa3e4b97d5eab9d5722f10d49d99a5937419ba ChangeLog 944
+SHA256 8bfb7487b9f22846a35a6b1e213759c8449fda8350eda1cdcd46e26703069816 ChangeLog 944
 MISC metadata.xml 318 RMD160 a0341b4c1065c62ec7f22473121323005561c373 SHA1 41f3bef77acdc206bd550ba73232147f59d3e8dd SHA256 1226e4f12d20217029d1d2f6c32764a9b6d3097dc145df45c7165e028b97bc8d
 MD5 64874a0274522a82a1c86e77d4d3c58d metadata.xml 318
 RMD160 a0341b4c1065c62ec7f22473121323005561c373 metadata.xml 318
 SHA256 1226e4f12d20217029d1d2f6c32764a9b6d3097dc145df45c7165e028b97bc8d metadata.xml 318
-MD5 9eb68e5b00b9764fb45c67a0a33f998e files/digest-xpg-0.1 461
-RMD160 bcc009b627aa4328042a12fbf0f22dd0bb23ea5d files/digest-xpg-0.1 461
-SHA256 b1357f77b2cf6bf6560b7152bc02a394de448c147d3e1d6d957c63743ef5db28 files/digest-xpg-0.1 461
 MD5 9eb68e5b00b9764fb45c67a0a33f998e files/digest-xpg-0.1-r1 461
 RMD160 bcc009b627aa4328042a12fbf0f22dd0bb23ea5d files/digest-xpg-0.1-r1 461
 SHA256 b1357f77b2cf6bf6560b7152bc02a394de448c147d3e1d6d957c63743ef5db28 files/digest-xpg-0.1-r1 461
diff --git a/dev-db/xpg/files/digest-xpg-0.1 b/dev-db/xpg/files/digest-xpg-0.1
deleted file mode 100644
index 4ed27ad466bf..000000000000
--- a/dev-db/xpg/files/digest-xpg-0.1
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 dfbab3741d64fecea33219179304d464 xpg-current.tar.gz 634870
-RMD160 45cd85d27968478a0eb0af941021fe4ab17236a3 xpg-current.tar.gz 634870
-SHA256 55e5aa108c49696980cc918f0975678008beff02612dac6920f770a5a8976ce6 xpg-current.tar.gz 634870
-MD5 aba52d5c542230e134ea6c0e62640a4f xpg-icons.tar.gz 38039
-RMD160 786a17f569eb3dc2427c6320fc119b1a279117f6 xpg-icons.tar.gz 38039
-SHA256 07207638d2a1638c638ebac2f0a522885fb68ba9685592c1b2fe46d581a75fd8 xpg-icons.tar.gz 38039
diff --git a/dev-db/xpg/xpg-0.1-r1.ebuild b/dev-db/xpg/xpg-0.1-r1.ebuild
index fa71ad9e861f..fa6501459c8d 100644
--- a/dev-db/xpg/xpg-0.1-r1.ebuild
+++ b/dev-db/xpg/xpg-0.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/xpg/xpg-0.1-r1.ebuild,v 1.1 2006/07/17 14:51:17 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/xpg/xpg-0.1-r1.ebuild,v 1.2 2007/10/24 03:51:30 wltjr Exp $
 
 inherit java-pkg-2
 
@@ -18,7 +18,7 @@ DEPEND=">=virtual/jdk-1.4"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 	sed -i "s/javac/javac $(java-pkg_javac-args)/" Makefile || die "sed failed"
 }
 
@@ -27,12 +27,12 @@ src_compile() {
 }
 
 src_install() {
-	cd ${S}
+	cd "${S}"
 	java-pkg_dojar bin/*.jar
 	dodir /usr/share/xpg /usr/share/pixmaps/
-	cp -Rdp styles ${D}/usr/share/xpg/
-	cp -Rdp ${WORKDIR}/*.jpg ${D}/usr/share/pixmaps/
-	cp -Rdp ${WORKDIR}/*.xpm ${D}/usr/share/pixmaps/
+	cp -Rdp styles "${D}"/usr/share/xpg/
+	cp -Rdp "${WORKDIR}"/*.jpg "${D}"/usr/share/pixmaps/
+	cp -Rdp "${WORKDIR}"/*.xpm "${D}"/usr/share/pixmaps/
 	dohtml -r doc/*
 
 	java-pkg_dolauncher ${PN} --jar xpg.jar --java_args '-Dxpghome=/usr/share/xpg'
diff --git a/dev-db/xpg/xpg-0.1.ebuild b/dev-db/xpg/xpg-0.1.ebuild
deleted file mode 100644
index 31eccb638ff4..000000000000
--- a/dev-db/xpg/xpg-0.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/xpg/xpg-0.1.ebuild,v 1.8 2005/01/01 17:45:39 eradicator Exp $
-inherit java-pkg
-
-DESCRIPTION="GUI for PostgreSQL written in Java"
-HOMEPAGE="http://www.kazak.ws/xpg/"
-SRC_URI="mirror://gentoo/xpg-current.tar.gz
-	mirror://gentoo/xpg-icons.tar.gz"
-S="${WORKDIR}/xpg-current"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~ppc ~x86"
-IUSE=""
-DEPEND=">=virtual/jdk-1.4"
-
-src_compile() {
-	make || die "make problems"
-}
-src_install () {
-	cd ${S}
-	java-pkg_dojar bin/*.jar
-	dodir /usr/share/xpg /usr/share/pixmaps/
-	cp -Rdp styles ${D}/usr/share/xpg/
-	cp -Rdp ${WORKDIR}/*.jpg ${D}/usr/share/pixmaps/
-	cp -Rdp ${WORKDIR}/*.xpm ${D}/usr/share/pixmaps/
-	dohtml -r doc/*
-
-	echo -e "#!/bin/bash\nexport XPG_HOME=/usr/share/xpg\njava -Dxpghome=\${XPG_HOME} -jar \${XPG_HOME}/lib/xpg.jar" > xpg
-	dobin xpg
-}