Don't build tests during normal build. Rename patches.

Package-Manager: portage-2.1.10.3/cvs/Linux x86_64

7 files changed, 42 insertions, 10 deletions

diff --git a/net-p2p/transmission/ChangeLog b/net-p2p/transmission/ChangeLog
index ee05d09f483c..51e06ec7a4d1 100644
--- a/net-p2p/transmission/ChangeLog
+++ b/net-p2p/transmission/ChangeLog
@@ -1,6 +1,17 @@
 # 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.153 2011/06/16 09:13:27 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/transmission/ChangeLog,v 1.154 2011/06/16 09:30:23 pva Exp $
+
+  16 Jun 2011; Peter Volkov <pva@gentoo.org>
+  -files/0001-configure.ac-Drop-redudant-code-indentation.patch,
+  -files/0002-Add-qt-config-to-make-qmake-aware-about-.-configure-.patch,
+  -files/0003-Allow-usage-of-system-miniupnp.-Rename-miniupnp-mini.patch,
+  transmission-2.31-r1.ebuild,
+  +files/transmission-2.31-0001-configure.ac.patch,
+  +files/transmission-2.31-0002-config.in-4-qt.pro.patch,
+  +files/transmission-2.31-0003-system-miniupnpc.patch,
+  +files/transmission-2.31-no-tests.patch:
+  Don't build tests during normal build. Rename patches.
 
 *transmission-2.31-r1 (16 Jun 2011)
 
diff --git a/net-p2p/transmission/Manifest b/net-p2p/transmission/Manifest
index 62ac74b7b6e9..38f76ad2d675 100644
--- a/net-p2p/transmission/Manifest
+++ b/net-p2p/transmission/Manifest
@@ -1,6 +1,7 @@
-AUX 0001-configure.ac-Drop-redudant-code-indentation.patch 1513 RMD160 dc538328560cc1d470bdd33b5f26989b95b035e5 SHA1 26392849d5284a30174506d343f87f1404e4211b SHA256 d7cb0336a665d1ce1728cd07f6920e991eece9e6bc3eb7c84e1ae9209bd57d22
-AUX 0002-Add-qt-config-to-make-qmake-aware-about-.-configure-.patch 2434 RMD160 364eca9a6144e53a7208da1c0b17f11b13b7a27f SHA1 850eb2e80518be9b04312369980830f5635bcc34 SHA256 fca9ebed543990728b6884b9249ab86023bee7da4fe77d1b206d46413af54210
-AUX 0003-Allow-usage-of-system-miniupnp.-Rename-miniupnp-mini.patch 22326 RMD160 9042f531db97c5caec503ef8a560ad172d0fb922 SHA1 7fd5b162da193a1b4abd029756c676a40bd9c66d SHA256 79c2128a2e399d8cad19a885a7cc3c12b09d9cd3cdbff83c2aa07eb1d3e8ce10
+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
+AUX transmission-2.31-0003-system-miniupnpc.patch 22326 RMD160 9042f531db97c5caec503ef8a560ad172d0fb922 SHA1 7fd5b162da193a1b4abd029756c676a40bd9c66d SHA256 79c2128a2e399d8cad19a885a7cc3c12b09d9cd3cdbff83c2aa07eb1d3e8ce10
+AUX transmission-2.31-no-tests.patch 504 RMD160 fd879a84f39348acb3700bd52f6bc08a9d8c0beb SHA1 8a18d36b406fb247a0b18a88f03f513e0ee594fa SHA256 eb344007d9da9e8060690df9bc50bc020ff6d749eab90707421af451b51b05bc
 AUX transmission-2.31-qt-libutp.patch 707 RMD160 cf81e7cd4361e09ef1d4cdfcb75e2e2c40d4582b SHA1 99dc8c8b0ab96c85ff6e0f42c2e31c40975d3f71 SHA256 475c085ef50fe4c0a1634530f57feca39d6285ed2cd63d13a7018a4f49caed12
 AUX transmission-daemon.confd.3 703 RMD160 482953d2bd8e9c69300af3389615764649954a63 SHA1 a4d16dde4e2408b48620cc89c4a8759b042797f2 SHA256 4b47acf195a14a322550cfcaa735a59aac38410d1c2c63ffa824ff131c55ca70
 AUX transmission-daemon.initd.6 2209 RMD160 2ed6f67e83a04eef148b39204dc4a6281bff0680 SHA1 4c6c0ce20d71e398b7254332e3afef6349f1f8a0 SHA256 61ece2b8307b0ee7ce637428f6871176f03873eff1871f34baf8c2627982f36a
