ant_src_unpack -> src_unpack

(Portage version: 2.1.1_pre3-r3)
 (Signed Manifest commit)

3 files changed, 21 insertions, 71 deletions

diff --git a/dev-java/jdbc-mysql/Manifest b/dev-java/jdbc-mysql/Manifest
index 788416fc0793..ad87d0623e7e 100644
--- a/dev-java/jdbc-mysql/Manifest
+++ b/dev-java/jdbc-mysql/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX compile-without-log4j.patch 682 RMD160 e2ec9338259d23d17a6a68235cf90f84d9acb0cc SHA1 e22c85b6ab0aefef5c1a6ac75d77571ccec0f176 SHA256 389c1b2c3467f39f52a7fb294ee88800431dd23e73a8ce165a04d0ee2d00a3db
 MD5 9275519a591f40e7ab6b3746d884f67f files/compile-without-log4j.patch 682
 RMD160 e2ec9338259d23d17a6a68235cf90f84d9acb0cc files/compile-without-log4j.patch 682
@@ -28,14 +31,14 @@ EBUILD jdbc-mysql-3.1.12.ebuild 1193 RMD160 2bae952b09f7db1d96c0e7f43081b97b06bb
 MD5 143060b9b6c0ce29be3b138fb1cd059a jdbc-mysql-3.1.12.ebuild 1193
 RMD160 2bae952b09f7db1d96c0e7f43081b97b06bbdde8 jdbc-mysql-3.1.12.ebuild 1193
 SHA256 5f5960c02f52e04b966ab6da2d66de37c54810c564d4c7c730b75ca791b8ad5e jdbc-mysql-3.1.12.ebuild 1193
-EBUILD jdbc-mysql-3.1.13.ebuild 1273 RMD160 b977814b600431dc9194ca735833d36f0367a39d SHA1 99248a8491c5452423b25d85ca957b08a7d28491 SHA256 c482116d9fee792b5041790a17a7d210ed86417a57d2707e5ba74bd096345877
-MD5 26f99f70f271c9aab462bfb5bdbd5842 jdbc-mysql-3.1.13.ebuild 1273
-RMD160 b977814b600431dc9194ca735833d36f0367a39d jdbc-mysql-3.1.13.ebuild 1273
-SHA256 c482116d9fee792b5041790a17a7d210ed86417a57d2707e5ba74bd096345877 jdbc-mysql-3.1.13.ebuild 1273
-MISC ChangeLog 7077 RMD160 75fb7d983b7122f6219f318efb885d8e0e5c1a64 SHA1 12e3592da62277cd73709c969a5a95cab7fe43f5 SHA256 d24d1a5f677147a40a77cd3967a5fb69dde5b3b1ddf67ad7f43e5fc7f47d9bd2
-MD5 90d00f56eaf2daaec5e735717d33fa1a ChangeLog 7077
-RMD160 75fb7d983b7122f6219f318efb885d8e0e5c1a64 ChangeLog 7077
-SHA256 d24d1a5f677147a40a77cd3967a5fb69dde5b3b1ddf67ad7f43e5fc7f47d9bd2 ChangeLog 7077
+EBUILD jdbc-mysql-3.1.13-r1.ebuild 1285 RMD160 58ba8b0adcc5d34b8ad49841fc173e944d3f9e74 SHA1 d161d70a73bf3207698c4058d7341a64350ac832 SHA256 c5ef6c025ae0e116d634fc065d574893e9970c44eaef1d9ca606884bed828720
+MD5 ae805172024b3ec7e4362f5661c1dace jdbc-mysql-3.1.13-r1.ebuild 1285
+RMD160 58ba8b0adcc5d34b8ad49841fc173e944d3f9e74 jdbc-mysql-3.1.13-r1.ebuild 1285
+SHA256 c5ef6c025ae0e116d634fc065d574893e9970c44eaef1d9ca606884bed828720 jdbc-mysql-3.1.13-r1.ebuild 1285
+MISC ChangeLog 7260 RMD160 67f9782d80ba028b94ec8facb813b0fbc4e420d7 SHA1 1ce26c66ffe0371610305e96bce8f81e3396ed89 SHA256 eef1b68091a1b91ad79b46a2aaad8f24872f8fae3dcd83636350784b8d84b81a
+MD5 d90d69a74e4a36873f7dcf419017f5e2 ChangeLog 7260
+RMD160 67f9782d80ba028b94ec8facb813b0fbc4e420d7 ChangeLog 7260
+SHA256 eef1b68091a1b91ad79b46a2aaad8f24872f8fae3dcd83636350784b8d84b81a ChangeLog 7260
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
@@ -55,6 +58,13 @@ SHA256 2e43592d00cb188b079064d3b3b2d245097f26b2a9f7257e84883ad8c3490381 files/di
 MD5 efa3c2c46fd264d929e4ac389de96b24 files/digest-jdbc-mysql-3.1.12 286
 RMD160 d578a2363dc817998933d8ba813cfcf422d87b7d files/digest-jdbc-mysql-3.1.12 286
 SHA256 2705923d8cae10fb921ace045a7c374fdc605d6cef413217b53fe87e4f309719 files/digest-jdbc-mysql-3.1.12 286
