Version bump wrt #364707 with a upstream patch to fix building with recent bluez wrt #363945.

Package-Manager: portage-2.2.0_alpha33/cvs/Linux x86_64

4 files changed, 73 insertions, 3 deletions

diff --git a/net-wireless/bluez-hcidump/ChangeLog b/net-wireless/bluez-hcidump/ChangeLog
index 711fad9a4af9..211ac501e099 100644
--- a/net-wireless/bluez-hcidump/ChangeLog
+++ b/net-wireless/bluez-hcidump/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-wireless/bluez-hcidump
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez-hcidump/ChangeLog,v 1.48 2010/06/11 12:09:08 ssuominen Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez-hcidump/ChangeLog,v 1.49 2011/05/15 16:16:10 ssuominen Exp $
+
+*bluez-hcidump-2.0 (15 May 2011)
+
+  15 May 2011; Samuli Suominen <ssuominen@gentoo.org>
+  +bluez-hcidump-2.0.ebuild, +files/bluez-hcidump-2.0-bluez-4.9x.patch:
+  Version bump wrt #364707 with a upstream patch to fix building with recent
+  bluez wrt #363945.
 
   11 Jun 2010; Samuli Suominen <ssuominen@gentoo.org>
   bluez-hcidump-1.42.ebuild:
diff --git a/net-wireless/bluez-hcidump/Manifest b/net-wireless/bluez-hcidump/Manifest
index cadd538eb05b..5e05aba68049 100644
--- a/net-wireless/bluez-hcidump/Manifest
+++ b/net-wireless/bluez-hcidump/Manifest
@@ -1,4 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX bluez-hcidump-2.0-bluez-4.9x.patch 515 RMD160 dfbf1eb28634938e17484f65e472e88410de070f SHA1 fbcd069e0ae106d4964e33ab31fff05c26a5e7b7 SHA256 9f5cd8ff1fd4a45687c43ef6eae82f3e1eef4e09624f482e939ffa0937a37c3e
 DIST bluez-hcidump-1.42.tar.gz 150060 RMD160 c80eab49c75b8782d35e64eecfbc5a0e56214d4c SHA1 b18e41cbf92c00cfd0331506312fa248b39a0eee SHA256 689e39f9432ab90af5f390d86cb46e06c35693d01ea29aec4e41c4f9e315f49f
+DIST bluez-hcidump-2.0.tar.bz2 124978 RMD160 dc74f2c298c569e401558623768d3f62cc670682 SHA1 9febd0aee927948dd98e09563848bcb79d126c3d SHA256 545258616428710e79f41bf6eb7c44b66a897c0ca50df478f34c708689ec30b6
 EBUILD bluez-hcidump-1.42.ebuild 620 RMD160 4067223b0cac430c51782b77ccd3bdd3f2ebead2 SHA1 7d0c55b60b874bfad54a8871fd03633e37d46e65 SHA256 6264533edef43a2fce86bb6d91bd9222cc893448037ff1583f977ebe606f5903
-MISC ChangeLog 6327 RMD160 d17b427857f015806c4760e142ddd86198bd65c9 SHA1 a75e7b068c1efc37c39e3896252064143d832cd3 SHA256 01f210ab35ef7a9c16bd92e6650100c2195618da96adeb52c51261317a2151ff
+EBUILD bluez-hcidump-2.0.ebuild 643 RMD160 62fde5f05305e1cac74ba55accb3ff82f2603548 SHA1 d226696cc13cdd38deb66effbfdef9af71d7debc SHA256 3cef0461270789fde3d9022c53edefbe682a78a49190e8374ca8992c087fd07f
+MISC ChangeLog 6586 RMD160 21d1eee2cf79a24fc444706ded25b9ef68d0c694 SHA1 d152ba51e8a5a8a7925168fbc23add9b5ff25ac0 SHA256 25007e201582e77e4d0a344bea4c6ab897dff5bbe75ff06b347afaa53b1701dc
 MISC metadata.xml 246 RMD160 2be63471293bc7dcf5b4efa7217bf0ec94d2a34e SHA1 cb0eefc516c70671b22b6bf8005ac94ff125f476 SHA256 75b18c15a1d7257d81551ae42b51a4f0585eee47eb1d98ca83661e2471bc2df4
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iF4EAREIAAYFAk3P/CkACgkQXkR9YqOcLPErswD+KrOR47ymX0/zsoeK8TSp8nbh
+Z3ImKNvUACI2BrlQRqIBAJQgGXwJVrsfS8VQiN3GiyzHsJRhCxuPuZfjxNG5lenj
+=nAcF
+-----END PGP SIGNATURE-----
diff --git a/net-wireless/bluez-hcidump/bluez-hcidump-2.0.ebuild b/net-wireless/bluez-hcidump/bluez-hcidump-2.0.ebuild
new file mode 100644
index 000000000000..0d19ca5322c9
--- /dev/null
+++ b/net-wireless/bluez-hcidump/bluez-hcidump-2.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez-hcidump/bluez-hcidump-2.0.ebuild,v 1.1 2011/05/15 16:16:10 ssuominen Exp $
+
+EAPI=4
+inherit eutils
+
+DESCRIPTION="Bluetooth HCI packet analyzer"
+HOMEPAGE="http://bluez.sourceforge.net/"
+SRC_URI="mirror://kernel/linux/bluetooth/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~x86"
+IUSE=""
+
+RDEPEND=">=net-wireless/bluez-4.90"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+DOCS=( AUTHORS ChangeLog README )
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-bluez-4.9x.patch
+}
diff --git a/net-wireless/bluez-hcidump/files/bluez-hcidump-2.0-bluez-4.9x.patch b/net-wireless/bluez-hcidump/files/bluez-hcidump-2.0-bluez-4.9x.patch
new file mode 100644
index 000000000000..11d7db3761d4
--- /dev/null
+++ b/net-wireless/bluez-hcidump/files/bluez-hcidump-2.0-bluez-4.9x.patch
@@ -0,0 +1,25 @@
+--- src/hcidump.c
++++ src/hcidump.c
+@@ -50,22 +50,6 @@
+ #include "parser/parser.h"
+ #include "parser/sdp.h"
+ 
+-#if __BYTE_ORDER == __LITTLE_ENDIAN
+-static inline uint64_t ntoh64(uint64_t n)
+-{
+-	uint64_t h;
+-	uint64_t tmp = ntohl(n & 0x00000000ffffffff);
+-	h = ntohl(n >> 32);
+-	h |= tmp << 32;
+-	return h;
+-}
+-#elif __BYTE_ORDER == __BIG_ENDIAN
+-#define ntoh64(x) (x)
+-#else
+-#error "Unknown byte order"
+-#endif
+-#define hton64(x) ntoh64(x)
+-
+ #define SNAP_LEN 	HCI_MAX_FRAME_SIZE
+ #define DEFAULT_PORT	"10839";
+