move dev-java/jmx dev-java/sun-jmx, removed some use flags, only way i could get...

Package-Manager: portage-2.0.53_rc5

diff --git a/dev-java/hibernate/ChangeLog b/dev-java/hibernate/ChangeLog
index d0721343317e19419ca29016c45f1f0c2e36b6d0..6bfa932f73fa06a3acb843d9ec6bb80ed4f8724c 100644 (file)
--- a/dev-java/hibernate/ChangeLog
+++ b/dev-java/hibernate/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/hibernate
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/hibernate/ChangeLog,v 1.20 2005/07/31 05:22:31 st_lim Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/hibernate/ChangeLog,v 1.21 2005/10/15 11:38:44 axxo Exp $
+
+  15 Oct 2005; Thomas Matthijs <axxo@gentoo.org> hibernate-2.1.8.ebuild,
+  hibernate-3.0_rc1.ebuild:
+  move dev-java/jmx dev-java/sun-jmx, removed some use flags, only way i could
+  get it too build, and st_lim doesnt seem to be fixing it
 
   31 Jul 2005; Lim Swee Tat <st_lim@gentoo.org> hibernate-2.1.8.ebuild:
   Updated and fixed 2.1.8

diff --git a/dev-java/hibernate/Manifest b/dev-java/hibernate/Manifest
index 7aaaa69954b06855851f0e40aadd00316628f7d3..c3b2b36e24d25c38fbac694d174d31e29fcd94f2 100644 (file)
--- a/dev-java/hibernate/Manifest
+++ b/dev-java/hibernate/Manifest
@@ -1,6 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 c095131cadc15351faea6d1e4b402a39 ChangeLog 2981
 MD5 b442a0c8138baf4b3737d0a382cfe360 files/digest-hibernate-2.1.8 69
 MD5 e5aa0a8633b0ef9e280d35213fd5254f files/digest-hibernate-3.0_rc1 70
 MD5 3b4b85e4f98e74c162e6782e0286d78d hibernate-2.1.8.ebuild 3631
 MD5 f51a9001024cf1ea8019b5a4f2628fb5 hibernate-3.0_rc1.ebuild 3669
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDUOpa/rLF9B432nYRAij3AKCStVDOT7fHHT/K8c4A6a7P5qM+hgCglVyu
+D/PU63OzPFhqHk6GCbeLEXQ=
+=RkoB
+-----END PGP SIGNATURE-----

diff --git a/dev-java/hibernate/hibernate-2.1.8.ebuild b/dev-java/hibernate/hibernate-2.1.8.ebuild
index d97c591264027af3bf3d1085e4598fee2b5e5eab..d1c86b45bf13f8c4313a66588eb2c9176c9b52de 100644 (file)
--- a/dev-java/hibernate/hibernate-2.1.8.ebuild
+++ b/dev-java/hibernate/hibernate-2.1.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/hibernate/hibernate-2.1.8.ebuild,v 1.9 2005/10/01 08:21:37 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/hibernate/hibernate-2.1.8.ebuild,v 1.10 2005/10/15 11:38:44 axxo Exp $
 
 inherit java-pkg
 
@@ -32,7 +32,7 @@ RDEPEND=">=virtual/jre-1.4
                )
                jboss? (
                        >=www-servers/jboss-3.2.5
-                       dev-java/jmx
+                       dev-java/sun-jmx
                )
                proxool? (
                        dev-java/proxool
@@ -96,7 +96,7 @@ src_unpack() {
                JBOSSHOME=`java-config -p jboss | sed -e "s/\/client.*$//g"`
                ln -sf ${JBOSSHOME}/server/all/lib/jboss-cache.jar
                ln -sf ${JBOSSHOME}/lib/jboss-system.jar
-               java-pkg_jar-from jmx
+               java-pkg_jar-from sun-jmx
                if ! [ -r jboss-cache.jar ] ; then
                        eerror "The JBoss JARs are not readable.  Most likely, the "
                        eerror "/var/lib/jboss directory is not traverseable  by the "

diff --git a/dev-java/hibernate/hibernate-3.0_rc1.ebuild b/dev-java/hibernate/hibernate-3.0_rc1.ebuild
index 67a324e7ee2d8eb32a990cc33df1708d708ec405..a1d2947e6b36d425b9c723eca57f7eab3bbac996 100644 (file)
--- a/dev-java/hibernate/hibernate-3.0_rc1.ebuild
+++ b/dev-java/hibernate/hibernate-3.0_rc1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/hibernate/hibernate-3.0_rc1.ebuild,v 1.8 2005/07/18 14:57:41 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/hibernate/hibernate-3.0_rc1.ebuild,v 1.9 2005/10/15 11:38:44 axxo Exp $
 
 inherit java-pkg
 
@@ -14,7 +14,7 @@ KEYWORDS="~x86 ~amd64"
 RDEPEND="
                >=virtual/jre-1.4
 
-               =dev-java/cglib-2*
+               =dev-java/cglib-2.0*
                dev-java/commons-collections
                dev-java/commons-logging
                dev-java/concurrent-util
@@ -24,23 +24,20 @@ RDEPEND="
                dev-java/odmg
                dev-java/proxool
 
-               c3p0? (
-                       dev-java/c3p0
-               )
+               dev-java/c3p0
+
                dbcp? (
                        dev-java/commons-pool
                        dev-java/commons-dbcp
                )
                jboss? (
                        >=www-servers/jboss-3.2.5
-                       dev-java/jmx
+                       dev-java/sun-jmx
                )
                jcs? (
                        dev-java/jcs-bin
                )
-               oscache? (
                        dev-java/oscache
-               )
                swarmcache? (
                        dev-java/swarmcache
                )
@@ -78,11 +75,11 @@ src_unpack() {
        java-pkg_jar-from proxool
 
        # c3p0 support
-       if use c3p0 ; then
+       #if use c3p0 ; then
                java-pkg_jar-from c3p0
-       else
-               find ${S}/src -name "C3P0*" -exec rm {} \;
-       fi
+       #else
+       #       find ${S}/src -name "C3P0*" -exec rm {} \;
+       #fi
 
        # DBCP support
        if use dbcp ; then
@@ -97,7 +94,7 @@ src_unpack() {
                JBOSSHOME=`java-config -p jboss | sed -e "s/\/client.*$//g"`
                ln -sf ${JBOSSHOME}/server/all/lib/jboss-cache.jar
                ln -sf ${JBOSSHOME}/lib/jboss-system.jar
-               java-pkg_jar-from jmx
+               java-pkg_jar-from sun-jmx
                if ! [ -r jboss-cache.jar ] ; then
                        eerror "The JBoss JARs are not readable.  Most likely, the "
                        eerror "/var/lib/jboss directory is not traverseable  by the "
@@ -124,11 +121,11 @@ src_unpack() {
 
 
        # OSCache support
-       if use oscache ; then
+       #if use oscache ; then
                java-pkg_jar-from oscache
-       else
-               find ${S}/src -name "OSCache*" -exec rm {} \;
-       fi
+       #else
+       #       find ${S}/src -name "OSCache*" -exec rm {} \;
+       #fi
 
        # SwarmCache support
        if use swarmcache ; then