gentoo resync : 14.07.2019

3 files changed, 10 insertions, 12 deletions

diff --git a/sci-visualization/gnuplot/Manifest b/sci-visualization/gnuplot/Manifest
index d40073e9a6b9..aca75294b27a 100644
--- a/sci-visualization/gnuplot/Manifest
+++ b/sci-visualization/gnuplot/Manifest
@@ -2,13 +2,13 @@ AUX gnuplot-5.0.1-fix-underlinking.patch 483 BLAKE2B 1719635d947a5d53fa5b6def652
 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.7.tar.gz 5100186 BLAKE2B 97fcefa12148fc2b581113c5283eb09217e87858ae293931758d0bb595fd7aaca4671216956211a3d30492be35f91809a975c9c80c25861c477e9235a8b5b309 SHA512 5d7241dc1472f87af8632110a1e88f83b5ea3f41e1bc8c89a45dc4662a3071d91a25bf9ae5196a2b8bef09c8079c22f635bb947c02def3416d78880d61eea919
-DIST gnuplot-5.2.2.tar.gz 5282973 BLAKE2B a15c72aaa8d62079ea3e9f20fa9fe3aaaf6036cf8dc67a784dee79ac7bd0ad7bfac754c9583b50c46deeef2f1bcd920d1094a5d1e19a1dae75405de8c3249621 SHA512 51d5b2234dae358580cc2794ed63f8a5b950baf73edc5362f5bb18d77e8066c3c010239c3b29840db11e5936cb9381bb57193de751bd274af5547a45d6d88b0b
 DIST gnuplot-5.2.5.tar.gz 5305288 BLAKE2B e9ba602cb8ae8f5f24758fcf8dc4f6e7530fe0286370fdf02e01a19be073c4d93ac1d03f3e1f1154212e269124f1c5305a22814d19f6e6989d70d8e1fb68f8f5 SHA512 e516f33b678963e13c2464679efec6c387e57df4f92a57d319baec8bbd29ab46e545cd5d70b2d17644d734040892769da745b8a5441467dcdb8f9c892a493ca4
 DIST gnuplot-5.2.6.tar.gz 5321601 BLAKE2B 4281ba29926ee7fc046b48006fed6513dd3a9ee8bd3a6aa41c5782c5162bfc8af64ffdfec77d4996af6a634f5f3424404eab77c0efd91c65bd34412f5b8f17c7 SHA512 557c0d00c951055ca03ef0f2b262e96b8013da4fedeb64dc5325fabd94772144fd2fe7bfa9d159fa47ab76695109cb4d3f01fc5bfa996df4576aee0eebe36a90
+DIST gnuplot-5.2.7.tar.gz 5335673 BLAKE2B 6ca3055f6bb2e032562c7f21beda0adca1087598c7bacc9ab187c7ea4a3d85e08598ddb0ff0660bca081bc17899dbb92bbfbb6acde8b7b5367f12da7a2a14b62 SHA512 f6b77e16b25e5705ea9dad4f89ed5f5a3cf95d3e4215da00be3cbfbcdeee23009e9205156399448526783f25b5b7599b674670c94c01345abafeff74f6c7de93
 EBUILD gnuplot-5.0.7.ebuild 5788 BLAKE2B bfb963858fa676d86728061f6a57495c6da0a6bc5eb24dd43a0ea5793b7ccc0e83bab1df12b0b307764849cf3c0c49f9a1e038fdcf9e84dee0d0dcda3cedb83a SHA512 ae47de041b4a3b0a350bb18ca099a0f2c1a0b7c3e328da00a545bba69251f71611e783e62148135520f3726ef360367c5a6eb272774aa389b2443b1f73e6a93f
-EBUILD gnuplot-5.2.2.ebuild 5818 BLAKE2B 38651d4c15bdd83982d4982fa02dfc3108fc139c88caa529784f83d33628e0cb372e081dc45dd3b5e87f41b3b92123c369a47c860c15138b59d1235ca2d18ae1 SHA512 229d6740b12f9a048d3fbfbc462e00f6bab68d15e0e1731f7cfb4627cba4f41ab822ba1223bf0d85745be04c67edca1c4599cb4af48b2726165a110b5bbdbda0
 EBUILD gnuplot-5.2.5.ebuild 5807 BLAKE2B 37a9279bc459710529f352039ded7af3d33d63951a4a6f0cb510db1c35225d83263a059cb778102c7c35aa5a55f2ec5ec17bcfc9aa3e0e2240a133134eaf20e1 SHA512 5a19f5d655e8058b3a125b9d4838472d41fc7e6fe4140fd5adc5d88d7f07608066fd5e5345a950f3fa7936eb7577bbbad48c5e9173528db19cbf1a2427c04f02
