updates to live ebuild

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

4 files changed, 107 insertions, 41 deletions

diff --git a/net-libs/libbtbb/ChangeLog b/net-libs/libbtbb/ChangeLog
index d60c347fc099..627d3781e07c 100644
--- a/net-libs/libbtbb/ChangeLog
+++ b/net-libs/libbtbb/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-libs/libbtbb
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libbtbb/ChangeLog,v 1.13 2013/06/03 04:11:45 zerochaos Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libbtbb/ChangeLog,v 1.14 2014/04/04 19:21:12 zerochaos Exp $
+
+  04 Apr 2014; Rick Farina <zerochaos@gentoo.org> libbtbb-9999.ebuild,
+  metadata.xml:
+  updates to live ebuild
 
   03 Jun 2013; Rick Farina <zerochaos@gentoo.org> -libbtbb-0.7.ebuild,
   -libbtbb-0.8.ebuild, -libbtbb-2012.10.1.ebuild, -libbtbb-2012.10.3-r1.ebuild,
diff --git a/net-libs/libbtbb/Manifest b/net-libs/libbtbb/Manifest
index 521804c9eaf4..e2b37725c72d 100644
--- a/net-libs/libbtbb/Manifest
+++ b/net-libs/libbtbb/Manifest
@@ -3,23 +3,23 @@ Hash: SHA512
 
 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-9999.ebuild 1470 SHA256 b7030c4d26389b38ab5469294e55c6b8c15902038a16d97a9b07b88e4070a00e SHA512 c410546a3b716976034bfecd3ae953de79696cdb62517c976b20c24a8ab4449061afd10e1ffbed8d8dbb5604e7b3ab87eccc0f3c6e3c5e8d6c5bf9177c686357 WHIRLPOOL 26fba9c5e86ab8e5c8ce8f2cd7936f86e801e7c39c215a31173e2073c84eef5714802eea4ce98b321833bee3a70505d6f6d4fd2b5c42d4c2ef3678c320016d7a
