Version bump.

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

4 files changed, 183 insertions, 3 deletions

diff --git a/dev-dotnet/ikvm/ChangeLog b/dev-dotnet/ikvm/ChangeLog
index 11d02067c45f..cd5fe9cf8a8e 100644
--- a/dev-dotnet/ikvm/ChangeLog
+++ b/dev-dotnet/ikvm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-dotnet/ikvm
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/ikvm/ChangeLog,v 1.34 2012/05/22 12:16:31 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/ikvm/ChangeLog,v 1.35 2012/07/21 10:12:48 pacho Exp $
+
+*ikvm-7.1.4532.2 (21 Jul 2012)
+
+  21 Jul 2012; Pacho Ramos <pacho@gentoo.org> +files/ikvm-7.1.4532.2-key.patch,
+  +ikvm-7.1.4532.2.ebuild:
+  Version bump.
 
   22 May 2012; Agostino Sarubbo <ago@gentoo.org> ikvm-0.46.0.2.ebuild:
   Stable for amd64, wrt bug #407701
@@ -173,4 +179,3 @@
   30 Jun 2004; Peter Johanson <latexer@gentoo.org> +metadata.xml,
   +ikvm-0.8.0.0.ebuild:
   Initial commit. Version that goess with mono-1.0
-
diff --git a/dev-dotnet/ikvm/Manifest b/dev-dotnet/ikvm/Manifest
index 3acd5124f5eb..1ef6ebfc4c99 100644
--- a/dev-dotnet/ikvm/Manifest
+++ b/dev-dotnet/ikvm/Manifest
@@ -1,10 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX ikvm-0.46.0.1-key.patch 2777 SHA256 cb05cb24008205cbfb297a0bf70794f9da830474434b64ce3b8d0dfab1890b90 SHA512 5262da5b12527b51e6f76d902e4e0d3738a52e207ce7d497490821fb62843b2ed0c6398bddd338192b3f7a40887bd03c14dac9c789ff85eed3caed62955b35ae WHIRLPOOL 6c17c2faa4f54230d25d4e0df481117c861bd4c845f15ea7c11ce7498d6e4a9e3f0d35716eea49751c1cf256303a57460249c01b3443f01382cc40c69797ed09
 AUX ikvm-0.46.0.2-unmappable-character.patch 459 SHA256 5ad54b98d39b652759b82ce09b5d6c27c83e0ac26317865ed9baf654d47ec8de SHA512 17f3ea844cf19c6cf4530c87643c2af5be2c48df954db31c225f9d50ce46695a921cefbe4fd30469705f7f7d23456178fd9553f0ac94a319ccc2aef0b1af3edd WHIRLPOOL 5c76fb297df4c0d1d7bcc90d5936cb842bef94bbebb2c55e23b9b250bff32346ae974b537afa8c5f9cf7d59b9932422eb6d71cacab7247eabaa48a653714d8e8
