Version bump wrt #299070. Fix file-collision with blackbox by renaming libbt.a to libbt-static.a wrt #298532. Change legacy e2fsprogs depend to util-linux for -luuid.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

4 files changed, 100 insertions, 3 deletions

diff --git a/net-libs/libbt/ChangeLog b/net-libs/libbt/ChangeLog
index 85097d9fbee6..bba0bb8b167c 100644
--- a/net-libs/libbt/ChangeLog
+++ b/net-libs/libbt/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-libs/libbt
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libbt/ChangeLog,v 1.15 2010/06/20 11:47:11 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libbt/ChangeLog,v 1.16 2010/07/12 20:14:36 ssuominen Exp $
+
+*libbt-1.06 (12 Jul 2010)
+
+  12 Jul 2010; Samuli Suominen <ssuominen@gentoo.org> libbt-1.05.ebuild,
+  +libbt-1.06.ebuild, +files/libbt-1.06-build.patch:
+  Version bump wrt #299070. Fix file-collision with blackbox by renaming
+  libbt.a to libbt-static.a wrt #298532. Change legacy e2fsprogs depend to
+  util-linux for -luuid.
 
   20 Jun 2010; Markos Chandras <hwoarang@gentoo.org> libbt-1.05.ebuild:
   Fix forced as-needed. Bug #315213
diff --git a/net-libs/libbt/files/libbt-1.06-build.patch b/net-libs/libbt/files/libbt-1.06-build.patch
new file mode 100644
index 000000000000..de778a75f165
--- /dev/null
+++ b/net-libs/libbt/files/libbt-1.06-build.patch
@@ -0,0 +1,53 @@
+http://bugs.gentoo.org/152489
+http://bugs.gentoo.org/248034
+http://bugs.gentoo.org/315213
+
+--- src/btlist.c
++++ src/btlist.c
+@@ -13,6 +13,7 @@
+
+ #include "config.h"
+
++#include <sys/types.h>
+ #include <openssl/sha.h>
+ #include <stdlib.h>
+ #include <string.h>
+--- src/peer.c
++++ src/peer.c
+@@ -35,6 +35,7 @@
+ #include <time.h>
+ #include <poll.h>
+ #include <assert.h>
++#include <limits.h>
+ 
+ #include "bterror.h"
+ #include "btmessage.h"
+--- src/udpproto.c	2009-12-07 15:03:54.000000000 +0100
++++ src/udpproto.c	2009-12-07 15:04:10.000000000 +0100
+@@ -4,6 +4,7 @@
+ #include <string.h>
+ #include <stdlib.h>
+ #include <unistd.h>
++#include <limits.h>
+ 
+ #include <arpa/inet.h>
+ 
+--- src/Makefile.in	2009-12-07 15:57:24.000000000 +0100
++++ src/Makefile.in	2009-12-07 15:57:34.000000000 +0100
+@@ -30,7 +30,7 @@
+ CPPFLAGS:=@CPPFLAGS@
+ CFLAGS+=-g -Wall -I../include -I$(top_srcdir)/include
+ 
+-LIBS:=@LIBS@ `curl-config --libs` -lm
++LIBS:=@LIBS@ `curl-config --libs` -lm -lcrypto
+ LDFLAGS:=-g -L. @LDFLAGS@
+ VERSION=1.06
+ MAKEDEPEND=@MAKEDEPEND@
+--- Makefile.in	2009-12-07 17:36:18.000000000 +0100
++++ Makefile.in	2009-12-07 17:36:28.000000000 +0100
+@@ -1,4 +1,4 @@
+-all:	depend compile
++all:	compile
+ 
+ compile:
+ 	cd src && ${MAKE}
diff --git a/net-libs/libbt/libbt-1.05.ebuild b/net-libs/libbt/libbt-1.05.ebuild
index 6968bf820675..52059ce5f892 100644
--- a/net-libs/libbt/libbt-1.05.ebuild
+++ b/net-libs/libbt/libbt-1.05.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libbt/libbt-1.05.ebuild,v 1.5 2010/06/20 11:47:11 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libbt/libbt-1.05.ebuild,v 1.6 2010/07/12 20:14:36 ssuominen Exp $
 
 inherit eutils autotools
 
@@ -15,7 +15,8 @@ IUSE=""
 
 DEPEND="dev-libs/openssl
 	net-misc/curl
-	sys-fs/e2fsprogs"
+	>=sys-apps/util-linux-2.16.2
+	!x11-wm/blackbox"
 
 src_unpack() {
 	unpack ${A}
diff --git a/net-libs/libbt/libbt-1.06.ebuild b/net-libs/libbt/libbt-1.06.ebuild
new file mode 100644
index 000000000000..4e2cc256f788
--- /dev/null
+++ b/net-libs/libbt/libbt-1.06.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libbt/libbt-1.06.ebuild,v 1.1 2010/07/12 20:14:36 ssuominen Exp $
+
+EAPI=2
+inherit eutils autotools
+
+DESCRIPTION="implementation of the BitTorrent core protocols in C"
+HOMEPAGE="http://libbt.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND="dev-libs/openssl
+	net-misc/curl
+	>=sys-apps/util-linux-2.16.2"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-build.patch
+	eautoreconf
+}
+
+src_install() {
+	dobin src/btlist src/btget src/btcheck || die
+
+	insinto /usr/include/libbt
+	doins include/*.h || die
+	newlib.a src/libbt.a libbt-static.a || die
+
+	doman man/*.1
+	dodoc CHANGELOG CREDITS README docs/*
+}