Revision bump to use update_2, see bug #140327.

(Portage version: 2.1.1_pre2-r8)
 (Signed Manifest commit)

3 files changed, 15 insertions, 121 deletions

diff --git a/dev-java/sun-j2me-bin/Manifest b/dev-java/sun-j2me-bin/Manifest
index 99557311f366..f9fa191d25f9 100644
--- a/dev-java/sun-j2me-bin/Manifest
+++ b/dev-java/sun-j2me-bin/Manifest
@@ -2,26 +2,26 @@
 Hash: SHA1
 
 DIST j2me_wireless_toolkit-2_2-linux-i386.bin 17637106 RMD160 2ab276d41a6e20476b51ec80279ef6fd0019de5b SHA1 fa9888ab2a7486be1b168e395e0aa40ca0103f14 SHA256 4480bea914a4537ea81a5a70c517f91aa5a567915f470e70e050c332bfdd4d34
-DIST j2me_wireless_toolkit-2_2-update_1-linux.zip 1521230 RMD160 418d3cb3e95c959bb0010022e32f976648a892e5 SHA1 d83a9b6a7c253633d37619b2796f4aa271bd57f0 SHA256 678db2b8bbd365fd5ff3457272ce123c6720d08b2fe8f2b256eeabb3d65da153
-EBUILD sun-j2me-bin-2.2-r2.ebuild 2501 RMD160 297fba3ddcca53c6a1c079f1c5b9744d85bbb4dc SHA1 fe4c8aade51b51864012aed039154eea1ca3efdc SHA256 d756d9d77281b307a93e94303d5b5eecdc11174a51425b39318a56095e9e5d89
-MD5 c60e3787ce25104fc5d2fdf371d3803a sun-j2me-bin-2.2-r2.ebuild 2501
-RMD160 297fba3ddcca53c6a1c079f1c5b9744d85bbb4dc sun-j2me-bin-2.2-r2.ebuild 2501
-SHA256 d756d9d77281b307a93e94303d5b5eecdc11174a51425b39318a56095e9e5d89 sun-j2me-bin-2.2-r2.ebuild 2501
-MISC ChangeLog 502 RMD160 9101e5161d9cd6da28c3f3d0e069649bd27e908e SHA1 40528ff5179357349c8f85a9b341e30a26ae7b77 SHA256 97df458aed3cfeb191014bfcd64d8bf5bdf27e52fea6b26d5ec15efe61f8acf5
-MD5 0eeeb582084b851759ac491a35db4182 ChangeLog 502
-RMD160 9101e5161d9cd6da28c3f3d0e069649bd27e908e ChangeLog 502
-SHA256 97df458aed3cfeb191014bfcd64d8bf5bdf27e52fea6b26d5ec15efe61f8acf5 ChangeLog 502
+DIST j2me_wireless_toolkit-2_2-update_2-linux.zip 1537734 RMD160 244ba6ba2fd35338546261d73cfb9e46372293d8 SHA1 69da3cd58c385c43aef43866c4d33e3a85625b84 SHA256 cdb17207c4eb15110ccc5222202f0043ac74237aab8c8b9f45abda2e0f449662
+EBUILD sun-j2me-bin-2.2-r3.ebuild 2358 RMD160 68bf584a4418f81328a1b78c7bb7c1f4e28e51fc SHA1 81226dc5d4dca5a7f8fc20a3b35a742743ff393f SHA256 4a69d8f116b10a4c5d2635490d675d027831bb70cf80ee3b4c070e749bd95e59
+MD5 3b05c55f71438116663316db8c3e9b2e sun-j2me-bin-2.2-r3.ebuild 2358
+RMD160 68bf584a4418f81328a1b78c7bb7c1f4e28e51fc sun-j2me-bin-2.2-r3.ebuild 2358
+SHA256 4a69d8f116b10a4c5d2635490d675d027831bb70cf80ee3b4c070e749bd95e59 sun-j2me-bin-2.2-r3.ebuild 2358
+MISC ChangeLog 702 RMD160 413403c29cec131eb12e68e7315e412fa095a9cb SHA1 97ed537e5020340889a105e0d5c2c39e6449ca52 SHA256 bc413de71c1aeb786921dea302dbc9a47ab3b654edbe8dd8267c734f5be04860
+MD5 c5df0941afab84cdbb602756fb06590d ChangeLog 702
+RMD160 413403c29cec131eb12e68e7315e412fa095a9cb ChangeLog 702
+SHA256 bc413de71c1aeb786921dea302dbc9a47ab3b654edbe8dd8267c734f5be04860 ChangeLog 702
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
 MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158
 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 metadata.xml 158
 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb metadata.xml 158
