aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAstroFloyd <AstroFloyd@gmail.com>2017-04-16 12:27:26 +0200
committerAstroFloyd <AstroFloyd@gmail.com>2017-04-16 12:27:26 +0200
commitdcdb6b8d74dad8b599b5f8e1bacce493bfa54c9d (patch)
tree3962906821821e590b239f631374c7bb288a7096
parentsci-astronomy/soltrack: initial ebuild for v2.1 (diff)
downloadAstroFloyd-dcdb6b8d74dad8b599b5f8e1bacce493bfa54c9d.zip
AstroFloyd-dcdb6b8d74dad8b599b5f8e1bacce493bfa54c9d.tar.gz
AstroFloyd-dcdb6b8d74dad8b599b5f8e1bacce493bfa54c9d.tar.bz2
sci-libs/plplot: revision bump to v5.10.0-r2
Package-Manager: Portage-2.3.3, Repoman-2.3.1
-rw-r--r--sci-libs/plplot/ChangeLog7
-rw-r--r--sci-libs/plplot/Manifest8
-rw-r--r--sci-libs/plplot/files/plplot-5.10.0-cairo.cmake.patch25
-rw-r--r--sci-libs/plplot/files/plplot-5.10.0-pango.cmake.patch28
-rw-r--r--sci-libs/plplot/metadata.xml1
-rw-r--r--sci-libs/plplot/plplot-5.10.0-r2.ebuild (renamed from sci-libs/plplot/plplot-5.10.0-r1.ebuild)4
6 files changed, 67 insertions, 6 deletions
diff --git a/sci-libs/plplot/ChangeLog b/sci-libs/plplot/ChangeLog
index 06c1532..9e23d97 100644
--- a/sci-libs/plplot/ChangeLog
+++ b/sci-libs/plplot/ChangeLog
@@ -1,7 +1,12 @@
# ChangeLog for sci-libs/plplot
-# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2017 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/sci-libs/plplot/ChangeLog,v 1.65 2015/07/23 20:20:57 pacho Exp $
+ 16 Apr 2017; AstroFloyd <AstroFloyd@gmail.com> -plplot-5.10.0-r1.ebuild,
+ +plplot-5.10.0-r2.ebuild, +files/plplot-5.10.0-cairo.cmake.patch,
+ +files/plplot-5.10.0-pango.cmake.patch:
+ Revision bump: patches for latest CMake version
+
23 Jul 2015; Pacho Ramos <pacho@gentoo.org> plplot-5.11.0-r1.ebuild:
ppc stable wrt bug #529038
diff --git a/sci-libs/plplot/Manifest b/sci-libs/plplot/Manifest
index 208fbbc..6461b31 100644
--- a/sci-libs/plplot/Manifest
+++ b/sci-libs/plplot/Manifest
@@ -1,10 +1,12 @@
+AUX plplot-5.10.0-cairo.cmake.patch 681 SHA256 62575ef7323370b6717c9ca51adb90d9f772a3cb80320f5ec42dd3d7b569ad26 SHA512 9b73c0d08335ae5bdfa60da4907a3bb25832c5857a6391950b4f2950240a594d08c0ab83d85255e5da2ee0e3c9bed936978d5ab88434ba82ae49554724c6fac7 WHIRLPOOL 38052c8bb03684c08b5e728a4516fe225efa86f24895d7fb05ff2062aee170931224e05fe55c65cf04f16e95487509d8729c4d2aea66036ab8d14672f8d64dbc
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.10.0-pango.cmake.patch 929 SHA256 03407f5fe5f468032ea4ff363237140da70f54fb7f9aaa6f078ae257dcc863fd SHA512 c3371cb69d5fc88e6134ab6f3bdc50903b58d6db576cb82ce721de060c6c32fc4dfbf20bb218db1f6b62b8946893987b74407c3f61d8d373236a9d9688700cac WHIRLPOOL d0c32d52001e006720b8542e3c537c5299f20e41b6ad5a56e5a8a484ba9b56b49be00e989aed5515d23a7f1a7d4f62f22f633c31309fc0c54aa8dcf4a68da921
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 6751 SHA256 c71c5f01e988fd1e65ff2cbd009a05fb300d4cb7259c752d7a4dbbeb55f0b457 SHA512 ad6af7e7123430b5cc979c7310ec15f31187b519091693d6999cfd4c6135d8303ea5e48dd11800451b0f73466bbfbdd51587165b507ba91a02cb175c3b91e4d8 WHIRLPOOL 955aceae6739a15d7831dcf2fceed36ce0a3c57764f028a70de683532d363dcdbf5836ee13775c2b668fa59126ac9af753dbe33add1ceb2b367574eea4b2336e
-MISC ChangeLog 12194 SHA256 5a44e970727e565dfa18a0d442d62b6b7c9383b7999233a17e0c1dc932a0f487 SHA512 823a012befbd2517cb4c2228bd3743a22ef59850a507e3370a75f08d749c50c342bfe8bb18f0f47afe50ecee8e2a1c8f5bc07f6e279cd4d1eba2ebe37e29954b WHIRLPOOL 4ac4c1fcd189ee8c8a2a5423610ce1cd46d14a86c933d5aede620eabad3dd747b02d50f487dee36fd7496f82c13c45e5966545445b5d1e16510f830bd4f89e09
-MISC metadata.xml 1509 SHA256 42713c1bc89bcccf8143e5440b3706296b2f8b7b678ab84fc2ddc4666ca692a1 SHA512 a35d537aa4e88afd20090020b3864cbf39570288321b6c0174cf3ebcefbea0a56d945f26301282f4c0770010c2b9e937f43ea78ff35c51d8c77a3b5ef4338ae2 WHIRLPOOL 04ff5d1aea63d1d67a0148acbb8aa93f34bc4ff15055b8e60c031a006627ed15e81c1ae8be9f478377c7b866e6f10f7f678faee023f263fb55105c0188549d1d
+EBUILD plplot-5.10.0-r2.ebuild 6843 SHA256 180e399588cfad393db566d778aac4e7ef08402cdf9b358719bbe8cc2dabdb44 SHA512 78869986417997e57fd1083cc6d60c3cf88e5ed6dc8ca3c95336be3bcdbe6be18fdbc53db757d48e7d039c36877e4047f37e9575d5a70e72bb8b9e453a7f0758 WHIRLPOOL 2d49e8de526767c718c09ff7bf66c61b54a14abd4f2aaaa3416e519d981860ad435483c7f05656c4a71a6fee5bdb0e5e2b40ac222bba1d9c8dc9dcae9e83c3fd
+MISC ChangeLog 12430 SHA256 eeef9841e31e9a81f5d62653997544b655b336fedc6023f46410c090b3356ad7 SHA512 9e0befc858164a9404c4eb00ec58b8e4fb1ab46172c3cf3fbfcff615781a82ad14bdebc044a8ba407ef4c0992fa2540d69a6c3c2323e43e13f3a50dfb7ccbb8c WHIRLPOOL 16292a60248b01c2138753a649caa63de2fd69ede2efe478920d9488767249225349d45cca3ffd64bc86cd1d0ab1e8fce830e9bcdb9a600736117065b67053d9
+MISC metadata.xml 1490 SHA256 205fcd4a0aa87cb64187c1cb45e5eae7bf82ef80d2106757333eef591584ac89 SHA512 0925d1319314d13313d18af9fb3548dfb778e1d09b8ee46833c7ab3368d5937147d91a3edba607c87ac9333a15c54b8f5190d289660b6a64ca545411eabdeede WHIRLPOOL f85c45518bf52c8cc6083e816b3c44d43a4c6461e1f5e4b5cec24132c69cbb92b12d891e1b41b4906c3a96897ef0aae391ef37aae332d0af017705a0b3441470
diff --git a/sci-libs/plplot/files/plplot-5.10.0-cairo.cmake.patch b/sci-libs/plplot/files/plplot-5.10.0-cairo.cmake.patch
new file mode 100644
index 0000000..63ed425
--- /dev/null
+++ b/sci-libs/plplot/files/plplot-5.10.0-cairo.cmake.patch
@@ -0,0 +1,25 @@
+--- a/cmake/modules/cairo.cmake 2013-09-07 10:29:45.000000000 +0200
++++ b/cmake/modules/cairo.cmake 2017-04-16 12:03:48.722484754 +0200
+@@ -97,15 +97,13 @@
+ OR PLD_extcairo
+ OR PLD_wincairo
+ )
+- pkg_check_pkgconfig(
+- pangocairo
+- includedir
+- linkdir
+- linkflags
+- cflags
+- version
+- _CAIRO
+- )
++ pkg_search_module(cairo pangocairo)
++ set(includedir ${cairo_INCLUDE_DIRS})
++ set(linkdir ${cairo_LIBRARY_DIRS})
++ set(linkflags ${cairo_LDFLAGS})
++ set(cflags ${cairo_CFLAGS})
++ set(version ${cairo_VERSION})
++
+ if(linkflags)
+ # Check that the pangocairo library version is recent
+ # enough to efficiently handle text clipping.
diff --git a/sci-libs/plplot/files/plplot-5.10.0-pango.cmake.patch b/sci-libs/plplot/files/plplot-5.10.0-pango.cmake.patch
new file mode 100644
index 0000000..0187d4a
--- /dev/null
+++ b/sci-libs/plplot/files/plplot-5.10.0-pango.cmake.patch
@@ -0,0 +1,28 @@
+--- a/cmake/modules/pango.cmake 2009-04-04 23:23:44.000000000 +0200
++++ b/cmake/modules/pango.cmake 2017-04-16 12:10:00.102280094 +0200
+@@ -20,20 +20,16 @@
+ # Module for determining all configuration variables for libpango.
+
+ if(PKG_CONFIG_EXECUTABLE)
+- pkg_check_pkgconfig(
+- pango
+- PANGO_INCLUDE_DIR PANGO_LINK_DIR PANGO_LINK_FLAGS PANGO_CFLAGS PANGO_VERSION _PANGO1
+- )
++ pkg_search_module(PANGO pango)
++ set(PANGO_LINK_FLAGS ${PANGO_LDFLAGS})
+ if(NOT PANGO_LINK_FLAGS)
+ message(STATUS
+ "WARNING: pkg-config does not find pango."
+ )
+ endif(NOT PANGO_LINK_FLAGS)
+-
+- pkg_check_pkgconfig(
+- pangoft2
+- PANGOFT2_INCLUDE_DIR PANGOFT2_LINK_DIR PANGOFT2_LINK_FLAGS PANGOFT2_CFLAGS PANGOFT2_VERSION _PANGO2
+- )
++
++ pkg_search_module(PANGOFT2 pangoft2)
++ set(PANGOFT2_LINK_FLAGS ${PANGOFT2_LDFLAGS})
+ if(NOT PANGOFT2_LINK_FLAGS)
+ message(STATUS
+ "WARNING: pkg-config does not find pangoft2."
diff --git a/sci-libs/plplot/metadata.xml b/sci-libs/plplot/metadata.xml
index f5db23b..b4e56a0 100644
--- a/sci-libs/plplot/metadata.xml
+++ b/sci-libs/plplot/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <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++,
diff --git a/sci-libs/plplot/plplot-5.10.0-r1.ebuild b/sci-libs/plplot/plplot-5.10.0-r2.ebuild
index bbca811..bdadf95 100644
--- a/sci-libs/plplot/plplot-5.10.0-r1.ebuild
+++ b/sci-libs/plplot/plplot-5.10.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 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.6 2015/05/07 09:14:47 jlec Exp $
@@ -100,6 +100,8 @@ PATCHES=(
"${FILESDIR}"/${PN}-5.9.11-multiarch.patch
"${FILESDIR}"/${PN}-5.10.0-have-config-h.patch
"${FILESDIR}"/${PN}-5.10.0-cmake.patch
+ "${FILESDIR}"/${PN}-5.10.0-pango.cmake.patch
+ "${FILESDIR}"/${PN}-5.10.0-cairo.cmake.patch
)
pkg_setup() {