Cleanup.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

9 files changed, 18 insertions, 286 deletions

diff --git a/dev-java/jdbc-jaybird/Manifest b/dev-java/jdbc-jaybird/Manifest
index 59ddead62cb1..7f06a332b182 100644
--- a/dev-java/jdbc-jaybird/Manifest
+++ b/dev-java/jdbc-jaybird/Manifest
@@ -1,20 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 2.1.6-remove-unused-ant-import.patch 586 RMD160 4cb0f57e7792b943cf2c523b6bcd6fb5cab998ba SHA1 cb125744a87cce1fe1c0e39221b1b6d26f8524c1 SHA256 7fbb207fd9405977e502a0050edd154389b8cf7b9dabf9fea73afa6fb40f992a
 AUX archive-xml-2.1.0.patch 399 RMD160 b84c5992739ce8db698dbe6562e3cae2f8099d3c SHA1 5bdf1fef96ce163cc90a8c6836ac3c9fc9f33f14 SHA256 3e3e1f0d3bce0b6582a1ed7a5d14d55f8d51a6ef6a68a9ac4532d96323c6917a
 AUX compile_xml-2.1.2.patch 892 RMD160 82f69ec15d1b1b13a9fc01ef14a956a368738f49 SHA1 2340cafff9e86bc6827a2749dcd367d5b16652d6 SHA256 dcf1f38895dbe194532ee4f10f47aa1736db50d9689bea6625328339cda24a97
 DIST Jaybird-2.1.5-src.zip 6047595 RMD160 08cce25d28a265c04a040dda22f9a1da25fd68c4 SHA1 6ef99462fb9ee8a2820418875e360b0c2282b951 SHA256 3b475bca2cc5c3cbf6032c75ff2ea47d2e77abad18df36e149c1eaccfc15a868
 DIST Jaybird-2.1.6-src.zip 5849860 RMD160 4a3d0b708f3aa9e24eccfcbf06b1d221205583b5 SHA1 cb4e14fdc51d32f53cbc9aa13a4404ccae2b20d3 SHA256 819d47e37b91d0ea23f8b043d504a00f5b19d207d80556f2bf465abf1e50fa48
-EBUILD jdbc-jaybird-2.1.5-r1.ebuild 2664 RMD160 51b0ac14b2ef4906434838c5849332ac146e48f9 SHA1 67d67007b0cb67398a09b48da375aa67c5c1562b SHA256 49c406ec6f56c9effadb1c7a63eea577405cac282836afe3a410626860f0ff51
-EBUILD jdbc-jaybird-2.1.5-r2.ebuild 3078 RMD160 003f2c04d5c577ff7681a062d13157672b8786c3 SHA1 387bf0e8ed40a06babb3785b3d34c7ae1f43a6e3 SHA256 d6eec4f5af35e0d112af110803708359f0249f8c435ff91cccacdbf5b5be73e8
+EBUILD jdbc-jaybird-2.1.5-r1.ebuild 2575 RMD160 e52a77a473293f1e27b39f4384b77cb6390495b1 SHA1 9bdd46b1b00a1140a426defa9b1fc00a020a5da3 SHA256 7621c378815806714d931f2ecac04a3a6d63ece22beaf7dca39a62b4a226ef08
+EBUILD jdbc-jaybird-2.1.5-r2.ebuild 2984 RMD160 01bff325b648862c90d720355f44b73058811aaa SHA1 d19a544826b99fdfd3cdb40a2c9173391bcfa6fc SHA256 1912c2c650c967663146f1dd34dc62b479814d2317330307eea2523caf94013e
 EBUILD jdbc-jaybird-2.1.6.ebuild 2881 RMD160 e1007d7b68352f56b26275253fc00c1cd439d41b SHA1 ba5bded1917f4154320aec5b71c631ee1f2e31ae SHA256 333465a007a6ea943fbdae96e34e95be79c63c6456426cff7bc0a727f287ad4e
