Patches from Caster for java-1.5-fixer. Primarily, it makes sure there aren't duplicate entries in the emerge list, and skips over packages for generation-2 that were specifically built for 1.5.

(Portage version: 2.1.1_pre3-r5)
 (Unsigned Manifest commit)

3 files changed, 15 insertions, 53 deletions

diff --git a/dev-java/java-config-wrapper/Manifest b/dev-java/java-config-wrapper/Manifest
index 179d73bc42f7..30e44f8134a7 100644
--- a/dev-java/java-config-wrapper/Manifest
+++ b/dev-java/java-config-wrapper/Manifest
@@ -1,6 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX java-config-wrapper-0.10-fixer.patch 2351 RMD160 95bd486ee7c1942f79ffaeab2e7f1b59c38322dd SHA1 20fb767be1edbad26e379299f8d39356a9482361 SHA256 3d44ca9f1577ef6537dea800adec494fb5379cdb87a2c7b9d1455952ec23f90a
+MD5 eceb5ac61c1df4b132e7b88c8a4822fc files/java-config-wrapper-0.10-fixer.patch 2351
+RMD160 95bd486ee7c1942f79ffaeab2e7f1b59c38322dd files/java-config-wrapper-0.10-fixer.patch 2351
+SHA256 3d44ca9f1577ef6537dea800adec494fb5379cdb87a2c7b9d1455952ec23f90a files/java-config-wrapper-0.10-fixer.patch 2351
 AUX java-config-wrapper-0.9-check_env_files.patch 1312 RMD160 50c21638dc27a21ec0ba801f5fbc9d131f8c9bc2 SHA1 d4c4b3fab3a5a52554587406aa245453c8328922 SHA256 8f2859277d786c6ff5f0fc3acbc8b722b7fe73f86f0799c67573790d3d14fd91
 MD5 c2242a4fe3ca6abb0127a464cff5f09d files/java-config-wrapper-0.9-check_env_files.patch 1312
 RMD160 50c21638dc27a21ec0ba801f5fbc9d131f8c9bc2 files/java-config-wrapper-0.9-check_env_files.patch 1312
@@ -26,25 +27,18 @@ MD5 a6259545ac3566beb0e5a33e2c01ef5c files/java-config-wrapper-0.9-virtual_check
 RMD160 54008d59ffce4a39292b933521e56f336ea85eaa files/java-config-wrapper-0.9-virtual_check.patch 1612
 SHA256 6e7f1e77ed663a7f3e540c232bdb90908060ca388f80f1b915993c05c0caa649 files/java-config-wrapper-0.9-virtual_check.patch 1612
 DIST java-config-wrapper-0.10.tar.bz2 5225 RMD160 c970bea9d2a8463378bb1bf345c67fdee9e50ea8 SHA1 1813cdafb3852451459472a6a7ca5e01d9b7e7fe SHA256 8272bce889841febf13ee18b548ae38733f6a67d1ed28a630c59d0ae198192bd
-EBUILD java-config-wrapper-0.10-r1.ebuild 784 RMD160 325899aaf6faddf4e84a12b13de8e5696e1d03e9 SHA1 287c4e8927c67583b60d660b2641a6d10fc553d6 SHA256 97dbc6bd12ec9cf80bb5b215a7376dbb0c1231b2ff81caf5129d3259941b425f
-MD5 a296835104405c1cd98f1a95203328ef java-config-wrapper-0.10-r1.ebuild 784
-RMD160 325899aaf6faddf4e84a12b13de8e5696e1d03e9 java-config-wrapper-0.10-r1.ebuild 784
-SHA256 97dbc6bd12ec9cf80bb5b215a7376dbb0c1231b2ff81caf5129d3259941b425f java-config-wrapper-0.10-r1.ebuild 784
-MISC ChangeLog 2605 RMD160 89677182488cdbab506861b008dabe90c013cb6a SHA1 c3911735c5f044b8fc09b18bd446759267dafa0f SHA256 c7b721e28527b7f8b995a763cfb385d584588e0714ed3abaad4f6db81b7ac665
-MD5 6a4cb9ae99de73926dc5bcd23e39a3bc ChangeLog 2605
-RMD160 89677182488cdbab506861b008dabe90c013cb6a ChangeLog 2605
-SHA256 c7b721e28527b7f8b995a763cfb385d584588e0714ed3abaad4f6db81b7ac665 ChangeLog 2605
+EBUILD java-config-wrapper-0.10-r2.ebuild 832 RMD160 3aefb2404d3d584e3f82214ebf30f14bb5bc23b4 SHA1 d296477e2acbc413d5cf9ec6ed938464bbef80ac SHA256 2503a1b0e5321bf2e35aa2983c80b346288c73254ad7ac6fb24f852352db4281
+MD5 19270f7a2dda1cf959867b6c58966e8a java-config-wrapper-0.10-r2.ebuild 832
+RMD160 3aefb2404d3d584e3f82214ebf30f14bb5bc23b4 java-config-wrapper-0.10-r2.ebuild 832
+SHA256 2503a1b0e5321bf2e35aa2983c80b346288c73254ad7ac6fb24f852352db4281 java-config-wrapper-0.10-r2.ebuild 832
+MISC ChangeLog 3021 RMD160 b4dbe66e333cbc5554b324884d0bfe67181f4e60 SHA1 7bb353f7a2958306615d0a18ed80190766c2be02 SHA256 eef7828507282279fde12268e6b24834877c3169ff04195cf64f0fefffbf06ea
+MD5 3f438d0b7f29b49a62459cf1c9e32be8 ChangeLog 3021
+RMD160 b4dbe66e333cbc5554b324884d0bfe67181f4e60 ChangeLog 3021
+SHA256 eef7828507282279fde12268e6b24834877c3169ff04195cf64f0fefffbf06ea ChangeLog 3021
 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 9c3a6c4135a8bda4f8bee326cac00ba3 files/digest-java-config-wrapper-0.10-r1 271
