diff options
| author |   Vlastimil Babka <caster@gentoo.org> | 2007-04-25 19:58:35 +0000 |
|---|---|---|
| committer | Vlastimil Babka <caster@gentoo.org> | 2007-04-25 19:58:35 +0000 |
| commit | 00db534222c075ce81e7e83731d9088adb97024f (patch) | |
| tree | 4d4108d3a2226de92e703bd391d1ea9b20723bbe /dev-java/castor | |
| parent | Add dev-java/ant-core to RDEPEND. (diff) | |
| download | gentoo-2-00db534222c075ce81e7e83731d9088adb97024f.tar.gz gentoo-2-00db534222c075ce81e7e83731d9088adb97024f.tar.bz2 gentoo-2-00db534222c075ce81e7e83731d9088adb97024f.zip | |
Fix dependencies, add examples USE flag.
(Portage version: 2.1.2.4)
Diffstat (limited to 'dev-java/castor')
| -rw-r--r-- | dev-java/castor/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-java/castor/castor-0.9.9.1-r1.ebuild | 20 |
2 files changed, 14 insertions, 11 deletions
diff --git a/dev-java/castor/ChangeLog b/dev-java/castor/ChangeLog index e0b03d9aa910..b2f51fdc6da9 100644 --- a/dev-java/castor/ChangeLog +++ b/dev-java/castor/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-java/castor # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/castor/ChangeLog,v 1.29 2007/02/14 17:38:03 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/castor/ChangeLog,v 1.30 2007/04/25 19:58:35 caster Exp $ + + 25 Apr 2007; Vlastimil Babka <caster@gentoo.org> castor-0.9.9.1-r1.ebuild: + Fix dependencies, add examples USE flag. 14 Feb 2007; Petteri Räty <betelgeuse@gentoo.org> -castor-0.9.5.3-r1.ebuild, -castor-1.0.3.ebuild: diff --git a/dev-java/castor/castor-0.9.9.1-r1.ebuild b/dev-java/castor/castor-0.9.9.1-r1.ebuild index 99353d42fd39..cb689e92ba50 100644 --- a/dev-java/castor/castor-0.9.9.1-r1.ebuild +++ b/dev-java/castor/castor-0.9.9.1-r1.ebuild @@ -1,7 +1,8 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/castor/castor-0.9.9.1-r1.ebuild,v 1.3 2006/08/06 04:17:36 nichoj Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/castor/castor-0.9.9.1-r1.ebuild,v 1.4 2007/04/25 19:58:35 caster Exp $ +JAVA_PKG_IUSE="doc source" inherit eutils java-pkg-2 java-ant-2 DESCRIPTION="Data binding framework for Java" @@ -10,7 +11,7 @@ HOMEPAGE="http://www.castor.org" LICENSE="Exolab" KEYWORDS="~amd64 ~x86" SLOT="0.9" -IUSE="doc postgres source" +IUSE="doc examples source" COMMON_DEP=" >=dev-java/adaptx-0.9.5.3 @@ -18,19 +19,18 @@ COMMON_DEP=" =dev-java/jakarta-oro-2.0* =dev-java/jakarta-regexp-1.3* >=dev-java/ldapsdk-4.1.7 - >=dev-java/junit-3.8 =dev-java/servletapi-2.3* =dev-java/xerces-1.3* =dev-java/cglib-2.0* postgres? ( =dev-java/jdbc2-postgresql-7.3* )" RDEPEND=">=virtual/jre-1.4 + dev-java/ant-core ${COMMON_DEP}" # Does not like Java 1.6's JDBC API DEPEND="|| ( - =virtual/jdk-1.4* =virtual/jdk-1.5* + =virtual/jdk-1.4* ) - >=dev-java/ant-core-1.5 ${COMMON_DEP}" src_unpack() { @@ -48,7 +48,6 @@ src_unpack() { java-pkg_jar-from cglib-2 java-pkg_jar-from jakarta-oro-2.0 jakarta-oro.jar oro.jar java-pkg_jar-from jakarta-regexp-1.3 jakarta-regexp.jar regexp.jar - java-pkg_jar-from junit java-pkg_jar-from servletapi-2.3 java-pkg_jar-from xerces-1.3 java-pkg_jar-from ldapsdk-4.1 ldapjdk.jar @@ -61,9 +60,10 @@ src_compile() { } src_install() { + java-pkg_newjar dist/${P}.jar java-pkg_newjar dist/${P}-xml.jar ${PN}-xml.jar - java-pkg_newjar dist/${P}.jar ${PN}.jar - use doc && java-pkg_dohtml -r build/doc/javadoc/* - use source && java-pkg_dosrc src/main/* + use doc && java-pkg_dojavadoc build/doc/javadoc + use examples && java-pkg_doexamples src/examples + use source && java-pkg_dosrc src/main/org } |