From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1C17C15800A for ; Tue, 22 Aug 2023 11:10:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5CB112BC016; Tue, 22 Aug 2023 11:10:50 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 40D2D2BC016 for ; Tue, 22 Aug 2023 11:10:50 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 35EBF3411F8 for ; Tue, 22 Aug 2023 11:10:49 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6B0EBFCC for ; Tue, 22 Aug 2023 11:10:47 +0000 (UTC) From: "Marek Szuba" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Marek Szuba" Message-ID: <1692702568.c7c10e597da1219b2350f3dd5118efe1cc1a26ac.marecki@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-misc/ola/files/, app-misc/ola/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-misc/ola/files/ola-0.10.9-protobuf_versioning.patch app-misc/ola/ola-0.10.9-r1.ebuild app-misc/ola/ola-0.10.9-r2.ebuild X-VCS-Directories: app-misc/ola/files/ app-misc/ola/ X-VCS-Committer: marecki X-VCS-Committer-Name: Marek Szuba X-VCS-Revision: c7c10e597da1219b2350f3dd5118efe1cc1a26ac X-VCS-Branch: master Date: Tue, 22 Aug 2023 11:10:47 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 3b31a5de-e1a0-4e0d-bd61-6d706c7fedb1 X-Archives-Hash: 8d964aa17a71f92c40ee350267af300a commit: c7c10e597da1219b2350f3dd5118efe1cc1a26ac Author: Marek Szuba gentoo org> AuthorDate: Tue Aug 22 11:09:28 2023 +0000 Commit: Marek Szuba gentoo org> CommitDate: Tue Aug 22 11:09:28 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7c10e59 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 gentoo.org> .../ola/files/ola-0.10.9-protobuf_versioning.patch | 42 ---------------------- .../{ola-0.10.9-r2.ebuild => ola-0.10.9-r1.ebuild} | 3 +- 2 files changed, 1 insertion(+), 44 deletions(-) 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 -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 -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-r2.ebuild b/app-misc/ola/ola-0.10.9-r1.ebuild similarity index 96% rename from app-misc/ola/ola-0.10.9-r2.ebuild rename to app-misc/ola/ola-0.10.9-r1.ebuild index 968caddebd07..c2e2066ba149 100644 --- a/app-misc/ola/ola-0.10.9-r2.ebuild +++ b/app-misc/ola/ola-0.10.9-r1.ebuild @@ -22,7 +22,7 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) RESTRICT="!test? ( test )" -RDEPEND="dev-libs/protobuf:= +RDEPEND="