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

Package-Manager: portage-2.1.2.4

8 files changed, 37 insertions, 118 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/Manifest b/net-libs/libbt/Manifest
index 1c5d316bfe7e..fba4a509df61 100644
--- a/net-libs/libbt/Manifest
+++ b/net-libs/libbt/Manifest
@@ -1,46 +1,24 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX 1.05-btlist.patch 172 RMD160 6869f57de440bcbaad12cd98c09b66e716ca7901 SHA1 5978e8ab2cbf406153b67ee11cacb3162c05f70a SHA256 65d96ae75ce0851e7d0de115516a44c72747c6afbca1cf1a9b1b95f8d9227539
+MD5 0ea46e31f8e237c444fff6a87795c1e1 files/1.05-btlist.patch 172
+RMD160 6869f57de440bcbaad12cd98c09b66e716ca7901 files/1.05-btlist.patch 172
+SHA256 65d96ae75ce0851e7d0de115516a44c72747c6afbca1cf1a9b1b95f8d9227539 files/1.05-btlist.patch 172
 AUX libbt-headerfix.patch 1485 RMD160 a41f747a1caa2fb1d4566b5970b0e55c5cea1a45 SHA1 1cfb8c8e300245801e54fd2fff1efe50d916cc8f SHA256 4995bde11779f90ed7ed5eeadadda914971fa637c59f5a20af38dd90f43c24a4
 MD5 5565843b8d8ecd0caa963e6509efef05 files/libbt-headerfix.patch 1485
 RMD160 a41f747a1caa2fb1d4566b5970b0e55c5cea1a45 files/libbt-headerfix.patch 1485
 SHA256 4995bde11779f90ed7ed5eeadadda914971fa637c59f5a20af38dd90f43c24a4 files/libbt-headerfix.patch 1485
-DIST libbt-1.03.tar.gz 307473 RMD160 d7f342eb741e13b42896a7b83a959c0f6a0c6cec SHA1 7c72e2342a46c8b1cfc554aeae046918b81603f4 SHA256 d8a5c49efcc02173e730a8c6593bf822fe2c7f6c49dacf3c6781209b27941539
-DIST libbt-1.04.tar.gz 309186 RMD160 a6b827fa1d5dc7a27ab78fefe2ac5009ef115f2a SHA1 ee65205f3e5575d86d5fec0b2958bb8855ec0fa5 SHA256 b769ea33c7006b2239376457c2892a5d6cc5045ca9e14f0b31333eaf7d032c9a
 DIST libbt-1.05.tar.gz 322880 RMD160 1d8e2fcaf5f2a0c71706be4efb478c3c1ff9bf7a SHA1 909c19c77b15a3d1e6f2a3f5e9bdc5f3fa178525 SHA256 d4d770120c7e5df6957b2b40e1edb6695106142360d5caac521b31a4c59fa1c7
