commit: a1366bf07dd48602e385d912bf7391bb3c2167f4 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> AuthorDate: Sun Mar 18 18:08:27 2018 +0000 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> CommitDate: Sun Mar 18 18:08:27 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1366bf0
sys-devel/autoconf-archive: Removed old. Package-Manager: Portage-2.3.24, Repoman-2.3.6 sys-devel/autoconf-archive/Manifest | 1 - .../autoconf-archive-2016.03.20-r1.ebuild | 28 ------ .../files/autoconf-archive-2016.03.20-cxxcpp.patch | 111 --------------------- .../autoconf-archive-2016.03.20-include.patch | 54 ---------- 4 files changed, 194 deletions(-) diff --git a/sys-devel/autoconf-archive/Manifest b/sys-devel/autoconf-archive/Manifest index 18b1c211e01..e2ca65636e6 100644 --- a/sys-devel/autoconf-archive/Manifest +++ b/sys-devel/autoconf-archive/Manifest @@ -1,4 +1,3 @@ -DIST autoconf-archive-2016.03.20.tar.xz 613612 BLAKE2B be3338572abc671ddbccf9bb6c14a3358156dce651bd8da563164d6e55eb326846951d31de286d9d932c6e77e0f83a5f55f65672e0860b72126b7fc1febe0a14 SHA512 194d639d82a3377cdaf843c4a49d3ce3843ea37499b169124ddd2fca1800c0a559e27087a062109482b22f68b30f25ebb6da4b769eb6174d6e781162c83703b3 DIST autoconf-archive-2017.03.21.tar.xz 633132 BLAKE2B d2dd681a3b8c30fe50ae70e8c938e6c235e2747475abc7bba62dc1836f9ca49733935ec5372d2497d6dcef43dbf306a5b53604cb300e24915d43c9fbb5a62b05 SHA512 826233fcdd0cb5a1fe18bd52477e3a8afcaf8719ea376b3be0864df6b481f0fef8fd8083485b1565a14c13ad64dbc0ae93149a62e16da9a4d24db8063120cc3a DIST autoconf-archive-2017.09.28.tar.xz 645388 BLAKE2B b7b62d30ddde199d0f1a61bb78c50f932ff4e66a57bc318f8dc096f506ab81c3308d389690fdf495c4b9cf405b0139126aea8f4cb3219ed8e94c9c0d707ad065 SHA512 2aa271fdd67fa3caf20e07eb8332d88f7008eefe1df447980d42cb2104313d99947b94ffdb0f6f4b4c8156cfc73d9e0b6c27a5f133c6b73787ef641d9951be90 DIST autoconf-archive-2018.03.13.tar.xz 649496 BLAKE2B a69c381d734aa41337b8af783196f13e7aa49d936289df237c56a9be7662cd2b766ac42fa10f4cd46feac3998a12c49745d994c5df95b5dd449646dae300a8f8 SHA512 301832a02b1913dd46cc34f6479264b37032d78457b2df526f0aafc752996972ca9c74fdae68fbe0f490268019c45329d564f263cbaff30203bbb4b4a8d5ad5f diff --git a/sys-devel/autoconf-archive/autoconf-archive-2016.03.20-r1.ebuild b/sys-devel/autoconf-archive/autoconf-archive-2016.03.20-r1.ebuild deleted file mode 100644 index 497b2bb6e63..00000000000 --- a/sys-devel/autoconf-archive/autoconf-archive-2016.03.20-r1.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -DESCRIPTION="GNU Autoconf Macro Archive" -HOMEPAGE="https://www.gnu.org/software/autoconf-archive/"; -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 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" -IUSE="" - -# File collisions. #540246 -RDEPEND="!=gnome-base/gnome-common-3.14.0 - !>=gnome-base/gnome-common-3.14.0-r1[-autoconf-archive(+)]" -DEPEND="" - -PATCHES=( - "${FILESDIR}"/${P}-cxxcpp.patch #581346 - "${FILESDIR}"/${P}-include.patch #581346 -) - -src_install() { - default - rm -r "${ED}/usr/share/${PN}" || die -} diff --git a/sys-devel/autoconf-archive/files/autoconf-archive-2016.03.20-cxxcpp.patch b/sys-devel/autoconf-archive/files/autoconf-archive-2016.03.20-cxxcpp.patch deleted file mode 100644 index c42a655302c..00000000000 --- a/sys-devel/autoconf-archive/files/autoconf-archive-2016.03.20-cxxcpp.patch +++ /dev/null @@ -1,111 +0,0 @@ -https://bugs.gentoo.org/581346 - -From 34104ea9e635fae5551fd1d6495a80f8041c4adc Mon Sep 17 00:00:00 2001 -From: "Enrico M. Crisostomo" <[email protected]> -Date: Sun, 20 Mar 2016 14:17:15 +0100 -Subject: [PATCH] Update CXXCPP after updating CXX. - -Rewrap text. - -Rewrap. ---- - m4/ax_cxx_compile_stdcxx.m4 | 14 ++++++++++---- - m4/ax_cxx_compile_stdcxx_11.m4 | 5 +++-- - m4/ax_cxx_compile_stdcxx_14.m4 | 5 +++-- - 3 files changed, 16 insertions(+), 8 deletions(-) - -diff --git a/m4/ax_cxx_compile_stdcxx.m4 b/m4/ax_cxx_compile_stdcxx.m4 -index 8adc765..2c18e49 100644 ---- a/m4/ax_cxx_compile_stdcxx.m4 -+++ b/m4/ax_cxx_compile_stdcxx.m4 -@@ -9,9 +9,9 @@ - # DESCRIPTION - # - # Check for baseline language coverage in the compiler for the specified --# version of the C++ standard. If necessary, add switches to CXX to --# enable support. VERSION may be '11' (for the C++11 standard) or '14' --# (for the C++14 standard). -+# version of the C++ standard. If necessary, add switches to CXX and -+# CXXCPP to enable support. VERSION may be '11' (for the C++11 standard) -+# or '14' (for the C++14 standard). - # - # The second argument, if specified, indicates whether you insist on an - # extended mode (e.g. -std=gnu++11) or a strict conformance mode (e.g. -@@ -39,7 +39,7 @@ - # and this notice are preserved. This file is offered as-is, without any - # warranty. - --#serial 3 -+#serial 4 - - dnl This macro is based on the code from the AX_CXX_COMPILE_STDCXX_11 macro - dnl (serial version number 13). -@@ -82,6 +82,9 @@ AC_DEFUN([AX_CXX_COMPILE_STDCXX], [dnl - CXX="$ac_save_CXX"]) - if eval test x\$$cachevar = xyes; then - CXX="$CXX $switch" -+ if test -n "$CXXCPP" ; then -+ CXXCPP="$CXXCPP $switch" -+ fi - ac_success=yes - break - fi -@@ -105,6 +108,9 @@ AC_DEFUN([AX_CXX_COMPILE_STDCXX], [dnl - CXX="$ac_save_CXX"]) - if eval test x\$$cachevar = xyes; then - CXX="$CXX $switch" -+ if test -n "$CXXCPP" ; then -+ CXXCPP="$CXXCPP $switch" -+ fi - ac_success=yes - break - fi -diff --git a/m4/ax_cxx_compile_stdcxx_11.m4 b/m4/ax_cxx_compile_stdcxx_11.m4 -index b3d4bfd..3dd5cf9 100644 ---- a/m4/ax_cxx_compile_stdcxx_11.m4 -+++ b/m4/ax_cxx_compile_stdcxx_11.m4 -@@ -9,7 +9,8 @@ - # DESCRIPTION - # - # Check for baseline language coverage in the compiler for the C++11 --# standard; if necessary, add switches to CXX to enable support. -+# standard; if necessary, add switches to CXX and CXXCPP to enable -+# support. - # - # This macro is a convenience alias for calling the AX_CXX_COMPILE_STDCXX - # macro with the version set to C++11. The two optional arguments are -@@ -32,7 +33,7 @@ - # and this notice are preserved. This file is offered as-is, without any - # warranty. - --#serial 15 -+#serial 16 - - include([ax_cxx_compile_stdcxx.m4]) - -diff --git a/m4/ax_cxx_compile_stdcxx_14.m4 b/m4/ax_cxx_compile_stdcxx_14.m4 -index 741accf..6d2123a 100644 ---- a/m4/ax_cxx_compile_stdcxx_14.m4 -+++ b/m4/ax_cxx_compile_stdcxx_14.m4 -@@ -9,7 +9,8 @@ - # DESCRIPTION - # - # Check for baseline language coverage in the compiler for the C++14 --# standard; if necessary, add switches to CXX to enable support. -+# standard; if necessary, add switches to CXX and CXXCPP to enable -+# support. - # - # This macro is a convenience alias for calling the AX_CXX_COMPILE_STDCXX - # macro with the version set to C++14. The two optional arguments are -@@ -27,7 +28,7 @@ - # and this notice are preserved. This file is offered as-is, without any - # warranty. - --#serial 2 -+#serial 3 - - include([ax_cxx_compile_stdcxx.m4]) - --- -2.8.2 - diff --git a/sys-devel/autoconf-archive/files/autoconf-archive-2016.03.20-include.patch b/sys-devel/autoconf-archive/files/autoconf-archive-2016.03.20-include.patch deleted file mode 100644 index 4ba295ea184..00000000000 --- a/sys-devel/autoconf-archive/files/autoconf-archive-2016.03.20-include.patch +++ /dev/null @@ -1,54 +0,0 @@ -https://bugs.gentoo.org/581346 - -From d343892fbd0605a9375ff1ae0467aa320a404b12 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger <[email protected]> -Date: Sat, 7 May 2016 19:41:40 -0400 -Subject: [PATCH] fix include errors w/AX_CXX_COMPILE_STDCXX_1[14] - -The search path for `include` is the current working directory, so trying -to include other m4 files directly only works if they live in the same dir -as where you're running `aclocal`. Otherwise we end up with errors like: - $ cd lcd4linux-0.10.1-RC2 - $ aclocal - /usr/share/aclocal/ax_cxx_compile_stdcxx_14.m4:32: file 'ax_cxx_compile_stdcxx.m4' does not exist - -Use the AX_REQUIRE_DEFINED macro instead to make sure the macro we want -exists. ---- - m4/ax_cxx_compile_stdcxx_11.m4 | 5 ++--- - m4/ax_cxx_compile_stdcxx_14.m4 | 5 ++--- - 2 files changed, 4 insertions(+), 6 deletions(-) - -diff --git a/m4/ax_cxx_compile_stdcxx_11.m4 b/m4/ax_cxx_compile_stdcxx_11.m4 -index 3dd5cf9..0aadeaf 100644 ---- a/m4/ax_cxx_compile_stdcxx_11.m4 -+++ b/m4/ax_cxx_compile_stdcxx_11.m4 -@@ -33,8 +33,7 @@ - # and this notice are preserved. This file is offered as-is, without any - # warranty. - --#serial 16 -- --include([ax_cxx_compile_stdcxx.m4]) -+#serial 17 - -+AX_REQUIRE_DEFINED([AX_CXX_COMPILE_STDCXX]) - AC_DEFUN([AX_CXX_COMPILE_STDCXX_11], [AX_CXX_COMPILE_STDCXX([11], [$1], [$2])]) -diff --git a/m4/ax_cxx_compile_stdcxx_14.m4 b/m4/ax_cxx_compile_stdcxx_14.m4 -index 6d2123a..51123f2 100644 ---- a/m4/ax_cxx_compile_stdcxx_14.m4 -+++ b/m4/ax_cxx_compile_stdcxx_14.m4 -@@ -28,8 +28,7 @@ - # and this notice are preserved. This file is offered as-is, without any - # warranty. - --#serial 3 -- --include([ax_cxx_compile_stdcxx.m4]) -+#serial 4 - -+AX_REQUIRE_DEFINED([AX_CXX_COMPILE_STDCXX]) - AC_DEFUN([AX_CXX_COMPILE_STDCXX_14], [AX_CXX_COMPILE_STDCXX([14], [$1], [$2])]) --- -2.8.2 -
