public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: sys-devel/boost-m4/, sys-devel/boost-m4/files/
@ 2018-05-27  8:25 Mikle Kolyada
  0 siblings, 0 replies; only message in thread
From: Mikle Kolyada @ 2018-05-27  8:25 UTC (permalink / raw
  To: gentoo-commits

commit:     9d82e3653eb6dc903686140a554901cc69edef39
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sun May 27 08:25:06 2018 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sun May 27 08:25:06 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d82e365

sys-devel/boost-m4: Drop old (EAPI=4)

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 sys-devel/boost-m4/Manifest                      |  1 -
 sys-devel/boost-m4/boost-m4-0.4-r1.ebuild        | 34 ---------
 sys-devel/boost-m4/boost-m4-0.4.ebuild           | 30 --------
 sys-devel/boost-m4/files/boost-m4-0.4-gcc5.patch | 91 ------------------------
 4 files changed, 156 deletions(-)

diff --git a/sys-devel/boost-m4/Manifest b/sys-devel/boost-m4/Manifest
index a24fce7d9ca..2c9cc88c4c1 100644
--- a/sys-devel/boost-m4/Manifest
+++ b/sys-devel/boost-m4/Manifest
@@ -1,2 +1 @@
-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

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 b230d2ec9dc..00000000000
--- 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 5fdcd0d7239..00000000000
--- 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/files/boost-m4-0.4-gcc5.patch b/sys-devel/boost-m4/files/boost-m4-0.4-gcc5.patch
deleted file mode 100644
index a929957e8aa..00000000000
--- 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


^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2018-05-27  8:25 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-05-27  8:25 [gentoo-commits] repo/gentoo:master commit in: sys-devel/boost-m4/, sys-devel/boost-m4/files/ Mikle Kolyada

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox