Drop old (#508854)

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

18 files changed, 26 insertions, 885 deletions

diff --git a/gnome-extra/yelp/ChangeLog b/gnome-extra/yelp/ChangeLog
index f798f1872aee..2a690e37d060 100644
--- a/gnome-extra/yelp/ChangeLog
+++ b/gnome-extra/yelp/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-extra/yelp
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/ChangeLog,v 1.316 2014/07/23 15:18:37 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/ChangeLog,v 1.317 2014/11/13 12:14:33 pacho Exp $
+
+  13 Nov 2014; Pacho Ramos <pacho@gentoo.org>
+  -files/yelp-2.30.2-freeze-move.patch, -files/yelp-2.30.2-gthread.patch,
+  -files/yelp-2.30.2-print-crash.patch, -files/yelp-2.30.2-uri-handler.patch,
+  -files/yelp-2.30.2-xz-support.patch, -yelp-2.30.2-r200.ebuild,
+  -yelp-3.10.2.ebuild:
+  Drop old (#508854)
 
   23 Jul 2014; Agostino Sarubbo <ago@gentoo.org> yelp-3.12.0.ebuild:
   Stable for x86, wrt bug #512012
diff --git a/gnome-extra/yelp/Manifest b/gnome-extra/yelp/Manifest
index 18d20f4035c8..318703da12bb 100644
--- a/gnome-extra/yelp/Manifest
+++ b/gnome-extra/yelp/Manifest
@@ -1,34 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX yelp-2.30.2-freeze-move.patch 3504 SHA256 8c0c6bd3b730de1a372ecc74373bc7ac1607ed668f48764250fd3c9e36998806 SHA512 2b6053d9ff56702f1e614d73fcfafa5914e8f59be2836293de3236597ca2732a0e351e9fb3755c7abad980b9d63482725036fa7db6c2a9c47d80829e27f8474e WHIRLPOOL d93757309f0b8e73639e455ad8e3dd10ff72440d11a30f244d0b31c2008c84d2f984b2058f648e1202075f7feea3db4f81fc6f497d499d2ed25dfcfde3285f4d
-AUX yelp-2.30.2-gthread.patch 284 SHA256 9a18650c9eff2cf0fc739cdba32ca10d5538bceaddaf9381d5b16a34eb0b0405 SHA512 546f7b34c6f60cd19dedb7903a551d551e9bdf6b0c8f81804b2dfd449bac0fe1cffa9b2d5a02e5eb3e3771297bd658121eb99d77862c18a3e5d850676e9e4e92 WHIRLPOOL 0a110d9dcd37774f83ba37af978c640aaae02a526be5dad86f22159733bd049de05fbfce070b0d9120c8d62b20e1f1c31c818802c703227ac8cbc5e80e8acf3d
-AUX yelp-2.30.2-print-crash.patch 1528 SHA256 e09129d48fae34be923be82e3c880c14ff6ad79112c1fbc8760b431caf501dd3 SHA512 ce63308e5df9586e0032c126fb715358fd4c51ae2a5436079d78e468092e8b0359e6abeb17a53424831e6be0eccc23dc0c283bfa5d7bc348c554e4b0ea46eb03 WHIRLPOOL 1aaee93c1f483d43a17c2ca3cb96e0ced40a534772da056f651d106a2a8e8bafc5ce71b8cb2164a230add94ac96c773f9efa7c0f44771648d33be382f11b6706
-AUX yelp-2.30.2-uri-handler.patch 860 SHA256 91e05fc3c5eb36c12e28cd7d2c058baf7395105f56826e1012a50e0b7882af65 SHA512 dd3afdcee7a021fda22da6a1e41c9092321eb7f013010fb0f8c479d37108fef985296d65365d15a304f0f90b4dd2c471d1b8c4818ca4b205a88aa0239d3eb51f WHIRLPOOL 141fae63bb5e66342c236a3357933c9fc5de5d8f25ef8b4527acbc4fb185b6e9611f2b7c085bdd20bb910c87403f7f3dddf182499c6e98d817a7f86158b1eeaf
-AUX yelp-2.30.2-xz-support.patch 6328 SHA256 b32e6c4169c4c7d5b0498605d4aa4de1817cd5655cbc70b88db04aff3fdf8aa6 SHA512 c4e03d53eabc9f9e0e20f07828cee51a5830799e48d02f20dbbbce68c373ca605913709fffa914d545e2070a1a0ff1697530877d69a38ade5cd7e2bf2fb05507 WHIRLPOOL b8ab124c1a9ddcd7fa9437d7128e81f8e86bb57e4d02c634dc99a98f2ed708262dab57f5cba9a140111d7ce53114b31dd5421d395439ab536b3f69f53e04e3c2
 AUX yelp-3.0.3-man-compatibility.patch 4226 SHA256 9b76f13236170ccbfa24060a18bdfaaad9bfe3490dc42abd9a1dee106f82c1f1 SHA512 7bb4ce52c8c81ff7bc0782eff963263132a39402f4c66122baa012e9e3046ed51090e548cdf282ef4a1afcb0d4ba7d2036002adf6e2a45032087444f0a68ddd6 WHIRLPOOL cbaf4d86e92a5d127941e5238ac122af137081f6da1c4c5bf70c7a1447c0afc8b563506aa8f99902de9021af926fe7816128aa9c3c54fd07f6c9bb828444da11
-DIST yelp-2.30.2+webkit.tar.xz 739928 SHA256 00d84338e3975174a5735deb39e2b4b49816cbedae8130ccba64abc72ae85cd5 SHA512 711baba2243916f11c4d4e24e1013dcf87f89a411c88dc0c2151ba67213ac720f71a5f17d1a6037b8978b372a95d1902d753e03ac0936fd90bce7dcb6f7da53a WHIRLPOOL 6b3736922b20c5a057c153010883d40eede244729f8f83fb480d8c1fafb8a631b93edc507de341fc59913e28a0af9f048cb3b0f591fa3ac4cf15a76bebaf70dd
-DIST yelp-3.10.2.tar.xz 1402220 SHA256 31cdff0df058fd42752808b6454b774281505f42695ee8b20891eb1332c34338 SHA512 300924f688e032ed4e7fb1b09da4a9c2125527a975dd1c2d0abd13d02d76a2dbae7c567c377aac34bcc07b570d69dacc07c1ebb4d48ea1be6e19e948fe7c7669 WHIRLPOOL ce9d7d177f569b268f0692f031371125f5948b84e1b174bd6692c0e7bee348135371927e903eab498c3d9ce3763b0024ab7e79ce3e45eb8730fe89af1bc50568
 DIST yelp-3.12.0.tar.xz 1413544 SHA256 c83991b94b12617343c0b18845eee9fcf445459c1f6d273a4ab0b6f89e0b4a4c SHA512 81894985453d26c3d8306a18067c057eed3475027b8bcf1c0187567ccd20c9c633d93a0b883a0aa7e8c10ed48ba3f509ea0bc57aad4b96869ab38570e95df241 WHIRLPOOL 3551cc002eae8fe203828b14dc2ea2e2388e3daad75bed8792b7b41c53d6f9b9c5cfed5c80afa0be2073a1abbf0fc43b1730917d7259a926a488f75fd89ce7ea
-EBUILD yelp-2.30.2-r200.ebuild 1724 SHA256 409af68702930cd22db3bf03624090aa17c435c9d72260a62774bbbb4847d09c SHA512 185ce58c6cc8b3e8d722c95114bbba7277602ba0dfee37b306375018bed01f4badb4ca1894f881be9b91d535c87aee016e5103a3d914da6c51536eb6d34f2507 WHIRLPOOL 3a093d36764cfba8768e5535d922b9c18ba755b7f3215888867127e73ffb55646fefeea19534b7cda013ada47e820c9f7ce68b29548ef127db1aa7f60995b6d1
-EBUILD yelp-3.10.2.ebuild 1320 SHA256 bf283e5e3f4a17e5cf681193125dbef50148143e3f625bfc3b16240e8993db4c SHA512 570a6765dc2f98897a32386ba90367be0ebd230877be3cf7dfc6748bdd8390e6d5735d194366a8cb2ae77a4f10950bcd7461d6c2fd1116d1441c26291e00d142 WHIRLPOOL 3fa241436c892785e48a757ec3c191ef5e5dcbfacf633ac410174156caa221bbaf3247b3a49e3b20fd022d1130acea80963e029554fe93e7017ea668af52a899
 EBUILD yelp-3.12.0.ebuild 1315 SHA256 3d4bb7448a92cf6ae17bb6b2063c204cc03960819db55640328cd504d633f30d SHA512 8045468e6caf897d6fac6d2b6301fee5edd0e3a606307c61e8143c9348aab68c00dc64589e76810562847ed3a553f7c08f3c849e7c7f7e51d735956ae267dec4 WHIRLPOOL 7cb3ceb490181450ef3abb50e5943cbe0a996d9bce7b25649193a363c7106b8b0e81a98f5f59b6b2bd965e4919d6ac5a20d875113b4b94c76713efe5995fcda3
-MISC ChangeLog 40929 SHA256 bda06e7a0b01e9a0511d84fe08151ed873b42c6a74f5442491ec313ab7c1b03e SHA512 3f7a44d0c264899ebf07b6c9c5a37319503f6e6b7e38f875bc116b4e46e33e159851002e4c3ee0ec09dc3f5c78fa4811b5ef90968bd1573b6bccf20dafa8b87a WHIRLPOOL 3ce7c95f99a37f378fb4248a41455c7cb0b16a437fa665c6d08b35cb426a70a9212674a9b0eb45f1abf88abc845a1e774e7e10a5b9c191bf96fe3e21451b7175
+MISC ChangeLog 41239 SHA256 d2de6b0ac6d281c4cf18f21509b49920b3e5f06f7d85c4518e903da6e331b690 SHA512 b303966772dad3b385a9ad63d554c7be0c64e419667446ba40406d5aa1ecc7237df178cbf0a7ce274ce711dc38fdb206392e81c7a33b78ce74d6a0d566102994 WHIRLPOOL 11791dbecc8fd642a2dc27b39d6c04521c48c2ef01cd8d99aae1c95a587825b5a6366281a7c57e1b13e6b786f5af5bf43548d5ed18ab85406bc31064e5f43329
 MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJTz9JOAAoJELp701BxlEWfOWsP/jP9OwyaBzraoV8Jf8MCsYJd
-JwfpouGMLDetFTBjXBkDRxRgWWMWJ3uR40hBfg7BqJ3rB/gcPBeKiyKIzMTn0g8V
-eNhd6J47cUiBLoBPLKHk9uKdoSifQhJIhDxD1TlWGURiUUe42mYVxvMR3VEdi/Qg
-cK/bx8pNjMrSHFeTSAVXOh3puNVVVssd1AMMafWzPqAFoCMhPJAYNz1UTaXO2LcI
-JhWQUn12D/lWyguIBuCIjcP6TRqd05ofB9XK3Lm6lzs7wsJk30aWvvU0kwBGjjyE
-uYhBEABfBKZBY7l3UjOIvoQRPvkUtpD5zy/zc+5lpGsNKaFBpVAIhz8rxd1rX9mf
-ARHVOgN6MjxJAbYMH0698wmOej+GpTZw9QpMU0IrC9PyNUIpsm4Q2RfgWkXMjQ7Y
-8GTKRmyjK9Gqa6AutupUTVkhpfKjer1YoVmVc6eENkFFtxTzqnaUubZQk70P3R3U
-SFyyQPGnbOhYt2GNuL6jZFAWm3m6TqSNiYjeuF3TBDyrbnbJkmcEaL1BVn5FFooE
-BK9/EIFQBmwSXX1+jFsDik6661zZvUfpkJ8N6LqVlw+XDNfE785LGZ1lyg8/eqDE
-8o3JwiwUSzWEbsjx0Vfbo29r10Z5nwinhwSyWlQrhuo24aLicGkNJ1q3Z3j1Jnqz
-Iw9DpMLBYm5lnxkNpTg3
-=zyKd
+iEYEAREIAAYFAlRkoKsACgkQCaWpQKGI+9RsIACfWNYvp/kVH28yli2uDZ47mDCh
+A+kAmwbRBCHGYmvWLO/IcWaQjF7ibBzd
+=00+N
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/yelp/files/yelp-2.30.2-freeze-move.patch b/gnome-extra/yelp/files/yelp-2.30.2-freeze-move.patch
deleted file mode 100644
index 2b5e1840fde5..000000000000
--- a/gnome-extra/yelp/files/yelp-2.30.2-freeze-move.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-commit fd70739a133053042360d14fd7e6bc9db884e021
-Author: Vincent Untz <vuntz@gnome.org>
-Date:   Sun Feb 20 16:00:00 2011 +0100
-
-    Fix small freezes when moving window
-    
-    This is similar to ce9025ff: we only save the window size after a
-    timeout, to stop always saving a file which calls fsync() and is
-    therefore slow.
-    
-    We also don't save the size if it hasn't changed.
-    
-    https://bugzilla.gnome.org/show_bug.cgi?id=642813
-
-diff --git a/src/yelp-window.c b/src/yelp-window.c
-index abad787..ea57576 100644
---- a/src/yelp-window.c
-+++ b/src/yelp-window.c
-@@ -284,6 +284,10 @@ struct _YelpWindowPriv {
-     gulong          cancel_handler;
-     gulong          finish_handler;
- 
-+    guint           resize_timeout;
-+    gint            saved_width;
-+    gint            saved_height;
-+
-     gint            toc_pause;
- 
-     GtkActionGroup *action_group;
-@@ -510,8 +514,12 @@ window_init (YelpWindow *window)
- 	    width = YELP_CONFIG_WIDTH_DEFAULT;
- 	if (height == 0)
- 	    height = YELP_CONFIG_HEIGHT_DEFAULT;
-+
-     }
- 
-+    window->priv->saved_width = width;
-+    window->priv->saved_height = height;
-+
-     g_free (config_path);
-     g_key_file_free (keyfile);
- 
-@@ -538,6 +546,10 @@ window_finalize (GObject *object)
-     YelpWindow *window = YELP_WINDOW (object);
-     YelpWindowPriv *priv = window->priv;
- 
-+    if (window->priv->resize_timeout)
-+        g_source_remove (window->priv->resize_timeout);
-+    window->priv->resize_timeout = 0;
-+
-     g_object_unref (priv->action_group);
-     g_object_unref (priv->ui_manager);
- 
-@@ -1810,26 +1822,22 @@ window_set_loading (YelpWindow *window)
- /** Window Callbacks **********************************************************/
- 
- static gboolean
--window_configure_cb (GtkWidget         *widget,
--		     GdkEventConfigure *event,
--		     gpointer           data)
-+save_window_size (YelpWindow *window,
-+		  gpointer    data)
- {
--    gint width, height;
-     GKeyFile *keyfile;
-     GError *config_error = NULL;
-     gchar *sdata, *config_path;
-     gsize config_size;
- 
--    gtk_window_get_size (GTK_WINDOW (widget), &width, &height);
--
-     keyfile = g_key_file_new();
- 
-     config_path = g_strconcat (g_get_home_dir(), YELP_CONFIG_PATH, NULL);
- 
-     g_key_file_set_integer (keyfile, YELP_CONFIG_GEOMETRY_GROUP,
--			    YELP_CONFIG_WIDTH, width);
-+			    YELP_CONFIG_WIDTH, window->priv->saved_width);
-     g_key_file_set_integer (keyfile, YELP_CONFIG_GEOMETRY_GROUP,
--			    YELP_CONFIG_HEIGHT, height);
-+			    YELP_CONFIG_HEIGHT, window->priv->saved_height);
- 
-     sdata = g_key_file_to_data (keyfile, &config_size, NULL);
- 
-@@ -1846,6 +1854,31 @@ window_configure_cb (GtkWidget         *widget,
-     return FALSE;
- }
- 
-+static gboolean
-+window_configure_cb (GtkWidget         *widget,
-+		     GdkEventConfigure *event,
-+		     gpointer           data)
-+{
-+    gint width, height;
-+    YelpWindow *window = YELP_WINDOW (widget);
-+
-+    gtk_window_get_size (GTK_WINDOW (widget), &width, &height);
-+
-+    if (width == window->priv->saved_width &&
-+        height == window->priv->saved_height)
-+        return FALSE;
-+
-+    window->priv->saved_width = width;
-+    window->priv->saved_height = height;
-+
-+    if (window->priv->resize_timeout)
-+        g_source_remove (window->priv->resize_timeout);
-+
-+    window->priv->resize_timeout = g_timeout_add (200, (GSourceFunc) save_window_size, widget);
-+
-+    return FALSE;
-+}
-+
- /** Gecko Callbacks ***********************************************************/
- 
- static void
diff --git a/gnome-extra/yelp/files/yelp-2.30.2-gthread.patch b/gnome-extra/yelp/files/yelp-2.30.2-gthread.patch
deleted file mode 100644
index bd84d7795ff2..000000000000
--- a/gnome-extra/yelp/files/yelp-2.30.2-gthread.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/configure.in b/configure.in
-index 9b5fd48..6c2fd89 100644
---- a/configure.in
-+++ b/configure.in
-@@ -68,6 +68,7 @@ AM_GLIB_DEFINE_LOCALEDIR([GNOMELOCALEDIR])
- PKG_CHECK_MODULES(YELP,
- [
- 	gio-2.0
-+	gthread-2.0
- 	gconf-2.0
- 	gnome-doc-utils >= 0.19.1
- 	gtk+-unix-print-2.0
diff --git a/gnome-extra/yelp/files/yelp-2.30.2-print-crash.patch b/gnome-extra/yelp/files/yelp-2.30.2-print-crash.patch
deleted file mode 100644
index a0833c9cdda1..000000000000
--- a/gnome-extra/yelp/files/yelp-2.30.2-print-crash.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-commit b1b83204de2eef17e746c82138325b997d1684fd
-Author: Vincent Untz <vuntz@gnome.org>
-Date:   Sun Feb 20 14:48:40 2011 +0100
-
-    Fix crash when printing a whole document
-    
-    We use g_strfreev() on an array with const strings. That's bad :-)
-    
-    https://bugzilla.gnome.org/show_bug.cgi?id=642808
-
-diff --git a/src/yelp-db-print.c b/src/yelp-db-print.c
-index b85eea6..6a48f84 100644
---- a/src/yelp-db-print.c
-+++ b/src/yelp-db-print.c
-@@ -477,17 +477,17 @@ dbprint_process (YelpDbprint *dbprint)
- 	params_max += 20;
- 	params = g_renew (gchar *, params, params_max);
-     }
--    params[params_i++] = "db.chunk.extension";
-+    params[params_i++] = g_strdup ("db.chunk.extension");
-     params[params_i++] = g_strdup ("\"\"");
--    params[params_i++] = "db.chunk.info_basename";
-+    params[params_i++] = g_strdup ("db.chunk.info_basename");
-     params[params_i++] = g_strdup ("\"index\"");
--    params[params_i++] = "db.chunk.max_depth";
-+    params[params_i++] = g_strdup ("db.chunk.max_depth");
-     params[params_i++] = g_strdup ("0");
--    params[params_i++] = "db2html.navbar.top";
-+    params[params_i++] = g_strdup ("db2html.navbar.top");
-     params[params_i++] = g_strdup ("0");
--    params[params_i++] = "db2html.navbar.bottom";
-+    params[params_i++] = g_strdup ("db2html.navbar.bottom");
-     params[params_i++] = g_strdup ("0");
--    params[params_i++] = "db2html.sidenav";
-+    params[params_i++] = g_strdup ("db2html.sidenav");
-     params[params_i++] = g_strdup ("0");
- 
-     params[params_i] = NULL;
diff --git a/gnome-extra/yelp/files/yelp-2.30.2-uri-handler.patch b/gnome-extra/yelp/files/yelp-2.30.2-uri-handler.patch
deleted file mode 100644
index 7a7798d6b924..000000000000
--- a/gnome-extra/yelp/files/yelp-2.30.2-uri-handler.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From f79bf2d8e632771275e89b67a218b22bb699afa7 Mon Sep 17 00:00:00 2001
-From: Matthias Clasen <mclasen@redhat.com>
-Date: Wed, 22 Dec 2010 21:11:01 +0000
-Subject: Add schemehandler information to the desktop file
-
-This should arrange things so that gtk_show_uri (..."ghelp:epiphany"...)
-will just work.
----
-diff --git a/yelp.desktop.in.in b/yelp.desktop.in.in
-index 6c71b95..02e8cdf 100644
---- a/yelp.desktop.in.in
-+++ b/yelp.desktop.in.in
-@@ -2,7 +2,7 @@
- _Name=Help
- _Comment=Get help with GNOME
- OnlyShowIn=GNOME;
--Exec=yelp
-+Exec=yelp %u
- Icon=help-browser
- StartupNotify=true
- Terminal=false
-@@ -12,3 +12,4 @@ X-GNOME-Bugzilla-Bugzilla=GNOME
- X-GNOME-Bugzilla-Product=Yelp
- X-GNOME-Bugzilla-Component=general
- X-GNOME-Bugzilla-Version=@VERSION@
-+MimeType=x-scheme-handler/ghelp;x-scheme-handler/help;x-scheme-handler/info;x-scheme-handler/man;
---
-cgit v0.9
diff --git a/gnome-extra/yelp/files/yelp-2.30.2-xz-support.patch b/gnome-extra/yelp/files/yelp-2.30.2-xz-support.patch
deleted file mode 100644
index d2103f264182..000000000000
--- a/gnome-extra/yelp/files/yelp-2.30.2-xz-support.patch
+++ /dev/null
@@ -1,229 +0,0 @@
-http://svnweb.mageia.org/packages/cauldron/yelp/releases/2.30.2/4.mga1/SOURCES/
-
---- configure.in
-+++ configure.in
-@@ -180,10 +180,10 @@
- dnl ====================================
- dnl = lzmadec for help converters
- dnl ====================================
--LZMADEC_LIBS=
--AC_CHECK_LIB(lzmadec, lzmadec_open, [LZMADEC_LIBS=-llzmadec 
--				     AC_DEFINE(HAVE_LIBLZMADEC, 1, [Compile with liblzmadec support])])
--AC_SUBST(LZMADEC_LIBS)
-+LZMA_LIBS=
-+AC_CHECK_LIB(lzma, [lzma_code, lzma_auto_decoder, lzma_end], [LZMA_LIBS=-llzma
-+				     AC_DEFINE(HAVE_LIBLZMA, 1, [Compile with liblzma support])])
-+AC_SUBST(LZMA_LIBS)
- 
- dnl ====================================
- dnl = Bzip2, for the help converters
---- src/Makefile.am
-+++ src/Makefile.am
-@@ -58,7 +58,7 @@
- 	$(POPT_LIBS)			\
- 	$(Z_LIBS)			\
- 	$(BZ_LIBS)			\
--	$(LZMADEC_LIBS)			\
-+	$(LZMA_LIBS)			\
- 	$(YELP_WEBKIT_LIBS)		\
- 	$(X_LIBS)
- 
-@@ -108,7 +108,7 @@
- 	yelp-transform.c	yelp-transform.h	\
- 	test-document.c
- test_document_CFLAGS = $(YELP_CFLAGS) $(AM_CFLAGS) $(YELP_DEFINES)
--test_document_LDADD = $(YELP_LIBS) $(Z_LIBS) $(BZ_LIBS) $(LZMADEC_LIBS)
-+test_document_LDADD = $(YELP_LIBS) $(Z_LIBS) $(BZ_LIBS) $(LZMA_LIBS)
- test_document_LDFLAGS = $(AM_LDFLAGS)
- 
- test_man_parser_SOURCES =					\
-@@ -119,7 +119,7 @@
- 	test-man-parser.c
- test_man_parser_CPPFLAGS = $(YELP_DEFINES) $(AM_CPPFLAGS)
- test_man_parser_CFLAGS = $(YELP_CFLAGS) $(AM_CFLAGS)
--test_man_parser_LDADD = $(YELP_LIBS) $(Z_LIBS) $(BZ_LIBS) $(LZMADEC_LIBS)
-+test_man_parser_LDADD = $(YELP_LIBS) $(Z_LIBS) $(BZ_LIBS) $(LZMA_LIBS)
- test_man_parser_LDFLAGS = $(AM_LDFLAGS)
- 
- test_page_SOURCES =					\
---- src/yelp-io-channel.c
-+++ src/yelp-io-channel.c
-@@ -26,6 +26,7 @@
- 
- 
- #include <stdio.h>
-+#include <stdlib.h>
- #include <glib.h>
- #include <glib/gi18n.h>
- 
-@@ -36,11 +37,80 @@
- #ifdef HAVE_LIBBZ2
- #include <bzlib.h>
- #endif
--#ifdef HAVE_LIBLZMADEC
--#include <lzmadec.h>
-+#ifdef HAVE_LIBLZMA
-+#include <lzma.h>
- #endif
- #include <string.h>
- 
-+#ifdef HAVE_LIBLZMA
-+typedef struct lzma_file {
-+    uint8_t buf[1<<15];
-+    lzma_stream strm;
-+    FILE *fp;
-+    lzma_bool eof;
-+} lzma_FILE;
-+
-+static lzma_FILE *lzma_open (const char *path)
-+{
-+    lzma_ret ret;
-+    lzma_FILE *lzma_file;
-+    lzma_stream tmp = (lzma_stream)LZMA_STREAM_INIT;
-+
-+    lzma_file = calloc (1, sizeof (*lzma_file));
-+    lzma_file->fp = fopen(path, "r");
-+    lzma_file->eof = 0;
-+    lzma_file->strm =  tmp;
-+
-+    ret = lzma_auto_decoder (&lzma_file->strm, -1, 0);
-+
-+    if (ret != LZMA_OK) {
-+	fclose (lzma_file->fp);
-+	free (lzma_file);
-+	return NULL;
-+    }
-+    return lzma_file;
-+}
-+
-+static ssize_t lzma_read(lzma_FILE *lzma_file, void *buf, size_t len)
-+{
-+    lzma_ret ret;
-+    lzma_bool eof = 0;
-+
-+    if (!lzma_file)
-+	return -1;
-+    if (lzma_file->eof)
-+	return 0;
-+
-+    lzma_file->strm.next_out = buf;
-+    lzma_file->strm.avail_out = len;
-+    for (;;) {
-+	if (!lzma_file->strm.avail_in) {
-+	    lzma_file->strm.next_in = (uint8_t *)lzma_file->buf;
-+	    lzma_file->strm.avail_in = fread (lzma_file->buf, 1, sizeof (lzma_file->buf), lzma_file->fp);
-+	    if (!lzma_file->strm.avail_in)
-+		eof = 1;
-+	}
-+	ret = lzma_code(&lzma_file->strm, LZMA_RUN);
-+	if (ret == LZMA_STREAM_END) {
-+	    lzma_file->eof = 1;
-+	    return len - lzma_file->strm.avail_out;
-+	}
-+	if (ret != LZMA_OK)
-+	    return -1;
-+	if (!lzma_file->strm.avail_out)
-+	    return len;
-+	if (eof)
-+	    return -1;
-+    }
-+}
-+
-+static void lzma_close(lzma_FILE *lzma_file)
-+{
-+    lzma_end (&lzma_file->strm);
-+    fclose (lzma_file->fp);
-+}
-+#endif
-+
- typedef struct _YelpIOChannel YelpIOChannel;
- struct _YelpIOChannel {
-     GIOChannel  channel;
-@@ -48,8 +118,8 @@
-     BZFILE     *bzin;
- #endif
-     gzFile      gzin;
--#ifdef HAVE_LIBLZMADEC
--    lzmadec_FILE *lzin;
-+#ifdef HAVE_LIBLZMA
-+    lzma_FILE	*lzin;
- #endif
- };
- 
-@@ -99,9 +169,9 @@
- 	channel->bzin = bzopen (file, "r");
-     else
- #endif
--#ifdef HAVE_LIBLZMADEC
--    if (g_str_has_suffix (file, ".lzma"))
--    	channel->lzin = lzmadec_open(file);
-+#ifdef HAVE_LIBLZMA
-+    if (g_str_has_suffix (file, ".lzma") || g_str_has_suffix (file, ".xz"))
-+    	channel->lzin = lzma_open (file);
-     else
- #endif
- 
-@@ -111,7 +181,7 @@
- #ifdef HAVE_LIBBZ2
-     !channel->bzin &&
- #endif
--#ifdef HAVE_LIBLZMADEC
-+#ifdef HAVE_LIBLZMA
-     !channel->lzin &&
- #endif
-     !channel->gzin) {
-@@ -159,9 +229,10 @@
- 	bytes = bzread (yelp_channel->bzin, buffer, count);
-     else
- #endif
--#if HAVE_LIBLZMADEC
--    if (yelp_channel->lzin)
-- 	bytes = lzmadec_read (yelp_channel->lzin, buffer, count);
-+#if HAVE_LIBLZMA
-+    if (yelp_channel->lzin) {
-+ 	bytes = lzma_read (yelp_channel->lzin, buffer, count);
-+    }
-     else
- #endif
- 	bytes = gzread (yelp_channel->gzin, buffer, count);
-@@ -186,9 +257,9 @@
-     if (yelp_channel->bzin)
- 	bzclose (yelp_channel->bzin);
- #endif
--#ifdef HAVE_LIBLZMADEC
-+#ifdef HAVE_LIBLZMA
-     if (yelp_channel->lzin)
--        lzmadec_close (yelp_channel->lzin);
-+        lzma_close (yelp_channel->lzin);
- #endif
-     if (yelp_channel->gzin)
- 	gzclose (yelp_channel->gzin);
---- src/yelp-uri.c
-+++ src/yelp-uri.c
-@@ -404,6 +404,13 @@
-                                         NULL);
-                 if (g_file_test (fullpath, G_FILE_TEST_IS_REGULAR))
-                     goto gotit;
-+
-+                fullpath = g_strconcat (langdir, "/", sectiondir,
-+                                        "/", name, ".", sectiondir + 3, ".xz",
-+                                        NULL);
-+                if (g_file_test (fullpath, G_FILE_TEST_IS_REGULAR))
-+                    goto gotit;
-+
-                 g_free (fullpath);
- 
-                 fullpath = NULL;
-@@ -532,6 +539,12 @@
-                 else if (is_man_path (basename, "lzma"))
-                     ret->priv->doctype = YELP_URI_DOCUMENT_TYPE_MAN;
-             }
-+            else if (g_str_equal (mime_type, "application/x-xz")) {
-+                if (g_str_has_suffix (basename, ".info.xz"))
-+                    ret->priv->doctype = YELP_URI_DOCUMENT_TYPE_INFO;
-+                else if (is_man_path (basename, "xz"))
-+                    ret->priv->doctype = YELP_URI_DOCUMENT_TYPE_MAN;
-+            }
-             else if (g_str_equal (mime_type, "application/octet-stream")) {
-                 if (g_str_has_suffix (basename, ".info"))
-                     ret->priv->doctype = YELP_URI_DOCUMENT_TYPE_INFO;
diff --git a/gnome-extra/yelp/yelp-2.30.2-r200.ebuild b/gnome-extra/yelp/yelp-2.30.2-r200.ebuild
deleted file mode 100644
index 0208d90c42e4..000000000000
--- a/gnome-extra/yelp/yelp-2.30.2-r200.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/yelp-2.30.2-r200.ebuild,v 1.11 2014/01/05 07:21:33 tetromino Exp $
-
-# git clone git://git.gnome.org/yelp
-# cd yelp
-# git checkout webkit
-# git merge origin/gnome-2-30
-
-EAPI=4
-GCONF_DEBUG=yes
-inherit autotools eutils gnome2
-
-MY_P=${P}+webkit
-
-DESCRIPTION="Help browser for GNOME"
-HOMEPAGE="http://projects.gnome.org/yelp/"
-SRC_URI="mirror://gentoo/${MY_P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sparc x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="lzma"
-
-RDEPEND="app-arch/bzip2
-	>=app-text/gnome-doc-utils-0.20.6
-	>=app-text/rarian-0.8.1
-	>=dev-libs/dbus-glib-0.98
-	>=dev-libs/glib-2.16
-	dev-libs/libxml2
-	dev-libs/libxslt
-	>=gnome-base/gconf-2
-	sys-libs/zlib
-	>=x11-libs/gtk+-2.18:2
-	x11-libs/libSM
-	x11-libs/libICE
-	x11-libs/libX11
-	x11-libs/startup-notification
-	net-libs/webkit-gtk:2
-	lzma? ( app-arch/xz-utils )"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	gnome-base/gnome-common
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog NEWS README TODO"
-	G2CONF="--enable-maintainer-mode --with-search=basic"
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-uri-handler.patch \
-		"${FILESDIR}"/${P}-print-crash.patch \
-		"${FILESDIR}"/${P}-freeze-move.patch \
-		"${FILESDIR}"/${P}-xz-support.patch \
-		"${FILESDIR}"/${P}-gthread.patch
-
-	sed -i -e '/CFLAGS/s:-pedantic -ansi::' configure.in || die #196621
-
-	eautoreconf
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	export ac_cv_lib_lzma_lzma_code__lzma_auto_decoder__lzma_end=$(usex lzma)
-
-	gnome2_src_configure
-}
diff --git a/gnome-extra/yelp/yelp-3.10.2.ebuild b/gnome-extra/yelp/yelp-3.10.2.ebuild
deleted file mode 100644
index 069e5e37fb88..000000000000
--- a/gnome-extra/yelp/yelp-3.10.2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/yelp-3.10.2.ebuild,v 1.3 2014/03/09 12:01:12 pacho Exp $
-
-EAPI="5"
-GCONF_DEBUG="yes"
-
-inherit autotools eutils gnome2
-
-DESCRIPTION="Help browser for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Yelp"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE=""
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
-
-RDEPEND="
-	app-arch/bzip2:=
-	>=app-arch/xz-utils-4.9:=
-	dev-db/sqlite:3=
-	>=dev-libs/glib-2.25.11:2
-	>=dev-libs/libxml2-2.6.5:2
-	>=dev-libs/libxslt-1.1.4
-	>=gnome-extra/yelp-xsl-3.6.1
-	>=net-libs/webkit-gtk-1.3.10:3
-	>=x11-libs/gtk+-2.91.8:3
-	x11-themes/gnome-icon-theme-symbolic
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.13
-	>=dev-util/intltool-0.41.0
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-	gnome-base/gnome-common
-"
-# If eautoreconf:
-#	gnome-base/gnome-common
-
-src_prepare() {
-	# Fix compatibility with Gentoo's sys-apps/man
-	# https://bugzilla.gnome.org/show_bug.cgi?id=648854
-	epatch "${FILESDIR}/${PN}-3.0.3-man-compatibility.patch"
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		--enable-bz2 \
-		--enable-lzma \
-		ITSTOOL=$(type -P true)
-}
diff --git a/gnome-extra/zenity/ChangeLog b/gnome-extra/zenity/ChangeLog
index 8597ae0ac83b..e628bc6cb0fa 100644
--- a/gnome-extra/zenity/ChangeLog
+++ b/gnome-extra/zenity/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gnome-extra/zenity
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/zenity/ChangeLog,v 1.223 2014/07/23 15:18:41 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/zenity/ChangeLog,v 1.224 2014/11/13 12:15:50 pacho Exp $
+
+  13 Nov 2014; Pacho Ramos <pacho@gentoo.org>
+  -files/zenity-2.32.1-libnotify-0.7.patch,
+  -files/zenity-3.8.0-broken-autoclose.patch,
+  -files/zenity-3.8.0-double-click.patch,
+  -files/zenity-3.8.0-listbox-expand.patch, -zenity-2.32.1.ebuild,
+  -zenity-3.8.0-r2.ebuild, metadata.xml:
+  Drop old (#508854)
 
   23 Jul 2014; Agostino Sarubbo <ago@gentoo.org> zenity-3.12.1.ebuild:
   Stable for x86, wrt bug #512012
diff --git a/gnome-extra/zenity/Manifest b/gnome-extra/zenity/Manifest
index afdf6b0ee76f..1f819abe0ad7 100644
--- a/gnome-extra/zenity/Manifest
+++ b/gnome-extra/zenity/Manifest
@@ -1,32 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX zenity-2.32.1-libnotify-0.7.patch 746 SHA256 98bf6ca77f0fef14a5f0b8788595710b7eb88db121103a72c4a38bb912038431 SHA512 ccef1dfde468c98a1836cc5ae0584166c605ca6a99c5df794d92c590b38fec489cb7e35c9b8826c624686796a5e2a97ddc28760f5909c8f42c6834d3357185ad WHIRLPOOL fa74b1a555d6060e6b6ace10c472289373a0f7cf132bae608877711c2a6b6036976f1cf33a4b067979299bc875ad56513ea9a07e595dddb25cb438907955011d
-AUX zenity-3.8.0-broken-autoclose.patch 3463 SHA256 1925f3c814b5eefc187e33b10f0c67207202112b4a10ece6c2d2f2409f2db16d SHA512 3bf996c1aa36ff0586072b8c71376c920b12922fb0666152be723266278badb7ac28505b820d936dff2eb579f1b57e06bb376d25fcd435451a7df4716edf9a74 WHIRLPOOL 766c71c7bffe1bd2028be60bb2576a519cae48cada7ade7052a3a3d32fa22c1cc804738e2bbf9130835cc9b9aaff959b6ba17c6bd74950c40a5f1d783d92f32f
-AUX zenity-3.8.0-double-click.patch 1008 SHA256 a020d4360f1ca64057b542776a94dcb3f4ce5760cd32b7a772a9530ad3c516e3 SHA512 f7f8ec8e4ad797a454f18610920f87c1ead639bd58f63b1c594862a583c72233cf769a3ef6226ad228f8e45b7e61e3f2de5ad4b70eef45f7fd2472a6d0153e86 WHIRLPOOL 3dd3bf0904b05467bc20ce9ba24a478b55803b5cd3cd486d701e25f2b577690c888504ef9d9ce93dc3c2b1a63808c79a7bb4b7b9a4c6cb978c6a2467e393e4a0
-AUX zenity-3.8.0-listbox-expand.patch 753 SHA256 80bf3608a7ebb68edd0e4a72bb57836d4b638efa5ac88cc6fb536a873e2916be SHA512 e53c1286690f6886f6b87d5d77891f371b8751f09c889445c6dde7a4288f1c189d5a19183421678cd610f8b1953c994432e91bf22534043e05d654074542bef5 WHIRLPOOL cf232010e002b09e6eddec1fb4c8ac3062ed1a5b73461940de3221f4b94d487c008cab94050da60967562b1721e197dd730b007fcf4f04ba3cfb057010eea0cd
-DIST zenity-2.32.1.tar.bz2 3128666 SHA256 8838be041a07364b62a4281c971392e4a09bb01bb3237a836ec0457ec0ea18ac SHA512 5cab5be6e22da46b6fa78bddd3c40e2413df64f8267452a332efc093e0e865c621cd68897c11c1af9a33afceb8cf84e08b03e17d4d0b3abfed95cbafe199c94e WHIRLPOOL eb3db6f89f5eaa9b316a22d46a4af03991255c16d28b10f7fe56f553f913642b3fe30661d2714bbb3921c9f5e1adede56b6b225313fe26211bdf6030a6167858
 DIST zenity-3.12.1.tar.xz 3670368 SHA256 a59705cdd1ea5318fdae3075c1cedcbead479230e9bead204391566d973dae11 SHA512 5bcb4db484e6747d6e8980bcb59efdf6d1fb86f476a84f6080cf473ff943d9a9d8ee3e2af9ccf7b6da44928be88bdae5dedc0f90189075d834654949e80cf08b WHIRLPOOL 4ea233c3ab537dcd2b9d3c55a9780e9a484aebbb003a1bed33a0a8a543d1d7faf4a37cd98b05cb7c2844d41229107086670c54b994702cf33d304de1e7980abe
-DIST zenity-3.8.0.tar.xz 3651076 SHA256 94fbf0b71592f26dce0e2c49b82b4401139c8434084ad24c2c6a61ace1e6563f SHA512 3e7c72a19f3f48c9da1578abfbdd3cd5973dbea6ead9fdf035b34405be2da9ea1be6f8ace271948144a9a7b6e34cac1dfc3e554f19438431ffb1e82f08ddc02d WHIRLPOOL cc5a731cce52bb4f2783d41b7f9319efe306552a3ada48fa91b4ead15407f3ad079b618c8ff508ca4666922de4bcc81b5824d77497615e03ddd61412bbb2fa90
-EBUILD zenity-2.32.1.ebuild 1296 SHA256 d25166a27416913c1dca7e5544ffc2e328cd2303616738fb05616c2c51bf2e27 SHA512 acaa93899a5e92e943609976a78ea8a648d7d75614e9f99760bd9c022259d4c99b9b77a58ebdabada364e822a6924882daefadd4e786df2f9d9cf9ea20baa85e WHIRLPOOL 62ab0b84f6a3d57a473bb4d170b7b39da0443c4b20b1627336184983625c124f081cf9a2a770018d1c4f76da80825e2e90648e5c8626b0f10220457f37f28829
 EBUILD zenity-3.12.1.ebuild 1261 SHA256 7b3f53a8238f536deaca96e375ac5640f81c5044fd88de7b466156110a31dabe SHA512 7cd26a006b10d48d2ae3e9c303809e749b696d9684c737b7be4f8128cf14c484c18495ae630d6b65492928c0f9f48108afbc0f5c4ef0c67c195f4faf8aeec8dd WHIRLPOOL 06e0798e98cbb2f7ee01e24697de9b7c292e40704718626a65868ea79e910db9c7b73cba0931b071231a66082ab92aa52b6956753e24cb6cac08f98dcf4ef584
-EBUILD zenity-3.8.0-r2.ebuild 1707 SHA256 ad61e1c230b296526819681bb75543f536b911b07b5bd5fef155a2b097b6fd1c SHA512 5d327877e15e4c4214f27a0e1ce2fa49c77149dd67311637650fa135e428021404e5e65418ecf8c9f79f0f6f5fa305db959d85c1ce44d87f477a5153410e96c9 WHIRLPOOL abedb1d89eec81eca3482d44ae28fc30e159802b34a225ea823583a7088c807e3370be4b2e8a604357e6e7f8986772a2cf2a4e44eddd98d6fac76231e1127ed5
-MISC ChangeLog 26563 SHA256 ee0c9feb866aa99fa67e31870c5be505272549917590571469dce74e8a5fb882 SHA512 1a1565ead88999585c46877a08ef6d66419493d8ce15e75a5e331b754969752345929393f09727f20f27e35191f5ea933a4217104398311b96401aaf7daaea41 WHIRLPOOL e2ccabe2be479450a8ae4a12cf70a4b8089489cc55959ced3281f0e0b86113e45003b99cba5492da45471453c090eaac18d0724fa39e731e1f63859d4a8b3673
-MISC metadata.xml 302 SHA256 b52e3b6c6080efd1fedb03fe6136d89d74f1e58896ae8d6f075622bf6806e200 SHA512 d66d8a12c3ef2bc74a768e83d63f87c9da48e1773fbfbff60abbe5e01142daf1fd1fc500ad7ea51418e7574fa956e1c0eddebce5d59525bc725b8576f8da95c8 WHIRLPOOL 1721abff208b87e089940e5c87c0b0848adec4a5cb299e35777cd473370ee5f1cd6bdc3614e272fd084cc9b4922048f7a01d46a2ab64757e3b93ff9ea721e7a6
+MISC ChangeLog 26873 SHA256 debbb3fe046dd5573d8d0339507e09c5cf68543a31f0c50c00d4436e564a1cfe SHA512 b7f3c5dafd36123c39537d26988a22b9708d1ffb7d7041cb886f6549daeafec1abfd39658bb41b97c5bbc8faeb8bdcf20a3e709869a12a320ce22eab4dc8531e WHIRLPOOL 9b99f71e7aca62c270d8afe0db553fd5086dc209f5d49e171bf13fe5434def028bd2113d371ffa7ae527d65da2766d01c2f31c71b90cf11ad0ecee8a0582bc29
+MISC metadata.xml 159 SHA256 b1ccd57b80d8d6ee7a9924844efd69830edfb744ab818d67e50a008b5aae7d4b SHA512 9408846d0f3194f62043b64e325aed9e8cce9a74b556865acf71facc3ad59a092dccbbb3c608ada40b73625eaac93a7bcc976858c6a47426bb8fadb6f830fe2b WHIRLPOOL 4700c8b71899b5acffcc46580315d4d116b478cfa283e0ea0569ab180e46850ce85d73c7370d989e53dd8aecb69ed843d2716bfebd3c5d74a7b5c3d4b94b96bb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJTz9JSAAoJELp701BxlEWfnIkP/iH36+Sw6muI0GK5xuEnNLlB
-ZUcjMVaDijw9WROowvLy5f9qSPS4cA0esPEcUbIPhxasIIG2JICCKYUXWxqu4+tn
-xHuwgdk2NOsRvUYeSakaujoKp9iU/j/RdiwciS8qgOXBNJc4Lty+2zQZ+6E46Q9T
-Pb24v8PkH5IhmXisjoRqZv7baHmmJLJ3bQH+P/ukwPdtVzlDkayFA9T3FOBSW60d
-rM05YdioWwCwuGhBd41qVb7RCfIX8Hk3p4bDZWp9ODD8NA3X+ixwYzQNOlbiW98I
-LwCx4IXE9mChGMQdCBRMRmWxiPZBgwsDs+CmEGLVVGKjrN9vY57dWtvIoyxwXcHv
-7q5quqljElXCkzTt+MrLFX94mhJPHYY/G5nLGrASKYLuL/hWvW3PwWYxxIG5fOoz
-EDmXkoVRaTcVccW1vSdVq0Z+KYrIGxyX9t4vLVoGkmf5sF9vL4FiCC2kOhVhIlI1
-S9CC668GX7TSVB9MPyG/aIXCzduzwvOy6PtRqW3VvYm2Mvc7Aa2XV/tcRErJSGIX
-7BP9goIOl4MGNMGznZjV5RRZtIlaRPpBhbxXOLG48XG0yfDu0nHltyz0/vsepLap
-ej6fdl5WDCebMXOeSbG2qHi/mEMRm1XRTx22Y2d5YJT87t4y7Xd8Cq/1n2Y1R4Yr
-iz5pPqDkDH5qNlYm/sYO
-=IMmX
+iEYEAREIAAYFAlRkoPcACgkQCaWpQKGI+9SmrgCdFg28QgOHo1XZsVnmojMKZalo
+D5UAmwS6x2qIBk02tbKGjrZyfP1bziqr
+=Wqm4
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/zenity/files/zenity-2.32.1-libnotify-0.7.patch b/gnome-extra/zenity/files/zenity-2.32.1-libnotify-0.7.patch
deleted file mode 100644
index 4d5bf7447b58..000000000000
--- a/gnome-extra/zenity/files/zenity-2.32.1-libnotify-0.7.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- src/notification.c
-+++ src/notification.c
-@@ -30,6 +30,9 @@
- 
- #ifdef HAVE_LIBNOTIFY
- #include <libnotify/notify.h>
-+#ifndef NOTIFY_CHECK_VERSION
-+#define NOTIFY_CHECK_VERSION(x,y,z) 0
-+#endif
- #endif
- 
- #include "zenity.h"
-@@ -184,10 +187,14 @@
-             icon = freeme = g_filename_to_uri (icon_file, NULL, NULL);
-           }
- 
-+#if NOTIFY_CHECK_VERSION (0, 7, 0)
-+          /* notify_notification_new_with_status_icon was removed */
-+#else
-           notif = notify_notification_new_with_status_icon (
-                               message[0] /* title */,
-                               message[1] /* summary */,
-                               icon, status_icon);
-+#endif
- 
-           g_strfreev (message);
-           g_free (freeme);
diff --git a/gnome-extra/zenity/files/zenity-3.8.0-broken-autoclose.patch b/gnome-extra/zenity/files/zenity-3.8.0-broken-autoclose.patch
deleted file mode 100644
index 0b4f1c77d400..000000000000
--- a/gnome-extra/zenity/files/zenity-3.8.0-broken-autoclose.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-From c89ce9c3812fdc3a2637fd76b42a07385ad50684 Mon Sep 17 00:00:00 2001
-From: Arx Cruz <arxcruz@gnome.org>
-Date: Tue, 04 Jun 2013 19:27:48 +0000
-Subject: Bug #653468. Fixed by Kurt Miller <kurt@intricatesoftware.com>.
-
-Fix the broken auto-close option in progress and list dialogs.
----
-diff --git a/src/progress.c b/src/progress.c
-index c382d74..055699c 100644
---- a/src/progress.c
-+++ b/src/progress.c
-@@ -81,12 +81,13 @@ zenity_progress_handle_stdin (GIOChannel   *channel,
-   static GObject *progress_bar;
-   static GObject *progress_label;
-   float percentage = 0.0;
-+  GIOStatus status = G_IO_STATUS_NORMAL;
-   
-   progress_data = (ZenityProgressData *) data;
-   progress_bar = gtk_builder_get_object (builder, "zenity_progress_bar");
-   progress_label = gtk_builder_get_object (builder, "zenity_progress_text");
- 
--  if ((condition == G_IO_IN) || (condition == G_IO_IN + G_IO_HUP)) {
-+  if ((condition & G_IO_IN) != 0) {
-     GString *string;
-     GError *error = NULL;
- 
-@@ -95,8 +96,6 @@ zenity_progress_handle_stdin (GIOChannel   *channel,
-     while (channel->is_readable != TRUE)
-       ;
-     do {
--      gint status;
--
-       do {
-         status = g_io_channel_read_line_string (channel, string, NULL, &error);
- 
-@@ -175,11 +174,11 @@ zenity_progress_handle_stdin (GIOChannel   *channel,
-         }
-       }
- 
--    } while (g_io_channel_get_buffer_condition (channel) == G_IO_IN);
-+    } while ((g_io_channel_get_buffer_condition (channel) & G_IO_IN) == G_IO_IN && status != G_IO_STATUS_EOF);
-     g_string_free (string, TRUE);
-   }
- 
--  if ((condition != G_IO_IN) && (condition != G_IO_IN + G_IO_HUP)) {
-+  if ((condition & G_IO_IN) != G_IO_IN || status == G_IO_STATUS_EOF) {
-     /* We assume that we are done, so stop the pulsating and de-sensitize the buttons */
-     GtkWidget *button;
- 
-diff --git a/src/tree.c b/src/tree.c
-index 031765e..4634ba1 100644
---- a/src/tree.c
-+++ b/src/tree.c
-@@ -139,6 +139,7 @@ zenity_tree_handle_stdin (GIOChannel  *channel,
-   static gboolean editable;
-   static gboolean toggles;
-   static gboolean first_time = TRUE;
-+  GIOStatus status = G_IO_STATUS_NORMAL;
- 
-   tree_view = GTK_TREE_VIEW (data);
-   n_columns = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (tree_view), "n_columns"));
-@@ -152,7 +153,7 @@ zenity_tree_handle_stdin (GIOChannel  *channel,
-     gtk_list_store_append (GTK_LIST_STORE (model), &iter);
-   }
- 
--  if ((condition == G_IO_IN) || (condition == G_IO_IN + G_IO_HUP)) {
-+  if ((condition & G_IO_IN) == G_IO_IN) {
-     GString *string;
-     GError *error = NULL;
- 
-@@ -161,8 +162,6 @@ zenity_tree_handle_stdin (GIOChannel  *channel,
-     while ((g_io_channel_get_flags(channel) & G_IO_FLAG_IS_READABLE) != G_IO_FLAG_IS_READABLE)
-       ;
-     do {
--      gint status;
--
-       do {
-         if (g_io_channel_get_flags(channel) & G_IO_FLAG_IS_READABLE)
-           status = g_io_channel_read_line_string (channel, string, NULL, &error);
-@@ -221,11 +220,11 @@ zenity_tree_handle_stdin (GIOChannel  *channel,
- 
-       column_count++;
- 
--    } while (g_io_channel_get_buffer_condition (channel) == G_IO_IN); 
-+    } while ((g_io_channel_get_buffer_condition (channel) & G_IO_IN) == G_IO_IN && status != G_IO_STATUS_EOF); 
-     g_string_free (string, TRUE);
-   }
- 
--  if ((condition != G_IO_IN) && (condition != G_IO_IN + G_IO_HUP)) {
-+  if ((condition & G_IO_IN) != G_IO_IN || status == G_IO_STATUS_EOF) {
-     g_io_channel_shutdown (channel, TRUE, NULL);
-     return FALSE;
-   }
---
-cgit v0.9.2
diff --git a/gnome-extra/zenity/files/zenity-3.8.0-double-click.patch b/gnome-extra/zenity/files/zenity-3.8.0-double-click.patch
deleted file mode 100644
index 53491d03a3aa..000000000000
--- a/gnome-extra/zenity/files/zenity-3.8.0-double-click.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 7c234ed9b71d5f009abff509ef2bf576f61a0cbb Mon Sep 17 00:00:00 2001
-From: Arx Cruz <arxcruz@gnome.org>
-Date: Thu, 23 May 2013 19:27:58 +0000
-Subject: Bug 698683 - Double clicking an item or hitting enter after selecting an item
-
-returns it twice
----
-diff --git a/src/tree.c b/src/tree.c
-index cf90239..031765e 100644
---- a/src/tree.c
-+++ b/src/tree.c
-@@ -710,12 +710,6 @@ zenity_tree_row_activated (GtkTreeView *tree_view, GtkTreePath *tree_path,
-                            GtkTreeViewColumn *tree_col, gpointer data)
- {
-   ZenityData *zen_data = data;
--  GtkTreeSelection *selection; 
--  
--  selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (tree_view));
--  gtk_tree_selection_selected_foreach (selection, 
--                                       (GtkTreeSelectionForeachFunc) zenity_tree_dialog_get_selected, 
--                                       GTK_TREE_VIEW (tree_view));
-  
-   zenity_tree_dialog_output ();
-   zen_data->exit_code = zenity_util_return_exit_code (ZENITY_OK);
---
-cgit v0.9.2
diff --git a/gnome-extra/zenity/files/zenity-3.8.0-listbox-expand.patch b/gnome-extra/zenity/files/zenity-3.8.0-listbox-expand.patch
deleted file mode 100644
index 41e90fedd59f..000000000000
--- a/gnome-extra/zenity/files/zenity-3.8.0-listbox-expand.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From 80bc8ce643979fec201c4ebd5cd6405b6310357f Mon Sep 17 00:00:00 2001
-From: Arx Cruz <arxcruz@gnome.org>
-Date: Thu, 10 Oct 2013 19:52:38 +0000
-Subject: But #702535 - List box doesn't expand to fill window
-
----
-diff --git a/src/zenity.ui b/src/zenity.ui
-index ee89093..7c0ab1f 100644
---- a/src/zenity.ui
-+++ b/src/zenity.ui
-@@ -1021,6 +1021,7 @@
-                 <property name="visible">True</property>
-                 <property name="can_focus">True</property>
-                 <property name="shadow_type">in</property>
-+                <property name="expand">True</property>
-                 <child>
-                   <object class="GtkTreeView" id="zenity_tree_view">
-                     <property name="visible">True</property>
---
-cgit v0.9.2
diff --git a/gnome-extra/zenity/metadata.xml b/gnome-extra/zenity/metadata.xml
index a7293fcdc37c..dad9001338dc 100644
--- a/gnome-extra/zenity/metadata.xml
+++ b/gnome-extra/zenity/metadata.xml
@@ -2,8 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>gnome</herd>
-	<use>
-		<flag name="compat">Installs gdialog for compatibility with older shell
-			scripts which uses <pkg>dev-lang/perl</pkg></flag>
-	</use>
 </pkgmetadata>
diff --git a/gnome-extra/zenity/zenity-2.32.1.ebuild b/gnome-extra/zenity/zenity-2.32.1.ebuild
deleted file mode 100644
index 1a01cccbf3f4..000000000000
--- a/gnome-extra/zenity/zenity-2.32.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/zenity/zenity-2.32.1.ebuild,v 1.9 2012/05/05 06:25:16 jdhore Exp $
-
-EAPI="3"
-GCONF_DEBUG="yes"
-
-inherit eutils gnome2
-
-DESCRIPTION="Tool to display dialogs from the commandline and shell scripts"
-HOMEPAGE="http://live.gnome.org/Zenity"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
-IUSE="+compat libnotify"
-
-RDEPEND=">=x11-libs/gtk+-2.18:2
-	>=dev-libs/glib-2.8:2
-	compat? ( >=dev-lang/perl-5 )
-	libnotify? ( >=x11-libs/libnotify-0.4.1 )"
-
-DEPEND="${RDEPEND}
-	app-text/scrollkeeper
-	app-text/docbook-xml-dtd:4.1.2
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.14
-	virtual/pkgconfig
-	>=app-text/gnome-doc-utils-0.10.1"
-# eautoreconf needs:
-#	>=gnome-base/gnome-common-2.12
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-scrollkeeper
-		--with-gtk=2.0
-		$(use_enable libnotify)"
-	DOCS="AUTHORS ChangeLog HACKING NEWS README THANKS TODO"
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-libnotify-0.7.patch
-	gnome2_src_prepare
-}
-
-src_install() {
-	gnome2_src_install
-
-	if ! use compat; then
-		rm "${ED}/usr/bin/gdialog" || die "rm gdialog failed!"
-	fi
-}
diff --git a/gnome-extra/zenity/zenity-3.8.0-r2.ebuild b/gnome-extra/zenity/zenity-3.8.0-r2.ebuild
deleted file mode 100644
index aa58b1d06dcb..000000000000
--- a/gnome-extra/zenity/zenity-3.8.0-r2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/zenity/zenity-3.8.0-r2.ebuild,v 1.5 2014/03/09 12:01:16 pacho Exp $
-
-EAPI="5"
-GCONF_DEBUG="yes"
-
-inherit eutils gnome2
-
-DESCRIPTION="Tool to display dialogs from the commandline and shell scripts"
-HOMEPAGE="https://wiki.gnome.org/Projects/Zenity"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
-IUSE="libnotify test +webkit"
-
-RDEPEND="
-	>=dev-libs/glib-2.8:2
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3:3
-	x11-libs/libX11
-	x11-libs/pango
-	libnotify? ( >=x11-libs/libnotify-0.6.1:= )
-	webkit? ( >=net-libs/webkit-gtk-1.4.0:3 )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.14
-	virtual/pkgconfig
-	test? ( app-text/yelp-tools )
-"
-# eautoreconf needs:
-#	>=gnome-base/gnome-common-2.12
-
-src_prepare() {
-	# Fix double clicking an item or hitting enter after selecting an item (from 'master')
-	epatch "${FILESDIR}/${PN}-3.8.0-double-click.patch"
-
-	# Fix the broken auto-close option in progress and list dialogs (from 'master')
-	epatch "${FILESDIR}/${PN}-3.8.0-broken-autoclose.patch"
-
-	# List box doesn't expand to fill window (from 'master')
-	epatch "${FILESDIR}/${PN}-3.8.0-listbox-expand.patch"
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	DOCS="AUTHORS ChangeLog HACKING NEWS README THANKS TODO"
-
-	gnome2_src_configure \
-		$(use_enable libnotify) \
-		$(use_enable webkit webkitgtk) \
-		PERL=$(type -P false) \
-		ITSTOOL=$(type -P true)
-}
-
-src_install() {
-	gnome2_src_install
-
-	rm "${ED}/usr/bin/gdialog" || die "rm gdialog failed!"
-}