dev-java/java-config: bump gentoo to arm

(Portage version: 2.1.9.24/svn/Linux x86_64, RepoMan options: --force) git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/genlink@2703 6952d904-891a-0410-993b-d76249ca496b
2010-11-09 04:33:33 +00:00 · 2010-11-09 04:33:33 +00:00 · f230c6a972
parent 57b2f23929
commit f230c6a972
7 changed files with 161 additions and 6 deletions
--- a/dev-java/java-config/ChangeLog
+++ b/dev-java/java-config/ChangeLog
@ -2,6 +2,15 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/dev-java/java-config/ChangeLog,v 1.235 2009/12/28 21:50:55 arfrever Exp $

+*java-config-2.1.11-r2 (09 Nov 2010)
+*java-config-2.1.11-r1 (09 Nov 2010)
+
+  09 Nov 2010; Mario Fetka <mario.fetka@gmail.com>
+  java-config-2.1.10.ebuild, java-config-2.1.11.ebuild,
+  +java-config-2.1.11-r1.ebuild, +java-config-2.1.11-r2.ebuild,
+  +files/java-config-2.1.11-python3.patch:
+  bump gentoo to arm
+
  25 Sep 2010; Mario Fetka <mario.fetka@gmail.com>
  java-config-2.1.10.ebuild, java-config-2.1.11.ebuild:
  bump and add arm support
--- a/dev-java/java-config/Manifest
+++ b/dev-java/java-config/Manifest
@ -1,7 +1,10 @@
+AUX java-config-2.1.11-python3.patch 525 RMD160 8a9a9693ea2d9e7a77b4a6803ad627a2bbaf3f5c SHA1 7c483602718877ab11d1793d99b6a16458264a4c SHA256 fbcc731ea0bca626855212f9e1af5fcda538743e5f23e0229a5bbfbd56c619a8
 AUX jdk-defaults-arm.conf 71 RMD160 5d2cbc1a4300baf05c871a0991b46a9c1685ad40 SHA1 4f52ddda48a478ec1747695478d1bfe09693a4f9 SHA256 bd6791555fc860455531da04226adf700f30d227ff8e478c4a294e4b5c87b454
 DIST java-config-2.1.10.tar.bz2 45507 RMD160 55fc34441a1553035c3e4ae674756df494a1705a SHA1 e78a8032a436a63a583960fe85bd5396144f8a97 SHA256 d0afa1279a2bf91a307e54a78227fe413aad12c1a1beaac4ee90b39cc1485ba5
 DIST java-config-2.1.11.tar.bz2 60763 RMD160 35f62025fe9843769fe164d9bb50419fd2fc7e34 SHA1 df62f76957343108d1b27687132958853434982c SHA256 ffc90aac716f6edc2f99f70e4947eab606e3a70dadb90328dedda16345796bbe
-EBUILD java-config-2.1.10.ebuild 1403 RMD160 e71cffda6680b5b06ec770b491da7762c4bae5ff SHA1 afe64ec555f1061300ff8a9354a0d90a7b1f32a0 SHA256 558363f502a4855b1e2583eff011743d528cd70004e83f8323f36b0b4be7a513
-EBUILD java-config-2.1.11.ebuild 1322 RMD160 10fbf1f78cc3c506a486ae81a362fcc350b98d08 SHA1 f70d220c85b5db87ab60aef4932c2ca43cf7dde0 SHA256 792faa33008cf20b6404f7c4186138628e0c79e5360de508b344856e21cf8789
-MISC ChangeLog 41004 RMD160 a6726d952ebe8c2eff8374c106500d94a744b953 SHA1 43d8e36eefb17b14cdb8026c188b3331ab035077 SHA256 bbeac7e3bafe331e2f7b2612bf56745edd4f6fd82f7f16bdbd87d2b64402f50a
+EBUILD java-config-2.1.10.ebuild 1429 RMD160 46e6bb8565d11def6faf4bee292a7b97aba729da SHA1 1121c0c529a2a9f2ff6196d1fbb75e03b4c4d1f5 SHA256 be860a8c873626d5b70102a3f104a8be9ae9d85df2617104fd35613fe870e23b
+EBUILD java-config-2.1.11-r1.ebuild 1424 RMD160 d6870401af89d87373087ed2a6d17992f62bd908 SHA1 f2398b605b8e08261fd2f28fa4a107c4364933f8 SHA256 506056e62f3d47132772228115a047ef7556728a66ad713cada1a63c969ed1c8
+EBUILD java-config-2.1.11-r2.ebuild 1464 RMD160 ff85d59a0f1c58c381e413e5486f036c0c5dbd88 SHA1 e4173fa50db072374ceeec326632814b86e982ab SHA256 b558cce72e5dcd54b029705c8e9c88c22481db80b2a600085daa63ba935106c2
+EBUILD java-config-2.1.11.ebuild 1347 RMD160 065dc613d934857fda5dbd975569e1742bd3f123 SHA1 fbc85d01853d88c21992d7c30d6c5b1c32eb0daa SHA256 86899c0ab1bf0ed6e972a0bd7dc37f39c44cb4579472736e859b4bee557f116d
+MISC ChangeLog 41315 RMD160 20de6ac8ba28f87981be9567c1009cfc21e09c3a SHA1 d3e49d2fb4423707f515c3202b5fcfc38893de5f SHA256 a123496a6f39f25635a8bc5259a02e1d40b758ac9e9e58196b9ac5be17d48c2f
 MISC metadata.xml 482 RMD160 b060f8a2492170d8513e1b2d03512d8b565b5045 SHA1 b154d3e425be12942f183a7ad1a37fecc215e4b4 SHA256 f80d3cd5afabd0dc4d177925c3715c464288e5ec3ed1ca809a7f7a66ee3907a5
--- a/dev-java/java-config/files/java-config-2.1.11-python3.patch
+++ b/dev-java/java-config/files/java-config-2.1.11-python3.patch
@ -0,0 +1,22 @@
+http://overlays.gentoo.org/proj/java/changeset/8184
+
+--- src/gjl
+++ src/gjl
+@@ -23,7 +23,7 @@
+ 
+ #Depreciated.
+ def get_needed_target(pkg):
+-    highest_target = None
+    highest_target = ""
+     needs_jdk = False
+     for pkg in get_needed_packages(pkg):
+         pkg_needs_jdk = False
+@@ -43,7 +43,7 @@
+     return highest_target, needs_jdk
+ 
+ def get_needed_target2(pkg):
+-    highest_target = None
+    highest_target = ""
+     needs_jdk = set()
+     for pkg in get_needed_packages(pkg):
+         target = pkg.target()
--- a/dev-java/java-config/java-config-2.1.10.ebuild
+++ b/dev-java/java-config/java-config-2.1.10.ebuild
@ -14,7 +14,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"

 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm ia64 ppc ppc64 x86 ~x86-fbsd"
 IUSE=""

 DEPEND=""
@ -26,8 +26,9 @@ RESTRICT_PYTHON_ABIS="3.*"
 PYTHON_MODNAME="java_config_2"

 src_prepare() {
+	distutils_src_prepare
 	sed -e "s/if not self.dry_run/& and not os.path.exists(s)/" -i setup.py || die "sed failed"
-	cp ${FILESDIR}/*.conf config
+	cp "${FILESDIR}/*.conf config"
 }

 src_test() {
--- a/dev-java/java-config/java-config-2.1.11-r1.ebuild
+++ b/dev-java/java-config/java-config-2.1.11-r1.ebuild
@ -0,0 +1,59 @@
+# 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-r1.ebuild,v 1.2 2010/11/08 11:59:25 phajdan.jr Exp $
+
+EAPI="2"
+PYTHON_DEPEND="*:2.6"
+SUPPORT_PYTHON_ABIS="1"
+
+inherit fdo-mime gnome2-utils distutils eutils
+
+DESCRIPTION="Java environment configuration tool"
+HOMEPAGE="http://www.gentoo.org/proj/en/java/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND=""
+RDEPEND=">=dev-java/java-config-wrapper-0.15"
+# https://bugs.gentoo.org/show_bug.cgi?id=315229
+PDEPEND=">=virtual/jre-1.5"
+# Tests fail when java-config isn't already installed.
+RESTRICT="test"
+RESTRICT_PYTHON_ABIS="2.4 2.5"
+
+PYTHON_MODNAME="java_config_2"
+
+src_prepare() {
+	distutils_src_prepare
+	cp "${FILESDIR}/*.conf config"
+}
+
+src_test() {
+	testing() {
+		PYTHONPATH="build-${PYTHON_ABI}/lib" "$(PYTHON)" src/run-test-suite.py
+	}
+	python_execute_function testing
+}
+
+src_install() {
+	distutils_src_install
+
+	insinto /usr/share/java-config-2/config/
+	newins config/jdk-defaults-${ARCH}.conf jdk-defaults.conf || die "arch config not found"
+}
+
+pkg_postrm() {
+	distutils_pkg_postrm
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postinst() {
+	distutils_pkg_postinst
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
--- a/dev-java/java-config/java-config-2.1.11-r2.ebuild
+++ b/dev-java/java-config/java-config-2.1.11-r2.ebuild
@ -0,0 +1,60 @@
+# 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-r2.ebuild,v 1.1 2010/11/08 18:38:18 arfrever Exp $
+
+EAPI="2"
+PYTHON_DEPEND="*:2.6"
+SUPPORT_PYTHON_ABIS="1"
+
+inherit distutils eutils fdo-mime gnome2-utils
+
+DESCRIPTION="Java environment configuration tool"
+HOMEPAGE="http://www.gentoo.org/proj/en/java/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND=""
+RDEPEND=">=dev-java/java-config-wrapper-0.15"
+# https://bugs.gentoo.org/show_bug.cgi?id=315229
+PDEPEND=">=virtual/jre-1.5"
+# Tests fail when java-config isn't already installed.
+RESTRICT="test"
+RESTRICT_PYTHON_ABIS="2.4 2.5"
+
+PYTHON_MODNAME="java_config_2"
+
+src_prepare() {
+	distutils_src_prepare
+	epatch "${FILESDIR}/${P}-python3.patch"
+	cp "${FILESDIR}/*.conf config"
+}
+
+src_test() {
+	testing() {
+		PYTHONPATH="build-${PYTHON_ABI}/lib" "$(PYTHON)" src/run-test-suite.py
+	}
+	python_execute_function testing
+}
+
+src_install() {
+	distutils_src_install
+
+	insinto /usr/share/java-config-2/config/
+	newins config/jdk-defaults-${ARCH}.conf jdk-defaults.conf || die "arch config not found"
+}
+
+pkg_postrm() {
+	distutils_pkg_postrm
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postinst() {
+	distutils_pkg_postinst
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
--- a/dev-java/java-config/java-config-2.1.11.ebuild
+++ b/dev-java/java-config/java-config-2.1.11.ebuild
@ -26,7 +26,8 @@ RESTRICT_PYTHON_ABIS="2.4 2.5"
 PYTHON_MODNAME="java_config_2"

 src_prepare() {
-	cp ${FILESDIR}/*.conf config
+	distutils_src_prepare
+	cp "${FILESDIR}/*.conf config"
 }

 src_test() {