[gentoo-commits] proj/dotnet:master commit in: dev-lang/mono/, dev-util/monodevelop/

[Heather Cynede]

commit:     7e5c77a9cda53dedf83d4875514bcf432c3feba3
Author:     Heather <Heather <AT> live <DOT> ru>
AuthorDate: Thu May 28 14:23:42 2015 +0000
Commit:     Heather Cynede <cynede <AT> gentoo <DOT> org>
CommitDate: Thu May 28 14:23:42 2015 +0000
URL:        https://gitweb.gentoo.org/proj/dotnet.git/commit/?id=7e5c77a9

QA & clean up

 dev-lang/mono/mono-4.0.1.28.ebuild                | 121 ----------------------
 dev-lang/mono/mono-4.0.1.34.ebuild                |   3 +-
 dev-lang/mono/mono-4.0.1.ebuild                   | 119 ---------------------
 dev-util/monodevelop/monodevelop-5.9.0.431.ebuild |   9 +-
 4 files changed, 5 insertions(+), 247 deletions(-)

diff --git a/dev-lang/mono/mono-4.0.1.28.ebuild b/dev-lang/mono/mono-4.0.1.28.ebuild
deleted file mode 100644
index ec119ca..0000000
--- a/dev-lang/mono/mono-4.0.1.28.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-AUTOTOOLS_PRUNE_LIBTOOL_FILES="all"
-
-inherit eutils linux-info mono-env flag-o-matic pax-utils autotools-utils
-
-DESCRIPTION="Mono runtime and class libraries, a C# compiler/interpreter"
-HOMEPAGE="http://www.mono-project.com/Main_Page"
-SRC_URI="http://download.mono-project.com/sources/${PN}/${P}.tar.bz2"
-
-LICENSE="MIT LGPL-2.1 GPL-2 BSD-4 NPL-1.1 Ms-PL GPL-2-with-linking-exception IDPL"
-SLOT="0"
-
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux"
-
-IUSE="nls minimal pax_kernel xen doc debug"
-
-COMMONDEPEND="
-	!minimal? ( >=dev-dotnet/libgdiplus-2.10 )
-	ia64? (	sys-libs/libunwind )
-	nls? ( sys-devel/gettext )
-"
-RDEPEND="${COMMONDEPEND}
-	|| ( www-client/links www-client/lynx )
-"
-DEPEND="${COMMONDEPEND}
-	sys-devel/bc
-	virtual/yacc
-	pax_kernel? ( sys-apps/elfix )
-"
-
-S="${WORKDIR}/${PN}-4.0.1"
-
-MAKEOPTS="${MAKEOPTS} -j1" #nowarn
-
-pkg_pretend() {
-	# If CONFIG_SYSVIPC is not set in your kernel .config, mono will hang while compiling.
-	# See http://bugs.gentoo.org/261869 for more info."
-	CONFIG_CHECK="SYSVIPC"
-	use kernel_linux && check_extra_config
-}
-
-pkg_setup() {
-	linux-info_pkg_setup
-	mono-env_pkg_setup
-}
-
-src_prepare() {
-	# we need to sed in the paxctl-ng -mr in the runtime/mono-wrapper.in so it don't
-	# get killed in the build proces when MPROTEC is enable. #286280
-	# RANDMMAP kill the build proces to #347365
-	if use pax_kernel ; then
-		ewarn "We are disabling MPROTECT on the mono binary."
-
-		# issue 9 : https://github.com/Heather/gentoo-dotnet/issues/9
-		sed '/exec "/ i\paxctl-ng -mr "$r/@mono_runtime@"' -i "${S}"/runtime/mono-wrapper.in || die "Failed to sed mono-wrapper.in"
-	fi
-
-	# mono build system can fail otherwise
-	strip-flags
-
-	# Remove this at your own peril. Mono will barf in unexpected ways.
-	append-flags -fno-strict-aliasing
-
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	# NOTE: We need the static libs for now so mono-debugger works.
-	# See http://bugs.gentoo.org/show_bug.cgi?id=256264 for details
-	#
-	# --without-moonlight since www-plugins/moonlight is not the only one
-	# using mono: https://bugzilla.novell.com/show_bug.cgi?id=641005#c3
-	#
-	# --with-profile4 needs to be always enabled since it's used by default
-	# and, otherwise, problems like bug #340641 appear.
-	#
-	# sgen fails on ppc, bug #359515
-	local myeconfargs=(
-		--enable-system-aot=yes
-		--enable-static
-		--disable-quiet-build
-		--without-moonlight
-		--with-libgdiplus=$(usex minimal no installed)
-		$(use_with xen xen_opt)
-		--without-ikvm-native
-		--with-jit
-		--disable-dtrace
-		--with-profile4
-		--with-sgen=$(usex ppc no yes)
-		$(use_with doc mcs-docs)
-		$(use_enable debug)
-		$(use_enable nls)
-	)
-
-	autotools-utils_src_configure
-
-	# FIX for uncompilable 3.4.0 sources
-	FF="${WORKDIR}/mono-3.4.0/mcs/tools/xbuild/targets/Microsoft.Portable.Common.targets"
-	rm -f $FF
-	touch $FF
-	echo '<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">' >> $FF
-	echo '    <Import Project="..\\Microsoft.Portable.Core.props" />' >> $FF
-	echo '    <Import Project="..\\Microsoft.Portable.Core.targets" />' >> $FF
-	echo '</Project>' >> $FF
-}
-
-src_compile() {
-	nonfatal autotools-utils_src_compile || {
-		eqawarn "maintainer of this ebuild has no idea why it fails. If you happen to know how to fix it - please let me know"
-		autotools-utils_src_compile
-	 }
-}
-
-src_test() {
-	cd mcs/tests || die
-	emake check
-}

