[gentoo-commits] dev/anarchy:master commit in: net-p2p/transmission/, net-p2p/transmission/files/

[Jory Pratt]

commit:     34a7328ba54d1ab0619a1383308cab7f9c769fdc
Author:     Jory A. Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 31 14:44:29 2011 +0000
Commit:     Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Mon Oct 31 14:44:29 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/anarchy.git;a=commit;h=34a7328b

workaround broken transmission in portage

---
 net-p2p/transmission/Manifest                      |    8 +
 .../transmission-2.33-0001-configure.ac.patch      |   47 ++++
 ...transmission-2.33-0002-config.in-4-qt.pro.patch |   72 +++++
 .../transmission-2.41-0003-system-miniupnpc.patch  |  281 ++++++++++++++++++++
 .../files/transmission-2.41-no_utp.patch           |   15 +
 .../transmission/files/transmission-daemon.confd.3 |   14 +
 .../transmission/files/transmission-daemon.initd.8 |   73 +++++
 net-p2p/transmission/transmission-2.41.ebuild      |  154 +++++++++++
 8 files changed, 664 insertions(+), 0 deletions(-)

diff --git a/net-p2p/transmission/Manifest b/net-p2p/transmission/Manifest
new file mode 100644
index 0000000..f9a4f11
--- /dev/null
+++ b/net-p2p/transmission/Manifest
@@ -0,0 +1,8 @@
+AUX transmission-2.33-0001-configure.ac.patch 1513 RMD160 c55d306b5657a07e71c88e703d4be86c47606bdf SHA1 e2c230117fb57ecddebb3798402cd1b36e45776c SHA256 aa269bb7ab69754a29399062b8abdab915a7172fa99a0747360584bcc9afaa25
+AUX transmission-2.33-0002-config.in-4-qt.pro.patch 2434 RMD160 eff545e8416f2bb92035717a35121ecaa0ba089f SHA1 e4470173150fe2b84583e295842e9ad13063ca75 SHA256 41d289f1701606eb337375ddcbc69f9c6b7e3e82d7212d8c3e4ecb4d034f7c46
+AUX transmission-2.41-0003-system-miniupnpc.patch 9639 RMD160 e23714576aa12d6a79ca8ca64793f549cc4d6534 SHA1 1d21efda014426ff4c34a30a7beadf7c730496c2 SHA256 9949347aa2dec92ef73b3dfc00d49618572b397e66d8415cca15933cce2f63f0
+AUX transmission-2.41-no_utp.patch 323 RMD160 120286fa0b4a9ba3cbcc5577fd2c7fe932c41b32 SHA1 b07ae38137bbb54c814b85232f9e07c53e6539f2 SHA256 0665f97fe4bd9e627252d5eed3bfc937747b80813a1579a93fc0f8b17fac0535
+AUX transmission-daemon.confd.3 703 RMD160 482953d2bd8e9c69300af3389615764649954a63 SHA1 a4d16dde4e2408b48620cc89c4a8759b042797f2 SHA256 4b47acf195a14a322550cfcaa735a59aac38410d1c2c63ffa824ff131c55ca70
+AUX transmission-daemon.initd.8 2235 RMD160 2848770ae93c597ea5cd6e8d22857bb99578b9e5 SHA1 683a27b11c84033de6efa831c6dabd1c487feb33 SHA256 370ec8a257a5bea28f9bb9d607e76676db94159def8be83932c7bda473f59012
+DIST transmission-2.41.tar.xz 2623344 RMD160 a2c9c80cff444978dff305d573007473af5b3084 SHA1 dd9531587778dc46757b1520accacf6afa20c370 SHA256 f31bf798f620b436b2f5ed7047fa27fab78ce4b229d6d02f8c71f9867277685a
+EBUILD transmission-2.41.ebuild 3967 RMD160 d20d576c39dd48f16dba5ba78e77a801a67e60d5 SHA1 20b54d89b37984bde1c80ba98b4ae045709de25a SHA256 51977af40712d968c983f15eebdeaceb251512e2136dd4500fbeaf94f293679b

