From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id EF44B1387D3 for ; Sun, 26 Oct 2014 16:16:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 37567E0872; Sun, 26 Oct 2014 16:16:22 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BC31DE0872 for ; Sun, 26 Oct 2014 16:16:21 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 86B0F340455 for ; Sun, 26 Oct 2014 16:16:20 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 332EB8CBD for ; Sun, 26 Oct 2014 16:16:18 +0000 (UTC) From: "Justin Lecher" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" Message-ID: <1414252240.4c982f626dbae30caa5885b7bf1181baf6cf9592.jlec@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-physics/root/ X-VCS-Repository: proj/sci X-VCS-Files: sci-physics/root/ChangeLog sci-physics/root/root-5.34.18-r2.ebuild sci-physics/root/root-6.00.01-r1.ebuild sci-physics/root/root-6.00.02.ebuild sci-physics/root/root-9999.ebuild X-VCS-Directories: sci-physics/root/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: 4c982f626dbae30caa5885b7bf1181baf6cf9592 X-VCS-Branch: master Date: Sun, 26 Oct 2014 16:16:18 +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: b688dc72-a95a-4a4b-b1c0-d08d032a120c X-Archives-Hash: 1824086aecfe340a9df9bd5925d772c3 commit: 4c982f626dbae30caa5885b7bf1181baf6cf9592 Author: Matthias Maier gentoo org> AuthorDate: Sat Oct 25 15:50:40 2014 +0000 Commit: Justin Lecher gentoo org> CommitDate: Sat Oct 25 15:50:40 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=4c982f62 sci-physics/root: Fix compilation with USE="mysql" wrt bug #523996; fix die_compiler message Package-Manager: portage-2.2.8-r2 --- sci-physics/root/ChangeLog | 5 +++++ sci-physics/root/root-5.34.18-r2.ebuild | 2 ++ sci-physics/root/root-6.00.01-r1.ebuild | 2 ++ sci-physics/root/root-6.00.02.ebuild | 10 ++++++---- sci-physics/root/root-9999.ebuild | 10 ++++++---- 5 files changed, 21 insertions(+), 8 deletions(-) diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog index 9b455b6..aff13e1 100644 --- a/sci-physics/root/ChangeLog +++ b/sci-physics/root/ChangeLog @@ -2,6 +2,11 @@ # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 # $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.96 2012/03/29 18:21:49 bicatali Exp $ + 25 Oct 2014; Matthias Maier root-5.34.18-r2.ebuild, + root-6.00.01-r1.ebuild, root-6.00.02.ebuild, root-9999.ebuild: + sci-physics/root: Fix compilation with USE="mysql" wrt bug #523996; fix + die_compiler message + 29 Sep 2014; Justin Lecher root-6.00.02.ebuild, +files/root-6.00.02-tm_zone.patch, metadata.xml: Backport fix for build failure diff --git a/sci-physics/root/root-5.34.18-r2.ebuild b/sci-physics/root/root-5.34.18-r2.ebuild index 072b81d..7ce12fd 100644 --- a/sci-physics/root/root-5.34.18-r2.ebuild +++ b/sci-physics/root/root-5.34.18-r2.ebuild @@ -260,6 +260,8 @@ src_configure() { $(use_enable math tmva) $(use_enable math unuran) $(use_enable mysql) + $(usex mysql \ + "--with-mysql-incdir=${EPREFIX}/usr/include/mysql" "") $(use_enable odbc) $(use_enable opengl) $(use_enable oracle) diff --git a/sci-physics/root/root-6.00.01-r1.ebuild b/sci-physics/root/root-6.00.01-r1.ebuild index ebc10e1..6fe0c16 100644 --- a/sci-physics/root/root-6.00.01-r1.ebuild +++ b/sci-physics/root/root-6.00.01-r1.ebuild @@ -322,6 +322,8 @@ src_configure() { $(use_enable math vdt) $(use_enable math unuran) $(use_enable mysql) + $(usex mysql \ + "--with-mysql-incdir=${EPREFIX}/usr/include/mysql" "") $(use_enable odbc) $(use_enable opengl) $(use_enable oracle) diff --git a/sci-physics/root/root-6.00.02.ebuild b/sci-physics/root/root-6.00.02.ebuild index 5208cc9..e53ed3d 100644 --- a/sci-physics/root/root-6.00.02.ebuild +++ b/sci-physics/root/root-6.00.02.ebuild @@ -128,10 +128,10 @@ PDEPEND="doc? ( ~app-doc/root-docs-${PV}[http=,math=] )" DOC_DIR="/usr/share/doc/${P}" die_compiler() { - die "Need one of the following C++11 capable compilers:" - die " >=sys-devel/gcc[cxx]-4.8" - die " >=sys-devel/clang-3.4" - die " >=dev-lang/icc-13" + die "Need one of the following C++11 capable compilers:"\ + " >=sys-devel/gcc[cxx]-4.8"\ + " >=sys-devel/clang-3.4"\ + " >=dev-lang/icc-13" } pkg_setup() { @@ -322,6 +322,8 @@ src_configure() { $(use_enable math vdt) $(use_enable math unuran) $(use_enable mysql) + $(usex mysql \ + "--with-mysql-incdir=${EPREFIX}/usr/include/mysql" "") $(use_enable odbc) $(use_enable opengl) $(use_enable oracle) diff --git a/sci-physics/root/root-9999.ebuild b/sci-physics/root/root-9999.ebuild index b2074ac..00f4946 100644 --- a/sci-physics/root/root-9999.ebuild +++ b/sci-physics/root/root-9999.ebuild @@ -128,10 +128,10 @@ PDEPEND="doc? ( ~app-doc/root-docs-${PV}[http=,math=] )" DOC_DIR="/usr/share/doc/${P}" die_compiler() { - die "Need one of the following C++11 capable compilers:" - die " >=sys-devel/gcc[cxx]-4.8" - die " >=sys-devel/clang-3.4" - die " >=dev-lang/icc-13" + die "Need one of the following C++11 capable compilers:"\ + " >=sys-devel/gcc[cxx]-4.8"\ + " >=sys-devel/clang-3.4"\ + " >=dev-lang/icc-13" } pkg_setup() { @@ -320,6 +320,8 @@ src_configure() { $(use_enable math vdt) $(use_enable math unuran) $(use_enable mysql) + $(usex mysql \ + "--with-mysql-incdir=${EPREFIX}/usr/include/mysql" "") $(use_enable odbc) $(use_enable opengl) $(use_enable oracle)