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

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

diff --git a/sci-visualization/paraview/paraview-4.3.1.ebuild b/sci-visualization/paraview/paraview-4.3.1.ebuild
index c978762fd4950184409ca2b2cdf70bbc0b39deb9..c9a1b260daee496a0f8a95ccdd9603a2268d4bca 100644 (file)
--- 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 21ac4abb708ff7aaf664251d4aede3c41cd33dd5..89dd7f316116e89c129155dcf3b9993b7a069156 100644 (file)
--- 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