Version bump brought in from the Java overlay. JBoss support is disabled until we finish packaging modular JBoss.

Package-Manager: portage-2.1.2_rc4-r4

6 files changed, 204 insertions, 9 deletions

diff --git a/dev-java/hibernate/ChangeLog b/dev-java/hibernate/ChangeLog
index 1c04867f6332..9e00a1b7475e 100644
--- a/dev-java/hibernate/ChangeLog
+++ b/dev-java/hibernate/ChangeLog
@@ -1,6 +1,13 @@
 # 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.23 2007/01/11 00:24:31 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/hibernate/ChangeLog,v 1.24 2007/01/11 04:49:52 nichoj Exp $
+
+*hibernate-3.0.5-r2 (11 Jan 2007)
+
+  11 Jan 2007; Joshua Nichols <nichoj@gentoo.org>
+  +files/hibernate-3.0.5-nosplash.patch, +hibernate-3.0.5-r2.ebuild:
+  Version bump brought in from the Java overlay. JBoss support is disabled
+  until we finish packaging modular JBoss.
 
 *hibernate-3.1.3 (11 Jan 2007)
 
diff --git a/dev-java/hibernate/Manifest b/dev-java/hibernate/Manifest
index a5fe28840f58..ff16a94a894f 100644
--- a/dev-java/hibernate/Manifest
+++ b/dev-java/hibernate/Manifest
@@ -1,10 +1,19 @@
-DIST hibernate-2.1.8.tar.gz 17348255
+AUX hibernate-3.0.5-nosplash.patch 3891 RMD160 2cd9fec46f848a4350c85e9a863dda16e2b00610 SHA1 1907032dae49f01abc1d077a70653b084a81b02e SHA256 a2b16438ff87cd59c22c4ede3b288a1ab9c1d90f061e9b4279e19a0fef3f8e64
+MD5 4918d75410af20764bb71a72a1546dd2 files/hibernate-3.0.5-nosplash.patch 3891
+RMD160 2cd9fec46f848a4350c85e9a863dda16e2b00610 files/hibernate-3.0.5-nosplash.patch 3891
+SHA256 a2b16438ff87cd59c22c4ede3b288a1ab9c1d90f061e9b4279e19a0fef3f8e64 files/hibernate-3.0.5-nosplash.patch 3891
+DIST hibernate-2.1.8.tar.gz 17348255 RMD160 cdc7c9723c30c048de2f27472c40902721a2a236 SHA1 bf432e3798370938b54a476e20ab96cdd9215f55 SHA256 5f81e81bc5d8b5727bd8419119c4a8094cd59c8035bdb17ac5b0e823e4f0afef
+DIST hibernate-3.0.5.tar.gz 16097031 RMD160 720e9f16b8caea3245a9b82075a1d0957e790d5a SHA1 49897f3c4cccf0fe9fbe7903a509a0ccc996958b SHA256 6971edbbb7bda9e0d2b96a0a652c9040ccde9f17dfae0fe72cc017c3b29196fa
 DIST hibernate-3.0rc1.tar.gz 14125433
 DIST hibernate-3.1.3.tar.gz 18529984 RMD160 3c7a2a74d4c9f35d4250f0f0ef1fd478c7fd1828 SHA1 b27169ede61e154cf5641b5a960f9074108d55a1 SHA256 e34feddabd7e1a432f11c670d08338720beb6c1dc5bb62952612f05260944c49
 EBUILD hibernate-2.1.8.ebuild 3631 RMD160 99ec77485327f0accd09a87cadb02095582c1870 SHA1 d2a956ca1993fd2d1b5e66b7b71434f94b800065 SHA256 7131d8105623d5d7c346c804ac07bea8dae53185ceaf6a0d861010d4342440bb
 MD5 3b4b85e4f98e74c162e6782e0286d78d hibernate-2.1.8.ebuild 3631
 RMD160 99ec77485327f0accd09a87cadb02095582c1870 hibernate-2.1.8.ebuild 3631
 SHA256 7131d8105623d5d7c346c804ac07bea8dae53185ceaf6a0d861010d4342440bb hibernate-2.1.8.ebuild 3631
