gentoo auto-resync : 06:08:2022 - 08:09:34

6 files changed, 41 insertions, 7 deletions

diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 3a83966e89f5..c7b6dc049ccc 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/coinor-vol/Manifest b/sci-libs/coinor-vol/Manifest
index deaa475b50f5..43853bfeb25d 100644
--- a/sci-libs/coinor-vol/Manifest
+++ b/sci-libs/coinor-vol/Manifest
@@ -1,3 +1,4 @@
+AUX coinor-vol-1.5.4-musl-1.2.3-null.patch 960 BLAKE2B 23394fe662887a2933e96114ad95cb2f43951598d1eb650cba358864b61491a161e34de38bf3d287e35492245a06a7138281d1c67799efb74a2a1022b6c2522b SHA512 bd97018719ef4fa4dd5222ad5acc4445f63fda3043358b2b7f59f0b812ec62c22f8f8911c1e9b7fd86ed601c481c75b188fe42c02844a5d31dadca56efc2bc96
 DIST coinor-vol-1.5.4.tar.gz 983625 BLAKE2B b1c78f94d1232d773aa325227ac01ad469d3ff56571119ae95ddb9a34eb7d55d004111e81dc89bb4bae1b5754da29cd4e93983772e158afa131a4da0b187b03c SHA512 ba489b909dab45a9a48a32804a571fc9ad966b268ce8a81a391a743b523bce393bd649aaf15c51f401267fe05fb2ff7623a1f7208c0b9d6c24af9b659a230780
-EBUILD coinor-vol-1.5.4.ebuild 2102 BLAKE2B 1c37d117d976ccd271cc10dba41cb163ee2913586e8c65b0ecfd3a4dfaf051ca5a7322eddec1e8390b9395d83e563e489162c4f9d3d4fe8be153ca1428ac3a66 SHA512 eb65860ba325fc7f4c65d7281556ef39deb0bd223761781fe05a0ff6a27c2ebed01366d5ff07440a5cc25a073246591b2da60c72c67888ec43ca8513844a2c47
+EBUILD coinor-vol-1.5.4.ebuild 2157 BLAKE2B cf81a7dc3e2d57d86b9690e8aec3b8cfeec1f19f986118fee989f60d394f063016fc29f0f77f3e399b316fd48d1136ff8f08d90b00da6c666a37f9a79b021ecb SHA512 4858ae612fed262c4ebeecb6507eaf5b360cd2642133dcdd501ea7b90246d832eb98ff5cc495ccb62d09c895f7b1e5ec6fc51403d54b0fe5a7c99953c6f0285c
 MISC metadata.xml 600 BLAKE2B 3921f277d3c92a1754802eebc64b75066da9c633e96e7dc5ece03a4554def9f1c59a4964440ed38e7cd97bebf68ebfac0adacc0081b10b45add2b3de0d47d0f0 SHA512 c61bdfbcf18560775ef5838a216fe1483e00dcaf9dc811ae8933e3394691e69bc9212ba1fb46cb71551fb8877f6dbaa2bbb1b9307aed6712066577f99559fc70
