[gentoo-commits] repo/gentoo:master commit in: app-misc/ola/

2024-03-06 Thread Marek Szuba 
commit: 0edf264ece7a8d529d83bfddf9e0c5a4ca6f9a59
Author: Marek Szuba  gentoo  org>
AuthorDate: Wed Mar  6 15:53:47 2024 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Wed Mar  6 17:37:23 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0edf264e

app-misc/ola: enable py3.12

Signed-off-by: Marek Szuba  gentoo.org>

 app-misc/ola/ola-0.10.9-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-misc/ola/ola-0.10.9-r2.ebuild 
b/app-misc/ola/ola-0.10.9-r2.ebuild
index 38c75abc6bd5..a9d0c36ac512 100644
--- a/app-misc/ola/ola-0.10.9-r2.ebuild
+++ b/app-misc/ola/ola-0.10.9-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit autotools python-single-r1

[gentoo-commits] repo/gentoo:master commit in: app-misc/ola/

2024-03-05 Thread Marek Szuba 
commit: 1f0073bc8f2f069654da9f688f0f15c8eae34102
Author: Marek Szuba  gentoo  org>
AuthorDate: Tue Mar  5 14:56:13 2024 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Tue Mar  5 15:00:28 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f0073bc

app-misc/ola: RDEPEND on https://bugs.gentoo.org/923757
Signed-off-by: Marek Szuba  gentoo.org>

 app-misc/ola/{ola-0.10.9-r1.ebuild => ola-0.10.9-r2.ebuild} | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app-misc/ola/ola-0.10.9-r1.ebuild 
b/app-misc/ola/ola-0.10.9-r2.ebuild
similarity index 97%
rename from app-misc/ola/ola-0.10.9-r1.ebuild
rename to app-misc/ola/ola-0.10.9-r2.ebuild
index 3fba6f5383fb..38c75abc6bd5 100644
--- a/app-misc/ola/ola-0.10.9-r1.ebuild
+++ b/app-misc/ola/ola-0.10.9-r2.ebuild
@@ -3,7 +3,6 @@
 
 EAPI=8
 
-# py3.12 blocked by protobuf-python
 PYTHON_COMPAT=( python3_{10..11} )
 
 inherit autotools python-single-r1
@@ -22,7 +21,7 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
 
 RESTRICT="!test? ( test )"
 
-RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: app-misc/ola/files/, app-misc/ola/

2023-08-22 Thread Marek Szuba 
commit: c7c10e597da1219b2350f3dd5118efe1cc1a26ac
Author: Marek Szuba  gentoo  org>
AuthorDate: Tue Aug 22 11:09:28 2023 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Tue Aug 22 11:09:28 2023 +
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..
--- 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="

[gentoo-commits] repo/gentoo:master commit in: app-misc/ola/, app-misc/ola/files/

2023-08-22 Thread Marek Szuba 
commit: 8ec0c08491c69b89eeed62918be5a4badea1f6d2
Author: Marek Szuba  gentoo  org>
AuthorDate: Tue Aug 22 11:03:47 2023 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Tue Aug 22 11:03:47 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ec0c084

app-misc/ola: let configure handle >=dev-libs/protobuf-23 version scheme

>From an as-of-yet-unmerged upstream PR, with thanks to sam for having
located it.

Bug: https://bugs.gentoo.org/912779
Signed-off-by: Marek Szuba  gentoo.org>

 .../ola/files/ola-0.10.9-protobuf_versioning.patch | 42 ++
 .../{ola-0.10.9-r1.ebuild => ola-0.10.9-r2.ebuild} |  3 +-
 2 files changed, 44 insertions(+), 1 deletion(-)

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
new file mode 100644
index ..835568e2d603
--- /dev/null
+++ b/app-misc/ola/files/ola-0.10.9-protobuf_versioning.patch
@@ -0,0 +1,42 @@
+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-r1.ebuild 
b/app-misc/ola/ola-0.10.9-r2.ebuild
similarity index 96%
rename from app-misc/ola/ola-0.10.9-r1.ebuild
rename to app-misc/ola/ola-0.10.9-r2.ebuild
index c2e2066ba149..968caddebd07 100644
--- a/app-misc/ola/ola-0.10.9-r1.ebuild
+++ b/app-misc/ola/ola-0.10.9-r2.ebuild
@@ -22,7 +22,7 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
 
 RESTRICT="!test? ( test )"
 
-RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: app-misc/ola/

2023-08-21 Thread Marek Szuba 
commit: bcd9d776bcabb38130c4fe00d4e06913321ab6b4
Author: Marek Szuba  gentoo  org>
AuthorDate: Mon Aug 21 22:00:37 2023 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Mon Aug 21 22:02:51 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bcd9d776

app-misc/ola: require https://bugs.gentoo.org/912779
Signed-off-by: Marek Szuba  gentoo.org>

 app-misc/ola/{ola-0.10.9.ebuild => ola-0.10.9-r1.ebuild} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-misc/ola/ola-0.10.9.ebuild b/app-misc/ola/ola-0.10.9-r1.ebuild
similarity index 98%
rename from app-misc/ola/ola-0.10.9.ebuild
rename to app-misc/ola/ola-0.10.9-r1.ebuild
index 2ee3011b7098..c2e2066ba149 100644
--- a/app-misc/ola/ola-0.10.9.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="

[gentoo-commits] repo/gentoo:master commit in: app-misc/ola/, app-misc/ola/files/

2023-08-21 Thread Marek Szuba 
commit: c21efb2f184c2d4189a623d9dd2df088295eecfb
Author: Marek Szuba  gentoo  org>
AuthorDate: Mon Aug 21 17:49:40 2023 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Mon Aug 21 18:08:48 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c21efb2f

app-misc/ola: do not use reinterpret_cast on NULL

In C++, nullptr_t values generally cannot be converted to a pointer
using reinterpret_cast. I say "generally" because glibc apparently
lets it slide; musl on the other hand does not. Do it the proper way
and use static_cast instead.

Closes: https://bugs.gentoo.org/877319
Signed-off-by: Marek Szuba  gentoo.org>

 app-misc/ola/files/ola-0.10.9-nullptr.patch | 214 
 app-misc/ola/ola-0.10.9.ebuild  |   7 +-
 2 files changed, 220 insertions(+), 1 deletion(-)

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 ..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(0),
+ #else
+-  OLA_ASSERT_EQ(reinterpret_cast(NULL),
++  OLA_ASSERT_EQ(static_cast(NULL),
+ #endif  // __FreeBSD__
+ string1.LookupElement(invalid_pointer));
+ 
+@@ -580,7 +580,7 @@
+ #ifdef __FreeBSD__
+   OLA_ASSERT_EQ(reinterpret_cast(0),
+ #else
+-  OLA_ASSERT_EQ(reinterpret_cast(NULL),
++  OLA_ASSERT_EQ(static_cast(NULL),
+ #endif  // __FreeBSD__
+ object.LookupElement(invalid_pointer));
+ 
+@@ -605,7 +605,7 @@
+ #ifdef __FreeBSD__
+   OLA_ASSERT_EQ(reinterpret_cast(0),
+ #else
+-  OLA_ASSERT_EQ(reinterpret_cast(NULL),
++  OLA_ASSERT_EQ(static_cast(NULL),
+ #endif  // __FreeBSD__
+ array->LookupElement(invalid_pointer));
+ 
+@@ -619,14 +619,14 @@
+ #ifdef __FreeBSD__
+   OLA_ASSERT_EQ(reinterpret_cast(0),
+ #else
+-  OLA_ASSERT_EQ(reinterpret_cast(NULL),
++  OLA_ASSERT_EQ(static_cast(NULL),
+ #endif  // __FreeBSD__
+ array->LookupElement(one_past_last));
+ 
+ #ifdef __FreeBSD__
+   OLA_ASSERT_EQ(reinterpret_cast(0),
+ #else
+-  OLA_ASSERT_EQ(reinterpret_cast(NULL),
++  OLA_ASSERT_EQ(static_cast(NULL),
+ #endif  // __FreeBSD__
+ array->LookupElement(invalid));
+ 
+--- a/ola/AutoStart.cpp
 b/ola/AutoStart.cpp
+@@ -113,7 +113,7 @@
+ #ifdef __FreeBSD__
+reinterpret_cast(0));
+ #else
+-   reinterpret_cast(NULL));
++   static_cast(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(0)));
+ #else
+-reinterpret_cast(NULL)));
++static_cast(NULL)));
+ #endif  // __FreeBSD__
+ 
+   // ok, now try something that returns a response from the port
+@@ -661,7 +661,7 @@
+ #ifdef __FreeBSD__
+ reinterpret_cast(0)));
+ #else
+-reinterpret_cast(NULL)));
++static_cast(NULL)));
+ #endif  // __FreeBSD__
+ 
+   // now try a broadcast fan out
+@@ -694,7 +694,7 @@
+ #ifdef __FreeBSD__
+ reinterpret_cast(0)));
+ #else
+-reinterpret_cast(NULL)));
++static_cast(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(0)));
+ #else
+-reinterpret_cast(NULL)));
++static_cast(NULL)));
+ #endif  // __FreeBSD__
+ 
+   // DUB responses are slightly different
+@@ -746,7 +746,7 @@
+ #ifdef __FreeBSD__
+ reinterpret_cast(0)));
+ #else
+-reinterpret_cast(NULL)));
++static_cast(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(0)));
+ #else
+-reinterpret_cast(NULL)));
++static_cast(NULL)));
+ #endif  // __FreeBSD__
+ 
+   // and the same again but the second port returns
+@@ -788,7 +788,7 @@
+ #ifdef __FreeBSD__
+ reinterpret_cast(0)));
+ #else
+-reinterpret_cast(NULL)));
++static_cast(NULL)));
+ #endif  // __FreeBSD__
+ 
+   // now the first port returns a RDM_TIMEOUT
+@@ -808,7 +808,7 @@
+ #ifdef __FreeBSD__
+ reinterpret_cast(0)));
+ #else
+-reinterpret_cast(NULL)));
++static_cast(NULL)));
+ #endif  // __FreeBSD__
+ 
+   //

