From c7c10e597da1219b2350f3dd5118efe1cc1a26ac Mon Sep 17 00:00:00 2001
From: Marek Szuba <marecki@gentoo.org>
Date: Tue, 22 Aug 2023 12:09:28 +0100
Subject: Revert "app-misc/ola: let configure handle >=dev-libs/protobuf-23
 version scheme"

Either the patch fucks something else up or more work is needed.
Full revert rather than another revbump because with CI having spotted
the issue so quickly, it hasn't been propagated to the user repo yet.

This reverts commit 8ec0c08491c69b89eeed62918be5a4badea1f6d2.

Signed-off-by: Marek Szuba <marecki@gentoo.org>
---
 .../ola/files/ola-0.10.9-protobuf_versioning.patch |  42 --------
 app-misc/ola/ola-0.10.9-r1.ebuild                  | 115 ++++++++++++++++++++
 app-misc/ola/ola-0.10.9-r2.ebuild                  | 116 ---------------------
 3 files changed, 115 insertions(+), 158 deletions(-)
 delete mode 100644 app-misc/ola/files/ola-0.10.9-protobuf_versioning.patch
 create mode 100644 app-misc/ola/ola-0.10.9-r1.ebuild
 delete mode 100644 app-misc/ola/ola-0.10.9-r2.ebuild

diff --git a/app-misc/ola/files/ola-0.10.9-protobuf_versioning.patch b/app-misc/ola/files/ola-0.10.9-protobuf_versioning.patch
deleted file mode 100644
index 835568e2d603..000000000000
--- a/app-misc/ola/files/ola-0.10.9-protobuf_versioning.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From d4414feefd95adf9c91d7eaf1e94380296c35f7a Mon Sep 17 00:00:00 2001
-From: Peter Newman <peternewman@users.noreply.github.com>
-Date: Fri, 7 Jul 2023 15:57:35 +0100
-Subject: [PATCH 1/2] Fix protoc version checking, since v20.x (cherry picked
- from commit 2e55aa88756718d8ab4a4c8fde97d620542c2c98)
-
---- a/config/ola.m4
-+++ b/config/ola.m4
-@@ -44,7 +44,14 @@ if test -z "$PROTOC" ; then
-   AC_MSG_ERROR([cannot find 'protoc' program]);
- elif test -n "$1" ; then
-   AC_MSG_CHECKING([protoc version])
--  [protoc_version=`$PROTOC --version 2>&1 | grep 'libprotoc' | sed 's/.*\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*/\1/g'`]
-+  # Since v20.x we only get effectively the minor and patch versions out of protoc.
-+  # Treat them as major and minor and everything should keep working indefinitely.
-+  # See https://protobuf.dev/support/version-support/
-+  # So we've got either of these:
-+  # libprotoc 2.4.1
-+  # libprotoc 23.3
-+  # The first sed ensures all versions have major, minor, patch, by adding a .0 on the end of ones missing it
-+  [protoc_version=`$PROTOC --version 2>&1 | grep 'libprotoc' | sed 's/\([^\.0-9][0-9][0-9]*\.[0-9][0-9]*\)$/\1\.0/g' | sed 's/.*\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*/\1/g'`]
-   [required=$1]
-   [required_major=`echo $required | sed 's/[^0-9].*//'`]
-   [required_minor=`echo $required | sed 's/[0-9][0-9]*\.\([0-9][0-9]*\)\.[0-9][0-9]*/\1/'`]
-
-From 546d9ee8d970c4e5b33d9d28b4acf6eb34f27a5d Mon Sep 17 00:00:00 2001
-From: Peter Newman <peternewman@users.noreply.github.com>
-Date: Fri, 7 Jul 2023 16:14:21 +0100
-Subject: [PATCH 2/2] Protoc check - correctly match multi-digit major versions
- (cherry picked from commit 69a2946622cdfce54cb6ed7f2210df2be0ec5576)
-
---- a/config/ola.m4
-+++ b/config/ola.m4
-@@ -51,7 +51,7 @@ elif test -n "$1" ; then
-   # libprotoc 2.4.1
-   # libprotoc 23.3
-   # The first sed ensures all versions have major, minor, patch, by adding a .0 on the end of ones missing it
--  [protoc_version=`$PROTOC --version 2>&1 | grep 'libprotoc' | sed 's/\([^\.0-9][0-9][0-9]*\.[0-9][0-9]*\)$/\1\.0/g' | sed 's/.*\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*/\1/g'`]
-+  [protoc_version=`$PROTOC --version 2>&1 | grep 'libprotoc' | sed 's/\([^\.0-9][0-9][0-9]*\.[0-9][0-9]*\)$/\1\.0/g' | sed 's/[^0-9]*\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*/\1/g'`]
-   [required=$1]
-   [required_major=`echo $required | sed 's/[^0-9].*//'`]
-   [required_minor=`echo $required | sed 's/[0-9][0-9]*\.\([0-9][0-9]*\)\.[0-9][0-9]*/\1/'`]
diff --git a/app-misc/ola/ola-0.10.9-r1.ebuild b/app-misc/ola/ola-0.10.9-r1.ebuild
new file mode 100644
index 000000000000..c2e2066ba149
--- /dev/null
+++ b/app-misc/ola/ola-0.10.9-r1.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2023 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="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.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
deleted file mode 100644
index 968caddebd07..000000000000
--- a/app-misc/ola/ola-0.10.9-r2.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2023 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:=
-	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.9-nullptr.patch
-	"${FILESDIR}"/${PN}-0.10.9-protobuf_versioning.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