[gentoo-commits] repo/gentoo:master commit in: sci-libs/libmems/, sci-libs/libmems/files/

[gentoo-commits] repo/gentoo:master commit in: sci-libs/libmems/, sci-libs/libmems/files/

[David Seifert]

commit:     a4ae38e90d917fe1c75c95f29444afa51e418889
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Fri Oct  7 22:00:22 2016 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Fri Oct  7 22:00:22 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4ae38e9

sci-libs/libmems: Allow building with Boost 1.62

Gentoo-bug: 595986
* Revbump to also fix USE=doc building
* Patch by Peter Levine

Package-Manager: portage-2.3.1

 .../files/libmems-1.6_p1-boost-1.62-type-traits.patch     | 15 +++++++++++++++
 ...{libmems-1.6_p1-r2.ebuild => libmems-1.6_p1-r3.ebuild} | 10 ++++++++++
 2 files changed, 25 insertions(+)

diff --git a/sci-libs/libmems/files/libmems-1.6_p1-boost-1.62-type-traits.patch b/sci-libs/libmems/files/libmems-1.6_p1-boost-1.62-type-traits.patch
new file mode 100644
index 00000000..609d0de
--- /dev/null
+++ b/sci-libs/libmems/files/libmems-1.6_p1-boost-1.62-type-traits.patch
@@ -0,0 +1,15 @@
+Shuffle around Boost type_traits, which otherwise causes issues with boost 1.62.
+See also: https://bugs.gentoo.org/show_bug.cgi?id=595986
+
+--- a/libMems/AbstractMatch.h
++++ b/libMems/AbstractMatch.h
+@@ -16,8 +16,7 @@
+ #include "libGenome/gnClone.h"
+ #include <vector>
+ #include <algorithm>
+-#include <boost/type_traits/remove_pointer.hpp>
+-#include <boost/type_traits/add_pointer.hpp>
++#include <boost/type_traits.hpp>
+ #include <boost/dynamic_bitset.hpp>
+ #include <libMems/SlotAllocator.h>
+ #include <libMems/configuration.h>

diff --git a/sci-libs/libmems/libmems-1.6_p1-r2.ebuild b/sci-libs/libmems/libmems-1.6_p1-r3.ebuild
similarity index 86%
rename from sci-libs/libmems/libmems-1.6_p1-r2.ebuild
rename to sci-libs/libmems/libmems-1.6_p1-r3.ebuild
index c00e615..ef5fd0a 100644
--- a/sci-libs/libmems/libmems-1.6_p1-r2.ebuild
+++ b/sci-libs/libmems/libmems-1.6_p1-r3.ebuild
@@ -29,6 +29,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-broken-constness.patch
 	"${FILESDIR}"/${P}-format-security.patch
 	"${FILESDIR}"/${P}-fix-c++14.patch
+	"${FILESDIR}"/${P}-boost-1.62-type-traits.patch
 )
 
 src_prepare() {
@@ -42,6 +43,15 @@ src_configure() {
 		$(use_enable static-libs static)
 }
 
+src_compile() {
+	default
+
+	if use doc; then
+		doxygen doxygen.am || die
+		HTML_DOCS+=( html/. )
+	fi
+}
+
 src_install() {
 	default