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

Package-Manager: portage-13805-svn/cvs/Linux i686

5 files changed, 140 insertions, 7 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/Manifest b/net-p2p/btg/Manifest
index 34aae9050686..c435af715ecc 100644
--- a/net-p2p/btg/Manifest
+++ b/net-p2p/btg/Manifest
@@ -2,11 +2,12 @@ AUX btg-0.9.7-broken_bundled_plotmm_sigc.patch 4177 RMD160 f2514633c587c0650966e
 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 btg-1.0.0-xmlrpc.patch 4073 RMD160 73c3ae34a75a2f2bba0928854e3ab8ad55c92281 SHA1 d124685174d5db7c79fa4fb0457dee5f51a71241 SHA256 fc1de7d3c21a010c270991020886e38401271aae61ac82c1cb5d1fd0a5d61509
 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
-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
+EBUILD btg-1.0.0-r1.ebuild 2307 RMD160 7453147d79a72d369d6b1092ab33004c6b4fb75c SHA1 a26823c8a7810cd9936d0b44afb328f1c19f7c33 SHA256 28922804f482a3e97de87c21ed485d695c6bf04d460ec815915183eaeef5f95a
+MISC ChangeLog 2905 RMD160 3117d19192c09d392351a1ea14efa39316b7975a SHA1 fe133a86cd514bb3b1de4fc15cc006a894483e57 SHA256 78176ebb771531e6216edcf39810ac8ad25c9125d0f225f289666e16fa0b7ca0
+MISC metadata.xml 476 RMD160 3a9cf5002c0cecdab802a07ae7e0ca53c5ace2cd SHA1 00fec72efb6eea2de49264e06e9bee9f21b0b3fe SHA256 38e3f9016b8bf5d7f4974364f1cc91261a8c8ba886cad5974c1a2f0fbd90f4db
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>