dont install versioned jar, thanks too Josh Nichols <nichoj@alum.rpi.edu> + version bump

Package-Manager: portage-2.0.51.22-r1

9 files changed, 81 insertions, 15 deletions

diff --git a/dev-java/c3p0/ChangeLog b/dev-java/c3p0/ChangeLog
index 53c6705461ea..25ce0ea43d23 100644
--- a/dev-java/c3p0/ChangeLog
+++ b/dev-java/c3p0/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for dev-java/c3p0
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/c3p0/ChangeLog,v 1.12 2005/04/22 08:17:40 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/c3p0/ChangeLog,v 1.13 2005/06/29 17:18:21 axxo Exp $
+
+*c3p0-0.9.0_pre6 (29 Jun 2005)
+*c3p0-0.8.5.2 (29 Jun 2005)
+*c3p0-0.8.5_pre9-r1 (29 Jun 2005)
+
+  29 Jun 2005; Thomas Matthijs <axxo@gentoo.org> -c3p0-0.8.4.5.ebuild,
+  -c3p0-0.8.5_pre9.ebuild, +c3p0-0.8.5_pre9-r1.ebuild, +c3p0-0.8.5.2.ebuild,
+  +c3p0-0.9.0_pre6.ebuild:
+  dont install versioned jar, thanks too Josh Nichols <nichoj@alum.rpi.edu> +
+  version bump
 
   22 Apr 2005; Simon Stelling <blubb@gentoo.org> c3p0-0.8.5_pre9.ebuild:
   stable on amd64
diff --git a/dev-java/c3p0/Manifest b/dev-java/c3p0/Manifest
index 83de13adf092..3dc5419b04d1 100644
--- a/dev-java/c3p0/Manifest
+++ b/dev-java/c3p0/Manifest
@@ -1,6 +1,18 @@
-MD5 57beca301b1ee33bfd8f131acf4bd923 ChangeLog 1365
-MD5 a8b1c27e51f0944f5ba500eaaf003391 c3p0-0.8.4.5.ebuild 1022
-MD5 0310abe00ee983d80db0c1b0b9363ded c3p0-0.8.5_pre9.ebuild 1082
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 dcb71724493612e00e3e05b4069e34b4 c3p0-0.8.5.2.ebuild 1091
+MD5 9076fda6faea1a6aec421e2ec65df794 c3p0-0.9.0_pre6.ebuild 1094
+MD5 f222cc23636c2a962b43eeae951e2436 c3p0-0.8.5_pre9-r1.ebuild 1095
+MD5 c6ddc57661154f29e35d769c59781af1 ChangeLog 1727
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
-MD5 a681652e2025f1c0806f596fa54dce17 files/digest-c3p0-0.8.4.5 65
-MD5 345082f23a9374aea4f95ea617a9d969 files/digest-c3p0-0.8.5_pre9 68
+MD5 345082f23a9374aea4f95ea617a9d969 files/digest-c3p0-0.8.5_pre9-r1 68
+MD5 64d9f17747aea1c4d121e716f16388ff files/digest-c3p0-0.9.0_pre6 68
+MD5 d1f86c22a5ead5f74f5862ed3f00b545 files/digest-c3p0-0.8.5.2 65
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCwtf8/rLF9B432nYRAiXdAJwOXhmIx1Xu9BdeZ7WG66rigQ7EvQCfd6UE
+2ftEggyRdpR1D0JPIVrskgE=
+=ahAw
+-----END PGP SIGNATURE-----
diff --git a/dev-java/c3p0/c3p0-0.8.4.5.ebuild b/dev-java/c3p0/c3p0-0.8.5.2.ebuild
index 2429375a5c1b..caa41337ef51 100644
--- a/dev-java/c3p0/c3p0-0.8.4.5.ebuild
+++ b/dev-java/c3p0/c3p0-0.8.5.2.ebuild
@@ -1,21 +1,24 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/c3p0/c3p0-0.8.4.5.ebuild,v 1.7 2005/01/01 18:12:38 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/c3p0/c3p0-0.8.5.2.ebuild,v 1.1 2005/06/29 17:18:21 axxo Exp $
 
 inherit java-pkg
 
+MY_PV=${PV/_pre/-pre}
+
 DESCRIPTION="c3p0 is a java component to provide an jdbc database pool"
 HOMEPAGE="http://c3p0.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}-${PV}.src.tgz"
+SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}.src.tgz"
 DEPEND=">=virtual/jdk-1.3
-	>=dev-java/ant-1.4"
+	>=dev-java/ant-1.4
+	jikes? ( dev-java/jikes )"
 RDEPEND=">=virtual/jre-1.3"
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="x86 ~ppc ~amd64"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="jikes doc"
 
