diff options
| -rw-r--r-- | net-libs/libbtbb/ChangeLog | 8 | ||||
| -rw-r--r-- | net-libs/libbtbb/libbtbb-2014.02.4.ebuild (renamed from net-libs/libbtbb/libbtbb-2014.02.2.ebuild) | 25 | ||||
| -rw-r--r-- | net-libs/libbtbb/libbtbb-9999.ebuild | 27 |
3 files changed, 43 insertions, 17 deletions
diff --git a/net-libs/libbtbb/ChangeLog b/net-libs/libbtbb/ChangeLog index 4735ad4ff733..bc01b0aa5fd1 100644 --- a/net-libs/libbtbb/ChangeLog +++ b/net-libs/libbtbb/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-libs/libbtbb # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/libbtbb/ChangeLog,v 1.17 2014/07/05 02:01:06 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/libbtbb/ChangeLog,v 1.18 2014/11/01 18:25:38 zerochaos Exp $ + +*libbtbb-2014.02.4 (01 Nov 2014) + + 01 Nov 2014; Rick Farina <zerochaos@gentoo.org> +libbtbb-2014.02.4.ebuild, + -libbtbb-2014.02.2.ebuild, libbtbb-9999.ebuild: + version bump, bug fixes against wireshark 1.12.x 05 Jul 2014; Patrick Lauer <patrick@gentoo.org> metadata.xml: Remove unneeded useflag description from metadata.xml diff --git a/net-libs/libbtbb/libbtbb-2014.02.2.ebuild b/net-libs/libbtbb/libbtbb-2014.02.4.ebuild index e488cfd85056..52a6edda602d 100644 --- a/net-libs/libbtbb/libbtbb-2014.02.2.ebuild +++ b/net-libs/libbtbb/libbtbb-2014.02.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/libbtbb/libbtbb-2014.02.2.ebuild,v 1.2 2014/07/04 21:30:36 zerochaos Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/libbtbb/libbtbb-2014.02.4.ebuild,v 1.1 2014/11/01 18:25:38 zerochaos Exp $ EAPI=5 @@ -27,22 +27,31 @@ IUSE="+pcap +wireshark-plugins" RDEPEND=" wireshark-plugins? ( - dev-libs/glib >=net-analyzer/wireshark-1.8.3-r1:= ) " DEPEND="${RDEPEND} - wireshark-plugins? ( virtual/pkgconfig )" + wireshark-plugins? ( dev-libs/glib + 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-1.12.0'; then + plugins="btbb" + 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-utils_src_prepare if use wireshark-plugins; then - for i in btbb btle btsm + which_plugins + for i in ${plugins} do sed -i 's#column_info#packet#' wireshark/plugins/${i}/cmake/FindWireshark.cmake || die CMAKE_USE_DIR="${S}"/wireshark/plugins/${i} @@ -63,7 +72,7 @@ src_configure() { cmake-utils_src_configure if use wireshark-plugins; then - for i in btbb btle btsm + for i in ${plugins} do CMAKE_USE_DIR="${S}"/wireshark/plugins/${i} BUILD_DIR="${WORKDIR}"/${i}_build @@ -81,7 +90,7 @@ src_compile(){ cmake-utils_src_compile if use wireshark-plugins; then - for i in btbb btle btsm + for i in ${plugins} do CMAKE_USE_DIR="${S}"/wireshark/plugins/${i} BUILD_DIR="${WORKDIR}"/${i}_build @@ -96,7 +105,7 @@ src_test(){ cmake-utils_src_test if use wireshark-plugins; then - for i in btbb btle btsm + for i in ${plugins} do CMAKE_USE_DIR="${S}"/wireshark/plugins/${i} BUILD_DIR="${WORKDIR}"/${i}_build @@ -111,7 +120,7 @@ src_install(){ cmake-utils_src_install if use wireshark-plugins; then - for i in btbb btle btsm + for i in ${plugins} do CMAKE_USE_DIR="${S}"/wireshark/plugins/${i} BUILD_DIR="${WORKDIR}"/${i}_build diff --git a/net-libs/libbtbb/libbtbb-9999.ebuild b/net-libs/libbtbb/libbtbb-9999.ebuild index ccb0bf2e9267..1528fa5ed7db 100644 --- a/net-libs/libbtbb/libbtbb-9999.ebuild +++ b/net-libs/libbtbb/libbtbb-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/libbtbb/libbtbb-9999.ebuild,v 1.12 2014/04/04 19:51:31 zerochaos Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/libbtbb/libbtbb-9999.ebuild,v 1.13 2014/11/01 18:25:38 zerochaos Exp $ EAPI=5 @@ -26,24 +26,35 @@ SLOT="0/${PV}" IUSE="+pcap +wireshark-plugins" RDEPEND=" + net-libs/libpcap wireshark-plugins? ( - dev-libs/glib >=net-analyzer/wireshark-1.8.3-r1:= ) " DEPEND="${RDEPEND} - wireshark-plugins? ( virtual/pkgconfig )" + wireshark-plugins? ( dev-libs/glib + 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-1.12.0'; then + plugins="btbb" + 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-utils_src_prepare if use wireshark-plugins; then - for i in btbb btle btsm + which_plugins + for i in ${plugins} do + sed -i 's#column_info#packet#' wireshark/plugins/${i}/cmake/FindWireshark.cmake || die CMAKE_USE_DIR="${S}"/wireshark/plugins/${i} BUILD_DIR="${WORKDIR}"/${i}_build cmake-utils_src_prepare @@ -62,7 +73,7 @@ src_configure() { cmake-utils_src_configure if use wireshark-plugins; then - for i in btbb btle btsm + for i in ${plugins} do CMAKE_USE_DIR="${S}"/wireshark/plugins/${i} BUILD_DIR="${WORKDIR}"/${i}_build @@ -80,7 +91,7 @@ src_compile(){ cmake-utils_src_compile if use wireshark-plugins; then - for i in btbb btle btsm + for i in ${plugins} do CMAKE_USE_DIR="${S}"/wireshark/plugins/${i} BUILD_DIR="${WORKDIR}"/${i}_build @@ -95,7 +106,7 @@ src_test(){ cmake-utils_src_test if use wireshark-plugins; then - for i in btbb btle btsm + for i in ${plugins} do CMAKE_USE_DIR="${S}"/wireshark/plugins/${i} BUILD_DIR="${WORKDIR}"/${i}_build @@ -110,7 +121,7 @@ src_install(){ cmake-utils_src_install if use wireshark-plugins; then - for i in btbb btle btsm + for i in ${plugins} do CMAKE_USE_DIR="${S}"/wireshark/plugins/${i} BUILD_DIR="${WORKDIR}"/${i}_build |