diff --git a/sci-libs/coinor-vol/coinor-vol-1.5.4.ebuild b/sci-libs/coinor-vol/coinor-vol-1.5.4.ebuild
index 53276b0f38c4..5ea2c976d627 100644
--- a/sci-libs/coinor-vol/coinor-vol-1.5.4.ebuild
+++ b/sci-libs/coinor-vol/coinor-vol-1.5.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -34,6 +34,10 @@ RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${MY_PN}-releases-${PV}/${MY_PN}"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-musl-1.2.3-null.patch
+)
+
 src_prepare() {
 	# Needed to make the --with-coin-instdir in src_configure happy.
 	dodir /usr
diff --git a/sci-libs/coinor-vol/files/coinor-vol-1.5.4-musl-1.2.3-null.patch b/sci-libs/coinor-vol/files/coinor-vol-1.5.4-musl-1.2.3-null.patch
new file mode 100644
index 000000000000..96a154740ed4
--- /dev/null
+++ b/sci-libs/coinor-vol/files/coinor-vol-1.5.4-musl-1.2.3-null.patch
@@ -0,0 +1,24 @@
+https://bugs.gentoo.org/841746
+https://github.com/coin-or/Vol/commit/7b65983cfbf66f9a615c1babcc28a7cd87eee3c4
+
+From: Stefan Vigerske <svigerske@gams.com>
+Date: Sat, 1 Feb 2020 17:45:41 +0000
+Subject: [PATCH] there should be no need to cast NULL, closes #1
+
+--- a/src/OsiVol/OsiVolSolverInterfaceIO.cpp
++++ b/src/OsiVol/OsiVolSolverInterfaceIO.cpp
+@@ -423,10 +423,10 @@ OsiVolSolverInterface::writeMps(const char *filename,
+    writer.setMpsData(*getMatrixByCol(), getInfinity(),
+ 		     getColLower(), getColUpper(),
+ 		     getObjCoefficients(), 
+-		     reinterpret_cast<const char *> (NULL) /*integrality*/,
++		     NULL /*integrality*/,
+ 		     getRowLower(), getRowUpper(),
+-		     reinterpret_cast<const char **> (NULL) /*colnam*/, 
+-		     reinterpret_cast<const char **> (NULL) /*rownam*/);
++		     NULL /*colnam*/, 
++		     NULL /*rownam*/);
+    std::string fname = filename;
+    if (extension)
+    { if (extension[0] != '\0' && extension[0] != '.')
+
diff --git a/sci-libs/dlib/Manifest b/sci-libs/dlib/Manifest
index 95128cb3f2cf..84b432a4936b 100644
--- a/sci-libs/dlib/Manifest
+++ b/sci-libs/dlib/Manifest
@@ -1,5 +1,5 @@
 DIST dlib-19.22.tar.gz 10796236 BLAKE2B 5ca840536f61b38557d39ff6c24d9727f7c494e032d5abf912ccf83f724ecad61ce241126478eeed8b14e33b994af4065b1cfaf17a3b29cfa0dafc236e4c2a06 SHA512 49af41460de9aa270e47ee1d158231e87ffdbbf56ca29a3382dd896fcf81ef04729e59bd9c26eac63fb088cefce651149e5cdb0ffed73bfd6b05127887114d94
 DIST dlib-19.24.tar.gz 10863367 BLAKE2B eda85c6ec38fcf212754aae2cdb68539425028735b5148a2f6668ac19f2583129585a7101b74fe202fbfa3d3d2f09e533805a82f8291540919a7eb11483812e8 SHA512 f6ef2fec0977782cdcc15c6340bd91e3471294332de391405f14d86e9fd0cfcc8195fbf5b702f8d269a90b06db23a8134d112ed3fcfb780ff0433d988c41d199
 EBUILD dlib-19.22.ebuild 2408 BLAKE2B ea18c8f137dc925a5fdffbd728c346906bfccb703d597df09bd08cca29d1c655b3897a71557015336c4edfc2ea4bedc65f8c5134007df0ee7871d7a854eb3a67 SHA512 c7cedc466f3ac4af898c797f328c6c095d548c93f1c45be39c55bf326bb783317bbb3fd83bb57f11caae0ac1c51011fa16f0bb3b04a2ae9fe4b4b82313a2dcf9
-EBUILD dlib-19.24.ebuild 2481 BLAKE2B 7811fd1827cb80fa46cf92b4d4e13ebb07d60ae7032b0724aba22f217357b305c8fe1ab4e4b3d72ea23ef66266580fe3702dbdf92ab9de49d6b0b34d6ee460af SHA512 658edfbb9bf1efb2da17a92e91c4c601a69a7078d2754d824e8c4332ea90bd140daa8b7ba185d73f66cd31da59d1feee1ed2ff55ac8e8a13acbb88c48d3cbc35
+EBUILD dlib-19.24.ebuild 2513 BLAKE2B 8faf0274b9ef05963a34b12c2bd47fdf89999d0af7cde697ad671b5de39b565a0b23ca555c1824575781e6bd2cf9fe2cbe8e55673e74ecc14e67ec5ab768b342 SHA512 d3934515077f1d3810bf7dbec5c37b480c615ce24075ef0048c3076eeaf1122d32f1d241620f77231c2fc6c508bb074b9bf886055e639a77298060b3c8eb7b6a
 MISC metadata.xml 1003 BLAKE2B 3c4e623c6abbd4d1ec8a9402009b2d01e6edb547bfd24f03c27853d0386170833553feecc7b0f6b751a3ad4e52f0575a4a87fbcf801a0952fc3d4e5c77645a43 SHA512 2c59cabd74e9433b9b31b96d1f476c2c9200cce51960c09de5ebd7aabbfe4cff1f4449a6a9ecaaf1907f58dd12c04039a9f58f69f2d036bc18bf82b4438cbc01
diff --git a/sci-libs/dlib/dlib-19.24.ebuild b/sci-libs/dlib/dlib-19.24.ebuild
index 961c180ef7c2..7390b5b72a3d 100644
--- a/sci-libs/dlib/dlib-19.24.ebuild
+++ b/sci-libs/dlib/dlib-19.24.ebuild
@@ -32,10 +32,15 @@ RDEPEND="
 	sqlite? ( dev-db/sqlite:3 )
 	X? ( x11-libs/libX11 )"
 DEPEND="${RDEPEND}"
-BDEPEND="python? ( test? (
-	dev-python/pytest[${PYTHON_USEDEP}]
-	dev-python/pip[${PYTHON_USEDEP}]
-) )"
+BDEPEND="
+	python? (
+		${DISTUTILS_DEPS}
+		test? (
+			dev-python/pytest[${PYTHON_USEDEP}]
+			dev-python/pip[${PYTHON_USEDEP}]
+		)
+	)
+"
 
 DOCS=( docs/README.txt )