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

(Portage version: 2.2.0_alpha67-r1/cvs/Linux x86_64)

6 files changed, 41 insertions, 43 deletions

diff --git a/net-libs/libbtbb/ChangeLog b/net-libs/libbtbb/ChangeLog
index 852b11bcad37..2119c40f884c 100644
--- 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/files/libbtbb-0.5-flags.patch b/net-libs/libbtbb/files/libbtbb-0.5-flags.patch
deleted file mode 100644
index 60df95f8c04e..000000000000
--- 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
index ea64b462d160..000000000000
--- 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
index 000000000000..979b354dd396
--- /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
index 47783595bd36..d6f48f672882 100644
--- 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 311f1420e551..fd71f4abccfe 100644
--- 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
 }