gentoo resync : 25.10.2021

6 files changed, 2 insertions, 194 deletions

diff --git a/sci-libs/gsl/Manifest b/sci-libs/gsl/Manifest
index 0c1326ee401c..eba4f5de3f55 100644
--- a/sci-libs/gsl/Manifest
+++ b/sci-libs/gsl/Manifest
@@ -1,12 +1,4 @@
-AUX cblas.pc.in 290 BLAKE2B c967d31982888ca2c180be0fc0691586e3fdbe2527fb54995cd5c85113ec6af8695c69ef9c70fc89ac271b818fb4ec5e53c010ea7e54a3e85712f1f51b9cf423 SHA512 2a1dc22097e2a50fd4a797c446b32202b74e9d754c8b61c51a3789c3eb42372adcc7fb25901c468d604cc4e7961d7f11e0e5883179894047948e46879fc04719
-AUX eselect.cblas.gsl 216 BLAKE2B d1f8be34cac7b83d88f69a3fd382fc68c96a04fc39b1e28ebe93b1a86ab5552cc7e6c559167151927ccddc3d8c1a27de30bc4f1aec96a84d8099d86d78bbb3ad SHA512 e5cd92f4e9829538642a0fed54fdf75bc579c8c20769997ec5a3ce0287993476e68fbeefec8e46162d05ea908d2e79187c15ebdd00f6558ecbd25de21ece64dc
-DIST gsl-1.16-cblas.patch.bz2 2810 BLAKE2B 364c9f93a386e5d95c86789a3c00231cdfbe588fe4371ae85447bc6574b7798721a8559fda747ee656de96e7d8c5657901db86dc9c59bcee27789c918222e38f SHA512 55a2dab850697b1e378ecf64d299ed6f021f1b1eb7dbad749f5014e5b7f275ec6c981a5699a87969c4d0794677efa51a5a2317526b58ca96aabb3f6a68cabd81
-DIST gsl-1.16.tar.gz 3534080 BLAKE2B 1c55a41e5ed57b57f671074240d23416aa8f23e3cc2bb832e455d4f44d307e6be6adfa3671dbbf2aa14604ea49f96ff636de7909f3532cdc811f6bd99b0aa59d SHA512 94e998953f30d701e1cd0a5e05d572c5cca7b6f40f0533aa85394ba4218946826408093ffe3049a0ab13d6ba87034fcec1a7d52a67d0b8860dc02b5fd4feb8eb
-DIST gsl-2.3-cblas.patch.bz2 12036 BLAKE2B ddad801cc42f925581e2e4995292f3eab0d2faf70c43c3b205fcf521b98e426df1d0824ed7d98b2c4cc89bbc4068fd45f2595dc02d23bded5c702b5a01bbfdb2 SHA512 37b867a21e60cd96c453ae24139bcf16c00c85bb6d5a3dcece81185fd9af5870c5167d2fa3c74cffce55bfb84f72be34d28ea94e0889904f8dda8687f66b4d23
-DIST gsl-2.5.tar.gz 7303881 BLAKE2B 7c6d10c21071a1af1f03123f83244476d2e90fcd27d05a115b03a74fe631eb7d8081f5260e534ae58ab0997c1111f980a5e4cb50d110ca626fe810c44be70180 SHA512 5b4c5c023f9029ce220f4e09aa4d0234fed94d42ac224d58fda095fe0532d54237a7c33278f8b5d0ba051f6004486edb38d0adb4fcb49337a8c1d8a18cf4a24a
 DIST gsl-2.7-cblas.patch.bz2 12073 BLAKE2B 71f2bdafdb1f42ca5c3515f8e39266242185218495705018d88e523be9bc776b39749156500cdc5746a16e481e9cfe2b79660e250eb1a70f3b18819d16fe11c5 SHA512 5b9b2a798079610d7d4981b83672cc978ed44b66aaf6e671794685f10bd4069764bb358870019dc0eec1e251639cde12aaa3598cae0e2fc050ea39c79435fe2f
 DIST gsl-2.7.tar.gz 7508761 BLAKE2B a9da4df40ea57374880026a0586f2f218dbb0c9154cc661b3e7f5cd414311b95300e60faa2d7f4d3c6cdae5cfdf77cb8052075b56f51564aec2649cc4ad5f7f9 SHA512 a14ac5400acaf4884620430dbeb6f0b28eafe946923b792ab0eccc2a2abc9113d8ce342f4b1e5396f05247649f7d6f953944a8e6bdbf9ee1adb9e67b7c3df2b5
