6 files changed, 18 insertions, 52 deletions
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 9f3fae587315..381ca44fa994 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/libcifpp/Manifest b/sci-libs/libcifpp/Manifest
index cb779b517899..166eaa3e3854 100644
--- a/sci-libs/libcifpp/Manifest
+++ b/sci-libs/libcifpp/Manifest
@@ -1,10 +1,7 @@
-DIST libcifpp-5.1.1-components.cif.xz 58896016 BLAKE2B 2bf61944fe6b11325df3c6c32eaabeb27b0f117eed362dd2eba51f623f4054d142ee84aeb04908322b7aebd30a1bd17da969eeda953f7423cca922006fe767d2 SHA512 d4103ac0b0ae5698dd4c17e452ea35871c4854827d3a2ee93f00b73b6f57b87ee2278b44ec0501f818dfc34284b4c19d4617ba3a98df9552da5ebedaa59c9622
-DIST libcifpp-5.1.1.tar.gz 2244833 BLAKE2B 3a5feada63ee123dbed1ba776d0248569f46bbc2d39748db7d3cdfdfb66c89e08c54cdf5133182978e9ef4808c19adfc794ee895a95e882f0d5ff3d173e57311 SHA512 3e988d0e4f24174fb47274b0feaae5a8a793441efb9c8273b328f412fbd29ee082cd91e19f19008069ebfd3507c83f7945dc33fc015784727603f987091eaa5c
-DIST libcifpp-5.1.2-components.cif.xz 59092332 BLAKE2B 3672ca8e9553be80822ca7d7398fd3b73b14b1bf375e63f3a7aef33c2ee92d837c9ca08b3a756d838c512ac5918a0537d70e9a422331fafaf0ff77ecf2134515 SHA512 b2d3507d339d8467b10d0a638a5b86e75ed73fb64fee854aefeb2f0ce999e6a99755af30483749ce75e8a4ce63536111bd2a7a5f698dfc86d1a2be3d243304ce
-DIST libcifpp-5.1.2.tar.gz 2244795 BLAKE2B 7bec9f901c112fabf86c9ce691229f42dcf854be4c99bdf09dbe7dd0d0a3a7e92831cb2b72afa4debc1ce8b1a3a33e27cceda048adca6805802189e0ad50349c SHA512 3adb801ed52b250f6779228288a2c2926c1c7d8d0eff0bb6ed610b4258de8537253d2ce95208e8682b2eb8d0c09ecb53b6269c24bdce907360d9478c6c8c3c1b
 DIST libcifpp-5.2.2-components.cif.xz 60754468 BLAKE2B 899120c2d6749fb2da9be94de8665f4e961d08c101b33bce98b84bf126b32d43bb79c88da98fb926047522a6f138512dcc59df698f57a83b716e039d422308d4 SHA512 d861b83f8b363f2e64ccf073bae768d73f9f57ec2674bf30d43b05fc9a32d235e26c888faaa02b6276e0734632b237b6dd00d8b966dd63b4fcf6562ebcf41cfc
 DIST libcifpp-5.2.2.tar.gz 2277238 BLAKE2B a31af09bed7f1dbd6f610e104f0a8439742c863bc58b3680c058cb570a1f93fbcd6d23f29a372aafbb7166a4d86b2590cd24e092b1cc7af25bd09bbe437c93eb SHA512 2bbe9b13fd0ce8f686b5fa9e1675a41cc37c954cd9d80326fcc7c5f4c767be95dd71f6ddc3e841b6102214cd66205303515fa0750683e539f48b038a32a51af9
-EBUILD libcifpp-5.1.1.ebuild 890 BLAKE2B 62a828f715d25d5368f94ad7e226d19caf45b0c37d311e5f6dcd13a3ec5224f296b69dc074891462063ceb92ee1153a7a1552731bef2800c914b201f76bca916 SHA512 0714de6553e370fb4ddb3d50c4e8fdfb227b671a581ef6d1a21257aee932ba816b3f41600c398cef4cd8ffbf99c7ab7824e79af66ab0f8ce877d585614444aad
-EBUILD libcifpp-5.1.2.ebuild 891 BLAKE2B fe97d75afc5635f9a791f4b814b9386ea075a9fea5c92058701f77cbf2da16c067fcf1bbd1ea505acc51985996fda3eef0608eebd51bdd6b2b4d8561853766b2 SHA512 8f934477871ea87cdee1e102a09d7e36786401da58f1b9453ba113701ad1a2cad51bed6f88f87b09b753358a475f52c82a3f24f1a9c2679405d7ab55a9f21f82
+DIST libcifpp-7.0.4-components.cif.xz 62591092 BLAKE2B f5fc502cfb0d5c33c2218a02ccbf652c87f0d9d0ac93a8f2eb7c5a7e1e301555cb641f3df815fefbb998ca00f0b04f4fd39de2023dd69ca88de29a814208cd70 SHA512 6f85b84b9e4c63b134dedbc41a6a3ba4a7bec6a66b0ce1fcc9248c06b3e5600b8fe31c5ed72722cb40cb431227f17bb9f485e7b471c84efa313b04adfb161ec2
+DIST libcifpp-7.0.4.tar.gz 2598838 BLAKE2B db6e4b1573d243c511f15ea1fc28867c8a57eb1050c24a59c12a4608b59890ee567569ca4035daead7e74d206a77bb280c56d54ef8b050fe297ccd75cf48ffeb SHA512 6957b3e3ace855c22923391cfd05db40399b6b84fb194ccceaf7b460493ee8576573056296eb06fecf9e6e83c590776fdd5a09f06bb316de61f44468d2a53392
 EBUILD libcifpp-5.2.2.ebuild 893 BLAKE2B c581661af0f35cf4593654dbd915e9eb31fa464790be260faec7924104a341922a95e209415af57462d72f27867b9124af84865a82261cda04231ea37b0b47e2 SHA512 dac5c593845e0274ea86e88805cbe240096529ceb977fafa941d11de6c03618ea8c63eabbe01d6dfdbdf03325de03f380b8d8ad610221516bd48c29fe1de58a7
+EBUILD libcifpp-7.0.4.ebuild 1055 BLAKE2B 68150419ce2e7e5ab7b976715e622c01a220ba24e0b846c2102c3c9629590f75f6509c36a5565141e9b29d9c014c23ae3ba9a30429ce165936853071840ba4bf SHA512 206748d242530272a826045e09d96341498511bb90ffd1664454211ac38f8496a2cb0eab8170440a494a7fd4f7e72f324ccfe701ca88a0c43e2cfa9622f17f84
 MISC metadata.xml 299 BLAKE2B 88091a7fbc350db0c22800bcd0de80ec406f7b8a0187b29d8660978384179f8194f7aa794bf0bd3b3f4ab68ac662ca62479319e218d2622e2a3e470653848251 SHA512 e6bc610ae1cf40584ba3067ece0c0c85d08ad0bbb99f5ecd8281c41b04ff932db838926a6ff238794ff46eb8035eb57c750e088bd3f164180952a9e597544e14
diff --git a/sci-libs/libcifpp/libcifpp-5.1.2.ebuild b/sci-libs/libcifpp/libcifpp-5.1.2.ebuild
deleted file mode 100644
index 47d08fc49c68..000000000000
--- a/sci-libs/libcifpp/libcifpp-5.1.2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2023 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"
-# Update components file on every bump
-# http://ftp.wwpdb.org/pub/pdb/data/monomers/components.cif.gz
-SRC_URI="
-	https://github.com/PDB-REDO/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
-	https://dev.gentoo.org/~pacho/${PN}/${P}-components.cif.xz
-"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-cpp/eigen:3
-	dev-libs/boost:=
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	cp "${WORKDIR}"/${P}-components.cif data/components.cif || die
-
-	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=ON
-		-DCIFPP_DOWNLOAD_CCD=OFF
-		-DCIFPP_INSTALL_UPDATE_SCRIPT=OFF
-		-DENABLE_TESTING="$(usex test)"
-	)
-	cmake_src_configure
-}
diff --git a/sci-libs/libcifpp/libcifpp-5.1.1.ebuild b/sci-libs/libcifpp/libcifpp-7.0.4.ebuild
index 8d30793f975e..8c10d84a2291 100644
--- a/sci-libs/libcifpp/libcifpp-5.1.1.ebuild
+++ b/sci-libs/libcifpp/libcifpp-7.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -7,7 +7,7 @@ inherit cmake
 DESCRIPTION="Code to work with mmCIF and PDB files"
 HOMEPAGE="https://github.com/PDB-REDO/libcifpp"
 # Update components file on every bump
-# ftp://ftp.wwpdb.org/pub/pdb/data/monomers/components.cif.gz
+# https://files.wwpdb.org/pub/pdb/data/monomers/components.cif.gz
 SRC_URI="
 	https://github.com/PDB-REDO/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
 	https://dev.gentoo.org/~pacho/${PN}/${P}-components.cif.xz
@@ -20,19 +20,26 @@ IUSE="test"
 RESTRICT="!test? ( test )"
 
 DEPEND="
-	dev-cpp/eigen:3
+	>=dev-cpp/eigen-3.4.0:3
 	dev-libs/boost:=
+	sys-libs/zlib
+	test? ( dev-cpp/catch:0 )
 "
 RDEPEND="${DEPEND}"
 
+src_prepare() {
+	# https://github.com/PDB-REDO/libcifpp/issues/59
+	sed -i -e '/unit-3d/d' test/CMakeLists.txt || die
+	cmake_src_prepare
+}
+
 src_configure() {
-	cp "${WORKDIR}"/${P}-components.cif data/components.cif || die
+	cp "${WORKDIR}"/${P}-components.cif rsrc/components.cif || die
 
 	local mycmakeargs=(
 		-DBUILD_SHARED_LIBS=ON
-		-DCIFPP_DOWNLOAD_CCD=OFF
 		-DCIFPP_INSTALL_UPDATE_SCRIPT=OFF
-		-DENABLE_TESTING="$(usex test)"
+		-DBUILD_TESTING="$(usex test)"
 	)
 	cmake_src_configure
 }
diff --git a/sci-libs/volk/Manifest b/sci-libs/volk/Manifest
index 2b797a281d5a..25fba3714ac0 100644
--- a/sci-libs/volk/Manifest
+++ b/sci-libs/volk/Manifest
@@ -1,6 +1,6 @@
 DIST volk-3.1.0.tar.xz 420088 BLAKE2B 709c3561675b0f71a1400d7b9332aa18c6d2ae848c993914cb40484890f631bde48da12ab9756be38cca9fbb20d0d851cb40ff5bfe3722ff72cd0b4daff1b11d SHA512 0c39c06e5121782461c0ea2c84402c84f9609a2a09ce7218e976472081d09531746ea1cde767f329a69d72d51cf5715bf7f2df1b26a8d8ddd1694e8239f5ff21
 DIST volk-3.1.2.tar.xz 381388 BLAKE2B c67049921cf0817ff263ae3b0b14b2939e69e461fa731b47f0f923ebe730e67a8715f20738b1991fc9956abd12eccfa50a421460feef12e7678d26a25d73acce SHA512 6fd99b037e2c2481f4886a70021403a8641567a0c0280496194da7ef1b8cf7dbecf91d5bfc1b1c3449788de360206bae5036d796a01bbec211ccf9ccbbc357ee
 EBUILD volk-3.1.0.ebuild 1292 BLAKE2B 7b96f904a2b5a5967a91027beaea1e5fa8e2b74def6ce15678e26fd72cdeec632bcd74ffbf11a9afd891433b7f6f5be3132607d74c0c21ea189ae41d7deaa075 SHA512 60d54b99e30649de03fc89b3f145afeb69b208075240e5e6762d744fbe6a8b4919b7ad9e718ac1c74ac24d540dc651046160b6f9b57eea4b27cea1d5a2da3eb7
-EBUILD volk-3.1.2.ebuild 1292 BLAKE2B 7b96f904a2b5a5967a91027beaea1e5fa8e2b74def6ce15678e26fd72cdeec632bcd74ffbf11a9afd891433b7f6f5be3132607d74c0c21ea189ae41d7deaa075 SHA512 60d54b99e30649de03fc89b3f145afeb69b208075240e5e6762d744fbe6a8b4919b7ad9e718ac1c74ac24d540dc651046160b6f9b57eea4b27cea1d5a2da3eb7
+EBUILD volk-3.1.2.ebuild 1291 BLAKE2B 0a091955e9e98b56b42c617754d52bbdf9a68ef264f0ad1804ee23ec174cdf5c918e789a9914bef7654001fb74f73b4e26f72cb55339967dfdb69caea43287f0 SHA512 8dcfa63dcca1296a19a150656e7da52a8bd827bc511cace2638936b1ed26b8109b8538d7d452d6bac396e3caf06147d125e9fb991186bd697370c0ed48ca23f3
 EBUILD volk-9999.ebuild 1292 BLAKE2B ebbd8ddc6c8fdee7047fe680220ed9d80a18f176d81504f6bd6e1953af78d3d30721c7c4fb420f6d432ab1a6e620b28f2182b4ca01a1d1d75ed095ab0400b1db SHA512 d9816eed7b44cca190fa76edfa9637435766731a7f368ac39ac42c2ea98b317c059261e4f3201098dececb745a5f2e3d30cd8b00817ebc5b5ff744de627cd720
 MISC metadata.xml 326 BLAKE2B add10950a24964807f5b5c4696f3852da2c19337e5db075bc1e2f9ba597812ac2b8e975b1747bf7a6a0e57420a9ea70f721d117f452c7971bb9a47765274938d SHA512 a5ce5f748eb162e852281a9a043c1bec629448da7f2f0a211f81c6671dbc10677aab06446fe9e1cd4105049ef95acbd03276d53472fbf73a8c3d608ea649787a
diff --git a/sci-libs/volk/volk-3.1.2.ebuild b/sci-libs/volk/volk-3.1.2.ebuild
index 0a400d90ff06..a6c27ce5a74e 100644
--- a/sci-libs/volk/volk-3.1.2.ebuild
+++ b/sci-libs/volk/volk-3.1.2.ebuild
@@ -17,7 +17,7 @@ if [[ "${PV}" == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/gnuradio/volk.git"
 else
 	SRC_URI="https://github.com/gnuradio/volk/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~riscv ~x86"
+	KEYWORDS="amd64 ~arm ~riscv ~x86"
 fi
 
 LICENSE="GPL-3"