gentoo auto-resync : 21:08:2023 - 21:44:47

5 files changed, 222 insertions, 150 deletions

diff --git a/app-misc/ola/Manifest b/app-misc/ola/Manifest
index 163ca9e8b563..dbe7560b9da9 100644
--- a/app-misc/ola/Manifest
+++ b/app-misc/ola/Manifest
@@ -1,6 +1,4 @@
-AUX ola-0.10.8-python_version_check.patch 953 BLAKE2B 6cc60d99a8f6c709e335c291fce0a887eb9aad94325887f8561699b4e1a8310ae82b15f9c21da530cc860375cf1c2fa6965c090bd4d57b09cf7ba0168ecc30c0 SHA512 fc979e59bc3ca60a52df1e8dec115477b26de91cd18bc762d27f5f8e2859bfb5c82889975523cc15f722932fab525ca19b39b56f4b03728310e5fda7dfefe6be
-DIST ola-0.10.8.tar.gz 2552023 BLAKE2B b4fa7e36e2b907e8f0ea16ef089607fc223afc543752a03740fd1d525062ea676d2f392bb623804543827d6f5ac6078c469a3edcb4321bca9a454b1c219f9c89 SHA512 78ef8cc7f8e8d0b1d15bbb305d99a589fce82e07e89ca3bf2466bef8cdc1b18f590fc8dcbf29fc5af2349e0721c832f525fd665d62498907554ee742d79cd3d2
+AUX ola-0.10.9-nullptr.patch 7412 BLAKE2B f03facd9b48493a47d35744d33edab8fbae87e0440053cd7f1610af40fae1a4d56b6a20beb2b3ca8b4fb64d023795ca9e12fd8149d69a150bc105f9978eaddbb SHA512 669ab2bab44cbab87f8c99f92799faa1422a0d0aaeb7da3c8b2dcdb71f47515e93f773b8fab372c66aa47a23797fce0725722ca25354e868ae2926510282058d
 DIST ola-0.10.9.tar.gz 2578760 BLAKE2B 8cace370b21788d0fe65e56d33fdc9436a5103837d370e3e7e07b43318d4ec3b29536b55c4b117f515a4698ebab88f58718759a0cf9a00f79d0b839e7a79d581 SHA512 e8e2f4249d6e1f63f6c36ae548d9e3a82080f0da82829f923ba6b4d63685fb89f9baccf4588fd6fcbf756708d91e27d022c0d623e7c03c84ec058e7dc7c46bdf
-EBUILD ola-0.10.8.ebuild 2430 BLAKE2B add36a82646cd0af033362efc14d0094ae293b8226a203c8f57eb5973034273bd3844d0b842681e947f4da9d7735859c86ccd1b941671cd39124583d8622c80a SHA512 9117910d63f198cda703fb35f5056ce197c0a610c7207e13f10fef5783ed988edacac9d8c30321156b593212537c55e910f8432bc1f254726667505ffb877436
-EBUILD ola-0.10.9.ebuild 2362 BLAKE2B a450424f36da44e80cf1649dcd970579515181868f853d34f9e9aa739e8d5cba8cb400055248886751fd2911747727704b413c11698d74cd5b79f3295944af4f SHA512 309d9acdb834e88d877f381cef6c1cb8ab9b366c031f63a3d5b8da076bbe7022020a9fa0f2a5e883f083459c07ccf2e24ffbadea0b31dac3ed3cd782707eea5f
+EBUILD ola-0.10.9.ebuild 2454 BLAKE2B 57ea1353e7e7d8568a11e306da5029b8c1479b27617f05545354dc3a943317ce65659d691db02d21a7f2e0df8c6b9438e32eb96ffae6baff60cb80cb316a9a47 SHA512 ed11a2149b0492a52722d24217e5f2ca15cbdc8488775f129b3a1199022e9d65b97e0b0de28e6a79651c520d276c9266a45c14892264139c557ba9672791fcfc
 MISC metadata.xml 1012 BLAKE2B 181177e538c6cdc37b3ba630b3bd3cffd1701e4f674cd51c6032c3b0367c11a0090482055328961e150203f47a1662597e2d0164c65c12662ce3ae2407db5a98 SHA512 01e6e96741b65a895229e7626e6fbfc51132d7b841c597933ea7055c302369264d014da1ff9c9bbad014c1cb812bb43d120a1d40c473c40eef6353ed4bfafc11
