sci-libs/plplot: Backport fix for cmake-3.10, #537670

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

diff --git a/sci-libs/plplot/ChangeLog b/sci-libs/plplot/ChangeLog
index e76cd318f8ddff400c4a6c29d5c9c0fa3abd0dc8..42796eb3c531f2f561b7bec3ef000bab157c9c30 100644 (file)
--- a/sci-libs/plplot/ChangeLog
+++ b/sci-libs/plplot/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-libs/plplot
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/plplot/ChangeLog,v 1.59 2014/06/27 19:26:10 bicatali Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/plplot/ChangeLog,v 1.60 2015/02/02 10:13:30 jlec Exp $
+
+  02 Feb 2015; Justin Lecher <jlec@gentoo.org> plplot-5.10.0-r1.ebuild,
+  +files/plplot-5.10.0-cmake.patch, metadata.xml:
+  Backport fix for cmake-3.10, #537670
 
   27 Jun 2014; Sébastien Fabbro <bicatali@gentoo.org> -plplot-5.10.0.ebuild,
   plplot-5.10.0-r1.ebuild:

diff --git a/sci-libs/plplot/Manifest b/sci-libs/plplot/Manifest
index 619877fa8e14676dd974e5468dc69bcff3b661a1..019e2a751dbd1e429108f53149986c37266ee501 100644 (file)
--- a/sci-libs/plplot/Manifest
+++ b/sci-libs/plplot/Manifest
@@ -1,19 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
+AUX plplot-5.10.0-cmake.patch 830 SHA256 43b8c9ecc521730c3121f3372c7d22681ba7e7ff097670886914c2e953f3f5ed SHA512 3e547dc71b10bac35c8564242818d6af1b4257982e1552ee55202dbc98f427b56ec2e4bbc5d5e2c26699ade56d3bb9110c9558c4e217a112a33af8b594438953 WHIRLPOOL 64b1d0aaa63a2235049369b446d4720b5e3eb27114863e023579daa5fa4557811723d89537c72d2154950ccdc25192e867d0d4f65a77a6cdd039db3e6128fe13
 AUX plplot-5.10.0-have-config-h.patch 10257 SHA256 981cdb158924046788b6de596f962dcfc047b6b98d80fb3a32576e196d5eb74f SHA512 b94a917d906c49a77cc7f5ae68b3419fc83d16721d2d841ec3f5fac31b30718690a82ae03659a1cd08e8d2432282df97c9fb01b2fd44b8ea4c578a81d50fd83e WHIRLPOOL d00c0dd0365c8ff4c3b76592527aaf79e8ec5de27ca24546e3e74258a253e67eb5d331d33367905a991c946a2448d5027795c12646ee1e8173741d6d1e8dc177
 AUX plplot-5.9.11-multiarch.patch 2150 SHA256 8100cdcb843c2d52a663434c481e804e4db22e319a1d6b69c0cfdc6938c70648 SHA512 c638a5bdba7d29d76fdf5c96415d56718dea162c1a03bf4f0180c12d8d8bf26603f628de4ec130403234a5a8e349630bed6d17e53a13fa6faf921da402869da9 WHIRLPOOL b88727e63940505512906886739f0aad7561b3659112bcf03b9ad25b8640a244a60acc69e5f355636c5dd876fc76db2043dafe399669f28b2eb0cbfc3e801d11
 AUX plplot-5.9.11-ocaml.patch 2829 SHA256 f355a3af4862133438a90c2b923dfedbce5b3311d2b38736a5cea998ec3fc1e0 SHA512 26d739d0cc3f3b8227de9fdfbb6a7cbfdca6daff6515b1b91571316abc2d057eac953951ad9bb7b0fd2b28d8e220836c5da652e19170ed8401a9b3946b39c34a WHIRLPOOL 7202a6f0d54510bfb46fcf8411014170f407526ed9bb2b14b19269ff66ffbe9a1a597751cb8ab63e2d98f73f9408bb4d8df961d9b2d5d188aba5f8005cff4153
 AUX plplot-5.9.11-octave.patch 633 SHA256 672f25cc93722d8116fb45853939b0e0b3cefa75b57ff87f2a8439c97723393e SHA512 c3832d531425cea20aa436cb757ed7bfd30bdc44a4d5cc11cf9a5e5fc7109897cc10748ce780de53232b63cd67d00c1cd2d9f62ef6d378d0f814182d1beb10e2 WHIRLPOOL 96ce5a919a944a833c3febc5b6932376ee32f764709470a405d73f691b2125f76ddb8b99b6ede13a19e9ee996d2ea226e0f4a8c299b174dd9f83b9e9a4aa7a7d
 AUX plplot-5.9.6-python.patch 379 SHA256 a338e7b7d9893aabf0bc2e4bc5bd25a97b81674abfa40492b6cc8a33fe8763c8 SHA512 cb2022bda3d5408ef0b2dc280981ad8bdb2f7ecb20d827f7e71ce063fba60963e68aeaa5efd8eef87da8e3dc270b609f7cb342c1da175cd757c9f135173842e4 WHIRLPOOL a6ae20047cd0e99251746cadf703e19d35897a6788e5b5d665758f970cc47aad31331640a679f974455aeab4ab6ec4927649d4b1c1a9d9efbe474f2e966aed83
 DIST plplot-5.10.0.tar.gz 14766687 SHA256 d4e930b8b9d43cd1663408986218d61f166de7cbc9ef5bed111b0bdea934f9d5 SHA512 92a1880dc544694a19aa5a3f6f592df5b63ea65827f11804f0b1bdb1d123546abb213c1af4950c18b50e0e0fb9b40bb3311e7f21e681237df6008fee9873b11e WHIRLPOOL 52b726925a6fa89e2e097a1a7578b8b0004bfac6a841019144785861a467e4d7c812bf4301e7a747d2edab47ef5b0d481c7732f5b0c9b4ff5dae6be6cd3e17ba
