gentoo resync : 29.01.2021

5 files changed, 27 insertions, 108 deletions

diff --git a/sci-libs/libqalculate/Manifest b/sci-libs/libqalculate/Manifest
index 490011dc372c..6a760f8e4336 100644
--- a/sci-libs/libqalculate/Manifest
+++ b/sci-libs/libqalculate/Manifest
@@ -1,8 +1,5 @@
-AUX libqalculate-0.9.9-readline.patch 424 BLAKE2B be67a73b0ee7c01c059111261305450b1c6c1547062eee955f6dac2d22582a70df85a3feb8189b304ee388b2a8aee69a8a9ce7bb7408d5fc9957178b66f3dd0f SHA512 677589db5ce91c8092666f20d54e8f607a4ad06beaddbe8a1b11262d70eb2707cf70a608b797efa20b635e018da082585d74309e6506f78f931c09487b8c9aa2
-DIST libqalculate-0.9.9.tar.gz 1509180 BLAKE2B 3f309add80ddb6b21730eab25d37c2d8fee163a79768a09ec5e7e5d329aa11ed9dafbf77f4ce194a96c2ac6a3b55a9c0d16755d5e106123cc2a5f931f6872d91 SHA512 c7692dcd91e0a7aea8184ca5366a3caf704b6e716c9e8552f4214ce7fc3157cf127daf7a063196383e4d5a99f8703486f2282c7fb01acafee5e1b3d8993de384
-DIST libqalculate-2.8.1.tar.gz 1961535 BLAKE2B 074d83a44cbc6cb5d8afe5121e4c34cec46f2f6fecf046f6b4e67c6ebc612030ccbd0f42c303cc675267374502ecb3e831c9bbfca0f13d339e31fb8933a99b7a SHA512 a258bf4f67db70263626ac77822afc75fd7a9e5af2feb1930314daff219865b28c43e82fef6ceae4f3f23957447d6eaebdc709e606d28457bca0f47eefb9274a
 DIST libqalculate-3.15.0.tar.gz 1747863 BLAKE2B eed4cf8f11546b80e9556cfdf09e48d8c4c29948e6bdc02b3f9efd9aa6dce8e6c5eecf440bf4b6243ddcdb59cb7176f1eb054a3ef73cc91444d86ed7645f3a37 SHA512 b8f2af83218a3f90326cb7f679b71cac328cf0591178ed718920cd491d682cf7341c702934b3a232bea5a67ec2d2e09b4321a7ac938c5bc1e221bee086ae4c36
-EBUILD libqalculate-0.9.9.ebuild 1442 BLAKE2B 642e3aef938dcc78f032a5a087ece871d08bd3bee90a8d709e1f56825fcacb048215b9ce4b92893fe68fc0f3659f9709fb5c335646b9ccf99d5d500009c4caa3 SHA512 c7738173ce5ba9290d6571f20089649b93133e2ac1d3ab84acf2bce312bf8dcb69ea7acdde2bce526a07df24312819da88dd24906406195091159bce509668ef
-EBUILD libqalculate-2.8.1.ebuild 1438 BLAKE2B 0550f2dc76b323b0f6d6a20fbef66a7d65011ffb4747c0e1dd812a752d75fe2cdf57ad37ad8080a3d9336a12918ba0937a3be39899461e32b40933855410e8c8 SHA512 990790716b50742317fbd56ed110b69d1573fb89d1fdf3f735087c7364f576c6af4fd882c67c2d4d69e867555656976e2a5ba7607a4a483136d4200a616800c4
-EBUILD libqalculate-3.15.0-r1.ebuild 1430 BLAKE2B a3d6f44135ec92a7580145908cd76ee5b6e82625164f679b73ec1b2d202c7584de298d2a3d3b346ef6e0fdf46eb3606c066a5a92ce5c022cc6950c26f083031b SHA512 f0007784f901a4ca786d7fb274337f4d8df3b954a96a8f59152551abb6d0fd21402066ceb64b12e90fc9bf7321b63c92be251a7bb41888ce80eac036d3051750
+DIST libqalculate-3.16.1.tar.gz 1756176 BLAKE2B b09e06a4d89249bb3e38a47ed47acc7598bc62e966673a1eb175641b1018021199dbbcd38266301ec8b2d3c55747378adfde3db4e25e58771be162905cb493dc SHA512 3cc7ba66493252015b9d33835188c236b10afdce5f23021a5e686609609265aed81d592815ee6a172c269a0f144a3203c954435fea8ddb82637453d5c98cd05a
+EBUILD libqalculate-3.15.0-r1.ebuild 1424 BLAKE2B dff87b194a2a34a0711c7b0b8f50d7e46f57b90869a2706d8aa7991440b56db8c92e54eb6265dfd4edf5086a058d53be87e3c0d1c553e13b9c2d27682efb707a SHA512 dc38abad377639192c9f276a1cf86847463b1ffe5fc35aef15b4d5d6e68f46af6dd6950f8127b1c091ce649dc5dd8fc6010333532ff493344727dd11e726b469
+EBUILD libqalculate-3.16.1.ebuild 1430 BLAKE2B 5ad7454423b04634dba7f119e0626a16b0a1eb84b5652293ce60a2f42c6c89faddd599deb68ee8ccdd1efaebb49f492b960762d6b298057a94a4f30e062f06f5 SHA512 fa4967817bd224a292a93ff1b0c698180f9de41fc374c1c6f9dab2654f5705d21435d8fd49a1214cf47cc669106fa53f93b6c178846ed54e2cc2d7a393aa206f
 MISC metadata.xml 412 BLAKE2B 6cb8a434ec8e0eaa50982720079db60a5a2211c9d67852712351e9d6698edb1d70058f8f093ecf7b93fb7f853b1f1c138bc0871a6751975d35c24c622510dde5 SHA512 b6c55b741bda2a497dae278d47c6931611cbda132e08deb16a9c4efef59c7cb18bc464e7d242380b7afde2af4ab6f8e7f72b7db4ed3fd6b8f4cdc9c0359550ce