@@ -9,7 +10,7 @@ AUX transmission-daemon.initd.8 2235 RMD160 2848770ae93c597ea5cd6e8d22857bb99578
 DIST transmission-2.22.tar.bz2 4802843 RMD160 e87b560f81fc8bc422dc7071a4b27bdcf2b2d6ac SHA1 ddd515bdcc201193b45f58b705f6e8fde9fcb5d1 SHA256 5a4079194f45260c143f21ea6f33ce2660d89fca02ad8f1e65169968d365e4d4
 DIST transmission-2.31.tar.xz 2558880 RMD160 e777e32e5d02e8a93a64e4821ea0f9ccd8724f2c SHA1 84cfbc4e6a8db437d3c5b7eb983ce763b2879b62 SHA256 82cd04c93c65df818d38dcec154f5864520ab3147fac372e11d8e9d12506deba
 EBUILD transmission-2.22.ebuild 3905 RMD160 fa3fb412e80762df5ea9f586e306d3d78f7940a2 SHA1 c8abfcb6c950ebe7946b912fc5246d6f950f7bd1 SHA256 bc88d99b145cd04958b0b7c34533e2e730a247d3b87423010886178e542b0a4d
-EBUILD transmission-2.31-r1.ebuild 4230 RMD160 193a478584e298362eaca9cdb653dbeccc1be1d5 SHA1 8958ee2b9d4160b7d59f61ffad2cb25dd7678998 SHA256 f26af441db2f61811eee853076d44f6382360ec92ae758e8db461a3f76b877f8
+EBUILD transmission-2.31-r1.ebuild 4186 RMD160 b73a2ad82fc17b03adf6f622cf984f0616d467f9 SHA1 34e11a0f03e0d1623f2e8d2a5ff1fd5d51f748fe SHA256 988da632a1b272360ba679091dc9b7764e8033cd4b765ae7fa36b6e17589c9c4
 EBUILD transmission-2.31.ebuild 3614 RMD160 6aea3b61e03e52aa67dc93a3fad133e9b4804aa1 SHA1 1efec7a48458a81996572e4e18eb9c336a37b66f SHA256 46928432ead81af791d9f5f258d34ec8cfbc767f91dd7b6e458713dfa765fd2f
-MISC ChangeLog 25775 RMD160 1134d8bef2a3e229cf1cfa01cd77ca0a5bc683a7 SHA1 b3e31289983834ef2e4d52077d64b9995c3d7e89 SHA256 544fc45b2520903a8a722435b4282f1f37a18cbe936e91a607b66a5556fdde5a
+MISC ChangeLog 26331 RMD160 39c113180a63312c73d8fcf2ec65c00754b9c9a6 SHA1 59e578e882fd5e4ca0e75529b33f788a26c8a429 SHA256 741bac81f7ea0b28bc7bf59d6624ef6080358775205329a4294af83acebcabf5
 MISC metadata.xml 444 RMD160 eb5aae9bdea645819e40b675f8372ded120d5783 SHA1 4b0f30908cea35a0fc8aca9cbe29599a0f833ab4 SHA256 ae66598063f3fa803005a3daf431d4dc4171e6988c38c128e6565910855dfaa9
