fix slot of libbtbb

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

5 files changed, 148 insertions, 19 deletions

diff --git a/net-libs/libbtbb/ChangeLog b/net-libs/libbtbb/ChangeLog
index 4b5558c8740f..6b67f232877f 100644
--- a/net-libs/libbtbb/ChangeLog
+++ b/net-libs/libbtbb/ChangeLog
@@ -1,6 +1,13 @@
 # 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.11 2013/02/05 04:18:58 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libbtbb/ChangeLog,v 1.12 2013/04/27 23:03:47 zerochaos Exp $
+
+*libbtbb-2012.10.3-r1 (27 Apr 2013)
+*libbtbb-2012.10.3-r2 (27 Apr 2013)
+
+  27 Apr 2013; Rick Farina <zerochaos@gentoo.org> +libbtbb-2012.10.3-r1.ebuild,
+  +libbtbb-2012.10.3-r2.ebuild, libbtbb-9999.ebuild:
+  fix slot of libbtbb
 
   05 Feb 2013; Rick Farina <zerochaos@gentoo.org> libbtbb-9999.ebuild:
   fixing EGIT_PROJECT, thanks to radhermit for pointing out the issue
diff --git a/net-libs/libbtbb/Manifest b/net-libs/libbtbb/Manifest
index f12d0333d585..84a0c3f69430 100644
--- a/net-libs/libbtbb/Manifest
+++ b/net-libs/libbtbb/Manifest
@@ -8,24 +8,26 @@ DIST libbtbb-2012-10-R3.tar.xz 65652 SHA256 0822a4b4da3ba7d0aceaa089ce95e9b77abd
 EBUILD libbtbb-0.7.ebuild 763 SHA256 4eb0db20cd6e864a1c7ce6fd755c59291fbac20f2bb223965a1602b97bf75dcb SHA512 7be63f2d7331465e9023108cb31e3b0fce9e68f311457abfca13ac4c1dd515b1a49f5dd0237ff4473a0ce17f662c8e024bb4e87faf387c76770aac611dad8d81 WHIRLPOOL cad49682016abe1e89c3722c37150431bfa171ac7c01e37fa0e10fde6e1e258c00bff605a68bb864ccfb1ae8a49e19e6f54bd0e1ad4148fb6613b7fbb4f174fd
 EBUILD libbtbb-0.8.ebuild 779 SHA256 4ea7e1ded83ac8488ab5341705270c050b8a0778648815fba7f7b5d664b3b01a SHA512 3fdfd6f517411458715212b7d88285ba3dba6ca8761694370ae91825455a8a256effc8f2537dd7d6e6403eb5eb0fc48b7dcb05b5859acb7984fc84377cb426f0 WHIRLPOOL bbf359eb41b0ddba41dc1c89fb1ba1465df876618d8eb86f4452278a0d8c19a3a47964f8979e7e20aa84409c3bd79cfca85cc6d3999bf16e382964c651360b23
 EBUILD libbtbb-2012.10.1.ebuild 1442 SHA256 08587f8f915f55fc668444a7026ecd5df8485494d41318a84b3fafcd6f7bd412 SHA512 e3b69641a412df989863bebebb4ac5d5f279b86123537f89a2b723141b5bcd58f5fe058f11970d4916dfd5a73327e8f914efb5612a47464a034f92f6b8566c93 WHIRLPOOL 00c19060e1611aa234e3f66a73a2f927e4432714f0675aff44f024ee620909b2856a24b511cb1992e91cfae63c4325730c10d3e270c11a98c9f90d7bcd4c5d92
+EBUILD libbtbb-2012.10.3-r1.ebuild 1447 SHA256 88d38ade358fa3b340a419a1c2a3b3fc68e2322ce5f82f8ac0bfcefe396737ce SHA512 08ed82540ac72c0b479908b83f5798117b13315cdd78cc8e5dd2de7025fa5674ed515f2f3c8b6b353b90137426b8e0ac7ac3704f0b338cd18f0d734a024e8949 WHIRLPOOL 528eaa0a128e21673aded5c6f3afd9257c4bb964dca43e13a307d73e2ae28af3fdfad84334dd2e7dcdad587c9e5b5297f22c95f03bcfec163376a2b0cfda524b
+EBUILD libbtbb-2012.10.3-r2.ebuild 1449 SHA256 ad42f33113bafce7c0d0bcfab7728b2f89d53352e0a98ba0a6d3623df965bad4 SHA512 de163af33627331671c6095648e840db13cb670895bab40f9b483fda8a843d2d86d0c8654eb307892781dbcad4c0b67988f819c4efcb64d271fc464a3b91aca3 WHIRLPOOL 223b29c627751a211861d6d59b5b32207daf5a40963d9bf76e8e142b01e70c7a9346406b6d089be43d2deaa8cf4ad5e2617e6d6fd5564cd54d2a3ddaa001deaa
 EBUILD libbtbb-2012.10.3.ebuild 1442 SHA256 830643ce79e1a86c35769596a307f6f4eaa88cd66eede72ce2e54a67c449f8e5 SHA512 452d3ad240d9001518f5c55b61b91c48c264e6d243d8bad0568d6559d6964aa690811bbe435cd11ad5fa902ad6d85e8fb481fa41c38ae0e45037be17ca0d5cfc WHIRLPOOL 5ce0c7e832d33eebb8532e03652cb801ee53119f7ed53d78e944ac3c3a27df54b84c8ac6364528a9b72d6c48d1a815b58ff35c44c21c6ce67cf068e6dd46a369
