gentoo auto-resync : 25:04:2023 - 18:13:05

8 files changed, 109 insertions, 70 deletions

diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 8d60688ac19a..a58991614e37 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/libcifpp/Manifest b/sci-libs/libcifpp/Manifest
index 91a010374a9c..a8b2682e395e 100644
--- a/sci-libs/libcifpp/Manifest
+++ b/sci-libs/libcifpp/Manifest
@@ -1,10 +1,5 @@
-DIST components-2.0.4.cif.gz 81445161 BLAKE2B 80d538109a716af0273d109151a434e68cc1be16dc3a21653a4b78dd9719c93f59259146a6e980fbab4484a6b41d32064a276566411e23bf56b0a42b6dacf408 SHA512 a154305f1d3ba2df24ca3859b0a7d1a81cae79c927a708a531bee1689b0b65752fd68032d12335afa4b6b2f5969e003365abd49bed729d740c0f3055328f08ad
-DIST components-3.0.0.cif.gz 82114845 BLAKE2B 9934110efb9848e8b71e75173bf9c8cfeec1daeef45648296dbcc41641308b9c4e6ff2ef16d86b44ebdb0a200fe6f2a8f13dadac1cce4d8ea2a2961927bf4c94 SHA512 625478378d236ec46130d83545c1b0fbdfb5e9cada3834ac14d4b052e9e460e73523e4438b3356a78d64f569e12cd4c13439b5de56462a10d5c11d0de09d52b8
-DIST libcifpp-2.0.4.tar.gz 960402 BLAKE2B 4650478b187ece13d38c0a5f13c94e6098e3271088a7dd19d72645d52d085304a463387f9d1b1edacbcd03a051b32fbf2384e3287d5ff4835091f2eae2fe2805 SHA512 f4a6b126b376b245d399508e9bc360bcf0451e6bd3cad3127567dd95afb1965c8eb764bb9b0bf26be26695fc5636e509709bdbc9f8c9a00939d049c1634dcae0
-DIST libcifpp-3.0.0.tar.gz 950896 BLAKE2B 8aad3ebea5cc82c2615b6dc6a8a50654375dd9f58ff6c27306bf1415d9658f29f196c5ea9bf0e4f913400b3eba48f19bc11dd97c84b59cf2df94f87afb06d5b7 SHA512 507abed829e4d5194eb22fe73d261295a9814577d7bc53743731e7a1ccb032f763f4bfa0e1b23665d52fabbfa38baca20e6373c14db029705427b6fa773df976
+AUX libcifpp-5.0.8-missing-include.patch 553 BLAKE2B 0bcda2161396c3a863f2b4bc0074ac1298c57fa67cdc7771c05bd56b99e8d88a2124dc361aeef99e4fe2aa06f8ba1af9bccd4f2c20c90ac3a8e8fcd0f211d6fc SHA512 deb17752ac3bf005e8936ab5894f0b5ca3eb8fcb59a41dff511111b0eddf88ff983504629888904ceaca17826710609add09e0075bf5c8726767d2a8589b1e90
 DIST libcifpp-5.0.8-components.cif.gz 89984770 BLAKE2B d42147d4da56589ac30de9fc3cdacd43e036f548eebf80a19d878c4bf0be535578eec6b78625e1ba60db53090ce5e4b9a3e59b06705f208b660fb2e37e79d1c2 SHA512 5f9705714816656aa910b571d77966926d66b2724136119857138975f8be5bb2e889e0c9b28ef1340a72857afb5831dba529b96e8dfc796f739e24b0dcab0424
 DIST libcifpp-5.0.8.tar.gz 1873629 BLAKE2B 07257a898b1253995880fea9b416b3a7681122b544f8397d353fda4069c33f4a6c2d5cf2210983acf68dc56cb27a20d780461c7c2485a445855e7b45cccd326d SHA512 4ea67fa4a93218fe96289de95591faa9411508e41e308f4ff470033fb0deb4029a86eafb7ba9295807fe3b350e8cc9f2267f7735ee8b1dbb431ee0275db2b8cc
