Cleanup.

Package-Manager: portage-2.1.4.1

5 files changed, 7 insertions, 186 deletions

diff --git a/dev-java/commons-logging/ChangeLog b/dev-java/commons-logging/ChangeLog
index f149459729f6..98672d2d7e39 100644
--- a/dev-java/commons-logging/ChangeLog
+++ b/dev-java/commons-logging/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/commons-logging
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-logging/ChangeLog,v 1.58 2008/02/06 15:25:30 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-logging/ChangeLog,v 1.59 2008/02/06 18:18:21 caster Exp $
+
+  06 Feb 2008; Vlastimil Babka <caster@gentoo.org>
+  -commons-logging-1.1-r2.ebuild, -commons-logging-1.1-r3.ebuild,
+  -commons-logging-1.1-r4.ebuild:
+  Cleanup.
 
 *commons-logging-1.1.1 (06 Feb 2008)
 
diff --git a/dev-java/commons-logging/commons-logging-1.1-r2.ebuild b/dev-java/commons-logging/commons-logging-1.1-r2.ebuild
deleted file mode 100644
index 251356c541e0..000000000000
--- a/dev-java/commons-logging/commons-logging-1.1-r2.ebuild
+++ /dev/null
@@ -1,60 +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/commons-logging/commons-logging-1.1-r2.ebuild,v 1.11 2007/12/15 20:11:52 betelgeuse Exp $
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="The Jakarta-Commons Logging package is an ultra-thin bridge between different logging libraries."
-HOMEPAGE="http://jakarta.apache.org/commons/logging/"
-SRC_URI="mirror://apache/jakarta/commons/logging/source/${P}-src.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~ia64 ppc ppc64 x86 ~x86-fbsd"
-IUSE="avalon-logkit log4j servletapi avalon-framework doc source"
-
-RDEPEND=">=virtual/jre-1.3
-	avalon-logkit? ( =dev-java/avalon-logkit-1.2* )
-	log4j? ( =dev-java/log4j-1.2* )
-	servletapi? ( =dev-java/servletapi-2.3* )
-	avalon-framework? ( =dev-java/avalon-framework-4.2* )"
-# ATTENTION: Add this when log4j-1.3 is out
-#	=dev-java/log4j-1.3*
-DEPEND=">=virtual/jdk-1.3
-	dev-java/ant-core
-	source? ( app-arch/zip )
-	${RDEPEND}"
-
-S="${WORKDIR}/${P}-src/"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-gentoo.patch"
-	# patch to make the build.xml respect no servletapi
-	# TODO file upstream -nichoj
-	epatch "${FILESDIR}/${P}-servletapi.patch"
-
-	java-ant_ignore-system-classes
-
-	use log4j && echo "log4j12.jar=$(java-pkg_getjars log4j)" > build.properties
-	# ATTENTION: Add this when log4j-1.3 is out (check the SLOT)
-	#echo "log4j13.jar=$(java-pkg_getjars log4j-1.3)" > build.properties
-	use avalon-logkit && echo "logkit.jar=$(java-pkg_getjars avalon-logkit-1.2)" >> build.properties
-	use servletapi && echo "servletapi.jar=$(java-pkg_getjars servletapi-2.3)" >> build.properties
-	use avalon-framework && echo "avalon-framework.jar=$(java-pkg_getjars avalon-framework-4.2)" >> build.properties
-	java-pkg_filter-compiler jikes ecj-3.2
-}
-
-EANT_BUILD_TARGET="compile"
-
-src_install() {
-	java-pkg_newjar target/${P}.jar ${PN}.jar
-	java-pkg_newjar target/${PN}-api-${PV}.jar ${PN}-api.jar
-	java-pkg_newjar target/${PN}-adapters-${PV}.jar ${PN}-adapters.jar
-
-	dodoc RELEASE-NOTES.txt || die
-	dohtml PROPOSAL.html STATUS.html || die
-	use doc && java-pkg_dojavadoc target/docs/
-	use source && java-pkg_dosrc src/java/org
-}
diff --git a/dev-java/commons-logging/commons-logging-1.1-r3.ebuild b/dev-java/commons-logging/commons-logging-1.1-r3.ebuild
deleted file mode 100644
index 9352e60e4c44..000000000000
--- a/dev-java/commons-logging/commons-logging-1.1-r3.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-logging/commons-logging-1.1-r3.ebuild,v 1.2 2008/01/12 15:13:04 caster Exp $
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="The Jakarta-Commons Logging package is an ultra-thin bridge between different logging libraries."
-HOMEPAGE="http://jakarta.apache.org/commons/logging/"
-SRC_URI="mirror://apache/jakarta/commons/logging/source/${P}-src.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="avalon-logkit log4j servletapi avalon-framework doc source"
-
-RDEPEND=">=virtual/jre-1.3
-	avalon-logkit? ( =dev-java/avalon-logkit-1.2* )
-	log4j? ( =dev-java/log4j-1.2* )
-	servletapi? ( ~java-virtuals/servlet-api-2.3 )
-	avalon-framework? ( =dev-java/avalon-framework-4.2* )"
-# ATTENTION: Add this when log4j-1.3 is out
-#	=dev-java/log4j-1.3*
-DEPEND=">=virtual/jdk-1.3
-	dev-java/ant-core
-	source? ( app-arch/zip )
-	${RDEPEND}"
-
-S="${WORKDIR}/${P}-src/"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-gentoo.patch"
-	# patch to make the build.xml respect no servletapi
-	# TODO file upstream -nichoj
-	epatch "${FILESDIR}/${P}-servletapi.patch"
-
-	java-ant_ignore-system-classes
-
-	use log4j && echo "log4j12.jar=$(java-pkg_getjars log4j)" > build.properties
-	# ATTENTION: Add this when log4j-1.3 is out (check the SLOT)
-	#echo "log4j13.jar=$(java-pkg_getjars log4j-1.3)" > build.properties
-	use avalon-logkit && echo "logkit.jar=$(java-pkg_getjars avalon-logkit-1.2)" >> build.properties
-	use servletapi && echo "servletapi.jar=$(java-pkg_getjar --virtual servlet-api-2.3 servlet.jar)" >> build.properties
-	use avalon-framework && echo "avalon-framework.jar=$(java-pkg_getjars avalon-framework-4.2)" >> build.properties
-	java-pkg_filter-compiler jikes ecj-3.2
-}
-
-EANT_BUILD_TARGET="compile"
-
-src_install() {
-	java-pkg_newjar target/${P}.jar ${PN}.jar
-	java-pkg_newjar target/${PN}-api-${PV}.jar ${PN}-api.jar
-	java-pkg_newjar target/${PN}-adapters-${PV}.jar ${PN}-adapters.jar
-
-	dodoc RELEASE-NOTES.txt || die
-	dohtml PROPOSAL.html STATUS.html || die
-	use doc && java-pkg_dojavadoc target/docs/
-	use source && java-pkg_dosrc src/java/org
-}
diff --git a/dev-java/commons-logging/commons-logging-1.1-r4.ebuild b/dev-java/commons-logging/commons-logging-1.1-r4.ebuild
deleted file mode 100644
index 561ea2c93318..000000000000
--- a/dev-java/commons-logging/commons-logging-1.1-r4.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-logging/commons-logging-1.1-r4.ebuild,v 1.1 2008/01/14 16:22:37 elvanor Exp $
-
-inherit java-pkg-2 java-ant-2 java-osgi
-
-DESCRIPTION="The Jakarta-Commons Logging package is an ultra-thin bridge between different logging libraries."
-HOMEPAGE="http://jakarta.apache.org/commons/logging/"
-SRC_URI="mirror://apache/jakarta/commons/logging/source/${P}-src.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="avalon-logkit log4j servletapi avalon-framework doc source"
-
-RDEPEND=">=virtual/jre-1.3
-	avalon-logkit? ( =dev-java/avalon-logkit-1.2* )
-	log4j? ( =dev-java/log4j-1.2* )
-	servletapi? ( ~java-virtuals/servlet-api-2.3 )
-	avalon-framework? ( =dev-java/avalon-framework-4.2* )"
-# ATTENTION: Add this when log4j-1.3 is out
-#	=dev-java/log4j-1.3*
-DEPEND=">=virtual/jdk-1.3
-	dev-java/ant-core
-	source? ( app-arch/zip )
-	${RDEPEND}"
-
-S="${WORKDIR}/${P}-src/"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-gentoo.patch"
-	# patch to make the build.xml respect no servletapi
-	# TODO file upstream -nichoj
-	epatch "${FILESDIR}/${P}-servletapi.patch"
-
-	java-ant_ignore-system-classes
-
-	use log4j && echo "log4j12.jar=$(java-pkg_getjars log4j)" > build.properties
-	# ATTENTION: Add this when log4j-1.3 is out (check the SLOT)
-	#echo "log4j13.jar=$(java-pkg_getjars log4j-1.3)" > build.properties
-	use avalon-logkit && echo "logkit.jar=$(java-pkg_getjars avalon-logkit-1.2)" >> build.properties
-	use servletapi && echo "servletapi.jar=$(java-pkg_getjar --virtual servlet-api-2.3 servlet.jar)" >> build.properties
-	use avalon-framework && echo "avalon-framework.jar=$(java-pkg_getjars avalon-framework-4.2)" >> build.properties
-	java-pkg_filter-compiler jikes ecj-3.2
-}
-
-EANT_BUILD_TARGET="compile"
-
-src_install() {
-	java-osgi_newjar-fromfile "target/${P}.jar" "${FILESDIR}/${P}-manifest" "Apache Commons Logging"
-	java-pkg_newjar target/${PN}-api-${PV}.jar ${PN}-api.jar
-	java-pkg_newjar target/${PN}-adapters-${PV}.jar ${PN}-adapters.jar
-
-	dodoc RELEASE-NOTES.txt || die
-	dohtml PROPOSAL.html STATUS.html || die
-	use doc && java-pkg_dojavadoc target/docs/
-	use source && java-pkg_dosrc src/java/org
-}
diff --git a/dev-java/jdbc-postgresql/Manifest b/dev-java/jdbc-postgresql/Manifest
index 00cafc48e57d..b78015b1434f 100644
--- a/dev-java/jdbc-postgresql/Manifest
+++ b/dev-java/jdbc-postgresql/Manifest
@@ -1,16 +1,12 @@
 AUX jdbc-postgresql-8.2_p504-build.xml.patch 1814 RMD160 3281bd8bb2c9461ca099169d71eff2a3e1855fb5 SHA1 bd89239484c1459c1219ea34ee6c5af1cea8cf4a SHA256 79c50e8603246965ded01285983150ec8f89408afef0b1465551d12b90dbaa10
 AUX jdbc-postgresql-8.2_p505-build.xml.patch 1814 RMD160 3281bd8bb2c9461ca099169d71eff2a3e1855fb5 SHA1 bd89239484c1459c1219ea34ee6c5af1cea8cf4a SHA256 79c50e8603246965ded01285983150ec8f89408afef0b1465551d12b90dbaa10