diff --git a/net-p2p/transmission/files/transmission-2.33-0001-configure.ac.patch b/net-p2p/transmission/files/transmission-2.33-0001-configure.ac.patch
new file mode 100644
index 0000000..75e6594
--- /dev/null
+++ b/net-p2p/transmission/files/transmission-2.33-0001-configure.ac.patch
@@ -0,0 +1,47 @@
+From fc34254a20735efaeb903365e0960d4a009463b3 Mon Sep 17 00:00:00 2001
+From: Peter Volkov <pva@g.o>
+Date: Thu, 16 Jun 2011 12:46:48 +0400
+Subject: [PATCH 1/3] configure.ac: Drop redudant code/indentation.
+
+---
+ configure.ac |   16 ++++------------
+ 1 files changed, 4 insertions(+), 12 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 7dcbcf0..421946f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -214,26 +214,18 @@ AC_CHECK_LIB([rt],
+ 
+ AC_MSG_CHECKING([µTP])
+ build_utp="no"
+-if test "x$CXX" = "x" ; then
+-    have_utp="no"
+-else
+-    have_utp="yes"
+-fi
+ AC_ARG_ENABLE([utp],
+               AS_HELP_STRING([--enable-utp],[build µTP support]),
+               [want_utp=${enableval}],
+-              [want_utp=${have_utp}])
++              [want_utp="yes"])
+ if test "x$want_utp" = "xyes" ; then
+-    if test "x$have_utp" = "xyes"; then 
++    if test "x$CXX" != "x" ; then
+         LIBUTP_CFLAGS="-I\$(top_srcdir)/third-party/"
+-        LIBUTP_LIBS="\$(top_builddir)/third-party/libutp/libutp.a"
+-	if test "x$libutp_extra_libs" != "x" ; then
+-	   LIBUTP_LIBS="$LIBUTP_LIBS $libutp_extra_libs"
+-	fi
++        LIBUTP_LIBS="\$(top_builddir)/third-party/libutp/libutp.a $libutp_extra_libs"
+         AC_DEFINE([WITH_UTP],[1])
+         build_utp="yes"
+     else 
+-      AC_MSG_ERROR("Unable to build uTP support -- C++ compiler not found") 
++        AC_MSG_ERROR("Unable to build uTP support -- C++ compiler not found; consider --disable-utp") 
+     fi 
+ fi 
+ AC_SUBST(LIBUTP_CFLAGS)
+-- 
+1.7.3.4
+

diff --git a/net-p2p/transmission/files/transmission-2.33-0002-config.in-4-qt.pro.patch b/net-p2p/transmission/files/transmission-2.33-0002-config.in-4-qt.pro.patch
new file mode 100644
index 0000000..1060795
--- /dev/null
+++ b/net-p2p/transmission/files/transmission-2.33-0002-config.in-4-qt.pro.patch
@@ -0,0 +1,72 @@
+From 9b55e6ce1a98b4c2f32349982d4172d0971601c6 Mon Sep 17 00:00:00 2001
+From: Peter Volkov <pva@g.o>
+Date: Thu, 16 Jun 2011 12:48:11 +0400
+Subject: [PATCH 2/3] Add qt/config to make qmake aware about ./configure results. This simplifies use of system third-party tools. Fixes build issue caused by ordering of make/qmake run: bugs.gentoo.org/368523.
+
+---
+ configure.ac |    5 ++++-
+ qt/config.in |    1 +
+ qt/qtr.pro   |    6 +++---
+ 3 files changed, 8 insertions(+), 4 deletions(-)
+ create mode 100644 qt/config.in
+
+diff --git a/configure.ac b/configure.ac
+index 421946f..bf0622b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -222,6 +222,7 @@ if test "x$want_utp" = "xyes" ; then
+     if test "x$CXX" != "x" ; then
+         LIBUTP_CFLAGS="-I\$(top_srcdir)/third-party/"
+         LIBUTP_LIBS="\$(top_builddir)/third-party/libutp/libutp.a $libutp_extra_libs"
++        LIBUTP_LIBS_QT="\$\${TRANSMISSION_TOP}/third-party/libutp/libutp.a $libutp_extra_libs"
+         AC_DEFINE([WITH_UTP],[1])
+         build_utp="yes"
+     else 
+@@ -230,6 +231,7 @@ if test "x$want_utp" = "xyes" ; then
+ fi 
+ AC_SUBST(LIBUTP_CFLAGS)
+ AC_SUBST(LIBUTP_LIBS)
++AC_SUBST(LIBUTP_LIBS_QT)
+ AM_CONDITIONAL([BUILD_UTP],[test "x$build_utp" = "xyes"])
+ AC_MSG_RESULT([$build_utp])
+ 
+@@ -484,7 +486,8 @@ AC_CONFIG_FILES([Makefile
+                  web/javascript/Makefile
+                  web/javascript/jquery/Makefile
+                  web/stylesheets/Makefile
+-                 po/Makefile.in])
++                 po/Makefile.in
++		 qt/config])
+ 
+ AC_OUTPUT
+ 
+diff --git a/qt/config.in b/qt/config.in
+new file mode 100644
+index 0000000..3340d1a
+--- /dev/null
++++ b/qt/config.in
+@@ -0,0 +1 @@
++LIBUTP_LIBS = @LIBUTP_LIBS_QT@
+diff --git a/qt/qtr.pro b/qt/qtr.pro
+index ce138a2..4e28e98 100644
+--- a/qt/qtr.pro
++++ b/qt/qtr.pro
+@@ -16,12 +16,12 @@ QT += network
+ PKGCONFIG = fontconfig libcurl openssl libevent
+ 
+ TRANSMISSION_TOP = ..
++include(config)
++
+ INCLUDEPATH = $${EVENT_TOP}/include $${INCLUDEPATH}
+ INCLUDEPATH += $${TRANSMISSION_TOP}
+ LIBS += $${TRANSMISSION_TOP}/libtransmission/libtransmission.a
+-exists( $${TRANSMISSION_TOP}/third-party/libutp/libutp.a ) { 
+-    LIBS += $${TRANSMISSION_TOP}/third-party/libutp/libutp.a
+-}
++LIBS += $${LIBUTP_LIBS}
+ LIBS += $${TRANSMISSION_TOP}/third-party/dht/libdht.a
+ LIBS += $${TRANSMISSION_TOP}/third-party/miniupnp/libminiupnp.a
+ LIBS += $${TRANSMISSION_TOP}/third-party/libnatpmp/libnatpmp.a
+-- 
+1.7.3.4
+