-EBUILD libbt-1.03.ebuild 908 RMD160 8dc819777e1eef7ceca09ccf17bf41450b24be25 SHA1 9f1d41ed4fb937cde6c1509ee5f098a64613a8eb SHA256 533aa310c79ab1f44ae4693d57651f15e315daf5638df3edb2e124c74c797ab8
-MD5 39f4ee27c1a15e860b2e328dd53bd6cc libbt-1.03.ebuild 908
-RMD160 8dc819777e1eef7ceca09ccf17bf41450b24be25 libbt-1.03.ebuild 908
-SHA256 533aa310c79ab1f44ae4693d57651f15e315daf5638df3edb2e124c74c797ab8 libbt-1.03.ebuild 908
-EBUILD libbt-1.04.ebuild 833 RMD160 eccab107b7638ed952b672f8744660c5dcfe619c SHA1 b355549758597aa5fa3c23da2696c6a1cf80ed62 SHA256 067122b5864512004daaa7debc3f7300cd9d9071771a8575c91420bf8a1050d7
-MD5 36586c4014caa3ef1d15e2fe35fa2134 libbt-1.04.ebuild 833
-RMD160 eccab107b7638ed952b672f8744660c5dcfe619c libbt-1.04.ebuild 833
-SHA256 067122b5864512004daaa7debc3f7300cd9d9071771a8575c91420bf8a1050d7 libbt-1.04.ebuild 833
-EBUILD libbt-1.05.ebuild 829 RMD160 84a2b8a241c5b99b066a181135a42a64bd66a8b8 SHA1 0e1def01c523bea64f0214a96b1a876dd99bd008 SHA256 141858f02bbda8254292fb314cb1f4c57f24b7875e5bea4d1c6dada5bebcbb72
-MD5 888b01acdaa337e8d7c40fcda4b33ddb libbt-1.05.ebuild 829
-RMD160 84a2b8a241c5b99b066a181135a42a64bd66a8b8 libbt-1.05.ebuild 829
-SHA256 141858f02bbda8254292fb314cb1f4c57f24b7875e5bea4d1c6dada5bebcbb72 libbt-1.05.ebuild 829
-MISC ChangeLog 1454 RMD160 9560ad4d42f3d33f37fe3e68c087e142e551fd27 SHA1 7f114c8f234b3b444b5d63c9ee9819a3d5d70a4e SHA256 3b65bd55ed7fe2565f2d8171e3d1d2efc67cf6a8ed06548092901ec129c5ee81
-MD5 7251956c8cf24c5eea65b0d7410b26a7 ChangeLog 1454
-RMD160 9560ad4d42f3d33f37fe3e68c087e142e551fd27 ChangeLog 1454
-SHA256 3b65bd55ed7fe2565f2d8171e3d1d2efc67cf6a8ed06548092901ec129c5ee81 ChangeLog 1454
+EBUILD libbt-1.05.ebuild 924 RMD160 d30bf6d498f45d1e4f33cec27c2b39d37e932866 SHA1 1eeb538df0437b13171e308d18c79cd6444caead SHA256 2a2bbf37bb2074ec9d6ecaa5cbc05c52c5bc4b68a2e314f01bb1476c3a40abf2
+MD5 f2112cbce817f6991fbfee88d3ae0709 libbt-1.05.ebuild 924
+RMD160 d30bf6d498f45d1e4f33cec27c2b39d37e932866 libbt-1.05.ebuild 924
+SHA256 2a2bbf37bb2074ec9d6ecaa5cbc05c52c5bc4b68a2e314f01bb1476c3a40abf2 libbt-1.05.ebuild 924
+MISC ChangeLog 1661 RMD160 f5ca9d52f5b198b048a7e40ba4dfc28152a41fe8 SHA1 0ea80230fba814fa24f1a9638aaa2a0367798140 SHA256 9303ef65d8cc1c6876d787fc058649759c90f02d95bdbe28cdac332b19bbbeb8
+MD5 8908df04e87d2640b569ce648d6c5763 ChangeLog 1661
+RMD160 f5ca9d52f5b198b048a7e40ba4dfc28152a41fe8 ChangeLog 1661
+SHA256 9303ef65d8cc1c6876d787fc058649759c90f02d95bdbe28cdac332b19bbbeb8 ChangeLog 1661
 MISC metadata.xml 160 RMD160 828887200387b28c37fc97111fc6bc3a0a2fcccd SHA1 813ef5bc57f6a8d95e7cab7a745a2a824858f49c SHA256 fe06593409e7f28665c032001005e94cb650299711a0af7f1a558bdb56c4004f
 MD5 8aefbc0e49db723ca1ad02d0c409cd49 metadata.xml 160
 RMD160 828887200387b28c37fc97111fc6bc3a0a2fcccd metadata.xml 160
 SHA256 fe06593409e7f28665c032001005e94cb650299711a0af7f1a558bdb56c4004f metadata.xml 160
-MD5 7fbe0e6208e14729a9e4779c013455ed files/digest-libbt-1.03 232
-RMD160 c5b46c88eead443ab163dbd1b603f2afcd13ee2a files/digest-libbt-1.03 232
-SHA256 c798595af92b32f270adf67069c8a9ea3739e49cf55f074849ee03f0503439ed files/digest-libbt-1.03 232
-MD5 d1ad70f74700ee90d6cb83758817c7e5 files/digest-libbt-1.04 232
-RMD160 f060c9945f72568608e877fc9ae6bf62af76ac72 files/digest-libbt-1.04 232
-SHA256 cdb93e0430efd967a4872c9bd56bc0851f851b1d8cbd0507fbe3d97f5604d9c3 files/digest-libbt-1.04 232
 MD5 d0ecee221d27ea3ba9d19841f17c4857 files/digest-libbt-1.05 232
 RMD160 08baae2458015d1c93196d9ae2fa285914d523e9 files/digest-libbt-1.05 232
 SHA256 78945f01a8c52a1ab60657b3a9b3f5310448d83d40e5594974b0fffe916ebcd6 files/digest-libbt-1.05 232
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.2 (GNU/Linux)
-
-iD8DBQFFy/kwAiZjviIA2XgRAk8kAJ4rSDMH8QSbrd1S5Tt7Ber+1J4n8ACaAhJl
-mAF9Ssw1kAIILYA/NyfjpO4=
-=BJDp
------END PGP SIGNATURE-----
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