+EBUILD hibernate-3.0.5-r2.ebuild 2550 RMD160 985c1277c4236263c0115903b1e240f288b33bbe SHA1 1018757431a37ced8b6bd5c0d57942c9b3bcbcf8 SHA256 e08fbbae6dea41209c8a933c116a9ae7289bb8c3b3101d71a1111a22db1778f1
+MD5 0cc57b665ca8ee2456db4a69efc877f6 hibernate-3.0.5-r2.ebuild 2550
+RMD160 985c1277c4236263c0115903b1e240f288b33bbe hibernate-3.0.5-r2.ebuild 2550
+SHA256 e08fbbae6dea41209c8a933c116a9ae7289bb8c3b3101d71a1111a22db1778f1 hibernate-3.0.5-r2.ebuild 2550
 EBUILD hibernate-3.0_rc1.ebuild 3633 RMD160 5150951576c359dba4db40ac616f4c1afbcae4cc SHA1 6cb6776726641ad90d7cf4d070020da78d02ebfc SHA256 9d9c8a104ad736cf6f0b4e9cbe998c92da7687fbe017589ba7fd9001cd4216c7
 MD5 894d0d8af99b6e9fa02d31a04b43e9f0 hibernate-3.0_rc1.ebuild 3633
 RMD160 5150951576c359dba4db40ac616f4c1afbcae4cc hibernate-3.0_rc1.ebuild 3633
@@ -13,17 +22,20 @@ EBUILD hibernate-3.1.3.ebuild 2074 RMD160 76e3772116c267c0db7fdbd01b7a5ccef5b894
 MD5 1fbc88350f73cbf7629ec5048598b77c hibernate-3.1.3.ebuild 2074
 RMD160 76e3772116c267c0db7fdbd01b7a5ccef5b894c1 hibernate-3.1.3.ebuild 2074
 SHA256 503caf98adf602ff8dbd03ab5f1d775551470dee289c320e61e1d31ae95c7c64 hibernate-3.1.3.ebuild 2074
-MISC ChangeLog 3490 RMD160 26ac25f5a22f44ce944f8ab193fcfdaa8a395620 SHA1 d1839b647e10cef63f68ed4adbfe5bbeb2e3443b SHA256 8b628ec676db696c1510b5bba07b8af6f5ba7dda733f019c6b9a22a712bd0504
-MD5 e28616d498e701174ebe38a9796e23b1 ChangeLog 3490
-RMD160 26ac25f5a22f44ce944f8ab193fcfdaa8a395620 ChangeLog 3490
-SHA256 8b628ec676db696c1510b5bba07b8af6f5ba7dda733f019c6b9a22a712bd0504 ChangeLog 3490
+MISC ChangeLog 3763 RMD160 5eddf744102fcc525a1d73e402cdbb34510dd75a SHA1 e6acef4772ad0fe9a687b6c607b005a71064a92b SHA256 e00b536ad1c1fafa8aefe838bc8cb48d04d9026ce9624563e51418a45ec6dd7d
+MD5 77e037ccbd1ee0985e884d336af344bb ChangeLog 3763
+RMD160 5eddf744102fcc525a1d73e402cdbb34510dd75a ChangeLog 3763
+SHA256 e00b536ad1c1fafa8aefe838bc8cb48d04d9026ce9624563e51418a45ec6dd7d ChangeLog 3763
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
 MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158
 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 metadata.xml 158
 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb metadata.xml 158
