gentoo auto-resync : 04:10:2022 - 19:18:10

4 files changed, 90 insertions, 4 deletions

diff --git a/app-misc/ola/Manifest b/app-misc/ola/Manifest
index 7d2a353ccc0a..d9c3fb303e86 100644
--- a/app-misc/ola/Manifest
+++ b/app-misc/ola/Manifest
@@ -1,3 +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
-EBUILD ola-0.10.8.ebuild 1371 BLAKE2B d0d0fe64dd2eca39317fb0415e295d8be5e162341b6c59d91657d5bc28f833baca25a9e8b978e9f7b4633bce21373d6ec2e5ec1b319ebf5455a939321f205893 SHA512 97f4f7a53d8fab7802183028f25ee427e26dfc1bf29eefbf673c70fd8ec3e3f8109a72f0e24273881fb51ae0f3e5572c11d2a9c2ff72452151139fd7bdac6733
-MISC metadata.xml 952 BLAKE2B 0cb2bf271a0392eb3117877a478c36e578cd0b05de41d7a60e42b3cefeeea746086d03aad4c2a8301665873dc0587befd56eaa18f37c237607f6c6de68892f0a SHA512 1a1189401e06190e2b0925c01c45afd386cb5d376f25b188446f3d120dfe35641aabae90b4dc3ad559077f82786a1ea0e648239a05beb1e6fe02d54a0eee020e
+EBUILD ola-0.10.8.ebuild 2430 BLAKE2B 79106cc82591c21065c4544d06c4a6d6621efed2f1c8aa3105d851f86880d65d28c16d20c0cc242be8e2a3b3341e3b5027444c621b2fd0c6ec3f99e227d09804 SHA512 6cca8541e09c7b6d378bcf226f72325569de521f412a2c43d86f15b0c837049a01ef8a45b6572ae591abe0c40237f5575bde1b596d41cc22cce8615d8396a76b
+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
new file mode 100644
index 000000000000..a4a82f916fa0
--- /dev/null
+++ b/app-misc/ola/files/ola-0.10.8-python_version_check.patch
@@ -0,0 +1,31 @@
+--- 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/metadata.xml b/app-misc/ola/metadata.xml
index fe23c959e3e0..90cb6324410e 100644
--- a/app-misc/ola/metadata.xml
+++ b/app-misc/ola/metadata.xml
@@ -19,5 +19,6 @@
 	<use>
 		<flag name="ftdi">Support FTDI devices</flag>
 		<flag name="http">Enable built-in Web UI</flag>
+		<flag name="rdm-tests">Install RDM responder tests</flag>
 	</use>
 </pkgmetadata>
diff --git a/app-misc/ola/ola-0.10.8.ebuild b/app-misc/ola/ola-0.10.8.ebuild
index e9fa6752713f..e6aea949a42b 100644
--- a/app-misc/ola/ola-0.10.8.ebuild
+++ b/app-misc/ola/ola-0.10.8.ebuild
@@ -3,7 +3,9 @@
 
 EAPI=8
 
-inherit autotools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit autotools python-single-r1
 
 DESCRIPTION="Open Lighting Architecture, a framework for lighting control information"
 HOMEPAGE="https://www.openlighting.org/ola/"
@@ -12,7 +14,10 @@ SRC_URI="https://github.com/OpenLightingProject/${PN}/releases/download/${PV}/${
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="examples ftdi http osc tcmalloc test usb zeroconf"
+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 )"
 
@@ -22,6 +27,17 @@ RDEPEND="dev-libs/protobuf:=
 	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 )"
@@ -30,10 +46,25 @@ DEPEND="${RDEPEND}
 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
@@ -44,10 +75,14 @@ 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)
@@ -55,7 +90,25 @@ src_configure() {
 	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
 }