gentoo resync : 25.05.2018

14 files changed, 278 insertions, 39 deletions

diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 48b5be8f1d5d..0091837f019a 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/dunst/Manifest b/x11-misc/dunst/Manifest
index 7b567785bf76..2bff9457efbe 100644
--- a/x11-misc/dunst/Manifest
+++ b/x11-misc/dunst/Manifest
@@ -1,5 +1,7 @@
 DIST dunst-1.1.0.tar.bz2 79032 BLAKE2B d0c0550a7bc2da5ba5f3fdfd04d06c03e70cf3bc4b69dc69071667a885a361fbb9564dc02d6a0530b85eea2df845b8b5f917ceef0dbe5159f968f20ef50762f6 SHA512 ba01a6b18da5199b3356342f5c22592f93f447389267810bbfc35decf1a67f89650d445d3c1dd6f3cc76a4f86f7165adc777b669444627e42d3e671d4f04a04b
 DIST dunst-1.2.0.tar.gz 110628 BLAKE2B 4bd695c31da23aa5657e3f8aac7c3d54d66f720f57d1b256c215f5d0a42c1367fbca7838f6f8e85c87df7a65c4679413be30608b48e3f017f54e695fa064c10a SHA512 223c8aae61574770a76bff84723643a3c03d3d9a8f4094bc4e92e16826703e7c0a7c3327945db8469b8dcc48fe5cfaba51e6724149e6571a7ffc1716656e30f3
+DIST dunst-1.3.2.tar.gz 121575 BLAKE2B 97f0011ce960a7852dca5a2917e328de2cc1a052ad0b7c2f07e878e3b6eb5281e49a070a574885b9a66eb6dc30ac07fdfd6322b44cbb7dbc1edf8d193a68b538 SHA512 eb7bff16a19d8f60e2f0eec419a0ffb2f8822b5ec2ffbe535303a71cc7d4ef528e5dbf2fe5f8f2f6f5bfd1ad2d39eab79b68054af924e118c646e059b6929465
 EBUILD dunst-1.1.0.ebuild 1193 BLAKE2B 22be8ac22df55546417fd0afbd6231b9b32ca1f4f95e20729219681a00e397d7a3a13f7499f0d05d72037413fb00dd45a7f2f6ec35a505695087fc6970dd22ea SHA512 3dae12bba3ee11392cb59428164543d36280a256f359041bfa575b26622615c5211370888d7fd12640bcbedddcac60179b630d7485e8783532926ba423d791c4
-EBUILD dunst-1.2.0.ebuild 1069 BLAKE2B 6dce17a435b06bae35455e1b0a9a7e66289162704c7a1a216aeae3eeb9ab3d370966dc9957cc62a0267d5361a347fb8e84e697aa4e5f862146bde5f6827f8b3a SHA512 ba6073ddec4a0f1fd397768bd4a170d16c576d082c8a1780eaa7bb7472e5e08be5b47c68fea3b0fc24a8db18e47e273c5ed770d7a28a9d0de8ca333590facc5a
-MISC metadata.xml 354 BLAKE2B 7024c3c1eb5499cb65bd59147da8c2d8054fccb779970652b62de9fd51617cfe9aee303ac8770da9a12c88515cb1fdf5c47ca9693ba4edd5830588030b6d1916 SHA512 fe149f9d5b272ad4238cd4bdce6fb48d71d4145c2bb0630ec521e16f00fb07009dcd52c1a06f016da333a2aa5972a6f00c36944d676046217ee201e13a676a7a
+EBUILD dunst-1.2.0.ebuild 1074 BLAKE2B 5d447c350b682b60af29da65683aa8255a74d0020e3993a64e1e724a3d9aad690f5f265402c0507f20f327323d5a7425533e14913b762b778b77b52c69040ee2 SHA512 dfda0ac316107e33237af4c0db8bd4bc65d3f0d8831cc81229b7340a58d1f3ba458b84bdbe6108f9a3629121acda63bbec663c640cfcdae469e403aba20bef8c
+EBUILD dunst-1.3.2.ebuild 1077 BLAKE2B 9bec7b7921fb762a6d929cae4d3024561a49dbc83e8ed46347c5b02bce198d7b3e5b2081e1481f9cc7ae914ae039fc9687a365b3c8819170ec5788840ec4f59f SHA512 9d809d67cf6b59a4c6d2bab878bbc154f20a0f45a6a4344895af14d42e63b760801adc53087c24e29057fe9373ed98f8df13a9bc4cd85ca4ffc5d04aa3a03de3
+MISC metadata.xml 448 BLAKE2B 088d419b835ebdb800e07ae00892d0c01bef6f862d72ac3976d58202e532870c1c0f8e96ea292c95e9579bda48b5c81952f954afee300e250a21167af639bf7e SHA512 4269d385c94e1dcfcd89f9ba95486da2a7feea2370fe1cef33051a3886e8c7612911bca2da15fa049d6692994c8c342e308fdfa2645a5f576ad93080e8d54d73
diff --git a/x11-misc/dunst/dunst-1.2.0.ebuild b/x11-misc/dunst/dunst-1.2.0.ebuild
index ceff714d927e..01a433b8b8ea 100644
--- a/x11-misc/dunst/dunst-1.2.0.ebuild
+++ b/x11-misc/dunst/dunst-1.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/${PN}-project/${PN}/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE="dunstify"
 
 CDEPEND="