-MD5 b442a0c8138baf4b3737d0a382cfe360 files/digest-hibernate-2.1.8 69
-RMD160 bfe3a8065a721f4e72eb90709873430c3979b2ec files/digest-hibernate-2.1.8 69
-SHA256 30adcc617fd9d73f472683d50b42decb194a5c451733f1db994f30cb945e70e1 files/digest-hibernate-2.1.8 69
+MD5 1ee5015b6e87f13a08dcd1bbe143bafd files/digest-hibernate-2.1.8 253
+RMD160 2d8e59cbe326974fc2bdd455bce4626c6a86b527 files/digest-hibernate-2.1.8 253
+SHA256 abbfd31c7eaed4e7dbc435ff429cb4cd47e6e5578924316665eec158e3518a1b files/digest-hibernate-2.1.8 253
+MD5 16ce2da72a4386e32086daf4f3d94235 files/digest-hibernate-3.0.5-r2 253
+RMD160 0b48a732450333486940adb64e28e334ef1a14a1 files/digest-hibernate-3.0.5-r2 253
+SHA256 5363d16fc4c6d845b851b96aa754ccd23e81227edfeb7815cf7149715d1ccf4e files/digest-hibernate-3.0.5-r2 253
 MD5 e5aa0a8633b0ef9e280d35213fd5254f files/digest-hibernate-3.0_rc1 70
 RMD160 5617879b00ec5f66dfce111b6ecbdd2026c83d6b files/digest-hibernate-3.0_rc1 70
 SHA256 befe3aab460b7819524f51d055687ebe0bdde47c7bee55a3b8d9a97919ce28b5 files/digest-hibernate-3.0_rc1 70
diff --git a/dev-java/hibernate/files/digest-hibernate-2.1.8 b/dev-java/hibernate/files/digest-hibernate-2.1.8
index b6f1daec96ef..9b0fe17c8237 100644
--- a/dev-java/hibernate/files/digest-hibernate-2.1.8
+++ b/dev-java/hibernate/files/digest-hibernate-2.1.8
@@ -1 +1,3 @@
 MD5 6a0459c511ded947d01cc7de15a518ef hibernate-2.1.8.tar.gz 17348255