-MD5 0b98ecbf341075a5406833bdbae31ac8 files/digest-jdbc-mysql-3.1.13 289
-RMD160 c0d8b65ce73718936a300bb49f116875e278fb75 files/digest-jdbc-mysql-3.1.13 289
-SHA256 850860f6a1f74e05c1555e65c965457866701d83ecfa9a0733f7b1041769ccb2 files/digest-jdbc-mysql-3.1.13 289
+MD5 0b98ecbf341075a5406833bdbae31ac8 files/digest-jdbc-mysql-3.1.13-r1 289
+RMD160 c0d8b65ce73718936a300bb49f116875e278fb75 files/digest-jdbc-mysql-3.1.13-r1 289
+SHA256 850860f6a1f74e05c1555e65c965457866701d83ecfa9a0733f7b1041769ccb2 files/digest-jdbc-mysql-3.1.13-r1 289
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.4 (GNU/Linux)
+
+iD8DBQFEwpWvgo/w9rxVVVERAsuQAJ9S3EtIjMXx2FQec1IWrc9XZP1e0gCfYefy
+dU1FM/dNLm00oBD9Xfw2pyo=
+=N0AX
+-----END PGP SIGNATURE-----
diff --git a/dev-java/jdbc-mysql/files/digest-jdbc-mysql-3.1.13 b/dev-java/jdbc-mysql/files/digest-jdbc-mysql-3.1.13
deleted file mode 100644
index 9e1b9a4ef5e5..000000000000
--- a/dev-java/jdbc-mysql/files/digest-jdbc-mysql-3.1.13
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 b2fc8cc8990d85629b183f284a8f46d8 mysql-connector-java-3.1.13.tar.gz 10454933
-RMD160 2316969d32ce5944e4a6dc682fc29a2cf9129cf2 mysql-connector-java-3.1.13.tar.gz 10454933
-SHA256 afa911e3999d10777fd4fb8b19c7af1330c04c927bd6fda859cd7623eb05713f mysql-connector-java-3.1.13.tar.gz 10454933
diff --git a/dev-java/jdbc-mysql/jdbc-mysql-3.1.13.ebuild b/dev-java/jdbc-mysql/jdbc-mysql-3.1.13.ebuild
deleted file mode 100644
index 9b076f8c26de..000000000000
--- a/dev-java/jdbc-mysql/jdbc-mysql-3.1.13.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-mysql/jdbc-mysql-3.1.13.ebuild,v 1.1 2006/07/18 01:28:00 nichoj Exp $
-
-inherit eutils java-pkg-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"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="c3p0"
-COMMON_DEP="
-	dev-java/log4j
-	c3p0? ( dev-java/c3p0 )
-	dev-java/jdbc2-stdext"
-RDEPEND=">=virtual/jre-1.2
-	${COMMON_DEP}"
-# FIXME doesn't like Java 1.6's JDBC API
-DEPEND="|| (
-		=virtual/jdk-1.3*
-		=virtual/jdk-1.4*
-		=virtual/jdk-1.5*
-	)
-	${COMMON_DEP}
-	sys-apps/sed
-	dev-java/ant-core
-	dev-java/junit"
-
-S="${WORKDIR}/${MY_P}"
-
-ant_src_unpack() {
-	unpack ${A}
-	cd ${S}
-	rm -f *.jar
-
-	sed -i 's,{buildDir}/MANIFEST.MF,{buildDir}/META-INF/MANIFEST.MF,' build.xml || die "sed failed"
-
-	mkdir src/lib-nodist # needed, or ant will fail
-	cd src/lib
-	rm -f *.jar
-	java-pkg_jar-from jdbc2-stdext
-	use c3p0 && java-pkg_jar-from c3p0
-}
-
-src_compile() {
-	eant dist
-}
-
-src_install() {
-	java-pkg_newjar build/${MY_P}/${MY_P}-bin.jar ${PN}.jar
-	dodoc README CHANGES
-}