Doesn't use scrollkeeper if not passing --enable-scrollkeeper, drop old

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

9 files changed, 15 insertions, 389 deletions

diff --git a/dev-util/glade/ChangeLog b/dev-util/glade/ChangeLog
index 284a0ef76803..cb735776460c 100644
--- a/dev-util/glade/ChangeLog
+++ b/dev-util/glade/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/glade
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/glade/ChangeLog,v 1.227 2015/04/08 17:54:02 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/glade/ChangeLog,v 1.228 2015/05/13 17:11:25 pacho Exp $
+
+  13 May 2015; Pacho Ramos <pacho@gentoo.org>
+  -files/glade-3.12.1-doc-version.patch, -files/glade-3.16.1-underlinking.patch,
+  -glade-3.16.1.ebuild, -glade-3.18.2.ebuild, -glade-3.8.4.ebuild,
+  glade-3.8.5.ebuild, metadata.xml:
+  Doesn't use scrollkeeper if not passing --enable-scrollkeeper, drop old
 
   08 Apr 2015; Michał Górny <mgorny@gentoo.org> glade-3.8.4.ebuild,
   glade-3.8.5.ebuild:
diff --git a/dev-util/glade/Manifest b/dev-util/glade/Manifest
index 9fdcf4911fab..67218b197774 100644
--- a/dev-util/glade/Manifest
+++ b/dev-util/glade/Manifest
@@ -1,38 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX glade-3.12.1-doc-version.patch 1416 SHA256 224a3aca9c9bcd190798a702f603a186155784d207720606ec2c89cc5152bb48 SHA512 1a630851cf12df54ce68feeb71343f1e7e56df25d8c1c31192307e4f19124a88293428362f35f59ca37cc116c26ce32e8c521415b93e47112f3d513b3afc9e56 WHIRLPOOL 7e860b824ef0aea4de6382dbf35acc1fb562eadcf46b27b04b1612b56fd968e73c9c5a5d862694a7aa100db084d2366575bdb12dfc32c0a4794ca6d91d672122
 AUX glade-3.14.1-doc-version.patch 853 SHA256 6fb39133bf00abd38f56b3a79cbd8b714a922cca231db59cd8dcb00693604fdf SHA512 cc9aec06f6acdfdf538de7043f9f753768e0e4c26fa9eef7e52b4e42aa6fd3836185c18ffd51abfc2aa3e6f5b2472e68914112230d2b8856e8a3c61e9d865ecf WHIRLPOOL 2f5315144afc183db4599134a23ebab098df1708474180c27aaf4143cf5db5a70260bbfed756d00f54a35f37b6379134cb24f6567edaaff0a9bae72b19433f99
-AUX glade-3.16.1-underlinking.patch 2545 SHA256 eb0fb4b5566c903cf63b0c6cd22755115ecd83e83a7a4f1e93e53be5942694a0 SHA512 c099df4f717dec37f81bcc8d01b3c948e44fe9372c2828400df1d9f77527fbf78b93b487cf13efacba9f927b06ef235dc86ea7ba21a6be39cb7ac2ddb0180e9f WHIRLPOOL 149bf8226263e9d2a66f28f80f9a53c1d2d71da46a72fd0f38f1889eabb6825b64c616228d9b1d645c16af0d1525c559280344a6cf1aa214b5a7fe2d1f212d88
 AUX glade-3.18.1-underlinking.patch 1560 SHA256 0a0884a3ba0b2517a39bb2d30c1a9e265e183711b45a1b0c57fd4a821fcf7026 SHA512 4a1204bad677f9849cd607dc30077843377f81b0822c94a79c4dc314214a971852f055e7d22ef737a99e6a981296cb52b48efef903a8d007be8a56e298ee7ed4 WHIRLPOOL dc066459f9a2bed65cb87e4ea1f99ce40979c1e1db22fc1b1004aa1db30283848da077dc2e2b5a3e1e84ef880af08bd650f6b5e17f1770e5376b7faaa88761ad