diff --git a/x11-misc/dunst/dunst-1.3.2.ebuild b/x11-misc/dunst/dunst-1.3.2.ebuild
new file mode 100644
index 000000000000..18ef727cb181
--- /dev/null
+++ b/x11-misc/dunst/dunst-1.3.2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="Customizable and lightweight notification-daemon"
+HOMEPAGE="http://www.knopwob.org/dunst/ https://github.com/dunst-project/dunst"
+SRC_URI="https://github.com/${PN}-project/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="dunstify"
+
+CDEPEND="
+	dev-libs/glib:2
+	dev-libs/libxdg-basedir
+	sys-apps/dbus
+	x11-libs/cairo[X,glib]
+	x11-libs/gdk-pixbuf
+	x11-libs/libX11
+	x11-libs/libXScrnSaver
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	x11-libs/pango[X]
+	dunstify? ( x11-libs/libnotify )
+"
+DEPEND="
+	${CDEPEND}
+	dev-lang/perl
+	virtual/pkgconfig
+"
+
+RDEPEND="${CDEPEND}"
+
+src_prepare() {
+	sed -i -e "/^CFLAGS/ { s:-g::;s:-O.:: }" config.mk || die
+
+	default
+}
+
+src_compile() {
+	tc-export CC
+	emake
+	use dunstify && emake dunstify
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="/usr" install
+
+	use dunstify && dobin dunstify
+
+	dodoc AUTHORS CHANGELOG.md README.md RELEASE_NOTES
+}
diff --git a/x11-misc/dunst/metadata.xml b/x11-misc/dunst/metadata.xml
index f0fe7c4c53ca..de3681ee1319 100644
--- a/x11-misc/dunst/metadata.xml
+++ b/x11-misc/dunst/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type='project'>
-<email>desktop-misc@gentoo.org</email>
-<name>Gentoo Desktop Miscellaneous Project</name>
-</maintainer>
-<use>
-<flag name="dunstify">Experimental replacement for notify-send.</flag>
-</use>
+	<maintainer type='project'>
+		<email>desktop-misc@gentoo.org</email>
+		<name>Gentoo Desktop Miscellaneous Project</name>
+	</maintainer>
+	<use>
+		<flag name="dunstify">Experimental replacement for notify-send.</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">dunst-project/dunst</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/x11-misc/gmrun/Manifest b/x11-misc/gmrun/Manifest
index dc2563a8088b..8d4d9810634c 100644
--- a/x11-misc/gmrun/Manifest
+++ b/x11-misc/gmrun/Manifest
@@ -1,7 +1,9 @@
 AUX gmrun-0.9.2-gcc43.patch 744 BLAKE2B 3b9fb28048c9ed4017811348011c7560cb71e1fe54b8c1348e795abec8593afcd1823202270ee7727450bf654ff0327b14f74d66defd62cb3ec77210c88498ef SHA512 376d0a5425f264044cb0d1635e0c5aaede0ad962fa21fc552cf2ae4145a33520f8035193fd4e9c3108ef5cfdc671aa2fc4922479836d392a0d3d287e810593c5