-EBUILD libcifpp-2.0.4-r1.ebuild 734 BLAKE2B 98776f8cdb01d30fc71a59b859ac0b5a336a79771fdf0f5b953fec5b1e932745f2ed10e26f707c9ba18479546a382acc123b7f45565a6b7fc5cbfe6aea6c524f SHA512 92882477bdd15718a78a980bf00cce6b7271fc9db5d405da95a747ec0ff1b45f797949673ce0799c3a281c17c40f1fd800e24e46ce676f4038699cce692a8954
-EBUILD libcifpp-3.0.0.ebuild 738 BLAKE2B e4577178cba7b208e9dde896997a131729031f916a3b9c67be5d83b8bc9b6e689940959ea132e27d399e6b9be5f3d7faae1b84de8445477c81385967013feb31 SHA512 849c3b2f65fc540bae1dd22cd4c39538728c34f5312c2dab94d9102fe9b59f0a903c60128dfba6bb791bcee5762f1d3a428f61f5190bea582a191012f35707c9
-EBUILD libcifpp-5.0.8.ebuild 870 BLAKE2B fa9206b2a876c9a6ed7b2f47059c2bdec6e81f8663257acadffe13a460d3c4235ebab513809820fcb8c7b875a6ae2351df3485d8fa2d2b1f6b935f768db8b34e SHA512 7cd7303f6925f6574959104244427ae9a7853140e6511d14c23d83c90de12ac803655893aa8af308fff1b7e345b10fe6826b07136f9ed06b5483cb1f892e1366
+EBUILD libcifpp-5.0.8.ebuild 975 BLAKE2B 7e001c18b1feea681575f3c4b60b07602cd270295a8b16ee722f01fdf46e4f04d53e5b5748c64341c6d01969ddd2258f0beb513c96c93f6933eab6d07169f26e SHA512 a3a32d9f577a550abf60b0eef1500ecc5bd56af880bc9f1d8777709320ad485e83727a9f2d3e7069b552b803206245f8fbe56189a5ee43489a33f88d8a821b4a
 MISC metadata.xml 299 BLAKE2B 88091a7fbc350db0c22800bcd0de80ec406f7b8a0187b29d8660978384179f8194f7aa794bf0bd3b3f4ab68ac662ca62479319e218d2622e2a3e470653848251 SHA512 e6bc610ae1cf40584ba3067ece0c0c85d08ad0bbb99f5ecd8281c41b04ff932db838926a6ff238794ff46eb8035eb57c750e088bd3f164180952a9e597544e14