-MISC ChangeLog 2978 SHA256 513645b4ae4a35c6064e4649ce6622deaee4fc382b85b2241ccaf4fd95157c73 SHA512 0115f209ea12743516002d2132c5c92a0ad9633ef8b7ab6aebd3126406aaf594b15e9e03a460cc8e94103cf994e8664d00c3235da2bf85f6041a1d6a373f51d0 WHIRLPOOL c3441843c93b147a3a957a4a65bcb4a2b8fd983ec3c33556f84cdd2c08048f4c43409c52d0f56c7ecc32c73bf5a63b94e7ab7580613ad755a1981e3aeb589b7b
-MISC metadata.xml 349 SHA256 4084f6dff788e2e233a97a20fec26825dfa55d96857eb3dd4e67f957d3137916 SHA512 819c559993555ba0c3b81c3948b85fd58057d023bcce08e49ea2bacc0267bc108f1448e5b504f294e98b3dc6e8b88fa4a4f57fe5999fe28f993036ac3312bf38 WHIRLPOOL dcfadb3719effccb6967f15a90e9c6322ee3538452e0337f0da35513cdff1d711bd7503b0b90880ca413ae8acc99ea7cacf3d03b0b2fc237c5b2c0cf478f83db
+EBUILD libbtbb-9999.ebuild 2558 SHA256 9ec154226efce02bc6b8acf6a571f2b05fe6582f527fcaa3510867d5cf4c16d0 SHA512 fdc1d8b6442a66be3a62e49a96e44d2b08d9298d52c28587d5d4a1456944b3c321183dbc209f9c89614666f8dc4444b3d2c83e054d861da3425aaa80db5b09a1 WHIRLPOOL f05aeda98a00c8c86f75973a8668d4230d9f8341067e69a4658ef3c2b31f2720acaaad7e98ba9520559a6a8d114a3147845c3d40e32ffe0b6ba36b4fd6ebcdcc
+MISC ChangeLog 3091 SHA256 90344ee54ddf9f8e58ae24a8d0d501e1f77e76eba77929696a183241b3870215 SHA512 08c88b0a2fc450ec89c1f750352598680daadf8aa45bc965ff95b77bd9f27ec46a011834917e37f74e9c8921b813de80552ac106595c77e7dc18e8bb3db3ece7 WHIRLPOOL 2796e0afef6526d583ce21926faf8ddbd1b7e8159b243410517db82c2a9e16894691b7c555ca638b459fadd5be1603428f1ad74a318a94b9538e52166195149c
+MISC metadata.xml 540 SHA256 50e2ba72a2b7026511db9537247aa02f838677c6b1475ccdc31f56510b2e08a9 SHA512 7f12b4aa155ba023e816c4b2e157337d336517293473b97e209c372eb93d82b78ee81eeb15b4cf1de5b0fbfec2c1b07313954bbe1d2c8d7618db44b85dcd5347 WHIRLPOOL 81799ccbd96f596db6ff83d54b2ef297e2f47d1b016ccb3ed5f1e8cfd37608c20d51d4cfd5b4acb66c9c284a209c169752040e6a27f8ead3a2ee5563ca5a00fe
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRrBe3AAoJEKXdFCfdEflK0ckP/3TJ+5QPwr7haLnJTsjfc8W7
-RtXiGWu8HHXWzgUPkZkdj0vC8p3FeRdl2CVpZwSHp9Hdt2ba60RpuACfVbHgDa0F
-Pq9Li0AXX6CG9GMc3BR5UYhNdoYZvhmX1wdQc6fiUnebjPZTN0RoAVq3D5e3hiVy
-+EpBhKhEo1hbgqUi3VLRjfLc7W16uPWWc+t8nnulZ7lmrRMYauwjPXt8etRquopT
-V32KcOCdi8RFBkMO38MBVK1NKAgah7yaNi+yj3i9Z9jOdp1FGOMJtvtTs89Wg6w+
-V+I2s04//xrYNRHJUm6rCwFTRfZxyg3p6KYGgRX/5UEl0gKnIu9V/3laiLqXqeG1
-GdQHC75m857l0xvDtHb6w+KKmx1dQVTvDwaPqVR0Xrv8O3LvbRd7lTNqtnUvVOY7
-JUlZtK8b6Z7r6WjjIp3/AGNy3dc6vvquqaeXstQmMyeV97irHxC2gYSQSM3xTbzd
-gqcFGqgrzXYs1Hy7qUzDhYP5SAUXzK8XeUlV2AIccIUPE+PoCgIra3OroCfOnTF9
-NxWcDtdZUCwsICx2UKUrtHqNKnr0IcXgig6to6ODoll2rESJIh+yvznyNfA+VgRY
-SKH8zl6q6upYZlIxPtdbNPjIxks1YqH33Fs2Utn1oYvFx4ifnAgLOJkHOjCEZ/Ab
-qz2XiI84aCwRFqUCRxbH
-=HpKq
+iQIcBAEBCgAGBQJTPwaCAAoJEKXdFCfdEflKJVoQAKHdKeoPJ+KvJ6xK/ZbcQqRl
+shKWRNQqCRekkAMVLPBLH0yHCSV6O5YJX2QUdJuQ8dhV+06yczDfwURPBsNlPPc5
+3FX7YYwfjqKRCZ/mRcTzPr3c8TXOxtR+f175fAzE1C/NdQQ1T/R1kZA6z/1BNkdj
+/fEV+kHmgM/O0CH6j0z1EtXD2c7JFn2eQt//Za922Gs3pSHdUXp58O8oBui3ggSQ
+vrQnoB3HgJiR/xvlvnWr1OEoZi+xxX90WpkPwiZqfp8Y6xtWN6jRjz6OuwW3buTT
+cVOuv35ObxbwmfuKV49NMmzeUM/mLRVywVwD7QEy46ry+CzXAFtVj4e2+bYlgLOj
+QnvQiPex1pu32Nu7n+gzEf9/mV7p5Ah86JPsCtVt4RIJW1Df6mxsw8zuJpDemvCW
+eCXfP7iIEKyCFJmUnXXt5OFESnowZfXWpIzXDm2/1VSHx5RjOegfX3SvYMDCHCHg
+7/2F8/7jDAo87jZnqX1VPuUBVgBxgBF9f6RlWitiI0yQCvED1BoyWlJwese1yHlP
+2IgKKc1TiOnOGjMMe2XUK/q25klz/TC7rl9yQckG+ouxMGnpc0lCZxEHv13BeBKv
+jqlbJBwDknm8O9ndY35kTq8MlFnDn4sKEuSGo+8k4taCuHJbg3m6qFk37XdJrzOc
+U7cOCEkpeXO/1W8GLctG
+=1ysL
 -----END PGP SIGNATURE-----
diff --git a/net-libs/libbtbb/libbtbb-9999.ebuild b/net-libs/libbtbb/libbtbb-9999.ebuild
index 8f24fbfdcc03..efb146e621f7 100644
--- a/net-libs/libbtbb/libbtbb-9999.ebuild
+++ b/net-libs/libbtbb/libbtbb-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# 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.10 2013/06/03 04:11:45 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libbtbb/libbtbb-9999.ebuild,v 1.11 2014/04/04 19:21:12 zerochaos Exp $
 
 EAPI=5
 