-S=${WORKDIR}/${P}.src
+S=${WORKDIR}/${PN}-${MY_PV}.src
 
 src_unpack() {
 	unpack ${A}
@@ -31,7 +34,7 @@ src_compile() {
 }
 
 src_install () {
-	java-pkg_dojar build/${PN}*.jar || die "installation failed"
+	java-pkg_newjar build/${PN}*.jar ${PN}.jar || die "installation failed"
 	dodoc README-SRC
 	use doc && java-pkg_dohtml -r build/apidocs/*
 }
diff --git a/dev-java/c3p0/c3p0-0.8.5_pre9.ebuild b/dev-java/c3p0/c3p0-0.8.5_pre9-r1.ebuild
index 2656fc8e9c84..cb700c0c7e43 100644
--- a/dev-java/c3p0/c3p0-0.8.5_pre9.ebuild
+++ b/dev-java/c3p0/c3p0-0.8.5_pre9-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/c3p0/c3p0-0.8.5_pre9.ebuild,v 1.4 2005/04/22 08:17:40 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/c3p0/c3p0-0.8.5_pre9-r1.ebuild,v 1.1 2005/06/29 17:18:21 axxo Exp $
 
 inherit java-pkg
 
@@ -34,7 +34,7 @@ src_compile() {
 }
 
 src_install () {
-	java-pkg_dojar build/${PN}*.jar || die "installation failed"
+	java-pkg_newjar build/${PN}*.jar ${PN}.jar || die "installation failed"
 	dodoc README-SRC
 	use doc && java-pkg_dohtml -r build/apidocs/*
 }
diff --git a/dev-java/c3p0/c3p0-0.9.0_pre6.ebuild b/dev-java/c3p0/c3p0-0.9.0_pre6.ebuild
new file mode 100644
index 000000000000..ce2469660f53
--- /dev/null
+++ b/dev-java/c3p0/c3p0-0.9.0_pre6.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/c3p0/c3p0-0.9.0_pre6.ebuild,v 1.1 2005/06/29 17:18:21 axxo Exp $
+
+inherit java-pkg
+
+MY_PV=${PV/_pre/-pre}
+
+DESCRIPTION="c3p0 is a java component to provide an jdbc database pool"
+HOMEPAGE="http://c3p0.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}.src.tgz"
+DEPEND=">=virtual/jdk-1.3
+	>=dev-java/ant-1.4
+	jikes? ( dev-java/jikes )"
+RDEPEND=">=virtual/jre-1.3"
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="jikes doc"
+
+S=${WORKDIR}/${PN}-${MY_PV}.src
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	echo "j2ee.jar.base.dir=`java-config --jdk-home`" > build.properties
+}
+
+src_compile() {
+	local antflags="jar"
+	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
+	use doc && antflags="${antflags} javadocs"
+	ant ${antflags} || die "compilation failed"
+}
+
+src_install () {
+	java-pkg_newjar build/${PN}*.jar ${PN}.jar || die "installation failed"
+	dodoc README-SRC
+	use doc && java-pkg_dohtml -r build/apidocs/*
+}
diff --git a/dev-java/c3p0/files/digest-c3p0-0.8.4.5 b/dev-java/c3p0/files/digest-c3p0-0.8.4.5
deleted file mode 100644
index 12da3dae7067..000000000000
--- a/dev-java/c3p0/files/digest-c3p0-0.8.4.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 86644b3f7d21aac38a8e83880190e4a3 c3p0-0.8.4.5.src.tgz 145851
diff --git a/dev-java/c3p0/files/digest-c3p0-0.8.5.2 b/dev-java/c3p0/files/digest-c3p0-0.8.5.2
new file mode 100644
index 000000000000..bb211e41b5bf
--- /dev/null
+++ b/dev-java/c3p0/files/digest-c3p0-0.8.5.2
@@ -0,0 +1 @@
+MD5 5ab651a6e3b7f9780880ffe9a0c722bc c3p0-0.8.5.2.src.tgz 202030
diff --git a/dev-java/c3p0/files/digest-c3p0-0.8.5_pre9 b/dev-java/c3p0/files/digest-c3p0-0.8.5_pre9-r1
index b1014fe436e9..b1014fe436e9 100644
--- a/dev-java/c3p0/files/digest-c3p0-0.8.5_pre9
+++ b/dev-java/c3p0/files/digest-c3p0-0.8.5_pre9-r1
diff --git a/dev-java/c3p0/files/digest-c3p0-0.9.0_pre6 b/dev-java/c3p0/files/digest-c3p0-0.9.0_pre6
new file mode 100644
index 000000000000..7033123e2bf0
--- /dev/null
+++ b/dev-java/c3p0/files/digest-c3p0-0.9.0_pre6
@@ -0,0 +1 @@
+MD5 d6d9a08258ca1c6e694844bffa8b0100 c3p0-0.9.0-pre6.src.tgz 291654