use system xmlrpc-epi, bug 276349. rb_libtorrent-0.13.1 is minimal, bug 276366. add clinkcc for upnp

(Portage version: 13805-svn/cvs/Linux i686)

4 files changed, 136 insertions, 4 deletions

diff --git a/net-p2p/btg/ChangeLog b/net-p2p/btg/ChangeLog
index 0fc18bc6294c..62433c675c42 100644
--- a/net-p2p/btg/ChangeLog
+++ b/net-p2p/btg/ChangeLog
@@ -1,6 +1,16 @@
 # 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.14 2009/07/02 22:55:49 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/btg/ChangeLog,v 1.15 2009/07/11 15:46:26 volkmar Exp $
+
+*btg-1.0.0-r1 (11 Jul 2009)
+
+  11 Jul 2009; Mounir Lamouri <volkmar@gentoo.org>
+  +files/btg-1.0.0-xmlrpc.patch, metadata.xml, -btg-1.0.0.ebuild,
+  +btg-1.0.0-r1.ebuild:
+  Use system xmlrpc-epi. Fix bug 276349.
+  Specify 0.13.1 rb_libtorrent as minimal. Fix bug 276366.
+  Let user use clinkcc or rb_libtorrent for upnp support.
+  Add myself as maintainer.
 
 *btg-1.0.0 (02 Jul 2009)
 
diff --git a/net-p2p/btg/btg-1.0.0.ebuild b/net-p2p/btg/btg-1.0.0-r1.ebuild
index 2fb63e8825ca..b655d65f1ac1 100644
--- a/net-p2p/btg/btg-1.0.0.ebuild
+++ b/net-p2p/btg/btg-1.0.0-r1.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/btg/btg-1.0.0-r1.ebuild,v 1.1 2009/07/11 15:46:26 volkmar Exp $
 
 EAPI="2"
 inherit eutils autotools
@@ -21,8 +21,9 @@ RDEPEND=">=dev-libs/boost-1.35
 	dev-libs/libgcrypt
 	dev-libs/libgpg-error
 	dev-libs/libtasn1
+	dev-libs/xmlrpc-epi
 	net-libs/gnutls
-	net-libs/rb_libtorrent
+	>=net-libs/rb_libtorrent-0.13.1
 	curl? ( net-misc/curl )
 	gtk? ( dev-cpp/gtkmm:2.4
 		dev-libs/libsigc++:2
@@ -31,7 +32,7 @@ RDEPEND=">=dev-libs/boost-1.35
 	!minimal? ( dev-util/dialog )
 	ncurses? ( sys-libs/ncurses )
 	test? ( dev-util/cppunit )
-	upnp? ( >=net-libs/rb_libtorrent-0.14 )
+	upnp? ( || ( >=net-libs/rb_libtorrent-0.13 net-libs/clinkcc ) )
 	webinterface? ( dev-lang/php:5[xml,zlib] virtual/httpd-cgi )"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
@@ -42,6 +43,7 @@ S="${WORKDIR}/${P%_*}"
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-gnutls-pc.patch  # bug 275850
 	epatch "${FILESDIR}"/${P}-gcc44.patch
+	epatch "${FILESDIR}"/${P}-xmlrpc.patch
 	eautoreconf
 }
 
