From 8d5dbd847cbc704a6a06405856e94b461011afe3 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 27 Mar 2021 06:06:27 +0000 Subject: gentoo resync : 27.03.2021 --- sys-devel/m4/Manifest | 4 +-- sys-devel/m4/m4-1.4.17.ebuild | 54 ---------------------------------------- sys-devel/m4/m4-1.4.18-r1.ebuild | 49 ------------------------------------ sys-devel/m4/m4-1.4.18-r2.ebuild | 50 +++++++++++++++++++++++++++++++++++++ 4 files changed, 51 insertions(+), 106 deletions(-) delete mode 100644 sys-devel/m4/m4-1.4.17.ebuild delete mode 100644 sys-devel/m4/m4-1.4.18-r1.ebuild create mode 100644 sys-devel/m4/m4-1.4.18-r2.ebuild (limited to 'sys-devel/m4') diff --git a/sys-devel/m4/Manifest b/sys-devel/m4/Manifest index 157d4547dce1..39007f54874e 100644 --- a/sys-devel/m4/Manifest +++ b/sys-devel/m4/Manifest @@ -1,8 +1,6 @@ AUX m4-1.4.17-posix_spawn.patch 3302 BLAKE2B fe00346f2f180fe70ef867376d9a3f0da632d83aeee21aa524642ec061e6c1e37538c37d266a32aea63c6a8f776ee3bc85fd82f447704c1e73965132f528030a SHA512 82f6f1960a290265f1a7a3c868a780fa0816194c26ed5fc8337e35983021798c55db7c75fccf979a7dcc73253d1864cbf2de89a906fc6bf8458a524e2c4604c8 AUX m4-1.4.18-darwin17-printf-n.patch 1386 BLAKE2B e5b1e4750b21b4efc0e62f2447a3f40dd037e28b5fe833d3ddf87fe853ee8885e34c5720b7b00f08242131df9996d36f4a954571ed21d067ca0dfeae69961e09 SHA512 4ad476e538c85ee41280461269dd8acabdbdb9cd2e0e2e49ea43bc14eb370e17282c504403a7c2914d886adf703bcc3b95991724bed90dc014a66cb861a70faf AUX m4-1.4.18-glibc228.patch 13863 BLAKE2B f8b54c3b7feae5d458ba893e08313f5e9772e66be03a5db2fe3929e671002cc3c80cf8cc6ca0a68b792f729404dc27c95cf436663026b50682f47c306721b581 SHA512 c81df4510b01044578e11c7bd1046ec297ab195f6e5c7d7eaad7aae31862326d12cf00a9f36218f93db88e36f88ec73be8e320214b999330da3dc5bba9a3be46 -DIST m4-1.4.17.tar.xz 1149088 BLAKE2B ccba6a1cd80de241bc2e755addbf4876b00ab776e0a3c85691998e3e84e8a091d57d8c3e9b43a115e52e416450de791662a54ca8e64e1603a166029164f140ce SHA512 406e6e97c3f5c5f3c8055bac748d4fe8c2e861d97e84ab6d840a2caa7df04f523cc662d6d51f6afae7d6c219d03693c7ae0c1e669a80246a3ceb5e8342b82389 DIST m4-1.4.18.tar.xz 1207688 BLAKE2B debfaa4d25af6f583e2cd703e77b73775790f48f34e878eddd820c6b244a065c69495473ce5067be1f20ca07b2d6af9f90cffd33e12c18fd719c0d234eb5462a SHA512 06f583efc3855cd8477d8347544f4ae5153a3e50aea74d21968afa7214784ea3ddfc02d0a2b11324120d76a19f2e804d20de11a456b5da929eb6ae469519b174 -EBUILD m4-1.4.17.ebuild 1555 BLAKE2B 2ebb1154f51aa295d3b3cdba31c728684d99486b2794781cf13b17e62eb427d71707500afa0c943435aece261487d780dda85b078d276043c6ab1e127f05b3ba SHA512 bbb3f55867a7e7019c5069c154e0c1125eeb80f6ec19184520e0948997818723071ac6e8b3dc52e1919f78635e99e0113c2139b4da40118a322dbdc3bcf7dd86 -EBUILD m4-1.4.18-r1.ebuild 1367 BLAKE2B 498f14f10d7d3fd9cfea2dfc8244690a036e34aac08eda2ea5469a41d3ad39b3226cee8789f25ce1efbbbc05a057c9aff084fe7e595abc688285736afab881d7 SHA512 a89559f8bbfa2f6d0588646b1969fd602235a474dfde05c4130def070167d6565f993a307861539e74d85d5846fd8816dc6282c11fe42eeed5152869264a14e3 +EBUILD m4-1.4.18-r2.ebuild 1331 BLAKE2B c7270e1440c2f54182075d137199be699898a764dec39f95dd180500408ca8072ae0ae16ea48a39ed876ffbb1ffdc3041eff3ec2f9571b52b65c140db187518b SHA512 b6956a89a8672055f1ba3889461b02b223e79dcbe170d393964220b1c91b9f60877c600b35baba49fd1e6ad6b6ced9e2b986cfdd087127d89d194ba3e706f176 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 diff --git a/sys-devel/m4/m4-1.4.17.ebuild b/sys-devel/m4/m4-1.4.17.ebuild deleted file mode 100644 index 631fdde89ffc..000000000000 --- a/sys-devel/m4/m4-1.4.17.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -inherit eutils - -DESCRIPTION="GNU macro processor" -HOMEPAGE="https://www.gnu.org/software/m4/m4.html" -SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="examples" - -# remember: cannot dep on autoconf since it needs us -DEPEND="app-arch/xz-utils" -RDEPEND="" - -src_prepare() { - epatch "${FILESDIR}"/${P}-posix_spawn.patch #580688, 581086 - - # Disable gnulib build test that has no impact on the source. - # Re-enable w/next version bump (and gnulib is updated). #554728 - [[ ${PV} != "1.4.17" ]] && die "re-enable test #554728" - echo 'exit 0' > tests/test-update-copyright.sh || die -} - -src_configure() { - # Disable automagic dependency over libsigsegv; see bug #278026 - export ac_cv_libsigsegv=no - - local myconf="" - [[ ${USERLAND} != "GNU" ]] && myconf="--program-prefix=g" - econf --enable-changeword ${myconf} -} - -src_test() { - [[ -d /none ]] && die "m4 tests will fail with /none/" #244396 - emake check -} - -src_install() { - default - # autoconf-2.60 for instance, first checks gm4, then m4. If we don't have - # gm4, it might find gm4 from outside the prefix on for instance Darwin - use prefix && dosym m4 /usr/bin/gm4 - if use examples ; then - docinto examples - dodoc examples/* - rm -f "${ED}"/usr/share/doc/${PF}/examples/Makefile* - fi -} diff --git a/sys-devel/m4/m4-1.4.18-r1.ebuild b/sys-devel/m4/m4-1.4.18-r1.ebuild deleted file mode 100644 index ac15d9604e10..000000000000 --- a/sys-devel/m4/m4-1.4.18-r1.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -DESCRIPTION="GNU macro processor" -HOMEPAGE="https://www.gnu.org/software/m4/m4.html" -SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="examples" - -# remember: cannot dep on autoconf since it needs us -DEPEND="app-arch/xz-utils" -RDEPEND="" - -src_prepare() { - eapply "${FILESDIR}"/${P}-darwin17-printf-n.patch - eapply "${FILESDIR}"/${P}-glibc228.patch #663924 - default -} - -src_configure() { - # Disable automagic dependency over libsigsegv; see bug #278026 - export ac_cv_libsigsegv=no - - local myconf="" - [[ ${USERLAND} != "GNU" ]] && myconf="--program-prefix=g" - econf --enable-changeword ${myconf} -} - -src_test() { - [[ -d /none ]] && die "m4 tests will fail with /none/" #244396 - emake check -} - -src_install() { - default - # autoconf-2.60 for instance, first checks gm4, then m4. If we don't have - # gm4, it might find gm4 from outside the prefix on for instance Darwin - use prefix && dosym m4 /usr/bin/gm4 - if use examples ; then - docinto examples - dodoc -r examples/ - rm -f "${ED}"/usr/share/doc/${PF}/examples/Makefile* - fi -} diff --git a/sys-devel/m4/m4-1.4.18-r2.ebuild b/sys-devel/m4/m4-1.4.18-r2.ebuild new file mode 100644 index 000000000000..e8f9585638d5 --- /dev/null +++ b/sys-devel/m4/m4-1.4.18-r2.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="GNU macro processor" +HOMEPAGE="https://www.gnu.org/software/m4/m4.html" +SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="examples" + +# remember: cannot dep on autoconf since it needs us +BDEPEND="app-arch/xz-utils" + +PATCHES=( + "${FILESDIR}"/${P}-darwin17-printf-n.patch + "${FILESDIR}"/${P}-glibc228.patch #663924 +) + +src_configure() { + local -a myeconfargs=( + --enable-changeword + + # Disable automagic dependency over libsigsegv; see bug #278026 + ac_cv_libsigsegv=no + ) + + [[ ${USERLAND} != GNU ]] && myeconfargs+=( --program-prefix=g ) + + econf "${myeconfargs[@]}" +} + +src_test() { + [[ -d /none ]] && die "m4 tests will fail with /none/" #244396 + emake check +} + +src_install() { + default + # autoconf-2.60 for instance, first checks gm4, then m4. If we don't have + # gm4, it might find gm4 from outside the prefix on for instance Darwin + use prefix && dosym m4 /usr/bin/gm4 + if use examples ; then + dodoc -r examples + rm -f "${ED}"/usr/share/doc/${PF}/examples/Makefile* + fi +} -- cgit v1.2.3