public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/libbtbb/
Date: Mon, 10 Jan 2022 16:03:42 +0000 (UTC)	[thread overview]
Message-ID: <1641830608.75cc60a219910a9240526b00a23adb600852fe79.asturm@gentoo> (raw)

commit:     75cc60a219910a9240526b00a23adb600852fe79
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jan  9 20:18:28 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> 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 <asturm <AT> 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-1.12.0'; then
-		plugins="btbb btle btsm"
-	fi
-}
-
-src_prepare() {
-	CMAKE_USE_DIR="${S}"
-	BUILD_DIR="${S}"_build
-	cmake_src_prepare
-
-	if use wireshark-plugins; then
-		which_plugins
-		for i in ${plugins}
-		do
-			sed -i 's#column_info#packet#' wireshark/plugins/${i}/cmake/FindWireshark.cmake || die
-			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_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
 }


             reply	other threads:[~2022-01-10 16:03 UTC|newest]

Thread overview: 34+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-01-10 16:03 Andreas Sturmlechner [this message]
  -- strict thread matches above, loose matches on Subject: below --
2022-08-27 11:38 [gentoo-commits] repo/gentoo:master commit in: net-libs/libbtbb/ Sam James
2022-01-12 16:14 Andreas Sturmlechner
2022-01-12 11:41 Jakov Smolić
2022-01-12 11:41 Jakov Smolić
2022-01-11 20:35 Arthur Zamarin
2022-01-10 16:03 Andreas Sturmlechner
2022-01-10 16:03 Andreas Sturmlechner
2022-01-10 16:03 Andreas Sturmlechner
2022-01-10 16:03 Andreas Sturmlechner
2021-03-30 23:27 Sam James
2021-03-30 20:20 Rick Farina
2021-03-30 20:20 Rick Farina
2021-01-07  3:00 Rick Farina
2020-09-01  9:07 Michał Górny
2020-07-05 13:44 Agostino Sarubbo
2020-07-05 13:38 Agostino Sarubbo
2020-07-05 13:36 Agostino Sarubbo
2019-03-20  2:25 Rick Farina
2018-08-07 23:10 Richard Farina
2018-01-11 16:06 Michał Górny
2018-01-11 16:02 Michał Górny
2017-03-20 17:07 Richard Farina
2017-03-04  5:08 Richard Farina
2017-03-04  5:06 Richard Farina
2016-02-03 23:00 Richard Farina
2016-02-02 17:53 Richard Farina
2016-01-22  3:17 Richard Farina
2016-01-22  3:17 Richard Farina
2015-09-22  2:36 Richard Farina
2015-09-05  2:39 Richard Farina
2015-09-05  2:39 Richard Farina
2015-09-04 16:35 Richard Farina
2015-08-28 15:42 Richard Farina

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1641830608.75cc60a219910a9240526b00a23adb600852fe79.asturm@gentoo \
    --to=asturm@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox