From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D1D16158095 for ; Sat, 27 Aug 2022 23:12:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 170BBE097C; Sat, 27 Aug 2022 23:10:09 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id F2E18E09CC for ; Sat, 27 Aug 2022 23:10:08 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 924CB3413C2 for ; Sat, 27 Aug 2022 08:03:23 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 41EA2558 for ; Sat, 27 Aug 2022 08:03:22 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1661587396.acde501c0f1a1673ab84c9c316334b497bbf0a00.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/libsigrok/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-libs/libsigrok/libsigrok-0.5.2-r2.ebuild sci-libs/libsigrok/libsigrok-0.5.2-r3.ebuild sci-libs/libsigrok/libsigrok-9999.ebuild X-VCS-Directories: sci-libs/libsigrok/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: acde501c0f1a1673ab84c9c316334b497bbf0a00 X-VCS-Branch: master Date: Sat, 27 Aug 2022 08:03:22 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 8cce40eb-be72-4c9e-b85a-f5a46a641a7d X-Archives-Hash: c41c23bbbbd82204305d26fd885d908a commit: acde501c0f1a1673ab84c9c316334b497bbf0a00 Author: Sam James gentoo org> AuthorDate: Sat Aug 27 08:02:06 2022 +0000 Commit: Sam James gentoo org> CommitDate: Sat Aug 27 08:03:16 2022 +0000 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-9999.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} == *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 }