diff options
Diffstat (limited to 'sys-devel/m4')
-rw-r--r-- | sys-devel/m4/Manifest | 3 | ||||
-rw-r--r-- | sys-devel/m4/m4-1.4.19-r2.ebuild (renamed from sys-devel/m4/m4-1.4.19-r1.ebuild) | 2 | ||||
-rw-r--r-- | sys-devel/m4/m4-1.4.19.ebuild | 100 |
3 files changed, 1 insertions, 104 deletions
diff --git a/sys-devel/m4/Manifest b/sys-devel/m4/Manifest index 658ab7b70354..4b4cab906481 100644 --- a/sys-devel/m4/Manifest +++ b/sys-devel/m4/Manifest @@ -5,6 +5,5 @@ AUX ppc-musl.patch 824 BLAKE2B b3476471c27a748a67f237d7f34ede06446417a310737d466 DIST m4-1.4.19-test-198-sysval-r1.patch.gz 6292 BLAKE2B 62f52c8bb75e7b8f11e487906f1ce47069ea6d3095fd6532aa6b47bcd8109b7cd733fde26915d449a1cfc326f27f5ed83ba29a5a80687b8b9bdb73c8d87e96b8 SHA512 c3e7d4c1631e401c6b5477c22fd5de837188acf9d72551b116c665a927d1799b1fb249e90c9fb4f6f2f328ee84b2e4dd0bf54f684139997c19ee5b69a3e9284d DIST m4-1.4.19.tar.xz 1654908 BLAKE2B 08694485a49c542761fa9a7db4d7609f4dfb08a5c6b785b57f2e14cf1f696c2a1c788bb5eb934e8159a632b63ff071dfe42511d0109d7b1828f46d33c8bf416a SHA512 47f595845c89709727bda0b3fc78e3188ef78ec818965b395532e7041cabe9e49677ee4aca3d042930095a7f8df81de3da1026b23b6897be471f6cf13ddd512b DIST m4-1.4.19.tar.xz.sig 488 BLAKE2B 99e89b1ed0bf158d29a652392fb122e23227e895c75a8c63057ebe33f11b433ab205ae99a991578a89df8c3e723fc00669d8cdb290fbc86eaa6c704b112e4370 SHA512 d6ac9c6a54c57e9b53fb3e34a60d49df2f46a6e494da0a0c9ae8246b984e68a853b5d8c42677c1a0485c3f36b0bce10a481d3775c0edc1dbdfb27b43545bc31e -EBUILD m4-1.4.19-r1.ebuild 2751 BLAKE2B a8dc892323599940e4f7c91a1bd5fe481aece43ba05e1de6c0188f23264b4183085aab3fa7ef19dceb20423fcce61155d645d1907f87ada308af0ae69be02cfe SHA512 04502ca8b1ebc227e8b0d3ab854e902eee9d061e34479d0628f4ed2ef10d8229e626c35c2730224a9347fec0c55e7e323622c1efd6c995172e387af431803b3c -EBUILD m4-1.4.19.ebuild 2702 BLAKE2B cd5c043fc061c27f9c7aeb33804f53675823ddcfd59e4bb9c99f5ae5a3cf047d14c64320affa59f1ca7d246c185da979abd9f9d14cad016002665bcc345c9ed3 SHA512 7945c7dc4a66b4b5b24fce265fda45e2bc1a3d97b3a480162938a8ac2e78e260408b2f8ed25d5023dacf485249997df8f22e299db4afa243355c69cec00bd494 +EBUILD m4-1.4.19-r2.ebuild 2685 BLAKE2B d0a830922f675ade614293444cb87fee203113472ab9f194c4e8916b88e4bfe61683cbb23ac263f24fce3dea6e403671d81c69256d136fa977c27a73dff30e15 SHA512 a3b08f539e9bc80c8249543f45551497418bcb4e2286773120aa8061ccb0742e4bf73de2473fb0b351111f338f4115bdca92399871b6e3edf871eb3266265c6e MISC metadata.xml 337 BLAKE2B dfc1567438a22dc64fbcd7c88e0840408e11b95e718134a839e1a9b526d6b618a40887c55097c8a36fd1757f9affe6acf07bd761efd59e372b95dd52110146b9 SHA512 066643eb5bc9f637200a19197c3c4825f3e032c568c0bb440b21c0b337a3ef30f69a1a1a4b38929b19ef22f9fd25d0f86079a11b33f7d1832165d216d269538d diff --git a/sys-devel/m4/m4-1.4.19-r1.ebuild b/sys-devel/m4/m4-1.4.19-r2.ebuild index e4e29d315999..8614334fbd84 100644 --- a/sys-devel/m4/m4-1.4.19-r1.ebuild +++ b/sys-devel/m4/m4-1.4.19-r2.ebuild @@ -77,8 +77,6 @@ src_configure() { ac_cv_libsigsegv=no ) - [[ ${USERLAND} != GNU ]] && myeconfargs+=( --program-prefix=g ) - econf "${myeconfargs[@]}" } diff --git a/sys-devel/m4/m4-1.4.19.ebuild b/sys-devel/m4/m4-1.4.19.ebuild deleted file mode 100644 index aac415f79961..000000000000 --- a/sys-devel/m4/m4-1.4.19.ebuild +++ /dev/null @@ -1,100 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/m4.asc -inherit verify-sig - -DESCRIPTION="GNU macro processor" -HOMEPAGE="https://www.gnu.org/software/m4/m4.html" -if [[ ${PV} == *_beta* ]] ; then - MY_P="${PN}-1.4.18d" - SRC_URI="https://alpha.gnu.org/gnu/${PN}/${MY_P}.tar.xz" - SRC_URI+=" verify-sig? ( https://alpha.gnu.org/gnu/${PN}/${MY_P}.tar.xz.sig )" - S="${WORKDIR}/${MY_P}" -else - SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" - SRC_URI+=" https://dev.gentoo.org/~floppym/dist/${P}-test-198-sysval-r1.patch.gz" - SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -fi - -LICENSE="GPL-3" -SLOT="0" -IUSE="examples nls" - -RDEPEND=" - virtual/libiconv - nls? ( - sys-devel/gettext - virtual/libintl - )" -DEPEND="${RDEPEND}" -# Remember: cannot dep on autoconf since it needs us -BDEPEND="app-arch/xz-utils - nls? ( sys-devel/gettext ) - verify-sig? ( sec-keys/openpgp-keys-m4 )" - -PATCHES=( - "${FILESDIR}"/ppc-musl.patch - "${FILESDIR}"/loong-fix-build.patch - "${FILESDIR}"/${PN}-1.4.19-make-4.4-tests.patch - "${WORKDIR}"/${P}-test-198-sysval-r1.patch -) - -src_unpack() { - if use verify-sig ; then - # Needed for downloaded patch (which is unsigned, which is fine) - verify-sig_verify_detached "${DISTDIR}"/${P}.tar.xz{,.sig} - fi - - default -} - -src_prepare() { - default - - # touch generated files after patching m4, to avoid activating maintainer - # mode - # remove when loong-fix-build.patch is no longer necessary - touch ./aclocal.m4 ./lib/config.hin ./configure ./doc/stamp-vti || die - find . -name Makefile.in -exec touch {} + || die -} - -src_configure() { - local -a myeconfargs=( - --enable-changeword - - --with-packager="Gentoo Linux" - --with-packager-version="${PVR}" - --with-packager-bug-reports="https://bugs.gentoo.org/" - - $(usex nls '' '--disable-nls') - - # 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 -} |