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 DD342158087 for ; Mon, 10 Jan 2022 16:03:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F422F2BC02B; Mon, 10 Jan 2022 16:03:45 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4FD762BC02B for ; Mon, 10 Jan 2022 16:03:45 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 03582342D1F for ; Mon, 10 Jan 2022 16:03:44 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4D84028F for ; Mon, 10 Jan 2022 16:03:42 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1641830608.75cc60a219910a9240526b00a23adb600852fe79.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/libbtbb/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-libs/libbtbb/libbtbb-9999.ebuild X-VCS-Directories: net-libs/libbtbb/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 75cc60a219910a9240526b00a23adb600852fe79 X-VCS-Branch: master Date: Mon, 10 Jan 2022 16:03:42 +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: 0de41ec8-52b3-4176-9254-b1cdcbf834f8 X-Archives-Hash: 4d99502d94cc7c10ebc69daaf2f99123 commit: 75cc60a219910a9240526b00a23adb600852fe79 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Jan 9 20:18:28 2022 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Jan 10 16:03:28 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75cc60a2 net-libs/libbtbb: Drop IUSE wireshark-plugins Any compatible wireshark version has left the tree so drop all that cruft with bogus cmake.eclass usage. Bug: https://bugs.gentoo.org/789234 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> net-libs/libbtbb/libbtbb-9999.ebuild | 118 +---------------------------------- 1 file changed, 1 insertion(+), 117 deletions(-) diff --git a/net-libs/libbtbb/libbtbb-9999.ebuild b/net-libs/libbtbb/libbtbb-9999.ebuild index fbdd1cde9c2c..9085d00e99ef 100644 --- a/net-libs/libbtbb/libbtbb-9999.ebuild +++ b/net-libs/libbtbb/libbtbb-9999.ebuild @@ -21,128 +21,12 @@ fi LICENSE="GPL-2" SLOT="0/${PV}" -IUSE="static-libs wireshark-plugins" - -RDEPEND=" - wireshark-plugins? ( >=net-analyzer/wireshark-1.8.3-r1:= ) -" -DEPEND="${RDEPEND} - wireshark-plugins? ( dev-libs/glib ) -" -BDEPEND="virtual/pkgconfig" - -get_PV() { local pv=$(best_version $1); pv=${pv#$1-}; pv=${pv%-r*}; pv=${pv//_}; echo ${pv}; } - -which_plugins() { - if has_version '>=net-analyzer/wireshark-2.2.0'; then - plugins="" - elif has_version '>=net-analyzer/wireshark-1.12.0'; then - plugins="btbb btbredr" - elif has_version '=net-analyzer/wireshark-2.0'; then - CMAKE_USE_DIR="${S}"/wireshark/plugins/${i} - else - CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i} - fi - BUILD_DIR="${WORKDIR}"/${i}_build - cmake_src_prepare - done - fi -} +IUSE="static-libs" src_configure() { - CMAKE_USE_DIR="${S}" - BUILD_DIR="${S}"_build local mycmakeargs=( -DENABLE_PYTHON=OFF -DBUILD_STATIC_LIB=$(usex static-libs) ) cmake_src_configure - - if use wireshark-plugins; then - for i in ${plugins} - do - if has_version '>=net-analyzer/wireshark-2.0'; then - CMAKE_USE_DIR="${S}"/wireshark/plugins/${i} - else - CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i} - fi - BUILD_DIR="${WORKDIR}"/${i}_build - local mycmakeargs=( - -DCMAKE_INSTALL_LIBDIR="/usr/$(get_libdir)/wireshark/plugins/$(get_PV net-analyzer/wireshark)" - ) - cmake_src_configure - done - fi -} - -src_compile() { - CMAKE_USE_DIR="${S}" - BUILD_DIR="${S}"_build - cmake_src_compile - - if use wireshark-plugins; then - for i in ${plugins} - do - if has_version '>=net-analyzer/wireshark-2.0'; then - CMAKE_USE_DIR="${S}"/wireshark/plugins/${i} - else - CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i} - fi - BUILD_DIR="${WORKDIR}"/${i}_build - cmake_src_compile - done - fi -} - -src_test() { - CMAKE_USE_DIR="${S}" - BUILD_DIR="${S}"_build - cmake_src_test - - if use wireshark-plugins; then - for i in ${plugins} - do - if has_version '>=net-analyzer/wireshark-2.0'; then - CMAKE_USE_DIR="${S}"/wireshark/plugins/${i} - else - CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i} - fi - BUILD_DIR="${WORKDIR}"/${i}_build - cmake_src_test - done - fi -} - -src_install() { - CMAKE_USE_DIR="${S}" - BUILD_DIR="${S}"_build - cmake_src_install - - if use wireshark-plugins; then - for i in ${plugins} - do - if has_version '>=net-analyzer/wireshark-2.0'; then - CMAKE_USE_DIR="${S}"/wireshark/plugins/${i} - else - CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i} - fi - BUILD_DIR="${WORKDIR}"/${i}_build - cmake_src_install - done - fi }