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

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

[Jory Pratt]

commit:     448be1652e804e86b80c045792548612f255c80f
Author:     Jory A. Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 31 14:51:13 2011 +0000
Commit:     Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Mon Oct 31 14:51:13 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/anarchy.git;a=commit;h=448be165

apply patch unconditionally

---
 net-p2p/transmission/Manifest                 |    2 +-
 net-p2p/transmission/transmission-2.41.ebuild |    8 +++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/net-p2p/transmission/Manifest b/net-p2p/transmission/Manifest
index f9a4f11..423be2a 100644
--- a/net-p2p/transmission/Manifest
+++ b/net-p2p/transmission/Manifest
@@ -5,4 +5,4 @@ AUX transmission-2.41-no_utp.patch 323 RMD160 120286fa0b4a9ba3cbcc5577fd2c7fe932
 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
+EBUILD transmission-2.41.ebuild 3934 RMD160 43195f95d853beba97fb9433ab83f9643affca97 SHA1 e8fd9443882a0b91fc1033779718d9bfc364de9a SHA256 a7c88304989c0595279fe3cc973f5462bace7b735ef995f32105903ce7c647c9

diff --git a/net-p2p/transmission/transmission-2.41.ebuild b/net-p2p/transmission/transmission-2.41.ebuild
index 2062695..26e7774 100644
--- a/net-p2p/transmission/transmission-2.41.ebuild
+++ b/net-p2p/transmission/transmission-2.41.ebuild
@@ -44,16 +44,14 @@ pkg_setup() {
 }
 
 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"
 
+	# Bug #387709 upstream fix
+	epatch "${FILESDIR}/${P}-no_utp.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