diff --git a/net-p2p/transmission/files/transmission-2.41-0003-system-miniupnpc.patch b/net-p2p/transmission/files/transmission-2.41-0003-system-miniupnpc.patch
new file mode 100644
index 0000000..e4b6271
--- /dev/null
+++ b/net-p2p/transmission/files/transmission-2.41-0003-system-miniupnpc.patch
@@ -0,0 +1,281 @@
+=== modified file 'cli/Makefile.am'
+--- cli/Makefile.am	2011-10-19 10:26:45 +0000
++++ cli/Makefile.am	2011-10-19 10:37:21 +0000
+@@ -18,8 +18,8 @@
+ 
+ transmission_cli_LDADD = \
+     $(top_builddir)/libtransmission/libtransmission.a \
++    @LIBUPNP_LIBS@ \
+     $(top_builddir)/third-party/libnatpmp/libnatpmp.a \
+-    $(top_builddir)/third-party/miniupnp/libminiupnp.a \
+     @DHT_LIBS@ \
+     @LIBUTP_LIBS@ \
+     @LIBEVENT_LIBS@ \
+
+=== modified file 'configure.ac'
+--- configure.ac	2011-10-19 10:36:21 +0000
++++ configure.ac	2011-10-19 10:37:21 +0000
+@@ -229,6 +229,77 @@
+ 
+ dnl ----------------------------------------------------------------------------
+ dnl
++dnl  Allow usage of system miniupnp library
++LIBUPNP_CFLAGS="-I\$(top_srcdir)/third-party/"
++LIBUPNP_LIBS="\$(top_builddir)/third-party/miniupnp/libminiupnp.a"
++LIBUPNP_LIBS_QT="\$\${TRANSMISSION_TOP}/third-party/miniupnp/libminiupnp.a"
++build_bundled_miniupnp="yes"
++AC_ARG_ENABLE([external-miniupnp],
++              AS_HELP_STRING([--enable-external-miniupnp],[Use system external-miniupnp]),
++              [want_external_miniupnp=${enableval}],
++              [want_external_miniupnp=no])
++if test "x$want_external_miniupnp" != "xno" ; then
++    AC_DEFINE([SYSTEM_MINIUPNP])
++    ac_save_LIBS="$LIBS"
++    LIBS="-lminiupnpc"
++    # Check miniupnp 1.5
++    AC_TRY_LINK([
++    #include <stdlib.h>
++    #include <miniupnpc/miniupnpc.h>
++    #include <miniupnpc/upnpcommands.h>
++    ],[
++        struct UPNPDev * devlist;
++        struct UPNPUrls    urls;
++        struct IGDdatas    data;
++        char lanaddr[16];
++        char portStr[8];
++        char intPort[8];
++        char intClient[16];
++        upnpDiscover( 2000, NULL, NULL, 0 );
++        UPNP_GetValidIGD( devlist, &urls, &data, lanaddr, sizeof( lanaddr ) ); 
++        UPNP_GetSpecificPortMappingEntry( urls.controlURL, data.first.servicetype,
++                            portStr, "TCP", intClient, intPort );
++    ],[
++    AC_DEFINE(HAVE_MINIUPNP_15, 1, [Define to 1 if you have miniupnpc version 1.5])
++    build_bundled_miniupnp="no"])
++    
++    # Check miniupnp 1.6
++    AC_TRY_LINK([
++    #include <stdlib.h>
++    #include <errno.h>
++    #include <miniupnpc/miniupnpc.h>
++    #include <miniupnpc/upnpcommands.h>
++    ],[
++        struct UPNPDev * devlist;
++        struct UPNPUrls    urls;
++        struct IGDdatas    data;
++        char lanaddr[16];
++        char portStr[8];
++        char intPort[8];
++        char intClient[16];
++	upnpDiscover( 2000, NULL, NULL, 0, 0, &errno );
++        UPNP_GetValidIGD( devlist, &urls, &data, lanaddr, sizeof( lanaddr ) ); 
++        UPNP_GetSpecificPortMappingEntry( urls.controlURL, data.first.servicetype,
++                            portStr, "TCP", intClient, intPort, NULL, NULL, NULL );
++    ],[
++    AC_DEFINE(HAVE_MINIUPNP_16, 1, [Define to 1 if you have miniupnpc version 1.6])
++    build_bundled_miniupnp="no"])
++
++    if test "x$build_bundled_miniupnp" = "xno" ; then
++        LIBUPNP_CFLAGS="" 
++        LIBUPNP_LIBS="-lminiupnpc"
++        LIBUPNP_LIBS_QT="-lminiupnpc"
++    else
++        AC_MSG_ERROR("Requested system libminiupnp but it is not found")
++    fi
++    LIBS="$ac_save_LIBS"
++fi
++AM_CONDITIONAL([BUILD_MINIUPNP],[test "x$build_bundled_miniupnp" = "xyes"])
++AC_SUBST(LIBUPNP_CFLAGS)
++AC_SUBST(LIBUPNP_LIBS)
++AC_SUBST(LIBUPNP_LIBS_QT)
++dnl ----------------------------------------------------------------------------
++dnl
+ dnl  detection for the GTK+ client
+ 
+ PKG_CHECK_MODULES(GTK,
+@@ -401,7 +472,7 @@
+                  libtransmission/Makefile
+                  utils/Makefile
+                  third-party/Makefile
+-                 third-party/miniupnp/Makefile
++		 third-party/miniupnp/Makefile
+                  third-party/libnatpmp/Makefile
+                  third-party/libutp/Makefile
+                  third-party/dht/Makefile
+
+=== modified file 'daemon/Makefile.am'
+--- daemon/Makefile.am	2011-10-19 10:26:45 +0000
++++ daemon/Makefile.am	2011-10-19 10:37:21 +0000
+@@ -20,7 +20,7 @@
+ 
+ LDADD = \
+     $(top_builddir)/libtransmission/libtransmission.a \
+-    $(top_builddir)/third-party/miniupnp/libminiupnp.a \
++    @LIBUPNP_LIBS@ \
+     $(top_builddir)/third-party/libnatpmp/libnatpmp.a \
+     @DHT_LIBS@ \
+     @LIBUTP_LIBS@ \
+
+=== modified file 'gtk/Makefile.am'
+--- gtk/Makefile.am	2011-10-19 10:26:45 +0000
++++ gtk/Makefile.am	2011-10-19 10:37:21 +0000
+@@ -84,7 +84,7 @@
+ 
+ transmission_gtk_LDADD = \
+     $(top_builddir)/libtransmission/libtransmission.a \
+-    $(top_builddir)/third-party/miniupnp/libminiupnp.a \
++    @LIBUPNP_LIBS@ \
+     $(top_builddir)/third-party/libnatpmp/libnatpmp.a \
+     @DHT_LIBS@ \
+     @LIBUTP_LIBS@ \
+
+=== modified file 'libtransmission/Makefile.am'
+--- libtransmission/Makefile.am	2011-10-19 10:26:45 +0000
++++ libtransmission/Makefile.am	2011-10-19 10:37:21 +0000
+@@ -8,6 +8,7 @@
+ AM_CFLAGS = \
+     @DHT_CFLAGS@ \
+     @LIBUTP_CFLAGS@ \
++    @LIBUPNP_CFLAGS@ \
+     @LIBEVENT_CFLAGS@ \
+     @LIBCURL_CFLAGS@ \
+     @OPENSSL_CFLAGS@ \
+@@ -139,7 +140,7 @@
+ 
+ apps_ldadd = \
+     ./libtransmission.a  \
+-    $(top_builddir)/third-party/miniupnp/libminiupnp.a \
++    @LIBUPNP_LIBS@ \
+     $(top_builddir)/third-party/libnatpmp/libnatpmp.a \
+     @INTLLIBS@ \
+     @DHT_LIBS@ \
+
+=== modified file 'libtransmission/upnp.c'
+--- libtransmission/upnp.c	2011-10-19 10:26:45 +0000
++++ libtransmission/upnp.c	2011-10-19 10:37:21 +0000
+@@ -13,8 +13,13 @@
+ #include <assert.h>
+ #include <errno.h>
+ 
++#ifdef SYSTEM_MINIUPNP
++#include <miniupnpc/miniupnpc.h>
++#include <miniupnpc/upnpcommands.h>
++#else
+ #include <miniupnp/miniupnpc.h>
+ #include <miniupnp/upnpcommands.h>
++#endif
+ 
+ #include "transmission.h"
+ #include "port-forwarding.h"
+@@ -97,7 +102,12 @@
+     {
+         struct UPNPDev * devlist;
+         errno = 0;
+-        devlist = upnpDiscover( 2000, NULL, NULL, 0, 0, &errno );
++#ifdef HAVE_MINIUPNP_16
++	devlist = upnpDiscover( 2000, NULL, NULL, 0, 0, &errno );
++#else
++	devlist = upnpDiscover( 2000, NULL, NULL, 0 );
++#endif
++
+         if( devlist == NULL )
+         {
+             tr_ndbg(
+@@ -144,9 +154,17 @@
+ 
+         tr_snprintf( portStr, sizeof( portStr ), "%d", handle->port );
+         if( UPNP_GetSpecificPortMappingEntry( handle->urls.controlURL, handle->data.first.servicetype,
+-            portStr, "TCP", intClient, intPort, NULL, NULL, NULL ) != UPNPCOMMAND_SUCCESS  ||
++#ifdef HAVE_MINIUPNP_16
++	    portStr, "TCP", intClient, intPort, NULL, NULL, NULL ) != UPNPCOMMAND_SUCCESS  ||
++#else 
++	    portStr, "TCP", intClient, intPort ) != UPNPCOMMAND_SUCCESS  ||
++#endif
+             UPNP_GetSpecificPortMappingEntry( handle->urls.controlURL, handle->data.first.servicetype,
++#ifdef HAVE_MINIUPNP_16
+             portStr, "UDP", intClient, intPort, NULL, NULL, NULL ) != UPNPCOMMAND_SUCCESS )
++#else
++	    portStr, "UDP", intClient, intPort ) != UPNPCOMMAND_SUCCESS )
++#endif
+         {
+             tr_ninf( getKey( ), _( "Port %d isn't forwarded" ), handle->port );
+             handle->isMapped = false;
+@@ -198,7 +216,11 @@
+             err_tcp = UPNP_AddPortMapping( handle->urls.controlURL,
+                                        handle->data.first.servicetype,
+                                        portStr, portStr, handle->lanaddr,
++#ifdef HAVE_MINIUPNP_16				       
+                                        desc, "TCP", NULL, NULL );
++#else
++				       desc, "TCP", NULL );
++#endif
+             if( err_tcp )
+                 tr_ndbg( getKey( ), "TCP Port forwarding failed with error %d (errno %d - %s)",
+                          err_tcp, errno, tr_strerror( errno ) );
+@@ -207,7 +229,11 @@
+             err_udp = UPNP_AddPortMapping( handle->urls.controlURL,
+                                        handle->data.first.servicetype,
+                                        portStr, portStr, handle->lanaddr,
++#ifdef HAVE_MINIUPNP_16				       
+                                        desc, "UDP", NULL, NULL );
++#else				       
++				       desc, "UDP", NULL );
++#endif				       
+             if( err_udp )
+                 tr_ndbg( getKey( ), "UDP Port forwarding failed with error %d (errno %d - %s)",
+                          err_udp, errno, tr_strerror( errno ) );
+
+=== modified file 'qt/config.in'
+--- qt/config.in	2011-10-19 10:36:21 +0000
++++ qt/config.in	2011-10-19 10:37:01 +0000
+@@ -1,1 +1,3 @@
+ LIBUTP_LIBS = @LIBUTP_LIBS_QT@
++MINIUPNP_LIBS = @LIBUPNP_LIBS_QT@
++
+
+=== modified file 'qt/qtr.pro'
+--- qt/qtr.pro	2011-10-19 10:36:21 +0000
++++ qt/qtr.pro	2011-10-19 10:37:26 +0000
+@@ -23,7 +23,7 @@
+ LIBS += $${TRANSMISSION_TOP}/libtransmission/libtransmission.a
+ LIBS += $${LIBUTP_LIBS}
+ LIBS += $${TRANSMISSION_TOP}/third-party/dht/libdht.a
+-LIBS += $${TRANSMISSION_TOP}/third-party/miniupnp/libminiupnp.a
++LIBS += $${MINIUPNP_LIBS}
+ LIBS += $${TRANSMISSION_TOP}/third-party/libnatpmp/libnatpmp.a
+ unix: LIBS += -L$${EVENT_TOP}/lib -lz -lrt
+ win32:DEFINES += QT_DBUS
+
+=== modified file 'third-party/Makefile.am'
+--- third-party/Makefile.am	2011-10-19 10:26:45 +0000
++++ third-party/Makefile.am	2011-10-19 10:37:26 +0000
+@@ -1,11 +1,14 @@
+ if BUILD_UTP
+   UTP_DIR = libutp
+ endif
++if BUILD_MINIUPNP
++  MINIUPNP_DIR = miniupnp
++endif
+ 
+ SUBDIRS = \
+   dht \
+   libnatpmp \
+-  miniupnp \
++  $(MINIUPNP_DIR) \
+   $(UTP_DIR)
+ 
+ EXTRA_DIST = \
+
+=== modified file 'utils/Makefile.am'
+--- utils/Makefile.am	2011-10-19 10:26:45 +0000
++++ utils/Makefile.am	2011-10-19 10:37:26 +0000
+@@ -26,7 +26,7 @@
+ 
+ transmission_create_LDADD = \
+     $(top_builddir)/libtransmission/libtransmission.a \
+-    $(top_builddir)/third-party/miniupnp/libminiupnp.a \
++    @LIBUPNP_LIBS@ \
+     $(top_builddir)/third-party/libnatpmp/libnatpmp.a \
+     @INTLLIBS@ \
+     @DHT_LIBS@ \
+