diff --git a/app-misc/ola/files/ola-0.10.8-python_version_check.patch b/app-misc/ola/files/ola-0.10.8-python_version_check.patch
deleted file mode 100644
index a4a82f916fa0..000000000000
--- a/app-misc/ola/files/ola-0.10.8-python_version_check.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- a/python/ola/OlaClient.py
-+++ b/python/ola/OlaClient.py
-@@ -952,7 +952,7 @@
-     controller = SimpleRpcController()
-     request = Ola_pb2.DmxData()
-     request.universe = universe
--    if sys.version >= '3.2':
-+    if sys.version_info[:3] >= (3,2):
-       request.data = data.tobytes()
-     else:
-       request.data = data.tostring()
---- a/python/ola/PidStore.py
-+++ b/python/ola/PidStore.py
-@@ -645,7 +645,7 @@
-                                 (self.name, self.min))
- 
-     try:
--      if sys.version >= '3.2':
-+      if sys.version_info[:3] >= (3,2):
-         data = struct.unpack('%ds' % arg_size, bytes(arg, 'utf8'))
-       else:
-         data = struct.unpack('%ds' % arg_size, arg)
-@@ -668,7 +668,7 @@
-     except struct.error as e:
-       raise UnpackException(e)
- 
--    if sys.version >= '3.2':
-+    if sys.version_info[:3] >= (3,2):
-       return value[0].rstrip(b'\x00').decode('utf-8')
-     else:
-       return value[0].rstrip(b'\x00')
diff --git a/app-misc/ola/files/ola-0.10.9-nullptr.patch b/app-misc/ola/files/ola-0.10.9-nullptr.patch
new file mode 100644
index 000000000000..d0efb84dce8d
--- /dev/null
+++ b/app-misc/ola/files/ola-0.10.9-nullptr.patch
@@ -0,0 +1,214 @@
+--- a/common/web/JsonTest.cpp
++++ b/common/web/JsonTest.cpp
+@@ -560,7 +560,7 @@
+ #ifdef __FreeBSD__
+   OLA_ASSERT_EQ(reinterpret_cast<JsonValue*>(0),
+ #else
+-  OLA_ASSERT_EQ(reinterpret_cast<JsonValue*>(NULL),
++  OLA_ASSERT_EQ(static_cast<JsonValue*>(NULL),
+ #endif  // __FreeBSD__
+                 string1.LookupElement(invalid_pointer));
+ 
+@@ -580,7 +580,7 @@
+ #ifdef __FreeBSD__
+   OLA_ASSERT_EQ(reinterpret_cast<JsonValue*>(0),
+ #else
+-  OLA_ASSERT_EQ(reinterpret_cast<JsonValue*>(NULL),
++  OLA_ASSERT_EQ(static_cast<JsonValue*>(NULL),
+ #endif  // __FreeBSD__
+                 object.LookupElement(invalid_pointer));
+ 
+@@ -605,7 +605,7 @@
+ #ifdef __FreeBSD__
+   OLA_ASSERT_EQ(reinterpret_cast<JsonValue*>(0),
+ #else
+-  OLA_ASSERT_EQ(reinterpret_cast<JsonValue*>(NULL),
++  OLA_ASSERT_EQ(static_cast<JsonValue*>(NULL),
+ #endif  // __FreeBSD__
+                 array->LookupElement(invalid_pointer));
+ 
+@@ -619,14 +619,14 @@
+ #ifdef __FreeBSD__
+   OLA_ASSERT_EQ(reinterpret_cast<JsonValue*>(0),
+ #else
+-  OLA_ASSERT_EQ(reinterpret_cast<JsonValue*>(NULL),
++  OLA_ASSERT_EQ(static_cast<JsonValue*>(NULL),
+ #endif  // __FreeBSD__
+                 array->LookupElement(one_past_last));
+ 
+ #ifdef __FreeBSD__
+   OLA_ASSERT_EQ(reinterpret_cast<JsonValue*>(0),
+ #else
+-  OLA_ASSERT_EQ(reinterpret_cast<JsonValue*>(NULL),
++  OLA_ASSERT_EQ(static_cast<JsonValue*>(NULL),
+ #endif  // __FreeBSD__
+                 array->LookupElement(invalid));
+ 
+--- a/ola/AutoStart.cpp
++++ b/ola/AutoStart.cpp
+@@ -113,7 +113,7 @@
+ #ifdef __FreeBSD__
+            reinterpret_cast<char*>(0));
+ #else
+-           reinterpret_cast<char*>(NULL));
++           static_cast<char*>(NULL));
+ #endif  // __FreeBSD__
+     OLA_WARN << "Failed to exec: " << strerror(errno);
+     _exit(1);
+--- a/olad/plugin_api/UniverseTest.cpp
++++ b/olad/plugin_api/UniverseTest.cpp
+@@ -635,7 +635,7 @@
+ #ifdef __FreeBSD__
+                         reinterpret_cast<const RDMResponse*>(0)));
+ #else
+-                        reinterpret_cast<const RDMResponse*>(NULL)));
++                        static_cast<const RDMResponse*>(NULL)));
+ #endif  // __FreeBSD__
+ 
+   // ok, now try something that returns a response from the port
+@@ -661,7 +661,7 @@
+ #ifdef __FreeBSD__
+                         reinterpret_cast<const RDMResponse*>(0)));
+ #else
+-                        reinterpret_cast<const RDMResponse*>(NULL)));
++                        static_cast<const RDMResponse*>(NULL)));
+ #endif  // __FreeBSD__
+ 
+   // now try a broadcast fan out
+@@ -694,7 +694,7 @@
+ #ifdef __FreeBSD__
+                         reinterpret_cast<const RDMResponse*>(0)));
+ #else
+-                        reinterpret_cast<const RDMResponse*>(NULL)));
++                        static_cast<const RDMResponse*>(NULL)));
+ #endif  // __FreeBSD__
+ 
+   // now confirm that if one of the ports fails to send, we see this response
+@@ -722,7 +722,7 @@
+ #ifdef __FreeBSD__
+                         reinterpret_cast<const RDMResponse*>(0)));
+ #else
+-                        reinterpret_cast<const RDMResponse*>(NULL)));
++                        static_cast<const RDMResponse*>(NULL)));
+ #endif  // __FreeBSD__
+ 
+   // DUB responses are slightly different
+@@ -746,7 +746,7 @@
+ #ifdef __FreeBSD__
+                         reinterpret_cast<const RDMResponse*>(0)));
+ #else
+-                        reinterpret_cast<const RDMResponse*>(NULL)));
++                        static_cast<const RDMResponse*>(NULL)));
+ #endif  // __FreeBSD__
+ 
+   // now check that we still get a RDM_DUB_RESPONSE even if one port returns an
+@@ -767,7 +767,7 @@
+ #ifdef __FreeBSD__
+                         reinterpret_cast<const RDMResponse*>(0)));
+ #else
+-                        reinterpret_cast<const RDMResponse*>(NULL)));
++                        static_cast<const RDMResponse*>(NULL)));
+ #endif  // __FreeBSD__
+ 
+   // and the same again but the second port returns
+@@ -788,7 +788,7 @@
+ #ifdef __FreeBSD__
+                         reinterpret_cast<const RDMResponse*>(0)));
+ #else
+-                        reinterpret_cast<const RDMResponse*>(NULL)));
++                        static_cast<const RDMResponse*>(NULL)));
+ #endif  // __FreeBSD__
+ 
+   // now the first port returns a RDM_TIMEOUT
+@@ -808,7 +808,7 @@
+ #ifdef __FreeBSD__
+                         reinterpret_cast<const RDMResponse*>(0)));
+ #else
+-                        reinterpret_cast<const RDMResponse*>(NULL)));
++                        static_cast<const RDMResponse*>(NULL)));
+ #endif  // __FreeBSD__
+ 
+   // finally if neither ports support the DUB, we should return that
+@@ -828,7 +828,7 @@
+ #ifdef __FreeBSD__
+                         reinterpret_cast<const RDMResponse*>(0)));
+ #else
+-                        reinterpret_cast<const RDMResponse*>(NULL)));
++                        static_cast<const RDMResponse*>(NULL)));
+ #endif  // __FreeBSD__
+ 
+   universe->RemovePort(&port1);
+--- a/plugins/spi/SPIOutputTest.cpp
++++ b/plugins/spi/SPIOutputTest.cpp
+@@ -160,7 +160,7 @@
+   OLA_ASSERT_EQ(5u, backend.Writes(0));
+ 
+   // Check nothing changed on the other output.
+-  OLA_ASSERT_EQ(reinterpret_cast<const uint8_t*>(NULL),
++  OLA_ASSERT_EQ(static_cast<const uint8_t*>(NULL),
+                 backend.GetData(1, &length));
+   OLA_ASSERT_EQ(0u, backend.Writes(1));
+ }
+@@ -210,7 +210,7 @@
+   OLA_ASSERT_EQ(3u, backend.Writes(0));
+ 
+   // Check nothing changed on the other output.
+-  OLA_ASSERT_EQ(reinterpret_cast<const uint8_t*>(NULL),
++  OLA_ASSERT_EQ(static_cast<const uint8_t*>(NULL),
+                 backend.GetData(1, &length));
+   OLA_ASSERT_EQ(0u, backend.Writes(1));
+ }
+@@ -265,7 +265,7 @@
+   OLA_ASSERT_EQ(4u, backend.Writes(0));
+ 
+   // Check nothing changed on the other output.
+-  OLA_ASSERT_EQ(reinterpret_cast<const uint8_t*>(NULL),
++  OLA_ASSERT_EQ(static_cast<const uint8_t*>(NULL),
+                 backend.GetData(1, &length));
+   OLA_ASSERT_EQ(0u, backend.Writes(1));
+ }
+@@ -312,7 +312,7 @@
+   OLA_ASSERT_DATA_EQUALS(EXPECTED4, arraysize(EXPECTED4), data, length);
+ 
+   // Check nothing changed on the other output.
+-  OLA_ASSERT_EQ(reinterpret_cast<const uint8_t*>(NULL),
++  OLA_ASSERT_EQ(static_cast<const uint8_t*>(NULL),
+                 backend.GetData(1, &length));
+   OLA_ASSERT_EQ(0u, backend.Writes(1));
+ }
+@@ -371,7 +371,7 @@
+   OLA_ASSERT_EQ(4u, backend.Writes(0));
+ 
+   // Check nothing changed on the other output.
+-  OLA_ASSERT_EQ(reinterpret_cast<const uint8_t*>(NULL),
++  OLA_ASSERT_EQ(static_cast<const uint8_t*>(NULL),
+                 backend.GetData(1, &length));
+   OLA_ASSERT_EQ(0u, backend.Writes(1));
+ }
+@@ -421,7 +421,7 @@
+   OLA_ASSERT_DATA_EQUALS(EXPECTED4, arraysize(EXPECTED4), data, length);
+ 
+   // Check nothing changed on the other output.
+-  OLA_ASSERT_EQ(reinterpret_cast<const uint8_t*>(NULL),
++  OLA_ASSERT_EQ(static_cast<const uint8_t*>(NULL),
+                 backend.GetData(1, &length));
+   OLA_ASSERT_EQ(0u, backend.Writes(1));
+ }
+@@ -517,7 +517,7 @@
+ 
+   // test6
+   // Check nothing changed on the other output.
+-  OLA_ASSERT_EQ(reinterpret_cast<const uint8_t*>(NULL),
++  OLA_ASSERT_EQ(static_cast<const uint8_t*>(NULL),
+                 backend.GetData(1, &length));
+   OLA_ASSERT_EQ(0u, backend.Writes(1));
+ 
+@@ -707,7 +707,7 @@
+ 
+   // test6
+   // Check nothing changed on the other output.
+-  OLA_ASSERT_EQ(reinterpret_cast<const uint8_t*>(NULL),
++  OLA_ASSERT_EQ(static_cast<const uint8_t*>(NULL),
+                 backend.GetData(1, &length));
+   OLA_ASSERT_EQ(0u, backend.Writes(1));
+ 
diff --git a/app-misc/ola/ola-0.10.8.ebuild b/app-misc/ola/ola-0.10.8.ebuild
deleted file mode 100644
index 895c098489fe..000000000000
--- a/app-misc/ola/ola-0.10.8.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit autotools python-single-r1
-
-DESCRIPTION="Open Lighting Architecture, a framework for lighting control information"
-HOMEPAGE="https://www.openlighting.org/ola/"
-SRC_URI="https://github.com/OpenLightingProject/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc examples ftdi http osc python rdm-tests tcmalloc test usb zeroconf"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
-	rdm-tests? ( python )"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-libs/protobuf:=
-	sys-apps/util-linux
-	sys-libs/ncurses
-	ftdi? ( dev-embedded/libftdi:1 )
-	http? ( net-libs/libmicrohttpd:= )
-	osc? ( media-libs/liblo )
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-python/protobuf-python[${PYTHON_USEDEP}]
-		')
-	)
-	rdm-tests? (
-		$(python_gen_cond_dep '
-			dev-python/numpy[${PYTHON_USEDEP}]
-		')
-	)
-	tcmalloc? ( dev-util/google-perftools:= )
-	usb? ( virtual/libusb:1 )
-	zeroconf? ( net-dns/avahi )"
-DEPEND="${RDEPEND}
-	sys-kernel/linux-headers"
-BDEPEND="sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen
-		media-gfx/graphviz
-	)
-	test? (
-		dev-util/cppunit
-		python? (
-			${PYTHON_DEPS}
-			$(python_gen_cond_dep '
-				dev-python/numpy[${PYTHON_USEDEP}]
-				dev-python/protobuf-python[${PYTHON_USEDEP}]
-			')
-		)
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.10.8-python_version_check.patch
-)
-
-src_prepare() {
-	default
-	# Upstream recommends doing this even for tarball builds
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-fatal-warnings
-		--with-uucp-lock="/run"
-		$(use_enable doc doxygen-doc)
-		$(use_enable doc doxygen-dot)
-		$(use_enable examples)
-		$(use_enable ftdi libftdi)
-		$(use_enable http)
-		$(use_enable osc)
-		$(use_enable python python-libs)
-		$(use_enable rdm-tests)
-		$(use_enable tcmalloc)
-		$(use_enable test unittests)
-		$(use_enable usb libusb)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	default
-	use doc && emake doxygen-doc
-}
-
-src_install() {
-	default
-
-	find "${ED}" -name '*.la' -delete || die
-
-	if use doc; then
-		dodoc -r html
-		docompress -x /usr/share/doc/${PF}/html
-	fi
-
-	if use examples && use python; then
-		docinto examples
-		python_fix_shebang python/examples/*.py
-		dodoc python/examples/*.py
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/app-misc/ola/ola-0.10.9.ebuild b/app-misc/ola/ola-0.10.9.ebuild
index 5cdbca6899a9..2ee3011b7098 100644
--- a/app-misc/ola/ola-0.10.9.ebuild
+++ b/app-misc/ola/ola-0.10.9.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+# py3.12 blocked by protobuf-python
+PYTHON_COMPAT=( python3_{10..11} )
 
 inherit autotools python-single-r1
 
@@ -61,6 +62,10 @@ BDEPEND="sys-devel/bison
 		)
 	)"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.10.9-nullptr.patch
+)
+
 src_prepare() {
 	default
 	# Upstream recommends doing this even for tarball builds