+AUX gmrun-0.9.2-gcc6-pie.patch 2772 BLAKE2B 7fc08a7a1570d1dba41551b99209636f2c13337c35c8bd0e90bcc4526eee0d44f40be339b2946ff8dc4e040b9589c733478b251b267a54b39bc3e54af2f666e2 SHA512 55fe649a1a79a9a5b78e84856577ac9bfddcee56b671941932b8907212203e67e3de186dfdbc117341e486b7fce2ab511df3df0032b9438da1e221280ad553cc
 AUX gmrun-0.9.2-glibc210.patch 324 BLAKE2B 6080d23e033fe589c6df27622c955dc4c81100635c8fb977c0bd7dfd99dd128247ce72f03d63964b045944f492db899fd262a8e41ba303a7709e81377db2e474 SHA512 6488186908e33fe27e4e4f6d81fe9dd5fc1bb74e15b2153ebd660788be75432e68dfebb6ee21b17a0711b99d5d1e54eaf0a4384111bfe56134cce817b4bed49d
 AUX gmrun-0.9.2-stlport.patch 697 BLAKE2B 6ebb5d3a8a0a0047ab5a537a5a6f7814add9b9a9ae05feb0ac9b9eab8b5643097b2b31ec0afadfbe345abba89d46432b64bdf34e1f1516ffa2c0c4fd8422bddd SHA512 84ea68891309b6c3a29188e188e4572b7228abf3d874f138750cf51f33f8fc42aee33f8f4538fc80e324c16e64c68b739cc321cb94e49dd4ace5ec1b3bc4605d
 AUX gmrun-0.9.2-sysconfdir.patch 863 BLAKE2B 11cd0ded75db0d90843799a1e06cc9118bf323d540d3870acf3c98e34486b902cb08e03a859c2a0debb1761a5d20923d560b41e276743640d9ab7a85026cb8ce SHA512 0c201cc73f35bf1d56ccc072e2adcc8c6acf5d42d325919fc2e4c4d4440db076812e5a4dc67cde3f857b78332b7f37adc1fb250bababee6ff4aecc16ecc0cbee
 DIST gmrun-0.9.2.tar.gz 66097 BLAKE2B 3b8f253e8d683d02c8b6cc8da3d54103b53c6b9ebd4d90b4675325809f592f407a32532e6f0d3d3a112f5c7b9304eaae75bc3ba7f1e1b372614d95206edf0da3 SHA512 3ce881463c23b6c2c39b4d41ff98f3d4a2b77f45a46d4ac43d8bbf726fcb3769b643436932714f9f5c22b855188928453810468d165af2c2433059a0149d6422
 EBUILD gmrun-0.9.2-r1.ebuild 837 BLAKE2B 597e3bf5f5bb78fa88d6cd30f40ff8b988ddadd4628951280b0822d00a4c41c4a99639328564ccaa5cce79fef0ef778b1676eb3be8f73e2e498eac5b891dabf7 SHA512 20d45866530f4c4b817a44eecb37a756f7381c1679bea84413d4bd2064c6f9df5993f465d33545fd3425327edb9266c5318c8f13b11a50e22318c73bdc032885