diff --git a/net-p2p/transmission/files/transmission-2.41-no_utp.patch b/net-p2p/transmission/files/transmission-2.41-no_utp.patch
new file mode 100644
index 0000000..afe93fd
--- /dev/null
+++ b/net-p2p/transmission/files/transmission-2.41-no_utp.patch
@@ -0,0 +1,15 @@
+--- a/third-party/libutp/utypes.h	Wed Sep 28 19:46:15 2011
++++ b/third-party/libutp/utypes.h	Wed Sep 28 19:47:06 2011
+@@ -36,7 +36,11 @@ typedef const char * cstr;
+ typedef char * str;
+ 
+ #ifndef __cplusplus
++#ifdef HAVE_STDBOOL_H
++#include <stdbool.h>
++#else
+ typedef uint8 bool;
++#endif
+ #endif
+ 
+ #endif //__UTYPES_H__
+

diff --git a/net-p2p/transmission/files/transmission-daemon.confd.3 b/net-p2p/transmission/files/transmission-daemon.confd.3
new file mode 100644
index 0000000..fcf37c7
--- /dev/null
+++ b/net-p2p/transmission/files/transmission-daemon.confd.3
@@ -0,0 +1,14 @@
+# This is the transmission-daemon configuration file. For other options and
+# better explanation, take a look at transmission-daemon manual page Note: it's
+# better to configure some settings (like username/password) in
+# /var/transmission/config/settings.json to avoid other users see it with `ps`
+
+TRANSMISSION_OPTIONS="--encryption-preferred"
+
+# Run daemon as another user (username or username:groupname)
+# If you change this setting, chown -R /var/transmission/config <and download directory, check web settings>
+#runas_user=transmission
+
+# Location of logfile (should be writeable for runas_user user)
+# Set logfile=syslog to use syslog for logging
+#logfile=/var/log/transmission/transmission.log

