gentoo resync : 04.08.2018

13 files changed, 43 insertions, 288 deletions

diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index 5aeabdb86265..50e2416a4f47 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
diff --git a/dev-vcs/easygit/Manifest b/dev-vcs/easygit/Manifest
index 5a2ce38304b4..c2bb7ab279d9 100644
--- a/dev-vcs/easygit/Manifest
+++ b/dev-vcs/easygit/Manifest
@@ -1,3 +1,5 @@
 DIST easygit-1.6.5.5 283019 BLAKE2B 77d81b193a9dbb0d75df9aa66dd549418c9249a4b073528d72e770bc1857ee1165b33adbefcff94621cedf48edf8b551e065678b0a64166305467e2a01d2076c SHA512 2e639ffa40ac6ea8619abf5d8aced57a9fb203aaf96e259b2d3905b1d6d040d3d64adf14dad0552bd710808e3c23b63e859f1b5b02bd13aca1ad232fe05c2bbd
+DIST easygit-1.7.5.2 283887 BLAKE2B 978e60add4f9a3e982010a002bad74d88fd7b00b544a9150d6926aae24430e833f56115fce80568b9095d2b1896bd45838312012609c47a4499a7e67b05e9d91 SHA512 fa798a18b3d9ae8394faa3a5772ad21c6c439835de977dbce077b79823e022f9aa15e2d603ab16ea592048dab039aed2d647018cd83f7b3ec0b6c0e7679d0eec
 EBUILD easygit-1.6.5.5.ebuild 517 BLAKE2B 36e84d7bbc2ac2263979b81226df52f0ca44bdd3eeb3aee6cdb55b7d7f440d7b4d15dcfe836658a875ec868e2203532072bdeadbb72e6e6e06c41ea1441f83f9 SHA512 bc29b551e3fc1dd6f2aa6c75483a96cb258815e9ff809fe9389455eda391ab51a069c9fb4148dfe9830912a33c9317fcffa17be6249ca26bd7c9e99086cdbab7
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
+EBUILD easygit-1.7.5.2.ebuild 517 BLAKE2B 200072df1a75b28ba5dbe45c5482a4aea0ad923d1b30934ae303c32e918a72051a21d1d8c1e2ff97b84e376427cf86abbe11af9ac9f8a090b28a9547d8e57884 SHA512 20344edec75e386df8a23a902f1051b29cdffad1bd727ef3450e18f3862046355fb6249275115ae468ed275486a0b08c5f23c45746e91c68a0eff795bff05e72
+MISC metadata.xml 363 BLAKE2B ee398b88367b0004f371ce5afc8580a4a2e115485a1e3f882369f9046c49519891b6ea6fa50fb4a33079c0c63639efe1fed8ee5d286dcfbebe216a06d4e1b173 SHA512 a19c917a1e76ae139fba6a947b896783c6c700c350e56bd1ed32ccbfbc9e28bf8cbdd074ec29aadfc98eee1339926582bae8eea87e8b596c6368e298b7a44bc1
diff --git a/dev-vcs/easygit/easygit-1.7.5.2.ebuild b/dev-vcs/easygit/easygit-1.7.5.2.ebuild
new file mode 100644
index 000000000000..e70c718cceff
--- /dev/null
+++ b/dev-vcs/easygit/easygit-1.7.5.2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Easy GIT (eg), a frontend for git designed for former cvs and svn users"
+HOMEPAGE="https://www.gnome.org/~newren/eg/"
+SRC_URI="https://www.gnome.org/~newren/eg/download/${PV}/eg -> ${P}"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~x86"
+SLOT="0"
+IUSE=""
+
+RDEPEND=">=dev-vcs/git-${PV}
+	dev-lang/perl"
+
+S=${WORKDIR}
+
+src_unpack() {
+	cp "${DISTDIR}/${P}" eg || die
+}
+
+src_install() {
+	dobin eg
+}
diff --git a/dev-vcs/easygit/metadata.xml b/dev-vcs/easygit/metadata.xml
index 6f49eba8f496..e8523f5eab18 100644
--- a/dev-vcs/easygit/metadata.xml
+++ b/dev-vcs/easygit/metadata.xml
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>gentoo@culot.org</email>
+		<name>Frederic Culot</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-vcs/giggle/Manifest b/dev-vcs/giggle/Manifest
deleted file mode 100644
index 682c88920d47..000000000000
--- a/dev-vcs/giggle/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX giggle-0.6.2-gtksourceview-3.8.0.patch 903 BLAKE2B 2ebe976476c120f1ad2729471615cc1a0b106a3cce0e267e1f6d31cac0b5d928f39eb91db62b733bbc15e5d867e73fb39b825cae39d215a68bdda89ef22a89fd SHA512 c60aaeab48ce95fb33dd7a93d51c3d7d17f449fdb0ae29b58cbe10f8e722c482d3793885c5d870b6ec8c03162aa37fef0b5e9dfeb9844494eddb318ecb703425
-AUX giggle-0.7-vte-2.91.patch 2331 BLAKE2B c1a393800fd8e8baaedb46c8f6bf7c7d0c0c09cd4868a47bd5ec9a74dce5fe9114000750183f12e10d9841dcc921a9b70b38fa973b66fca505c661fab882e3be SHA512 7ef6ea65c321e2b55e78ff0ffc8bf8b271516c009c54bebddd3f5e478e8483a911ca279af0f31c9bc7c81c8089c5bbe42f209d7fe55db91e0834baecd01a1fee
-DIST giggle-0.7.tar.xz 2042304 BLAKE2B 376b82e7550e1926109572656424918cdd4282e64f215344c519f0c5960f2aea5399fd9f779982c75f7fffdc41b3c7f4660d823ddcbb03d43506646299f34509 SHA512 01d3cc0adc610706a97b89487624fe3d09c1347c0b07920e71d2e33761fab4894ebb304113ac7df6cdd03ed6116d09dcce85b35d6169df5a3f3973faaa151cfb
-EBUILD giggle-0.7-r2.ebuild 972 BLAKE2B 3ac1ecde7d81a56b079c7798f76540da10ce5b20f02b58d831a27145ca4bc8abdcf07a151573f0e0420f8539c5182c7f0f0d029552f05cf935acb0f6c2266eba SHA512 7801a82d2bf848f2b2c1b10a5e1d92f099da1e3146370bed5af7ce29187452b3da629bc4a7ab6a4f4914367346698b2180e35d3847d29d0d78d80509672eb36e
-MISC metadata.xml 321 BLAKE2B 121b3f98d2d98848910ae89330e3330201de74751c55dafa2df80fe4cf8698819fd9808d2fff89f3bd34480d4393e2a1a6fe5e1d5e878c239bc10d8acea10949 SHA512 a7a7226c85410af2cc6caee355668474f22f784b80abceafdbe01e94c9a4e0e267fd56a6c839ae0279a511681b4ce9bcdd87555f460b2b8b51607422fcb05a7c
diff --git a/dev-vcs/giggle/files/giggle-0.6.2-gtksourceview-3.8.0.patch b/dev-vcs/giggle/files/giggle-0.6.2-gtksourceview-3.8.0.patch
deleted file mode 100644
index 37648e171232..000000000000
--- a/dev-vcs/giggle/files/giggle-0.6.2-gtksourceview-3.8.0.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/src/giggle-diff-view.h b/src/giggle-diff-view.h
-index de5fe02..9ef33b5 100644
---- a/src/giggle-diff-view.h
-+++ b/src/giggle-diff-view.h
-@@ -23,6 +23,7 @@
- 
- #include <glib-object.h>
- #include <gtk/gtk.h>
-+#include <gtksourceview/gtksourcebuffer.h>
- #include <gtksourceview/gtksourceview.h>
- #include <gtksourceview/gtksourcelanguagemanager.h>
- 
-diff --git a/src/giggle-view-file.c b/src/giggle-view-file.c
-index 7746225..7b74c0a 100644
---- a/src/giggle-view-file.c
-+++ b/src/giggle-view-file.c
-@@ -42,6 +42,7 @@
- 
- #include <gtksourceview/gtksourcelanguagemanager.h>
- #include <gtksourceview/gtksourceview.h>
-+#include <gtksourceview/gtksourcebuffer.h>
- 
- #define GIGGLE_TYPE_VIEW_FILE_SNAPSHOT            (giggle_view_file_snapshot_get_type ())
- #define GIGGLE_VIEW_FILE_SNAPSHOT(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIGGLE_TYPE_VIEW_FILE_SNAPSHOT, GiggleViewFileSnapshot))
diff --git a/dev-vcs/giggle/files/giggle-0.7-vte-2.91.patch b/dev-vcs/giggle/files/giggle-0.7-vte-2.91.patch
deleted file mode 100644
index f800a9d157ca..000000000000
--- a/dev-vcs/giggle/files/giggle-0.7-vte-2.91.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From b9e260840d03e33ac55142719f3d54129b54cc70 Mon Sep 17 00:00:00 2001
-From: Debarshi Ray <debarshir@gnome.org>
-Date: Mon, 26 Jan 2015 15:38:24 +0100
-Subject: [PATCH] Port to vte-2.91 API
-
-https://bugzilla.gnome.org/show_bug.cgi?id=743537
----
- configure.ac                   |  2 +-
- plugins/giggle-view-terminal.c | 19 ++++++++++---------
- 2 files changed, 11 insertions(+), 10 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 6e27733..72e7bd1 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -106,7 +106,7 @@ AC_ARG_ENABLE([terminal],
- AS_IF([test "x$enable_terminal" = "xyes"],
-       [
-         PKG_CHECK_MODULES([VTE],
--                          [vte-2.90 >= $VTE_REQUIRED_VERSION],
-+                          [vte-2.91 >= $VTE_REQUIRED_VERSION],
-                           [have_vte=yes
-                            AC_DEFINE([HAVE_VTE], [1],
-                                      [Use features from vte])
-diff --git a/plugins/giggle-view-terminal.c b/plugins/giggle-view-terminal.c
-index 06a9a50..cd107f2 100644
---- a/plugins/giggle-view-terminal.c
-+++ b/plugins/giggle-view-terminal.c
-@@ -186,15 +186,16 @@ giggle_view_terminal_append_tab (GiggleViewTerminal *view,
- 	real_argv[1] = NULL;
- 	spawn_flags = G_SPAWN_CHILD_INHERITS_STDIN | G_SPAWN_SEARCH_PATH | G_SPAWN_FILE_AND_ARGV_ZERO;
- 
--	succes = vte_terminal_fork_command_full (VTE_TERMINAL (terminal),
--	                                         pty_flags,
--	                                         directory,
--	                                         real_argv,
--	                                         NULL,
--	                                         spawn_flags,
--	                                         NULL, NULL,
--	                                         NULL,
--	                                         &error);
-+	succes = vte_terminal_spawn_sync (VTE_TERMINAL (terminal),
-+	                                  pty_flags,
-+	                                  directory,
-+	                                  real_argv,
-+	                                  NULL,
-+	                                  spawn_flags,
-+	                                  NULL, NULL,
-+	                                  NULL,
-+	                                  NULL,
-+	                                  &error);
- 	g_strfreev (real_argv);
- 
- 	if (succes == FALSE) {
--- 
-2.1.0
-
diff --git a/dev-vcs/giggle/giggle-0.7-r2.ebuild b/dev-vcs/giggle/giggle-0.7-r2.ebuild
deleted file mode 100644
index b423d027f8fc..000000000000
--- a/dev-vcs/giggle/giggle-0.7-r2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit autotools gnome2
-
-DESCRIPTION="GTK+ Frontend for GIT"
-HOMEPAGE="https://wiki.gnome.org/Apps/giggle"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="eds"
-
-RDEPEND="
-	>=dev-vcs/git-1.5
-	>=dev-libs/glib-2.30:2
-	>=x11-libs/gtk+-3.3.12:3
-	>=x11-libs/gtksourceview-3.0:3.0
-	>=x11-libs/gdk-pixbuf-2.22.0
-	eds? ( gnome-extra/evolution-data-server:= )
-	>=x11-libs/vte-0.28:2.91
-"
-DEPEND="${RDEPEND}
-	gnome-base/gnome-common
-	sys-devel/gettext
-	app-text/yelp-tools
-	virtual/pkgconfig
-	>=dev-util/intltool-0.35
-	>=sys-devel/autoconf-2.64
-	>=sys-devel/libtool-2
-"
-
-src_prepare() {
-	eapply "${FILESDIR}/${PN}-0.6.2-gtksourceview-3.8.0.patch"
-	eapply "${FILESDIR}/${PN}-0.7-vte-2.91.patch"
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		$(use_enable eds evolution-data-server)
-}
diff --git a/dev-vcs/giggle/metadata.xml b/dev-vcs/giggle/metadata.xml
deleted file mode 100644
index 93f8632fd83c..000000000000
--- a/dev-vcs/giggle/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>ikelos@gentoo.org</email>
-		<name>Mike Auty</name>
-	</maintainer>
-	<longdescription lang="en">
-		GTK+ based frontend for GIT
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-vcs/mercurial/Manifest b/dev-vcs/mercurial/Manifest
index f1571bb88141..7c060980c636 100644
--- a/dev-vcs/mercurial/Manifest
+++ b/dev-vcs/mercurial/Manifest
@@ -2,12 +2,10 @@ AUX 70mercurial-gentoo.el 76 BLAKE2B 2b9488757b2516dc494ce4f38c89b63669886eefaeb
 AUX cacerts.rc 51 BLAKE2B 8b42b2f4514d938b051feb7e59c69e6b06d1ceabe6c5a252a3cb4033555bcccda9375ae1fa9a5607f07296bd094c425077f5788e2c9fbca9b22914da41ddf132 SHA512 39c40c6cc95c54dcae13effb5c23f541f49fd89e0f040e214673afd906c6d5140eb18801d55330f4455507b467f0fae011998e60932e9a2accf37a0e7a047b90
 AUX mercurial-3.0.1-po_fixes.patch 1396 BLAKE2B 2de846558d2d2f8f4d4ccd7d8e0d65fd96edf31c858d05f0f5c29087a8122fefdd21546dea297709173d812e33774acadf8dada57d178c9ef9fafde560f4be4b SHA512 c696e0df1f6d149e8522123fe51585ded2955bbea782819d634eaf6edb0ddd189c68372692cb247bbd96d51c69801c2d8232e4b0b60093ff1f11b28010292cb7
 DIST mercurial-4.5.2.tar.gz 5779915 BLAKE2B 9abc5a8bafc43bc8e930bb51aa2e57397cd5858dc7bb31d9a37795a4e2799dc03b57130b23e29f89a07bd7502f136594a03d1a4bd5dfd04e2e968213b50413da SHA512 f70e40cba72b7955f0ecec9c1f53ffffac26f206188617cb182e22ce4f43dc8b970ce46d12c516ef88480c3fa076a59afcddd736dffb642d8e23befaf45b4941
-DIST mercurial-4.5.3.tar.gz 5884837 BLAKE2B 61e61624cb397786b7a4f6ed62a3ba0c2ed7cbacc5918341d014a7e0fd9bbe07c91def00539411e71d231d18060de8461bef05590626bf1318691f791e0ad2b5 SHA512 9c23ffefb0a194b5a88ee783186347c21e7d973524ba40119439702953b35b01ad6fbc32ce09ae169f1020963e92312a39321b1da3ffe06db1d44158761abbec
-DIST mercurial-4.6.1.tar.gz 6407380 BLAKE2B 02663a11c56bbd05f123a0903463d7e95cdf3f2e553b0f81b365b4ca296c15bccd735487162870a4e38253c6c0cb1d8f0cf1bbb1b05b3c3b721f2209e4e1b2ec SHA512 0c7737ca803691b135b4906cc527b20595e314009096d8a19f37814ee192b182e7c5360fbf993f632d6071da1f9fca38677e7190c14ed92bafa8add72a4a27d9
 DIST mercurial-4.6.2.tar.gz 6407989 BLAKE2B 22aa121b2544e3597f2ea4d3a7a80b3b8f5ca6f9de15326dbee555ca3d14b8a552042c4448aae17b1c015b4f302c3512c204f17a834b758f51fbcc2455ed4e6f SHA512 71afb9ed3f62b1b946563c55851dda1fc8b724afe82a4a253c7f4719ae9e1160d5f9644bed7fd27ee3a21d8e682352364fc9f47bafa552cd4cd7fac7c0d42bdd
+DIST mercurial-4.7.tar.gz 6476268 BLAKE2B e13458729f06a2516e885abf767989e8df7f3cc743f7f57aa44ca41c6c2c4542a28e6172a7e109395fb76057afc04c2318b10f8b21ae90cb5c9efe6188da0483 SHA512 a08dfc4e296b5d162097769ab38ab85b7c5de16710bce0b6dce2a39f56cb517455c0ed634f689d07e9bd082fb7641501b7da51963844aee7ab28233cf721dec8
 EBUILD mercurial-4.5.2.ebuild 3547 BLAKE2B f472141575aef5f6091625beeb30674e29b3d18e72887045c0e1f70914f285613317f6549679a695f13eda3f8b9af51a0b1270108355394f0ac49de4e76bdbc0 SHA512 04604379d7d11c530bf178f0b316160f0fbfd76ea0aeca5a806482c780a8142109fa23d43383f25f195421f3eacc9217a2dd58128ed2cad45deb1d730cbeb585
-EBUILD mercurial-4.5.3.ebuild 3556 BLAKE2B 97bf79f486cfeaa783c170df4d8460294073eb6a7c5ad6f79faa42bb78c8e35daff20e48d5248ee845f73d3fa231580f2acff63a0104befb900e8dcb08ec143e SHA512 9fb21045a85f89cda4641224ca3b5e8ee7320004b25b2eb134b66c7e25daa93fbfecd23def0ad2bec5b006372eb67bd3d093fa9eac6c62b68153907706b7044b
-EBUILD mercurial-4.6.1.ebuild 3556 BLAKE2B 97bf79f486cfeaa783c170df4d8460294073eb6a7c5ad6f79faa42bb78c8e35daff20e48d5248ee845f73d3fa231580f2acff63a0104befb900e8dcb08ec143e SHA512 9fb21045a85f89cda4641224ca3b5e8ee7320004b25b2eb134b66c7e25daa93fbfecd23def0ad2bec5b006372eb67bd3d093fa9eac6c62b68153907706b7044b
-EBUILD mercurial-4.6.2.ebuild 3552 BLAKE2B d81bb6ef99441130e55d1c31a21f3192fbde691878881e17bfa172906a9491ed084e7226511edce458ba2817128547673b785ad7b4d1777b77d13117badd8581 SHA512 8e7afabafd49959b5295d2d83738c0e9eba286b3d78077205b6f4fd0e99f8c2094ae5d937679dc2dcae336a51e3ef38cf46af90161df187a03bdab9eb63b40b5
+EBUILD mercurial-4.6.2.ebuild 3551 BLAKE2B 0d19507fb765cd391ccb19b2a7aab6715ad900de92dd2dfcf2b0788a32ebe3fa5081230b77fcd35eb8980ba8c898f60275dcd6a479f1fb965d0cbbcd5fff2ba0 SHA512 7967f72dd65ef28e49939cb99bcd696c5e6a373cec68e185fabcb8d6b34dd839a793b8718d65f5348efcff60ad0bdcf3eeba451fc5de9226282ec4a18dd2415a
+EBUILD mercurial-4.7.ebuild 3504 BLAKE2B 0033386d6a0fbc5f0221b58ccd6389d58f852a2ef2a4d30008898cac30911ff120603c6afbcf28b30a42127c46c254c4a265f4b125ab6b9234d2a61351ebb392 SHA512 df17c9707c561fb6cb8174c2aa2a6921660db1b61a169da739f5e5f975e63c0c3c3d3d1157e23046288b0f3417f497bb32c8efa7313f262236a02ed14b748120
 EBUILD mercurial-9999.ebuild 4131 BLAKE2B 55328bbb7ccca04843b595d18c44dbbf5a51e4808a4e9d517355c38f89270551017fdeca45471972210e7246aa970dfa4ae4f5951cd4ff5d33e9ae696ef45b41 SHA512 0f6ee4a02c89c9e08e0a18e1f11169836eb336cf18af01df22d0a8b189c8fa61f0de5fd0b28105f83df55b23f840ad4ea934fac779c64ba5156c042106169c08
 MISC metadata.xml 456 BLAKE2B d824c2b22d9785c268cfadaa4456794cf423ef6df69767577c4df16e6cebe3bc3c02f40ec7dd799eaaf6bac5754bee28b6b923b11d40f628fcb4a4f85a849de9 SHA512 2bf62b3a98e71ff5acba09c06cc1f29a2cb24d6634a384ff800bb10ab6f5de71a5db440b0fa8a5183db95eafc6ad98444a817c23887baf0dc59f6260402574b1
diff --git a/dev-vcs/mercurial/mercurial-4.6.1.ebuild b/dev-vcs/mercurial/mercurial-4.6.1.ebuild
deleted file mode 100644
index 55a97bb048ec..000000000000
--- a/dev-vcs/mercurial/mercurial-4.6.1.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads"
-
-inherit bash-completion-r1 elisp-common eutils distutils-r1 flag-o-matic
-
-DESCRIPTION="Scalable distributed SCM"
-HOMEPAGE="https://www.mercurial-scm.org/"
-SRC_URI="https://www.mercurial-scm.org/release/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="bugzilla emacs gpg test tk"
-
-RDEPEND="bugzilla? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
-	gpg? ( app-crypt/gnupg )
-	tk? ( dev-lang/tk )
-	app-misc/ca-certificates"
-DEPEND="emacs? ( virtual/emacs )
-	test? ( app-arch/unzip
-		dev-python/pygments[${PYTHON_USEDEP}] )"
-
-SITEFILE="70${PN}-gentoo.el"
-
-PATCHES=( "${FILESDIR}/${PN}-3.0.1-po_fixes.patch" )
-
-python_prepare_all() {
-	# fix up logic that won't work in Gentoo Prefix (also won't outside in
-	# certain cases), bug #362891
-	sed -i -e 's:xcodebuild:nocodebuild:' setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	strip-flags -ftracer -ftree-vectorize
-	# Note: make it impl-conditional if py3 is supported
-	append-flags -fno-strict-aliasing
-
-	"${PYTHON}" setup.py build_mo || die
-}
-
-python_compile_all() {
-	rm -r contrib/{win32,macosx} || die
-	if use emacs; then
-		cd contrib || die
-		elisp-compile mercurial.el || die "elisp-compile failed!"
-	fi
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	newbashcomp contrib/bash_completion hg
-
-	insinto /usr/share/zsh/site-functions
-	newins contrib/zsh_completion _hg
-
-	rm -f doc/*.?.txt
-	dodoc CONTRIBUTORS
-	cp hgweb*.cgi "${ED}"/usr/share/doc/${PF}/ || die
-
-	dobin hgeditor
-	dobin contrib/hgk
-	python_foreach_impl python_doscript contrib/hg-ssh
-
-	if use emacs; then
-		elisp-install ${PN} contrib/mercurial.el* || die "elisp-install failed!"
-		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
-	fi
-
-	local RM_CONTRIB=(hgk hg-ssh bash_completion zsh_completion wix buildrpm plan9
-	                  *.el mercurial.spec)
-	for f in ${RM_CONTRIB[@]}; do
-		rm -r contrib/$f || die
-	done
-
-	dodoc -r contrib
-	docompress -x /usr/share/doc/${PF}/contrib
-	doman doc/*.?
-
-	insinto /etc/mercurial/hgrc.d
-	doins "${FILESDIR}/cacerts.rc"
-}
-
-src_test() {
-	pushd tests &>/dev/null || die
-	rm -rf *svn*			# Subversion tests fail with 1.5
-	rm -f test-archive*		# Fails due to verbose tar output changes
-	rm -f test-convert-baz*		# GNU Arch baz
-	rm -f test-convert-cvs*		# CVS
-	rm -f test-convert-darcs*	# Darcs
-	rm -f test-convert-git*		# git
-	rm -f test-convert-mtn*		# monotone
-	rm -f test-convert-tla*		# GNU Arch tla
-	#rm -f test-doctest*		# doctest always fails with python 2.5.x
-	rm -f test-largefiles*		# tends to time out
-
-	popd &>/dev/null || die
-	distutils-r1_src_test
-}
-
-python_test() {
-	local TEST_DIR
-
-	rm -rf "${TMPDIR}"/test
-	distutils_install_for_testing
-	cd tests || die
-	"${PYTHON}" run-tests.py --verbose \
-		--tmpdir="${TMPDIR}"/test \
-		--with-hg="${TEST_DIR}"/scripts/hg \
-		|| die "Tests fail with ${EPYTHON}"
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-
-	elog "If you want to convert repositories from other tools using convert"
-	elog "extension please install correct tool:"
-	elog "  dev-vcs/cvs"
-	elog "  dev-vcs/darcs"
-	elog "  dev-vcs/git"
-	elog "  dev-vcs/monotone"
-	elog "  dev-vcs/subversion"
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-vcs/mercurial/mercurial-4.6.2.ebuild b/dev-vcs/mercurial/mercurial-4.6.2.ebuild
index 010b8d4c338a..cb567c14f46d 100644
--- a/dev-vcs/mercurial/mercurial-4.6.2.ebuild
+++ b/dev-vcs/mercurial/mercurial-4.6.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.mercurial-scm.org/release/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="bugzilla emacs gpg test tk"
 
 RDEPEND="bugzilla? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
diff --git a/dev-vcs/mercurial/mercurial-4.5.3.ebuild b/dev-vcs/mercurial/mercurial-4.7.ebuild
index 55a97bb048ec..472f7fbf0c79 100644
--- a/dev-vcs/mercurial/mercurial-4.5.3.ebuild
+++ b/dev-vcs/mercurial/mercurial-4.7.ebuild
@@ -46,7 +46,7 @@ python_configure_all() {
 }
 
 python_compile_all() {
-	rm -r contrib/{win32,macosx} || die
+	rm -r contrib/win32 || die
 	if use emacs; then
 		cd contrib || die
 		elisp-compile mercurial.el || die "elisp-compile failed!"
@@ -74,8 +74,7 @@ python_install_all() {
 		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
 	fi
 
-	local RM_CONTRIB=(hgk hg-ssh bash_completion zsh_completion wix buildrpm plan9
-	                  *.el mercurial.spec)
+	local RM_CONTRIB=(hgk hg-ssh bash_completion zsh_completion wix plan9 *.el)
 	for f in ${RM_CONTRIB[@]}; do
 		rm -r contrib/$f || die
 	done