gentoo resync : 29.05.2018

5 files changed, 2 insertions, 161 deletions

diff --git a/sys-devel/boost-m4/Manifest b/sys-devel/boost-m4/Manifest
index bb09317ec6bd..b61da684ce30 100644
--- a/sys-devel/boost-m4/Manifest
+++ b/sys-devel/boost-m4/Manifest
@@ -1,7 +1,3 @@
-AUX boost-m4-0.4-gcc5.patch 3535 BLAKE2B 9c41d3db6f6f2553f5520744cd7ef6ac57c55f1ca9ac7f35d97bd61cd3f89e045bf9ddd2654f4755ff3878f0539aed143e2facb70598bd701582ac27cecc734f SHA512 7f579416e10cd9e2a40d1e973ae55a3bd4f5932ce9bd7309b6013224819ab2ef21ee6fbf7e40dfe2f461d2e84cfecbba54347ef37401d3687ca3f03bcf5f7210
-DIST boost-m4-0.4.tar.gz 38871 BLAKE2B 95475d8109f13b420ee5ac95588e5756b17e923ef436be64a8814858aa167889eb52b095f4672cdc15b55b0f6f40fc4e687b95aeb8a84ff6c57cbbbfb9d20846 SHA512 f0ee9edbf20043679339bcb46a912d460a787635106559780d6a9a08dd685051a58667a0a1e26364709de10dde49f4b2fd348dbd6199a9da3099d75e665c1e95
 DIST boost-m4-0.4_p20160328.tar.gz 41253 BLAKE2B 47ad17f652560dce4e276b295e55e7daa8752f1c932a6c0d1bad9e4bc2ff72eb0adfaf8abc4e7c57f179f08857de255935fc530f0a4d8a26d3f6a2a0711417ac SHA512 4aecd311b21ced4a3d62fc706a9fa731c375ea490482f78756892243b5af6909cd8841c249632b37820be7f1bde41c290e842edd933d0c727e1dca76d30eb506
-EBUILD boost-m4-0.4-r1.ebuild 917 BLAKE2B c32b670293a9b5b5bd949c71c35d6bae28581db8aef36afd4532e8c7f92fe9beb58a84496e2bcc17c884ad46e3c1b8e5468579947e1008c0393e211ce4849d61 SHA512 d6fa04dca6ce327db4189f03e8e7a7239e69c1f16b9c5a91a7b8020b1dc970ea8393daa2c8dbab1f11d433e63d11858f96bc5790334f65e4260696198b0912d8
-EBUILD boost-m4-0.4.ebuild 844 BLAKE2B 5d1ab04c297ef3f76665ccf1e18a66a5018945287a7acc0874b2a32b764db1770f39cae4f814cddc2e008e13821884134d4414d0ef8838f761b5b88d6af73a11 SHA512 896b5628af4a1934c25543d564a2266bdf7afc0653ec93de84155d16b905aeaede4e4877b0dd3afde6a6bacbce266c8247a2cde9cc8f1662af53878b478161d0
-EBUILD boost-m4-0.4_p20160328.ebuild 904 BLAKE2B ace4eba2aa64209e1781365d659cacd98aa73e73759018ef8e014c05f809af6bda3439b89e406590a67865d7c6a9f576492e5fd1ba09eb6bd422b0229819138a SHA512 946d65f421d24657b2f7d4cfd913a2a6ff654d9a3dffe757c474cc29693708d495d698632f8a0b5bba8a2555b428358cfb85dfcd280b0383269d37901152d46a
+EBUILD boost-m4-0.4_p20160328.ebuild 903 BLAKE2B 88cb7206789f90ab93f6e92be31141c804bc476f2bf80b066208a913156cc7a1106e7ecb5ad10cf8e932cd26a6c3abd881547fc4c371245adc715c27fc60fd40 SHA512 213afaaaf6ed51ef021b94baac7e4b59fe6f6ff7025b5137fe28fb4768adb519de328108c38cb1d6a4054d9da1d66e9b69abfe41a1acb71bdebd94a07c6fa324
 MISC metadata.xml 222 BLAKE2B 448a1ea951952548a4400942106647671f29fd652f7cfb1c37fe9560e77f169f9ba9b68967736b542d134c111924cd0e2d84dc4db6269690234b6f0b50cac630 SHA512 5144b4eb888e33db8ccf9038a19bebaca24c0ad51a04e706f1701214adab830a39907686b4c4d655f147b827c34dc2fda9737680ee983da5f62b417ec0775557
