Removed gen1 version, quoted var.

(Portage version: 2.1.4_rc10)

4 files changed, 7 insertions, 62 deletions

diff --git a/dev-java/xml-commons/ChangeLog b/dev-java/xml-commons/ChangeLog
index ea527d140610..14f58690a6a5 100644
--- a/dev-java/xml-commons/ChangeLog
+++ b/dev-java/xml-commons/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/xml-commons
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xml-commons/ChangeLog,v 1.21 2007/11/10 12:25:23 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xml-commons/ChangeLog,v 1.22 2007/12/19 04:32:35 wltjr Exp $
+
+  19 Dec 2007; William L. Thomson Jr. <wltjr@gentoo.org>
+  -xml-commons-1.0_beta2.ebuild, xml-commons-1.0_beta2-r1.ebuild:
+  Removed gen1 version, quoted var.
 
   10 Nov 2007; nixnut <nixnut@gentoo.org> xml-commons-1.0_beta2-r1.ebuild:
   Stable on ppc wrt bug 197709
diff --git a/dev-java/xml-commons/files/digest-xml-commons-1.0_beta2 b/dev-java/xml-commons/files/digest-xml-commons-1.0_beta2
deleted file mode 100644
index 86439ff51227..000000000000
--- a/dev-java/xml-commons/files/digest-xml-commons-1.0_beta2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 6c6551ece56948ee535d5f5014489b8d xml-commons-1.0.b2.tar.gz 1821110
-RMD160 eef68ff81875db60993ee09a5c7c034075f75426 xml-commons-1.0.b2.tar.gz 1821110
-SHA256 22b9e53919e4aa15fdd074a515c8a8dc9823a91d72eb91fbb3e1bd8cfc488375 xml-commons-1.0.b2.tar.gz 1821110
diff --git a/dev-java/xml-commons/xml-commons-1.0_beta2-r1.ebuild b/dev-java/xml-commons/xml-commons-1.0_beta2-r1.ebuild
index 239e50789cff..4ab93ec04bfc 100644
--- a/dev-java/xml-commons/xml-commons-1.0_beta2-r1.ebuild
+++ b/dev-java/xml-commons/xml-commons-1.0_beta2-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/xml-commons/xml-commons-1.0_beta2-r1.ebuild,v 1.8 2007/11/10 12:25:23 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xml-commons/xml-commons-1.0_beta2-r1.ebuild,v 1.9 2007/12/19 04:32:35 wltjr Exp $
 
 JAVA_PKG_IUSE="doc source"
 
@@ -38,7 +38,7 @@ src_compile() {
 	local antflags="jar"
 	use doc && antflags="${antflags} javadocs"
 
-	cd ${S}/java
+	cd "${S}"/java
 	eant -f resolver.xml ${antflags} || die "XML-Resolver Compile failed"
 	eant -f which.xml ${antflags} || die "XML-Which Compile failed"
 }
diff --git a/dev-java/xml-commons/xml-commons-1.0_beta2.ebuild b/dev-java/xml-commons/xml-commons-1.0_beta2.ebuild
deleted file mode 100644
index c73e36fa6efe..000000000000
--- a/dev-java/xml-commons/xml-commons-1.0_beta2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xml-commons/xml-commons-1.0_beta2.ebuild,v 1.16 2006/10/05 17:00:40 gustavoz Exp $
-
-inherit eutils java-pkg
-
-MY_PV=${PV/_beta/.b}
-MY_P=${PN}-${MY_PV}
-DESCRIPTION="Jakarta project for for XML bindings for java"
-HOMEPAGE="http://xml.apache.org/commons/"
-SRC_URI="mirror://apache/xml/commons/${MY_P}.tar.gz"
-
-# Resolver is under Apache-1.1
-# SAX2 is public-domain
-# DOM documentation is under W3C-document
-# DOM software is under W3C
-# See ${S}/java/external for the license files
-LICENSE="Apache-1.1 public-domain W3C-document W3C"
-SLOT="0"
-KEYWORDS="x86 amd64 ppc64 ppc"
-IUSE="doc jikes source"
-
-DEPEND=">=virtual/jdk-1.4
-	dev-java/ant-core
-	jikes? ( >=dev-java/jikes-1.21 )
-	source? ( app-arch/zip )"
-RDEPEND=">=virtual/jre-1.4"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	epatch ${FILESDIR}/${PV}-jdk15.patch
-}
-
-src_compile() {
-	local antflags="jar"
-	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
-	use doc && antflags="${antflags} javadocs"
-
-	cd ${S}/java
-	ant -f resolver.xml ${antflags} || die "XML-Resolver Compile failed"
-	ant -f which.xml ${antflags} || die "XML-Which Compile failed"
-}
-
-src_install() {
-	java-pkg_dojar java/build/which.jar
-	java-pkg_dojar java/build/resolver.jar
-	java-pkg_dojar java/external/build/xml-apis.jar
-
-	dodoc README.html
-	use doc && java-pkg_dohtml -r java/build/docs/*
-	use source && java-pkg_dosrc java/src/org
-}