old

(Portage version: 2.2.0_alpha89/cvs/Linux x86_64)

4 files changed, 0 insertions, 414 deletions

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
deleted file mode 100644
index 75e6594962c4..000000000000
--- a/net-p2p/transmission/files/transmission-2.33-0001-configure.ac.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From fc34254a20735efaeb903365e0960d4a009463b3 Mon Sep 17 00:00:00 2001
-From: Peter Volkov <pva@gentoo.org>
-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
deleted file mode 100644
index 106079509f4c..000000000000
--- a/net-p2p/transmission/files/transmission-2.33-0002-config.in-4-qt.pro.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From 9b55e6ce1a98b4c2f32349982d4172d0971601c6 Mon Sep 17 00:00:00 2001
-From: Peter Volkov <pva@gentoo.org>
-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
deleted file mode 100644
index e4b6271ba771..000000000000
--- a/net-p2p/transmission/files/transmission-2.41-0003-system-miniupnpc.patch
+++ /dev/null
@@ -1,281 +0,0 @@
-=== 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-noutp.patch b/net-p2p/transmission/files/transmission-2.41-noutp.patch
deleted file mode 100644
index 141102162809..000000000000
--- a/net-p2p/transmission/files/transmission-2.41-noutp.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- third-party/libutp/utypes.h.orig	Wed Sep 28 19:46:15 2011
-+++ 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__