Removed java gen 1 ebuilds, quoted vars.

Package-Manager: portage-2.1.3.15

4 files changed, 10 insertions, 73 deletions

diff --git a/dev-java/xdoclet/ChangeLog b/dev-java/xdoclet/ChangeLog
index 08ca0746aeec..22bc44212b44 100644
--- a/dev-java/xdoclet/ChangeLog
+++ b/dev-java/xdoclet/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/xdoclet
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xdoclet/ChangeLog,v 1.28 2007/08/13 12:58:24 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xdoclet/ChangeLog,v 1.29 2007/10/24 06:31:25 wltjr Exp $
+
+  24 Oct 2007; William L. Thomson Jr. <wltjr@gentoo.org>
+  -xdoclet-1.2.2.ebuild, xdoclet-1.2.3.ebuild:
+  Removed java gen 1 ebuilds, quoted vars.
 
   13 Aug 2007; Christian Faulhammer <opfer@gentoo.org> xdoclet-1.2.3.ebuild:
   stable x86, bug 187603
diff --git a/dev-java/xdoclet/files/digest-xdoclet-1.2.2 b/dev-java/xdoclet/files/digest-xdoclet-1.2.2
deleted file mode 100644
index 6e668efc0d02..000000000000
--- a/dev-java/xdoclet/files/digest-xdoclet-1.2.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 5ed352554cd8ac048e8bf99a25c9b07d xdoclet-src-1.2.2.tgz 5745305
-RMD160 1685e82c03e11fca7365489b4e043ba2540847f6 xdoclet-src-1.2.2.tgz 5745305
-SHA256 fae9816a4332c212034657ac7a85c8a6c9945840a2f246d857aeca8a08ce34c1 xdoclet-src-1.2.2.tgz 5745305
diff --git a/dev-java/xdoclet/xdoclet-1.2.2.ebuild b/dev-java/xdoclet/xdoclet-1.2.2.ebuild
deleted file mode 100644
index 69b607442753..000000000000
--- a/dev-java/xdoclet/xdoclet-1.2.2.ebuild
+++ /dev/null
@@ -1,64 +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/xdoclet/xdoclet-1.2.2.ebuild,v 1.10 2007/07/11 19:58:37 mr_bones_ Exp $
-
-inherit java-pkg eutils
-
-DESCRIPTION="XDoclet is an extended Javadoc Doclet engine."
-HOMEPAGE="http://xdoclet.sf.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}-src-${PV}.tgz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="jikes source"
-
-RDEPEND=">=virtual/jre-1.3
-	>=dev-java/bsf-2.3
-	dev-java/commons-collections
-	dev-java/commons-logging
-	dev-java/log4j
-	dev-java/mockobjects
-	dev-java/velocity
-	dev-java/xjavadoc"
-DEPEND=">=virtual/jdk-1.3
-	${RDEPEND}
-	>=dev-java/ant-core-1.6
-	>=dev-java/ant-tasks-1.6
-	jikes? ( dev-java/jikes )
-	source? ( app-arch/zip )"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	epatch ${FILESDIR}/${P}-interface.patch
-	epatch ${FILESDIR}/${P}-buildfile.patch
-	# Fixes problems experienced when behind a proxy.
-	# Contributed by Gergan Penkov <gpp666_999@yahoo.de> bug #99642
-	epatch ${FILESDIR}/${PN}-modules_common_ent.patch
-
-	cd ${S}/lib && rm -f *.jar
-	java-pkg_jar-from xjavadoc
-	java-pkg_jar-from bsf-2.3
-	java-pkg_jar-from velocity
-	java-pkg_jar-from log4j
-	java-pkg_jar-from mockobjects
-	java-pkg_jar-from commons-logging
-	java-pkg_jar-from commons-collections
-	java-pkg_jar-from velocity
-}
-
-src_compile() {
-	local antflags="core modules maven"
-	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
-	ant ${antflags} || die "Failed to compile XDoclet core."
-}
-
-src_install() {
-	for jar in target/lib/*.jar; do
-		java-pkg_newjar ${jar} $(basename ${jar/-${PV}/})
-	done
-
-	dodoc README.txt
-	use source && java-pkg_dosrc core/src/xdoclet modules/*
-}
diff --git a/dev-java/xdoclet/xdoclet-1.2.3.ebuild b/dev-java/xdoclet/xdoclet-1.2.3.ebuild
index 20162921b6c7..f5e5401ba935 100644
--- a/dev-java/xdoclet/xdoclet-1.2.3.ebuild
+++ b/dev-java/xdoclet/xdoclet-1.2.3.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/xdoclet/xdoclet-1.2.3.ebuild,v 1.10 2007/08/13 12:58:24 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xdoclet/xdoclet-1.2.3.ebuild,v 1.11 2007/10/24 06:31:25 wltjr Exp $
 
 JAVA_PKG_IUSE="source"
 WANT_ANT_TASKS="ant-nodeps ant-trax"
@@ -32,11 +32,11 @@ RDEPEND=">=virtual/jre-1.4
 src_unpack() {
 	unpack ${A}
 
-	cd ${S}
-	epatch ${FILESDIR}/${P}-interface.patch
-	epatch ${FILESDIR}/${P}-buildfile.patch
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-interface.patch
+	epatch "${FILESDIR}"/${P}-buildfile.patch
 
-	cd ${S}/lib && rm -f *.jar
+	cd "${S}"/lib && rm -f *.jar
 	java-pkg_jar-from xjavadoc
 	java-pkg_jar-from bsf-2.3
 	java-pkg_jar-from velocity