Remove bad patch due to cvs keyword substitution.

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

3 files changed, 10 insertions, 277 deletions

diff --git a/net-p2p/transmission/ChangeLog b/net-p2p/transmission/ChangeLog
index 573aa0ca8341..8fc404b25b59 100644
--- a/net-p2p/transmission/ChangeLog
+++ b/net-p2p/transmission/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-p2p/transmission
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/transmission/ChangeLog,v 1.163 2012/01/25 14:33:01 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/transmission/ChangeLog,v 1.164 2012/01/26 00:09:52 floppym Exp $
+
+  26 Jan 2012; Mike Gilbert <floppym@gentoo.org>
+  -files/transmission-2.42-natpmp-system.patch:
+  Remove bad patch due to cvs keyword substitution.
 
 *transmission-2.42 (25 Jan 2012)
 
diff --git a/net-p2p/transmission/Manifest b/net-p2p/transmission/Manifest
index 55834bfbeac6..d43bddc11b92 100644
--- a/net-p2p/transmission/Manifest
+++ b/net-p2p/transmission/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX transmission-2.31-0001-configure.ac.patch 1513 RMD160 dc538328560cc1d470bdd33b5f26989b95b035e5 SHA1 26392849d5284a30174506d343f87f1404e4211b SHA256 d7cb0336a665d1ce1728cd07f6920e991eece9e6bc3eb7c84e1ae9209bd57d22
 AUX transmission-2.31-0002-config.in-4-qt.pro.patch 2434 RMD160 364eca9a6144e53a7208da1c0b17f11b13b7a27f SHA1 850eb2e80518be9b04312369980830f5635bcc34 SHA256 fca9ebed543990728b6884b9249ab86023bee7da4fe77d1b206d46413af54210
@@ -14,7 +14,6 @@ AUX transmission-2.41-noutp.patch 323 RMD160 cc1504552af58a67e3d98ead530bf3fffeb
 AUX transmission-2.42-0001-configure.ac.patch 1211 RMD160 f712539374b80d4042bfa03a269f78ccfcbe5d86 SHA1 fcd7873cbec8329cb4d684d1683ceeefa5acd7f6 SHA256 e65929a083685ec99db29a1b64ac2cb07197de85beeaed83f805f7351e291eb5
 AUX transmission-2.42-0003-system-miniupnpc.patch 6850 RMD160 23fea4e81b482ab1915043479f261176203a2796 SHA1 1f6b43aee2edd7cfc89bb9ed51e3d256909d85e8 SHA256 e03d95e13af1a2bdcb6137845336d7e8aab3ac2c96976cfae8bf8c3f11a50bde
 AUX transmission-2.42-0005-build-with-natpmp1.patch 591 RMD160 d36754ac843e24e1b1d5b2c7fe4acee98e7bae6f SHA1 272be3b176ad9e225af5b872d45569ee2876e14d SHA256 bd22f3a9fe950f222387723fc90225854afc7079a6030ae08447447b362b63e5
-AUX transmission-2.42-natpmp-system.patch 9261 RMD160 6c4239cc349a82101a2a244b981db67b580d5e82 SHA1 6acc52fe82c0a833bade2e25b3d7917a4d994dac SHA256 d47de749bc0408f2e94d3ccbb4ec889c07c856a1d2c5496049ed145022dd44f7
 AUX transmission-2.42-respect-cflags.patch 905 RMD160 8a8832dc3bbf2ee2c3f5a72c7529cd8aefc91c21 SHA1 fb1e4bef42b85e05b782c2012abcb47b372fb585 SHA256 0c7a06c158b22a44bb0c0b2c646e147472a039e7171c94b6f3c6a0d6c346be87
 AUX transmission-daemon.confd.3 703 RMD160 482953d2bd8e9c69300af3389615764649954a63 SHA1 a4d16dde4e2408b48620cc89c4a8759b042797f2 SHA256 4b47acf195a14a322550cfcaa735a59aac38410d1c2c63ffa824ff131c55ca70
 AUX transmission-daemon.initd.6 2221 RMD160 4283421f0e0794161c07544b2dd87a960585d3d8 SHA1 e249a01c7e6e7c909d56be7c704d3b3567e6e85c SHA256 85f41c6f2ab1a13667d8b1db343ac8864aa92c4d064d1782f2033a5abec70e00