-DIST glade-3.16.1.tar.xz 3080072 SHA256 994ac258bc100d3907ed40a2880c3144f13997b324477253e812d59f2716523f SHA512 daa67dd44a6e0ab1e2ed2fd8e389de40c0d6f516765b564563422e0210fe50185e485d2ed7d3e79b96589dccdfc089c8ee058cfc52a79ba1d478e61098af334e WHIRLPOOL 47d15ac37a15d3d37591aaee0eb62320ae7c78bffae20f6aaf37aa7a09f3adf01e86c6d1ad97ca546db48af3e6d0eac8866941cd7ccf37461b85ac672aea9fca
-DIST glade-3.18.2.tar.xz 3256200 SHA256 a2fd77e64e8d6c4d6cbd7f365b5b3a4a06b04f749c90acbdf7a09538b2a021fc SHA512 5bf3ec211ccf84802307ccb8615df6c622a8c3132f247ec3b93c379608ae1c778ac7ca515a51b30769b7d7fe29525c11f0b513665cb4dea9b5b33ccf834b9b57 WHIRLPOOL 878171679c14354c4252f648ca074a4d1ab4dbdcacb2f374b457e531e03ad8abf05f24b1f251f26ccdb047727738d6ab16c7d028283d5f40884f0ac3a4b562d6
 DIST glade-3.18.3.tar.xz 3266400 SHA256 ecdbce46e7fbfecd463be840b94fbf54d83723b3ebe075414cfd225ddab66452 SHA512 6e98d6ba98118fde4066f983024818528ac8c82d176896e2c5c62a19094377df4bf4c6b4edd028cd72bf8744c807c28a930e467f2a23670537b02af327b683f8 WHIRLPOOL 4e1e86b86216739007b3524464a5fcaf07c66ba5adc36a3c497c0c411401fffc6345db2722a1b0f85d1e1e13c920553014e4eac3bdbbd2dcc7ddbd8ac7cb41a3
-DIST glade3-3.8.4.tar.xz 2305876 SHA256 c7ae0775b96a400cf43be738b2f836663a505b1458255df9ce83a340057e3d08 SHA512 dead9b9788002eecca6f8413c999471b957a8c482d770a0a2288c207c86a69e0a011164114ea9d2da60641be9cb205e3f1be7838998566a585aa3b121d316ef5 WHIRLPOOL 0fc377d71367c084a32b5b77fdbdfb82a8c8192faa94a65660c461900fedb01fd68751cb4511af926f6dc18d3e4c0f4743e68207c725b133d61a6f066a30ffd9
 DIST glade3-3.8.5.tar.xz 2322076 SHA256 58a5f6e4df4028230ddecc74c564808b7ec4471b1925058e29304f778b6b2735 SHA512 722a33f1a1ec3baa785bf3c6f7f5ec2cbe7cf6fe44c9c26d33728de16f2856cbb1ace0cd38c5b5356081e326666cc82fd00f2b6af53bd06bb832079610042985 WHIRLPOOL 672c38822dd04e43e2a3c6642fa34e9e485172d943a0abd5e16f7f378f73bc9126768955d9aad431960f5966be8edaa26a755ca28e2644a790c111e0b6c0142d
-EBUILD glade-3.16.1.ebuild 2579 SHA256 85c0373f11a2022fb800ad66c9e709d4e7981f9e5917fb9bfc3a55c4c9ca1b19 SHA512 bc0b22aa6de9064139e4e5ceb39c272dd5632e97831143f162a54dcf7096b348c6b11d1d9ee37e7e745e89ecccb3174c704f8a7dfc72b5ebd4c008ab91cecee6 WHIRLPOOL ce1e87269e27dde27fe2b7a22b6a9c421917b6909ea8feabd0cd77d3702e785ca4304d8574e6c9752f3aa113b032fb5f10a6cbe6b3b647a3e5f88a201bcb393a
-EBUILD glade-3.18.2.ebuild 2594 SHA256 ab08632cb968620ca2508fd9d0e2eedd2f9557e0deaf5177980cb40cb4b7f761 SHA512 ba9bfd9b4dddaed64f74aba1ed1b81d89986613c6e3af4f375d060fa8fbf44e30b0d47eea66fa8ef4247731f771f713d145b8bb760fac9542d45a2e55046de0b WHIRLPOOL 51feaf374e2ffa6f283baf552d33fbdb52682c620d473881e18b7f631897335911952d654412fc9690a162ba3a45873c9bce5274f1101839c1fd7d614b74225a
 EBUILD glade-3.18.3.ebuild 2642 SHA256 46a1486d0025e1899e647589d068c547a6bb7611d77c1d131c85de9ea3a16f6d SHA512 1d5d01c4ce1ef4a9480e9e9236d40c518993dbfc47b7f3c62562a76cac77c021a14577cd2cb74231e6af6d5433bac0557143a7fa27521efb427023d582d5bc7c WHIRLPOOL 34251273898825513cd54a93d80903a37daae823fda344601e0a1f96cfb88b2bb6ce2d402e0ded128118521ce1be19492ccf35dd8804feb3dd658195c69f04b0
