Version bump, including patches and various ebuild improvements (see ChangeLog)

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

6 files changed, 184 insertions, 3 deletions

diff --git a/net-p2p/btg/ChangeLog b/net-p2p/btg/ChangeLog
index 75ca56c8f1b6..0fc18bc6294c 100644
--- a/net-p2p/btg/ChangeLog
+++ b/net-p2p/btg/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for net-p2p/btg
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/btg/ChangeLog,v 1.13 2009/03/07 14:54:03 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/btg/ChangeLog,v 1.14 2009/07/02 22:55:49 yngwin Exp $
+
+*btg-1.0.0 (02 Jul 2009)
+
+  02 Jul 2009; Ben de Groot <yngwin@gentoo.org> +btg-1.0.0.ebuild,
+  +files/btg-1.0.0-gcc44.patch, +files/btg-1.0.0-gnutls-pc.patch:
+  Version bump, including patches and various ebuild improvements:
+  - patch to use pkgconfig to build with >=gnutls-2.8 (bug 275850)
+  - patch to fix compiling with gcc-4.4 by adding some missing C headers
+  - incorporate some changes from bug 231105 (curl useflag, dep updates)
+  - add upnp useflag, upnp is offered by >=rb_libtorrent-0.14
+  - migrate to eapi-2
+  - expand a bit on description
 
   07 Mar 2009; Petteri Räty <betelgeuse@gentoo.org> -btg-0.9.6-r1.ebuild:
   Remove old version.
diff --git a/net-p2p/btg/Manifest b/net-p2p/btg/Manifest
index 97d19d91e2c3..34aae9050686 100644
--- a/net-p2p/btg/Manifest
+++ b/net-p2p/btg/Manifest
@@ -1,8 +1,12 @@
 AUX btg-0.9.7-broken_bundled_plotmm_sigc.patch 4177 RMD160 f2514633c587c0650966ef9cd48996b8f29db1a7 SHA1 f64aa392beefaef9d4c8a004ee03ed4d69e59f05 SHA256 30c73fb4dfc103674a8791d2aa5275ad8d888ddb0dcc71d538d93f824eceb556
 AUX btg-0.9.7-gcc43.patch 2072 RMD160 783d4a59e5db251738c5a0842836b4dc776ceb7b SHA1 67340904363f99b386bc0f1faa0bb9689d6f217f SHA256 4b98e358e49e379ef940057cd1ce0906961d372cefc053136da601f4fb395e70
+AUX btg-1.0.0-gcc44.patch 747 RMD160 0bfcbb9805931e0ba50f171913509ad068c4fe4a SHA1 cb0fd87cf7be44f1940c7468362c3d9bba918c05 SHA256 9b04e50a1bb1509cae948727a4fe845af654d46d23446d1ecb414d04ca9dfcb8
+AUX btg-1.0.0-gnutls-pc.patch 1869 RMD160 441b3d6f3236fec6b29b43a5ebadaa9c1753bb80 SHA1 7cdebcec7faa2783fe43476d86e3b3aa832170db SHA256 7e06b744f47e098ec96625515e8e06cd0493b949ca86bc0657d955b0f7dd7572
 AUX btgd-confd 356 RMD160 4a5f537a334ed848d739ef0b80a93b34a4bcd393 SHA1 0b5f812cd19aa0c146a113d1d5baaff14d8ca2b1 SHA256 7feba6c4e38b11c8bafb56dcc7865efd90d88e8f08dd6366ae81c38c78f5f5a8
 AUX btgd-init 1015 RMD160 c70fd1f49e83b318ca7e65bc4ca6a1af7a23f4f0 SHA1 ac5aa7b44b31778383f8300e7c07a9559852cabb SHA256 0ce7a6af95c1a9bda8f890b54e3815785c2c213360f2cf383bac1f9423bdc410
 DIST btg-0.9.7.tar.gz 1175042 RMD160 a97d9082f39c8eb8f0e0afe2c678d53584591dec SHA1 5cb01f105e71eb524db8c65bf81b0d1f6a3c4beb SHA256 31237c4b7881b9d3534b476ed986596db4acae0460772eed7364f455da2d89ac
+DIST btg-1.0.0.tar.gz 1344719 RMD160 c30c6d56ac96d4f3f5d5274b22de0d0676baa749 SHA1 1562c02b563d45d5439cfff6ed680263f4012a64 SHA256 13aa5da13b55e5ebb3b849bf52dbe15f9817247d141a7e6c03979bf1a31ccf1e
 EBUILD btg-0.9.7.ebuild 1987 RMD160 900648a9050338691c47961e33109b240c39fbd3 SHA1 c4148a9d3e757a3d7bd9195b03a776d92115fb95 SHA256 72569cfeae49b0ee32f5fdebcd181ef3663f7675e58e447cd0a3d8093f49eda9
