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

(Portage version: 2.1.3.15)

4 files changed, 13 insertions, 46 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/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
-}