[gentoo-commits] repo/gentoo:master commit in: app-misc/ola/files/, app-misc/ola/

2023-08-21 Thread Marek Szuba 
commit: 48eec4ef55c88f2aff4367f313101199759fd024
Author: Marek Szuba  gentoo  org>
AuthorDate: Mon Aug 21 16:50:18 2023 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Mon Aug 21 18:08:46 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48eec4ef

app-misc/ola: drop 0.10.8

Signed-off-by: Marek Szuba  gentoo.org>

 app-misc/ola/Manifest  |   1 -
 .../files/ola-0.10.8-python_version_check.patch|  31 --
 app-misc/ola/ola-0.10.8.ebuild | 114 -
 3 files changed, 146 deletions(-)

diff --git a/app-misc/ola/Manifest b/app-misc/ola/Manifest
index c98814f9b31a..2f4d34ce54a6 100644
--- a/app-misc/ola/Manifest
+++ b/app-misc/ola/Manifest
@@ -1,2 +1 @@
-DIST ola-0.10.8.tar.gz 2552023 BLAKE2B 
b4fa7e36e2b907e8f0ea16ef089607fc223afc543752a03740fd1d525062ea676d2f392bb623804543827d6f5ac6078c469a3edcb4321bca9a454b1c219f9c89
 SHA512 
78ef8cc7f8e8d0b1d15bbb305d99a589fce82e07e89ca3bf2466bef8cdc1b18f590fc8dcbf29fc5af2349e0721c832f525fd665d62498907554ee742d79cd3d2
 DIST ola-0.10.9.tar.gz 2578760 BLAKE2B 
8cace370b21788d0fe65e56d33fdc9436a5103837d370e3e7e07b43318d4ec3b29536b55c4b117f515a4698ebab88f58718759a0cf9a00f79d0b839e7a79d581
 SHA512 
