Bump to libbtbb-0.6 at zero_chaos's request, with a patch to fix QA warning about...

Package-Manager: portage-2.2.0_alpha67-r1/cvs/Linux x86_64

diff --git a/net-libs/libbtbb/ChangeLog b/net-libs/libbtbb/ChangeLog
index 852b11bcad37fe9214915abbb89aad30da3ce024..2119c40f884ccd28c421f1a948ba6bfeaedd97df 100644 (file)
--- a/net-libs/libbtbb/ChangeLog
+++ b/net-libs/libbtbb/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-libs/libbtbb
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libbtbb/ChangeLog,v 1.1 2011/05/31 19:47:28 binki Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libbtbb/ChangeLog,v 1.2 2011/10/16 22:54:34 binki Exp $
+
+*libbtbb-0.6 (16 Oct 2011)
+
+  16 Oct 2011; Nathan Phillip Brink <binki@gentoo.org> -libbtbb-0.5.ebuild,
+  -files/libbtbb-0.5-flags.patch, -files/libbtbb-0.5-makefile.patch,
+  +libbtbb-0.6.ebuild, +files/libbtbb-0.6-soname-symlink.patch,
+  libbtbb-9999.ebuild:
+  Bump to libbtbb-0.6 at zero_chaos's request, with a patch to fix QA warning
+  about missing SONAME symlink.
 
 *libbtbb-9999 (31 May 2011)
 *libbtbb-0.5 (31 May 2011)

diff --git a/net-libs/libbtbb/Manifest b/net-libs/libbtbb/Manifest
index c4eb0d1bcb61e9e9471557ac151dea0bcd390bbc..f4b4d13a7ab744f711749041c1e0ae16ab2fa2ec 100644 (file)
--- a/net-libs/libbtbb/Manifest
+++ b/net-libs/libbtbb/Manifest
@@ -1,19 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX libbtbb-0.5-flags.patch 478 RMD160 e6d526c3e99ba1340ca4688ad97c3296f51f62df SHA1 b773c8cddf6c5a42b3c9b471d2b5dc378297e053 SHA256 a6c78c2f60b328483cc1f2e8cfe1443c8c231e2786bc5e5185be4265730478d7
-AUX libbtbb-0.5-makefile.patch 414 RMD160 07aed7bd845b2012969cc19f7961b9378084ea38 SHA1 039581d940cac12e521c1b74a79cec080a29eb66 SHA256 4b139d321261a2d23d932464c624d42c685754d8ecc3ae73d4024836a67b7277
-DIST libbtbb.0.5.tgz 137378 RMD160 c5d68e7620c901cf520e33fc747cc6a0b9535154 SHA1 5465d4520b267bad53c56a67260099e60439c922 SHA256 528cfd3822f98f539cf468d82c63b32c2063bcca53299befe14200723bec7d52
-EBUILD libbtbb-0.5.ebuild 920 RMD160 813cd4aa6a0cc6ccb711daeedc608a2d43563208 SHA1 2032fae17b9388303d5a11564c9dab12e0741a24 SHA256 f8ac612db760156ec5101dbb1a6544a4f5d2059fc001629c76b05cf2881bbbc2
-EBUILD libbtbb-9999.ebuild 921 RMD160 486dabc4547d6d8ddddeaa5be12d22bc960babf2 SHA1 0c6301f348756c1753695249a9a64cd05b8a967c SHA256 052ca031e99388281beaa120007995d4be1b31485057406e3b61bbe1bee4d38b
-MISC ChangeLog 512 RMD160 655db2948c8817327a1d7dd6236c29739f0556a9 SHA1 882fd5219d5600c57211667f734ca9eb602ff066 SHA256 833f3069c7a23b06ae96ad6a7d878bf348db0c4f7344a230c6e2bad5f3490862
+AUX libbtbb-0.6-soname-symlink.patch 584 RMD160 5b07dcae3132ec8b7d04fca654708e211d9c8088 SHA1 bbbcfa0d3169582cf6c7060ea34707f3572199c0 SHA256 f6dae6e1ee33549bb114443a4734d13e181ce77c680093926d282d2975767a1c
+DIST libbtbb-0.6.tar.gz 50830 RMD160 6c26531a4b0ec01146113ddd69a4de4debea8436 SHA1 db1962540fc64dbf2a918338565bdbe7b33ab374 SHA256 084f3a78f396cfcf65fdcd7391110e8efe4473b954004558c63a9110ba721858
+EBUILD libbtbb-0.6.ebuild 874 RMD160 1f03f7a60379db0fe507ac4b5e9fad19de927114 SHA1 222bacaf5b6a4b33a41f89f4c75bf0b6770d9b05 SHA256 3e3efe173f832aa0f5fafa2b83154f28164faa199fd2828eff23cdc38f8e94dd
+EBUILD libbtbb-9999.ebuild 875 RMD160 35ade589ffa58d3af3a9c3e59e4896612059be15 SHA1 f8a428c8f22cab10e45228739a6a0e46af575ad4 SHA256 8be266d9607cbe04b0711b15983bd9e86f3fee7371fdbd0620d9e9099c5db9b5
+MISC ChangeLog 883 RMD160 539c95adb128a00d7a0055137a6f741657a087d9 SHA1 f4301cfd4437cb6a64fbdfdd3190050f34c0e6bd SHA256 8d522cd312f9beb3e87790a604c06a4c639021ed8b33a7555d6b23a11b02eb9d
 MISC metadata.xml 454 RMD160 59e614f8726108ed8be88dc0fcd0f81546c584b9 SHA1 5e392c8b3e1b4d240d9baa3ced7c79e127eefa18 SHA256 11b7557fcae40d0a856921ce04d7f6965d0e92fef2af13a65b551a4edb29448f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.14 (GNU/Linux)
 
