Update 2.1.11 based on suggestions from Arfrever.

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

diff --git a/dev-java/java-config/ChangeLog b/dev-java/java-config/ChangeLog
index 48d9f12dcb8571901a36af1dd96f31fe9cfebf41..d4c1d03de257b01291da1c30437e9521f6dbbefe 100644 (file)
--- a/dev-java/java-config/ChangeLog
+++ b/dev-java/java-config/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/java-config
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/java-config/ChangeLog,v 1.241 2010/04/28 11:50:52 ali_bush Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-config/ChangeLog,v 1.242 2010/04/28 12:05:35 ali_bush Exp $
+
+  29 Apr 2010; Alistair Bush <ali_bush@gentoo.org>
+  java-config-2.1.11.ebuild:
+  Update 2.1.11 based on suggestions from Arfrever.
 
 *java-config-2.1.11 (28 Apr 2010)
 

diff --git a/dev-java/java-config/Manifest b/dev-java/java-config/Manifest
index bd36703fcac0d9da453f7af782c7150289e35a0f..0994efdf24a5124203b9c47db6949a924547b699 100644 (file)
--- a/dev-java/java-config/Manifest
+++ b/dev-java/java-config/Manifest
@@ -9,9 +9,9 @@ DIST java-config-2.1.8.tar.bz2 56913 RMD160 d16f8ae852580ee26644c086c12d1ca81e30
 DIST java-config-2.1.9.tar.bz2 56757 RMD160 08e2cb147681fd71100aa40f892e8a71c503f256 SHA1 9a5c333ac0401d247969910e8165d77eeee86f7a SHA256 0d2ed065225474f030d63e51812b525781ec3325a5297da81c22a27e4d4a7778
 EBUILD java-config-1.3.7-r1.ebuild 1307 RMD160 9e2e1045e452bd4afd834fff437495d5d4c02e05 SHA1 b1f4850230c446a7f39033542707b9b4fe9496c1 SHA256 72ad16124c942d97ad0042c51b61747503b57fc5cc99223426e1d84035a6a0c6
 EBUILD java-config-2.1.10.ebuild 1373 RMD160 1ed799496e1473e04ba6ce3dfe46a8afa7424700 SHA1 c711ae1fbd96de480303ba373d80519670ebcb72 SHA256 492af964bbbf398e105f925c7ebc4c80713fd33a9e605b117badd6f48f3caf75
-EBUILD java-config-2.1.11.ebuild 1380 RMD160 d11349393574f02686cd85267fafc0d2d7c09632 SHA1 799bff959624ea67fbdfbc721705720dfb0a7f6e SHA256 f591f307d7c77df067989fb32277a396e0900a2216673d527694ab0b57e0a7ac
+EBUILD java-config-2.1.11.ebuild 1276 RMD160 b9b2966861b93618d3af3486774ebbbc23bfa4f8 SHA1 de4c27ece4049fa7a0ff6584f9ddf323c2cd575e SHA256 20396656312831bf2759e433b245704023a96fb03ea44b8d405b882567f7050a
 EBUILD java-config-2.1.8-r1.ebuild 1100 RMD160 9c2cdf3be8f0c4657bba57e8bee3b110139cabf0 SHA1 6eb468fc29d4a2f6f3f065cc9475c2f067ffb261 SHA256 34b0464f1513ba884ca830f748bb5aa6b9f7ffac8c0280a38090289a30a1ca97
 EBUILD java-config-2.1.9-r1.ebuild 1086 RMD160 69cac90e3adc54815cbfc35f3446e422bfb9c904 SHA1 3ea1dbcc00f94e969b31e2936c5900f949e4c58f SHA256 71b615aef705ebf77190551496fd20431e436c2b95bbe4c8db7bdc681048512f
 EBUILD java-config-2.1.9-r2.ebuild 1125 RMD160 df2e99dd49e7a4cae8d9596d5b55909f5d896ce0 SHA1 edd29e0e0746d2b1791ad4cf5f16bd90ede121d7 SHA256 e51552023b80b625563113bd3ac51f999fedbf8dfb07f65e7da07c8eedd13619
-MISC ChangeLog 41281 RMD160 1212c7f48e1bedf647310c4835c166f6613a5cdc SHA1 64366fdbb7825552055b4ab49b14c0f63a74b2e0 SHA256 a4f46b3ad65d72eb9d7c23ddb636911675055042929e554a44cb90f1b9889001
+MISC ChangeLog 41414 RMD160 8b70ca06bdd012b8d11bfb6fe67219366255e931 SHA1 3828ff648bdfc435fb4b18f7d8b68f32ba0839b2 SHA256 8018bb8fb30d5e623d56622320023e78737947ba4dd5de9565ed9b166b3126dc
 MISC metadata.xml 482 RMD160 b060f8a2492170d8513e1b2d03512d8b565b5045 SHA1 b154d3e425be12942f183a7ad1a37fecc215e4b4 SHA256 f80d3cd5afabd0dc4d177925c3715c464288e5ec3ed1ca809a7f7a66ee3907a5

diff --git a/dev-java/java-config/java-config-2.1.11.ebuild b/dev-java/java-config/java-config-2.1.11.ebuild
index b4b47221b3459f3375015eb8ab45baccb78a6314..42684b87a20368e11ed3c60a62b717bf8ea7fcca 100644 (file)
--- a/dev-java/java-config/java-config-2.1.11.ebuild
+++ b/dev-java/java-config/java-config-2.1.11.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/java-config/java-config-2.1.11.ebuild,v 1.1 2010/04/28 11:50:52 ali_bush Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-config/java-config-2.1.11.ebuild,v 1.2 2010/04/28 12:05:35 ali_bush Exp $
 
 EAPI="2"
-NEED_PYTHON="2.4"
+PYTHON_DEPEND="*:2.6"
 SUPPORT_PYTHON_ABIS="1"
 
 inherit fdo-mime gnome2-utils distutils eutils
@@ -21,14 +21,10 @@ DEPEND=""
 RDEPEND=">=dev-java/java-config-wrapper-0.15"
 # Tests fail when java-config isn't already installed.
 RESTRICT="test"
-RESTRICT_PYTHON_ABIS="3.*"
+RESTRICT_PYTHON_ABIS="2.4 2.5"
 
 PYTHON_MODNAME="java_config_2"
 
-src_prepare() {
-       sed -e "s/if not self.dry_run/& and not os.path.exists(s)/" -i setup.py || die "sed failed"
-}
-
 src_test() {
        testing() {
                PYTHONPATH="build-${PYTHON_ABI}/lib" "$(PYTHON)" src/run-test-suite.py