-MISC ChangeLog 1995 RMD160 d05eb290f059d54317a8be86179e5154fb8f4040 SHA1 3bae8fc607dda53d2b3ead55f1c8f80c0580b3b4 SHA256 79b306e4b4e8acdf63c163b4478086487fc07ee2f6988831ac6fc5cca5513229
-MISC metadata.xml 327 RMD160 1bcca96051c39ea9866bfe8f4a3b571755dfc9e0 SHA1 4748822c7a61f10820aceb0b15dddabd7d99a86d SHA256 e59d31061f324b135c344db74e567a97469d37f4631687fb9ac695aa7ca53ed1
+EBUILD btg-1.0.0.ebuild 2209 RMD160 dc9cf3b499f586038b2bb3aa5e700583e955d9bb SHA1 6a3a2cf200c28d60f5444d970d93d7933cc80646 SHA256 eba179c208ad645bd29b1561bb3c7c9caa6189e25e94708ff84aedac384bc98d
+MISC ChangeLog 2547 RMD160 065daf3c125eec231fbdef1059be87afbd43ef99 SHA1 5e9978e268b8930974fc134dc18367b095d9990e SHA256 dd93a61080fa68df468f291e078351737e4068059202defd5a6dde33da758e2e
+MISC metadata.xml 377 RMD160 2ded7dd81ae55a3c7187068420559f614de5b1d1 SHA1 2f03ff871a5703c0ac7cfc38f5e9eccdef3aed7e SHA256 f300cbe3e0cc2afc622b6c5a9bf72956174c5f1ba6986cd801b230ba0e5e98f2
diff --git a/net-p2p/btg/btg-1.0.0.ebuild b/net-p2p/btg/btg-1.0.0.ebuild
new file mode 100644
index 000000000000..2fb63e8825ca
--- /dev/null
+++ b/net-p2p/btg/btg-1.0.0.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/btg/btg-1.0.0.ebuild,v 1.1 2009/07/02 22:55:49 yngwin Exp $
+
+EAPI="2"
+inherit eutils autotools
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="A bittorrent client using rb_libtorrent with a daemon/client model"
+HOMEPAGE="http://btg.berlios.de/"
+SRC_URI="mirror://berlios/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="curl debug doc event-callback gtk minimal ncurses session test upnp webinterface"
+
+RDEPEND=">=dev-libs/boost-1.35
+	dev-libs/expat
+	dev-libs/libgcrypt
+	dev-libs/libgpg-error
+	dev-libs/libtasn1
+	net-libs/gnutls
+	net-libs/rb_libtorrent
+	curl? ( net-misc/curl )
+	gtk? ( dev-cpp/gtkmm:2.4
+		dev-libs/libsigc++:2
+		sci-libs/plotmm
+		x11-libs/pango )
+	!minimal? ( dev-util/dialog )
+	ncurses? ( sys-libs/ncurses )
+	test? ( dev-util/cppunit )
+	upnp? ( >=net-libs/rb_libtorrent-0.14 )
+	webinterface? ( dev-lang/php:5[xml,zlib] virtual/httpd-cgi )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	doc? ( app-doc/doxygen )"
+
+S="${WORKDIR}/${P%_*}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gnutls-pc.patch  # bug 275850
+	epatch "${FILESDIR}"/${P}-gcc44.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf LIBS="-lboost_thread -lboost_date_time" \
+		$(use_enable curl url) \
+		$(use_enable debug) \
+		$(use_enable gtk gui) \
+		$(use_enable ncurses cli) \
+		$(use_enable event-callback) \
+		$(use_enable session session-saving) \
+		$(use_enable test unittest) \
+		$(use_enable upnp) \
+		$(use_enable webinterface www) \
+		$(use_enable !minimal command-list) \
+		$(use_enable !minimal btg-config) \
+		--disable-dependency-tracking
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die 'emake install failed'
+
+	dodoc AUTHORS ChangeLog README TODO
+
+	newinitd "${FILESDIR}/btgd-init" ${PN}
+	newconfd "${FILESDIR}/btgd-confd" ${PN}
+
+	use gtk && make_desktop_entry btgui "BTG GUI Client" btg "Network;P2P"
+}
+
+pkg_postinst() {
+	enewgroup p2p
+	enewuser p2p -1 -1 /home/p2p p2p
+
+	echo
+	elog "BTG needs a daemon.ini and client.ini. To create them run btg-config and"
+	elog "put them in the home of the user running btg (/home/p2p/.btg by default)"
+	echo
+}
diff --git a/net-p2p/btg/files/btg-1.0.0-gcc44.patch b/net-p2p/btg/files/btg-1.0.0-gcc44.patch
new file mode 100644
index 000000000000..5c22ae51b138
--- /dev/null
+++ b/net-p2p/btg/files/btg-1.0.0-gcc44.patch
@@ -0,0 +1,31 @@
+--- btg-1.0.0/bcore/os/socket.cpp.orig	2009-07-01 15:32:51.000000000 +0200
++++ btg-1.0.0/bcore/os/socket.cpp	2009-07-01 15:34:42.000000000 +0200
+@@ -32,6 +32,7 @@
+ {
+ #include <errno.h>
+ #include <fcntl.h>
++#include <stdio.h>
+ }
+
+ namespace btg
+--- btg-1.0.0/bcore/os/fileop.cpp.orig	2009-07-01 17:06:42.000000000 +0200
++++ btg-1.0.0/bcore/os/fileop.cpp	2009-07-01 17:07:22.000000000 +0200
+@@ -24,6 +24,8 @@
+
+ #include <bcore/logmacro.h>
+
++#include <cstdio>
++
+ extern "C"
+ {
+    // For getenv.
+--- btg-1.0.0/bcore/logger/logger.cpp.orig	2009-07-01 19:38:33.000000000 +0200
++++ btg-1.0.0/bcore/logger/logger.cpp	2009-07-01 19:39:02.000000000 +0200
+@@ -22,6 +22,7 @@
+ 
+ #include "logger.h"
+ #include "logif.h"
++#include <cstdio>
+ 
+ namespace btg
+ {
diff --git a/net-p2p/btg/files/btg-1.0.0-gnutls-pc.patch b/net-p2p/btg/files/btg-1.0.0-gnutls-pc.patch
new file mode 100644
index 000000000000..d136afcabab8
--- /dev/null
+++ b/net-p2p/btg/files/btg-1.0.0-gnutls-pc.patch
@@ -0,0 +1,50 @@
+--- btg-1.0.0/configure.in.orig	2009-07-01 15:08:38.000000000 +0200
++++ btg-1.0.0/configure.in	2009-07-01 15:08:47.000000000 +0200
+@@ -144,11 +144,7 @@
+
+ AC_CACHE_SAVE
+
+-AM_PATH_LIBGNUTLS([1.0.0], [gnutlsfound=true], [gnutlsfound=false])
+-
+-if test "$gnutlsfound" = "false"; then
+-        AC_MSG_ERROR([unable to find libgnutls library, currently this is required.])
+-fi
++PKG_CHECK_MODULES(LIBGNUTLS, gnutls >= 1.0.0)
+
+ AM_LIBGNUTLS_VERSION
+
+--- btg-1.0.0/m4/libgnutls-version.m4.orig	2008-06-14 08:29:51.000000000 +0200
++++ btg-1.0.0/m4/libgnutls-version.m4	2009-07-01 15:05:28.000000000 +0200
+@@ -3,27 +3,15 @@
+ dnl
+
+ AC_DEFUN([AM_LIBGNUTLS_VERSION],
+-[dnl
+-dnl Get the cflags and libraries from the libgnutls-config script
+-dnl
+-AC_ARG_WITH(libgnutls-prefix,
+-          [  --with-libgnutls-prefix=PFX   Prefix where libgnutls is installed (optional)],
+-          libgnutls_config_prefix="$withval", libgnutls_config_prefix="")
+-
+-  if test x$libgnutls_config_prefix != x ; then
+-     if test x${LIBGNUTLS_CONFIG+set} != xset ; then
+-        LIBGNUTLS_CONFIG=$libgnutls_config_prefix/bin/libgnutls-config
+-     fi
+-  fi
+-
+-  AC_PATH_PROG(LIBGNUTLS_CONFIG, libgnutls-config, no)
++[
++  PKG_CHECK_EXISTS(gnutls, [gnutls_exists=yes], [gnutls_exists=no])
+
+-  if test "$LIBGNUTLS_CONFIG" = "no" ; then
++  if test "$gnutls_exists" = "no" ; then
+     LIBGNUTLS_MAJOR_VER=0
+     LIBGNUTLS_MINOR_VER=0
+   else
+-    LIBGNUTLS_MAJOR_VER=`$LIBGNUTLS_CONFIG $libgnutls_config_args --version|cut -d "." -f 1`
+-    LIBGNUTLS_MINOR_VER=`$LIBGNUTLS_CONFIG $libgnutls_config_args --version|cut -d "." -f 2`
++    LIBGNUTLS_MAJOR_VER=`pkg-config gnutls --modversion --silence-errors |cut -d "." -f 1`
++    LIBGNUTLS_MINOR_VER=`pkg-config gnutls --modversion --silence-errors |cut -d "." -f 2`
+   fi
+
+   AC_DEFINE_UNQUOTED(GNUTLS_MAJOR_VER, [$LIBGNUTLS_MAJOR_VER], [gnutls major version])
diff --git a/net-p2p/btg/metadata.xml b/net-p2p/btg/metadata.xml
index f288acb55b50..86e5ffb2f38c 100644
--- a/net-p2p/btg/metadata.xml
+++ b/net-p2p/btg/metadata.xml
@@ -4,6 +4,7 @@
   <herd>net-p2p</herd>
   <use>
     <flag name="event-callback">Enable calling a script or executable for certain events</flag>
+	<flag name="upnp">Enable support for UPnP</flag>
     <flag name="webinterface">install webBTG</flag>
   </use>
 </pkgmetadata>