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

(Portage version: 2.1.10.3/cvs/Linux x86_64)

6 files changed, 36 insertions, 5 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/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