From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id BB378138330 for ; Fri, 7 Oct 2016 22:00:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9A63E21C043; Fri, 7 Oct 2016 22:00:51 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7ECE321C043 for ; Fri, 7 Oct 2016 22:00:51 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1245134146E for ; Fri, 7 Oct 2016 22:00:50 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4EC7D248E for ; Fri, 7 Oct 2016 22:00:46 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1475877622.a4ae38e90d917fe1c75c95f29444afa51e418889.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/libmems/, sci-libs/libmems/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-libs/libmems/files/libmems-1.6_p1-boost-1.62-type-traits.patch sci-libs/libmems/libmems-1.6_p1-r2.ebuild sci-libs/libmems/libmems-1.6_p1-r3.ebuild X-VCS-Directories: sci-libs/libmems/ sci-libs/libmems/files/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: a4ae38e90d917fe1c75c95f29444afa51e418889 X-VCS-Branch: master Date: Fri, 7 Oct 2016 22:00:46 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: c09f1c45-8dae-4607-beb3-ef6682519de2 X-Archives-Hash: 7f32ffc213c7ac68957eb5cad112e350 commit: a4ae38e90d917fe1c75c95f29444afa51e418889 Author: David Seifert gentoo org> AuthorDate: Fri Oct 7 22:00:22 2016 +0000 Commit: David Seifert gentoo 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 + #include +-#include +-#include ++#include + #include + #include + #include 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