diff --git a/dev-lang/mono/mono-4.0.1.34.ebuild b/dev-lang/mono/mono-4.0.1.34.ebuild
index c76fb8f..09331fe 100644
--- a/dev-lang/mono/mono-4.0.1.34.ebuild
+++ b/dev-lang/mono/mono-4.0.1.34.ebuild
@@ -32,9 +32,8 @@ DEPEND="${COMMONDEPEND}
 	pax_kernel? ( sys-apps/elfix )
 "
 
-S="${WORKDIR}/${PN}-4.0.1"
-
 MAKEOPTS="${MAKEOPTS} -j1" #nowarn
+S="${WORKDIR}/${PN}-4.0.1"
 
 pkg_pretend() {
 	# If CONFIG_SYSVIPC is not set in your kernel .config, mono will hang while compiling.

diff --git a/dev-lang/mono/mono-4.0.1.ebuild b/dev-lang/mono/mono-4.0.1.ebuild
deleted file mode 100644
index 8ba5999..0000000
--- a/dev-lang/mono/mono-4.0.1.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-AUTOTOOLS_PRUNE_LIBTOOL_FILES="all"
-
-inherit eutils linux-info mono-env flag-o-matic pax-utils autotools-utils
-
-DESCRIPTION="Mono runtime and class libraries, a C# compiler/interpreter"
-HOMEPAGE="http://www.mono-project.com/Main_Page"
-SRC_URI="http://download.mono-project.com/sources/${PN}/${P}.tar.bz2"
-
-LICENSE="MIT LGPL-2.1 GPL-2 BSD-4 NPL-1.1 Ms-PL GPL-2-with-linking-exception IDPL"
-SLOT="0"
-
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux"
-
-IUSE="nls minimal pax_kernel xen doc debug"
-
-COMMONDEPEND="
-	!minimal? ( >=dev-dotnet/libgdiplus-2.10 )
-	ia64? (	sys-libs/libunwind )
-	nls? ( sys-devel/gettext )
-"
-RDEPEND="${COMMONDEPEND}
-	|| ( www-client/links www-client/lynx )
-"
-DEPEND="${COMMONDEPEND}
-	sys-devel/bc
-	virtual/yacc
-	pax_kernel? ( sys-apps/elfix )
-"
-
-MAKEOPTS="${MAKEOPTS} -j1" #nowarn
-
-pkg_pretend() {
-	# If CONFIG_SYSVIPC is not set in your kernel .config, mono will hang while compiling.
-	# See http://bugs.gentoo.org/261869 for more info."
-	CONFIG_CHECK="SYSVIPC"
-	use kernel_linux && check_extra_config
-}
-
-pkg_setup() {
-	linux-info_pkg_setup
-	mono-env_pkg_setup
-}
-
-src_prepare() {
-	# we need to sed in the paxctl-ng -mr in the runtime/mono-wrapper.in so it don't
-	# get killed in the build proces when MPROTEC is enable. #286280
-	# RANDMMAP kill the build proces to #347365
-	if use pax_kernel ; then
-		ewarn "We are disabling MPROTECT on the mono binary."
-
-		# issue 9 : https://github.com/Heather/gentoo-dotnet/issues/9
-		sed '/exec "/ i\paxctl-ng -mr "$r/@mono_runtime@"' -i "${S}"/runtime/mono-wrapper.in || die "Failed to sed mono-wrapper.in"
-	fi
-
-	# mono build system can fail otherwise
-	strip-flags
-
-	# Remove this at your own peril. Mono will barf in unexpected ways.
-	append-flags -fno-strict-aliasing
-
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	# NOTE: We need the static libs for now so mono-debugger works.
-	# See http://bugs.gentoo.org/show_bug.cgi?id=256264 for details
-	#
-	# --without-moonlight since www-plugins/moonlight is not the only one
-	# using mono: https://bugzilla.novell.com/show_bug.cgi?id=641005#c3
-	#
-	# --with-profile4 needs to be always enabled since it's used by default
-	# and, otherwise, problems like bug #340641 appear.
-	#
-	# sgen fails on ppc, bug #359515
-	local myeconfargs=(
-		--enable-system-aot=yes
-		--enable-static
-		--disable-quiet-build
-		--without-moonlight
-		--with-libgdiplus=$(usex minimal no installed)
-		$(use_with xen xen_opt)
-		--without-ikvm-native
-		--with-jit
-		--disable-dtrace
-		--with-profile4
-		--with-sgen=$(usex ppc no yes)
-		$(use_with doc mcs-docs)
-		$(use_enable debug)
-		$(use_enable nls)
-	)
-
-	autotools-utils_src_configure
-
-	# FIX for uncompilable 3.4.0 sources
-	FF="${WORKDIR}/mono-3.4.0/mcs/tools/xbuild/targets/Microsoft.Portable.Common.targets"
-	rm -f $FF
-	touch $FF
-	echo '<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">' >> $FF
-	echo '    <Import Project="..\\Microsoft.Portable.Core.props" />' >> $FF
-	echo '    <Import Project="..\\Microsoft.Portable.Core.targets" />' >> $FF
-	echo '</Project>' >> $FF
-}
-
-src_compile() {
-	nonfatal autotools-utils_src_compile || {
-		eqawarn "maintainer of this ebuild has no idea why it fails. If you happen to know how to fix it - please let me know"
-		autotools-utils_src_compile
-	 }
-}
-
-src_test() {
-	cd mcs/tests || die
-	emake check
-}

diff --git a/dev-util/monodevelop/monodevelop-5.9.0.431.ebuild b/dev-util/monodevelop/monodevelop-5.9.0.431.ebuild
index b8f6224..2808847 100644
--- a/dev-util/monodevelop/monodevelop-5.9.0.431.ebuild
+++ b/dev-util/monodevelop/monodevelop-5.9.0.431.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="5"
+EAPI=5
 inherit fdo-mime gnome2-utils dotnet versionator eutils
 
 DESCRIPTION="Integrated Development Environment for .NET"
@@ -16,8 +16,7 @@ SRC_URI="http://download.mono-project.com/sources/${PN}/${P}.tar.bz2
 	https://www.nuget.org/api/v2/package/Microsoft.AspNet.Razor/3.2.2 -> Microsoft.AspNet.Razor.3.2.2.zip
 	https://www.nuget.org/api/v2/package/Microsoft.AspNet.WebPages/3.2.2 -> Microsoft.AspNet.WebPages.3.2.2.zip
 	https://www.nuget.org/api/v2/package/Microsoft.Web.Infrastructure/1.0.0.0 -> Microsoft.Web.Infrastructure.1.0.0.0.zip"
- 		 
-
+ 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
@@ -54,7 +53,7 @@ src_unpack() {
 	mkdir monodevelop-5.9/packages || die
 	cd monodevelop-5.9/packages || die
 	
-	for pkg in	NUnit.2.6.3 \
+	for pkg in NUnit.2.6.3 \
 				NUnit.Runners.2.6.3 \
 				System.Web.Mvc.Extensions.Mvc.4.1.0.9 \
 				Microsoft.AspNet.Mvc.5.2.2 \
@@ -78,7 +77,7 @@ src_prepare() {
 
 	#copy missing binaries
 	cp -fR "${WORKDIR}"/NUnit-2.5.10.11092/bin/net-2.0/framework/* "${S}"/external/cecil/Test/libs/nunit-2.5.10/ || die
-	
+
 	#fix ASP.Net
 	epatch "${FILESDIR}/5.7-downgrade_to_mvc3.patch"
 	# fix for https://github.com/gentoo/dotnet/issues/42