From: Samuli Suominen Date: Mon, 12 Jul 2010 20:14:36 +0000 (+0000) Subject: Version bump wrt #299070. Fix file-collision with blackbox by renaming libbt.a to... X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=30b03b5c2e31575144442382650818b09ce84d77;p=gentoo.git 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. Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 --- 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 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 libbt-1.05.ebuild: Fix forced as-needed. Bug #315213 diff --git a/net-libs/libbt/Manifest b/net-libs/libbt/Manifest index c468f2c06a66..b47f61db748f 100644 --- a/net-libs/libbt/Manifest +++ b/net-libs/libbt/Manifest @@ -1,6 +1,9 @@ AUX 1.05-btlist.patch 172 RMD160 6869f57de440bcbaad12cd98c09b66e716ca7901 SHA1 5978e8ab2cbf406153b67ee11cacb3162c05f70a SHA256 65d96ae75ce0851e7d0de115516a44c72747c6afbca1cf1a9b1b95f8d9227539 AUX libbt-1.05-build.patch 238 RMD160 54647c53bc3286107cc11d33c380102b079f8e02 SHA1 8b226f7e3a41569c5812cb3c4aad32b0ec8120b0 SHA256 cd81c2933699386505f3ecf8faf9e7dbf8b351a7267e50b3b1044d312cc2490e +AUX libbt-1.06-build.patch 1221 RMD160 30baa80ab01a1e45284e8a1a0c0211cbfe832e2e SHA1 6b38826e1e3665c5241a82d95da662606a47f0cd SHA256 2ad45cefb9f894754427a7c5cfd655ab08b4ba91c48aed4c3d3058b92c9d5aa9 DIST libbt-1.05.tar.gz 322880 RMD160 1d8e2fcaf5f2a0c71706be4efb478c3c1ff9bf7a SHA1 909c19c77b15a3d1e6f2a3f5e9bdc5f3fa178525 SHA256 d4d770120c7e5df6957b2b40e1edb6695106142360d5caac521b31a4c59fa1c7 -EBUILD libbt-1.05.ebuild 1005 RMD160 909feb2526770867f05f50fd3f9ebdad7f3cf7cc SHA1 40c79dbe6f47d91486b1fe72d88841ea897cd7b5 SHA256 fd528247fa903c17c1869c7f793d2b67327e713c6996c54aa8c4892a10f27ccd -MISC ChangeLog 2035 RMD160 bc8f0dd412c8e11932ecd0f74c15eb5d8a1aafdb SHA1 7d799fa156944e786ef63622a438f687ae892af5 SHA256 4f6797190ca0a99d9884062b7a7541188e114a3aa34db24f733ffdf0ac6c9dfe +DIST libbt-1.06.tar.gz 334835 RMD160 feb2a82c8873f7ec329382871dcce2b5d27f4d5e SHA1 55eb35334a388ccac4297f445e3b3d6d791eae4f SHA256 89f7887ef892158fec2691efaf26036dab2a239ab87881473ae405f2f2d13560 +EBUILD libbt-1.05.ebuild 1036 RMD160 969b67d2cd5c750cd86aa3f3ead001810bbc1870 SHA1 f6b89cc6bd61ee63543536b65ce987c960143adb SHA256 d87a0dfac1508ab052059db11855d26bae12cfcf4b61d82262c555f69123c1d0 +EBUILD libbt-1.06.ebuild 842 RMD160 0e3f63e98360133c3295ff05409cdfcb48183444 SHA1 ae3fbb006f97d8d5e4766e757c900ae8fa8df16d SHA256 af8bb2cdeed3a46aba7b5f6425e02bbd833b3b2ca7b3819651751a382d4ad373 +MISC ChangeLog 2363 RMD160 81def8d9802fd9801ed455ed406af3d4d5f64fd8 SHA1 769cec0bcf79cafd60f0f6c9c6ab1ab6cfc2df55 SHA256 12c3adc2c7f96409ff0878cc2d82cbb683667fae00150a55c213fce9d66d8bad MISC metadata.xml 160 RMD160 828887200387b28c37fc97111fc6bc3a0a2fcccd SHA1 813ef5bc57f6a8d95e7cab7a745a2a824858f49c SHA256 fe06593409e7f28665c032001005e94cb650299711a0af7f1a558bdb56c4004f 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 + #include + #include + #include +--- src/peer.c ++++ src/peer.c +@@ -35,6 +35,7 @@ + #include + #include + #include ++#include + + #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 + #include + #include ++#include + + #include + +--- 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/* +}