[gentoo-commits] proj/dotnet:master commit in: dev-dotnet/ikvm/
commit: be56744b66c87074797dece10f12f0c7b61ff1a5 Author: ArsenShnurkov gmail com> AuthorDate: Fri Mar 18 06:03:38 2016 + Commit: Heather Cynede gentoo org> CommitDate: Fri Mar 18 06:03:38 2016 + URL:https://gitweb.gentoo.org/proj/dotnet.git/commit/?id=be56744b lift to net45 profile dev-dotnet/ikvm/ikvm-7.2.4630.5_p201602270.ebuild | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dev-dotnet/ikvm/ikvm-7.2.4630.5_p201602270.ebuild b/dev-dotnet/ikvm/ikvm-7.2.4630.5_p201602270.ebuild index 6f1894f..44f8665 100644 --- a/dev-dotnet/ikvm/ikvm-7.2.4630.5_p201602270.ebuild +++ b/dev-dotnet/ikvm/ikvm-7.2.4630.5_p201602270.ebuild @@ -25,13 +25,14 @@ SRC_URI="http://www.frijters.net/openjdk-7u4-stripped.zip SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" +IUSE="+net45" +USE_DOTNET="net45" RDEPEND=">=dev-lang/mono-2 dev-libs/glib" DEPEND="${RDEPEND} !dev-dotnet/ikvm-bin - >=dev-dotnet/nant-0.85 + dev-util/nant >=virtual/jdk-1.7 app-arch/unzip virtual/pkgconfig @@ -68,7 +69,7 @@ src_configure() { } src_compile() { - XDG_CONFIG_HOME="${T}/home/test" nant -t:mono-2.0 signed || die "ikvm build failed" + XDG_CONFIG_HOME="${T}/home/test" nant -t:mono-4.5 signed || die "ikvm build failed" } generate_pkgconfig() {
[gentoo-commits] proj/dotnet:master commit in: dev-dotnet/ikvm/
commit: fcea55124069aa81a70672f05cf07eab868abc27 Author: ArsenShnurkov gmail com> AuthorDate: Thu Mar 17 18:58:55 2016 + Commit: Heather Cynede gentoo org> CommitDate: Thu Mar 17 18:58:55 2016 + URL:https://gitweb.gentoo.org/proj/dotnet.git/commit/?id=fcea5512 lift to the latest mono commit ...r1.ebuild => ikvm-7.2.4630.5_p201602270.ebuild} | 40 -- 1 file changed, 29 insertions(+), 11 deletions(-) diff --git a/dev-dotnet/ikvm/ikvm-7.2.4630.5-r1.ebuild b/dev-dotnet/ikvm/ikvm-7.2.4630.5_p201602270.ebuild similarity index 69% rename from dev-dotnet/ikvm/ikvm-7.2.4630.5-r1.ebuild rename to dev-dotnet/ikvm/ikvm-7.2.4630.5_p201602270.ebuild index 994d253..6f1894f 100644 --- a/dev-dotnet/ikvm/ikvm-7.2.4630.5-r1.ebuild +++ b/dev-dotnet/ikvm/ikvm-7.2.4630.5_p201602270.ebuild @@ -1,17 +1,28 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI="4" +EAPI="6" inherit eutils dotnet 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="ZLIB GPL-2-with-linking-exception" +GITHUBNAME="mono/ikvm-fork" +EGIT_BRANCH="master" +EGIT_COMMIT="00252c18fc0a4a206e45461736a890acb785a9d8" +GITHUBACC=${GITHUBNAME%/*} +GITHUBREPO=${GITHUBNAME#*/} +GITFILENAME=${GITHUBREPO}-${GITHUBACC}-${PV}-${EGIT_COMMIT} +GITHUB_ZIP="https://api.github.com/repos/${GITHUBACC}/${GITHUBREPO}/zipball/${EGIT_COMMIT} -> ${GITFILENAME}.zip" +S="${WORKDIR}/${GITFILENAME}" + +SRC_URI="http://www.frijters.net/openjdk-7u4-stripped.zip + mirror://gentoo/mono.snk.bz2 + ${GITHUB_ZIP}" + SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="" @@ -26,23 +37,30 @@ DEPEND="${RDEPEND} virtual/pkgconfig app-arch/sharutils" +src_unpack() { + default_src_unpack + einfo '"'${WORKDIR}/${GITHUBACC}-${GITHUBREPO}-'"'* + mv "${WORKDIR}/${GITHUBACC}-${GITHUBREPO}-"* "${WORKDIR}/${GITFILENAME}" || die +} + 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 + #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:../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 + #sed -i -e 's:pkg-config --cflags:pkg-config --cflags --libs:' \ + # native/native.build || die mkdir -p "${T}"/home/test java-pkg-2_src_prepare + eapply_user } src_configure() {
[gentoo-commits] proj/dotnet:master commit in: dev-dotnet/ikvm/files/, dev-dotnet/ikvm/
commit: 1d1d6aabaa84dc4d14b3f2b4c55c51dc85675a54 Author: ArsenShnurkov gmail com> AuthorDate: Fri Mar 18 06:25:53 2016 + Commit: Heather Cynede gentoo org> CommitDate: Fri Mar 18 06:25:53 2016 + URL:https://gitweb.gentoo.org/proj/dotnet.git/commit/?id=1d1d6aab patch for removed folders dev-dotnet/ikvm/files/ikvm.build.patch| 23 +++ dev-dotnet/ikvm/ikvm-7.2.4630.5_p201602270.ebuild | 5 - 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/dev-dotnet/ikvm/files/ikvm.build.patch b/dev-dotnet/ikvm/files/ikvm.build.patch new file mode 100644 index 000..8c342d0 --- /dev/null +++ b/dev-dotnet/ikvm/files/ikvm.build.patch @@ -0,0 +1,23 @@ +diff --git a/ikvm.build b/ikvm.build +index 5ba38cc..1b2869a 100644 +--- a/ikvm.build b/ikvm.build +@@ -11,18 +11,7 @@ + + + +- + +- +- +- +- +- +- +- +- +- +- + + + diff --git a/dev-dotnet/ikvm/ikvm-7.2.4630.5_p201602270.ebuild b/dev-dotnet/ikvm/ikvm-7.2.4630.5_p201602270.ebuild index 44f8665..a4d62ca 100644 --- a/dev-dotnet/ikvm/ikvm-7.2.4630.5_p201602270.ebuild +++ b/dev-dotnet/ikvm/ikvm-7.2.4630.5_p201602270.ebuild @@ -45,6 +45,9 @@ src_unpack() { } src_prepare() { + eapply "${FILESDIR}/ikvm.build.patch" + #cp "${FILESDIR}/ikvm.build" "${S}/ikvm.build" || die + # 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 @@ -96,7 +99,7 @@ generate_pkgconfig() { src_install() { local dll dllbase exe insinto /usr/$(get_libdir)/${PN} - doins bin/*.exe +# doins bin/*.exe dodir /bin for exe in bin/*.exe
[gentoo-commits] proj/dotnet:master commit in: dev-dotnet/ikvm/
commit: da004e4d3470a94ba08f43b4ea80e02598831b77 Author: ArsenShnurkov gmail com> AuthorDate: Thu Mar 17 17:49:42 2016 + Commit: Heather Cynede gentoo org> CommitDate: Thu Mar 17 17:49:42 2016 + URL:https://gitweb.gentoo.org/proj/dotnet.git/commit/?id=da004e4d lift java dependency 1.7->1.8 dev-dotnet/ikvm/ikvm-7.2.4630.5-r1.ebuild | 101 ++ 1 file changed, 101 insertions(+) diff --git a/dev-dotnet/ikvm/ikvm-7.2.4630.5-r1.ebuild b/dev-dotnet/ikvm/ikvm-7.2.4630.5-r1.ebuild new file mode 100644 index 000..994d253 --- /dev/null +++ b/dev-dotnet/ikvm/ikvm-7.2.4630.5-r1.ebuild @@ -0,0 +1,101 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="4" + +inherit eutils dotnet 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="ZLIB GPL-2-with-linking-exception" + +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 + java-pkg-2_src_prepare +} + +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 +}