-RMD160 3ffb177712eec2358b03768ab8a8f3ad1ae11e6c files/digest-java-config-wrapper-0.10-r1 271
-SHA256 0b7b345df70a8eadbab3e0e264020f24554ea0c98aee219b09153849d7c9ed13 files/digest-java-config-wrapper-0.10-r1 271
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.4 (GNU/Linux)
-
-iD8DBQFEwB2zAiZjviIA2XgRArMMAJ9IznXusU000xDZzpMHzdSqTpM1BQCeJofl
-358SprQNqvHfAi8aaOryfkE=
-=DYty
------END PGP SIGNATURE-----
+MD5 9c3a6c4135a8bda4f8bee326cac00ba3 files/digest-java-config-wrapper-0.10-r2 271
+RMD160 3ffb177712eec2358b03768ab8a8f3ad1ae11e6c files/digest-java-config-wrapper-0.10-r2 271
+SHA256 0b7b345df70a8eadbab3e0e264020f24554ea0c98aee219b09153849d7c9ed13 files/digest-java-config-wrapper-0.10-r2 271
diff --git a/dev-java/java-config-wrapper/files/digest-java-config-wrapper-0.10-r1 b/dev-java/java-config-wrapper/files/digest-java-config-wrapper-0.10-r1
deleted file mode 100644
index 1a39e8a2826e..000000000000
--- a/dev-java/java-config-wrapper/files/digest-java-config-wrapper-0.10-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 4255cda560c9a09c0b71fdcc13d27daa java-config-wrapper-0.10.tar.bz2 5225
-RMD160 c970bea9d2a8463378bb1bf345c67fdee9e50ea8 java-config-wrapper-0.10.tar.bz2 5225
-SHA256 8272bce889841febf13ee18b548ae38733f6a67d1ed28a630c59d0ae198192bd java-config-wrapper-0.10.tar.bz2 5225
diff --git a/dev-java/java-config-wrapper/java-config-wrapper-0.10-r1.ebuild b/dev-java/java-config-wrapper/java-config-wrapper-0.10-r1.ebuild
deleted file mode 100644
index 74df5b995691..000000000000
--- a/dev-java/java-config-wrapper/java-config-wrapper-0.10-r1.ebuild
+++ /dev/null
@@ -1,29 +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/java-config-wrapper/java-config-wrapper-0.10-r1.ebuild,v 1.3 2006/07/21 00:19:45 flameeyes Exp $
-
-inherit eutils
-DESCRIPTION="Wrapper for java-config"
-HOMEPAGE="http://www.gentoo.org/proj/en/java"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-DEPEND="!<dev-java/java-config-1.3"
-RDEPEND="app-portage/portage-utils"
-
-IUSE=""
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	# Remove unnecessary file
-	rm src/shell/java-check-environment.orig
-	# Fix regression bug #140752
-	epatch ${FILESDIR}/${PN}-0.9-qfile.patch
-}
-
-src_install() {
-	dobin src/shell/*
-}