-iJwEAQEIAAYFAk59rVIACgkQfXuS5UK5QB2KrwP+Pvyf9c5DPAtV4b2xO/SZ36Ve
-raOLDue7YUp3REvSqUQSKmuuabvxcPOj77s8rzoz76RSKLBNPl/+jSooDqGsLVoI
-l25jERVJjcllY3fHoeymGWaeWm1E4IQc9kL/ix7u56UPRvSNXNkCOpvb1Q7W2ADR
-QaBVgikoEMPEL2dpqfs=
-=vzQM
+iQIcBAEBCAAGBQJOm2HEAAoJEHQ6UuhrqBBQnvAP/3HRO1+rgYdqEARGOq5ywAyI
+Fbfy26PYGiNLE95W/6JbgBRr5DhdDnB+kDGzoL1fQo2hdfGW6+i4aIJBeTV0yXty
+dZpzAGcBM8201s7iO/OXeKfbl4Tt324tNhDOEFEQ9kJ+KAu7cTo/2ddKm6BV6nYc
+0jiDqeQjSNNbBzl3WAMQwjPKi0n0cxYafjlbr9Zm92frLmsSCG2ASHgXkW0juC7q
+7nPtnapLQNYDu9DVxjSb/ocPicH2oi2U0MHN5jzJtrrGmiP72yZ9F1C1VKjRXWJn
+6CqxmA+tMdJGJZ2tBeDPhSHuMGwcYZKMgyuu5XIrAFeLJdmCZh31fwXD9FKJ7TFT
+JWEfRoOjxLrm0lQMMOE9+zsXbbtvy6/aijhhK2Twb0LIQ8KVaLZ6SeBTCDFYMjHA
+DySkId/iGuBbSe8mAODr/E27+ws7bdyFoTzV/7Gw5bzyuHkwtzJiJMoh9nnfcKrN
+InbE6Jc5H3GDLwIi9kWEr355RPijtm8rT6HvuxbY17Ys3mAVjrsKyUpSqasKv/FF
+L9AwFxqyNO1sWgwl372bvgcv2+Vb9fwfeTeuJ7LZIsdFjeiH8HEdgbfu1Ao8/l0f
+8zh/nxGPAq0iO9WJpDxb8hz2me2pkMFMd8vVGZ5Bc9/smE4ALp4VsLwkLCgprQJS
+V3f6DFVhSsTDve7MyyM1
+=2tvP
 -----END PGP SIGNATURE-----

diff --git a/net-libs/libbtbb/files/libbtbb-0.5-flags.patch b/net-libs/libbtbb/files/libbtbb-0.5-flags.patch
deleted file mode 100644 (file)
index 60df95f..0000000
--- a/net-libs/libbtbb/files/libbtbb-0.5-flags.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-From: Nathan Phillip Brink <binki@gentoo.org>
-Subject: Respect LDFLAGS, CFLAGS, and CPPFLAGS.
-
---- a/Makefile
-+++ b/Makefile
-@@ -35,8 +35,8 @@
- all: libbtbb
- 
- libbtbb:
--      $(CC) -g -O2 -Wall -fPIC  -c $(SOURCE_FILES)
--      $(CC) -shared -Wl,-soname,$(SONAME) -o $(LIB_FILE) $(OBJECT_FILES)
-+      $(CC) $(CFLAGS) $(CPPFLAGS) -g -O2 -Wall -fPIC  -c $(SOURCE_FILES)
-+      $(CC) $(CFLAGS) $(LDFLAGS) -shared -Wl,-soname,$(SONAME) -o $(LIB_FILE) $(OBJECT_FILES)
- 
- clean:
-       rm -f *.o $(LIB_FILE)

diff --git a/net-libs/libbtbb/files/libbtbb-0.5-makefile.patch b/net-libs/libbtbb/files/libbtbb-0.5-makefile.patch
deleted file mode 100644 (file)
index ea64b46..0000000
--- a/net-libs/libbtbb/files/libbtbb-0.5-makefile.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff -Naur libbtbb-orig/Makefile libbtbb/Makefile
---- libbtbb-orig/Makefile      2011-05-27 23:54:48.000000000 -0400
-+++ libbtbb/Makefile   2011-05-27 23:56:40.000000000 -0400
-@@ -45,5 +45,5 @@
-       $(INSTALL) -m 0644 $(LIB_FILE) $(INSTALL_DIR)
-       $(INSTALL) -m 0644 $(HEADER_FILES) $(INCLUDE_DIR)
-       $(LDCONFIG)
--      ln -fs $(INSTALL_DIR)/$(LIB_FILE) $(INSTALL_DIR)/$(LIB_NAME)
-+      ln -fs $(LIB_FILE) $(INSTALL_DIR)/$(LIB_NAME)
- 