e8e2f4249d6e1f63f6c36ae548d9e3a82080f0da82829f923ba6b4d63685fb89f9baccf4588fd6fcbf756708d91e27d022c0d623e7c03c84ec058e7dc7c46bdf

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..
--- 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/ola-0.10.8.ebuild b/app-misc/ola/ola-0.10.8.ebuild
deleted file mode 100644
index 895c098489fe..
--- 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() {
-

[gentoo-commits] repo/gentoo:master commit in: app-misc/ola/

2023-02-26 Thread Marek Szuba 
commit: 72ba2fe5d4f79e637fdace7e0b3ff9559b682373
Author: Marek Szuba  gentoo  org>
AuthorDate: Sun Feb 26 22:02:25 2023 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Sun Feb 26 22:03:09 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72ba2fe5

app-misc/ola: add 0.10.9

Closes: https://bugs.gentoo.org/896592
Signed-off-by: Marek Szuba  gentoo.org>

 app-misc/ola/Manifest  |   1 +
 app-misc/ola/ola-0.10.9.ebuild | 110 +
 2 files changed, 111 insertions(+)

diff --git a/app-misc/ola/Manifest b/app-misc/ola/Manifest
index 8994df22e307..c98814f9b31a 100644
--- a/app-misc/ola/Manifest
+++ b/app-misc/ola/Manifest
@@ -1 +1,2 @@
 DIST ola-0.10.8.tar.gz 2552023 BLAKE2B 
b4fa7e36e2b907e8f0ea16ef089607fc223afc543752a03740fd1d525062ea676d2f392bb623804543827d6f5ac6078c469a3edcb4321bca9a454b1c219f9c89
 SHA512 
78ef8cc7f8e8d0b1d15bbb305d99a589fce82e07e89ca3bf2466bef8cdc1b18f590fc8dcbf29fc5af2349e0721c832f525fd665d62498907554ee742d79cd3d2
+DIST ola-0.10.9.tar.gz 2578760 BLAKE2B 
8cace370b21788d0fe65e56d33fdc9436a5103837d370e3e7e07b43318d4ec3b29536b55c4b117f515a4698ebab88f58718759a0cf9a00f79d0b839e7a79d581
 SHA512 
e8e2f4249d6e1f63f6c36ae548d9e3a82080f0da82829f923ba6b4d63685fb89f9baccf4588fd6fcbf756708d91e27d022c0d623e7c03c84ec058e7dc7c46bdf

diff --git a/app-misc/ola/ola-0.10.9.ebuild b/app-misc/ola/ola-0.10.9.ebuild
new file mode 100644
index ..5cdbca6899a9
--- /dev/null
+++ b/app-misc/ola/ola-0.10.9.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..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}]
+   ')
+   )
+   )"
+
+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
+}

[gentoo-commits] repo/gentoo:master commit in: app-misc/ola/files/, app-misc/ola/

2022-10-04 Thread Marek Szuba 
commit: 3a7fbdfb074e7482ca1ded2e5eafbb915f20fd99
Author: Marek Szuba  gentoo  org>
AuthorDate: Tue Oct  4 11:27:20 2022 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Tue Oct  4 12:50:20 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a7fbdfb

app-misc/ola: support installing Python bindings

Signed-off-by: Marek Szuba  gentoo.org>

 .../files/ola-0.10.8-python_version_check.patch| 31 
 app-misc/ola/metadata.xml  |  1 +
 app-misc/ola/ola-0.10.8.ebuild | 41 --
 3 files changed, 71 insertions(+), 2 deletions(-)

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 ..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 @@

Support FTDI devices
Enable built-in Web UI
+   Install RDM responder tests

 

