[gentoo-commits] repo/gentoo:master commit in: sci-visualization/paraview/

[Matthias Maier]

commit:     42b0f9c7e6dbd0b751f6728f226cd4c5ed946cc6
Author:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 21 21:29:51 2015 +0000
Commit:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Mon Sep 21 21:35:54 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42b0f9c7

sci-visualization/paraview: Fix configuration issue with dev-db/mysql-6.1.6, 
bug #560916

dev-db/mysql-5.5.29 and older have left the tree two years ago. Remove
buggy compatibility code that identified version 6.1.6 being less than
5.5.29...

Gentoo-Bug: 560916

Package-Manager: portage-2.2.20.1

 sci-visualization/paraview/paraview-4.3.1.ebuild | 14 --------------
 sci-visualization/paraview/paraview-4.4.0.ebuild | 14 --------------
 2 files changed, 28 deletions(-)

diff --git a/sci-visualization/paraview/paraview-4.3.1.ebuild 
b/sci-visualization/paraview/paraview-4.3.1.ebuild
index c978762..c9a1b26 100644
--- a/sci-visualization/paraview/paraview-4.3.1.ebuild
+++ b/sci-visualization/paraview/paraview-4.3.1.ebuild
@@ -125,18 +125,6 @@ src_prepare() {
 }
 
 src_configure() {
-       local mysql_lib mysql_includedir
-
-       if use mysql ; then
-               if [[ $(mysql_config --version | sed 's/\.//g') -lt 5529 ]] ; 
then
-                       mysql_lib="/usr/$(get_libdir)/mysql/libmysqlclient.so"
-                       mysql_includedir="/usr/include/mysql"
-               else
-                       mysql_lib="$(mysql_config 
--variable=pkglibdir)/libmysqlclient.so"
-                       mysql_includedir="$(mysql_config 
--variable=pkgincludedir)"
-               fi
-       fi
-
        # VTK_USE_SYSTEM_QTTESTING
        # PARAVIEW_USE_SYSTEM_AUTOBAHN
        local mycmakeargs=(
@@ -171,8 +159,6 @@ src_configure() {
                -DVTK_USE_FFMPEG_ENCODER=OFF
                -DPROTOC_LOCATION=$(type -P protoc)
                -DVTK_Group_StandAlone=ON
-               -DMYSQL_INCLUDE_DIRECTORIES="$(usex mysql "${mysql_includedir}" 
"")"
-               -DMYSQL_LIBRARY="$(usex mysql "${mysql_lib}" "")"
                # force this module due to incorrect build system deps
                # wrt bug 460528
                -DModule_vtkUtilitiesProcessXML=ON

diff --git a/sci-visualization/paraview/paraview-4.4.0.ebuild 
b/sci-visualization/paraview/paraview-4.4.0.ebuild
index 21ac4ab..89dd7f3 100644
--- a/sci-visualization/paraview/paraview-4.4.0.ebuild
+++ b/sci-visualization/paraview/paraview-4.4.0.ebuild
@@ -123,18 +123,6 @@ src_prepare() {
 }
 
 src_configure() {
-       local mysql_lib mysql_includedir
-
-       if use mysql ; then
-               if [[ $(mysql_config --version | sed 's/\.//g') -lt 5529 ]] ; 
then
-                       mysql_lib="/usr/$(get_libdir)/mysql/libmysqlclient.so"
-                       mysql_includedir="/usr/include/mysql"
-               else
-                       mysql_lib="$(mysql_config 
--variable=pkglibdir)/libmysqlclient.so"
-                       mysql_includedir="$(mysql_config 
--variable=pkgincludedir)"
-               fi
-       fi
-
        # VTK_USE_SYSTEM_QTTESTING
        # PARAVIEW_USE_SYSTEM_AUTOBAHN
        local mycmakeargs=(
@@ -169,8 +157,6 @@ src_configure() {
                -DVTK_USE_FFMPEG_ENCODER=OFF
                -DPROTOC_LOCATION=$(type -P protoc)
                -DVTK_Group_StandAlone=ON
-               -DMYSQL_INCLUDE_DIRECTORIES="$(usex mysql "${mysql_includedir}" 
"")"
-               -DMYSQL_LIBRARY="$(usex mysql "${mysql_lib}" "")"
                # force this module due to incorrect build system deps
                # wrt bug 460528
                -DModule_vtkUtilitiesProcessXML=ON