commit: 4c982f626dbae30caa5885b7bf1181baf6cf9592
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 25 15:50:40 2014 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> 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 <tam...@gentoo.org> 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 <j...@gentoo.org> 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)