-EBUILD glade-3.8.4.ebuild 1262 SHA256 9e6d7d4ecf4b680626b7ca88675633a6cd00bc9f0c4cf2d0d8eff83bf99fad1a SHA512 4854a3ca6841f4e6cace1ffcf66906e249f0e86991ab8e796bc9cf498a815446badd07f57901046d5ac7c58280065e34d2904deaa3b5974af7b4a71ab07c1156 WHIRLPOOL 7d41cf93d34f0b9cf0924a4aae3324306fd47397d1ee69007235e254368b88c0376e224de72e61934af13167bc68602a98d79ead93f1460def4c19e1d26119df
-EBUILD glade-3.8.5.ebuild 1262 SHA256 1e08dc008a843a50a4c01c2ea0c28fca2f58e50678dad3d64ffc0268d4f7cb4f SHA512 fb993eb5c2f8117d55617715d0c7cd9b55b6910893ee6f3dadef6bd2b3dea8680857a03363b1b44e8abf12fefd82701ada05f8639e44701e73d99b9716762e4b WHIRLPOOL be4f0a4d86dd3763be39f8bbc007575092cb2724b1dc8bf4dbf29970d10b12bb8e986a38fce203a7a80f3ef043135824eebdaad29c0068757628fd63728b89e9
-MISC ChangeLog 29187 SHA256 530857c2f65dd0e553501cbea59813506116bb6493bddab76ec31706f4ca12a3 SHA512 ecdee24bfda5b3b0e66ef1fc979649cc03990f11d40dada4c2ce3e1ee353412aac1fa558170533f7f648e39c6e18b4887d2ce5f197b8421b8bcaaa50e8fb8cbf WHIRLPOOL 73e2bec8a1b01c79ddbeea588887f7441ad44c33d1db83d20b7f6e69e80b9538d9d1afc292455b972ddfb24c47778c6915be37985e6d4bc97b980d7592144272
-MISC metadata.xml 160 SHA256 4d793ecb79b17794248102d8409d16bc27b1022c72038bd2d1241e129693d5f2 SHA512 677650c05f31fc27035e12f3f5e4b095715dfe12d2d3483f800bfbc6e986a98dbb1997cd52ad7a177b5c120c9b87fe5a2452a4f0f9852ac9a58262e0c5d576c9 WHIRLPOOL 070602fb27fee6a25035c9e93f5c2422270a5781fd11dac318d3f5c32cf9e49163abf7999729df230d3e181b6a1362982744e1f0ac016bf59a3458ae23abbb83
+EBUILD glade-3.8.5.ebuild 1238 SHA256 b08e68a03b64e2f9b2883277f0e3786adf6089391aee907f76236dcfedb6eb31 SHA512 f5bcd336ae23f5e4fbbb7a218322d74b4c0f5b7e7b2dab71ea4808d3af9ded77eaa5c2893d429fd37b53a80e43744cdbf3c18f1de9450e75511c49032384daf3 WHIRLPOOL e88b1f60d71b2b339098e439283e8a62e447d6b4f50a280c61dba2e5af4ef677cdbfb43f650f28d832151d9c6b5928ad3768cdfb096ddc7cbf95658155a13632
+MISC ChangeLog 29491 SHA256 2d38f0450cf75c6f86aa2d235357be90b7e3c0b12b528808eab9603858f5ae8d SHA512 1e3bdc80a8a624e8a0ead341c3d8eb0e68251f3092865bc5cd84b3220515f589d5dae58686630bb1b488fe61d623d2c9c9d233dc7ffafacd5024526c96ce9db4 WHIRLPOOL 8a3049eb82a927b74fe66ba5b073de1b838482a9282804778e1d2983cea34fc9630997e15001b341d4acf8eb65c1a3a8adfea890cb0927b859b299c8d32e7471
+MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJVJWtRXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOywUP/3h1hjbgIUkgGaWtInISRcNC
-HxLO6v2kHO4YwlCUug05nGyGPlzmXv6enu59tGDzrnwdaGRBoQE9BJP+YkuZX4hw
-teKSCgwtUXojpIyWfyWIHClMyxhHImj75s6iXIBgWqqrd4ZzFuO6h6iC1VkSV90S
-I/W22mhaC06y0Xi5uimP8R6i59F/ocEr5Ltb0FucBD2QgY/XGtdu6PMv2u+TiIjS
-osF1LvjfLbmLSGEXXq1tzHspYSvDMkRjJ20aOjNUutF2DgfYEILcfjzU4BL7EI+M
-NBL3clozb+o2+2vkSlsm8awt9r14UOoWrEo6sSQ7Z9TjE39gQrep0B6XHYsYQ1gy
-Hv0q9zcoFifVAf0RaKNRVi1tuFE9XcjmHdsStIE7OWQdyQErrRFtvT73DPJ9+zoR
-d765ilehTwUTF4yYH5XlytXTi0lKGwlChjkQzvKNYg52uKEOElj+rVxcGgk43N8K
-gV+aPQFgD2EJAHManUnEQw6wCAPE7TYtFWyRFcepH19yrK6aVVX9wwfS6hOndjmy
-dwxF7j1hSNlfoZzt5aQEyQKHDlXmuDwW1iI7UUOOc5zM97MouQ9VvFeMEtx8zvcF
-x8Mw48Z0A2HuHk30JJvNCV6QZ5PSzz/kQpdq7cvUGOjm7m80a7Agl5slv/kOs2HL
-1mV7guAf/fXgGx1hF82v
-=VOy6
+iEYEAREIAAYFAlVThb4ACgkQCaWpQKGI+9TmewCeNqxcme8Bvap/kGoTAL3RNKub
+KiYAn1/tsaB+5Sud+87+YghDFA0UjkXO
+=1qkx
 -----END PGP SIGNATURE-----
