Tweak style.

(Portage version: 2.1.2.7)

4 files changed, 22 insertions, 71 deletions

diff --git a/dev-java/commons-transaction/ChangeLog b/dev-java/commons-transaction/ChangeLog
index c9e5447e779e..29af72ce3b76 100644
--- a/dev-java/commons-transaction/ChangeLog
+++ b/dev-java/commons-transaction/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-java/commons-transaction
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-transaction/ChangeLog,v 1.3 2006/07/22 23:06:08 nelchael Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-transaction/ChangeLog,v 1.4 2007/05/27 00:39:18 betelgeuse Exp $
+
+  27 May 2007; Petteri Räty <betelgeuse@gentoo.org>
+  -commons-transaction-1.0.1.ebuild, commons-transaction-1.0.1-r1.ebuild:
+  Tweak style.
+
+  27 May 2007; Petteri Räty <betelgeuse@gentoo.org>
+  -commons-transaction-1.0.1.ebuild:
+  Remove generation 1 ebuild.
 
 *commons-transaction-1.0.1-r1 (22 Jul 2006)
 
diff --git a/dev-java/commons-transaction/commons-transaction-1.0.1-r1.ebuild b/dev-java/commons-transaction/commons-transaction-1.0.1-r1.ebuild
index b694f2fdc0e8..5e0a3b1da3d3 100644
--- a/dev-java/commons-transaction/commons-transaction-1.0.1-r1.ebuild
+++ b/dev-java/commons-transaction/commons-transaction-1.0.1-r1.ebuild
@@ -1,6 +1,8 @@
-# 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-java/commons-transaction/commons-transaction-1.0.1-r1.ebuild,v 1.1 2006/07/22 23:06:08 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-transaction/commons-transaction-1.0.1-r1.ebuild,v 1.2 2007/05/27 00:39:18 betelgeuse Exp $
+
+JAVA_PKG_IUSE="doc source"
 
 inherit java-pkg-2 java-ant-2
 
@@ -11,39 +13,34 @@ SRC_URI="mirror://apache/jakarta/commons/transaction/source/${P}-src.tgz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="doc source"
+IUSE=""
 
 RDEPEND=">=virtual/jre-1.4
 	dev-java/commons-codec
 	dev-java/jta
 	dev-java/log4j"
 DEPEND=">=virtual/jdk-1.4
-	${RDEPEND}
-	dev-java/ant-core
-	source? ( app-arch/zip )"
+	${RDEPEND}"
 
 S="${WORKDIR}"
 
 src_unpack() {
 	unpack ${A}
-
+	rm -v *.jar || die
 	cd ${S}/lib
-	rm -f *.jar
+	rm -f *.jar || die
 	java-pkg_jar-from commons-codec
 	java-pkg_jar-from log4j
 	java-pkg_jar-from jta
 }
 
-src_compile() {
-	local antflags="jar"
-	use doc && antflags="${antflags} javadocs"
-	eant ${antflags} jar || die "Compilation failed"
-}
+EANT_DOC_TARGET="javadocs"
 
 src_install() {
 	java-pkg_newjar dist/lib/${P}.jar ${PN}.jar
 
-	dodoc NOTICE.txt REAME.txt RELEASE-NOTES.txt
-	java-pkg_dohtml -r build/doc/* xdocs
+	dodoc NOTICE.txt README.txt RELEASE-NOTES.txt || die
+	dohtml -r xdocs/* || die
+	use doc && java-pkg_dojavadoc build/doc/apidocs
 	use source && java-pkg_dosrc src/java/*
 }
diff --git a/dev-java/commons-transaction/commons-transaction-1.0.1.ebuild b/dev-java/commons-transaction/commons-transaction-1.0.1.ebuild
deleted file mode 100644
index 1f5da873ecec..000000000000
--- a/dev-java/commons-transaction/commons-transaction-1.0.1.ebuild
+++ /dev/null
@@ -1,51 +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/commons-transaction/commons-transaction-1.0.1.ebuild,v 1.3 2005/07/12 13:29:02 axxo Exp $
-
-inherit java-pkg
-
-DESCRIPTION="Commons Transaction aims at providing lightweight, standardized, well tested and efficient implementations of utility classes commonly used in transactional Java programming."
-HOMEPAGE="http://jakarta.apache.org/commons/transaction/"
-SRC_URI="mirror://apache/jakarta/commons/transaction/source/${P}-src.tgz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc jikes source"
-
-RDEPEND=">=virtual/jre-1.4
-	dev-java/commons-codec
-	dev-java/jta
-	dev-java/log4j"
-DEPEND=">=virtual/jdk-1.4
-	${RDEPEND}
-	dev-java/ant-core
-	jikes? ( dev-java/jikes )
-	source? ( app-arch/zip )"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}/lib
-	rm -f *.jar
-	java-pkg_jar-from commons-codec
-	java-pkg_jar-from log4j
-	java-pkg_jar-from jta
-}
-
-src_compile() {
-	local antflags="jar"
-	use doc && antflags="${antflags} javadocs"
-	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
-	ant ${antflags} jar || die "Compilation failed"
-}
-
-src_install() {
-	java-pkg_newjar dist/lib/${P}.jar ${PN}.jar
-
-	dodoc NOTICE.txt REAME.txt RELEASE-NOTES.txt
-	java-pkg_dohtml -r build/doc/* xdocs
-	use source && java-pkg_dosrc src/java/*
-}
diff --git a/dev-java/commons-transaction/files/digest-commons-transaction-1.0.1 b/dev-java/commons-transaction/files/digest-commons-transaction-1.0.1
deleted file mode 100644
index 202726bf9a61..000000000000
--- a/dev-java/commons-transaction/files/digest-commons-transaction-1.0.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 2ec968e144f84e8d0ab193757bd4e306 commons-transaction-1.0.1-src.tgz 849934
-RMD160 9852690c3a78fc9e4998cc99862553dbe0985f24 commons-transaction-1.0.1-src.tgz 849934
-SHA256 2840697b784ae544de00e3b4876b34a1cef2a869e17d0397cf2087fa5d0b8882 commons-transaction-1.0.1-src.tgz 849934