diff --git a/sci-libs/libcifpp/files/libcifpp-5.0.8-missing-include.patch b/sci-libs/libcifpp/files/libcifpp-5.0.8-missing-include.patch
new file mode 100644
index 000000000000..26735e003f4d
--- /dev/null
+++ b/sci-libs/libcifpp/files/libcifpp-5.0.8-missing-include.patch
@@ -0,0 +1,21 @@
+From 0f03fc31e058da4b66f16a67e7674fba1b85ca80 Mon Sep 17 00:00:00 2001
+From: "Maarten L. Hekkelman" <maarten@hekkelman.com>
+Date: Wed, 19 Apr 2023 09:22:32 +0200
+Subject: [PATCH] added required include
+
+---
+ include/cif++/text.hpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/include/cif++/text.hpp b/include/cif++/text.hpp
+index 9da9ab9..00f33c1 100644
+--- a/include/cif++/text.hpp
++++ b/include/cif++/text.hpp
+@@ -30,6 +30,7 @@
+ 
+ #include <charconv>
+ #include <cmath>
++#include <cstdint>
+ #include <limits>
+ #include <set>
+ #include <sstream>
diff --git a/sci-libs/libcifpp/libcifpp-2.0.4-r1.ebuild b/sci-libs/libcifpp/libcifpp-2.0.4-r1.ebuild
deleted file mode 100644
index 70d19261a89d..000000000000
--- a/sci-libs/libcifpp/libcifpp-2.0.4-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Code to work with mmCIF and PDB files"
-HOMEPAGE="https://github.com/PDB-REDO/libcifpp"
-SRC_URI="
-	https://github.com/PDB-REDO/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
-	ftp://ftp.wwpdb.org/pub/pdb/data/monomers/components.cif.gz -> components-${PV}.cif.gz
-"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-libs/boost:="
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	cp "${WORKDIR}"/components-${PV}.cif data/components.cif || die
-
-	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=ON
-		-DCIFPP_BUILD_TESTS="$(usex test)"
-	)
-	cmake_src_configure
-}
diff --git a/sci-libs/libcifpp/libcifpp-3.0.0.ebuild b/sci-libs/libcifpp/libcifpp-3.0.0.ebuild
deleted file mode 100644
index 32bb52f339bb..000000000000
--- a/sci-libs/libcifpp/libcifpp-3.0.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit cmake
-
-DESCRIPTION="Code to work with mmCIF and PDB files"
-HOMEPAGE="https://github.com/PDB-REDO/libcifpp"
-SRC_URI="
-	https://github.com/PDB-REDO/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
-	ftp://ftp.wwpdb.org/pub/pdb/data/monomers/components.cif.gz -> components-${PV}.cif.gz
-"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-libs/boost:="
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	cp "${WORKDIR}"/components-${PV}.cif data/components.cif || die
-
-	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=ON
-		-DCIFPP_BUILD_TESTS="$(usex test)"
-	)
-	cmake_src_configure
-}
diff --git a/sci-libs/libcifpp/libcifpp-5.0.8.ebuild b/sci-libs/libcifpp/libcifpp-5.0.8.ebuild
index 856007e7bd81..b468bb36559f 100644
--- a/sci-libs/libcifpp/libcifpp-5.0.8.ebuild
+++ b/sci-libs/libcifpp/libcifpp-5.0.8.ebuild
@@ -22,6 +22,11 @@ RESTRICT="!test? ( test )"
 DEPEND="dev-libs/boost:="
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+	# https://github.com/PDB-REDO/libcifpp/issues/40
+	"${FILESDIR}/${P}-missing-include.patch"
+)
+
 src_configure() {
 	cp "${WORKDIR}"/${P}-components.cif data/components.cif || die
 
diff --git a/sci-libs/libqalculate/Manifest b/sci-libs/libqalculate/Manifest
index 0c8ea61c9aa5..45937a4ed944 100644
--- a/sci-libs/libqalculate/Manifest
+++ b/sci-libs/libqalculate/Manifest
@@ -5,10 +5,12 @@ DIST libqalculate-4.1.1.tar.gz 2172017 BLAKE2B e9dcc22ad2d102572610ddc103afc5a27
 DIST libqalculate-4.2.0.tar.gz 2215812 BLAKE2B 393bab0d9cf5d4a3158d93bf676805d829a2103ec1dc733e3d98fd7a54ab0c42d3797dadb1cde72b1df2e13cfb691430982f5fbd886ac9f0a906b3884f912202 SHA512 105f567a3b24a1c396df0eb85f299d18228f489e4d989f0fa09cf97321494030e9a85d9cd9fe4b5dd8cc233b4329025788275ba168546929e912598dee8ef6b8
 DIST libqalculate-4.3.0.tar.gz 2230559 BLAKE2B 724dde0bc16e5eaed63420c6dd68ac7c94477c44c007c92bb3b4560d8a2d2062ade4be6d2c8005ff64bf8ffe4c42d95d6990f7900df7a1c1a36cd4cd717bd04d SHA512 234c111435d9461ab65d274030f9a5f6ee401cd81df62b9c2273e921edb8db3bde4254060285dbfaa7b9701a257a5801c8ab8f26b0c2aeeafd2a36042bdeeb84
 DIST libqalculate-4.5.0.tar.gz 2603599 BLAKE2B 142790cf89e97c601b08d553b1f9cd6c1bf184a43c2614a07fa91560a875ea3e3124cf29d7652640b1f2fb4fada1519d48e4cb0ebcfb844c26369d3031aee230 SHA512 a123eaa725c6c6badce0eceecd6ef7e37ca281e7de18085d6a28aa6043bb3f1069f9ebba82b29989c9958455aa093ee183fd8013a86b39bd34e56454bdb35770
+DIST libqalculate-4.6.1.tar.gz 2610769 BLAKE2B 02ad7371c537bf40d98bb1b32877f0a39394b0723c45e53b00381df2d0d326b79ab39c66238a8e3a89f10aa093f6c12bcc5ae0457f6d65503fb3712a78bb0dfc SHA512 7f03e0f8cc87918b8ec962ce8c85840b644aad02cdd53037d41602198cdcb6567099d175771ff3752fc99fccbc4b180527da5fef68b0059bd1b259c34c57620e
 EBUILD libqalculate-3.21.0.ebuild 1654 BLAKE2B c5b306253cf8573552a4317a2472933b38356c174d47e609f4cdb8c44345563c385844c634153c884c16d6e67f8c069d9f3f4e7af751b65f02eec38c6d58391b SHA512 3ef1a0e55ccf8b9457c3a5bd1d40d34196f201faad18e7085b1af42c8ef27f4b9fd8d2f83ae5cdc2ce698f696b200bc85e23f2b575f42d26af78ace024504cd6
 EBUILD libqalculate-3.22.0.ebuild 1774 BLAKE2B 6722314fab7a62696124df0e3813b9d3f4309900c34dff7ef30dee9b0184e8cab34131ca45d3b26bb7137d53b5761347c1e80efd5fa1f2cc6294c6ea2bea49f4 SHA512 7a14d2b32fd478eb11a597a08bb7c7e9a5f0035c94ab7b2b5b36f3a0086807d4b4c6e844a91c8176ddf8cb2be574d031c54c8cc652ead9ad2c9d25e441a67e23
 EBUILD libqalculate-4.1.1.ebuild 1774 BLAKE2B 23f655bbecef591ab2fe8b12c0c4590c5e5bbe9465e7813207561fb8b94d4a042fd9901304e12ab324bbcfdc046ac3e5682d04224eed57e88046e6193058b5dc SHA512 2c45e268d85005c089d34c2f5e6dd76c44b182ceeca3d3a0267fb739cc721d9d49471362fa119d65a8e2e13daadc439273caf2a7e4017a2f02ebb94fa89576f8
 EBUILD libqalculate-4.2.0.ebuild 1781 BLAKE2B e23053dd9aeb9115fdc08e2dfdbf9fca73547283f8c64e533ce29bf8e9989693954d7ea07330707c9e822b86200a68a8d78f2a6ede562c1e5d8dd9dd5440f578 SHA512 79bdde4b78735c4991467711492823ddf2a290fc6c36648be316a15303de277295448067ffb550c02e2e0a37286b0dfeb82e03751459009d0b99ff28a0cd7664
 EBUILD libqalculate-4.3.0.ebuild 1776 BLAKE2B b2c07046419a37aba3bf49f8eff06733c1f28afb55a1da4c8c99f71a2e926eede062704426db7ad2479213b5667c58b5cbd88bf1b6b1d372c7579a8bb2f3f5c0 SHA512 6a0ca261ce06171873da35bb6ca54eab2e66d33d28e47b0778e1f14789b4779d20cc102250d145464e82c2d8e77e8263ba31c15eba847090eac7e9285984cdbf
 EBUILD libqalculate-4.5.0.ebuild 1868 BLAKE2B be2f2f91a02aef7173c8bee825b3bc3f72c182d4226e08112d38af02a60cc34aa33bb5fad5123dec7216cf0f186e743df778aeea1f20936d9c210a7bf9179ada SHA512 337ce33d7e7be2d5a7fb01deeaf30a1f2568cb32e5c4eb17927c1d3be031b94de91c2180def7bd431063dc4fefab601234c7e27346e013941d2a871b5cd0cb1c
+EBUILD libqalculate-4.6.1.ebuild 1828 BLAKE2B 7bae5fd9d112e633c90eaf935eed82611f9f63fef7cd9aceae641e70869b665b74bdfca475ebb32259fb6eeb0caa0982eac0ef92ad686f0a9ae7e6f4e1f9897c SHA512 4ba41a2696cc1696f48d4dc7ff712438b3799700f19126f444f24a33c7d8df0c01ed7ed1adf9aceaafd8f36d669287029789416f58cfe41f510f60d5f88e84fb
 MISC metadata.xml 544 BLAKE2B 063781dc01d5fdfd9d4d23c10b475bb4afa03cb788cb170d0cdfcdbdfedef24924452384eb5caed4a92020b449de9cc32ce12e17ab77d835b8986836bbce101c SHA512 916f4be9424b01991e8c6322d62126fb2ea67b10e4632cd3d9bac6bdd547121c1806c7257fc086751d49d02bf70959a7604f99446c9fefb3598cf9a92489a6ad
diff --git a/sci-libs/libqalculate/libqalculate-4.6.1.ebuild b/sci-libs/libqalculate/libqalculate-4.6.1.ebuild
new file mode 100644
index 000000000000..6bdf2d129d50
--- /dev/null
+++ b/sci-libs/libqalculate/libqalculate-4.6.1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Bump with sci-calculators/qalculate-gtk!
+
+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"
+# SONAME changes pretty often on bumps. Check!
+SLOT="0/22"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="curl icu gnuplot +hardened readline test"
+RESTRICT="!test? ( test )"
+
+DEPEND="dev-libs/gmp:=
+	dev-libs/libxml2:2
+	dev-libs/mpfr:=
+	virtual/libiconv
+	curl? ( net-misc/curl )
+	icu? ( dev-libs/icu:= )
+	readline? ( sys-libs/readline:= )"
+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 \
+		$(use_enable test tests) \
+		$(use_enable test unittests) \
+		$(use_with curl libcurl) \
+		$(use_with gnuplot gnuplot-call) \
+		$(use_enable !hardened insecure) \
+		$(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
+}