-EBUILD gnuplot-5.2.6.ebuild 5815 BLAKE2B 1e0c4ef6c9224972010a275cfc23aa607018cbb72577fdc94c2af2c7abef1ad165f879d29b3cbdcdd94d83e9ce501b806f4102705dce53b841f6e26fe284ffe2 SHA512 9ec200cb3bc8f17ea374011682b492db424de4a0a9d94d1d6bb8743e427b54ca52a91a9daf98e4e055c599dae283cfb46111a97bfe440916bd9779e71e0c3c6e
+EBUILD gnuplot-5.2.6.ebuild 5814 BLAKE2B 7e25d8ceb8d418a8fa97709795948a8817867b612e35b3cab99399c7c2b409f725f11ec5c7d00843e29bae8562df3a4718e826995054b03dff07877f44c0bac6 SHA512 23405b22a2430c0df3994421af4fbebc89d968c95117072bd860ceb20659d91fe3c3e26e8dd45831a7f69ce2bd68f34ed24bfcbf5eb209e5ddb3a222c328d1ca
+EBUILD gnuplot-5.2.7.ebuild 5815 BLAKE2B 1e0c4ef6c9224972010a275cfc23aa607018cbb72577fdc94c2af2c7abef1ad165f879d29b3cbdcdd94d83e9ce501b806f4102705dce53b841f6e26fe284ffe2 SHA512 9ec200cb3bc8f17ea374011682b492db424de4a0a9d94d1d6bb8743e427b54ca52a91a9daf98e4e055c599dae283cfb46111a97bfe440916bd9779e71e0c3c6e
 EBUILD gnuplot-5.2.9999.ebuild 5749 BLAKE2B 44d3a7b53370f7a234f2f9963ede97c9b78638fe788860cbdbe534b432d633e1a917eabd27f120f16101d768c6a0c052eaaadb21633062ac6a71cae6e23fc0b1 SHA512 ef46ad5ca57d656c31ca991a5332a10c72e878bc09705896631a400839dc737b84a568d589b1d5f7b7d0dbe4074e739f519a1f6a39c5089477ad18700a831889
 EBUILD gnuplot-5.3.9999.ebuild 5189 BLAKE2B caf4ce5aeaf52a310f9f5163384e9a5663b15dac659079141f02e11a6c64572b7307c1c52bf63ff4ddc313218c594858241d59a0036694211185a8bf73012f88 SHA512 ac03609bff28227681876cf336f4db56835a79eb3ca36832556ebce62f1047a3caea381d747b56f7e9e5a47fe07041465d9c82fe3f3bac8eaaf5924c7740d8de
 MISC metadata.xml 1267 BLAKE2B f3b0192ce2cd8d0fb10c2f4fb4bad9780f01746cb283c19e7ecc622c85470ed8a3b7193ca2f7abdee6fdb771719e0c0a9a8a5c7fd9320ef0dae1f1210e7e36cd SHA512 dc9f36a7f2ffb85eeafb41a2b5d0b61746ef3e1de049db18ba351108b887b4cf506ea871754918faae8b4989e5ee7dbfc9f7f48c5b9df55a3bbe782425dc0421
diff --git a/sci-visualization/gnuplot/gnuplot-5.2.6.ebuild b/sci-visualization/gnuplot/gnuplot-5.2.6.ebuild
index 9240510b1032..88161e584c00 100644
--- a/sci-visualization/gnuplot/gnuplot-5.2.6.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-5.2.6.ebuild
@@ -17,7 +17,7 @@ if [[ -z ${PV%%*9999} ]]; then
 else
 	MY_P="${P/_/.}"
 	SRC_URI="mirror://sourceforge/gnuplot/${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="gnuplot bitmap? ( free-noncomm )"
diff --git a/sci-visualization/gnuplot/gnuplot-5.2.2.ebuild b/sci-visualization/gnuplot/gnuplot-5.2.7.ebuild
index b9ca6aa4f8c4..9240510b1032 100644
--- a/sci-visualization/gnuplot/gnuplot-5.2.2.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-5.2.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,17 +9,15 @@ DESCRIPTION="Command-line driven interactive plotting program"
 HOMEPAGE="http://www.gnuplot.info/"
 
 if [[ -z ${PV%%*9999} ]]; then
-	inherit cvs
-	ECVS_SERVER="gnuplot.cvs.sourceforge.net:/cvsroot/gnuplot"
-	ECVS_MODULE="gnuplot"
-	ECVS_BRANCH="HEAD"
-	ECVS_USER="anonymous"
-	ECVS_CVS_OPTIONS="-dP"
+	inherit git-r3
+	EGIT_REPO_URI="https://git.code.sf.net/p/gnuplot/gnuplot-main"
+	EGIT_BRANCH="branch-5-2-stable"
 	MY_P="${PN}"
+	EGIT_CHECKOUT_DIR="${WORKDIR}/${MY_P}"
 else
 	MY_P="${P/_/.}"
 	SRC_URI="mirror://sourceforge/gnuplot/${MY_P}.tar.gz"
-	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~s390 ~sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="gnuplot bitmap? ( free-noncomm )"