fix for bug 516178, wireshark 1.12 renamed a header file, backport from git

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xDD11F94A

4 files changed, 23 insertions, 80 deletions

diff --git a/net-libs/libbtbb/ChangeLog b/net-libs/libbtbb/ChangeLog
index 0e6182735b1b..d746678891f3 100644
--- a/net-libs/libbtbb/ChangeLog
+++ b/net-libs/libbtbb/ChangeLog
@@ -1,6 +1,10 @@
 # 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.15 2014/04/04 19:51:31 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libbtbb/ChangeLog,v 1.16 2014/07/04 21:30:36 zerochaos Exp $
+
+  04 Jul 2014; Rick Farina <zerochaos@gentoo.org> -libbtbb-2012.10.3-r2.ebuild,
+  libbtbb-2014.02.2.ebuild, libbtbb-9999.ebuild:
+  fix for bug 516178, wireshark 1.12 renamed a header file, backport from git
 
 *libbtbb-2014.02.2 (04 Apr 2014)
 
diff --git a/net-libs/libbtbb/Manifest b/net-libs/libbtbb/Manifest
index ef21715c9979..cbc733c5f710 100644
--- a/net-libs/libbtbb/Manifest
+++ b/net-libs/libbtbb/Manifest
@@ -2,26 +2,24 @@
 Hash: SHA512
 
 DIST 2014-02-R2.tar.gz 165467 SHA256 96c99b4cd12b098b9abbef1b9942e38c34490d4b27ef1fe7dd9c6058e11dafe6 SHA512 4696f043061b15455be6c6aab8b4b1ee3823cb736014237eadbf60fca0ae54457aab160b23a1a067192b8c811d363586ac7f4b45cfa55e54f6fac24967dccfd2 WHIRLPOOL 747f0b2a229596d89c1d3835f4bd417d234a6ab5ffeabca10d657c6a69eadfbd423b1805a08178f07087d76f48320533fc2a3fef0cecfc09c24ace2cade3458f
-DIST libbtbb-2012-10-R3.tar.xz 65652 SHA256 0822a4b4da3ba7d0aceaa089ce95e9b77abdf229916f2c221c76ac2a0cdd1b37 SHA512 53c6d2b9c2c295d40dfabfe9d369c83491d9f5ad8ebc6c4a2f7ef5f2728017335f552239e7d093e9baf4a9e581a8d7da3840d6f96bc3ab5882b91e98c52c37e4 WHIRLPOOL 7fc027851c4e4d22a2499ddd7e8195a8037a0723f0e0c36730d19fd627482d50e05809b61d4e2df4f6d2764fe9847d0e674a2b05f50904b29561397db19a014d
-EBUILD libbtbb-2012.10.3-r2.ebuild 1461 SHA256 198fc8ff46e9248b2394c783be57150f93a88d7e66830f7431840f8d53e31bc6 SHA512 a675eab70d632870dedd72817de60e1fe22d6971587c6d162e412d442d0b32110a4b6bc2e7248a98d846b84d580cfdff83b6b1843e5d73e1f43b0b54b68ee535 WHIRLPOOL bf9efe7e8334588910481d7bf22652785f07ae3ecb1eb140f3a17c4c5994903854911ce422a874a7894b25a81cba063157e7c8cede06e69d763eca126c1355e1
-EBUILD libbtbb-2014.02.2.ebuild 2598 SHA256 904534c63dba29bd129bbc8110c6c6248aaeda524832a30255abd27856b6519d SHA512 b590c43fcb5cb05767d8fa532398e8bd68f86c9eee86cf94f3a68ab0c25f1da01005b2684e1e86f11c1444164b65fa5fec382d18fb7a1a9672826ff7c40def71 WHIRLPOOL 9021441f7ebc80844fb467875db19851c598a31f9c961468cc41e94c9cdb8d09f204c680eb421656ed5c1a33586dd74e3e7d8876b4ddbd8d949f85720ad53bf9
+EBUILD libbtbb-2014.02.2.ebuild 2688 SHA256 19041c229db00bacae7a0b25342b90c3dc7c6adb7b2575e28e017f8daf43947a SHA512 7e5c02fae697d23e771ff4c8d2f8a051d25161c34222eb83fc338614ccedfd11c69de1a23f93d0c9df45419f75e00151a60cd78ba5acd4554414c5c13077025d WHIRLPOOL be226c22626c8a7d34061e670e2c4aee7900cf6bca5a3373d604ed9e7c9b6ac44f56414598a7797d4b658bd8fa0eeae013d650f9d72b2623d0f4eee9d9e4ee47
 EBUILD libbtbb-9999.ebuild 2594 SHA256 925dd099eebc6e08b94d4e0045b90883adeabf3f4089b0972f11cb32f28825fe SHA512 1c8872fdd771bd6ae05d0879f52c558ac6d85d3747c7ad6353b6600f688f7d08ec2f1922a4a8b3ceb3c8df7b3ca0495904d810b9831c1c6268616e3cf0a85dee WHIRLPOOL d48aeb346f0fac3a082b027b4ab344dcd19cf5a045fd8231b1f9de9f3b7d31034e7cae49743f2dd4592b5c162cfeab3ae2eaf15cb514554576b8e5808a803fd8
