gentoo auto-resync : 09:10:2022 - 01:31:00

5 files changed, 3 insertions, 63 deletions

diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index bcad388cd4b5..980585426d67 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/gsl/Manifest b/sci-libs/gsl/Manifest
index 67bbd93db376..376b788dbf6f 100644
--- a/sci-libs/gsl/Manifest
+++ b/sci-libs/gsl/Manifest
@@ -1,6 +1,4 @@
 DIST gsl-2.7-cblas.patch.bz2 12073 BLAKE2B 71f2bdafdb1f42ca5c3515f8e39266242185218495705018d88e523be9bc776b39749156500cdc5746a16e481e9cfe2b79660e250eb1a70f3b18819d16fe11c5 SHA512 5b9b2a798079610d7d4981b83672cc978ed44b66aaf6e671794685f10bd4069764bb358870019dc0eec1e251639cde12aaa3598cae0e2fc050ea39c79435fe2f
 DIST gsl-2.7.1.tar.gz 7509209 BLAKE2B dd216c2fdb536e57b6e29613e46e1a05183fd18c47434039caac68fefffc0390cfe2f21eb117347d4bbdf9004de837ef2db02c17c01eaea4b615e3e45a4fd90f SHA512 3300a748b63b583374701d5ae2a9db7349d0de51061a9f98e7c145b2f7de9710b3ad58b3318d0be2a9a287ace4cc5735bb9348cdf48075b98c1f6cc1029df131
-DIST gsl-2.7.tar.gz 7508761 BLAKE2B a9da4df40ea57374880026a0586f2f218dbb0c9154cc661b3e7f5cd414311b95300e60faa2d7f4d3c6cdae5cfdf77cb8052075b56f51564aec2649cc4ad5f7f9 SHA512 a14ac5400acaf4884620430dbeb6f0b28eafe946923b792ab0eccc2a2abc9113d8ce342f4b1e5396f05247649f7d6f953944a8e6bdbf9ee1adb9e67b7c3df2b5
 EBUILD gsl-2.7.1-r1.ebuild 1323 BLAKE2B 52c5d89e0f6b514c2f4098ac3e28b59f28761a2982c0be0a3f0132f3546c5a6998c0fa6258704ee9b425de6960eafe5fed550108e2d29df02d3771b4dde22d27 SHA512 aa1cab10dcf2536ccec66607dead1c23175216c5a23b88393551c1be40fc847062f0ef4ae715fc767b8d5539e2d37038a050638e861e36dcf0757ce087310ba7
-EBUILD gsl-2.7.ebuild 1288 BLAKE2B dad0fb8afcf6ab39b112406574081aa2fdb339f4625d96c751042f9bf5dcf046b4e73287c62319e819e505925bd6efb4e2c27731fa40c017ccb225f798bac843 SHA512 f824d23f42c08409d4d993ed073143501b34e393b75409d8af1623eabb6c3cfb88a26ec40e79125f4ee388de46bbacfed59c789a7494bc391ec709bb92a25b29
 MISC metadata.xml 1191 BLAKE2B 856a9a1b3195a76a6c1fffe65dbb94b90a135ce4290c33d772efca43be04f29db7efee5083ee997660c5831aa75773993423645a28e82072b3ceb877135d6810 SHA512 9cb110e5202df7ca123da18ffd0ac60d1d9d5577a29dacff001b24b0c0eae4f96851273d72956dd7b0b94c9fabd392ea13ae6aae54e801d118032d215ede59b2
