Removed java5 use flag because the sources use enum and as such the ebuild complecity...

Package-Manager: portage-2.1.2_rc4-r7

diff --git a/dev-java/proxool/ChangeLog b/dev-java/proxool/ChangeLog
index 64ebca62588f3f92068086cb00be5651f6f1c72c..dbd8dba9b7c2cfc3c570b0dd1d8ad3bbf5573fa9 100644 (file)
--- a/dev-java/proxool/ChangeLog
+++ b/dev-java/proxool/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/proxool
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/proxool/ChangeLog,v 1.6 2007/01/11 14:26:22 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/proxool/ChangeLog,v 1.7 2007/01/11 21:15:31 betelgeuse Exp $
+
+  12 Jan 2007; Petteri Räty <betelgeuse@gentoo.org>
+  proxool-0.8.3-r1.ebuild:
+  Removed java5 use flag because the sources use enum and as such the ebuild
+  complecity does not justify the use flag. mx4j-core hard dep will be removed
+  when we one day have virtuals for java packages.
 
 *proxool-0.8.3-r1 (11 Jan 2007)
 

diff --git a/dev-java/proxool/Manifest b/dev-java/proxool/Manifest
index 6b21ebbafaa9775751d82426970abf9dea9195c9..8eaf0113cf894ce081f2dc41cb9ec2ae4005367f 100644 (file)
--- a/dev-java/proxool/Manifest
+++ b/dev-java/proxool/Manifest
@@ -2,18 +2,18 @@
 Hash: SHA1
 
 DIST proxool-0.8.3-source.tar.gz 5782824 RMD160 2635e7fb70455ac8d04c48e585a00faba7c91a86 SHA1 9b4c5366a57ab6404cc2e288699195a7b86beda3 SHA256 2de39f0b45b71ba05f5639943a8f59a8bc49a4cc025efd7d1b16b39dfbd0ad11
-EBUILD proxool-0.8.3-r1.ebuild 1511 RMD160 844b21de2c37c356f8573b9f4d9e25b9c3659904 SHA1 2a9e967f95c5ccb1d5b719a4178b3fc8c5e056cf SHA256 d803ba2fdb380118ff03ffd30357a6fe0d4bd411a8f19a17024109bc8de77564
-MD5 bf232e305114c18cdf310d72eccf9006 proxool-0.8.3-r1.ebuild 1511
-RMD160 844b21de2c37c356f8573b9f4d9e25b9c3659904 proxool-0.8.3-r1.ebuild 1511
-SHA256 d803ba2fdb380118ff03ffd30357a6fe0d4bd411a8f19a17024109bc8de77564 proxool-0.8.3-r1.ebuild 1511
+EBUILD proxool-0.8.3-r1.ebuild 1523 RMD160 13a19c77dbf5947bff26f5fee3c2a7320629e6a4 SHA1 15c6859f040a5df2f303da5cc90e06f8e99e7a08 SHA256 892b3b713a09158650a77b0104e016c5adc6863d89b717a42faee1d3f6352f47
+MD5 2f929f2f899617a60cfa4ce5d5ad767a proxool-0.8.3-r1.ebuild 1523
+RMD160 13a19c77dbf5947bff26f5fee3c2a7320629e6a4 proxool-0.8.3-r1.ebuild 1523
+SHA256 892b3b713a09158650a77b0104e016c5adc6863d89b717a42faee1d3f6352f47 proxool-0.8.3-r1.ebuild 1523
 EBUILD proxool-0.8.3.ebuild 971 RMD160 3a0c4aa05e5a0cfdfffcce905df5fd2ca686d494 SHA1 1e04ffd038adf8d3dfbbd83e7828577f3f6c969c SHA256 6392ebbce96085057deb89f168c0595c6ef154e12fd4ea284f031edf8158caa0
 MD5 d303b103d7c2520be3aa7230345c86a6 proxool-0.8.3.ebuild 971
 RMD160 3a0c4aa05e5a0cfdfffcce905df5fd2ca686d494 proxool-0.8.3.ebuild 971
 SHA256 6392ebbce96085057deb89f168c0595c6ef154e12fd4ea284f031edf8158caa0 proxool-0.8.3.ebuild 971
