Fix broken xhost test.

Package-Manager: portage-2.1.4.4

4 files changed, 15 insertions, 11 deletions

diff --git a/kde-base/libkdepim/ChangeLog b/kde-base/libkdepim/ChangeLog
index dae65da73777..bd896c700e64 100644
--- a/kde-base/libkdepim/ChangeLog
+++ b/kde-base/libkdepim/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/libkdepim
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdepim/ChangeLog,v 1.92 2008/02/20 23:30:42 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdepim/ChangeLog,v 1.93 2008/02/26 06:59:34 zlin Exp $
+
+  26 Feb 2008; Bo Ørsted Andresen <zlin@gentoo.org> libkdepim-3.5.8.ebuild,
+  libkdepim-3.5.9.ebuild:
+  Fix broken xhost test.
 
 *libkdepim-3.5.9 (20 Feb 2008)
 
diff --git a/kde-base/libkdepim/Manifest b/kde-base/libkdepim/Manifest
index e329cff126b0..11c6cce6f152 100644
--- a/kde-base/libkdepim/Manifest
+++ b/kde-base/libkdepim/Manifest
@@ -4,14 +4,14 @@ Hash: SHA1
 DIST kdepim-3.5-patchset-04.tar.bz2 133990 RMD160 9d9fd1e7b04512f1f28bba78d5eeadfc3e3280ba SHA1 ff535be3a60938382094642af18776a529620209 SHA256 8b1968a7bef8ab2efdb2d87e96943ce636775b76365bc1bc99e1e377f9abfc61
 DIST kdepim-3.5.8.tar.bz2 14107449 RMD160 bb34c7e88227a1ebdd8ff38ee41445f85969175e SHA1 8284db2d3d767228cfb2cad4bf8d5221848d64f2 SHA256 433f8541af0a05e0a7e15df5ecca8463a29b6574871b941a8312b04b2233fef1
 DIST kdepim-3.5.9.tar.bz2 14497974 RMD160 7c2cbd5b5f9075bc8dcc7998fc04bf9b297bfd54 SHA1 53ab658c5cdf2e6f836d2e12e3bc4e2fe3b96f15 SHA256 ee3f02ac828f1915c09b8c0a1289efcfbae36321cd07bc071df8be041de10d3a
-EBUILD libkdepim-3.5.8.ebuild 1520 RMD160 ae3d4b949331e1fb24e1ccef58ff0535582a1513 SHA1 a7dceefb005d5dee912b0609c01e783a9e129497 SHA256 c75f178e66b77679f3705191cff593a77ee966ee4055cb68e2e12ced3f3a1616
-EBUILD libkdepim-3.5.9.ebuild 1486 RMD160 8abb33a25d04c79f5fda5ed1f011b4c837a93780 SHA1 3d11fdb24dc71b4d4843a2bc320751a9ded3f35a SHA256 a20b33e1b6a29c62d6bd46fb05c4c3f3c2d53070826295f66a12de5eee09bfb8
-MISC ChangeLog 11900 RMD160 c9ed7745990f2d14329aa8c58e4daf5ddede36a5 SHA1 a2b8d8f0f087a5c1fb7fcea22e72758c20f5adb9 SHA256 55a5d94abd88aa87c7ceb58e091f8b4175b0a855700dea0f43d03902922c865d
+EBUILD libkdepim-3.5.8.ebuild 1508 RMD160 bc8b91c041730c09ae0bbbe8ee5e939890e9805f SHA1 998e94f3dc33b48b372aa457f8b64a804859e512 SHA256 b11453da7c86bdca9c8fd21eeca5b940b3d0ed071af703a2e27f3d95e18fa60a
+EBUILD libkdepim-3.5.9.ebuild 1470 RMD160 04a48fe86028e3c34fff124cddc1c0f87bc3fe66 SHA1 ed34aff973e1fc4d9893e334e45fa74d12a20bb7 SHA256 7f6eeb6d00fb0b17d649632770c79774a95531df9f4f111b70e4d5957886c0d2
+MISC ChangeLog 12023 RMD160 f641bae05c794cf7e918433acf4057f78ecf10da SHA1 d3060701285938a734e708018abf1269c9e9d5de SHA256 eecde115e383a6cba9796bac96103f2f68d6a08981bc6a3bddeb54a91e143a91
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHvLgoCkvF58q80IkRAhmeAJ9u5bytVV8FwBPWbCJxr4Gt4DGzKwCfdPYV
-gVfqA6M5k/PNqTr8VS9pZTw=
-=yQHX
+iD8DBQFHw7jJfxJ68Jl1NeERArJZAJ0ZhdIvCdByN9fQbqqcjZOAc9ll4QCdECoF
+yrBNqHilvqd3NWf1AEnuf3A=
+=ipaK
 -----END PGP SIGNATURE-----
diff --git a/kde-base/libkdepim/libkdepim-3.5.8.ebuild b/kde-base/libkdepim/libkdepim-3.5.8.ebuild
index 42fb571878fb..1ba2a2030f30 100644
--- a/kde-base/libkdepim/libkdepim-3.5.8.ebuild
+++ b/kde-base/libkdepim/libkdepim-3.5.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdepim/libkdepim-3.5.8.ebuild,v 1.6 2008/01/31 15:32:28 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdepim/libkdepim-3.5.8.ebuild,v 1.7 2008/02/26 06:59:34 zlin Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
@@ -35,7 +35,7 @@ src_unpack() {
 	# Call Qt 3 designer
 	sed -i -e "s:\"designer\":\"${QTDIR}/bin/designer\":g" "${S}/libkdepim/kcmdesignerfields.cpp" || die "sed failed"
 
-	if ! [[ $(xhost >> /dev/null 2>/dev/null) ]] ; then
+	if ! xhost >> /dev/null 2>/dev/null; then
 		einfo "User ${USER} has no X access, disabling tests."
 		sed -e "s:tests::" -i libkdepim/Makefile.am || die "sed failed"
 	fi
diff --git a/kde-base/libkdepim/libkdepim-3.5.9.ebuild b/kde-base/libkdepim/libkdepim-3.5.9.ebuild
index 005de3c20085..ec58bdb8067d 100644
--- a/kde-base/libkdepim/libkdepim-3.5.9.ebuild
+++ b/kde-base/libkdepim/libkdepim-3.5.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdepim/libkdepim-3.5.9.ebuild,v 1.1 2008/02/20 23:30:42 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdepim/libkdepim-3.5.9.ebuild,v 1.2 2008/02/26 06:59:34 zlin Exp $
 
 KMNAME=kdepim
 EAPI="1"
@@ -34,7 +34,7 @@ src_unpack() {
 	# Call Qt 3 designer
 	sed -i -e "s:\"designer\":\"${QTDIR}/bin/designer\":g" "${S}/libkdepim/kcmdesignerfields.cpp" || die "sed failed"
 
-	if ! [[ $(xhost >> /dev/null 2>/dev/null) ]] ; then
+	if ! xhost >> /dev/null 2>/dev/null; then
 		einfo "User ${USER} has no X access, disabling tests."
 		sed -e "s:tests::" -i libkdepim/Makefile.am || die "sed failed"
 	fi