diff --git a/sci-libs/gsl/gsl-2.7.ebuild b/sci-libs/gsl/gsl-2.7.ebuild
deleted file mode 100644
index ac5938b4fe8d..000000000000
--- a/sci-libs/gsl/gsl-2.7.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic toolchain-funcs
-
-DESCRIPTION="The GNU Scientific Library"
-HOMEPAGE="https://www.gnu.org/software/gsl/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz
-	https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-2.7-cblas.patch.bz2"
-
-LICENSE="GPL-3"
-SLOT="0/25"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-IUSE="cblas-external +deprecated static-libs"
-
-RDEPEND="cblas-external? ( virtual/cblas:= )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${WORKDIR}"/${PN}-2.7-cblas.patch
-)
-
-src_prepare() {
-	filter-flags -ffast-math
-
-	default
-
-	if use deprecated; then
-		sed -i -e "/GSL_DISABLE_DEPRECATED/,+2d" configure.ac || die
-	fi
-	eautoreconf
-}
-
-src_configure() {
-	if use cblas-external; then
-		export CBLAS_LIBS="$($(tc-getPKG_CONFIG) --libs cblas)"
-		export CBLAS_CFLAGS="$($(tc-getPKG_CONFIG) --cflags cblas)"
-	fi
-
-	econf \
-		--enable-shared \
-		$(use_with cblas-external) \
-		$(use_enable static-libs static)
-}
-
-src_test() {
-	local MAKEOPTS="${MAKEOPTS} -j1"
-	default
-}
-
-src_install() {
-	default
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/sci-libs/plplot/Manifest b/sci-libs/plplot/Manifest
index 15bab63ee82d..cf192b9adb5a 100644
--- a/sci-libs/plplot/Manifest
+++ b/sci-libs/plplot/Manifest
@@ -6,5 +6,5 @@ AUX plplot-5.15.0-ocaml-rpath.patch 9583 BLAKE2B b475580f9e4da0ab660dc2d0dfbdbbf
 AUX plplot-5.15.0-ocaml.patch 3424 BLAKE2B ba1c9f758c319a76b0a457a287ee6934ee39300401e2d9a364c70446e12af679ce55c22eda0bf7aa7cb621fd4c76f56268afa649ba935a716495049f41706187 SHA512 1387625d1e784fb92ab3279a342c08d8f85fc055e0c69ce1af9656492102072c7a1d5a6498f8758dc3fd35e0543e80b65cd315641886f9baff60f7740583a0e3
 AUX plplot-5.9.6-python.patch 379 BLAKE2B cf08250c851c3405517183e8f3425f42ede2f850cc8bcd89828e3e1b89035731a8a3face0988750e9f9e5dce2fa0404b23b2721c5b315ff61aeac552fd6e05f2 SHA512 cb2022bda3d5408ef0b2dc280981ad8bdb2f7ecb20d827f7e71ce063fba60963e68aeaa5efd8eef87da8e3dc270b609f7cb342c1da175cd757c9f135173842e4
 DIST plplot-5.15.0.tar.gz 15380293 BLAKE2B 41f359c4e86c7a26fe53a9d82a9f02aeb97b5b6f44abca590621640c56e50a62823e8a03165a939689f5456cee419b8292ea34faccd07641bd4a953b6f1d73fe SHA512 54533245569b724a7ef90392cc6e9ae65873e6cbab923df0f841c8b43def5e4307690894c7681802209bd3c8df97f54285310a706428f79b3340cce3207087c8
-EBUILD plplot-5.15.0-r103.ebuild 7496 BLAKE2B b6759895f34ff55ed55bd97b92290d79288397cd73b56ebf5d8c5b3233587093f0d3d54a9688b9e6b8988e0eceb2cfe305dbc5da0b68311dfc21a4fa39878424 SHA512 352c50c8ddebf960d87e4b4e9758aa72f54f76da86015eb5b8e2c874b8a04d6b8e467bb2a6ba2cbc5771aa88efd71bcfc17d619e91e516c0df4a77c8f32fff6a
+EBUILD plplot-5.15.0-r104.ebuild 7483 BLAKE2B 90278685729e073b9bada6f5ab7591f4482eea45dc74e0d48874778558395d3e2290cbedddfdc6a91d261ca75e50b2f7213aa3740b0138b817114cd8f3cea3e5 SHA512 4effd8e8301d13ee8c653f98121c686a8ee80284c714259b3abf3ca45c9f6d8529f59be924ce3d3f30cff146dd9dc4cf3c86d6bd309e1682249f8fcfd182b430
 MISC metadata.xml 1421 BLAKE2B a15479caf11e0f90cb45613ee48ca2d4270a18b57b8f409d4687cee5c55f660fca46a8a2a36c3c1c4a5d02a4c964b1d8db6ea4112039af8bcda808e50b4bf1f1 SHA512 fc99a3225ce54af9945e8fec3cd96f9c75cdc74b8ad4d5362bd5b1529b3872eddd06a190ea9f1cafa727d28e3e2086a27ecd5db89afd993d844ba8f299f2f317
diff --git a/sci-libs/plplot/plplot-5.15.0-r103.ebuild b/sci-libs/plplot/plplot-5.15.0-r104.ebuild
index 3b7f2ddfb10f..b09ff4482286 100644
--- a/sci-libs/plplot/plplot-5.15.0-r103.ebuild
+++ b/sci-libs/plplot/plplot-5.15.0-r104.ebuild
@@ -10,7 +10,7 @@ PYTHON_COMPAT=( python3_{8..10} )
 # fails with ninja, due to USE=java missing swig output dependencies
 CMAKE_MAKEFILE_GENERATOR=emake
 
-inherit cmake flag-o-matic fortran-2 java-pkg-opt-2 lua-single python-single-r1 toolchain-funcs virtualx wxwidgets
+inherit cmake flag-o-matic fortran-2 java-pkg-opt-2 lua-single python-single-r1 virtualx wxwidgets
 
 DESCRIPTION="Multi-language scientific plotting library"
 HOMEPAGE="http://plplot.sourceforge.net/"
@@ -36,7 +36,7 @@ RESTRICT="
 "
 
 RDEPEND="
-	cairo? ( x11-libs/cairo:0=[svg?,X] )
+	cairo? ( x11-libs/cairo:0=[svg(+)?,X] )
 	gd? ( media-libs/gd:2=[jpeg?,png?] )
 	java? ( >=virtual/jre-1.8:* )
 	latex? (