Major overhaul.

Require jdk6 for building. #402487

Package-Manager: portage-2.1.10.57/cvs/Linux x86_64

3 files changed, 79 insertions, 3 deletions

diff --git a/dev-java/proxool/ChangeLog b/dev-java/proxool/ChangeLog
index cebee8f74d2f..aacfd3021aa0 100644
--- a/dev-java/proxool/ChangeLog
+++ b/dev-java/proxool/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/proxool
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/proxool/ChangeLog,v 1.13 2007/11/25 11:07:13 drac Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/proxool/ChangeLog,v 1.14 2012/05/06 19:22:22 sera Exp $
+
+*proxool-0.8.3-r2 (06 May 2012)
+
+  06 May 2012; Ralph Sennhauser <sera@gentoo.org> +proxool-0.8.3-r2.ebuild:
+  Major overhaul.
+  Require jdk6 for building. #402487
 
   25 Nov 2007; Samuli Suominen <drac@gentoo.org> proxool-0.8.3-r1.ebuild:
   amd64 stable wrt #189343
diff --git a/dev-java/proxool/Manifest b/dev-java/proxool/Manifest
index 07374b7aab66..17be69cbde48 100644
--- a/dev-java/proxool/Manifest
+++ b/dev-java/proxool/Manifest
@@ -1,4 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST proxool-0.8.3-source.tar.gz 5782824 RMD160 2635e7fb70455ac8d04c48e585a00faba7c91a86 SHA1 9b4c5366a57ab6404cc2e288699195a7b86beda3 SHA256 2de39f0b45b71ba05f5639943a8f59a8bc49a4cc025efd7d1b16b39dfbd0ad11
 EBUILD proxool-0.8.3-r1.ebuild 1558 RMD160 10e8d4563b968d015306e56e231b025fa31f5b64 SHA1 bcf1f75fcbe01c7e054fae65681476a62d2ec889 SHA256 ecaa51b69603ee3d91c444f1f0713126e5b9aa2c5c1e80b3d27f51afe41ba076
-MISC ChangeLog 1964 RMD160 a2f4d4b55619325f0de9b104a9c47550003fff12 SHA1 8d7466e708a7216e899fa4bf4973e09e727ba3d9 SHA256 065c9fa41963ec343935445252557e9e5305aca94e3528e89eab5f17fea3b7d8
+EBUILD proxool-0.8.3-r2.ebuild 1418 RMD160 9a0527e9035b155717bf36839cdf005f22949474 SHA1 d0a7340f7ab41ada33d0c3de9f8902cee2368707 SHA256 b799f1ddb508b30aec40e4684a943e686b9de7e56a27b39e9942adef00548ae2
+MISC ChangeLog 2129 RMD160 942aa1da4e381e6663b5b25aae7414a4a0b5fdc5 SHA1 6a71182e163c9867ba838d625c224aac120de7a8 SHA256 a025b96d71f547331e6027651bbfa645d021f0643a3d84efb2cbe81f75fd41e3
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQEcBAEBAgAGBQJPps99AAoJEIUJ+svaV163vk0H/2xkcOD6608Xi7B9p189bED2
+AuTmi54VAORJi75iMkzNoOWTOou/DtcJAF6GOFxBaBiNF862lSr5uaW8bk3blvxw
+bs+IWRsoh1Mcoi8VVtAlXtMOcqVoBseHYYhoKyOGM3JX2K9INRNgtQgGRJySjLMG
+8EpZ06OSmDILLgaaMbyBKkjvMeuk1OUn3Dd+KR6rHifgI8Sh6xgeRjRg/s6JRRW2
+DEf5W05MD1vdBYEvmiQAjpbI+Pd0mOd5w9SQW7TYKdgZken/nbOhzRKNP9K7s8sY
+7DKo308DAQDMf8WrVQBqeiYMRUbgFQm1Xve217Q26vvVQlnYOKFB6I705CtOSO0=
+=cazc
+-----END PGP SIGNATURE-----
diff --git a/dev-java/proxool/proxool-0.8.3-r2.ebuild b/dev-java/proxool/proxool-0.8.3-r2.ebuild
new file mode 100644
index 000000000000..446c1938575e
--- /dev/null
+++ b/dev-java/proxool/proxool-0.8.3-r2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/proxool/proxool-0.8.3-r2.ebuild,v 1.1 2012/05/06 19:22:22 sera Exp $
+
+EAPI=4
+
+JAVA_PKG_IUSE="doc source"
+WANT_ANT_TASKS="ant-nodeps"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Proxool is a Java connection pool."
+HOMEPAGE="http://proxool.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}-source.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+# Tests disabled because they would need hibernate
+# and as such creating a circular dependency
+RESTRICT="test"
+
+COMMON_DEP="
+	dev-java/avalon-framework:4.2
+	dev-java/avalon-logkit:2.0
+	dev-java/log4j:0
+	dev-java/mx4j-core:3.0
+	java-virtuals/servlet-api:3.0"
+RDEPEND="${COMMON_DEP}
+	>=virtual/jre-1.4"
+# Require jdk6 for building. #402487
+DEPEND="${COMMON_DEP}
+	virtual/jdk:1.6
+	dev-util/checkstyle:0"
+
+java_prepare() {
+	find -name '*.jar' -exec rm {} + || die
+
+	java-pkg_jar-from --into lib --build-only checkstyle
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+EANT_BUILD_TARGET="build-jar"
+EANT_GENTOO_CLASSPATH="log4j,servlet-api-3.0,avalon-framework-4.2,avalon-logkit-2.0,mx4j-core-3.0"
+
+src_install() {
+	java-pkg_newjar build/${P}.jar ${PN}.jar
+
+	dodoc README.txt || die
+	# dohtml valid as there are other docs too
+	use doc && java-pkg_dohtml -r doc/*
+	use source && java-pkg_dosrc src/java/*
+}