diff --git a/sys-devel/boost-m4/boost-m4-0.4-r1.ebuild b/sys-devel/boost-m4/boost-m4-0.4-r1.ebuild
deleted file mode 100644
index b230d2ec9dc5..000000000000
--- a/sys-devel/boost-m4/boost-m4-0.4-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils vcs-snapshot
-
-DESCRIPTION="Another set of autoconf macros for compiling against boost"
-HOMEPAGE="https://github.com/tsuna/boost.m4"
-SRC_URI="${HOMEPAGE}/tarball/v${PV} -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE=""
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gcc5.patch
-}
-
-# boost.m4 has a buildsystem, but the distributer didn't use make dist
-# so we'd have to eautoreconf to use it. Also, its ./configure script
-# DEPENDs on boost. For installing one file, bootstrapping the
-# buildsystem isn't worth it.
-src_configure() { :; }
-
-src_compile() { :; }
-
-src_install() {
-	insinto /usr/share/aclocal
-	doins build-aux/boost.m4
-
-	dodoc AUTHORS NEWS README THANKS
-}
diff --git a/sys-devel/boost-m4/boost-m4-0.4.ebuild b/sys-devel/boost-m4/boost-m4-0.4.ebuild
deleted file mode 100644
index 5fdcd0d72395..000000000000
--- a/sys-devel/boost-m4/boost-m4-0.4.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit vcs-snapshot
-
-DESCRIPTION="Another set of autoconf macros for compiling against boost"
-HOMEPAGE="https://github.com/tsuna/boost.m4"
-SRC_URI="${HOMEPAGE}/tarball/v${PV} -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE=""
-
-# boost.m4 has a buildsystem, but the distributer didn't use make dist
-# so we'd have to eautoreconf to use it. Also, its ./configure script
-# DEPENDs on boost. For installing one file, bootstrapping the
-# buildsystem isn't worth it.
-src_configure() { :; }
-
-src_compile() { :; }
-
-src_install() {
-	insinto /usr/share/aclocal
-	doins build-aux/boost.m4
-
-	dodoc AUTHORS NEWS README THANKS
-}
diff --git a/sys-devel/boost-m4/boost-m4-0.4_p20160328.ebuild b/sys-devel/boost-m4/boost-m4-0.4_p20160328.ebuild
index 66dfeaa5c885..ce2f59b99369 100644
--- a/sys-devel/boost-m4/boost-m4-0.4_p20160328.ebuild
+++ b/sys-devel/boost-m4/boost-m4-0.4_p20160328.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~soap/distfiles/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ~ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE=""
 S="${WORKDIR}/boost.m4-1489691f65aecb593e33abc3e56ac482dd67da7b"
 