-MISC ChangeLog 6517 RMD160 3cecbc16183a666d81889b05e08badfe5c8c048f SHA1 1d5cde27427c84335a2f8bb33aeb4cd1cd50fa7e SHA256 f577b95160e5ace5a09753f219a89b04e6ab83a4717eb1a4f9e7d594dbbef3ff
+MISC ChangeLog 6674 RMD160 b77038ffaa69d10615e6c7bba1d15fde3e1252af SHA1 6a3f3c24e5f91778112dd0304855c513cce0115a SHA256 417709cb4cbd3b6efb5036f8e0ad2fa771e750e02d66cd908baac06617cf5df7
 MISC metadata.xml 414 RMD160 a7cdce874ba139f5314bcb45cf8393cc3fc01eb6 SHA1 162a57f24ec42e9204e70841d1a20a24ab8cdfc1 SHA256 d3635c61fd3bc2e887561ab219c5cf0ab20a8e9a6ca0f27d104585f1db3319a4
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAkulDUMACgkQcxLzpIGCsLTJXACghKSXjXzdgPZpRhmhEh0Pmp2w
-CXoAnRfzmVL7VrMbRBri3ezZErYUXCwJ
-=PB42
------END PGP SIGNATURE-----
diff --git a/dev-java/jdbc-mysql/ChangeLog b/dev-java/jdbc-mysql/ChangeLog
index 5722445bc2e0..e99678261d95 100644
--- a/dev-java/jdbc-mysql/ChangeLog
+++ b/dev-java/jdbc-mysql/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/jdbc-mysql
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-mysql/ChangeLog,v 1.71 2010/05/16 19:42:02 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-mysql/ChangeLog,v 1.72 2010/06/30 20:46:26 caster Exp $
+
+  30 Jun 2010; Vlastimil Babka <caster@gentoo.org> -jdbc-mysql-5.0.8.ebuild,
+  jdbc-mysql-5.1.6.ebuild, -jdbc-mysql-5.1.10.ebuild,
+  -files/do-not-filter-png.diff:
+  Cleanup.
 
   16 May 2010; Markus Meier <maekke@gentoo.org> jdbc-mysql-5.1.11.ebuild:
   amd64/x86 stable, bug #309109