+RMD160 cdc7c9723c30c048de2f27472c40902721a2a236 hibernate-2.1.8.tar.gz 17348255
+SHA256 5f81e81bc5d8b5727bd8419119c4a8094cd59c8035bdb17ac5b0e823e4f0afef hibernate-2.1.8.tar.gz 17348255
diff --git a/dev-java/hibernate/files/digest-hibernate-3.0.5-r2 b/dev-java/hibernate/files/digest-hibernate-3.0.5-r2
new file mode 100644
index 000000000000..cbfce883a050
--- /dev/null
+++ b/dev-java/hibernate/files/digest-hibernate-3.0.5-r2
@@ -0,0 +1,3 @@
+MD5 e46e74c1eecd36025d2257cdc0998925 hibernate-3.0.5.tar.gz 16097031
+RMD160 720e9f16b8caea3245a9b82075a1d0957e790d5a hibernate-3.0.5.tar.gz 16097031
+SHA256 6971edbbb7bda9e0d2b96a0a652c9040ccde9f17dfae0fe72cc017c3b29196fa hibernate-3.0.5.tar.gz 16097031
diff --git a/dev-java/hibernate/files/hibernate-3.0.5-nosplash.patch b/dev-java/hibernate/files/hibernate-3.0.5-nosplash.patch
new file mode 100644
index 000000000000..13ce65fb8e09
--- /dev/null
+++ b/dev-java/hibernate/files/hibernate-3.0.5-nosplash.patch
@@ -0,0 +1,78 @@
+diff -ru hibernate-3.0/build.xml hibernate-3.0-patched/build.xml
+--- hibernate-3.0/build.xml	2005-05-25 01:03:45.000000000 -0400
++++ hibernate-3.0-patched/build.xml	2005-07-08 01:35:00.000000000 -0400
+@@ -132,7 +132,7 @@
+ 		</delete>
+ 	</target>
+ 
+-	<target name="init" depends="splash" description="Initialize the build">
++	<target name="init" description="Initialize the build">
+ 		<tstamp>
+ 			<format property="subversion" pattern="yyyy-MM-dd hh:mm:ss"/>
+ 		</tstamp>
+Only in hibernate-3.0/lib: _README.txt
+Only in hibernate-3.0/lib: ant-1.6.3.jar
+Only in hibernate-3.0/lib: ant-antlr-1.6.3.jar
+Only in hibernate-3.0/lib: ant-junit-1.6.3.jar
+Only in hibernate-3.0/lib: ant-launcher-1.6.3.jar
+Only in hibernate-3.0/lib: ant-swing-1.6.3.jar
+Only in hibernate-3.0/lib: antlr-2.7.5H3.jar
+Only in hibernate-3.0/lib: antlr.license.txt
+Only in hibernate-3.0/lib: apache.license-2.0.txt
+Only in hibernate-3.0/lib: apache.license.txt
+Only in hibernate-3.0-patched/lib: asm-analysis.jar
+Files hibernate-3.0/lib/asm-attrs.jar and hibernate-3.0-patched/lib/asm-attrs.jar differ
+Only in hibernate-3.0-patched/lib: asm-commons.jar
+Only in hibernate-3.0-patched/lib: asm-tree.jar
+Only in hibernate-3.0-patched/lib: asm-util.jar
+Only in hibernate-3.0-patched/lib: asm-xml.jar
+Files hibernate-3.0/lib/asm.jar and hibernate-3.0-patched/lib/asm.jar differ
+Only in hibernate-3.0/lib: c3p0-0.8.5.2.jar
+Only in hibernate-3.0-patched/lib: c3p0.jar
+Only in hibernate-3.0/lib: c3p0.license.txt
+Only in hibernate-3.0/lib: cglib-2.1.jar
+Only in hibernate-3.0-patched/lib: cglib.jar
+Only in hibernate-3.0/lib: cleanimports.jar
+Only in hibernate-3.0/lib: commons-collections-2.1.1.jar
+Only in hibernate-3.0-patched/lib: commons-collections.jar
+Only in hibernate-3.0/lib: commons-logging-1.0.4.jar
+Only in hibernate-3.0-patched/lib: commons-logging-api.jar
+Only in hibernate-3.0-patched/lib: commons-logging.jar
+Only in hibernate-3.0/lib: concurrent-1.3.2.jar
+Only in hibernate-3.0/lib: connector.jar
+Only in hibernate-3.0/lib: connector.licence.txt
+Only in hibernate-3.0/lib: dom4j-1.6.jar
+Only in hibernate-3.0-patched/lib: dom4j.jar
+Only in hibernate-3.0/lib: ehcache-1.1.jar
+Only in hibernate-3.0-patched/lib: ehcache.jar
+Only in hibernate-3.0/lib: jaas.jar
+Only in hibernate-3.0/lib: jaas.licence.txt
+Only in hibernate-3.0/lib: jacc-1_0-fr.jar
+Only in hibernate-3.0/lib: jaxen-1.1-beta-4.jar
+Only in hibernate-3.0-patched/lib: jaxen.jar
+Files hibernate-3.0/lib/jboss-cache.jar and hibernate-3.0-patched/lib/jboss-cache.jar differ
+Files hibernate-3.0/lib/jboss-common.jar and hibernate-3.0-patched/lib/jboss-common.jar differ
+Only in hibernate-3.0-patched/lib: jboss-j2ee.jar
+Files hibernate-3.0/lib/jboss-jmx.jar and hibernate-3.0-patched/lib/jboss-jmx.jar differ
+Files hibernate-3.0/lib/jboss-system.jar and hibernate-3.0-patched/lib/jboss-system.jar differ
+Only in hibernate-3.0/lib: jdbc2_0-stdext.licence.txt
+Only in hibernate-3.0/lib: jgroups-2.2.7.jar
+Only in hibernate-3.0-patched/lib: jgroups-core.jar
+Files hibernate-3.0/lib/jta.jar and hibernate-3.0-patched/lib/jta.jar differ
+Only in hibernate-3.0/lib: jta.licence.txt
+Only in hibernate-3.0/lib: junit-3.8.1.jar
+Only in hibernate-3.0/lib: log4j-1.2.9.jar
+Only in hibernate-3.0-patched/lib: log4j.jar
+Only in hibernate-3.0/lib: oscache-2.1.jar
+Only in hibernate-3.0-patched/lib: oscache.jar
+Only in hibernate-3.0/lib: proxool-0.8.3.jar
+Only in hibernate-3.0-patched/lib: proxool.jar
+Only in hibernate-3.0/lib: swarmcache-1.0rc2.jar
+Only in hibernate-3.0-patched/lib: swarmcache.jar
+Only in hibernate-3.0/lib: versioncheck.jar
+Only in hibernate-3.0/lib: xerces-2.6.2.jar
+Only in hibernate-3.0-patched/lib: xercesImpl.jar
+Only in hibernate-3.0-patched/lib: xercesSamples.jar
+Files hibernate-3.0/lib/xml-apis.jar and hibernate-3.0-patched/lib/xml-apis.jar differ
+Only in hibernate-3.0-patched/lib: xmlParserAPIs.jar
+Only in hibernate-3.0-patched/: packed
diff --git a/dev-java/hibernate/hibernate-3.0.5-r2.ebuild b/dev-java/hibernate/hibernate-3.0.5-r2.ebuild
new file mode 100644
index 000000000000..c283a01690f4
--- /dev/null
+++ b/dev-java/hibernate/hibernate-3.0.5-r2.ebuild
@@ -0,0 +1,93 @@
+# 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 $
+
+inherit java-pkg-2 java-ant-2 eutils
+
+MY_PV="3.0"
+DESCRIPTION="Hibernate is a powerful, ultra-high performance object / relational persistence and query service for Java."
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+HOMEPAGE="http://www.hibernate.org"
+LICENSE="LGPL-2"
+# disable jboss until modular jboss is ready
+#IUSE="doc jboss"
+IUSE="doc"
+SLOT="3"
+KEYWORDS="~amd64 ~x86"
+
+COMMON_DEPEND="
+	=dev-java/asm-2*
+	dev-java/c3p0
+	=dev-java/cglib-2.1*
+	dev-java/commons-collections
+	dev-java/commons-logging
+	=dev-java/dom4j-1*
+	=dev-java/ehcache-1.1*
+	=dev-java/jaxen-1.1*
+	dev-java/log4j
+	dev-java/oscache
+	dev-java/proxool
+	=dev-java/swarmcache-1*
+	dev-java/jta
+	dev-java/sun-jacc-api
+	>=dev-java/xerces-2.7"
+#	jboss? (
+#		=dev-java/jboss-module-cache-4.0*
+#		=dev-java/jboss-module-common-4.0*
+#		=dev-java/jboss-module-j2ee-4.0*
+#		=dev-java/jboss-module-jmx-4.0*
+#		=dev-java/jboss-module-system-4.0*
+#	)
+
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEPEND}"
+DEPEND=">=virtual/jdk-1.4
+		>=dev-java/ant-core-1.5
+		${COMMON_DEPEND}"
+# TODO fix for Java 1.6... has problems due to JDBC4
+JAVA_PKG_NV_DEPEND="=virtual/jdk-1.4* =virtual/jdk-1.5*"
+
+S=${WORKDIR}/${PN}-${MY_PV}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# get rid of the lame splash screen
+	epatch ${FILESDIR}/${P}-nosplash.patch
+
+#	if ! use jboss; then
+		rm src/org/hibernate/cache/JndiBoundTreeCacheProvider.java \
+			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 
+		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
+		java-pkg_jar-from ${PACKAGE}
+	done
+	java-pkg_jar-from cglib-2.1 cglib.jar
+
+#	if use jboss; then
+#		java-pkg_jar-from jboss-module-cache-4 jboss-cache.jar
+#		java-pkg_jar-from jboss-module-common-4 jboss-common.jar
+#		java-pkg_jar-from jboss-module-j2ee-4 jboss-j2ee.jar
+#		java-pkg_jar-from jboss-module-jmx-4 jboss-jmx.jar
+#		java-pkg_jar-from jboss-module-system-4 jboss-system.jar
+#	fi
+
+}
+src_compile() {
+	eant jar -Ddist.dir=dist $(use_doc)
+}
+
+src_install() {
+	java-pkg_dojar dist/hibernate3.jar
+	dodoc changelog.txt readme.txt
+	use doc && java-pkg_dohtml -r dist/doc/api doc/other doc/reference
+}