Disable functional tests that require network connection and rely on 3rd party external server (bug #341267).

Package-Manager: portage-2.2_rc97/cvs/Linux x86_64

4 files changed, 37 insertions, 11 deletions

diff --git a/dev-libs/qoauth/ChangeLog b/dev-libs/qoauth/ChangeLog
index 54c84e77005f..813d8e5a8945 100644
--- a/dev-libs/qoauth/ChangeLog
+++ b/dev-libs/qoauth/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/qoauth
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/qoauth/ChangeLog,v 1.9 2010/10/16 10:19:51 ayoy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/qoauth/ChangeLog,v 1.10 2010/10/16 13:04:51 ayoy Exp $
+
+  16 Oct 2010; Dominik Kapusta <ayoy@gentoo.org> qoauth-1.0.1.ebuild,
+  +files/qoauth-1.0.1-disable-ft.patch:
+  Disable functional tests that require network connection and rely on
+  3rd party external server (bug #341267).
 
   16 Oct 2010; Dominik Kapusta <ayoy@gentoo.org> qoauth-1.0.1.ebuild:
   Adding x11-libs/qt-test conditional dependency to compile and run tests
diff --git a/dev-libs/qoauth/Manifest b/dev-libs/qoauth/Manifest
index 7b3e17acdf3f..6f465b3a6b0c 100644
--- a/dev-libs/qoauth/Manifest
+++ b/dev-libs/qoauth/Manifest
@@ -1,17 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX qoauth-1.0.1-disable-ft.patch 629 RMD160 968a17db05c6de94d137e03d7fe2f4b3546e2c8c SHA1 c64f328a8af1fe0ae8c2f2e85281899c6025cd0b SHA256 8933ba98f972b8b19c5e6bccd685224800810434bfed22987d228137b65c22c0
 DIST qoauth-1.0-src.tar.bz2 41392 RMD160 e50a9e3404e318b11928fa64167e2d0d7e6ec0c5 SHA1 1871712ddf946f134b4c102089d5e52916e6f283 SHA256 a86604b8d3e353a7de641525d5d3ffc078d8977d3d24614cf73891f668eb28f6
 DIST qoauth-1.0.1-src.tar.bz2 42298 RMD160 f6cb736a4c4ca036f7bb3bc840243cf005febd3b SHA1 bc9bfd0afa68f584734b836f7e8e1687a117e3b2 SHA256 b8579a77cecb07928e557c4a019db902a0f040b22f7926f147299e87ac5a54fd
 EBUILD qoauth-1.0-r1.ebuild 1621 RMD160 b2b761a3284fdaa70a47612463a5e96f306350ba SHA1 612e9d80b608a8f0a186b630ca408d6421be0091 SHA256 00f57aabf92727f2ecd657ad13a4b86f58e6d6ec1d81aab5fa2f35122cce81ee
-EBUILD qoauth-1.0.1.ebuild 1499 RMD160 7ccaa2e7d08ef2c4021022b1ee8b48f9a5367017 SHA1 63672bcae6fedb8cf45a2790f369ea7a2fc40b9d SHA256 092d5491e181a02736b988dd56ec854d3c4d5d953e86278cdbc4dbce162034ec
+EBUILD qoauth-1.0.1.ebuild 1562 RMD160 79225796f5c7cedb8b823ecb232d359f9943937c SHA1 c3d74fedb667cbd443ab0da78adc370a7eb58070 SHA256 635dcf76188845e7921beccad8be04721aa8af176b8edef05cd3037ebafe589e
 EBUILD qoauth-1.0.ebuild 1587 RMD160 a729ee87937ddc39cd1b23b2a64b1cccdb6b30f6 SHA1 6ae7009694697337117219bb537957228cf7840f SHA256 5de24483632b6075b7ad86c8dcc45e7d83f9d87e95a935b7a80fa0344ed4e8f3
-MISC ChangeLog 1320 RMD160 fe20ff277cfafc3d6aa45d123cd1acc87acdcf28 SHA1 49048aeac2f2203ff32f3678bd966b3ea0c70af9 SHA256 962741d5f1653b9b9ce8d8d831d40ee5ac749a09a1bf73076a5c0e186d2095f7
+MISC ChangeLog 1546 RMD160 e7f8c6ca66c009d278417458a1911162da6ee91b SHA1 a9305c6815c51eaea8d75165d77642c6c99537a8 SHA256 f766a5c33a8508b85bff8583a45ae13981c66939cde7b8d47c5e525855d8366c
 MISC metadata.xml 290 RMD160 4f0a495977cde8ee26d792d1f99a7b45c06ec94a SHA1 96b5cbf153f5fb648a55d58a022644fb68537a64 SHA256 7bbdae5398455a6b6fa04d6683547595c3453751fc9eb3ee20ae27b32c04b5bd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAky5fFUACgkQ+CZEqwt+F6bofgCaA5K2tPk/r9jjTcXZjECVXX1d
-9lQAoJcxQOvWJUm7YNlQhgWQmFPR6vS7
-=5R7M
+iEYEARECAAYFAky5owMACgkQ+CZEqwt+F6YRWQCfaQmKL+O3h7vWpCL60bBy2zwS
+aWAAnReynsZ04Y+kr7AveICaMrYKWUD8
+=v3Jd
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/qoauth/files/qoauth-1.0.1-disable-ft.patch b/dev-libs/qoauth/files/qoauth-1.0.1-disable-ft.patch
new file mode 100644
index 000000000000..1fd6fd0fc8c9
--- /dev/null
+++ b/dev-libs/qoauth/files/qoauth-1.0.1-disable-ft.patch
@@ -0,0 +1,20 @@
+diff --git a/qoauth.pro b/qoauth.pro
+index f09b3be..27d7bb3 100644
+--- a/qoauth.pro
++++ b/qoauth.pro
+@@ -5,6 +5,6 @@ SUBDIRS += src tests
+ CONFIG += ordered
+ 
+ check.target = check
+-check.commands = ( cd tests/ut_interface && ./ut_interface ) && ( cd tests/ft_interface && ./ft_interface )
++check.commands = ( cd tests/ut_interface && ./ut_interface )
+ check.depends = sub-tests
+ QMAKE_EXTRA_TARGETS += check
+diff --git a/tests/tests.pro b/tests/tests.pro
+index d582750..e010bb0 100644
+--- a/tests/tests.pro
++++ b/tests/tests.pro
+@@ -1,2 +1,2 @@
+ TEMPLATE = subdirs
+-SUBDIRS += ut_interface ft_interface
++SUBDIRS += ut_interface
diff --git a/dev-libs/qoauth/qoauth-1.0.1.ebuild b/dev-libs/qoauth/qoauth-1.0.1.ebuild
index cc5f19a2f04a..5c69bef039aa 100644
--- a/dev-libs/qoauth/qoauth-1.0.1.ebuild
+++ b/dev-libs/qoauth/qoauth-1.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/qoauth/qoauth-1.0.1.ebuild,v 1.2 2010/10/16 10:19:51 ayoy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/qoauth/qoauth-1.0.1.ebuild,v 1.3 2010/10/16 13:04:51 ayoy Exp $
 
 EAPI="2"
 
@@ -25,16 +25,16 @@ RDEPEND="${COMMON_DEPEND}
 S="${WORKDIR}/${P}-src"
 
 src_prepare() {
+	# disable functional tests that require network connection and rely
+	# on 3rd party external server (bug #341267)
+	epatch "${FILESDIR}/${P}-disable-ft.patch"
+
 	sed -i -e '/^ *docs \\$/d' \
 		   -e '/^ *build_all \\$/d' \
 		   -e 's/^\#\(!macx\)/\1/' \
 		src/src.pro || die "sed failed"
 
 	sed -i -e "s/\(.*\)lib$/\1$(get_libdir)/" src/pcfile.sh || die "sed failed"
-
-	if ! use test; then
-		sed -i -e 's/^\(SUBDIRS.*\) tests/\1/' ${PN}.pro || die "sed failed"
-	fi
 }
 
 src_compile() {