Dep/Style fixes

(Portage version: 2.0.51.22-r1)

3 files changed, 11 insertions, 17 deletions

diff --git a/dev-java/xdoclet/xdoclet-1.2.0_beta1.ebuild b/dev-java/xdoclet/xdoclet-1.2.0_beta1.ebuild
index 5466e1555c39..4caef1198abd 100644
--- a/dev-java/xdoclet/xdoclet-1.2.0_beta1.ebuild
+++ b/dev-java/xdoclet/xdoclet-1.2.0_beta1.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.0_beta1.ebuild,v 1.11 2005/04/03 03:59:39 luckyduck Exp $
+# $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
 
@@ -22,9 +22,7 @@ S=${WORKDIR}/
 src_unpack() {
 	unpack ${A}
 	if use jikes ; then
-		einfo "Configuring build for Jikes"
-		cp build.properties build.properties~ \
-			&& sed -e 's/compiler = modern/compiler = jikes/' <build.properties~ >build.properties
+		sed -e 's/compiler = modern/compiler = jikes/' -i build.properties
 	fi
 }
 
@@ -34,6 +32,5 @@ src_compile() {
 
 src_install() {
 	java-pkg_dojar target/lib/*.jar
-	dodoc LICENSE.txt
 	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 2a241c2daf0e..afdf5589ae05 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.6 2005/04/03 03:59:39 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xdoclet/xdoclet-1.2.1.ebuild,v 1.7 2005/07/15 12:02:38 axxo Exp $
 
 inherit java-pkg
 
@@ -27,9 +27,7 @@ DEPEND="${RDEPEND}
 src_unpack() {
 	unpack ${A}
 	if use jikes; then
-		einfo "Configuring build for Jikes"
-		cp build.properties build.properties~ \
-			&& sed -e 's/compiler = modern/compiler = jikes/' <build.properties~ >build.properties
+		sed -e 's/compiler = modern/compiler = jikes/' -i build.properties
 	fi
 }
 
@@ -51,6 +49,5 @@ src_compile() {
 
 src_install() {
 	java-pkg_dojar target/lib/*.jar
-	dodoc LICENSE.txt
 	cp -r target/docs target/generated-xdocs samples ${D}/usr/share/doc/${P}
 }
diff --git a/dev-java/xdoclet/xdoclet-1.2.2.ebuild b/dev-java/xdoclet/xdoclet-1.2.2.ebuild
index b75d34feb221..12be2533330b 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.2 2005/04/03 04:01:35 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xdoclet/xdoclet-1.2.2.ebuild,v 1.3 2005/07/15 12:02:38 axxo Exp $
 
 inherit java-pkg eutils
 
@@ -12,10 +12,6 @@ SLOT="0"
 KEYWORDS="~x86"
 IUSE="jikes source"
 
-DEPEND=">=virtual/jdk-1.3
-	>=dev-java/ant-core-1.6
-	jikes? ( dev-java/jikes )
-	source? ( app-arch/zip )"
 RDEPEND=">=virtual/jre-1.3
 	=dev-java/bsf-2.3*
 	dev-java/commons-collections
@@ -24,6 +20,11 @@ RDEPEND=">=virtual/jre-1.3
 	dev-java/mockobjects
 	dev-java/velocity
 	dev-java/xjavadoc"
+DEPEND=">=virtual/jdk-1.3
+	${RDEPEND}
+	>=dev-java/ant-core-1.6
+	jikes? ( dev-java/jikes )
+	source? ( app-arch/zip )"
 
 src_unpack() {
 	unpack ${A}
@@ -51,9 +52,8 @@ src_compile() {
 
 src_install() {
 	for jar in target/lib/*.jar; do
-		mv ${jar} ${jar/-1.2.2/}
+		java-pkg_newjar ${jar} $(basename ${jar/-1.2.2/})
 	done
-	dojar target/lib/*.jar
 
 	dodoc README.txt
 	use source && java-pkg_dosrc core/src/xdoclet modules/*