-DIST postgresql-jdbc-8.0-320.src.tar.gz 425514 RMD160 966fa59b398dbbaf9dbdf85f7e4099f60cbd6fa7 SHA1 38036759da54e19c16283325f7c1f6ef7bc29af5 SHA256 2206bd735ee3dc188467d83d2a480412535a018bffd0411af9ed2ff2c29154f6
-DIST postgresql-jdbc-8.1-410.src.tar.gz 488493 RMD160 90d73dc7b0451d39dc3aeae7951bf4cb5d3a647d SHA1 dd8a8024ccafef66742ba1d55b4b7a2208ea8949 SHA256 c52d928145c5c2df1179bc2b58aab53b67bde25b942b35b20833e490a7019614
 DIST postgresql-jdbc-8.2-504.src.tar.gz 482124 RMD160 5c47ee886bb1e7b056ee83d9eb59826cffb7bd47 SHA1 5be1fc49fb0990f2bff6919c4f88827de9d5b791 SHA256 a432864026e6018bc7871f5042456ac280895719fb07ce92a9ffa64564517fba
 DIST postgresql-jdbc-8.2-505.src.tar.gz 498495 RMD160 2ad97701cd481d76c6ec4339524037b99738a351 SHA1 082c5135ff98b46cd2b089ca0f04fb66a4ee9ffb SHA256 76bf2aa5ead0d043d81df1c31db9f654e6eb9d80fa9e8a97fb7432950a8197b6
 DIST postgresql-jdbc-8.2-506.src.tar.gz 501821 RMD160 abdff521a24d3e065031eebfcbfa9fd0fd399442 SHA1 54a8c67ddf689fa4b91d8af731e5938e243bc9d3 SHA256 9c3c930cb4f32830b2fc543ade6d5f89f91df971d21da0c50c05d709245eae1a
 DIST postgresql-jdbc-8.3-603.src.tar.gz 521517 RMD160 3cebe6aab292d8dbbf003f6ef1036938a991f1a1 SHA1 3d0e17b3bb21c91e62ae7370a95e7f70ea1f062d SHA256 d7fa28a6f059887ae8d692c0e8a8befac688b3755ac6f46ab07e2119018e4f2d
