Fix build issue when USE=-utp, bug #290737.

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

4 files changed, 31 insertions, 9 deletions

diff --git a/net-p2p/transmission/ChangeLog b/net-p2p/transmission/ChangeLog
index be92306d261d..1a72193d8fe7 100644
--- a/net-p2p/transmission/ChangeLog
+++ b/net-p2p/transmission/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-p2p/transmission
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/transmission/ChangeLog,v 1.158 2011/10/19 11:49:53 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/transmission/ChangeLog,v 1.159 2011/11/26 22:41:25 eva Exp $
+
+  26 Nov 2011; Gilles Dartiguelongue <eva@gentoo.org> transmission-2.41.ebuild,
+  +files/transmission-2.41-noutp.patch:
+  Fix build issue when USE=-utp, bug #290737.
 
   19 Oct 2011; Peter Volkov <pva@gentoo.org> transmission-2.41.ebuild:
   Drop noexistent configure options.
diff --git a/net-p2p/transmission/Manifest b/net-p2p/transmission/Manifest
index 049570f6aee6..b201d4027643 100644
--- a/net-p2p/transmission/Manifest
+++ b/net-p2p/transmission/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 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
@@ -10,6 +10,7 @@ AUX transmission-2.33-0001-configure.ac.patch 1513 RMD160 c55d306b5657a07e71c88e
 AUX transmission-2.33-0002-config.in-4-qt.pro.patch 2434 RMD160 eff545e8416f2bb92035717a35121ecaa0ba089f SHA1 e4470173150fe2b84583e295842e9ad13063ca75 SHA256 41d289f1701606eb337375ddcbc69f9c6b7e3e82d7212d8c3e4ecb4d034f7c46
 AUX transmission-2.33-0003-system-miniupnpc.patch 10483 RMD160 bce3fce6ed161dd476acc24118c29242a3eaecd2 SHA1 8aad4fcc81c67bec5ce50c9b6a7a09c3cfa1e580 SHA256 bedf15cca0b63f97da62dbb1164b432ada1f08d34335feb0ef05d907c9898b16
 AUX transmission-2.41-0003-system-miniupnpc.patch 9639 RMD160 e23714576aa12d6a79ca8ca64793f549cc4d6534 SHA1 1d21efda014426ff4c34a30a7beadf7c730496c2 SHA256 9949347aa2dec92ef73b3dfc00d49618572b397e66d8415cca15933cce2f63f0
+AUX transmission-2.41-noutp.patch 323 RMD160 cc1504552af58a67e3d98ead530bf3fffeb37bd8 SHA1 3f36855323742a920dc25351427a156a73086478 SHA256 d7f3eb4fa094bc1af3a9d83085332523648a5cc7079d99fe2bd2ac5585f0bf20
 AUX transmission-daemon.confd.3 703 RMD160 482953d2bd8e9c69300af3389615764649954a63 SHA1 a4d16dde4e2408b48620cc89c4a8759b042797f2 SHA256 4b47acf195a14a322550cfcaa735a59aac38410d1c2c63ffa824ff131c55ca70
 AUX transmission-daemon.initd.6 2209 RMD160 2ed6f67e83a04eef148b39204dc4a6281bff0680 SHA1 4c6c0ce20d71e398b7254332e3afef6349f1f8a0 SHA256 61ece2b8307b0ee7ce637428f6871176f03873eff1871f34baf8c2627982f36a
 AUX transmission-daemon.initd.7 2196 RMD160 e2a1aa4c2e39fe360d39fa72b16994aecd53485a SHA1 4d7b59f9540cd9045ac00013cd9abb7726f85984 SHA256 0e7268ac3b8ea74afeb1d39871b3e5ee675575c517ebccd1f3ba67340deed6df