-EBUILD gsl-1.16.ebuild 3069 BLAKE2B 3cb68ede8761db13a1e17b0e0aff1f165e20f38946dd5b70a92b597c38faa4581bd0c9b96d16257f7fbccfa765513e4a0319686f4ffd959e7a0d2e084cacab75 SHA512 03a6b20f6d6cf125d120841aea9b2170e9bb77bbc64346e82f3a03fc5e78c19ae75bf8e01c19e6371f21658c3bcc168f0f13a04ebb500715629c45306b5af713
-EBUILD gsl-2.5-r1.ebuild 1428 BLAKE2B 199410861db77b4e73bba3647790efd91fe675185c55cb1730e6e06221753f34048cff8033e07c1846104801c994da0b9fe0c2da3a6661e3899d67b0345892fc SHA512 bc175e93a0ab179b397d97efe24a9b66a1787c28dcd5c38e6cec359246790fb01fb43764567dd1031ace02acc99928d1518a59f6c4e98b8c674c7f8f1f7c09bf
-EBUILD gsl-2.7.ebuild 1458 BLAKE2B 5eb807b11c79db186302341a8877ba9e35b9d144e26ea2087340fac45dc6131382bb4c0e67d219926ff2550714edeefc718e4818411a80ebbe3c691f2a1ce39b SHA512 c77d9bda24cafc6c9bd612c5d5727ac2e2ef2df30d6718cdcadfa6c63f5a04428ff586224c81a632a35eee1aba86c7dbe2210ecd733ef7bc68c78046635cd3fe
+EBUILD gsl-2.7.ebuild 1456 BLAKE2B b5fb1ef6587526b39804ce175d0f67a7917a0f48a90ff3585577b51ba7547b026e3518801fb66f43cff5c8228142189e65cfe5e1bf0ef7cdb3c166b9532b5231 SHA512 14e1f9ee0d3d7b3e9942082b143971426352011c27ff4cfdeb9e63294c68598e38b2ff8074f4431909b1d06603b8120288a4504981732c6e8beb2fb0e597dcf3
 MISC metadata.xml 1191 BLAKE2B 856a9a1b3195a76a6c1fffe65dbb94b90a135ce4290c33d772efca43be04f29db7efee5083ee997660c5831aa75773993423645a28e82072b3ceb877135d6810 SHA512 9cb110e5202df7ca123da18ffd0ac60d1d9d5577a29dacff001b24b0c0eae4f96851273d72956dd7b0b94c9fabd392ea13ae6aae54e801d118032d215ede59b2