@@ -10,9 +10,8 @@ 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"
-	EGIT_PROJECT="libbtbb"
-	inherit git-2
+	EGIT_REPO_URI="https://github.com/greatscottgadgets/libbtbb.git"
+	inherit git-r3
 	KEYWORDS=""
 else
 	MY_P=${P/\./-}
@@ -24,37 +23,98 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0/${PV}"
-IUSE="+wireshark"
+IUSE="+pcap +wireshark-plugins"
 
 RDEPEND="
-	wireshark? (
+	wireshark-plugins? (
 		dev-libs/glib
 		>=net-analyzer/wireshark-1.8.3-r1:=
 	)
 "
 DEPEND="${RDEPEND}
-	wireshark? ( virtual/pkgconfig )"
+	wireshark-plugins? ( 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(){
+	CMAKE_USE_DIR="${S}"
+	BUILD_DIR="${S}"_build
+	cmake-utils_src_prepare
 
-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
+	if use wireshark-plugins; then
+		for i in btbb btle btsm
+		do
+			CMAKE_USE_DIR="${S}"/wireshark/plugins/${i}
+			BUILD_DIR="${WORKDIR}"/${i}_build
+			cmake-utils_src_prepare
+		done
+	fi
 }
 
-src_compile() {
-	default_src_compile
-	use wireshark && cmake-utils_src_compile
+src_configure() {
+	CMAKE_USE_DIR="${S}"
+	BUILD_DIR="${S}"_build
+	local mycmakeargs=(
+	-DDISABLE_PYTHON=true
+	-DPACKAGE_MANAGER=true
+	$(cmake-utils_use pcap PCAPDUMP)
+	)
+	cmake-utils_src_configure
+
+	if use wireshark-plugins; then
+		for i in btbb btle btsm
+		do
+			CMAKE_USE_DIR="${S}"/wireshark/plugins/${i}
+			BUILD_DIR="${WORKDIR}"/${i}_build
+			local mycmakeargs=(
+			-DCMAKE_INSTALL_LIBDIR="/usr/$(get_libdir)/wireshark/plugins/$(get_PV net-analyzer/wireshark)"
+			)
+			cmake-utils_src_configure
+		done
+	fi
+}
+
+src_compile(){
+	CMAKE_USE_DIR="${S}"
+	BUILD_DIR="${S}"_build
+	cmake-utils_src_compile
+
+	if use wireshark-plugins; then
+		for i in btbb btle btsm
+		do
+			CMAKE_USE_DIR="${S}"/wireshark/plugins/${i}
+			BUILD_DIR="${WORKDIR}"/${i}_build
+			cmake-utils_src_compile
+		done
+	fi
+}
+
+src_test(){
+	CMAKE_USE_DIR="${S}"
+	BUILD_DIR="${S}"_build
+	cmake-utils_src_test
+
+	if use wireshark-plugins; then
+		for i in btbb btle btsm
+		do
+			CMAKE_USE_DIR="${S}"/wireshark/plugins/${i}
+			BUILD_DIR="${WORKDIR}"/${i}_build
+			cmake-utils_src_test
+		done
+	fi
 }
 
-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
+src_install(){
+	CMAKE_USE_DIR="${S}"
+	BUILD_DIR="${S}"_build
+	cmake-utils_src_install
 
-	use wireshark && cmake-utils_src_install
+	if use wireshark-plugins; then
+		for i in btbb btle btsm
+		do
+			CMAKE_USE_DIR="${S}"/wireshark/plugins/${i}
+			BUILD_DIR="${WORKDIR}"/${i}_build
+			cmake-utils_src_install
+		done
+	fi
 }
diff --git a/net-libs/libbtbb/metadata.xml b/net-libs/libbtbb/metadata.xml
index 485953a791ab..dcc4212afa5c 100644
--- a/net-libs/libbtbb/metadata.xml
+++ b/net-libs/libbtbb/metadata.xml
@@ -6,6 +6,8 @@
     <name>Rick Farina</name>
   </maintainer>
   <use>
+    <flag name="pcap">Add support for network packet capture via net-libs/libpcap</flag>
     <flag name="wireshark">Build the wireshark plugin for bluetooth baseband sniffing</flag>
+    <flag name="wireshark-plugins">Build the wireshark plugins for bluetooth baseband sniffing</flag>
   </use>
 </pkgmetadata>