Unset DISPLAY before running tests; bug #148056

Package-Manager: portage-2.1.2_rc1-r5

4 files changed, 35 insertions, 14 deletions

diff --git a/gnome-extra/deskbar-applet/ChangeLog b/gnome-extra/deskbar-applet/ChangeLog
index 239e97489c73..0963b1548eb2 100644
--- a/gnome-extra/deskbar-applet/ChangeLog
+++ b/gnome-extra/deskbar-applet/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-extra/deskbar-applet
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/deskbar-applet/ChangeLog,v 1.28 2006/11/06 10:35:04 metalgod Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/deskbar-applet/ChangeLog,v 1.29 2006/11/15 16:43:50 dang Exp $
+
+  15 Nov 2006; Daniel Gryniewicz <dang@gentoo.org>
+  +files/deskbar-applet-2.16.1-display.patch, deskbar-applet-2.16.1.ebuild:
+  Unset DISPLAY before running tests; bug #148056
 
 *deskbar-applet-2.16.1 (06 Nov 2006)
 
diff --git a/gnome-extra/deskbar-applet/Manifest b/gnome-extra/deskbar-applet/Manifest
index bf42db77a23e..68a0244af36d 100644
--- a/gnome-extra/deskbar-applet/Manifest
+++ b/gnome-extra/deskbar-applet/Manifest
@@ -13,6 +13,10 @@ AUX deskbar-applet-2.16-fix_encoding.patch 265 RMD160 8fe023296004b7245ddfc388c6
 MD5 f598cdd9bcbaa7215b4a561a45464359 files/deskbar-applet-2.16-fix_encoding.patch 265
 RMD160 8fe023296004b7245ddfc388c619c116daae2c14 files/deskbar-applet-2.16-fix_encoding.patch 265
 SHA256 1fd7af187f33335f9cde4135c7c2282a5ec8ea3dd97d62d2991347bac4cbe752 files/deskbar-applet-2.16-fix_encoding.patch 265
+AUX deskbar-applet-2.16.1-display.patch 464 RMD160 cfda3950f07ebd8a6720e563acdf05c05d4ddb67 SHA1 2c89f50456d11e4c2f5792dc65470158f802f802 SHA256 fa4a972b9d009403d0f84675eb7ccff5551227447988bb13a7ac1137e2ffb3be
+MD5 7eecb4e74cacc20f841c024e1145baa4 files/deskbar-applet-2.16.1-display.patch 464
+RMD160 cfda3950f07ebd8a6720e563acdf05c05d4ddb67 files/deskbar-applet-2.16.1-display.patch 464
+SHA256 fa4a972b9d009403d0f84675eb7ccff5551227447988bb13a7ac1137e2ffb3be files/deskbar-applet-2.16.1-display.patch 464
 DIST deskbar-applet-2.14.2.tar.bz2 498475 RMD160 b97da51fbb83537b523dad347cf7e6142be61c86 SHA1 d0d5f3f1ec704c84d69a6bc94d5699d77d5dbc62 SHA256 d90e8a109e679a2e0ae015a712a6a403f4643615675ea34e0f47d0d0518835fd
 DIST deskbar-applet-2.16.0.tar.bz2 613562 RMD160 f90a860d68af203f222f59f7b8aceba76b14810d SHA1 69452c6e492e07d32f67077ba8580f34a5fb3c31 SHA256 835fcc0260f16bb462e476f277b46df0d5f77fd7afc8f9aab1159daaee685582
 DIST deskbar-applet-2.16.1.tar.bz2 615223 RMD160 d02576ce3b841f24c4ca175259ede6a84ffa1e76 SHA1 c8d474dc8156bc8f9e6c9e7ce3fe973afe6078dc SHA256 12ea52337279a6b63ae8bb7a87012e3d5c1f6e6ee04be7bc8e3405fcf78993a2
@@ -24,14 +28,14 @@ EBUILD deskbar-applet-2.16.0.ebuild 1195 RMD160 fec5a0e8d234eeeb769787cec2024ba1
 MD5 0ccfe93c01b9dd17146c25befa3e34eb deskbar-applet-2.16.0.ebuild 1195
 RMD160 fec5a0e8d234eeeb769787cec2024ba1ca2b773a deskbar-applet-2.16.0.ebuild 1195
 SHA256 6aece120fa78ffc615562a3a502baa3a3a9a126890f108700378a5e0326ba330 deskbar-applet-2.16.0.ebuild 1195