-EBUILD libbtbb-9999.ebuild 1449 SHA256 bc4dd6e96bc0026bdb2e6927fab2105a3ff01868b1b38845e669e09784b76f81 SHA512 47bb2b7e9082f5277b0ac681451059ef897d7a66ff4697656938fe121428b7b170375be51da9cb99de701fec3f29f0a98409ae69ba0f0ca9f7de1adacb55d7ad WHIRLPOOL 215d04fbd324f86d5b38e66fb0af360456a936b10861658dc48b747d77a6aeeec36194d48964882cc609eb596cddaf5b039c8055f9a7fdf7273d358ed5b32b92
-MISC ChangeLog 2431 SHA256 d81c57158b7f065c69d6ec8c6c99a6a7cc1a507b62daaafc8df978811a3b216e SHA512 f9d3cc7137825f3f72bc28f1f5df9ac59c06ea059d90931c785dccd55c3fc0758363a18d7521c3e8865a719280a0eb49ce54deeedc8145aeeab164d894384fb7 WHIRLPOOL c724482ca13e9569b090c2e24ab3138f90b9174afa6e23863d63957ec74c22b57e28d23cf81f4b170248be93e0fe8550a1dd15f40af0f94c64fa02ce4bca0a8d
+EBUILD libbtbb-9999.ebuild 1457 SHA256 e131667781d6bfc6e7f1f72fa8865c093e8d50fa64cc1c084be4cc0c84e1249e SHA512 2d7aaf0de1a9f47ec08c7a035b7e951adeed6f01b1ef4757018765d49ae22a6a1b2535afd4e076d1a8cf54ee304a0aa5fd0af0022e46af8f1072551eb4107748 WHIRLPOOL fe2f3f828738d0cd6c53f8bb1f811b63cc11a4469aa5875398598d4d125541989f9200f5c93dd325ff81ff12f2c1f5c70c0086ed87b742bb183e2736d884c61e
+MISC ChangeLog 2660 SHA256 b875fa255fd24d7eeb6e5bf3128cf8467d23f3ddb5a5a772e8443f57fb9dcd62 SHA512 77427fced17e45be91e05cd3fa6d82f30e11129c4803effbde156966f49c85a636a44145a86593264072e6c6c56bf558121088a8611e91a9746f03fe3b2bbf5b WHIRLPOOL 704e8f725de386164b24bf24259602c126b7e62df8567a57eee120ac21eed575d78f3c0f5c475188df0aebb19c14761b3e38d353213d9cc9fb891046a249194b
 MISC metadata.xml 349 SHA256 4084f6dff788e2e233a97a20fec26825dfa55d96857eb3dd4e67f957d3137916 SHA512 819c559993555ba0c3b81c3948b85fd58057d023bcce08e49ea2bacc0267bc108f1448e5b504f294e98b3dc6e8b88fa4a4f57fe5999fe28f993036ac3312bf38 WHIRLPOOL dcfadb3719effccb6967f15a90e9c6322ee3538452e0337f0da35513cdff1d711bd7503b0b90880ca413ae8acc99ea7cacf3d03b0b2fc237c5b2c0cf478f83db
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJREIg5AAoJEKXdFCfdEflKtHoQAJ+ea+vQcrIm+Ay0tNIhjjdS
-+9ehxwkKUy9SnpMT5Re6K9nQp5Oc7HLWO9l4pUvasnhX2giLBKK6ZjhI+mKkLlWl
-0DNvRVrIaqGMqY7kJRCR/2dPJYSPFeK2KXMktPX8kKKTOhgWSSKGehZR3g0DnPaq
-gY17TVIYHcyVvyQgtI2YpOLGWsvybZfQIzEjjjc+1b2+NVmMLx9DQABMxIQ8viZ/
-JgMYKUsFrJmDrEaGnCrbAe9x2LcGXNsgD4CbJCg4RGcHKbkOd2qkzM9CTlgiKyhC
-NP/azVBpfKzANjf6r7flI3xweSOiKUYkoFQ1xW4+T14Izt2OS9Hd4EJf1CXXbXVe
-NYA9kfeH51GGmvMxV/R+qFezFK7/rVGY5KEyOAWYtxTrKNRp4kHU8ImmJLNCfCra
-OgIoWx7ow5cwS6/rpqb8vV7Kr7jxGue00Z5wbwEuymtdsmQ+pQ+bac8MGKqAtSCw
-v0fs0wAh8uRnF4FBKObcEG7IshjcDsu9FbQ2tVxE45oH4FR8Ih7l0/HDtD+GziSK
-PuXxiI3870jvtzLhAzvdSzOiKiXhVoncjbA0TUpRysWuKUC0fhHlFFpElEKOKFHA
-f47g8PxQkoBVI2cz/UbKO8B6jRgNiR6i/UgZjB63vtNQ+6OecNn/JfHHfhbYDb0V
-cfdnoSxmo619VHM35pPM
-=eQa9
+iQIcBAEBCgAGBQJRfFoDAAoJEKXdFCfdEflK86oP/2L1nBjuEOjPoVA1FiCv2vsG
+St5dOZRC/Ngyj+PfTfMR6hc3cYAfbKeueIq3K4s4vqtMDnH8HNRNZcpfY2mcR0DT
+4ThPo2ojli9qBA817lh9CepzGoP1l3P8Mc/m19tAV6XCwqn7RGS8Juz5wECOJps1
+WTfZjQ6i54UpENNhOmWIAJnj2OhKQe23RSOft1FkfEUuLeko/jlEbFAppkzXP8If
++3t0gtyxpMSsJwoemj1yBGEKV8bmW4CQ1GlVH2+Q60F92A4O6Rmg4+jTOGg8N71f
+JyDmerK6Z35j4bqMhFm/K4gplctudVz4QFcjZAi+2+wxsaYveDKuOgOaf8lOtrfF
+XaSgEWKo1qDg6/9x7Clr5jtb6N46d7Pfx3b7XX1DhGr1fBH4AaG3Jk6Ag1Mg3IXH
+uDte9Z7VLhEy9pPEG7lxXxiySwF2Sw2hStDQ25g5XEw+zTI43eCz6qdJHor6/tLo
+Gt6TMnnJ/cf7auixXqTvJs+Pu/6mz4jIAWij3NuK4FpgvUNe4mjEdm5zujeUPNRH
+HNZeqb5HBbf+F0zCrMTiAS0XhQFIB7VGoBbi/lPKzfiawhMob02tAdmhBmx2wHPr
+jBGCByR5TrgizXpjR16/gK72IQGJ7g+o1/9ji5TExg+F9JC52rUy+lOCy49dN2gS
+0WN08HVYBnxlNOWiiGAe
+=U80k
 -----END PGP SIGNATURE-----