diff --git a/net-p2p/btg/files/btg-1.0.0-xmlrpc.patch b/net-p2p/btg/files/btg-1.0.0-xmlrpc.patch
new file mode 100644
index 000000000000..ec531696ece4
--- /dev/null
+++ b/net-p2p/btg/files/btg-1.0.0-xmlrpc.patch
@@ -0,0 +1,116 @@
+--- m4/xmlrpc.m4.old	2009-07-11 15:51:04.000000000 +0200
++++ m4/xmlrpc.m4	2009-07-11 18:50:22.000000000 +0200
+@@ -6,17 +6,16 @@
+ [  --with-xmlrpc-prefix=DIR  search for xmlrpc in DIR/include and DIR/lib], [
+     for dir in `echo "$withval" | tr : ' '`; do
+       if test -d $dir/include; then XMLRPC_CFLAGS="-I$dir/include"; fi
+-      if test -d $dir/lib; then XMLRPC_LDFLAGS="-L$dir/lib"; fi
++      if test -d $dir/lib; then XMLRPC_LIBS="-L$dir/lib"; fi
+     done
+    ])
+ 
+-  XMLRPC_LIBNAME="xmlrpc-epi"
+-  XMLRPC_LDFLAGS="$XMLRPC_LDFLAGS -l$XMLRPC_LIBNAME"
++	XMLRPC_LIBS="$XMLRPC_LIBS -lxmlrpc-epi"
+ 
+   CFLAGS_SAVED="$CFLAGS"
+   CFLAGS="$CFLAGS $XMLRPC_CFLAGS"
+-  LDFLAGS_SAVED="$LDFLAGS"
+-  LDFLAGS="$LDFLAGS $XMLRPC_LDFLAGS"
++  LIBS_SAVED="$LIBS"
++  LIBS="$LIBS $XMLRPC_LIBS"
+ 
+   AC_HEADER_STDC
+   dnl AC_CHECK_HEADERS(xmlrpc.h)
+@@ -34,6 +33,28 @@
+   ], [
+     AC_MSG_RESULT([no])
+     AC_MSG_NOTICE([Cannot use XML-RPC headers from the specified location])
++
++    if test -z "$XMLRPC_CFLAGS"; then
++      XMLRPC_CFLAGS="-I$prefix/include/xmlrpc-epi"
++    else
++      XMLRPC_CFLAGS="$XMLRPC_CFLAGS/xmlrpc-epi"
++    fi
++
++    CFLAGS="$CFLAGS $XMLRPC_CFLAGS"
++    AC_MSG_CHECKING([whether XML-RPC headers can be used in xmlrpc directory])
++    AC_COMPILE_IFELSE([
++    AC_LANG_PROGRAM([
++      # include <xmlrpc.h>
++    ], [
++      XMLRPC_REQUEST xmlrpc_request = XMLRPC_RequestNew();
++      return 0;
++    ])
++    ], [
++      AC_MSG_RESULT([yes])
++    ], [
++      AC_MSG_RESULT([no])
++      AC_MSG_NOTICE([Cannot use XML-RPC headers])
++    ])
+   ])
+ 
+   AC_MSG_CHECKING([whether XML-RPC library can be used])
+@@ -45,15 +66,15 @@
+   ], [
+     AC_MSG_RESULT([yes])
+     AC_SUBST(XMLRPC_CFLAGS)
+-    AC_SUBST(XMLRPC_LDFLAGS)
++    AC_SUBST(XMLRPC_LIBS)
+   ], [
+     AC_MSG_RESULT([no])
+-    XMLRPC_LDFLAGS=""
++    XMLRPC_LIBS=""
+     XMLRPC_CFLAGS=""
+     AC_MSG_NOTICE([Cannot link with XML-RPC from the specified location])
+   ])
+ 
+   CFLAGS="$CFLAGS_SAVED"
+-  LDFLAGS="$LDFLAGS_SAVED"
++  LIBS="$LIBS_SAVED"
+ ])
+ 
+--- configure.in.old	2009-07-11 16:20:16.000000000 +0200
++++ configure.in	2009-07-11 16:20:26.000000000 +0200
+@@ -41,7 +41,7 @@
+ 
+ XMLRPC_CHECK
+ 
+-if test -z "$XMLRPC_LDFLAGS" ; then
++if test -z "$XMLRPC_LIBS" ; then
+   AC_MSG_NOTICE([Using internal XML-RPC implementation.])
+   BTG_INTERNAL_XMLRPC=1
+   AM_CONDITIONAL(BUILDINTERNALXMLRPC, true)
+--- bcore/Makefile.am.old	2009-07-11 16:27:49.000000000 +0200
++++ bcore/Makefile.am	2009-07-11 16:27:59.000000000 +0200
+@@ -130,7 +130,7 @@
+ bitvector.cpp \
+ urlstatus.cpp
+ 
+-libbtgcore_la_LIBADD = @XMLRPC_LDFLAGS@ @ZLIB_LDFLAGS@ \
++libbtgcore_la_LIBADD = @XMLRPC_LIBS@ @ZLIB_LDFLAGS@ \
+ @LIBGNUTLS_LIBS@ @BOOST_PROGRAM_OPTIONS_LIB@ \
+ @BOOST_THREAD_LIB@ @BOOST_FILESYSTEM_LIB@ @BOOST_SYSTEM_LIB@ \
+ @BOOST_DATE_TIME_LIB@
+--- daemon/Makefile.am.old	2009-07-11 16:24:11.000000000 +0200
++++ daemon/Makefile.am	2009-07-11 16:25:40.000000000 +0200
+@@ -92,7 +92,7 @@
+                     $(UPNP_LDADD) $(HTTP_LDADD) \
+                     @LIBS@ @LIBTORRENT_LIBS@ @BOOST_SYSTEM_LIB@ @ZLIB_LDFLAGS@ \
+                     @LIBGNUTLS_LIBS@ @BOOST_THREAD_LIB@ @BOOST_FILESYSTEM_LIB@ \
+-                    @BOOST_PROGRAM_OPTIONS_LIB@ @XMLRPC_LDFLAGS@ @BOOST_DATE_TIME_LIB@ \
++                    @BOOST_PROGRAM_OPTIONS_LIB@ @XMLRPC_LIBS@ @BOOST_DATE_TIME_LIB@ \
+                     $(URL_LIBS) $(CYBERLINK_LDADD)
+ 
+ #btgdaemon_LDFLAGS  = -all-static
+--- utest/Makefile.am.old	2009-07-11 16:26:25.000000000 +0200
++++ utest/Makefile.am	2009-07-11 16:26:43.000000000 +0200
+@@ -85,7 +85,7 @@
+ testrunner_LDFLAGS  = @LIBS@ $(CPPUNIT_LIBS) @LIBTORRENT_LIBS@ @BOOST_SYSTEM_LIB@ \
+                       @@ZLIB_LDFLAGS @BOOST_FILESYSTEM_LIB@ \
+                       @BOOST_PROGRAM_OPTIONS_LIB@ @BOOST_THREAD_LIB@ \
+-                      @LIBGNUTLS_LIBS@ @XMLRPC_LDFLAGS@ $(URL_LIBS)
++                      @LIBGNUTLS_LIBS@ @XMLRPC_LIBS@ $(URL_LIBS)
+ 
+ testrunner_CFLAGS   = @CFLAGS@   $(CPPUNIT_CFLAGS) @LIBTORRENT_CFLAGS@ @LIBGNUTLS_CFLAGS@ @ZLIB_CFLAGS@ \
+                       @XMLRPC_CFLAGS@ -DBTG_DEBUG=@BTG_DEBUG@ \
diff --git a/net-p2p/btg/metadata.xml b/net-p2p/btg/metadata.xml
index 86e5ffb2f38c..615a805d88fb 100644
--- a/net-p2p/btg/metadata.xml
+++ b/net-p2p/btg/metadata.xml
@@ -2,6 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>net-p2p</herd>
+  <maintainer>
+	  <email>volkmar@gentoo.org</email>
+	  <name>Mounir Lamouri</name>
+  </maintainer>
   <use>
     <flag name="event-callback">Enable calling a script or executable for certain events</flag>
 	<flag name="upnp">Enable support for UPnP</flag>