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 214ED1387B1 for ; Mon, 21 Sep 2015 21:36:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B2967E0807; Mon, 21 Sep 2015 21:36:14 +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 41BF2E0807 for ; Mon, 21 Sep 2015 21:36:14 +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 D7DCE3408DD for ; Mon, 21 Sep 2015 21:36:11 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9EA8116C for ; Mon, 21 Sep 2015 21:36:10 +0000 (UTC) From: "Matthias Maier" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matthias Maier" Message-ID: <1442871354.42b0f9c7e6dbd0b751f6728f226cd4c5ed946cc6.tamiko@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-visualization/paraview/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-visualization/paraview/paraview-4.3.1.ebuild sci-visualization/paraview/paraview-4.4.0.ebuild X-VCS-Directories: sci-visualization/paraview/ X-VCS-Committer: tamiko X-VCS-Committer-Name: Matthias Maier X-VCS-Revision: 42b0f9c7e6dbd0b751f6728f226cd4c5ed946cc6 X-VCS-Branch: master Date: Mon, 21 Sep 2015 21:36:10 +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: 483e05fa-453a-47a3-a190-4d15d312c484 X-Archives-Hash: 6c193fe52fae58363539c78267387766 commit: 42b0f9c7e6dbd0b751f6728f226cd4c5ed946cc6 Author: Matthias Maier gentoo org> AuthorDate: Mon Sep 21 21:29:51 2015 +0000 Commit: Matthias Maier gentoo 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