diff --git a/net-libs/libbtbb/files/libbtbb-0.6-soname-symlink.patch b/net-libs/libbtbb/files/libbtbb-0.6-soname-symlink.patch
new file mode 100644 (file)
index 0000000..979b354
--- /dev/null
+++ b/net-libs/libbtbb/files/libbtbb-0.6-soname-symlink.patch
@@ -0,0 +1,21 @@
+From bb72db04075dc5a1f0f88b92d3b1715bb2f0681e Mon Sep 17 00:00:00 2001
+From: Nathan Phillip Brink <ohnobinki@ohnopublishing.net>
+Date: Sun, 16 Oct 2011 20:12:51 +0000
+Subject: [PATCH 1/2] Install an SONAME symlink.
+
+---
+ Makefile |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index bec0ed5..65e1858 100644
+--- a/Makefile
++++ b/Makefile
+@@ -46,4 +46,4 @@ install:
+       $(INSTALL) -m 0644 $(HEADER_FILES) $(INCLUDE_DIR)
+       $(LDCONFIG)
+       ln -fs $(LIB_FILE) $(INSTALL_DIR)/$(LIB_NAME)
+-
++      ln -fs $(LIB_FILE) $(INSTALL_DIR)/$(SONAME)
+-- 
+1.7.3.4
\ No newline at end of file

diff --git a/net-libs/libbtbb/libbtbb-0.5.ebuild b/net-libs/libbtbb/libbtbb-0.6.ebuild
similarity index 66%
rename from net-libs/libbtbb/libbtbb-0.5.ebuild
rename to net-libs/libbtbb/libbtbb-0.6.ebuild
index 47783595bd369a60d8d28aacad343c8e33e5a122..d6f48f672882927a12cced17206c21e66e7ee16a 100644 (file)
--- a/net-libs/libbtbb/libbtbb-0.5.ebuild
+++ b/net-libs/libbtbb/libbtbb-0.6.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libbtbb/libbtbb-0.5.ebuild,v 1.1 2011/05/31 19:47:28 binki Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libbtbb/libbtbb-0.6.ebuild,v 1.1 2011/10/16 22:54:34 binki Exp $
 
 EAPI=4
 
-inherit eutils
+inherit eutils multilib
 
 DESCRIPTION="A library to decode Bluetooth baseband packets"
 HOMEPAGE="http://libbtbb.sourceforge.net/"
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]] ; then
        inherit git-2
        KEYWORDS=""
 else
-       SRC_URI="mirror://sourceforge/${PN}/${PN}.${PV}.tgz"
+       SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
        KEYWORDS="~amd64 ~arm ~x86"
 fi
 
@@ -22,12 +22,9 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
 
-S=${WORKDIR}/${PN}
-
 src_prepare() {
-       if [[ ${PV} != "9999" ]] ; then
-               epatch "${FILESDIR}"/${P}-makefile.patch \
-                       "${FILESDIR}"/${P}-flags.patch
+       if [[ ${PV} != "9999" ]]; then
+               epatch "${FILESDIR}"/${P}-soname-symlink.patch
        fi
 }
 

diff --git a/net-libs/libbtbb/libbtbb-9999.ebuild b/net-libs/libbtbb/libbtbb-9999.ebuild
index 311f1420e55162e84aabaa7596efae506c65e705..fd71f4abccfeba0ada8a33f017a5e0a19ed3092c 100644 (file)
--- a/net-libs/libbtbb/libbtbb-9999.ebuild
+++ b/net-libs/libbtbb/libbtbb-9999.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2011 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.1 2011/05/31 19:47:28 binki Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libbtbb/libbtbb-9999.ebuild,v 1.2 2011/10/16 22:54:34 binki Exp $
 
 EAPI=4
 
-inherit eutils
+inherit eutils multilib
 
 DESCRIPTION="A library to decode Bluetooth baseband packets"
 HOMEPAGE="http://libbtbb.sourceforge.net/"
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]] ; then
        inherit git-2
        KEYWORDS=""
 else
-       SRC_URI="mirror://sourceforge/${PN}/${PN}.${PV}.tgz"
+       SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
        KEYWORDS="~amd64 ~arm ~x86"
 fi
 
@@ -22,12 +22,9 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
 
-S=${WORKDIR}/${PN}
-
 src_prepare() {
-       if [[ ${PV} != "9999" ]] ; then
-               epatch "${FILESDIR}"/${P}-makefile.patch \
-                       "${FILESDIR}"/${P}-flags.patch
+       if [[ ${PV} != "9999" ]]; then
+               epatch "${FILESDIR}"/${P}-soname-symlink.patch
        fi
 }