Fix for brokentest fix

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

3 files changed, 32 insertions, 14 deletions

diff --git a/x11-libs/guile-gtk/ChangeLog b/x11-libs/guile-gtk/ChangeLog
index f83102a061c4..c598488dfb78 100644
--- a/x11-libs/guile-gtk/ChangeLog
+++ b/x11-libs/guile-gtk/ChangeLog
@@ -1,10 +1,13 @@
 # ChangeLog for x11-libs/guile-gtk
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/guile-gtk/ChangeLog,v 1.35 2010/06/28 22:28:32 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/guile-gtk/ChangeLog,v 1.36 2010/07/16 06:49:24 jlec Exp $
+
+  16 Jul 2010; Justin Lecher <jlec@gentoo.org> files/2.1-brokentest.patch:
+  Fix for brokentest fix
 
   28 Jun 2010; Justin Lecher <jlec@gentoo.org> +files/2.1-brokentest.patch,
   guile-gtk-2.1.ebuild, +files/2.1-prll-install.patch:
-  Fix prrll installation, 298803 and remoed broken test, #298802
+  Fix prll installation, 298803 and removed broken test, #298802
 
   28 Jun 2010; Christoph Mende <angelos@gentoo.org> guile-gtk-2.1.ebuild:
   Stable on amd64 wrt bug #326019
diff --git a/x11-libs/guile-gtk/Manifest b/x11-libs/guile-gtk/Manifest
index 63f895086c38..97a0bdb06ed0 100644
--- a/x11-libs/guile-gtk/Manifest
+++ b/x11-libs/guile-gtk/Manifest
@@ -1,7 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX 2.1-brokentest.patch 540 RMD160 529624352d1d33ca288460e995763d470484c182 SHA1 94eab8d293c9da274d44d881e8706c8f999970a7 SHA256 0e12a50b48ab4aed771e56d137f6199cc5b3994970f97ae2125acad5aba6941c
+AUX 2.1-brokentest.patch 1029 RMD160 221bf0f170a56b28edb2ab8527b20b008c904cdb SHA1 0764c905a540725c9f689b8b6d1ec50e4abb467c SHA256 6aa51463c7f0f966c8a7668877fc1199b6ed85187be21811ca3c84ca42c029c1
 AUX 2.1-prll-install.patch 421 RMD160 c0736b01e21b53622df840b95e9f63b3a417b37f SHA1 efd73f287772db2695f6fba4ed2530ed9f8f73b9 SHA256 9f2aa837ee4cae17e703e4367179e64e69c0759f601ad3acd74431222e420b0d
 AUX guile-gtk-0.19-Makefile.in.patch 556 RMD160 72b626b414a22de64987a442d73309b3b8fa30ff SHA1 55f6745826baaea37560fbb8659ced162a601372 SHA256 edfa2c0a22e339d19428499e03b05817a7cb13bfe1c1a5bbaab9843729d48cd7
 AUX guile-gtk-2.0-g-object-ref.diff 1239 RMD160 5f7f7b567bf26ed1ca247bb031067e9deb3843c6 SHA1 5838fcb4fbed6af1a33cb72498eeedd281c31205 SHA256 fb68d90e21c8d7fb2b73c55a068b5528ae56c82336b200012f97b8abe56242fc
@@ -15,12 +15,12 @@ EBUILD guile-gtk-1.2.0.41.ebuild 796 RMD160 e87298f93d46146e7da32d16bb9194fcb421
 EBUILD guile-gtk-1.2.0.60.ebuild 776 RMD160 4d97b12f93a114e92f0edba93166002afc4b0e62 SHA1 69e08f490ebf6ff177faaac46c6fb8c8687e3462 SHA256 9f824a51a044c4bed34293662b88ea69d21e7f3dbabe0ec55f8c571ac8b19be5
 EBUILD guile-gtk-2.0.ebuild 1080 RMD160 84fc8d60671c7a9a2fe5d51cbcb9f7c83228effb SHA1 902f4e69061b7c3075449828e1288772fe786dc8 SHA256 a9de52a986a831f8b7cddb7764fe42b4e8bdd33c08748fcc2e5de5c03f4dd169
 EBUILD guile-gtk-2.1.ebuild 1203 RMD160 88194ffe3faafcbcb697548a075f626b67e59d5e SHA1 9f74faaa872f78b87106ae958539ffa4a8e5786c SHA256 98b6f39e0ad26fdcde18a3024f9080a6a2116ecc6eb3fa71a8dd97ac8b1077fe
