diff options
author | V3n3RiX <venerix@koprulu.sector> | 2022-08-27 14:54:15 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2022-08-27 14:54:15 +0100 |
commit | d654bb059f90c086625a31ce15747f8418cd4bd5 (patch) | |
tree | 0a78e925021da9dc8bfd06ada53004c160b957b3 /sci-libs/libsigrok | |
parent | 4e6378ddac49b7268b7ab55d1f5900b2a6d81923 (diff) |
gentoo auto-resync : 27:08:2022 - 14:54:15
Diffstat (limited to 'sci-libs/libsigrok')
-rw-r--r-- | sci-libs/libsigrok/Manifest | 7 | ||||
-rw-r--r-- | sci-libs/libsigrok/files/libsigrok-0.5.2-ruby-swig-docs.patch | 63 | ||||
-rw-r--r-- | sci-libs/libsigrok/libsigrok-0.5.2-r2.ebuild | 36 | ||||
-rw-r--r-- | sci-libs/libsigrok/libsigrok-0.5.2-r3.ebuild | 36 | ||||
-rw-r--r-- | sci-libs/libsigrok/libsigrok-9999.ebuild | 35 |
5 files changed, 12 insertions, 165 deletions
diff --git a/sci-libs/libsigrok/Manifest b/sci-libs/libsigrok/Manifest index 2dc1475e039e..272b54ee411d 100644 --- a/sci-libs/libsigrok/Manifest +++ b/sci-libs/libsigrok/Manifest @@ -1,8 +1,7 @@ AUX libsigrok-0.5.2-check-0.15.patch 917 BLAKE2B 39d042e99dc5a71fa79def033f7a30621967294ed8198b00ca9e7a21caf7ee77f07e3f6d1e27c3a4d2629539835ec1b4e7bc3fdfe2ce1e98d7e97b4a897131ce SHA512 1729653f153ebdec08c0b987a0cf15a50ed6ce8948805b2a9ddf122ba591426e830329bfb47527ef253c19f9b8e98693ab0258e9ac19906473d3605d61c8983d -AUX libsigrok-0.5.2-ruby-swig-docs.patch 3085 BLAKE2B 865f38a8230762f58620c06b91dda8bfda405057c6733ef8dc27dbc7094817709ce03a3db1904e4c4ce3ecbdc82da6d16c5719a3f93410a84f07cd4c4018a9ea SHA512 aa3fd492f736c0fe7af1c2ba4e41307731589cef78c480426113dcbae8abbf0ecc07bdc5e1b251103d5aa813f120c5ff7f76dd6d5e577ca8f2b9f29eac008025 AUX libsigrok-0.5.2-swig-4.patch 1484 BLAKE2B 94c9bbde14f3175252677dedd50a7f3ff17bcc734382d93fbe3c65c71989dc72d0568535343bcb7764053075a2bac9c9f2d4e480d582a5371ac0d4a12bcab4a2 SHA512 34e568351624aeada4c3894be8a60cc0111be7c20ebe8e5395a1f81b2fc453a6a8228f575b95faad5140162a9d4fc5fc570546f42673f7275cb3910c73ffc8de DIST libsigrok-0.5.2.tar.gz 1779465 BLAKE2B fc6fdde1054e9ac50bc42249c34b3dbfff1e89d77f0db5a8762e52fcf2ea5ea69b2defcf1cde4ed7b1edd1e21770002ed661a470c8d666904daa48a84a2bbfc5 SHA512 cf673dad6280302d69050c29490621f66c6d6a73932d019a53ec3501316d3f2e23e7667a04f866dbe6ed73f86a63de73d2173e2b6cea563631d705e06f887092 -EBUILD libsigrok-0.5.2-r2.ebuild 3910 BLAKE2B d09247d9500282261fa2b62e4b9ee6f5505973f6b836893f166871b8d67fd3a90c89542c882f3367a38f50bac6a064d727cf26a32555fe54b53165481b752973 SHA512 e5f9c8451451788b05c15353a4b1136b423fc6ab576ea55e7c720c25c6b96391c49a3bb4240ef96322b212a49f37dcd0495df646a8648a06d18c4f25ed3617ab -EBUILD libsigrok-0.5.2-r3.ebuild 4065 BLAKE2B 94e72b79adcf4038ddedb811ef1dcf576c2844f17d659c51f6173e20c0650c823ee1285d41f41d4c94a29edc4dea7ff3f52d931d3cc8822021ab8125c020763b SHA512 b3f70628616d00308008f9cf7ba5a240401beb2cb16edc0bf38c5442b0f8a5bffc6fd2acc786cb74d03bd76452f7e30df8eda39f84c40d1ba71925f5d9ec54d7 -EBUILD libsigrok-9999.ebuild 3929 BLAKE2B ee6a027e09ea5cd2b4cb4a9a2d8bfcc22ef07925e4c9379651480e0fd5623800568f1953c016df7ed2c67ff8a047a8818f4cf190c6820b724938fbb5546cd38d SHA512 a32a12a04a81f8eddd3250cba69af665f2946ae00b45aa5aeb814a48212bae9d218924ca6517674781d007c3b68646c859689b37dc0af6cb38849a46cbc1c334 +EBUILD libsigrok-0.5.2-r2.ebuild 3217 BLAKE2B a9a39b3e01066495bb64514fd8214ab0a8dc084af365792171db7c0bfced90a745feeda6c689fbef85ab0eeb5b9a726cc4f23472fccaefd99d9e357f3360cc61 SHA512 fa97d8dec1b2d4937199f39e65e38d67b0265f965c42cda8ac8ef55fcaf1f1c39e098a55aaec59c9a7136ed9a5a6148be04a4350e2d0a3c149ef979856572fdd +EBUILD libsigrok-0.5.2-r3.ebuild 3372 BLAKE2B 5352869af3f192c8efd7d9c16b2e5bd96520bc8b930ae5913833ee99523666796139f1bd347cd3f6f708e6678403905bceb31ed393ab4a65bfb0e3687006ecaf SHA512 3bab46f5e64df7e2faea78b1e532deb61eb7579476729d1f88aefb2734107acda2ba60a328370441033ec685d1165aafd0f4365ed25dc9b9a058aa3aa0cd8fc5 +EBUILD libsigrok-9999.ebuild 3290 BLAKE2B 1c865cc5fa393ebe6c5e53b201c57835b890212d6d75e0541989294f84073086102f0cb114341ec69856c3cce5c4fbd88b47021f7483410fd553f24fb7fee45d SHA512 b8e613b21253123ce2fd8c1b3a6194cbbdff1fc8402e8423c7e601ca0c42ab15a98924d7c3afaaf0f20b969ac66eb7a851baf91e63ea5a2977eb610af71a47f4 MISC metadata.xml 886 BLAKE2B cb7cece1f79a4affb612e55f147eb93895a805e43aed6bbabfed2e3b925b0714d64651c00294da2742f8c09ce9984a58888b89025d73712400c8bd026296b2cb SHA512 79c9697b3fe6954108cb60ae79c06cee280ef6d73bcd9e35ab148750a4fa55c8e5118c21cdb4e3ae009d4c160a26c98132448476ef90ac6d7a19a79138c3b2f6 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..000000000000 --- 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 <anatol.pomozov@gmail.com> -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 <anatol.pomozov@gmail.com> ---- - 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-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} == *9999* ]]; 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} == *9999* ]] && 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} == *9999* ]]; 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="bluetooth +cxx ftdi hidapi java parport python ruby serial static-libs test +udev usb" +IUSE="bluetooth +cxx ftdi hidapi 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 )" @@ -42,7 +39,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(+)] ) " @@ -62,7 +58,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 " @@ -73,13 +68,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 } @@ -91,15 +84,7 @@ 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 @@ -119,10 +104,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 @@ -130,14 +111,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 @@ -145,7 +121,6 @@ each_python_compile() { src_compile() { default - use ruby && ruby-ng_src_compile use python && python_foreach_impl each_python_compile } @@ -153,10 +128,6 @@ src_test() { emake check } -each_ruby_install() { - emake ruby-install DESTDIR="${D}" -} - each_python_install() { cd "${BUILD_DIR}" emake python-install DESTDIR="${D}" @@ -166,7 +137,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-9999.ebuild b/sci-libs/libsigrok/libsigrok-9999.ebuild index c8561dcffd11..f75df88d8c40 100644 --- a/sci-libs/libsigrok/libsigrok-9999.ebuild +++ b/sci-libs/libsigrok/libsigrok-9999.ebuild @@ -4,10 +4,8 @@ EAPI="7" PYTHON_COMPAT=( python3_{8,9,10} ) -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} == *9999* ]]; then EGIT_REPO_URI="git://sigrok.org/${PN}" @@ -22,10 +20,9 @@ HOMEPAGE="https://sigrok.org/wiki/Libsigrok" LICENSE="GPL-3" SLOT="0/9999" -IUSE="bluetooth +cxx ftdi hidapi java nettle parport python ruby serial static-libs test +udev usb" +IUSE="bluetooth +cxx ftdi hidapi java nettle 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 )" @@ -43,7 +40,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(+)] ) " @@ -63,7 +59,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 " @@ -72,7 +67,6 @@ S="${WORKDIR}"/${P} pkg_setup() { use python && python_setup - use ruby && ruby-ng_pkg_setup java-pkg-opt-2_pkg_setup } @@ -84,15 +78,7 @@ sigrok_src_prepare() { [[ ${PV} == *9999* ]] && 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 @@ -113,10 +99,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 @@ -124,14 +106,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 @@ -139,7 +116,6 @@ each_python_compile() { src_compile() { default - use ruby && ruby-ng_src_compile use python && python_foreach_impl each_python_compile } @@ -147,10 +123,6 @@ src_test() { emake check } -each_ruby_install() { - emake ruby-install DESTDIR="${D}" -} - each_python_install() { cd "${BUILD_DIR}" emake python-install DESTDIR="${D}" @@ -160,7 +132,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 } |