-MISC ChangeLog 3265 SHA256 0cca82a2e057b031215cc702b0f71f115200ecbb9b3bfdf5f182f8cf0a13f277 SHA512 ba92cb28748141027ad458030895c545559f352cfa3c20b3de70e800d83ba87a95c7dafa033d7b3e604af46f6b5c447a670f128a0a5a18a02eadfcab8952d65d WHIRLPOOL 615d5606ed2c022845405a7ef5859072a76503bf8d891a87de91b9ce2265d84e1ad7dea2438365e4387d8e43fb478230e11196e326aacbd137d62cf4d7162d72
+MISC ChangeLog 3473 SHA256 e5b97f0d39774c54aee5b79377ea8a00632d9c794aa06a6e3484cf7db6160e09 SHA512 d5fd6f897c9b2c0d5f070e73eb1ce8b8c6efaa9340258a4da1fca0307c7e691be6f46e07cc67ab69c51d86e5a4357a028f0701ca3bc780d20d7942b72e8cf42f WHIRLPOOL 0ddc332cc54ec6932f51ff4afcb1c5fabebb717252d8d8f94acb10707bb6a8df49c734ad7ff50d878832c6af52165c810f6ea11c00311d1e33536e8fff46b01c
 MISC metadata.xml 540 SHA256 50e2ba72a2b7026511db9537247aa02f838677c6b1475ccdc31f56510b2e08a9 SHA512 7f12b4aa155ba023e816c4b2e157337d336517293473b97e209c372eb93d82b78ee81eeb15b4cf1de5b0fbfec2c1b07313954bbe1d2c8d7618db44b85dcd5347 WHIRLPOOL 81799ccbd96f596db6ff83d54b2ef297e2f47d1b016ccb3ed5f1e8cfd37608c20d51d4cfd5b4acb66c9c284a209c169752040e6a27f8ead3a2ee5563ca5a00fe
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQIcBAEBCgAGBQJTPw2dAAoJEKXdFCfdEflKLmQP/1oIr0rYy5OPxYciW54Jx9XV
-l8ypSiqVtZASlZ23zMmSaKDZysk4Pgv9eU0RR3q8BoaKGuG7gCdSaPKGbuZI+DH7
-BQm0tbyTYrFfhGJP9DP0HdJFL/haT6MlwEcvGHRfUUmbwhwNBdsi/LJsWkJ+NNbi
-woOqtWPvCTftW/uXAScEjseI4e8IQwPYCgRWlp7uz56EOrecmEDoyexDx2ZnV89Q
-Ku+EgF2GoZzB6LE3od/plbtGxPdM6QtNAojrOAeYeA6dj0XudL8Qx7XcgbwbN0At
-E/L2VYCstT1kwra6HD52lMb8XRnFpXACaesHKDf8KXzgxxep/vZ9Rlkr3M+N5XD3
-yp4JOat3+cvag2NqZ8X80OQ2+93cid3EgeybFgD6eRO6K4iM8bFvMxOYvCKbppHJ
-nD//LqRHkAAi78unMnBd+fUAZhtPl3hHRDzB4zmev5Mp5g8nc1XoHtKUodhzJjJs
-DTHW/Zc2qDtD703V4Fbg3UFtWXBPzWcvFxlh28oaqBqby/Xi4hwI+iEe6er1BNoT
-nsFGaq+FMjCTU16B2s6/iPkOM2N6SgWOyGqkRB2Hox0MB2r7YftiWEibhsnIxmK8
-cxzKmJIkoonq+JTAwegJYFY3VS8ZyNxs1KAmEWnudMwlwmKlQ+H8SIzELguqRIpG
-sGHZeFlW4U0FaXFA3xLZ
-=dYOu
+iQIcBAEBCgAGBQJTtx3MAAoJEKXdFCfdEflKmBQP/2PWIJC6J5UdnXOKIZshxjFE
+gYzyWCR3JAScWif92Q6HB2pf863NqTj/PD1shYC1Zw6DOtOaZjM0oZHAOFTy0mPU
+EMgBh1jgJNy0BN5jfJvZWSP0+trX//04hrogKUaaIa14Lbkuzc4bZlnUGD/b/q+x
+BI4WtGAwpbXe2jJeZ25qgKr7ZMm9kMcvDPTyDrOHx7Q4jZ+NUWW8EaFwgsgy4iMr
+4A1twgROIkYEqhP8e/HSfndu5uU2JIAD3YixYO9hiirsKtiCkCRzeoeVfMzYnr5L
+8US5gnlhSJkE/nW1+LKjVQj10IbrVvOp1M6+0gkM6o0ce9b/0rng8TL6RrjRYFu4
+XrsFY/b3hIwWCyT5jJNnfGIertf6bA2UP8/wxtqlerWi7D+p4lHy0V+0eKRSFoLY
+Agr6mOEWQj4zDBBXy0TC7T2bplLaO8J2QOVu2NkILA3yuFrsfRbysa/Bno00fhDr
+ahmoG68NjKjgnskhT6rSPOV5P7DB/I+t2MbFfQraIBDOedKNcwx1RFuxLu2W1QFE
+/oyIQ66aTe1D0idjJ8N+Ktjm8eUyerq90f48XAw73tQw8+xhOd7Vjq6ilbNrMvBx
+/ZqGjS3ew4sMQkE2XF3Pyt+krp8qTfmfNX0JbSEReqO1KVF1FyQZvsDZ0TbRZt4f
+SaBfLQaHtsitDzDUy/wA
+=OoOo
 -----END PGP SIGNATURE-----
diff --git a/net-libs/libbtbb/libbtbb-2012.10.3-r2.ebuild b/net-libs/libbtbb/libbtbb-2012.10.3-r2.ebuild
deleted file mode 100644
index cfffe3f85793..000000000000
--- a/net-libs/libbtbb/libbtbb-2012.10.3-r2.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libbtbb/libbtbb-2012.10.3-r2.ebuild,v 1.2 2013/06/03 04:11:45 zerochaos Exp $
-
-EAPI=5
-
-inherit multilib cmake-utils
-
-DESCRIPTION="A library to decode Bluetooth baseband packets"
-HOMEPAGE="http://libbtbb.sourceforge.net/"
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="http://git.code.sf.net/p/libbtbb/code"
-	SRC_URI=""
-	inherit git-2
-	KEYWORDS=""
-else
-	MY_P=${P/\./-}
-	MY_P=${MY_P/./-R}
-	S=${WORKDIR}/${MY_P}
-	SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0/1"
-IUSE="+wireshark"
-
-RDEPEND="
-	wireshark? (
-		dev-libs/glib
-		>=net-analyzer/wireshark-1.8.3-r1:=
-	)
-"
-DEPEND="${RDEPEND}
-	wireshark? ( virtual/pkgconfig )"
-
-get_PV() { local pv=$(best_version $1); pv=${pv#$1-}; pv=${pv%-r*}; pv=${pv//_}; echo ${pv}; }
-
-CMAKE_USE_DIR="${S}"/wireshark/plugins/btbb
-
-src_prepare() {
-		sed -i \
-			-e '/set(CMAKE_INSTALL_LIBDIR/ d' \
-			-e "s:R} N:R}/wireshark/plugins/$(get_PV net-analyzer/wireshark) N:" \
-			${CMAKE_USE_DIR}/CMakeLists.txt || die
-}
-
-src_compile() {
-	default_src_compile
-	use wireshark && cmake-utils_src_compile
-}
-
-src_install() {
-	dodir /usr/$(get_libdir)
-	dodir /usr/include
-	emake LDCONFIG=true DESTDIR="${D}" INSTALL_DIR="${ED}/usr/$(get_libdir)" INCLUDE_DIR="${ED}/usr/include" install
-
-	use wireshark && cmake-utils_src_install
-}
diff --git a/net-libs/libbtbb/libbtbb-2014.02.2.ebuild b/net-libs/libbtbb/libbtbb-2014.02.2.ebuild
index 2f11a8c16731..e488cfd85056 100644
--- a/net-libs/libbtbb/libbtbb-2014.02.2.ebuild
+++ b/net-libs/libbtbb/libbtbb-2014.02.2.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.1 2014/04/04 19:51:31 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libbtbb/libbtbb-2014.02.2.ebuild,v 1.2 2014/07/04 21:30:36 zerochaos Exp $
 
 EAPI=5
 
@@ -44,6 +44,7 @@ src_prepare(){
 	if use wireshark-plugins; then
 		for i in btbb btle btsm
 		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