Skip stream tests when it's disabled, bug #373757 by Nikoli.

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

4 files changed, 26 insertions, 20 deletions

diff --git a/app-text/libwpd/ChangeLog b/app-text/libwpd/ChangeLog
index c392a0ea4cc5..6b94e21aafc7 100644
--- a/app-text/libwpd/ChangeLog
+++ b/app-text/libwpd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/libwpd
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/libwpd/ChangeLog,v 1.73 2011/07/01 21:06:25 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/libwpd/ChangeLog,v 1.74 2011/07/02 11:24:14 pacho Exp $
+
+  02 Jul 2011; Pacho Ramos <pacho@gentoo.org> libwpd-0.8.14-r1.ebuild,
+  libwpd-0.9.1.ebuild:
+  Skip stream tests when it's disabled, bug #373757 by Nikoli.
 
   01 Jul 2011; Markos Chandras <hwoarang@gentoo.org> libwpd-0.8.14-r1.ebuild:
   Stable on amd64 wrt bug #278255
diff --git a/app-text/libwpd/Manifest b/app-text/libwpd/Manifest
index 9c53460c73e8..db260d020325 100644
--- a/app-text/libwpd/Manifest
+++ b/app-text/libwpd/Manifest
@@ -1,29 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 AUX libwpd-0.9.1-gcc46.patch 1864 RMD160 e3452710283ef0e87892d361e0bbf422e55c8f98 SHA1 6008c567e4a68e274c31c586e15287bcd29b2ca0 SHA256 f95a5a3edda76fda7d27d039696fd4bbc660a17ef8219f82f0cb4ca09fd1ea2d
 AUX libwpd-0.9.1-test-build.patch 312 RMD160 fe4525bceb0075f45020127551c06500d7e0014b SHA1 a81860d901a35951e7c26f565e055a5814533add SHA256 9aa5942719ff08b8955f14e7e25c0db3e14258106d1d03fbbdef824a9d87d35f
 DIST libwpd-0.8.14.tar.bz2 424176 RMD160 fdac23a7c582119e4840958f2dac7a30953f86d4 SHA1 0ffc66954bde284030a6c5ad837b862160ed3d33 SHA256 e4aca91b90d6faf9b01fbc4695074ac43f236eb39aee6f8bd993e1c241149901
 DIST libwpd-0.9.1.tar.bz2 540345 RMD160 8cb666fd4244831be0008a24905fb22692414d8e SHA1 bc1fd58fdb260409b02bd01911bd3187b05c5220 SHA256 f8295f3803f9089f31c26b77371f3bcaf8e57909b6803b7b8fb9194e7e55e40b
-EBUILD libwpd-0.8.14-r1.ebuild 1492 RMD160 5336ed671b6c4246e0037ad6962973bfd22b976b SHA1 cd27efb3327b23df580e5cbe689d51d5be3c5575 SHA256 dd766ea95ce2e5b4f5a7617fa83651c62270f3561def56901a9eaecdccf87d6d
+EBUILD libwpd-0.8.14-r1.ebuild 1638 RMD160 07239bcc1d40266db1bc1133eec0374a41fd0981 SHA1 8fc6e8ccccd2e4a052f5c464d3554a17bb44d52c SHA256 af08acd0b57f12ddd01097eecc8b9e684138621bd4e444d5194507f1772d2be9
 EBUILD libwpd-0.8.14.ebuild 901 RMD160 de49adddfbe7cb475f5476726e2142780193460d SHA1 b8e6256dc4027d82145428be169f92d793f2cdaf SHA256 cb9590bb3d8156a08b0abe4de7d185ef80a24d4dd8f1669f7d5bb514a23d8e1a