+AUX ikvm-7.1.4532.2-key.patch 2848 SHA256 b695097b16dcb08caaaf75e0a26f25e170a5f6ffa511065a8c87cbf7bd80e4c7 SHA512 2110d70dd405c648e8631c0dff8dc022406f258b4c5f942456c7c3df0a47261a19ce2dbb2e793c41c4bd9251ab2da3c19308d43b947272f34a4901c396fa5519 WHIRLPOOL c16f4548da209df2c82d9f2ff2d62cb8ea769ef5235bdf18748e3013823a0066161c95bc35e2d9f1de339f2def6c892b2ae6ba9885ed51f99f98d55553f4510f
 AUX mono.snk.uu 892 SHA256 19ad5c915aef4ae4e6ecc3051e5c55005bfa5098c98693b8a4cdd5c09a517e46 SHA512 23c9c9038cc0c497a3a15a87359574e1e366c4e967984309121bfa12d203a90f6f3bb3d1f780b047aae722b2628e51f1344c5c778add14602c92ea32a48fe333 WHIRLPOOL ee01e78bc37db362d11377fb1314eade44458a47910aa7a4cca76f22b0cf02c58596f7892d58e3f2a27773229081445dfbf245e69606d448cb41e94940049d92
 DIST ikvmsrc-0.46.0.1.zip 1870376 SHA256 901e8b990cf6d0fc9f8a18179e040cdba8a2fa00ac5658eded5c9ea4665f6423 SHA512 83c0dbaf0ea229fb8046d0f6016bfe1990c88639fd5d162afea3330441ec627edcb93de903e5fa3d73062c917574441bac832c2d61144626e70b3324dfdbf9f4 WHIRLPOOL ee837a2d9c038ec2fdfec93ed2cd0ec162bf4e081b8a0f0fe8b9bab62eada13f72cf8a8c5a8c83600b415d89dd5b0a539056e169ea79d8eb885298ddf91e3533
 DIST ikvmsrc-0.46.0.2.zip 1873662 SHA256 25afda0b29a2562ffb8f0a457204bde1008c8d255abaf45c3a09b13f7eba5f06 SHA512 79976ef9f90a691a607740d4efd338ed8ee86061298ebf3a5b3c660bed779e54bb7fe80548fc1eed78ce35fbdcccb460b656960a2c464377fcfcb98c2c6ed12b WHIRLPOOL 5c7f6c800c5b4670fb9e9a45161059233edf06b0440e7428217b03f400f29a46a0b0fd253bbc5d608ab5be7d0edac78b98efe6dbf219b72e960d5d51731b6a26
+DIST ikvmsrc-7.1.4532.2.zip 2102200 SHA256 3f22b9171b56a7600f28c42828898772bcd37c996d15b219c1b9ba08aa4c12e0 SHA512 889e23ce9cdc9abff98c54e5e02b9798ab908c37ecb6b8b0733d7b6e8e813c939ab91daa6ae57a0abd4fa90365c395231de5c9596fd77bdf1b15505c6b46abb1 WHIRLPOOL 5cf5e210b21b2697a489b0d6d40321d9f4cf89e92b2d280fa6686583836821d3bb613ce9af1bbde772fda5a0373dac20f7a09f4852d5c59ecef2bd65bce82235
+DIST openjdk-7u4-stripped.zip 55617337 SHA256 d85b89b452ecdb46309ec39b28e283813660bb8b8399d4c222d3ff1a83b971f9 SHA512 3f4d32994c9a078b68ae6da13770c249561240a01840f88094e139b0297b25e37a2acd3ef74fa14a830be5aa43c693b3ecf1c745dbc7051c4b2e1816c397e9a1 WHIRLPOOL b7690de8c31acb4b3a62fdd132bcf33b2264559e64a116d75fed3a3edeb570345ade582377d2d824d2ab5831a0865b5b1c51f7a514285935696be3cef5079b1b
 DIST openjdk6-b22-stripped.zip 51279392 SHA256 32af924f320118b242c1bce4828abbe4c11120dd144c012ce2f5d88b75d2f568 SHA512 e0cd896c80e3b10aaa1b1128ea63b062c7de0539188d66f2ae081d420c6f467b1aa8fdbc5fe4cb366c89ed2880560b287e9af5e8312d36903a46f23d1bbbe791 WHIRLPOOL 7d86ea0693e371273ea160ba20daafe7b8d9453687a3e21f81ef239f4186cafcc367950a1117a14da21b212831baebfab9a03f87166f7cd6a598811cc73e3a10
 EBUILD ikvm-0.46.0.1.ebuild 2794 SHA256 b726370bbb135256fe89d7eb1424a8796a033907f5da9e04c27052b0c2a48dff SHA512 4619aceaca0eaaa15afb4daaf85ee23627eccdb1f1a9badefb8e214173bba8bfc962a0760222747794c5e34c8e9bc26b6a52ebc94f72c4e8512210f591af7a75 WHIRLPOOL 27d091998ecc227a03ee90df3a7f5901a2c2fa488e43d2e6b7de758e5ddd152aa11b23f849babd2befd17f34ea9ea81e142149255e5766fb6240ac6973499859
 EBUILD ikvm-0.46.0.2.ebuild 2921 SHA256 ef60c480c116566b930bb0cb1c16e88ba9f112b380ba50f5c1a9d8f9a9207136 SHA512 b73271d0c59354abab25aaadfbd103adc8ff261e72359e7e0cc9c1bcbb346fbff0cc53644bba6313f175e0b2a80cbb1bc2e1dc83282efb57cf7701925d7b42fb WHIRLPOOL 3f171e83c2e6aec58ffa2661937f72adb931dab35f55290ca9b483927580c776feb2d97b2167060614a7e49163d6a377c7c17eee8c4ae2170df45b705c1a1588
