subject:"\[gentoo\-commits\] repo\/gentoo\:master commit in\: sci\-libs\/libsigrok\/"

[gentoo-commits] repo/gentoo:master commit in: sci-libs/libsigrok/files/, sci-libs/libsigrok/

2023-06-10 Thread Sam James

commit: a09cf66a0d720125efdfd0f62643ba4be61545a7
Author: Sam James  gentoo  org>
AuthorDate: Sat Jun 10 21:32:32 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jun 10 21:32:37 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a09cf66a

sci-libs/libsigrok: fix build w/ swig-4.1

Closes: https://bugs.gentoo.org/878395
Signed-off-by: Sam James  gentoo.org>

 .../libsigrok/files/libsigrok-0.5.2-swig-4.1.patch |  11 ++
 sci-libs/libsigrok/libsigrok-0.5.2-r4.ebuild   | 156 +
 2 files changed, 167 insertions(+)

diff --git a/sci-libs/libsigrok/files/libsigrok-0.5.2-swig-4.1.patch 
b/sci-libs/libsigrok/files/libsigrok-0.5.2-swig-4.1.patch
new file mode 100644
index ..6513491270cf
--- /dev/null
+++ b/sci-libs/libsigrok/files/libsigrok-0.5.2-swig-4.1.patch
@@ -0,0 +1,11 @@
+https://bugs.gentoo.org/878395
+--- a/bindings/cxx/enums.py
 b/bindings/cxx/enums.py
+@@ -73,6 +73,8 @@
+ code = open(os.path.join(outdirname, 'cxx/enums.cpp'), 'w')
+ swig = open(os.path.join(outdirname, 'swig/enums.i'), 'w')
+ 
++print('%include "attribute.i" \n', file=swig)
++
+ for file in (header, code):
+ print("/* Generated file - edit enums.py instead! */", file=file)

