From 8be70107efbb417f839292165ee39d07a062046f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 13 Jan 2018 06:19:51 +0000 Subject: gentoo resync : 13.01.2018 --- sci-visualization/gnuplot/Manifest | 5 ++- .../gnuplot/files/gnuplot-5.2.2-regis.patch | 43 ++++++++++++++++++++++ sci-visualization/gnuplot/gnuplot-5.2.2.ebuild | 6 ++- sci-visualization/gnuplot/metadata.xml | 1 + 4 files changed, 51 insertions(+), 4 deletions(-) create mode 100644 sci-visualization/gnuplot/files/gnuplot-5.2.2-regis.patch (limited to 'sci-visualization/gnuplot') diff --git a/sci-visualization/gnuplot/Manifest b/sci-visualization/gnuplot/Manifest index c496f7709c1e..d54c9b5c4133 100644 --- a/sci-visualization/gnuplot/Manifest +++ b/sci-visualization/gnuplot/Manifest @@ -1,5 +1,6 @@ AUX gnuplot-5.0.1-fix-underlinking.patch 483 BLAKE2B 1719635d947a5d53fa5b6def65286aa1064e5a80d36d42670890bdda7dc849add342e3574dbee85f0546d953491271354c6946cc157207af700ab1cfde6d0249 SHA512 b5ac3ed830f201ba6018a81bc4860e6da0e41cc9cdc1ac8acc225bf41a0006cbd6e2f8e061ab2bd013ad55b105a02e915e256a09ca4e4faaf4791ea1c3199f28 AUX gnuplot-5.0.6-no-picins.patch 956 BLAKE2B 41485f39f7640426624abcfa3f9231768044d11a6fdea838a964070465d2af00149bed5715a2a97ec6cfd1dddd32169a0694685d36c806982eb1b10676f4dd28 SHA512 fe66f0d8045be89d6464b9de9aa7d80196b4eccf0d0aab3daf6b0a121f5565bb96f11e0f96d9d9c296795b86e11300ddb9811100671fc4470d2dbf8097fbb02c +AUX gnuplot-5.2.2-regis.patch 1171 BLAKE2B 57d2faba0f01ca27de0ff39b9b9d01faeffcbedacd240c39aa7756fffa27aa2f6d28d3cf5d24f2b6a88399ada1538676f408851957e5df026411dffb32665689 SHA512 fe9154eb6687426542fd51b42b80378e1755007e81628be6bb318a8aaabd90dc7cadb85362162e7e323a0cf60b6bcd0509bb0318888c17bb5e4330f4c00f1f6b DIST gnuplot-5.0.1.tar.gz 4963747 BLAKE2B 12ef41cf34a5cb8768391a00508656af5f642b1abd9be895a29814dfb4aed5c9fa611a780063667c95e7154382d64e8fbb5d93bef601d5d1dddc9e7bbad9ce0f SHA512 f68ccef8ecad0d5f7c2eb5dc2c97ba14abba6e3324c36bb9ede5f87eef613942376a26e42e55fa8e9c908e2b732aa0b9f34d6d5c386e3d5cf9685bbca60fa094 DIST gnuplot-5.0.6.tar.gz 5093897 BLAKE2B 9cbd432b8177175b39b4c0068b4852951903fb7d142608b2a7d624e29d8f5e6f4b700ecb3914b7de8e0fc8dcc22156d4cbf2e5b681412b3b5aca4738ec258759 SHA512 7f9b05725a8594dcfbf1f1fc8f1db9bf45e1b6841fa1089b2c2528a3e36f71baab16d5fbeb027e4dd3618461a4895d037cb9f43781bfee2cb078cb9583567d8d DIST gnuplot-5.0.7.tar.gz 5100186 BLAKE2B 97fcefa12148fc2b581113c5283eb09217e87858ae293931758d0bb595fd7aaca4671216956211a3d30492be35f91809a975c9c80c25861c477e9235a8b5b309 SHA512 5d7241dc1472f87af8632110a1e88f83b5ea3f41e1bc8c89a45dc4662a3071d91a25bf9ae5196a2b8bef09c8079c22f635bb947c02def3416d78880d61eea919 @@ -7,7 +8,7 @@ DIST gnuplot-5.2.2.tar.gz 5282973 BLAKE2B a15c72aaa8d62079ea3e9f20fa9fe3aaaf6036 EBUILD gnuplot-5.0.1-r1.ebuild 5692 BLAKE2B 62aa0d443aeb5690a274c1a7e389e506a152eac52a4d0ec36d412158c7bd963a8eee6d558b9f2b1608b4d8612879a34b89f476f21ebef5c4d73fc95c28f2e70d SHA512 6058590102387ce8899f50f2621fdb6221b2faa5f9778cda0cea465aa1501bc78c02c6e769f3f05297c8769f48087787fe20a9af7bc6e7038752c82d68993849 EBUILD gnuplot-5.0.6.ebuild 5891 BLAKE2B fd3af7f1a8184ff2ea2464fae22525d7832eeb21e37b64739016bdf4a3e9ed58d3dce75cb5763c61e5ec0fda3c07a70cb72cb002d3365304e9656c2b38de2cae SHA512 53e558357ab52930975be0fa3bf2bba9578c62d2f98658eafe0bb9581c477aa56f64f378705de51e1d284b0f37365b10e159d9e229a1a10a14f1a6d544cb25cb EBUILD gnuplot-5.0.7.ebuild 5830 BLAKE2B cb0609ed221db653ae7a25c41ec43afeac5358a8ce7334d4b127de353800bd14820c90d84c6b70ba1163f1c831a5a99e5bb33b46ee173d11b3566fe63d30f815 SHA512 a21375723ecf36385a2749c2710bb3e45448df198c373c190c5be0f293474cf97733a3ef8f8e16e83399d7dc85f6ff104110cf10e85c3ed98c5abfabd7852197 -EBUILD gnuplot-5.2.2.ebuild 5786 BLAKE2B 9fa3e7d0881cb7bc002be34e9a0b1efa52169bcd97de44ee5257a303fdcd0b6603fb695385907ff558d81492dbd553f9499995778ffa7b384e89df1474a49ff5 SHA512 0288e928706b88c9294bb65e18ea68c47902fc6ecddd790656c4d465eef5684f782780d9ea6e0680082fa79bed1650b4b7272f3a58b821ef9ecd8f65907cce17 +EBUILD gnuplot-5.2.2.ebuild 5860 BLAKE2B 1c1cb9b7e2ac370674628a8bd9d1e444a60aae2967eca5d53bcbd52202d8f3e4623071da33ab12c2f58462855bcb871bf3edd8c42da7082e6a7616a282ee826e SHA512 ae23cfd5c27f35102e76dba5f204b69b5a5df8e7e41ede76be867043233a3611ca17420217c7adc3045a5f8480483253a34771dd3c97e2d59881607344a41e96 EBUILD gnuplot-5.2.9999.ebuild 5807 BLAKE2B 3a2afe5f7ac171bd54334c94ac51d7ecf289ef19d4ff0109598e997a1174bf1451885ba885c86e03ec488cbe7ce2df9a21a26e4f1dcfd30e7dd1e7cf4aee1e27 SHA512 c197bda66704c895b49a0935bdfa20fd8e85c9460966ad621a46f0bc195e1648c3329e53d3be43dab137fb4eb9ebdb84727e82ff748e02f9aadd0e5be21909d1 EBUILD gnuplot-5.3.9999.ebuild 5794 BLAKE2B ca534f75fe5a9c39d93b9e750ec020aecacf426bec9c1852ce21879b44cbcb3e77c2599ea52dc02b69fb20b8a94a34b97225f5c793ea820985b40017ba5ecba5 SHA512 501777c51d6fd6fb63106857a25bdfc1038bcbaed039d5e9e351f2e80043ed88d90055f611c72964f60b4fe948d562db6ebe2c1c9adf1fb10940666c1d147d42 -MISC metadata.xml 1217 BLAKE2B 50ad1f750abe89f9b8b46da87d676d91777be370bd5d51f068b02697254c89e47c232a92d5c2e5316aa2c0ed7fd3905f5aa67fb7bb05b420180ee53a7f20945a SHA512 e97feeb58efc1064f7b5739306dde9435e4cb93c260d8999e292adefc99c45c8534ac5e4c06096c5fb79faea88562c76ef74868be0b112dcb8162ecbfa39a42c +MISC metadata.xml 1267 BLAKE2B f3b0192ce2cd8d0fb10c2f4fb4bad9780f01746cb283c19e7ecc622c85470ed8a3b7193ca2f7abdee6fdb771719e0c0a9a8a5c7fd9320ef0dae1f1210e7e36cd SHA512 dc9f36a7f2ffb85eeafb41a2b5d0b61746ef3e1de049db18ba351108b887b4cf506ea871754918faae8b4989e5ee7dbfc9f7f48c5b9df55a3bbe782425dc0421 diff --git a/sci-visualization/gnuplot/files/gnuplot-5.2.2-regis.patch b/sci-visualization/gnuplot/files/gnuplot-5.2.2-regis.patch new file mode 100644 index 000000000000..613a028ee79b --- /dev/null +++ b/sci-visualization/gnuplot/files/gnuplot-5.2.2-regis.patch @@ -0,0 +1,43 @@ +Add configure option for ReGIS support. +https://bugs.gentoo.org/643888 + +--- gnuplot-5.2.2-orig/configure.ac ++++ gnuplot-5.2.2/configure.ac +@@ -1057,6 +1057,13 @@ + AC_DEFINE(HAVE_MIF,1, + [ Define to include support for mif terminal ],)) + ++dnl ReGIS terminal ++AC_ARG_WITH(regis,dnl ++[ --with-regis ReGIS terminal]) ++AS_IF([test "x${with_regis}" = "xyes"], ++ AC_DEFINE(HAVE_REGIS,1, ++ [ Define to include support for ReGIS terminal ],)) ++ + AC_ARG_WITH(cairo,dnl + [ --without-cairo cairo-based terminals (default enabled)],, + [test -z "${with_cairo}" && with_cairo=yes]) +@@ -1350,6 +1357,12 @@ + AC_MSG_RESULT([ mif terminal: no (use --with-mif to enable)]) + fi + ++if test "$with_regis" = yes; then ++ AC_MSG_RESULT([ ReGIS terminal: yes]) ++else ++ AC_MSG_RESULT([ ReGIS terminal: no (use --with-regis to enable)]) ++fi ++ + if test "$is_msdos" = yes; then + AC_MSG_RESULT([ svga terminal (MSDOS/djgpp): yes]) + fi +--- gnuplot-5.2.2-orig/src/term.h ++++ gnuplot-5.2.2/src/term.h +@@ -182,7 +182,7 @@ + #endif + + /* REGIS graphics language */ +-#ifdef VMS ++#if defined(VMS) || defined(HAVE_REGIS) + # include "regis.trm" + #endif + diff --git a/sci-visualization/gnuplot/gnuplot-5.2.2.ebuild b/sci-visualization/gnuplot/gnuplot-5.2.2.ebuild index 9948859c4837..ee0a6fd16570 100644 --- a/sci-visualization/gnuplot/gnuplot-5.2.2.ebuild +++ b/sci-visualization/gnuplot/gnuplot-5.2.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -26,7 +26,7 @@ fi LICENSE="gnuplot bitmap? ( free-noncomm )" SLOT="0" -IUSE="aqua bitmap cairo compat doc examples +gd ggi latex libcaca libcerf lua qt5 readline svga wxwidgets X" +IUSE="aqua bitmap cairo compat doc examples +gd ggi latex libcaca libcerf lua qt5 readline regis svga wxwidgets X" RDEPEND=" cairo? ( @@ -73,6 +73,7 @@ TEXMF="${EPREFIX}/usr/share/texmf-site" src_prepare() { eapply "${FILESDIR}"/${PN}-5.0.1-fix-underlinking.patch eapply "${FILESDIR}"/${PN}-5.0.6-no-picins.patch + eapply "${FILESDIR}"/${PN}-5.2.2-regis.patch eapply_user if [[ -z ${PV%%*9999} ]]; then @@ -138,6 +139,7 @@ src_configure() { "$(use_with libcaca caca "${EPREFIX}/usr/$(get_libdir)")" \ $(use_with libcerf) \ $(use_with lua) \ + $(use_with regis) \ $(use_with svga linux-vga) \ $(use_with X x) \ --enable-stats \ diff --git a/sci-visualization/gnuplot/metadata.xml b/sci-visualization/gnuplot/metadata.xml index 8700ea957399..6442566e482f 100644 --- a/sci-visualization/gnuplot/metadata.xml +++ b/sci-visualization/gnuplot/metadata.xml @@ -27,6 +27,7 @@ Enable special functions from sci-libs/libcerf Enable dot-matrix printers and pbm terminal + Enable ReGIS terminal gnuplot -- cgit v1.2.3