-EBUILD plplot-5.10.0-r1.ebuild 6714 SHA256 75f41e7c53e448cbd153f1651074eacb01534fe251a48c9626dd86d23df3bfa6 SHA512 fa758591e7545ff91eb99888037ce4e6212e767090636638accda4739a7d83e840ccdc14e6360f4a708c8fe25cb8e129aa1a7097d2cdc6c3d189749dea496080 WHIRLPOOL 7bed0304c135c32cac0a242eb5e131181ba6f4cc8da3ab7343dd9038f03b9aa9d66db548395ec47083c54daa3f2c357c38b757663278ff1358bc68cd24282b6e
-MISC ChangeLog 11221 SHA256 bc76fa6e9a7dc5e569a4a6bca10ab9cc54b8fdf0a4a92821d3d8562b3fd42750 SHA512 b2bf9683c424f532703f3bf9900c689ae5c93450cb07b338110a23aa0bc05fc657eecf40a4c385cdcac432612d1b68cae547dec3614f069f5ebb44f31f7745e6 WHIRLPOOL 0b6308fd43ac1fbe24b4392833bd896d9e471480da753c259fa5f17fa1eb6b5c61b7458962224a4ecfcb8a8a2bcae5aa95ba1cf77a4f14a501a0171fb82b8a67
-MISC metadata.xml 1409 SHA256 9fe1c36eb5beb07262c2814c2ff0aa16c18c69fbb091641608f5ac9b90630d99 SHA512 338034d611f0b7fff5fdcfadb76488b25326f00df739c3ce58ca59b67c6fb8738bde9ceb88bf990de77364b938c2c33c5a1e56ca7ae69d910f6eac673ce4d651 WHIRLPOOL 7c81f05237517c0048cc4d4cb91a289d59b84c0923f17f8ca8bf9faf40cdb69c304fa37f63efbe63bfcfad26f5f2da9e884e1e94426eae4df99fcbba45a76c92
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iEYEAREIAAYFAlOtxVUACgkQ1ycZbhPLE2BEBACfcykDkYYMp114cP9ooKekDXHi
-UY4AoIcoOGfm4q7EVkN2gEVea6aLR1h/
-=ED3r
------END PGP SIGNATURE-----
+EBUILD plplot-5.10.0-r1.ebuild 6750 SHA256 fb2815c0d95699e651c6372b7a048fcc6e580c15e23af68975d26d28a9629980 SHA512 ac95603bd3e7a1995b3a6d634ba5d5a80eee054f1bb5126477b06269bfb413f229277f9fdd17ac5d698bed463b2ece6377d8a04d546fade0729ee2b00f4961d1 WHIRLPOOL ecbcdd2c47e25dd53ea005a0b8cf1dd5269bae9ed7707d7e2b500afb3855a3dbc707fe2ebcc08ad86302ef947896ec7796e20ceae6668ba000774957f4067729
+MISC ChangeLog 11379 SHA256 3848bab3b47651070b26856e85e3c198bab772a0b301818ee8ae9288a94352f8 SHA512 866fda06eb43dbb4e18f315523c9cc6731d741d0b6cd8d0cda157314256ce2d4332ca36a117e2559a6a30cb57fbfe75c54b0a166d21d117786f3248e3edc1649 WHIRLPOOL 153a439ec3baf6b08f512110544a93968c6e4d69209c496b7db37624782450c191d25662d9b73a10a23e4af4c3aaac212a80a4ad8c7c3d72bd64516095f49770
+MISC metadata.xml 1429 SHA256 69a86cbfe74c03beb7603183c6e6cebe3feebd2e013008034b3a7b9e2f47174b SHA512 ac998adfee018189ffdc434c0eb24a8c1406612b17e476ccfaa648e52094cfd205ace285129d5840ef40f1aa12aaa4ffddeadbe0938769ecc67e5073ad0a4b2a WHIRLPOOL 4178e7bc90990ca48e9a03efb3cef7785d98e81558787a2c27fff61d65877d92f90ced7b34ec5be2538bd8c42a38911cfc2f217f97a241156a461e4d394341a7