-MISC ChangeLog 1000 RMD160 f28f08d319496ada73a1547df11c7cb695c31e59 SHA1 9bf0a0d21ac324f2a9b093891c86e3758bfb577a SHA256 b704e9919ed35fc01e5cf1e7454a6edfa6f936efb16ed8cbed348c535dde41e7
-MD5 ef58a9e025f3427888f93d6ecedb31a6 ChangeLog 1000
-RMD160 f28f08d319496ada73a1547df11c7cb695c31e59 ChangeLog 1000
-SHA256 b704e9919ed35fc01e5cf1e7454a6edfa6f936efb16ed8cbed348c535dde41e7 ChangeLog 1000
+MISC ChangeLog 1288 RMD160 2b2ef0f17c40fff65dc206915f04fd2da9d2acea SHA1 4329e1b72acb70c1631fa1b94825ce32a98f361a SHA256 2df152c1248a9842b3deb77b0b3ecf564dd544b64030d1c562974242e9129892
+MD5 ff5028f9c2bb1ae9216ebd3a2b9854f0 ChangeLog 1288
+RMD160 2b2ef0f17c40fff65dc206915f04fd2da9d2acea ChangeLog 1288
+SHA256 2df152c1248a9842b3deb77b0b3ecf564dd544b64030d1c562974242e9129892 ChangeLog 1288
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
@@ -27,7 +27,7 @@ SHA256 73d049e904bfec274a6929e7b22b021c3ef17b642c6c16d730bc91242873beaa files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFFpp2KcxLzpIGCsLQRAkKsAJ9fPRieimOBErupy4cxj1YT4mdugwCglhTO
-m/Y1g0UEpTjXDA+KrWlLQfQ=
-=uGM+
+iD8DBQFFpv1ncxLzpIGCsLQRAlKSAJ9Pn6yn27pz1CDhNsPSe0m0g+sjcACdEB7R
+nxxenOSxmE76jUPuSA0rufM=
+=aSE7
 -----END PGP SIGNATURE-----

diff --git a/dev-java/proxool/proxool-0.8.3-r1.ebuild b/dev-java/proxool/proxool-0.8.3-r1.ebuild
index ab44727ccfc92ce42029efbe3ef1b3b0e805dc1f..9602c96536e25c3bdfaa24310882ce90f36e9f20 100644 (file)
--- a/dev-java/proxool/proxool-0.8.3-r1.ebuild
+++ b/dev-java/proxool/proxool-0.8.3-r1.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/proxool/proxool-0.8.3-r1.ebuild,v 1.1 2007/01/11 14:26:22 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/proxool/proxool-0.8.3-r1.ebuild,v 1.2 2007/01/11 21:15:31 betelgeuse Exp $
 
 inherit java-pkg-2 java-ant-2
 
@@ -11,26 +11,26 @@ SRC_URI="mirror://sourceforge/${PN}/${P}-source.tar.gz"
 LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="doc java5 source"
+IUSE="doc source"
 
+# We could add java5 use flag but the sources use enum
+# Making this ebuild quite complex. The mx4j-core dep
+# can be obsoloted by the java virtuals any way.
 COMMON_DEP="
        dev-java/log4j
        =dev-java/servletapi-2.4*
        =dev-java/avalon-framework-4.2*
        =dev-java/avalon-logkit-2*
-       !java5? ( =dev-java/mx4j-core-3* )"
+       =dev-java/mx4j-core-3*"
 
 RDEPEND="
-       java5? ( >=virtual/jre-1.5 )
-       !java5? ( >=virtual/jre-1.4 )
+       >=virtual/jre-1.4
        ${COMMON_DEP}
        "
 
 DEPEND="
+       >=virtual/jdk-1.4
        ${COMMON_DEP}
-       java5? ( >=virtual/jdk-1.5 )
-       !java5? ( >=virtual/jdk-1.4 )
-       >=dev-java/java-config-2.0.31
        dev-java/ant-core
        dev-util/checkstyle
        source? ( app-arch/zip )"
@@ -45,7 +45,7 @@ src_unpack() {
        java-pkg_jar-from servletapi-2.4
        java-pkg_jar-from avalon-framework-4.2
        java-pkg_jar-from avalon-logkit-2.0
-       use java5 || java-pkg_jar-from mx4j-core-3.0
+       java-pkg_jar-from mx4j-core-3.0
 }
 
 src_test() {