commit: 1c1f3451fe580287404e806a23b62a1e8ee18b79 Author: Mikhail Pukhlikov <cynede <AT> gentoo <DOT> org> AuthorDate: Wed Nov 30 08:51:54 2016 +0000 Commit: Mikhail Pukhlikov <cynede <AT> gentoo <DOT> org> CommitDate: Wed Nov 30 08:52:20 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c1f3451
dev-lang/mono: downgrade unstable mono from nightly dev-lang/mono/Manifest | 2 +- ...o-4.9.0.729-r1.ebuild => mono-4.8.0.371.ebuild} | 23 +---- dev-lang/mono/mono-4.9.0.729.ebuild | 115 --------------------- 3 files changed, 5 insertions(+), 135 deletions(-) diff --git a/dev-lang/mono/Manifest b/dev-lang/mono/Manifest index 8886ac0..b746947 100644 --- a/dev-lang/mono/Manifest +++ b/dev-lang/mono/Manifest @@ -1,4 +1,4 @@ DIST mono-2.10.9.tar.bz2 34038017 SHA256 541038cd4edd4a1c485638d49697d45015ef7483bcb21bb6165e4d7eb770c9a5 SHA512 426881873e7f9aaf01e1306bed7b3ac220082ca40dce91fa4f4f331944e8d91453b3cdcc4918882ab039ed694ae8819eeb787edf6a2ad42cc661614076725c01 WHIRLPOOL 93f54fbbf032fb60467fd4317630588d349c3dfb50158bad478bd3e2650fd3e8f12d45be372873b57626d4ac48f798646c3650590bbf731dc2f005ee618b8548 DIST mono-4.4.1.0.tar.bz2 85897587 SHA256 165e7686b5cbb1ab671b4cb2069207999c3d70044002190b6ec84bb1fdf62b4a SHA512 d9b6c57c2d9327ea551083b81a2e6cc222ded9a04862056b0dfded1c5df56efbfc4960097df034595012231fe50d172174ab7b3e3f2d8c4c6953ab2106b1cb6a WHIRLPOOL 99f16622c6d1902a7efff41d55d114ed214979c1d902a5dcbc257c180a1e68ed519beb5383db2358096e3f8425483983565c8f438552de36ffabe4bfad3f5fbd DIST mono-4.6.1.5.tar.bz2 83174665 SHA256 3871ee72bdfc2ea5d636ffff22cf49ae6bac7c4a4f3d687214dd8ac236bbf7c3 SHA512 1d0c1ec2930ecea3faf1be572bc045300ef4a90d3fe7519f2a9c797be79298c61528d83baa5a24a57143a35be80f78297196556c33cd0f345d9907a973fe625a WHIRLPOOL 9ccfdfa68f2d9a75440c71fb22af988165608299d7aaeecac77fc783412cba4524a423b166a540d2381c98c58e3f7e40ada91381d45f67693e1f69e462bbb1d9 -DIST mono-4.9.0.729.tar.bz2 100437013 SHA256 05dcd396c29d40ccc0c4985138bcbd7abca1c326b69c3a85edbc21d8bb5448ef SHA512 7db4b184a2cb6d8aec19cb9e7efd4bbd6fb1c3910bd7141c1109242dd9c389b33403ba28de8bd42c6af5620e92af4c8f79fef0eef2428c53960fc78077f1f973 WHIRLPOOL 070cc2a47ff2f87d7953d50e63c4d379961cb39fcc8009fe19ee7f2ca77fd65ff9f66e7b3844b0b33e89d41ac2d82876b07eec7bf63863a51932161aa4dae065 +DIST mono-4.8.0.371.tar.bz2 88118108 SHA256 5b04de45d153807fa47744e2f678f98947b612e0e8d1cbcf6b10ac3bb0615d29 SHA512 1af02acbb362b8fb60983a1ff1a3026d34a8d2fd46536cce60317911cad2c60d0948858261715706cc387f9a42c4217da9b334ed561b6641c52b346b8d034df6 WHIRLPOOL 62116b051a6487fb90aa12d1d097ce9468d4cff30f9e5e86da1e4a0e1d424cba87fdf9f47b448391d5d8d68b34d9ec7c0c75d556d43d208a3f51e697ea86b6ba diff --git a/dev-lang/mono/mono-4.9.0.729-r1.ebuild b/dev-lang/mono/mono-4.8.0.371.ebuild similarity index 76% rename from dev-lang/mono/mono-4.9.0.729-r1.ebuild rename to dev-lang/mono/mono-4.8.0.371.ebuild index b97f86a..fa00af0 100644 --- a/dev-lang/mono/mono-4.9.0.729-r1.ebuild +++ b/dev-lang/mono/mono-4.8.0.371.ebuild @@ -8,7 +8,7 @@ inherit eutils linux-info mono-env flag-o-matic pax-utils versionator multilib-m 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}/nightly/${P}.tar.bz2"; +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" @@ -68,26 +68,11 @@ src_prepare() { # mono build system can fail otherwise strip-flags - # Fix VB targets - # http://osdir.com/ml/general/2015-05/msg20808.html - #eapply "${FILESDIR}/add_missing_vb_portable_targets.patch" - - # Fix build when sgen disabled - # https://bugzilla.xamarin.com/show_bug.cgi?id=32015 - #eapply "${FILESDIR}/${PN}-4.0.2.5-fix-mono-dis-makefile-am-when-without-sgen.patch" - - # TODO: update patch - # Fix atomic_add_i4 support for 32-bit ppc - # https://github.com/mono/mono/compare/f967c79926900343f399c75624deedaba460e544^...8f379f0c8f98493180b508b9e68b9aa76c0c5bdf - #epatch "${FILESDIR}/${PN}-4.0.2.5-fix-ppc-atomic-add-i4.patch" - - # TODO: update patch - #epatch "${FILESDIR}/systemweb3.patch" - #epatch "${FILESDIR}/fix-for-GitExtensions-issue-2710-another-resolution.patch" - #epatch "${FILESDIR}/fix-for-bug36724.patch" + #TODO: resolve problem with newer binutils + #bug: https://bugs.gentoo.org/show_bug.cgi?id=600664 + #append-flags -fPIC default - #eapply_user multilib_copy_sources } diff --git a/dev-lang/mono/mono-4.9.0.729.ebuild b/dev-lang/mono/mono-4.9.0.729.ebuild deleted file mode 100644 index 6149fa4..00000000 --- a/dev-lang/mono/mono-4.9.0.729.ebuild +++ /dev/null @@ -1,115 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 - -inherit eutils linux-info mono-env flag-o-matic pax-utils versionator multilib-minimal - -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}/nightly/${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" - -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 ) - dev-util/cmake - !dev-lang/mono-basic -" - -S="${WORKDIR}/${PN}-$(get_version_component_range 1-3)" - -pkg_pretend() { - # https://github.com/gentoo/gentoo/blob/f200e625bda8de696a28338318c9005b69e34710/eclass/linux-info.eclass#L686 - # 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 MPROTECT is enable. #286280 - # RANDMMAP kill the build proces to #347365 - # use paxmark.sh to get PT/XT logic #532244 - 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\paxmark.sh -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 - - # Fix VB targets - # http://osdir.com/ml/general/2015-05/msg20808.html - #eapply "${FILESDIR}/add_missing_vb_portable_targets.patch" - - # Fix build when sgen disabled - # https://bugzilla.xamarin.com/show_bug.cgi?id=32015 - #eapply "${FILESDIR}/${PN}-4.0.2.5-fix-mono-dis-makefile-am-when-without-sgen.patch" - - # TODO: update patch - # Fix atomic_add_i4 support for 32-bit ppc - # https://github.com/mono/mono/compare/f967c79926900343f399c75624deedaba460e544^...8f379f0c8f98493180b508b9e68b9aa76c0c5bdf - #epatch "${FILESDIR}/${PN}-4.0.2.5-fix-ppc-atomic-add-i4.patch" - - # TODO: update patch - #epatch "${FILESDIR}/systemweb3.patch" - #epatch "${FILESDIR}/fix-for-GitExtensions-issue-2710-another-resolution.patch" - #epatch "${FILESDIR}/fix-for-bug36724.patch" - - default - #eapply_user - multilib_copy_sources -} - -multilib_src_configure() { - local myeconfargs=( - --disable-silent-rules - $(use_with xen xen_opt) - --without-ikvm-native - --disable-dtrace - $(use_with doc mcs-docs) - $(use_enable nls) - ) - - econf "${myeconfargs[@]}" -} - -multilib_src_test() { - cd mcs/tests || die - emake check -} - -multilib_src_install() { - default_src_install - - # Remove files not respecting LDFLAGS and that we are not supposed to provide, see Fedora - # mono.spec and http://www.mail-archive.com/mono-devel-list@lists.ximian.com/msg24870.html - # for reference. - rm -f "${ED}"/usr/lib/mono/{2.0,4.5}/mscorlib.dll.so || die - rm -f "${ED}"/usr/lib/mono/{2.0,4.5}/mcs.exe.so || die -}
