gentoo resync : 22.12.2021

3 files changed, 2 insertions, 78 deletions

diff --git a/sci-libs/libqalculate/Manifest b/sci-libs/libqalculate/Manifest
index a379d83033e8..42c7ceeeb0bb 100644
--- a/sci-libs/libqalculate/Manifest
+++ b/sci-libs/libqalculate/Manifest
@@ -1,7 +1,5 @@
-DIST libqalculate-3.20.1.tar.gz 2107300 BLAKE2B 79314cbe2adb183a17f96947b8ad4fa0bbfea665f7b9afda67785059e9bc0d94599b05cd55999302fc5e1216929b4ed98db4e2a6ae0c6fc74ebdd37dc6dcb72e SHA512 65a723c257c9e2419fc60ca254c23a7a7dd4d9a31beaa9c8fcf41a1e252e5f3be08e1160dcc72a0a407fe3ffd3e73353b141e40019871677a490d8c810c96931
 DIST libqalculate-3.21.0.tar.gz 2117414 BLAKE2B eaf8b886e716a6f8e9631dbda6533906cc7c5ed986233d75b9384aefb4123479914715d37268db5e1d403d1ee1835cde77314abe5380768fce5c266d1c253ca3 SHA512 7ca876ffe359ab2c6c6ae266007f489f9cd26f6650d6ace4e1d80cc660d16294cce601ed81046baca25cc4ec41668498af0a555fddc47c4118241e72af039614
 DIST libqalculate-3.22.0.tar.gz 2150167 BLAKE2B 2023dc00e516f26d93e6acae66acb6211fb4dd234fba7e1e012c29ea224276040e75552b923b275e0cbe3e168ed419849f7f204aac3952a872ad0f1916470358 SHA512 2fc7e9e2edda0dfa221865050068eead29f9fecfef8eb8817bacc7493ed03215c60931b40e69165f565fc0574e370131ebebd9b247fedafc5821aae35b71dac9
-EBUILD libqalculate-3.20.1-r1.ebuild 1609 BLAKE2B bd23938bca6883b4216aeeee4089135397d503cbbbab4fb3b839cb8c10adec7780adc5591f202fc03cd042c598a7a6193d2353652af38a09f68b658723f2b041 SHA512 df46c547e21e416ff03f73571098b474bdba5ea5c797a03b8f0c46f2edbe6163d30c2c6039ede337c538708d46f549ce2f7c97ad2b7e41ae6faa10c13ac32002
-EBUILD libqalculate-3.21.0.ebuild 1659 BLAKE2B 1935f1c45853dca19ca328a9dcf2d483978cc7deabd164c9fb07a031d75e2aec7b7797d237c0f807f25399677efb06fb15c5203bd978034d0600eef497c5ca3e SHA512 0e005722cb40663ff315de407df3284f4c45a2342349bea8edbccaef52fc6a86b185e7954a707a857b8eb8a1b386ad46dcc0a68eeacd90098a807d28dd49cb79
+EBUILD libqalculate-3.21.0.ebuild 1654 BLAKE2B c5b306253cf8573552a4317a2472933b38356c174d47e609f4cdb8c44345563c385844c634153c884c16d6e67f8c069d9f3f4e7af751b65f02eec38c6d58391b SHA512 3ef1a0e55ccf8b9457c3a5bd1d40d34196f201faad18e7085b1af42c8ef27f4b9fd8d2f83ae5cdc2ce698f696b200bc85e23f2b575f42d26af78ace024504cd6
 EBUILD libqalculate-3.22.0.ebuild 1779 BLAKE2B e7c473a397155083881de30343ca2324957decd20f0ed03871c89d34733d4b741a14c9a3f057272f2f6e147c27c69ffd5c00439a7f89874f98079cab1164c2b1 SHA512 08333db34e338e746bfb83fe39a5d124073fc7705367dc3f7da197457ebeabef82eedb0d966d31dfffe1ab589ae2f332baa703a03e6aaa19d92237f7583da0e0
 MISC metadata.xml 413 BLAKE2B 40f271cbe3f5ca30aa6ec6320d382faef0864e064ae57599a6da937da85b4de9d57eeec6f8b737698ede76d663149b13247d1edf8b5b291de19ac3d6b5266492 SHA512 053e75b77c4ff628535db22d9763e27c32cee904f0b268d2d507f367c938aff5bdd75a66e3f4c2316dc1d3db579d721564d3a12e139740a3a0d50c36f8d52e94
diff --git a/sci-libs/libqalculate/libqalculate-3.20.1-r1.ebuild b/sci-libs/libqalculate/libqalculate-3.20.1-r1.ebuild
deleted file mode 100644
index a233c76663bd..000000000000
--- a/sci-libs/libqalculate/libqalculate-3.20.1-r1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="A modern multi-purpose calculator library"
-HOMEPAGE="https://qalculate.github.io/"
-SRC_URI="https://github.com/Qalculate/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/22"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-IUSE="curl icu gnuplot readline"
-
-DEPEND="
-	dev-libs/gmp:0=
-	dev-libs/libxml2:2
-	dev-libs/mpfr:0=
-	virtual/libiconv
-	curl? ( net-misc/curl )
-	icu? ( dev-libs/icu:= )
-	readline? ( sys-libs/readline:0= )"
-RDEPEND="${DEPEND}
-	gnuplot? ( >=sci-visualization/gnuplot-3.7 )"
-BDEPEND="dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-src_prepare() {
-	default
-
-	cat >po/POTFILES.skip <<-EOF || die
-		# Required by make check
-		data/currencies.xml.in
-		data/datasets.xml.in
-		data/elements.xml.in
-		data/functions.xml.in
-		data/planets.xml.in
-		data/prefixes.xml.in
-		data/units.xml.in
-		data/variables.xml.in
-		src/defs2doc.cc
-	EOF
-}
-
-src_configure() {
-	# Needed for po-defs/Makefile
-	export CXX_FOR_BUILD="$(tc-getBUILD_CXX)"
-	export CXXCPP_FOR_BUILD="$(tc-getBUILD_CXX) -E"
-
-	# bug #792027
-	tc-export CC
-
-	econf \
-		--disable-static \
-		$(use_with curl libcurl) \
-		$(use_with gnuplot gnuplot-call) \
-		$(use_with icu) \
-		$(use_with readline)
-}
-
-src_install() {
-	# docs/reference/Makefile.am -> referencedir=
-	emake \
-		DESTDIR="${D}" \
-		referencedir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		install
-
-	einstalldocs
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/sci-libs/libqalculate/libqalculate-3.21.0.ebuild b/sci-libs/libqalculate/libqalculate-3.21.0.ebuild
index c07e53ae32bb..ce8152e82e7b 100644
--- a/sci-libs/libqalculate/libqalculate-3.21.0.ebuild
+++ b/sci-libs/libqalculate/libqalculate-3.21.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/Qalculate/${PN}/releases/download/v${PV}/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0/22"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 IUSE="curl icu gnuplot readline"
 
 DEPEND="