gentoo resync : 17.02.2020

7 files changed, 36 insertions, 146 deletions

diff --git a/sci-visualization/Manifest.gz b/sci-visualization/Manifest.gz
index 13b80cafad4b..35a4cb63f07a 100644
--- a/sci-visualization/Manifest.gz
+++ b/sci-visualization/Manifest.gz
diff --git a/sci-visualization/gnuplot/Manifest b/sci-visualization/gnuplot/Manifest
index 65d4a05a259b..a6287f68a8d8 100644
--- a/sci-visualization/gnuplot/Manifest
+++ b/sci-visualization/gnuplot/Manifest
@@ -5,8 +5,8 @@ AUX gnuplot-5.2.6-caca.patch 385 BLAKE2B 33607e93cf59c6774892df7588c843c9c03b2ee
 DIST gnuplot-5.0.7.tar.gz 5100186 BLAKE2B 97fcefa12148fc2b581113c5283eb09217e87858ae293931758d0bb595fd7aaca4671216956211a3d30492be35f91809a975c9c80c25861c477e9235a8b5b309 SHA512 5d7241dc1472f87af8632110a1e88f83b5ea3f41e1bc8c89a45dc4662a3071d91a25bf9ae5196a2b8bef09c8079c22f635bb947c02def3416d78880d61eea919
 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 5772 BLAKE2B 885962a3e873639ceeee360bab9fed851c785e017c354d55e0502fad81193092dc2335f3d4fa617dc8054f52445a1a3fb55496c83f954ddcd958b42dcebf70f8 SHA512 be81f70f53f0b625f5b27ae63352693efda47746eac5a0a93b01d864f2be53ada42aefc1cd0da2a589302a8643a23400f8b8d4fbfc9f0ee80136cee0383e6699
-EBUILD gnuplot-5.2.6.ebuild 5836 BLAKE2B 4b185e9880efbfc7adf373116f135f609614a5a3f51776fb021fcb79db47431cd98c0a1c6721cbf7913585976ba3beb5802ad747e228026d3ac66edb6184fee8 SHA512 434b8c6d616e1af1692f5605ae660cc755e9a0ff6fdabce67779c00037e407b2c1830a0c3e1561345701feb62bd34a196d3a9eba5f885df669fde81011a04698
+EBUILD gnuplot-5.0.7.ebuild 5772 BLAKE2B 06b1d0d77ceea91443c3972f54850d22213819adac7f48a2d870aa0476ed814bf6150e8171d5d2e9f115c3d09b705f5901f916c6bbf3c087dde099656be9c324 SHA512 c8f47c9903eaf1c2cf81c9f630f41c26bd3eb22ae96734b105a099d4810ad23fb5381bedcaee3c924fd66259726089309db55a3d583be4dadce8e6e126ae2665
+EBUILD gnuplot-5.2.6.ebuild 5836 BLAKE2B 3db5540a52f1ede2946454cd22e36a5ab224825363916352733dd36578a06f8d3a57882f0dbd943d5f41ffd6cfe35d7c13db5d339abc09b9d255dfaed613aab0 SHA512 67f56ab064a5b8976c85b809ac38b34118f34d05a4b8e606c1a49a5a0ec9016ffb2420294bb6badb67956870f65b32b20b56bda72ddaed508c74086bc10e1fd0
 EBUILD gnuplot-5.2.7.ebuild 5836 BLAKE2B 4b185e9880efbfc7adf373116f135f609614a5a3f51776fb021fcb79db47431cd98c0a1c6721cbf7913585976ba3beb5802ad747e228026d3ac66edb6184fee8 SHA512 434b8c6d616e1af1692f5605ae660cc755e9a0ff6fdabce67779c00037e407b2c1830a0c3e1561345701feb62bd34a196d3a9eba5f885df669fde81011a04698
 EBUILD gnuplot-5.2.9999.ebuild 5732 BLAKE2B 30e18d41e564b6316253b6aad9ad99f6e181996df3235f6c3dc89798528479c83bc66eb2912165c6bda278916a45834e3899d54373907707717caa6ce43e6e25 SHA512 ec8298cc2b0e7d82578a0322f9634710d3875e1c21cd4360ae79dae77a744eb179efdd375057344d771fd554302c1fa1e7832efe8502ee7eccbbebbeae07dbc6
 EBUILD gnuplot-5.3.9999.ebuild 5154 BLAKE2B ffed0a6362d6db589ebd626f93cbf36c7ecc3539d39ed979e62b7d7b42e596b207980c98a0459d72c4d2dd57b1054486dc6009f679de7763b6d31b15eff5df36 SHA512 2613b14581d311a39f1e128131b5dea6f96896371df2f8138ce7c2ce037e8e925a5341922d9bb2223088578891b9760d9e9319375297b653a3732a383ceff048