-MD5 d982119b2e6d42951ca295fa800e919b files/digest-sun-j2me-bin-2.2-r2 623
-RMD160 e9f25dc6f761a1dbedddc34a6dec16cf56a4c48b files/digest-sun-j2me-bin-2.2-r2 623
-SHA256 3f99926c16b528b7d1a38fdf0859d6a89dcb95bddf8b332bf4be5b9087c6fc48 files/digest-sun-j2me-bin-2.2-r2 623
+MD5 cdcec72296a192ae5ddbbf697b1316e3 files/digest-sun-j2me-bin-2.2-r3 623
+RMD160 bd2c059915d9852955c520f2e86d88fd4db46317 files/digest-sun-j2me-bin-2.2-r3 623
+SHA256 f80d6b25e8771df543593a5ee46cce9f752a4a09120db10081029d817c90218a files/digest-sun-j2me-bin-2.2-r3 623
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFEr8Gpgo/w9rxVVVERAtykAJ9SYbtA2ikY7BXxyOCiWVm+rMZmagCgkSSR
-+Br5RK2MbGMTyr0Iq635hWU=
-=CcfZ
+iD8DBQFEt3Tjgo/w9rxVVVERAvn4AJwOigyP2uJGNN9BbFQ5stO9YdRc5gCgrYmR
+jZzFqkvueaY08vd7qYbzhi8=
+=0j3p
 -----END PGP SIGNATURE-----
diff --git a/dev-java/sun-j2me-bin/files/digest-sun-j2me-bin-2.2-r2 b/dev-java/sun-j2me-bin/files/digest-sun-j2me-bin-2.2-r2
deleted file mode 100644
index b70ee34f8bbf..000000000000
--- a/dev-java/sun-j2me-bin/files/digest-sun-j2me-bin-2.2-r2
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 c9c631a7bb4681b1421ec8a30eb2c8c4 j2me_wireless_toolkit-2_2-linux-i386.bin 17637106
-RMD160 2ab276d41a6e20476b51ec80279ef6fd0019de5b j2me_wireless_toolkit-2_2-linux-i386.bin 17637106
-SHA256 4480bea914a4537ea81a5a70c517f91aa5a567915f470e70e050c332bfdd4d34 j2me_wireless_toolkit-2_2-linux-i386.bin 17637106
-MD5 ed2aeadb22a73c46561394e59a6a3ce2 j2me_wireless_toolkit-2_2-update_1-linux.zip 1521230
-RMD160 418d3cb3e95c959bb0010022e32f976648a892e5 j2me_wireless_toolkit-2_2-update_1-linux.zip 1521230
-SHA256 678db2b8bbd365fd5ff3457272ce123c6720d08b2fe8f2b256eeabb3d65da153 j2me_wireless_toolkit-2_2-update_1-linux.zip 1521230
diff --git a/dev-java/sun-j2me-bin/sun-j2me-bin-2.2-r2.ebuild b/dev-java/sun-j2me-bin/sun-j2me-bin-2.2-r2.ebuild
deleted file mode 100644
index 9bcb20661b0e..000000000000
--- a/dev-java/sun-j2me-bin/sun-j2me-bin-2.2-r2.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2006 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.2-r2.ebuild,v 1.2 2006/07/08 14:30:09 nelchael Exp $
-
-inherit java-pkg-2
-
-DESCRIPTION="Java 2 Micro Edition Wireless Toolkit for developing wireless applications"
-HOMEPAGE="http://java.sun.com/products/j2mewtoolkit/"
-BINARY="j2me_wireless_toolkit-${PV//./_}-linux-i386.bin"
-PATCH="j2me_wireless_toolkit-2_2-update_1-linux.zip"
-SRC_URI="${BINARY} ${PATCH}"
-LICENSE="sun-bcla-j2me"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE="doc examples"
-RESTRICT="fetch"
-# Before going official with this all the jars should be checked for packed stuff
-# I think the lib/jsrXXX.jar probably are at least packed jars
-DEPEND=">=dev-java/sun-jaf-bin-1.0
-		>=dev-java/sun-javamail-bin-1.3
-		dev-java/xsdlib"
-RDEPEND="${DEPEND}
-		>=virtual/jdk-1.4.2"
-
-S=${WORKDIR}
-
-MY_FILE=${DISTDIR}/${BINARY}
-
-pkg_nofetch() {
-
-	einfo "Please download ${BINARY} and the patch"
-	einfo "${PATCH} from:"
-	einfo "http://java.sun.com/products/sjwtoolkit/download-2_2.html"
-	einfo "and move it to ${DISTDIR}"
-
-}
-
-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=10 2>/dev/null || die
-	unzip install.zip >/dev/null || die
-	eend $?
-	rm install.zip
-
-	unpack ${PATCH}
-
-	#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_install() {
-
-	local DIR=/opt/${P}
-	cd ${WORKDIR}
-
-	einfo "Copying files"
-	dodir ${DIR}
-	cp -r appdb 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-bin activation.jar
-	java-pkg_jar-from sun-javamail-bin mail.jar
-	java-pkg_jar-from xsdlib xsdlib.jar
-
-	einfo "Registering jar files"
-	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
-
-}