diff --git a/sci-libs/gsl/files/cblas.pc.in b/sci-libs/gsl/files/cblas.pc.in
deleted file mode 100644
index a2580f85e6e8..000000000000
--- a/sci-libs/gsl/files/cblas.pc.in
+++ /dev/null
@@ -1,12 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=/usr/@LIBDIR@
-includedir=${prefix}/include
-
-Name: cblas
-Description: GSL C Implementation of the Basic Linear Algebra Subprograms
-Version: @PV@
-URL: http://www.gnu.org/software/gsl
-Libs: -L${libdir} -lcblas
-Libs.private: -lm
-Cflags: -I${includedir}
diff --git a/sci-libs/gsl/files/eselect.cblas.gsl b/sci-libs/gsl/files/eselect.cblas.gsl
deleted file mode 100644
index af6fee51fef9..000000000000
--- a/sci-libs/gsl/files/eselect.cblas.gsl
+++ /dev/null
@@ -1,5 +0,0 @@
-libgslcblas.so /usr/@LIBDIR@/libcblas.so
-libgslcblas.so.0 /usr/@LIBDIR@/libcblas.so.0
-libgslcblas.a /usr/@LIBDIR@/libcblas.a
-../blas/gsl/cblas.pc /usr/@LIBDIR@/pkgconfig/cblas.pc
-gsl/gsl_cblas.h /usr/include/cblas.h
diff --git a/sci-libs/gsl/gsl-1.16.ebuild b/sci-libs/gsl/gsl-1.16.ebuild
deleted file mode 100644
index eac9c3b6f75d..000000000000
--- a/sci-libs/gsl/gsl-1.16.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit epatch flag-o-matic autotools 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/~mgorny/dist/${P}-cblas.patch.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-IUSE="cblas-external static-libs"
-
-RDEPEND="
-	cblas-external? ( virtual/cblas )
-	app-eselect/eselect-cblas"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS BUGS ChangeLog NEWS README THANKS TODO )
-
-pkg_pretend() {
-	# prevent to use external cblas from a previously installed gsl
-	local current_lib
-	if use cblas-external; then
-		current_lib=$(eselect cblas show | cut -d' ' -f2)
-		if [[ ${current_lib} == gsl ]]; then
-			ewarn "USE flag cblas-external is set: linking gsl with an external cblas."
-			ewarn "However the current selected external cblas is gsl."
-			ewarn "Please install and/or eselect another cblas"
-			die "Circular gsl dependency"
-		fi
-	fi
-}
-
-src_prepare() {
-	ESELECT_PROF="gsl"
-
-	# bug 349005
-	[[ $(tc-getCC)$ == *gcc* ]] && \
-		[[ $(tc-getCC)$ != *apple* ]] && \
-		[[ $(gcc-major-version)$(gcc-minor-version) -eq 44 ]] \
-		&& filter-mfpmath sse
-	filter-flags -ffast-math
-
-	epatch "${WORKDIR}"/${P}-cblas.patch
-	eautoreconf
-
-	cp "${FILESDIR}"/eselect.cblas.gsl "${T}"/ || die
-	sed -i -e "s:/usr:${EPREFIX}/usr:" "${T}"/eselect.cblas.gsl || die
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		sed -i -e 's/\.so\([\.0-9]\+\)\?/\1.dylib/g' \
-			"${T}"/eselect.cblas.gsl || die
-	fi
-}
-
-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() {
-	emake -j1 check
-}
-
-src_install() {
-	default
-
-	find "${ED}" -name '*.la' -exec rm -f {} + || die
-
-	# take care of pkgconfig file for cblas implementation.
-	sed -e "s/@LIBDIR@/$(get_libdir)/" \
-		-e "s/@PV@/${PV}/" \
-		-e "/^prefix=/s:=:=${EPREFIX}:" \
-		-e "/^libdir=/s:=:=${EPREFIX}:" \
-		"${FILESDIR}"/cblas.pc.in > cblas.pc \
-		|| die "sed cblas.pc failed"
-	insinto /usr/$(get_libdir)/blas/gsl
-	doins cblas.pc
-	eselect cblas add $(get_libdir) "${T}"/eselect.cblas.gsl \
-		${ESELECT_PROF}
-}
-
-pkg_postinst() {
-	local p=cblas
-	local current_lib=$(eselect ${p} show | cut -d' ' -f2)
-	if [[ ${current_lib} == ${ESELECT_PROF} || -z ${current_lib} ]]; then
-		# work around eselect bug #189942
-		local configfile="${EROOT}"/etc/env.d/${p}/$(get_libdir)/config
-		[[ -e ${configfile} ]] && rm -f ${configfile}
-		eselect ${p} set ${ESELECT_PROF}
-		elog "${p} has been eselected to ${ESELECT_PROF}"
-	else
-		elog "Current eselected ${p} is ${current_lib}"
-		elog "To use ${p} ${ESELECT_PROF} implementation, you have to issue (as root):"
-		elog "\t eselect ${p} set ${ESELECT_PROF}"
-	fi
-}
diff --git a/sci-libs/gsl/gsl-2.5-r1.ebuild b/sci-libs/gsl/gsl-2.5-r1.ebuild
deleted file mode 100644
index f9cbafbd975d..000000000000
--- a/sci-libs/gsl/gsl-2.5-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 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/~mgorny/dist/${PN}-2.3-cblas.patch.bz2"
-
-LICENSE="GPL-3"
-SLOT="0/23"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~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.3-cblas.patch )
-
-src_prepare() {
-	# bug 349005
-	[[ $(tc-getCC)$ == *gcc* ]] && \
-		[[ $(tc-getCC)$ != *apple* ]] && \
-		[[ $(gcc-major-version)$(gcc-minor-version) -eq 44 ]] \
-		&& filter-mfpmath sse
-	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' -exec rm -f {} +
-}
diff --git a/sci-libs/gsl/gsl-2.7.ebuild b/sci-libs/gsl/gsl-2.7.ebuild
index 7fe267577885..1f76267c23d5 100644
--- a/sci-libs/gsl/gsl-2.7.ebuild
+++ b/sci-libs/gsl/gsl-2.7.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz
 
 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"
+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:= )"