@@ -32,22 +31,12 @@ EBUILD transmission-2.33-r1.ebuild 4360 RMD160 adde6fb9821b740584a38d2163be3318d
 EBUILD transmission-2.33.ebuild 4356 RMD160 f04825ed475243c6a5673ce8e0055665f5c083d3 SHA1 a02e5d5c44f08bbf4a31893a8f5b08516ea061b9 SHA256 30e201d4880d55e6562ed348b5a2a240b0387248a83ee4ee0ad90e62eac5909e
 EBUILD transmission-2.41.ebuild 4088 RMD160 acefdcf1f9cc71d3df8bbb9c33e4b9bee11b408f SHA1 a6eeaa8aa734d7fb9d0475dd44bd9d208874ebfb SHA256 500728a16fe5a8872d02015aea9e61608f7dfc501b1021180308e580d25da5d1
 EBUILD transmission-2.42.ebuild 4626 RMD160 0a13ca4e5b01f72c76fdfbd9213e97616f0d0b47 SHA1 7b8222ed6d28eba68ea09f02c009483e16d17714 SHA256 7db456457eada21868d9a3619a2107a0bfed0e3357364328d7927b8c497ee3cc
-MISC ChangeLog 28523 RMD160 f158adeeaf7b3f8ba8446596b3effb5c489e5d84 SHA1 00babe0c16bf3e7485d7a3800ef2bf5a1a0b9071 SHA256 fade9641448244e2cad47cf1cf72e8312a0eb447156e44d511ff255f785cc3cd
+MISC ChangeLog 28671 RMD160 18351655bea67dc63a8f49ac9dfbdadfbcfed115 SHA1 4116cafeba4e84d253dedd3c18b0e2f92ec0c620 SHA256 0ad708e0263c2bf138d520b4a6e5fbdaab91ddaffecf6a574b90468695800deb
 MISC metadata.xml 511 RMD160 b11330845a7f696e355443d7d9bb98e96c12c1b7 SHA1 5fed92119a7effcdfc3705666ff47fbb321c4cc6 SHA256 769efb2c32743c91a234a50929d223b5831e5406d3ae1c624e4356f0218d01b3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPIBNLAAoJEOSiRoyO7jvotSQP+gIb328sKb2Z3GNKDx/wTzpO
-84XfBEP+NCDBLJ7sZuksgeyKe3vEQnjieRQRQ46mu9oteRUsAeoUrkRvDvQP1qcu
-aIuSn5VWdONCZwQIXxyW7yLaxn32Sj6gY9aImYOA9saO5E47lpfnS/Xozg98TYVM
-GHdERXIP0Jlt1Oab2M2Yr/GtpPYjuho0jn4UHJr9dpxk/Qir+QK9V67LrNJ3jJhW
-Xtb1aO8cUGD+eTYZg/aBIeBNiLJcojM83d0QiyFXlaSKviGg/unXsqCh05h5rD/s
-W66E+abBAuSWjsaTdl5/l43ml7BENM3/i0LjEI0mGCB2tSOqK3DB1yRmmFmDB0xN
-+nDePtTHzDKbwvDR1o1tfhFAj0slLXzHt6YipImKqQVzmlixPmPfhoCdz2pPoPlg
-zA1pOZLSy+WS0zlku0VLoNkRguH+s0+S776WONbz/oCLXqL3p3u1nRYmYUGYoun5
-s45gfSqZgVpSvbskVy4//bG6OfOajQAP0lXHppUC387Fpve7IhaAqinZyoWGf0G2
-VRksLh746mYsOtbgosIQRmbjfpz9aQseFUWM6pyvJVda11JBt2qqQt7RK2hpadR1
-OTRSGrH3Iw5q17kuqH/RwqcFgY851dxw/bxJ9i0EUDkWi3IsBg+p7pTQoLvIq/VD
-WVfeelu8p9y9KNC3sIEx
-=pWRS
+iF4EAREIAAYFAk8gmdUACgkQC77qH+pIQ6S1LQEAydZZnou0w2kn9q8vB0OG0jOd
+t+lBwdEDLZaKgFuRl60A/2jTtEmLw+ONYuVQc7Vcmt8x1oi/PNObjnoxu0F+YUks
+=XqbF
 -----END PGP SIGNATURE-----