+EBUILD gmrun-0.9.2-r2.ebuild 768 BLAKE2B 3e79d32b18a322c86b83da6eb171ff6314757a8b2c81f7a6282301b015d73e3c29743354921b6ab7e410f1d88a808607313029ff6f9b689bdb80a8acd6b7011a SHA512 e36415e424243fd967bf85fb7cc66b8790da7db137aa61de9a0eaf24fc9c0199c2820a2bf54257e7e9827f0e427c653fd963941d72d824c4353f48040bfde46c
 MISC metadata.xml 523 BLAKE2B 64ba9f284e12ddc2c01c23641870422810ea147ef875177c633082e9ab65f86b0cef0ae332eb61235cee9facdc2de08a9a3e07b27cf595696ab3e42d03a161e2 SHA512 8cd78652f2a6be93952b1edb9570261fba71afff13eeba915e47c4178adfbb26450ed1159812ad211c941a0ffbd96b3e5b864c2c7300b882d2245285a1d3f730
diff --git a/x11-misc/gmrun/files/gmrun-0.9.2-gcc6-pie.patch b/x11-misc/gmrun/files/gmrun-0.9.2-gcc6-pie.patch
new file mode 100644
index 000000000000..3ef46c7bd653
--- /dev/null
+++ b/x11-misc/gmrun/files/gmrun-0.9.2-gcc6-pie.patch
@@ -0,0 +1,84 @@
+From 351d355835532dbea8430902977873e887dd1c12 Mon Sep 17 00:00:00 2001
+From: Lucian Poston <lucian.poston@gmail.com>
+Date: Wed, 6 Dec 2017 04:22:28 -0800
+Subject: [PATCH] fix segfault in gcc-6
+
+---
+ src/gtkcompletionline.cc | 27 +++++++++++++++------------
+ src/gtkcompletionline.h  |  2 +-
+ 2 files changed, 16 insertions(+), 13 deletions(-)
+
+diff --git a/src/gtkcompletionline.cc b/src/gtkcompletionline.cc
+index eb324b5..537fafb 100644
+--- a/src/gtkcompletionline.cc
++++ b/src/gtkcompletionline.cc
+@@ -77,22 +77,25 @@ static gboolean
+ on_key_press(GtkCompletionLine *cl, GdkEventKey *event, gpointer data);
+ 
+ /* get_type */
+-guint gtk_completion_line_get_type(void)
++GType gtk_completion_line_get_type(void)
+ {
+-  static guint type = 0;
++  static GType type = 0;
+   if (type == 0)
+   {
+-    GtkTypeInfo type_info =
++    static const GTypeInfo type_info =
+     {
+-      "GtkCompletionLine",
+-      sizeof(GtkCompletionLine),
+       sizeof(GtkCompletionLineClass),
+-      (GtkClassInitFunc)gtk_completion_line_class_init,
+-      (GtkObjectInitFunc)gtk_completion_line_init,
+-      /*(GtkArgSetFunc)*/NULL /* reserved */,
+-      /*(GtkArgGetFunc)*/NULL /* reserved */
++      NULL,
++      NULL,
++      (GClassInitFunc)gtk_completion_line_class_init,
++      NULL,
++      NULL,
++      sizeof(GtkCompletionLine),
++      0,
++      (GInstanceInitFunc)gtk_completion_line_init,
++      NULL
+     };
+-    type = gtk_type_unique(gtk_entry_get_type(), &type_info);
++    type = g_type_register_static(GTK_TYPE_ENTRY, "GtkCompletionLine", &type_info, (GTypeFlags)0);
+   }
+   return type;
+ }
+@@ -114,7 +117,7 @@ gtk_completion_line_class_init(GtkCompletionLineClass *klass)
+ 
+   gtk_completion_line_signals[NOTUNIQUE] =
+     gtk_signal_new("notunique",
+-                   GTK_RUN_FIRST, G_TYPE_FROM_CLASS(object_class),
++                  GTK_RUN_FIRST, G_TYPE_FROM_CLASS(object_class),
+                    GTK_SIGNAL_OFFSET(GtkCompletionLineClass,
+                                      notunique),
+                    gtk_signal_default_marshaller, GTK_TYPE_NONE, 0);
+@@ -778,7 +781,7 @@ complete_line(GtkCompletionLine *object)
+ GtkWidget *
+ gtk_completion_line_new()
+ {
+-  return GTK_WIDGET(gtk_type_new(gtk_completion_line_get_type()));
++  return GTK_WIDGET(g_object_new(gtk_completion_line_get_type(), NULL));
+ }
+ 
+ static void
+diff --git a/src/gtkcompletionline.h b/src/gtkcompletionline.h
+index 5e14cd7..0d7f2dc 100644
+--- a/src/gtkcompletionline.h
++++ b/src/gtkcompletionline.h
+@@ -76,7 +76,7 @@ extern "C++" {
+     void (* cancel)(GtkCompletionLine *cl);
+   };
+ 
+-  guint gtk_completion_line_get_type(void);
++  GType gtk_completion_line_get_type(void);
+   GtkWidget *gtk_completion_line_new();
+ 
+   void gtk_completion_line_last_history_item(GtkCompletionLine*);
+-- 
+2.13.6
+
diff --git a/x11-misc/gmrun/gmrun-0.9.2-r2.ebuild b/x11-misc/gmrun/gmrun-0.9.2-r2.ebuild
new file mode 100644
index 000000000000..b2ce6fb13cbd
--- /dev/null
+++ b/x11-misc/gmrun/gmrun-0.9.2-r2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools
+
+DESCRIPTION="A GTK-2 based launcher box with bash style auto completion!"
+HOMEPAGE="https://sourceforge.net/projects/gmrun/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-1"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~ppc ~x86"
+
+RDEPEND="
+	dev-libs/glib:2
+	dev-libs/popt
+	x11-libs/gtk+:2
+"
+DEPEND="
+	${RDEPEND}
+	elibc_glibc? ( >=sys-libs/glibc-2.10 )
+	sys-apps/sed
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	eapply \
+		"${FILESDIR}"/${P}-gcc43.patch \
+		"${FILESDIR}"/${P}-gcc6-pie.patch \
+		"${FILESDIR}"/${P}-sysconfdir.patch \
+		"${FILESDIR}"/${P}-glibc210.patch \
+		"${FILESDIR}"/${P}-stlport.patch
+
+	eapply_user
+	eautoreconf
+}
diff --git a/x11-misc/shared-mime-info/Manifest b/x11-misc/shared-mime-info/Manifest
index 117f72d816bb..45573af795f5 100644
--- a/x11-misc/shared-mime-info/Manifest
+++ b/x11-misc/shared-mime-info/Manifest
@@ -1,3 +1,3 @@
 DIST shared-mime-info-1.9.tar.xz 607648 BLAKE2B 6ac4c0dbe3862be78dc4fb5711ca3c8137ae9dee83752b1811991f44bae0ba83036fb10c598c4a098933df8914a67212db97c8bcfefc80febd2ce3e4673846d7 SHA512 b4ab7bfec4cbc827fe0d459040967afb714c073ad27ec9ad46e51ebc49c56b2a85501a3c8c5c199b4cb5359fc46580d6f2dfdb49da1670216d5d2b56758de491
