diff options
| author |   Petteri Räty <betelgeuse@gentoo.org> | 2007-01-11 19:13:59 +0000 |
|---|---|---|
| committer | Petteri Räty <betelgeuse@gentoo.org> | 2007-01-11 19:13:59 +0000 |
| commit | a38ce5359ea78392b04e1b53e6a5b11e98f1484b (patch) | |
| tree | a9f75134df90137300a8a0a1ccdd3e86b4961945 /dev-java/hibernate | |
| parent | Stable on hppa. (diff) | |
| download | gentoo-2-a38ce5359ea78392b04e1b53e6a5b11e98f1484b.tar.gz gentoo-2-a38ce5359ea78392b04e1b53e6a5b11e98f1484b.tar.bz2 gentoo-2-a38ce5359ea78392b04e1b53e6a5b11e98f1484b.zip | |
Remove java-pkg_jar-from call for jdbc2-stdext as it is not needed to compile hibernate and not dependent upon. Fixes bug #161582.
(Portage version: 2.1.2_rc4-r7)
Diffstat (limited to 'dev-java/hibernate')
| -rw-r--r-- | dev-java/hibernate/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-java/hibernate/hibernate-3.0.5-r2.ebuild | 6 | ||||
| -rw-r--r-- | dev-java/hibernate/hibernate-3.1.3.ebuild | 8 |
3 files changed, 12 insertions, 8 deletions
diff --git a/dev-java/hibernate/ChangeLog b/dev-java/hibernate/ChangeLog index 77fb9b97a90e..f479b7157749 100644 --- a/dev-java/hibernate/ChangeLog +++ b/dev-java/hibernate/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-java/hibernate # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/hibernate/ChangeLog,v 1.25 2007/01/11 13:17:04 nichoj Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/hibernate/ChangeLog,v 1.26 2007/01/11 19:13:59 betelgeuse Exp $ + + 12 Jan 2007; Petteri Räty <betelgeuse@gentoo.org> hibernate-3.1.3.ebuild: + Remove java-pkg_jar-from call for jdbc2-stdext as it is not needed to + compile hibernate and not dependent upon. Fixes bug #161582. 11 Jan 2007; Joshua Nichols <nichoj@gentoo.org> metadata.xml: Added self as maintainer. diff --git a/dev-java/hibernate/hibernate-3.0.5-r2.ebuild b/dev-java/hibernate/hibernate-3.0.5-r2.ebuild index c283a01690f4..f008a6df472b 100644 --- a/dev-java/hibernate/hibernate-3.0.5-r2.ebuild +++ b/dev-java/hibernate/hibernate-3.0.5-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/hibernate/hibernate-3.0.5-r2.ebuild,v 1.1 2007/01/11 04:49:52 nichoj Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/hibernate/hibernate-3.0.5-r2.ebuild,v 1.2 2007/01/11 19:13:59 betelgeuse Exp $ inherit java-pkg-2 java-ant-2 eutils @@ -61,11 +61,11 @@ src_unpack() { src/org/hibernate/cache/TreeCache.java \ src/org/hibernate/cache/TreeCacheProvider.java # fi - + cd lib rm *.jar - local JAR_PACKAGES="ant-core antlr asm-2 c3p0 commons-collections + local JAR_PACKAGES="ant-core antlr asm-2 c3p0 commons-collections commons-logging dom4j-1 ehcache jaxen-1.1 jdbc2-stdext jta log4j oscache proxool swarmcache-1.0 sun-jacc-api xerces-2" for PACKAGE in ${JAR_PACKAGES}; do diff --git a/dev-java/hibernate/hibernate-3.1.3.ebuild b/dev-java/hibernate/hibernate-3.1.3.ebuild index aa1fd4800c00..92a7ced33a71 100644 --- a/dev-java/hibernate/hibernate-3.1.3.ebuild +++ b/dev-java/hibernate/hibernate-3.1.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/hibernate/hibernate-3.1.3.ebuild,v 1.1 2007/01/11 00:24:31 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/hibernate/hibernate-3.1.3.ebuild,v 1.2 2007/01/11 19:13:59 betelgeuse Exp $ inherit java-pkg-2 java-ant-2 eutils @@ -31,7 +31,6 @@ COMMON_DEPEND=" dev-java/sun-jacc-api dev-java/jgroups >=dev-java/xerces-2.7" -# dev-java/jdbc2-stdext RDEPEND=">=virtual/jre-1.4 ${COMMON_DEPEND}" # FIXME doesn't like Java 1.6's JDBC API @@ -53,11 +52,12 @@ src_unpack() { src/org/hibernate/cache/TreeCache.java \ src/org/hibernate/cache/TreeCacheProvider.java + rm -v *.jar cd lib - rm *.jar + rm -v *.jar local JAR_PACKAGES="asm-2 c3p0 commons-collections - commons-logging dom4j-1 ehcache jaxen-1.1 jdbc2-stdext + commons-logging dom4j-1 ehcache jaxen-1.1 log4j oscache proxool swarmcache-1.0 xerces-2 jgroups" for PACKAGE in ${JAR_PACKAGES}; do java-pkg_jar-from ${PACKAGE} |