diff --git a/dev-java/jdbc-mysql/files/do-not-filter-png.diff b/dev-java/jdbc-mysql/files/do-not-filter-png.diff
deleted file mode 100644
index 3aaabe5d3257..000000000000
--- a/dev-java/jdbc-mysql/files/do-not-filter-png.diff
+++ /dev/null
@@ -1,18 +0,0 @@
---- mysql-connector-java-3.1.12/build.xml.orig	2006-04-19 12:37:46.000000000 +0200
-+++ mysql-connector-java-3.1.12/build.xml	2006-04-19 12:57:52.000000000 +0200
-@@ -99,6 +99,7 @@
- 				<patternset id="classjar" >
- 					<exclude name="**/*.class*"/>
- 					<exclude name="**/*.jar"/>
-+					<exclude name="**/*.png"/>
- 				</patternset>
- 			</fileset>
- 
-@@ -116,6 +117,7 @@
- 			<fileset dir="${sourceDir}" excludes="**/CVS">
- 				<patternset id="dojar" >
- 					<include name="**/*.jar*"/>
-+					<include name="**/*.png"/>
- 				</patternset>
- 			</fileset>
- 		</copy>
diff --git a/dev-java/jdbc-mysql/jdbc-mysql-5.0.8.ebuild b/dev-java/jdbc-mysql/jdbc-mysql-5.0.8.ebuild
deleted file mode 100644
index bbf38643a17b..000000000000
--- a/dev-java/jdbc-mysql/jdbc-mysql-5.0.8.ebuild
+++ /dev/null
@@ -1,74 +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/jdbc-mysql/jdbc-mysql-5.0.8.ebuild,v 1.5 2008/03/21 02:23:42 ken69267 Exp $
-
-JAVA_PKG_IUSE="source"
-WANT_ANT_TASKS="ant-contrib"
-
-inherit eutils java-pkg-2 java-ant-2
-
-MY_PN="mysql-connector-java"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="MySQL JDBC driver"
-HOMEPAGE="http://www.mysql.com/products/connector/j/"
-SRC_URI="mirror://mysql/Downloads/Connector-J/${MY_P}.tar.gz"
-LICENSE="GPL-2-with-MySQL-FLOSS-exception"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="c3p0 log4j"
-COMMON_DEP="
-	log4j? ( dev-java/log4j )
-	c3p0? ( dev-java/c3p0 )
-	dev-java/commons-logging"
-RDEPEND=">=virtual/jre-1.4
-	${COMMON_DEP}"
-# FIXME doesn't like Java 1.6's JDBC API
-DEPEND="|| (
-		=virtual/jdk-1.5*
-		=virtual/jdk-1.4*
-	)
-	${COMMON_DEP}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# gcj hangs, but works for others -> why regexp over pictures?!
-	epatch "${FILESDIR}/do-not-filter-png.diff"
-	epatch "${FILESDIR}/5.0.5-remove-jboss-dependency-from-tests.patch"
-	# http://bugs.mysql.com/bug.php?id=28286
-	epatch "${FILESDIR}/5.0.5-dist-target-depends.patch"
-
-	rm -v *.jar debug/*.jar || die
-
-	java-ant_ignore-system-classes
-
-	# use test && mkdir src/lib-nodist # needed, or ant will fail
-
-	cd src/lib
-	rm -v *.jar || die
-	java-pkg_jar-from commons-logging
-	use log4j && java-pkg_jar-from log4j
-	use c3p0 && java-pkg_jar-from c3p0
-}
-
-EANT_BUILD_TARGET="dist"
-
-# Tests need a mysql DB to exist
-RESTRICT="test"
-src_test() {
-	cd src/lib
-	java-pkg_jar-from junit
-	cd "${S}"
-	ANT_TASKS="ant-junit" eant test -Dcom.mysql.jdbc.noCleanBetweenCompiles=true
-}
-
-src_install() {
-	java-pkg_newjar build/${MY_P}/${MY_P}-bin.jar ${PN}.jar
-	dodoc README CHANGES || die
-	dohtml docs/*.html || die
-	use source && java-pkg_dosrc src/com src/org
-}
diff --git a/dev-java/jdbc-mysql/jdbc-mysql-5.1.10.ebuild b/dev-java/jdbc-mysql/jdbc-mysql-5.1.10.ebuild
deleted file mode 100644
index c92b8f52f62a..000000000000
--- a/dev-java/jdbc-mysql/jdbc-mysql-5.1.10.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-mysql/jdbc-mysql-5.1.10.ebuild,v 1.3 2010/02/12 23:07:40 caster Exp $
-
-JAVA_PKG_IUSE="source"
-WANT_ANT_TASKS="ant-contrib"
-
-inherit eutils java-pkg-2 java-ant-2
-
-MY_PN="mysql-connector-java"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="MySQL JDBC driver"
-HOMEPAGE="http://www.mysql.com/products/connector/j/"
-SRC_URI="mirror://mysql/Downloads/Connector-J/${MY_P}.tar.gz"
-LICENSE="GPL-2-with-MySQL-FLOSS-exception"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="c3p0 log4j"
-COMMON_DEP="
-	log4j? ( dev-java/log4j )
-	c3p0? ( dev-java/c3p0 )
-	dev-java/commons-logging"
-RDEPEND=">=virtual/jre-1.4
-	${COMMON_DEP}"
-
-JAVA_PKG_NV_DEPEND="
-	|| ( =virtual/jdk-1.5* =virtual/jdk-1.4* )"
-
-DEPEND="${JAVA_PKG_NV_DEPEND}
-	>=virtual/jdk-1.6
-	${COMMON_DEP}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/5.0.5-remove-jboss-dependency-from-tests.patch"
-	# http://bugs.mysql.com/bug.php?id=28286
-	epatch "${FILESDIR}/5.0.5-dist-target-depends.patch"
-
-	# checks fail if java6 bootclasspath is not a single jar
-	sed -i 's/depends="-compiler-check, /depends="/' build.xml || die
-
-	rm -v *.jar || die
-
-	# use test && mkdir src/lib-nodist # needed, or ant will fail
-
-	cd src/lib
-	rm -v *.jar || die
-	java-pkg_jar-from commons-logging
-	use log4j && java-pkg_jar-from log4j
-	use c3p0 && java-pkg_jar-from c3p0
-}
-
-# Needs two different source/targets
-JAVA_PKG_BSFIX="off"
-JAVA_ANT_IGNORE_SYSTEM_CLASSES="true"
-EANT_BUILD_TARGET="dist"
-
-src_compile() {
-	local vm=$(depend-java-query -v ">=virtual/jdk-1.6")
-	local javac=$(GENTOO_VM="${vm}" java-config --javac)
-	local rt=$(GENTOO_VM="${vm}" java-config -g BOOTCLASSPATH)
-	einfo "Using ${vm} to compile the JDBC4 driver"
-	einfo "javac: ${javac}"
-	einfo "bootclasspath: ${rt}"
-	java-pkg-2_src_compile \
-		-Dcom.mysql.jdbc.java6.javac="${javac}" \
-		-Dcom.mysql.jdbc.java6.rtjar="${rt}"
-}
-
-# Tests need a mysql DB to exist
-RESTRICT="test"
-src_test() {
-	cd src/lib
-	java-pkg_jar-from junit
-	cd "${S}"
-	ANT_TASKS="ant-junit" eant test -Dcom.mysql.jdbc.noCleanBetweenCompiles=true
-}
-
-src_install() {
-	# Skip bytecode check because we want two versions there
-	JAVA_PKG_STRICT= java-pkg_newjar build/${MY_P}/${MY_P}-bin.jar ${PN}.jar
-	dodoc README CHANGES || die
-	dohtml docs/*.html || die
-	use source && java-pkg_dosrc src/com src/org
-}
-
-# Silence java-dep-check because it doesn't know how to find 1.6 classes
-pkg_preinst() { :; }
diff --git a/dev-java/jdbc-mysql/jdbc-mysql-5.1.6.ebuild b/dev-java/jdbc-mysql/jdbc-mysql-5.1.6.ebuild
index 2998f8ce8787..9359b280119e 100644
--- a/dev-java/jdbc-mysql/jdbc-mysql-5.1.6.ebuild
+++ b/dev-java/jdbc-mysql/jdbc-mysql-5.1.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-mysql/jdbc-mysql-5.1.6.ebuild,v 1.4 2010/02/12 22:55:28 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-mysql/jdbc-mysql-5.1.6.ebuild,v 1.5 2010/06/30 20:46:26 caster Exp $
 
 JAVA_PKG_IUSE="source"
 WANT_ANT_TASKS="ant-contrib"
@@ -15,7 +15,7 @@ HOMEPAGE="http://www.mysql.com/products/connector/j/"
 SRC_URI="mirror://mysql/Downloads/Connector-J/${MY_P}.tar.gz"
 LICENSE="GPL-2-with-MySQL-FLOSS-exception"
 SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 x86"
+KEYWORDS="ppc"
 IUSE="c3p0 log4j"
 COMMON_DEP="
 	log4j? ( dev-java/log4j )
diff --git a/dev-java/jdbc-postgresql/ChangeLog b/dev-java/jdbc-postgresql/ChangeLog
index 5a37b414d3dd..cbd86d6508ed 100644
--- a/dev-java/jdbc-postgresql/ChangeLog
+++ b/dev-java/jdbc-postgresql/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/jdbc-postgresql
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-postgresql/ChangeLog,v 1.40 2010/06/17 19:56:30 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-postgresql/ChangeLog,v 1.41 2010/06/30 20:48:03 caster Exp $
+
+  30 Jun 2010; Vlastimil Babka <caster@gentoo.org>
+  jdbc-postgresql-8.3_p605.ebuild, -jdbc-postgresql-8.4_p701.ebuild:
+  Cleanup.
 
   17 Jun 2010; Patrick Lauer <patrick@gentoo.org>
   jdbc-postgresql-8.3_p603.ebuild, jdbc-postgresql-8.3_p605.ebuild,
diff --git a/dev-java/jdbc-postgresql/jdbc-postgresql-8.3_p605.ebuild b/dev-java/jdbc-postgresql/jdbc-postgresql-8.3_p605.ebuild
index 7cc0eefc3156..09d3a7e8a820 100644
--- a/dev-java/jdbc-postgresql/jdbc-postgresql-8.3_p605.ebuild
+++ b/dev-java/jdbc-postgresql/jdbc-postgresql-8.3_p605.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-postgresql/jdbc-postgresql-8.3_p605.ebuild,v 1.5 2010/06/17 19:56:30 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-postgresql/jdbc-postgresql-8.3_p605.ebuild,v 1.6 2010/06/30 20:48:03 caster Exp $
 
 EAPI="2"
 JAVA_PKG_IUSE="doc source"
@@ -17,7 +17,7 @@ HOMEPAGE="http://jdbc.postgresql.org/"
 
 LICENSE="POSTGRESQL"
 SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 x86"
+KEYWORDS="ppc"
 IUSE="java6 test"
 
 DEPEND=">=dev-java/java-config-2.0.31
diff --git a/dev-java/jdbc-postgresql/jdbc-postgresql-8.4_p701.ebuild b/dev-java/jdbc-postgresql/jdbc-postgresql-8.4_p701.ebuild
deleted file mode 100644
index 93fec2a3703c..000000000000
--- a/dev-java/jdbc-postgresql/jdbc-postgresql-8.4_p701.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-postgresql/jdbc-postgresql-8.4_p701.ebuild,v 1.5 2010/06/17 19:56:30 patrick Exp $
-
-EAPI="2"
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-MY_PN="postgresql-jdbc"
-MY_PV="${PV/_p/-}"
-MY_P="${MY_PN}-${MY_PV}.src"
-
-DESCRIPTION="JDBC Driver for PostgreSQL"
-SRC_URI="http://jdbc.postgresql.org/download/${MY_P}.tar.gz"
-HOMEPAGE="http://jdbc.postgresql.org/"
-
-LICENSE="POSTGRESQL"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE="java6 test"
-
-DEPEND=">=dev-java/java-config-2.0.31
-	java6? ( =virtual/jdk-1.6* )
-	!java6? ( =virtual/jdk-1.5* )
-	doc? (
-		dev-libs/libxslt
-		app-text/docbook-xsl-stylesheets
-	)
-	test? (
-		dev-java/ant-junit
-		dev-db/postgresql-server
-	)"
-RDEPEND="java6? ( >=virtual/jre-1.6 )
-	!java6? ( >=virtual/jre-1.5 )"
-
-S="${WORKDIR}/${MY_P}"
-
-EANT_DOC_TARGET="publicapi"
-
-java_prepare() {
-	# bug 314647
-	epatch "${FILESDIR}/${P}-stray-com.sun-import.patch"
-	# needed for src_test
-	java-ant_rewrite-classpath
-}
-
-src_compile() {
-	java-pkg-2_src_compile
-
-	# There is a task that creates this doc but I didn't find a way how to use system catalog
-	# to lookup the stylesheet so the 'doc' target is rewritten here to use system call instead.
-	if use doc; then
-		mkdir -p "${S}/build/doc"
-		xsltproc -o "${S}/build/doc/pgjdbc.html" http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl \
-			"${S}/doc/pgjdbc.xml"
-	fi
-}
-
-src_test() {
-	einfo "In order to run the tests successfully, you have to have:"
-	einfo "1) PostgreSQL server running"
-	einfo "2) database 'test' defined with user 'test' with password 'password'"
-	einfo "   as owner of the database"
-	einfo "3) plpgsql support in the 'test' database"
-	einfo
-	einfo "You can find a general info on how to perform these steps at"
-	einfo "http://gentoo-wiki.com/HOWTO_Configure_Postgresql"
-
-	ANT_TASKS="ant-junit" eant test -Dgentoo.classpath=$(java-pkg_getjars --build-only junit)
-}
-
-src_install() {
-	java-pkg_newjar jars/postgresql.jar jdbc-postgresql.jar
-
-	if use doc ; then
-		java-pkg_dojavadoc build/publicapi
-		dohtml build/doc/pgjdbc.html || die
-	fi
-
-	use source && java-pkg_dosrc org
-}