From d40fbe5f4f908eb7b6591031f814dfd85a1d13f9 Mon Sep 17 00:00:00 2001 From: Richard Farina Date: Thu, 19 Mar 2015 20:45:19 +0000 Subject: [PATCH] make pcap properly optional Package-Manager: portage-2.2.18/cvs/Linux x86_64 Manifest-Sign-Key: 0xDD11F94A --- net-libs/libbtbb/ChangeLog | 7 ++++-- net-libs/libbtbb/Manifest | 32 ++++++++++++++-------------- net-libs/libbtbb/libbtbb-9999.ebuild | 13 +++++------ 3 files changed, 28 insertions(+), 24 deletions(-) diff --git a/net-libs/libbtbb/ChangeLog b/net-libs/libbtbb/ChangeLog index bc01b0aa5fd1..c8e0734fe873 100644 --- a/net-libs/libbtbb/ChangeLog +++ b/net-libs/libbtbb/ChangeLog @@ -1,6 +1,9 @@ # 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.18 2014/11/01 18:25:38 zerochaos Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-libs/libbtbb/ChangeLog,v 1.19 2015/03/19 20:45:13 zerochaos Exp $ + + 19 Mar 2015; Rick Farina libbtbb-9999.ebuild: + make pcap properly optional *libbtbb-2014.02.4 (01 Nov 2014) diff --git a/net-libs/libbtbb/Manifest b/net-libs/libbtbb/Manifest index a3e1e3d782f7..441e679ff80a 100644 --- a/net-libs/libbtbb/Manifest +++ b/net-libs/libbtbb/Manifest @@ -1,25 +1,25 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA512 +Hash: SHA256 DIST 2014-02-R4.tar.gz 165417 SHA256 6e79a2d8530596e34ad13fcce43dcf8b30b165d4629d5bf9c3eb7f8817980524 SHA512 9ab5ca45f9a88c78f8238c73eabbd04c69723e4ac9171551e3e073eff06acd5ad4197ea4f87036ae066aebb0d15705249899d2b7475e56bd224c83df6f0bd8d5 WHIRLPOOL 30fdc8948f5d1dd057887369f12a5660b1faabe14933ad876c00161fbd43dcebc80f512e370d4b8f56525a8bdcad057a4da8c545814276a65a691bb8e85383fb EBUILD libbtbb-2014.02.4.ebuild 2867 SHA256 f7632143f744f99f546782beb3c5d3f3229149738d7965e33044ca443946e90f SHA512 cad01c026056363e60741689b6c95f7d5d92fc25860b8b94bd7d564608a64af01630c98b855c0d3aa4b053dad133ff535852448602dbfb85c15b00679a4ba4fd WHIRLPOOL 357b6df8b3a02976d761ab336830169e0b5fd049d534e729ebc50cb4a82891696f7ca4e7b0274c5e5611b4e71a0461c5e83fbef3b0e497a4920436a0d058ed8b -EBUILD libbtbb-9999.ebuild 2881 SHA256 0345dffedccc0c3db9bf4b9fadc750b658fae65697157a91b74132da21ffbf4e SHA512 0819ba67e8b86d4b7ccde5a765626f5d93a3eddfa2587f88b01b0fd80806ce5c32cc319602964ea69bd36bb735c9326cabe6de88a7fe5feb4c505fc0fa11a129 WHIRLPOOL 3d4c183ad0b927d58a900d4d2b8d17d0febc5be540701f8d7dd641af20115588c62ed8645905f31d15eb6908f94b1a6375e5dc1d8c62a4873d99a1e0bf4dd580 -MISC ChangeLog 3807 SHA256 5bb69cb7423749a4cfdd401de76bd7563a348ae615776ea2f38e9ad426cf0915 SHA512 5e0fd78a9c9de915b8826e6fe9067ef11ec703f4aea799d08683d4c067ec7d0fbbdb37d7e86d9edc3b281fda84c85319bf696e0b24ee8b57f189665dd96e0347 WHIRLPOOL fc37fb858d096e876da222c65feca57864c20ab02cffea6b75b82d3735663137e2676e102d815014b36fea63bf27fb240625485e94db5eca2f306441f1294616 +EBUILD libbtbb-9999.ebuild 2929 SHA256 1aa3ab89336a401baac249acfb482f2ae996c96a46bc6d17ebee0f45dfe8dfcb SHA512 e7a980aaf6edecc5bd01a0a41c5d8cc31acb13cbce81bb7ae430dfdbf76d70ee1f4e67bd3dd4b8ed13d3437452afa762ae8c885c33c7f16f0f51a30e6f3e903b WHIRLPOOL a42958a167c0d0890ae7a19c01fb8496e635f78534809fcab74fef548833c70a2c3f47f23496b5b8b88a7892edaacbe7f3b9b6db5c091801bec1ab2a8e269aad +MISC ChangeLog 3909 SHA256 426b418c0cfe303b6848c0056378f0ff748c8904e98a4e7fb1c54bafc69486f0 SHA512 1dffb7ffa8c7a5cb73750d48bfa42b87610e71c9a810febe1c26b8deca4a53f34b301d7354ba3908c8510523bf20693ac7a61ac613bb01e2440781651cad8cc1 WHIRLPOOL 8b4bf48b70e212d9ac1aa5745afbff6e4cedc7d1039339af36218e732484e2e8ae45be32437ec8037c75d5616b322bbd36fbf8c0e15111fd311310e9a74c5876 MISC metadata.xml 447 SHA256 ba92693c88971a0400a761d219cde616867dca26c749be15084ec1326cb1a0f9 SHA512 5cd3d8c10ac7af6d4faf636d992210b9ffbc302ecbec4c1e0e9d34a07347acf85478ea3b49eda848702a37fcb3d926f9265be57c0224815598ba6766b2036930 WHIRLPOOL 95ba420aea3cefd523a4f98a1871c434b62ee416a678fcf44cd215df5a068cb559d79f82724544f97bfffc942e85d49c31ca23efb072a333ac7cbf6bac749a50 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQIcBAEBCgAGBQJUVSZDAAoJEKXdFCfdEflK3pkP/RUnLblol6jD83/TjI4DCiNB -aI8VHxxKCVNGnukbwT7IKs0BDxqOtYo0Zet1EwndKwLHlI8a9hLJIZ5QLMbxirBF -HHXbaF9g7srnlnnt+9LLRcE0YmMtC/PNCYcql3SPTE2sp4gk1TM8CyCPld55oZAO -lBtHKcB2uCLMTN/82kukHxfmw3dO9916glF7Peqh0fiIEOLzl91ArO1j45WLVMWQ -0a7jB6HvL1njAgW+N6ggwbgsxZuJqeF3FWaEKrjMZ4sMuU9jZvOeGDEhZGczTHuT -nie4PeCHZY2695ud0qLTVT/iP+HkslFcL0YPprwodrOZt3uUwy1E4UQZIQBeWweW -t0Aq0eUb6SeaPszMhQgYPYPicZkui+XrKampbN81ksE/cqe5lETano+YDbSKbNwY -5KVCdOF+8Lnu62GT4HoP7sy+0h/uCq+u89LeRjqL9U5jPwWk3f4c1EJAOGWSzhC6 -+8rTKoUm5Ay2uI5AwjdDycy+floZCMv9kHI1j/S1J6lFC3CEX4TQJf4kOBrVvZze -3+M/O+iqhScRyCYdzhEmcIqxefx1qhH2pTq5Nbe2opFwdgbtbrilF2YdLT3Ya7x3 -mxBh0BpuyRFG2E+R7OEjkPyHd3YXI1YXEpLRCzoF7EheRWfy7i+1tyjlMtusyA0y -nrnpiQTQxS6lIOo9iBmj -=GNx7 +iQIcBAEBCAAGBQJVCzVlAAoJEKXdFCfdEflK0N0QALJbtaNovBxQhgn6NzAskD0x +Q1nlkSVIF7WQZ52neaYTVuxpp+w/aIhPOAE1V5qG8GqodiUEEXc7DkNS9DyhPHgQ +Bfwfcib/pRxBprra+3RUFHE+UwrDVFqPAlo8T5wLbDnZUowLRgaYqpe/dah4vXg1 +AOPQ1d+EYlbzsCf+UxkPiyiELJcUwRON3GmlHjjY6btvOLtDBgMXuJdb9FC3uLO+ +/VR94pgExKPC0+JAhwlpTMqLU5M+1ITFd+5XS9tjOQcrVgat7vJO2HZ03oP+MX0S +Ebp6ErKNwbNyD4f4oCLxzyUNXumUylyaeW5N8FXHG2FBxCHmcyJMl72oB1T6S1U2 +vtLlRzOMrM9lOSbrrSIcaG7fYDk+IGe9MZyP+AP2kUdbeBtH++TRGF39ofazPalY +nTKfjLDVVSfxjBroVNs+Iid6eRzhDnxVbecty9JKu2UbkjAmiPRFRPAKIbflLB+/ +VgJQXVwvnkkYyHfGSdngu+Kvjq8EPT6+j/7L3RpqcSczSisuO0vRFS8F/z+FJ9r+ +uMjoY5jzKqLkM+hyC+Jq7SIrH4SHsXLooAAIhoLyWhl0Ees+vf8ZbSmA9BMxe6VK +fZNjVNzAb87CUYmP0XxcwK0lzVWDXr1lRZjErNaAEtVxYtXW/tE4tz/5HGvBWp70 +00cApbYqJW1YOHTPwsgp +=9Jhy -----END PGP SIGNATURE----- diff --git a/net-libs/libbtbb/libbtbb-9999.ebuild b/net-libs/libbtbb/libbtbb-9999.ebuild index 1528fa5ed7db..96c377557ec0 100644 --- a/net-libs/libbtbb/libbtbb-9999.ebuild +++ b/net-libs/libbtbb/libbtbb-9999.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 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.13 2014/11/01 18:25:38 zerochaos Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/libbtbb/libbtbb-9999.ebuild,v 1.14 2015/03/19 20:45:13 zerochaos Exp $ EAPI=5 @@ -26,7 +26,7 @@ SLOT="0/${PV}" IUSE="+pcap +wireshark-plugins" RDEPEND=" - net-libs/libpcap + pcap? ( net-libs/libpcap ) wireshark-plugins? ( >=net-analyzer/wireshark-1.8.3-r1:= ) @@ -66,9 +66,10 @@ src_configure() { CMAKE_USE_DIR="${S}" BUILD_DIR="${S}"_build local mycmakeargs=( - -DDISABLE_PYTHON=true - -DPACKAGE_MANAGER=true - $(cmake-utils_use pcap PCAPDUMP) + -DDISABLE_PYTHON=true + -DPACKAGE_MANAGER=true + $(cmake-utils_use pcap PCAPDUMP) + $(cmake-utils_use pcap USE_PCAP) ) cmake-utils_src_configure -- 2.26.2