bump

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

4 files changed, 222 insertions, 13 deletions

diff --git a/dev-java/sun-j2me-bin/ChangeLog b/dev-java/sun-j2me-bin/ChangeLog
index 552218755133..c68964a01f4a 100644
--- a/dev-java/sun-j2me-bin/ChangeLog
+++ b/dev-java/sun-j2me-bin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/sun-j2me-bin
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-j2me-bin/ChangeLog,v 1.10 2009/11/25 09:55:53 maekke Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-j2me-bin/ChangeLog,v 1.11 2010/05/13 21:13:34 mabi Exp $
+
+*sun-j2me-bin-2.5.2.01 (13 May 2010)
+
+  13 May 2010; <mabi@gentoo.org> +sun-j2me-bin-2.5.2.01.ebuild,
+  +files/java-config.patch:
+  bump (bug #209396), thanks to Ciprian Ciubotariu et.al.
 
   25 Nov 2009; Markus Meier <maekke@gentoo.org> sun-j2me-bin-2.2-r3.ebuild:
   amd64 stable, bug #284298
diff --git a/dev-java/sun-j2me-bin/Manifest b/dev-java/sun-j2me-bin/Manifest
index e70757ba21b2..a1cf1573f387 100644
--- a/dev-java/sun-j2me-bin/Manifest
+++ b/dev-java/sun-j2me-bin/Manifest
@@ -1,15 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX java-config.patch 2604 RMD160 7744d9c58e16af2170778ceaaf39b181dc968f99 SHA1 02a6a67bbe8e51791bef3fe8730f98cf3f0ad1d5 SHA256 4c217155d2c5794d3f2197b023d4b26840daf02dfc714499d9f811de51f5abd2
 DIST j2me_wireless_toolkit-2_2-linux-i386.bin 17637106 RMD160 2ab276d41a6e20476b51ec80279ef6fd0019de5b SHA1 fa9888ab2a7486be1b168e395e0aa40ca0103f14 SHA256 4480bea914a4537ea81a5a70c517f91aa5a567915f470e70e050c332bfdd4d34
 DIST j2me_wireless_toolkit-2_2-update_2-linux.zip 1537734 RMD160 244ba6ba2fd35338546261d73cfb9e46372293d8 SHA1 69da3cd58c385c43aef43866c4d33e3a85625b84 SHA256 cdb17207c4eb15110ccc5222202f0043ac74237aab8c8b9f45abda2e0f449662
+DIST sun_java_wireless_toolkit-2.5.2_01-linuxi486.bin.sh 39797585 RMD160 fdd26ddb177d27a5dceb6de75bd406dc154659e9 SHA1 b1c39419c6ab3d30c04793a89df1f435af0bedd0 SHA256 416ea8c8dc56e3563fc92e89bb9dde243662272bc4c88121d8fc1074044b4bb2
 EBUILD sun-j2me-bin-2.2-r3.ebuild 2821 RMD160 922fd34a6ac22246f209d4f20dad51f0f1d1bbb5 SHA1 ed3905870bc00514c05d067256637242656734da SHA256 295e30a38257117fc6ce4142f20030cd48274d8c01d1ce8d307f1f07f3a718b6
-MISC ChangeLog 1651 RMD160 8cae3cde0bff979b6407f76523a792030c79f6e9 SHA1 e9a3dbb5ea40be7807bc624fdf6d617cebc2efdb SHA256 b5c76cef38edb5cdbf23a45526fb55cc47713c5fbfc212a53ab7d9e41da55177
+EBUILD sun-j2me-bin-2.5.2.01.ebuild 2714 RMD160 5b0d087d078879a5c0b9a345fd2b69aeef3020a8 SHA1 fb742a0e87abe9dc9a9409fee3e468b5bf8adbb5 SHA256 8b9d61bccea68033d73863f731ec12a0bf72f8bed29c84246934916092fea0b7
+MISC ChangeLog 1838 RMD160 3a627d9f78bfa9a4c34e57eaf1a6e26db5b5a91a SHA1 1063e0658b0c809536293e6f860a0beafdc20743 SHA256 4f09f24833aac9a23516886fb07d181c3f6697cfd40401295f5f635e564172bf
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAksM/zkACgkQkKaRLQcq0GLazgCbBCp8N6ohqvS0rX1QEDH1fxbU
-z3UAoLWs6D1GKIM2g5DDYjG0si0CMUda
-=ry1y
------END PGP SIGNATURE-----
diff --git a/dev-java/sun-j2me-bin/files/java-config.patch b/dev-java/sun-j2me-bin/files/java-config.patch
new file mode 100644
index 000000000000..6905b9fc207d
--- /dev/null
+++ b/dev-java/sun-j2me-bin/files/java-config.patch
@@ -0,0 +1,101 @@
+--- bin/ktoolbar	2008-02-08 19:49:45.000000000 +0100
++++ bin/ktoolbar	2008-02-08 20:19:57.000000000 +0100
+@@ -1,6 +1,10 @@
+ #!/bin/sh
+ 
+-javapathtowtk=`java-config --jdk-home`"/bin/"
++if [ "`uname -m`" = "x86_64" ]; then
++	javapathtowtk=`java-config --select-vm=emul-linux-x86-java --jdk-home`"/bin/"
++else
++	javapathtowtk=`java-config --jdk-home`"/bin/"
++fi
+ 
+ PRG=$0
+ 
+--- bin/prefs		2008-02-08 19:49:45.000000000 +0100
++++ bin/prefs		2008-02-08 20:19:57.000000000 +0100
+@@ -1,6 +1,10 @@
+ #!/bin/sh
+ 
+-javapathtowtk=`java-config --jdk-home`"/bin/"
++if [ "`uname -m`" = "x86_64" ]; then
++	javapathtowtk=`java-config --select-vm=emul-linux-x86-java --jdk-home`"/bin/"
++else
++	javapathtowtk=`java-config --jdk-home`"/bin/"
++fi
+ 
+ PRG=$0
+
+--- bin/utils	2008-02-08 19:49:45.000000000 +0100
++++ bin/utils	2008-02-08 20:19:57.000000000 +0100
+@@ -1,6 +1,10 @@
+ #!/bin/sh
+ 
+-javapathtowtk=`java-config --jdk-home`"/bin/"
++if [ "`uname -m`" = "x86_64" ]; then
++	javapathtowtk=`java-config --select-vm=emul-linux-x86-java --jdk-home`"/bin/"
++else
++	javapathtowtk=`java-config --jdk-home`"/bin/"
++fi
+ 
+ PRG=$0
+
+--- bin/wscompile	2008-02-08 19:49:45.000000000 +0100
++++ bin/wscompile	2008-02-08 20:19:57.000000000 +0100
+@@ -1,6 +1,10 @@
+ #!/bin/sh
+ 
+-javapathtowtk=`java-config --jdk-home`"/bin/"
++if [ "`uname -m`" = "x86_64" ]; then
++	javapathtowtk=`java-config --select-vm=emul-linux-x86-java --jdk-home`"/bin/"
++else
++	javapathtowtk=`java-config --jdk-home`"/bin/"
++fi
+ 
+ PRG=$0
+ 
+
+--- bin/mekeytool	2008-02-08 19:49:45.000000000 +0100
++++ bin/mekeytool	2008-02-08 20:19:57.000000000 +0100
+@@ -1,6 +1,10 @@
+ #!/bin/sh
+ 
+-javapathtowtk=`java-config --jdk-home`"/bin/"
++if [ "`uname -m`" = "x86_64" ]; then
++	javapathtowtk=`java-config --select-vm=emul-linux-x86-java --jdk-home`"/bin/"
++else
++	javapathtowtk=`java-config --jdk-home`"/bin/"
++fi
+ 
+ PRG=$0
+ 
+--- bin/emulator	2008-02-08 19:49:45.000000000 +0100
++++ bin/emulator	2008-02-08 20:19:57.000000000 +0100
+@@ -1,6 +1,10 @@
+ #!/bin/sh
+ 
+-javapathtowtk=`java-config --jdk-home`"/bin/"
++if [ "`uname -m`" = "x86_64" ]; then
++	javapathtowtk=`java-config --select-vm=emul-linux-x86-java --jdk-home`"/bin/"
++else
++	javapathtowtk=`java-config --jdk-home`"/bin/"
++fi
+ 
+ PRG=$0
+ 
+
+--- bin/defaultdevice		2008-02-08 19:49:45.000000000 +0100
++++ bin/defaultdevice		2008-02-08 20:19:57.000000000 +0100
+@@ -1,6 +1,10 @@
+ #!/bin/sh
+ 
+-javapathtowtk=`java-config --jdk-home`"/bin/"
++if [ "`uname -m`" = "x86_64" ]; then
++	javapathtowtk=`java-config --select-vm=emul-linux-x86-java --jdk-home`"/bin/"
++else
++	javapathtowtk=`java-config --jdk-home`"/bin/"
++fi
+ 
+ PRG=$0
+ 
+
diff --git a/dev-java/sun-j2me-bin/sun-j2me-bin-2.5.2.01.ebuild b/dev-java/sun-j2me-bin/sun-j2me-bin-2.5.2.01.ebuild
new file mode 100644
index 000000000000..940b3105a611
--- /dev/null
+++ b/dev-java/sun-j2me-bin/sun-j2me-bin-2.5.2.01.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-j2me-bin/sun-j2me-bin-2.5.2.01.ebuild,v 1.1 2010/05/13 21:13:34 mabi Exp $
+
+inherit java-pkg-2
+
+DESCRIPTION="Java 2 Micro Edition Wireless Toolkit for developing wireless applications"
+HOMEPAGE="http://java.sun.com/products/j2mewtoolkit/"
+
+DOWNLOAD_URL="http://java.sun.com/products/sjwtoolkit/download.html"
+BINARY="sun_java_wireless_toolkit-2.5.2_01-linuxi486.bin.sh"
+
+SRC_URI="${BINARY}"
+LICENSE="sun-bcla-j2me"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples"
+RESTRICT="fetch"
+
+COMMON_DEP="
+	dev-java/sun-jaf
+	dev-java/sun-javamail
+	dev-java/xsdlib"
+RDEPEND="${COMMON_DEP}
+	>=virtual/jdk-1.4.2
+	amd64? ( app-emulation/emul-linux-x86-java )"
+DEPEND="${COMMON_DEP}
+	app-arch/unzip"
+
+S=${WORKDIR}
+
+MY_FILE=${DISTDIR}/${BINARY}
+
+pkg_nofetch() {
+
+	einfo "Please navigate your browser to"
+	einfo "${DOWNLOAD_URL}"
+	einfo "scroll down and notice the download button."
+	einfo "Click the Download button for J2ME Wireless Toolkit 2.5.2"
+	einfo "and download ${BINARY}"
+	einfo "Put this file to ${DISTDIR} and resume the installation"
+
+}
+
+src_unpack() {
+
+	if [[ ! -r ${MY_FILE} ]]; then
+
+		eerror "cannot read ${A}. Please check the permission and try again."
+		die
+
+	fi
+
+	#extract compressed data and unpack
+	ebegin "Unpacking ${BINARY}"
+	dd bs=2048 if=${MY_FILE} of=install.zip skip=13 2>/dev/null || die
+	unzip install.zip >/dev/null || die
+	eend $?
+	rm install.zip
+
+	#Set the java-bin-path in some scripts
+	for file in ktoolbar emulator mekeytool prefs utils wscompile defaultdevice; do
+		sed -i -e \
+			"s@pathtowtk=\$@pathtowtk=\`java-config --jdk-home\`\"/bin/\"@" \
+			"${WORKDIR}/bin/${file}" || die
+	done
+
+	cd "${S}/bin"
+	rm -f activation.jar mail.jar xsdlib.jar
+
+}
+
+src_compile() {
+	epatch "${FILESDIR}/java-config.patch"
+}
+
+src_install() {
+
+	local DIR=/opt/${P}
+	cd "${WORKDIR}"
+
+	einfo "Copying files"
+	dodir ${DIR}
+	cp -r j2mewtk_template bin lib wtklib "${D}/${DIR}"
+	use examples && cp -r apps "${D}/${DIR}"
+
+	einfo "Setting permissions"
+	chmod 755 "${D}/${DIR}/bin/"* || die
+	chmod 644 "${D}/${DIR}/bin/"*.jar || die
+
+	einfo "Installing documentation"
+	dohtml *.html
+	use doc && java-pkg_dohtml -r docs/*
+
+	cd "${D}/${DIR}/bin"
+	java-pkg_jar-from sun-jaf activation.jar
+	java-pkg_jar-from sun-javamail mail.jar
+	java-pkg_jar-from xsdlib xsdlib.jar
+
+	einfo "Registering jar files"
+	# The zip files are somehow broken and python zip handling errors on them
+	JAVA_PKG_STRICT= java-pkg_regjar \
+		"${D}${DIR}/lib/"*.jar \
+		"${D}${DIR}/wtklib/kenv.zip" \
+		"${D}${DIR}/wtklib/"*.jar
+
+	dodir /usr/bin
+	dosym "${DIR}/bin/ktoolbar" /usr/bin/ktoolbar
+}