diff --git a/sci-libs/plplot/files/plplot-5.10.0-cmake.patch b/sci-libs/plplot/files/plplot-5.10.0-cmake.patch
new file mode 100644 (file)
index 0000000..dbb0f82
--- /dev/null
+++ b/sci-libs/plplot/files/plplot-5.10.0-cmake.patch
@@ -0,0 +1,18 @@
+diff --git a/cmake/modules/pkg-config.cmake b/cmake/modules/pkg-config.cmake
+index 3f842aa..4d269bd 100644
+--- a/cmake/modules/pkg-config.cmake
++++ b/cmake/modules/pkg-config.cmake
+@@ -94,7 +94,12 @@ macro(pkg_check_pkgconfig _package _include_DIR _link_DIR _link_FLAGS _cflags _v
+     set(_xprefix ${_prefix})
+   endif(FORCE_EXTERNAL_STATIC)
+   
+-  _pkg_check_modules_internal(0 0 ${_prefix} "${_package}")
++  if(CMAKE_VERSION VERSION_LESS "3.1")
++    _pkg_check_modules_internal(0 0 ${_prefix} "${_package}")
++  else(CMAKE_VERSION VERSION_LESS "3.1")
++    _pkg_check_modules_internal(0 0 0 0 ${_prefix} "${_package}")
++  endif(CMAKE_VERSION VERSION_LESS "3.1")
++    
+   if(${_prefix}_FOUND)
+     cmake_link_flags(${_link_FLAGS} "${${_xprefix}_LDFLAGS}")
+     # If libraries cannot be not found, then that is equivalent to whole

diff --git a/sci-libs/plplot/metadata.xml b/sci-libs/plplot/metadata.xml
index 7b67d268d00c1473e0112fd03d1f943049c4f3e5..f5888937e939018a9a50ec1ac37a03cc236d3b77 100644 (file)
--- a/sci-libs/plplot/metadata.xml
+++ b/sci-libs/plplot/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
-<longdescription lang='en'>
+  <herd>sci</herd>
+  <longdescription lang="en">
   PLplot is a library of functions that are useful for making scientific
   plots. It can be used from within compiled languages such as C, C++,
   FORTRAN and Java, as well as interactively from interpreted languages such
@@ -15,13 +15,13 @@
   support for extended characters inculding the Greek alphabet and a host of
   mathematical symbols.
 </longdescription>
-<use>
-  <flag name="ada">Add bindings for the ADA programming language</flag>
-  <flag name="dynamic">Build with dynamic drivers</flag>
-  <flag name="octave">Add bindings for
+  <use>
+    <flag name="ada">Add bindings for the ADA programming language</flag>
+    <flag name="dynamic">Build with dynamic drivers</flag>
+    <flag name="octave">Add bindings for
   <pkg>sci-mathematics/octave</pkg></flag>
-  <flag name="pdl">Add bindings for <pkg>dev-perl/PDL</pkg></flag>
-  <flag name="qhull">Add bindings for <pkg>media-libs/qhull</pkg></flag>
-  <flag name="shapefile">Enable support for ESRI shapefiles</flag>
-</use>
+    <flag name="pdl">Add bindings for <pkg>dev-perl/PDL</pkg></flag>
+    <flag name="qhull">Add bindings for <pkg>media-libs/qhull</pkg></flag>
+    <flag name="shapefile">Enable support for ESRI shapefiles</flag>
+  </use>
 </pkgmetadata>

diff --git a/sci-libs/plplot/plplot-5.10.0-r1.ebuild b/sci-libs/plplot/plplot-5.10.0-r1.ebuild
index d7f869766f9ef92b12f7cb366d8f9b63f30522b1..2d8f3d8194eb921dfad8def5d2b3a643539b288a 100644 (file)
--- a/sci-libs/plplot/plplot-5.10.0-r1.ebuild
+++ b/sci-libs/plplot/plplot-5.10.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/plplot/plplot-5.10.0-r1.ebuild,v 1.2 2014/06/27 19:26:10 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/plplot/plplot-5.10.0-r1.ebuild,v 1.3 2015/02/02 10:13:30 jlec Exp $
 
 EAPI=5
 
@@ -99,6 +99,7 @@ PATCHES=(
        "${FILESDIR}"/${PN}-5.9.11-octave.patch
        "${FILESDIR}"/${PN}-5.9.11-multiarch.patch
        "${FILESDIR}"/${PN}-5.10.0-have-config-h.patch
+       "${FILESDIR}"/${PN}-5.10.0-cmake.patch
 )
 
 pkg_setup() {