Fixed wrapper script to address bug #138281

Package-Manager: portage-2.1.1_pre1-r2

3 files changed, 15 insertions, 56 deletions

diff --git a/dev-java/jikes/Manifest b/dev-java/jikes/Manifest
index b26a8be079c7..200118d252fc 100644
--- a/dev-java/jikes/Manifest
+++ b/dev-java/jikes/Manifest
@@ -6,23 +6,23 @@ AUX deprecated.patch 995 RMD160 7f4373f101ee6e2f4de73deec3efd5412aa1d109 SHA1 62
 MD5 f4b99fcf9aad09cc8ac1414bab7f40d7 files/deprecated.patch 995
 RMD160 7f4373f101ee6e2f4de73deec3efd5412aa1d109 files/deprecated.patch 995
 SHA256 59e09d783e867a95bb2ddabd29e2e8f0bad173731e8b859a45e49f2a3d0d88eb files/deprecated.patch 995
-AUX jikes 379 RMD160 2c368d725780af2f740effc47972d443cf5a9850 SHA1 f162128fe7b2660b27052e277e53091d799de7fa SHA256 132949f32ac7512e71d14ae93ff900e9a69644139fa0cbea9340f4ddca566115
-MD5 315440906c75919a404560783c402170 files/jikes 379
-RMD160 2c368d725780af2f740effc47972d443cf5a9850 files/jikes 379
-SHA256 132949f32ac7512e71d14ae93ff900e9a69644139fa0cbea9340f4ddca566115 files/jikes 379
+AUX jikes 381 RMD160 796f1f528361dcb9797204a226b497cb4efb7dae SHA1 194ba0f9da6c159d9546aed34f0699800f4501e9 SHA256 ede10b0f53b1499aa14337deb7b39d932e635aef0087ffe0cf58672cb1921c09
+MD5 c1fe46db21f639734237eba0250463a6 files/jikes 381
+RMD160 796f1f528361dcb9797204a226b497cb4efb7dae files/jikes 381
+SHA256 ede10b0f53b1499aa14337deb7b39d932e635aef0087ffe0cf58672cb1921c09 files/jikes 381
 DIST jikes-1.22.tar.bz2 616655 RMD160 47f76eb4aa04ad73f8ff5abbf5a399e0b5b6728d SHA1 55bc20b609827e132e047d6c89084d4981905e11 SHA256 0cb02c763bc441349f6d38cacd52adf762302cce3a08e269f1f75f726e6e14e3
 EBUILD jikes-1.22-r1.ebuild 761 RMD160 fe52aa3a81974ca642d5b91d7133a5a25263c561 SHA1 3e6a2d167eac7c9ba9e2c77ef455ff3bf047e2e5 SHA256 542393dcc80f00b98f78de199fec3d6b647fdd2097f8b5a5a034690ced5415b4
 MD5 74ab99e1424d1a33c54a30c3cbba3e7b jikes-1.22-r1.ebuild 761
 RMD160 fe52aa3a81974ca642d5b91d7133a5a25263c561 jikes-1.22-r1.ebuild 761
 SHA256 542393dcc80f00b98f78de199fec3d6b647fdd2097f8b5a5a034690ced5415b4 jikes-1.22-r1.ebuild 761