diff --git a/app-misc/ola/ola-0.10.8.ebuild b/app-misc/ola/ola-0.10.8.ebuild
index e9fa6752713f..bcb9094e62e1 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="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 )"
@@ -32,8 +48,19 @@ BDEPEND="sys-devel/bison
virtual/pkgconfig
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
@@ -48,6 +75,8 @@ src_configure() {
$(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)
@@ -57,5 +86,13 @@ src_configure() {
 
 src_install() {
default
+
find "${ED}" -name '*.la' -delete || die
+
+   if use examples && use python; then
+   docinto examples
+   python_fix_shebang python/examples/*.py
+   dodoc python/examples/*.py
+

[gentoo-commits] repo/gentoo:master commit in: app-misc/ola/

2022-10-04 Thread Marek Szuba 
commit: 20a9034cb55abc59e788da1328aa13c3236c5f88
Author: Marek Szuba  gentoo  org>
AuthorDate: Tue Oct  4 12:17:54 2022 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Tue Oct  4 12:50:21 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20a9034c

app-misc/ola: instrument generation of HTML docs

Signed-off-by: Marek Szuba  gentoo.org>

 app-misc/ola/ola-0.10.8.ebuild | 18 +-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/app-misc/ola/ola-0.10.8.ebuild b/app-misc/ola/ola-0.10.8.ebuild
index bcb9094e62e1..e6aea949a42b 100644
--- a/app-misc/ola/ola-0.10.8.ebuild
+++ b/app-misc/ola/ola-0.10.8.ebuild
@@ -14,7 +14,7 @@ 
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 python rdm-tests 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 )"
@@ -46,6 +46,10 @@ DEPEND="${RDEPEND}
 BDEPEND="sys-devel/bison
sys-devel/flex
virtual/pkgconfig
+   doc? (
+   app-doc/doxygen
+   media-gfx/graphviz
+   )
test? (
dev-util/cppunit
python? (
@@ -71,6 +75,8 @@ 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)
@@ -84,11 +90,21 @@ 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

[gentoo-commits] repo/gentoo:master commit in: app-misc/ola/

2022-10-03 Thread Marek Szuba 
commit: a875aa576c8ac0578f63e5a24e190129dad2733b
Author: Marek Szuba  gentoo  org>
AuthorDate: Tue Oct  4 03:04:00 2022 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Tue Oct  4 03:13:03 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a875aa57

app-misc/ola: new package, add 0.10.8

Signed-off-by: Marek Szuba  gentoo.org>

 app-misc/ola/Manifest  |  1 +
 app-misc/ola/metadata.xml  | 23 
 app-misc/ola/ola-0.10.8.ebuild | 61 ++
 3 files changed, 85 insertions(+)

diff --git a/app-misc/ola/Manifest b/app-misc/ola/Manifest
new file mode 100644
index ..8994df22e307
--- /dev/null
+++ b/app-misc/ola/Manifest
@@ -0,0 +1 @@
+DIST ola-0.10.8.tar.gz 2552023 BLAKE2B 
b4fa7e36e2b907e8f0ea16ef089607fc223afc543752a03740fd1d525062ea676d2f392bb623804543827d6f5ac6078c469a3edcb4321bca9a454b1c219f9c89
 SHA512 
78ef8cc7f8e8d0b1d15bbb305d99a589fce82e07e89ca3bf2466bef8cdc1b18f590fc8dcbf29fc5af2349e0721c832f525fd665d62498907554ee742d79cd3d2

diff --git a/app-misc/ola/metadata.xml b/app-misc/ola/metadata.xml
new file mode 100644
index ..fe23c959e3e0
--- /dev/null
+++ b/app-misc/ola/metadata.xml
@@ -0,0 +1,23 @@
+
+https://www.gentoo.org/dtd/metadata.dtd;>
+
+   
+   mare...@gentoo.org
+   Marek Szuba
+   
+   
+   The Open Lighting Architecture is a framework for lighting 
control information.
+   It supports a range of protocols and over a dozen USB devices. 
It can run as a
+   standalone service, which is useful for converting signals 
between protocols,
+   or alternatively using the OLA API, it can be used as the 
backend for lighting
+   control software. OLA runs on many different platforms 
including ARM, which
+   makes it a perfect fit for low cost Ethernet to DMX gateways.
+   
+   
+   OpenLightingProject/ola
+   
+   
+   Support FTDI devices
+   Enable built-in Web UI
+   
+

diff --git a/app-misc/ola/ola-0.10.8.ebuild b/app-misc/ola/ola-0.10.8.ebuild
new file mode 100644
index ..e9fa6752713f
--- /dev/null
+++ b/app-misc/ola/ola-0.10.8.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+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="examples ftdi http osc tcmalloc test usb zeroconf"
+
+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 )
+   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
+   test? (
+   dev-util/cppunit
+   )"
+
+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 examples)
+   $(use_enable ftdi libftdi)
+   $(use_enable http)
+   $(use_enable osc)
+   $(use_enable tcmalloc)
+   $(use_enable test unittests)
+   $(use_enable usb libusb)
+   )
+   econf "${myeconfargs[@]}"
+}
+
+src_install() {
+   default
+   find "${ED}" -name '*.la' -delete || die
+}