-MISC ChangeLog 4552 RMD160 2e8bff1706760ec6fd26a509f0113117f23b558b SHA1 6c8894c52c2e6b5c3b474b914333fc7685bdb99b SHA256 613384183f3d2294cbb816b736aaf6b934e657e6237f51beb308248070797c92
+MISC ChangeLog 4653 RMD160 a43e6d8d8cb5d1b82b7ae5c5633bbca125f5ea3d SHA1 a6d33d7a303165289c70c4b90dc9a062edd8b7eb SHA256 25256d78c7dddefbc1e8d47960ff1f22966cd770a49ab01c1a1e32198915acc4
 MISC metadata.xml 383 RMD160 594d1ff2899049ee525b97cfa541c7aeb3cc6d2d SHA1 75b1a5d6f5fdd1a328498f7e82c54ab62f6163c0 SHA256 703a18a1572fa929ca3f575b294703022e2f771d3fff0b22e895cd452076feaa
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkwpIhYACgkQgAnW8HDreRZ+NACcDRRvc3dbNOjY3KC7b7TCoYwg
-sw0AmgMP5h4XGDm4XmY/F8vcgJMMrw7r
-=0bx6
+iEYEARECAAYFAkxAAPkACgkQgAnW8HDreRbPuACgsXDLkg+PPEMqpIOaMk46595P
+ufIAoI0IaZb/DLyNq67IQih0qHKPcfaH
+=xPEU
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/guile-gtk/files/2.1-brokentest.patch b/x11-libs/guile-gtk/files/2.1-brokentest.patch
index 9fe058cc6b12..ecba95174e0c 100644
--- a/x11-libs/guile-gtk/files/2.1-brokentest.patch
+++ b/x11-libs/guile-gtk/files/2.1-brokentest.patch
@@ -1,11 +1,15 @@
 diff --git a/tests/gdk.scm b/tests/gdk.scm
-index 6e08f9f..36941f5 100644
+index 6e08f9f..6b01e83 100644
 --- a/tests/gdk.scm
 +++ b/tests/gdk.scm
-@@ -1106,13 +1106,6 @@
- ;; gdk-selection-property-get
- ;;
+@@ -1102,28 +1102,6 @@
+ 	  (got  (exact-positive-integer? (gdk-screen-height-mm))))
+      (test "gdk-screen-height-mm" #f want got))))
  
+-;;
+-;; gdk-selection-property-get
+-;;
+-
 -(malloced-steady  ;; with nothing ever requested
 - (lambda ()
 -   (let* ((win    sample-win)
@@ -13,6 +17,17 @@ index 6e08f9f..36941f5 100644
 -	  (got    (gdk-selection-property-get win)))
 -     (test "gdk-selection-property-get" sample-win want got))))
 -
- (malloced-steady  ;; on a destroyed window
-  (lambda ()
-    (let* ((win    (gdk-window-new #f 100 100 '() 'input-output 'toplevel))
+-(malloced-steady  ;; on a destroyed window
+- (lambda ()
+-   (let* ((win    (gdk-window-new #f 100 100 '() 'input-output 'toplevel))
+-	  (want   '(#f NONE 0))
+-	  (got    (begin
+-		    (gdk-window-destroy win)
+-		    (gdk-selection-property-get win))))
+-     ;; final free()s only take place under the main loop, so need this to
+-     ;; satisfy `malloced-steady
+-     (gtk-main-iteration-do #f)
+-     (test "gdk-selection-property-get" (list "destroyed win" win) want got))))
+ 
+ ;;
+ ;; gdk-text-extents