-EBUILD jikes-1.22-r12.ebuild 990 RMD160 bc62a813292a3dc9d6c6da788190099d4e06468c SHA1 9dd17d4ad11391dd6e4880a43b7718481669b2f0 SHA256 4d1fed8062518d576894feac449a77600e28410c45ddc7b7410aeed4a44f3996
-MD5 efc3a7f1cc44f234500faa0ae0bc319b jikes-1.22-r12.ebuild 990
-RMD160 bc62a813292a3dc9d6c6da788190099d4e06468c jikes-1.22-r12.ebuild 990
-SHA256 4d1fed8062518d576894feac449a77600e28410c45ddc7b7410aeed4a44f3996 jikes-1.22-r12.ebuild 990
-MISC ChangeLog 4845 RMD160 b143da78ba1628eaa0964711502f4a89e7f89219 SHA1 11d9dd5e95c9794545dee2baa5ca8caf1a594a4d SHA256 452ffcd17ff93e7445784c1018d0cfa96469ef79dff1efafd4fc2d569d7f97d7
-MD5 05d3da58d0496556ed65b6dc821fa0c4 ChangeLog 4845
-RMD160 b143da78ba1628eaa0964711502f4a89e7f89219 ChangeLog 4845
-SHA256 452ffcd17ff93e7445784c1018d0cfa96469ef79dff1efafd4fc2d569d7f97d7 ChangeLog 4845
+EBUILD jikes-1.22-r13.ebuild 990 RMD160 457f43dbdf9ab99897a66838b8e7a87fd9bc8896 SHA1 3005fc1dfcdc6dda3b73b5f298f1d27dbedc0322 SHA256 a934ebe6b9a95a2256cafbe97fdcdba7c6a4ed45f4d1119f622f60e670fa4729
+MD5 3918bdda123e70fdef87c9d8358444db jikes-1.22-r13.ebuild 990
+RMD160 457f43dbdf9ab99897a66838b8e7a87fd9bc8896 jikes-1.22-r13.ebuild 990
+SHA256 a934ebe6b9a95a2256cafbe97fdcdba7c6a4ed45f4d1119f622f60e670fa4729 jikes-1.22-r13.ebuild 990
+MISC ChangeLog 5038 RMD160 01cf1ff975396fa57efe24f41e3b6e9d00405442 SHA1 1cade2045ad22bfa04235c31ee00aba0ecb0dccd SHA256 cafe74a899d71b53c0610a8c869fa37cb88a94666f57a8187d8d4fba21713de4
+MD5 daaef4265dd2813df35eb62516e7fc19 ChangeLog 5038
+RMD160 01cf1ff975396fa57efe24f41e3b6e9d00405442 ChangeLog 5038
+SHA256 cafe74a899d71b53c0610a8c869fa37cb88a94666f57a8187d8d4fba21713de4 ChangeLog 5038
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
@@ -30,6 +30,6 @@ SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 metadata
 MD5 c5bd3814a9d7f064efeb359292aa3e6f files/digest-jikes-1.22-r1 235
 RMD160 2aadc2d87daa48ddb88a40a4bb225e79e9e1c3f8 files/digest-jikes-1.22-r1 235
 SHA256 30a6b69ab4842626a7ac049e05f329ffcf94db3e2f48c990932b5eecfbb486fd files/digest-jikes-1.22-r1 235
-MD5 c5bd3814a9d7f064efeb359292aa3e6f files/digest-jikes-1.22-r12 235
-RMD160 2aadc2d87daa48ddb88a40a4bb225e79e9e1c3f8 files/digest-jikes-1.22-r12 235
-SHA256 30a6b69ab4842626a7ac049e05f329ffcf94db3e2f48c990932b5eecfbb486fd files/digest-jikes-1.22-r12 235
+MD5 c5bd3814a9d7f064efeb359292aa3e6f files/digest-jikes-1.22-r13 235
+RMD160 2aadc2d87daa48ddb88a40a4bb225e79e9e1c3f8 files/digest-jikes-1.22-r13 235
+SHA256 30a6b69ab4842626a7ac049e05f329ffcf94db3e2f48c990932b5eecfbb486fd files/digest-jikes-1.22-r13 235
diff --git a/dev-java/jikes/files/digest-jikes-1.22-r12 b/dev-java/jikes/files/digest-jikes-1.22-r12
deleted file mode 100644
index 88b0b88ba4f2..000000000000
--- a/dev-java/jikes/files/digest-jikes-1.22-r12
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 cda958c7fef6b43b803e1d1ef9afcb85 jikes-1.22.tar.bz2 616655
-RMD160 47f76eb4aa04ad73f8ff5abbf5a399e0b5b6728d jikes-1.22.tar.bz2 616655
-SHA256 0cb02c763bc441349f6d38cacd52adf762302cce3a08e269f1f75f726e6e14e3 jikes-1.22.tar.bz2 616655
diff --git a/dev-java/jikes/jikes-1.22-r12.ebuild b/dev-java/jikes/jikes-1.22-r12.ebuild
deleted file mode 100644
index 921b43534a74..000000000000
--- a/dev-java/jikes/jikes-1.22-r12.ebuild
+++ /dev/null
@@ -1,38 +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/jikes/jikes-1.22-r12.ebuild,v 1.1 2006/06/25 01:12:45 nichoj Exp $
-
-inherit flag-o-matic eutils
-
-DESCRIPTION="IBM's open source, high performance Java compiler"
-HOMEPAGE="http://jikes.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-LICENSE="IBM"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86 ~ppc64"
-IUSE=""
-DEPEND=""
-RDEPEND=">=dev-java/java-config-2.0.0"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/deprecated.patch
-}
-
-src_compile() {
-	filter-flags "-fno-rtti"
-	econf || die "configure problem"
-	emake || die "compile problem"
-}
-
-src_install () {
-	make DESTDIR=${D} install || die "install problem"
-	dodoc ChangeLog AUTHORS README TODO NEWS
-
-	mv ${D}/usr/bin/jikes{,-bin}
-	dobin ${FILESDIR}/jikes
-
-	insinto /usr/share/java-config-2/compiler
-	newins ${FILESDIR}/compiler-settings jikes
-}