diff options
| author |   Petteri Räty <betelgeuse@gentoo.org> | 2007-11-28 03:15:14 +0000 |
|---|---|---|
| committer | Petteri Räty <betelgeuse@gentoo.org> | 2007-11-28 03:15:14 +0000 |
| commit | 93a3b672aabfbf153fec5936d5c22a2859425375 (patch) | |
| tree | 9f78232516436458db70308783b494dfeedc2d74 /dev-java | |
| parent | Add -j1 to emake calls as parellel builds don't work when gcj is detected. Fi... (diff) | |
| download | gentoo-2-93a3b672aabfbf153fec5936d5c22a2859425375.tar.gz gentoo-2-93a3b672aabfbf153fec5936d5c22a2859425375.tar.bz2 gentoo-2-93a3b672aabfbf153fec5936d5c22a2859425375.zip | |
Prefer 1.5 over 1.4 and ebuild cleanup.
(Portage version: 2.1.4_rc3)
Diffstat (limited to 'dev-java')
| -rw-r--r-- | dev-java/c3p0/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-java/c3p0/c3p0-0.9.0.4.ebuild | 14 |
2 files changed, 10 insertions, 9 deletions
diff --git a/dev-java/c3p0/ChangeLog b/dev-java/c3p0/ChangeLog index cfbd2fa43ce0..4e05972b364a 100644 --- a/dev-java/c3p0/ChangeLog +++ b/dev-java/c3p0/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-java/c3p0 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/c3p0/ChangeLog,v 1.24 2007/02/11 12:22:21 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/c3p0/ChangeLog,v 1.25 2007/11/28 03:15:14 betelgeuse Exp $ + + 28 Nov 2007; Petteri Räty <betelgeuse@gentoo.org> c3p0-0.9.0.4.ebuild: + Prefer 1.5 over 1.4 and ebuild cleanup. 11 Feb 2007; Vlastimil Babka <caster@gentoo.org> -c3p0-0.8.5_pre9-r1.ebuild: diff --git a/dev-java/c3p0/c3p0-0.9.0.4.ebuild b/dev-java/c3p0/c3p0-0.9.0.4.ebuild index d4f24b92e84c..712f29ac98c3 100644 --- a/dev-java/c3p0/c3p0-0.9.0.4.ebuild +++ b/dev-java/c3p0/c3p0-0.9.0.4.ebuild @@ -1,6 +1,8 @@ # Copyright 1999-2007 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.4.ebuild,v 1.6 2007/02/10 18:56:48 nixnut Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/c3p0/c3p0-0.9.0.4.ebuild,v 1.7 2007/11/28 03:15:14 betelgeuse Exp $ + +JAVA_PKG_IUSE="doc source" inherit java-pkg-2 java-ant-2 @@ -11,16 +13,14 @@ HOMEPAGE="http://c3p0.sourceforge.net/" SRC_URI="mirror://sourceforge/${PN}/${SRC_P}.tgz" # Does not like Java 1.6's JDBC API COMMON_DEPEND="dev-java/log4j" -DEPEND="|| ( =virtual/jdk-1.4* =virtual/jdk-1.5* ) - dev-java/ant-core - source? ( app-arch/zip ) +DEPEND="|| ( =virtual/jdk-1.5* =virtual/jdk-1.4* ) ${COMMON_DEPEND}" RDEPEND=">=virtual/jre-1.4 ${COMMON_DEPEND}" LICENSE="LGPL-2" SLOT="0" KEYWORDS="amd64 ppc ppc64 x86" -IUSE="doc source" +IUSE="" S="${WORKDIR}/${SRC_P}" @@ -32,9 +32,7 @@ src_unpack() { echo "log4j.jar.file=$(java-pkg_getjar log4j log4j.jar)" >> build.properties } -src_compile() { - eant jar $(use_doc javadocs) -} +EANT_DOC_TARGET="javadocs" src_install() { java-pkg_newjar build/${P}.jar |