-MISC ChangeLog 6882 SHA256 03e0c8ed2eee5b2633e8a6f85db494907385f3fe6d1f0bcf26b369fc2769b753 SHA512 16a905aa0f90c33dbb602ef689304e7a2de73bcfa6bc0926509d7bd6cc9f5bc77d07f438caa73eb7c7dce1308269bef1df3b1abcfb1ee5c2ecd169130aad3d27 WHIRLPOOL c0778753ff36342841d4258e11c4cf4248392bb8f9521bc4a9fb53670b65a9a387db69cc11d5b61bf56eff3978a17d2de6aa6b736ef8f07995ab4ed039516736
+EBUILD ikvm-7.1.4532.2.ebuild 2842 SHA256 03a1af89e0d074bce63e58a3e6e565f76f0e8cf6d9b2d63190ecb356f71d4ff5 SHA512 abd4033b7c01c4381aca22993512098d7961338b9c00de554c4471e389a97c9c3a5413a7137fb5673b96f45922332983d96006105108d600e0963645d89faa0a WHIRLPOOL 385283cc6f308c816aa8d56500ac4cbb97007a08c57038accd732997a9605439302c2512e6dc1ab7678e0ca6903a9d0342dadd13f33332546c770ba19200a0f3
+MISC ChangeLog 7039 SHA256 137b5926af50a03014ecd0dd68414d351ad04ef0412006138619500384db49da SHA512 54a6cb912bbf65a0ed96147845c5147d98ca569f066a0ec8c031d7e5659f12a23adc74556645c526fddd7e09c20769e3f7433f138134d8b1a5e730fbf2a8d6b0 WHIRLPOOL 1aa5cd65ee363fed5f1f59284d0ebd6ac84f375640f7873b8a5f1e6d095659a8b7d3bf72fa81c48a9e229486b00c775d8990b5a15eff1b4194b945e2fda61717
 MISC metadata.xml 160 SHA256 1bc3e313a948415fff0dfa63a5610943327146bfe16bfeca603379bf9706a687 SHA512 087fcbf85988f071b9ce3491d0b6e1a767758e970950ef4247759ef48bcc4335c973dcc53b69fd712ac7e9704614878506fa342ba09edcf1c067e9ee478f94d7 WHIRLPOOL 65533bc6b7e60c26732efd476ed2c3aa0938bbea25140b8402ab2e05f0ac34c7a6d838ed7af763b2ec0a34317fcd8baf814f7c7ea8718ca5901160083d9525b8
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAlAKgKUACgkQCaWpQKGI+9RwXQCfbKBdzp3scjLctQaIvTkRGZbF
+JJUAn2yihtls8TQf9egn7pr5vXrO4qRK
+=vH8A
+-----END PGP SIGNATURE-----
diff --git a/dev-dotnet/ikvm/files/ikvm-7.1.4532.2-key.patch b/dev-dotnet/ikvm/files/ikvm-7.1.4532.2-key.patch
new file mode 100644
index 000000000000..34ce79da5bb6
--- /dev/null
+++ b/dev-dotnet/ikvm/files/ikvm-7.1.4532.2-key.patch
@@ -0,0 +1,61 @@
+Author: Jo Shields
+Description: This patch ensures that rather than trying to use the Mono Crypto
+Description: Service Provider to retrieve a signing key (CSP is not safe to
+Description: run with fakeroot), we simply hard-code the path to a bundled key
+Description: file
+Index: ikvm/ikvm-7.0.4335.0/CommonAssemblyInfo.cs.in
+===================================================================
+--- ikvm.orig/ikvm-7.0.4335.0/CommonAssemblyInfo.cs.in	2012-02-07 01:29:25.080047165 +0000
++++ ikvm/ikvm-7.0.4335.0/CommonAssemblyInfo.cs.in	2012-02-07 01:30:58.092593303 +0000
+@@ -33,5 +33,6 @@
+ 

