From 1f0073bc8f2f069654da9f688f0f15c8eae34102 Mon Sep 17 00:00:00 2001
From: Marek Szuba <marecki@gentoo.org>
Date: Tue, 5 Mar 2024 14:56:13 +0000
Subject: app-misc/ola: RDEPEND on <dev-libs/protobuf-22.5

Turns out that version also uses the new versioning scheme.

Bug: https://bugs.gentoo.org/923757
Signed-off-by: Marek Szuba <marecki@gentoo.org>
---
 app-misc/ola/ola-0.10.9-r1.ebuild | 115 --------------------------------------
 app-misc/ola/ola-0.10.9-r2.ebuild | 114 +++++++++++++++++++++++++++++++++++++
 2 files changed, 114 insertions(+), 115 deletions(-)
 delete mode 100644 app-misc/ola/ola-0.10.9-r1.ebuild
 create mode 100644 app-misc/ola/ola-0.10.9-r2.ebuild

diff --git a/app-misc/ola/ola-0.10.9-r1.ebuild b/app-misc/ola/ola-0.10.9-r1.ebuild
deleted file mode 100644
index 3fba6f5383fb..000000000000
--- a/app-misc/ola/ola-0.10.9-r1.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# py3.12 blocked by protobuf-python
-PYTHON_COMPAT=( python3_{10..11} )
-
-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-23:=
-	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="app-alternatives/yacc
-	app-alternatives/lex
-	virtual/pkgconfig
-	doc? (
-		app-text/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.9-nullptr.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-r2.ebuild b/app-misc/ola/ola-0.10.9-r2.ebuild
new file mode 100644
index 000000000000..38c75abc6bd5
--- /dev/null
+++ b/app-misc/ola/ola-0.10.9-r2.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..11} )
+
+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-22.5:=
+	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="app-alternatives/yacc
+	app-alternatives/lex
+	virtual/pkgconfig
+	doc? (
+		app-text/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.9-nullptr.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
+}
-- 
cgit v1.2.3-65-gdbad