commit: 627ac4ee95dfac531fdd3b91d1d0e0157bee2ceb
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 7 21:43:14 2019 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Dec 7 21:43:14 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=627ac4ee
dev-libs/boost: Rebase patches
Package-Manager: Portage-2.3.81, Repoman-2.3.20
Signed-off-by: David Seifert <soap <AT> gentoo.org>
dev-libs/boost/boost-1.71.0.ebuild | 11 +++--------
.../boost/files/boost-1.56.0-build-auto_index-tool.patch | 13 -------------
.../boost/files/boost-1.71.0-build-auto_index-tool.patch | 13 +++++++++++++
...9.0-context-x32.patch => boost-1.71.0-context-x32.patch} | 0
...icu_rpath.patch => boost-1.71.0-disable_icu_rpath.patch} | 6 +++---
5 files changed, 19 insertions(+), 24 deletions(-)
diff --git a/dev-libs/boost/boost-1.71.0.ebuild
b/dev-libs/boost/boost-1.71.0.ebuild
index 1f0b0e66905..faa5a960910 100644
--- a/dev-libs/boost/boost-1.71.0.ebuild
+++ b/dev-libs/boost/boost-1.71.0.ebuild
@@ -49,9 +49,9 @@ BDEPEND="=dev-util/boost-build-${MAJOR_V}*"
S="${WORKDIR}/${PN}_${MY_PV}"
PATCHES=(
- "${FILESDIR}"/${PN}-1.48.0-disable_icu_rpath.patch
- "${FILESDIR}"/${PN}-1.69.0-context-x32.patch
- "${FILESDIR}"/${PN}-1.56.0-build-auto_index-tool.patch
+ "${FILESDIR}"/${PN}-1.71.0-disable_icu_rpath.patch
+ "${FILESDIR}"/${PN}-1.71.0-context-x32.patch
+ "${FILESDIR}"/${PN}-1.71.0-build-auto_index-tool.patch
)
python_bindings_needed() {
@@ -130,11 +130,6 @@ pkg_setup() {
src_prepare() {
default
-
- # Do not try to build missing 'wave' tool, bug #522682
- # Upstream bugreport - https://svn.boost.org/trac/boost/ticket/10507
- sed -i -e 's:wave/build//wave::' tools/Jamfile.v2 || die
-
multilib_copy_sources
}
diff --git a/dev-libs/boost/files/boost-1.56.0-build-auto_index-tool.patch
b/dev-libs/boost/files/boost-1.56.0-build-auto_index-tool.patch
deleted file mode 100644
index 48ca5138871..00000000000
--- a/dev-libs/boost/files/boost-1.56.0-build-auto_index-tool.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Build auto_index tool with USE="tools"
-Gentoo bug report: https://bugs.gentoo.org/show_bug.cgi?id=529066
-
---- a/tools/Jamfile.v2.orig 2014-12-24 12:57:32.290880067 +0300
-+++ b/tools/Jamfile.v2 2014-12-24 12:58:38.403883250 +0300
-@@ -20,6 +20,7 @@
- use-project /boost/regression : regression/build ;
-
- TOOLS =
-+ auto_index/build//auto_index
- bcp//bcp
- inspect/build//inspect
- quickbook//quickbook
diff --git a/dev-libs/boost/files/boost-1.71.0-build-auto_index-tool.patch
b/dev-libs/boost/files/boost-1.71.0-build-auto_index-tool.patch
new file mode 100644
index 00000000000..ca793b9d06e
--- /dev/null
+++ b/dev-libs/boost/files/boost-1.71.0-build-auto_index-tool.patch
@@ -0,0 +1,13 @@
+Build auto_index tool with USE="tools"
+See also: https://bugs.gentoo.org/529066
+
+--- a/tools/Jamfile.v2
++++ b/tools/Jamfile.v2
+@@ -18,6 +18,7 @@
+ ;
+
+ TOOLS =
++ auto_index/build//auto_index
+ bcp//bcp
+ inspect/build//inspect
+ quickbook//quickbook
diff --git a/dev-libs/boost/files/boost-1.69.0-context-x32.patch
b/dev-libs/boost/files/boost-1.71.0-context-x32.patch
similarity index 100%
rename from dev-libs/boost/files/boost-1.69.0-context-x32.patch
rename to dev-libs/boost/files/boost-1.71.0-context-x32.patch
diff --git a/dev-libs/boost/files/boost-1.48.0-disable_icu_rpath.patch
b/dev-libs/boost/files/boost-1.71.0-disable_icu_rpath.patch
similarity index 94%
rename from dev-libs/boost/files/boost-1.48.0-disable_icu_rpath.patch
rename to dev-libs/boost/files/boost-1.71.0-disable_icu_rpath.patch
index 23a87830d10..32faf8d0eb3 100644
--- a/dev-libs/boost/files/boost-1.48.0-disable_icu_rpath.patch
+++ b/dev-libs/boost/files/boost-1.71.0-disable_icu_rpath.patch
@@ -1,6 +1,6 @@
--- a/libs/locale/build/Jamfile.v2
+++ b/libs/locale/build/Jamfile.v2
-@@ -58,8 +58,8 @@
+@@ -65,8 +65,8 @@
if $(ICU_LINK)
{
@@ -11,7 +11,7 @@
}
else
{
-@@ -117,7 +117,6 @@
+@@ -124,7 +124,6 @@
<library>icuuc/<link>shared/<runtime-link>shared
<library>icudt/<link>shared/<runtime-link>shared
<library>icuin/<link>shared/<runtime-link>shared
@@ -19,7 +19,7 @@
<runtime-link>shared ;
-@@ -176,7 +175,6 @@
+@@ -183,7 +182,6 @@
<library>icuuc_64/<link>shared/<runtime-link>shared
<library>icudt_64/<link>shared/<runtime-link>shared
<library>icuin_64/<link>shared/<runtime-link>shared