+ #if SIGNCODE

+ 	#pragma warning disable 1699

+-	[assembly: AssemblyKeyName("ikvm-key")]

++	[assembly: AssemblyDelaySign(false)]

++	[assembly: AssemblyKeyFile("../../debian/mono.snk")]

+ #endif

+Index: ikvm/ikvm-7.0.4335.0/ikvm.build
+===================================================================
+--- ikvm.orig/ikvm-7.0.4335.0/ikvm.build	2012-02-07 01:29:57.152235493 +0000
++++ ikvm/ikvm-7.0.4335.0/ikvm.build	2012-02-07 01:30:48.348536094 +0000
+@@ -6,8 +6,8 @@
+     </target>

+     <target name="signed">

+          <property name="signed" value="SIGNCODE" />

+-         <property name="signoption" value="-key:ikvm-key" />

+-         <property name="ilasm_signoption" value="/key:@ikvm-key" />

++         <property name="signoption" value="-keyfile:../../debian/mono.snk" />

++         <property name="ilasm_signoption" value="/key:../../debian/mono.snk" />

+          <call target="managed" />

+     </target>

+     <target name="managed" depends="clean-managed CommonAssemblyInfo">

+Index: ikvm/ikvm-7.0.4335.0/runtime/runtime.build
+===================================================================
+--- ikvm.orig/ikvm-7.0.4335.0/runtime/runtime.build	2012-02-07 01:31:20.084722420 +0000
++++ ikvm/ikvm-7.0.4335.0/runtime/runtime.build	2012-02-07 01:31:47.120881144 +0000
+@@ -19,8 +19,8 @@
+ 

+     <target name="signed">

+         <property name="signed" value="SIGNCODE" />

+-        <property name="signoption" value="-key:ikvm-key" />

+-        <property name="ilasm_signoption" value="/key:@ikvm-key" />

++        <property name="signoption" value="-keyfile:../../../debian/mono.snk" />

++        <property name="ilasm_signoption" value="/key:../../../debian/mono.snk" />

+         <call target="full" />

+     </target>

+ 

+Index: ikvm/ikvm-7.0.4335.0/tools/pubkey.cs
+===================================================================
+--- ikvm.orig/ikvm-7.0.4335.0/tools/pubkey.cs	2012-02-07 01:28:30.479726527 +0000
++++ ikvm/ikvm-7.0.4335.0/tools/pubkey.cs	2012-02-07 01:28:58.927893592 +0000
+@@ -29,7 +29,8 @@
+ 

+ #if SIGNCODE

+     #pragma warning disable 1699

+-    [assembly: AssemblyKeyName("ikvm-key")]

++    [assembly: AssemblyDelaySign(false)]

++    [assembly: AssemblyKeyFile("../../debian/mono.snk")]

+ #endif

+ 

+ class PublicKey

diff --git a/dev-dotnet/ikvm/ikvm-7.1.4532.2.ebuild b/dev-dotnet/ikvm/ikvm-7.1.4532.2.ebuild
new file mode 100644
index 000000000000..3ad73cfb65e6
--- /dev/null
+++ b/dev-dotnet/ikvm/ikvm-7.1.4532.2.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/ikvm/ikvm-7.1.4532.2.ebuild,v 1.1 2012/07/21 10:12:48 pacho Exp $
+
+EAPI="4"
+
+inherit eutils mono multilib java-pkg-2
+
+DESCRIPTION="Java VM for .NET"
+HOMEPAGE="http://www.ikvm.net/ http://weblog.ikvm.net/"
+SRC_URI="http://www.frijters.net/openjdk-7u4-stripped.zip
+	http://www.frijters.net/${PN}src-${PV}.zip"
+LICENSE="as-is"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/mono-2
+	dev-libs/glib"
+DEPEND="${RDEPEND}
+	!dev-dotnet/ikvm-bin
+	>=dev-dotnet/nant-0.85
+	virtual/jdk:1.7
+	app-arch/unzip
+	virtual/pkgconfig
+	app-arch/sharutils"
+
+src_prepare() {
+	# We cannot rely on Mono Crypto Service Provider as it doesn't work inside
+	# sandbox, we simply hard-code the path to a bundled key like Debian does.
+	epatch "${FILESDIR}"/${PN}-7.1.4532.2-key.patch
+	mkdir -p ../debian/ || die
+	uudecode < "${FILESDIR}"/mono.snk.uu -o ../debian/mono.snk || die
+
+	# Ensures that we use Mono's bundled copy of SharpZipLib instead of relying
+	# on ikvm-bin one
+	sed -i -e 's:../bin/ICSharpCode.SharpZipLib.dll:ICSharpCode.SharpZipLib.dll:' \
+		ikvmc/ikvmc.build ikvmstub/ikvmstub.build || die
+
+	sed -i -e 's:pkg-config --cflags:pkg-config --cflags --libs:' \
+		native/native.build || die
+
+	mkdir -p "${T}"/home/test
+}
+
+src_configure() {
+	:
+}
+
+src_compile() {
+	XDG_CONFIG_HOME="${T}/home/test" nant -t:mono-2.0 signed || die "ikvm build failed"
+}
+
+generate_pkgconfig() {
+	ebegin "Generating .pc file"
+	local dll LSTRING="Libs:"
+	dodir "/usr/$(get_libdir)/pkgconfig"
+	cat <<- EOF -> "${D}/usr/$(get_libdir)/pkgconfig/${PN}.pc"
+		prefix=/usr
+		exec_prefix=\${prefix}
+		libdir=\${prefix}/$(get_libdir)
+		Name: IKVM.NET
+		Description: An implementation of Java for Mono and the Microsoft .NET Framework.
+		Version: ${PV}
+	EOF
+	for dll in "${S}"/bin/IKVM.*.dll
+	do
+		LSTRING="${LSTRING} -r:"'${libdir}'"/mono/IKVM/${dll##*/}"
+	done
+	printf "${LSTRING}" >> "${D}/usr/$(get_libdir)/pkgconfig/${PN}.pc"
+	PKG_CONFIG_PATH="${D}/usr/$(get_libdir)/pkgconfig/" pkg-config --silence-errors --libs ikvm &> /dev/null
+	eend $?
+}
+
+src_install() {
+	local dll dllbase exe
+	insinto /usr/$(get_libdir)/${PN}
+	doins bin/*.exe
+
+	dodir /bin
+	for exe in bin/*.exe
+	do
+		exebase=${exe##*/}
+		ebegin "Generating wrapper for ${exebase} -> ${exebase%.exe}"
+		make_wrapper ${exebase%.exe} "mono /usr/$(get_libdir)/${PN}/${exebase}"
+		eend $? || die "Failed generating wrapper for ${exebase}"
+	done
+
+	generate_pkgconfig || die "generating .pc failed"
+
+	for dll in bin/IKVM.*.dll
+	do
+		dllbase=${dll##*/}
+		ebegin "Installing and registering ${dllbase}"
+		gacutil -i bin/${dllbase} -root "${D}"/usr/$(get_libdir) \
+			-gacdir /usr/$(get_libdir) -package IKVM &>/dev/null
+		eend $? || die "Failed installing ${dllbase}"
+	done
+}