@@ -23,13 +24,13 @@ EBUILD transmission-2.31-r1.ebuild 4186 RMD160 b73a2ad82fc17b03adf6f622cf984f061
 EBUILD transmission-2.31.ebuild 3614 RMD160 6aea3b61e03e52aa67dc93a3fad133e9b4804aa1 SHA1 1efec7a48458a81996572e4e18eb9c336a37b66f SHA256 46928432ead81af791d9f5f258d34ec8cfbc767f91dd7b6e458713dfa765fd2f
 EBUILD transmission-2.33-r1.ebuild 4360 RMD160 adde6fb9821b740584a38d2163be3318db8c1d5c SHA1 ce5bb8596dd783762e9534b7029d44e3408eae63 SHA256 e26d046d0076e792889702821c4ef06a6d00d5a5014c8c8613d67cd386238939
 EBUILD transmission-2.33.ebuild 4356 RMD160 f04825ed475243c6a5673ce8e0055665f5c083d3 SHA1 a02e5d5c44f08bbf4a31893a8f5b08516ea061b9 SHA256 30e201d4880d55e6562ed348b5a2a240b0387248a83ee4ee0ad90e62eac5909e
-EBUILD transmission-2.41.ebuild 3865 RMD160 27ff3bd633d15b99513462e171f1630fa5f64586 SHA1 355f814ea58bec492f2be4ceaa991a2ff2032470 SHA256 94a1e85aae95390d5882df3927d103d3fdd1119eb3b3afee9e4bc8f57963d6d9
-MISC ChangeLog 27343 RMD160 9d13151a4a8672298d1dbe1640b691adf6711d4c SHA1 2b2314c3f8676b0be9f1e533f71a7a0fd298d882 SHA256 ca90784d7401bec9709f989012f49c66d1ecb848e328e56ab5cc0f33bc3d8571
+EBUILD transmission-2.41.ebuild 3953 RMD160 8f8ef7aa147d04654413ce4fc62ecddfa53b4de7 SHA1 e4d032dfaf618d6abaf33abb53faf514bb3bcaf3 SHA256 94e57f6e87bec5ba578cda3cbc408d6069a1414218da8fc6ab01ee66e0ee2511
+MISC ChangeLog 27510 RMD160 1f993b747862b8833e3f197f609d1cb34dc6b367 SHA1 bef31b085ecd92e94507a6fb9b2e0f4716093f78 SHA256 6936f7cedd17e3208acefda2f75d29ecf201279e42578ab2614f2422c473e8ee
 MISC metadata.xml 444 RMD160 eb5aae9bdea645819e40b675f8372ded120d5783 SHA1 4b0f30908cea35a0fc8aca9cbe29599a0f833ab4 SHA256 ae66598063f3fa803005a3daf431d4dc4171e6988c38c128e6565910855dfaa9
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk6euPYACgkQGrk+8vGYmwfYqgEAnl3dGrfk4e9SPr4OEMr3u2h+
-nnk5cwYGQsr1EIu33mEA/AtKN+Ikwq3FwfGubj6q6cvp92/wBuZEF+PH063W/rg8
-=iFFw
+iEYEARECAAYFAk7RaxsACgkQ1fmVwcYIWAaiQwCgxCR+YZI/o9Vb7QfJ2pFIjfV8
+uisAmwQv/M8vxZ0mza6IWs52g2qyLgNm
+=4OKK
 -----END PGP SIGNATURE-----
diff --git a/net-p2p/transmission/files/transmission-2.41-noutp.patch b/net-p2p/transmission/files/transmission-2.41-noutp.patch
new file mode 100644
index 000000000000..141102162809
--- /dev/null
+++ b/net-p2p/transmission/files/transmission-2.41-noutp.patch
@@ -0,0 +1,14 @@
+--- 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__
diff --git a/net-p2p/transmission/transmission-2.41.ebuild b/net-p2p/transmission/transmission-2.41.ebuild
index 62d60442840b..701596fc6545 100644
--- a/net-p2p/transmission/transmission-2.41.ebuild
+++ b/net-p2p/transmission/transmission-2.41.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/transmission/transmission-2.41.ebuild,v 1.3 2011/11/26 22:41:25 eva Exp $
 
 EAPI=4
 inherit eutils fdo-mime gnome2-utils qt4-r2 autotools
@@ -49,6 +49,9 @@ src_prepare() {
 	epatch "${FILESDIR}/${PN}-2.33-0002-config.in-4-qt.pro.patch"
 	epatch "${FILESDIR}/${P}-0003-system-miniupnpc.patch"
 
+	# Fix build failure with USE=-utp, bug #290737
+	epatch "${FILESDIR}/${P}-noutp.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