diff --git a/net-p2p/transmission/files/transmission-2.42-natpmp-system.patch b/net-p2p/transmission/files/transmission-2.42-natpmp-system.patch
deleted file mode 100644
index cdf1872d7131..000000000000
--- a/net-p2p/transmission/files/transmission-2.42-natpmp-system.patch
+++ /dev/null
@@ -1,260 +0,0 @@
-diff -urN transmission-2.42.old/cli/Makefile.am transmission-2.42/cli/Makefile.am
---- transmission-2.42.old/cli/Makefile.am	2012-01-25 12:30:32.737406480 +0100
-+++ transmission-2.42/cli/Makefile.am	2012-01-25 15:25:14.903209957 +0100
-@@ -19,7 +19,7 @@
- transmission_cli_LDADD = \
-     $(top_builddir)/libtransmission/libtransmission.a \
-     @LIBUPNP_LIBS@ \
--    $(top_builddir)/third-party/libnatpmp/libnatpmp.a \
-+    @LIBNATPMP_LIBS@ \
-     @DHT_LIBS@ \
-     @LIBUTP_LIBS@ \
-     @LIBEVENT_LIBS@ \
-diff -urN transmission-2.42.old/configure.ac transmission-2.42/configure.ac
---- transmission-2.42.old/configure.ac	2012-01-25 12:30:32.742406446 +0100
-+++ transmission-2.42/configure.ac	2012-01-25 14:45:14.264515474 +0100
-@@ -302,6 +302,29 @@
- AC_SUBST(LIBUPNP_CFLAGS)
- AC_SUBST(LIBUPNP_LIBS)
- AC_SUBST(LIBUPNP_LIBS_QT)
-+
-+dnl ----------------------------------------------------------------------------
-+dnl
-+dnl  Allow usage of system natpmp library
-+LIBNATPMP_CFLAGS="-I\$(top_srcdir)/third-party/libnatpmp/"
-+LIBNATPMP_LIBS="\$(top_builddir)/third-party/natpmp/libnatpmp.a"
-+LIBNATPMP_LIBS_QT="\$\${TRANSMISSION_TOP}/third-party/natpmp/libnatpmp.a"
-+build_bundled_natpmp="yes"
-+AC_ARG_ENABLE([external-natpmp],
-+              AS_HELP_STRING([--enable-external-natpmp],[Use system external-natpmp]),
-+              [want_external_natpmp=${enableval}],
-+              [want_external_natpmp=no])
-+if test "x$want_external_natpmp" != "xno" ; then
-+        dnl Would be lovely if it had pkgconfig
-+        LIBNATPMP_CFLAGS="" 
-+        LIBNATPMP_LIBS="-lnatpmp"
-+        LIBNATPMP_LIBS_QT="-lnatpmp"
-+        build_bundled_natpmp="no"
-+fi
-+AM_CONDITIONAL([BUILD_NATPMP],[test "x$build_bundled_natpmp" = "xyes"])
-+AC_SUBST(LIBNATPMP_CFLAGS)
-+AC_SUBST(LIBNATPMP_LIBS)
-+AC_SUBST(LIBNATPMP_LIBS_QT)
- dnl ----------------------------------------------------------------------------
- dnl
- dnl  detection for the GTK+ client
-diff -urN transmission-2.42.old/daemon/Makefile.am transmission-2.42/daemon/Makefile.am
---- transmission-2.42.old/daemon/Makefile.am	2012-01-25 12:30:32.742406446 +0100
-+++ transmission-2.42/daemon/Makefile.am	2012-01-25 12:48:10.476222152 +0100
-@@ -21,7 +21,7 @@
- LDADD = \
-     $(top_builddir)/libtransmission/libtransmission.a \
-     @LIBUPNP_LIBS@ \
--    $(top_builddir)/third-party/libnatpmp/libnatpmp.a \
-+    @LIBNATPMP_LIBS@ \
-     @DHT_LIBS@ \
-     @LIBUTP_LIBS@ \
-     @LIBEVENT_LIBS@ \
-diff -urN transmission-2.42.old/gtk/Makefile.am transmission-2.42/gtk/Makefile.am
---- transmission-2.42.old/gtk/Makefile.am	2012-01-25 12:30:32.742406446 +0100
-+++ transmission-2.42/gtk/Makefile.am	2012-01-25 14:46:46.797886956 +0100
-@@ -85,7 +85,7 @@
- transmission_gtk_LDADD = \
-     $(top_builddir)/libtransmission/libtransmission.a \
-     @LIBUPNP_LIBS@ \
--    $(top_builddir)/third-party/libnatpmp/libnatpmp.a \
-+    @LIBNATPMP_LIBS@ \
-     @DHT_LIBS@ \
-     @LIBUTP_LIBS@ \
-     @GTK_LIBS@ \
-diff -urN transmission-2.42.old/libtransmission/Makefile.am transmission-2.42/libtransmission/Makefile.am
---- transmission-2.42.old/libtransmission/Makefile.am	2012-01-25 12:30:32.739406466 +0100
-+++ transmission-2.42/libtransmission/Makefile.am	2012-01-25 15:10:54.507053909 +0100
-@@ -1,7 +1,5 @@
- AM_CPPFLAGS = \
--    -I. \
-     -I$(top_srcdir) \
--    -I$(top_srcdir)/third-party/ \
-     -D__TRANSMISSION__ \
-     -DPACKAGE_DATA_DIR=\""$(datadir)"\"
- 
-@@ -9,6 +7,7 @@
-     @DHT_CFLAGS@ \
-     @LIBUTP_CFLAGS@ \
-     @LIBUPNP_CFLAGS@ \
-+    @LIBNATPMP_CFLAGS@ \
-     @LIBEVENT_CFLAGS@ \
-     @LIBCURL_CFLAGS@ \
-     @OPENSSL_CFLAGS@ \
-@@ -91,7 +90,7 @@
-     magnet.h \
-     makemeta.h \
-     metainfo.h \
--    natpmp.h \
-+    natpmp_local.h \
-     net.h \
-     peer-common.h \
-     peer-io.h \
-@@ -141,7 +140,7 @@
- apps_ldadd = \
-     ./libtransmission.a  \
-     @LIBUPNP_LIBS@ \
--    $(top_builddir)/third-party/libnatpmp/libnatpmp.a \
-+    @LIBNATPMP_LIBS@ \
-     @INTLLIBS@ \
-     @DHT_LIBS@ \
-     @LIBUTP_LIBS@ \
-diff -urN transmission-2.42.old/libtransmission/natpmp.c transmission-2.42/libtransmission/natpmp.c
---- transmission-2.42.old/libtransmission/natpmp.c	2012-01-25 12:30:32.739406466 +0100
-+++ transmission-2.42/libtransmission/natpmp.c	2012-01-25 15:11:10.186947403 +0100
-@@ -17,10 +17,10 @@
- #include <event2/util.h> /* evutil_inet_ntop() */
- 
- #define ENABLE_STRNATPMPERR
--#include <libnatpmp/natpmp.h>
-+#include "natpmp.h"
- 
- #include "transmission.h"
--#include "natpmp.h"
-+#include "natpmp_local.h"
- #include "net.h" /* tr_netCloseSocket */
- #include "port-forwarding.h"
- #include "utils.h"
-diff -urN transmission-2.42.old/libtransmission/natpmp.h transmission-2.42/libtransmission/natpmp.h
---- transmission-2.42.old/libtransmission/natpmp.h	2012-01-25 12:30:32.739406466 +0100
-+++ transmission-2.42/libtransmission/natpmp.h	1970-01-01 01:00:00.000000000 +0100
-@@ -1,34 +0,0 @@
--/*
-- * This file Copyright (C) Mnemosyne LLC
-- *
-- * This file is licensed by the GPL version 2. Works owned by the
-- * Transmission project are granted a special exemption to clause 2(b)
-- * so that the bulk of its code can remain under the MIT license.
-- * This exemption does not extend to derived works not owned by
-- * the Transmission project.
-- *
-- * $Id: natpmp.h 12204 2011-03-22 15:19:54Z jordan $
-- */
--
--#ifndef __TRANSMISSION__
--#error only libtransmission should #include this header.
--#endif
--
--#ifndef TR_NATPMP_H
--#define TR_NATPMP_H 1
--
--/**
-- * @addtogroup port_forwarding Port Forwarding
-- * @{
-- */
--
--typedef struct tr_natpmp tr_natpmp;
--
--tr_natpmp * tr_natpmpInit( void );
--
--void tr_natpmpClose( tr_natpmp * );
--
--int tr_natpmpPulse( tr_natpmp *, tr_port port, bool isEnabled, tr_port * public_port );
--
--/* @} */
--#endif
-diff -urN transmission-2.42.old/libtransmission/natpmp_local.h transmission-2.42/libtransmission/natpmp_local.h
---- transmission-2.42.old/libtransmission/natpmp_local.h	1970-01-01 01:00:00.000000000 +0100
-+++ transmission-2.42/libtransmission/natpmp_local.h	2012-01-25 12:27:55.513474369 +0100
-@@ -0,0 +1,34 @@
-+/*
-+ * This file Copyright (C) Mnemosyne LLC
-+ *
-+ * This file is licensed by the GPL version 2. Works owned by the
-+ * Transmission project are granted a special exemption to clause 2(b)
-+ * so that the bulk of its code can remain under the MIT license.
-+ * This exemption does not extend to derived works not owned by
-+ * the Transmission project.
-+ *
-+ * $Id: natpmp.h 12204 2011-03-22 15:19:54Z jordan $
-+ */
-+
-+#ifndef __TRANSMISSION__
-+#error only libtransmission should #include this header.
-+#endif
-+
-+#ifndef TR_NATPMP_H
-+#define TR_NATPMP_H 1
-+
-+/**
-+ * @addtogroup port_forwarding Port Forwarding
-+ * @{
-+ */
-+
-+typedef struct tr_natpmp tr_natpmp;
-+
-+tr_natpmp * tr_natpmpInit( void );
-+
-+void tr_natpmpClose( tr_natpmp * );
-+
-+int tr_natpmpPulse( tr_natpmp *, tr_port port, bool isEnabled, tr_port * public_port );
-+
-+/* @} */
-+#endif
-diff -urN transmission-2.42.old/libtransmission/port-forwarding.c transmission-2.42/libtransmission/port-forwarding.c
---- transmission-2.42.old/libtransmission/port-forwarding.c	2012-01-25 12:30:32.739406466 +0100
-+++ transmission-2.42/libtransmission/port-forwarding.c	2012-01-25 15:19:34.684520801 +0100
-@@ -18,7 +18,7 @@
- #include <event2/event.h>
- 
- #include "transmission.h"
--#include "natpmp.h"
-+#include "natpmp_local.h"
- #include "net.h"
- #include "peer-mgr.h"
- #include "port-forwarding.h"
-diff -urN transmission-2.42.old/qt/config.in transmission-2.42/qt/config.in
---- transmission-2.42.old/qt/config.in	2012-01-25 12:30:32.741406452 +0100
-+++ transmission-2.42/qt/config.in	2012-01-25 14:47:43.390502589 +0100
-@@ -1,3 +1,4 @@
- LIBUTP_LIBS = @LIBUTP_LIBS_QT@
- MINIUPNP_LIBS = @LIBUPNP_LIBS_QT@
-+NATPNP_LIBS = @LIBNATPNP_LIBS_QT@
- 
-diff -urN transmission-2.42.old/qt/qtr.pro transmission-2.42/qt/qtr.pro
---- transmission-2.42.old/qt/qtr.pro	2012-01-25 12:30:32.742406446 +0100
-+++ transmission-2.42/qt/qtr.pro	2012-01-25 14:47:32.270578114 +0100
-@@ -24,7 +24,7 @@
- LIBS += $${LIBUTP_LIBS}
- LIBS += $${TRANSMISSION_TOP}/third-party/dht/libdht.a
- LIBS += $${MINIUPNP_LIBS}
--LIBS += $${TRANSMISSION_TOP}/third-party/libnatpmp/libnatpmp.a
-+LIBS += $${NATPNP_LIBS}
- unix: LIBS += -L$${EVENT_TOP}/lib -lz -lrt
- win32:DEFINES += QT_DBUS
- win32:LIBS += -levent-2.0 -lws2_32 -lintl
-diff -urN transmission-2.42.old/third-party/Makefile.am transmission-2.42/third-party/Makefile.am
---- transmission-2.42.old/third-party/Makefile.am	2012-01-25 12:30:32.702406719 +0100
-+++ transmission-2.42/third-party/Makefile.am	2012-01-25 14:45:04.312583068 +0100
-@@ -4,10 +4,13 @@
- if BUILD_MINIUPNP
-   MINIUPNP_DIR = miniupnp
- endif
-+if BUILD_NATPMP
-+  NATPMP_DIR = libnatpmp
-+endif
- 
- SUBDIRS = \
-   dht \
--  libnatpmp \
-+  $(NATPMP_DIR) \
-   $(MINIUPNP_DIR) \
-   $(UTP_DIR)
- 
-diff -urN transmission-2.42.old/utils/Makefile.am transmission-2.42/utils/Makefile.am
---- transmission-2.42.old/utils/Makefile.am	2012-01-25 12:30:32.744406434 +0100
-+++ transmission-2.42/utils/Makefile.am	2012-01-25 12:48:14.787192871 +0100
-@@ -27,7 +27,7 @@
- transmission_create_LDADD = \
-     $(top_builddir)/libtransmission/libtransmission.a \
-     @LIBUPNP_LIBS@ \
--    $(top_builddir)/third-party/libnatpmp/libnatpmp.a \
-+    @LIBNATPMP_LIBS@ \
-     @INTLLIBS@ \
-     @DHT_LIBS@ \
-     @LIBUTP_LIBS@ \