diff --git a/sci-libs/libqalculate/files/libqalculate-0.9.9-readline.patch b/sci-libs/libqalculate/files/libqalculate-0.9.9-readline.patch
deleted file mode 100644
index ab2a5a0eb3ff..000000000000
--- a/sci-libs/libqalculate/files/libqalculate-0.9.9-readline.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -ru libqalculate-0.9.9.orig/src/qalc.cc libqalculate-0.9.9/src/qalc.cc
---- libqalculate-0.9.9.orig/src/qalc.cc	2016-07-26 14:41:40.000000000 +0200
-+++ libqalculate-0.9.9/src/qalc.cc	2016-08-04 18:27:36.553906707 +0200
-@@ -3179,7 +3179,9 @@
- 		if(!file) {
- 			g_free(gstr_file);
- 			g_free(gstr_oldfile);
-+#ifdef HAVE_LIBREADLINE
- 			g_free(historyfile);
-+#endif
- 			first_time = true;
- 			set_saved_mode();
- 			return;
diff --git a/sci-libs/libqalculate/libqalculate-0.9.9.ebuild b/sci-libs/libqalculate/libqalculate-0.9.9.ebuild
deleted file mode 100644
index 205d51b8dc7a..000000000000
--- a/sci-libs/libqalculate/libqalculate-0.9.9.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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/6"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="gnuplot readline static-libs"
-
-COMMON_DEPEND="
-	dev-libs/glib:2
-	dev-libs/libxml2:2
-	>=sci-libs/cln-1.2
-	sys-libs/zlib
-	readline? ( sys-libs/readline:0= )"
-DEPEND="${COMMON_DEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-RDEPEND="${COMMON_DEPEND}
-	net-misc/wget
-	gnuplot? ( >=sci-visualization/gnuplot-3.7 )"
-
-PATCHES=(
-	# https://github.com/Qalculate/libqalculate/issues/6
-	"${FILESDIR}"/${P}-readline.patch
-)
-
-src_prepare() {
-	default
-
-	cat >po/POTFILES.skip <<-EOF
-	# 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/units.xml.in
-	data/variables.xml.in
-	src/defs2doc.cc
-	EOF
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		$(use_with readline)
-}
-
-src_install() {
-	# docs/reference/Makefile.am -> referencedir=
-	emake \
-		DESTDIR="${D}" \
-		referencedir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		install
-
-	dodoc AUTHORS ChangeLog NEWS README* TODO
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/sci-libs/libqalculate/libqalculate-3.15.0-r1.ebuild b/sci-libs/libqalculate/libqalculate-3.15.0-r1.ebuild
index 822797484de7..35672fd3c7e3 100644
--- a/sci-libs/libqalculate/libqalculate-3.15.0-r1.ebuild
+++ b/sci-libs/libqalculate/libqalculate-3.15.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/Qalculate/${PN}/releases/download/v${PV}/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0/21"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="curl icu gnuplot readline"
 
 DEPEND="
diff --git a/sci-libs/libqalculate/libqalculate-2.8.1.ebuild b/sci-libs/libqalculate/libqalculate-3.16.1.ebuild
index 2cd5124b9489..94aa33f3f886 100644
--- a/sci-libs/libqalculate/libqalculate-2.8.1.ebuild
+++ b/sci-libs/libqalculate/libqalculate-3.16.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,11 +8,11 @@ HOMEPAGE="https://qalculate.github.io/"
 SRC_URI="https://github.com/Qalculate/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
-SLOT="0/20"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="curl icu gnuplot readline static-libs"
+SLOT="0/21"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="curl icu gnuplot readline"
 
-COMMON_DEPEND="
+DEPEND="
 	dev-libs/gmp:0=
 	dev-libs/libxml2:2
 	dev-libs/mpfr:0=
@@ -20,33 +20,35 @@ COMMON_DEPEND="
 	curl? ( net-misc/curl )
 	icu? ( dev-libs/icu:= )
 	readline? ( sys-libs/readline:0= )"
-DEPEND="${COMMON_DEPEND}
+RDEPEND="${DEPEND}
+	gnuplot? ( >=sci-visualization/gnuplot-3.7 )"
+BDEPEND="
 	dev-util/intltool
 	sys-devel/gettext
 	virtual/pkgconfig"
-RDEPEND="${COMMON_DEPEND}
-	gnuplot? ( >=sci-visualization/gnuplot-3.7 )"
 
 src_prepare() {
 	default
 
-	cat >po/POTFILES.skip <<-EOF
-	# 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/units.xml.in
-	data/variables.xml.in
-	src/defs2doc.cc
+	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() {
 	econf \
-		$(use_enable static-libs static) \
+		--disable-static \
 		$(use_with curl libcurl) \
+		$(use_with gnuplot gnuplot-call) \
 		$(use_with icu) \
 		$(use_with readline)
 }
@@ -57,8 +59,7 @@ src_install() {
 		DESTDIR="${D}" \
 		referencedir="${EPREFIX}/usr/share/doc/${PF}/html" \
 		install
-
-	dodoc AUTHORS ChangeLog NEWS README* TODO
+	einstalldocs
 
 	find "${ED}" -name '*.la' -delete || die
 }