Move SLOT 3 to java overlay as it's not used in the main tree.

Package-Manager: portage-2.2_rc6/cvs/Linux 2.6.26-gentoo i686

3 files changed, 9 insertions, 102 deletions

diff --git a/dev-java/hibernate/ChangeLog b/dev-java/hibernate/ChangeLog
index 03a868541a04..9fa3314df8d2 100644
--- a/dev-java/hibernate/ChangeLog
+++ b/dev-java/hibernate/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/hibernate
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/hibernate/ChangeLog,v 1.37 2008/07/30 18:58:25 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/hibernate/ChangeLog,v 1.38 2008/08/03 22:04:53 betelgeuse Exp $
+
+  03 Aug 2008; Petteri Räty <betelgeuse@gentoo.org>
+  -hibernate-3.0.5-r2.ebuild:
+  Move SLOT 3 to java overlay as it's not used in the main tree.
 
 *hibernate-3.1.3-r1 (30 Jul 2008)
 
diff --git a/dev-java/hibernate/Manifest b/dev-java/hibernate/Manifest
index aff15dbb55ad..18dfc7316914 100644
--- a/dev-java/hibernate/Manifest
+++ b/dev-java/hibernate/Manifest
@@ -2,17 +2,15 @@
 Hash: SHA1
 
 AUX hibernate-3.0.5-nosplash.patch 3891 RMD160 2cd9fec46f848a4350c85e9a863dda16e2b00610 SHA1 1907032dae49f01abc1d077a70653b084a81b02e SHA256 a2b16438ff87cd59c22c4ede3b288a1ab9c1d90f061e9b4279e19a0fef3f8e64
-DIST hibernate-3.0.5.tar.gz 16097031 RMD160 720e9f16b8caea3245a9b82075a1d0957e790d5a SHA1 49897f3c4cccf0fe9fbe7903a509a0ccc996958b SHA256 6971edbbb7bda9e0d2b96a0a652c9040ccde9f17dfae0fe72cc017c3b29196fa
 DIST hibernate-3.1.3.tar.gz 18529984 RMD160 3c7a2a74d4c9f35d4250f0f0ef1fd478c7fd1828 SHA1 b27169ede61e154cf5641b5a960f9074108d55a1 SHA256 e34feddabd7e1a432f11c670d08338720beb6c1dc5bb62952612f05260944c49
-EBUILD hibernate-3.0.5-r2.ebuild 2592 RMD160 c916cd95d0bb33a35f0a5bdfbc346790ede577eb SHA1 f9aa7964175924d9aa1a6c737f76a3b8ec17a0a1 SHA256 346c210a311bf01c11c2cb748a1aeaac2ac1facc33ab488a544369cc0bc46102
 EBUILD hibernate-3.1.3-r1.ebuild 1815 RMD160 27299f587c617cfdeb9fe6e00325b88f328881f9 SHA1 d7c673a2ebba959e56e95a8ec14de8f42e695a79 SHA256 447d9ed017cb3faa73acb7f6c0e9b80b95f7e3534ed12a4b67ee384dc7f51bf8
 EBUILD hibernate-3.1.3.ebuild 2063 RMD160 9d7c368d7f020d6dfbf93ca2f50fb9a65ee2bb2a SHA1 0840bef07aa4bcca05d525ca50bca370ff03b833 SHA256 a82b869b63a96a795e5d6cc1f86a591acac1ebaccefe060e408ce75cf099e983
-MISC ChangeLog 5581 RMD160 f45768a17db42b1982ae2272001606dac3767d1f SHA1 b14738695391c10d531b8c58d1356a736c7ca29f SHA256 3544e9d4ca5f7e1b88a2dfca1a2c9420f1ad94ab2dda6f7a7d456807e5c0f330
+MISC ChangeLog 5730 RMD160 90ae8a968cb3f25e61cad383f205f810bf38bd70 SHA1 6719167b7ca34609b3ee0a1574c1d94e943d300c SHA256 a1ecdc4a09be5d1bdf369e7ad870b89c4afce9145dea0673d1bc6c364bcca78a
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkiQueEACgkQcxLzpIGCsLRzlwCeNlkJepvR8lrG1865nEpHZPnL
-3V8AnjGDur8cj4ULG4hb/TbVTtWVoHPF
-=Yamc
+iEYEARECAAYFAkiWK5EACgkQcxLzpIGCsLQL0wCbBAUlEoiaacKgbiBeuVyDhYPf
+THoAn0zgNLEEzVCnoh3YP9Zr+BYO+o/S
+=PPwH
 -----END PGP SIGNATURE-----
diff --git a/dev-java/hibernate/hibernate-3.0.5-r2.ebuild b/dev-java/hibernate/hibernate-3.0.5-r2.ebuild
deleted file mode 100644
index f1cc110539fe..000000000000
--- a/dev-java/hibernate/hibernate-3.0.5-r2.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# 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.6 2007/11/02 10:40:55 betelgeuse Exp $
-
-WANT_ANT_TASKS="ant-antlr ant-swing ant-junit"
-
-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/ant-core
-	=dev-java/antlr-2*
-	=dev-java/asm-2.0*
-	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
-		${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 -v *.jar || die
-
-	local JAR_PACKAGES="ant-core antlr asm-2 c3p0 commons-collections
-		commons-logging dom4j-1 ehcache jaxen-1.1 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
-
-}
-
-EANT_EXTRA_ARGS="-Ddist.dir=dist"
-
-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
-}