diff options
| author |   Julian Ospald <hasufell@gentoo.org> | 2013-07-27 23:54:00 +0000 |
|---|---|---|
| committer | Julian Ospald <hasufell@gentoo.org> | 2013-07-27 23:54:00 +0000 |
| commit | 9a23162e7b401245fdc3e2cd0315fd865e8855c2 (patch) | |
| tree | 013bde117215673484ee2cfa56a35bb7222b8848 /sci-visualization/paraview | |
| parent | Rewrite sed expression in qt_nolibx11() to work on both 4.8.4 and 4.8.5. Fixe... (diff) | |
| download | historical-9a23162e7b401245fdc3e2cd0315fd865e8855c2.tar.gz historical-9a23162e7b401245fdc3e2cd0315fd865e8855c2.tar.bz2 historical-9a23162e7b401245fdc3e2cd0315fd865e8855c2.zip | |
fix build with stable dev-db/mysql wrt #478250
Package-Manager: portage-2.2.0_alpha190/cvs/Linux x86_64
Manifest-Sign-Key: 0xE73C35B3
Diffstat (limited to 'sci-visualization/paraview')
| -rw-r--r-- | sci-visualization/paraview/ChangeLog | 5 | ||||
| -rw-r--r-- | sci-visualization/paraview/Manifest | 18 | ||||
| -rw-r--r-- | sci-visualization/paraview/paraview-4.0.1.ebuild | 16 |
3 files changed, 26 insertions, 13 deletions
diff --git a/sci-visualization/paraview/ChangeLog b/sci-visualization/paraview/ChangeLog index 1d3332af2421..2622c8c5fb79 100644 --- a/sci-visualization/paraview/ChangeLog +++ b/sci-visualization/paraview/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sci-visualization/paraview # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/ChangeLog,v 1.72 2013/07/27 21:48:12 hasufell Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/ChangeLog,v 1.73 2013/07/27 23:53:59 hasufell Exp $ + + 28 Jul 2013; Julian Ospald <hasufell@gentoo.org> paraview-4.0.1.ebuild: + fix build with stable dev-db/mysql wrt #478250 27 Jul 2013; Julian Ospald <hasufell@gentoo.org> -paraview-3.98.0.ebuild, -paraview-3.98.0-r1.ebuild, -files/paraview-3.98.0-gcc-4.7.patch, diff --git a/sci-visualization/paraview/Manifest b/sci-visualization/paraview/Manifest index 1d9e70fca447..fc288226a8ff 100644 --- a/sci-visualization/paraview/Manifest +++ b/sci-visualization/paraview/Manifest @@ -7,17 +7,17 @@ AUX paraview-4.0.1-vtk-cg-path.patch 1087 SHA256 291e1dd64351dcac5c1595a10f9c830 AUX paraview-4.0.1-vtknetcd.patch 2775 SHA256 b972d38d99c43db18c92b5423d06f542eae843028e1f37dff102ea10979dfea1 SHA512 3da1cd798307059e3e4dd3da876da5579384c7fe8c41301b73540f8bc653457186f956505272bb20fafb12d5f756c79ae7c31d8e5b361e0f7f86de2f480ed61b WHIRLPOOL bbf8bba64eeb0d1830f5da7285ea3c848dccf7dbef6e2663bbadea37059d10f89af676e0b44b42f8283193ccbf36895a83981206767d401094dca3113396b544 AUX paraview-4.0.1-xdmf-cstring.patch 360 SHA256 4505a480b3775d20cde98f724a20c8b0dbf4f3baf6068013bf69b0e54c1f8473 SHA512 5577b7bae26959546795721d712c4e4f6a5403b35c0871040f6c74c07cd3aecd5b03e9f7a07ef49714b8adb4c7cc880385215b8742895006d2ad3dfeccc50472 WHIRLPOOL e0d0c1603ba4ca66fc05dd5049215f2c988f3452763772df35c7fd6a8cb6fa779fd4efbccd20a01f19778f7c0b1db78e0af12716137976ae7bf54923a6bc0642 DIST ParaView-v4.0.1-source.tgz 47827831 SHA256 1e04fcc085ee0305a163d9b6a66904fbb21e6a3fac69b275395c5ffc106e48e2 SHA512 be27b4c10f4881bcd85bfd81b0671f74358022809837620a0baf59f3c3090a5eb3afc1f78a561a3fcf9d4154875fb393c062c1b428579bc254ac7c1ff7214505 WHIRLPOOL ddac32f4be7d46b43f8f66f51ec7877442fd502fcc19b9864e284762b2cc0f3162f16766ca5c566b7f8201745ed6535cf95651f152a4d4476c2682a6432835c0 -EBUILD paraview-4.0.1.ebuild 9426 SHA256 da7a73424c3c0f539e9bdbb8f68b861a0fd9595a3f6e9c51ece587b31451aa1d SHA512 831f868062e0efd1baa912e2dc0018963adab7e94c5d886b855e30843e161a23d094ccc59fca7d6f1a1360325945b2baa63b2976d99e2f5fe0b333cf2040afd5 WHIRLPOOL 79174b3ffab330b84beb0a9ad65065ad5d8e628dbbf4631529a1b57705f4d718835ce23fc821de4c587f460ee1a29777a8731873a61ada37ff6f6fa4e8f3e3de -MISC ChangeLog 15463 SHA256 83fe7b436791d1a56786f1f4108adea08c763a7c35dcaa7240ff77e4cb972d66 SHA512 2ba4481d54c16abc756d6c4e0a5d855802ee59d80ffe50d7664ff209d48b4e9bdf635a09489ba82c63881532f6ea7dd5e7995430294679d08168c1f058f5ebd5 WHIRLPOOL d7d6e7fa859f1c614066887656358b144a73729a33bed28767fd2181042c89c0db3b7ce737027cbb093a8d15b4f15698c0d0d544d1aaa3f4ceaec856aad8363d +EBUILD paraview-4.0.1.ebuild 9705 SHA256 b08b1a60b384f055be88a0e6f9791366e2cbf3c082ece01053a465b8defd79ec SHA512 c5a0244806fafaf7fa114e2f2276352c5fdd0dc68210f60cdf58ae1cf21fd028a68607a5dfe14286bb5e855ca2efa735b7f626f6e2d19eda4a56ddadd143051d WHIRLPOOL e0dd644bc03a2253435d649c88723ede9fa9078cdbdba829e5b924a23d932e914032af52d8e7e61b6db9a0dc7023eee5fa4d50fc080da55c0a6da3745555d19d +MISC ChangeLog 15587 SHA256 1882b934261d1499f038bd151602d811d4e2d8dedd6a117ac656c8b5fd8d5352 SHA512 b86e1aac0f5c327052017f9e49c97f0cecb2d0348e57f89baa1f3913ddb5482b8df0d1fa17bf0bd8fd47ee396e657c46dd464e97f243ede54f248db96ec4d3f3 WHIRLPOOL 09b8deccf5b8bef219ec6fcb6a2d6321893e74f99043526c7b7f811f1e600a6fa1f470c645db8ff3512080661ebfee17521f45e574f55b04eda5c43e0e4b799f MISC metadata.xml 735 SHA256 648a5e42e36e2e9134525d349b71c6addf1986934fb8510a60e304143eeecc9e SHA512 377cfa79808b2e75eadf5563fef1a0474f67eb6da4f5a6c47ed4f1f188af22979fe06be2b67bdf0b427cf77595ea9f507dd4c570137d38438dc74ef70d431156 WHIRLPOOL 573a07256245eabec115fb910b990a06386e582f37adebba4e135299cced7102cd8524fb655c162e1702fb0f5fe2008f7d463d855965d797ea4b136340ed506e -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.20 (GNU/Linux) -iQEcBAEBCAAGBQJR9E4sAAoJEFpvPKfnPDWz6a8H/2RjAMKJBHnX68fwbGL29ZvY -GiLG5h+aq2PV5hiU445pcEysV52u8Np3c7neQPsidsLdZiArYwM2OpTpXpBytNIR -RxL/4PHZBjXPQ0wkGTLbx4a7YE8En72S8Yqo+RDvvgN6jeWfXjuOHg/0nrhDRPpi -DvOSNVuaB2jTC383N3whVPaFXeotfHPNEqM5QuL/YN7muqkFIyRCOeX/S4080Auh -U5+93sUFQLPlc7f5wKkhuR1il8Iw4XPVC5Mmdv4UQnX2lcNr4hTedkbRzhzzrG6o -wh909TGnmS8My1jme4Z4qeHFzimldJOfc8i2SQpmmgi3oK00HW2Rpv5Ak3m5xnU= -=9Wif +iQEcBAEBCAAGBQJR9GufAAoJEFpvPKfnPDWzfp8IAIlJZpGvXibSaGrjDuGtsY70 +KsFUGBUcMvLjLVkLxNp9VoefaHX04V6w6Zf1yM6nZsPMUI2NheWLf5jcb0HGzvDH +hevYvJOcxKWKPqZiWR6B28R1r7A8cW80sJJVQ2MMeSbMCw92SBSwEPzhFg0U+eWK +5pyntpwFcrxXHMOMJTK8QE+PkOKLJbusiPTw1kOx5Yi9QDx0HqNYGgpQRs05DfOt +dAKkKftX0+KMe1lSxwrtQIaiw6v9tU9M+mV/hRcIgFfj1ldviAdVpsYhnRvu5+sh +NTX9itOAOgePVRyxuKQERPmSjmRz3zwriYGah93uOsS/5EdQEXOECRgrjfmlTKs= +=8qJR -----END PGP SIGNATURE----- diff --git a/sci-visualization/paraview/paraview-4.0.1.ebuild b/sci-visualization/paraview/paraview-4.0.1.ebuild index ffb829a3d245..6df0ee96e2bd 100644 --- a/sci-visualization/paraview/paraview-4.0.1.ebuild +++ b/sci-visualization/paraview/paraview-4.0.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/paraview-4.0.1.ebuild,v 1.2 2013/07/24 11:16:23 hasufell Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/paraview-4.0.1.ebuild,v 1.3 2013/07/27 23:53:59 hasufell Exp $ EAPI=5 @@ -116,6 +116,16 @@ src_prepare() { } src_configure() { + local mysql_lib mysql_includedir + + 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 + # TODO: use system protobuf, jsoncpp # VTK_USE_SYSTEM_QTTESTING # PARAVIEW_USE_SYSTEM_AUTOBAHN @@ -149,8 +159,8 @@ src_configure() { -DVTK_USE_FFMPEG_ENCODER=OFF -DPROTOC_LOCATION=$(type -P protoc) -DVTK_Group_StandAlone=ON - -DMYSQL_INCLUDE_DIRECTORIES="$(usex mysql "$(mysql_config --variable=pkgincludedir)" "")" - -DMYSQL_LIBRARY="$(usex mysql "$(mysql_config --variable=pkglibdir)/libmysqlclient.so" "")" + -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 |