diff --git a/sci-visualization/gnuplot/gnuplot-5.0.7.ebuild b/sci-visualization/gnuplot/gnuplot-5.0.7.ebuild
index c3a0eb1fbbab..5e41cba3154c 100644
--- a/sci-visualization/gnuplot/gnuplot-5.0.7.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-5.0.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/sci-visualization/gnuplot/gnuplot-5.2.6.ebuild b/sci-visualization/gnuplot/gnuplot-5.2.6.ebuild
index e2c078bf41d8..2a12c827ecbd 100644
--- a/sci-visualization/gnuplot/gnuplot-5.2.6.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-5.2.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/sci-visualization/grace/Manifest b/sci-visualization/grace/Manifest
index eaf5ed89c8b4..e9b5fa2b56e1 100644
--- a/sci-visualization/grace/Manifest
+++ b/sci-visualization/grace/Manifest
@@ -4,11 +4,10 @@ AUX grace-5.1.22-dlmodule.patch 355 BLAKE2B baee835ed77d6720f145a7973a5a1e58359d
 AUX grace-5.1.22-ldflags.patch 1161 BLAKE2B 0fcc7850a91bd127b0780a05cf54c4a96000371cfe07808894d69bb37aeb3351190bd6b25e2a9a7dde85833ed5663530f5502eed37985f628b99510ed07a44b7 SHA512 43950d98c61cbeaa93d84d1c4b37233a49150ef804b6a00ffbcccc4dd926878bafa9d24007640f193c323e093f0c4c731ac676f5e5d410c8e814796babdf6e0a
 AUX grace-5.1.22-mkstemp.patch 1664 BLAKE2B 90d2a665a06f18790bcb1c70004ca6a9f9d7fafdf0912ab6e94ca18cda751eb38588b6a51a14a0ffd887164782b00d542dceede9df475b6f6891c89991235b12 SHA512 e7ba04f9be93e2bb12e5f78894eec255b76ee85463ec35b2890ff111f9f64567c67effec1678d4a953a602be3d0ecd2123487e3dd88704d325b369e59750ad44
 AUX grace.desktop 161 BLAKE2B a401e23fc2ee22cd47c36becfa742f5acafd2359185a92f1156159c2ea480a17a82219182873aaf9da4e6582bce6ac1ef62b66b1330759214fc21a364c376ac6 SHA512 6d43de6f8d5f85c3fff36202320864ea3611d3ee842efa677ad59ae1390c6499f9f14aefd37345c0cec62024637b057e804efd26577c45b4f7a5bb6717952b2a
-DIST grace-5.1.23.tar.gz 2501364 BLAKE2B 805edb081b008a43a37a03666704b149d6edf5d9d2e6313102a0e9ccda3bd7b4a0a79616d7f7df5061d7bc5f48afe0334942b8862483488dc866f7594b0596a4 SHA512 84b75639a5065fb0a39204b55e82471be90d78b22530e541a4e58cb5bcd94a59d51e91da38d9fecb9c23e21744c0c3b31bb9db4fd26c656233a19cffd1eef7d3
 DIST grace-5.1.25.tar.gz 2957689 BLAKE2B f46032c92aa2ed2484ca05c0eb858f47adfa88517e7d06c0d95a6d23c044356edfc52b9a7566a625ef5f4a1a4b5450b0ce065a94ba15c59fb8395d53c85872c9 SHA512 9ea68483af1dfc98d217ae730b7a51b66deae5aaa8dfda29d5a3337ed4b5728b45aa03f561bf7d4173e73d6af8dee03cbabd95c0c8dd36999303c89451a3728a
 DIST grace.png 338 BLAKE2B 3a109acd9e44929b9efe1fd6b707459b71cfbb601b98a00619096becff8d89fb46f2fe34f4a5c5974b125b4bed9b5f2452fee669627146ba00976dd43a7778b0 SHA512 804a693b867ad63f34964c7388f61719c558d253cb2c7bc7b6bd0647ad9b3ddc6b23d3950091b6804e4a94736f024486cf3dcce5f877135def34712ee95e4031
 DIST grace.png.tar 10240 BLAKE2B 3e99cd04a92b547ed5440475363b140d0183c92d1865f0b4564890f705a87df4e55624d681fa77408948a841eac4358465e49e65fa02615e31ec54ffb84f059d SHA512 e94970b92894e58fd481d2f81e615c38b77fab7039985516a2ad9b2bb2bb7a82f4e3e8cdb639e7c0d55eaad6bf8abc636a342c94a356e3bd0520824252faddcf
