Tweak style.

Package-Manager: portage-2.1.2.7

5 files changed, 34 insertions, 90 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/Manifest b/dev-java/commons-transaction/Manifest
index 647c5282cdcb..2a627b811400 100644
--- a/dev-java/commons-transaction/Manifest
+++ b/dev-java/commons-transaction/Manifest
@@ -2,32 +2,25 @@
 Hash: SHA1
 
 DIST commons-transaction-1.0.1-src.tgz 849934 RMD160 9852690c3a78fc9e4998cc99862553dbe0985f24 SHA1 a15d71beabc51e9d99cf57cf33c980a006a1146a SHA256 2840697b784ae544de00e3b4876b34a1cef2a869e17d0397cf2087fa5d0b8882
-EBUILD commons-transaction-1.0.1-r1.ebuild 1320 RMD160 ecb47da9e9b21538effb2363b50dc929a3b98a25 SHA1 cfdce70f940691949ed5e30a48621ccb85f3f254 SHA256 293a97bbb0a4a71f08f0a4ced1d94e87a9956c7b81134c3dfc2c7a074ae34c9c
-MD5 622aa497428f4192cf2e03712b717d6b commons-transaction-1.0.1-r1.ebuild 1320
-RMD160 ecb47da9e9b21538effb2363b50dc929a3b98a25 commons-transaction-1.0.1-r1.ebuild 1320
-SHA256 293a97bbb0a4a71f08f0a4ced1d94e87a9956c7b81134c3dfc2c7a074ae34c9c commons-transaction-1.0.1-r1.ebuild 1320
-EBUILD commons-transaction-1.0.1.ebuild 1392 RMD160 0e189cfe7f2e0462ef215577163a11534bee39b5 SHA1 7c92176f8945b564056a51edf85a148782b17ce4 SHA256 06eb46b6828c89b6f0d8ef3b8926e2485477d9bde5c8ab1c512d10f4c9c83759
-MD5 1f433d03b3e2f45172f7ac5cfa35dc04 commons-transaction-1.0.1.ebuild 1392
-RMD160 0e189cfe7f2e0462ef215577163a11534bee39b5 commons-transaction-1.0.1.ebuild 1392
-SHA256 06eb46b6828c89b6f0d8ef3b8926e2485477d9bde5c8ab1c512d10f4c9c83759 commons-transaction-1.0.1.ebuild 1392
-MISC ChangeLog 764 RMD160 00e146a25e48df40da5b834efae869bf86d963bd SHA1 5dfe7dc4c8759b5bf8d4b0a3a845a8ee8b0d75d4 SHA256 fa4313ebaefc1904631e3369498d6751ed4e32e36ad36c1734e6d47af71be1f7
-MD5 a74cc57e69bef6cde8832f34adc385d2 ChangeLog 764
-RMD160 00e146a25e48df40da5b834efae869bf86d963bd ChangeLog 764
-SHA256 fa4313ebaefc1904631e3369498d6751ed4e32e36ad36c1734e6d47af71be1f7 ChangeLog 764
+EBUILD commons-transaction-1.0.1-r1.ebuild 1259 RMD160 0c3c5b21150425859adedef46d8d45d663d2f972 SHA1 e0fed7695b33ce4db2c9d9af01ef99b6699270ea SHA256 dab9abd62477aa1c52e17d7700cecb3b54a66885dcdd4dcd8a0b38598aad79ac
+MD5 3534a6eedc48cadd7eb5c6e1ccb203f1 commons-transaction-1.0.1-r1.ebuild 1259
+RMD160 0c3c5b21150425859adedef46d8d45d663d2f972 commons-transaction-1.0.1-r1.ebuild 1259
+SHA256 dab9abd62477aa1c52e17d7700cecb3b54a66885dcdd4dcd8a0b38598aad79ac commons-transaction-1.0.1-r1.ebuild 1259
+MISC ChangeLog 1030 RMD160 21c8883038871b92bcf20e195d2dfe54c9744464 SHA1 e28ebf596f0e30b58e344a6d7243263649a490fb SHA256 965692388f7197f35f3b8d52427fa6c4839d8c5e5d572d2750ff9c5437aed944
+MD5 aeeefdd3ef4b58364d6fc13c60f2a439 ChangeLog 1030
+RMD160 21c8883038871b92bcf20e195d2dfe54c9744464 ChangeLog 1030
+SHA256 965692388f7197f35f3b8d52427fa6c4839d8c5e5d572d2750ff9c5437aed944 ChangeLog 1030
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 metadata.xml 157
-MD5 76e390f6e0a73052d42264a4ffaf4c82 files/digest-commons-transaction-1.0.1 280
-RMD160 64186cf92d0b5f590fc08d7f4e3a5179e75763ec files/digest-commons-transaction-1.0.1 280
-SHA256 367e8ebcd0d34e80d35fe856843370c40bc70a17c6b749ec8b764903edf41d3d files/digest-commons-transaction-1.0.1 280
 MD5 76e390f6e0a73052d42264a4ffaf4c82 files/digest-commons-transaction-1.0.1-r1 280
 RMD160 64186cf92d0b5f590fc08d7f4e3a5179e75763ec files/digest-commons-transaction-1.0.1-r1 280
 SHA256 367e8ebcd0d34e80d35fe856843370c40bc70a17c6b749ec8b764903edf41d3d files/digest-commons-transaction-1.0.1-r1 280
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.4 (GNU/Linux)
+Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFEwq9pgo/w9rxVVVERAnivAJ9nU8zHK0HuKV6osTYuhusiQ7SoDgCdHrBY
-G382nxXj2YNiw/3LcT2xdjI=
-=eoSL
+iD8DBQFGWNM3cxLzpIGCsLQRAt+2AJ9AheMPZemzfENfsQImyaG3+0lBWACgiWay
+WYkD5Zu/MCRx2/5MUJ6Fhy0=
+=oni9
 -----END PGP SIGNATURE-----
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