diff --git a/sci-libs/libsigrok/libsigrok-0.5.2-r4.ebuild 
b/sci-libs/libsigrok/libsigrok-0.5.2-r4.ebuild
new file mode 100644
index ..8da4999fe538
--- /dev/null
+++ b/sci-libs/libsigrok/libsigrok-0.5.2-r4.ebuild
@@ -0,0 +1,156 @@
+# 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-r1 java-pkg-opt-2 udev xdg-utils
+
+if [[ ${PV} == ** ]]; then
+   EGIT_REPO_URI="git://sigrok.org/${PN}"
+   inherit git-r3
+else
+   SRC_URI="https://sigrok.org/download/source/${PN}/${P}.tar.gz;
+   KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+DESCRIPTION="Basic hardware drivers for logic analyzers and input/output file 
format support"
+HOMEPAGE="https://sigrok.org/wiki/Libsigrok;
+
+LICENSE="GPL-3"
+SLOT="0/4"
+IUSE="bluetooth +cxx ftdi hidapi java parport python serial static-libs test 
+udev usb"
+REQUIRED_USE="java? ( cxx )
+   python? ( cxx ${PYTHON_REQUIRED_USE} )"
+
+RESTRICT="!test? ( test )"
+
+# We also support librevisa, but that isn't in the tree ...
+LIB_DEPEND="
+   >=dev-libs/glib-2.32.0[static-libs(+)]
+   >=dev-libs/libzip-0.8:=[static-libs(+)]
+   bluetooth? ( >=net-wireless/bluez-4.0:= )
+   cxx? ( dev-cpp/glibmm:2[static-libs(+)] )
+   ftdi? ( dev-embedded/libftdi:1[static-libs(+)] )
+   hidapi? ( >=dev-libs/hidapi-0.8.0 )
+   parport? ( sys-libs/libieee1284[static-libs(+)] )
+   python? (
+   ${PYTHON_DEPS}
+   >=dev-python/pygobject-3.0.0[${PYTHON_USEDEP}]
+   )
+   serial? ( >=dev-libs/libserialport-0.1.1[static-libs(+)] )
+   usb? ( virtual/libusb:1[static-libs(+)] )
+"
+RDEPEND="
+   java? ( >=virtual/jre-1.8:* )
+   !static-libs? ( ${LIB_DEPEND//\[static-libs(+)]} )
+   static-libs? ( ${LIB_DEPEND} )
+"
+DEPEND="${LIB_DEPEND//\[static-libs(+)]}
+   cxx? ( app-doc/doxygen )
+   java? (
+   >=dev-lang/swig-3.0.6
+   >=virtual/jdk-1.8:*
+   )
+   python? (
+   >=dev-lang/swig-3.0.6
+   dev-python/numpy[${PYTHON_USEDEP}]
+   dev-python/setuptools[${PYTHON_USEDEP}]
+   )
+   test? ( >=dev-libs/check-0.9.4 )
+   virtual/pkgconfig
+"
+
+S="${WORKDIR}"/${P}
+
+PATCHES=(
+   # https://sigrok.org/bugzilla/show_bug.cgi?id=1527
+   "${FILESDIR}/${P}-swig-4.patch"
+   # https://sigrok.org/bugzilla/show_bug.cgi?id=1526
+   "${FILESDIR}/${P}-check-0.15.patch"
+   # https://bugs.gentoo.org/878395
+   "${FILESDIR}/${PN}-0.5.2-swig-4.1.patch"
+)
+
+pkg_setup() {
+   use python && python_setup
+   java-pkg-opt-2_pkg_setup
+}
+
+src_unpack() {
+   [[ ${PV} == ** ]] && git-r3_src_unpack || default
+}
+
+sigrok_src_prepare() {
+   eautoreconf
+}
+
+src_prepare() {
+   default
+   sigrok_src_prepare
+   use python && python_copy_sources
+}
+
+sigrok_src_configure() {
+   econf \
+   $(use_with bluetooth libbluez) \
+   $(use_with ftdi libftdi) \
+   $(use_with hidapi libhidapi) \
+   $(use_with parport libieee1284) \
+   $(use_with serial libserialport) \
+   $(use_with usb libusb) \
+   $(use_enable cxx) \
+   $(use_enable java) \
+   $(use_enable static-libs static) \
+   "${@}"
+}
+
+each_python_configure() {
+   cd "${BUILD_DIR}"
+   sigrok_src_configure --disable-ruby --enable-python
+}
+
+src_configure() {
+   sigrok_src_configure --disable-ruby --disable-python
+   use python && python_foreach_impl each_python_configure
+}
+
+each_python_compile() {
+   cd

[gentoo-commits] repo/gentoo:master commit in: sci-libs/libsigrok/

2023-02-26 Thread Sven Wegener

commit: c1e8153ceed9ba0ad19ca5d758e35cdd7ae9b04c
Author: Sven Wegener  gentoo  org>
AuthorDate: Sun Feb 26 18:38:05 2023 +
Commit: Sven Wegener  gentoo  org>
CommitDate: Sun Feb 26 20:03:02 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1e8153c

sci-libs/libsigrok: call udev_reload in pkg_post{inst,rm}

Closes: https://bugs.gentoo.org/842009
Signed-off-by: Sven Wegener  gentoo.org>

 sci-libs/libsigrok/libsigrok-0.5.2-r3.ebuild | 2 ++
 sci-libs/libsigrok/libsigrok-.ebuild | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/sci-libs/libsigrok/libsigrok-0.5.2-r3.ebuild 
b/sci-libs/libsigrok/libsigrok-0.5.2-r3.ebuild
index a5da9b38bb07..82db0c21674c 100644
--- a/sci-libs/libsigrok/libsigrok-0.5.2-r3.ebuild
+++ b/sci-libs/libsigrok/libsigrok-0.5.2-r3.ebuild
@@ -144,9 +144,11 @@ src_install() {
 pkg_postinst() {
xdg_icon_cache_update
xdg_mimeinfo_database_update
+   udev_reload
 }
 
 pkg_postrm() {
xdg_icon_cache_update
xdg_mimeinfo_database_update
+   udev_reload
 }

diff --git a/sci-libs/libsigrok/libsigrok-.ebuild 
b/sci-libs/libsigrok/libsigrok-.ebuild
index e4d3cd18778d..14382a5710c2 100644
--- a/sci-libs/libsigrok/libsigrok-.ebuild
+++ b/sci-libs/libsigrok/libsigrok-.ebuild
@@ -139,9 +139,11 @@ src_install() {
 pkg_postinst() {
xdg_icon_cache_update
xdg_mimeinfo_database_update
+   udev_reload
 }
 
 pkg_postrm() {
xdg_icon_cache_update
xdg_mimeinfo_database_update
+   udev_reload
 }

[gentoo-commits] repo/gentoo:master commit in: sci-libs/libsigrok/

2023-02-26 Thread Sven Wegener

commit: 5c314caca1562741e759c398aa13f98de0643ac5
Author: Sven Wegener  gentoo  org>
AuthorDate: Sun Feb 26 18:36:34 2023 +
Commit: Sven Wegener  gentoo  org>
CommitDate: Sun Feb 26 20:03:02 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c314cac

sci-libs/libsigrok: update EAPI 7 -> 8

Signed-off-by: Sven Wegener  gentoo.org>

 sci-libs/libsigrok/libsigrok-0.5.2-r3.ebuild | 2 +-
 sci-libs/libsigrok/libsigrok-.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-libs/libsigrok/libsigrok-0.5.2-r3.ebuild 
b/sci-libs/libsigrok/libsigrok-0.5.2-r3.ebuild
index f4fa7b02de2c..a5da9b38bb07 100644
--- a/sci-libs/libsigrok/libsigrok-0.5.2-r3.ebuild
+++ b/sci-libs/libsigrok/libsigrok-0.5.2-r3.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI="8"
 
 PYTHON_COMPAT=( python3_{9,10} )
 

diff --git a/sci-libs/libsigrok/libsigrok-.ebuild 
b/sci-libs/libsigrok/libsigrok-.ebuild
index 32e030d01b3b..e4d3cd18778d 100644
--- a/sci-libs/libsigrok/libsigrok-.ebuild
+++ b/sci-libs/libsigrok/libsigrok-.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI="8"
 
 PYTHON_COMPAT=( python3_{9,10} )

[gentoo-commits] repo/gentoo:master commit in: sci-libs/libsigrok/

2023-02-26 Thread Sven Wegener

commit: 15909a7b196f86dc79b4a12f6f7005c9eb274e7c
Author: Sven Wegener  gentoo  org>
AuthorDate: Sun Feb 26 18:40:36 2023 +
Commit: Sven Wegener  gentoo  org>
CommitDate: Sun Feb 26 20:03:02 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15909a7b

sci-libs/libsigrok: enable py3.11

Closes: https://bugs.gentoo.org/897216
Signed-off-by: Sven Wegener  gentoo.org>

 sci-libs/libsigrok/libsigrok-0.5.2-r3.ebuild | 2 +-
 sci-libs/libsigrok/libsigrok-.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-libs/libsigrok/libsigrok-0.5.2-r3.ebuild 
b/sci-libs/libsigrok/libsigrok-0.5.2-r3.ebuild
index 82db0c21674c..8a010fd267af 100644
--- a/sci-libs/libsigrok/libsigrok-0.5.2-r3.ebuild
+++ b/sci-libs/libsigrok/libsigrok-0.5.2-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="8"
 
-PYTHON_COMPAT=( python3_{9,10} )
+PYTHON_COMPAT=( python3_{9..11} )
 
 inherit autotools python-r1 java-pkg-opt-2 udev xdg-utils
 

diff --git a/sci-libs/libsigrok/libsigrok-.ebuild 
b/sci-libs/libsigrok/libsigrok-.ebuild
index 14382a5710c2..242b275a45d7 100644
--- a/sci-libs/libsigrok/libsigrok-.ebuild
+++ b/sci-libs/libsigrok/libsigrok-.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="8"
 
-PYTHON_COMPAT=( python3_{9,10} )
+PYTHON_COMPAT=( python3_{9..11} )
 
 inherit python-r1 java-pkg-opt-2 udev xdg-utils

[gentoo-commits] repo/gentoo:master commit in: sci-libs/libsigrok/

2023-02-26 Thread Sven Wegener

commit: 3e67831dbf4f0d49712ef31f57994c0231a03cd6
Author: Sven Wegener  gentoo  org>
AuthorDate: Sun Feb 26 18:29:14 2023 +
Commit: Sven Wegener  gentoo  org>
CommitDate: Sun Feb 26 20:03:01 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e67831d

sci-libs/libsigrok: drop 0.5.2-r2

Signed-off-by: Sven Wegener  gentoo.org>

 sci-libs/libsigrok/libsigrok-0.5.2-r2.ebuild | 148 ---
 1 file changed, 148 deletions(-)

diff --git a/sci-libs/libsigrok/libsigrok-0.5.2-r2.ebuild 
b/sci-libs/libsigrok/libsigrok-0.5.2-r2.ebuild
deleted file mode 100644
index ef282ece33cc..
--- a/sci-libs/libsigrok/libsigrok-0.5.2-r2.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_9 )
-
-inherit python-r1 java-pkg-opt-2 udev xdg-utils
-
-if [[ ${PV} == ** ]]; then
-   EGIT_REPO_URI="git://sigrok.org/${PN}"
-   inherit git-r3 autotools
-else
-   SRC_URI="https://sigrok.org/download/source/${PN}/${P}.tar.gz;
-   KEYWORDS="amd64 x86"
-fi
-
-DESCRIPTION="Basic hardware drivers for logic analyzers and input/output file 
format support"
-HOMEPAGE="https://sigrok.org/wiki/Libsigrok;
-
-LICENSE="GPL-3"
-SLOT="0/4"
-IUSE="+cxx ftdi java parport python serial static-libs test +udev usb"
-REQUIRED_USE="java? ( cxx )
-   python? ( cxx ${PYTHON_REQUIRED_USE} )"
-
-RESTRICT="!test? ( test )"
-
-# We also support librevisa, but that isn't in the tree ...
-LIB_DEPEND="
-   >=dev-libs/glib-2.32.0[static-libs(+)]
-   >=dev-libs/libzip-0.8:=[static-libs(+)]
-   cxx? ( dev-cpp/glibmm:2[static-libs(+)] )
-   ftdi? ( dev-embedded/libftdi:1[static-libs(+)] )
-   parport? ( sys-libs/libieee1284[static-libs(+)] )
-   python? (
-   ${PYTHON_DEPS}
-   >=dev-python/pygobject-3.0.0[${PYTHON_USEDEP}]
-   )
-   serial? ( >=dev-libs/libserialport-0.1.1[static-libs(+)] )
-   usb? ( virtual/libusb:1[static-libs(+)] )
-"
-RDEPEND="
-   java? ( >=virtual/jre-1.8:* )
-   !static-libs? ( ${LIB_DEPEND//\[static-libs(+)]} )
-   static-libs? ( ${LIB_DEPEND} )
-"
-DEPEND="${LIB_DEPEND//\[static-libs(+)]}
-   cxx? ( app-doc/doxygen )
-   java? (
-   >=dev-lang/swig-3.0.6
-   >=virtual/jdk-1.8:*
-   )
-   python? (
-   >=dev-lang/swig-3.0.6
-   dev-python/numpy[${PYTHON_USEDEP}]
-   dev-python/setuptools[${PYTHON_USEDEP}]
-   )
-   test? ( >=dev-libs/check-0.9.4 )
-   virtual/pkgconfig
-"
-
-S="${WORKDIR}"/${P}
-
-PATCHES=(
-   # https://sigrok.org/bugzilla/show_bug.cgi?id=1527
-   "${FILESDIR}/${P}-swig-4.patch"
-   # https://sigrok.org/bugzilla/show_bug.cgi?id=1526
-   "${FILESDIR}/${P}-check-0.15.patch"
-)
-
-pkg_setup() {
-   use python && python_setup
-   java-pkg-opt-2_pkg_setup
-}
-
-src_unpack() {
-   [[ ${PV} == ** ]] && git-r3_src_unpack || default
-}
-
-sigrok_src_prepare() {
-   [[ ${PV} == ** ]] && eautoreconf
-}
-
-src_prepare() {
-   default
-   sigrok_src_prepare
-   use python && python_copy_sources
-}
-
-sigrok_src_configure() {
-   econf \
-   $(use_with ftdi libftdi) \
-   $(use_with parport libieee1284) \
-   $(use_with serial libserialport) \
-   $(use_with usb libusb) \
-   $(use_enable cxx) \
-   $(use_enable java) \
-   $(use_enable static-libs static) \
-   "${@}"
-}
-
-each_python_configure() {
-   cd "${BUILD_DIR}"
-   sigrok_src_configure --disable-ruby --enable-python
-}
-
-src_configure() {
-   sigrok_src_configure --disable-ruby --disable-python
-   use python && python_foreach_impl each_python_configure
-}
-
-each_python_compile() {
-   cd "${BUILD_DIR}"
-   emake python-build
-}
-
-src_compile() {
-   default
-   use python && python_foreach_impl each_python_compile
-}
-
-src_test() {
-   emake check
-}
-
-each_python_install() {
-   cd "${BUILD_DIR}"
-   emake python-install DESTDIR="${D}"
-   python_optimize
-}
-
-src_install() {
-   default
-   use python && python_foreach_impl each_python_install
-   use udev && udev_dorules contrib/*.rules
-   find "${D}" -name '*.la' -type f -delete || die
-}
-
-pkg_postinst() {
-   xdg_icon_cache_update
-   xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-   xdg_icon_cache_update
-   xdg_mimeinfo_database_update
-}

[gentoo-commits] repo/gentoo:master commit in: sci-libs/libsigrok/files/

2022-08-27 Thread Sam James

commit: aebc03acfbe9cb5cf3ee4416eab0c75a1d2acdd6
Author: Sam James  gentoo  org>
AuthorDate: Sat Aug 27 11:41:18 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Aug 27 11:41:18 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aebc03ac

sci-libs/libsigrok: drop unused Ruby patch

Fixes: acde501c0f1a1673ab84c9c316334b497bbf0a00
Signed-off-by: Sam James  gentoo.org>

 .../files/libsigrok-0.5.2-ruby-swig-docs.patch | 63 --
 1 file changed, 63 deletions(-)

diff --git a/sci-libs/libsigrok/files/libsigrok-0.5.2-ruby-swig-docs.patch 
b/sci-libs/libsigrok/files/libsigrok-0.5.2-ruby-swig-docs.patch
deleted file mode 100644
index 808227a2fffb..
--- a/sci-libs/libsigrok/files/libsigrok-0.5.2-ruby-swig-docs.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From bae9308ec157378bd22ce4f4a0226f1e7ef23594 Mon Sep 17 00:00:00 2001
-From: Anatol Pomozov 
-Date: Mon, 8 Jun 2020 20:46:44 -0700
-Subject: [PATCH] Fix ruby SWIG bindings generation
-
-bindings/swig/doc.py generates a swig interface file for ruby bindings
-that includes docstrings with comments braces ( /* and */ ) like this:
-
-  %feature("docstring") sigrok::Channel::type "/* Type of this channel. */\n";
-  %feature("docstring") sigrok::Channel::enabled "/* Enabled status of this 
channel. */\n";
-
-SWIG generates *.cxx and adds its own braces to the docstring:
-
-/*/* Document-class: Sigrok::Error
-Exception thrown when an error code is returned by any libsigrok call. */
-*/
-
-this causes compilation error for Ruby bindings.
-
-To fix the error we should not add extra braces to the docstring.
-With this patch libsigrok compiles fine with with ruby 2.7 and swig 4.0.2.
-
-Fixes bug #1526
-
-Signed-off-by: Anatol Pomozov 

- bindings/swig/doc.py | 8 
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/bindings/swig/doc.py b/bindings/swig/doc.py
-index e8767af8..182f5477 100644
 a/bindings/swig/doc.py
-+++ b/bindings/swig/doc.py
-@@ -46,7 +46,7 @@ for compound in index.findall('compound'):
- if language == 'python':
- print('%%feature("docstring") %s "%s";' % (class_name, brief))
- elif language == 'ruby':
--print('%%feature("docstring") %s "/* Document-class: %s\\n%s 
*/\\n";' % (class_name, class_name.replace("sigrok", "Sigrok", 1), brief))
-+print('%%feature("docstring") %s "Document-class: %s\\n%s\\n";' % 
(class_name, class_name.replace("sigrok", "Sigrok", 1), brief))
- elif language == 'java':
- print('%%typemap(javaclassmodifiers) %s "/** %s */\npublic 
class"' % (
- class_name, brief))
-@@ -77,10 +77,10 @@ for compound in index.findall('compound'):
- for name, desc in parameters.items()]) + '";')
- if language == 'ruby' and kind == 'public-func':
- print(str.join('\n', [
--'%%feature("docstring") %s::%s "/* %s' % (
-+'%%feature("docstring") %s::%s "%s' % (
- class_name, member_name, brief)] + [
- '@param %s %s' % (name, desc)
--for name, desc in parameters.items()]) + ' 
*/\\n";')
-+for name, desc in parameters.items()]) + '\\n";')
- elif language == 'java' and kind == 'public-func':
- print(str.join('\n', [
- '%%javamethodmodifiers %s::%s "/** %s' % (
-@@ -111,4 +111,4 @@ for compound in index.findall('compound'):
- print('%}')
- elif language == 'ruby' and constants:
- for member_name, brief in constants:
--print('%%feature("docstring") %s::%s "/* %s */\\n";' % 
(class_name, member_name, brief))
-+print('%%feature("docstring") %s::%s "%s\\n";' % (class_name, 
member_name, brief))
--- 
-2.27.0

[gentoo-commits] repo/gentoo:master commit in: sci-libs/libsigrok/

2022-08-27 Thread Sam James

commit: acde501c0f1a1673ab84c9c316334b497bbf0a00
Author: Sam James  gentoo  org>
AuthorDate: Sat Aug 27 08:02:06 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Aug 27 08:03:16 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=acde501c

sci-libs/libsigrok: drop removed ruby26 (and ruby entirely)

Doesn't support newer Rubys, so drop Ruby support entirely.

Signed-off-by: Sam James  gentoo.org>

 sci-libs/libsigrok/libsigrok-0.5.2-r2.ebuild | 36 +++-
 sci-libs/libsigrok/libsigrok-0.5.2-r3.ebuild | 36 +++-
 sci-libs/libsigrok/libsigrok-.ebuild | 35 +++
 3 files changed, 9 insertions(+), 98 deletions(-)

diff --git a/sci-libs/libsigrok/libsigrok-0.5.2-r2.ebuild 
b/sci-libs/libsigrok/libsigrok-0.5.2-r2.ebuild
index 353b751959c9..fd7173899b54 100644
--- a/sci-libs/libsigrok/libsigrok-0.5.2-r2.ebuild
+++ b/sci-libs/libsigrok/libsigrok-0.5.2-r2.ebuild
@@ -4,10 +4,8 @@
 EAPI="7"
 
 PYTHON_COMPAT=( python3_{8,9} )
-USE_RUBY="ruby26 ruby25"
-RUBY_OPTIONAL="yes"
 
-inherit python-r1 java-pkg-opt-2 ruby-ng udev xdg-utils
+inherit python-r1 java-pkg-opt-2 udev xdg-utils
 
 if [[ ${PV} == ** ]]; then
EGIT_REPO_URI="git://sigrok.org/${PN}"
@@ -22,10 +20,9 @@ HOMEPAGE="https://sigrok.org/wiki/Libsigrok;
 
 LICENSE="GPL-3"
 SLOT="0/4"
-IUSE="+cxx ftdi java parport python ruby serial static-libs test +udev usb"
+IUSE="+cxx ftdi java parport python serial static-libs test +udev usb"
 REQUIRED_USE="java? ( cxx )
-   python? ( cxx ${PYTHON_REQUIRED_USE} )
-   ruby? ( cxx || ( $(ruby_get_use_targets) ) )"
+   python? ( cxx ${PYTHON_REQUIRED_USE} )"
 
 RESTRICT="!test? ( test )"
 
@@ -40,7 +37,6 @@ LIB_DEPEND="
${PYTHON_DEPS}
>=dev-python/pygobject-3.0.0[${PYTHON_USEDEP}]
)
-   ruby? ( $(ruby_implementations_depend) )
serial? ( >=dev-libs/libserialport-0.1.1[static-libs(+)] )
usb? ( virtual/libusb:1[static-libs(+)] )
 "
@@ -60,7 +56,6 @@ DEPEND="${LIB_DEPEND//\[static-libs(+)]}
dev-python/numpy[${PYTHON_USEDEP}]
dev-python/setuptools[${PYTHON_USEDEP}]
)
-   ruby? ( >=dev-lang/swig-3.0.8 )
test? ( >=dev-libs/check-0.9.4 )
virtual/pkgconfig
 "
@@ -71,13 +66,11 @@ PATCHES=(
# https://sigrok.org/bugzilla/show_bug.cgi?id=1527
"${FILESDIR}/${P}-swig-4.patch"
# https://sigrok.org/bugzilla/show_bug.cgi?id=1526
-   "${FILESDIR}/${P}-ruby-swig-docs.patch" # bug 705074
"${FILESDIR}/${P}-check-0.15.patch"
 )
 
 pkg_setup() {
use python && python_setup
-   use ruby && ruby-ng_pkg_setup
java-pkg-opt-2_pkg_setup
 }
 
@@ -89,15 +82,7 @@ sigrok_src_prepare() {
[[ ${PV} == ** ]] && eautoreconf
 }
 
-each_ruby_prepare() {
-   sigrok_src_prepare
-}
-
 src_prepare() {
-   if use ruby; then
-   cp -rl "${S}" "${WORKDIR}"/all || die
-   ruby-ng_src_prepare
-   fi
default
sigrok_src_prepare
use python && python_copy_sources
@@ -115,10 +100,6 @@ sigrok_src_configure() {
"${@}"
 }
 
-each_ruby_configure() {
-   RUBY="${RUBY}" sigrok_src_configure --enable-ruby --disable-python
-}
-
 each_python_configure() {
cd "${BUILD_DIR}"
sigrok_src_configure --disable-ruby --enable-python
@@ -126,14 +107,9 @@ each_python_configure() {
 
 src_configure() {
sigrok_src_configure --disable-ruby --disable-python
-   use ruby && ruby-ng_src_configure
use python && python_foreach_impl each_python_configure
 }
 
-each_ruby_compile() {
-   emake ruby-build
-}
-
 each_python_compile() {
cd "${BUILD_DIR}"
emake python-build
@@ -141,7 +117,6 @@ each_python_compile() {
 
 src_compile() {
default
-   use ruby && ruby-ng_src_compile
use python && python_foreach_impl each_python_compile
 }
 
@@ -149,10 +124,6 @@ src_test() {
emake check
 }
 
-each_ruby_install() {
-   emake ruby-install DESTDIR="${D}"
-}
-
 each_python_install() {
cd "${BUILD_DIR}"
emake python-install DESTDIR="${D}"
@@ -162,7 +133,6 @@ each_python_install() {
 src_install() {
default
use python && python_foreach_impl each_python_install
-   use ruby && ruby-ng_src_install
use udev && udev_dorules contrib/*.rules
find "${D}" -name '*.la' -type f -delete || die
 }

diff --git a/sci-libs/libsigrok/libsigrok-0.5.2-r3.ebuild 
b/sci-libs/libsigrok/libsigrok-0.5.2-r3.ebuild
index 3523b5e36b13..3bc1b3e108fc 100644
--- a/sci-libs/libsigrok/libsigrok-0.5.2-r3.ebuild
+++ b/sci-libs/libsigrok/libsigrok-0.5.2-r3.ebuild
@@ -4,10 +4,8 @@
 EAPI="7"
 
 PYTHON_COMPAT=( python3_{8,9,10} )
-USE_RUBY="ruby26 ruby25"
-RUBY_OPTIONAL="yes"
 
-inherit autotools python-r1 java-pkg-opt-2 ruby-ng udev xdg-utils
+inherit autotools python-r1 java-pkg-opt-2 udev xdg-utils
 
 if [[ ${PV} ==

[gentoo-commits] repo/gentoo:master commit in: sci-libs/libsigrok/

2022-06-22 Thread Arthur Zamarin

commit: a44f5b67971e7757bab5a72da39a430cfe44219f
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Wed Jun 22 18:37:14 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Wed Jun 22 18:37:14 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a44f5b67

sci-libs/libsigrok: Keyword 0.5.2-r3 arm, #849830

Signed-off-by: Arthur Zamarin  gentoo.org>

 sci-libs/libsigrok/libsigrok-0.5.2-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/libsigrok/libsigrok-0.5.2-r3.ebuild 
b/sci-libs/libsigrok/libsigrok-0.5.2-r3.ebuild
index a38acb484d20..3523b5e36b13 100644
--- a/sci-libs/libsigrok/libsigrok-0.5.2-r3.ebuild
+++ b/sci-libs/libsigrok/libsigrok-0.5.2-r3.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == ** ]]; then
inherit git-r3
 else
SRC_URI="https://sigrok.org/download/source/${PN}/${P}.tar.gz;
-   KEYWORDS="amd64 ~arm64 x86"
+   KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 DESCRIPTION="Basic hardware drivers for logic analyzers and input/output file 
format support"

[gentoo-commits] repo/gentoo:master commit in: sci-libs/libsigrok/

2022-06-22 Thread Arthur Zamarin

commit: 51d654a562823a547d64047052ece0bcd9efed1f
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Wed Jun 22 16:02:09 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Wed Jun 22 16:02:09 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51d654a5

sci-libs/libsigrok: Keyword 0.5.2-r3 arm64, #849830

Signed-off-by: Arthur Zamarin  gentoo.org>

 sci-libs/libsigrok/libsigrok-0.5.2-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/libsigrok/libsigrok-0.5.2-r3.ebuild 
b/sci-libs/libsigrok/libsigrok-0.5.2-r3.ebuild
index 3a101e6da886..a38acb484d20 100644
--- a/sci-libs/libsigrok/libsigrok-0.5.2-r3.ebuild
+++ b/sci-libs/libsigrok/libsigrok-0.5.2-r3.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == ** ]]; then
inherit git-r3
 else
SRC_URI="https://sigrok.org/download/source/${PN}/${P}.tar.gz;
-   KEYWORDS="amd64 x86"
+   KEYWORDS="amd64 ~arm64 x86"
 fi
 
 DESCRIPTION="Basic hardware drivers for logic analyzers and input/output file 
format support"

[gentoo-commits] repo/gentoo:master commit in: sci-libs/libsigrok/

2022-06-07 Thread Joonas Niilola

commit: a514d37dd7b93177e21c5cc12a2432627569185f
Author: Joonas Niilola  gentoo  org>
AuthorDate: Tue Jun  7 07:47:04 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue Jun  7 07:59:28 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a514d37d

sci-libs/libsigrok: Stabilize 0.5.2-r3 x86, #849902

Signed-off-by: Joonas Niilola  gentoo.org>

 sci-libs/libsigrok/libsigrok-0.5.2-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/libsigrok/libsigrok-0.5.2-r3.ebuild 
b/sci-libs/libsigrok/libsigrok-0.5.2-r3.ebuild
index 63d1be0eaca0..3a101e6da886 100644
--- a/sci-libs/libsigrok/libsigrok-0.5.2-r3.ebuild
+++ b/sci-libs/libsigrok/libsigrok-0.5.2-r3.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == ** ]]; then
inherit git-r3
 else
SRC_URI="https://sigrok.org/download/source/${PN}/${P}.tar.gz;
-   KEYWORDS="amd64 ~x86"
+   KEYWORDS="amd64 x86"
 fi
 
 DESCRIPTION="Basic hardware drivers for logic analyzers and input/output file 
format support"

[gentoo-commits] repo/gentoo:master commit in: sci-libs/libsigrok/

2022-06-07 Thread Joonas Niilola

commit: 150f205811d75068a2769bf9c44adda8651f971e
Author: Joonas Niilola  gentoo  org>
AuthorDate: Tue Jun  7 06:32:07 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue Jun  7 06:34:09 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=150f2058

sci-libs/libsigrok: Stabilize 0.5.2-r3 amd64, #849902

Signed-off-by: Joonas Niilola  gentoo.org>

 sci-libs/libsigrok/libsigrok-0.5.2-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/libsigrok/libsigrok-0.5.2-r3.ebuild 
b/sci-libs/libsigrok/libsigrok-0.5.2-r3.ebuild
index 8ea5f166972b..63d1be0eaca0 100644
--- a/sci-libs/libsigrok/libsigrok-0.5.2-r3.ebuild
+++ b/sci-libs/libsigrok/libsigrok-0.5.2-r3.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == ** ]]; then
inherit git-r3
 else
SRC_URI="https://sigrok.org/download/source/${PN}/${P}.tar.gz;
-   KEYWORDS="~amd64 ~x86"
+   KEYWORDS="amd64 ~x86"
 fi
 
 DESCRIPTION="Basic hardware drivers for logic analyzers and input/output file 
format support"

[gentoo-commits] repo/gentoo:master commit in: sci-libs/libsigrok/

2022-05-01 Thread Sven Wegener

commit: 0999b8906d3232d2a370f8713fd06253eaba082a
Author: Sven Wegener  gentoo  org>
AuthorDate: Sun May  1 07:18:16 2022 +
Commit: Sven Wegener  gentoo  org>
CommitDate: Sun May  1 07:23:07 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0999b890

sci-libs/libsigrok: Drop python3_7

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Sven Wegener  gentoo.org>

 sci-libs/libsigrok/libsigrok-0.5.2-r2.ebuild | 4 ++--
 sci-libs/libsigrok/libsigrok-0.5.2-r3.ebuild | 2 +-
 sci-libs/libsigrok/libsigrok-.ebuild | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sci-libs/libsigrok/libsigrok-0.5.2-r2.ebuild 
b/sci-libs/libsigrok/libsigrok-0.5.2-r2.ebuild
index 441a3bc48621..353b751959c9 100644
--- a/sci-libs/libsigrok/libsigrok-0.5.2-r2.ebuild
+++ b/sci-libs/libsigrok/libsigrok-0.5.2-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 USE_RUBY="ruby26 ruby25"
 RUBY_OPTIONAL="yes"
 

diff --git a/sci-libs/libsigrok/libsigrok-0.5.2-r3.ebuild 
b/sci-libs/libsigrok/libsigrok-0.5.2-r3.ebuild
index 8c206cfc5d79..8ea5f166972b 100644
--- a/sci-libs/libsigrok/libsigrok-0.5.2-r3.ebuild
+++ b/sci-libs/libsigrok/libsigrok-0.5.2-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{7,8,9,10} )
+PYTHON_COMPAT=( python3_{8,9,10} )
 USE_RUBY="ruby26 ruby25"
 RUBY_OPTIONAL="yes"
 

diff --git a/sci-libs/libsigrok/libsigrok-.ebuild 
b/sci-libs/libsigrok/libsigrok-.ebuild
index 126dd3c3d52f..c8561dcffd11 100644
--- a/sci-libs/libsigrok/libsigrok-.ebuild
+++ b/sci-libs/libsigrok/libsigrok-.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{7,8,9,10} )
+PYTHON_COMPAT=( python3_{8,9,10} )
 USE_RUBY="ruby26 ruby25"
 RUBY_OPTIONAL="yes"

[gentoo-commits] repo/gentoo:master commit in: sci-libs/libsigrok/

2022-01-08 Thread Sven Wegener

commit: 44f39e4508eb7d9ed920c692404d42133bec962c
Author: Sven Wegener  gentoo  org>
AuthorDate: Sat Jan  8 15:22:53 2022 +
Commit: Sven Wegener  gentoo  org>
CommitDate: Sat Jan  8 15:31:42 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44f39e45

sci-libs/libsigrok: Support python3_10

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Sven Wegener  gentoo.org>

 sci-libs/libsigrok/libsigrok-.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-libs/libsigrok/libsigrok-.ebuild 
b/sci-libs/libsigrok/libsigrok-.ebuild
index 6dade8d873f3..126dd3c3d52f 100644
--- a/sci-libs/libsigrok/libsigrok-.ebuild
+++ b/sci-libs/libsigrok/libsigrok-.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9,10} )
 USE_RUBY="ruby26 ruby25"
 RUBY_OPTIONAL="yes"

[gentoo-commits] repo/gentoo:master commit in: sci-libs/libsigrok/

2022-01-08 Thread Sven Wegener

commit: ca5f7669273e6f5fd5a6b9bc309115efcec6fbf7
Author: Sven Wegener  gentoo  org>
AuthorDate: Sat Jan  8 15:22:52 2022 +
Commit: Sven Wegener  gentoo  org>
CommitDate: Sat Jan  8 15:31:42 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca5f7669

sci-libs/libsigrok: Add bluetooth, hidapi and nettle USE flags

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Sven Wegener  gentoo.org>

 sci-libs/libsigrok/libsigrok-.ebuild | 8 +++-
 sci-libs/libsigrok/metadata.xml  | 4 +++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/sci-libs/libsigrok/libsigrok-.ebuild 
b/sci-libs/libsigrok/libsigrok-.ebuild
index 02994b07b73a..6dade8d873f3 100644
--- a/sci-libs/libsigrok/libsigrok-.ebuild
+++ b/sci-libs/libsigrok/libsigrok-.ebuild
@@ -22,7 +22,7 @@ HOMEPAGE="https://sigrok.org/wiki/Libsigrok;
 
 LICENSE="GPL-3"
 SLOT="0/"
-IUSE="+cxx ftdi java parport python ruby serial static-libs test +udev usb"
+IUSE="bluetooth +cxx ftdi hidapi java nettle parport python ruby serial 
static-libs test +udev usb"
 REQUIRED_USE="java? ( cxx )
python? ( cxx ${PYTHON_REQUIRED_USE} )
ruby? ( cxx || ( $(ruby_get_use_targets) ) )"
@@ -33,8 +33,11 @@ RESTRICT="!test? ( test )"
 LIB_DEPEND="
>=dev-libs/glib-2.32.0[static-libs(+)]
>=dev-libs/libzip-0.8:=[static-libs(+)]
+   bluetooth? ( >=net-wireless/bluez-4.0:= )
cxx? ( dev-cpp/glibmm:2[static-libs(+)] )
ftdi? ( dev-embedded/libftdi:1[static-libs(+)] )
+   hidapi? ( >=dev-libs/hidapi-0.8.0 )
+   nettle? ( dev-libs/nettle:=[static-libs(+)] )
parport? ( sys-libs/libieee1284[static-libs(+)] )
python? (
${PYTHON_DEPS}
@@ -97,7 +100,10 @@ src_prepare() {
 
 sigrok_src_configure() {
econf \
+   $(use_with bluetooth libbluez) \
$(use_with ftdi libftdi) \
+   $(use_with hidapi libhidapi) \
+   $(use_with nettle libnettle) \
$(use_with parport libieee1284) \
$(use_with serial libserialport) \
$(use_with usb libusb) \

diff --git a/sci-libs/libsigrok/metadata.xml b/sci-libs/libsigrok/metadata.xml
index 125e899de100..d9f21398e7c8 100644
--- a/sci-libs/libsigrok/metadata.xml
+++ b/sci-libs/libsigrok/metadata.xml
@@ -11,7 +11,9 @@
   as well as input/output file format support.
 
 
- Enable drivers that need libftdi
+ Enable drivers that need 
dev-embedded/libftdi
+ Enable drivers that need dev-libs/hidapi
+ Enable drivers that need dev-libs/nettle
  Enable drivers that are parallel (IEEE1284) based
  Enable drivers that are serial (RS232) based

[gentoo-commits] repo/gentoo:master commit in: sci-libs/libsigrok/

2022-01-08 Thread Sven Wegener

commit: 0d5022e4701cb57dc6f1a12a5615dd532d2b176c
Author: Sven Wegener  gentoo  org>
AuthorDate: Sat Jan  8 15:22:53 2022 +
Commit: Sven Wegener  gentoo  org>
CommitDate: Sat Jan  8 15:31:42 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d5022e4

sci-libs/libsigrok: Revision bump

This includes the last changes from the live ebuild.

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Sven Wegener  gentoo.org>

 sci-libs/libsigrok/libsigrok-0.5.2-r3.ebuild | 182 +++
 1 file changed, 182 insertions(+)

diff --git a/sci-libs/libsigrok/libsigrok-0.5.2-r3.ebuild 
b/sci-libs/libsigrok/libsigrok-0.5.2-r3.ebuild
new file mode 100644
index ..8c206cfc5d79
--- /dev/null
+++ b/sci-libs/libsigrok/libsigrok-0.5.2-r3.ebuild
@@ -0,0 +1,182 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+USE_RUBY="ruby26 ruby25"
+RUBY_OPTIONAL="yes"
+
+inherit autotools python-r1 java-pkg-opt-2 ruby-ng udev xdg-utils
+
+if [[ ${PV} == ** ]]; then
+   EGIT_REPO_URI="git://sigrok.org/${PN}"
+   inherit git-r3
+else
+   SRC_URI="https://sigrok.org/download/source/${PN}/${P}.tar.gz;
+   KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Basic hardware drivers for logic analyzers and input/output file 
format support"
+HOMEPAGE="https://sigrok.org/wiki/Libsigrok;
+
+LICENSE="GPL-3"
+SLOT="0/4"
+IUSE="bluetooth +cxx ftdi hidapi java parport python ruby serial static-libs 
test +udev usb"
+REQUIRED_USE="java? ( cxx )
+   python? ( cxx ${PYTHON_REQUIRED_USE} )
+   ruby? ( cxx || ( $(ruby_get_use_targets) ) )"
+
+RESTRICT="!test? ( test )"
+
+# We also support librevisa, but that isn't in the tree ...
+LIB_DEPEND="
+   >=dev-libs/glib-2.32.0[static-libs(+)]
+   >=dev-libs/libzip-0.8:=[static-libs(+)]
+   bluetooth? ( >=net-wireless/bluez-4.0:= )
+   cxx? ( dev-cpp/glibmm:2[static-libs(+)] )
+   ftdi? ( dev-embedded/libftdi:1[static-libs(+)] )
+   hidapi? ( >=dev-libs/hidapi-0.8.0 )
+   parport? ( sys-libs/libieee1284[static-libs(+)] )
+   python? (
+   ${PYTHON_DEPS}
+   >=dev-python/pygobject-3.0.0[${PYTHON_USEDEP}]
+   )
+   ruby? ( $(ruby_implementations_depend) )
+   serial? ( >=dev-libs/libserialport-0.1.1[static-libs(+)] )
+   usb? ( virtual/libusb:1[static-libs(+)] )
+"
+RDEPEND="
+   java? ( >=virtual/jre-1.8:* )
+   !static-libs? ( ${LIB_DEPEND//\[static-libs(+)]} )
+   static-libs? ( ${LIB_DEPEND} )
+"
+DEPEND="${LIB_DEPEND//\[static-libs(+)]}
+   cxx? ( app-doc/doxygen )
+   java? (
+   >=dev-lang/swig-3.0.6
+   >=virtual/jdk-1.8:*
+   )
+   python? (
+   >=dev-lang/swig-3.0.6
+   dev-python/numpy[${PYTHON_USEDEP}]
+   dev-python/setuptools[${PYTHON_USEDEP}]
+   )
+   ruby? ( >=dev-lang/swig-3.0.8 )
+   test? ( >=dev-libs/check-0.9.4 )
+   virtual/pkgconfig
+"
+
+S="${WORKDIR}"/${P}
+
+PATCHES=(
+   # https://sigrok.org/bugzilla/show_bug.cgi?id=1527
+   "${FILESDIR}/${P}-swig-4.patch"
+   # https://sigrok.org/bugzilla/show_bug.cgi?id=1526
+   "${FILESDIR}/${P}-ruby-swig-docs.patch" # bug 705074
+   "${FILESDIR}/${P}-check-0.15.patch"
+)
+
+pkg_setup() {
+   use python && python_setup
+   use ruby && ruby-ng_pkg_setup
+   java-pkg-opt-2_pkg_setup
+}
+
+src_unpack() {
+   [[ ${PV} == ** ]] && git-r3_src_unpack || default
+}
+
+sigrok_src_prepare() {
+   eautoreconf
+}
+
+each_ruby_prepare() {
+   sigrok_src_prepare
+}
+
+src_prepare() {
+   if use ruby; then
+   cp -rl "${S}" "${WORKDIR}"/all || die
+   ruby-ng_src_prepare
+   fi
+   default
+   sigrok_src_prepare
+   use python && python_copy_sources
+}
+
+sigrok_src_configure() {
+   econf \
+   $(use_with bluetooth libbluez) \
+   $(use_with ftdi libftdi) \
+   $(use_with hidapi libhidapi) \
+   $(use_with parport libieee1284) \
+   $(use_with serial libserialport) \
+   $(use_with usb libusb) \
+   $(use_enable cxx) \
+   $(use_enable java) \
+   $(use_enable static-libs static) \
+   "${@}"
+}
+
+each_ruby_configure() {
+   RUBY="${RUBY}" sigrok_src_configure --enable-ruby --disable-python
+}
+
+each_python_configure() {
+   cd "${BUILD_DIR}"
+   sigrok_src_configure --disable-ruby --enable-python
+}
+
+src_configure() {
+   sigrok_src_configure --disable-ruby --disable-python
+   use ruby && ruby-ng_src_configure
+   use python && python_foreach_impl each_python_configure
+}
+
+each_ruby_compile() {
+   emake ruby-build
+}
+
+each_python_compile() {
+   cd "${BUILD_DIR}"
+   emake python-build
+}
+
+src_compile() {
+   default
+

[gentoo-commits] repo/gentoo:master commit in: sci-libs/libsigrok/

2021-07-02 Thread Joonas Niilola

commit: bb49af09c8c5c50df423d315ecc4d1137b04d171
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Fri Jul  2 08:19:19 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Fri Jul  2 08:21:57 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb49af09

sci-libs/libsigrok: min java 1.8:*

Bug: https://bugs.gentoo.org/787644
Package-Manager: Portage-3.0.20, Repoman-3.0.2
Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/21405
Signed-off-by: Joonas Niilola  gentoo.org>

 .../{libsigrok-0.5.2-r1.ebuild => libsigrok-0.5.2-r2.ebuild}| 4 ++--
 sci-libs/libsigrok/libsigrok-.ebuild| 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/sci-libs/libsigrok/libsigrok-0.5.2-r1.ebuild 
b/sci-libs/libsigrok/libsigrok-0.5.2-r2.ebuild
similarity index 98%
rename from sci-libs/libsigrok/libsigrok-0.5.2-r1.ebuild
rename to sci-libs/libsigrok/libsigrok-0.5.2-r2.ebuild
index 23601315e40..441a3bc4862 100644
--- a/sci-libs/libsigrok/libsigrok-0.5.2-r1.ebuild
+++ b/sci-libs/libsigrok/libsigrok-0.5.2-r2.ebuild
@@ -45,7 +45,7 @@ LIB_DEPEND="
usb? ( virtual/libusb:1[static-libs(+)] )
 "
 RDEPEND="
-   java? ( >=virtual/jre-1.4 )
+   java? ( >=virtual/jre-1.8:* )
!static-libs? ( ${LIB_DEPEND//\[static-libs(+)]} )
static-libs? ( ${LIB_DEPEND} )
 "
@@ -53,7 +53,7 @@ DEPEND="${LIB_DEPEND//\[static-libs(+)]}
cxx? ( app-doc/doxygen )
java? (
>=dev-lang/swig-3.0.6
-   >=virtual/jdk-1.4
+   >=virtual/jdk-1.8:*
)
python? (
>=dev-lang/swig-3.0.6

diff --git a/sci-libs/libsigrok/libsigrok-.ebuild 
b/sci-libs/libsigrok/libsigrok-.ebuild
index 3ca48b69c90..02994b07b73 100644
--- a/sci-libs/libsigrok/libsigrok-.ebuild
+++ b/sci-libs/libsigrok/libsigrok-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -45,7 +45,7 @@ LIB_DEPEND="
usb? ( virtual/libusb:1[static-libs(+)] )
 "
 RDEPEND="
-   java? ( >=virtual/jre-1.4 )
+   java? ( >=virtual/jre-1.8:* )
!static-libs? ( ${LIB_DEPEND//\[static-libs(+)]} )
static-libs? ( ${LIB_DEPEND} )
 "
@@ -53,7 +53,7 @@ DEPEND="${LIB_DEPEND//\[static-libs(+)]}
cxx? ( app-doc/doxygen )
java? (
>=dev-lang/swig-3.0.6
-   >=virtual/jdk-1.4
+   >=virtual/jdk-1.8:*
)
python? (
>=dev-lang/swig-3.0.6

[gentoo-commits] repo/gentoo:master commit in: sci-libs/libsigrok/

2021-04-19 Thread Sam James

commit: 58fd583c143f8788a4ef1d6700cf92998bbe1c44
Author: Sam James  gentoo  org>
AuthorDate: Mon Apr 19 20:04:32 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Apr 19 20:53:42 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58fd583c

sci-libs/libsigrok: drop 0.5.2

Signed-off-by: Sam James  gentoo.org>

 sci-libs/libsigrok/libsigrok-0.5.2.ebuild | 178 --
 1 file changed, 178 deletions(-)

diff --git a/sci-libs/libsigrok/libsigrok-0.5.2.ebuild 
b/sci-libs/libsigrok/libsigrok-0.5.2.ebuild
deleted file mode 100644
index dad18f7d967..000
--- a/sci-libs/libsigrok/libsigrok-0.5.2.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_{7,8} )
-USE_RUBY="ruby26 ruby25"
-RUBY_OPTIONAL="yes"
-
-inherit python-r1 java-pkg-opt-2 ruby-ng udev xdg-utils
-
-if [[ ${PV} == ** ]]; then
-   EGIT_REPO_URI="git://sigrok.org/${PN}"
-   inherit git-r3 autotools
-else
-   SRC_URI="https://sigrok.org/download/source/${PN}/${P}.tar.gz;
-   KEYWORDS="amd64 x86"
-fi
-
-DESCRIPTION="Basic hardware drivers for logic analyzers and input/output file 
format support"
-HOMEPAGE="https://sigrok.org/wiki/Libsigrok;
-
-LICENSE="GPL-3"
-SLOT="0/4"
-IUSE="+cxx ftdi java parport python ruby serial static-libs test +udev usb"
-REQUIRED_USE="java? ( cxx )
-   python? ( cxx ${PYTHON_REQUIRED_USE} )
-   ruby? ( cxx || ( $(ruby_get_use_targets) ) )"
-
-RESTRICT="!test? ( test )"
-
-# We also support librevisa, but that isn't in the tree ...
-LIB_DEPEND="
-   >=dev-libs/glib-2.32.0[static-libs(+)]
-   >=dev-libs/libzip-0.8:=[static-libs(+)]
-   cxx? ( dev-cpp/glibmm:2[static-libs(+)] )
-   ftdi? ( dev-embedded/libftdi:1[static-libs(+)] )
-   parport? ( sys-libs/libieee1284[static-libs(+)] )
-   python? (
-   ${PYTHON_DEPS}
-   >=dev-python/pygobject-3.0.0[${PYTHON_USEDEP}]
-   )
-   ruby? ( $(ruby_implementations_depend) )
-   serial? ( >=dev-libs/libserialport-0.1.1[static-libs(+)] )
-   usb? ( virtual/libusb:1[static-libs(+)] )
-"
-RDEPEND="
-   java? ( >=virtual/jre-1.4 )
-   !static-libs? ( ${LIB_DEPEND//\[static-libs(+)]} )
-   static-libs? ( ${LIB_DEPEND} )
-"
-DEPEND="${LIB_DEPEND//\[static-libs(+)]}
-   cxx? ( app-doc/doxygen )
-   java? (
-   >=dev-lang/swig-3.0.6
-   >=virtual/jdk-1.4
-   )
-   python? (
-   >=dev-lang/swig-3.0.6
-   dev-python/numpy[${PYTHON_USEDEP}]
-   dev-python/setuptools[${PYTHON_USEDEP}]
-   )
-   ruby? ( >=dev-lang/swig-3.0.8 )
-   test? ( >=dev-libs/check-0.9.4 )
-   virtual/pkgconfig
-"
-
-S="${WORKDIR}"/${P}
-
-PATCHES=(
-   # https://sigrok.org/bugzilla/show_bug.cgi?id=1527
-   "${FILESDIR}/${P}-swig-4.patch"
-   # https://sigrok.org/bugzilla/show_bug.cgi?id=1526
-   "${FILESDIR}/${P}-ruby-swig-docs.patch" # bug 705074
-   "${FILESDIR}/${P}-check-0.15.patch"
-)
-
-pkg_setup() {
-   use python && python_setup
-   use ruby && ruby-ng_pkg_setup
-   java-pkg-opt-2_pkg_setup
-}
-
-src_unpack() {
-   [[ ${PV} == ** ]] && git-r3_src_unpack || default
-}
-
-sigrok_src_prepare() {
-   [[ ${PV} == ** ]] && eautoreconf
-}
-
-each_ruby_prepare() {
-   sigrok_src_prepare
-}
-
-src_prepare() {
-   if use ruby; then
-   cp -rl "${S}" "${WORKDIR}"/all || die
-   ruby-ng_src_prepare
-   fi
-   default
-   sigrok_src_prepare
-   use python && python_copy_sources
-}
-
-sigrok_src_configure() {
-   econf \
-   $(use_with ftdi libftdi) \
-   $(use_with parport libieee1284) \
-   $(use_with serial libserialport) \
-   $(use_with usb libusb) \
-   $(use_enable cxx) \
-   $(use_enable java) \
-   $(use_enable static-libs static) \
-   "${@}"
-}
-
-each_ruby_configure() {
-   RUBY="${RUBY}" sigrok_src_configure --enable-ruby --disable-python
-}
-
-each_python_configure() {
-   cd "${BUILD_DIR}"
-   sigrok_src_configure --disable-ruby --enable-python
-}
-
-src_configure() {
-   sigrok_src_configure --disable-ruby --disable-python
-   use ruby && ruby-ng_src_configure
-   use python && python_foreach_impl each_python_configure
-}
-
-each_ruby_compile() {
-   emake ruby-build
-}
-
-each_python_compile() {
-   cd "${BUILD_DIR}"
-   emake python-build
-}
-
-src_compile() {
-   default
-   use ruby && ruby-ng_src_compile
-   use python && python_foreach_impl each_python_compile
-}
-
-src_test() {
-   emake check
-}
-
-each_ruby_install() {
-   emake ruby-install DESTDIR="${D}"
-}
-
-each_python_install() {
-   cd "${BUILD_DIR}"
-   emake python-install DESTDIR="${D}"
-

[gentoo-commits] repo/gentoo:master commit in: sci-libs/libsigrok/

2021-02-19 Thread Thomas Deutschmann

commit: 2bbe331b58e98f6c5cf2798486f8b03aac91b51a
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Fri Feb 19 19:30:35 2021 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Fri Feb 19 19:32:23 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2bbe331b

sci-libs/libsigrok: x86 stable (bug #769926)

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Thomas Deutschmann  gentoo.org>

 sci-libs/libsigrok/libsigrok-0.5.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/libsigrok/libsigrok-0.5.2-r1.ebuild 
b/sci-libs/libsigrok/libsigrok-0.5.2-r1.ebuild
index 1ca3403709a..23601315e40 100644
--- a/sci-libs/libsigrok/libsigrok-0.5.2-r1.ebuild
+++ b/sci-libs/libsigrok/libsigrok-0.5.2-r1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == ** ]]; then
inherit git-r3 autotools
 else
SRC_URI="https://sigrok.org/download/source/${PN}/${P}.tar.gz;
-   KEYWORDS="amd64 ~x86"
+   KEYWORDS="amd64 x86"
 fi
 
 DESCRIPTION="Basic hardware drivers for logic analyzers and input/output file 
format support"

[gentoo-commits] repo/gentoo:master commit in: sci-libs/libsigrok/

2021-02-17 Thread Sam James

commit: c0d68357ae781df33fd36366932f8deaf0f15d50
Author: Sam James  gentoo  org>
AuthorDate: Thu Feb 18 07:23:16 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Feb 18 07:23:16 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0d68357

sci-libs/libsigrok: Stabilize 0.5.2-r1 amd64, #769926

Signed-off-by: Sam James  gentoo.org>

 sci-libs/libsigrok/libsigrok-0.5.2-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-libs/libsigrok/libsigrok-0.5.2-r1.ebuild 
b/sci-libs/libsigrok/libsigrok-0.5.2-r1.ebuild
index 94476c1a5af..1ca3403709a 100644
--- a/sci-libs/libsigrok/libsigrok-0.5.2-r1.ebuild
+++ b/sci-libs/libsigrok/libsigrok-0.5.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -14,7 +14,7 @@ if [[ ${PV} == ** ]]; then
inherit git-r3 autotools
 else
SRC_URI="https://sigrok.org/download/source/${PN}/${P}.tar.gz;
-   KEYWORDS="~amd64 ~x86"
+   KEYWORDS="amd64 ~x86"
 fi
 
 DESCRIPTION="Basic hardware drivers for logic analyzers and input/output file 
format support"

[gentoo-commits] repo/gentoo:master commit in: sci-libs/libsigrok/

2020-11-16 Thread Sven Wegener

commit: c1ff73c9d6df4b2d4f951bc58b0c75c0bd1af872
Author: Sven Wegener  gentoo  org>
AuthorDate: Mon Nov 16 22:16:23 2020 +
Commit: Sven Wegener  gentoo  org>
CommitDate: Mon Nov 16 22:31:15 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1ff73c9

sci-libs/libsigrok: Require libftdi1, bug #736112

Closes: https://bugs.gentoo.org/736112
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Sven Wegener  gentoo.org>

 sci-libs/libsigrok/libsigrok-0.5.2.ebuild | 2 +-
 sci-libs/libsigrok/libsigrok-.ebuild  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-libs/libsigrok/libsigrok-0.5.2.ebuild 
b/sci-libs/libsigrok/libsigrok-0.5.2.ebuild
index 6f9692c6488..bff13a8719a 100644
--- a/sci-libs/libsigrok/libsigrok-0.5.2.ebuild
+++ b/sci-libs/libsigrok/libsigrok-0.5.2.ebuild
@@ -34,7 +34,7 @@ LIB_DEPEND="
>=dev-libs/glib-2.32.0[static-libs(+)]
>=dev-libs/libzip-0.8:=[static-libs(+)]
cxx? ( dev-cpp/glibmm:2[static-libs(+)] )
-   ftdi? ( >=dev-embedded/libftdi-0.16:=[static-libs(+)] )
+   ftdi? ( dev-embedded/libftdi:1[static-libs(+)] )
parport? ( sys-libs/libieee1284[static-libs(+)] )
python? (
${PYTHON_DEPS}

diff --git a/sci-libs/libsigrok/libsigrok-.ebuild 
b/sci-libs/libsigrok/libsigrok-.ebuild
index 1449357471e..d81e9bd7d13 100644
--- a/sci-libs/libsigrok/libsigrok-.ebuild
+++ b/sci-libs/libsigrok/libsigrok-.ebuild
@@ -34,7 +34,7 @@ LIB_DEPEND="
>=dev-libs/glib-2.32.0[static-libs(+)]
>=dev-libs/libzip-0.8:=[static-libs(+)]
cxx? ( dev-cpp/glibmm:2[static-libs(+)] )
-   ftdi? ( >=dev-embedded/libftdi-0.16:=[static-libs(+)] )
+   ftdi? ( dev-embedded/libftdi:1[static-libs(+)] )
parport? ( sys-libs/libieee1284[static-libs(+)] )
python? (
${PYTHON_DEPS}

[gentoo-commits] repo/gentoo:master commit in: sci-libs/libsigrok/

2020-11-16 Thread Sven Wegener

commit: 6b8afa1ed0dc5b2a84b64a80e694e71b0ac1b47a
Author: Sven Wegener  gentoo  org>
AuthorDate: Mon Nov 16 22:16:26 2020 +
Commit: Sven Wegener  gentoo  org>
CommitDate: Mon Nov 16 22:31:16 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b8afa1e

sci-libs/libsigrok: Revision bump

Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Sven Wegener  gentoo.org>

 sci-libs/libsigrok/libsigrok-0.5.2-r1.ebuild | 178 +++
 1 file changed, 178 insertions(+)

diff --git a/sci-libs/libsigrok/libsigrok-0.5.2-r1.ebuild 
b/sci-libs/libsigrok/libsigrok-0.5.2-r1.ebuild
new file mode 100644
index 000..9387c14e6ca
--- /dev/null
+++ b/sci-libs/libsigrok/libsigrok-0.5.2-r1.ebuild
@@ -0,0 +1,178 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+USE_RUBY="ruby26 ruby25"
+RUBY_OPTIONAL="yes"
+
+inherit python-r1 java-pkg-opt-2 ruby-ng udev xdg-utils
+
+if [[ ${PV} == ** ]]; then
+   EGIT_REPO_URI="git://sigrok.org/${PN}"
+   inherit git-r3 autotools
+else
+   SRC_URI="https://sigrok.org/download/source/${PN}/${P}.tar.gz;
+   KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Basic hardware drivers for logic analyzers and input/output file 
format support"
+HOMEPAGE="https://sigrok.org/wiki/Libsigrok;
+
+LICENSE="GPL-3"
+SLOT="0/4"
+IUSE="+cxx ftdi java parport python ruby serial static-libs test +udev usb"
+REQUIRED_USE="java? ( cxx )
+   python? ( cxx ${PYTHON_REQUIRED_USE} )
+   ruby? ( cxx || ( $(ruby_get_use_targets) ) )"
+
+RESTRICT="!test? ( test )"
+
+# We also support librevisa, but that isn't in the tree ...
+LIB_DEPEND="
+   >=dev-libs/glib-2.32.0[static-libs(+)]
+   >=dev-libs/libzip-0.8:=[static-libs(+)]
+   cxx? ( dev-cpp/glibmm:2[static-libs(+)] )
+   ftdi? ( dev-embedded/libftdi:1[static-libs(+)] )
+   parport? ( sys-libs/libieee1284[static-libs(+)] )
+   python? (
+   ${PYTHON_DEPS}
+   >=dev-python/pygobject-3.0.0[${PYTHON_USEDEP}]
+   )
+   ruby? ( $(ruby_implementations_depend) )
+   serial? ( >=dev-libs/libserialport-0.1.1[static-libs(+)] )
+   usb? ( virtual/libusb:1[static-libs(+)] )
+"
+RDEPEND="
+   java? ( >=virtual/jre-1.4 )
+   !static-libs? ( ${LIB_DEPEND//\[static-libs(+)]} )
+   static-libs? ( ${LIB_DEPEND} )
+"
+DEPEND="${LIB_DEPEND//\[static-libs(+)]}
+   cxx? ( app-doc/doxygen )
+   java? (
+   >=dev-lang/swig-3.0.6
+   >=virtual/jdk-1.4
+   )
+   python? (
+   >=dev-lang/swig-3.0.6
+   dev-python/numpy[${PYTHON_USEDEP}]
+   dev-python/setuptools[${PYTHON_USEDEP}]
+   )
+   ruby? ( >=dev-lang/swig-3.0.8 )
+   test? ( >=dev-libs/check-0.9.4 )
+   virtual/pkgconfig
+"
+
+S="${WORKDIR}"/${P}
+
+PATCHES=(
+   # https://sigrok.org/bugzilla/show_bug.cgi?id=1527
+   "${FILESDIR}/${P}-swig-4.patch"
+   # https://sigrok.org/bugzilla/show_bug.cgi?id=1526
+   "${FILESDIR}/${P}-ruby-swig-docs.patch" # bug 705074
+   "${FILESDIR}/${P}-check-0.15.patch"
+)
+
+pkg_setup() {
+   use python && python_setup
+   use ruby && ruby-ng_pkg_setup
+   java-pkg-opt-2_pkg_setup
+}
+
+src_unpack() {
+   [[ ${PV} == ** ]] && git-r3_src_unpack || default
+}
+
+sigrok_src_prepare() {
+   [[ ${PV} == ** ]] && eautoreconf
+}
+
+each_ruby_prepare() {
+   sigrok_src_prepare
+}
+
+src_prepare() {
+   if use ruby; then
+   cp -rl "${S}" "${WORKDIR}"/all || die
+   ruby-ng_src_prepare
+   fi
+   default
+   sigrok_src_prepare
+   use python && python_copy_sources
+}
+
+sigrok_src_configure() {
+   econf \
+   $(use_with ftdi libftdi) \
+   $(use_with parport libieee1284) \
+   $(use_with serial libserialport) \
+   $(use_with usb libusb) \
+   $(use_enable cxx) \
+   $(use_enable java) \
+   $(use_enable static-libs static) \
+   "${@}"
+}
+
+each_ruby_configure() {
+   RUBY="${RUBY}" sigrok_src_configure --enable-ruby --disable-python
+}
+
+each_python_configure() {
+   cd "${BUILD_DIR}"
+   sigrok_src_configure --disable-ruby --enable-python
+}
+
+src_configure() {
+   sigrok_src_configure --disable-ruby --disable-python
+   use ruby && ruby-ng_src_configure
+   use python && python_foreach_impl each_python_configure
+}
+
+each_ruby_compile() {
+   emake ruby-build
+}
+
+each_python_compile() {
+   cd "${BUILD_DIR}"
+   emake python-build
+}
+
+src_compile() {
+   default
+   use ruby && ruby-ng_src_compile
+   use python && python_foreach_impl each_python_compile
+}
+
+src_test() {
+   emake check
+}
+
+each_ruby_install() {
+   emake ruby-install DESTDIR="${D}"
+}
+
+each_python_install() {
+   cd

[gentoo-commits] repo/gentoo:master commit in: sci-libs/libsigrok/

2020-11-16 Thread Sven Wegener

commit: da2e90c2511e96c686dfd6ad301351cc71006d0b
Author: Sven Wegener  gentoo  org>
AuthorDate: Mon Nov 16 22:16:25 2020 +
Commit: Sven Wegener  gentoo  org>
CommitDate: Mon Nov 16 22:31:16 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da2e90c2

sci-libs/libsigrok: Add support for python 3.9

Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Sven Wegener  gentoo.org>

 sci-libs/libsigrok/libsigrok-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/libsigrok/libsigrok-.ebuild 
b/sci-libs/libsigrok/libsigrok-.ebuild
index d81e9bd7d13..f6f845590f7 100644
--- a/sci-libs/libsigrok/libsigrok-.ebuild
+++ b/sci-libs/libsigrok/libsigrok-.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 USE_RUBY="ruby26 ruby25"
 RUBY_OPTIONAL="yes"

[gentoo-commits] repo/gentoo:master commit in: sci-libs/libsigrok/files/, sci-libs/libsigrok/

2020-11-16 Thread Sven Wegener

commit: cb658281569eb887138e836f0c17a6855c84f047
Author: Sven Wegener  gentoo  org>
AuthorDate: Mon Nov 16 22:16:24 2020 +
Commit: Sven Wegener  gentoo  org>
CommitDate: Mon Nov 16 22:31:16 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb658281

sci-libs/libsigrok: Fix FEATURES=test with >=dev-libs/check-0.15

Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Sven Wegener  gentoo.org>

 .../files/libsigrok-0.5.2-check-0.15.patch | 26 ++
 sci-libs/libsigrok/libsigrok-0.5.2.ebuild  |  1 +
 2 files changed, 27 insertions(+)

diff --git a/sci-libs/libsigrok/files/libsigrok-0.5.2-check-0.15.patch 
b/sci-libs/libsigrok/files/libsigrok-0.5.2-check-0.15.patch
new file mode 100644
index 000..8099dcc6c49
--- /dev/null
+++ b/sci-libs/libsigrok/files/libsigrok-0.5.2-check-0.15.patch
@@ -0,0 +1,26 @@
+From 505a55f7899ee2eb41418e753a1290252202ecd3 Mon Sep 17 00:00:00 2001
+From: Jiri Slaby 
+Date: Tue, 15 Sep 2020 08:50:48 +0200
+Subject: [PATCH] tests: strutil, use ck_assert
+
+We pass no message, so use ck_assert instead of ck_assert_msg. This
+results in an error with check 0.15:
+tests/strutil.c:157:2: error: too few arguments to function '_ck_assert_failed'
+  157 |  ck_assert_msg(saved_locale != NULL);
+---
+ tests/strutil.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/strutil.c b/tests/strutil.c
+index fca70eaae..ec2233329 100644
+--- a/tests/strutil.c
 b/tests/strutil.c
+@@ -154,7 +154,7 @@ START_TEST(test_locale)
+   fprintf(stderr, "Old locale = %s\n", old_locale);
+   /* Copy the name so it won’t be clobbered by setlocale. */
+   saved_locale = g_strdup(old_locale);
+-  ck_assert_msg(saved_locale != NULL);
++  ck_assert(saved_locale != NULL);
+ 
+ #ifdef _WIN32
+   /*

diff --git a/sci-libs/libsigrok/libsigrok-0.5.2.ebuild 
b/sci-libs/libsigrok/libsigrok-0.5.2.ebuild
index bff13a8719a..17fe88bad8f 100644
--- a/sci-libs/libsigrok/libsigrok-0.5.2.ebuild
+++ b/sci-libs/libsigrok/libsigrok-0.5.2.ebuild
@@ -72,6 +72,7 @@ PATCHES=(
"${FILESDIR}/${P}-swig-4.patch"
# https://sigrok.org/bugzilla/show_bug.cgi?id=1526
"${FILESDIR}/${P}-ruby-swig-docs.patch" # bug 705074
+   "${FILESDIR}/${P}-check-0.15.patch"
 )
 
 pkg_setup() {

[gentoo-commits] repo/gentoo:master commit in: sci-libs/libsigrok/

2020-11-16 Thread Sven Wegener

commit: 87ad7879c7215cb967e527f3126a122dc533a1b6
Author: Sven Wegener  gentoo  org>
AuthorDate: Mon Nov 16 22:16:25 2020 +
Commit: Sven Wegener  gentoo  org>
CommitDate: Mon Nov 16 22:31:16 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87ad7879

sci-libs/libsigrok: EAPI=7

Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Sven Wegener  gentoo.org>

 sci-libs/libsigrok/libsigrok-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/libsigrok/libsigrok-.ebuild 
b/sci-libs/libsigrok/libsigrok-.ebuild
index f6f845590f7..7cbb58b0daf 100644
--- a/sci-libs/libsigrok/libsigrok-.ebuild
+++ b/sci-libs/libsigrok/libsigrok-.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
 PYTHON_COMPAT=( python3_{6,7,8,9} )
 USE_RUBY="ruby26 ruby25"

[gentoo-commits] repo/gentoo:master commit in: sci-libs/libsigrok/, sci-libs/libsigrok/files/

2020-09-06 Thread Andreas Sturmlechner

commit: 030daa8375b9719fbbcfe9e5e3a5205208deff19
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Sep  6 16:35:56 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Sep  6 16:45:41 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=030daa83

sci-libs/libsigrok: Drop 0.3.0

Closes: https://bugs.gentoo.org/730490
Package-Manager: Portage-3.0.5, Repoman-3.0.1
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 sci-libs/libsigrok/Manifest|   1 -
 .../files/libsigrok-0.3.0-configure-flags.patch| 169 -
 .../files/libsigrok-0.3.0-no-check-linkage.patch   |  30 
 sci-libs/libsigrok/libsigrok-0.3.0.ebuild  |  65 
 4 files changed, 265 deletions(-)

diff --git a/sci-libs/libsigrok/Manifest b/sci-libs/libsigrok/Manifest
index a25f3c7b87d..c98a79f5939 100644
--- a/sci-libs/libsigrok/Manifest
+++ b/sci-libs/libsigrok/Manifest
@@ -1,2 +1 @@
-DIST libsigrok-0.3.0.tar.gz 924503 BLAKE2B 
132cc952b7314e11034100973f1086d17515fb7b1eb3792506569211fe05e9f35b113fceaff7c0468ad9be0bbcac0251ae63ae856f1393c51e743983e60886df
 SHA512 
b94e8a8da1346f9ab267fd693975411243f2cb016e48ec05f4ad88a8a1dfe5ed6f5ad4ac4bf0e94dc551dc92cd70d2719983e21abaa4811693fb28a27bf74550
 DIST libsigrok-0.5.2.tar.gz 1779465 BLAKE2B 
fc6fdde1054e9ac50bc42249c34b3dbfff1e89d77f0db5a8762e52fcf2ea5ea69b2defcf1cde4ed7b1edd1e21770002ed661a470c8d666904daa48a84a2bbfc5
 SHA512 
cf673dad6280302d69050c29490621f66c6d6a73932d019a53ec3501316d3f2e23e7667a04f866dbe6ed73f86a63de73d2173e2b6cea563631d705e06f887092

diff --git a/sci-libs/libsigrok/files/libsigrok-0.3.0-configure-flags.patch 
b/sci-libs/libsigrok/files/libsigrok-0.3.0-configure-flags.patch
deleted file mode 100644
index 16e13349360..000
--- a/sci-libs/libsigrok/files/libsigrok-0.3.0-configure-flags.patch
+++ /dev/null
@@ -1,169 +0,0 @@
-https://sourceforge.net/p/sigrok/mailman/message/32459490/
-
-From de8690fe8aad81f963f14cf1bd7d6e7013d9d747 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger 
-Date: Fri, 13 Jun 2014 19:09:35 -0400
-Subject: [PATCH] add explicit configure flags for ftdi/serial/usb libraries
-
-This makes it a lot easier for distros to control this functionality.

- configure.ac | 118 +++
- 1 file changed, 79 insertions(+), 39 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 496bc7a..f23e630 100644
 a/configure.ac
-+++ b/configure.ac
-@@ -261,6 +261,18 @@ AC_ARG_ENABLE(zeroplus-logic-cube,
-   [HW_ZEROPLUS_LOGIC_CUBE="$enableval"],
-   [HW_ZEROPLUS_LOGIC_CUBE=$HW_ENABLED_DEFAULT])
- 
-+AC_ARG_ENABLE(libserialport,
-+  AC_HELP_STRING([--disable-libserialport],
-+  [disable libserialport support [default=detect]]))
-+
-+AC_ARG_ENABLE(libftdi,
-+  AC_HELP_STRING([--disable-libftdi],
-+  [disable libftdi support [default=detect]]))
-+
-+AC_ARG_ENABLE(libusb,
-+  AC_HELP_STRING([--disable-libusb],
-+  [disable libusb support [default=detect]]))
-+
- # Checks for libraries.
- 
- case "$host" in
-@@ -302,19 +314,28 @@ PKG_CHECK_MODULES([libzip], [libzip >= 0.10],
- 
- # libserialport is only needed for some hardware drivers. Disable the
- # respective drivers if it is not found.
--PKG_CHECK_MODULES([libserialport], [libserialport >= 0.1.0],
--  [have_libserialport="yes"; LIB_CFLAGS="$LIB_CFLAGS 
$libserialport_CFLAGS";
--  LIBS="$LIBS $libserialport_LIBS";
--  SR_PKGLIBS="$SR_PKGLIBS libserialport"],
--  [have_libserialport="no"; HW_AGILENT_DMM="no"; HW_APPA_55II="no";
-+if test "x$enable_libserialport" != "xno"; then
-+  PKG_CHECK_MODULES([libserialport], [libserialport >= 0.1.0],
-+  [have_libserialport="yes"; LIB_CFLAGS="$LIB_CFLAGS 
$libserialport_CFLAGS";
-+  LIBS="$LIBS $libserialport_LIBS";
-+  SR_PKGLIBS="$SR_PKGLIBS libserialport"],
-+  [have_libserialport="no"])
-+  if test "x$enable_libserialport$have_libserialport" = "xyesno"; then
-+  AC_MSG_ERROR([libserialport support requested, but it was not 
found])
-+  fi
-+else
-+  have_libserialport="no"
-+fi
-+
-+# Define HAVE_LIBSERIALPORT in config.h if we found libserialport.
-+if test "x$have_libserialport" = "xno"; then
-+  HW_AGILENT_DMM="no"; HW_APPA_55II="no";
-   HW_ATTEN_PPS3XXX="no"; HW_BRYMEN_DMM="no"; HW_CEM_DT_885X="no";
-   HW_CENTER_3XX="no"; HW_COLEAD_SLM="no"; HW_CONRAD_DIGI_35_CPU="no";
-   HW_FLUKE_DMM="no"; HW_GMC_MH_1X_2X="no"; HW_HAMEG_HMO="no";
-   HW_MIC_985XX="no"; HW_NORMA_DMM="no"; HW_OLS="no";
--  HW_SERIAL_DMM="no"; HW_TELEINFO="no"; HW_TONDAJ_SL_814="no"])
--
--# Define HAVE_LIBSERIALPORT in config.h if we found libserialport.
--if test "x$have_libserialport" != "xno"; then
-+  HW_SERIAL_DMM="no"; HW_TELEINFO="no"; HW_TONDAJ_SL_814="no";
-+else
-   AC_DEFINE_UNQUOTED(HAVE_LIBSERIALPORT, [1],
-   [Specifies whether we have libserialport.])
- fi

[gentoo-commits] repo/gentoo:master commit in: sci-libs/libsigrok/

2020-07-06 Thread Andreas Sturmlechner

commit: d0e6b543fb302289d23469fd837036ccc367f057
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Jul  5 22:37:14 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Jul  6 18:15:24 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0e6b543

sci-libs/libsigrok: Set IUSE="+cxx" default

sci-electronics/pulseview as the only revdep depends on this usedep.
Besides, upstream prints a huge warning from the build system without it.

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 sci-libs/libsigrok/libsigrok-0.5.2.ebuild | 2 +-
 sci-libs/libsigrok/libsigrok-.ebuild  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-libs/libsigrok/libsigrok-0.5.2.ebuild 
b/sci-libs/libsigrok/libsigrok-0.5.2.ebuild
index bcd79fccc6f..ba30bc5fe2d 100644
--- a/sci-libs/libsigrok/libsigrok-0.5.2.ebuild
+++ b/sci-libs/libsigrok/libsigrok-0.5.2.ebuild
@@ -22,7 +22,7 @@ HOMEPAGE="https://sigrok.org/wiki/Libsigrok;
 
 LICENSE="GPL-3"
 SLOT="0/4"
-IUSE="cxx ftdi java parport python ruby serial static-libs test +udev usb"
+IUSE="+cxx ftdi java parport python ruby serial static-libs test +udev usb"
 REQUIRED_USE="java? ( cxx )
python? ( cxx ${PYTHON_REQUIRED_USE} )
ruby? ( cxx || ( $(ruby_get_use_targets) ) )"

diff --git a/sci-libs/libsigrok/libsigrok-.ebuild 
b/sci-libs/libsigrok/libsigrok-.ebuild
index 2194f4331cb..1449357471e 100644
--- a/sci-libs/libsigrok/libsigrok-.ebuild
+++ b/sci-libs/libsigrok/libsigrok-.ebuild
@@ -22,7 +22,7 @@ HOMEPAGE="https://sigrok.org/wiki/Libsigrok;
 
 LICENSE="GPL-3"
 SLOT="0/"
-IUSE="cxx ftdi java parport python ruby serial static-libs test +udev usb"
+IUSE="+cxx ftdi java parport python ruby serial static-libs test +udev usb"
 REQUIRED_USE="java? ( cxx )
python? ( cxx ${PYTHON_REQUIRED_USE} )
ruby? ( cxx || ( $(ruby_get_use_targets) ) )"

[gentoo-commits] repo/gentoo:master commit in: sci-libs/libsigrok/

2020-07-06 Thread Andreas Sturmlechner

commit: 81efb055e4db1f94cbc976900a132b722b7372ee
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Jul  2 22:45:49 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Jul  6 18:15:23 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81efb055

sci-libs/libsigrok: Big facelift

- ruby24--
- drop eutils.eclass, ltprune.eclass, gnome2-utils.eclass
- sort dependencies
- split lines, one dep per line
- add missing || die
- run default instead of eapply_user in src_prepare

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 sci-libs/libsigrok/libsigrok-0.5.2.ebuild | 60 +++
 sci-libs/libsigrok/libsigrok-.ebuild  | 60 +++
 2 files changed, 74 insertions(+), 46 deletions(-)

diff --git a/sci-libs/libsigrok/libsigrok-0.5.2.ebuild 
b/sci-libs/libsigrok/libsigrok-0.5.2.ebuild
index 49ca96068ac..18ae0ba31b3 100644
--- a/sci-libs/libsigrok/libsigrok-0.5.2.ebuild
+++ b/sci-libs/libsigrok/libsigrok-0.5.2.ebuild
@@ -4,12 +4,12 @@
 EAPI="6"
 
 PYTHON_COMPAT=( python3_{6,7} )
-USE_RUBY="ruby26 ruby25 ruby24"
+USE_RUBY="ruby26 ruby25"
 RUBY_OPTIONAL="yes"
 
-inherit eutils gnome2-utils python-r1 java-pkg-opt-2 ltprune ruby-ng udev 
xdg-utils
+inherit python-r1 java-pkg-opt-2 ruby-ng udev xdg-utils
 
-if [[ ${PV} == "" ]]; then
+if [[ ${PV} == ** ]]; then
EGIT_REPO_URI="git://sigrok.org/${PN}"
inherit git-r3 autotools
 else
@@ -17,42 +17,53 @@ else
KEYWORDS="~amd64 ~x86"
 fi
 
-DESCRIPTION="basic hardware drivers for logic analyzers and input/output file 
format support"
+DESCRIPTION="Basic hardware drivers for logic analyzers and input/output file 
format support"
 HOMEPAGE="https://sigrok.org/wiki/Libsigrok;
 
 LICENSE="GPL-3"
 SLOT="0/4"
-IUSE="cxx ftdi java parport python ruby serial static-libs +udev test usb"
+IUSE="cxx ftdi java parport python ruby serial static-libs test +udev usb"
+REQUIRED_USE="java? ( cxx )
+   python? ( cxx ${PYTHON_REQUIRED_USE} )
+   ruby? ( cxx || ( $(ruby_get_use_targets) ) )"
+
 RESTRICT="!test? ( test )"
-REQUIRED_USE="java? ( cxx ) python? ( cxx ${PYTHON_REQUIRED_USE} ) ruby? ( cxx 
|| ( $(ruby_get_use_targets) ) )"
 
 # We also support librevisa, but that isn't in the tree ...
-LIB_DEPEND=">=dev-libs/glib-2.32.0[static-libs(+)]
+LIB_DEPEND="
+   >=dev-libs/glib-2.32.0[static-libs(+)]
>=dev-libs/libzip-0.8:=[static-libs(+)]
cxx? ( dev-cpp/glibmm:2[static-libs(+)] )
-   python? ( ${PYTHON_DEPS} >=dev-python/pygobject-3.0.0[${PYTHON_USEDEP}] 
)
-   ruby? ( $(ruby_implementations_depend) )
ftdi? ( >=dev-embedded/libftdi-0.16:=[static-libs(+)] )
parport? ( sys-libs/libieee1284[static-libs(+)] )
+   python? (
+   ${PYTHON_DEPS}
+   >=dev-python/pygobject-3.0.0[${PYTHON_USEDEP}]
+   )
+   ruby? ( $(ruby_implementations_depend) )
serial? ( >=dev-libs/libserialport-0.1.1[static-libs(+)] )
-   usb? ( virtual/libusb:1[static-libs(+)] )"
-RDEPEND="!static-libs? ( ${LIB_DEPEND//\[static-libs(+)]} )
+   usb? ( virtual/libusb:1[static-libs(+)] )
+"
+RDEPEND="
+   java? ( >=virtual/jre-1.4 )
+   !static-libs? ( ${LIB_DEPEND//\[static-libs(+)]} )
static-libs? ( ${LIB_DEPEND} )
-   java? ( >=virtual/jre-1.4 )"
+"
 DEPEND="${LIB_DEPEND//\[static-libs(+)]}
-   test? ( >=dev-libs/check-0.9.4 )
cxx? ( app-doc/doxygen )
java? (
>=dev-lang/swig-3.0.6
>=virtual/jdk-1.4
)
python? (
-   dev-python/setuptools[${PYTHON_USEDEP}]
-   dev-python/numpy[${PYTHON_USEDEP}]
>=dev-lang/swig-3.0.6
+   dev-python/numpy[${PYTHON_USEDEP}]
+   dev-python/setuptools[${PYTHON_USEDEP}]
)
ruby? ( >=dev-lang/swig-3.0.8 )
-   virtual/pkgconfig"
+   test? ( >=dev-libs/check-0.9.4 )
+   virtual/pkgconfig
+"
 
 S="${WORKDIR}"/${P}
 
@@ -62,11 +73,11 @@ pkg_setup() {
 }
 
 src_unpack() {
-   [[ ${PV} == "" ]] && git-r3_src_unpack || default
+   [[ ${PV} == ** ]] && git-r3_src_unpack || default
 }
 
 sigrok_src_prepare() {
-   [[ ${PV} == "" ]] && eautoreconf
+   [[ ${PV} == ** ]] && eautoreconf
 }
 
 each_ruby_prepare() {
@@ -74,9 +85,12 @@ each_ruby_prepare() {
 }
 
 src_prepare() {
-   use ruby && cp -rl "${S}" "${WORKDIR}"/all && ruby-ng_src_prepare
+   if use ruby; then
+   cp -rl "${S}" "${WORKDIR}"/all || die
+   ruby-ng_src_prepare
+   fi
+   default
sigrok_src_prepare
-   eapply_user
use python && python_copy_sources
 }
 
@@ -142,15 +156,15 @@ src_install() {
use python && python_foreach_impl each_python_install
use ruby && ruby-ng_src_install
use udev && udev_dorules contrib/*.rules
-   prune_libtool_files
+   find "${D}" -name

[gentoo-commits] repo/gentoo:master commit in: sci-libs/libsigrok/

2020-07-06 Thread Andreas Sturmlechner

commit: b4bb3a7a64050f6a5dbf7252a85a38e6b4e4cd81
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Jul  2 23:11:19 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Jul  6 18:15:24 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4bb3a7a

sci-libs/libsigrok: Drop 0.4.0, 0.5.1

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 sci-libs/libsigrok/Manifest   |   2 -
 sci-libs/libsigrok/libsigrok-0.4.0.ebuild |  90 --
 sci-libs/libsigrok/libsigrok-0.5.1.ebuild | 101 --
 3 files changed, 193 deletions(-)

diff --git a/sci-libs/libsigrok/Manifest b/sci-libs/libsigrok/Manifest
index 5bd8440632e..a25f3c7b87d 100644
--- a/sci-libs/libsigrok/Manifest
+++ b/sci-libs/libsigrok/Manifest
@@ -1,4 +1,2 @@
 DIST libsigrok-0.3.0.tar.gz 924503 BLAKE2B 
132cc952b7314e11034100973f1086d17515fb7b1eb3792506569211fe05e9f35b113fceaff7c0468ad9be0bbcac0251ae63ae856f1393c51e743983e60886df
 SHA512 
b94e8a8da1346f9ab267fd693975411243f2cb016e48ec05f4ad88a8a1dfe5ed6f5ad4ac4bf0e94dc551dc92cd70d2719983e21abaa4811693fb28a27bf74550
-DIST libsigrok-0.4.0.tar.gz 1387329 BLAKE2B 
8d1578c1f84c84af54f0e6c97bcdcec6d183a80170d0b19aa44c4015dac3c418e1a1e304b42b12be3f905a3887f95d2ecc9644aeb2a81a961e09438e380ec70b
 SHA512 
5963c1a44cf351a38d9434f89a15b20d36c7196a78464c302c65ab262bcdb2f26274c7fabf01174757e1f9a367497b9721578ebf802f75ef97ee71ff3dade1e0
-DIST libsigrok-0.5.1.tar.gz 1664813 BLAKE2B 
b5765e1057ee4411ef2f83fa73473429bc8f84653f1c7761af3c1280decc2fcb1d3c68d8f92f7e77b85f1fcda74cf6066e5bf56c0da2de4b28148b920b94e0da
 SHA512 
48337fc4625dc0abc162ae54e04ce091047835aa1e49ba1ab84542805008d1ff5646b143fde57e317f3b34514c0e6d4dcb7b1c5944f3f16bdef1a7169edc3517
 DIST libsigrok-0.5.2.tar.gz 1779465 BLAKE2B 
fc6fdde1054e9ac50bc42249c34b3dbfff1e89d77f0db5a8762e52fcf2ea5ea69b2defcf1cde4ed7b1edd1e21770002ed661a470c8d666904daa48a84a2bbfc5
 SHA512 
cf673dad6280302d69050c29490621f66c6d6a73932d019a53ec3501316d3f2e23e7667a04f866dbe6ed73f86a63de73d2173e2b6cea563631d705e06f887092

diff --git a/sci-libs/libsigrok/libsigrok-0.4.0.ebuild 
b/sci-libs/libsigrok/libsigrok-0.4.0.ebuild
deleted file mode 100644
index df9318757a5..000
--- a/sci-libs/libsigrok/libsigrok-0.4.0.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit eutils python-single-r1 java-pkg-opt-2 ltprune
-
-if [[ ${PV} == "" ]]; then
-   EGIT_REPO_URI="git://sigrok.org/${PN}"
-   inherit git-r3 autotools
-else
-   SRC_URI="https://sigrok.org/download/source/${PN}/${P}.tar.gz;
-   KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="basic hardware drivers for logic analyzers and input/output file 
format support"
-HOMEPAGE="https://sigrok.org/wiki/Libsigrok;
-
-LICENSE="GPL-3"
-SLOT="0/3"
-IUSE="cxx ftdi java parport python serial static-libs test usb"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="java? ( cxx ) python? ( cxx ${PYTHON_REQUIRED_USE} )"
-
-# We also support librevisa, but that isn't in the tree ...
-LIB_DEPEND=">=dev-libs/glib-2.32.0[static-libs(+)]
-   >=dev-libs/libzip-0.8:=[static-libs(+)]
-   cxx? ( dev-cpp/glibmm:2[static-libs(+)] )
-   python? (
-   ${PYTHON_DEPS}
-   $(python_gen_cond_dep '
-   >=dev-python/pygobject-3.0.0[${PYTHON_MULTI_USEDEP}]
-   ')
-   )
-   ftdi? ( >=dev-embedded/libftdi-0.16:=[static-libs(+)] )
-   parport? ( sys-libs/libieee1284[static-libs(+)] )
-   serial? ( >=dev-libs/libserialport-0.1.1[static-libs(+)] )
-   usb? ( virtual/libusb:1[static-libs(+)] )"
-RDEPEND="!static-libs? ( ${LIB_DEPEND//\[static-libs(+)]} )
-   static-libs? ( ${LIB_DEPEND} )
-   java? ( >=virtual/jre-1.4 )"
-DEPEND="${LIB_DEPEND//\[static-libs(+)]}
-   test? ( >=dev-libs/check-0.9.4 )
-   cxx? ( app-doc/doxygen )
-   java? (
-   >=dev-lang/swig-3.0.6
-   >=virtual/jdk-1.4
-   )
-   python? (
-   $(python_gen_cond_dep '
-   dev-python/setuptools[${PYTHON_MULTI_USEDEP}]
-   dev-python/numpy[${PYTHON_MULTI_USEDEP}]
-   ')
-   >=dev-lang/swig-3.0.6
-   )
-   virtual/pkgconfig"
-
-pkg_setup() {
-   use python && python-single-r1_pkg_setup
-   java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-   [[ ${PV} == "" ]] && eautoreconf
-   eapply_user
-}
-
-src_configure() {
-   econf \
-   $(use_with ftdi libftdi) \
-   $(use_with parport libieee1284) \
-   $(use_with serial libserialport) \
-   $(use_with usb libusb) \
-   $(use_enable cxx) \
-   $(use_enable java) \
-   $(use_enable python) \
-   --disable-ruby \
-

[gentoo-commits] repo/gentoo:master commit in: sci-libs/libsigrok/

2020-07-06 Thread Andreas Sturmlechner

commit: 03b3c1e088fef1a1327fd46a8b46ea6021553307
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Jul  2 22:51:59 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Jul  6 18:15:23 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03b3c1e0

sci-libs/libsigrok: Run python_setup conditionally in pkg_setup

...instead of unconditionally in src_configure.

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 sci-libs/libsigrok/libsigrok-0.5.2.ebuild | 2 +-
 sci-libs/libsigrok/libsigrok-.ebuild  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-libs/libsigrok/libsigrok-0.5.2.ebuild 
b/sci-libs/libsigrok/libsigrok-0.5.2.ebuild
index 18ae0ba31b3..476037f9317 100644
--- a/sci-libs/libsigrok/libsigrok-0.5.2.ebuild
+++ b/sci-libs/libsigrok/libsigrok-0.5.2.ebuild
@@ -68,6 +68,7 @@ DEPEND="${LIB_DEPEND//\[static-libs(+)]}
 S="${WORKDIR}"/${P}
 
 pkg_setup() {
+   use python && python_setup
use ruby && ruby-ng_pkg_setup
java-pkg-opt-2_pkg_setup
 }
@@ -116,7 +117,6 @@ each_python_configure() {
 }
 
 src_configure() {
-   python_setup
sigrok_src_configure --disable-ruby --disable-python
use ruby && ruby-ng_src_configure
use python && python_foreach_impl each_python_configure

diff --git a/sci-libs/libsigrok/libsigrok-.ebuild 
b/sci-libs/libsigrok/libsigrok-.ebuild
index 065e6b2667f..ce8dd772ca1 100644
--- a/sci-libs/libsigrok/libsigrok-.ebuild
+++ b/sci-libs/libsigrok/libsigrok-.ebuild
@@ -68,6 +68,7 @@ DEPEND="${LIB_DEPEND//\[static-libs(+)]}
 S="${WORKDIR}"/${P}
 
 pkg_setup() {
+   use python && python_setup
use ruby && ruby-ng_pkg_setup
java-pkg-opt-2_pkg_setup
 }
@@ -116,7 +117,6 @@ each_python_configure() {
 }
 
 src_configure() {
-   python_setup
sigrok_src_configure --disable-ruby --disable-python
use ruby && ruby-ng_src_configure
use python && python_foreach_impl each_python_configure

[gentoo-commits] repo/gentoo:master commit in: sci-libs/libsigrok/files/, sci-libs/libsigrok/

2020-07-06 Thread Andreas Sturmlechner

commit: 2d67ebbf58c156b92a1ef37bec35e3d780a5f746
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Jul  5 22:06:48 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Jul  6 18:15:24 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d67ebbf

sci-libs/libsigrok: Fix build with IUSE=java and >=dev-lang/swig-4

See also: https://sigrok.org/bugzilla/show_bug.cgi?id=1527

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../libsigrok/files/libsigrok-0.5.2-swig-4.patch   | 37 ++
 sci-libs/libsigrok/libsigrok-0.5.2.ebuild  |  3 ++
 2 files changed, 40 insertions(+)

diff --git a/sci-libs/libsigrok/files/libsigrok-0.5.2-swig-4.patch 
b/sci-libs/libsigrok/files/libsigrok-0.5.2-swig-4.patch
new file mode 100644
index 000..3c5dd85a510
--- /dev/null
+++ b/sci-libs/libsigrok/files/libsigrok-0.5.2-swig-4.patch
@@ -0,0 +1,37 @@
+From e803574173bdac8a7f33085a648c29eaf248a394 Mon Sep 17 00:00:00 2001
+From: Uwe Hermann 
+Date: Sat, 4 Apr 2020 21:54:13 +0200
+Subject: [PATCH 1/1] bindings/java: Fix build issue with SWIG 4.x.
+
+Tested with SWIG 3.x and SWIG 4.x.
+
+This fixes bug #1527.
+---
+ bindings/java/org/sigrok/core/classes/classes.i | 8 
+ 1 file changed, 8 insertions(+)
+
+diff --git a/bindings/java/org/sigrok/core/classes/classes.i 
b/bindings/java/org/sigrok/core/classes/classes.i
+index 75793b25..e953fe5d 100644
+--- a/bindings/java/org/sigrok/core/classes/classes.i
 b/bindings/java/org/sigrok/core/classes/classes.i
+@@ -94,10 +94,18 @@ VECTOR(std::shared_ptr, 
HardwareDevice)
+   "java.util.Map"
+ 
+ %typemap(javain,
++/* SWIG 4.0.0 changed the std::map wrappers in an incompatible way. */
++#if SWIG_VERSION >= 0x04
++pre="  $javaclassname temp$javainput = new $javaclassname();
++for (java.util.Map.Entry entry : $javainput.entrySet())
++  temp$javainput.put(entry.getKey(), entry.getValue());",
++pgcppname="temp$javainput")
++#else
+ pre="  $javaclassname temp$javainput = new $javaclassname();
+ for (java.util.Map.Entry entry : $javainput.entrySet())
+   temp$javainput.set(entry.getKey(), entry.getValue());",
+ pgcppname="temp$javainput")
++#endif
+   std::map< CKey, CValue > "$javaclassname.getCPtr(temp$javainput)"
+ 
+ %typemap(javaout) std::map< CKey, CValue > {
+-- 
+2.24.0.rc2

diff --git a/sci-libs/libsigrok/libsigrok-0.5.2.ebuild 
b/sci-libs/libsigrok/libsigrok-0.5.2.ebuild
index ba30bc5fe2d..03ae49481ed 100644
--- a/sci-libs/libsigrok/libsigrok-0.5.2.ebuild
+++ b/sci-libs/libsigrok/libsigrok-0.5.2.ebuild
@@ -67,6 +67,9 @@ DEPEND="${LIB_DEPEND//\[static-libs(+)]}
 
 S="${WORKDIR}"/${P}
 
+# https://sigrok.org/bugzilla/show_bug.cgi?id=1527
+PATCHES=( "${FILESDIR}/${P}-swig-4.patch" )
+
 pkg_setup() {
use python && python_setup
use ruby && ruby-ng_pkg_setup

[gentoo-commits] repo/gentoo:master commit in: sci-libs/libsigrok/, sci-libs/libsigrok/files/

2020-07-06 Thread Andreas Sturmlechner

commit: d444c133186ee28d7b6ef65d27c692378c93a372
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Jul  5 22:20:04 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Jul  6 18:15:24 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d444c133

sci-libs/libsigrok: Fix build with IUSE=ruby

Closes: https://bugs.gentoo.org/705074
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../files/libsigrok-0.5.2-ruby-swig-docs.patch | 63 ++
 sci-libs/libsigrok/libsigrok-0.5.2.ebuild  |  8 ++-
 2 files changed, 69 insertions(+), 2 deletions(-)

diff --git a/sci-libs/libsigrok/files/libsigrok-0.5.2-ruby-swig-docs.patch 
b/sci-libs/libsigrok/files/libsigrok-0.5.2-ruby-swig-docs.patch
new file mode 100644
index 000..808227a2fff
--- /dev/null
+++ b/sci-libs/libsigrok/files/libsigrok-0.5.2-ruby-swig-docs.patch
@@ -0,0 +1,63 @@
+From bae9308ec157378bd22ce4f4a0226f1e7ef23594 Mon Sep 17 00:00:00 2001
+From: Anatol Pomozov 
+Date: Mon, 8 Jun 2020 20:46:44 -0700
+Subject: [PATCH] Fix ruby SWIG bindings generation
+
+bindings/swig/doc.py generates a swig interface file for ruby bindings
+that includes docstrings with comments braces ( /* and */ ) like this:
+
+  %feature("docstring") sigrok::Channel::type "/* Type of this channel. */\n";
+  %feature("docstring") sigrok::Channel::enabled "/* Enabled status of this 
channel. */\n";
+
+SWIG generates *.cxx and adds its own braces to the docstring:
+
+/*/* Document-class: Sigrok::Error
+Exception thrown when an error code is returned by any libsigrok call. */
+*/
+
+this causes compilation error for Ruby bindings.
+
+To fix the error we should not add extra braces to the docstring.
+With this patch libsigrok compiles fine with with ruby 2.7 and swig 4.0.2.
+
+Fixes bug #1526
+
+Signed-off-by: Anatol Pomozov 
+---
+ bindings/swig/doc.py | 8 
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/bindings/swig/doc.py b/bindings/swig/doc.py
+index e8767af8..182f5477 100644
+--- a/bindings/swig/doc.py
 b/bindings/swig/doc.py
+@@ -46,7 +46,7 @@ for compound in index.findall('compound'):
+ if language == 'python':
+ print('%%feature("docstring") %s "%s";' % (class_name, brief))
+ elif language == 'ruby':
+-print('%%feature("docstring") %s "/* Document-class: %s\\n%s 
*/\\n";' % (class_name, class_name.replace("sigrok", "Sigrok", 1), brief))
++print('%%feature("docstring") %s "Document-class: %s\\n%s\\n";' % 
(class_name, class_name.replace("sigrok", "Sigrok", 1), brief))
+ elif language == 'java':
+ print('%%typemap(javaclassmodifiers) %s "/** %s */\npublic 
class"' % (
+ class_name, brief))
+@@ -77,10 +77,10 @@ for compound in index.findall('compound'):
+ for name, desc in parameters.items()]) + '";')
+ if language == 'ruby' and kind == 'public-func':
+ print(str.join('\n', [
+-'%%feature("docstring") %s::%s "/* %s' % (
++'%%feature("docstring") %s::%s "%s' % (
+ class_name, member_name, brief)] + [
+ '@param %s %s' % (name, desc)
+-for name, desc in parameters.items()]) + ' 
*/\\n";')
++for name, desc in parameters.items()]) + '\\n";')
+ elif language == 'java' and kind == 'public-func':
+ print(str.join('\n', [
+ '%%javamethodmodifiers %s::%s "/** %s' % (
+@@ -111,4 +111,4 @@ for compound in index.findall('compound'):
+ print('%}')
+ elif language == 'ruby' and constants:
+ for member_name, brief in constants:
+-print('%%feature("docstring") %s::%s "/* %s */\\n";' % 
(class_name, member_name, brief))
++print('%%feature("docstring") %s::%s "%s\\n";' % (class_name, 
member_name, brief))
+-- 
+2.27.0

diff --git a/sci-libs/libsigrok/libsigrok-0.5.2.ebuild 
b/sci-libs/libsigrok/libsigrok-0.5.2.ebuild
index 03ae49481ed..7e3111fc54d 100644
--- a/sci-libs/libsigrok/libsigrok-0.5.2.ebuild
+++ b/sci-libs/libsigrok/libsigrok-0.5.2.ebuild
@@ -67,8 +67,12 @@ DEPEND="${LIB_DEPEND//\[static-libs(+)]}
 
 S="${WORKDIR}"/${P}
 
-# https://sigrok.org/bugzilla/show_bug.cgi?id=1527
-PATCHES=( "${FILESDIR}/${P}-swig-4.patch" )
+PATCHES=(
+   # https://sigrok.org/bugzilla/show_bug.cgi?id=1527
+   "${FILESDIR}/${P}-swig-4.patch"
+   # https://sigrok.org/bugzilla/show_bug.cgi?id=1526
+   "${FILESDIR}/${P}-ruby-swig-docs.patch" # bug 705074
+)
 
 pkg_setup() {
use python && python_setup

[gentoo-commits] repo/gentoo:master commit in: sci-libs/libsigrok/

2020-07-06 Thread Andreas Sturmlechner

commit: c3afa36c0f88c98ad100588493867d6915a87801
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Jul  5 21:55:46 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Jul  6 18:15:23 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3afa36c

sci-libs/libsigrok: python3_8

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 sci-libs/libsigrok/libsigrok-0.5.2.ebuild | 2 +-
 sci-libs/libsigrok/libsigrok-.ebuild  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-libs/libsigrok/libsigrok-0.5.2.ebuild 
b/sci-libs/libsigrok/libsigrok-0.5.2.ebuild
index 476037f9317..bcd79fccc6f 100644
--- a/sci-libs/libsigrok/libsigrok-0.5.2.ebuild
+++ b/sci-libs/libsigrok/libsigrok-0.5.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 USE_RUBY="ruby26 ruby25"
 RUBY_OPTIONAL="yes"
 

diff --git a/sci-libs/libsigrok/libsigrok-.ebuild 
b/sci-libs/libsigrok/libsigrok-.ebuild
index ce8dd772ca1..2194f4331cb 100644
--- a/sci-libs/libsigrok/libsigrok-.ebuild
+++ b/sci-libs/libsigrok/libsigrok-.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 USE_RUBY="ruby26 ruby25"
 RUBY_OPTIONAL="yes"

[gentoo-commits] repo/gentoo:master commit in: sci-libs/libsigrok/

2020-02-09 Thread Michał Górny

commit: 18786cdbe9d22955bf2ac9f1b52968f9ae74b6c8
Author: Michał Górny  gentoo  org>
AuthorDate: Fri Feb  7 19:06:18 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Feb  9 16:35:30 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18786cdb

sci-libs/libsigrok: Switch to PYTHON_MULTI_USEDEP API

Signed-off-by: Michał Górny  gentoo.org>

 sci-libs/libsigrok/libsigrok-0.4.0.ebuild | 13 ++---
 sci-libs/libsigrok/libsigrok-0.5.1.ebuild | 13 ++---
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/sci-libs/libsigrok/libsigrok-0.4.0.ebuild 
b/sci-libs/libsigrok/libsigrok-0.4.0.ebuild
index 4b21e16866f..a1816ed7b3c 100644
--- a/sci-libs/libsigrok/libsigrok-0.4.0.ebuild
+++ b/sci-libs/libsigrok/libsigrok-0.4.0.ebuild
@@ -28,7 +28,12 @@ REQUIRED_USE="java? ( cxx ) python? ( cxx 
${PYTHON_REQUIRED_USE} )"
 LIB_DEPEND=">=dev-libs/glib-2.32.0[static-libs(+)]
>=dev-libs/libzip-0.8:=[static-libs(+)]
cxx? ( dev-cpp/glibmm:2[static-libs(+)] )
-   python? ( ${PYTHON_DEPS} >=dev-python/pygobject-3.0.0[${PYTHON_USEDEP}] 
)
+   python? (
+   ${PYTHON_DEPS}
+   $(python_gen_cond_dep '
+   >=dev-python/pygobject-3.0.0[${PYTHON_MULTI_USEDEP}]
+   ')
+   )
ftdi? ( >=dev-embedded/libftdi-0.16:=[static-libs(+)] )
parport? ( sys-libs/libieee1284[static-libs(+)] )
serial? ( >=dev-libs/libserialport-0.1.1[static-libs(+)] )
@@ -44,8 +49,10 @@ DEPEND="${LIB_DEPEND//\[static-libs(+)]}
>=virtual/jdk-1.4
)
python? (
-   dev-python/setuptools[${PYTHON_USEDEP}]
-   dev-python/numpy[${PYTHON_USEDEP}]
+   $(python_gen_cond_dep '
+   dev-python/setuptools[${PYTHON_MULTI_USEDEP}]
+   dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+   ')
>=dev-lang/swig-3.0.6
)
virtual/pkgconfig"

diff --git a/sci-libs/libsigrok/libsigrok-0.5.1.ebuild 
b/sci-libs/libsigrok/libsigrok-0.5.1.ebuild
index af1e257b901..de2b5e3a0ce 100644
--- a/sci-libs/libsigrok/libsigrok-0.5.1.ebuild
+++ b/sci-libs/libsigrok/libsigrok-0.5.1.ebuild
@@ -28,7 +28,12 @@ REQUIRED_USE="java? ( cxx ) python? ( cxx 
${PYTHON_REQUIRED_USE} )"
 LIB_DEPEND=">=dev-libs/glib-2.32.0[static-libs(+)]
>=dev-libs/libzip-0.8:=[static-libs(+)]
cxx? ( dev-cpp/glibmm:2[static-libs(+)] )
-   python? ( ${PYTHON_DEPS} >=dev-python/pygobject-3.0.0[${PYTHON_USEDEP}] 
)
+   python? (
+   ${PYTHON_DEPS}
+   $(python_gen_cond_dep '
+   >=dev-python/pygobject-3.0.0[${PYTHON_MULTI_USEDEP}]
+   ')
+   )
ftdi? ( >=dev-embedded/libftdi-0.16:=[static-libs(+)] )
parport? ( sys-libs/libieee1284[static-libs(+)] )
serial? ( >=dev-libs/libserialport-0.1.1[static-libs(+)] )
@@ -44,8 +49,10 @@ DEPEND="${LIB_DEPEND//\[static-libs(+)]}
>=virtual/jdk-1.4
)
python? (
-   dev-python/setuptools[${PYTHON_USEDEP}]
-   dev-python/numpy[${PYTHON_USEDEP}]
+   $(python_gen_cond_dep '
+   dev-python/setuptools[${PYTHON_MULTI_USEDEP}]
+   dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+   ')
>=dev-lang/swig-3.0.6
)
virtual/pkgconfig"

[gentoo-commits] repo/gentoo:master commit in: sci-libs/libsigrok/

2020-01-15 Thread Michał Górny

commit: 9b431e299a46705b99fa0bc8e1c190e637abcd51
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Jan 16 06:33:32 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Jan 16 06:38:18 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b431e29

sci-libs/libsigrok: Remove Python 2

Signed-off-by: Michał Górny  gentoo.org>

 sci-libs/libsigrok/libsigrok-0.4.0.ebuild | 2 +-
 sci-libs/libsigrok/libsigrok-0.5.1.ebuild | 2 +-
 sci-libs/libsigrok/libsigrok-0.5.2.ebuild | 2 +-
 sci-libs/libsigrok/libsigrok-.ebuild  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sci-libs/libsigrok/libsigrok-0.4.0.ebuild 
b/sci-libs/libsigrok/libsigrok-0.4.0.ebuild
index a360d439247..4b21e16866f 100644
--- a/sci-libs/libsigrok/libsigrok-0.4.0.ebuild
+++ b/sci-libs/libsigrok/libsigrok-0.4.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit eutils python-single-r1 java-pkg-opt-2
 

diff --git a/sci-libs/libsigrok/libsigrok-0.5.1.ebuild 
b/sci-libs/libsigrok/libsigrok-0.5.1.ebuild
index a55893a0199..af1e257b901 100644
--- a/sci-libs/libsigrok/libsigrok-0.5.1.ebuild
+++ b/sci-libs/libsigrok/libsigrok-0.5.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit eutils gnome2-utils python-single-r1 java-pkg-opt-2 udev xdg-utils
 

diff --git a/sci-libs/libsigrok/libsigrok-0.5.2.ebuild 
b/sci-libs/libsigrok/libsigrok-0.5.2.ebuild
index b34f77155e0..ef3ba1331db 100644
--- a/sci-libs/libsigrok/libsigrok-0.5.2.ebuild
+++ b/sci-libs/libsigrok/libsigrok-0.5.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 USE_RUBY="ruby26 ruby25 ruby24"
 RUBY_OPTIONAL="yes"
 

diff --git a/sci-libs/libsigrok/libsigrok-.ebuild 
b/sci-libs/libsigrok/libsigrok-.ebuild
index 5c3c959d1d2..5f5f5dc0de7 100644
--- a/sci-libs/libsigrok/libsigrok-.ebuild
+++ b/sci-libs/libsigrok/libsigrok-.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 USE_RUBY="ruby26 ruby25 ruby24"
 RUBY_OPTIONAL="yes"

[gentoo-commits] repo/gentoo:master commit in: sci-libs/libsigrok/

2019-12-31 Thread Sven Wegener

commit: 2e518193fb981eaa830104563621b383f4207843
Author: Sven Wegener  gentoo  org>
AuthorDate: Tue Dec 31 14:43:29 2019 +
Commit: Sven Wegener  gentoo  org>
CommitDate: Tue Dec 31 15:13:14 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e518193

sci-libs/libsigrok: Optimize python modules

Package-Manager: Portage-2.3.79, Repoman-2.3.16
Signed-off-by: Sven Wegener  gentoo.org>

 sci-libs/libsigrok/libsigrok-.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sci-libs/libsigrok/libsigrok-.ebuild 
b/sci-libs/libsigrok/libsigrok-.ebuild
index 22fa3622f09..434df74ec09 100644
--- a/sci-libs/libsigrok/libsigrok-.ebuild
+++ b/sci-libs/libsigrok/libsigrok-.ebuild
@@ -134,6 +134,7 @@ each_ruby_install() {
 each_python_install() {
cd "${BUILD_DIR}"
emake python-install DESTDIR="${D}"
+   python_optimize
 }
 
 src_install() {

[gentoo-commits] repo/gentoo:master commit in: sci-libs/libsigrok/

2019-12-31 Thread Sven Wegener

commit: b151de6f5ea2bb92bc151968c8dd947c192d8179
Author: Sven Wegener  gentoo  org>
AuthorDate: Tue Dec 31 15:07:50 2019 +
Commit: Sven Wegener  gentoo  org>
CommitDate: Tue Dec 31 15:13:26 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b151de6f

sci-libs/libsigrok: Version bump to 0.5.2

Package-Manager: Portage-2.3.79, Repoman-2.3.16
Signed-off-by: Sven Wegener  gentoo.org>

 sci-libs/libsigrok/Manifest   |   1 +
 sci-libs/libsigrok/libsigrok-0.5.2.ebuild | 156 ++
 2 files changed, 157 insertions(+)

diff --git a/sci-libs/libsigrok/Manifest b/sci-libs/libsigrok/Manifest
index db935b04490..5bd8440632e 100644
--- a/sci-libs/libsigrok/Manifest
+++ b/sci-libs/libsigrok/Manifest
@@ -1,3 +1,4 @@
 DIST libsigrok-0.3.0.tar.gz 924503 BLAKE2B 
132cc952b7314e11034100973f1086d17515fb7b1eb3792506569211fe05e9f35b113fceaff7c0468ad9be0bbcac0251ae63ae856f1393c51e743983e60886df
 SHA512 
b94e8a8da1346f9ab267fd693975411243f2cb016e48ec05f4ad88a8a1dfe5ed6f5ad4ac4bf0e94dc551dc92cd70d2719983e21abaa4811693fb28a27bf74550
 DIST libsigrok-0.4.0.tar.gz 1387329 BLAKE2B 
8d1578c1f84c84af54f0e6c97bcdcec6d183a80170d0b19aa44c4015dac3c418e1a1e304b42b12be3f905a3887f95d2ecc9644aeb2a81a961e09438e380ec70b
 SHA512 
5963c1a44cf351a38d9434f89a15b20d36c7196a78464c302c65ab262bcdb2f26274c7fabf01174757e1f9a367497b9721578ebf802f75ef97ee71ff3dade1e0
 DIST libsigrok-0.5.1.tar.gz 1664813 BLAKE2B 
b5765e1057ee4411ef2f83fa73473429bc8f84653f1c7761af3c1280decc2fcb1d3c68d8f92f7e77b85f1fcda74cf6066e5bf56c0da2de4b28148b920b94e0da
 SHA512 
48337fc4625dc0abc162ae54e04ce091047835aa1e49ba1ab84542805008d1ff5646b143fde57e317f3b34514c0e6d4dcb7b1c5944f3f16bdef1a7169edc3517
+DIST libsigrok-0.5.2.tar.gz 1779465 BLAKE2B 
fc6fdde1054e9ac50bc42249c34b3dbfff1e89d77f0db5a8762e52fcf2ea5ea69b2defcf1cde4ed7b1edd1e21770002ed661a470c8d666904daa48a84a2bbfc5
 SHA512 
cf673dad6280302d69050c29490621f66c6d6a73932d019a53ec3501316d3f2e23e7667a04f866dbe6ed73f86a63de73d2173e2b6cea563631d705e06f887092

diff --git a/sci-libs/libsigrok/libsigrok-0.5.2.ebuild 
b/sci-libs/libsigrok/libsigrok-0.5.2.ebuild
new file mode 100644
index 000..6613025d515
--- /dev/null
+++ b/sci-libs/libsigrok/libsigrok-0.5.2.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+USE_RUBY="ruby26 ruby25 ruby24"
+RUBY_OPTIONAL="yes"
+
+inherit eutils gnome2-utils python-r1 java-pkg-opt-2 ruby-ng udev xdg-utils
+
+if [[ ${PV} == "" ]]; then
+   EGIT_REPO_URI="git://sigrok.org/${PN}"
+   inherit git-r3 autotools
+else
+   SRC_URI="https://sigrok.org/download/source/${PN}/${P}.tar.gz;
+   KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="basic hardware drivers for logic analyzers and input/output file 
format support"
+HOMEPAGE="https://sigrok.org/wiki/Libsigrok;
+
+LICENSE="GPL-3"
+SLOT="0/4"
+IUSE="cxx ftdi java parport python ruby serial static-libs +udev test usb"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="java? ( cxx ) python? ( cxx ${PYTHON_REQUIRED_USE} ) ruby? ( cxx 
|| ( $(ruby_get_use_targets) ) )"
+
+# We also support librevisa, but that isn't in the tree ...
+LIB_DEPEND=">=dev-libs/glib-2.32.0[static-libs(+)]
+   >=dev-libs/libzip-0.8:=[static-libs(+)]
+   cxx? ( dev-cpp/glibmm:2[static-libs(+)] )
+   python? ( ${PYTHON_DEPS} >=dev-python/pygobject-3.0.0[${PYTHON_USEDEP}] 
)
+   ruby? ( $(ruby_implementations_depend) )
+   ftdi? ( >=dev-embedded/libftdi-0.16:=[static-libs(+)] )
+   parport? ( sys-libs/libieee1284[static-libs(+)] )
+   serial? ( >=dev-libs/libserialport-0.1.1[static-libs(+)] )
+   usb? ( virtual/libusb:1[static-libs(+)] )"
+RDEPEND="!static-libs? ( ${LIB_DEPEND//\[static-libs(+)]} )
+   static-libs? ( ${LIB_DEPEND} )
+   java? ( >=virtual/jre-1.4 )"
+DEPEND="${LIB_DEPEND//\[static-libs(+)]}
+   test? ( >=dev-libs/check-0.9.4 )
+   cxx? ( app-doc/doxygen )
+   java? (
+   >=dev-lang/swig-3.0.6
+   >=virtual/jdk-1.4
+   )
+   python? (
+   dev-python/setuptools[${PYTHON_USEDEP}]
+   dev-python/numpy[${PYTHON_USEDEP}]
+   >=dev-lang/swig-3.0.6
+   )
+   ruby? ( >=dev-lang/swig-3.0.8 )
+   virtual/pkgconfig"
+
+S="${WORKDIR}"/${P}
+
+pkg_setup() {
+   use ruby && ruby-ng_pkg_setup
+   java-pkg-opt-2_pkg_setup
+}
+
+src_unpack() {
+   [[ ${PV} == "" ]] && git-r3_src_unpack || default
+}
+
+sigrok_src_prepare() {
+   [[ ${PV} == "" ]] && eautoreconf
+}
+
+each_ruby_prepare() {
+   sigrok_src_prepare
+}
+
+src_prepare() {
+   use ruby && cp -rl "${S}" "${WORKDIR}"/all && ruby-ng_src_prepare
+   sigrok_src_prepare
+   eapply_user
+   use python && python_copy_sources
+}
+
+sigrok_src_configure() {
+   econf \
+   $(use_with ftdi libftdi) \
+   $(use_with parport

[gentoo-commits] repo/gentoo:master commit in: sci-libs/libsigrok/

2019-04-12 Thread Sven Wegener

commit: f116ea372762cb0dd20879f479272678ef39f731
Author: Sven Wegener  gentoo  org>
AuthorDate: Fri Apr 12 17:27:39 2019 +
Commit: Sven Wegener  gentoo  org>
CommitDate: Fri Apr 12 17:30:26 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f116ea37

sci-libs/libsigrok: Build for multiple python and ruby versions

Closes: https://bugs.gentoo.org/578328
Signed-off-by: Sven Wegener  gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11

 sci-libs/libsigrok/libsigrok-.ebuild | 81 
 1 file changed, 71 insertions(+), 10 deletions(-)

diff --git a/sci-libs/libsigrok/libsigrok-.ebuild 
b/sci-libs/libsigrok/libsigrok-.ebuild
index 4c9fa1e4807..b82051f8e0f 100644
--- a/sci-libs/libsigrok/libsigrok-.ebuild
+++ b/sci-libs/libsigrok/libsigrok-.ebuild
@@ -3,9 +3,11 @@
 
 EAPI="6"
 
-PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+USE_RUBY="ruby26 ruby25 ruby24"
+RUBY_OPTIONAL="yes"
 
-inherit eutils gnome2-utils python-single-r1 java-pkg-opt-2 udev xdg-utils
+inherit eutils gnome2-utils python-r1 java-pkg-opt-2 ruby-ng udev xdg-utils
 
 if [[ ${PV} == "" ]]; then
EGIT_REPO_URI="git://sigrok.org/${PN}"
@@ -20,14 +22,15 @@ HOMEPAGE="https://sigrok.org/wiki/Libsigrok;
 
 LICENSE="GPL-3"
 SLOT="0/"
-IUSE="cxx ftdi java parport python serial static-libs test +udev usb"
-REQUIRED_USE="java? ( cxx ) python? ( cxx ${PYTHON_REQUIRED_USE} )"
+IUSE="cxx ftdi java parport python ruby serial static-libs +udev test usb"
+REQUIRED_USE="java? ( cxx ) python? ( cxx ${PYTHON_REQUIRED_USE} ) ruby? ( cxx 
|| ( $(ruby_get_use_targets) ) )"
 
 # We also support librevisa, but that isn't in the tree ...
 LIB_DEPEND=">=dev-libs/glib-2.32.0[static-libs(+)]
>=dev-libs/libzip-0.8:=[static-libs(+)]
cxx? ( dev-cpp/glibmm:2[static-libs(+)] )
python? ( ${PYTHON_DEPS} >=dev-python/pygobject-3.0.0[${PYTHON_USEDEP}] 
)
+   ruby? ( $(ruby_implementations_depend) )
ftdi? ( >=dev-embedded/libftdi-0.16:=[static-libs(+)] )
parport? ( sys-libs/libieee1284[static-libs(+)] )
serial? ( >=dev-libs/libserialport-0.1.1[static-libs(+)] )
@@ -47,19 +50,36 @@ DEPEND="${LIB_DEPEND//\[static-libs(+)]}
dev-python/numpy[${PYTHON_USEDEP}]
>=dev-lang/swig-3.0.6
)
+   ruby? ( >=dev-lang/swig-3.0.8 )
virtual/pkgconfig"
 
+S="${WORKDIR}"/${P}
+
 pkg_setup() {
-   use python && python-single-r1_pkg_setup
+   use ruby && ruby-ng_pkg_setup
java-pkg-opt-2_pkg_setup
 }
 
-src_prepare() {
+src_unpack() {
+   [[ ${PV} == "" ]] && git-r3_src_unpack || default
+}
+
+sigrok_src_prepare() {
[[ ${PV} == "" ]] && eautoreconf
+}
+
+each_ruby_prepare() {
+   sigrok_src_prepare
+}
+
+src_prepare() {
+   use ruby && cp -rl "${S}" "${WORKDIR}"/all && ruby-ng_src_prepare
+   sigrok_src_prepare
eapply_user
+   use python && python_copy_sources
 }
 
-src_configure() {
+sigrok_src_configure() {
econf \
$(use_with ftdi libftdi) \
$(use_with parport libieee1284) \
@@ -67,17 +87,58 @@ src_configure() {
$(use_with usb libusb) \
$(use_enable cxx) \
$(use_enable java) \
-   $(use_enable python) \
-   --disable-ruby \
-   $(use_enable static-libs static)
+   $(use_enable static-libs static) \
+   "${@}"
+}
+
+each_ruby_configure() {
+   RUBY="${RUBY}" sigrok_src_configure --enable-ruby --disable-python
+}
+
+each_python_configure() {
+   cd "${BUILD_DIR}"
+   sigrok_src_configure --disable-ruby --enable-python
+}
+
+src_configure() {
+   python_setup
+   sigrok_src_configure --disable-ruby --disable-python
+   use ruby && ruby-ng_src_configure
+   use python && python_foreach_impl each_python_configure
+}
+
+each_ruby_compile() {
+   emake ruby-build
+}
+
+each_python_compile() {
+   cd "${BUILD_DIR}"
+   emake python-build
+}
+
+src_compile() {
+   default
+   use ruby && ruby-ng_src_compile
+   use python && python_foreach_impl each_python_compile
 }
 
 src_test() {
emake check
 }
 
+each_ruby_install() {
+   emake ruby-install DESTDIR="${D}"
+}
+
+each_python_install() {
+   cd "${BUILD_DIR}"
+   emake python-install DESTDIR="${D}"
+}
+
 src_install() {
default
+   use python && python_foreach_impl each_python_install
+   use ruby && ruby-ng_src_install
use udev && udev_dorules contrib/*.rules
prune_libtool_files
 }

[gentoo-commits] repo/gentoo:master commit in: sci-libs/libsigrok/

2019-04-12 Thread Sven Wegener

commit: d5751f01a9aad9ae1f4ab7e0140784ca861854d0
Author: Sven Wegener  gentoo  org>
AuthorDate: Fri Apr 12 15:40:51 2019 +
Commit: Sven Wegener  gentoo  org>
CommitDate: Fri Apr 12 15:44:11 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5751f01

sci-libs/libsigrok: Cleanup

Signed-off-by: Sven Wegener  gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11

 sci-libs/libsigrok/Manifest   |  1 -
 sci-libs/libsigrok/libsigrok-0.5.0.ebuild | 92 ---
 2 files changed, 93 deletions(-)

diff --git a/sci-libs/libsigrok/Manifest b/sci-libs/libsigrok/Manifest
index 24b3f0f027b..db935b04490 100644
--- a/sci-libs/libsigrok/Manifest
+++ b/sci-libs/libsigrok/Manifest
@@ -1,4 +1,3 @@
 DIST libsigrok-0.3.0.tar.gz 924503 BLAKE2B 
132cc952b7314e11034100973f1086d17515fb7b1eb3792506569211fe05e9f35b113fceaff7c0468ad9be0bbcac0251ae63ae856f1393c51e743983e60886df
 SHA512 
b94e8a8da1346f9ab267fd693975411243f2cb016e48ec05f4ad88a8a1dfe5ed6f5ad4ac4bf0e94dc551dc92cd70d2719983e21abaa4811693fb28a27bf74550
 DIST libsigrok-0.4.0.tar.gz 1387329 BLAKE2B 
8d1578c1f84c84af54f0e6c97bcdcec6d183a80170d0b19aa44c4015dac3c418e1a1e304b42b12be3f905a3887f95d2ecc9644aeb2a81a961e09438e380ec70b
 SHA512 
5963c1a44cf351a38d9434f89a15b20d36c7196a78464c302c65ab262bcdb2f26274c7fabf01174757e1f9a367497b9721578ebf802f75ef97ee71ff3dade1e0
-DIST libsigrok-0.5.0.tar.gz 1560400 BLAKE2B 
2093a7f2855708ef5b8d260fb6721c1ed66cade65ceecdce5808d4edf97f65026755586ca2969417c19b89bde46b0b786287dcf0bf554d8faba42f8f51a9
 SHA512 
56129da97830d9c98c73612a6ce21664b4365aafa2939c1dd9e4ff3f7397b3a07f82684b3d34fc998acd32a04f17a7a629dde455e4ed6310f0075dabaae0e5ec
 DIST libsigrok-0.5.1.tar.gz 1664813 BLAKE2B 
b5765e1057ee4411ef2f83fa73473429bc8f84653f1c7761af3c1280decc2fcb1d3c68d8f92f7e77b85f1fcda74cf6066e5bf56c0da2de4b28148b920b94e0da
 SHA512 
48337fc4625dc0abc162ae54e04ce091047835aa1e49ba1ab84542805008d1ff5646b143fde57e317f3b34514c0e6d4dcb7b1c5944f3f16bdef1a7169edc3517

diff --git a/sci-libs/libsigrok/libsigrok-0.5.0.ebuild 
b/sci-libs/libsigrok/libsigrok-0.5.0.ebuild
deleted file mode 100644
index 8d56edf9699..000
--- a/sci-libs/libsigrok/libsigrok-0.5.0.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
-
-inherit eutils gnome2-utils python-single-r1 java-pkg-opt-2 xdg-utils
-
-if [[ ${PV} == "" ]]; then
-   EGIT_REPO_URI="git://sigrok.org/${PN}"
-   inherit git-r3 autotools
-else
-   SRC_URI="https://sigrok.org/download/source/${PN}/${P}.tar.gz;
-   KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="basic hardware drivers for logic analyzers and input/output file 
format support"
-HOMEPAGE="https://sigrok.org/wiki/Libsigrok;
-
-LICENSE="GPL-3"
-SLOT="0/4"
-IUSE="cxx ftdi java parport python serial static-libs test usb"
-REQUIRED_USE="java? ( cxx ) python? ( cxx ${PYTHON_REQUIRED_USE} )"
-
-# We also support librevisa, but that isn't in the tree ...
-LIB_DEPEND=">=dev-libs/glib-2.32.0[static-libs(+)]
-   >=dev-libs/libzip-0.8:=[static-libs(+)]
-   cxx? ( dev-cpp/glibmm:2[static-libs(+)] )
-   python? ( ${PYTHON_DEPS} >=dev-python/pygobject-3.0.0[${PYTHON_USEDEP}] 
)
-   ftdi? ( >=dev-embedded/libftdi-0.16:=[static-libs(+)] )
-   parport? ( sys-libs/libieee1284[static-libs(+)] )
-   serial? ( >=dev-libs/libserialport-0.1.1[static-libs(+)] )
-   usb? ( virtual/libusb:1[static-libs(+)] )"
-RDEPEND="!static-libs? ( ${LIB_DEPEND//\[static-libs(+)]} )
-   static-libs? ( ${LIB_DEPEND} )
-   java? ( >=virtual/jre-1.4 )"
-DEPEND="${LIB_DEPEND//\[static-libs(+)]}
-   test? ( >=dev-libs/check-0.9.4 )
-   cxx? ( app-doc/doxygen )
-   java? (
-   >=dev-lang/swig-3.0.6
-   >=virtual/jdk-1.4
-   )
-   python? (
-   dev-python/setuptools[${PYTHON_USEDEP}]
-   dev-python/numpy[${PYTHON_USEDEP}]
-   >=dev-lang/swig-3.0.6
-   )
-   virtual/pkgconfig"
-
-pkg_setup() {
-   use python && python-single-r1_pkg_setup
-   java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-   [[ ${PV} == "" ]] && eautoreconf
-   eapply_user
-}
-
-src_configure() {
-   econf \
-   $(use_with ftdi libftdi) \
-   $(use_with parport libieee1284) \
-   $(use_with serial libserialport) \
-   $(use_with usb libusb) \
-   $(use_enable cxx) \
-   $(use_enable java) \
-   $(use_enable python) \
-   --disable-ruby \
-   $(use_enable static-libs static)
-}
-
-src_test() {
-   emake check
-}
-
-src_install() {
-   default
-   prune_libtool_files
-}
-
-pkg_postinst() {
-   gnome2_icon_cache_update
-   xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-   gnome2_icon_cache_update
-

[gentoo-commits] repo/gentoo:master commit in: sci-libs/libsigrok/

2019-04-12 Thread Sven Wegener

commit: d90c4128d5449d92fd016832a38120258e8a2813
Author: Sven Wegener  gentoo  org>
AuthorDate: Fri Apr 12 15:42:24 2019 +
Commit: Sven Wegener  gentoo  org>
CommitDate: Fri Apr 12 15:44:11 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d90c4128

sci-libs/libsigrok: Install udev rules, bug #671716

Closes: https://bugs.gentoo.org/671716
Signed-off-by: Sven Wegener  gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11

 sci-libs/libsigrok/libsigrok-0.5.1.ebuild | 7 ---
 sci-libs/libsigrok/libsigrok-.ebuild  | 7 ---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/sci-libs/libsigrok/libsigrok-0.5.1.ebuild 
b/sci-libs/libsigrok/libsigrok-0.5.1.ebuild
index 8ebbf15dc3d..5c92de1d5d3 100644
--- a/sci-libs/libsigrok/libsigrok-0.5.1.ebuild
+++ b/sci-libs/libsigrok/libsigrok-0.5.1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
 PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} )
 
-inherit eutils gnome2-utils python-single-r1 java-pkg-opt-2 xdg-utils
+inherit eutils gnome2-utils python-single-r1 java-pkg-opt-2 udev xdg-utils
 
 if [[ ${PV} == "" ]]; then
EGIT_REPO_URI="git://sigrok.org/${PN}"
@@ -20,7 +20,7 @@ HOMEPAGE="https://sigrok.org/wiki/Libsigrok;
 
 LICENSE="GPL-3"
 SLOT="0/4"
-IUSE="cxx ftdi java parport python serial static-libs test usb"
+IUSE="cxx ftdi java parport python serial static-libs test +udev usb"
 REQUIRED_USE="java? ( cxx ) python? ( cxx ${PYTHON_REQUIRED_USE} )"
 
 # We also support librevisa, but that isn't in the tree ...
@@ -78,6 +78,7 @@ src_test() {
 
 src_install() {
default
+   use udev && udev_dorules contrib/*.rules
prune_libtool_files
 }
 

diff --git a/sci-libs/libsigrok/libsigrok-.ebuild 
b/sci-libs/libsigrok/libsigrok-.ebuild
index 694f44c3d60..4c9fa1e4807 100644
--- a/sci-libs/libsigrok/libsigrok-.ebuild
+++ b/sci-libs/libsigrok/libsigrok-.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
 PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} )
 
-inherit eutils gnome2-utils python-single-r1 java-pkg-opt-2 xdg-utils
+inherit eutils gnome2-utils python-single-r1 java-pkg-opt-2 udev xdg-utils
 
 if [[ ${PV} == "" ]]; then
EGIT_REPO_URI="git://sigrok.org/${PN}"
@@ -20,7 +20,7 @@ HOMEPAGE="https://sigrok.org/wiki/Libsigrok;
 
 LICENSE="GPL-3"
 SLOT="0/"
-IUSE="cxx ftdi java parport python serial static-libs test usb"
+IUSE="cxx ftdi java parport python serial static-libs test +udev usb"
 REQUIRED_USE="java? ( cxx ) python? ( cxx ${PYTHON_REQUIRED_USE} )"
 
 # We also support librevisa, but that isn't in the tree ...
@@ -78,6 +78,7 @@ src_test() {
 
 src_install() {
default
+   use udev && udev_dorules contrib/*.rules
prune_libtool_files
 }

[gentoo-commits] repo/gentoo:master commit in: sci-libs/libsigrok/

2018-12-08 Thread Sven Wegener

commit: 4806e87dda892682f83e8e1886376f563f157945
Author: Sven Wegener  gentoo  org>
AuthorDate: Thu Nov 29 13:09:06 2018 +
Commit: Sven Wegener  gentoo  org>
CommitDate: Sat Dec  8 21:30:43 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4806e87d

sci-libs/libsigrok: Support python3.7

Signed-off-by: Sven Wegener  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 sci-libs/libsigrok/libsigrok-0.5.1.ebuild | 2 +-
 sci-libs/libsigrok/libsigrok-.ebuild  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-libs/libsigrok/libsigrok-0.5.1.ebuild 
b/sci-libs/libsigrok/libsigrok-0.5.1.ebuild
index 8d56edf9699..8ebbf15dc3d 100644
--- a/sci-libs/libsigrok/libsigrok-0.5.1.ebuild
+++ b/sci-libs/libsigrok/libsigrok-0.5.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} )
 
 inherit eutils gnome2-utils python-single-r1 java-pkg-opt-2 xdg-utils
 

diff --git a/sci-libs/libsigrok/libsigrok-.ebuild 
b/sci-libs/libsigrok/libsigrok-.ebuild
index aeb0f3c4579..694f44c3d60 100644
--- a/sci-libs/libsigrok/libsigrok-.ebuild
+++ b/sci-libs/libsigrok/libsigrok-.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} )
 
 inherit eutils gnome2-utils python-single-r1 java-pkg-opt-2 xdg-utils

[gentoo-commits] repo/gentoo:master commit in: sci-libs/libsigrok/

2018-11-03 Thread Sven Wegener

commit: 1efa1338cf48dd393c0ce527ca56360e462e781f
Author: Sven Wegener  gentoo  org>
AuthorDate: Sat Nov  3 10:46:06 2018 +
Commit: Sven Wegener  gentoo  org>
CommitDate: Sat Nov  3 11:02:16 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1efa1338

sci-libs/libsigrok: Version bump

Signed-off-by: Sven Wegener  gentoo.org>
Package-Manager: Portage-2.3.49, Repoman-2.3.11

 sci-libs/libsigrok/Manifest   |  1 +
 sci-libs/libsigrok/libsigrok-0.5.1.ebuild | 92 +++
 2 files changed, 93 insertions(+)

diff --git a/sci-libs/libsigrok/Manifest b/sci-libs/libsigrok/Manifest
index 93e3f97f523..24b3f0f027b 100644
--- a/sci-libs/libsigrok/Manifest
+++ b/sci-libs/libsigrok/Manifest
@@ -1,3 +1,4 @@
 DIST libsigrok-0.3.0.tar.gz 924503 BLAKE2B 
132cc952b7314e11034100973f1086d17515fb7b1eb3792506569211fe05e9f35b113fceaff7c0468ad9be0bbcac0251ae63ae856f1393c51e743983e60886df
 SHA512 
b94e8a8da1346f9ab267fd693975411243f2cb016e48ec05f4ad88a8a1dfe5ed6f5ad4ac4bf0e94dc551dc92cd70d2719983e21abaa4811693fb28a27bf74550
 DIST libsigrok-0.4.0.tar.gz 1387329 BLAKE2B 
8d1578c1f84c84af54f0e6c97bcdcec6d183a80170d0b19aa44c4015dac3c418e1a1e304b42b12be3f905a3887f95d2ecc9644aeb2a81a961e09438e380ec70b
 SHA512 
5963c1a44cf351a38d9434f89a15b20d36c7196a78464c302c65ab262bcdb2f26274c7fabf01174757e1f9a367497b9721578ebf802f75ef97ee71ff3dade1e0
 DIST libsigrok-0.5.0.tar.gz 1560400 BLAKE2B 
2093a7f2855708ef5b8d260fb6721c1ed66cade65ceecdce5808d4edf97f65026755586ca2969417c19b89bde46b0b786287dcf0bf554d8faba42f8f51a9
 SHA512 
56129da97830d9c98c73612a6ce21664b4365aafa2939c1dd9e4ff3f7397b3a07f82684b3d34fc998acd32a04f17a7a629dde455e4ed6310f0075dabaae0e5ec
+DIST libsigrok-0.5.1.tar.gz 1664813 BLAKE2B 
b5765e1057ee4411ef2f83fa73473429bc8f84653f1c7761af3c1280decc2fcb1d3c68d8f92f7e77b85f1fcda74cf6066e5bf56c0da2de4b28148b920b94e0da
 SHA512 
48337fc4625dc0abc162ae54e04ce091047835aa1e49ba1ab84542805008d1ff5646b143fde57e317f3b34514c0e6d4dcb7b1c5944f3f16bdef1a7169edc3517

diff --git a/sci-libs/libsigrok/libsigrok-0.5.1.ebuild 
b/sci-libs/libsigrok/libsigrok-0.5.1.ebuild
new file mode 100644
index 000..8d56edf9699
--- /dev/null
+++ b/sci-libs/libsigrok/libsigrok-0.5.1.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+
+inherit eutils gnome2-utils python-single-r1 java-pkg-opt-2 xdg-utils
+
+if [[ ${PV} == "" ]]; then
+   EGIT_REPO_URI="git://sigrok.org/${PN}"
+   inherit git-r3 autotools
+else
+   SRC_URI="https://sigrok.org/download/source/${PN}/${P}.tar.gz;
+   KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="basic hardware drivers for logic analyzers and input/output file 
format support"
+HOMEPAGE="https://sigrok.org/wiki/Libsigrok;
+
+LICENSE="GPL-3"
+SLOT="0/4"
+IUSE="cxx ftdi java parport python serial static-libs test usb"
+REQUIRED_USE="java? ( cxx ) python? ( cxx ${PYTHON_REQUIRED_USE} )"
+
+# We also support librevisa, but that isn't in the tree ...
+LIB_DEPEND=">=dev-libs/glib-2.32.0[static-libs(+)]
+   >=dev-libs/libzip-0.8:=[static-libs(+)]
+   cxx? ( dev-cpp/glibmm:2[static-libs(+)] )
+   python? ( ${PYTHON_DEPS} >=dev-python/pygobject-3.0.0[${PYTHON_USEDEP}] 
)
+   ftdi? ( >=dev-embedded/libftdi-0.16:=[static-libs(+)] )
+   parport? ( sys-libs/libieee1284[static-libs(+)] )
+   serial? ( >=dev-libs/libserialport-0.1.1[static-libs(+)] )
+   usb? ( virtual/libusb:1[static-libs(+)] )"
+RDEPEND="!static-libs? ( ${LIB_DEPEND//\[static-libs(+)]} )
+   static-libs? ( ${LIB_DEPEND} )
+   java? ( >=virtual/jre-1.4 )"
+DEPEND="${LIB_DEPEND//\[static-libs(+)]}
+   test? ( >=dev-libs/check-0.9.4 )
+   cxx? ( app-doc/doxygen )
+   java? (
+   >=dev-lang/swig-3.0.6
+   >=virtual/jdk-1.4
+   )
+   python? (
+   dev-python/setuptools[${PYTHON_USEDEP}]
+   dev-python/numpy[${PYTHON_USEDEP}]
+   >=dev-lang/swig-3.0.6
+   )
+   virtual/pkgconfig"
+
+pkg_setup() {
+   use python && python-single-r1_pkg_setup
+   java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+   [[ ${PV} == "" ]] && eautoreconf
+   eapply_user
+}
+
+src_configure() {
+   econf \
+   $(use_with ftdi libftdi) \
+   $(use_with parport libieee1284) \
+   $(use_with serial libserialport) \
+   $(use_with usb libusb) \
+   $(use_enable cxx) \
+   $(use_enable java) \
+   $(use_enable python) \
+   --disable-ruby \
+   $(use_enable static-libs static)
+}
+
+src_test() {
+   emake check
+}
+
+src_install() {
+   default
+   prune_libtool_files
+}
+
+pkg_postinst() {
+   gnome2_icon_cache_update
+   xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+   gnome2_icon_cache_update
+

[gentoo-commits] repo/gentoo:master commit in: sci-libs/libsigrok/

2018-10-11 Thread Sven Wegener

commit: a407f796898f7bb7b906bc0853de8b194484f04f
Author: Sven Wegener  gentoo  org>
AuthorDate: Thu Oct 11 07:23:39 2018 +
Commit: Sven Wegener  gentoo  org>
CommitDate: Thu Oct 11 07:23:39 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a407f796

sci-libs/libsigrok: Use correct command for mime database

Signed-off-by: Sven Wegener  gentoo.org>
Package-Manager: Portage-2.3.49, Repoman-2.3.11

 sci-libs/libsigrok/libsigrok-0.5.0.ebuild | 4 ++--
 sci-libs/libsigrok/libsigrok-.ebuild  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sci-libs/libsigrok/libsigrok-0.5.0.ebuild 
b/sci-libs/libsigrok/libsigrok-0.5.0.ebuild
index 66e5bbfb814..8d56edf9699 100644
--- a/sci-libs/libsigrok/libsigrok-0.5.0.ebuild
+++ b/sci-libs/libsigrok/libsigrok-0.5.0.ebuild
@@ -83,10 +83,10 @@ src_install() {
 
 pkg_postinst() {
gnome2_icon_cache_update
-   xdg_desktop_database_update
+   xdg_mimeinfo_database_update
 }
 
 pkg_postrm() {
gnome2_icon_cache_update
-   xdg_desktop_database_update
+   xdg_mimeinfo_database_update
 }

diff --git a/sci-libs/libsigrok/libsigrok-.ebuild 
b/sci-libs/libsigrok/libsigrok-.ebuild
index ef12e1f2792..aeb0f3c4579 100644
--- a/sci-libs/libsigrok/libsigrok-.ebuild
+++ b/sci-libs/libsigrok/libsigrok-.ebuild
@@ -83,10 +83,10 @@ src_install() {
 
 pkg_postinst() {
gnome2_icon_cache_update
-   xdg_desktop_database_update
+   xdg_mimeinfo_database_update
 }
 
 pkg_postrm() {
gnome2_icon_cache_update
-   xdg_desktop_database_update
+   xdg_mimeinfo_database_update
 }

[gentoo-commits] repo/gentoo:master commit in: sci-libs/libsigrok/

2018-10-11 Thread Sven Wegener

commit: 79993520ea6a94649f9309f7121a513f529a20b8
Author: Sven Wegener  gentoo  org>
AuthorDate: Thu Oct 11 07:11:44 2018 +
Commit: Sven Wegener  gentoo  org>
CommitDate: Thu Oct 11 07:13:17 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79993520

sci-libs/libsigrok: Update icon cache and mime database

Signed-off-by: Sven Wegener  gentoo.org>
Package-Manager: Portage-2.3.49, Repoman-2.3.11

 sci-libs/libsigrok/libsigrok-0.5.0.ebuild | 14 --
 sci-libs/libsigrok/libsigrok-.ebuild  | 14 --
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/sci-libs/libsigrok/libsigrok-0.5.0.ebuild 
b/sci-libs/libsigrok/libsigrok-0.5.0.ebuild
index 2119698af8f..66e5bbfb814 100644
--- a/sci-libs/libsigrok/libsigrok-0.5.0.ebuild
+++ b/sci-libs/libsigrok/libsigrok-0.5.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
 PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
 
-inherit eutils python-single-r1 java-pkg-opt-2
+inherit eutils gnome2-utils python-single-r1 java-pkg-opt-2 xdg-utils
 
 if [[ ${PV} == "" ]]; then
EGIT_REPO_URI="git://sigrok.org/${PN}"
@@ -80,3 +80,13 @@ src_install() {
default
prune_libtool_files
 }
+
+pkg_postinst() {
+   gnome2_icon_cache_update
+   xdg_desktop_database_update
+}
+
+pkg_postrm() {
+   gnome2_icon_cache_update
+   xdg_desktop_database_update
+}

diff --git a/sci-libs/libsigrok/libsigrok-.ebuild 
b/sci-libs/libsigrok/libsigrok-.ebuild
index c3a463fbec8..ef12e1f2792 100644
--- a/sci-libs/libsigrok/libsigrok-.ebuild
+++ b/sci-libs/libsigrok/libsigrok-.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
 PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
 
-inherit eutils python-single-r1 java-pkg-opt-2
+inherit eutils gnome2-utils python-single-r1 java-pkg-opt-2 xdg-utils
 
 if [[ ${PV} == "" ]]; then
EGIT_REPO_URI="git://sigrok.org/${PN}"
@@ -80,3 +80,13 @@ src_install() {
default
prune_libtool_files
 }
+
+pkg_postinst() {
+   gnome2_icon_cache_update
+   xdg_desktop_database_update
+}
+
+pkg_postrm() {
+   gnome2_icon_cache_update
+   xdg_desktop_database_update
+}

[gentoo-commits] repo/gentoo:master commit in: sci-libs/libsigrok/

2018-04-11 Thread David Seifert

commit: aea77f7d6856f8ada48649b143ec482552bd5a26
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Wed Apr 11 08:32:34 2018 +
Commit: David Seifert  gentoo  org>
CommitDate: Wed Apr 11 09:39:54 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aea77f7d

sci-libs/libsigrok: use HTTPS

 sci-libs/libsigrok/libsigrok-0.3.0.ebuild | 6 +++---
 sci-libs/libsigrok/libsigrok-0.4.0.ebuild | 6 +++---
 sci-libs/libsigrok/libsigrok-0.5.0.ebuild | 6 +++---
 sci-libs/libsigrok/libsigrok-.ebuild  | 6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/sci-libs/libsigrok/libsigrok-0.3.0.ebuild 
b/sci-libs/libsigrok/libsigrok-0.3.0.ebuild
index d978f928e0c..dfa540c113f 100644
--- a/sci-libs/libsigrok/libsigrok-0.3.0.ebuild
+++ b/sci-libs/libsigrok/libsigrok-0.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -9,12 +9,12 @@ if [[ ${PV} == "" ]]; then
EGIT_REPO_URI="git://sigrok.org/${PN}"
inherit git-r3 autotools
 else
-   SRC_URI="http://sigrok.org/download/source/${PN}/${P}.tar.gz;
+   SRC_URI="https://sigrok.org/download/source/${PN}/${P}.tar.gz;
KEYWORDS="amd64 x86"
 fi
 
 DESCRIPTION="basic hardware drivers for logic analyzers and input/output file 
format support"
-HOMEPAGE="http://sigrok.org/wiki/Libsigrok;
+HOMEPAGE="https://sigrok.org/wiki/Libsigrok;
 
 LICENSE="GPL-3"
 SLOT="0/2"

diff --git a/sci-libs/libsigrok/libsigrok-0.4.0.ebuild 
b/sci-libs/libsigrok/libsigrok-0.4.0.ebuild
index b80377e5cf1..6eb82d78162 100644
--- a/sci-libs/libsigrok/libsigrok-0.4.0.ebuild
+++ b/sci-libs/libsigrok/libsigrok-0.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -11,12 +11,12 @@ if [[ ${PV} == "" ]]; then
EGIT_REPO_URI="git://sigrok.org/${PN}"
inherit git-r3 autotools
 else
-   SRC_URI="http://sigrok.org/download/source/${PN}/${P}.tar.gz;
+   SRC_URI="https://sigrok.org/download/source/${PN}/${P}.tar.gz;
KEYWORDS="~amd64 ~x86"
 fi
 
 DESCRIPTION="basic hardware drivers for logic analyzers and input/output file 
format support"
-HOMEPAGE="http://sigrok.org/wiki/Libsigrok;
+HOMEPAGE="https://sigrok.org/wiki/Libsigrok;
 
 LICENSE="GPL-3"
 SLOT="0/3"

diff --git a/sci-libs/libsigrok/libsigrok-0.5.0.ebuild 
b/sci-libs/libsigrok/libsigrok-0.5.0.ebuild
index f4b44fd9c9b..2119698af8f 100644
--- a/sci-libs/libsigrok/libsigrok-0.5.0.ebuild
+++ b/sci-libs/libsigrok/libsigrok-0.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -11,12 +11,12 @@ if [[ ${PV} == "" ]]; then
EGIT_REPO_URI="git://sigrok.org/${PN}"
inherit git-r3 autotools
 else
-   SRC_URI="http://sigrok.org/download/source/${PN}/${P}.tar.gz;
+   SRC_URI="https://sigrok.org/download/source/${PN}/${P}.tar.gz;
KEYWORDS="~amd64 ~x86"
 fi
 
 DESCRIPTION="basic hardware drivers for logic analyzers and input/output file 
format support"
-HOMEPAGE="http://sigrok.org/wiki/Libsigrok;
+HOMEPAGE="https://sigrok.org/wiki/Libsigrok;
 
 LICENSE="GPL-3"
 SLOT="0/4"

diff --git a/sci-libs/libsigrok/libsigrok-.ebuild 
b/sci-libs/libsigrok/libsigrok-.ebuild
index f1ec96e0b8e..c3a463fbec8 100644
--- a/sci-libs/libsigrok/libsigrok-.ebuild
+++ b/sci-libs/libsigrok/libsigrok-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -11,12 +11,12 @@ if [[ ${PV} == "" ]]; then
EGIT_REPO_URI="git://sigrok.org/${PN}"
inherit git-r3 autotools
 else
-   SRC_URI="http://sigrok.org/download/source/${PN}/${P}.tar.gz;
+   SRC_URI="https://sigrok.org/download/source/${PN}/${P}.tar.gz;
KEYWORDS="~amd64 ~x86"
 fi
 
 DESCRIPTION="basic hardware drivers for logic analyzers and input/output file 
format support"
-HOMEPAGE="http://sigrok.org/wiki/Libsigrok;
+HOMEPAGE="https://sigrok.org/wiki/Libsigrok;
 
 LICENSE="GPL-3"
 SLOT="0/"

[gentoo-commits] repo/gentoo:master commit in: sci-libs/libsigrok/

2017-12-10 Thread Sven Wegener

commit: 27ac68e2f3cc0fc78a1f4287582698e72d37a123
Author: Sven Wegener  gentoo  org>
AuthorDate: Sun Dec 10 15:59:06 2017 +
Commit: Sven Wegener  gentoo  org>
CommitDate: Sun Dec 10 16:11:35 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27ac68e2

sci-libs/libsigrok: Add numpy dependency

Package-Manager: Portage-2.3.14, Repoman-2.3.6

 sci-libs/libsigrok/libsigrok-0.4.0.ebuild | 1 +
 sci-libs/libsigrok/libsigrok-0.5.0.ebuild | 1 +
 sci-libs/libsigrok/libsigrok-.ebuild  | 1 +
 3 files changed, 3 insertions(+)

diff --git a/sci-libs/libsigrok/libsigrok-0.4.0.ebuild 
b/sci-libs/libsigrok/libsigrok-0.4.0.ebuild
index e582aa537ff..e79c34d9fba 100644
--- a/sci-libs/libsigrok/libsigrok-0.4.0.ebuild
+++ b/sci-libs/libsigrok/libsigrok-0.4.0.ebuild
@@ -44,6 +44,7 @@ DEPEND="${LIB_DEPEND//\[static-libs(+)]}
)
python? (
dev-python/setuptools[${PYTHON_USEDEP}]
+   dev-python/numpy[${PYTHON_USEDEP}]
>=dev-lang/swig-3.0.6
)
virtual/pkgconfig"

diff --git a/sci-libs/libsigrok/libsigrok-0.5.0.ebuild 
b/sci-libs/libsigrok/libsigrok-0.5.0.ebuild
index d74c547e748..400eea6eddf 100644
--- a/sci-libs/libsigrok/libsigrok-0.5.0.ebuild
+++ b/sci-libs/libsigrok/libsigrok-0.5.0.ebuild
@@ -44,6 +44,7 @@ DEPEND="${LIB_DEPEND//\[static-libs(+)]}
)
python? (
dev-python/setuptools[${PYTHON_USEDEP}]
+   dev-python/numpy[${PYTHON_USEDEP}]
>=dev-lang/swig-3.0.6
)
virtual/pkgconfig"

diff --git a/sci-libs/libsigrok/libsigrok-.ebuild 
b/sci-libs/libsigrok/libsigrok-.ebuild
index 64f2bbbe161..f7868a4be8b 100644
--- a/sci-libs/libsigrok/libsigrok-.ebuild
+++ b/sci-libs/libsigrok/libsigrok-.ebuild
@@ -44,6 +44,7 @@ DEPEND="${LIB_DEPEND//\[static-libs(+)]}
)
python? (
dev-python/setuptools[${PYTHON_USEDEP}]
+   dev-python/numpy[${PYTHON_USEDEP}]
>=dev-lang/swig-3.0.6
)
virtual/pkgconfig"

[gentoo-commits] repo/gentoo:master commit in: sci-libs/libsigrok/

2017-12-10 Thread Sven Wegener

commit: 1a5b032641d0123c851460de1e9c1eed88a118fd
Author: Sven Wegener  gentoo  org>
AuthorDate: Sun Dec 10 15:55:37 2017 +
Commit: Sven Wegener  gentoo  org>
CommitDate: Sun Dec 10 16:11:34 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a5b0326

sci-libs/libsigrok: Add setuptools dependency

Package-Manager: Portage-2.3.14, Repoman-2.3.6

 sci-libs/libsigrok/libsigrok-0.4.0.ebuild | 1 +
 sci-libs/libsigrok/libsigrok-0.5.0.ebuild | 1 +
 sci-libs/libsigrok/libsigrok-.ebuild  | 1 +
 3 files changed, 3 insertions(+)

diff --git a/sci-libs/libsigrok/libsigrok-0.4.0.ebuild 
b/sci-libs/libsigrok/libsigrok-0.4.0.ebuild
index 63e4b5773b7..e582aa537ff 100644
--- a/sci-libs/libsigrok/libsigrok-0.4.0.ebuild
+++ b/sci-libs/libsigrok/libsigrok-0.4.0.ebuild
@@ -43,6 +43,7 @@ DEPEND="${LIB_DEPEND//\[static-libs(+)]}
>=virtual/jdk-1.4
)
python? (
+   dev-python/setuptools[${PYTHON_USEDEP}]
>=dev-lang/swig-3.0.6
)
virtual/pkgconfig"

diff --git a/sci-libs/libsigrok/libsigrok-0.5.0.ebuild 
b/sci-libs/libsigrok/libsigrok-0.5.0.ebuild
index b39a7f58ecd..d74c547e748 100644
--- a/sci-libs/libsigrok/libsigrok-0.5.0.ebuild
+++ b/sci-libs/libsigrok/libsigrok-0.5.0.ebuild
@@ -43,6 +43,7 @@ DEPEND="${LIB_DEPEND//\[static-libs(+)]}
>=virtual/jdk-1.4
)
python? (
+   dev-python/setuptools[${PYTHON_USEDEP}]
>=dev-lang/swig-3.0.6
)
virtual/pkgconfig"

diff --git a/sci-libs/libsigrok/libsigrok-.ebuild 
b/sci-libs/libsigrok/libsigrok-.ebuild
index 4f4a05a4047..64f2bbbe161 100644
--- a/sci-libs/libsigrok/libsigrok-.ebuild
+++ b/sci-libs/libsigrok/libsigrok-.ebuild
@@ -43,6 +43,7 @@ DEPEND="${LIB_DEPEND//\[static-libs(+)]}
>=virtual/jdk-1.4
)
python? (
+   dev-python/setuptools[${PYTHON_USEDEP}]
>=dev-lang/swig-3.0.6
)
virtual/pkgconfig"

[gentoo-commits] repo/gentoo:master commit in: sci-libs/libsigrok/

2017-12-10 Thread Sven Wegener

commit: 6187781018eed189a4612f067d8a9a76bcd3c91c
Author: Sven Wegener  gentoo  org>
AuthorDate: Sun Dec 10 16:10:54 2017 +
Commit: Sven Wegener  gentoo  org>
CommitDate: Sun Dec 10 16:11:35 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61877810

sci-libs/libsigrok: Support python3_6

Package-Manager: Portage-2.3.14, Repoman-2.3.6

 sci-libs/libsigrok/libsigrok-0.4.0.ebuild | 2 +-
 sci-libs/libsigrok/libsigrok-0.5.0.ebuild | 2 +-
 sci-libs/libsigrok/libsigrok-.ebuild  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sci-libs/libsigrok/libsigrok-0.4.0.ebuild 
b/sci-libs/libsigrok/libsigrok-0.4.0.ebuild
index e79c34d9fba..b80377e5cf1 100644
--- a/sci-libs/libsigrok/libsigrok-0.4.0.ebuild
+++ b/sci-libs/libsigrok/libsigrok-0.4.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-PYTHON_COMPAT=( python{2_7,3_{4,5}} )
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
 
 inherit eutils python-single-r1 java-pkg-opt-2
 

diff --git a/sci-libs/libsigrok/libsigrok-0.5.0.ebuild 
b/sci-libs/libsigrok/libsigrok-0.5.0.ebuild
index 400eea6eddf..f4b44fd9c9b 100644
--- a/sci-libs/libsigrok/libsigrok-0.5.0.ebuild
+++ b/sci-libs/libsigrok/libsigrok-0.5.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-PYTHON_COMPAT=( python{2_7,3_{4,5}} )
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
 
 inherit eutils python-single-r1 java-pkg-opt-2
 

diff --git a/sci-libs/libsigrok/libsigrok-.ebuild 
b/sci-libs/libsigrok/libsigrok-.ebuild
index f7868a4be8b..f1ec96e0b8e 100644
--- a/sci-libs/libsigrok/libsigrok-.ebuild
+++ b/sci-libs/libsigrok/libsigrok-.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-PYTHON_COMPAT=( python{2_7,3_{4,5}} )
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
 
 inherit eutils python-single-r1 java-pkg-opt-2

[gentoo-commits] repo/gentoo:master commit in: sci-libs/libsigrok/

2017-11-07 Thread Sven Wegener

commit: c1f678131d1ae9026a4128d18d02ac67cefd6b5f
Author: Sven Wegener  gentoo  org>
AuthorDate: Mon Oct 30 22:20:53 2017 +
Commit: Sven Wegener  gentoo  org>
CommitDate: Tue Nov  7 21:35:56 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1f67813

sci-libs/libsigrok: Add sub-slot

Package-Manager: Portage-2.3.8, Repoman-2.3.4

 sci-libs/libsigrok/libsigrok-0.3.0.ebuild | 2 +-
 sci-libs/libsigrok/libsigrok-0.4.0.ebuild | 2 +-
 sci-libs/libsigrok/libsigrok-0.5.0.ebuild | 2 +-
 sci-libs/libsigrok/libsigrok-.ebuild  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sci-libs/libsigrok/libsigrok-0.3.0.ebuild 
b/sci-libs/libsigrok/libsigrok-0.3.0.ebuild
index 21530e0ef70..d978f928e0c 100644
--- a/sci-libs/libsigrok/libsigrok-0.3.0.ebuild
+++ b/sci-libs/libsigrok/libsigrok-0.3.0.ebuild
@@ -17,7 +17,7 @@ DESCRIPTION="basic hardware drivers for logic analyzers and 
input/output file fo
 HOMEPAGE="http://sigrok.org/wiki/Libsigrok;
 
 LICENSE="GPL-3"
-SLOT="0"
+SLOT="0/2"
 IUSE="ftdi serial static-libs test usb"
 
 # We also support librevisa, but that isn't in the tree ...

diff --git a/sci-libs/libsigrok/libsigrok-0.4.0.ebuild 
b/sci-libs/libsigrok/libsigrok-0.4.0.ebuild
index 8d30801c100..63e4b5773b7 100644
--- a/sci-libs/libsigrok/libsigrok-0.4.0.ebuild
+++ b/sci-libs/libsigrok/libsigrok-0.4.0.ebuild
@@ -19,7 +19,7 @@ DESCRIPTION="basic hardware drivers for logic analyzers and 
input/output file fo
 HOMEPAGE="http://sigrok.org/wiki/Libsigrok;
 
 LICENSE="GPL-3"
-SLOT="0"
+SLOT="0/3"
 IUSE="cxx ftdi java parport python serial static-libs test usb"
 REQUIRED_USE="java? ( cxx ) python? ( cxx ${PYTHON_REQUIRED_USE} )"
 

diff --git a/sci-libs/libsigrok/libsigrok-0.5.0.ebuild 
b/sci-libs/libsigrok/libsigrok-0.5.0.ebuild
index 8d30801c100..b39a7f58ecd 100644
--- a/sci-libs/libsigrok/libsigrok-0.5.0.ebuild
+++ b/sci-libs/libsigrok/libsigrok-0.5.0.ebuild
@@ -19,7 +19,7 @@ DESCRIPTION="basic hardware drivers for logic analyzers and 
input/output file fo
 HOMEPAGE="http://sigrok.org/wiki/Libsigrok;
 
 LICENSE="GPL-3"
-SLOT="0"
+SLOT="0/4"
 IUSE="cxx ftdi java parport python serial static-libs test usb"
 REQUIRED_USE="java? ( cxx ) python? ( cxx ${PYTHON_REQUIRED_USE} )"
 

diff --git a/sci-libs/libsigrok/libsigrok-.ebuild 
b/sci-libs/libsigrok/libsigrok-.ebuild
index 8d30801c100..4f4a05a4047 100644
--- a/sci-libs/libsigrok/libsigrok-.ebuild
+++ b/sci-libs/libsigrok/libsigrok-.ebuild
@@ -19,7 +19,7 @@ DESCRIPTION="basic hardware drivers for logic analyzers and 
input/output file fo
 HOMEPAGE="http://sigrok.org/wiki/Libsigrok;
 
 LICENSE="GPL-3"
-SLOT="0"
+SLOT="0/"
 IUSE="cxx ftdi java parport python serial static-libs test usb"
 REQUIRED_USE="java? ( cxx ) python? ( cxx ${PYTHON_REQUIRED_USE} )"

[gentoo-commits] repo/gentoo:master commit in: sci-libs/libsigrok/

2017-07-01 Thread Sven Wegener

commit: f1ac880de212a70282b69fbbf69e0a3e70ea86ac
Author: Sven Wegener  gentoo  org>
AuthorDate: Sat Jul  1 20:51:28 2017 +
Commit: Sven Wegener  gentoo  org>
CommitDate: Sat Jul  1 20:52:34 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1ac880d

sci-libs/libsigrok: Version bump

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 sci-libs/libsigrok/Manifest   |  1 +
 sci-libs/libsigrok/libsigrok-0.5.0.ebuild | 80 +++
 2 files changed, 81 insertions(+)

diff --git a/sci-libs/libsigrok/Manifest b/sci-libs/libsigrok/Manifest
index 7944562eb00..f97cf0a322e 100644
--- a/sci-libs/libsigrok/Manifest
+++ b/sci-libs/libsigrok/Manifest
@@ -1,2 +1,3 @@
 DIST libsigrok-0.3.0.tar.gz 924503 SHA256 
43926907a06f1d7aa73c68ae379d66412ac2728483eed7d20a8cf061f73f7050 SHA512 
b94e8a8da1346f9ab267fd693975411243f2cb016e48ec05f4ad88a8a1dfe5ed6f5ad4ac4bf0e94dc551dc92cd70d2719983e21abaa4811693fb28a27bf74550
 WHIRLPOOL 
709b1e7fd0b3f864129ade9d91cc072cf72675bc10ec053e71cd0e7ce18442d405dc8ab5d435ac59694360a2be4f5a9a2ceb559dd3e6c7a7736dafa7a04ccae7
 DIST libsigrok-0.4.0.tar.gz 1387329 SHA256 
5f291f3fee36e6dab1336f1c78596e50588831bc5ebd7cddc2a95fe8c71d669e SHA512 
5963c1a44cf351a38d9434f89a15b20d36c7196a78464c302c65ab262bcdb2f26274c7fabf01174757e1f9a367497b9721578ebf802f75ef97ee71ff3dade1e0
 WHIRLPOOL 
0364ff1e75212025e06080eacc8e088ee791deb605c1a8c63a25c8bbd45b2812aad1e456969f2c179e62e554f4c33a935e97cf8afe378e2f75715084d82694d4
+DIST libsigrok-0.5.0.tar.gz 1560400 SHA256 
4c8c86779b880a5c419f6c77a08b1147021e5a19fa83b0f3b19da27463c9f3a4 SHA512 
56129da97830d9c98c73612a6ce21664b4365aafa2939c1dd9e4ff3f7397b3a07f82684b3d34fc998acd32a04f17a7a629dde455e4ed6310f0075dabaae0e5ec
 WHIRLPOOL 
af15b6ad8f012bba889490e743610d3922c086326f9166da96ff4e5a1536f219b2b4b0f6d45500cc2dc47d98620f5ae537ae6cbf44e1a3388f2fe30c38c44cd3

diff --git a/sci-libs/libsigrok/libsigrok-0.5.0.ebuild 
b/sci-libs/libsigrok/libsigrok-0.5.0.ebuild
new file mode 100644
index 000..8d30801c100
--- /dev/null
+++ b/sci-libs/libsigrok/libsigrok-0.5.0.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python{2_7,3_{4,5}} )
+
+inherit eutils python-single-r1 java-pkg-opt-2
+
+if [[ ${PV} == "" ]]; then
+   EGIT_REPO_URI="git://sigrok.org/${PN}"
+   inherit git-r3 autotools
+else
+   SRC_URI="http://sigrok.org/download/source/${PN}/${P}.tar.gz;
+   KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="basic hardware drivers for logic analyzers and input/output file 
format support"
+HOMEPAGE="http://sigrok.org/wiki/Libsigrok;
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="cxx ftdi java parport python serial static-libs test usb"
+REQUIRED_USE="java? ( cxx ) python? ( cxx ${PYTHON_REQUIRED_USE} )"
+
+# We also support librevisa, but that isn't in the tree ...
+LIB_DEPEND=">=dev-libs/glib-2.32.0[static-libs(+)]
+   >=dev-libs/libzip-0.8:=[static-libs(+)]
+   cxx? ( dev-cpp/glibmm:2[static-libs(+)] )
+   python? ( ${PYTHON_DEPS} >=dev-python/pygobject-3.0.0[${PYTHON_USEDEP}] 
)
+   ftdi? ( >=dev-embedded/libftdi-0.16:=[static-libs(+)] )
+   parport? ( sys-libs/libieee1284[static-libs(+)] )
+   serial? ( >=dev-libs/libserialport-0.1.1[static-libs(+)] )
+   usb? ( virtual/libusb:1[static-libs(+)] )"
+RDEPEND="!static-libs? ( ${LIB_DEPEND//\[static-libs(+)]} )
+   static-libs? ( ${LIB_DEPEND} )
+   java? ( >=virtual/jre-1.4 )"
+DEPEND="${LIB_DEPEND//\[static-libs(+)]}
+   test? ( >=dev-libs/check-0.9.4 )
+   cxx? ( app-doc/doxygen )
+   java? (
+   >=dev-lang/swig-3.0.6
+   >=virtual/jdk-1.4
+   )
+   python? (
+   >=dev-lang/swig-3.0.6
+   )
+   virtual/pkgconfig"
+
+pkg_setup() {
+   use python && python-single-r1_pkg_setup
+   java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+   [[ ${PV} == "" ]] && eautoreconf
+   eapply_user
+}
+
+src_configure() {
+   econf \
+   $(use_with ftdi libftdi) \
+   $(use_with parport libieee1284) \
+   $(use_with serial libserialport) \
+   $(use_with usb libusb) \
+   $(use_enable cxx) \
+   $(use_enable java) \
+   $(use_enable python) \
+   --disable-ruby \
+   $(use_enable static-libs static)
+}
+
+src_test() {
+   emake check
+}
+
+src_install() {
+   default
+   prune_libtool_files
+}

[gentoo-commits] repo/gentoo:master commit in: sci-libs/libsigrok/

2017-03-22 Thread Thomas Deutschmann

commit: 62779b73bd9883374c4a0aec437fc640758849f8
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Wed Mar 22 21:12:50 2017 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Wed Mar 22 21:13:16 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62779b73

sci-libs/libsigrok: Set subslot operator on dev-libs/libzip atom

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 sci-libs/libsigrok/libsigrok-0.3.0.ebuild | 4 ++--
 sci-libs/libsigrok/libsigrok-0.4.0.ebuild | 6 +++---
 sci-libs/libsigrok/libsigrok-.ebuild  | 6 +++---
 sci-libs/libsigrok/metadata.xml   | 5 +
 4 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/sci-libs/libsigrok/libsigrok-0.3.0.ebuild 
b/sci-libs/libsigrok/libsigrok-0.3.0.ebuild
index 06e8eaf2e37..21530e0ef70 100644
--- a/sci-libs/libsigrok/libsigrok-0.3.0.ebuild
+++ b/sci-libs/libsigrok/libsigrok-0.3.0.ebuild
@@ -13,7 +13,7 @@ else
KEYWORDS="amd64 x86"
 fi
 
-DESCRIPTION="provide basic hardware drivers for logic analyzers and 
input/output file format support"
+DESCRIPTION="basic hardware drivers for logic analyzers and input/output file 
format support"
 HOMEPAGE="http://sigrok.org/wiki/Libsigrok;
 
 LICENSE="GPL-3"
@@ -22,7 +22,7 @@ IUSE="ftdi serial static-libs test usb"
 
 # We also support librevisa, but that isn't in the tree ...
 LIB_DEPEND=">=dev-libs/glib-2.32.0[static-libs(+)]
-   >=dev-libs/libzip-0.8[static-libs(+)]
+   >=dev-libs/libzip-0.8:=[static-libs(+)]
ftdi? ( >=dev-embedded/libftdi-0.16:=[static-libs(+)] )
serial? ( >=dev-libs/libserialport-0.1.0[static-libs(+)] )
usb? ( virtual/libusb:1[static-libs(+)] )"

diff --git a/sci-libs/libsigrok/libsigrok-0.4.0.ebuild 
b/sci-libs/libsigrok/libsigrok-0.4.0.ebuild
index 75ff9fe29ae..8d30801c100 100644
--- a/sci-libs/libsigrok/libsigrok-0.4.0.ebuild
+++ b/sci-libs/libsigrok/libsigrok-0.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -15,7 +15,7 @@ else
KEYWORDS="~amd64 ~x86"
 fi
 
-DESCRIPTION="provide basic hardware drivers for logic analyzers and 
input/output file format support"
+DESCRIPTION="basic hardware drivers for logic analyzers and input/output file 
format support"
 HOMEPAGE="http://sigrok.org/wiki/Libsigrok;
 
 LICENSE="GPL-3"
@@ -25,7 +25,7 @@ REQUIRED_USE="java? ( cxx ) python? ( cxx 
${PYTHON_REQUIRED_USE} )"
 
 # We also support librevisa, but that isn't in the tree ...
 LIB_DEPEND=">=dev-libs/glib-2.32.0[static-libs(+)]
-   >=dev-libs/libzip-0.8[static-libs(+)]
+   >=dev-libs/libzip-0.8:=[static-libs(+)]
cxx? ( dev-cpp/glibmm:2[static-libs(+)] )
python? ( ${PYTHON_DEPS} >=dev-python/pygobject-3.0.0[${PYTHON_USEDEP}] 
)
ftdi? ( >=dev-embedded/libftdi-0.16:=[static-libs(+)] )

diff --git a/sci-libs/libsigrok/libsigrok-.ebuild 
b/sci-libs/libsigrok/libsigrok-.ebuild
index 75ff9fe29ae..8d30801c100 100644
--- a/sci-libs/libsigrok/libsigrok-.ebuild
+++ b/sci-libs/libsigrok/libsigrok-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -15,7 +15,7 @@ else
KEYWORDS="~amd64 ~x86"
 fi
 
-DESCRIPTION="provide basic hardware drivers for logic analyzers and 
input/output file format support"
+DESCRIPTION="basic hardware drivers for logic analyzers and input/output file 
format support"
 HOMEPAGE="http://sigrok.org/wiki/Libsigrok;
 
 LICENSE="GPL-3"
@@ -25,7 +25,7 @@ REQUIRED_USE="java? ( cxx ) python? ( cxx 
${PYTHON_REQUIRED_USE} )"
 
 # We also support librevisa, but that isn't in the tree ...
 LIB_DEPEND=">=dev-libs/glib-2.32.0[static-libs(+)]
-   >=dev-libs/libzip-0.8[static-libs(+)]
+   >=dev-libs/libzip-0.8:=[static-libs(+)]
cxx? ( dev-cpp/glibmm:2[static-libs(+)] )
python? ( ${PYTHON_DEPS} >=dev-python/pygobject-3.0.0[${PYTHON_USEDEP}] 
)
ftdi? ( >=dev-embedded/libftdi-0.16:=[static-libs(+)] )

diff --git a/sci-libs/libsigrok/metadata.xml b/sci-libs/libsigrok/metadata.xml
index 03c75dbad27..60598929d67 100644
--- a/sci-libs/libsigrok/metadata.xml
+++ b/sci-libs/libsigrok/metadata.xml
@@ -5,6 +5,11 @@
  embed...@gentoo.org
  Embedded Gentoo
 
+
+  libsigrok is a shared library written in C, which provides the basic
+  hardware access drivers for logic analyzers and other supported devices,
+  as well as input/output file format support.
+
 
  Enable drivers that need libftdi
  Enable drivers that are parallel (IEEE1284) based

[gentoo-commits] repo/gentoo:master commit in: sci-libs/libsigrok/

2017-01-10 Thread Agostino Sarubbo

commit: e62fd5ee3d38f1232749054ee8aee9f1b74ede49
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Jan 10 14:53:05 2017 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Jan 10 14:53:05 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e62fd5ee

sci-libs/libsigrok: amd64 stable wrt bug #601152

Package-Manager: portage-2.3.0
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 sci-libs/libsigrok/libsigrok-0.3.0.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-libs/libsigrok/libsigrok-0.3.0.ebuild 
b/sci-libs/libsigrok/libsigrok-0.3.0.ebuild
index 014ca61..ab4dab2 100644
--- a/sci-libs/libsigrok/libsigrok-0.3.0.ebuild
+++ b/sci-libs/libsigrok/libsigrok-0.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -11,7 +11,7 @@ if [[ ${PV} == "" ]]; then
inherit git-r3 autotools
 else
SRC_URI="http://sigrok.org/download/source/${PN}/${P}.tar.gz;
-   KEYWORDS="~amd64 ~x86"
+   KEYWORDS="amd64 ~x86"
 fi
 
 DESCRIPTION="provide basic hardware drivers for logic analyzers and 
input/output file format support"

[gentoo-commits] repo/gentoo:master commit in: sci-libs/libsigrok/

2016-08-03 Thread Sven Wegener

commit: bad438905f90833cf0135c5038d9e59d0ed11ec1
Author: Sven Wegener  gentoo  org>
AuthorDate: Wed Aug  3 11:30:51 2016 +
Commit: Sven Wegener  gentoo  org>
CommitDate: Wed Aug  3 11:35:21 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bad43890

sci-libs/libsigrok: Update libserialport dependency

Package-Manager: portage-2.2.28
Signed-off-by: Sven Wegener  gentoo.org>

 sci-libs/libsigrok/libsigrok-0.3.0.ebuild | 2 +-
 sci-libs/libsigrok/libsigrok-.ebuild  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-libs/libsigrok/libsigrok-0.3.0.ebuild 
b/sci-libs/libsigrok/libsigrok-0.3.0.ebuild
index 21514bd..014ca61 100644
--- a/sci-libs/libsigrok/libsigrok-0.3.0.ebuild
+++ b/sci-libs/libsigrok/libsigrok-0.3.0.ebuild
@@ -25,7 +25,7 @@ IUSE="ftdi serial static-libs test usb"
 LIB_DEPEND=">=dev-libs/glib-2.32.0[static-libs(+)]
>=dev-libs/libzip-0.8[static-libs(+)]
ftdi? ( >=dev-embedded/libftdi-0.16:=[static-libs(+)] )
-   serial? ( dev-libs/libserialport[static-libs(+)] )
+   serial? ( >=dev-libs/libserialport-0.1.0[static-libs(+)] )
usb? ( virtual/libusb:1[static-libs(+)] )"
 RDEPEND="!static-libs? ( ${LIB_DEPEND//\[static-libs(+)]} )
static-libs? ( ${LIB_DEPEND} )"

diff --git a/sci-libs/libsigrok/libsigrok-.ebuild 
b/sci-libs/libsigrok/libsigrok-.ebuild
index 1a67f00..02ab795 100644
--- a/sci-libs/libsigrok/libsigrok-.ebuild
+++ b/sci-libs/libsigrok/libsigrok-.ebuild
@@ -31,7 +31,7 @@ LIB_DEPEND=">=dev-libs/glib-2.32.0[static-libs(+)]
python? ( ${PYTHON_DEPS} >=dev-python/pygobject-3.0.0[${PYTHON_USEDEP}] 
)
ftdi? ( >=dev-embedded/libftdi-0.16:=[static-libs(+)] )
parport? ( sys-libs/libieee1284[static-libs(+)] )
-   serial? ( dev-libs/libserialport[static-libs(+)] )
+   serial? ( >=dev-libs/libserialport-0.1.1[static-libs(+)] )
usb? ( virtual/libusb:1[static-libs(+)] )"
 RDEPEND="!static-libs? ( ${LIB_DEPEND//\[static-libs(+)]} )
static-libs? ( ${LIB_DEPEND} )

[gentoo-commits] repo/gentoo:master commit in: sci-libs/libsigrok/

2016-08-03 Thread Sven Wegener

commit: ff8b5f1634c07b92c99d3947921f4c33b4675972
Author: Sven Wegener  gentoo  org>
AuthorDate: Wed Aug  3 11:30:47 2016 +
Commit: Sven Wegener  gentoo  org>
CommitDate: Wed Aug  3 11:35:21 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff8b5f16

sci-libs/libsigrok: Temporarily disable ruby bindings

We're going to add a USE flag later, but for the time being this ensures
a determinable build.

Package-Manager: portage-2.2.28
Signed-off-by: Sven Wegener  gentoo.org>

 sci-libs/libsigrok/libsigrok-.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sci-libs/libsigrok/libsigrok-.ebuild 
b/sci-libs/libsigrok/libsigrok-.ebuild
index 0078407..1a67f00 100644
--- a/sci-libs/libsigrok/libsigrok-.ebuild
+++ b/sci-libs/libsigrok/libsigrok-.ebuild
@@ -67,6 +67,7 @@ src_configure() {
$(use_enable cxx) \
$(use_enable java) \
$(use_enable python) \
+   --disable-ruby \
$(use_enable static-libs static)
 }

[gentoo-commits] repo/gentoo:master commit in: sci-libs/libsigrok/

2016-08-03 Thread Sven Wegener

commit: 5edb67d38e8a0f8e01d49ad8cc364a25dad6bfb5
Author: Sven Wegener  gentoo  org>
AuthorDate: Wed Aug  3 11:30:54 2016 +
Commit: Sven Wegener  gentoo  org>
CommitDate: Wed Aug  3 11:35:21 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5edb67d3

sci-libs/libsigrok: Version bump, bug #579878

Package-Manager: portage-2.2.28
Signed-off-by: Sven Wegener  gentoo.org>

 sci-libs/libsigrok/Manifest   |  1 +
 sci-libs/libsigrok/libsigrok-0.4.0.ebuild | 81 +++
 2 files changed, 82 insertions(+)

diff --git a/sci-libs/libsigrok/Manifest b/sci-libs/libsigrok/Manifest
index 0289374..7944562 100644
--- a/sci-libs/libsigrok/Manifest
+++ b/sci-libs/libsigrok/Manifest
@@ -1 +1,2 @@
 DIST libsigrok-0.3.0.tar.gz 924503 SHA256 
43926907a06f1d7aa73c68ae379d66412ac2728483eed7d20a8cf061f73f7050 SHA512 
b94e8a8da1346f9ab267fd693975411243f2cb016e48ec05f4ad88a8a1dfe5ed6f5ad4ac4bf0e94dc551dc92cd70d2719983e21abaa4811693fb28a27bf74550
 WHIRLPOOL 
709b1e7fd0b3f864129ade9d91cc072cf72675bc10ec053e71cd0e7ce18442d405dc8ab5d435ac59694360a2be4f5a9a2ceb559dd3e6c7a7736dafa7a04ccae7
+DIST libsigrok-0.4.0.tar.gz 1387329 SHA256 
5f291f3fee36e6dab1336f1c78596e50588831bc5ebd7cddc2a95fe8c71d669e SHA512 
5963c1a44cf351a38d9434f89a15b20d36c7196a78464c302c65ab262bcdb2f26274c7fabf01174757e1f9a367497b9721578ebf802f75ef97ee71ff3dade1e0
 WHIRLPOOL 
0364ff1e75212025e06080eacc8e088ee791deb605c1a8c63a25c8bbd45b2812aad1e456969f2c179e62e554f4c33a935e97cf8afe378e2f75715084d82694d4

diff --git a/sci-libs/libsigrok/libsigrok-0.4.0.ebuild 
b/sci-libs/libsigrok/libsigrok-0.4.0.ebuild
new file mode 100644
index 000..02ab795
--- /dev/null
+++ b/sci-libs/libsigrok/libsigrok-0.4.0.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+
+PYTHON_COMPAT=( python{2_7,3_{3,4,5}} )
+
+inherit eutils python-single-r1 java-pkg-opt-2
+
+if [[ ${PV} == "" ]]; then
+   EGIT_REPO_URI="git://sigrok.org/${PN}"
+   inherit git-r3 autotools
+else
+   SRC_URI="http://sigrok.org/download/source/${PN}/${P}.tar.gz;
+   KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="provide basic hardware drivers for logic analyzers and 
input/output file format support"
+HOMEPAGE="http://sigrok.org/wiki/Libsigrok;
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="cxx ftdi java parport python serial static-libs test usb"
+REQUIRED_USE="java? ( cxx ) python? ( cxx ${PYTHON_REQUIRED_USE} )"
+
+# We also support librevisa, but that isn't in the tree ...
+LIB_DEPEND=">=dev-libs/glib-2.32.0[static-libs(+)]
+   >=dev-libs/libzip-0.8[static-libs(+)]
+   cxx? ( dev-cpp/glibmm:2[static-libs(+)] )
+   python? ( ${PYTHON_DEPS} >=dev-python/pygobject-3.0.0[${PYTHON_USEDEP}] 
)
+   ftdi? ( >=dev-embedded/libftdi-0.16:=[static-libs(+)] )
+   parport? ( sys-libs/libieee1284[static-libs(+)] )
+   serial? ( >=dev-libs/libserialport-0.1.1[static-libs(+)] )
+   usb? ( virtual/libusb:1[static-libs(+)] )"
+RDEPEND="!static-libs? ( ${LIB_DEPEND//\[static-libs(+)]} )
+   static-libs? ( ${LIB_DEPEND} )
+   java? ( >=virtual/jre-1.4 )"
+DEPEND="${LIB_DEPEND//\[static-libs(+)]}
+   test? ( >=dev-libs/check-0.9.4 )
+   cxx? ( app-doc/doxygen )
+   java? (
+   >=dev-lang/swig-3.0.6
+   >=virtual/jdk-1.4
+   )
+   python? (
+   >=dev-lang/swig-3.0.6
+   )
+   virtual/pkgconfig"
+
+pkg_setup() {
+   use python && python-single-r1_pkg_setup
+   java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+   [[ ${PV} == "" ]] && eautoreconf
+   eapply_user
+}
+
+src_configure() {
+   econf \
+   $(use_with ftdi libftdi) \
+   $(use_with parport libieee1284) \
+   $(use_with serial libserialport) \
+   $(use_with usb libusb) \
+   $(use_enable cxx) \
+   $(use_enable java) \
+   $(use_enable python) \
+   --disable-ruby \
+   $(use_enable static-libs static)
+}
+
+src_test() {
+   emake check
+}
+
+src_install() {
+   default
+   prune_libtool_files
+}

[gentoo-commits] repo/gentoo:master commit in: sci-libs/libsigrok/

2016-08-03 Thread Sven Wegener

commit: 231c7560d89fb84593ace9f4461be27908590992
Author: Sven Wegener  gentoo  org>
AuthorDate: Wed Aug  3 11:30:43 2016 +
Commit: Sven Wegener  gentoo  org>
CommitDate: Wed Aug  3 11:35:21 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=231c7560

sci-libs/libsigrok: Bump to EAPI 6

Package-Manager: portage-2.2.28
Signed-off-by: Sven Wegener  gentoo.org>

 sci-libs/libsigrok/libsigrok-.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sci-libs/libsigrok/libsigrok-.ebuild 
b/sci-libs/libsigrok/libsigrok-.ebuild
index c37062d..0078407 100644
--- a/sci-libs/libsigrok/libsigrok-.ebuild
+++ b/sci-libs/libsigrok/libsigrok-.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="5"
+EAPI="6"
 
 PYTHON_COMPAT=( python{2_7,3_{3,4,5}} )
 
@@ -55,6 +55,7 @@ pkg_setup() {
 
 src_prepare() {
[[ ${PV} == "" ]] && eautoreconf
+   eapply_user
 }
 
 src_configure() {

[gentoo-commits] repo/gentoo:master commit in: sci-libs/libsigrok/

2016-01-10 Thread Sven Wegener

commit: a3f5bbe30e494fa465f22468e14542899fc6fefd
Author: Sven Wegener  gentoo  org>
AuthorDate: Sun Jan 10 09:56:56 2016 +
Commit: Sven Wegener  gentoo  org>
CommitDate: Sun Jan 10 09:59:28 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3f5bbe3

sci-libs/libsigrok: Add SLOT dep on libftdi

Signed-off-by: Sven Wegener  gentoo.org>

 sci-libs/libsigrok/libsigrok-0.3.0.ebuild | 4 ++--
 sci-libs/libsigrok/libsigrok-.ebuild  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sci-libs/libsigrok/libsigrok-0.3.0.ebuild 
b/sci-libs/libsigrok/libsigrok-0.3.0.ebuild
index f8a0052..0a8d5fa 100644
--- a/sci-libs/libsigrok/libsigrok-0.3.0.ebuild
+++ b/sci-libs/libsigrok/libsigrok-0.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -24,7 +24,7 @@ IUSE="ftdi serial static-libs test usb"
 # We also support librevisa, but that isn't in the tree ...
 LIB_DEPEND=">=dev-libs/glib-2.32.0[static-libs(+)]
>=dev-libs/libzip-0.8[static-libs(+)]
-   ftdi? ( >=dev-embedded/libftdi-0.16[static-libs(+)] )
+   ftdi? ( >=dev-embedded/libftdi-0.16:=[static-libs(+)] )
serial? ( dev-libs/libserialport[static-libs(+)] )
usb? ( virtual/libusb:1[static-libs(+)] )"
 RDEPEND="!static-libs? ( ${LIB_DEPEND//\[static-libs(+)]} )

diff --git a/sci-libs/libsigrok/libsigrok-.ebuild 
b/sci-libs/libsigrok/libsigrok-.ebuild
index 9f8569a..c37062d 100644
--- a/sci-libs/libsigrok/libsigrok-.ebuild
+++ b/sci-libs/libsigrok/libsigrok-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -29,7 +29,7 @@ LIB_DEPEND=">=dev-libs/glib-2.32.0[static-libs(+)]
>=dev-libs/libzip-0.8[static-libs(+)]
cxx? ( dev-cpp/glibmm:2[static-libs(+)] )
python? ( ${PYTHON_DEPS} >=dev-python/pygobject-3.0.0[${PYTHON_USEDEP}] 
)
-   ftdi? ( >=dev-embedded/libftdi-0.16[static-libs(+)] )
+   ftdi? ( >=dev-embedded/libftdi-0.16:=[static-libs(+)] )
parport? ( sys-libs/libieee1284[static-libs(+)] )
serial? ( dev-libs/libserialport[static-libs(+)] )
usb? ( virtual/libusb:1[static-libs(+)] )"

[gentoo-commits] repo/gentoo:master commit in: sci-libs/libsigrok/

2016-01-10 Thread Sven Wegener

commit: 2f96d5a9d2aeed7d16047d0a158d044d43006dde
Author: Sven Wegener  gentoo  org>
AuthorDate: Sun Jan 10 10:54:38 2016 +
Commit: Sven Wegener  gentoo  org>
CommitDate: Sun Jan 10 11:17:41 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f96d5a9

sci-libs/libsigrok: Use SLOT operator

Signed-off-by: Sven Wegener  gentoo.org>

 sci-libs/libsigrok/libsigrok-0.3.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/libsigrok/libsigrok-0.3.0.ebuild 
b/sci-libs/libsigrok/libsigrok-0.3.0.ebuild
index 0a8d5fa..21514bd 100644
--- a/sci-libs/libsigrok/libsigrok-0.3.0.ebuild
+++ b/sci-libs/libsigrok/libsigrok-0.3.0.ebuild
@@ -39,7 +39,7 @@ src_prepare() {
eautoreconf
 
# Deal with libftdi-0.x & libftdi-1.x changes.
-   if has_version '>=dev-embedded/libftdi-1' ; then
+   if has_version dev-embedded/libftdi:1 ; then
sed -i 's:libftdi >= 0.16:libftdi1 >= 0.16:g' configure || die
fi

[gentoo-commits] repo/gentoo:master commit in: sci-libs/libsigrok/

2015-12-19 Thread Sven Wegener

commit: bff8acbeb59405986d4bbfb32e2abb5981ae249f
Author: Sven Wegener  gentoo  org>
AuthorDate: Sat Dec 19 16:19:49 2015 +
Commit: Sven Wegener  gentoo  org>
CommitDate: Sat Dec 19 16:34:37 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bff8acbe

sci-libs/libsigrok: Add missing dependency on glibmm, bug #537998

Signed-off-by: Sven Wegener  gentoo.org>

 sci-libs/libsigrok/libsigrok-.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sci-libs/libsigrok/libsigrok-.ebuild 
b/sci-libs/libsigrok/libsigrok-.ebuild
index 517ea84..591bef3 100644
--- a/sci-libs/libsigrok/libsigrok-.ebuild
+++ b/sci-libs/libsigrok/libsigrok-.ebuild
@@ -24,6 +24,7 @@ IUSE="ftdi serial static-libs test usb"
 # We also support librevisa, but that isn't in the tree ...
 LIB_DEPEND=">=dev-libs/glib-2.32.0[static-libs(+)]
>=dev-libs/libzip-0.8[static-libs(+)]
+   dev-cpp/glibmm:2[static-libs(+)]
ftdi? ( >=dev-embedded/libftdi-0.16[static-libs(+)] )
serial? ( dev-libs/libserialport[static-libs(+)] )
usb? ( virtual/libusb:1[static-libs(+)] )"

[gentoo-commits] repo/gentoo:master commit in: sci-libs/libsigrok/

2015-12-19 Thread Sven Wegener

commit: 82efa1d2d002c334ca40f83eddb42fc7fcdc4739
Author: Sven Wegener  gentoo  org>
AuthorDate: Sun Dec 13 23:18:01 2015 +
Commit: Sven Wegener  gentoo  org>
CommitDate: Sat Dec 19 16:44:32 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82efa1d2

sci-libs/libsigrok: Add support for parallel port drivers

Signed-off-by: Sven Wegener  gentoo.org>

 sci-libs/libsigrok/libsigrok-.ebuild | 4 +++-
 sci-libs/libsigrok/metadata.xml  | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/sci-libs/libsigrok/libsigrok-.ebuild 
b/sci-libs/libsigrok/libsigrok-.ebuild
index b74e69e..72e1a41 100644
--- a/sci-libs/libsigrok/libsigrok-.ebuild
+++ b/sci-libs/libsigrok/libsigrok-.ebuild
@@ -19,13 +19,14 @@ HOMEPAGE="http://sigrok.org/wiki/Libsigrok;
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="ftdi serial static-libs test usb"
+IUSE="ftdi parport serial static-libs test usb"
 
 # We also support librevisa, but that isn't in the tree ...
 LIB_DEPEND=">=dev-libs/glib-2.32.0[static-libs(+)]
>=dev-libs/libzip-0.8[static-libs(+)]
dev-cpp/glibmm:2[static-libs(+)]
ftdi? ( >=dev-embedded/libftdi-0.16[static-libs(+)] )
+   parport? ( sys-libs/libieee1284[static-libs(+)] )
serial? ( dev-libs/libserialport[static-libs(+)] )
usb? ( virtual/libusb:1[static-libs(+)] )"
 RDEPEND="!static-libs? ( ${LIB_DEPEND//\[static-libs(+)]} )
@@ -42,6 +43,7 @@ src_prepare() {
 src_configure() {
econf \
$(use_with ftdi libftdi) \
+   $(use_with parport libieee1284) \
$(use_with serial libserialport) \
$(use_with usb libusb) \
$(use_enable static-libs static)

diff --git a/sci-libs/libsigrok/metadata.xml b/sci-libs/libsigrok/metadata.xml
index 9b40b4f..34522af 100644
--- a/sci-libs/libsigrok/metadata.xml
+++ b/sci-libs/libsigrok/metadata.xml
@@ -4,6 +4,7 @@
 dev-embedded
 
  Enable drivers that need libftdi
+ Enable drivers that are parallel (IEEE1284) based
  Enable drivers that are serial (RS232) based

[gentoo-commits] repo/gentoo:master commit in: sci-libs/libsigrok/

2015-12-19 Thread Sven Wegener

commit: e331922a234a04f4323303dc9a196ab9a3126202
Author: Sven Wegener  gentoo  org>
AuthorDate: Sat Dec 19 16:26:04 2015 +
Commit: Sven Wegener  gentoo  org>
CommitDate: Sat Dec 19 16:34:39 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e331922a

sci-libs/libsigrok: Add missing dependency on swig, bug #567270

Signed-off-by: Sven Wegener  gentoo.org>

 sci-libs/libsigrok/libsigrok-.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sci-libs/libsigrok/libsigrok-.ebuild 
b/sci-libs/libsigrok/libsigrok-.ebuild
index 591bef3..b9fd1b7 100644
--- a/sci-libs/libsigrok/libsigrok-.ebuild
+++ b/sci-libs/libsigrok/libsigrok-.ebuild
@@ -32,6 +32,7 @@ RDEPEND="!static-libs? ( ${LIB_DEPEND//\[static-libs(+)]} )
static-libs? ( ${LIB_DEPEND} )"
 DEPEND="${LIB_DEPEND//\[static-libs(+)]}
test? ( >=dev-libs/check-0.9.4 )
+   >=dev-lang/swig-3.0.6
virtual/pkgconfig"
 
 src_prepare() {

[gentoo-commits] repo/gentoo:master commit in: sci-libs/libsigrok/

2015-12-19 Thread Sven Wegener

commit: 5ad329bba1def4c7f1a2b83a28e3888bb197d4d1
Author: Sven Wegener  gentoo  org>
AuthorDate: Sun Dec 13 23:17:27 2015 +
Commit: Sven Wegener  gentoo  org>
CommitDate: Sat Dec 19 16:34:41 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ad329bb

sci-libs/libsigrok: Use use_with for libs

Signed-off-by: Sven Wegener  gentoo.org>

 sci-libs/libsigrok/libsigrok-.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sci-libs/libsigrok/libsigrok-.ebuild 
b/sci-libs/libsigrok/libsigrok-.ebuild
index b9fd1b7..b74e69e 100644
--- a/sci-libs/libsigrok/libsigrok-.ebuild
+++ b/sci-libs/libsigrok/libsigrok-.ebuild
@@ -41,9 +41,9 @@ src_prepare() {
 
 src_configure() {
econf \
-   $(use_enable ftdi libftdi) \
-   $(use_enable serial libserialport) \
-   $(use_enable usb libusb) \
+   $(use_with ftdi libftdi) \
+   $(use_with serial libserialport) \
+   $(use_with usb libusb) \
$(use_enable static-libs static)
 }

[gentoo-commits] repo/gentoo:master commit in: sci-libs/libsigrok/

2015-12-19 Thread Sven Wegener

commit: 6c54edb74d21ef58a85c24e1cb62c59b1a40cfee
Author: Sven Wegener  gentoo  org>
AuthorDate: Sun Dec 13 22:14:10 2015 +
Commit: Sven Wegener  gentoo  org>
CommitDate: Sat Dec 19 16:45:14 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c54edb7

sci-libs/libsigrok: Support cxx/java/python USE flags

Signed-off-by: Sven Wegener  gentoo.org>

 sci-libs/libsigrok/libsigrok-.ebuild | 30 +-
 1 file changed, 25 insertions(+), 5 deletions(-)

diff --git a/sci-libs/libsigrok/libsigrok-.ebuild 
b/sci-libs/libsigrok/libsigrok-.ebuild
index 72e1a41..a56bc58 100644
--- a/sci-libs/libsigrok/libsigrok-.ebuild
+++ b/sci-libs/libsigrok/libsigrok-.ebuild
@@ -4,7 +4,9 @@
 
 EAPI="5"
 
-inherit eutils
+PYTHON_COMPAT=( python{2_7,3_{3,4,5}} )
+
+inherit eutils python-single-r1 java-pkg-opt-2
 
 if [[ ${PV} == "" ]]; then
EGIT_REPO_URI="git://sigrok.org/${PN}"
@@ -19,23 +21,38 @@ HOMEPAGE="http://sigrok.org/wiki/Libsigrok;
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="ftdi parport serial static-libs test usb"
+IUSE="cxx ftdi java parport python serial static-libs test usb"
+REQUIRED_USE="java? ( cxx ) python? ( cxx ${PYTHON_REQUIRED_USE} )"
 
 # We also support librevisa, but that isn't in the tree ...
 LIB_DEPEND=">=dev-libs/glib-2.32.0[static-libs(+)]
>=dev-libs/libzip-0.8[static-libs(+)]
-   dev-cpp/glibmm:2[static-libs(+)]
+   cxx? ( dev-cpp/glibmm:2[static-libs(+)] )
+   python? ( ${PYTHON_DEPS} >=dev-python/pygobject-3.0.0[${PYTHON_USEDEP}] 
)
ftdi? ( >=dev-embedded/libftdi-0.16[static-libs(+)] )
parport? ( sys-libs/libieee1284[static-libs(+)] )
serial? ( dev-libs/libserialport[static-libs(+)] )
usb? ( virtual/libusb:1[static-libs(+)] )"
 RDEPEND="!static-libs? ( ${LIB_DEPEND//\[static-libs(+)]} )
-   static-libs? ( ${LIB_DEPEND} )"
+   static-libs? ( ${LIB_DEPEND} )
+   java? ( >=virtual/jre-1.4 )"
 DEPEND="${LIB_DEPEND//\[static-libs(+)]}
test? ( >=dev-libs/check-0.9.4 )
-   >=dev-lang/swig-3.0.6
+   cxx? ( app-doc/doxygen )
+   java? (
+   >=dev-lang/swig-3.0.6
+   >=virtual/jdk-1.4
+   )
+   python? (
+   >=dev-lang/swig-3.0.6
+   )
virtual/pkgconfig"
 
+pkg_setup() {
+   use python && python-single-r1_pkg_setup
+   java-pkg-opt-2_pkg_setup
+}
+
 src_prepare() {
[[ ${PV} == "" ]] && eautoreconf
 }
@@ -46,6 +63,9 @@ src_configure() {
$(use_with parport libieee1284) \
$(use_with serial libserialport) \
$(use_with usb libusb) \
+   $(use_enable cxx) \
+   $(use_enable java) \
+   $(use_enable python) \
$(use_enable static-libs static)
 }

62 matches

Mail list logo