-EBUILD deskbar-applet-2.16.1.ebuild 1245 RMD160 c4538758a349fcf83fb5340ace68234b840934f5 SHA1 35e0c4185f7cd66c957841f6ae34470efe00590e SHA256 3c8b7cbe2ee307ef16f7efb3685da0812265319efbf243fe15a5650958f9c425
-MD5 3f4d85526b781b3362eaca4f6b902cb6 deskbar-applet-2.16.1.ebuild 1245
-RMD160 c4538758a349fcf83fb5340ace68234b840934f5 deskbar-applet-2.16.1.ebuild 1245
-SHA256 3c8b7cbe2ee307ef16f7efb3685da0812265319efbf243fe15a5650958f9c425 deskbar-applet-2.16.1.ebuild 1245
-MISC ChangeLog 4493 RMD160 8987d2eef5991a55592f6d38701faab4595c78cd SHA1 b1f0f6feacef6d4bfa752fd54e8e200591d712e1 SHA256 f7fbcac95240a32668d38b9643e2f39b68904120a6703a403ed047c4f08c8afc
-MD5 439d045ed1eac0b3448a6cb67b4e4c0d ChangeLog 4493
-RMD160 8987d2eef5991a55592f6d38701faab4595c78cd ChangeLog 4493
-SHA256 f7fbcac95240a32668d38b9643e2f39b68904120a6703a403ed047c4f08c8afc ChangeLog 4493
+EBUILD deskbar-applet-2.16.1.ebuild 1323 RMD160 2eaa9a8a31735d151e651ef924bb946371f26d21 SHA1 7e66ad7072af058fb903d091e788d1adc1d6946b SHA256 b7cefbc6f5fa861ec223d979c46922b129e7c9baf5e1941271bf1d1755ac92e3
+MD5 b88c2e6d1145f89f05c0bc18c8adb510 deskbar-applet-2.16.1.ebuild 1323
+RMD160 2eaa9a8a31735d151e651ef924bb946371f26d21 deskbar-applet-2.16.1.ebuild 1323
+SHA256 b7cefbc6f5fa861ec223d979c46922b129e7c9baf5e1941271bf1d1755ac92e3 deskbar-applet-2.16.1.ebuild 1323
+MISC ChangeLog 4667 RMD160 86f5d00e033fc7f82607ad09434c48c8b63c3023 SHA1 b60d7b9cb9f2b21b2169b5ab8958d28e2d79d1d1 SHA256 eb5ebdf364305f6f8e055c935d81d077b0f624ae8c4ad30ab298d70ff11e6fd5
+MD5 6c616b0141d9073706f076160b0bee3e ChangeLog 4667
+RMD160 86f5d00e033fc7f82607ad09434c48c8b63c3023 ChangeLog 4667
+SHA256 eb5ebdf364305f6f8e055c935d81d077b0f624ae8c4ad30ab298d70ff11e6fd5 ChangeLog 4667
 MISC metadata.xml 413 RMD160 b43b823b1de922a86e22ab10f0f11954f51cebaa SHA1 278ad1cb047bfb613a7575d35875b01754776d8d SHA256 1388b8a4eeeec86628d3669c5fa22e9491e2ce21b8b76ad43a6b5b6b6c9fa6e2
 MD5 c96fe9e3f7052e7e1e929b940d8bb263 metadata.xml 413
 RMD160 b43b823b1de922a86e22ab10f0f11954f51cebaa metadata.xml 413
@@ -46,9 +50,9 @@ MD5 730d3fe4a3fb58d0ec17d06931a999b3 files/digest-deskbar-applet-2.16.1 268
 RMD160 26e10fd9e925ceed138df35d2a648801cdd34ff7 files/digest-deskbar-applet-2.16.1 268
 SHA256 5c3c1f6ae63733c25d45523c1125a4b59bfb8993865ea6c25daf09f95def9bd4 files/digest-deskbar-applet-2.16.1 268
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
+Version: GnuPG v1.4.5-ecc0.1.6 (GNU/Linux)
 
-iD8DBQFFTw/nwUpWvClEHQoRAlGcAJ9YLn838VzDkxYosi2Z5O8O9WPjYgCfYnrA
-qpiyj13x+jl2HuA3y1zAcoc=
-=1ldQ
+iD8DBQFFW0PHomPajV0RnrERAkEZAJsHVh9HjbIzaDKEGfOjejODNpruqwCfeyEC
+2W93keHEMPok3hJowHXh0Eg=
+=5ruI
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/deskbar-applet/deskbar-applet-2.16.1.ebuild b/gnome-extra/deskbar-applet/deskbar-applet-2.16.1.ebuild
index d10b6e4d9c78..04dcb4179600 100644
--- a/gnome-extra/deskbar-applet/deskbar-applet-2.16.1.ebuild
+++ b/gnome-extra/deskbar-applet/deskbar-applet-2.16.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/deskbar-applet/deskbar-applet-2.16.1.ebuild,v 1.1 2006/11/06 10:35:04 metalgod Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/deskbar-applet/deskbar-applet-2.16.1.ebuild,v 1.2 2006/11/15 16:43:50 dang Exp $
 
 inherit gnome2 eutils autotools python
 
@@ -40,6 +40,8 @@ src_unpack() {
 	# Fix installing libs into pythondir
 	epatch ${FILESDIR}/${PN}-2.15.3-multilib.patch
 	epatch ${FILESDIR}/${PN}-2.16-fix_encoding.patch
+	# Unset DISPLAY before tests; bug #148056
+	epatch ${FILESDIR}/${P}-display.patch
 
 	AT_M4DIR="m4" eautoreconf
 }
diff --git a/gnome-extra/deskbar-applet/files/deskbar-applet-2.16.1-display.patch b/gnome-extra/deskbar-applet/files/deskbar-applet-2.16.1-display.patch
new file mode 100644
index 000000000000..eb766cc38438
--- /dev/null
+++ b/gnome-extra/deskbar-applet/files/deskbar-applet-2.16.1-display.patch
@@ -0,0 +1,11 @@
+diff --exclude-from=/home/dang/.diffrc -up -ruN deskbar-applet-2.16.1.orig/configure.ac deskbar-applet-2.16.1/configure.ac
+--- deskbar-applet-2.16.1.orig/configure.ac	2006-10-22 09:15:29.000000000 -0400
++++ deskbar-applet-2.16.1/configure.ac	2006-11-15 11:26:45.000000000 -0500
+@@ -71,6 +71,7 @@ AC_SUBST(DESKBAR_CFLAGS)
+ AC_SUBST(DESKBAR_LIBS)
+ 
+ AC_MSG_CHECKING([for gnomeapplet module])
++unset DISPLAY
+ if AC_RUN_LOG([$PYTHON -c '
+ try:
+     import gnomeapplet