-EBUILD grace-5.1.23-r1.ebuild 2881 BLAKE2B badddd0f120a6412980753677aaf2b2238fb4a29aed8531ea7d03f1c8dfeb777f5d16b35bec5601ce0071b184dc832bf8339e5eaf9528322f669583e701eea31 SHA512 b4efb103df93cfe9429a7b996cede8d94e36aeba1b721024076ea5a35a62234b0b0a71caf5b30cace32b113d2239037cca83c0fda781fd6aef8f769c87902032
-EBUILD grace-5.1.23.ebuild 2878 BLAKE2B e51e9e90eb5d050d703a0a7069a870e3b0d0f8b3990682b135f74d0e9417d0728e57ff192308e1b3803f3970e029395eeeb6cbc50f66a63effbf16db6d99557b SHA512 7ea419a1843b0aa108b4fc765d545e2503351b6b0a7b2ddac6f48c01b78a7e4682be363735cdf4f4420304ac5d5c9439a40b87ef2bb6672eb7eab6fed345afd0
+DIST grace_5.1.25-7.debian.tar.xz 108904 BLAKE2B 17265969d0501e1b1306733178a680b93d1d5fa96d63df4c14e5b3cba70b68d44d90a77d6ec0aa5243c2a79048bb75aedefeae1a2bab551a6315d253ee831735 SHA512 2fa34337858454c8a28b666fccb7157e9c4895b828f25171c4c6b68316abbf6d4bc54032f1de01ccb6b86068f7059ae2462d18b4a273341f588f49fc35f1bb61
 EBUILD grace-5.1.25.ebuild 2755 BLAKE2B 8d795e4b22bcbd3703d46ce292953d14cc4c393d86e988953c877b14060fc2fa252e62a72297adefb5a42f1dd8ac371515a33c2850fc181d7bf54aaefb8fdd6a SHA512 b7b6188fc2825584783a059b1c54de606f81739c0098dd0e2dd7e129cee705fc7cf76ab383cd13ac88cc626c078c3410c4c7ae301b4dac7c016333315f2d4108
+EBUILD grace-5.1.25_p7.ebuild 2792 BLAKE2B 5873ea8e75fe9c1029139b7d2e45e39b34738dff7cbc5806db63789b9fcbc25d4d22c8686621583e1e2e232037a0f860e59da09b0473209d16fb60b2b1ee4ee9 SHA512 2fe8a3a6f89d4ac57688bdb562ebd183922a070dcb4bad13e17da4d5eb6d086216a790183c2ecc5604d8c974cbf83b13ffd8dbb62c8423a416bfc4affd470776
 MISC metadata.xml 854 BLAKE2B e13e7dd68252a64082dced5b692838ba88f0ea9795a319a9c3fecca6289be8bd57b3e3fd379741085da7548187bf340e0a156ed66ffaf56312db4cee551bf25e SHA512 ac6c70961058fcff4c352138f48f3efc468a82132625893775c775258b8d2e894d09faa3e51b382c437583088ac937ca3d8e2002f202fce6409c6f11e5acfaf2
