diff options
author | V3n3RiX <venerix@koprulu.sector> | 2023-11-22 05:13:16 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2023-11-22 05:13:16 +0000 |
commit | 734d2dac3e96161f025c33aa2d518d798cd06580 (patch) | |
tree | 77bbca9599a6ffb5ff949095afeef39f04753795 /sys-devel/autoconf-vanilla | |
parent | 51a01b0f2371b8dfc39f2747ecafd7d5f083ecb4 (diff) |
gentoo auto-resync : 22:11:2023 - 05:13:16
Diffstat (limited to 'sys-devel/autoconf-vanilla')
22 files changed, 914 insertions, 0 deletions
diff --git a/sys-devel/autoconf-vanilla/Manifest b/sys-devel/autoconf-vanilla/Manifest new file mode 100644 index 000000000000..f5ae87a52462 --- /dev/null +++ b/sys-devel/autoconf-vanilla/Manifest @@ -0,0 +1,26 @@ +AUX autoconf-2.13-destdir.patch 604 BLAKE2B 4c3607a31a7e99820b49dea142e9b2445a70508cedf7407f7822f86fb4d1595ced6ab202bf6e42e422f41e44c256e62ee2a617f5ea01d1319c66f811333d5c1e SHA512 c69c7681b028f82735e0187dc9ea0d73906b74e32a6d51754e2c973a559895590fb5a1701d153445b772bcf0536a4688292895242910f20e6d4cf1a02f1a877f +AUX autoconf-2.13-gentoo.patch 799 BLAKE2B e9d403d2e7e6ca2efafcf9b2e7108f8b383b107bc78290242f0ed2662ec8e05c5a178f8014e6317f260695cbaa0e4c6a2cce3221d1990b1fd2a96fa3db5ce611 SHA512 5712ad0d67cb5661c949700d5bc0d8c582b27562229400e7b8b1c0249020d13077af5ef3602adef7135cc8dfe529556d5a23f2ce494e3554322262510c2a9fb7 +AUX autoconf-2.13-perl-5.26.patch 387 BLAKE2B 21152b0df23fc2567b52a0f1afb27c85ccc343fadb0055b6e7d592a2de30120d4cabacb42355b9024a2058211e0fa8df1d64af6a4d467ff3c334a9e2cd3ff9de SHA512 0729e8478095b81d833f159fb3c8c242aa78220719af3cf5409034994f40de809fa308541c55c6de0a84f911a8eb74c7800f4a9b66342443fd0f2ba18e392234 +AUX autoconf-2.13-test-fixes.patch 547 BLAKE2B aa7509f3098da8e2723f835133e375d63896ea65b3030037d625361fa01a02e7e982920cedcbfdf1679783fd7a6a8f0b8476e583749419fd8d103735c0b98d2d SHA512 085e7525c66e710b42dcb068c8aeda89488d1e926e493bcab74e1a1440f53f67630d6998a2a9eff6dc65cf8f71cad19127d541422b51a2519163b51ba78ae592 +AUX autoconf-2.61-darwin.patch 454 BLAKE2B c98084d8109ead961c446aecd38d150b244a83a62870e6820c10024085c023ebcbc75d2c388e170c3bdbd562e3a2b795271c52c02b3245ccc30195443d82d89b SHA512 7d11430a596cfa8624380fa21cfee4f4684a0144d4a4f93218656cedc0aeba2e7bf85dd52f7cdad3ef2a9aa4d5213c318b6cde8a33c09690ea4dddc7d8057101 +AUX autoconf-2.69-fix-libtool-test.patch 1093 BLAKE2B e7b98ae1c84d6d0a41daa16c71cab644328c850c77214dd15c99c2b1ae2ee040ef3d75d4dbe3301992bdb9ad2f2b48f4a6363b14e9f6765863e57f0047b83f86 SHA512 38506631fdde1f80a3467673e6fb48d4751323462c1657c85e2b5289e1219ef236ed9af3a66906c8851a62c244c1ffed70537a5f1421539429a9aa04e929d727 +AUX autoconf-2.69-make-tests-bash5-compatible.patch 2275 BLAKE2B 17fd9702c37cc7686a232e0bb93e5fc04d11b65945f89d79673302bec393bd5572a961b0ecedd743b3336f2583534063b6dd9b3095d0cc6bbd4cf55a58145c54 SHA512 f2672e99afb69cf625097ba5e6d15356eec5c41e095ff60da33331184ecd635d97fa20f20a2db8cfdeb96fde14dca0cdee7081df3328e8032f66eeed58374e36 +AUX autoconf-2.69-perl-5.26-2.patch 1003 BLAKE2B e2a858f905f20d46a52ac7d78be63ef0ea5ce0b87a7059ea17317bed3b658c0eafe3f9d8b1b11f4d84d3160bfa3f504e980870fe562d7a1ba6da1c70177e49bb SHA512 b02086ac8a468a626d8b6506aa14e19ef10e4d33b91a7647f74d5746cce9f690d6cf5840ea81c593f63e8f94275974f31c8695065844380678e83153c1b547d0 +AUX autoconf-2.69-perl-5.26.patch 820 BLAKE2B 405d92044f338b8c7f0ebc6b0007938143c011eff116a65dd06a126a9ab3b127ee766c618e0d51caf88821d979632e7949c843ebad1c5c9e87ad066aa4a46376 SHA512 0202c099b85102dab18ad7d4268b836cadf587d0a48aefa386e70539b3b689fd580053d7287730f1d0a9cc97d6eeb41c1579a181a82a5cb2e04e436bb96d0b20 +AUX autoconf-2.71-AC_LANG_CALL_C_cxx.patch 1376 BLAKE2B 475ece38cc5e4c4990db922e1500817df22af5303fab4f7f8810391aa2c6ddde799edf72c68c9f87db51be2ac327e7a1db8af845c5e804dbb540701fac0fbafd SHA512 c82eee93927952826385ecb4eb72e495632b73ff317173180e3823b434be6be50c81e135ddd78e63e5d8479232c49d6bbe3788a4df751a794a70fae818eb5463 +AUX autoconf-2.71-conflicts.patch 1587 BLAKE2B a8ccd285f3946dd4be9475e665de442748d3a1edc418a93f33f33bdaa4bf6aa2701d33867ebd22ad27bf5c8cf66b0b8cd6aec1f8eeb1265dbdfca03eaffc0145 SHA512 f0f422bdeb67c0455d1486f750d705a199092b7e46d3736de6c359aab9fcc0cece4f7c26ea51e551e56134ac45526bba3c1af0834f1b23d088fd23bde0d53e5d +AUX autoconf-2.71-darwin.patch 525 BLAKE2B 641a98ccc5070ed46480c65c3966b7c047a48bc44930b0ca6039e492d383857140fa7da152eb60ad6bc51ad129cfbf66bd9863dea25672f985b38422a4ce3160 SHA512 92c528f416c6dbc413bd027c6684b8bf14b397164e13d5a2e754e23ac0803b09b20bf54ec89e495736b122eb6b519013c94b54d36fa7aff2715454a6321d0a05 +AUX autoconf-2.71-make-4.4.patch 966 BLAKE2B 0dfcd9aa7240085aef73b8f5a72e3c4dfbce61f1eed2149295318707435343a19a7aa71f6d3aa355638094791e04339b73af9869accbb602895c35ee1a2a25ac SHA512 7f968ddb2305ce03993dce735ff7b7e71f3f8cf06f3ddba7d40e2f8bc059f4bae4427102d247928a433d8e0af7cd1ec4b6f2654415da361111427ad05af33754 +AUX autoconf-2.71-time.patch 1253 BLAKE2B 0f791c225bddb89dab42b3927e1993f260df90de3a80bf0360f573231abd2c99128fccbc88eec82e9a7a07b7c9b4aa2dd8a7db1832d4ac5dbada34b4b2c4a213 SHA512 e84f4d0a700653ba244c6169f516666b4ce3328c90a5461690f6109649504350b5823fd109cc2298ddf05e81fab3aceea955547b02c7472acb44dcc31ba79b70 +AUX autoconf-2.72c-conflicts.patch 1629 BLAKE2B 41e01eb20345f57183ed821253346458fa27a19874accaba3cb581a6082849a3c7343c7bfdd25ec22f2530bec3e016e02ca90d74eb7136eed970789242a89e77 SHA512 080c1a7f06de8f3ce8e7be2cd23ee3892df1ed3a9153929ff43e7eafc2010a50d71b70a3e49cb0beb4fc32296731579c0eebae57435e5ae2d9fc0339bd8bd84a +DIST autoconf-2.13.tar.gz 443844 BLAKE2B ade10f9d4a0b1a0e8b752eee817cfe100d77b074192b9892330402ddc5b62dda1a3485ce0c36e72191daa9fd49382b99851cb6aa3a13aca8cf2ae6e884638fb6 SHA512 602584f4c77b7a554aaa068eda5409b68eb0b3229e9c224bffb91c83c4314d25de15bd560a323626ff78f6df339c79e1ef8938c54b78ecadf4dc75c5241290ad +DIST autoconf-2.69-runstatedir_patches.tar.xz 257096 BLAKE2B ae765e0ca7fe8261117f6f6b75611c232fc3d4016c22c86346afa72f2b7e6c3b7ccc1f9dfe134b2443f8bde6d578b503d79cf88472f76ce75b6c2e843ef55b8e SHA512 55f93299fe5243151f6bb782986a7935270f06d5065929f4d365a37aba05703e3ce66ecf7981d30413db50ee6b4f77d81d10a71b539c8a366c5c5a156c5443da +DIST autoconf-2.69.tar.xz 1214744 BLAKE2B 71d33d72a06e9a05fbed0eda73bc9d8a3805c7c90bf082959862f93f3c5f01192114176e84d84ecb58fa99512eafbc0ab21ad1407be18c8c63bb3dc1117c482d SHA512 995d3e5a8eb1eb37e2b7fae53c6ec7a9b4df997286b7d643344818f94636756b1bf5ff5ea9155e755cb9461149a853dfbf2886fc6bd7132e5afa9c168e306e9b +DIST autoconf-2.71.tar.xz 1292296 BLAKE2B 7fd4b98b4cfff10720e8da6ee91045637991643b50fcb3e47a0ecfcc01600f7b7b36fd1c0a5f08b68a418f1bdbd8d5a98de1008157595dd37cc3a31facb61416 SHA512 73d32b4adcbe24e3bafa9f43f59ed3b6efbd3de0f194e5ec90375f35da1199c583f5d3e89139b7edbad35171403709270e339ffa56a2ecb9b3123e9285021ff0 +DIST autoconf-2.72c.tar.xz 1374524 BLAKE2B 066a1687d66f22f31dfc889c89e618b3b8f3887162639d5349e95517fba7784d88355310f6ec22b3f85838be5e1dbf27b27e618e079e1fefd0358d835e718443 SHA512 7baa0af656879ef446ffca75763cde3a2391851fcc2dc08ddd00846fa474bb7a6beccc694a5ccb72fc5e0261a90f14b4aa72b6b91a8689ff8c651aa7706b55d5 +EBUILD autoconf-vanilla-2.13.ebuild 1585 BLAKE2B 7d3c5b3bc2d0c01e0732706a641d35f5f9172ba78189c10d1a5be2391e7a4f8f85bc4f55d9bdc76322cb13418dbb9672fa13ec238a000d7c74423c1addef2a97 SHA512 b9a9e695852fa3491a5bcf69bd1f056895b21976835161ca1cb8d6f4023fe31e0b6ee823351bddf6beccbee8116588698ce90493753c85b8c2d29b66478e3483 +EBUILD autoconf-vanilla-2.69.ebuild 2120 BLAKE2B 99f4b5d0afcb8d7b45529d22a3983dccf75bb813ddaa3897d0b93187dc9ddfc316afa139f8d6fce068d5ef5549291c07d5ceb5b3b77ca24fb6b4383e70b13660 SHA512 8de0684f9990b37a0ea1b92f022fa92f87cef8699d9d8e383da294afe57f189ddcb92fef5f1b807765fb537191de1777c61cd4306f530c4a9fda8b4c0f99d9c6 +EBUILD autoconf-vanilla-2.71.ebuild 2186 BLAKE2B 696707e661faf922df2261d92ce93fd8b4d1a6be78931feadd4fdd70fe701b14c5f93aa6d84c7b3a0edbffb60da5156d75d7b3885db9087f32d0ebf062b38a2c SHA512 644f950236f5d9d2c0cd52b515a181b57fa3ca74c8f567b4fcb513552a522c5c3a5a1e65180927e0d40c58131b810357eca88a98c6f30c0b7ee400a0888d23e2 +EBUILD autoconf-vanilla-2.72c.ebuild 2335 BLAKE2B a4a97c66e8d0abb9a98c6d3d2a4261cf2ae24189202a4ee7ffbeb882f7778a360a508a3e22fd8ce7a044db1b0e20d77b0c85dc8952765d447babe716f6dd9061 SHA512 4b9ab7d3a0e5c4901d5dec9effe5d4e10a49bf3cf2152b331d4e33ab6f6e006097141025a09ea6647668870a49508a7973e0a47e86397a73fc84a5d0daaa7b3c +EBUILD autoconf-vanilla-9999.ebuild 2281 BLAKE2B 22570603a4d94b1cf2a8b0ff942a40ac7255d7c67821a2aa9f1096acd9e781426f46cb7ef44126a2f7407946c1ebea5016128e992ae963b915b39fc922c68f44 SHA512 2ed31d743014123ea204a1302995999a7bc16cfe4f16bf2c450a71f6fa0882b8a83b44bbf0e4b3ec58d774764cd20e7cb9c6a921118b282188ee72903bd4d42e +MISC metadata.xml 343 BLAKE2B e5fd0138606384a4d646b618c096693858ddc94d09e0bb4dd3ecc6ef064a1edf9586f62a5cc753f680d73b2a6c72ed00739b21e54d490dd8edc97aa32dd05309 SHA512 6b06b7e7a5e47a4de92b2032ba3af669916818038802309e4db26917aa536387d2227feb33c29976179fb3cbb10d4b2f975d1055308e6db81a734baf1e8c1e5e diff --git a/sys-devel/autoconf-vanilla/autoconf-vanilla-2.13.ebuild b/sys-devel/autoconf-vanilla/autoconf-vanilla-2.13.ebuild new file mode 100644 index 000000000000..a1101e7c7dee --- /dev/null +++ b/sys-devel/autoconf-vanilla/autoconf-vanilla-2.13.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-autoconf + +MY_PN=${PN/-vanilla} +MY_P=${MY_PN}-${PV} + +DESCRIPTION="Used to create autoconfiguration files" +HOMEPAGE="https://www.gnu.org/software/autoconf/autoconf.html" +SRC_URI="mirror://gnu/${MY_PN}/${MY_P}.tar.gz" +S="${WORKDIR}"/${MY_P} + +LICENSE="GPL-2" +SLOT="${PV:0:3}" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +IUSE="test" +RESTRICT="!test? ( test )" + +BDEPEND=" + dev-lang/perl + sys-devel/m4 + test? ( dev-util/dejagnu ) +" +RDEPEND=" + ${BDEPEND} + sys-apps/texinfo + >=sys-devel/autoconf-wrapper-13 +" + +PATCHES=( + "${FILESDIR}"/${MY_P}-gentoo.patch + "${FILESDIR}"/${MY_P}-destdir.patch + "${FILESDIR}"/${MY_P}-test-fixes.patch #146592 + "${FILESDIR}"/${MY_P}-perl-5.26.patch +) + +src_configure() { + # need to include --exec-prefix and --bindir or our + # DESTDIR patch will trigger sandbox hate :( + # + # need to force locale to C to avoid bugs in the old + # configure script breaking the install paths #351982 + # + # force to `awk` so that we don't encode another awk that + # happens to currently be installed, but might later be + # uninstalled (like mawk). same for m4. + export ac_cv_path_M4="m4" ac_cv_prog_AWK="awk" + export LC_ALL=C + + toolchain-autoconf_src_configure \ + --exec-prefix="${EPREFIX}"/usr \ + --bindir="${EPREFIX}"/usr/bin \ + --datadir="${EPREFIX}"/usr/share/"${P}" \ + --infodir="${TC_AUTOCONF_INFOPATH}" +} diff --git a/sys-devel/autoconf-vanilla/autoconf-vanilla-2.69.ebuild b/sys-devel/autoconf-vanilla/autoconf-vanilla-2.69.ebuild new file mode 100644 index 000000000000..e5e60776090a --- /dev/null +++ b/sys-devel/autoconf-vanilla/autoconf-vanilla-2.69.ebuild @@ -0,0 +1,79 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://git.savannah.gnu.org/git/autoconf.git" + inherit git-r3 +else + MY_PN=${PN/-vanilla} + MY_P=${MY_PN}-${PV} + + SRC_URI=" + mirror://gnu/${MY_PN}/${MY_P}.tar.xz + https://dev.gentoo.org/~polynomial-c/dist/${MY_P}-runstatedir_patches.tar.xz + " + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +fi + +S="${WORKDIR}"/${MY_P} + +inherit toolchain-autoconf + +DESCRIPTION="Used to create autoconfiguration files" +HOMEPAGE="https://www.gnu.org/software/autoconf/autoconf.html" + +LICENSE="GPL-3+" +SLOT="${PV}" +IUSE="emacs" + +BDEPEND=" + >=sys-devel/m4-1.4.16 + >=dev-lang/perl-5.6 +" +RDEPEND=" + ${BDEPEND} + >=sys-devel/autoconf-wrapper-13 + !~sys-devel/${P}:2.5 +" + +[[ ${PV} == 9999 ]] && BDEPEND+=" >=sys-apps/texinfo-4.3" + +PDEPEND="emacs? ( app-emacs/autoconf-mode )" + +PATCHES=( + "${FILESDIR}"/${MY_PN}-2.69-perl-5.26.patch + "${FILESDIR}"/${MY_P}-fix-libtool-test.patch + "${FILESDIR}"/${MY_PN}-2.69-perl-5.26-2.patch + "${FILESDIR}"/${MY_P}-make-tests-bash5-compatible.patch + + "${WORKDIR}"/patches/${MY_P}-texinfo.patch +) + +TC_AUTOCONF_ENVPREFIX=07 + +src_prepare() { + # usr/bin/libtool is provided by binutils-apple, need gnu libtool + if [[ ${CHOST} == *-darwin* ]] ; then + PATCHES+=( "${FILESDIR}"/${MY_PN}-2.61-darwin.patch ) + fi + + # Save timestamp to avoid later makeinfo call + touch -r doc/{,old_}autoconf.texi || die + + toolchain-autoconf_src_prepare + + # Restore timestamp to avoid makeinfo call + # We already have an up to date autoconf.info page at this point. + touch -r doc/{old_,}autoconf.texi || die + + # This version uses recursive makefiles. As this code is dead by + # now, and this 'fix' is getting hacked in from the future back into + # the past, I doubt that the sins committed below will have a wide + # impact. Don't copy this code. + find . \ + -name Makefile.in \ + -execdir sed -i '/^pkgdatadir/s/@PACKAGE@/&-vanilla/g' {} + \ + || die +} diff --git a/sys-devel/autoconf-vanilla/autoconf-vanilla-2.71.ebuild b/sys-devel/autoconf-vanilla/autoconf-vanilla-2.71.ebuild new file mode 100644 index 000000000000..51b9ab8bb9b6 --- /dev/null +++ b/sys-devel/autoconf-vanilla/autoconf-vanilla-2.71.ebuild @@ -0,0 +1,88 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://git.savannah.gnu.org/git/autoconf.git" + inherit git-r3 +else + MY_PN=${PN/-vanilla} + MY_P=${MY_PN}-${PV} + + SRC_URI=" + mirror://gnu/${MY_PN}/${MY_P}.tar.xz + https://alpha.gnu.org/pub/gnu/${MY_PN}/${MY_P}.tar.xz + " + + if ! [[ ${PV} == *_beta* ]] ; then + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + fi + S="${WORKDIR}"/${MY_P} +fi + +inherit toolchain-autoconf + +DESCRIPTION="Used to create autoconfiguration files" +HOMEPAGE="https://www.gnu.org/software/autoconf/autoconf.html" + +LICENSE="GPL-3+" +SLOT="${PV/_*}" +IUSE="emacs" + +# for 2.71, our Perl time resolution patch changes our min Perl from 5.6 +# (vanilla upstream for 2.71) to 5.8. +BDEPEND=">=sys-devel/m4-1.4.16 + >=dev-lang/perl-5.8" +RDEPEND="${BDEPEND} + >=sys-devel/autoconf-wrapper-15 + sys-devel/gnuconfig + !~sys-devel/${P}:2.5" +[[ ${PV} == 9999 ]] && BDEPEND+=" >=sys-apps/texinfo-4.3" +PDEPEND="emacs? ( app-emacs/autoconf-mode )" + +PATCHES=( + "${FILESDIR}"/${MY_P}-AC_LANG_CALL_C_cxx.patch + "${FILESDIR}"/${MY_P}-time.patch + "${FILESDIR}"/${MY_P}-make-4.4.patch + "${FILESDIR}"/"${MY_P}"-conflicts.patch +) + +TC_AUTOCONF_ENVPREFIX=07 + +src_prepare() { + # usr/bin/libtool is provided by binutils-apple, need gnu libtool + if [[ ${CHOST} == *-darwin* ]] ; then + PATCHES+=( "${FILESDIR}"/${MY_PN}-2.71-darwin.patch ) + fi + + # Save timestamp to avoid later makeinfo call + touch -r doc/{,old_}autoconf.texi || die + + local pdir + for pdir in "${WORKDIR}"/{upstream_,}patches ; do + if [[ -d "${pdir}" ]] ; then + eapply ${pdir} + fi + done + + toolchain-autoconf_src_prepare + + # Restore timestamp to avoid makeinfo call + # We already have an up to date autoconf.info page at this point. + touch -r doc/{old_,}autoconf.texi || die +} + +src_test() { + emake check +} + +src_install() { + toolchain-autoconf_src_install + + local f + for f in config.{guess,sub} ; do + ln -fs ../../gnuconfig/${f} \ + "${ED}"/usr/share/autoconf-*/build-aux/${f} || die + done +} diff --git a/sys-devel/autoconf-vanilla/autoconf-vanilla-2.72c.ebuild b/sys-devel/autoconf-vanilla/autoconf-vanilla-2.72c.ebuild new file mode 100644 index 000000000000..ba5dad5a496c --- /dev/null +++ b/sys-devel/autoconf-vanilla/autoconf-vanilla-2.72c.ebuild @@ -0,0 +1,93 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://git.savannah.gnu.org/git/autoconf.git" + inherit git-r3 +else + MY_PN=${PN/-vanilla} + # For _beta handling replace with real version number + MY_PV="${PV}" + MY_P="${MY_PN}-${MY_PV}" + #PATCH_TARBALL_NAME="${MY_PN}-2.70-patches-01" + + SRC_URI=" + mirror://gnu/${MY_PN}/${MY_P}.tar.xz + https://alpha.gnu.org/pub/gnu/${MY_PN}/${MY_P}.tar.xz + https://meyering.net/ac/${MY_P}.tar.xz + " + S="${WORKDIR}"/${MY_P} + + if [[ ${PV} != *_beta* ]] && ! [[ $(ver_cut 3) =~ [a-z] ]] ; then + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + fi +fi + +inherit toolchain-autoconf + +DESCRIPTION="Used to create autoconfiguration files" +HOMEPAGE="https://www.gnu.org/software/autoconf/autoconf.html" + +LICENSE="GPL-3+" +SLOT="$(ver_cut 1-2)" +IUSE="emacs" + +BDEPEND=" + >=dev-lang/perl-5.10 + >=sys-devel/m4-1.4.16 +" +RDEPEND=" + ${BDEPEND} + >=sys-devel/autoconf-wrapper-15 + sys-devel/gnuconfig + !~sys-devel/${P}:2.5 +" +[[ ${PV} == 9999 ]] && BDEPEND+=" >=sys-apps/texinfo-4.3" +PDEPEND="emacs? ( app-emacs/autoconf-mode )" + +PATCHES=( + "${FILESDIR}"/"${MY_P}"-conflicts.patch +) + +TC_AUTOCONF_ENVPREFIX=07 + +src_prepare() { + if [[ ${PV} == *9999 ]] ; then + # Avoid the "dirty" suffix in the git version by generating it + # before we run later stages which might modify source files. + local ver=$(./build-aux/git-version-gen .tarball-version) + echo "${ver}" > .tarball-version || die + + autoreconf -f -i || die + fi + + # usr/bin/libtool is provided by binutils-apple, need gnu libtool + if [[ ${CHOST} == *-darwin* ]] ; then + PATCHES+=( "${FILESDIR}"/${MY_PN}-2.71-darwin.patch ) + fi + + # Save timestamp to avoid later makeinfo call + touch -r doc/{,old_}autoconf.texi || die + + toolchain-autoconf_src_prepare + + # Restore timestamp to avoid makeinfo call + # We already have an up to date autoconf.info page at this point. + touch -r doc/{old_,}autoconf.texi || die +} + +src_test() { + emake check +} + +src_install() { + toolchain-autoconf_src_install + + local f + for f in config.{guess,sub} ; do + ln -fs ../../gnuconfig/${f} \ + "${ED}"/usr/share/autoconf-*/build-aux/${f} || die + done +} diff --git a/sys-devel/autoconf-vanilla/autoconf-vanilla-9999.ebuild b/sys-devel/autoconf-vanilla/autoconf-vanilla-9999.ebuild new file mode 100644 index 000000000000..2386d2432452 --- /dev/null +++ b/sys-devel/autoconf-vanilla/autoconf-vanilla-9999.ebuild @@ -0,0 +1,89 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://git.savannah.gnu.org/git/autoconf.git" + inherit git-r3 +else + MY_PN=${PN/-vanilla} + # For _beta handling replace with real version number + MY_PV="${PV}" + MY_P="${MY_PN}-${MY_PV}" + #PATCH_TARBALL_NAME="${MY_PN}-2.70-patches-01" + + SRC_URI=" + mirror://gnu/${MY_PN}/${MY_P}.tar.xz + https://alpha.gnu.org/pub/gnu/${MY_PN}/${MY_P}.tar.xz + https://meyering.net/ac/${MY_P}.tar.xz + " + S="${WORKDIR}"/${MY_P} + + if [[ ${PV} != *_beta* ]] && ! [[ $(ver_cut 3) =~ [a-z] ]] ; then + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + fi +fi + +inherit toolchain-autoconf + +DESCRIPTION="Used to create autoconfiguration files" +HOMEPAGE="https://www.gnu.org/software/autoconf/autoconf.html" + +LICENSE="GPL-3+" +SLOT="$(ver_cut 1-2)" +IUSE="emacs" + +BDEPEND=" + >=dev-lang/perl-5.10 + >=sys-devel/m4-1.4.16 +" +RDEPEND=" + ${BDEPEND} + >=sys-devel/autoconf-wrapper-15 + sys-devel/gnuconfig + !~sys-devel/${P}:2.5 +" +[[ ${PV} == 9999 ]] && BDEPEND+=" >=sys-apps/texinfo-4.3" +PDEPEND="emacs? ( app-emacs/autoconf-mode )" + +TC_AUTOCONF_ENVPREFIX=07 + +src_prepare() { + if [[ ${PV} == *9999 ]] ; then + # Avoid the "dirty" suffix in the git version by generating it + # before we run later stages which might modify source files. + local ver=$(./build-aux/git-version-gen .tarball-version) + echo "${ver}" > .tarball-version || die + + autoreconf -f -i || die + fi + + # usr/bin/libtool is provided by binutils-apple, need gnu libtool + if [[ ${CHOST} == *-darwin* ]] ; then + PATCHES+=( "${FILESDIR}"/${MY_PN}-2.71-darwin.patch ) + fi + + # Save timestamp to avoid later makeinfo call + touch -r doc/{,old_}autoconf.texi || die + + toolchain-autoconf_src_prepare + + # Restore timestamp to avoid makeinfo call + # We already have an up to date autoconf.info page at this point. + touch -r doc/{old_,}autoconf.texi || die +} + +src_test() { + emake check +} + +src_install() { + toolchain-autoconf_src_install + + local f + for f in config.{guess,sub} ; do + ln -fs ../../gnuconfig/${f} \ + "${ED}"/usr/share/autoconf-*/build-aux/${f} || die + done +} diff --git a/sys-devel/autoconf-vanilla/files/autoconf-2.13-destdir.patch b/sys-devel/autoconf-vanilla/files/autoconf-2.13-destdir.patch new file mode 100644 index 000000000000..47605af5f59c --- /dev/null +++ b/sys-devel/autoconf-vanilla/files/autoconf-2.13-destdir.patch @@ -0,0 +1,26 @@ +--- a/Makefile.in ++++ b/Makefile.in +@@ -41,18 +41,18 @@ + + transform=@program_transform_name@ + +-prefix = @prefix@ ++prefix = $(DESTDIR)@prefix@ +-exec_prefix = @exec_prefix@ ++exec_prefix = $(DESTDIR)@exec_prefix@ + + # Directory in which to install scripts. +-bindir = @bindir@ ++bindir = $(DESTDIR)@bindir@ + + # Directory in which to install library files. +-datadir = @datadir@ ++datadir = $(DESTDIR)@datadir@ + acdatadir = $(datadir)/autoconf + + # Directory in which to install documentation info files. +-infodir = @infodir@ ++infodir = $(DESTDIR)@infodir@ + + #### End of system configuration section. #### + diff --git a/sys-devel/autoconf-vanilla/files/autoconf-2.13-gentoo.patch b/sys-devel/autoconf-vanilla/files/autoconf-2.13-gentoo.patch new file mode 100644 index 000000000000..44f09cba92f0 --- /dev/null +++ b/sys-devel/autoconf-vanilla/files/autoconf-2.13-gentoo.patch @@ -0,0 +1,36 @@ +--- a/configure ++++ b/configure +@@ -654,12 +654,10 @@ + echo "$ac_t""no" 1>&6 + fi + +-if test "$PERL" != no; then +- SCRIPTS=autoscan +-else +- echo "configure: warning: autoscan will not be built since perl is not found" 1>&2 ++if test "$PERL" = no; then ++ PERL=/usr/bin/perl + fi +- ++SCRIPTS=autoscan + ac_aux_dir= + for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do + if test -f $ac_dir/install-sh; then +--- a/configure.in ++++ b/configure.in +@@ -14,12 +14,10 @@ + AC_PATH_PROG(PERL, perl, no) + AC_SUBST(PERL)dnl + AC_SUBST(SCRIPTS)dnl +-if test "$PERL" != no; then +- SCRIPTS=autoscan +-else +- AC_MSG_WARN(autoscan will not be built since perl is not found) ++if test "$PERL" = no; then ++ PERL=/usr/bin/perl + fi +- ++SCRIPTS=autoscan + AC_PROG_INSTALL + + # Work with the GNU or Cygnus source tree layout. diff --git a/sys-devel/autoconf-vanilla/files/autoconf-2.13-perl-5.26.patch b/sys-devel/autoconf-vanilla/files/autoconf-2.13-perl-5.26.patch new file mode 100644 index 000000000000..6fbc0cd1bc89 --- /dev/null +++ b/sys-devel/autoconf-vanilla/files/autoconf-2.13-perl-5.26.patch @@ -0,0 +1,12 @@ +diff -ruN autoconf-2.13.orig/autoscan.pl autoconf-2.13/autoscan.pl +--- autoconf-2.13.orig/autoscan.pl 1999-01-05 14:28:42.000000000 +0100 ++++ autoconf-2.13/autoscan.pl 2018-12-22 19:55:10.986732296 +0100 +@@ -232,7 +232,7 @@ + # Strip out comments and variable references. + s/#.*//; + s/\$\([^\)]*\)//g; +- s/\${[^\}]*}//g; ++ s/\$\{[^\}]*}//g; + s/@[^@]*@//g; + + # Variable assignments. diff --git a/sys-devel/autoconf-vanilla/files/autoconf-2.13-test-fixes.patch b/sys-devel/autoconf-vanilla/files/autoconf-2.13-test-fixes.patch new file mode 100644 index 000000000000..b8a7e3b8ce99 --- /dev/null +++ b/sys-devel/autoconf-vanilla/files/autoconf-2.13-test-fixes.patch @@ -0,0 +1,18 @@ +newer gcc versions don't provide g77, so if it doesn't exist, +don't bother trying to test it (and failing) + +http://bugs.gentoo.org/146592 + +--- autoconf-2.13/testsuite/autoconf.s/syntax.exp ++++ autoconf-2.13/testsuite/autoconf.s/syntax.exp +@@ -5,6 +5,10 @@ + set macros [exec sed -n $script $srcdir/../acspecific.m4] + + foreach mac $macros { ++ if { [string match "*F77*" "$mac"] && [catch {exec which g77} ignore_output] } then { ++ send_user "XFAIL: $mac\n" ++ continue ++ } + send_user "$mac\n" + autoconf_test $mac $mac + } diff --git a/sys-devel/autoconf-vanilla/files/autoconf-2.61-darwin.patch b/sys-devel/autoconf-vanilla/files/autoconf-2.61-darwin.patch new file mode 100644 index 000000000000..83f450e6f5af --- /dev/null +++ b/sys-devel/autoconf-vanilla/files/autoconf-2.61-darwin.patch @@ -0,0 +1,11 @@ +--- a/bin/autoreconf.in ++++ b/bin/autoreconf.in +@@ -110,7 +110,7 @@ + my $autoheader = $ENV{'AUTOHEADER'} || '@bindir@/@autoheader-name@'; + my $automake = $ENV{'AUTOMAKE'} || 'automake'; + my $aclocal = $ENV{'ACLOCAL'} || 'aclocal'; +-my $libtoolize = $ENV{'LIBTOOLIZE'} || 'libtoolize'; ++my $libtoolize = $ENV{'LIBTOOLIZE'} || 'glibtoolize'; + my $autopoint = $ENV{'AUTOPOINT'} || 'autopoint'; + + # --install -- as --add-missing in other tools. diff --git a/sys-devel/autoconf-vanilla/files/autoconf-2.69-fix-libtool-test.patch b/sys-devel/autoconf-vanilla/files/autoconf-2.69-fix-libtool-test.patch new file mode 100644 index 000000000000..e75eba621606 --- /dev/null +++ b/sys-devel/autoconf-vanilla/files/autoconf-2.69-fix-libtool-test.patch @@ -0,0 +1,31 @@ +From 247b02e5a5bb79ca6666e91de02ae2d3cb0cd325 Mon Sep 17 00:00:00 2001 +From: "Gary V. Vaughan" <gary@gnu.org> +Date: Mon, 3 Nov 2014 07:25:03 +0100 +Subject: tests: avoid spurious test failure with libtool 2.4.3 + +Based on a report by Bruce Dubbs. + +* tests/foreign.at (Libtool): Be tolerant of 'quote' replacing the +older `quote'. + +Signed-off-by: Eric Blake <eblake@redhat.com> +--- + tests/foreign.at | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/foreign.at b/tests/foreign.at +index a9dc33c..d4702cd 100644 +--- a/tests/foreign.at ++++ b/tests/foreign.at +@@ -57,7 +57,7 @@ AT_CHECK([./config.guess || exit 77], [], [ignore], [ignore]) + # Make sure at-path contains something valid, and let the test suite + # display it when verbose. And fail, skipping would too easily hide + # problems. +-AT_CHECK([sed -n ["s,^.*\`\\(/[^']*\\)'.*,\\1,p"] stdout], [0], [stdout]) ++AT_CHECK([sed -n ["s,^[^']*[\`']\\(/[^']*\\)'.*,\\1,p"] stdout], [0], [stdout]) + AT_CHECK([test -f "`sed -n 1p stdout`"]) + + # Older libtoolize installed everything but install-sh... +-- +cgit v1.0-41-gc330 + diff --git a/sys-devel/autoconf-vanilla/files/autoconf-2.69-make-tests-bash5-compatible.patch b/sys-devel/autoconf-vanilla/files/autoconf-2.69-make-tests-bash5-compatible.patch new file mode 100644 index 000000000000..1afcec15bb4f --- /dev/null +++ b/sys-devel/autoconf-vanilla/files/autoconf-2.69-make-tests-bash5-compatible.patch @@ -0,0 +1,63 @@ +From 5b9db67786a428164abafe626ab11a2754aad528 Mon Sep 17 00:00:00 2001 +From: Ondrej Dubaj <odubaj@redhat.com> +Date: Wed, 28 Aug 2019 07:39:50 +0200 +Subject: Port tests to Bash 5 + +* tests/local.at (AT_CHECK_ENV, AT_CONFIG_CMP): +Add BASH_ARGC, BASH_ARGV to list of variables to be ignored when +comparing variable space dumps. +(AT_CONFIG_CMP): Also ignore LINENO. +* tests/m4sh.at: Also unset LINENO in 'reference' and 'test/test-1'. +--- + tests/local.at | 5 ++++- + tests/m4sh.at | 4 ++-- + 2 files changed, 6 insertions(+), 3 deletions(-) + +diff --git a/tests/local.at b/tests/local.at +index a22958c0..852be285 100644 +--- a/tests/local.at ++++ b/tests/local.at +@@ -325,7 +325,7 @@ if test -f state-env.before && test -f state-env.after; then + [AWK|LEX|LEXLIB|LEX_OUTPUT_ROOT|LN_S|M4|MKDIR_P|RANLIB|SET_MAKE|YACC], + [GREP|[EF]GREP|SED], + [[_@]|.[*#?$].], +- [argv|ARGC|LINENO|OLDPWD|PIPESTATUS|RANDOM|SECONDS]))=' \ ++ [argv|ARGC|LINENO|BASH_ARGC|BASH_ARGV|OLDPWD|PIPESTATUS|RANDOM|SECONDS]))=' \ + $act_file || + test $? -eq 1 || echo failed >&2 + ) 2>stderr-$act_file | +@@ -382,6 +382,9 @@ do + /'\'\\\$\''=/ d + /^argv=/ d + /^ARGC=/ d ++ /^BASH_ARGC=/ d ++ /^BASH_ARGV=/ d ++ /^LINENO=/ d + ' $act_file >at_config_vars-$act_file + done + AT_CMP([at_config_vars-$1], [at_config_vars-$2])[]dnl +diff --git a/tests/m4sh.at b/tests/m4sh.at +index e9d70b02..cbdfcb62 100644 +--- a/tests/m4sh.at ++++ b/tests/m4sh.at +@@ -254,7 +254,7 @@ AT_CHECK([autom4te -l m4sh $1.as -o $1]) + # `_oline_', once processed and ran, produces our reference. + # We check that we find ourselves by looking at a string which is + # available only in the original script: `_oline_'. +-AT_DATA_LINENO([reference], [false], [__OLINE__], [_oline__]) ++AT_DATA_LINENO([reference], [true], [__OLINE__], [_oline__]) + AT_CHECK([./reference], 0, [stdout]) + + # The reference: +@@ -264,7 +264,7 @@ mv stdout expout + # Be sure to be out of the PATH. + AT_CHECK([mkdir test || exit 77]) + +-AT_DATA_LINENO([test/test-1], [false], [__LINENO__], [LINENO]) ++AT_DATA_LINENO([test/test-1], [true], [__LINENO__], [LINENO]) + AT_CHECK([./test/test-1], 0, [expout]) + AT_CHECK([(PATH=test$PATH_SEPARATOR$PATH; export PATH; exec test-1)], + 0, [expout]) +-- +cgit v1.2.1 + diff --git a/sys-devel/autoconf-vanilla/files/autoconf-2.69-perl-5.26-2.patch b/sys-devel/autoconf-vanilla/files/autoconf-2.69-perl-5.26-2.patch new file mode 100644 index 000000000000..6becf807c43e --- /dev/null +++ b/sys-devel/autoconf-vanilla/files/autoconf-2.69-perl-5.26-2.patch @@ -0,0 +1,30 @@ +https://bugs.gentoo.org/625576 + +--- autoconf-2.69/bin/autoheader.in ++++ autoconf-2.69/bin/autoheader.in +@@ -173,6 +173,12 @@ + # Source what the traces are trying to tell us. + verb "$me: running $autoconf to trace from $ARGV[0]"; + my $quoted_tmp = shell_quote ($tmp); ++my $perl_tmp; ++if ( $tmp =~ /^\// ) { ++ $perl_tmp=$tmp; ++} else { ++ $perl_tmp="./".$tmp; ++} + xsystem ("$autoconf" + # If you change this list, update the + # `Autoheader-preselections' section of autom4te.in. +@@ -182,9 +188,9 @@ + . " " . shell_quote ($ARGV[0]) . " >$quoted_tmp/traces.pl"); + + local (%verbatim, %symbol); +-debug "$me: \`do'ing $tmp/traces.pl:\n" . `sed 's/^/| /' $quoted_tmp/traces.pl`; +-do "$tmp/traces.pl"; +-warn "couldn't parse $tmp/traces.pl: $@" if $@; ++debug "$me: \`do'ing $perl_tmp/traces.pl:\n" . `sed 's/^/| /' $quoted_tmp/traces.pl`; ++do "$perl_tmp/traces.pl"; ++warn "couldn't parse $perl_tmp/traces.pl: $@" if $@; + unless ($config_h) + { + error "error: AC_CONFIG_HEADERS not found in $ARGV[0]"; diff --git a/sys-devel/autoconf-vanilla/files/autoconf-2.69-perl-5.26.patch b/sys-devel/autoconf-vanilla/files/autoconf-2.69-perl-5.26.patch new file mode 100644 index 000000000000..b3d7888ca722 --- /dev/null +++ b/sys-devel/autoconf-vanilla/files/autoconf-2.69-perl-5.26.patch @@ -0,0 +1,28 @@ +From e5654a5591884b92633c7785f325626711e7f7aa Mon Sep 17 00:00:00 2001 +From: Paul Eggert <eggert@cs.ucla.edu> +Date: Tue, 29 Jan 2013 13:46:48 -0800 +Subject: [PATCH] autoscan: port to perl 5.17 + +* bin/autoscan.in (scan_sh_file): Escape '{'. This avoids a +feature that is deprecated in Perl 5.17. Reported by Ray Lauff in +<http://lists.gnu.org/archive/html/bug-autoconf/2013-01/msg00059.html>. +--- + bin/autoscan.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/bin/autoscan.in b/bin/autoscan.in +index 993a750..db1df79 100644 +--- a/bin/autoscan.in ++++ b/bin/autoscan.in +@@ -358,7 +358,7 @@ sub scan_sh_file ($) + { + # Strip out comments and variable references. + s/#.*//; +- s/\${[^\}]*}//g; ++ s/\$\{[^\}]*}//g; + s/@[^@]*@//g; + + # Tokens in the code. +-- +1.9.1 + diff --git a/sys-devel/autoconf-vanilla/files/autoconf-2.71-AC_LANG_CALL_C_cxx.patch b/sys-devel/autoconf-vanilla/files/autoconf-2.71-AC_LANG_CALL_C_cxx.patch new file mode 100644 index 000000000000..5b53d17135bc --- /dev/null +++ b/sys-devel/autoconf-vanilla/files/autoconf-2.71-AC_LANG_CALL_C_cxx.patch @@ -0,0 +1,35 @@ +https://git.savannah.gnu.org/cgit/autoconf.git/commit/?id=b27bc3e230bb12fdd9a813e38e82bc4c3e22b4cc + +Note: we drop the comma from the comment because some packages +have bad quoting, and while that will need to be sorted when/if +autoconf 2.72 is released, we've got our hands full with the +Clang situation right now (bug #871753). + +From b27bc3e230bb12fdd9a813e38e82bc4c3e22b4cc Mon Sep 17 00:00:00 2001 +From: Paul Eggert <eggert@cs.ucla.edu> +Date: Tue, 31 Aug 2021 16:30:46 -0700 +Subject: Port AC_LANG_CALL(C) to C++ +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +* lib/autoconf/c.m4 (AC_LANG_CALL(C)): Add an extern "C" if C++. +Problem reported by Vincent Lefèvre (sr #110532). +--- a/lib/autoconf/c.m4 ++++ b/lib/autoconf/c.m4 +@@ -126,7 +126,13 @@ m4_define([AC_LANG_CALL(C)], + m4_if([$2], [main], , + [/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ ++ builtin and then its argument prototype would still apply. ++ The 'extern "C"' is for builds by C++ compilers; ++ although this is not generally supported in C code supporting it here ++ has little cost and some practical benefit (sr 110532). */ ++#ifdef __cplusplus ++extern "C" ++#endif + char $2 ();])], [return $2 ();])]) + + +cgit v1.1 diff --git a/sys-devel/autoconf-vanilla/files/autoconf-2.71-conflicts.patch b/sys-devel/autoconf-vanilla/files/autoconf-2.71-conflicts.patch new file mode 100644 index 000000000000..d9829d1ae213 --- /dev/null +++ b/sys-devel/autoconf-vanilla/files/autoconf-2.71-conflicts.patch @@ -0,0 +1,47 @@ +From 0d784a60bb65eb730a1b5f2b24887192d058629b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Arsen=20Arsenovi=C4=87?= <arsen@gentoo.org> +Date: Sat, 4 Nov 2023 00:32:48 +0100 +Subject: [PATCH] Append '-vanilla' to pkgdatadir + +--- + Makefile.am | 3 +++ + Makefile.in | 2 +- + 2 files changed, 4 insertions(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index 17e1f8f..73d2ea7 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -18,6 +18,9 @@ + + ACLOCAL_AMFLAGS = -I m4 + ++# Work around file conflicts against sys-devel/autoconf -- Arsen ++pkgdatadir = $(datadir)/@PACKAGE@-vanilla-@VERSION@ ++ + ## All of these will be incrementally updated later, here or in included + ## makefile fragments. + ETAGS_ARGS = +diff --git a/Makefile.in b/Makefile.in +index dcd27f7..704248f 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -195,7 +195,6 @@ am__make_running_with_option = \ + test $$has_opt = yes + am__make_dryrun = (target_option=n; $(am__make_running_with_option)) + am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) +-pkgdatadir = $(datadir)/@PACKAGE@-@VERSION@ + pkgincludedir = $(includedir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkglibexecdir = $(libexecdir)/@PACKAGE@ +@@ -401,6 +400,7 @@ distuninstallcheck_listfiles = find . -type f -print + am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ + | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' + distcleancheck_listfiles = find . -type f -print ++pkgdatadir = $(datadir)/@PACKAGE@-vanilla-@VERSION@ + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ + AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +-- +2.42.0 + diff --git a/sys-devel/autoconf-vanilla/files/autoconf-2.71-darwin.patch b/sys-devel/autoconf-vanilla/files/autoconf-2.71-darwin.patch new file mode 100644 index 000000000000..c122aee4b22d --- /dev/null +++ b/sys-devel/autoconf-vanilla/files/autoconf-2.71-darwin.patch @@ -0,0 +1,11 @@ +--- a/bin/autoreconf.in ++++ b/bin/autoreconf.in +@@ -122,7 +122,7 @@ + my $autom4te = $ENV{'AUTOM4TE'} || '@bindir@/@autom4te-name@'; + my $automake = $ENV{'AUTOMAKE'} || 'automake'; + my $aclocal = $ENV{'ACLOCAL'} || 'aclocal'; +-my $libtoolize = $ENV{'LIBTOOLIZE'} || 'libtoolize'; ++my $libtoolize = $ENV{'LIBTOOLIZE'} || 'glibtoolize'; + my $intltoolize = $ENV{'INTLTOOLIZE'} || 'intltoolize'; + my $gtkdocize = $ENV{'GTKDOCIZE'} || 'gtkdocize'; + my $autopoint = $ENV{'AUTOPOINT'} || 'autopoint'; diff --git a/sys-devel/autoconf-vanilla/files/autoconf-2.71-make-4.4.patch b/sys-devel/autoconf-vanilla/files/autoconf-2.71-make-4.4.patch new file mode 100644 index 000000000000..4dcf05996180 --- /dev/null +++ b/sys-devel/autoconf-vanilla/files/autoconf-2.71-make-4.4.patch @@ -0,0 +1,25 @@ +https://git.savannah.gnu.org/cgit/autoconf.git/commit/?id=31f673434ee402258b45e958c88acc8725d82b1a +https://savannah.gnu.org/bugs/?63040 +https://bugs.gentoo.org/869257 + +From 31f673434ee402258b45e958c88acc8725d82b1a Mon Sep 17 00:00:00 2001 +From: Paul Eggert <eggert@cs.ucla.edu> +Date: Fri, 9 Sep 2022 16:54:11 -0500 +Subject: Port to GNU make 4.4 + +* cfg.mk (PATH): Assign eagerly, and simplify shell use, avoiding +use of the shell entirely if PWD is set, as it should be. +Problem reported by Sergei Trofimovich in: +https://lists.gnu.org/r/autoconf-patches/2022-09/msg00007.html +--- a/cfg.mk ++++ b/cfg.mk +@@ -18,7 +18,7 @@ + # This file is '-include'd into GNUmakefile. + + # Build with our own versions of these tools, when possible. +-export PATH = $(shell echo "`pwd`/tests:$$PATH") ++export PATH := $(or $(PWD),$(shell pwd))/tests:$(PATH) + + # Remove the autoreconf-provided INSTALL, so that we regenerate it. + _autoreconf = autoreconf -i -v && rm -f INSTALL +cgit v1.1 diff --git a/sys-devel/autoconf-vanilla/files/autoconf-2.71-time.patch b/sys-devel/autoconf-vanilla/files/autoconf-2.71-time.patch new file mode 100644 index 000000000000..8ecfe10f40a3 --- /dev/null +++ b/sys-devel/autoconf-vanilla/files/autoconf-2.71-time.patch @@ -0,0 +1,49 @@ +From e194b3c7e00429612a9d40e78ea571687fd25b91 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= <dilfridge@gentoo.org> +Date: Sun, 1 Aug 2021 19:07:48 +0200 +Subject: [PATCH] Use stat from Time::HiRes (instead of File::stat) +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org> +--- + lib/Autom4te/FileUtils.pm | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +diff --git a/lib/Autom4te/FileUtils.pm b/lib/Autom4te/FileUtils.pm +index a182031b..27a5fd91 100644 +--- a/lib/Autom4te/FileUtils.pm ++++ b/lib/Autom4te/FileUtils.pm +@@ -34,12 +34,12 @@ This perl module provides various general purpose file handling functions. + + =cut + +-use 5.006; ++use 5.008; + use strict; + use warnings FATAL => 'all'; + + use Exporter; +-use File::stat; ++use Time::HiRes qw(stat); + use IO::File; + + use Autom4te::Channels; +@@ -115,10 +115,11 @@ sub mtime ($) + return 0 + if $file eq '-' || ! -f $file; + +- my $stat = stat ($file) ++ my ($dev,$ino,$mode,$nlink,$uid,$gid,$rdev,$size, ++ $atime,$mtime,$ctime,$blksize,$blocks) = stat ($file) + or fatal "cannot stat $file: $!"; + +- return $stat->mtime; ++ return $mtime; + } + + +-- +2.31.1 + diff --git a/sys-devel/autoconf-vanilla/files/autoconf-2.72c-conflicts.patch b/sys-devel/autoconf-vanilla/files/autoconf-2.72c-conflicts.patch new file mode 100644 index 000000000000..2ff6418a3a34 --- /dev/null +++ b/sys-devel/autoconf-vanilla/files/autoconf-2.72c-conflicts.patch @@ -0,0 +1,48 @@ +From 8eee2e2b910c6c3d837a4708d4d5d3d80afd8ef9 Mon Sep 17 00:00:00 2001 +From: Arsen Arsenović <arsen@gentoo.org> +Date: Sat, 4 Nov 2023 00:20:05 +0100 +Subject: [PATCH] Append '-vanilla' to pkgdatadir + +--- + Makefile.am | 3 +++ + Makefile.in | 3 ++- + 2 files changed, 5 insertions(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index 28bb494..dfc8932 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -18,6 +18,9 @@ + + ACLOCAL_AMFLAGS = -I m4 + ++# Work around file conflicts against sys-devel/autoconf -- Arsen ++pkgdatadir = $(datadir)/@PACKAGE@-vanilla-@VERSION@ ++ + ## All of these will be incrementally updated later, here or in included + ## makefile fragments. + ETAGS_ARGS = +diff --git a/Makefile.in b/Makefile.in +index 2cde4d0..cf17242 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -197,7 +197,6 @@ am__make_dryrun = (target_option=n; $(am__make_running_with_option)) + am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) + am__rm_f = rm -f $(am__rm_f_notfound) + am__rm_rf = rm -rf $(am__rm_f_notfound) +-pkgdatadir = $(datadir)/@PACKAGE@-@VERSION@ + pkgincludedir = $(includedir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkglibexecdir = $(libexecdir)/@PACKAGE@ +@@ -401,6 +400,8 @@ am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ + distcleancheck_listfiles = \ + find . \( -type f -a \! \ + \( -name .nfs* -o -name .smb* -o -name .__afs* \) \) -print ++# Work around file conflicts against sys-devel/autoconf -- Arsen ++pkgdatadir = $(datadir)/@PACKAGE@-vanilla-@VERSION@ + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ + AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +-- +2.42.0 + diff --git a/sys-devel/autoconf-vanilla/metadata.xml b/sys-devel/autoconf-vanilla/metadata.xml new file mode 100644 index 000000000000..4ff4a48125bc --- /dev/null +++ b/sys-devel/autoconf-vanilla/metadata.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>base-system@gentoo.org</email> + <name>Gentoo Base System</name> + </maintainer> + <upstream> + <remote-id type="savannah">autoconf</remote-id> + </upstream> +</pkgmetadata> |