diff options
Diffstat (limited to 'sys-devel')
| -rw-r--r-- | sys-devel/Manifest.gz | bin | 9334 -> 9332 bytes | |||
| -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 | ||||
| -rw-r--r-- | sys-devel/gcc/Manifest | 2 | ||||
| -rw-r--r-- | sys-devel/gcc/files/fix_libtool_files.sh | 2 |
6 files changed, 46 insertions, 5 deletions
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz Binary files differindex a2afc3eaacfc..5a21c5fb9b03 100644 --- a/sys-devel/Manifest.gz +++ b/sys-devel/Manifest.gz 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 diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest index 7b57e2b95288..bc814c32fa52 100644 --- a/sys-devel/gcc/Manifest +++ b/sys-devel/gcc/Manifest @@ -8,7 +8,7 @@ AUX awk/fixlafiles.awk 7693 BLAKE2B 190e7709ca8a515f16065d5c831849452b6c6fad9fb8 AUX awk/fixlafiles.awk-no_gcc_la 8473 BLAKE2B 58d7c9e98b356cefd08a24a978f88ca7d1dd21c22dcb6591e5ebc79849b1d798e4333b1a1d09c21e56309ae9f47dcb730b30b3e93bb44ab01f843b4b17623978 SHA512 bea5e047e8bf4dd5d6e877e84225b7efd79dedaad0a35713b3b6887b82aac215dde8f07b9bdfc8a75874248faf4cb7c73d01303e22476e6160e7398db1497b94 AUX c89 412 BLAKE2B 04236b6a32e8819c65713821e769d5bf55f194fb6bdaa61c48ad09c7e13e123d3e4725394b3a922445efaa951849f4e87f96e34a55d3e229dbedc50ca1816f44 SHA512 71d33a147339d8d70a62aa22a95d3e70e445d8435d6ac05893f7da19ae851b89bea851f6ce213fbd22470f13572ae13b83cf02f0621333f07d7b0c68a79b7924 AUX c99 446 BLAKE2B 061fcbef85149de611c4692c99c2c5ebeeef045637b999dbea0d1922398e16361cedbd461ed6aaf0c49c6269900a4c346f5026d8c22780044e1cc8afee74be4e SHA512 bf3b0eb1125d5e89b433954fcbf805cd86dec5a6eeb23df685ebf3ff83a610573f2ffcec65d893244c845936a73918387cba026710c65c854b2c94a78b007989 -AUX fix_libtool_files.sh 1547 BLAKE2B 8b3a802269de38a8732b8276c54e87ea2fa7f20e24950035976ec20da291d874280fb5a8f93b1e68e5b2a9aba1bf4916cec6c98f62abb5c62484ce56b279c2b5 SHA512 ca39921a04ce9f0888e6aac3240ee71c8259734457a3ac5b910da3c57e04abab7550ae77ed3de6233533569009b17540300cdca32fabf5f3be004f3f8917fd83 +AUX fix_libtool_files.sh 1546 BLAKE2B afef9b4e3add813374d95226ebe1d76986c00c7e81be20cb5110388ad9322e1a18f42d8c1ad2d355699033bb5f24071e2c1c308eee6390eeb864769f13e93614 SHA512 3c6fb7d8b127875aa9450b0f0835f99ae69a3d88df86fefc3932e9ced9912811f58e21a5d1ba9444422476efb5497452aa8a89a9d3499ad88add493a02b98fd3 AUX gcc-4.9.4-bootstrap.patch 2698 BLAKE2B 2fe9519590f0870aa201d550e027eaec311961c07b62f470d77f1de125fdf81cab6f884f08dfd8b957b7c2880ad04a7400f3fb395f5404d6c467373042e2fb0c SHA512 c712234b87aa66379bc52b43bce31a2dfd8de996030588a26261bb08471cd6e92587bc5aa35bb8f776a5128b1deb524e37aebe1c0b970a98210d653b5094d95b AUX gcc-configure-LANG.patch 2052 BLAKE2B 28c36f4992e41305ee421dade5eaaac34e3bdc523665b03f360f2bc01e8f69e9dc48052edb80dece63ab561e80325b4f125502482eb16f7324f1c03670021550 SHA512 a694c7ac2f45cc657097ff5b0cf1356ac88a9c06035c9ba15167e9d444844d0d8a478eb1b9b62195dd063774f79697b9148b9cdb6c261640b472c291061b2129 AUX gcc-configure-texinfo.patch 337 BLAKE2B 6408817927f71c5c55a19510a95e1aaad9b56be216ec1c753920b55a435d70579e27ff5bb8ecbeea1b9ff1c8ae62b940fbf10bf876c3d7ecf6cd662d9b693100 SHA512 a15fba8bf2ff02bdeca54d6f186bfa08c1079c6a8ba0a3beef154483ce5c1b8c497e7ffeec32371968f0037e0ff8384609eb0c367d0155a4e5a7eef8aad084d5 diff --git a/sys-devel/gcc/files/fix_libtool_files.sh b/sys-devel/gcc/files/fix_libtool_files.sh index 53c46de0fdc9..af085e1efa01 100644 --- a/sys-devel/gcc/files/fix_libtool_files.sh +++ b/sys-devel/gcc/files/fix_libtool_files.sh @@ -38,7 +38,7 @@ ARGV3=$3 . /etc/profile || exit 1 -if [ ${EUID:-0} -ne 0 -a "${EPREFIX}" == '' ] ; then +if [ ${EUID:-0} -ne 0 -a "${EPREFIX}" = '' ] ; then echo "${0##*/}: Must be root." exit 1 fi |