diff --git a/sci-visualization/grace/grace-5.1.23.ebuild b/sci-visualization/grace/grace-5.1.23.ebuild
deleted file mode 100644
index 4b2795c8f6ba..000000000000
--- a/sci-visualization/grace/grace-5.1.23.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-FORTRAN_NEEDED=fortran
-
-inherit eutils fortran-2 multilib toolchain-funcs
-
-DESCRIPTION="Motif based XY-plotting tool"
-HOMEPAGE="http://plasma-gate.weizmann.ac.il/Grace/"
-SRC_URI="
-	http://pkgs.fedoraproject.org/cgit/grace.git/plain/grace.png
-	https://dev.gentoo.org/~jlec/distfiles/${PN}.png.tar
-	ftp://plasma-gate.weizmann.ac.il/pub/${PN}/src/stable/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2 LGPL-2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="fortran fftw jpeg netcdf png"
-
-DEPEND="
-	media-libs/t1lib
-	media-libs/tiff:0
-	sys-libs/zlib
-	>=x11-libs/motif-2.3:0
-	x11-libs/xbae
-	fftw? ( sci-libs/fftw:2.1 )
-	jpeg? ( virtual/jpeg:0 )
-	netcdf? ( sci-libs/netcdf )
-	png? ( media-libs/libpng:0= )"
-RDEPEND="${DEPEND}
-	x11-misc/xdg-utils"
-
-pkg_setup() {
-	fortran-2_pkg_setup
-	tc-export CC
-}
-
-src_prepare() {
-	# move tmpnam to mkstemp (adapted from debian)
-	epatch "${FILESDIR}"/${PN}-5.1.22-mkstemp.patch
-	# fix configure instead of aclocal.m4
-	epatch "${FILESDIR}"/${PN}-5.1.21-netcdf.patch
-	# fix for missing defines when fortran is disabled
-	epatch "${FILESDIR}"/${PN}-5.1.21-fortran.patch
-	# fix a leak (from freebsd)
-	epatch \
-		"${FILESDIR}"/${PN}-5.1.22-dlmodule.patch \
-		"${FILESDIR}"/${PN}-5.1.22-ldflags.patch
-
-	# don't strip if not asked for
-	sed -i \
-		-e 's:$(INSTALL_PROGRAM) -s:$(INSTALL_PROGRAM):g' \
-		{auxiliary,grconvert,src}/Makefile || die
-
-	sed -i \
-		-e 's:$(GRACE_HOME)/bin:$(PREFIX)/bin:g' \
-		-e "s:\$(GRACE_HOME)/lib:\$(PREFIX)/$(get_libdir):g" \
-		-e 's:$(GRACE_HOME)/include:$(PREFIX)/include:g' \
-		-e 's:$(PREFIX)/man:$(PREFIX)/share/man:g' \
-		Makefile */Makefile || die "sed failed"
-
-	sed -i \
-		-e 's:bin/grconvert:grconvert:' \
-		-e 's:auxiliary/fdf2fit:fdf2fit:' \
-		gracerc || die
-}
-
-src_configure() {
-	local myconf
-	if use fortran; then
-		myconf="--with-f77=$(tc-getFC)"
-	else
-		myconf="--without-f77"
-	fi
-
-	# the configure script just produces a basic Make.conf
-	# and a config.h
-	econf \
-		--disable-pdfdrv \
-		--disable-xmhtml \
-		--without-bundled-xbae \
-		--without-bundled-t1lib \
-		--enable-grace-home="${EPREFIX}"/usr/share/${PN} \
-		--with-helpviewer="xdg-open %s" \
-		--with-editor="xdg-open %s" \
-		--with-printcmd="lpr" \
-		--x-includes="${EPREFIX}"/usr/include \
-		--x-libraries="${EPREFIX}"/usr/$(get_libdir) \
-		$(use_with fftw) \
-		$(use_enable fortran f77-wrapper) \
-		$(use_enable netcdf) \
-		$(use_enable jpeg jpegdrv) \
-		$(use_enable png pngdrv) \
-		${myconf}
-}
-
-src_install() {
-	default
-
-	dosym ../../${PN}/examples /usr/share/doc/${PF}/examples
-	dosym ../../${PN}/doc /usr/share/doc/${PF}/html
-
-	doman "${ED}"/usr/share/doc/${PF}/html/*.1
-	rm -f "${ED}"/usr/share/doc/${PF}/html/*.1 || die
-	doicon "${WORKDIR}"/${PN}.png
-	domenu "${FILESDIR}"/${PN}.desktop
-	doicon "${WORKDIR}"/${PN}.png
-}
diff --git a/sci-visualization/grace/grace-5.1.23-r1.ebuild b/sci-visualization/grace/grace-5.1.25_p7.ebuild
index 74c9a9f993c6..b38696109880 100644
--- a/sci-visualization/grace/grace-5.1.23-r1.ebuild
+++ b/sci-visualization/grace/grace-5.1.25_p7.ebuild
@@ -1,23 +1,22 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-
+EAPI=7
 FORTRAN_NEEDED=fortran
 
-inherit eutils fortran-2 multilib toolchain-funcs
+inherit desktop fortran-2 toolchain-funcs
 
 DESCRIPTION="Motif based XY-plotting tool"
 HOMEPAGE="http://plasma-gate.weizmann.ac.il/Grace/"
 SRC_URI="
-	http://pkgs.fedoraproject.org/cgit/grace.git/plain/grace.png
-	https://dev.gentoo.org/~jlec/distfiles/${PN}.png.tar
-	ftp://plasma-gate.weizmann.ac.il/pub/${PN}/src/stable/${P}.tar.gz"
+	ftp://plasma-gate.weizmann.ac.il/pub/${PN}/src/stable/${P/_p*}.tar.gz
+	mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_p*}-${PV/*_p}.debian.tar.xz
+"
 
 SLOT="0"
 LICENSE="GPL-2 LGPL-2"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="fortran fftw jpeg netcdf png"
+IUSE="fftw fortran jpeg netcdf png"
 
 DEPEND="
 	media-libs/t1lib
@@ -25,29 +24,33 @@ DEPEND="
 	sys-libs/zlib
 	>=x11-libs/motif-2.3:0
 	x11-libs/xbae
-	fftw? ( sci-libs/fftw:2.1 )
+	fftw? ( sci-libs/fftw:3.0= )
 	jpeg? ( virtual/jpeg:0 )
 	netcdf? ( sci-libs/netcdf )
 	png? ( media-libs/libpng:0= )"
 RDEPEND="${DEPEND}
 	x11-misc/xdg-utils"
 
+S="${WORKDIR}/${P/_p*}"
+
+PATCHES=(
+	# fix for missing defines when fortran is disabled
+	"${FILESDIR}"/${PN}-5.1.21-fortran.patch
+	# fix a leak (from freebsd)
+	"${FILESDIR}"/${PN}-5.1.22-dlmodule.patch
+)
+
 pkg_setup() {
 	fortran-2_pkg_setup
-	tc-export CC AR
 }
 
 src_prepare() {
-	# move tmpnam to mkstemp (adapted from debian)
-	epatch "${FILESDIR}"/${PN}-5.1.22-mkstemp.patch
-	# fix configure instead of aclocal.m4
-	epatch "${FILESDIR}"/${PN}-5.1.21-netcdf.patch
-	# fix for missing defines when fortran is disabled
-	epatch "${FILESDIR}"/${PN}-5.1.21-fortran.patch
-	# fix a leak (from freebsd)
-	epatch \
-		"${FILESDIR}"/${PN}-5.1.22-dlmodule.patch \
-		"${FILESDIR}"/${PN}-5.1.22-ldflags.patch
+	default
+
+	# Debian patches
+	for p in $(<"${WORKDIR}"/debian/patches/series) ; do
+		eapply -p1 "${WORKDIR}/debian/patches/${p}"
+	done
 
 	# don't strip if not asked for
 	sed -i \
@@ -68,12 +71,7 @@ src_prepare() {
 }
 
 src_configure() {
-	local myconf
-	if use fortran; then
-		myconf="--with-f77=$(tc-getFC)"
-	else
-		myconf="--without-f77"
-	fi
+	tc-export CC AR
 
 	# the configure script just produces a basic Make.conf
 	# and a config.h
@@ -93,7 +91,7 @@ src_configure() {
 		$(use_enable netcdf) \
 		$(use_enable jpeg jpegdrv) \
 		$(use_enable png pngdrv) \
-		${myconf}
+		$(use_with fortran f77 $(tc-getFC))
 }
 
 src_install() {
@@ -104,7 +102,10 @@ src_install() {
 
 	doman "${ED}"/usr/share/doc/${PF}/html/*.1
 	rm -f "${ED}"/usr/share/doc/${PF}/html/*.1 || die
-	doicon "${WORKDIR}"/${PN}.png
+
 	domenu "${FILESDIR}"/${PN}.desktop
-	doicon "${WORKDIR}"/${PN}.png
+	for size in 16 22 24 32; do
+		newicon -s "${size}" "${WORKDIR}"/debian/icons/grace"${size}".png "${PN}.png"
+	done
+	doicon -s 48 "${WORKDIR}"/debian/icons/grace.png
 }