-EBUILD libwpd-0.9.1.ebuild 1776 RMD160 d70f7151bbd8f7e6d6b681ab4a0d84c8753a9844 SHA1 dd90750fd694cf62080eb633ab67d1dfe02a1b5a SHA256 e35c04625132768cac9ac966a6a5032cafb3711ce4acab41e01b3555ac022574
-MISC ChangeLog 8943 RMD160 973393013a087f135cf378a887586cb22403e289 SHA1 a3c1a6a2322af0cfce0b9c621d7e06fc72a88906 SHA256 4fdbc7be59053d1c56b5629844f0e3cd0c1eb92ba3e62548134472b186b97334
+EBUILD libwpd-0.9.1.ebuild 1907 RMD160 c3ae572405f5612fbee25f0ef7ab603112c5ab2d SHA1 e5a5571c796a7aab0fb29add0f5ba96f157f8a5f SHA256 fe2608488352ccb03fc9b99a775371a857f79f69d5c65dd1dd6816e83cb59bc1
+MISC ChangeLog 9098 RMD160 e0f4714f80ad7b85cb7ca110dd90e3ada4b28e31 SHA1 9a3b20562309638c4fbe20345f11b77d18f6b800 SHA256 ad0d0ae46a73a889af5b4f3fd45a31ea347189bd0ca5c2ffabcfc5efdf657c62
 MISC metadata.xml 224 RMD160 f5f4831e7844c3bf2c25dd076673fdd9a3d1031a SHA1 fda8c1df897460ba96e15e7e661c4f266860cf26 SHA256 e1333ec0c96a03ada3a7b313d1c0903f39e103a7ef4b33275ab2c6f0087c5208
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJODjbVAAoJEPqDWhW0r/LCLVYP/AzVkRazimLHx5ctGr+e/TIV
-H6rkl6kEeQRsx/f56QG1ytMHhVC4eUaNgY9mvVfKzIOGA/Sq5Ibg++rqSp1GPRu/
-qvBFW/eq7S/QSCoOnqj96jDxogRIcDGduIzqR4H5zcZkWBjn0AdEutUAA2ajYIRf
-SMhhOko/ZVu06945OzX9sN0hVEogvNA+ygik9sn7K7ZLkSuieCK7vjdk6fLeduOK
-H18yPSV7pccGXJ2RLGf1vD2Id3fcalGjzCev79dfJ2/8gtwuNX7lgbDL+TO1r3SQ
-YCCGrvMgXW3/hvowYVHGkD9pOeQHAYT9MbQFD2B8d3hZnu5JXMg5G7IOD9c/Yhlx
-ypbU4CuPxqpoz87Ai50GCs5ki5XQ11xLzMw02FR6lwM9qeWe6SogXGRGDSC33Bo/
-FkCAX0sO4YI0IBrIdVkIesbGvf3jQiFclwip9xswHAPq6tsVCJ5h3cx4eD+eb4pu
-TKkMlGc06joc9fj2JdYf+PELJbIgC4rX9SPPFccSNx3dKYtPxxedLxoA9RfvkEC+
-/P0+fS0LRmouZDtBtfjnsce2tB1z6I1BLief79cDakEk+pw1XXhi9dQHC0JWELG9
-XksVz6UeEaWQy5BwvOjdJ6IAp4xm/SsnVOLOohM0tK5VhL79JSBfhfNWXDNbuXju
-zqoATIBmTPwQ95RPL9Kl
-=+pd8
+iEYEARECAAYFAk4O/+QACgkQCaWpQKGI+9RvTwCeLgbko7LjWhUJ2oQ+P0SCvDJL
++ukAni/PsHmA6Mxm6y674uCUQDSSEW3y
+=l2FM
 -----END PGP SIGNATURE-----
diff --git a/app-text/libwpd/libwpd-0.8.14-r1.ebuild b/app-text/libwpd/libwpd-0.8.14-r1.ebuild
index ecc6857cdb38..da0b7f51f6db 100644
--- a/app-text/libwpd/libwpd-0.8.14-r1.ebuild
+++ b/app-text/libwpd/libwpd-0.8.14-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/app-text/libwpd/libwpd-0.8.14-r1.ebuild,v 1.2 2011/07/01 21:06:25 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/libwpd/libwpd-0.8.14-r1.ebuild,v 1.3 2011/07/02 11:24:14 pacho Exp $
 
 EAPI="4"
 
@@ -24,6 +24,13 @@ DEPEND="${RDEPEND}
 	test? ( dev-util/cppunit )
 "
 
+src_prepare() {
+	# Skip stream tests when it's disabled, bug #373757
+	if ! use tools; then
+		sed -i -e '/src\/test/d' Makefile.{am,in} || die
+	fi
+}
+
 src_configure() {
 	econf \
 		$(use_with doc docs) \
diff --git a/app-text/libwpd/libwpd-0.9.1.ebuild b/app-text/libwpd/libwpd-0.9.1.ebuild
index aba673776dd4..a85657282303 100644
--- a/app-text/libwpd/libwpd-0.9.1.ebuild
+++ b/app-text/libwpd/libwpd-0.9.1.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/app-text/libwpd/libwpd-0.9.1.ebuild,v 1.5 2011/05/01 10:04:00 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/libwpd/libwpd-0.9.1.ebuild,v 1.6 2011/07/02 11:24:14 pacho Exp $
 
 EAPI="4"
 
@@ -30,6 +30,11 @@ src_prepare() {
 
 	epatch "${FILESDIR}/${P}-gcc46.patch"
 
+	# Skip stream tests when it's disabled, bug #373757
+	if ! use tools; then
+		sed -i -e '/src\/test/d' Makefile.{am,in} || die
+	fi
+
 	# Do not build tests if not needed (and no before the lib itself)
 	epatch "${FILESDIR}/${P}-test-build.patch"
 	eautoreconf