-EBUILD shared-mime-info-1.9.ebuild 1471 BLAKE2B 56a16d41ea79d6205fc12f4267192f0d6139c3e43de5ede74bf154577d217baa687c3eed46201bbbb61b58a6a44fcddc484bbf48fdcdd1d1b134c9a7c52ae89b SHA512 4cad2957b70ba474ff6986ac4e9dfad8752f1acebd103df29825174e2c8152032b3c6ce84b94187816e2c4765657f396ca1da6c906452225358e856e8c612878
+EBUILD shared-mime-info-1.9.ebuild 1468 BLAKE2B 0209388692eb50642d52579e68b110424c8417886e2d7f89a1129c6aa45472e8ed9fb2ca722fceffddf9f449db9fa6a053bd543a8cdbab43afa1c0b9268ba952 SHA512 2b5b7ddc08167cc72df3f5c07ee1a9b76c316ad76c6fce1bea43ffb044c91e7792d850b21afefbbf7a580ea9597eeceb738cc4db9bbc8532c99d70fdcfe68a50
 MISC metadata.xml 228 BLAKE2B 6b6559027915d8578c02e363cc855e812c338acf7716fe4108a8b85c09152a086cb578e7361f4613a44e8b550d7e205ff43aea39dd9488951fa18c6e15042278 SHA512 4f5e63f918a0f8790db49c5b12173c673f86935f00796a04acfed573f618379b73b05b1869941e11f881fe69d4958f5287ce815fd710eadb6ac9f2680894caae