diff --git a/net-libs/libbtbb/libbtbb-2012.10.3-r1.ebuild b/net-libs/libbtbb/libbtbb-2012.10.3-r1.ebuild
new file mode 100644
index 000000000000..546850163ffc
--- /dev/null
+++ b/net-libs/libbtbb/libbtbb-2012.10.3-r1.ebuild
@@ -0,0 +1,60 @@
+# 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-r1.ebuild,v 1.1 2013/04/27 23:03:47 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"
+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-"}; echo "${pv%-r[0-9]*}"; }
+
+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-2012.10.3-r2.ebuild b/net-libs/libbtbb/libbtbb-2012.10.3-r2.ebuild
new file mode 100644
index 000000000000..f80dc336014b
--- /dev/null
+++ b/net-libs/libbtbb/libbtbb-2012.10.3-r2.ebuild
@@ -0,0 +1,60 @@
+# 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.1 2013/04/27 23:03:47 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-"}; echo "${pv%-r[0-9]*}"; }
+
+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-9999.ebuild b/net-libs/libbtbb/libbtbb-9999.ebuild
index 8ef73fbd14d9..37ec8ab6bc78 100644
--- a/net-libs/libbtbb/libbtbb-9999.ebuild
+++ b/net-libs/libbtbb/libbtbb-9999.ebuild
@@ -1,6 +1,6 @@
 # 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-9999.ebuild,v 1.8 2013/02/05 04:18:58 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libbtbb/libbtbb-9999.ebuild,v 1.9 2013/04/27 23:03:47 zerochaos Exp $
 
 EAPI=5
 
@@ -23,13 +23,13 @@ else
 fi
 
 LICENSE="GPL-2"
-SLOT="0"
+SLOT="0/${PV}"
 IUSE="+wireshark"
 
 RDEPEND="
 	wireshark? (
 		dev-libs/glib
-		>=net-analyzer/wireshark-1.8.3-r1
+		>=net-analyzer/wireshark-1.8.3-r1:=
 	)
 "
 DEPEND="${RDEPEND}