diff --git a/sys-devel/boost-m4/files/boost-m4-0.4-gcc5.patch b/sys-devel/boost-m4/files/boost-m4-0.4-gcc5.patch
deleted file mode 100644
index a929957e8aa6..000000000000
--- a/sys-devel/boost-m4/files/boost-m4-0.4-gcc5.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-https://bugs.gentoo.org/549618
-Note: I dropped the last hunk from the upstream patch. It doesn't apply and
-is unnecessary since we build boost with --layout=system.
-
-From 32553aaf4d5090da19aa0ec33b936982c685009f Mon Sep 17 00:00:00 2001
-From: Akim Demaille <akim@lrde.epita.fr>
-Date: Wed, 26 Nov 2014 16:56:28 +0100
-Subject: [PATCH] boost.m4: cope with GCC 5
-
-Serial 24.
-
-There are two needed adjustments.
-
-One due to the output format which has changed:
-
-  $ cat conftest.cc
-  #include <boost/version.hpp>
-  boost-lib-version = BOOST_LIB_VERSION
-  $ g++-mp-4.9 -E conftest.cc            $ g++-mp-5 -E conftest.cc
-  # 1 "conftest.cc"                      # 1 "conftest.cc"
-  # 1 "<built-in>"                       # 1 "<built-in>"
-  # 1 "<command-line>"                   # 1 "<command-line>"
-  # 1 "conftest.cc"                      # 1 "conftest.cc"
-  # 1 "/include/boost/version.hpp" 1 3   # 1 "/include/boost/version.hpp" 1 3
-  # 2 "conftest.cc" 2                    # 2 "conftest.cc" 2
-  boost-lib-version = "1_56"           ! boost-lib-version =
-                                       ! # 2 "conftest.cc" 3
-                                       !                    "1_56"
-
-Since I fear that -P is not portable, let's play with tr and grep to
-get rid of all the # lines and glue the remaining lines together.
-
-The other one is that, finally, gcc 4.10 will actually be named gcc 5,
-so recognize this name.
-
-* build-aux/m4/boost.m4 (_BOOST_SED_CPP): Clean the preprocessor output
-before handing it to the sed command.
-(_BOOST_FIND_COMPILER_TAG): Support GCC 5.
-Improve accuracy of error messages by adding delimiters to bad strings.
-
-Signed-off-by: Benoit Sigoure <tsunanet@gmail.com>
----
- build-aux/boost.m4 | 25 ++++++++++++++++++++++---
- 1 file changed, 22 insertions(+), 3 deletions(-)
-
---- a/build-aux/boost.m4
-+++ b/build-aux/boost.m4
-@@ -72,8 +72,25 @@ dnl strip `\n' with backquotes, not the `\r'.  This results in
- dnl boost_cv_lib_version='1_37\r' for instance, which breaks
- dnl everything else.
- dnl Cannot use 'dnl' after [$4] because a trailing dnl may break AC_CACHE_CHECK
-+dnl
-+dnl Beware that GCC 5, when expanding macros, may embed # line directives
-+dnl a within single line:
-+dnl
-+dnl # 1 "conftest.cc"
-+dnl # 1 "<built-in>"
-+dnl # 1 "<command-line>"
-+dnl # 1 "conftest.cc"
-+dnl # 1 "/opt/local/include/boost/version.hpp" 1 3
-+dnl # 2 "conftest.cc" 2
-+dnl boost-lib-version =
-+dnl # 2 "conftest.cc" 3
-+dnl                    "1_56"
-+dnl
-+dnl So get rid of the # lines, and glue the remaining ones together.
- (eval "$ac_cpp conftest.$ac_ext") 2>&AS_MESSAGE_LOG_FD |
-+  grep -v '#' |
-   tr -d '\r' |
-+  tr -s '\n' ' ' |
-   $SED -n -e "$1" >conftest.i 2>&1],
-   [$3],
-   [$4])
-@@ -208,7 +225,7 @@ AC_LANG_POP([C++])dnl
-   AC_CACHE_CHECK([for Boost's header version],
-     [boost_cv_lib_version],
-     [m4_pattern_allow([^BOOST_LIB_VERSION$])dnl
--     _BOOST_SED_CPP([/^boost-lib-version = /{s///;s/\"//g;p;q;}],
-+     _BOOST_SED_CPP([[/^boost-lib-version = /{s///;s/[\" ]//g;p;q;}]],
-                     [#include <boost/version.hpp>
- boost-lib-version = BOOST_LIB_VERSION],
-     [boost_cv_lib_version=`cat conftest.i`])])
-@@ -216,7 +233,7 @@ boost-lib-version = BOOST_LIB_VERSION],
-     boost_major_version=`echo "$boost_cv_lib_version" | sed 's/_//;s/_.*//'`
-     case $boost_major_version in #(
-       '' | *[[!0-9]]*)
--        AC_MSG_ERROR([invalid value: boost_major_version=$boost_major_version])
-+        AC_MSG_ERROR([invalid value: boost_major_version='$boost_major_version'])
-         ;;
-     esac
- fi