commit: 144c6102e66d538379514eea52e44841e582eb34 Author: Mikhail Pukhlikov <cynede <AT> gentoo <DOT> org> AuthorDate: Wed Oct 10 10:23:01 2018 +0000 Commit: Mikhail Pukhlikov <cynede <AT> gentoo <DOT> org> CommitDate: Thu Oct 11 06:42:02 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=144c6102
dev-lang/mono: bump to 5.16, drop multilib, clean old Package-Manager: Portage-2.3.51, Repoman-2.3.11 Signed-off-by: Mikhail Pukhlikov <cynede <AT> gentoo.org> dev-lang/mono/Manifest | 4 +- dev-lang/mono/mono-4.6.1.5-r1.ebuild | 117 --------------------- dev-lang/mono/mono-5.14.0.177.ebuild | 4 +- ...no-5.12.0.226.ebuild => mono-5.16.0.179.ebuild} | 20 ++-- dev-lang/mono/mono-5.4.1.6.ebuild | 109 ------------------- 5 files changed, 12 insertions(+), 242 deletions(-) diff --git a/dev-lang/mono/Manifest b/dev-lang/mono/Manifest index 79b46063ca0..8f4f0a10078 100644 --- a/dev-lang/mono/Manifest +++ b/dev-lang/mono/Manifest @@ -1,6 +1,4 @@ DIST mono-4.4.1.0.tar.bz2 85897587 BLAKE2B 79651189e696aa7352704e1ac659302423b1212c88337da8d522aad8e8a49855b74c43020f506b3455ce1a99566e96ae464fecced584b14470d0c8dfe605c5b6 SHA512 d9b6c57c2d9327ea551083b81a2e6cc222ded9a04862056b0dfded1c5df56efbfc4960097df034595012231fe50d172174ab7b3e3f2d8c4c6953ab2106b1cb6a -DIST mono-4.6.1.5.tar.bz2 83174665 BLAKE2B ce4586af882c6592d1615156d009e496b8405dcf3a2b59e53bb58d1949c33d68645506378eab272a6ef340194582333c515b38f635e961edc64767078905a2df SHA512 1d0c1ec2930ecea3faf1be572bc045300ef4a90d3fe7519f2a9c797be79298c61528d83baa5a24a57143a35be80f78297196556c33cd0f345d9907a973fe625a DIST mono-4.8.0.524.tar.bz2 87392723 BLAKE2B ac17c3da6d6c08c4cb72c4fa300ded92625bd8c14c1e45ea9539efa42c8d085759f7bb298fe5df57bd41f18abf83f293d26a9e6272944933fcff0a3c16a7e4f3 SHA512 eb77b768a4a26e6a2a872f4845769cdc83f01af3377ecd6d932437d2a1b54bfd1ce727563906146195a54997b4b624fb75449a6f0bcfe818cbc4e6544841bf2b -DIST mono-5.12.0.226.tar.bz2 213373240 BLAKE2B 6aa8d9962aa51d6a7f8f6106835cef6a4eb626d7af56a09ca185736db2535dbaffd5d97d5d0eef39001b11d41d868706be4788496c8d0036bdbad24c5f6fcc46 SHA512 f4ab3066c9a3545ace0c4af50ddbe58cf5d9ffe4895cc546669f329b91988fcfebab91a070ea46b27536040823a3bbc1bd7e5552a49769988e8271d52662c583 DIST mono-5.14.0.177.tar.bz2 219729440 BLAKE2B c21af7f541e5fcd456faeaf654ded7937da5241feb94b0de464a880915d758791ff7a645dbcb4023e7cced7ab0854bb8da0cc246abc6ab575bb278aa58fdc8c7 SHA512 f13afbe4289e177705642f79f4236710bdc8db8e956782c5370baf22207d6713f7997ec286c7742416c8206d2da205f295437d1afcdc430628d13e32f0e87d2d -DIST mono-5.4.1.6.tar.bz2 204934321 BLAKE2B 7aa3450a9bc4033f8084c4271b215af636e0df72d6349c97e0acd110d91e276d22b735d19bac2fb1e995ec34fa9e041831358a01d5c098b9c5e8b567d98350fe SHA512 d3618e9f127bc95b15feba5bf73317574872208770d83b8b545a9888df81a629e6fb14160db8a38526ffeb005f682e8dd9b8ced84bdb0cbb36dc9e7b28c240a4 +DIST mono-5.16.0.179.tar.bz2 231379081 BLAKE2B bdcb770d28eea953d428b8d41221bb192adf17bd677711fe17b44e2faa174d59adbe7816297c5eafa2589bb871d3bc2bb84b6e99a11df63758ff6f1b83b8814e SHA512 17d29dc19e3694abd236a50dda99ab85a215d1e88b8d6474c8b8b638dfe8a0f8d60ee3d3d5da600a861cfe6a0dda77cbf3594e9c5dd8b599c80363b4f01d9f1e diff --git a/dev-lang/mono/mono-4.6.1.5-r1.ebuild b/dev-lang/mono/mono-4.6.1.5-r1.ebuild deleted file mode 100644 index 3ed76fb6a64..00000000000 --- a/dev-lang/mono/mono-4.6.1.5-r1.ebuild +++ /dev/null @@ -1,117 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -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="https://www.mono-project.com/Main_Page"; -SRC_URI="https://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" - -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}-$(get_version_component_range 1-3)" - -pkg_pretend() { - linux-info_pkg_setup - if use kernel_linux; then - if linux_config_exists; then - linux_chkconfig_builtin SYSVIPC || die "SYSVIPC not enabled in the kernel" - else - # https://github.com/gentoo/gentoo/blob/f200e625bda8de696a28338318c9005b69e34710/eclass/linux-info.eclass#L686 - ewarn "kernel config not found" - ewarn "If CONFIG_SYSVIPC is not set in your kernel .config, mono will hang while compiling." - ewarn "See http://bugs.gentoo.org/261869 for more info." - fi - fi -} - -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 -} diff --git a/dev-lang/mono/mono-5.14.0.177.ebuild b/dev-lang/mono/mono-5.14.0.177.ebuild index 4d520080eb6..057c8e099f0 100644 --- a/dev-lang/mono/mono-5.14.0.177.ebuild +++ b/dev-lang/mono/mono-5.14.0.177.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~arm64" +KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux" RESTRICT="mirror" SLOT="0" diff --git a/dev-lang/mono/mono-5.12.0.226.ebuild b/dev-lang/mono/mono-5.16.0.179.ebuild similarity index 88% rename from dev-lang/mono/mono-5.12.0.226.ebuild rename to dev-lang/mono/mono-5.16.0.179.ebuild index 4d520080eb6..6179696890e 100644 --- a/dev-lang/mono/mono-5.12.0.226.ebuild +++ b/dev-lang/mono/mono-5.16.0.179.ebuild @@ -1,14 +1,17 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~arm64" + +KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux" + RESTRICT="mirror" SLOT="0" IUSE="nls minimal pax_kernel xen doc" -inherit autotools eutils linux-info mono-env flag-o-matic pax-utils multilib-minimal +#TODO: multilib-minimal support +inherit autotools eutils linux-info mono-env flag-o-matic pax-utils DESCRIPTION="Mono runtime and class libraries, a C# compiler/interpreter" HOMEPAGE="http://www.mono-project.com/Main_Page"; @@ -69,17 +72,12 @@ src_prepare() { # mono build system can fail otherwise strip-flags - #TODO: resolve problem with newer binutils - #bug: https://bugs.gentoo.org/show_bug.cgi?id=600664 - #append-flags -fPIC - default # PATCHES contains configure.ac patch eautoreconf - multilib_copy_sources } -multilib_src_configure() { +src_configure() { local myeconfargs=( --disable-silent-rules $(use_with xen xen_opt) @@ -92,12 +90,12 @@ multilib_src_configure() { econf "${myeconfargs[@]}" } -multilib_src_test() { +src_test() { cd mcs/tests || die emake check } -multilib_src_install() { +src_install() { default_src_install # Remove files not respecting LDFLAGS and that we are not supposed to provide, see Fedora diff --git a/dev-lang/mono/mono-5.4.1.6.ebuild b/dev-lang/mono/mono-5.4.1.6.ebuild deleted file mode 100644 index 22de8a7240e..00000000000 --- a/dev-lang/mono/mono-5.4.1.6.ebuild +++ /dev/null @@ -1,109 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools eutils linux-info mono-env flag-o-matic pax-utils versionator multilib-minimal - -DESCRIPTION="Mono runtime and class libraries, a C# compiler/interpreter" -HOMEPAGE="https://www.mono-project.com/Main_Page"; -SRC_URI="https://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 ~arm64" - -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 -" - -PATCHES=( - "${FILESDIR}"/${PN}-5.0.1.1-x86_32.patch -) - -#S="${WORKDIR}/${PN}-$(get_version_component_range 1-3)" - -pkg_pretend() { - linux-info_pkg_setup - if use kernel_linux; then - if linux_config_exists; then - linux_chkconfig_builtin SYSVIPC || die "SYSVIPC not enabled in the kernel" - else - # https://github.com/gentoo/gentoo/blob/f200e625bda8de696a28338318c9005b69e34710/eclass/linux-info.eclass#L686 - ewarn "kernel config not found" - ewarn "If CONFIG_SYSVIPC is not set in your kernel .config, mono will hang while compiling." - ewarn "See https://bugs.gentoo.org/261869 for more info." - fi - fi -} - -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 - - #TODO: resolve problem with newer binutils - #bug: https://bugs.gentoo.org/show_bug.cgi?id=600664 - #append-flags -fPIC - - default - # PATCHES contains configure.ac patch - eautoreconf - 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 -}