diff --git a/net-p2p/transmission/files/transmission-daemon.initd.8 b/net-p2p/transmission/files/transmission-daemon.initd.8
new file mode 100644
index 0000000..1641cce
--- /dev/null
+++ b/net-p2p/transmission/files/transmission-daemon.initd.8
@@ -0,0 +1,73 @@
+#!/sbin/runscript
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/transmission/files/transmission-daemon.initd.8,v 1.1 2011/06/16 09:13:27 pva Exp $
+
+opts="start stop reload"
+description="Transmission is a fast, easy and free bittorrent client"
+description_start="Start transmission-daemon server and web interface"
+description_stop="Stop transmission-daemon server and web interface"
+description_reload="Reload transmission-daemon settings"
+
+rundir=${rundir:-/var/run/transmission}
+pidfile=${pidfile:-${rundir}/transmission.pid}
+config_dir=${config_dir:-/var/transmission/config}
+download_dir=${download_dir:-/var/transmission/downloads}
+logfile=${logfile:-/var/log/transmission/transmission.log}
+runas_user=${runas_user:-transmission:transmission}
+
+SSD_OPTIONS=""
+
+depend() {
+	need net
+}
+
+check_config() {
+	if [ ! -d "${rundir}" ]; then
+		mkdir "${rundir}"
+		if [ -n "${runas_user}" ]; then
+			chown -R ${runas_user} "${rundir}"
+		fi
+	fi
+
+	# In case no config directory option passed use default
+	if ! $(echo ${TRANSMISSION_OPTIONS} | grep -q -e '\B-g' -e '\B--config-dir'); then
+		TRANSMISSION_OPTIONS="${TRANSMISSION_OPTIONS} --config-dir ${config_dir}"
+		# put download dir location on first run (and take it from config later)
+		if [ ! -f ${config_dir}/settings.json ]; then
+			TRANSMISSION_OPTIONS="${TRANSMISSION_OPTIONS} --download-dir ${download_dir}"
+		fi
+	fi
+
+	if [ -n "${runas_user}" ]; then
+		if [ -f /etc/init.d/sysfs ]; then
+			SSD_OPTIONS="${SSD_OPTIONS} --user ${runas_user}"
+		else
+			SSD_OPTIONS="${SSD_OPTIONS} --chuid ${runas_user}"
+		fi
+	fi
+}
+
+start() {
+	check_config
+
+	ebegin "Starting transmission daemon"
+	start-stop-daemon --start --quiet --pidfile ${pidfile} ${SSD_OPTIONS} \
+		--exec /usr/bin/transmission-daemon -- --pid-file ${pidfile} \
+		$(test ${logfile} != "syslog" && echo --logfile ${logfile}) \
+		${TRANSMISSION_OPTIONS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping transmission daemon"
+	start-stop-daemon --stop --quiet --retry TERM/45/QUIT/15 --pidfile ${pidfile}
+	eend $?
+}
+
+reload() {
+	ebegin "Reloading transmission configuration"
+	start-stop-daemon --signal HUP --pidfile ${pidfile}
+	eend $?
+}
+

diff --git a/net-p2p/transmission/transmission-2.41.ebuild b/net-p2p/transmission/transmission-2.41.ebuild
new file mode 100644
index 0000000..2062695
--- /dev/null
+++ b/net-p2p/transmission/transmission-2.41.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/transmission/transmission-2.41.ebuild,v 1.2 2011/10/19 11:49:53 pva Exp $
+
+EAPI=4
+inherit eutils fdo-mime gnome2-utils qt4-r2 autotools
+
+MY_P="${P/_beta/b}"
+
+DESCRIPTION="A Fast, Easy and Free BitTorrent client"
+HOMEPAGE="http://www.transmissionbt.com/"
+SRC_URI="http://download.transmissionbt.com/${PN}/files/${MY_P}.tar.xz"
+
+LICENSE="MIT GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gtk kde nls qt4 utp"
+
+RDEPEND="
+	sys-libs/zlib
+	>=dev-libs/libevent-2.0.10
+	>=dev-libs/openssl-0.9.4
+	|| ( >=net-misc/curl-7.16.3[ssl]
+		>=net-misc/curl-7.16.3[gnutls] )
+	>=net-libs/miniupnpc-1.6
+	gtk? ( >=dev-libs/glib-2.28:2
+		>=x11-libs/gtk+-2.22:2
+		>=dev-libs/dbus-glib-0.70 )
+	qt4? ( x11-libs/qt-gui:4[dbus] )"
+DEPEND="${RDEPEND}
+	>=sys-devel/libtool-2.2.6b
+	nls? ( sys-devel/gettext
+		>=dev-util/intltool-0.40 )
+	dev-util/pkgconfig
+	sys-apps/sed"
+
+S="${WORKDIR}/${MY_P}"
+
+REQUIRED_USE="gtk? ( nls )"
+
+pkg_setup() {
+	enewgroup transmission
+	enewuser transmission -1 -1 -1 transmission
+}
+
+src_prepare() {
+	# Bug #387709, workaround redefines
+	if use !utp; then
+		epatch "${FILESDIR}/${P}-no_utp.patch"
+	fi
+
+	# https://trac.transmissionbt.com/ticket/4323
+	epatch "${FILESDIR}/${PN}-2.33-0001-configure.ac.patch"
+	epatch "${FILESDIR}/${PN}-2.33-0002-config.in-4-qt.pro.patch"
+	epatch "${FILESDIR}/${P}-0003-system-miniupnpc.patch"
+
+	# Upstream is not interested in this: https://trac.transmissionbt.com/ticket/4324
+	sed -e 's|noinst\(_PROGRAMS = $(TESTS)\)|check\1|' -i libtransmission/Makefile.am || die
+
+	eautoreconf
+
+	sed -i -e 's:-ggdb3::g' configure || die
+	# Magnet link support
+	if use kde; then
+		cat > qt/transmission-magnet.protocol <<-EOF
+		[Protocol]
+		exec=transmission-qt '%u'
+		protocol=magnet
+		Icon=transmission
+		input=none
+		output=none
+		helper=true
+		listing=
+		reading=false
+		writing=false
+		makedir=false
+		deleting=false
+		EOF
+	fi
+}
+
+src_configure() {
+	# cli and daemon doesn't have external deps and are enabled by default
+	econf \
+		$(use_enable nls) \
+		$(use_enable utp) \
+		$(use_enable gtk) \
+		--enable-external-miniupnp
+
+	use qt4 && cd qt && eqmake4 qtr.pro
+}
+
+src_compile() {
+	emake
+	use qt4 && cd qt && emake
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	dodoc AUTHORS NEWS qt/README.txt
+	rm -f "${ED}"/usr/share/${PN}/web/LICENSE
+
+	newinitd "${FILESDIR}"/${PN}-daemon.initd.8 ${PN}-daemon
+	newconfd "${FILESDIR}"/${PN}-daemon.confd.3 ${PN}-daemon
+
+	keepdir /var/{transmission/{config,downloads},log/transmission}
+	fowners -R transmission:transmission /var/{transmission/{,config,downloads},log/transmission}
+
+	if use qt4; then
+		cd qt
+		emake INSTALL_ROOT="${D}/usr" install
+		insinto /usr/share/applications/
+		doins transmission-qt.desktop
+		mv icons/transmission{,-qt}.png
+		doicon icons/transmission-qt.png
+		if use kde; then
+			insinto /usr/share/kde4/services/
+			doins transmission-magnet.protocol
+		fi
+	fi
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+
+	ewarn "If you use transmission-daemon, please, set 'rpc-username' and"
+	ewarn "'rpc-password' (in plain text, transmission-daemon will hash it on"
+	ewarn "start) in settings.json file located at /var/transmission/config or"
+	ewarn "any other appropriate config directory."
+	elog
+	elog "To enable sound emerge media-libs/libcanberra and check that at least"
+	elog "some sound them is selected. For this go:"
+	elog "Gnome/system/preferences/sound themes tab and 'sound theme: default'"
+	elog
+	if use utp; then
+		ewarn
+		ewarn "Since uTP is enabled ${PN} needs large kernel buffers for the UDP socket."
+		ewarn "Please, add into /etc/sysctl.conf following lines:"
+		ewarn " net.core.rmem_max = 4194304"
+		ewarn " net.core.wmem_max = 1048576"
+		ewarn "and run sysctl -p"
+	fi
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}