like anyone will read this commit msg

Package-Manager: portage-2.0.51.22-r1

5 files changed, 10 insertions, 49 deletions

diff --git a/dev-java/xdoclet/Manifest b/dev-java/xdoclet/Manifest
index 85475d12259d..094290f65a4b 100644
--- a/dev-java/xdoclet/Manifest
+++ b/dev-java/xdoclet/Manifest
@@ -1,20 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 088c180629eb555896225a87fd47063f xdoclet-1.2.2.ebuild 1505
-MD5 59db2e3e85a7935f06a21fc46a6b1549 xdoclet-1.2.0_beta1.ebuild 845
-MD5 c796b1c1ff426dca8f1a745f408cf9d3 xdoclet-1.2.1.ebuild 1476
+MD5 681850b0140883586d9081c0462305da xdoclet-1.2.2.ebuild 1504
+MD5 23eedf023b42c74cebfac4887dbc1231 xdoclet-1.2.1.ebuild 1476
 MD5 fcdbc4334683064f6fd297c9db0751c2 ChangeLog 1878
 MD5 2f0b8cbc0e0adf36b678725712a3e3b7 metadata.xml 511
 MD5 36b04e593588b126ef0e905e4ead4fcf files/xdoclet-1.2.2-buildfile.patch 2518
 MD5 0c3cfa2caf87830c10fb14bc83840c98 files/xdoclet-1.2.2-interface.patch 10893
-MD5 cf001749ad1559c92f75e64bf7939974 files/digest-xdoclet-1.2.0_beta1 73
 MD5 6d6f9189f4ecffc98c1b539a0b647cc3 files/digest-xdoclet-1.2.1 139
 MD5 5a7e75c3d62a58edfa3c2416acfbb69a files/digest-xdoclet-1.2.2 67
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFC16X0/rLF9B432nYRAmvLAJ9IDpWtP5hE4+JG+gJZLyr8wD623ACfbxJE
-bDA9ZjFMoOECPOSSmCxTiBo=
-=4iS2
+iD8DBQFC2/G0/rLF9B432nYRAggJAKCixM/OMpVqmSMPlczNbe5ajLMjYACgyOgC
+3ZM98fhtLOy9DSCc+yQ/TzI=
+=j+ax
 -----END PGP SIGNATURE-----
diff --git a/dev-java/xdoclet/files/digest-xdoclet-1.2.0_beta1 b/dev-java/xdoclet/files/digest-xdoclet-1.2.0_beta1
deleted file mode 100644
index 3b9a3961d3a3..000000000000
--- a/dev-java/xdoclet/files/digest-xdoclet-1.2.0_beta1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 156fc5c90ee4fe76c00ef7ff9dba3dd5 xdoclet-src-1.2.0-beta1.tgz 4993151
diff --git a/dev-java/xdoclet/xdoclet-1.2.0_beta1.ebuild b/dev-java/xdoclet/xdoclet-1.2.0_beta1.ebuild
deleted file mode 100644
index 4caef1198abd..000000000000
--- a/dev-java/xdoclet/xdoclet-1.2.0_beta1.ebuild
+++ /dev/null
@@ -1,36 +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/xdoclet/xdoclet-1.2.0_beta1.ebuild,v 1.12 2005/07/15 12:02:38 axxo Exp $
-
-inherit java-pkg
-
-DESCRIPTION="A code-generation engine primarily for EJB"
-HOMEPAGE="http://xdoclet.sf.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}-src-${PV/_/-}.tgz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="x86 amd64"
-IUSE="jikes"
-
-RDEPEND=">=virtual/jdk-1.3"
-DEPEND="${RDEPEND}
-	jikes? ( dev-java/jikes )
-	>=dev-java/ant-1.5"
-
-S=${WORKDIR}/
-
-src_unpack() {
-	unpack ${A}
-	if use jikes ; then
-		sed -e 's/compiler = modern/compiler = jikes/' -i build.properties
-	fi
-}
-
-src_compile() {
-	ant || die
-}
-
-src_install() {
-	java-pkg_dojar target/lib/*.jar
-	cp -r target/docs target/generated-xdocs samples ${D}/usr/share/doc/${P}
-}
diff --git a/dev-java/xdoclet/xdoclet-1.2.1.ebuild b/dev-java/xdoclet/xdoclet-1.2.1.ebuild
index afdf5589ae05..d4922ab7342c 100644
--- a/dev-java/xdoclet/xdoclet-1.2.1.ebuild
+++ b/dev-java/xdoclet/xdoclet-1.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xdoclet/xdoclet-1.2.1.ebuild,v 1.7 2005/07/15 12:02:38 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xdoclet/xdoclet-1.2.1.ebuild,v 1.8 2005/07/18 18:14:50 axxo Exp $
 
 inherit java-pkg
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}-src-${PV}.tgz
 	mirror://gentoo/xjavadoc-${XJAVADOC_PV}-src.tar.bz2"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="x86 amd64 ~ppc"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="jikes"
 
 RDEPEND=">=virtual/jdk-1.3"
diff --git a/dev-java/xdoclet/xdoclet-1.2.2.ebuild b/dev-java/xdoclet/xdoclet-1.2.2.ebuild
index 12be2533330b..84a3907be457 100644
--- a/dev-java/xdoclet/xdoclet-1.2.2.ebuild
+++ b/dev-java/xdoclet/xdoclet-1.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.3 2005/07/15 12:02:38 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xdoclet/xdoclet-1.2.2.ebuild,v 1.4 2005/07/18 18:14:50 axxo Exp $
 
 inherit java-pkg eutils
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://xdoclet.sf.net/"
 SRC_URI="mirror://sourceforge/${PN}/${PN}-src-${PV}.tgz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE="jikes source"
 
 RDEPEND=">=virtual/jre-1.3
@@ -52,7 +52,7 @@ src_compile() {
 
 src_install() {
 	for jar in target/lib/*.jar; do
-		java-pkg_newjar ${jar} $(basename ${jar/-1.2.2/})
+		java-pkg_newjar ${jar} $(basename ${jar/-${PV}/})
 	done
 
 	dodoc README.txt