diff --git a/dev-util/glade/files/glade-3.12.1-doc-version.patch b/dev-util/glade/files/glade-3.12.1-doc-version.patch
deleted file mode 100644
index 60842e7624cd..000000000000
--- a/dev-util/glade/files/glade-3.12.1-doc-version.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From e3e91245e730f0532e913fde910054f464085241 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Sun, 6 May 2012 22:40:47 -0400
-Subject: [PATCH] Version glade documentation
-
-Rename gnome help files to prevent collision with other versions.
-
-Avoid loading glade-3.8's devhelp files.
----
- help/Makefile.am   |    5 ++++-
- src/glade-window.c |    2 +-
- 2 files changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/help/Makefile.am b/help/Makefile.am
-index 70836e3..dd769c3 100644
---- a/help/Makefile.am
-+++ b/help/Makefile.am
-@@ -2,8 +2,11 @@
- include $(top_srcdir)/gnome-doc-utils.make
- dist-hook: doc-dist-hook
- 
--DOC_MODULE = glade
-+DOC_MODULE = glade-@GLADE_MAJOR_VERSION@.@GLADE_MINOR_VERSION@
- DOC_INCLUDES = legal.xml
- DOC_FIGURES = figures/main-window.png
- 
- DOC_LINGUAS = bg ca cs de el en_GB es eu fr gl hi it ja oc pt_BR ru sl sv uk zh_CN
-+
-+C/$(DOC_MODULE).xml: $(top_srcdir)/help/C/glade.xml
-+	cp -p $(top_srcdir)/help/C/glade.xml C/$(DOC_MODULE).xml
-diff --git a/src/glade-window.c b/src/glade-window.c
-index 89a4549..4eb8be5 100644
---- a/src/glade-window.c
-+++ b/src/glade-window.c
-@@ -2041,7 +2041,7 @@ show_developer_manual_cb (GtkAction * action, GladeWindow * window)
- {
-   if (glade_util_have_devhelp ())
-     {
--      glade_util_search_devhelp ("gladeui", NULL, NULL);
-+      glade_util_search_devhelp ("gladeui-2", NULL, NULL);
-       return;
-     }
- 
--- 
-1.7.8.6
-
diff --git a/dev-util/glade/files/glade-3.16.1-underlinking.patch b/dev-util/glade/files/glade-3.16.1-underlinking.patch
deleted file mode 100644
index b97426c2a6dc..000000000000
--- a/dev-util/glade/files/glade-3.16.1-underlinking.patch
+++ /dev/null
@@ -1,71 +0,0 @@
- gladeui/Makefile.am | 4 ++--
- src/Makefile.am     | 2 +-
- tests/Makefile.am   | 6 +++---
- 3 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/gladeui/Makefile.am b/gladeui/Makefile.am
-index 87d610c..8fc02a0 100644
---- a/gladeui/Makefile.am
-+++ b/gladeui/Makefile.am
-@@ -19,7 +19,7 @@ glade_previewer_CFLAGS =   \
- 
- glade_previewer_LDFLAGS = $(AM_LDFLAGS)
- 
--glade_previewer_LDADD = libgladeui-2.la $(GTK_MAC_LIBS)
-+glade_previewer_LDADD = libgladeui-2.la $(GTK_MAC_LIBS) -lm
- 
- glade_previewer_SOURCES = \
- 	glade-previewer.c \
-@@ -263,7 +263,7 @@ introspection_sources = $(libgladeui_2_la_SOURCES) $(libgladeuiinclude_HEADERS)
- Gladeui-2.0.gir: libgladeui-2.la
- Gladeui_2_0_gir_INCLUDES = Gtk-3.0
- Gladeui_2_0_gir_CFLAGS = $(INCLUDES)
--Gladeui_2_0_gir_LIBS = libgladeui-2.la
-+Gladeui_2_0_gir_LIBS = libgladeui-2.la m
- Gladeui_2_0_gir_FILES = $(introspection_sources)
- INTROSPECTION_GIRS += Gladeui-2.0.gir
- 
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 89e597e..83dd436 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -18,7 +18,7 @@ glade_CFLAGS =           \
- 
- glade_LDFLAGS = $(AM_LDFLAGS) $(GMODULE_EXPORT_LDFLAGS)
- 
--glade_LDADD = $(top_builddir)/gladeui/libgladeui-2.la $(GTK_MAC_LIBS)
-+glade_LDADD = $(top_builddir)/gladeui/libgladeui-2.la $(GTK_MAC_LIBS) -lm
- 
- BUILT_SOURCES = glade-resources.c glade-resources.h
- 
-diff --git a/tests/Makefile.am b/tests/Makefile.am
-index fc96195..3099186 100644
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -28,7 +28,7 @@ progs_ldadd = $(top_builddir)/gladeui/libgladeui-2.la
- create_widgets_CPPFLAGS = $(progs_cppflags)
- create_widgets_CFLAGS   = $(progs_cflags)
- create_widgets_LDFLAGS  = $(progs_libs)
--create_widgets_LDADD    = $(progs_ldadd)
-+create_widgets_LDADD    = $(progs_ldadd) -lm
- create_widgets_SOURCES  = create-widgets.c
- 
- # Test that various types of container widgets
-@@ -37,7 +37,7 @@ create_widgets_SOURCES  = create-widgets.c
- add_child_CPPFLAGS = $(progs_cppflags)
- add_child_CFLAGS   = $(progs_cflags)
- add_child_LDFLAGS  = $(progs_libs)
--add_child_LDADD    = $(progs_ldadd)
-+add_child_LDADD    = $(progs_ldadd) -lm
- add_child_SOURCES  = add-child.c
- 
- TOPLEVEL_ORDER_FILES = \
-@@ -63,7 +63,7 @@ toplevel-order-resources.c: $(TOPLEVEL_ORDER_FILES)
- toplevel_order_CPPFLAGS = $(progs_cppflags)
- toplevel_order_CFLAGS   = $(progs_cflags)
- toplevel_order_LDFLAGS  = $(progs_libs)
--toplevel_order_LDADD    = $(progs_ldadd)
-+toplevel_order_LDADD    = $(progs_ldadd) -lm
- toplevel_order_SOURCES  = \
- 	toplevel-order.c \
- 	toplevel-order-resources.c
diff --git a/dev-util/glade/glade-3.16.1.ebuild b/dev-util/glade/glade-3.16.1.ebuild
deleted file mode 100644
index 7e82ec7522c6..000000000000
--- a/dev-util/glade/glade-3.16.1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/glade/glade-3.16.1.ebuild,v 1.14 2014/05/02 08:45:51 pacho Exp $
-
-EAPI="5"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools eutils gnome2 python-single-r1 versionator virtualx
-
-DESCRIPTION="A user interface designer for GTK+ and GNOME"
-HOMEPAGE="http://glade.gnome.org/"
-
-LICENSE="GPL-2+ FDL-1.1+"
-SLOT="3.10/6" # subslot = suffix of libgladeui-2.so
-KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="+introspection python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	dev-libs/atk[introspection?]
-	>=dev-libs/glib-2.32:2
-	>=dev-libs/libxml2-2.4.0:2
-	x11-libs/cairo:=
-	x11-libs/gdk-pixbuf:2[introspection?]
-	>=x11-libs/gtk+-3.10:3[introspection?]
-	x11-libs/pango[introspection?]
-	introspection? ( >=dev-libs/gobject-introspection-1.32 )
-	python? (
-		${PYTHON_DEPS}
-		>=dev-python/pygobject-3.8:3[${PYTHON_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/yelp-tools
-	dev-libs/libxslt
-	>=dev-util/gtk-doc-am-1.13
-	>=dev-util/intltool-0.41.0
-	virtual/pkgconfig
-
-	dev-libs/gobject-introspection-common
-	gnome-base/gnome-common
-"
-# eautoreconf requires:
-#	dev-libs/gobject-introspection-common
-#	gnome-base/gnome-common
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# To avoid file collison with other slots, rename help module.
-	# Prevent the UI from loading glade:3's gladeui devhelp documentation.
-	epatch \
-		"${FILESDIR}/${PN}-3.14.1-doc-version.patch" \
-		"${FILESDIR}"/${P}-underlinking.patch
-
-	eautoreconf
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		--enable-gladeui \
-		--enable-libtool-lock \
-		$(use_enable introspection) \
-		$(use_enable python) \
-		ITSTOOL=$(type -P true)
-}
-
-src_test() {
-	Xemake check
-}
-
-src_install() {
-	# modify Name in .desktop file to avoid confusion with other slots
-	sed -e 's:^\(Name.*=Glade\):\1 '$(get_version_component_range 1-2): \
-		-i data/glade.desktop || die "sed of data/glade.desktop failed"
-	# modify name in .devhelp2 file to avoid shadowing with glade:3 docs
-	sed -e 's:name="gladeui":name="gladeui-2":' \
-		-i doc/html/gladeui.devhelp2 || die "sed of gladeui.devhelp2 failed"
-	gnome2_src_install
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	if ! has_version dev-util/devhelp ; then
-		elog "You may want to install dev-util/devhelp for integration API"
-		elog "documentation support."
-	fi
-}
diff --git a/dev-util/glade/glade-3.18.2.ebuild b/dev-util/glade/glade-3.18.2.ebuild
deleted file mode 100644
index 3adafd01754e..000000000000
--- a/dev-util/glade/glade-3.18.2.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/glade/glade-3.18.2.ebuild,v 1.2 2014/05/02 08:45:51 pacho Exp $
-
-EAPI="5"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools eutils gnome2 python-single-r1 versionator virtualx
-
-DESCRIPTION="A user interface designer for GTK+ and GNOME"
-HOMEPAGE="http://glade.gnome.org/"
-
-LICENSE="GPL-2+ FDL-1.1+"
-SLOT="3.10/6" # subslot = suffix of libgladeui-2.so
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="+introspection python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	dev-libs/atk[introspection?]
-	>=dev-libs/glib-2.32:2
-	>=dev-libs/libxml2-2.4.0:2
-	x11-libs/cairo:=
-	x11-libs/gdk-pixbuf:2[introspection?]
-	>=x11-libs/gtk+-3.12:3[introspection?]
-	x11-libs/pango[introspection?]
-	introspection? ( >=dev-libs/gobject-introspection-1.32 )
-	python? (
-		${PYTHON_DEPS}
-		>=dev-python/pygobject-3.8:3[${PYTHON_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/yelp-tools
-	dev-libs/libxslt
-	>=dev-util/gtk-doc-am-1.13
-	>=dev-util/intltool-0.41.0
-	virtual/pkgconfig
-
-	dev-libs/gobject-introspection-common
-	gnome-base/gnome-common
-"
-# eautoreconf requires:
-#	dev-libs/gobject-introspection-common
-#	gnome-base/gnome-common
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# To avoid file collison with other slots, rename help module.
-	# Prevent the UI from loading glade:3's gladeui devhelp documentation.
-	epatch \
-		"${FILESDIR}"/${PN}-3.14.1-doc-version.patch \
-		"${FILESDIR}"/${PN}-3.16.1-underlinking.patch
-
-	eautoreconf
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		--enable-gladeui \
-		--enable-libtool-lock \
-		$(use_enable introspection) \
-		$(use_enable python) \
-		ITSTOOL=$(type -P true)
-}
-
-src_test() {
-	Xemake check
-}
-
-src_install() {
-	# modify Name in .desktop file to avoid confusion with other slots
-	sed -e 's:^\(Name.*=Glade\):\1 '$(get_version_component_range 1-2): \
-		-i data/glade.desktop || die "sed of data/glade.desktop failed"
-	# modify name in .devhelp2 file to avoid shadowing with glade:3 docs
-	sed -e 's:name="gladeui":name="gladeui-2":' \
-		-i doc/html/gladeui.devhelp2 || die "sed of gladeui.devhelp2 failed"
-	gnome2_src_install
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	if ! has_version dev-util/devhelp ; then
-		elog "You may want to install dev-util/devhelp for integration API"
-		elog "documentation support."
-	fi
-}
diff --git a/dev-util/glade/glade-3.8.4.ebuild b/dev-util/glade/glade-3.8.4.ebuild
deleted file mode 100644
index 3f39df4876cd..000000000000
--- a/dev-util/glade/glade-3.8.4.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/glade/glade-3.8.4.ebuild,v 1.13 2015/04/08 17:54:02 mgorny Exp $
-
-EAPI="5"
-GCONF_DEBUG="yes"
-GNOME_ORG_MODULE="glade3"
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils gnome2 python-single-r1
-
-DESCRIPTION="A user interface designer for GTK+ and GNOME"
-HOMEPAGE="http://glade.gnome.org/"
-
-LICENSE="GPL-2+ FDL-1.1+"
-SLOT="3/11" # subslot = suffix of libgladeui-1.so
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="gnome python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	>=dev-libs/glib-2.8:2
-	>=x11-libs/gtk+-2.24:2
-	>=dev-libs/libxml2-2.4:2
-	gnome?	(
-		>=gnome-base/libgnomeui-2
-		>=gnome-base/libbonoboui-2 )
-	python? (
-		${PYTHON_DEPS}
-		>=dev-python/pygtk-2.10:2 )
-"
-DEPEND="${RDEPEND}
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.35
-	virtual/pkgconfig
-	sys-devel/gettext
-	app-text/scrollkeeper
-	>=app-text/gnome-doc-utils-0.9
-	app-text/docbook-xml-dtd:4.1.2
-"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--enable-libtool-lock \
-		$(use_enable gnome) \
-		$(use_enable python)
-}
diff --git a/dev-util/glade/glade-3.8.5.ebuild b/dev-util/glade/glade-3.8.5.ebuild
index f4657029e915..ee45d8de00aa 100644
--- a/dev-util/glade/glade-3.8.5.ebuild
+++ b/dev-util/glade/glade-3.8.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/glade/glade-3.8.5.ebuild,v 1.10 2015/04/08 17:54:02 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/glade/glade-3.8.5.ebuild,v 1.11 2015/05/13 17:11:25 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="yes"
@@ -35,7 +35,6 @@ DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.35
 	virtual/pkgconfig
 	sys-devel/gettext
-	app-text/scrollkeeper
 	>=app-text/gnome-doc-utils-0.9
 	app-text/docbook-xml-dtd:4.1.2
 "
diff --git a/dev-util/glade/metadata.xml b/dev-util/glade/metadata.xml
index 6e0e2ecb48ca..da6fd63d0085 100644
--- a/dev-util/glade/metadata.xml
+++ b/dev-util/glade/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>gnome</herd>
+<herd>gnome</herd>
 </pkgmetadata>