Version bump.

Package-Manager: portage-2.2.0_alpha4/cvs/Linux x86_64

4 files changed, 114 insertions, 2 deletions

diff --git a/dev-java/commons-daemon/ChangeLog b/dev-java/commons-daemon/ChangeLog
index f7d36d981a9c..bab0190f86e6 100644
--- a/dev-java/commons-daemon/ChangeLog
+++ b/dev-java/commons-daemon/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/commons-daemon
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-daemon/ChangeLog,v 1.40 2010/10/17 12:25:14 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-daemon/ChangeLog,v 1.41 2010/11/13 22:29:56 caster Exp $
+
+*commons-daemon-1.0.4 (13 Nov 2010)
+
+  13 Nov 2010; Vlastimil Babka <caster@gentoo.org>
+  +commons-daemon-1.0.4.ebuild:
+  Version bump.
 
   17 Oct 2010; Vlastimil Babka <caster@gentoo.org>
   -files/1.0.1-as-needed.patch, -commons-daemon-1.0.1-r2.ebuild,
diff --git a/dev-java/commons-daemon/commons-daemon-1.0.4.ebuild b/dev-java/commons-daemon/commons-daemon-1.0.4.ebuild
new file mode 100644
index 000000000000..f329d31d1bf9
--- /dev/null
+++ b/dev-java/commons-daemon/commons-daemon-1.0.4.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-daemon/commons-daemon-1.0.4.ebuild,v 1.1 2010/11/13 22:29:56 caster Exp $
+
+EAPI="2"
+WANT_AUTOCONF=2.5
+JAVA_PKG_IUSE="doc examples source"
+
+inherit java-pkg-2 java-ant-2 eutils autotools
+
+DESCRIPTION="Tools to allow java programs to run as unix daemons"
+SRC_URI="mirror://apache/commons/daemon/source/${P}-src.tar.gz"
+HOMEPAGE="http://commons.apache.org/daemon/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.4"
+RDEPEND=">=virtual/jre-1.4"
+
+S=${WORKDIR}/${P}-src
+
+java_prepare() {
+	# https://issues.apache.org/jira/browse/DAEMON-154
+	find . -name "*.o" -delete -print || die
+
+	rm src/samples/build/classes/*.class || die
+
+	cd "${S}/src/native/unix"
+	sed -e "s/powerpc/powerpc|powerpc64/g" -i support/apsupport.m4
+	eautoconf
+}
+
+src_configure() {
+	java-ant-2_src_configure
+	cd "${S}/src/native/unix"
+	econf || die "configure failed"
+}
+
+src_compile() {
+	# compile native stuff
+	cd "${S}/src/native/unix"
+	emake || die "make failed"
+
+	# compile java stuff
+	cd "${S}"
+	java-pkg-2_src_compile
+}
+
+src_install() {
+	dobin src/native/unix/jsvc || die
+	java-pkg_newjar dist/*.jar
+
+	dodoc README RELEASE-NOTES.txt *.html || die
+	use doc && java-pkg_dohtml -r dist/docs/*
+	use examples && java-pkg_doexamples src/samples
+	use source && java-pkg_dosrc src/java/* src/native/unix/native
+}
diff --git a/dev-java/commons-pool/ChangeLog b/dev-java/commons-pool/ChangeLog
index b327f56a01b0..c213683d60c4 100644
--- a/dev-java/commons-pool/ChangeLog
+++ b/dev-java/commons-pool/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/commons-pool
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-pool/ChangeLog,v 1.55 2010/10/17 12:26:00 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-pool/ChangeLog,v 1.56 2010/11/13 22:34:00 caster Exp $
+
+*commons-pool-1.5.5 (13 Nov 2010)
+
+  13 Nov 2010; Vlastimil Babka <caster@gentoo.org>
+  +commons-pool-1.5.5.ebuild:
+  Version bump.
 
   17 Oct 2010; Vlastimil Babka <caster@gentoo.org> -commons-pool-1.4.ebuild:
   Remove old.
diff --git a/dev-java/commons-pool/commons-pool-1.5.5.ebuild b/dev-java/commons-pool/commons-pool-1.5.5.ebuild
new file mode 100644
index 000000000000..1d793e7b6530
--- /dev/null
+++ b/dev-java/commons-pool/commons-pool-1.5.5.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-pool/commons-pool-1.5.5.ebuild,v 1.1 2010/11/13 22:34:00 caster Exp $
+
+EAPI=2
+JAVA_PKG_IUSE="doc source test"
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Provides general purpose object pooling API"
+HOMEPAGE="http://commons.apache.org/pool/"
+SRC_URI="mirror://apache/commons/pool/source/${P}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.4"
+DEPEND=">=virtual/jdk-1.4
+	test? (
+		dev-java/ant-junit
+		dev-java/junit:0
+	)"
+
+S="${WORKDIR}/${P}-src"
+
+EANT_BUILD_TARGET="build-jar"
+
+src_test() {
+	ANT_TASKS="ant-junit" eant -Dclasspath="$(java-pkg_getjars junit)" test
+}
+
+src_install() {
+	java-pkg_dojar dist/${PN}.jar
+	dodoc README.txt RELEASE-NOTES.txt || die
+
+	use doc && java-pkg_dojavadoc dist/docs/api
+	use source && java-pkg_dosrc src/java/org
+}