-EBUILD jdbc-postgresql-8.0_p320.ebuild 2400 RMD160 cb5fda79dab17ba3ce4b5c668a6b8f2b4400235c SHA1 3f7189043b4a51f6226f1bcc7be0928eed60c304 SHA256 c3846979a227aeb63d28a7d674a23c553bc8f02378f5b8261b46182a0419700a
-EBUILD jdbc-postgresql-8.1_p410.ebuild 2400 RMD160 27abf36c1e3b3a7a7b293bf9a3d3315daa7b0073 SHA1 ff1abe27a9cd5e4ee308a54951fd0818c546926c SHA256 78fc992ea018be17e14fdcd7490632307165a32ef8f36b2b07f6c4811258b2e2
 EBUILD jdbc-postgresql-8.2_p504.ebuild 2551 RMD160 112bbbe4119fd62462fcc2fb3973d3d9d9ae52d2 SHA1 44d60f08b4ab85cccd9ad9ab07923e0f62ed2911 SHA256 68289bccb4c5d35e9d58bed3cf2454c047fb16b5fd01ad4c870a17df498aa7bf
 EBUILD jdbc-postgresql-8.2_p505.ebuild 2539 RMD160 c6997507f64e5c087b71ae764f7ddc5c8cc86af3 SHA1 9dd13e7a94835f1428062f67e06fd20e307aa1f8 SHA256 3dce28ccd155432858c0862a3e6bf5408b987ddc56c7bb02b2beb47e0ea207f5
 EBUILD jdbc-postgresql-8.2_p506.ebuild 2206 RMD160 e4019c6a714faff916ec596b4c7a8fed73c7d4a3 SHA1 1ff3e68bc87ff85a4c2d4d260f530df0911a3cdf SHA256 677adf97c17aaaa5e69265a16a1d15f288b453006ad32e1f2c1295547af07b39
 EBUILD jdbc-postgresql-8.3_p603.ebuild 2214 RMD160 381cf23f609a44fef6b7e9e55b519bd4173b2704 SHA1 80fe7905736be727c99172f25d38a01e92bb5b5b SHA256 6e53be8ad1d7cccc12964d45661d80fd33fdb89ee3388734da1bcefa52534cf2
-MISC ChangeLog 3218 RMD160 18859d41da23ec621eb9cb4944fb7a04f6668e49 SHA1 d27f13e3164cd76df91a92ed4907c878fbe40066 SHA256 434330097bda702557cd3e095272519c198d1a3cda01c557bc801b87e4ee470f
+MISC ChangeLog 3366 RMD160 e825b3f39d0c31ad42f22279f5052445f67075ca SHA1 53f0d599b4957c37cc5e5132bdb9d19d01e2254f SHA256 892d6fcae4cccd96b24825d55025cb40155647c78fbd86f55502964acb706418
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9