diff --git a/x11-misc/shared-mime-info/shared-mime-info-1.9.ebuild b/x11-misc/shared-mime-info/shared-mime-info-1.9.ebuild
index 4d7eae0ed5e1..78fe4402a9dc 100644
--- a/x11-misc/shared-mime-info/shared-mime-info-1.9.ebuild
+++ b/x11-misc/shared-mime-info/shared-mime-info-1.9.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://people.freedesktop.org/~hadess/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND=">=dev-libs/glib-2
diff --git a/x11-misc/xiccd/Manifest b/x11-misc/xiccd/Manifest
index 93f58b3f2e0a..30ef34759e77 100644
--- a/x11-misc/xiccd/Manifest
+++ b/x11-misc/xiccd/Manifest
@@ -1,5 +1,3 @@
-DIST xiccd-0.2.3.tar.gz 30136 BLAKE2B 8e45754d76aae29e0ca398534d2031e058964685d8fda7e1f082fdc96c012158226f3e57fccc99dce253f3a948c6a04ef0aba85f45ce674061b982597179235c SHA512 2c68c5de95dd6390c4196e198c63a78f82903d4f1210b98b8e67ee7b0ebc5d06e21e553288e2ced26c2df9c232c0b6fd1972308bf0a0e31dbdfae8ec208a86ec
 DIST xiccd-0.2.4.tar.gz 30981 BLAKE2B 079b743f88308b3fff5826bccef125c90636182cf1e6311166e91a337b24be824ac564696f1c65d112fccf737bfbff968ce3d96a2a31ba29cca1069377e16695 SHA512 40101467a38e9369b171b44d5d7fd4b07968dfcd74ace89e15f3dfad32131a3dc3b26249af2340e408908bd3df766785b46e885a3b68ff26b24ed2627a40cd2c
-EBUILD xiccd-0.2.3.ebuild 506 BLAKE2B 0e58d75c0d583104f3191817ae9689a4176447515b8abfb08ac8d9ec8826caf2fa043dc54c41316da8d3b9bc36ccec0f0f224affd0d6202eae063debe871fcec SHA512 85650c8738fb06ae5981bf6d42e1dacdc0dccbf28cdc083a57ae5d167d40059ceffdd770da8d40f5c438653b13066cf175ea516c2c117241efd0ec66cbda2ac5
 EBUILD xiccd-0.2.4.ebuild 506 BLAKE2B 1af3760f9e7de84bd58183a29e90c720f90e2040256e1d9e3b86d9abbf4b36ea4a42d84155342dd0073488d54ddcdf372bf40b9247009077bb9f9bdde660d0ac SHA512 ffd40914be02c49134a58f419e49423dbeb8bb612a56537331ff948b9c08e09cdea7bbf29a5eedf63586fa80e4e911717b8fa61c84cf1139585c8c3415a7aa7a
 MISC metadata.xml 764 BLAKE2B 386c639b7452560295dc0b25e0dfafe126c868d4749711125faf5aa57c027d45ac69ce658d09f775504eea2a8ee9d1ef89cb821ccf695d17506fe14639d847f8 SHA512 91b048281b6c4ca83e6ba61e870e5f04b90bae2668727edf18946c1ee703284b48a4caf4a1f259c80106fcdcaba91c10048c9f4569a2a5b45110a8acd2e1b2db
