diff options
Diffstat (limited to 'sys-devel/autogen')
-rw-r--r-- | sys-devel/autogen/Manifest | 3 | ||||
-rw-r--r-- | sys-devel/autogen/autogen-5.18.12.ebuild | 10 | ||||
-rw-r--r-- | sys-devel/autogen/files/autogen-guile-2.2.patch | 34 |
3 files changed, 44 insertions, 3 deletions
diff --git a/sys-devel/autogen/Manifest b/sys-devel/autogen/Manifest index ee605580ccc7..7c5dfc42747c 100644 --- a/sys-devel/autogen/Manifest +++ b/sys-devel/autogen/Manifest @@ -1,10 +1,11 @@ AUX autogen-5.18.4-tmp-log.patch 500 BLAKE2B 131982c73b5fe2a0bf3515fcd8ead7df4149af7b9ab4f899dea0966f927319ee156d3748151b359c9be6e1a6f50b0a64a4330bbf3af985f048228024a1ececf2 SHA512 7467f09109b16aef1ce72e294e627a16bf46d861ecbbf467c3a7317e440a18cdea100d32f3fdbd37ef6140dd65b1b57523983b08b25c331e229ddd132e3b3824 AUX autogen-5.18.4_fix_format.test_for_dash.patch 777 BLAKE2B 22621c5c825c47b94a8d28e6f471f3abc522761ce31a535bf357236eea1f71c546d9e025a879bf05719283147a4b3be83b8ee889f9aceda4597ee86f08c27a23 SHA512 4ac158532ad3e65219d0f8476acf05678d552b9fd13c3299e703a6979723e10fef2b87051983ae280609a6497ba2829e6197a97b18b54b2446ad106c6b9f1ae1 +AUX autogen-guile-2.2.patch 1033 BLAKE2B a18e884010f48b43b17bb5c78a4676a364503943f5144991ad2ab6acb8a9ba6f08044bd613f0763b5c863b380ecbcc7207df6cd29d08da3d034f07a386204bde SHA512 19c25fff1ca0427ff18627a14dab223b92da8670487351808df892fff77a8e33895e2ecc51acd8b03f3a89a5e19813fa12fb93c0aa54e47796812e99fd4ac7bf DIST autogen-5.18.10.tar.xz 1017960 SHA256 4e248e02c50404ea5c5fc29027d26600f895a9eae7ea5ef851be2c8587abc148 SHA512 cfb06566aebe2aa833f2a032c513aa1d57a803eee82f03d6f6fe3806a0f570d5dbf8331015d2afde89a3d4e4c967b6a367d3e2820addb3ff6a5ac6d481a058be WHIRLPOOL 2eae849d10083da05e0c42931b5f52a9e6ab0f548473a3812e089515ec5ed76dc94008466ab6f4e5bcf5c220898aa7ffba6ecdcbde7d8fbe0134daf45788994a DIST autogen-5.18.12.tar.xz 1018412 BLAKE2B f8ac1efbd6c6afdaa248e3063cf43fe0d32da6bd1160397f8bf736970f15047c70772a6e21d6010c8103aecce6ea2c3d90a63b9c5cbd6199a97c82384630a341 SHA512 46de5910e2786a9b0ec96989d3e11be3ed12e5600f01d6fa9291bfbfae42a66994aeca2949837b471827ae3285ec4caafb42bc19ca91146cd7ea7a355aaffd03 DIST autogen-5.18.4.tar.xz 1017936 BLAKE2B bc2b4d7143642baa923c49bfe37d60c0d3a0a3a09a9af504c5dc865f1054e4d510ca3144737c2098a75189a7335bc560ec26318689ebf6d1291969d5a081cfa2 SHA512 a02363484de5019bd90fb6f2cf52b1b9556d6cf310c62a68830d0b2408ea4870d3c262fe5d1c27e3586ed3af4a7487d7422ad117760ac2a01ef3cfcfc1f2bfb6 EBUILD autogen-5.18.10.ebuild 1155 BLAKE2B 5247ebdb86d1a049087ed0bb2b2ac0efef3d3a07e26943d035971c2bb55fc554d7dccd9c45b98355ae5a234a254c7744e29907e2e3467b7aeec878eed5991efb SHA512 ac21f0960ae9196d5214c125b2a55c2d8b0608b23d1f07d76dec31cec55eb1d158c46898d4f632cb67168a193820a40d364231a84268b3369f2d5b4fa2b82faa -EBUILD autogen-5.18.12.ebuild 1155 BLAKE2B 5247ebdb86d1a049087ed0bb2b2ac0efef3d3a07e26943d035971c2bb55fc554d7dccd9c45b98355ae5a234a254c7744e29907e2e3467b7aeec878eed5991efb SHA512 ac21f0960ae9196d5214c125b2a55c2d8b0608b23d1f07d76dec31cec55eb1d158c46898d4f632cb67168a193820a40d364231a84268b3369f2d5b4fa2b82faa +EBUILD autogen-5.18.12.ebuild 1214 BLAKE2B 8ac64ad2743bcd3a3392adbc7dbbd40edb9f30ef0e721699fb5995b2688ef47ae7eca72bec7da59a546ad80f4fe6f1d02b5586a427b8ef804f668ed7c5b0cdc5 SHA512 5a58610c10865a0b73d0b5a347fd58d6f12a6cb2941a33920ef0be73f4b0b76938c8aaa62296ac948a73acaa9d4b82d6b4dd5061bccf18f2164846724739544c EBUILD autogen-5.18.4-r1.ebuild 1005 BLAKE2B dfeaef4b16c1f5d595f1de1bd45f708396b989bbe758572d44e3ca31ecda300c593c44402ccaba478f9469af9b186c1dc3e5a3ee09f2a1ee0837142bcd9597cd SHA512 753f60ae9aec07e18d7aff99579760b046e0009d2a98c330aba1333263c70a063b78b2187395cc15988430829616036f4548d44a4c31bb9ab0ab6235acd06ab6 EBUILD autogen-5.18.4.ebuild 988 BLAKE2B 33c9989c980c49e9831243f11711b8f056b1ad761859d35ca8e7a2591074cee3d52be9706ac7909b3af4d95dc411be153ff91d430bb4d6d6a0173645597457bf SHA512 703592e8e47e247aba37a140e015d25a46bd3c9d1b1cf4ad1ac49782e39b35b7a376cd27437d8f6969056d879630e0fb55d1e35fabddaa4730820ef549cf936b MISC metadata.xml 369 BLAKE2B 84e42ca4413579471dd92284666f1a2565b58191e94ed3392e540dd09b8f423138ec4e3bdef6bba9e2f1cec71d425138f3d3954ad2e6bd8c57fed69bed91789c SHA512 48f4b495b998480adae388ddd9319edbc0e0e91a35904df6d98d79866b5b814fa20446c7c9b78e5d65c63ba1c281659db3cfa49908e70d85d16f76caca3c7541 diff --git a/sys-devel/autogen/autogen-5.18.12.ebuild b/sys-devel/autogen/autogen-5.18.12.ebuild index 9d29603d3e72..65274d31baa6 100644 --- a/sys-devel/autogen/autogen-5.18.12.ebuild +++ b/sys-devel/autogen/autogen-5.18.12.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI="5" +EAPI=6 -inherit eutils toolchain-funcs +inherit ltprune toolchain-funcs DESCRIPTION="Program and text file generation" HOMEPAGE="https://www.gnu.org/software/autogen/" @@ -20,7 +20,13 @@ RDEPEND=">=dev-scheme/guile-2.0:= dev-libs/libxml2" DEPEND="${RDEPEND}" +PATCHES=( + "${FILESDIR}/${PN}-guile-2.2.patch" +) + src_prepare() { + default + # https://savannah.gnu.org/support/index.php?109050 sed -i \ -e "/--cflags-only-I/s:pkg-config:$(tc-getPKG_CONFIG):" \ diff --git a/sys-devel/autogen/files/autogen-guile-2.2.patch b/sys-devel/autogen/files/autogen-guile-2.2.patch new file mode 100644 index 000000000000..8ef904adb029 --- /dev/null +++ b/sys-devel/autogen/files/autogen-guile-2.2.patch @@ -0,0 +1,34 @@ +https://raw.githubusercontent.com/Homebrew/formula-patches/master/autogen/allow-guile-2.2.diff + +--- a/agen5/guile-iface.h ++++ b/agen5/guile-iface.h +@@ -9,7 +9,7 @@ + # error AutoGen does not work with this version of Guile + choke me. + +-#elif GUILE_VERSION < 201000 ++#else + # define AG_SCM_IS_PROC(_p) scm_is_true( scm_procedure_p(_p)) + # define AG_SCM_LIST_P(_l) scm_is_true( scm_list_p(_l)) + # define AG_SCM_PAIR_P(_p) scm_is_true( scm_pair_p(_p)) +@@ -24,9 +24,6 @@ + # define AG_SCM_TO_ULONG(_v) ((unsigned long)scm_to_ulong(_v)) + # define AG_SCM_VEC_P(_v) scm_is_vector(_v) + +-#else +-# error unknown GUILE_VERSION +- choke me. + #endif + + #endif /* MUTATING_GUILE_IFACE_H_GUARD */ +--- a/configure ++++ b/configure +@@ -14191,7 +14191,7 @@ $as_echo "no" >&6; } + PKG_CONFIG="" + fi + fi +- _guile_versions_to_search="2.0 1.8" ++ _guile_versions_to_search="2.2 2.0 1.8" + if test -n "$GUILE_EFFECTIVE_VERSION"; then + _guile_tmp="" + for v in $_guile_versions_to_search; do |