Add patch to fix compile failure, bug 152489 and stable x86, drop old

(Portage version: 2.1.2.4)

7 files changed, 25 insertions, 84 deletions

diff --git a/net-libs/libbt/ChangeLog b/net-libs/libbt/ChangeLog
index 9f2ea3b76216..2b49a0eb7c82 100644
--- a/net-libs/libbt/ChangeLog
+++ b/net-libs/libbt/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-libs/libbt
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libbt/ChangeLog,v 1.11 2007/02/09 04:31:38 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libbt/ChangeLog,v 1.12 2007/04/20 15:49:28 armin76 Exp $
+
+  20 Apr 2007; Raúl Porcel <armin76@gentoo.org> +files/1.05-btlist.patch,
+  -libbt-1.03.ebuild, -libbt-1.04.ebuild, libbt-1.05.ebuild:
+  Add patch to fix compile failure, bug 152489 and stable x86, drop old
 
   09 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> ChangeLog:
   Regenerate digest in Manifest2 format.
diff --git a/net-libs/libbt/files/1.05-btlist.patch b/net-libs/libbt/files/1.05-btlist.patch
new file mode 100644
index 000000000000..e4eca5ae01db
--- /dev/null
+++ b/net-libs/libbt/files/1.05-btlist.patch
@@ -0,0 +1,10 @@
+--- src/btlist.c.orig
++++ src/btlist.c
+@@ -13,6 +13,7 @@
+
+ #include "config.h"
+
++#include <sys/types.h>
+ #include <openssl/sha.h>
+ #include <stdlib.h>
+ #include <string.h>
diff --git a/net-libs/libbt/files/digest-libbt-1.03 b/net-libs/libbt/files/digest-libbt-1.03
deleted file mode 100644
index 48cc76a4cefe..000000000000
--- a/net-libs/libbt/files/digest-libbt-1.03
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 f5fdd7f4b641d5da08d678130b4d6bff libbt-1.03.tar.gz 307473
-RMD160 d7f342eb741e13b42896a7b83a959c0f6a0c6cec libbt-1.03.tar.gz 307473
-SHA256 d8a5c49efcc02173e730a8c6593bf822fe2c7f6c49dacf3c6781209b27941539 libbt-1.03.tar.gz 307473
diff --git a/net-libs/libbt/files/digest-libbt-1.04 b/net-libs/libbt/files/digest-libbt-1.04
deleted file mode 100644
index 703d68f166e5..000000000000
--- a/net-libs/libbt/files/digest-libbt-1.04
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c5f50f1b3d76722a6494a0ae4720b9d1 libbt-1.04.tar.gz 309186
-RMD160 a6b827fa1d5dc7a27ab78fefe2ac5009ef115f2a libbt-1.04.tar.gz 309186
-SHA256 b769ea33c7006b2239376457c2892a5d6cc5045ca9e14f0b31333eaf7d032c9a libbt-1.04.tar.gz 309186
diff --git a/net-libs/libbt/libbt-1.03.ebuild b/net-libs/libbt/libbt-1.03.ebuild
deleted file mode 100644
index 140b82909aec..000000000000
--- a/net-libs/libbt/libbt-1.03.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libbt/libbt-1.03.ebuild,v 1.3 2004/08/14 00:46:09 squinky86 Exp $
-
-inherit eutils
-
-DESCRIPTION="libBT is an implementation of the BitTorrent core protocols in C"
-HOMEPAGE="http://libbt.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-RESTRICT="nomirror"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc"
-
-IUSE=""
-
-DEPEND="dev-libs/openssl
-	net-misc/curl
-	sys-fs/e2fsprogs"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-headerfix.patch
-}
-
-src_compile () {
-	econf || die
-	sed -i -e "s:-g -Wall:${CFLAGS} -g -Wall:g" src/Makefile
-	emake || die
-}
-
-src_install () {
-	dobin src/btlist src/btget src/btcheck
-	doman man/*
-	insinto /usr/include/libbt
-	doins include/*
-	dolib src/libbt.a
-	dodoc CHANGELOG COPYING CREDITS README docs/*
-}
diff --git a/net-libs/libbt/libbt-1.04.ebuild b/net-libs/libbt/libbt-1.04.ebuild
deleted file mode 100644
index f699a15c1304..000000000000
--- a/net-libs/libbt/libbt-1.04.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libbt/libbt-1.04.ebuild,v 1.1 2005/05/29 22:13:16 sekretarz Exp $
-
-inherit eutils
-
-DESCRIPTION="libBT is an implementation of the BitTorrent core protocols in C"
-HOMEPAGE="http://libbt.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-RESTRICT="nomirror"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc ~amd64"
-
-IUSE=""
-
-DEPEND="dev-libs/openssl
-	net-misc/curl
-	sys-fs/e2fsprogs"
-
-src_compile () {
-	econf || die
-	sed -i -e "s:-g -Wall:${CFLAGS} -g -Wall:g" src/Makefile
-	emake || die
-}
-
-src_install () {
-	dobin src/btlist src/btget src/btcheck
-	doman man/*
-	insinto /usr/include/libbt
-	doins include/*
-	dolib src/libbt.a
-	dodoc CHANGELOG COPYING CREDITS README docs/*
-}
diff --git a/net-libs/libbt/libbt-1.05.ebuild b/net-libs/libbt/libbt-1.05.ebuild
index f0d16f94dab6..3b898740d8a7 100644
--- a/net-libs/libbt/libbt-1.05.ebuild
+++ b/net-libs/libbt/libbt-1.05.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 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.1 2006/01/13 13:32:57 mkay Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libbt/libbt-1.05.ebuild,v 1.2 2007/04/20 15:49:28 armin76 Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 RESTRICT="nomirror"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~amd64"
+KEYWORDS="~amd64 ~ppc x86"
 
 IUSE=""
 
@@ -18,6 +18,13 @@ DEPEND="dev-libs/openssl
 	net-misc/curl
 	sys-fs/e2fsprogs"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${PV}-btlist.patch # 152489
+}
+
 src_compile () {
 	econf || die
 	sed -i -e "s:-g -Wall:${CFLAGS} -g -Wall:g" src/Makefile