diff --git a/x11-misc/xiccd/xiccd-0.2.3.ebuild b/x11-misc/xiccd/xiccd-0.2.3.ebuild
deleted file mode 100644
index 71eb9b4bf531..000000000000
--- a/x11-misc/xiccd/xiccd-0.2.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="A desktop environment-independent bridge between colord and X"
-HOMEPAGE="https://github.com/agalakhov/xiccd"
-SRC_URI="https://github.com/agalakhov/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="dev-libs/glib:2
-	x11-apps/xrandr
-	x11-misc/colord"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-	eautoreconf
-}
diff --git a/x11-misc/zim/Manifest b/x11-misc/zim/Manifest
index 8c7bf1930c59..d68abf35fdcd 100644
--- a/x11-misc/zim/Manifest
+++ b/x11-misc/zim/Manifest
@@ -3,8 +3,10 @@ DIST zim-0.65.tar.gz 1899614 BLAKE2B e7989d91120f2ffe0668c996b5abd61cc1cb12b2a5a
 DIST zim-0.66.tar.gz 2020216 BLAKE2B 7a2af3dca2ff72dd94c605c4fa89b0d3be1413643c781aa151483445e6a029db6021ed84df797b6d9aaac05fd791fe50e4bdc9f1682d252e80f083bf37a10602 SHA512 9693dba8ee6ad915a85ca999674350b278043559ba4adf93c03c8815211ecab451a6e2dceaf62ea7048609eb86f19485f2dd77dbaaf6f2d81f97f6450bf25ca9
 DIST zim-0.67.tar.gz 2034747 BLAKE2B 47e49191e699f93727f566593d616ef0da5b826dccb2f952c6220627d67f295d40e57b9e00dec8395a933a0378c0b1b05c25db7a2cb30fd4509e6ee06269c831 SHA512 0f3387a74a9d6a1e972b4ad411230b9318c58432bd853ef6d45cd535dcdef901369a70dd619b842f1e6564a4b583075865d30acb75cc7649facf5acfe43d8b94
 DIST zim-0.68-rc1.tar.gz 2602967 BLAKE2B 7a1eed33e8d7f27ea287c993f1dde5e8d89cc9435f909ede5696f80ceaee454a38d0ab903313d6a07375797bd43cf48925e81be725094d4a4ce188f750fcac9e SHA512 60c2c654f6b40edcf029efb8367e18a8c4cca7fde11339f4ab9b3724f07f4041aae5740cd7a42fe3b2f836537c699ad597cef0eaec0b0511cb7c65b40ea6e04e
+DIST zim-0.68.tar.gz 2044224 BLAKE2B 5c53c3197bc5de90c38059e7323366ed5b7600ebf0b3575d81e618d972d0360f67660da4637f1e6f1459549b21525ed17183e9c2f57f8ab0b27236e36bda9666 SHA512 4ab7f2b55e37ae917a7faa0018a36cbad2534bb43146f47810479155009eb2ccbf4f8ab185d8b4cd3ba7e22a4e2fc5eb08c4bae0688186c13d31dfcab23b0048
 EBUILD zim-0.65.ebuild 1777 BLAKE2B 29f8c8c7bd19e0580603df7a246160f57f42f08c4e474abd8852245dbe7e1656e8d8e17bdc7952771c571ea94c35c18d80e67c4990e8206c5baa806ff2847977 SHA512 d3d2cb0eea9629277c38883523a7cda05a275b729c34805c9eeaab11ea016d46b05f325efb7d6af2a093d3c71fac0b8e50e46b642a62275772cb9f2a870de6e0
 EBUILD zim-0.66.ebuild 1779 BLAKE2B b3f4597786e61255a1cfc5990ea88354be0db3f86e0c1fab2472bbccf4e7384b596bd1e6ea795a5debe3a7fb8a5fe9d539f58cb269e7a170d5f81000bffebde2 SHA512 e2f1e3bc0f287beeb2e7b1fbabb0225fc06776682bdc832d6c874f8159a64a750bbaeb73461bc81ca40f03780f44d3a7f2dc2a26aa08b9102d808c200d39dd0e
 EBUILD zim-0.67.ebuild 1828 BLAKE2B b6fc04b1b8166a2c4e4539ce1533f41d9d40ba7798031886b508fefa34ee71b554135f8962bb6d4c7e075b13b219e6354ecc233c98b549804f65cebfc218ab16 SHA512 d735ebe9821d634fff6ee707b2694cc347b32a7d65b88a0f7a179171496088714ac4fb6cce5806c60881d5149971b41438c2707b52457e4daa8d08f0e4bd71d3