diff --git a/net-p2p/transmission/files/0001-configure.ac-Drop-redudant-code-indentation.patch b/net-p2p/transmission/files/transmission-2.31-0001-configure.ac.patch
index 1ccaf4392559..1ccaf4392559 100644
--- a/net-p2p/transmission/files/0001-configure.ac-Drop-redudant-code-indentation.patch
+++ b/net-p2p/transmission/files/transmission-2.31-0001-configure.ac.patch
diff --git a/net-p2p/transmission/files/0002-Add-qt-config-to-make-qmake-aware-about-.-configure-.patch b/net-p2p/transmission/files/transmission-2.31-0002-config.in-4-qt.pro.patch
index eeef9d87e8a2..eeef9d87e8a2 100644
--- a/net-p2p/transmission/files/0002-Add-qt-config-to-make-qmake-aware-about-.-configure-.patch
+++ b/net-p2p/transmission/files/transmission-2.31-0002-config.in-4-qt.pro.patch
diff --git a/net-p2p/transmission/files/0003-Allow-usage-of-system-miniupnp.-Rename-miniupnp-mini.patch b/net-p2p/transmission/files/transmission-2.31-0003-system-miniupnpc.patch
index 6a022f8c2782..6a022f8c2782 100644
--- a/net-p2p/transmission/files/0003-Allow-usage-of-system-miniupnp.-Rename-miniupnp-mini.patch
+++ b/net-p2p/transmission/files/transmission-2.31-0003-system-miniupnpc.patch
diff --git a/net-p2p/transmission/files/transmission-2.31-no-tests.patch b/net-p2p/transmission/files/transmission-2.31-no-tests.patch
new file mode 100644
index 000000000000..d4a7e2fafc6a
--- /dev/null
+++ b/net-p2p/transmission/files/transmission-2.31-no-tests.patch
@@ -0,0 +1,19 @@
+commit b46cac3a9fb95fa6edd6f18c82b7738ab81c062d
+Author: Peter Volkov <pva@gentoo.org>
+Date:   Thu Jun 16 13:21:12 2011 +0400
+
+    Don't build programs required for tests.
+
+diff --git a/libtransmission/Makefile.am b/libtransmission/Makefile.am
+index a68349b..656f8aa 100644
+--- a/libtransmission/Makefile.am
++++ b/libtransmission/Makefile.am
+@@ -133,7 +133,7 @@ TESTS = \
+     test-peer-id \
+     utils-test
+ 
+-noinst_PROGRAMS = $(TESTS)
++check_PROGRAMS = $(TESTS)
+ 
+ apps_ldflags = \
+     @ZLIB_LDFLAGS@
diff --git a/net-p2p/transmission/transmission-2.31-r1.ebuild b/net-p2p/transmission/transmission-2.31-r1.ebuild
index 38b8e88eba97..c8dcd13b85c0 100644
--- a/net-p2p/transmission/transmission-2.31-r1.ebuild
+++ b/net-p2p/transmission/transmission-2.31-r1.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.31-r1.ebuild,v 1.1 2011/06/16 09:13:27 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/transmission/transmission-2.31-r1.ebuild,v 1.2 2011/06/16 09:30:23 pva Exp $
 
 EAPI=4
 inherit eutils fdo-mime gnome2-utils qt4-r2 autotools
@@ -47,9 +47,10 @@ pkg_setup() {
 
 src_prepare() {
 	epatch "${FILESDIR}/${P}-qt-libutp.patch" #368187
-	epatch "${FILESDIR}/0001-configure.ac-Drop-redudant-code-indentation.patch"
-	epatch "${FILESDIR}/0002-Add-qt-config-to-make-qmake-aware-about-.-configure-.patch"
-	epatch "${FILESDIR}/0003-Allow-usage-of-system-miniupnp.-Rename-miniupnp-mini.patch"
+	epatch "${FILESDIR}/${P}-0001-configure.ac.patch"
+	epatch "${FILESDIR}/${P}-0002-config.in-4-qt.pro.patch"
+	epatch "${FILESDIR}/${P}-0003-system-miniupnpc.patch"
+	epatch "${FILESDIR}/${P}-no-tests.patch"
 	mv third-party/miniupnp{,c} || die
 	eautoreconf