+EBUILD zim-0.68.ebuild 1847 BLAKE2B 12615ea89e434348ff24ed1f492a09c11944c54c1bc4931f8a555b04eed4bb909a205e7b980ae1a6e63054441cafb854c5b76b21b068ad2b62daa51a76e69238 SHA512 5fe0bd6aa83e1645b630a70c287fe50e16a60fc6bdb966fb768be2052d65bd4c484ee1896379fd6990d30614b4048834460813ffa15179ac57127946a51504d5
 EBUILD zim-0.68_rc1.ebuild 1871 BLAKE2B 9bcd6204f6e7c06face149cfa2b77fafcc90dc69c2e55359fe1b5df83ee0735368be03a527ca5d7bd811b0da242b2ecd740dc46d8a39526778420f226d6e807e SHA512 4d6f5ffd3247519248ee30c48f922b576526e954280ef76b954145bd368cbb10a2c8304d1dc9de12c526be1802a381cbe2f84ee0e080be0551ae94529da685f0
 MISC metadata.xml 824 BLAKE2B a6ac745b62015073844af9a8aae0ef1d6ca6b7c28e881c7b85d31e00c808076fa944feec5980cdefc72b5ddfa2cecb98fc96b4745df12743212a4d572679408d SHA512 26a4774e75f0a06bfedc2c26f4ca688f9a2644935302e0674ba5a5308af88bc90f291a01f5b10bba62ac0f0a46561d63bfd9289de67bc53c4be454542ea76816
diff --git a/x11-misc/zim/zim-0.68.ebuild b/x11-misc/zim/zim-0.68.ebuild
new file mode 100644
index 000000000000..44110e717f31
--- /dev/null
+++ b/x11-misc/zim/zim-0.68.ebuild
@@ -0,0 +1,79 @@
+# 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="sqlite"
+DISTUTILS_SINGLE_IMPL=1
+
+inherit xdg-utils distutils-r1 gnome2-utils virtualx
+
+DESCRIPTION="A desktop wiki"
+HOMEPAGE="http://zim-wiki.org/"
+SRC_URI="http://zim-wiki.org/downloads/${P}.tar.gz"
+
+LICENSE="BSD GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="dev-python/pygtk[${PYTHON_USEDEP}]
+	dev-python/pygobject:2[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	x11-misc/xdg-utils
+	test? (
+		dev-vcs/bzr
+		dev-vcs/git
+		dev-vcs/mercurial )"
+
+DOCS=( CHANGELOG.txt README.txt HACKING )
+PATCHES=( "${FILESDIR}"/${PN}-0.60-remove-ubuntu-theme.patch )
+
+python_prepare_all() {
+	sed -i -e "s/'USER'/'LOGNAME'/g" zim/__init__.py zim/fs.py || die
+
+	if [[ ${LINGUAS} ]]; then
+		local lingua
+		for lingua in translations/*.po; do
+			lingua=${lingua/.po}
+			lingua=${lingua/translations\/}
+			has ${lingua} ${LINGUAS} || \
+				{ rm translations/${lingua}.po || die; }
+		done
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	VIRTUALX_COMMAND="${PYTHON}" virtualmake test.py
+}
+
+python_install() {
+	distutils-r1_python_install --skip-xdg-cmd
+}
+
+pkg_postinst() {
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+	if ! has_version ${CATEGORY}/${PN}; then
+		einfo "Please emerge these packages for additional functionality"
+		einfo "    dev-lang/R"
+		einfo "    dev-python/gtkspell-python"
+		einfo "    dev-vcs/bzr"
+		einfo "    media-gfx/graphviz"
+		einfo "    media-gfx/imagemagick"
+		einfo "    media-gfx/scrot"
+		einfo "    media-sound/lilypond"
+		einfo "    sci-visualization/gnuplot"
+		einfo "    virtual/latex-base app-text/dvipng"
+	fi
+}
+
+pkg_postrm() {
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+}