proj/gentoo: Initial commit

This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
author: Robin H. Johnson <robbat2@gentoo.org> 2015-08-08 13:49:04 -0700
committer: Robin H. Johnson <robbat2@gentoo.org> 2015-08-08 17:38:18 -0700
commit: 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree: 3f91093cdb475e565ae857f1c5a7fd339e2d781e /x11-misc
download: gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
1405 files changed, 38692 insertions, 0 deletions
diff --git a/x11-misc/3ddesktop/3ddesktop-0.2.9-r1.ebuild b/x11-misc/3ddesktop/3ddesktop-0.2.9-r1.ebuild
new file mode 100644
index 000000000000..68896485ba48
--- /dev/null
+++ b/x11-misc/3ddesktop/3ddesktop-0.2.9-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils
+
+DESCRIPTION="OpenGL virtual desktop switching"
+HOMEPAGE="http://desk3d.sourceforge.net/"
+SRC_URI="mirror://sourceforge/desk3d/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+
+RDEPEND="
+	>=media-libs/freetype-2
+	media-libs/freeglut
+	media-libs/imlib2[X]
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXi
+	x11-libs/libXmu
+	x11-libs/libXt
+	x11-libs/libXxf86vm
+"
+DEPEND="
+	${RDEPEND}
+	x11-proto/xf86vidmodeproto
+	x11-proto/xproto
+"
+
+DOCS=( AUTHORS TODO ChangeLog README README.windowmanagers )
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-gcc4.patch \
+		"${FILESDIR}"/${P}-asneeded.patch \
+		"${FILESDIR}"/${P}-missing-include.patch \
+		"${FILESDIR}"/${P}-gl_init.patch
+
+	eautoreconf
+}
+
+pkg_postinst() {
+	echo
+	elog "This ebuild installed a configuration file called /etc/3ddesktop.conf"
+	elog "The default configuration makes a screenshot of the virtual desktops"
+	elog "every X seconds. This is non-optimal behavior."
+	elog
+	elog "To enable a more intelligent way of updating the virtual desktops,"
+	elog "execute the following:"
+	elog
+	elog "  echo \"AutoAcquire 0\" >> /etc/3ddesktop.conf"
+	elog
+	elog "This will cause 3ddesktop to update the virtual desktop snapshots"
+	elog "only when a 3d desktop switch is required."
+}
diff --git a/x11-misc/3ddesktop/Manifest b/x11-misc/3ddesktop/Manifest
new file mode 100644
index 000000000000..3c778c2be7e1
--- /dev/null
+++ b/x11-misc/3ddesktop/Manifest
@@ -0,0 +1 @@
+DIST 3ddesktop-0.2.9.tar.gz 182278 SHA256 8fde969c1aec60685e0a74d2ebcfa1ef570df454288d5774646e2b291515e8c5 SHA512 87de83561bc1614e4dde623197b04e482e04ad363ba88adf4e4e9950a942a5725d2a7199406949981c1a4aeba5d71fb9a1693f99aefa21ed7b83e083bb902686 WHIRLPOOL 5238f9c99b1df49cab181e0d872c6af0d54b8fc126801c9d7a0b145729e7921cb5db82d734498506af74a0dcc2a7fe51009bfbe6a06b018754ed5980aa32560f
diff --git a/x11-misc/3ddesktop/files/3ddesktop-0.2.9-asneeded.patch b/x11-misc/3ddesktop/files/3ddesktop-0.2.9-asneeded.patch
new file mode 100644
index 000000000000..2534535dee1f
--- /dev/null
+++ b/x11-misc/3ddesktop/files/3ddesktop-0.2.9-asneeded.patch
@@ -0,0 +1,13 @@
+http://bugs.gentoo.org/206817
+
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -37,7 +37,7 @@
+        camera.cpp \
+        config.cpp
+ 
+-3ddeskd_LDFLAGS = $(imlib2_libs) @GL_LIBS@ 
++3ddeskd_LDADD = $(imlib2_libs) @GL_LIBS@ 
+ 
+ noinst_HEADERS = 3ddesk.h \
+        arrange.hpp  \
diff --git a/x11-misc/3ddesktop/files/3ddesktop-0.2.9-gcc4.patch b/x11-misc/3ddesktop/files/3ddesktop-0.2.9-gcc4.patch
new file mode 100644
index 000000000000..a67753fcee39
--- /dev/null
+++ b/x11-misc/3ddesktop/files/3ddesktop-0.2.9-gcc4.patch
@@ -0,0 +1,14 @@
+http://bugs.gentoo.org/118458
+
+--- a/event.hpp
++++ b/event.hpp
+@@ -74,7 +74,7 @@
+         list<Event *>::iterator k;
+         for (k = events.begin(); k != events.end(); ++k) {
+             Event *e = *k;
+-            printf(":: Event %d  0x%x\n", e->type, (unsigned int)(e->function));
++            printf(":: Event %d  %p\n", e->type, e->function);
+         }
+     }
+
+
diff --git a/x11-misc/3ddesktop/files/3ddesktop-0.2.9-gl_init.patch b/x11-misc/3ddesktop/files/3ddesktop-0.2.9-gl_init.patch
new file mode 100644
index 000000000000..d817cea54ece
--- /dev/null
+++ b/x11-misc/3ddesktop/files/3ddesktop-0.2.9-gl_init.patch
@@ -0,0 +1,23 @@
+http://bugs.gentoo.org/123762
+
+--- a/3ddeskd.cpp
++++ b/3ddeskd.cpp
+@@ -2411,15 +2411,15 @@
+ 
+     // initialize opengl
+ 
+-    // our own init function.
+-    gl_init();
+-
+     GLWin.open_display();
+ 
+ 
+     GLWin.create_GL_window("Enhanced 3-dimensional workspace visualization magic machine", 
+                            cfg->options->do_fullscreen);
+ 
++    // our own init function.
++    gl_init();
++
+     cfg->texture_size = GLWin.get_best_texture_size(cfg->texture_size);
+ 
+     // Loads up the correct perspective matrix
diff --git a/x11-misc/3ddesktop/files/3ddesktop-0.2.9-missing-include.patch b/x11-misc/3ddesktop/files/3ddesktop-0.2.9-missing-include.patch
new file mode 100644
index 000000000000..328cbcad6d29
--- /dev/null
+++ b/x11-misc/3ddesktop/files/3ddesktop-0.2.9-missing-include.patch
@@ -0,0 +1,12 @@
+http://bugs.gentoo.org/228217
+
+--- a/config.hpp
++++ b/config.hpp
+@@ -24,6 +24,7 @@
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <cstring>
+ 
+ #include <errno.h>
+ #include <unistd.h>
diff --git a/x11-misc/3ddesktop/metadata.xml b/x11-misc/3ddesktop/metadata.xml
new file mode 100644
index 000000000000..a31c49d0edc4
--- /dev/null
+++ b/x11-misc/3ddesktop/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>desktop-misc</herd>
+	<longdescription>
+3d Destkop is an OpenGL program for switching virtual desktops in a seamless
+3-dimensional manner. The current desktop is mapped into a 3D space where you
+may choose other screens. Several different visualization modes are available.
+</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">desk3d</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-misc/3dfb/3dfb-0.6.1-r1.ebuild b/x11-misc/3dfb/3dfb-0.6.1-r1.ebuild
new file mode 100644
index 000000000000..1152cd8b6776
--- /dev/null
+++ b/x11-misc/3dfb/3dfb-0.6.1-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="3D File Browser"
+HOMEPAGE="http://sourceforge.net/projects/dz3d/"
+SRC_URI="mirror://sourceforge/dz3d/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+
+RDEPEND="dev-libs/glib:2
+	media-libs/freeglut
+	virtual/opengl
+	x11-libs/libXmu"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS ChangeLog NEWS README WISHLIST )
+
+src_prepare() {
+	epatch "${FILESDIR}/${PV}-gcc41.patch" \
+		"${FILESDIR}/${P}-freeglut-compat.patch"
+	epatch_user
+}
diff --git a/x11-misc/3dfb/Manifest b/x11-misc/3dfb/Manifest
new file mode 100644
index 000000000000..6a29076b7074
--- /dev/null
+++ b/x11-misc/3dfb/Manifest
@@ -0,0 +1 @@
+DIST 3dfb-0.6.1.tar.gz 102343 SHA256 94321725651711a7f7e61f8c479e519985f980e788dfa6a840300d8a41dacf3f SHA512 3eb43dd80d5ffaea8845e84e2cf21599ee36739ac99d558c4c11592363970795e60b30f444229c987f527a0765fa657111d7a54eef84b5d3d9375c7a812588f1 WHIRLPOOL 4d589d3f9a0b3823e7e64db15f147eced83224db5c20e73c40ac98a7192b93a409f36d561017fc4d23a354e210bdf1e9cafddee8461fe94c88abc79cb578263a
diff --git a/x11-misc/3dfb/files/0.6.1-gcc41.patch b/x11-misc/3dfb/files/0.6.1-gcc41.patch
new file mode 100644
index 000000000000..2a964f66c21d
--- /dev/null
+++ b/x11-misc/3dfb/files/0.6.1-gcc41.patch
@@ -0,0 +1,12 @@
+diff -Nur 3dfb-0.6.1.orig/src/gui.cpp 3dfb-0.6.1/src/gui.cpp
+--- 3dfb-0.6.1.orig/src/gui.cpp	2004-07-28 22:32:21.000000000 +0000
++++ 3dfb-0.6.1/src/gui.cpp	2006-09-18 21:35:01.271923722 +0000
+@@ -70,7 +70,7 @@
+ 
+ 
+ static fileMap fileMap;
+-static levelLocation levels[fileMap.maxLevels];
++static levelLocation levels[1024];
+ 
+ 
+ 
diff --git a/x11-misc/3dfb/files/3dfb-0.6.1-freeglut-compat.patch b/x11-misc/3dfb/files/3dfb-0.6.1-freeglut-compat.patch
new file mode 100644
index 000000000000..f05e3538120d
--- /dev/null
+++ b/x11-misc/3dfb/files/3dfb-0.6.1-freeglut-compat.patch
@@ -0,0 +1,10 @@
+--- src/main.cpp.bak	2014-03-13 12:24:32.155889466 +0400
++++ src/main.cpp	2014-03-13 12:24:42.482890090 +0400
+@@ -7,6 +7,7 @@
+ 
+ int main(int argc, char **argv)
+ {
++    glutInit(&argc, argv);
+     gui_init();
+     glutMainLoop();
+     return(0);
diff --git a/x11-misc/3dfb/metadata.xml b/x11-misc/3dfb/metadata.xml
new file mode 100644
index 000000000000..d0053fa8abcf
--- /dev/null
+++ b/x11-misc/3dfb/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>desktop-effects</herd>
+	<upstream>
+		<remote-id type="sourceforge">dz3d</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-misc/3dfm/3dfm-1.0.ebuild b/x11-misc/3dfm/3dfm-1.0.ebuild
new file mode 100644
index 000000000000..82926d20528a
--- /dev/null
+++ b/x11-misc/3dfm/3dfm-1.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+DESCRIPTION="OpenGL-based 3D File Manager"
+HOMEPAGE="http://sourceforge.net/projects/innolab/"
+SRC_URI="mirror://sourceforge/innolab/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+DEPEND="virtual/glu
+	virtual/opengl
+	media-libs/freeglut"
+RDEPEND="${DEPEND}"
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	mv "${D}"/usr/bin/interface "${D}"/usr/bin/3dfm || die
+
+	dodoc AUTHORS ChangeLog README
+}
diff --git a/x11-misc/3dfm/Manifest b/x11-misc/3dfm/Manifest
new file mode 100644
index 000000000000..eec2727d4b3f
--- /dev/null
+++ b/x11-misc/3dfm/Manifest
@@ -0,0 +1 @@
+DIST 3dfm-1.0.tar.gz 139275 SHA256 eec8a32f4761db74cfe9c19b614e9e112d693a0273d7f0c4f77cc7639eec83ab SHA512 8db31f54df57c1054a36708117db2de04b05ca7b67de53b0af9e0cb53fc5678590745b6c03d3ea9b6fc4dbe50435b8f52d3286a18313e3011d7ca2d28620d666 WHIRLPOOL 2a9955b9a092c2cc8e0d0f98dfd78691b887bf93c5882675b567ca831b33b42e7a191d65a266079ede9aeef3585732e436b71aa2b712975c9f9de5899f4ce55d
diff --git a/x11-misc/3dfm/metadata.xml b/x11-misc/3dfm/metadata.xml
new file mode 100644
index 000000000000..8b279ff8e12d
--- /dev/null
+++ b/x11-misc/3dfm/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>desktop-effects</herd>
+	<upstream>
+		<remote-id type="sourceforge">innolab</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-misc/Xorgautoconfig/Manifest b/x11-misc/Xorgautoconfig/Manifest
new file mode 100644
index 000000000000..5f9c5d0e28bc
--- /dev/null
+++ b/x11-misc/Xorgautoconfig/Manifest
@@ -0,0 +1 @@
+DIST Xorgautoconfig-0.2.4.tar.bz2 33371 SHA256 63aece49c4584e1ef5b28a38519a7e4b8e102ea260e8acf2d7ead9b6675de3da
diff --git a/x11-misc/Xorgautoconfig/Xorgautoconfig-0.2.4-r1.ebuild b/x11-misc/Xorgautoconfig/Xorgautoconfig-0.2.4-r1.ebuild
new file mode 100644
index 000000000000..0d8e1069b300
--- /dev/null
+++ b/x11-misc/Xorgautoconfig/Xorgautoconfig-0.2.4-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Xorgautconfig generates xorg.conf files for PPC based computers"
+HOMEPAGE="http://dev.gentoo.org/~josejx/Xorgautoconfig.html"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="ppc ppc64"
+IUSE=""
+
+DEPEND=""
+RDEPEND="sys-apps/pciutils"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/backingstore.patch
+	epatch "${FILESDIR}"/${PN}-lz.patch
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" || die "emake failed!"
+}
+
+src_install() {
+	dodir /usr
+	into /usr
+	dosbin Xorgautoconfig
+
+	newinitd Xorgautoconfig.init Xorgautoconfig
+
+	dodoc ChangeLog
+}
diff --git a/x11-misc/Xorgautoconfig/files/Xorgautoconfig-lz.patch b/x11-misc/Xorgautoconfig/files/Xorgautoconfig-lz.patch
new file mode 100644
index 000000000000..c0182a754957
--- /dev/null
+++ b/x11-misc/Xorgautoconfig/files/Xorgautoconfig-lz.patch
@@ -0,0 +1,11 @@
+--- Makefile.bak	2007-02-12 19:45:05.000000000 -0500
++++ Makefile	2007-02-12 19:44:37.000000000 -0500
+@@ -3,7 +3,7 @@
+ OBJS = Xorgautoconfig.o pci.o misc.o ddcprobe/minifind.o ddcprobe/common.o ddcprobe/vesamode.o ddcprobe/of.o
+ 
+ all: $(OBJS)
+-	${CC} -s -o Xorgautoconfig $(CFLAGS) $(OBJS) -lpci
++	${CC} -s -o Xorgautoconfig $(CFLAGS) $(OBJS) -lpci -lz
+ 
+ clean:
+ 	rm -f $(OBJS) Xorgautoconfig
diff --git a/x11-misc/Xorgautoconfig/files/backingstore.patch b/x11-misc/Xorgautoconfig/files/backingstore.patch
new file mode 100644
index 000000000000..d1668d7da9f7
--- /dev/null
+++ b/x11-misc/Xorgautoconfig/files/backingstore.patch
@@ -0,0 +1,10 @@
+--- Xorgtext.h.bak	2006-07-06 11:48:31.000000000 -0400
++++ Xorgtext.h	2006-07-06 11:48:36.000000000 -0400
+@@ -135,7 +135,6 @@
+ 
+ static char *driver_radeon =
+ "	### Available Driver options:\n"
+-"	Option \"BackingStore\" \"true\"  # Increases performance\n"
+ "	Option \"EnablePageFlip\" \"true\" # Increases performance\n"
+ "	#Option \"SWcursor\"	\"false\" # Use Software Cursor\n"
+ "	#Option \"NoAccel\"	\"false\" # Disable Hardware Acceleration\n"
diff --git a/x11-misc/Xorgautoconfig/metadata.xml b/x11-misc/Xorgautoconfig/metadata.xml
new file mode 100644
index 000000000000..e5db48ef412c
--- /dev/null
+++ b/x11-misc/Xorgautoconfig/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>ppc</herd>
+<maintainer>
+<email>josejx@gentoo.org</email>
+<name>Joseph Jezak</name>
+</maintainer>
+<longdescription lang="en">
+An X.org auto configuration tool for PPC machines.
+</longdescription>
+</pkgmetadata>
+
diff --git a/x11-misc/accessx/Manifest b/x11-misc/accessx/Manifest
new file mode 100644
index 000000000000..7ce4a8a3d3cd
--- /dev/null
+++ b/x11-misc/accessx/Manifest
@@ -0,0 +1 @@
+DIST accessx0951.tar.gz 17199 RMD160 505db30895d16137ff893ee0adbc1e8a8c706e4b SHA1 c189d86067df37d206c7c1cd99ec7568f045d0a8 SHA256 441e9316552a88d26b265a3074656ec56a84d8ea287d7dcebdb7a2b562111863
diff --git a/x11-misc/accessx/accessx-0951-r1.ebuild b/x11-misc/accessx/accessx-0951-r1.ebuild
new file mode 100644
index 000000000000..3f2742082ac5
--- /dev/null
+++ b/x11-misc/accessx/accessx-0951-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="Interface to the XKEYBOARD extension in X11"
+HOMEPAGE="http://cita.disability.uiuc.edu/software/accessx/freewareaccessx.php"
+SRC_URI="http://cmos-eng.rehab.uiuc.edu/${PN}/software/${PN}${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ppc sparc x86"
+IUSE=""
+
+DEPEND="x11-libs/libX11
+	x11-libs/libXext
+	dev-lang/tk"
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-build.patch
+
+	sed -i \
+		-e 's:$(CC) $(OPTS) ax.C:$(CC) $(LDFLAGS) $(OPTS) ax.C:' \
+		Makefile || die
+}
+
+src_compile() {
+	emake CC="$(tc-getCXX)" OPTS="${CXXFLAGS}" \
+		XLIBDIR="-L/usr/$(get_libdir)" LLIBS="-lXext -lX11" || die
+}
+
+src_install() {
+	dobin accessx ax || die
+	dodoc CHANGES README
+}
diff --git a/x11-misc/accessx/files/accessx-0951-build.patch b/x11-misc/accessx/files/accessx-0951-build.patch
new file mode 100644
index 000000000000..6d732487214f
--- /dev/null
+++ b/x11-misc/accessx/files/accessx-0951-build.patch
@@ -0,0 +1,65 @@
+diff -ur accessx.orig/Access.C accessx/Access.C
+--- accessx.orig/Access.C	2003-09-19 19:08:01.000000000 +0300
++++ accessx/Access.C	2008-01-07 18:53:43.000000000 +0200
+@@ -22,6 +22,8 @@
+ #include <X11/XKBlib.h>
+ #include "Access.h"
+ 
++using namespace std;
++
+ //
+ // Access()
+ //
+@@ -153,7 +155,7 @@
+     //Get the state of the keyboard.
+ 
+     XkbDescPtr xkb = XkbGetMap(display, 0, XkbUseCoreKbd);
+-    if ((int)xkb == BadAlloc || xkb == NULL)
++    if (xkb == NULL)
+       {
+ 	return 5; /*AccessKeyboardQueryFailure;*/
+       }
+@@ -262,7 +264,7 @@
+     //Get the state of the keyboard.
+ 
+     XkbDescPtr xkb = XkbGetMap(display, 0, XkbUseCoreKbd);
+-    if ((int)xkb == BadAlloc || xkb == NULL)
++    if (xkb == NULL)
+       {
+ 	return 5; /*AccessKeyboardQueryFailure;*/
+       }
+diff -ur accessx.orig/Access.h accessx/Access.h
+--- accessx.orig/Access.h	2003-09-19 19:00:42.000000000 +0300
++++ accessx/Access.h	2008-01-07 18:53:47.000000000 +0200
+@@ -21,7 +21,7 @@
+  *
+  */
+ 
+-#include <iostream.h>
++#include <iostream>
+ #include <math.h>
+ 
+ inline char* onoroff(int val)
+diff -ur accessx.orig/ax.C accessx/ax.C
+--- accessx.orig/ax.C	2003-09-19 19:09:31.000000000 +0300
++++ accessx/ax.C	2008-01-07 18:53:49.000000000 +0200
+@@ -20,6 +20,7 @@
+ 
+ #include "ax.h"
+ 
++using namespace std;
+ 
+ ///////////////////////////////////////////////////////////////////////////////
+ //
+diff -ur accessx.orig/ax.h accessx/ax.h
+--- accessx.orig/ax.h	2003-09-19 19:06:56.000000000 +0300
++++ accessx/ax.h	2008-01-07 18:53:51.000000000 +0200
+@@ -24,7 +24,7 @@
+ 
+ // Include Files
+ 
+-#include <iostream.h>
++#include <iostream>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
diff --git a/x11-misc/accessx/metadata.xml b/x11-misc/accessx/metadata.xml
new file mode 100644
index 000000000000..731225048652
--- /dev/null
+++ b/x11-misc/accessx/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>desktop-misc</herd>
+</pkgmetadata>
diff --git a/x11-misc/afbinit/Manifest b/x11-misc/afbinit/Manifest
new file mode 100644
index 000000000000..dc1efe18c835
--- /dev/null
+++ b/x11-misc/afbinit/Manifest
@@ -0,0 +1 @@
+DIST afbinit-1.0.1.tar.bz2 3288 SHA256 3a9b246b34f9b518f2e9a143e5c9faacd0197baa4e5dd13f82ce3c336a3c285c
diff --git a/x11-misc/afbinit/afbinit-1.0.1-r7.ebuild b/x11-misc/afbinit/afbinit-1.0.1-r7.ebuild
new file mode 100644
index 000000000000..6964aa949c7c
--- /dev/null
+++ b/x11-misc/afbinit/afbinit-1.0.1-r7.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils
+
+DESCRIPTION="loads the microcode for Elite3D framebuffers to use X"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+IUSE=""
+
+LICENSE="GPL-1"
+SLOT="0"
+KEYWORDS="-* sparc"
+
+RDEPEND="${DEPEND}
+	sys-apps/util-linux"
+
+src_unpack() {
+	unpack ${A}
+	##
+	# Patch rc.afb to handle both kernels 2.4.x and 2.6.x
+	einfo "Patching to handle both kernel 2.4.x and 2.6.x style afb identification"
+	cd "${S}"
+	epatch "${FILESDIR}"/rc.afb-${PVR}.patch || die "Cannot patch rc.afb init script"
+	einfo 'Patching afbinit.c to use MMAP_PUBLIC (needed for kernels > 2.6.14)'
+	epatch "${FILESDIR}"/afbinit-mmap-${PV}.patch || die "Cannot patch for mmap"
+}
+
+src_compile() {
+	emake || die "make failed"
+}
+
+src_install() {
+	dosbin afbinit
+	dosbin rc.afb
+	newinitd "${FILESDIR}"/afbinit.init afbinit
+}
+
+pkg_postinst() {
+	einfo "To use afbinit, you'll need the AFB microcode."
+	einfo "This is available via a Solaris install at /usr/lib/afb.ucode"
+	einfo "or via sun.com"
+}
diff --git a/x11-misc/afbinit/files/afbinit-mmap-1.0.1.patch b/x11-misc/afbinit/files/afbinit-mmap-1.0.1.patch
new file mode 100644
index 000000000000..43a16c0cbf49
--- /dev/null
+++ b/x11-misc/afbinit/files/afbinit-mmap-1.0.1.patch
@@ -0,0 +1,20 @@
+--- afbinit.c-	2006-01-31 15:21:31.000000000 +0000
++++ afbinit.c	2006-01-31 15:22:23.000000000 +0000
+@@ -236,7 +236,7 @@
+ 	/* MMAP the registers. */
+ 	uregs = mmap(0, 0x2000,
+ 		     PROT_READ | PROT_WRITE,
+-		     MAP_PRIVATE,
++		     MAP_SHARED,
+ 		     afb_fd,
+ 		     0x04000000);
+ 	if (uregs == (void *)-1L) {
+@@ -246,7 +246,7 @@
+ 
+ 	kregs = mmap(0, 0x2000,
+ 		     PROT_READ | PROT_WRITE,
+-		     MAP_PRIVATE,
++		     MAP_SHARED,
+ 		     afb_fd,
+ 		     0x0bc04000);
+ 	if (kregs == (void *)-1L) {
diff --git a/x11-misc/afbinit/files/afbinit.init b/x11-misc/afbinit/files/afbinit.init
new file mode 100644
index 000000000000..ed8fa59c017d
--- /dev/null
+++ b/x11-misc/afbinit/files/afbinit.init
@@ -0,0 +1,14 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+depend() {
+	before xdm
+}
+
+start() {
+	ebegin "Loading afbinit"
+	/usr/sbin/rc.afb
+	eend $? "Failed to load afbinit"
+}
diff --git a/x11-misc/afbinit/files/rc.afb-1.0.1-r7.patch b/x11-misc/afbinit/files/rc.afb-1.0.1-r7.patch
new file mode 100644
index 000000000000..37f5f40d1a6a
--- /dev/null
+++ b/x11-misc/afbinit/files/rc.afb-1.0.1-r7.patch
@@ -0,0 +1,62 @@
+--- rc.afb-	1999-09-08 06:42:36.000000000 +0000
++++ rc.afb	2008-03-18 17:55:11.000000000 +0000
+@@ -10,11 +10,6 @@
+ 	exit 0
+ fi
+ 
+-if [ `/bin/dmesg | /bin/grep -c "Elite 3D"` -eq 0 ]
+-then
+-	exit 0
+-fi
+-
+ # The microcode loader binary and the microcode
+ # itself must exist.
+ if [ ! -x /usr/sbin/afbinit -o ! -f /usr/lib/afb.ucode ]
+@@ -22,13 +17,38 @@
+ 	exit 0
+ fi
+ 
+-# Make FB device list.
+-afb_devs=`/bin/dmesg | /bin/egrep -i "Elite 3D" | /bin/sed 's/\:.*//'`
++# Make FB device list, depending on which kind of kernel we have.
++# First, try kernel 2.4.x
++
++if [ `/bin/dmesg | /bin/grep -c "Elite 3D"` -gt 0 ]
++then
++
++	afb_devs=`/bin/dmesg | /bin/egrep -i "Elite 3D" | /bin/sed 's/\:.*//'`
++
++	# Load microcode onto each card.
++	for AFB in ${afb_devs}
++	do
++		echo -n "${AFB}: Loading Elite3D microcode... "
++		/usr/sbin/afbinit /dev/${AFB} /usr/lib/afb.ucode
++		echo "done."
++	done
++	exit 0
++else
++##
++#	OK, we're not kernel 2.4.x
++#	try kernel 2.6.x
++
++## if [ `/bin/dmesg | /bin/grep -c "AFB"` -gt 0 ]
++## then
+ 
+-# Load microcode onto each card.
+-for AFB in ${afb_devs}
+-do
+-	echo -n "${AFB}: Loading Elite3D microcode... "
+-	/usr/sbin/afbinit /dev/${AFB} /usr/lib/afb.ucode
+-	echo "done."
+-done
++	[[ -e /proc/fb ]] || exit 0
++	afb_devs=`/bin/more -s /proc/fb  | /bin/egrep -i "Elite 3D" | /bin/sed 's/\ .*//'`
++	# Load microcode onto each card.
++	for AFB in ${afb_devs}
++	do
++		echo -n "/dev/fb${AFB}: Loading Elite3D microcode... "
++		/usr/sbin/afbinit /dev/fb${AFB} /usr/lib/afb.ucode
++		echo "done."
++	done
++	exit 0
++fi
diff --git a/x11-misc/afbinit/metadata.xml b/x11-misc/afbinit/metadata.xml
new file mode 100644
index 000000000000..b87e94c3126f
--- /dev/null
+++ b/x11-misc/afbinit/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+
+	<herd>sparc</herd>
+
+</pkgmetadata>
diff --git a/x11-misc/alacarte/Manifest b/x11-misc/alacarte/Manifest
new file mode 100644
index 000000000000..6fcf6e22fb17
--- /dev/null
+++ b/x11-misc/alacarte/Manifest
@@ -0,0 +1,2 @@
+DIST alacarte-3.10.0.tar.xz 181576 SHA256 bdc91981859a5076ae38a213892074e1263629835702920d47f6ee2bb76179f1 SHA512 7ac46fe754c8ddb83856440ebd1c383ef8ec6f8b9601774442613e1a4ccbbc919eed221b4d4555b9dba3af78dbd985fed4320fbeada4eb68f7c088ebee01f564 WHIRLPOOL 231b64749c033c3e45433d743179437f2f41e9c3cfa99beea99e9040b08ed9eb2d06e25e9d7212d41d5a29a32d4f63fc21e6da091a199c4a180505c13a6b04b7
+DIST alacarte-3.11.91.tar.xz 199128 SHA256 d77294f25ac9e4f293530080578d83dc8e014d5b7c6c01d6f9a7f1715719a384 SHA512 b4b5ead4ba0b9742ea0530ecb5362afa970125d29750aaf147be6fd477f238b9c360307ce1df2a56330a69cd9c849a0dde4be44b36bf55377f42e30429411935 WHIRLPOOL 6a6e2f47486c714dd1d35b6814f6a5dabd79799d9d101d7d2e8e74b2cef0d9f028bab104213574fb067d2419f82af3f4c79ad6d59b457237837ce5c65d764b02
diff --git a/x11-misc/alacarte/alacarte-3.10.0.ebuild b/x11-misc/alacarte/alacarte-3.10.0.ebuild
new file mode 100644
index 000000000000..09265d02274c
--- /dev/null
+++ b/x11-misc/alacarte/alacarte-3.10.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+# FIXME: support python3 but installs in a weird location
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="xml"
+
+inherit gnome2 python-r1
+
+DESCRIPTION="Simple GNOME menu editor"
+HOMEPAGE="https://git.gnome.org/browse/alacarte"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+IUSE=""
+
+COMMON_DEPEND="
+	${PYTHON_DEPS}
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	>=gnome-base/gnome-menus-3.5.3:3[introspection]
+"
+RDEPEND="${COMMON_DEPEND}
+	x11-libs/gdk-pixbuf:2[introspection]
+	x11-libs/gtk+:3[introspection]
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/intltool-0.40.0
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	gnome2_src_prepare
+	python_copy_sources
+}
+
+src_configure() {
+	python_foreach_impl run_in_build_dir gnome2_src_configure
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir gnome2_src_compile
+}
+
+src_test() {
+	python_foreach_impl run_in_build_dir default
+}
+
+src_install() {
+	installing() {
+		gnome2_src_install
+		# Massage shebang to make python_doscript happy
+		sed -e 's:#! '"${PYTHON}:#!/usr/bin/python:" \
+			-i alacarte || die
+			python_doscript alacarte
+		}
+	python_foreach_impl run_in_build_dir installing
+}
diff --git a/x11-misc/alacarte/alacarte-3.11.91.ebuild b/x11-misc/alacarte/alacarte-3.11.91.ebuild
new file mode 100644
index 000000000000..2d689edd3f37
--- /dev/null
+++ b/x11-misc/alacarte/alacarte-3.11.91.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+# FIXME: support python3 but installs in a weird location
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="xml"
+
+inherit gnome2 python-r1
+
+DESCRIPTION="Simple GNOME menu editor"
+HOMEPAGE="https://git.gnome.org/browse/alacarte"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+IUSE=""
+
+COMMON_DEPEND="
+	${PYTHON_DEPS}
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	>=gnome-base/gnome-menus-3.5.3:3[introspection]
+"
+RDEPEND="${COMMON_DEPEND}
+	x11-libs/gdk-pixbuf:2[introspection]
+	x11-libs/gtk+:3[introspection]
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/intltool-0.40.0
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	gnome2_src_prepare
+	python_copy_sources
+}
+
+src_configure() {
+	python_foreach_impl run_in_build_dir gnome2_src_configure
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir gnome2_src_compile
+}
+
+src_test() {
+	python_foreach_impl run_in_build_dir default
+}
+
+src_install() {
+	installing() {
+		gnome2_src_install
+		# Massage shebang to make python_doscript happy
+		sed -e 's:#! '"${PYTHON}:#!/usr/bin/python:" \
+			-i alacarte || die
+			python_doscript alacarte
+		}
+	python_foreach_impl run_in_build_dir installing
+}
diff --git a/x11-misc/alacarte/metadata.xml b/x11-misc/alacarte/metadata.xml
new file mode 100644
index 000000000000..da6fd63d0085
--- /dev/null
+++ b/x11-misc/alacarte/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>gnome</herd>
+</pkgmetadata>
diff --git a/x11-misc/alltray/Manifest b/x11-misc/alltray/Manifest
new file mode 100644
index 000000000000..913b05b89cfc
--- /dev/null
+++ b/x11-misc/alltray/Manifest
@@ -0,0 +1 @@
+DIST alltray-0.7.5.1dev.tar.gz 481458 SHA256 09dad447b85ecb57debcb423f34381db7f112a010fbc83e4f65b3b31cf416514 SHA512 4cdba8a1a6d6969205387d985fda0cc479006ad009e3e35614569a5214d302b3852504c4d8ed0cf6557e202b941cc004033b4396a7b11e734a93317d70bc3efe WHIRLPOOL 6e9b65540b322a5f6902a204386cd80467b50f593dcb8933e34157e21f4c4f9c3e312e260f32c0fd31c592f9437f10bb754195ab0868592e24fbd941310117ae
diff --git a/x11-misc/alltray/alltray-0.7.5.1.ebuild b/x11-misc/alltray/alltray-0.7.5.1.ebuild
new file mode 100644
index 000000000000..83ad8c95c954
--- /dev/null
+++ b/x11-misc/alltray/alltray-0.7.5.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+VALA_MIN_API_VERSION="0.14"
+
+inherit autotools vala
+
+MY_P=${P}dev
+
+DESCRIPTION="An application which allows any application to be docked into the system notification area"
+HOMEPAGE="http://alltray.trausch.us/"
+SRC_URI="http://code.launchpad.net/${PN}/trunk/${PV}dev/+download/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+RDEPEND="dev-libs/glib:2
+	gnome-base/libgtop:2
+	x11-libs/gtk+:2
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXpm
+	x11-libs/libwnck:1"
+DEPEND="${RDEPEND}
+	$(vala_depend)
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+DOCS=( AUTHORS ChangeLog HACKING NEWS README )
+
+src_prepare() {
+	sed -i -e 's:-DG.*DISABLE_DEPRECATED::' src/Makefile.{am,in} || die #391101
+
+	sed -i \
+		-e '/Encoding/d' \
+		-e '/Categories/s:Application;::' \
+		-e '/Icon/s:.png::' \
+		data/alltray.desktop{,.in} || die
+
+	vala_src_prepare
+	sed -i -e '/AC_PATH_PROG/s:valac:${VALAC}:g' configure.ac || die
+
+	eautoreconf
+}
diff --git a/x11-misc/alltray/files/alltray-0.7.4-include-fixes.patch b/x11-misc/alltray/files/alltray-0.7.4-include-fixes.patch
new file mode 100644
index 000000000000..55814f5e70e5
--- /dev/null
+++ b/x11-misc/alltray/files/alltray-0.7.4-include-fixes.patch
@@ -0,0 +1,30 @@
+--- alltray/src/Application.c
++++ alltray/src/Application.c
+@@ -16,6 +16,7 @@
+ #include <gdk-pixbuf/gdk-pixdata.h>
+ #include <config.h>
+ 
++#include "gtop_glue.h"
+ 
+ #define ALL_TRAY_TYPE_APPLICATION (all_tray_application_get_type ())
+ #define ALL_TRAY_APPLICATION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ALL_TRAY_TYPE_APPLICATION, AllTrayApplication))
+--- alltray/src/AttachHelper.c
++++ alltray/src/AttachHelper.c
+@@ -16,6 +16,7 @@
+ #include <string.h>
+ #include <gtk/gtk.h>
+ 
++#include "x11_glue.h"
+ 
+ #define ALL_TRAY_TYPE_ATTACH_HELPER (all_tray_attach_helper_get_type ())
+ #define ALL_TRAY_ATTACH_HELPER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ALL_TRAY_TYPE_ATTACH_HELPER, AllTrayAttachHelper))
+--- alltray/src/Process.c
++++ alltray/src/Process.c
+@@ -16,6 +16,7 @@
+ #include <libwnck/libwnck.h>
+ #include <stdio.h>
+ 
++#include "gtop_glue.h"
+ 
+ #define ALL_TRAY_TYPE_PROCESS (all_tray_process_get_type ())
+ #define ALL_TRAY_PROCESS(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ALL_TRAY_TYPE_PROCESS, AllTrayProcess))
diff --git a/x11-misc/alltray/metadata.xml b/x11-misc/alltray/metadata.xml
new file mode 100644
index 000000000000..2e4a29de1851
--- /dev/null
+++ b/x11-misc/alltray/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+	<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
+	<longdescription>
+With AllTray you can dock any application into the system tray/notification
+area. A high-light feature is that a click on the "close" button will minimize
+to system tray. It is written in C using GTK and Xlib. It works well with Gnome,
+KDE and XFCE 4.2.
+	</longdescription>
+</pkgmetadata>
diff --git a/x11-misc/alock/Manifest b/x11-misc/alock/Manifest
new file mode 100644
index 000000000000..c2d8ef0a2a3d
--- /dev/null
+++ b/x11-misc/alock/Manifest
@@ -0,0 +1 @@
+DIST alock-svn-94.tar.bz2 68140 SHA256 37938b56588e0e9bdfdf52097bccd000f992ea725c87cd8c8b3ea4df847e8f26
diff --git a/x11-misc/alock/alock-94.ebuild b/x11-misc/alock/alock-94.ebuild
new file mode 100644
index 000000000000..3c362b8c7418
--- /dev/null
+++ b/x11-misc/alock/alock-94.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+inherit eutils toolchain-funcs
+
+DESCRIPTION="locks the local X display until a password is entered"
+HOMEPAGE="http://code.google.com/p/alock/
+	http://darkshed.net/projects/alock"
+SRC_URI="http://alock.googlecode.com/files/alock-svn-${PV}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="imlib pam"
+
+DEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXpm
+	x11-libs/libXrender
+	x11-libs/libXcursor
+	imlib? ( media-libs/imlib2[X] )
+	pam? ( virtual/pam )"
+
+S=${WORKDIR}/${PN}-svn-${PV}
+
+src_prepare() {
+	epatch "${FILESDIR}"/implicit_pointer_conversion_fix_amd64.patch
+}
+
+src_configure() {
+	tc-export CC
+
+	./configure \
+		--prefix=/usr \
+		--with-all \
+		$(use_with pam) \
+		$(use_with imlib imlib2) || die
+}
+
+src_compile() {
+	emake XMLTO=true || die
+}
+
+src_install() {
+	dobin src/alock || die
+	doman alock.1 || die
+	dodoc {CHANGELOG,README,TODO}.txt || die
+
+	insinto /usr/share/alock/xcursors
+	doins contrib/xcursor-* || die
+
+	insinto /usr/share/alock/bitmaps
+	doins bitmaps/* || die
+
+	if ! use pam; then
+		fperms 4755 /usr/bin/alock
+	fi
+}
diff --git a/x11-misc/alock/files/implicit_pointer_conversion_fix_amd64.patch b/x11-misc/alock/files/implicit_pointer_conversion_fix_amd64.patch
new file mode 100644
index 000000000000..1184ee73a612
--- /dev/null
+++ b/x11-misc/alock/files/implicit_pointer_conversion_fix_amd64.patch
@@ -0,0 +1,13 @@
+Index: alock-svn-94/src/auth_passwd.c
+===================================================================
+--- alock-svn-94.orig/src/auth_passwd.c
++++ alock-svn-94/src/auth_passwd.c
+@@ -43,7 +43,7 @@
+ \* ---------------------------------------------------------------- */
+ 
+ static struct passwd* pwd_entry = NULL;
+-
++char * crypt (const char *key, const char *salt);
+ static int alock_auth_passwd_init(const char* args) {
+ 
+     errno = 0;
diff --git a/x11-misc/alock/metadata.xml b/x11-misc/alock/metadata.xml
new file mode 100644
index 000000000000..884db118c2df
--- /dev/null
+++ b/x11-misc/alock/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>desktop-misc</herd>
+	<upstream>
+		<remote-id type="google-code">alock</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-misc/andromeda/Manifest b/x11-misc/andromeda/Manifest
new file mode 100644
index 000000000000..a0dca1dfe51c
--- /dev/null
+++ b/x11-misc/andromeda/Manifest
@@ -0,0 +1 @@
+DIST andromeda-0.3.tar.gz 2225274 SHA256 f0fad0017b95a6b2a2c4d253b96ae114fd58a30a9421ed9944f49178915fc078 SHA512 a9600490b68cee92ae2bc0ff9d34d18ca1708806b4e345d49309cabd7156702315123e319542014bb7207c637b931ba64bf9bc403f44be45550c068881fcf80c WHIRLPOOL 815e93556bb72edc82707d5452d87261362cd083654e26ce5f3db8592f121e658759c09ce3352b14340e0a332e5641e14341f7c62a22cf15f2f4218d4026fc8e
diff --git a/x11-misc/andromeda/andromeda-0.3.ebuild b/x11-misc/andromeda/andromeda-0.3.ebuild
new file mode 100644
index 000000000000..e599c519e7a1
--- /dev/null
+++ b/x11-misc/andromeda/andromeda-0.3.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit cmake-utils
+
+DESCRIPTION="Qt4-based filemanager"
+HOMEPAGE="https://github.com/ABBAPOH/andromeda"
+SRC_URI="http://dev.gentoo.org/~yngwin/distfiles/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="pdf"
+
+RDEPEND=">=dev-qt/qtcore-4.8.0:4
+	>=dev-qt/qtdbus-4.8.0:4
+	>=dev-qt/qtgui-4.8.0:4
+	>=dev-qt/qtopengl-4.8.0:4
+	>=dev-qt/qtwebkit-4.8.0:4
+	pdf? ( app-text/poppler )"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${PN}-${PN}
+
+DOCS="TODO.txt dist/changes-*"
+
+src_configure() {
+	# avoid building manual-only tests
+	local mycmakeargs=(
+		-DDISABLE_TESTS=true
+		$(cmake-utils_use_find_package pdf PopplerQt4)
+	)
+
+	cmake-utils_src_configure
+}
diff --git a/x11-misc/andromeda/metadata.xml b/x11-misc/andromeda/metadata.xml
new file mode 100644
index 000000000000..52ac90661a13
--- /dev/null
+++ b/x11-misc/andromeda/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>qt</herd>
+	<upstream>
+		<remote-id type="github">ABBAPOH/andromeda</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-misc/appmenu-qt/Manifest b/x11-misc/appmenu-qt/Manifest
new file mode 100644
index 000000000000..e6d6f5b41ef1
--- /dev/null
+++ b/x11-misc/appmenu-qt/Manifest
@@ -0,0 +1 @@
+DIST appmenu-qt-0.2.6.tar.bz2 22569 SHA256 21dd0357edeef1b20a5b56c91f1f423fdef65c81d082a22d8fe5761810927ddb
diff --git a/x11-misc/appmenu-qt/appmenu-qt-0.2.6.ebuild b/x11-misc/appmenu-qt/appmenu-qt-0.2.6.ebuild
new file mode 100644
index 000000000000..e0173d0a8e65
--- /dev/null
+++ b/x11-misc/appmenu-qt/appmenu-qt-0.2.6.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit cmake-utils
+
+DESCRIPTION="Application menu module for Qt"
+HOMEPAGE="https://launchpad.net/appmenu-qt"
+SRC_URI="http://launchpad.net/${PN}/trunk/${PV}/+download/${PN}-${PV}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=">=dev-qt/qtcore-4.8:4
+	>=dev-qt/qtdbus-4.8:4
+	>=dev-qt/qtgui-4.8:4
+	>=dev-libs/libdbusmenu-qt-0.9.0[qt4(+)]"
+RDEPEND="${DEPEND}"
+
+DOCS=( NEWS README )
diff --git a/x11-misc/appmenu-qt/metadata.xml b/x11-misc/appmenu-qt/metadata.xml
new file mode 100644
index 000000000000..0d275ddb5633
--- /dev/null
+++ b/x11-misc/appmenu-qt/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>kde</herd>
+	<upstream>
+		<remote-id type="launchpad">appmenu-qt</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-misc/apwal/Manifest b/x11-misc/apwal/Manifest
new file mode 100644
index 000000000000..f50da71fd193
--- /dev/null
+++ b/x11-misc/apwal/Manifest
@@ -0,0 +1 @@
+DIST apwal-0.4.5.tar.gz 73999 SHA256 0de64be9b40d853ef1efe69faf99e3e7b9c3b756575ed9f40e16aa4fe74844f3
diff --git a/x11-misc/apwal/apwal-0.4.5-r1.ebuild b/x11-misc/apwal/apwal-0.4.5-r1.ebuild
new file mode 100644
index 000000000000..3e59f37bc418
--- /dev/null
+++ b/x11-misc/apwal/apwal-0.4.5-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="2"
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="A simple application launcher and combined editor"
+HOMEPAGE="http://apwal.free.fr/"
+SRC_URI="http://apwal.free.fr/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="x11-libs/gtk+:2
+	x11-libs/gdk-pixbuf
+	dev-libs/libxml2
+	dev-libs/glib"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${PN}
+
+pkg_setup() {
+	tc-export CC
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-makefile.patch
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc ABOUT Changelog FAQ README  || die
+}
diff --git a/x11-misc/apwal/files/apwal-0.4.5-makefile.patch b/x11-misc/apwal/files/apwal-0.4.5-makefile.patch
new file mode 100644
index 000000000000..462ba882d8e3
--- /dev/null
+++ b/x11-misc/apwal/files/apwal-0.4.5-makefile.patch
@@ -0,0 +1,67 @@
+* Fix parallel build
+* Respect CC, CFLAGS, LDFLAGS #333969
+* don't strip binaries
+* fix install paths
+
+--- Makefile
++++ Makefile
+@@ -1,11 +1,8 @@
+ 
+ include Makefile.inc
+ 
+-all:
+-	(cd src && $(MAKE) $@)
+-
+-install:
+-	(cd src && $(MAKE) $@)
++all install:
++	$(MAKE) -C src $@
+ 
+ clean:
+ 	(cd src && $(MAKE) $@)
+--- src/Makefile
++++ src/Makefile
+@@ -5,8 +5,8 @@
+ CFLAGS=-g -Wall -Werror `pkg-config --cflags gtk+-2.0 gthread-2.0` -DGTK_DISABLE_DEPRECATED -DAPWAL_DEBUG
+ LDFLAGS=`pkg-config --libs gtk+-2.0 gthread-2.0` `xml2-config --libs`
+ else
+-CFLAGS=-O2 `pkg-config --cflags gtk+-2.0 gthread-2.0`
+-LDFLAGS=-O2 `pkg-config --libs gtk+-2.0 gthread-2.0` `xml2-config --libs`
++CPPFLAGS=`pkg-config --cflags gtk+-2.0 gthread-2.0`
++LIBS=`pkg-config --libs gtk+-2.0 gthread-2.0` `xml2-config --libs`
+ endif
+ 
+ OBJS=main.o app.o launcher.o editor.o property.o \
+@@ -24,25 +24,24 @@
+ ifdef APWAL_DEBUG
+ all: checktraceformat apwal tags
+ apwal: $(OBJS)
+-	gcc -o $@ $^ $(LDFLAGS)
++	$(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
+ else
+ all: apwal
+ apwal: $(OBJS)
+-	gcc -o $@ $^ $(LDFLAGS)
+-	strip $@
++	$(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
+ endif
+ 
+ install: all
+-	cp apwal /usr/local/bin/
+-	ln -sf /usr/local/bin/apwal /usr/local/bin/apwal-editor
++	install -D -m 755 apwal $(DESTDIR)/usr/bin/apwal
++	ln -sf apwal $(DESTDIR)/usr/bin/apwal-editor
+ 
+ .c.o: $(INCS)
+-	gcc -c $< -o $*.o $(CFLAGS)
++	$(CC) -c $(CPPFLAGS) $(CFLAGS) $< -o $*.o
+ 
+ xmlrc.o: xmlrc.c $(INCS)
+-	gcc -c $< -o $*.o $(CFLAGS) `xml2-config --cflags`
++	$(CC) $(CPPFLAGS) $(CFLAGS) `xml2-config --cflags` -c $< -o $*.o
+ about.o: about.c $(INCS) ../Makefile.inc
+-	gcc -c $< -o $*.o $(CFLAGS) -DAPWAL_VERSION=\"$(VERS)\"
++	$(CC) $(CPPFLAGS) -DAPWAL_VERSION=\"$(VERS)\" $(CFLAGS) -c $< -o $*.o
+ 
+ gtkstuff.o: pixbufinline.inc
+ xmlrc.o: xmlrcinline.inc
diff --git a/x11-misc/apwal/metadata.xml b/x11-misc/apwal/metadata.xml
new file mode 100644
index 000000000000..40838bc36783
--- /dev/null
+++ b/x11-misc/apwal/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>desktop-misc</herd>
+</pkgmetadata>
diff --git a/x11-misc/arandr/Manifest b/x11-misc/arandr/Manifest
new file mode 100644
index 000000000000..6865c80dc0a8
--- /dev/null
+++ b/x11-misc/arandr/Manifest
@@ -0,0 +1,2 @@
+DIST arandr-0.1.7.1.tar.gz 82118 SHA256 ab73aa90d05d48b95a01afdad37b7c21a2cdf4af98f7d78b2502b819382748da SHA512 1e3b8ec0d98d38515a159c7695abefd7451a3fa6b7d43641766c997aab63152dfa76c2d9208ba2848ce588dd033a8e85ae31b97acdd4aa5e450fd87725cc21ce WHIRLPOOL 9f9844cb0cb14fcba17767a1b50270843c70859253d96c23d3d47c65b64d5740fcdbad888d97f60fd1ae5f13245098d11c6b9552a221938c8b3b183146ffdf4c
+DIST arandr-0.1.8.tar.gz 86930 SHA256 6d8ec18e2f683818f420502516f7ece6c377a1903eab1de781152b585725a734 SHA512 3038677d92596aa63233ecd6fa8c1cb0d3522bc8aa69912aa79be900059c37bdda14efe9c17dc16a4c5858ebeeee7f62a55156b6e47e0715f1a341e8ad3c4f11 WHIRLPOOL 91f4810e732289b01dbaa9173a684d7c4c338a78a4b26d0314da99abc491adf30da7067c8657ac024c61cdc8d7c018c120c51bd104ae182b50761f33b6891e6a
diff --git a/x11-misc/arandr/arandr-0.1.7.1.ebuild b/x11-misc/arandr/arandr-0.1.7.1.ebuild
new file mode 100644
index 000000000000..190e6db25e98
--- /dev/null
+++ b/x11-misc/arandr/arandr-0.1.7.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils distutils-r1
+
+DESCRIPTION="A simple visual frontend for XRandR 1.2/1.3"
+HOMEPAGE="http://christian.amsuess.com/tools/arandr/"
+SRC_URI="http://christian.amsuess.com/tools/${PN}/files/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND=">=dev-python/pygtk-2[${PYTHON_USEDEP}]
+	x11-apps/xrandr"
+DEPEND=">=dev-python/docutils-0.6[${PYTHON_USEDEP}]"
+
+src_prepare() {
+	local i p
+	# simulate gettext behavior:
+	#  LINGUAS unset => install all
+	#  LINGUAS="" => install none
+	#  LINGUAS="de fr" => install de and fr
+	if [[ -n "${LINGUAS+x}" ]] ; then # if LINGUAS is set
+		for i in $(cd "${S}"/data/po ; for p in *.po ; do echo ${p%.po} ; done) ; do # for every supported language
+			if ! has ${i} ${LINGUAS} ; then # if language is disabled
+				rm data/po/${i}.po || die
+			fi
+		done
+	fi
+	distutils-r1_src_prepare
+}
diff --git a/x11-misc/arandr/arandr-0.1.8.ebuild b/x11-misc/arandr/arandr-0.1.8.ebuild
new file mode 100644
index 000000000000..c7da8ab744b6
--- /dev/null
+++ b/x11-misc/arandr/arandr-0.1.8.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils distutils-r1
+
+DESCRIPTION="A simple visual frontend for XRandR 1.2/1.3"
+HOMEPAGE="http://christian.amsuess.com/tools/arandr/"
+SRC_URI="http://christian.amsuess.com/tools/${PN}/files/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-python/pygtk-2[${PYTHON_USEDEP}]
+	x11-apps/xrandr"
+DEPEND=">=dev-python/docutils-0.6[${PYTHON_USEDEP}]"
+
+src_prepare() {
+	local i p
+	# simulate gettext behavior:
+	#  LINGUAS unset => install all
+	#  LINGUAS="" => install none
+	#  LINGUAS="de fr" => install de and fr
+	if [[ -n "${LINGUAS+x}" ]] ; then # if LINGUAS is set
+		for i in $(cd "${S}"/data/po ; for p in *.po ; do echo ${p%.po} ; done) ; do # for every supported language
+			if ! has ${i} ${LINGUAS} ; then # if language is disabled
+				rm data/po/${i}.po || die
+			fi
+		done
+	fi
+	distutils-r1_src_prepare
+}
diff --git a/x11-misc/arandr/metadata.xml b/x11-misc/arandr/metadata.xml
new file mode 100644
index 000000000000..540f810e069d
--- /dev/null
+++ b/x11-misc/arandr/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>desktop-misc</herd>
+</pkgmetadata>
diff --git a/x11-misc/autocutsel/Manifest b/x11-misc/autocutsel/Manifest
new file mode 100644
index 000000000000..6ec09b7d7079
--- /dev/null
+++ b/x11-misc/autocutsel/Manifest
@@ -0,0 +1 @@
+DIST autocutsel-0.9.0.tar.gz 297595 RMD160 d6bfd0cfb53cb15dbd10b4bc989f6ebdc20511e9 SHA1 7b15210b17a1499d2deba2261993373d3be14bb2 SHA256 bef0ebc2dc2c92fc29f00867771229fd8391e6028bbb8bca9d809e827119e342
diff --git a/x11-misc/autocutsel/autocutsel-0.9.0.ebuild b/x11-misc/autocutsel/autocutsel-0.9.0.ebuild
new file mode 100644
index 000000000000..c65a6a47b613
--- /dev/null
+++ b/x11-misc/autocutsel/autocutsel-0.9.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+DESCRIPTION="Synchronise the two copy/paste buffers mainly used by X applications"
+HOMEPAGE="http://www.nongnu.org/autocutsel/"
+SRC_URI="http://savannah.nongnu.org/download/${PN}/${P}.tar.gz"
+IUSE=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc sparc x86"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXmu
+	x11-libs/libXt
+	x11-libs/libXaw
+	x11-libs/libXext"
+DEPEND="${RDEPEND}
+	x11-proto/xproto"
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed."
+	dodoc AUTHORS ChangeLog NEWS README TODO
+}
diff --git a/x11-misc/autocutsel/metadata.xml b/x11-misc/autocutsel/metadata.xml
new file mode 100644
index 000000000000..eafac49a2eac
--- /dev/null
+++ b/x11-misc/autocutsel/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>desktop-misc</herd>
+	<longdescription>autocutsel synchronizes the two copy/paste buffers mainly used by X applications. It unifies "clipboards" between VNC servers and Windows.</longdescription>
+</pkgmetadata>
diff --git a/x11-misc/basqet/Manifest b/x11-misc/basqet/Manifest
new file mode 100644
index 000000000000..259656427824
--- /dev/null
+++ b/x11-misc/basqet/Manifest
@@ -0,0 +1,2 @@
+DIST basqet_0.1.4-src.tgz 153422 SHA256 ad8187510fcc8c211e049053c0c10eeb4a3719856c17b1ecd8d0501406e4c967
+DIST basqet_0.2.0-src.tgz 471700 SHA256 46a66a61af82b57c5fc6be40565837dab785f1dbb375656cf207ef08eb09f8a2
diff --git a/x11-misc/basqet/basqet-0.1.4.ebuild b/x11-misc/basqet/basqet-0.1.4.ebuild
new file mode 100644
index 000000000000..c541946b9ce1
--- /dev/null
+++ b/x11-misc/basqet/basqet-0.1.4.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=3
+
+inherit eutils qt4-r2
+
+DESCRIPTION="Keep your notes, pictures, ideas, and information in Baskets"
+HOMEPAGE="http://code.google.com/p/basqet/"
+SRC_URI="http://basqet.googlecode.com/files/${PN}_${PV}-src.tgz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-qt/qtgui:4
+	dev-qt/qtxmlpatterns:4"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	qt4-r2_src_prepare
+
+	sed -i 's:PREFIX = /usr/local:PREFIX = /usr:' ${PN}.pro || die
+}
diff --git a/x11-misc/basqet/basqet-0.2.0.ebuild b/x11-misc/basqet/basqet-0.2.0.ebuild
new file mode 100644
index 000000000000..ab66136dba7e
--- /dev/null
+++ b/x11-misc/basqet/basqet-0.2.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit qt4-r2
+
+DESCRIPTION="Keep your notes, pictures, ideas, and information in Baskets"
+HOMEPAGE="http://code.google.com/p/basqet/"
+SRC_URI="http://basqet.googlecode.com/files/${PN}_${PV}-src.tgz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-qt/qtcore:4
+	dev-qt/qtgui:4"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/release_${PV}
+
+PATCHES=( "${FILESDIR}/${P}-desktop.patch" )
+
+src_prepare() {
+	qt4-r2_src_prepare
+
+	sed -i 's:PREFIX = /usr/local:PREFIX = /usr:' ${PN}.pro || die
+}
diff --git a/x11-misc/basqet/files/basqet-0.2.0-desktop.patch b/x11-misc/basqet/files/basqet-0.2.0-desktop.patch
new file mode 100644
index 000000000000..161ad1d8fd3c
--- /dev/null
+++ b/x11-misc/basqet/files/basqet-0.2.0-desktop.patch
@@ -0,0 +1,14 @@
+--- basqet.desktop
++++ basqet.desktop
+@@ -1,9 +1,9 @@
+ [Desktop Entry]
+-Version=0.2.0
++Version=1.0
+ Terminal=false
+ TryExec=basqet
+ Exec=basqet
+-Icon=basqet.png
++Icon=basqet
+ Type=Application
+ Categories=Office;WordProcessor;
+ StartupNotify=false
diff --git a/x11-misc/basqet/metadata.xml b/x11-misc/basqet/metadata.xml
new file mode 100644
index 000000000000..7aa61dde7f6e
--- /dev/null
+++ b/x11-misc/basqet/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>qt</herd>
+	<upstream>
+		<remote-id type="google-code">basqet</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-misc/bbacpi/Manifest b/x11-misc/bbacpi/Manifest
new file mode 100644
index 000000000000..4c01aebb1403
--- /dev/null
+++ b/x11-misc/bbacpi/Manifest
@@ -0,0 +1 @@
+DIST bbacpi-0.1.5.tar.gz 241565 SHA256 e3845b961f424461cd956b24b22613171b65f8fa1e302ad1ef713d22c9273e51 SHA512 4491bf0352a376ada9006f3306c377d5c8b6fafcad8d214f64f8a3cd52e1e8b8d02b084888d58d8a1389a624631f6fc3b6f98aa33cd89b06e1ccd0802b5a540a WHIRLPOOL 54207dd972e88e12a84179fc334cad721965821ee228cb3afe8af1ac17b72c13d1e4e6ecc1f559d8d5c6c5f0e8e98854c4ce5409cb7791e67d4aecfac92cd57f
diff --git a/x11-misc/bbacpi/bbacpi-0.1.5-r1.ebuild b/x11-misc/bbacpi/bbacpi-0.1.5-r1.ebuild
new file mode 100644
index 000000000000..b609ece180ef
--- /dev/null
+++ b/x11-misc/bbacpi/bbacpi-0.1.5-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+
+inherit eutils
+
+DESCRIPTION="ACPI monitor for X11"
+HOMEPAGE="http://bbacpi.sourceforge.net"
+SRC_URI="mirror://sourceforge/bbacpi/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 x86"
+IUSE=""
+
+DEPEND="x11-libs/gtk+:2
+	media-libs/imlib
+	x11-misc/xdialog
+	sys-power/acpi
+	sys-power/acpid"
+RDEPEND="${DEPEND}
+	media-fonts/font-adobe-100dpi"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-noextraquals.diff
+}
+
+src_install() {
+	einstall || die
+	dodoc AUTHORS ChangeLog README || die
+}
diff --git a/x11-misc/bbacpi/bbacpi-0.1.5-r2.ebuild b/x11-misc/bbacpi/bbacpi-0.1.5-r2.ebuild
new file mode 100644
index 000000000000..626f304f5eb5
--- /dev/null
+++ b/x11-misc/bbacpi/bbacpi-0.1.5-r2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils
+
+DESCRIPTION="ACPI monitor for X11"
+HOMEPAGE="http://bbacpi.sourceforge.net"
+SRC_URI="mirror://sourceforge/bbacpi/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	media-libs/imlib
+	sys-power/acpi
+	sys-power/acpid
+	x11-libs/libX11
+	x11-misc/xdialog
+"
+RDEPEND="
+	${DEPEND}
+	media-fonts/font-adobe-100dpi
+"
+
+DOCS=( AUTHORS ChangeLog README )
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-noextraquals.diff \
+		"${FILESDIR}"/${P}-overflows.diff
+	eautoreconf
+}
diff --git a/x11-misc/bbacpi/files/bbacpi-0.1.5-noextraquals.diff b/x11-misc/bbacpi/files/bbacpi-0.1.5-noextraquals.diff
new file mode 100644
index 000000000000..7da903cbd4ca
--- /dev/null
+++ b/x11-misc/bbacpi/files/bbacpi-0.1.5-noextraquals.diff
@@ -0,0 +1,13 @@
+--- a/resource.hh
++++ b/resource.hh
+@@ -126,8 +126,8 @@
+ {
+   
+ public:
+-  Resource::Resource(ToolWindow *);
+-  Resource::~Resource(void);
++  Resource(ToolWindow *);
++  ~Resource(void);
+   
+   struct FRAME frame;
+   struct LABEL label;
diff --git a/x11-misc/bbacpi/files/bbacpi-0.1.5-overflows.diff b/x11-misc/bbacpi/files/bbacpi-0.1.5-overflows.diff
new file mode 100644
index 000000000000..df961e607e4f
--- /dev/null
+++ b/x11-misc/bbacpi/files/bbacpi-0.1.5-overflows.diff
@@ -0,0 +1,105 @@
+Fixes buffer overflows and --as-needed issues
+
+https://bugs.gentoo.org/show_bug.cgi?id=338936
+
+Patch written by Kevin Pyle <gentoo.8eaf7cd8e5128d8191fe@spamgourmet.com>
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,4 +1,4 @@
+-AM_CPPFLAGS =	@CPPFLAGS@ @INTERLACE@ \
++AM_CPPFLAGS =	 @INTERLACE@ \
+ 		-DGLOBAL_BB=\"$(datadir)/bbtools/bbacpi.bb\" \
+ 		-DGLOBAL_NOBB=\"$(datadir)/bbtools/bbacpi.nobb\" \
+ 		-DGLOBAL_DATA=\"$(datadir)/bbtools\"
+--- a/bbacpi.cc
++++ b/bbacpi.cc
+@@ -167,7 +167,7 @@ bool CheckLoad::checkbatteryfile (char* name, char* device)
+   if (ret = (fp = fopen(name, "r"))) {
+     char buffer[100];
+     char present[20];
+-    fgets(buffer,128,fp);
++    fgets(buffer, sizeof(buffer),fp);
+     sscanf(buffer,"present:                 %s", present);
+     if (strncmp(present, "yes", 3) != 0) {
+       fprintf(stderr, "Device %s not present.\n", device);
+@@ -195,7 +195,7 @@ void CheckLoad::ReadStaticInfo()
+     {
+       /* Read data in any order */
+       found = 0;
+-      while (found < 11 && (fgets(buffer, 63, fp) != NULL)) {
++      while (found < 11 && (fgets(buffer, sizeof(buffer), fp) != NULL)) {
+ 	/* Present */
+ 	if (strncmp(buffer, "present:", 7) == 0 
+ 	    || strncmp(buffer, "Present:", 7) == 0) {
+@@ -277,7 +277,7 @@ void CheckLoad::ReadStaticInfo()
+       {
+ 	/* Read data in any order */
+ 	found = 0;
+-	while (found < 11  && (fgets(buffer, 63, fp) != NULL)) {
++	while (found < 11  && (fgets(buffer, sizeof(buffer), fp) != NULL)) {
+ 	  /* Present */
+ 	  if (strncmp(buffer, "present:", 7) == 0 
+ 	      || strncmp(buffer, "Present:", 7) == 0) {
+@@ -361,7 +361,7 @@ void CheckLoad::ReadStaticInfo()
+   if ((fp = fopen(names.temptrip, "r")))
+     {
+       found = 0;
+-      while (found < 2 && (fgets(buffer,128,fp) != NULL)) {
++      while (found < 2 && (fgets(buffer, sizeof(buffer),fp) != NULL)) {
+ 	/* Critical */
+ 	if (strncmp(buffer, "critical", 8) == 0 
+ 	    || strncmp(buffer, "Critical", 8) == 0) {
+@@ -425,7 +425,7 @@ void CheckLoad::Reconfigure()
+ 	if  (file_status.st_mtime != last_mtime)
+ 	  {
+ 	    found = 0;
+-	    while (found < 4 && (fgets(buffer, 63, fp) != NULL)) {
++	    while (found < 4 && (fgets(buffer, sizeof(buffer), fp) != NULL)) {
+ 	      /* Charging state */
+ 	      if (strncmp(buffer, "charging state:", 15) == 0 
+ 		  || strncmp(buffer, "Charging State:", 15) == 0) {
+@@ -463,7 +463,7 @@ void CheckLoad::Reconfigure()
+ 	if  (file_status.st_mtime != last_mtime)
+ 	  {
+ 	    found = 0;
+-	    while (found < 4 && (fgets(buffer, 63, fp) != NULL)) {
++	    while (found < 4 && (fgets(buffer, sizeof(buffer), fp) != NULL)) {
+ 	      /* Charging state */
+ 	      if (strncmp(buffer, "charging state:", 15) == 0 
+ 		  || strncmp(buffer, "Charging State:", 15) == 0) {
+@@ -497,7 +497,7 @@ void CheckLoad::Reconfigure()
+   if ((fp = fopen(names.adapter, "r")))
+     {
+       found = 0;
+-      while (found < 1 && (fgets(buffer, 63,fp) != NULL)) {
++      while (found < 1 && (fgets(buffer, sizeof(buffer),fp) != NULL)) {
+ 	if (strncmp(buffer, "state:", 6) == 0 
+ 	    || strncmp(buffer, "State:", 6) == 0) {
+ 	  sscanf(buffer+offset,"%s", adapter.state);
+@@ -511,7 +511,7 @@ void CheckLoad::Reconfigure()
+   if ((fp = fopen(names.temperature, "r")))
+     {
+       found = 0;
+-      while (found < 1 && (fgets(buffer, 63,fp) != NULL)) {
++      while (found < 1 && (fgets(buffer, sizeof(buffer),fp) != NULL)) {
+ 	if (strncmp(buffer, "temperature:", 12) == 0 
+ 	    || strncmp(buffer, "Temperature:", 12) == 0) {
+ 	  sscanf(buffer+offset,"%u", &temperature.celcius);
+--- a/configure.in
++++ b/configure.in
+@@ -89,12 +89,12 @@ AC_PATH_XTRA
+ 
+ CFLAGS="$CFLAGS $X_CFLAGS"
+ CXXFLAGS="$CXXFLAGS $X_CFLAGS"
+-LDFLAGS="$LDFLAGS $X_LIBS $X_PRE_LIBS"
++LIBS="$LIBS $X_LIBS $X_PRE_LIBS"
+ dnl Checks for X libraries.
+-AC_CHECK_LIB(X11, XOpenDisplay, LDFLAGS="$LDFLAGS -lX11",
++AC_CHECK_LIB(X11, XOpenDisplay,,
+              AC_MSG_ERROR(XOpenDisplay not found in -lX11))
+ 
+-LDFLAGS="$LDFLAGS $X_EXTRA_LIBS"
++LIBS="$LIBS $X_EXTRA_LIBS"
+ 
+ dnl Check for Imlib
+ AC_MSG_CHECKING([for Imlib])
diff --git a/x11-misc/bbacpi/metadata.xml b/x11-misc/bbacpi/metadata.xml
new file mode 100644
index 000000000000..42fe8839ccee
--- /dev/null
+++ b/x11-misc/bbacpi/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>desktop-misc</herd>
+	<longdescription lang="en">
+Utility for viewing ACPI data via X11
+</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">bbacpi</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-misc/bbappconf/Manifest b/x11-misc/bbappconf/Manifest
new file mode 100644
index 000000000000..28ee91de3609
--- /dev/null
+++ b/x11-misc/bbappconf/Manifest
@@ -0,0 +1 @@
+DIST bbappconf-0.0.2.tar.gz 80107 SHA256 90f02de8f9b507e53232c77f179382d1734fa63c2978070c4582dea575434705 SHA512 910ebaff204b3bbed88296b077a50fd061e9dee74703991f8f43079aae736a65f98acafe8b437b6d3f7e021173a5f09a8bd98549b8a63d12718d8f2389284117 WHIRLPOOL 72bfbc597289aaada28c91041f1685a9faac605e3af0635a135f5e73e57f86955a7915366646dd386a4a98b96d18ceab50c70be6e2883a364ece2bc0b7968408
diff --git a/x11-misc/bbappconf/bbappconf-0.0.2.ebuild b/x11-misc/bbappconf/bbappconf-0.0.2.ebuild
new file mode 100644
index 000000000000..441d5b86c6ef
--- /dev/null
+++ b/x11-misc/bbappconf/bbappconf-0.0.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit autotools eutils
+
+DESCRIPTION="utility that allows you to specify window properties in blackbox"
+HOMEPAGE="http://sourceforge.net/projects/bbtools"
+SRC_URI="mirror://sourceforge/bbtools/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ppc sparc x86 ~x86-fbsd"
+IUSE="debug"
+
+DOCS=( AUTHORS BUGS ChangeLog NEWS README TODO data/README.bbappconf )
+
+RDEPEND="x11-libs/libX11"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-fix-sigsegv.diff \
+		"${FILESDIR}"/${P}-asneeded.patch \
+		"${FILESDIR}"/${P}-docs.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable debug)
+}
diff --git a/x11-misc/bbappconf/files/bbappconf-0.0.2-asneeded.patch b/x11-misc/bbappconf/files/bbappconf-0.0.2-asneeded.patch
new file mode 100644
index 000000000000..1a2008218c69
--- /dev/null
+++ b/x11-misc/bbappconf/files/bbappconf-0.0.2-asneeded.patch
@@ -0,0 +1,89 @@
+Fixing build with --as-needed
+
+https://bugs.gentoo.org/show_bug.cgi?id=248548
+
+--- configure.in
++++ configure.in
+@@ -5,38 +5,25 @@
+ 
+ AC_PREFIX_DEFAULT(/usr/local)
+ 
+-
+-
+ AC_CHECK_PROGS(regex_cmd, sed)
+ if test x$regex_cmd = "x"; then
+  AC_MSG_ERROR([error. sed is required to build the default bbtoolsrc file.])
+ fi
+ 
+-
+-dnl get the debug values right
+-AC_DEFUN(AC_SET_DEBUG,
+-[
+- test "$CFLAGS" = "" && CFLAGS="-g -Wall -DDEBUG"
+- test "$CXXFLAGS" = "" && CXXFLAGS="-g -Wall -DDEBUG"
+- test "$LDFLAGS" = "" && LDFLAGS=""
+-])
+-
+-AC_DEFUN(AC_SET_NODEBUG,
+-[
+- test "$CFLAGS" = "" && CFLAGS="-O2 -Wall"
+- test "$CXXFLAGS" = "" && CXXFLAGS="-O2 -Wall"
+- test "$LDFLAGS" = "" && LDFLAGS="-s"
+-])
+-      
+-
++dnl Check for debug
++DEBUG=""
++AC_MSG_CHECKING([whether to enable debug code])
+ AC_ARG_ENABLE(debug,[  --enable-debug	create debugging code [default=no]],
+-[
+-if test $enableval = "no";
+- then AC_SET_NODEBUG
+- else AC_SET_DEBUG
+-fi
+-],
+-AC_SET_NODEBUG)
++  if test x$enableval = "xyes"; then
++    AC_MSG_RESULT([yes])
++    DEBUG="-DDEBUG"
++  else
++    AC_MSG_RESULT([no])
++  fi,
++  AC_MSG_RESULT([no])
++  DEBUG=""
++)
++AC_SUBST(DEBUG)
+ 
+ dnl Check for Interlacing
+ INTERLACE=""
+@@ -69,15 +56,8 @@
+ AC_PATH_X
+ AC_PATH_XTRA
+ 
+-CFLAGS="$CFLAGS $X_CFLAGS"
+-CXXFLAGS="$CXXFLAGS $X_CFLAGS"
+-LDFLAGS="$LDFLAGS $X_LIBS $X_PRE_LIBS"
+-
+ dnl Checks for X libraries.
+-AC_CHECK_LIB(X11, XOpenDisplay, LDFLAGS="$LDFLAGS -lX11",
+-             AC_MSG_ERROR(XOpenDisplay not found in -lX11))
+-
+-LDFLAGS="$LDFLAGS $X_EXTRA_LIBS"
++AC_CHECK_LIB(X11, XOpenDisplay,,AC_MSG_ERROR(XOpenDisplay not found in -lX11))
+ 
+ dnl Checks for header files.
+ AC_HEADER_STDC
+--- Makefile.am
++++ Makefile.am
+@@ -1,4 +1,4 @@
+-CPPFLAGS =	@CPPFLAGS@  @INTERLACE@ \
++AM_CPPFLAGS =	@DEBUG@ @INTERLACE@ \
+ 		-DGLOBAL_BB=\"$(datadir)/bbtools/bbappconf.bb\" \
+ 		-DGLOBAL_NOBB=\"$(datadir)/bbtools/bbappconf.nobb\"
+ 
+@@ -18,4 +18,4 @@
+ 		  NETInterface.cc NETInterface.hh \
+ 		  blackboxstyle.hh
+ EXTRA_DIST = BUGS TODO
+-bbappconf_LDADD = @X_LIBS@
++bbappconf_LDADD = @X_PRE_LIBS@ @X_LIBS@ @X_EXTRA_LIBS@
diff --git a/x11-misc/bbappconf/files/bbappconf-0.0.2-docs.patch b/x11-misc/bbappconf/files/bbappconf-0.0.2-docs.patch
new file mode 100644
index 000000000000..b92e92faae73
--- /dev/null
+++ b/x11-misc/bbappconf/files/bbappconf-0.0.2-docs.patch
@@ -0,0 +1,14 @@
+Don't install README to /usr/share/${PN}
+
+--- data/Makefile.am
++++ data/Makefile.am
+@@ -1,8 +1,7 @@
+ configdir = $(datadir)/bbtools
+ 
+ config_DATA =	bbappconf.bb \
+-		bbappconf.nobb \
+-		README.bbappconf
++		bbappconf.nobb
+ 
+ EXTRA_DIST = $(config_DATA)
+ 
diff --git a/x11-misc/bbappconf/files/bbappconf-0.0.2-fix-sigsegv.diff b/x11-misc/bbappconf/files/bbappconf-0.0.2-fix-sigsegv.diff
new file mode 100644
index 000000000000..178677389faf
--- /dev/null
+++ b/x11-misc/bbappconf/files/bbappconf-0.0.2-fix-sigsegv.diff
@@ -0,0 +1,18 @@
+Files bbappconf-0.0.2.orig/.BaseDisplay.cc.swp and bbappconf-0.0.2/.BaseDisplay.cc.swp differ
+Files bbappconf-0.0.2.orig/.resource.cc.swp and bbappconf-0.0.2/.resource.cc.swp differ
+diff -urN bbappconf-0.0.2.orig/resource.cc bbappconf-0.0.2/resource.cc
+--- bbappconf-0.0.2.orig/resource.cc	2005-01-19 09:49:19.000000000 -0500
++++ bbappconf-0.0.2/resource.cc	2005-01-19 10:09:42.530236696 -0500
+@@ -19,10 +19,12 @@
+ // (See the included file COPYING / GPL-2.0)
+ //
+ 
++#include <cstdlib>
+ #include "resource.hh"
+ #include "blackboxstyle.hh"
+ 
+ Resource::Resource(ToolWindow *toolwindow): BaseResource(toolwindow) {
++  frame.font = NULL;
+   Load();
+ }
+ 
diff --git a/x11-misc/bbappconf/metadata.xml b/x11-misc/bbappconf/metadata.xml
new file mode 100644
index 000000000000..651c7b4f59f9
--- /dev/null
+++ b/x11-misc/bbappconf/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer>
+    <email>maintainer-needed@gentoo.org</email>
+  </maintainer>
+  <longdescription>
+  bbappconf is a utility that allows you to specify window properties 
+  in Blackbox.
+  </longdescription>
+  <upstream>
+    <remote-id type="sourceforge">bbtools</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/x11-misc/bbcd/Manifest b/x11-misc/bbcd/Manifest
new file mode 100644
index 000000000000..157ac09505da
--- /dev/null
+++ b/x11-misc/bbcd/Manifest
@@ -0,0 +1 @@
+DIST bbcd-0.3.1.tar.gz 74853 SHA256 30a63b349d6eb6dd0018e5d76e8f1f97fdde60798f9dfec210662a47e65a8875
diff --git a/x11-misc/bbcd/bbcd-0.3.1-r1.ebuild b/x11-misc/bbcd/bbcd-0.3.1-r1.ebuild
new file mode 100644
index 000000000000..13523fdf6036
--- /dev/null
+++ b/x11-misc/bbcd/bbcd-0.3.1-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit eutils
+
+DESCRIPTION="Basic CD Player for blackbox wm"
+HOMEPAGE="http://tranber1.free.fr/bbcd.html"
+SRC_URI="http://tranber1.free.fr/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ppc x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="media-libs/libcdaudio
+	x11-libs/libX11"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}_${PV}a.diff
+	epatch "${FILESDIR}"/${P}-gcc3.3.patch
+	epatch "${FILESDIR}"/${P}-gcc4.3.patch
+}
+
+src_install () {
+	emake DESTDIR="${D}" install
+	rm -rf "${D}"/usr/doc || die
+	dodoc AUTHORS BUGS ChangeLog NEWS README
+}
diff --git a/x11-misc/bbcd/files/bbcd-0.3.1-gcc3.3.patch b/x11-misc/bbcd/files/bbcd-0.3.1-gcc3.3.patch
new file mode 100644
index 000000000000..906dabf616ca
--- /dev/null
+++ b/x11-misc/bbcd/files/bbcd-0.3.1-gcc3.3.patch
@@ -0,0 +1,20 @@
+--- bbcd-0.3.1/Color.cc.org	2003-12-07 14:55:51.791299707 +0100
++++ bbcd-0.3.1/Color.cc	2003-12-07 14:56:07.724194970 +0100
+@@ -32,6 +32,7 @@
+ //#include <stdio.h>
+ //}
+ #include <iostream>
++#include <assert.h>
+ 
+ 
+ BColor::ColorCache BColor::colorcache;
+--- bbcd-0.3.1/Texture.cc.org	2003-12-07 14:55:57.382507797 +0100
++++ bbcd-0.3.1/Texture.cc	2003-12-07 14:56:41.924228114 +0100
+@@ -37,6 +37,7 @@
+ #include "Texture.hh"
+ //#include "BaseDisplay.hh"
+ #include "Image.hh"
++#include <assert.h>
+ //#include "Screen.hh"
+ //#include "blackbox.hh"
+ 
diff --git a/x11-misc/bbcd/files/bbcd-0.3.1-gcc4.3.patch b/x11-misc/bbcd/files/bbcd-0.3.1-gcc4.3.patch
new file mode 100644
index 000000000000..90c2d4ab8d8e
--- /dev/null
+++ b/x11-misc/bbcd/files/bbcd-0.3.1-gcc4.3.patch
@@ -0,0 +1,11 @@
+Add header to be compatible with gcc-4.3 and glibc-2.8.
+--- bbcd-0.3.1/Image.cc
++++ bbcd-0.3.1/Image.cc
+@@ -29,6 +29,7 @@
+ //#  include <stdio.h>
+ //#endif // HAVE_STDIO_H
+ #include <iostream>
++#include <cstring>
+ 
+ #include <algorithm>
+ using std::max;
diff --git a/x11-misc/bbcd/files/bbcd-0.3.1_0.3.1a.diff b/x11-misc/bbcd/files/bbcd-0.3.1_0.3.1a.diff
new file mode 100644
index 000000000000..75db91941727
--- /dev/null
+++ b/x11-misc/bbcd/files/bbcd-0.3.1_0.3.1a.diff
@@ -0,0 +1,41 @@
+diff -urN bbcd-0.3.1/CD_Ctrl.cc bbcd-0.3.2/CD_Ctrl.cc
+--- bbcd-0.3.1/CD_Ctrl.cc	Sun Jun 23 18:35:27 2002
++++ bbcd-0.3.2/CD_Ctrl.cc	Mon Feb  3 09:29:00 2003
+@@ -116,7 +116,7 @@
+       cd_resume(getCdFd());
+       return di.disc_current_track;
+     }
+-    if(di.disc_mode == CDAUDIO_COMPLETED) {
++    if(di.disc_mode == CDAUDIO_COMPLETED || di.disc_mode == CDAUDIO_NOSTATUS) {
+       cd_play(getCdFd(), di.disc_first_track);
+       return di.disc_first_track;
+     }
+Binary files bbcd-0.3.1/test_cd_ctrl and bbcd-0.3.2/test_cd_ctrl differ
+diff -urN bbcd-0.3.1/test_cd_ctrl.cc bbcd-0.3.2/test_cd_ctrl.cc
+--- bbcd-0.3.1/test_cd_ctrl.cc	Thu Jun 27 22:52:36 2002
++++ bbcd-0.3.2/test_cd_ctrl.cc	Mon Feb  3 09:19:42 2003
+@@ -88,10 +88,20 @@
+ 
+   CD_Controler cd(deviceName);
+   if(info) {
+-    std::cout << "Drive status: \n";
+-    std::cout << "Disc present ? " << (cd.isDiscPresent()?"yes":"no") << "\n";
+-    std::cout << "Is drive playing ? " << (cd.isPlaying()?"yes":"no") << "\n"
+-      << "Is drive paused ? " << (cd.isPaused()?"yes":"no") << "\n";
++    std::cout << "Drive status: \n"
++      << "Disc present? " << (cd.isDiscPresent()?"yes":"no") << "\n"
++      << "Is drive playing? " << (cd.isPlaying()?"yes":"no") << "\n"
++      << "Is drive paused? " << (cd.isPaused()?"yes":"no") << "\n"
++      << "Audio status: ";
++    switch(cd.getAudioStatus()) {
++    case CD_Controler::Invalid:   std::cout<<"Invalid"; break;
++    case CD_Controler::Play:      std::cout<<"Play"; break;
++    case CD_Controler::Paused:    std::cout<<"Paused"; break;
++    case CD_Controler::Completed: std::cout<<"Completed"; break;
++    case CD_Controler::Error:     std::cout<<"Error"; break;
++    case CD_Controler::NoStatus:  std::cout<<"No Status"; break;
++    }
++    std::cout<<std::endl;
+   }
+ 
+   if(pause) {
diff --git a/x11-misc/bbcd/metadata.xml b/x11-misc/bbcd/metadata.xml
new file mode 100644
index 000000000000..36762631649d
--- /dev/null
+++ b/x11-misc/bbcd/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
+  <longdescription>
+  Basic CD Player app for Blackbox.
+  </longdescription>
+</pkgmetadata>
diff --git a/x11-misc/bbdate/Manifest b/x11-misc/bbdate/Manifest
new file mode 100644
index 000000000000..43e85e9026dc
--- /dev/null
+++ b/x11-misc/bbdate/Manifest
@@ -0,0 +1 @@
+DIST bbdate-0.2.4.tar.gz 60644 SHA256 a7957e8b8aa27b7d15d05ba19011311693d4ffd3bb53f023d1f2346f142bb802 SHA512 90c51249a6ad0b90aea640b1f94cee4e9feb3ca46e4407ab3be645f92a32e7c3f1879c58a236c487dd7bfb24aae1f6a03da0a535c9218fbcbcdbd1e6f043d041 WHIRLPOOL 29f3c9879769248f283969e17084e04262438fdaeb1a2fcb0a8132394796d775a4fc14362c9d127987d81b48d2e50ea0d928d88ab7d44eace19bd8b96bdef75d
diff --git a/x11-misc/bbdate/bbdate-0.2.4-r1.ebuild b/x11-misc/bbdate/bbdate-0.2.4-r1.ebuild
new file mode 100644
index 000000000000..67068033465c
--- /dev/null
+++ b/x11-misc/bbdate/bbdate-0.2.4-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils autotools
+
+DESCRIPTION="blackbox date display"
+HOMEPAGE="http://sourceforge.net/projects/bbtools"
+SRC_URI="mirror://sourceforge/bbtools/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc sparc x86 ~x86-fbsd"
+IUSE=""
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-as-needed.patch
+	sed -i \
+		-e 's|-helvetica-|-*-|g' \
+		resource.cc data/${PN}.{nobb,style} || die
+	eautoreconf
+}
+
+src_install () {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc README AUTHORS BUGS INSTALL ChangeLog TODO
+
+	# since multiple bbtools packages provide this file, install
+	# it in /usr/share/doc/${PF}
+	mv "${D}"/usr/share/bbtools/bbtoolsrc.in \
+		"${D}"/usr/share/doc/${PF}/bbtoolsrc.example
+}
diff --git a/x11-misc/bbdate/files/bbdate-0.2.4-as-needed.patch b/x11-misc/bbdate/files/bbdate-0.2.4-as-needed.patch
new file mode 100644
index 000000000000..38767a76443b
--- /dev/null
+++ b/x11-misc/bbdate/files/bbdate-0.2.4-as-needed.patch
@@ -0,0 +1,21 @@
+Reason: Correct lib and ldflags ordering, fixes --as-needed.
+Upstream: No.
+--- bbdate-0.2.4/configure.in
++++ bbdate-0.2.4/configure.in
+@@ -47,12 +47,13 @@
+ 
+ CFLAGS="$CFLAGS $X_CFLAGS"
+ CXXFLAGS="$CXXFLAGS $X_CFLAGS"
+-LDFLAGS="$LDFLAGS $X_LIBS $X_PRE_LIBS"
++LDFLAGS="$LDFLAGS"
++LIBS="$X_LIBS $X_PRE_LIBS"
+ dnl Checks for X libraries.
+-AC_CHECK_LIB(X11, XOpenDisplay, LDFLAGS="$LDFLAGS -lX11",
++AC_CHECK_LIB(X11, XOpenDisplay, LIBS="$LIBS -lX11",
+              AC_MSG_ERROR(XOpenDisplay not found in -lX11))
+ 
+-LDFLAGS="$LDFLAGS $X_EXTRA_LIBS"
++LIBS="$LIBS $X_EXTRA_LIBS"
+ 
+ dnl Checks for header files.
+ AC_HEADER_STDC
diff --git a/x11-misc/bbdate/metadata.xml b/x11-misc/bbdate/metadata.xml
new file mode 100644
index 000000000000..7771645ed3d5
--- /dev/null
+++ b/x11-misc/bbdate/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
+	<longdescription>A data display for Blackbox.</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">bbtools</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-misc/bbkeys/Manifest b/x11-misc/bbkeys/Manifest
new file mode 100644
index 000000000000..a6e69b1e37f9
--- /dev/null
+++ b/x11-misc/bbkeys/Manifest
@@ -0,0 +1,2 @@
+DIST bbkeys-0.9.0.tar.gz 199146 SHA256 1ebf372e35b31e7bd63c9a28d2434cfc44588db08b653df64a396d2821dd9ff0
+DIST bbkeys-0.9.1.tar.gz 226941 SHA256 4381994b998a0b41e3b27d532bdb2a859fefaca260705022eeec8c1c02e99680
diff --git a/x11-misc/bbkeys/bbkeys-0.9.0-r1.ebuild b/x11-misc/bbkeys/bbkeys-0.9.0-r1.ebuild
new file mode 100644
index 000000000000..b8fe4ba8b533
--- /dev/null
+++ b/x11-misc/bbkeys/bbkeys-0.9.0-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils
+
+DESCRIPTION="Use keyboard shortcuts in the blackbox wm"
+HOMEPAGE="http://bbkeys.sourceforge.net"
+SRC_URI="mirror://sourceforge/bbkeys/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ppc x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=x11-wm/blackbox-0.70.0"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-gcc-4.3.patch"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+	rm -rf "${D}/usr/share/doc"
+	dodoc AUTHORS BUGS ChangeLog NEWS README
+}
diff --git a/x11-misc/bbkeys/bbkeys-0.9.1.ebuild b/x11-misc/bbkeys/bbkeys-0.9.1.ebuild
new file mode 100644
index 000000000000..ccd84533b98a
--- /dev/null
+++ b/x11-misc/bbkeys/bbkeys-0.9.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+DESCRIPTION="Use keyboard shortcuts in the blackbox wm"
+HOMEPAGE="http://bbkeys.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=x11-wm/blackbox-0.70.0"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	rm -rf "${D}"/usr/share/doc
+	dodoc AUTHORS BUGS ChangeLog NEWS README || die
+
+	echo PRELINK_PATH_MASK=/usr/bin/bbkeys > "${T}"/99bbkeys
+	doenvd "${T}"/99bbkeys || die
+}
diff --git a/x11-misc/bbkeys/files/bbkeys-0.9.0-gcc-4.3.patch b/x11-misc/bbkeys/files/bbkeys-0.9.0-gcc-4.3.patch
new file mode 100644
index 000000000000..58b536ff38e2
--- /dev/null
+++ b/x11-misc/bbkeys/files/bbkeys-0.9.0-gcc-4.3.patch
@@ -0,0 +1,59 @@
+diff -Naupr bbkeys-0.9.0.orig/src/actions.cc bbkeys-0.9.0/src/actions.cc
+--- bbkeys-0.9.0.orig/src/actions.cc	2005-02-20 22:03:43.000000000 +0100
++++ bbkeys-0.9.0/src/actions.cc	2008-02-24 09:26:30.000000000 +0100
+@@ -25,7 +25,8 @@
+ #include "actions.hh"
+ 
+ #include <iostream>
+-#include <string>
++#include <cstring>
++#include <cstdlib>
+ #include <sstream>
+ 
+ Action::Action(enum ActionType type, Display * display, KeyCode keycode, 
+diff -Naupr bbkeys-0.9.0.orig/src/Config.cpp bbkeys-0.9.0/src/Config.cpp
+--- bbkeys-0.9.0.orig/src/Config.cpp	2004-09-03 03:08:00.000000000 +0200
++++ bbkeys-0.9.0/src/Config.cpp	2008-02-24 09:29:55.000000000 +0100
+@@ -24,7 +24,7 @@
+ 
+ 
+ #include "Config.h"
+-#include <string>
++#include <cstring>
+ 
+ #include <iostream>
+ using std::cout;
+diff -Naupr bbkeys-0.9.0.orig/src/KeyClient.cpp bbkeys-0.9.0/src/KeyClient.cpp
+--- bbkeys-0.9.0.orig/src/KeyClient.cpp	2004-09-26 04:27:46.000000000 +0200
++++ bbkeys-0.9.0/src/KeyClient.cpp	2008-02-24 09:26:14.000000000 +0100
+@@ -58,6 +58,7 @@ extern "C" {
+ #include <iostream>
+ #include <algorithm>
+ #include <vector>
++#include <cstring>
+ 
+ //--------------------------------------------------------
+ // Constructor/Destructor
+diff -Naupr bbkeys-0.9.0.orig/src/main.cpp bbkeys-0.9.0/src/main.cpp
+--- bbkeys-0.9.0.orig/src/main.cpp	2004-09-16 02:53:51.000000000 +0200
++++ bbkeys-0.9.0/src/main.cpp	2008-02-24 09:31:38.000000000 +0100
+@@ -27,6 +27,8 @@
+ 
+ #include "main.h"
+ 
++#include <cstring>
++
+ //--------------------------------------------------------
+ // parseOptions
+ //--------------------------------------------------------
+diff -Naupr bbkeys-0.9.0.orig/src/Netclient.cpp bbkeys-0.9.0/src/Netclient.cpp
+--- bbkeys-0.9.0.orig/src/Netclient.cpp	2004-09-26 04:27:46.000000000 +0200
++++ bbkeys-0.9.0/src/Netclient.cpp	2008-02-24 09:30:41.000000000 +0100
+@@ -25,6 +25,7 @@
+ // Methods, ideas, implementations taken from Openbox's XAtom class *sigh*
+ 
+ #include "Netclient.h"
++#include <cstring>
+ 
+ Netclient::Netclient (const bt::Display &display)
+   : bt::EWMH(display), _display(display)
diff --git a/x11-misc/bbkeys/metadata.xml b/x11-misc/bbkeys/metadata.xml
new file mode 100644
index 000000000000..82f8fca0a209
--- /dev/null
+++ b/x11-misc/bbkeys/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer>
+    <email>maintainer-needed@gentoo.org</email>
+  </maintainer>
+  <longdescription>
+  A keygrabber for Blackbox.
+  </longdescription>
+  <upstream>
+    <remote-id type="sourceforge">bbkeys</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/x11-misc/bblaunch/Manifest b/x11-misc/bblaunch/Manifest
new file mode 100644
index 000000000000..436f4076c662
--- /dev/null
+++ b/x11-misc/bblaunch/Manifest
@@ -0,0 +1 @@
+DIST bblaunch-0.0.3.tar.gz 31719 SHA256 892e84e47aeb97843b99aef9eecae0b7ebf3971547ebb51d6e4e79111b06dfee
diff --git a/x11-misc/bblaunch/bblaunch-0.0.3.ebuild b/x11-misc/bblaunch/bblaunch-0.0.3.ebuild
new file mode 100644
index 000000000000..82f390d9b84d
--- /dev/null
+++ b/x11-misc/bblaunch/bblaunch-0.0.3.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+inherit eutils
+
+DESCRIPTION="An application launcher for Blackbox type window managers"
+SRC_URI="http://www.stud.ifi.uio.no/~steingrd/${P}.tar.gz"
+HOMEPAGE="http://blackboxwm.sourceforge.net/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="ppc x86 ~x86-fbsd"
+IUSE=""
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}.patch
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc README CHANGELOG AUTHORS
+}
diff --git a/x11-misc/bblaunch/files/bblaunch-0.0.3.patch b/x11-misc/bblaunch/files/bblaunch-0.0.3.patch
new file mode 100644
index 000000000000..3c78fab2ec77
--- /dev/null
+++ b/x11-misc/bblaunch/files/bblaunch-0.0.3.patch
@@ -0,0 +1,11 @@
+--- bblaunch.c.orig	2002-05-06 23:35:57.000000000 -0500
++++ bblaunch.c	2004-06-15 07:21:11.080972712 -0500
+@@ -170,7 +170,7 @@
+ 	launchargs.iconic = False;
+ 	launchargs.pause = 1000;
+ 
+-	sprintf(launchargs.call, "%s", (char *)atoi(argv[0]));
++	sprintf(launchargs.call, "%s", argv[0]);
+ 
+ 	i = 1;
+ 	valargs = 1;
diff --git a/x11-misc/bblaunch/metadata.xml b/x11-misc/bblaunch/metadata.xml
new file mode 100644
index 000000000000..232a6b8297fd
--- /dev/null
+++ b/x11-misc/bblaunch/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
+  <longdescription>
+  An application launcher for Blackbox.
+  </longdescription>
+</pkgmetadata>
diff --git a/x11-misc/bbmail/Manifest b/x11-misc/bbmail/Manifest
new file mode 100644
index 000000000000..521ed79d72e2
--- /dev/null
+++ b/x11-misc/bbmail/Manifest
@@ -0,0 +1 @@
+DIST bbmail-0.9.3.tar.gz 186433 SHA256 e992f83d758215e3331f7bfcb5431b6cc8988bc542907de1bca6fe3c8ae9233e
diff --git a/x11-misc/bbmail/bbmail-0.9.3.ebuild b/x11-misc/bbmail/bbmail-0.9.3.ebuild
new file mode 100644
index 000000000000..ab3d3ce8e92d
--- /dev/null
+++ b/x11-misc/bbmail/bbmail-0.9.3.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+inherit autotools eutils
+
+DESCRIPTION="blackbox mail notification"
+HOMEPAGE="http://sourceforge.net/projects/bbtools"
+SRC_URI="mirror://sourceforge/bbtools/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="amd64 ppc x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="x11-wm/blackbox
+	x11-libs/libX11
+	x11-libs/libXext"
+DEPEND="${RDEPEND}
+	x11-proto/xproto"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gcc4.3.patch \
+		"${FILESDIR}"/${P}-gcc4.4.patch
+	eautoreconf
+}
+
+src_install () {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dobin scripts/bbmailparsefm.pl
+	dodoc AUTHORS BUGS ChangeLog INSTALL NEWS README TODO
+}
diff --git a/x11-misc/bbmail/files/bbmail-0.9.3-gcc4.3.patch b/x11-misc/bbmail/files/bbmail-0.9.3-gcc4.3.patch
new file mode 100644
index 000000000000..442c68f3ce8e
--- /dev/null
+++ b/x11-misc/bbmail/files/bbmail-0.9.3-gcc4.3.patch
@@ -0,0 +1,45 @@
+Reason: Fix compile with gcc 4.3 and glibc 2.8.
+Upstream: Sent, http://sourceforge.net/tracker/index.php?func=detail&aid=2116825&group_id=54703&atid=474517
+--- bbmail-0.9.3.orig/src/baseresource.cpp	2008-09-17 22:39:58.000000000 +0200
++++ bbmail-0.9.3/src/baseresource.cpp	2008-09-17 22:44:16.000000000 +0200
+@@ -20,6 +20,7 @@
+ //
+ 
+ #include <string>
++#include <cstring>
+ #include "baseresource.h"
+ #include <stdio.h>
+ #include "Menu.hh"
+--- bbmail-0.9.3.orig/src/bbmail.cpp	2008-09-17 22:39:58.000000000 +0200
++++ bbmail-0.9.3/src/bbmail.cpp	2008-09-17 22:43:49.000000000 +0200
+@@ -22,6 +22,8 @@
+ #include "bbmail.h"
+ #include "config.h"
+ #include <string>
++#include <cstring>
++
+ 
+ extern "C" {
+ #include <utime.h>
+--- bbmail-0.9.3.orig/src/main.cpp	2008-09-17 22:39:58.000000000 +0200
++++ bbmail-0.9.3/src/main.cpp	2008-09-17 22:42:09.000000000 +0200
+@@ -23,6 +23,8 @@
+ #include "main.h"
+ #include "config.h"
+ 
++#include <cstring>
++
+ Configuration::Configuration(int iargc, char **iargv)
+ {
+ 	withdrawn = false;
+--- bbmail-0.9.3.orig/src/resource.cpp	2008-09-17 22:39:58.000000000 +0200
++++ bbmail-0.9.3/src/resource.cpp	2008-09-17 22:44:36.000000000 +0200
+@@ -23,6 +23,8 @@
+ #include "resource.h"
+ #include "blackboxstyle.h"
+ 
++#include <cstring>
++
+ Resource::Resource(ToolWindow *toolwindow, const std::string &rc_file):
+ 		BaseResource(*toolwindow, toolwindow->getCurrentScreen(), rc_file), 
+     	spoolfile(0),
diff --git a/x11-misc/bbmail/files/bbmail-0.9.3-gcc4.4.patch b/x11-misc/bbmail/files/bbmail-0.9.3-gcc4.4.patch
new file mode 100644
index 000000000000..d0f93d921d97
--- /dev/null
+++ b/x11-misc/bbmail/files/bbmail-0.9.3-gcc4.4.patch
@@ -0,0 +1,89 @@
+diff -ur bbmail-0.9.3.orig/configure.ac bbmail-0.9.3/configure.ac
+--- bbmail-0.9.3.orig/configure.ac	2007-12-03 23:04:11.000000000 +0200
++++ bbmail-0.9.3/configure.ac	2009-07-30 19:24:12.000000000 +0300
+@@ -9,13 +9,11 @@
+ AC_DEFUN(AC_SET_DEBUG,
+ [
+  test "$CXXFLAGS" = "" && CXXFLAGS="-g -Wall -DDEBUG"
+- test "$LDFLAGS" = "" && LDFLAGS=""
+ ])
+ 
+ AC_DEFUN(AC_SET_NODEBUG,
+ [
+- test "$CXXFLAGS" = "" && CXXFLAGS="-O2 -Wall"
+- test "$LDFLAGS" = "" && LDFLAGS="-s"
++ test "$CXXFLAGS" = "" && CXXFLAGS="-Wall"
+ ])
+       
+ 
+@@ -46,9 +44,9 @@
+ 
+ CFLAGS="$CFLAGS $X_CFLAGS"
+ CXXFLAGS="$CXXFLAGS $X_CFLAGS"
+-LDFLAGS="$LDFLAGS $X_LIBS $X_PRE_LIBS"
++LIBS="$X_LIBS $X_PRE_LIBS"
+ dnl Checks for X libraries.
+-AC_CHECK_LIB(X11, XOpenDisplay, LDFLAGS="$LDFLAGS -lX11",
++AC_CHECK_LIB(X11, XOpenDisplay, LIBS="$LIBS -lX11",
+              AC_MSG_ERROR(XOpenDisplay not found in -lX11))
+ 
+ dnl Checks for Xextension
+diff -ur bbmail-0.9.3.orig/src/bbmail.cpp bbmail-0.9.3/src/bbmail.cpp
+--- bbmail-0.9.3.orig/src/bbmail.cpp	2007-12-03 23:08:26.000000000 +0200
++++ bbmail-0.9.3/src/bbmail.cpp	2009-07-30 19:20:10.000000000 +0300
+@@ -19,6 +19,8 @@
+ // (See the included file COPYING / GPL-2.0)
+ //
+ 
++#include <cstdio>
++
+ #include "bbmail.h"
+ #include "config.h"
+ #include <string>
+diff -ur bbmail-0.9.3.orig/src/mailboxmenu.cpp bbmail-0.9.3/src/mailboxmenu.cpp
+--- bbmail-0.9.3.orig/src/mailboxmenu.cpp	2005-02-01 00:03:37.000000000 +0200
++++ bbmail-0.9.3/src/mailboxmenu.cpp	2009-07-30 19:20:39.000000000 +0300
+@@ -19,6 +19,9 @@
+ // (See the included file COPYING / GPL-2.0)
+ //
+ //
++
++#include <cstdio>
++
+ #include "mailboxmenu.h"
+ 
+ MailboxMenu::MailboxMenu(ToolWindow *toolwindow) :
+diff -ur bbmail-0.9.3.orig/src/main.cpp bbmail-0.9.3/src/main.cpp
+--- bbmail-0.9.3.orig/src/main.cpp	2006-01-20 23:28:08.000000000 +0200
++++ bbmail-0.9.3/src/main.cpp	2009-07-30 19:19:49.000000000 +0300
+@@ -19,6 +19,8 @@
+ // (See the included file COPYING / GPL-2.0)
+ //
+ 
++#include <cstdio>
++
+ #include "bbmail.h"
+ #include "main.h"
+ #include "config.h"
+diff -ur bbmail-0.9.3.orig/src/Makefile.am bbmail-0.9.3/src/Makefile.am
+--- bbmail-0.9.3.orig/src/Makefile.am	2005-09-06 23:57:42.000000000 +0300
++++ bbmail-0.9.3/src/Makefile.am	2009-07-30 19:24:39.000000000 +0300
+@@ -10,5 +10,4 @@
+ 		 spoollist.cpp spoollist.h \
+ 		 mailboxmenu.cpp mailboxmenu.h \
+ 		 blackboxstyle.h
+-bbmail_LDADD = @X_LIBS@
+-
++bbmail_LDADD = @LIBS@
+diff -ur bbmail-0.9.3.orig/src/resource.cpp bbmail-0.9.3/src/resource.cpp
+--- bbmail-0.9.3.orig/src/resource.cpp	2007-08-28 19:47:19.000000000 +0300
++++ bbmail-0.9.3/src/resource.cpp	2009-07-30 19:20:00.000000000 +0300
+@@ -19,6 +19,8 @@
+ // (See the included file COPYING / GPL-2.0)
+ //
+ 
++#include <cstdio>
++
+ #include "bbmail.h"
+ #include "resource.h"
+ #include "blackboxstyle.h"
diff --git a/x11-misc/bbmail/metadata.xml b/x11-misc/bbmail/metadata.xml
new file mode 100644
index 000000000000..670d4c7bde18
--- /dev/null
+++ b/x11-misc/bbmail/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer>
+    <email>maintainer-needed@gentoo.org</email>
+  </maintainer>
+  <longdescription>
+  Mail notification for Blackbox.
+  </longdescription>
+  <upstream>
+    <remote-id type="sourceforge">bbtools</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/x11-misc/bbpager/Manifest b/x11-misc/bbpager/Manifest
new file mode 100644
index 000000000000..6838bd708f11
--- /dev/null
+++ b/x11-misc/bbpager/Manifest
@@ -0,0 +1 @@
+DIST bbpager-0.4.7.tar.gz 170575 SHA256 e7063a8d65c25663f44e2769132053bd3f1b90f0d4b19a8d8aa2e5f028f0679d
diff --git a/x11-misc/bbpager/bbpager-0.4.7.ebuild b/x11-misc/bbpager/bbpager-0.4.7.ebuild
new file mode 100644
index 000000000000..9dcdbd02e608
--- /dev/null
+++ b/x11-misc/bbpager/bbpager-0.4.7.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit base autotools
+
+DESCRIPTION="An understated pager for Blackbox"
+HOMEPAGE="http://bbtools.sourceforge.net/"
+SRC_URI="mirror://sourceforge/bbtools/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="x11-wm/blackbox"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+PATCHES=(
+		"${FILESDIR}/${P}-gcc43.patch"
+		"${FILESDIR}/${P}-as-needed.patch"
+	)
+
+src_unpack() {
+	base_src_unpack
+	cd "${S}"
+	eautoreconf
+}
+
+src_install () {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc AUTHORS BUGS ChangeLog README TODO
+}
diff --git a/x11-misc/bbpager/files/bbpager-0.4.7-as-needed.patch b/x11-misc/bbpager/files/bbpager-0.4.7-as-needed.patch
new file mode 100644
index 000000000000..47efa7132f99
--- /dev/null
+++ b/x11-misc/bbpager/files/bbpager-0.4.7-as-needed.patch
@@ -0,0 +1,92 @@
+diff -NrU5 bbpager-0.4.7.orig/configure.ac bbpager-0.4.7/configure.ac
+--- bbpager-0.4.7.orig/configure.ac	2008-12-20 22:38:36.000000000 +0100
++++ bbpager-0.4.7/configure.ac	2008-12-20 23:58:12.000000000 +0100
+@@ -37,40 +37,45 @@
+ AC_PROG_INSTALL
+ AC_HEADER_STDC
+ AC_CHECK_HEADERS(ctype.h fcntl.h libgen.h locale.h process.h signal.h stdio.h time.h unistd.h sys/param.h sys/select.h sys/stat.h sys/time.h sys/types.h sys/wait.h)
+ AC_HEADER_TIME
+ 
++dnl Checks for typedefs, structures, and compiler characteristics.
++AC_C_CONST
++AC_STRUCT_TM
++
++dnl Checks for library functions.
++AC_CHECK_FUNCS(select strstr)
++
+ AC_CHECK_FUNCS(setlocale sigaction strftime)
+ 
+ AC_PATH_X
+ AC_PATH_XTRA
+ 
+-CFLAGS="$CFLAGS $X_CFLAGS"
+-CXXFLAGS="$CXXFLAGS $X_CFLAGS"
+-LDFLAGS="$LDFLAGS $X_LIBS $X_PRE_LIBS"
+ dnl Checks for X libraries.
+-AC_CHECK_LIB(X11, XOpenDisplay, LDFLAGS="$LDFLAGS -lX11",
+-             AC_MSG_ERROR(XOpenDisplay not found in -lX11))
++AC_CHECK_LIB([X11],
++	[XOpenDisplay],
++	[],
++	[AC_MSG_ERROR(XOpenDisplay not found in -lX11)]
++	)
+ 
+ dnl Checks for Xextension
+-SHAPE=
+-AC_CHECK_LIB(Xext, XMissingExtension, LIBS="$LIBS -lXext"; SHAPE="-DSHAPE",
+-             AC_MSG_ERROR(XMissingExtension not found in -lXext))
+-AC_SUBST(SHAPE)
+-
+-dnl Checks for typedefs, structures, and compiler characteristics.
+-AC_C_CONST
+-AC_HEADER_TIME
+-AC_STRUCT_TM
+-
+-dnl Checks for library functions.
+-AC_CHECK_FUNCS(select strstr)
++PKG_CHECK_MODULES([XEXT], [xext],
++	[
++	AC_CHECK_LIB([Xext],
++		[XMissingExtension],
++		[],
++	        [AC_MSG_ERROR(XMissingExtension not found in -lXext)]
++		)
++	],
++	[AC_MSG_ERROR(xext not found)]
++	)
+ 
+ dnl pkgconfig checks for blackbox library
+ PKG_CHECK_MODULES(LIBBT, libbt)
+-CXXFLAGS="$CXXFLAGS $LIBBT_CFLAGS"
+-LIBS="$LIBS $LIBBT_LIBS"
++
++LIBS="$LIBS $LIBBT_LIBS $X_LIBS $X_PRE_LIBS $XEXT_LIBS"
+ 
+ dnl generate the config header
+ AM_CONFIG_HEADER(config.h) 
+ 
+ dnl Print results
+diff -NrU5 bbpager-0.4.7.orig/src/Makefile.am bbpager-0.4.7/src/Makefile.am
+--- bbpager-0.4.7.orig/src/Makefile.am	2008-12-20 22:38:36.000000000 +0100
++++ bbpager-0.4.7/src/Makefile.am	2008-12-20 23:56:15.000000000 +0100
+@@ -1,8 +1,9 @@
+-CPPFLAGS = @CPPFLAGS@ @SHAPE@ \
++AM_CPPFLAGS = $(CPPFLAGS) -DSHAPE \
+ -DBBTOOL_GLOBAL=\"$(datadir)/bbtools/bbpager.rc\" \
+ -DBBTOOL_LOCAL=\"~/.bbtools/bbpager.rc\"
++AM_CXXFLAGS = $(X_CFLAGS) $(XEXT_CFLAGS) $(LIBBT_CFLAGS)
+ 				
+ bin_PROGRAMS = bbpager
+ bbpager_SOURCES = bbpager.cxx bbpager.h \
+ 		 main.cxx main.h \
+ 		 Baseresource.cxx Baseresource.h \
+@@ -10,7 +11,8 @@
+ 		 wminterface.cxx wminterface.h \
+ 		 blackboxstyle.h \
+          pager.cxx pager.h \
+          desktop.cxx desktop.h
+ #		 pagermenu.cc pagermenu.hh \
+-bbpager_LDADD = @X_LIBS@
++#
++
+ 
diff --git a/x11-misc/bbpager/files/bbpager-0.4.7-gcc43.patch b/x11-misc/bbpager/files/bbpager-0.4.7-gcc43.patch
new file mode 100644
index 000000000000..bf0c9bedd64e
--- /dev/null
+++ b/x11-misc/bbpager/files/bbpager-0.4.7-gcc43.patch
@@ -0,0 +1,33 @@
+diff -urNad bbpager-0.4.7~/src/Baseresource.cxx bbpager-0.4.7/src/Baseresource.cxx
+--- bbpager-0.4.7~/src/Baseresource.cxx	2008-03-28 06:55:16.000000000 -0400
++++ bbpager-0.4.7/src/Baseresource.cxx	2008-04-09 21:58:03.000000000 -0400
+@@ -20,6 +20,7 @@
+ //
+ 
+ #include <string>
++#include <cstring>
+ #include "Baseresource.h"
+ #include <stdio.h>
+ #include "Menu.hh"
+diff -urNad bbpager-0.4.7~/src/main.cxx bbpager-0.4.7/src/main.cxx
+--- bbpager-0.4.7~/src/main.cxx	2008-03-28 06:55:16.000000000 -0400
++++ bbpager-0.4.7/src/main.cxx	2008-04-09 21:58:03.000000000 -0400
+@@ -25,6 +25,7 @@
+ 
+ #include <stdio.h>
+ #include <string>
++#include <cstring>
+ #include <iostream>
+ 
+ 
+diff -urNad bbpager-0.4.7~/src/resource.cxx bbpager-0.4.7/src/resource.cxx
+--- bbpager-0.4.7~/src/resource.cxx	2007-03-11 17:47:07.000000000 -0400
++++ bbpager-0.4.7/src/resource.cxx	2008-04-09 21:58:39.000000000 -0400
+@@ -19,6 +19,7 @@
+ // (See the included file COPYING / GPL-2.0)
+ //
+ 
++#include <cstring>
+ #include "resource.h"
+ #include "blackboxstyle.h"
+ 
diff --git a/x11-misc/bbpager/metadata.xml b/x11-misc/bbpager/metadata.xml
new file mode 100644
index 000000000000..93d6fc922f8c
--- /dev/null
+++ b/x11-misc/bbpager/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer>
+    <email>maintainer-needed@gentoo.org</email>
+  </maintainer>
+  <longdescription>
+  An understated pager for Blackbox.
+  </longdescription>
+  <upstream>
+    <remote-id type="sourceforge">bbtools</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/x11-misc/bbppp/Manifest b/x11-misc/bbppp/Manifest
new file mode 100644
index 000000000000..47e911eefece
--- /dev/null
+++ b/x11-misc/bbppp/Manifest
@@ -0,0 +1 @@
+DIST bbppp-0.2.5.tar.gz 83421 SHA256 6d606f2e269574b61ad2a223ef38dfe3469cfa7518f5d114f2349545747173b4 SHA512 55d1e4d1a2c97ac5a5d34a48cd877891d8d6acf32083d7bfa90e4941cfbc18a91d056a0ec6b7a96182f72be440f6609caf3bc82c9071c6d0bcfbe95577f04930 WHIRLPOOL 09ee0e37e75c52be0bdccb8fbb518fd1c408340e256b0ea62366bc816cc830a6d265ea80432ee0e8ba768c5d938d3a6b85c026d562e27bd47aed107e27205a34
diff --git a/x11-misc/bbppp/bbppp-0.2.5-r1.ebuild b/x11-misc/bbppp/bbppp-0.2.5-r1.ebuild
new file mode 100644
index 000000000000..d3c8e49aa3fe
--- /dev/null
+++ b/x11-misc/bbppp/bbppp-0.2.5-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit autotools eutils
+
+DESCRIPTION="blackbox ppp frontend/monitor"
+HOMEPAGE="http://sourceforge.net/projects/bbtools/"
+SRC_URI="mirror://sourceforge/bbtools/${PN}/${P}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND="x11-libs/libX11"
+RDEPEND="${DEPEND}
+	media-fonts/font-adobe-100dpi"
+
+DOCS=( README AUTHORS BUGS ChangeLog NEWS TODO data/README.bbppp )
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gcc3-multiline.patch \
+		"${FILESDIR}"/${PN}-asneeded.patch \
+		"${FILESDIR}"/${P}-overflows.patch
+	eautoreconf
+}
+
+src_install () {
+	default
+	rm "${D}"/usr/share/bbtools/README.bbppp
+}
+
+pkg_postinst() {
+	# don't assume blackbox exists because virtual/blackbox is installed
+	if [[ -x ${ROOT}/usr/bin/blackbox ]] ; then
+		if ! grep bbppp "${ROOT}"/usr/bin/blackbox &>/dev/null ; then
+			sed -e "s/.*blackbox/exec \/usr\/bin\/bbppp \&\n&/" blackbox | cat > blackbox
+		fi
+	fi
+}
diff --git a/x11-misc/bbppp/bbppp-0.2.5.ebuild b/x11-misc/bbppp/bbppp-0.2.5.ebuild
new file mode 100644
index 000000000000..aee5f76cc632
--- /dev/null
+++ b/x11-misc/bbppp/bbppp-0.2.5.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+
+inherit autotools eutils
+
+DESCRIPTION="blackbox ppp frontend/monitor"
+HOMEPAGE="http://sourceforge.net/projects/bbtools/"
+SRC_URI="mirror://sourceforge/bbtools/${PN}/${P}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ppc x86"
+IUSE=""
+
+DEPEND="x11-libs/libX11"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gcc3-multiline.patch \
+		"${FILESDIR}"/${PN}-asneeded.patch
+	eautoreconf
+}
+
+src_install () {
+	emake DESTDIR="${D}" install || die
+	dodoc README AUTHORS BUGS ChangeLog NEWS TODO data/README.bbppp || die
+	rm "${D}"/usr/share/bbtools/README.bbppp
+}
+
+pkg_postinst() {
+	# don't assume blackbox exists because virtual/blackbox is installed
+	if [[ -x ${ROOT}/usr/bin/blackbox ]] ; then
+		if ! grep bbppp "${ROOT}"/usr/bin/blackbox &>/dev/null ; then
+			sed -e "s/.*blackbox/exec \/usr\/bin\/bbppp \&\n&/" blackbox | cat > blackbox
+		fi
+	fi
+}
diff --git a/x11-misc/bbppp/files/bbppp-0.2.5-gcc3-multiline.patch b/x11-misc/bbppp/files/bbppp-0.2.5-gcc3-multiline.patch
new file mode 100644
index 000000000000..ef2072faa9af
--- /dev/null
+++ b/x11-misc/bbppp/files/bbppp-0.2.5-gcc3-multiline.patch
@@ -0,0 +1,44 @@
+--- main.cc
++++ main.cc
+@@ -24,25 +24,24 @@
+ 
+ void Usage()
+ {
+-	char* usageOptions = {"Options:\n\
+-	                      -display <display name>     X server to connect to\n\
+-	                      -c[onfig] <filename>        Alternate config file\n\
+-	                      -n[obb]                     Fall back on default configuration\n\
+-	                      -v[ersion]                  Display version number\n\
+-	                      -h[elp]                     Display this help\n\
+-	                      -geom[etry] <geometry>      Set geometry of window\n\
+-	                      -d[ecorated]                Show 'normal' decorated window\n\
+-	                      -w[ithdrawn]                Place bbtool in the Slit\n\
+-	                      -s[hape]                    Don't display groundplate\n\
+-	                      -thru[put]                  Display throughput rate\n\
+-	                      -o[rient] <v|h>             Display window widgets horizontally or vertically\n\
+-	                      -com[pact]                  Display buttons in compact style\n\
+-	                      -notime                     Dont display time window\n\
+-	                      -nosecs                     Show uptime in old-style hh:mm format\n\n"};
++	char* usageOptions = {"Options:\n"
++	                     "-display <display name>     X server to connect to\n"
++	                     "-c[onfig] <filename>        Alternate config file\n"
++	                     "-n[obb]                     Fall back on default configuration\n"
++	                     "-v[ersion]                  Display version number\n"
++	                     "-h[elp]                     Display this help\n"
++	                     "-geom[etry] <geometry>      Set geometry of window\n"
++	                     "-d[ecorated]                Show 'normal' decorated window\n"
++	                     "-w[ithdrawn]                Place bbtool in the Slit\n"
++	                     "-s[hape]                    Don't display groundplate\n"
++	                     "-thru[put]                  Display throughput rate\n"
++	                     "-o[rient] <v|h>             Display window widgets horizontally or vertically\n"
++	                     "-com[pact]                  Display buttons in compact style\n"
++	                     "-notime                     Dont display time window\n"
++	                     "-nosecs                     Show uptime in old-style hh:mm format\n\n"};
+ 
+ 	fprintf(stdout,"\n%s version %s \n",BBTOOL,BBTOOL_VERSION);
+-	fprintf(stdout,"Usage:\n\
+-	        %s [options]\n",BBTOOL);
++	fprintf(stdout,"Usage:\n%s [options]\n",BBTOOL);
+ 	fprintf(stdout, "%s", usageOptions);
+ 	/*
+ 	fprintf(stdout,"-t[ype] <0|1|2|3>           0: 
diff --git a/x11-misc/bbppp/files/bbppp-0.2.5-overflows.patch b/x11-misc/bbppp/files/bbppp-0.2.5-overflows.patch
new file mode 100644
index 000000000000..0c089bc92f4e
--- /dev/null
+++ b/x11-misc/bbppp/files/bbppp-0.2.5-overflows.patch
@@ -0,0 +1,17 @@
+diff --git a/pppstat.cc b/pppstat.cc
+index 71264e4..ca0f11c 100644
+--- a/pppstat.cc
++++ b/pppstat.cc
+@@ -52,10 +52,10 @@ PPPStat::PPPStat(ToolWindow *toolwindow)
+ 	lastTimeMil = 0.0;
+ 	ppp_h = -1;
+ #ifndef ISDN
+-	active_interface= new char[4];
++	active_interface= new char[5];
+ 	strcpy(active_interface,"ppp0");
+ #else
+-	active_interface= new char[5];
++	active_interface= new char[6];
+ 	strcpy(active_interface,"ippp0");
+ #endif
+ 	connect_status=false;
diff --git a/x11-misc/bbppp/files/bbppp-asneeded.patch b/x11-misc/bbppp/files/bbppp-asneeded.patch
new file mode 100644
index 000000000000..7e8c2b8bcfd4
--- /dev/null
+++ b/x11-misc/bbppp/files/bbppp-asneeded.patch
@@ -0,0 +1,38 @@
+Fixing build with as-needed
+
+https://bugs.gentoo.org/show_bug.cgi?id=248552
+
+--- configure.in
++++ configure.in
+@@ -86,14 +86,9 @@
+ AC_PATH_X
+ AC_PATH_XTRA
+ 
+-CFLAGS="$CFLAGS $X_CFLAGS"
+-CXXFLAGS="$CXXFLAGS $X_CFLAGS"
+-LDFLAGS="$LDFLAGS $X_LIBS $X_PRE_LIBS"
+ dnl Checks for X libraries.
+-AC_CHECK_LIB(X11, XOpenDisplay, LDFLAGS="$LDFLAGS -lX11",
+-             AC_MSG_ERROR(XOpenDisplay not found in -lX11))
+-
+-LDFLAGS="$LDFLAGS $X_EXTRA_LIBS"
++AC_CHECK_LIB([X11], [XOpenDisplay], ,
++             AC_MSG_ERROR(XOpenDisplay not found in -lX11),)
+ 
+ dnl Checks for header files.
+ AC_HEADER_STDC
+--- Makefile.am
++++ Makefile.am
+@@ -1,4 +1,4 @@
+-CPPFLAGS =	@CPPFLAGS@ @INTERLACE@ @ISDN@\
++AM_CPPFLAGS =	 @INTERLACE@ @ISDN@\
+ 		-DGLOBAL_BB=\"$(datadir)/bbtools/bbppp.bb\" \
+ 		-DGLOBAL_NOBB=\"$(datadir)/bbtools/bbppp.nobb\"
+ 
+@@ -16,4 +16,5 @@
+ 		 Basewindow.cc Basewindow.hh \
+ 		 blackboxstyle.hh
+ EXTRA_DIST = BUGS TODO
+-bbppp_LDADD = @X_LIBS@
++bbppp_LDADD  = @X_PRE_LIBS@ @X_LIBS@ @X_EXTRA_LIBS@
++bbppp_CFLAGS = @X_PRE_CFLAGS@ @X_CFLAGS@ @X_EXTRA_CFLAGS@ 
diff --git a/x11-misc/bbppp/metadata.xml b/x11-misc/bbppp/metadata.xml
new file mode 100644
index 000000000000..5527b7f8abac
--- /dev/null
+++ b/x11-misc/bbppp/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer>
+    <email>maintainer-needed@gentoo.org</email>
+  </maintainer>
+  <longdescription>
+  A PPP frontend/monitor for Blackbox.
+  </longdescription>
+  <upstream>
+    <remote-id type="sourceforge">bbtools</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/x11-misc/bbrun/Manifest b/x11-misc/bbrun/Manifest
new file mode 100644
index 000000000000..92fe60ea4ec6
--- /dev/null
+++ b/x11-misc/bbrun/Manifest
@@ -0,0 +1 @@
+DIST bbrun-1.6.tar.gz 21132 SHA256 d0af57276ec9191a94f8d20a2da69dc1818f410f23478f041334aef2d707559a
diff --git a/x11-misc/bbrun/bbrun-1.6-r1.ebuild b/x11-misc/bbrun/bbrun-1.6-r1.ebuild
new file mode 100644
index 000000000000..b1cfe533972f
--- /dev/null
+++ b/x11-misc/bbrun/bbrun-1.6-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="blackbox program execution dialog box"
+HOMEPAGE="http://www.darkops.net/bbrun"
+SRC_URI="http://www.darkops.net/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+RDEPEND="x11-libs/gtk+:2"
+DEPEND="${RDEPEND}
+	x11-libs/libXpm
+	virtual/pkgconfig"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-makefile.patch
+}
+
+src_compile() {
+	emake -C ${PN} CC="$(tc-getCC)" || die
+}
+
+src_install() {
+	dobin ${PN}/${PN}
+	dodoc Changelog README
+}
diff --git a/x11-misc/bbrun/files/bbrun-1.6-makefile.patch b/x11-misc/bbrun/files/bbrun-1.6-makefile.patch
new file mode 100644
index 000000000000..cf89b96df6f3
--- /dev/null
+++ b/x11-misc/bbrun/files/bbrun-1.6-makefile.patch
@@ -0,0 +1,29 @@
+Respect {C,LD}FLAGS, fix underlinking
+
+http://bugs.gentoo.org/367853
+
+--- bbrun/Makefile
++++ bbrun/Makefile
+@@ -1,7 +1,7 @@
+ CC     = gcc
+ LIBDIR = -L/usr/lib -L/usr/X11R6/lib
+-LIBS   = -lXpm `pkg-config --libs gtk+-2.0`
+-CFLAGS = `pkg-config --cflags gtk+-2.0`
++LIBS   = `pkg-config --libs xext xpm gtk+-2.0`
++DEP_CFLAGS = `pkg-config --cflags xext xpm gtk+-2.0`
+ 
+ OBJS   = bbrun.o \
+          ../wmgeneral/wmgeneral.o \
+@@ -11,10 +11,10 @@
+ all: bbrun
+ 
+ .c.o:
+-	$(CC) -g -c -O2 -Wall $< -o $*.o $(CFLAGS)
++	$(CC) $(CFLAGS) $(DEP_CFLAGS) -c -Wall $< -o $*.o
+ 
+ bbrun: $(OBJS)
+-	$(CC) -Wall -g -o bbrun $^ $(LIBDIR) $(LIBS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -Wall -o bbrun $^ $(LIBDIR) $(LIBS)
+ 
+ install:
+ 	cp bbrun /usr/local/bin/
diff --git a/x11-misc/bbrun/files/bbrun-1.6-respectflags.patch b/x11-misc/bbrun/files/bbrun-1.6-respectflags.patch
new file mode 100644
index 000000000000..d81824b0ed0f
--- /dev/null
+++ b/x11-misc/bbrun/files/bbrun-1.6-respectflags.patch
@@ -0,0 +1,26 @@
+Respect {C,LD}FLAGS
+
+--- bbrun/Makefile
++++ bbrun/Makefile
+@@ -1,7 +1,7 @@
+ CC     = gcc
+ LIBDIR = -L/usr/lib -L/usr/X11R6/lib
+ LIBS   = -lXpm `pkg-config --libs gtk+-2.0`
+-CFLAGS = `pkg-config --cflags gtk+-2.0`
++GTK_CFLAGS = `pkg-config --cflags gtk+-2.0`
+ 
+ OBJS   = bbrun.o \
+          ../wmgeneral/wmgeneral.o \
+@@ -11,10 +11,10 @@
+ all: bbrun
+ 
+ .c.o:
+-	$(CC) -g -c -O2 -Wall $< -o $*.o $(CFLAGS)
++	$(CC) $(CFLAGS) $(GTK_CFLAGS) -c -Wall $< -o $*.o
+ 
+ bbrun: $(OBJS)
+-	$(CC) -Wall -g -o bbrun $^ $(LIBDIR) $(LIBS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -Wall -o bbrun $^ $(LIBDIR) $(LIBS)
+ 
+ install:
+ 	cp bbrun /usr/local/bin/
diff --git a/x11-misc/bbrun/metadata.xml b/x11-misc/bbrun/metadata.xml
new file mode 100644
index 000000000000..4538a68724a6
--- /dev/null
+++ b/x11-misc/bbrun/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
+</pkgmetadata>
diff --git a/x11-misc/bbsload/Manifest b/x11-misc/bbsload/Manifest
new file mode 100644
index 000000000000..c4cd54834e8a
--- /dev/null
+++ b/x11-misc/bbsload/Manifest
@@ -0,0 +1 @@
+DIST bbsload-0.2.9.tar.gz 127556 SHA256 9a7f626cd66fa6d04a6aee83b31652ebe2604b1b8848ff5737a3a753a98acd82 SHA512 73bdf9da03bea0253ebec6aaf2cbd1e287bf97c2e9669c05fe878b24e3d30bfb6ad9c7b0be358f89ead646f023b2f0fc0ea1cc1b153713b91c005fbfbf8f4591 WHIRLPOOL a44b672e22fbd373911570a3dc3a949512a7ee77f2e8f71b3859ccc8215116e368c5ec81453e248b750091165e0524cc14c76a556c639972784195f7eaa9d95d
diff --git a/x11-misc/bbsload/bbsload-0.2.9.ebuild b/x11-misc/bbsload/bbsload-0.2.9.ebuild
new file mode 100644
index 000000000000..0caf4016715c
--- /dev/null
+++ b/x11-misc/bbsload/bbsload-0.2.9.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit autotools eutils
+
+DESCRIPTION="blackbox load monitor"
+HOMEPAGE="http://sourceforge.net/projects/bbtools/"
+SRC_URI="mirror://sourceforge/bbtools/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="media-fonts/font-adobe-100dpi"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.2.8-as-needed.patch
+	eautoreconf
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc README AUTHORS BUGS ChangeLog NEWS TODO data/README.bbsload
+}
diff --git a/x11-misc/bbsload/files/bbsload-0.2.8-as-needed.patch b/x11-misc/bbsload/files/bbsload-0.2.8-as-needed.patch
new file mode 100644
index 000000000000..fd3aa0a42de3
--- /dev/null
+++ b/x11-misc/bbsload/files/bbsload-0.2.8-as-needed.patch
@@ -0,0 +1,23 @@
+diff -NrU5 bbsload-0.2.8.orig/configure.in bbsload-0.2.8/configure.in
+--- bbsload-0.2.8.orig/configure.in	2008-12-18 00:44:23.000000000 +0100
++++ bbsload-0.2.8/configure.in	2008-12-18 00:46:33.000000000 +0100
+@@ -87,16 +87,16 @@
+ AC_PATH_X
+ AC_PATH_XTRA
+ 
+ CFLAGS="$CFLAGS $X_CFLAGS"
+ CXXFLAGS="$CXXFLAGS $X_CFLAGS"
+-LDFLAGS="$LDFLAGS $X_LIBS $X_PRE_LIBS"
++LIBS="$X_LIBS $X_PRE_LIBS"
+ dnl Checks for X libraries.
+-AC_CHECK_LIB(X11, XOpenDisplay, LDFLAGS="$LDFLAGS -lX11",
++AC_CHECK_LIB(X11, XOpenDisplay, LIBS="$LIBS -lX11",
+              AC_MSG_ERROR(XOpenDisplay not found in -lX11))
+ 
+-LDFLAGS="$LDFLAGS $X_EXTRA_LIBS"
++LIBS="$LIBS $X_EXTRA_LIBS"
+ 
+ dnl Checks for header files.
+ AC_HEADER_STDC
+ AC_CHECK_HEADERS(malloc.h)
+ 
diff --git a/x11-misc/bbsload/files/bbsload-0.2.8-gcc43.patch b/x11-misc/bbsload/files/bbsload-0.2.8-gcc43.patch
new file mode 100644
index 000000000000..e506ca26d808
--- /dev/null
+++ b/x11-misc/bbsload/files/bbsload-0.2.8-gcc43.patch
@@ -0,0 +1,14 @@
+diff -aur bbsload-0.2.8.old/resource.hh bbsload-0.2.8/resource.hh
+--- bbsload-0.2.8.old/resource.hh	2008-11-25 18:09:55.000000000 +0100
++++ bbsload-0.2.8/resource.hh	2008-11-25 18:12:49.000000000 +0100
+@@ -121,8 +121,8 @@
+ {
+ 
+ public:
+-    Resource::Resource(ToolWindow *);
+-    Resource::~Resource(void);
++    Resource(ToolWindow *);
++    ~Resource(void);
+ 
+     struct FRAME frame;
+     struct LABEL label;
diff --git a/x11-misc/bbsload/metadata.xml b/x11-misc/bbsload/metadata.xml
new file mode 100644
index 000000000000..5da1df511b3b
--- /dev/null
+++ b/x11-misc/bbsload/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
+	<longdescription>Load monitor for Blackbox.</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">bbtools</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-misc/bbtime/Manifest b/x11-misc/bbtime/Manifest
new file mode 100644
index 000000000000..b185758b679d
--- /dev/null
+++ b/x11-misc/bbtime/Manifest
@@ -0,0 +1 @@
+DIST bbtime-0.1.5.tar.gz 68842 SHA256 e5ee51b43e5f7014059ae9e66b00a13410a781ecfac84774dcb66d7f3371dd00
diff --git a/x11-misc/bbtime/bbtime-0.1.5.ebuild b/x11-misc/bbtime/bbtime-0.1.5.ebuild
new file mode 100644
index 000000000000..fcf4c9fc08f6
--- /dev/null
+++ b/x11-misc/bbtime/bbtime-0.1.5.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit autotools eutils
+
+DESCRIPTION="blackbox time watcher"
+HOMEPAGE="http://sourceforge.net/projects/bbtools/"
+SRC_URI="mirror://sourceforge/bbtools/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ppc x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND="x11-libs/libX11"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-asneeded.patch
+	eautoreconf
+}
+
+src_install () {
+	emake DESTDIR="${D}" install
+	dodoc README AUTHORS BUGS ChangeLog NEWS TODO data/README.bbtime
+
+	rm "${D}"/usr/share/bbtools/README.bbtime || die
+	# since multiple bbtools packages provide this file, install
+	# it in /usr/share/doc/${PF}
+	mv "${D}/usr/share/bbtools/bbtoolsrc.in" \
+		"${D}/usr/share/doc/${PF}/bbtoolsrc.example" || die
+}
diff --git a/x11-misc/bbtime/files/bbtime-0.1.5-asneeded.patch b/x11-misc/bbtime/files/bbtime-0.1.5-asneeded.patch
new file mode 100644
index 000000000000..17788812d8a2
--- /dev/null
+++ b/x11-misc/bbtime/files/bbtime-0.1.5-asneeded.patch
@@ -0,0 +1,39 @@
+Fixing build with as-needed
+
+https://bugs.gentoo.org/show_bug.cgi?id=248555
+
+--- configure.in
++++ configure.in
+@@ -47,14 +47,9 @@
+ AC_PATH_X
+ AC_PATH_XTRA
+ 
+-CFLAGS="$CFLAGS $X_CFLAGS"
+-CXXFLAGS="$CXXFLAGS $X_CFLAGS"
+-LDFLAGS="$LDFLAGS $X_LIBS $X_PRE_LIBS"
+ dnl Checks for X libraries.
+-AC_CHECK_LIB(X11, XOpenDisplay, LDFLAGS="$LDFLAGS -lX11",
+-             AC_MSG_ERROR(XOpenDisplay not found in -lX11))
+-
+-LDFLAGS="$LDFLAGS $X_EXTRA_LIBS"
++AC_CHECK_LIB([X11], [XOpenDisplay], ,
++             AC_MSG_ERROR(XOpenDisplay not found in -lX11),)
+ 
+ dnl Checks for header files.
+ AC_HEADER_STDC
+--- Makefile.am
++++ Makefile.am
+@@ -1,5 +1,4 @@
+-CPPFLAGS =	@CPPFLAGS@ \
+-		-DDEFAULT_CONF=\"$(datadir)/bbtools/bbtime.conf\" \
++AM_CPPFLAGS =	-DDEFAULT_CONF=\"$(datadir)/bbtools/bbtime.conf\" \
+ 		-DDEFAULT_NOBB=\"$(datadir)/bbtools/bbtime.nobb\"
+ 
+ 
+@@ -14,4 +13,5 @@
+ 		 timemenu.cc timemenu.hh \
+ 		 blackboxstyle.hh
+ EXTRA_DIST = BUGS TODO
+-bbtime_LDADD = @X_LIBS@
++bbtime_LDADD = @X_PRE_LIBS@ @X_LIBS@ @X_EXTRA_LIBS@
++bbtime_CFLAGS = @X_PRE_CFLAGS@ @X_CGLAGS@ @X_EXTRA_CFLAGS@
diff --git a/x11-misc/bbtime/metadata.xml b/x11-misc/bbtime/metadata.xml
new file mode 100644
index 000000000000..22b8da1dff67
--- /dev/null
+++ b/x11-misc/bbtime/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
+	<longdescription>A time monitor for Blackbox.</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">bbtools</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-misc/bbweather/Manifest b/x11-misc/bbweather/Manifest
new file mode 100644
index 000000000000..8bd2c146d787
--- /dev/null
+++ b/x11-misc/bbweather/Manifest
@@ -0,0 +1 @@
+DIST bbweather-0.6.3.tar.bz2 80631 SHA256 575e0f5dd1af770490bf0f3ef9c26de5245deb91f79caa3d5db3cd9dc23b8e1e SHA512 e5bd4febf119c0f81a64fb5ff4cf3b526a84e8fd26005ff04c6297f9b50963d2d710227469f9a1cf2d1c51f3524a2bce544a07c70ca4e5beff64c954768468a6 WHIRLPOOL 7b0c2f4561f54bdf1daab217ca4ca3d26e44a377013f327668a5edeb964f189ea19f1eb413ca48f35c52e69275ed945e8843c1dfedf59b28b5dc3cacd35c5724
diff --git a/x11-misc/bbweather/bbweather-0.6.3-r1.ebuild b/x11-misc/bbweather/bbweather-0.6.3-r1.ebuild
new file mode 100644
index 000000000000..c1586ad261a1
--- /dev/null
+++ b/x11-misc/bbweather/bbweather-0.6.3-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+
+inherit autotools eutils
+
+DESCRIPTION="blackbox weather monitor"
+HOMEPAGE="http://www.netmeister.org/apps/bbweather/"
+SRC_URI="http://www.netmeister.org/apps/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 hppa ppc x86"
+IUSE=""
+
+DEPEND="dev-lang/perl
+	x11-libs/libX11"
+RDEPEND="${DEPEND}
+	net-misc/wget
+	x11-apps/xmessage
+	!<=x11-plugins/gkrellweather-2.0.7-r1"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-asneeded.patch
+	gunzip doc/*.gz || die
+	sed -i \
+		-e "s:man_DATA:man1_MANS:;s:.gz::g;/^mandir/d" \
+		doc/Makefile.am || die
+	sed -i \
+		-e 's|-helvetica-|-*-|g' \
+		resource.cpp data/${PN}.{nobb,style} || die
+	eautoreconf
+}
+
+src_install () {
+	emake DESTDIR="${D}" docdir="/usr/share/doc/${PF}" install || die
+	dodoc README AUTHORS ChangeLog NEWS TODO data/README.bbweather || die
+
+	# since multiple bbtools packages provide this file, install
+	# it in /usr/share/doc/${PF}
+	mv "${D}"/usr/share/bbtools/bbtoolsrc.in \
+		"${D}"/usr/share/doc/${PF}/bbtoolsrc.example
+}
diff --git a/x11-misc/bbweather/files/bbweather-asneeded.patch b/x11-misc/bbweather/files/bbweather-asneeded.patch
new file mode 100644
index 000000000000..593e471641c8
--- /dev/null
+++ b/x11-misc/bbweather/files/bbweather-asneeded.patch
@@ -0,0 +1,40 @@
+Fixing build with as-needed
+
+https://bugs.gentoo.org/248556
+
+--- configure.in
++++ configure.in
+@@ -56,15 +56,10 @@
+ AC_PATH_X
+ AC_PATH_XTRA
+ 
+-CFLAGS="$CFLAGS $X_CFLAGS"
+-CXXFLAGS="$CXXFLAGS $X_CFLAGS"
+-LDFLAGS="$LDFLAGS $X_LIBS $X_PRE_LIBS"
+ DATADIR=$datadir
+ dnl Checks for X libraries.
+-AC_CHECK_LIB(X11, XOpenDisplay, LDFLAGS="$LDFLAGS -lX11",
+-             AC_MSG_ERROR(XOpenDisplay not found in -lX11))
+-
+-LDFLAGS="$LDFLAGS $X_EXTRA_LIBS"
++AC_CHECK_LIB([X11], [XOpenDisplay], ,
++             AC_MSG_ERROR(XOpenDisplay not found in -lX11), )
+ 
+ dnl Checks for header files.
+ AC_HEADER_STDC
+--- Makefile.am
++++ Makefile.am
+@@ -1,5 +1,4 @@
+-CPPFLAGS =	@CPPFLAGS@ \
+-		-DDEFAULT_CONF=\"$(datadir)/bbtools/bbweather.conf\" \
++AM_CPPFLAGS =	-DDEFAULT_CONF=\"$(datadir)/bbtools/bbweather.conf\" \
+ 		-DDEFAULT_NOBB=\"$(datadir)/bbtools/bbweather.nobb\"
+ 
+ 
+@@ -13,4 +12,5 @@
+ 		 Basewindow.cpp Basewindow.h \
+ 		 blackboxstyle.h
+ EXTRA_DIST = BUGS TODO
+-bbweather_LDADD = @X_LIBS@
++bbweather_LDADD = @X_PRE_LIBS@ @X_LIBS@ @X_EXTRA_LIBS@
++bbweather_CFLAGS = @X_PRE_CFLAGS@ @X_CFLAGS@ @X_EXTRA_CFLAGS@
diff --git a/x11-misc/bbweather/metadata.xml b/x11-misc/bbweather/metadata.xml
new file mode 100644
index 000000000000..2391229f31bf
--- /dev/null
+++ b/x11-misc/bbweather/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
+	<longdescription>
+	Weather monitor for Blackbox.
+	</longdescription>
+</pkgmetadata>
diff --git a/x11-misc/blockdpy/Manifest b/x11-misc/blockdpy/Manifest
new file mode 100644
index 000000000000..f98f0e7fd351
--- /dev/null
+++ b/x11-misc/blockdpy/Manifest
@@ -0,0 +1 @@
+DIST blockdpy.c 10580 SHA256 32fc5c822db84d99dced36369695c64664d8075d1a7cf6cd2305f8f79cc8a004
diff --git a/x11-misc/blockdpy/blockdpy-1.ebuild b/x11-misc/blockdpy/blockdpy-1.ebuild
new file mode 100644
index 000000000000..252c06355c14
--- /dev/null
+++ b/x11-misc/blockdpy/blockdpy-1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit toolchain-funcs
+
+DESCRIPTION="Tool to block access via the physical display while x11vnc is running"
+HOMEPAGE="http://www.karlrunge.com/x11vnc/blockdpy.c"
+SRC_URI="http://www.karlrunge.com/x11vnc/blockdpy.c"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="x11-libs/libX11
+	x11-libs/libXext"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}
+
+src_unpack() {
+	cp "${DISTDIR}"/blockdpy.c blockdpy.c
+
+	# Add includes to avoid QA warnings.
+	sed -i '/#include <stdio.h>/i#include <stdlib.h>' blockdpy.c
+	sed -i '/#include <stdio.h>/i#include <string.h>' blockdpy.c
+}
+
+src_compile() {
+	$(tc-getCC) ${CFLAGS} ${LDFLAGS} -o blockdpy blockdpy.c -lX11 -lXext ||
+		die "compile failed"
+
+	# Create README from head comment in source.
+	sed -n '1,/^ *\*\//s/^[ -]*\*[ \/]*//p' < blockdpy.c > README
+}
+
+src_install() {
+	dobin blockdpy || die "install failed"
+	dodoc README
+}
+
+pkg_postinst() {
+	# Just warn about missing xlock instead of requiring it in case
+	# the user wants to use something else.
+	if ! [ -x /usr/bin/xlock ]; then
+		ewarn 'The xlock executable was not found.'
+		ewarn 'blockdpy runs "xlock" as the screen-lock program by default.'
+		ewarn 'You should either install x11-misc/xlockmore or override the'
+		ewarn 'default by calling blockdpy with the -lock option or by'
+		ewarn 'setting the XLOCK_CMD environment variable.'
+		ewarn
+		ewarn "  Examples:  blockdpy -lock 'xscreensaver-command -lock'"
+		ewarn "             blockdpy -lock 'kdesktop_lock --forcelock'"
+		ewarn
+	fi
+}
diff --git a/x11-misc/blockdpy/metadata.xml b/x11-misc/blockdpy/metadata.xml
new file mode 100644
index 000000000000..a40624fba8f0
--- /dev/null
+++ b/x11-misc/blockdpy/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+	<email>maintainer-needed@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-misc/bmpanel/Manifest b/x11-misc/bmpanel/Manifest
new file mode 100644
index 000000000000..ced7a35a98d9
--- /dev/null
+++ b/x11-misc/bmpanel/Manifest
@@ -0,0 +1 @@
+DIST bmpanel-0.9.27.tar.gz 30638 SHA256 a6976d024800b878117161174cc6ca57b21b2462666e75111cdd32eea8464557 SHA512 fc36db740ead9700156b24d1fea8fda6ac99b77db54f1a8d832a1d22075dc0f1034ad948e7b1506cec79db06a185494c2b7937dd76e220153aad0c6862ccc70d WHIRLPOOL 3e956b49854eb622cce8b4ca782e8e5427422694d9817c47b8b5763e2a1261e28b3fe24d1957ab6ea647a3d4436e910dc609c58de6335b04b0d917c6e1819804
diff --git a/x11-misc/bmpanel/bmpanel-0.9.27-r1.ebuild b/x11-misc/bmpanel/bmpanel-0.9.27-r1.ebuild
new file mode 100644
index 000000000000..cce6a31cb75a
--- /dev/null
+++ b/x11-misc/bmpanel/bmpanel-0.9.27-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+
+inherit base eutils
+
+DESCRIPTION="a lightweight, NETWM compliant panel for X11 Window System"
+HOMEPAGE="http://nsf.110mb.com/bmpanel"
+SRC_URI="http://nsf.110mb.com/${PN}/${P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ~x86"
+IUSE="debug libev libevent"
+
+RDEPEND=">=media-libs/imlib2-1.4.0[X]
+	media-libs/freetype:2
+	x11-libs/libX11
+	x11-libs/libXrender
+	x11-libs/libXcomposite
+	x11-libs/libXfixes
+	media-libs/fontconfig
+	libev? ( dev-libs/libev )
+	libevent? ( dev-libs/libevent )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/Makefile.patch"
+)
+
+DOCS=( AUTHORS README )
+
+src_configure() {
+	# the provided configure script is broken.
+	# it doesn't provide --disable-foo, --host etc. so we can't use econf here.
+	local myconf="--prefix=/usr --ugly"
+
+	use debug && myconf="${myconf} --debug"
+	use libev && myconf="${myconf} --with-ev"
+	use libevent && myconf="${myconf} --with-event"
+
+	einfo "./configure ${myconf}"
+	./configure ${myconf} || die "configure failed"
+}
diff --git a/x11-misc/bmpanel/files/Makefile.patch b/x11-misc/bmpanel/files/Makefile.patch
new file mode 100644
index 000000000000..d9cdc8308837
--- /dev/null
+++ b/x11-misc/bmpanel/files/Makefile.patch
@@ -0,0 +1,14 @@
+--- src/Makefile.old	2009-02-15 16:12:16.750885874 +0100
++++ src/Makefile	2009-02-15 16:16:24.560106442 +0100
+@@ -12,10 +12,7 @@ ifneq ($(UGLY),1)
+ endif
+ 
+ $(APP): $(OBJS)
+-	$(V_L)$(LD) $(LIBS) -o $@ $(OBJS)
+-ifeq ($(DEBUG),0)
+-	$(V_S)strip -s $(APP)
+-endif
++	$(V_L)$(LD) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
+ 
+ $(BUILDDIR)/src/%.o: src/%.c .mk/config.mk
+ 	$(V_C)$(CC) -c -MMD $(CFLAGS) $< -o $@
diff --git a/x11-misc/bmpanel/metadata.xml b/x11-misc/bmpanel/metadata.xml
new file mode 100644
index 000000000000..87d6ecef4754
--- /dev/null
+++ b/x11-misc/bmpanel/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
+	<use>
+		<flag name='libev'>Use the libev event loop interface</flag>
+		<flag name='libevent'>Use the libevent event loop interface</flag>
+	</use>
+</pkgmetadata>
diff --git a/x11-misc/bumblebee/Manifest b/x11-misc/bumblebee/Manifest
new file mode 100644
index 000000000000..eefc4b2817f5
--- /dev/null
+++ b/x11-misc/bumblebee/Manifest
@@ -0,0 +1 @@
+DIST bumblebee-3.2.1.tar.gz 143110 SHA256 1018703b07e2f607a4641249d69478ce076ae5a1e9dd6cff5694d394fa7ee30e SHA512 6f016f75d199577215ff00c059e196829e9d3efeb0fb6eebe6c3fad6176e330332e1ef25875a22ac9892895683d95899ea44f1ec1f85d31300ad83cb1fe0310a WHIRLPOOL 0d59b205f3c57afbf3fa6c8a55964afed8684e57db045e4c333c8e94f0b5d91637963a0b9f386eb6fe655716b8854e82ae5724dacdc76a34de6eb1f99ffc4908
diff --git a/x11-misc/bumblebee/bumblebee-3.2.1.ebuild b/x11-misc/bumblebee/bumblebee-3.2.1.ebuild
new file mode 100644
index 000000000000..60d7b3413d42
--- /dev/null
+++ b/x11-misc/bumblebee/bumblebee-3.2.1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils multilib readme.gentoo systemd user
+
+DESCRIPTION="Service providing elegant and stable means of managing Optimus graphics chipsets"
+HOMEPAGE="http://bumblebee-project.org https://github.com/Bumblebee-Project/Bumblebee"
+SRC_URI="http://bumblebee-project.org/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-3"
+KEYWORDS="amd64 x86"
+
+IUSE="+bbswitch video_cards_nouveau video_cards_nvidia"
+
+RDEPEND="
+	dev-libs/libbsd
+	virtual/opengl
+	x11-base/xorg-drivers[video_cards_nvidia?,video_cards_nouveau?]
+	x11-misc/virtualgl:=
+	bbswitch? ( sys-power/bbswitch )
+"
+DEPEND="${RDEPEND}
+	dev-libs/glib:2
+	sys-apps/help2man
+	virtual/pkgconfig
+	x11-libs/libX11
+"
+
+REQUIRED_USE="|| ( video_cards_nouveau video_cards_nvidia )"
+
+src_configure() {
+	DOC_CONTENTS="In order to use Bumblebee, add your user to 'bumblebee' group.
+		You may need to setup your /etc/bumblebee/bumblebee.conf"
+
+	if use video_cards_nvidia ; then
+		# Get paths to GL libs for all ABIs
+		local nvlib=""
+		for i in  $(get_all_libdirs) ; do
+			nvlib="${nvlib}:/usr/${i}/opengl/nvidia/lib"
+		done
+
+		local nvpref="/usr/$(get_libdir)/opengl/nvidia"
+		local xorgpref="/usr/$(get_libdir)/xorg/modules"
+		ECONF_PARAMS="CONF_DRIVER=nvidia CONF_DRIVER_MODULE_NVIDIA=nvidia \
+			CONF_LDPATH_NVIDIA=${nvlib#:} \
+			CONF_MODPATH_NVIDIA=${nvpref}/lib,${nvpref}/extensions,${xorgpref}/drivers,${xorgpref}"
+	fi
+
+	econf \
+		--docdir=/usr/share/doc/"${PF}" \
+		${ECONF_PARAMS}
+}
+
+src_install() {
+	newconfd "${FILESDIR}"/bumblebee.confd bumblebee
+	newinitd "${FILESDIR}"/bumblebee.initd bumblebee
+	newenvd  "${FILESDIR}"/bumblebee.envd 99bumblebee
+	systemd_dounit scripts/systemd/bumblebeed.service
+
+	readme.gentoo_create_doc
+
+	default
+}
+
+pkg_preinst() {
+	use video_cards_nvidia || rm "${ED}"/etc/bumblebee/xorg.conf.nvidia
+	use video_cards_nouveau || rm "${ED}"/etc/bumblebee/xorg.conf.nouveau
+
+	enewgroup bumblebee
+}
diff --git a/x11-misc/bumblebee/files/bumblebee.confd b/x11-misc/bumblebee/files/bumblebee.confd
new file mode 100644
index 000000000000..1c70206da6bf
--- /dev/null
+++ b/x11-misc/bumblebee/files/bumblebee.confd
@@ -0,0 +1,3 @@
+# /etc/conf.d/bumblebee
+
+BUMBLEBEE_EXTRA_OPTS="--use-syslog"
+\ No newline at end of file
diff --git a/x11-misc/bumblebee/files/bumblebee.envd b/x11-misc/bumblebee/files/bumblebee.envd
new file mode 100644
index 000000000000..e19cc56a1303
--- /dev/null
+++ b/x11-misc/bumblebee/files/bumblebee.envd
@@ -0,0 +1,3 @@
+# Comment this out if you are using VirtualGL also for other purposes and this
+# slows down things for you.
+VGL_READBACK="pbo"
diff --git a/x11-misc/bumblebee/files/bumblebee.initd b/x11-misc/bumblebee/files/bumblebee.initd
new file mode 100644
index 000000000000..fb618305cb32
--- /dev/null
+++ b/x11-misc/bumblebee/files/bumblebee.initd
@@ -0,0 +1,23 @@
+#!/sbin/runscript
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+depend() {
+	need xdm vgl
+}
+
+PIDFILE="${PIDFILE:-/var/run/bumblebee.pid}"
+
+start() {
+	ebegin "Starting BumbleBee Daemon"
+		start-stop-daemon -S -p "${PIDFILE}" -x /usr/sbin/bumblebeed -- -D ${BUMBLEBEE_EXTRA_OPTS} --pidfile "${PIDFILE}"
+	eend $?
+}
+
+stop() {
+
+	ebegin "Stopping BumbleBee Daemon"
+		start-stop-daemon -K -p "${PIDFILE}" -R SIGTERM/10
+	eend $?
+}
diff --git a/x11-misc/bumblebee/metadata.xml b/x11-misc/bumblebee/metadata.xml
new file mode 100644
index 000000000000..15a5547eef62
--- /dev/null
+++ b/x11-misc/bumblebee/metadata.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>proxy-maintainers</herd>
+	<maintainer>
+		<email>pacho@gentoo.org</email>
+		<name>Pacho Ramos</name>
+	</maintainer>
+	<maintainer>
+		<email>rei4dan@gmail.com</email>
+		<name>My Th</name>
+	</maintainer>
+	<longdescription>
+	A rewrite of the original Bumblebee service, providing an elegant and stable
+	means of managing Optimus hybrid graphics chipsets. A primary goal of this
+	project is to not only enable use of the discrete GPU for rendering, but
+	also to enable smart power management of the dGPU when it's not in use.
+</longdescription>
+	<use>
+		<flag name="bbswitch">Add dependency on <pkg>sys-kernel/bbswitch</pkg> for
+			PM feature</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">Bumblebee-Project/Bumblebee</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-misc/cairo-clock/Manifest b/x11-misc/cairo-clock/Manifest
new file mode 100644
index 000000000000..6990ff87cfac
--- /dev/null
+++ b/x11-misc/cairo-clock/Manifest
@@ -0,0 +1,2 @@
+DIST cairo-clock-0.3.4.tar.gz 832968 SHA256 f310de5bc03473a190d691679a831cd305351744ccf6eb7701f43dda6cd98a8d
+DIST cairo-clock_0.3.3-1.tar.gz 1248398 SHA256 812ca12792940138ce4d154d1d0d7d1e37295cf06ac7caf02935d5ebf845dc4c
diff --git a/x11-misc/cairo-clock/cairo-clock-0.3.3.ebuild b/x11-misc/cairo-clock/cairo-clock-0.3.3.ebuild
new file mode 100644
index 000000000000..c6f809451e99
--- /dev/null
+++ b/x11-misc/cairo-clock/cairo-clock-0.3.3.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+
+inherit autotools base
+
+DESCRIPTION="An analog clock displaying the system-time"
+HOMEPAGE="http://macslow.thepimp.net/?page_id=23"
+SRC_URI="http://macslow.thepimp.net/projects/${PN}/${PN}_${PV}-1.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~x86 ~x86-fbsd"
+IUSE=""
+PATCHES=( "${FILESDIR}/${P}-gcc46.patch" )
+
+RDEPEND="dev-libs/glib:2
+	gnome-base/libglade
+	gnome-base/librsvg
+	>=x11-libs/cairo-1.2
+	x11-libs/gtk+:2
+	>=x11-libs/pango-1.10"
+DEPEND="${DEPEND}
+	virtual/pkgconfig
+	dev-util/intltool
+	sys-devel/gettext"
+
+src_prepare() {
+	base_src_prepare
+	intltoolize --force --copy --automake || die "intltoolize failed"
+	eautoreconf
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc AUTHORS BUGS ChangeLog NEWS README TODO
+}
diff --git a/x11-misc/cairo-clock/cairo-clock-0.3.4.ebuild b/x11-misc/cairo-clock/cairo-clock-0.3.4.ebuild
new file mode 100644
index 000000000000..025ee8c4ae95
--- /dev/null
+++ b/x11-misc/cairo-clock/cairo-clock-0.3.4.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+DESCRIPTION="An analog clock displaying the system-time"
+HOMEPAGE="http://macslow.net/?page_id=23"
+SRC_URI="http://macslow.thepimp.net/projects/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=dev-libs/glib-2.8
+	>=gnome-base/libglade-2.6
+	>=gnome-base/librsvg-2.14
+	>=x11-libs/cairo-1.2
+	>=x11-libs/gtk+-2.10:2
+	>=x11-libs/pango-1.10"
+DEPEND="${DEPEND}
+	dev-util/intltool
+	virtual/pkgconfig
+	sys-devel/gettext"
+
+DOCS=( AUTHORS NEWS README TODO )
+
+src_prepare() {
+	# cc: error: unrecognized option '--export-dynamic'
+	sed -i -e '/cairo_clock_LDFLAGS/s:=.*:= -rdynamic:' src/Makefile.in || die
+}
diff --git a/x11-misc/cairo-clock/files/cairo-clock-0.3.3-gcc46.patch b/x11-misc/cairo-clock/files/cairo-clock-0.3.3-gcc46.patch
new file mode 100644
index 000000000000..76569cc84260
--- /dev/null
+++ b/x11-misc/cairo-clock/files/cairo-clock-0.3.3-gcc46.patch
@@ -0,0 +1,12 @@
+diff -uNr cairo-clock-0.3.3.ORIG/src/Makefile.am cairo-clock-0.3.3/src/Makefile.am
+--- cairo-clock-0.3.3.ORIG/src/Makefile.am	2011-09-24 12:42:48.862380207 +0100
++++ cairo-clock-0.3.3/src/Makefile.am	2011-09-24 12:43:29.135381441 +0100
+@@ -1,7 +1,7 @@
+ bin_PROGRAMS = cairo_clock
+ transform = s/_/-/g
+ 
+-cairo_clock_LDFLAGS = -Wl, --export-dynamic
++cairo_clock_LDFLAGS = -rdynamic
+ 
+ cairo_clock_LDADD =	\
+ 	$(GLIB_LIBS)	\
diff --git a/x11-misc/cairo-clock/metadata.xml b/x11-misc/cairo-clock/metadata.xml
new file mode 100644
index 000000000000..731225048652
--- /dev/null
+++ b/x11-misc/cairo-clock/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>desktop-misc</herd>
+</pkgmetadata>
diff --git a/x11-misc/calise/Manifest b/x11-misc/calise/Manifest
new file mode 100644
index 000000000000..6b5807c8427b
--- /dev/null
+++ b/x11-misc/calise/Manifest
@@ -0,0 +1 @@
+DIST calise-0.4.2.tar.gz 102792 SHA256 fdc380fea57a10a22e3fc3a61f57ee988b56e144db29ac1ce79e76d4e2971551 SHA512 b08722083447780dbfe6a3614cf0891eed791819adc6c434b878c55cbad6fa122d3c2042274fe9acbc0c68a2acb3ca7835422ec6d2d1f867d6fd9ec806a4f750 WHIRLPOOL 6399b583c024ec8c0a507de941d5d3ce4dff895f261bf127f7bc8583e2a15af1d8db965b04458beb11c5c829dad917973c49a8f4f3fc2da2497fcd9a88879398
diff --git a/x11-misc/calise/calise-0.4.2.ebuild b/x11-misc/calise/calise-0.4.2.ebuild
new file mode 100644
index 000000000000..9553d4f3b515
--- /dev/null
+++ b/x11-misc/calise/calise-0.4.2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+inherit distutils-r1 linux-info systemd
+
+DESCRIPTION="Computes ambient brightness and sets screen's correct backlight using a webcam"
+HOMEPAGE="http://calise.sourceforge.net/"
+SRC_URI="http://sourceforge.net/projects/${PN}/files/${PN}-beta/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+CDEPEND="${RDEPEND}
+	dev-python/pyxdg[${PYTHON_USEDEP}]
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-python/pygobject[${PYTHON_USEDEP}]
+	sci-astronomy/pyephem[${PYTHON_USEDEP}]
+	x11-themes/hicolor-icon-theme"
+DEPEND="${CDEPEND}
+	dev-python/python-distutils-extra[${PYTHON_USEDEP}]
+	dev-util/intltool
+	sys-kernel/linux-headers
+	x11-libs/libX11"
+RDEPEND="${CDEPEND}"
+
+CONFIG_CHECK="~BACKLIGHT_CLASS_DEVICE"
+
+S="${WORKDIR}/${PN}"
+
+src_prepare() {
+	# Add missing trailing ; to desktop file.
+	sed -i 's/^\(Categories=Utility\)$/\1;/' \
+		share/applications/calise.desktop.in || die
+
+	# Fix up bashisms.
+	sed -i 's:&>/dev/null:2>\&1 >/dev/null:' \
+		other/init_scripts/init.d/${PN}d || die
+}
+
+src_install() {
+	doconfd other/init_scripts/conf.d/${PN}d
+	doinitd other/init_scripts/init.d/${PN}d
+	systemd_dounit other/systemd_scripts/${PN}d.service
+
+	install -D -m755 other/pm-utils_scripts/53${PN}d "${D}"/usr/lib/pm-utils/sleep.d/53${PN}d
+
+	distutils-r1_src_install
+}
+
+pkg_postinst() {
+	einfo "Optional runtime dependency: dev-python/PyQt4 for GUI"
+}
diff --git a/x11-misc/calise/metadata.xml b/x11-misc/calise/metadata.xml
new file mode 100644
index 000000000000..b6a99d12873d
--- /dev/null
+++ b/x11-misc/calise/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>proxy-maintainers</herd>
+	<maintainer>
+		<email>alex_y_xu@yahoo.ca</email>
+		<name>Alex Xu</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/x11-misc/cbatticon/Manifest b/x11-misc/cbatticon/Manifest
new file mode 100644
index 000000000000..5ee155d7c475
--- /dev/null
+++ b/x11-misc/cbatticon/Manifest
@@ -0,0 +1,3 @@
+DIST cbatticon-1.3.2.tar.gz 12749 SHA256 40f5b80e9a405ce79ecca74bcd72778372729b2add63a9c4e3386908cfb8ad4c SHA512 492b0e9e16b7a14a8bf184d213af7c7366a2cd8bfe9fe91e935e95a72e8f5213029d8b32512961f142da9db3832dd5fa98f291223b0d473a133132614ed926aa WHIRLPOOL 78cc260cc9060931cea9b9fa87e0be81b33f74641cd09a4592911612ae78e3c0ee80c4e2f045c186f030f389946264e1468451068c4fe319d9247d30f227d9b5
+DIST cbatticon-1.4.1.tar.gz 14334 SHA256 ba6ef1b588530d31af41173a188d7333d68c83ea6e579e6f93e8acde854c3a26 SHA512 5b133705b7cbc6b778f677117ae3f936511a8d35eafa00de1a2fdb7901ef8b98c76b0fc5e50fb21e3592c264ce4490a35806363d4446eca6384b48572a848577 WHIRLPOOL c91116fd1962e07227dd784e3c259cdfda8c46275f19994df488130bd3b4595808b79e8440c3710d96156b960bf14dd1fc876a390d762adb9e4289a4289a9705
+DIST cbatticon-1.4.2.tar.gz 14449 SHA256 987d979c426c12d7ef6ce7856a7c0d0d0a70720cafcada9ba6a4800d048ef502 SHA512 53d0ff654758a7c40f32a86a4364ff2b57f23bec9a10d3c9964eb7afb59bfd2d8ee21c5ece9d6bb4b99c54dbfb1f6b8ab7e36e93c246d0fef4e300416b1159fe WHIRLPOOL 4db6b81e668504001b39a53ca19920c57f6d868b236805b5c3a46a769b197053507681a6ebad4d70641a90919852144176cece64e99905eb9bb9f74dc430323d
diff --git a/x11-misc/cbatticon/cbatticon-1.3.2.ebuild b/x11-misc/cbatticon/cbatticon-1.3.2.ebuild
new file mode 100644
index 000000000000..c8c2adcd94b1
--- /dev/null
+++ b/x11-misc/cbatticon/cbatticon-1.3.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit toolchain-funcs
+
+DESCRIPTION="A GTK+ battery icon which uses libudev to be lightweight and fast"
+HOMEPAGE="https://github.com/ColinJones/cbatticon"
+SRC_URI="https://github.com/ColinJones/cbatticon/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="x11-libs/gtk+:2
+	x11-libs/libnotify"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_compile() {
+	tc-export CC
+	emake V=1 VERSION="${PF}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" V=1 VERSION="${PF}" install
+}
diff --git a/x11-misc/cbatticon/cbatticon-1.4.1.ebuild b/x11-misc/cbatticon/cbatticon-1.4.1.ebuild
new file mode 100644
index 000000000000..01840f093d8e
--- /dev/null
+++ b/x11-misc/cbatticon/cbatticon-1.4.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit toolchain-funcs
+
+DESCRIPTION="A lightweight and fast battery icon that sits in your system tray"
+HOMEPAGE="https://github.com/ColinJones/cbatticon"
+SRC_URI="https://github.com/ColinJones/cbatticon/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libnotify"
+
+RDEPEND="
+	dev-libs/glib:2
+	x11-libs/gtk+:3
+	libnotify? ( x11-libs/libnotify )
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+
+src_compile() {
+	tc-export CC
+	emake \
+		$(usex libnotify WITH_NOTIFY=1 WITH_NOTIFY=0) \
+		V=1 \
+		VERSION="${PF}" \
+		WITH_GTK3=1
+}
+
+src_install() {
+	emake DESTDIR="${D}" V=1 VERSION="${PF}" install
+}
diff --git a/x11-misc/cbatticon/cbatticon-1.4.2.ebuild b/x11-misc/cbatticon/cbatticon-1.4.2.ebuild
new file mode 100644
index 000000000000..01840f093d8e
--- /dev/null
+++ b/x11-misc/cbatticon/cbatticon-1.4.2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit toolchain-funcs
+
+DESCRIPTION="A lightweight and fast battery icon that sits in your system tray"
+HOMEPAGE="https://github.com/ColinJones/cbatticon"
+SRC_URI="https://github.com/ColinJones/cbatticon/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libnotify"
+
+RDEPEND="
+	dev-libs/glib:2
+	x11-libs/gtk+:3
+	libnotify? ( x11-libs/libnotify )
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+
+src_compile() {
+	tc-export CC
+	emake \
+		$(usex libnotify WITH_NOTIFY=1 WITH_NOTIFY=0) \
+		V=1 \
+		VERSION="${PF}" \
+		WITH_GTK3=1
+}
+
+src_install() {
+	emake DESTDIR="${D}" V=1 VERSION="${PF}" install
+}
diff --git a/x11-misc/cbatticon/metadata.xml b/x11-misc/cbatticon/metadata.xml
new file mode 100644
index 000000000000..419ec4f290b0
--- /dev/null
+++ b/x11-misc/cbatticon/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>desktop-misc</herd>
+	<upstream>
+		<remote-id type="github">ColinJones/cbatticon</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-misc/cdm/Manifest b/x11-misc/cdm/Manifest
new file mode 100644
index 000000000000..53066f7e3a42
--- /dev/null
+++ b/x11-misc/cdm/Manifest
@@ -0,0 +1,2 @@
+DIST cdm-0.5.3.tar.gz 13751 SHA256 fb9ada13d3416305828c99943698fe7df3b0ab91bd6099e7b2707e1d8dd99a23 SHA512 bdb2746c41272d47defd6fcae3ab18bc71de6aaca521d8deee82d776fe1c06ea0eb679297dc731e9ecf878bee400aabccdb3d6d044f2ffcdc5e838488b0d6799 WHIRLPOOL 90265c475acc5a41e796cef9afb2087437885ca4b52f02e908d08f4e6f78201f1d09afeb0ebf906a6b3dcf3c7be69f9d5372d3035f85ed7d090137ce70bb8dc3
+DIST cdm-0.6.1_pre20130419.tar.gz 16056 SHA256 3fabec053271c39bbca44074fd05eda0ccf8c1e320664bb6d8f23fa79aca2bca SHA512 638d92c536609b8bf1d08f4be80933e5ff23acfe412ee6b72ff924edbe1e510110b7941caea9b206136ee5a75dddd998275e89c132feba0ed3df26ab1657bf8b WHIRLPOOL 5606bc125080c74b5b49aebc26283817e03ef84bff5e671fa7df9f3f8041c3975db34a2a00ad37578419319244dc66935908df9bdd8b19f6d4b9351e5ff11f50
diff --git a/x11-misc/cdm/cdm-0.5.3.ebuild b/x11-misc/cdm/cdm-0.5.3.ebuild
new file mode 100644
index 000000000000..4d5474af85eb
--- /dev/null
+++ b/x11-misc/cdm/cdm-0.5.3.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit base pam eutils
+
+DESCRIPTION="The Console Display Manager"
+HOMEPAGE="https://wiki.archlinux.org/index.php/CDM"
+SRC_URI="http://dev.gentoo.org/~gienah/snapshots/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="pam consolekit"
+REQUIRED_USE="consolekit? ( pam )"
+
+DEPEND="app-shells/bash"
+
+RDEPEND="${DEPEND}
+	dev-util/dialog
+	x11-apps/xdpyinfo
+	x11-apps/xinit
+	consolekit? ( sys-auth/consolekit
+		sys-apps/dbus )
+	pam? ( virtual/pam )"
+
+PATCHES=("${FILESDIR}/${PN}-0.5.3-invalid-MIT-cookie.patch")
+
+src_prepare() {
+	base_src_prepare
+	if ! use consolekit; then
+		sed -e 's@consolekit=yes@consolekit=no@' \
+			-i "${S}/src/cdmrc" || die "Could not turn off consolekit in cdmrc"
+	fi
+}
+
+src_install() {
+	if use pam ; then
+		pamd_mimic system-local-login cdm auth account session
+	fi
+
+	insinto /usr/bin/
+	insopts -m0755
+	dobin src/${PN}
+
+	insinto /etc
+	insopts -Dm644
+	doins src/cdmrc
+
+	insinto /usr/share/${PN}
+	insopts -m644
+	doins src/xinitrc*
+
+	insinto /etc/profile.d/
+	insopts -Dm755
+	doins src/zzz-${PN}-profile.sh
+
+	# Install themes
+	insinto /usr/share/${PN}/themes
+	doins src/themes/*
+	# Copy documentation manually
+	dodoc CHANGELOG
+}
+
+pkg_postinst() {
+	einfo "In order to use CDM you must first edit your /etc/cdmrc"
+	einfo "At least these should be edited before you start using CDM:"
+	einfo "wmbinlist=(awesome openbox-session startkde startxfce4 gnome-session)"
+	einfo "wmdisplist=(Awesome Openbox KDE Xfce Gnome)"
+	einfo "Add whatever WM/DE you have."
+	einfo "Then just login with your username"
+	ewarn "Remove xdm from default runlevel"
+}
diff --git a/x11-misc/cdm/cdm-0.6.1_pre20130419.ebuild b/x11-misc/cdm/cdm-0.6.1_pre20130419.ebuild
new file mode 100644
index 000000000000..5d0dcb7860e0
--- /dev/null
+++ b/x11-misc/cdm/cdm-0.6.1_pre20130419.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit pam eutils
+
+DESCRIPTION="The Console Display Manager"
+HOMEPAGE="https://wiki.archlinux.org/index.php/CDM"
+SRC_URI="http://dev.gentoo.org/~gienah/snapshots/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="pam consolekit"
+REQUIRED_USE="consolekit? ( pam )"
+
+DEPEND="app-shells/bash"
+
+RDEPEND="${DEPEND}
+	dev-util/dialog
+	x11-apps/xdpyinfo
+	x11-apps/xinit
+	consolekit? ( sys-auth/consolekit
+		sys-apps/dbus )
+	pam? ( virtual/pam )"
+
+src_prepare() {
+	if ! use consolekit; then
+		sed -e 's@consolekit=yes@consolekit=no@' \
+			-i "${S}/src/cdmrc" || die "Could not turn off consolekit in cdmrc"
+	fi
+}
+
+src_install() {
+	if use pam ; then
+		pamd_mimic system-local-login cdm auth account session
+	fi
+
+	insinto /usr/bin/
+	insopts -m0755
+	dobin src/${PN} src/${PN}-xlaunch
+
+	insinto /etc
+	insopts -Dm644
+	doins src/cdmrc
+
+	insinto /etc/profile.d/
+	insopts -Dm755
+	newins src/profile.sh zzz-${PN}.sh
+
+	# Install themes
+	insinto /usr/share/${PN}/themes
+	doins themes/*
+	# Copy documentation manually
+	dodoc ChangeLog-0.6 ChangeLog-before-0.6 README.md
+}
+
+pkg_postinst() {
+	ewarn "In order to use CDM you must first edit your /etc/cdmrc"
+	ewarn "At least the binlist, namelist and flaglist entries should be added or edited"
+	ewarn "to specify the X window managers and console shells that you want before"
+	ewarn "you start CDM.  Something like:"
+	ewarn "binlist=('xmonad' 'startkde' '/bin/zsh --login' '/bin/bash --login')"
+	ewarn "namelist=('XMonad' 'KDE' 'Console Zsh' 'Console Bash')"
+	ewarn "flaglist=(X X C C)"
+	ewarn "Ensure the flaglist X entries correspond to the X-Windows programs, and the"
+	ewarn "C entries correspond to console shells.  Then just login with your username."
+	ewarn "Remove xdm from default runlevel."
+}
diff --git a/x11-misc/cdm/files/cdm-0.5.3-invalid-MIT-cookie.patch b/x11-misc/cdm/files/cdm-0.5.3-invalid-MIT-cookie.patch
new file mode 100644
index 000000000000..1cec2b5c44a6
--- /dev/null
+++ b/x11-misc/cdm/files/cdm-0.5.3-invalid-MIT-cookie.patch
@@ -0,0 +1,19 @@
+commit c4b831f919e695d1c6882fbd76900dfa0f64cab5
+Author: ShadowKyogre <shadowkyogre@aim.com>
+Date:   Sat Feb 11 17:44:23 2012 -0800
+
+    Add case for handling the Invalid MIT cookie or something.
+
+diff --git a/src/cdm b/src/cdm
+index d5aead5..59094cc 100755
+--- a/src/cdm
++++ b/src/cdm
+@@ -128,6 +128,8 @@ else
+		elif [[ $dpyinfo = No\ protocol\ specified* ]]; then
+			# Display is in use by another user
+			let display=display+1
++		elif [[ $dpyinfo = Invalid\ MIT* ]];then
++			let display=display+1
+		else
+			break
+		fi
diff --git a/x11-misc/cdm/metadata.xml b/x11-misc/cdm/metadata.xml
new file mode 100644
index 000000000000..1574d2cf1ad0
--- /dev/null
+++ b/x11-misc/cdm/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+  <email>gienah@gentoo.org</email>
+  <name>Mark Wright</name>
+</maintainer>
+<longdescription lang='en'>
+CDM is a minimalistic, yet full-featured replacement for
+login-managers like slim, kdm, gdm and qingy that provides a fast,
+dialog-based login system without the overhead of the X Window System
+or the instability of qingy. Written in pure bash, CDM has no other
+dependencies, yet supports multiple users/sessions and can start
+virtually any DE/WM.
+</longdescription>
+<use> 
+  <flag name='consolekit'>Enable native consolekit support</flag>
+</use>
+</pkgmetadata>
diff --git a/x11-misc/chgres/Manifest b/x11-misc/chgres/Manifest
new file mode 100644
index 000000000000..c752d7a362c7
--- /dev/null
+++ b/x11-misc/chgres/Manifest
@@ -0,0 +1 @@
+DIST chgres-0.1.tar.gz 9219 RMD160 dff610b2c712f20fe7f3bd54c7d2a14083041532 SHA1 1ad31364d62df383198fc1f01a1c923a7059fdd1 SHA256 37f76425c92c5cf8d2448c87886474348d1a05ead1ac085aa885c2533c5efb26
diff --git a/x11-misc/chgres/chgres-0.1-r1.ebuild b/x11-misc/chgres/chgres-0.1-r1.ebuild
new file mode 100644
index 000000000000..75f47747139c
--- /dev/null
+++ b/x11-misc/chgres/chgres-0.1-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="A very simple command line utility for changing X resolutions"
+HOMEPAGE="http://hpwww.ec-lyon.fr/~vincent/"
+SRC_URI="http://hpwww.ec-lyon.fr/~vincent/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXxf86dga
+	x11-libs/libXext
+	x11-libs/libXxf86vm"
+DEPEND="${RDEPEND}
+	x11-proto/xf86vidmodeproto
+	x11-proto/xf86dgaproto"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-{flags,includes}.patch
+	tc-export CC
+}
+
+src_install() {
+	dobin chgres
+	dodoc README
+}
diff --git a/x11-misc/chgres/files/chgres-0.1-flags.patch b/x11-misc/chgres/files/chgres-0.1-flags.patch
new file mode 100644
index 000000000000..4045175dde09
--- /dev/null
+++ b/x11-misc/chgres/files/chgres-0.1-flags.patch
@@ -0,0 +1,21 @@
+--- a/Makefile	2001-04-18 23:07:56.000000000 +0200
++++ b/Makefile	2010-09-17 03:08:55.000000000 +0200
+@@ -1,9 +1,9 @@
+-CFLAGS=
+-LDFLAGS= -L/usr/X11R6/lib -lXext -lX11 -lXxf86vm -lXxf86dga
++LIBS= $(shell pkg-config --libs xext x11 xxf86vm xxf86dga)
++INCLUDES= $(shell pkg-config --cflags xext x11 xxf86vm xxf86dga)
+ prefix=/usr
+ 
+ chgres: chgres.o
+-	$(CC) -o $@ $< $(LDFLAGS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LIBS)
+ 
+ install: chgres
+ 	install -D -m 0555 chgres $(prefix)/bin/
+@@ -12,4 +12,4 @@
+ 	rm -f core chgres.o chgres
+ 
+ .c.o:
+-	$(CC) $(CFLAGS) -c $< -o $@
++	$(CC) $(CFLAGS) $(INCLUDES) -c $< -o $@
diff --git a/x11-misc/chgres/files/chgres-0.1-includes.patch b/x11-misc/chgres/files/chgres-0.1-includes.patch
new file mode 100644
index 000000000000..c972ab96fc8f
--- /dev/null
+++ b/x11-misc/chgres/files/chgres-0.1-includes.patch
@@ -0,0 +1,15 @@
+--- a/chgres.c	2001-04-18 22:40:05.000000000 +0200
++++ b/chgres.c	2010-09-17 03:20:37.000000000 +0200
+@@ -17,9 +17,11 @@
+  */
+ 
+ #include <X11/Xlib.h>
+-#include <X11/extensions/xf86dga.h>
++#include <X11/extensions/Xxf86dga.h>
+ #include <X11/extensions/xf86vmode.h>
+ #include <stdio.h>
++#include <stdlib.h> /* exit() */
++#include <strings.h> /* strcasecmp() */
+ 
+ #define VERSION "0.1"
+ 
diff --git a/x11-misc/chgres/metadata.xml b/x11-misc/chgres/metadata.xml
new file mode 100644
index 000000000000..170550f4616e
--- /dev/null
+++ b/x11-misc/chgres/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>desktop-misc</herd>
+	<longdescription>chgres is a small tool which uses the XFree86-VidModeExtension X11 extension to query and set the resolution of your XFree86 display, without restarting it. It has a simple command-line user interface which makes it suitable for use in shell scripts.</longdescription>
+</pkgmetadata>
diff --git a/x11-misc/colord/Manifest b/x11-misc/colord/Manifest
new file mode 100644
index 000000000000..029df26c031f
--- /dev/null
+++ b/x11-misc/colord/Manifest
@@ -0,0 +1,3 @@
+DIST colord-1.2.10.tar.xz 1203248 SHA256 1dea0453cc778326e700f6cb0a206836a57dedfb0fbdc3acaf2be02ea77a963a SHA512 fdf6f41e84fb37905e3c2e37a7d095d5271759f17e292cf5cf23f846ea6805949185c1a0548c4c4e24e2a385e655cd30609423921b0389076f5373ca1b8578e7 WHIRLPOOL d70fd0d3fde030f6c592f49ae146ccbb38c00ad0c28e2253ea8e2e00436c19fc4cf53aead6360e04eb7509a8d94bd07ffab6dde5592fd050dd37de3355b76f87
+DIST colord-1.2.11.tar.xz 1205468 SHA256 dac29c83659703a8548db561bc670832f26b30f7a88ed90a6530eb052a10df8f SHA512 fec46d295b1b4caba7c0a666eccbf3ce325fab4bd56e6a841cfdd9b7a381384dff3c71a744dda0e88ed2e99519c278c1ee495e6b8870c74cb4939dbc08d4bb96 WHIRLPOOL 7372d1a52c897e133fa75c8e06c47b3f7035cb01a3ec858f74ddc741613b11554a2d6dac6c886347f4e82baa16091cc41232a5deb3db4ae5a4930be0d1de6f41
+DIST colord-1.2.9.tar.xz 1200936 SHA256 48ce0db4f327c94c2bec11fed98a9a73f580d34c6edcd636d90831fe3bea5ae4 SHA512 d25497fa6460e5ffd7ce872bf16b60916e879cdd3aaec4c81dd4ab8446949767f3d3d49a3e654813445b049a9653334ba22d8e9a91cf6699c6063c01be382a75 WHIRLPOOL ca8edc19b162e4e97c263c1bc64d2a655d5adafeb2cb64c8bdbd7eb4e20052ce76f8ad332168088a97e654d20f0c5215d62829fed7471ac69faed3a79fc9f283
diff --git a/x11-misc/colord/colord-1.2.10.ebuild b/x11-misc/colord/colord-1.2.10.ebuild
new file mode 100644
index 000000000000..a8df68ac111d
--- /dev/null
+++ b/x11-misc/colord/colord-1.2.10.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+VALA_USE_DEPEND="vapigen"
+
+inherit autotools bash-completion-r1 check-reqs eutils gnome2 user systemd udev vala multilib-minimal
+
+DESCRIPTION="System service to accurately color manage input and output devices"
+HOMEPAGE="http://www.freedesktop.org/software/colord/"
+SRC_URI="http://www.freedesktop.org/software/colord/releases/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0/2" # subslot = libcolord soname version
+KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+
+# We prefer policykit enabled by default, bug #448058
+IUSE="argyllcms examples extra-print-profiles +gusb +introspection +policykit scanner systemd +udev vala"
+REQUIRED_USE="
+	gusb? ( udev )
+	scanner? ( udev )
+	vala? ( introspection )
+"
+
+COMMON_DEPEND="
+	dev-db/sqlite:3=
+	>=dev-libs/glib-2.36:2[${MULTILIB_USEDEP}]
+	>=media-libs/lcms-2.6:2=[${MULTILIB_USEDEP}]
+	argyllcms? ( media-gfx/argyllcms )
+	gusb? ( >=dev-libs/libgusb-0.2.2[introspection?,${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.8:= )
+	policykit? ( >=sys-auth/polkit-0.103 )
+	scanner? (
+		media-gfx/sane-backends
+		sys-apps/dbus )
+	systemd? ( >=sys-apps/systemd-44:0= )
+	udev? (
+		virtual/udev
+		virtual/libgudev:=
+		virtual/libudev:=[${MULTILIB_USEDEP}]
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	!media-gfx/shared-color-profiles
+	!<=media-gfx/colorhug-client-0.1.13
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/libxslt
+	>=dev-util/gtk-doc-am-1.9
+	>=dev-util/intltool-0.35
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	extra-print-profiles? ( media-gfx/argyllcms )
+	vala? ( $(vala_depend) )
+"
+
+# FIXME: needs pre-installed dbus service files
+RESTRICT="test"
+
+# According to upstream comment in colord.spec.in, building the extra print
+# profiles requires >=4G of memory
+CHECKREQS_MEMORY="4G"
+
+pkg_pretend() {
+	use extra-print-profiles && check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	use extra-print-profiles && check-reqs_pkg_setup
+	enewgroup colord
+	enewuser colord -1 -1 /var/lib/colord colord
+}
+
+src_prepare() {
+	# Adapt to Gentoo paths
+	sed -i -e 's/spotread/argyll-spotread/' \
+		src/sensors/cd-sensor-argyll.c \
+		configure.ac || die
+
+	eautoreconf
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+}
+
+multilib_src_configure() {
+	# Reverse tools require gusb
+	# bash-completion test does not work on gentoo
+	local myconf=(
+		--disable-bash-completion
+		--disable-examples
+		--disable-static
+		--enable-libcolordcompat
+		--with-daemon-user=colord
+		--localstatedir="${EPREFIX}"/var
+		$(multilib_native_use_enable argyllcms argyllcms-sensor)
+		$(multilib_native_use_enable extra-print-profiles print-profiles)
+		$(multilib_native_usex extra-print-profiles COLPROF="$(type -P argyll-colprof)" "")
+		$(use_enable gusb)
+		$(multilib_native_use_enable gusb reverse)
+		$(multilib_native_use_enable introspection)
+		$(multilib_native_use_enable policykit polkit)
+		$(multilib_native_use_enable scanner sane)
+		$(multilib_native_use_enable systemd systemd-login)
+		$(use_enable udev)
+		--with-udevrulesdir="$(get_udevdir)"/rules.d
+		$(multilib_native_use_enable vala)
+		"$(systemd_with_unitdir)"
+	)
+
+	if ! multilib_is_native_abi; then
+		# disable some extraneous checks
+		myconf+=(
+			SQLITE_{CFLAGS,LIBS}=' '
+			GUDEV_{CFLAGS,LIBS}=' '
+		)
+	fi
+
+	ECONF_SOURCE=${S} \
+	gnome2_src_configure "${myconf[@]}"
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi; then
+		gnome2_src_compile
+	else
+		emake -C lib/colord
+		use gusb && emake -C lib/colorhug
+		emake -C lib/compat
+	fi
+}
+
+multilib_src_test() {
+	if multilib_is_native_abi; then
+		default
+	else
+		emake -C lib/colord check
+		use gusb && emake -C lib/colorhug check
+		emake -C lib/compat check
+	fi
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		gnome2_src_install
+	else
+		gnome2_src_install -C lib/colord
+		use gusb && gnome2_src_install -C lib/colorhug
+		gnome2_src_install -C lib/compat
+		gnome2_src_install -C contrib/session-helper install-libcolord_includeHEADERS
+	fi
+}
+
+multilib_src_install_all() {
+	DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README.md TODO"
+	einstalldocs
+
+	newbashcomp data/colormgr colormgr
+
+	# Ensure config and profile directories exist and /var/lib/colord/*
+	# is writable by colord user
+	keepdir /var/lib/color{,d}/icc
+	fowners colord:colord /var/lib/colord{,/icc}
+
+	if use examples; then
+		docinto examples
+		dodoc examples/*.c
+	fi
+}
diff --git a/x11-misc/colord/colord-1.2.11.ebuild b/x11-misc/colord/colord-1.2.11.ebuild
new file mode 100644
index 000000000000..8e4bdf785286
--- /dev/null
+++ b/x11-misc/colord/colord-1.2.11.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+VALA_USE_DEPEND="vapigen"
+
+inherit autotools bash-completion-r1 check-reqs eutils gnome2 user systemd udev vala multilib-minimal
+
+DESCRIPTION="System service to accurately color manage input and output devices"
+HOMEPAGE="http://www.freedesktop.org/software/colord/"
+SRC_URI="http://www.freedesktop.org/software/colord/releases/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0/2" # subslot = libcolord soname version
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+
+# We prefer policykit enabled by default, bug #448058
+IUSE="argyllcms examples extra-print-profiles +gusb +introspection +policykit scanner systemd +udev vala"
+REQUIRED_USE="
+	gusb? ( udev )
+	scanner? ( udev )
+	vala? ( introspection )
+"
+
+COMMON_DEPEND="
+	dev-db/sqlite:3=
+	>=dev-libs/glib-2.36:2[${MULTILIB_USEDEP}]
+	>=media-libs/lcms-2.6:2=[${MULTILIB_USEDEP}]
+	argyllcms? ( media-gfx/argyllcms )
+	gusb? ( >=dev-libs/libgusb-0.2.2[introspection?,${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.8:= )
+	policykit? ( >=sys-auth/polkit-0.103 )
+	scanner? (
+		media-gfx/sane-backends
+		sys-apps/dbus )
+	systemd? ( >=sys-apps/systemd-44:0= )
+	udev? (
+		virtual/udev
+		virtual/libgudev:=
+		virtual/libudev:=[${MULTILIB_USEDEP}]
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	!media-gfx/shared-color-profiles
+	!<=media-gfx/colorhug-client-0.1.13
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/libxslt
+	>=dev-util/gtk-doc-am-1.9
+	>=dev-util/intltool-0.35
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	extra-print-profiles? ( media-gfx/argyllcms )
+	vala? ( $(vala_depend) )
+"
+
+# FIXME: needs pre-installed dbus service files
+RESTRICT="test"
+
+# According to upstream comment in colord.spec.in, building the extra print
+# profiles requires >=4G of memory
+CHECKREQS_MEMORY="4G"
+
+pkg_pretend() {
+	use extra-print-profiles && check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	use extra-print-profiles && check-reqs_pkg_setup
+	enewgroup colord
+	enewuser colord -1 -1 /var/lib/colord colord
+}
+
+src_prepare() {
+	# Adapt to Gentoo paths
+	sed -i -e 's/spotread/argyll-spotread/' \
+		src/sensors/cd-sensor-argyll.c \
+		configure.ac || die
+
+	eautoreconf
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+}
+
+multilib_src_configure() {
+	# Reverse tools require gusb
+	# bash-completion test does not work on gentoo
+	local myconf=(
+		--disable-bash-completion
+		--disable-examples
+		--disable-static
+		--enable-libcolordcompat
+		--with-daemon-user=colord
+		--localstatedir="${EPREFIX}"/var
+		$(multilib_native_use_enable argyllcms argyllcms-sensor)
+		$(multilib_native_use_enable extra-print-profiles print-profiles)
+		$(multilib_native_usex extra-print-profiles COLPROF="$(type -P argyll-colprof)" "")
+		$(use_enable gusb)
+		$(multilib_native_use_enable gusb reverse)
+		$(multilib_native_use_enable introspection)
+		$(multilib_native_use_enable policykit polkit)
+		$(multilib_native_use_enable scanner sane)
+		$(multilib_native_use_enable systemd systemd-login)
+		$(use_enable udev)
+		--with-udevrulesdir="$(get_udevdir)"/rules.d
+		$(multilib_native_use_enable vala)
+		"$(systemd_with_unitdir)"
+	)
+
+	if ! multilib_is_native_abi; then
+		# disable some extraneous checks
+		myconf+=(
+			SQLITE_{CFLAGS,LIBS}=' '
+			GUDEV_{CFLAGS,LIBS}=' '
+		)
+	fi
+
+	ECONF_SOURCE=${S} \
+	gnome2_src_configure "${myconf[@]}"
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi; then
+		gnome2_src_compile
+	else
+		emake -C lib/colord
+		use gusb && emake -C lib/colorhug
+		emake -C lib/compat
+	fi
+}
+
+multilib_src_test() {
+	if multilib_is_native_abi; then
+		default
+	else
+		emake -C lib/colord check
+		use gusb && emake -C lib/colorhug check
+		emake -C lib/compat check
+	fi
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		gnome2_src_install
+	else
+		gnome2_src_install -C lib/colord
+		use gusb && gnome2_src_install -C lib/colorhug
+		gnome2_src_install -C lib/compat
+		gnome2_src_install -C contrib/session-helper install-libcolord_includeHEADERS
+	fi
+}
+
+multilib_src_install_all() {
+	DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README.md TODO"
+	einstalldocs
+
+	newbashcomp data/colormgr colormgr
+
+	# Ensure config and profile directories exist and /var/lib/colord/*
+	# is writable by colord user
+	keepdir /var/lib/color{,d}/icc
+	fowners colord:colord /var/lib/colord{,/icc}
+
+	if use examples; then
+		docinto examples
+		dodoc examples/*.c
+	fi
+}
diff --git a/x11-misc/colord/colord-1.2.9.ebuild b/x11-misc/colord/colord-1.2.9.ebuild
new file mode 100644
index 000000000000..7b4e1b9181f9
--- /dev/null
+++ b/x11-misc/colord/colord-1.2.9.ebuild
@@ -0,0 +1,172 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+VALA_USE_DEPEND="vapigen"
+VALA_MIN_API_VERSION="0.18"
+
+inherit autotools bash-completion-r1 check-reqs eutils gnome2 multilib-minimal user systemd udev vala
+
+DESCRIPTION="System service to accurately color manage input and output devices"
+HOMEPAGE="http://www.freedesktop.org/software/colord/"
+SRC_URI="http://www.freedesktop.org/software/colord/releases/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0/2" # subslot = libcolord soname version
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+
+# We prefer policykit enabled by default, bug #448058
+IUSE="argyllcms examples extra-print-profiles +gusb +introspection +policykit scanner systemd +udev vala"
+REQUIRED_USE="
+	gusb? ( udev )
+	scanner? ( udev )
+	vala? ( introspection )
+"
+
+COMMON_DEPEND="
+	dev-db/sqlite:3=
+	>=dev-libs/glib-2.36:2[${MULTILIB_USEDEP}]
+	>=media-libs/lcms-2.6:2=[${MULTILIB_USEDEP}]
+	argyllcms? ( media-gfx/argyllcms )
+	gusb? ( >=dev-libs/libgusb-0.2.2[introspection?,${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.8 )
+	policykit? ( >=sys-auth/polkit-0.103 )
+	scanner? (
+		media-gfx/sane-backends
+		sys-apps/dbus )
+	systemd? ( >=sys-apps/systemd-44:0= )
+	udev? (
+		virtual/udev
+		virtual/libgudev:=
+		virtual/libudev:=[${MULTILIB_USEDEP}]
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	!media-gfx/shared-color-profiles
+	!<=media-gfx/colorhug-client-0.1.13
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/libxslt
+	>=dev-util/gtk-doc-am-1.9
+	>=dev-util/intltool-0.35
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	extra-print-profiles? ( media-gfx/argyllcms )
+	vala? ( $(vala_depend) )
+"
+
+# FIXME: needs pre-installed dbus service files
+RESTRICT="test"
+
+# According to upstream comment in colord.spec.in, building the extra print
+# profiles requires >=4G of memory
+CHECKREQS_MEMORY="4G"
+
+pkg_pretend() {
+	use extra-print-profiles && check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	use extra-print-profiles && check-reqs_pkg_setup
+	enewgroup colord
+	enewuser colord -1 -1 /var/lib/colord colord
+}
+
+src_prepare() {
+	# Adapt to Gentoo paths
+	sed -i -e 's/spotread/argyll-spotread/' \
+		src/sensors/cd-sensor-argyll.c \
+		configure.ac || die
+
+	eautoreconf
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+}
+
+multilib_src_configure() {
+	# Reverse tools require gusb
+	# bash-completion test does not work on gentoo
+	local myconf=(
+		--disable-bash-completion
+		--disable-examples
+		--disable-static
+		--enable-libcolordcompat
+		--with-daemon-user=colord
+		--localstatedir="${EPREFIX}"/var
+		$(multilib_native_use_enable argyllcms argyllcms-sensor)
+		$(multilib_native_use_enable extra-print-profiles print-profiles)
+		$(multilib_native_usex extra-print-profiles COLPROF="$(type -P argyll-colprof)" "")
+		$(use_enable gusb)
+		$(multilib_native_use_enable gusb reverse)
+		$(multilib_native_use_enable introspection)
+		$(multilib_native_use_enable policykit polkit)
+		$(multilib_native_use_enable scanner sane)
+		$(multilib_native_use_enable systemd systemd-login)
+		$(use_enable udev)
+		--with-udevrulesdir="$(get_udevdir)"/rules.d
+		$(multilib_native_use_enable vala)
+		"$(systemd_with_unitdir)"
+	)
+
+	if ! multilib_is_native_abi; then
+		# disable some extraneous checks
+		myconf+=(
+			SQLITE_{CFLAGS,LIBS}=' '
+			GUDEV_{CFLAGS,LIBS}=' '
+		)
+	fi
+
+	ECONF_SOURCE=${S} \
+	gnome2_src_configure "${myconf[@]}"
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi; then
+		gnome2_src_compile
+	else
+		emake -C lib/colord
+		use gusb && emake -C lib/colorhug
+		emake -C lib/compat
+	fi
+}
+
+multilib_src_test() {
+	if multilib_is_native_abi; then
+		default
+	else
+		emake -C lib/colord check
+		use gusb && emake -C lib/colorhug check
+		emake -C lib/compat check
+	fi
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		gnome2_src_install
+	else
+		gnome2_src_install -C lib/colord
+		use gusb && gnome2_src_install -C lib/colorhug
+		gnome2_src_install -C lib/compat
+		gnome2_src_install -C contrib/session-helper install-libcolord_includeHEADERS
+	fi
+}
+
+multilib_src_install_all() {
+	DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README.md TODO"
+	einstalldocs
+
+	newbashcomp data/colormgr colormgr
+
+	# Ensure config and profile directories exist and /var/lib/colord/*
+	# is writable by colord user
+	keepdir /var/lib/color{,d}/icc
+	fowners colord:colord /var/lib/colord{,/icc}
+
+	if use examples; then
+		docinto examples
+		dodoc examples/*.c
+	fi
+}
diff --git a/x11-misc/colord/metadata.xml b/x11-misc/colord/metadata.xml
new file mode 100644
index 000000000000..419ce9848522
--- /dev/null
+++ b/x11-misc/colord/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>gnome</herd>
+	<use>
+		<flag name="argyllcms">Enable ArgyllCMS sensor</flag>
+		<flag name="extra-print-profiles">Generate extra print profiles.
+			Warning: significant build time and memory requirements.</flag>
+		<flag name="gusb">Enable <pkg>dev-libs/libgusb</pkg> support, needed for
+			colorimeter drivers</flag>
+	</use>
+</pkgmetadata>
diff --git a/x11-misc/compton/Manifest b/x11-misc/compton/Manifest
new file mode 100644
index 000000000000..d7a0fbc900f1
--- /dev/null
+++ b/x11-misc/compton/Manifest
@@ -0,0 +1,2 @@
+DIST compton-0.1_beta1.tar.gz 140466 SHA256 28a770e81ae9e33d759044a75cd2b57329b17bf211cf0e795bc73e56933df8d6 SHA512 fa3e9eb8d85071ac38aa2834f7a14679fce95e1367f6c58987e2d56c5d90e7dd6e3945557e91512199a78bc38eba7f22bdd6efa872d8b108cb33c4579501ae95 WHIRLPOOL faa3a2c23ab1af3f340615bb7593cbd0e81edd36398fb58293ddc543df80ecc13a7e2f2ff8f281cb478f94713896b081b39607c0918d524dfa931a4a1b1c412f
+DIST compton-0.1_beta2.tar.gz 144239 SHA256 7b9cd52a57326116fb5db3f5f89b7d50e17715252d9fd79b70b45ace30a6b009 SHA512 c3a019d90e32559d44e3a4969bcc15a15837db9c9519ce8cc70b1bd3d0cb16d29449f68cc2f6a8d834569c9620ec6533ab85c1586da957c69b1ae341d9584535 WHIRLPOOL 39ca9718bc79d4542d73cce39bb51fc9b9c0497a30914ab044b920f72a3c2f8cbd315c5dc97c999c1f0ca798ae692ada4626f069914b6835f0c225638b486422
diff --git a/x11-misc/compton/compton-0.1_beta1.ebuild b/x11-misc/compton/compton-0.1_beta1.ebuild
new file mode 100644
index 000000000000..9d39d7360ddd
--- /dev/null
+++ b/x11-misc/compton/compton-0.1_beta1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python3_3 )
+inherit toolchain-funcs python-r1
+
+DESCRIPTION="A compositor for X, and a fork of xcompmgr-dana"
+HOMEPAGE="http://github.com/chjj/compton"
+SRC_URI="https://github.com/chjj/compton/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="dbus +drm opengl +pcre"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	dev-libs/libconfig
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	dbus? ( sys-apps/dbus )
+	opengl? ( virtual/opengl )
+	pcre? ( dev-libs/libpcre:3 )"
+RDEPEND="${COMMON_DEPEND}
+	x11-apps/xprop
+	x11-apps/xwininfo"
+DEPEND="${COMMON_DEPEND}
+	app-text/asciidoc
+	virtual/pkgconfig
+	x11-proto/xproto
+	drm? ( x11-libs/libdrm )"
+
+nobuildit() { use $1 || echo yes ; }
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		tc-export CC
+	fi
+}
+
+src_compile() {
+	emake docs
+	NO_DBUS=$(nobuildit dbus) \
+	NO_VSYNC_DRM=$(nobuildit drm) \
+	NO_VSYNC_OPENGL=$(nobuildit opengl) \
+	NO_REGEX_PCRE=$(nobuildit pcre) \
+		emake compton
+}
+
+src_install() {
+	NO_DBUS=$(nobuildit dbus) \
+	NO_VSYNC_DRM=$(nobuildit drm) \
+	NO_VSYNC_OPENGL=$(nobuildit opengl) \
+	NO_REGEX_PCRE=$(nobuildit pcre) \
+		default
+	docinto examples
+	dodoc compton.sample.conf dbus-examples/*
+	python_foreach_impl python_newscript bin/compton-convgen.py compton-convgen
+}
diff --git a/x11-misc/compton/compton-0.1_beta2.ebuild b/x11-misc/compton/compton-0.1_beta2.ebuild
new file mode 100644
index 000000000000..dbfcd55efbfd
--- /dev/null
+++ b/x11-misc/compton/compton-0.1_beta2.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python3_3 python3_4 )
+inherit toolchain-funcs python-r1
+
+DESCRIPTION="A compositor for X, and a fork of xcompmgr-dana"
+HOMEPAGE="http://github.com/chjj/compton"
+SRC_URI="https://github.com/chjj/compton/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="dbus +drm opengl +pcre xinerama"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	dev-libs/libconfig
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	dbus? ( sys-apps/dbus )
+	opengl? ( virtual/opengl )
+	pcre? ( dev-libs/libpcre:3 )
+	xinerama? ( x11-libs/libXinerama )"
+RDEPEND="${COMMON_DEPEND}
+	x11-apps/xprop
+	x11-apps/xwininfo"
+DEPEND="${COMMON_DEPEND}
+	app-text/asciidoc
+	virtual/pkgconfig
+	x11-proto/xproto
+	drm? ( x11-libs/libdrm )"
+
+nobuildit() { use $1 || echo yes ; }
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		tc-export CC
+	fi
+}
+
+src_compile() {
+	emake docs
+
+	NO_DBUS=$(nobuildit dbus) \
+	NO_XINERAMA=$(nobuildit xinerama) \
+	NO_VSYNC_DRM=$(nobuildit drm) \
+	NO_VSYNC_OPENGL=$(nobuildit opengl) \
+	NO_REGEX_PCRE=$(nobuildit pcre) \
+		emake compton
+}
+
+src_install() {
+	NO_DBUS=$(nobuildit dbus) \
+	NO_VSYNC_DRM=$(nobuildit drm) \
+	NO_VSYNC_OPENGL=$(nobuildit opengl) \
+	NO_REGEX_PCRE=$(nobuildit pcre) \
+		default
+	docinto examples
+	dodoc compton.sample.conf dbus-examples/*
+	python_foreach_impl python_newscript bin/compton-convgen.py compton-convgen
+}
diff --git a/x11-misc/compton/compton-9999.ebuild b/x11-misc/compton/compton-9999.ebuild
new file mode 100644
index 000000000000..5d1ce4566d32
--- /dev/null
+++ b/x11-misc/compton/compton-9999.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python3_3 python3_4 )
+inherit toolchain-funcs python-r1 git-2
+
+DESCRIPTION="A compositor for X, and a fork of xcompmgr-dana"
+HOMEPAGE="http://github.com/chjj/compton"
+SRC_URI=""
+
+EGIT_REPO_URI="git://github.com/chjj/compton.git"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS=""
+IUSE="dbus +drm opengl +pcre xinerama"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	dev-libs/libconfig
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	dbus? ( sys-apps/dbus )
+	opengl? ( virtual/opengl )
+	pcre? ( dev-libs/libpcre:3 )
+	xinerama? ( x11-libs/libXinerama )"
+RDEPEND="${COMMON_DEPEND}
+	x11-apps/xprop
+	x11-apps/xwininfo"
+DEPEND="${COMMON_DEPEND}
+	app-text/asciidoc
+	virtual/pkgconfig
+	x11-proto/xproto
+	drm? ( x11-libs/libdrm )"
+
+nobuildit() { use $1 || echo yes ; }
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		tc-export CC
+	fi
+}
+
+src_compile() {
+	emake docs
+
+	NO_DBUS=$(nobuildit dbus) \
+	NO_XINERAMA=$(nobuildit xinerama) \
+	NO_VSYNC_DRM=$(nobuildit drm) \
+	NO_VSYNC_OPENGL=$(nobuildit opengl) \
+	NO_REGEX_PCRE=$(nobuildit pcre) \
+		emake compton
+}
+
+src_install() {
+	NO_DBUS=$(nobuildit dbus) \
+	NO_VSYNC_DRM=$(nobuildit drm) \
+	NO_VSYNC_OPENGL=$(nobuildit opengl) \
+	NO_REGEX_PCRE=$(nobuildit pcre) \
+		default
+	docinto examples
+	dodoc compton.sample.conf dbus-examples/*
+	python_foreach_impl python_newscript bin/compton-convgen.py compton-convgen
+}
diff --git a/x11-misc/compton/metadata.xml b/x11-misc/compton/metadata.xml
new file mode 100644
index 000000000000..bad8680cf41c
--- /dev/null
+++ b/x11-misc/compton/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>desktop-misc</herd>
+  <use>
+    <flag name="drm">Enable VSync with DRM_IOCTL_WAIT_VBLANK</flag>
+    <flag name="opengl">Enable VSync with SGI_swap_control OpenGL extension</flag>
+  </use>
+  <upstream>
+    <remote-id type="github">chjj/compton</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/x11-misc/dclock/Manifest b/x11-misc/dclock/Manifest
new file mode 100644
index 000000000000..b32bb93c9c5a
--- /dev/null
+++ b/x11-misc/dclock/Manifest
@@ -0,0 +1,2 @@
+DIST dclock_2.2.2-4.debian.tar.gz 6576 SHA256 259aa8e1d9b0b0ca813285c295246921bedb9ff047db01facbf0a49d4f513f34 SHA512 9b1c61c9ad4ac19b9bd128915ccb846b658ecdad8af8cb7197cef49a75f8e6abefd2375b1814364889af3c29b095cdf8dc1cf40b36683842f1d0a272bd9e188f WHIRLPOOL be9cd64af1390a28aacf9cd48ec602fad1fc9fb2b4fc86673060966559b96611b0e03be229a1b0de10769b3bdd747e9d6b06f30e43b5067cbea9faddc8a91ae7
+DIST dclock_2.2.2.orig.tar.gz 63583 SHA256 d14ebc107b4b837ac3ee79ea639c32d7cec658df653687e665979640cd339c3c SHA512 c43ba031fd0d9ba2bc7e8fe9becc73591bfc47cd4ca931df03fa55207cfb148e24e5d702a7de5af8b67e188c561eae2fb7da14162f6a982d0abbb3251c32372c WHIRLPOOL 5f0dc1acd97c22b42aee274d963f6ddc687d648ab43861a8b862567a37adce036e8e662d5b5dc4aac7e26625d4de019fab85d5005c2a89f27580b8ca494277b5
diff --git a/x11-misc/dclock/dclock-2.2.2_p4-r1.ebuild b/x11-misc/dclock/dclock-2.2.2_p4-r1.ebuild
new file mode 100644
index 000000000000..7560bec1bffb
--- /dev/null
+++ b/x11-misc/dclock/dclock-2.2.2_p4-r1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="Digital clock for the X window system"
+HOMEPAGE="http://packages.qa.debian.org/d/dclock.html"
+SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV/_p*/}.orig.tar.gz
+		mirror://debian/pool/main/d/${PN}/${PN}_${PV/_p/-}.debian.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="xft"
+
+RDEPEND="
+	xft? (
+		media-libs/freetype
+		x11-libs/libXft
+	)
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXt
+"
+DEPEND="
+	${RDEPEND}
+	app-text/rman
+	x11-misc/imake
+	xft? ( virtual/pkgconfig )
+"
+
+S=${WORKDIR}/${P/_p*/}
+
+src_prepare() {
+	EPATCH_FORCE=yes EPATCH_SUFFIX=diff epatch "${WORKDIR}"/debian/patches
+	epatch "${FILESDIR}"/${P}-include.patch
+}
+
+src_configure() {
+	if use xft; then
+		append-cppflags \
+			-DXFT_SUPPORT \
+			$( $(tc-getPKG_CONFIG) --cflags freetype2)
+	else
+		append-cppflags -UXFT_SUPPORT
+		sed -i -e '/EXTRA_LIBRARIES/s|^|#|g' Imakefile || die
+	fi
+
+	xmkmf || die
+}
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS}" \
+		EXTRA_LDOPTIONS="${LDFLAGS}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install{,.man}
+
+	insinto /usr/share/sounds
+	doins sounds/*
+
+	insinto /usr/share/X11/app-defaults
+	newins Dclock.ad DClock
+
+	dodoc README TODO
+}
diff --git a/x11-misc/dclock/dclock-2.2.2_p4.ebuild b/x11-misc/dclock/dclock-2.2.2_p4.ebuild
new file mode 100644
index 000000000000..ae6ac54df88b
--- /dev/null
+++ b/x11-misc/dclock/dclock-2.2.2_p4.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Digital clock for the X window system"
+HOMEPAGE="http://packages.qa.debian.org/d/dclock.html"
+SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV/_p*/}.orig.tar.gz
+		mirror://debian/pool/main/d/${PN}/${PN}_${PV/_p/-}.debian.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXt"
+DEPEND="${RDEPEND}
+	app-text/rman
+	x11-misc/imake"
+
+S=${WORKDIR}/${P/_p*/}
+
+src_prepare() {
+	EPATCH_FORCE=yes EPATCH_SUFFIX=diff epatch "${WORKDIR}"/debian/patches
+	epatch "${FILESDIR}"/${P}-include.patch
+}
+
+src_configure() {
+	xmkmf || die
+}
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS}" \
+		EXTRA_LDOPTIONS="${LDFLAGS}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install{,.man}
+
+	insinto /usr/share/sounds
+	doins sounds/*
+
+	insinto /usr/share/X11/app-defaults
+	newins Dclock.ad DClock
+
+	dodoc README TODO
+}
diff --git a/x11-misc/dclock/files/dclock-2.2.2_p4-include.patch b/x11-misc/dclock/files/dclock-2.2.2_p4-include.patch
new file mode 100644
index 000000000000..2fbdd884fafb
--- /dev/null
+++ b/x11-misc/dclock/files/dclock-2.2.2_p4-include.patch
@@ -0,0 +1,10 @@
+--- dclock.c
++++ dclock.c
+@@ -7,6 +7,7 @@
+  * manager: *Dclock.seconds: on
+  */
+ #include <stdio.h>
++#include <stdlib.h> /* exit() */
+ #include <locale.h>
+ #include <X11/Intrinsic.h>
+ #include "Dclock.h"
diff --git a/x11-misc/dclock/metadata.xml b/x11-misc/dclock/metadata.xml
new file mode 100644
index 000000000000..2518313f5241
--- /dev/null
+++ b/x11-misc/dclock/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+        <herd>desktop-misc</herd>
+</pkgmetadata>
diff --git a/x11-misc/denu/Manifest b/x11-misc/denu/Manifest
new file mode 100644
index 000000000000..ce0e9e35feeb
--- /dev/null
+++ b/x11-misc/denu/Manifest
@@ -0,0 +1 @@
+DIST denu-2.3.2.tar.bz2 19644 SHA256 948c88d4c66bf9477d2e7185dce0b1cf58f96d75ebf289415610b16ac1c5e094
diff --git a/x11-misc/denu/denu-2.3.2-r1.ebuild b/x11-misc/denu/denu-2.3.2-r1.ebuild
new file mode 100644
index 000000000000..7f276ca25f79
--- /dev/null
+++ b/x11-misc/denu/denu-2.3.2-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="3"
+PYTHON_DEPEND="2:2.6"
+inherit python
+
+DESCRIPTION="A menu generation program for fluxbox, waimea, openbox, icewm, gnome and kde"
+HOMEPAGE="http://denu.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 hppa ppc ~ppc64 x86"
+IUSE=""
+
+RDEPEND=">=dev-python/pygtk-2.4.1"
+DEPEND="${RDEPEND}"
+
+src_install() {
+	./install.sh "${D}" || die "./install.sh failed"
+	python_convert_shebangs -r 2 "${D}"
+}
diff --git a/x11-misc/denu/metadata.xml b/x11-misc/denu/metadata.xml
new file mode 100644
index 000000000000..ef925213c21d
--- /dev/null
+++ b/x11-misc/denu/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer>
+    <email>maintainer-needed@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="sourceforge">denu</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/x11-misc/devilspie/Manifest b/x11-misc/devilspie/Manifest
new file mode 100644
index 000000000000..1fa8ccc5027e
--- /dev/null
+++ b/x11-misc/devilspie/Manifest
@@ -0,0 +1 @@
+DIST devilspie-0.22.tar.gz 192646 RMD160 0e35409bdbf0e0a29df59e16ab9fd3774a001b62 SHA1 6bf8d04b373dd301497c5acdcde3dbb45309f59d SHA256 e06aba1d96889e1b58bd1b0ba4d3015f50adc3ade2824b5cb37a0ee7f2490aaf
diff --git a/x11-misc/devilspie/devilspie-0.22.ebuild b/x11-misc/devilspie/devilspie-0.22.ebuild
new file mode 100644
index 000000000000..ded3a2746a8f
--- /dev/null
+++ b/x11-misc/devilspie/devilspie-0.22.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+inherit autotools
+
+DESCRIPTION="A Window Matching utility similar to Sawfish's Matched Windows feature"
+HOMEPAGE="http://www.burtonini.com/blog/computers/devilspie"
+SRC_URI="http://www.burtonini.com/computing/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ppc sparc x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	>=dev-libs/glib-2.10
+	x11-libs/gtk+:2
+	>=x11-libs/libwnck-2.10:1
+	x11-libs/libX11
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	dev-util/intltool
+	sys-devel/gettext
+	gnome-base/gnome-common" # Required by eautoreconf
+
+src_prepare() {
+	sed -i -e "s:\(/usr/share/doc/devilspie\):\1-${PVR}:" devilspie.1 || die
+	sed -i -e '/-DG.*_DISABLE_DEPRECATED/d' src/Makefile.am || die
+	eautoreconf
+	export LIBS="-lX11"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog NEWS README TODO
+	keepdir /etc/devilspie
+}
diff --git a/x11-misc/devilspie/metadata.xml b/x11-misc/devilspie/metadata.xml
new file mode 100644
index 000000000000..731225048652
--- /dev/null
+++ b/x11-misc/devilspie/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>desktop-misc</herd>
+</pkgmetadata>
diff --git a/x11-misc/devilspie2/Manifest b/x11-misc/devilspie2/Manifest
new file mode 100644
index 000000000000..8e47f635d466
--- /dev/null
+++ b/x11-misc/devilspie2/Manifest
@@ -0,0 +1,2 @@
+DIST devilspie2_0.36-src.tar.gz 44818 SHA256 7d0c2982d65f4dfc9d64f29f72252cce3354231938bc79da8034edfb3394ae11 SHA512 5ab755e7b2f12c0d6304a7ce4a25c95f1cb5d11eec42da0902239e37e2f637663706a21b2d69643f423b8fd597761283fc7a0efc8c201e1f07e503a2057fefd6 WHIRLPOOL 2a6aac66c8fe9e5a0eb8099eca835bc1a7382627e662fdbd70f598a4ead478ca9d8a8510a6ce353f2a186ac94f71a5df67375dd91a3dbd4c9cc001854d1cc6fa
+DIST devilspie2_0.37-src.tar.gz 44722 SHA256 463db05b85723f571e16034b3c9281bdcc3a2cffcaa2cf056580575ee8a421b6 SHA512 1eaf7d6a5074179d1a3b356ed25e0243bb177e8d408797a8efe230ae1b737d18f52442a69f92a3f47cece2d91c70b4c7d9cb378183eb353f0e163ac772f9478e WHIRLPOOL a58c6137415108c10e603e4c095309038801b2a82dfa0ea1befd8a03b62d341fdf3015314df0ebb0f81f43b481c3661b6904ef28a1899bd52aeb98922dcd509a
diff --git a/x11-misc/devilspie2/devilspie2-0.36.ebuild b/x11-misc/devilspie2/devilspie2-0.36.ebuild
new file mode 100644
index 000000000000..10c913be0070
--- /dev/null
+++ b/x11-misc/devilspie2/devilspie2-0.36.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# check locales on version bump!
+PLOCALES="fi fr ja nl pt_BR ru sv"
+inherit flag-o-matic toolchain-funcs l10n
+
+DESCRIPTION="Devilspie like window matching utility, using LUA for scripting"
+HOMEPAGE="http://devilspie2.gusnan.se"
+SRC_URI="http://devilspie2.gusnan.se/download/${PN}_${PV}-src.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="debug"
+
+RDEPEND=">=dev-libs/glib-2.32.4:2
+	>=dev-lang/lua-5.1.5
+	>=x11-libs/gtk+-3.4.4:3
+	>=x11-libs/libwnck-3.4.4:3
+	x11-libs/libX11"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig
+	x11-proto/xproto"
+
+src_prepare() {
+	use debug && append-cflags -D_DEBUG
+}
+
+src_compile() {
+	emake CC=$(tc-getCC) PREFIX="/usr" LANGUAGES="$(l10n_get_locales)"
+}
+
+src_install() {
+	emake PREFIX="/usr" DESTDIR="${D}" LANGUAGES="$(l10n_get_locales)" install
+
+	dodoc AUTHORS ChangeLog README README.translators TODO VERSION
+	doman devilspie2.1
+}
+
+pkg_postinst() {
+	elog "Default directory for scripts is ~/.config/devilspie2/"
+}
diff --git a/x11-misc/devilspie2/devilspie2-0.37.ebuild b/x11-misc/devilspie2/devilspie2-0.37.ebuild
new file mode 100644
index 000000000000..815fe9329187
--- /dev/null
+++ b/x11-misc/devilspie2/devilspie2-0.37.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# check locales on version bump!
+PLOCALES="fi fr ja nl pt_BR ru sv"
+inherit flag-o-matic toolchain-funcs l10n
+
+DESCRIPTION="Devilspie like window matching utility, using LUA for scripting"
+HOMEPAGE="http://devilspie2.gusnan.se"
+SRC_URI="http://devilspie2.gusnan.se/download/${PN}_${PV}-src.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+RDEPEND=">=dev-libs/glib-2.32.4:2
+	>=dev-lang/lua-5.1.5
+	>=x11-libs/gtk+-3.4.4:3
+	>=x11-libs/libwnck-3.4.4:3
+	x11-libs/libX11"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig
+	x11-proto/xproto"
+
+src_prepare() {
+	use debug && append-cflags -D_DEBUG
+}
+
+src_compile() {
+	emake CC=$(tc-getCC) PREFIX="/usr" LANGUAGES="$(l10n_get_locales)"
+}
+
+src_install() {
+	emake PREFIX="/usr" DESTDIR="${D}" LANGUAGES="$(l10n_get_locales)" install
+
+	dodoc AUTHORS ChangeLog README README.translators TODO VERSION
+	doman devilspie2.1
+}
+
+pkg_postinst() {
+	elog "Default directory for scripts is ~/.config/devilspie2/"
+}
diff --git a/x11-misc/devilspie2/metadata.xml b/x11-misc/devilspie2/metadata.xml
new file mode 100644
index 000000000000..9360f354d02a
--- /dev/null
+++ b/x11-misc/devilspie2/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>desktop-misc</herd>
+</pkgmetadata>
+
diff --git a/x11-misc/dex/Manifest b/x11-misc/dex/Manifest
new file mode 100644
index 000000000000..f78ab2ccadc8
--- /dev/null
+++ b/x11-misc/dex/Manifest
@@ -0,0 +1,2 @@
+DIST dex-0.6.tar.gz 7389 SHA256 8e31bdde6b2450244c9b0a8e337997cb08b3e65626d2bf7a4dadddb19ceef0f1 SHA512 d479c51a758f9bae513c7a8f0ca0e19004f954f6ea7284b077c3602a660bd2d0ddcb3866d84b04b6bf46e64a5c7d55e1d220044034d9bb88d12ed1599d99fd6a WHIRLPOOL 409e9092781a6e31e3d41710099622fd8c41cba138b3235f796983a2e3fa45391fd7b0b1ae3cd638ddeb35990b36e88e3d729daa113dd78a68b789ba7712c947
+DIST dex-0.7.tar.gz 7679 SHA256 2b0c98832c4b894486807a9ac0417ca127425013e0f07da352621065cb36adc6 SHA512 ee1f8c6ef0b374aadf6ad0ee6482bb23f740f67888994839c381b71b3655d0cbd7d3d5c99abe5f3bce856cb767a1b4bffdbcdf6c70969226b44a59ee76943bce WHIRLPOOL 18606fe1f7f82010101c4998126505530bf7eb0e4fccfc5f9ce7d4c3d48375424d824af484d8927f2f245ee455994c91fc0772a7b47dc2e165cc38eed1917031
diff --git a/x11-misc/dex/dex-0.6.ebuild b/x11-misc/dex/dex-0.6.ebuild
new file mode 100644
index 000000000000..328b233a0f38
--- /dev/null
+++ b/x11-misc/dex/dex-0.6.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{3_3,3_4} )
+inherit eutils python-r1
+
+DESCRIPTION="DesktopEntry eXecution - tool to manage and launch autostart entries"
+HOMEPAGE="http://e-jc.de/"
+SRC_URI="https://github.com/jceb/dex/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+
+IUSE=""
+
+RDEPEND="${PYTHON_DEPS}"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	epatch_user
+}
+
+src_install() {
+	dobin dex
+	python_replicate_script "${ED}/usr/bin/dex"
+	dodoc README
+	doman dex.1
+}
diff --git a/x11-misc/dex/dex-0.7.ebuild b/x11-misc/dex/dex-0.7.ebuild
new file mode 100644
index 000000000000..46b1c6d1c26a
--- /dev/null
+++ b/x11-misc/dex/dex-0.7.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{3_3,3_4} )
+inherit eutils python-r1
+
+DESCRIPTION="DesktopEntry eXecution - tool to manage and launch autostart entries"
+HOMEPAGE="http://e-jc.de/"
+SRC_URI="https://github.com/jceb/dex/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="${PYTHON_DEPS}"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	epatch_user
+}
+
+src_install() {
+	dobin dex
+	python_replicate_script "${ED}/usr/bin/dex"
+	dodoc README
+	doman dex.1
+}
diff --git a/x11-misc/dex/metadata.xml b/x11-misc/dex/metadata.xml
new file mode 100644
index 000000000000..7b0ac3cd3a83
--- /dev/null
+++ b/x11-misc/dex/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>pinkbyte@gentoo.org</email>
+		<name>Sergey Popov</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">jceb/dex</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-misc/dmenu/Manifest b/x11-misc/dmenu/Manifest
new file mode 100644
index 000000000000..a1177f5fa0cb
--- /dev/null
+++ b/x11-misc/dmenu/Manifest
@@ -0,0 +1 @@
+DIST dmenu-4.5.tar.gz 11543 SHA256 082cd698d82125ca0b3989006fb84ac4675c2a5585bf5bb8af0ea09cfb95a850 SHA512 872dee68c35a93c663eb0a941653eaaa4aa83d8379e05b4dbca089a2c9335036b496de85d8ddf7af1228a5625490a06a89031fb1aac726236b608b952962c248 WHIRLPOOL b91660f3028d314f1a10b994af73e6239c4aaabda6c9ab269bda7e37e0cd22c0eaf3b93998c4cb0fe1f9d8f2fd198afc2e70c237a46921ece9fd9a697f58c869
diff --git a/x11-misc/dmenu/dmenu-4.5-r3.ebuild b/x11-misc/dmenu/dmenu-4.5-r3.ebuild
new file mode 100644
index 000000000000..2b209722c411
--- /dev/null
+++ b/x11-misc/dmenu/dmenu-4.5-r3.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils toolchain-funcs
+
+DESCRIPTION="a generic, highly customizable, and efficient menu for the X Window System"
+HOMEPAGE="http://tools.suckless.org/dmenu/"
+SRC_URI="http://dl.suckless.org/tools/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 hppa ppc ppc64 x86 ~x86-fbsd"
+IUSE="xft xinerama"
+
+RDEPEND="
+	x11-libs/libX11
+	xft? ( x11-libs/libXft )
+	xinerama? ( x11-libs/libXinerama )
+"
+DEPEND="${RDEPEND}
+	xft? ( virtual/pkgconfig )
+	xinerama? ( virtual/pkgconfig )
+"
+
+src_prepare() {
+	# Respect our flags
+	sed -i \
+		-e '/^CFLAGS/{s|=.*|+= -ansi -pedantic -Wall $(INCS) $(CPPFLAGS)|}' \
+		-e '/^LDFLAGS/s|= -s|+=|' \
+		config.mk || die
+	# Make make verbose
+	sed -i \
+		-e 's|^	@|	|g' \
+		-e '/^	echo/d' \
+		Makefile || die
+	use xft && epatch "${FILESDIR}"/${PN}-4.5-xft-2.patch
+
+	epatch_user
+}
+
+src_compile() {
+	emake CC=$(tc-getCC) \
+		"XFTINC=$( $(tc-getPKG_CONFIG) --cflags xft 2>/dev/null )" \
+		"XFTLIBS=$( $(tc-getPKG_CONFIG) --libs xft 2>/dev/null )" \
+		"XINERAMAFLAGS=$(
+			usex xinerama "-DXINERAMA $(
+				$(tc-getPKG_CONFIG) --cflags xinerama 2>/dev/null
+			)" ''
+		)" \
+		"XINERAMALIBS=$(
+			usex xinerama "$( $(tc-getPKG_CONFIG) --libs xinerama 2>/dev/null)" ''
+		)"
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="/usr" install
+}
diff --git a/x11-misc/dmenu/dmenu-4.5-r4.ebuild b/x11-misc/dmenu/dmenu-4.5-r4.ebuild
new file mode 100644
index 000000000000..7844730f9c80
--- /dev/null
+++ b/x11-misc/dmenu/dmenu-4.5-r4.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils toolchain-funcs
+
+DESCRIPTION="a generic, highly customizable, and efficient menu for the X Window System"
+HOMEPAGE="http://tools.suckless.org/dmenu/"
+SRC_URI="http://dl.suckless.org/tools/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="xft xinerama"
+
+RDEPEND="
+	x11-libs/libX11
+	xft? ( x11-libs/libXft )
+	xinerama? ( x11-libs/libXinerama )
+"
+DEPEND="${RDEPEND}
+	xft? ( virtual/pkgconfig )
+	xinerama? ( virtual/pkgconfig )
+"
+
+src_prepare() {
+	# Respect our flags
+	sed -i \
+		-e '/^CFLAGS/{s|=.*|+= -ansi -pedantic -Wall $(INCS) $(CPPFLAGS)|}' \
+		-e '/^LDFLAGS/s|= -s|+=|' \
+		config.mk || die
+	# Make make verbose
+	sed -i \
+		-e 's|^	@|	|g' \
+		-e '/^	echo/d' \
+		Makefile || die
+	use xft && epatch "${FILESDIR}"/${PN}-4.5-xft-3.patch
+
+	epatch_user
+}
+
+src_compile() {
+	emake CC=$(tc-getCC) \
+		"XFTINC=$( $(tc-getPKG_CONFIG) --cflags xft 2>/dev/null )" \
+		"XFTLIBS=$( $(tc-getPKG_CONFIG) --libs xft 2>/dev/null )" \
+		"XINERAMAFLAGS=$(
+			usex xinerama "-DXINERAMA $(
+				$(tc-getPKG_CONFIG) --cflags xinerama 2>/dev/null
+			)" ''
+		)" \
+		"XINERAMALIBS=$(
+			usex xinerama "$( $(tc-getPKG_CONFIG) --libs xinerama 2>/dev/null)" ''
+		)"
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="/usr" install
+}
diff --git a/x11-misc/dmenu/dmenu-9999.ebuild b/x11-misc/dmenu/dmenu-9999.ebuild
new file mode 100644
index 000000000000..fcb7bf49def9
--- /dev/null
+++ b/x11-misc/dmenu/dmenu-9999.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils git-r3 savedconfig toolchain-funcs
+
+DESCRIPTION="a generic, highly customizable, and efficient menu for the X Window System"
+HOMEPAGE="http://tools.suckless.org/dmenu/"
+EGIT_REPO_URI="git://git.suckless.org/dmenu"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS=""
+IUSE="xinerama"
+
+RDEPEND="
+	x11-libs/libX11
+	xinerama? ( x11-libs/libXinerama )
+"
+DEPEND="${RDEPEND}
+	xinerama? ( virtual/pkgconfig )
+"
+
+src_prepare() {
+	# Respect our flags
+	sed -i \
+		-e '/^CFLAGS/{s|=.*|+= -ansi -pedantic -Wall $(INCS) $(CPPFLAGS)|}' \
+		-e '/^LDFLAGS/s|= -s|+=|' \
+		config.mk || die
+	# Make make verbose
+	sed -i \
+		-e 's|^	@|	|g' \
+		-e '/^	echo/d' \
+		Makefile || die
+
+	restore_config config.def.h
+	epatch_user
+}
+
+src_configure() {
+	tc-export PKG_CONFIG
+}
+
+src_compile() {
+	emake \
+		CC=$(tc-getCC) \
+		"XINERAMAFLAGS=$(
+			usex xinerama "-DXINERAMA $(
+				${PKG_CONFIG} --cflags xinerama 2>/dev/null
+			)" ''
+		)" \
+		"XINERAMALIBS=$(
+			usex xinerama "$(
+				${PKG_CONFIG} --libs xinerama 2>/dev/null
+			)" ''
+		)"
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="/usr" install
+
+	save_config config.def.h
+}
diff --git a/x11-misc/dmenu/files/dmenu-4.5-xft-2.patch b/x11-misc/dmenu/files/dmenu-4.5-xft-2.patch
new file mode 100644
index 000000000000..4e3f32c6aabb
--- /dev/null
+++ b/x11-misc/dmenu/files/dmenu-4.5-xft-2.patch
@@ -0,0 +1,410 @@
+--- a/config.mk
++++ b/config.mk
+@@ -12,9 +12,13 @@
+ XINERAMALIBS  = -lXinerama
+ XINERAMAFLAGS = -DXINERAMA
+ 
++# Xft, comment if you don't want it
++XFTINC = $(shell pkg-config --cflags xft)
++XFTLIBS = $(shell pkg-config --libs xft)
++
+ # includes and libs
+-INCS = -I${X11INC}
+-LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS}
++INCS = -I${X11INC} ${XFTINC}
++LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${XFTLIBS}
+ 
+ # flags
+ CPPFLAGS = -D_BSD_SOURCE -D_POSIX_C_SOURCE=2 -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
+--- a/dmenu.1
++++ b/dmenu.1
+@@ -53,7 +53,7 @@
+ defines the prompt to be displayed to the left of the input field.
+ .TP
+ .BI \-fn " font"
+-defines the font or font set used.
++defines the font or font set used. eg. "fixed" or "Monospace-12:normal" (an xft font)
+ .TP
+ .BI \-nb " color"
+ defines the normal background color.
+--- a/dmenu.c
++++ b/dmenu.c
+@@ -17,6 +17,7 @@
+                              * MAX(0, MIN((y)+(h),(r).y_org+(r).height) - MAX((y),(r).y_org)))
+ #define MIN(a,b)              ((a) < (b) ? (a) : (b))
+ #define MAX(a,b)              ((a) > (b) ? (a) : (b))
++#define DEFFONT "fixed" /* xft example: "Monospace-11" */
+ 
+ typedef struct Item Item;
+ struct Item {
+@@ -26,6 +27,7 @@
+ 
+ static void appenditem(Item *item, Item **list, Item **last);
+ static void calcoffsets(void);
++static void cleanup(void);
+ static char *cistrstr(const char *s, const char *sub);
+ static void drawmenu(void);
+ static void grabkeyboard(void);
+@@ -50,10 +52,12 @@
+ static const char *selbgcolor  = "#005577";
+ static const char *selfgcolor  = "#eeeeee";
+ static unsigned int lines = 0;
+-static unsigned long normcol[ColLast];
+-static unsigned long selcol[ColLast];
++static ColorSet *normcol;
++static ColorSet *selcol;
+ static Atom clip, utf8;
+ static Bool topbar = True;
++static Bool running = True;
++static int ret = 0;
+ static DC *dc;
+ static Item *items = NULL;
+ static Item *matches, *matchend;
+@@ -104,7 +108,9 @@
+ 			usage();
+ 
+ 	dc = initdc();
+-	initfont(dc, font);
++	initfont(dc, font ? font : DEFFONT);
++	normcol = initcolor(dc, normfgcolor, normbgcolor);
++	selcol = initcolor(dc, selfgcolor, selbgcolor);
+ 
+ 	if(fast) {
+ 		grabkeyboard();
+@@ -117,7 +123,8 @@
+ 	setup();
+ 	run();
+ 
+-	return 1; /* unreachable */
++	cleanup();
++	return ret;
+ }
+ 
+ void
+@@ -160,6 +167,15 @@
+ }
+ 
+ void
++cleanup(void) {
++    freecol(dc, normcol);
++    freecol(dc, selcol);
++    XDestroyWindow(dc->dpy, win);
++    XUngrabKeyboard(dc->dpy, CurrentTime);
++    freedc(dc);
++}
++
++void
+ drawmenu(void) {
+ 	int curpos;
+ 	Item *item;
+@@ -167,7 +183,7 @@
+ 	dc->x = 0;
+ 	dc->y = 0;
+ 	dc->h = bh;
+-	drawrect(dc, 0, 0, mw, mh, True, BG(dc, normcol));
++	drawrect(dc, 0, 0, mw, mh, True, normcol->BG);
+ 
+ 	if(prompt) {
+ 		dc->w = promptw;
+@@ -178,7 +194,7 @@
+ 	dc->w = (lines > 0 || !matches) ? mw - dc->x : inputw;
+ 	drawtext(dc, text, normcol);
+ 	if((curpos = textnw(dc, text, cursor) + dc->h/2 - 2) < dc->w)
+-		drawrect(dc, curpos, 2, 1, dc->h - 4, True, FG(dc, normcol));
++		drawrect(dc, curpos, 2, 1, dc->h - 4, True, normcol->FG);
+ 
+ 	if(lines > 0) {
+ 		/* draw vertical list */
+@@ -321,7 +337,8 @@
+ 		sel = matchend;
+ 		break;
+ 	case XK_Escape:
+-		exit(EXIT_FAILURE);
++        ret = EXIT_FAILURE;
++        running = False;
+ 	case XK_Home:
+ 		if(sel == matches) {
+ 			cursor = 0;
+@@ -359,7 +376,8 @@
+ 	case XK_Return:
+ 	case XK_KP_Enter:
+ 		puts((sel && !(ev->state & ShiftMask)) ? sel->text : text);
+-		exit(EXIT_SUCCESS);
++		ret = EXIT_SUCCESS;
++		running = False;
+ 	case XK_Right:
+ 		if(text[cursor] != '\0') {
+ 			cursor = nextrune(+1);
+@@ -490,7 +508,7 @@
+ run(void) {
+ 	XEvent ev;
+ 
+-	while(!XNextEvent(dc->dpy, &ev)) {
++	while(running && !XNextEvent(dc->dpy, &ev)) {
+ 		if(XFilterEvent(&ev, win))
+ 			continue;
+ 		switch(ev.type) {
+@@ -524,11 +542,6 @@
+ 	XineramaScreenInfo *info;
+ #endif
+ 
+-	normcol[ColBG] = getcolor(dc, normbgcolor);
+-	normcol[ColFG] = getcolor(dc, normfgcolor);
+-	selcol[ColBG]  = getcolor(dc, selbgcolor);
+-	selcol[ColFG]  = getcolor(dc, selfgcolor);
+-
+ 	clip = XInternAtom(dc->dpy, "CLIPBOARD",   False);
+ 	utf8 = XInternAtom(dc->dpy, "UTF8_STRING", False);
+ 
+@@ -582,7 +595,7 @@
+ 
+ 	/* create menu window */
+ 	swa.override_redirect = True;
+-	swa.background_pixel = normcol[ColBG];
++	swa.background_pixel = normcol->BG;
+ 	swa.event_mask = ExposureMask | KeyPressMask | VisibilityChangeMask;
+ 	win = XCreateWindow(dc->dpy, root, x, y, mw, mh, 0,
+ 	                    DefaultDepth(dc->dpy, screen), CopyFromParent,
+--- a/draw.c
++++ b/draw.c
+@@ -9,9 +9,6 @@
+ 
+ #define MAX(a, b)  ((a) > (b) ? (a) : (b))
+ #define MIN(a, b)  ((a) < (b) ? (a) : (b))
+-#define DEFAULTFN  "fixed"
+-
+-static Bool loadfont(DC *dc, const char *fontstr);
+ 
+ void
+ drawrect(DC *dc, int x, int y, unsigned int w, unsigned int h, Bool fill, unsigned long color) {
+@@ -23,7 +20,7 @@
+ }
+ 
+ void
+-drawtext(DC *dc, const char *text, unsigned long col[ColLast]) {
++drawtext(DC *dc, const char *text, ColorSet *col) {
+ 	char buf[BUFSIZ];
+ 	size_t mn, n = strlen(text);
+ 
+@@ -35,19 +32,24 @@
+ 	if(mn < n)
+ 		for(n = MAX(mn-3, 0); n < mn; buf[n++] = '.');
+ 
+-	drawrect(dc, 0, 0, dc->w, dc->h, True, BG(dc, col));
++	drawrect(dc, 0, 0, dc->w, dc->h, True, col->BG);
+ 	drawtextn(dc, buf, mn, col);
+ }
+ 
+ void
+-drawtextn(DC *dc, const char *text, size_t n, unsigned long col[ColLast]) {
++drawtextn(DC *dc, const char *text, size_t n, ColorSet *col) {
+ 	int x = dc->x + dc->font.height/2;
+ 	int y = dc->y + dc->font.ascent+1;
+ 
+-	XSetForeground(dc->dpy, dc->gc, FG(dc, col));
+-	if(dc->font.set)
++	XSetForeground(dc->dpy, dc->gc, col->FG);
++	if(dc->font.xft_font) {
++		if (!dc->xftdraw)
++			eprintf("error, xft drawable does not exist");
++		XftDrawStringUtf8(dc->xftdraw, &col->FG_xft,
++			dc->font.xft_font, x, y, (unsigned char*)text, n);
++	} else if(dc->font.set) {
+ 		XmbDrawString(dc->dpy, dc->canvas, dc->font.set, dc->gc, x, y, text, n);
+-	else {
++	} else {
+ 		XSetFont(dc->dpy, dc->gc, dc->font.xfont->fid);
+ 		XDrawString(dc->dpy, dc->canvas, dc->gc, x, y, text, n);
+ 	}
+@@ -69,16 +71,33 @@
+ }
+ 
+ void
++freecol(DC *dc, ColorSet *col) {
++    if(col) {
++        if(&col->FG_xft)
++            XftColorFree(dc->dpy, DefaultVisual(dc->dpy, DefaultScreen(dc->dpy)),
++                DefaultColormap(dc->dpy, DefaultScreen(dc->dpy)), &col->FG_xft);
++        free(col); 
++    }
++}
++
++void
+ freedc(DC *dc) {
++    if(dc->font.xft_font) {
++        XftFontClose(dc->dpy, dc->font.xft_font);
++        XftDrawDestroy(dc->xftdraw);
++    }
+ 	if(dc->font.set)
+ 		XFreeFontSet(dc->dpy, dc->font.set);
+-	if(dc->font.xfont)
++    if(dc->font.xfont)
+ 		XFreeFont(dc->dpy, dc->font.xfont);
+-	if(dc->canvas)
++    if(dc->canvas)
+ 		XFreePixmap(dc->dpy, dc->canvas);
+-	XFreeGC(dc->dpy, dc->gc);
+-	XCloseDisplay(dc->dpy);
+-	free(dc);
++	if(dc->gc)
++        XFreeGC(dc->dpy, dc->gc);
++	if(dc->dpy)
++        XCloseDisplay(dc->dpy);
++	if(dc)
++        free(dc);
+ }
+ 
+ unsigned long
+@@ -91,6 +110,20 @@
+ 	return color.pixel;
+ }
+ 
++ColorSet *
++initcolor(DC *dc, const char * foreground, const char * background) {
++	ColorSet * col = (ColorSet *)malloc(sizeof(ColorSet));
++	if(!col)
++		eprintf("error, cannot allocate memory for color set");
++	col->BG = getcolor(dc, background);
++	col->FG = getcolor(dc, foreground);
++	if(dc->font.xft_font)
++		if(!XftColorAllocName(dc->dpy, DefaultVisual(dc->dpy, DefaultScreen(dc->dpy)),
++			DefaultColormap(dc->dpy, DefaultScreen(dc->dpy)), foreground, &col->FG_xft))
++			eprintf("error, cannot allocate xft font color '%s'\n", foreground);
++	return col;
++}
++
+ DC *
+ initdc(void) {
+ 	DC *dc;
+@@ -109,23 +142,11 @@
+ 
+ void
+ initfont(DC *dc, const char *fontstr) {
+-	if(!loadfont(dc, fontstr ? fontstr : DEFAULTFN)) {
+-		if(fontstr != NULL)
+-			fprintf(stderr, "cannot load font '%s'\n", fontstr);
+-		if(fontstr == NULL || !loadfont(dc, DEFAULTFN))
+-			eprintf("cannot load font '%s'\n", DEFAULTFN);
+-	}
+-	dc->font.height = dc->font.ascent + dc->font.descent;
+-}
+-
+-Bool
+-loadfont(DC *dc, const char *fontstr) {
+ 	char *def, **missing, **names;
+ 	int i, n;
+ 	XFontStruct **xfonts;
+ 
+-	if(!*fontstr)
+-		return False;
++	missing = NULL;
+ 	if((dc->font.set = XCreateFontSet(dc->dpy, fontstr, &missing, &n, &def))) {
+ 		n = XFontsOfFontSet(dc->font.set, &xfonts, &names);
+ 		for(i = 0; i < n; i++) {
+@@ -133,15 +154,21 @@
+ 			dc->font.descent = MAX(dc->font.descent, xfonts[i]->descent);
+ 			dc->font.width   = MAX(dc->font.width,   xfonts[i]->max_bounds.width);
+ 		}
+-	}
+-	else if((dc->font.xfont = XLoadQueryFont(dc->dpy, fontstr))) {
+-		dc->font.ascent  = dc->font.xfont->ascent;
++    } else if((dc->font.xfont = XLoadQueryFont(dc->dpy, fontstr))) {
++		dc->font.ascent = dc->font.xfont->ascent;
+ 		dc->font.descent = dc->font.xfont->descent;
+ 		dc->font.width   = dc->font.xfont->max_bounds.width;
++	} else if((dc->font.xft_font = XftFontOpenName(dc->dpy, DefaultScreen(dc->dpy), fontstr))) {
++		dc->font.ascent = dc->font.xft_font->ascent;
++		dc->font.descent = dc->font.xft_font->descent;
++		dc->font.width = dc->font.xft_font->max_advance_width;
++	} else {
++		eprintf("cannot load font '%s'\n", fontstr);
+ 	}
+ 	if(missing)
+ 		XFreeStringList(missing);
+-	return dc->font.set || dc->font.xfont;
++	dc->font.height = dc->font.ascent + dc->font.descent;
++	return;
+ }
+ 
+ void
+@@ -151,20 +178,29 @@
+ 
+ void
+ resizedc(DC *dc, unsigned int w, unsigned int h) {
++	int screen = DefaultScreen(dc->dpy);
+ 	if(dc->canvas)
+ 		XFreePixmap(dc->dpy, dc->canvas);
+ 
+ 	dc->w = w;
+ 	dc->h = h;
+ 	dc->canvas = XCreatePixmap(dc->dpy, DefaultRootWindow(dc->dpy), w, h,
+-	                           DefaultDepth(dc->dpy, DefaultScreen(dc->dpy)));
++	                           DefaultDepth(dc->dpy, screen));
++	if(dc->font.xft_font && !(dc->xftdraw)) {
++		dc->xftdraw = XftDrawCreate(dc->dpy, dc->canvas, DefaultVisual(dc->dpy,screen), DefaultColormap(dc->dpy,screen));
++		if(!(dc->xftdraw))
++			eprintf("error, cannot create xft drawable\n");
++	}
+ }
+ 
+ int
+ textnw(DC *dc, const char *text, size_t len) {
+-	if(dc->font.set) {
++	if(dc->font.xft_font) {
++		XGlyphInfo gi;
++		XftTextExtentsUtf8(dc->dpy, dc->font.xft_font, (const FcChar8*)text, len, &gi);
++		return gi.width;
++	} else if(dc->font.set) {
+ 		XRectangle r;
+-
+ 		XmbTextExtents(dc->font.set, text, len, NULL, &r);
+ 		return r.width;
+ 	}
+--- a/draw.h
++++ b/draw.h
+@@ -1,9 +1,6 @@
+ /* See LICENSE file for copyright and license details. */
+ 
+-#define FG(dc, col)  ((col)[(dc)->invert ? ColBG : ColFG])
+-#define BG(dc, col)  ((col)[(dc)->invert ? ColFG : ColBG])
+-
+-enum { ColBG, ColFG, ColBorder, ColLast };
++#include <X11/Xft/Xft.h>
+ 
+ typedef struct {
+ 	int x, y, w, h;
+@@ -11,6 +8,7 @@
+ 	Display *dpy;
+ 	GC gc;
+ 	Pixmap canvas;
++	XftDraw *xftdraw;
+ 	struct {
+ 		int ascent;
+ 		int descent;
+@@ -18,15 +16,24 @@
+ 		int width;
+ 		XFontSet set;
+ 		XFontStruct *xfont;
++		XftFont *xft_font;
+ 	} font;
+ } DC;  /* draw context */
+ 
++typedef struct {
++	unsigned long FG;
++	XftColor FG_xft;
++	unsigned long BG;
++} ColorSet;
++
+ void drawrect(DC *dc, int x, int y, unsigned int w, unsigned int h, Bool fill, unsigned long color);
+-void drawtext(DC *dc, const char *text, unsigned long col[ColLast]);
+-void drawtextn(DC *dc, const char *text, size_t n, unsigned long col[ColLast]);
++void drawtext(DC *dc, const char *text, ColorSet *col);
++void drawtextn(DC *dc, const char *text, size_t n, ColorSet *col);
++void freecol(DC *dc, ColorSet *col);
+ void eprintf(const char *fmt, ...);
+ void freedc(DC *dc);
+ unsigned long getcolor(DC *dc, const char *colstr);
++ColorSet *initcolor(DC *dc, const char *foreground, const char *background);
+ DC *initdc(void);
+ void initfont(DC *dc, const char *fontstr);
+ void mapdc(DC *dc, Window win, unsigned int w, unsigned int h);
diff --git a/x11-misc/dmenu/files/dmenu-4.5-xft-3.patch b/x11-misc/dmenu/files/dmenu-4.5-xft-3.patch
new file mode 100644
index 000000000000..e97629a69871
--- /dev/null
+++ b/x11-misc/dmenu/files/dmenu-4.5-xft-3.patch
@@ -0,0 +1,412 @@
+--- a/config.mk
++++ b/config.mk
+@@ -12,9 +12,13 @@
+ XINERAMALIBS  = -lXinerama
+ XINERAMAFLAGS = -DXINERAMA
+ 
++# Xft, comment if you don't want it
++XFTINC = $(shell pkg-config --cflags xft)
++XFTLIBS = $(shell pkg-config --libs xft)
++
+ # includes and libs
+-INCS = -I${X11INC}
+-LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS}
++INCS = -I${X11INC} ${XFTINC}
++LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${XFTLIBS}
+ 
+ # flags
+ CPPFLAGS = -D_BSD_SOURCE -D_POSIX_C_SOURCE=2 -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
+--- a/dmenu.1
++++ b/dmenu.1
+@@ -53,7 +53,7 @@
+ defines the prompt to be displayed to the left of the input field.
+ .TP
+ .BI \-fn " font"
+-defines the font or font set used.
++defines the font or font set used. eg. "fixed" or "Monospace-12:normal" (an xft font)
+ .TP
+ .BI \-nb " color"
+ defines the normal background color.
+--- a/dmenu.c
++++ b/dmenu.c
+@@ -17,6 +17,7 @@
+                              * MAX(0, MIN((y)+(h),(r).y_org+(r).height) - MAX((y),(r).y_org)))
+ #define MIN(a,b)              ((a) < (b) ? (a) : (b))
+ #define MAX(a,b)              ((a) > (b) ? (a) : (b))
++#define DEFFONT "fixed" /* xft example: "Monospace-11" */
+ 
+ typedef struct Item Item;
+ struct Item {
+@@ -26,6 +27,7 @@
+ 
+ static void appenditem(Item *item, Item **list, Item **last);
+ static void calcoffsets(void);
++static void cleanup(void);
+ static char *cistrstr(const char *s, const char *sub);
+ static void drawmenu(void);
+ static void grabkeyboard(void);
+@@ -50,10 +52,12 @@
+ static const char *selbgcolor  = "#005577";
+ static const char *selfgcolor  = "#eeeeee";
+ static unsigned int lines = 0;
+-static unsigned long normcol[ColLast];
+-static unsigned long selcol[ColLast];
++static ColorSet *normcol;
++static ColorSet *selcol;
+ static Atom clip, utf8;
+ static Bool topbar = True;
++static Bool running = True;
++static int ret = 0;
+ static DC *dc;
+ static Item *items = NULL;
+ static Item *matches, *matchend;
+@@ -104,7 +108,9 @@
+ 			usage();
+ 
+ 	dc = initdc();
+-	initfont(dc, font);
++	initfont(dc, font ? font : DEFFONT);
++	normcol = initcolor(dc, normfgcolor, normbgcolor);
++	selcol = initcolor(dc, selfgcolor, selbgcolor);
+ 
+ 	if(fast) {
+ 		grabkeyboard();
+@@ -117,7 +123,8 @@
+ 	setup();
+ 	run();
+ 
+-	return 1; /* unreachable */
++	cleanup();
++	return ret;
+ }
+ 
+ void
+@@ -160,6 +167,15 @@
+ }
+ 
+ void
++cleanup(void) {
++    freecol(dc, normcol);
++    freecol(dc, selcol);
++    XDestroyWindow(dc->dpy, win);
++    XUngrabKeyboard(dc->dpy, CurrentTime);
++    freedc(dc);
++}
++
++void
+ drawmenu(void) {
+ 	int curpos;
+ 	Item *item;
+@@ -167,7 +183,7 @@
+ 	dc->x = 0;
+ 	dc->y = 0;
+ 	dc->h = bh;
+-	drawrect(dc, 0, 0, mw, mh, True, BG(dc, normcol));
++	drawrect(dc, 0, 0, mw, mh, True, normcol->BG);
+ 
+ 	if(prompt) {
+ 		dc->w = promptw;
+@@ -178,7 +194,7 @@
+ 	dc->w = (lines > 0 || !matches) ? mw - dc->x : inputw;
+ 	drawtext(dc, text, normcol);
+ 	if((curpos = textnw(dc, text, cursor) + dc->h/2 - 2) < dc->w)
+-		drawrect(dc, curpos, 2, 1, dc->h - 4, True, FG(dc, normcol));
++		drawrect(dc, curpos, 2, 1, dc->h - 4, True, normcol->FG);
+ 
+ 	if(lines > 0) {
+ 		/* draw vertical list */
+@@ -321,7 +337,9 @@
+ 		sel = matchend;
+ 		break;
+ 	case XK_Escape:
+-		exit(EXIT_FAILURE);
++		ret = EXIT_FAILURE;
++		running = False;
++		break;
+ 	case XK_Home:
+ 		if(sel == matches) {
+ 			cursor = 0;
+@@ -359,7 +377,9 @@
+ 	case XK_Return:
+ 	case XK_KP_Enter:
+ 		puts((sel && !(ev->state & ShiftMask)) ? sel->text : text);
+-		exit(EXIT_SUCCESS);
++		ret = EXIT_SUCCESS;
++		running = False;
++		break;
+ 	case XK_Right:
+ 		if(text[cursor] != '\0') {
+ 			cursor = nextrune(+1);
+@@ -490,7 +510,7 @@
+ run(void) {
+ 	XEvent ev;
+ 
+-	while(!XNextEvent(dc->dpy, &ev)) {
++	while(running && !XNextEvent(dc->dpy, &ev)) {
+ 		if(XFilterEvent(&ev, win))
+ 			continue;
+ 		switch(ev.type) {
+@@ -524,11 +544,6 @@
+ 	XineramaScreenInfo *info;
+ #endif
+ 
+-	normcol[ColBG] = getcolor(dc, normbgcolor);
+-	normcol[ColFG] = getcolor(dc, normfgcolor);
+-	selcol[ColBG]  = getcolor(dc, selbgcolor);
+-	selcol[ColFG]  = getcolor(dc, selfgcolor);
+-
+ 	clip = XInternAtom(dc->dpy, "CLIPBOARD",   False);
+ 	utf8 = XInternAtom(dc->dpy, "UTF8_STRING", False);
+ 
+@@ -582,7 +597,7 @@
+ 
+ 	/* create menu window */
+ 	swa.override_redirect = True;
+-	swa.background_pixel = normcol[ColBG];
++	swa.background_pixel = normcol->BG;
+ 	swa.event_mask = ExposureMask | KeyPressMask | VisibilityChangeMask;
+ 	win = XCreateWindow(dc->dpy, root, x, y, mw, mh, 0,
+ 	                    DefaultDepth(dc->dpy, screen), CopyFromParent,
+--- a/draw.c
++++ b/draw.c
+@@ -9,9 +9,6 @@
+ 
+ #define MAX(a, b)  ((a) > (b) ? (a) : (b))
+ #define MIN(a, b)  ((a) < (b) ? (a) : (b))
+-#define DEFAULTFN  "fixed"
+-
+-static Bool loadfont(DC *dc, const char *fontstr);
+ 
+ void
+ drawrect(DC *dc, int x, int y, unsigned int w, unsigned int h, Bool fill, unsigned long color) {
+@@ -23,7 +20,7 @@
+ }
+ 
+ void
+-drawtext(DC *dc, const char *text, unsigned long col[ColLast]) {
++drawtext(DC *dc, const char *text, ColorSet *col) {
+ 	char buf[BUFSIZ];
+ 	size_t mn, n = strlen(text);
+ 
+@@ -35,19 +32,24 @@
+ 	if(mn < n)
+ 		for(n = MAX(mn-3, 0); n < mn; buf[n++] = '.');
+ 
+-	drawrect(dc, 0, 0, dc->w, dc->h, True, BG(dc, col));
++	drawrect(dc, 0, 0, dc->w, dc->h, True, col->BG);
+ 	drawtextn(dc, buf, mn, col);
+ }
+ 
+ void
+-drawtextn(DC *dc, const char *text, size_t n, unsigned long col[ColLast]) {
++drawtextn(DC *dc, const char *text, size_t n, ColorSet *col) {
+ 	int x = dc->x + dc->font.height/2;
+ 	int y = dc->y + dc->font.ascent+1;
+ 
+-	XSetForeground(dc->dpy, dc->gc, FG(dc, col));
+-	if(dc->font.set)
++	XSetForeground(dc->dpy, dc->gc, col->FG);
++	if(dc->font.xft_font) {
++		if (!dc->xftdraw)
++			eprintf("error, xft drawable does not exist");
++		XftDrawStringUtf8(dc->xftdraw, &col->FG_xft,
++			dc->font.xft_font, x, y, (unsigned char*)text, n);
++	} else if(dc->font.set) {
+ 		XmbDrawString(dc->dpy, dc->canvas, dc->font.set, dc->gc, x, y, text, n);
+-	else {
++	} else {
+ 		XSetFont(dc->dpy, dc->gc, dc->font.xfont->fid);
+ 		XDrawString(dc->dpy, dc->canvas, dc->gc, x, y, text, n);
+ 	}
+@@ -69,16 +71,33 @@
+ }
+ 
+ void
++freecol(DC *dc, ColorSet *col) {
++    if(col) {
++        if(&col->FG_xft)
++            XftColorFree(dc->dpy, DefaultVisual(dc->dpy, DefaultScreen(dc->dpy)),
++                DefaultColormap(dc->dpy, DefaultScreen(dc->dpy)), &col->FG_xft);
++        free(col); 
++    }
++}
++
++void
+ freedc(DC *dc) {
++    if(dc->font.xft_font) {
++        XftFontClose(dc->dpy, dc->font.xft_font);
++        XftDrawDestroy(dc->xftdraw);
++    }
+ 	if(dc->font.set)
+ 		XFreeFontSet(dc->dpy, dc->font.set);
+-	if(dc->font.xfont)
++    if(dc->font.xfont)
+ 		XFreeFont(dc->dpy, dc->font.xfont);
+-	if(dc->canvas)
++    if(dc->canvas)
+ 		XFreePixmap(dc->dpy, dc->canvas);
+-	XFreeGC(dc->dpy, dc->gc);
+-	XCloseDisplay(dc->dpy);
+-	free(dc);
++	if(dc->gc)
++        XFreeGC(dc->dpy, dc->gc);
++	if(dc->dpy)
++        XCloseDisplay(dc->dpy);
++	if(dc)
++        free(dc);
+ }
+ 
+ unsigned long
+@@ -91,6 +110,20 @@
+ 	return color.pixel;
+ }
+ 
++ColorSet *
++initcolor(DC *dc, const char * foreground, const char * background) {
++	ColorSet * col = (ColorSet *)malloc(sizeof(ColorSet));
++	if(!col)
++		eprintf("error, cannot allocate memory for color set");
++	col->BG = getcolor(dc, background);
++	col->FG = getcolor(dc, foreground);
++	if(dc->font.xft_font)
++		if(!XftColorAllocName(dc->dpy, DefaultVisual(dc->dpy, DefaultScreen(dc->dpy)),
++			DefaultColormap(dc->dpy, DefaultScreen(dc->dpy)), foreground, &col->FG_xft))
++			eprintf("error, cannot allocate xft font color '%s'\n", foreground);
++	return col;
++}
++
+ DC *
+ initdc(void) {
+ 	DC *dc;
+@@ -109,23 +142,11 @@
+ 
+ void
+ initfont(DC *dc, const char *fontstr) {
+-	if(!loadfont(dc, fontstr ? fontstr : DEFAULTFN)) {
+-		if(fontstr != NULL)
+-			fprintf(stderr, "cannot load font '%s'\n", fontstr);
+-		if(fontstr == NULL || !loadfont(dc, DEFAULTFN))
+-			eprintf("cannot load font '%s'\n", DEFAULTFN);
+-	}
+-	dc->font.height = dc->font.ascent + dc->font.descent;
+-}
+-
+-Bool
+-loadfont(DC *dc, const char *fontstr) {
+ 	char *def, **missing, **names;
+ 	int i, n;
+ 	XFontStruct **xfonts;
+ 
+-	if(!*fontstr)
+-		return False;
++	missing = NULL;
+ 	if((dc->font.set = XCreateFontSet(dc->dpy, fontstr, &missing, &n, &def))) {
+ 		n = XFontsOfFontSet(dc->font.set, &xfonts, &names);
+ 		for(i = 0; i < n; i++) {
+@@ -133,15 +154,21 @@
+ 			dc->font.descent = MAX(dc->font.descent, xfonts[i]->descent);
+ 			dc->font.width   = MAX(dc->font.width,   xfonts[i]->max_bounds.width);
+ 		}
+-	}
+-	else if((dc->font.xfont = XLoadQueryFont(dc->dpy, fontstr))) {
+-		dc->font.ascent  = dc->font.xfont->ascent;
++    } else if((dc->font.xfont = XLoadQueryFont(dc->dpy, fontstr))) {
++		dc->font.ascent = dc->font.xfont->ascent;
+ 		dc->font.descent = dc->font.xfont->descent;
+ 		dc->font.width   = dc->font.xfont->max_bounds.width;
++	} else if((dc->font.xft_font = XftFontOpenName(dc->dpy, DefaultScreen(dc->dpy), fontstr))) {
++		dc->font.ascent = dc->font.xft_font->ascent;
++		dc->font.descent = dc->font.xft_font->descent;
++		dc->font.width = dc->font.xft_font->max_advance_width;
++	} else {
++		eprintf("cannot load font '%s'\n", fontstr);
+ 	}
+ 	if(missing)
+ 		XFreeStringList(missing);
+-	return dc->font.set || dc->font.xfont;
++	dc->font.height = dc->font.ascent + dc->font.descent;
++	return;
+ }
+ 
+ void
+@@ -151,20 +178,29 @@
+ 
+ void
+ resizedc(DC *dc, unsigned int w, unsigned int h) {
++	int screen = DefaultScreen(dc->dpy);
+ 	if(dc->canvas)
+ 		XFreePixmap(dc->dpy, dc->canvas);
+ 
+ 	dc->w = w;
+ 	dc->h = h;
+ 	dc->canvas = XCreatePixmap(dc->dpy, DefaultRootWindow(dc->dpy), w, h,
+-	                           DefaultDepth(dc->dpy, DefaultScreen(dc->dpy)));
++	                           DefaultDepth(dc->dpy, screen));
++	if(dc->font.xft_font && !(dc->xftdraw)) {
++		dc->xftdraw = XftDrawCreate(dc->dpy, dc->canvas, DefaultVisual(dc->dpy,screen), DefaultColormap(dc->dpy,screen));
++		if(!(dc->xftdraw))
++			eprintf("error, cannot create xft drawable\n");
++	}
+ }
+ 
+ int
+ textnw(DC *dc, const char *text, size_t len) {
+-	if(dc->font.set) {
++	if(dc->font.xft_font) {
++		XGlyphInfo gi;
++		XftTextExtentsUtf8(dc->dpy, dc->font.xft_font, (const FcChar8*)text, len, &gi);
++		return gi.width;
++	} else if(dc->font.set) {
+ 		XRectangle r;
+-
+ 		XmbTextExtents(dc->font.set, text, len, NULL, &r);
+ 		return r.width;
+ 	}
+--- a/draw.h
++++ b/draw.h
+@@ -1,9 +1,6 @@
+ /* See LICENSE file for copyright and license details. */
+ 
+-#define FG(dc, col)  ((col)[(dc)->invert ? ColBG : ColFG])
+-#define BG(dc, col)  ((col)[(dc)->invert ? ColFG : ColBG])
+-
+-enum { ColBG, ColFG, ColBorder, ColLast };
++#include <X11/Xft/Xft.h>
+ 
+ typedef struct {
+ 	int x, y, w, h;
+@@ -11,6 +8,7 @@
+ 	Display *dpy;
+ 	GC gc;
+ 	Pixmap canvas;
++	XftDraw *xftdraw;
+ 	struct {
+ 		int ascent;
+ 		int descent;
+@@ -18,15 +16,24 @@
+ 		int width;
+ 		XFontSet set;
+ 		XFontStruct *xfont;
++		XftFont *xft_font;
+ 	} font;
+ } DC;  /* draw context */
+ 
++typedef struct {
++	unsigned long FG;
++	XftColor FG_xft;
++	unsigned long BG;
++} ColorSet;
++
+ void drawrect(DC *dc, int x, int y, unsigned int w, unsigned int h, Bool fill, unsigned long color);
+-void drawtext(DC *dc, const char *text, unsigned long col[ColLast]);
+-void drawtextn(DC *dc, const char *text, size_t n, unsigned long col[ColLast]);
++void drawtext(DC *dc, const char *text, ColorSet *col);
++void drawtextn(DC *dc, const char *text, size_t n, ColorSet *col);
++void freecol(DC *dc, ColorSet *col);
+ void eprintf(const char *fmt, ...);
+ void freedc(DC *dc);
+ unsigned long getcolor(DC *dc, const char *colstr);
++ColorSet *initcolor(DC *dc, const char *foreground, const char *background);
+ DC *initdc(void);
+ void initfont(DC *dc, const char *fontstr);
+ void mapdc(DC *dc, Window win, unsigned int w, unsigned int h);
diff --git a/x11-misc/dmenu/metadata.xml b/x11-misc/dmenu/metadata.xml
new file mode 100644
index 000000000000..9c37c491d29b
--- /dev/null
+++ b/x11-misc/dmenu/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>desktop-misc</herd>
+  <maintainer>
+    <email>jer@gentoo.org</email>
+  </maintainer>
+  <use>
+  <flag name="xft">Enable unofficial <pkg>x11-libs/libXft</pkg> support</flag>
+  </use>
+</pkgmetadata>
diff --git a/x11-misc/dockmanager/Manifest b/x11-misc/dockmanager/Manifest
new file mode 100644
index 000000000000..ffb01b590ed6
--- /dev/null
+++ b/x11-misc/dockmanager/Manifest
@@ -0,0 +1 @@
+DIST dockmanager-0.1.0.tar.gz 532346 SHA256 7afbf43f9e1a14b0b7d8f34ae8c017d5ab58bacdf26481082a489c10953e74f3 SHA512 4379e21b5bb42d8a0e58edf02991a4a3f9c8eefc08321cbeb91db45718fdbfe155894e57b46356b07c43e4ce70266357ef84bc4c79280175cc724c9ddb550f4f WHIRLPOOL 670ec892d9ed0759849a258a1017bc58276bb3ca1faec7717e7fc4b4c8d5d1205a0999913d37092540f8029ed9ede08f5b0dfc2514e1d7cf32de805d90aedffd
diff --git a/x11-misc/dockmanager/dockmanager-0.1.0-r1.ebuild b/x11-misc/dockmanager/dockmanager-0.1.0-r1.ebuild
new file mode 100644
index 000000000000..a877f26ad8ca
--- /dev/null
+++ b/x11-misc/dockmanager/dockmanager-0.1.0-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+GCONF_DEBUG="no"
+
+inherit gnome2 python-single-r1 vala
+
+DESCRIPTION="dock-independent helper scripts"
+HOMEPAGE="https://launchpad.net/dockmanager"
+SRC_URI="http://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+IUSE="debug"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-libs/dbus-glib
+	dev-libs/glib:2
+	x11-libs/gtk+:2
+	x11-libs/libdesktop-agnostic
+"
+DEPEND="${RDEPEND}
+	$(vala_depend)
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	rm -f {scripts,metadata}/pidgin_control.* || die
+	sed -i -e "/pidgin_control/d" {scripts,metadata}/Makefile.* || die
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		$(use_enable debug) \
+		$(use_enable !debug release)
+}
diff --git a/x11-misc/dockmanager/metadata.xml b/x11-misc/dockmanager/metadata.xml
new file mode 100644
index 000000000000..f24c2b1e2db9
--- /dev/null
+++ b/x11-misc/dockmanager/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer>
+    <email>angelos@gentoo.org</email>
+    <name>Christoph Mende</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="launchpad">dockmanager</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/x11-misc/dragbox/Manifest b/x11-misc/dragbox/Manifest
new file mode 100644
index 000000000000..28fb3f9a837a
--- /dev/null
+++ b/x11-misc/dragbox/Manifest
@@ -0,0 +1 @@
+DIST dragbox-0.4.0.tar.gz 88019 RMD160 741fdb9cd4e489df6a4d014f44b80469ca2e1181 SHA1 880deea590bb656e4c61360e83001b677546e5e5 SHA256 ba5dc05818cc991b4581e2b3987148043df786a60da1cf88e119d0dd4e4cd77f
diff --git a/x11-misc/dragbox/dragbox-0.4.0.ebuild b/x11-misc/dragbox/dragbox-0.4.0.ebuild
new file mode 100644
index 000000000000..b46f9a054ad1
--- /dev/null
+++ b/x11-misc/dragbox/dragbox-0.4.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+PYTHON_DEPEND="2"
+inherit python
+
+DESCRIPTION="GTK tool for connecting the commandline with the desktop environment"
+HOMEPAGE="http://kaizer.se/wiki/dragbox/"
+SRC_URI="http://kaizer.se/publicfiles/${PN}/${P}.tar.gz"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/pygtk:2
+	gnome-base/libglade:2.0
+	dev-python/gnome-vfs-python:2
+	dev-python/libgnome-python:2
+	dev-python/gconf-python:2
+	sys-apps/dbus
+	x11-libs/gtk+:2"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	python_clean_py-compile_files
+	python_convert_shebangs 2 dragbox
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS ChangeLog NEWS README TODO
+}
+
+pkg_postinst() {
+	python_mod_optimize Dragbox
+}
+
+pkg_postrm() {
+	python_mod_cleanup Dragbox
+}
diff --git a/x11-misc/dragbox/metadata.xml b/x11-misc/dragbox/metadata.xml
new file mode 100644
index 000000000000..92b31095ea4a
--- /dev/null
+++ b/x11-misc/dragbox/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+  <email>maintainer-needed@gentoo.org</email>
+</maintainer>
+<longdescription lang="en">
+</longdescription>
+</pkgmetadata>
diff --git a/x11-misc/driconf/Manifest b/x11-misc/driconf/Manifest
new file mode 100644
index 000000000000..2fc475ee7c3d
--- /dev/null
+++ b/x11-misc/driconf/Manifest
@@ -0,0 +1 @@
+DIST driconf-0.9.1.tar.gz 112529 SHA256 4849a43f6324498e943c03777bce571229b5446985b1cec596b365505e76f73f
diff --git a/x11-misc/driconf/driconf-0.9.1-r1.ebuild b/x11-misc/driconf/driconf-0.9.1-r1.ebuild
new file mode 100644
index 000000000000..300bbc62de7b
--- /dev/null
+++ b/x11-misc/driconf/driconf-0.9.1-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="3"
+PYTHON_DEPEND="2"
+PYTHON_USE_WITH="xml"
+
+inherit distutils eutils
+
+DESCRIPTION="driconf is a GTK+2 GUI configurator for DRI"
+HOMEPAGE="http://dri.freedesktop.org/wiki/DriConf"
+SRC_URI="http://freedesktop.org/~fxkuehl/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 ~sparc x86"
+IUSE=""
+
+RDEPEND=">=x11-libs/gtk+-2.4:2
+	>=dev-python/pygtk-2.4:2
+	x11-apps/xdriinfo"
+DEPEND="${RDEPEND}"
+
+DOCS="CHANGELOG COPYING PKG-INFO README TODO"
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-glxinfo-unicode.patch \
+		"${FILESDIR}"/${P}-update-toolbar-methods.patch \
+		"${FILESDIR}"/${P}-driconf_simpleui.py.patch
+
+	# Fix install locations which breaks location policy - Josh_B
+	sed -i \
+		-e 's-/usr/local-/usr-g' \
+		driconf \
+		driconf.desktop \
+		driconf.py \
+		setup.cfg \
+		setup.py \
+		|| die "Sed failed!"
+}
+
+src_install() {
+	distutils_src_install
+	domenu driconf.desktop
+}
+
+pkg_postinst() {
+	python_mod_optimize /usr/lib/driconf
+}
+
+pkg_postrm() {
+	python_mod_cleanup /usr/lib/driconf
+}
diff --git a/x11-misc/driconf/files/driconf-0.9.1-driconf_simpleui.py.patch b/x11-misc/driconf/files/driconf-0.9.1-driconf_simpleui.py.patch
new file mode 100644
index 000000000000..fb661c819be2
--- /dev/null
+++ b/x11-misc/driconf/files/driconf-0.9.1-driconf_simpleui.py.patch
@@ -0,0 +1,16 @@
+http://cvs.fedoraproject.org/viewvc/rpms/driconf/devel/
+
+--- driconf_simpleui.py
++++ driconf_simpleui.py
+@@ -266,8 +266,8 @@
+                     j = i
+                     break
+                 i = i - 1
+-            if i < chars/3:
+-                i = chars
++            else:
++                i = j = chars
+             head, tail = head + tail[:i] + '\n', tail[j:]
+     return head
+ 
+
diff --git a/x11-misc/driconf/files/driconf-0.9.1-glxinfo-unicode.patch b/x11-misc/driconf/files/driconf-0.9.1-glxinfo-unicode.patch
new file mode 100644
index 000000000000..df4155025255
--- /dev/null
+++ b/x11-misc/driconf/files/driconf-0.9.1-glxinfo-unicode.patch
@@ -0,0 +1,22 @@
+http://cvs.fedoraproject.org/viewvc/rpms/driconf/devel/
+
+--- driconf_simpleui.py
++++ driconf_simpleui.py
+@@ -450,11 +450,13 @@ class MainWindow (gtk.Window):
+         else:
+             screen = self.screens[0]
+             if screen.glxInfo:
+-                text = "%s (%s)" % (
+-                    screen.glxInfo.renderer, screen.glxInfo.vendor)
++                text = u"%s (%s)" % (
++                    unicode(screen.glxInfo.renderer, "utf-8", "replace"),
++                    unicode(screen.glxInfo.vendor, "utf-8", "replace"))
+             else:
+-                text = _("Screen") + " %d: %s" % (
+-                    screen.num, screen.driver.name.capitalize())
++                text = _(u"Screen") + u" %d: %s" % (screen.num,
++                    unicode(screen.driver.name, "utf-8",
++                        "replace").capitalize())
+             deviceHBox = gtk.HBox()
+             deviceLabel = gtk.Label()
+             deviceLabel.set_justify(gtk.JUSTIFY_LEFT)
diff --git a/x11-misc/driconf/files/driconf-0.9.1-update-toolbar-methods.patch b/x11-misc/driconf/files/driconf-0.9.1-update-toolbar-methods.patch
new file mode 100644
index 000000000000..d6ce7e5c73e9
--- /dev/null
+++ b/x11-misc/driconf/files/driconf-0.9.1-update-toolbar-methods.patch
@@ -0,0 +1,108 @@
+http://cvs.fedoraproject.org/viewvc/rpms/driconf/devel/
+
+--- driconf_complexui.py
++++ driconf_complexui.py
+@@ -838,42 +838,73 @@ class MainWindow (gtk.Window):
+         self.paned.show()
+         self.toolbar = gtk.Toolbar ()
+         iconSize = self.toolbar.get_icon_size()
+-        self.saveButton = self.toolbar.insert_stock (
+-            "gtk-save", _("Save selected configuration file"),
+-            "priv", self.configTree.saveConfig, None, -1)
+-        self.reloadButton = self.toolbar.insert_stock (
+-            "gtk-revert-to-saved", _("Reload selected configuration file"),
+-            "priv", self.configTree.reloadConfig, None, -1)
+-        self.toolbar.append_space()
+-        self.newButton = self.toolbar.insert_stock (
+-            "gtk-new", _("Create a new device or application"),
+-            "priv", self.configTree.newItem, None, -1)
+-        self.removeButton = self.toolbar.insert_stock (
+-            "gtk-delete", _("Remove selected device or application"),
+-            "priv", self.configTree.removeItem, None, -1)
+-        self.upButton = self.toolbar.insert_stock (
+-            "gtk-go-up", _("Move selected item up"),
+-            "priv", self.configTree.moveUp, None, -1)
+-        self.downButton = self.toolbar.insert_stock (
+-            "gtk-go-down", _("Move selected item down"),
+-            "priv", self.configTree.moveDown, None, -1)
+-        self.propertiesButton = self.toolbar.insert_stock (
+-            "gtk-properties", _("Properties of selected device or application"),
+-            "priv", self.configTree.properties, None, -1)
+-        self.toolbar.append_space()
++
++        self.saveButton = gtk.ToolButton("gtk-save")
++        self.saveButton.set_tooltip_text(_("Save selected configuration file"))
++        self.saveButton.connect("clicked", self.configTree.saveConfig)
++        self.saveButton.show()
++        self.toolbar.insert(self.saveButton, -1)
++        self.reloadButton = gtk.ToolButton("gtk-revert-to-saved")
++        self.reloadButton.set_tooltip_text(_("Reload selected configuration file"))
++        self.reloadButton.connect("clicked", self.configTree.reloadConfig)
++        self.reloadButton.show()
++        self.toolbar.insert(self.reloadButton, -1)
++
++        separator = gtk.SeparatorToolItem()
++        separator.show()
++        self.toolbar.insert(separator, -1)
++
++        self.newButton = gtk.ToolButton("gtk-new")
++        self.newButton.set_tooltip_text(_("Create a new device or application"))
++        self.newButton.connect("clicked", self.configTree.newItem)
++        self.newButton.show()
++        self.toolbar.insert(self.newButton, -1)
++        self.removeButton = gtk.ToolButton("gtk-delete")
++        self.removeButton.set_tooltip_text(_("Remove selected device or application"))
++        self.removeButton.connect("clicked", self.configTree.removeItem)
++        self.removeButton.show()
++        self.toolbar.insert(self.removeButton, -1)
++        self.upButton = gtk.ToolButton("gtk-go-up")
++        self.upButton.set_tooltip_text(_("Move selected item up"))
++        self.upButton.connect("clicked", self.configTree.moveUp)
++        self.upButton.show()
++        self.toolbar.insert(self.upButton, -1)
++        self.downButton = gtk.ToolButton("gtk-go-down")
++        self.downButton.set_tooltip_text(_("Move selected item down"))
++        self.downButton.connect("clicked", self.configTree.moveDown)
++        self.downButton.show()
++        self.toolbar.insert(self.downButton, -1)
++        self.propertiesButton = gtk.ToolButton("gtk-properties")
++        self.propertiesButton.set_tooltip_text(_("Properties of selected device or application"))
++        self.propertiesButton.connect("clicked", self.configTree.properties)
++        self.propertiesButton.show()
++        self.toolbar.insert(self.propertiesButton, -1)
++
++        separator = gtk.SeparatorToolItem()
++        separator.show()
++        self.toolbar.insert(separator, -1)
++
+         # The gtk-about stock item is available with gtk >= 2.6.
+         # It's definitely not available with gtk 2.2. Not sure about 2.4.
+         if gtk.gtk_version[0] == 2 and gtk.gtk_version[1] < 6:
+             aboutStock = "gtk-dialog-info"
+         else:
+             aboutStock = "gtk-about"
+-        self.aboutButton = self.toolbar.insert_stock (
+-            aboutStock, _("About DRIconf"), "priv",
+-            self.aboutHandler, None, -1)
+-        self.toolbar.append_space()
+-        self.exitButton = self.toolbar.insert_stock (
+-            "gtk-quit", _("Exit DRIconf"), "priv",
+-            self.exitHandler, None, -1)
++        self.aboutButton = gtk.ToolButton(aboutStock)
++        self.aboutButton.set_tooltip_text(_("About DRIconf"))
++        self.aboutButton.connect("clicked", self.aboutHandler)
++        self.aboutButton.show()
++        self.toolbar.insert(self.aboutButton, -1)
++
++        separator = gtk.SeparatorToolItem()
++        separator.show()
++        self.toolbar.insert(separator, -1)
++
++        self.exitButton = gtk.ToolButton("gtk-quit")
++        self.exitButton.set_tooltip_text(_("Exit DRIconf"))
++        self.exitButton.connect("clicked", self.exitHandler)
++        self.exitButton.show()
++        self.toolbar.insert(self.exitButton, -1)
+         if len(configList) != 0:
+             self.activateConfigButtons (configList[0])
+         self.toolbar.show()
diff --git a/x11-misc/driconf/metadata.xml b/x11-misc/driconf/metadata.xml
new file mode 100644
index 000000000000..6cc3982431f8
--- /dev/null
+++ b/x11-misc/driconf/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>x11</herd>
+</pkgmetadata>
diff --git a/x11-misc/dsx/dsx-0.1.ebuild b/x11-misc/dsx/dsx-0.1.ebuild
new file mode 100644
index 000000000000..cd59bd7b8538
--- /dev/null
+++ b/x11-misc/dsx/dsx-0.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+PYTHON_DEPEND="2"
+
+inherit python
+
+DESCRIPTION="command line selection of your X desktop environment"
+HOMEPAGE="http://www.gentoo.org/"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ppc x86"
+IUSE=""
+
+RDEPEND="x11-apps/xinit"
+DEPEND=""
+
+pkg_setup() {
+	python_set_active_version 2
+}
+
+src_prepare() {
+	cp "${FILESDIR}"/${P} "${T}"
+	python_convert_shebangs -r 2 "${T}"
+}
+
+src_install() {
+	newbin "${T}"/${P} dsx
+}
diff --git a/x11-misc/dsx/files/dsx-0.1 b/x11-misc/dsx/files/dsx-0.1
new file mode 100644
index 000000000000..d8f5e7192928
--- /dev/null
+++ b/x11-misc/dsx/files/dsx-0.1
@@ -0,0 +1,72 @@
+#!/usr/bin/env python
+# dsx is Mandrakesoft's Xtart modified to work with a Gentoo Linux system.
+# Gentoo doesn't use a wmsession.d directory, so we're going to accept the
+# /etc/X11/Sessions executables as our menu and our command parameters.
+# I also tried to increase the robustness of the entry checking and make the
+# error messages less condescending.
+# The 0 option for "no wm" was removed.  I altered it to run option 1 instead.
+
+### Original copyright / license message from Xtart... ###
+#  This is an official linux-mandrake extension of the X windowing system for
+#  the benefit of Declan Moriarty  Copyright 2001 by civileme@mandrakesoft all
+#  rights reserved.  Use is hereby granted under the GNU General Publoic
+#  License version 2 or any future version of said license at the user's option
+#
+#  No Warranty of course.
+#  This program is designed for those who want to work in concole and   
+#  occasionally boot into window managers or who want to avoid theme
+#  persistence from one WM to another.
+################
+import sys
+import os
+import popen2
+import string
+import math
+def complain():
+    print 'X initiation aborted on invalid selection.'
+    sys.exit(0)
+    return
+print
+print 'Welcome to the Desktop Selector for X'
+print
+fspc=os.path.expanduser('~')+'/'
+io=popen2.Popen3('ls /etc/X11/Sessions',1)
+L=io.fromchild.readlines()
+Sessions={}
+Sessionkeys=[]
+primekey=0
+for k in L:
+    primekey+=1
+    name=k[:-1]
+    command='/etc/X11/Sessions/'+k[:-1]
+    Sessions[primekey]=(name, command)
+Sessionkeys=Sessions.keys()
+Sessionkeys.sort()
+for j in Sessionkeys:
+    if os.system('[ -x '+Sessions[j][1]+' ]') == 0:
+        print j, Sessions[j][0]
+    pass
+print
+sys.stdin.flush()
+s=raw_input('Enter the number of your desired desktop environment [1]: ')
+if len(s)==0:
+    s='1'
+if s=='0':
+    s='1'
+for j in range(len(s)):
+    if string.find(string.digits,s[j]) == -1:
+        print "'" + s[j] + "' isn't a digit."
+	complain()
+if len(s)>int(math.log10(primekey))+1:
+    print "That number is too big."
+    complain()
+well=int(s)
+wellformed=Sessions.has_key(well)
+if wellformed:
+    os.execvp('xinit',Sessions[well])
+else:
+    print
+    print 'Your selection was invalid.'
+    print
+    complain()
+
diff --git a/x11-misc/dsx/metadata.xml b/x11-misc/dsx/metadata.xml
new file mode 100644
index 000000000000..40838bc36783
--- /dev/null
+++ b/x11-misc/dsx/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>desktop-misc</herd>
+</pkgmetadata>
diff --git a/x11-misc/dunst/Manifest b/x11-misc/dunst/Manifest
new file mode 100644
index 000000000000..aec870557380
--- /dev/null
+++ b/x11-misc/dunst/Manifest
@@ -0,0 +1,3 @@
+DIST dunst-0.5.0.tar.bz2 28521 SHA256 4be8cf366930b297f03078f233f2fec479638d0c69b0e5e75bb49da487684b05 SHA512 3ce762295ea28b10539da6c5b9b4bffa41535d90544d933b2b81838f44a6d5d95c292a08048576b87db4f74592e5e068687743d7fda0dc3aa4aac06aa81ba7fd WHIRLPOOL ab1200ddadff1bcf6bbb5a56b464c4da2c045e9e074e1ada3e1841574dde21e4e672452130b7fffa9605fb20ab22870f9e49af2b32e15513f7dfa071be9958b1
+DIST dunst-1.0.0.tar.bz2 75306 SHA256 5c79ef11165421a4828453a42dfe9c60a4cb9d8743f970186a90c67e277f5280 SHA512 81490597ef8354d2c32838c72e03b121cf09d61e0fbef697a8adfb0c4783e45b3bb05790bf94cc1d0ed41e7f4b5f13a8edfdc65fec5569dc29966edd0807bfe1 WHIRLPOOL 724295fec6d284cc512944435a93df8c55b214d59d2b2b33c3fbf83e6a51db40b6ca15ce68446988dbeab695b0a907a4301124f35fb6748bed8c8143042b0bd9
+DIST dunst-1.1.0.tar.bz2 79032 SHA256 c72bf167eaab4e44a98ec87101b023efee0aa8916df56630b99a5bc53f8d7070 SHA512 ba01a6b18da5199b3356342f5c22592f93f447389267810bbfc35decf1a67f89650d445d3c1dd6f3cc76a4f86f7165adc777b669444627e42d3e671d4f04a04b WHIRLPOOL 6985c17549de4c7f6e2ba17ae1117db21693f4ed05df65e6238cfe6001aeb9c7a98834f3e794a0c80dbe913099082624256708c29ffa02cf35b0ab0032e94926
diff --git a/x11-misc/dunst/dunst-0.5.0.ebuild b/x11-misc/dunst/dunst-0.5.0.ebuild
new file mode 100644
index 000000000000..46e56c652caf
--- /dev/null
+++ b/x11-misc/dunst/dunst-0.5.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="customizable and lightweight notification-daemon"
+HOMEPAGE="http://www.knopwob.org/dunst/"
+SRC_URI="http://www.knopwob.org/public/dunst-release/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	dev-libs/libxdg-basedir
+	sys-apps/dbus
+	x11-libs/libXScrnSaver
+	x11-libs/libXft
+	x11-libs/libXinerama
+"
+RDEPEND="${DEPEND}"
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="/usr" install
+
+	dodoc CHANGELOG
+}
diff --git a/x11-misc/dunst/dunst-1.0.0-r1.ebuild b/x11-misc/dunst/dunst-1.0.0-r1.ebuild
new file mode 100644
index 000000000000..cdfd2d6dbf1c
--- /dev/null
+++ b/x11-misc/dunst/dunst-1.0.0-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="customizable and lightweight notification-daemon"
+HOMEPAGE="http://www.knopwob.org/dunst/"
+SRC_URI="http://www.knopwob.org/public/dunst-release/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="dunstify"
+
+CDEPEND="
+	dev-libs/glib:2
+	dev-libs/libxdg-basedir
+	sys-apps/dbus
+	x11-libs/libXScrnSaver
+	x11-libs/libXft
+	x11-libs/libXinerama
+	x11-libs/cairo[X,glib]
+	x11-libs/pango[X]
+	dunstify? ( x11-libs/libnotify )
+"
+
+DEPEND="${CDEPEND}
+		dev-lang/perl
+		virtual/pkgconfig"
+
+RDEPEND="${CDEPEND}"
+
+src_prepare() {
+	# fixes backported from git
+	epatch "${FILESDIR}"/${P}-correctly_handle_num_lock.patch
+	epatch "${FILESDIR}"/${P}-fix_pause_resume.patch
+
+	# Remove nasty CFLAGS which override user choice
+	sed -ie "/^CFLAGS/ {
+		s:-g::
+		s:-O.::
+	}" config.mk || die "sed failed"
+
+	if ! use dunstify; then
+		# don't build dunstify: it pulls in deps but is not being installed
+		sed -ie "/^all:/ s:dunstify::" Makefile || die "sed failed"
+	fi
+
+	epatch_user
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="/usr" install
+
+	if use dunstify; then
+		dobin dunstify
+	fi
+
+	dodoc CHANGELOG
+}
diff --git a/x11-misc/dunst/dunst-1.0.0.ebuild b/x11-misc/dunst/dunst-1.0.0.ebuild
new file mode 100644
index 000000000000..32aa742ab9b9
--- /dev/null
+++ b/x11-misc/dunst/dunst-1.0.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="customizable and lightweight notification-daemon"
+HOMEPAGE="http://www.knopwob.org/dunst/"
+SRC_URI="http://www.knopwob.org/public/dunst-release/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="dunstify"
+
+CDEPEND="
+	dev-libs/glib:2
+	dev-libs/libxdg-basedir
+	sys-apps/dbus
+	x11-libs/libXScrnSaver
+	x11-libs/libXft
+	x11-libs/libXinerama
+	x11-libs/cairo[X,glib]
+	x11-libs/pango[X]
+	dunstify? ( x11-libs/libnotify )
+"
+
+DEPEND="${CDEPEND}
+		dev-lang/perl
+		virtual/pkgconfig"
+
+RDEPEND="${CDEPEND}"
+
+src_prepare() {
+	# Remove nasty CFLAGS which override user choice
+	sed -ie "/^CFLAGS/ {
+		s:-g::
+		s:-O.::
+	}" config.mk || die "sed failed"
+
+	if ! use dunstify; then
+		# don't build dunstify: it pulls in deps but is not being installed
+		sed -ie "/^all:/ s:dunstify::" Makefile || die "sed failed"
+	fi
+
+	epatch_user
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="/usr" install
+
+	if use dunstify; then
+		dobin dunstify
+	fi
+
+	dodoc CHANGELOG
+}
diff --git a/x11-misc/dunst/dunst-1.1.0.ebuild b/x11-misc/dunst/dunst-1.1.0.ebuild
new file mode 100644
index 000000000000..e67ea07acf0b
--- /dev/null
+++ b/x11-misc/dunst/dunst-1.1.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="customizable and lightweight notification-daemon"
+HOMEPAGE="http://www.knopwob.org/dunst/"
+SRC_URI="http://www.knopwob.org/public/dunst-release/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="dunstify"
+
+CDEPEND="
+	dev-libs/glib:2
+	dev-libs/libxdg-basedir
+	sys-apps/dbus
+	x11-libs/libXScrnSaver
+	x11-libs/libXft
+	x11-libs/libXinerama
+	x11-libs/cairo[X,glib]
+	x11-libs/pango[X]
+	dunstify? ( x11-libs/libnotify )
+"
+
+DEPEND="${CDEPEND}
+		dev-lang/perl
+		virtual/pkgconfig"
+
+RDEPEND="${CDEPEND}"
+
+src_prepare() {
+	# Remove nasty CFLAGS which override user choice
+	sed -ie "/^CFLAGS/ {
+		s:-g::
+		s:-O.::
+	}" config.mk || die "sed failed"
+
+	if use dunstify; then
+		# add dunstify to the all target
+		sed -ie "/^all:/ s:$: dunstify:" Makefile || die "sed failed"
+	fi
+
+	epatch_user
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="/usr" install
+
+	if use dunstify; then
+		dobin dunstify
+	fi
+
+	dodoc CHANGELOG
+}
diff --git a/x11-misc/dunst/files/dunst-1.0.0-correctly_handle_num_lock.patch b/x11-misc/dunst/files/dunst-1.0.0-correctly_handle_num_lock.patch
new file mode 100644
index 000000000000..fc784fb8fc66
--- /dev/null
+++ b/x11-misc/dunst/files/dunst-1.0.0-correctly_handle_num_lock.patch
@@ -0,0 +1,149 @@
+https://github.com/knopwob/dunst/commit/be7d2b351
+
+From be7d2b3511dc528b135e5dc6d5358c700fefaa30 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ren=C3=A9=20=27Necoro=27=20Neumann?= <necoro@necoro.net>
+Date: Mon, 3 Jun 2013 14:39:24 +0200
+Subject: [PATCH] Correctly handle Num_Lock.
+
+Find out which modifier key is used by Num_Lock (`x_numlock_mod()`) and
+register grabs for both variants: modifier present/not present.
+---
+ x.c | 73 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------
+ 1 file changed, 67 insertions(+), 6 deletions(-)
+
+--- a/x.c
++++ b/x.c
+@@ -485,6 +485,58 @@ static void setopacity(Window win, unsigned long opacity)
+ 
+ 
+ 
++        /*
++         * Returns the modifier which is NumLock.
++         */
++static KeySym x_numlock_mod()
++{
++        static KeyCode nl = 0;
++        KeySym sym = 0;
++        XModifierKeymap * map = XGetModifierMapping(xctx.dpy);
++
++        if (!nl)
++                nl = XKeysymToKeycode(xctx.dpy, XStringToKeysym("Num_Lock"));
++
++        for (int mod = 0; mod < 8; mod++) {
++                for (int j = 0; j < map->max_keypermod; j++) {
++                        if (map->modifiermap[mod*map->max_keypermod+j] == nl) {
++                                /* In theory, one could use `1 << mod`, but this
++                                 * could count as 'using implementation details',
++                                 * so use this large switch. */
++                                switch (mod) {
++                                        case ShiftMapIndex:
++                                                sym = ShiftMask;
++                                                goto end;
++                                        case LockMapIndex:
++                                                sym = LockMask;
++                                                goto end;
++                                        case ControlMapIndex:
++                                                sym = ControlMask;
++                                                goto end;
++                                        case Mod1MapIndex:
++                                                sym = Mod1Mask;
++                                                goto end;
++                                        case Mod2MapIndex:
++                                                sym = Mod2Mask;
++                                                goto end;
++                                        case Mod3MapIndex:
++                                                sym = Mod3Mask;
++                                                goto end;
++                                        case Mod4MapIndex:
++                                                sym = Mod4Mask;
++                                                goto end;
++                                        case Mod5MapIndex:
++                                                sym = Mod5Mask;
++                                                goto end;
++                                }
++                        }
++                }
++        }
++
++end:
++        XFreeModifiermap(map);
++        return sym;
++}
+ 
+         /*
+          * Helper function to use glib's mainloop mechanic
+@@ -515,6 +567,7 @@ gboolean x_mainloop_fd_dispatch(GSource * source, GSourceFunc callback,
+                                 gpointer user_data)
+ {
+         XEvent ev;
++        unsigned int state;
+         while (XPending(xctx.dpy) > 0) {
+                 XNextEvent(xctx.dpy, &ev);
+                 switch (ev.type) {
+@@ -535,10 +588,13 @@ gboolean x_mainloop_fd_dispatch(GSource * source, GSourceFunc callback,
+                         }
+                         break;
+                 case KeyPress:
++                        state = ev.xkey.state;
++                        /* NumLock is also encoded in the state. Remove it. */
++                        state &= ~x_numlock_mod();
+                         if (settings.close_ks.str
+                             && XLookupKeysym(&ev.xkey,
+                                              0) == settings.close_ks.sym
+-                            && settings.close_ks.mask == ev.xkey.state) {
++                            && settings.close_ks.mask == state) {
+                                 if (displayed) {
+                                         notification *n = g_queue_peek_head(displayed);
+                                         if (n)
+@@ -548,19 +604,19 @@ gboolean x_mainloop_fd_dispatch(GSource * source, GSourceFunc callback,
+                         if (settings.history_ks.str
+                             && XLookupKeysym(&ev.xkey,
+                                              0) == settings.history_ks.sym
+-                            && settings.history_ks.mask == ev.xkey.state) {
++                            && settings.history_ks.mask == state) {
+                                 history_pop();
+                         }
+                         if (settings.close_all_ks.str
+                             && XLookupKeysym(&ev.xkey,
+                                              0) == settings.close_all_ks.sym
+-                            && settings.close_all_ks.mask == ev.xkey.state) {
++                            && settings.close_all_ks.mask == state) {
+                                 move_all_to_history();
+                         }
+                         if (settings.context_ks.str
+                             && XLookupKeysym(&ev.xkey,
+                                              0) == settings.context_ks.sym
+-                            && settings.context_ks.mask == ev.xkey.state) {
++                            && settings.context_ks.mask == state) {
+                                 context_menu();
+                         }
+                         break;
+@@ -953,9 +1009,12 @@ int x_shortcut_grab(keyboard_shortcut * ks)
+ 
+         x_shortcut_setup_error_handler();
+ 
+-        if (ks->is_valid)
++        if (ks->is_valid) {
+                 XGrabKey(xctx.dpy, ks->code, ks->mask, root,
+                          true, GrabModeAsync, GrabModeAsync);
++                XGrabKey(xctx.dpy, ks->code, ks->mask | x_numlock_mod() , root,
++                         true, GrabModeAsync, GrabModeAsync);
++        }
+ 
+         if (x_shortcut_tear_down_error_handler()) {
+                 fprintf(stderr, "Unable to grab key \"%s\"\n", ks->str);
+@@ -972,8 +1031,10 @@ void x_shortcut_ungrab(keyboard_shortcut * ks)
+ {
+         Window root;
+         root = RootWindow(xctx.dpy, DefaultScreen(xctx.dpy));
+-        if (ks->is_valid)
++        if (ks->is_valid) {
+                 XUngrabKey(xctx.dpy, ks->code, ks->mask, root);
++                XUngrabKey(xctx.dpy, ks->code, ks->mask | x_numlock_mod(), root);
++        }
+ }
+ 
+         /*
+-- 
+1.9.1
+
diff --git a/x11-misc/dunst/files/dunst-1.0.0-fix_pause_resume.patch b/x11-misc/dunst/files/dunst-1.0.0-fix_pause_resume.patch
new file mode 100644
index 000000000000..f95cc310b373
--- /dev/null
+++ b/x11-misc/dunst/files/dunst-1.0.0-fix_pause_resume.patch
@@ -0,0 +1,60 @@
+https://github.com/knopwob/dunst/commit/04248fd4
+
+From 04248fd49ef6769c7dc7e246fc505ad9c70afe27 Mon Sep 17 00:00:00 2001
+From: Sascha Kruse <knopwob@googlemail.com>
+Date: Mon, 22 Apr 2013 20:07:35 +0000
+Subject: [PATCH] fix pause/resume
+
+this fixes github issue #98
+---
+ dunst.c | 14 ++++++++------
+ 1 file changed, 8 insertions(+), 6 deletions(-)
+
+--- a/dunst.c
++++ b/dunst.c
+@@ -105,7 +105,7 @@ void update_lists()
+ 
+         if (pause_display) {
+                 while (displayed->length > 0) {
+-                        g_queue_insert_sorted(queue, g_queue_pop_head(queue),
++                        g_queue_insert_sorted(queue, g_queue_pop_head(displayed),
+                                               notification_cmp_data, NULL);
+                 }
+                 return;
+@@ -240,16 +240,16 @@ gboolean run(void *data)
+                 timeout_cnt--;
+         }
+ 
+-        if (displayed->length > 0 && !xctx.visible) {
+-                x_win_show();
++        if (displayed->length > 0 && !xctx.visible && !pause_display) {
++            x_win_show();
+         }
+ 
+-        if (displayed->length == 0 && xctx.visible) {
+-                x_win_hide();
++        if (xctx.visible && (pause_display || displayed->length == 0)) {
++            x_win_hide(); 
+         }
+ 
+         if (xctx.visible) {
+-                x_win_draw();
++            x_win_draw();
+         }
+ 
+         if (xctx.visible) {
+@@ -355,9 +355,11 @@ void pause_signal_handler(int sig)
+ {
+         if (sig == SIGUSR1) {
+                 pause_display = true;
++                wake_up();
+         }
+         if (sig == SIGUSR2) {
+                 pause_display = false;
++                wake_up();
+         }
+ 
+         signal(sig, pause_signal_handler);
+-- 
+1.9.1
+
diff --git a/x11-misc/dunst/metadata.xml b/x11-misc/dunst/metadata.xml
new file mode 100644
index 000000000000..c837a2621f98
--- /dev/null
+++ b/x11-misc/dunst/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>wired@gentoo.org</email>
+		<name>Alex Alexander</name>
+	</maintainer>
+	<use>
+		<flag name="dunstify">Experimental replacement for notify-send.</flag>
+	</use>
+</pkgmetadata>
diff --git a/x11-misc/dxpc/Manifest b/x11-misc/dxpc/Manifest
new file mode 100644
index 000000000000..f216683d5a32
--- /dev/null
+++ b/x11-misc/dxpc/Manifest
@@ -0,0 +1 @@
+DIST dxpc-3.9.2.tgz 199267 RMD160 5494459e7c460138e72e900877c61c30265bbb89 SHA1 08f3c3cc04f8048ec181563b373f309e5e270bfa SHA256 414c499c6aa97f061dc589733142d5be671645436938cfc02b243914a0a27de5
diff --git a/x11-misc/dxpc/dxpc-3.9.2-r1.ebuild b/x11-misc/dxpc/dxpc-3.9.2-r1.ebuild
new file mode 100644
index 000000000000..64246b731407
--- /dev/null
+++ b/x11-misc/dxpc/dxpc-3.9.2-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+DESCRIPTION="Differential X Protocol Compressor"
+HOMEPAGE="http://www.vigor.nu/dxpc/"
+SRC_URI="http://www.vigor.nu/dxpc/${P}.tgz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ppc x86"
+IUSE=""
+
+RDEPEND="x11-libs/libXt
+	>=dev-libs/lzo-2"
+DEPEND="${RDEPEND}
+	x11-proto/xproto"
+
+src_install () {
+	emake prefix="${D}/usr" man1dir="${D}/usr/share/man/man1" install || die
+	dodoc CHANGES README TODO
+}
diff --git a/x11-misc/dxpc/files/dxpc-3.8.2-lzo2.patch b/x11-misc/dxpc/files/dxpc-3.8.2-lzo2.patch
new file mode 100644
index 000000000000..80b5b0b87ced
--- /dev/null
+++ b/x11-misc/dxpc/files/dxpc-3.8.2-lzo2.patch
@@ -0,0 +1,314 @@
+diff -ru dxpc-3.8.2-orig/Compresser.H dxpc-3.8.2/Compresser.H
+--- dxpc-3.8.2-orig/Compresser.H	1999-08-19 19:58:28.000000000 +0200
++++ dxpc-3.8.2/Compresser.H	2006-08-14 17:45:19.000000000 +0200
+@@ -1,8 +1,8 @@
+ #ifndef COMPRESSER_H_
+ #define COMPRESSER_H_
+ 
+-#include "lzo1x.h"
+-#include "lzo1c.h"
++#include "lzo/lzo1x.h"
++#include "lzo/lzo1c.h"
+ 
+ class EncodeBuffer;
+ struct cEntry;
+diff -ru dxpc-3.8.2-orig/configure dxpc-3.8.2/configure
+--- dxpc-3.8.2-orig/configure	2002-11-14 05:52:02.000000000 +0100
++++ dxpc-3.8.2/configure	2006-08-14 17:45:19.000000000 +0200
+@@ -3102,16 +3102,19 @@
+ fi
+ 
+ 
+-echo "$as_me:$LINENO: checking for lzo_version in -llzo" >&5
+-echo $ECHO_N "checking for lzo_version in -llzo... $ECHO_C" >&6
+-if test "${ac_cv_lib_lzo_lzo_version+set}" = set; then
++echo "$as_me:$LINENO: checking for lzo_version in -llzo2" >&5
++echo $ECHO_N "checking for lzo_version in -llzo2... $ECHO_C" >&6
++if test "${ac_cv_lib_lzo2_lzo_version+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-llzo  $LIBS"
++LIBS="-llzo2  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ #ifdef __cplusplus
+@@ -3130,29 +3133,41 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
++  (eval $ac_link) 2>conftest.er1
+   ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-         { ac_try='test -s conftest$ac_exeext'
++	 { ac_try='test -z "$ac_cxx_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  ac_cv_lib_lzo_lzo_version=yes
++  ac_cv_lib_lzo2_lzo_version=yes
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-ac_cv_lib_lzo_lzo_version=no
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_lzo2_lzo_version=no
+ fi
+-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_lzo_lzo_version" >&5
+-echo "${ECHO_T}$ac_cv_lib_lzo_lzo_version" >&6
+-if test $ac_cv_lib_lzo_lzo_version = yes; then
+-  LIBS="$LIBS -llzo"
++echo "$as_me:$LINENO: result: $ac_cv_lib_lzo2_lzo_version" >&5
++echo "${ECHO_T}$ac_cv_lib_lzo2_lzo_version" >&6
++if test $ac_cv_lib_lzo2_lzo_version = yes; then
++  LIBS="$LIBS -llzo2"
+ else
+   { { echo "$as_me:$LINENO: error: lzo library required: you may need to use the --with-lzo-lib
+ option to specify path to LZO if it is installed in a non-standard
+@@ -3482,31 +3497,44 @@
+ if test $ac_cv_header_lzoconf_h = yes; then
+   :
+ else
+-  if test "${ac_cv_header__usr_local_include_lzoconf_h+set}" = set; then
+-  echo "$as_me:$LINENO: checking for /usr/local/include/lzoconf.h" >&5
+-echo $ECHO_N "checking for /usr/local/include/lzoconf.h... $ECHO_C" >&6
+-if test "${ac_cv_header__usr_local_include_lzoconf_h+set}" = set; then
++  if test "${ac_cv_header__usr_include_lzo_lzoconf_h+set}" = set; then
++  echo "$as_me:$LINENO: checking for /usr/include/lzo/lzoconf.h" >&5
++echo $ECHO_N "checking for /usr/include/lzo/lzoconf.h... $ECHO_C" >&6
++if test "${ac_cv_header__usr_include_lzo_lzoconf_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header__usr_local_include_lzoconf_h" >&5
+-echo "${ECHO_T}$ac_cv_header__usr_local_include_lzoconf_h" >&6
++echo "$as_me:$LINENO: result: $ac_cv_header__usr_include_lzo_lzoconf_h" >&5
++echo "${ECHO_T}$ac_cv_header__usr_include_lzo_lzoconf_h" >&6
+ else
+   # Is the header compilable?
+-echo "$as_me:$LINENO: checking /usr/local/include/lzoconf.h usability" >&5
+-echo $ECHO_N "checking /usr/local/include/lzoconf.h usability... $ECHO_C" >&6
++echo "$as_me:$LINENO: checking /usr/include/lzo/lzoconf.h usability" >&5
++echo $ECHO_N "checking /usr/include/lzo/lzoconf.h usability... $ECHO_C" >&6
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ $ac_includes_default
+-#include </usr/local/include/lzoconf.h>
++#include </usr/include/lzo/lzoconf.h>
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
++  (eval $ac_compile) 2>conftest.er1
+   ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-         { ac_try='test -s conftest.$ac_objext'
++	 { ac_try='test -z "$ac_cxx_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -3515,20 +3543,24 @@
+   ac_header_compiler=yes
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ ac_header_compiler=no
+ fi
+-rm -f conftest.$ac_objext conftest.$ac_ext
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+ echo "${ECHO_T}$ac_header_compiler" >&6
+ 
+ # Is the header present?
+-echo "$as_me:$LINENO: checking /usr/local/include/lzoconf.h presence" >&5
+-echo $ECHO_N "checking /usr/local/include/lzoconf.h presence... $ECHO_C" >&6
++echo "$as_me:$LINENO: checking /usr/include/lzo/lzoconf.h presence" >&5
++echo $ECHO_N "checking /usr/include/lzo/lzoconf.h presence... $ECHO_C" >&6
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-#include "confdefs.h"
+-#include </usr/local/include/lzoconf.h>
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include </usr/include/lzo/lzoconf.h>
+ _ACEOF
+ if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+@@ -3558,33 +3590,50 @@
+ echo "${ECHO_T}$ac_header_preproc" >&6
+ 
+ # So?  What about this header?
+-case $ac_header_compiler:$ac_header_preproc in
+-  yes:no )
+-    { echo "$as_me:$LINENO: WARNING: /usr/local/include/lzoconf.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-echo "$as_me: WARNING: /usr/local/include/lzoconf.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: /usr/local/include/lzoconf.h: proceeding with the preprocessor's result" >&5
+-echo "$as_me: WARNING: /usr/local/include/lzoconf.h: proceeding with the preprocessor's result" >&2;};;
+-  no:yes )
+-    { echo "$as_me:$LINENO: WARNING: /usr/local/include/lzoconf.h: present but cannot be compiled" >&5
+-echo "$as_me: WARNING: /usr/local/include/lzoconf.h: present but cannot be compiled" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: /usr/local/include/lzoconf.h: check for missing prerequisite headers?" >&5
+-echo "$as_me: WARNING: /usr/local/include/lzoconf.h: check for missing prerequisite headers?" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: /usr/local/include/lzoconf.h: proceeding with the preprocessor's result" >&5
+-echo "$as_me: WARNING: /usr/local/include/lzoconf.h: proceeding with the preprocessor's result" >&2;};;
++case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
++  yes:no: )
++    { echo "$as_me:$LINENO: WARNING: /usr/include/lzo/lzoconf.h: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: /usr/include/lzo/lzoconf.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: /usr/include/lzo/lzoconf.h: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: /usr/include/lzo/lzoconf.h: proceeding with the compiler's result" >&2;}
++    ac_header_preproc=yes
++    ;;
++  no:yes:* )
++    { echo "$as_me:$LINENO: WARNING: /usr/include/lzo/lzoconf.h: present but cannot be compiled" >&5
++echo "$as_me: WARNING: /usr/include/lzo/lzoconf.h: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: /usr/include/lzo/lzoconf.h:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: /usr/include/lzo/lzoconf.h:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: /usr/include/lzo/lzoconf.h: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: /usr/include/lzo/lzoconf.h: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: /usr/include/lzo/lzoconf.h:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: /usr/include/lzo/lzoconf.h:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: /usr/include/lzo/lzoconf.h: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: /usr/include/lzo/lzoconf.h: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: /usr/include/lzo/lzoconf.h: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: /usr/include/lzo/lzoconf.h: in the future, the compiler will take precedence" >&2;}
++    (
++      cat <<\_ASBOX
++## ------------------------------------------ ##
++## Report this to the AC_PACKAGE_NAME lists.  ##
++## ------------------------------------------ ##
++_ASBOX
++    ) |
++      sed "s/^/$as_me: WARNING:     /" >&2
++    ;;
+ esac
+-echo "$as_me:$LINENO: checking for /usr/local/include/lzoconf.h" >&5
+-echo $ECHO_N "checking for /usr/local/include/lzoconf.h... $ECHO_C" >&6
+-if test "${ac_cv_header__usr_local_include_lzoconf_h+set}" = set; then
++echo "$as_me:$LINENO: checking for /usr/include/lzo/lzoconf.h" >&5
++echo $ECHO_N "checking for /usr/include/lzo/lzoconf.h... $ECHO_C" >&6
++if test "${ac_cv_header__usr_include_lzo_lzoconf_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  ac_cv_header__usr_local_include_lzoconf_h=$ac_header_preproc
++  ac_cv_header__usr_include_lzo_lzoconf_h=$ac_header_preproc
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header__usr_local_include_lzoconf_h" >&5
+-echo "${ECHO_T}$ac_cv_header__usr_local_include_lzoconf_h" >&6
++echo "$as_me:$LINENO: result: $ac_cv_header__usr_include_lzo_lzoconf_h" >&5
++echo "${ECHO_T}$ac_cv_header__usr_include_lzo_lzoconf_h" >&6
+ 
+ fi
+-if test $ac_cv_header__usr_local_include_lzoconf_h = yes; then
+-  CXXFLAGS="$CXXFLAGS -I/usr/local/include"
++if test $ac_cv_header__usr_include_lzo_lzoconf_h = yes; then
++  CXXFLAGS="$CXXFLAGS -I/usr/include/lzo"
+ else
+   { { echo "$as_me:$LINENO: error: lzoconf.h required (part of LZO library)" >&5
+ echo "$as_me: error: lzoconf.h required (part of LZO library)" >&2;}
+diff -ru dxpc-3.8.2-orig/configure.in dxpc-3.8.2/configure.in
+--- dxpc-3.8.2-orig/configure.in	2002-11-14 05:26:28.000000000 +0100
++++ dxpc-3.8.2/configure.in	2006-08-14 17:45:19.000000000 +0200
+@@ -21,8 +21,8 @@
+ dnl Checks for header files.
+ AC_PATH_XTRA
+ 
+-AC_CHECK_LIB(lzo, lzo_version, 
+-             [LIBS="$LIBS -llzo"],
++AC_CHECK_LIB(lzo2, lzo_version, 
++             [LIBS="$LIBS -llzo2"],
+              AC_MSG_ERROR(
+ [lzo library required: you may need to use the --with-lzo-lib 
+ option to specify path to LZO if it is installed in a non-standard
+@@ -31,8 +31,8 @@
+ # The LZO installer likes to put headers in /usr/local/include, even on
+ # systems where that is not searched. Try to be nice and detect this case...
+ AC_CHECK_HEADER(lzoconf.h, ,
+- [AC_CHECK_HEADER(/usr/local/include/lzoconf.h,
+-		   [CXXFLAGS="$CXXFLAGS -I/usr/local/include"],
++ [AC_CHECK_HEADER(/usr/include/lzo/lzoconf.h,
++		   [CXXFLAGS="$CXXFLAGS -I/usr/include/lzo"],
+ 		   AC_MSG_ERROR([lzoconf.h required (part of LZO library)]))])
+ 
+ AC_DEFUN(dxpc_ACCEPT_LENGTH_T,
+diff -ru dxpc-3.8.2-orig/Decompresser.H dxpc-3.8.2/Decompresser.H
+--- dxpc-3.8.2-orig/Decompresser.H	1999-08-19 20:00:16.000000000 +0200
++++ dxpc-3.8.2/Decompresser.H	2006-08-14 17:45:19.000000000 +0200
+@@ -1,7 +1,7 @@
+ #ifndef DECOMPRESSER_H_
+ #define DECOMPRESSER_H_
+ 
+-#include "lzo1c.h"
++#include "lzo/lzo1c.h"
+ 
+ class DecodeBuffer;
+ #include "Compresser.H"
+diff -ru dxpc-3.8.2-orig/Makefile.in dxpc-3.8.2/Makefile.in
+--- dxpc-3.8.2-orig/Makefile.in	2002-11-11 19:37:52.000000000 +0100
++++ dxpc-3.8.2/Makefile.in	2006-08-14 17:45:19.000000000 +0200
+@@ -53,12 +53,12 @@
+ install: install.bin install.man
+ 
+ install.bin:	$(TARGET)
+-	$(srcdir)/mkinstalldirs $(bindir)
+-	$(INSTALL) $(TARGET) $(bindir)/$(TARGET)
++	$(srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
++	$(INSTALL) $(TARGET) $(DESTDIR)$(bindir)/$(TARGET)
+ 
+ install.man:
+-	$(srcdir)/mkinstalldirs $(man1dir)
+-	$(INSTALL_DATA) $(TARGET).man $(man1dir)/$(TARGET).1
++	$(srcdir)/mkinstalldirs $(DESTDIR)$(man1dir)
++	$(INSTALL_DATA) $(TARGET).man $(DESTDIR)$(man1dir)/$(TARGET).1
+ 
+ clean:
+ 	-rm -f *~ *.o $(TARGET) pure_* quant_* *.bak core gmon.out
diff --git a/x11-misc/dxpc/metadata.xml b/x11-misc/dxpc/metadata.xml
new file mode 100644
index 000000000000..2518313f5241
--- /dev/null
+++ b/x11-misc/dxpc/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+        <herd>desktop-misc</herd>
+</pkgmetadata>
diff --git a/x11-misc/dzen/Manifest b/x11-misc/dzen/Manifest
new file mode 100644
index 000000000000..022309b40880
--- /dev/null
+++ b/x11-misc/dzen/Manifest
@@ -0,0 +1 @@
+DIST dzen-0.9.5.tar.gz 38167 SHA256 0556c815de7257bccd50cfa62371e4bc1c358fa1c5a179a4f99890a63912dc19 SHA512 ed4eb5d657d8f3822d8fbf224da5c2d415852c340959840051ec9cfc63f90361e09b9d36cb8221cf046ae66af02b9fab67f4f16c834c5895e801d452e4f8a916 WHIRLPOOL d26831f48effe502e26f5a84c1a3ff18498d8c83053c716e75f4e695af3eec99f5f7fb19132e2d2ac13350d949bc2d9484607ea5a1cbed4b9682f15144ec9d3d
diff --git a/x11-misc/dzen/dzen-0.9.5-r1.ebuild b/x11-misc/dzen/dzen-0.9.5-r1.ebuild
new file mode 100644
index 000000000000..9deff6330500
--- /dev/null
+++ b/x11-misc/dzen/dzen-0.9.5-r1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils toolchain-funcs vcs-snapshot
+
+COMMITID="f7907da3a42a6d59e27ede88f5f01e4e41c4c9e0"
+
+DESCRIPTION="a general purpose messaging, notification and menuing program for X11"
+HOMEPAGE="https://github.com/robm/dzen"
+SRC_URI="https://github.com/robm/${PN}/tarball/${COMMITID} -> ${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="amd64 x86"
+IUSE="minimal xft xinerama xpm"
+SLOT="2"
+
+RDEPEND="
+	x11-libs/libX11
+	xft? ( x11-libs/libXft )
+	xinerama? ( x11-libs/libXinerama )
+	xpm? ( x11-libs/libXpm )
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	x11-proto/xproto
+	xinerama? ( x11-proto/xineramaproto )
+"
+
+DOCS=( README )
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-config-default.patch \
+		"${FILESDIR}"/${P}-off-by-one.patch
+
+	sed -i \
+		-e '/strip/d' \
+		-e 's:^	@:	:g' \
+		-e 's:{CC}:(CC):g' \
+		Makefile gadgets/Makefile || die
+
+	tc-export CC PKG_CONFIG
+}
+
+src_configure() {
+	if use xinerama ; then
+		sed -e '/^LIBS/s|$| -lXinerama|' \
+			-e '/^CFLAGS/s|$| -DDZEN_XINERAMA|' \
+			-i config.mk || die
+	fi
+	if use xpm ; then
+		sed -e '/^LIBS/s|$| -lXpm|' \
+			-e '/^CFLAGS/s|$| -DDZEN_XPM|' \
+			-i config.mk || die
+	fi
+	if use xft ; then
+		sed -e '/^LIBS/s|$| $(shell ${PKG_CONFIG} --libs xft)|' \
+			-e '/^CFLAGS/s|$| -DDZEN_XFT $(shell ${PKG_CONFIG} --cflags xft)|' \
+			-i config.mk || die
+	fi
+}
+
+src_compile() {
+	default
+	use minimal || emake -C gadgets
+}
+
+src_install() {
+	default
+
+	if ! use minimal ; then
+		emake -C gadgets DESTDIR="${D}" install
+		dobin gadgets/*.sh
+		dodoc gadgets/README*
+	fi
+}
diff --git a/x11-misc/dzen/files/dzen-0.9.5-config-default.patch b/x11-misc/dzen/files/dzen-0.9.5-config-default.patch
new file mode 100644
index 000000000000..2fcdddbf6a68
--- /dev/null
+++ b/x11-misc/dzen/files/dzen-0.9.5-config-default.patch
@@ -0,0 +1,95 @@
+--- a/config.mk
++++ b/config.mk
+@@ -4,7 +4,7 @@
+ # Customize below to fit your system
+ 
+ # paths
+-PREFIX = /usr/local
++PREFIX = /usr
+ MANPREFIX = ${PREFIX}/share/man
+ 
+ X11INC = /usr/X11R6/include
+@@ -19,55 +19,12 @@
+ # Comment  : Add # to the beginning of the respective lines
+ 
+ ## Option 1: No Xinerama no XPM no XFT
+-#LIBS = -L/usr/lib -lc -L${X11LIB} -lX11
+-#CFLAGS = -Wall -Os ${INCS} -DVERSION=\"${VERSION}\"
+-
+-
+-## Option 2: No Xinerama with XPM
+-#LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 -lXpm
+-#CFLAGS = -Wall -Os ${INCS} -DVERSION=\"${VERSION}\" -DDZEN_XPM
+-
+-
+-# Option 3: With Xinerama no XPM
+-#LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 -lXinerama
+-#CFLAGS = -Wall -Os ${INCS} -DVERSION=\"${VERSION}\" -DDZEN_XINERAMA
+-
+-
+-## Option 4: With Xinerama and XPM
+-#LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 -lXinerama -lXpm
+-#CFLAGS = -Wall -Os ${INCS} -DVERSION=\"${VERSION}\" -DDZEN_XINERAMA -DDZEN_XPM
+-
+-
+-## Option 5: With XFT
+-LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 `pkg-config --libs xft`
+-CFLAGS = -Wall -Os ${INCS} -DVERSION=\"${VERSION}\" -DDZEN_XFT `pkg-config --cflags xft`
+-
+-
+-## Option 6: With XPM and XFT
+-#LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 -lXpm `pkg-config --libs xft`
+-#CFLAGS = -Wall -Os ${INCS} -DVERSION=\"${VERSION}\" -DDZEN_XPM -DDZEN_XFT `pkg-config --cflags xft`
+-
+-
+-## Option 7: With Xinerama and XPM and XFT
+-#LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 -lXinerama -lXpm `pkg-config --libs xft`
+-#CFLAGS = -Wall -Os ${INCS} -DVERSION=\"${VERSION}\" -DDZEN_XINERAMA -DDZEN_XPM -DDZEN_XFT `pkg-config --cflags xft`
+-
+-
++LIBS = -lX11
++CFLAGS += -Wall ${INCS} -DVERSION=\"${VERSION}\"
+ 
+ # END of feature configuration
+ 
+-
+-LDFLAGS = ${LIBS}
+-
+-# Solaris, uncomment for Solaris
+-#CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\"
+-#LDFLAGS = ${LIBS}
+-#CFLAGS += -xtarget=ultra
+-
+-# Debugging
+-#CFLAGS = ${INCS} -DVERSION=\"${VERSION}\" -std=gnu89 -pedantic -Wall -W -Wundef -Wendif-labels -Wshadow -Wpointer-arith -Wbad-function-cast -Wcast-align -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Winline -Wdisabled-optimization -O2 -pipe -DDZEN_XFT `pkg-config --cflags xft`
+-#LDFLAGS = ${LIBS}
++LDFLAGS += ${LIBS}
+ 
+ # compiler and linker
+-CC = gcc
+-LD = ${CC}
++LD = $(CC)
+--- a/gadgets/config.mk
++++ b/gadgets/config.mk
+@@ -1,7 +1,7 @@
+ # Customize below to fit your system
+ 
+ # paths
+-PREFIX = /usr/local
++PREFIX = /usr
+ MANPREFIX = ${PREFIX}/share/man
+ 
+ X11INC = /usr/X11R6/include
+@@ -10,9 +10,8 @@
+ X11LIB = /usr/X11R6/lib
+ LIBS = -L/usr/lib 
+ 
+-CFLAGS = -Os ${INCS} 
+-LDFLAGS = ${LIBS}
++CFLAGS += ${INCS} 
++LDFLAGS += ${LIBS}
+ 
+ # compiler and linker
+-CC = gcc
+-LD = ${CC}
++LD = $(CC)
diff --git a/x11-misc/dzen/files/dzen-0.9.5-off-by-one.patch b/x11-misc/dzen/files/dzen-0.9.5-off-by-one.patch
new file mode 100644
index 000000000000..008fd6455014
--- /dev/null
+++ b/x11-misc/dzen/files/dzen-0.9.5-off-by-one.patch
@@ -0,0 +1,11 @@
+--- a/main.c
++++ b/main.c
+@@ -109,7 +109,7 @@
+ 		rem = NULL;
+ 	}
+ 	while(off < len) {
+-		if(i > MAX_LINE_LEN) {
++		if(i == MAX_LINE_LEN - 1) {
+ 			outbuf[i] = '\0';
+ 			return ++off;
+ 		}
diff --git a/x11-misc/dzen/metadata.xml b/x11-misc/dzen/metadata.xml
new file mode 100644
index 000000000000..a5cf379b5fce
--- /dev/null
+++ b/x11-misc/dzen/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>desktop-misc</herd>
+  <longdescription>Dzen is a general purpose messaging, notification and menuing
+  program for X11. It was designed to be scriptable in any language and
+  integrate well with window managers like dwm, wmii and xmonad though it will
+  work with any window manager.</longdescription>
+  <upstream>
+    <remote-id type="github">robm/dzen</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/x11-misc/e16keyedit/Manifest b/x11-misc/e16keyedit/Manifest
new file mode 100644
index 000000000000..6a642b5e06ce
--- /dev/null
+++ b/x11-misc/e16keyedit/Manifest
@@ -0,0 +1 @@
+DIST e16keyedit-0.7.tar.gz 88323 SHA256 8f9aa35ca5355f7a5bee04f4cced0922ed0f690be2d10f5a8e39680e391c09a2 SHA512 6178977bd9e1dfd337717660be8102f5c3f0a6d29d4b0b1ae67a7fa9a812ab46c4fee67e52282ca38d429d16697935e25e7c046f22d7f3bb06b7b3933e6d557b WHIRLPOOL 33192e9ee9fa2826855b69e109f70ddd71c9b338d2d7095e2739ac2fda75640371370fb61183819e252080893dca1a2b3f14f1c56e4416dd28bc1e406297d6e3
diff --git a/x11-misc/e16keyedit/e16keyedit-0.7.ebuild b/x11-misc/e16keyedit/e16keyedit-0.7.ebuild
new file mode 100644
index 000000000000..ac6de26c2ab7
--- /dev/null
+++ b/x11-misc/e16keyedit/e16keyedit-0.7.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+DESCRIPTION="Key binding editor for enlightenment 16"
+HOMEPAGE="http://www.enlightenment.org/"
+SRC_URI="mirror://sourceforge/enlightenment/${P}.tar.gz"
+
+LICENSE="MIT-with-advertising"
+SLOT="0"
+KEYWORDS="amd64 ppc sparc x86"
+IUSE=""
+
+RDEPEND="=x11-libs/gtk+-2*"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_compile() {
+	econf --enable-gtk2 || die
+	emake || die
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die
+	dodoc README ChangeLog AUTHORS
+}
diff --git a/x11-misc/e16keyedit/metadata.xml b/x11-misc/e16keyedit/metadata.xml
new file mode 100644
index 000000000000..9e83ca4cde6d
--- /dev/null
+++ b/x11-misc/e16keyedit/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>vapier@gentoo.org</email>
+	</maintainer>
+	<longdescription>
+This is a standalone keybindings editor for enlightenment version 0.16.
+</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">enlightenment</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-misc/e16menuedit2/Manifest b/x11-misc/e16menuedit2/Manifest
new file mode 100644
index 000000000000..c564054dd068
--- /dev/null
+++ b/x11-misc/e16menuedit2/Manifest
@@ -0,0 +1 @@
+DIST e16menuedit2-0.0.3.tar.gz 370740 SHA256 9a290f13f25b3fbce6d446cbc136933d981926b1da59c84cfac7f3690606b5a5 SHA512 41942028e7d20b5aa46fce8f54f60af46bd08e292a1812d4845d68cbc670699c8fc70a8d71c2749df623a4a083b92bc9539b9241fd7daabbee0deb855ff1be99 WHIRLPOOL 79efe3272f17db1d0fb540cb42682859926c6579d9b8469e3a2a06c7a3228183906e0c1f8f2a7e23130d833e46000bb1a36f1e0554603b94630a2d97116b1cf0
diff --git a/x11-misc/e16menuedit2/e16menuedit2-0.0.3.ebuild b/x11-misc/e16menuedit2/e16menuedit2-0.0.3.ebuild
new file mode 100644
index 000000000000..ee4e418356a2
--- /dev/null
+++ b/x11-misc/e16menuedit2/e16menuedit2-0.0.3.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+GCONF_DEBUG="yes"
+
+inherit gnome2 eutils
+
+DESCRIPTION="Menu editor for enlightenment DR16 written in GTK2"
+HOMEPAGE="http://www.enlightenment.org/"
+SRC_URI="mirror://sourceforge/enlightenment/${P}.tar.gz"
+
+LICENSE="MIT-with-advertising"
+SLOT="0"
+KEYWORDS="amd64 arm ~ppc sh sparc x86"
+IUSE=""
+
+RDEPEND="
+	>=x11-wm/enlightenment-0.16
+	>=gnome-base/libglade-2.4
+	x11-libs/gtk+:2
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-no-docs.patch
+	sed -i '1i#include <glib/gstdio.h>' src/e16menuedit2.c
+	gnome2_src_prepare
+}
diff --git a/x11-misc/e16menuedit2/files/e16menuedit2-0.0.3-no-docs.patch b/x11-misc/e16menuedit2/files/e16menuedit2-0.0.3-no-docs.patch
new file mode 100644
index 000000000000..764ac8660336
--- /dev/null
+++ b/x11-misc/e16menuedit2/files/e16menuedit2-0.0.3-no-docs.patch
@@ -0,0 +1,19 @@
+--- Makefile.in
++++ Makefile.in
+@@ -220,14 +220,7 @@
+ yelphelpdir = @yelphelpdir@
+ SUBDIRS = src po pixmaps help
+-e16menuedit2docdir = ${prefix}/${packagedocdir}
++e16menuedit2docdir = ${prefix}
+-e16menuedit2doc_DATA = \
+-		README\
+-		COPYING\
+-		AUTHORS\
+-		ChangeLog\
+-		INSTALL\
+-		NEWS\
+-                TODO
++e16menuedit2doc_DATA = 
+ 
+ GLADE_FILES = e16menuedit2.glade
+ e16menuedit2datadir = ${prefix}/${packagedatadir}/glade
diff --git a/x11-misc/e16menuedit2/metadata.xml b/x11-misc/e16menuedit2/metadata.xml
new file mode 100644
index 000000000000..a3f922b180c6
--- /dev/null
+++ b/x11-misc/e16menuedit2/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>vapier@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">enlightenment</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-misc/easystroke/Manifest b/x11-misc/easystroke/Manifest
new file mode 100644
index 000000000000..122843bfc166
--- /dev/null
+++ b/x11-misc/easystroke/Manifest
@@ -0,0 +1 @@
+DIST easystroke-0.6.0.tar.gz 121358 SHA256 f4c37adbc4dd405a24badb9e6be20d3223b4087ff9caed2c15ff71674051d0fd SHA512 a74cbdfd2b56e6b20d895297e80fb63f3d8ac938235ecf7067f984d087004af22a5ea0116ae20b948e238b02a06b14044a7025d65840f0c8d00542332387c921 WHIRLPOOL d1305449563d599c5159ebddb2fdc6c17f2e79d8a1ea5186cff9f6785545cb2941413fb498347da8801ac665e20f1aa252270bcc88e93d97111ae253924d7b18
diff --git a/x11-misc/easystroke/easystroke-0.6.0-r1.ebuild b/x11-misc/easystroke/easystroke-0.6.0-r1.ebuild
new file mode 100644
index 000000000000..9e2cf6a6316c
--- /dev/null
+++ b/x11-misc/easystroke/easystroke-0.6.0-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils toolchain-funcs
+
+DESCRIPTION="a gesture-recognition application for X11"
+HOMEPAGE="http://sourceforge.net/apps/trac/easystroke/"
+SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-cpp/gtkmm:3.0
+	dev-libs/boost
+	dev-libs/dbus-glib
+	dev-libs/glib:2
+	x11-base/xorg-server
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXtst
+"
+DEPEND="
+	${RDEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-cellrendertextish.patch
+	epatch "${FILESDIR}"/${P}-desktop.patch
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+	epatch "${FILESDIR}"/${P}-reinstate-signal-handlers.patch
+	epatch "${FILESDIR}"/${P}-buttons-scroll-send.patch
+
+	tc-export CC CXX PKG_CONFIG
+
+	if ! [[ -z ${LINGUAS} ]]; then
+		strip-linguas -i po/
+
+		local es_lingua lang
+		for es_lingua in $( printf "%s\n" po/*.po ); do
+			lang=${es_lingua/po\/}
+			has ${lang/.po/} ${LINGUAS} || rm ${es_lingua}
+		done
+	fi
+}
+
+src_compile() {
+	emake \
+		AOFLAGS='' \
+		LDFLAGS="${LDFLAGS}" \
+		PREFIX=/usr
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX=/usr install
+}
diff --git a/x11-misc/easystroke/easystroke-0.6.0.ebuild b/x11-misc/easystroke/easystroke-0.6.0.ebuild
new file mode 100644
index 000000000000..73de92fea6fd
--- /dev/null
+++ b/x11-misc/easystroke/easystroke-0.6.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils toolchain-funcs
+
+DESCRIPTION="a gesture-recognition application for X11"
+HOMEPAGE="http://sourceforge.net/apps/trac/easystroke/"
+SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+	dev-cpp/gtkmm:3.0
+	dev-libs/boost
+	dev-libs/dbus-glib
+	dev-libs/glib:2
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXtst
+"
+DEPEND="
+	${RDEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-cellrendertextish.patch
+	epatch "${FILESDIR}"/${P}-desktop.patch
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+
+	tc-export CC CXX PKG_CONFIG
+
+	strip-linguas -i po/
+
+	local es_lingua lang
+	for es_lingua in $( printf "%s\n" po/*.po ); do
+		lang=${es_lingua/po\/}
+		has ${lang/.po/} ${LINGUAS} || rm ${es_lingua}
+	done
+}
+
+src_compile() {
+	emake \
+		AOFLAGS='' \
+		LDFLAGS="${LDFLAGS}" \
+		PREFIX=/usr
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX=/usr install
+}
diff --git a/x11-misc/easystroke/files/easystroke-0.6.0-buttons-scroll-send.patch b/x11-misc/easystroke/files/easystroke-0.6.0-buttons-scroll-send.patch
new file mode 100644
index 000000000000..27bfa4cfee66
--- /dev/null
+++ b/x11-misc/easystroke/files/easystroke-0.6.0-buttons-scroll-send.patch
@@ -0,0 +1,43 @@
+From 5388934e722308cd314d65e362ddfaf6e5ab6c94 Mon Sep 17 00:00:00 2001
+From: Thomas Jaeger <ThJaeger@gmail.com>
+Date: Sat, 13 Apr 2013 14:10:35 -0400
+Subject: Make buttons and scroll work properly with 'send'
+
+---
+ handler.cc | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/handler.cc b/handler.cc
+index f47aae3..c1bd279 100644
+--- a/handler.cc
++++ b/handler.cc
+@@ -545,7 +545,7 @@ class AbstractScrollHandler : public Handler {
+ 
+ protected:
+ 	AbstractScrollHandler() : last_t(0), offset_x(0.0), offset_y(0.0) {
+-		if (!prefs.move_back.get() || xstate->current_dev->absolute)
++		if (!prefs.move_back.get() || (xstate->current_dev && xstate->current_dev->absolute))
+ 			return;
+ 		Window dummy1, dummy2;
+ 		int dummy3, dummy4;
+@@ -563,7 +563,7 @@ protected:
+ 	}
+ protected:
+ 	void move_back() {
+-		if (!prefs.move_back.get() || xstate->current_dev->absolute)
++		if (!prefs.move_back.get() || (xstate->current_dev && xstate->current_dev->absolute))
+ 			return;
+ 		XTestFakeMotionEvent(dpy, DefaultScreen(dpy), orig_x, orig_y, 0);
+ 	}
+@@ -1115,6 +1115,8 @@ XState::XState() : current_dev(NULL), in_proximity(false), accepted(true) {
+ 
+ void XState::run_action(RAction act) {
+ 	RModifiers mods = act->prepare();
++	IF_BUTTON(act, b)
++		return handler->replace_child(new ButtonHandler(mods, b));
+ 	if (IS_IGNORE(act))
+ 		return handler->replace_child(new IgnoreHandler(mods));
+ 	if (IS_SCROLL(act))
+-- 
+1.8.4
+
diff --git a/x11-misc/easystroke/files/easystroke-0.6.0-cellrendertextish.patch b/x11-misc/easystroke/files/easystroke-0.6.0-cellrendertextish.patch
new file mode 100644
index 000000000000..8664ed736bae
--- /dev/null
+++ b/x11-misc/easystroke/files/easystroke-0.6.0-cellrendertextish.patch
@@ -0,0 +1,20 @@
+--- a/cellrenderertextish.c
++++ b/cellrenderertextish.c
+@@ -599,7 +599,7 @@
+ 	_g_free0 (self->priv->path);
+ 	self->priv->path = _tmp3_;
+ 	g_signal_connect_object ((GtkCellEditable*) self, "editing-done", (GCallback) _cell_editable_accel_on_editing_done_gtk_cell_editable_editing_done, self, 0);
+-	_tmp4_ = _ ("Key combination...");
++	_tmp4_ = ("Key combination...");
+ 	_tmp5_ = (GtkLabel*) gtk_label_new (_tmp4_);
+ 	g_object_ref_sink (_tmp5_);
+ 	label = _tmp5_;
+@@ -907,7 +907,7 @@
+ 				const gchar* _tmp10_;
+ 				const gchar* _tmp11_ = NULL;
+ 				_tmp10_ = item;
+-				_tmp11_ = _ (_tmp10_);
++				_tmp11_ = (_tmp10_);
+ 				gtk_combo_box_text_append_text ((GtkComboBoxText*) self, _tmp11_);
+ 				_g_free0 (item);
+ 			}
diff --git a/x11-misc/easystroke/files/easystroke-0.6.0-desktop.patch b/x11-misc/easystroke/files/easystroke-0.6.0-desktop.patch
new file mode 100644
index 000000000000..c9a75a2c4b78
--- /dev/null
+++ b/x11-misc/easystroke/files/easystroke-0.6.0-desktop.patch
@@ -0,0 +1,11 @@
+--- a/easystroke.desktop.in
++++ b/easystroke.desktop.in
+@@ -6,7 +6,7 @@
+ Exec=easystroke
+ Icon=easystroke
+ Categories=GTK;Utility;Accessibility;
+-Actions=About;Enable;Disable;Quit
++Actions=About;Enable;Disable;Quit;
+ _Comment=Control your desktop using mouse gestures
+ 
+ [Desktop Action About]
diff --git a/x11-misc/easystroke/files/easystroke-0.6.0-gentoo.patch b/x11-misc/easystroke/files/easystroke-0.6.0-gentoo.patch
new file mode 100644
index 000000000000..ee95b21486c1
--- /dev/null
+++ b/x11-misc/easystroke/files/easystroke-0.6.0-gentoo.patch
@@ -0,0 +1,41 @@
+--- a/Makefile
++++ b/Makefile
+@@ -19,14 +19,14 @@
+ MENUDIR  = $(PREFIX)/share/applications
+ LOCALEDIR= $(PREFIX)/share/locale
+ DFLAGS   =
+-OFLAGS   = -O2
+-AOFLAGS  = -O3
++#OFLAGS   = -O2
++#AOFLAGS  = -O3
+ STROKEFLAGS  = -Wall -std=c99 $(DFLAGS)
+-CXXFLAGS = -Wall $(DFLAGS) -DLOCALEDIR=\"$(LOCALEDIR)\" `pkg-config gtkmm-3.0 dbus-glib-1 --cflags`
+-CFLAGS   = -Wall $(DFLAGS) -DLOCALEDIR=\"$(LOCALEDIR)\" `pkg-config gtk+-3.0 --cflags` -DGETTEXT_PACKAGE='"easystroke"'
+-LDFLAGS  = $(DFLAGS)
++CXXFLAGS += -Wall $(DFLAGS) -DLOCALEDIR=\"$(LOCALEDIR)\" $(shell $(PKG_CONFIG) gtkmm-3.0 dbus-glib-1 --cflags)
++CFLAGS   += -Wall $(DFLAGS) -DLOCALEDIR=\"$(LOCALEDIR)\" $(shell $(PKG_CONFIG) gtk+-3.0 --cflags) -DGETTEXT_PACKAGE='"easystroke"'
++#LDFLAGS  = $(DFLAGS)
+ 
+-LIBS     = $(DFLAGS) -lboost_serialization -lX11 -lXext -lXi -lXfixes -lXtst `pkg-config gtkmm-3.0 dbus-glib-1 --libs`
++LIBS     = $(DFLAGS) -lboost_serialization -lX11 -lXext -lXi -lXfixes -lXtst $(shell $(PKG_CONFIG) gtkmm-3.0 dbus-glib-1 --libs)
+ 
+ BINARY   = easystroke
+ ICON     = easystroke.svg
+@@ -60,7 +60,7 @@
+ include $(DEPFILES)
+ 
+ $(BINARY): $(OFILES)
+-	$(CXX) $(LDFLAGS) -o $@ $(OFILES) $(LIBS)
++	$(CXX) $(CFLAGS) $(LDFLAGS) -o $@ $(OFILES) $(LIBS)
+ 
+ stroke.o: stroke.c
+ 	$(CC) $(STROKEFLAGS) $(AOFLAGS) -MT $@ -MMD -MP -MF $*.Po -o $@ -c $<
+@@ -119,7 +119,7 @@
+ 	help2man -N -n "X11 gesture recognition application" ./$(BINARY) > $@
+ 
+ install: all
+-	install -Ds $(BINARY) $(DESTDIR)$(BINDIR)/$(BINARY)
++	install -D $(BINARY) $(DESTDIR)$(BINDIR)/$(BINARY)
+ 	install -D -m 644 $(ICON) $(DESTDIR)$(ICONDIR)/$(ICON)
+ 	install -D -m 644 $(MENU) $(DESTDIR)$(MENUDIR)/$(MENU)
+ 	for f in $(MOFILES); do \
diff --git a/x11-misc/easystroke/files/easystroke-0.6.0-reinstate-signal-handlers.patch b/x11-misc/easystroke/files/easystroke-0.6.0-reinstate-signal-handlers.patch
new file mode 100644
index 000000000000..2e96346459a8
--- /dev/null
+++ b/x11-misc/easystroke/files/easystroke-0.6.0-reinstate-signal-handlers.patch
@@ -0,0 +1,42 @@
+From 7bda4bd9c705413598ee9b534884bc7f23704932 Mon Sep 17 00:00:00 2001
+From: Thomas Jaeger <ThJaeger@gmail.com>
+Date: Thu, 20 Jun 2013 01:45:20 -0400
+Subject: Reinstate signal handlers that got lost in the gtk3 transition
+
+Also, fix a segfault when handling SIGINT.
+---
+ main.cc | 11 ++++++++++-
+ 1 file changed, 10 insertions(+), 1 deletion(-)
+
+diff --git a/main.cc b/main.cc
+index 55d0b3c..8cd9c56 100644
+--- a/main.cc
++++ b/main.cc
+@@ -161,7 +161,12 @@ void quit() {
+ 		xstate->bail_out();
+ 	dead = true;
+ 	win->hide();
+-	xstate->queue(sigc::ptr_fun(&Gtk::Main::quit));
++	Glib::RefPtr<Gio::Application> app = Gio::Application::get_default();
++	xstate->queue(sigc::mem_fun(*app.operator->(), &Gio::Application::quit));
++}
++
++void sig_int(int) {
++	quit();
+ }
+ 
+ class App : public Gtk::Application, Base {
+@@ -371,6 +376,10 @@ void App::on_activate() {
+ 
+ 	create_config_dir();
+ 	unsetenv("DESKTOP_AUTOSTART_ID");
++
++	signal(SIGINT, &sig_int);
++	signal(SIGCHLD, SIG_IGN);
++
+ 	dpy = XOpenDisplay(NULL);
+ 	if (!dpy) {
+ 		printf(_("Couldn't open display.\n"));
+-- 
+1.8.4
+
diff --git a/x11-misc/easystroke/metadata.xml b/x11-misc/easystroke/metadata.xml
new file mode 100644
index 000000000000..2c734e7ab536
--- /dev/null
+++ b/x11-misc/easystroke/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>desktop-misc</herd>
+	<upstream>
+		<remote-id type="sourceforge">easystroke</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-misc/efax-gtk/Manifest b/x11-misc/efax-gtk/Manifest
new file mode 100644
index 000000000000..0d345168f4b6
--- /dev/null
+++ b/x11-misc/efax-gtk/Manifest
@@ -0,0 +1,4 @@
+DIST efax-gtk-3.2.11.src.tgz 1236415 SHA256 15f726a7cd8ba28f0934433d8bfd2c80c5b94fbe61174fe17e2c85d296ce8cd2 SHA512 35f07019983170781b86f99e6d96e0a738d49a1aadaeded76b1f185e42313c5e4b9a88daff21a57286f2a60e4113c2965ca1c4747c5352906e2f9767b5c5f715 WHIRLPOOL f7127c23d53a173ae63c07fac36148ec226a0250a6fb66d3b2a254868c9a37fc58f337c5aaac26070e3384a430aeb6e757b3c86a866d50d0dc1dc7b0b61ceb70
+DIST efax-gtk-3.2.12.src.tgz 1242786 SHA256 5014b758db9533efbf898be96b0edbda577b6cd9ea34004171731ba0ff0e210e SHA512 630e3cb3740c21b51ba5b4e6144870e9b4107bbc9367bf6d09a42b936fe642e7816cfaf657dc02f9dc030ca83657cc148dbc13d03607bf72591ce2df578ef679 WHIRLPOOL 82cb831d42f8c36a8859dd2a049fbe22af5850b8fb52b1dce54b3d6db892b3e4ee372cb624fe699141dca323d944361a36e941db54b834e0c22aa17fc48d6253
+DIST efax-gtk-3.2.13.src.tgz 1245015 SHA256 4d09de4a0c530fe24cf8d8061aae92d5c2e6b8c52120b97be0ad8e4c3b68ac37 SHA512 dde0f79df444bdaf5250eae1dc0a94184c0b32e319b04943e81178d2a744bb6e387b5aa0f2379bd23dd4c18d28c30c60083c0cda5819e5c853c1b7bdc4f5b64f WHIRLPOOL 0336f7e6cb566cc3debc76cd9e2c0e67ca4d6b796693d4c8cd56e28166380f814290df55a9feefea111bbcf3ea0f27d6ed27ffd9b10784081fd0395314218e94
+DIST efax-gtk-3.2.9.src.tgz 1176921 SHA256 92f4047dcbbafcebaad11f86115abed2e1ac4c34ab0dddba0bb3ad6875bee79b SHA512 a2a4a648b95f9143f8ad3b42c3f8f86323a2b312fed87616eddeaebe06742a5a4ae841d79f3078bf9e819288252ad4d79ec429a66116c1d2b8df8a8a13cac806 WHIRLPOOL 9e21ff1ae8787306c0c23661d6a0d998037f982f9ef37f150a90d64710f6ad1aea8adb28729eb549be981386f1f8605e908b5a1126b058c06ccc09951d38885b
diff --git a/x11-misc/efax-gtk/efax-gtk-3.2.11.ebuild b/x11-misc/efax-gtk/efax-gtk-3.2.11.ebuild
new file mode 100644
index 000000000000..96c86fcc8b89
--- /dev/null
+++ b/x11-misc/efax-gtk/efax-gtk-3.2.11.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+DESCRIPTION="A graphical frontend for the 'efax' application"
+HOMEPAGE="http://efax-gtk.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.src.tgz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="nls"
+
+RDEPEND=">=dev-libs/glib-2.10
+	media-libs/tiff:0
+	x11-libs/libX11
+	x11-libs/c++-gtk-utils:3
+	x11-libs/gtk+:3"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+DOCS="AUTHORS BUGS ChangeLog README"
+
+src_prepare() {
+	# Prevent sandbox violation with chown/chgrp and existing spooldir
+	sed -i -e '/ch.*lp.*spooldir/d' efax-gtk-faxfilter/Makefile.in || die
+
+	sed -i \
+		-e '/^Encoding/d' \
+		-e '/^Icon/s:.png::' \
+		-e '/^Categories/s:Application;::' \
+		${PN}.desktop || die
+}
+
+src_configure() {
+	econf --disable-silent-rules \
+		$(use_enable nls) \
+		--with-gtk-version=gtk3
+}
+
+src_install() {
+	default
+	# http://bugs.gentoo.org/401221
+	mv -vf "${ED}"usr/share/man/man1/efax{,-0.9a}.1 || die
+	mv -vf "${ED}"usr/share/man/man1/efix{,-0.9a}.1 || die
+}
+
+pkg_postinst() {
+	local spooldir="${EROOT}"/var/spool/fax
+	[[ -d ${spooldir} ]] && chown lp:lp "${spooldir}"
+}
diff --git a/x11-misc/efax-gtk/efax-gtk-3.2.12.ebuild b/x11-misc/efax-gtk/efax-gtk-3.2.12.ebuild
new file mode 100644
index 000000000000..ec228b5db51c
--- /dev/null
+++ b/x11-misc/efax-gtk/efax-gtk-3.2.12.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="A graphical frontend for the 'efax' application"
+HOMEPAGE="http://efax-gtk.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.src.tgz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="nls"
+
+RDEPEND=">=dev-libs/glib-2.10
+	media-libs/tiff:0=
+	x11-libs/libX11
+	x11-libs/c++-gtk-utils:0
+	x11-libs/gtk+:3"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+DOCS="AUTHORS BUGS ChangeLog README"
+
+src_prepare() {
+	# Prevent sandbox violation with chown/chgrp and existing spooldir
+	sed -i -e '/ch.*lp.*spooldir/d' efax-gtk-faxfilter/Makefile.in || die
+
+	sed -i \
+		-e '/^Encoding/d' \
+		-e '/^Categories/s:Office;::' \
+		${PN}.desktop || die
+}
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		--with-gtk-version=gtk3
+}
+
+src_install() {
+	default
+	# File collision with net-misc/efax wrt #401221
+	mv "${ED}"usr/share/man/man1/efax{,-0.9a}.1 || die
+	mv "${ED}"usr/share/man/man1/efix{,-0.9a}.1 || die
+}
+
+pkg_postinst() {
+	local spooldir="${EROOT}"/var/spool/fax
+	[[ -d ${spooldir} ]] && chown lp:lp "${spooldir}"
+}
diff --git a/x11-misc/efax-gtk/efax-gtk-3.2.13.ebuild b/x11-misc/efax-gtk/efax-gtk-3.2.13.ebuild
new file mode 100644
index 000000000000..f124933a0688
--- /dev/null
+++ b/x11-misc/efax-gtk/efax-gtk-3.2.13.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="A graphical frontend for the 'efax' application"
+HOMEPAGE="http://efax-gtk.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.src.tgz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="nls"
+
+RDEPEND=">=dev-libs/glib-2.10
+	media-libs/tiff:0=
+	x11-libs/libX11
+	x11-libs/c++-gtk-utils:0
+	x11-libs/gtk+:3"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+DOCS="AUTHORS BUGS ChangeLog README"
+
+src_prepare() {
+	# Prevent sandbox violation with chown/chgrp and existing spooldir
+	sed -i -e '/ch.*lp.*spooldir/d' efax-gtk-faxfilter/Makefile.in || die
+
+	sed -i \
+		-e '/^Encoding/d' \
+		-e '/^Categories/s:Office;::' \
+		${PN}.desktop || die
+}
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		--with-gtk-version=gtk3
+}
+
+src_install() {
+	default
+	# File collision with net-misc/efax wrt #401221
+	mv "${ED}"usr/share/man/man1/efax{,-0.9a}.1 || die
+	mv "${ED}"usr/share/man/man1/efix{,-0.9a}.1 || die
+}
+
+pkg_postinst() {
+	local spooldir="${EROOT}"/var/spool/fax
+	[[ -d ${spooldir} ]] && chown lp:lp "${spooldir}"
+}
diff --git a/x11-misc/efax-gtk/efax-gtk-3.2.9.ebuild b/x11-misc/efax-gtk/efax-gtk-3.2.9.ebuild
new file mode 100644
index 000000000000..8a94d676432c
--- /dev/null
+++ b/x11-misc/efax-gtk/efax-gtk-3.2.9.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+DESCRIPTION="A graphical frontend for the 'efax' application"
+HOMEPAGE="http://efax-gtk.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.src.tgz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
+IUSE="nls"
+
+RDEPEND=">=dev-libs/glib-2.10
+	media-libs/tiff:0
+	x11-libs/libX11
+	x11-libs/c++-gtk-utils:3
+	x11-libs/gtk+:3"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+DOCS="AUTHORS BUGS ChangeLog README"
+
+src_prepare() {
+	# Prevent sandbox violation with chown/chgrp and existing spooldir
+	sed -i -e '/ch.*lp.*spooldir/d' efax-gtk-faxfilter/Makefile.in || die
+
+	sed -i \
+		-e '/^Encoding/d' \
+		-e '/^Icon/s:.png::' \
+		-e '/^Categories/s:Application;::' \
+		${PN}.desktop || die
+}
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		--with-gtk-version=gtk3
+}
+
+src_install() {
+	default
+	# http://bugs.gentoo.org/401221
+	mv -vf "${ED}"usr/share/man/man1/efax{,-0.9a}.1 || die
+	mv -vf "${ED}"usr/share/man/man1/efix{,-0.9a}.1 || die
+}
+
+pkg_postinst() {
+	local spooldir="${EROOT}"/var/spool/fax
+	[[ -d ${spooldir} ]] && chown lp:lp "${spooldir}"
+}
diff --git a/x11-misc/efax-gtk/metadata.xml b/x11-misc/efax-gtk/metadata.xml
new file mode 100644
index 000000000000..5b7b5e3a3f21
--- /dev/null
+++ b/x11-misc/efax-gtk/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>desktop-misc</herd>
+	<upstream>
+		<remote-id type="sourceforge">efax-gtk</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-misc/electricsheep/Manifest b/x11-misc/electricsheep/Manifest
new file mode 100644
index 000000000000..0c544895ff60
--- /dev/null
+++ b/x11-misc/electricsheep/Manifest
@@ -0,0 +1 @@
+DIST electricsheep-2.7_beta11.tar.bz2 224892 SHA256 093ffdf65d24d0eb6c66e398c092bcf48d72e23151c0d572b2c327344f1261a1 SHA512 13ff9b1a5aded75d07d5cb1a6a11e6c6417e98e218ce928c2f3e67879dc5947dba4acdc5b2c058d6994b245e4d666bd2bb8a6adc98876ba1134c962abfa29354 WHIRLPOOL 14a33b2d06e2fe19c2e1356cd20b61c3e26a246518d9912b92533b528b2b0086addf6e80ee226abaf30a3abc31930fd20f96f7970c975c80598370b9386cd86e
diff --git a/x11-misc/electricsheep/electricsheep-2.7_beta11.ebuild b/x11-misc/electricsheep/electricsheep-2.7_beta11.ebuild
new file mode 100644
index 000000000000..a2f5f8536a8e
--- /dev/null
+++ b/x11-misc/electricsheep/electricsheep-2.7_beta11.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils flag-o-matic autotools
+
+DESCRIPTION="realize the collective dream of sleeping computers from all over the internet"
+HOMEPAGE="http://electricsheep.org/"
+SRC_URI="http://dev.gentooexperimental.org/~dreeevil/electricsheep-2.7_beta11.tar.bz2"
+
+IUSE="" #kde gnome
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+DEPEND="dev-libs/expat
+	>=gnome-base/libglade-2.5.0:2.0
+	>=virtual/ffmpeg-0.10
+	sys-libs/zlib
+	>=x11-libs/gtk+-2.7.0:2
+	x11-libs/libX11"
+RDEPEND="${DEPEND}
+	app-arch/gzip
+	media-gfx/flam3
+	media-video/mplayer
+	net-misc/curl
+	x11-misc/xdg-utils"
+#	kde? ( kde-base/kscreensaver )
+#	gnome? ( gnome-extra/gnome-screensaver )
+DEPEND="${DEPEND}
+	virtual/pkgconfig
+	x11-proto/xproto"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-xdg-utils.patch \
+		"${FILESDIR}"/${PN}-gnome.patch \
+		"${FILESDIR}"/${P}-asneeded.patch \
+		"${FILESDIR}"/${PN}-ffmpeg.patch \
+		"${FILESDIR}"/${P}-ffmpeg1.patch \
+		"${FILESDIR}"/${P}-ffmpeg2.patch
+	eautoreconf
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die "make install failed"
+
+	# install the xscreensaver config file
+	insinto /usr/share/xscreensaver/config
+	doins ${PN}.xml || die "${PN}.xml failed"
+
+	#if use kde; then
+	#	set-kdedir
+	#	newins ${PN}.desktop{.kde,} || die "${PN}.desktop.kde failed"
+	#	insinto "${KDEDIR}/share/applnk/System/ScreenSavers"
+	#	newins ${PN}.desktop{.kde,} || die "${PN}.desktop.kde failed"
+	#fi
+
+	#if use gnome; then
+	#	domenu ${PN}.desktop || die "${PN}.desktop failed"
+	#	exeinto /usr/libexec/gnome-screensaver
+	#	doexe ${PN}-saver || die "${PN}-saver failed"
+	#fi
+}
diff --git a/x11-misc/electricsheep/files/electricsheep-2.7_beta11-asneeded.patch b/x11-misc/electricsheep/files/electricsheep-2.7_beta11-asneeded.patch
new file mode 100644
index 000000000000..70f746d5ff8b
--- /dev/null
+++ b/x11-misc/electricsheep/files/electricsheep-2.7_beta11-asneeded.patch
@@ -0,0 +1,13 @@
+diff -ur electricsheep-2.7_beta11.orig/Makefile.am electricsheep-2.7_beta11/Makefile.am
+--- electricsheep-2.7_beta11.orig/Makefile.am	2009-09-18 00:42:49.000000000 +0300
++++ electricsheep-2.7_beta11/Makefile.am	2010-02-26 14:35:07.000000000 +0200
+@@ -9,7 +9,8 @@
+ pkgdata_DATA = electricsheep-wait.avi electricsheep-preferences.glade
+ 
+ electricsheep_preferences_CFLAGS = @libglade_CFLAGS@ -DPACKAGE_DATA_DIR=\"$(pkgdatadir)\"
+-electricsheep_preferences_LDFLAGS = @libglade_LIBS@ -export-dynamic
++electricsheep_preferences_LDADD = @libglade_LIBS@
++electricsheep_preferences_LDFLAGS = -export-dynamic
+ electricsheep_preferences_SOURCES = electricsheep-preferences.c utils.c md5.c
+ 
+ 
diff --git a/x11-misc/electricsheep/files/electricsheep-2.7_beta11-ffmpeg1.patch b/x11-misc/electricsheep/files/electricsheep-2.7_beta11-ffmpeg1.patch
new file mode 100644
index 000000000000..aa5fd179ebfe
--- /dev/null
+++ b/x11-misc/electricsheep/files/electricsheep-2.7_beta11-ffmpeg1.patch
@@ -0,0 +1,37 @@
+Index: electricsheep-2.7_beta11/electricsheep.c
+===================================================================
+--- electricsheep-2.7_beta11.orig/electricsheep.c
++++ electricsheep-2.7_beta11/electricsheep.c
+@@ -652,7 +652,7 @@ void copy_out_file(char *fname) {
+       return;
+     }
+ 
+-    if (0 > av_open_input_file(&ictx, fname, NULL, 0, NULL)) {
++    if (0 > avformat_open_input(&ictx, fname, NULL, NULL)) {
+ 	perror(fname);
+ 	exit(1);
+     }
+@@ -699,8 +699,6 @@ void copy_out_file(char *fname) {
+ 	output_ctx->oformat = ofmt;
+ 
+ 	st = av_new_stream(output_ctx, output_ctx->nb_streams);
+-	st->stream_copy = 1;
+-	av_set_parameters(output_ctx, NULL);
+ 
+ 	icodec = ictx->streams[input_stream_index]->codec;
+ 	codec = output_ctx->streams[0]->codec;
+@@ -718,12 +716,12 @@ void copy_out_file(char *fname) {
+ 	codec->height = icodec->height;
+ 	codec->has_b_frames = icodec->has_b_frames;
+ 
+-	if (url_fopen(&output_ctx->pb, pipe, URL_WRONLY) < 0) {
++	if (avio_open(&output_ctx->pb, pipe, AVIO_FLAG_WRITE) < 0) {
+ 	    fprintf(logout, "Could not open '%s'\n", pipe);
+ 	    exit(1);
+ 	}
+ 
+-	av_write_header(output_ctx);
++	avformat_write_header(output_ctx, NULL);
+     }
+ 
+     while (1) {
diff --git a/x11-misc/electricsheep/files/electricsheep-2.7_beta11-ffmpeg2.patch b/x11-misc/electricsheep/files/electricsheep-2.7_beta11-ffmpeg2.patch
new file mode 100644
index 000000000000..d08f3b0c5f00
--- /dev/null
+++ b/x11-misc/electricsheep/files/electricsheep-2.7_beta11-ffmpeg2.patch
@@ -0,0 +1,32 @@
+Index: electricsheep-2.7_beta11/electricsheep.c
+===================================================================
+--- electricsheep-2.7_beta11.orig/electricsheep.c
++++ electricsheep-2.7_beta11/electricsheep.c
+@@ -657,7 +657,7 @@ void copy_out_file(char *fname) {
+ 	exit(1);
+     }
+ 
+-    if (0 > av_find_stream_info(ictx)) {
++    if (0 > avformat_find_stream_info(ictx, NULL)) {
+ 	fprintf(logout, "%s: could not find codec parameters\n", fname);
+ 	exit(1);
+     }
+@@ -698,7 +698,8 @@ void copy_out_file(char *fname) {
+ 	}
+ 	output_ctx->oformat = ofmt;
+ 
+-	st = av_new_stream(output_ctx, output_ctx->nb_streams);
++	st = avformat_new_stream(output_ctx, NULL);
++	if(st) st->id = output_ctx->nb_streams;
+ 
+ 	icodec = ictx->streams[input_stream_index]->codec;
+ 	codec = output_ctx->streams[0]->codec;
+@@ -741,7 +742,7 @@ void copy_out_file(char *fname) {
+ 	av_free_packet(&opkt);
+ 	av_free_packet(&ipkt);
+     }
+-    av_close_input_file(ictx);
++    avformat_close_input(&ictx);
+ }
+ 
+ time_t search_time;
diff --git a/x11-misc/electricsheep/files/electricsheep-ffmpeg.patch b/x11-misc/electricsheep/files/electricsheep-ffmpeg.patch
new file mode 100644
index 000000000000..d40c171cb221
--- /dev/null
+++ b/x11-misc/electricsheep/files/electricsheep-ffmpeg.patch
@@ -0,0 +1,41 @@
+Index: electricsheep-2.7_beta11/electricsheep.c
+===================================================================
+--- electricsheep-2.7_beta11.orig/electricsheep.c
++++ electricsheep-2.7_beta11/electricsheep.c
+@@ -61,6 +61,9 @@
+ #define STATFS statfs
+ #endif
+ 
++#ifndef guess_format
++#define guess_format av_guess_format
++#endif
+ 
+ prefs_t prefs;
+ 
+@@ -662,7 +665,7 @@ void copy_out_file(char *fname) {
+     input_stream_index = -1;
+     for (j = 0; j < ictx->nb_streams; j++) {
+ 	AVCodecContext *enc = ictx->streams[j]->codec;
+-	if (CODEC_TYPE_VIDEO == enc->codec_type) {
++	if (AVMEDIA_TYPE_VIDEO == enc->codec_type) {
+ 	    input_stream_index = j;
+ 	    break;
+ 	}
+@@ -686,7 +689,7 @@ void copy_out_file(char *fname) {
+ 	    }
+ 	}
+ 
+-	output_ctx = av_alloc_format_context();
++	output_ctx = avformat_alloc_context();
+ 
+ 	ofmt = guess_format(NULL, fname, NULL);
+ 	if (!ofmt) {
+@@ -730,7 +733,7 @@ void copy_out_file(char *fname) {
+ 	av_init_packet(&opkt);
+ 	if (av_parser_change(ictx->streams[input_stream_index]->parser, output_ctx->streams[0]->codec,
+ 			     &opkt.data, &opkt.size, ipkt.data, ipkt.size,
+-			     ipkt.flags & PKT_FLAG_KEY))
++			     ipkt.flags & AV_PKT_FLAG_KEY))
+ 	    opkt.destruct= av_destruct_packet;
+ 		
+ 	if (-1 == av_interleaved_write_frame(output_ctx, &opkt)) {
diff --git a/x11-misc/electricsheep/files/electricsheep-gnome.patch b/x11-misc/electricsheep/files/electricsheep-gnome.patch
new file mode 100644
index 000000000000..bea649edb0bd
--- /dev/null
+++ b/x11-misc/electricsheep/files/electricsheep-gnome.patch
@@ -0,0 +1,25 @@
+Index: client/Makefile.am
+===================================================================
+--- client/Makefile.am	(revision 1257)
++++ client/Makefile.am	(working copy)
+@@ -28,20 +28,3 @@
+ 	electricsheep-preferences.glade electricsheep.h electricsheep-saver \
+ 	16_electricsheep 
+ 
+-GNOME_SCREENSAVER_DATADIR = $(shell pkg-config --variable themesdir gnome-screensaver)
+-GNOME_SCREENSAVER_PRIVEXEDIR = $(shell pkg-config --variable privlibexecdir gnome-screensaver)
+-
+-install-data-local:
+-	-$(INSTALL) electricsheep.desktop $(GNOME_SCREENSAVER_DATADIR)
+-	-$(INSTALL) electricsheep-saver $(GNOME_SCREENSAVER_PRIVEXEDIR)
+-	-$(INSTALL) -d $(pkgdatadir)
+-	-$(INSTALL) 16_electricsheep /usr/share/gconf/defaults
+-	-update-gconf-defaults
+-
+-uninstall-local:
+-	-rm /usr/share/gconf/defaults/16_electricsheep
+-	-rm -rf $(pkgdatadir)
+-	-rm $(GNOME_SCREENSAVER_PRIVEXEDIR)/electricsheep-saver
+-	-rm $(GNOME_SCREENSAVER_DATADIR)/electricsheep.desktop
+-	-update-gconf-defaults
+-
diff --git a/x11-misc/electricsheep/files/electricsheep-xdg-utils.patch b/x11-misc/electricsheep/files/electricsheep-xdg-utils.patch
new file mode 100644
index 000000000000..4ca38158c741
--- /dev/null
+++ b/x11-misc/electricsheep/files/electricsheep-xdg-utils.patch
@@ -0,0 +1,15 @@
+Index: client/electricsheep-preferences.c
+===================================================================
+--- client/electricsheep-preferences.c	(revision 1257)
++++ client/electricsheep-preferences.c	(working copy)
+@@ -121,8 +121,8 @@
+ }
+ 
+ void on_helpButton_clicked(GtkWidget *widget, gpointer user_data) {
+-    if (system("gnome-open http://electricsheep.org/client/LNX_" VERSION ".html &"))
+-	perror("gnome-open");
++    if (system("xdg-open http://electricsheep.org/client/LNX_" VERSION ".html &"))
++	perror("xdg-open");
+ }
+ 
+ static void tick() {
diff --git a/x11-misc/electricsheep/metadata.xml b/x11-misc/electricsheep/metadata.xml
new file mode 100644
index 000000000000..91f4e72fb544
--- /dev/null
+++ b/x11-misc/electricsheep/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/x11-misc/etm/Manifest b/x11-misc/etm/Manifest
new file mode 100644
index 000000000000..53b2ef3368da
--- /dev/null
+++ b/x11-misc/etm/Manifest
@@ -0,0 +1 @@
+DIST etm-696.tar.gz 163174 SHA256 c50e53e7669c4cd5a2746fc5f9d6f982ae4f0436999959ae34c42e6a1d4b90b8
diff --git a/x11-misc/etm/etm-696-r1.ebuild b/x11-misc/etm/etm-696-r1.ebuild
new file mode 100644
index 000000000000..06cc03ce742d
--- /dev/null
+++ b/x11-misc/etm/etm-696-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+inherit distutils-r1
+
+DESCRIPTION="Event and Task Manager, an intuitive time management application"
+HOMEPAGE="http://www.duke.edu/~dgraham/ETM/"
+SRC_URI="mirror://sourceforge/etmeventandtask/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ical"
+
+DEPEND="dev-python/wxpython:2.8[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	ical? ( dev-python/icalendar[${PYTHON_USEDEP}] )"
+RDEPEND="${DEPEND}"
diff --git a/x11-misc/etm/metadata.xml b/x11-misc/etm/metadata.xml
new file mode 100644
index 000000000000..1b2855b1d22f
--- /dev/null
+++ b/x11-misc/etm/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
+	<longdescription lang="en">
+		etm is an acronym for Event and Task Manager. It provides a simple,
+		intuitive format for using plain text files to store data, a command
+		line interface for viewing stored information in a variety of convenient
+		ways and a cross-platform, wx(python)-based GUI for creating and
+		modifying items as well as viewing them.
+	</longdescription>
+	<use>
+		<flag name="ical">Enable export of ical format files by depending on
+			<pkg>dev-python/icalendar</pkg></flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">etmeventandtask</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-misc/evolvotron/Manifest b/x11-misc/evolvotron/Manifest
new file mode 100644
index 000000000000..525c85d1d69b
--- /dev/null
+++ b/x11-misc/evolvotron/Manifest
@@ -0,0 +1,3 @@
+DIST evolvotron-0.6.1.tar.gz 156441 SHA256 70bf4dc6de69f43385047d3dfb6058c6d5b26957313486bfc452721ff05be503
+DIST evolvotron-0.6.2.tar.gz 160255 SHA256 9303726eb691dec92bd9fc0c144530c8facc7c71a8394e040e63896bbcfbe7d8 SHA512 f20f7079846fcfaea7d75494087fb159d0ab64b22342d34caf2b468de0e3891be9265e6f5a957a915c9eda311f643a9959de526578299c74e7f128f24e1a0c64 WHIRLPOOL f7d97dc0fd2ac819d4a0bf2e6b5f17695c9d4d6f09b4107278ebdf6845d2e57848d31ab30d03eda373741b1a242e0d5e27f13515167a77d49f3d83bedae30fa2
+DIST evolvotron-0.6.3.tar.gz 182357 SHA256 d1735fe84d90be004888017068f49fa00c97378fd7cca11a90a4a889ef681393 SHA512 4cb5e3bda340c3444c5d59aa0569010c1845104a67996a596840aec768964a96798dc61bab7c6a77de3a4586010d8d066941795145400ad9a3fd336269e681a9 WHIRLPOOL 34bb1e2aac934cb3c8079803eca3844750641d4b4dbcd4a01f18405f0ae861b77814087bb9b6d57fdad5998ac62b05e846483251df34d17c29f1df815a322909
diff --git a/x11-misc/evolvotron/evolvotron-0.6.1.ebuild b/x11-misc/evolvotron/evolvotron-0.6.1.ebuild
new file mode 100644
index 000000000000..f7137737adca
--- /dev/null
+++ b/x11-misc/evolvotron/evolvotron-0.6.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+PYTHON_DEPEND="2:2.6"
+inherit python qt4-r2
+
+DESCRIPTION="Generative art image evolver"
+HOMEPAGE="http://sourceforge.net/projects/evolvotron/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="dev-qt/qtgui:4"
+DEPEND="${RDEPEND}
+	dev-libs/boost"
+
+S=${WORKDIR}/${PN}
+
+pkg_setup() {
+	python_set_active_version 2
+}
+
+src_configure() {
+	eqmake4 main.pro
+}
+
+src_compile() {
+	./text_to_markup.py -html < USAGE > evolvotron.html
+	./text_to_markup.py -qml -s < USAGE > libevolvotron/usage_text.h
+	emake -j1 || die
+}
+
+src_install() {
+	for bin in ${PN}{,_mutate,_render}; do
+		dobin ${bin}/${bin} || die
+	done
+
+	doman man/man1/*
+	dodoc BUGS CHANGES README TODO USAGE
+	dohtml *.html
+}
diff --git a/x11-misc/evolvotron/evolvotron-0.6.2.ebuild b/x11-misc/evolvotron/evolvotron-0.6.2.ebuild
new file mode 100644
index 000000000000..1945d52297d0
--- /dev/null
+++ b/x11-misc/evolvotron/evolvotron-0.6.2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+PYTHON_DEPEND="2:2.6"
+inherit python qt4-r2
+
+DESCRIPTION="Generative art image evolver"
+HOMEPAGE="http://sourceforge.net/projects/evolvotron/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="
+	dev-qt/qtgui:4
+	dev-libs/boost
+"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${PN}
+
+pkg_setup() {
+	python_set_active_version 2
+}
+
+src_configure() {
+	eqmake4 main.pro
+}
+
+src_compile() {
+	./text_to_markup.py -html < USAGE > evolvotron.html
+	./text_to_markup.py -qml -s < USAGE > libevolvotron/usage_text.h
+
+	local etsubdir
+	for etsubdir in \
+		libfunction libevolvotron evolvotron evolvotron_render evolvotron_mutate
+		do
+		emake sub-${etsubdir}
+	done
+}
+
+src_install() {
+	for bin in ${PN}{,_mutate,_render}; do
+		dobin ${bin}/${bin}
+	done
+
+	doman man/man1/*
+	dodoc BUGS NEWS README TODO USAGE
+	dohtml *.html
+}
diff --git a/x11-misc/evolvotron/evolvotron-0.6.3.ebuild b/x11-misc/evolvotron/evolvotron-0.6.3.ebuild
new file mode 100644
index 000000000000..8a428a76ce96
--- /dev/null
+++ b/x11-misc/evolvotron/evolvotron-0.6.3.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit qt4-r2
+
+DESCRIPTION="Generative art image evolver"
+HOMEPAGE="http://sourceforge.net/projects/evolvotron/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="
+	dev-libs/boost
+	dev-qt/qtgui:4
+"
+DEPEND="
+	${DEPEND}
+"
+
+S=${WORKDIR}/${PN}
+
+src_configure() {
+	eqmake4 main.pro
+}
+
+src_compile() {
+	local etsubdir
+	for etsubdir in \
+		libfunction libevolvotron evolvotron evolvotron_render evolvotron_mutate
+		do
+		emake sub-${etsubdir}
+	done
+}
+
+src_install() {
+	local bin
+	for bin in ${PN}{,_mutate,_render}; do
+		dobin ${bin}/${bin}
+	done
+	doman man/man1/*
+	dodoc BUGS NEWS README TODO USAGE
+	dohtml *.html
+}
diff --git a/x11-misc/evolvotron/metadata.xml b/x11-misc/evolvotron/metadata.xml
new file mode 100644
index 000000000000..77c9e1d9c3f6
--- /dev/null
+++ b/x11-misc/evolvotron/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>desktop-misc</herd>
+	<upstream>
+		<remote-id type="sourceforge">evolvotron</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-misc/fbdesk/Manifest b/x11-misc/fbdesk/Manifest
new file mode 100644
index 000000000000..7c2cdf0197b8
--- /dev/null
+++ b/x11-misc/fbdesk/Manifest
@@ -0,0 +1 @@
+DIST fbdesk-1.4.1.tar.gz 426550 SHA256 ca5620468ca8743c6bf536099ac6ddc2a0546e5d658bb88f27db8e429ff51c4c SHA512 0a99ae062442f85a9d4018db0f2815c0e537488999e71aef18eb3df09526e2b9c931e5caf30bb0cf484ddce28c3fc3672773fbf576e3f932f30ee48c89b346a0 WHIRLPOOL f3b5ece5d9b59f961843cbe91ca4c2dbd65b0ddb7bf5091c25778579ed668d30b2b8a932f4ee1e42fef2aa4c0e3aa9c10e79dd865eec6b2bfdfa2a4a73a3465d
diff --git a/x11-misc/fbdesk/fbdesk-1.4.1.ebuild b/x11-misc/fbdesk/fbdesk-1.4.1.ebuild
new file mode 100644
index 000000000000..96060a3e0d32
--- /dev/null
+++ b/x11-misc/fbdesk/fbdesk-1.4.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils
+
+DESCRIPTION="fluxbox-util application that creates and manage icons on your Fluxbox desktop"
+HOMEPAGE="http://fluxbox.sourceforge.net/fbdesk/"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ia64 ppc sparc x86"
+IUSE="debug png"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXpm
+	x11-libs/libXrender
+	x11-libs/libXft
+	media-libs/imlib2[X]
+	png? ( media-libs/libpng )"
+DEPEND="${RDEPEND}
+	x11-proto/xproto"
+
+DOCS=( AUTHORS ChangeLog README )
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-gcc-4.3.patch \
+		"${FILESDIR}"/${P}-libpng14.patch \
+		"${FILESDIR}"/${P}-libpng15.patch
+}
+
+src_configure() {
+	econf \
+		$(use_enable debug) \
+		$(use_enable png)
+}
diff --git a/x11-misc/fbdesk/files/fbdesk-1.4.1-gcc-4.3.patch b/x11-misc/fbdesk/files/fbdesk-1.4.1-gcc-4.3.patch
new file mode 100644
index 000000000000..97c0b31678af
--- /dev/null
+++ b/x11-misc/fbdesk/files/fbdesk-1.4.1-gcc-4.3.patch
@@ -0,0 +1,156 @@
+--- a/src/FbDesk.cc
++++ b/src/FbDesk.cc
+@@ -37,10 +37,11 @@
+ #include <iostream>
+ #include <fstream>
+ #include <algorithm>
+ #include <unistd.h>
+ #include <cstdio>
++#include <cstring>
+ 
+ using namespace std;
+ using namespace FbTk;
+ 
+ 
+--- a/src/FbTk/FbPixmap.cc
++++ b/src/FbTk/FbPixmap.cc
+@@ -28,10 +28,11 @@
+ 
+ #include <X11/Xutil.h>
+ #include <X11/Xatom.h>
+ #include <iostream>
+ #include <string>
++#include <cstring>
+ 
+ using namespace std;
+ 
+ namespace FbTk {
+ 
+--- a/src/FbTk/KeyUtil.cc
++++ b/src/FbTk/KeyUtil.cc
+@@ -23,10 +23,11 @@
+ 
+ #include "KeyUtil.hh"
+ #include "App.hh"
+ 
+ #include <string>
++#include <cstring>
+ 
+ namespace {
+ 
+ struct t_modlist{
+     char *str;
+--- a/src/FbTk/StringUtil.cc
++++ b/src/FbTk/StringUtil.cc
+@@ -47,10 +47,11 @@
+ 
+ 
+ #include <memory>
+ #include <algorithm>
+ #include <string>
++#include <cstring>
+ 
+ using std::string;
+ using std::transform;
+ 
+ namespace FbTk {
+--- a/src/FbTk/TextBox.cc
++++ b/src/FbTk/TextBox.cc
+@@ -34,10 +34,11 @@
+ #endif
+ #include <X11/keysym.h>
+ #include <X11/Xutil.h>
+ 
+ #include <iostream>
++#include <cstdlib>
+ 
+ namespace FbTk {
+ 
+ TextBox::TextBox(int screen_num,
+                  const Font &font, const std::string &text):
+--- a/src/FbTk/TextureRender.cc
++++ b/src/FbTk/TextureRender.cc
+@@ -31,10 +31,11 @@
+ #include "FbPixmap.hh"
+ #include "GContext.hh"
+ 
+ #include <iostream>
+ #include <string>
++#include <cstring>
+ #ifdef HAVE_CSTDIO
+   #include <cstdio>
+ #else
+   #include <stdio.h>
+ #endif
+--- a/src/FbTk/Theme.cc
++++ b/src/FbTk/Theme.cc
+@@ -34,10 +34,11 @@
+ #else
+   #include <stdio.h>
+ #endif
+ #include <memory>
+ #include <iostream>
++#include <algorithm>
+ 
+ using namespace std;
+ 
+ namespace FbTk {
+ 
+--- a/src/FbTk/ThemeItems.cc
++++ b/src/FbTk/ThemeItems.cc
+@@ -46,10 +46,12 @@
+   #include <stdio.h>
+ #endif
+ 
+ #include <iostream>
+ #include <memory>
++#include <cstdlib>
++#include <cstring>
+ 
+ namespace FbTk {
+ 
+ using std::string;
+ using std::cerr;
+--- a/src/FbTk/XFontImp.cc
++++ b/src/FbTk/XFontImp.cc
+@@ -26,10 +26,11 @@
+ #include "GContext.hh"
+ #include "FbPixmap.hh"
+ 
+ #include <X11/Xutil.h>
+ 
++#include <cstdlib>
+ #include <iostream>
+ #include <new>
+ #ifdef HAVE_CSTDIO
+   #include <cstdio>
+ #else
+--- a/src/main.cc
++++ b/src/main.cc
+@@ -21,14 +21,16 @@
+ 
+ #include "App.hh"
+ #include "FbDesk.hh"
+ #include "version.h"
+ 
++#include <cstdlib>
+ #include <iostream>
+ #include <stdexcept>
+ #include <signal.h>
+ #include <sys/wait.h>
++#include <cstring>
+ 
+ using namespace std;
+ 
+ ///  handles system signals
+ void signalhandler(int sig) {
+--- a/src/FbTk/ImagePNG.cc
++++ b/src/FbTk/ImagePNG.cc
+@@ -30,6 +30,7 @@
+ #include <png.h>
+ #include <cstdio>
+ #include <iostream>
++#include <cstring>
+ using namespace std;
+ 
+ namespace {
diff --git a/x11-misc/fbdesk/files/fbdesk-1.4.1-libpng14.patch b/x11-misc/fbdesk/files/fbdesk-1.4.1-libpng14.patch
new file mode 100644
index 000000000000..472df8b742e5
--- /dev/null
+++ b/x11-misc/fbdesk/files/fbdesk-1.4.1-libpng14.patch
@@ -0,0 +1,11 @@
+--- src/FbTk/ImagePNG.cc
++++ src/FbTk/ImagePNG.cc
+@@ -88,7 +88,7 @@
+     // check header
+     unsigned char tag[4];
+     fread(tag, 1, 4, fp);
+-    if (!png_check_sig(tag, 4)) {
++    if (png_sig_cmp(tag, 0, 4)) {
+         fclose(fp);
+         return 0;
+     }
diff --git a/x11-misc/fbdesk/files/fbdesk-1.4.1-libpng15.patch b/x11-misc/fbdesk/files/fbdesk-1.4.1-libpng15.patch
new file mode 100644
index 000000000000..fbfd9cb09628
--- /dev/null
+++ b/x11-misc/fbdesk/files/fbdesk-1.4.1-libpng15.patch
@@ -0,0 +1,145 @@
+This patch is from netbsd pkgsrc
+
+ftp://ftp.netbsd.org/pub/pkgsrc/current/pkgsrc/x11/fbdesk/patches
+
+--- src/FbTk/ImagePNG.cc
++++ src/FbTk/ImagePNG.cc
+@@ -76,6 +76,8 @@ ImagePNG::~ImagePNG() {
+ }
+ 
+ PixmapWithMask *ImagePNG::load(const std::string &filename, int screen_num) const {
++    int pixel_depth;
++    int rowbytes;
+     if (filename.empty())
+         return 0;
+ #ifdef DEBUG
+@@ -102,7 +104,7 @@ PixmapWithMask *ImagePNG::load(const std
+         return 0;
+     }
+ 
+-    if (setjmp(png.png()->jmpbuf)) {
++    if (setjmp(png_jmpbuf(png.png()))) {
+         fclose(fp);
+         return 0;
+     }
+@@ -115,12 +117,14 @@ PixmapWithMask *ImagePNG::load(const std
+     png_get_IHDR(png.png(), png.info(), &w, &h,
+                  &bit_depth, &color_type,
+                  &interlace_type, 0, 0);
++    pixel_depth = bit_depth * png_get_channels(png.png(), png.info());
++    rowbytes = png_get_rowbytes(png.png(), png.info());
+ #ifdef DEBUG    
+-    cerr<<png.info()->width<<", "<<png.info()->height<<endl;
+-    cerr<<"bit_depth = "<<(int)png.info()->bit_depth<<endl;
+-    cerr<<"bytes per pixel = "<<((int)png.info()->bit_depth>>3)<<endl;
+-    cerr<<"pixel depth = "<<(int)png.info()->pixel_depth<<endl;
+-    cerr<<"rowbytes = "<<png.info()->rowbytes<<endl;
++    cerr<<png_get_image_width(png.png(), png.info())<<", "<<png_get_image_height(png.png(), png.info())<<endl;
++    cerr<<"bit_depth = "<<(int)png_get_bit_depth(png.png(),png.info())<<endl;
++    cerr<<"bytes per pixel = "<<((int)png_get_bit_depth(png.png(), png.info())>>3)<<endl;
++    cerr<<"pixel depth = "<<pixel_depth<<endl;
++    cerr<<"rowbytes = "<<rowbytes<<endl;
+     cerr<<"Color type = ";
+     switch (color_type) {
+     case PNG_COLOR_TYPE_GRAY:
+@@ -146,7 +150,7 @@ PixmapWithMask *ImagePNG::load(const std
+     // convert to rgb
+     if (color_type == PNG_COLOR_TYPE_PALETTE && bit_depth <= 8) {
+         png_set_expand(png.png());
+-        png.info()->pixel_depth = 8;
++        pixel_depth = 8;
+     }
+     // convert to rgb
+     if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) {
+@@ -158,7 +162,7 @@ PixmapWithMask *ImagePNG::load(const std
+     if (color_type == PNG_COLOR_TYPE_GRAY ||
+         color_type == PNG_COLOR_TYPE_GRAY_ALPHA) {
+         png_set_gray_to_rgb(png.png());
+-        png.info()->pixel_depth = 8;
++        pixel_depth = 8;
+         color_type = PNG_COLOR_TYPE_RGB;
+     }
+ 
+@@ -170,23 +174,23 @@ PixmapWithMask *ImagePNG::load(const std
+     // expand to 4 bytes
+     if (bit_depth == 8 && color_type == PNG_COLOR_TYPE_RGB) {
+         png_set_filler(png.png(), 0, PNG_FILLER_AFTER);
+-        png.info()->rowbytes = png.info()->width * 4;
+-        png.info()->pixel_depth = 32;
++        rowbytes = png_get_image_width(png.png(), png.info()) * 4;
++        pixel_depth = 32;
+     }
+     
+-    if (png.info()->pixel_depth == 4 ||
+-        png.info()->pixel_depth == 8)
++    if (pixel_depth == 4 ||
++        pixel_depth == 8)
+         return 0;
+ 
+     // create memory to hold rows
+-    png_bytep *row_pointers = new (nothrow) png_bytep[png.info()->height];
++    png_bytep *row_pointers = new (nothrow) png_bytep[png_get_image_height(png.png(), png.info())];
+     if (row_pointers == 0) {
+         fclose(fp);
+         return 0;
+     }
+ 
+-    for (unsigned int row = 0; row < png.info()->height; ++row) {
+-        row_pointers[row] = new png_byte[png.info()->rowbytes];
++    for (unsigned int row = 0; row < png_get_image_height(png.png(), png.info()); ++row) {
++        row_pointers[row] = new png_byte[rowbytes];
+     }
+ 
+     // get transparent pixel
+@@ -214,31 +218,31 @@ PixmapWithMask *ImagePNG::load(const std
+     fclose(fp);
+ 
+     // clear linear memory
+-    char *data = new char[png.info()->rowbytes * png.info()->height];
+-    for (int offset=0, y = 0; y < png.info()->height; y++) {
+-        for (int x = 0; x < png.info()->rowbytes; x++, offset++) {
++    char *data = new char[rowbytes * png_get_image_height(png.png(), png.info())];
++    for (int offset=0, y = 0; y < png_get_image_height(png.png(), png.info()); y++) {
++        for (int x = 0; x < rowbytes; x++, offset++) {
+             data[offset] = row_pointers[y][x];
+         }
+     }
+ 
+-    FbTk::Surface *srf = new (nothrow) FbTk::Surface(png.info()->width, png.info()->height,
+-                                                     png.info()->pixel_depth);
++    FbTk::Surface *srf = new (nothrow) FbTk::Surface(png_get_image_width(png.png(), png.info()), png_get_image_height(png.png(), png.info()),
++                                                     pixel_depth);
+ 
+     if (srf == 0)
+         return 0;
+ 
+ 
+     // finaly copy data to surface
+-    switch (png.info()->pixel_depth) {
++    switch (pixel_depth) {
+     case 16:
+         convert16to32(data, *srf);
+         break;
+     case 24:
+     case 32:
+-        memcpy(srf->data(), data, png.info()->height * png.info()->rowbytes);
++        memcpy(srf->data(), data, png_get_image_height(png.png(), png.info()) * rowbytes);
+         break;
+     default:
+-        cerr<<"ImagePNG: Can't convert from "<<(int)png.info()->pixel_depth<<" to 32bpp."<<endl;
++        cerr<<"ImagePNG: Can't convert from "<<pixel_depth<<" to 32bpp."<<endl;
+         break;
+     }
+     
+@@ -264,9 +268,9 @@ PixmapWithMask *ImagePNG::load(const std
+         long i = 0x44332211;
+         unsigned char* a = (unsigned char*) &i;
+         bool big_endian = (*a != 0x11);
+-        int alphacolor = ((png.info()->channels != 4) ? 0xFF000000 : 0);
++        int alphacolor = ((png_get_channels(png.png(), png.info()) != 4) ? 0xFF000000 : 0);
+         if (big_endian) {
+-            int shift = ((png.info()->channels == 4) ? 0 : 8);
++            int shift = ((png_get_channels(png.png(), png.info()) == 4) ? 0 : 8);
+             alphacolor = (0xFF >> shift);    
+         }
+         screen_surf.setColorKey(alphacolor, true);
diff --git a/x11-misc/fbdesk/metadata.xml b/x11-misc/fbdesk/metadata.xml
new file mode 100644
index 000000000000..4538a68724a6
--- /dev/null
+++ b/x11-misc/fbdesk/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
+</pkgmetadata>
diff --git a/x11-misc/fbpager/Manifest b/x11-misc/fbpager/Manifest
new file mode 100644
index 000000000000..565261e38af7
--- /dev/null
+++ b/x11-misc/fbpager/Manifest
@@ -0,0 +1 @@
+DIST fbpager-20090221.tar.bz2 267876 SHA256 3120bee671b482cd0985e6bfe1ed63d4518f2b648dc0730861776db5c738d921 SHA512 fca9a43a3f71b1eb7b27befb3de4b0010f4974cb8898050325bec6def19f1b99a8e549eec04c14ef7777da8d23c25f8e799798160384e08d5a213c9c202bfd7a WHIRLPOOL b4cfe551b2c1b6e233c5243b8d1128ca1ed445bc670105688cf9141c60131d858bcd6d508160a258a102f0b466ddeea4e7ebf323e0c57da0afd1b529ba71f668
diff --git a/x11-misc/fbpager/fbpager-20090221.ebuild b/x11-misc/fbpager/fbpager-20090221.ebuild
new file mode 100644
index 000000000000..38d8762a053d
--- /dev/null
+++ b/x11-misc/fbpager/fbpager-20090221.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+inherit eutils
+
+DESCRIPTION="A Pager for fluxbox"
+HOMEPAGE="http://git.fluxbox.org/fbpager.git/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~mips ppc ~sparc x86 ~x86-fbsd"
+IUSE="+xrender"
+
+DEPEND="x11-libs/libX11
+	xrender? ( x11-libs/libXrender )"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	econf $(use_enable xrender)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc AUTHORS NEWS README TODO
+}
+
+pkg_postinst() {
+	einfo "To run fbpager inside the FluxBox slit, use fbpager -w"
+}
diff --git a/x11-misc/fbpager/files/fbpager-0.1.4-gcc41.patch b/x11-misc/fbpager/files/fbpager-0.1.4-gcc41.patch
new file mode 100644
index 000000000000..8f085d5a9724
--- /dev/null
+++ b/x11-misc/fbpager/files/fbpager-0.1.4-gcc41.patch
@@ -0,0 +1,76 @@
+--- fbpager-0.1.4.orig/src/Resources.hh
++++ fbpager-0.1.4/src/Resources.hh
+@@ -8,8 +8,10 @@
+ #include <cstdio>
+ #include <cstring>
+ 
++namespace FbTk {
++
+ template<>
+-void FbTk::Resource<bool>::
++void Resource<bool>::
+ setFromString(char const *strval) {
+     if (strcasecmp(strval, "true") == 0 ||
+         strcasecmp(strval, "yes") == 0)
+@@ -19,38 +21,37 @@
+ }
+ 
+ template<>
+-std::string FbTk::Resource<bool>::
++std::string Resource<bool>::
+ getString() {				
+     return std::string(**this == true ? "true" : "false");
+ }
+ 
+ template <>
+-void FbTk::Resource<std::string>::setFromString(const char *str) {
++void Resource<std::string>::setFromString(const char *str) {
+     *(*this) = (str ?  str : "");
+ }
+ 
+ template <>
+-std::string FbTk::Resource<std::string>::getString() {
++std::string Resource<std::string>::getString() {
+     return *(*this);
+ }
+ 
+ template <>
+-void FbTk::Resource<int>::setFromString(const char *str) {
++void Resource<int>::setFromString(const char *str) {
+     if (str == 0)
+         return;
+     sscanf(str, "%d", &(*(*this)));
+ }
+ 
+ template <>
+-std::string FbTk::Resource<int>::getString() {
++std::string Resource<int>::getString() {
+     char buff[16];
+     sprintf(buff, "%d", (*(*this)));
+     return std::string(buff);
+ }
+ 
+-namespace FbPager {
+ template <>
+-void FbTk::Resource<FbPager::Alignment>::setFromString(const char *str) {
++void Resource<FbPager::FbPager::Alignment>::setFromString(const char *str) {
+     if (strcmp("TopToBottom", str) == 0)
+         *(*this) = FbPager::FbPager::TOP_TO_BOTTOM;
+     else
+@@ -58,7 +59,7 @@
+ }
+ 
+ template <>
+-std::string FbTk::Resource<FbPager::Alignment>::getString() {
++std::string Resource<FbPager::FbPager::Alignment>::getString() {
+     switch (*(*this)) {
+     case FbPager::FbPager::LEFT_TO_RIGHT:
+         return "LeftToRight";
+@@ -67,6 +68,6 @@
+     }
+ }
+ 
+-} // end namespace FbPager
++} // end namespace FbTk
+ 
+ #endif // RESOURCES
diff --git a/x11-misc/fbpager/files/fbpager-0.1.4-gcc43.patch b/x11-misc/fbpager/files/fbpager-0.1.4-gcc43.patch
new file mode 100644
index 000000000000..9289e990bac4
--- /dev/null
+++ b/x11-misc/fbpager/files/fbpager-0.1.4-gcc43.patch
@@ -0,0 +1,63 @@
+--- src/FbTk/StringUtil.cc.orig	2008-06-14 17:36:06.000000000 +0000
++++ src/FbTk/StringUtil.cc	2008-06-14 17:39:56.000000000 +0000
+@@ -23,6 +23,9 @@
+ 
+ #include "StringUtil.hh"
+ 
++
++#include <cstring>
++#include <locale>
+ #include <string>
+ #include <cstdio>
+ #include <cstdlib>
+@@ -37,6 +40,26 @@
+ 
+ namespace StringUtil {
+ 
++
++/* 
++ * structs needed for std::transform() 
++ * See: http://gcc.gnu.org/onlinedocs/libstdc++/22_locale/howto.html#7 
++ */ 
++struct ToUpper { 
++  ToUpper(std::locale const& l) : loc(l) {;} 
++  char operator() (char c) const  { return std::toupper(c,loc); } 
++ private: 
++  std::locale const& loc; 
++}; 
++	 
++struct ToLower { 
++  ToLower(std::locale const& l) : loc(l) {;} 
++  char operator() (char c) const  { return std::tolower(c,loc); } 
++private: 
++  std::locale const& loc; 
++}; 
++
++
+ /**
+    Takes a pointer to string *s as an argument,
+    creates a new string n, copies s to n and
+@@ -160,14 +183,20 @@
+ }
+ 
+ std::string toLower(const std::string &conv) {
++
++    ToLower __tolower(std::locale::classic());
++
+     std::string ret = conv;
+-    std::transform(ret.begin(), ret.end(), ret.begin(), tolower);
++    std::transform(ret.begin(), ret.end(), ret.begin(), __tolower);
+     return ret;
+ }
+ 
+ std::string toUpper(const std::string &conv) {
++
++    ToUpper __toupper(std::locale::classic());
++
+     std::string ret = conv;
+-    std::transform(ret.begin(), ret.end(), ret.begin(), toupper);
++    std::transform(ret.begin(), ret.end(), ret.begin(), __toupper);
+     return ret;
+ }
+ 
+
diff --git a/x11-misc/fbpager/metadata.xml b/x11-misc/fbpager/metadata.xml
new file mode 100644
index 000000000000..2deafa5692f4
--- /dev/null
+++ b/x11-misc/fbpager/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
+	<use>
+		<flag name='xrender'>Enable transparency support via
+			<pkg>x11-libs/libXrender</pkg></flag>
+	</use>
+</pkgmetadata>
diff --git a/x11-misc/fbpanel/Manifest b/x11-misc/fbpanel/Manifest
new file mode 100644
index 000000000000..ee89550ced9c
--- /dev/null
+++ b/x11-misc/fbpanel/Manifest
@@ -0,0 +1 @@
+DIST fbpanel-6.1.tbz2 190266 SHA256 e14542cc81ea06e64dd4708546f5fd3f5e01884c3e4617885c7ef22af8cf3965 SHA512 10ffa422d811725dff68f43af9735d79c7859114bdf06f49b05e0bc4b0fd5eb8a3ea196cd07753f261d60c0bd0716baa6d5a22c860dde6597c70bfcfb0f7078e WHIRLPOOL 362d4beaa383ad716a851d4fe1a5e583d635c300a0d97ba36d07e2709b8ca09cd6756c7bf8f7fc62508c547dc23c043b6ad0e90787dc629b3dda280d2b55e97e
diff --git a/x11-misc/fbpanel/fbpanel-6.1-r2.ebuild b/x11-misc/fbpanel/fbpanel-6.1-r2.ebuild
new file mode 100644
index 000000000000..ec43317cb63a
--- /dev/null
+++ b/x11-misc/fbpanel/fbpanel-6.1-r2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="light-weight X11 desktop panel"
+HOMEPAGE="http://fbpanel.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tbz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm ~mips ppc ppc64 x86"
+IUSE=""
+
+RDEPEND="x11-libs/gtk+:2"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=( CHANGELOG CREDITS README )
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-underlinking.patch
+	epatch "${FILESDIR}"/${P}-xlogout.patch
+	tc-export CC
+}
+
+src_configure() {
+	# not autotools based
+	echo "./configure --datadir=/usr/share --libdir=/usr/$(get_libdir)"
+	./configure --datadir=/usr/share --libdir=/usr/$(get_libdir) || die
+}
+
+pkg_postinst() {
+	elog "For the volume plugin to work, you need to configure your kernel"
+	elog "with CONFIG_SND_MIXER_OSS or CONFIG_SOUND_PRIME or some other means"
+	elog "that provide the /dev/mixer device node."
+}
diff --git a/x11-misc/fbpanel/files/fbpanel-6.1-underlinking.patch b/x11-misc/fbpanel/files/fbpanel-6.1-underlinking.patch
new file mode 100644
index 000000000000..74c04d55f76d
--- /dev/null
+++ b/x11-misc/fbpanel/files/fbpanel-6.1-underlinking.patch
@@ -0,0 +1,15 @@
+--- a/scripts/custom.sh
++++ b/scripts/custom.sh
+@@ -18,10 +18,10 @@
+ add_feature dependency "disable dependency tracking" disabled
+ 
+ add_var glib_cflags "glib cflags" '`RFS=$rfs scripts/rfs-pkg-config --cflags glib-2.0`'
+-add_var gtk_cflags "gtk cflags" '`RFS=$rfs scripts/rfs-pkg-config --cflags gtk+-2.0`'
++add_var gtk_cflags "gtk cflags" '`RFS=$rfs scripts/rfs-pkg-config --cflags gtk+-2.0 x11`'
+ 
+ add_var glib_libs "glib libs" '`RFS=$rfs scripts/rfs-pkg-config --libs glib-2.0`'
+-add_var gtk_libs "gtk libs" '`RFS=$rfs scripts/rfs-pkg-config --libs gtk+-2.0`'
++add_var gtk_libs "gtk libs" '`RFS=$rfs scripts/rfs-pkg-config --libs gtk+-2.0 x11` -lm'
+ 
+ add_var cflagsx "C flags" '-I$topdir/panel $glib_cflags $gtk_cflags -fPIC'
+ add_var ldflagsx "linker flags" '$glib_libs $gtk_libs'
diff --git a/x11-misc/fbpanel/files/fbpanel-6.1-xlogout.patch b/x11-misc/fbpanel/files/fbpanel-6.1-xlogout.patch
new file mode 100644
index 000000000000..a6cd71e75d50
--- /dev/null
+++ b/x11-misc/fbpanel/files/fbpanel-6.1-xlogout.patch
@@ -0,0 +1,13 @@
+Gentoo: https://bugs.gentoo.org/show_bug.cgi?id=501804
+Upstream: http://sourceforge.net/p/fbpanel/code/474/
+
+Signed-off-by: Markos Chandras <hwoarang@gentoo.org>
+
+--- a/exec/xlogout
++++ b/exec/xlogout
+@@ -45,5 +45,5 @@
+ [ -z "$SPID" ] && exit 1
+ echo "Session start up script"
+ ps -o uid,pid,ppid,sess,cmd --pid $SPID
+-kill -SIGTERM -$SPID
++kill -SIGTERM -$SPID $SPID
diff --git a/x11-misc/fbpanel/metadata.xml b/x11-misc/fbpanel/metadata.xml
new file mode 100644
index 000000000000..4172fa486e98
--- /dev/null
+++ b/x11-misc/fbpanel/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>desktop-misc</herd>
+  <upstream>
+    <remote-id type="sourceforge">fbpanel</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/x11-misc/fireflies/Manifest b/x11-misc/fireflies/Manifest
new file mode 100644
index 000000000000..9506a36f962e
--- /dev/null
+++ b/x11-misc/fireflies/Manifest
@@ -0,0 +1 @@
+DIST fireflies-2.07.tar.gz 199917 SHA256 e215d5306340aed25a103bd6af34b6d3ef0d9f2628c56d3a67b2eb4a9f19a648 SHA512 d8d478c3ff7705eb2e2f04f490d37ea8d7edcac2fcdc99e06f9bad09c0f1b678d62f09b3d965734f230b2aa3d804c81ad3d15429ede7cb8e951213716f61666a WHIRLPOOL c7714c4f1d694a9b832594ee0627324dc6a3606d62d1a5e83ba05fb1ccfdc3a1cc7e86c8c3634cd008f70e6e443e668c3c41e795941d59af3370f1c5b0562509
diff --git a/x11-misc/fireflies/files/fireflies-2.06-Make.include.in.patch b/x11-misc/fireflies/files/fireflies-2.06-Make.include.in.patch
new file mode 100644
index 000000000000..e7cb5ec5a7c2
--- /dev/null
+++ b/x11-misc/fireflies/files/fireflies-2.06-Make.include.in.patch
@@ -0,0 +1,15 @@
+--- a/Make.include.in	2003-04-17 06:02:52.000000000 +0100
++++ b/Make.include.in	2003-11-18 18:36:36.000000000 +0000
+@@ -5,8 +5,9 @@
+ GL_LIBS = @GL_LIBS@
+ OPT_LIBS = @OPT_LIBS@
+ 
+-CFLAGS = -Wall -I../libgfx/include/ $(SDL_CFLAGS) @CFLAGS@
+-LIBS = ../libgfx/src/libgfx.a $(GL_LIBS) $(SDL_LIBS) $(OPT_LIBS) @LIBS@
++override CFLAGS += -Wall -I../libgfx/include/ $(SDL_CFLAGS)
++override CXXFLAGS += -Wall -I../libgfx/include/ $(SDL_CFLAGS)
++override LIBS += ../libgfx/src/libgfx.a $(GL_LIBS) $(SDL_LIBS) $(OPT_LIBS)
+ 
+ OBJECTS = arrow.o bait.o firefly.o scene.o tail.o utils.o modes.o @OPT_OBJS@
+ PROGRAM = @PROGRAM@
+
diff --git a/x11-misc/fireflies/files/fireflies-2.06-configure.patch b/x11-misc/fireflies/files/fireflies-2.06-configure.patch
new file mode 100644
index 000000000000..096b4018c3ab
--- /dev/null
+++ b/x11-misc/fireflies/files/fireflies-2.06-configure.patch
@@ -0,0 +1,14 @@
+--- a/configure	2003-06-21 17:04:21.000000000 +0100
++++ b/configure	2003-11-18 09:43:21.000000000 +0000
+@@ -2889,8 +2889,8 @@
+ #define HAVE_SDL 1
+ _ACEOF
+ 
+-    SDL_LIBS="\`sdl-config --libs\`"
+-    SDL_CFLAGS="\`sdl-config --cflags\`"
++    SDL_LIBS="`sdl-config --libs`"
++    SDL_CFLAGS="`sdl-config --cflags`"
+     OPT_OBJS="$OPT_OBJS canvas_sdl.o"
+ fi
+ 
+
diff --git a/x11-misc/fireflies/files/fireflies-2.07-build_system.patch b/x11-misc/fireflies/files/fireflies-2.07-build_system.patch
new file mode 100644
index 000000000000..2097b881b743
--- /dev/null
+++ b/x11-misc/fireflies/files/fireflies-2.07-build_system.patch
@@ -0,0 +1,85 @@
+Multiple QA issues:
+* Respect CXXFLAGS,LDFLAGS
+* fix parallel build
+* configure recursively
+* don't strip binaries
+* don't unpack libgfx during make
+
+http://bugs.gentoo.org/show_bug.cgi?id=336814
+
+--- configure.ac
++++ configure.ac
+@@ -2,6 +2,7 @@
+ AC_INIT(fireflies, 2.07, guy@somewhere.fscked.org)
+ AC_CONFIG_SRCDIR([src/arrow.cc])
+ AC_CONFIG_HEADER([config.h])
++AC_CONFIG_SUBDIRS([libgfx])
+ 
+ sys=`uname`
+ 
+--- Makefile
++++ Makefile
+@@ -21,18 +21,17 @@
+ win32/
+ 
+ all:	libgfx/src/libgfx.a
+-	cd src && make
++	$(MAKE) -C src
+ 
+ libgfx/src/libgfx.a:
+-	gunzip -c libgfx-1.0.1.tar.gz | tar x
+-	cd libgfx && ./configure && cd src && make
++	$(MAKE) -C libgfx/src
+ 
+ install: all
+ 	sh ./installit $(DESTDIR)
+ 
+ clean:
+-	make -C src clean
+-	make -C win32 clean
++	$(MAKE) -C src clean
++	$(MAKE) -C win32 clean
+ 
+ dist:
+ 	rm -rf fireflies-$(VERSION)
+@@ -42,7 +41,7 @@
+ 
+ 	# need Make.include temporarily to run make
+ 	cp Make.include fireflies-$(VERSION)
+-	make -C fireflies-$(VERSION) clean
++	$(MAKE) -C fireflies-$(VERSION) clean
+ 	rm -f fireflies-$(VERSION)/Make.include
+ 
+ 	# don't want to include debian's buildroot
+--- src/Makefile
++++ src/Makefile
+@@ -8,8 +8,7 @@
+ all:	$(PROGRAM)
+ 
+ $(PROGRAM):	$(OBJECTS)
+-	$(CXX) -o $(PROGRAM) $(OBJECTS) $(LIBS)
+-	strip $(PROGRAM)
++	$(CXX) $(LDFLAGS) -o $(PROGRAM) $(OBJECTS) $(LIBS)
+ 
+ $(OBJECTS): $(HEADERS)
+ 
+@@ -17,7 +16,7 @@
+ .SUFFIXES: .cc .rc .o
+ 
+ .cc.o:
+-	$(CXX) -c $(CFLAGS) -o $@ $<
++	$(CXX) -c $(CXXFLAGS) -o $@ $<
+ 
+ #$(HEADERS_GCH): %.h.gch: %.h
+ #	$(CXX) -c -x c++-header $(CFLAGS) -o $@ $<
+--- Make.include.in
++++ Make.include.in
+@@ -5,7 +5,7 @@
+ GL_LIBS = @GL_LIBS@
+ OPT_LIBS = @OPT_LIBS@
+ 
+-CFLAGS = -Wall -I../libgfx/include/ $(SDL_CFLAGS) @CFLAGS@
++CXXFLAGS = -Wall -I../libgfx/include/ $(SDL_CFLAGS) @CXXFLAGS@
+ LIBS = ../libgfx/src/libgfx.a $(GL_LIBS) $(SDL_LIBS) $(OPT_LIBS) @LIBS@
+ 
+ OBJECTS = arrow.o bait.o firefly.o scene.o tail.o utils.o modes.o @OPT_OBJS@
diff --git a/x11-misc/fireflies/files/fireflies-2.07-gcc43.patch b/x11-misc/fireflies/files/fireflies-2.07-gcc43.patch
new file mode 100644
index 000000000000..d6bad4d9dda4
--- /dev/null
+++ b/x11-misc/fireflies/files/fireflies-2.07-gcc43.patch
@@ -0,0 +1,11 @@
+--- fireflies-2.07/libgfx/src/raster.cxx.old	2008-07-29 17:53:35.000000000 -0500
++++ fireflies-2.07/libgfx/src/raster.cxx	2008-07-29 17:53:51.000000000 -0500
+@@ -9,7 +9,7 @@
+ #include <gfx/gfx.h>
+ #include <gfx/raster.h>
+ 
+-#include <string>
++#include <cstring>
+ #include <cctype>
+ 
+ ByteRaster::ByteRaster(const ByteRaster &img)
diff --git a/x11-misc/fireflies/files/fireflies-2.07-gcc44.patch b/x11-misc/fireflies/files/fireflies-2.07-gcc44.patch
new file mode 100644
index 000000000000..612a25ec280f
--- /dev/null
+++ b/x11-misc/fireflies/files/fireflies-2.07-gcc44.patch
@@ -0,0 +1,12 @@
+diff -ur fireflies-2.07.orig/src/vroot.h fireflies-2.07/src/vroot.h
+--- fireflies-2.07.orig/src/vroot.h	2005-12-09 05:07:30.000000000 +0200
++++ fireflies-2.07/src/vroot.h	2009-08-09 21:18:40.000000000 +0300
+@@ -78,6 +78,8 @@
+  "#Id: vroot.h,v 1.4 1991/09/30 19:23:16 stolcke Exp stolcke #";
+ #endif
+ 
++#include <stdio.h>
++
+ #include <X11/X.h>
+ #include <X11/Xatom.h>
+ #include <X11/Xlib.h>
diff --git a/x11-misc/fireflies/files/fireflies-2.07-glx-detection.patch b/x11-misc/fireflies/files/fireflies-2.07-glx-detection.patch
new file mode 100644
index 000000000000..f4c8bf5bb8f3
--- /dev/null
+++ b/x11-misc/fireflies/files/fireflies-2.07-glx-detection.patch
@@ -0,0 +1,52 @@
+From 41db6d93ab4d91f74761f8a34800b9026b0482c7 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Sat, 6 Jun 2015 20:25:39 +0200
+Subject: [PATCH] Fix underquoting in configure.ac
+
+.. resulting in
+
+  checking for glXSwapBuffers in -lGL... ./configure: line 3095: ac_fn_c_try_link: command not found
+  no
+
+at runtime.
+---
+ configure.ac | 22 +++++++++++-----------
+ 1 file changed, 11 insertions(+), 11 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 7bb7e72..cd7fa54 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -54,18 +54,18 @@ CYGWIN*|cygwin*|MINGW*|mingw*)
+     OPT_OBJS="main.o canvas_base.o"
+     PROGRAM="fireflies"
+ 
+-    AC_CHECK_LIB(GL, glXSwapBuffers,\
+-	AC_DEFINE(HAVE_GLX)
+-	OPT_OBJS="$OPT_OBJS canvas_glx.o",\
+-	AC_CHECK_LIB(MesaGL, glXSwapBuffers,\
+-	    AC_DEFINE(HAVE_GLX)
+-	    OPT_OBJS="$OPT_OBJS canvas_glx.o"))
+-
+-    AC_CHECK_LIB(GL, glBegin, \
+-	GL_LIBS="-lGL -lGLU", \
+-	AC_CHECK_LIB(MesaGL, glBegin, \
++    AC_CHECK_LIB([GL], [glXSwapBuffers],\
++	[AC_DEFINE(HAVE_GLX)
++	OPT_OBJS="$OPT_OBJS canvas_glx.o"],\
++	[AC_CHECK_LIB([MesaGL], [glXSwapBuffers],\
++	    [AC_DEFINE(HAVE_GLX)
++	    OPT_OBJS="$OPT_OBJS canvas_glx.o"])])
++
++    AC_CHECK_LIB([GL], [glBegin], \
++	[GL_LIBS="-lGL -lGLU"], \
++	[AC_CHECK_LIB([MesaGL], [glBegin], \
+ 	    [GL_LIBS="-lMesaGL -lMesaGLU"], \
+-	    AC_MSG_ERROR([cannot find GL libraries])))
++	    [AC_MSG_ERROR([cannot find GL libraries])])])
+ 
+     ;;
+ esac
+-- 
+2.4.0
+
diff --git a/x11-misc/fireflies/files/fireflies-2.07-libgfx-libpng15.patch b/x11-misc/fireflies/files/fireflies-2.07-libgfx-libpng15.patch
new file mode 100644
index 000000000000..23d471b8fd13
--- /dev/null
+++ b/x11-misc/fireflies/files/fireflies-2.07-libgfx-libpng15.patch
@@ -0,0 +1,20 @@
+--- libgfx/src/raster-png.cxx
++++ libgfx/src/raster-png.cxx
+@@ -39,7 +39,7 @@
+    // Because we didn't set up any error handlers, we need to be
+    // prepared to handle longjmps out of the library on error
+    // conditions.
+-   if( setjmp(png_ptr->jmpbuf) )
++   if( setjmp(png_jmpbuf(png_ptr)) )
+    {
+       png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
+       fclose(fp);
+@@ -129,7 +129,7 @@
+       return false;
+    }
+ 
+-   if( setjmp(png_ptr->jmpbuf) )
++   if( setjmp(png_jmpbuf(png_ptr)) )
+    {
+       fclose(fp);
+       png_destroy_write_struct(&png_ptr,  (png_infopp)NULL);
diff --git a/x11-misc/fireflies/files/fireflies-2.07-libgfx-libpng16.patch b/x11-misc/fireflies/files/fireflies-2.07-libgfx-libpng16.patch
new file mode 100644
index 000000000000..b599cac4f80f
--- /dev/null
+++ b/x11-misc/fireflies/files/fireflies-2.07-libgfx-libpng16.patch
@@ -0,0 +1,15 @@
+raster-png.cxx: In function ‘ByteRaster* read_png_image(const char*)’:
+raster-png.cxx:104:47: error: ‘memcpy’ was not declared in this scope
+       memcpy(pixel, row_pointers[row], nbytes);
+                                              ^
+
+--- libgfx/src/raster-png.cxx
++++ libgfx/src/raster-png.cxx
+@@ -16,6 +16,7 @@
+ #ifdef HAVE_LIBPNG
+ 
+ #include <png.h>
++#include <string.h> /* memcpy() */
+ 
+ ByteRaster *read_png_image(const char *file_name)
+ {
diff --git a/x11-misc/fireflies/files/fireflies-2.07-linking.patch b/x11-misc/fireflies/files/fireflies-2.07-linking.patch
new file mode 100644
index 000000000000..cc7e16994878
--- /dev/null
+++ b/x11-misc/fireflies/files/fireflies-2.07-linking.patch
@@ -0,0 +1,28 @@
+From da7c37ae638ac9e2989a3d65f529997c6d2111e1 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Sat, 6 Jun 2015 20:38:27 +0200
+Subject: [PATCH] Fix linking of src/canvas_glx.o
+
+Otherwise:
+/usr/lib/gcc/x86_64-pc-linux-gnu/4.8.4/../../../../x86_64-pc-linux-gnu/bin/ld: canvas_glx.o: undefined reference to symbol 'XPending'
+/usr/lib64/libX11.so.6: error adding symbols: DSO missing from command line
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index cd7fa54..1fa000b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -50,7 +50,7 @@ CYGWIN*|cygwin*|MINGW*|mingw*)
+ 	    test -f $try && RCFILE=$try
+     done
+ 
+-    OPT_LIBS=""
++    OPT_LIBS="-lX11"
+     OPT_OBJS="main.o canvas_base.o"
+     PROGRAM="fireflies"
+ 
+-- 
+2.4.0
+
diff --git a/x11-misc/fireflies/fireflies-2.07-r1.ebuild b/x11-misc/fireflies/fireflies-2.07-r1.ebuild
new file mode 100644
index 000000000000..a7a1e994a31e
--- /dev/null
+++ b/x11-misc/fireflies/fireflies-2.07-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils multilib
+
+DESCRIPTION="Fireflies screensaver: Wicked cool eye candy"
+HOMEPAGE="http://somewhere.fscked.org/proj/fireflies/"
+SRC_URI="http://somewhere.fscked.org/proj/${PN}/files/${P}.tar.gz"
+
+LICENSE="GPL-2 HPND" # HPND is for libgfx, see src_unpack()
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+RDEPEND="media-libs/libsdl
+	virtual/glu
+	virtual/opengl
+	x11-libs/libX11"
+DEPEND="${RDEPEND}"
+
+DOCS=( ChangeLog debian/README.Debian README )
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	tar -xzf libgfx-1.0.1.tar.gz
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-build_system.patch \
+		"${FILESDIR}"/${P}-gcc4{3,4}.patch \
+		"${FILESDIR}"/${P}-libgfx-libpng1{5,6}.patch
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--with-confdir=/usr/share/xscreensaver/config \
+		--with-bindir="/usr/$(get_libdir)/misc/xscreensaver"
+}
diff --git a/x11-misc/fireflies/fireflies-2.07-r2.ebuild b/x11-misc/fireflies/fireflies-2.07-r2.ebuild
new file mode 100644
index 000000000000..9f0420715f7b
--- /dev/null
+++ b/x11-misc/fireflies/fireflies-2.07-r2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils multilib
+
+DESCRIPTION="Fireflies screensaver: Wicked cool eye candy"
+HOMEPAGE="http://somewhere.fscked.org/proj/fireflies/"
+SRC_URI="http://somewhere.fscked.org/proj/${PN}/files/${P}.tar.gz"
+
+LICENSE="GPL-2 HPND" # HPND is for libgfx, see src_unpack()
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="media-libs/libsdl
+	virtual/glu
+	virtual/opengl
+	x11-libs/libX11"
+DEPEND="${RDEPEND}"
+
+DOCS=( ChangeLog debian/README.Debian README TODO )
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	tar -xzf libgfx-1.0.1.tar.gz
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-build_system.patch \
+		"${FILESDIR}"/${P}-glx-detection.patch \
+		"${FILESDIR}"/${P}-linking.patch \
+		"${FILESDIR}"/${P}-gcc4{3,4}.patch \
+		"${FILESDIR}"/${P}-libgfx-libpng1{5,6}.patch
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--with-confdir=/usr/share/xscreensaver/config \
+		--with-bindir="/usr/$(get_libdir)/misc/xscreensaver"
+}
+
+src_install() {
+	exeinto /usr/lib  # FHS: internal binaries
+	newexe {,${PN}-}add-xscreensaver
+
+	default
+}
diff --git a/x11-misc/fireflies/metadata.xml b/x11-misc/fireflies/metadata.xml
new file mode 100644
index 000000000000..2518313f5241
--- /dev/null
+++ b/x11-misc/fireflies/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+        <herd>desktop-misc</herd>
+</pkgmetadata>
diff --git a/x11-misc/flow-pomodoro/Manifest b/x11-misc/flow-pomodoro/Manifest
new file mode 100644
index 000000000000..74abdbce3ce8
--- /dev/null
+++ b/x11-misc/flow-pomodoro/Manifest
@@ -0,0 +1 @@
+DIST flow-pomodoro-1.1.1.tar.gz 684633 SHA256 311d22dcfe57dd7c236a2632368abdc667f42aaf7f1d713393d9dbbc12c3a855 SHA512 9a97d553b7a7ec5c32c0b6002e9f194fc297ef3fc18cb41d3ae7ca602d42d1313b1602e094f669f558ab15b7519c880dd12867724d5b2324f6e2d34ee409496d WHIRLPOOL f3183d0d3542f7fe28f97ed391dcc5e308cb783e27ca6b204623f14cefa722f2f28eda2d40203dbd0ba4c28c490c9bfc7861ba331c40dcd69152e126ec91828a
diff --git a/x11-misc/flow-pomodoro/flow-pomodoro-1.1.1.ebuild b/x11-misc/flow-pomodoro/flow-pomodoro-1.1.1.ebuild
new file mode 100644
index 000000000000..fbcfc2acd31a
--- /dev/null
+++ b/x11-misc/flow-pomodoro/flow-pomodoro-1.1.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-utils
+
+DESCRIPTION="A pomodoro app that blocks distractions while you work"
+HOMEPAGE="https://github.com/iamsergio/flow-pomodoro"
+SRC_URI="https://github.com/iamsergio/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="dev-qt/qtcore:5
+	dev-qt/qtquick1:5
+	dev-qt/qtdbus:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtquickcontrols:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5"
+RDEPEND="${DEPEND}"
diff --git a/x11-misc/flow-pomodoro/metadata.xml b/x11-misc/flow-pomodoro/metadata.xml
new file mode 100644
index 000000000000..d181ded0c734
--- /dev/null
+++ b/x11-misc/flow-pomodoro/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>mrueg@gentoo.org</email>
+		<name>Manuel Rüger</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">iamsergio/flow-pomodoro</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-misc/fluxter/Manifest b/x11-misc/fluxter/Manifest
new file mode 100644
index 000000000000..2f9ebc86c523
--- /dev/null
+++ b/x11-misc/fluxter/Manifest
@@ -0,0 +1 @@
+DIST fluxter-0.1.0.tar.gz 99522 SHA256 e2dc2c18e0a5299feac44facfc4748e92453e916b7b991fe79d00ae9c460e137
diff --git a/x11-misc/fluxter/files/fluxter-0.1.0-asneeded.patch b/x11-misc/fluxter/files/fluxter-0.1.0-asneeded.patch
new file mode 100644
index 000000000000..8b68260741e7
--- /dev/null
+++ b/x11-misc/fluxter/files/fluxter-0.1.0-asneeded.patch
@@ -0,0 +1,43 @@
+--- Makefile.am
++++ Makefile.am
+@@ -17,4 +17,4 @@
+ 		  NETInterface.cc NETInterface.hh \
+ 		  blackboxstyle.hh
+ EXTRA_DIST = BUGS TODO
+-fluxter_LDADD = @X_LIBS@
++fluxter_LDADD = @LIBS@
+--- configure.in
++++ configure.in
+@@ -18,14 +18,12 @@
+ [
+  test "$CFLAGS" = "" && CFLAGS="-g -Wall -DDEBUG"
+  test "$CXXFLAGS" = "" && CXXFLAGS="-g -Wall -DDEBUG"
+- test "$LDFLAGS" = "" && LDFLAGS=""
+ ])
+ 
+ AC_DEFUN(AC_SET_NODEBUG,
+ [
+- test "$CFLAGS" = "" && CFLAGS="-O2 -Wall"
+- test "$CXXFLAGS" = "" && CXXFLAGS="-O2 -Wall"
+- test "$LDFLAGS" = "" && LDFLAGS="-s"
++ test "$CFLAGS" = "" && CFLAGS="-Wall"
++ test "$CXXFLAGS" = "" && CXXFLAGS="-Wall"
+ ])
+       
+ 
+@@ -71,12 +69,12 @@
+ 
+ CFLAGS="$CFLAGS $X_CFLAGS"
+ CXXFLAGS="$CXXFLAGS $X_CFLAGS"
+-LDFLAGS="$LDFLAGS $X_LIBS $X_PRE_LIBS"
++LIBS="$LIBS $X_LIBS $X_PRE_LIBS"
+ dnl Checks for X libraries.
+-AC_CHECK_LIB(X11, XOpenDisplay, LDFLAGS="$LDFLAGS -lX11",
++AC_CHECK_LIB(X11, XOpenDisplay, LIBS="$LIBS -lX11",
+              AC_MSG_ERROR(XOpenDisplay not found in -lX11))
+ 
+-LDFLAGS="$LDFLAGS $X_EXTRA_LIBS"
++LIBS="$LIBS $X_EXTRA_LIBS"
+ 
+ dnl Checks for header files.
+ AC_HEADER_STDC
diff --git a/x11-misc/fluxter/fluxter-0.1.0.ebuild b/x11-misc/fluxter/fluxter-0.1.0.ebuild
new file mode 100644
index 000000000000..821fe277d845
--- /dev/null
+++ b/x11-misc/fluxter/fluxter-0.1.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+inherit autotools eutils
+
+DESCRIPTION="workspace pager dockapp, particularly useful with the Fluxbox window manager"
+HOMEPAGE="http://www.isomedia.com/homes/stevencooper"
+SRC_URI="http://www.isomedia.com/homes/stevencooper/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 hppa ppc x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND="x11-libs/libX11
+	x11-libs/libSM
+	x11-libs/libICE"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-asneeded.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--datadir=/usr/share/commonbox
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS BUGS ChangeLog README TODO
+}
diff --git a/x11-misc/fluxter/metadata.xml b/x11-misc/fluxter/metadata.xml
new file mode 100644
index 000000000000..1402a60126fa
--- /dev/null
+++ b/x11-misc/fluxter/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+	<email>pchrist@gentoo.org</email>
+	<name>Panagiotis Christopoulos</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-misc/fpm2/Manifest b/x11-misc/fpm2/Manifest
new file mode 100644
index 000000000000..2dc09f518e33
--- /dev/null
+++ b/x11-misc/fpm2/Manifest
@@ -0,0 +1 @@
+DIST fpm2-0.79.tar.bz2 230189 RMD160 4acd18d56ea70cdfc6696eb30ce452bb061121f5 SHA1 14e657aab737917c22e68796f127ed629b6c53b6 SHA256 d55e9ce6be38a44fc1053d82db2d117cf3991a51898bd86d7913bae769f04da7
diff --git a/x11-misc/fpm2/fpm2-0.79.ebuild b/x11-misc/fpm2/fpm2-0.79.ebuild
new file mode 100644
index 000000000000..b1e6cc141635
--- /dev/null
+++ b/x11-misc/fpm2/fpm2-0.79.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+DESCRIPTION="A GUI password manager utility with password generator"
+HOMEPAGE="http://als.regnet.cz/fpm2/"
+SRC_URI="http://als.regnet.cz/${PN}/download/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND=">=x11-libs/gtk+-2.10.14:2
+	dev-libs/libxml2
+	>=dev-libs/glib-2.16
+	x11-libs/libX11"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	dev-util/intltool"
+
+DOCS="AUTHORS ChangeLog NEWS README TODO"
+
+src_prepare() {
+	# fix tests
+	for x in ${PN}.glade data/${PN}.desktop.in; do
+		echo "${x}" >> "${S}"/po/POTFILES.in
+	done
+}
diff --git a/x11-misc/fpm2/metadata.xml b/x11-misc/fpm2/metadata.xml
new file mode 100644
index 000000000000..5e3a61a90139
--- /dev/null
+++ b/x11-misc/fpm2/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+<email>hwoarang@gentoo.org</email>
+<name>Markos Chandras</name>
+</maintainer>
+<longdescription lang="en">
+</longdescription>
+</pkgmetadata>
+
diff --git a/x11-misc/fracplanet/Manifest b/x11-misc/fracplanet/Manifest
new file mode 100644
index 000000000000..82a98e11fd3a
--- /dev/null
+++ b/x11-misc/fracplanet/Manifest
@@ -0,0 +1 @@
+DIST fracplanet-0.4.0.tar.gz 101700 SHA256 38d56aba3c5cf19d4f2c218bece471d3860b161d2210a24ba94550356723482a
diff --git a/x11-misc/fracplanet/files/fracplanet-0.4.0-gold.patch b/x11-misc/fracplanet/files/fracplanet-0.4.0-gold.patch
new file mode 100644
index 000000000000..c980dfdd6b33
--- /dev/null
+++ b/x11-misc/fracplanet/files/fracplanet-0.4.0-gold.patch
@@ -0,0 +1,22 @@
+--- triangle_mesh_viewer.h
++++ triangle_mesh_viewer.h
+@@ -24,6 +24,7 @@
+ #ifndef _triangle_mesh_viewer_h_
+ #define _triangle_mesh_viewer_h_
+ 
++#include <GL/glu.h>
+ #include "parameters_render.h"
+ #include "random.h"
+ #include "triangle_mesh.h"
+
+--- fracplanet.pro
++++ fracplanet.pro
+@@ -8,7 +8,7 @@
+ 
+ HEADERS += $$system(ls *.h)
+ SOURCES += $$system(ls *.cpp)
+-LIBS += -lboost_program_options
++LIBS += -lboost_program_options -lGLU
+ 
+ DEFINES += QT_DLL
+ 
diff --git a/x11-misc/fracplanet/fracplanet-0.4.0.ebuild b/x11-misc/fracplanet/fracplanet-0.4.0.ebuild
new file mode 100644
index 000000000000..91f2aec4c800
--- /dev/null
+++ b/x11-misc/fracplanet/fracplanet-0.4.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit qt4-r2
+
+DESCRIPTION="Fractal planet and terrain generator"
+HOMEPAGE="http://sourceforge.net/projects/fracplanet/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-libs/boost
+	virtual/glu
+	virtual/opengl
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4
+	dev-qt/qtopengl:4"
+DEPEND="${RDEPEND}
+	dev-libs/libxslt"
+
+S=${WORKDIR}/${PN}
+
+PATCHES=( "${FILESDIR}/${P}-gold.patch" )
+
+src_compile() {
+	xsltproc -stringparam version ${PV} -html htm_to_qml.xsl fracplanet.htm \
+		| sed 's/"/\\"/g' | sed 's/^/"/g' | sed 's/$/\\n"/g'> usage_text.h
+	qt4-r2_src_compile
+}
+
+src_install() {
+	dobin ${PN}
+	doman man/man1/${PN}.1
+	dodoc BUGS NEWS README THANKS TODO
+	dohtml *.{css,htm}
+}
diff --git a/x11-misc/fracplanet/metadata.xml b/x11-misc/fracplanet/metadata.xml
new file mode 100644
index 000000000000..2fa57541046f
--- /dev/null
+++ b/x11-misc/fracplanet/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>desktop-misc</herd>
+	<upstream>
+		<remote-id type="sourceforge">fracplanet</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-misc/fraqtive/Manifest b/x11-misc/fraqtive/Manifest
new file mode 100644
index 000000000000..fd495f688ec3
--- /dev/null
+++ b/x11-misc/fraqtive/Manifest
@@ -0,0 +1,2 @@
+DIST fraqtive-0.4.7.tar.bz2 259933 SHA256 f280ada46b1d91859747e7ba6d53aee3ffbb5c3cba803a0b6ffbc155d9e70d72 SHA512 7298be12b67f87f1a0249ea76319360af1477053cb1def67541f362f4e0bd72ee1c13ad1d98cbf4e155f4a1c8509b2553c39e5f4a585b91b53da2b64160d1f0c WHIRLPOOL 251cb00314abb12b053e4b752ba3647305b1609c530ff79d53f711cc4397459d7bdb720ca32f0e6608018c56d059a6a43e9f02b636aab8088f6dc7ed027f9d0b
+DIST fraqtive-0.4.8.tar.bz2 260484 SHA256 dbb21b5e6305cbf02c27aaedb12c5125ac873600bce10d12e88b2305a2083cd7 SHA512 8b4be81dd14fe086dbcffda123395ccb30a197e7762e590bc3ab7dc1d0aafb44dc45e1445e2f83198a0c1f4b9ea0d54a7de1989c3b85c0f2e5f474a67255d942 WHIRLPOOL 29bfc8574d63ac6e77c36531e1dd9aa63810af12e6669f8248c364f6dd42088ac1418cdce6c1b760dc922bbded65b148e0079f8c56df69e27f42b093212ee7c3
diff --git a/x11-misc/fraqtive/fraqtive-0.4.7.ebuild b/x11-misc/fraqtive/fraqtive-0.4.7.ebuild
new file mode 100644
index 000000000000..0fa608e01b2a
--- /dev/null
+++ b/x11-misc/fraqtive/fraqtive-0.4.7.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils gnome2-utils qmake-utils toolchain-funcs
+
+DESCRIPTION="an open source, multi-platform generator of the Mandelbrot family fractals"
+HOMEPAGE="http://fraqtive.mimec.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="qt5 cpu_flags_x86_sse2"
+
+RDEPEND="
+	!qt5? (
+		dev-qt/qtcore:4
+		dev-qt/qtgui:4
+		dev-qt/qtopengl:4
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtopengl:5
+	)
+	virtual/glu
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+
+src_configure() {
+	tc-export PKG_CONFIG
+	sed -i -e "s|-lGLU|$( ${PKG_CONFIG} --libs glu )|g" src/src.pro || die
+	local conf="release"
+
+	if use cpu_flags_x86_sse2; then
+		conf="$conf sse2"
+	else
+		conf="$conf no-sse2"
+	fi
+
+	echo "CONFIG += $conf" > "${S}"/config.pri
+	echo "PREFIX = ${EPREFIX}/usr" >> "${S}"/config.pri
+	# Don't strip wrt #252096
+	echo "QMAKE_STRIP =" >> "${S}"/config.pri
+
+	if use qt5; then
+		eqmake5
+	else
+		eqmake4
+	fi
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/x11-misc/fraqtive/fraqtive-0.4.8.ebuild b/x11-misc/fraqtive/fraqtive-0.4.8.ebuild
new file mode 100644
index 000000000000..0fa608e01b2a
--- /dev/null
+++ b/x11-misc/fraqtive/fraqtive-0.4.8.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils gnome2-utils qmake-utils toolchain-funcs
+
+DESCRIPTION="an open source, multi-platform generator of the Mandelbrot family fractals"
+HOMEPAGE="http://fraqtive.mimec.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="qt5 cpu_flags_x86_sse2"
+
+RDEPEND="
+	!qt5? (
+		dev-qt/qtcore:4
+		dev-qt/qtgui:4
+		dev-qt/qtopengl:4
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtopengl:5
+	)
+	virtual/glu
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+
+src_configure() {
+	tc-export PKG_CONFIG
+	sed -i -e "s|-lGLU|$( ${PKG_CONFIG} --libs glu )|g" src/src.pro || die
+	local conf="release"
+
+	if use cpu_flags_x86_sse2; then
+		conf="$conf sse2"
+	else
+		conf="$conf no-sse2"
+	fi
+
+	echo "CONFIG += $conf" > "${S}"/config.pri
+	echo "PREFIX = ${EPREFIX}/usr" >> "${S}"/config.pri
+	# Don't strip wrt #252096
+	echo "QMAKE_STRIP =" >> "${S}"/config.pri
+
+	if use qt5; then
+		eqmake5
+	else
+		eqmake4
+	fi
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/x11-misc/fraqtive/metadata.xml b/x11-misc/fraqtive/metadata.xml
new file mode 100644
index 000000000000..4e66ecce0fd7
--- /dev/null
+++ b/x11-misc/fraqtive/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>desktop-misc</herd>
+  <upstream>
+    <remote-id type="sourceforge">fraqtive</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/x11-misc/ftmenu/Manifest b/x11-misc/ftmenu/Manifest
new file mode 100644
index 000000000000..c6791ac13717
--- /dev/null
+++ b/x11-misc/ftmenu/Manifest
@@ -0,0 +1 @@
+DIST ftmenu-0.4.0.tar.gz 315415 SHA256 25f18f1e0cad81bb6a0c65ae11d11f684bd7e2343a519f76ca0dda0173ad765b
diff --git a/x11-misc/ftmenu/ftmenu-0.4.0.ebuild b/x11-misc/ftmenu/ftmenu-0.4.0.ebuild
new file mode 100644
index 000000000000..12d9ea343f61
--- /dev/null
+++ b/x11-misc/ftmenu/ftmenu-0.4.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="2"
+
+DESCRIPTION="A tray menu for the Fluxbox toolbar"
+HOMEPAGE="http://ftmenu.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+COMMON_DEPEND=">=x11-libs/gtk+-2.6:2
+	>=dev-libs/glib-2.6:2"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig"
+RDEPEND="${COMMON_DEPEND}
+	x11-wm/fluxbox"
+
+src_compile() {
+	emake CFLAGS="${CFLAGS}" || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+	dodoc AUTHORS NEWS README ChangeLog || die
+}
+
+pkg_postinst() {
+	echo
+	einfo "To use ftmenu, edit your ~/.fluxbox/menu file and modify the [begin]"
+	einfo "line to contain the path to an icon of your choice."
+	einfo
+	einfo "For example, to use the default ftmenu xpm icon:"
+	einfo "   [begin] (Fluxbox-0.9.12) </usr/share/ftmenu/fb.xpm>"
+	einfo
+	einfo "Next, add 'ftmenu &' to your X startup file (~/.xinitrc or ~/.xsession)."
+	echo
+}
diff --git a/x11-misc/ftmenu/metadata.xml b/x11-misc/ftmenu/metadata.xml
new file mode 100644
index 000000000000..577eb66c739e
--- /dev/null
+++ b/x11-misc/ftmenu/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">ftmenu</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-misc/gbase/Manifest b/x11-misc/gbase/Manifest
new file mode 100644
index 000000000000..4f48040e182b
--- /dev/null
+++ b/x11-misc/gbase/Manifest
@@ -0,0 +1 @@
+DIST gbase-0.5.tar.gz 6427 SHA256 6e5bab77aec548d7694ff9dde9e444b146bc370ac8d89e98d7cca533ea455f3e
diff --git a/x11-misc/gbase/files/gbase-0.5-gtk.patch b/x11-misc/gbase/files/gbase-0.5-gtk.patch
new file mode 100644
index 000000000000..38936e79738c
--- /dev/null
+++ b/x11-misc/gbase/files/gbase-0.5-gtk.patch
@@ -0,0 +1,26 @@
+diff -ur gbase-0.5.orig/Makefile gbase-0.5/Makefile
+--- gbase-0.5.orig/Makefile	1999-10-28 00:23:51.000000000 +0300
++++ gbase-0.5/Makefile	2008-01-16 14:24:55.000000000 +0200
+@@ -1,15 +1,15 @@
+-CC = gcc
+-CCFLAGS = `gtk-config --cflags`
+-LDFLAGS = `gtk-config --libs`
++CC ?= gcc
++CFLAGS += `pkg-config --cflags gtk+-2.0`
++LIBS = `pkg-config --libs gtk+-2.0`
+ 
+ gbase:	gbase.o
+-	$(CC) gbase.o $(LDFLAGS) -o gbase
++	$(CC) $(LDFLAGS) gbase.o $(LIBS) -o gbase
+ 
+ clean:
+ 	rm -f gbase gbase.o gbase.c~
+ 
+ # Make object files:
+ %.o:
+-	$(CC) $(CCFLAGS) -c $*.c
++	$(CC) $(CFLAGS) -c $*.c
+ 
+-gbase.o: gbase.c
+\ No newline at end of file
++gbase.o: gbase.c
diff --git a/x11-misc/gbase/gbase-0.5.ebuild b/x11-misc/gbase/gbase-0.5.ebuild
new file mode 100644
index 000000000000..4e64fcbc09c8
--- /dev/null
+++ b/x11-misc/gbase/gbase-0.5.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit eutils toolchain-funcs
+
+DESCRIPTION="a convert program for decimal, hexadecimal, octal and binary values"
+HOMEPAGE="http://www.fluxcode.net"
+SRC_URI="http://www.fluxcode.net/files/${P}.tar.gz"
+
+LICENSE="Artistic"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="x11-libs/gtk+:2"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gtk.patch
+}
+
+src_compile() {
+	tc-export CC
+	emake
+}
+
+src_test() { :; } #424671
+
+src_install() {
+	dobin ${PN}
+	dodoc README
+}
diff --git a/x11-misc/gbase/metadata.xml b/x11-misc/gbase/metadata.xml
new file mode 100644
index 000000000000..731225048652
--- /dev/null
+++ b/x11-misc/gbase/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>desktop-misc</herd>
+</pkgmetadata>
diff --git a/x11-misc/gbdfed/Manifest b/x11-misc/gbdfed/Manifest
new file mode 100644
index 000000000000..091feca27494
--- /dev/null
+++ b/x11-misc/gbdfed/Manifest
@@ -0,0 +1,2 @@
+DIST gbdfed-1.5.tbz2 229315 RMD160 d3754e4b0a2005ac347010a21296e45e1b1d3ef6 SHA1 b3a937beedf222e10bf6f379240d43687a9c75ac SHA256 d3cd6c3b26b1ed4d0bf8a186d5cc180f1be699864a52899016a31576fb5f65ae
+DIST gbdfed-1.6.tbz2 236166 RMD160 205de4c1e3e2e0e3e3c037d2b1f3090ff15723f0 SHA1 4985f100e56a5b097f169f63be3ef7b054d929c9 SHA256 5db25d4ce688dcb188dee056e58614a94a5e4fce4b6066fbb310951ab999093c
diff --git a/x11-misc/gbdfed/files/gbdfed-1.4-glibc-2.10.patch b/x11-misc/gbdfed/files/gbdfed-1.4-glibc-2.10.patch
new file mode 100644
index 000000000000..5a4f690da70b
--- /dev/null
+++ b/x11-misc/gbdfed/files/gbdfed-1.4-glibc-2.10.patch
@@ -0,0 +1,39 @@
+--- bdfgname.c
++++ bdfgname.c
+@@ -39,7 +39,7 @@
+ #define MAX_GLYPH_NAME_LEN 127
+ 
+ static int
+-getline(FILE *in, char *buf, int limit)
++bdf_getline(FILE *in, char *buf, int limit)
+ {
+     int c, i;
+ 
+@@ -78,11 +78,11 @@
+ 
+     while (!feof(in)) {
+         pos = ftell(in);
+-        (void) getline(in, buf, 256);
++        (void) bdf_getline(in, buf, 256);
+         while (!feof(in) && (buf[0] == 0 || buf[0] == '#')) {
+             buf[0] = 0;
+             pos = ftell(in);
+-            (void) getline(in, buf, 256);
++            (void) bdf_getline(in, buf, 256);
+         }
+ 
+         if (buf[0] == 0)
+@@ -139,11 +139,11 @@
+ 
+     while (!feof(in)) {
+         pos = ftell(in);
+-        (void) getline(in, buf, 256);
++        (void) bdf_getline(in, buf, 256);
+         while (!feof(in) && (buf[0] == 0 || buf[0] == '#')) {
+             buf[0] = 0;
+             pos = ftell(in);
+-            (void) getline(in, buf, 256);
++            (void) bdf_getline(in, buf, 256);
+         }
+ 
+         if (adobe_names_used == adobe_names_size) {
diff --git a/x11-misc/gbdfed/gbdfed-1.5.ebuild b/x11-misc/gbdfed/gbdfed-1.5.ebuild
new file mode 100644
index 000000000000..cdd9181017e8
--- /dev/null
+++ b/x11-misc/gbdfed/gbdfed-1.5.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+inherit eutils
+
+DESCRIPTION="gbdfed Bitmap Font Editor"
+HOMEPAGE="http://www.math.nmsu.edu/~mleisher/Software/gbdfed/"
+SRC_URI="http://www.math.nmsu.edu/~mleisher/Software/gbdfed/${P}.tbz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=x11-libs/gtk+-2.6:2
+	>=media-libs/freetype-2
+	x11-libs/libX11
+	x11-libs/pango"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.4-glibc-2.10.patch
+	sed "s:-D.*_DISABLE_DEPRECATED::" -i Makefile.in #248562
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc README NEWS || die
+}
diff --git a/x11-misc/gbdfed/gbdfed-1.6.ebuild b/x11-misc/gbdfed/gbdfed-1.6.ebuild
new file mode 100644
index 000000000000..1ff3a0625fdf
--- /dev/null
+++ b/x11-misc/gbdfed/gbdfed-1.6.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit eutils
+
+DESCRIPTION="gbdfed Bitmap Font Editor"
+HOMEPAGE="http://www.math.nmsu.edu/~mleisher/Software/gbdfed/"
+SRC_URI="http://www.math.nmsu.edu/~mleisher/Software/gbdfed/${P}.tbz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=x11-libs/gtk+-2.6:2
+	>=media-libs/freetype-2
+	x11-libs/libX11
+	x11-libs/pango"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	sed "s:-D.*_DISABLE_DEPRECATED::" -i Makefile.in #248562
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc README NEWS
+}
diff --git a/x11-misc/gbdfed/metadata.xml b/x11-misc/gbdfed/metadata.xml
new file mode 100644
index 000000000000..64cc0b687d48
--- /dev/null
+++ b/x11-misc/gbdfed/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>fonts</herd>
+</pkgmetadata>
diff --git a/x11-misc/gccmakedep/Manifest b/x11-misc/gccmakedep/Manifest
new file mode 100644
index 000000000000..2731299a90f3
--- /dev/null
+++ b/x11-misc/gccmakedep/Manifest
@@ -0,0 +1,2 @@
+DIST gccmakedep-1.0.2.tar.bz2 70490 SHA256 063d49685b1002f3d0b89dfa730e9159f685bd51c277a39fc37b6e377a55ae11 SHA512 be4588002e6b96dcc6acb664d0a5d382afc3115c7c39c08af95127fce5c114dc05141d1e30129d93cfe8818f21091f3578d38e83a84cd0013218ba80d9288bb2 WHIRLPOOL cf01e86391c5a00152e7bac9fd58c386cd94db62f24540b38410e336f59c076f4ffc76dbff02c4f4823e05077609d94a390c5ea6d04dcc5280dd85633ecb2308
+DIST gccmakedep-1.0.3.tar.bz2 104766 SHA256 b275dcf1f7323ed89e8b36f8fbd5da665d8700005f1779fa5b90a1688bbf2ee4 SHA512 563b2897770a4df2792ea3eae8183a1f9e78192b7efc9c8296ee68d1cba6e72fa962a88e3251bb780df776e2aa7e80d74d5096675c61526c232aefa4f9e6a5fc WHIRLPOOL 63d2b6c33c432545c793bf5d56c1a6d8b5a1222c5de5f99b22115deab82ba120a4199ddcb780e070e4167158f764a50bb70754138b161b529b77cb06465ef28b
diff --git a/x11-misc/gccmakedep/gccmakedep-1.0.2-r1.ebuild b/x11-misc/gccmakedep/gccmakedep-1.0.2-r1.ebuild
new file mode 100644
index 000000000000..0a648868bf04
--- /dev/null
+++ b/x11-misc/gccmakedep/gccmakedep-1.0.2-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit xorg-2
+
+DESCRIPTION="create dependencies in makefiles using 'gcc -M'"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND="x11-proto/xproto"
diff --git a/x11-misc/gccmakedep/gccmakedep-1.0.3.ebuild b/x11-misc/gccmakedep/gccmakedep-1.0.3.ebuild
new file mode 100644
index 000000000000..28191efdc046
--- /dev/null
+++ b/x11-misc/gccmakedep/gccmakedep-1.0.3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit xorg-2
+
+DESCRIPTION="create dependencies in makefiles using 'gcc -M'"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND="x11-proto/xproto"
diff --git a/x11-misc/gccmakedep/metadata.xml b/x11-misc/gccmakedep/metadata.xml
new file mode 100644
index 000000000000..01c4c004e735
--- /dev/null
+++ b/x11-misc/gccmakedep/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>x11</herd>
+</pkgmetadata>
diff --git a/x11-misc/gcolor2/Manifest b/x11-misc/gcolor2/Manifest
new file mode 100644
index 000000000000..e5c068bd8ddb
--- /dev/null
+++ b/x11-misc/gcolor2/Manifest
@@ -0,0 +1,2 @@
+DIST gcolor2-0.4.tar.gz 375217 SHA256 89bd6c6d27ba5a679ec60057de8497855072f520515b490e5986fc3509774f23 SHA512 9b9677b4be8797c9b03deef9bf1b96e6497d2adf85f74d01f1b478f04d92cb912790c4d5fb74f403295219cac6c0d3fcabaa7de340975bbcdb68b0347f6042a3 WHIRLPOOL a0ae359ec66c50cd0386bbf4448ad32947e976012089d16f8f0ada71e27a375da6185ba4096c29c57f1cc980992aa050647e75bf6eec6839bc32a56e4cae1876
+DIST gcolor2.svg 12742 SHA256 df70b5fc937db1940fc1dacf51ec72006352e7597ec52e8815ac6a860a96ff07 SHA512 377dbd494e5a3f881df65415ee66310cd96b4e4ac668101aa068bfe6f575b694c930817cec942e885f93465d05ccc604950f2154e26be95618d6f272d81ffe1b WHIRLPOOL 64d3034595ef5fdafe8f3960d6b16f3aea3c02e56b3b475f9745b7862523c248c65e9ecb36cbe479d2b34032d1178d19630a4806fb1ac7ebf3e101fbd1e6c886
diff --git a/x11-misc/gcolor2/files/gcolor2-0.4-amd64.patch b/x11-misc/gcolor2/files/gcolor2-0.4-amd64.patch
new file mode 100644
index 000000000000..cd06a8315f98
--- /dev/null
+++ b/x11-misc/gcolor2/files/gcolor2-0.4-amd64.patch
@@ -0,0 +1,46 @@
+diff --exclude-from=/home/dang/bin/scripts/diffrc -up -ruN gcolor2-0.4.orig/src/callbacks.c gcolor2-0.4/src/callbacks.c
+--- gcolor2-0.4.orig/src/callbacks.c	2005-07-12 14:06:12.000000000 -0400
++++ gcolor2-0.4/src/callbacks.c	2007-02-17 19:19:38.000000000 -0500
+@@ -4,6 +4,9 @@
+ 
+ #include <gtk/gtk.h>
+ #include <stdio.h>
++#include <string.h>
++#include <glib.h>
++#include <glib/gprintf.h>
+ 
+ #include "callbacks.h"
+ #include "interface.h"
+@@ -172,6 +175,9 @@ void on_copy_color_to_clipboard_activate
+ 	gtk_clipboard_set_text (cb, hex, strlen (hex));
+ }
+ 
++void add_rgb_file (gchar *filename, gchar *type);
++gchar* get_system_file (void);
++
+ void on_show_system_colors_activate (GtkMenuItem *menuitem, gpointer user_data)
+ {
+ 	if (gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (menuitem)))
+@@ -266,6 +272,8 @@ void on_save_button_clicked (GtkButton *
+ 	gtk_widget_destroy (savedialog);
+ }
+ 
++void add_list_color (gchar *spec, gchar *name, gchar *type, gboolean is_new_color);
++
+ void add_color_to_treeview ()
+ {
+ 	GtkTreeView      *treeview;
+diff --exclude-from=/home/dang/bin/scripts/diffrc -up -ruN gcolor2-0.4.orig/src/main.c gcolor2-0.4/src/main.c
+--- gcolor2-0.4.orig/src/main.c	2005-07-11 10:55:49.000000000 -0400
++++ gcolor2-0.4/src/main.c	2007-02-17 19:18:23.000000000 -0500
+@@ -4,6 +4,10 @@
+ 
+ #include <gtk/gtk.h>
+ #include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
++#include <glib.h>
++#include <glib/gprintf.h>
+ 
+ #include "interface.h"
+ #include "support.h"
diff --git a/x11-misc/gcolor2/files/gcolor2-0.4-pkg-config-macro.patch b/x11-misc/gcolor2/files/gcolor2-0.4-pkg-config-macro.patch
new file mode 100644
index 000000000000..ee904746f147
--- /dev/null
+++ b/x11-misc/gcolor2/files/gcolor2-0.4-pkg-config-macro.patch
@@ -0,0 +1,10 @@
+--- configure.ac.old	2008-01-08 09:36:24.000000000 +0100
++++ configure.ac	2008-01-08 09:37:06.000000000 +0100
+@@ -26,6 +26,7 @@
+ AC_DISABLE_STATIC
+ AC_PROG_LIBTOOL
+ AC_PROG_INTLTOOL([0.27])
++PKG_PROG_PKG_CONFIG
+ 
+ 
+ GETTEXT_PACKAGE=gcolor2
diff --git a/x11-misc/gcolor2/files/modular-rgb.patch b/x11-misc/gcolor2/files/modular-rgb.patch
new file mode 100644
index 000000000000..eec5668c2bc7
--- /dev/null
+++ b/x11-misc/gcolor2/files/modular-rgb.patch
@@ -0,0 +1,21 @@
+--- src/callbacks.h.orig	2006-01-10 21:26:19.000000000 -0500
++++ src/callbacks.h	2006-01-10 21:26:44.000000000 -0500
+@@ -12,6 +12,7 @@
+ #define SYSTEM_FILE_2      "/usr/lib/X11/rgb.txt"
+ #define SYSTEM_FILE_3      "/etc/X11/rgb.txt"
+ #define SYSTEM_FILE_4      "/usr/openwin/lib/X11/rgb.txt"
++#define SYSTEM_FILE_5      "/usr/share/X11/rgb.txt"
+ 
+ /* about dialog text */
+ #define ABOUT_CREDITS_TEXT "Developer:\n" \
+--- src/main.c.orig	2006-01-10 21:43:20.000000000 -0500
++++ src/main.c	2006-01-10 21:42:14.000000000 -0500
+@@ -36,6 +36,8 @@
+ 		sys_filename = SYSTEM_FILE_3;
+ 	else if (g_file_test (SYSTEM_FILE_4, G_FILE_TEST_EXISTS))
+ 		sys_filename = SYSTEM_FILE_4;
++	else if (g_file_test (SYSTEM_FILE_5, G_FILE_TEST_EXISTS))
++		sys_filename = SYSTEM_FILE_5;
+ 	else
+ 		return FALSE;
+ 	return TRUE;
diff --git a/x11-misc/gcolor2/gcolor2-0.4-r4.ebuild b/x11-misc/gcolor2/gcolor2-0.4-r4.ebuild
new file mode 100644
index 000000000000..023493b2ac40
--- /dev/null
+++ b/x11-misc/gcolor2/gcolor2-0.4-r4.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+GCONF_DEBUG="no"
+
+inherit autotools eutils gnome2
+
+DESCRIPTION="A GTK+ color selector"
+HOMEPAGE="http://gcolor2.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
+	http://dev.gentoo.org/~pacho/gnome/${PN}.svg"
+
+LICENSE="GPL-2 public-domain"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=x11-libs/gtk+-2.4:2"
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.27
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	epatch "${FILESDIR}"/modular-rgb.patch
+	epatch "${FILESDIR}"/${P}-amd64.patch
+	epatch "${FILESDIR}"/${P}-pkg-config-macro.patch
+
+	# To check at each bump.
+	sed "s/^#.*/[encoding: UTF-8]/" -i po/POTFILES.in || die "sed failed"
+	echo "gcolor2.glade" >> po/POTFILES.in
+
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_install() {
+	gnome2_src_install
+
+	# Icon from http://sourceforge.net/p/gcolor2/patches/5/
+	doicon -s scalable "${DISTDIR}/${PN}.svg"
+	make_desktop_entry ${PN} Gcolor2 ${PN} Graphics
+}
diff --git a/x11-misc/gcolor2/metadata.xml b/x11-misc/gcolor2/metadata.xml
new file mode 100644
index 000000000000..340e98c59a07
--- /dev/null
+++ b/x11-misc/gcolor2/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>gnome</herd>
+	<upstream>
+		<remote-id type="sourceforge">gcolor2</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-misc/gdevilspie/Manifest b/x11-misc/gdevilspie/Manifest
new file mode 100644
index 000000000000..c9b3dd935dee
--- /dev/null
+++ b/x11-misc/gdevilspie/Manifest
@@ -0,0 +1 @@
+DIST gdevilspie-0.5.tar.bz2 29028 SHA256 e03ab813e56b6dc6d868db7c318d280c9864cfa6e8a4ca84a5bb5d05542f55ff SHA512 0426b58c37b3078185abf8f3100f1da982b58e789c68b8f2f1b4e6e6f4befbaf12782b9790be5a1e90ee432a46cc1a91a69997c54796c756276e59533dccb388 WHIRLPOOL 43c7220c44ef005289bb3f9eaada51eb6bac42dba00920e4d55c029262289ee43b6d8c498c8daa48bffb0194c93d852bc471d98e09a808799b58f59e12636454
diff --git a/x11-misc/gdevilspie/files/gdevilspie-0.5-paths.patch b/x11-misc/gdevilspie/files/gdevilspie-0.5-paths.patch
new file mode 100644
index 000000000000..771501b0045e
--- /dev/null
+++ b/x11-misc/gdevilspie/files/gdevilspie-0.5-paths.patch
@@ -0,0 +1,84 @@
+--- /home/usuario/Escritorio/gdevilspie	2015-04-26 03:30:16.760326671 -0300
++++ /usr/lib/python-exec/python2.7/gdevilspie	2015-04-26 03:32:11.247227671 -0300
+@@ -48,6 +48,10 @@
+ DISABLE_XDG=""
+ try:
+     import xdg.DesktopEntry
++    if xdg.DesktopEntry.__dict__.has_key('xdg_config_home') == True:
++        xdg_config_home = xdg.DesktopEntry.xdg_config_home 
++    else:
++        xdg_config_home = os.path.join(os.environ["HOME"], "config")
+ except:
+ 	error = gtk.MessageDialog(None, 0, gtk.MESSAGE_ERROR, gtk.BUTTONS_CLOSE, "Make sure that Python-xdg is correctly installed if you need autostart handling.")
+ 	response = error.run()
+@@ -300,22 +304,32 @@
+ 	return strous
+ 
+ # Glade file used in all classes
+-if os.path.isfile(os.path.dirname(sys.argv[0])+'/gdevilspie.glade'):
+-	gladefile = os.path.dirname(sys.argv[0])+'/gdevilspie.glade'
+-elif os.path.isfile(os.path.dirname(sys.argv[0]) + '/../share/gdevilspie/gdevilspie.glade'):
+-	gladefile = os.path.dirname(sys.argv[0])+'/../share/gdevilspie/gdevilspie.glade'
+-else:
+-	gtk.MessageDialog(None, 0, gtk.MESSAGE_ERROR, gtk.BUTTONS_CLOSE, "Glade file not found, exiting.").run()
+-	quit()
++for syspath in os.environ["PATH"].split(":"):
++	if os.path.isfile(os.path.dirname(syspath) + '/../share/gdevilspie/gdevilspie.glade'):
++		gladefile = os.path.dirname(syspath)+'/../share/gdevilspie/gdevilspie.glade'
++		break
++if "gladefile" not in globals():
++	if os.path.isfile(os.path.dirname(sys.argv[0])+'/gdevilspie.glade'):
++		gladefile = os.path.dirname(sys.argv[0])+'/gdevilspie.glade'
++	elif os.path.isfile(os.path.dirname(sys.argv[0]) + '/../share/gdevilspie/gdevilspie.glade'):
++		gladefile = os.path.dirname(sys.argv[0])+'/../share/gdevilspie/gdevilspie.glade'
++	else:
++		gtk.MessageDialog(None, 0, gtk.MESSAGE_ERROR, gtk.BUTTONS_CLOSE, "Glade file not found, exiting.").run()
++		quit()
+ 
+ 
+ # icon used
+-if os.path.isfile(os.path.dirname(sys.argv[0])+'/gdevilspie.png'):
+-	gdevilspie_icon = os.path.dirname(sys.argv[0])+'/gdevilspie.png'
+-elif os.path.isfile(os.path.dirname(sys.argv[0]) + '/../share/gdevilspie/gdevilspie.png'):
+-	gdevilspie_icon = os.path.dirname(sys.argv[0])+'/../share/gdevilspie/gdevilspie.png'
+-else:
+-	gtk.MessageDialog(None, 0, gtk.MESSAGE_ERROR, gtk.BUTTONS_CLOSE, "Icon file not found.").run()
++for syspath in os.environ["PATH"].split(":"):
++	if os.path.isfile(os.path.dirname(syspath) + '/../share/gdevilspie/gdevilspie.png'):
++		gdevilspie_icon = os.path.dirname(syspath)+'/../share/gdevilspie/gdevilspie.png'
++		break
++if "gdevilspie_icon" not in globals():
++	if os.path.isfile(os.path.dirname(sys.argv[0])+'/gdevilspie.png'):
++		gdevilspie_icon = os.path.dirname(sys.argv[0])+'/gdevilspie.png'
++	elif os.path.isfile(os.path.dirname(sys.argv[0]) + '/../share/gdevilspie/gdevilspie.png'):
++		gdevilspie_icon = os.path.dirname(sys.argv[0])+'/../share/gdevilspie/gdevilspie.png'
++	else:
++		gtk.MessageDialog(None, 0, gtk.MESSAGE_ERROR, gtk.BUTTONS_CLOSE, "Icon file not found.").run()
+ 
+ # Directory where we store .ds files
+ dir = os.path.expanduser("~/.devilspie")
+@@ -542,12 +556,12 @@
+ 		if ( DISABLE_XDG == "True" ):
+ 				self.DaemonAutostart.set_sensitive(False)
+ 		else:
+-				if (os.path.exists(xdg.DesktopEntry.xdg_config_home + "/autostart/devilspie.desktop")):
+-					df = xdg.DesktopEntry.DesktopEntry(xdg.DesktopEntry.xdg_config_home + "/autostart/devilspie.desktop")
++				if (os.path.exists(xdg_config_home + "/autostart/devilspie.desktop")):
++					df = xdg.DesktopEntry.DesktopEntry(xdg_config_home + "/autostart/devilspie.desktop")
+ 					if (df.get('X-GNOME-Autostart-enabled') == 'true'):
+ 							self.DaemonAutostart.set_active(True)
+ 				else:
+-						df = xdg.DesktopEntry.DesktopEntry(xdg.DesktopEntry.xdg_config_home + "/autostart/devilspie.desktop")
++						df = xdg.DesktopEntry.DesktopEntry(xdg_config_home + "/autostart/devilspie.desktop")
+ 						df.set('Name','Devilspie')
+ 						df.set('Exec','devilspie')
+ 						df.set('X-GNOME-Autostart-enabled','false')
+@@ -555,7 +569,7 @@
+ 
+ 					
+   def on_DaemonAutostart_toggled(self,widget):
+-			df = xdg.DesktopEntry.DesktopEntry(xdg.DesktopEntry.xdg_config_home + "/autostart/devilspie.desktop")
++			df = xdg.DesktopEntry.DesktopEntry(xdg_config_home + "/autostart/devilspie.desktop")
+ 			if (widget.get_active()):
+ 					df.set('X-GNOME-Autostart-enabled','true')
+ 					df.write()
diff --git a/x11-misc/gdevilspie/gdevilspie-0.5-r1.ebuild b/x11-misc/gdevilspie/gdevilspie-0.5-r1.ebuild
new file mode 100644
index 000000000000..f1dfa9fb2255
--- /dev/null
+++ b/x11-misc/gdevilspie/gdevilspie-0.5-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="A user friendly interface to the devilspie window matching daemon, to create rules easily"
+HOMEPAGE="http://code.google.com/p/gdevilspie/"
+SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	dev-python/pygtk:2[${PYTHON_USEDEP}]
+	dev-python/libwnck-python[${PYTHON_USEDEP}]
+"
+RDEPEND="${DEPEND}
+	x11-misc/devilspie
+"
+
+PATCHES=(
+	# Fix paths for finding XDG and glade file, bug #539638 
+	"${FILESDIR}/${P}-paths.patch"
+)
+
+src_prepare() {
+	sed -i -e "s:doc/gdevilspie:doc/${PF}:" setup.py || die
+	distutils-r1_src_prepare
+}
diff --git a/x11-misc/gdevilspie/metadata.xml b/x11-misc/gdevilspie/metadata.xml
new file mode 100644
index 000000000000..70778a76521f
--- /dev/null
+++ b/x11-misc/gdevilspie/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>desktop-misc</herd>
+	<upstream>
+		<remote-id type="google-code">gdevilspie</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-misc/genmenu/Manifest b/x11-misc/genmenu/Manifest
new file mode 100644
index 000000000000..2ef0314712ac
--- /dev/null
+++ b/x11-misc/genmenu/Manifest
@@ -0,0 +1 @@
+DIST genmenu-1.1.0.tar.bz2 10728 RMD160 1c4f4986b6ad71d15da32210a1f28866523bd2e4 SHA1 f8c52f60f3a0edad7cea3144cbe62d59e9e19bbb SHA256 c9795290e23b9c938bdae865a74801a4aaee0234be718af99667757a7e0d0844
diff --git a/x11-misc/genmenu/files/genmenu-1.0.2.patch b/x11-misc/genmenu/files/genmenu-1.0.2.patch
new file mode 100644
index 000000000000..f8855a48a4e3
--- /dev/null
+++ b/x11-misc/genmenu/files/genmenu-1.0.2.patch
@@ -0,0 +1,27 @@
+--- genmenu-orig	2003-05-29 02:26:17.000000000 -0700
++++ genmenu	2003-05-29 02:35:21.000000000 -0700
+@@ -815,6 +815,7 @@
+ 	fi
+ 
+ 	echo -e "\nWriting $(ucfirst $1) menu\n"
++	mv $bb_menu $bb_menu.orig
+ 	bb_writemenu >$bb_menu
+ 	echo
+ 
+@@ -842,6 +843,7 @@
+ 	fi
+ 
+ 	echo -e "\nWriting Window Maker menu\n"
++	mv $menu $menu.orig
+ 	wm_writemenu >$menu
+  echo
+ }
+@@ -872,6 +874,8 @@
+ 
+ 	programs
+ 
++	mv $menu $menu.orig
++
+ 	( echo "\"User Menus\""
+ 
+ 	if [ -f "$ECONFDIR/genmenu.menu" ]; then
diff --git a/x11-misc/genmenu/genmenu-1.1.0.ebuild b/x11-misc/genmenu/genmenu-1.1.0.ebuild
new file mode 100644
index 000000000000..e464083c4654
--- /dev/null
+++ b/x11-misc/genmenu/genmenu-1.1.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit eutils
+
+DESCRIPTION="menu generator for *box, WindowMaker, and Enlightenment"
+HOMEPAGE="http://f00l.de/genmenu/"
+SRC_URI="http://f00l.de/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="app-shells/bash"
+
+src_prepare() {
+	epatch "${FILESDIR}"/genmenu-1.0.2.patch
+}
+
+src_install() {
+	dobin genmenu
+	dodoc ChangeLog README
+}
diff --git a/x11-misc/genmenu/metadata.xml b/x11-misc/genmenu/metadata.xml
new file mode 100644
index 000000000000..59e2b8f78cb5
--- /dev/null
+++ b/x11-misc/genmenu/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>maintainer-needed@gentoo.org</email>
+		<name>Default assignee for orphaned packages</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/x11-misc/gigolo/Manifest b/x11-misc/gigolo/Manifest
new file mode 100644
index 000000000000..5932e3c06923
--- /dev/null
+++ b/x11-misc/gigolo/Manifest
@@ -0,0 +1 @@
+DIST gigolo-0.4.2.tar.bz2 243877 SHA256 553fc78fe4e7bd2f01f3851baea7e63f6414fe652dfb4b08c60b5c4b2b909164 SHA512 d6d8c65674097fb3eae586e4c71b0f36ba64df00b2ac84c32bd83cfb0fd690ae998c22cea02194acd1f018cdfd01b42f840867425ed183fb0ad98c8d97859532 WHIRLPOOL 94140dc124b8bb15225248976b2779bdf0b4aeee478a6a6de30032689c33041eae28067b7cb434584628d8f722df0262aa761c641853f64a3a422ff1228d859f
diff --git a/x11-misc/gigolo/gigolo-0.4.2.ebuild b/x11-misc/gigolo/gigolo-0.4.2.ebuild
new file mode 100644
index 000000000000..d40cbd6c9566
--- /dev/null
+++ b/x11-misc/gigolo/gigolo-0.4.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+#EAUTORECONF=yes (Why was this in 0.4.1 w/o any calls to autotools.eclass again?
+# some reference to intltoolize in ChangeLog but that's it?)
+inherit xfconf
+
+DESCRIPTION="a frontend to easily manage connections to remote filesystems using GIO/GVfs"
+HOMEPAGE="http://www.uvena.de/gigolo/ http://goodies.xfce.org/projects/applications/gigolo"
+SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND=">=dev-libs/glib-2.16
+	>=x11-libs/gtk+-2.12:2"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	virtual/pkgconfig"
+
+pkg_setup() {
+	DOCS=( AUTHORS ChangeLog NEWS README TODO )
+}
+
+src_install() {
+	xfconf_src_install
+	rm -rf "${ED}"/usr/share/doc/${PN}
+}
diff --git a/x11-misc/gigolo/metadata.xml b/x11-misc/gigolo/metadata.xml
new file mode 100644
index 000000000000..008cf479f615
--- /dev/null
+++ b/x11-misc/gigolo/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer>
+    <email>xfce@gentoo.org</email>
+    <name>XFCE Team</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/x11-misc/gmrun/Manifest b/x11-misc/gmrun/Manifest
new file mode 100644
index 000000000000..496e082c68f4
--- /dev/null
+++ b/x11-misc/gmrun/Manifest
@@ -0,0 +1 @@
+DIST gmrun-0.9.2.tar.gz 66097 SHA256 17297bce53249ccc7145931db22251b47f77ac355f78cf8abf1e87ae16341fa0 SHA512 3ce881463c23b6c2c39b4d41ff98f3d4a2b77f45a46d4ac43d8bbf726fcb3769b643436932714f9f5c22b855188928453810468d165af2c2433059a0149d6422 WHIRLPOOL d8ea7ddcc4625e64e35f281bb561af4cd94d65b1c6548c3f44f23f3334e31cb1ea96afcb1052c45e4fe01ba73f9863a738c571711ccf3c6dfe5c4f17b085e7d4
diff --git a/x11-misc/gmrun/files/gmrun-0.9.2-gcc43.patch b/x11-misc/gmrun/files/gmrun-0.9.2-gcc43.patch
new file mode 100644
index 000000000000..e1d4d6d211ac
--- /dev/null
+++ b/x11-misc/gmrun/files/gmrun-0.9.2-gcc43.patch
@@ -0,0 +1,40 @@
+--- a/src/gtkcompletionline.cc
++++ b/src/gtkcompletionline.cc
+@@ -29,6 +29,7 @@
+ #include <set>
+ #include <sstream>
+ #include <string>
++#include <cstring>
+ #include <vector>
+ using namespace std;
+ 
+--- a/src/ci_string.h
++++ b/src/ci_string.h
+@@ -7,6 +7,7 @@
+ #define __CI_STRING_H__
+ 
+ #include <string>
++#include <cstring>
+ #include <ctype.h>
+ 
+ struct ci_char_traits : public std::char_traits<char>
+--- a/src/prefs.cc
++++ b/src/prefs.cc
+@@ -13,6 +13,7 @@
+ #include <fstream>
+ #include <iostream>
+ #include <stdio.h>
++#include <stdlib.h>
+ 
+ #include <list>
+ 
+--- a/src/main.cc
++++ b/src/main.cc
+@@ -14,6 +14,7 @@
+ #include <gdk/gdkkeysyms.h>
+ 
+ #include <string>
++#include <cstring>
+ #include <iostream>
+ #include <sstream>
+ #include <vector>
diff --git a/x11-misc/gmrun/files/gmrun-0.9.2-glibc210.patch b/x11-misc/gmrun/files/gmrun-0.9.2-glibc210.patch
new file mode 100644
index 000000000000..6e12a56f431d
--- /dev/null
+++ b/x11-misc/gmrun/files/gmrun-0.9.2-glibc210.patch
@@ -0,0 +1,11 @@
+--- a/src/gtkcompletionline.cc
++++ b/src/gtkcompletionline.cc
+@@ -376,7 +377,7 @@
+   return 0;
+ }
+ 
+-int my_alphasort(const void* va, const void* vb) {
++int my_alphasort(const dirent** va, const dirent** vb) {
+   const struct dirent** a = (const struct dirent**)va;
+   const struct dirent** b = (const struct dirent**)vb;
+ 
diff --git a/x11-misc/gmrun/files/gmrun-0.9.2-stlport.patch b/x11-misc/gmrun/files/gmrun-0.9.2-stlport.patch
new file mode 100644
index 000000000000..426f652a0c2b
--- /dev/null
+++ b/x11-misc/gmrun/files/gmrun-0.9.2-stlport.patch
@@ -0,0 +1,35 @@
+https://bugs.gentoo.org/show_bug.cgi?id=164339
+
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -1,7 +1,7 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+ INCLUDES = \
+-	@GTK_CFLAGS@ @STLPORT_CXXFLAGS@
++	@GTK_CFLAGS@ 
+ 
+ bin_PROGRAMS = gmrun
+ 
+@@ -13,7 +13,7 @@
+ 
+ # gmrun_LDFLAGS = -s
+ 
+-gmrun_LDADD = @GTK_LIBS@ @STLPORT_LDFLAGS@
++gmrun_LDADD = @GTK_LIBS@ 
+ 
+ AM_CPPFLAGS = \
+ 	-DPACKAGE_DATA_DIR='"$(datadir)/$(PACKAGE)"' -DPACKAGE_SYSCONF_DIR='"$(sysconfdir)"'
+--- a/configure.in
++++ b/configure.in
+@@ -37,8 +37,8 @@
+ AC_HEADER_DIRENT
+ AC_HEADER_STDC
+ AC_PROG_CXX
+-AC_PATH_STLPORT_LIB
+-AC_PATH_STLPORT_INC
++dnl REMOVED _LIB
++dnl REMOVED _INC
+ 
+ 
+ AC_CHECK_FUNC( poptGetContext,
diff --git a/x11-misc/gmrun/files/gmrun-0.9.2-sysconfdir.patch b/x11-misc/gmrun/files/gmrun-0.9.2-sysconfdir.patch
new file mode 100644
index 000000000000..92db743a8df5
--- /dev/null
+++ b/x11-misc/gmrun/files/gmrun-0.9.2-sysconfdir.patch
@@ -0,0 +1,41 @@
+http://bugs.gentoo.org/292856
+
+--- a/config/Makefile.am
++++ b/config/Makefile.am
+@@ -1,6 +1,6 @@
+ # $Id$
+ 
+-myrcdir = @PACKAGE_DATA_DIR@
++myrcdir = $(sysconfdir)
+ myrc_DATA = gmrunrc
+ 
+ EXTRA_DIST = gmrunrc
+--- a/config.h.in
++++ b/config.h.in
+@@ -10,7 +10,6 @@
+ #undef HAVE_STPCPY
+ #undef HAVE_LIBSM
+ #undef PACKAGE_LOCALE_DIR
+-#undef PACKAGE_DATA_DIR
+ #undef PACKAGE_SOURCE_DIR
+ 
+ /* Define if you have the <dirent.h> header file.  */
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -15,3 +15,5 @@
+ 
+ gmrun_LDADD = @GTK_LIBS@ @STLPORT_LDFLAGS@
+ 
++AM_CPPFLAGS = \
++	-DPACKAGE_DATA_DIR='"$(datadir)/$(PACKAGE)"' -DPACKAGE_SYSCONF_DIR='"$(sysconfdir)"'
+--- a/src/prefs.cc
++++ b/src/prefs.cc
+@@ -30,7 +30,7 @@
+ 
+ Prefs::Prefs()
+ {
+-  string file_name = PACKAGE_DATA_DIR"/";
++  string file_name = PACKAGE_SYSCONF_DIR"/";
+   file_name += GMRUNRC;
+   init(file_name);
+ 
diff --git a/x11-misc/gmrun/gmrun-0.9.2-r1.ebuild b/x11-misc/gmrun/gmrun-0.9.2-r1.ebuild
new file mode 100644
index 000000000000..a9e38cadf4fa
--- /dev/null
+++ b/x11-misc/gmrun/gmrun-0.9.2-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils
+
+DESCRIPTION="A GTK-2 based launcher box with bash style auto completion!"
+HOMEPAGE="http://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() {
+	epatch \
+		"${FILESDIR}"/${P}-gcc43.patch \
+		"${FILESDIR}"/${P}-sysconfdir.patch \
+		"${FILESDIR}"/${P}-glibc210.patch \
+		"${FILESDIR}"/${P}-stlport.patch
+
+	eautoreconf
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc AUTHORS ChangeLog README NEWS
+}
diff --git a/x11-misc/gmrun/metadata.xml b/x11-misc/gmrun/metadata.xml
new file mode 100644
index 000000000000..0db3203fd1e0
--- /dev/null
+++ b/x11-misc/gmrun/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>desktop-misc</herd>
+	<longdescription>
+		A run utility intended to replace grun or gnome-run. Most prominent
+		features include slim design and bash style auto-completion.
+	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">gmrun</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-misc/googsystray/Manifest b/x11-misc/googsystray/Manifest
new file mode 100644
index 000000000000..86f1656860bd
--- /dev/null
+++ b/x11-misc/googsystray/Manifest
@@ -0,0 +1 @@
+DIST googsystray-1.3.1.tar.gz 1000034 SHA256 ac6f4505f1aed260a8beeb9742e1789d1492ad0b62b56f25f73d7d552b539ebe
diff --git a/x11-misc/googsystray/googsystray-1.3.1.ebuild b/x11-misc/googsystray/googsystray-1.3.1.ebuild
new file mode 100644
index 000000000000..9957a89351b5
--- /dev/null
+++ b/x11-misc/googsystray/googsystray-1.3.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="3"
+
+SUPPORT_PYTHON_ABIS=1
+PYTHON_DEPEND="2:2.6"
+RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-*"
+
+inherit distutils
+
+DESCRIPTION="System tray application for Google Voice, GMail, Google Calendar, Google Reader, and Google Wave"
+HOMEPAGE="http://googsystray.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=" >=dev-python/pygtk-2.14"
+RDEPEND="${DEPEND}"
diff --git a/x11-misc/googsystray/metadata.xml b/x11-misc/googsystray/metadata.xml
new file mode 100644
index 000000000000..e291e7d32e92
--- /dev/null
+++ b/x11-misc/googsystray/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>hwoarang@gentoo.org</email>
+		<name>Markos Chandras</name>
+	</maintainer>
+	<longdescription lang="en">
+</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">googsystray</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-misc/grabc/Manifest b/x11-misc/grabc/Manifest
new file mode 100644
index 000000000000..8c7531d36229
--- /dev/null
+++ b/x11-misc/grabc/Manifest
@@ -0,0 +1 @@
+DIST grabc1.1.tar.gz 2983 SHA256 f0492a8ea33b46a16bdb94644420f54724e31c4436e4cd77937a30b2de3bb00e
diff --git a/x11-misc/grabc/files/grabc-1.1-makefile.patch b/x11-misc/grabc/files/grabc-1.1-makefile.patch
new file mode 100644
index 000000000000..4815ae5675c5
--- /dev/null
+++ b/x11-misc/grabc/files/grabc-1.1-makefile.patch
@@ -0,0 +1,37 @@
+--- grabc1.1/Makefile.org	1997-03-17 06:51:39.000000000 +0100
++++ grabc1.1/Makefile	2010-02-08 12:18:34.000000000 +0100
+@@ -2,17 +2,15 @@
+ # Makefile automatically generated by genmake 1.0, Mar-16-97
+ # genmake 1.0 by ma_muquit@fccc.edu, RCS
+ ##
+-CC= cc
+ DEFS=  
+ PROGNAME= grabc
+-LIBS= -L/usr/X11R6/lib -lX11
++LIBS= $(shell pkg-config --libs x11)
+ 
+ INCLUDES=  -I.
+ 
+-# replace -O with -g in order to debug
++# replace -O2 -pipe -Wall -march=athlon-xp with -g in order to debug
+ 
+ DEFINES= $(INCLUDES) $(DEFS) -D__USE_FIXED_PROTOTYPES__ -DSYS_UNIX=1
+-CFLAGS= -O $(DEFINES)
+ 
+ SRCS = grabc.c
+ 
+@@ -20,12 +18,12 @@
+ 
+ .c.o:
+ 	rm -f $@
+-	$(CC) $(CFLAGS) -c $*.c
++	$(CC) $(CFLAGS) $(DEFINES) -c $*.c
+ 
+ all: $(PROGNAME)
+ 
+ $(PROGNAME) : $(OBJS)
+-	$(CC) $(CFLAGS) -o $(PROGNAME) $(OBJS) $(LIBS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $(PROGNAME) $(OBJS) $(LIBS)
+ 
+ clean:
+ 	rm -f $(OBJS) $(PROGNAME) core
diff --git a/x11-misc/grabc/grabc-1.1-r1.ebuild b/x11-misc/grabc/grabc-1.1-r1.ebuild
new file mode 100644
index 000000000000..05b5805d092c
--- /dev/null
+++ b/x11-misc/grabc/grabc-1.1-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils toolchain-funcs
+
+S="${WORKDIR}/${PN}${PV}"
+DESCRIPTION="determine the color string in hex (or RGB components) by clicking on a pixel on the screen"
+HOMEPAGE="http://www.muquit.com/muquit/software/grabc/grabc.html"
+SRC_URI="http://www.muquit.com/muquit/software/${PN}/${PN}${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86"
+IUSE=""
+
+RDEPEND="x11-libs/libX11"
+DEPEND="${RDEPEND}
+	x11-proto/xproto"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${P}-makefile.patch
+}
+
+src_compile() {
+	tc-export CC
+	emake || die "emake failed"
+}
+
+src_install() {
+	dobin grabc  || die "dobin failed"
+	dodoc README || die "dodoc failed"
+}
diff --git a/x11-misc/grabc/metadata.xml b/x11-misc/grabc/metadata.xml
new file mode 100644
index 000000000000..731225048652
--- /dev/null
+++ b/x11-misc/grabc/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>desktop-misc</herd>
+</pkgmetadata>
diff --git a/x11-misc/gromit/Manifest b/x11-misc/gromit/Manifest
new file mode 100644
index 000000000000..0905b0eb78e4
--- /dev/null
+++ b/x11-misc/gromit/Manifest
@@ -0,0 +1 @@
+DIST gromit-20041213.tar.gz 21970 SHA256 00ba978570ab7b987c909a61f467ef78f78d8f4c7e572d4902d0567eeb669618
diff --git a/x11-misc/gromit/gromit-20041213-r1.ebuild b/x11-misc/gromit/gromit-20041213-r1.ebuild
new file mode 100644
index 000000000000..aa995ee80f94
--- /dev/null
+++ b/x11-misc/gromit/gromit-20041213-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="2"
+
+inherit toolchain-funcs
+
+DESCRIPTION="GRaphics Over MIscellaneous Things, a presentation helper"
+HOMEPAGE="http://www.home.unix-ag.org/simon/gromit"
+SRC_URI="http://www.home.unix-ag.org/simon/gromit/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ppc x86"
+IUSE=""
+
+RDEPEND="x11-libs/gtk+:2"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	sed -i Makefile \
+		-e 's:-Wall:-Wall $(CFLAGS) $(LDFLAGS):' \
+		-e 's:gcc:$(CC):g' \
+		|| die "sed Makefile failed"
+
+	# Drop DEPRECATED flags, bug #387833
+	sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED ::g' \
+		Makefile || die
+}
+
+src_compile() {
+	emake CC=$(tc-getCC) || die
+}
+
+src_install() {
+	dobin ${PN}
+	newdoc ${PN}rc ${PN}rc.example
+	dodoc AUTHORS ChangeLog README
+}
diff --git a/x11-misc/gromit/metadata.xml b/x11-misc/gromit/metadata.xml
new file mode 100644
index 000000000000..e770d1bc9a96
--- /dev/null
+++ b/x11-misc/gromit/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>graphics</herd>
+</pkgmetadata>
diff --git a/x11-misc/growl-for-linux/Manifest b/x11-misc/growl-for-linux/Manifest
new file mode 100644
index 000000000000..e8b373cda78e
--- /dev/null
+++ b/x11-misc/growl-for-linux/Manifest
@@ -0,0 +1 @@
+DIST growl-for-linux-0.6.7.tar.gz 945307 SHA256 ade0ecfc31ac6e713ac9a50bf91c45da0abf1ed45e98d124c60bb9d336704c2a SHA512 00bf229349c534014112dab0615c82201c5e629fec554ce29494b3d27403552018b20829655fe927c8469ae9cb878a8be54c920f27c5c04aaa8012749b0bbf5e WHIRLPOOL 0ddfc66d2554b025187a455a105f4e3a1cfca7a99691f3a08bef66ff0f5a94cb792436097eacb3511cdafc8ff830cec50907d2b65ff98ef606acf050121a3588
diff --git a/x11-misc/growl-for-linux/growl-for-linux-0.6.7.ebuild b/x11-misc/growl-for-linux/growl-for-linux-0.6.7.ebuild
new file mode 100644
index 000000000000..269c7064227e
--- /dev/null
+++ b/x11-misc/growl-for-linux/growl-for-linux-0.6.7.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+AUTOTOOLS_AUTORECONF=1
+inherit autotools-utils
+
+DESCRIPTION="Growl Implementation For Linux"
+HOMEPAGE="http://mattn.github.com/growl-for-linux/"
+SRC_URI="mirror://github/mattn/growl-for-linux/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-db/sqlite:3
+	dev-libs/dbus-glib
+	dev-libs/glib:2
+	dev-libs/libxml2
+	dev-libs/openssl
+	net-misc/curl
+	x11-libs/gtk+:2"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS ChangeLog NEWS README TODO )
+
+src_configure() {
+	local myeconfargs=(
+		LIBS=-lgthread-2.0
+		--disable-static
+	)
+	autotools-utils_src_configure
+}
+
+src_install() {
+	autotools-utils_src_install
+	prune_libtool_files --modules
+}
diff --git a/x11-misc/growl-for-linux/growl-for-linux-9999.ebuild b/x11-misc/growl-for-linux/growl-for-linux-9999.ebuild
new file mode 100644
index 000000000000..8fe7caecfa81
--- /dev/null
+++ b/x11-misc/growl-for-linux/growl-for-linux-9999.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+EGIT_REPO_URI="git://github.com/mattn/growl-for-linux"
+AUTOTOOLS_AUTORECONF=1
+inherit autotools-utils git-2
+
+DESCRIPTION="Growl Implementation For Linux"
+HOMEPAGE="http://mattn.github.com/growl-for-linux/"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS=""
+
+RDEPEND="dev-db/sqlite:3
+	dev-libs/dbus-glib
+	dev-libs/glib:2
+	dev-libs/libxml2
+	dev-libs/openssl
+	net-misc/curl
+	x11-libs/gtk+:2"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS ChangeLog NEWS README TODO )
+
+src_configure() {
+	local myeconfargs=(
+		--disable-static
+	)
+	autotools-utils_src_configure
+}
+
+src_install() {
+	autotools-utils_src_install
+	prune_libtool_files --modules
+}
diff --git a/x11-misc/growl-for-linux/metadata.xml b/x11-misc/growl-for-linux/metadata.xml
new file mode 100644
index 000000000000..b28c03055c25
--- /dev/null
+++ b/x11-misc/growl-for-linux/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer>
+    <email>maintainer-needed@gentoo.org</email>
+  </maintainer>
+  <longdescription lang="en">
+    Growl For Linux is Linux-compatible of Growl. Growl is a notification system for Mac OS X.
+  </longdescription>
+</pkgmetadata>
+
diff --git a/x11-misc/grsync/Manifest b/x11-misc/grsync/Manifest
new file mode 100644
index 000000000000..ff2ba3bb6b05
--- /dev/null
+++ b/x11-misc/grsync/Manifest
@@ -0,0 +1,2 @@
+DIST grsync-1.2.4.tar.gz 311561 SHA256 5e74819a9188a5f722b8a692d8df0bc011c3ff1f1e8e4bbd8e5989b76e46c370 SHA512 303541eb89a279f05bc63975d28c4d197fbb852da316bdad4a294abd41caebf7bf6d1fcb33988fe03fdd04176b6a98eeb9e9a89caf01adcc2b0a60001f78270f WHIRLPOOL bd776a939a5f7d7baa107d7f4b3aa598fa61bab56a9d2db8e3fa08acdee9ee26c3f5e81e170d7aa830d890b1e02f82d60ce37c1d6c850cc4194c4a4748785ce1
+DIST grsync-1.2.5.tar.gz 324655 SHA256 4f1443154f7c85ca7b0e93d5fea438e2709776005e7cfc97da89f4899b1c12e5 SHA512 68000d729d8c15ac439fb8b66df80892c8df3acf8497635836b3be585ba3028a95d158afe6ca63976f8d893af2da209b567e1ff61a6e008dd16e498d83882e9f WHIRLPOOL 08a0935168ae570327cd5763307fbcadf48730984b08d4ad4dc1a66d5734c265d6c316969005b8afe9facc5487750ceeca25556fc53b48aed7079f7348b90323
diff --git a/x11-misc/grsync/grsync-1.2.4.ebuild b/x11-misc/grsync/grsync-1.2.4.ebuild
new file mode 100644
index 000000000000..83fce4fb92eb
--- /dev/null
+++ b/x11-misc/grsync/grsync-1.2.4.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit gnome2
+
+DESCRIPTION="A gtk frontend to rsync"
+HOMEPAGE="http://www.opbyte.it/grsync/"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86 ~x86-fbsd"
+IUSE=""
+SRC_URI="http://www.opbyte.it/release/${P}.tar.gz"
+
+RDEPEND=">=x11-libs/gtk+-2.16:2
+	net-misc/rsync"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	dev-util/intltool"
+
+DOCS="AUTHORS NEWS README"
+
+src_configure() {
+	econf --disable-unity
+}
diff --git a/x11-misc/grsync/grsync-1.2.5.ebuild b/x11-misc/grsync/grsync-1.2.5.ebuild
new file mode 100644
index 000000000000..a7c4b176a396
--- /dev/null
+++ b/x11-misc/grsync/grsync-1.2.5.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit gnome2
+
+DESCRIPTION="A gtk frontend to rsync"
+HOMEPAGE="http://www.opbyte.it/grsync/"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ~x86 ~x86-fbsd"
+IUSE=""
+SRC_URI="http://www.opbyte.it/release/${P}.tar.gz"
+
+RDEPEND=">=x11-libs/gtk+-2.16:2
+	net-misc/rsync"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	dev-util/intltool"
+
+DOCS="AUTHORS NEWS README"
+
+src_configure() {
+	econf --disable-unity
+}
diff --git a/x11-misc/grsync/metadata.xml b/x11-misc/grsync/metadata.xml
new file mode 100644
index 000000000000..6b1e56a9c383
--- /dev/null
+++ b/x11-misc/grsync/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer>
+    <email>voyageur@gentoo.org</email>
+    <name>Bernard Cafarelli</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/x11-misc/grub2-theme-preview/Manifest b/x11-misc/grub2-theme-preview/Manifest
new file mode 100644
index 000000000000..e7dc1d6aa2f2
--- /dev/null
+++ b/x11-misc/grub2-theme-preview/Manifest
@@ -0,0 +1,5 @@
+DIST grub2-theme-preview-1.1.tar.gz 3662 SHA256 49ac0108ca477a6e777d808f252ff7fcf82e4a03b85652fe84fc85903edb966b SHA512 1fe42a4b4106d07bd051b539efdfd203780b3d2b85515ad7d314d1c47ad713ea8baad8a2783b217549b5008d531c33882ef5ba1cdd5f7265aa0e6c4d1a0b5265 WHIRLPOOL 46116ead63118afedc87f576154f6111b0b9042f2c4b5ace5f662f18dfb5ece3f6de835a55ed423c45f5f785f30afa3a90690ea7bb06bd7b6d68647b5d2d946a
+DIST grub2-theme-preview-1.2.1.tar.gz 4386 SHA256 35581a955405c73ef4089294a12ffc3e5c2195b0854d0eb33ab863d934e148d1 SHA512 cae06493f71ece9b78b0613a1a906f520df5d375124466033dd7c0dc05a5990f86aa911681ba28c3688ca90daf33b38b3ce727e4fd5349c79d710c59ec552da6 WHIRLPOOL 93a78fde7684704ea546b935563586d7fb65430af9d008560ed1809c2a8cc7b3938a4d3e0d0617cec0433e65e2778e60d0f3f037be29a636265676059da43752
+DIST grub2-theme-preview-1.2.tar.gz 4347 SHA256 b9babe004d44d3efb769a7fa3dcf676a37287ef625985a210952f7567afb1145 SHA512 c09369e4854e438eedf49a6dbaa89e7e5da095023f68fe744c52a4845d0de613f6eb5498ccbd327dd0d94f3c555582b5a82672d0e0d2dcdbc8899518e7f65d4c WHIRLPOOL b2e450d7de89a697b1451e3512ea956ef2f48abf10ebde5562fae0e7ea4a10b8df13c0aff376e8bd0890b94a330fc5776cf5a2d5c8efdd289660584eceb41dc6
+DIST grub2-theme-preview-1.3.0.tar.gz 4924 SHA256 b4d36ffe393e9893deb9ac197d7ed91a297bfbe69689a6a3b2273bdbcb66b274 SHA512 89cc093f891a64cb436a993fccf59243c68a1d3bd01a288f083a0188fc716e02adc659e46fc58314cfe5ffa502f0f48eefe42c44b9333bbd31c305245563247f WHIRLPOOL a15410d7f192d29fed041f89c306e4132c61cd1b755533bd1d3e912a12f2679cc7fef8d8e7ecf4dc044862fef3779934c22cb66eca673e14e962ea3920758c41
+DIST grub2-theme-preview-1.3.1.tar.gz 5064 SHA256 a207fe994af719d930964306f67f477efb3f254fa059dbd12456efeaadf7eab8 SHA512 69aed10a2612ea442a94748d3491c2300c83aafd4650dd54e520572c809c7ca3890ff3be42eeff7684ecbbfff425b3f44a651e01b5c682a1d0dc792b33b713fb WHIRLPOOL e51d4954e6872d4ad0425a2eca945af5cb97f5b48d94abd4be8ac604c78730660b6e1d1d2272c0423e89bc9ea6605ed6837e61ae628b1fdfd2d1682f7d03a640
diff --git a/x11-misc/grub2-theme-preview/grub2-theme-preview-1.1.ebuild b/x11-misc/grub2-theme-preview/grub2-theme-preview-1.1.ebuild
new file mode 100644
index 000000000000..59b6bbfc2df7
--- /dev/null
+++ b/x11-misc/grub2-theme-preview/grub2-theme-preview-1.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )
+inherit distutils-r1
+
+DESCRIPTION="Preview a GRUB 2.x theme using KVM/QEMU"
+HOMEPAGE="https://github.com/hartwork/grub2-theme-preview"
+SRC_URI="https://github.com/hartwork/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="app-emulation/qemu
+	dev-libs/libisoburn
+	sys-fs/mtools
+	sys-boot/grub:2[grub_platforms_pc]"
diff --git a/x11-misc/grub2-theme-preview/grub2-theme-preview-1.2.1.ebuild b/x11-misc/grub2-theme-preview/grub2-theme-preview-1.2.1.ebuild
new file mode 100644
index 000000000000..59b6bbfc2df7
--- /dev/null
+++ b/x11-misc/grub2-theme-preview/grub2-theme-preview-1.2.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )
+inherit distutils-r1
+
+DESCRIPTION="Preview a GRUB 2.x theme using KVM/QEMU"
+HOMEPAGE="https://github.com/hartwork/grub2-theme-preview"
+SRC_URI="https://github.com/hartwork/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="app-emulation/qemu
+	dev-libs/libisoburn
+	sys-fs/mtools
+	sys-boot/grub:2[grub_platforms_pc]"
diff --git a/x11-misc/grub2-theme-preview/grub2-theme-preview-1.2.ebuild b/x11-misc/grub2-theme-preview/grub2-theme-preview-1.2.ebuild
new file mode 100644
index 000000000000..59b6bbfc2df7
--- /dev/null
+++ b/x11-misc/grub2-theme-preview/grub2-theme-preview-1.2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )
+inherit distutils-r1
+
+DESCRIPTION="Preview a GRUB 2.x theme using KVM/QEMU"
+HOMEPAGE="https://github.com/hartwork/grub2-theme-preview"
+SRC_URI="https://github.com/hartwork/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="app-emulation/qemu
+	dev-libs/libisoburn
+	sys-fs/mtools
+	sys-boot/grub:2[grub_platforms_pc]"
diff --git a/x11-misc/grub2-theme-preview/grub2-theme-preview-1.3.0.ebuild b/x11-misc/grub2-theme-preview/grub2-theme-preview-1.3.0.ebuild
new file mode 100644
index 000000000000..59b6bbfc2df7
--- /dev/null
+++ b/x11-misc/grub2-theme-preview/grub2-theme-preview-1.3.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )
+inherit distutils-r1
+
+DESCRIPTION="Preview a GRUB 2.x theme using KVM/QEMU"
+HOMEPAGE="https://github.com/hartwork/grub2-theme-preview"
+SRC_URI="https://github.com/hartwork/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="app-emulation/qemu
+	dev-libs/libisoburn
+	sys-fs/mtools
+	sys-boot/grub:2[grub_platforms_pc]"
diff --git a/x11-misc/grub2-theme-preview/grub2-theme-preview-1.3.1.ebuild b/x11-misc/grub2-theme-preview/grub2-theme-preview-1.3.1.ebuild
new file mode 100644
index 000000000000..59b6bbfc2df7
--- /dev/null
+++ b/x11-misc/grub2-theme-preview/grub2-theme-preview-1.3.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )
+inherit distutils-r1
+
+DESCRIPTION="Preview a GRUB 2.x theme using KVM/QEMU"
+HOMEPAGE="https://github.com/hartwork/grub2-theme-preview"
+SRC_URI="https://github.com/hartwork/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="app-emulation/qemu
+	dev-libs/libisoburn
+	sys-fs/mtools
+	sys-boot/grub:2[grub_platforms_pc]"
diff --git a/x11-misc/grub2-theme-preview/metadata.xml b/x11-misc/grub2-theme-preview/metadata.xml
new file mode 100644
index 000000000000..ca4389f7be88
--- /dev/null
+++ b/x11-misc/grub2-theme-preview/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>sping@gentoo.org</email>
+		<name>Sebastian Pipping</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">hartwork/grub2-theme-preview</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-misc/grun/Manifest b/x11-misc/grun/Manifest
new file mode 100644
index 000000000000..f9f5f8860788
--- /dev/null
+++ b/x11-misc/grun/Manifest
@@ -0,0 +1 @@
+DIST grun-0.9.3.tar.gz 368318 SHA256 c484d80e4636a69c6ad6491a4769f555be20595e67cb4bfd34c3c91e501b95dd SHA512 cac78955f59d9981b2b39dce701fa508d00b1d39c8c05ac417cf8ed81419092949765e572f2f3d01bc1d916c28d0a428f84282111264adda9078261fa286e7d0 WHIRLPOOL 12e7278201eab7750dbe4258116c980d376c28cd2f037ef18ab23c5b98aa94332757c7d4dad762e2c3c18187dfca2a909d9ac608e43e10db9b74fe0af940930f
diff --git a/x11-misc/grun/files/grun-0.9.3-no_nls.patch b/x11-misc/grun/files/grun-0.9.3-no_nls.patch
new file mode 100644
index 000000000000..61b3f33c9ca8
--- /dev/null
+++ b/x11-misc/grun/files/grun-0.9.3-no_nls.patch
@@ -0,0 +1,13 @@
+http://bugs.gentoo.org/237046
+
+--- a/grun.c
++++ b/grun.c
+@@ -30,8 +30,6 @@
+ 
+ #if defined (HAVE_GETTEXT) || defined (HAVE_CATGETS)
+ #include <libintl.h>
+-#else
+-#include "intl/libintl.h"
+ #endif
+ 
+ #define PATH_CHAR	":"
diff --git a/x11-misc/grun/grun-0.9.3-r1.ebuild b/x11-misc/grun/grun-0.9.3-r1.ebuild
new file mode 100644
index 000000000000..ebc39634a8f6
--- /dev/null
+++ b/x11-misc/grun/grun-0.9.3-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils
+
+DESCRIPTION="gRun is a GTK based Run dialog that closely resembles the Windows Run dialog, just like xexec"
+HOMEPAGE="http://code.google.com/p/grun/"
+SRC_URI="http://grun.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~x86-fbsd"
+IUSE="nls"
+
+RDEPEND="
+	dev-libs/glib:2
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:2
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-no_nls.patch
+}
+
+src_configure() {
+	[[ -z ${TERM} ]] && TERM=xterm
+
+	econf \
+		$(use_enable nls) \
+		--disable-gtktest \
+		--enable-associations \
+		--enable-testfile \
+		--with-default-xterm=${TERM}
+}
+
+src_install() {
+	default
+	dodoc AUTHORS BUGS ChangeLog NEWS README TODO
+}
diff --git a/x11-misc/grun/metadata.xml b/x11-misc/grun/metadata.xml
new file mode 100644
index 000000000000..11cb726ccd43
--- /dev/null
+++ b/x11-misc/grun/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>desktop-misc</herd>
+	<upstream>
+		<remote-id type="google-code">grun</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-misc/gtk2fontsel/Manifest b/x11-misc/gtk2fontsel/Manifest
new file mode 100644
index 000000000000..b180d5f21b1c
--- /dev/null
+++ b/x11-misc/gtk2fontsel/Manifest
@@ -0,0 +1 @@
+DIST gtk2fontsel-0.1.tar.gz 60706 SHA256 5cd6396fc3c6e7f9bc358cc5ad30592ba446cdb0138a811216497b6453905a68
diff --git a/x11-misc/gtk2fontsel/gtk2fontsel-0.1.ebuild b/x11-misc/gtk2fontsel/gtk2fontsel-0.1.ebuild
new file mode 100644
index 000000000000..40b8f3a43086
--- /dev/null
+++ b/x11-misc/gtk2fontsel/gtk2fontsel-0.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+
+DESCRIPTION="A font selection tool similar to xfontsel"
+HOMEPAGE="http://gtk2fontsel.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/gtk+:2"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS NEWS README
+}
diff --git a/x11-misc/gtk2fontsel/metadata.xml b/x11-misc/gtk2fontsel/metadata.xml
new file mode 100644
index 000000000000..da9d520c562a
--- /dev/null
+++ b/x11-misc/gtk2fontsel/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>desktop-misc</herd>
+	<upstream>
+		<remote-id type="sourceforge">gtk2fontsel</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-misc/gtkdialog/Manifest b/x11-misc/gtkdialog/Manifest
new file mode 100644
index 000000000000..9b6476ec9d98
--- /dev/null
+++ b/x11-misc/gtkdialog/Manifest
@@ -0,0 +1,2 @@
+DIST gtkdialog-0.8.2.tar.gz 494083 SHA256 02a75a331d712b0756abb3f1715b7016398f1831917a1798ce747d7131a30fb5 SHA512 15eb99a2a0b3983fc99658afe6e0a97fbeaf2e533a93974d5961da052e87c0aa3a7b6ac4445deff0e54e22a260568b125fd563784352af058328c4a3dbace6fe WHIRLPOOL 04de9c2434ff87b2b7c26f5447db765e3c02ad60b07a15e946853d41db2b981f3a6c1a123bb91472317414eeb3416e52db02faa869f0d5c02f8917877518f562
+DIST gtkdialog-0.8.3.tar.gz 571974 SHA256 ff89d2d7f1e6488e5df5f895716ac1d4198c2467a2a5dc1f51ab408a2faec38e SHA512 fd8a93d576917efd650e38e31f261065c0a0c3f9213338ed4bd457d310993d8efbe8deabb2c1451f491d14c8d38cbcd5d4cb0c9f289c6fd462f7a06754b89da7 WHIRLPOOL 51ca225b8c47de8f5fdaf1937d44450670d77cb913c677fa48dafce9e1365fb8a45f353b9ab9f86a3da96155a3d27f1dd011e98ae74eac506069bd72ae484867
diff --git a/x11-misc/gtkdialog/gtkdialog-0.8.2.ebuild b/x11-misc/gtkdialog/gtkdialog-0.8.2.ebuild
new file mode 100644
index 000000000000..a3979b6397cb
--- /dev/null
+++ b/x11-misc/gtkdialog/gtkdialog-0.8.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+DESCRIPTION="A small utility for fast and easy GUI building"
+HOMEPAGE="http://code.google.com/p/gtkdialog/"
+SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+RDEPEND="x11-libs/gtk+:2
+	gnome-base/libglade"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	sys-devel/flex
+	virtual/yacc"
+
+DOCS=( AUTHORS ChangeLog TODO )
+
+src_install() {
+	# Stop make install from running gtk-update-icon-cache
+	emake DESTDIR="${D}" UPDATE_ICON_CACHE=true install
+}
diff --git a/x11-misc/gtkdialog/gtkdialog-0.8.3.ebuild b/x11-misc/gtkdialog/gtkdialog-0.8.3.ebuild
new file mode 100644
index 000000000000..afdadf3ffba2
--- /dev/null
+++ b/x11-misc/gtkdialog/gtkdialog-0.8.3.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+DESCRIPTION="A small utility for fast and easy GUI building"
+HOMEPAGE="http://code.google.com/p/gtkdialog/"
+SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/gtk+:2
+	gnome-base/libglade"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	sys-devel/flex
+	virtual/yacc"
+
+DOCS=( AUTHORS ChangeLog TODO )
+
+src_install() {
+	# Stop make install from running gtk-update-icon-cache
+	emake DESTDIR="${D}" UPDATE_ICON_CACHE=true install
+}
diff --git a/x11-misc/gtkdialog/metadata.xml b/x11-misc/gtkdialog/metadata.xml
new file mode 100644
index 000000000000..f66a06401dd0
--- /dev/null
+++ b/x11-misc/gtkdialog/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>desktop-misc</herd>
+	<longdescription>gtkdialog is a GUI-creation utility that can be used with an arbitrary
+	interpreter. It enables the programmer to describe a graphical user 
+	interface in a simple XML-like language, and use it with any 
+	interpreter that supports either files, standard I/O, or environment 
+	variables. It can be called as an external program from the 
+	interpreter, but can be used as a stand-alone framework for the 
+	application as well. Stand-alone, bash, and awk examples are provided.</longdescription>
+	<upstream>
+		<remote-id type="google-code">gtkdialog</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-misc/gxmessage/Manifest b/x11-misc/gxmessage/Manifest
new file mode 100644
index 000000000000..f5df70fcd9b9
--- /dev/null
+++ b/x11-misc/gxmessage/Manifest
@@ -0,0 +1,4 @@
+DIST gxmessage-2.20.1.tar.gz 270198 SHA256 a189874ae7dcf6efdea34c706be246b61bbe8b158bdbee3ac087a531bac4e5ac SHA512 4b743e4aab423eb0053f5bb0a35ca1e351f51d0789fa6e2f134bcf5cca691595e15e80868610e23d99792343f174f1f1dbd41b823b6b44c1a9327235cf9c1cd2 WHIRLPOOL 3b31bddfa4a893cf1a19022a73bab2929ee2acf960ef8d842fecdbe92187e2faa8c92e7cd111dad941ba9a4d63893189cf7fa957fbba25a247be245e00bf2c6f
+DIST gxmessage-2.20.3.tar.gz 274110 SHA256 8ae76a779094334db436032e830831b4d194943a5e712fd49bdf1968f1d2ec37 SHA512 8f677d0ee899c88a40c912ba68b59ba9a21a0ae21db467c64756daea41fbf2a7fb566e26c74e72f89e6009b1e8029af9bd5748f92099f681346399fe7e9d8e27 WHIRLPOOL f58c9f705a7a69d0cba89b08ef72bdc30aa2e4c0a2885f0d664167a2a2f112410ef1a40ac25354a4b26258e2ec51b5e846e2cb4d507645b1454103a04c4784a8
+DIST gxmessage-3.4.2.tar.gz 274768 SHA256 b76f828b159da2d52d1ff34698024bc60c1b8290f0d691e624d27fb4842beadc SHA512 702e0735085ab236e610c5ebefbda7e35349db8212853450c396c124e18b6786772a0e0f1401e57ef44c25fca908d20c513d233314caad8552a6a7ad024ea0a7 WHIRLPOOL 6d73944f51e8658a9ec5b8d7b0be5eb241ba11fa52b88db4dd182fc17024b6890d00e8903ed09c07ccf9ba20587f540a112b6a22715115ddbfea410c875ee5d4
+DIST gxmessage-3.4.3.tar.gz 275354 SHA256 db4e1655fc58f31e5770a17dfca4e6c89028ad8b2c8e043febc87a0beedeef05 SHA512 4e3c455595db723e2d78060c4913f1a87b8f0c5cb6017427d48cd02652655592bf8aa1001adfbfecd5598cc0c613c78a74d71a59a7f1f0787acc29774328e93a WHIRLPOOL 76d363960d2d23cb3199227c1288515fa6c0c125408bd65a80cbb0a433e827566eb23bc9481bf85ce4affdd2ae8ce7257b753ae09ee86ec746a5db3c45b7dba7
diff --git a/x11-misc/gxmessage/gxmessage-2.20.1.ebuild b/x11-misc/gxmessage/gxmessage-2.20.1.ebuild
new file mode 100644
index 000000000000..9e8845fb70b1
--- /dev/null
+++ b/x11-misc/gxmessage/gxmessage-2.20.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit gnome2-utils
+
+DESCRIPTION="A GTK+ based xmessage clone"
+HOMEPAGE="http://savannah.gnu.org/projects/gxmessage/ http://homepages.ihug.co.nz/~trmusson/programs.html#gxmessage"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz
+	http://homepages.ihug.co.nz/~trmusson/stuff/${P}.tar.gz"
+
+LICENSE="GPL-3 public-domain"
+SLOT="0"
+KEYWORDS="amd64 ppc sparc x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=x11-libs/gtk+-2.20:2"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	>=dev-util/intltool-0.40.1
+	sys-devel/gettext"
+
+DOCS=( AUTHORS ChangeLog HACKING NEWS README TODO )
+
+src_install() {
+	default
+
+	docinto examples
+	dodoc examples/*
+}
+
+pkg_preinst() { gnome2_icon_savelist; }
+pkg_postinst() { gnome2_icon_cache_update; }
+pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/x11-misc/gxmessage/gxmessage-2.20.3.ebuild b/x11-misc/gxmessage/gxmessage-2.20.3.ebuild
new file mode 100644
index 000000000000..5b48c8c929e1
--- /dev/null
+++ b/x11-misc/gxmessage/gxmessage-2.20.3.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit gnome2-utils
+
+DESCRIPTION="A GTK+ based xmessage clone"
+HOMEPAGE="http://savannah.gnu.org/projects/gxmessage/ http://homepages.ihug.co.nz/~trmusson/programs.html#gxmessage"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz
+	http://homepages.ihug.co.nz/~trmusson/stuff/${P}.tar.gz"
+
+LICENSE="GPL-3 public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=x11-libs/gtk+-2.20:2"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	>=dev-util/intltool-0.40.1
+	sys-devel/gettext"
+
+DOCS=( AUTHORS ChangeLog HACKING NEWS README TODO )
+
+src_install() {
+	default
+
+	docinto examples
+	dodoc examples/*
+}
+
+pkg_preinst() { gnome2_icon_savelist; }
+pkg_postinst() { gnome2_icon_cache_update; }
+pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/x11-misc/gxmessage/gxmessage-3.4.2.ebuild b/x11-misc/gxmessage/gxmessage-3.4.2.ebuild
new file mode 100644
index 000000000000..48eeed0ea2a9
--- /dev/null
+++ b/x11-misc/gxmessage/gxmessage-3.4.2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit gnome2-utils
+
+DESCRIPTION="A GTK+ based xmessage clone"
+HOMEPAGE="http://savannah.gnu.org/projects/gxmessage/ http://homepages.ihug.co.nz/~trmusson/programs.html#gxmessage"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz
+	http://homepages.ihug.co.nz/~trmusson/stuff/${P}.tar.gz"
+
+LICENSE="GPL-3 public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="
+	dev-libs/glib:2
+	x11-libs/gtk+:3
+	x11-libs/pango
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	>=dev-util/intltool-0.40.1
+	sys-devel/gettext"
+
+DOCS=( AUTHORS ChangeLog HACKING NEWS README TODO )
+
+src_install() {
+	default
+
+	docinto examples
+	dodoc examples/*
+}
+
+pkg_preinst() { gnome2_icon_savelist; }
+pkg_postinst() { gnome2_icon_cache_update; }
+pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/x11-misc/gxmessage/gxmessage-3.4.3.ebuild b/x11-misc/gxmessage/gxmessage-3.4.3.ebuild
new file mode 100644
index 000000000000..48eeed0ea2a9
--- /dev/null
+++ b/x11-misc/gxmessage/gxmessage-3.4.3.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit gnome2-utils
+
+DESCRIPTION="A GTK+ based xmessage clone"
+HOMEPAGE="http://savannah.gnu.org/projects/gxmessage/ http://homepages.ihug.co.nz/~trmusson/programs.html#gxmessage"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz
+	http://homepages.ihug.co.nz/~trmusson/stuff/${P}.tar.gz"
+
+LICENSE="GPL-3 public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="
+	dev-libs/glib:2
+	x11-libs/gtk+:3
+	x11-libs/pango
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	>=dev-util/intltool-0.40.1
+	sys-devel/gettext"
+
+DOCS=( AUTHORS ChangeLog HACKING NEWS README TODO )
+
+src_install() {
+	default
+
+	docinto examples
+	dodoc examples/*
+}
+
+pkg_preinst() { gnome2_icon_savelist; }
+pkg_postinst() { gnome2_icon_cache_update; }
+pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/x11-misc/gxmessage/metadata.xml b/x11-misc/gxmessage/metadata.xml
new file mode 100644
index 000000000000..731225048652
--- /dev/null
+++ b/x11-misc/gxmessage/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>desktop-misc</herd>
+</pkgmetadata>
diff --git a/x11-misc/habak/Manifest b/x11-misc/habak/Manifest
new file mode 100644
index 000000000000..83cc741c70e4
--- /dev/null
+++ b/x11-misc/habak/Manifest
@@ -0,0 +1 @@
+DIST habak-0.2.5.tar.bz2 22657 SHA256 a4cdd16c34a147c8cba8dd3fdcfe9c55b762a77476ff69fcc5b79f2859660005
diff --git a/x11-misc/habak/files/README.en b/x11-misc/habak/files/README.en
new file mode 100644
index 000000000000..0bdbc259119f
--- /dev/null
+++ b/x11-misc/habak/files/README.en
@@ -0,0 +1,165 @@
+Habak - "Ha" Background
+=========
+
+Compilation:
+	We need a compiler, X server and Imlib2. Just run make, that's all.
+
+Installation:
+	Well, place a ready binary where you want.
+
+A short review:
+
+
+Habak is using layers. The lowest layer is just a black screen.
+On this you can place other objects, called habaks. There are
+three kinds of habaks: graphic files (images),  fonts and "internal objects"
+(internals). Wallaper is created by putting on a black screen
+one or more habaks. An order of habaks in command line is an order
+of putting them on desktop, so the last habak will be drawed above
+previous habaks.
+
+Kinds of habaks:
+
+
+Files (images) are included by -i option, ie:
+
+./habak -i ~/graphics/wallpaper.jpg
+
+will include to desktop wallpaper.jpg file. If you typed after -i not a file,
+but a directory, habak would create a list of files contained within, randomly
+select any one of them, and then try to load it. In other words,
+if you have a lot of pictures in ~/gfx/nice_wallpapers/ then habak
+can choose random image. You only need to run './habak -i ~/gfx/nice_wallpapers/'
+
+Aside from files, you can use fonts (TrueType). Option -f will be useful in this
+case. By means of -f option you have to point a file with TrueType font, ie.
+
+./habak -f ~/.fonts/nice_font.ttf
+
+You can set a size of font, by typing it following slash after font name, ie
+'./habak -f ~/.fonts/nice_font.ttf/50'
+
+Third (and last) type of habaks are internal habaks. You can enable them
+by the -I option. They are not adopting any external data, but
+themself generate some patterns. At this moment only two patterns
+are available, "int" and "INT", which do an interlacing. For example:
+
+./habak -I int
+
+Internal habak "int" do an interlacing, by turning out even lines
+of image. Very nice effect, especially if wallpaper is gaudy.
+"INT" habak works identical as "int", but turns out odd lines
+(by putting together "int" and "INT" you can turn out all lines of screen).
+
+By default lines aren't turned out in fact, but darked (in my opinion
+it generates a better effect), but you can control it by
+-c color modifier (i will tell about it later).
+
+
+USAGE PHILOSOPHY
+You can (and you should to) put habaks together, ie.
+
+./habak -i ~/gfx/cool.jpg -I int -i ~/gfx/small_logo.png -f ~/.fonts/deltafont.ttf -f ~/.fonts/deltafont.ttf/10
+
+that syntax means, that habak will firstly draw coll.jpg file,
+then put on internal habak "interlace", and then will draw small_logo.png
+image, then deltafont.ttf font, and eventually one more time deltafont.ttf
+file, but this time with size of 10 pixels. Simple.
+
+MODIFIERS
+Obviously, alone habaks wouldn't be so elastic, so there are available a lot
+of modifiers that affect on them look. Some modifiers are even
+necessary. Modifiers are options, that are given following
+a definition of any habak - they affect only just followed habak.
+
+Modifier -C
+-C is a centering modifier. Habak that is followed by this modifier will be 
+centered on the screen.
+
+Modifier -S
+-S is a scaling modifier. Habak treated by this modifier will be scaled
+to fill whole screen (but with proportions saved). Using it have a sense
+only for file habaks (images).
+
+Modifier -p
+-p is a position modifier. It precisely determines position of habak
+on desktop. This modifier requires also additional parameter, in the
+form of 'x,y', ie.
+
+./habak -i ~/gfx/meggy.jpg -p 10,50
+
+will render meggy.jpg file with upper-left corner in point 10,50 on desktop.
+Coortinates can be negative, so position will be calculated from the
+opposite side of screen, ie.
+
+./habak -i ~/gfx/meggy.jpg -p -10,50
+
+will calculate "the beggining" position of habak to a ten pixels from
+right and 50 pixels from upper side of screen. To place habak for example
+in upper-right corner, you should use '-p -0,0'
+
+Modifier -c
+-c is a color modifier. Some habaks supports choosing a color
+(at this time only font habaks and internal habaks). -C option
+require parameter, that describe color in form of R,G,B,A, ie.
+
+./habak -I int -c 50,60,70,190
+
+means using "int" habak with color:
+- red component set to 50
+- green component set to 60
+- blue component set to 70
+- alpha channel set to 190
+
+All numbers accepts numbers from 0 (minimal saturation) to 255
+(maximal saturation).
+
+For example '-c 0,0,0,255' means black, fully not transparent color,
+'-c 255,255,255,0' means white, fully transparent color (so just
+not visible), and '-c 200,0,0,128' is a strong red and transparent
+in 50% color.
+
+Modifier -t
+This modifier is a text modifier, works only with font habak.
+As parameter accepts only one line of text, that is rendered
+by the font habak. Any text is accepted, you can write kernel
+version, date, your name, name of favourite distribution or
+image of cat that have a lie-in on your printer. Select something,
+i like a date, text will be nicely antialiased, if you want to use
+not ASCII characters, you have to use utf-8 encoding.
+
+For example.
+
+./habak -f ~/.fonts/deltafont.ttf/15 -t "User $USER on day `date +%Y-%m-%d`" -p 0,-0 -c 240,240,240,200
+
+will render on a black screen for example text "User gregory on day
+2003-12-21", using deltafont.ttf font in size of 15 pixels. Text
+will be placed in lower-left corner of screen, gray color and will
+be transparent a little.
+
+Obviously it is a so simple example, you can complicate it:
+
+./habak -i /usr/local/share/backgrounds/lens -C -f ~/.fonts/deltafont.ttf/15 -t "User $USER on day `date +%Y-%m-%d`" -p 0,-0 -c 240,240,240,200
+
+Now on the background firstly will be placed centered image
+from /usr/local/share/backgrounds/lens directory, and that
+text will be rendered on it. You can complicate it yet:
+
+./habak -i /usr/local/share/backgrounds/lens -C -f ~/.fonts/deltafont.ttf/15 -t "User $USER on day `date +%Y-%m-%d`" -p 5,-0 -c 240,240,240,100 -f ~/.fonts/deltafont.ttf/15 -t "User $USER on day `date +%Y-%m-%d`" -p 0,-5 -c 240,240,240,255
+
+This situation is simpilar, but i complicated text a little -
+i generats *two* font habaks with the same content, but
+one of it is displacemented a little, and have smaller
+transparency. It gives so nice effect of shadow under text. By
+putting together *several* such shadows differenced in size of font
+and intensivity of transparency you can achieve fantastic effects.
+
+Finally, fire up:
+
+./habak -i /usr/local/share/backgrounds/lens -C -I int -f ~/.fonts/deltafont.ttf/15 -t "User $USER on day `date +%Y-%m-%d`" -p 5,-0 -c 240,240,240,100 -f ~/.fonts/deltafont.ttf/15 -t "User $USER on day `date +%Y-%m-%d`" -p 0,-5 -c 240,240,240,255
+
+Here i added an internal habak "interlace", between picture
+from /usr/local/share/backgrounds/lens and font habaks, so
+image is faced by small grid of interlacing, but text is not
+(because it is placed above interlacing).
+
diff --git a/x11-misc/habak/habak-0.2.5-r1.ebuild b/x11-misc/habak/habak-0.2.5-r1.ebuild
new file mode 100644
index 000000000000..bdbc8010dab2
--- /dev/null
+++ b/x11-misc/habak/habak-0.2.5-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="A simple but powerful tool to set desktop wallpaper"
+HOMEPAGE="http://home.gna.org/fvwm-crystal/"
+SRC_URI="http://download.gna.org/fvwm-crystal/${PN}/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="media-libs/imlib2[X]
+	x11-libs/libX11"
+DEPEND="${RDEPEND}
+	x11-proto/xproto"
+
+# Skip into the src directory so we avoid a recursive make call that
+# is going to break parallel make.
+S="${WORKDIR}/${P}/src"
+
+src_prepare() {
+	sed -i \
+		-e '/(LDFLAGS)/s:$: -lImlib2 -lm -lX11:' \
+		-e 's:gcc:$(CC):' \
+		"${S}"/Makefile || die "Makefile fixing failed"
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" ${PN} || die "make failed"
+}
+
+src_install() {
+	dobin ${PN} || die "dobin failed"
+
+	cd "${WORKDIR}/${P}"
+	dodoc ChangeLog README TODO "${FILESDIR}"/README.en || die "dodoc failed"
+}
diff --git a/x11-misc/habak/metadata.xml b/x11-misc/habak/metadata.xml
new file mode 100644
index 000000000000..40838bc36783
--- /dev/null
+++ b/x11-misc/habak/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>desktop-misc</herd>
+</pkgmetadata>
diff --git a/x11-misc/hsetroot/Manifest b/x11-misc/hsetroot/Manifest
new file mode 100644
index 000000000000..31ed6eb4b0bc
--- /dev/null
+++ b/x11-misc/hsetroot/Manifest
@@ -0,0 +1 @@
+DIST hsetroot-1.0.2.tar.gz 125535 SHA256 d6712d330b31122c077bfc712ec4e213abe1fe71ab24b9150ae2774ca3154fd7 SHA512 51788a6b579b82368ef5e11255ff56e2db978a02f7ad752ba64ec33c56ae5f27c1f0ef3452725d1c7bdb9d97b8a3a5b64422031c9c75a7279c407b8772d5edc3 WHIRLPOOL bcf543cf7fb6b6f14ff10de66d554ae9a2e1074a7adbe11068c501a495b98b6518c6cd26504ec8a5aff644c789b86d52c74c026af266c881bd9b13dab9ca5bb8
diff --git a/x11-misc/hsetroot/files/hsetroot-1.0.2-underlinking.patch b/x11-misc/hsetroot/files/hsetroot-1.0.2-underlinking.patch
new file mode 100644
index 000000000000..8d87a48fb805
--- /dev/null
+++ b/x11-misc/hsetroot/files/hsetroot-1.0.2-underlinking.patch
@@ -0,0 +1,24 @@
+http://bugs.gentoo.org/504056
+
+--- configure.ac
++++ configure.ac
+@@ -38,6 +38,8 @@
+ # Checks for typedefs, structures, and compiler characteristics.
+ AC_C_CONST
+ 
++PKG_CHECK_MODULES(X11, [x11])
++
+ # Check for imlib2
+ AC_CHECK_PROGS(imlib2config_cmd, imlib2-config)
+ if test x$imlib2config_cmd = "x"; then
+--- src/Makefile.am
++++ src/Makefile.am
+@@ -1,7 +1,7 @@
+ bin_PROGRAMS = hsetroot
+ 
+ AM_CFLAGS = @CFLAGS@ @IMLIB2_CFLAGS@ -Wall
+-LIBS = @IMLIB2_LIBS@
++LIBS = @IMLIB2_LIBS@ $(X11_LIBS)
+ 
+ hsetroot_SOURCES = hsetroot.c
+ 
diff --git a/x11-misc/hsetroot/hsetroot-1.0.2.ebuild b/x11-misc/hsetroot/hsetroot-1.0.2.ebuild
new file mode 100644
index 000000000000..277384ab5c16
--- /dev/null
+++ b/x11-misc/hsetroot/hsetroot-1.0.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils
+
+DESCRIPTION="Tool which allows you to compose wallpapers ('root pixmaps') for X"
+HOMEPAGE="http://thegraveyard.org/hsetroot.html"
+SRC_URI="http://cdn.thegraveyard.org/releases/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ppc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	>=media-libs/imlib2-1.0.6.2003[X]"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	x11-proto/xproto"
+
+DOCS="AUTHORS ChangeLog NEWS README"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-underlinking.patch
+	# The pre-generated configure script contains unneeded deps
+	eautoreconf
+}
diff --git a/x11-misc/hsetroot/metadata.xml b/x11-misc/hsetroot/metadata.xml
new file mode 100644
index 000000000000..cbdd24cc0a74
--- /dev/null
+++ b/x11-misc/hsetroot/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>desktop-misc</herd>
+<longdescription>
+hsetroot is a tool which allows you to compose wallpapers ("root pixmaps") for X. It has a lot of options like rendering gradients, solids, images but it also allows you to perform manipulations on those things, or chain them together. You could use one standard background image for isntance, and using tint to make it fit your current theme. And yes, of course it is compatible with semi-translucent applications like aterm and xchat :)
+	 
+ At this time, hsetroot can render: gradients (multi-color with variable distance), solids (rectangles) and images (centered, tiled, fullscreen, or maximum aspect). It supports the following manipulations: tinting (overlaying a color mask), blurring, sharpening, flipping (horizontally, diagonally, vertically) it also allows you to adjust brightness, contrast and gamma-level. hsetroot also supports alpha-channels when rendering things.
+</longdescription>
+</pkgmetadata>
diff --git a/x11-misc/i3lock/Manifest b/x11-misc/i3lock/Manifest
new file mode 100644
index 000000000000..4e45bb60224b
--- /dev/null
+++ b/x11-misc/i3lock/Manifest
@@ -0,0 +1,3 @@
+DIST i3lock-2.5.tar.bz2 16135 SHA256 ac2772c9e4fc13adb882cacaae13ccc381d6d4f154ffd538634a58e6369d0d77 SHA512 8e49c25b0efe3836a8daa4dae61354ecb57374a8de8f10b8b5f262d7c1f6070d60e3ac25112be6079a56baa83f73c3c2a85d48ab27c8559df8aef358ffdab2a7 WHIRLPOOL 3adf11ecd931f1d266a56ac7d3135317d6c12c03478ae65221e985b1b8991ddac3066221d711b3f77b2ae812f1a1c74790876ced9c1f3910feae70815392c573
+DIST i3lock-2.6.tar.bz2 17972 SHA256 c02d899fefc66bc36e47b305251363861400541f3925a21a94c66cee9055402a SHA512 ccaf336b4abd65df24ba37613ba46e129d6e4c42cb8c0a05cc8d9cc0815f0f9f03613230b1cdbb5d16d6903a57a04f2c6b0fc168881ae03000aa170716fedf4a WHIRLPOOL 7ce2dfc29e3366075597097d53c09373677019d0c6f8e872a157a8e7f32b44daf0ccd19fe56c69ca8ae43f60a2d87eed4c8e2e5716cc8ec24c82f5a0cda8a2a5
+DIST i3lock-2.7.tar.bz2 19490 SHA256 6882183ed0eca439e3ad1ae3e9d48b4d0a0b6f075e3850b46bf84aec97538fe2 SHA512 7945d142d239fe7f8985c1000e22db0532456939e65ee855f12e364092808d0cc09cc818b1189e32d88c872ce00033c41c8ebefe62349630872815adaf8b3899 WHIRLPOOL 088fe683f723a6adfb6f60efb4a8f62870b96adf3a96606e9cba642f21ecf42f1fdc0b8346dd4a84a5f65bc6f5e2d1f256e80a0ba736dc4fe276a697c347c983
diff --git a/x11-misc/i3lock/i3lock-2.5.ebuild b/x11-misc/i3lock/i3lock-2.5.ebuild
new file mode 100644
index 000000000000..2b503ed1ea74
--- /dev/null
+++ b/x11-misc/i3lock/i3lock-2.5.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit toolchain-funcs
+
+DESCRIPTION="Simple screen locker"
+HOMEPAGE="http://i3wm.org/i3lock/"
+SRC_URI="http://i3wm.org/${PN}/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="virtual/pam
+	dev-libs/libev
+	>=x11-libs/libxkbcommon-0.3.1
+	x11-libs/libxkbfile
+	x11-libs/xcb-util
+	x11-libs/libX11
+	x11-libs/cairo[xcb]"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+DOCS=( CHANGELOG README )
+
+pkg_setup() {
+	tc-export CC
+}
+
+src_prepare() {
+	sed -i -e 's:login:system-auth:' ${PN}.pam || die
+}
+
+src_install() {
+	default
+	doman ${PN}.1
+}
diff --git a/x11-misc/i3lock/i3lock-2.6.ebuild b/x11-misc/i3lock/i3lock-2.6.ebuild
new file mode 100644
index 000000000000..11787237b70e
--- /dev/null
+++ b/x11-misc/i3lock/i3lock-2.6.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Simple screen locker"
+HOMEPAGE="http://i3wm.org/i3lock/"
+SRC_URI="http://i3wm.org/${PN}/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~x86"
+IUSE=""
+
+RDEPEND="virtual/pam
+	dev-libs/libev
+	>=x11-libs/libxkbcommon-0.3.1[X]
+	x11-libs/libxcb[xkb]
+	x11-libs/xcb-util
+	x11-libs/cairo[xcb]"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+DOCS=( CHANGELOG README )
+
+pkg_setup() {
+	tc-export CC
+}
+
+src_prepare() {
+	sed -i -e 's:login:system-auth:' ${PN}.pam || die
+	epatch_user
+}
+
+src_install() {
+	default
+	doman ${PN}.1
+}
diff --git a/x11-misc/i3lock/i3lock-2.7.ebuild b/x11-misc/i3lock/i3lock-2.7.ebuild
new file mode 100644
index 000000000000..6207486dcf63
--- /dev/null
+++ b/x11-misc/i3lock/i3lock-2.7.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Simple screen locker"
+HOMEPAGE="http://i3wm.org/i3lock/"
+SRC_URI="http://i3wm.org/${PN}/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="virtual/pam
+	dev-libs/libev
+	>=x11-libs/libxkbcommon-0.5.0[X]
+	x11-libs/libxcb[xkb]
+	x11-libs/xcb-util
+	x11-libs/cairo[xcb]"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+DOCS=( CHANGELOG README.md )
+
+pkg_setup() {
+	tc-export CC
+}
+
+src_prepare() {
+	sed -i -e 's:login:system-auth:' ${PN}.pam || die
+	epatch_user
+}
+
+src_install() {
+	default
+	doman ${PN}.1
+}
diff --git a/x11-misc/i3lock/metadata.xml b/x11-misc/i3lock/metadata.xml
new file mode 100644
index 000000000000..b5caab41c7b2
--- /dev/null
+++ b/x11-misc/i3lock/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>desktop-misc</herd>
+	<maintainer>
+		<email>xarthisius@gentoo.org</email>
+		<name>Kacper Kowalik</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/x11-misc/i3status/Manifest b/x11-misc/i3status/Manifest
new file mode 100644
index 000000000000..2132242a5475
--- /dev/null
+++ b/x11-misc/i3status/Manifest
@@ -0,0 +1,3 @@
+DIST i3status-2.7.tar.bz2 37594 SHA256 073f4e5de3bc5afc1f23c52ea52e2aa4b90ca8a012f28ba2c5fac3c33474a632 SHA512 7db6aded37e131c75e99f939102ac3b953817456921eec6b9054b6c4e0855f8d1f20638cbcd0f0b18ad24201041a01ade98c4d4cde6ff14bb11508454b8d3062 WHIRLPOOL 3bc2b599cda1d0f9e5442f03dc4e8700f84172c45d193b502f2894420c9be4a5c93022d199a718864a34c8fbbd6dc9d0d911c4c484a826fa4640514418e2f887
+DIST i3status-2.8.tar.bz2 40422 SHA256 ab06c5dd454354e6fc64354082616115082b70dc3906361bce5a02beb0f807fe SHA512 b1e3dbc480660a96a662ccb996769203fae22448f8801cabb56c339ba63ac84d30018c897e2ecac23f513cfe9d9a7d9200a351a2e6b10a42c1929c28e8e22c02 WHIRLPOOL 84444845a10bcdfd68336439c92197629b5e426e474dcfe68fd9cc11b7097476c32337c360429b344fdbe03e70d8b47c5eefd3f489bf2b78fd1df3f2f091a568
+DIST i3status-2.9.tar.bz2 46615 SHA256 42eb09500c625fcac9a7125a29e7bf532ca4b8540942418ee3253aa15e5e9de3 SHA512 67d026fcb4cc2a8af39cc268c962d49c4d3f2473bad92d99fa7fba876235ac83471663b318f890e9d7d3e9e06897286d693d352e686376a3a4876f253f309cb6 WHIRLPOOL 1a94da2c5d3bc4585908367b14ca1b18fada2a0d3c93a231969e6b92586a66bbcf5f67b0952bc6535e44f2e3ef1f66f000b55049b586821697f4fb26783da6cf
diff --git a/x11-misc/i3status/i3status-2.7.ebuild b/x11-misc/i3status/i3status-2.7.ebuild
new file mode 100644
index 000000000000..bf07eaa423f8
--- /dev/null
+++ b/x11-misc/i3status/i3status-2.7.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit toolchain-funcs versionator fcaps
+
+DESCRIPTION="generates a status bar for dzen2, xmobar or similar"
+HOMEPAGE="http://i3wm.org/i3status/"
+SRC_URI="http://i3wm.org/${PN}/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="dev-libs/confuse
+	>=dev-libs/yajl-2.0.2
+	media-libs/alsa-lib
+	net-wireless/wireless-tools"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	sed -e "/@echo/d" -e "s:@\$(:\$(:g" -e "/setcap/d" \
+		-e '/CFLAGS+=-g/d' -i Makefile || die
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+pkg_postinst() {
+	fcaps cap_net_admin usr/bin/${PN}
+	einfo "${PN} can be used with any of the following programs:"
+	einfo "   i3bar (x11-wm/i3)"
+	einfo "   x11-misc/xmobar"
+	einfo "   x11-misc/dzen"
+	einfo "Please refer to manual: man ${PN}"
+}
diff --git a/x11-misc/i3status/i3status-2.8.ebuild b/x11-misc/i3status/i3status-2.8.ebuild
new file mode 100644
index 000000000000..febb8e24c4a1
--- /dev/null
+++ b/x11-misc/i3status/i3status-2.8.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit toolchain-funcs versionator fcaps
+
+DESCRIPTION="generates a status bar for dzen2, xmobar or similar"
+HOMEPAGE="http://i3wm.org/i3status/"
+SRC_URI="http://i3wm.org/${PN}/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-libs/confuse
+	>=dev-libs/yajl-2.0.2
+	media-libs/alsa-lib
+	net-wireless/wireless-tools"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	sed -e "/@echo/d" -e "s:@\$(:\$(:g" -e "/setcap/d" \
+		-e '/CFLAGS+=-g/d' -i Makefile || die
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+pkg_postinst() {
+	fcaps cap_net_admin usr/bin/${PN}
+	einfo "${PN} can be used with any of the following programs:"
+	einfo "   i3bar (x11-wm/i3)"
+	einfo "   x11-misc/xmobar"
+	einfo "   x11-misc/dzen"
+	einfo "Please refer to manual: man ${PN}"
+}
diff --git a/x11-misc/i3status/i3status-2.9.ebuild b/x11-misc/i3status/i3status-2.9.ebuild
new file mode 100644
index 000000000000..7fc35460ff48
--- /dev/null
+++ b/x11-misc/i3status/i3status-2.9.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit toolchain-funcs versionator fcaps
+
+DESCRIPTION="generates a status bar for dzen2, xmobar or similar"
+HOMEPAGE="http://i3wm.org/i3status/"
+SRC_URI="http://i3wm.org/${PN}/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-libs/confuse
+	>=dev-libs/yajl-2.0.2
+	media-libs/alsa-lib
+	net-wireless/wireless-tools"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	sed -e "/@echo/d" -e "s:@\$(:\$(:g" -e "/setcap/d" \
+		-e '/CFLAGS+=-g/d' -i Makefile || die
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+pkg_postinst() {
+	fcaps cap_net_admin usr/bin/${PN}
+	einfo "${PN} can be used with any of the following programs:"
+	einfo "   i3bar (x11-wm/i3)"
+	einfo "   x11-misc/xmobar"
+	einfo "   x11-misc/dzen"
+	einfo "Please refer to manual: man ${PN}"
+}
diff --git a/x11-misc/i3status/metadata.xml b/x11-misc/i3status/metadata.xml
new file mode 100644
index 000000000000..29dbb30b93cd
--- /dev/null
+++ b/x11-misc/i3status/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>desktop-misc</herd>
+	<maintainer>
+		<email>xarthisius@gentoo.org</email>
+		<name>Kacper Kowalik</name>
+	</maintainer>
+	<longdescription>
+		i3status is a small program (about 1500 SLOC) for generating a status bar for
+		dzen2, xmobar or similar programs. It is designed to be very efficient by
+		issuing a very small number of system calls, as one generally wants to update
+		such a status line every second. This ensures that even under high load, your
+		status bar is updated correctly. Also, it saves a bit of energy by not hogging
+		your CPU as much as spawning the corresponding amount of shell commands would.
+	</longdescription>
+	<use>
+		<flag name="filecaps">Linux capabilities library is required for i3status to be able to read net bandwith</flag>
+	</use>
+</pkgmetadata>
diff --git a/x11-misc/i855crt/Manifest b/x11-misc/i855crt/Manifest
new file mode 100644
index 000000000000..f6d65cf6bacf
--- /dev/null
+++ b/x11-misc/i855crt/Manifest
@@ -0,0 +1 @@
+DIST i855crt-0.4.tar.gz 65209 SHA256 942fb0cde89737e921837d5ecab2a49158b04a5389205728cfa49108ee0bc269
diff --git a/x11-misc/i855crt/files/i855crt-i915support.diff b/x11-misc/i855crt/files/i855crt-i915support.diff
new file mode 100644
index 000000000000..5aea3a7dd96c
--- /dev/null
+++ b/x11-misc/i855crt/files/i855crt-i915support.diff
@@ -0,0 +1,70 @@
+--- a/dumpreg.c
++++ b/dumpreg.c
+@@ -36,10 +36,11 @@
+ 		(p = strstr(*buff_ptr, I810_DC100STR_1)) != NULL ||
+ 		(p = strstr(*buff_ptr, I810_DC100STR_2)) != NULL ||
+ 		(p = strstr(*buff_ptr, I810_IGSTR)) != NULL ||
+-		(p = strstr(*buff_ptr, I810_CFCSTR)) != NULL;
++		(p = strstr(*buff_ptr, I810_CFCSTR)) != NULL ||
+ 		(p = strstr(*buff_ptr, I830STR)) != NULL ||
+ 		(p = strstr(*buff_ptr, I845STR)) != NULL ||
+-		(p = strstr(*buff_ptr, I865STR)) != NULL ;
++		(p = strstr(*buff_ptr, I865STR)) != NULL ||
++		(p = strstr(*buff_ptr, I915STR)) != NULL ;
+ 	
+ 		if(i)
+ 		{
+@@ -89,7 +90,7 @@
+ 	chip = i810_chip(&buff, &len, pci_f);
+ 	if (chip == NULL) 
+ 	{
+-		fprintf(stderr, "No know videocard has been found.\n");
++		fprintf(stderr, "No known videocard has been found.\n");
+ 		exit(1);
+ 	}
+ 	pclose(pci_f);
+--- a/i855crt.c
++++ b/i855crt.c
+@@ -254,14 +254,15 @@
+ 		(p = strstr(*buff_ptr, I810_DC100STR_1)) != NULL ||
+ 		(p = strstr(*buff_ptr, I810_DC100STR_2)) != NULL ||
+ 		(p = strstr(*buff_ptr, I810_IGSTR)) != NULL ||
+-		(p = strstr(*buff_ptr, I810_CFCSTR)) != NULL;
++		(p = strstr(*buff_ptr, I810_CFCSTR)) != NULL ||
+ 		(p = strstr(*buff_ptr, I830STR)) != NULL ||
+ 		(p = strstr(*buff_ptr, I845STR)) != NULL ||
+-		(p = strstr(*buff_ptr, I865STR)) != NULL ;
++		(p = strstr(*buff_ptr, I865STR)) != NULL ||
++		(p = strstr(*buff_ptr, I915STR)) != NULL ;
+ 	
+ 		if(i)
+ 		{
+-			fprintf(stderr,"This driver is untested with your videocard !\n");  
++			fprintf(stderr,"This driver is untested with your video card !\n");  
+ 			return p;
+ 		}
+ 		
+@@ -493,7 +494,7 @@
+ 	chip = i810_chip(&buff, &len, pci_f);
+ 	if (chip == NULL) 
+ 	{
+-		fprintf(stderr, "No know videocard has been found.\n");
++		fprintf(stderr, "No known videocard has been found.\n");
+ 		exit(1);
+ 	}
+ 	pclose(pci_f);
+--- a/i855crt.h
++++ b/i855crt.h
+@@ -1,3 +1,4 @@
++
+ /* 
+ * This is part of the source for i855crt driver
+ * copyright(c) Merello Andrea 2004
+@@ -45,6 +46,7 @@
+ #define I845STR			"8086:2562"
+ #define I855STR			"8086:3582"
+ #define I865STR			"8086:2572"
++#define I915STR			"8086:2592"
+ #define MEMSTR			"Memory at"
+ #define NONPRSTR		"32-bit, non-prefetchable"
+ 
diff --git a/x11-misc/i855crt/i855crt-0.4-r1.ebuild b/x11-misc/i855crt/i855crt-0.4-r1.ebuild
new file mode 100644
index 000000000000..8ce6e2304a75
--- /dev/null
+++ b/x11-misc/i855crt/i855crt-0.4-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Intel Montara 855GM CRT out auxiliary driver"
+HOMEPAGE="http://i855crt.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE=""
+
+DEPEND="
+	x11-libs/libX11
+	x11-libs/libXv
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-i915support.diff
+
+	# respect CC, fix underlinking
+	sed -i Makefile \
+		-e 's|gcc|$(CC)|g;/LDFLAGS/{s|$| -lX11|g};s|-lXext||g' \
+		|| die
+	export LIBS="-lX11"
+	tc-export CC
+
+	# upstream ships it with the binary, we want to make sure we compile it
+	emake clean
+}
+
+src_install() {
+	dobin i855crt
+	insinto /etc
+	doins i855crt.conf
+}
diff --git a/x11-misc/i855crt/metadata.xml b/x11-misc/i855crt/metadata.xml
new file mode 100644
index 000000000000..91dfec751a9f
--- /dev/null
+++ b/x11-misc/i855crt/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>desktop-misc</herd>
+	<longdescription lang="en">
+i855crt is a tool to send the output of a i855-based graphic card to the
+external VGA, primarily used for presentations.
+</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">i855crt</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-misc/icewmcp/Manifest b/x11-misc/icewmcp/Manifest
new file mode 100644
index 000000000000..ed8d1e8c30eb
--- /dev/null
+++ b/x11-misc/icewmcp/Manifest
@@ -0,0 +1 @@
+DIST IceWMControlPanel-3.2.tar.bz2 586044 SHA256 6259d27b5de151049b245cac17606ba77d055766ef1706363dc301085c925af9 SHA512 017b257bb30c49eb0b13a9570df70f6f8ccb55087121440cd1331f8364ddc6c23fae26c98bae1bd831f2a9fc52bef531cab9313f3e2ea209ce26d776ee64c47e WHIRLPOOL f133b4998528c10071c39bab3187705ac7f5c6ee87bd2b73de395a88b0953df217b9e4cc2216ca9bf14ac70b190c30879f04eba2f4a1d342b30e994952a4e17a
diff --git a/x11-misc/icewmcp/icewmcp-3.2-r2.ebuild b/x11-misc/icewmcp/icewmcp-3.2-r2.ebuild
new file mode 100644
index 000000000000..1a246aae445f
--- /dev/null
+++ b/x11-misc/icewmcp/icewmcp-3.2-r2.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+PYTHON_DEPEND="2"
+
+inherit python multilib
+
+S=${WORKDIR}/INSTALL-IceWMCP
+MY_PN=IceWMControlPanel
+MY_DEST="usr/$(get_libdir)/${P}"
+MY_BIN="usr/bin"
+
+DESCRIPTION="A complete control panel for IceWM using gtk & python"
+HOMEPAGE="http://icesoundmanager.sourceforge.net/index.php"
+SRC_URI="mirror://sourceforge/icesoundmanager/${MY_PN}-${PV}.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~amd64 ~ppc x86"
+IUSE=""
+DEPEND="x11-wm/icewm
+		dev-python/pygtk:2
+		x11-libs/gtk+:2"
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_install() {
+	dodir "${MY_DEST}/"
+	dodir "${MY_BIN}/"
+	dodoc "${S}"/doc/* "${S}"/licenses/*
+	cp "${S}"/* "${D}"/${MY_DEST}
+	cp -R "${S}"/applets "${S}"/applet-icons "${S}"/help "${S}"/icons \
+	"${S}"/locale "${S}"/pixmaps "${D}"/${MY_DEST}/
+	# create executable shortcuts to the python scripts
+	echo -e "#!/bin/bash \n python /${MY_DEST}/IceWMCP.py" > ${T}/IceWMCP
+	echo -e "#!/bin/bash \n python /${MY_DEST}/IceWMCPKeyboard.py" > ${T}/IceWMCP-Keyboard
+	echo -e "#!/bin/bash \n python /${MY_DEST}/IceWMCPMouse.py" > ${T}/IceWMCP-Mouse
+	echo -e "#!/bin/bash \n python /${MY_DEST}/pyspool.py" > ${T}/IceWMCP-PySpool
+	echo -e "#!/bin/bash \n python /${MY_DEST}/IceWMCPWallpaper.py" > ${T}/IceWMCP-Wallpaper
+	echo -e "#!/bin/bash \n python /${MY_DEST}/IceWMCPWinOptions.py" > ${T}/IceWMCP-WinOptions
+	echo -e "#!/bin/bash \n python /${MY_DEST}/phrozenclock.py" > ${T}/PhrozenClock
+	echo -e "#!/bin/bash \n python /${MY_DEST}/icesound.py" > ${T}/IceSoundManager
+	echo -e "#!/bin/bash \n python /${MY_DEST}/IceWMCP_GtkPCCard.py" > ${T}/GtkPCCard
+	echo -e "#!/bin/bash \n python /${MY_DEST}/IceMe.py" > ${T}/iceme
+	echo -e "#!/bin/bash \n python /${MY_DEST}/icepref.py" > ${T}/icepref
+	echo -e "#!/bin/bash \n python /${MY_DEST}/icepref_td.py" > ${T}/icepref_td
+	echo -e "#!/bin/bash \n python /${MY_DEST}/IceWMCPGtkIconSelection.py" > ${T}/IceWMCP-Icons
+	echo -e "#!/bin/bash \n python /${MY_DEST}/IceWMCPEnergyStar.py" > ${T}/IceWMCP-EnergyStar
+	dobin "${T}"/*
+}
+
+pkg_postinst() {
+	einfo "Some of the icons displayed by IceWMCP may be pointing to"
+	einfo "programs which are not on your system!  You can hide them"
+	einfo "using the Configuration window (Ctrl+C) or change them"
+	einfo "by editing the files in"
+	einfo "/${MY_DEST}/applets and"
+	einfo "/${MY_DEST}/applet-icons."
+}
diff --git a/x11-misc/icewmcp/icewmcp-3.2-r4.ebuild b/x11-misc/icewmcp/icewmcp-3.2-r4.ebuild
new file mode 100644
index 000000000000..7c97bf317f7a
--- /dev/null
+++ b/x11-misc/icewmcp/icewmcp-3.2-r4.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+inherit multilib python-single-r1
+
+MY_PN=IceWMControlPanel
+DESCRIPTION="A complete control panel for IceWM using gtk & python"
+HOMEPAGE="http://icesoundmanager.sourceforge.net/index.php"
+SRC_URI="mirror://sourceforge/icesoundmanager/${MY_PN}-${PV}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+DEPEND="
+	dev-python/pygtk:2
+	x11-libs/gtk+:2
+	x11-wm/icewm
+"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/INSTALL-IceWMCP
+
+src_prepare() {
+	rm -rf licenses
+	mv doc .. || die
+}
+
+src_install() {
+	local dest="/usr/$(get_libdir)/${P}"
+	insinto ${dest}
+	doins -r *
+
+	local w wraps=(
+		"IceWMCP.py IceWMCP"
+		"IceWMCPKeyboard.py IceWMCP-Keyboard"
+		"IceWMCPMouse.py IceWMCP-Mouse"
+		"pyspool.py IceWMCP-PySpool"
+		"IceWMCPWallpaper.py IceWMCP-Wallpaper"
+		"IceWMCPWinOptions.py IceWMCP-WinOptions"
+		"phrozenclock.py PhrozenClock"
+		"icesound.py IceSoundManager"
+		"IceWMCP_GtkPCCard.py GtkPCCard"
+		"IceMe.py iceme"
+		"icepref.py icepref"
+		"icepref_td.py icepref_td"
+		"IceWMCPGtkIconSelection.py IceWMCP-Icons"
+		"IceWMCPEnergyStar.py IceWMCP-EnergyStar"
+	)
+	for w in "${wraps[@]}" ; do
+		set -- ${w}
+		printf '#!/bin/sh\nexec %s %s/%s\n' "${EPYTHON}" "${dest}" "$1" > "${T}"/$2
+		dobin "${T}"/$2 || die
+	done
+
+	dodoc ../doc/*.txt
+	dohtml ../doc/*.html
+	python_optimize "${D}/${dest}"
+}
diff --git a/x11-misc/icewmcp/metadata.xml b/x11-misc/icewmcp/metadata.xml
new file mode 100644
index 000000000000..0c74c3eb46a6
--- /dev/null
+++ b/x11-misc/icewmcp/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>desktop-misc</herd>
+	<upstream>
+		<remote-id type="sourceforge">icesoundmanager</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-misc/icon-naming-utils/Manifest b/x11-misc/icon-naming-utils/Manifest
new file mode 100644
index 000000000000..8f46c777c8c8
--- /dev/null
+++ b/x11-misc/icon-naming-utils/Manifest
@@ -0,0 +1 @@
+DIST icon-naming-utils-0.8.90.tar.gz 70321 SHA256 044ab2199ed8c6a55ce36fd4fcd8b8021a5e21f5bab028c0a7cdcf52a5902e1c SHA512 6c23f6138e053f9fc6de9d56f94b80849f29f9fde46cdf54b705720cb48b0c660f315484fb36fb9936d4ceade7768aad2d17280545a4b392aa56185c9452999d WHIRLPOOL 86800d8edb196ee9ba063baa99211720dfb242b32225e852ad16d883a237d00ae68546b76f871a912453fae417c93f92e876b26f2112aa9692523c9d8a5ca603
diff --git a/x11-misc/icon-naming-utils/icon-naming-utils-0.8.90.ebuild b/x11-misc/icon-naming-utils/icon-naming-utils-0.8.90.ebuild
new file mode 100644
index 000000000000..12625d73f558
--- /dev/null
+++ b/x11-misc/icon-naming-utils/icon-naming-utils-0.8.90.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+DESCRIPTION="Utils to help with the transition to the new freedesktop.org naming scheme"
+HOMEPAGE="http://tango.freedesktop.org"
+SRC_URI="http://tango.freedesktop.org/releases/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND=">=dev-perl/XML-Simple-2
+	 >=dev-lang/perl-5"
+DEPEND="${RDEPEND}"
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed."
+	dodoc AUTHORS ChangeLog NEWS README
+}
diff --git a/x11-misc/icon-naming-utils/metadata.xml b/x11-misc/icon-naming-utils/metadata.xml
new file mode 100644
index 000000000000..c03b663ea9ff
--- /dev/null
+++ b/x11-misc/icon-naming-utils/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>freedesktop</herd>
+	<maintainer>
+		<email>freedesktop-bugs@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/x11-misc/iconbox/Manifest b/x11-misc/iconbox/Manifest
new file mode 100644
index 000000000000..084bbedd8940
--- /dev/null
+++ b/x11-misc/iconbox/Manifest
@@ -0,0 +1 @@
+DIST iconbox_0.2.tar.gz 14739 SHA256 6ca36bc55a37a0cca5e1fb91fd66bb3b724355aa8044548008de0ad52aad8e22
diff --git a/x11-misc/iconbox/iconbox-0.2.ebuild b/x11-misc/iconbox/iconbox-0.2.ebuild
new file mode 100644
index 000000000000..b7bee0ce31be
--- /dev/null
+++ b/x11-misc/iconbox/iconbox-0.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+MY_P=${P/-/_}
+
+DESCRIPTION="App for placing icons in a menu which auto-hides"
+HOMEPAGE="http://packages.gentoo.org/"
+SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc x86"
+IUSE=""
+
+RDEPEND="x11-libs/gtk+:2
+	dev-perl/gtk2-perl"
+DEPEND="${RDEPEND}"
+
+src_compile() { :; }
+
+src_install() {
+	dobin iconbox{,conf}
+	dodoc Changelog README
+	doman *.1
+}
diff --git a/x11-misc/iconbox/metadata.xml b/x11-misc/iconbox/metadata.xml
new file mode 100644
index 000000000000..be913d7a46e5
--- /dev/null
+++ b/x11-misc/iconbox/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>desktop-misc</herd>
+<longdescription lang="en">
+Iconbox is a free desktop tool that allows applications to be started quickly
+with one mouse click. When Iconbox is running, the main window is invisible
+until you move the cursor into a chosen area on the desktop. When the Iconbox
+window appears, an application is started by clicking on the respective icon.
+Afterward, the iconbox window disappears. 
+</longdescription>
+</pkgmetadata>
+
diff --git a/x11-misc/idesk-extras/Manifest b/x11-misc/idesk-extras/Manifest
new file mode 100644
index 000000000000..85e891506a42
--- /dev/null
+++ b/x11-misc/idesk-extras/Manifest
@@ -0,0 +1 @@
+DIST idesk-extras-1.37.tar.xz 424684 SHA256 8e0bd7011706685810940adabd9f284e33212971a629f81f693322342a958a68 SHA512 a64ced6bd46945949a0bdbcef8a1f142d6fa2f50e4776f5eead9581430d5ef17d41fbd2a05e284f25cc23c2d2b948d02f2d5d0f51217d43958f40949255b6a28 WHIRLPOOL a688a6d923519dc1e48a904327119c9c5d287759c1cd7cca3fe356b2c29127e38d334a0aab87cd84b886c7d3174ff4cf8b7a0335a16c41b7a79648a4631d0acd
diff --git a/x11-misc/idesk-extras/files/idesk-extras-1.37-stdout.patch b/x11-misc/idesk-extras/files/idesk-extras-1.37-stdout.patch
new file mode 100644
index 000000000000..d827184ff9a4
--- /dev/null
+++ b/x11-misc/idesk-extras/files/idesk-extras-1.37-stdout.patch
@@ -0,0 +1,112 @@
+From b8e096f75c9a2fb3a5f02146f0e52ccae796aa87 Mon Sep 17 00:00:00 2001
+From: hasufell <hasufell@gentoo.org>
+Date: Sun, 6 Oct 2013 14:39:02 +0200
+Subject: [PATCH] use stdout to avoid broken tmp files
+
+e.g. fontconfig errors will break parsing
+---
+ idesktool | 28 ++++++++++++++--------------
+ 1 file changed, 14 insertions(+), 14 deletions(-)
+
+diff --git a/idesktool b/idesktool
+index 931ad6f..90e5ceb 100755
+--- a/idesktool
++++ b/idesktool
+@@ -88,10 +88,10 @@ end" > ~/.ideskrc
+ newcaption()
+ {
+ 
+-$DIALOG --wizard --title "idesktool 1.36" \
++$DIALOG --stdout --wizard --title "idesktool 1.36" \
+         --inputbox "Icon Caption:\n
+ 		(Leave blank for no caption)"\
+-		 8 40 "$cap" 2> ~/.idesktop/inputbox.tmp.$$
++		 8 40 "$cap" 1> ~/.idesktop/inputbox.tmp.$$
+ retval=$?
+ case $retval in
+      0) cap=$(cat ~/.idesktop/inputbox.tmp.$$)
+@@ -132,10 +132,10 @@ modcaption=NoCaption$$
+ fi
+ 
+ 
+-$DIALOG --wizard --title "idesktool 1.36" \
++$DIALOG --stdout --wizard --title "idesktool 1.36" \
+    --separate-output --2inputsbox "NOTE: The default right-click command \n
+    runs this configuration tool (recommended)."\
+-	18 40 "Left-Click Command:" "$command" "Right-Click Command:" "idesktool $modcaption.lnk" 2> ~/.idesktop/inputbox.tmp.$$
++	18 40 "Left-Click Command:" "$command" "Right-Click Command:" "idesktool $modcaption.lnk" 1> ~/.idesktop/inputbox.tmp.$$
+ retval=$?
+ 
+ case $retval in
+@@ -187,10 +187,10 @@ modifycaption()
+ 
+ {
+ 
+-$DIALOG --wizard --title "idesktool 1.36" \
++$DIALOG --stdout --wizard --title "idesktool 1.36" \
+         --inputbox "Icon Caption:\n
+ 		   (Leave blank for no caption)"\
+-		 8 40 "$currentcaption" 2> ~/.idesktop/inputbox.tmp.$$
++		 8 40 "$currentcaption" 1> ~/.idesktop/inputbox.tmp.$$
+ retval=$?
+ case $retval in
+      0) cap=$(cat ~/.idesktop/inputbox.tmp.$$)
+@@ -235,10 +235,10 @@ modcaption=NoCaption$$
+ fi
+ 
+ 
+-$DIALOG --wizard --title "idesktool 1.36" \
++$DIALOG --stdout --wizard --title "idesktool 1.36" \
+    --separate-output --2inputsbox  "NOTE: The default right-click command \n
+    runs this configuration tool (recommended)."\
+-	18 40 "Left-Click Command:" "$command" "Right-Click Command:" "idesktool $modcaption.lnk" 2> ~/.idesktop/inputbox.tmp.$$
++	18 40 "Left-Click Command:" "$command" "Right-Click Command:" "idesktool $modcaption.lnk" 1> ~/.idesktop/inputbox.tmp.$$
+ retval=$?
+ case $retval in 
+ 1) rm -f ~/.idesktop/inputbox.tmp.$$
+@@ -423,13 +423,13 @@ argyyep()
+ 
+ firstwindow=argyyep
+ 
+-$DIALOG --title "idesktool 1.36" \
++$DIALOG --stdout --title "idesktool 1.36" \
+         --radiolist "Desktop Icon Manager" 18 40 0 \
+         "Properties" "View or Edit This Icon" off \
+         "Delete" "    Remove This Icon" off \
+         "New" "       Add a New Icon" off \
+         "Refresh" "   Reload the Desktop" off \
+-	"Configure" " Edit iDesk's conf. file" off 2> ~/.idesktop/checklist.tmp.$$
++	"Configure" " Edit iDesk's conf. file" off 1> ~/.idesktop/checklist.tmp.$$
+ 
+ retval=$?
+ 
+@@ -469,13 +469,13 @@ argynope()
+ 
+ firstwindow=argynope
+ 
+-$DIALOG --title "idesktool 1.36" \
++$DIALOG --stdout --title "idesktool 1.36" \
+         --radiolist "Desktop Icon Manager" 18 40 0 \
+         "Properties" "View or Edit an Icon" off \
+         "Delete" "    Remove an Icon" off \
+         "New" "       Add a new Icon" off \
+         "Refresh" "   Reload the Desktop" off \
+-	"Configure" " Edit iDesk's conf. file" off 2> ~/.idesktop/checklist.tmp.$$	
++	"Configure" " Edit iDesk's conf. file" off 1> ~/.idesktop/checklist.tmp.$$
+ retval=$?
+ 
+ case $retval in
+@@ -511,8 +511,8 @@ esac
+ ##########################################################
+ editconfig()
+ {
+-Xdialog --title "iDesk Configuration" --fixed-font  "" \
+-	--editbox ~/.ideskrc 0 0 2> ~/.idesktop/editbox.txt.$$
++Xdialog --stdout --title "iDesk Configuration" --fixed-font  "" \
++	--editbox ~/.ideskrc 0 0 1> ~/.idesktop/editbox.txt.$$
+ 
+ case $? in
+   0) cat ~/.idesktop/editbox.txt.$$ > ~/.ideskrc
+-- 
+1.8.3.2
+
diff --git a/x11-misc/idesk-extras/idesk-extras-1.37-r1.ebuild b/x11-misc/idesk-extras/idesk-extras-1.37-r1.ebuild
new file mode 100644
index 000000000000..c92089223352
--- /dev/null
+++ b/x11-misc/idesk-extras/idesk-extras-1.37-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="Graphical configuration for iDesk plus icons"
+HOMEPAGE="http://www.jmurray.id.au/idesk-extras.html" # dead?
+SRC_URI="http://dev.gentoo.org/~hasufell/distfiles/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="app-shells/bash
+	x11-misc/idesk
+	x11-misc/xdialog"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-stdout.patch
+}
+
+src_install() {
+	dobin idesktool
+	dodoc CHANGES
+	dohtml ${PN}.html
+
+	insinto /usr/share/idesk
+	doins -r icons
+}
diff --git a/x11-misc/idesk-extras/metadata.xml b/x11-misc/idesk-extras/metadata.xml
new file mode 100644
index 000000000000..91f4e72fb544
--- /dev/null
+++ b/x11-misc/idesk-extras/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/x11-misc/idesk/Manifest b/x11-misc/idesk/Manifest
new file mode 100644
index 000000000000..f90d1975f3b3
--- /dev/null
+++ b/x11-misc/idesk/Manifest
@@ -0,0 +1 @@
+DIST idesk-0.7.5.tar.bz2 185858 SHA256 d4b7ea5dcf6d49d83e2df9512d4c6388f11632a702b14f42a1bc6bffb617b3d3
diff --git a/x11-misc/idesk/files/idesk-0.7.5-glibc-2.12.patch b/x11-misc/idesk/files/idesk-0.7.5-glibc-2.12.patch
new file mode 100644
index 000000000000..c4ac03e206e9
--- /dev/null
+++ b/x11-misc/idesk/files/idesk-0.7.5-glibc-2.12.patch
@@ -0,0 +1,17 @@
+Fixes build with glibc-2.12
+
+http://bugs.gentoo.org/333515
+https://bugs.launchpad.net/ubuntu/+source/idesk/+bug/592602
+
+Patch written by Bhavani Shankar <bhavi@ubuntu.com>
+--- idesk-0.7.5/src/DesktopConfig.cpp
++++ idesk-0.7.5/src/DesktopConfig.cpp
+@@ -24,6 +24,8 @@
+ 
+ #include "DesktopConfig.h"
+ #include "Util.h"
++#include <sys/types.h>    // For stat()
++#include <sys/stat.h>     // For stat()
+ 
+ //the initilizer list just sets the program defaults for non-necessary options
+ DesktopConfig::DesktopConfig(Database db, string ideskrcFile) :
diff --git a/x11-misc/idesk/idesk-0.7.5-r2.ebuild b/x11-misc/idesk/idesk-0.7.5-r2.ebuild
new file mode 100644
index 000000000000..4db3595ecf79
--- /dev/null
+++ b/x11-misc/idesk/idesk-0.7.5-r2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit eutils
+
+DESCRIPTION="Utility to place icons on the root window"
+HOMEPAGE="http://idesk.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
+IUSE=""
+
+RDEPEND=">=media-libs/imlib2-1.4[X]
+	media-libs/freetype
+	dev-libs/libxml2
+	dev-libs/glib:2
+	x11-libs/pango
+	x11-libs/gtk+:2
+	media-libs/libart_lgpl
+	x11-libs/startup-notification"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS NEWS README TODO )
+
+src_prepare() {
+	sed -i \
+		-e 's,/usr/local/,/usr/,' \
+		examples/default.lnk || die
+	epatch "${FILESDIR}"/${P}-glibc-2.12.patch #333515
+}
+
+src_configure() {
+	econf --enable-libsn
+}
diff --git a/x11-misc/idesk/metadata.xml b/x11-misc/idesk/metadata.xml
new file mode 100644
index 000000000000..fb0d57fe87f6
--- /dev/null
+++ b/x11-misc/idesk/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>desktop-misc</herd>
+	<upstream>
+		<remote-id type="sourceforge">idesk</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-misc/imake/Manifest b/x11-misc/imake/Manifest
new file mode 100644
index 000000000000..ec3d71e221c5
--- /dev/null
+++ b/x11-misc/imake/Manifest
@@ -0,0 +1,3 @@
+DIST imake-1.0.5.tar.bz2 148503 SHA256 99ce77ce73892d262522ee621032cef2fad2d30a36088b1305a156af4ee21cc1 SHA512 a3d114cdf093c60b6094b403d7fa9ab640ea227e602c6136ee15230ee0528f2f1cdc20056bf0598e411c7a19a3ac00c997ad421b8e393f205989776574b6e40e WHIRLPOOL 39cadd5c76946c7705ab2c4feda9da0f884ffacc03965b58dfdb3bcbbbb45c39420919bae58addbd5d3a4af000e1da1fc828937a02c5416fbda5cba0cfc65f3e
+DIST imake-1.0.6.tar.bz2 155571 SHA256 fa8983fdb0a72ba8482d1d2683967fb45c29edd7149b25f619f97ea5a599069d SHA512 5e0744903c8b044fac98859fee1d15fe1db4b8346a1b1fd0c8c8a683914c3a83a2d18316cadf1ab7ee455004b761c1fa7808bdf48bbfb9e7cbe6c7c143ad2f43 WHIRLPOOL 091e0f6e8708fccdede729f412b4ae777dbc329372d3dd99ea04181a1ddb41cd0e750ca1252cb72fba8377ffb535096e173d6bde97823060355f2d9765eda31f
+DIST imake-1.0.7.tar.bz2 156543 SHA256 690c2c4ac1fad2470a5ea73156cf930b8040dc821a0da4e322014a42c045f37e SHA512 b3527c8fead25c6e093e1fe4a39e60ff210212dcd323e206505b9e872a3f36d9db85f85cab5a6f0fa914fa5c558ef54b499b2b13ccd66739223e4e72ef805d08 WHIRLPOOL 4aa6d4819eb672e6470f7194f74ce997e7d3572f24c272ecab2211e5c141a9b8f9a71a2d137ac18e31628c921ecba0c964b90feff4233b00e095b5536d0d81e1
diff --git a/x11-misc/imake/imake-1.0.5.ebuild b/x11-misc/imake/imake-1.0.5.ebuild
new file mode 100644
index 000000000000..74db10af243c
--- /dev/null
+++ b/x11-misc/imake/imake-1.0.5.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+XORG_STATIC=no
+inherit xorg-2
+
+DESCRIPTION="C preprocessor interface to the make utility"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="x11-misc/xorg-cf-files"
+DEPEND="${RDEPEND}
+	x11-proto/xproto"
+
+src_prepare() {
+	# don't use Sun compilers on Solaris, we want GCC from prefix
+	sed -i \
+		-e "1s/^/#if defined(sun)\n# undef sun\n#endif/" \
+		imake.c imakemdep.h || die "sed failed"
+	xorg-2_src_prepare
+}
diff --git a/x11-misc/imake/imake-1.0.6.ebuild b/x11-misc/imake/imake-1.0.6.ebuild
new file mode 100644
index 000000000000..11067bf14c59
--- /dev/null
+++ b/x11-misc/imake/imake-1.0.6.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+XORG_STATIC=no
+inherit xorg-2
+
+DESCRIPTION="C preprocessor interface to the make utility"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="x11-misc/xorg-cf-files"
+DEPEND="${RDEPEND}
+	x11-proto/xproto"
+
+src_prepare() {
+	# don't use Sun compilers on Solaris, we want GCC from prefix
+	sed -i \
+		-e "1s/^/#if defined(sun)\n# undef sun\n#endif/" \
+		imake.c imakemdep.h || die "sed failed"
+	xorg-2_src_prepare
+}
diff --git a/x11-misc/imake/imake-1.0.7.ebuild b/x11-misc/imake/imake-1.0.7.ebuild
new file mode 100644
index 000000000000..dd8e63a00ba2
--- /dev/null
+++ b/x11-misc/imake/imake-1.0.7.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+XORG_STATIC=no
+inherit xorg-2
+
+DESCRIPTION="C preprocessor interface to the make utility"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="x11-misc/xorg-cf-files"
+DEPEND="${RDEPEND}
+	x11-proto/xproto"
+
+src_prepare() {
+	# don't use Sun compilers on Solaris, we want GCC from prefix
+	sed -i \
+		-e "1s/^/#if defined(sun)\n# undef sun\n#endif/" \
+		imake.c imakemdep.h || die "sed failed"
+	xorg-2_src_prepare
+}
diff --git a/x11-misc/imake/metadata.xml b/x11-misc/imake/metadata.xml
new file mode 100644
index 000000000000..01c4c004e735
--- /dev/null
+++ b/x11-misc/imake/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>x11</herd>
+</pkgmetadata>
diff --git a/x11-misc/imwheel/Manifest b/x11-misc/imwheel/Manifest
new file mode 100644
index 000000000000..e7b3f6f3ad11
--- /dev/null
+++ b/x11-misc/imwheel/Manifest
@@ -0,0 +1,2 @@
+DIST imwheel-1.0.0_pre13_p20100827.tar.bz2 125776 RMD160 cb2d30893806db58c568a0843b14fd9098b8b5cd SHA1 1e92843b908e4e70363946fb653df25d9e7370f1 SHA256 41b74fea9ff7818b79ce93eacb3fbdf2ba376890846cd17aa9373abe082475b9
+DIST imwheel-1.0.0pre12.tar.gz 186424 RMD160 988d90fb89926794b9189cb7be36b52fa9efb8a3 SHA1 827ddfbcfb693c4534977bc004fc031449bc8a92 SHA256 2320ed019c95ca4d922968e1e1cbf0c075a914e865e3965d2bd694ca3d57cfe3
diff --git a/x11-misc/imwheel/imwheel-1.0.0_pre12.ebuild b/x11-misc/imwheel/imwheel-1.0.0_pre12.ebuild
new file mode 100644
index 000000000000..538676ef2a2e
--- /dev/null
+++ b/x11-misc/imwheel/imwheel-1.0.0_pre12.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils
+
+DESCRIPTION="mouse tool for advanced features such as wheels and 3+ buttons"
+HOMEPAGE="http://imwheel.sourceforge.net/"
+SRC_URI="mirror://sourceforge/imwheel/${P/_/}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ppc x86"
+IUSE=""
+
+RDEPEND="x11-libs/libXtst
+	x11-libs/libX11
+	x11-libs/libXmu
+	x11-libs/libXt
+	x11-libs/libXext"
+
+DEPEND="${RDEPEND}
+	x11-proto/inputproto
+	x11-proto/xextproto
+	x11-proto/xproto
+	>=sys-apps/sed-4"
+
+S=${WORKDIR}/${P/_/}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	#epatch ${FILESDIR}/${P}-gentoo.diff
+	sed -i -e "s:/etc:${D}/etc:g" Makefile.am || die
+	sed -i -e "s:/etc:${D}/etc:g" Makefile.in || die
+}
+
+src_compile() {
+	local myconf
+	# don't build gpm stuff
+	myconf="--disable-gpm --disable-gpm-doc"
+	econf ${myconf} || die "configure failed"
+	emake || die "parallel make failed"
+}
+
+src_install() {
+	einstall || die "make install failed"
+	dodoc AUTHORS BUGS ChangeLog EMACS M-BA47 NEWS README TODO
+}
diff --git a/x11-misc/imwheel/imwheel-1.0.0_pre13_p20100827.ebuild b/x11-misc/imwheel/imwheel-1.0.0_pre13_p20100827.ebuild
new file mode 100644
index 000000000000..7c91eff1afb7
--- /dev/null
+++ b/x11-misc/imwheel/imwheel-1.0.0_pre13_p20100827.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="2"
+
+inherit autotools eutils
+
+DESCRIPTION="mouse tool for advanced features such as wheels and 3+ buttons"
+HOMEPAGE="http://imwheel.sourceforge.net/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/libXtst
+	x11-libs/libX11
+	x11-libs/libXmu
+	x11-libs/libXt
+	x11-libs/libXext"
+
+DEPEND="${RDEPEND}
+	x11-proto/inputproto
+	x11-proto/xextproto
+	x11-proto/xproto
+	>=sys-apps/sed-4"
+
+src_prepare() {
+	sed -i -e "s:/etc:${D}/etc:g" Makefile.am || die
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+	# don't build gpm stuff
+	myconf="--disable-gpm --disable-gpm-doc"
+	econf ${myconf} || die "configure failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+	dodoc AUTHORS BUGS ChangeLog EMACS M-BA47 NEWS README TODO
+}
diff --git a/x11-misc/imwheel/metadata.xml b/x11-misc/imwheel/metadata.xml
new file mode 100644
index 000000000000..731225048652
--- /dev/null
+++ b/x11-misc/imwheel/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>desktop-misc</herd>
+</pkgmetadata>
diff --git a/x11-misc/ipager/Manifest b/x11-misc/ipager/Manifest
new file mode 100644
index 000000000000..9603a773cc37
--- /dev/null
+++ b/x11-misc/ipager/Manifest
@@ -0,0 +1 @@
+DIST ipager-1.1.0.tar.gz 30499 SHA256 d2ad9a3aeb376644a76f57d2b275182cb8af0b64bd6a66c1791da60652a81123 SHA512 34f2982b4378e8de7479803d205c2d9157b71863278382c91d0c3daaee57352f2f6678fa338f34dc9e6bd70081e5f0bc03634632a7b6ab20a507b6fad3c2e5e3 WHIRLPOOL 51555487cf33fdbad376db98114f656ad2e35fe55303f2c28167cfee66c43a7b662e523bb3c4e6debb368c375f7ddfb731f086cf5ed6f25e7052c0140a3cc077
diff --git a/x11-misc/ipager/files/ipager-1.1.0-gcc43.patch b/x11-misc/ipager/files/ipager-1.1.0-gcc43.patch
new file mode 100644
index 000000000000..e4fe301a7b89
--- /dev/null
+++ b/x11-misc/ipager/files/ipager-1.1.0-gcc43.patch
@@ -0,0 +1,29 @@
+Fix ipager to compile with GCC 4.3.
+
+Patch taken from Gentoo bug #173562.
+
+X-Gentoo-Bug: 173562
+Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
+
+--- iconfig.old	2008-08-22 21:35:16.000000000 +0600
++++ iconfig.cpp	2008-08-22 21:35:20.000000000 +0600
+@@ -30,7 +30,7 @@
+ #include <iostream>
+ #include <fstream>
+ #include <sstream>
+-
++#include <stdlib.h>
+ #include <sys/stat.h>
+ #include <sys/types.h>
+ 
+--- wm.old	2008-08-22 21:52:36.000000000 +0600
++++ wm.cpp	2008-08-22 21:52:40.000000000 +0600
+@@ -27,7 +27,7 @@
+ 
+ #include <time.h>
+ #include "atoms.h"
+-
++#include <stdlib.h>
+ 
+ WM * WM::m_instance = 0;
+ bool WM::x_error = false;
diff --git a/x11-misc/ipager/files/ipager-1.1.0-gcc47.patch b/x11-misc/ipager/files/ipager-1.1.0-gcc47.patch
new file mode 100644
index 000000000000..f4c899302aeb
--- /dev/null
+++ b/x11-misc/ipager/files/ipager-1.1.0-gcc47.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/423215
+
+--- a/ipager.cpp
++++ b/ipager.cpp
+@@ -29,6 +29,7 @@
+ #include <config.h>
+ #endif
+ 
++#include <unistd.h>
+ #include <iostream>
+ #include <string>
+ using namespace std;
diff --git a/x11-misc/ipager/files/ipager-1.1.0-scons_flags.patch b/x11-misc/ipager/files/ipager-1.1.0-scons_flags.patch
new file mode 100644
index 000000000000..6eb8b1ff4f53
--- /dev/null
+++ b/x11-misc/ipager/files/ipager-1.1.0-scons_flags.patch
@@ -0,0 +1,24 @@
+Make sure Scons takes the CFLAGS/CXXFLAGS/LDFLAGS etc for the system.
+
+Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
+
+diff -Nuar ipager-1.1.0.orig/SConstruct ipager-1.1.0/SConstruct
+--- ipager-1.1.0.orig/SConstruct	2008-09-08 20:32:23.007016555 -0700
++++ ipager-1.1.0/SConstruct	2008-09-08 20:32:05.103267940 -0700
+@@ -30,6 +30,16 @@
+ # environment
+ ipager_env = Environment(options = ipager_options, ENV = os.environ)
+ 
++# process env variables
++for K in ['CPPFLAGS', 'CFLAGS', 'CXXFLAGS', 'LDFLAGS', 'CC', 'CXX']:
++  if K in os.environ.keys():
++    dict = ipager_env.ParseFlags(os.environ[K])
++    # These headers are supposed static. Don't check at each build.
++    for i in dict['CPPPATH']:
++      dict['CCFLAGS'].append('-I' + i)
++    dict['CPPPATH'] = []
++    ipager_env.MergeFlags(dict)
++
+ ipager_env.Append(
+         CPPFLAGS = [ '-Wall' ],
+         CPPPATH = [ '/usr/X11R6/include' ],
diff --git a/x11-misc/ipager/files/ipager-1.1.0-scons_imlib2.patch b/x11-misc/ipager/files/ipager-1.1.0-scons_imlib2.patch
new file mode 100644
index 000000000000..283dec348ab1
--- /dev/null
+++ b/x11-misc/ipager/files/ipager-1.1.0-scons_imlib2.patch
@@ -0,0 +1,19 @@
+--- ipager-1.1.0/SConstruct	2005-11-06 06:23:24.000000000 -0500
++++ ipager-1.1.0-gentoo/SConstruct	2008-09-08 15:18:07.000000000 -0400
+@@ -115,12 +115,14 @@
+     else:
+         print "yes"
+         ipager_env.AppendUnique(
+-            CPPPATH = imlib2_env.Dictionary()['CPPPATH'], 
+             CCFLAGS = imlib2_env.Dictionary()['CCFLAGS'], 
+             LIBPATH = imlib2_env.Dictionary()['LIBPATH'],
+             LIBS    = imlib2_env.Dictionary()['LIBS']
+-
+         )
++        if imlib2_env.Dictionary().has_key('CPPPATH'): 
++            ipager_env.AppendUnique(
++                CPPPATH = imlib2_env.Dictionary()['CPPPATH'], 
++            )
+ 
+ conf.Finish()
+ 
diff --git a/x11-misc/ipager/ipager-1.1.0.ebuild b/x11-misc/ipager/ipager-1.1.0.ebuild
new file mode 100644
index 000000000000..6c15920edc90
--- /dev/null
+++ b/x11-misc/ipager/ipager-1.1.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+inherit eutils
+
+DESCRIPTION="A themable desktop pager for fluxbox and other window managers"
+HOMEPAGE="http://www.useperl.ru/ipager/index.en.html"
+SRC_URI="http://www.useperl.ru/ipager/src/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="xinerama"
+
+RDEPEND="media-libs/imlib2[X]
+	x11-libs/libXmu
+	xinerama? ( x11-libs/libXinerama )"
+DEPEND="${RDEPEND}
+	dev-util/scons"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-scons_imlib2.patch
+	epatch "${FILESDIR}"/${P}-scons_flags.patch
+	epatch "${FILESDIR}"/${P}-gcc43.patch
+	epatch "${FILESDIR}"/${P}-gcc47.patch
+}
+
+src_compile() {
+	CONFIG_OPTS="xinerama=false"
+	use xinerama && CONFIG_OPTS="${CONFIG_OPTS} xinerama=true"
+	# FYI: Passing debug=true only adds -ggdb inside the SConstruct
+
+	scons \
+		--cache-disable \
+		PREFIX="/usr" \
+		${CONFIG_OPTS} \
+		|| die "scons configure failed"
+}
+
+src_install() {
+	scons \
+		--cache-disable \
+		PREFIX="/usr" \
+		DESTDIR="${D}" \
+		install \
+		|| die "scons install failed"
+	dodoc ToDo ChangeLog README
+	dodoc themes/*.conf
+}
diff --git a/x11-misc/ipager/metadata.xml b/x11-misc/ipager/metadata.xml
new file mode 100644
index 000000000000..6cfe0bd0a888
--- /dev/null
+++ b/x11-misc/ipager/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
+	<longdescription lang="en">
+		A themeable desktop pager for fluxbox and other window managers.
+	</longdescription>
+</pkgmetadata>
+
diff --git a/x11-misc/kapow/Manifest b/x11-misc/kapow/Manifest
new file mode 100644
index 000000000000..e2601637d42b
--- /dev/null
+++ b/x11-misc/kapow/Manifest
@@ -0,0 +1,2 @@
+DIST kapow-1.4.3-src.tar.bz2 425479 SHA256 f73bc86db9280f28e5d39a353ad1a925cac5be8087b8f9d5740fe7ca936af62e SHA512 aad034f4b3454f8bb73945add138b06895f191de5399783aafd3efc7a041501380bf6c9473856ee058319cddf22b519b5d7509debc76d45179c45bf0dffd351b WHIRLPOOL de6ea00cbb527a19981cb153918f0d3ec1b8c1d5a6fd152f339c7875cdc059a5e7a6647958a5670644aec73d35f9005c8681a21dd36a441bca48e6055b3aca57
+DIST kapow-1.4.4-src.tar.bz2 427133 SHA256 3dc24784931ad68e794f14b93306867d1ae2caf0689fffb2b3a5aede3b97728b SHA512 9164efa36dbbed092fdc834c2eb0603e5f72d8891cde0f55f2ac1894fcedfe28c85a3dfdf85c2408d91e91aa68f74771a504b23727d9175ab5f92c707ce875d6 WHIRLPOOL c5bf96cf44fa589030c97c67c32fd89e715cdd47991f5ed1fd67422d156e978914754b03c0a882c8cebca532e322ad55a84d8f37a8aef9883e5c9595e5b72e3c
diff --git a/x11-misc/kapow/kapow-1.4.3.ebuild b/x11-misc/kapow/kapow-1.4.3.ebuild
new file mode 100644
index 000000000000..9a947d48f111
--- /dev/null
+++ b/x11-misc/kapow/kapow-1.4.3.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit qt4-r2
+
+DESCRIPTION="A punch clock program designed to easily keep track of your hours"
+HOMEPAGE="http://gottcode.org/kapow/"
+SRC_URI="http://gottcode.org/${PN}/${P}-src.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-qt/qtgui:4"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	eqmake4 kapow.pro PREFIX=/usr
+}
+
+DOCS="ChangeLog README"
diff --git a/x11-misc/kapow/kapow-1.4.4.ebuild b/x11-misc/kapow/kapow-1.4.4.ebuild
new file mode 100644
index 000000000000..5e0743284199
--- /dev/null
+++ b/x11-misc/kapow/kapow-1.4.4.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit qt4-r2
+
+DESCRIPTION="A punch clock program designed to easily keep track of your hours"
+HOMEPAGE="http://gottcode.org/kapow/"
+SRC_URI="http://gottcode.org/${PN}/${P}-src.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-qt/qtgui:4"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	eqmake4 kapow.pro PREFIX=/usr
+}
+
+DOCS=( ChangeLog README )
diff --git a/x11-misc/kapow/metadata.xml b/x11-misc/kapow/metadata.xml
new file mode 100644
index 000000000000..540f810e069d
--- /dev/null
+++ b/x11-misc/kapow/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>desktop-misc</herd>
+</pkgmetadata>
diff --git a/x11-misc/kaqaz/Manifest b/x11-misc/kaqaz/Manifest
new file mode 100644
index 000000000000..b1b56158e512
--- /dev/null
+++ b/x11-misc/kaqaz/Manifest
@@ -0,0 +1 @@
+DIST kaqaz-1.2.0.tar.gz 5824631 SHA256 9e6f34164623e79319a962fed6410b74e0d479571116a4525364edfa8ea4a3e9 SHA512 447d4bb9dd413b07f1f05ab797fe3c277caa1afc7063dccc080ee274f266e07dd04c17b56cacd8baa6e67ba53e0012f2cf5d490493c5fbd24c3e6bfcbf1887c4 WHIRLPOOL 9aa125318b6a94325509f22f08cdec96c114e0bf3de8b37966de91421da70e75d09e10414eb9cddfd3c16ec79674b854ffc4ce3a4c66924ec67cb55f339cfd68
diff --git a/x11-misc/kaqaz/kaqaz-1.2.0.ebuild b/x11-misc/kaqaz/kaqaz-1.2.0.ebuild
new file mode 100644
index 000000000000..5ef7ef08b616
--- /dev/null
+++ b/x11-misc/kaqaz/kaqaz-1.2.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit qmake-utils
+
+DESCRIPTION="Modern note manager"
+HOMEPAGE="http://labs.sialan.org/projects/kaqaz"
+if [[ ${PV} = *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/sialan-labs/kaqaz.git"
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/sialan-labs/kaqaz/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE=""
+
+RDEPEND="dev-qt/qtdeclarative:5
+	dev-qt/qtquick1:5
+	dev-qt/qtmultimedia:5
+	dev-qt/qtsql:5
+	dev-qt/qtsensors:5
+	dev-qt/qtpositioning:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtgui:5
+	dev-qt/qtcore:5"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	eqmake5
+}
+
+src_install() {
+	emake install INSTALL_ROOT="${D}"
+}
diff --git a/x11-misc/kaqaz/metadata.xml b/x11-misc/kaqaz/metadata.xml
new file mode 100644
index 000000000000..d40c59e42cfd
--- /dev/null
+++ b/x11-misc/kaqaz/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>qt</herd>
+  <maintainer>
+    <email>yngwin@gentoo.org</email>
+    <name>Ben de Groot</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">sialan-labs/kaqaz</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/x11-misc/kbdd/Manifest b/x11-misc/kbdd/Manifest
new file mode 100644
index 000000000000..5ab00ecf21f8
--- /dev/null
+++ b/x11-misc/kbdd/Manifest
@@ -0,0 +1,2 @@
+DIST kbdd-0.5.2.tar.gz 30680 SHA256 fb49d09d8b9e4605ed6028eb37acbb404807dffb09cf8e4ee529abcda9b5e7c6 SHA512 dc911ea9a7c97a986a8f8bfd3936d2ea4a691e3d6aacfb606821b7a458b84011ee6e4dba60ae2cd105fe599b41a8d28e3f0345f0865150005e042c92796bb6e3 WHIRLPOOL 3c2b8017c3931e30fb4444433732901fb0cf5f2f21540bbe889a6e8ea8a1fc8f2e8d7a1f9f6511fac5adc4a07a6b996accff142b3f08bb52f2edc094bcb2378b
+DIST kbdd-0.7.tar.gz 32550 SHA256 325231d4491bfbdb80ce66c1b4db3c41081d915f1c2af8cfc1d68590c640b489 SHA512 959c07746207819b6c2ba74635d737767970ccd9442b728021c8162de01f08a709aced78473ddd942d46159264b89e631ef35a0cd9c5330f71710a55125aeaa0 WHIRLPOOL f16bdbdd21fb8188bc46c044693510610573486cfa058957293a1dcaa7b6a2294735bda859d50fb8297072676ae25bc1cb58282652a5db12410cf389c91407c8
diff --git a/x11-misc/kbdd/files/kbdd-0.7-fix-non-dbus-build.patch b/x11-misc/kbdd/files/kbdd-0.7-fix-non-dbus-build.patch
new file mode 100644
index 000000000000..4bb3bb7feeca
--- /dev/null
+++ b/x11-misc/kbdd/files/kbdd-0.7-fix-non-dbus-build.patch
@@ -0,0 +1,16 @@
+diff --git a/src/kbdd.c b/src/kbdd.c
+index 45968be..9402725 100644
+--- a/src/kbdd.c
++++ b/src/kbdd.c
+@@ -31,9 +31,10 @@
+ #include "config.h"
+ #endif
+ 
++#include <glib.h>
++
+ #ifdef ENABLE_DBUS
+ #include <pthread.h>
+-#include <glib.h>
+ #include "dbus/m-kbdd-service.h"
+ #include "dbus/kbdd-service-glue.h"
+ #endif
diff --git a/x11-misc/kbdd/kbdd-0.5.2.ebuild b/x11-misc/kbdd/kbdd-0.5.2.ebuild
new file mode 100644
index 000000000000..7c4536b86c65
--- /dev/null
+++ b/x11-misc/kbdd/kbdd-0.5.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit autotools
+
+DESCRIPTION="Very simple layout switcher"
+HOMEPAGE="http://github.com/qnikst/kbdd"
+SRC_URI="https://github.com/qnikst/kbdd/tarball/v${PV} -> ${PN}-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="dbus"
+
+DEPEND="dev-libs/glib
+		x11-libs/libX11
+		dbus? (
+			sys-apps/dbus
+			>=dev-libs/dbus-glib-0.86
+			)"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"
+
+src_prepare() {
+	cd "${WORKDIR}"/qnikst-kbdd-*
+	S=$(pwd)
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable dbus) || die "econf failed"
+}
diff --git a/x11-misc/kbdd/kbdd-0.7.ebuild b/x11-misc/kbdd/kbdd-0.7.ebuild
new file mode 100644
index 000000000000..cd9fa2a32141
--- /dev/null
+++ b/x11-misc/kbdd/kbdd-0.7.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit autotools eutils
+
+DESCRIPTION="Very simple layout switcher"
+HOMEPAGE="http://github.com/qnikst/kbdd"
+SRC_URI="https://github.com/qnikst/kbdd/tarball/v${PV} -> ${PN}-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="dbus"
+
+DEPEND="dev-libs/glib
+		x11-libs/libX11
+		dbus? (
+			sys-apps/dbus
+			>=dev-libs/dbus-glib-0.86
+			)"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"
+
+src_prepare() {
+	cd "${WORKDIR}"/qnikst-kbdd-*
+	epatch "${FILESDIR}"/kbdd-0.7-fix-non-dbus-build.patch
+	S=$(pwd)
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable dbus) || die "econf failed"
+}
diff --git a/x11-misc/kbdd/metadata.xml b/x11-misc/kbdd/metadata.xml
new file mode 100644
index 000000000000..b700c6b0f22b
--- /dev/null
+++ b/x11-misc/kbdd/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer>
+    <email>qnikst@gentoo.org</email>
+    <description>Very simple layout switcher</description>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">qnikst/kbdd</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/x11-misc/kdocker/Manifest b/x11-misc/kdocker/Manifest
new file mode 100644
index 000000000000..dcfb732e06e6
--- /dev/null
+++ b/x11-misc/kdocker/Manifest
@@ -0,0 +1 @@
+DIST kdocker-4.8.tar.gz 379186 SHA256 16e5d6dab6957139343b29d2bab7d1f7154d74bb4a60dace897b23cf6f8921a9 SHA512 4e7d716dba1ec7d45cb1134e4d28b4d4461a837d2f88f1460d54297594f617c414ba231515e1ca5c284e75099ac5db9762712085aba6c374991c8c642d903a91 WHIRLPOOL 059c018059e29f5259adfeb23f3bf1d6b1967aa06a1cf991bcfa050324c3459ea08c304c869a77c4f6ac16e508546051d6484cc6806217fb39afd8fdd01f9970
diff --git a/x11-misc/kdocker/files/kdocker-4.8-unbundle-qtsingleapplication.patch b/x11-misc/kdocker/files/kdocker-4.8-unbundle-qtsingleapplication.patch
new file mode 100644
index 000000000000..798769e6907c
--- /dev/null
+++ b/x11-misc/kdocker/files/kdocker-4.8-unbundle-qtsingleapplication.patch
@@ -0,0 +1,17 @@
+=== modified file 'kdocker.pro'
+--- kdocker.pro	2011-05-31 00:46:31 +0000
++++ kdocker.pro	2013-10-27 14:41:36 +0000
+@@ -2,7 +2,11 @@
+ CONFIG += qt
+ TARGET = kdocker
+ 
+-include(solutions/qtsingleapplication/qtsingleapplication.pri)
++isEmpty(SYSTEMQTSA) {
++	include(3rdparty/qtsingleapplication/qtsingleapplication.pri)
++} else {
++	CONFIG += qtsingleapplication
++}
+ 
+ DEPENDPATH += src
+ INCLUDEPATH += . src  /usr/include/X11
+
diff --git a/x11-misc/kdocker/kdocker-4.8-r2.ebuild b/x11-misc/kdocker/kdocker-4.8-r2.ebuild
new file mode 100644
index 000000000000..812d28d88832
--- /dev/null
+++ b/x11-misc/kdocker/kdocker-4.8-r2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+LANGS="it"
+inherit bash-completion-r1 qt4-r2
+
+DESCRIPTION="Helper to dock any application into the system tray"
+HOMEPAGE="https://launchpad.net/kdocker/"
+SRC_URI="http://launchpad.net/${PN}/trunk/${PV:0:3}/+download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND="
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4
+	dev-qt/qtsingleapplication[qt4(+),X]
+	x11-libs/libX11
+	x11-libs/libXmu
+	x11-libs/libXpm
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( AUTHORS BUGS ChangeLog CREDITS README TODO )
+
+PATCHES=( "${FILESDIR}/${P}-unbundle-qtsingleapplication.patch" )
+
+src_prepare() {
+	qt4-r2_src_prepare
+
+	if ! use linguas_it ; then
+		sed -e '/^INSTALLS +=/s/translations//' -i kdocker.pro || die "sed failed"
+	fi
+
+	sed -i -e "/completion.path/s%/etc/bash_completion.d%$(get_bashcompdir)%" \
+		kdocker.pro || die "sed failed"
+}
+
+src_configure() {
+	eqmake4 PREFIX="${EPREFIX}/usr" SYSTEMQTSA=1
+}
diff --git a/x11-misc/kdocker/metadata.xml b/x11-misc/kdocker/metadata.xml
new file mode 100644
index 000000000000..106f35298550
--- /dev/null
+++ b/x11-misc/kdocker/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>kde</herd>
+	<upstream>
+		<remote-id type="launchpad">kdocker</remote-id>
+		<bugs-to>http://bugs.launchpad.net/kdocker</bugs-to>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-misc/ktsuss/Manifest b/x11-misc/ktsuss/Manifest
new file mode 100644
index 000000000000..f7923f0e7d76
--- /dev/null
+++ b/x11-misc/ktsuss/Manifest
@@ -0,0 +1 @@
+DIST ktsuss-2.tar.gz 298960 SHA256 a32e20924b10a21df47cd2451069f57eb96090e6df8ef94fcdcae88a75e3c6c8 SHA512 d053074a98ea5db71bfb90bbce74ae802e86547e91abb985d0ff1eef578d3c9fb0c52964f0c3827b0919553ef4b1d7e394c50b4a0d5676196812481e8da944a7 WHIRLPOOL b98f39a645c0c1252c2493451ebdc86a8a3ba9a522cdd2aa71ec03552c8adef7144cb9b8782c54fbec9bbd5f8352fc51824e88e0a06b639a6e270daad60a19d7
diff --git a/x11-misc/ktsuss/ktsuss-2.ebuild b/x11-misc/ktsuss/ktsuss-2.ebuild
new file mode 100644
index 000000000000..f26b7e083735
--- /dev/null
+++ b/x11-misc/ktsuss/ktsuss-2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+DESCRIPTION="Graphical version of su written in C and GTK+ 2"
+HOMEPAGE="http://code.google.com/p/ktsuss/"
+SRC_URI="http://ktsuss.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
+IUSE=""
+
+RDEPEND=">=x11-libs/gtk+-2.12.11:2
+	>=dev-libs/glib-2.16.5:2"
+DEPEND="virtual/pkgconfig
+	${RDEPEND}"
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc Changelog CREDITS README
+}
diff --git a/x11-misc/ktsuss/metadata.xml b/x11-misc/ktsuss/metadata.xml
new file mode 100644
index 000000000000..1d6819a1c170
--- /dev/null
+++ b/x11-misc/ktsuss/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>proxy-maintainers</herd>
+	<maintainer>
+		<email>hypnos75@gmail.com</email>
+		<name>Hypnos</name>
+		<description>Proxy maintainer. Assign bugs to him</description>
+	</maintainer>
+	<upstream>
+		<remote-id type="google-code">ktsuss</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-misc/launchy/Manifest b/x11-misc/launchy/Manifest
new file mode 100644
index 000000000000..c5d88db80500
--- /dev/null
+++ b/x11-misc/launchy/Manifest
@@ -0,0 +1 @@
+DIST launchy-2.5.tar.gz 2926807 SHA256 93ec471423b77973a2118eaec64c7a1c05ce37b5bff41760336ebd14fc819500 SHA512 31cf591184c81c5c44c174f12ffdec4fd15eb2f78af3195afceb9b11253d4bb17edee77b9316c8275828431b2ece5bfbc69f50b390eec27295828e80965c0930 WHIRLPOOL ff210a23f675fe9c5000dfc1dadbefd5acd6604b355ef257fa7ef3550da5dcb43721ae5f8d1aaba2b5db835068054838c9c7e81e8a83efb3b9c00303e4e0ddb0
diff --git a/x11-misc/launchy/files/launchy-2.5-underlink.patch b/x11-misc/launchy/files/launchy-2.5-underlink.patch
new file mode 100644
index 000000000000..f14110d581b5
--- /dev/null
+++ b/x11-misc/launchy/files/launchy-2.5-underlink.patch
@@ -0,0 +1,12 @@
+diff --git a/src/src.pro b/src/src.pro
+index 13a627d..f720a22 100644
+--- a/src/src.pro
++++ b/src/src.pro
+@@ -72,6 +72,7 @@ unix:!macx {
+                 platform_base_hottrigger.h
+ 
+     PREFIX = /usr
++    LIBS += -lX11 -lXext -lXrender
+     DEFINES += SKINS_PATH=\\\"$$PREFIX/share/launchy/skins/\\\" \
+         PLUGINS_PATH=\\\"$$PREFIX/lib64/launchy/plugins/\\\" \
+         PLATFORMS_PATH=\\\"$$PREFIX/lib64/launchy/\\\"
diff --git a/x11-misc/launchy/launchy-2.5.ebuild b/x11-misc/launchy/launchy-2.5.ebuild
new file mode 100644
index 000000000000..0f775fc3167d
--- /dev/null
+++ b/x11-misc/launchy/launchy-2.5.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit fdo-mime gnome2-utils qt4-r2
+
+DESCRIPTION="utility that merges application menus, your desktop and even your file manager"
+HOMEPAGE="http://www.launchy.net/"
+SRC_URI="http://www.launchy.net/downloads/src/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-qt/qtgui:4"
+DEPEND="${RDEPEND}
+	dev-libs/boost"
+
+PATCHES=( "${FILESDIR}"/${P}-underlink.patch )
+
+src_prepare() {
+	sed -i -e "s:lib/launchy:$(get_libdir)/launchy:" src/src.pro \
+		platforms/unix/unix.pro \
+		plugins/*/*.pro || die "sed failed"
+	qt4-r2_src_prepare
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
diff --git a/x11-misc/launchy/metadata.xml b/x11-misc/launchy/metadata.xml
new file mode 100644
index 000000000000..fb7ec4a9a25a
--- /dev/null
+++ b/x11-misc/launchy/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>angelos@gentoo.org</email>
+		<name>Christoph Mende</name>
+	</maintainer>
+</pkgmetadata>
+
diff --git a/x11-misc/light-locker/Manifest b/x11-misc/light-locker/Manifest
new file mode 100644
index 000000000000..bb793f36af4c
--- /dev/null
+++ b/x11-misc/light-locker/Manifest
@@ -0,0 +1 @@
+DIST light-locker-1.6.0.tar.bz2 522644 SHA256 63e0cbcc7ceb8ad695b4bbe7eb9ba5fee32f47790ccde048748d8a47edd32ad0 SHA512 23e10a2d32eabf2cfcc898dcb0c8f98cc7c4e02a3fa83d1a5bd19c0f11251123e618f469bada2cd1fa4f028396c5fbe5751f9943b1be4448aefc2d64fea1eb18 WHIRLPOOL 3d16015765caa8f166a7b1ce8529077bca8809b5d4b66f4a29a852a8f610286ea957f87bc0f10b119083153b2412a77232214b8a428999d5522833e779338500
diff --git a/x11-misc/light-locker/light-locker-1.6.0.ebuild b/x11-misc/light-locker/light-locker-1.6.0.ebuild
new file mode 100644
index 000000000000..cfaec1eb7a27
--- /dev/null
+++ b/x11-misc/light-locker/light-locker-1.6.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools-utils
+
+DESCRIPTION="A simple locker using lightdm"
+HOMEPAGE="https://github.com/the-cavalry/light-locker"
+SRC_URI="${HOMEPAGE}/releases/download/v${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+consolekit +dpms gtk3 +screensaver -systemd +upower"
+
+RDEPEND="dev-libs/dbus-glib
+	>=dev-libs/glib-2.25.6:2
+	>=sys-apps/dbus-0.30
+	x11-libs/cairo
+	x11-libs/libX11
+	x11-libs/pango
+	x11-libs/libXxf86vm
+	consolekit? ( sys-auth/consolekit )
+	dpms? ( x11-libs/libXext )
+	!gtk3? ( >=x11-libs/gtk+-2.24:2 )
+	gtk3? ( x11-libs/gtk+:3 )
+	screensaver? ( x11-libs/libXScrnSaver )
+	systemd? ( sys-apps/systemd )
+	upower? ( || ( sys-power/upower sys-power/upower-pm-utils ) )"
+DEPEND="${RDEPEND}
+	dev-lang/perl
+	dev-perl/XML-Parser
+	dev-util/intltool
+	sys-devel/gettext"
+RDEPEND="${RDEPEND}
+	x11-misc/lightdm"
+
+DOCS=( AUTHORS HACKING NEWS README )
+
+src_configure() {
+	local myeconfargs=(
+		$(use_with consolekit console-kit)
+		$(use_with dpms dpms-ext)
+		$(use_with !gtk3 gtk2)
+		$(use_with screensaver x)
+		$(use_with screensaver mit-ext)
+		$(use_with systemd)
+		$(use_with upower)
+	)
+	autotools-utils_src_configure
+}
diff --git a/x11-misc/light-locker/metadata.xml b/x11-misc/light-locker/metadata.xml
new file mode 100644
index 000000000000..b552d0643948
--- /dev/null
+++ b/x11-misc/light-locker/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer>
+    <email>calchan@gentoo.org</email>
+    <name>Denis Dupeyron</name>
+  </maintainer>
+  <use>
+    <flag name="consolekit">Keep track of the various users, sessions, and seats present on the system.</flag>
+    <flag name="dpms">Turn on the display on screensaver deactivation.</flag>
+    <flag name="gtk3">Build with GTK+ 3 instead of GTK+ 2.</flag>
+    <flag name="screensaver">Lock the screen on screensaver activation.</flag>
+  </use>
+  <upstream>
+    <remote-id type="github">the-cavalry/light-locker</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/x11-misc/lightdm-gtk-greeter/Manifest b/x11-misc/lightdm-gtk-greeter/Manifest
new file mode 100644
index 000000000000..40046d7b814b
--- /dev/null
+++ b/x11-misc/lightdm-gtk-greeter/Manifest
@@ -0,0 +1,6 @@
+DIST lightdm-gentoo-patch-2.tar.gz 695543 SHA256 5733622609afa67c82e8b6bc4915d6fbbf8470604afe87c4334d418eb5834fa0 SHA512 8d9bfdee71ab1871de33e134b11bba409cc493876e5ae9534956100ff6af6c8748b29de9082ecf8b771ccac4c8c2024e15e93332165171dfe93eb99c9a834274 WHIRLPOOL cb5137a361f32c122fc7d7013f53e890c0ec1823bb78c61fbbeb03803363a2f94cfd61fba096036930d5c561452ab86bab85a9003b1afe521f8b77301c933338
+DIST lightdm-gtk-greeter-1.3.1.tar.gz 374479 SHA256 a384b6413a52e6c6aeaf3242b2420e857ad7e2e4e5bec47da663e67076c0ee87 SHA512 3a597fcf3dff930c5ed9cc13675c0af6f385987718527a4a2598a92d2c114df5752d8ab7867d027b4c5de71fa76f0127b57b4d73400a096e530835bf9e2e945a WHIRLPOOL 7e78fd138c528e258eb1718ddf2479ebc657887a41c605a001dc14a20965c99d45d7500b5e5194ca364069ead762fb029ea6e2ce03be4cc786ef568b4deef7e5
+DIST lightdm-gtk-greeter-1.6.1.tar.gz 391175 SHA256 1f0286ab093d50151f0efc46496aef3f8ed8c7306bbc81807a3fdcbcb2a468d9 SHA512 5137deb631b669db58731a6449ba8f8709666fb7b6affac56038355aafec73041e81a9a822035de7bed0d7164d124df50387a708addde4cf094fe0a977ea154a WHIRLPOOL 9eb4cec7f04d21c3c912f8bf42ae2110ce126006a15c860b21fd66fb41bcb0a517895eba6f017587576fb03be17601614ca3798147923a1690573a1d5e35e813
+DIST lightdm-gtk-greeter-1.9.0.tar.gz 451297 SHA256 a9103b4aa161feae99a2a62b716a157cde3817e93cee7f73cde2796a12396938 SHA512 759a0f3c8b1fcfc8a6926276243e66675762ae533e20ea95d10e0159023e2252f5b773bdfc65dda6a6a2285e2540a578c7fd2682b108c58791feac9ec8af6885 WHIRLPOOL f4de03e81eb4568f18ccab94222375a6f4d210b7f083506b0ce6e72697a0dc4fd9ed7a867469e101dfb9b47661fb9f5c88c36298a26083175909fbd1aa3be2f4
+DIST lightdm-gtk-greeter-2.0.0.tar.gz 453687 SHA256 4c0a0121d1ec82c85c8aed4ad80ebd48ddc56d9bace31da72423bfd330c26484 SHA512 0c6b61ed09d3edf870e8b4316c6a8b2ff2656cf61ca00dfd1a9c37b87e0f4f58f5e875fd7477e36f54f32ce2304ce870ecc46325fa5aeb20d82d0d6e25b0190c WHIRLPOOL b69f8a1e48968c403a0c2532dd306dfb7d09020c20a99e1ff817c10562f9f80fefa57400d4bdcfd8ee348324e89bc1c1320a4917542a2fe914fac5f3f2692dab
+DIST lightdm-gtk-greeter-2.0.1.tar.gz 467375 SHA256 3264008c8f51323413c2a6ac16523930b75f4ecdde6da8b6fe47ec9bffd9310c SHA512 fd41cae828f7feafb462143519500d0d98a8b6729eb5ffd9be4247d47fa0074fa00ac9892c8cbdda9d7656e9d6949ae65e69911ae911269e99e80e4fefb19a08 WHIRLPOOL b726e9088dcf6e8e8d0cf06900cf6436f089af84e596079d8d0cafedb1963fd3b54a790e46b01d2fd62c70c1970d2ebbe66cb4af3fae9dda9988e09a4efe4919
diff --git a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-1.3.1-r1.ebuild b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-1.3.1-r1.ebuild
new file mode 100644
index 000000000000..3646f93f12c5
--- /dev/null
+++ b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-1.3.1-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+DESCRIPTION="LightDM GTK+ Greeter"
+HOMEPAGE="http://launchpad.net/lightdm-gtk-greeter"
+SRC_URI="http://launchpad.net/lightdm-gtk-greeter/1.4/${PV}/+download/${P}.tar.gz branding? (
+http://dev.gentoo.org/~hwoarang/distfiles/lightdm-gentoo-patch-2.tar.gz )"
+
+LICENSE="GPL-3 LGPL-3
+	branding? ( CC-BY-3.0 )"
+SLOT="0"
+KEYWORDS="amd64 arm ~ppc x86"
+IUSE="branding"
+
+DEPEND="x11-libs/gtk+:3
+	>=x11-misc/lightdm-1.2.2"
+RDEPEND="!!<x11-misc/lightdm-1.1.1
+	x11-libs/gtk+:3
+	>=x11-misc/lightdm-1.2.2
+	x11-themes/gnome-themes-standard
+	x11-themes/gnome-icon-theme"
+
+GENTOO_BG="gentoo-bg_65.jpg"
+
+src_prepare() {
+	# Ok, this has to be fixed in the tarball but I am too lazy to do it.
+	# I will fix this once I decide to update the tarball with a new gentoo
+	# background
+	# Bug #404467
+	if use branding; then
+		sed -i -e "/xft-hintstyle/s:slight:hintslight:" \
+			"${WORKDIR}"/${PN}.conf || die
+	fi
+}
+
+src_install() {
+	default
+
+	if use branding; then
+		insinto /etc/lightdm/
+		doins "${WORKDIR}"/${PN}.conf
+		insinto /usr/share/lightdm/backgrounds/
+		doins "${WORKDIR}"/${GENTOO_BG}
+		sed -i -e \
+			"/background/s:=.*:=/usr/share/lightdm/backgrounds/${GENTOO_BG}:" \
+			"${D}"/etc/lightdm/${PN}.conf || die
+		newdoc "${WORKDIR}"/README.txt README-background.txt
+	fi
+}
diff --git a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-1.6.1.ebuild b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-1.6.1.ebuild
new file mode 100644
index 000000000000..9417f575385b
--- /dev/null
+++ b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-1.6.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit versionator
+
+DESCRIPTION="LightDM GTK+ Greeter"
+HOMEPAGE="http://launchpad.net/lightdm-gtk-greeter"
+SRC_URI="http://launchpad.net/lightdm-gtk-greeter/$(get_version_component_range 1-2)/${PV}/+download/${P}.tar.gz branding? (
+http://dev.gentoo.org/~hwoarang/distfiles/lightdm-gentoo-patch-2.tar.gz )"
+
+LICENSE="GPL-3 LGPL-3
+	branding? ( CC-BY-3.0 )"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~ppc x86"
+IUSE="branding"
+
+DEPEND="x11-libs/gtk+:3
+	>=x11-misc/lightdm-1.2.2"
+RDEPEND="!!<x11-misc/lightdm-1.1.1
+	x11-libs/gtk+:3
+	>=x11-misc/lightdm-1.2.2
+	x11-themes/gnome-themes-standard
+	x11-themes/gnome-icon-theme"
+
+GENTOO_BG="gentoo-bg_65.jpg"
+
+src_prepare() {
+	# Ok, this has to be fixed in the tarball but I am too lazy to do it.
+	# I will fix this once I decide to update the tarball with a new gentoo
+	# background
+	# Bug #404467
+	if use branding; then
+		sed -i -e "/xft-hintstyle/s:slight:hintslight:" \
+			"${WORKDIR}"/${PN}.conf || die
+	fi
+}
+
+src_install() {
+	default
+
+	if use branding; then
+		insinto /etc/lightdm/
+		doins "${WORKDIR}"/${PN}.conf
+		insinto /usr/share/lightdm/backgrounds/
+		doins "${WORKDIR}"/${GENTOO_BG}
+		sed -i -e \
+			"/background/s:=.*:=/usr/share/lightdm/backgrounds/${GENTOO_BG}:" \
+			"${D}"/etc/lightdm/${PN}.conf || die
+		newdoc "${WORKDIR}"/README.txt README-background.txt
+	fi
+}
diff --git a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-1.9.0.ebuild b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-1.9.0.ebuild
new file mode 100644
index 000000000000..369ce43103b8
--- /dev/null
+++ b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-1.9.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit versionator
+
+DESCRIPTION="LightDM GTK+ Greeter"
+HOMEPAGE="http://launchpad.net/lightdm-gtk-greeter"
+SRC_URI="http://launchpad.net/lightdm-gtk-greeter/$(get_version_component_range 1-2)/${PV}/+download/${P}.tar.gz branding? (
+http://dev.gentoo.org/~hwoarang/distfiles/lightdm-gentoo-patch-2.tar.gz )"
+
+LICENSE="GPL-3 LGPL-3
+	branding? ( CC-BY-3.0 )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE="branding"
+
+DEPEND="x11-libs/gtk+:3
+	>=x11-misc/lightdm-1.2.2"
+RDEPEND="!!<x11-misc/lightdm-1.1.1
+	x11-libs/gtk+:3
+	>=x11-misc/lightdm-1.2.2
+	x11-themes/gnome-themes-standard
+	x11-themes/gnome-icon-theme"
+
+GENTOO_BG="gentoo-bg_65.jpg"
+
+src_prepare() {
+	# Ok, this has to be fixed in the tarball but I am too lazy to do it.
+	# I will fix this once I decide to update the tarball with a new gentoo
+	# background
+	# Bug #404467
+	if use branding; then
+		sed -i -e "/xft-hintstyle/s:slight:hintslight:" \
+			"${WORKDIR}"/${PN}.conf || die
+	fi
+}
+
+src_install() {
+	default
+
+	if use branding; then
+		insinto /etc/lightdm/
+		doins "${WORKDIR}"/${PN}.conf
+		insinto /usr/share/lightdm/backgrounds/
+		doins "${WORKDIR}"/${GENTOO_BG}
+		sed -i -e \
+			"/background/s:=.*:=/usr/share/lightdm/backgrounds/${GENTOO_BG}:" \
+			"${D}"/etc/lightdm/${PN}.conf || die
+		newdoc "${WORKDIR}"/README.txt README-background.txt
+	fi
+}
diff --git a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.0.ebuild b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.0.ebuild
new file mode 100644
index 000000000000..bf83bfe75e84
--- /dev/null
+++ b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit versionator
+
+DESCRIPTION="LightDM GTK+ Greeter"
+HOMEPAGE="http://launchpad.net/lightdm-gtk-greeter"
+SRC_URI="http://launchpad.net/lightdm-gtk-greeter/$(get_version_component_range 1-2)/${PV}/+download/${P}.tar.gz branding? (
+http://dev.gentoo.org/~hwoarang/distfiles/lightdm-gentoo-patch-2.tar.gz )"
+
+LICENSE="GPL-3 LGPL-3
+	branding? ( CC-BY-3.0 )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+IUSE="branding"
+
+DEPEND="x11-libs/gtk+:3
+	>=x11-misc/lightdm-1.2.2"
+RDEPEND="!!<x11-misc/lightdm-1.1.1
+	x11-libs/gtk+:3
+	>=x11-misc/lightdm-1.2.2
+	x11-themes/gnome-themes-standard
+	x11-themes/gnome-icon-theme"
+
+GENTOO_BG="gentoo-bg_65.jpg"
+
+src_prepare() {
+	# Ok, this has to be fixed in the tarball but I am too lazy to do it.
+	# I will fix this once I decide to update the tarball with a new gentoo
+	# background
+	# Bug #404467
+	if use branding; then
+		sed -i -e "/xft-hintstyle/s:slight:hintslight:" \
+			"${WORKDIR}"/${PN}.conf || die
+	fi
+}
+
+src_install() {
+	default
+
+	if use branding; then
+		insinto /etc/lightdm/
+		doins "${WORKDIR}"/${PN}.conf
+		insinto /usr/share/lightdm/backgrounds/
+		doins "${WORKDIR}"/${GENTOO_BG}
+		sed -i -e \
+			"/background/s:=.*:=/usr/share/lightdm/backgrounds/${GENTOO_BG}:" \
+			"${D}"/etc/lightdm/${PN}.conf || die
+		newdoc "${WORKDIR}"/README.txt README-background.txt
+	fi
+}
diff --git a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.1.ebuild b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.1.ebuild
new file mode 100644
index 000000000000..2579868f15bd
--- /dev/null
+++ b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit versionator
+
+DESCRIPTION="LightDM GTK+ Greeter"
+HOMEPAGE="http://launchpad.net/lightdm-gtk-greeter"
+SRC_URI="http://launchpad.net/lightdm-gtk-greeter/$(get_version_component_range 1-2)/${PV}/+download/${P}.tar.gz branding? (
+http://dev.gentoo.org/~hwoarang/distfiles/lightdm-gentoo-patch-2.tar.gz )"
+
+LICENSE="GPL-3 LGPL-3
+	branding? ( CC-BY-3.0 )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+IUSE="branding"
+
+DEPEND="sys-devel/gettext
+	x11-libs/gtk+:3
+	>=x11-misc/lightdm-1.2.2"
+RDEPEND="!!<x11-misc/lightdm-1.1.1
+	x11-libs/gtk+:3
+	>=x11-misc/lightdm-1.2.2
+	x11-themes/gnome-themes-standard
+	x11-themes/gnome-icon-theme"
+
+GENTOO_BG="gentoo-bg_65.jpg"
+
+src_prepare() {
+	# Ok, this has to be fixed in the tarball but I am too lazy to do it.
+	# I will fix this once I decide to update the tarball with a new gentoo
+	# background
+	# Bug #404467
+	if use branding; then
+		sed -i -e "/xft-hintstyle/s:slight:hintslight:" \
+			"${WORKDIR}"/${PN}.conf || die
+	fi
+}
+
+src_install() {
+	default
+
+	if use branding; then
+		insinto /etc/lightdm/
+		doins "${WORKDIR}"/${PN}.conf
+		insinto /usr/share/lightdm/backgrounds/
+		doins "${WORKDIR}"/${GENTOO_BG}
+		sed -i -e \
+			"/background/s:=.*:=/usr/share/lightdm/backgrounds/${GENTOO_BG}:" \
+			"${D}"/etc/lightdm/${PN}.conf || die
+		newdoc "${WORKDIR}"/README.txt README-background.txt
+	fi
+}
diff --git a/x11-misc/lightdm-gtk-greeter/metadata.xml b/x11-misc/lightdm-gtk-greeter/metadata.xml
new file mode 100644
index 000000000000..cc663964ad30
--- /dev/null
+++ b/x11-misc/lightdm-gtk-greeter/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>hwoarang@gentoo.org</email>
+		<name>Markos Chandras</name>
+	</maintainer>
+	<longdescription lang="en">
+</longdescription>
+	<upstream>
+		<remote-id type="launchpad">lightdm-gtk-greeter</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-misc/lightdm-kde/Manifest b/x11-misc/lightdm-kde/Manifest
new file mode 100644
index 000000000000..5a21b5214998
--- /dev/null
+++ b/x11-misc/lightdm-kde/Manifest
@@ -0,0 +1 @@
+DIST lightdm-kde-0.3.2.1.tar.bz2 1379085 SHA256 65b2a1bab2c88bf55a07e62cbe0eb8ac3660638636c5825e5925b28d03f12188 SHA512 e5a812d37d0906960b707ee0104a6d0c240c910149f64757521504483caa9363467bb21d446c74851db38024785486b5355e3627db3fca3d6f8f046c2e8cf0f1 WHIRLPOOL 13bcd945b5c84609397b16f087fe53da8560f6092fe857746fc7f6e8d7d3804289ef1cfc56d9696561d9301fa5c80a46c117cd1b8077fe793a0e71696107b131
diff --git a/x11-misc/lightdm-kde/files/lightdm-kde-0.3.2.1-lightdm-1.7.patch b/x11-misc/lightdm-kde/files/lightdm-kde-0.3.2.1-lightdm-1.7.patch
new file mode 100644
index 000000000000..0e83db26166b
--- /dev/null
+++ b/x11-misc/lightdm-kde/files/lightdm-kde-0.3.2.1-lightdm-1.7.patch
@@ -0,0 +1,49 @@
+From dacd25fc53ecfd8928464420c21ff52b660a0893 Mon Sep 17 00:00:00 2001
+From: Iain Lane <iain.lane@canonical.com>
+Date: Thu, 1 Aug 2013 21:37:48 +1000
+Subject: [PATCH] FindQLightDM.cmake: Search for new liblightdm-qt-3 as well as
+ old liblightdm-qt-2
+
+BUG: 319480
+---
+ cmake/modules/FindQLightDM.cmake | 15 ++++++++++++---
+ 1 file changed, 12 insertions(+), 3 deletions(-)
+
+diff --git a/cmake/modules/FindQLightDM.cmake b/cmake/modules/FindQLightDM.cmake
+index c055c61..f901cf6 100644
+--- a/cmake/modules/FindQLightDM.cmake
++++ b/cmake/modules/FindQLightDM.cmake
+@@ -19,10 +19,19 @@ set(QLIGHTDM_LIBRARIES_FIND_REQUIRED ${QLightDM_FIND_REQUIRED})
+ find_package(PkgConfig)
+ if(PKG_CONFIG_FOUND)
+     if (QLIGHTDM_MIN_VERSION)
+-        PKG_CHECK_MODULES(PC_QLIGHTDM liblightdm-qt-2>=${QLIGHTDM_MIN_VERSION})
++        PKG_CHECK_MODULES(PC_QLIGHTDM liblightdm-qt-3>=${QLIGHTDM_MIN_VERSION})
+     else (QLIGHTDM_MIN_VERSION)
+-        PKG_CHECK_MODULES(PC_QLIGHTDM liblightdm-qt-2)
++        PKG_CHECK_MODULES(PC_QLIGHTDM liblightdm-qt-3)
+     endif (QLIGHTDM_MIN_VERSION)
++    SET (QLIGHTDM_API 3)
++    if (NOT PC_QLIGHTDM_FOUND)
++        if (QLIGHTDM_MIN_VERSION)
++            PKG_CHECK_MODULES(PC_QLIGHTDM liblightdm-qt-2>=${QLIGHTDM_MIN_VERSION})
++        else (QLIGHTDM_MIN_VERSION)
++            PKG_CHECK_MODULES(PC_QLIGHTDM liblightdm-qt-2)
++        endif (QLIGHTDM_MIN_VERSION)
++        SET (QLIGHTDM_API 2)
++    endif (NOT PC_QLIGHTDM_FOUND)
+ endif(PKG_CONFIG_FOUND)
+ 
+ 
+@@ -34,7 +43,7 @@ find_path(QLIGHTDM_INCLUDE_DIR
+ )
+ 
+ find_library(QLIGHTDM_LIBRARIES
+-             NAMES lightdm-qt-2
++             NAMES lightdm-qt-${QLIGHTDM_API}
+              HINTS
+              ${PC_QLIGHTDM_LIBDIR}
+              ${PC_QLIGHTDM_LIBRARY_DIRS}
+-- 
+1.8.3.2
+
diff --git a/x11-misc/lightdm-kde/lightdm-kde-0.3.2.1.ebuild b/x11-misc/lightdm-kde/lightdm-kde-0.3.2.1.ebuild
new file mode 100644
index 000000000000..145ffc1c4e2f
--- /dev/null
+++ b/x11-misc/lightdm-kde/lightdm-kde-0.3.2.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_MINIMAL="4.8"
+KDE_SCM="git"
+EGIT_REPONAME="${PN/-kde/}"
+KDE_LINGUAS="bs cs da de el es et fi fr ga gl hu it ja km lt mr nds nl pl pt pt_BR ro ru sk sl sv tr uk"
+inherit kde4-base
+
+DESCRIPTION="LightDM KDE greeter"
+HOMEPAGE="https://projects.kde.org/projects/playground/base/lightdm"
+[[ ${PV} = 9999* ]] || SRC_URI="mirror://kde/unstable/${PN}/src/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+KEYWORDS="amd64 ~arm ~ppc x86"
+SLOT="4"
+IUSE="debug"
+
+RDEPEND="
+	x11-libs/libX11
+	dev-qt/qtdeclarative:4
+	>=x11-misc/lightdm-1.4.0[qt4]
+"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+"
+
+S=${WORKDIR}/${PN/-kde}-${PV}
+
+PATCHES=( "${FILESDIR}/${P}-lightdm-1.7.patch" )
diff --git a/x11-misc/lightdm-kde/metadata.xml b/x11-misc/lightdm-kde/metadata.xml
new file mode 100644
index 000000000000..8d1e86a9cefb
--- /dev/null
+++ b/x11-misc/lightdm-kde/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>kde</herd>
+</pkgmetadata>
diff --git a/x11-misc/lightdm/Manifest b/x11-misc/lightdm/Manifest
new file mode 100644
index 000000000000..1856450c048c
--- /dev/null
+++ b/x11-misc/lightdm/Manifest
@@ -0,0 +1,8 @@
+DIST introspection-20110205.m4.tar.bz2 1220 SHA256 4394a606d380ae5315872ede35387f104da5fad96794d29c45c444a9d481d8b2 SHA512 5c49239935b93d86cce68b577b43d1a56d8749ab5747029bfcfa67339697134be24ef29ba6c3d133b8c03e867864637c8eb61491a4b7f6bb1e56386ed66cb9be WHIRLPOOL 0765c0a72919b26d0c8c38714450eec578a347bfc1c59d4950b633b64b17aa1cde38dfb87fdcd6e2f364c98d6c0bd3dadaa9c2a9711bd1b5ac09a583b988f500
+DIST lightdm-1.10.3.tar.xz 469992 SHA256 1e31b99eba6626ed46b7940cd53cbd585fa53a433258371490ce74dbd047889c SHA512 95000ac3686ec81bc9925ca1dd5007422b8f7b74ae63c239af4e2fe16bfb75d778a26301897516da2d6792e0a8cf519dfbfb13bc9b531f9b7856a0c99c66b2a1 WHIRLPOOL 5b97c0090c60efc0a2edcc6f8d8788b089233f0630fcc418f3d5c2aaf58940c26e1b0b449f1ef7c9240c0f0ab300df28d8eb221aa46aa2c65487228740fd9a70
+DIST lightdm-1.10.5.tar.xz 470452 SHA256 90b2133916d46d7eeae9b14fb581ae29d09e099f4c5f82566370c21f5c6c6fcd SHA512 a5ee39228a53a666a6cc7600004932e27a3d0ea4295640171794d64b11d23938d132073dfa58289df61995512b6e5a210a4fb5bf1f89c663f6372479cad4f766 WHIRLPOOL bfdaecec39d8aafedb531746d2d28ff494f38d532c5807cb9ca258f0cb531437606dcef77c717058bd14a6e1367709239d13732ee21920919568d897b1996159
+DIST lightdm-1.12.3.tar.xz 473512 SHA256 c7dc90fde4f22762f38f06506b64f3b95cc3a1d9ccb8c18efa408087fd054465 SHA512 dca75324e3326a3fdc575837226a9633c7ec967e2484b03e051d5ce2f788dba8e23d4875da3c8d97cb8c6a1da843bc7500876027ca2c40e2bc4844b034acbd08 WHIRLPOOL 22a0c30032dcec66263801285017305b385789ed09b32c3e73c5db27daad44a7c44311d30f2002fe776f10cbaeb5d47727502ff19f61c0465e37987baa231de8
+DIST lightdm-1.13.2.tar.xz 478064 SHA256 579f74c175b6cb1e2e304fe8cad462f99467b50701a0b1c85fe455f41caf83af SHA512 929b0a2bacb9cb45c03664b191f7d6022b65133b286ca5af5118bb2ffc12c8eb49dcc9cb135b02880c7a9f5a6e6de59fa432c0e6a44d22426727463367239476 WHIRLPOOL d979f09f2e75a9977f8917b7d711eb803aa564a75582d7b86e24fe9ca410a6d3555081ef7e3b6750344208236f8a1d85171b267cc4ff0cb47baafe2e8f10de46
+DIST lightdm-1.14.1.tar.xz 477172 SHA256 c09827783f4a5f6742cd774de73a3e0f929a2493334f121b4659ea754c817ace SHA512 228be6216c7bdb478abddb20905b1ad3ff6583906addd8b0487d8a7ae62d220efe2cb5a72f896924101b2b01826beb6281e1049792d6f23b91dda40f7b251707 WHIRLPOOL 28c2d2f8a2051d6166d89b629827ea8f64f36ff67ef09dc9c54b932ba25818d9f5c41359f9090f7363ebef0eac11ba6051af5a6c569c3860dce9374b3c5018e0
+DIST lightdm-1.14.2.tar.xz 477232 SHA256 28b078979870782aaa1a9167945e1dab19cc6d699747af3d0c0c9a3bdb8dbba1 SHA512 5dec6fb492930827c3e07a027411ad5b864f0ef923753c9b8d309c1ab9de9c405ba66b2adbb12784cdd02d9cadebcb5299761ec17bbf1cd4a4202478ce8b427b WHIRLPOOL e9122281e599663af42f06a8d68fc0eae6b9b1c7d820802c14bc9d5bfd32005d4fe28cae805f697ec62587e2e4c5c4e290d37fcb84cf262f538b967c584e9f45
+DIST lightdm-1.15.0.tar.xz 478928 SHA256 1a8a4a4bf81a00e44fb57e13cff475b7cfedf94a09c2be544b04e3b372140c38 SHA512 6b4efe958f2cfd22069ebce74c45c7d059e2cb04dbccd9a7d7ac76e0eaf07000c8f48a377b3f2a65cf9a674bd730d3126a4f3bca8e83fc8768519e440daf6cb2 WHIRLPOOL 48543995efc6beddbc3081a2f2b973400cad7e83e812a15dff8908e6c4e4ed6e82ddd36d642e4c7493dca3e9890ae21c228bebc73d1ec8350997d3c2db230e6f
diff --git a/x11-misc/lightdm/files/README.gentoo b/x11-misc/lightdm/files/README.gentoo
new file mode 100644
index 000000000000..182f53087548
--- /dev/null
+++ b/x11-misc/lightdm/files/README.gentoo
@@ -0,0 +1,11 @@
+
+ * Even though the default /etc/lightdm/lightdm.conf will work for
+ * most users, make sure you configure it to suit your needs
+ * before using lightdm for the first time.
+ * You can test the configuration file using the following
+ * command: lightdm --test-mode -c /etc/lightdm/lightdm.conf. This
+ * requires xorg-server to be built with the 'kdrive' useflag.
+ *
+ * You can also set your own default values for LIGHTDM_GREETER,
+ * LIGHTDM_SESSION, and LIGHTDM_USER in /etc/portage/make.conf
+
diff --git a/x11-misc/lightdm/files/Xsession b/x11-misc/lightdm/files/Xsession
new file mode 100644
index 000000000000..50ce80fd3e19
--- /dev/null
+++ b/x11-misc/lightdm/files/Xsession
@@ -0,0 +1,74 @@
+#!/bin/sh
+#
+# LightDM wrapper to run around X sessions.
+
+echo "Running X session wrapper"
+
+# Load profile
+for file in "/etc/profile" "$HOME/.profile" "/etc/xprofile" "$HOME/.xprofile"; do
+    if [ -f "$file" ]; then
+        echo "Loading profile from $file";
+        . "$file"
+    fi
+done
+
+# Load resources
+for file in "/etc/X11/Xresources" "$HOME/.Xresources"; do
+    if [ -f "$file" ]; then
+        echo "Loading resource: $file"
+        xrdb -nocpp -merge "$file"
+    fi
+done
+
+# Load keymaps
+for file in "/etc/X11/Xkbmap" "$HOME/.Xkbmap"; do
+    if [ -f "$file" ]; then
+        echo "Loading keymap: $file"
+        setxkbmap `cat "$file"`
+        XKB_IN_USE=yes
+    fi
+done
+
+# Load xmodmap if not using XKB
+if [ -z "$XKB_IN_USE" ]; then
+    for file in "/etc/X11/Xmodmap" "$HOME/.Xmodmap"; do
+        if [ -f "$file" ]; then
+           echo "Loading modmap: $file"
+           xmodmap "$file"
+        fi
+    done
+fi
+
+unset XKB_IN_USE
+
+# /etc/X11/xinit/xinitrc.d/80-dbus expects $command to be
+# set to the Xsession arguments. So make it happy. See
+# https://bugs.gentoo.org/show_bug.cgi?id=533456
+command="$@"
+
+# Run all system xinitrc shell scripts.
+xinitdir="/etc/X11/xinit/xinitrc.d"
+if [ -d "$xinitdir" ]; then
+    for script in $xinitdir/*; do
+        echo "Loading xinit script $script"
+        if [ -x "$script" -a ! -d "$script" ]; then
+            . "$script"
+        fi
+    done
+fi
+
+# Load Xsession scripts
+xsessionddir="/etc/X11/Xsession.d"
+if [ -d "$xsessionddir" ]; then
+    for i in `ls $xsessionddir`; do
+        script="$xsessionddir/$i"
+        echo "Loading X session script $script"
+        if [ -r "$script"  -a -f "$script" ] && expr "$i" : '^[[:alnum:]_-]\+$' > /dev/null; then
+            . "$script"
+        fi
+    done
+fi
+
+echo "X session wrapper complete, running session $@"
+
+exec $command
diff --git a/x11-misc/lightdm/files/lightdm b/x11-misc/lightdm/files/lightdm
new file mode 100644
index 000000000000..6286d6ab4f66
--- /dev/null
+++ b/x11-misc/lightdm/files/lightdm
@@ -0,0 +1,8 @@
+#%PAM-1.0
+auth       optional		pam_env.so
+auth       include		system-login
+auth       required		pam_nologin.so
+account    include		system-login
+password   include		system-login
+session    optional             pam_loginuid.so
+session    include		system-auth
diff --git a/x11-misc/lightdm/files/lightdm-1.2.0-fix-configure.patch b/x11-misc/lightdm/files/lightdm-1.2.0-fix-configure.patch
new file mode 100644
index 000000000000..c8c795e044e1
--- /dev/null
+++ b/x11-misc/lightdm/files/lightdm-1.2.0-fix-configure.patch
@@ -0,0 +1,10 @@
+--- configure.ac~	2012-04-23 12:12:44.000000000 +0100
++++ configure.ac	2012-04-23 12:25:51.050999668 +0100
+@@ -93,6 +93,7 @@
+     PKG_CHECK_MODULES(LIBLIGHTDM_QT, [
+         QtCore
+         QtDBus
++        QtGui
+     ])
+     QT4_BINDIR=`$PKG_CONFIG Qt --variable bindir`
+     AC_CHECK_TOOLS(MOC, [moc-qt4 moc],, [$QT4_BINDIR:$PATH])
diff --git a/x11-misc/lightdm/files/lightdm-1.7.7-session-wrapper.patch b/x11-misc/lightdm/files/lightdm-1.7.7-session-wrapper.patch
new file mode 100644
index 000000000000..40b4159755a2
--- /dev/null
+++ b/x11-misc/lightdm/files/lightdm-1.7.7-session-wrapper.patch
@@ -0,0 +1,13 @@
+Index: lightdm-1.7.7/data/lightdm.conf
+===================================================================
+--- lightdm-1.7.7.orig/data/lightdm.conf
++++ lightdm-1.7.7/data/lightdm.conf
+@@ -87,7 +87,7 @@
+ #user-session=default
+ #allow-guest=true
+ #guest-session=UNIMPLEMENTED
+-#session-wrapper=lightdm-session
++session-wrapper=/etc/lightdm/Xsession
+ #greeter-wrapper=
+ #display-setup-script=
+ #greeter-setup-script=
diff --git a/x11-misc/lightdm/files/lightdm-autologin b/x11-misc/lightdm/files/lightdm-autologin
new file mode 100644
index 000000000000..decfba3438b7
--- /dev/null
+++ b/x11-misc/lightdm/files/lightdm-autologin
@@ -0,0 +1,6 @@
+auth	optional	pam_env.so
+auth	required	pam_nologin.so
+auth	required	pam_permit.so
+
+account	include		system-local-login
+session	include		system-local-login
diff --git a/x11-misc/lightdm/files/lightdm.service b/x11-misc/lightdm/files/lightdm.service
new file mode 100644
index 000000000000..7eb46cebaa10
--- /dev/null
+++ b/x11-misc/lightdm/files/lightdm.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=Light Display Manager
+Documentation=man:lightdm(1)
+After=systemd-user-sessions.service
+
+[Service]
+ExecStart=/usr/sbin/lightdm
+StandardOutput=syslog
+Restart=always
+IgnoreSIGPIPE=no
+BusName=org.freedesktop.DisplayManager
+
+[Install]
+Alias=display-manager.service
diff --git a/x11-misc/lightdm/files/session-wrapper-lightdm.patch b/x11-misc/lightdm/files/session-wrapper-lightdm.patch
new file mode 100644
index 000000000000..9f41816a9f5f
--- /dev/null
+++ b/x11-misc/lightdm/files/session-wrapper-lightdm.patch
@@ -0,0 +1,13 @@
+Index: lightdm-1.0.6/data/lightdm.conf
+===================================================================
+--- lightdm-1.0.6.orig/data/lightdm.conf
++++ lightdm-1.0.6/data/lightdm.conf
+@@ -65,7 +65,7 @@
+ #user-session=default
+ #allow-guest=true
+ #guest-session=UNIMPLEMENTED
+-#session-wrapper=lightdm-session
++session-wrapper=/etc/lightdm/Xsession
+ #display-setup-script=
+ #greeter-setup-script=
+ #session-setup-script=
diff --git a/x11-misc/lightdm/lightdm-1.10.3.ebuild b/x11-misc/lightdm/lightdm-1.10.3.ebuild
new file mode 100644
index 000000000000..5c70e155f7b3
--- /dev/null
+++ b/x11-misc/lightdm/lightdm-1.10.3.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils pam readme.gentoo systemd
+
+TRUNK_VERSION="1.10"
+DESCRIPTION="A lightweight display manager"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/LightDM"
+SRC_URI="http://launchpad.net/${PN}/${TRUNK_VERSION}/${PV}/+download/${P}.tar.xz
+	mirror://gentoo/introspection-20110205.m4.tar.bz2"
+
+LICENSE="GPL-3 LGPL-3"
+SLOT="0"
+KEYWORDS="amd64 arm ~ppc x86"
+IUSE="+gtk +introspection kde qt4"
+REQUIRED_USE="|| ( gtk kde )"
+
+COMMON_DEPEND=">=dev-libs/glib-2.32.3:2
+	dev-libs/libxml2
+	sys-apps/accountsservice
+	virtual/pam
+	x11-libs/libX11
+	>=x11-libs/libxklavier-5
+	introspection? ( >=dev-libs/gobject-introspection-1 )
+	qt4? (
+		dev-qt/qtcore:4
+		dev-qt/qtdbus:4
+		dev-qt/qtgui:4
+		)"
+RDEPEND="${COMMON_DEPEND}
+	>=sys-auth/pambase-20101024-r2"
+DEPEND="${COMMON_DEPEND}
+	dev-util/gtk-doc-am
+	dev-util/intltool
+	gnome-base/gnome-common
+	sys-devel/gettext
+	virtual/pkgconfig"
+PDEPEND="gtk? ( x11-misc/lightdm-gtk-greeter )
+	kde? ( x11-misc/lightdm-kde )"
+
+DOCS=( NEWS )
+RESTRICT="test"
+
+src_prepare() {
+	sed -i -e 's:getgroups:lightdm_&:' tests/src/libsystem.c || die #412369
+	sed -i -e '/minimum-uid/s:500:1000:' data/users.conf || die
+
+	einfo "Fixing the session-wrapper variable in lightdm.conf"
+	sed -i -e \
+		"/session-wrapper/s@^.*@session-wrapper=/etc/${PN}/Xsession@" \
+		data/lightdm.conf || die "Failed to fix lightdm.conf"
+
+	epatch_user
+
+	# Remove bogus Makefile statement. This needs to go upstream
+	sed -i /"@YELP_HELP_RULES@"/d help/Makefile.am || die
+	if has_version dev-libs/gobject-introspection; then
+		eautoreconf
+	else
+		AT_M4DIR=${WORKDIR} eautoreconf
+	fi
+}
+
+src_configure() {
+	# Set default values if global vars unset
+	local _greeter _session _user
+	_greeter=${LIGHTDM_GREETER:=lightdm-gtk-greeter}
+	_session=${LIGHTDM_SESSION:=gnome}
+	_user=${LIGHTDM_USER:=root}
+	# Let user know how lightdm is configured
+	einfo "Gentoo configuration"
+	einfo "Default greeter: ${_greeter}"
+	einfo "Default session: ${_session}"
+	einfo "Greeter user: ${_user}"
+
+	# also disable tests because libsystem.c does not build. Tests are
+	# restricted so it does not matter anyway.
+	econf \
+		--localstatedir=/var \
+		--disable-static \
+		--disable-tests \
+		$(use_enable introspection) \
+		$(use_enable qt4 liblightdm-qt) \
+		--disable-liblightdm-qt5 \
+		--with-user-session=${_session} \
+		--with-greeter-session=${_greeter} \
+		--with-greeter-user=${_user} \
+		--with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html
+}
+
+src_install() {
+	default
+
+	# Delete apparmor profiles because they only work with Ubuntu's
+	# apparmor package. Bug #494426
+	if [[ -d ${D}/etc/apparmor.d ]]; then
+		rm -r "${D}/etc/apparmor.d" || die \
+			"Failed to remove apparmor profiles"
+	fi
+
+	insinto /etc/${PN}
+	doins data/{${PN},keys}.conf
+	doins "${FILESDIR}"/Xsession
+	fperms +x /etc/${PN}/Xsession
+
+	prune_libtool_files --all
+	rm -rf "${ED}"/etc/init
+
+	pamd_mimic system-local-login ${PN} auth account session #372229
+	dopamd "${FILESDIR}"/${PN}-autologin #390863, #423163
+
+	readme.gentoo_create_doc
+
+	systemd_dounit "${FILESDIR}/${PN}.service"
+}
diff --git a/x11-misc/lightdm/lightdm-1.10.5.ebuild b/x11-misc/lightdm/lightdm-1.10.5.ebuild
new file mode 100644
index 000000000000..104ecbfc3190
--- /dev/null
+++ b/x11-misc/lightdm/lightdm-1.10.5.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils pam readme.gentoo systemd
+
+TRUNK_VERSION="1.10"
+DESCRIPTION="A lightweight display manager"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/LightDM"
+SRC_URI="http://launchpad.net/${PN}/${TRUNK_VERSION}/${PV}/+download/${P}.tar.xz
+	mirror://gentoo/introspection-20110205.m4.tar.bz2"
+
+LICENSE="GPL-3 LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE="+gtk +introspection kde qt4"
+REQUIRED_USE="|| ( gtk kde )"
+
+COMMON_DEPEND=">=dev-libs/glib-2.32.3:2
+	dev-libs/libxml2
+	sys-apps/accountsservice
+	virtual/pam
+	x11-libs/libX11
+	>=x11-libs/libxklavier-5
+	introspection? ( >=dev-libs/gobject-introspection-1 )
+	qt4? (
+		dev-qt/qtcore:4
+		dev-qt/qtdbus:4
+		dev-qt/qtgui:4
+		)"
+RDEPEND="${COMMON_DEPEND}
+	>=sys-auth/pambase-20101024-r2"
+DEPEND="${COMMON_DEPEND}
+	dev-util/gtk-doc-am
+	dev-util/intltool
+	gnome-base/gnome-common
+	sys-devel/gettext
+	virtual/pkgconfig"
+PDEPEND="gtk? ( x11-misc/lightdm-gtk-greeter )
+	kde? ( x11-misc/lightdm-kde )"
+
+DOCS=( NEWS )
+RESTRICT="test"
+
+src_prepare() {
+	sed -i -e 's:getgroups:lightdm_&:' tests/src/libsystem.c || die #412369
+	sed -i -e '/minimum-uid/s:500:1000:' data/users.conf || die
+
+	einfo "Fixing the session-wrapper variable in lightdm.conf"
+	sed -i -e \
+		"/session-wrapper/s@^.*@session-wrapper=/etc/${PN}/Xsession@" \
+		data/lightdm.conf || die "Failed to fix lightdm.conf"
+
+	epatch_user
+
+	# Remove bogus Makefile statement. This needs to go upstream
+	sed -i /"@YELP_HELP_RULES@"/d help/Makefile.am || die
+	if has_version dev-libs/gobject-introspection; then
+		eautoreconf
+	else
+		AT_M4DIR=${WORKDIR} eautoreconf
+	fi
+}
+
+src_configure() {
+	# Set default values if global vars unset
+	local _greeter _session _user
+	_greeter=${LIGHTDM_GREETER:=lightdm-gtk-greeter}
+	_session=${LIGHTDM_SESSION:=gnome}
+	_user=${LIGHTDM_USER:=root}
+	# Let user know how lightdm is configured
+	einfo "Gentoo configuration"
+	einfo "Default greeter: ${_greeter}"
+	einfo "Default session: ${_session}"
+	einfo "Greeter user: ${_user}"
+
+	# also disable tests because libsystem.c does not build. Tests are
+	# restricted so it does not matter anyway.
+	econf \
+		--localstatedir=/var \
+		--disable-static \
+		--disable-tests \
+		$(use_enable introspection) \
+		$(use_enable qt4 liblightdm-qt) \
+		--disable-liblightdm-qt5 \
+		--with-user-session=${_session} \
+		--with-greeter-session=${_greeter} \
+		--with-greeter-user=${_user} \
+		--with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html
+}
+
+src_install() {
+	default
+
+	# Delete apparmor profiles because they only work with Ubuntu's
+	# apparmor package. Bug #494426
+	if [[ -d ${D}/etc/apparmor.d ]]; then
+		rm -r "${D}/etc/apparmor.d" || die \
+			"Failed to remove apparmor profiles"
+	fi
+
+	insinto /etc/${PN}
+	doins data/{${PN},keys}.conf
+	doins "${FILESDIR}"/Xsession
+	fperms +x /etc/${PN}/Xsession
+
+	prune_libtool_files --all
+	rm -rf "${ED}"/etc/init
+
+	pamd_mimic system-local-login ${PN} auth account session #372229
+	dopamd "${FILESDIR}"/${PN}-autologin #390863, #423163
+
+	readme.gentoo_create_doc
+
+	systemd_dounit "${FILESDIR}/${PN}.service"
+}
diff --git a/x11-misc/lightdm/lightdm-1.12.3.ebuild b/x11-misc/lightdm/lightdm-1.12.3.ebuild
new file mode 100644
index 000000000000..6e54a7285797
--- /dev/null
+++ b/x11-misc/lightdm/lightdm-1.12.3.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils pam readme.gentoo systemd versionator
+
+TRUNK_VERSION="$(get_version_component_range 1-2)"
+DESCRIPTION="A lightweight display manager"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/LightDM"
+SRC_URI="http://launchpad.net/${PN}/${TRUNK_VERSION}/${PV}/+download/${P}.tar.xz
+	mirror://gentoo/introspection-20110205.m4.tar.bz2"
+
+LICENSE="GPL-3 LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+IUSE="+gtk +introspection kde qt4"
+REQUIRED_USE="|| ( gtk kde )"
+
+COMMON_DEPEND=">=dev-libs/glib-2.32.3:2
+	dev-libs/libxml2
+	sys-apps/accountsservice
+	virtual/pam
+	x11-libs/libX11
+	>=x11-libs/libxklavier-5
+	introspection? ( >=dev-libs/gobject-introspection-1 )
+	qt4? (
+		dev-qt/qtcore:4
+		dev-qt/qtdbus:4
+		dev-qt/qtgui:4
+		)"
+RDEPEND="${COMMON_DEPEND}
+	>=sys-auth/pambase-20101024-r2"
+DEPEND="${COMMON_DEPEND}
+	dev-util/gtk-doc-am
+	dev-util/intltool
+	gnome-base/gnome-common
+	sys-devel/gettext
+	virtual/pkgconfig"
+PDEPEND="gtk? ( x11-misc/lightdm-gtk-greeter )
+	kde? ( x11-misc/lightdm-kde )"
+
+DOCS=( NEWS )
+RESTRICT="test"
+
+src_prepare() {
+	sed -i -e 's:getgroups:lightdm_&:' tests/src/libsystem.c || die #412369
+	sed -i -e '/minimum-uid/s:500:1000:' data/users.conf || die
+
+	einfo "Fixing the session-wrapper variable in lightdm.conf"
+	sed -i -e \
+		"/session-wrapper/s@^.*@session-wrapper=/etc/${PN}/Xsession@" \
+		data/lightdm.conf || die "Failed to fix lightdm.conf"
+
+	epatch_user
+
+	# Remove bogus Makefile statement. This needs to go upstream
+	sed -i /"@YELP_HELP_RULES@"/d help/Makefile.am || die
+	if has_version dev-libs/gobject-introspection; then
+		eautoreconf
+	else
+		AT_M4DIR=${WORKDIR} eautoreconf
+	fi
+}
+
+src_configure() {
+	# Set default values if global vars unset
+	local _greeter _session _user
+	_greeter=${LIGHTDM_GREETER:=lightdm-gtk-greeter}
+	_session=${LIGHTDM_SESSION:=gnome}
+	_user=${LIGHTDM_USER:=root}
+	# Let user know how lightdm is configured
+	einfo "Gentoo configuration"
+	einfo "Default greeter: ${_greeter}"
+	einfo "Default session: ${_session}"
+	einfo "Greeter user: ${_user}"
+
+	# also disable tests because libsystem.c does not build. Tests are
+	# restricted so it does not matter anyway.
+	econf \
+		--localstatedir=/var \
+		--disable-static \
+		--disable-tests \
+		$(use_enable introspection) \
+		$(use_enable qt4 liblightdm-qt) \
+		--disable-liblightdm-qt5 \
+		--with-user-session=${_session} \
+		--with-greeter-session=${_greeter} \
+		--with-greeter-user=${_user} \
+		--with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html
+}
+
+src_install() {
+	default
+
+	# Delete apparmor profiles because they only work with Ubuntu's
+	# apparmor package. Bug #494426
+	if [[ -d ${D}/etc/apparmor.d ]]; then
+		rm -r "${D}/etc/apparmor.d" || die \
+			"Failed to remove apparmor profiles"
+	fi
+
+	insinto /etc/${PN}
+	doins data/{${PN},keys}.conf
+	doins "${FILESDIR}"/Xsession
+	fperms +x /etc/${PN}/Xsession
+	# /var/lib/lightdm-data could be useful. Bug #522228
+	dodir /var/lib/lightdm-data
+
+	prune_libtool_files --all
+	rm -rf "${ED}"/etc/init
+
+	pamd_mimic system-local-login ${PN} auth account session #372229
+	dopamd "${FILESDIR}"/${PN}-autologin #390863, #423163
+
+	readme.gentoo_create_doc
+
+	systemd_dounit "${FILESDIR}/${PN}.service"
+}
diff --git a/x11-misc/lightdm/lightdm-1.13.2.ebuild b/x11-misc/lightdm/lightdm-1.13.2.ebuild
new file mode 100644
index 000000000000..277dca2c8eca
--- /dev/null
+++ b/x11-misc/lightdm/lightdm-1.13.2.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils pam readme.gentoo systemd versionator
+
+TRUNK_VERSION="$(get_version_component_range 1-2)"
+DESCRIPTION="A lightweight display manager"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/LightDM"
+SRC_URI="http://launchpad.net/${PN}/${TRUNK_VERSION}/${PV}/+download/${P}.tar.xz
+	mirror://gentoo/introspection-20110205.m4.tar.bz2"
+
+LICENSE="GPL-3 LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE="+gtk +introspection kde qt4 +gnome"
+REQUIRED_USE="|| ( gtk kde )"
+
+COMMON_DEPEND=">=dev-libs/glib-2.32.3:2
+	dev-libs/libxml2
+	gnome? ( sys-apps/accountsservice )
+	virtual/pam
+	x11-libs/libX11
+	>=x11-libs/libxklavier-5
+	introspection? ( >=dev-libs/gobject-introspection-1 )
+	qt4? (
+		dev-qt/qtcore:4
+		dev-qt/qtdbus:4
+		dev-qt/qtgui:4
+		)"
+RDEPEND="${COMMON_DEPEND}
+	>=sys-auth/pambase-20101024-r2"
+DEPEND="${COMMON_DEPEND}
+	dev-util/gtk-doc-am
+	dev-util/intltool
+	gnome? ( gnome-base/gnome-common )
+	sys-devel/gettext
+	virtual/pkgconfig"
+PDEPEND="gtk? ( x11-misc/lightdm-gtk-greeter )
+	kde? ( x11-misc/lightdm-kde )"
+
+DOCS=( NEWS )
+RESTRICT="test"
+
+src_prepare() {
+	sed -i -e 's:getgroups:lightdm_&:' tests/src/libsystem.c || die #412369
+	sed -i -e '/minimum-uid/s:500:1000:' data/users.conf || die
+
+	einfo "Fixing the session-wrapper variable in lightdm.conf"
+	sed -i -e \
+		"/session-wrapper/s@^.*@session-wrapper=/etc/${PN}/Xsession@" \
+		data/lightdm.conf || die "Failed to fix lightdm.conf"
+
+	epatch_user
+
+	# Remove bogus Makefile statement. This needs to go upstream
+	sed -i /"@YELP_HELP_RULES@"/d help/Makefile.am || die
+	if has_version dev-libs/gobject-introspection; then
+		eautoreconf
+	else
+		AT_M4DIR=${WORKDIR} eautoreconf
+	fi
+}
+
+src_configure() {
+	# Set default values if global vars unset
+	local _greeter _session _user
+	_greeter=${LIGHTDM_GREETER:=lightdm-gtk-greeter}
+	_session=${LIGHTDM_SESSION:=gnome}
+	_user=${LIGHTDM_USER:=root}
+	# Let user know how lightdm is configured
+	einfo "Gentoo configuration"
+	einfo "Default greeter: ${_greeter}"
+	einfo "Default session: ${_session}"
+	einfo "Greeter user: ${_user}"
+
+	# also disable tests because libsystem.c does not build. Tests are
+	# restricted so it does not matter anyway.
+	econf \
+		--localstatedir=/var \
+		--disable-static \
+		--disable-tests \
+		$(use_enable introspection) \
+		$(use_enable qt4 liblightdm-qt) \
+		--disable-liblightdm-qt5 \
+		--with-user-session=${_session} \
+		--with-greeter-session=${_greeter} \
+		--with-greeter-user=${_user} \
+		--with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html
+}
+
+src_install() {
+	default
+
+	# Delete apparmor profiles because they only work with Ubuntu's
+	# apparmor package. Bug #494426
+	if [[ -d ${D}/etc/apparmor.d ]]; then
+		rm -r "${D}/etc/apparmor.d" || die \
+			"Failed to remove apparmor profiles"
+	fi
+
+	insinto /etc/${PN}
+	doins data/{${PN},keys}.conf
+	doins "${FILESDIR}"/Xsession
+	fperms +x /etc/${PN}/Xsession
+	# /var/lib/lightdm-data could be useful. Bug #522228
+	dodir /var/lib/lightdm-data
+
+	prune_libtool_files --all
+	rm -rf "${ED}"/etc/init
+
+	# Remove existing pam file. We will build a new one. Bug #524792
+	rm -rf "${ED}"/etc/pam.d/${PN}{,-greeter}
+	pamd_mimic system-local-login ${PN} auth account password session #372229
+	pamd_mimic system-local-login ${PN}-greeter auth account password session #372229
+	dopamd "${FILESDIR}"/${PN}-autologin #390863, #423163
+
+	readme.gentoo_create_doc
+
+	systemd_dounit "${FILESDIR}/${PN}.service"
+}
diff --git a/x11-misc/lightdm/lightdm-1.14.1.ebuild b/x11-misc/lightdm/lightdm-1.14.1.ebuild
new file mode 100644
index 000000000000..277dca2c8eca
--- /dev/null
+++ b/x11-misc/lightdm/lightdm-1.14.1.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils pam readme.gentoo systemd versionator
+
+TRUNK_VERSION="$(get_version_component_range 1-2)"
+DESCRIPTION="A lightweight display manager"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/LightDM"
+SRC_URI="http://launchpad.net/${PN}/${TRUNK_VERSION}/${PV}/+download/${P}.tar.xz
+	mirror://gentoo/introspection-20110205.m4.tar.bz2"
+
+LICENSE="GPL-3 LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE="+gtk +introspection kde qt4 +gnome"
+REQUIRED_USE="|| ( gtk kde )"
+
+COMMON_DEPEND=">=dev-libs/glib-2.32.3:2
+	dev-libs/libxml2
+	gnome? ( sys-apps/accountsservice )
+	virtual/pam
+	x11-libs/libX11
+	>=x11-libs/libxklavier-5
+	introspection? ( >=dev-libs/gobject-introspection-1 )
+	qt4? (
+		dev-qt/qtcore:4
+		dev-qt/qtdbus:4
+		dev-qt/qtgui:4
+		)"
+RDEPEND="${COMMON_DEPEND}
+	>=sys-auth/pambase-20101024-r2"
+DEPEND="${COMMON_DEPEND}
+	dev-util/gtk-doc-am
+	dev-util/intltool
+	gnome? ( gnome-base/gnome-common )
+	sys-devel/gettext
+	virtual/pkgconfig"
+PDEPEND="gtk? ( x11-misc/lightdm-gtk-greeter )
+	kde? ( x11-misc/lightdm-kde )"
+
+DOCS=( NEWS )
+RESTRICT="test"
+
+src_prepare() {
+	sed -i -e 's:getgroups:lightdm_&:' tests/src/libsystem.c || die #412369
+	sed -i -e '/minimum-uid/s:500:1000:' data/users.conf || die
+
+	einfo "Fixing the session-wrapper variable in lightdm.conf"
+	sed -i -e \
+		"/session-wrapper/s@^.*@session-wrapper=/etc/${PN}/Xsession@" \
+		data/lightdm.conf || die "Failed to fix lightdm.conf"
+
+	epatch_user
+
+	# Remove bogus Makefile statement. This needs to go upstream
+	sed -i /"@YELP_HELP_RULES@"/d help/Makefile.am || die
+	if has_version dev-libs/gobject-introspection; then
+		eautoreconf
+	else
+		AT_M4DIR=${WORKDIR} eautoreconf
+	fi
+}
+
+src_configure() {
+	# Set default values if global vars unset
+	local _greeter _session _user
+	_greeter=${LIGHTDM_GREETER:=lightdm-gtk-greeter}
+	_session=${LIGHTDM_SESSION:=gnome}
+	_user=${LIGHTDM_USER:=root}
+	# Let user know how lightdm is configured
+	einfo "Gentoo configuration"
+	einfo "Default greeter: ${_greeter}"
+	einfo "Default session: ${_session}"
+	einfo "Greeter user: ${_user}"
+
+	# also disable tests because libsystem.c does not build. Tests are
+	# restricted so it does not matter anyway.
+	econf \
+		--localstatedir=/var \
+		--disable-static \
+		--disable-tests \
+		$(use_enable introspection) \
+		$(use_enable qt4 liblightdm-qt) \
+		--disable-liblightdm-qt5 \
+		--with-user-session=${_session} \
+		--with-greeter-session=${_greeter} \
+		--with-greeter-user=${_user} \
+		--with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html
+}
+
+src_install() {
+	default
+
+	# Delete apparmor profiles because they only work with Ubuntu's
+	# apparmor package. Bug #494426
+	if [[ -d ${D}/etc/apparmor.d ]]; then
+		rm -r "${D}/etc/apparmor.d" || die \
+			"Failed to remove apparmor profiles"
+	fi
+
+	insinto /etc/${PN}
+	doins data/{${PN},keys}.conf
+	doins "${FILESDIR}"/Xsession
+	fperms +x /etc/${PN}/Xsession
+	# /var/lib/lightdm-data could be useful. Bug #522228
+	dodir /var/lib/lightdm-data
+
+	prune_libtool_files --all
+	rm -rf "${ED}"/etc/init
+
+	# Remove existing pam file. We will build a new one. Bug #524792
+	rm -rf "${ED}"/etc/pam.d/${PN}{,-greeter}
+	pamd_mimic system-local-login ${PN} auth account password session #372229
+	pamd_mimic system-local-login ${PN}-greeter auth account password session #372229
+	dopamd "${FILESDIR}"/${PN}-autologin #390863, #423163
+
+	readme.gentoo_create_doc
+
+	systemd_dounit "${FILESDIR}/${PN}.service"
+}
diff --git a/x11-misc/lightdm/lightdm-1.14.2.ebuild b/x11-misc/lightdm/lightdm-1.14.2.ebuild
new file mode 100644
index 000000000000..277dca2c8eca
--- /dev/null
+++ b/x11-misc/lightdm/lightdm-1.14.2.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils pam readme.gentoo systemd versionator
+
+TRUNK_VERSION="$(get_version_component_range 1-2)"
+DESCRIPTION="A lightweight display manager"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/LightDM"
+SRC_URI="http://launchpad.net/${PN}/${TRUNK_VERSION}/${PV}/+download/${P}.tar.xz
+	mirror://gentoo/introspection-20110205.m4.tar.bz2"
+
+LICENSE="GPL-3 LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE="+gtk +introspection kde qt4 +gnome"
+REQUIRED_USE="|| ( gtk kde )"
+
+COMMON_DEPEND=">=dev-libs/glib-2.32.3:2
+	dev-libs/libxml2
+	gnome? ( sys-apps/accountsservice )
+	virtual/pam
+	x11-libs/libX11
+	>=x11-libs/libxklavier-5
+	introspection? ( >=dev-libs/gobject-introspection-1 )
+	qt4? (
+		dev-qt/qtcore:4
+		dev-qt/qtdbus:4
+		dev-qt/qtgui:4
+		)"
+RDEPEND="${COMMON_DEPEND}
+	>=sys-auth/pambase-20101024-r2"
+DEPEND="${COMMON_DEPEND}
+	dev-util/gtk-doc-am
+	dev-util/intltool
+	gnome? ( gnome-base/gnome-common )
+	sys-devel/gettext
+	virtual/pkgconfig"
+PDEPEND="gtk? ( x11-misc/lightdm-gtk-greeter )
+	kde? ( x11-misc/lightdm-kde )"
+
+DOCS=( NEWS )
+RESTRICT="test"
+
+src_prepare() {
+	sed -i -e 's:getgroups:lightdm_&:' tests/src/libsystem.c || die #412369
+	sed -i -e '/minimum-uid/s:500:1000:' data/users.conf || die
+
+	einfo "Fixing the session-wrapper variable in lightdm.conf"
+	sed -i -e \
+		"/session-wrapper/s@^.*@session-wrapper=/etc/${PN}/Xsession@" \
+		data/lightdm.conf || die "Failed to fix lightdm.conf"
+
+	epatch_user
+
+	# Remove bogus Makefile statement. This needs to go upstream
+	sed -i /"@YELP_HELP_RULES@"/d help/Makefile.am || die
+	if has_version dev-libs/gobject-introspection; then
+		eautoreconf
+	else
+		AT_M4DIR=${WORKDIR} eautoreconf
+	fi
+}
+
+src_configure() {
+	# Set default values if global vars unset
+	local _greeter _session _user
+	_greeter=${LIGHTDM_GREETER:=lightdm-gtk-greeter}
+	_session=${LIGHTDM_SESSION:=gnome}
+	_user=${LIGHTDM_USER:=root}
+	# Let user know how lightdm is configured
+	einfo "Gentoo configuration"
+	einfo "Default greeter: ${_greeter}"
+	einfo "Default session: ${_session}"
+	einfo "Greeter user: ${_user}"
+
+	# also disable tests because libsystem.c does not build. Tests are
+	# restricted so it does not matter anyway.
+	econf \
+		--localstatedir=/var \
+		--disable-static \
+		--disable-tests \
+		$(use_enable introspection) \
+		$(use_enable qt4 liblightdm-qt) \
+		--disable-liblightdm-qt5 \
+		--with-user-session=${_session} \
+		--with-greeter-session=${_greeter} \
+		--with-greeter-user=${_user} \
+		--with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html
+}
+
+src_install() {
+	default
+
+	# Delete apparmor profiles because they only work with Ubuntu's
+	# apparmor package. Bug #494426
+	if [[ -d ${D}/etc/apparmor.d ]]; then
+		rm -r "${D}/etc/apparmor.d" || die \
+			"Failed to remove apparmor profiles"
+	fi
+
+	insinto /etc/${PN}
+	doins data/{${PN},keys}.conf
+	doins "${FILESDIR}"/Xsession
+	fperms +x /etc/${PN}/Xsession
+	# /var/lib/lightdm-data could be useful. Bug #522228
+	dodir /var/lib/lightdm-data
+
+	prune_libtool_files --all
+	rm -rf "${ED}"/etc/init
+
+	# Remove existing pam file. We will build a new one. Bug #524792
+	rm -rf "${ED}"/etc/pam.d/${PN}{,-greeter}
+	pamd_mimic system-local-login ${PN} auth account password session #372229
+	pamd_mimic system-local-login ${PN}-greeter auth account password session #372229
+	dopamd "${FILESDIR}"/${PN}-autologin #390863, #423163
+
+	readme.gentoo_create_doc
+
+	systemd_dounit "${FILESDIR}/${PN}.service"
+}
diff --git a/x11-misc/lightdm/lightdm-1.15.0.ebuild b/x11-misc/lightdm/lightdm-1.15.0.ebuild
new file mode 100644
index 000000000000..277dca2c8eca
--- /dev/null
+++ b/x11-misc/lightdm/lightdm-1.15.0.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils pam readme.gentoo systemd versionator
+
+TRUNK_VERSION="$(get_version_component_range 1-2)"
+DESCRIPTION="A lightweight display manager"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/LightDM"
+SRC_URI="http://launchpad.net/${PN}/${TRUNK_VERSION}/${PV}/+download/${P}.tar.xz
+	mirror://gentoo/introspection-20110205.m4.tar.bz2"
+
+LICENSE="GPL-3 LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE="+gtk +introspection kde qt4 +gnome"
+REQUIRED_USE="|| ( gtk kde )"
+
+COMMON_DEPEND=">=dev-libs/glib-2.32.3:2
+	dev-libs/libxml2
+	gnome? ( sys-apps/accountsservice )
+	virtual/pam
+	x11-libs/libX11
+	>=x11-libs/libxklavier-5
+	introspection? ( >=dev-libs/gobject-introspection-1 )
+	qt4? (
+		dev-qt/qtcore:4
+		dev-qt/qtdbus:4
+		dev-qt/qtgui:4
+		)"
+RDEPEND="${COMMON_DEPEND}
+	>=sys-auth/pambase-20101024-r2"
+DEPEND="${COMMON_DEPEND}
+	dev-util/gtk-doc-am
+	dev-util/intltool
+	gnome? ( gnome-base/gnome-common )
+	sys-devel/gettext
+	virtual/pkgconfig"
+PDEPEND="gtk? ( x11-misc/lightdm-gtk-greeter )
+	kde? ( x11-misc/lightdm-kde )"
+
+DOCS=( NEWS )
+RESTRICT="test"
+
+src_prepare() {
+	sed -i -e 's:getgroups:lightdm_&:' tests/src/libsystem.c || die #412369
+	sed -i -e '/minimum-uid/s:500:1000:' data/users.conf || die
+
+	einfo "Fixing the session-wrapper variable in lightdm.conf"
+	sed -i -e \
+		"/session-wrapper/s@^.*@session-wrapper=/etc/${PN}/Xsession@" \
+		data/lightdm.conf || die "Failed to fix lightdm.conf"
+
+	epatch_user
+
+	# Remove bogus Makefile statement. This needs to go upstream
+	sed -i /"@YELP_HELP_RULES@"/d help/Makefile.am || die
+	if has_version dev-libs/gobject-introspection; then
+		eautoreconf
+	else
+		AT_M4DIR=${WORKDIR} eautoreconf
+	fi
+}
+
+src_configure() {
+	# Set default values if global vars unset
+	local _greeter _session _user
+	_greeter=${LIGHTDM_GREETER:=lightdm-gtk-greeter}
+	_session=${LIGHTDM_SESSION:=gnome}
+	_user=${LIGHTDM_USER:=root}
+	# Let user know how lightdm is configured
+	einfo "Gentoo configuration"
+	einfo "Default greeter: ${_greeter}"
+	einfo "Default session: ${_session}"
+	einfo "Greeter user: ${_user}"
+
+	# also disable tests because libsystem.c does not build. Tests are
+	# restricted so it does not matter anyway.
+	econf \
+		--localstatedir=/var \
+		--disable-static \
+		--disable-tests \
+		$(use_enable introspection) \
+		$(use_enable qt4 liblightdm-qt) \
+		--disable-liblightdm-qt5 \
+		--with-user-session=${_session} \
+		--with-greeter-session=${_greeter} \
+		--with-greeter-user=${_user} \
+		--with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html
+}
+
+src_install() {
+	default
+
+	# Delete apparmor profiles because they only work with Ubuntu's
+	# apparmor package. Bug #494426
+	if [[ -d ${D}/etc/apparmor.d ]]; then
+		rm -r "${D}/etc/apparmor.d" || die \
+			"Failed to remove apparmor profiles"
+	fi
+
+	insinto /etc/${PN}
+	doins data/{${PN},keys}.conf
+	doins "${FILESDIR}"/Xsession
+	fperms +x /etc/${PN}/Xsession
+	# /var/lib/lightdm-data could be useful. Bug #522228
+	dodir /var/lib/lightdm-data
+
+	prune_libtool_files --all
+	rm -rf "${ED}"/etc/init
+
+	# Remove existing pam file. We will build a new one. Bug #524792
+	rm -rf "${ED}"/etc/pam.d/${PN}{,-greeter}
+	pamd_mimic system-local-login ${PN} auth account password session #372229
+	pamd_mimic system-local-login ${PN}-greeter auth account password session #372229
+	dopamd "${FILESDIR}"/${PN}-autologin #390863, #423163
+
+	readme.gentoo_create_doc
+
+	systemd_dounit "${FILESDIR}/${PN}.service"
+}
diff --git a/x11-misc/lightdm/metadata.xml b/x11-misc/lightdm/metadata.xml
new file mode 100644
index 000000000000..eb31e4ae1bc2
--- /dev/null
+++ b/x11-misc/lightdm/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>hwoarang@gentoo.org</email>
+		<name>Markos Chandras</name>
+	</maintainer>
+	<use>
+		<flag name="gtk">Pull in the gtk+ greeter</flag>
+		<flag name="introspection">Use dev-libs/gobject-introspection for introspection</flag>
+		<flag name="kde">Pull in the kde greeter</flag>
+	</use>
+	<longdescription lang="en">
+</longdescription>
+	<upstream>
+		<remote-id type="launchpad">lightdm</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-misc/lineak-defaultplugin/Manifest b/x11-misc/lineak-defaultplugin/Manifest
new file mode 100644
index 000000000000..2cf45b7de5de
--- /dev/null
+++ b/x11-misc/lineak-defaultplugin/Manifest
@@ -0,0 +1 @@
+DIST lineak-defaultplugin-0.9.tar.gz 840704 SHA256 3b679d38e32e47c05f13de89b5f3ca49729b6dd847208bd184f772e5f9373230 SHA512 f110eb42f8711b9fbd38652462d9b44f6f6851c4dc5cdb466b63bd09b8d3320e35d7de82626f2c9409bbf0f96d4f1e4ab2e9a82932452e50b403d343fca1ce4b WHIRLPOOL 6a641600e2c581ba17a1324ac892426d9f9f5c83e50efc6b39275effc437e664eb02c083a025779c9d51d02d8e444465f7070950e002f2f1a65417ea63b1ae9e
diff --git a/x11-misc/lineak-defaultplugin/files/lineak-defaultplugin-0.9.0-gcc43.patch b/x11-misc/lineak-defaultplugin/files/lineak-defaultplugin-0.9.0-gcc43.patch
new file mode 100644
index 000000000000..1d12fce74f09
--- /dev/null
+++ b/x11-misc/lineak-defaultplugin/files/lineak-defaultplugin-0.9.0-gcc43.patch
@@ -0,0 +1,10 @@
+--- a/default_plugin/defaultplugin.cpp
++++ b/default_plugin/defaultplugin.cpp
+@@ -35,6 +35,7 @@
+ #include <iostream>
+ #include <sstream>
+ #include <stdlib.h>
++#include <cstring>
+ using namespace std;
+ using namespace lineak_core_functions;
+ 
diff --git a/x11-misc/lineak-defaultplugin/files/lineak-defaultplugin-0.9.0-gcc47.patch b/x11-misc/lineak-defaultplugin/files/lineak-defaultplugin-0.9.0-gcc47.patch
new file mode 100644
index 000000000000..7f593ef0818b
--- /dev/null
+++ b/x11-misc/lineak-defaultplugin/files/lineak-defaultplugin-0.9.0-gcc47.patch
@@ -0,0 +1,10 @@
+--- a/default_plugin/defaultplugin.cpp
++++ b/default_plugin/defaultplugin.cpp
+@@ -35,6 +35,7 @@
+ #include <iostream>
+ #include <sstream>
+ #include <stdlib.h>
++#include <unistd.h> /* fork() */
+ #include <cstring>
+ using namespace std;
+ using namespace lineak_core_functions;
diff --git a/x11-misc/lineak-defaultplugin/lineak-defaultplugin-0.9.0-r1.ebuild b/x11-misc/lineak-defaultplugin/lineak-defaultplugin-0.9.0-r1.ebuild
new file mode 100644
index 000000000000..519a37822f53
--- /dev/null
+++ b/x11-misc/lineak-defaultplugin/lineak-defaultplugin-0.9.0-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils multilib
+
+MY_P=${P/.0/}
+
+DESCRIPTION="Mute/unmute and other macros for LINEAK"
+HOMEPAGE="http://lineak.sourceforge.net"
+SRC_URI="mirror://sourceforge/lineak/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="debug"
+
+RDEPEND="
+	=x11-misc/lineakd-${PV}*
+"
+DEPEND="
+	${RDEPEND}
+	x11-proto/inputproto
+"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-gcc43.patch \
+		"${FILESDIR}"/${P}-gcc47.patch
+
+	sed -i -e 's:$(DESTDIR)${DESTDIR}:$(DESTDIR):' default_plugin/Makefile.in || die
+}
+
+src_configure() {
+	econf USER_LDFLAGS="${LDFLAGS}" $(use_enable debug)
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		PLUGINDIR=/usr/$(get_libdir)/lineakd/plugins \
+		install
+	dodoc AUTHORS README
+}
diff --git a/x11-misc/lineak-defaultplugin/lineak-defaultplugin-0.9.0.ebuild b/x11-misc/lineak-defaultplugin/lineak-defaultplugin-0.9.0.ebuild
new file mode 100644
index 000000000000..5c7893d2ac71
--- /dev/null
+++ b/x11-misc/lineak-defaultplugin/lineak-defaultplugin-0.9.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils multilib
+
+MY_P=${P/.0/}
+
+DESCRIPTION="Mute/unmute and other macros for LINEAK"
+HOMEPAGE="http://lineak.sourceforge.net"
+SRC_URI="mirror://sourceforge/lineak/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="debug"
+
+DEPEND="=x11-misc/lineakd-${PV}*
+	x11-proto/inputproto"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-gcc43.patch
+}
+
+src_compile() {
+	econf USER_LDFLAGS="${LDFLAGS}" $(use_enable debug)
+	emake || die "emake failed."
+}
+
+src_install() {
+	sed -i -e 's:$(DESTDIR)${DESTDIR}:$(DESTDIR):' default_plugin/Makefile
+
+	emake DESTDIR="${D}" \
+		PLUGINDIR=/usr/$(get_libdir)/lineakd/plugins \
+		install || die "emake install failed."
+	dodoc AUTHORS README
+}
diff --git a/x11-misc/lineak-defaultplugin/metadata.xml b/x11-misc/lineak-defaultplugin/metadata.xml
new file mode 100644
index 000000000000..c01576627929
--- /dev/null
+++ b/x11-misc/lineak-defaultplugin/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>desktop-misc</herd>
+  <upstream>
+    <remote-id type="sourceforge">lineak</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/x11-misc/lineak-xosdplugin/Manifest b/x11-misc/lineak-xosdplugin/Manifest
new file mode 100644
index 000000000000..1f5996cc21cb
--- /dev/null
+++ b/x11-misc/lineak-xosdplugin/Manifest
@@ -0,0 +1 @@
+DIST lineak-xosdplugin-0.9.tar.gz 802367 SHA256 ba83d8e6abc2fd1ddbfb0c4837d9a9b2db82e5f3e9732db546147f520ba1c2af
diff --git a/x11-misc/lineak-xosdplugin/files/lineak-xosdplugin-0.9.0-gcc43.patch b/x11-misc/lineak-xosdplugin/files/lineak-xosdplugin-0.9.0-gcc43.patch
new file mode 100644
index 000000000000..ed3f4017fb57
--- /dev/null
+++ b/x11-misc/lineak-xosdplugin/files/lineak-xosdplugin-0.9.0-gcc43.patch
@@ -0,0 +1,14 @@
+diff -urNad lineak-xosdplugin-0.9~/xosd_plugin/xosdctrl.cpp lineak-xosdplugin-0.9/xosd_plugin/xosdctrl.cpp
+--- lineak-xosdplugin-0.9~/xosd_plugin/xosdctrl.cpp	2006-02-08 18:32:13.000000000 +0000
++++ lineak-xosdplugin-0.9/xosd_plugin/xosdctrl.cpp	2008-03-17 04:35:12.000000000 +0000
+@@ -21,6 +21,8 @@
+ #include <lineak/lconfig.h>
+ #include <lineak/lineak_core_functions.h>
+ 
++#include <cstdlib>
++#include <cstring>
+ 
+ using namespace lineak_core_functions;
+ using namespace std;
+
+
diff --git a/x11-misc/lineak-xosdplugin/lineak-xosdplugin-0.9.0-r1.ebuild b/x11-misc/lineak-xosdplugin/lineak-xosdplugin-0.9.0-r1.ebuild
new file mode 100644
index 000000000000..0ae84c08c393
--- /dev/null
+++ b/x11-misc/lineak-xosdplugin/lineak-xosdplugin-0.9.0-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils multilib
+
+MY_P=${P/.0/}
+
+DESCRIPTION="Xosd plugin for LINEAK"
+HOMEPAGE="http://lineak.sourceforge.net/"
+SRC_URI="mirror://sourceforge/lineak/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="debug"
+
+DEPEND="=x11-misc/lineakd-${PV}*
+		x11-libs/xosd"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-gcc43.patch
+}
+
+src_compile() {
+	econf $(use_enable debug) --with-x
+	emake LDFLAGS="${LDFLAGS}" || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" \
+		PLUGINDIR=/usr/$(get_libdir)/lineakd/plugins \
+		install || die
+	dodoc AUTHORS README || die
+}
diff --git a/x11-misc/lineak-xosdplugin/metadata.xml b/x11-misc/lineak-xosdplugin/metadata.xml
new file mode 100644
index 000000000000..381a9fd5d696
--- /dev/null
+++ b/x11-misc/lineak-xosdplugin/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>desktop-misc</herd>
+	<upstream>
+		<remote-id type="sourceforge">lineak</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-misc/lineakd/Manifest b/x11-misc/lineakd/Manifest
new file mode 100644
index 000000000000..a89839fe3a81
--- /dev/null
+++ b/x11-misc/lineakd/Manifest
@@ -0,0 +1 @@
+DIST lineakd-0.9.tar.gz 991376 SHA256 39fd34f8df4d31d16adacce1191b34cef5e510b536701120906ec708be21010b SHA512 e30a2e111832e3f08bbff858647536aaeb75d20008618b8c7555836104fd5a66d8e3173d0f9da76906caf13e9c9753c9140cd22dbb96fde464ed5d5f254d721e WHIRLPOOL 6c6f556c34df24c1fe1c973cd813b7dd3f4b6c91836b49c84b7f1f8d6f1cc9463885396b505feda285e61e34623d443eeea70cfee68b18af8e3ca132b7bcd33f
diff --git a/x11-misc/lineakd/files/lineakd-0.9.0-DELL-XPS-M1330-XOrg-1_5.patch b/x11-misc/lineakd/files/lineakd-0.9.0-DELL-XPS-M1330-XOrg-1_5.patch
new file mode 100644
index 000000000000..4435b1a25e07
--- /dev/null
+++ b/x11-misc/lineakd/files/lineakd-0.9.0-DELL-XPS-M1330-XOrg-1_5.patch
@@ -0,0 +1,32 @@
+--- a/lineakd/lineakkb.def
++++ b/lineakd/lineakkb.def
+@@ -2040,9 +2040,29 @@
+      Previous       = 144
+      Next           = 153
+      Stop           = 164
++     WinKey         = 115
++     FnWinKey       = 116
++     Menu           = 117
+    [END KEYS]
+ [END DELL-XPS-GEN-2]
+ 
++[DELL-XPS-M1330-XOrg-1_5] # By skypjack
++   brandname = "Dell"
++   modelname = "Inspiron XPS M1330 XOrg 1.5"
++   [KEYS]
++     Mute           = 121
++     VolumeDown     = 122
++     VolumeUp       = 123
++     Play|Pause     = 172
++     Previous       = 173
++     Next           = 171
++     Stop           = 174
++     WinKey         = 133
++     FnWinKey       = 134
++     Menu           = 135
++   [END KEYS]
++[END DELL-XPS-M1330-XOrg-1_5]
++
+ [DELL-SK-8100] # By Akshoslaa
+   brandname = "Dell"
+   modelname = "SK-8100"
diff --git a/x11-misc/lineakd/files/lineakd-0.9.0-gcc43.patch b/x11-misc/lineakd/files/lineakd-0.9.0-gcc43.patch
new file mode 100644
index 000000000000..c36a7375c060
--- /dev/null
+++ b/x11-misc/lineakd/files/lineakd-0.9.0-gcc43.patch
@@ -0,0 +1,42 @@
+--- a/lineak/xmgr.cpp
++++ b/lineak/xmgr.cpp
+@@ -21,6 +21,8 @@
+ #include <lineak/lbutton.h>
+ 
+ extern "C" {
++   #include <stdlib.h>
++   #include <string.h>
+    #include <signal.h>
+    #include <X11/Xlib.h>
+    #include <X11/keysym.h>
+--- a/lineak/defloader.h
++++ b/lineak/defloader.h
+@@ -23,6 +23,7 @@
+ #   endif
+ 
+ #   include <lineak/loader.h>
++#   include <cstdlib>
+ #   include <map>
+ 
+ class LDef;
+--- a/lineak/pluginmanager.cpp
++++ b/lineak/pluginmanager.cpp
+@@ -34,6 +34,7 @@
+ #include <unistd.h>
+ #include <dirent.h>
+ #include <dlfcn.h>
++#include <string.h>
+ }
+ 
+ using namespace lineak_core_functions;
+--- a/lineak/cdromctrl.cpp
++++ b/lineak/cdromctrl.cpp
+@@ -51,6 +51,7 @@
+ 
+ #include <stdio.h>
+ #include <errno.h>
++#include <string.h>
+ #include <unistd.h>
+ 
+ }
+
diff --git a/x11-misc/lineakd/lineakd-0.9.0-r1.ebuild b/x11-misc/lineakd/lineakd-0.9.0-r1.ebuild
new file mode 100644
index 000000000000..b3cb416855c4
--- /dev/null
+++ b/x11-misc/lineakd/lineakd-0.9.0-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit eutils multilib
+
+MY_P=${P/.0/}
+
+DESCRIPTION="Linux support for Easy Access and Internet Keyboards features X11 support"
+HOMEPAGE="http://lineak.sourceforge.net"
+SRC_URI="mirror://sourceforge/lineak/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc sparc x86"
+IUSE="debug"
+
+RDEPEND="x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXext"
+DEPEND="${RDEPEND}
+	x11-libs/libxkbfile
+	x11-libs/libXt
+	x11-proto/inputproto
+	x11-proto/xextproto
+	x11-proto/xproto
+	x11-libs/libXtst"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-gcc43.patch \
+		"${FILESDIR}"/${P}-DELL-XPS-M1330-XOrg-1_5.patch
+}
+
+src_configure() {
+	econf $(use_enable debug) --with-x
+}
+
+src_install() {
+	sed -i -e 's:$(DESTDIR)${DESTDIR}:$(DESTDIR):' lineakd/Makefile
+
+	dodir /usr/share/man/man8
+
+	emake -j1 DESTDIR="${D}" install
+	dodoc AUTHORS README TODO
+	keepdir /usr/$(get_libdir)/lineakd/plugins
+
+	insinto /etc/lineak
+	doins lineakd.conf.example lineakd.conf.kde.example
+}
+
+pkg_postinst() {
+	elog
+	elog "evtest utility has not been installed. evtest can be found"
+	elog "in games-util/joystick."
+	elog
+}
diff --git a/x11-misc/lineakd/metadata.xml b/x11-misc/lineakd/metadata.xml
new file mode 100644
index 000000000000..381a9fd5d696
--- /dev/null
+++ b/x11-misc/lineakd/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>desktop-misc</herd>
+	<upstream>
+		<remote-id type="sourceforge">lineak</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-misc/lndir/Manifest b/x11-misc/lndir/Manifest
new file mode 100644
index 000000000000..fbd838853984
--- /dev/null
+++ b/x11-misc/lndir/Manifest
@@ -0,0 +1,2 @@
+DIST lndir-1.0.2.tar.bz2 105950 SHA256 e5130133e2c6e07c63e5f20199fc6581295c24706e9078f4285378eec14728b5
+DIST lndir-1.0.3.tar.bz2 114392 SHA256 49f4fab0de8d418db4ce80dad34e9b879a4199f3e554253a8e1ab68f7c7cb65d
diff --git a/x11-misc/lndir/lndir-1.0.2.ebuild b/x11-misc/lndir/lndir-1.0.2.ebuild
new file mode 100644
index 000000000000..b9eb7d48e6bf
--- /dev/null
+++ b/x11-misc/lndir/lndir-1.0.2.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=3
+
+XORG_STATIC=no
+inherit xorg-2
+
+DESCRIPTION="create a shadow directory of symbolic links to another directory tree"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+		x11-proto/xproto"
diff --git a/x11-misc/lndir/lndir-1.0.3.ebuild b/x11-misc/lndir/lndir-1.0.3.ebuild
new file mode 100644
index 000000000000..0e8cd9692d09
--- /dev/null
+++ b/x11-misc/lndir/lndir-1.0.3.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=3
+
+XORG_STATIC=no
+inherit xorg-2
+
+DESCRIPTION="create a shadow directory of symbolic links to another directory tree"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+		x11-proto/xproto"
diff --git a/x11-misc/lndir/metadata.xml b/x11-misc/lndir/metadata.xml
new file mode 100644
index 000000000000..01c4c004e735
--- /dev/null
+++ b/x11-misc/lndir/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>x11</herd>
+</pkgmetadata>
diff --git a/x11-misc/lsw/Manifest b/x11-misc/lsw/Manifest
new file mode 100644
index 000000000000..c1db6fda5a90
--- /dev/null
+++ b/x11-misc/lsw/Manifest
@@ -0,0 +1 @@
+DIST lsw-0.3.tar.gz 2723 SHA256 0b3f3ce16eef060df6e0d90327ee82593dfd75281347908698747cfa3f8d0655 SHA512 54f5aeb6d17fe23a2e65fbbf4a7622c194e776261a6f0c04ece54fbf212588ec749d5bf5939a6084997f36468339f5373169234c671211a2b7712c408cf883d8 WHIRLPOOL 2b3fcd30ebf466a0ec0b78b3b9995545f0a24c4720076b5692f166ee2e342a87d85969372f830a1fbbf339cdff1545a6d846f029104f94a7ac03db34f5ca6ee8
diff --git a/x11-misc/lsw/lsw-0.3.ebuild b/x11-misc/lsw/lsw-0.3.ebuild
new file mode 100644
index 000000000000..504a7921d8d5
--- /dev/null
+++ b/x11-misc/lsw/lsw-0.3.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit toolchain-funcs
+
+DESCRIPTION="list window names"
+HOMEPAGE="http://tools.suckless.org/lsw"
+SRC_URI="http://dl.suckless.org/tools/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~x86"
+
+RDEPEND="x11-libs/libX11"
+DEPEND="${RDEPEND}
+	x11-proto/xproto"
+
+src_prepare() {
+	sed -i config.mk \
+		-e '/^CC/d' \
+		-e '/^CFLAGS/{s| -Os||;s|=|+=|}' \
+		-e '/^LDFLAGS/{s|=|+=|;s| -s||}' || die
+	sed -i \
+		-e 's|^\t@|\t|g' \
+		-e '/^\techo/d' \
+		Makefile || die
+}
+
+src_compile() {
+	emake CC=$(tc-getCC)
+}
+
+src_install() {
+	doman ${PN}.1
+	dobin ${PN}
+}
diff --git a/x11-misc/lsw/metadata.xml b/x11-misc/lsw/metadata.xml
new file mode 100644
index 000000000000..540f810e069d
--- /dev/null
+++ b/x11-misc/lsw/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>desktop-misc</herd>
+</pkgmetadata>
diff --git a/x11-misc/lxmed/Manifest b/x11-misc/lxmed/Manifest
new file mode 100644
index 000000000000..8485fc89a875
--- /dev/null
+++ b/x11-misc/lxmed/Manifest
@@ -0,0 +1,2 @@
+DIST lxmed-20110717.tar.gz 68514 SHA256 d38645de3f133e3ec9f49cc1c56923fda930a09a33244649f6850147d7f4c74e
+DIST lxmed-20120515.tar.gz 80181 SHA256 156318768dc4440fdf851cb7eeedfa96678382eca05ce52a8766936ab5d10cca
diff --git a/x11-misc/lxmed/lxmed-20110717.ebuild b/x11-misc/lxmed/lxmed-20110717.ebuild
new file mode 100644
index 000000000000..492169e8d73e
--- /dev/null
+++ b/x11-misc/lxmed/lxmed-20110717.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit eutils java-utils-2
+
+DESCRIPTION="freedesktop.org specification compatible menu editor"
+HOMEPAGE="http://lxmed.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.5
+	x11-libs/gksu"
+DEPEND=""
+
+S=${WORKDIR}/${PN}/content
+
+src_prepare() {
+	sed -i -e '/^Icon/s:=.*:=lxmed:' lxmed.desktop || die
+}
+
+src_install() {
+	java-pkg_dojar LXMenuEditor.jar
+	java-pkg_dolauncher lxmed --jar LXMenuEditor.jar
+	doicon lxmed.png
+	domenu lxmed.desktop
+}
diff --git a/x11-misc/lxmed/lxmed-20120515.ebuild b/x11-misc/lxmed/lxmed-20120515.ebuild
new file mode 100644
index 000000000000..83501dfc78c8
--- /dev/null
+++ b/x11-misc/lxmed/lxmed-20120515.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit eutils gnome2-utils java-utils-2
+
+DESCRIPTION="freedesktop.org specification compatible menu editor"
+HOMEPAGE="http://lxmed.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.5
+	x11-libs/gksu"
+DEPEND=""
+
+S=${WORKDIR}/${PN}/content
+
+src_prepare() {
+	sed -i -e '/^Icon/s:=.*:=lxmed:' lxmed.desktop || die
+}
+
+src_install() {
+	java-pkg_dojar LXMenuEditor.jar
+	java-pkg_dolauncher lxmed --jar LXMenuEditor.jar
+
+	insinto /usr/share/icons/hicolor/48x48/apps
+	doins lxmed.png
+
+	domenu lxmed.desktop
+}
+
+pkg_preinst() {	gnome2_icon_savelist; }
+pkg_postinst() { gnome2_icon_cache_update; }
+pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/x11-misc/lxmed/metadata.xml b/x11-misc/lxmed/metadata.xml
new file mode 100644
index 000000000000..09cb6b0857cb
--- /dev/null
+++ b/x11-misc/lxmed/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>desktop-misc</herd>
+  <maintainer>
+    <email>ssuominen@gentoo.org</email>
+    <name>Samuli Suominen</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="sourceforge">lxmed</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/x11-misc/macopix/Manifest b/x11-misc/macopix/Manifest
new file mode 100644
index 000000000000..4f8567f715ad
--- /dev/null
+++ b/x11-misc/macopix/Manifest
@@ -0,0 +1,11 @@
+DIST macopix-1.7.4.tar.bz2 725481 SHA256 cbff49abca2f8709dd27a8705fb54e663b160fa5376eaf2da30f0e9e39c8f669 SHA512 6010f98ecd3aad4325e81f037589cc4e79d857d513687f5243adb6ef3768ace5cddf4f5cdce977a75a4dc769b52bb541bdeefe92cdc012471de950ee81592db7 WHIRLPOOL 765276f6770e0c03332a100f052e44bf01d75b78b817c16cb103c82d13f065ebbbc1c1e6b8661215dc8219763c6f72f846beac478d1f110bf1de0e26a2c99f7b
+DIST macopix-mascot-HxB-euc-ja-0.30.tar.gz 803473 SHA256 3e8ca25e163a97fca12e1a134943a7815e245c779ff88e9444b7af5ee117f4fb SHA512 8897bd6d30fe3372e91d00add2a1af5d7fd7384ce7668aa9b21952d5be863d04c63af8bb98846c59f54a87af3b60acbd008f6c62b68a22038f29a07e7ba19333 WHIRLPOOL dcf76db88af2034a156d5987e6772ad03b0b756c080b9d1423fa8038bc57f14de31b8e2e868c0814eb79c0affd875a1bbef1ecf28065d2a5abb8ca9cf754d0b3
+DIST macopix-mascot-comic_party-euc-ja-1.02.tar.gz 20656 SHA256 3dbdcd20f2f1f99062263b70bcef92e31f81b1e3e6c62ac0de8f71df83cb1983 SHA512 b71a586faef6b878c150e7e8e412c70d8d08919736695108efe2f119aaa01347befcaf222990fbaba10daa57120645e5c77b5534df0e4224feddbaa15c80ecf2 WHIRLPOOL 87f622715dddcb6937ae2685d8324864bde7f67571bd425b2791b46b0d29607466f3a99d43ba7c2187d3929bb5e8fb4382f5282a9935c8eceaa86daf350177a7
+DIST macopix-mascot-cosmos-euc-ja-1.02.tar.gz 329269 SHA256 e39ef6da31f8f8c4c9c8a50fe0e1e00800fe7258b51d1cb4a9b6512962f8a3aa SHA512 05b126b872c7ddf7dfe5b6fdd9654b8f97f6e005d8fa8ad30277a379c333cb0defaad43f9165db4712fc7e4d755fdddd34dce49a99f89c56f4dc951340fc7b1b WHIRLPOOL f13c4652ce7589dd9da4ddbe3b28ee0aa992ac84cbf7cdd7af1b4ab879036ced13cc917c97c59e3d835718dd41ddd7ee14e058f169a4a0072cee62975a136f61
+DIST macopix-mascot-kanon-euc-ja-1.02.tar.gz 451021 SHA256 3b2b1d6cbc5f413404680866e2e4506e6ec081af7f90dfa015f5674c8454729b SHA512 4dca3b0389ea0f305938d0867c06702dd1983e1728751fc09d51d64ec0df4c3389a91e35c113436a45ddbe6f7fb6ba7019f29a88cc118bcc4abcc128cb3a33f7 WHIRLPOOL 0dd4bd9fb4d9507332741fde9b5ca22da78311279046b1eb72e6170ae0291bdac2dc9b54eeb36a0552df02c309e05d8a881a6d71e6f33c25095bebbfdc30cc4b
+DIST macopix-mascot-marimite-euc-ja-2.20.tar.gz 916260 SHA256 dd64c0834032dd37b83dc5f660dc813fcb0c514f3331f942afc61ff483126418 SHA512 15c98e05b6f9139c085464f1286db9eda32ccce180f970684b8eebbd1eab904a7db736fce5a1c8ca48692b7b5b7e407e6d23d9ad03350780d8dfe6fee4b1386c WHIRLPOOL 835df6a4fcd416d83694d63af03daa97a5ad169b0bd746e246158f77505a03e78047e4355fa6a418373ee692da33a6276c1cd984783e8af02ad8f9400801a80e
+DIST macopix-mascot-mizuiro-euc-ja-1.02.tar.gz 187782 SHA256 f57a40f8b107f862162ce40d07f2237670b850af353b4b3ca880e7190e4e104f SHA512 4bd4cb0ad2fab501b76855994e5c92737d110820c2c70ce12a7d7a8b6ea9e28887a0022dc19c3ac1e927f6f90f4097d6cd3b1d9a9954b42311aa71041f2d0596 WHIRLPOOL 8d0a42346dc4644b93902db3cdabb5e29e66faab9f1b5795c10869d35fd7a872da2d2f1a8795c752580515ef146ab99037a6c8c3714af473133fa7b82aaf4ba7
+DIST macopix-mascot-one-euc-ja-1.02.tar.gz 199796 SHA256 d365e516557fd6f3826d9086f7348c3e444256371cac87f901078ece7c118454 SHA512 2344f4734bd13fecb2c1ea1451aa1100ab4145ee7e29ea4730546ffeb4067f3505875d7c5efda5c7f2a2b08ecbe77b0a42d89b51e4e2ae95924eff02a5c0d99e WHIRLPOOL 9cc8aa9460282f3d21ad6f36b57101b6635e0696440ae2bd60384fc0a98383a5c1b78d1f8e18f5b250920a87af440c49735374041c0108ce4b7da776f829e1e4
+DIST macopix-mascot-pia2-euc-ja-1.02.tar.gz 191520 SHA256 b3ae2b2480173673010f91fd0864249e05bd990af9af9fccddd43a2bd829d76b SHA512 4e0177ca699d9e9caea7a9b6f6d81b41a25e1f05f44c9df1ea31578ddb908fcf12e6463bb84f0536ae25df24aca712b17a0d068d74c587671bb202c8441b7f42 WHIRLPOOL a595e13cae427cd283dd25191f40c999b68528cad93e0e0245898bfa24c9cccf216c5745ab6320546850cbf31d603593a6cf579735588d3be45257f8f8b1074e
+DIST macopix-mascot-triangle_heart-euc-ja-1.02.tar.gz 310099 SHA256 5849b6e40a8037e0739b523aed7b597cb2464418bb922d7917dd95c7ed65cdef SHA512 133a3446a3713192ffef84cd381065b2a99db2eb0dd18692d54e7974eb26aa63eef6d051466ddf89152f6baa8e4625ae6e7e975cf944dd12e0b6cc17c56e5673 WHIRLPOOL fe918686dea750b1b7cd8593c0e3c2b48b02dc7fa9fec268d4a00e2bf3011e20659ccd8806f9dd716b16653734d6146b1e9354896bd2a8eded66330c0bd1da9b
+DIST macopix-mascot-tsukihime-euc-ja-1.02.tar.gz 616138 SHA256 6dcf1add046046f45ad9b23ed174b22537e23cfa3686b6bc84f607bd34a7ea8e SHA512 226a175846a1f81a5aeedab6d7b85e38903d3b85a88a4a2c9a91365ba8a149a9ee54d6174bf8c4595cbe6542d3afcebd440a4185402c2139310664059515a2c5 WHIRLPOOL ae946ec2f8d41d4015e0e41f3d636ce336de4bf5b515ef96962ad1a2fed24d6da8316f1bdeb6d303c9f83235d51533aebdab9fae01530f990cbbbe224e719021
diff --git a/x11-misc/macopix/macopix-1.7.4.ebuild b/x11-misc/macopix/macopix-1.7.4.ebuild
new file mode 100644
index 000000000000..d3041a97f936
--- /dev/null
+++ b/x11-misc/macopix/macopix-1.7.4.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+DESCRIPTION="MaCoPiX (Mascot Constructive Pilot for X) is a desktop mascot application on UNIX / X Window system"
+HOMEPAGE="http://rosegray.sakura.ne.jp/macopix/index-e.html"
+
+BASE_URI="http://rosegray.sakura.ne.jp/macopix"
+SRC_URI="${BASE_URI}/${P}.tar.bz2"
+
+# NOTE: These mascots are not redistributable on commercial CD-ROM.
+# The author granted to use them under Gentoo Linux.
+MY_MASCOTS="macopix-mascot-HxB-euc-ja-0.30
+	macopix-mascot-marimite-euc-ja-2.20
+	macopix-mascot-cosmos-euc-ja-1.02
+	macopix-mascot-mizuiro-euc-ja-1.02
+	macopix-mascot-pia2-euc-ja-1.02
+	macopix-mascot-tsukihime-euc-ja-1.02
+	macopix-mascot-triangle_heart-euc-ja-1.02
+	macopix-mascot-comic_party-euc-ja-1.02
+	macopix-mascot-kanon-euc-ja-1.02
+	macopix-mascot-one-euc-ja-1.02"
+
+for i in ${MY_MASCOTS} ; do
+	SRC_URI="${SRC_URI} ${BASE_URI}/${i}.tar.gz"
+done
+
+# programme itself is GPL-2, and mascots are free-noncomm
+LICENSE="GPL-2 free-noncomm"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="gnutls nls"
+
+RDEPEND="x11-libs/gtk+:2
+	dev-libs/glib:2
+	nls? ( >=sys-devel/gettext-0.10 )
+	media-libs/libpng
+	gnutls? ( net-libs/gnutls )
+	!gnutls? ( dev-libs/openssl )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_configure() {
+	export LIBS="-lX11"
+	econf \
+		--with-gtk2 \
+		$(use_enable nls) \
+		$(use_with gnutls) \
+	|| die "econf failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+
+	dodoc AUTHORS ChangeLog* NEWS *README* || die
+
+	# install mascots
+	for d in ${MY_MASCOTS} ; do
+		einfo "Installing ${d}..."
+		cd "${WORKDIR}/${d}" || die
+		insinto /usr/share/"${PN}"
+		for i in *.mcpx *.menu ; do
+			doins "$i" || die
+		done
+		insinto /usr/share/"${PN}"/pixmap
+		for i in *.png ; do
+			doins "$i" || die
+		done
+		docinto "${d}"
+		dodoc README.jp || die
+	done
+}
diff --git a/x11-misc/macopix/metadata.xml b/x11-misc/macopix/metadata.xml
new file mode 100644
index 000000000000..40838bc36783
--- /dev/null
+++ b/x11-misc/macopix/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>desktop-misc</herd>
+</pkgmetadata>
diff --git a/x11-misc/magick-rotation/Manifest b/x11-misc/magick-rotation/Manifest
new file mode 100644
index 000000000000..5079cfb54ecf
--- /dev/null
+++ b/x11-misc/magick-rotation/Manifest
@@ -0,0 +1 @@
+DIST magick-rotation-1.6.2.tar.bz2 103389 SHA256 e0decb8ffb6bd5b8ffd0f01df345f23041abe78cda97fbe7065772260a1a2520 SHA512 40252c4b57d304244f8f7a8b08448cb498efd9044406235f2d728a89c8b4888009c4e7a9f50cbb61b5620336eedf1abb1591e68e94a57b051f4d823acbcdff5f WHIRLPOOL 3aeea34a2a7cbf966a7c0ea3bd13810e2a7a2015bc1f068566ce0515636bcb661e728af6682eea80b39624a3947a8219b9144a296f7c7fe9526d952d21cab49f
diff --git a/x11-misc/magick-rotation/magick-rotation-1.6.2-r1.ebuild b/x11-misc/magick-rotation/magick-rotation-1.6.2-r1.ebuild
new file mode 100644
index 000000000000..ba4a60fb1596
--- /dev/null
+++ b/x11-misc/magick-rotation/magick-rotation-1.6.2-r1.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="xml"
+inherit eutils python-single-r1 toolchain-funcs udev user versionator
+
+MY_PV=$(get_version_component_range 1-2)
+
+DESCRIPTION="Application that rotates tablet pc's screen automatically, depending on orientation"
+HOMEPAGE="https://launchpad.net/magick-rotation"
+SRC_URI="http://launchpad.net/magick-rotation/trunk/${MY_PV}/+download/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+
+DEPEND="${PYTHON_DEPS}
+	x11-libs/libX11
+	x11-libs/libXrandr"
+
+RDEPEND="${DEPEND}
+	dev-python/pygobject:2[${PYTHON_USEDEP}]
+	dev-python/pygtk:2[${PYTHON_USEDEP}]
+	dev-python/py-notify[${PYTHON_USEDEP}]
+	x11-apps/xinput"
+
+# there are no tests in package, default 'make check' does wrong things, bug #453672
+RESTRICT="test"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	enewgroup magick
+}
+
+src_prepare() {
+	# Remove unneeded files
+	rm -r apt_* installer_gtk.py MAGICK-INSTALL gset_addkeyval.py MagickIcons/MagickSplash.png MagickUninstall || die 'removing unneeded files failed'
+
+	# Fix Python shebangs
+	python_fix_shebang "${S}"
+
+	epatch_user
+}
+
+src_compile() {
+	my_compile() {
+		echo $(tc-getCC) $*
+		$(tc-getCC) $* || die 'compilation failed'
+	}
+
+	local suffix=
+	if use amd64; then
+		suffix=64
+	else
+		suffix=32
+	fi
+	my_compile "${CFLAGS} ${LDFLAGS} check.c -lX11 -lXrandr -o checkmagick${suffix}"
+}
+
+src_install() {
+	#TODO: add installation of GNOME Shell 3.2 extension
+	dobin	checkmagick*
+
+	udev_dorules 62-magick.rules
+
+	insinto	/usr/share/${PN}
+	doins	*.py
+
+	insinto	/usr/share/${PN}/MagickIcons
+	doins	MagickIcons/*.png
+
+	exeinto /usr/share/${PN}
+	doexe	magick-rotation
+	doexe	xrotate.py
+
+	dodoc *.txt ChangeLog
+
+	make_desktop_entry /usr/share/${PN}/${PN} "Magick Rotation" /usr/share/${PN}/MagickIcons/magick-rotation-enabled.png "System;Utility;"
+}
+
+pkg_postinst() {
+	optfeature() {
+		elog "  [\e[1m$(has_version ${1} && echo I || echo ' ')\e[0m] ${1} (${2})"
+	}
+
+	elog
+	elog "In order to use Magick Rotation with an on-screen keyboard and handwriting,"
+	elog "the following additional package may also be installed for use at run-time:"
+	elog
+	optfeature 'media-gfx/cellwriter' "Magick Rotation's default onscreen keyboard"
+	elog
+
+	ewarn "in order to use Magick Rotation you have to be in the 'magick' group."
+	ewarn "Just run 'gpasswd -a <USER> magick', then have <USER> re-login."
+}
diff --git a/x11-misc/magick-rotation/metadata.xml b/x11-misc/magick-rotation/metadata.xml
new file mode 100644
index 000000000000..7e1cd0d686a6
--- /dev/null
+++ b/x11-misc/magick-rotation/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>proxy-maintainers</herd>
+	<maintainer>
+		<email>evadim@evadim.ru</email>
+		<name>Vadim Efimov</name>
+		<description>Maintainer. Assign bugs to him</description>
+	</maintainer>
+	<maintainer>
+		<email>pinkbyte@gentoo.org</email>
+		<name>Sergey Popov</name>
+		<description>Proxy maintainer. CC him on bugs</description>
+	</maintainer>
+	<upstream>
+		<remote-id type="launchpad">magick-rotation</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-misc/magneto-gtk/Manifest b/x11-misc/magneto-gtk/Manifest
new file mode 100644
index 000000000000..520d012e476c
--- /dev/null
+++ b/x11-misc/magneto-gtk/Manifest
@@ -0,0 +1 @@
+DIST entropy-254.tar.bz2 18516662 SHA256 5e411472eaf7016a68a4aa81ef92dd3aad8403fc65a0ffb09c57b91c959ca3a6 SHA512 3b3e82abad8008720e370b7892b7be1c48aaa6605914db977f68b9a108ada0a4adbaa5b7b50a9a02ba9c8b0bdefadcda1eceee2c7c2abc385b3daf669649e2da WHIRLPOOL 593469b858707e4ceca56146fa1d608141e44dda0a0921ed6a3ec566878c1e3c153410233f088d57db4f8bd9d1c796bd945cbea3ba455572efc05eca42023ce5
diff --git a/x11-misc/magneto-gtk/magneto-gtk-254.ebuild b/x11-misc/magneto-gtk/magneto-gtk-254.ebuild
new file mode 100644
index 000000000000..d367b5fbdfc5
--- /dev/null
+++ b/x11-misc/magneto-gtk/magneto-gtk-254.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils python-single-r1
+
+DESCRIPTION="Entropy Package Manager notification applet GTK2 frontend"
+HOMEPAGE="http://www.sabayon.org"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+SRC_URI="mirror://sabayon/sys-apps/entropy-${PV}.tar.bz2"
+S="${WORKDIR}/entropy-${PV}/magneto"
+
+DEPEND="${PYTHON_DEPS}"
+RDEPEND="~app-misc/magneto-loader-${PV}[${PYTHON_USEDEP}]
+	dev-python/notify-python
+	dev-python/pygtk:2
+	${DEPEND}"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+src_install() {
+	emake DESTDIR="${D}" LIBDIR="usr/lib" magneto-gtk-install || die "make install failed"
+
+	python_optimize "${D}/usr/lib/entropy/magneto/magneto/gtk"
+}
diff --git a/x11-misc/magneto-gtk/metadata.xml b/x11-misc/magneto-gtk/metadata.xml
new file mode 100644
index 000000000000..187f7a710efe
--- /dev/null
+++ b/x11-misc/magneto-gtk/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>lxnay@gentoo.org</email>
+		<name>Fabio Erculiani</name>
+	</maintainer>
+	<use>
+	</use>
+</pkgmetadata>
+
diff --git a/x11-misc/magneto-gtk3/Manifest b/x11-misc/magneto-gtk3/Manifest
new file mode 100644
index 000000000000..520d012e476c
--- /dev/null
+++ b/x11-misc/magneto-gtk3/Manifest
@@ -0,0 +1 @@
+DIST entropy-254.tar.bz2 18516662 SHA256 5e411472eaf7016a68a4aa81ef92dd3aad8403fc65a0ffb09c57b91c959ca3a6 SHA512 3b3e82abad8008720e370b7892b7be1c48aaa6605914db977f68b9a108ada0a4adbaa5b7b50a9a02ba9c8b0bdefadcda1eceee2c7c2abc385b3daf669649e2da WHIRLPOOL 593469b858707e4ceca56146fa1d608141e44dda0a0921ed6a3ec566878c1e3c153410233f088d57db4f8bd9d1c796bd945cbea3ba455572efc05eca42023ce5
diff --git a/x11-misc/magneto-gtk3/magneto-gtk3-254.ebuild b/x11-misc/magneto-gtk3/magneto-gtk3-254.ebuild
new file mode 100644
index 000000000000..7092a18e8201
--- /dev/null
+++ b/x11-misc/magneto-gtk3/magneto-gtk3-254.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils python-single-r1
+
+DESCRIPTION="Entropy Package Manager notification applet GTK3 frontend"
+HOMEPAGE="http://www.sabayon.org"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+SRC_URI="mirror://sabayon/sys-apps/entropy-${PV}.tar.bz2"
+S="${WORKDIR}/entropy-${PV}/magneto"
+
+DEPEND="${PYTHON_DEPS}"
+RDEPEND="${DEPEND}
+	~app-misc/magneto-loader-${PV}[${PYTHON_USEDEP}]
+	dev-libs/gobject-introspection
+	x11-libs/gdk-pixbuf[introspection]
+	x11-libs/gtk+:3[introspection]
+	x11-libs/libnotify[introspection]"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+src_install() {
+	emake DESTDIR="${D}" LIBDIR="usr/lib" magneto-gtk3-install || die "make install failed"
+	python_optimize "${D}/usr/lib/entropy/magneto/magneto/gtk3"
+}
diff --git a/x11-misc/magneto-gtk3/metadata.xml b/x11-misc/magneto-gtk3/metadata.xml
new file mode 100644
index 000000000000..187f7a710efe
--- /dev/null
+++ b/x11-misc/magneto-gtk3/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>lxnay@gentoo.org</email>
+		<name>Fabio Erculiani</name>
+	</maintainer>
+	<use>
+	</use>
+</pkgmetadata>
+
diff --git a/x11-misc/makedepend/Manifest b/x11-misc/makedepend/Manifest
new file mode 100644
index 000000000000..b309a6ae2897
--- /dev/null
+++ b/x11-misc/makedepend/Manifest
@@ -0,0 +1,3 @@
+DIST makedepend-1.0.3.tar.bz2 123703 SHA256 3a251d30e567e4eab109be486918887635e08963195b80d193f0ee65cef8b737 SHA512 343154fd938c1e649813546d21771183605db95f853606bf8a2934b36afe700659d4aa03fd2148a7b543d52fd68e03bf8400f817012371905243d62f44b0ba8a WHIRLPOOL c5eaa89802a52a51361160bb42d57400454349b58925629c0f48e816c0da2543b2b11a4c7444f602416d3c43900f79cbb641a76f8e67af2b208879e0d3fcd6a2
+DIST makedepend-1.0.4.tar.bz2 131683 SHA256 ab56b8aeee00ed78d93c57d102e33ef4e6828ef5edd7108574966ed7d212f7fe SHA512 b4e276847deed9f52b86d89e4b14b5521aabc409fabb840aaaec6097fae2284be3c0f723b60e77267b6bea37c24ea8ad84afb81c4104e5f22049810e9ad6802e WHIRLPOOL 7ed33d22fdcfd9fe4ada740b2e842815cc6349e19672311857f3a63f38204cb050b1c3e857834dfde9af1515759f15a9b31150eac75b56485f1fec215bcd5322
+DIST makedepend-1.0.5.tar.bz2 143498 SHA256 f7a80575f3724ac3d9b19eaeab802892ece7e4b0061dd6425b4b789353e25425 SHA512 e28d71c3ce4f74ca6479771fcdd123c19ab18e3f2aa690a7798237f21f13fca4c4d66d7b7b1d708c2c214b8e17f8fe37e6cf5b75a4d2b88514c50addea2600cb WHIRLPOOL cf5bc215e427030967ede94db201a12d2da1fdbcdb2ae85e9aeecc3f68cd0337193af49a599275943e047d84d103b45612e64431a5b4168e6dc00f254a16182d
diff --git a/x11-misc/makedepend/makedepend-1.0.3.ebuild b/x11-misc/makedepend/makedepend-1.0.3.ebuild
new file mode 100644
index 000000000000..20597a52538b
--- /dev/null
+++ b/x11-misc/makedepend/makedepend-1.0.3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=3
+XORG_STATIC=no
+inherit xorg-2
+
+DESCRIPTION="create dependencies in makefiles"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	x11-proto/xproto"
diff --git a/x11-misc/makedepend/makedepend-1.0.4.ebuild b/x11-misc/makedepend/makedepend-1.0.4.ebuild
new file mode 100644
index 000000000000..fcc014e07ec5
--- /dev/null
+++ b/x11-misc/makedepend/makedepend-1.0.4.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+XORG_STATIC=no
+inherit xorg-2
+
+DESCRIPTION="create dependencies in makefiles"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	x11-proto/xproto"
diff --git a/x11-misc/makedepend/makedepend-1.0.5.ebuild b/x11-misc/makedepend/makedepend-1.0.5.ebuild
new file mode 100644
index 000000000000..5cb7f8a14a8d
--- /dev/null
+++ b/x11-misc/makedepend/makedepend-1.0.5.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+XORG_STATIC=no
+inherit xorg-2
+
+DESCRIPTION="create dependencies in makefiles"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	x11-proto/xproto"
diff --git a/x11-misc/makedepend/metadata.xml b/x11-misc/makedepend/metadata.xml
new file mode 100644
index 000000000000..01c4c004e735
--- /dev/null
+++ b/x11-misc/makedepend/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>x11</herd>
+</pkgmetadata>
diff --git a/x11-misc/matchbox-keyboard/Manifest b/x11-misc/matchbox-keyboard/Manifest
new file mode 100644
index 000000000000..aad6989df829
--- /dev/null
+++ b/x11-misc/matchbox-keyboard/Manifest
@@ -0,0 +1 @@
+DIST matchbox-keyboard-0.1.tar.bz2 103222 SHA256 682614fa3682c4bd31e26b6f76e04bb579c2e70dbf060083e20077f4e93fb4b3
diff --git a/x11-misc/matchbox-keyboard/matchbox-keyboard-0.1.ebuild b/x11-misc/matchbox-keyboard/matchbox-keyboard-0.1.ebuild
new file mode 100644
index 000000000000..73fadd2f8d64
--- /dev/null
+++ b/x11-misc/matchbox-keyboard/matchbox-keyboard-0.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="2"
+
+inherit versionator eutils
+
+DESCRIPTION="Matchbox-keyboard is an on screen 'virtual' or 'software' keyboard"
+HOMEPAGE="http://matchbox-project.org/"
+SRC_URI="http://matchbox-project.org/sources/${PN}/$(get_version_component_range 1-2)/${P}.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="amd64 ~arm ~hppa ppc x86"
+IUSE="debug cairo"
+
+DEPEND="x11-libs/libfakekey
+	cairo? ( x11-libs/cairo[X] )
+	!cairo? ( x11-libs/libXft )"
+
+src_configure() {
+	econf	$(use_enable debug) \
+		$(use_enable cairo) \
+		|| die "Configuration failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "Installation failed"
+
+	dodoc AUTHORS ChangeLog INSTALL NEWS README
+}
diff --git a/x11-misc/matchbox-keyboard/metadata.xml b/x11-misc/matchbox-keyboard/metadata.xml
new file mode 100644
index 000000000000..6a17403e0ad0
--- /dev/null
+++ b/x11-misc/matchbox-keyboard/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>gpe</herd>
+</pkgmetadata>
diff --git a/x11-misc/matchbox-panel-manager/Manifest b/x11-misc/matchbox-panel-manager/Manifest
new file mode 100644
index 000000000000..7861f41c3cac
--- /dev/null
+++ b/x11-misc/matchbox-panel-manager/Manifest
@@ -0,0 +1 @@
+DIST matchbox-panel-manager-0.1.tar.bz2 64068 SHA256 32136aaaf66ff0083158476707f69aa5ee128bc4b3bd62a2be9f9db2dc5804b6
diff --git a/x11-misc/matchbox-panel-manager/matchbox-panel-manager-0.1.ebuild b/x11-misc/matchbox-panel-manager/matchbox-panel-manager-0.1.ebuild
new file mode 100644
index 000000000000..533086298ad8
--- /dev/null
+++ b/x11-misc/matchbox-panel-manager/matchbox-panel-manager-0.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=1
+
+inherit versionator
+
+DESCRIPTION="Matchbox panel configuration utility"
+HOMEPAGE="http://matchbox-project.org/"
+SRC_URI="http://matchbox-project.org/sources/${PN}/$(get_version_component_range 1-2)/${P}.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="amd64 ~arm ~hppa ppc x86"
+IUSE=""
+
+DEPEND=">=x11-libs/libmatchbox-1.5
+	x11-libs/gtk+:2"
+
+RDEPEND="${DEPEND}
+	x11-wm/matchbox-panel"
+
+src_compile() {
+	econf || die "Configuration failed"
+
+	emake || die "Compilation failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "Installation failed"
+
+	dodoc AUTHORS ChangeLog INSTALL NEWS README
+}
diff --git a/x11-misc/matchbox-panel-manager/metadata.xml b/x11-misc/matchbox-panel-manager/metadata.xml
new file mode 100644
index 000000000000..6a17403e0ad0
--- /dev/null
+++ b/x11-misc/matchbox-panel-manager/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>gpe</herd>
+</pkgmetadata>
diff --git a/x11-misc/mate-notification-daemon/Manifest b/x11-misc/mate-notification-daemon/Manifest
new file mode 100644
index 000000000000..7cd357b12949
--- /dev/null
+++ b/x11-misc/mate-notification-daemon/Manifest
@@ -0,0 +1,2 @@
+DIST mate-notification-daemon-1.8.0.tar.xz 301228 SHA256 21f29513efdbc97ab87e7813bb81c2d23038f5c49a57f55107316f99ae79cfb0 SHA512 a37fe85998b18148eb1dcf4f96a6a18a8f2b9acdbeaf356decc41b220e8db58db914cd1f2ff665081061e63119773445d9fb874c19ab8fd5396fc7b927f6267d WHIRLPOOL fc7a093b558745bcceee708fdf6ad24df41ebbc2beebc41b742b59e7ef1b2c9b59a9daea4166c7713264e5a2c804e63e5f9bf17aadaba718c1e94a3977a55744
+DIST mate-notification-daemon-1.8.1.tar.xz 300984 SHA256 322b0f461d0972536916191481ee8f71b94c9534049498617c78218c9ce792a6 SHA512 45d9d8e95628a4ea384335a2293c85cda3177676acf6b4d3ee877f85f7b631c8f19429884017414f6882c4b6dcb32a1c2dbeb3bebaee8f8ab3107003bf3c9d92 WHIRLPOOL 4c88feacefd6e1f5b741e19694f8c17e83ff0963340b4f6a90bec07d532608e39ad617f41d5301e703dc3c3326021062edd748a44899e61905cabd1173b86120
diff --git a/x11-misc/mate-notification-daemon/mate-notification-daemon-1.8.0.ebuild b/x11-misc/mate-notification-daemon/mate-notification-daemon-1.8.0.ebuild
new file mode 100644
index 000000000000..54df139aa68a
--- /dev/null
+++ b/x11-misc/mate-notification-daemon/mate-notification-daemon-1.8.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2 versionator
+
+MATE_BRANCH="$(get_version_component_range 1-2)"
+
+SRC_URI="http://pub.mate-desktop.org/releases/${MATE_BRANCH}/${P}.tar.xz"
+DESCRIPTION="MATE Notification daemon"
+HOMEPAGE="http://mate-desktop.org"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+RDEPEND="
+	dev-libs/atk:0
+	>=dev-libs/dbus-glib-0.78:0
+	>=dev-libs/glib-2.18:2
+	>=media-libs/libcanberra-0.4:0[gtk]
+	>=sys-apps/dbus-1:0
+	x11-libs/cairo:0
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-2.18:2
+	>=x11-libs/libnotify-0.7:0
+	x11-libs/libX11:0
+	>=x11-libs/libwnck-1:1
+	virtual/libintl:0
+	!x11-misc/notify-osd:*
+	!x11-misc/qtnotifydaemon:*
+	!x11-misc/notification-daemon:*"
+
+DEPEND="${RDEPEND}
+	app-arch/xz-utils:0
+	>=dev-util/intltool-0.40:*
+	sys-devel/gettext:*
+	>=sys-devel/libtool-2.2.6:2
+	virtual/pkgconfig:*"
+
+DOCS=( AUTHORS ChangeLog NEWS )
+
+src_install() {
+	gnome2_src_install
+
+	cat <<-EOF > "${T}/org.freedesktop.Notifications.service"
+	[D-BUS Service]
+	Name=org.freedesktop.Notifications
+	Exec=/usr/libexec/mate-notification-daemon
+	EOF
+
+	insinto /usr/share/dbus-1/services
+	doins "${T}/org.freedesktop.Notifications.service"
+}
diff --git a/x11-misc/mate-notification-daemon/mate-notification-daemon-1.8.1.ebuild b/x11-misc/mate-notification-daemon/mate-notification-daemon-1.8.1.ebuild
new file mode 100644
index 000000000000..149190eefe3e
--- /dev/null
+++ b/x11-misc/mate-notification-daemon/mate-notification-daemon-1.8.1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2 versionator
+
+MATE_BRANCH="$(get_version_component_range 1-2)"
+
+SRC_URI="http://pub.mate-desktop.org/releases/${MATE_BRANCH}/${P}.tar.xz"
+DESCRIPTION="MATE Notification daemon"
+HOMEPAGE="http://mate-desktop.org"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-libs/atk:0
+	>=dev-libs/dbus-glib-0.78:0
+	>=dev-libs/glib-2.18:2
+	>=media-libs/libcanberra-0.4:0[gtk]
+	>=sys-apps/dbus-1:0
+	x11-libs/cairo:0
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-2.18:2
+	>=x11-libs/libnotify-0.7:0
+	x11-libs/libX11:0
+	>=x11-libs/libwnck-1:1
+	virtual/libintl:0
+	!x11-misc/notify-osd:*
+	!x11-misc/qtnotifydaemon:*
+	!x11-misc/notification-daemon:*"
+
+DEPEND="${RDEPEND}
+	app-arch/xz-utils:0
+	>=dev-util/intltool-0.40:*
+	sys-devel/gettext:*
+	>=sys-devel/libtool-2.2.6:2
+	virtual/pkgconfig:*"
+
+DOCS=( AUTHORS ChangeLog NEWS )
+
+src_install() {
+	gnome2_src_install
+
+	cat <<-EOF > "${T}/org.freedesktop.Notifications.service"
+	[D-BUS Service]
+	Name=org.freedesktop.Notifications
+	Exec=/usr/libexec/mate-notification-daemon
+	EOF
+
+	insinto /usr/share/dbus-1/services
+	doins "${T}/org.freedesktop.Notifications.service"
+}
diff --git a/x11-misc/mate-notification-daemon/metadata.xml b/x11-misc/mate-notification-daemon/metadata.xml
new file mode 100644
index 000000000000..504b80a3baa5
--- /dev/null
+++ b/x11-misc/mate-notification-daemon/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+    <herd>mate</herd>
+    <upstream>
+        <remote-id type="github">mate-desktop/mate-notification-daemon</remote-id>
+    </upstream>
+</pkgmetadata>
diff --git a/x11-misc/menulibre/Manifest b/x11-misc/menulibre/Manifest
new file mode 100644
index 000000000000..40af0a788e97
--- /dev/null
+++ b/x11-misc/menulibre/Manifest
@@ -0,0 +1,2 @@
+DIST menulibre_13.01.4.tar.gz 322686 SHA256 2329b426af55936dc40c7d1bcae99f98b674d06e3757657bd47dcb93d1ac45f3 SHA512 c3311443d00901d0c80078e4f51f81cc2bafbb8048a8eb1f0594e4430e9d8d1c563f4ec6b423952d3e8523f921220bb9d6fa0e4a62453d07011ae781070750d4 WHIRLPOOL b419f3285a97918796c08d0cb7681ada8f6bd19297bdfaea603c2e6256c06d775369d683f150f9c708d26ff2220fceb97d37541143bbcd9d08387e5ebd2967d5
+DIST menulibre_13.04.17.tar.gz 337166 SHA256 84cd21d92bb16cc221d7fa7ebf801a7493cce8743dd15b65d72af23d4b421a99 SHA512 7e0a2c3d765612a1c9ae9f82206fc180d7edc06dbe294bd200d699ecdb243a28ba58030b94084bc0525540f514642914b4224d766d4c9817ee7ee9ac9074b627 WHIRLPOOL d8d87c4180623a956f3c799b506c8718f1b42dcc7554df20d7e21b612f3134451250f5e5b07db0f672df40b1478b8e4189be94ea1850a8008800fe5c07ad051c
diff --git a/x11-misc/menulibre/files/menulibre-13.01.4-GError-import.patch b/x11-misc/menulibre/files/menulibre-13.01.4-GError-import.patch
new file mode 100644
index 000000000000..6a747ba07fb8
--- /dev/null
+++ b/x11-misc/menulibre/files/menulibre-13.01.4-GError-import.patch
@@ -0,0 +1,17 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Mon Oct 21 17:32:25 UTC 2013
+Subject: fix import
+
+https://bugs.gentoo.org/show_bug.cgi?id=488866
+
+--- a/menulibre_lib/IconTheme.py
++++ b/menulibre_lib/IconTheme.py
+@@ -15,7 +15,7 @@
+ ### END LICENSE
+ 
+ from gi.repository import Gtk, GdkPixbuf
+-from gi._glib import GError
++from gi._glib._glib import GError
+ import os
+ 
+ from menulibreconfig import get_data_file
diff --git a/x11-misc/menulibre/menulibre-13.01.4-r1.ebuild b/x11-misc/menulibre/menulibre-13.01.4-r1.ebuild
new file mode 100644
index 000000000000..6b072656cbc7
--- /dev/null
+++ b/x11-misc/menulibre/menulibre-13.01.4-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="xml"
+DISTUTILS_IN_SOURCE_BUILD=1
+inherit eutils gnome2-utils distutils-r1
+
+DESCRIPTION="An advanced menu editor that provides modern features in a clean, easy-to-use interface"
+HOMEPAGE="http://www.smdavis.us/projects/menulibre/"
+SRC_URI="http://launchpad.net/${PN}/trunk/${PV}/+download/${PN}_${PV}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/python-distutils-extra[${PYTHON_USEDEP}]"
+RDEPEND="dev-libs/gobject-introspection
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	x11-libs/gdk-pixbuf[X,introspection]
+	x11-libs/gtk+:3[X,introspection]
+	x11-themes/hicolor-icon-theme"
+
+PATCHES=( "${FILESDIR}"/${P}-GError-import.patch )
+
+S=${WORKDIR}/${PN}
+
+python_prepare_all() {
+	# too many categories
+	sed -i \
+		-e 's/X-GNOME-Settings-Panel;X-GNOME-PersonalSettings;DesktopSettings;X-XFCE;//' \
+		menulibre.desktop.in || die 'sed on menulibre.desktop.in failed'
+
+	local i
+	# fix incorrect behavior when LINGUAS is set to an empty string
+	# https://bugs.launchpad.net/python-distutils-extra/+bug/1133594
+	if [[ -n "${LINGUAS+x}" ]] ; then # if LINGUAS is set
+		for i in $(cd "${S}"/po ; for p in *.po ; do echo ${p%.po} ; done) ; do # for every supported language
+			if ! has ${i} ${LINGUAS} ; then # if language is disabled
+				rm po/${i}.po || die
+			fi
+		done
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	newicon -s 32 help/C/figures/icon.png menu-editor.png
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	elog "optional dependencies:"
+	elog "  gnome-extra/yelp (view help contents)"
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/x11-misc/menulibre/menulibre-13.01.4.ebuild b/x11-misc/menulibre/menulibre-13.01.4.ebuild
new file mode 100644
index 000000000000..a8552d4aa89f
--- /dev/null
+++ b/x11-misc/menulibre/menulibre-13.01.4.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="xml"
+DISTUTILS_IN_SOURCE_BUILD=1
+inherit eutils gnome2-utils distutils-r1
+
+DESCRIPTION="An advanced menu editor that provides modern features in a clean, easy-to-use interface"
+HOMEPAGE="http://www.smdavis.us/projects/menulibre/"
+SRC_URI="http://launchpad.net/${PN}/trunk/${PV}/+download/${PN}_${PV}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND="dev-python/python-distutils-extra[${PYTHON_USEDEP}]"
+RDEPEND="dev-libs/gobject-introspection
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	x11-libs/gdk-pixbuf[X,introspection]
+	x11-libs/gtk+:3[X,introspection]
+	x11-themes/hicolor-icon-theme"
+
+S=${WORKDIR}/${PN}
+
+python_prepare_all() {
+	# too many categories
+	sed -i \
+		-e 's/X-GNOME-Settings-Panel;X-GNOME-PersonalSettings;DesktopSettings;X-XFCE;//' \
+		menulibre.desktop.in || die 'sed on menulibre.desktop.in failed'
+
+	local i
+	# fix incorrect behavior when LINGUAS is set to an empty string
+	# https://bugs.launchpad.net/python-distutils-extra/+bug/1133594
+	if [[ -n "${LINGUAS+x}" ]] ; then # if LINGUAS is set
+		for i in $(cd "${S}"/po ; for p in *.po ; do echo ${p%.po} ; done) ; do # for every supported language
+			if ! has ${i} ${LINGUAS} ; then # if language is disabled
+				rm po/${i}.po || die
+			fi
+		done
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	newicon -s 32 help/C/figures/icon.png menu-editor.png
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	elog "optional dependencies: gnome-extra/yelp (view help contents)"
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/x11-misc/menulibre/menulibre-13.04.17.ebuild b/x11-misc/menulibre/menulibre-13.04.17.ebuild
new file mode 100644
index 000000000000..8bb71d8b1bf4
--- /dev/null
+++ b/x11-misc/menulibre/menulibre-13.04.17.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="xml"
+DISTUTILS_IN_SOURCE_BUILD=1
+inherit eutils gnome2-utils distutils-r1
+
+DESCRIPTION="An advanced menu editor that provides modern features in a clean, easy-to-use interface"
+HOMEPAGE="http://www.smdavis.us/projects/menulibre/"
+SRC_URI="http://launchpad.net/${PN}/trunk/${PV}/+download/${PN}_${PV}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/python-distutils-extra[${PYTHON_USEDEP}]"
+RDEPEND="dev-libs/gobject-introspection
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	dev-python/pyxdg[${PYTHON_USEDEP}]
+	x11-libs/gdk-pixbuf[X,introspection]
+	x11-libs/gtk+:3[X,introspection]
+	x11-libs/gtksourceview:3.0[introspection]
+	x11-themes/hicolor-icon-theme"
+
+S=${WORKDIR}/trunk
+
+python_prepare_all() {
+	# too many categories
+	sed -i \
+		-e 's/X-GNOME-Settings-Panel;X-GNOME-PersonalSettings;DesktopSettings;X-XFCE;//' \
+		menulibre.desktop.in || die 'sed on menulibre.desktop.in failed'
+
+	local i
+	# fix incorrect behavior when LINGUAS is set to an empty string
+	# https://bugs.launchpad.net/python-distutils-extra/+bug/1133594
+	if [[ -n "${LINGUAS+x}" ]] ; then # if LINGUAS is set
+		for i in $(cd "${S}"/po ; for p in *.po ; do echo ${p%.po} ; done) ; do # for every supported language
+			if ! has ${i} ${LINGUAS} ; then # if language is disabled
+				rm po/${i}.po || die
+			fi
+		done
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	newicon -s 32 help/C/figures/icon.png menu-editor.png
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	elog "optional dependencies:"
+	elog "  gnome-extra/yelp (view help contents)"
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/x11-misc/menulibre/metadata.xml b/x11-misc/menulibre/metadata.xml
new file mode 100644
index 000000000000..15139ff6b48f
--- /dev/null
+++ b/x11-misc/menulibre/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>desktop-misc</herd>
+	<upstream>
+		<remote-id type="launchpad">menulibre</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-misc/menumaker/Manifest b/x11-misc/menumaker/Manifest
new file mode 100644
index 000000000000..c4330876aa9b
--- /dev/null
+++ b/x11-misc/menumaker/Manifest
@@ -0,0 +1 @@
+DIST menumaker-0.99.7.tar.gz 138857 SHA256 dc319aa063aa8ec017af3f736cc6e4f7578e145289976c109a4cb19df3b3c445
diff --git a/x11-misc/menumaker/menumaker-0.99.7.ebuild b/x11-misc/menumaker/menumaker-0.99.7.ebuild
new file mode 100644
index 000000000000..a0f6bfa48dad
--- /dev/null
+++ b/x11-misc/menumaker/menumaker-0.99.7.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="3"
+PYTHON_DEPEND="2"
+
+inherit multilib python
+
+DESCRIPTION="Utility that scans through the system and generates a menu of installed programs"
+HOMEPAGE="http://menumaker.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86 ~x86-fbsd"
+IUSE="doc"
+
+DEPEND="doc? ( sys-apps/texinfo )"
+RDEPEND=""
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_configure() {
+	econf PYTHON="$(PYTHON)"
+}
+
+src_compile() {
+	emake -j1 || die "emake failed"
+
+	if use doc; then
+		cd doc
+		emake html || die "Generation of documentation failed"
+	fi
+}
+
+src_install() {
+	emake -j1 DESTDIR="${D}" install || die "emake install failed"
+	python_need_rebuild
+
+	find "${D}" "(" -name "*.pyc" -o -name "*.pyo" ")" -print0 | xargs -0 rm -fr
+
+	dodoc ChangeLog README NEWS AUTHORS INSTALL
+
+	if use doc; then
+		dohtml doc/mmaker.html/*
+	fi
+}
+
+pkg_postinst() {
+	python_mod_optimize /usr/$(get_libdir)/menumaker
+}
+
+pkg_postrm() {
+	python_mod_cleanup /usr/$(get_libdir)/menumaker
+}
diff --git a/x11-misc/menumaker/metadata.xml b/x11-misc/menumaker/metadata.xml
new file mode 100644
index 000000000000..97202cc660ab
--- /dev/null
+++ b/x11-misc/menumaker/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>python</herd>
+	<upstream>
+		<remote-id type="sourceforge">menumaker</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-misc/metadata.xml b/x11-misc/metadata.xml
new file mode 100644
index 000000000000..dfa319ee8104
--- /dev/null
+++ b/x11-misc/metadata.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<catmetadata>
+	<longdescription lang="en">
+		The x11-misc category contains miscellaneous X11 applications which do
+		not belong elsewhere.
+	</longdescription>
+	<longdescription lang="de">
+		Die Kategorie x11-misc enthält verschiedene X11-Applikationen die sich
+		nicht anderweitig einordnen lassen.
+	</longdescription>
+	<longdescription lang="es">
+		La categoría x11-misc contiene aplicaciones mixtas de X11 que no
+		pertenecen a ninguna otra categoría.
+	</longdescription>
+	<longdescription lang="ja">
+		x11-miscカテゴリーには他のカテゴリーに分類されなかった
+		多種多様なX11アプリケーションが含まれて>います。
+	</longdescription>
+	<longdescription lang="nl">
+		De categorie x11-misc bevat allerlei X11-applicaties die niet in andere
+		categorieën thuishoren.
+	</longdescription>
+	<longdescription lang="vi">
+		Nhóm x11-misc chứa các ứng dụng X11 không thuộc vào nơi nào khác.
+	</longdescription>
+	<longdescription lang="sk">
+		Kategória x11-misc obsahuje rôzne aplikácie pre X11, ktoré nie sú
+		zaradené do iných kategórií.
+	</longdescription>
+	<longdescription lang="it">
+		La categoria x11-misc contiene applicazioni miste per X11 che non appartengono ad altre categorie.
+	</longdescription>
+	<longdescription lang="pt">
+		A categoria x11-misc contém aplicações mistas de X11 que não
+		pertencem a outras categorias.
+	</longdescription>
+	<longdescription lang="pl">
+		Kategoria x11-misc zawiera aplikacje dla X11, które nie pasują do żadnej
+		z pozostałych kategorii.
+	</longdescription>
+</catmetadata>
+
diff --git a/x11-misc/mgm/Manifest b/x11-misc/mgm/Manifest
new file mode 100644
index 000000000000..1338ba708b26
--- /dev/null
+++ b/x11-misc/mgm/Manifest
@@ -0,0 +1 @@
+DIST mgm-1.2.tgz 905812 SHA256 097e046528b0933f5be5071944bf3368892c9fb98144c111be38e948fe1f0356 SHA512 70384a4f982771788d863b1531a3541f1c83d312073bd3b84bf38ca0a764d0072cb64ead2916105b8a84cb9110c65ddae730babc27d4c7635e99ad3ded9561cc WHIRLPOOL 8af89415a5ff07ddb31a3e2c4617d80a71d5286b5483dbc8cfbd76fd7f799803ace95a5266169e361a36abed5b7eb78e92efb647c21251c2759b1f77df60ed9c
diff --git a/x11-misc/mgm/metadata.xml b/x11-misc/mgm/metadata.xml
new file mode 100644
index 000000000000..731225048652
--- /dev/null
+++ b/x11-misc/mgm/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>desktop-misc</herd>
+</pkgmetadata>
diff --git a/x11-misc/mgm/mgm-1.2.ebuild b/x11-misc/mgm/mgm-1.2.ebuild
new file mode 100644
index 000000000000..d7a20158231a
--- /dev/null
+++ b/x11-misc/mgm/mgm-1.2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+DESCRIPTION="Moaning Goat Meter: load and status meter written in Perl"
+HOMEPAGE="http://www.linuxmafia.com/mgm"
+SRC_URI="http://downloads.xiph.org/releases/mgm/${P}.tgz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ppc x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/perl-5.6.1
+	>=dev-perl/perl-tk-800.024"
+
+src_install() {
+	exeinto /usr/share/mgm
+	doexe mgm || die "doexe failed."
+	dosym /usr/share/mgm/mgm /usr/bin/mgm
+	insinto /usr/share/mgm
+	doins -r lib modules || die "doins failed."
+	dohtml doc/*
+}
diff --git a/x11-misc/mixer_app/Manifest b/x11-misc/mixer_app/Manifest
new file mode 100644
index 000000000000..2deadf11810d
--- /dev/null
+++ b/x11-misc/mixer_app/Manifest
@@ -0,0 +1 @@
+DIST Mixer.app-1.8.0.tar.gz 37884 RMD160 ae29a9b6c4a3d37d48f5e2b936ac62b81cc02c52 SHA1 68b644e2b13fe4a89461cf28ab6aebbcaedc0552 SHA256 223c08d91fd7930d6a97cea376b99fb0118cdea12406c7d62d17d38276b4dd15
diff --git a/x11-misc/mixer_app/files/mixer_app-1.8.0-build.patch b/x11-misc/mixer_app/files/mixer_app-1.8.0-build.patch
new file mode 100644
index 000000000000..f36ea6e78ec6
--- /dev/null
+++ b/x11-misc/mixer_app/files/mixer_app-1.8.0-build.patch
@@ -0,0 +1,44 @@
+--- Makefile
++++ Makefile
+@@ -2,32 +2,24 @@
+ # Mixer.app Makefile
+ #
+ 
+-DESTDIR =
+-GNUSTEP_BINDIR = /usr/local/GNUstep/Apps/Mixer.app
+-X11_BINDIR = /usr/X11R6/bin
+-
+-CXX=c++
+-CXXFLAGS += -Wall -pedantic -fno-rtti -fno-exceptions -O2 -I/usr/X11R6/include
+-LDFLAGS += -L/usr/X11R6/lib -lXpm -lXext -lX11
++BINDIR = /usr/bin
++
++CXX ?= g++
++CXXFLAGS += -Wall -pedantic -fno-rtti -fno-exceptions
++LIBS = -lXpm -lXext -lX11
+ 
+ OBJECTS = Main.o Mixer.o Xpm.o
+ 
+ all: Mixer.app
+ 
+ Mixer.app: $(OBJECTS)
+-	$(CXX) $(OBJECTS) -o $@ $(LDFLAGS)
++	$(CXX) $(LDFLAGS) $(OBJECTS) -o $@ $(LIBS)
+ 
+ .PHONY:	install clean distclean
+ 
+-install: install-gnustep
+-
+-install-gnustep: all
+-	install -d  $(DESTDIR)$(GNUSTEP_BINDIR)
+-	install -m 0755 Mixer.app $(DESTDIR)$(GNUSTEP_BINDIR)/Mixer
+-
+-install-x11: all
+-	install -d  $(DESTDIR)$(X11_BINDIR)
+-	install -m 0755 Mixer.app $(DESTDIR)$(X11_BINDIR)/Mixer.app
++install: all
++	install -d  $(DESTDIR)$(BINDIR)
++	install -m 0755 Mixer.app $(DESTDIR)$(BINDIR)/Mixer.app
+ 
+ clean:
+ 	rm -f *~ *.o
diff --git a/x11-misc/mixer_app/metadata.xml b/x11-misc/mixer_app/metadata.xml
new file mode 100644
index 000000000000..a03f5d8b381b
--- /dev/null
+++ b/x11-misc/mixer_app/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>desktop-dock</herd>
+</pkgmetadata>
diff --git a/x11-misc/mixer_app/mixer_app-1.8.0.ebuild b/x11-misc/mixer_app/mixer_app-1.8.0.ebuild
new file mode 100644
index 000000000000..9226c03823f0
--- /dev/null
+++ b/x11-misc/mixer_app/mixer_app-1.8.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit eutils toolchain-funcs
+
+MY_P=Mixer.app-${PV}
+
+DESCRIPTION="mixer utility that has three volume controllers that can be configured to handle any sound source"
+HOMEPAGE="http://www.fukt.bsnet.se/~per/mixer/"
+SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc sparc x86"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXpm"
+DEPEND="${RDEPEND}
+	virtual/os-headers
+	x11-proto/xextproto"
+
+S=${WORKDIR}/${MY_P}
+
+DOCS="ChangeLog README"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-build.patch
+}
+
+src_compile() {
+	tc-export CXX
+	emake
+}
diff --git a/x11-misc/mozo/Manifest b/x11-misc/mozo/Manifest
new file mode 100644
index 000000000000..808ad671cd1c
--- /dev/null
+++ b/x11-misc/mozo/Manifest
@@ -0,0 +1 @@
+DIST mozo-1.8.0.tar.xz 162484 SHA256 326f0a6c30c07381b113b243ccdcc46269b2cab1e998ea6e1f9e79f520f015cb SHA512 4d5a0f8881b65c7ebf82686735f42183853c0c3687b5e15e594a0d9c88b6eb0d19201105773c3f3a539e93f045732a2c4e6d4718073283c4d518e505fed7e4ab WHIRLPOOL f47637cf8a6cb0ea2f805a3acf72df391e4c3dfb0f65af433be591a30e24f64ee3cf233b821dd4b790efecad468e66d23ca175b83ea309a3ac436b5d6d13cc00
diff --git a/x11-misc/mozo/metadata.xml b/x11-misc/mozo/metadata.xml
new file mode 100644
index 000000000000..07173e378ed5
--- /dev/null
+++ b/x11-misc/mozo/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+    <herd>mate</herd>
+    <upstream>
+        <remote-id type="github">mate-desktop/mozo</remote-id>
+    </upstream>
+</pkgmetadata>
diff --git a/x11-misc/mozo/mozo-1.8.0.ebuild b/x11-misc/mozo/mozo-1.8.0.ebuild
new file mode 100644
index 000000000000..2bfadf51a791
--- /dev/null
+++ b/x11-misc/mozo/mozo-1.8.0.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+GCONF_DEBUG="no"
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="xml"
+
+inherit gnome2 python-r1 versionator
+
+MATE_BRANCH="$(get_version_component_range 1-2)"
+
+SRC_URI="http://pub.mate-desktop.org/releases/${MATE_BRANCH}/${P}.tar.xz"
+DESCRIPTION="Mozo menu editor for MATE"
+HOMEPAGE="http://mate-desktop.org"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+COMMON_DEPEND=">=dev-python/pygobject-2.15.1:2[${PYTHON_USEDEP}]
+	>=dev-python/pygtk-2.13:2[${PYTHON_USEDEP}]
+	>=mate-base/mate-menus-1.8:0[introspection,python]"
+
+RDEPEND="${COMMON_DEPEND}
+	${PYTHON_DEPS}
+	>=mate-base/mate-panel-1.8:0
+	x11-libs/gdk-pixbuf:2[introspection]
+	x11-libs/gtk+:2[introspection]
+	virtual/libintl:0
+	!!x11-misc/mate-menu-editor"
+
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/intltool-0.40:*
+	sys-devel/gettext:*
+	virtual/pkgconfig:*"
+
+src_prepare() {
+	gnome2_src_prepare
+	python_copy_sources
+}
+
+src_configure() {
+	python_foreach_impl run_in_build_dir gnome2_src_configure \
+		--disable-icon-update
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir gnome2_src_compile
+}
+
+src_test() {
+	python_foreach_impl run_in_build_dir emake check
+}
+
+DOCS="AUTHORS NEWS README"
+
+src_install() {
+	installing() {
+		gnome2_src_install
+
+		# Massage shebang to make python_doscript happy
+		sed -e 's:#! '"${PYTHON}:#!/usr/bin/python:" \
+			-i mozo || die
+
+		python_doscript mozo
+	}
+
+	python_foreach_impl run_in_build_dir installing
+}
diff --git a/x11-misc/netwmpager/Manifest b/x11-misc/netwmpager/Manifest
new file mode 100644
index 000000000000..653e3e0eca01
--- /dev/null
+++ b/x11-misc/netwmpager/Manifest
@@ -0,0 +1 @@
+DIST netwmpager-2.04.tar.bz2 175696 SHA256 d1507ad1d79e9d4a8ff00ed9fbb7e909798956d45b562ddfb690ebc0ab8a96f6 SHA512 06e42bdb1cba862faa50716962c7711f04350146c524f7699086335c491c564b4079ebab423932efa5eea757facf5471c60b787dea4c4a73e02574fafab1259e WHIRLPOOL a40ffda11940a1fb814d180a1cb7de8339a4a9ab113c0f9a3196db88909739f4de29c99f4a904c93d80e37503329c6b1e6713d9949a781127ca47cec2a2c7de9
diff --git a/x11-misc/netwmpager/files/netwmpager-1.11-desktop-switch.patch b/x11-misc/netwmpager/files/netwmpager-1.11-desktop-switch.patch
new file mode 100644
index 000000000000..bc4abda5a0ea
--- /dev/null
+++ b/x11-misc/netwmpager/files/netwmpager-1.11-desktop-switch.patch
@@ -0,0 +1,10 @@
+--- pager.c	2006-04-15 21:14:55.000000000 +0200
++++ pager.c	2008-04-02 18:10:43.000000000 +0200
+@@ -1137,6 +1137,7 @@
+ 		if (pager->mouse.window_idx == -1) {
+ 			x_set_current_desktop(desk);
+ 		} else if (!pager->mouse.dragging) {
++			x_set_current_desktop(desk);
+ 			x_set_active_window(pager->windows[pager->mouse.window_idx].window, SOURCE_INDICATION_PAGER);
+ 		}
+ 	} else if (button == 2) {
diff --git a/x11-misc/netwmpager/metadata.xml b/x11-misc/netwmpager/metadata.xml
new file mode 100644
index 000000000000..402a82e8c6df
--- /dev/null
+++ b/x11-misc/netwmpager/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">sf-xpaint</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-misc/netwmpager/netwmpager-2.04.ebuild b/x11-misc/netwmpager/netwmpager-2.04.ebuild
new file mode 100644
index 000000000000..7ea67cf0e469
--- /dev/null
+++ b/x11-misc/netwmpager/netwmpager-2.04.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit toolchain-funcs
+
+DESCRIPTION="EWMH (NetWM) compatible pager. Works with Openbox and other EWMH
+compliant window managers."
+HOMEPAGE="http://sourceforge.net/projects/sf-xpaint/files/netwmpager/"
+SRC_URI="mirror://sourceforge/sf-xpaint/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXrender
+	x11-libs/libXft
+	x11-libs/libXdmcp
+	x11-libs/libXau"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	x11-proto/xproto"
+
+src_configure() {
+	# econf doesn't work
+	tc-export CC
+	./configure --prefix=/usr || die
+
+}
+
+src_install () {
+	default
+
+	dodoc Changelog
+}
diff --git a/x11-misc/nitrogen/Manifest b/x11-misc/nitrogen/Manifest
new file mode 100644
index 000000000000..a40beeac3af4
--- /dev/null
+++ b/x11-misc/nitrogen/Manifest
@@ -0,0 +1 @@
+DIST nitrogen-1.5.2.tar.gz 307356 SHA256 60a2437ce6a6c0ba44505fc8066c1973140d4bb48e1e5649f525c7b0b8bf9fd2 SHA512 f4fdafcecb946f6918220f7562a69eb5223d4303c9bf3df4adb5dedfd8d402ee4f3fd3b1692875ede545d3e03f0ca88fa475206a839bb36677fa008a33e99551 WHIRLPOOL 6295f747e1bfb98c4cc83a6ccae2f48e77ceb10b1f4e9296c168e7f3ca846df1f7ca5639b94d7cbf2aa936ea5ed2c82de6ae18e90c3a0c16fc1e61eabf9079c2
diff --git a/x11-misc/nitrogen/files/nitrogen-1.5.2-gold.patch b/x11-misc/nitrogen/files/nitrogen-1.5.2-gold.patch
new file mode 100644
index 000000000000..81f034ab7cb8
--- /dev/null
+++ b/x11-misc/nitrogen/files/nitrogen-1.5.2-gold.patch
@@ -0,0 +1,16 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -34,10 +34,11 @@
+ PKG_CHECK_MODULES(GTK2,[gtk+-2.0 >= $GTK2_VERSION])
+ PKG_CHECK_MODULES(GTKMM2, [gtkmm-2.4 >= $GTKMM2_VERSION])
+ PKG_CHECK_MODULES(GTHREAD2, [gthread-2.0 >= $GTHREAD2_VERSION])
++PKG_CHECK_MODULES(X11, x11)
+ 
+ 
+-NITROGEN_LIBS="$GLIB2_LIBS $GTK2_LIBS $GTKMM2_LIBS $GTHREAD2_LIBS"
+-NITROGEN_CFLAGS="$GLIB2_CFLAGS $GTK2_CFLAGS $GTKMM2_CFLAGS $GTHREAD2_CFLAGS"
++NITROGEN_LIBS="$GLIB2_LIBS $GTK2_LIBS $GTKMM2_LIBS $GTHREAD2_LIBS $X11_LIBS"
++NITROGEN_CFLAGS="$GLIB2_CFLAGS $GTK2_CFLAGS $GTKMM2_CFLAGS $GTHREAD2_CFLAGS $X11_CFLAGS"
+ 
+ dnl do some autotools picen to get inotify
+ AC_ARG_ENABLE(inotify, [  --disable-inotify       disable support for inotify watching of dirs (default: enabled)], [enable_inotify=$enableval],[enable_inotify=yes])
diff --git a/x11-misc/nitrogen/metadata.xml b/x11-misc/nitrogen/metadata.xml
new file mode 100644
index 000000000000..540f810e069d
--- /dev/null
+++ b/x11-misc/nitrogen/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>desktop-misc</herd>
+</pkgmetadata>
diff --git a/x11-misc/nitrogen/nitrogen-1.5.2.ebuild b/x11-misc/nitrogen/nitrogen-1.5.2.ebuild
new file mode 100644
index 000000000000..78a895c2b093
--- /dev/null
+++ b/x11-misc/nitrogen/nitrogen-1.5.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit autotools eutils
+
+DESCRIPTION="A background browser and setter for X"
+HOMEPAGE="http://projects.l3ib.org/nitrogen/"
+SRC_URI="http://projects.l3ib.org/${PN}/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="nls xinerama"
+
+RDEPEND=">=dev-cpp/gtkmm-2.10:2.4
+	>=gnome-base/librsvg-2.20:2
+	>=x11-libs/gtk+-2.10:2
+	xinerama? ( x11-libs/libXinerama )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	xinerama? ( x11-proto/xineramaproto )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gold.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-dependency-tracking \
+		$(use_enable nls) \
+		$(use_enable xinerama)
+}
+
+DOCS=( AUTHORS ChangeLog NEWS README )
diff --git a/x11-misc/notification-daemon/Manifest b/x11-misc/notification-daemon/Manifest
new file mode 100644
index 000000000000..2b5d6d82d7a9
--- /dev/null
+++ b/x11-misc/notification-daemon/Manifest
@@ -0,0 +1,4 @@
+DIST notification-daemon-0.5.0.tar.bz2 330034 SHA256 aa1d3546fd1d5c51087317f4921c419927b644c12c39b557c959c9b45deb1475 SHA512 abdc86732afebbbe819db779924b82642fee7d29c005564dc890918849e2af11dbff5ba36e1d089c35318236e5950ac69df7e379fc48e7d696d27facce203b5a WHIRLPOOL e49419b4d09b3e4cd0baf0887c628f7d16edefad62de8e73939d7df948a8c24ddbae66c9ac6da9c9eba94b4783e07aafdfcc92de37fed231c44900afac4d564a
+DIST notification-daemon-0.7.6.tar.xz 279488 SHA256 64d0ce6fb12c94c3b73b701502c804c408cb5a94580bcae5ac37607639f7a0b3 SHA512 b781eef6b0a0208726c669083f024047651e2cf4ab79275076b6c36d2c6b551349a085618828bf4d8c013367be3c88c660d3231c8a6c6ce37cb6c6b0e436ed44 WHIRLPOOL 7f8e1ab298df8e945511eb438afae0943cc9da193c6a5cd0c36ed0a0bcf15c5553e8ff1b918c9a3c23cc534ff747a8a2e370e48a46f408b39abbdb0a1af85897
+DIST notification-daemon-3.14.1.tar.xz 280344 SHA256 3cd9af77708fb1ab95ed6c8c66095c5c99a19e84eadc6ba607ef07973e262b80 SHA512 977d028206d6a2005d346f697af5790b404f56399c451774037db25e37724f0cfbd558ae413c9ada40d2d7f399c1911392b19194e8fd093de74f65a6783ccc05 WHIRLPOOL 6c4161a75cdf4db1c99ebc8ede36c4229de1a491a3d5aefab41279b934a95c73dca1799848bd62c63aea31c282d56afeced73f7c51ee36821b642d3490cf08cc
+DIST notification-daemon-3.16.1.tar.xz 280404 SHA256 256b322f5d18d438c3f1b0d1d10b6b1fbcff80f82f785e3fc69680e4e498fd81 SHA512 02971b68c5f16d5cf7760915040ac6336a540cda4fd85766e4597a9df3fc4971d7f12f8023a84e55c5cc90c79ea5c685b440411854d2113a719474347c8c4979 WHIRLPOOL 21f06857caf115cd4d53de14e9531a09ade102d378c1a80ba779f4c4cf7b392ae31c50cf7c148aa21800e882a3cd4bd10ba64ae197fd56e560ce050d2875d307
diff --git a/x11-misc/notification-daemon/files/notification-daemon-0.5.0-libnotify-0.7.patch b/x11-misc/notification-daemon/files/notification-daemon-0.5.0-libnotify-0.7.patch
new file mode 100644
index 000000000000..63765ee79e69
--- /dev/null
+++ b/x11-misc/notification-daemon/files/notification-daemon-0.5.0-libnotify-0.7.patch
@@ -0,0 +1,28 @@
+--- src/capplet/notification-properties.c
++++ src/capplet/notification-properties.c
+@@ -27,6 +27,10 @@
+ #include <string.h>
+ #include <libnotify/notify.h>
+ 
++#ifndef NOTIFY_CHECK_VERSION
++#define NOTIFY_CHECK_VERSION(x,y,z) 0
++#endif
++
+ #include "stack.h"
+ 
+ #define GCONF_KEY_DAEMON         "/apps/notification-daemon"
+@@ -402,8 +406,12 @@
+ 
+         dialog->preview = notify_notification_new (_("Notification Test"),
+                                                    _("Just a test"),
+-                                                   "gnome-util",
+-                                                   NULL);
++                                                   "gnome-util"
++#if NOTIFY_CHECK_VERSION (0, 7, 0)
++                                                   );
++#else
++                                                   , NULL);
++#endif
+ 
+         if (!notify_notification_show (dialog->preview, &error)) {
+                 char *message;
diff --git a/x11-misc/notification-daemon/files/notification-daemon-0.5.0-underlinking.patch b/x11-misc/notification-daemon/files/notification-daemon-0.5.0-underlinking.patch
new file mode 100644
index 000000000000..306ffd9cf991
--- /dev/null
+++ b/x11-misc/notification-daemon/files/notification-daemon-0.5.0-underlinking.patch
@@ -0,0 +1,12 @@
+http://bugs.gentoo.org/468522
+
+--- configure.ac
++++ configure.ac
+@@ -98,6 +98,7 @@
+ 	dbus-1 >= $REQ_DBUS_VERSION, \
+ 	dbus-glib-1 >= $REQ_DBUS_VERSION, \
+         libcanberra-gtk >= $REQ_LIBCANBERRA_GTK_VERSION, \
++	gmodule-2.0, \
+ 	gconf-2.0, \
+ 	libwnck-1.0 \
+         x11 \
diff --git a/x11-misc/notification-daemon/metadata.xml b/x11-misc/notification-daemon/metadata.xml
new file mode 100644
index 000000000000..854288052d19
--- /dev/null
+++ b/x11-misc/notification-daemon/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>freedesktop</herd>
+</pkgmetadata>
diff --git a/x11-misc/notification-daemon/notification-daemon-0.5.0.ebuild b/x11-misc/notification-daemon/notification-daemon-0.5.0.ebuild
new file mode 100644
index 000000000000..2684b589c7f0
--- /dev/null
+++ b/x11-misc/notification-daemon/notification-daemon-0.5.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+GCONF_DEBUG=no
+GNOME2_LA_PUNT=yes
+GNOME_TARBALL_SUFFIX=bz2
+
+inherit autotools eutils gnome2
+
+DESCRIPTION="Notification daemon"
+HOMEPAGE="http://git.gnome.org/browse/notification-daemon/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE=""
+
+RDEPEND=">=dev-libs/glib-2
+	>=x11-libs/gtk+-2.18:2
+	>=gnome-base/gconf-2
+	>=dev-libs/dbus-glib-0.100
+	>=sys-apps/dbus-1
+	>=media-libs/libcanberra-0.4[gtk]
+	x11-libs/libnotify
+	x11-libs/libwnck:1
+	x11-libs/libX11
+	!x11-misc/notify-osd
+	!x11-misc/qtnotifydaemon"
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.50
+	gnome-base/gnome-common
+	>=sys-devel/gettext-0.18
+	virtual/pkgconfig"
+
+DOCS="AUTHORS ChangeLog NEWS"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-libnotify-0.7.patch \
+		"${FILESDIR}"/${P}-underlinking.patch
+
+	eautoreconf
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure --disable-static
+}
diff --git a/x11-misc/notification-daemon/notification-daemon-0.7.6.ebuild b/x11-misc/notification-daemon/notification-daemon-0.7.6.ebuild
new file mode 100644
index 000000000000..cd714505ab4b
--- /dev/null
+++ b/x11-misc/notification-daemon/notification-daemon-0.7.6.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit gnome.org
+
+DESCRIPTION="Notification daemon"
+HOMEPAGE="http://git.gnome.org/browse/notification-daemon/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE=""
+
+RDEPEND=">=dev-libs/glib-2.28
+	x11-libs/gtk+:3
+	sys-apps/dbus
+	media-libs/libcanberra[gtk3]
+	>=x11-libs/libnotify-0.7
+	x11-libs/libX11
+	!x11-misc/notify-osd
+	!x11-misc/qtnotifydaemon"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS ChangeLog NEWS )
+
+src_install() {
+	default
+
+	cat <<-EOF > "${T}"/org.freedesktop.Notifications.service
+	[D-BUS Service]
+	Name=org.freedesktop.Notifications
+	Exec=/usr/libexec/notification-daemon
+	EOF
+
+	insinto /usr/share/dbus-1/services
+	doins "${T}"/org.freedesktop.Notifications.service
+}
diff --git a/x11-misc/notification-daemon/notification-daemon-3.14.1.ebuild b/x11-misc/notification-daemon/notification-daemon-3.14.1.ebuild
new file mode 100644
index 000000000000..0596320d2a7b
--- /dev/null
+++ b/x11-misc/notification-daemon/notification-daemon-3.14.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit gnome.org
+
+DESCRIPTION="Notification daemon"
+HOMEPAGE="http://git.gnome.org/browse/notification-daemon/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE=""
+
+RDEPEND="
+	>=dev-libs/glib-2.28
+	>=x11-libs/gtk+-3.8:3
+	sys-apps/dbus
+	media-libs/libcanberra[gtk3]
+	>=x11-libs/libnotify-0.7
+	x11-libs/libX11
+	!x11-misc/notify-osd
+	!x11-misc/qtnotifydaemon
+"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+DOCS=( AUTHORS ChangeLog NEWS )
+
+src_install() {
+	default
+
+	cat <<-EOF > "${T}"/org.freedesktop.Notifications.service
+	[D-BUS Service]
+	Name=org.freedesktop.Notifications
+	Exec=/usr/libexec/notification-daemon
+	EOF
+
+	insinto /usr/share/dbus-1/services
+	doins "${T}"/org.freedesktop.Notifications.service
+}
diff --git a/x11-misc/notification-daemon/notification-daemon-3.16.1.ebuild b/x11-misc/notification-daemon/notification-daemon-3.16.1.ebuild
new file mode 100644
index 000000000000..2e2183905b4b
--- /dev/null
+++ b/x11-misc/notification-daemon/notification-daemon-3.16.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit gnome.org
+
+DESCRIPTION="Notification daemon"
+HOMEPAGE="http://git.gnome.org/browse/notification-daemon/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE=""
+
+RDEPEND="
+	>=dev-libs/glib-2.28
+	>=x11-libs/gtk+-3.15.2:3
+	sys-apps/dbus
+	media-libs/libcanberra[gtk3]
+	>=x11-libs/libnotify-0.7
+	x11-libs/libX11
+	!x11-misc/notify-osd
+	!x11-misc/qtnotifydaemon
+"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+DOCS=( AUTHORS ChangeLog NEWS )
+
+src_install() {
+	default
+
+	cat <<-EOF > "${T}"/org.freedesktop.Notifications.service
+	[D-BUS Service]
+	Name=org.freedesktop.Notifications
+	Exec=/usr/libexec/notification-daemon
+	EOF
+
+	insinto /usr/share/dbus-1/services
+	doins "${T}"/org.freedesktop.Notifications.service
+}
diff --git a/x11-misc/notify-osd/Manifest b/x11-misc/notify-osd/Manifest
new file mode 100644
index 000000000000..2c39fb9c113f
--- /dev/null
+++ b/x11-misc/notify-osd/Manifest
@@ -0,0 +1 @@
+DIST notify-osd-0.9.34.tar.gz 635387 SHA256 12080deeaa5e1e10b420117351c2bd5db3421b0d1efcab8ee8052c808c3aaa3c SHA512 60ca63c2041f129d5139537242c2260908cedef633df977a608e19dcb01b75b2280ec80abe2b6da5eff76621107ee9d294742abfae301bc24eaa3aa855c56ce1 WHIRLPOOL 3a1aa26ed5276e6cfe2501585effb8825bfde56cadb7a264ebf084a60f520e423498073c86ecce6621599f8c7d383962d0a40f1096c5afb8830a91c5e821171e
diff --git a/x11-misc/notify-osd/metadata.xml b/x11-misc/notify-osd/metadata.xml
new file mode 100644
index 000000000000..650c2a2edb1f
--- /dev/null
+++ b/x11-misc/notify-osd/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>ayatana</herd>
+  <maintainer>
+    <email>ayatana-bugs@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="launchpad">notify-osd</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/x11-misc/notify-osd/notify-osd-0.9.34.ebuild b/x11-misc/notify-osd/notify-osd-0.9.34.ebuild
new file mode 100644
index 000000000000..5943c617e485
--- /dev/null
+++ b/x11-misc/notify-osd/notify-osd-0.9.34.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit autotools gnome2-utils multilib savedconfig
+
+DESCRIPTION="Canonical's on-screen-display notification agent"
+HOMEPAGE="http://launchpad.net/notify-osd"
+SRC_URI="http://launchpad.net/${PN}/precise/${PV}/+download/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="minimal"
+
+COMMON_DEPEND=">=dev-libs/dbus-glib-0.98
+	>=dev-libs/glib-2.16
+	>=x11-libs/gtk+-3.2:3
+	>=x11-libs/libnotify-0.7
+	>=x11-libs/libwnck-3
+	x11-libs/libX11
+	x11-libs/pixman
+	!x11-misc/notification-daemon
+	!x11-misc/qtnotifydaemon"
+RDEPEND="${COMMON_DEPEND}
+	!minimal? ( x11-themes/notify-osd-icons )"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+	gnome-base/gnome-common
+	x11-proto/xproto"
+
+RESTRICT="test" # virtualx.eclass: 1 of 1: FAIL: test-modules
+
+DOCS=( AUTHORS ChangeLog NEWS README TODO )
+
+src_prepare() {
+	sed -i -e 's:noinst_PROG:check_PROG:' tests/Makefile.am || die
+	restore_config src/{bubble,defaults,dnd}.c #428134
+	eautoreconf
+}
+
+src_configure() {
+	econf --libexecdir=/usr/$(get_libdir)/${PN}
+}
+
+src_install() {
+	default
+	save_config src/{bubble,defaults,dnd}.c
+	rm -f "${ED}"/usr/share/${PN}/icons/*/*/*/README
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+	gnome2_schemas_savelist
+}
+pkg_postinst() {
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+}
+pkg_postrm() {
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+}
diff --git a/x11-misc/nts/Manifest b/x11-misc/nts/Manifest
new file mode 100644
index 000000000000..8c568726f152
--- /dev/null
+++ b/x11-misc/nts/Manifest
@@ -0,0 +1 @@
+DIST nts-82.tar.gz 155819 SHA256 ffdb54ee6c607dfced534188ef212dd1ab41103af06a2e2ee26467fb574fadb4 SHA512 03ec801a550668c8654240823f63e4793d54d12630181e38031872f8d5e6cf01e151be1a5762c7013941701a679d361951f271e0f4cf0d90da54ed1db2ea61fd WHIRLPOOL 94b438add01a9ecc31c94d250a41e4c5ad20e6c7ba0b2489c365fb748a1f90d651e7c31238843f7d5a8eed9c160d2a669bafcfd4148ef37448b99c1a525292ad
diff --git a/x11-misc/nts/metadata.xml b/x11-misc/nts/metadata.xml
new file mode 100644
index 000000000000..5f46adac6d22
--- /dev/null
+++ b/x11-misc/nts/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
+	<longdescription lang="en">
+		nts is an acronym for Note Taking Simplified. It provides a simple,
+		intuitive format for using plain text files to store notes, a command
+		line interface for viewing notes in a variety of convenient ways and a
+		cross-platform, wx(python)-based GUI for creating and modifying notes as
+		well as viewing them. Displayed items can be grouped by path or tag and
+		can be filtered in various ways.
+	</longdescription>
+</pkgmetadata>
+
diff --git a/x11-misc/nts/nts-82.ebuild b/x11-misc/nts/nts-82.ebuild
new file mode 100644
index 000000000000..bf0c1a8d5a19
--- /dev/null
+++ b/x11-misc/nts/nts-82.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+inherit distutils-r1
+
+DESCRIPTION="Note Taking made Simple, an intuitive note taking application"
+HOMEPAGE="http://www.duke.edu/~dgraham/NTS/"
+SRC_URI="${HOMEPAGE}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+
+RDEPEND="
+	dev-python/wxpython:2.8[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	|| ( dev-python/docutils[${PYTHON_USEDEP}] app-text/pandoc )
+"
diff --git a/x11-misc/numlockx/Manifest b/x11-misc/numlockx/Manifest
new file mode 100644
index 000000000000..02d5374382b9
--- /dev/null
+++ b/x11-misc/numlockx/Manifest
@@ -0,0 +1 @@
+DIST numlockx-1.2.tar.gz 82703 SHA256 e468eb9121c94c9089dc6a287eeb347e900ce04a14be37da29d7696cbce772e4 SHA512 efaaa67e8b2723cb1e8461dde664f1f8e9b21f34edfe2e1135a6b756fa2843aed1a386f2f9d70bd62ddae9aedfeeff856a18da8b542f2cff440f93b38e5a853e WHIRLPOOL f71cacc0ff872acca97ca52b6516b12824e4330b2ef36a2de42ff07e342f96b7605ccb8cdccfa933f6bc3a73fb97e7d0ee1f8c0d7c345032dc8c5150c9c66272
diff --git a/x11-misc/numlockx/metadata.xml b/x11-misc/numlockx/metadata.xml
new file mode 100644
index 000000000000..731225048652
--- /dev/null
+++ b/x11-misc/numlockx/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>desktop-misc</herd>
+</pkgmetadata>
diff --git a/x11-misc/numlockx/numlockx-1.2.ebuild b/x11-misc/numlockx/numlockx-1.2.ebuild
new file mode 100644
index 000000000000..eee31b799f7e
--- /dev/null
+++ b/x11-misc/numlockx/numlockx-1.2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools
+
+DESCRIPTION="Turns on numlock in X"
+HOMEPAGE="http://home.kde.org/~seli/numlockx/"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm ppc ppc64 sparc x86"
+IUSE=""
+
+RDEPEND="
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXtst
+"
+DEPEND="
+	${RDEPEND}
+	x11-proto/xextproto
+	x11-proto/xproto
+"
+
+src_prepare() {
+	sed -i \
+		-e '/^K_.*$/d' \
+		-e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' \
+		configure.in || die
+	sed -i -e 's,@X_[_A-Z]\+@,,g' Makefile.am || die
+	eautoreconf
+}
+
+src_install() {
+	dobin ${PN}
+	dodoc AUTHORS README
+}
diff --git a/x11-misc/obconf-qt/Manifest b/x11-misc/obconf-qt/Manifest
new file mode 100644
index 000000000000..3f2c9dd157bf
--- /dev/null
+++ b/x11-misc/obconf-qt/Manifest
@@ -0,0 +1,2 @@
+DIST obconf-qt-0.1.0.tar.xz 52048 SHA256 4831bfc06eff0529697a51196c1d7866cb12e3b19a0724e8201dbdfd2bca082b SHA512 0193b5d5d3ede2c7e2e5720c5ead1b75812277da474569926138647127cade87e23c3ca8c65dfded988122c097b867a6ce940da1eb526b12a44262be778d3fe8 WHIRLPOOL 835ee8c32cead4241d953e9302cd1f77c4ede8e15ab8d045af9d8cd49338ee75ec7feb05899a9da64b7e26497e35e59fe430ea99fd50d7fa2efc71f9ad84c561
+DIST obconf-qt-0.9.0_p20150729.tar.gz 96660 SHA256 8419186b842c270be8ba03122f51aea20f2656369a7254c0dd4e88ad09b88aad SHA512 cb4318608fb49926212130de368b059af34c9731d5edf19fca4b05f583ec0d37ce7568f95a5a3f1533642503fd3c7f03fee65ca96796cbc0bb16e92f9890efe3 WHIRLPOOL 6aa7987420904f5b63e1bc3b1cbb63382c9a10cceb9e9831062c2dbd89bb9e3c380ae6c124a9c71e9dac867a74f7212c6d8863a479564ee5c0c4d28c273668d2
diff --git a/x11-misc/obconf-qt/metadata.xml b/x11-misc/obconf-qt/metadata.xml
new file mode 100644
index 000000000000..d89dead0ed86
--- /dev/null
+++ b/x11-misc/obconf-qt/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>lxqt</herd>
+  <maintainer>
+    <email>jauhien@gentoo.org</email>
+    <name>Jauhien Piatlicki</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/x11-misc/obconf-qt/obconf-qt-0.1.0.ebuild b/x11-misc/obconf-qt/obconf-qt-0.1.0.ebuild
new file mode 100644
index 000000000000..1298177f6835
--- /dev/null
+++ b/x11-misc/obconf-qt/obconf-qt-0.1.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit cmake-utils
+
+DESCRIPTION="Openbox window manager configuration tool"
+HOMEPAGE="http://lxqt.org/"
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://git.lxde.org/git/lxde/${PN}.git"
+else
+	SRC_URI="http://lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+LICENSE="GPL-2 LGPL-2.1+"
+SLOT="0"
+
+S=${WORKDIR}
+
+RDEPEND="dev-libs/glib:2
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4
+	x11-wm/openbox:3"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
diff --git a/x11-misc/obconf-qt/obconf-qt-0.9.0_p20150729.ebuild b/x11-misc/obconf-qt/obconf-qt-0.9.0_p20150729.ebuild
new file mode 100644
index 000000000000..23f322337b3e
--- /dev/null
+++ b/x11-misc/obconf-qt/obconf-qt-0.9.0_p20150729.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit cmake-utils
+
+DESCRIPTION="Openbox window manager configuration tool"
+HOMEPAGE="http://lxqt.org/"
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://git.lxde.org/git/lxde/${PN}.git"
+else
+	SRC_URI="http://dev.gentoo.org/~jauhien/distfiles/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+LICENSE="GPL-2 LGPL-2.1+"
+SLOT="0"
+
+RDEPEND="dev-libs/glib:2
+	dev-libs/libxml2
+	dev-qt/linguist-tools:5
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	media-libs/fontconfig
+	media-libs/freetype
+	x11-wm/openbox:3
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXft
+	x11-libs/pango
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
diff --git a/x11-misc/obconf/Manifest b/x11-misc/obconf/Manifest
new file mode 100644
index 000000000000..7a5d7e9714fa
--- /dev/null
+++ b/x11-misc/obconf/Manifest
@@ -0,0 +1,2 @@
+DIST obconf-2.0.3_p20111019.tar.gz 109540 SHA256 c06ba45c99abf4e0c5906266e03486ccbe8391c9aae30498c60be64e5481caa7 SHA512 1ce59375252404e02c27cf2ffb6606a6243318819e5ea127344e569ae4f96c3fe8b2e14006de0d9907397819119722fb2474acd645544c227e8f9668bb2b1798 WHIRLPOOL b464a212530ae4ae17c2d9915a423fe2a16a4e70c3166c59d8b400cd6a34392c862ea0ca44065359b8b1cc3e914d0dacb511fa63e496aa253ddccc5b1aaf50c9
+DIST obconf-2.0.4.tar.gz 456523 SHA256 71a3e5f4ee246a27421ba85044f09d449f8de22680944ece9c471cd46a9356b9 SHA512 b8cf6f363fa8c2f1d21142a3f79687a72f683f564285b05751c822ddf7a421b09c3440cbc5b08eb09d151601c6ada835ff5cc940bf5abeec2210cca26b552294 WHIRLPOOL 3ab648028deaa701e60c40eaa7512b9e61058995ef65f3bd3871a65352e8c9a88f82077a8bf28a59b3af07b9c66a77a046c525176e7b4831abfaf643265663e6
diff --git a/x11-misc/obconf/files/obconf-2.0.3_p20111019-desktopfile.patch b/x11-misc/obconf/files/obconf-2.0.3_p20111019-desktopfile.patch
new file mode 100644
index 000000000000..50433325ad90
--- /dev/null
+++ b/x11-misc/obconf/files/obconf-2.0.3_p20111019-desktopfile.patch
@@ -0,0 +1,24 @@
+commit 1b6eb630bc82265f514c30717b712758917b0e1c
+Author: hasufell <hasufell@gentoo.org>
+Date:   Mon Jul 29 23:37:52 2013 +0200
+
+    fix desktop file
+
+diff --git a/obconf.desktop b/obconf.desktop
+index 0c9714e..a3ba032 100644
+--- a/obconf.desktop
++++ b/obconf.desktop
+@@ -1,5 +1,4 @@
+ [Desktop Entry]
+-Encoding=UTF-8
+ Type=Application
+ Name=Openbox Configuration Manager
+ Name[zh_TW]=Openbox 組態管理器
+@@ -8,6 +7,6 @@ Comment[zh_TW]=管理 Openbox 組態設定
+ Icon=obconf
+ Exec=obconf %f
+ Categories=Settings;DesktopSettings;GTK;
+-MimeType=application/x-openbox-theme
++MimeType=application/x-openbox-theme;
+ StartupNotify=true
+ Terminal=false
diff --git a/x11-misc/obconf/metadata.xml b/x11-misc/obconf/metadata.xml
new file mode 100644
index 000000000000..d07bd8015808
--- /dev/null
+++ b/x11-misc/obconf/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer>
+  	<email>hwoarang@gentoo.org</email>
+	<name>Markos Chandras</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/x11-misc/obconf/obconf-2.0.3_p20111019.ebuild b/x11-misc/obconf/obconf-2.0.3_p20111019.ebuild
new file mode 100644
index 000000000000..71d3ada41b10
--- /dev/null
+++ b/x11-misc/obconf/obconf-2.0.3_p20111019.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+inherit autotools fdo-mime eutils
+
+DESCRIPTION="ObConf is a tool for configuring the Openbox window manager"
+HOMEPAGE="http://openbox.org/wiki/ObConf:About"
+SRC_URI="http://dev.gentoo.org/~hwoarang/distfiles/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ppc ppc64 sparc x86 ~x86-fbsd ~arm-linux ~x86-linux"
+IUSE="nls"
+
+RDEPEND="gnome-base/libglade:2.0
+	x11-libs/gtk+:2
+	x11-libs/startup-notification
+	>=x11-wm/openbox-3.5.0_p20111019"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+S=${WORKDIR}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-desktopfile.patch
+	eautopoint
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable nls)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS CHANGELOG README || die "dodoc failed"
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
diff --git a/x11-misc/obconf/obconf-2.0.4.ebuild b/x11-misc/obconf/obconf-2.0.4.ebuild
new file mode 100644
index 000000000000..b5b358e3d25b
--- /dev/null
+++ b/x11-misc/obconf/obconf-2.0.4.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit fdo-mime
+
+DESCRIPTION="ObConf is a tool for configuring the Openbox window manager"
+HOMEPAGE="http://openbox.org/wiki/ObConf:About"
+SRC_URI="http://openbox.org/dist/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~arm-linux ~x86-linux"
+IUSE="nls"
+
+RDEPEND="gnome-base/libglade:2.0
+	x11-libs/gtk+:2
+	x11-libs/startup-notification
+	>=x11-wm/openbox-3.5.2"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+src_configure() {
+	econf \
+		$(use_enable nls)
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
diff --git a/x11-misc/obconf/obconf-9999.ebuild b/x11-misc/obconf/obconf-9999.ebuild
new file mode 100644
index 000000000000..9b35a1ff6af5
--- /dev/null
+++ b/x11-misc/obconf/obconf-9999.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="2"
+
+WANT_AUTOMAKE="1.9"
+inherit autotools fdo-mime git-2
+
+DESCRIPTION="ObConf is a tool for configuring the Openbox window manager"
+HOMEPAGE="http://openbox.org/wiki/ObConf:About"
+EGIT_REPO_URI="git://git.openbox.org/dana/obconf.git"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="nls"
+
+RDEPEND="gnome-base/libglade:2.0
+	x11-libs/gtk+:2
+	x11-libs/startup-notification
+	=x11-wm/openbox-9999"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )
+	virtual/pkgconfig"
+
+src_prepare() {
+	eautopoint
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable nls)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc AUTHORS CHANGELOG README || die "dodoc failed"
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
diff --git a/x11-misc/obmenu-generator/Manifest b/x11-misc/obmenu-generator/Manifest
new file mode 100644
index 000000000000..2b1fb1aa44cd
--- /dev/null
+++ b/x11-misc/obmenu-generator/Manifest
@@ -0,0 +1 @@
+DIST obmenu-generator-0.61.tar.gz 19371 SHA256 37a5df166675a71ca8b700709d73b76f38a5e600cb04f8b6e9183fb6bd08cd5f SHA512 0211ca2d84eb78468b4122945efe4ed34fd61822f68a5797c29f9a59d7bd80dc90df6b0602fff3a62476a8e435eb6deb23b0caf9e0e6036d2294228b62b77b9b WHIRLPOOL 7aa48dc3c2ddb5d93c71d37be1870e8565be2cb78ca4af1d3286fc12e533c8de36342a1a8d5ab55a0999dd10b996442617bda114c5dd446cb45b64b37bf17ceb
diff --git a/x11-misc/obmenu-generator/metadata.xml b/x11-misc/obmenu-generator/metadata.xml
new file mode 100644
index 000000000000..f28aa89d7913
--- /dev/null
+++ b/x11-misc/obmenu-generator/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<maintainer status="active">
+			<email>trizenx@gmail.com</email>
+		</maintainer>
+		<remote-id type="github">trizen/obmenu-generator</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-misc/obmenu-generator/obmenu-generator-0.61.ebuild b/x11-misc/obmenu-generator/obmenu-generator-0.61.ebuild
new file mode 100644
index 000000000000..f490bc94fceb
--- /dev/null
+++ b/x11-misc/obmenu-generator/obmenu-generator-0.61.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="A fast pipe/static menu generator for the Openbox Window Manager"
+HOMEPAGE="http://trizen.go.ro/"
+SRC_URI="https://github.com/trizen/obmenu-generator/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-lang/perl
+	dev-perl/Data-Dump
+	>=dev-perl/Linux-DesktopFiles-0.90.0
+	x11-wm/openbox
+"
+
+src_install() {
+	dobin ${PN}
+	insinto /etc/xdg/obmenu-generator
+	doins schema.pl
+	newdoc README.md README
+}
+
+pkg_postinst() {
+	elog "No docs, run 'obmenu-generator -h' for help."
+	elog "Config file will be created at"
+	elog "~/.config/${PN}/config.pl"
+}
diff --git a/x11-misc/obmenu/Manifest b/x11-misc/obmenu/Manifest
new file mode 100644
index 000000000000..a82bd6558432
--- /dev/null
+++ b/x11-misc/obmenu/Manifest
@@ -0,0 +1 @@
+DIST obmenu-1.0.tar.gz 26375 SHA256 c9cea64d40d461a34ea3bdaec9867487c819d5f9814e1cc54db607d4d3c20e27 SHA512 64f36c5847c9e20ad989ba1e5a1fd780e420ad52ed3c188b06910a5bebb54373ad6b826621916fbcb1f900a34569f1d7c484094de99a227ed31cd2ff87ef78c5 WHIRLPOOL 3ffc97d147eaed207f19e09c16c9558878b84b426e31c72d568b1ff70eefbcdb60cfe5f31fe7ccb0c78e546dde005ea85cc506277ea54e455396878c088f1b55
diff --git a/x11-misc/obmenu/metadata.xml b/x11-misc/obmenu/metadata.xml
new file mode 100644
index 000000000000..7b6a9e3ef397
--- /dev/null
+++ b/x11-misc/obmenu/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">obmenu</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-misc/obmenu/obmenu-1.0-r1.ebuild b/x11-misc/obmenu/obmenu-1.0-r1.ebuild
new file mode 100644
index 000000000000..6c0d455629df
--- /dev/null
+++ b/x11-misc/obmenu/obmenu-1.0-r1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+inherit distutils-r1
+
+DESCRIPTION="Menu editor designed for openbox"
+HOMEPAGE="http://obmenu.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+
+RDEPEND="dev-python/pygtk"
diff --git a/x11-misc/obmenu/obmenu-1.0.ebuild b/x11-misc/obmenu/obmenu-1.0.ebuild
new file mode 100644
index 000000000000..bf67ded17f0f
--- /dev/null
+++ b/x11-misc/obmenu/obmenu-1.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=3
+PYTHON_DEPEND="2"
+inherit distutils
+
+DESCRIPTION="Menu editor designed for openbox"
+HOMEPAGE="http://obmenu.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=dev-python/pygtk-2.6"
+
+PYTHON_MODNAME="obxml.py"
+
+pkg_setup() {
+	python_set_active_version 2
+}
diff --git a/x11-misc/obtheme/Manifest b/x11-misc/obtheme/Manifest
new file mode 100644
index 000000000000..c19ac1448ee8
--- /dev/null
+++ b/x11-misc/obtheme/Manifest
@@ -0,0 +1 @@
+DIST obtheme-2013.2.20.2.tar.xz 25080 SHA256 3e183092c9340347628412b6af36e54eda863deb8f4e8d26f1a78f2f512fe685 SHA512 5e7d1d187c0d5f3e6851b3a09be9aeed3b2708277940abd19efba4a501bf3ab20e0307f51e4b63e33ba07d301abf41607cec7074b3e478c9c5e6b065b3773f77 WHIRLPOOL 4d2d053199b6987747037fc06700ce1ec066cc52fc85e247eecb366f9bbfccdb6088aaed1304cbd41ec77a279dab5a97f633867e8661569aac15c8ebf46b0178
diff --git a/x11-misc/obtheme/metadata.xml b/x11-misc/obtheme/metadata.xml
new file mode 100644
index 000000000000..9360f354d02a
--- /dev/null
+++ b/x11-misc/obtheme/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>desktop-misc</herd>
+</pkgmetadata>
+
diff --git a/x11-misc/obtheme/obtheme-2013.2.20.2.ebuild b/x11-misc/obtheme/obtheme-2013.2.20.2.ebuild
new file mode 100644
index 000000000000..5a7bd4ed2601
--- /dev/null
+++ b/x11-misc/obtheme/obtheme-2013.2.20.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils python-r1
+
+DESCRIPTION="A gui theme editor for openbox"
+HOMEPAGE="http://xyne.archlinux.ca/projects/obtheme/"
+SRC_URI="http://xyne.archlinux.ca/projects/obtheme/src/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	dev-python/pygobject:2[${PYTHON_USEDEP}]
+	dev-python/pygtk:2[${PYTHON_USEDEP}]
+	dev-python/fuse-python
+	x11-libs/gtk+:2
+"
+
+src_install() {
+	python_foreach_impl python_doscript ${PN}
+	domenu ${PN}.desktop
+	dodoc README CHANGELOG
+}
diff --git a/x11-misc/okindd/Manifest b/x11-misc/okindd/Manifest
new file mode 100644
index 000000000000..1ba8cbea08b8
--- /dev/null
+++ b/x11-misc/okindd/Manifest
@@ -0,0 +1,2 @@
+DIST okindd-0.6.0-49-20110113.tar.bz2 11557 SHA256 a2a98c1bbe2e64b22542d7a0f131a4373dcd075fb569841e045aa6cfb827a236
+DIST okindd-0.6.1-23-20120304.tar.bz2 14778 SHA256 f99e48b56f312d9aa7f0d612eb926ee3a11cec1bec50538e4c3efa5e7df6a985
diff --git a/x11-misc/okindd/files/okindd-0.6.1-gcc-4.7.patch b/x11-misc/okindd/files/okindd-0.6.1-gcc-4.7.patch
new file mode 100644
index 000000000000..4cf7e4f20571
--- /dev/null
+++ b/x11-misc/okindd/files/okindd-0.6.1-gcc-4.7.patch
@@ -0,0 +1,10 @@
+--- src/okindd.h
++++ src/okindd.h
+@@ -9,6 +9,7 @@
+ #include "text.h"
+ #include "menu.h"
+ #include "global.h"
++#include <unistd.h>
+ #include <QApplication>
+ #include <QLabel>
+ #include <QtDBus>
diff --git a/x11-misc/okindd/metadata.xml b/x11-misc/okindd/metadata.xml
new file mode 100644
index 000000000000..ab02f994fdd2
--- /dev/null
+++ b/x11-misc/okindd/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>qt</herd>
+</pkgmetadata>
diff --git a/x11-misc/okindd/okindd-0.6.0.ebuild b/x11-misc/okindd/okindd-0.6.0.ebuild
new file mode 100644
index 000000000000..2dbefddf7d89
--- /dev/null
+++ b/x11-misc/okindd/okindd-0.6.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit qt4-r2
+
+MY_P="${P}-49-20110113"
+
+DESCRIPTION="On Screen Display (OSD) for KDE 4.x - works on any qt desktop"
+HOMEPAGE="http://sites.kochkin.org/okindd/Home"
+SRC_URI="http://sites.kochkin.org/okindd/Home/development/${MY_P}.tar.bz2"
+
+LICENSE="GPL-3"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="debug"
+
+DEPEND="dev-qt/qtgui:4
+	dev-qt/qtdbus:4"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}"
+
+src_configure() {
+	eqmake4 okindd.pro
+}
+
+DOCS=( changelog )
+src_install() {
+	qt4-r2_src_install
+	docinto examples
+	dodoc scripts/*
+	dodoc conf/okinddrc.example
+
+	elog "You can find an example configuration file at"
+	elog "	/usr/share/doc/okindd/examples/okinddrc.example"
+	elog "It should be placed in \${HOME}/.okindd/"
+}
diff --git a/x11-misc/okindd/okindd-0.6.1.ebuild b/x11-misc/okindd/okindd-0.6.1.ebuild
new file mode 100644
index 000000000000..716796226f37
--- /dev/null
+++ b/x11-misc/okindd/okindd-0.6.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit qt4-r2
+
+MY_P=${P}-23-20120304
+
+DESCRIPTION="On Screen Display (OSD) for KDE 4.x - works on any Qt desktop"
+HOMEPAGE="http://sites.kochkin.org/okindd/Home"
+SRC_URI="http://sites.kochkin.org/okindd/Home/${MY_P}.tar.bz2"
+
+LICENSE="GPL-3"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="debug"
+
+DEPEND="
+	dev-qt/qtcore:4
+	dev-qt/qtdbus:4
+	dev-qt/qtgui:4
+"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${PN}
+
+DOCS="changelog"
+PATCHES=( "${FILESDIR}/${P}-gcc-4.7.patch" )
+
+src_install() {
+	qt4-r2_src_install
+
+	rm -rf "${ED}"usr/share/doc/${PN}
+	docinto examples
+	dodoc conf/okinddrc.{example,my} scripts/*
+	docompress -x /usr/share/doc/${PF}/examples
+}
+
+pkg_postinst() {
+	elog "You can find an example configuration file at"
+	elog "    ${EROOT}usr/share/doc/${PF}/examples/okinddrc.example"
+	elog "It should be placed inside \${HOME}/.okindd/"
+}
diff --git a/x11-misc/openbox-menu/Manifest b/x11-misc/openbox-menu/Manifest
new file mode 100644
index 000000000000..5d7e3a1b85d3
--- /dev/null
+++ b/x11-misc/openbox-menu/Manifest
@@ -0,0 +1,2 @@
+DIST openbox-menu-0.5.1.tar.bz2 23027 SHA256 328f669e96919e94c13f77cad755625c23b9f9cef9a8a0eb2e7a5a8621b56387 SHA512 3c794413a7a1ecc7823c3d50c3b5aaca31cdb4f919aeb2b9cb4e04583a417329fc7e3a751d115170b12099ca9b4fb958cd44347558453140863a1f3b7b765b06 WHIRLPOOL 1f4ef46ea7e357a5c0ad25c6b99a0d6e106c27d0021c588e32361440125b3012a23d97f65b6225cff6fce9344698d7547532db8e3f6529a26bf80f66df13a4aa
+DIST openbox-menu-0.7.0.tar.bz2 23088 SHA256 00964fc4798152393c49a5bc41afbf5e04af07ef250ef61309091f95ff96542d SHA512 21684097ffdfce625761b059d26a29dca27b1d79251c7f1d9ef4017b1af6be321059ce9e52349a5e8e40a4e54493ab920cf193d87f5b0d4f96a498da594abb8e WHIRLPOOL f488388a9c789a5ccc92125e4a02319add1a88747fc94eb9a7dbcb868271c596b01ec7ee41177ba07cb7afe540fbef24f36dce12e5ef3ca54e199b83160b8ece
diff --git a/x11-misc/openbox-menu/files/openbox-menu-0.5.0-build.patch b/x11-misc/openbox-menu/files/openbox-menu-0.5.0-build.patch
new file mode 100644
index 000000000000..5750e982be10
--- /dev/null
+++ b/x11-misc/openbox-menu/files/openbox-menu-0.5.0-build.patch
@@ -0,0 +1,81 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Wed Aug 21 14:26:38 UTC 2013
+Subject: several QA fixes
+
+--- a/Makefile
++++ b/Makefile
+@@ -1,17 +1,27 @@
+-LIBS= `pkg-config --libs glib-2.0 gtk+-2.0 libmenu-cache`
+-CFLAGS+= -g -Wall `pkg-config --cflags glib-2.0 gtk+-2.0 libmenu-cache`
+-CC=gcc
++CC ?= gcc
++PKG_CONFIG ?= pkg-config
++
++CFLAGS ?= -O2 -g
++CFLAGS += -Wall $(shell $(PKG_CONFIG) --cflags glib-2.0 gtk+-2.0 libmenu-cache)
++LIBS += $(shell $(PKG_CONFIG) --libs glib-2.0 gtk+-2.0 libmenu-cache)
+ #-DG_DISABLE_DEPRECATED
+ 
+-# Comment this line if you don't want icons to appear in menu
+-CFLAGS+=-DWITH_ICONS
+-# Uncomment this line if Openbox can display SVG icons 
+-# Check SVG support with '$ ldd /usr/bin/openbox | grep svg', librsvg must appear..
+-# CFLAGS+=-DWITH_SVG
+-
+-prefix= /usr/local
+-DESTDIR ?= $(prefix)
+-BINDIR= ${DESTDIR}/bin
++# set to 0 to turn off icons in menus
++ICONS=1
++
++# set to 0 to turn off svg icons in menus
++SVG_ICONS=1
++
++ifeq ($(SVG_ICONS),1)
++CPPFLAGS += -DWITH_SVG
++endif
++
++ifeq ($(ICONS),1)
++CPPFLAGS += -DWITH_ICONS
++endif
++
++prefix = /usr
++BINDIR = ${prefix}/bin
+ 
+ SRC= $(shell ls *.c 2> /dev/null)
+ OBJ= $(SRC:.c=.o)
+@@ -19,26 +29,29 @@
+ all: $(OBJ) openbox-menu
+ 
+ %.o: %.c
+-	$(CC) $(CFLAGS) -c $< -o $@
++	$(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@
+ 
+ openbox-menu: $(OBJ)
+-	$(CC) $(OBJ) -o openbox-menu $(LDFLAGS) $(LIBS)
++	$(CC) $(CFLAGS) $(OBJ) -o openbox-menu $(LDFLAGS) $(LIBS)
+ 
+-.PHONY: clean install doc changelog check
++.PHONY: clean install install-strip doc changelog check
+ 
+ clean:
+ 	@rm -f *.o openbox-menu
+ 	@rm -rf doc
+ 
+ install:
++	@install -Dm 755 openbox-menu "$(DESTDIR)$(BINDIR)/openbox-menu"
++
++install-strip:
+ 	@strip -s openbox-menu
+-	@install -Dm 755 openbox-menu $(BINDIR)/openbox-menu
++	@install -Dm 755 openbox-menu "$(DESTDIR)$(BINDIR)/openbox-menu"
+ 
+ doc:
+ 	robodoc --src . --doc doc/ --multidoc --index --html --cmode
+ 
+ check: openbox-menu
+-	./openbox-menu > test.xml 
++	./openbox-menu > test.xml
+ 	xmllint test.xml
+ 	rm test.xml
+ 
diff --git a/x11-misc/openbox-menu/metadata.xml b/x11-misc/openbox-menu/metadata.xml
new file mode 100644
index 000000000000..3ec7e75078cb
--- /dev/null
+++ b/x11-misc/openbox-menu/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>desktop-misc</herd>
+<upstream>
+<maintainer status="active">
+<email>mimasgpc@free.fr</email>
+</maintainer>
+<doc lang="en">http://mimasgpc.free.fr/openbox-menu_en.html</doc>
+</upstream>
+<use>
+<flag name='icons'>Enable support for icons in menus</flag>
+<flag name='svg'>Support SVG icons</flag>
+</use>
+</pkgmetadata>
+
diff --git a/x11-misc/openbox-menu/openbox-menu-0.5.1.ebuild b/x11-misc/openbox-menu/openbox-menu-0.5.1.ebuild
new file mode 100644
index 000000000000..6c6e36cd0d26
--- /dev/null
+++ b/x11-misc/openbox-menu/openbox-menu-0.5.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Another dynamic menu generator for Openbox"
+HOMEPAGE="http://mimasgpc.free.fr/openbox-menu_en.html"
+SRC_URI="https://bitbucket.org/fabriceT/${PN}/downloads/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="+icons svg"
+REQUIRED_USE="svg? ( icons )"
+
+CDEPEND="
+	dev-libs/glib:2
+	lxde-base/menu-cache
+	x11-libs/gtk+:2
+"
+RDEPEND="
+	${CDEPEND}
+	icons? ( x11-wm/openbox[imlib,svg?] )
+	!icons? ( x11-wm/openbox )
+"
+DEPEND="
+	${CDEPEND}
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.5.0-build.patch
+	epatch_user
+	tc-export CC PKG_CONFIG
+}
+
+src_compile() {
+	emake \
+		$(usex icons 'ICONS=1' 'ICONS=0') \
+		$(usex svg 'SVG_ICONS=1' 'SVG_ICONS=0')
+}
diff --git a/x11-misc/openbox-menu/openbox-menu-0.7.0.ebuild b/x11-misc/openbox-menu/openbox-menu-0.7.0.ebuild
new file mode 100644
index 000000000000..1a4fc20dc2a7
--- /dev/null
+++ b/x11-misc/openbox-menu/openbox-menu-0.7.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Another dynamic menu generator for Openbox"
+HOMEPAGE="http://mimasgpc.free.fr/openbox-menu_en.html"
+SRC_URI="https://bitbucket.org/fabriceT/${PN}/downloads/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+icons svg"
+REQUIRED_USE="svg? ( icons )"
+
+COMMON_DEPEND="
+	dev-libs/glib:2
+	lxde-base/menu-cache
+	x11-libs/gtk+:2
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	icons? ( x11-wm/openbox[imlib,svg?] )
+	!icons? ( x11-wm/openbox )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.5.0-build.patch
+	epatch_user
+	tc-export CC PKG_CONFIG
+}
+
+src_compile() {
+	emake \
+		$(usex icons 'ICONS=1' 'ICONS=0') \
+		$(usex svg 'SVG_ICONS=1' 'SVG_ICONS=0')
+}
diff --git a/x11-misc/oroborus-desklaunch/Manifest b/x11-misc/oroborus-desklaunch/Manifest
new file mode 100644
index 000000000000..88ce9333cf0b
--- /dev/null
+++ b/x11-misc/oroborus-desklaunch/Manifest
@@ -0,0 +1 @@
+DIST desklaunch_1.1.8.tar.gz 14258 SHA256 8cb14b959f80ab119d9a420494c36d6fa80108d3a5febd98cdd76713a1b73dd3
diff --git a/x11-misc/oroborus-desklaunch/files/oroborus-desklaunch-1.1.7-gentoo.diff b/x11-misc/oroborus-desklaunch/files/oroborus-desklaunch-1.1.7-gentoo.diff
new file mode 100644
index 000000000000..a6d833bcfd3d
--- /dev/null
+++ b/x11-misc/oroborus-desklaunch/files/oroborus-desklaunch-1.1.7-gentoo.diff
@@ -0,0 +1,39 @@
+--- Makefile
++++ Makefile
+@@ -1,29 +1,26 @@
+-CC        = gcc
+-CFLAGS    = -g -O2 -Wall
+-XROOT     = /usr/X11R6
+-INCLUDES  = -I$(XROOT)/include
+-LIBS      = -lX11 -lXext -lXpm 
+-LDPATH    = -L$(XROOT)/lib
++INCLUDES  = `pkg-config --cflags x11 xext xpm`
++LIBS      = `pkg-config --libs x11 xext xpm`
+ 
+-DESTDIR   =
+ PROG      = desklaunch
+ PREFIX    = $(DESTDIR)/usr
++MANDIR	  = $(PREFIX)/share/man
+ RCFILE    = .$(PROG)rc
+ DEFINES   = -DRCFILE=\"$(RCFILE)\" #-DDEBUG
+ 
+ OBJS      = $(PROG).o  
++MAN	  = debian/$(PROG).1
+ 
+ all: $(PROG) 
+ 
+ $(PROG): $(OBJS)
+-	$(CC) $(OBJS) $(LDPATH) $(LIBS) -o $@
++	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(LIBS) -o $@
+ 
+ $(OBJS): %.o: %.c $(HEADERS)
+ 	$(CC) $(CFLAGS) $(DEFINES) $(INCLUDES) -c $< -o $@
+ 
+ install: all
+-	install $(PROG) $(PREFIX)/bin
+-	install -d $(PREFIX)/share/$(PROG)
++	install -D -m 755 $(PROG) $(PREFIX)/bin/$(PROG)
++	install -D -m 644 $(MAN) $(MANDIR)/man1/$(PROG).1
+ 
+ uninstall:
+ 	rm -f $(PREFIX)/bin/$(PROG)
diff --git a/x11-misc/oroborus-desklaunch/metadata.xml b/x11-misc/oroborus-desklaunch/metadata.xml
new file mode 100644
index 000000000000..1c8c12910925
--- /dev/null
+++ b/x11-misc/oroborus-desklaunch/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
+	<longdescription>
+		DeskLaunch is a small utility for creating desktop icons using pixmaps. 
+		A simple click will launch the desired application.
+	</longdescription>
+</pkgmetadata>
diff --git a/x11-misc/oroborus-desklaunch/oroborus-desklaunch-1.1.8.ebuild b/x11-misc/oroborus-desklaunch/oroborus-desklaunch-1.1.8.ebuild
new file mode 100644
index 000000000000..80128379d1c9
--- /dev/null
+++ b/x11-misc/oroborus-desklaunch/oroborus-desklaunch-1.1.8.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit eutils toolchain-funcs
+
+MY_PN=${PN/oroborus-//}
+
+DESCRIPTION="utility for creating desktop icons for Oroborus"
+HOMEPAGE="http://www.oroborus.org"
+SRC_URI="mirror://debian/pool/main/d/${MY_PN}/${MY_PN}_${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXpm
+	!x11-wm/oroborus-extras"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_PN}-${PV}
+DOCS=( README debian/changelog debian/example_rc )
+
+pkg_setup() {
+	tc-export CC
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.1.7-gentoo.diff
+}
diff --git a/x11-misc/oroborus-deskmenu/Manifest b/x11-misc/oroborus-deskmenu/Manifest
new file mode 100644
index 000000000000..4bbf7257623d
--- /dev/null
+++ b/x11-misc/oroborus-deskmenu/Manifest
@@ -0,0 +1 @@
+DIST deskmenu_1.4.5.tar.gz 127599 SHA256 a875ee1f7771233575d2662c94223a331985cf532843852ece1fd73f6a6c63f6
diff --git a/x11-misc/oroborus-deskmenu/metadata.xml b/x11-misc/oroborus-deskmenu/metadata.xml
new file mode 100644
index 000000000000..0315d8a47428
--- /dev/null
+++ b/x11-misc/oroborus-deskmenu/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
+	<longdescription>
+		DeskMenu is a root menu program which is activated by clicking the root window. 
+		It is configured from a .deskmenurc file in your home directory. DeskMenu is 
+		useful for window managers which do not provide a menu such as Oroborus.
+	</longdescription>
+</pkgmetadata>
diff --git a/x11-misc/oroborus-deskmenu/oroborus-deskmenu-1.4.5.ebuild b/x11-misc/oroborus-deskmenu/oroborus-deskmenu-1.4.5.ebuild
new file mode 100644
index 000000000000..6a1d021fee13
--- /dev/null
+++ b/x11-misc/oroborus-deskmenu/oroborus-deskmenu-1.4.5.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+MY_PN=${PN/oroborus-//}
+
+DESCRIPTION="root menu program for Oroborus"
+HOMEPAGE="http://www.oroborus.org"
+SRC_URI="mirror://debian/pool/main/d/${MY_PN}/${MY_PN}_${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="=x11-libs/gtk+-2*
+	!x11-wm/oroborus-extras"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_PN}-${PV}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog NEWS README TODO example_rc || die
+}
diff --git a/x11-misc/oroborus-keylaunch/Manifest b/x11-misc/oroborus-keylaunch/Manifest
new file mode 100644
index 000000000000..469eb5bbccbb
--- /dev/null
+++ b/x11-misc/oroborus-keylaunch/Manifest
@@ -0,0 +1 @@
+DIST keylaunch_1.3.9.tar.gz 80286 SHA256 213da77e9263e6aa7edbb1204402ef55d5daff2cd66add2cacbf84a1206da1ef
diff --git a/x11-misc/oroborus-keylaunch/metadata.xml b/x11-misc/oroborus-keylaunch/metadata.xml
new file mode 100644
index 000000000000..47fa4b0fccba
--- /dev/null
+++ b/x11-misc/oroborus-keylaunch/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
+	<longdescription>
+		KeyLaunch is a small utility for binding commands to a hot key. It reads a configuration 
+		file in ~/.keylaunchrc. KeyLaunch uses Ctrl, Alt and Shift as modifier keys, 
+		the hotkey is up to the user.
+	</longdescription>
+</pkgmetadata>
diff --git a/x11-misc/oroborus-keylaunch/oroborus-keylaunch-1.3.9.ebuild b/x11-misc/oroborus-keylaunch/oroborus-keylaunch-1.3.9.ebuild
new file mode 100644
index 000000000000..f367bd5e9435
--- /dev/null
+++ b/x11-misc/oroborus-keylaunch/oroborus-keylaunch-1.3.9.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+MY_PN=${PN/oroborus-//}
+
+DESCRIPTION="utility for binding keys in Oroborus"
+HOMEPAGE="http://www.oroborus.org"
+SRC_URI="mirror://debian/pool/main/k/${MY_PN}/${MY_PN}_${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="x11-libs/libX11
+	!x11-wm/oroborus-extras"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_PN}-${PV}
+
+src_prepare() {
+	sed -e "s: -g -O2 -Wall::" \
+		-e "/^install:/s/install-docs//" \
+		-i Makefile.in || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc README docs/example_rc debian/changelog
+}
diff --git a/x11-misc/outwiker/Manifest b/x11-misc/outwiker/Manifest
new file mode 100644
index 000000000000..e83be6b86381
--- /dev/null
+++ b/x11-misc/outwiker/Manifest
@@ -0,0 +1,2 @@
+DIST outwiker-1.7.0-src-full.tar.gz 17740708 SHA256 63adca029e5f2384bb2e865bc72b1a89dc78f2495396acb519a4aa663a4dc29c SHA512 9b776010847f91302c4469462124b7c986bb9fe58ff998c5979f00ab1ba03064fb8f89135406ad050346cae5a3403742e173561193f0c7c7676859d80a613d6f WHIRLPOOL 0e95b6548c1185ec06233e612019ea8487aefab6215daf5142455906c7bc0d38e71aa5c4a4c9d166a4f5a219435019de9004a1711033e9057e4602154e4d75b7
+DIST outwiker-1.8.0.tar.gz 27931330 SHA256 b000980b7c744000f1876860c163a27b5c9513ceb04dc77f4fbe974bfdf1a060 SHA512 d4b669383c8c1c95683e8f38617618583076f25db4c3eac778644c9bceeb1e78a7574a1dbea962e2d513e5a0349fced52608a470eb7b6c84dbf83a09c0256df6 WHIRLPOOL 10f0f13188a7da3bf12c15f64b23ba751d74d0fb4757cd3ab4db4d0b64a49177c0cb792f95b6dfc7d716a45b54671ca72c8642d753070e3aa071371a9f5bfea5
diff --git a/x11-misc/outwiker/metadata.xml b/x11-misc/outwiker/metadata.xml
new file mode 100644
index 000000000000..5c22da2a8ddd
--- /dev/null
+++ b/x11-misc/outwiker/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer>
+    <email>pinkbyte@gentoo.org</email>
+    <name>Sergey Popov</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">Jenyay/outwiker</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/x11-misc/outwiker/outwiker-1.7.0.ebuild b/x11-misc/outwiker/outwiker-1.7.0.ebuild
new file mode 100644
index 000000000000..8cdf33b5b200
--- /dev/null
+++ b/x11-misc/outwiker/outwiker-1.7.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_DEPEND="2:2.7"
+inherit python
+
+DESCRIPTION="The tree notes organizer"
+HOMEPAGE="http://jenyay.net/Outwiker/English"
+SRC_URI="http://jenyay.net/uploads/Soft/Outwiker/${P}-src-full.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-python/pywebkitgtk
+	dev-python/wxpython"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}"
+
+src_prepare() {
+	# fix desktop file
+	sed -i -e 's/Application;//' outwiker.desktop || die 'sed on outwiker.desktop failed'
+}
+
+src_compile() { :; }
+
+pkg_postinst() {
+	python_mod_optimize "${ED}/usr/share/${PN}"
+}
+
+pkg_postrm() {
+	python_mod_cleanup "${ED}/usr/share/${PN}"
+}
diff --git a/x11-misc/outwiker/outwiker-1.8.0.ebuild b/x11-misc/outwiker/outwiker-1.8.0.ebuild
new file mode 100644
index 000000000000..a7610870a498
--- /dev/null
+++ b/x11-misc/outwiker/outwiker-1.8.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+inherit eutils python-r1
+
+DESCRIPTION="The tree notes organizer"
+HOMEPAGE="http://jenyay.net/Outwiker/English"
+SRC_URI="https://github.com/Jenyay/${PN}/archive/stable_${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="${PYTHON_DEPS}"
+RDEPEND="${DEPEND}
+	dev-python/pywebkitgtk[${PYTHON_USEDEP}]
+	dev-python/wxpython[${PYTHON_USEDEP}]
+	virtual/python-imaging[${PYTHON_USEDEP}]
+	x11-misc/xdg-utils
+	x11-themes/hicolor-icon-theme
+"
+
+S="${WORKDIR}/${PN}-stable_${PV}"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+src_prepare() {
+	# fix desktop file
+	sed -i -e 's/Application;//' outwiker.desktop || die 'sed on outwiker.desktop failed'
+
+	epatch_user
+}
diff --git a/x11-misc/parcellite/Manifest b/x11-misc/parcellite/Manifest
new file mode 100644
index 000000000000..bf9877081aad
--- /dev/null
+++ b/x11-misc/parcellite/Manifest
@@ -0,0 +1 @@
+DIST parcellite-1.1.9.tar.gz 720177 SHA256 cba89585082eebbe848ac1c0023cc71a0184c0db24ebc5f8a21039e46d7f11d4 SHA512 24721dbd4f049f65a40f4e4c6914344062d49dfb50e3cf6496c6f14d9aff02bef5b88d3a714e8176955c84b1324c9ca1f35b389e8033d1232dd3c802c40e32bf WHIRLPOOL ce605b7fdb000840eada03e6c29d9ea86a9a9f1f7461e34206bfd10960967bad3bc7b093ce32a8d337cde07337ebcde5cf041b50bd8785178c4a70426482e130
diff --git a/x11-misc/parcellite/metadata.xml b/x11-misc/parcellite/metadata.xml
new file mode 100644
index 000000000000..8e77238df625
--- /dev/null
+++ b/x11-misc/parcellite/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>desktop-misc</herd>
+	<upstream>
+		<remote-id type="sourceforge">parcellite</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-misc/parcellite/parcellite-1.1.9.ebuild b/x11-misc/parcellite/parcellite-1.1.9.ebuild
new file mode 100644
index 000000000000..a76ef01e489f
--- /dev/null
+++ b/x11-misc/parcellite/parcellite-1.1.9.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils fdo-mime
+
+MY_P=${PN}-${PV/_}
+
+DESCRIPTION="A lightweight GTK+ based clipboard manager"
+HOMEPAGE="http://parcellite.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="nls"
+
+RDEPEND=">=dev-libs/glib-2.14
+	>=x11-libs/gtk+-2.10:2"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? (
+		dev-util/intltool
+		sys-devel/gettext
+	)"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	sed -i data/${PN}.desktop.in -e 's:Application;::g' || die
+
+	sed -i -e '/^ALL_LINGUAS=/d' configure || die
+	strip-linguas -i po/
+	export ALL_LINGUAS="${LINGUAS}"
+}
+
+src_configure() {
+	econf $(use_enable nls)
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}
diff --git a/x11-misc/pathfinder/Manifest b/x11-misc/pathfinder/Manifest
new file mode 100644
index 000000000000..be8d2e7aae99
--- /dev/null
+++ b/x11-misc/pathfinder/Manifest
@@ -0,0 +1,4 @@
+DIST fox-1.6.36.tar.gz 4344694 SHA256 cf8f4d09e104d6b3c425df3ce5b3bd54ed4c8095389f742f81370aba16169dff SHA512 2985404d6b2122159e9859d3490a154b75429bb1cf9d9920155f454012ef88fbd005548db0e68d55826d7b9d68ec745bccd14e27a8ff13bdbf5c8357f47ccdc0 WHIRLPOOL 74af19f2d041b785e88799b1fc8aad5c94efa30e53b9fecd0e8bfb6abff58c3930ef28e91d3199d79acacb100d2281ad7497bc1656556ef0d78daa109f90c860
+DIST fox-1.7.45.tar.gz 5254563 SHA256 78f2b5f609a52d21da08e693d45b8eeb9d4ceed52ad86e451ef4485f2375c829 SHA512 ec8acf0eb0b1882254f7df2abdcb87445992fc9fb8165afcc08b8dd52a718cb31953849efc7a530bd682e6265687bdf4dc9fb5c930557b9405235182894684b0 WHIRLPOOL 08808e67e0e31c7389b1d4ac097d7d707fb48a925df233021913bc80363002c0c4ce19c8630f4bd5c87ebb5bc5c010dc7f3260f415dfa5b60390c5aae316de78
+DIST fox-1.7.47.tar.gz 5271135 SHA256 7f1de8566b88b0010137ea1172168d53494d2d14bfa03fe32f7796146a31a2a3 SHA512 8802c7a21ba35b48a638fb87354da3de54c82ebdd3f931a601f55473fe1f7c16bfa2df253e8531af2058665d9b6f31adf52f6973c2d94f435cc90ac112af22ed WHIRLPOOL fbcf4540b268e95fa4d70ed335d8f499ec46e18390cdc090c98c21b4be5ff3ec576439265cfcf8b90c037fed7937c3a5f19f8544db1906cf86a3f255b8092d62
+DIST fox-1.7.49.tar.gz 5336321 SHA256 2435c56cde3ba6617c638af4f3bac39e8f4d5dd5a5c6d0805d274c7ba05c520c SHA512 da6c3478370f1e72091675e49f8458a6722eca4735bf89052b2b7ef02f4e74ee41f10c9fcc39a24a1571dd0bb1cdf779e9dea5bf15be20722ca783c9d59eb6e9 WHIRLPOOL 53ad3d34e57507702fc2ac9bd7b446021a99e3dff5b337cda090a670b06d4733abce2bbca88a7586e8af2d00f16ee84b0bd3c42f66fd6e430cc6d342bb76b1ff
diff --git a/x11-misc/pathfinder/metadata.xml b/x11-misc/pathfinder/metadata.xml
new file mode 100644
index 000000000000..00c1680ed459
--- /dev/null
+++ b/x11-misc/pathfinder/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>mabi@gentoo.org</email>
+		<name>Matti Bickel</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/x11-misc/pathfinder/pathfinder-1.6.36.ebuild b/x11-misc/pathfinder/pathfinder-1.6.36.ebuild
new file mode 100644
index 000000000000..61802fde79cd
--- /dev/null
+++ b/x11-misc/pathfinder/pathfinder-1.6.36.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="1"
+
+inherit fox
+
+DESCRIPTION="File manager based on the FOX Toolkit"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 hppa ppc ppc64 ~sparc x86"
+IUSE="jpeg png tiff"
+
+DEPEND="
+	x11-libs/fox:1.6
+	jpeg? ( virtual/jpeg )
+	png? ( media-libs/libpng:0 )
+	tiff? ( media-libs/tiff:0 )"
+
+RDEPEND="${DEPEND}"
+
+FOXCONF="$(use_enable jpeg) \
+	$(use_enable png) \
+	$(use_enable tiff)"
diff --git a/x11-misc/pathfinder/pathfinder-1.7.45.ebuild b/x11-misc/pathfinder/pathfinder-1.7.45.ebuild
new file mode 100644
index 000000000000..f46b53527e1e
--- /dev/null
+++ b/x11-misc/pathfinder/pathfinder-1.7.45.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit fox
+
+DESCRIPTION="File manager based on the FOX Toolkit"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+jpeg +png +tiff"
+
+DEPEND="
+	x11-libs/fox:1.7
+	jpeg? ( virtual/jpeg )
+	png? ( media-libs/libpng:0 )
+	tiff? ( media-libs/tiff:0 )"
+
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	FOXCONF="$(use_enable jpeg) \
+		$(use_enable png) \
+		$(use_enable tiff)" fox_src_configure
+}
diff --git a/x11-misc/pathfinder/pathfinder-1.7.47.ebuild b/x11-misc/pathfinder/pathfinder-1.7.47.ebuild
new file mode 100644
index 000000000000..dfb852f2eedd
--- /dev/null
+++ b/x11-misc/pathfinder/pathfinder-1.7.47.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit fox
+
+DESCRIPTION="File manager based on the FOX Toolkit"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+jpeg +png +tiff"
+
+DEPEND="
+	x11-libs/fox:1.7
+	x11-libs/libICE
+	x11-libs/libSM
+	jpeg? ( virtual/jpeg )
+	png? ( media-libs/libpng:0 )
+	tiff? ( media-libs/tiff:0 )"
+
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	FOXCONF="$(use_enable jpeg) \
+		$(use_enable png) \
+		$(use_enable tiff)" fox_src_configure
+}
diff --git a/x11-misc/pathfinder/pathfinder-1.7.49.ebuild b/x11-misc/pathfinder/pathfinder-1.7.49.ebuild
new file mode 100644
index 000000000000..924cb567e07f
--- /dev/null
+++ b/x11-misc/pathfinder/pathfinder-1.7.49.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit fox
+
+DESCRIPTION="File manager based on the FOX Toolkit"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~hppa ppc ~ppc64 ~sparc x86"
+IUSE="+jpeg +png +tiff"
+
+DEPEND="
+	x11-libs/fox:1.7
+	x11-libs/libICE
+	x11-libs/libSM
+	jpeg? ( virtual/jpeg )
+	png? ( media-libs/libpng:0 )
+	tiff? ( media-libs/tiff:0 )"
+
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	FOXCONF="$(use_enable jpeg) \
+		$(use_enable png) \
+		$(use_enable tiff)" fox_src_configure
+}
diff --git a/x11-misc/pcmanfm-qt/Manifest b/x11-misc/pcmanfm-qt/Manifest
new file mode 100644
index 000000000000..1ffa970f1855
--- /dev/null
+++ b/x11-misc/pcmanfm-qt/Manifest
@@ -0,0 +1,3 @@
+DIST pcmanfm-qt-0.7.0.tar.xz 125308 SHA256 7ed3b2dec812294f770bdc39725eb94c8ea722420065d040ed4edf4d8455ec31 SHA512 1ddfb8139c805cb1df1cc028a82dadaee8f7cdd918ef108b3d4bad81a737b7cab517dd19803537264f5abab3e1942591da859cc431ad16916c756b402b269178 WHIRLPOOL 33046e270cbca03ac93348686a496d0a1ae210c13e28119307bd67e0ff2a1b3c89899e2c39884d4fa7924af23361b7e3e015981e7ae6ed53b1734f0882ab7aa8
+DIST pcmanfm-qt-0.8.0.tar.xz 164284 SHA256 63672fdf819d8a2c60b3ab21841a830702624d33565352af2850ef7cba9b5f16 SHA512 6135546b34703605de9ca51e4b28758cfda662aa10ce67eedadacfd6a56af65e1fa2229c7973e33d77e0f3877eca03581a930c0fc217904d62567f76cc273802 WHIRLPOOL f49bf98a56411b1c8e589104ace3dd0361baa6cac424e16d874d88e14361cf4055698b69c125892bea0bef688676080edc1685f5e21f3dd7c892437f2d50c3ba
+DIST pcmanfm-qt-0.9.0.tar.xz 189184 SHA256 2df0f0a0c092f9ee6e7311255ab2aed66c8ea897b3399affb96732c46421e2df SHA512 cbd2f508ad26f5f0b0ea55ad210fadea773fc1a9f7851cb7e40459b6c0fcab0a65cafa51b8de881b6e197594dd2aa862d815241fb2818ac4ee3c03274051e0e0 WHIRLPOOL e5ff20b344d3ff307df7030b2fd76cffad354f578999252a3d76fc80601a6a7ddbce208b906fb6e04e0161d5cc73caa9d64892a27b28872bf8be73e42cc7b925
diff --git a/x11-misc/pcmanfm-qt/metadata.xml b/x11-misc/pcmanfm-qt/metadata.xml
new file mode 100644
index 000000000000..7e8af4140376
--- /dev/null
+++ b/x11-misc/pcmanfm-qt/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>lxqt</herd>
+  <maintainer>
+    <email>jauhien@gentoo.org</email>
+    <name>Jauhien Piatlicki</name>
+  </maintainer>
+  <longdescription lang="en">
+  </longdescription>
+</pkgmetadata>
diff --git a/x11-misc/pcmanfm-qt/pcmanfm-qt-0.7.0.ebuild b/x11-misc/pcmanfm-qt/pcmanfm-qt-0.7.0.ebuild
new file mode 100644
index 000000000000..4c4346ad606f
--- /dev/null
+++ b/x11-misc/pcmanfm-qt/pcmanfm-qt-0.7.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-utils multilib readme.gentoo
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://git.lxde.org/git/lxde/${PN}"
+else
+	SRC_URI="http://lxqt.org/downloads/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~x86"
+	S="${WORKDIR}"
+fi
+
+DESCRIPTION="Fast lightweight tabbed filemanager (Qt port)"
+HOMEPAGE="http://pcmanfm.sourceforge.net/"
+
+LICENSE="GPL-2 LGPL-2.1+"
+SLOT="0"
+
+CDEPEND=">=dev-libs/glib-2.18:2
+	dev-qt/qtcore:4
+	dev-qt/qtdbus:4
+	dev-qt/qtgui:4
+	>=lxde-base/menu-cache-0.4.1
+	>=x11-libs/libfm-1.2.0"
+RDEPEND="${CDEPEND}
+	virtual/eject
+	virtual/freedesktop-icon-theme"
+DEPEND="${CDEPEND}
+	>=dev-util/intltool-0.40
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+src_prepare() {
+	# fix multilib
+	sed -i -e "/LIBRARY\ DESTINATION/s:lib:$(get_libdir):" \
+		libfm-qt/CMakeLists.txt || die
+	cmake-utils_src_prepare
+}
+
+src_install() {
+	cmake-utils_src_install
+	DOC_CONTENTS="Be sure to set an icon theme in Edit > Preferences > User Interface"
+	readme.gentoo_src_install
+}
diff --git a/x11-misc/pcmanfm-qt/pcmanfm-qt-0.8.0.ebuild b/x11-misc/pcmanfm-qt/pcmanfm-qt-0.8.0.ebuild
new file mode 100644
index 000000000000..075a4d1d14db
--- /dev/null
+++ b/x11-misc/pcmanfm-qt/pcmanfm-qt-0.8.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-utils multilib readme.gentoo
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://git.lxde.org/git/lxde/${PN}"
+else
+	SRC_URI="http://lxqt.org/downloads/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Fast lightweight tabbed filemanager (Qt port)"
+HOMEPAGE="http://pcmanfm.sourceforge.net/"
+
+LICENSE="GPL-2 LGPL-2.1+"
+SLOT="0"
+
+CDEPEND=">=dev-libs/glib-2.18:2
+	dev-qt/linguist-tools:5
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	>=lxde-base/menu-cache-0.4.1
+	>=x11-libs/libfm-1.2.0
+	x11-libs/libxcb:=
+"
+RDEPEND="${CDEPEND}
+	x11-misc/xdg-utils
+	virtual/eject
+	virtual/freedesktop-icon-theme"
+DEPEND="${CDEPEND}
+	>=dev-util/intltool-0.40
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+src_prepare() {
+	# fix multilib
+	sed -i -e "/LIBRARY\ DESTINATION/s:lib:$(get_libdir):" \
+		libfm-qt/CMakeLists.txt || die
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DUSE_QT5=ON
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	DOC_CONTENTS="Be sure to set an icon theme in Edit > Preferences > User Interface"
+	readme.gentoo_src_install
+}
diff --git a/x11-misc/pcmanfm-qt/pcmanfm-qt-0.9.0.ebuild b/x11-misc/pcmanfm-qt/pcmanfm-qt-0.9.0.ebuild
new file mode 100644
index 000000000000..e379634ca7e7
--- /dev/null
+++ b/x11-misc/pcmanfm-qt/pcmanfm-qt-0.9.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-utils multilib readme.gentoo
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://git.lxde.org/git/lxde/${PN}"
+else
+	SRC_URI="http://downloads.lxqt.org/lxqt/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+DESCRIPTION="Fast lightweight tabbed filemanager (Qt port)"
+HOMEPAGE="http://pcmanfm.sourceforge.net/"
+
+LICENSE="GPL-2 LGPL-2.1+"
+SLOT="0"
+
+CDEPEND=">=dev-libs/glib-2.18:2
+	dev-qt/linguist-tools:5
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	>=lxde-base/menu-cache-0.4.1
+	>=x11-libs/libfm-1.2.0
+	x11-libs/libxcb:=
+"
+RDEPEND="${CDEPEND}
+	x11-misc/xdg-utils
+	virtual/eject
+	virtual/freedesktop-icon-theme"
+DEPEND="${CDEPEND}
+	>=dev-util/intltool-0.40
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+src_prepare() {
+	# fix multilib
+	sed -i -e "/LIBRARY\ DESTINATION/s:lib:$(get_libdir):" \
+		libfm-qt/CMakeLists.txt || die
+	cmake-utils_src_prepare
+}
+
+src_install() {
+	cmake-utils_src_install
+	DOC_CONTENTS="Be sure to set an icon theme in Edit > Preferences > User Interface"
+	readme.gentoo_src_install
+}
diff --git a/x11-misc/pcmanfm/Manifest b/x11-misc/pcmanfm/Manifest
new file mode 100644
index 000000000000..2324e378fc87
--- /dev/null
+++ b/x11-misc/pcmanfm/Manifest
@@ -0,0 +1,4 @@
+DIST pcmanfm-0.9.10.tar.gz 565628 SHA256 f133c6f207f719d1fc69fe8bc07b2de6883c6937ffa87448df42e3b1a30e0298 SHA512 25ee98785ebb490d2cafb3cfa4e52f1620c8ca8392e492c92e24e6fcf0baf301b456f1fbb3ec42ec460f2453bd5b29c16ce2d42d8a410573462255d581d6e694 WHIRLPOOL 19b84a96d9f948b7cb77445837986ae279cf676e2c565628443fb0baf0c177ad6d1142ddd7bdf16be9d7c9d9fcd71bd664a44d2afce728d6d3de6f115053ef5b
+DIST pcmanfm-1.1.2.tar.gz 434785 SHA256 23ee33b34066ac83ce9a98bc9930049e69839438fb60489bd453bec8c2068950 SHA512 0640919477bef8a88b76eb96aaf7f261c423189b60b27f720514040b4006ab5d9d30db5f25380320efc322ca2631298c72ee52a92bebf11ebf162eaa577058e1 WHIRLPOOL e94311f287d1fecf85444e30038a8e6cc65942855c3a562c5fd3c86e53ec46adb4fcf732993857d6e0bb212d1dd49034efd0b9983edcc8f006c4481126e3c778
+DIST pcmanfm-1.2.2.tar.xz 406584 SHA256 f620019ac0203b2d0e6eb8aa5a6a46e2bee15a43b4bdd9580db367b6325e9503 SHA512 a76be2e1e02d0e285b0ae239121260d438ae8fe96741d6cf24ddd554eb49187ae4a31d3193ebc688a4c042a96d35f3bfc6bb7c5af7fc288b08cd36711bd91e60 WHIRLPOOL 3bd00d760bd53f9bf010deddc39f7ac11e6c355908b72d258dd38fdf5227cfd2c33dd49d4b771b9ce7c8d64b6870ee5f39049e7b0bbee00834095e35deca6c5a
+DIST pcmanfm-1.2.3.tar.xz 406756 SHA256 cfa8d82fc63be147045174bef074807e1e32ce8c6bf4dbd8fad49e260bcf6380 SHA512 b350566c3aee0fe857ed1f0df2ae7d2ce51caf1547b951b380145078ba60f2fe6e0490c4d4c19465c5b1e0a9966205db6f8fe4dafb7cb3e987b9157551df2b28 WHIRLPOOL b342745086bf00e294cf40115c08f63ee99bb67c7f4cb4a6527b56bc3c26f85f93953a4655d91c1186335872342ef05362530f56c865fe5e46d8220a02cc781a
diff --git a/x11-misc/pcmanfm/metadata.xml b/x11-misc/pcmanfm/metadata.xml
new file mode 100644
index 000000000000..164fe00d2fab
--- /dev/null
+++ b/x11-misc/pcmanfm/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>lxde</herd>
+  <maintainer>
+  	<email>hwoarang@gentoo.org</email>
+	<name>Markos Chandras</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/x11-misc/pcmanfm/pcmanfm-0.9.10.ebuild b/x11-misc/pcmanfm/pcmanfm-0.9.10.ebuild
new file mode 100644
index 000000000000..508306a55e1d
--- /dev/null
+++ b/x11-misc/pcmanfm/pcmanfm-0.9.10.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit autotools fdo-mime
+
+DESCRIPTION="Fast lightweight tabbed filemanager"
+HOMEPAGE="http://pcmanfm.sourceforge.net/"
+SRC_URI="http://dev.gentoo.org/~hwoarang/distfiles/${P}.tar.gz"
+
+KEYWORDS="~alpha amd64 arm ppc x86 ~amd64-linux ~x86-linux"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug"
+
+COMMON_DEPEND=">=dev-libs/glib-2.18:2
+	>=x11-libs/gtk+-2.22.1:2
+	>=lxde-base/menu-cache-0.3.2
+	>=x11-libs/libfm-0.1.16"
+RDEPEND="${COMMON_DEPEND}
+	virtual/eject
+	virtual/freedesktop-icon-theme"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/intltool-0.40
+	virtual/pkgconfig
+	sys-devel/gettext"
+
+src_prepare() {
+	# Fix desktop icons
+	sed -i -e "/MimeType/s:=.*normal;:=:" "${S}"/data/${PN}.desktop \
+		|| die "failed to fix desktop icon"
+	# drop -O0 -g. Bug #382265 and #382265
+	sed -i -e "s:-O0::" -e "/-DG_ENABLE_DEBUG/s: -g::" "${S}"/configure.ac || die
+	#Remove -Werror for automake-1.12. Bug #421101
+	sed -i "s:-Werror::" configure.ac || die
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--sysconfdir="${EPREFIX}/etc" \
+		$(use_enable debug)
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+
+	elog 'PCmanFM can optionally support the menu://applications/ location.'
+	elog 'You should install lxde-base/lxmenu-data for that	functionality.'
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}
diff --git a/x11-misc/pcmanfm/pcmanfm-1.1.2.ebuild b/x11-misc/pcmanfm/pcmanfm-1.1.2.ebuild
new file mode 100644
index 000000000000..0e0b5cce9a48
--- /dev/null
+++ b/x11-misc/pcmanfm/pcmanfm-1.1.2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+inherit eutils fdo-mime readme.gentoo
+
+MY_PV="${PV/_/}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Fast lightweight tabbed filemanager"
+HOMEPAGE="http://pcmanfm.sourceforge.net/"
+SRC_URI="http://dev.gentoo.org/~hwoarang/distfiles/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm ~mips ppc x86"
+IUSE="debug"
+
+RDEPEND=">=dev-libs/glib-2.18:2
+	>=x11-libs/gtk+-2.16:2
+	>=lxde-base/menu-cache-0.3.2
+	x11-misc/shared-mime-info
+	>=x11-libs/libfm-${PV}:=
+	virtual/eject
+	virtual/freedesktop-icon-theme"
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.40
+	virtual/pkgconfig
+	sys-devel/gettext"
+
+S="${WORKDIR}"/${MY_P}
+
+DOCS=( AUTHORS )
+
+DOC_CONTENTS="PCmanFM can optionally support the menu://applications/
+	location. You should install lxde-base/lxmenu-data for that functionality."
+
+src_configure() {
+	strip-linguas -i "${S}/po"
+	econf --sysconfdir=/etc $(use_enable debug)
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
diff --git a/x11-misc/pcmanfm/pcmanfm-1.2.2.ebuild b/x11-misc/pcmanfm/pcmanfm-1.2.2.ebuild
new file mode 100644
index 000000000000..a9ce355b2792
--- /dev/null
+++ b/x11-misc/pcmanfm/pcmanfm-1.2.2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+inherit eutils fdo-mime readme.gentoo
+
+MY_PV="${PV/_/}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Fast lightweight tabbed filemanager"
+HOMEPAGE="http://pcmanfm.sourceforge.net/"
+SRC_URI="http://dev.gentoo.org/~hwoarang/distfiles/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~x86"
+IUSE="debug"
+
+RDEPEND=">=dev-libs/glib-2.18:2
+	>=x11-libs/gtk+-2.16:2
+	>=lxde-base/menu-cache-0.3.2
+	x11-misc/shared-mime-info
+	>=x11-libs/libfm-${PV}:=
+	virtual/eject
+	virtual/freedesktop-icon-theme"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	>=dev-util/intltool-0.40
+	virtual/pkgconfig
+	sys-devel/gettext"
+
+S="${WORKDIR}"/${MY_P}
+
+DOCS=( AUTHORS )
+
+DOC_CONTENTS="PCmanFM can optionally support the menu://applications/
+	location. You should install lxde-base/lxmenu-data for that functionality."
+
+src_configure() {
+	strip-linguas -i "${S}/po"
+	econf --sysconfdir=/etc $(use_enable debug)
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
diff --git a/x11-misc/pcmanfm/pcmanfm-1.2.3.ebuild b/x11-misc/pcmanfm/pcmanfm-1.2.3.ebuild
new file mode 100644
index 000000000000..b67fd6f5eee0
--- /dev/null
+++ b/x11-misc/pcmanfm/pcmanfm-1.2.3.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+PLOCALES="ar be bg bn ca cs da de el en_GB es et eu fa fi fo fr gl he hr hu id
+is it ja kk km ko lg lt lv ms nl pa pl pt pt_BR ro ru si sk sl sr sr@latin sv
+te th tr tt_RU ug uk vi zh_CN zh_TW"
+PLOCALE_BACKUP="en_GB"
+
+inherit eutils fdo-mime l10n readme.gentoo
+
+MY_PV="${PV/_/}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Fast lightweight tabbed filemanager"
+HOMEPAGE="http://pcmanfm.sourceforge.net/"
+SRC_URI="http://dev.gentoo.org/~hwoarang/distfiles/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm ~arm64 ~mips ppc x86"
+IUSE="debug"
+
+RDEPEND=">=dev-libs/glib-2.18:2
+	>=x11-libs/gtk+-2.16:2
+	>=lxde-base/menu-cache-0.3.2
+	x11-misc/shared-mime-info
+	>=x11-libs/libfm-${PV}:=[gtk(+)]
+	virtual/eject
+	virtual/freedesktop-icon-theme"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	>=dev-util/intltool-0.40
+	virtual/pkgconfig
+	sys-devel/gettext"
+
+S="${WORKDIR}"/${MY_P}
+
+DOCS=( AUTHORS )
+
+DOC_CONTENTS="PCmanFM can optionally support the menu://applications/
+	location. You should install lxde-base/lxmenu-data for that functionality."
+
+src_prepare() {
+	export LINGUAS="${LINGUAS:-${PLOCALE_BACKUP}}"
+	l10n_get_locales > ${S}/po/LINGUAS
+	epatch_user
+}
+
+src_configure() {
+	econf --sysconfdir=/etc $(use_enable debug)
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
diff --git a/x11-misc/pcmanfm/pcmanfm-9999.ebuild b/x11-misc/pcmanfm/pcmanfm-9999.ebuild
new file mode 100644
index 000000000000..435117549a3b
--- /dev/null
+++ b/x11-misc/pcmanfm/pcmanfm-9999.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+PLOCALES="ar be bg bn ca cs da de el en_GB es et eu fa fi fo fr gl he hr hu id
+is it ja kk km ko lg lt lv ms nl pa pl pt pt_BR ro ru si sk sl sr sr@latin sv
+te th tr tt_RU ug uk vi zh_CN zh_TW"
+PLOCALE_BACKUP="en_GB"
+
+inherit autotools eutils fdo-mime l10n readme.gentoo
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="git://pcmanfm.git.sourceforge.net/gitroot/pcmanfm/${PN}"
+	inherit git-r3
+	KEYWORDS=""
+else
+	SRC_URI="http://dev.gentoo.org/~hwoarang/distfiles/${MY_P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~x86"
+fi
+
+MY_PV="${PV/_/}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Fast lightweight tabbed filemanager"
+HOMEPAGE="http://pcmanfm.sourceforge.net/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug"
+
+RDEPEND=">=dev-libs/glib-2.18:2
+	>=x11-libs/gtk+-2.16:2
+	>=lxde-base/menu-cache-0.3.2
+	x11-misc/shared-mime-info
+	>=x11-libs/libfm-${PV}:=[gtk(+)]
+	virtual/eject
+	virtual/freedesktop-icon-theme"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	>=dev-util/intltool-0.40
+	virtual/pkgconfig
+	sys-devel/gettext"
+
+S="${WORKDIR}"/${MY_P}
+
+DOCS=( AUTHORS )
+
+DOC_CONTENTS="PCmanFM can optionally support the menu://applications/
+	location. You should install lxde-base/lxmenu-data for that functionality."
+
+src_prepare() {
+	intltoolize --force --copy --automake || die
+	# drop -O0 -g. Bug #382265 and #382265
+	sed -i -e "s:-O0::" -e "/-DG_ENABLE_DEBUG/s: -g::" "${S}"/configure.ac || die
+	#Remove -Werror for automake-1.12. Bug #421101
+	sed -i "s:-Werror::" configure.ac || die
+	eautoreconf
+	export LINGUAS="${LINGUAS:-${PLOCALE_BACKUP}}"
+	l10n_get_locales > ${S}/po/LINGUAS
+	epatch_user
+}
+
+src_configure() {
+	econf --sysconfdir="${EPREFIX}/etc" $(use_enable debug)
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
diff --git a/x11-misc/peksystray/Manifest b/x11-misc/peksystray/Manifest
new file mode 100644
index 000000000000..8338718251de
--- /dev/null
+++ b/x11-misc/peksystray/Manifest
@@ -0,0 +1,2 @@
+DIST peksystray-0.2.1.tar.gz 70261 SHA256 1642322c50c893467c0e48ed0ced258e17e0df5c2f0415d6dcf4fe906f530793
+DIST peksystray-0.4.0.tar.bz2 73810 SHA256 30733b349bc7919171a6fa31023c8704eaae9158084a5210d49aa3210123a778
diff --git a/x11-misc/peksystray/files/peksystray-0.4.0-asneeded.patch b/x11-misc/peksystray/files/peksystray-0.4.0-asneeded.patch
new file mode 100644
index 000000000000..1fc376a8ac92
--- /dev/null
+++ b/x11-misc/peksystray/files/peksystray-0.4.0-asneeded.patch
@@ -0,0 +1,36 @@
+--- configure.in
++++ configure.in
+@@ -4,6 +4,7 @@
+ AM_INIT_AUTOMAKE(peksystray, 0.4.0)
+ 
+ AC_PROG_CC
++AC_PATH_X
+ AC_PATH_XTRA
+ 
+ dnl Are we going to enable the debugging output ??
+@@ -19,13 +20,7 @@
+         AC_DEFINE(DEBUG,,[Enable verbose debugging output])
+ fi
+ 
+-CFLAGS="$CFLAGS $X_CFLAGS"
+-#x_includes="-I$x_includes"
+-LDFLAGS="$LDFLAGS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
+-#x_libraries="$X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
+-
+-AC_SUBST(x_includes)
+-AC_SUBST(x_libraries)
++AC_CHECK_LIB([X11], [XOpenDisplay])
+ 
+ AC_OUTPUT([
+ Makefile
+--- src/Makefile.am
++++ src/Makefile.am
+@@ -1,7 +1,4 @@
+ bin_PROGRAMS = peksystray
+ 
+-INCLUDES = @x_includes@
+-
+-peksystray_LDADD = @x_libraries@
+-
+ peksystray_SOURCES = peksystray.c
++peksystray_LDADD   = @X_PRE_LIBS@ @X_LIBS@ @X_EXTRA_LIBS@
diff --git a/x11-misc/peksystray/metadata.xml b/x11-misc/peksystray/metadata.xml
new file mode 100644
index 000000000000..c45a76de0a36
--- /dev/null
+++ b/x11-misc/peksystray/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">peksystray</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-misc/peksystray/peksystray-0.2.1.ebuild b/x11-misc/peksystray/peksystray-0.2.1.ebuild
new file mode 100644
index 000000000000..ec018af1ed9e
--- /dev/null
+++ b/x11-misc/peksystray/peksystray-0.2.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils multilib
+
+DESCRIPTION="A system tray dockapp for window managers supporting docking"
+HOMEPAGE="http://freshmeat.net/projects/peksystray"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha ~amd64 ppc x86"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXt"
+DEPEND="${RDEPEND}"
+
+src_compile() {
+	econf --x-libraries=/usr/$(get_libdir) || die
+	emake || die
+}
+
+src_install() {
+	dobin src/peksystray
+	dodoc AUTHORS NEWS README THANKS TODO
+}
diff --git a/x11-misc/peksystray/peksystray-0.4.0.ebuild b/x11-misc/peksystray/peksystray-0.4.0.ebuild
new file mode 100644
index 000000000000..714634616ca3
--- /dev/null
+++ b/x11-misc/peksystray/peksystray-0.4.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+inherit autotools eutils
+
+DESCRIPTION="A system tray dockapp for window managers supporting docking"
+HOMEPAGE="http://peksystray.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND="x11-libs/libX11
+	x11-libs/libXt"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-asneeded.patch
+	eautoreconf
+}
+
+src_install() {
+	dobin src/peksystray || die
+	dodoc AUTHORS ChangeLog NEWS README REFS THANKS TODO
+}
diff --git a/x11-misc/piedock/Manifest b/x11-misc/piedock/Manifest
new file mode 100644
index 000000000000..03be8bcbb48f
--- /dev/null
+++ b/x11-misc/piedock/Manifest
@@ -0,0 +1,2 @@
+DIST piedock-1.6.4.tar.bz2 254108 SHA256 3afaaf9fa917cc6c91f9dc69d501bb18e890bc00759acc81647f92ef6aa1181e SHA512 517ecb4637bf34bb79f1eea5671719b58de69c95e4ba311816139ac0fad95f973e9ae602e42459c8c62571a66119696a9c1f4e0c679f4ea7423136f7ae6d5a43 WHIRLPOOL cdc99478938d9093c2670909a9997fb6d3b12e6ec6329ed97f0ae00b21c27833599579c1dd5ad9ef7d7b6b0e9dd3dd9424d6c1b8640aea1bae3723d62341fef3
+DIST piedock-1.6.6.tar.bz2 254634 SHA256 1d0873b3b85d22edc1d28f6308ee70fd9054a6f34a8ae4fd9f6f161c18e32680 SHA512 4bad03387a21c75cf48b80ef2bf6ccc3553097fa41115a40689ec2c8e00ee9fadddbe43226f90012667eb8545e1209e5c9f6308f436bdf1d12d73de30764f1be WHIRLPOOL 1d605bb5c18f4e89f1dce3eb84b0f68bce80256f1ae125bb6753bd59d025e446b18b7889370e5477ba23399c8628c1f1bec1954160f4acfb90ddf750dd40fb84
diff --git a/x11-misc/piedock/files/piedock-1.6.1-signals.patch b/x11-misc/piedock/files/piedock-1.6.1-signals.patch
new file mode 100644
index 000000000000..7ed5e9734c61
--- /dev/null
+++ b/x11-misc/piedock/files/piedock-1.6.1-signals.patch
@@ -0,0 +1,10 @@
+--- a/src/main.cpp
++++ b/src/main.cpp
+@@ -25,6 +25,7 @@
+ #include <stdlib.h>
+ 
+ #ifdef HAVE_GTK
++#undef signals // Collides with GTK symbols
+ #include <gtk/gtk.h>
+ #endif
+ 
diff --git a/x11-misc/piedock/metadata.xml b/x11-misc/piedock/metadata.xml
new file mode 100644
index 000000000000..540f810e069d
--- /dev/null
+++ b/x11-misc/piedock/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>desktop-misc</herd>
+</pkgmetadata>
diff --git a/x11-misc/piedock/piedock-1.6.4.ebuild b/x11-misc/piedock/piedock-1.6.4.ebuild
new file mode 100644
index 000000000000..788f26d0c881
--- /dev/null
+++ b/x11-misc/piedock/piedock-1.6.4.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils
+
+DESCRIPTION="A little bit like the famous OS X dock but in shape of a pie menu"
+HOMEPAGE="http://markusfisch.de/PieDock"
+SRC_URI="http://markusfisch.de/downloads/${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gtk kde"
+
+RDEPEND="
+	media-libs/libpng
+	x11-libs/libX11
+	x11-libs/libXft
+	x11-libs/libXmu
+	x11-libs/libXrender
+	gtk? (
+		dev-libs/atk
+		dev-libs/glib
+		x11-libs/gdk-pixbuf
+		x11-libs/gtk+:2
+	)
+	kde? (
+		kde-base/kdelibs:4
+		dev-qt/qtcore:4
+		dev-qt/qtgui:4
+	)
+"
+DEPEND="${RDEPEND}"
+
+DOCS=( res/${PN}rc.sample AUTHORS ChangeLog NEWS )
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.6.1-signals.patch
+}
+
+src_configure() {
+	econf \
+		$(use_enable gtk) \
+		$(use_enable kde) \
+		--bindir="${EPREFIX}"/usr/bin \
+		--enable-xft \
+		--enable-xmu \
+		--enable-xrender
+}
diff --git a/x11-misc/piedock/piedock-1.6.6.ebuild b/x11-misc/piedock/piedock-1.6.6.ebuild
new file mode 100644
index 000000000000..788f26d0c881
--- /dev/null
+++ b/x11-misc/piedock/piedock-1.6.6.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils
+
+DESCRIPTION="A little bit like the famous OS X dock but in shape of a pie menu"
+HOMEPAGE="http://markusfisch.de/PieDock"
+SRC_URI="http://markusfisch.de/downloads/${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gtk kde"
+
+RDEPEND="
+	media-libs/libpng
+	x11-libs/libX11
+	x11-libs/libXft
+	x11-libs/libXmu
+	x11-libs/libXrender
+	gtk? (
+		dev-libs/atk
+		dev-libs/glib
+		x11-libs/gdk-pixbuf
+		x11-libs/gtk+:2
+	)
+	kde? (
+		kde-base/kdelibs:4
+		dev-qt/qtcore:4
+		dev-qt/qtgui:4
+	)
+"
+DEPEND="${RDEPEND}"
+
+DOCS=( res/${PN}rc.sample AUTHORS ChangeLog NEWS )
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.6.1-signals.patch
+}
+
+src_configure() {
+	econf \
+		$(use_enable gtk) \
+		$(use_enable kde) \
+		--bindir="${EPREFIX}"/usr/bin \
+		--enable-xft \
+		--enable-xmu \
+		--enable-xrender
+}
diff --git a/x11-misc/ptbatterysystemtray/Manifest b/x11-misc/ptbatterysystemtray/Manifest
new file mode 100644
index 000000000000..29023774ccc3
--- /dev/null
+++ b/x11-misc/ptbatterysystemtray/Manifest
@@ -0,0 +1 @@
+DIST ptbatterysystemtray-1.0.0_rc2.tar.gz 234884 SHA256 c28e43e9157df74c7e4599485c24fe8dc79201133c56d7d72f3e4eda5def12f4 SHA512 869eb71032691738277c1ba16b9e8d6e79ab25e8c533c2c12b4a69c6dbfee53d40bb471e4d28ce60b9e3dae19aea166953b5d5641ae0ba873ef55811fdd088e5 WHIRLPOOL 78dd6a7634563abd683ee389ba620fdf6db811df6b0a69773a5d249986ffd381d73f02377a2ae6dd6510e53449c7af4142232a875749a9ea851f391ac9582020
diff --git a/x11-misc/ptbatterysystemtray/metadata.xml b/x11-misc/ptbatterysystemtray/metadata.xml
new file mode 100644
index 000000000000..dc439f7e84f5
--- /dev/null
+++ b/x11-misc/ptbatterysystemtray/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>qt</herd>
+</pkgmetadata>
diff --git a/x11-misc/ptbatterysystemtray/ptbatterysystemtray-1.0.0_rc2.ebuild b/x11-misc/ptbatterysystemtray/ptbatterysystemtray-1.0.0_rc2.ebuild
new file mode 100644
index 000000000000..3698bf95acf3
--- /dev/null
+++ b/x11-misc/ptbatterysystemtray/ptbatterysystemtray-1.0.0_rc2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit qt4-r2
+
+DESCRIPTION="A simple battery monitor in the system tray"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+DEPEND="
+	dev-qt/qtcore:4
+	dev-qt/qtdbus:4
+	dev-qt/qtgui:4
+"
+RDEPEND="${DEPEND}"
+
+DOCS="AUTHORS ChangeLog README"
+
+src_unpack() {
+	default
+	mv ${PN}-${PN} "${S}" || die
+}
+
+src_configure() {
+	eqmake4 ${PN}.pro INSTALL_PREFIX=/usr
+}
diff --git a/x11-misc/py3status/Manifest b/x11-misc/py3status/Manifest
new file mode 100644
index 000000000000..fb2f550b171a
--- /dev/null
+++ b/x11-misc/py3status/Manifest
@@ -0,0 +1 @@
+DIST py3status-2.4.tar.gz 47991 SHA256 35021e5d9085f6d99de0e406d961cf0f79415ed9eb933181b3cf08b3ebec6826 SHA512 e2ff8b438e327f494daa94be283907049cd12722aef1a96300bbc21124a11b2c072a893aa7945584bc4bed84e27cc09bba7f17065e65265bcaaa2f3af3b3c944 WHIRLPOOL 35978385988e24ccbf62b3b1b167d21bbfbdbe4e6c481980a6fb583e8ef5336105fac2fa321fac832d19c3ada83aa40e3aa865e8701b3c8998c0fd3a569cc047
diff --git a/x11-misc/py3status/metadata.xml b/x11-misc/py3status/metadata.xml
new file mode 100644
index 000000000000..0387375d488f
--- /dev/null
+++ b/x11-misc/py3status/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>ultrabug@gentoo.org</email>
+		<name>Alexys Jacob</name>
+	</maintainer>
+	<longdescription lang="en">py3status is an extensible
+ i3status wrapper written in python</longdescription>
+	<upstream>
+		<remote-id type="pypi">py3status</remote-id>
+		<remote-id type="github">ultrabug/py3status</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-misc/py3status/py3status-2.4.ebuild b/x11-misc/py3status/py3status-2.4.ebuild
new file mode 100644
index 000000000000..ffe53b43ed31
--- /dev/null
+++ b/x11-misc/py3status/py3status-2.4.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+SRC_URI="https://github.com/ultrabug/py3status/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+inherit distutils-r1
+
+MY_PN="py3status"
+MY_P="${MY_PN}-${PV/_/-}"
+
+DESCRIPTION="py3status is an extensible i3status wrapper written in python"
+HOMEPAGE="https://github.com/ultrabug/py3status"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="x11-misc/i3status"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S=${WORKDIR}/${MY_P}
diff --git a/x11-misc/pypanel/Manifest b/x11-misc/pypanel/Manifest
new file mode 100644
index 000000000000..7f42872b58fb
--- /dev/null
+++ b/x11-misc/pypanel/Manifest
@@ -0,0 +1 @@
+DIST PyPanel-2.4.tar.gz 29857 SHA256 4e612b43c61b3a8af7d57a0364f6cd89df481dc41e20728afa643e9e3546e911
diff --git a/x11-misc/pypanel/metadata.xml b/x11-misc/pypanel/metadata.xml
new file mode 100644
index 000000000000..ca302fdca57c
--- /dev/null
+++ b/x11-misc/pypanel/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>desktop-misc</herd>
+	<longdescription>
+PyPanel is a lightweight panel/taskbar for X11 window managers that can
+be easily customized to match any desktop theme or taste.
+
+Some of the customizable features include transparency w/ shading, panel
+dimensions and location, font type and colors, button events/actions,
+clock and workspace name display.
+
+PyPanel should work with any WM that supports the EWMH specification.
+The following have been tested: Kahakai, Openbox3, PekWM, WindowMaker.
+</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">pypanel</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-misc/pypanel/pypanel-2.4-r1.ebuild b/x11-misc/pypanel/pypanel-2.4-r1.ebuild
new file mode 100644
index 000000000000..37149e2f5e85
--- /dev/null
+++ b/x11-misc/pypanel/pypanel-2.4-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="3"
+PYTHON_DEPEND="2"
+
+inherit distutils
+
+MY_PN=${PN/pyp/PyP}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="A lightweight panel/taskbar for X11 window managers"
+HOMEPAGE="http://pypanel.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ~ppc64 x86"
+IUSE=""
+
+RDEPEND="x11-libs/libXft
+	dev-python/python-xlib
+	sys-apps/sed
+	media-libs/imlib2[X]"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
diff --git a/x11-misc/qcomicbook/Manifest b/x11-misc/qcomicbook/Manifest
new file mode 100644
index 000000000000..97abe71d4927
--- /dev/null
+++ b/x11-misc/qcomicbook/Manifest
@@ -0,0 +1 @@
+DIST qcomicbook-0.9.0.tar.gz 738514 SHA256 8e36f94d7b55798258b6df085324da150b0983020853eb270992157e9692abcb SHA512 e3df724d851822a1d7e72fd6a9fc3b14d5d406d97e0098ddd07a6329a3fe98cc8aa5e77d071f98399d60f231bd0d6dd17ab995aa5e784171aa69fa3fd1ce861b WHIRLPOOL 93234e38c3a589139e305497aaef6d70ffdd09c9fd7fa71e39287dbd3e37dd3a7831b549bf53a72bb3193ca29fd353c282af1a80554de838cbd26265bd23b578
diff --git a/x11-misc/qcomicbook/metadata.xml b/x11-misc/qcomicbook/metadata.xml
new file mode 100644
index 000000000000..baccd90af55a
--- /dev/null
+++ b/x11-misc/qcomicbook/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>desktop-misc</herd>
+	<herd>qt</herd>
+</pkgmetadata>
diff --git a/x11-misc/qcomicbook/qcomicbook-0.9.0-r1.ebuild b/x11-misc/qcomicbook/qcomicbook-0.9.0-r1.ebuild
new file mode 100644
index 000000000000..3433048e7ddc
--- /dev/null
+++ b/x11-misc/qcomicbook/qcomicbook-0.9.0-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+CMAKE_IN_SOURCE_BUILD=1
+PLOCALES="cs_CZ de_DE es_ES fi_FI fr_CA fr_FR it_IT ko_KR nl_NL pl_PL pt_BR ru_RU uk_UA zh_CN"
+inherit cmake-utils flag-o-matic l10n
+
+DESCRIPTION="A viewer for comic book archives containing jpeg/png images"
+HOMEPAGE="http://qcomicbook.org/"
+SRC_URI="http://qcomicbook.org/releases/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE="debug"
+
+DEPEND="dev-qt/qtgui:4
+	app-text/poppler[qt4]"
+RDEPEND="${DEPEND}"
+
+DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
+
+src_prepare() {
+	rm_loc() {
+	        rm "i18n/${PN}_${1}.ts" || die "removing ${1} locale failed"
+	}
+	rm "i18n/${PN}_en_EN.ts" || die 'removing redundant english locale failed'
+	l10n_find_plocales_changes "i18n" "${PN}_" ".ts"
+	l10n_for_each_disabled_locale_do rm_loc
+
+	# fix desktop file
+	sed -i \
+		-e '/^Encoding/d' \
+		-e '/^Icon/s/.png//' \
+		-e '/^Categories/s/Application;//' \
+		"data/${PN}.desktop" || die 'sed on desktop file failed'
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	elog "For using QComicBook with compressed archives you may want to install:"
+	elog "    app-arch/p7zip"
+	elog "    app-arch/unace"
+	elog "    app-arch/unrar or app-arch/rar"
+	elog "    app-arch/unzip"
+}
diff --git a/x11-misc/qlipper/Manifest b/x11-misc/qlipper/Manifest
new file mode 100644
index 000000000000..68f65edf9513
--- /dev/null
+++ b/x11-misc/qlipper/Manifest
@@ -0,0 +1 @@
+DIST qlipper-2.0.2.tar.bz2 83544 SHA256 bd5463183966c6fee464b256b21f6e8397cd05faa20bd12719f7369a72c73958 SHA512 ac402f5d5fe77213192a59b0f52e780bf98f211868f88552a3bbcb400269714da42a5b13222a48aa0b8906c77100c8f5bf058dc159550e0d4a5575dc2917b268 WHIRLPOOL 87341e7172e3b5700a27e071d98fcf287b6cf795e99082707b73eaf4c4cc27e0da3c9e338d938b4a805f295e1163d51365a9f0373679787609ce986f536c91d7
diff --git a/x11-misc/qlipper/files/qlipper-2.0.2-system-includes.patch b/x11-misc/qlipper/files/qlipper-2.0.2-system-includes.patch
new file mode 100644
index 000000000000..1f478324e3f7
--- /dev/null
+++ b/x11-misc/qlipper/files/qlipper-2.0.2-system-includes.patch
@@ -0,0 +1,18 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index a036f9b..92a471a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -187,9 +187,13 @@ include_directories (
+ )
+ if (NOT QTSINGLEAPPLICATION_FOUND)
+     include_directories(${CMAKE_CURRENT_SOURCE_DIR}/qtsingleapplication)
++else ()
++    include_directories(${QTSINGLEAPPLICATION_INCLUDE_DIR})
+ endif (NOT QTSINGLEAPPLICATION_FOUND)
+ if (NOT QXT_FOUND)
+     include_directories(${CMAKE_CURRENT_SOURCE_DIR}/qxt)
++else ()
++    include_directories(${QXT_INCLUDE_PATH})
+ endif (NOT QXT_FOUND)
+ 
+ 
diff --git a/x11-misc/qlipper/metadata.xml b/x11-misc/qlipper/metadata.xml
new file mode 100644
index 000000000000..dc439f7e84f5
--- /dev/null
+++ b/x11-misc/qlipper/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>qt</herd>
+</pkgmetadata>
diff --git a/x11-misc/qlipper/qlipper-2.0.2.ebuild b/x11-misc/qlipper/qlipper-2.0.2.ebuild
new file mode 100644
index 000000000000..a1a4927fd6b3
--- /dev/null
+++ b/x11-misc/qlipper/qlipper-2.0.2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PLOCALES="cs sr"
+
+inherit cmake-utils l10n
+
+DESCRIPTION="Lightweight and cross-platform clipboard history applet"
+HOMEPAGE="http://code.google.com/p/qlipper/"
+SRC_URI="http://qlipper.googlecode.com/files/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4
+	dev-qt/qtsingleapplication[qt4(+),X]
+	x11-libs/libqxt
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-system-includes.patch"
+)
+
+src_prepare() {
+	cmake-utils_src_prepare
+	l10n_for_each_disabled_locale_do rm_ts
+}
+
+src_configure() {
+	cmake-utils_src_configure INSTALL_PREFIX="${EPREFIX}"/usr
+}
+
+rm_ts() {
+	rm -f "${S}"/ts/${PN}.${1}.ts
+}
diff --git a/x11-misc/qps/Manifest b/x11-misc/qps/Manifest
new file mode 100644
index 000000000000..e8ec5fbc582f
--- /dev/null
+++ b/x11-misc/qps/Manifest
@@ -0,0 +1,2 @@
+DIST qps-1.10.12.1.tar.bz2 223171 SHA256 d392b84f0b1d4d838014ff3f9fcbcc8f046b8262edc19a1504808b0ecb9cf70d
+DIST qps-1.10.16.tar.bz2 218323 SHA256 733b910fafbd07310fa4273e04aedbeaeaf3f8b9d0bbde3543e34bf83dcce39e
diff --git a/x11-misc/qps/metadata.xml b/x11-misc/qps/metadata.xml
new file mode 100644
index 000000000000..ab02f994fdd2
--- /dev/null
+++ b/x11-misc/qps/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>qt</herd>
+</pkgmetadata>
diff --git a/x11-misc/qps/qps-1.10.12.1.ebuild b/x11-misc/qps/qps-1.10.12.1.ebuild
new file mode 100644
index 000000000000..483127b169da
--- /dev/null
+++ b/x11-misc/qps/qps-1.10.12.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="2"
+
+inherit qt4-r2
+
+DESCRIPTION="Visual process manager - Qt version of ps/top"
+HOMEPAGE="http://qps.kldp.net/projects/qps/"
+SRC_URI="http://kldp.net/frs/download.php/5394/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+DEPEND="dev-qt/qtcore:4
+	dev-qt/qtgui:4"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	sed -i -e '/strip/d' ${PN}.pro || die "sed failed"
+}
+
+src_install() {
+	dobin ${PN} || die "installing binary failed"
+	doman ${PN}.1 || die "installing man page failed"
+	dodoc CHANGES || die "installing documentation failed"
+
+	newicon icon/icon.xpm ${PN}.xpm || die "installing icon failed"
+	domenu ${PN}.desktop || die "installing desktop file failed"
+}
diff --git a/x11-misc/qps/qps-1.10.16.ebuild b/x11-misc/qps/qps-1.10.16.ebuild
new file mode 100644
index 000000000000..d7a60838d9d5
--- /dev/null
+++ b/x11-misc/qps/qps-1.10.16.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit eutils qt4-r2
+
+DESCRIPTION="Visual process manager - Qt version of ps/top"
+HOMEPAGE="http://qps.kldp.net/projects/qps/"
+SRC_URI="http://kldp.net/frs/download.php/5963/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+DEPEND="dev-qt/qtcore:4
+	dev-qt/qtdbus:4
+	dev-qt/qtgui:4"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	sed -i -e '/strip/d' ${PN}.pro || die "sed failed"
+}
+
+src_install() {
+	dobin ${PN}
+	doman ${PN}.1
+	dodoc CHANGES
+
+	newicon icon/icon.xpm ${PN}.xpm
+	make_desktop_entry ${PN} ${PN} ${PN} "System;"
+}
diff --git a/x11-misc/qsynergy/Manifest b/x11-misc/qsynergy/Manifest
new file mode 100644
index 000000000000..af056f4d90b1
--- /dev/null
+++ b/x11-misc/qsynergy/Manifest
@@ -0,0 +1 @@
+DIST qsynergy-0.9.1.tar.gz 158259 SHA256 3ae886f977cae04c2152cc9f0bdcf88b17bd6ebe6b003c3eba58c68b1eb24630 SHA512 90632fe2a360e455b93aee4725f0130426e842a574dd17b2a36b6a23a646ded4f7998781e48599edb3ad962b0cb32c7ae5ad3bd2275a1a421c143f9ea2cec55f WHIRLPOOL c93fe5c53d289fe2ce26818752b028686830e156b6cde7dffb5f754016072d9327f1f7088a9cd7d044fa3644fb3b2969c381713c74d069b38b843b335a989d2d
diff --git a/x11-misc/qsynergy/metadata.xml b/x11-misc/qsynergy/metadata.xml
new file mode 100644
index 000000000000..6346c424e69b
--- /dev/null
+++ b/x11-misc/qsynergy/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>qt</herd>
+	<upstream>
+		<remote-id type="sourceforge">qsynergy</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-misc/qsynergy/qsynergy-0.9.1-r1.ebuild b/x11-misc/qsynergy/qsynergy-0.9.1-r1.ebuild
new file mode 100644
index 000000000000..61cdf9af11e5
--- /dev/null
+++ b/x11-misc/qsynergy/qsynergy-0.9.1-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit qt4-r2
+
+DESCRIPTION="A comprehensive and easy to use graphical front end for Synergy"
+HOMEPAGE="http://www.volker-lanz.de/en/software/qsynergy/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+DEPEND="dev-qt/qtgui:4"
+RDEPEND="${DEPEND}
+	x11-misc/synergy"
+
+DOCS=( README )
diff --git a/x11-misc/qterm/Manifest b/x11-misc/qterm/Manifest
new file mode 100644
index 000000000000..0d767abd34bb
--- /dev/null
+++ b/x11-misc/qterm/Manifest
@@ -0,0 +1 @@
+DIST qterm-0.5.12.tar.bz2 749254 SHA256 bd31051a6c117b05fef3ea163480143837c57632a84eab43e8e142860bcab22a SHA512 43f302f28edfb7fe4332d054390011e3eba37863be57191a13cedf2fa76d7b5db53d32947b7acd5e7585f2b0c8afe9b4b43334d86040f1f9249e9e767dd715e8 WHIRLPOOL 77b3fb09ea28901a151f8e0707a107677260a52d38a24427155dfa4e36d208bfc08be4016205d4c4f0c7fd374b967ccfed46271644e6dca2aa6e27ac637a991a
diff --git a/x11-misc/qterm/files/qterm-0.5.11-gentoo.patch b/x11-misc/qterm/files/qterm-0.5.11-gentoo.patch
new file mode 100644
index 000000000000..08a2c90dc397
--- /dev/null
+++ b/x11-misc/qterm/files/qterm-0.5.11-gentoo.patch
@@ -0,0 +1,11 @@
+--- src/qterm.desktop	2009-01-07 03:11:15.000000000 +0900
++++ src/qterm.desktop	2009-10-03 01:30:27.000000000 +0900
+@@ -3,7 +3,7 @@
+ Encoding=UTF-8
+ Type=Application
+ Name=QTerm
+-Exec=qterm -caption "%c" %i %m %u
++Exec=QTerm -caption "%c" %i %m %u
+ GenericName=BBS Client
+ GenericName[zh_CN]=BBS 客户端程序
+ GenericName[zh_TW]=BBS 客戶端程式
diff --git a/x11-misc/qterm/files/qterm-0.5.12-glibc216.patch b/x11-misc/qterm/files/qterm-0.5.12-glibc216.patch
new file mode 100644
index 000000000000..a2f7c3b625c1
--- /dev/null
+++ b/x11-misc/qterm/files/qterm-0.5.12-glibc216.patch
@@ -0,0 +1,12 @@
+diff --git a/src/main.cpp b/src/main.cpp
+index 6c39d4a..859de70 100644
+--- a/src/main.cpp
++++ b/src/main.cpp
+@@ -41,6 +41,7 @@ AUTHOR:        kingson fiasco
+ #include <fcntl.h>
+ #include <execinfo.h>
+ #include <signal.h>
++#include <unistd.h>
+ 
+ #define QTERM_SIG_MAX_RETS 50
+ #define QTERM_SIG_LOG_DIR "/var/tmp"
diff --git a/x11-misc/qterm/files/qterm-0.5.12-qt4.patch b/x11-misc/qterm/files/qterm-0.5.12-qt4.patch
new file mode 100644
index 000000000000..870055461120
--- /dev/null
+++ b/x11-misc/qterm/files/qterm-0.5.12-qt4.patch
@@ -0,0 +1,11 @@
+--- CMakeLists.txt~	2011-08-18 11:34:04.197046828 +0900
++++ CMakeLists.txt	2011-08-18 11:34:09.557046770 +0900
+@@ -7,7 +7,7 @@
+ set(QTERM_VERSION_RELEASE 12)
+ set(QTERM_VERSION "${QTERM_VERSION_MAJOR}.${QTERM_VERSION_MINOR}.${QTERM_VERSION_RELEASE}" )
+ set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
+-find_package(Qt4 REQUIRED)
++# find_package(Qt4 REQUIRED)
+ find_package(KDE4)
+ 
+ IF(WIN32 AND MSVC)
diff --git a/x11-misc/qterm/metadata.xml b/x11-misc/qterm/metadata.xml
new file mode 100644
index 000000000000..734d356f5763
--- /dev/null
+++ b/x11-misc/qterm/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>cjk</herd>
+	<upstream>
+		<remote-id type="sourceforge">qterm</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-misc/qterm/qterm-0.5.12-r1.ebuild b/x11-misc/qterm/qterm-0.5.12-r1.ebuild
new file mode 100644
index 000000000000..ff3f0daf4bc6
--- /dev/null
+++ b/x11-misc/qterm/qterm-0.5.12-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-utils
+
+DESCRIPTION="A BBS client for Linux"
+HOMEPAGE="http://qterm.sourceforge.net"
+SRC_URI="mirror://sourceforge/qterm/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-qt/qtcore-4.5:4
+	>=dev-qt/qtdbus-4.5:4
+	>=dev-qt/qtgui-4.5:4[qt3support]
+	>=dev-qt/qtscript-4.5:4
+	dev-libs/openssl:0
+	x11-libs/libX11
+"
+DEPEND="${RDEPEND}
+	kde-base/kdelibs
+	dev-qt/qthelp:4
+	dev-qt/qtwebkit:4"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.5.11-gentoo.patch"
+	"${FILESDIR}/${P}-qt4.patch"
+	"${FILESDIR}/${P}-glibc216.patch"
+)
+
+src_install() {
+	cmake-utils_src_install
+	mv "${D}"/usr/bin/qterm "${D}"/usr/bin/QTerm || die
+	dodoc README TODO
+}
diff --git a/x11-misc/qterm/qterm-0.5.12.ebuild b/x11-misc/qterm/qterm-0.5.12.ebuild
new file mode 100644
index 000000000000..2c9c7826656c
--- /dev/null
+++ b/x11-misc/qterm/qterm-0.5.12.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=3
+inherit cmake-utils eutils
+
+DESCRIPTION="A BBS client for Linux"
+HOMEPAGE="http://qterm.sourceforge.net"
+SRC_URI="mirror://sourceforge/qterm/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+RDEPEND=">=dev-qt/qtgui-4.5:4[qt3support]
+	dev-libs/openssl"
+DEPEND="${RDEPEND}
+	kde-base/kdelibs
+	dev-qt/qthelp:4
+	dev-qt/qtwebkit:4"
+
+src_prepare() {
+	epatch "${FILESDIR}"/"${PN}"-0.5.11-gentoo.patch \
+			"${FILESDIR}"/${P}-qt4.patch \
+			"${FILESDIR}"/${P}-glibc216.patch
+}
+
+src_install() {
+	cmake-utils_src_install
+	mv "${D}"/usr/bin/qterm "${D}"/usr/bin/QTerm || die
+	dodoc README TODO
+}
diff --git a/x11-misc/qtfm/Manifest b/x11-misc/qtfm/Manifest
new file mode 100644
index 000000000000..d265d13a3ecf
--- /dev/null
+++ b/x11-misc/qtfm/Manifest
@@ -0,0 +1 @@
+DIST qtfm-5.5.tar.gz 149667 SHA256 845fc43800d12483fa1993c56a8c965ff8dc917b97f03d9ce2e24318806fb211 SHA512 0d592b482f35c76b424cc581394d34299bb93367f287f57718d640df256f352fef7e389a8370889d0d78ca8afb9868cdfb56ae15671614e279365b72f9e629e0 WHIRLPOOL d842f533bdc16886255bfffdb173697334c5e4ee22aea35ba0f72561858b32eb035ce881f031f027c40b7f2f8a3786f69161d4097a2304aea02858b1878013c9
diff --git a/x11-misc/qtfm/metadata.xml b/x11-misc/qtfm/metadata.xml
new file mode 100644
index 000000000000..fe7f2a00ab81
--- /dev/null
+++ b/x11-misc/qtfm/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>qt</herd>
+<herd>desktop-misc</herd>
+</pkgmetadata>
diff --git a/x11-misc/qtfm/qtfm-5.5.ebuild b/x11-misc/qtfm/qtfm-5.5.ebuild
new file mode 100644
index 000000000000..80e89408ed6f
--- /dev/null
+++ b/x11-misc/qtfm/qtfm-5.5.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit fdo-mime qt4-r2
+
+DESCRIPTION="A small, lightweight file manager for desktops based on pure Qt"
+HOMEPAGE="http://www.qtfm.org/"
+SRC_URI="http://www.qtfm.org/${P}.tar.gz?attredirects=0 -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+# file is for LIBS += -lmagic
+RDEPEND="sys-apps/file
+	dev-qt/qtgui:4"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	sed -i \
+		-e "/^docs.path/s:qtfm:${PF}:" \
+		-e '/^docs.files/s: COPYING::' \
+		${PN}.desktop || die
+	sed -i \
+		-e '/MimeType=/s|$|;|' \
+		-e '/Categories=/s|$|;System;FileTools;|' \
+		${PN}.desktop || die
+}
+
+pkg_postinst() { fdo-mime_desktop_database_update; }
+pkg_postrm() { fdo-mime_desktop_database_update; }
diff --git a/x11-misc/qtnotifydaemon/Manifest b/x11-misc/qtnotifydaemon/Manifest
new file mode 100644
index 000000000000..fe3d8e9a1a94
--- /dev/null
+++ b/x11-misc/qtnotifydaemon/Manifest
@@ -0,0 +1 @@
+DIST qtnotifydaemon_1.0.14.orig.tar.gz 1136779 SHA256 1e5a91c8b1f4a9954842a69c2e41bf8fbccad4dcdc115797863098f800be54b5 SHA512 409f911be7d0e55f8a9f23db67ad6eefac1d215c598f54bab35bd704feee3a68ae21a3c416bd8848aacbdd82ca751ea1170c566d5615d4ac8a30adb87d487b8f WHIRLPOOL b73f19aa3e18dec8dd952768b14a0fb5defeee0c58c27fce50ca53bb5602c5fe8dfe15f79c5e727657ae35efae20e38e9720953e1f102c0c46717f475f830445
diff --git a/x11-misc/qtnotifydaemon/files/qtnotifydaemon-1.0.14-build.patch b/x11-misc/qtnotifydaemon/files/qtnotifydaemon-1.0.14-build.patch
new file mode 100644
index 000000000000..0aebc851c727
--- /dev/null
+++ b/x11-misc/qtnotifydaemon/files/qtnotifydaemon-1.0.14-build.patch
@@ -0,0 +1,32 @@
+Fixes build with GCC 4.7, as well as the gold linker.
+
+--- main.cpp
++++ main.cpp
+@@ -22,6 +22,7 @@
+ #include <signal.h>
+ #include <sys/stat.h>
+ #include <pwd.h>
++#include <unistd.h>
+ #include "dbus.h"
+ #include "notifywidget.h"
+ #include "notifyarea.h"
+--- notifyarea.cpp
++++ notifyarea.cpp
+@@ -22,6 +22,7 @@
+ #include <QSystemTrayIcon> //alex
+ #include <QDesktopWidget>
+ #include <fstream>
++#include <unistd.h>
+ #include "notifyarea.h"
+ #include "notifywidget.h"
+ #include "dbus.h"
+--- qtnotifydaemon.pro
++++ qtnotifydaemon.pro
+@@ -13,6 +13,7 @@
+ INCLUDEPATH += .
+ QT += dbus
+ RESOURCES += images.qrc
++LIBS += -lX11
+ 
+ # Input
+ SOURCES += main.cpp notifywidget.cpp dbus.cpp notifyarea.cpp message.cpp
diff --git a/x11-misc/qtnotifydaemon/metadata.xml b/x11-misc/qtnotifydaemon/metadata.xml
new file mode 100644
index 000000000000..e44f13e08d2e
--- /dev/null
+++ b/x11-misc/qtnotifydaemon/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>qt</herd>
+  <herd>desktop-misc</herd>
+  <maintainer>
+    <email>ssuominen@gentoo.org</email>
+    <name>Samuli Suominen</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="sourceforge">qtnotifydaemon</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/x11-misc/qtnotifydaemon/qtnotifydaemon-1.0.14.ebuild b/x11-misc/qtnotifydaemon/qtnotifydaemon-1.0.14.ebuild
new file mode 100644
index 000000000000..da339ae7d4e0
--- /dev/null
+++ b/x11-misc/qtnotifydaemon/qtnotifydaemon-1.0.14.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit qt4-r2
+
+DESCRIPTION="A flexible and configurable notification daemon"
+HOMEPAGE="http://sourceforge.net/projects/qtnotifydaemon/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}.orig.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	dev-qt/qtdbus:4
+	dev-qt/qtgui:4
+	dev-qt/qt3support:4
+	!x11-misc/notification-daemon
+	!x11-misc/notify-osd"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}
+
+PATCHES=( "${FILESDIR}/${P}-build.patch" )
+
+src_install() {
+	dobin ${PN}
+
+	insinto /usr/share/dbus-1/services
+	doins org.freedesktop.Notifications.service
+
+	doman debian/${PN}.1
+}
diff --git a/x11-misc/qxkb/Manifest b/x11-misc/qxkb/Manifest
new file mode 100644
index 000000000000..5b3b8b29b451
--- /dev/null
+++ b/x11-misc/qxkb/Manifest
@@ -0,0 +1,3 @@
+DIST qxkb-0.4.4.tar.bz2 201092 SHA256 034b70bddc5b363d3fcee9718924f0d2000acb3c2c99bd745505236a40689b6f SHA512 f4687bffd49d2b3cd4c37a768a9b4148d3192be20f7061111e188937c6208bb55ee9a9c83e706cf88ec52187965d03da888544a9ab6f6bc2eff0f99df9e7cca0 WHIRLPOOL 6decfcaa0d352362291eee1f4ca9b8a99e9187d01bcb5b6265136ccc8bc5b692f9ff410a4ed74a54ea653a65424171eb9b3c842868f67f34dc0271ba06bf0bbd
+DIST qxkb-0.4.5.tar.bz2 177479 SHA256 03c897c1a4c594b3895d5fb23ee6a405d6fb1ba062ecc502ce4513b2982974f9 SHA512 2e5ab7b563b72eab5ace0b5a3f14efabb2e138b80075605ddff059ab0d05b1726bf6ae6736ab9079a67d05be7e980f7836a240cc64d2881570e527f76453cf2e WHIRLPOOL 5edf8a4a255cfc33a607c4118205d32eab0f7589868f64d35fd57f3a142ca3063530e3973e1c60d96e79adde6f99e231c2c7821b5adfe4da748a6935bfd604d8
+DIST qxkb-0.4.6.tar.bz2 172194 SHA256 d41f09913ebf89c94ac75a7cd7dd08344485506f1c50a469e076a214952fee79 SHA512 25ac14043ddd6499abf338b1327c2c62c256293419de90932a149151fb00295230da37276c0c6b3ceb2466e983536b9eca3b7072516a6c2e8464c8f06cd2fcef WHIRLPOOL dad87ba3b6154d1c15c70ad97ab3eabe288e308c7118cc8afacd646759f341d7438256ae78a495949ac409b4411fd6a1a5f6cf7fb79c77299b3f35b2ba51c613
diff --git a/x11-misc/qxkb/metadata.xml b/x11-misc/qxkb/metadata.xml
new file mode 100644
index 000000000000..dc439f7e84f5
--- /dev/null
+++ b/x11-misc/qxkb/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>qt</herd>
+</pkgmetadata>
diff --git a/x11-misc/qxkb/qxkb-0.4.4-r1.ebuild b/x11-misc/qxkb/qxkb-0.4.4-r1.ebuild
new file mode 100644
index 000000000000..dd7bd5562a62
--- /dev/null
+++ b/x11-misc/qxkb/qxkb-0.4.4-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit cmake-utils
+
+DESCRIPTION="Qt4-based keyboard layout switcher"
+HOMEPAGE="http://code.google.com/p/qxkb/"
+SRC_URI="http://qxkb.googlecode.com/files/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="debug"
+
+DEPEND="x11-libs/libxkbfile
+	dev-qt/qtgui:4
+	dev-qt/qtsvg:4"
+RDEPEND="${DEPEND}
+	x11-apps/setxkbmap"
diff --git a/x11-misc/qxkb/qxkb-0.4.5.ebuild b/x11-misc/qxkb/qxkb-0.4.5.ebuild
new file mode 100644
index 000000000000..f30960060019
--- /dev/null
+++ b/x11-misc/qxkb/qxkb-0.4.5.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-utils
+
+DESCRIPTION="Qt4-based keyboard layout switcher"
+HOMEPAGE="http://code.google.com/p/qxkb/"
+SRC_URI="http://qxkb.googlecode.com/files/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+	x11-libs/libxkbfile
+	dev-qt/qtgui:4
+	dev-qt/qtsvg:4
+"
+RDEPEND="${DEPEND}
+	x11-apps/setxkbmap
+"
+
+src_prepare() {
+	sed -i -e 's:../language:${CMAKE_SOURCE_DIR}/language:' \
+		CMakeLists.txt || die
+
+	cmake-utils_src_prepare
+}
diff --git a/x11-misc/qxkb/qxkb-0.4.6.ebuild b/x11-misc/qxkb/qxkb-0.4.6.ebuild
new file mode 100644
index 000000000000..9edcd2054443
--- /dev/null
+++ b/x11-misc/qxkb/qxkb-0.4.6.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit cmake-utils
+
+DESCRIPTION="Qt4-based keyboard layout switcher"
+HOMEPAGE="http://code.google.com/p/qxkb/"
+SRC_URI="http://qxkb.googlecode.com/files/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="dev-qt/qtgui:4
+	dev-qt/qtsvg:4
+	x11-libs/libxkbfile"
+RDEPEND="${DEPEND}
+	x11-apps/setxkbmap"
+
+src_prepare() {
+	sed -i -e 's:../language:${CMAKE_SOURCE_DIR}/language:' \
+		CMakeLists.txt || die
+
+	cmake-utils_src_prepare
+}
diff --git a/x11-misc/read-edid/Manifest b/x11-misc/read-edid/Manifest
new file mode 100644
index 000000000000..a7ba33395d3b
--- /dev/null
+++ b/x11-misc/read-edid/Manifest
@@ -0,0 +1,3 @@
+DIST read-edid-1.4.2.tar.gz 84138 SHA256 c1b5d839fe6349efc183b3a3d33a8be1cd0dfea3c94015a86159d8aaeb6e9dd7 SHA512 b52c763a7713661a542f707d48251257c9540c4b1ad517b7ddbbc051edf919600cf27f93c13e32d5d6d148dd08327dc91f11eecc0b6db82179d044cef5b52550 WHIRLPOOL 8a64748f9976db385ea24a60fae86d55da2434e35b0d2cf46876680e7be6604bf3ab011226697cfd1b871ccf2fc7c1841f1228be54e8a9c55ba9d82bbc2972fa
+DIST read-edid-3.0.1.tar.gz 22688 SHA256 17430e66dc03812b6f1ac532acb65c8e3837dd0e90b6b45e1c4ea324d60a8027 SHA512 b9f44daaf7ee15823c2259a0e7ce41f003f2e24cc37291bd061803591fd0b24ddd60691d1724dec39b14cc1c07115c76d90e7ddf78af9a7d15302c75cfc1835d WHIRLPOOL 6671206fa7884174d26636e79fde089707ff388b09ead44dac13948943766b74b13e8d135c07b62c0af0e87d582ccba9a529be503387e7e6ba00bbf89ea395b2
+DIST read-edid-3.0.2.tar.gz 17508 SHA256 c7c6d8440f5b90f98e276829271ccea5b2ff5a3413df8a0f87ec09f834af186f SHA512 779ebe7f1ffb6e7952762b5f886e07974f2c0fe5fa9be0722b928559466b56aae450f741817bb91bb2e33ca66ab27af39cea3c7af220c99b85dae81734138aac WHIRLPOOL b86cf313046f766558986145e94fbcaaf6b3e643ec9d1b3778d836b2e7d050e22df259d7c35462569084ff30b890cab948af17740e13add4b5b3f0af68cb6943
diff --git a/x11-misc/read-edid/metadata.xml b/x11-misc/read-edid/metadata.xml
new file mode 100644
index 000000000000..540f810e069d
--- /dev/null
+++ b/x11-misc/read-edid/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>desktop-misc</herd>
+</pkgmetadata>
diff --git a/x11-misc/read-edid/read-edid-1.4.2.ebuild b/x11-misc/read-edid/read-edid-1.4.2.ebuild
new file mode 100644
index 000000000000..b3976804f4dd
--- /dev/null
+++ b/x11-misc/read-edid/read-edid-1.4.2.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="Get EDID information from a PnP monitor"
+HOMEPAGE="http://www.polypux.org/projects/read-edid/"
+SRC_URI="http://www.polypux.org/projects/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ppc ~sparc x86"
+
+DOCS=( AUTHORS ChangeLog NEWS README )
+
+src_configure() {
+	econf --mandir=/usr/share/man
+}
diff --git a/x11-misc/read-edid/read-edid-3.0.1.ebuild b/x11-misc/read-edid/read-edid-3.0.1.ebuild
new file mode 100644
index 000000000000..34c694f8e9be
--- /dev/null
+++ b/x11-misc/read-edid/read-edid-3.0.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit cmake-utils
+
+DESCRIPTION="Program that can get information from a PnP monitor"
+HOMEPAGE="http://www.polypux.org/projects/read-edid/"
+SRC_URI="http://www.polypux.org/projects/${PN}/${P}.tar.gz"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="-* amd64 x86"
+
+DEPEND=">=dev-libs/libx86-1.1"
+RDEPEND="$DEPEND"
+
+src_prepare() {
+	sed -i -e 's|COPYING||g;s|share/doc/read-edid|&-'"${PV}"'|g' \
+		CMakeLists.txt || die
+	cmake-utils_src_prepare
+}
diff --git a/x11-misc/read-edid/read-edid-3.0.2.ebuild b/x11-misc/read-edid/read-edid-3.0.2.ebuild
new file mode 100644
index 000000000000..0c59448a03ea
--- /dev/null
+++ b/x11-misc/read-edid/read-edid-3.0.2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit cmake-utils
+
+DESCRIPTION="Program that can get information from a PnP monitor"
+HOMEPAGE="http://www.polypux.org/projects/read-edid/"
+SRC_URI="http://www.polypux.org/projects/${PN}/${P}.tar.gz"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+
+DEPEND=">=dev-libs/libx86-1.1"
+RDEPEND="$DEPEND"
+
+src_prepare() {
+	sed -i -e 's|COPYING||g;s|share/doc/read-edid|&-'"${PV}"'|g' \
+		CMakeLists.txt || die
+	cmake-utils_src_prepare
+}
diff --git a/x11-misc/rednotebook/Manifest b/x11-misc/rednotebook/Manifest
new file mode 100644
index 000000000000..69a2f0de84bc
--- /dev/null
+++ b/x11-misc/rednotebook/Manifest
@@ -0,0 +1,2 @@
+DIST rednotebook-1.4.0.tar.gz 449654 SHA256 ca68e39e5fa3182eef334d160ff9b389aad39c22abfe7caa560a5ff92eb038b0 SHA512 04ba842b4b2050de15ea080af509a95c573664f2947ca7acbd51c0987185dfcff18b65d53db1ca61dba586f6a9f3193c20782c225229268c647c2b5716fc318b WHIRLPOOL a5fcebfb249f38c1a2924b4f8cdfb7b4f691fce20d25a068424eca04f41c512ef4a16e197808a0a384784e182f9f0bc52dd2590ee162170748b9dbbe4a839470
+DIST rednotebook-1.8.0.tar.gz 500452 SHA256 63beacfdc738a9640bcc7b35ae28c18c7310d9f6fc9e9a6afafcc4d37f628213 SHA512 4d165bff34013fb5583a98a77b96d149eea62b67f0f0177778f0f97e9f65beb2d298c6b08fb5f6f8b18fa951b18f19478b52b239ab1af397ee3850d24eb8a9cf WHIRLPOOL 684bf11e2552b0a5030bbfa58a27a2fa6825ecc8657c3954117096e76b28dc8fb18f261d199cf712b67d3f7439b65e15231c984da9e8d04a1e0bc4505c40ce98
diff --git a/x11-misc/rednotebook/files/rednotebook-1.2.0-disable-spell.patch b/x11-misc/rednotebook/files/rednotebook-1.2.0-disable-spell.patch
new file mode 100644
index 000000000000..ac4261b99018
--- /dev/null
+++ b/x11-misc/rednotebook/files/rednotebook-1.2.0-disable-spell.patch
@@ -0,0 +1,17 @@
+Index: rednotebook-1.2.0/rednotebook/gui/editor.py
+===================================================================
+--- rednotebook-1.2.0.orig/rednotebook/gui/editor.py
++++ rednotebook-1.2.0/rednotebook/gui/editor.py
+@@ -25,11 +25,7 @@ import gtk
+ import gobject
+ import pango
+ 
+-# try to import gtkspell
+-try:
+-    import gtkspell
+-except ImportError:
+-    gtkspell = None
++gtkspell = None
+ 
+ from rednotebook.gui import t2t_highlight
+ from rednotebook import undo
diff --git a/x11-misc/rednotebook/files/rednotebook-1.6.5-disable-spell.patch b/x11-misc/rednotebook/files/rednotebook-1.6.5-disable-spell.patch
new file mode 100644
index 000000000000..0648c425249f
--- /dev/null
+++ b/x11-misc/rednotebook/files/rednotebook-1.6.5-disable-spell.patch
@@ -0,0 +1,17 @@
+Index: rednotebook-1.6.5/rednotebook/gui/editor.py
+===================================================================
+--- rednotebook-1.6.5.orig/rednotebook/gui/editor.py
++++ rednotebook-1.6.5/rednotebook/gui/editor.py
+@@ -25,12 +25,7 @@ import gtk
+ import gobject
+ import pango
+ 
+-# Try to import gtkspell
+ gtkspell = None
+-try:
+-    import gtkspell
+-except ImportError:
+-    pass
+ 
+ from rednotebook.gui import t2t_highlight
+ from rednotebook import undo
diff --git a/x11-misc/rednotebook/metadata.xml b/x11-misc/rednotebook/metadata.xml
new file mode 100644
index 000000000000..0b1b70bb42e0
--- /dev/null
+++ b/x11-misc/rednotebook/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<use>
+		<flag name="libyaml">enable libyaml support</flag>
+		<flag name="spell">enable gtk-spell support</flag>
+	</use>
+	<maintainer>
+		<email>mattm@gentoo.org</email>
+		<name>Matthew Marlowe</name>
+	</maintainer>
+	<longdescription lang="en">
+A graphical journal with calendar, templates, tags, keyword searching, and export functionality.
+</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">rednotebook</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-misc/rednotebook/rednotebook-1.4.0.ebuild b/x11-misc/rednotebook/rednotebook-1.4.0.ebuild
new file mode 100644
index 000000000000..75cf524d6384
--- /dev/null
+++ b/x11-misc/rednotebook/rednotebook-1.4.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="3"
+
+PYTHON_DEPEND="2"
+LANGS="ar ast be bg bs ca cs cy da de el en_GB eo es eu fi fo fr gl he hr hu hy
+id it ja ka kk ko lt mn ms nb nds nl nn oc pl pt pt_BR ro ru si sk sr sv ta te
+tl tr ug uk uz vi wa zh_CN zh_HK zh_TW"
+
+inherit python eutils distutils
+
+DESCRIPTION="A graphical journal with calendar, templates, tags, keyword searching, and export functionality"
+HOMEPAGE="http://rednotebook.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="libyaml spell"
+for x in ${LANGS}; do
+	IUSE="${IUSE} linguas_${x}"
+done
+
+RDEPEND="dev-python/pyyaml[libyaml?]
+	>=dev-python/pygtk-2.13
+	dev-python/pywebkitgtk
+	spell? ( dev-python/gtkspell-python )"
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	! use spell && epatch "${FILESDIR}/${PN}-1.2.0-disable-spell.patch"
+	# rename wae file. I think this should be wa.po instead of wae.po
+	mv po/wae.po po/wa.po || die
+	for x in ${LANGS}; do
+		if ! has ${x} ${LINGUAS}; then
+			rm po/${x}.po || die
+		fi
+	done
+	distutils_src_prepare
+}
diff --git a/x11-misc/rednotebook/rednotebook-1.8.0.ebuild b/x11-misc/rednotebook/rednotebook-1.8.0.ebuild
new file mode 100644
index 000000000000..d862a3c0b542
--- /dev/null
+++ b/x11-misc/rednotebook/rednotebook-1.8.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils distutils-r1
+
+DESCRIPTION="A graphical journal with calendar, templates, tags, keyword searching, and export functionality"
+HOMEPAGE="http://rednotebook.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~x86"
+IUSE="libyaml spell"
+
+RDEPEND="
+	dev-python/pyyaml[libyaml?,${PYTHON_USEDEP}]
+	>=dev-python/pygtk-2.13[${PYTHON_USEDEP}]
+	>=dev-python/pywebkitgtk-1.1.5[${PYTHON_USEDEP}]
+	dev-python/chardet[${PYTHON_USEDEP}]
+	spell? ( dev-python/gtkspell-python[${PYTHON_USEDEP}] )"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	! use spell && epatch "${FILESDIR}/${PN}-1.6.5-disable-spell.patch"
+}
diff --git a/x11-misc/redshift/Manifest b/x11-misc/redshift/Manifest
new file mode 100644
index 000000000000..bc88f9810d43
--- /dev/null
+++ b/x11-misc/redshift/Manifest
@@ -0,0 +1,3 @@
+DIST redshift-1.10.tar.gz 519595 SHA256 f7a1ca1eccf662995737e14f894c2b15193923fbbe378d151e346a8013644f16 SHA512 0fd3867d883268279b6297a0eec1bcdc20022a893b935fd4767fbfc0797ad044777af4cf1efcfec7a1f362306ae88869f73b20c91b29844e9e201881c5b56260 WHIRLPOOL 3aa705a5afedb4ebb7fcab98afec0d69ea5c8c7cd280eee72fc2aff260df85d00b0af722ce6fc1e3e04d000e30d37eb2ddca8b82d6a25e9d587f4e0d98bfc626
+DIST redshift-1.7.tar.bz2 269820 SHA256 9bfa3c3d4a9ce6ea06a5e6235ab4e8215a456c08d6e7451c0389456a37d010c8 SHA512 522b29c2a96d56d8497f93b8a72f295a3a4bbbaef32c514b6975da9a6d046bc0c97318458e8dad000ae18bef98a8fae0d1c2249f3be6860985a4e5ae0b1bb559 WHIRLPOOL 78c1e4a121b93889f6ebbfe86962c5b830a4b7169d0a8c33883e00405dfc5d51409a59b788618a8be740720c50ef17a230fbcf408d5ece858b73286eec336c27
+DIST redshift-1.9.1.tar.gz 163257 SHA256 31636a76c3544cd1efd3cd43f443d97b63f9d27c4bcc90619897cf489ea74766 SHA512 7d0d037a6415efd5b82e4d617fdc826bb67259358bb4c00153a121712ae3ea260e975860bb02b8cdc789d9593fd420fae6cf5319cf0bad29202ba2ff83f9efff WHIRLPOOL 926123312d64e3f974e253b7226fade48233fdccd6ba6494dac00ef0b26ceaf021be8f35c446851bd59e20e66ea1fcc65c2aa087f193d3960328540b31def2ea
diff --git a/x11-misc/redshift/files/1.6-bonoboiidfix.patch b/x11-misc/redshift/files/1.6-bonoboiidfix.patch
new file mode 100644
index 000000000000..b4f6c4de2749
--- /dev/null
+++ b/x11-misc/redshift/files/1.6-bonoboiidfix.patch
@@ -0,0 +1,43 @@
+Description: Handle newer versions of gnome-panel gconf schema.
+ In newer versions of gnome-panel (>2.30), the gconf identifier 
+ name for bonobo_iid was renamed to applet_iid, this caused 
+ redshift to be unable to locate the Clock Applet.  This patch 
+ attempts to use the legacy behaviour, and on failure to 
+ retrieve the value uses the newer identifer.
+Author: Miloš Komarčević <kmilos@gmail.com>
+Bug: https://launchpad.net/bugs/706353
+Bug-Ubuntu: https://launchpad.net/bugs/706353
+Bug-Fedora: https://bugzilla.redhat.com/661145
+Bug-Gentoo: https://bugs.gentoo.org/365481
+ 
+--- a/src/location-gnome-clock.c
++++ b/src/location-gnome-clock.c
+@@ -104,11 +104,28 @@
+ 			char *bonobo_iid = gconf_client_get_string(client, key,
+ 								   &error);
+ 
++			/* Try both gnome-panel 2.30.x and earlier bonobo_iid key and
++			   newer applet_iid. */
+ 			if (!error && bonobo_iid != NULL &&
+ 			    !strcmp(bonobo_iid, "OAFIID:GNOME_ClockApplet")) {
+ 				clock_applet_count += 1;
+ 				current_city = find_current_city(client, id);
+ 			}
++			else {
++				g_free(key);
++				key = g_strdup_printf("/apps/panel/applets/%s"
++					    "/applet_iid", id);
++				char *applet_iid = gconf_client_get_string(client, key,
++									    &error);
++
++				if (!error && applet_iid != NULL &&
++				    !strcmp(applet_iid, "ClockAppletFactory::ClockApplet")) {
++					clock_applet_count += 1;
++					current_city = find_current_city(client, id);
++				}
++
++				g_free(applet_iid);
++			}
+ 
+ 			g_free(bonobo_iid);
+ 			g_free(key);
diff --git a/x11-misc/redshift/files/redshift-1.7-make-conditionals.patch b/x11-misc/redshift/files/redshift-1.7-make-conditionals.patch
new file mode 100644
index 000000000000..03d150c4d80e
--- /dev/null
+++ b/x11-misc/redshift/files/redshift-1.7-make-conditionals.patch
@@ -0,0 +1,72 @@
+--- Makefile.am	2012-07-20 22:52:27.013475104 +0200
++++ Makefile.am	2012-07-20 23:54:22.807021292 +0200
+@@ -2,43 +2,51 @@
+ SUBDIRS = src po
+ ACLOCAL_AMFLAGS = -I m4
+ 
++_HICOLOR_FILES = \
++	data/icons/hicolor/scalable/apps/redshift.svg \
++	data/icons/hicolor/scalable/apps/redshift-status-on.svg \
++	data/icons/hicolor/scalable/apps/redshift-status-off.svg
++
++_UBUNTU_MONO_DARK_FILES = \
++	data/icons/ubuntu-mono-dark/scalable/apps/redshift-status-on.svg \
++	data/icons/ubuntu-mono-dark/scalable/apps/redshift-status-off.svg
++
++_UBUNTU_MONO_LIGHT_FILES = \
++	data/icons/ubuntu-mono-light/scalable/apps/redshift-status-on.svg \
++	data/icons/ubuntu-mono-light/scalable/apps/redshift-status-off.svg
++
++_DESKTOP_FILES = \
++	data/applications/gtk-redshift.desktop
++
+ # Icons
++if ENABLE_GUI
+ hicolor_icondir = @datadir@/icons/hicolor/scalable/apps
+-hicolor_icon_DATA = data/icons/hicolor/scalable/apps/redshift.svg \
+-	data/icons/hicolor/scalable/apps/redshift-status-on.svg \
+-	data/icons/hicolor/scalable/apps/redshift-status-off.svg
++hicolor_icon_DATA = $(_HICOLOR_FILES)
+ 
+ if ENABLE_UBUNTU
+ ubuntu_mono_dark_icondir = @datadir@/icons/ubuntu-mono-dark/scalable/apps
+-ubuntu_mono_dark_icon_DATA = \
+-	data/icons/ubuntu-mono-dark/scalable/apps/redshift-status-on.svg \
+-	data/icons/ubuntu-mono-dark/scalable/apps/redshift-status-off.svg
++ubuntu_mono_dark_icon_DATA = $(_UBUNTU_MONO_DARK_FILES)
+ 
+ ubuntu_mono_light_icondir = @datadir@/icons/ubuntu-mono-light/scalable/apps
+-ubuntu_mono_light_icon_DATA = \
+-	data/icons/ubuntu-mono-light/scalable/apps/redshift-status-on.svg \
+-	data/icons/ubuntu-mono-light/scalable/apps/redshift-status-off.svg
++ubuntu_mono_light_icon_DATA = $(_UBUNTU_MONO_LIGHT_FILES)
++endif
+ endif
+ 
+ 
+ # Desktop file
+ if ENABLE_GUI
+ desktopdir = @datadir@/applications
+-desktop_DATA = data/applications/gtk-redshift.desktop
++desktop_DATA = $(_DESKTOP_FILES)
+ endif
+ 
+ # man page
+ dist_man1_MANS = redshift.1
+ 
+ EXTRA_DIST = \
+-	$(hicolor_icon_DATA) \
+-	$(desktop_DATA)
+-
+-if ENABLE_UBUNTU
+-EXTRA_DIST += \
+-	$(ubuntu_mono_dark_icon_DATA) \
+-	$(ubuntu_mono_light_icon_DATA)
+-endif
++	$(_HICOLOR_FILES) \
++	$(_UBUNTU_MONO_DARK_FILES) \
++	$(_UBUNTU_MONO_LIGHT_FILES) \
++	$(_DESKTOP_FILES)
+ 
+ # Update PO translations
+ .PHONY: update-po
diff --git a/x11-misc/redshift/files/redshift-1.9-toggle.patch b/x11-misc/redshift/files/redshift-1.9-toggle.patch
new file mode 100644
index 000000000000..b28a11be2b52
--- /dev/null
+++ b/x11-misc/redshift/files/redshift-1.9-toggle.patch
@@ -0,0 +1,37 @@
+From 9426e9fba038a3b5076ed92dbe538451de8725f2 Mon Sep 17 00:00:00 2001
+From: Jon Lund Steffensen <jonlst@gmail.com>
+Date: Fri, 11 Apr 2014 00:26:57 +0200
+Subject: [PATCH] redshift-gtk: Fix crash when toggling state using the status
+ icon
+
+---
+ src/redshift-gtk/statusicon.py | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/src/redshift-gtk/statusicon.py b/src/redshift-gtk/statusicon.py
+index 5685f08..08f28ef 100644
+--- a/src/redshift-gtk/statusicon.py
++++ b/src/redshift-gtk/statusicon.py
+@@ -79,7 +79,7 @@ def __init__(self, args=[]):
+ 
+         # Add toggle action
+         self.toggle_item = Gtk.CheckMenuItem.new_with_label(_('Enabled'))
+-        self.toggle_item.connect('activate', self.toggle_cb)
++        self.toggle_item.connect('activate', self.toggle_item_cb)
+         self.status_menu.append(self.toggle_item)
+ 
+         # Add suspend menu
+@@ -215,6 +215,10 @@ def popup_menu_cb(self, widget, button, time, data=None):
+                                self.status_icon, button, time)
+ 
+     def toggle_cb(self, widget, data=None):
++        self.remove_suspend_timer()
++        self.child_toggle_status()
++
++    def toggle_item_cb(self, widget, data=None):
+         # Only toggle if a change from current state was requested
+         if self.is_enabled() != widget.get_active():
+             self.remove_suspend_timer()
+-- 
+1.9.1
+
diff --git a/x11-misc/redshift/metadata.xml b/x11-misc/redshift/metadata.xml
new file mode 100644
index 000000000000..5232af440a8a
--- /dev/null
+++ b/x11-misc/redshift/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>desktop-misc</herd>
+  <maintainer>
+    <email>sping@gentoo.org</email>
+  </maintainer>
+  <use>
+    <flag name="appindicator">Enable usage of <pkg>dev-libs/libappindicator</pkg> to export menu options in to unity and KDE 5</flag>
+    <flag name="geoclue">Control dependency on <pkg>app-misc/geoclue</pkg></flag>
+  </use>
+  <upstream>
+    <remote-id type="github">jonls/redshift</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/x11-misc/redshift/redshift-1.10.ebuild b/x11-misc/redshift/redshift-1.10.ebuild
new file mode 100644
index 000000000000..5c1997d86001
--- /dev/null
+++ b/x11-misc/redshift/redshift-1.10.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python{3_3,3_4} )
+
+inherit systemd autotools eutils gnome2-utils python-r1
+
+DESCRIPTION="A screen color temperature adjusting software"
+HOMEPAGE="http://jonls.dk/redshift/"
+SRC_URI="https://github.com/jonls/redshift/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="appindicator geoclue gtk nls"
+
+COMMON_DEPEND=">=x11-libs/libX11-1.4
+	x11-libs/libXxf86vm
+	x11-libs/libxcb
+	x11-libs/libdrm
+	geoclue? ( app-misc/geoclue:2.0 dev-libs/glib:2 )
+	gtk? ( ${PYTHON_DEPS} )"
+RDEPEND="${COMMON_DEPEND}
+	gtk? ( dev-python/pygobject[${PYTHON_USEDEP}]
+		x11-libs/gtk+:3[introspection]
+		dev-python/pyxdg[${PYTHON_USEDEP}] )"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/intltool-0.50
+	nls? ( sys-devel/gettext )
+	appindicator? ( dev-libs/libappindicator )
+"
+
+src_prepare() {
+	epatch_user
+	eautoreconf
+}
+
+src_configure() {
+	python_export_best
+
+	econf \
+		--disable-silent-rules \
+		$(use_enable nls) \
+		--enable-drm \
+		--enable-randr \
+		--enable-vidmode \
+		--disable-wingdi \
+		\
+		--disable-corelocation \
+		--disable-geoclue \
+		$(use_enable geoclue geoclue2) \
+		\
+		$(use_enable gtk gui) \
+		--with-systemduserunitdir="$(systemd_get_userunitdir)" \
+		--disable-quartz \
+		--disable-ubuntu
+}
+
+_impl_specific_src_install() {
+	emake DESTDIR="${D}" pythondir="$(python_get_sitedir)" \
+			-C src/redshift-gtk install
+}
+
+src_install() {
+	emake DESTDIR="${D}" UPDATE_ICON_CACHE=/bin/true install
+
+	if use gtk; then
+		python_foreach_impl _impl_specific_src_install
+		python_replicate_script "${D}"/usr/bin/redshift-gtk
+		dosym redshift-gtk /usr/bin/gtk-redshift
+	fi
+}
+
+pkg_preinst() {
+	use gtk && gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	use gtk && gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	use gtk && gnome2_icon_cache_update
+}
diff --git a/x11-misc/redshift/redshift-1.7-r1.ebuild b/x11-misc/redshift/redshift-1.7-r1.ebuild
new file mode 100644
index 000000000000..6d531cf6eecb
--- /dev/null
+++ b/x11-misc/redshift/redshift-1.7-r1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools eutils gnome2-utils python-r1
+
+DESCRIPTION="A screen color temperature adjusting software"
+HOMEPAGE="http://jonls.dk/redshift/"
+SRC_URI="http://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="geoclue gnome gtk nls"
+
+COMMON_DEPEND=">=x11-libs/libX11-1.4
+	x11-libs/libXxf86vm
+	x11-libs/libxcb
+	geoclue? ( app-misc/geoclue:0 )
+	gnome? ( dev-libs/glib:2
+		>=gnome-base/gconf-2 )
+	gtk? ( ${PYTHON_DEPS} )"
+RDEPEND="${COMMON_DEPEND}
+	gtk? ( >=dev-python/pygtk-2[${PYTHON_USEDEP}]
+		dev-python/pyxdg[${PYTHON_USEDEP}] )"
+DEPEND="${COMMON_DEPEND}
+	nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-make-conditionals.patch
+	epatch_user
+	eautoreconf
+}
+
+src_configure() {
+	python_export_best
+
+	econf \
+		--disable-silent-rules \
+		$(use_enable nls) \
+		--enable-randr \
+		--enable-vidmode \
+		--disable-wingdi \
+		$(use_enable gnome gnome-clock) \
+		$(use_enable geoclue) \
+		$(use_enable gtk gui) \
+		--disable-ubuntu
+}
+
+_impl_specific_src_install() {
+	emake DESTDIR="${D}" pythondir="$(python_get_sitedir)" \
+			-C src/gtk-redshift install
+}
+
+src_install() {
+	default
+
+	if use gtk; then
+		python_foreach_impl _impl_specific_src_install
+		python_replicate_script "${D}"/usr/bin/gtk-redshift
+	fi
+}
+
+pkg_preinst() {
+	use gtk && gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	use gtk && gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	use gtk && gnome2_icon_cache_update
+}
diff --git a/x11-misc/redshift/redshift-1.7.ebuild b/x11-misc/redshift/redshift-1.7.ebuild
new file mode 100644
index 000000000000..f6acae4a0ee4
--- /dev/null
+++ b/x11-misc/redshift/redshift-1.7.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=3
+
+PYTHON_DEPEND="gtk? 2:2.6"
+
+inherit eutils gnome2-utils python
+
+DESCRIPTION="A screen color temperature adjusting software"
+HOMEPAGE="http://jonls.dk/redshift/"
+SRC_URI="http://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="geoclue gnome gtk nls"
+
+COMMON_DEPEND=">=x11-libs/libX11-1.4
+	x11-libs/libXxf86vm
+	x11-libs/libxcb
+	geoclue? ( app-misc/geoclue:0 )
+	gnome? ( dev-libs/glib:2
+		>=gnome-base/gconf-2 )"
+RDEPEND="${COMMON_DEPEND}
+	gtk? ( >=dev-python/pygtk-2
+		dev-python/pyxdg )"
+DEPEND="${COMMON_DEPEND}
+	nls? ( sys-devel/gettext )"
+
+pkg_setup() {
+	use gtk && python_set_active_version 2
+}
+
+src_prepare() {
+	if use gtk; then
+		>py-compile
+		python_convert_shebangs 2 src/gtk-redshift/gtk-redshift
+	fi
+}
+
+src_configure() {
+	local myconf
+	use gtk || myconf="--disable-gui"
+
+	econf \
+		--disable-dependency-tracking \
+		$(use_enable nls) \
+		--enable-randr \
+		--enable-vidmode \
+		$(use_enable gnome gnome-clock) \
+		$(use_enable geoclue) \
+		${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS NEWS README
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	use gtk && python_mod_optimize gtk_${PN}
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	use gtk && python_mod_cleanup gtk_${PN}
+}
diff --git a/x11-misc/redshift/redshift-1.9.1-r1.ebuild b/x11-misc/redshift/redshift-1.9.1-r1.ebuild
new file mode 100644
index 000000000000..f792a71b96e0
--- /dev/null
+++ b/x11-misc/redshift/redshift-1.9.1-r1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python{3_3,3_4} )
+
+inherit autotools eutils gnome2-utils python-r1
+
+DESCRIPTION="A screen color temperature adjusting software"
+HOMEPAGE="http://jonls.dk/redshift/"
+SRC_URI="https://github.com/jonls/redshift/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="appindicator geoclue gtk nls"
+
+COMMON_DEPEND=">=x11-libs/libX11-1.4
+	x11-libs/libXxf86vm
+	x11-libs/libxcb
+	x11-libs/libdrm
+	geoclue? ( app-misc/geoclue:0 dev-libs/glib:2 )
+	gtk? ( ${PYTHON_DEPS} )"
+RDEPEND="${COMMON_DEPEND}
+	gtk? ( dev-python/pygobject[${PYTHON_USEDEP}]
+		x11-libs/gtk+:3[introspection]
+		dev-python/pyxdg[${PYTHON_USEDEP}] )"
+DEPEND="${COMMON_DEPEND}
+	nls? ( sys-devel/gettext )
+	appindicator? ( dev-libs/libappindicator )
+"
+
+src_prepare() {
+	epatch_user
+	eautoreconf
+}
+
+src_configure() {
+	python_export_best
+
+	econf \
+		--disable-silent-rules \
+		$(use_enable nls) \
+		--enable-drm \
+		--enable-randr \
+		--enable-vidmode \
+		--disable-wingdi \
+		$(use_enable geoclue) \
+		$(use_enable gtk gui) \
+		--disable-ubuntu
+}
+
+_impl_specific_src_install() {
+	emake DESTDIR="${D}" pythondir="$(python_get_sitedir)" \
+			-C src/redshift-gtk install
+}
+
+src_install() {
+	emake DESTDIR="${D}" UPDATE_ICON_CACHE=/bin/true install
+
+	if use gtk; then
+		python_foreach_impl _impl_specific_src_install
+		python_replicate_script "${D}"/usr/bin/redshift-gtk
+		dosym redshift-gtk /usr/bin/gtk-redshift
+	fi
+}
+
+pkg_preinst() {
+	use gtk && gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	use gtk && gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	use gtk && gnome2_icon_cache_update
+}
diff --git a/x11-misc/redshift/redshift-1.9.1-r2.ebuild b/x11-misc/redshift/redshift-1.9.1-r2.ebuild
new file mode 100644
index 000000000000..735ea0771f76
--- /dev/null
+++ b/x11-misc/redshift/redshift-1.9.1-r2.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python{3_3,3_4} )
+
+inherit systemd autotools eutils gnome2-utils python-r1
+
+DESCRIPTION="A screen color temperature adjusting software"
+HOMEPAGE="http://jonls.dk/redshift/"
+SRC_URI="https://github.com/jonls/redshift/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="appindicator geoclue gtk nls"
+
+COMMON_DEPEND=">=x11-libs/libX11-1.4
+	x11-libs/libXxf86vm
+	x11-libs/libxcb
+	x11-libs/libdrm
+	geoclue? ( app-misc/geoclue:0 dev-libs/glib:2 )
+	gtk? ( ${PYTHON_DEPS} )"
+RDEPEND="${COMMON_DEPEND}
+	gtk? ( dev-python/pygobject[${PYTHON_USEDEP}]
+		x11-libs/gtk+:3[introspection]
+		dev-python/pyxdg[${PYTHON_USEDEP}] )"
+DEPEND="${COMMON_DEPEND}
+	nls? ( sys-devel/gettext )
+	appindicator? ( dev-libs/libappindicator )
+"
+
+src_prepare() {
+	epatch_user
+	eautoreconf
+}
+
+src_configure() {
+	python_export_best
+
+	econf \
+		--disable-silent-rules \
+		$(use_enable nls) \
+		--enable-drm \
+		--enable-randr \
+		--enable-vidmode \
+		--disable-wingdi \
+		$(use_enable geoclue) \
+		$(use_enable gtk gui) \
+		--with-systemduserunitdir="$(systemd_get_userunitdir)" \
+		--disable-ubuntu
+}
+
+_impl_specific_src_install() {
+	emake DESTDIR="${D}" pythondir="$(python_get_sitedir)" \
+			-C src/redshift-gtk install
+}
+
+src_install() {
+	emake DESTDIR="${D}" UPDATE_ICON_CACHE=/bin/true install
+
+	if use gtk; then
+		python_foreach_impl _impl_specific_src_install
+		python_replicate_script "${D}"/usr/bin/redshift-gtk
+		dosym redshift-gtk /usr/bin/gtk-redshift
+	fi
+}
+
+pkg_preinst() {
+	use gtk && gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	use gtk && gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	use gtk && gnome2_icon_cache_update
+}
diff --git a/x11-misc/redshift/redshift-1.9.1.ebuild b/x11-misc/redshift/redshift-1.9.1.ebuild
new file mode 100644
index 000000000000..01555708170d
--- /dev/null
+++ b/x11-misc/redshift/redshift-1.9.1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python{3_3,3_4} )
+
+inherit autotools eutils gnome2-utils python-r1
+
+DESCRIPTION="A screen color temperature adjusting software"
+HOMEPAGE="http://jonls.dk/redshift/"
+SRC_URI="https://github.com/jonls/redshift/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 ~x86"
+IUSE="geoclue gtk nls"
+
+COMMON_DEPEND=">=x11-libs/libX11-1.4
+	x11-libs/libXxf86vm
+	x11-libs/libxcb
+	x11-libs/libdrm
+	geoclue? ( app-misc/geoclue:0 dev-libs/glib:2 )
+	gtk? ( ${PYTHON_DEPS} )"
+RDEPEND="${COMMON_DEPEND}
+	gtk? ( dev-python/pygobject[${PYTHON_USEDEP}]
+		dev-python/pyxdg[${PYTHON_USEDEP}] )"
+DEPEND="${COMMON_DEPEND}
+	nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	epatch_user
+	eautoreconf
+}
+
+src_configure() {
+	python_export_best
+
+	econf \
+		--disable-silent-rules \
+		$(use_enable nls) \
+		--enable-drm \
+		--enable-randr \
+		--enable-vidmode \
+		--disable-wingdi \
+		$(use_enable geoclue) \
+		$(use_enable gtk gui) \
+		--disable-ubuntu
+}
+
+_impl_specific_src_install() {
+	emake DESTDIR="${D}" pythondir="$(python_get_sitedir)" \
+			-C src/redshift-gtk install
+}
+
+src_install() {
+	emake DESTDIR="${D}" UPDATE_ICON_CACHE=/bin/true install
+
+	if use gtk; then
+		python_foreach_impl _impl_specific_src_install
+		python_replicate_script "${D}"/usr/bin/redshift-gtk
+		dosym redshift-gtk /usr/bin/gtk-redshift
+	fi
+}
+
+pkg_preinst() {
+	use gtk && gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	use gtk && gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	use gtk && gnome2_icon_cache_update
+}
diff --git a/x11-misc/rendercheck/Manifest b/x11-misc/rendercheck/Manifest
new file mode 100644
index 000000000000..7b2ac08556ca
--- /dev/null
+++ b/x11-misc/rendercheck/Manifest
@@ -0,0 +1,2 @@
+DIST rendercheck-1.4.tar.bz2 125828 SHA256 6835ce19788e2e9b9ac0307b92adac88daee57edd56e0739c822a0811bc83b87
+DIST rendercheck-1.5.tar.bz2 143656 SHA256 00605679436d65ccf9a6f1f1cb206df7a2e8b28a7821e867922d2b14b009f1cc SHA512 ffa1abf317f85a8bcef3544e3f810b34567553524ac0a784d2a67470e0811854d7983af8600a04aadecf42871ccb83ad5c0e9e25179142fda2a8f5853a07f616 WHIRLPOOL 691babaa2d9c0562857be7cc60d80ef057667649f2a0efd8fe21367d67e6224e5e76b591af5ef2fb97ad92292013767091c910cbce5e8e3d15587d57b24e947d
diff --git a/x11-misc/rendercheck/metadata.xml b/x11-misc/rendercheck/metadata.xml
new file mode 100644
index 000000000000..01c4c004e735
--- /dev/null
+++ b/x11-misc/rendercheck/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>x11</herd>
+</pkgmetadata>
diff --git a/x11-misc/rendercheck/rendercheck-1.4.ebuild b/x11-misc/rendercheck/rendercheck-1.4.ebuild
new file mode 100644
index 000000000000..acdd081ff73b
--- /dev/null
+++ b/x11-misc/rendercheck/rendercheck-1.4.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=3
+
+XORG_MODULE=app/
+XORG_STATIC=no
+inherit xorg-2
+
+DESCRIPTION="Tests for compliance with X RENDER extension"
+
+KEYWORDS="~alpha amd64 ppc ppc64 ~sparc x86"
+IUSE=""
+
+RDEPEND="x11-libs/libXrender
+	x11-libs/libX11"
+DEPEND="${RDEPEND}"
diff --git a/x11-misc/rendercheck/rendercheck-1.5.ebuild b/x11-misc/rendercheck/rendercheck-1.5.ebuild
new file mode 100644
index 000000000000..a5516ea525c1
--- /dev/null
+++ b/x11-misc/rendercheck/rendercheck-1.5.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+XORG_MODULE=app/
+XORG_STATIC=no
+inherit xorg-2
+
+DESCRIPTION="Tests for compliance with X RENDER extension"
+
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/libXrender
+	x11-libs/libX11"
+DEPEND="${RDEPEND}"
diff --git a/x11-misc/revelation/Manifest b/x11-misc/revelation/Manifest
new file mode 100644
index 000000000000..bc8c4148a363
--- /dev/null
+++ b/x11-misc/revelation/Manifest
@@ -0,0 +1 @@
+DIST revelation-0.4.14.tar.xz 316096 SHA256 38a532e7c528076f82ef3564b5a75d0a37387492007cf49f2e4ef2c3eee9454d SHA512 0af5b7eea47a7706dd164f4f0a1da12fd2595e8add1455e4e4092e4b6aa1507faf2c94227dd838734bdc19fef9d268938362fca2d3cde59897580598eefa1145 WHIRLPOOL 5e65fa3e4e2ee1c13b5095ed00426987d74898113135e5ede878b206d01877bfa732eb145234a4a8889ca633a7b830a6d3621386dc8fa3579defdfbc66c3aeb8
diff --git a/x11-misc/revelation/metadata.xml b/x11-misc/revelation/metadata.xml
new file mode 100644
index 000000000000..cc160542fb5e
--- /dev/null
+++ b/x11-misc/revelation/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>tristan@gentoo.org</email>
+		<name>Tristan Heaven</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/x11-misc/revelation/revelation-0.4.14-r1.ebuild b/x11-misc/revelation/revelation-0.4.14-r1.ebuild
new file mode 100644
index 000000000000..2bbfc3773bed
--- /dev/null
+++ b/x11-misc/revelation/revelation-0.4.14-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+GCONF_DEBUG="no"
+
+inherit python-single-r1 gnome2
+
+DESCRIPTION="A password manager for GNOME"
+HOMEPAGE="http://revelation.olasagasti.info/"
+SRC_URI="https://www.bitbucket.org/erikg/revelation/downloads/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="test"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-python/pygtk[${PYTHON_USEDEP}]
+	dev-python/pycrypto[${PYTHON_USEDEP}]
+	dev-python/gconf-python[${PYTHON_USEDEP}]
+	dev-python/libgnome-python[${PYTHON_USEDEP}]
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	sys-libs/cracklib[python,${PYTHON_USEDEP}]
+"
+
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	gnome2_src_configure \
+		--without-applet \
+		--disable-desktop-update \
+		--disable-mime-update
+}
+
+src_install() {
+	gnome2_src_install
+	python_fix_shebang "${ED}"
+}
diff --git a/x11-misc/rodent/Manifest b/x11-misc/rodent/Manifest
new file mode 100644
index 000000000000..4d7cce9ea121
--- /dev/null
+++ b/x11-misc/rodent/Manifest
@@ -0,0 +1 @@
+DIST rodent-4.9.2.tar.gz 12061909 SHA256 d1e892ed22ad5eac65d915b0ac81d1c01b72699667429e7bc8847cc8c5ddc001 SHA512 776975bfff4e9e7b51e4f4b6f2d3e78c2fdeb949ed144dce66faa32b5a20f085201050500f26eb4af74ec63a354bb71ab39b8dd5eb9f95bffe289bb71bdd33a6 WHIRLPOOL 698facf1ff82b1c1a668437d7f0af253084e259f69459e00206ee4630809549187be89cc576534713376a2ab848a35b77c00881e2c5021cbeccc4e9e1fd3b40a
diff --git a/x11-misc/rodent/files/rodent-4.9.2-rupo.patch b/x11-misc/rodent/files/rodent-4.9.2-rupo.patch
new file mode 100644
index 000000000000..688904f3dec1
--- /dev/null
+++ b/x11-misc/rodent/files/rodent-4.9.2-rupo.patch
@@ -0,0 +1,15 @@
+diff --git a/po/ru.po b/po/ru.po
+index 1062358..5bc37e4 100644
+--- a/po/ru.po
++++ b/po/ru.po
+@@ -381,9 +381,7 @@ msgstr "Фоновое изображение"
+ 
+ #: ../Build/bin/Rfm-root.desktop.in.in.h:2
+ msgid "Change background image"
+-msgstr ""
+-"Изменение изображения фона\n"
+-"изменение изображения фона"
++msgstr "Изменение изображения фона"
+ 
+ #. old items:
+ #: ../Build/plugins/Rodent-fstab.desktop.in.in.h:1
diff --git a/x11-misc/rodent/metadata.xml b/x11-misc/rodent/metadata.xml
new file mode 100644
index 000000000000..75fb1eb8f3cb
--- /dev/null
+++ b/x11-misc/rodent/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>xfce@gentoo.org</email>
+		<name>XFCE Team</name>
+	</maintainer>
+	<longdescription lang="en">Rodent is fast, small and powerful file manager for the GNU operating system (but it also works in BSD). Rodent is *not* a filemanager for dummies. Emphasis is on ease of use for the advanced user, not the computer illiterate.</longdescription>
+	<use>
+		<flag name="experimental">Build experimental plugins (obexfs, curlftpfs, ecryptfs, cifs and samba)</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">xffm</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-misc/rodent/rodent-4.9.2.ebuild b/x11-misc/rodent/rodent-4.9.2.ebuild
new file mode 100644
index 000000000000..ac332dc4431f
--- /dev/null
+++ b/x11-misc/rodent/rodent-4.9.2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+EAUTORECONF=yes
+inherit xfconf
+
+DESCRIPTION="A fast, small and powerful file manager and graphical shell"
+HOMEPAGE="http://rodent.xffm.org/"
+SRC_URI="mirror://sourceforge/xffm/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="experimental"
+
+COMMON_DEPEND="x11-libs/libX11
+	x11-libs/libSM
+	dev-libs/libxml2
+	>=dev-libs/glib-2.24
+	x11-libs/gtk+:3
+	>=x11-libs/cairo-1.8.10
+	>=gnome-base/librsvg-2.26
+	>=dev-libs/libzip-0.9
+	sys-apps/file"
+RDEPEND="${COMMON_DEPEND}
+	gnome-base/gvfs"
+DEPEND="${COMMON_DEPEND}
+	dev-util/intltool
+	virtual/pkgconfig"
+
+pkg_setup() {
+	XFCONF=( $(use_enable experimental) )
+	DOCS=( ChangeLog README TODO )
+	PATCHES=( "${FILESDIR}"/${P}-rupo.patch )
+}
+
+src_prepare() {
+	sed -e "s:\$(bindir):\$(DESTDIR)\$(bindir):" -i Build/plugins/Makefile.am
+	sed -e "/^Categories/s:Rodent:X-Rodent:" \
+		-e "s/;;/;/" -i Build/*/*.desktop.in.in
+	xfconf_src_prepare
+}
diff --git a/x11-misc/rofi/Manifest b/x11-misc/rofi/Manifest
new file mode 100644
index 000000000000..ccb3713a7a9c
--- /dev/null
+++ b/x11-misc/rofi/Manifest
@@ -0,0 +1,2 @@
+DIST rofi-0.15.5.tar.xz 124952 SHA256 3d7fefc986003527237ffc59a27158e4680e8c6daa6d45374e50734a19996dcf SHA512 4925912cc575a83d3b3fbe08b767798f3e3834dc1d818894ac1537f2eb8a102219029a9c35f8085e81d9c30cfecad86e44ae4707e5149a14ba144f79e08880bc WHIRLPOOL 2bceb26240ceeb0870bb2d7cc630079cc5fd53ae88ec5ce425d9371b6363f1a874e52f8d1e9373a8956f16c6779cdf9d1fb9c6ec50fc96a62d00c6d1241cd98c
+DIST rofi-0.15.7.tar.xz 125824 SHA256 8c35d3d2a36cc61ae6b5dcc6a07a590e3d6d446944ec6e37dd5a3c3fcff64188 SHA512 51caaaf6f2280c24b65386a3e38591b601e06f9d7ffa132023c93d86cb9ccf8ac1d1e2dec6886128ebdac6558fae3c718c21e489c4bd13575aeee2143ecdac13 WHIRLPOOL a9de957c8cee9682608c35363d1142ec624fb4ce8f22c96da9dc35259afab599fd48dc1e9d528c287fecaa5e1a3c20efe51f1c9159913d7aa7878bbd98814578
diff --git a/x11-misc/rofi/files/rofi-0.15.4-Werror.patch b/x11-misc/rofi/files/rofi-0.15.4-Werror.patch
new file mode 100644
index 000000000000..bffd15008536
--- /dev/null
+++ b/x11-misc/rofi/files/rofi-0.15.4-Werror.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -6,7 +6,7 @@
+ ##
+ # Setup automake to be silent and in foreign mode.
+ ##
+-AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects dist-xz])
++AM_INIT_AUTOMAKE([-Wall foreign subdir-objects dist-xz])
+ AM_SILENT_RULES([yes])
+ 
+ ##
diff --git a/x11-misc/rofi/metadata.xml b/x11-misc/rofi/metadata.xml
new file mode 100644
index 000000000000..999093b2ecfb
--- /dev/null
+++ b/x11-misc/rofi/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>desktop-misc</herd>
+	<maintainer>
+		<email>jer@gentoo.org</email>
+		<name>Jeroen Roovers</name>
+	</maintainer>
+	<use>
+		<flag name="i3">Compile in support for the <pkg>x11-wm/i3</pkg> window manager</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">DaveDavenport/rofi</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-misc/rofi/rofi-0.15.5.ebuild b/x11-misc/rofi/rofi-0.15.5.ebuild
new file mode 100644
index 000000000000..6de1ac970986
--- /dev/null
+++ b/x11-misc/rofi/rofi-0.15.5.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils toolchain-funcs
+
+DESCRIPTION="A window switcher, run dialog and dmenu replacement"
+HOMEPAGE="https://davedavenport.github.io/rofi/"
+SRC_URI="https://github.com/DaveDavenport/${PN}/releases/download/${PV}/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="i3"
+
+RDEPEND="
+	dev-libs/glib:2
+	media-libs/freetype
+	x11-libs/libX11
+	x11-libs/libXft
+	x11-libs/libXinerama
+	x11-libs/pango[X]
+	i3? ( x11-wm/i3 )
+"
+DEPEND="
+	${RDEPEND}
+	x11-proto/xineramaproto
+	x11-proto/xproto
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-0.15.4-Werror.patch
+
+	eautoreconf
+}
+
+src_configure() {
+	tc-export CC
+	econf $(usex i3 '' --disable-i3support)
+}
+
+src_test() {
+	emake test
+}
diff --git a/x11-misc/rofi/rofi-0.15.7.ebuild b/x11-misc/rofi/rofi-0.15.7.ebuild
new file mode 100644
index 000000000000..6de1ac970986
--- /dev/null
+++ b/x11-misc/rofi/rofi-0.15.7.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils toolchain-funcs
+
+DESCRIPTION="A window switcher, run dialog and dmenu replacement"
+HOMEPAGE="https://davedavenport.github.io/rofi/"
+SRC_URI="https://github.com/DaveDavenport/${PN}/releases/download/${PV}/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="i3"
+
+RDEPEND="
+	dev-libs/glib:2
+	media-libs/freetype
+	x11-libs/libX11
+	x11-libs/libXft
+	x11-libs/libXinerama
+	x11-libs/pango[X]
+	i3? ( x11-wm/i3 )
+"
+DEPEND="
+	${RDEPEND}
+	x11-proto/xineramaproto
+	x11-proto/xproto
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-0.15.4-Werror.patch
+
+	eautoreconf
+}
+
+src_configure() {
+	tc-export CC
+	econf $(usex i3 '' --disable-i3support)
+}
+
+src_test() {
+	emake test
+}
diff --git a/x11-misc/rss-glx/Manifest b/x11-misc/rss-glx/Manifest
new file mode 100644
index 000000000000..0d0a8c4c02ca
--- /dev/null
+++ b/x11-misc/rss-glx/Manifest
@@ -0,0 +1 @@
+DIST rss-glx_0.9.1.tar.bz2 5435799 SHA256 8f8d773864695fd57e6ff21f430994369ad74c69a5e66ce510bbba8ca55333aa SHA512 3293e6446d6f85e895f1ba8fa982a1ab1873f60714e0b351458ac12117af2427b7cc931185b9485a2af6dd86ea9ea5f2fca92eaae9c0dd5290b5108bc2360961 WHIRLPOOL 9acf336481697ef94f2929b766e805aa805f8e2ebb272a7301a46bbbd2236350245b3e699972a0fc969b3d03182cdb1e5c38454ca8f207ddc1ab9f5676bf0f7a
diff --git a/x11-misc/rss-glx/files/rss-glx-0.9.1-asneeded.patch b/x11-misc/rss-glx/files/rss-glx-0.9.1-asneeded.patch
new file mode 100644
index 000000000000..e492183dcf9e
--- /dev/null
+++ b/x11-misc/rss-glx/files/rss-glx-0.9.1-asneeded.patch
@@ -0,0 +1,12 @@
+Fixing as-needed issue
+
+http://bugs.gentoo.org/313837
+
+--- a/src/PixelCity/Makefile.am
++++ b/src/PixelCity/Makefile.am
+@@ -23,3 +23,5 @@
+ 	Texture.cpp \
+ 	Visible.cpp \
+ 	World.cpp
++libPixelCity_la_LIBADD=@quesoglc_LIBS@
++libPixelCity_la_CFLAGS=@quesoglc_CFLAGS@
diff --git a/x11-misc/rss-glx/files/rss-glx-0.9.1-quesoglc.patch b/x11-misc/rss-glx/files/rss-glx-0.9.1-quesoglc.patch
new file mode 100644
index 000000000000..0aed3eabed63
--- /dev/null
+++ b/x11-misc/rss-glx/files/rss-glx-0.9.1-quesoglc.patch
@@ -0,0 +1,18 @@
+Removing automagic dependency on media-libs/quesoglc
+
+http://bugs.gentoo.org/313837
+
+--- a/configure.in
++++ b/configure.in
+@@ -200,7 +200,10 @@
+ 
+ AM_CONDITIONAL(INSTALL_KDE_CONFIG_FILES, test "$INSTALL_KDE_CONFIG_FILES" = "yes")
+ 
+-PKG_CHECK_MODULES(quesoglc, quesoglc >= 0.7, AC_DEFINE([HAVE_GLC], , [QuesoGLC is available for use.]), AC_DEFINE([MISSING_GLC], , [QuesoGLC not available.]))
++AC_ARG_WITH([quesoglc], AS_HELP_STRING([--with-quesoglc], [Build with QuusoGLC library (default: disabled)]))
++if test "x$with_quesoglc" = "xyes"; then
++	PKG_CHECK_MODULES(quesoglc, quesoglc >= 0.7, AC_DEFINE([HAVE_GLC], , [QuesoGLC is available for use.]), AC_DEFINE([MISSING_GLC], , [QuesoGLC not available.]))
++fi
+ 
+ AC_OUTPUT([
+ 	Makefile
diff --git a/x11-misc/rss-glx/metadata.xml b/x11-misc/rss-glx/metadata.xml
new file mode 100644
index 000000000000..b5d864c0bffc
--- /dev/null
+++ b/x11-misc/rss-glx/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>desktop-misc</herd>
+	<use>
+		<flag name="quesoglc">Enable support for OpenGL Character Renderer</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">rss-glx</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-misc/rss-glx/rss-glx-0.9.1.ebuild b/x11-misc/rss-glx/rss-glx-0.9.1.ebuild
new file mode 100644
index 000000000000..bdd70eea770b
--- /dev/null
+++ b/x11-misc/rss-glx/rss-glx-0.9.1.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils multilib
+
+MY_P=${PN}_${PV}
+
+DESCRIPTION="Really Slick OpenGL Screensavers for XScreenSaver"
+HOMEPAGE="http://rss-glx.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
+IUSE="+bzip2 openal quesoglc"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	>=media-libs/glew-1.5.1
+	media-libs/mesa
+	>=media-gfx/imagemagick-6.4
+	>=x11-misc/xscreensaver-5.08-r2
+	bzip2? ( app-arch/bzip2 )
+	openal? ( >=media-libs/freealut-1.1.0-r1 )
+	quesoglc? ( media-libs/quesoglc )"
+DEPEND="${RDEPEND}
+	x11-proto/xextproto
+	virtual/pkgconfig
+	sys-apps/sed"
+
+DOCS="ChangeLog README*"
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	sed -i \
+		-e '/CFLAGS=/s:-O2:${CFLAGS}:' \
+		-e '/CXXFLAGS=/s:-O2:${CXXFLAGS}:' \
+		-e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' \
+		configure.in || die
+	epatch "${FILESDIR}"/${P}-quesoglc.patch \
+		"${FILESDIR}"/${P}-asneeded.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--bindir=/usr/$(get_libdir)/misc/xscreensaver \
+		--enable-shared \
+		--disable-dependency-tracking \
+		$(use_enable bzip2) \
+		$(use_enable openal sound) \
+		$(use_with quesoglc) \
+		--with-configdir=/usr/share/xscreensaver/config
+}
+
+pkg_postinst() {
+	local xssconf="${ROOT}usr/share/X11/app-defaults/XScreenSaver"
+
+	if [ -f ${xssconf} ]; then
+		sed -e '/*programs:/a\
+		GL:       \"Cyclone\"  cyclone --root     \\n\\\
+		GL:      \"Euphoria\"  euphoria --root    \\n\\\
+		GL:    \"Fieldlines\"  fieldlines --root  \\n\\\
+		GL:        \"Flocks\"  flocks --root      \\n\\\
+		GL:          \"Flux\"  flux --root        \\n\\\
+		GL:        \"Helios\"  helios --root      \\n\\\
+		GL:    \"Hyperspace\"  hyperspace --root  \\n\\\
+		GL:       \"Lattice\"  lattice --root     \\n\\\
+		GL:        \"Plasma\"  plasma --root      \\n\\\
+		GL:     \"Pixelcity\"  pixelcity --root   \\n\\\
+		GL:     \"Skyrocket\"  skyrocket --root   \\n\\\
+		GL:    \"Solarwinds\"  solarwinds --root  \\n\\\
+		GL:     \"Colorfire\"  colorfire --root   \\n\\\
+		GL:   \"Hufos Smoke\"  hufo_smoke --root  \\n\\\
+		GL:  \"Hufos Tunnel\"  hufo_tunnel --root \\n\\\
+		GL:    \"Sundancer2\"  sundancer2 --root  \\n\\\
+		GL:          \"BioF\"  biof --root        \\n\\\
+		GL:   \"BusySpheres\"  busyspheres --root \\n\\\
+		GL:   \"SpirographX\"  spirographx --root \\n\\\
+		GL:    \"MatrixView\"  matrixview --root  \\n\\\
+		GL:        \"Lorenz\"  lorenz --root      \\n\\\
+		GL:      \"Drempels\"  drempels --root    \\n\\\
+		GL:      \"Feedback\"  feedback --root    \\n\\' \
+			-i ${xssconf} || die "sed failed"
+	fi
+}
+
+pkg_postrm() {
+	local xssconf="${ROOT}usr/share/X11/app-defaults/XScreenSaver"
+
+	if [ -f ${xssconf} ]; then
+		sed \
+			-e '/\"Cyclone\"  cyclone/d' \
+			-e '/\"Euphoria\"  euphoria/d' \
+			-e '/\"Fieldlines\"  fieldlines/d' \
+			-e '/\"Flocks\"  flocks/d' \
+			-e '/\"Flux\"  flux/d' \
+			-e '/\"Helios\"  helios/d' \
+			-e '/\"Hyperspace\"  hyperspace/d' \
+			-e '/\"Lattice\"  lattice/d' \
+			-e '/\"Plasma\"  plasma/d' \
+			-e '/\"Pixelcity\"  pixelcity/d' \
+			-e '/\"Skyrocket\"  skyrocket/d' \
+			-e '/\"Solarwinds\"  solarwinds/d' \
+			-e '/\"Colorfire\"  colorfire/d' \
+			-e '/\"Hufos Smoke\"  hufo_smoke/d' \
+			-e '/\"Hufos Tunnel\"  hufo_tunnel/d' \
+			-e '/\"Sundancer2\"  sundancer2/d' \
+			-e '/\"BioF\"  biof/d' \
+			-e '/\"BusySpheres\"  busyspheres/d' \
+			-e '/\"SpirographX\"  spirographx/d' \
+			-e '/\"MatrixView\"  matrixview/d' \
+			-e '/\"Lorenz\"  lorenz/d' \
+			-e '/\"Drempels\"  drempels/d' \
+			-e '/\"Feedback\"  feedback/d' \
+			-i ${xssconf} || die "sed failed"
+	fi
+}
diff --git a/x11-misc/screen-message/Manifest b/x11-misc/screen-message/Manifest
new file mode 100644
index 000000000000..586519f06a4f
--- /dev/null
+++ b/x11-misc/screen-message/Manifest
@@ -0,0 +1 @@
+DIST screen-message_0.23.orig.tar.gz 347123 SHA256 6a34fca5a4816f80504a872221a44ff982f7854eb2d3529369e77722b4a4f420 SHA512 1681fc1f8acc42ef82b42930ddc784b80eb34f77415b8d898f8857dabb87115d616e9e36504e218ca57f894f9e5ab9568296694aaab8fd816b165e68e38bc614 WHIRLPOOL 3f6819c3c456617e85cdec00bfa5d05a3774805b19d94119be0873052823c1b60c14d5986a51d06abd83ecf691662939f3a28abc6aff95eba565f6a94f9e0db0
diff --git a/x11-misc/screen-message/files/screen-message-0.22-desktop-file.patch b/x11-misc/screen-message/files/screen-message-0.22-desktop-file.patch
new file mode 100644
index 000000000000..66ec231b0e85
--- /dev/null
+++ b/x11-misc/screen-message/files/screen-message-0.22-desktop-file.patch
@@ -0,0 +1,23 @@
+From af93db050e56dd6cc99674c58c48d45fd2eb92ba Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Thu, 29 May 2014 18:22:04 +0200
+Subject: [PATCH] Fix desktop file template
+
+warning: value "GTK;Application;Utility;" for key "Categories" in group "Desktop Entry" contains a deprecated value "Application"
+---
+ sm.desktop.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/sm.desktop.in b/sm.desktop.in
+index f37e974..4b6033d 100644
+--- a/sm.desktop.in
++++ b/sm.desktop.in
+@@ -5,4 +5,4 @@ Exec=@BINPATH@/sm
+ Icon=sm
+ Terminal=false
+ Type=Application
+-Categories=GTK;Application;Utility;
++Categories=GTK;Utility;
+-- 
+1.9.3
+
diff --git a/x11-misc/screen-message/metadata.xml b/x11-misc/screen-message/metadata.xml
new file mode 100644
index 000000000000..16bcc9f800a2
--- /dev/null
+++ b/x11-misc/screen-message/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>sping@gentoo.org</email>
+		<name>Sebastian Pipping</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/x11-misc/screen-message/screen-message-0.23.ebuild b/x11-misc/screen-message/screen-message-0.23.ebuild
new file mode 100644
index 000000000000..5dbe3f9b8e79
--- /dev/null
+++ b/x11-misc/screen-message/screen-message-0.23.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+DESCRIPTION="Display a multi-line message large, fullscreen, black on white"
+HOMEPAGE="http://www.joachim-breitner.de/projects#screen-message"
+SRC_URI="mirror://debian/pool/main/s/${PN}/${PN}_${PV}.orig.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="x11-libs/gtk+:3
+	>=x11-libs/pango-1.16"
+RDEPEND="${DEPEND}
+	!<net-im/jabberd2-2.2.17-r1"
+
+src_install() {
+	default
+
+	dodir /usr/bin || die
+	mv "${D}"/usr/{games,bin}/sm || die
+	sed -i 's|Exec=/usr/games/sm||' "${D}"/usr/share/applications/sm.desktop || die
+}
diff --git a/x11-misc/screengrab/Manifest b/x11-misc/screengrab/Manifest
new file mode 100644
index 000000000000..65e448d8a055
--- /dev/null
+++ b/x11-misc/screengrab/Manifest
@@ -0,0 +1 @@
+DIST screengrab-1.0.tar.gz 152250 SHA256 40babc5c1afc32e4f413ec56bfd2bf39bdb894ac32465b6cceec21520e60563f SHA512 e34e1fa907ccb105e1b37db40c2dfc22d19b8cdf517a73f4df11f3dffc2cdb0c6ed204d2d1c5bd8efeaa5326f52907fb4b364c84be510d392d7ff882f8d44a7e WHIRLPOOL cefb28f7d4ef29683389e4f4a2e12bb15af049e3c0834f6d53d04650b7b5128090defe5d0849bfdb417e534ccdac12ace73f72a70852f02681a58d35a4032f6b
diff --git a/x11-misc/screengrab/files/screengrab-1.0-detect-lib64.patch b/x11-misc/screengrab/files/screengrab-1.0-detect-lib64.patch
new file mode 100644
index 000000000000..308893d656e2
--- /dev/null
+++ b/x11-misc/screengrab/files/screengrab-1.0-detect-lib64.patch
@@ -0,0 +1,27 @@
+commit f613bc6d26095b891c7aa886de0bd6e5bfc5ce46
+Author: DOOMer <doomer3d@gmail.com>
+Date:   Fri Aug 16 02:26:27 2013 +0400
+
+    Fix detect 'lib64' dir
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d31a477..c56d158 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -67,11 +67,13 @@ add_definitions( -DPREFIX="${CMAKE_INSTALL_PREFIX}")
+ 
+ message(STATUS "Install prefix: " ${CMAKE_INSTALL_PREFIX})
+ 
+-IF (IS64BITS AND RESPECTLIB64)
++string (COMPARE EQUAL "${CMAKE_SIZEOF_VOID_P}" "8" IS64BITS)
++
++IF (IS64BITS)
+     SET (LIBDIR "lib64")
+-ELSE (IS64BITS AND RESPECTLIB64)
++ELSE (IS64BITS )
+     SET (LIBDIR "lib")
+-ENDIF (IS64BITS AND RESPECTLIB64)
++ENDIF (IS64BITS )
+ set(SG_LIBDIR "${LIBDIR}/screengrab")
+ set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${SG_LIBDIR}")
+ message(STATUS "Library path: "${CMAKE_INSTALL_RPATH})
diff --git a/x11-misc/screengrab/metadata.xml b/x11-misc/screengrab/metadata.xml
new file mode 100644
index 000000000000..89e086cd0db1
--- /dev/null
+++ b/x11-misc/screengrab/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>qt</herd>
+	<upstream>
+		<remote-id type="google-code">screengrab-qt</remote-id>
+	</upstream>
+<upstream>
+	<maintainer status="active">
+	<email>doomer3d@gmail.com</email>
+	<name>Artem Galichkin</name>
+	</maintainer>
+</upstream>
+</pkgmetadata>
diff --git a/x11-misc/screengrab/screengrab-1.0.ebuild b/x11-misc/screengrab/screengrab-1.0.ebuild
new file mode 100644
index 000000000000..a503a4781cd9
--- /dev/null
+++ b/x11-misc/screengrab/screengrab-1.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-utils
+
+DESCRIPTION="Qt application for getting screenshots"
+HOMEPAGE="http://screengrab.doomer.org"
+# Mirror the tarball because upstream failed to provide a proper way to get it
+SRC_URI="http://screengrab.doomer.org/download/screengrab-1_0_/  -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND="x11-libs/libX11
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-detect-lib64.patch )
+
+src_prepare() {
+	# Install docs into the right dir, but skip the license.
+	sed -i -e "/SG_DOCDIR/s:screengrab:${PF}:" \
+		CMakeLists.txt || die
+	cmake-utils_src_prepare
+}
diff --git a/x11-misc/sddm/Manifest b/x11-misc/sddm/Manifest
new file mode 100644
index 000000000000..ffdf15a403d6
--- /dev/null
+++ b/x11-misc/sddm/Manifest
@@ -0,0 +1 @@
+DIST sddm-0.11.0.tar.gz 4735807 SHA256 80d53f075c275f744bd547523d6d640baccfacb4e463a71ec0facb8231b832ce SHA512 9dd2b80788e3cfdb353e64f709db451e04828991976b8b0f74c0e97dbf467fa2744702c73e5e50137eec10dac92df7dacd83fb458f75dd595556fc95fb1759f7 WHIRLPOOL 079c5093374710c2a3247a3e27dd26f3d10962c7cb8f260b80a4ba17a72e63676012d4b8e50f8f4bffc43124efdf05c7e14aefe86253b391345c7fa98a2d4c2f
diff --git a/x11-misc/sddm/files/sddm-0.10.0-consolekit.patch b/x11-misc/sddm/files/sddm-0.10.0-consolekit.patch
new file mode 100644
index 000000000000..acdfdc1a43e2
--- /dev/null
+++ b/x11-misc/sddm/files/sddm-0.10.0-consolekit.patch
@@ -0,0 +1,13 @@
+diff --git a/data/scripts/Xsession b/data/scripts/Xsession
+index a5d270d..4b48524 100755
+--- a/data/scripts/Xsession
++++ b/data/scripts/Xsession
+@@ -74,7 +74,7 @@ case $session in
+     exec xterm -geometry 80x24-0-0
+     ;;
+   *)
+-    eval exec "$session"
++    eval exec ck-launch-session "$session"
+     ;;
+ esac
+ exec xmessage -center -buttons OK:0 -default OK "Sorry, cannot execute $session. Check $DESKTOP_SESSION.desktop."
diff --git a/x11-misc/sddm/files/sddm-0.10.0-upower.patch b/x11-misc/sddm/files/sddm-0.10.0-upower.patch
new file mode 100644
index 000000000000..8c0f34c27e8b
--- /dev/null
+++ b/x11-misc/sddm/files/sddm-0.10.0-upower.patch
@@ -0,0 +1,12 @@
+diff -u -r sddm-0.9.0.orig/src/daemon/PowerManager.cpp sddm-0.9.0/src/daemon/PowerManager.cpp
+--- sddm-0.9.0.orig/src/daemon/PowerManager.cpp	2014-10-01 18:40:37.402683578 +0200
++++ sddm-0.9.0/src/daemon/PowerManager.cpp	2014-10-01 18:40:43.502618164 +0200
+@@ -197,7 +197,7 @@
+             m_backends << new Login1Backend();
+ 
+         // check if upower interface exists
+-        if (interface->isServiceRegistered(UPOWER_SERVICE))
++//        if (interface->isServiceRegistered(UPOWER_SERVICE))
+             m_backends << new UPowerBackend();
+     }
+ 
diff --git a/x11-misc/sddm/files/sddm-0.11.0-consolekit.patch b/x11-misc/sddm/files/sddm-0.11.0-consolekit.patch
new file mode 100644
index 000000000000..4871bee0f06e
--- /dev/null
+++ b/x11-misc/sddm/files/sddm-0.11.0-consolekit.patch
@@ -0,0 +1,11 @@
+--- data/scripts/Xsession.old	2015-01-08 12:58:24.448241484 +0100
++++ data/scripts/Xsession	2015-01-08 13:00:07.794244087 +0100
+@@ -93,7 +93,7 @@
+     exec xterm -geometry 80x24-0-0
+     ;;
+   *)
+-    eval exec "$session"
++    eval exec ck-launch-session "$session"
+     ;;
+ esac
+ exec xmessage -center -buttons OK:0 -default OK "Sorry, cannot execute $session. Check $DESKTOP_SESSION.desktop."
diff --git a/x11-misc/sddm/files/sddm-0.11.0-dbus-config.patch b/x11-misc/sddm/files/sddm-0.11.0-dbus-config.patch
new file mode 100644
index 000000000000..c13c2bd79cf4
--- /dev/null
+++ b/x11-misc/sddm/files/sddm-0.11.0-dbus-config.patch
@@ -0,0 +1,46 @@
+From 4ab6ab1b78617c51a6d9db4d03be2b3d75e7acc5 Mon Sep 17 00:00:00 2001
+From: Harald Sitter <sitter@kde.org>
+Date: Tue, 14 Apr 2015 10:50:00 +0200
+Subject: [PATCH] allow changing the dbus config file name
+
+on some distributions the generic name of the dbus config might be provided
+by more than one display manager, so always installing with the generic
+name would require distributions to hard-patch the cmake code.
+allowing to change it through a cmake cache variable enables distributions
+to simply parameterize in their cmake call.
+
+this for example affects Ubuntu where the config would be provided by both
+SDDM and LightDM.
+---
+ CMakeLists.txt      | 1 +
+ data/CMakeLists.txt | 2 +-
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 7ceed6e..cf21dc9 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -141,6 +141,7 @@ set(SESSION_COMMAND             "${DATA_INSTALL_DIR}/scripts/Xsession"
+ 
+ set(CONFIG_FILE                 "${CMAKE_INSTALL_FULL_SYSCONFDIR}/sddm.conf"        CACHE PATH      "Path of the sddm config file")
+ set(LOG_FILE                    "${CMAKE_INSTALL_FULL_LOCALSTATEDIR}/log/sddm.log"  CACHE PATH      "Path of the sddm log file")
++set(DBUS_CONFIG_FILENAME        "org.freedesktop.DisplayManager.conf"               CACHE STRING    "Name of the sddm config file")
+ set(COMPONENTS_TRANSLATION_DIR  "${DATA_INSTALL_DIR}/translations"                  CACHE PATH      "Components translations directory")
+ 
+ # Add subdirectories
+diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
+index 918892f..335f4e7 100644
+--- a/data/CMakeLists.txt
++++ b/data/CMakeLists.txt
+@@ -1,7 +1,7 @@
+ install(DIRECTORY   "faces"                             DESTINATION "${DATA_INSTALL_DIR}")
+ install(DIRECTORY   "flags"                             DESTINATION "${DATA_INSTALL_DIR}")
+ 
+-install(FILES "org.freedesktop.DisplayManager.conf"       DESTINATION "${DBUS_CONFIG_DIR}")
++install(FILES "org.freedesktop.DisplayManager.conf"     DESTINATION "${DBUS_CONFIG_DIR}" RENAME ${DBUS_CONFIG_FILENAME})
+ 
+ install(FILES "scripts/Xsession" "scripts/Xsetup" "scripts/Xstop" DESTINATION "${DATA_INSTALL_DIR}/scripts"
+         PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE
+-- 
+2.3.6
+
diff --git a/x11-misc/sddm/metadata.xml b/x11-misc/sddm/metadata.xml
new file mode 100644
index 000000000000..fdeadb584e84
--- /dev/null
+++ b/x11-misc/sddm/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>lxqt</herd>
+  <maintainer>
+    <email>jauhien@gentoo.org</email>
+    <name>Jauhien Piatlicki</name>
+  </maintainer>
+  <use>
+    <flag name="consolekit">Use ck-launch-session from sys-auth/consolekit by default in Xsession (no native support)</flag>
+  </use>
+  <longdescription lang="en">
+    SDDM is a modern display manager for X11 aiming to be fast, simple
+    and beatiful. It uses modern technologies like QtQuick, which in
+    turn gives the designer the ability to create smooth, animated
+    user interfaces.
+  </longdescription>
+  <upstream>
+    <remote-id type="github">sddm/sddm</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/x11-misc/sddm/sddm-0.11.0-r1.ebuild b/x11-misc/sddm/sddm-0.11.0-r1.ebuild
new file mode 100644
index 000000000000..e64e71168c2d
--- /dev/null
+++ b/x11-misc/sddm/sddm-0.11.0-r1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit cmake-utils toolchain-funcs user
+
+DESCRIPTION="Simple Desktop Display Manager"
+HOMEPAGE="https://github.com/sddm/sddm"
+SRC_URI="http://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64 ~arm ~x86"
+
+LICENSE="GPL-2+ MIT CC-BY-3.0 public-domain"
+SLOT="0"
+IUSE="consolekit systemd +upower"
+REQUIRED_USE="?? ( upower systemd )"
+
+RDEPEND="sys-libs/pam
+	>=x11-base/xorg-server-1.15.1
+	x11-libs/libxcb[xkb(-)]
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtdeclarative:5
+	dev-qt/linguist-tools:5
+	dev-qt/qttest:5
+	systemd? ( sys-apps/systemd:= )
+	upower? ( || ( sys-power/upower sys-power/upower-pm-utils ) )"
+DEPEND="${RDEPEND}
+	>=sys-devel/gcc-4.7.0
+	virtual/pkgconfig"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		[[ $(gcc-version) < 4.7 ]] && \
+			die 'The active compiler needs to be gcc 4.7 (or newer)'
+	fi
+}
+
+src_prepare() {
+	use consolekit && epatch "${FILESDIR}/${P}-consolekit.patch"
+	use upower && epatch "${FILESDIR}/${PN}-0.10.0-upower.patch"
+	# fix bug 552318
+	epatch "${FILESDIR}/${P}-dbus-config.patch"
+
+	# respect user's cflags
+	sed -e 's|-Wall -march=native||' \
+		-e 's|-O2||' \
+		-i CMakeLists.txt || die 'sed failed'
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_no systemd SYSTEMD)
+		-DDBUS_CONFIG_FILENAME:STRING="org.freedesktop.sddm.conf"
+	)
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	if use consolekit; then
+		ewarn "This display manager doesn't have native built-in ConsoleKit support."
+		ewarn "In order to use ConsoleKit pam module with this display manager,"
+		ewarn "you should remove the \"nox11\" parameter from pm_ck_connector.so"
+		ewarn "line in /etc/pam.d/system-login"
+	fi
+	ewarn "Add the sddm user manually to the video group"
+	ewarn "if you experience flickering or other rendering issues of sddm-greeter"
+	ewarn "see https://github.com/gentoo/qt/pull/52"
+}
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 /var/lib/sddm ${PN}
+}
diff --git a/x11-misc/seetxt/Manifest b/x11-misc/seetxt/Manifest
new file mode 100644
index 000000000000..46d14e5ebbc0
--- /dev/null
+++ b/x11-misc/seetxt/Manifest
@@ -0,0 +1 @@
+DIST seetxt-0.72.tar.bz2 141695 SHA256 c38786057e3939f262235c68cf3b8a7d7ab1450ffe4508ec98ec10e16b396159 SHA512 3d6e604e3ee8b0d382dcf60a507c54162eb28d5a9d61edc631a40a95f550276bf4e505ea37966a50d7f38ba952408d8d06b91bc71a8eb32322cb047a4ffc27ea WHIRLPOOL 1bd4060d5a2d49e601b868a43aa3e24ea104ed953a96701c50ab7ded234eabf9f31683d14294914e517bd5df641e58f56d50c2b7898338032f3c4561df37d615
diff --git a/x11-misc/seetxt/files/0.72-0001-fix-linking.patch b/x11-misc/seetxt/files/0.72-0001-fix-linking.patch
new file mode 100644
index 000000000000..b21e05592933
--- /dev/null
+++ b/x11-misc/seetxt/files/0.72-0001-fix-linking.patch
@@ -0,0 +1,39 @@
+From 0eb39c4c08e7e3787d411a36e4997ae144e2bed5 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Tiziano=20M=C3=BCller?= <tm@dev-zero.ch>
+Date: Tue, 9 Apr 2013 07:23:19 +0200
+Subject: [PATCH 1/2] Fix linking.
+
+---
+ configure.ac    | 2 +-
+ src/Makefile.am | 4 +++-
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 3a1aa30..f1d3f30 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -13,7 +13,7 @@ AM_PROG_CC_C_O
+ AC_PROG_LN_S  # for ln -s (mandatory)
+ 
+ # Checks for libraries.
+-GTK_REQUIRED_VERSION=2.12.0
++PKG_CHECK_MODULES([DEPS], [gtk+-2.0 >= 2.12.0])
+ 
+ # Checks for header files.
+ AC_CHECK_HEADERS([dirent.h errno.h fcntl.h pthread.h stdlib.h string.h regex.h sys/socket.h sys/time.h time.h unistd.h])
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 2c8a24d..fca6504 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -1,5 +1,7 @@
++AM_CPPFLAGS = $(DEPS_CFLAGS)
++
+ bin_PROGRAMS = seetxt
+ seetxt_CFLAGS = -D SDIR=\"$(datadir)/seetxt-runtime\"
+-seetxt_LDFLAGS = `pkg-config --libs gtk+-2.0` -lpthread
++seetxt_LDADD = $(DEPS_LIBS) -lpthread
+ INCLUDES = `pkg-config --cflags gtk+-2.0`
+ seetxt_SOURCES = see.c server.c util.c
+-- 
+1.8.1.5
+
diff --git a/x11-misc/seetxt/files/0.72-0002-fix-shared-files-install.patch b/x11-misc/seetxt/files/0.72-0002-fix-shared-files-install.patch
new file mode 100644
index 000000000000..e4f488a32d48
--- /dev/null
+++ b/x11-misc/seetxt/files/0.72-0002-fix-shared-files-install.patch
@@ -0,0 +1,32 @@
+From a1137a02237df31e063af622be0dc76c2ab3e45a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Tiziano=20M=C3=BCller?= <tm@dev-zero.ch>
+Date: Tue, 9 Apr 2013 07:24:45 +0200
+Subject: [PATCH 2/2] Fix shared files install
+
+---
+ Makefile.am | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 691c0f1..404d743 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,13 +1,13 @@
+ SUBDIRS = src
+ buildextra = @builddir@/extra
+-pkgdatadir = $(DESTDIR)$(datadir)/seetxt-runtime
++pkgdatadir = $(datadir)/seetxt-runtime
+ 
+ install-data-am:
+ 	-install --mode=644 $(buildextra)/seetxt.1 $(DESTDIR)$(mandir)/man1/
+ 	@echo " "
+ 	@echo "Installing some additional files in $(DESTDIR)$(pkgdatadir)..."
+ 	@echo " "
+-	-mkdir $(pkgdatadir)
++	-mkdir -p $(DESTDIR)$(pkgdatadir)
+ 	-install --mode=644 $(buildextra)/seeon.png $(buildextra)/seeoff.png $(buildextra)/.seeconfig $(buildextra)/COPYING.images $(DESTDIR)$(pkgdatadir)
+ 	-install --mode=666 $(buildextra)/filelist $(DESTDIR)$(pkgdatadir)
+ 	-cd $(DESTDIR)$(mandir)/man1; ln -s seetxt.1 seeman.1
+-- 
+1.8.1.5
+
diff --git a/x11-misc/seetxt/metadata.xml b/x11-misc/seetxt/metadata.xml
new file mode 100644
index 000000000000..402820e93e7a
--- /dev/null
+++ b/x11-misc/seetxt/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>dev-zero@gentoo.org</email>
+		<name>Tiziano Müller</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="google-code">seetxt</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-misc/seetxt/seetxt-0.72-r1.ebuild b/x11-misc/seetxt/seetxt-0.72-r1.ebuild
new file mode 100644
index 000000000000..eee282c0235a
--- /dev/null
+++ b/x11-misc/seetxt/seetxt-0.72-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools eutils
+
+DESCRIPTION="Clever, lightweight GUI text file and manual page viewer for X windows"
+HOMEPAGE="http://code.google.com/p/seetxt/ http://seetxt.sourceforge.net/"
+SRC_URI="http://seetxt.googlecode.com/files/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="x11-libs/gtk+:2"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}/${PV}-0001-fix-linking.patch" \
+		"${FILESDIR}/${PV}-0002-fix-shared-files-install.patch"
+	eautoreconf
+}
+
+src_install() {
+	dodir /usr/share/man/man1
+	default
+	sed -i -e 's|local/||' "${D}/usr/share/seetxt-runtime/filelist" || die "sed failed"
+}
diff --git a/x11-misc/set_opacity/Manifest b/x11-misc/set_opacity/Manifest
new file mode 100644
index 000000000000..b0519b9e37d8
--- /dev/null
+++ b/x11-misc/set_opacity/Manifest
@@ -0,0 +1 @@
+DIST set_opacity-1.0.tar.gz 5115 SHA256 b3aac6b47107840866f1968e346f59963de2548d7d583a919c95144cb7aae105
diff --git a/x11-misc/set_opacity/files/makefile.patch b/x11-misc/set_opacity/files/makefile.patch
new file mode 100644
index 000000000000..bb21db68ce48
--- /dev/null
+++ b/x11-misc/set_opacity/files/makefile.patch
@@ -0,0 +1,21 @@
+--- Makefile	2006-02-09 16:45:52.000000000 +0300
++++ Makefile	2011-07-18 13:58:58.644703015 +0400
+@@ -1,14 +1,14 @@
+ PACKAGES = xcomposite xfixes xdamage xrender
+-LIBS=`pkg-config --libs ${PACKAGES}` -lm
+-INCS=`pkg-config --cflags ${PACKAGES}`
++LIBS=$(shell pkg-config --libs $(PACKAGES)) -lm
++INCS=$(shell pkg-config --cflags $(PACKAGES))
+ 
+ .c.o:
+-	$(CC) $(CFLAGS) $(INCS) -c $*.c
++	$(CC) $(CFLAGS) $(INCS) -c $< -o $@
+ 
+ OBJS=set_opacity.o interface.o stack.o
+ 
+ set_opacity: $(OBJS)
+-	$(CC) $(CFLAGS) -g -o $@ $(OBJS) $(LIBS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
+ 
+ $(OBJS): interface.h stack.h
+ 
diff --git a/x11-misc/set_opacity/metadata.xml b/x11-misc/set_opacity/metadata.xml
new file mode 100644
index 000000000000..57147d064d19
--- /dev/null
+++ b/x11-misc/set_opacity/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer>
+    <email>pinkbyte@gentoo.org</email>
+    <name>Sergey Popov</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="gitorious">x11-tools/set_opacity</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/x11-misc/set_opacity/set_opacity-1.0.ebuild b/x11-misc/set_opacity/set_opacity-1.0.ebuild
new file mode 100644
index 000000000000..37a6cba55d5c
--- /dev/null
+++ b/x11-misc/set_opacity/set_opacity-1.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit toolchain-funcs
+
+DESCRIPTION="Tool for set real compositing for windows through window's id, process' pid etc."
+HOMEPAGE="https://gitorious.org/x11-tools/set_opacity"
+SRC_URI="https://gitorious.org/x11-tools/set_opacity/archive-tarball/${PV} -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="x11-libs/libXdamage
+	x11-libs/libXcomposite
+	x11-libs/libXfixes
+	x11-libs/libXrender"
+RDEPEND=${DEPEND}
+
+S="${WORKDIR}/x11-tools-set_opacity"
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	dobin set_opacity
+}
diff --git a/x11-misc/set_opacity/set_opacity-9999.ebuild b/x11-misc/set_opacity/set_opacity-9999.ebuild
new file mode 100644
index 000000000000..6633e1570170
--- /dev/null
+++ b/x11-misc/set_opacity/set_opacity-9999.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+EGIT_REPO_URI="git://gitorious.org/x11-tools/set_opacity.git"
+
+inherit git-2 toolchain-funcs
+
+DESCRIPTION="Tool for set real compositing for windows through window's id, process' pid etc."
+HOMEPAGE="https://gitorious.org/x11-tools/set_opacity"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="x11-libs/libXdamage
+	x11-libs/libXcomposite
+	x11-libs/libXfixes
+	x11-libs/libXrender"
+RDEPEND=${DEPEND}
+
+KEYWORDS=""
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	dobin set_opacity
+}
diff --git a/x11-misc/shared-mime-info/Manifest b/x11-misc/shared-mime-info/Manifest
new file mode 100644
index 000000000000..120b07da8a34
--- /dev/null
+++ b/x11-misc/shared-mime-info/Manifest
@@ -0,0 +1 @@
+DIST shared-mime-info-1.4.tar.xz 537916 SHA256 bbc0bd023f497dfd75e1ca73441cbbb5a63617d9e14f2790b868361cc055b5b1 SHA512 ac643a5360c1e4811b2df8e3c52434e5ee48f8e62a01ede3fb0895d30721b58b5b26c0edc43f779576ff899bd1a8b181699a08dbbb1e956394555f6ca983a582 WHIRLPOOL 32cb301cd54140b83af8c321b7ebc571b87b07ca86bfc68e6760e4dd3551188a092a96087042b13f1278c11cd88c261879fc816d0c2efcbee473211d929194bf
diff --git a/x11-misc/shared-mime-info/files/shared-mime-info-1.4-iso-1.patch b/x11-misc/shared-mime-info/files/shared-mime-info-1.4-iso-1.patch
new file mode 100644
index 000000000000..601e8aff5caa
--- /dev/null
+++ b/x11-misc/shared-mime-info/files/shared-mime-info-1.4-iso-1.patch
@@ -0,0 +1,40 @@
+From 0e93784410db711eef67fa2a56b0ec4bc4b5e08d Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Sun, 15 Feb 2015 18:43:49 +0100
+Subject: [PATCH] Add a note about ISO image magic
+
+And the fact that we cannot implement it here.
+---
+ HACKING                | 3 +++
+ freedesktop.org.xml.in | 1 +
+ 2 files changed, 4 insertions(+)
+
+diff --git a/HACKING b/HACKING
+index 260025b..370fb68 100644
+--- a/HACKING
++++ b/HACKING
+@@ -10,6 +10,9 @@ A few ground rules for people interested in adding new mime-types.
+ * Mime-types/file formats proprietary to one application should only
+   be added to a private .xml file and be bundled with the application
+   itself
++* Magic offset must be as small as possible. For example, the worst case
++  scenario for ISO images is 32k inside the file. This is too big for a sniff
++  buffer, especially on remote locations. Avoid those.
+ * No commits should be done that break the test suite, or the test suite
+   test in question should be amended, and reason for the changes clearly
+   documented in the commit message
+diff --git a/freedesktop.org.xml.in b/freedesktop.org.xml.in
+index 7321d40..093c260 100644
+--- a/freedesktop.org.xml.in
++++ b/freedesktop.org.xml.in
+@@ -1514,6 +1514,7 @@ command to generate the output files.
+     <_comment>raw CD image</_comment>
+     <sub-class-of type="application/x-raw-disk-image"/>
+     <alias type="application/x-iso9660-image"/>
++    <!-- No magic, see https://bugs.freedesktop.org/show_bug.cgi?id=10049 -->
+     <glob pattern="*.iso"/>
+     <glob pattern="*.iso9660"/>
+   </mime-type>
+-- 
+2.4.1
+
diff --git a/x11-misc/shared-mime-info/files/shared-mime-info-1.4-iso-2.patch b/x11-misc/shared-mime-info/files/shared-mime-info-1.4-iso-2.patch
new file mode 100644
index 000000000000..5c0bb0357b29
--- /dev/null
+++ b/x11-misc/shared-mime-info/files/shared-mime-info-1.4-iso-2.patch
@@ -0,0 +1,29 @@
+From 824cff3da0f17812715795f0e64a47f7331a338b Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Wed, 18 Feb 2015 10:37:36 +0100
+Subject: [PATCH] Bump priority for ISO images glob matching
+
+To work-around file managers that cannot use magic to differentiate
+mime-types.
+
+https://bugs.freedesktop.org/show_bug.cgi?id=80877
+---
+ freedesktop.org.xml.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/freedesktop.org.xml.in b/freedesktop.org.xml.in
+index 64f34b9..59e399c 100644
+--- a/freedesktop.org.xml.in
++++ b/freedesktop.org.xml.in
+@@ -1515,7 +1515,7 @@ command to generate the output files.
+     <sub-class-of type="application/x-raw-disk-image"/>
+     <alias type="application/x-iso9660-image"/>
+     <!-- No magic, see https://bugs.freedesktop.org/show_bug.cgi?id=10049 -->
+-    <glob pattern="*.iso"/>
++    <glob pattern="*.iso" weight="80"/>
+     <glob pattern="*.iso9660"/>
+   </mime-type>
+   <mime-type type="application/x-cdrdao-toc">
+-- 
+2.4.1
+
diff --git a/x11-misc/shared-mime-info/metadata.xml b/x11-misc/shared-mime-info/metadata.xml
new file mode 100644
index 000000000000..8c868061b739
--- /dev/null
+++ b/x11-misc/shared-mime-info/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>freedesktop</herd>
+<maintainer>
+<email>freedesktop-bugs@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-misc/shared-mime-info/shared-mime-info-1.4-r1.ebuild b/x11-misc/shared-mime-info/shared-mime-info-1.4-r1.ebuild
new file mode 100644
index 000000000000..3bb169160d0b
--- /dev/null
+++ b/x11-misc/shared-mime-info/shared-mime-info-1.4-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils fdo-mime
+
+DESCRIPTION="The Shared MIME-info Database specification"
+HOMEPAGE="http://freedesktop.org/wiki/Software/shared-mime-info"
+SRC_URI="http://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 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~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
+	dev-libs/libxml2"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+DOCS=( ChangeLog HACKING NEWS README )
+
+src_prepare() {
+	# Useful patches from usptream git, will be in next release
+	epatch "${FILESDIR}"/${P}-iso-1.patch
+	epatch "${FILESDIR}"/${P}-iso-2.patch
+
+	epatch_user
+}
+
+src_configure() {
+	export ac_cv_func_fdatasync=no #487504
+
+	econf \
+		$(use_enable test default-make-check) \
+		--disable-update-mimedb
+}
+
+src_compile() {
+	# FIXME: 0.91 fails with -j9 every second time like:
+	# update_mime_database-update-mime-database.o: file not recognized: File truncated
+	# collect2: ld returned 1 exit status
+	emake -j1
+}
+
+src_install() {
+	default
+
+	# in prefix, install an env.d entry such that prefix patch is used/added
+	if use prefix; then
+		echo "XDG_DATA_DIRS=\"${EPREFIX}/usr/share\"" > "${T}"/50mimeinfo
+		doenvd "${T}"/50mimeinfo
+	fi
+}
+
+pkg_postinst() {
+	use prefix && export XDG_DATA_DIRS="${EPREFIX}"/usr/share
+	fdo-mime_mime_database_update
+}
diff --git a/x11-misc/shared-mime-info/shared-mime-info-1.4.ebuild b/x11-misc/shared-mime-info/shared-mime-info-1.4.ebuild
new file mode 100644
index 000000000000..1823cd681a4d
--- /dev/null
+++ b/x11-misc/shared-mime-info/shared-mime-info-1.4.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils fdo-mime
+
+DESCRIPTION="The Shared MIME-info Database specification"
+HOMEPAGE="http://freedesktop.org/wiki/Software/shared-mime-info"
+SRC_URI="http://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 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~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
+	dev-libs/libxml2"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+DOCS=( ChangeLog HACKING NEWS README )
+
+src_configure() {
+	export ac_cv_func_fdatasync=no #487504
+
+	econf \
+		$(use_enable test default-make-check) \
+		--disable-update-mimedb
+}
+
+src_compile() {
+	# FIXME: 0.91 fails with -j9 every second time like:
+	# update_mime_database-update-mime-database.o: file not recognized: File truncated
+	# collect2: ld returned 1 exit status
+	emake -j1
+}
+
+src_install() {
+	default
+
+	# in prefix, install an env.d entry such that prefix patch is used/added
+	if use prefix; then
+		echo "XDG_DATA_DIRS=\"${EPREFIX}/usr/share\"" > "${T}"/50mimeinfo
+		doenvd "${T}"/50mimeinfo
+	fi
+}
+
+pkg_postinst() {
+	use prefix && export XDG_DATA_DIRS="${EPREFIX}"/usr/share
+	fdo-mime_mime_database_update
+}
diff --git a/x11-misc/shutter/Manifest b/x11-misc/shutter/Manifest
new file mode 100644
index 000000000000..66910f3b8dc7
--- /dev/null
+++ b/x11-misc/shutter/Manifest
@@ -0,0 +1,5 @@
+DIST shutter-0.90.1.tar.gz 3354197 SHA256 10ba5cda49b2407ba2ea87bf8b06b60bd03c63e7ce391dda100c321054a02124 SHA512 306671fdf0f31758b256bf6986db3c9100c292d12dce7316a111a20ae0ae4bc1820b4875d2fe593941b175e7fcf6767b328f1c0c518f55ea081aed49071ce0c7 WHIRLPOOL f36bf5fa9c358c40b25fe856c7fc36c8d5b26c6f94502ae213caf33d025dff9910d2d0926f6c358d2d81c766df09b64b6a918757fb53b6a197f353fe08f6df30
+DIST shutter-0.90.tar.gz 3281329 SHA256 7001b872f1723f58ec27289ceeb1fe9e3a75d82236250dc466076d30d7137a7d SHA512 f27912f2b1a2d9469e20870c79f8cd11671ce9559510149f3806e2d1d3fd00d25e1f1216f9aac226aef1d7f6d543078d1a03ade912a4797d1342aad739ef6999 WHIRLPOOL 5c57ee654aa01f6bdfe8d7d69903a7fcc5186a88d0e1172326425c945796b3fc1f28929af97c67d065ddb1029f9a42b0fe86b71cef31fcae5aae3d19a3e0a36d
+DIST shutter-0.91.tar.gz 3376735 SHA256 08764792ac6c2ed139a59283a8e5151fa40294c6822986d555977e6f60a49815 SHA512 bc777d034b7ac103db59e686080590dae656fafbc4684227b256fc197a3bd02a66f67f674836db66afe5524427c127042830fe9b760d5a32c6e6a1c2e2be764b WHIRLPOOL 98ca5193b6c342fcf48eede47cac0944c670092beaacf340c78607b659e5c59445fc0e55b22155886a79b318bce681935a15932d78de616425072819d5af6e21
+DIST shutter-0.93.1.tar.gz 3432204 SHA256 536d1f7bc69fff518bf5a6a040d6a2d65beb2eecd5429967c71c25cf991e9625 SHA512 50a635fdf73454b15351a7e2c4507bf0f9fd816273affbed412f42b1032087304ecf1fb4a4b655bc056820f267b98214ff5104f4fcd9e843f78e70ac4a7a4a04 WHIRLPOOL e81f5970850638c711ae958365edde5f7f2b9678d292ce666c89a6611a30ce143440de5db47916b6e84b737bf3416bbed164e79954d8210382ff3f4546a840ad
+DIST shutter-0.93.tar.gz 3378419 SHA256 493b39e1d4a1df4728c776eed7bf0bd6b81151ed4631c11aff6b291695733f87 SHA512 8ebaf13b1d71bdabe6f610ee42e4bedd331479e72ee71a345e7b6bf9f56151b0d9c2cb0d104420b40636d3030258a8a8937a7672262c7afc5cd3b0e59b9d37b8 WHIRLPOOL cc0b0e1f0f8805dd34b05a95de63a3b7904af7f7d1ca79b4d841e4ad7f77a33b0e590b239e282cb8a449658360b44c444dafa86d8aa9b6b5fe925c95161cb55d
diff --git a/x11-misc/shutter/files/0.86.4-disable-goocanvas.patch b/x11-misc/shutter/files/0.86.4-disable-goocanvas.patch
new file mode 100644
index 000000000000..aea2e67f1714
--- /dev/null
+++ b/x11-misc/shutter/files/0.86.4-disable-goocanvas.patch
@@ -0,0 +1,21 @@
+Index: shutter-0.86.4/bin/shutter
+===================================================================
+--- shutter-0.86.4.orig/bin/shutter
++++ shutter-0.86.4/bin/shutter
+@@ -8350,14 +8350,9 @@ sub fct_init_depend {
+ 		$nautilus_sendto = FALSE;
+ 	}
+ 
+-	#goocanvas
+-	eval { require Goo::Canvas };
+-	if ($@) {
+-		warn "WARNING: Goo::Canvas/libgoocanvas is missing --> drawing tool will be disabled!\n\n";
+-		$goocanvas = FALSE;
+-	}
++	$goocanvas = FALSE;
+ 	
+-	eval { require Net::DBus::GLib };
++		eval { require Net::DBus::GLib };
+ 	if ($@) {
+ 		warn "WARNING: Net::DBus::GLib is missing --> Ubuntu One support will be disabled!\n\n";
+ 		$ubuntuone = FALSE;
diff --git a/x11-misc/shutter/files/disable-goocanvas-0.87.1.patch b/x11-misc/shutter/files/disable-goocanvas-0.87.1.patch
new file mode 100644
index 000000000000..7819e602a1b5
--- /dev/null
+++ b/x11-misc/shutter/files/disable-goocanvas-0.87.1.patch
@@ -0,0 +1,18 @@
+Index: shutter-0.87.1/bin/shutter
+===================================================================
+--- shutter-0.87.1.orig/bin/shutter
++++ shutter-0.87.1/bin/shutter
+@@ -9188,12 +9188,7 @@ if ($app->is_running) {
+ 			$nautilus_sendto = FALSE;
+ 		}
+ 
+-		#goocanvas
+-		eval { require Goo::Canvas };
+-		if ($@) {
+-			warn "WARNING: Goo::Canvas/libgoo-canvas-perl is missing --> drawing tool will be disabled!\n\n";
+-			$goocanvas = FALSE;
+-		}
++		$goocanvas = FALSE;
+ 		
+ 		#net-dbus-glib-perl
+ 		eval { require Net::DBus::GLib };
diff --git a/x11-misc/shutter/files/disable_webphoto-0.87.1.patch b/x11-misc/shutter/files/disable_webphoto-0.87.1.patch
new file mode 100644
index 000000000000..7db728c4b53a
--- /dev/null
+++ b/x11-misc/shutter/files/disable_webphoto-0.87.1.patch
@@ -0,0 +1,17 @@
+Index: shutter-0.87.1/bin/shutter
+===================================================================
+--- shutter-0.87.1.orig/bin/shutter
++++ shutter-0.87.1/bin/shutter
+@@ -9181,11 +9181,7 @@ if ($app->is_running) {
+ 			die "ERROR: imagemagick is missing --> aborting!\n\n";
+ 		}
+ 
+-		#gnome-web-photo
+-		unless ( File::Which::which('gnome-web-photo') ) {
+-			warn "WARNING: gnome-web-photo is missing --> screenshots of websites will be disabled!\n\n";
+-			$gnome_web_photo = FALSE;
+-		}
++		$gnome_web_photo = FALSE;
+ 
+ 		#nautilus-sendto
+ 		unless ( File::Which::which('nautilus-sendto') ) {
diff --git a/x11-misc/shutter/files/shutter-0.90-goocanvas.patch b/x11-misc/shutter/files/shutter-0.90-goocanvas.patch
new file mode 100644
index 000000000000..3a811635a988
--- /dev/null
+++ b/x11-misc/shutter/files/shutter-0.90-goocanvas.patch
@@ -0,0 +1,18 @@
+Index: shutter-0.90/bin/shutter
+===================================================================
+--- shutter-0.90.orig/bin/shutter
++++ shutter-0.90/bin/shutter
+@@ -9407,12 +9407,7 @@ else {
+             $nautilus_sendto = FALSE;
+         }
+ 
+-        #goocanvas
+-        eval { require Goo::Canvas };
+-        if ($@) {
+-            warn "WARNING: Goo::Canvas/libgoo-canvas-perl is missing --> drawing tool will be disabled!\n\n";
+-            $goocanvas = FALSE;
+-        }
++        $goocanvas = FALSE;
+ 
+         #net-dbus-glib-perl
+         eval { require Net::DBus::GLib };
diff --git a/x11-misc/shutter/files/shutter-0.90-webphoto.patch b/x11-misc/shutter/files/shutter-0.90-webphoto.patch
new file mode 100644
index 000000000000..647e53aa5e04
--- /dev/null
+++ b/x11-misc/shutter/files/shutter-0.90-webphoto.patch
@@ -0,0 +1,17 @@
+Index: shutter-0.90/bin/shutter
+===================================================================
+--- shutter-0.90.orig/bin/shutter
++++ shutter-0.90/bin/shutter
+@@ -9396,11 +9396,7 @@ else {
+             die "ERROR: imagemagick is missing --> aborting!\n\n";
+         }
+ 
+-        #gnome-web-photo
+-        unless ( File::Which::which('gnome-web-photo') ) {
+-            warn "WARNING: gnome-web-photo is missing --> screenshots of websites will be disabled!\n\n";
+-            $gnome_web_photo = FALSE;
+-        }
++        $gnome_web_photo = FALSE;
+ 
+         #nautilus-sendto
+         unless ( File::Which::which('nautilus-sendto') ) {
diff --git a/x11-misc/shutter/metadata.xml b/x11-misc/shutter/metadata.xml
new file mode 100644
index 000000000000..0cde073c8f9e
--- /dev/null
+++ b/x11-misc/shutter/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>graphics</herd>
+<maintainer>
+<email>hwoarang@gentoo.org</email>
+<name>Markos Chandras</name>
+</maintainer>
+<use>
+	<flag name="webphoto">Enables screenshots of websites</flag>
+	<flag name="drawing">Enables drawing tool</flag>
+</use>
+<longdescription lang="en">
+</longdescription>
+</pkgmetadata>
+
diff --git a/x11-misc/shutter/shutter-0.90.1.ebuild b/x11-misc/shutter/shutter-0.90.1.ebuild
new file mode 100644
index 000000000000..986aa28b1868
--- /dev/null
+++ b/x11-misc/shutter/shutter-0.90.1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils
+
+DESCRIPTION="Feature-rich screenshot program"
+HOMEPAGE="http://shutter-project.org/"
+SRC_URI="http://shutter-project.org/wp-content/uploads/releases/tars/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="drawing webphoto"
+
+RDEPEND="dev-lang/perl
+	drawing? ( dev-perl/Goo-Canvas  )
+	webphoto? ( gnome-extra/gnome-web-photo )
+	|| ( media-gfx/imagemagick[perl] media-gfx/graphicsmagick[imagemagick,perl] )
+	dev-perl/libxml-perl
+	dev-perl/gnome2-wnck
+	dev-perl/gnome2-canvas
+	dev-perl/gnome2-perl
+	dev-perl/Gtk2-Unique
+	dev-perl/Gtk2-ImageView
+	dev-perl/File-DesktopEntry
+	dev-perl/File-HomeDir
+	dev-perl/File-Which
+	dev-perl/JSON
+	dev-perl/File-Copy-Recursive
+	dev-perl/File-MimeInfo
+	dev-perl/Locale-gettext
+	dev-perl/Net-DBus
+	dev-perl/Proc-Simple
+	dev-perl/Proc-ProcessTable
+	dev-perl/Sort-Naturally
+	dev-perl/WWW-Mechanize
+	dev-perl/X11-Protocol
+	dev-perl/XML-Simple
+	dev-perl/libwww-perl"
+
+src_prepare() {
+	use webphoto || epatch "${FILESDIR}"/${PN}-0.90-webphoto.patch
+	use drawing || epatch "${FILESDIR}"/${PN}-0.90-goocanvas.patch
+	#Fix tray icon because it doesn't pick the right icon using various themes
+	sed -i -e "/\$tray->set_from_icon_name/s:set_from_icon_name:set_from_file:" \
+	-e "s:shutter-panel:/usr/share/icons/hicolor/scalable/apps/&.svg:" \
+	bin/shutter || die "failed to fix trayicon"
+}
+
+src_install() {
+	dobin bin/${PN} || die "dobin failed"
+	insinto /usr/share/${PN}
+	doins -r share/${PN}/* || die "doins failed"
+	dodoc README || die "dodoc failed"
+	domenu share/applications/${PN}.desktop
+	# Man page is broken. Reconstruct it.
+	gunzip share/man/man1/${PN}.1.gz || die "gunzip failed"
+	doman share/man/man1/${PN}.1 || die "doman failed"
+	doicon share/pixmaps/${PN}.png
+	doins -r share/locale || die "doins failed"
+	insinto /usr/share/icons/hicolor
+	doins -r share/icons/hicolor/* || die "doins failed"
+	find "${D}"/usr/share/shutter/resources/system/plugins/ -type f ! -name '*.*' -exec chmod 755 {} \; \
+		|| die "failed to make plugins executables"
+	find "${D}"/usr/share/shutter/resources/system/upload_plugins/upload -type f \
+		-name "*.pm" -exec chmod 755 {} \; || die "failed to make upload plugins executables"
+}
diff --git a/x11-misc/shutter/shutter-0.90.ebuild b/x11-misc/shutter/shutter-0.90.ebuild
new file mode 100644
index 000000000000..d0e31d1294cc
--- /dev/null
+++ b/x11-misc/shutter/shutter-0.90.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="2"
+
+inherit eutils
+
+DESCRIPTION="Feature-rich screenshot program"
+HOMEPAGE="http://shutter-project.org/"
+SRC_URI="http://shutter-project.org/wp-content/uploads/releases/tars/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="drawing webphoto"
+
+RDEPEND="dev-lang/perl
+	drawing? ( dev-perl/Goo-Canvas  )
+	webphoto? ( gnome-extra/gnome-web-photo )
+	|| ( media-gfx/imagemagick[perl] media-gfx/graphicsmagick[imagemagick,perl] )
+	dev-perl/libxml-perl
+	dev-perl/gnome2-wnck
+	dev-perl/gnome2-canvas
+	dev-perl/gnome2-perl
+	dev-perl/Gtk2-Unique
+	dev-perl/Gtk2-ImageView
+	dev-perl/File-DesktopEntry
+	dev-perl/File-HomeDir
+	dev-perl/File-Which
+	dev-perl/JSON
+	dev-perl/File-Copy-Recursive
+	dev-perl/File-MimeInfo
+	dev-perl/Locale-gettext
+	dev-perl/Net-DBus
+	dev-perl/Proc-Simple
+	dev-perl/Proc-ProcessTable
+	dev-perl/Sort-Naturally
+	dev-perl/WWW-Mechanize
+	dev-perl/X11-Protocol
+	dev-perl/XML-Simple
+	dev-perl/libwww-perl"
+
+src_prepare() {
+	use webphoto || epatch "${FILESDIR}"/${P}-webphoto.patch
+	use drawing || epatch "${FILESDIR}"/${P}-goocanvas.patch
+	#Fix tray icon because it doesn't pick the right icon using various themes
+	sed -i -e "/\$tray->set_from_icon_name/s:set_from_icon_name:set_from_file:" \
+	-e "s:shutter-panel:/usr/share/icons/hicolor/scalable/apps/&.svg:" \
+	bin/shutter || die "failed to fix trayicon"
+}
+
+src_install() {
+	dobin bin/${PN} || die "dobin failed"
+	insinto /usr/share/${PN}
+	doins -r share/${PN}/* || die "doins failed"
+	dodoc README || die "dodoc failed"
+	domenu share/applications/${PN}.desktop
+	# mapage is broken. Reconstruct it.
+	mv share/man/man1/${PN}.1.gz share/man/man1/${PN}.1
+	bzip2 share/man/man1/${PN}.1
+	doman share/man/man1/${PN}.1.bz2 || die "doman failed"
+	doicon share/pixmaps/${PN}.png
+	doins -r share/locale || die "doins failed"
+	insinto /usr/share/icons/hicolor
+	doins -r share/icons/hicolor/* || die "doins failed"
+	find "${D}"/usr/share/shutter/resources/system/plugins/ -type f ! -name '*.*' -exec chmod 755 {} \; \
+		|| die "failed to make plugins executables"
+	find "${D}"/usr/share/shutter/resources/system/upload_plugins/upload -type f \
+		-name "*.pm" -exec chmod 755 {} \; || die "failed to make upload plugins executables"
+}
diff --git a/x11-misc/shutter/shutter-0.91.ebuild b/x11-misc/shutter/shutter-0.91.ebuild
new file mode 100644
index 000000000000..361c2670c8d4
--- /dev/null
+++ b/x11-misc/shutter/shutter-0.91.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils
+
+DESCRIPTION="Feature-rich screenshot program"
+HOMEPAGE="http://shutter-project.org/"
+SRC_URI="http://shutter-project.org/wp-content/uploads/releases/tars/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="drawing webphoto"
+
+RDEPEND="dev-lang/perl
+	drawing? ( dev-perl/Goo-Canvas  )
+	webphoto? ( gnome-extra/gnome-web-photo )
+	|| ( media-gfx/imagemagick[perl] media-gfx/graphicsmagick[imagemagick,perl] )
+	dev-perl/libxml-perl
+	dev-perl/gnome2-wnck
+	dev-perl/gnome2-canvas
+	dev-perl/gnome2-perl
+	dev-perl/Gtk2-Unique
+	dev-perl/Gtk2-ImageView
+	dev-perl/File-DesktopEntry
+	dev-perl/File-HomeDir
+	dev-perl/File-Which
+	dev-perl/JSON
+	dev-perl/File-Copy-Recursive
+	dev-perl/File-MimeInfo
+	dev-perl/Locale-gettext
+	dev-perl/Net-DBus
+	dev-perl/Proc-Simple
+	dev-perl/Proc-ProcessTable
+	dev-perl/Sort-Naturally
+	dev-perl/WWW-Mechanize
+	dev-perl/X11-Protocol
+	dev-perl/XML-Simple
+	dev-perl/libwww-perl"
+
+src_prepare() {
+	use webphoto || epatch "${FILESDIR}"/${PN}-0.90-webphoto.patch
+	use drawing || epatch "${FILESDIR}"/${PN}-0.90-goocanvas.patch
+	#Fix tray icon because it doesn't pick the right icon using various themes
+	sed -i -e "/\$tray->set_from_icon_name/s:set_from_icon_name:set_from_file:" \
+	-e "s:shutter-panel:/usr/share/icons/hicolor/scalable/apps/&.svg:" \
+	bin/shutter || die "failed to fix trayicon"
+}
+
+src_install() {
+	dobin bin/${PN} || die "dobin failed"
+	insinto /usr/share/${PN}
+	doins -r share/${PN}/* || die "doins failed"
+	dodoc README || die "dodoc failed"
+	domenu share/applications/${PN}.desktop
+	# Man page is broken. Reconstruct it.
+	gunzip share/man/man1/${PN}.1.gz || die "gunzip failed"
+	doman share/man/man1/${PN}.1 || die "doman failed"
+	doicon share/pixmaps/${PN}.png
+	doins -r share/locale || die "doins failed"
+	insinto /usr/share/icons/hicolor
+	doins -r share/icons/hicolor/* || die "doins failed"
+	find "${D}"/usr/share/shutter/resources/system/plugins/ -type f ! -name '*.*' -exec chmod 755 {} \; \
+		|| die "failed to make plugins executables"
+	find "${D}"/usr/share/shutter/resources/system/upload_plugins/upload -type f \
+		-name "*.pm" -exec chmod 755 {} \; || die "failed to make upload plugins executables"
+}
diff --git a/x11-misc/shutter/shutter-0.93.1.ebuild b/x11-misc/shutter/shutter-0.93.1.ebuild
new file mode 100644
index 000000000000..908017dff083
--- /dev/null
+++ b/x11-misc/shutter/shutter-0.93.1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils
+
+DESCRIPTION="Feature-rich screenshot program"
+HOMEPAGE="http://shutter-project.org/"
+SRC_URI="http://shutter-project.org/wp-content/uploads/releases/tars/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="drawing webphoto"
+
+RDEPEND="dev-lang/perl
+	drawing? ( dev-perl/Goo-Canvas  )
+	webphoto? ( gnome-extra/gnome-web-photo )
+	|| ( media-gfx/imagemagick[perl] media-gfx/graphicsmagick[imagemagick,perl] )
+	dev-perl/libxml-perl
+	dev-perl/gnome2-wnck
+	dev-perl/gnome2-canvas
+	dev-perl/gnome2-perl
+	dev-perl/Gtk2-Unique
+	dev-perl/Gtk2-ImageView
+	dev-perl/File-DesktopEntry
+	dev-perl/File-HomeDir
+	dev-perl/File-Which
+	dev-perl/JSON
+	dev-perl/File-Copy-Recursive
+	dev-perl/File-MimeInfo
+	dev-perl/Locale-gettext
+	dev-perl/Net-DBus
+	dev-perl/Proc-Simple
+	dev-perl/Proc-ProcessTable
+	dev-perl/Sort-Naturally
+	dev-perl/WWW-Mechanize
+	dev-perl/X11-Protocol
+	dev-perl/XML-Simple
+	dev-perl/libwww-perl"
+
+src_prepare() {
+	use webphoto || epatch "${FILESDIR}"/${PN}-0.90-webphoto.patch
+	use drawing || epatch "${FILESDIR}"/${PN}-0.90-goocanvas.patch
+	#Fix tray icon because it doesn't pick the right icon using various themes
+	sed -i -e "/\$tray->set_from_icon_name/s:set_from_icon_name:set_from_file:" \
+	-e "s:shutter-panel:/usr/share/icons/hicolor/scalable/apps/&.svg:" \
+	bin/shutter || die "failed to fix trayicon"
+}
+
+src_install() {
+	dobin bin/${PN} || die "dobin failed"
+	insinto /usr/share/${PN}
+	doins -r share/${PN}/* || die "doins failed"
+	dodoc README || die "dodoc failed"
+	domenu share/applications/${PN}.desktop
+	# Man page is broken. Reconstruct it.
+	gunzip share/man/man1/${PN}.1.gz || die "gunzip failed"
+	doman share/man/man1/${PN}.1 || die "doman failed"
+	doicon share/pixmaps/${PN}.png
+	doins -r share/locale || die "doins failed"
+	insinto /usr/share/icons/hicolor
+	doins -r share/icons/hicolor/* || die "doins failed"
+	find "${D}"/usr/share/shutter/resources/system/plugins/ -type f ! -name '*.*' -exec chmod 755 {} \; \
+		|| die "failed to make plugins executables"
+	find "${D}"/usr/share/shutter/resources/system/upload_plugins/upload -type f \
+		-name "*.pm" -exec chmod 755 {} \; || die "failed to make upload plugins executables"
+}
diff --git a/x11-misc/shutter/shutter-0.93.ebuild b/x11-misc/shutter/shutter-0.93.ebuild
new file mode 100644
index 000000000000..361c2670c8d4
--- /dev/null
+++ b/x11-misc/shutter/shutter-0.93.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils
+
+DESCRIPTION="Feature-rich screenshot program"
+HOMEPAGE="http://shutter-project.org/"
+SRC_URI="http://shutter-project.org/wp-content/uploads/releases/tars/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="drawing webphoto"
+
+RDEPEND="dev-lang/perl
+	drawing? ( dev-perl/Goo-Canvas  )
+	webphoto? ( gnome-extra/gnome-web-photo )
+	|| ( media-gfx/imagemagick[perl] media-gfx/graphicsmagick[imagemagick,perl] )
+	dev-perl/libxml-perl
+	dev-perl/gnome2-wnck
+	dev-perl/gnome2-canvas
+	dev-perl/gnome2-perl
+	dev-perl/Gtk2-Unique
+	dev-perl/Gtk2-ImageView
+	dev-perl/File-DesktopEntry
+	dev-perl/File-HomeDir
+	dev-perl/File-Which
+	dev-perl/JSON
+	dev-perl/File-Copy-Recursive
+	dev-perl/File-MimeInfo
+	dev-perl/Locale-gettext
+	dev-perl/Net-DBus
+	dev-perl/Proc-Simple
+	dev-perl/Proc-ProcessTable
+	dev-perl/Sort-Naturally
+	dev-perl/WWW-Mechanize
+	dev-perl/X11-Protocol
+	dev-perl/XML-Simple
+	dev-perl/libwww-perl"
+
+src_prepare() {
+	use webphoto || epatch "${FILESDIR}"/${PN}-0.90-webphoto.patch
+	use drawing || epatch "${FILESDIR}"/${PN}-0.90-goocanvas.patch
+	#Fix tray icon because it doesn't pick the right icon using various themes
+	sed -i -e "/\$tray->set_from_icon_name/s:set_from_icon_name:set_from_file:" \
+	-e "s:shutter-panel:/usr/share/icons/hicolor/scalable/apps/&.svg:" \
+	bin/shutter || die "failed to fix trayicon"
+}
+
+src_install() {
+	dobin bin/${PN} || die "dobin failed"
+	insinto /usr/share/${PN}
+	doins -r share/${PN}/* || die "doins failed"
+	dodoc README || die "dodoc failed"
+	domenu share/applications/${PN}.desktop
+	# Man page is broken. Reconstruct it.
+	gunzip share/man/man1/${PN}.1.gz || die "gunzip failed"
+	doman share/man/man1/${PN}.1 || die "doman failed"
+	doicon share/pixmaps/${PN}.png
+	doins -r share/locale || die "doins failed"
+	insinto /usr/share/icons/hicolor
+	doins -r share/icons/hicolor/* || die "doins failed"
+	find "${D}"/usr/share/shutter/resources/system/plugins/ -type f ! -name '*.*' -exec chmod 755 {} \; \
+		|| die "failed to make plugins executables"
+	find "${D}"/usr/share/shutter/resources/system/upload_plugins/upload -type f \
+		-name "*.pm" -exec chmod 755 {} \; || die "failed to make upload plugins executables"
+}
diff --git a/x11-misc/shutterbug/Manifest b/x11-misc/shutterbug/Manifest
new file mode 100644
index 000000000000..be8d2e7aae99
--- /dev/null
+++ b/x11-misc/shutterbug/Manifest
@@ -0,0 +1,4 @@
+DIST fox-1.6.36.tar.gz 4344694 SHA256 cf8f4d09e104d6b3c425df3ce5b3bd54ed4c8095389f742f81370aba16169dff SHA512 2985404d6b2122159e9859d3490a154b75429bb1cf9d9920155f454012ef88fbd005548db0e68d55826d7b9d68ec745bccd14e27a8ff13bdbf5c8357f47ccdc0 WHIRLPOOL 74af19f2d041b785e88799b1fc8aad5c94efa30e53b9fecd0e8bfb6abff58c3930ef28e91d3199d79acacb100d2281ad7497bc1656556ef0d78daa109f90c860
+DIST fox-1.7.45.tar.gz 5254563 SHA256 78f2b5f609a52d21da08e693d45b8eeb9d4ceed52ad86e451ef4485f2375c829 SHA512 ec8acf0eb0b1882254f7df2abdcb87445992fc9fb8165afcc08b8dd52a718cb31953849efc7a530bd682e6265687bdf4dc9fb5c930557b9405235182894684b0 WHIRLPOOL 08808e67e0e31c7389b1d4ac097d7d707fb48a925df233021913bc80363002c0c4ce19c8630f4bd5c87ebb5bc5c010dc7f3260f415dfa5b60390c5aae316de78
+DIST fox-1.7.47.tar.gz 5271135 SHA256 7f1de8566b88b0010137ea1172168d53494d2d14bfa03fe32f7796146a31a2a3 SHA512 8802c7a21ba35b48a638fb87354da3de54c82ebdd3f931a601f55473fe1f7c16bfa2df253e8531af2058665d9b6f31adf52f6973c2d94f435cc90ac112af22ed WHIRLPOOL fbcf4540b268e95fa4d70ed335d8f499ec46e18390cdc090c98c21b4be5ff3ec576439265cfcf8b90c037fed7937c3a5f19f8544db1906cf86a3f255b8092d62
+DIST fox-1.7.49.tar.gz 5336321 SHA256 2435c56cde3ba6617c638af4f3bac39e8f4d5dd5a5c6d0805d274c7ba05c520c SHA512 da6c3478370f1e72091675e49f8458a6722eca4735bf89052b2b7ef02f4e74ee41f10c9fcc39a24a1571dd0bb1cdf779e9dea5bf15be20722ca783c9d59eb6e9 WHIRLPOOL 53ad3d34e57507702fc2ac9bd7b446021a99e3dff5b337cda090a670b06d4733abce2bbca88a7586e8af2d00f16ee84b0bd3c42f66fd6e430cc6d342bb76b1ff
diff --git a/x11-misc/shutterbug/metadata.xml b/x11-misc/shutterbug/metadata.xml
new file mode 100644
index 000000000000..00c1680ed459
--- /dev/null
+++ b/x11-misc/shutterbug/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>mabi@gentoo.org</email>
+		<name>Matti Bickel</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/x11-misc/shutterbug/shutterbug-1.6.36.ebuild b/x11-misc/shutterbug/shutterbug-1.6.36.ebuild
new file mode 100644
index 000000000000..89d7e038acf3
--- /dev/null
+++ b/x11-misc/shutterbug/shutterbug-1.6.36.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="1"
+
+inherit fox
+
+DESCRIPTION="Screenshot utility based on the FOX Toolkit"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 hppa ppc ppc64 ~sparc x86"
+IUSE="jpeg png tiff"
+
+DEPEND="
+	x11-libs/fox:1.6
+	jpeg? ( virtual/jpeg )
+	png? ( media-libs/libpng:0 )
+	tiff? ( media-libs/tiff:0 )"
+
+RDEPEND="${DEPEND}"
+
+FOXCONF="$(use_enable jpeg) \
+	$(use_enable png) \
+	$(use_enable tiff)"
diff --git a/x11-misc/shutterbug/shutterbug-1.7.45.ebuild b/x11-misc/shutterbug/shutterbug-1.7.45.ebuild
new file mode 100644
index 000000000000..ea12864b16c6
--- /dev/null
+++ b/x11-misc/shutterbug/shutterbug-1.7.45.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit fox
+
+DESCRIPTION="Screenshot utility based on the FOX Toolkit"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+jpeg +png +tiff"
+
+DEPEND="
+	x11-libs/fox:1.7
+	jpeg? ( virtual/jpeg )
+	png? ( media-libs/libpng:0 )
+	tiff? ( media-libs/tiff:0 )"
+
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	FOXCONF="$(use_enable jpeg) \
+		$(use_enable png) \
+		$(use_enable tiff)" fox_src_configure
+}
diff --git a/x11-misc/shutterbug/shutterbug-1.7.47.ebuild b/x11-misc/shutterbug/shutterbug-1.7.47.ebuild
new file mode 100644
index 000000000000..f5b2e70358d9
--- /dev/null
+++ b/x11-misc/shutterbug/shutterbug-1.7.47.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit fox
+
+DESCRIPTION="Screenshot utility based on the FOX Toolkit"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+jpeg +png +tiff"
+
+DEPEND="
+	x11-libs/fox:1.7
+	x11-libs/libICE
+	x11-libs/libSM
+	jpeg? ( virtual/jpeg )
+	png? ( media-libs/libpng:0 )
+	tiff? ( media-libs/tiff:0 )"
+
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	FOXCONF="$(use_enable jpeg) \
+		$(use_enable png) \
+		$(use_enable tiff)" fox_src_configure
+}
diff --git a/x11-misc/shutterbug/shutterbug-1.7.49.ebuild b/x11-misc/shutterbug/shutterbug-1.7.49.ebuild
new file mode 100644
index 000000000000..86447916e3b2
--- /dev/null
+++ b/x11-misc/shutterbug/shutterbug-1.7.49.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit fox
+
+DESCRIPTION="Screenshot utility based on the FOX Toolkit"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~hppa ppc ~ppc64 ~sparc x86"
+IUSE="+jpeg +png +tiff"
+
+DEPEND="
+	x11-libs/fox:1.7
+	x11-libs/libICE
+	x11-libs/libSM
+	jpeg? ( virtual/jpeg )
+	png? ( media-libs/libpng:0 )
+	tiff? ( media-libs/tiff:0 )"
+
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	FOXCONF="$(use_enable jpeg) \
+		$(use_enable png) \
+		$(use_enable tiff)" fox_src_configure
+}
diff --git a/x11-misc/simpleswitcher/metadata.xml b/x11-misc/simpleswitcher/metadata.xml
new file mode 100644
index 000000000000..dc4e0a03dace
--- /dev/null
+++ b/x11-misc/simpleswitcher/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>xmw@gentoo.org</email>
+		<name>Michael Weber</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">seanpringle/simpleswitcher</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-misc/simpleswitcher/simpleswitcher-9999.ebuild b/x11-misc/simpleswitcher/simpleswitcher-9999.ebuild
new file mode 100644
index 000000000000..7617711c7f53
--- /dev/null
+++ b/x11-misc/simpleswitcher/simpleswitcher-9999.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit git-2 toolchain-funcs
+
+DESCRIPTION="lightweight EWMH window switcher with features and looks of dmenu"
+HOMEPAGE="https://github.com/seanpringle/simpleswitcher"
+EGIT_REPO_URI="https://github.com/seanpringle/simpleswitcher"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXft
+	x11-libs/libXinerama"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_compile() {
+	tc-export CC
+	default
+}
+
+src_install() {
+	default
+	doman ${PN}.1
+	dodoc README.md
+}
diff --git a/x11-misc/sisctrl/Manifest b/x11-misc/sisctrl/Manifest
new file mode 100644
index 000000000000..35987ca4a0a0
--- /dev/null
+++ b/x11-misc/sisctrl/Manifest
@@ -0,0 +1 @@
+DIST sisctrl-0.0.20051202.tar.gz 666749 SHA256 76855a8ff4631418374261613a273b082e0f56f29aa083a2197c5350688611f1 SHA512 26fe6561c2c14ff6cf952b89b8089b4fbdbc0c142bbcbf1358afe610b219a05dcf4d0bc835365cd0cf13558fed142b8aa2a0aa91c4fec8f40f0fc82590feabd1 WHIRLPOOL ec5dcf2b2286b99716cea4625d2124490e56c8ab743f0d068811b9a63f59533eaf924606b0fca3741b3abccbe91050c8ea7b2e66f40a70f256669ac981cbeda7
diff --git a/x11-misc/sisctrl/files/sisctrl-0.0.20051202-no-xv.patch b/x11-misc/sisctrl/files/sisctrl-0.0.20051202-no-xv.patch
new file mode 100644
index 000000000000..6c61b8485bc2
--- /dev/null
+++ b/x11-misc/sisctrl/files/sisctrl-0.0.20051202-no-xv.patch
@@ -0,0 +1,12 @@
+--- a/src/sisctrl.c
++++ b/src/sisctrl.c
+@@ -4067,7 +4067,9 @@
+ 			 ( (!(sc.sdflags & SiS_SD_SUPPORT2OVL)) || (sc.sd2flags & SiS_SD2_SUPPORT760OO) ) ) ?
+ 			 	1 : 0;
+ 
++#ifdef USEXV
+     gl.noxvdemo = (sc.noxvdemo) ? 1 : 0;
++#endif
+ 
+ #ifdef USE_STRAY
+     gl.dontusesystemtray = sc.dontusesystemtray;
diff --git a/x11-misc/sisctrl/metadata.xml b/x11-misc/sisctrl/metadata.xml
new file mode 100644
index 000000000000..2518313f5241
--- /dev/null
+++ b/x11-misc/sisctrl/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+        <herd>desktop-misc</herd>
+</pkgmetadata>
diff --git a/x11-misc/sisctrl/sisctrl-0.0.20051202.ebuild b/x11-misc/sisctrl/sisctrl-0.0.20051202.ebuild
new file mode 100644
index 000000000000..548f712a1958
--- /dev/null
+++ b/x11-misc/sisctrl/sisctrl-0.0.20051202.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils flag-o-matic
+
+DESCRIPTION="tool that allows you to tune SiS drivers from X"
+HOMEPAGE="http://www.winischhofer.net/linuxsispart1.shtml#sisctrl"
+SRC_URI="http://www.winischhofer.net/sis/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 x86"
+IUSE=""
+
+RDEPEND="dev-libs/glib:2
+	 x11-libs/gtk+:2
+	 x11-libs/libXrender
+	 x11-libs/libXv
+	 x11-libs/libXxf86vm"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	x11-proto/xf86vidmodeproto"
+
+DOCS="AUTHORS ChangeLog NEWS README"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-no-xv.patch
+	sed -i -e 's,/X11R6,,g' configure || die
+	append-flags -lm
+}
diff --git a/x11-misc/skippy/Manifest b/x11-misc/skippy/Manifest
new file mode 100644
index 000000000000..1807b9e31d02
--- /dev/null
+++ b/x11-misc/skippy/Manifest
@@ -0,0 +1 @@
+DIST skippy-0.5.0.tar.bz2 23722 RMD160 66c8980881defaa3d634d6fe4f2745c91a2247e5 SHA1 30774b56fe2c355449843f4b16c1aa783f32daa7 SHA256 8f0f15f34a9fcfacb36cc8dc156d0d10c62020bbdd45edc348af67d861b74a99
diff --git a/x11-misc/skippy/files/skippy-0.5.0-Makefile.patch b/x11-misc/skippy/files/skippy-0.5.0-Makefile.patch
new file mode 100644
index 000000000000..957d3ba6216c
--- /dev/null
+++ b/x11-misc/skippy/files/skippy-0.5.0-Makefile.patch
@@ -0,0 +1,32 @@
+Don't use LDFLAGS to pass libraries.
+
+--- Makefile
++++ Makefile
+@@ -1,14 +1,12 @@
+-PREFIX = /usr/local
++PREFIX = /usr
+ BINDIR = ${PREFIX}/bin
+ 
+-X11PREFIX = /usr/X11R6
+-
+-CFLAGS += -I${X11PREFIX}/include `imlib2-config --cflags` `pkg-config xft --cflags` -g -pedantic -Wall
+-LDFLAGS += -L${X11PREFIX}/lib -lX11 -lm `imlib2-config --libs` `pkg-config xft --libs`
++CFLAGS += `imlib2-config --cflags` `pkg-config xft --cflags` -pedantic -Wall
++LDLIBS = -lX11 -lm `imlib2-config --libs` `pkg-config xft --libs`
+ 
+ # Comment these out to disable Xinerama support
+ CFLAGS += -DXINERAMA
+-LDFLAGS += -lXext -lXinerama
++LDLIBS += -lXext -lXinerama
+ 
+ # Uncomment this for Xinerama debugging
+ #CFLAGS += -DDEBUG
+@@ -21,7 +19,7 @@
+ all: skippy${EXESUFFIX}
+ 
+ skippy${EXESUFFIX}: Makefile ${SOURCES} ${HEADERS}
+-	gcc ${CFLAGS} -o skippy${EXESUFFIX} ${SOURCES} ${LDFLAGS}
++	${CC} ${LDFLAGS} ${CFLAGS} -o skippy${EXESUFFIX} ${SOURCES} ${LDLIBS}
+ 
+ clean:
+ 	rm -f skippy${EXESUFFIX}
diff --git a/x11-misc/skippy/files/skippy-pointer-size.patch b/x11-misc/skippy/files/skippy-pointer-size.patch
new file mode 100644
index 000000000000..8a7ee42d177b
--- /dev/null
+++ b/x11-misc/skippy/files/skippy-pointer-size.patch
@@ -0,0 +1,11 @@
+--- wm.c
++++ wm.c
+@@ -258,7 +258,7 @@
+ 		return 0;
+ 	
+ 	for(i = 0; i < items_read; i++)
+-		l = dlist_add(l, (void*)((CARD32*)data)[i]);
++		l = dlist_add(l, (void*)((void**)data)[i]);
+ 	
+ 	XFree(data);
+ 	
diff --git a/x11-misc/skippy/metadata.xml b/x11-misc/skippy/metadata.xml
new file mode 100644
index 000000000000..731225048652
--- /dev/null
+++ b/x11-misc/skippy/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>desktop-misc</herd>
+</pkgmetadata>
diff --git a/x11-misc/skippy/skippy-0.5.0.ebuild b/x11-misc/skippy/skippy-0.5.0.ebuild
new file mode 100644
index 000000000000..1627520b810e
--- /dev/null
+++ b/x11-misc/skippy/skippy-0.5.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+inherit eutils toolchain-funcs
+
+DESCRIPTION="A full-screen task-switcher providing Apple Expose-like functionality with various WMs"
+HOMEPAGE="http://thegraveyard.org/skippy.php"
+SRC_URI="http://thegraveyard.org/files/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+RDEPEND="media-libs/imlib2[X]
+	x11-libs/libXext
+	x11-libs/libX11
+	x11-libs/libXinerama
+	x11-libs/libXmu
+	x11-libs/libXft"
+DEPEND="${RDEPEND}
+	x11-proto/xproto
+	x11-proto/xineramaproto
+	virtual/pkgconfig"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-pointer-size.patch \
+		"${FILESDIR}"/${P}-Makefile.patch
+}
+
+src_compile() {
+	tc-export CC
+	emake || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc CHANGELOG skippyrc-default
+}
+
+pkg_postinst() {
+	echo
+	elog "You should copy skippyrc-default from /usr/share/doc/${PF} to"
+	elog "~/.skippyrc and edit the keysym used to invoke skippy."
+	elog "Use x11-apps/xev to find out the keysym."
+	echo
+}
diff --git a/x11-misc/slim/Manifest b/x11-misc/slim/Manifest
new file mode 100644
index 000000000000..6de046801615
--- /dev/null
+++ b/x11-misc/slim/Manifest
@@ -0,0 +1 @@
+DIST slim-1.3.6.tar.gz 232547 SHA256 21defeed175418c46d71af71fd493cd0cbffd693f9d43c2151529125859810df SHA512 345b1dee5d6f0c3716dfa7c5c16274adbf18586bdaaa6af4f310e24c5a61f79a297ffac921a5ba545523317e9fe120916df226c36b9c9b49c2ac9c1ca21dee0c WHIRLPOOL 473fa2f3752ec0c1bd2410ff3110649ce792c2e904928694b5fb8a43de619945276282e4a9de86198b9f38cdd74d1f9dc9cbcc754cc97989002b368ef26a8429
diff --git a/x11-misc/slim/files/Xsession-r3 b/x11-misc/slim/files/Xsession-r3
new file mode 100644
index 000000000000..237fb3630661
--- /dev/null
+++ b/x11-misc/slim/files/Xsession-r3
@@ -0,0 +1,158 @@
+#!/bin/sh
+#
+# Slim login manager Xsession script
+#
+
+command="$@"
+
+# this will go into slim.log along with all other echo's
+# good for debugging where things go wrong
+echo "$0: Beginning session setup..."
+
+# First read /etc/profile and .profile
+test -f /etc/profile && . /etc/profile
+test -f "$HOME/.profile" && . "$HOME/.profile"
+# Second read /etc/xprofile and .xprofile for X specific setup
+test -f /etc/xprofile && . /etc/xprofile
+test -f "$HOME/.xprofile" && . "$HOME/.xprofile"
+
+# wrap possible arguments to determine whether to treat special or not
+if [ "x$command" = "xcustom" ] || [ "x$command" = "xCustom" ] || [ "x$command" = "xdefault" ] || [ "x$command" = "xDefault" ]; then
+  command="Xsession"
+fi
+if [ "x$command" = "x" ]; then
+  # no default specified, check if Xsession will complete
+  # and if not then assign XSESSION to command
+  if [ -x "$HOME/.xsession" ] || [ -x "$HOME/.Xclients" ] || [ -x /etc/X11/xinit/Xclients ] || [ -x /etc/X11/Xclients ]; then
+    command="Xsession"
+  else
+    command=$XSESSION
+  fi
+fi
+
+# most of this is from /etc/X11/chooser.sh
+sessionscript=""
+if [ -n "${command}" ]; then
+  # find a match for $command in /etc/X11/Sessions
+  for x in /etc/X11/Sessions/* ; do
+    if [ "`echo ${x##*/} | awk '{ print toupper($1) }'`" = "`echo ${command} | awk '{ print toupper($1) }'`" ]; then
+      sessionscript=${x}
+      break
+    fi
+  done
+  if [ -n "${sessionscript}" ]; then
+    if [ -x "${sessionscript}" ]; then
+      command="${sessionscript}"
+    else
+      command="/bin/sh ${sessionscript}"
+    fi
+  else
+
+    # find an executable for $command
+    x=""
+    y=""
+
+    for x in "${command}" "`echo ${command} | awk '{ print toupper($1) }'`" "`echo ${command} | awk '{ print tolower($1) }'`"
+    do
+      # Fall through ...
+      if [ -x "`which ${x} 2>/dev/null`" ]; then
+	y="`which ${x} 2>/dev/null`"
+	break
+      fi
+    done
+    # note , if the command could not be found then $command will be empty
+    command="$y"
+    unset x
+    unset y
+  fi
+fi
+
+# call xrdb and xmodmap and such, since $command is not a session script
+if [ -z "${sessionscript}" ]; then
+  userresources="$HOME/.Xresources"
+  usermodmap="$HOME/.Xmodmap"
+  userxkbmap="$HOME/.Xkbmap"
+
+  sysresources=/etc/X11/Xresources 
+  sysmodmap=/etc/X11/Xmodmap 
+  sysxkbmap=/etc/X11/Xkbmap
+
+  rh6sysresources=/etc/X11/xinit/Xresources 
+  rh6sysmodmap=/etc/X11/xinit/Xmodmap 
+
+  # merge in defaults
+  if [ -f "$rh6sysresources" ]; then
+    xrdb -merge "$rh6sysresources"
+  fi
+
+  if [ -f "$sysresources" ]; then
+    xrdb -merge "$sysresources"
+  fi
+
+  if [ -f "$userresources" ]; then
+    xrdb -merge "$userresources"
+  fi
+
+  # merge in keymaps
+  if [ -f "$sysxkbmap" ]; then
+    setxkbmap `cat "$sysxkbmap"`
+    XKB_IN_USE=yes
+  fi
+
+  if [ -f "$userxkbmap" ]; then
+    setxkbmap `cat "$userxkbmap"`
+    XKB_IN_USE=yes
+  fi
+
+  #
+  # Eeek, this seems like too much magic here
+  #
+  if [ -z "$XKB_IN_USE" -a ! -L /etc/X11/X ]; then
+    if grep '^exec.*/Xsun' /etc/X11/X > /dev/null 2>&1 && [ -f /etc/X11/XF86Config ]; then
+      xkbsymbols=`sed -n -e 's/^[     ]*XkbSymbols[   ]*"\(.*\)".*$/\1/p' /etc/X11/XF86Config`
+      if [ -n "$xkbsymbols" ]; then
+        setxkbmap -symbols "$xkbsymbols"
+        XKB_IN_USE=yes
+      fi
+    fi
+  fi
+
+  # xkb and xmodmap don't play nice together
+  if [ -z "$XKB_IN_USE" ]; then
+    if [ -f "$rh6sysmodmap" ]; then
+      xmodmap "$rh6sysmodmap"
+    fi
+
+    if [ -f "$sysmodmap" ]; then
+      xmodmap "$sysmodmap"
+    fi
+
+    if [ -f "$usermodmap" ]; then
+      xmodmap "$usermodmap"
+    fi
+  fi
+
+  unset XKB_IN_USE
+fi
+unset sessionscript
+
+# start failsafe session
+if [ -z "${command}" ]; then
+  echo "$0: Failed to find a command to start the session, so starting a failsafe xterm."
+  exec xterm -geometry 80x24+0+0
+fi
+
+# run all system xinitrc shell scripts which will update command
+if [ -d /etc/X11/xinit/xinitrc.d ]; then
+  for i in /etc/X11/xinit/xinitrc.d/* ; do
+    if [ -x "$i" ]; then
+      . "$i"
+    fi
+  done
+  unset i
+fi
+
+echo "$0: Setup done, will execute: $command"
+exec $command
+
+# vim:ts=4
diff --git a/x11-misc/slim/files/slim-1.3.5-arm.patch b/x11-misc/slim/files/slim-1.3.5-arm.patch
new file mode 100644
index 000000000000..9438ce4a1caf
--- /dev/null
+++ b/x11-misc/slim/files/slim-1.3.5-arm.patch
@@ -0,0 +1,11 @@
+--- a/Ck.cpp	2012-06-26 04:20:14.000000000 -0400
++++ b/Ck.cpp	2012-10-05 13:25:29.000000000 -0400
+@@ -91,7 +91,7 @@
+ 
+ 	vt = *((long *)return_value);
+ 
+-	std::snprintf(device, 32, "/dev/tty%ld", vt);
++	std::sprintf(device, "/dev/tty%ld", vt);
+ 
+ 	if(return_value)
+ 	  XFree(return_value);
diff --git a/x11-misc/slim/files/slim-1.3.5-disable-ck-for-systemd.patch b/x11-misc/slim/files/slim-1.3.5-disable-ck-for-systemd.patch
new file mode 100644
index 000000000000..f7e361767615
--- /dev/null
+++ b/x11-misc/slim/files/slim-1.3.5-disable-ck-for-systemd.patch
@@ -0,0 +1,122 @@
+diff -Naur slim-1.3.5/app.cpp slim-1.3.5.new/app.cpp
+--- slim-1.3.5/app.cpp	2012-12-31 08:03:42.000000000 -0500
++++ slim-1.3.5.new/app.cpp	2013-08-22 14:16:37.994854259 -0400
+@@ -138,11 +138,14 @@
+ 	daemonmode = false;
+ 	force_nodaemon = false;
+ 	firstlogin = true;
++#ifdef USE_CONSOLEKIT
++	consolekit_support_enabled = true;
++#endif
+ 	Dpy = NULL;
+ 
+ 	/* Parse command line
+ 	   Note: we force a option for nodaemon switch to handle "-nodaemon" */
+-	while((tmp = getopt(argc, argv, "vhp:n:d?")) != EOF) {
++	while((tmp = getopt(argc, argv, "vhsp:n:d?")) != EOF) {
+ 		switch (tmp) {
+ 		case 'p':	/* Test theme */
+ 			testtheme = optarg;
+@@ -163,6 +166,11 @@
+ 			std::cout << APPNAME << " version " << VERSION << endl;
+ 			exit(OK_EXIT);
+ 			break;
++#ifdef USE_CONSOLEKIT
++		case 's':	/* Disable consolekit support */
++			consolekit_support_enabled = false;
++			break;
++#endif
+ 		case '?':	/* Illegal */
+ 			logStream << endl;
+ 		case 'h':   /* Help */
+@@ -171,6 +179,9 @@
+ 			<< "	-d: daemon mode" << endl
+ 			<< "	-nodaemon: no-daemon mode" << endl
+ 			<< "	-v: show version" << endl
++#ifdef USE_CONSOLEKIT
++			<< "	-s: start for systemd, disable consolekit support" << endl
++#endif
+ 			<< "	-p /path/to/theme/dir: preview theme" << endl;
+ 			exit(OK_EXIT);
+ 			break;
+@@ -559,6 +570,7 @@
+ #endif
+ 
+ #ifdef USE_CONSOLEKIT
++	if (consolekit_support_enabled) {
+ 	/* Setup the ConsoleKit session */
+ 	try {
+ 		ck.open_session(DisplayName, pw->pw_uid);
+@@ -567,6 +579,7 @@
+ 		logStream << APPNAME << ": " << e << endl;
+ 		exit(ERR_EXIT);
+ 	}
++	}
+ #endif
+ 
+ 	/* Create new process */
+@@ -578,6 +591,7 @@
+ 		char** child_env = pam.getenvlist();
+ 
+ # ifdef USE_CONSOLEKIT
++		if (consolekit_support_enabled) {
+ 		char** old_env = child_env;
+ 
+ 		/* Grow the copy of the environment for the session cookie */
+@@ -590,6 +604,7 @@
+ 		memcpy(child_env, old_env, sizeof(char*)*n+1);
+ 		child_env[n - 1] = StrConcat("XDG_SESSION_COOKIE=", ck.get_xdg_session_cookie());
+ 		child_env[n] = NULL;
++		}
+ # endif /* USE_CONSOLEKIT */
+ #else
+ 
+@@ -611,6 +626,7 @@
+ 		child_env[n++]=StrConcat("MAIL=", maildir.c_str());
+ 		child_env[n++]=StrConcat("XAUTHORITY=", xauthority.c_str());
+ # ifdef USE_CONSOLEKIT
++		if (consolekit_support_enabled)
+ 		child_env[n++]=StrConcat("XDG_SESSION_COOKIE=", ck.get_xdg_session_cookie());
+ # endif /* USE_CONSOLEKIT */
+ 		child_env[n++]=0;
+@@ -656,12 +672,14 @@
+ 	}
+ 
+ #ifdef USE_CONSOLEKIT
++	if (consolekit_support_enabled) {
+ 	try {
+ 		ck.close_session();
+ 	}
+ 	catch(Ck::Exception &e) {
+ 		logStream << APPNAME << ": " << e << endl;
+ 	};
++	}
+ #endif
+ 
+ #ifdef USE_PAM
+diff -Naur slim-1.3.5/app.h slim-1.3.5.new/app.h
+--- slim-1.3.5/app.h	2012-12-31 08:03:42.000000000 -0500
++++ slim-1.3.5.new/app.h	2013-08-22 14:12:45.536850016 -0400
+@@ -108,6 +108,10 @@
+ 	char *testtheme;
+ 	bool testing;
+ 
++#ifdef USE_CONSOLEKIT
++	bool consolekit_support_enabled;
++#endif
++
+ 	std::string themeName;
+ 	std::string mcookie;
+ 
+diff -Naur slim-1.3.5/slim.service slim-1.3.5.new/slim.service
+--- slim-1.3.5/slim.service	2012-12-31 08:03:42.000000000 -0500
++++ slim-1.3.5.new/slim.service	2013-08-22 14:15:39.186853186 -0400
+@@ -3,7 +3,7 @@
+ After=systemd-user-sessions.service
+ 
+ [Service]
+-ExecStart=/usr/bin/slim -nodaemon
++ExecStart=/usr/bin/slim -nodaemon -s
+ 
+ [Install]
+ Alias=display-manager.service
diff --git a/x11-misc/slim/files/slim-1.3.6-config.diff b/x11-misc/slim/files/slim-1.3.6-config.diff
new file mode 100644
index 000000000000..9da6795cccfa
--- /dev/null
+++ b/x11-misc/slim/files/slim-1.3.6-config.diff
@@ -0,0 +1,77 @@
+--- slim.conf.orig	2010-08-25 11:52:23.000000000 -0400
++++ slim.conf	2010-08-25 11:58:58.000000000 -0400
+@@ -2,7 +2,7 @@
+ # Note: -xauth $authfile is automatically appended
+ default_path        /bin:/usr/bin:/usr/local/bin
+ default_xserver     /usr/bin/X
+-#xserver_arguments   -dpi 75
++xserver_arguments   -nolisten tcp -br -deferglyphs 16 vt07
+ 
+ # Commands for halt, login, etc.
+ halt_cmd            /sbin/shutdown -h now
+@@ -18,7 +18,7 @@
+ 
+ 
+ # Activate numlock when slim starts. Valid values: on|off
+-# numlock             on
++numlock             on
+ 
+ # Hide the mouse cursor (note: does not work with some WMs).
+ # Valid values: true|false
+@@ -33,7 +33,8 @@
+ # to adjust the command according to your preferred shell,
+ # i.e. for freebsd use:
+ # login_cmd           exec /bin/sh - ~/.xinitrc %session
+-login_cmd           exec /bin/bash -login ~/.xinitrc %session
++# login_cmd           exec /bin/bash -login ~/.xinitrc %session
++login_cmd           exec /bin/bash -login /usr/share/slim/Xsession %session
+ 
+ # Commands executed when starting and exiting a session.
+ # They can be used for registering a X11 session with
+@@ -41,20 +42,30 @@
+ #
+ # sessionstart_cmd	some command
+ # sessionstop_cmd	some command
++sessionstart_cmd	/usr/bin/sessreg -a -l :0.0 %user
++sessionstop_cmd     /usr/bin/sessreg -d -l :0.0 %user
+ 
+ # Start in daemon mode. Valid values: yes | no
+ # Note that this can be overriden by the command line
+ # options "-d" and "-nodaemon"
+-# daemon	yes
++daemon	yes
+ 
+-# Available sessions (first one is the default).
+-# The current chosen session name is replaced in the login_cmd
++# Available sessions:
++# The current chosen session name replaces %session in the login_cmd
+ # above, so your login command can handle different sessions.
++# If no session is chosen (via F1), %session will be an empty string.
+ # see the xinitrc.sample file shipped with slim sources
+-sessions            xfce4,icewm-session,wmaker,blackbox
++#sessions            xfce4,icewm-session,wmaker,blackbox
++# Alternatively, read available sessions from a directory of scripts:
++#sessiondir           /etc/X11/Sessions
++# Or, read available sessions from the xsessions desktop files --
++# note that this may provide a full path to the session executable!
++sessiondir	/usr/share/xsessions
+ 
+-# Executed when pressing F11 (requires imagemagick)
++# Executed when pressing F11 (requires media-gfx/imagemagick for import)
++# Alternative is media-gfx/scrot. See Gentoo bug 252241 for more info.
+ screenshot_cmd      import -window root /slim.png
++#screenshot_cmd      scrot /root/slim.png
+ 
+ # welcome message. Available variables: %host, %domain
+ welcome_msg         Welcome to %host
+@@ -83,8 +91,8 @@
+ # randomly choose from
+ current_theme       default
+ 
+-# Lock file
+-lockfile            /var/run/slim.lock
++# Lock file, /etc/init.d/xdm expects slim.pid
++lockfile            /run/slim.pid
+ 
+ # Log file
+ logfile             /var/log/slim.log
diff --git a/x11-misc/slim/files/slim-1.3.6-drop-zlib.patch b/x11-misc/slim/files/slim-1.3.6-drop-zlib.patch
new file mode 100644
index 000000000000..cf2106a8a8eb
--- /dev/null
+++ b/x11-misc/slim/files/slim-1.3.6-drop-zlib.patch
@@ -0,0 +1,10 @@
+--- a/CMakeLists.txt	2014-02-28 10:38:48.655262163 -0500
++++ b/CMakeLists.txt	2014-02-28 10:47:01.671271162 -0500
+@@ -96,7 +96,6 @@
+ find_package(Freetype REQUIRED)
+ find_package(JPEG REQUIRED)
+ find_package(PNG REQUIRED)
+-find_package(ZLIB REQUIRED)
+ 
+ # Fontconfig
+ set(FONTCONFIG_DIR ${CMAKE_MODULE_PATH})
diff --git a/x11-misc/slim/files/slim-1.3.6-fix-slimlock-nopam-v2.patch b/x11-misc/slim/files/slim-1.3.6-fix-slimlock-nopam-v2.patch
new file mode 100644
index 000000000000..d5fc4db4838d
--- /dev/null
+++ b/x11-misc/slim/files/slim-1.3.6-fix-slimlock-nopam-v2.patch
@@ -0,0 +1,26 @@
+--- a/CMakeLists.txt	2013-10-27 21:24:21.193802669 -0400
++++ b/CMakeLists.txt	2013-10-27 21:26:54.127806951 -0400
+@@ -220,7 +220,6 @@
+ ####### install
+ # slim
+ install(TARGETS slim RUNTIME DESTINATION bin)
+-install(TARGETS slimlock RUNTIME DESTINATION bin)
+ 
+ if (BUILD_SHARED_LIBS)
+ 	set_target_properties(libslim PROPERTIES
+@@ -235,8 +234,14 @@
+ 
+ # man file
+ install(FILES slim.1 DESTINATION ${MANDIR}/man1/)
+-install(FILES slimlock.1 DESTINATION ${MANDIR}/man1/)
+ # configure
+ install(FILES slim.conf DESTINATION ${SYSCONFDIR})
++
++#slimlock
++if(BUILD_SLIMLOCK)
++install(TARGETS slimlock RUNTIME DESTINATION bin PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE SETUID)
++install(FILES slimlock.1 DESTINATION ${MANDIR}/man1/)
++endif(BUILD_SLIMLOCK)
++
+ # themes directory
+ subdirs(themes)
diff --git a/x11-misc/slim/files/slim-1.3.6-fix-slimlock-nopam.patch b/x11-misc/slim/files/slim-1.3.6-fix-slimlock-nopam.patch
new file mode 100644
index 000000000000..bd6d1679c09e
--- /dev/null
+++ b/x11-misc/slim/files/slim-1.3.6-fix-slimlock-nopam.patch
@@ -0,0 +1,26 @@
+--- a/CMakeLists.txt	2013-10-27 21:24:21.193802669 -0400
++++ b/CMakeLists.txt	2013-10-27 21:26:54.127806951 -0400
+@@ -220,7 +220,6 @@
+ ####### install
+ # slim
+ install(TARGETS slim RUNTIME DESTINATION bin)
+-install(TARGETS slimlock RUNTIME DESTINATION bin)
+ 
+ if (BUILD_SHARED_LIBS)
+ 	set_target_properties(libslim PROPERTIES
+@@ -235,8 +234,14 @@
+ 
+ # man file
+ install(FILES slim.1 DESTINATION ${MANDIR}/man1/)
+-install(FILES slimlock.1 DESTINATION ${MANDIR}/man1/)
+ # configure
+ install(FILES slim.conf DESTINATION ${SYSCONFDIR})
++
++#slimlock
++if(BUILD_SLIMLOCK)
++install(TARGETS slimlock RUNTIME DESTINATION bin)
++install(FILES slimlock.1 DESTINATION ${MANDIR}/man1/)
++endif(BUILD_SLIMLOCK)
++
+ # themes directory
+ subdirs(themes)
diff --git a/x11-misc/slim/files/slim-1.3.6-freetype.patch b/x11-misc/slim/files/slim-1.3.6-freetype.patch
new file mode 100644
index 000000000000..8cefc0bf0998
--- /dev/null
+++ b/x11-misc/slim/files/slim-1.3.6-freetype.patch
@@ -0,0 +1,12 @@
+diff -up ./CMakeLists.txt.orig ./CMakeLists.txt
+--- ./CMakeLists.txt.orig	2014-11-11 20:38:40.706121207 +0100
++++ ./CMakeLists.txt	2014-11-11 20:39:34.206120264 +0100
+@@ -165,7 +165,7 @@ include_directories(
+ 	${X11_Xft_INCLUDE_PATH}
+ 	${X11_Xrender_INCLUDE_PATH}
+ 	${X11_Xrandr_INCLUDE_PATH}
+-	${FREETYPE_INCLUDE_DIR_freetype2}
++	${FREETYPE_INCLUDE_DIRS}
+ 	${X11_Xmu_INCLUDE_PATH}
+ 	${ZLIB_INCLUDE_DIR}
+ 	${JPEG_INCLUDE_DIR}
diff --git a/x11-misc/slim/files/slim-1.3.6-honour-cflags.patch b/x11-misc/slim/files/slim-1.3.6-honour-cflags.patch
new file mode 100644
index 000000000000..8335e0fe9e75
--- /dev/null
+++ b/x11-misc/slim/files/slim-1.3.6-honour-cflags.patch
@@ -0,0 +1,14 @@
+--- CMakeLists.txt	2013-10-01 18:38:05.000000000 -0400
++++ CMakeLists.txt.new	2013-10-15 11:33:18.975741094 -0400
+@@ -42,11 +42,6 @@
+ set(SLIM_DEFINITIONS ${SLIM_DEFINITIONS} "-DPKGDATADIR=\"${PKGDATADIR}\"")
+ set(SLIM_DEFINITIONS ${SLIM_DEFINITIONS} "-DSYSCONFDIR=\"${SYSCONFDIR}\"")
+ 
+-# Flags
+-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -g -O2")
+-set(CMAKE_CPP_FLAGS "${CMAKE_CPP_FLAGS} -Wall -g -O2")
+-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -g -O2")
+-
+ # source 
+ set(slim_srcs
+ 	main.cpp
diff --git a/x11-misc/slim/files/slim-1.3.6-libslim-cmake-fixes.patch b/x11-misc/slim/files/slim-1.3.6-libslim-cmake-fixes.patch
new file mode 100644
index 000000000000..11e39dc97628
--- /dev/null
+++ b/x11-misc/slim/files/slim-1.3.6-libslim-cmake-fixes.patch
@@ -0,0 +1,33 @@
+--- a/CMakeLists.txt	2013-10-15 11:35:16.688739802 -0400
++++ b/CMakeLists.txt	2013-10-15 11:53:46.185727620 -0400
+@@ -115,6 +115,7 @@
+ 		message("\tPAM Found")
+ 		set(SLIM_DEFINITIONS ${SLIM_DEFINITIONS} "-DUSE_PAM")
+ 		target_link_libraries(${PROJECT_NAME} ${PAM_LIBRARY})
++		target_link_libraries(libslim ${PAM_LIBRARY})
+ 		target_link_libraries(slimlock ${PAM_LIBRARY})
+ 		include_directories(${PAM_INCLUDE_DIR})
+ 	else(PAM_FOUND)
+@@ -173,7 +174,10 @@
+ )
+ 
+ target_link_libraries(libslim
+-    ${JPEG_LIBRARIES}
++	${RT_LIB}
++	${X11_Xft_LIB}
++	${X11_Xrandr_LIB}
++	${JPEG_LIBRARIES}
+ 	${PNG_LIBRARIES}
+ )
+ 
+@@ -228,8 +228,8 @@
+ 		SOVERSION ${SLIM_VERSION})
+ 
+ 	install(TARGETS libslim
+-		LIBRARY DESTINATION lib
+-		ARCHIVE DESTINATION lib
++		LIBRARY DESTINATION lib${LIB_SUFFIX}
++		ARCHIVE DESTINATION lib${LIB_SIFFUX}
+ 	)
+ endif (BUILD_SHARED_LIBS)
+ 
diff --git a/x11-misc/slim/files/slim-1.3.6-session-chooser.patch b/x11-misc/slim/files/slim-1.3.6-session-chooser.patch
new file mode 100644
index 000000000000..b43c9a307605
--- /dev/null
+++ b/x11-misc/slim/files/slim-1.3.6-session-chooser.patch
@@ -0,0 +1,115 @@
+--- a/cfg.cpp	2013-10-01 18:38:05.000000000 -0400
++++ b/cfg.cpp	2013-10-24 12:12:20.584103253 -0400
+@@ -274,14 +274,14 @@
+ 	while (true) {
+ 		string::const_iterator begin = s;
+ 		while (*s != c && s != str.end()) { ++s; }
+-	tmp = string(begin, s);
+-	if (useEmpty || tmp.size() > 0)
++		tmp = string(begin, s);
++		if (useEmpty || tmp.size() > 0)
+ 			v.push_back(tmp);
+ 		if (s == str.end()) {
+ 			break;
+ 		}
+ 		if (++s == str.end()) {
+-		if (useEmpty)
++			if (useEmpty)
+ 				v.push_back("");
+ 			break;
+ 		}
+@@ -289,6 +289,7 @@
+ }
+ 
+ void Cfg::fillSessionList(){
++	string strSessionList = getOption("sessions");
+ 	string strSessionDir  = getOption("sessiondir");
+ 
+ 	sessions.clear();
+@@ -307,29 +308,29 @@
+ 				struct stat oFileStat;
+ 
+ 				if (stat(strFile.c_str(), &oFileStat) == 0) {
+-                    if (S_ISREG(oFileStat.st_mode) &&
+-                            access(strFile.c_str(), R_OK) == 0){
+-                        ifstream desktop_file( strFile.c_str() );
+-                        if (desktop_file){
+-                             string line, session_name = "", session_exec = "";
+-                             while (getline( desktop_file, line )) {
+-                                 if (line.substr(0, 5) == "Name=") {
+-                                     session_name = line.substr(5);
+-                                     if (!session_exec.empty())
+-                                         break;
+-                                 } else
+-                                     if (line.substr(0, 5) == "Exec=") {
+-                                         session_exec = line.substr(5);
+-                                         if (!session_name.empty())
+-                                             break;
+-                                     }
+-                             }
+-                             desktop_file.close();
+-                             pair<string,string> session(session_name,session_exec);
+-                             sessions.push_back(session);
+-                             cout << session_exec << " - " << session_name << endl;
+-                        }
+-
++					if (S_ISREG(oFileStat.st_mode) &&
++						access(strFile.c_str(), R_OK) == 0){
++							ifstream desktop_file( strFile.c_str() );
++							if (desktop_file){
++								string line, session_name = "", session_exec = "";
++								while (getline( desktop_file, line )) {
++								if (line.substr(0, 5) == "Name=") {
++									session_name = line.substr(5);
++									if (!session_exec.empty()) break;
++								} else if (line.substr(0, 5) == "Exec=") {
++									session_exec = line.substr(5);
++									if (!session_name.empty()) break;
++								}
++							}
++							desktop_file.close();
++							if (!session_name.empty() && !session_exec.empty()) {
++								pair<string,string> session(session_name,session_exec);
++								sessions.push_back(session);
++							} else if (access(strFile.c_str(), X_OK) == 0) {
++								pair<string,string> session(string(pDirent->d_name),strFile);
++								sessions.push_back(session);
++							}
++						}
+ 					}
+ 				}
+ 			}
+@@ -338,8 +339,18 @@
+ 	}
+ 
+ 	if (sessions.empty()){
+-        pair<string,string> session("","");
+-        sessions.push_back(session);
++		if (strSessionList.empty()) {
++			pair<string,string> session("","");
++			sessions.push_back(session);
++		} else {
++			// iterate through the split of the session list
++			vector<string> sessit;
++			split(sessit,strSessionList,',',false);
++			for (vector<string>::iterator it = sessit.begin(); it != sessit.end(); ++it) {
++				pair<string,string> session(*it,*it);
++				sessions.push_back(session);
++			}
++		}
+ 	}
+ }
+ 
+--- a/app.cpp	2013-10-24 12:16:59.870111072 -0400
++++ b/app.cpp	2013-10-24 12:29:59.899132910 -0400
+@@ -377,10 +377,6 @@
+ 			LoginPanel->SetName(cfg->getOption("default_user") );
+ 		}
+ 
+-        if (firstloop) {
+-            LoginPanel->SwitchSession();
+-        }
+-
+ 		if (!AuthenticateUser(focuspass && firstloop)){
+ 			panelclosed = 0;
+ 			firstloop = false;
diff --git a/x11-misc/slim/files/slim-1.3.6-strip-systemd-unit-install.patch b/x11-misc/slim/files/slim-1.3.6-strip-systemd-unit-install.patch
new file mode 100644
index 000000000000..f116c5ebc976
--- /dev/null
+++ b/x11-misc/slim/files/slim-1.3.6-strip-systemd-unit-install.patch
@@ -0,0 +1,13 @@
+--- CMakeLists.txt	2013-10-15 12:02:13.463722050 -0400
++++ CMakeLists.txt.new	2013-10-17 09:41:41.602917345 -0400
+@@ -238,10 +238,6 @@
+ install(FILES slimlock.1 DESTINATION ${MANDIR}/man1/)
+ # configure
+ install(FILES slim.conf DESTINATION ${SYSCONFDIR})
+-# systemd service file
+-if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+-	install(FILES slim.service DESTINATION ${LIBDIR}/systemd/system)
+-endif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+ # themes directory
+ subdirs(themes)
+ 
diff --git a/x11-misc/slim/files/slim-1.3.6-systemd-session.patch b/x11-misc/slim/files/slim-1.3.6-systemd-session.patch
new file mode 100644
index 000000000000..0639aeb5f185
--- /dev/null
+++ b/x11-misc/slim/files/slim-1.3.6-systemd-session.patch
@@ -0,0 +1,29 @@
+--- a/app.cpp	2013-10-23 16:19:57.074100282 -0400
++++ b/app.cpp	2013-10-23 16:33:13.302122574 -0400
+@@ -829,8 +829,13 @@
+ 
+ 	StopServer();
+ 	RemoveLock();
+-	while (waitpid(-1, NULL, WNOHANG) > 0); /* Collects all dead childrens */
+-	Run();
++	if (force_nodaemon) {
++		delete LoginPanel;
++		exit(ERR_EXIT); /* use ERR_EXIT so that systemd's RESTART=on-failure works */
++	} else {
++		while (waitpid(-1, NULL, WNOHANG) > 0); /* Collects all dead childrens */
++		Run();
++	}
+ }
+ 
+ void App::KillAllClients(Bool top) {
+--- a/slim.service	2013-10-23 16:19:57.074100282 -0400
++++ b/slim.service	2013-10-23 16:45:14.901142776 -0400
+@@ -4,6 +4,7 @@
+ 
+ [Service]
+ ExecStart=/usr/bin/slim -nodaemon -s
++Restart=on-failure
+ 
+ [Install]
+ Alias=display-manager.service
+Common subdirectories: slim-1.3.6/themes and slim-1.3.6.new/themes
diff --git a/x11-misc/slim/files/slim.logrotate b/x11-misc/slim/files/slim.logrotate
new file mode 100644
index 000000000000..89015306ff50
--- /dev/null
+++ b/x11-misc/slim/files/slim.logrotate
@@ -0,0 +1,9 @@
+/var/log/slim.log {
+	compress
+	rotate 4
+	weekly
+	delaycompress
+	copytruncate
+	missingok
+	notifempty
+}
diff --git a/x11-misc/slim/metadata.xml b/x11-misc/slim/metadata.xml
new file mode 100644
index 000000000000..56c5cc2069cb
--- /dev/null
+++ b/x11-misc/slim/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>desktop-misc</herd>
+	<maintainer>
+		<email>axs@gentoo.org</email>
+	</maintainer>
+	<use>
+		<flag name="consolekit">Enable native consolekit support</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">slim.berlios</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-misc/slim/slim-1.3.6-r3.ebuild b/x11-misc/slim/slim-1.3.6-r3.ebuild
new file mode 100644
index 000000000000..72bfdfbcd384
--- /dev/null
+++ b/x11-misc/slim/slim-1.3.6-r3.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+CMAKE_MIN_VERSION="2.8.8"
+inherit cmake-utils pam eutils systemd versionator
+
+DESCRIPTION="Simple Login Manager"
+HOMEPAGE="http://sourceforge.net/projects/slim.berlios/"
+SRC_URI="mirror://sourceforge/project/${PN}.berlios/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 arm ~mips ppc ppc64 sparc x86 ~x86-fbsd"
+IUSE="branding pam consolekit"
+REQUIRED_USE="consolekit? ( pam )"
+
+RDEPEND="x11-libs/libXmu
+	x11-libs/libX11
+	x11-libs/libXpm
+	x11-libs/libXft
+	x11-libs/libXrandr
+	media-libs/libpng:0=
+	virtual/jpeg:=
+	x11-apps/sessreg
+	consolekit? ( sys-auth/consolekit
+		sys-apps/dbus )
+	pam? (	virtual/pam
+		!x11-misc/slimlock )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	x11-proto/xproto"
+PDEPEND="branding? ( >=x11-themes/slim-themes-1.2.3a-r3 )"
+
+src_prepare() {
+	# Our Gentoo-specific config changes
+	epatch "${FILESDIR}"/${P}-config.diff
+	epatch "${FILESDIR}"/${PN}-1.3.5-arm.patch
+	epatch "${FILESDIR}"/${P}-honour-cflags.patch
+	epatch "${FILESDIR}"/${P}-libslim-cmake-fixes.patch
+	epatch "${FILESDIR}"/${PN}-1.3.5-disable-ck-for-systemd.patch
+	epatch "${FILESDIR}"/${P}-strip-systemd-unit-install.patch
+	epatch "${FILESDIR}"/${P}-systemd-session.patch
+	epatch "${FILESDIR}"/${P}-session-chooser.patch
+	epatch "${FILESDIR}"/${P}-fix-slimlock-nopam.patch
+	epatch "${FILESDIR}"/${P}-drop-zlib.patch
+	epatch "${FILESDIR}"/${P}-freetype.patch
+
+	if use elibc_FreeBSD; then
+		sed -i -e 's/"-DHAVE_SHADOW"/"-DNEEDS_BASENAME"/' CMakeLists.txt \
+			|| die
+	fi
+
+	if use branding; then
+		sed -i -e 's/  default/  slim-gentoo-simple/' slim.conf || die
+	fi
+}
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use pam USE_PAM)
+		$(cmake-utils_use consolekit USE_CONSOLEKIT)
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if use pam ; then
+		pamd_mimic system-local-login slim auth account session
+		pamd_mimic system-local-login slimlock auth
+	fi
+
+	systemd_dounit slim.service
+
+	insinto /usr/share/slim
+	newins "${FILESDIR}/Xsession-r3" Xsession
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/slim.logrotate" slim
+
+	dodoc xinitrc.sample ChangeLog README TODO THEMES
+}
+
+pkg_postinst() {
+	# note, $REPLACING_VERSIONS will always contain 0 or 1 PV's for slim
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog
+		elog "The configuration file is located at /etc/slim.conf."
+		elog
+		elog "If you wish ${PN} to start automatically, set DISPLAYMANAGER=\"${PN}\" "
+		elog "in /etc/conf.d/xdm and run \"rc-update add xdm default\"."
+	fi
+	if ! version_is_at_least "1.3.2-r7" "${REPLACING_VERSIONS:-1.0}" ; then
+		elog
+		elog "By default, ${PN} is set up to do proper X session selection, including ~/.xsession"
+		elog "support, as well as selection between sessions available in"
+		elog "/etc/X11/Sessions/ at login by pressing [F1]."
+		elog
+		elog "The XSESSION environment variable is still supported as a default"
+		elog "if no session has been specified by the user."
+		elog
+		elog "If you want to use .xinitrc in the user's home directory for session"
+		elog "management instead, see README and xinitrc.sample in"
+		elog "/usr/share/doc/${PF} and change your login_cmd in /etc/slim.conf"
+		elog "accordingly."
+		elog
+		ewarn "Please note that slim supports consolekit directly.  Please do not use any "
+		ewarn "old work-arounds (including calls to 'ck-launch-session' in xinitrc scripts)"
+		ewarn "and enable USE=\"consolekit\" instead."
+		ewarn
+	fi
+	if ! use pam; then
+		elog "You have merged ${PN} without USE=\"pam\", this will cause ${PN} to fall back to"
+		elog "the console when restarting your window manager. If this is not desired, then"
+		elog "please remerge ${PN} with USE=\"pam\""
+		elog
+	fi
+}
diff --git a/x11-misc/slim/slim-1.3.6-r4.ebuild b/x11-misc/slim/slim-1.3.6-r4.ebuild
new file mode 100644
index 000000000000..a9d0280dce5f
--- /dev/null
+++ b/x11-misc/slim/slim-1.3.6-r4.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+CMAKE_MIN_VERSION="2.8.8"
+inherit cmake-utils pam eutils systemd versionator
+
+DESCRIPTION="Simple Login Manager"
+HOMEPAGE="http://sourceforge.net/projects/slim.berlios/"
+SRC_URI="mirror://sourceforge/project/${PN}.berlios/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="branding pam consolekit"
+REQUIRED_USE="consolekit? ( pam )"
+
+RDEPEND="x11-libs/libXmu
+	x11-libs/libX11
+	x11-libs/libXpm
+	x11-libs/libXft
+	x11-libs/libXrandr
+	media-libs/libpng:0=
+	virtual/jpeg:=
+	x11-apps/sessreg
+	consolekit? ( sys-auth/consolekit
+		sys-apps/dbus )
+	pam? (	virtual/pam
+		!x11-misc/slimlock )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	x11-proto/xproto"
+PDEPEND="branding? ( >=x11-themes/slim-themes-1.2.3a-r3 )"
+
+src_prepare() {
+	# Our Gentoo-specific config changes
+	epatch "${FILESDIR}"/${P}-config.diff
+	epatch "${FILESDIR}"/${PN}-1.3.5-arm.patch
+	epatch "${FILESDIR}"/${P}-honour-cflags.patch
+	epatch "${FILESDIR}"/${P}-libslim-cmake-fixes.patch
+	epatch "${FILESDIR}"/${PN}-1.3.5-disable-ck-for-systemd.patch
+	epatch "${FILESDIR}"/${P}-strip-systemd-unit-install.patch
+	epatch "${FILESDIR}"/${P}-systemd-session.patch
+	epatch "${FILESDIR}"/${P}-session-chooser.patch
+	epatch "${FILESDIR}"/${P}-fix-slimlock-nopam-v2.patch
+	epatch "${FILESDIR}"/${P}-drop-zlib.patch
+	epatch "${FILESDIR}"/${P}-freetype.patch
+
+	if use elibc_FreeBSD; then
+		sed -i -e 's/"-DHAVE_SHADOW"/"-DNEEDS_BASENAME"/' CMakeLists.txt \
+			|| die
+	fi
+
+	if use branding; then
+		sed -i -e 's/  default/  slim-gentoo-simple/' slim.conf || die
+	fi
+}
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use pam USE_PAM)
+		$(cmake-utils_use consolekit USE_CONSOLEKIT)
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if use pam ; then
+		pamd_mimic system-local-login slim auth account session
+		pamd_mimic system-local-login slimlock auth
+	fi
+
+	systemd_dounit slim.service
+
+	insinto /usr/share/slim
+	newins "${FILESDIR}/Xsession-r3" Xsession
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/slim.logrotate" slim
+
+	dodoc xinitrc.sample ChangeLog README TODO THEMES
+}
+
+pkg_postinst() {
+	# note, $REPLACING_VERSIONS will always contain 0 or 1 PV's for slim
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog
+		elog "The configuration file is located at /etc/slim.conf."
+		elog
+		elog "If you wish ${PN} to start automatically, set DISPLAYMANAGER=\"${PN}\" "
+		elog "in /etc/conf.d/xdm and run \"rc-update add xdm default\"."
+	fi
+	if ! version_is_at_least "1.3.2-r7" "${REPLACING_VERSIONS:-1.0}" ; then
+		elog
+		elog "By default, ${PN} is set up to do proper X session selection, including ~/.xsession"
+		elog "support, as well as selection between sessions available in"
+		elog "/etc/X11/Sessions/ at login by pressing [F1]."
+		elog
+		elog "The XSESSION environment variable is still supported as a default"
+		elog "if no session has been specified by the user."
+		elog
+		elog "If you want to use .xinitrc in the user's home directory for session"
+		elog "management instead, see README and xinitrc.sample in"
+		elog "/usr/share/doc/${PF} and change your login_cmd in /etc/slim.conf"
+		elog "accordingly."
+		elog
+		ewarn "Please note that slim supports consolekit directly.  Please do not use any "
+		ewarn "old work-arounds (including calls to 'ck-launch-session' in xinitrc scripts)"
+		ewarn "and enable USE=\"consolekit\" instead."
+		ewarn
+	fi
+	if ! use pam; then
+		elog "You have merged ${PN} without USE=\"pam\", this will cause ${PN} to fall back to"
+		elog "the console when restarting your window manager. If this is not desired, then"
+		elog "please remerge ${PN} with USE=\"pam\""
+		elog
+	fi
+}
diff --git a/x11-misc/slock/Manifest b/x11-misc/slock/Manifest
new file mode 100644
index 000000000000..3d81cb7ba2af
--- /dev/null
+++ b/x11-misc/slock/Manifest
@@ -0,0 +1 @@
+DIST slock-1.2.tar.gz 4853 SHA256 3402658f890a88da3f34db04fca1783ed549ade45c2ebb8d8f0cd2b549f633b3 SHA512 0e66c5451c72a5df391a61eefa6b1a1493705fc9c0b04d9db934a56c11852c284ecca8706f47ceb1d1c8cfc5241c818c6026afb30fc9cf3938e44ea282338bee WHIRLPOOL b24a0efaa4272520f05991a7370bdbf2e34c31c58b01b900e39f2398081e829461b62c43c322fd40f0debaa491c57f768a652055341b213cc98d88680923916d
diff --git a/x11-misc/slock/files/slock-1.2-dontdieonme.patch b/x11-misc/slock/files/slock-1.2-dontdieonme.patch
new file mode 100644
index 000000000000..e4d1b464597f
--- /dev/null
+++ b/x11-misc/slock/files/slock-1.2-dontdieonme.patch
@@ -0,0 +1,11 @@
+--- a/slock.c
++++ b/slock.c
+@@ -57,7 +57,7 @@
+ 	if (fd < 0 && errno == ENOENT)
+ 		return;
+ 	if (fd < 0 || write(fd, "-1000\n", 6) != 6 || close(fd) != 0)
+-		die("cannot disable the out-of-memory killer for this process\n");
++		fprintf(stderr, "cannot disable the out-of-memory killer for this process\n");
+ }
+ #endif
+ 
diff --git a/x11-misc/slock/metadata.xml b/x11-misc/slock/metadata.xml
new file mode 100644
index 000000000000..68ea403e7ceb
--- /dev/null
+++ b/x11-misc/slock/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>desktop-misc</herd>
+<maintainer>
+  <email>jer@gentoo.org</email>
+</maintainer>
+<longdescription>simple X screen locker</longdescription>
+</pkgmetadata>
diff --git a/x11-misc/slock/slock-1.2.ebuild b/x11-misc/slock/slock-1.2.ebuild
new file mode 100644
index 000000000000..ae04a409d34e
--- /dev/null
+++ b/x11-misc/slock/slock-1.2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils fcaps savedconfig toolchain-funcs
+
+DESCRIPTION="simple X screen locker"
+HOMEPAGE="http://tools.suckless.org/slock"
+SRC_URI="http://dl.suckless.org/tools/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 hppa x86 ~x86-fbsd"
+
+RDEPEND="
+	x11-libs/libX11
+	x11-libs/libXext
+"
+DEPEND="
+	${RDEPEND}
+	x11-proto/xproto
+"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-dontdieonme.patch
+
+	sed -i \
+		-e '/^CFLAGS/{s: -Os::g; s:= :+= :g}' \
+		-e '/^CC/d' \
+		-e '/^LDFLAGS/{s:-s::g; s:= :+= :g}' \
+		config.mk || die
+	sed -i \
+		-e 's|@${CC}|$(CC)|g' \
+		Makefile || die
+	if use elibc_FreeBSD; then
+		sed -i -e 's/-DHAVE_SHADOW_H//' config.mk || die
+	fi
+	restore_config config.h
+	tc-export CC
+}
+
+src_compile() { emake slock; }
+
+src_install() {
+	dobin slock
+	save_config config.h
+}
+
+pkg_postinst() {
+	# cap_dac_read_search used to be enough for shadow access
+	# but now slock wants to write to /proc/self/oom_score_adj
+	# and for that it needs:
+	fcaps cap_dac_override,cap_sys_resource /usr/bin/slock
+
+	savedconfig_pkg_postinst
+}
diff --git a/x11-misc/spacefm/Manifest b/x11-misc/spacefm/Manifest
new file mode 100644
index 000000000000..20a5cb2d2d54
--- /dev/null
+++ b/x11-misc/spacefm/Manifest
@@ -0,0 +1,4 @@
+DIST spacefm-0.9.3.tar.xz 1291540 SHA256 0072a6f2668ae6649e1cc410f1e7eec172a0297de8b225c963b9e29c6a0ed04d SHA512 02140d1915b77dcbe30c76f3666b8a2bf15f634026d27f059a47c567c5ac697ff1fe9ed95a9dcbed092eaafd9075974cd46a1d315c20e103ea97f0bac9c29df9 WHIRLPOOL 04804f65bafb5fbeb86743a183af3439f0b040d5301cc1b74abc7257a4889d9d16c9ddbe10284da7d1cd9e2b65afb01379835647e1a84e638b6c81778dde7256
+DIST spacefm-0.9.4.tar.xz 1283576 SHA256 75886cc93e6586753f01242ba883856567c3fdc90d240f112662ca3080e25955 SHA512 b7c3c92b4b6cb74f6c1d63a91beca9759af23fd3b7e5ffc10a895fc948f07aa5e28a0085820cae39bd5eb6e0489181369870fd760950dea26bf0b13c9f499a66 WHIRLPOOL ffb962e1c89125253368a2c40dde4dc7b02f54f365a77cd14a21a417ca40ace9d08e0603d52fd6b065e57e80c5f281d85f8b1644b883f683cfee2d1996afffd2
+DIST spacefm-1.0.0.tar.xz 1338824 SHA256 dc3025bd31ea235afaa55cf609d376dc8c79e63dcd127389085758a9b26b97b6 SHA512 b4306092069125608132c3c7a3f54ba33bcc39876ccb409d69795283c83a6eb7c58e9848c9b3b6dbda606886f1f9359fb96a6b9b1b8076bf585fde237b0e3402 WHIRLPOOL db78cbf76b4d151773412d7646055fa26e058b93107eb4b0d84fba369d277211fd4edbe3660bf5a26f3452e4e9ad6c84d724cee4658c7dda63e479d871a7ee3d
+DIST spacefm-1.0.2.tar.xz 1382356 SHA256 e7d0c5c034b68b7e3f74b14758b751051a7abd4fa7c65d29cfb9598a965f5b33 SHA512 0d82754344ca5421012d2328cbaa32f021bcdbecf12b24224e6be5890d27c1ea285b1cb2b5614d7350995df974f8af6a9958105c6215424425bc500210b9d79b WHIRLPOOL f59894666aa40a4a3d54b9ac56ac05f6e65f693a9bc65c6c407f0a84aab60048c1d612b2026a51996e9ed5d39e88bde734bf72c4aa67b4e10e5c2efe2ca548b2
diff --git a/x11-misc/spacefm/metadata.xml b/x11-misc/spacefm/metadata.xml
new file mode 100644
index 000000000000..698760589924
--- /dev/null
+++ b/x11-misc/spacefm/metadata.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>zlg@gentoo.org</email>
+		<name>Daniel Campbell</name>
+	</maintainer>
+	<upstream>
+		<maintainer status="active">
+			<email>ignorantguru@users.sourceforge.net</email>
+		</maintainer>
+		<changelog>http://ignorantguru.github.com/spacefm/news.html</changelog>
+		<doc lang="en">https://github.com/IgnorantGuru/spacefm/wiki/</doc>
+		<bugs-to>https://github.com/IgnorantGuru/spacefm/issues</bugs-to>
+	</upstream>
+	<use>
+		<flag name="gtk2">Support GTK+ 2.x instead of GTK+ 3.x</flag>
+		<flag name="gtk3">Support GTK+ 3.x instead of GTK+ 2.x</flag>
+		<flag name="video-thumbnails">Support video thumbnails with ffmpegthumbnailer</flag>
+	</use>
+	<longdescription lang="en">
+		SpaceFM is a file manager with built-in VFS, optional udisks-based device 
+		manager, customizable menu system, and bash integration. SpaceFM is a fork 
+		of legacy PCManFM. Earlier versions of this program were released under 
+		the name PCManFM-Mod.
+	</longdescription>
+</pkgmetadata>
diff --git a/x11-misc/spacefm/spacefm-0.9.3.ebuild b/x11-misc/spacefm/spacefm-0.9.3.ebuild
new file mode 100644
index 000000000000..7528217aabbc
--- /dev/null
+++ b/x11-misc/spacefm/spacefm-0.9.3.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit fdo-mime gnome2-utils linux-info
+
+DESCRIPTION="A multi-panel tabbed file manager"
+HOMEPAGE="http://ignorantguru.github.com/spacefm/"
+SRC_URI="http://dev.gentoo.org/~hasufell/distfiles/${P}.tar.xz
+	mirror://sourceforge/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="+startup-notification"
+
+RDEPEND="dev-libs/glib:2
+	dev-util/desktop-file-utils
+	>=virtual/udev-143
+	virtual/freedesktop-icon-theme
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:3
+	x11-libs/pango
+	x11-libs/libX11
+	x11-misc/shared-mime-info
+	startup-notification? ( x11-libs/startup-notification )"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	virtual/pkgconfig
+	sys-devel/gettext"
+
+src_configure() {
+	econf \
+		--htmldir=/usr/share/doc/${PF}/html \
+		$(use_enable startup-notification) \
+		--disable-hal \
+		--enable-inotify \
+		--disable-pixmaps \
+		--with-gtk3=yes
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+	gnome2_icon_cache_update
+
+	einfo
+	elog "To mount as non-root user you need one of the following:"
+	elog "  sys-apps/udevil (recommended, see below)"
+	elog "  sys-apps/pmount"
+	elog "  sys-fs/udisks:0"
+	elog "  sys-fs/udisks:2"
+	elog "To support ftp/nfs/smb/ssh URLs in the path bar you need:"
+	elog "  sys-apps/udevil"
+	elog "To perform as root functionality you need one of the following:"
+	elog "  x11-misc/ktsuss"
+	elog "  x11-libs/gksu"
+	elog "  kde-apps/kdesu"
+	elog "Other optional dependencies:"
+	elog "  sys-apps/dbus"
+	elog "  sys-process/lsof (device processes)"
+	elog "  virtual/eject (eject media)"
+	einfo
+	if ! has_version 'sys-fs/udisks' ; then
+		elog "When using SpaceFM without udisks, and without the udisks-daemon running,"
+		elog "you may need to enable kernel polling for device media changes to be detected."
+		elog "See /usr/share/doc/${PF}/html/spacefm-manual-en.html#devices-kernpoll"
+		has_version '<virtual/udev-173' && ewarn "You need at least udev-173"
+		kernel_is lt 2 6 38 && ewarn "You need at least kernel 2.6.38"
+		einfo
+	fi
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+	gnome2_icon_cache_update
+}
diff --git a/x11-misc/spacefm/spacefm-0.9.4.ebuild b/x11-misc/spacefm/spacefm-0.9.4.ebuild
new file mode 100644
index 000000000000..7528217aabbc
--- /dev/null
+++ b/x11-misc/spacefm/spacefm-0.9.4.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit fdo-mime gnome2-utils linux-info
+
+DESCRIPTION="A multi-panel tabbed file manager"
+HOMEPAGE="http://ignorantguru.github.com/spacefm/"
+SRC_URI="http://dev.gentoo.org/~hasufell/distfiles/${P}.tar.xz
+	mirror://sourceforge/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="+startup-notification"
+
+RDEPEND="dev-libs/glib:2
+	dev-util/desktop-file-utils
+	>=virtual/udev-143
+	virtual/freedesktop-icon-theme
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:3
+	x11-libs/pango
+	x11-libs/libX11
+	x11-misc/shared-mime-info
+	startup-notification? ( x11-libs/startup-notification )"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	virtual/pkgconfig
+	sys-devel/gettext"
+
+src_configure() {
+	econf \
+		--htmldir=/usr/share/doc/${PF}/html \
+		$(use_enable startup-notification) \
+		--disable-hal \
+		--enable-inotify \
+		--disable-pixmaps \
+		--with-gtk3=yes
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+	gnome2_icon_cache_update
+
+	einfo
+	elog "To mount as non-root user you need one of the following:"
+	elog "  sys-apps/udevil (recommended, see below)"
+	elog "  sys-apps/pmount"
+	elog "  sys-fs/udisks:0"
+	elog "  sys-fs/udisks:2"
+	elog "To support ftp/nfs/smb/ssh URLs in the path bar you need:"
+	elog "  sys-apps/udevil"
+	elog "To perform as root functionality you need one of the following:"
+	elog "  x11-misc/ktsuss"
+	elog "  x11-libs/gksu"
+	elog "  kde-apps/kdesu"
+	elog "Other optional dependencies:"
+	elog "  sys-apps/dbus"
+	elog "  sys-process/lsof (device processes)"
+	elog "  virtual/eject (eject media)"
+	einfo
+	if ! has_version 'sys-fs/udisks' ; then
+		elog "When using SpaceFM without udisks, and without the udisks-daemon running,"
+		elog "you may need to enable kernel polling for device media changes to be detected."
+		elog "See /usr/share/doc/${PF}/html/spacefm-manual-en.html#devices-kernpoll"
+		has_version '<virtual/udev-173' && ewarn "You need at least udev-173"
+		kernel_is lt 2 6 38 && ewarn "You need at least kernel 2.6.38"
+		einfo
+	fi
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+	gnome2_icon_cache_update
+}
diff --git a/x11-misc/spacefm/spacefm-1.0.0.ebuild b/x11-misc/spacefm/spacefm-1.0.0.ebuild
new file mode 100644
index 000000000000..064d5e5104c2
--- /dev/null
+++ b/x11-misc/spacefm/spacefm-1.0.0.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit fdo-mime gnome2-utils linux-info
+
+DESCRIPTION="A multi-panel tabbed file manager"
+HOMEPAGE="http://ignorantguru.github.com/spacefm/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gtk2 +gtk3 +startup-notification +video-thumbnails"
+REQUIRED_USE="gtk2? ( !gtk3 )"
+
+RDEPEND="dev-libs/glib:2
+	dev-util/desktop-file-utils
+	>=virtual/udev-143
+	virtual/freedesktop-icon-theme
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	gtk2? ( x11-libs/gtk+:2 )
+	!gtk2? ( x11-libs/gtk+:3 )
+	x11-libs/pango
+	x11-libs/libX11
+	x11-misc/shared-mime-info
+	video-thumbnails? ( media-video/ffmpegthumbnailer )
+	startup-notification? ( x11-libs/startup-notification )"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	virtual/pkgconfig
+	sys-devel/gettext"
+
+src_configure() {
+	econf \
+		--htmldir=/usr/share/doc/${PF}/html \
+		$(use_enable startup-notification) \
+		$(use_enable video-thumbnails) \
+		--disable-hal \
+		--enable-inotify \
+		--disable-pixmaps \
+		$(use_with gtk3 gtk3 "yes")
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+	gnome2_icon_cache_update
+
+	einfo
+	elog "To mount as non-root user you need one of the following:"
+	elog "  sys-apps/udevil (recommended, see below)"
+	elog "  sys-apps/pmount"
+	elog "  sys-fs/udisks:0"
+	elog "  sys-fs/udisks:2"
+	elog "To support ftp/nfs/smb/ssh URLs in the path bar you need:"
+	elog "  sys-apps/udevil"
+	elog "To perform as root functionality you need one of the following:"
+	elog "  x11-misc/ktsuss"
+	elog "  x11-libs/gksu"
+	elog "  kde-apps/kdesu"
+	elog "Other optional dependencies:"
+	elog "  sys-apps/dbus"
+	elog "  sys-process/lsof (device processes)"
+	elog "  virtual/eject (eject media)"
+	einfo
+	if ! has_version 'sys-fs/udisks' ; then
+		elog "When using SpaceFM without udisks, and without the udisks-daemon running,"
+		elog "you may need to enable kernel polling for device media changes to be detected."
+		elog "See /usr/share/doc/${PF}/html/spacefm-manual-en.html#devices-kernpoll"
+		has_version '<virtual/udev-173' && ewarn "You need at least udev-173"
+		kernel_is lt 2 6 38 && ewarn "You need at least kernel 2.6.38"
+		einfo
+	fi
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+	gnome2_icon_cache_update
+}
diff --git a/x11-misc/spacefm/spacefm-1.0.2.ebuild b/x11-misc/spacefm/spacefm-1.0.2.ebuild
new file mode 100644
index 000000000000..064d5e5104c2
--- /dev/null
+++ b/x11-misc/spacefm/spacefm-1.0.2.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit fdo-mime gnome2-utils linux-info
+
+DESCRIPTION="A multi-panel tabbed file manager"
+HOMEPAGE="http://ignorantguru.github.com/spacefm/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gtk2 +gtk3 +startup-notification +video-thumbnails"
+REQUIRED_USE="gtk2? ( !gtk3 )"
+
+RDEPEND="dev-libs/glib:2
+	dev-util/desktop-file-utils
+	>=virtual/udev-143
+	virtual/freedesktop-icon-theme
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	gtk2? ( x11-libs/gtk+:2 )
+	!gtk2? ( x11-libs/gtk+:3 )
+	x11-libs/pango
+	x11-libs/libX11
+	x11-misc/shared-mime-info
+	video-thumbnails? ( media-video/ffmpegthumbnailer )
+	startup-notification? ( x11-libs/startup-notification )"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	virtual/pkgconfig
+	sys-devel/gettext"
+
+src_configure() {
+	econf \
+		--htmldir=/usr/share/doc/${PF}/html \
+		$(use_enable startup-notification) \
+		$(use_enable video-thumbnails) \
+		--disable-hal \
+		--enable-inotify \
+		--disable-pixmaps \
+		$(use_with gtk3 gtk3 "yes")
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+	gnome2_icon_cache_update
+
+	einfo
+	elog "To mount as non-root user you need one of the following:"
+	elog "  sys-apps/udevil (recommended, see below)"
+	elog "  sys-apps/pmount"
+	elog "  sys-fs/udisks:0"
+	elog "  sys-fs/udisks:2"
+	elog "To support ftp/nfs/smb/ssh URLs in the path bar you need:"
+	elog "  sys-apps/udevil"
+	elog "To perform as root functionality you need one of the following:"
+	elog "  x11-misc/ktsuss"
+	elog "  x11-libs/gksu"
+	elog "  kde-apps/kdesu"
+	elog "Other optional dependencies:"
+	elog "  sys-apps/dbus"
+	elog "  sys-process/lsof (device processes)"
+	elog "  virtual/eject (eject media)"
+	einfo
+	if ! has_version 'sys-fs/udisks' ; then
+		elog "When using SpaceFM without udisks, and without the udisks-daemon running,"
+		elog "you may need to enable kernel polling for device media changes to be detected."
+		elog "See /usr/share/doc/${PF}/html/spacefm-manual-en.html#devices-kernpoll"
+		has_version '<virtual/udev-173' && ewarn "You need at least udev-173"
+		kernel_is lt 2 6 38 && ewarn "You need at least kernel 2.6.38"
+		einfo
+	fi
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+	gnome2_icon_cache_update
+}
diff --git a/x11-misc/spacefm/spacefm-9999.ebuild b/x11-misc/spacefm/spacefm-9999.ebuild
new file mode 100644
index 000000000000..560a3a322f0c
--- /dev/null
+++ b/x11-misc/spacefm/spacefm-9999.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+EGIT_REPO_URI="git://github.com/IgnorantGuru/${PN}.git"
+EGIT_BRANCH="next"
+
+inherit fdo-mime git-2 gnome2-utils linux-info
+
+DESCRIPTION="A multi-panel tabbed file manager"
+HOMEPAGE="http://ignorantguru.github.com/spacefm/"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS=""
+IUSE="+startup-notification +video-thumbnails"
+
+RDEPEND="dev-libs/glib:2
+	dev-util/desktop-file-utils
+	>=virtual/udev-143
+	virtual/freedesktop-icon-theme
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:3
+	x11-libs/pango
+	x11-libs/libX11
+	x11-misc/shared-mime-info
+	video-thumbnails? ( media-video/ffmpegthumbnailer )
+	startup-notification? ( x11-libs/startup-notification )"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	virtual/pkgconfig
+	sys-devel/gettext"
+
+src_configure() {
+	econf \
+		--htmldir=/usr/share/doc/${PF}/html \
+		$(use_enable startup-notification) \
+		$(use_enable video-thumbnails) \
+		--disable-hal \
+		--enable-inotify \
+		--disable-pixmaps \
+		--with-gtk3=yes
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+	gnome2_icon_cache_update
+
+	einfo
+	elog "To mount as non-root user you need one of the following:"
+	elog "  sys-apps/udevil (recommended, see below)"
+	elog "  sys-apps/pmount"
+	elog "  sys-fs/udisks:0"
+	elog "  sys-fs/udisks:2"
+	elog "To support ftp/nfs/smb/ssh URLs in the path bar you need:"
+	elog "  sys-apps/udevil"
+	elog "To perform as root functionality you need one of the following:"
+	elog "  x11-misc/ktsuss"
+	elog "  x11-libs/gksu"
+	elog "  kde-apps/kdesu"
+	elog "Other optional dependencies:"
+	elog "  sys-apps/dbus"
+	elog "  sys-process/lsof (device processes)"
+	elog "  virtual/eject (eject media)"
+	einfo
+	if ! has_version 'sys-fs/udisks' ; then
+		elog "When using SpaceFM without udisks, and without the udisks-daemon running,"
+		elog "you may need to enable kernel polling for device media changes to be detected."
+		elog "See /usr/share/doc/${PF}/html/spacefm-manual-en.html#devices-kernpoll"
+		has_version '<virtual/udev-173' && ewarn "You need at least udev-173"
+		kernel_is lt 2 6 38 && ewarn "You need at least kernel 2.6.38"
+		einfo
+	fi
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+	gnome2_icon_cache_update
+}
diff --git a/x11-misc/spnavcfg/Manifest b/x11-misc/spnavcfg/Manifest
new file mode 100644
index 000000000000..8c9c3101537b
--- /dev/null
+++ b/x11-misc/spnavcfg/Manifest
@@ -0,0 +1 @@
+DIST spnavcfg-0.2.1.tar.gz 18717 SHA256 a26d4478480f2fb65217cb0d88da5ff81a38c27aaa74710778ea0b999259c4c1
diff --git a/x11-misc/spnavcfg/files/spnavcfg-0.2.1-custom-flags.patch b/x11-misc/spnavcfg/files/spnavcfg-0.2.1-custom-flags.patch
new file mode 100644
index 000000000000..5e4c788dcffe
--- /dev/null
+++ b/x11-misc/spnavcfg/files/spnavcfg-0.2.1-custom-flags.patch
@@ -0,0 +1,44 @@
+diff -Npur spnavcfg-0.2.1.orig/Makefile.in spnavcfg-0.2.1/Makefile.in
+--- spnavcfg-0.2.1.orig/Makefile.in	2012-01-31 22:16:40.789374658 +0100
++++ spnavcfg-0.2.1/Makefile.in	2012-01-31 22:17:01.146374359 +0100
+@@ -5,8 +5,8 @@ warn = -Wall -Wno-int-to-pointer-cast -W
+ 
+ CC = gcc
+ INSTALL = install
+-CFLAGS = -pedantic $(warn) $(dbg) $(opt) `pkg-config --cflags gtk+-2.0`
+-LDFLAGS = `pkg-config --libs gtk+-2.0`
++CFLAGS = $(user_cflags) `pkg-config --cflags gtk+-2.0`
++LDFLAGS = $(user_ldflags) `pkg-config --libs gtk+-2.0`
+ 
+ $(bin): $(obj)
+ 	$(CC) -o $@ $(obj) $(LDFLAGS)
+diff -Npur spnavcfg-0.2.1.orig/configure spnavcfg-0.2.1/configure
+--- spnavcfg-0.2.1.orig/configure	2012-01-31 22:16:40.789374658 +0100
++++ spnavcfg-0.2.1/configure	2012-01-31 22:17:01.146374359 +0100
+@@ -43,6 +43,12 @@ done
+ echo "  prefix: $PREFIX"
+ echo "  optimize for speed: $OPT"
+ echo "  include debugging symbols: $DBG"
++if [ -n "$CFLAGS" ]; then
++	echo "  cflags: $CFLAGS"
++fi
++if [ -n "$LDFLAGS" ]; then
++	echo "  ldflags: $LDFLAGS"
++fi
+ echo
+ 
+ # create Makefile
+@@ -58,6 +64,13 @@ if [ "$OPT" = 'yes' ]; then
+ 	echo 'opt = -O3' >>Makefile
+ fi
+ 
++if [ -n "$CFLAGS" ]; then
++        echo "user_cflags = $CFLAGS" >>Makefile
++fi
++if [ -n "$LDFLAGS" ]; then
++	echo "user_ldflags = $LDFLAGS" >>Makefile
++fi
++
+ cat "$srcdir/Makefile.in" >>Makefile
+ 
+ echo ''
diff --git a/x11-misc/spnavcfg/files/spnavcfg-0.2.1-destdir.patch b/x11-misc/spnavcfg/files/spnavcfg-0.2.1-destdir.patch
new file mode 100644
index 000000000000..8e6848baa102
--- /dev/null
+++ b/x11-misc/spnavcfg/files/spnavcfg-0.2.1-destdir.patch
@@ -0,0 +1,16 @@
+diff -Npur spnavcfg-0.2.1.orig/Makefile.in spnavcfg-0.2.1/Makefile.in
+--- spnavcfg-0.2.1.orig/Makefile.in	2012-01-24 19:50:04.738222230 +0100
++++ spnavcfg-0.2.1/Makefile.in	2012-01-24 19:51:13.199221053 +0100
+@@ -20,9 +20,9 @@ clean:
+ 
+ .PHONY: install
+ install:
+-	$(INSTALL) -d $(PREFIX)/bin
+-	$(INSTALL) -m 4775 $(bin) $(PREFIX)/bin/$(bin)
++	$(INSTALL) -d $(DESTDIR)$(PREFIX)/bin
++	$(INSTALL) -m 4775 $(bin) $(DESTDIR)$(PREFIX)/bin/$(bin)
+ 
+ .PHONY: uninstall
+ uninstall:
+-	rm -f $(PREFIX)/bin/$(bin)
++	rm -f $(DESTDIR)$(PREFIX)/bin/$(bin)
diff --git a/x11-misc/spnavcfg/files/spnavcfg-0.2.1-x11-libs.patch b/x11-misc/spnavcfg/files/spnavcfg-0.2.1-x11-libs.patch
new file mode 100644
index 000000000000..7294013ac5c4
--- /dev/null
+++ b/x11-misc/spnavcfg/files/spnavcfg-0.2.1-x11-libs.patch
@@ -0,0 +1,12 @@
+diff -Npur spnavcfg-0.2.1.orig/Makefile.in spnavcfg-0.2.1/Makefile.in
+--- spnavcfg-0.2.1.orig/Makefile.in	2012-01-31 22:10:35.832381151 +0100
++++ spnavcfg-0.2.1/Makefile.in	2012-01-31 22:11:14.254380520 +0100
+@@ -6,7 +6,7 @@ warn = -Wall -Wno-int-to-pointer-cast -W
+ CC = gcc 
+ INSTALL = install
+ CFLAGS = $(user_cflags) `pkg-config --cflags gtk+-2.0`
+-LDFLAGS = $(user_ldflags) `pkg-config --libs gtk+-2.0`
++LDFLAGS = $(user_ldflags) `pkg-config --libs gtk+-2.0` -lX11
+ 
+ $(bin): $(obj)
+ 	$(CC) -o $@ $(obj) $(LDFLAGS)
diff --git a/x11-misc/spnavcfg/metadata.xml b/x11-misc/spnavcfg/metadata.xml
new file mode 100644
index 000000000000..691a96f7a8d8
--- /dev/null
+++ b/x11-misc/spnavcfg/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>proxy-maintainers</herd>
+	<maintainer>
+		<email>anthoine.bourgeois@gmail.com</email>
+		<name>Anthoine Bourgeois</name>
+	</maintainer>
+	<maintainer>
+		<email>sping@gentoo.org</email>
+		<name>Sebastian Pipping</name>
+	</maintainer>
+	<longdescription>
+		The spnavcfg is the GTK-based configuration GUI for
+		<pkg>sys-libs/spacenavd</pkg>.
+	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">spacenav</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-misc/spnavcfg/spnavcfg-0.2.1.ebuild b/x11-misc/spnavcfg/spnavcfg-0.2.1.ebuild
new file mode 100644
index 000000000000..d1fb9afe1895
--- /dev/null
+++ b/x11-misc/spnavcfg/spnavcfg-0.2.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="3"
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="GTK-based GUI to configure a space navigator device"
+HOMEPAGE="http://spacenav.sourceforge.net/"
+SRC_URI="mirror://sourceforge/project/spacenav/spacenavd%20config%20gui/${PN}%20${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="x11-libs/gtk+:2"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig"
+RDEPEND="${COMMON_DEPEND}
+	app-misc/spacenavd[X]"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-destdir.patch
+	epatch "${FILESDIR}"/${P}-custom-flags.patch
+	epatch "${FILESDIR}"/${P}-x11-libs.patch
+}
+
+src_compile() {
+	emake CC=$(tc-getCC) || die "Make failed."
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "Install failed"
+	dodoc README || die
+}
diff --git a/x11-misc/sprop/Manifest b/x11-misc/sprop/Manifest
new file mode 100644
index 000000000000..091998df2de9
--- /dev/null
+++ b/x11-misc/sprop/Manifest
@@ -0,0 +1 @@
+DIST sprop-0.1.tar.gz 2750 SHA256 c1b786d9fbd81a57addd7e21a34c5a121543cbf9f38fe309e7b452ba94b69ab5 SHA512 74f918b2bbf627e269a674cabd8c4c26192ba67a7240061c0f0f6ddc8e86c32aff83352f2b2f4a2c6b2fcf7245cb1293ae98a2e7bd6189d632e20aa603764ddb WHIRLPOOL 4fae18dcaae26acd5ab3c93f752ab011419d1101f5ad8b1c777749e59028988ec7b4606779a8b314acdeed1d8c4496ba5f722f477eed2c8ee08e1b42c49e9fe2
diff --git a/x11-misc/sprop/metadata.xml b/x11-misc/sprop/metadata.xml
new file mode 100644
index 000000000000..704d8f91190c
--- /dev/null
+++ b/x11-misc/sprop/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+<email>jer@gentoo.org</email>
+<name>Jeroen Roovers</name>
+</maintainer>
+</pkgmetadata>
+
diff --git a/x11-misc/sprop/sprop-0.1.ebuild b/x11-misc/sprop/sprop-0.1.ebuild
new file mode 100644
index 000000000000..83017472ca79
--- /dev/null
+++ b/x11-misc/sprop/sprop-0.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit toolchain-funcs
+
+DESCRIPTION="a simple X property utility"
+HOMEPAGE="http://tools.suckless.org/sprop"
+SRC_URI="http://dl.suckless.org/tools/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	x11-libs/libX11
+"
+DEPEND="
+	${RDEPEND}
+	x11-proto/xproto
+"
+src_prepare() {
+	sed -i \
+		-e '/^CC/d' \
+		-e '/^CFLAGS/s| =| +=|;s| -Os||g' \
+		-e '/^LDFLAGS/s|= -s|+=|g' \
+		config.mk || die
+
+	sed -i \
+		-e 's|@${CC}|$(CC)|g' \
+		Makefile || die
+
+	tc-export CC
+}
+
+src_compile() { emake sprop; }
+
+src_install() {
+	dobin ${PN}
+	doman ${PN}.1
+}
diff --git a/x11-misc/sselp/Manifest b/x11-misc/sselp/Manifest
new file mode 100644
index 000000000000..2daa540cd1e9
--- /dev/null
+++ b/x11-misc/sselp/Manifest
@@ -0,0 +1 @@
+DIST sselp-0.2.tar.gz 2562 SHA256 cd0f95ec0eb571a6dd3c48ba3aa931080eb33bc81805bd72832cc04c01b8b822 SHA512 f53163bd6bf257ef912d23dd813690a6a8700344bcc3caad73556917f12e76364b6ebc9bd11224fe8f4013d83518459440f113a313fc9721de2a124277270044 WHIRLPOOL f9ab90f765633106397cf62cb38da780b1fa25379e1722772e46d2eed0614bbfcf778f60e1c5e1a97049033898e41e35e1fecd48195ad510aeedf2031e7bdaf5
diff --git a/x11-misc/sselp/metadata.xml b/x11-misc/sselp/metadata.xml
new file mode 100644
index 000000000000..d6e0a0f7eded
--- /dev/null
+++ b/x11-misc/sselp/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>desktop-misc</herd>
+<maintainer>
+<email>jer@gentoo.org</email>
+<name>Jeroen Roovers</name>
+</maintainer>
+</pkgmetadata>
+
diff --git a/x11-misc/sselp/sselp-0.2.ebuild b/x11-misc/sselp/sselp-0.2.ebuild
new file mode 100644
index 000000000000..1ab1534560c7
--- /dev/null
+++ b/x11-misc/sselp/sselp-0.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit toolchain-funcs
+
+DESCRIPTION="Simple X selection printer"
+HOMEPAGE="http://tools.suckless.org/sselp"
+SRC_URI="http://dl.suckless.org/tools/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 hppa ~ppc ~ppc64 x86"
+IUSE=""
+
+DEPEND="x11-libs/libX11"
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	sed -i \
+		-e "s|^CFLAGS = -std=c99 -pedantic -Wall -Os|CFLAGS += -std=c99 -pedantic -Wall|" \
+		-e "s|^LDFLAGS = -s|LDFLAGS +=|" \
+		-e "s|^CC = cc|CC = $(tc-getCC)|" \
+		config.mk || die "sed failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="/usr" install || die "emake install failed"
+	dodoc README
+}
diff --git a/x11-misc/sselp/sselp-9999.ebuild b/x11-misc/sselp/sselp-9999.ebuild
new file mode 100644
index 000000000000..a42f9be5d304
--- /dev/null
+++ b/x11-misc/sselp/sselp-9999.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit git-2 toolchain-funcs
+
+DESCRIPTION="Simple X selection printer"
+HOMEPAGE="http://tools.suckless.org/sselp"
+SRC_URI=""
+EGIT_REPO_URI="git://git.suckless.org/sselp"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+DEPEND="x11-libs/libX11"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	sed -i \
+		-e "s|^CFLAGS = -std=c99 -pedantic -Wall -Os|CFLAGS += -std=c99 -pedantic -Wall|" \
+		-e "s|^LDFLAGS = -s|LDFLAGS +=|" \
+		-e "s|^CC = cc|CC = $(tc-getCC)|" \
+		config.mk || die "sed failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="/usr" install
+	dodoc README
+}
diff --git a/x11-misc/stalonetray/Manifest b/x11-misc/stalonetray/Manifest
new file mode 100644
index 000000000000..dc2633b04430
--- /dev/null
+++ b/x11-misc/stalonetray/Manifest
@@ -0,0 +1,2 @@
+DIST stalonetray-0.8.1.tar.bz2 150814 SHA256 94a2f80ae211a552c2d379b5b41e2618f3e906b33bee207fec8793b1a9bde8f2
+DIST stalonetray-0.8.3.tar.bz2 155276 SHA256 36548a588b2d466913423245dda6ffb6313132cd0cec635a117d37b3dab5fd4c SHA512 b1c50d844b6497b586c1ad56b721675690ea305a4e3a2601ab5305af0e208c215825eefa8fa374ae0c392252156a8dffd5882992c943344f5b6a674fe6553942 WHIRLPOOL fc0e1a01b98bc4475b2137242a97c58d20113a23f7fb2fd97c94e6c52105080beeeadf6d8f5b1b0da99aa080a1de90e05db3155a7c7d051966b5c6ae8b06e397
diff --git a/x11-misc/stalonetray/metadata.xml b/x11-misc/stalonetray/metadata.xml
new file mode 100644
index 000000000000..77344c741801
--- /dev/null
+++ b/x11-misc/stalonetray/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>desktop-dock</herd>
+	<use>
+		<flag name="graceful-exit">use non-portable hack to exit gracefuly on signal</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">stalonetray</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-misc/stalonetray/stalonetray-0.8.1.ebuild b/x11-misc/stalonetray/stalonetray-0.8.1.ebuild
new file mode 100644
index 000000000000..6f86670ec196
--- /dev/null
+++ b/x11-misc/stalonetray/stalonetray-0.8.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+DESCRIPTION="System tray utility including support for KDE system tray icons"
+HOMEPAGE="http://stalonetray.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="debug +graceful-exit kde"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libXpm"
+DEPEND="${RDEPEND}
+	x11-proto/xproto"
+
+src_configure() {
+	econf $(use_enable debug) \
+		$(use_enable graceful-exit) \
+		$(use_enable kde native-kde)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	dodoc AUTHORS ChangeLog NEWS README stalonetrayrc.sample TODO
+	dohtml stalonetray.html
+}
diff --git a/x11-misc/stalonetray/stalonetray-0.8.3.ebuild b/x11-misc/stalonetray/stalonetray-0.8.3.ebuild
new file mode 100644
index 000000000000..615494594418
--- /dev/null
+++ b/x11-misc/stalonetray/stalonetray-0.8.3.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="System tray utility including support for KDE system tray icons"
+HOMEPAGE="http://stalonetray.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug +graceful-exit kde"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libXpm"
+DEPEND="${RDEPEND}
+	x11-proto/xproto"
+
+src_configure() {
+	econf $(use_enable debug) \
+		$(use_enable graceful-exit) \
+		$(use_enable kde native-kde)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	dodoc AUTHORS ChangeLog NEWS README stalonetrayrc.sample TODO
+	dohtml stalonetray.html
+}
diff --git a/x11-misc/sunflower/Manifest b/x11-misc/sunflower/Manifest
new file mode 100644
index 000000000000..74b28e15d453
--- /dev/null
+++ b/x11-misc/sunflower/Manifest
@@ -0,0 +1 @@
+DIST sunflower-0.2-59.tgz 790126 SHA256 f0497c18870487361780a776bf31235473c20ef66bc56a95c6048e00c399b525 SHA512 e97076eb1c57d52b8fd95501259acaaa9a429f9daacc30ef587cce2f3419433f5aa4554e0e86beeceda208b4be425b98c64c6ced04e36e86b2b4f803176c37f9 WHIRLPOOL 6126fda9675b9938e3a12620e48e22c6d23253890f47c5ab34a7322280d27d1d78e2e3745ccf55831094efb987835f9f0f159dbe109732da2c236096f485cfee
diff --git a/x11-misc/sunflower/files/sunflower b/x11-misc/sunflower/files/sunflower
new file mode 100644
index 000000000000..192d4b99e1ae
--- /dev/null
+++ b/x11-misc/sunflower/files/sunflower
@@ -0,0 +1,5 @@
+#!/usr/bin/env python
+
+import os
+os.chdir("@SITEDIR@")
+import sunflower.Sunflower
diff --git a/x11-misc/sunflower/metadata.xml b/x11-misc/sunflower/metadata.xml
new file mode 100644
index 000000000000..d9df2048b4c0
--- /dev/null
+++ b/x11-misc/sunflower/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>proxy-maintainers</herd>
+	<maintainer>
+		<email>hasufell@gentoo.org</email>
+		<name>Julian Ospald</name>
+		<description>Maintainer. Assign bugs to him</description>
+	</maintainer>
+	<maintainer>
+		<email>henrique.ribeiro.dias@gmail.com</email>
+		<name>Henrique Dias</name>
+		<description>Proxy maintainer. CC him on bugs</description>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">MeanEYE/Sunflower</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-misc/sunflower/sunflower-0.2_alpha59.ebuild b/x11-misc/sunflower/sunflower-0.2_alpha59.ebuild
new file mode 100644
index 000000000000..689ac28550eb
--- /dev/null
+++ b/x11-misc/sunflower/sunflower-0.2_alpha59.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+inherit eutils fdo-mime gnome2-utils python-r1
+
+MY_PN="Sunflower"
+DESCRIPTION="Small and highly customizable twin-panel file manager with plugin-support"
+HOMEPAGE="https://github.com/MeanEYE/Sunflower
+	http://sunflower-fm.org/"
+SRC_URI="http://sunflower-fm.org/pub/sunflower-${PV/_alpha/-}.tgz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}"
+RDEPEND="${DEPEND}
+	>=dev-python/pygtk-2.15.0[${PYTHON_USEDEP}]
+	>=dev-python/notify-python-0.1[${PYTHON_USEDEP}]
+	gnome-base/librsvg:2"
+
+S=${WORKDIR}/${MY_PN}
+
+src_prepare() {
+	find "${S}" -name "*.py[co]" -delete || die
+	find "${S}"/translations -name "*.po" -delete || die
+	rm "${S}"/translations/${PN}.pot || die
+
+	sed -i \
+		-e '/^application_file/s/os.path.dirname(sys.argv\[0\])/os.getcwd()/' \
+		${MY_PN}.py || die
+}
+
+src_install() {
+	touch __init__.py || die
+	installme() {
+		# install modules
+		python_moduleinto ${PN}
+		python_domodule images application ${MY_PN}.py \
+			AUTHORS CHANGES COPYING DEPENDS TODO __init__.py
+
+		# generate and install startup scripts
+		sed \
+			-e "s#@SITEDIR@#$(python_get_sitedir)/${PN}#" \
+			"${FILESDIR}"/${PN} > "${WORKDIR}"/${PN} || die
+		python_doscript "${WORKDIR}"/${PN}
+	}
+
+	# install for all enabled implementations
+	python_foreach_impl installme
+
+	insinto /usr/share/locale
+	# correct gettext behavior
+	if [[ -n "${LINGUAS+x}" ]] ; then
+		for i in $(cd "${S}"/translations ; echo *) ; do
+			if has ${i} ${LINGUAS} ; then
+				doins -r "${S}"/translations/${i}
+			fi
+		done
+	else
+		doins -r "${S}"/translations/*
+	fi
+
+	newicon -s 64 images/${PN}_64.png ${PN}.png
+	doicon -s scalable images/${PN}.svg
+	newmenu ${MY_PN}.desktop ${PN}.desktop
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+
+	# TODO: better description
+	elog "optional dependencies:"
+	elog "  dev-python/libgnome-python"
+	elog "  media-libs/mutagen"
+	elog "  x11-libs/vte:0[python] (terminal support)"
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
diff --git a/x11-misc/superswitcher/Manifest b/x11-misc/superswitcher/Manifest
new file mode 100644
index 000000000000..eec605d48332
--- /dev/null
+++ b/x11-misc/superswitcher/Manifest
@@ -0,0 +1 @@
+DIST superswitcher-0.6.tar.gz 183184 SHA256 232b98d1a9443fcf4f969cf4cf00df3908c3ccb55f36059391da68873d514599 SHA512 7385c14537a81f3e78509ff7399e1caf84f46fae22ce844f70f7cd72c8865d3808af77229744443178da691dfbcf61cae908c2eb54ef1564c83473ed9ff6ae0b WHIRLPOOL 984945cca220b5144dbb7808ff3dc980d4e59fadde33beac865d9c1f9c15d03419a8a57d852057af6f7679fc34dbb906176317f16fcf78f8de62949e7f3c2ee6
diff --git a/x11-misc/superswitcher/files/superswitcher-0.6-glib-single-include.patch b/x11-misc/superswitcher/files/superswitcher-0.6-glib-single-include.patch
new file mode 100644
index 000000000000..fe3249982870
--- /dev/null
+++ b/x11-misc/superswitcher/files/superswitcher-0.6-glib-single-include.patch
@@ -0,0 +1,27 @@
+Index: superswitcher-0.6/src/dbus-object.h
+===================================================================
+--- superswitcher-0.6.orig/src/dbus-object.h
++++ superswitcher-0.6/src/dbus-object.h
+@@ -4,7 +4,7 @@
+ #ifndef SUPERSWITCHER_DBUS_OBJECT_H
+ #define SUPERSWITCHER_DBUS_OBJECT_H
+ 
+-#include <glib/gtypes.h>
++#include <glib.h>
+ 
+ #include "forward_declarations.h"
+ 
+Index: superswitcher-0.6/src/forward_declarations.h
+===================================================================
+--- superswitcher-0.6.orig/src/forward_declarations.h
++++ superswitcher-0.6/src/forward_declarations.h
+@@ -18,8 +18,7 @@ typedef struct _SSXineramaScreen SSXiner
+ #define ABNORMAL_EXIT_CODE_ANOTHER_INSTANCE_IS_RUNNING  1
+ #define ABNORMAL_EXIT_CODE_UNKNOWN_COMMAND_LINE_OPTION  2
+ 
+-#include <glib/gerror.h>
+-#include <glib/gtypes.h>
++#include <glib.h>
+ gboolean   superswitcher_hide_popup     (void *, GError **);
+ gboolean   superswitcher_show_popup     (void *, GError **);
+ gboolean   superswitcher_toggle_popup   (void *, GError **);
diff --git a/x11-misc/superswitcher/files/superswitcher-0.6-wnck-workspace.patch b/x11-misc/superswitcher/files/superswitcher-0.6-wnck-workspace.patch
new file mode 100644
index 000000000000..90919a57485b
--- /dev/null
+++ b/x11-misc/superswitcher/files/superswitcher-0.6-wnck-workspace.patch
@@ -0,0 +1,62 @@
+It seems like wnck_window_is_skip_pager isn't all we need to check.
+
+--- superswitcher/src/screen.c
++++ superswitcher/src/screen.c
+@@ -505,6 +505,7 @@
+ static SSWindow *
+ add_window_to_screen (SSScreen *screen, WnckWindow *wnck_window)
+ {
++  WnckWorkspace *wnck_workspace;
+   SSWindow *window;
+   SSWorkspace *workspace;
+   int n;
+@@ -513,7 +514,13 @@
+     return NULL;
+   }
+ 
+-  n = wnck_workspace_get_number (wnck_window_get_workspace (wnck_window));
++  wnck_workspace = wnck_window_get_workspace (wnck_window);
++
++  if (wnck_workspace == NULL) {
++    return NULL;
++  }
++
++  n = wnck_workspace_get_number (wnck_workspace);
+   workspace = ss_screen_get_nth_workspace (screen, n);
+ 
+   window = ss_window_new (workspace, wnck_window);
+--- superswitcher/src/window.c
++++ superswitcher/src/window.c
+@@ -254,6 +254,7 @@
+ static void
+ on_workspace_changed (WnckWindow *wnck_window, gpointer data)
+ {
++  WnckWorkspace *wnck_workspace;
+   SSWindow *window;
+   SSWorkspace *old_workspace;
+   SSWorkspace *new_workspace;
+@@ -261,12 +262,19 @@
+ 
+   window = (SSWindow *) data;
+   old_workspace = window->workspace;
+-  new_workspace_id = wnck_workspace_get_number (wnck_window_get_workspace (wnck_window));
+-  new_workspace = ss_screen_get_nth_workspace (old_workspace->screen, new_workspace_id);
+-
+   ss_workspace_remove_window (old_workspace, window);
++
++  wnck_workspace = wnck_window_get_workspace (wnck_window);
++  if (wnck_workspace) {
++    new_workspace_id = wnck_workspace_get_number (wnck_workspace);
++    new_workspace = ss_screen_get_nth_workspace (old_workspace->screen, new_workspace_id);
++
++    ss_workspace_add_window (new_workspace, window);
++    window->workspace = new_workspace;
++  } else {
++    window->workspace = NULL;
++  }
++
+-  window->workspace = new_workspace;
+-  ss_workspace_add_window (new_workspace, window);
+   window->new_window_index = -1;
+   gtk_widget_queue_draw (gtk_widget_get_toplevel (window->widget));
+ }
diff --git a/x11-misc/superswitcher/metadata.xml b/x11-misc/superswitcher/metadata.xml
new file mode 100644
index 000000000000..39234cc2df9b
--- /dev/null
+++ b/x11-misc/superswitcher/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+	<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
+	<longdescription lang="en">SuperSwitcher is a (more feature-ful) replacement for the Alt-Tab window
+switching behavior and Ctrl-Alt-Left/Right/Up/Down workspace switching behavior
+that is currently provided by Metacity.</longdescription>
+	<upstream>
+		<remote-id type="google-code">superswitcher</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-misc/superswitcher/superswitcher-0.6.ebuild b/x11-misc/superswitcher/superswitcher-0.6.ebuild
new file mode 100644
index 000000000000..12d72e102ffd
--- /dev/null
+++ b/x11-misc/superswitcher/superswitcher-0.6.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit autotools eutils
+
+DESCRIPTION="A more feature-full replacement of the Alt-Tab window switching behavior"
+HOMEPAGE="http://code.google.com/p/superswitcher/"
+SRC_URI="http://superswitcher.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-libs/dbus-glib
+	dev-libs/glib:2
+	>=gnome-base/gconf-2:2
+	x11-libs/gtk+:2
+	>=x11-libs/libwnck-2.10:1
+	x11-libs/libXcomposite
+	x11-libs/libXinerama
+	x11-libs/libXrender"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	gnome-base/gnome-common"
+
+src_prepare() {
+	sed -i \
+		-e '/-DG.*_DISABLE_DEPRECATED/d' \
+		src/Makefile.am || die #338906
+
+	epatch "${FILESDIR}"/${P}-wnck-workspace.patch
+	epatch "${FILESDIR}"/${PN}-0.6-glib-single-include.patch
+	eautoreconf
+}
+
+src_install() {
+	MAKEOPTS=-j1 default
+}
diff --git a/x11-misc/sux/Manifest b/x11-misc/sux/Manifest
new file mode 100644
index 000000000000..ec49ed9706ae
--- /dev/null
+++ b/x11-misc/sux/Manifest
@@ -0,0 +1 @@
+DIST sux 9403 SHA256 98a2e66d105e06f95d67312f40f928fb2885084ff46fad248c6d6cd25904efd1 SHA512 cf1afb736299e349a14837f89f0feb6a5beb1af35be8e6baef74d03e7278a9d9c331d2759ec21e5cf8b43197734f96464b82ff5904968428bc43a45d2ad0c598 WHIRLPOOL b0ef6fb0eb2752c99c53e7059d9e2830a336b84d98b67ef56d2fe758fd328fcd271a245bfbad8fd7cf1410c57757a8831c4edbe8b71c32f6dbfbac44d5020cc8
diff --git a/x11-misc/sux/files/sux-1.0-dash.patch b/x11-misc/sux/files/sux-1.0-dash.patch
new file mode 100644
index 000000000000..a2ba00e0be05
--- /dev/null
+++ b/x11-misc/sux/files/sux-1.0-dash.patch
@@ -0,0 +1,12 @@
+--- a/sux
++++ b/sux
+@@ -302,7 +302,8 @@
+   then
+     if [ "$sux_got_minus" = "1" ]
+     then
+-      sux_cmd="sh -c \"exec -l \$SHELL\""
++      # exec -l does not work in dash (Gentoo bug #473200)
++      sux_cmd="sh -c \"exec \$SHELL\""
+     else
+       sux_cmd="\$SHELL"
+     fi
diff --git a/x11-misc/sux/files/sux-1.0-r1.patch b/x11-misc/sux/files/sux-1.0-r1.patch
new file mode 100644
index 000000000000..5be78fd7b7d2
--- /dev/null
+++ b/x11-misc/sux/files/sux-1.0-r1.patch
@@ -0,0 +1,52 @@
+--- a/sux
++++ b/sux
+@@ -29,7 +29,6 @@
+ # are on NFS. In such a case, change the default to copy-cookies.
+ sux_root_cookie_transfer="c"
+ 
+-
+ usage()
+ {
+   echo "usage: `basename $0` [-m|-p|--preserve-environment]" >&2
+@@ -230,10 +229,10 @@
+   # Remove the old cookies. They may cause trouble if we transfer only one 
+   # cookie, e.g. an MIT cookie, and there's still a stale XDM cookie hanging 
+   # around.
+-  export TERM="xauth -q remove $DISPLAY 2>/dev/null;"
++  export TERM="/usr/X11R6/bin/xauth -q remove $DISPLAY 2>/dev/null;"
+   if [ -n "$sux_unix_display" ]
+   then
+-    TERM="$TERM xauth -q remove $sux_unix_display;"
++    TERM="$TERM /usr/X11R6/bin/xauth -q remove $sux_unix_display;"
+   fi
+ 
+   # Note that there may be more than one cookie to transfer, hence 
+@@ -250,7 +249,7 @@
+     sux_i=`expr $sux_i + 1`
+     if [ $sux_i -eq 9 ]
+     then
+-      TERM="$TERM | xauth nmerge - ;"
++      TERM="$TERM | /usr/X11R6/bin/xauth nmerge - ;"
+       sux_i=0
+     fi
+   done
+@@ -316,12 +316,12 @@
+ # wouldn't have the proper access rights anyway...
+ unset XAUTHORITY
+ 
++sux_home=`egrep "^$sux_username:" /etc/passwd | cut -d: -f6`
+ 
+ ##
+ # --preserve-environment special case
+ if [ -n "$sux_preserve" -a -n "$sux_xauth_cmd" ]
+ then
+-  sux_home=`egrep "^$sux_username:" /etc/passwd | cut -d: -f6`
+   if [ -z "$sux_home" ]
+   then
+     echo "WARNING: --preserve-environment has been set, but no good value was found for XAUTHORITY, expect trouble" >&2
+@@ -334,4 +334,4 @@
+ ##
+ # Execute su
+ exec su $sux_su_opts -c "$sux_xauth_cmd \
+-     exec env $sux_xauthority $sux_term DISPLAY='$DISPLAY' $sux_cmd;"
++     exec env $sux_xauthority $sux_term HOME='$sux_home' DISPLAY='$DISPLAY' $sux_cmd;"
diff --git a/x11-misc/sux/files/sux-X11R6.patch b/x11-misc/sux/files/sux-X11R6.patch
new file mode 100644
index 000000000000..6b345a646965
--- /dev/null
+++ b/x11-misc/sux/files/sux-X11R6.patch
@@ -0,0 +1,24 @@
+--- a/sux
++++ b/sux
+@@ -229,10 +229,10 @@
+   # Remove the old cookies. They may cause trouble if we transfer only one 
+   # cookie, e.g. an MIT cookie, and there's still a stale XDM cookie hanging 
+   # around.
+-  export TERM="/usr/X11R6/bin/xauth -q remove $DISPLAY 2>/dev/null;"
++  export TERM="/usr/bin/xauth -q remove $DISPLAY 2>/dev/null;"
+   if [ -n "$sux_unix_display" ]
+   then
+-    TERM="$TERM /usr/X11R6/bin/xauth -q remove $sux_unix_display;"
++    TERM="$TERM /usr/bin/xauth -q remove $sux_unix_display;"
+   fi
+ 
+   # Note that there may be more than one cookie to transfer, hence 
+@@ -249,7 +249,7 @@
+     sux_i=`expr $sux_i + 1`
+     if [ $sux_i -eq 9 ]
+     then
+-      TERM="$TERM | /usr/X11R6/bin/xauth nmerge - ;"
++      TERM="$TERM | /usr/bin/xauth nmerge - ;"
+       sux_i=0
+     fi
+   done
diff --git a/x11-misc/sux/metadata.xml b/x11-misc/sux/metadata.xml
new file mode 100644
index 000000000000..540f810e069d
--- /dev/null
+++ b/x11-misc/sux/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>desktop-misc</herd>
+</pkgmetadata>
diff --git a/x11-misc/sux/sux-1.0-r4.ebuild b/x11-misc/sux/sux-1.0-r4.ebuild
new file mode 100644
index 000000000000..43e3f723a458
--- /dev/null
+++ b/x11-misc/sux/sux-1.0-r4.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils
+
+DESCRIPTION="\"su\" wrapper which transfers X credentials"
+HOMEPAGE="http://fgouget.free.fr/sux/sux-readme.shtml"
+SRC_URI="http://fgouget.free.fr/sux/sux"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ppc sparc x86"
+IUSE=""
+
+S="${WORKDIR}"
+
+RDEPEND="x11-apps/xauth"
+
+src_unpack() {
+	cp "${DISTDIR}"/${A} .
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-r1.patch \
+		"${FILESDIR}"/${PN}-X11R6.patch \
+		"${FILESDIR}"/${P}-dash.patch
+}
+
+src_install() {
+	dobin sux
+}
diff --git a/x11-misc/sw-notify-send/Manifest b/x11-misc/sw-notify-send/Manifest
new file mode 100644
index 000000000000..faba77b3c92f
--- /dev/null
+++ b/x11-misc/sw-notify-send/Manifest
@@ -0,0 +1,2 @@
+DIST sw-notify-send-0.1.1.tar.bz2 54661 SHA256 b178554b2359ccad72aefff3c986356b96a541602d08b819565dd8d91ca3e4d4
+DIST tinynotify-send-1.2.1.tar.bz2 266078 SHA256 72c5f4451348b0a06dd57efb5de75273e47f7e35ae04df9a3dd1c64be1e71e65 SHA512 f416db09fa95f04d771610af7ae8953192027b8606c53f54efe514c4d33b59e8dc362676004a036c2dd7e7c7cf03b077ee9b753839efbcb181c5724f43efa58d WHIRLPOOL 2e82b67111db19aa52e293feea167e53ef73bf04a043049543082cf9eea64f75bbfe9788e323dd19d081b5cab43ff469e370810fd6bbc70707329cacfb560411
diff --git a/x11-misc/sw-notify-send/metadata.xml b/x11-misc/sw-notify-send/metadata.xml
new file mode 100644
index 000000000000..feaa57e4dc77
--- /dev/null
+++ b/x11-misc/sw-notify-send/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
+	<upstream>
+		<maintainer status="active">
+			<email>mgorny@gentoo.org</email>
+			<name>Michał Górny</name>
+		</maintainer>
+		<bugs-to>https://bitbucket.org/mgorny/tinynotify-send/issues/</bugs-to>
+		<remote-id type="bitbucket">mgorny/tinynotify-send</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-misc/sw-notify-send/sw-notify-send-0.1.1.ebuild b/x11-misc/sw-notify-send/sw-notify-send-0.1.1.ebuild
new file mode 100644
index 000000000000..f1a686cf7830
--- /dev/null
+++ b/x11-misc/sw-notify-send/sw-notify-send-0.1.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=3
+inherit autotools-utils
+
+DESCRIPTION="A system-wide notification wrapper for notify-send"
+HOMEPAGE="https://github.com/mgorny/sw-notify-send/"
+SRC_URI="mirror://github/mgorny/${PN}/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="sys-process/procps"
+DEPEND="${RDEPEND}"
+
+# The lack of x11-libs/libnotify RDEPEND is intentional as:
+# 1) The notification daemon may be running in a libnotify-enabled
+# chroot system, while keeping the host system libnotify-free (in this
+# case sw-notify-send enters the chroot first);
+# 2) Having any kind of a notification daemon implies having libnotify
+# installed. And if none is running, notify-send is not called anyway.
+
+DOCS=( README )
diff --git a/x11-misc/sw-notify-send/sw-notify-send-1.2.1.ebuild b/x11-misc/sw-notify-send/sw-notify-send-1.2.1.ebuild
new file mode 100644
index 000000000000..7180d8b6de4b
--- /dev/null
+++ b/x11-misc/sw-notify-send/sw-notify-send-1.2.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit autotools-utils
+
+MY_PN=tinynotify-send
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="A system-wide variant of tinynotify-send"
+HOMEPAGE="https://github.com/mgorny/tinynotify-send/"
+SRC_URI="mirror://github/mgorny/${MY_PN}/${MY_P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/libtinynotify
+	~x11-libs/libtinynotify-cli-${PV}
+	x11-libs/libtinynotify-systemwide"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=( README )
+S=${WORKDIR}/${MY_P}
+
+src_configure() {
+	myeconfargs=(
+		--disable-library
+		--disable-regular
+		--enable-system-wide
+	)
+
+	autotools-utils_src_configure
+}
diff --git a/x11-misc/sw-notify-send/sw-notify-send-9999.ebuild b/x11-misc/sw-notify-send/sw-notify-send-9999.ebuild
new file mode 100644
index 000000000000..6cf23d120d57
--- /dev/null
+++ b/x11-misc/sw-notify-send/sw-notify-send-9999.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+#if LIVE
+AUTOTOOLS_AUTORECONF=yes
+EGIT_REPO_URI="http://bitbucket.org/mgorny/tinynotify-send.git"
+
+inherit git-r3
+#endif
+
+inherit autotools-utils
+
+MY_PN=tinynotify-send
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="A system-wide variant of tinynotify-send"
+HOMEPAGE="https://bitbucket.org/mgorny/tinynotify-send/"
+SRC_URI="https://www.bitbucket.org/mgorny/${MY_PN}/downloads/${MY_P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/libtinynotify:0=
+	~x11-libs/libtinynotify-cli-${PV}
+	x11-libs/libtinynotify-systemwide:0="
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+#if LIVE
+EGIT_CHECKOUT_DIR=${WORKDIR}/${MY_P}
+KEYWORDS=
+SRC_URI=
+DEPEND="${DEPEND}
+	dev-util/gtk-doc"
+#endif
+
+src_configure() {
+	myeconfargs=(
+		--disable-library
+		--disable-regular
+		--enable-system-wide
+	)
+
+	autotools-utils_src_configure
+}
diff --git a/x11-misc/sxhkd/Manifest b/x11-misc/sxhkd/Manifest
new file mode 100644
index 000000000000..7d9c869708fd
--- /dev/null
+++ b/x11-misc/sxhkd/Manifest
@@ -0,0 +1,3 @@
+DIST sxhkd-0.5.3.tar.gz 34128 SHA256 4f794ecccc03d2ecfc2fef074a09195d16ec7343c514acacf71ffa770ca4a977 SHA512 d573117abae5ca1b2643d6405ed032f75b9b67bb15bbdfc6f25e2fa69df81a5b75c7ae15d835dacc6e972cb8594ccf300fd0881a153302b12eb04c3437cf795b WHIRLPOOL 3e3c2d6f846a3ac6ea3e202bf7d279a76038b120358f141170d0c1e3d7e1950f38472ed87f474c01292f9002c3c5bc02070b7117f15dc919536732ee8fb4d9cf
+DIST sxhkd-0.5.4.tar.gz 34526 SHA256 de95f97155319ded41ece9403ac9e9f18bfdd914a09f553ab09b331bbfe5d332 SHA512 db3d06d0ba580a05da87dae278a65cd7fedc41203ca6a7fb864b25c368ed7db3c38b8d69b69f8a639ab8de1603e3cf8b827efe617efcb9ebacb852793fc85e8a WHIRLPOOL 44b7fff7efb659d1abab3e9890f7ec01a160ddb5762a77c8e1d5c198945594dd5f2a8985f3798b6e969eacc7603bcf6ce394270f2e3e6152c2c8fbdd1ef09f6e
+DIST sxhkd-0.5.5.tar.gz 34634 SHA256 86a2ec98ed0a83a4c228ab9d9cdec5e1f81eb96f33d9c8f20d5a9e4b7ea1ad99 SHA512 95e927d8e8af552565b60b76ac40436ee3a741334c41d8b1c1335e1967139273e0bf89e5211d954b4001dd4ce779687281fe29669e1d33e40c60c8a7963afe10 WHIRLPOOL 9d8acdbe58c834af6101b2a57fa8962ae1dbddcbc892689026c8e50bb22fea876eac930092648f75a80f3c2ee146174ce519b5c3d73c2bb8e04858ceb8e6199f
diff --git a/x11-misc/sxhkd/files/sxhkd-0.5.3-flags.patch b/x11-misc/sxhkd/files/sxhkd-0.5.3-flags.patch
new file mode 100644
index 000000000000..8e485c2cb58c
--- /dev/null
+++ b/x11-misc/sxhkd/files/sxhkd-0.5.3-flags.patch
@@ -0,0 +1,23 @@
+--- sxhkd-0.5.3/Makefile
++++ sxhkd-0.5.3/Makefile
+@@ -5,7 +5,6 @@
+ LIBS     = -lm -lxcb -lxcb-keysyms
+ CFLAGS  += -std=c99 -pedantic -Wall -Wextra -I$(PREFIX)/include
+ CFLAGS  += -D_POSIX_C_SOURCE=200112L -DVERSION=\"$(VERSION)\"
+-LDFLAGS += -L$(PREFIX)/lib
+ 
+ PREFIX    ?= /usr/local
+ BINPREFIX  = $(PREFIX)/bin
+@@ -14,11 +13,9 @@
+ SRC = $(wildcard *.c)
+ OBJ = $(SRC:.c=.o)
+ 
+-all: CFLAGS  += -Os
+-all: LDFLAGS += -s
+ all: $(NAME)
+ 
+-debug: CFLAGS += -O0 -g -DDEBUG
++debug: CFLAGS += -DDEBUG
+ debug: $(NAME)
+ 
+ include Sourcedeps
diff --git a/x11-misc/sxhkd/metadata.xml b/x11-misc/sxhkd/metadata.xml
new file mode 100644
index 000000000000..f7b524e66dcf
--- /dev/null
+++ b/x11-misc/sxhkd/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>radhermit@gentoo.org</email>
+		<name>Tim Harder</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">baskerville/sxhkd</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-misc/sxhkd/sxhkd-0.5.3.ebuild b/x11-misc/sxhkd/sxhkd-0.5.3.ebuild
new file mode 100644
index 000000000000..a32e23f32c9c
--- /dev/null
+++ b/x11-misc/sxhkd/sxhkd-0.5.3.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils toolchain-funcs systemd
+
+DESCRIPTION="Simple X hotkey daemon"
+HOMEPAGE="https://github.com/baskerville/sxhkd/"
+SRC_URI="https://github.com/baskerville/sxhkd/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="x11-libs/libxcb
+	x11-libs/xcb-util-keysyms"
+DEPEND="${RDEPEND}
+	x11-libs/xcb-util"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-flags.patch
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" PREFIX=/usr
+}
+
+src_install() {
+	emake PREFIX=/usr DESTDIR="${D}" install
+	systemd_dounit contrib/systemd/${PN}.service
+}
diff --git a/x11-misc/sxhkd/sxhkd-0.5.4.ebuild b/x11-misc/sxhkd/sxhkd-0.5.4.ebuild
new file mode 100644
index 000000000000..c8b37197dd43
--- /dev/null
+++ b/x11-misc/sxhkd/sxhkd-0.5.4.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils toolchain-funcs systemd
+
+DESCRIPTION="Simple X hotkey daemon"
+HOMEPAGE="https://github.com/baskerville/sxhkd/"
+SRC_URI="https://github.com/baskerville/sxhkd/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="x11-libs/libxcb
+	x11-libs/xcb-util-keysyms"
+DEPEND="${RDEPEND}
+	x11-libs/xcb-util"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.5.3-flags.patch
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" PREFIX=/usr
+}
+
+src_install() {
+	emake PREFIX=/usr DESTDIR="${D}" install
+	systemd_dounit contrib/systemd/${PN}.service
+}
diff --git a/x11-misc/sxhkd/sxhkd-0.5.5.ebuild b/x11-misc/sxhkd/sxhkd-0.5.5.ebuild
new file mode 100644
index 000000000000..538355f48880
--- /dev/null
+++ b/x11-misc/sxhkd/sxhkd-0.5.5.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils toolchain-funcs systemd
+
+DESCRIPTION="Simple X hotkey daemon"
+HOMEPAGE="https://github.com/baskerville/sxhkd/"
+SRC_URI="https://github.com/baskerville/sxhkd/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="x11-libs/libxcb
+	x11-libs/xcb-util-keysyms"
+DEPEND="${RDEPEND}
+	x11-libs/xcb-util"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.5.3-flags.patch
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" PREFIX=/usr
+}
+
+src_install() {
+	emake PREFIX=/usr DESTDIR="${D}" install
+	systemd_dounit contrib/systemd/${PN}.service
+}
diff --git a/x11-misc/synergy/Manifest b/x11-misc/synergy/Manifest
new file mode 100644
index 000000000000..a9d503a4b860
--- /dev/null
+++ b/x11-misc/synergy/Manifest
@@ -0,0 +1,3 @@
+DIST synergy-1.6.3.tar.gz 4405517 SHA256 93b1965b8e0cfc55cc654aab7053a58b9e730d09e68bbc520be32353a01dce1a SHA512 de67b0663c5ef411570f163208b2a295a8f16537dcc37a41a31039a2d01de083410c023b7f255664eb0c84f0290473690b638934082c2276ddce594126861165 WHIRLPOOL cb8737f0fe75105c9f5c8c371a5aef55c5eb8f1c419b3a7315ed66880e79c379efc6d7bced20c0d046bc281be935322def54f98d67e383d7236620a948ae1c14
+DIST synergy-1.7.3.tar.gz 13661943 SHA256 a4effc3ddb0ef6de95f83fa62b5290e2909f8b76729b1bde89c5061e5d381e25 SHA512 334cad16b843f0a6c1337960d76b37724bdb2a5f9841cffab4dbcbe6393cb0c4323860b64a15cccba1158763ef8cbea820900a5c53d0abbb6a92cfbeff827287 WHIRLPOOL c8e1587016b1fb930d8de9cb18a0fcfbf7423ab351c50bc7923da97b68008c57ef12bcd069cc2b15e87175ff1521a60af63dbb2bc09d94a4e45aec6994f035e5
+DIST synergy.png 26910 SHA256 c7e6cbaea549a189daed46c7170477772d932144ca20c9ea0db6859bd896f08c SHA512 0b5a1813c71fd2923adca4cf7b0f840fc37c73a2f18ad68f8bb2fd2ea312d9a884e2e2bcd78f6dd0f13d1f31ea3991379e141ec62d970a18c3a9c46b26720c5d WHIRLPOOL 7b3e7f9b05462fb536de0ca8d2257ea8abc0b2f17f0335d7eee73322f79a9ecccf729b992e58cd0965a9c9842f48020b6588cd4af47ea0f6d2b2cd7793c64e3a
diff --git a/x11-misc/synergy/files/synergy-1.4.16_p1969-pthread.patch b/x11-misc/synergy/files/synergy-1.4.16_p1969-pthread.patch
new file mode 100644
index 000000000000..adddf2f73b67
--- /dev/null
+++ b/x11-misc/synergy/files/synergy-1.4.16_p1969-pthread.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -141,6 +141,8 @@
+ 	check_library_exists("pthread" pthread_create "" HAVE_PTHREAD)
+ 	if (HAVE_PTHREAD)
+ 		list(APPEND libs pthread)
++		set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pthread")
++		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread")
+ 	else()
+ 		message(FATAL_ERROR "Missing library: pthread")
+ 	endif()
diff --git a/x11-misc/synergy/files/synergy-1.4.17_p2055-CSocketMultiplexer.patch b/x11-misc/synergy/files/synergy-1.4.17_p2055-CSocketMultiplexer.patch
new file mode 100644
index 000000000000..0e99fd3bce5d
--- /dev/null
+++ b/x11-misc/synergy/files/synergy-1.4.17_p2055-CSocketMultiplexer.patch
@@ -0,0 +1,13 @@
+http://synergy-project.org/spit/issues/details/2935/
+https://bugs.gentoo.org/show_bug.cgi?id=505978
+
+--- a/src/lib/net/SocketMultiplexer.cpp
++++ b/src/lib/net/SocketMultiplexer.cpp
+@@ -243,6 +243,7 @@
+ 		for (CSocketJobMap::iterator i = m_socketJobMap.begin();
+ 							i != m_socketJobMap.end();) {
+ 			if (*(i->second) == NULL) {
++				m_socketJobs.erase(i->second);
+ 				m_socketJobMap.erase(i++);
+ 				m_update = true;
+ 			}
diff --git a/x11-misc/synergy/files/synergy-1.4.17_p2055-cryptopp.patch b/x11-misc/synergy/files/synergy-1.4.17_p2055-cryptopp.patch
new file mode 100644
index 000000000000..59f85a9c29a0
--- /dev/null
+++ b/x11-misc/synergy/files/synergy-1.4.17_p2055-cryptopp.patch
@@ -0,0 +1,96 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -145,6 +145,10 @@
+ 	check_type_size(long SIZEOF_LONG)
+ 	check_type_size(short SIZEOF_SHORT)
+ 
++	set(CMAKE_REQUIRED_LIBRARIES crypto++)
++	set(CMAKE_REQUIRED_LIBRARIES)
++	set(CMAKE_INCLUDE_DIRECTORIES)
++
+ 	# pthread is used on both Linux and Mac
+ 	check_library_exists("pthread" pthread_create "" HAVE_PTHREAD)
+ 	if (HAVE_PTHREAD)
+--- a/ext/CMakeLists.txt
++++ b/ext/CMakeLists.txt
+@@ -13,47 +13,6 @@
+ # You should have received a copy of the GNU General Public License
+ # along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ 
+-set(cryptopp_dir cryptopp562)
+-
+-# only compile the crypto++ files we need.
+-set(cryptopp_src
+-	${cryptopp_dir}/3way.cpp
+-	${cryptopp_dir}/algparam.cpp
+-	${cryptopp_dir}/asn.cpp
+-	${cryptopp_dir}/authenc.cpp
+-	${cryptopp_dir}/basecode.cpp
+-	${cryptopp_dir}/cpu.cpp
+-	${cryptopp_dir}/cryptlib.cpp
+-	${cryptopp_dir}/des.cpp
+-	${cryptopp_dir}/dessp.cpp
+-	${cryptopp_dir}/dll.cpp
+-	${cryptopp_dir}/ec2n.cpp
+-	${cryptopp_dir}/ecp.cpp
+-	${cryptopp_dir}/filters.cpp
+-	${cryptopp_dir}/fips140.cpp
+-	${cryptopp_dir}/gcm.cpp
+-	${cryptopp_dir}/gf2n.cpp
+-	${cryptopp_dir}/gfpcrypt.cpp
+-	${cryptopp_dir}/hex.cpp
+-	${cryptopp_dir}/hmac.cpp
+-	${cryptopp_dir}/hrtimer.cpp
+-	${cryptopp_dir}/integer.cpp
+-	${cryptopp_dir}/iterhash.cpp
+-	${cryptopp_dir}/misc.cpp
+-	${cryptopp_dir}/modes.cpp
+-	${cryptopp_dir}/mqueue.cpp
+-	${cryptopp_dir}/nbtheory.cpp
+-	${cryptopp_dir}/oaep.cpp
+-	${cryptopp_dir}/osrng.cpp
+-	${cryptopp_dir}/pubkey.cpp
+-	${cryptopp_dir}/queue.cpp
+-	${cryptopp_dir}/randpool.cpp
+-	${cryptopp_dir}/rdtables.cpp
+-	${cryptopp_dir}/rijndael.cpp
+-	${cryptopp_dir}/rng.cpp
+-	${cryptopp_dir}/sha.cpp
+-)
+-
+ # if 64-bit windows, compile asm file.
+ if (CMAKE_CL_64)
+ 	list(APPEND cryptopp_src ${cryptopp_dir}/x64dll.asm ${cryptopp_dir}/x64masm.asm)
+@@ -87,10 +46,3 @@
+ 		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=${CRYPTOPP_ARCH}")
+ 	endif()
+ endif()
+-
+-add_library(cryptopp STATIC ${cryptopp_src})
+-
+-if (UNIX)
+-	# ignore warnings in crypto++
+-	set_target_properties(cryptopp PROPERTIES COMPILE_FLAGS "-w")
+-endif()
+--- a/src/lib/io/CryptoMode_cryptopp.h
++++ b/src/lib/io/CryptoMode_cryptopp.h
+@@ -25,6 +25,6 @@
+ #	pragma GCC system_header
+ #endif 
+ 
+-#include <cryptopp562/gcm.h>
+-#include <cryptopp562/modes.h>
+-#include <cryptopp562/aes.h>
++#include <crypto++/gcm.h>
++#include <crypto++/modes.h>
++#include <crypto++/aes.h>
+--- a/src/lib/io/CryptoStream_cryptopp.h
++++ b/src/lib/io/CryptoStream_cryptopp.h
+@@ -25,5 +25,5 @@
+ #	pragma GCC system_header
+ #endif
+ 
+-#include <cryptopp562/osrng.h>
+-#include <cryptopp562/sha.h>
++#include <crypto++/osrng.h>
++#include <crypto++/sha.h>
diff --git a/x11-misc/synergy/files/synergy-1.4.17_p2055-gentoo.patch b/x11-misc/synergy/files/synergy-1.4.17_p2055-gentoo.patch
new file mode 100644
index 000000000000..89f46f3c9af0
--- /dev/null
+++ b/x11-misc/synergy/files/synergy-1.4.17_p2055-gentoo.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -77,7 +77,7 @@
+ 
+ 	# warnings as errors:
+ 	# we have a problem with people checking in code with warnings.
+-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
++	#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
+ 
+ 	# For config.h, detect the libraries, functions, etc.
+ 	include(CheckIncludeFiles)
diff --git a/x11-misc/synergy/files/synergy-1.4.17_p2055-test.patch b/x11-misc/synergy/files/synergy-1.4.17_p2055-test.patch
new file mode 100644
index 000000000000..e0e25c2e128b
--- /dev/null
+++ b/x11-misc/synergy/files/synergy-1.4.17_p2055-test.patch
@@ -0,0 +1,33 @@
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -19,6 +19,6 @@
+ add_subdirectory(plugin)
+ add_subdirectory(micro)
+ 
+-if (NOT ${CMAKE_SYSTEM_NAME} MATCHES "IRIX")
++if (${WITH_GENTOO_TEST} MATCHES "ON")
+ 	add_subdirectory(test)
+ endif()
+--- a/src/test/CMakeLists.txt
++++ b/src/test/CMakeLists.txt
+@@ -14,20 +14,5 @@
+ # You should have received a copy of the GNU General Public License
+ # along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ 
+-include_directories(
+-	../../ext/gtest-1.6.0
+-	../../ext/gtest-1.6.0/include
+-	../../ext/gmock-1.6.0
+-	../../ext/gmock-1.6.0/include)
+-	
+-add_library(gtest STATIC ../../ext/gtest-1.6.0/src/gtest-all.cc)
+-add_library(gmock STATIC ../../ext/gmock-1.6.0/src/gmock-all.cc)
+-
+-if (UNIX)
+-	# ignore warnings in gtest and gmock
+-	set_target_properties(gtest PROPERTIES COMPILE_FLAGS "-w")
+-	set_target_properties(gmock PROPERTIES COMPILE_FLAGS "-w")
+-endif()
+-
+ add_subdirectory(integtests)
+ add_subdirectory(unittests)
diff --git a/x11-misc/synergy/metadata.xml b/x11-misc/synergy/metadata.xml
new file mode 100644
index 000000000000..e3df9aad5ab5
--- /dev/null
+++ b/x11-misc/synergy/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>desktop-misc</herd>
+	<upstream>
+		<remote-id type="google-code">synergy</remote-id>
+		<remote-id type="github">synergy/synergy</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-misc/synergy/synergy-1.6.3.ebuild b/x11-misc/synergy/synergy-1.6.3.ebuild
new file mode 100644
index 000000000000..b949a61d0d0c
--- /dev/null
+++ b/x11-misc/synergy/synergy-1.6.3.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils flag-o-matic gnome2-utils cmake-utils qt4-r2
+
+DESCRIPTION="Lets you easily share a single mouse and keyboard between multiple computers"
+HOMEPAGE="http://synergy-project.org/ https://github.com/synergy/synergy"
+SRC_URI="
+	https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+	http://dev.gentoo.org/~hasufell/distfiles/${PN}.png
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ppc ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="qt4 test"
+
+COMMON_DEPEND="
+	>=dev-libs/crypto++-5.6.2
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXi
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	x11-libs/libXtst
+	qt4? (
+		dev-qt/qtcore:4
+		dev-qt/qtgui:4
+		net-dns/avahi[mdnsresponder-compat]
+	)
+"
+DEPEND="
+	${COMMON_DEPEND}
+	test? ( >=dev-cpp/gmock-1.6.0 )
+	x11-proto/kbproto
+	x11-proto/randrproto
+	x11-proto/xextproto
+	x11-proto/xineramaproto
+	x11-proto/xproto
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	qt4? ( !x11-misc/qsynergy )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.4.16_p1969-pthread.patch"
+	"${FILESDIR}/${PN}-1.4.17_p2055-cryptopp.patch"
+	"${FILESDIR}/${PN}-1.4.17_p2055-test.patch"
+	"${FILESDIR}/${PN}-1.4.17_p2055-gentoo.patch"
+	"${FILESDIR}/${PN}-1.4.17_p2055-CSocketMultiplexer.patch"
+)
+
+src_prepare() {
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=$(cmake-utils_use_with test GENTOO_TEST)
+	cmake-utils_src_configure
+
+	if use qt4 ; then
+		cd src/gui || die
+		qt4-r2_src_configure
+	fi
+}
+
+src_compile() {
+	cmake-utils_src_compile
+
+	if use qt4 ; then
+		cd src/gui || die
+		qt4-r2_src_compile
+	fi
+}
+
+src_test() {
+	local exe fail
+	for exe in bin/integtests bin/unittests; do
+		${exe} || fail+=" ${exe}"
+	done
+	[[ ${fail} ]] && ewarn "${fail} failed"
+}
+
+src_install () {
+	dobin bin/${PN}{c,s}
+
+	if use qt4 ; then
+		newbin bin/${PN} qsynergy
+		newicon -s 256 "${DISTDIR}"/${PN}.png q${PN}.png
+		make_desktop_entry q${PN} ${PN/s/S} q${PN} Utility;
+	fi
+
+	insinto /etc
+	newins doc/synergy.conf.example synergy.conf
+
+	newman doc/${PN}c.man ${PN}c.1
+	newman doc/${PN}s.man ${PN}s.1
+
+	dodoc README doc/synergy.conf.example* ChangeLog
+}
+
+pkg_preinst() {
+	use qt4 && gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	use qt4 && gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	use qt4 && gnome2_icon_cache_update
+}
diff --git a/x11-misc/synergy/synergy-1.7.3.ebuild b/x11-misc/synergy/synergy-1.7.3.ebuild
new file mode 100644
index 000000000000..2a781dd6a1a3
--- /dev/null
+++ b/x11-misc/synergy/synergy-1.7.3.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils flag-o-matic gnome2-utils cmake-utils qt4-r2
+
+DESCRIPTION="Lets you easily share a single mouse and keyboard between multiple computers"
+HOMEPAGE="http://synergy-project.org/ https://github.com/synergy/synergy"
+SRC_URI="
+	https://github.com/${PN}/${PN}/archive/v${PV}-stable.tar.gz -> ${P}.tar.gz
+	http://dev.gentoo.org/~hasufell/distfiles/${PN}.png
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="qt4 test"
+
+S=${WORKDIR}/${P}-stable
+
+COMMON_DEPEND="
+	dev-libs/openssl
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXi
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	x11-libs/libXtst
+	qt4? (
+		dev-qt/qtcore:4
+		dev-qt/qtgui:4
+		net-dns/avahi[mdnsresponder-compat]
+	)
+"
+DEPEND="
+	${COMMON_DEPEND}
+	test? ( >=dev-cpp/gmock-1.6.0 )
+	x11-proto/kbproto
+	x11-proto/randrproto
+	x11-proto/xextproto
+	x11-proto/xineramaproto
+	x11-proto/xproto
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	qt4? ( !x11-misc/qsynergy )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.4.16_p1969-pthread.patch"
+	"${FILESDIR}/${PN}-1.4.17_p2055-test.patch"
+	"${FILESDIR}/${PN}-1.4.17_p2055-gentoo.patch"
+	"${FILESDIR}/${PN}-1.4.17_p2055-CSocketMultiplexer.patch"
+)
+
+src_prepare() {
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=$(cmake-utils_use_with test GENTOO_TEST)
+	cmake-utils_src_configure
+
+	if use qt4 ; then
+		cd src/gui || die
+		qt4-r2_src_configure
+	fi
+}
+
+src_compile() {
+	cmake-utils_src_compile
+
+	if use qt4 ; then
+		cd src/gui || die
+		qt4-r2_src_compile
+	fi
+}
+
+src_test() {
+	local exe fail
+	for exe in bin/integtests bin/unittests; do
+		${exe} || fail+=" ${exe}"
+	done
+	[[ ${fail} ]] && ewarn "${fail} failed"
+}
+
+src_install () {
+	dobin bin/${PN}{c,s} bin/syntool
+
+	if use qt4 ; then
+		newbin bin/${PN} qsynergy
+		newicon -s 256 "${DISTDIR}"/${PN}.png q${PN}.png
+		make_desktop_entry q${PN} ${PN/s/S} q${PN} Utility;
+	fi
+
+	insinto /etc
+	newins doc/synergy.conf.example synergy.conf
+
+	newman doc/${PN}c.man ${PN}c.1
+	newman doc/${PN}s.man ${PN}s.1
+
+	dodoc README doc/synergy.conf.example* ChangeLog
+}
+
+pkg_preinst() {
+	use qt4 && gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	use qt4 && gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	use qt4 && gnome2_icon_cache_update
+}
diff --git a/x11-misc/tabbed/Manifest b/x11-misc/tabbed/Manifest
new file mode 100644
index 000000000000..3e233c239029
--- /dev/null
+++ b/x11-misc/tabbed/Manifest
@@ -0,0 +1 @@
+DIST tabbed-0.6.tar.gz 12926 SHA256 7651ea3acbec5d6a25469e8665da7fc70aba2b4fa61a2a6a5449eafdfd641c42 SHA512 bcad873251be6b5de21311531e8d24330003b42790cb94d559a0d1be45408b3e0722c14e7c7f2cefd0717fd2a2d7a100fa08fc4e10e7bb669935909602286553 WHIRLPOOL 072ef8b28907958da40b44b07c40e753459851a11a9e9708fa97de27768841580a39dd16018dd6c8d2949b23fabd9cc1152f41462226094d1d501aed1f1f35cd
diff --git a/x11-misc/tabbed/metadata.xml b/x11-misc/tabbed/metadata.xml
new file mode 100644
index 000000000000..d6e0a0f7eded
--- /dev/null
+++ b/x11-misc/tabbed/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>desktop-misc</herd>
+<maintainer>
+<email>jer@gentoo.org</email>
+<name>Jeroen Roovers</name>
+</maintainer>
+</pkgmetadata>
+
diff --git a/x11-misc/tabbed/tabbed-0.6.ebuild b/x11-misc/tabbed/tabbed-0.6.ebuild
new file mode 100644
index 000000000000..de4295939f29
--- /dev/null
+++ b/x11-misc/tabbed/tabbed-0.6.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit savedconfig toolchain-funcs
+
+DESCRIPTION="Simple generic tabbed fronted to xembed aware applications"
+HOMEPAGE="http://tools.suckless.org/tabbed"
+SRC_URI="http://dl.suckless.org/tools/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/libX11"
+DEPEND="
+	x11-proto/xproto
+	${RDEPEND}
+"
+
+src_prepare() {
+	sed config.mk \
+		-e '/^CC/d' \
+		-e 's|/usr/local|/usr|g' \
+		-e 's|^CFLAGS.*|CFLAGS += -std=c99 -pedantic -Wall $(INCS) $(CPPFLAGS)|g' \
+		-e 's|^LDFLAGS.*|LDFLAGS += $(CFLAGS) $(LIBS)|g' \
+		-e 's|^LIBS.*|LIBS = -lX11|g' \
+		-e 's|{|(|g;s|}|)|g' \
+		-i || die
+
+	sed Makefile \
+		-e 's|{|(|g;s|}|)|g' \
+		-e '/^[[:space:]]*@echo/d' \
+		-e 's|^	@|	|g' \
+		-i || die
+
+	restore_config config.h
+}
+
+src_compile() {
+	emake CC=$(tc-getCC)
+}
+src_install() {
+	default
+	save_config config.h
+}
diff --git a/x11-misc/tint2/Manifest b/x11-misc/tint2/Manifest
new file mode 100644
index 000000000000..d76be0515621
--- /dev/null
+++ b/x11-misc/tint2/Manifest
@@ -0,0 +1 @@
+DIST tint2-0.11.tar.bz2 91716 SHA256 fe106e6a6057d2631abddde9f82d3fd4fb1985c4fb93f10d3886417a9e22471d SHA512 db88c17780d24b82badbedbce4518d736dfcb2a730ff500bcb36f2b32f65271c2424f0c2a34981f9d3af033b84252db0c8217e2dd7ca57f9a0eadbc98796115c WHIRLPOOL 4c497995bc5713199a8e624ebfa463edbd610b6d948f1cbfce11ec78e4cd2cd6fad51bd58937b0fce343bb86a29a35bc40eec2bafb687c6ee89355bceb5486ec
diff --git a/x11-misc/tint2/files/battery_segfault.patch b/x11-misc/tint2/files/battery_segfault.patch
new file mode 100644
index 000000000000..3f933e2f5223
--- /dev/null
+++ b/x11-misc/tint2/files/battery_segfault.patch
@@ -0,0 +1,20 @@
+Index: battery.c
+===================================================================
+--- src/battery/battery.c	(revision 575)
++++ src/battery/battery.c	(revision 576)
+@@ -194,8 +194,14 @@
+ 		}
+ 		g_free(path2);
+ 	}
++
++	path_current_now = g_build_filename(battery_dir, "power_now", NULL);
++	if (!g_file_test (path_current_now, G_FILE_TEST_EXISTS)) {
++		g_free(path_current_now);
++		path_current_now = g_build_filename(battery_dir, "current_now", NULL);
++	}
++
+ 	if (path_energy_now && path_energy_full) {
+-		path_current_now = g_build_filename(battery_dir, "current_now", NULL);
+ 		path_status = g_build_filename(battery_dir, "status", NULL);
+ 
+ 		// check file
diff --git a/x11-misc/tint2/metadata.xml b/x11-misc/tint2/metadata.xml
new file mode 100644
index 000000000000..1531b9302030
--- /dev/null
+++ b/x11-misc/tint2/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>amynka@gentoo.org</email>
+	</maintainer>
+	<use>
+		<flag name="examples">Install tint2rc examples</flag>
+		<flag name="battery">Enable battery status plugin</flag>
+		<flag name="tint2conf">Build/Install tint2conf as well</flag>
+	</use>
+	<longdescription lang="en">tint2 is a simple panel/taskbar intentionally made for 
+		<pkg>
+			openbox</pkg>3, but should also work with other window managers.
+		It's based on ttm code http://code.google.com/p/ttm/.
+		The goal is to keep a clean and unintrusive look with code lightweight and compliance with freedesktop specifications.</longdescription>
+	<upstream>
+		<remote-id type="google-code">tint2</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-misc/tint2/tint2-0.11-r1.ebuild b/x11-misc/tint2/tint2-0.11-r1.ebuild
new file mode 100644
index 000000000000..175f52218cf5
--- /dev/null
+++ b/x11-misc/tint2/tint2-0.11-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="3"
+
+inherit cmake-utils eutils
+
+MY_P="${PN}-${PV/_/-}"
+
+DESCRIPTION="A lightweight panel/taskbar"
+HOMEPAGE="https://gitlab.com/o9000/tint2"
+SRC_URI="http://tint2.googlecode.com/files/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="battery examples tint2conf"
+
+COMMON_DEPEND="dev-libs/glib:2
+	x11-libs/cairo
+	x11-libs/pango[X]
+	x11-libs/libX11
+	x11-libs/libXinerama
+	x11-libs/libXdamage
+	x11-libs/libXcomposite
+	x11-libs/libXrender
+	x11-libs/libXrandr
+	media-libs/imlib2[X]"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+	x11-proto/xineramaproto"
+RDEPEND="${COMMON_DEPEND}
+	tint2conf? ( x11-misc/tintwizard )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	epatch "${FILESDIR}/battery_segfault.patch" # bug 343963
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_enable battery BATTERY)
+		$(cmake-utils_use_enable examples EXAMPLES)
+		$(cmake-utils_use_enable tint2conf TINT2CONF)
+
+		# bug 296890
+		"-DDOCDIR=/usr/share/doc/${PF}"
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	rm -f "${D}/usr/bin/tintwizard.py"
+}
diff --git a/x11-misc/tint2/tint2-0.11-r2.ebuild b/x11-misc/tint2/tint2-0.11-r2.ebuild
new file mode 100644
index 000000000000..bc4d1377738d
--- /dev/null
+++ b/x11-misc/tint2/tint2-0.11-r2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit cmake-utils
+
+MY_P="${PN}-${PV/_/-}"
+
+DESCRIPTION="A lightweight panel/taskbar"
+HOMEPAGE="https://gitlab.com/o9000/tint2"
+SRC_URI="http://tint2.googlecode.com/files/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="battery examples tint2conf"
+
+COMMON_DEPEND="dev-libs/glib:2
+	x11-libs/cairo
+	x11-libs/pango[X]
+	x11-libs/libX11
+	x11-libs/libXinerama
+	x11-libs/libXdamage
+	x11-libs/libXcomposite
+	x11-libs/libXrender
+	x11-libs/libXrandr
+	media-libs/imlib2[X]"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+	x11-proto/xineramaproto"
+RDEPEND="${COMMON_DEPEND}
+	tint2conf? ( x11-misc/tintwizard )"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=( "${FILESDIR}/battery_segfault.patch" ) # bug 343963
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_enable battery BATTERY)
+		$(cmake-utils_use_enable examples EXAMPLES)
+		$(cmake-utils_use_enable tint2conf TINT2CONF)
+
+		# bug 296890
+		"-DDOCDIR=/usr/share/doc/${PF}"
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	rm -f "${D}/usr/bin/tintwizard.py"
+}
diff --git a/x11-misc/tintwizard/Manifest b/x11-misc/tintwizard/Manifest
new file mode 100644
index 000000000000..735ce1ea5b97
--- /dev/null
+++ b/x11-misc/tintwizard/Manifest
@@ -0,0 +1 @@
+DIST tintwizard-0.3.4.tar.gz 22918 SHA256 ca527f1068307a81b5c588f199979a578d4b3679a1fcd451e7d368ed7f8bb890
diff --git a/x11-misc/tintwizard/metadata.xml b/x11-misc/tintwizard/metadata.xml
new file mode 100644
index 000000000000..6f6d944a179d
--- /dev/null
+++ b/x11-misc/tintwizard/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
+	<longdescription lang="en">This project aims to provide an easy way to change the appearance of
+		tint2. Through an easy-to-use graphical user interface, you can generate
+		configs and apply to them tint2.</longdescription>
+	<upstream>
+		<remote-id type="google-code">tintwizard</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-misc/tintwizard/tintwizard-0.3.4-r1.ebuild b/x11-misc/tintwizard/tintwizard-0.3.4-r1.ebuild
new file mode 100644
index 000000000000..6aedeba4f5fd
--- /dev/null
+++ b/x11-misc/tintwizard/tintwizard-0.3.4-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="3"
+
+PYTHON_DEPEND="2"
+
+inherit python
+
+DESCRIPTION="GUI wizard which generates config files for tint2 panels"
+HOMEPAGE="http://code.google.com/p/tintwizard/"
+SRC_URI="http://tintwizard.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="x11-misc/tint2
+	dev-python/pygtk:2"
+
+src_prepare() {
+	python_convert_shebangs 2 tintwizard.py
+}
+
+src_install() {
+	dodoc ChangeLog
+
+	dobin tintwizard.py || die
+	dosym /usr/bin/tintwizard.py /usr/bin/tintwizard || die
+}
diff --git a/x11-misc/tinymount/Manifest b/x11-misc/tinymount/Manifest
new file mode 100644
index 000000000000..88116742fcf7
--- /dev/null
+++ b/x11-misc/tinymount/Manifest
@@ -0,0 +1 @@
+DIST tinymount-0.2.8.tar.gz 28176 SHA256 c3aae8e77d32818cbb52a186924bfd0b22fdf45e6e5c73bff56ea478c45fe9ba SHA512 22a958938ce4b4d34d6edd037594945e91d37499264d7907c79c220bd38243b9e4e7b422b00cacc0af991fac9e7d9022d932042df7a65ef9339f351e9b94c758 WHIRLPOOL bbe0e3a5e7b8b595b0c870e0c68fb99bd2852ada2c5f246d5e3efca7689c57765e6f1f1bb1f524ef6367aa26a3b48c4f3468966f21f7808ba108ce28e3d4cac0
diff --git a/x11-misc/tinymount/files/tinymount-0.2.6-libnotify.patch b/x11-misc/tinymount/files/tinymount-0.2.6-libnotify.patch
new file mode 100644
index 000000000000..9032d3a3eb5a
--- /dev/null
+++ b/x11-misc/tinymount/files/tinymount-0.2.6-libnotify.patch
@@ -0,0 +1,15 @@
+# Don't build with libnotify unconditionally
+# bug #442048
+diff --git a/src/src.pro b/src/src.pro
+index 6a676cd..6b8c2f1 100644
+--- a/src/src.pro
++++ b/src/src.pro
+@@ -63,8 +63,6 @@ RESOURCES += tinymount.qrc
+ 
+ TRANSLATIONS = translations/tinymount_ru.ts
+ 
+-CONFIG += with_libnotify
+-
+ with_libnotify {
+     DEFINES += WITH_LIBNOTIFY
+     CONFIG += link_pkgconfig
diff --git a/x11-misc/tinymount/metadata.xml b/x11-misc/tinymount/metadata.xml
new file mode 100644
index 000000000000..102f7269c2c8
--- /dev/null
+++ b/x11-misc/tinymount/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>qt</herd>
+  <herd>desktop-misc</herd>
+  <herd>proxy-maintainers</herd>
+  <maintainer>
+    <email>limanski@narod.ru</email>
+    <name>Mike Limansky</name>
+    <description>Both upstream and ebuild author</description>
+  </maintainer>
+  <maintainer>
+    <email>ssuominen@gentoo.org</email>
+    <name>Samuli Suominen</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">limansky/tinymount</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/x11-misc/tinymount/tinymount-0.2.8.ebuild b/x11-misc/tinymount/tinymount-0.2.8.ebuild
new file mode 100644
index 000000000000..0bad1c60fcde
--- /dev/null
+++ b/x11-misc/tinymount/tinymount-0.2.8.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PLOCALES="ru uk"
+inherit l10n qt4-r2
+
+if [[ ${PV} == *9999 ]]; then
+	EGIT_REPO_URI=("https://github.com/limansky/${PN}.git")
+	inherit git-r3
+else
+	SRC_URI="https://github.com/limansky/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Simple graphical utility for disk mounting"
+HOMEPAGE="https://github.com/limansky/tinymount"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug libnotify"
+
+COMMON_DEPEND="
+	dev-qt/qtcore:4
+	dev-qt/qtdbus:4
+	dev-qt/qtgui:4
+	libnotify? ( x11-libs/libnotify )"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig"
+RDEPEND="${COMMON_DEPEND}
+	sys-fs/udisks:0"
+
+DOCS=( ChangeLog README.md )
+
+src_prepare() {
+	remove_locale() {
+		sed -i -e "/translations\/${PN}_${1}.ts/d" src/src.pro || die
+	}
+
+	# Check for locales added/removed from previous version
+	l10n_find_plocales_changes src/translations "${PN}_" .ts
+
+	# Prevent disabled locales from being built
+	l10n_for_each_disabled_locale_do remove_locale
+
+	# Bug 441986
+	sed -i -e 's|-Werror||g' src/src.pro || die
+
+	qt4-r2_src_prepare
+}
+
+src_configure() {
+	eqmake4 \
+		PREFIX="${EPREFIX}/usr" \
+		$(use libnotify && echo CONFIG+=with_libnotify)
+}
diff --git a/x11-misc/tinynotify-send/Manifest b/x11-misc/tinynotify-send/Manifest
new file mode 100644
index 000000000000..9eb82a78331e
--- /dev/null
+++ b/x11-misc/tinynotify-send/Manifest
@@ -0,0 +1 @@
+DIST tinynotify-send-1.2.1.tar.bz2 266078 SHA256 72c5f4451348b0a06dd57efb5de75273e47f7e35ae04df9a3dd1c64be1e71e65 SHA512 f416db09fa95f04d771610af7ae8953192027b8606c53f54efe514c4d33b59e8dc362676004a036c2dd7e7c7cf03b077ee9b753839efbcb181c5724f43efa58d WHIRLPOOL 2e82b67111db19aa52e293feea167e53ef73bf04a043049543082cf9eea64f75bbfe9788e323dd19d081b5cab43ff469e370810fd6bbc70707329cacfb560411
diff --git a/x11-misc/tinynotify-send/metadata.xml b/x11-misc/tinynotify-send/metadata.xml
new file mode 100644
index 000000000000..feaa57e4dc77
--- /dev/null
+++ b/x11-misc/tinynotify-send/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
+	<upstream>
+		<maintainer status="active">
+			<email>mgorny@gentoo.org</email>
+			<name>Michał Górny</name>
+		</maintainer>
+		<bugs-to>https://bitbucket.org/mgorny/tinynotify-send/issues/</bugs-to>
+		<remote-id type="bitbucket">mgorny/tinynotify-send</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-misc/tinynotify-send/tinynotify-send-1.2.1-r1.ebuild b/x11-misc/tinynotify-send/tinynotify-send-1.2.1-r1.ebuild
new file mode 100644
index 000000000000..0581268d49ff
--- /dev/null
+++ b/x11-misc/tinynotify-send/tinynotify-send-1.2.1-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit autotools-utils
+
+DESCRIPTION="A notification sending utility (using libtinynotify)"
+HOMEPAGE="https://bitbucket.org/mgorny/tinynotify-send/"
+SRC_URI="https://www.bitbucket.org/mgorny/${PN}/downloads/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="app-eselect/eselect-notify-send
+	x11-libs/libtinynotify
+	~x11-libs/libtinynotify-cli-${PV}"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_configure() {
+	myeconfargs=(
+		--disable-library
+		--enable-regular
+		--disable-system-wide
+		--with-system-wide-exec=/usr/bin/sw-notify-send
+	)
+
+	autotools-utils_src_configure
+}
+
+pkg_postinst() {
+	eselect notify-send update ifunset
+}
+
+pkg_postrm() {
+	eselect notify-send update ifunset
+}
diff --git a/x11-misc/tinynotify-send/tinynotify-send-9999.ebuild b/x11-misc/tinynotify-send/tinynotify-send-9999.ebuild
new file mode 100644
index 000000000000..3218ad6198d4
--- /dev/null
+++ b/x11-misc/tinynotify-send/tinynotify-send-9999.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+#if LIVE
+AUTOTOOLS_AUTORECONF=yes
+EGIT_REPO_URI="http://bitbucket.org/mgorny/${PN}.git"
+
+inherit git-r3
+#endif
+
+inherit autotools-utils
+
+DESCRIPTION="A notification sending utility (using libtinynotify)"
+HOMEPAGE="https://bitbucket.org/mgorny/tinynotify-send/"
+SRC_URI="https://www.bitbucket.org/mgorny/${PN}/downloads/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="app-eselect/eselect-notify-send
+	x11-libs/libtinynotify:0=
+	~x11-libs/libtinynotify-cli-${PV}"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+#if LIVE
+KEYWORDS=
+SRC_URI=
+DEPEND="${DEPEND}
+	dev-util/gtk-doc"
+#endif
+
+src_configure() {
+	myeconfargs=(
+		--disable-library
+		--enable-regular
+		--disable-system-wide
+		--with-system-wide-exec=/usr/bin/sw-notify-send
+	)
+
+	autotools-utils_src_configure
+}
+
+pkg_postinst() {
+	eselect notify-send update ifunset
+}
+
+pkg_postrm() {
+	eselect notify-send update ifunset
+}
diff --git a/x11-misc/touchcal/Manifest b/x11-misc/touchcal/Manifest
new file mode 100644
index 000000000000..add475d58c84
--- /dev/null
+++ b/x11-misc/touchcal/Manifest
@@ -0,0 +1 @@
+DIST touchcal-0.50.tar.gz 94641 RMD160 02f76284e92ca5cf9b0a78b46027aa78d53d09a3 SHA1 3eb2a6272ade4bc4f519893c3247d94bfb16db1b SHA256 f76d60f14fa24834347c3b1f5ae9f9976baa48ee0408f246ff0e18bb73df34da
diff --git a/x11-misc/touchcal/metadata.xml b/x11-misc/touchcal/metadata.xml
new file mode 100644
index 000000000000..e4c3af14ebcb
--- /dev/null
+++ b/x11-misc/touchcal/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">touchcal</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-misc/touchcal/touchcal-0.50.ebuild b/x11-misc/touchcal/touchcal-0.50.ebuild
new file mode 100644
index 000000000000..60c8b047fc02
--- /dev/null
+++ b/x11-misc/touchcal/touchcal-0.50.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+DESCRIPTION="Touchscreen calibration utility"
+HOMEPAGE="http://touchcal.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND="sys-libs/ncurses"
+RDEPEND="${DEPEND}"
diff --git a/x11-misc/touchfreeze/Manifest b/x11-misc/touchfreeze/Manifest
new file mode 100644
index 000000000000..9ee6349fa077
--- /dev/null
+++ b/x11-misc/touchfreeze/Manifest
@@ -0,0 +1 @@
+DIST touchfreeze-0.2.5.tar.gz 24023 SHA256 8b1a142dc37e8f14d1b2f81b5b47526842ce2867f4dc490d71eec21572ceda2f
diff --git a/x11-misc/touchfreeze/files/touchfreeze-0.2.5-underlinking.patch b/x11-misc/touchfreeze/files/touchfreeze-0.2.5-underlinking.patch
new file mode 100644
index 000000000000..e9f331307680
--- /dev/null
+++ b/x11-misc/touchfreeze/files/touchfreeze-0.2.5-underlinking.patch
@@ -0,0 +1,7 @@
+--- TouchFreeze.pro
++++ TouchFreeze.pro
+@@ -3,3 +3,4 @@
+ RESOURCES+=stuff.qrc
+ SOURCES+=main.cpp TouchFreezeApp.cpp TouchFreezeUI.cpp SynDaemon.cpp
+ HEADERS+=TouchFreezeApp.h TouchFreezeUI.h SynDaemon.h Version.h
++LIBS+=-lX11
diff --git a/x11-misc/touchfreeze/metadata.xml b/x11-misc/touchfreeze/metadata.xml
new file mode 100644
index 000000000000..dc439f7e84f5
--- /dev/null
+++ b/x11-misc/touchfreeze/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>qt</herd>
+</pkgmetadata>
diff --git a/x11-misc/touchfreeze/touchfreeze-0.2.5-r1.ebuild b/x11-misc/touchfreeze/touchfreeze-0.2.5-r1.ebuild
new file mode 100644
index 000000000000..57ac2f3cc608
--- /dev/null
+++ b/x11-misc/touchfreeze/touchfreeze-0.2.5-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit eutils qt4-r2
+
+DESCRIPTION="X11 touch pad driver configuration utility"
+HOMEPAGE="http://kde-apps.org/content/show.php/TouchFreeze?content=61442"
+SRC_URI="http://www.fit.vutbr.cz/~kombrink/personal/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="debug"
+
+DEPEND="x11-libs/libX11
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4
+"
+RDEPEND="${DEPEND}
+	x11-drivers/xf86-input-synaptics
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-underlinking.patch
+)
+
+src_install() {
+	dobin ${PN}
+	newicon res/touchpad.svg ${PN}.svg
+	dodoc AUTHORS README
+	make_desktop_entry ${PN} TouchFreeze ${PN} 'Qt;System'
+}
diff --git a/x11-misc/trayer-srg/Manifest b/x11-misc/trayer-srg/Manifest
new file mode 100644
index 000000000000..898c501b26d0
--- /dev/null
+++ b/x11-misc/trayer-srg/Manifest
@@ -0,0 +1,2 @@
+DIST trayer-srg-1.1.5.tar.gz 27322 SHA256 98804500188c0bb99c7389ebea4b2e4dfffa2f3d06dc97e633b4934cf7c29757 SHA512 143277849c19f0caf8fcfb7c0e49f6caa1aec35e12a52cc9a92bdab0f64a9112334d998eb107e587755212d4421ff303582052206ac916b35f1e06e3e1d23277 WHIRLPOOL 37be63aa199a3c9271a7dbcc18c7b6639e81c746e9ba8cd772eb3f229723fad254c2d457ff6120278401124d98f0934857c2fb46fff5872518edc20d8af5fe19
+DIST trayer-srg-1.1.6.tar.gz 27576 SHA256 70acdf466e03a69715f8b90296ecbb14c5e8594f64a94d4b1ad1f5ba6b146a2e SHA512 456af94277dc237c516fff1589060b0b656040811ae48bba3c021be6310d104881c0eee7391d228d197db78e9bfb04773d4282ab2fe31717a4779b38bdb6739d WHIRLPOOL 6dc5394db31d73e6f8e28b4a86f0262108f946e2f0b111af3bd7c774cc84ea0b90e0eb0ba869c24b1dcdf477280dfaed10cf2c598ba5d075c372a28736434574
diff --git a/x11-misc/trayer-srg/metadata.xml b/x11-misc/trayer-srg/metadata.xml
new file mode 100644
index 000000000000..6616aa14aecc
--- /dev/null
+++ b/x11-misc/trayer-srg/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>xmw@gentoo.org</email>
+		<name>Michael Weber</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">sargon/trayer-srg</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-misc/trayer-srg/trayer-srg-1.1.5.ebuild b/x11-misc/trayer-srg/trayer-srg-1.1.5.ebuild
new file mode 100644
index 000000000000..95765bb1f103
--- /dev/null
+++ b/x11-misc/trayer-srg/trayer-srg-1.1.5.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit toolchain-funcs vcs-snapshot
+
+DESCRIPTION="trayer fork with multi monitor support, cleaned up codebase and other fancy stuff"
+HOMEPAGE="https://github.com/sargon/trayer-srg"
+SRC_URI="https://github.com/sargon/${PN}/tarball/${P/-srg/} -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:2
+	x11-libs/libX11
+	x11-libs/libXmu"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_compile() {
+	emake DEVEL=1 TARGET=${PN} CC="$(tc-getCC)"
+}
+
+src_install() {
+	dobin ${PN}
+	dodoc CHANGELOG CREDITS README TODO
+}
diff --git a/x11-misc/trayer-srg/trayer-srg-1.1.6.ebuild b/x11-misc/trayer-srg/trayer-srg-1.1.6.ebuild
new file mode 100644
index 000000000000..7269d23666c5
--- /dev/null
+++ b/x11-misc/trayer-srg/trayer-srg-1.1.6.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit toolchain-funcs vcs-snapshot
+
+DESCRIPTION="trayer fork with multi monitor support, cleaned up codebase and other fancy stuff"
+HOMEPAGE="https://github.com/sargon/trayer-srg"
+SRC_URI="https://github.com/sargon/${PN}/tarball/${P/-srg/} -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:2
+	x11-libs/libX11
+	x11-libs/libXmu"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_compile() {
+	emake DEVEL=1 TARGET=${PN} CC="$(tc-getCC)"
+}
+
+src_install() {
+	dobin ${PN}
+	dodoc CHANGELOG CREDITS README TODO
+}
diff --git a/x11-misc/trayer/Manifest b/x11-misc/trayer/Manifest
new file mode 100644
index 000000000000..31fdf081bc31
--- /dev/null
+++ b/x11-misc/trayer/Manifest
@@ -0,0 +1 @@
+DIST trayer-1.0.tar.gz 30445 SHA256 896647e972a0b189b8368a7de30480e90eede0078ebdbdb62051f18a58070fbd SHA512 c46093ee18908b7cf8e52d2f10adeb0eefc90562b87862a5459cc4563e53528107ee1dba47b1cb88e378bdac40d64a1d8cb9ecbf014aef997c44f242b49534f7 WHIRLPOOL baf2186cf3aace8520d3d6bd757a98d1cfa3f79563a5cd3751e9f911afd255ed5b57f6608f43e1a9a8e2895e45ed2dd761381e38d3ff1584c51365c80fcde366
diff --git a/x11-misc/trayer/metadata.xml b/x11-misc/trayer/metadata.xml
new file mode 100644
index 000000000000..b1a9efc4f2f0
--- /dev/null
+++ b/x11-misc/trayer/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>desktop-dock</herd>
+</pkgmetadata>
diff --git a/x11-misc/trayer/trayer-1.0-r1.ebuild b/x11-misc/trayer/trayer-1.0-r1.ebuild
new file mode 100644
index 000000000000..022c8622c501
--- /dev/null
+++ b/x11-misc/trayer/trayer-1.0-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit toolchain-funcs
+
+DESCRIPTION="Lightweight GTK+ based systray for UNIX desktop"
+HOMEPAGE="http://home.gna.org/fvwm-crystal/"
+SRC_URI="http://download.gna.org/fvwm-crystal/trayer/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86"
+IUSE=""
+RDEPEND="
+	dev-libs/glib:2
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:2
+	x11-libs/libX11
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	# fix for as-needed, bug #141707
+	# fix pre-stripped files, bug #252098
+	sed -i Makefile \
+		-e 's:$(LIBS) $(OBJ) $(SYSTRAYOBJ):$(OBJ) $(SYSTRAYOBJ) $(LIBS):' \
+		-e 's:strip:true:g' \
+		|| die
+	# fix underlinking, bug #369591
+	sed -i Makefile.common \
+		-e '/^LIBS/s:).*: x11):' \
+		-e '/^INC/s:).*: x11):' \
+		|| die
+}
+
+src_compile() {
+	emake -j1 CC=$(tc-getCC) CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	dobin trayer
+	doman trayer.1
+	dodoc CHANGELOG CREDITS README
+}
diff --git a/x11-misc/treeline/Manifest b/x11-misc/treeline/Manifest
new file mode 100644
index 000000000000..9feced7c1d8d
--- /dev/null
+++ b/x11-misc/treeline/Manifest
@@ -0,0 +1,3 @@
+DIST treeline-1.4.1.tar.gz 499500 SHA256 d66e0fcae9bcb5e54f664381f6af73f360f9ff46c91787a126c7197fbe685489 SHA512 85e87d4201eca19fb4255eacef89b7975f982a32790e74b5a35ab37e42e316eb45a1518f093097141dc5db1a8a090537f42e35fddf3f51b3ae4cf4c812f9ea95 WHIRLPOOL 7f97e943d86f6f94fd32dbb2836ed9a5f1cd38c777322962b7809705f48886ad4988c3739907020976ee0aa798d5b9b76302d05fb753f642fa839cd556175312
+DIST treeline-1.9.4.tar.gz 327826 SHA256 eb26c836024687c2cbe386c129d49b72891333d6908ba6b7109aa1bad58a2f62 SHA512 be9a2dd385a941794adb779a3f4deec4d855ec2dbcfb92ed421879c212ab78dcc401dc0ee7fbdbd075faa60f3d290219877bcf97376e9df4d00d1cd9c2774f2d WHIRLPOOL 97682512a2f1461cee4230a2adeba47284a50263c3a2dbad2588bb503abbfc3ccb118f7832b7dd6b92946881ca79fc6a042f0d50d2d0c21f5549ca9c83773f5e
+DIST treeline-i18n-1.4.1a.tar.gz 279797 SHA256 891f086b0718336911ef118a4e25772c639cb48c1bea007031b5da075512e478 SHA512 82a79d24d451f5512c80b7647a6d10146649d2224c5ced8e5b402b44dea5d3d7cb00a3e8c96384d499fe2eb87dca686feb74a79db083e531fdb872218f54861b WHIRLPOOL cd8cac4419273369800314b7428e202586540e5b348203ab6567c73d1861e48b1f83e4f7c5c21da6fce9800d95bca71a5b057a81f2e22e64a2a656cd54d32dda
diff --git a/x11-misc/treeline/files/treeline-1.2.3-nocompile.patch b/x11-misc/treeline/files/treeline-1.2.3-nocompile.patch
new file mode 100644
index 000000000000..764859f1e415
--- /dev/null
+++ b/x11-misc/treeline/files/treeline-1.2.3-nocompile.patch
@@ -0,0 +1,12 @@
+--- a/install.py
++++ b/install.py
+@@ -230,7 +230,8 @@
+     pythonBuildDir = os.path.join(buildRoot, pythonPrefixDir[1:])
+ 
+     if os.path.isdir('source'):
+-        compileall.compile_dir('source', ddir=os.path.join(prefixDir, 'source'))
++        # don't compile, let our eclass handle that
++        # compileall.compile_dir('source', ddir=os.path.join(prefixDir, 'source'))
+         print 'Installing files...'
+         print '  Copying python files to %s' % pythonBuildDir
+         removeDir(pythonBuildDir)         # remove old?
diff --git a/x11-misc/treeline/metadata.xml b/x11-misc/treeline/metadata.xml
new file mode 100644
index 000000000000..a3891ce6e178
--- /dev/null
+++ b/x11-misc/treeline/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>desktop-misc</herd>
+	<upstream>
+		<remote-id type="sourceforge">treeline</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-misc/treeline/treeline-1.4.1-r1.ebuild b/x11-misc/treeline/treeline-1.4.1-r1.ebuild
new file mode 100644
index 000000000000..cdc989fc524f
--- /dev/null
+++ b/x11-misc/treeline/treeline-1.4.1-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="xml"
+
+inherit eutils python-single-r1
+
+DESCRIPTION="TreeLine is a structured information storage program"
+HOMEPAGE="http://treeline.bellz.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+
+TLLINGUAS=( de fr )
+IUSE+=" ${TLLINGUAS[@]/#/linguas_}"
+for lingua in ${TLLINGUAS[@]}; do
+	SRC_URI+=" linguas_${lingua}? ( mirror://sourceforge/${PN}/${PN}-i18n-${PV}a.tar.gz )"
+done
+unset lingua
+
+DEPEND="
+	${PYTHON_DEPS}
+"
+RDEPEND="
+	${DEPEND}
+	dev-python/PyQt4[X]
+"
+
+S="${WORKDIR}/TreeLine"
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	local lingua
+	for lingua in ${TLLINGUAS}; do
+		if use linguas_${lingua}; then
+			tar xozf "${DISTDIR}"/${PN}-i18n-${PV}a.tar.gz \
+				TreeLine/doc/{readme_${lingua}.trl,README_${lingua}.html} \
+				TreeLine/translations/{treeline_${lingua}.{qm,ts},qt_${lingua}.{qm,ts}} || die
+		fi
+	done
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.2.3-nocompile.patch
+
+	rm doc/LICENSE || die
+
+	python_export PYTHON_SITEDIR
+	sed -i "s;prefixDir, 'lib;'${PYTHON_SITEDIR};" install.py || die
+}
+
+src_install() {
+	"${EPYTHON}" install.py -x -p /usr/ -d /usr/share/doc/${PF} -b "${D}" || die
+}
diff --git a/x11-misc/treeline/treeline-1.9.4.ebuild b/x11-misc/treeline/treeline-1.9.4.ebuild
new file mode 100644
index 000000000000..3566b9c437fc
--- /dev/null
+++ b/x11-misc/treeline/treeline-1.9.4.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python3_{3,4} )
+PYTHON_REQ_USE="xml"
+
+inherit eutils python-single-r1
+
+DESCRIPTION="TreeLine is a structured information storage program"
+HOMEPAGE="http://treeline.bellz.org/"
+SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+
+DEPEND="
+	${PYTHON_DEPS}
+"
+RDEPEND="
+	${DEPEND}
+	dev-python/PyQt4[X,${PYTHON_USEDEP}]
+"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+S="${WORKDIR}/TreeLine"
+
+src_prepare() {
+	rm doc/LICENSE || die
+
+	python_export PYTHON_SITEDIR
+	sed -i "s;prefixDir, 'lib;'${PYTHON_SITEDIR};" install.py || die
+}
+
+src_install() {
+	"${EPYTHON}" install.py -x -p /usr/ -d /usr/share/doc/${PF} -b "${D}" || die
+}
diff --git a/x11-misc/unclutter/Manifest b/x11-misc/unclutter/Manifest
new file mode 100644
index 000000000000..2687c6940fc9
--- /dev/null
+++ b/x11-misc/unclutter/Manifest
@@ -0,0 +1 @@
+DIST unclutter-8.tar.Z 12344 SHA256 b855a78d4465ab2f86287eacac63a73f1504b08522840aa37718776e7ec9192a SHA512 9a64e6eceae685cf34b1ea85818735f8f85514ba1eea262476653886d74e469cfd6b9a39edbd098b138a5c89e6b97b42cf251bee59272c76cbeba190979744b4 WHIRLPOOL 9cccf31b0e64e37d075ec411398abbeea399745ae2e90f3c35e707a78c8a8c04e017d24f4a2f135cc75e04c5915cdc7bd5b3c16fdf1e7fbf73174cc30a461873
diff --git a/x11-misc/unclutter/files/unclutter-8-FocusOut.patch b/x11-misc/unclutter/files/unclutter-8-FocusOut.patch
new file mode 100644
index 000000000000..d26ef8e6a652
--- /dev/null
+++ b/x11-misc/unclutter/files/unclutter-8-FocusOut.patch
@@ -0,0 +1,17 @@
+Description: Fixes blinking pointer and 100% CPU usage with GTK applications
+Author: Tao Nelson <taobert@gmail.com>
+Debian-Bug: 266118
+
+--- a/unclutter.c
++++ b/unclutter.c
+@@ -399,7 +399,9 @@
+ 		do{
+ 		    XNextEvent(display,&event);
+ 		}while(event.type!=LeaveNotify &&
+-		       event.type!=FocusOut &&
++		    /* Some gtk applications seem not to like this:
++		     * event.type!=FocusOut && 
++		     */
+ 		       event.type!=UnmapNotify &&
+ 		       event.type!=ConfigureNotify &&
+ 		       event.type!=CirculateNotify &&
diff --git a/x11-misc/unclutter/files/unclutter-8-include.patch b/x11-misc/unclutter/files/unclutter-8-include.patch
new file mode 100644
index 000000000000..688fa129c561
--- /dev/null
+++ b/x11-misc/unclutter/files/unclutter-8-include.patch
@@ -0,0 +1,10 @@
+--- a/unclutter.c
++++ b/unclutter.c
+@@ -24,6 +24,7 @@
+ #include <X11/Xutil.h>
+ #include <X11/Xproto.h>
+ #include <stdio.h>
++#include <stdlib.h>
+ #include "vroot.h"
+ 
+ char *progname;
diff --git a/x11-misc/unclutter/metadata.xml b/x11-misc/unclutter/metadata.xml
new file mode 100644
index 000000000000..40838bc36783
--- /dev/null
+++ b/x11-misc/unclutter/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>desktop-misc</herd>
+</pkgmetadata>
diff --git a/x11-misc/unclutter/unclutter-8-r2.ebuild b/x11-misc/unclutter/unclutter-8-r2.ebuild
new file mode 100644
index 000000000000..9d68313ac09b
--- /dev/null
+++ b/x11-misc/unclutter/unclutter-8-r2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+
+inherit toolchain-funcs
+
+DESCRIPTION="Hides mouse pointer while not in use"
+HOMEPAGE="http://www.ibiblio.org/pub/X11/contrib/utilities/unclutter-8.README"
+SRC_URI="ftp://ftp.x.org/contrib/utilities/${P}.tar.Z"
+
+SLOT="0"
+LICENSE="public-domain"
+KEYWORDS="alpha amd64 hppa ~mips ppc ppc64 ~sparc x86"
+IUSE=""
+
+RDEPEND="x11-libs/libX11"
+DEPEND="${RDEPEND}
+	x11-proto/xproto"
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	sed -i -e "/stdio/ a #include <stdlib.h>" unclutter.c || die #implictits
+}
+
+src_compile() {
+	emake CDEBUGFLAGS="${CFLAGS}" CC="$(tc-getCC)" \
+		LDOPTIONS="${LDFLAGS}" || die
+}
+
+src_install () {
+	dobin unclutter || die
+	newman unclutter.man unclutter.1x || die
+	dodoc README || die
+}
diff --git a/x11-misc/unclutter/unclutter-8-r3.ebuild b/x11-misc/unclutter/unclutter-8-r3.ebuild
new file mode 100644
index 000000000000..260ebc9d0ee8
--- /dev/null
+++ b/x11-misc/unclutter/unclutter-8-r3.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Hides mouse pointer while not in use"
+HOMEPAGE="http://www.ibiblio.org/pub/X11/contrib/utilities/unclutter-8.README"
+SRC_URI="ftp://ftp.x.org/contrib/utilities/${P}.tar.Z"
+
+SLOT="0"
+LICENSE="public-domain"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="x11-libs/libX11"
+DEPEND="${RDEPEND}
+	x11-proto/xproto"
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-include.patch \
+		"${FILESDIR}"/${P}-FocusOut.patch
+}
+
+src_compile() {
+	emake CDEBUGFLAGS="${CFLAGS}" CC="$(tc-getCC)" LDOPTIONS="${LDFLAGS}"
+}
+
+src_install () {
+	dobin unclutter
+	newman unclutter.man unclutter.1x
+	dodoc README
+}
diff --git a/x11-misc/urxvt-font-size/Manifest b/x11-misc/urxvt-font-size/Manifest
new file mode 100644
index 000000000000..d37f6fc84918
--- /dev/null
+++ b/x11-misc/urxvt-font-size/Manifest
@@ -0,0 +1 @@
+DIST urxvt-font-size-1.1.tar.gz 5490 SHA256 f3a4b917680f028b960741a95e6fafba4574c80c089b1e36faf5528ba1b4d54d SHA512 923cf79dc11cdfd53bf7f0a5bc909cc80916f9e956f1aadc2cfa609d1c9c33211c0b023f5dca4c56a12acf7d3c70d7229e5a78783d20965964511b5f6ad01b1d WHIRLPOOL a4c5a860fe12666f91c3136d25bce110dda85879e8512d3f70ef55570d33718b7fb27ffb313e852ef18df743347d4a0ab2536d03d95bd0c46e75895b8c8f5d43
diff --git a/x11-misc/urxvt-font-size/metadata.xml b/x11-misc/urxvt-font-size/metadata.xml
new file mode 100644
index 000000000000..9d0a9a7512a3
--- /dev/null
+++ b/x11-misc/urxvt-font-size/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>radhermit@gentoo.org</email>
+		<name>Tim Harder</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">majutsushi/urxvt-font-size</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-misc/urxvt-font-size/urxvt-font-size-1.1.ebuild b/x11-misc/urxvt-font-size/urxvt-font-size-1.1.ebuild
new file mode 100644
index 000000000000..20cf2b574ffd
--- /dev/null
+++ b/x11-misc/urxvt-font-size/urxvt-font-size-1.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit multilib
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="git://github.com/majutsushi/urxvt-font-size.git"
+	inherit git-r3
+else
+	KEYWORDS="amd64 x86"
+	SRC_URI="https://github.com/majutsushi/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+DESCRIPTION="Perl extension for rxvt-unicode to change the font size on the fly"
+HOMEPAGE="https://github.com/majutsushi/urxvt-font-size/"
+
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND="
+	x11-apps/xlsfonts
+	x11-terms/rxvt-unicode[perl]
+"
+
+src_install() {
+	insinto /usr/$(get_libdir)/urxvt/perl
+	doins font-size
+	dodoc README.markdown
+}
diff --git a/x11-misc/urxvt-font-size/urxvt-font-size-9999.ebuild b/x11-misc/urxvt-font-size/urxvt-font-size-9999.ebuild
new file mode 100644
index 000000000000..3cccaa79a6be
--- /dev/null
+++ b/x11-misc/urxvt-font-size/urxvt-font-size-9999.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit multilib
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="git://github.com/majutsushi/urxvt-font-size.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/majutsushi/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+DESCRIPTION="Perl extension for rxvt-unicode to change the font size on the fly"
+HOMEPAGE="https://github.com/majutsushi/urxvt-font-size/"
+
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND="
+	x11-apps/xlsfonts
+	x11-terms/rxvt-unicode[perl]
+"
+
+src_install() {
+	insinto /usr/$(get_libdir)/urxvt/perl
+	doins font-size
+	dodoc README.markdown
+}
diff --git a/x11-misc/urxvt-perls/Manifest b/x11-misc/urxvt-perls/Manifest
new file mode 100644
index 000000000000..820bf6e122c8
--- /dev/null
+++ b/x11-misc/urxvt-perls/Manifest
@@ -0,0 +1 @@
+DIST urxvt-perls-2.2.tar.gz 14300 SHA256 c184f9a188866fef333489323576e5d2808a1cbcdb5f69b9a0be5d5e1eff8b87 SHA512 3b6c9b71ee2bc6a64762c2c9255ce52c489282797fb2859c17bb83eacae44bbbdf7f22d47de1bb0492753e7cd685fe4bc44c71421a19e162185ad60331b84d89 WHIRLPOOL 44df15fa71a3529791c6ea57a351efc726a34cbf997a1a7ff94aa38be46590db035db6b27f617492370150842879198e6e4a81307407a230d5c287399916f1f1
diff --git a/x11-misc/urxvt-perls/metadata.xml b/x11-misc/urxvt-perls/metadata.xml
new file mode 100644
index 000000000000..1939529b2291
--- /dev/null
+++ b/x11-misc/urxvt-perls/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>radhermit@gentoo.org</email>
+		<name>Tim Harder</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">muennich/urxvt-perls</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-misc/urxvt-perls/urxvt-perls-2.2.ebuild b/x11-misc/urxvt-perls/urxvt-perls-2.2.ebuild
new file mode 100644
index 000000000000..1fbc2055fd86
--- /dev/null
+++ b/x11-misc/urxvt-perls/urxvt-perls-2.2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit multilib
+
+DESCRIPTION="Perl extensions for rxvt-unicode"
+HOMEPAGE="https://github.com/muennich/urxvt-perls"
+SRC_URI="https://github.com/muennich/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm x86"
+
+RDEPEND="x11-misc/xsel
+	x11-terms/rxvt-unicode[perl]"
+
+src_install() {
+	insinto /usr/$(get_libdir)/urxvt/perl
+	doins clipboard keyboard-select url-select
+	dodoc README.md
+}
diff --git a/x11-misc/util-macros/Manifest b/x11-misc/util-macros/Manifest
new file mode 100644
index 000000000000..b631af03e89b
--- /dev/null
+++ b/x11-misc/util-macros/Manifest
@@ -0,0 +1,3 @@
+DIST util-macros-1.17.1.tar.bz2 79105 SHA256 5e52654f2a0b04223cf28a9d7fd62cf288852e639ac13a75172fd47d0d6ac625 SHA512 0b8eaebd63d194aad5e395f9596e3099aa0a503dd892c62ef805f1a566c3a83eeca85d2bd47c680867e2903801bddc5cc0b097bf7db592fe289ead9ead891e04 WHIRLPOOL 23a1172bfb547b9028f33997558fcd557010343a9330e727b8a419d6ab2b222c406b8955c18f5d0f736357be39161cb8ee70fd1810181b7d1559676b3b1affe2
+DIST util-macros-1.18.0.tar.bz2 77830 SHA256 e5e3d132a852f0576ea2cf831a9813c54a58810a59cdb198f56b884c5a78945b SHA512 c663c03e6d4a37d47154d16a805933f7d683724d341cc558be0a01a007e824097d1b39bc8edbf8753d7374bf8e16eb037983c7672cfec6e2fa73cf2cab864ef4 WHIRLPOOL 9300ce9a63190afede83d0afad727824bd105a939385b314b771ae93556423f796d1135da1c5986e1e50d101514be0ac8c92da29bff4592b435bdd6869e6c3cf
+DIST util-macros-1.19.0.tar.bz2 80027 SHA256 2835b11829ee634e19fa56517b4cfc52ef39acea0cd82e15f68096e27cbed0ba SHA512 6820fced14e28d505ed47c4e7e9fae17340e93caf94cc983683128b53833e257aed636bcac6204ed87ddc10132473ceb4bd2f6de53ea66ab8f71b8cd23fbfc15 WHIRLPOOL d0ab481249e8983122f413c9178fd68e216925fcc4ab98faa8c270505578289b6adf3976796135fc5f01bab992a5eaaa0d3b8bd91f7c240affed9ff3cf32f9e6
diff --git a/x11-misc/util-macros/metadata.xml b/x11-misc/util-macros/metadata.xml
new file mode 100644
index 000000000000..01c4c004e735
--- /dev/null
+++ b/x11-misc/util-macros/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>x11</herd>
+</pkgmetadata>
diff --git a/x11-misc/util-macros/util-macros-1.17.1.ebuild b/x11-misc/util-macros/util-macros-1.17.1.ebuild
new file mode 100644
index 000000000000..91e738708b6e
--- /dev/null
+++ b/x11-misc/util-macros/util-macros-1.17.1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit xorg-2
+
+EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/util/macros"
+DESCRIPTION="X.Org autotools utility macros"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
diff --git a/x11-misc/util-macros/util-macros-1.18.0.ebuild b/x11-misc/util-macros/util-macros-1.18.0.ebuild
new file mode 100644
index 000000000000..878e017d1b10
--- /dev/null
+++ b/x11-misc/util-macros/util-macros-1.18.0.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit xorg-2
+
+EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/util/macros"
+DESCRIPTION="X.Org autotools utility macros"
+
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
diff --git a/x11-misc/util-macros/util-macros-1.19.0.ebuild b/x11-misc/util-macros/util-macros-1.19.0.ebuild
new file mode 100644
index 000000000000..c840b5db516a
--- /dev/null
+++ b/x11-misc/util-macros/util-macros-1.19.0.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit xorg-2
+
+EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/util/macros"
+DESCRIPTION="X.Org autotools utility macros"
+
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
diff --git a/x11-misc/vdpauinfo/Manifest b/x11-misc/vdpauinfo/Manifest
new file mode 100644
index 000000000000..c79c615d16a8
--- /dev/null
+++ b/x11-misc/vdpauinfo/Manifest
@@ -0,0 +1,3 @@
+DIST vdpauinfo-0.0.6.tar.gz 77375 SHA256 52bb5d817b16984aca2d410584150cd35551bdfd6346688a377d406e25a65454 SHA512 d6dca1908e522227441f108052c9bfe8201bf907ffb7d6d86b1a701f815411f7063454ca7d9beb643a1ed7634f178ebd47218d2e445585f6f1c2c70b6c29c867 WHIRLPOOL dd7d37dfb9880c68a2ccc2deaea6ddacfaa687ddd0800b94adf12fe5e89314604bc13b31b629a642e33e6a0880380a080757730fd768556ebaf3403ee35e76c6
+DIST vdpauinfo-0.1.tar.gz 82732 SHA256 b0c856a6933e306f3f783717a29124c7d145d6027a3175e197249696f5d5019f SHA512 f72e05b5b7189aa431ab6e6a6e7d976cbf6072ab16d1aa6a06cef12d0aaa6778e4d38619d08da7784968b5a709b209d6584ec3f9d52f6fbdd2e81b1bf21d1f17 WHIRLPOOL 3461b637cc5ad1c182a6d0c325583148a4365234110c1a07c9cd88221f364dbc79355c0cb90696b870974de7968e5f86f480cc745c23bd607de95cd012608f50
+DIST vdpauinfo-0.9.tar.gz 87887 SHA256 a040fe3682db4cb6076179185a68559a62b908cd01f0aee086838eaf2923c8e3 SHA512 dc54db4778d53704814b25d37ee05ee3c0b1e20aca701e695a5e87ad90ae609c5ad778f2571f3637af9cfe0cb0fa5f829ef19cfb7b28d16120db50da2b763fe2 WHIRLPOOL 359411d9f9599aa221bcdb4e85990b86d20520add4ba752f2eb8e8a8e049534708bf820047574b3e15f4d9c63af45103b4777605439c26989e9ef0f5b1f9e8c8
diff --git a/x11-misc/vdpauinfo/metadata.xml b/x11-misc/vdpauinfo/metadata.xml
new file mode 100644
index 000000000000..e8b7c340d5db
--- /dev/null
+++ b/x11-misc/vdpauinfo/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>cardoe@gentoo.org</email>
+		<name>Doug Goldstein</name>
+	</maintainer>
+</pkgmetadata>
+
diff --git a/x11-misc/vdpauinfo/vdpauinfo-0.0.6.ebuild b/x11-misc/vdpauinfo/vdpauinfo-0.0.6.ebuild
new file mode 100644
index 000000000000..bbb6d7d16be3
--- /dev/null
+++ b/x11-misc/vdpauinfo/vdpauinfo-0.0.6.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="Displays info about your card's VDPAU support"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/VDPAU"
+SRC_URI="http://people.freedesktop.org/~aplattner/vdpau/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+		x11-libs/libvdpau"
+DEPEND="${RDEPEND}
+		virtual/pkgconfig
+		x11-proto/xproto"
diff --git a/x11-misc/vdpauinfo/vdpauinfo-0.1.ebuild b/x11-misc/vdpauinfo/vdpauinfo-0.1.ebuild
new file mode 100644
index 000000000000..f53461577757
--- /dev/null
+++ b/x11-misc/vdpauinfo/vdpauinfo-0.1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="Displays info about your card's VDPAU support"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/VDPAU"
+SRC_URI="http://people.freedesktop.org/~aplattner/vdpau/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+		x11-libs/libvdpau"
+DEPEND="${RDEPEND}
+		virtual/pkgconfig
+		x11-proto/xproto"
diff --git a/x11-misc/vdpauinfo/vdpauinfo-0.9-r1.ebuild b/x11-misc/vdpauinfo/vdpauinfo-0.9-r1.ebuild
new file mode 100644
index 000000000000..909aa7d74fed
--- /dev/null
+++ b/x11-misc/vdpauinfo/vdpauinfo-0.9-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="Displays info about your card's VDPAU support"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/VDPAU"
+SRC_URI="http://people.freedesktop.org/~aplattner/vdpau/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+		>=x11-libs/libvdpau-0.9"
+DEPEND="${RDEPEND}
+		virtual/pkgconfig
+		x11-proto/xproto"
diff --git a/x11-misc/viewglob/Manifest b/x11-misc/viewglob/Manifest
new file mode 100644
index 000000000000..668812bef61e
--- /dev/null
+++ b/x11-misc/viewglob/Manifest
@@ -0,0 +1 @@
+DIST viewglob-2.0.4.tar.gz 324752 SHA256 69ef6c62de26b2fad82ddff3fcc72e15ddf7eed7047492218f7c6387c0e7c6f4 SHA512 95fb5ef6dc412804cbff6a961ec08bf8e114eefb9ea5430aa1be2f8b2bcbb7e76ab8392e31148d4275debd6f4cada81d1ebfb08a741b8a579f749efdb8f7adb4 WHIRLPOOL e22d237e736283027991a9e2c5bf61bf275b61a34ff3f6b645d46bb69fe2c524f14b07820e03cec526b2268e0ad88c81f9b82b299df253b79d64f1e0ffcb8979
diff --git a/x11-misc/viewglob/files/README.gentoo b/x11-misc/viewglob/files/README.gentoo
new file mode 100644
index 000000000000..be03a013571b
--- /dev/null
+++ b/x11-misc/viewglob/files/README.gentoo
@@ -0,0 +1,17 @@
+/usr/bin/viewglob is a wrapper for vgd and vgseer (client and
+daemon, respectively). Generally speaking, this is what you want to
+execute from your shell.
+
+Should you prefer to start viewglob with each shell session, try
+something like this:
+
+  if [[ ! $VG_VIEWGLOB_ACTIVE && $DISPLAY ]] ; then
+      exec viewglob
+  fi
+
+Have a look at http://viewglob.sourceforge.net/faq.html for a
+few more viewglob tricks.
+
+There are some known bugs in viewglob with screen. Exercise some
+caution and take results with a pinch of salt if you try the two
+together.
diff --git a/x11-misc/viewglob/files/viewglob-2.0.4-format-security.patch b/x11-misc/viewglob/files/viewglob-2.0.4-format-security.patch
new file mode 100644
index 000000000000..98490e3836c9
--- /dev/null
+++ b/x11-misc/viewglob/files/viewglob-2.0.4-format-security.patch
@@ -0,0 +1,36 @@
+ common/syslogging.c | 2 +-
+ vgseer/vgseer.c     | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/common/syslogging.c b/common/syslogging.c
+index dcb7106..df0b537 100644
+--- a/common/syslogging.c
++++ b/common/syslogging.c
+@@ -40,6 +40,6 @@ void syslogging(const gchar* log_domain, GLogLevelFlags log_level,
+ 	else
+ 		priority = LOG_NOTICE;
+ 
+-	syslog(priority, message);
++	syslog(priority, "%s", message);
+ }
+ 
+diff --git a/vgseer/vgseer.c b/vgseer/vgseer.c
+index e045835..18b0024 100644
+--- a/vgseer/vgseer.c
++++ b/vgseer/vgseer.c
+@@ -276,13 +276,13 @@ static gint connect_to_vgd(gchar* server, gchar* port,
+ 	if (STREQ(value, "ERROR")) {
+ 		/* Print reason for error and exit. */
+ 		get_param_verify(fd, &param, &value, P_REASON, NULL);
+-		g_critical(value);
++		g_critical("%s", value);
+ 		clean_fail(NULL);
+ 	}
+ 	else if (STREQ(value, "WARNING")) {
+ 		/* Print warning but continue. */
+ 		get_param_verify(fd, &param, &value, P_REASON, NULL);
+-		g_warning(value);
++		g_warning("%s", value);
+ 	}
+ 	else if (!STREQ(value, "OK")) {
+ 		g_critical("Unknown value for P_STATUS: %s", value);
diff --git a/x11-misc/viewglob/files/viewglob-2.0.4-underlinking.patch b/x11-misc/viewglob/files/viewglob-2.0.4-underlinking.patch
new file mode 100644
index 000000000000..acea0bd6c359
--- /dev/null
+++ b/x11-misc/viewglob/files/viewglob-2.0.4-underlinking.patch
@@ -0,0 +1,163 @@
+ Makefile.am           |  6 +++---
+ shell/Makefile.am     | 12 ++++++------
+ vgd/Makefile.am       |  2 +-
+ vgdisplay/Makefile.am |  4 ++--
+ vgdisplay/Makefile.in |  2 +-
+ vgexpand/Makefile.am  |  2 +-
+ vgping/Makefile.am    |  2 +-
+ vgseer/Makefile.am    |  2 +-
+ 8 files changed, 16 insertions(+), 16 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 5378bad..4b0d394 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -11,19 +11,19 @@ man_MANS = vgseer.1 viewglob.1 $(MANS_FULL)
+ viewglob.1:
+ 	rm -f viewglob.1.tmp
+ 	sed -e 's/@RELEASE_DATE\@/$(RELEASE_DATE)/g' \
+-		viewglob.1.in > viewglob.1.tmp
++		$(srcdir)/viewglob.1.in > viewglob.1.tmp
+ 	mv viewglob.1.tmp viewglob.1
+ 
+ vgseer.1:
+ 	rm -f vgseer.1.tmp
+ 	sed -e 's/@RELEASE_DATE\@/$(RELEASE_DATE)/g' \
+-		vgseer.1.in > vgseer.1.tmp
++		$(srcdir)/vgseer.1.in > vgseer.1.tmp
+ 	mv vgseer.1.tmp vgseer.1
+ 
+ vgd.1:
+ 	rm -f vgd.1.tmp
+ 	sed -e 's/@RELEASE_DATE\@/$(RELEASE_DATE)/g' \
+-		vgd.1.in > vgd.1.tmp
++		$(srcdir)/vgd.1.in > vgd.1.tmp
+ 	mv vgd.1.tmp vgd.1
+ 
+ EXTRA_DIST = COPYING2 HACKING viewglob.1.in vgseer.1.in vgd.1.in
+diff --git a/shell/Makefile.am b/shell/Makefile.am
+index 1d4239a..0a62bc7 100644
+--- a/shell/Makefile.am
++++ b/shell/Makefile.am
+@@ -1,7 +1,7 @@
+ 
+ bin_SCRIPTS = viewglob
+-pkglib_SCRIPTS = getopt.sh conf-to-args.sh
+-pkglib_DATA = init-viewglob.bashrc .zshrc
++libexec_SCRIPTS = getopt.sh conf-to-args.sh
++pkgdata_DATA = init-viewglob.bashrc .zshrc
+ 
+ viewglob:
+ 	rm -f viewglob.tmp
+@@ -10,27 +10,27 @@ viewglob:
+ 		-e 's,@PACKAGE_NAME\@,$(PACKAGE_NAME),g' \
+ 		-e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \
+ 		-e 's/@RELEASE_DATE\@/$(RELEASE_DATE)/g' \
+-		viewglob.in > viewglob.tmp
++		$(srcdir)/viewglob.in > viewglob.tmp
+ 	chmod a+x viewglob.tmp
+ 	mv viewglob.tmp viewglob
+ 
+ getopt.sh:
+ 	rm -f getopt.sh.tmp
+ 	sed -e 's,@BASH_FULL_PATH\@,$(BASH_FULL_PATH),g' \
+-		getopt.sh.in > getopt.sh.tmp
++		$(srcdir)/getopt.sh.in > getopt.sh.tmp
+ 	chmod a+x getopt.sh.tmp
+ 	mv getopt.sh.tmp getopt.sh
+ 
+ .zshrc:
+ 	rm -f init-viewglob.zshrc.tmp
+ 	sed -e 's,@pkglibdir\@,$(pkglibdir),g' \
+-		init-viewglob.zshrc.in > init-viewglob.zshrc.tmp
++		$(srcdir)/init-viewglob.zshrc.in > init-viewglob.zshrc.tmp
+ 	mv init-viewglob.zshrc.tmp .zshrc
+ 
+ init-viewglob.bashrc:
+ 	rm -f init-viewglob.bashrc.tmp
+ 	sed -e 's,@pkglibdir\@,$(pkglibdir),g' \
+-		init-viewglob.bashrc.in > init-viewglob.bashrc.tmp
++		$(srcdir)/init-viewglob.bashrc.in > init-viewglob.bashrc.tmp
+ 	mv init-viewglob.bashrc.tmp init-viewglob.bashrc
+ 
+ 
+diff --git a/vgd/Makefile.am b/vgd/Makefile.am
+index 634b7de..1982981 100644
+--- a/vgd/Makefile.am
++++ b/vgd/Makefile.am
+@@ -25,7 +25,7 @@ BUILT_SOURCES = vgd-usage.h
+ 
+ vgd-usage.h: vgd-usage.txt
+ 	rm -f vgd-usage.tmp
+-	sed <vgd-usage.txt >vgd-usage.tmp \
++	sed < $(srcdir)/vgd-usage.txt >vgd-usage.tmp \
+ 		-e 's/\\/\\\\/g' \
+ 		-e 's/"/\\"/g' \
+ 		-e 's/.*/\"&\\n\"/'
+diff --git a/vgdisplay/Makefile.am b/vgdisplay/Makefile.am
+index 4aa941b..5d2e1df 100644
+--- a/vgdisplay/Makefile.am
++++ b/vgdisplay/Makefile.am
+@@ -4,9 +4,9 @@ AM_CPPFLAGS = -DVG_LIB_DIR="\"$(pkglibdir)\"" -I$(COMMON_DIR) \
+ LDADD = \
+ 	@GLIB_LIBS@ \
+ 	@X_PRE_LIBS@ @X_LIBS@ -lX11 @X_EXTRA_LIBS@ \
+-	@GTK_LIBS@
++	@GTK_LIBS@ -lm
+ 
+-pkglib_PROGRAMS = vgclassic vgmini
++libexec_PROGRAMS = vgclassic vgmini
+ 
+ vgclassic_SOURCES = \
+ 	vgclassic.c \
+diff --git a/vgdisplay/Makefile.in b/vgdisplay/Makefile.in
+index 218587b..cd7d86d 100644
+--- a/vgdisplay/Makefile.in
++++ b/vgdisplay/Makefile.in
+@@ -55,7 +55,7 @@ am_vgclassic_OBJECTS = vgclassic.$(OBJEXT) exhibit.$(OBJEXT) \
+ 	hardened-io.$(OBJEXT) x11-stuff.$(OBJEXT) syslogging.$(OBJEXT) \
+ 	fgetopt.$(OBJEXT)
+ vgclassic_OBJECTS = $(am_vgclassic_OBJECTS)
+-vgclassic_LDADD = $(LDADD)
++vgclassic_LDADD = $(LDADD) -lm
+ vgclassic_DEPENDENCIES =
+ am_vgmini_OBJECTS = vgmini.$(OBJEXT) wrap_box.$(OBJEXT) \
+ 	file_box.$(OBJEXT) lscolors.$(OBJEXT) dircont.$(OBJEXT) \
+diff --git a/vgexpand/Makefile.am b/vgexpand/Makefile.am
+index e6817cc..6357fc8 100644
+--- a/vgexpand/Makefile.am
++++ b/vgexpand/Makefile.am
+@@ -2,7 +2,7 @@ COMMON_DIR = $(top_srcdir)/common
+ AM_CPPFLAGS = @GLIB_CFLAGS@ -DVG_LIB_DIR="\"$(pkglibdir)\"" -I$(COMMON_DIR)
+ LDADD = @GLIB_LIBS@
+ 
+-pkglib_PROGRAMS = vgexpand
++libexec_PROGRAMS = vgexpand
+ 
+ vgexpand_SOURCES = vgexpand.c
+ 
+diff --git a/vgping/Makefile.am b/vgping/Makefile.am
+index 02a1db3..7b09845 100644
+--- a/vgping/Makefile.am
++++ b/vgping/Makefile.am
+@@ -1,6 +1,6 @@
+ COMMON_DIR = $(top_srcdir)/common
+ 
+-pkglib_PROGRAMS = vgping
++libexec_PROGRAMS = vgping
+ 
+ vgping_CPPFLAGS = @GLIB_CFLAGS@ -DVG_LIB_DIR="\"$(pkglibdir)\"" -I$(COMMON_DIR)
+ vgping_LDADD = @GLIB_LIBS@ @LIBS@
+diff --git a/vgseer/Makefile.am b/vgseer/Makefile.am
+index ff0431e..05480b8 100644
+--- a/vgseer/Makefile.am
++++ b/vgseer/Makefile.am
+@@ -29,7 +29,7 @@ BUILT_SOURCES = vgseer-usage.h
+ 
+ vgseer-usage.h: vgseer-usage.txt
+ 	rm -f vgseer-usage.tmp
+-	sed <vgseer-usage.txt >vgseer-usage.tmp \
++	sed < $(srcdir)/vgseer-usage.txt >vgseer-usage.tmp \
+ 		-e 's/\\/\\\\/g' \
+ 		-e 's/"/\\"/g' \
+ 		-e 's/.*/\"&\\n\"/'
diff --git a/x11-misc/viewglob/metadata.xml b/x11-misc/viewglob/metadata.xml
new file mode 100644
index 000000000000..665f68caaade
--- /dev/null
+++ b/x11-misc/viewglob/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>shell-tools</herd>
+  <longdescription lang="en">
+		Viewglob is a package that graphically displays the results of a shell
+		glob, helping beginners of shell usage become acclimitised to filename
+		generation. In addition, it acts as a basic replacement for ls, by
+		tracking shell directory changes. It is compatible with zsh and bash,
+		and helper files and documentation are provided.
+	</longdescription>
+  <upstream>
+    <remote-id type="sourceforge">viewglob</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/x11-misc/viewglob/viewglob-2.0.4-r1.ebuild b/x11-misc/viewglob/viewglob-2.0.4-r1.ebuild
new file mode 100644
index 000000000000..20cdb09ecaaf
--- /dev/null
+++ b/x11-misc/viewglob/viewglob-2.0.4-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=yes
+
+inherit autotools-utils readme.gentoo
+
+DESCRIPTION="Graphical display of directories and globs referenced at the shell prompt"
+HOMEPAGE="http://viewglob.sourceforge.net/"
+SRC_URI="mirror://sourceforge/viewglob/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ~sparc x86"
+IUSE=""
+
+RDEPEND="
+	dev-libs/glib:2
+	x11-libs/gtk+:2
+	|| ( app-shells/bash:* app-shells/zsh )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-underlinking.patch
+	"${FILESDIR}"/${P}-format-security.patch
+)
+
+src_install() {
+	autotools-utils_src_install
+	readme.gentoo_src_install
+}
diff --git a/x11-misc/virtualgl/Manifest b/x11-misc/virtualgl/Manifest
new file mode 100644
index 000000000000..bce7452d197b
--- /dev/null
+++ b/x11-misc/virtualgl/Manifest
@@ -0,0 +1,2 @@
+DIST VirtualGL-2.3.3.tar.gz 2614988 SHA256 857fd5c51c64016a1687cbda62ca5dcdf7073181df86b57be010501b565e5d45 SHA512 7bab5145be338d9bb2f9b4952ee530e84ae195185d55039cf10c89ced049716756f23f4d9c41c82f032c6e6a57bbbaebf023b3e501011bfd5c6aa3d59b22dd8d WHIRLPOOL e903172545c825b8df1dc6678738ac5e7ac2a104ec979668e522f46e2d2f715a3a07cb3cbac57c9e848a6420873f671737b7bed9acf50556a4aea08c4c1355a3
+DIST VirtualGL-2.4.1.tar.gz 1116018 SHA256 2889c6eb35b50340517856f497c07450a9d5ccab46e9b1700a76029a2159cf2e SHA512 b8901eccb29ea21ca1cb0743b6b3a7316ee02422a94be04133daa1c8a24b109e27504a63c901359c7dec22a8af2f0e26d909f9b74c834b97dc19f7491232db0a WHIRLPOOL 2fec19e22eab70cde4a9e4a8a2c9a9628e3e20809e6322b14de53bca50a967f8a142dee147255cb3e9d4d6c802d984b5adbd5293b6bdd205405b92fe18386b95
diff --git a/x11-misc/virtualgl/files/vgl-helper.sh b/x11-misc/virtualgl/files/vgl-helper.sh
new file mode 100644
index 000000000000..805409284862
--- /dev/null
+++ b/x11-misc/virtualgl/files/vgl-helper.sh
@@ -0,0 +1,39 @@
+#!/bin/bash
+
+. /etc/vgl.conf
+
+vgl_start() {
+    truncate --size=0 /var/lib/VirtualGL/vgl_xauth_key
+
+    set_xauth
+    # Check if XAUTHORITY was set successfully, if not wait up to
+    # 60 seconds to allow X start.
+    tries=120
+    while [ ${tries} -gt 0 ]; do
+        tries=$((tries - 1))
+        if [ -z "${XAUTHORITY}" ]; then
+            sleep 0.5
+            set_xauth
+            continue
+        elif [ ! -e "${XAUTHORITY}" ]; then
+            sleep 0.5
+            # fall through, file not existing yet
+        fi
+        break
+    done
+
+    xauth -f /var/lib/VirtualGL/vgl_xauth_key add $DISPLAY . \
+        $(xauth -f $XAUTHORITY list | awk '{print $3;exit}') && \
+        chmod 644 /var/lib/VirtualGL/vgl_xauth_key
+}
+
+vgl_stop() {
+    rm -f /var/lib/VirtualGL/vgl_xauth_key
+}
+
+
+if [ "${1}" = "start" ]; then
+    vgl_start
+elif [ "${1}" = "stop" ]; then
+    vgl_stop
+fi
diff --git a/x11-misc/virtualgl/files/vgl.confd-r1 b/x11-misc/virtualgl/files/vgl.confd-r1
new file mode 100644
index 000000000000..d56414d41110
--- /dev/null
+++ b/x11-misc/virtualgl/files/vgl.confd-r1
@@ -0,0 +1,27 @@
+# /etc/conf.d/vgl
+
+DISPLAY="${DISPLAY:-:0}"
+
+# Make it a function in case we have to repeat it in init script later
+set_xauth() {
+
+# common case (works in almost all tested environments (except of lightdm)):
+XAUTHORITY="$(ps wwax -C X,Xorg -o args= --sort=-stime | grep -m 1 -o '\B[-]auth\s*/var\S*auth\S*' | cut -d ' ' -f 2)"
+
+# kdm and some others:
+# XAUTHORITY="$(find /var/run/xauth/A${DISPLAY}-*|tail -n1)"
+
+# gdm:
+# XAUTHORITY="/var/gdm/${DISPLAY}.Xauth"
+
+# slim:
+# XAUTHORITY="/var/run/slim.auth"
+
+# lightdm:
+# XAUTHORITY="/var/run/lightdm/root/${DISPLAY}"
+
+# lxdm:
+# XAUTHORITY="/var/run/lxdm/lxdm-${DISPLAY}.auth"
+
+}
+set_xauth
diff --git a/x11-misc/virtualgl/files/vgl.initd-r2 b/x11-misc/virtualgl/files/vgl.initd-r2
new file mode 100644
index 000000000000..7d5981f9b8e3
--- /dev/null
+++ b/x11-misc/virtualgl/files/vgl.initd-r2
@@ -0,0 +1,30 @@
+#!/sbin/runscript
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# TODO: description="*" and other OpenRC 0.9+ candies
+
+depend() {
+	need xdm
+	after sshd
+}
+
+start() {
+	ebegin "Starting VirtualGL"
+	truncate --size=0 /var/lib/VirtualGL/vgl_xauth_key
+
+	# Check if XAUTHORITY was set successfully, if not wait a bit and let X to start
+	[ -z "$XAUTHORITY" ] && sleep 3 && set_xauth
+	[ -e "$XAUTHORITY" ] || sleep 3
+	xauth -f /var/lib/VirtualGL/vgl_xauth_key add $DISPLAY . `xauth -f $XAUTHORITY list | awk '{print $3;exit}'` && \
+		chmod 644 /var/lib/VirtualGL/vgl_xauth_key
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping VirtualGL"
+	[ -f /var/lib/VirtualGL/vgl_xauth_key ] && \
+		rm /var/lib/VirtualGL/vgl_xauth_key
+	eend $?
+}
diff --git a/x11-misc/virtualgl/files/vgl.service b/x11-misc/virtualgl/files/vgl.service
new file mode 100644
index 000000000000..a001e8a1d2f1
--- /dev/null
+++ b/x11-misc/virtualgl/files/vgl.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=VirtualGL service
+After=display-manager.service
+
+[Service]
+RemainAfterExit=yes
+PIDFile=/var/run/named/named.pid
+ExecStart=/usr/libexec/vgl-helper.sh start
+ExecStop=/usr/libexec/vgl-helper.sh stop
+
+[Install]
+WantedBy=multi-user.target
+
diff --git a/x11-misc/virtualgl/metadata.xml b/x11-misc/virtualgl/metadata.xml
new file mode 100644
index 000000000000..82630efb1696
--- /dev/null
+++ b/x11-misc/virtualgl/metadata.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>proxy-maintainers</herd>
+	<maintainer>
+		<email>pacho@gentoo.org</email>
+		<name>Pacho Ramos</name>
+	</maintainer>
+	<maintainer>
+		<email>mva@mva.name</email>
+		<name>Vadim A. Misbakh-Soloviov</name>
+	</maintainer>
+	<maintainer>
+		<email>rei4dan@gmail.com</email>
+		<name>My Th</name>
+	</maintainer>
+	<longdescription>
+	An open source package that gives any Unix or Linux remote display software
+	the ability to run OpenGL applications with full 3D hardware acceleration.
+</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">virtualgl</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-misc/virtualgl/virtualgl-2.3.3.ebuild b/x11-misc/virtualgl/virtualgl-2.3.3.ebuild
new file mode 100644
index 000000000000..b1780b7c760b
--- /dev/null
+++ b/x11-misc/virtualgl/virtualgl-2.3.3.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit cmake-multilib multilib systemd
+
+DESCRIPTION="Run OpenGL applications remotely with full 3D hardware acceleration"
+HOMEPAGE="http://www.virtualgl.org/"
+
+MY_PN="VirtualGL"
+MY_P="${MY_PN}-${PV}"
+S="${WORKDIR}/${MY_P}"
+SRC_URI="mirror://sourceforge/${PN}/${MY_PN}/${PV}/${MY_P}.tar.gz"
+
+SLOT="0"
+LICENSE="LGPL-2.1 wxWinLL-3.1 FLTK"
+KEYWORDS="amd64 x86"
+IUSE="ssl"
+
+RDEPEND="
+	ssl? ( dev-libs/openssl[${MULTILIB_USEDEP}] )
+	media-libs/libjpeg-turbo[${MULTILIB_USEDEP}]
+	x11-libs/libX11[${MULTILIB_USEDEP}]
+	x11-libs/libXext[${MULTILIB_USEDEP}]
+	x11-libs/libXv[${MULTILIB_USEDEP}]
+	virtual/glu[${MULTILIB_USEDEP}]
+	virtual/opengl[${MULTILIB_USEDEP}]
+	amd64? ( abi_x86_32? (
+		>=media-libs/libjpeg-turbo-1.3.0-r3[abi_x86_32]
+		>=x11-libs/libX11-1.6.2[abi_x86_32]
+		>=x11-libs/libXext-1.3.2[abi_x86_32]
+		>=x11-libs/libXv-1.0.10[abi_x86_32]
+		>=virtual/glu-9.0-r1[abi_x86_32]
+		>=virtual/opengl-7.0-r1[abi_x86_32]
+	) )
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	# Use /var/lib, bug #428122
+	sed -e "s#/etc/opt#/var/lib#g" -i doc/unixconfig.txt doc/index.html doc/advancedopengl.txt \
+		server/vglrun server/vglgenkey server/vglserver_config || die
+
+	default
+}
+
+src_configure() {
+	abi_configure() {
+		local mycmakeargs=(
+			$(cmake-utils_use ssl VGL_USESSL)
+			-DVGL_DOCDIR=/usr/share/doc/"${P}"
+			-DTJPEG_INCLUDE_DIR=/usr/include
+			-DVGL_LIBDIR=/usr/$(get_libdir)
+			-DTJPEG_LIBRARY=/usr/$(get_libdir)/libturbojpeg.so
+			-DCMAKE_LIBRARY_PATH=/usr/$(get_libdir)
+			-DVGL_FAKELIBDIR=/usr/fakelib/${ABI}
+		)
+		cmake-utils_src_configure
+	}
+	multilib_parallel_foreach_abi abi_configure
+}
+
+src_install() {
+	cmake-multilib_src_install
+
+	# Make config dir
+	dodir /var/lib/VirtualGL
+	fowners root:video /var/lib/VirtualGL
+	fperms 0750 /var/lib/VirtualGL
+	newinitd "${FILESDIR}/vgl.initd-r2" vgl
+	newconfd "${FILESDIR}/vgl.confd-r1" vgl
+
+	exeinto /usr/libexec
+	doexe "${FILESDIR}/vgl-helper.sh"
+	systemd_dounit "${FILESDIR}/vgl.service"
+
+	# Rename glxinfo to vglxinfo to avoid conflict with x11-apps/mesa-progs
+	mv "${D}"/usr/bin/{,v}glxinfo || die
+
+	# Remove license files, bug 536284
+	rm "${D}"/usr/share/doc/${PF}/{LGPL.txt*,LICENSE*} || die
+}
diff --git a/x11-misc/virtualgl/virtualgl-2.4.1.ebuild b/x11-misc/virtualgl/virtualgl-2.4.1.ebuild
new file mode 100644
index 000000000000..e9767e88f1a3
--- /dev/null
+++ b/x11-misc/virtualgl/virtualgl-2.4.1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit cmake-multilib multilib systemd
+
+DESCRIPTION="Run OpenGL applications remotely with full 3D hardware acceleration"
+HOMEPAGE="http://www.virtualgl.org/"
+
+MY_PN="VirtualGL"
+MY_P="${MY_PN}-${PV}"
+S="${WORKDIR}/${MY_P}"
+SRC_URI="mirror://sourceforge/${PN}/files/${PV}/${MY_P}.tar.gz"
+
+SLOT="0"
+LICENSE="LGPL-2.1 wxWinLL-3.1 FLTK"
+KEYWORDS="~amd64 ~x86"
+IUSE="ssl"
+
+RDEPEND="
+	ssl? ( dev-libs/openssl[${MULTILIB_USEDEP}] )
+	media-libs/libjpeg-turbo[${MULTILIB_USEDEP}]
+	x11-libs/libX11[${MULTILIB_USEDEP}]
+	x11-libs/libXext[${MULTILIB_USEDEP}]
+	x11-libs/libXv[${MULTILIB_USEDEP}]
+	virtual/glu[${MULTILIB_USEDEP}]
+	virtual/opengl[${MULTILIB_USEDEP}]
+	amd64? ( abi_x86_32? (
+		>=media-libs/libjpeg-turbo-1.3.0-r3[abi_x86_32]
+		>=x11-libs/libX11-1.6.2[abi_x86_32]
+		>=x11-libs/libXext-1.3.2[abi_x86_32]
+		>=x11-libs/libXv-1.0.10[abi_x86_32]
+		>=virtual/glu-9.0-r1[abi_x86_32]
+		>=virtual/opengl-7.0-r1[abi_x86_32]
+	) )
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	# Use /var/lib, bug #428122
+	sed -e "s#/etc/opt#/var/lib#g" -i doc/unixconfig.txt doc/index.html doc/advancedopengl.txt \
+		server/vglrun.in server/vglgenkey server/vglserver_config || die
+
+	default
+}
+
+src_configure() {
+	abi_configure() {
+		local mycmakeargs=(
+			$(cmake-utils_use ssl VGL_USESSL)
+			-DVGL_DOCDIR=/usr/share/doc/"${P}"
+			-DTJPEG_INCLUDE_DIR=/usr/include
+			-DVGL_LIBDIR=/usr/$(get_libdir)
+			-DTJPEG_LIBRARY=/usr/$(get_libdir)/libturbojpeg.so
+			-DCMAKE_LIBRARY_PATH=/usr/$(get_libdir)
+			-DVGL_FAKELIBDIR=/usr/fakelib/${ABI}
+		)
+		cmake-utils_src_configure
+	}
+	multilib_parallel_foreach_abi abi_configure
+}
+
+src_install() {
+	cmake-multilib_src_install
+
+	# Make config dir
+	dodir /var/lib/VirtualGL
+	fowners root:video /var/lib/VirtualGL
+	fperms 0750 /var/lib/VirtualGL
+	newinitd "${FILESDIR}/vgl.initd-r2" vgl
+	newconfd "${FILESDIR}/vgl.confd-r1" vgl
+
+	exeinto /usr/libexec
+	doexe "${FILESDIR}/vgl-helper.sh"
+	systemd_dounit "${FILESDIR}/vgl.service"
+
+	# Rename glxinfo to vglxinfo to avoid conflict with x11-apps/mesa-progs
+	mv "${D}"/usr/bin/{,v}glxinfo || die
+
+	# Remove license files, bug 536284
+	rm "${D}"/usr/share/doc/${PF}/{LGPL.txt*,LICENSE*} || die
+}
diff --git a/x11-misc/vnc2swf/Manifest b/x11-misc/vnc2swf/Manifest
new file mode 100644
index 000000000000..a30fcb3d7b85
--- /dev/null
+++ b/x11-misc/vnc2swf/Manifest
@@ -0,0 +1 @@
+DIST vnc2swf-0.5.0.tar.gz 438058 RMD160 37476595432777d8da9e6230f486f6593c29c41f SHA1 4cd4f03535ca33c2f6bad9761016e6d9f9ee0d15 SHA256 ce49be2f0ae866e1a8e74e82f42cb466d01052aa0de07bfbf9f13bdcc16a8edc
diff --git a/x11-misc/vnc2swf/metadata.xml b/x11-misc/vnc2swf/metadata.xml
new file mode 100644
index 000000000000..e022ba6cabdd
--- /dev/null
+++ b/x11-misc/vnc2swf/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>desktop-misc</herd>
+  <longdescription>
+  Vnc2swf is a cross-platform screen recording tool for ShockWave Flash (swf)
+  format. Vnc2swf comes with two different implementations, a Python one
+  (pyvnc2swf) and C one (vnc2swf).
+  </longdescription>
+  <use>
+    <flag name="x11vnc">Install script that depends on x11vnc</flag>
+  </use>
+</pkgmetadata>
diff --git a/x11-misc/vnc2swf/vnc2swf-0.5.0-r1.ebuild b/x11-misc/vnc2swf/vnc2swf-0.5.0-r1.ebuild
new file mode 100644
index 000000000000..232f807f4736
--- /dev/null
+++ b/x11-misc/vnc2swf/vnc2swf-0.5.0-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils
+
+DESCRIPTION="A tool for recording Flash SWF movies from VNC sessions"
+HOMEPAGE="http://www.unixuser.org/~euske/vnc2swf"
+SRC_URI="http://www.unixuser.org/~euske/vnc2swf/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="x11vnc"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXaw
+	x11-libs/libXext
+	x11-libs/libXmu
+	x11-libs/libXt"
+DEPEND="${RDEPEND}
+	x11-proto/xextproto
+	x11-proto/xproto
+	sys-apps/sed
+	sys-libs/zlib
+	x11vnc? ( x11-misc/x11vnc )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	sed -ie "s:docs:html:" README || die
+	sed -ie "s:-mouse ::" recordwin.sh || die
+}
+
+src_install() {
+	dobin vnc2swf || die
+	if use x11vnc; then
+		# this USE flag is needed because recordwin
+		# only works on x11vnc
+		newbin recordwin.sh recordwin
+		dosed "s:./vnc2swf:vnc2swf:" /usr/bin/recordwin || die
+	fi
+	insinto /etc/X11/app-defaults
+	newins Vnc2Swf.ad Vnc2Swf || die
+	dodoc README*  || die
+	dohtml -a html,swf docs/* || die
+}
diff --git a/x11-misc/vym/Manifest b/x11-misc/vym/Manifest
new file mode 100644
index 000000000000..1c6f4566af90
--- /dev/null
+++ b/x11-misc/vym/Manifest
@@ -0,0 +1,2 @@
+DIST vym-2.3.22.tar.bz2 6737848 SHA256 92bd267fc2aa404e0f0887e780bae422be922c20d8037d743f32b16a4f8a16df SHA512 c6b15da272190e877d519153865e60f967a67cbdd4a0f56519f9c5a330605b97ea822f162ccf9fd57d1a4ec540d46e82c3004fa8e26c31786691b037ecb1c63e WHIRLPOOL e452abb36902e34afbe5b637c769a2bf17a9bb0d940ff72b46d55b19a821b26bce6ebad9bf125edb088a4e3d922a2fa2ab8dc096c378d1bee4efcb133519bb7b
+DIST vym-2.3.24.tar.bz2 6738245 SHA256 b719521b97cd1cf1ab881a46325519bd9c48191537eadac8d4251a08a0741e06 SHA512 360cc1b80ed9fe28aa2eb0574f3f481acc264aa96e49d438893c63e27262272420abb7d8eb94283a6e2218bd11810616dc46b756607b8003a94eb2ba8ae5197c WHIRLPOOL 66e374e2c7dbb2633872db149d4f85ea80ccbaa0cd26cf837502edc7197a0e3a03348befce7fb918aeedca2d31205594985a647dd4b6a597df75432b5f7d2a7e
diff --git a/x11-misc/vym/files/vym-2.3.22-arrowobj.patch b/x11-misc/vym/files/vym-2.3.22-arrowobj.patch
new file mode 100644
index 000000000000..5c1cd6fc57c0
--- /dev/null
+++ b/x11-misc/vym/files/vym-2.3.22-arrowobj.patch
@@ -0,0 +1,18 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -69,6 +69,7 @@
+       aboutdialog.h
+       taskfiltermodel.h
+       animpoint.h
++      arrowobj.h
+       attribute.h
+       attributeitem.h
+       #   attributedelegate.h
+@@ -156,6 +157,7 @@
+       aboutdialog.cpp
+       taskfiltermodel.cpp
+       animpoint.cpp
++      arrowobj.cpp
+       attribute.cpp
+       attributeitem.cpp
+       #   attributedelegate.cpp
diff --git a/x11-misc/vym/metadata.xml b/x11-misc/vym/metadata.xml
new file mode 100644
index 000000000000..33d6f84ad262
--- /dev/null
+++ b/x11-misc/vym/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>desktop-misc</herd>
+	<upstream>
+		<remote-id type="sourceforge">vym</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-misc/vym/vym-2.3.22.ebuild b/x11-misc/vym/vym-2.3.22.ebuild
new file mode 100644
index 000000000000..073ee6392a1e
--- /dev/null
+++ b/x11-misc/vym/vym-2.3.22.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils cmake-utils
+
+DESCRIPTION="View Your Mind, a mindmap tool"
+HOMEPAGE="http://www.insilmaril.de/vym/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="dbus"
+
+VYM_LINGUAS=( cs_CZ de_DE es fr ia it pt_BR ru sv zh_CN zh_TW )
+IUSE+=" ${VYM_LINGUAS[@]/#/linguas_}"
+
+DEPEND="
+	dev-qt/qtgui:4[qt3support]
+	dev-qt/qtsvg:4
+	dbus? ( dev-qt/qtdbus:4 )
+"
+RDEPEND="
+	${DEPEND}
+	app-arch/zip
+"
+
+DOCS=( README.txt doc/vym.pdf )
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-arrowobj.patch
+
+	local lingua
+	for lingua in ${VYM_LINGUAS[@]}; do
+		if ! use linguas_${lingua}; then
+			sed -i -e "/lang\/vym_${lingua}.ts/d" CMakeLists.txt || die
+			rm -r lang/vym_${lingua}.ts || die
+		fi
+	done
+	sed -i \
+		-e '/lang\/vym_en.ts/d' \
+		CMakeLists.txt || die
+	rm -r lang/vym_en.ts || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use !dbus NO_DBUS)
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	doman doc/vym.1.gz
+	if use linguas_es ; then
+		dodoc doc/vym_es.pdf
+	elif use linguas_fr ; then
+		dodoc doc/vym_fr.pdf
+	fi
+	make_desktop_entry vym vym /usr/share/vym/icons/vym.png Education
+}
diff --git a/x11-misc/vym/vym-2.3.24.ebuild b/x11-misc/vym/vym-2.3.24.ebuild
new file mode 100644
index 000000000000..fd7e47a00043
--- /dev/null
+++ b/x11-misc/vym/vym-2.3.24.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils cmake-utils
+
+DESCRIPTION="View Your Mind, a mindmap tool"
+HOMEPAGE="http://www.insilmaril.de/vym/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="dbus"
+
+VYM_LINGUAS=( cs_CZ de_DE es fr ia it pt_BR ru sv zh_CN zh_TW )
+IUSE+=" ${VYM_LINGUAS[@]/#/linguas_}"
+
+DEPEND="
+	dev-qt/qtgui:4[qt3support]
+	dev-qt/qtsvg:4
+	dbus? ( dev-qt/qtdbus:4 )
+"
+RDEPEND="
+	${DEPEND}
+	app-arch/zip
+"
+
+DOCS=( README.txt doc/vym.pdf )
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.3.22-arrowobj.patch
+
+	sed -i \
+		-e '/lang\/vym_en.ts/d' \
+		CMakeLists.txt || die
+	rm -r lang/vym_en.ts || die
+}
+
+src_configure() {
+	local lingua
+	for lingua in ${VYM_LINGUAS[@]}; do
+		if ! use linguas_${lingua}; then
+			sed -i -e "/lang\/vym_${lingua}.ts/d" CMakeLists.txt || die
+			rm -r lang/vym_${lingua}.ts || die
+		fi
+	done
+
+	local mycmakeargs=(
+		$(cmake-utils_use !dbus NO_DBUS)
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	doman doc/vym.1.gz
+	if use linguas_es ; then
+		dodoc doc/vym_es.pdf
+	elif use linguas_fr ; then
+		dodoc doc/vym_fr.pdf
+	fi
+	make_desktop_entry vym vym /usr/share/vym/icons/vym.png Education
+}
diff --git a/x11-misc/wayv/Manifest b/x11-misc/wayv/Manifest
new file mode 100644
index 000000000000..8f59630618af
--- /dev/null
+++ b/x11-misc/wayv/Manifest
@@ -0,0 +1 @@
+DIST wayv-0.3.tar.gz 139197 SHA256 7a655c63efbf19225a66f0617d4455c7b050631301033223d1292ffa40b284f3 SHA512 dda4dafc63c4393a726175597ae734b321e3c91ab6acd1b4b0ecae5861fa7c87ce83b68ae4a8bb92be9039b22ddb86f7e9ba87559d35095784eb98a5eda14681 WHIRLPOOL bf6393e2b83fc1f50342db703febb342ee0aafac613b9a174842ec5a8e84d64e8396e722ec02f84f2b02e806d0a4bd479bd1cdb48b0e005286748502426b060c
diff --git a/x11-misc/wayv/metadata.xml b/x11-misc/wayv/metadata.xml
new file mode 100644
index 000000000000..731225048652
--- /dev/null
+++ b/x11-misc/wayv/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>desktop-misc</herd>
+</pkgmetadata>
diff --git a/x11-misc/wayv/wayv-0.3-r2.ebuild b/x11-misc/wayv/wayv-0.3-r2.ebuild
new file mode 100644
index 000000000000..548ead453f19
--- /dev/null
+++ b/x11-misc/wayv/wayv-0.3-r2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit toolchain-funcs
+
+DESCRIPTION="Wayv is hand-writing/gesturing recognition software for X"
+HOMEPAGE="http://www.stressbunny.com/wayv"
+SRC_URI="http://www.stressbunny.com/gimme/wayv/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc x86"
+
+RDEPEND="
+	x11-libs/libX11
+	x11-libs/libXtst
+"
+DEPEND="
+	${RDEPEND}
+	x11-proto/inputproto
+	x11-proto/xproto
+"
+
+src_prepare() {
+	sed -i -e 's| = -Wall -O2| += |g' src/Makefile* || die
+	tc-export CC
+}
+
+src_install() {
+	default
+
+	cd doc
+	default
+	dodoc HOWTO*
+}
diff --git a/x11-misc/wbar/Manifest b/x11-misc/wbar/Manifest
new file mode 100644
index 000000000000..0b1ab5586c9f
--- /dev/null
+++ b/x11-misc/wbar/Manifest
@@ -0,0 +1 @@
+DIST wbar-2.3.4.tgz 189999 SHA256 46a69849e4436529aefb5cfb2c94b520d05a53c237e7773b90207f67f97a93e3 SHA512 07f3484bd071761d57ef1172c56b30980eef9ce2ee65d1fc21ea20c631a1da1d88c1b8a9e1a1fca0e5f18e7bf1c5697c349a543d72966ce71ff53d7e921147b3 WHIRLPOOL 3d5ff6e1ea5f9079c5e7ab2e9e59729795514415241f180c9438480d94c192180f725f6d541b117ed33728694f632fc11beb69bcfdb3dcbc03d4c211e2b28d31
diff --git a/x11-misc/wbar/files/wbar-2.3.3-cfg.patch b/x11-misc/wbar/files/wbar-2.3.3-cfg.patch
new file mode 100644
index 000000000000..5ffd82869983
--- /dev/null
+++ b/x11-misc/wbar/files/wbar-2.3.3-cfg.patch
@@ -0,0 +1,15 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Fri Sep 21 21:45:22 UTC 2012
+Subject: remove wbar-config for -gtk
+
+--- a/etc/wbar.cfg.in
++++ b/etc/wbar.cfg.in
+@@ -2,8 +2,3 @@
+ c: @PACKAGE_NAME@ @DEFAULT_ARGV@
+ t: none
+ 
+-i: @PIXMAPDIR@/@PACKAGE_NAME@/wbar.png
+-c: wbar-config
+-t: Config
+-
+-
diff --git a/x11-misc/wbar/files/wbar-2.3.3-desktopfile.patch b/x11-misc/wbar/files/wbar-2.3.3-desktopfile.patch
new file mode 100644
index 000000000000..79a5de15629d
--- /dev/null
+++ b/x11-misc/wbar/files/wbar-2.3.3-desktopfile.patch
@@ -0,0 +1,89 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date:   Fri Sep 21 17:08:32 2012 +0200
+
+	fix desktop file destination and QA issues
+
+diff --git a/configure.ac b/configure.ac
+index 00ad0b6..48fe73d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -83,6 +83,7 @@ AC_DEFINE_UNQUOTED(PIDOF_BIN, "$PIDOF_BIN ", [ program to retreive wbar pid ])
+ 
+ AC_CONFIG_FILES([Makefile \
+ share/Makefile \
++share/wbar.desktop.in \
+ etc/Makefile \
+ etc/wbar.cfg \
+ etc/wbar.desktop.in \
+diff --git a/etc/Makefile.am b/etc/Makefile.am
+index ec41c76..d78525e 100644
+--- a/etc/Makefile.am
++++ b/etc/Makefile.am
+@@ -3,7 +3,7 @@ CLEANFILES = *~ $(wbardesktop:.desktop.in.in=.desktop)
+ defaultdir = @DEFAULT_CONFIGDIR@
+ default_DATA = $(wbarcfg:.cfg.in=.cfg)
+ 
+-autostartdir = @DEFAULT_CONFIGDIR@
++autostartdir = $(sysconfdir)/xdg/autostart
+ autostart_DATA = $(wbardesktop:.desktop.in.in=.desktop)
+ 
+ bashcompletiondir = /etc/bash_completion.d
+diff --git a/po/POTFILES.in b/po/POTFILES.in
+index ddf920c..16ee6dd 100644
+--- a/po/POTFILES.in
++++ b/po/POTFILES.in
+@@ -1,3 +1,4 @@
++share/wbar.desktop.in
+ share/wbar.glade
+ src/config/Functions.cc
+ src/config/Functions.h
+diff --git a/po/POTFILES.skip b/po/POTFILES.skip
+index 327f139..27a8f48 100644
+--- a/po/POTFILES.skip
++++ b/po/POTFILES.skip
+@@ -1,2 +1,3 @@
+ etc/wbar.desktop.in.in
++share/wbar.desktop.in.in
+ 
+diff --git a/share/Makefile.am b/share/Makefile.am
+index 87c736b..66027d4 100644
+--- a/share/Makefile.am
++++ b/share/Makefile.am
+@@ -1,8 +1,17 @@
+-CLEANFILES = *~
++CLEANFILES = *~ $(wbardesktop:.desktop.in.in=.desktop)
+ 
+ gladedir = @GLADE_PACKAGE_DIR@
+ glade_DATA = @PACKAGE@.glade
+ 
++desktopfilesdir = $(prefix)/share/applications
++desktopfiles_DATA = $(wbardesktop:.desktop.in.in=.desktop)
++
++@INTLTOOL_DESKTOP_RULE@
++
++wbardesktop = wbar.desktop.in.in
++
+ EXTRA_DIST = \
+-$(glade_DATA)
++$(glade_DATA) \
++$(wbardesktop) \
++$(wbardesktop:.desktop.in.in=.desktop.in)
+ 
+diff --git a/share/wbar.desktop.in.in b/share/wbar.desktop.in.in
+new file mode 100644
+index 0000000..48fc33c
+--- /dev/null
++++ b/share/wbar.desktop.in.in
+@@ -0,0 +1,12 @@
++[Desktop Entry]
++_Name=Warlock Bar
++Type=Application
++Exec=@BINDIR@/@PACKAGE_NAME@
++Terminal=false
++Icon=@PIXMAPDIR@/@PACKAGE_NAME@.png
++_Comment=A light and fast launch bar.
++Categories=Utility;
++X-GNOME-Bugzilla-Bugzilla=GNOME
++X-GNOME-Bugzilla-Product=@PACKAGE_NAME@
++X-GNOME-Bugzilla-Component=general
++X-Ubuntu-Gettext-Domain=@PACKAGE_NAME@
diff --git a/x11-misc/wbar/files/wbar-2.3.3-nowerror.patch b/x11-misc/wbar/files/wbar-2.3.3-nowerror.patch
new file mode 100644
index 000000000000..2cf163bc4642
--- /dev/null
+++ b/x11-misc/wbar/files/wbar-2.3.3-nowerror.patch
@@ -0,0 +1,14 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Sun Aug 26 17:18:37 UTC 2012
+Subject: remove Werror
+
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -8,7 +8,6 @@
+ 	-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
+ 	-Wall \
+ 	-Wunused \
+-	-Werror \
+ 	-I$(top_srcdir)/src/utils
+ 
+ if WBAR_CONFIG
diff --git a/x11-misc/wbar/files/wbar-2.3.3-test.patch b/x11-misc/wbar/files/wbar-2.3.3-test.patch
new file mode 100644
index 000000000000..4468791a4202
--- /dev/null
+++ b/x11-misc/wbar/files/wbar-2.3.3-test.patch
@@ -0,0 +1,11 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Fri Sep 21 21:50:34 UTC 2012
+Subject: fix test phase
+
+--- a/po/POTFILES.in
++++ b/po/POTFILES.in
+@@ -1,3 +1,4 @@
++etc/wbar.desktop.in
+ share/wbar.desktop.in
+ share/wbar.glade
+ src/config/Functions.cc
diff --git a/x11-misc/wbar/files/wbar-2.3.4-automake-1.13.patch b/x11-misc/wbar/files/wbar-2.3.4-automake-1.13.patch
new file mode 100644
index 000000000000..d8f59518ca16
--- /dev/null
+++ b/x11-misc/wbar/files/wbar-2.3.4-automake-1.13.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -3,7 +3,7 @@
+ AC_INIT([wbar], [2.3.4])
+ AM_INIT_AUTOMAKE([ filename-length-max=256 tar-ustar ])
+ 
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+ AC_CONFIG_MACRO_DIR([m4])
+ 
+ AC_PROG_CXX
diff --git a/x11-misc/wbar/files/wbar-2.3.4-completion.patch b/x11-misc/wbar/files/wbar-2.3.4-completion.patch
new file mode 100644
index 000000000000..218d33442a9e
--- /dev/null
+++ b/x11-misc/wbar/files/wbar-2.3.4-completion.patch
@@ -0,0 +1,19 @@
+--- a/etc/wbar
++++ b/etc/wbar
+@@ -1,7 +1,6 @@
+ # bash completion for wbar
+ # Yadickson Soto yadickson@gmail.com
+ 
+-have wbar &&
+ _wbar()
+ {
+     local cur prev split=false
+@@ -106,7 +105,7 @@
+             -- "$cur") )
+ 
+     fi
+-} &&
++}
+ complete -F _wbar wbar
+ 
+ # Local variables:
diff --git a/x11-misc/wbar/metadata.xml b/x11-misc/wbar/metadata.xml
new file mode 100644
index 000000000000..a5d082ae569c
--- /dev/null
+++ b/x11-misc/wbar/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>desktop-misc</herd>
+	<use>
+		<flag name="gtk">Enables the gtk-based wbar-config GUI</flag>
+	</use>
+	<upstream>
+		<remote-id type="google-code">wbar</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-misc/wbar/wbar-2.3.4-r1.ebuild b/x11-misc/wbar/wbar-2.3.4-r1.ebuild
new file mode 100644
index 000000000000..1970cd096d8b
--- /dev/null
+++ b/x11-misc/wbar/wbar-2.3.4-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools bash-completion-r1 eutils
+
+DESCRIPTION="A fast, lightweight quick launch bar"
+HOMEPAGE="http://code.google.com/p/wbar/"
+SRC_URI="http://${PN}.googlecode.com/files/${P}.tgz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="gtk"
+
+RDEPEND="media-libs/imlib2[X]
+	x11-libs/libX11
+	gtk? ( gnome-base/libglade
+		media-libs/freetype:2
+		x11-libs/gdk-pixbuf:2
+		x11-libs/gtk+:2 )"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+src_prepare() {
+	use gtk || epatch "${FILESDIR}"/${PN}-2.3.3-cfg.patch
+	epatch \
+		"${FILESDIR}"/${PN}-2.3.3-desktopfile.patch \
+		"${FILESDIR}"/${PN}-2.3.3-nowerror.patch \
+		"${FILESDIR}"/${PN}-2.3.3-test.patch \
+		"${FILESDIR}"/${P}-automake-1.13.patch
+
+	sed -i \
+		-e "/^bashcompletiondir/s:=.*$:=$(get_bashcompdir):" \
+		etc/Makefile.am || die #482358
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable gtk wbar-config)
+}
+
+pkg_postinst() {
+	einfo
+	elog "media-libs/imlib2 needs to be compiled with the appropriate useflags"
+	elog "depending on your choice of image files (such as png, jpeg...)"
+	einfo
+}
diff --git a/x11-misc/wbar/wbar-2.3.4-r2.ebuild b/x11-misc/wbar/wbar-2.3.4-r2.ebuild
new file mode 100644
index 000000000000..2d357ca05432
--- /dev/null
+++ b/x11-misc/wbar/wbar-2.3.4-r2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools bash-completion-r1 eutils
+
+DESCRIPTION="A fast, lightweight quick launch bar"
+HOMEPAGE="http://code.google.com/p/wbar/"
+SRC_URI="http://${PN}.googlecode.com/files/${P}.tgz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gtk"
+
+RDEPEND="media-libs/imlib2[X]
+	x11-libs/libX11
+	gtk? ( gnome-base/libglade
+		media-libs/freetype:2
+		x11-libs/gdk-pixbuf:2
+		x11-libs/gtk+:2 )"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+src_prepare() {
+	use gtk || epatch "${FILESDIR}"/${PN}-2.3.3-cfg.patch
+
+	epatch \
+		"${FILESDIR}"/${PN}-2.3.3-desktopfile.patch \
+		"${FILESDIR}"/${PN}-2.3.3-nowerror.patch \
+		"${FILESDIR}"/${PN}-2.3.3-test.patch \
+		"${FILESDIR}"/${P}-automake-1.13.patch \
+		"${FILESDIR}"/${P}-completion.patch
+
+	sed -i \
+		-e "/^bashcompletiondir/s:=.*$:=$(get_bashcompdir):" \
+		etc/Makefile.am || die #482358
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable gtk wbar-config)
+}
+
+pkg_postinst() {
+	einfo
+	elog "media-libs/imlib2 needs to be compiled with the appropriate useflags"
+	elog "depending on your choice of image files (such as png, jpeg...)"
+	einfo
+}
diff --git a/x11-misc/wbarconf/Manifest b/x11-misc/wbarconf/Manifest
new file mode 100644
index 000000000000..5e43836b7bae
--- /dev/null
+++ b/x11-misc/wbarconf/Manifest
@@ -0,0 +1 @@
+DIST wbarconf-0.7.2.2.tar.gz 764073 SHA256 d0d0722b8db107983d22a0d4d00679d55ad0800ea81f3ce29869ee4f864c6089 SHA512 9be4fe4ccceb8432d601806e4e10c19d4072502b63648e1111537e8a693a64d78f2a08f12598bd7ab0b356a1a24ccf138bcd893cb0cccb5bf7fbf80caf9d9eba WHIRLPOOL 7fad64b6cc3aa39729a1f5533910641d5e4ea5bdd6b5ea9f38d0b473c2f39a94ab7c1d985222673da5041fa3593723e74301da366f45620f976cc90612ff3dd2
diff --git a/x11-misc/wbarconf/files/wbarconf-0.7.2.2-install.patch b/x11-misc/wbarconf/files/wbarconf-0.7.2.2-install.patch
new file mode 100644
index 000000000000..040d435bc797
--- /dev/null
+++ b/x11-misc/wbarconf/files/wbarconf-0.7.2.2-install.patch
@@ -0,0 +1,81 @@
+--- wbarconf/install.sh
++++ wbarconf/install.sh
+@@ -1,5 +1,6 @@
+ #!/bin/sh
+ startdir=$1
++version=0.7.2.2
+ 
+ if [ $(echo $1|wc -w) -eq 0 ];then
+ 	echo "Usage: install.sh /path/to"
+@@ -8,29 +9,28 @@
+ 	exit 1
+ fi
+ 
+-echo "Installing in to $startdir..."
++echo "Installing in to ${startdir}..."
+ 
++cd "$(dirname "$(readlink -f "$0")")" || exit 1
+ 
+-mkdir -p $startdir/bin/ || return 1
+-install -m0755 wbarconf $startdir/bin/ || return 1
++mkdir -p "${startdir}"/bin/ || exit 1
++install -m0755 wbarconf "${startdir}"/bin/ || exit 1
+ 
+-mkdir -p $startdir/share/wbarconf/
+-install -m0644 README $startdir/share/wbarconf/ || return 1
+-install -m0644 COPYING $startdir/share/wbarconf/ || return 1
++mkdir -p "${startdir}"/share/doc/wbarconf-${version}/wbarbacks/ || exit 1
++install -m0644 README "${startdir}"/share/doc/wbarconf-${version}/ || exit 1
++install -m0644 wbarbacks/README "${startdir}"/share/doc/wbarconf-${version}/wbarbacks/ || exit 1
+ 
+-mkdir -p $startdir/share/locale/ || return 1
+-cp -av locale/* $startdir/share/locale/ || return 1
+-chmod 0755 -R  $startdir/share/ || return 1
+-find $startdir/share/locale/ -name wbarconf.po -print | xargs rm -f
+-install -m0644 messages.pot $startdir/share/wbarconf/ || return 1
++find . -type d -name LC_MESSAGES -exec mkdir -p "${startdir}/share/{}" \; || exit 1
++find . -type f -name wbarconf.mo -exec install -m0644 '{}' "${startdir}/share/{}" \; || exit 1
+ 
+-cp -av wbarbacks $startdir/share/wbarconf/ || return 1
+-chmod 0655 -R  $startdir/share/wbarconf/ || return 1
++mkdir -p "${startdir}"/share/wbarconf/wbarbacks/ || exit 1
++install -m0644 messages.pot "${startdir}"/share/wbarconf/ || exit 1
++find ./wbarbacks -type f -name "*.png" -exec install -m0644 '{}' "${startdir}/share/wbarconf/{}" \; || exit 1
+ 
+-mkdir -p $startdir/share/pixmaps/
+-install -m0644 wbarconf.png $startdir/share/pixmaps/ || return 1
++mkdir -p "${startdir}"/share/pixmaps/ || exit 1
++install -m0644 wbarconf.png "${startdir}"/share/pixmaps/ || exit 1
+ 
+-mkdir -p $startdir/share/applications/
+-install -m0644 wbarconf.desktop $startdir/share/applications/ || return 1
++mkdir -p "${startdir}"/share/applications/ || exit 1
++install -m0644 wbarconf.desktop "${startdir}"/share/applications/ || exit 1
+ 
+ echo "Installation complete."
+--- wbarconf/wbarconf.desktop
++++ wbarconf/wbarconf.desktop
+@@ -2,10 +2,10 @@
+ Name=WbarConf
+ Exec=wbarconf 
+ Type=Application
+-Icon=wbarconf.png
++Icon=wbarconf
+ Terminal=false
+ StartupNotify=true
+-Categories=GTK;Utility; 
++Categories=GTK;Utility;
+ Comment=Configuration tool for wbar
+ Comment[de]=Konfigurationswerkzeug für Wbar
+ Comment[fi]=Asetustyökalu wbar:lle
+--- wbarconf/wbarconf
++++ wbarconf/wbarconf
+@@ -51,7 +51,7 @@
+     print("Gettext error, defaulting to english!")
+     #    return message
+ 
+-wbarversion="0.7.2.1"
++wbarversion="0.7.2.2"
+ 
+ ITEM_ID = 0
+ ITEM_ICON = 1
diff --git a/x11-misc/wbarconf/metadata.xml b/x11-misc/wbarconf/metadata.xml
new file mode 100644
index 000000000000..731225048652
--- /dev/null
+++ b/x11-misc/wbarconf/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>desktop-misc</herd>
+</pkgmetadata>
diff --git a/x11-misc/wbarconf/wbarconf-0.7.2.2-r1.ebuild b/x11-misc/wbarconf/wbarconf-0.7.2.2-r1.ebuild
new file mode 100644
index 000000000000..176bc9a5d1f9
--- /dev/null
+++ b/x11-misc/wbarconf/wbarconf-0.7.2.2-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+PYTHON_DEPEND="2:2.6"
+
+inherit eutils python
+
+DESCRIPTION="Configuration GUI for x11-misc/wbar"
+HOMEPAGE="http://koti.kapsi.fi/ighea/wbarconf/"
+SRC_URI="http://koti.kapsi.fi/ighea/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND=">=x11-misc/wbar-1.3.3
+	dev-python/pygobject:2
+	dev-python/pygtk:2
+	sys-devel/gettext"
+DEPEND=""
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-install.patch
+}
+
+src_install() {
+	./install.sh "${D}/usr" || die "./install.sh failed."
+}
diff --git a/x11-misc/wdm/Manifest b/x11-misc/wdm/Manifest
new file mode 100644
index 000000000000..cf73a0fc917a
--- /dev/null
+++ b/x11-misc/wdm/Manifest
@@ -0,0 +1 @@
+DIST wdm-1.28.tar.bz2 381522 SHA256 8a5cde0a4988d557d48bb7470f14f416d0b8ff6e20d7061643e6143f7b2be2c4
diff --git a/x11-misc/wdm/files/wdm-1.28-terminateServer.patch b/x11-misc/wdm/files/wdm-1.28-terminateServer.patch
new file mode 100644
index 000000000000..3e167bd818e5
--- /dev/null
+++ b/x11-misc/wdm/files/wdm-1.28-terminateServer.patch
@@ -0,0 +1,12 @@
+http://bugs.gentoo.org/290034
+
+--- configs/wdm-config.in
++++ configs/wdm-config.in
+@@ -21,6 +21,7 @@
+ DisplayManager*session:         @DMDIR@/Xsession
+ DisplayManager*authComplain:    false
+ DisplayManager*wdmLogin:        @exec_prefix@/bin/wdmLogin
++DisplayManager*terminateServer: true
+ !
+ ! display screen background--if not set or set to none, then the
+ !                            background is not set by wdm.
diff --git a/x11-misc/wdm/files/wdm-include b/x11-misc/wdm/files/wdm-include
new file mode 100644
index 000000000000..d8bf7862f436
--- /dev/null
+++ b/x11-misc/wdm/files/wdm-include
@@ -0,0 +1,6 @@
+#%PAM-1.0
+auth       include		system-auth
+auth       required		pam_nologin.so
+account    include		system-auth
+password   include		system-auth
+session    include		system-auth
diff --git a/x11-misc/wdm/files/wdm-include.1 b/x11-misc/wdm/files/wdm-include.1
new file mode 100644
index 000000000000..7f4f041b28ac
--- /dev/null
+++ b/x11-misc/wdm/files/wdm-include.1
@@ -0,0 +1,6 @@
+#%PAM-1.0
+auth       required		pam_nologin.so
+auth       include		system-auth
+account    include		system-auth
+password   include		system-auth
+session    include		system-auth
diff --git a/x11-misc/wdm/metadata.xml b/x11-misc/wdm/metadata.xml
new file mode 100644
index 000000000000..731225048652
--- /dev/null
+++ b/x11-misc/wdm/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>desktop-misc</herd>
+</pkgmetadata>
diff --git a/x11-misc/wdm/wdm-1.28-r3.ebuild b/x11-misc/wdm/wdm-1.28-r3.ebuild
new file mode 100644
index 000000000000..04b5fce3aa73
--- /dev/null
+++ b/x11-misc/wdm/wdm-1.28-r3.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+inherit eutils pam
+
+DESCRIPTION="WINGs Display Manager"
+HOMEPAGE="http://voins.program.ru/wdm/"
+SRC_URI="http://voins.program.ru/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ppc ~ppc64 ~sparc x86"
+IUSE="truetype pam selinux"
+
+COMMON_DEPEND=">=x11-wm/windowmaker-0.70.0
+	truetype? ( x11-libs/libXft )
+	x11-libs/libXmu
+	x11-libs/libXt
+	x11-libs/libXpm
+	pam? ( virtual/pam )"
+DEPEND="${COMMON_DEPEND}
+	sys-devel/gettext"
+RDEPEND="${COMMON_DEPEND}
+	pam? ( >=sys-auth/pambase-20080219.1 )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-terminateServer.patch
+}
+
+src_configure() {
+	econf \
+		--exec-prefix=/usr \
+		--with-wdmdir=/etc/X11/wdm \
+		$(use_enable pam) \
+		$(use_enable selinux)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	rm -f "${D}"/etc/pam.d/wdm
+	pamd_mimic system-local-login wdm auth account password session
+}
diff --git a/x11-misc/whaw/Manifest b/x11-misc/whaw/Manifest
new file mode 100644
index 000000000000..2df4242da43a
--- /dev/null
+++ b/x11-misc/whaw/Manifest
@@ -0,0 +1 @@
+DIST whaw-0.2.tar.gz 105440 SHA256 0aa010fd107adcf35bbedbf5bece6a01e9bf7773d5db90e94a8783a23637e027 SHA512 80f38353a867ceb9e9850bf3f723ec6f943a559ab4b38aad2a44818bc88f44d289e9d97acc82d25462bc48bb55fd462cea09b865829e595f1a2ede221b72fa7f WHIRLPOOL 567671cbc0e6bc898a7a6747a3bc49ecd1811785000f1afe45b3f09e7fa7376c323bee48b1937770c49aa9bdc7c1011b9cc1e753ab6c50aec2f147f1f2b1e306
diff --git a/x11-misc/whaw/files/whaw-0.2-fix-implicit-declaration-warning.patch b/x11-misc/whaw/files/whaw-0.2-fix-implicit-declaration-warning.patch
new file mode 100644
index 000000000000..155233b4b183
--- /dev/null
+++ b/x11-misc/whaw/files/whaw-0.2-fix-implicit-declaration-warning.patch
@@ -0,0 +1,10 @@
+--- whaw.c.orig	2014-05-15 12:11:22.404504530 +0400
++++ whaw.c	2014-05-15 12:11:43.004506325 +0400
+@@ -5,6 +5,7 @@
+ #include <X11/cursorfont.h>
+ #include <X11/extensions/Xinerama.h>
+ #include <assert.h>
++#include <ctype.h>
+ #include <popt.h>
+ #include <stdbool.h>
+ #include <stdio.h>
diff --git a/x11-misc/whaw/metadata.xml b/x11-misc/whaw/metadata.xml
new file mode 100644
index 000000000000..9b7650854d21
--- /dev/null
+++ b/x11-misc/whaw/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>pinkbyte@gentoo.org</email>
+		<name>Sergey Popov</name>
+	</maintainer>
+	<upstream>
+		<maintainer>
+			<email>john@repetae.net</email>
+			<name>John Meacham</name>
+		</maintainer>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-misc/whaw/whaw-0.2.ebuild b/x11-misc/whaw/whaw-0.2.ebuild
new file mode 100644
index 000000000000..08c605ad121d
--- /dev/null
+++ b/x11-misc/whaw/whaw-0.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils
+
+DESCRIPTION="Window manager independent Window Layout tool"
+HOMEPAGE="http://repetae.net/computer/whaw/"
+SRC_URI="http://repetae.net/computer/${PN}/drop/whaw-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-libs/popt
+	x11-libs/libX11
+	x11-libs/libXinerama
+	x11-libs/libXmu
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-fix-implicit-declaration-warning.patch"
+	epatch_user
+}
diff --git a/x11-misc/wininfo/Manifest b/x11-misc/wininfo/Manifest
new file mode 100644
index 000000000000..48f9877291ea
--- /dev/null
+++ b/x11-misc/wininfo/Manifest
@@ -0,0 +1 @@
+DIST wininfo-0.7.tar.gz 479409 RMD160 de71cf043e126f4bb0a10ecc3e323cd5bc588679 SHA1 b9d3b541cff1a05646678aa1608e079298c59c2a SHA256 8bb02068b183c684b04b4a5dc46dee041aa224c5843348cd16f2b53503b41833
diff --git a/x11-misc/wininfo/files/wininfo-0.7-desktop-entry.patch b/x11-misc/wininfo/files/wininfo-0.7-desktop-entry.patch
new file mode 100644
index 000000000000..478fb2e83481
--- /dev/null
+++ b/x11-misc/wininfo/files/wininfo-0.7-desktop-entry.patch
@@ -0,0 +1,14 @@
+diff -ur wininfo-0.7.orig/docs/xdg-wininfo.desktop wininfo-0.7/docs/xdg-wininfo.desktop
+--- wininfo-0.7.orig/docs/xdg-wininfo.desktop	2004-08-26 07:15:35.000000000 +0300
++++ wininfo-0.7/docs/xdg-wininfo.desktop	2008-02-02 14:46:55.000000000 +0200
+@@ -1,9 +1,8 @@
+ [Desktop Entry]
+-Encoding=UTF-8
+ Comment=A window information utility for X
+ Exec=wininfo
+ Name=X Window Information
+ GenericName=X Debugging Tool
+ Terminal=false
+ Type=Application
+-Categories=Application;Development;
++Categories=Development;GTK;
diff --git a/x11-misc/wininfo/metadata.xml b/x11-misc/wininfo/metadata.xml
new file mode 100644
index 000000000000..2518313f5241
--- /dev/null
+++ b/x11-misc/wininfo/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+        <herd>desktop-misc</herd>
+</pkgmetadata>
diff --git a/x11-misc/wininfo/wininfo-0.7.ebuild b/x11-misc/wininfo/wininfo-0.7.ebuild
new file mode 100644
index 000000000000..b990bc66abbf
--- /dev/null
+++ b/x11-misc/wininfo/wininfo-0.7.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+inherit eutils
+
+DESCRIPTION="An X app that follows your pointer providing information about the windows below"
+HOMEPAGE="http://freedesktop.org/Software/wininfo"
+SRC_URI="http://www.freedesktop.org/software/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE=""
+
+RDEPEND="x11-libs/gtk+:2
+	x11-libs/libX11
+	x11-libs/libXres
+	x11-libs/libXext"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-desktop-entry.patch
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed."
+	dodoc AUTHORS ChangeLog NEWS README
+}
diff --git a/x11-misc/winswitch/Manifest b/x11-misc/winswitch/Manifest
new file mode 100644
index 000000000000..12b8d7d9e647
--- /dev/null
+++ b/x11-misc/winswitch/Manifest
@@ -0,0 +1 @@
+DIST winswitch-0.12.18.src.tar.bz2 1193952 SHA256 466a6906d98b47381f0528410e1d833354dc20ea2855a0c0424a10c90cbc7e08 SHA512 841d269119ab3118acbbd7ad1c2d27203b45a72213fd9e8d75d937224d973e78110a05e5772a3856a3f3c9440633b200c7a0eab67a3d5b0125de22f33084819e WHIRLPOOL 18d783e8589b687435a278e8acce83a31fb720b8ec29a58e78a2f61649687ac2e998d11e780863cba5b26d062872f314b07ab5a277f9d1a67b5a446647df0d25
diff --git a/x11-misc/winswitch/files/winswitch-0.12.18-PIL.patch b/x11-misc/winswitch/files/winswitch-0.12.18-PIL.patch
new file mode 100644
index 000000000000..be6484dd1084
--- /dev/null
+++ b/x11-misc/winswitch/files/winswitch-0.12.18-PIL.patch
@@ -0,0 +1,84 @@
+https://bugs.gentoo.org/show_bug.cgi?id=471564
+https://winswitch.org/trac/ticket/238
+
+--- winswitch-0.12.18/winswitch/virt/xpra_client_util.py
++++ winswitch-0.12.18/winswitch/virt/xpra_client_util.py
+@@ -95,8 +95,8 @@
+ 		widgets = []
+ 		has_pil = False
+ 		try:
+-			import Image
+-			has_pil = Image is not None
++			import PIL.Image
++			has_pil = PIL.Image is not None
+ 		except:
+ 			pass
+ 		jw = self.get_encoding_widget(server, server_command, options, change_cb, has_pil)
+--- winswitch-0.12.18/winswitch/ui/capture_util.py
++++ winswitch-0.12.18/winswitch/ui/capture_util.py
+@@ -125,16 +125,16 @@
+ 		#resize it
+ 		img_data = load_binary_file(self.filename)
+ 		import StringIO
+-		import Image
+-		image = Image.open(StringIO.StringIO(img_data))
++		import PIL.Image
++		image = PIL.Image.open(StringIO.StringIO(img_data))
+ 		self.save_resized(image)
+ 
+ 	def save_resized(self, image):
+ 		""" save a PIL.Image after resizing it to thumbnail size """
+-		import Image
++		import PIL.Image
+ 		(w,h) = image.size
+ 		w,h = self.get_thumbnail_dimensions(w, h)
+-		image.thumbnail((w,h), Image.ANTIALIAS)
++		image.thumbnail((w,h), PIL.Image.ANTIALIAS)
+ 		image.save(self.filename, "PNG")
+ 
+ 
+@@ -190,13 +190,13 @@
+ 
+ 	def	do_capture(self):
+ 		#force py2exe to include these:
+-		import Image
+-		import GifImagePlugin
+-		import JpegImagePlugin
+-		import PngImagePlugin
+-		import ImageGrab
+-		assert Image and GifImagePlugin and JpegImagePlugin and PngImagePlugin and ImageGrab		#avoid pydev warnings
+-		screenshot = ImageGrab.grab()
++		import PIL.Image
++		import PIL.GifImagePlugin
++		import PIL.JpegImagePlugin
++		import PIL.PngImagePlugin
++		import PIL.ImageGrab
++		assert PIL.Image and PIL.GifImagePlugin and PIL.JpegImagePlugin and PIL.PngImagePlugin and PIL.ImageGrab		#avoid pydev warnings
++		screenshot = PIL.ImageGrab.grab()
+ 		self.save_resized(screenshot)
+ 		self.finish()
+ 
+--- winswitch-0.12.18/winswitch/util/icon_util.py
++++ winswitch-0.12.18/winswitch/util/icon_util.py
+@@ -27,7 +27,7 @@
+ 	HAS_CAIRO_RSVG = False
+ 
+ try:
+-	import Image
++	import PIL.Image
+ 	has_PIL = True
+ except:
+ 	has_PIL = False
+@@ -58,10 +58,10 @@
+ 	return	scaled_data
+ 
+ def pil_load_scaled_pixmap(filename, size_limit):
+-	img = Image.open(filename)
++	img = PIL.Image.open(filename)
+ 	(w,h) = img.size
+ 	if w>size_limit or h>size_limit:
+-		img.thumbnail((size_limit,size_limit), Image.ANTIALIAS)
++		img.thumbnail((size_limit,size_limit), PIL.Image.ANTIALIAS)
+ 	assert img
+ 	return	pil_image_to_png_data(img)
+ 
diff --git a/x11-misc/winswitch/metadata.xml b/x11-misc/winswitch/metadata.xml
new file mode 100644
index 000000000000..475f302a1746
--- /dev/null
+++ b/x11-misc/winswitch/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+	<email>xmw@gentoo.org</email>
+	<name>Michael Weber</name>
+</maintainer>
+<upstream>
+	<doc lang="en">http://winswitch.org/documentation/</doc>
+	<bugs-to>https://winswitch.org/trac/report</bugs-to>
+</upstream>
+</pkgmetadata>
+
diff --git a/x11-misc/winswitch/winswitch-0.12.18-r1.ebuild b/x11-misc/winswitch/winswitch-0.12.18-r1.ebuild
new file mode 100644
index 000000000000..cec3bfbe16da
--- /dev/null
+++ b/x11-misc/winswitch/winswitch-0.12.18-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="client server tool to start and control virtual desktops"
+HOMEPAGE="http://winswitch.org"
+SRC_URI="http://winswitch.org/src/${P}.src.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="dev-python/gst-python:0.10[${PYTHON_USEDEP}]
+	dev-python/netifaces[${PYTHON_USEDEP}]
+	dev-python/notify-python[${PYTHON_USEDEP}]
+	dev-python/pycrypto[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	dev-python/pygtk[${PYTHON_USEDEP}]
+	dev-python/twisted-core
+	dev-python/twisted-conch
+	media-gfx/xloadimage
+	virtual/python-imaging[${PYTHON_USEDEP}]
+	x11-misc/devilspie"
+DEPEND=""
+
+PATCHES=( "${FILESDIR}"/${P}-PIL.patch )
+
+python_prepare_all() {
+	einfo "Remove bundled Vash"
+	rm -rf skel/share/Vash || die
+	export PREFIX="${EPREFIX}"
+	distutils-r1_python_prepare_all
+}
+
+pkg_postinst() {
+	elog "You might want to install following packages for additional protocol functionality"
+	elog "    net-misc/tigervnc[?server]"
+	elog "    x11-wm/xpra[?server]"
+	elog "    || ( net-misc/nxclient net-misc/nx ) "
+	elog "and net-dns/avahi[python] for automatic server discovery"
+}
diff --git a/x11-misc/wmakerconf/Manifest b/x11-misc/wmakerconf/Manifest
new file mode 100644
index 000000000000..18e2eec2932a
--- /dev/null
+++ b/x11-misc/wmakerconf/Manifest
@@ -0,0 +1 @@
+DIST wmakerconf_2.12.tar.gz 830156 SHA256 debfc3b2a26fd4bd2dab4a06155b786e1b36e64145012410eb0de730a79a9bb3
diff --git a/x11-misc/wmakerconf/files/wmakerconf-2.12-wmaker-0.95_support.patch b/x11-misc/wmakerconf/files/wmakerconf-2.12-wmaker-0.95_support.patch
new file mode 100644
index 000000000000..5b598c3c1542
--- /dev/null
+++ b/x11-misc/wmakerconf/files/wmakerconf-2.12-wmaker-0.95_support.patch
@@ -0,0 +1,82 @@
+diff -Naur wmakerconf-2.12.orig/src/menu.c wmakerconf-2.12/src/menu.c
+--- wmakerconf-2.12.orig/src/menu.c	2012-02-10 17:34:57.601475631 +0100
++++ wmakerconf-2.12/src/menu.c	2012-02-10 17:35:03.917287748 +0100
+@@ -500,10 +500,10 @@
+  *  No return value.
+  */
+ {
+-   if (!WMWritePropListToFile (orig_wmaker, orig_wmaker_fname, YES))
++   if (!WMWritePropListToFile(orig_wmaker, orig_wmaker_fname))
+       warning (_("Can't revert to backupfile of `WindowMaker'. "
+ 		 "Please manually revert from file WindowMaker.bak."));
+-   if (orig_rootmenu && !WMWritePropListToFile (orig_rootmenu, orig_rootmenu_fname, YES))
++   if (orig_rootmenu && !WMWritePropListToFile(orig_rootmenu, orig_rootmenu_fname))
+       warning (_("Can't revert to backupfile of `WMRootMenu'. "
+ 		 "Please manually revert from file WMRootMenu.bak."));
+    gtk_main_quit ();
+diff -Naur wmakerconf-2.12.orig/src/rootmenu.c wmakerconf-2.12/src/rootmenu.c
+--- wmakerconf-2.12.orig/src/rootmenu.c	2012-02-10 17:34:57.601475631 +0100
++++ wmakerconf-2.12/src/rootmenu.c	2012-02-10 17:35:03.929287391 +0100
+@@ -365,7 +365,7 @@
+ 		       node_freeitem, NULL);
+       g_node_destroy (node);
+ 
+-      if (WMWritePropListToFile (menu, filename, YES))
++      if (WMWritePropListToFile(menu, filename))
+       {
+ 	 menu_changed = NO;
+ 	 message (_("Window Maker root menu file '%s' saved."), filename);
+diff -Naur wmakerconf-2.12.orig/src/themebrowser.c wmakerconf-2.12/src/themebrowser.c
+--- wmakerconf-2.12.orig/src/themebrowser.c	2012-02-10 17:34:57.601475631 +0100
++++ wmakerconf-2.12/src/themebrowser.c	2012-02-10 17:35:56.515722786 +0100
+@@ -2705,7 +2705,7 @@
+ 	 oldfiles = g_list_remove (oldfiles, tmp);
+ 	 Free (tmp);
+       }
+-      if (!WMWritePropListToFile (theme, stylename, YES))
++      if (!WMWritePropListToFile(theme, stylename))
+       {
+ 	 dialog_popup (DIALOG_ERROR, NULL, NULL,
+ 		       _("Can't save theme file\n`%s'\n"
+diff -Naur wmakerconf-2.12.orig/src/window.c wmakerconf-2.12/src/window.c
+--- wmakerconf-2.12.orig/src/window.c	2012-02-10 17:34:57.601475631 +0100
++++ wmakerconf-2.12/src/window.c	2012-02-10 17:35:03.953286677 +0100
+@@ -1069,7 +1069,7 @@
+ 	 WMReleasePropList (all_keys);
+       }
+ 
+-      if (WMWritePropListToFile (newwm, orig_wmaker_fname, YES))
++      if (WMWritePropListToFile(newwm, orig_wmaker_fname))
+       {
+ 	 changed = NO;
+ 	 message (_("Window Maker config file '%s' saved."),
+diff -Naur wmakerconf-2.12.orig/src/wmconfig.c wmakerconf-2.12/src/wmconfig.c
+--- wmakerconf-2.12.orig/src/wmconfig.c	2012-02-10 17:34:57.601475631 +0100
++++ wmakerconf-2.12/src/wmconfig.c	2012-02-10 17:35:03.957286559 +0100
+@@ -216,7 +216,7 @@
+ 	 /*
+ 	  *  Generate backup file "'path'.bak"
+ 	  */
+-	 if (WMWritePropListToFile (orig_rootmenu, new, YES))
++	 if (WMWritePropListToFile(orig_rootmenu, new))
+ 	    message (_("Backupfile `%s' generated."), new);
+ 	 else
+ 	    error (_("Can't write backupfile `%s'."), new);
+@@ -280,7 +280,7 @@
+    if (!windowmaker)
+    {
+       windowmaker = global_windowmaker;
+-      if (WMWritePropListToFile (windowmaker, orig_wmaker_fname, YES))
++      if (WMWritePropListToFile(windowmaker, orig_wmaker_fname))
+ 	 warning (_("New WindowMaker configuration file `%s' created."),
+ 		  orig_wmaker_fname);
+       else
+@@ -294,7 +294,7 @@
+       /*
+        *  Generate backup file "'path'.bak"
+        */
+-      if (WMWritePropListToFile (windowmaker, new, YES))
++      if (WMWritePropListToFile(windowmaker, new))
+ 	 message (_("Backupfile `%s' generated."), new);
+       else
+ 	 error (_("Can't write backupfile `%s'."), new);
diff --git a/x11-misc/wmakerconf/metadata.xml b/x11-misc/wmakerconf/metadata.xml
new file mode 100644
index 000000000000..1f7c89842d5d
--- /dev/null
+++ b/x11-misc/wmakerconf/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>gnustep</herd>
+	<upstream>
+		<remote-id type="sourceforge">wmakerconf</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-misc/wmakerconf/wmakerconf-2.12-r1.ebuild b/x11-misc/wmakerconf/wmakerconf-2.12-r1.ebuild
new file mode 100644
index 000000000000..13808a5c7f18
--- /dev/null
+++ b/x11-misc/wmakerconf/wmakerconf-2.12-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit eutils
+
+DESCRIPTION="X based config tool for the windowmaker X windowmanager"
+HOMEPAGE="http://wmakerconf.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P/-/_}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="imlib nls perl"
+
+RDEPEND="x11-libs/gtk+:2
+	>=x11-wm/windowmaker-0.95.2
+	imlib? ( media-libs/imlib )
+	perl? ( dev-lang/perl
+		dev-perl/HTML-Parser
+		|| ( dev-perl/libwww-perl
+		www-client/lynx
+		net-misc/wget ) )"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )
+	virtual/pkgconfig"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-wmaker-0.95_support.patch
+}
+
+src_configure() {
+	local myconf
+	use imlib || myconf="--disable-imlibtest"
+
+	econf \
+		$(use_enable perl upgrade) \
+		$(use_enable nls) \
+		${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" gnulocaledir="${ED}/usr/share/locale" install
+	dodoc AUTHORS ChangeLog MANUAL NEWS README TODO
+	doman man/*.1
+
+	rm -f "${ED}"/usr/share/${PN}/{AUTHORS,README,COPYING,NEWS,MANUAL,ABOUT-NLS,NLS-TEAM1,ChangeLog}
+}
+
+pkg_postinst() {
+	elog "New features added with WindowMaker >= 0.95 will not be available in wmakerconf"
+	elog "WPrefs is the recommended configuration tool"
+}
diff --git a/x11-misc/wmakerconf/wmakerconf-2.12.ebuild b/x11-misc/wmakerconf/wmakerconf-2.12.ebuild
new file mode 100644
index 000000000000..bf7a858760ef
--- /dev/null
+++ b/x11-misc/wmakerconf/wmakerconf-2.12.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=3
+
+DESCRIPTION="X based config tool for the windowmaker X windowmanager"
+HOMEPAGE="http://wmakerconf.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P/-/_}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+IUSE="imlib nls perl"
+
+RDEPEND="x11-libs/gtk+:2
+	<x11-wm/windowmaker-0.95.0
+	imlib? ( media-libs/imlib )
+	perl? ( dev-lang/perl
+		dev-perl/HTML-Parser
+		|| ( dev-perl/libwww-perl
+		www-client/lynx
+		net-misc/wget ) )"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )
+	virtual/pkgconfig"
+
+src_configure() {
+	local myconf
+	use imlib || myconf="--disable-imlibtest"
+
+	econf \
+		$(use_enable perl upgrade) \
+		$(use_enable nls) \
+		${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" gnulocaledir="${ED}/usr/share/locale" install || die
+	dodoc AUTHORS ChangeLog MANUAL NEWS README TODO
+	doman man/*.1
+
+	rm -f "${ED}"/usr/share/${PN}/{AUTHORS,README,COPYING,NEWS,MANUAL,ABOUT-NLS,NLS-TEAM1,ChangeLog}
+}
diff --git a/x11-misc/wmctrl/Manifest b/x11-misc/wmctrl/Manifest
new file mode 100644
index 000000000000..1fdd3695c9cc
--- /dev/null
+++ b/x11-misc/wmctrl/Manifest
@@ -0,0 +1 @@
+DIST wmctrl-1.07.tar.gz 87820 SHA256 d78a1efdb62f18674298ad039c5cbdb1edb6e8e149bb3a8e3a01a4750aa3cca9 SHA512 4c77ad1e204e8d444f682ad1d05c0993bcab9097ac6d4b6a944556ab85acbe713f549dbaf443cd4d1226a162ce7d46fbd209c92652e87fc8e609feee74907daa WHIRLPOOL a0c5112704b94c93e6ac1fd945222c04567f152359713e2224623291f654b68cf77c03612d16a2cc78166af59a2e6dc29835bae843e26ac96815cc9f8b38deef
diff --git a/x11-misc/wmctrl/files/amd64-Xlib.patch b/x11-misc/wmctrl/files/amd64-Xlib.patch
new file mode 100644
index 000000000000..a1039a825023
--- /dev/null
+++ b/x11-misc/wmctrl/files/amd64-Xlib.patch
@@ -0,0 +1,28 @@
+--- wmctrl-1.07.orig/main.c
++++ wmctrl-1.07/main.c
+@@ -1425,6 +1425,16 @@
+      *
+      * long_length = Specifies the length in 32-bit multiples of the
+      *               data to be retrieved.
++     *
++     * NOTE:  see 
++     * http://mail.gnome.org/archives/wm-spec-list/2003-March/msg00067.html
++     * In particular:
++     *
++     * 	When the X window system was ported to 64-bit architectures, a
++     * rather peculiar design decision was made. 32-bit quantities such
++     * as Window IDs, atoms, etc, were kept as longs in the client side
++     * APIs, even when long was changed to 64 bits.
++     *
+      */
+     if (XGetWindowProperty(disp, win, xa_prop_name, 0, MAX_PROPERTY_VALUE_LEN / 4, False,
+             xa_prop_type, &xa_ret_type, &ret_format,     
+@@ -1441,6 +1451,8 @@
+ 
+     /* null terminate the result to make string handling easier */
+     tmp_size = (ret_format / 8) * ret_nitems;
++    /* Correct 64 Architecture implementation of 32 bit data */
++    if(ret_format==32) tmp_size *= sizeof(long)/4;
+     ret = g_malloc(tmp_size + 1);
+     memcpy(ret, ret_prop, tmp_size);
+     ret[tmp_size] = '\0';
diff --git a/x11-misc/wmctrl/metadata.xml b/x11-misc/wmctrl/metadata.xml
new file mode 100644
index 000000000000..a0142a499218
--- /dev/null
+++ b/x11-misc/wmctrl/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
+	<longdescription>
+		 The wmctrl program is a command line tool to interact with an 
+		 EWMH/NetWM compatible X Window Manager. It provides command line 
+		 access to almost all the features defined in the EWMH specification.
+		 Using it, it's possible to, for example, obtain information about the
+		 window manager, get a detailed list of desktops and managed windows, 
+		 switch and resize desktops, change number of desktops, make windows 
+		 full-screen, always-above or sticky, and activate, close, move, 
+		 resize, maximize and minimize them. 
+	</longdescription>	
+</pkgmetadata>
diff --git a/x11-misc/wmctrl/wmctrl-1.07-r1.ebuild b/x11-misc/wmctrl/wmctrl-1.07-r1.ebuild
new file mode 100644
index 000000000000..bab0a2937e3a
--- /dev/null
+++ b/x11-misc/wmctrl/wmctrl-1.07-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils
+
+DESCRIPTION="command line tool to interact with an EWMH/NetWM compatible X Window Manager"
+HOMEPAGE="http://tomas.styblo.name/wmctrl/"
+SRC_URI="http://tomas.styblo.name/${PN}/dist/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ~sparc x86 ~x86-linux"
+IUSE=""
+
+RDEPEND=">=dev-libs/glib-2
+	x11-libs/libX11
+	x11-libs/libXt
+	x11-libs/libXmu"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	x11-proto/xproto"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/amd64-Xlib.patch" || die "Patch failed"
+}
+
+src_install () {
+	make DESTDIR="${D}" install || die "make install failed"
+	dodoc AUTHORS ChangeLog NEWS README
+}
diff --git a/x11-misc/wmiface/Manifest b/x11-misc/wmiface/Manifest
new file mode 100644
index 000000000000..f2185c428e72
--- /dev/null
+++ b/x11-misc/wmiface/Manifest
@@ -0,0 +1 @@
+DIST wmiface-2.1.tar.gz 95167 SHA256 45918a1e5a5e397111dc3f6ab78295a72a52fe61692b867073d2ff6d8f546a53 SHA512 767ec2f0a23def3a5e00c77702049356a08b6bad51becfa685e47be53408de5206c36df0aa394947318b3f54481646d2b0b1a4394e79cfe08281d8fb41a3e568 WHIRLPOOL 8e8c86a44ec679c3ffea44418e27cc762b6d952f1a4ea8b8ffa3d136da9aaf097345479000473c564d7c52b49ba51b92008aee4a57996f982c10501d3214ea1e
diff --git a/x11-misc/wmiface/metadata.xml b/x11-misc/wmiface/metadata.xml
new file mode 100644
index 000000000000..a23f444b67d6
--- /dev/null
+++ b/x11-misc/wmiface/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>kde</herd>
+</pkgmetadata>
diff --git a/x11-misc/wmiface/wmiface-2.1.ebuild b/x11-misc/wmiface/wmiface-2.1.ebuild
new file mode 100644
index 000000000000..b017c105c00c
--- /dev/null
+++ b/x11-misc/wmiface/wmiface-2.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-utils
+
+DESCRIPTION="Command line tool allowing user scripting of the running window manager"
+HOMEPAGE="http://kde-apps.org/content/show.php/WMIface?content=40425"
+SRC_URI="http://home.kde.org/~seli/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+RDEPEND="
+	dev-qt/qtcore:4
+	x11-libs/libX11
+"
+DEPEND="${DEPEND}
+	dev-qt/qtgui:4
+"
diff --git a/x11-misc/wmname/Manifest b/x11-misc/wmname/Manifest
new file mode 100644
index 000000000000..d7add68a9036
--- /dev/null
+++ b/x11-misc/wmname/Manifest
@@ -0,0 +1 @@
+DIST wmname-0.1.tar.gz 2512 SHA256 559ad188b2913167dcbb37ecfbb7ed474a7ec4bbcb0129d8d5d08cb9208d02c5 SHA512 e57100f8de2579f4090c0aaf5a5b134d03bcbcdca5c6d005b12ce39ad322d96651bb13d151cf259e935e6c50e7b21bde43a4eace112be80983a92f92b99f192f WHIRLPOOL d46dafea93cd673d6e6285e266745690a5ab9d4fac11f171d3c143fa04563bccfb6a4927cb052fd3d15f27a11b0e76245e1e86458b36a03fcde154283b46dd0d
diff --git a/x11-misc/wmname/files/wmname-0.1-buildsystem.patch b/x11-misc/wmname/files/wmname-0.1-buildsystem.patch
new file mode 100644
index 000000000000..bee2131d9bef
--- /dev/null
+++ b/x11-misc/wmname/files/wmname-0.1-buildsystem.patch
@@ -0,0 +1,26 @@
+--- wmname-0.1/config.mk
++++ wmname-0.1/config.mk
+@@ -16,9 +16,9 @@
+ 
+ # flags
+ CPPFLAGS = -DVERSION=\"${VERSION}\"
+-CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
+-LDFLAGS = -s ${LIBS}
++CFLAGS += -std=c99 -pedantic ${INCS} ${CPPFLAGS}
++LDFLAGS += ${LIBS}
+ 
+ # compiler and linker
+-CC = cc
+-LD = ${CC}
++CC ?= cc
++LD ?= ${CC}
+--- wmname-0.1/Makefile
++++ wmname-0.1/Makefile
+@@ -23,7 +23,6 @@
+ wmname: ${OBJ}
+ 	@echo LD $@
+ 	@${LD} -o $@ ${OBJ} ${LDFLAGS}
+-	@strip $@
+ 
+ clean:
+ 	@echo cleaning
diff --git a/x11-misc/wmname/metadata.xml b/x11-misc/wmname/metadata.xml
new file mode 100644
index 000000000000..59acc2cc580e
--- /dev/null
+++ b/x11-misc/wmname/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+<email>xmw@gentoo.org</email>
+<name>Michael Weber</name>
+</maintainer>
+</pkgmetadata>
+
diff --git a/x11-misc/wmname/wmname-0.1.ebuild b/x11-misc/wmname/wmname-0.1.ebuild
new file mode 100644
index 000000000000..e1d4f6967c2b
--- /dev/null
+++ b/x11-misc/wmname/wmname-0.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=3
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="utility to set the name of your window manager"
+HOMEPAGE="http://tools.suckless.org/wmname"
+SRC_URI="http://dl.suckless.org/tools/wmname-0.1.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~ppc ~sparc x86"
+IUSE=""
+
+RDEPEND="x11-libs/libX11"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-buildsystem.patch
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" LD="$(tc-getCC)" || die
+}
+
+src_install() {
+	emake CC="$(tc-getCC)" LD="$(tc-getCC)" \
+		PREFIX="${EPREFIX}"/usr DESTDIR="${D}" install || die
+	dodoc README || die
+}
diff --git a/x11-misc/x11vnc/Manifest b/x11-misc/x11vnc/Manifest
new file mode 100644
index 000000000000..4a60226b5686
--- /dev/null
+++ b/x11-misc/x11vnc/Manifest
@@ -0,0 +1,2 @@
+DIST 82eb9752485db87c9c6d3d6bb4aa1ae7ac81174a.zip 1830730 SHA256 fc6a28df089e47b68931019ce038b6e2fcd78e93de7f6984a22262252d01c16f SHA512 0fa4f7b52442793ec1bd82c74f9d092c69262e4f1fa93584fef17bbe0e5cbde08bc5ad0924631801bb43b41d90c37077a317c61511553f98698096eab05791eb WHIRLPOOL f1a45b549fb6ff9bea2eb4e3719b5dd43a78f6f418c61691cebab313d56761147d928648e103c654309575bec7c716a6f1cd1ef7a9b484c09edee37233cb0ce7
+DIST x11vnc-0.9.13.tar.gz 2853769 SHA256 f6829f2e629667a5284de62b080b13126a0736499fe47cdb447aedb07a59f13b SHA512 7b24e495f29122032e1c8ced7f7d8e0a56a2a8263e761a50725320742c99a0fcd5680d13038dd5d47e1c05d3b889d0caa13ba0b1aeda6fa42d5fb5ef3c43f908 WHIRLPOOL d812b257e70d6caccc6669c7fca89cacc590b5908c7877f62bdd14a159b0712b5b60e8587b6a385a5a68c46e15296ab838b07196786ac354fccb0759725685c4
diff --git a/x11-misc/x11vnc/files/x11vnc-0.9.13-shm-cleanup.patch b/x11-misc/x11vnc/files/x11vnc-0.9.13-shm-cleanup.patch
new file mode 100644
index 000000000000..0d5d78bdae0d
--- /dev/null
+++ b/x11-misc/x11vnc/files/x11vnc-0.9.13-shm-cleanup.patch
@@ -0,0 +1,35 @@
+fix that is already in upstream x11vnc-0.9.14 dev
+
+from ChromiumOS:
+
+x11vnc: Fix shm close on early shutdown.
+
+Global structures {scanline,fullscreen,scanrect}_shm are initialized to
+zero, including the .shmid field. This creates problems when shutdown /
+clean_shm is called before these structures are properly initialized in
+initialize_polling_images. shm_delete will be called on the structure,
+and since the shmid isn't -1, shmctl(id, IPC_RMID...) will be called for
+id=0. id=0 is in fact a valid shmid, and it might belong to some other
+shared memory for some other processes, creating many potential problems.
+
+Fix is to initialize shmid to -1 to indicate that it is in fact
+uninitialized.
+
+https://chromium-review.googlesource.com/37971
+
+--- a/x11vnc/x11vnc_defs.c
++++ b/x11vnc/x11vnc_defs.c
+@@ -82,10 +82,10 @@
+ XImage *raw_fb_image = NULL;	/* the raw fb */
+
+ /* corresponding shm structures */
+-XShmSegmentInfo scanline_shm;
+-XShmSegmentInfo fullscreen_shm;
++XShmSegmentInfo scanline_shm = {.shmid = -1};
++XShmSegmentInfo fullscreen_shm = {.shmid = -1};
+ XShmSegmentInfo *tile_row_shm;	/* for all possible row runs */
+-XShmSegmentInfo snaprect_shm;
++XShmSegmentInfo snaprect_shm = {.shmid = -1};
+
+ /* rfb screen info */
+ rfbScreenInfoPtr screen = NULL;
diff --git a/x11-misc/x11vnc/files/x11vnc-0.9.13-warnings.patch b/x11-misc/x11vnc/files/x11vnc-0.9.13-warnings.patch
new file mode 100644
index 000000000000..f80e83f196bc
--- /dev/null
+++ b/x11-misc/x11vnc/files/x11vnc-0.9.13-warnings.patch
@@ -0,0 +1,42 @@
+--- x11vnc-0.9.13.orig/x11vnc/remote.c
++++ x11vnc-0.9.13/x11vnc/remote.c
+@@ -5860,7 +5860,7 @@
+ 		}
+ 		if (!strcmp(p, "vncdisplay")) {
+ 			snprintf(buf, bufn, "aro=%s:%s", p,
+-			    NONUL(vnc_desktop_name));
++			    vnc_desktop_name);
+ 			goto qry;
+ 		}
+ 		if (!strcmp(p, "icon_mode")) {
+@@ -6062,7 +6062,7 @@
+ 		if (!strcmp(p, "h") || !strcmp(p, "help") ||
+ 		    !strcmp(p, "V") || !strcmp(p, "version") ||
+ 		    !strcmp(p, "lastmod")) {
+-			snprintf(buf, bufn, "aro=%s:%s", p, NONUL(lastmod));
++			snprintf(buf, bufn, "aro=%s:%s", p, lastmod);
+ 			goto qry;
+ 		}
+ 		if (!strcmp(p, "bg")) {
+--- x11vnc-0.9.13.orig/x11vnc/sslhelper.c
++++ x11vnc-0.9.13/x11vnc/sslhelper.c
+@@ -4041,7 +4041,7 @@
+ 				strncpy(last_get, rcookie, 100);
+ 				if (db) fprintf(stderr, "last_get: '%s'\n", last_get);
+ 			}
+-			if (rcookie && strstr(rcookie, "VncViewer.class")) {
++			if (strstr(rcookie, "VncViewer.class")) {
+ 				rfbLog("\n");
+ 				rfbLog("helper[%d]:\n", pid);
+ 				rfbLog("***********************************************************\n");
+--- x11vnc-0.9.13.orig/x11vnc/userinput.c
++++ x11vnc-0.9.13/x11vnc/userinput.c
+@@ -1305,7 +1305,7 @@
+ 	int font_size = 15;
+ 	int win_y, scr_y, loc_cut = 4*font_size, y_cut = 10*font_size;
+ 	
+-	if (!xrecord_set_by_keys || !xrecord_name_info) {
++	if (!xrecord_set_by_keys) {
+ 		return 0;
+ 	}
+ 	if (xrecord_name_info[0] == '\0') {
diff --git a/x11-misc/x11vnc/metadata.xml b/x11-misc/x11vnc/metadata.xml
new file mode 100644
index 000000000000..65577dd2b8e6
--- /dev/null
+++ b/x11-misc/x11vnc/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>proxy-maintainers</herd>
+	<maintainer>
+		<email>alex_y_xu@yahoo.ca</email>
+		<name>Alex Xu</name>
+		<description>Proxy maintainer. CC him on bugs</description>
+	</maintainer>
+	<longdescription>
+		The primary goal of this program is to create a portable and
+		simple command-line server utility that allows a VNC viewer
+		to connect to an actual X display.
+	</longdescription>
+	<use>
+		<flag name="system-libvncserver">Build x11vnc against the system
+			libvncserver (experimental)</flag>
+		<flag name="tk">Support the simple tcl/tk -gui option</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">libvncserver</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-misc/x11vnc/x11vnc-0.9.13-r1.ebuild b/x11-misc/x11vnc/x11vnc-0.9.13-r1.ebuild
new file mode 100644
index 000000000000..3993d81eeabe
--- /dev/null
+++ b/x11-misc/x11vnc/x11vnc-0.9.13-r1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="A VNC server for real X displays"
+HOMEPAGE="http://www.karlrunge.com/x11vnc/"
+SRC_URI="mirror://sourceforge/libvncserver/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="avahi crypt fbcon +jpeg ssl system-libvncserver threads tk xinerama +zlib"
+
+RDEPEND="
+	x11-libs/libXfixes
+	x11-libs/libXrandr
+	x11-libs/libX11
+	>=x11-libs/libXtst-1.1.0
+	x11-libs/libXdamage
+	x11-libs/libXext
+	avahi? ( >=net-dns/avahi-0.6.4 )
+	ssl? ( dev-libs/openssl )
+	system-libvncserver? ( >=net-libs/libvncserver-0.9.7[threads=,jpeg=,zlib=] )
+	!system-libvncserver? (
+		zlib? ( sys-libs/zlib )
+		jpeg? ( virtual/jpeg:0 )
+	)
+	tk? ( dev-lang/tk )
+	xinerama? ( x11-libs/libXinerama )"
+DEPEND="${RDEPEND}
+	x11-libs/libXt
+	x11-proto/inputproto
+	x11-proto/trapproto
+	x11-proto/recordproto
+	x11-proto/xproto
+	x11-proto/xextproto
+	xinerama? ( x11-proto/xineramaproto )"
+
+pkg_setup() {
+	if use avahi && ! use threads ; then
+		ewarn "Non-native avahi support has been enabled."
+		ewarn "Native avahi support can be enabled by also enabling the threads USE flag."
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-warnings.patch \
+		"${FILESDIR}"/${P}-shm-cleanup.patch
+}
+
+src_configure() {
+	# --without-v4l because of missing video4linux 2.x support wrt #389079
+	econf \
+		$(use_with system-libvncserver) \
+		$(use_with xinerama) \
+		--without-v4l \
+		$(use_with fbcon fbdev) \
+		$(use_with crypt) \
+		$(use_with ssl crypto) \
+		$(use_with ssl) \
+		$(use_with avahi) \
+		$(use_with jpeg) \
+		$(use_with zlib) \
+		$(use_with threads pthread)
+}
+
+src_install() {
+	default
+	dodoc x11vnc/{ChangeLog,README}
+	# Remove include files, which conflict with net-libs/libvncserver
+	rm -rf "${ED%/}"/usr/include
+}
diff --git a/x11-misc/x11vnc/x11vnc-0.9.13.ebuild b/x11-misc/x11vnc/x11vnc-0.9.13.ebuild
new file mode 100644
index 000000000000..c8f68aa19ea2
--- /dev/null
+++ b/x11-misc/x11vnc/x11vnc-0.9.13.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit eutils
+
+DESCRIPTION="A VNC server for real X displays"
+HOMEPAGE="http://www.karlrunge.com/x11vnc/"
+SRC_URI="mirror://sourceforge/libvncserver/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="avahi crypt fbcon +jpeg ssl system-libvncserver threads tk xinerama +zlib"
+
+RDEPEND="system-libvncserver? ( >=net-libs/libvncserver-0.9.7[threads=,jpeg=,zlib=] )
+	!system-libvncserver? (
+		zlib? ( sys-libs/zlib )
+		jpeg? ( virtual/jpeg:0 )
+	)
+	ssl? ( dev-libs/openssl )
+	tk? ( dev-lang/tk )
+	avahi? ( >=net-dns/avahi-0.6.4 )
+	xinerama? ( x11-libs/libXinerama )
+	x11-libs/libXfixes
+	x11-libs/libXrandr
+	x11-libs/libX11
+	>=x11-libs/libXtst-1.1.0
+	x11-libs/libXdamage
+	x11-libs/libXext"
+DEPEND="${RDEPEND}
+	x11-libs/libXt
+	xinerama? ( x11-proto/xineramaproto )
+	x11-proto/inputproto
+	x11-proto/trapproto
+	x11-proto/recordproto
+	x11-proto/xproto
+	x11-proto/xextproto"
+
+pkg_setup() {
+	if use avahi && ! use threads ; then
+		ewarn "Non-native avahi support has been enabled."
+		ewarn "Native avahi support can be enabled by also enabling the threads USE flag."
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-warnings.patch
+}
+
+src_configure() {
+	# --without-v4l because of missing video4linux 2.x support wrt #389079
+	econf \
+		$(use_with system-libvncserver) \
+		$(use_with avahi) \
+		$(use_with xinerama) \
+		$(use_with ssl) \
+		$(use_with ssl crypto) \
+		$(use_with crypt) \
+		--without-v4l \
+		$(use_with jpeg) \
+		$(use_with zlib) \
+		$(use_with threads pthread) \
+		$(use_with fbcon fbdev)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc x11vnc/{ChangeLog,README}
+	# Remove include files, which conflict with net-libs/libvncserver
+	rm -rf "${D}"/usr/include
+}
diff --git a/x11-misc/x11vnc/x11vnc-0.9.13_p20150111.ebuild b/x11-misc/x11vnc/x11vnc-0.9.13_p20150111.ebuild
new file mode 100644
index 000000000000..840a8a9f9c44
--- /dev/null
+++ b/x11-misc/x11vnc/x11vnc-0.9.13_p20150111.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools eutils
+
+DESCRIPTION="A VNC server for real X displays"
+HOMEPAGE="http://www.karlrunge.com/x11vnc/"
+SRC_URI="https://github.com/LibVNC/x11vnc/archive/82eb9752485db87c9c6d3d6bb4aa1ae7ac81174a.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="avahi crypt fbcon ssl xinerama"
+
+RDEPEND="
+	x11-libs/libX11
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrandr
+	>=x11-libs/libXtst-1.1.0
+	avahi? ( >=net-dns/avahi-0.6.4 )
+	ssl? ( dev-libs/openssl:= )
+	>=net-libs/libvncserver-0.9.8
+	xinerama? ( x11-libs/libXinerama )"
+DEPEND="${RDEPEND}
+	x11-libs/libXt
+	x11-proto/inputproto
+	x11-proto/trapproto
+	x11-proto/recordproto
+	x11-proto/xproto
+	x11-proto/xextproto
+	xinerama? ( x11-proto/xineramaproto )"
+
+S="${WORKDIR}/x11vnc-82eb9752485db87c9c6d3d6bb4aa1ae7ac81174a"
+
+DOCS=(ChangeLog README)
+
+src_prepare() {
+	eautoreconf
+}
+
+src_configure() {
+	# --without-v4l because of missing video4linux 2.x support wrt #389079
+	econf \
+		$(use_with avahi) \
+		$(use_with crypt) \
+		$(use_with fbcon fbdev) \
+		$(use_with ssl) \
+		$(use_with ssl crypto) \
+		--without-v4l \
+		$(use_with xinerama)
+}
diff --git a/x11-misc/x2vnc/Manifest b/x11-misc/x2vnc/Manifest
new file mode 100644
index 000000000000..a7cee933064e
--- /dev/null
+++ b/x11-misc/x2vnc/Manifest
@@ -0,0 +1 @@
+DIST x2vnc-1.7.2.tar.gz 82258 SHA256 dc076dc0dad1ae4ebf5bc95bf792812b2639e92e127efb9c68de6a53874c7001
diff --git a/x11-misc/x2vnc/files/expectk.patch b/x11-misc/x2vnc/files/expectk.patch
new file mode 100644
index 000000000000..5c5ba6887cb1
--- /dev/null
+++ b/x11-misc/x2vnc/files/expectk.patch
@@ -0,0 +1,17 @@
+--- tkx2vnc	2010-03-14 21:31:49.000000000 +0100
++++ tkx2vnc.new	2010-03-14 21:32:58.000000000 +0100
+@@ -1,10 +1,13 @@
+-#!/usr/bin/expectk -f
++#!/usr/bin/wish
+ 
+ # Name: tkx2vnc
+ # Author: David Noble
+ # Version: 1.0a
+ # Written: May 13, 2002
+ # Modified: May 15, 2002
++# Expect dependency fixed by Patrick Kursawe, March 14, 2010
++
++package require Expect
+ 
+ proc prompt {} {
+     global prefs
diff --git a/x11-misc/x2vnc/metadata.xml b/x11-misc/x2vnc/metadata.xml
new file mode 100644
index 000000000000..497c310b0dcd
--- /dev/null
+++ b/x11-misc/x2vnc/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>desktop-misc</herd>
+<maintainer>
+  <email>maintainer-needed@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-misc/x2vnc/x2vnc-1.7.2-r1.ebuild b/x11-misc/x2vnc/x2vnc-1.7.2-r1.ebuild
new file mode 100644
index 000000000000..ac24926814ca
--- /dev/null
+++ b/x11-misc/x2vnc/x2vnc-1.7.2-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils
+
+DESCRIPTION="Control a remote computer running VNC from X"
+HOMEPAGE="http://fredrik.hubbe.net/x2vnc.html"
+SRC_URI="http://fredrik.hubbe.net/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ppc sparc x86"
+IUSE="tk"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXScrnSaver
+	x11-libs/libXext
+	x11-libs/libXinerama"
+DEPEND="${RDEPEND}
+	x11-proto/scrnsaverproto
+	x11-proto/xproto
+	x11-proto/xineramaproto
+	tk? ( dev-tcltk/expect )"
+
+src_unpack() {
+		unpack ${A}
+		cd "${S}/contrib"
+		epatch "${FILESDIR}/expectk.patch"
+}
+
+src_install() {
+	dodir /usr/share /usr/bin
+	make DESTDIR="${D}" install || die
+	use tk && dobin contrib/tkx2vnc
+	dodoc ChangeLog README
+}
diff --git a/x11-misc/x2x/Manifest b/x11-misc/x2x/Manifest
new file mode 100644
index 000000000000..ed6e5419c7e2
--- /dev/null
+++ b/x11-misc/x2x/Manifest
@@ -0,0 +1,5 @@
+DIST x2x-1.27-keymap.diff.gz 1145 SHA256 7a18a9729868325b133fc62f5aaf759db9ebf20192e2d6d16b0dcf32927c7dc1 SHA512 46e0d9cef4b985523e4bf2d6c550d68f488c0975a007433f2a6c03d77541ce0cbdffd44ea29472fa6db4e8b804503cdaf9e8b5f9d72c56d902270cf3291ca37f WHIRLPOOL cec4095420fc46b9a19498aa4bc767605b451ab48369e4a7171ffc7cae3c76ba38bedaaecf9e67500ffff5f7becafde19afde9955b25288e6b4f00204c85a153
+DIST x2x-1.27-license.patch.gz 1001 SHA256 1b78a9de556622c72fd66bbf23245cd62cefe3c4e5ba37971f37c43eab2c9964 SHA512 cdff296ed3ea7d3d72b7d64f4878d94b63ee459a3487668b2174f54e4d2519daa1fb80ffec2cb3ce188032bb72148629cb276eb0d0311ed1f26c3da8066caed8 WHIRLPOOL c1945777befe38bbcc7c70ae89665337d8043d467d249bd5f1b707d1ab20b58766b54280bcd6ce53c3ab30b9473ab4f42fd92fce3799de25705b5149d371eba1
+DIST x2x-1.27.tar.gz 16776 SHA256 d27ffc37d801934e79a91aa8f413d9d6466297995bf7c88156842d1aec040a36 SHA512 c5f8b1ec49f9871bf0d8142a047a2dff9a6ee262dfafd459044c977973dd45e297186961a8793938fc8e328f2553ec4de97e06343bdf3550f3bc3f2368b23131 WHIRLPOOL 6900c30e8c937380812668048c01429a0e7af532042791cecdb5c877b191d146cac3fafc8c47beebea96bcfc983abbe4b03414f85b768c5bc40169e148344028
+DIST x2x_1.27-8-initvars.patch.gz 494 SHA256 b34173edeae1a5dd06ead2f9712ac4f28018b2723921054286d851366cdf9920 SHA512 53060affef7575106932380063616473103c738193fdeab9118e0fb9ec1d1de2fe63f4112e5af82fe38198d0b42a10effde574bb9dee95c8fefdbdf680dbdf01 WHIRLPOOL 369a6af91841fc50435c74bda8f0a76b99669bcd0a1642990746755874c26c2cf7477502f4017c84c6485f3352854985b19634ed06ce7db641307c2a13c18572
+DIST x2x_1.27-8.diff.gz 13291 SHA256 d20fcc3e81ef60ef4720737883642739bb744a1d690c74b33d9086118e8b10ab SHA512 8201ab5fd0efd93adec53cec3b48f7b4de907b2db184ffa6e85a1e16739b4d0021f4562820d0b4730a0f6a2779985b5574973c2b0ceb04b241f0d7dc15060b71 WHIRLPOOL de2e1a36f733dba3050ec22b42d2c394e4e64a16a78dc650fd88839fab3d71f7ab7db202af075bb35f662b41d44561dfb73931d9be86b5374d6ebc9987aca852
diff --git a/x11-misc/x2x/metadata.xml b/x11-misc/x2x/metadata.xml
new file mode 100644
index 000000000000..731225048652
--- /dev/null
+++ b/x11-misc/x2x/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>desktop-misc</herd>
+</pkgmetadata>
diff --git a/x11-misc/x2x/x2x-1.27-r3.ebuild b/x11-misc/x2x/x2x-1.27-r3.ebuild
new file mode 100644
index 000000000000..e0834f4d008f
--- /dev/null
+++ b/x11-misc/x2x/x2x-1.27-r3.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="A utility to connect the Mouse and KeyBoard to another X"
+HOMEPAGE="http://www.the-labs.com/X11/#x2x"
+LICENSE="x2x"
+SRC_URI="http://ftp.digital.com/pub/Digital/SRC/x2x/${P}.tar.gz
+	mirror://debian/pool/main/x/x2x/x2x_1.27-8.diff.gz
+	mirror://gentoo/x2x_1.27-8-initvars.patch.gz
+	mirror://gentoo/${P}-license.patch.gz
+	mirror://gentoo/${P}-keymap.diff.gz"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~mips ppc x86"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXtst
+	x11-libs/libXext"
+DEPEND="${RDEPEND}
+	x11-proto/inputproto
+	app-text/rman
+	x11-misc/imake
+	x11-proto/xproto"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Patch from Debian to add -north and -south, among other fixes
+	epatch "${DISTDIR}"/x2x_1.27-8.diff.gz
+	# Revert part of debian patch messing with CFLAGS
+	sed -i '/CFLAGS = -Wall/d' Imakefile || die
+
+	# Fix variable initialization in Debian patch
+	epatch "${DISTDIR}"/x2x_1.27-8-initvars.patch.gz
+
+	# Patch to add LICENSE
+	epatch "${DISTDIR}"/${P}-license.patch.gz
+
+	# Patch to fix bug #126939
+	# AltGr does not work in x2x with different keymaps:
+	epatch "${DISTDIR}"/${P}-keymap.diff.gz
+
+	# Man-page is packaged as x2x.1 but needs to be x2x.man for building
+	mv x2x.1 x2x.man || die
+}
+
+src_compile() {
+	xmkmf || die
+	emake CC="$(tc-getCC)" CDEBUGFLAGS="${CFLAGS}" \
+		EXTRA_LDOPTIONS="${LDFLAGS}" || die
+}
+
+src_install () {
+	emake DESTDIR="${D}" install || die
+	newman x2x.man x2x.1 || die
+}
diff --git a/x11-misc/xac/Manifest b/x11-misc/xac/Manifest
new file mode 100644
index 000000000000..5e6473b8dd7c
--- /dev/null
+++ b/x11-misc/xac/Manifest
@@ -0,0 +1 @@
+DIST xac-0.6_pre4.tar.bz2 37409 SHA256 ff34e1e6e7027a22e712307e3832423b512af894e8ad9678e2f5d022a699a4d4
diff --git a/x11-misc/xac/files/x86-biosfix.patch b/x11-misc/xac/files/x86-biosfix.patch
new file mode 100644
index 000000000000..918cdf131d55
--- /dev/null
+++ b/x11-misc/xac/files/x86-biosfix.patch
@@ -0,0 +1,40 @@
+diff -u -B -r1.1 -r1.2
+--- src/bioscall.h	25 Aug 2006 19:48:26 -0000	1.1
++++ src/bioscall.h	30 Sep 2009 15:05:49 -0000	1.2
+@@ -1,6 +1,8 @@
+ #ifndef bioscall_h
+ #define bioscall_h
+ 
++#include "int10defs.h"
++
+ /* Print some of the interesting parts of a vm86_regs structure. */
+ void dump_regs(struct vm86_regs *regs);
+ 
+diff -u -B -r1.1 -r1.2
+--- src/lrmi.h	25 Aug 2006 19:48:26 -0000	1.1
++++ src/lrmi.h	30 Sep 2009 15:05:49 -0000	1.2
+@@ -26,6 +26,8 @@
+ #ifndef LRMI_H
+ #define LRMI_H
+ 
++#include "int10defs.h"
++
+ #if defined(__i386__) && (defined(__linux__) || defined(__NetBSD__) \
+ 	|| defined(__FreeBSD__) || defined(__OpenBSD__))
+ 
+diff -Naur
+--- src/int10defs.h 
++++ src/int10defs.h 30 Sep 2009 15:05:49 -0000
+@@ -0,0 +1,12 @@
++/* Fix missing INT10 defines */
++#ifndef IF_MASK
++#define TF_MASK		0x00000100
++#define IF_MASK		0x00000200
++#define IOPL_MASK	0x00003000
++#define NT_MASK		0x00004000
++#define VM_MASK		0x00020000
++#define AC_MASK		0x00040000
++#define VIF_MASK	0x00080000	/* virtual interrupt flag */
++#define VIP_MASK	0x00100000	/* virtual interrupt pending */
++#define ID_MASK		0x00200000
++#endif
diff --git a/x11-misc/xac/metadata.xml b/x11-misc/xac/metadata.xml
new file mode 100644
index 000000000000..487b7c36eb44
--- /dev/null
+++ b/x11-misc/xac/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+<email>josejx@gentoo.org</email>
+<name>Joseph Jezak</name>
+</maintainer>
+<longdescription lang="en">
+X.org autoconfiguration tool written in python.
+</longdescription>
+</pkgmetadata>
diff --git a/x11-misc/xac/xac-0.6_pre4.ebuild b/x11-misc/xac/xac-0.6_pre4.ebuild
new file mode 100644
index 000000000000..398aeff936bf
--- /dev/null
+++ b/x11-misc/xac/xac-0.6_pre4.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit toolchain-funcs eutils multilib
+
+DESCRIPTION="Xorgautoconfig (xac) generates configuration files for X.org"
+HOMEPAGE="http://dev.gentoo.org/~josejx/xac.html"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ppc ppc64 ~x86"
+SLOT="0"
+IUSE="livecd"
+DEPEND=">=dev-lang/python-2.3
+	   sys-apps/pciutils"
+RDEPEND=">=dev-lang/python-2.3
+		x11-base/xorg-server"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	### Replace /usr/lib/xac with libdir version
+	sed -i "s:/usr/lib/xac:/usr/$(get_libdir)/xac:" xac
+
+	### Fix the x86 bios call with newer glibc
+	epatch "${FILESDIR}/x86-biosfix.patch"
+
+	### Make setup.py executable
+	chmod +x "${S}/src/setup.py"
+}
+
+src_compile() {
+	### Compile the C bindings
+	cd "${S}"/src
+	./setup.py build || die "Failed to build the C modules"
+}
+
+src_install() {
+	local xac_base="/usr/$(get_libdir)/xac"
+
+	dosbin "${S}"/xac
+
+	### Install the C mods
+	cd "${S}"/src
+	./setup.py install --root "${D}" || die "Failed to install the C modules"
+
+	dodir "${xac_base}"
+	insinto ${xac_base}
+	doins "${S}"/py/*
+
+	### Only install the init scripts if livecd is enabled
+	if use livecd; then
+		newinitd "${S}"/xac.init xac
+		newconfd "${S}"/xac.conf xac
+	fi
+}
diff --git a/x11-misc/xaos/Manifest b/x11-misc/xaos/Manifest
new file mode 100644
index 000000000000..d7888a39fbfb
--- /dev/null
+++ b/x11-misc/xaos/Manifest
@@ -0,0 +1,3 @@
+DIST xaos-3.5.tar.gz 2930590 SHA256 471fa752154a8e4c4687797fe1241df1b3f82400b2ef4e6a603969a27cd74842 SHA512 c0d9e88de7767a9c62bf2fe6e49e4115d992882cd0780acf61fc14539364d383b275b7f589de353e0b025f43efc54986f19c0722322aedd992027e788295d1df WHIRLPOOL be6b0d5314b19e2a39a46a959ec7e9bf820958eddb43f105b40f02c2a58b00f983aaccce5678ade413b9004bd07a483140b0b6c71313b9fcc6686b74ea6eb82d
+DIST xaos-3.6.tar.gz 2040707 SHA256 989f3e38f7793810cbb1496d5291d44836a7d7c058422b9ee1cffb163a0b8d95 SHA512 5f61df978b7842b84a52cfb28f7daf1a5ab11d9d7adadbd0dd5bfb60240fcb2fc59b2a3d34faff7896c0c44c32daaf3941071d70db3d58b06b1aef1bcd1022c1 WHIRLPOOL c860b2b16150ffd285a0617ba5f1fcd87d6840df47152258cb54c2ea78171574c96427a8ac2ad05cbe7c80c9dde36b290fe3d2681679bd0135df430873dd2d14
+DIST xaos.png.tar 10240 SHA256 23806369fa304bf58439f39d9c672fe7f2b4293b3b1bfcccffd0c7994faeaa6a SHA512 43d51a07ac8014162b0ff4e9bbefdeeca759d3613816a95149b6fd2397b7c661adcfb33bb45b8de4dedfa41d8799ef7df3eacb426712679e867098eaf144a262 WHIRLPOOL 3c13eaf9c287c035cb6fcdd4150daac9e97bedbc258064b53e68095656cac1faf959c691e847e7a263a3c43938e820bb7da6e1589ced9ed33aa2821252b22298
diff --git a/x11-misc/xaos/files/xaos-3.4-include.patch b/x11-misc/xaos/files/xaos-3.4-include.patch
new file mode 100644
index 000000000000..65f7b8c5630c
--- /dev/null
+++ b/x11-misc/xaos/files/xaos-3.4-include.patch
@@ -0,0 +1,7 @@
+--- src/util/thread.c.orig	2009-03-28 10:50:49.817619387 +0000
++++ src/util/thread.c	2009-03-28 10:59:40.048185946 +0000
+@@ -1,3 +1,4 @@
++#include <stdlib.h>
+ #ifndef _plan9_
+ #include <signal.h>
+ #include <stdio.h>
diff --git a/x11-misc/xaos/files/xaos-3.4-png.patch b/x11-misc/xaos/files/xaos-3.4-png.patch
new file mode 100644
index 000000000000..454f8acaa994
--- /dev/null
+++ b/x11-misc/xaos/files/xaos-3.4-png.patch
@@ -0,0 +1,11 @@
+--- configure.in.orig	2009-03-28 09:50:18.764999182 +0000
++++ configure.in	2009-03-28 09:49:18.685947638 +0000
+@@ -98,7 +98,7 @@
+ AC_ARG_WITH(png,
+         [  --with-png=yes/no       enables/disables PNG saving support],[
+ 	if test x$withval = xyes; then
+-	  png=test
++	  png=yes
+ 	fi
+ 	if test x$withval = xno; then
+ 	  png=no
diff --git a/x11-misc/xaos/files/xaos-3.5-build-fix-i686.patch b/x11-misc/xaos/files/xaos-3.5-build-fix-i686.patch
new file mode 100644
index 000000000000..4736dd389b5a
--- /dev/null
+++ b/x11-misc/xaos/files/xaos-3.5-build-fix-i686.patch
@@ -0,0 +1,20 @@
+--- xaos-3.5/src/engine/zoomd.c.orig	2009-07-18 00:50:31.000000000 +0100
++++ xaos-3.5/src/engine/zoomd.c	2012-05-20 19:04:55.891065437 +0100
+@@ -280,6 +280,7 @@ dosymetry2(void /*@unused@ */ *data, str
+ #endif
+ #undef bpp1
+ 
++REGISTERS(0)
+ static INLINE void fillline(int line)
+ {
+     register unsigned char *RESTRICT vbuff = cimage.currlines[line];
+--- xaos-3.5/src/engine/zoom.c.fix-build	2009-07-18 00:50:31.000000000 +0100
++++ xaos-3.5/src/engine/zoom.c	2012-05-20 19:11:53.625083113 +0100
+@@ -933,6 +933,7 @@ static /*INLINE */ void preparemoveoldpo
+ }
+ 
+ #ifndef USE_i386ASM
++REGISTERS(0)
+ static /*INLINE */ void
+ moveoldpoints(void /*@unused@ */ *data1,
+ 	      struct taskinfo /*@unused@ */ *task,
diff --git a/x11-misc/xaos/files/xaos-3.5-gettext.patch b/x11-misc/xaos/files/xaos-3.5-gettext.patch
new file mode 100644
index 000000000000..b83b24346cd8
--- /dev/null
+++ b/x11-misc/xaos/files/xaos-3.5-gettext.patch
@@ -0,0 +1,88 @@
+diff -ur xaos-3.5.orig/src/i18n/cs.po xaos-3.5/src/i18n/cs.po
+--- xaos-3.5.orig/src/i18n/cs.po	2014-06-08 15:19:23.313803520 +0200
++++ xaos-3.5/src/i18n/cs.po	2014-06-08 15:20:35.071009379 +0200
+@@ -10,6 +10,7 @@
+ "PO-Revision-Date: 2002-08-17 21:44+0200\n"
+ "Last-Translator: MadSoft <madsoft@centrum.cz>\n"
+ "Language-Team: Czech\n"
++"Language: cs\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=ISO-8859-2\n"
+ "Content-Transfer-Encoding: 8-bit\n"
+diff -ur xaos-3.5.orig/src/i18n/de.po xaos-3.5/src/i18n/de.po
+--- xaos-3.5.orig/src/i18n/de.po	2014-06-08 15:19:23.314803662 +0200
++++ xaos-3.5/src/i18n/de.po	2014-06-08 15:20:59.684508120 +0200
+@@ -11,6 +11,7 @@
+ "PO-Revision-Date: 2008-04-27 21:48+0200\n"
+ "Last-Translator: \n"
+ "Language-Team:  <de@li.org>\n"
++"Language: de\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=ISO-8859-1\n"
+ "Content-Transfer-Encoding: 8bit\n"
+diff -ur xaos-3.5.orig/src/i18n/es.po xaos-3.5/src/i18n/es.po
+--- xaos-3.5.orig/src/i18n/es.po	2014-06-08 15:19:23.314803662 +0200
++++ xaos-3.5/src/i18n/es.po	2014-06-08 15:21:10.917104552 +0200
+@@ -10,6 +10,7 @@
+ "PO-Revision-Date: 2002-10-04 15:22+0200\n"
+ "Last-Translator: C�sar P�rez <oroz@users.sourceforge.net>\n"
+ "Language-Team: Spanish <es@li.org>\n"
++"Language: es\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=ISO-8859-1\n"
+ "Content-Transfer-Encoding: 8-bit\n"
+diff -ur xaos-3.5.orig/src/i18n/fr.po xaos-3.5/src/i18n/fr.po
+--- xaos-3.5.orig/src/i18n/fr.po	2014-06-08 15:19:23.315803804 +0200
++++ xaos-3.5/src/i18n/fr.po	2014-06-08 15:21:24.653056586 +0200
+@@ -10,6 +10,7 @@
+ "PO-Revision-Date: 2006-02-05 17:35+0200\n"
+ "Last-Translator: Philippe Wautelet <traduc _at_ fractalzone _dot_ be>\n"
+ "Language-Team: French\n"
++"Language: fr\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=ISO-8859-1\n"
+ "Content-Transfer-Encoding: 8-bit\n"
+diff -ur xaos-3.5.orig/src/i18n/hu.po xaos-3.5/src/i18n/hu.po
+--- xaos-3.5.orig/src/i18n/hu.po	2014-06-08 15:19:23.315803804 +0200
++++ xaos-3.5/src/i18n/hu.po	2014-06-08 15:21:49.950651185 +0200
+@@ -10,6 +10,7 @@
+ "PO-Revision-Date: 2002-08-17 21:44+0200\n"
+ "Last-Translator: Zoltan Kovacs <kovzol@math.u-szeged.hu>\n"
+ "Language-Team: Hungarian\n"
++"Language: hu\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=ISO-8859-2\n"
+ "Content-Transfer-Encoding: 8-bit\n"
+diff -ur xaos-3.5.orig/src/i18n/it.po xaos-3.5/src/i18n/it.po
+--- xaos-3.5.orig/src/i18n/it.po	2014-06-08 15:19:23.316803947 +0200
++++ xaos-3.5/src/i18n/it.po	2014-06-08 15:22:00.324125022 +0200
+@@ -11,6 +11,7 @@
+ "PO-Revision-Date: 2008-04-08 10:10+0000\n"
+ "Last-Translator: Sergio Zanchetta <Unknown>\n"
+ "Language-Team: Italian <it@li.org>\n"
++"Language: it\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=ISO-8859-1\n"
+ "Content-Transfer-Encoding: 8bit\n"
+diff -ur xaos-3.5.orig/src/i18n/pt.po xaos-3.5/src/i18n/pt.po
+--- xaos-3.5.orig/src/i18n/pt.po	2014-06-08 15:19:23.316803947 +0200
++++ xaos-3.5/src/i18n/pt.po	2014-06-08 15:22:12.961920461 +0200
+@@ -9,6 +9,7 @@
+ "PO-Revision-Date: 2009-06-01 14:07-0300\n"
+ "Last-Translator: Lucio de Araujo <lucio.matema@gmail.com>\n"
+ "Language-Team: Portuguese <zeliagarcia@seed.pr.gov.br>\n"
++"Language: pt\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=ISO-8859-1\n"
+ "Content-Transfer-Encoding: 8bit\n"
+diff -ur xaos-3.5.orig/src/i18n/ro.po xaos-3.5/src/i18n/ro.po
+--- xaos-3.5.orig/src/i18n/ro.po	2014-06-08 15:19:23.317804089 +0200
++++ xaos-3.5/src/i18n/ro.po	2014-06-08 15:22:21.969200049 +0200
+@@ -10,6 +10,7 @@
+ "PO-Revision-Date: 2008-04-28 11:21+0100\n"
+ "Last-Translator: Zoltan Kovacs <kovzol@matek.hu>\n"
+ "Language-Team: The XaoS Development Team <xaos-devel@lists.sf.net>\n"
++"Language: ro\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=utf-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
diff --git a/x11-misc/xaos/files/xaos-3.5-libpng15.patch b/x11-misc/xaos/files/xaos-3.5-libpng15.patch
new file mode 100644
index 000000000000..beece8339e31
--- /dev/null
+++ b/x11-misc/xaos/files/xaos-3.5-libpng15.patch
@@ -0,0 +1,131 @@
+http://code.google.com/p/gnuxaos/issues/detail?id=55
+
+--- src/util/png.c
++++ src/util/png.c
+@@ -3,6 +3,7 @@
+ #include <aconfig.h>
+ #ifdef USE_PNG
+ #include <png.h>
++#include <zlib.h>
+ #endif
+ #include <stdlib.h>
+ #include <stdio.h>
+@@ -31,6 +32,9 @@
+     png_structp png_ptr;
+     png_infop info_ptr;
+     png_color palette[256];
++    png_color_8 sig_bit;
++    int color_type;
++    int bit_depth;
+     volatile unsigned short a = 255;
+     volatile unsigned char *b = (volatile unsigned char *) &a;
+ #ifdef _undefined_
+@@ -59,7 +63,7 @@
+ 	png_destroy_write_struct(&png_ptr, (png_infopp) NULL);
+ 	return "No memory to create png info structure";
+     }
+-    if (setjmp(png_ptr->jmpbuf)) {
++    if (setjmp(png_jmpbuf(png_ptr))) {
+ 	png_destroy_write_struct(&png_ptr, &info_ptr);
+ 	fclose(file);
+ 	return strerror(errno);
+@@ -78,57 +82,70 @@
+     png_set_compression_window_bits(png_ptr, 15);
+     png_set_compression_method(png_ptr, 8);
+ 
+-    info_ptr->width = image->width;
+-    info_ptr->height = image->height;
+-    /*info_ptr->gamma=1.0; */
+-    info_ptr->gamma = 0.5;
+-    info_ptr->valid |= PNG_INFO_gAMA | PNG_INFO_pHYs;
+-    info_ptr->x_pixels_per_unit = (png_uint_32) (100 / image->pixelwidth);
+-    info_ptr->y_pixels_per_unit = (png_uint_32) (100 / image->pixelheight);
++    switch (image->palette->type)
++    {
++    case C256:
++	color_type = PNG_COLOR_TYPE_PALETTE;
++	bit_depth = image->bytesperpixel * 8;
++	break;
++    case SMALLITER:
++    case LARGEITER:
++    case GRAYSCALE:
++	color_type = PNG_COLOR_TYPE_GRAY;
++	bit_depth = image->bytesperpixel * 8;
++	break;
++    case TRUECOLOR:
++    case TRUECOLOR24:
++    case TRUECOLOR16:
++	color_type = PNG_COLOR_TYPE_RGB;
++	bit_depth = 8;
++	break;
++    }
+ 
++    png_set_IHDR (png_ptr, info_ptr, image->width, image->height, bit_depth,
++		  color_type, PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_BASE,
++		  PNG_FILTER_TYPE_BASE);
+ 
+     switch (image->palette->type) {
+     case C256:
+ 	{
+ 	    int i;
+-	    info_ptr->color_type = PNG_COLOR_TYPE_PALETTE;
+-	    info_ptr->bit_depth = image->bytesperpixel * 8;
+-	    info_ptr->palette = palette;
+-	    info_ptr->valid |= PNG_INFO_PLTE;
++	    png_color png_palette[257];
++	    int png_num_palette;
+ 	    for (i = 0; i < image->palette->end; i++)
+-		info_ptr->palette[i].red = image->palette->rgb[i][0],
+-		    info_ptr->palette[i].green = image->palette->rgb[i][1],
+-		    info_ptr->palette[i].blue = image->palette->rgb[i][2],
+-		    info_ptr->num_palette = image->palette->end;
++		png_palette[i].red = image->palette->rgb[i][0],
++		    png_palette[i].green = image->palette->rgb[i][1],
++		    png_palette[i].blue = image->palette->rgb[i][2],
++		    png_num_palette = image->palette->end;
++	    png_set_PLTE(png_ptr, info_ptr, png_palette, png_num_palette);
+ 	}
+ 	break;
+-    case SMALLITER:
+-    case LARGEITER:
+-    case GRAYSCALE:
+-	info_ptr->color_type = PNG_COLOR_TYPE_GRAY;
+-	info_ptr->bit_depth = image->bytesperpixel * 8;
+-	break;
+     case TRUECOLOR:
+     case TRUECOLOR24:
+     case TRUECOLOR16:
+-	info_ptr->color_type = PNG_COLOR_TYPE_RGB;
+-	info_ptr->bit_depth = 8;
+-	info_ptr->sig_bit.red = 8 - image->palette->info.truec.rprec;
+-	info_ptr->sig_bit.green = 8 - image->palette->info.truec.gprec;
+-	info_ptr->sig_bit.blue = 8 - image->palette->info.truec.bprec;
++	sig_bit.red = 8 - image->palette->info.truec.rprec;
++	sig_bit.green = 8 - image->palette->info.truec.gprec;
++	sig_bit.blue = 8 - image->palette->info.truec.bprec;
++	png_set_sBIT(png_ptr, info_ptr, &sig_bit);
+ 	break;
+     }
+-    info_ptr->interlace_type = 0;
++
++    png_write_info (png_ptr, info_ptr);
++
+ #ifdef _undefined_
+     png_set_text(png_ptr, info_ptr, comments,
+ 		 sizeof(comments) / sizeof(png_text));
+ #endif
+ 
+-    png_write_info(png_ptr, info_ptr);
++    png_set_gAMA(png_ptr, info_ptr, 0.5 /* 1.0 */);
++    png_set_pHYs(png_ptr, info_ptr, (png_uint_32) (100 / image->pixelwidth),
++		 (png_uint_32) (100 / image->pixelheight),
++		 PNG_RESOLUTION_UNKNOWN);
++
+     /*png_set_filler(png_ptr,0,PNG_FILLER_AFTER); */
+     png_set_packing(png_ptr);
+     if (image->palette->type & (TRUECOLOR | TRUECOLOR24 | TRUECOLOR16))
+-	png_set_shift(png_ptr, &(info_ptr->sig_bit));
++	png_set_shift (png_ptr, &sig_bit);
+     if (*b == 255)
+ 	png_set_swap(png_ptr);
+     png_set_bgr(png_ptr);
diff --git a/x11-misc/xaos/files/xaos-3.6-locale-dir.patch b/x11-misc/xaos/files/xaos-3.6-locale-dir.patch
new file mode 100644
index 000000000000..740f32d18985
--- /dev/null
+++ b/x11-misc/xaos/files/xaos-3.6-locale-dir.patch
@@ -0,0 +1,11 @@
+--- configure.in.orig	2014-06-09 10:54:18.459186718 -0700
++++ configure.in	2014-06-09 10:56:47.472204763 -0700
+@@ -141,7 +141,7 @@
+ dnl Checks for programs.
+ 
+ DRIVERDIRS=""
+-LOCALEDIR="/usr/share/locale"
++LOCALEDIR="$prefix/share/locale"
+ DRIVERLIBS="lib/libui.a lib/libui-hlp.a lib/libengine.a lib/libutil.a lib/libfilter.a"
+ AC_PROG_INSTALL
+ 
diff --git a/x11-misc/xaos/files/xaos-3.6-no-auto-strip.patch b/x11-misc/xaos/files/xaos-3.6-no-auto-strip.patch
new file mode 100644
index 000000000000..ab6e6b56a9b8
--- /dev/null
+++ b/x11-misc/xaos/files/xaos-3.6-no-auto-strip.patch
@@ -0,0 +1,20 @@
+--- Makefile.in.orig	2014-06-09 10:42:00.574129368 -0700
++++ Makefile.in	2014-06-09 10:43:04.035568767 -0700
+@@ -36,7 +36,7 @@
+ 	@INSTALL@ -d $(DESTDIR)$(datadir)/XaoS/help
+ 	@INSTALL@ -d $(DESTDIR)$(bindir)
+ 	@INSTALL@ -d $(DESTDIR)$(mandir)/man6
+-	@INSTALL@ -s bin/xaos $(DESTDIR)$(bindir)
++	@INSTALL@ bin/xaos $(DESTDIR)$(bindir)
+ 	@INSTALL@ -m 444 tutorial/*.x[ah]f $(DESTDIR)$(datadir)/XaoS/tutorial
+ 
+ 	@INSTALL@ -m 444 examples/README $(DESTDIR)$(datadir)/XaoS/examples
+@@ -49,7 +49,7 @@
+ 
+ 	@INSTALL@ -m 444 catalogs/*.cat catalogs/README $(DESTDIR)$(datadir)/XaoS/catalogs
+ 	@INSTALL@ -m 444 help/xaos.hlp $(DESTDIR)$(datadir)/XaoS/help
+-	@INSTALL@ -m 444 AUTHORS NEWS COPYING TODO INSTALL ChangeLog ChangeLog.old $(DESTDIR)$(datadir)/XaoS/doc
++	@INSTALL@ -m 444 AUTHORS NEWS TODO ChangeLog ChangeLog.old $(DESTDIR)$(datadir)/XaoS/doc
+ 	@INSTALL@ -m 444 doc/xaos.6 $(DESTDIR)$(mandir)/man6
+ 	test -z "$(infodir)" || @INSTALL@ -d "$(DESTDIR)$(infodir)"
+ 	@INSTALL@ -m 444 doc/xaos.info $(DESTDIR)$(infodir)/xaos.info
diff --git a/x11-misc/xaos/metadata.xml b/x11-misc/xaos/metadata.xml
new file mode 100644
index 000000000000..a359aa3b27f9
--- /dev/null
+++ b/x11-misc/xaos/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>sci</herd>
+  <longdescription lang="en">
+  XaoS is a fast, portable real-time interactive fractal zoomer. It
+  displays the Mandelbrot set (among other escape time fractals) and
+  allows you zoom smoothly into the fractal. Various coloring modes are
+  provided for both the points inside and outside the selected set. XaoS
+  supports switching between Julia and Mandelbrot fractal types and
+  on-the-fly plane switching.
+</longdescription>
+  <upstream>
+    <remote-id type="sourceforge">xaos</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/x11-misc/xaos/xaos-3.5-r1.ebuild b/x11-misc/xaos/xaos-3.5-r1.ebuild
new file mode 100644
index 000000000000..3a172260ee04
--- /dev/null
+++ b/x11-misc/xaos/xaos-3.5-r1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit eutils autotools
+
+DESCRIPTION="A very fast real-time fractal zoomer"
+HOMEPAGE="http://xaos.sf.net/"
+SRC_URI="
+	http://dev.gentoo.org/~jlec/distfiles/${PN}.png.tar
+	mirror://sourceforge/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="amd64 ppc sparc x86"
+IUSE="aalib doc -gtk nls png svga threads X"
+
+RDEPEND="
+	sci-libs/gsl
+	sys-libs/zlib
+	aalib? ( media-libs/aalib )
+	gtk? ( x11-libs/gtk+:2 )
+	png? ( media-libs/libpng )
+	X? ( x11-libs/libX11
+		 x11-libs/libXext
+		 x11-libs/libXxf86vm )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( virtual/texi2dvi )
+	X? (
+		x11-proto/xf86vidmodeproto
+		x11-proto/xextproto
+		x11-proto/xproto )"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-3.4-png.patch \
+		"${FILESDIR}"/${PN}-3.4-include.patch \
+		"${FILESDIR}"/${PN}-3.5-libpng15.patch \
+		"${FILESDIR}"/${PN}-3.5-build-fix-i686.patch \
+		"${FILESDIR}"/${PN}-3.5-gettext.patch
+	sed -i -e 's/-s//' Makefile.in
+	eautoreconf
+}
+
+src_configure() {
+	# use gsl and not nasm (see bug #233318)
+	econf \
+		--with-sffe=yes \
+		--with-gsl=yes \
+		$(use_enable nls) \
+		$(use_with png) \
+		$(use_with aalib aa-driver) \
+		$(use_with gtk gtk-driver) \
+		$(use_with threads pthread) \
+		$(use_with X x11-driver) \
+		$(use_with X x)
+}
+
+src_compile() {
+	default
+	if use doc; then
+		cd "${S}"/doc
+		emake xaos.dvi
+		dvipdf xaos.dvi || die
+		cd "${S}"/help
+		emake html
+	fi
+}
+
+src_install() {
+	default
+	if use doc; then
+		insinto /usr/share/doc/${PF}
+		doins doc/xaos.pdf
+		dohtml -r help/*
+	fi
+	local driver="x11"
+	use gtk && driver="\"GTK+ Driver\""
+	make_desktop_entry "xaos -driver ${driver}" "XaoS Fractal Zoomer" \
+		xaos "Application;Education;Math;Graphics;"
+	doicon "${WORKDIR}"/${PN}.png
+}
diff --git a/x11-misc/xaos/xaos-3.6.ebuild b/x11-misc/xaos/xaos-3.6.ebuild
new file mode 100644
index 000000000000..58546a88900f
--- /dev/null
+++ b/x11-misc/xaos/xaos-3.6.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=1
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
+inherit autotools-utils eutils
+
+DESCRIPTION="Very fast real-time fractal zoomer"
+HOMEPAGE="http://matek.hu/xaos/doku.php"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
+	http://dev.gentoo.org/~jlec/distfiles/${PN}.png.tar"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="aalib doc -gtk nls png svga threads X"
+
+RDEPEND="
+	sci-libs/gsl:0=
+	sys-libs/zlib:0=
+	aalib? ( media-libs/aalib:0= )
+	gtk? ( x11-libs/gtk+:2= )
+	nls? ( sys-devel/gettext )
+	png? ( media-libs/libpng:0= )
+	X? ( x11-libs/libX11:0=
+		 x11-libs/libXext:0=
+		 x11-libs/libXxf86vm:0= )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( virtual/texi2dvi )
+	X? (
+		x11-proto/xf86vidmodeproto
+		x11-proto/xextproto
+		x11-proto/xproto )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.4-png.patch
+	"${FILESDIR}"/${PN}-3.4-include.patch
+	"${FILESDIR}"/${PN}-3.5-build-fix-i686.patch
+	"${FILESDIR}"/${PN}-3.6-locale-dir.patch
+	"${FILESDIR}"/${PN}-3.6-no-auto-strip.patch
+)
+
+src_prepare() {
+	autotools-utils_src_prepare
+	if use nls; then
+		if [[ "${LINGUAS+set}" == "set" ]]; then
+			strip-linguas -i src/i18n
+			sed -i -e '/^ALL_LINGUAS=/d' configure || die
+			export ALL_LINGUAS="${LINGUAS}"
+		fi
+	else
+		sed -i -e '/^ALL_LINGUAS=/d' configure || die
+	fi
+}
+
+src_configure() {
+	local myeconfargs=(
+		--with-sffe=yes
+		--with-gsl=yes
+		$(use_enable nls)
+		$(use_with png)
+		$(use_with aalib aa-driver)
+		$(use_with gtk gtk-driver)
+		$(use_with threads pthread)
+		$(use_with X x11-driver)
+		$(use_with X x)
+	)
+	autotools-utils_src_configure
+}
+
+src_compile() {
+	autotools-utils_src_compile
+	if use doc; then
+		cd "${BUILD_DIR}"/doc
+		emake xaos.dvi
+		dvipdf xaos.dvi || die
+		cd "${BUILD_DIR}"/help
+		emake html
+	fi
+}
+
+src_install() {
+	autotools-utils_src_install
+	if use doc; then
+		insinto /usr/share/doc/${PF}
+		doins doc/xaos.pdf
+		dohtml -r help/*
+	fi
+	local driver="x11"
+	use gtk && driver="\"GTK+ Driver\""
+	make_desktop_entry "xaos -driver ${driver}" "XaoS Fractal Zoomer" \
+		xaos "Application;Education;Math;Graphics;"
+	doicon "${WORKDIR}"/${PN}.png
+}
diff --git a/x11-misc/xautolock/Manifest b/x11-misc/xautolock/Manifest
new file mode 100644
index 000000000000..44b81eade069
--- /dev/null
+++ b/x11-misc/xautolock/Manifest
@@ -0,0 +1 @@
+DIST xautolock-2.2.tgz 35288 SHA256 11f0275175634e6db756e96f5713ec91b8b1c41f8663df54e8a5d27dc71c4da2 SHA512 5f9dcc25cda706610e77a74235c4b421ca3a833d154b1a269057f0774579e1c6ec36fe0e5be5fadd6942ce8c1640a760f891397586b162e6024b524635153d04 WHIRLPOOL c10262350dd39d9e69d491ee2164911ccb6077dd7f8be08981256e4fcb3d7059133fb172360d8f33b12d89e6576f4c4aa6b9d3ea4cdff427e4d5a0dab6ba757c
diff --git a/x11-misc/xautolock/metadata.xml b/x11-misc/xautolock/metadata.xml
new file mode 100644
index 000000000000..731225048652
--- /dev/null
+++ b/x11-misc/xautolock/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>desktop-misc</herd>
+</pkgmetadata>
diff --git a/x11-misc/xautolock/xautolock-2.2.ebuild b/x11-misc/xautolock/xautolock-2.2.ebuild
new file mode 100644
index 000000000000..73e2dcab815a
--- /dev/null
+++ b/x11-misc/xautolock/xautolock-2.2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit toolchain-funcs
+
+DESCRIPTION="An automatic X screen-locker/screen-saver"
+SRC_URI="http://www.ibiblio.org/pub/Linux/X11/screensavers/${P}.tgz"
+HOMEPAGE="http://www.ibiblio.org/pub/Linux/X11/screensavers/"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc sparc x86"
+
+RDEPEND="
+	|| (
+		x11-misc/alock
+		x11-misc/i3lock
+		x11-misc/slim
+		x11-misc/slock
+		x11-misc/xlockmore
+		x11-misc/xtrlock
+	)
+	x11-libs/libXScrnSaver
+"
+DEPEND="
+	${RDEPEND}
+	app-text/rman
+	x11-misc/imake
+	x11-proto/scrnsaverproto
+"
+
+src_configure() {
+	xmkmf || die
+}
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		CDEBUGFLAGS="${CFLAGS}" \
+		EXTRA_LDOPTIONS="${LDFLAGS}"
+}
+
+src_install () {
+	dobin xautolock
+	newman xautolock.man xautolock.1
+	dodoc Changelog Readme Todo
+}
diff --git a/x11-misc/xautomation/Manifest b/x11-misc/xautomation/Manifest
new file mode 100644
index 000000000000..02adbda95d34
--- /dev/null
+++ b/x11-misc/xautomation/Manifest
@@ -0,0 +1,3 @@
+DIST xautomation-1.05.tar.gz 114472 SHA256 b57056699c405f12ad07254bd2486202df56bbfe2ca9db60cf4f3bedf7425d93 SHA512 88915bdc35baf9efe5f5ab2475ebe88e5f5f8face06ac87a857dcec78ad3a4614e57e4dd30353f12e28e4f588d030c38d25bd6f12eb6df62c79a5712655563b0 WHIRLPOOL 62b670a4bc35b8509dd3a872404301b39a2dd55a0f73d0fbcae1cda82fba9b1c9ebcd18f52c6a395956aedd25289e6b80554d11b11917387e8719f447f11e3a6
+DIST xautomation-1.06.tar.gz 115249 SHA256 970bf67d65e47d9bbee5c4c9cc33ab2d8a0ddb9a436479f1bda83158907ea8d2
+DIST xautomation-1.09.tar.gz 123995 SHA256 ee8f2c61165da682f58371a51cfc263d6e54609b614e712320b0987779d95f0d SHA512 60de78ef9e4bd605ff2cdf1cd34771940d043a2ba0498a053d54dad82476aa123afe91690e7f57d2f346845d4b1313bc0e4d3df524815265c817961978ef4ad8 WHIRLPOOL 51315082d23227805ce969760e12fadf4fa54b2cf6bfe7ccf93af5e5cf7faed9dfffb8a27fa922560c5720e2dea644a82b1e4d2b568dc69270efd70e06cb1c20
diff --git a/x11-misc/xautomation/metadata.xml b/x11-misc/xautomation/metadata.xml
new file mode 100644
index 000000000000..731225048652
--- /dev/null
+++ b/x11-misc/xautomation/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>desktop-misc</herd>
+</pkgmetadata>
diff --git a/x11-misc/xautomation/xautomation-1.05.ebuild b/x11-misc/xautomation/xautomation-1.05.ebuild
new file mode 100644
index 000000000000..b74f97831bf0
--- /dev/null
+++ b/x11-misc/xautomation/xautomation-1.05.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+DESCRIPTION="Control X from command line and find things on screen"
+HOMEPAGE="http://hoopajoo.net/projects/xautomation.html"
+SRC_URI="http://hoopajoo.net/static/projects/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm ppc x86"
+IUSE=""
+
+RDEPEND="
+	media-libs/libpng
+	x11-libs/libX11
+	x11-libs/libXtst
+"
+DEPEND="
+	${RDEPEND}
+	x11-proto/inputproto
+	x11-proto/xextproto
+	x11-proto/xproto
+"
+
+DOCS=( AUTHORS ChangeLog )
+
+src_prepare() {
+	export LIBS="-lX11"
+}
diff --git a/x11-misc/xautomation/xautomation-1.06.ebuild b/x11-misc/xautomation/xautomation-1.06.ebuild
new file mode 100644
index 000000000000..5ddb47d7860a
--- /dev/null
+++ b/x11-misc/xautomation/xautomation-1.06.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+DESCRIPTION="Control X from command line and find things on screen"
+HOMEPAGE="http://hoopajoo.net/projects/xautomation.html"
+SRC_URI="http://hoopajoo.net/static/projects/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE=""
+
+RDEPEND=">=media-libs/libpng-1.2:0
+	x11-libs/libX11
+	x11-libs/libXtst"
+DEPEND="${RDEPEND}
+	x11-proto/inputproto
+	x11-proto/xextproto
+	x11-proto/xproto"
+
+DOCS="AUTHORS ChangeLog"
diff --git a/x11-misc/xautomation/xautomation-1.09.ebuild b/x11-misc/xautomation/xautomation-1.09.ebuild
new file mode 100644
index 000000000000..194768417838
--- /dev/null
+++ b/x11-misc/xautomation/xautomation-1.09.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="Control X from command line and find things on screen"
+HOMEPAGE="http://hoopajoo.net/projects/xautomation.html"
+SRC_URI="http://hoopajoo.net/static/projects/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+
+RDEPEND="
+	>=media-libs/libpng-1.2:0
+	x11-libs/libX11
+	x11-libs/libXi
+	x11-libs/libXtst
+"
+DEPEND="
+	${RDEPEND}
+	x11-proto/inputproto
+	x11-proto/xextproto
+	x11-proto/xproto
+"
+
+DOCS="AUTHORS ChangeLog"
diff --git a/x11-misc/xbatt/Manifest b/x11-misc/xbatt/Manifest
new file mode 100644
index 000000000000..dcd0d00833ce
--- /dev/null
+++ b/x11-misc/xbatt/Manifest
@@ -0,0 +1,2 @@
+DIST xbatt-1.2.1.tar.gz 12779 SHA256 6c184c23e2be2b4934ccfcae39b158d5bab81e9f602a412bdbce57b436fd3b66 SHA512 db96f89e3abecd23532305069806ac094d5a31797f6f730d0f0d5345ac3f339286a5e3bcfc73d42a44a666bcbc768c955b9c3d8ca2fd28bd8239dfa109fe7020 WHIRLPOOL ba4268f33202b576b39837894c71172660d4103f07e11081d3e215828f87738067ac1798c50469342d29baa7d6523e7ff30aba91b5f7a57ebac5c48cce3b2506
+DIST xbatt-1.3pr1.tar.gz 14412 SHA256 aa41269247dd818ce1f92a16af3ea286ac34b395cb39daa1196fca5adfb5ed4b SHA512 f6022a2d464e22a31c8246f20c4dcab2be381ec63a02fb9ac1d3e28dc9bdf26a949735b2eba800941f5dfde371913ea7a560413191197c44a0c156a58a60d41d WHIRLPOOL abf6148df8ae8be6ea328f41b801c28e675959b6b0ec9a4b684fa7ce6c1b3b757209176203ac0bb318eff0dfc246b939853227fb02862684f983b60e8aa7652b
diff --git a/x11-misc/xbatt/files/xbatt-1.2.1-implicits.patch b/x11-misc/xbatt/files/xbatt-1.2.1-implicits.patch
new file mode 100644
index 000000000000..d86e42ef3fc8
--- /dev/null
+++ b/x11-misc/xbatt/files/xbatt-1.2.1-implicits.patch
@@ -0,0 +1,14 @@
+Fix implicit functions declarations
+
+--- xbatt.c
++++ xbatt.c
+@@ -47,6 +47,9 @@
+ #include <time.h>
+ #include <sys/file.h>
+ #include <sys/ioctl.h>
++#include <unistd.h>
++#include <stdlib.h>
++#include <X11/IntrinsicP.h>
+ #include <X11/StringDefs.h>
+ #include <X11/Intrinsic.h>
+ #include <X11/Shell.h>
diff --git a/x11-misc/xbatt/metadata.xml b/x11-misc/xbatt/metadata.xml
new file mode 100644
index 000000000000..2518313f5241
--- /dev/null
+++ b/x11-misc/xbatt/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+        <herd>desktop-misc</herd>
+</pkgmetadata>
diff --git a/x11-misc/xbatt/xbatt-1.2.1-r1.ebuild b/x11-misc/xbatt/xbatt-1.2.1-r1.ebuild
new file mode 100644
index 000000000000..df07cf26f61c
--- /dev/null
+++ b/x11-misc/xbatt/xbatt-1.2.1-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Notebook battery indicator for X"
+HOMEPAGE="http://www.clave.gr.jp/~eto/xbatt/"
+SRC_URI="http://www.clave.gr.jp/~eto/xbatt/${P}.tar.gz"
+
+LICENSE="xbatt"
+SLOT="0"
+KEYWORDS="~amd64 ppc x86"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXmu
+	x11-libs/libXt
+	x11-libs/libXaw
+	x11-libs/libXext
+	x11-libs/libxkbfile
+	x11-libs/libXpm"
+DEPEND="${RDEPEND}
+	x11-proto/xextproto
+	x11-misc/imake"
+
+src_prepare(){
+	epatch "${FILESDIR}"/${P}-implicits.patch
+}
+
+src_compile() {
+	xmkmf || die
+	emake xbatt CDEBUGFLAGS="${CFLAGS}" CC="$(tc-getCC)" \
+		EXTRA_LDOPTIONS="${LDFLAGS}" || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc README* || die
+}
diff --git a/x11-misc/xbatt/xbatt-1.3_rc1.ebuild b/x11-misc/xbatt/xbatt-1.3_rc1.ebuild
new file mode 100644
index 000000000000..f1c2cc3b3bff
--- /dev/null
+++ b/x11-misc/xbatt/xbatt-1.3_rc1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+
+inherit versionator eutils toolchain-funcs
+
+MY_PV=${PV/_rc/pr}
+DESCRIPTION="Notebook battery indicator for X"
+HOMEPAGE="http://www.clave.gr.jp/~eto/xbatt/"
+SRC_URI="http://www.clave.gr.jp/~eto/xbatt/${PN}-${MY_PV}.tar.gz"
+
+LICENSE="xbatt"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXmu
+	x11-libs/libXt
+	x11-libs/libXaw
+	x11-libs/libXext
+	x11-libs/libxkbfile
+	x11-libs/libXpm"
+DEPEND="${RDEPEND}
+	x11-proto/xextproto
+	x11-misc/imake"
+
+S="${WORKDIR}"/${PN}-$(get_version_component_range 1-2)
+
+src_prepare(){
+	epatch "${FILESDIR}"/${PN}-1.2.1-implicits.patch
+}
+
+src_compile() {
+	xmkmf || die
+	emake xbatt CDEBUGFLAGS="${CFLAGS}" CC="$(tc-getCC)" \
+		EXTRA_LDOPTIONS="${LDFLAGS}" || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc README* || die
+}
diff --git a/x11-misc/xbattbar/Manifest b/x11-misc/xbattbar/Manifest
new file mode 100644
index 000000000000..8476368b5df3
--- /dev/null
+++ b/x11-misc/xbattbar/Manifest
@@ -0,0 +1,3 @@
+DIST xbattbar_1.4.3.orig.tar.gz 15722 SHA256 8f4963bac20836538530a738b7b921543e1381ea01f457c26937efba981292d9
+DIST xbattbar_1.4.4.orig.tar.gz 15922 SHA256 2e64855de0cef61f764a7eea81565f7a06fe82492db0b6a09662d6dd93b61448 SHA512 0cd09f4489d9ec551e202fc4791e250c5bf6fdb1801d9025662b79060eb7673c6e43dcf3c352370d42549587dd60879ccad6c6e401f86c7e2a641acbec176aa9 WHIRLPOOL 8eb4b95685ef92c783f9dbe26583cae9189490008630b92d32761548dea603b09cb2c0ed21f463694b7254aea9bd4dc60c835d2207a66812a9d33ef980b72740
+DIST xbattbar_1.4.5.orig.tar.gz 16191 SHA256 01b75b2f902d1315a08ec7ddfdcdafc7686cf88662bbf2be5bfcc892294c4b80 SHA512 cc9719e98dc038e0b5bbe1a13acea5cf6c15495b8a133b25663bd86688635bf6f3fefb360a27fb9f00b2012ba16f58bc6f63bfc8ee7eb227e30ad5c9ee1def56 WHIRLPOOL e39aaff055e7ebb7de2a21af5ea263b64949a2ae5e783d47e8879eb51d46a3aa766b29e913eff79ae2585ac3ddbd53710eb7c164a625c7cfdfdf237bf38de884
diff --git a/x11-misc/xbattbar/files/xbattbar-1.4.3.patch b/x11-misc/xbattbar/files/xbattbar-1.4.3.patch
new file mode 100644
index 000000000000..ad5b9e49c1fa
--- /dev/null
+++ b/x11-misc/xbattbar/files/xbattbar-1.4.3.patch
@@ -0,0 +1,38 @@
+--- Makefile
++++ Makefile
+@@ -8,16 +8,16 @@
+ all: $(TARGET) $(APM_CHECK)
+ 
+ $(TARGET): obj/xbattbar.o
+-	gcc -o $@ $< -lX11
++	$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $< -lX11
+ 
+ obj/xbattbar.o: xbattbar.c obj/stamp
+-	gcc -MMD -o $@ -c $<
++	$(CC) $(CFLAGS) -MMD -o $@ -c $<
+ 
+ $(APM_CHECK): obj/xbattbar-check-apm.o
+-	gcc -o $@ $<
++	$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $<
+ 
+ obj/xbattbar-check-apm.o: xbattbar-check-apm.c obj/stamp
+-	gcc -MMD -D$(OS_TYPE) -o $@ -c $<
++	$(CC) $(CFLAGS) -MMD -D$(OS_TYPE) -o $@ -c $<
+ 
+ obj/stamp:
+ 	mkdir obj
+@@ -29,11 +29,11 @@
+ 
+ 
+ install: $(TARGET) $(APM_CHECK)
+-	install -d -m 0755 $(DESTDIR)/usr/lib/$(PROJECT)
++	install -d -m 0755 $(DESTDIR)/usr/lib$(LIB_SUFFIX)/$(PROJECT)
+ 	install -d -m 0755 $(DESTDIR)/usr/bin
+ 	install -d -m 0755 $(DESTDIR)/usr/share/man/man1
+-	install -m 0755 $(APM_CHECK) $(DESTDIR)/usr/lib/$(PROJECT)/
+-	install -m 0755 xbattbar-check-acpi $(DESTDIR)/usr/lib/$(PROJECT)/
++	install -m 0755 $(APM_CHECK) $(DESTDIR)/usr/lib$(LIB_SUFFIX)/$(PROJECT)/
++	install -m 0755 xbattbar-check-acpi $(DESTDIR)/usr/lib$(LIB_SUFFIX)/$(PROJECT)/
+ 	install -m 0755 $(TARGET) $(DESTDIR)/usr/bin/
+ 	install -m 0644 xbattbar.man $(DESTDIR)/usr/share/man/man1/$(PROJECT).1 
+ 
diff --git a/x11-misc/xbattbar/files/xbattbar-1.4.4.patch b/x11-misc/xbattbar/files/xbattbar-1.4.4.patch
new file mode 100644
index 000000000000..0a17a4cd1a5e
--- /dev/null
+++ b/x11-misc/xbattbar/files/xbattbar-1.4.4.patch
@@ -0,0 +1,40 @@
+--- a/Makefile
++++ b/Makefile
+@@ -8,16 +8,16 @@
+ all: $(TARGET) $(APM_CHECK)
+ 
+ $(TARGET): obj/xbattbar.o
+-	gcc -o $@ $< -lX11
++	$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $< -lX11
+ 
+ obj/xbattbar.o: xbattbar.c obj/stamp
+-	gcc -MMD -o $@ -c $<
++	$(CC) $(LDFLAGS) $(CFLAGS) -MMD -o $@ -c $<
+ 
+ $(APM_CHECK): obj/xbattbar-check-apm.o
+-	gcc -o $@ $<
++	$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $<
+ 
+ obj/xbattbar-check-apm.o: xbattbar-check-apm.c obj/stamp
+-	gcc -MMD -D$(OS_TYPE) -o $@ -c $<
++	$(CC) $(LDFLAGS) $(CFLAGS) -MMD -D$(OS_TYPE) -o $@ -c $<
+ 
+ obj/stamp:
+ 	mkdir obj
+@@ -29,12 +29,12 @@
+ 
+ 
+ install: $(TARGET) $(APM_CHECK)
+-	install -d -m 0755 $(DESTDIR)/usr/lib/$(PROJECT)
++	install -d -m 0755 $(DESTDIR)/usr/$(LIBDIR)/$(PROJECT)
+ 	install -d -m 0755 $(DESTDIR)/usr/bin
+ 	install -d -m 0755 $(DESTDIR)/usr/share/man/man1
+-	install -m 0755 $(APM_CHECK) $(DESTDIR)/usr/lib/$(PROJECT)/
+-	install -m 0755 xbattbar-check-acpi $(DESTDIR)/usr/lib/$(PROJECT)/
+-	install -m 0755 xbattbar-check-sys  $(DESTDIR)/usr/lib/$(PROJECT)/
++	install -m 0755 $(APM_CHECK) $(DESTDIR)/usr/$(LIBDIR)/$(PROJECT)/
++	install -m 0755 xbattbar-check-acpi $(DESTDIR)/usr/$(LIBDIR)/$(PROJECT)/
++	install -m 0755 xbattbar-check-sys  $(DESTDIR)/usr/$(LIBDIR)/$(PROJECT)/
+ 	install -m 0755 $(TARGET) $(DESTDIR)/usr/bin/
+ 	install -m 0644 xbattbar.man $(DESTDIR)/usr/share/man/man1/$(PROJECT).1 
+ 
diff --git a/x11-misc/xbattbar/files/xbattbar-1.4.5.patch b/x11-misc/xbattbar/files/xbattbar-1.4.5.patch
new file mode 100644
index 000000000000..2602bb91187a
--- /dev/null
+++ b/x11-misc/xbattbar/files/xbattbar-1.4.5.patch
@@ -0,0 +1,40 @@
+--- a/Makefile
++++ b/Makefile
+@@ -11,16 +11,16 @@
+ all: $(TARGET) $(APM_CHECK)
+ 
+ $(TARGET): obj/xbattbar.o
+-	gcc -o $@ $< -lX11 $(LDFLAGS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(shell $(PKG_CONFIG) --libs x11)
+ 
+ obj/xbattbar.o: xbattbar.c obj/stamp
+-	gcc -MMD -o $@ -c $< $(CFLAGS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -MMD -o $@ -c $<
+ 
+ $(APM_CHECK): obj/xbattbar-check-apm.o
+-	gcc -o $@ $< $(LDFLAGS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $<
+ 
+ obj/xbattbar-check-apm.o: xbattbar-check-apm.c obj/stamp
+-	gcc -MMD -D$(OS_TYPE) -o $@ -c $< $(CFLAGS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -MMD -D$(OS_TYPE) -o $@ -c $<
+ 
+ obj/stamp:
+ 	mkdir obj
+@@ -32,12 +32,12 @@
+ 
+ 
+ install: $(TARGET) $(APM_CHECK)
+-	install -d -m 0755 $(DESTDIR)/usr/lib/$(PROJECT)
++	install -d -m 0755 $(DESTDIR)/usr/$(LIBDIR)/$(PROJECT)
+ 	install -d -m 0755 $(DESTDIR)/usr/bin
+ 	install -d -m 0755 $(DESTDIR)/usr/share/man/man1
+-	install -m 0755 $(APM_CHECK) $(DESTDIR)/usr/lib/$(PROJECT)/
+-	install -m 0755 xbattbar-check-acpi $(DESTDIR)/usr/lib/$(PROJECT)/
+-	install -m 0755 xbattbar-check-sys  $(DESTDIR)/usr/lib/$(PROJECT)/
++	install -m 0755 $(APM_CHECK) $(DESTDIR)/usr/$(LIBDIR)/$(PROJECT)/
++	install -m 0755 xbattbar-check-acpi $(DESTDIR)/usr/$(LIBDIR)/$(PROJECT)/
++	install -m 0755 xbattbar-check-sys  $(DESTDIR)/usr/$(LIBDIR)/$(PROJECT)/
+ 	install -m 0755 $(TARGET) $(DESTDIR)/usr/bin/
+ 	install -m 0644 xbattbar.man $(DESTDIR)/usr/share/man/man1/$(PROJECT).1 
+ 
diff --git a/x11-misc/xbattbar/metadata.xml b/x11-misc/xbattbar/metadata.xml
new file mode 100644
index 000000000000..731225048652
--- /dev/null
+++ b/x11-misc/xbattbar/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>desktop-misc</herd>
+</pkgmetadata>
diff --git a/x11-misc/xbattbar/xbattbar-1.4.3.ebuild b/x11-misc/xbattbar/xbattbar-1.4.3.ebuild
new file mode 100644
index 000000000000..91f8d25f15d2
--- /dev/null
+++ b/x11-misc/xbattbar/xbattbar-1.4.3.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+inherit eutils flag-o-matic multilib toolchain-funcs
+
+DESCRIPTION="Advanced Power Management battery status display for X"
+HOMEPAGE="http://packages.qa.debian.org/x/xbattbar.html"
+SRC_URI="mirror://debian/pool/main/x/${PN}/${PN}_${PV}.orig.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ppc x86"
+IUSE=""
+
+DEPEND="dev-lang/perl
+	x11-libs/libX11"
+RDEPEND="${DEPEND}
+	!ppc? ( >=sys-power/acpi-1.5 )" # ppc has APM
+
+# XXX: Avoiding imake in purpose here.
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}.patch
+
+	sed -i \
+		-e "s:usr/lib:usr/$(get_libdir):" \
+		xbattbar.c || die
+}
+
+src_compile() {
+	[[ $(tc-arch) == amd64 ]] && export LIB_SUFFIX=64
+	tc-export CC
+	use kernel_linux && append-flags -Dlinux
+	emake || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc README
+}
diff --git a/x11-misc/xbattbar/xbattbar-1.4.4.ebuild b/x11-misc/xbattbar/xbattbar-1.4.4.ebuild
new file mode 100644
index 000000000000..c13fbe10b3c0
--- /dev/null
+++ b/x11-misc/xbattbar/xbattbar-1.4.4.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+inherit eutils flag-o-matic multilib python-single-r1 toolchain-funcs
+
+DESCRIPTION="Advanced Power Management battery status display for X"
+HOMEPAGE="http://packages.qa.debian.org/x/xbattbar.html"
+SRC_URI="mirror://debian/pool/main/x/${PN}/${PN}_${PV}.orig.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+DEPEND="
+	dev-lang/perl
+	x11-libs/libX11
+"
+RDEPEND="
+	${DEPEND}
+	${PYTHON_DEPS}
+	!ppc? ( >=sys-power/acpi-1.5 )
+" # ppc has APM
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.4.4.patch
+
+	sed -i \
+		-e "s:usr/lib:usr/$(get_libdir):" \
+		xbattbar.c || die
+}
+
+src_compile() {
+	use kernel_linux && append-flags -Dlinux
+	emake CC=$(tc-getCC) LIBDIR="$(get_libdir)"
+	python_fix_shebang ${PN}-check-sys
+}
+
+src_install() {
+	emake install DESTDIR="${D}" LIBDIR="$(get_libdir)"
+	dodoc README
+}
diff --git a/x11-misc/xbattbar/xbattbar-1.4.5.ebuild b/x11-misc/xbattbar/xbattbar-1.4.5.ebuild
new file mode 100644
index 000000000000..0e757f7df0cd
--- /dev/null
+++ b/x11-misc/xbattbar/xbattbar-1.4.5.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+inherit eutils flag-o-matic multilib python-single-r1 toolchain-funcs
+
+DESCRIPTION="Advanced Power Management battery status display for X"
+HOMEPAGE="http://packages.qa.debian.org/x/xbattbar.html"
+SRC_URI="mirror://debian/pool/main/x/${PN}/${PN}_${PV}.orig.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+DEPEND="
+	dev-lang/perl
+	x11-libs/libX11
+"
+RDEPEND="
+	${DEPEND}
+	${PYTHON_DEPS}
+	!ppc? ( >=sys-power/acpi-1.5 )
+" # ppc has APM
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.4.5.patch
+
+	sed -i \
+		-e "s:usr/lib:usr/$(get_libdir):" \
+		xbattbar.c || die
+
+	tc-export PKG_CONFIG
+}
+
+src_compile() {
+	use kernel_linux && append-flags -Dlinux
+	emake \
+		CC=$(tc-getCC) \
+		LIBDIR="$(get_libdir)" \
+		LDFLAGS="${LDFLAGS}"
+	python_fix_shebang ${PN}-check-sys
+}
+
+src_install() {
+	emake DESTDIR="${D}" LIBDIR="$(get_libdir)" install
+	dodoc README
+}
diff --git a/x11-misc/xbindkeys/Manifest b/x11-misc/xbindkeys/Manifest
new file mode 100644
index 000000000000..ca727b46794d
--- /dev/null
+++ b/x11-misc/xbindkeys/Manifest
@@ -0,0 +1 @@
+DIST xbindkeys-1.8.6.tar.gz 151941 SHA256 6c0d18be19fc19ab9b4595edf3a23c0a6946c8a5eb5c1bc395471c8f9a710d18 SHA512 3c77541eae9f87d2020c2272984c221094276dae2a8690c5cec9fe1b23c0139229b8f56876170da70684aeaa128642349b6835c375d473186cbf8123517173ba WHIRLPOOL b590aa52e9965b9360ecf43286e59dd240480b731769f7cccea5872925a296d8a3ea173a5326f07b377475f08a40a5e245487361e6a700ed7e0f71a143849af5
diff --git a/x11-misc/xbindkeys/metadata.xml b/x11-misc/xbindkeys/metadata.xml
new file mode 100644
index 000000000000..731225048652
--- /dev/null
+++ b/x11-misc/xbindkeys/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>desktop-misc</herd>
+</pkgmetadata>
diff --git a/x11-misc/xbindkeys/xbindkeys-1.8.6.ebuild b/x11-misc/xbindkeys/xbindkeys-1.8.6.ebuild
new file mode 100644
index 000000000000..95b31d2dae11
--- /dev/null
+++ b/x11-misc/xbindkeys/xbindkeys-1.8.6.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+DESCRIPTION="Tool for launching commands on keystrokes"
+SRC_URI="http://www.nongnu.org/${PN}/${P}.tar.gz"
+HOMEPAGE="http://www.nongnu.org/xbindkeys/xbindkeys.html"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+IUSE="guile tk"
+
+RDEPEND="x11-libs/libX11
+	guile? ( >=dev-scheme/guile-1.8.4[deprecated] )
+	tk? ( dev-lang/tk )"
+DEPEND="${RDEPEND}
+	x11-proto/xproto"
+
+src_configure() {
+	econf \
+		$(use_enable tk) \
+		$(use_enable guile)
+}
diff --git a/x11-misc/xbitmaps/Manifest b/x11-misc/xbitmaps/Manifest
new file mode 100644
index 000000000000..7c8610ceadf3
--- /dev/null
+++ b/x11-misc/xbitmaps/Manifest
@@ -0,0 +1 @@
+DIST xbitmaps-1.1.1.tar.bz2 113346 SHA256 3671b034356bbc4d32d052808cf646c940ec8b2d1913adac51b1453e41aa1e9d SHA512 172a74014e699e5f295ae726a77f1669baf4ac00d64a138b77e5502102b2a02c10127f35ccea5b6af5479d17f60a6bb63ac0f943fd071ab8b396d43ef314ae61 WHIRLPOOL 7117fc51777231332b1792e7cc7d761276f8ff4e88baa46d64206fac71fdad6fd5cad93a1bd105d0262e986faf2ab39613ea063c2b182d8c624b168261dda23e
diff --git a/x11-misc/xbitmaps/metadata.xml b/x11-misc/xbitmaps/metadata.xml
new file mode 100644
index 000000000000..01c4c004e735
--- /dev/null
+++ b/x11-misc/xbitmaps/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>x11</herd>
+</pkgmetadata>
diff --git a/x11-misc/xbitmaps/xbitmaps-1.1.1.ebuild b/x11-misc/xbitmaps/xbitmaps-1.1.1.ebuild
new file mode 100644
index 000000000000..1f5a88f8ba40
--- /dev/null
+++ b/x11-misc/xbitmaps/xbitmaps-1.1.1.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=3
+
+XORG_MODULE=data/
+XORG_STATIC=no
+inherit xorg-2
+
+DESCRIPTION="X.Org bitmaps data"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/x11-misc/xcalendar/Manifest b/x11-misc/xcalendar/Manifest
new file mode 100644
index 000000000000..d0209a95ee71
--- /dev/null
+++ b/x11-misc/xcalendar/Manifest
@@ -0,0 +1 @@
+DIST xcalendar-4.0+i18n.tar.gz 48635 SHA256 f4c45d863c2a8a04bfcc4180cb06bd13bbdc26f855578e99b1e459e834c6fd7f
diff --git a/x11-misc/xcalendar/files/xcalendar-4.0-implicits.patch b/x11-misc/xcalendar/files/xcalendar-4.0-implicits.patch
new file mode 100644
index 000000000000..977ca96e572f
--- /dev/null
+++ b/x11-misc/xcalendar/files/xcalendar-4.0-implicits.patch
@@ -0,0 +1,22 @@
+Fix implicit functions declarations
+
+--- xcalendar/xcalendar.h
++++ xcalendar/xcalendar.h
+@@ -37,6 +37,7 @@
+ 
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ #include  <X11/Xos.h>
+ #include <X11/Xlib.h>
+ #include <X11/Intrinsic.h>
+--- xcalendar/lists.c
++++ xcalendar/lists.c
+@@ -25,6 +25,7 @@
+ 
+ #include "xcalendar.h"
+ 
++is_last(LList *list);
+ 
+ List 
+ CreateList(length, elementSize)
diff --git a/x11-misc/xcalendar/files/xcalendar-4.0-motif-gentoo.diff b/x11-misc/xcalendar/files/xcalendar-4.0-motif-gentoo.diff
new file mode 100644
index 000000000000..a35d98bcb814
--- /dev/null
+++ b/x11-misc/xcalendar/files/xcalendar-4.0-motif-gentoo.diff
@@ -0,0 +1,26 @@
+--- xcalendar.orig/Imakefile	Sat Sep 30 20:19:17 1995
++++ xcalendar/Imakefile	Tue Aug 20 08:37:48 2002
+@@ -1,18 +1,18 @@
+ XCALENDAR_LIBDIR = $(LIBDIR)/xcalendar
+         LIBFILES = larrow.xbm qmark.xbm quit.xbm rarrow.xbm xcalendar.hlp
+ # Comment out the following two lines for the Motif version
+-LOCAL_LIBRARIES = $(XAWLIB) $(XMULIB) $(XTOOLLIB) $(XLIB)
+-  EXTRA_DEFINES = -DATHENA
++#LOCAL_LIBRARIES = $(XAWLIB) $(XMULIB) $(XTOOLLIB) $(XLIB)
++#  EXTRA_DEFINES = -DATHENA
+ # Uncomment the following two lines for the Motif version
+-# LOCAL_LIBRARIES = -L/usr/local/Motif/lib -lXm $(XMULIB) $(XTOOLLIB) $(XLIB)
+-#   EXTRA_DEFINES = -I/usr/local/Motif/include
++ LOCAL_LIBRARIES = -lXm $(XMULIB) $(XTOOLLIB) $(XLIB)
++   EXTRA_DEFINES = 
+             SRCS = xcalendar.c dayeditor.c lists.c
+             OBJS = xcalendar.o dayeditor.o lists.o
+ 
+ #
+ # for Internationalization
+ #
+-EXTRA_DEFINES = -DXI18N -DATHENA
++#EXTRA_DEFINES = -DXI18N -DATHENA
+ ##if !SharedLibXwchar
+ #       _UseCat($(USRLIBDIR),$(CONTRIBSRC)/lib/Xwchar,/libXwchar.a)
+ #       XWCHARLIB = LoaderLibPrefix _Use(-lXwchar,$(DEPXWCHARLIB))
diff --git a/x11-misc/xcalendar/metadata.xml b/x11-misc/xcalendar/metadata.xml
new file mode 100644
index 000000000000..731225048652
--- /dev/null
+++ b/x11-misc/xcalendar/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>desktop-misc</herd>
+</pkgmetadata>
diff --git a/x11-misc/xcalendar/xcalendar-4.0-r1.ebuild b/x11-misc/xcalendar/xcalendar-4.0-r1.ebuild
new file mode 100644
index 000000000000..bcf7f1e0ad46
--- /dev/null
+++ b/x11-misc/xcalendar/xcalendar-4.0-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit eutils multilib
+
+DESCRIPTION="A simple interactive calendar program with a notebook capability"
+HOMEPAGE="http://www.freebsd.org/"
+SRC_URI="ftp://daemon.jp.FreeBSD.org/pub/FreeBSD-jp/ports-jp/LOCAL_PORTS/${P}+i18n.tar.gz"
+
+LICENSE="HPND"
+SLOT="0"
+KEYWORDS="alpha amd64 ppc ppc64 x86 ~x86-fbsd"
+IUSE="motif"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXmu
+	x11-libs/libXt
+	x11-libs/libXaw
+	x11-libs/libXext"
+DEPEND="${RDEPEND}
+	x11-misc/imake
+	x11-proto/xproto
+	x11-misc/gccmakedep
+	motif? ( >=x11-libs/motif-2.3:0 )"
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	use motif && epatch "${FILESDIR}"/${P}-motif-gentoo.diff
+	epatch "${FILESDIR}"/${P}-implicits.patch
+	sed -e "s:%%XCALENDAR_LIBDIR%%:/usr/$(get_libdir)/xcalendar:" \
+		-e "s:/usr/local/X11R5/lib/X11/:/usr/$(get_libdir)/:" \
+		-i XCalendar.sed || die
+}
+
+src_compile() {
+	xmkmf -a
+	emake CC="$(tc-getCC)" CDEBUGFLAGS="${CFLAGS}" EXTRA_LDOPTIONS="${LDFLAGS}"
+}
+
+src_install() {
+	dobin xcalendar
+	newman xcalendar.man xcalendar.1
+
+	insinto /usr/share/X11/app-defaults
+	newins XCalendar.sed XCalendar
+
+	insinto /usr/$(get_libdir)/xcalendar
+	doins *.xbm *.hlp
+
+	dodoc README
+}
diff --git a/x11-misc/xcalib/Manifest b/x11-misc/xcalib/Manifest
new file mode 100644
index 000000000000..1b6245a616cf
--- /dev/null
+++ b/x11-misc/xcalib/Manifest
@@ -0,0 +1 @@
+DIST xcalib-source-0.8.tar.gz 32782 RMD160 5cf0674c1c5687d930a1653dc39f9b241000bfda SHA1 93565ff3df6cf78fd8d1cbeefd094aea6ba070fd SHA256 8a112ee710e5446f6c36e62345b2066f10639d500259db8c48bf1716caea06e6
diff --git a/x11-misc/xcalib/files/xcalib-0.8-ldflags.patch b/x11-misc/xcalib/files/xcalib-0.8-ldflags.patch
new file mode 100644
index 000000000000..a21a5fbabe0b
--- /dev/null
+++ b/x11-misc/xcalib/files/xcalib-0.8-ldflags.patch
@@ -0,0 +1,24 @@
+Index: xcalib-0.8/Makefile
+===================================================================
+--- xcalib-0.8.orig/Makefile
++++ xcalib-0.8/Makefile
+@@ -50,16 +50,16 @@ all: xcalib
+ # low overhead version (internal parser)
+ xcalib: xcalib.c
+ 	$(CC) $(CFLAGS) -c xcalib.c -I$(XINCLUDEDIR) -DXCALIB_VERSION=\"$(XCALIB_VERSION)\"
+-	$(CC) $(CFLAGS) -L$(XLIBDIR) -lm -o xcalib xcalib.o -lX11 -lXxf86vm -lXext
++	$(CC) $(LDFLAGS) -L$(XLIBDIR) -o xcalib xcalib.o -lX11 -lXxf86vm -lXext -lm
+ 
+ fglrx_xcalib: xcalib.c
+ 	$(CC) $(CFLAGS) -c xcalib.c -I$(XINCLUDEDIR) -DXCALIB_VERSION=\"$(XCALIB_VERSION)\" -I$(FGLRXINCLUDEDIR) -DFGLRX
+-	$(CC) $(CFLAGS) -L$(XLIBDIR) -L$(FGLRXLIBDIR) -lm -o xcalib xcalib.o -lX11 -lXxf86vm -lXext -lfglrx_gamma
++	$(CC) $(LDFLAGS) -L$(XLIBDIR) -L$(FGLRXLIBDIR) -o xcalib xcalib.o -lX11 -lXxf86vm -lXext -lfglrx_gamma -lm
+ 
+ win_xcalib: xcalib.c
+ 	$(CC) $(CFLAGS) -c xcalib.c -DXCALIB_VERSION=\"$(XCALIB_VERSION)\" -DWIN32GDI
+ 	windres.exe resource.rc resource.o
+-	$(CC) $(CFLAGS) -mwindows -lm resource.o -o xcalib xcalib.o
++	$(CC) $(LDFLAGS) -mwindows -lm resource.o -o xcalib xcalib.o
+ 
+ install:
+ 	cp ./xcalib $(DESTDIR)/usr/local/bin/
diff --git a/x11-misc/xcalib/metadata.xml b/x11-misc/xcalib/metadata.xml
new file mode 100644
index 000000000000..c99ec372cedc
--- /dev/null
+++ b/x11-misc/xcalib/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+    <maintainer>
+        <email>maintainer-needed@gentoo.org</email>
+    </maintainer>
+    <upstream>
+        <remote-id type="sourceforge">xcalib</remote-id>
+    </upstream>
+</pkgmetadata>
diff --git a/x11-misc/xcalib/xcalib-0.8.ebuild b/x11-misc/xcalib/xcalib-0.8.ebuild
new file mode 100644
index 000000000000..e810d566a2ce
--- /dev/null
+++ b/x11-misc/xcalib/xcalib-0.8.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils toolchain-funcs multilib
+
+DESCRIPTION="xcalib is a tiny monitor calibration loader for X.org"
+HOMEPAGE="http://xcalib.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}-source-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXxf86vm"
+
+DEPEND="${RDEPEND}
+	x11-proto/xf86vidmodeproto"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-ldflags.patch"
+}
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
+		XINCLUDEDIR=/usr/include \
+		XLIBDIR=/usr/$(get_libdir) \
+		|| die 'make failed'
+}
+
+src_install() {
+	dobin xcalib
+	dodoc README
+
+	docinto profiles
+	dodoc *.icm *.icc
+}
diff --git a/x11-misc/xcape/Manifest b/x11-misc/xcape/Manifest
new file mode 100644
index 000000000000..2393763efe82
--- /dev/null
+++ b/x11-misc/xcape/Manifest
@@ -0,0 +1,2 @@
+DIST xcape-1.0.tar.gz 16409 SHA256 1ba287cf98a417fd67afff58b8f5f4c00e62b3e5195d3aea48b11bba70649561 SHA512 289954bf6ba7dc5f260354c677db11954abcaa4dadeee64566a4524c54529754ccb771816ceabee238dad0f77ba3acd8536c0e1d4817d72e71e76b2f7975fed4 WHIRLPOOL ca54bfb111f31969c7243377c32748580b9ebce22035e034453d80efc6fc86d9c2ead7d8ec17b44b81266d0ac94c8c2139a70c5db116a1f6385c3c991682099b
+DIST xcape-1.1.tar.gz 18458 SHA256 69ae927a6b2b1268a809b9c3af7c4f94584458f022beb6e2ca3e6bc3ba8a6d4a SHA512 6234e50a38003249eae563ff22ce923c3032e44b358e8e49550001c60246be1159a47f60f52d42040dda88d5396228b8daf4f0f4b03db2bcfc514c634c81540f WHIRLPOOL 1fa89d34143fb98adabdb2b41528352a3f4cd6778324f07ffbd17a921c7fded07a91555eb877361af8452cfd3d516a5eecf6c8ac3ebf565ae89d032ee2c9b06d
diff --git a/x11-misc/xcape/metadata.xml b/x11-misc/xcape/metadata.xml
new file mode 100644
index 000000000000..43e57ddbd5aa
--- /dev/null
+++ b/x11-misc/xcape/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>proxy-maintainers</herd>
+	<maintainer>
+		<email>aditsu@yahoo.com</email>
+		<description>Maintainer. Assign bugs to him</description>
+	</maintainer>
+	<maintainer>
+		<email>pinkbyte@gentoo.org</email>
+		<name>Sergey Popov</name>
+		<description>Proxy maintainer. CC him on bugs</description>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">alols/xcape</remote-id>
+		<bugs-to>https://github.com/alols/xcape/issues</bugs-to>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-misc/xcape/xcape-1.0.ebuild b/x11-misc/xcape/xcape-1.0.ebuild
new file mode 100644
index 000000000000..3f730fc33dd2
--- /dev/null
+++ b/x11-misc/xcape/xcape-1.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Utility to make modifier keys send custom key events when pressed on their own"
+HOMEPAGE="https://github.com/alols/xcape"
+SRC_URI="https://github.com/alols/xcape/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXtst"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	epatch_user
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
diff --git a/x11-misc/xcape/xcape-1.1.ebuild b/x11-misc/xcape/xcape-1.1.ebuild
new file mode 100644
index 000000000000..7356149a4f2a
--- /dev/null
+++ b/x11-misc/xcape/xcape-1.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Utility to make modifier keys send custom key events when pressed on their own"
+HOMEPAGE="https://github.com/alols/xcape"
+SRC_URI="https://github.com/alols/xcape/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXtst"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	# Fix path to man and to pkg-config
+	sed -i \
+		-e "/MANDIR/s:local:share:" \
+		-e "s/pkg-config/$(tc-getPKG_CONFIG)/" \
+		Makefile || die
+
+	epatch_user
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
+}
diff --git a/x11-misc/xcave/Manifest b/x11-misc/xcave/Manifest
new file mode 100644
index 000000000000..0c9e3a5e9403
--- /dev/null
+++ b/x11-misc/xcave/Manifest
@@ -0,0 +1,2 @@
+DIST xcave-2.3.2.tar.gz 817887 SHA256 d80376f56c2fa62f61f55ce50dcf0e65032c78e9319e6e411fbd6d3f01887ac3 SHA512 3948bfd62deb9c29eb333093a7295ec8a2ee5633bed881252351bc3355803893e15ccd0145189a7d6a6160c89617b757c9b3205037a015f1da881160fd480f96 WHIRLPOOL 25c014b01aa84cc2e14b6b45e457c58134a35ef9bc666549e9f6739692213cf165090d686b2db3894c95c525216323d56e80971a1a1b617dba034b2862276881
+DIST xcave-2.4.0.tar.gz 817356 SHA256 e561850fe4fc4c7ac5ea592dd43590a4049cd2cc52595333ba953d660d9dc533 SHA512 cdba5ad8b7634004a9439fd87a8eb8ed45137e78cb119310c6b7df9352aa979682edaae6440200804e23953c822d377c95cf459cc37ce227d1a41885a91afba4 WHIRLPOOL e9c4b6469adc7a6183cd431efa86ead19fd246a408b23fa84135942532531635ad9be6136145578963720944f8895d672e9b4625933e900333c75d15b56f3136
diff --git a/x11-misc/xcave/metadata.xml b/x11-misc/xcave/metadata.xml
new file mode 100644
index 000000000000..540f810e069d
--- /dev/null
+++ b/x11-misc/xcave/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>desktop-misc</herd>
+</pkgmetadata>
diff --git a/x11-misc/xcave/xcave-2.3.2.ebuild b/x11-misc/xcave/xcave-2.3.2.ebuild
new file mode 100644
index 000000000000..748ddbd3909c
--- /dev/null
+++ b/x11-misc/xcave/xcave-2.3.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+inherit autotools
+
+DESCRIPTION="View and manage contents of your wine cellar"
+HOMEPAGE="http://xcave.free.fr/index-en.php"
+SRC_URI="http://${PN}.free.fr/backbone.php?what=download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=x11-libs/gtk+-2.8:2
+	>=gnome-base/libglade-2.6
+	dev-libs/libxml2"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	sys-devel/gettext
+	dev-util/intltool"
+
+src_prepare() {
+	echo src/xcave_supp.c > po/POTFILES.skip
+#	intltoolize --force --copy --automake || die
+	eautoreconf
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc ChangeLog TODO
+	rm -rf "${D}"/usr/doc
+}
diff --git a/x11-misc/xcave/xcave-2.4.0.ebuild b/x11-misc/xcave/xcave-2.4.0.ebuild
new file mode 100644
index 000000000000..246953daed92
--- /dev/null
+++ b/x11-misc/xcave/xcave-2.4.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+DESCRIPTION="View and manage contents of your wine cellar"
+HOMEPAGE="http://xcave.free.fr/index-en.php"
+SRC_URI="http://${PN}.free.fr/backbone.php?what=download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RESTRICT="test"
+
+RDEPEND=">=x11-libs/gtk+-2.8:2
+	dev-libs/libxml2"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	sys-devel/gettext
+	dev-util/intltool"
+
+src_install() {
+	default
+	dodoc ChangeLog TODO
+	rm -rfv "${D}"/usr/doc
+}
diff --git a/x11-misc/xcb/Manifest b/x11-misc/xcb/Manifest
new file mode 100644
index 000000000000..807c05686b6e
--- /dev/null
+++ b/x11-misc/xcb/Manifest
@@ -0,0 +1 @@
+DIST xcb-2.4.tar.gz 19830 SHA256 21f25d05907fa3c8393b21474e81f4043af43fb087265f1753a5d57d068bc295
diff --git a/x11-misc/xcb/metadata.xml b/x11-misc/xcb/metadata.xml
new file mode 100644
index 000000000000..731225048652
--- /dev/null
+++ b/x11-misc/xcb/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>desktop-misc</herd>
+</pkgmetadata>
diff --git a/x11-misc/xcb/xcb-2.4-r1.ebuild b/x11-misc/xcb/xcb-2.4-r1.ebuild
new file mode 100644
index 000000000000..16165c63407f
--- /dev/null
+++ b/x11-misc/xcb/xcb-2.4-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+
+inherit toolchain-funcs
+
+DESCRIPTION="Marc Lehmann's improved X Cut Buffers"
+HOMEPAGE="http://oldhome.schmorp.de/marc/xcb.html"
+SRC_URI="http://oldhome.schmorp.de/marc/data/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 ~ppc x86"
+IUSE="motif"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXt
+	x11-libs/libXaw
+	x11-libs/libXext"
+DEPEND="${RDEPEND}
+	x11-proto/xproto
+	motif? ( >=x11-libs/motif-2.3:0 )"
+
+src_compile() {
+	local gui libs
+
+	if use motif; then
+		gui="-DMOTIF"
+		libs="-lXm -lXt -lX11"
+	else
+		gui="-DATHENA"
+		libs="-lXaw -lXt -lXext -lX11"
+	fi
+
+	emake -f Makefile.std xcb Xcb.ad \
+		CC=$(tc-getCC) \
+		CPP=$(tc-getCPP) \
+		CFLAGS="${CFLAGS} ${gui}" \
+		GUI="${gui}" \
+		LIBS="${libs}" \
+		LDFLAGS="${LDFLAGS}" \
+		|| die "emake failed"
+}
+
+src_install() {
+	dobin xcb || die "dobin failed"
+	newman xcb.man xcb.1
+	insinto /usr/share/X11/app-defaults
+	newins Xcb.ad Xcb || die "newins failed"
+}
diff --git a/x11-misc/xcb/xcb-2.4.ebuild b/x11-misc/xcb/xcb-2.4.ebuild
new file mode 100644
index 000000000000..f3fdf2a246c6
--- /dev/null
+++ b/x11-misc/xcb/xcb-2.4.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+inherit toolchain-funcs
+
+DESCRIPTION="Marc Lehmann's improved X Cut Buffers"
+HOMEPAGE="http://oldhome.schmorp.de/marc/xcb.html"
+SRC_URI="http://oldhome.schmorp.de/marc/data/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 ~ppc x86"
+IUSE="motif"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXt
+	x11-libs/libXaw
+	x11-libs/libXext"
+DEPEND="${RDEPEND}
+	x11-proto/xproto
+	motif? ( >=x11-libs/motif-2.3:0 )"
+
+src_compile() {
+	local gui libs
+
+	if use motif; then
+		gui="-DMOTIF"
+		libs="-lXm -lXt -lX11"
+	else
+		gui="-DATHENA"
+		libs="-lXaw -lXt -lXext -lX11"
+	fi
+
+	tc-export CC
+	emake -f Makefile.std xcb Xcb.ad \
+		CFLAGS="${CFLAGS} ${gui}" \
+		GUI="${gui}" \
+		LIBS="${libs}" \
+		|| die "emake failed"
+}
+
+src_install() {
+	dobin xcb || die "dobin failed"
+	newman xcb.man xcb.1
+	insinto /usr/share/X11/app-defaults
+	newins Xcb.ad Xcb || die "newins failed"
+}
diff --git a/x11-misc/xclip/Manifest b/x11-misc/xclip/Manifest
new file mode 100644
index 000000000000..5212323a6cba
--- /dev/null
+++ b/x11-misc/xclip/Manifest
@@ -0,0 +1 @@
+DIST xclip-0.12.tar.gz 63420 SHA256 b7c7fad059ba446df5692d175c2a1d3816e542549661224806db369a0d716c45 SHA512 6c769878004c02d87b9eca2b33dc34edb40acc59be767a6481f207a74d52fca3725a040b0c8deffa1419b687bd73cf3124a090413c06787c0dd137b0ede795e0 WHIRLPOOL 9217c3b278557bf38758619e4895a3ec37a4debdf194dc9ab7073e21f1257edd7fb6796fe32550f6d4900326a6eafadf47932d22d1514fedbb03b2db2d1220e3
diff --git a/x11-misc/xclip/metadata.xml b/x11-misc/xclip/metadata.xml
new file mode 100644
index 000000000000..52b5463d56b9
--- /dev/null
+++ b/x11-misc/xclip/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>desktop-misc</herd>
+  <upstream>
+    <remote-id type="sourceforge">xclip</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/x11-misc/xclip/xclip-0.12.ebuild b/x11-misc/xclip/xclip-0.12.ebuild
new file mode 100644
index 000000000000..daded6cd05b1
--- /dev/null
+++ b/x11-misc/xclip/xclip-0.12.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+DESCRIPTION="Command-line utility to read data from standard in and place it in an X selection"
+HOMEPAGE="http://sourceforge.net/projects/xclip/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXmu"
+DEPEND="${RDEPEND}
+	x11-libs/libXt"
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc ChangeLog README
+}
diff --git a/x11-misc/xcompmgr/Manifest b/x11-misc/xcompmgr/Manifest
new file mode 100644
index 000000000000..635d5c9e0fd5
--- /dev/null
+++ b/x11-misc/xcompmgr/Manifest
@@ -0,0 +1,2 @@
+DIST xcompmgr-1.1.6.tar.bz2 123683 SHA256 c98949d36793b30ed1ed47495c87a05fa245ac0fc2857d2abc54979124687c02 SHA512 c1dd2ab42575fcf9d53fc923b4fe98ee4b2617e2bd652b8f20d34404e8547f8dfecb6bcd14d1d54da1a618ccb8e822b89e75d57f0320e9d55edbfb0dc83ddcbd WHIRLPOOL a2cc2cbcdc53685d51b272a5c0bdfa40a33204dfabe89e780e6b9f37b8449483c5cecc6288f565e441c7af9a362fd6c0d1abfc29760db812d41f50b5f4549b57
+DIST xcompmgr-1.1.7.tar.bz2 136667 SHA256 c8049b1a2531313be7469ba9b198d334f0b91cc01efc2b20b9afcb117e4d6892 SHA512 f93a6be78169dd41ff08d71409e28746fd62902810a2f6930c0ac44f1415bc7391a8fb885b074fd40afedd7f1c1590aa7c67fc101c3b6488ddaa74495b42149c WHIRLPOOL 100d6aa734eb453976951d8341f613fdbbbb90b311eba006ca015d469f44ee3eb038acdf842e201da51a61c3d03b5c3f5c240d9a43709a9d44ebf71502c19939
diff --git a/x11-misc/xcompmgr/metadata.xml b/x11-misc/xcompmgr/metadata.xml
new file mode 100644
index 000000000000..01c4c004e735
--- /dev/null
+++ b/x11-misc/xcompmgr/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>x11</herd>
+</pkgmetadata>
diff --git a/x11-misc/xcompmgr/xcompmgr-1.1.6.ebuild b/x11-misc/xcompmgr/xcompmgr-1.1.6.ebuild
new file mode 100644
index 000000000000..5197e4270755
--- /dev/null
+++ b/x11-misc/xcompmgr/xcompmgr-1.1.6.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+XORG_STATIC=no
+inherit xorg-2
+
+DESCRIPTION="X Compositing manager"
+HOMEPAGE="http://freedesktop.org/Software/xapps"
+SRC_URI="http://xorg.freedesktop.org/releases/individual/app/${P}.tar.bz2"
+
+LICENSE="BSD"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
+IUSE=""
+
+RDEPEND="
+	x11-libs/libXrender
+	x11-libs/libXdamage
+	x11-libs/libXfixes
+	x11-libs/libXcomposite
+	x11-libs/libXext
+"
+DEPEND="${RDEPEND}"
diff --git a/x11-misc/xcompmgr/xcompmgr-1.1.7.ebuild b/x11-misc/xcompmgr/xcompmgr-1.1.7.ebuild
new file mode 100644
index 000000000000..9a3a67c402a0
--- /dev/null
+++ b/x11-misc/xcompmgr/xcompmgr-1.1.7.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+XORG_STATIC=no
+inherit xorg-2
+
+DESCRIPTION="X Compositing manager"
+HOMEPAGE="http://freedesktop.org/Software/xapps"
+SRC_URI="http://xorg.freedesktop.org/releases/individual/app/${P}.tar.bz2"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND="
+	x11-libs/libXrender
+	x11-libs/libXdamage
+	x11-libs/libXfixes
+	x11-libs/libXcomposite
+	x11-libs/libXext
+"
+DEPEND="${RDEPEND}"
diff --git a/x11-misc/xdaliclock/Manifest b/x11-misc/xdaliclock/Manifest
new file mode 100644
index 000000000000..547e7fd7d53f
--- /dev/null
+++ b/x11-misc/xdaliclock/Manifest
@@ -0,0 +1,2 @@
+DIST xdaliclock-2.41.tar.gz 2340437 SHA256 2d347347b7add0a7d535f5c59e811d495f5451b18fef54f1cc5124a3fe9633b3 SHA512 66f22a4cf16c63fbc01c1fcb6cd1a714e539669ccc088cf13ab792ab2d4407b5870b2a6e9caf998285efc74d0d70b2bed1f35e28af22ef412bf8842a5413e27a WHIRLPOOL a7486731fbf0e657c74f272d35113d4bbc591109e77dfcff33c309edb1502054db858cbb38b747246c4e08eb36ed5ee331afaf181f9694d1e26e8be6beb8963f
+DIST xdaliclock-2.43.tar.gz 2300886 SHA256 6b573a8bac23a72e87a1cd9966c28f1d653bdb0b28bb8fd11633a1a4c2fd9fa4 SHA512 4906632148599254d9b29b032d846fcea1a568de8156cfe9556aa1603e063015d7e3422ba9ce4f47c2877f144837a660964456584a643f274b78422c12c0c923 WHIRLPOOL 9531fadc040e23ddce6fd5e2b1192151358132a0f8e5c0b67b2266906620b0c4ba05d544a4d1dc9fec15fc45a2c463a7a2baea8f5e1fb68f2e4dd4e6e30e0404
diff --git a/x11-misc/xdaliclock/metadata.xml b/x11-misc/xdaliclock/metadata.xml
new file mode 100644
index 000000000000..731225048652
--- /dev/null
+++ b/x11-misc/xdaliclock/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>desktop-misc</herd>
+</pkgmetadata>
diff --git a/x11-misc/xdaliclock/xdaliclock-2.41.ebuild b/x11-misc/xdaliclock/xdaliclock-2.41.ebuild
new file mode 100644
index 000000000000..89ba8859cdb1
--- /dev/null
+++ b/x11-misc/xdaliclock/xdaliclock-2.41.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="Dali Clock is a digital clock. When a digit changes, it melts into its new shape"
+HOMEPAGE="http://www.jwz.org/xdaliclock"
+SRC_URI="http://www.jwz.org/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS=" amd64 ppc ppc64 x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXt
+"
+DEPEND="
+	${RDEPEND}
+	x11-proto/xextproto
+	x11-proto/xproto
+"
+
+S=${WORKDIR}/${P}/X11
+
+src_install() {
+	dobin ${PN}
+	newman ${PN}.man ${PN}.1
+	dodoc ../README
+}
diff --git a/x11-misc/xdaliclock/xdaliclock-2.43.ebuild b/x11-misc/xdaliclock/xdaliclock-2.43.ebuild
new file mode 100644
index 000000000000..96edd319d20b
--- /dev/null
+++ b/x11-misc/xdaliclock/xdaliclock-2.43.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="Dali Clock is a digital clock. When a digit changes, it melts into its new shape"
+HOMEPAGE="http://www.jwz.org/xdaliclock"
+SRC_URI="http://www.jwz.org/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXt
+"
+DEPEND="
+	${RDEPEND}
+	x11-proto/xextproto
+	x11-proto/xproto
+"
+
+S=${WORKDIR}/${P}/X11
+
+src_install() {
+	dobin ${PN}
+	newman ${PN}.man ${PN}.1
+	dodoc ../README
+}
diff --git a/x11-misc/xdesktopwaves/Manifest b/x11-misc/xdesktopwaves/Manifest
new file mode 100644
index 000000000000..76f5aacd6a94
--- /dev/null
+++ b/x11-misc/xdesktopwaves/Manifest
@@ -0,0 +1 @@
+DIST xdesktopwaves-1.3.tar.gz 49302 SHA256 185a1fe56095610e95580713eec491ad1d93f4c89015ae612f214e1ccee51779
diff --git a/x11-misc/xdesktopwaves/files/xdesktopwaves-1.3-gentoo.patch b/x11-misc/xdesktopwaves/files/xdesktopwaves-1.3-gentoo.patch
new file mode 100644
index 000000000000..accbb4d9baec
--- /dev/null
+++ b/x11-misc/xdesktopwaves/files/xdesktopwaves-1.3-gentoo.patch
@@ -0,0 +1,38 @@
+--- xdesktopwaves-1.3/Makefile.org	2004-12-18 06:47:40.000000000 +0100
++++ xdesktopwaves-1.3/Makefile	2010-02-08 20:05:31.000000000 +0100
+@@ -11,14 +11,13 @@
+ 
+ #=========================== C compiler configuration ==========================
+ 
+-CC     = gcc
+-CFLAGS = -I/usr/X11R6/include -O2
++CFLAGS += $(shell pkg-config --cflags x11 xext)
+ 
+ #============================= Linker configuration ============================
+ 
+-LINK   = gcc
+-LFLAGS = -L/usr/X11R6/lib
+-LIBS   = -lm -lX11 -lXext
++LINK   = $(CC)
++LFLAGS = $(LDFLAGS)
++LIBS   = -lm $(shell pkg-config --libs x11 xext)
+ 
+ #============================ Installer configuration ==========================
+ 
+--- xdesktopwaves-1.3/xdwapi/Makefile.org	2004-12-18 06:47:40.000000000 +0100
++++ xdesktopwaves-1.3/xdwapi/Makefile	2010-02-08 20:08:14.000000000 +0100
+@@ -1,10 +1,9 @@
+ # Makefile for the xdesktopwaves API and its demo program
+ 
+-CC     = gcc
+-CFLAGS = -I/usr/X11R6/include -O2
+-LINK   = gcc
+-LFLAGS = -L/usr/X11R6/lib
+-LIBS   = -lm -lX11
++CFLAGS += $(shell pkg-config --cflags x11 xext)
++LINK   = $(CC)
++LFLAGS = $(LDFLAGS)
++LIBS   = -lm $(shell pkg-config --libs x11 xext)
+ 
+ all: xdwapidemo
+ 
diff --git a/x11-misc/xdesktopwaves/metadata.xml b/x11-misc/xdesktopwaves/metadata.xml
new file mode 100644
index 000000000000..e6f7528ea31a
--- /dev/null
+++ b/x11-misc/xdesktopwaves/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>desktop-misc</herd>
+	<longdescription>
+		xdesktopwaves is a cellular automata setting the background of your
+		X Windows desktop under water. Windows and mouse are like ships on the
+		sea. Each movement of these ends up in moving water waves. You can even
+		have rain and/or storm stirring up the water.
+  </longdescription>
+	<upstream>
+		<remote-id type="sourceforge">xdesktopwaves</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-misc/xdesktopwaves/xdesktopwaves-1.3-r1.ebuild b/x11-misc/xdesktopwaves/xdesktopwaves-1.3-r1.ebuild
new file mode 100644
index 000000000000..43a8b912963d
--- /dev/null
+++ b/x11-misc/xdesktopwaves/xdesktopwaves-1.3-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="2"
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="A cellular automata setting the background of your X Windows desktop under water"
+HOMEPAGE="http://xdesktopwaves.sourceforge.net/"
+LICENSE="GPL-2"
+RDEPEND="x11-libs/libXext"
+DEPEND="${RDEPEND}
+	x11-proto/xextproto"
+
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+}
+
+src_compile() {
+	tc-export CC
+	emake || die "failed building program"
+	cd xdwapi
+	emake || die "failed building demo"
+}
+
+src_install() {
+	dobin xdesktopwaves xdwapi/xdwapidemo
+	doman xdesktopwaves.1
+	insinto /usr/share/pixmaps
+	doins xdesktopwaves.xpm
+	make_desktop_entry xdesktopwaves
+	dodoc README
+}
+
+pkg_preinst() {
+	elog "To see what xdesktopwaves is able to do, start it by running"
+	elog "'xdesktopwaves' and then run 'xdwapidemo'. You should see the"
+	elog "supported effects on your desktop"
+}
diff --git a/x11-misc/xdesktopwaves/xdesktopwaves-1.3.ebuild b/x11-misc/xdesktopwaves/xdesktopwaves-1.3.ebuild
new file mode 100644
index 000000000000..20b4aa95c6b3
--- /dev/null
+++ b/x11-misc/xdesktopwaves/xdesktopwaves-1.3.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils
+
+DESCRIPTION="A cellular automata setting the background of your X Windows desktop under water"
+HOMEPAGE="http://xdesktopwaves.sourceforge.net/"
+LICENSE="GPL-2"
+RDEPEND="x11-libs/libXext"
+DEPEND="${RDEPEND}
+	x11-proto/xextproto"
+
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+src_compile() {
+	emake || die "failed building program"
+	cd xdwapi
+	emake || die "failed building demo"
+}
+
+src_install() {
+	dobin xdesktopwaves xdwapi/xdwapidemo
+	doman xdesktopwaves.1
+	insinto /usr/share/pixmaps
+	doins xdesktopwaves.xpm
+	make_desktop_entry xdesktopwaves
+	dodoc README
+}
+
+pkg_preinst() {
+	elog "To see what xdesktopwaves is able to do, start it by running"
+	elog "'xdesktopwaves' and then run 'xdwapidemo'. You should see the"
+	elog "supported effects on your desktop"
+}
diff --git a/x11-misc/xdg-user-dirs-gtk/Manifest b/x11-misc/xdg-user-dirs-gtk/Manifest
new file mode 100644
index 000000000000..bbecf86564cc
--- /dev/null
+++ b/x11-misc/xdg-user-dirs-gtk/Manifest
@@ -0,0 +1,2 @@
+DIST xdg-user-dirs-gtk-0.10.tar.xz 116528 SHA256 739a1a89baf34aa7261e924a21d2ae646b0475b67b3db3daa84327a99132d83e SHA512 c3ef070244cd1c87312c2c2602dbe7bc3dd26eed632b0d8d779580d7ee6259efdda453ab7bdf4415cc72fad7a74d9dd36476189fe446d5627e4db75d905302f5 WHIRLPOOL 5fc149fd8f08569cf5d1223f6c1b7d7162a3b40554dd7af765b757fb2fad555dc6630ccbdbaf740a715c21519a5a168c303a3fd18ef1971728fad828628465f7
+DIST xdg-user-dirs-gtk-0.9.tar.xz 112828 SHA256 4b908252515eb95b27427ef7c6b0e096febde716c0c89e8f03a79d23882b79c8 SHA512 ea963c06ff00a291e0e7f0ae11469c073c3cfc96320b5dd463de521cf7f92c3aa05670a62d3d9a6c4db35f22009fd0ea949195181e0e04fb7c190c6205213270 WHIRLPOOL d3375a263bd837d4ea2f833d3d4dc3dfb993f670e6727eb4c4d34e2bd5a804fee5f33e740444112744638c65482669cc69e639185ae427047adbbd4e46e8936b
diff --git a/x11-misc/xdg-user-dirs-gtk/metadata.xml b/x11-misc/xdg-user-dirs-gtk/metadata.xml
new file mode 100644
index 000000000000..9879e83b822e
--- /dev/null
+++ b/x11-misc/xdg-user-dirs-gtk/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>freedesktop</herd>
+  <maintainer>
+    <email>freedesktop-bugs@gentoo.org</email>
+  </maintainer>
+</pkgmetadata>
diff --git a/x11-misc/xdg-user-dirs-gtk/xdg-user-dirs-gtk-0.10.ebuild b/x11-misc/xdg-user-dirs-gtk/xdg-user-dirs-gtk-0.10.ebuild
new file mode 100644
index 000000000000..04663ffa38c3
--- /dev/null
+++ b/x11-misc/xdg-user-dirs-gtk/xdg-user-dirs-gtk-0.10.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit gnome.org readme.gentoo
+
+DESCRIPTION="xdg-user-dirs-gtk integrates xdg-user-dirs into the Gnome desktop and Gtk+ applications"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/xdg-user-dirs"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE=""
+
+RDEPEND="
+	>=x11-misc/xdg-user-dirs-0.14
+	>=x11-libs/gtk+-3.5.1:3
+"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	virtual/pkgconfig
+"
+
+DOC_CONTENTS="
+	This package tries to automatically use some sensible default
+	directories for your documents, music, video and other stuff.
+	If you want to change those directories to your needs, see
+	the settings in ~/.config/user-dir.dirs
+"
+
+src_prepare() {
+	sed -i \
+		-e '/Encoding/d' \
+		-e 's:OnlyShowIn=GNOME;LXDE;Unity;:NotShowIn=KDE;:' \
+		user-dirs-update-gtk.desktop.in || die
+}
diff --git a/x11-misc/xdg-user-dirs-gtk/xdg-user-dirs-gtk-0.9.ebuild b/x11-misc/xdg-user-dirs-gtk/xdg-user-dirs-gtk-0.9.ebuild
new file mode 100644
index 000000000000..820a8f276fea
--- /dev/null
+++ b/x11-misc/xdg-user-dirs-gtk/xdg-user-dirs-gtk-0.9.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit gnome.org
+
+DESCRIPTION="xdg-user-dirs-gtk integrates xdg-user-dirs into the Gnome desktop and Gtk+ applications"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/xdg-user-dirs"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE=""
+
+RDEPEND=">=x11-misc/xdg-user-dirs-0.14
+	x11-libs/gtk+:3"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	virtual/pkgconfig"
+
+src_prepare() {
+	sed -i \
+		-e '/Encoding/d' \
+		-e 's:OnlyShowIn=GNOME;LXDE;Unity;:NotShowIn=KDE;:' \
+		user-dirs-update-gtk.desktop.in || die
+}
+
+pkg_postinst() {
+	elog
+	elog " This package tries to automatically use some sensible default "
+	elog " directories for your documents, music, video and other stuff. "
+	elog
+	elog " If you want to change those directories to your needs, see "
+	elog " the settings in ~/.config/user-dir.dirs "
+	elog
+}
diff --git a/x11-misc/xdg-user-dirs/Manifest b/x11-misc/xdg-user-dirs/Manifest
new file mode 100644
index 000000000000..4323d401a8fb
--- /dev/null
+++ b/x11-misc/xdg-user-dirs/Manifest
@@ -0,0 +1 @@
+DIST xdg-user-dirs-0.15.tar.gz 243747 SHA256 20b4a751f41d0554bce3e0ce5e8d934be98cc62d48f0b90a894c3e1916552786 SHA512 2365003d4c116326357755dbeb462d5d7a4fd1391fe0b4ced5597db1017dff230676773aa8cd4bdd9dbb1bfb59c1c71d08ed860a047e0e9c2ab2487c814c7ca9 WHIRLPOOL 12de27ae0c386f4db740ea5104233d6782d65686fb3df74f9c516d47d253e49f41ed25b75f2bcf9667b1f8e6e6fec66030ccdc6cadb1eb6a5f1a90ab9fe12e3b
diff --git a/x11-misc/xdg-user-dirs/files/xdg-user-dirs-0.15-libiconv.patch b/x11-misc/xdg-user-dirs/files/xdg-user-dirs-0.15-libiconv.patch
new file mode 100644
index 000000000000..c193fc83447a
--- /dev/null
+++ b/x11-misc/xdg-user-dirs/files/xdg-user-dirs-0.15-libiconv.patch
@@ -0,0 +1,14 @@
+http://bugs.gentoo.org/366885
+http://bugs.gentoo.org/499940
+
+--- Makefile.am
++++ Makefile.am
+@@ -16,7 +16,7 @@
+ xdgdir=$(sysconfdir)/xdg
+ xdg_DATA=user-dirs.conf user-dirs.defaults
+ 
+-libraries = $(LIBINTL)
++libraries = $(LIBINTL) $(LIBICONV)
+ 
+ bin_PROGRAMS =					\
+ 	xdg-user-dirs-update			\
diff --git a/x11-misc/xdg-user-dirs/metadata.xml b/x11-misc/xdg-user-dirs/metadata.xml
new file mode 100644
index 000000000000..9879e83b822e
--- /dev/null
+++ b/x11-misc/xdg-user-dirs/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>freedesktop</herd>
+  <maintainer>
+    <email>freedesktop-bugs@gentoo.org</email>
+  </maintainer>
+</pkgmetadata>
diff --git a/x11-misc/xdg-user-dirs/xdg-user-dirs-0.15.ebuild b/x11-misc/xdg-user-dirs/xdg-user-dirs-0.15.ebuild
new file mode 100644
index 000000000000..bff7e501a7b1
--- /dev/null
+++ b/x11-misc/xdg-user-dirs/xdg-user-dirs-0.15.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils
+
+DESCRIPTION="A tool to help manage 'well known' user directories"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/xdg-user-dirs"
+SRC_URI="http://user-dirs.freedesktop.org/releases/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="gtk"
+
+RDEPEND=""
+# libxslt is mandatory because 0.15 tarball is broken, re:
+# http://bugs.freedesktop.org/show_bug.cgi?id=66251
+DEPEND="app-text/docbook-xml-dtd:4.3
+	dev-libs/libxslt
+	sys-devel/gettext"
+PDEPEND="gtk? ( x11-misc/xdg-user-dirs-gtk )"
+
+DOCS=( AUTHORS ChangeLog NEWS )
+
+src_prepare() {
+	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die #467032
+	epatch "${FILESDIR}"/${P}-libiconv.patch
+	eautoreconf # for the above patch
+}
diff --git a/x11-misc/xdg-utils/Manifest b/x11-misc/xdg-utils/Manifest
new file mode 100644
index 000000000000..afce9591f920
--- /dev/null
+++ b/x11-misc/xdg-utils/Manifest
@@ -0,0 +1,3 @@
+DIST xdg-utils-1.1.0-rc2.tar.gz 307013 SHA256 bbe95ec4e7d54827981598622dafda8fd20ca2a2fddc8a940dd741215baff1ec SHA512 41ba836ba5e882a28247739b7b9dee667cfee35b5b53bbfbd756752dab240b4a394dfbbe1d218a92a2dcc264e999d10e5e9dec4cf8674d266b0f93a259a4ddc1 WHIRLPOOL 123860d87ff00dd4221375c93eb9f4c7ee61e9af259cd5f671176d527dd1e8f0e61939b5ef9d92da0730803eab71e67eb68d51360865ae4110e7228fc460d7dc
+DIST xdg-utils-1.1.0_rc2-patchset-1.tar.xz 20164 SHA256 0c7f3c39c28d43e049ea32f4b29f768c91a1c190d4ea736940370b40ee4d2cb8 SHA512 3f90bd778fe1aaf50a05f6d0e4ae51ab251037bde57a7f21a66b66681f05b811a832dadfde909938240ee4bbf4060e471faf0105a5f0e832af7e0436b4206bef WHIRLPOOL 883cb5efead1df84425252860577610dad5ae7ce14673d5c96a432c44de215252349ac0d07b7bfb071da38b70235f8b7c9c2fea8ffba5c1443f28078842a3930
+DIST xdg-utils-1.1.0_rc3_p20150119.tar.xz 262380 SHA256 6db91e0f6a4bb2698abde9dc578d61d1a9375c417adbe61e4c4364bbcbe6a4d9 SHA512 a83903f3d367e1deaf9355727e024606a4df90869629862c5ac55ca5f35b47ab2992863a9aec91413606e1ebc26905c1aef03c3f7f35a68db048059921658089 WHIRLPOOL d04f0bab8aefd9fb4d6c8805bf66aaeb5a79e1ecbe5866624f1f1d1da77115cc5c64d563aa75540ffef4eaeb610d879657422635b7548a0184138eb7319efedd
diff --git a/x11-misc/xdg-utils/metadata.xml b/x11-misc/xdg-utils/metadata.xml
new file mode 100644
index 000000000000..8c868061b739
--- /dev/null
+++ b/x11-misc/xdg-utils/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>freedesktop</herd>
+<maintainer>
+<email>freedesktop-bugs@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-misc/xdg-utils/xdg-utils-1.1.0_rc2-r1.ebuild b/x11-misc/xdg-utils/xdg-utils-1.1.0_rc2-r1.ebuild
new file mode 100644
index 000000000000..90ff190197e6
--- /dev/null
+++ b/x11-misc/xdg-utils/xdg-utils-1.1.0_rc2-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils
+
+MY_P=${P/_/-}
+
+DESCRIPTION="Portland utils for cross-platform/cross-toolkit/cross-desktop interoperability"
+HOMEPAGE="http://portland.freedesktop.org/"
+SRC_URI="http://people.freedesktop.org/~rdieter/${PN}/${MY_P}.tar.gz
+	http://dev.gentoo.org/~ssuominen/${P}-patchset-1.tar.xz"
+#SRC_URI="http://portland.freedesktop.org/download/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc +perl"
+
+RDEPEND="dev-util/desktop-file-utils
+	x11-misc/shared-mime-info
+	x11-apps/xprop
+	x11-apps/xset
+	perl? ( dev-perl/File-MimeInfo )"
+DEPEND="app-text/xmlto
+	|| ( www-client/links www-client/lynx virtual/w3m )"
+
+DOCS="README RELEASE_NOTES TODO" # ChangeLog is bogus, see git instead
+
+RESTRICT="test" # Disabled because of sandbox violation(s)
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	# If you choose to do git snapshot instead of patchset, you need to remember
+	# to run `autoconf` in ./ and `make scripts-clean` in ./scripts/ to refresh
+	# all the files
+	if [[ -d ${WORKDIR}/patch ]]; then
+		EPATCH_SUFFIX=patch EPATCH_FORCE=yes epatch
+	fi
+}
+
+src_configure() {
+	export ac_cv_path_XMLTO="$(type -P xmlto) --skip-validation" #502166
+	default
+}
+
+src_install() {
+	default
+
+	newdoc scripts/xsl/README README.xsl
+	use doc && dohtml -r scripts/html
+
+	# Install default XDG_DATA_DIRS, bug #264647
+	echo XDG_DATA_DIRS=\"${EPREFIX}/usr/local/share\" > 30xdg-data-local
+	echo 'COLON_SEPARATED="XDG_DATA_DIRS XDG_CONFIG_DIRS"' >> 30xdg-data-local
+	doenvd 30xdg-data-local
+
+	echo XDG_DATA_DIRS=\"${EPREFIX}/usr/share\" > 90xdg-data-base
+	echo XDG_CONFIG_DIRS=\"${EPREFIX}/etc/xdg\" >> 90xdg-data-base
+	doenvd 90xdg-data-base
+}
+
+pkg_postinst() {
+	[[ -x $(type -P gtk-update-icon-cache) ]] || elog "Install x11-libs/gtk+:2 for the gtk-update-icon-cache command."
+}
diff --git a/x11-misc/xdg-utils/xdg-utils-1.1.0_rc2.ebuild b/x11-misc/xdg-utils/xdg-utils-1.1.0_rc2.ebuild
new file mode 100644
index 000000000000..766e6f489406
--- /dev/null
+++ b/x11-misc/xdg-utils/xdg-utils-1.1.0_rc2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MY_P=${P/_/-}
+
+DESCRIPTION="Portland utils for cross-platform/cross-toolkit/cross-desktop interoperability"
+HOMEPAGE="http://portland.freedesktop.org/"
+SRC_URI="http://people.freedesktop.org/~rdieter/${PN}/${MY_P}.tar.gz"
+#SRC_URI="http://portland.freedesktop.org/download/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc +perl"
+
+RDEPEND="dev-util/desktop-file-utils
+	x11-misc/shared-mime-info
+	x11-apps/xprop
+	x11-apps/xset
+	perl? ( dev-perl/File-MimeInfo )"
+DEPEND="app-text/xmlto
+	|| ( www-client/links www-client/lynx virtual/w3m )"
+
+DOCS="README RELEASE_NOTES TODO" # ChangeLog is bogus, see git instead
+
+RESTRICT="test" # Disabled because of sandbox violation(s)
+
+S=${WORKDIR}/${MY_P}
+
+src_configure() {
+	export ac_cv_path_XMLTO="$(type -P xmlto) --skip-validation" #502166
+	default
+}
+
+src_install() {
+	default
+
+	newdoc scripts/xsl/README README.xsl
+	use doc && dohtml -r scripts/html
+
+	# Install default XDG_DATA_DIRS, bug #264647
+	echo XDG_DATA_DIRS=\"${EPREFIX}/usr/local/share\" > 30xdg-data-local
+	echo 'COLON_SEPARATED="XDG_DATA_DIRS XDG_CONFIG_DIRS"' >> 30xdg-data-local
+	doenvd 30xdg-data-local
+
+	echo XDG_DATA_DIRS=\"${EPREFIX}/usr/share\" > 90xdg-data-base
+	echo XDG_CONFIG_DIRS=\"${EPREFIX}/etc/xdg\" >> 90xdg-data-base
+	doenvd 90xdg-data-base
+}
+
+pkg_postinst() {
+	[[ -x $(type -P gtk-update-icon-cache) ]] || elog "Install x11-libs/gtk+:2 for the gtk-update-icon-cache command."
+}
diff --git a/x11-misc/xdg-utils/xdg-utils-1.1.0_rc3_p20150119.ebuild b/x11-misc/xdg-utils/xdg-utils-1.1.0_rc3_p20150119.ebuild
new file mode 100644
index 000000000000..682231d13dd7
--- /dev/null
+++ b/x11-misc/xdg-utils/xdg-utils-1.1.0_rc3_p20150119.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils
+
+#MY_P=${P/_/-}
+
+DESCRIPTION="Portland utils for cross-platform/cross-toolkit/cross-desktop interoperability"
+HOMEPAGE="http://portland.freedesktop.org/"
+SRC_URI="http://dev.gentoo.org/~yngwin/distfiles/${P}.tar.xz"
+#SRC_URI="http://people.freedesktop.org/~rdieter/${PN}/${MY_P}.tar.gz
+#	http://dev.gentoo.org/~ssuominen/${P}-patchset-1.tar.xz"
+#SRC_URI="http://portland.freedesktop.org/download/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc +perl"
+
+RDEPEND="dev-util/desktop-file-utils
+	x11-misc/shared-mime-info
+	x11-apps/xprop
+	x11-apps/xset
+	perl? ( dev-perl/File-MimeInfo )"
+DEPEND="app-text/xmlto
+	|| ( www-client/links www-client/lynx virtual/w3m )"
+
+DOCS="README RELEASE_NOTES TODO" # ChangeLog is bogus, see git instead
+
+RESTRICT="test" # Disabled because of sandbox violation(s)
+
+#S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	# If you choose to do git snapshot instead of patchset, you need to remember
+	# to run `autoconf` in ./ and `make scripts-clean` in ./scripts/ to refresh
+	# all the files
+	if [[ -d ${WORKDIR}/patch ]]; then
+		EPATCH_SUFFIX=patch EPATCH_FORCE=yes epatch
+	fi
+	eautoreconf
+	pushd scripts && make scripts-clean && popd
+}
+
+src_configure() {
+	export ac_cv_path_XMLTO="$(type -P xmlto) --skip-validation" #502166
+	default
+}
+
+src_install() {
+	default
+
+	newdoc scripts/xsl/README README.xsl
+	use doc && dohtml -r scripts/html
+
+	# Install default XDG_DATA_DIRS, bug #264647
+	echo XDG_DATA_DIRS=\"${EPREFIX}/usr/local/share\" > 30xdg-data-local
+	echo 'COLON_SEPARATED="XDG_DATA_DIRS XDG_CONFIG_DIRS"' >> 30xdg-data-local
+	doenvd 30xdg-data-local
+
+	echo XDG_DATA_DIRS=\"${EPREFIX}/usr/share\" > 90xdg-data-base
+	echo XDG_CONFIG_DIRS=\"${EPREFIX}/etc/xdg\" >> 90xdg-data-base
+	doenvd 90xdg-data-base
+}
+
+pkg_postinst() {
+	[[ -x $(type -P gtk-update-icon-cache) ]] || elog "Install x11-libs/gtk+:2 for the gtk-update-icon-cache command."
+}
diff --git a/x11-misc/xdialog/Manifest b/x11-misc/xdialog/Manifest
new file mode 100644
index 000000000000..0638e520e51f
--- /dev/null
+++ b/x11-misc/xdialog/Manifest
@@ -0,0 +1 @@
+DIST Xdialog-2.3.1.tar.bz2 457938 SHA256 1d446899697145fc36623d8afdd274066177da9383a6b619c18e8eb1b2ba589a SHA512 2a0f6e15297ae3ef54a41da1b1fe2ef376d28757d47433df2b8e9918cd4f95871a630b94ec544bd848e518df7f86934030a71bf0371a1466286bf7d912335525 WHIRLPOOL 27a2a25bf2eea348a9dbdf04aed334fa70e35f8d84d56e8ee561ebb345e8c457c6b9cff83a99c9df07686dc20e25d3bb980fae6b9d774d601ddbff2a04f49010
diff --git a/x11-misc/xdialog/files/xdialog-2.3.1-install.patch b/x11-misc/xdialog/files/xdialog-2.3.1-install.patch
new file mode 100644
index 000000000000..f5a02b099d92
--- /dev/null
+++ b/x11-misc/xdialog/files/xdialog-2.3.1-install.patch
@@ -0,0 +1,13 @@
+http://bugs.gentoo.org/327353
+
+--- doc/Makefile.am
++++ doc/Makefile.am
+@@ -6,7 +6,7 @@
+ 
+ CLEANFILES = index.html compatibility.html changelog.html license.html Xdialog.1
+ 
+-doc_DATA = index.html compatibility.html changelog.html license.html $(srcdir)/*.html $(srcdir)/*.png
++doc_DATA = $(srcdir)/*.html $(srcdir)/*.png
+ 
+ man_MANS = Xdialog.1
+ 
diff --git a/x11-misc/xdialog/files/xdialog-2.3.1-no-strip.patch b/x11-misc/xdialog/files/xdialog-2.3.1-no-strip.patch
new file mode 100644
index 000000000000..a507f3f0cfbb
--- /dev/null
+++ b/x11-misc/xdialog/files/xdialog-2.3.1-no-strip.patch
@@ -0,0 +1,48 @@
+diff -Nru Xdialog-2.3.1.vanilla/configure.in Xdialog-2.3.1/configure.in
+--- Xdialog-2.3.1.vanilla/configure.in	2009-02-11 09:54:10.000000000 +0000
++++ Xdialog-2.3.1/configure.in	2009-02-11 09:59:28.000000000 +0000
+@@ -36,13 +36,8 @@
+   CPPFLAGS="$CPPFLAGS -DUSE_GTK2"
+   AC_MSG_RESULT(Compiling for GTK2)
+   ])
+-if test "$compile_for" = "gtk2" ; then
+-  AM_PATH_GTK_2_0(2.2.0, ,
+-            AC_MSG_ERROR(Cannot find GTK2.))
+-else
+-  AM_PATH_GTK(1.2.0, ,
+-            AC_MSG_ERROR(Cannot find GTK: Is gtk-config in path?))
+-fi
++AM_PATH_GTK_2_0(2.2.0, ,
++		AC_MSG_ERROR(Cannot find GTK2.))
+ 
+ dnl Set PACKAGE_DATA_DIR in config.h.
+ if test "x${datadir}" = 'x${prefix}/share'; then
+@@ -59,28 +54,6 @@
+ packagesrcdir=`cd $srcdir && pwd`
+ AC_DEFINE_UNQUOTED(PACKAGE_SOURCE_DIR, "${packagesrcdir}", [ ])
+ 
+-dnl Use -Wall if we have gcc.
+-if test "x$GCC" = "xyes"; then
+-  case " $CFLAGS " in
+-  *[[\ \	]-Wall[\ \	]]*) ;;
+-  *) CFLAGS="$CFLAGS -Wall" ;;
+-  esac
+-  case " $CFLAGS " in
+-  *[[\ \	]-s[\ \	]]*) ;;
+-  *) CFLAGS="$CFLAGS -s" ;;
+-  esac
+-  case `gcc --version` in
+-  2.95*|2.96*|2.97*)
+-  case " $CFLAGS " in
+-  *[[\ \	]-fno-omit-frame-pointer[\ \	]]*) ;;
+-  *) CFLAGS="$CFLAGS -fno-omit-frame-pointer" ;;
+-  esac
+-  AC_MSG_RESULT(Buggy GCC version: compiling with -fno-omit-frame-pointer)
+-  ;;
+-  *) ;;
+-  esac
+-fi
+-
+ AC_ARG_WITH(french-labels,
+   [  --with-french-labels    Enables french labels in menus],[
+   CPPFLAGS="$CPPFLAGS -DFRENCH"
diff --git a/x11-misc/xdialog/metadata.xml b/x11-misc/xdialog/metadata.xml
new file mode 100644
index 000000000000..91ed7416b725
--- /dev/null
+++ b/x11-misc/xdialog/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>desktop-misc</herd>
+</pkgmetadata>
+
diff --git a/x11-misc/xdialog/xdialog-2.3.1.ebuild b/x11-misc/xdialog/xdialog-2.3.1.ebuild
new file mode 100644
index 000000000000..967790e2b315
--- /dev/null
+++ b/x11-misc/xdialog/xdialog-2.3.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils
+
+DESCRIPTION="drop-in replacement for cdialog using GTK"
+HOMEPAGE="http://xdialog.free.fr/"
+SRC_URI="http://${PN}.free.fr/Xdialog-${PV}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ~hppa ppc x86"
+IUSE="doc examples nls"
+
+RDEPEND="
+	dev-libs/glib:2
+	>=x11-libs/gtk+-2.2:2
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+
+S=${WORKDIR}/${P/x/X}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-{no-strip,install}.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		--with-gtk2
+}
+
+src_install() {
+	default
+	rm -rf "${D}"/usr/share/doc
+
+	dodoc AUTHORS BUGS ChangeLog README
+
+	use doc && dohtml -r doc/
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins samples/*
+	fi
+}
diff --git a/x11-misc/xdiskusage/Manifest b/x11-misc/xdiskusage/Manifest
new file mode 100644
index 000000000000..d0e952fc7c63
--- /dev/null
+++ b/x11-misc/xdiskusage/Manifest
@@ -0,0 +1 @@
+DIST xdiskusage-1.48_p20111016.tar.xz 17812 RMD160 ee487ed33ef509454badb86161bbfce779f3f648 SHA1 e109083a2ef0ac3418f03f0d261d92a1ec0de5a9 SHA256 e612d2652a4127a9c4a296b186dd2cf9eb2cc43c217c85ae534ba55545af0250
diff --git a/x11-misc/xdiskusage/metadata.xml b/x11-misc/xdiskusage/metadata.xml
new file mode 100644
index 000000000000..38c15f113190
--- /dev/null
+++ b/x11-misc/xdiskusage/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>desktop-misc</herd>
+  <longdescription>
+	xdiskusage is a user-friendly program to show you what is using up all your disk space.
+ </longdescription>
+</pkgmetadata>
diff --git a/x11-misc/xdiskusage/xdiskusage-1.48_p20111016.ebuild b/x11-misc/xdiskusage/xdiskusage-1.48_p20111016.ebuild
new file mode 100644
index 000000000000..ee06386f8704
--- /dev/null
+++ b/x11-misc/xdiskusage/xdiskusage-1.48_p20111016.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit autotools
+
+DESCRIPTION="front end to xdu for viewing disk usage graphically under X11"
+HOMEPAGE="http://xdiskusage.sourceforge.net/"
+SRC_URI="mirror://gentoo/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=x11-libs/fltk-1.3:1"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils"
+
+src_prepare() { eautoreconf; }
+src_compile() {
+	emake \
+		CXXFLAGS="${CXXFLAGS} $(fltk-config --cxxflags)" \
+		LDLIBS="$(fltk-config --ldflags)"
+}
+src_install() { dobin ${PN}; doman ${PN}.1; dodoc README; }
diff --git a/x11-misc/xdo/Manifest b/x11-misc/xdo/Manifest
new file mode 100644
index 000000000000..3cc25e968afa
--- /dev/null
+++ b/x11-misc/xdo/Manifest
@@ -0,0 +1,2 @@
+DIST xdo-0.3.tar.gz 6927 SHA256 4845d2d0ba6c55ca657b7fc02483bde26545502ee81e1495ee313dd5bca20e89 SHA512 b900d487f7daba67466ae2a3c318dd64ab2aa2d5f9954af8c93bc30262b23f86972c93e82df56da0801b60be5314e7870df6d7c4252ec00f4705e629d1197d31 WHIRLPOOL bb80a95872f646e97fb377ef50bf3be3f471936b68bc505432fe9d5e0eede0e0c13a04eb86314faadf63c3334af7a3006a88dae55979aca0473379d439eb0f6e
+DIST xdo-0.4.tar.gz 6544 SHA256 0b3ac57c6127799d18d27aa58b21d837b96525c6c6ae2f1433dc6d0a371e74ea SHA512 2299023be0abf5eea7c71c4513b9a7a6175a287ede233110291d2908ab417a389efe31b26c3fb8cc9e0017707b7accfac6785c1e1fe4154dcebceda3a6121cef WHIRLPOOL a5670d514e5f4279e088b2d4e3904d01464ff5864616bdbfc25ff65e1c3a160bc862441e120fbe313ab7ea9e16d7077c4c7edbc3715d6c39dec18c835182b6e6
diff --git a/x11-misc/xdo/metadata.xml b/x11-misc/xdo/metadata.xml
new file mode 100644
index 000000000000..41a378ba7d91
--- /dev/null
+++ b/x11-misc/xdo/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>radhermit@gentoo.org</email>
+		<name>Tim Harder</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">baskerville/xdo</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-misc/xdo/xdo-0.3.ebuild b/x11-misc/xdo/xdo-0.3.ebuild
new file mode 100644
index 000000000000..caa8f0c26fe5
--- /dev/null
+++ b/x11-misc/xdo/xdo-0.3.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit toolchain-funcs
+
+DESCRIPTION="Small X utility to perform elementary actions on windows"
+HOMEPAGE="https://github.com/baskerville/xdo/"
+SRC_URI="https://github.com/baskerville/xdo/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="x11-libs/libxcb
+	x11-libs/xcb-util-wm"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	sed -e '/CFLAGS += -Os/d' \
+		-e '/LDFLAGS += -s/d' \
+		-i Makefile || die
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" PREFIX=/usr
+}
+
+src_install() {
+	emake PREFIX=/usr DESTDIR="${D}" install
+}
diff --git a/x11-misc/xdo/xdo-0.4.ebuild b/x11-misc/xdo/xdo-0.4.ebuild
new file mode 100644
index 000000000000..778177ffc527
--- /dev/null
+++ b/x11-misc/xdo/xdo-0.4.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit toolchain-funcs
+
+DESCRIPTION="Small X utility to perform elementary actions on windows"
+HOMEPAGE="https://github.com/baskerville/xdo/"
+SRC_URI="https://github.com/baskerville/xdo/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="x11-libs/libxcb
+	x11-libs/xcb-util-wm"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	sed -e '/CFLAGS += -Os/d' \
+		-e '/LDFLAGS += -s/d' \
+		-i Makefile || die
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" PREFIX=/usr
+}
+
+src_install() {
+	emake PREFIX=/usr DESTDIR="${D}" install
+}
diff --git a/x11-misc/xdock/Manifest b/x11-misc/xdock/Manifest
new file mode 100644
index 000000000000..dd50f44bde0d
--- /dev/null
+++ b/x11-misc/xdock/Manifest
@@ -0,0 +1 @@
+DIST xdock-0.3.0.tar.gz 345753 SHA256 eaa70e0890cde23d2dd6821ad4825a0b096d2def4a437ad01d2b6bfbf77f3d75 SHA512 72fcfa4ae643a054c2ea1a4a4bc2772cb961dedfbb8d85acfaa997bea574cb6b2df3f88bc6bb9dae3a2a27a7a0136887c79e2508ff2e69998c4c985d34080e88 WHIRLPOOL 77b839b3eca278a6fe602de92c92a54d76c928c2cc17ffe3ee892a98a55d5d4560935b77c9f53a052e94b778cc11e86e4677c92cecf2fc0e4df72785698b98b2
diff --git a/x11-misc/xdock/files/xdock-0.2.0-ldconfig.patch b/x11-misc/xdock/files/xdock-0.2.0-ldconfig.patch
new file mode 100644
index 000000000000..31956ccd8362
--- /dev/null
+++ b/x11-misc/xdock/files/xdock-0.2.0-ldconfig.patch
@@ -0,0 +1,8 @@
+--- a/src/lib/Makefile.am
++++ b/src/lib/Makefile.am
+@@ -8,5 +8,3 @@
+ 
+ include_HEADERS = xdock.h
+ 
+-install-exec-hook:
+-	ldconfig
diff --git a/x11-misc/xdock/metadata.xml b/x11-misc/xdock/metadata.xml
new file mode 100644
index 000000000000..0e065732328d
--- /dev/null
+++ b/x11-misc/xdock/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>desktop-dock</herd>
+	<upstream>
+		<remote-id type="sourceforge">xdock</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-misc/xdock/xdock-0.3.0.ebuild b/x11-misc/xdock/xdock-0.3.0.ebuild
new file mode 100644
index 000000000000..4427a3bf6cb5
--- /dev/null
+++ b/x11-misc/xdock/xdock-0.3.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils
+
+DESCRIPTION="emulates Window Maker docks (runs in any window manager)"
+HOMEPAGE="http://xdock.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/libX11"
+DEPEND="${RDEPEND}"
+
+DOCS=( API AUTHORS ChangeLog README TODO )
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.2.0-ldconfig.patch
+	sed -i -e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' configure.ac || die
+	eautoreconf
+}
diff --git a/x11-misc/xdotool/Manifest b/x11-misc/xdotool/Manifest
new file mode 100644
index 000000000000..d1951fd056e1
--- /dev/null
+++ b/x11-misc/xdotool/Manifest
@@ -0,0 +1,2 @@
+DIST xdotool-2.20101012.3049.tar.gz 99573 SHA256 9a9a03701018be6ca82f60c636f37d1749bfb24a5ce6a1f6910fccb67f58b32a
+DIST xdotool-2.20110530.1.tar.gz 107204 SHA256 e7b42c8b1d391970e1c1009b256033f30e57d8e0a2a3de229fd61ecfc27baf67 SHA512 0b2f71203c41e320aac152e1376b30bb9f5ea2067572299ad4c32f49b2505566275f0b377b4f443c3520751d71a9b270325cd676e63ee2a153de3213e128f2cb WHIRLPOOL c4bb185e59237917ddeb86d433ca1fbbea1ace2e1cc46c7d949cef748a7765b01300fdd3826537135798a646d4672a1607b6cc60acc7539e46994d974a5e1dad
diff --git a/x11-misc/xdotool/metadata.xml b/x11-misc/xdotool/metadata.xml
new file mode 100644
index 000000000000..9daac930f2b9
--- /dev/null
+++ b/x11-misc/xdotool/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>joker@gentoo.org</email>
+		<name>Christian Birchinger</name>
+	</maintainer>
+	<longdescription>This tool lets you programatically (or manually) simulate keyboard input and
+mouse activity, move and resize windows, etc. It does this using X11's XTEST
+extension and other Xlib functions. </longdescription>
+	<upstream>
+		<remote-id type="google-code">semicomplete</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-misc/xdotool/xdotool-2.20101012.3049.ebuild b/x11-misc/xdotool/xdotool-2.20101012.3049.ebuild
new file mode 100644
index 000000000000..feafc1ee6b3d
--- /dev/null
+++ b/x11-misc/xdotool/xdotool-2.20101012.3049.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+
+inherit eutils toolchain-funcs flag-o-matic multilib
+
+DESCRIPTION="Simulate keyboard input and mouse activity, move and resize windows"
+HOMEPAGE="http://www.semicomplete.com/projects/xdotool/"
+SRC_URI="http://semicomplete.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="examples"
+
+DEPEND="x11-libs/libXtst
+	x11-libs/libX11"
+RDEPEND="${DEPEND}"
+
+# The test wants to manualy start Xvfb, wont use VirtualX and it tries
+# to run a full gnome-session. For such a tiny application i consider
+# it overkill to rewrite the test scripts to not use it's own X server
+# and add a full blown gnome just to run the tests.
+RESTRICT="test"
+
+src_prepare() {
+	sed -e "s/installheader post-install$/installheader/" \
+		-i Makefile || die "sed failed"
+}
+
+src_compile() {
+	tc-export CC LD
+	default
+}
+
+src_install() {
+	emake PREFIX="${D}usr" INSTALLMAN="${D}usr/share/man" INSTALLLIB="${D}usr/$(get_libdir)" install || die
+
+	dodoc CHANGELIST README
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins examples/*
+	fi
+}
diff --git a/x11-misc/xdotool/xdotool-2.20110530.1.ebuild b/x11-misc/xdotool/xdotool-2.20110530.1.ebuild
new file mode 100644
index 000000000000..4e49c063adcb
--- /dev/null
+++ b/x11-misc/xdotool/xdotool-2.20110530.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+
+inherit eutils toolchain-funcs flag-o-matic multilib
+
+DESCRIPTION="Simulate keyboard input and mouse activity, move and resize windows"
+HOMEPAGE="http://www.semicomplete.com/projects/xdotool/"
+SRC_URI="http://semicomplete.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 arm ppc x86"
+IUSE="examples"
+
+RDEPEND="x11-libs/libXtst
+	x11-libs/libX11
+	x11-libs/libXinerama"
+DEPEND="${RDEPEND}"
+
+# The test wants to manualy start Xvfb, wont use VirtualX and it tries
+# to run a full gnome-session. For such a tiny application i consider
+# it overkill to rewrite the test scripts to not use it's own X server
+# and add a full blown gnome just to run the tests.
+RESTRICT="test"
+
+src_prepare() {
+	sed -i \
+		-e "s/installheader post-install$/installheader/" \
+		-e 's:\<pkg-config\>:$(PKG_CONFIG):' \
+		Makefile || die "sed failed"
+}
+
+src_compile() {
+	tc-export CC LD PKG_CONFIG
+	default
+}
+
+src_install() {
+	emake PREFIX="${D}usr" INSTALLMAN="${D}usr/share/man" INSTALLLIB="${D}usr/$(get_libdir)" install || die
+
+	dodoc CHANGELIST README
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins examples/*
+	fi
+}
diff --git a/x11-misc/xearth/Manifest b/x11-misc/xearth/Manifest
new file mode 100644
index 000000000000..f7b02372b91f
--- /dev/null
+++ b/x11-misc/xearth/Manifest
@@ -0,0 +1 @@
+DIST xearth-1.1.tar.gz 157887 SHA256 bcb1407cc35b3f6dd3606b2c6072273b6a912cbd9ed1ae22fb2d26694541309c SHA512 ab1c146385a0e61f6208a0218cabc8a10902f52feb50f328a330cdbddc5d2eff2c3efdf6719b625bcc07171ed2fd6201230ad8a71cd77a451ad9c81383bfd46e WHIRLPOOL c5884f3d7bed815f3e9ebe96c078d8646602117744377d8b83065aa4218869a9acdfcd6373d65d6702a1f051a301a0f881cb7f2aae00b0e1db057b13759ab727
diff --git a/x11-misc/xearth/files/xearth-1.1-include.patch b/x11-misc/xearth/files/xearth-1.1-include.patch
new file mode 100644
index 000000000000..d3974b43f2e7
--- /dev/null
+++ b/x11-misc/xearth/files/xearth-1.1-include.patch
@@ -0,0 +1,10 @@
+--- a/gifout.c	1999-11-07 07:51:34.000000000 +0100
++++ b/gifout.c	2010-09-18 02:44:44.000000000 +0200
+@@ -44,6 +44,7 @@
+  */
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ #include "port.h"
+ #include "gifint.h"
+ #include "kljcpyrt.h"
diff --git a/x11-misc/xearth/metadata.xml b/x11-misc/xearth/metadata.xml
new file mode 100644
index 000000000000..0e92f1446c72
--- /dev/null
+++ b/x11-misc/xearth/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+        <herd>desktop-misc</herd>
+</pkgmetadata>
+
diff --git a/x11-misc/xearth/xearth-1.1-r1.ebuild b/x11-misc/xearth/xearth-1.1-r1.ebuild
new file mode 100644
index 000000000000..e00b1c5b4ee6
--- /dev/null
+++ b/x11-misc/xearth/xearth-1.1-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+
+HOMEPAGE="http://hewgill.com/xearth/original/"
+DESCRIPTION="Xearth sets the X root window to an image of the Earth"
+SRC_URI="ftp://cag.lcs.mit.edu/pub/tuna/${P}.tar.gz
+	ftp://ftp.cs.colorado.edu/users/tuna/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="xearth"
+KEYWORDS="alpha amd64 ppc ppc64 x86"
+IUSE=""
+
+RDEPEND="
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXt
+"
+DEPEND="${RDEPEND}
+	x11-misc/imake
+	app-text/rman
+	x11-proto/xproto
+"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-include.patch
+}
+
+src_configure() {
+	xmkmf || die
+}
+
+src_compile() {
+	emake CC=$(tc-getCC) \
+		CCOPTIONS="${CFLAGS}" \
+		EXTRA_LDOPTIONS="${LDFLAGS}"
+}
+
+src_install() {
+	newman xearth.man xearth.1
+	dobin xearth
+	dodoc BUILT-IN GAMMA-TEST HISTORY README
+}
diff --git a/x11-misc/xfe/Manifest b/x11-misc/xfe/Manifest
new file mode 100644
index 000000000000..014e05c1fdd3
--- /dev/null
+++ b/x11-misc/xfe/Manifest
@@ -0,0 +1 @@
+DIST xfe-1.40.tar.gz 2574477 SHA256 2b476f15beff1a1ce85dd4ce6559bb7ceca78b866c63fb4986456862a36862a8 SHA512 22cf9fd60dcd4b594d7ff39ea78d10a8c71ee2433025acf32b7e69457a5e86852b54e448ebc1e3f63f39bf720767064c74c46eaf2b999c14ae76417d33272892 WHIRLPOOL 5c3ce54db8ac3c7e99f590100a493e3611ea2cad90b498d0b673d1366a85ed0280c8aa664f60f9de633192964a5cead4efee65e6eee69f65fdd0928061e07e0e
diff --git a/x11-misc/xfe/files/xfe-1.32.2-missing_Xlib_h.patch b/x11-misc/xfe/files/xfe-1.32.2-missing_Xlib_h.patch
new file mode 100644
index 000000000000..eb08d0ca069f
--- /dev/null
+++ b/x11-misc/xfe/files/xfe-1.32.2-missing_Xlib_h.patch
@@ -0,0 +1,33 @@
+--- a/src/ViewWindow.cpp
++++ a/src/ViewWindow.cpp
+@@ -12,6 +12,8 @@
+ #include <string.h>
+ #include <unistd.h>
+ 
++#include <X11/Xlib.h>
++
+ #include <fx.h>
+ #include <fxkeys.h>
+ #include <FXPNGIcon.h>
+--- a/src/WriteWindow.cpp
++++ a/src/WriteWindow.cpp
+@@ -12,6 +12,8 @@
+ #include <unistd.h>
+ #include <signal.h>
+ 
++#include <X11/Xlib.h>
++
+ #include <fx.h>
+ #include <fxkeys.h>
+ #include <FXPNGIcon.h>
+--- a/src/XFileExplorer.cpp
++++ a/src/XFileExplorer.cpp
+@@ -8,6 +8,8 @@
+ #include <sys/wait.h>
+ #include <unistd.h>
+ 
++#include <X11/Xlib.h>
++
+ #include <fx.h>
+ #include <fxkeys.h>
+ #include <FXPNGIcon.h>
diff --git a/x11-misc/xfe/metadata.xml b/x11-misc/xfe/metadata.xml
new file mode 100644
index 000000000000..900869d128f4
--- /dev/null
+++ b/x11-misc/xfe/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>desktop-misc</herd>
+	<upstream>
+		<remote-id type="sourceforge">xfe</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-misc/xfe/xfe-1.40.ebuild b/x11-misc/xfe/xfe-1.40.ebuild
new file mode 100644
index 000000000000..ce72a0b34a3a
--- /dev/null
+++ b/x11-misc/xfe/xfe-1.40.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PLOCALES="
+	bs ca cs da de el es_AR es_CO es fr hu it ja nl no pl pt_BR pt_PT ru sv tr
+	zh_CN zh_TW
+"
+inherit autotools l10n
+
+DESCRIPTION="MS-Explorer-like minimalist file manager for X"
+HOMEPAGE="http://roland65.free.fr/xfe"
+SRC_URI="mirror://sourceforge/${PN}/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 ~sparc x86"
+IUSE="debug nls startup-notification"
+
+RDEPEND="
+	media-libs/libpng:0
+	x11-libs/fox:1.6[truetype,png]
+	x11-libs/libX11
+	x11-libs/libXft
+	startup-notification? ( x11-libs/startup-notification )
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	nls? (
+		dev-util/intltool
+		sys-devel/gettext
+	)
+"
+
+DOCS=( AUTHORS BUGS ChangeLog README TODO )
+
+src_prepare() {
+	cat >po/POTFILES.skip <<-EOF
+	src/icons.cpp
+	xfe.desktop.in.in
+	xfi.desktop.in.in
+	xfp.desktop.in.in
+	xfv.desktop.in.in
+	xfw.desktop.in.in
+	EOF
+
+	# malformed LINGUAS file
+	# recent intltool expects newline for every linguas
+	sed -i \
+		-e '/^#/!s:\s\s*:\n:g' \
+		po/LINGUAS || die
+
+	# remove not selected locales
+	rm_locale() { sed -i -e "/${1}/d" po/LINGUAS || die ;}
+	l10n_for_each_disabled_locale_do rm_locale
+
+	sed -i \
+		-e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' \
+		configure.ac || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable debug) \
+		$(use_enable nls) \
+		$(use_enable startup-notification sn) \
+		--enable-minimalflags
+}
diff --git a/x11-misc/xfishtank/Manifest b/x11-misc/xfishtank/Manifest
new file mode 100644
index 000000000000..fc536b17fc9c
--- /dev/null
+++ b/x11-misc/xfishtank/Manifest
@@ -0,0 +1 @@
+DIST xfishtank-2.1tp.tar.gz 187513 SHA256 afaedcecd61716fce6c008598dc5750f8d061ae23a36afbab426d0d2cc922240
diff --git a/x11-misc/xfishtank/files/xfishtank-2.1-implicits.patch b/x11-misc/xfishtank/files/xfishtank-2.1-implicits.patch
new file mode 100644
index 000000000000..0a4a03503246
--- /dev/null
+++ b/x11-misc/xfishtank/files/xfishtank-2.1-implicits.patch
@@ -0,0 +1,75 @@
+--- xfishtank-2.1tp/read.c
++++ xfishtank-2.1tp/read.c
+@@ -1,5 +1,7 @@
+ #include <X11/Xlib.h>
+ #include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
+ #include "compact.h"
+ #include "medcut.h"
+ 
+--- xfishtank-2.1tp/medcut.c
++++ xfishtank-2.1tp/medcut.c
+@@ -1,4 +1,5 @@
+ #include <stdio.h>
++#include <stdlib.h>
+ #include "medcut.h"
+ 
+ #define RED     0
+--- xfishtank-2.1tp/xfish.c
++++ xfishtank-2.1tp/xfish.c
+@@ -46,6 +46,9 @@
+ #endif
+ 
+ #include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
++#include <unistd.h>
+ #ifdef sgi
+ #define _BSD_SIGNALS
+ #endif
+@@ -848,8 +850,8 @@
+ 	struct colr_data colrs[256];
+ 
+ 	colormap = XDefaultColormap(Dpy, screen);
+
+-	if (colormap == NULL)
++	if (colormap == 0)
+ 	{
+ 		return;
+ 	}
+@@ -1812,9 +1814,11 @@
+ high_res_sleep(seconds)
+     double      seconds;
+ {
+-    int         fds = 0;
++    fd_set      fds;
+     struct timeval timeout;
+ 
++    FD_ZERO(&fds);
++
+     timeout.tv_sec = seconds;
+     timeout.tv_usec = (seconds - timeout.tv_sec) * 1000000.0;
+     select(0, &fds, &fds, &fds, &timeout);
+--- xfishtank-2.1tp/makeh.c
++++ xfishtank-2.1tp/makeh.c
+@@ -1,6 +1,6 @@
+-
++#include <stdlib.h>
+ #include <stdio.h>
+-
++#include <string.h>
+ main()
+ {
+ 	FILE *fp;
+--- xfishtank-2.1tp/gifread.c
++++ xfishtank-2.1tp/gifread.c
+@@ -56,6 +56,8 @@
+ 
+ #include <X11/Xlib.h>
+ #include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
+ #if  defined(SYSV) || defined(SVR4)
+ #include <string.h>
+ #else	/* SYSV */
diff --git a/x11-misc/xfishtank/files/xfishtank-2.1tp-Makefile.patch b/x11-misc/xfishtank/files/xfishtank-2.1tp-Makefile.patch
new file mode 100644
index 000000000000..df404b1949b0
--- /dev/null
+++ b/x11-misc/xfishtank/files/xfishtank-2.1tp-Makefile.patch
@@ -0,0 +1,12 @@
+diff -Nru xfishtank-2.1tp.vanilla/Makefile xfishtank-2.1tp/Makefile
+--- xfishtank-2.1tp.vanilla/Makefile	2005-12-18 16:21:08.000000000 +0100
++++ xfishtank-2.1tp/Makefile	2005-12-18 16:23:06.000000000 +0100
+@@ -212,7 +212,7 @@
+ 
+       ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(STD_INCLUDES)
+        ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(EXTRA_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(DEFINES)
+-           CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(ALLDEFINES)
++           CFLAGS += $(CCOPTIONS) $(THREADS_CFLAGS) $(ALLDEFINES)
+         LINTFLAGS = $(LINTOPTS) -DLINT $(ALLDEFINES) $(DEPEND_DEFINES)
+          LDPRELIB = -L$(USRLIBDIR)
+         LDPOSTLIB =
diff --git a/x11-misc/xfishtank/metadata.xml b/x11-misc/xfishtank/metadata.xml
new file mode 100644
index 000000000000..731225048652
--- /dev/null
+++ b/x11-misc/xfishtank/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>desktop-misc</herd>
+</pkgmetadata>
diff --git a/x11-misc/xfishtank/xfishtank-2.1-r1.ebuild b/x11-misc/xfishtank/xfishtank-2.1-r1.ebuild
new file mode 100644
index 000000000000..12b55ec45b94
--- /dev/null
+++ b/x11-misc/xfishtank/xfishtank-2.1-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+
+inherit eutils toolchain-funcs
+
+MY_P=${P}tp
+
+DESCRIPTION="Turns your root window into an aquarium"
+HOMEPAGE="http://www.ibiblio.org/pub/Linux/X11/demos/"
+SRC_URI="http://www.ibiblio.org/pub/Linux/X11/demos/${MY_P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86 ~x86-linux"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXt
+	x11-libs/libXext"
+DEPEND="${RDEPEND}
+	x11-proto/xproto
+	x11-misc/imake"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-implicits.patch
+}
+
+src_compile() {
+	xmkmf || die
+	emake CDEBUGFLAGS="${CFLAGS}" CC="$(tc-getCC)" \
+		EXTRA_LDOPTIONS="${LDFLAGS}" ${PN} || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc README README.Linux README.TrueColor README.Why.2.1tp || die
+}
diff --git a/x11-misc/xfishtank/xfishtank-2.1.ebuild b/x11-misc/xfishtank/xfishtank-2.1.ebuild
new file mode 100644
index 000000000000..03021e8d23de
--- /dev/null
+++ b/x11-misc/xfishtank/xfishtank-2.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils
+
+MY_P=${P}tp
+
+DESCRIPTION="Turns your root window into an aquarium"
+HOMEPAGE="http://www.ibiblio.org/pub/Linux/X11/demos/"
+SRC_URI="http://www.ibiblio.org/pub/Linux/X11/demos/${MY_P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="ppc ppc64 x86"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXt
+	x11-libs/libXext"
+DEPEND="${RDEPEND}
+	x11-proto/xproto
+	x11-misc/makedepend"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+	epatch "${FILESDIR}/${MY_P}-Makefile.patch"
+	cd "${S}"
+	sed -i -e 's,INSTPGMFLAGS = -s,INSTPGMFLAGS =,' Makefile || die
+}
+
+src_compile() {
+	makedepend || die "makedepend failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	make BINDIR=/usr/bin DESTDIR="${D}" install || die "make install failed"
+	dodoc README README.Linux README.TrueColor README.Why.2.1tp
+}
diff --git a/x11-misc/xfractint/Manifest b/x11-misc/xfractint/Manifest
new file mode 100644
index 000000000000..0f22a7ccab92
--- /dev/null
+++ b/x11-misc/xfractint/Manifest
@@ -0,0 +1 @@
+DIST xfractint-20.04p12.tar.gz 1335480 SHA256 e81affa9d3b3826f14502cedf1fc4a4dd41bcfa71ba32f8e4224748c5b9c69e0 SHA512 ef233b417ccdff153e53b70f4ac0500be99e9fc6e87360b341640573592320b2485f18fd6426436432d968d33fa41d4862babf193c3b11c480f514a4602bb8f2 WHIRLPOOL 47a2f4c0919232109309a00a131ffc4a5a87519727469af09f51101f7984b54851e71d928147faed27d51d167ce3c13f5332cd0747e63cf96c18cbed2d81b404
diff --git a/x11-misc/xfractint/files/xfractint-20.04p09-ldflags.patch b/x11-misc/xfractint/files/xfractint-20.04p09-ldflags.patch
new file mode 100644
index 000000000000..382bdc6a285c
--- /dev/null
+++ b/x11-misc/xfractint/files/xfractint-20.04p09-ldflags.patch
@@ -0,0 +1,29 @@
+--- Makefile
++++ Makefile
+@@ -125,7 +125,7 @@
+ 
+ ifeq ($(AS),/usr/bin/nasm)
+ 
+-CFLAGS = -I$(HFD) $(DEFINES) -g -DBIG_ANSI_C -DLINUX -DNASM -fno-builtin
++CFLAGS = -I$(HFD) $(DEFINES) -DBIG_ANSI_C -DLINUX -DNASM -fno-builtin
+ #CFLAGS = -I. -D_CONST $(DEFINES)
+ #CFLAGS = -I$(HFD) $(DEFINES) -g -DBIG_ANSI_C -DLINUX \
+ #         -march=$(ARCH) -DNASM -fno-builtin
+@@ -133,7 +133,7 @@
+ 
+ else
+ 
+-CFLAGS = -I$(HFD) $(DEFINES) -g -DBIG_ANSI_C -DLINUX -fno-builtin
++CFLAGS = -I$(HFD) $(DEFINES) -DBIG_ANSI_C -DLINUX -fno-builtin
+ #CFLAGS = -I$(HFD) $(DEFINES) -g -DBIG_ANSI_C -DLINUX \
+ #         -march=$(ARCH) -fno-builtin
+ #CFLAGS = -I. $(DEFINES) -g -DBIG_ANSI_C -DLINUX -Os -fno-builtin
+@@ -312,7 +312,7 @@
+ 	          "HFD=.${HFD}"
+ 	cd unix ; ${MAKE} all "CC=${CC}" "CFLAGS= -I.${HFD} -I${XFTHFD} ${CFLAGS} ${OPT}" "SRCDIR=${SHRDIR}" \
+ 	          "AS=${AS}" "AFLAGS=${AFLAGS}" "HFD=.${HFD}"
+-	$(CC) -o xfractint $(CFLAGS) $(OPT) $(OBJS) $(U_OBJS) $(LIBS)
++	$(CC) -o xfractint $(CFLAGS) $(LDFLAGS) $(OPT) $(OBJS) $(U_OBJS) $(LIBS)
+ #	strip xfractint
+ 
+ fractint:
diff --git a/x11-misc/xfractint/files/xfractint.envd b/x11-misc/xfractint/files/xfractint.envd
new file mode 100644
index 000000000000..3dd0cbcda664
--- /dev/null
+++ b/x11-misc/xfractint/files/xfractint.envd
@@ -0,0 +1,4 @@
+#Specifies xfractint directory
+
+FRACTDIR=/usr/share/xfractint
+
diff --git a/x11-misc/xfractint/metadata.xml b/x11-misc/xfractint/metadata.xml
new file mode 100644
index 000000000000..ff62877c67ae
--- /dev/null
+++ b/x11-misc/xfractint/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+  <email>maintainer-needed@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-misc/xfractint/xfractint-20.04_p12.ebuild b/x11-misc/xfractint/xfractint-20.04_p12.ebuild
new file mode 100644
index 000000000000..0ed5221789cf
--- /dev/null
+++ b/x11-misc/xfractint/xfractint-20.04_p12.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit eutils toolchain-funcs
+
+MY_P=${P/_}
+
+DESCRIPTION="A fractal generator"
+HOMEPAGE="http://www.fractint.org"
+SRC_URI="http://www.fractint.org/ftp/current/linux/${MY_P}.tar.gz"
+
+LICENSE="freedist"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+RDEPEND="x11-libs/libX11"
+DEPEND="${RDEPEND}
+	x11-libs/libXft"
+#	x86? ( dev-lang/nasm )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	epatch "${FILESDIR}/xfractint-20.04p09-ldflags.patch"
+}
+
+src_compile() {
+	# Untested, any x86 archteam dev. is allowed to uncomment this.
+	local myasm="foo"
+#	use x86 && myasm="/usr/bin/nasm"
+	emake CC="$(tc-getCC)" AS="${myasm}" OPT="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	emake DESTDIR="${D}/usr" STRIP="true" install
+	newenvd "${FILESDIR}"/xfractint.envd 60xfractint
+}
+
+pkg_postinst() {
+	elog "XFractInt requires the FRACTDIR variable to be set in order to start."
+	elog "Please re-login or \`source /etc/profile\` to have this variable set."
+}
diff --git a/x11-misc/xgestures/Manifest b/x11-misc/xgestures/Manifest
new file mode 100644
index 000000000000..cc46a743c4c5
--- /dev/null
+++ b/x11-misc/xgestures/Manifest
@@ -0,0 +1 @@
+DIST xgestures-0.4.tar.bz2 77902 SHA256 aec17a79e411abf00388f78adf8ceaaa1f4cbbc18e0f5c1b81d48ff3821459ca SHA512 c61108e609fb0f28affb5d5cc4002a7f840f123bb96b79265a47e74a541b1ca8deee016f90fc801fa682e61b9df008c0323d36482abaa83f8f6d4a5c73137abf WHIRLPOOL c3088c2a93b211c06737a7f18b9c0935270df7db91a7dae0d95749bf06570ad4a0a67c2c052c68e842c1e5b741f5ec185cfadcb709b7ed30d5c83a8f97f3e044
diff --git a/x11-misc/xgestures/metadata.xml b/x11-misc/xgestures/metadata.xml
new file mode 100644
index 000000000000..acfc446191f5
--- /dev/null
+++ b/x11-misc/xgestures/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>pinkbyte@gentoo.org</email>
+		<name>Sergey Popov</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">xgestures</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-misc/xgestures/xgestures-0.4.ebuild b/x11-misc/xgestures/xgestures-0.4.ebuild
new file mode 100644
index 000000000000..d196ff0e5624
--- /dev/null
+++ b/x11-misc/xgestures/xgestures-0.4.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+DESCRIPTION="A mouse gesture recognition program for X11 desktops"
+HOMEPAGE="http://www.cs.bgu.ac.il/~tzachar/xgestures.html"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/libXmu
+	x11-libs/libX11
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/libXt"
+DEPEND="${RDEPEND}
+	x11-proto/xextproto
+	x11-proto/xproto"
+
+DOCS=( AUTHORS ChangeLog NEWS README )
+
+src_install() {
+	default
+	newdoc .gestures gestures
+}
+
+pkg_postinst()
+{
+	elog "Unpack /usr/share/doc/${PF}/gestures* and copy it to \$HOME/.gestures"
+}
diff --git a/x11-misc/xhkeys/Manifest b/x11-misc/xhkeys/Manifest
new file mode 100644
index 000000000000..b7c7167e7788
--- /dev/null
+++ b/x11-misc/xhkeys/Manifest
@@ -0,0 +1 @@
+DIST xhkeys-2.2.1.tar.gz 146338 RMD160 39861a6a1e23e2783d66dcd357675059345a5e56 SHA1 1779001d797dd828dbc4ae1521b76c403e362c27 SHA256 4ddcdbb9687bdbfdd6c0f0974dfb463d939421ab3d3245368a18636b79fd6be9
diff --git a/x11-misc/xhkeys/files/xhkeys b/x11-misc/xhkeys/files/xhkeys
new file mode 100644
index 000000000000..cc66bb19ec1a
--- /dev/null
+++ b/x11-misc/xhkeys/files/xhkeys
@@ -0,0 +1,16 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+start() {
+	ebegin "Starting xhkeys"
+	start-stop-daemon --start --quiet --exec /usr/bin/xhkeys	
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping xhkeys"
+	start-stop-daemon --stop --quiet --exec /usr/bin/xhkeys
+	eend $?
+}
diff --git a/x11-misc/xhkeys/files/xhkeys-2.2.1-linux_headers.patch b/x11-misc/xhkeys/files/xhkeys-2.2.1-linux_headers.patch
new file mode 100644
index 000000000000..9e851ada0658
--- /dev/null
+++ b/x11-misc/xhkeys/files/xhkeys-2.2.1-linux_headers.patch
@@ -0,0 +1,12 @@
+Fix compilation for >=linux-headers-2.6.35
+
+--- xhkeys-2.2.1/xhkeys_cdaudio.c
++++ xhkeys-2.2.1/xhkeys_cdaudio.c
+@@ -16,6 +16,7 @@
+ #include <string.h>
+ #include <stdarg.h>
+ #include <ctype.h>
++#include <limits.h>
+ #include <linux/cdrom.h>
+ #include <sys/ioctl.h>
+ #include <fcntl.h>
diff --git a/x11-misc/xhkeys/metadata.xml b/x11-misc/xhkeys/metadata.xml
new file mode 100644
index 000000000000..2518313f5241
--- /dev/null
+++ b/x11-misc/xhkeys/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+        <herd>desktop-misc</herd>
+</pkgmetadata>
diff --git a/x11-misc/xhkeys/xhkeys-2.2.1.ebuild b/x11-misc/xhkeys/xhkeys-2.2.1.ebuild
new file mode 100644
index 000000000000..d919bb4ac3c3
--- /dev/null
+++ b/x11-misc/xhkeys/xhkeys-2.2.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils
+
+DESCRIPTION="assign particular actions to any key or key combination"
+HOMEPAGE="http://wmalms.tripod.com/#XHKEYS"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86 ppc"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXt
+	x11-libs/libXext"
+DEPEND="${RDEPEND}
+	x11-proto/xextproto
+	x11-proto/xproto"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-linux_headers.patch
+}
+
+src_install() {
+	dobin xhkeys xhkconf || die
+	dodoc README VERSION
+}
diff --git a/x11-misc/xidle/Manifest b/x11-misc/xidle/Manifest
new file mode 100644
index 000000000000..220b79759628
--- /dev/null
+++ b/x11-misc/xidle/Manifest
@@ -0,0 +1 @@
+DIST xidle-24102005.tar.bz2 4886 RMD160 1f1b096ddc24a1f0587d644277e3e924e43a84be SHA1 bc62c95742549880dbd75a49e87e1dc7175473fb SHA256 c5b003bc552fd51595a522e09da15335f2d7cb21882d62cbea7d5f0df73d08f9
diff --git a/x11-misc/xidle/files/xidle-24102005-dead.patch b/x11-misc/xidle/files/xidle-24102005-dead.patch
new file mode 100644
index 000000000000..26ce27bcc0bd
--- /dev/null
+++ b/x11-misc/xidle/files/xidle-24102005-dead.patch
@@ -0,0 +1,15 @@
+--- a/xidle.c
++++ b/xidle.c
+@@ -87,10 +87,10 @@
+ void	close_x(struct xinfo *);
+ void	init_x(const char *, struct xinfo *, int, int);
+ void	handler(int);
+-__dead void	usage(void);
++void	usage(void);
+ 
+ 
+-__dead void
++void
+ usage()
+ {
+ 	fprintf(stderr, "Usage:\n%s %s\n", __progname,
diff --git a/x11-misc/xidle/metadata.xml b/x11-misc/xidle/metadata.xml
new file mode 100644
index 000000000000..c3a21340a392
--- /dev/null
+++ b/x11-misc/xidle/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+	<email>jer@gentoo.org</email>
+	<name>Jeroen Roovers</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-misc/xidle/xidle-24102005.ebuild b/x11-misc/xidle/xidle-24102005.ebuild
new file mode 100644
index 000000000000..7e286b09a122
--- /dev/null
+++ b/x11-misc/xidle/xidle-24102005.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit eutils toolchain-funcs
+
+DESCRIPTION="xidle monitors inactivity in X and runs the specified program when
+a timeout occurs."
+HOMEPAGE="http://www.freebsdsoftware.org/x11/xidle.html"
+SRC_URI="mirror://freebsd/ports/local-distfiles/novel/${P}.tar.bz2"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86"
+IUSE=""
+
+DEPEND="
+	x11-libs/libX11
+	x11-libs/libXScrnSaver
+	"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-dead.patch"
+}
+
+src_compile() {
+	local my_compile="$(tc-getCC) ${CFLAGS} ${LDFLAGS} -o ${PN}{,.c} -lXss -lX11"
+	echo ${my_compile}
+	eval ${my_compile} || die
+}
+
+src_install() {
+	dobin ${PN}
+	doman ${PN}.1
+}
diff --git a/x11-misc/xkbd/Manifest b/x11-misc/xkbd/Manifest
new file mode 100644
index 000000000000..01b8ec054b14
--- /dev/null
+++ b/x11-misc/xkbd/Manifest
@@ -0,0 +1,2 @@
+DIST xkbd-0.8.15-CVS.tar.gz 344790 RMD160 f09960cd044e7135f5700290a1b0c74ea59fa5c8 SHA1 f047609e4710bb20b1fdab40c1f2dc850c78fe04 SHA256 04bc9f6ea423f7fbd9150767cef6a1bc5c70c545eeb923539a93a549905457de
+DIST xkbd-0.8.16.tar.gz 347616 RMD160 09f3b8b1e53eb5e471275879ee1d8171b18e8869 SHA1 0d4c2bbcf50d5b93b2eb7cd0abc4bc95b4e4da82 SHA256 c85848851dfa42636a4eebec7f7f121365aa28b27554a0c1d5eca15ed4107471
diff --git a/x11-misc/xkbd/files/xkbd-0.8.15-fix-geometry.patch b/x11-misc/xkbd/files/xkbd-0.8.15-fix-geometry.patch
new file mode 100644
index 000000000000..3620dc5d6f2a
--- /dev/null
+++ b/x11-misc/xkbd/files/xkbd-0.8.15-fix-geometry.patch
@@ -0,0 +1,35 @@
+diff -ruN xkbd-0.8.15/src/xkbd.c xkbd-0.8.15-new/src/xkbd.c
+--- xkbd-0.8.15/src/xkbd.c	2003-09-29 10:29:35.000000000 -0700
++++ xkbd-0.8.15-new/src/xkbd.c	2008-03-23 02:43:20.000000000 -0700
+@@ -307,19 +307,20 @@
+ 				0, BlackPixel(display, screen_num),
+ 				WhitePixel(display, screen_num));
+       
++      wret = DisplayWidth(display, screen_num);
++      hret = DisplayHeight(display, screen_num)/4;
++      xret = 0;
++      yret = DisplayHeight(display, screen_num) - hret;
++
+       if (geometry != NULL)
+ 	{
+-	  XParseGeometry(geometry, &xret, &yret, &wret, &hret );
+-	}
+-      else
+-	{
+-	  if (wm_type != WM_MATCHBOX)
+-	    {
+-	      wret = DisplayWidth(display, screen_num);
+-	      hret = DisplayHeight(display, screen_num)/4;
+-	      xret = 0;
+-	      yret = DisplayHeight(display, screen_num) - hret;
+-	    }
++	  int flags;
++
++	  flags = XParseGeometry(geometry, &xret, &yret, &wret, &hret );
++	  if( flags & XNegative )
++	      xret += DisplayWidth( display, screen_num ) - wret;
++	  if( flags & YNegative )
++	      yret += DisplayHeight( display, screen_num ) - hret;
+ 	}
+       
+       /* check for user selected keyboard conf file */
diff --git a/x11-misc/xkbd/files/xkbd-0.8.15-fix-keysyms-search.patch b/x11-misc/xkbd/files/xkbd-0.8.15-fix-keysyms-search.patch
new file mode 100644
index 000000000000..0d4d5c29cc9c
--- /dev/null
+++ b/x11-misc/xkbd/files/xkbd-0.8.15-fix-keysyms-search.patch
@@ -0,0 +1,13 @@
+http://bugs.gentoo.org/287075
+
+--- src/libvirtkeys.c
++++ src/libvirtkeys.c
+@@ -341,7 +341,7 @@
+ 
+ 	for (keycode = 0; ((keycode < (maxKeycode - minKeycode + 1)) && !found); keycode++)
+ 	{
+-		for (column = 0; ((column < keysymsPerKeycode) && !found); column++)
++		for (column = 0; ((column < (keysymsPerKeycode > 4 ? 4 : keysymsPerKeycode)) && !found); column++)
+ 		{
+ 			if (keymap[(keycode * keysymsPerKeycode + column)] == ks)
+ 			{
diff --git a/x11-misc/xkbd/files/xkbd-0.8.15-increase-delay.patch b/x11-misc/xkbd/files/xkbd-0.8.15-increase-delay.patch
new file mode 100644
index 000000000000..deadcd7cddb1
--- /dev/null
+++ b/x11-misc/xkbd/files/xkbd-0.8.15-increase-delay.patch
@@ -0,0 +1,22 @@
+diff -ruN xkbd-0.8.15/data/en_GB.qwerty.xkbd.in xkbd-0.8.15-new/data/en_GB.qwerty.xkbd.in
+--- xkbd-0.8.15/data/en_GB.qwerty.xkbd.in	2003-08-10 10:46:29.000000000 -0700
++++ xkbd-0.8.15-new/data/en_GB.qwerty.xkbd.in	2008-03-23 02:52:52.000000000 -0700
+@@ -24,6 +24,7 @@
+ 
+ # button style, can be rounded ( default ), square or plain
+ button_style square
++repeat_delay 50
+ 
+ </global>
+ #
+diff -ruN xkbd-0.8.15/data/en_US.qwerty.xkbd.in xkbd-0.8.15-new/data/en_US.qwerty.xkbd.in
+--- xkbd-0.8.15/data/en_US.qwerty.xkbd.in	2002-11-28 03:46:04.000000000 -0800
++++ xkbd-0.8.15-new/data/en_US.qwerty.xkbd.in	2008-03-23 02:50:39.000000000 -0700
+@@ -26,6 +26,7 @@
+ 
+ # button style, can be rounded ( default ), square or plain
+ # button_style plain
++repeat_delay 50
+ 
+ </global>
+ 
diff --git a/x11-misc/xkbd/files/xkbd-0.8.16-fix-geometry.patch b/x11-misc/xkbd/files/xkbd-0.8.16-fix-geometry.patch
new file mode 100644
index 000000000000..d90824085ea4
--- /dev/null
+++ b/x11-misc/xkbd/files/xkbd-0.8.16-fix-geometry.patch
@@ -0,0 +1,36 @@
+--- xkbd-0.8.16/src/xkbd.c
++++ xkbd-0.8.16/src/xkbd.c
+@@ -307,21 +307,22 @@
+ 				0, BlackPixel(display, screen_num),
+ 				WhitePixel(display, screen_num));
+ 
++      wret = DisplayWidth(display, screen_num);
++      hret = DisplayHeight(display, screen_num)/4;
++      xret = 0;
++      yret = DisplayHeight(display, screen_num) - hret;
++
+       // deactivate geometry for 0.8.16 release - mb
+       geometry = NULL;
+       if (geometry != NULL)
+ 	{
+-	  XParseGeometry(geometry, &xret, &yret, &wret, &hret );
+-	}
+-      else
+-	{
+-	  if (wm_type != WM_MATCHBOX)
+-	    {
+-	      wret = DisplayWidth(display, screen_num);
+-	      hret = DisplayHeight(display, screen_num)/4;
+-	      xret = 0;
+-	      yret = DisplayHeight(display, screen_num) - hret;
+-	    }
++	  int flags;
++
++	  flags = XParseGeometry(geometry, &xret, &yret, &wret, &hret );
++	  if( flags & XNegative )
++	      xret += DisplayWidth( display, screen_num ) - wret;
++	  if( flags & YNegative )
++	      yret += DisplayHeight( display, screen_num ) - hret;
+ 	}
+       
+       /* check for user selected keyboard conf file */
diff --git a/x11-misc/xkbd/metadata.xml b/x11-misc/xkbd/metadata.xml
new file mode 100644
index 000000000000..40838bc36783
--- /dev/null
+++ b/x11-misc/xkbd/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>desktop-misc</herd>
+</pkgmetadata>
diff --git a/x11-misc/xkbd/xkbd-0.8.15-r1.ebuild b/x11-misc/xkbd/xkbd-0.8.15-r1.ebuild
new file mode 100644
index 000000000000..d0da45f65692
--- /dev/null
+++ b/x11-misc/xkbd/xkbd-0.8.15-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+inherit eutils
+
+DESCRIPTION="Xkbd - onscreen soft keyboard for X11"
+HOMEPAGE="http://handhelds.org/"
+SRC_URI="ftp://ftp.yzu.edu.tw/mirror/pub2/ftp.handhelds.org/distributions/familiar/source/v0.8.4-rc1/sources/${P}-CVS.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~ppc x86"
+IUSE="doc debug"
+
+RDEPEND="x11-libs/libXrender
+	x11-libs/libX11
+	x11-libs/libXft
+	x11-libs/libXtst
+	x11-libs/libXpm
+	media-libs/freetype
+	dev-libs/expat
+	sys-libs/zlib
+	doc? ( app-text/docbook-sgml-utils )"
+DEPEND="${RDEPEND}
+	x11-proto/xproto
+	x11-proto/xextproto"
+
+src_prepare() {
+	# 2008-03-23 gi1242: Fix handling of -geometry argument
+	epatch "${FILESDIR}"/${P}-fix-geometry.patch
+	# 2008-03-23 gi1242: Increase default repeat delay
+	epatch "${FILESDIR}"/${P}-increase-delay.patch
+	epatch "${FILESDIR}"/${P}-fix-keysyms-search.patch
+}
+
+src_configure() {
+	econf \
+		$(use_enable debug)
+}
+
+src_compile() {
+	emake || die
+	use doc && docbook2html README
+}
+
+src_install() {
+	einstall || die
+	dodoc AUTHORS NEWS README
+
+	if use doc; then
+		insinto /usr/share/doc/${PF}/html
+		doins *.html
+	fi
+}
diff --git a/x11-misc/xkbd/xkbd-0.8.16.ebuild b/x11-misc/xkbd/xkbd-0.8.16.ebuild
new file mode 100644
index 000000000000..ad0a25f89a43
--- /dev/null
+++ b/x11-misc/xkbd/xkbd-0.8.16.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit eutils
+
+DESCRIPTION="onscreen soft keyboard for X11"
+HOMEPAGE="http://trac.hackable1.org/trac/wiki/Xkbd"
+SRC_URI="http://trac.hackable1.org/trac/raw-attachment/wiki/Xkbd/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE="doc debug"
+
+RDEPEND="x11-libs/libXrender
+	x11-libs/libX11
+	x11-libs/libXft
+	x11-libs/libXtst
+	x11-libs/libXpm
+	media-libs/freetype
+	dev-libs/expat
+	sys-libs/zlib
+	doc? ( app-text/docbook-sgml-utils )"
+DEPEND="${RDEPEND}
+	x11-proto/xproto
+	x11-proto/xextproto"
+
+src_prepare() {
+	# 2008-03-23 gi1242: Fix handling of -geometry argument
+	epatch "${FILESDIR}"/${P}-fix-geometry.patch
+	# 2008-03-23 gi1242: Increase default repeat delay
+	epatch "${FILESDIR}"/${PN}-0.8.15-increase-delay.patch
+	epatch "${FILESDIR}"/${PN}-0.8.15-fix-keysyms-search.patch
+}
+
+src_configure() {
+	econf \
+		$(use_enable debug)
+}
+
+src_compile() {
+	default
+
+	use doc && docbook2html README
+}
+
+src_install() {
+	default
+
+	if use doc; then
+		insinto /usr/share/doc/${PF}/html
+		doins *.html
+	fi
+}
diff --git a/x11-misc/xkeyboard-config/Manifest b/x11-misc/xkeyboard-config/Manifest
new file mode 100644
index 000000000000..8f92990a9bd7
--- /dev/null
+++ b/x11-misc/xkeyboard-config/Manifest
@@ -0,0 +1,2 @@
+DIST xkeyboard-config-2.14.tar.bz2 953589 SHA256 dc91458a214c56a35727f9e523fc647615de64137057ca6ee4d4d4474a4bb2ae SHA512 b8c9affafcc61fde32bb90fa83c2e5a05a0903a9ec71ee8878a460b6173c82c5d5c95d3735d1e0f65bcdbcd66842788275523ab5f6e78c2e56266cee0d74da58 WHIRLPOOL c3ca9816b0eac131c7556da0f42987b4fd77d4565a92103b2bda0d5b9264893f9e61d2756e231bb9bac353397a310fe5a0415536496b8758e89545676f33741e
+DIST xkeyboard-config-2.15.tar.bz2 958523 SHA256 0e443cf7ca2f0b40846472c029647a05933fc705d611e1478c4db8a48a6f38bf SHA512 64212cdf75bdf7af29134d718a041489c9bca20b1c7d6d8e4b81373eb72b26deed0728a23448083fc918c8cb8bb41341d76de26c85496a528aa120a47d268d66 WHIRLPOOL f9eaf8e2cc6be78a582b1ce26dd6da4255aa14faef95267b8cea12d253550ba0304c664209a5675bad9875ad7304f9d4dc13f6a0db498a79e3ebf6502c70ebae
diff --git a/x11-misc/xkeyboard-config/metadata.xml b/x11-misc/xkeyboard-config/metadata.xml
new file mode 100644
index 000000000000..01c4c004e735
--- /dev/null
+++ b/x11-misc/xkeyboard-config/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>x11</herd>
+</pkgmetadata>
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.14.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.14.ebuild
new file mode 100644
index 000000000000..ca060ab4f91a
--- /dev/null
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.14.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+XORG_STATIC=no
+inherit xorg-2
+
+EGIT_REPO_URI="git://anongit.freedesktop.org/git/xkeyboard-config"
+
+DESCRIPTION="X keyboard configuration database"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/XKeyboardConfig"
+[[ ${PV} == *9999* ]] || SRC_URI="${XORG_BASE_INDIVIDUAL_URI}/data/${PN}/${P}.tar.bz2"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND=">=x11-apps/xkbcomp-1.2.3
+	>=x11-libs/libX11-1.4.3"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	>=x11-proto/xproto-7.0.20"
+
+XORG_CONFIGURE_OPTIONS=(
+	--with-xkb-base="${EPREFIX}/usr/share/X11/xkb"
+	--enable-compat-rules
+	# do not check for runtime deps
+	--disable-runtime-deps
+	--with-xkb-rules-symlink=xorg
+)
+
+src_prepare() {
+	xorg-2_src_prepare
+	if [[ ${XORG_EAUTORECONF} != no ]]; then
+		intltoolize --copy --automake || die
+	fi
+}
+
+src_compile() {
+	# cleanup to make sure .dir files are regenerated
+	# bug #328455 c#26
+	xorg-2_src_compile clean
+	xorg-2_src_compile
+}
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.15.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.15.ebuild
new file mode 100644
index 000000000000..20b9c27eb7db
--- /dev/null
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.15.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+XORG_STATIC=no
+inherit xorg-2
+
+EGIT_REPO_URI="git://anongit.freedesktop.org/git/xkeyboard-config"
+
+DESCRIPTION="X keyboard configuration database"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/XKeyboardConfig"
+[[ ${PV} == *9999* ]] || SRC_URI="${XORG_BASE_INDIVIDUAL_URI}/data/${PN}/${P}.tar.bz2"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND=">=x11-apps/xkbcomp-1.2.3
+	>=x11-libs/libX11-1.4.3"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	>=x11-proto/xproto-7.0.20"
+
+XORG_CONFIGURE_OPTIONS=(
+	--with-xkb-base="${EPREFIX}/usr/share/X11/xkb"
+	--enable-compat-rules
+	# do not check for runtime deps
+	--disable-runtime-deps
+	--with-xkb-rules-symlink=xorg
+)
+
+src_prepare() {
+	xorg-2_src_prepare
+	if [[ ${XORG_EAUTORECONF} != no ]]; then
+		intltoolize --copy --automake || die
+	fi
+}
+
+src_compile() {
+	# cleanup to make sure .dir files are regenerated
+	# bug #328455 c#26
+	xorg-2_src_compile clean
+	xorg-2_src_compile
+}
diff --git a/x11-misc/xkeycaps/Manifest b/x11-misc/xkeycaps/Manifest
new file mode 100644
index 000000000000..0b2fa2ccad8b
--- /dev/null
+++ b/x11-misc/xkeycaps/Manifest
@@ -0,0 +1 @@
+DIST xkeycaps_2.47.orig.tar.gz 351418 SHA256 efd92e6179ec4506cbb08db11091185f3bd1567eecb2291f91f70980e175d8f4
diff --git a/x11-misc/xkeycaps/files/xkeycaps-2.47-Imakefile.patch b/x11-misc/xkeycaps/files/xkeycaps-2.47-Imakefile.patch
new file mode 100644
index 000000000000..42f7ab6e344d
--- /dev/null
+++ b/x11-misc/xkeycaps/files/xkeycaps-2.47-Imakefile.patch
@@ -0,0 +1,22 @@
+diff -ur xkeycaps-2.47.orig/Imakefile xkeycaps-2.47/Imakefile
+--- xkeycaps-2.47.orig/Imakefile	2005-02-23 00:33:15.000000000 +0200
++++ xkeycaps-2.47/Imakefile	2008-12-07 22:55:24.000000000 +0200
+@@ -1,5 +1,5 @@
+-/**/# Imakefile for xkeycaps;
+-/**/# Copyright (c) 1991, 1992, 1993, 1994, 1995, 1999 Jamie Zawinski.
++/* Imakefile for xkeycaps;
++   Copyright (c) 1991, 1992, 1993, 1994, 1995, 1999 Jamie Zawinski. */
+ 
+ /*
+  *  To specify a different default keyboard (for when the vendor display
+@@ -353,8 +353,8 @@
+             TAR = tar
+        COMPRESS = compress
+    COMPRESS_EXT = Z
+-/**/#      COMPRESS = gzip --verbose --best
+-/**/#  COMPRESS_EXT = gz
++/* COMPRESS = gzip --verbose --best */
++/* COMPRESS_EXT = gz */
+ 
+ ComplexProgramTarget(xkeycaps)
+ 
diff --git a/x11-misc/xkeycaps/files/xkeycaps-2.47-man.patch b/x11-misc/xkeycaps/files/xkeycaps-2.47-man.patch
new file mode 100644
index 000000000000..f68629ef3eaf
--- /dev/null
+++ b/x11-misc/xkeycaps/files/xkeycaps-2.47-man.patch
@@ -0,0 +1,12 @@
+diff -ur xkeycaps-2.47.orig/xkeycaps.man xkeycaps-2.47/xkeycaps.man
+--- xkeycaps-2.47.orig/xkeycaps.man	2006-01-02 02:22:17.000000000 +0200
++++ xkeycaps-2.47/xkeycaps.man	2008-12-07 22:51:38.000000000 +0200
+@@ -267,7 +267,7 @@
+ the physical keys: it is immutable (unless you repaint your keyboard...)
+ .TP 10
+ .B \fIChord\fP
+-This term refers to a set of two or more keys held down simultaniously (by
++This term refers to a set of two or more keys held down simultaneously (by
+ analogy with piano keyboards.)  All but one of the keys will generally be
+ Modifier Keys.  Sometimes \fIConstellation\fP is used to mean the same thing.
+ .TP 10
diff --git a/x11-misc/xkeycaps/metadata.xml b/x11-misc/xkeycaps/metadata.xml
new file mode 100644
index 000000000000..731225048652
--- /dev/null
+++ b/x11-misc/xkeycaps/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>desktop-misc</herd>
+</pkgmetadata>
diff --git a/x11-misc/xkeycaps/xkeycaps-2.47-r1.ebuild b/x11-misc/xkeycaps/xkeycaps-2.47-r1.ebuild
new file mode 100644
index 000000000000..0da28d0189a0
--- /dev/null
+++ b/x11-misc/xkeycaps/xkeycaps-2.47-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="GUI frontend to xmodmap"
+HOMEPAGE="http://packages.qa.debian.org/x/xkeycaps.html"
+SRC_URI="mirror://debian/pool/main/x/${PN}/${PN}_${PV}.orig.tar.gz"
+
+LICENSE="HPND"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86"
+IUSE=""
+
+RDEPEND="x11-misc/xbitmaps
+	x11-libs/libX11
+	x11-libs/libXmu
+	x11-libs/libXt
+	x11-libs/libXaw
+	x11-libs/libXext"
+DEPEND="${RDEPEND}
+	x11-proto/xproto
+	x11-misc/imake
+	>=sys-apps/sed-4"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-Imakefile.patch \
+		"${FILESDIR}"/${P}-man.patch
+}
+
+src_compile() {
+	xmkmf || die
+	sed -i -e "s,all:: xkeycaps.\$(MANSUFFIX).html,all:: ,g" \
+		Makefile || die
+	emake EXTRA_LDOPTIONS="${LDFLAGS}" CC="$(tc-getCC)" \
+		CDEBUGFLAGS="${CFLAGS}" || die
+}
+
+src_install () {
+	emake DESTDIR="${D}" install || die
+	newman ${PN}.man ${PN}.1 || die
+	dodoc README *.txt || die
+}
diff --git a/x11-misc/xlockmore/Manifest b/x11-misc/xlockmore/Manifest
new file mode 100644
index 000000000000..bf1002f007f2
--- /dev/null
+++ b/x11-misc/xlockmore/Manifest
@@ -0,0 +1,2 @@
+DIST xlockmore-5.45.tar.bz2 1968176 SHA256 7f81a80cb486c05269d71e9cc2d9c51645b59f09779fc24d01b858b7563015f7 SHA512 ab7ad1d1a066176cb8fb77d8c93181dad437b75d1c163f3ea49892477b4a4404129ce169d2fa38f131272a0a8b834ea61c88dd8bb8963d9dfed21c41af120fde WHIRLPOOL 2e890583c6105808821ae447e136fcea4cc782a4eb5a8e55f67195f91a0db23a9121e5bf53e9046139f3cc59e5d7d38ec97a42ce0c31df573674b3644c548cd7
+DIST xlockmore-5.46.tar.xz 1610356 SHA256 32b3be122c4fde5ae70dba5899bbcc20cd7e80119e246d79455d84046d6d40df SHA512 4be4c70f72f9a820e26204fbd8450f2f920b6ed1583d413ba3983c4ced778c9d4e6dfa40a4c7919557b3fa7ecccba08e1a0bb0403924fa84770401d6758c7d9c WHIRLPOOL 6bfd885cb6e460ccbb2ebd682d2096e454c4a5ccb58244495451973bd16d5410f3ba347afdba6c747a34a50bcb1612bae5fa16f1c09f54f2f82c1257ed59105d
diff --git a/x11-misc/xlockmore/files/xlockmore-5.31-configure.in.patch b/x11-misc/xlockmore/files/xlockmore-5.31-configure.in.patch
new file mode 100644
index 000000000000..a0b8f6d3e5b2
--- /dev/null
+++ b/x11-misc/xlockmore/files/xlockmore-5.31-configure.in.patch
@@ -0,0 +1,22 @@
+Index: xlockmore-5.31/configure.in
+===================================================================
+--- xlockmore-5.31.orig/configure.in
++++ xlockmore-5.31/configure.in
+@@ -8,17 +8,7 @@ AC_CANONICAL_HOST
+ canonical=$host
+ 
+ AC_PROG_CC
+-dnl Check if C++ compiler is present. If not set CXX to the C-compiler used
+-dnl for the other compilations.
+-if test "$CC" = gcc; then
+-  AC_CHECK_PROGS(CXX, $CCC g++ CC C++ c++ cxx cc++ xlC $CC, gcc)
+-else
+-  AC_CHECK_PROGS(CXX, $CCC CC C++ g++ c++ cxx cc++ xlC $CC, gcc)
+-fi
+ AC_PROG_CXX
+-if test "${CXX}" = "xlC" ; then
+-  CXXFLAGS="${CXXFLAGS} -+"
+-fi
+ 
+ dnl If you're using g++-2.95 or later and have old X11 includes, you may need
+ dnl to use "g++ -fpermissive" in the Makefiles
diff --git a/x11-misc/xlockmore/files/xlockmore-5.31-ldflags.patch b/x11-misc/xlockmore/files/xlockmore-5.31-ldflags.patch
new file mode 100644
index 000000000000..85ca2fe259d6
--- /dev/null
+++ b/x11-misc/xlockmore/files/xlockmore-5.31-ldflags.patch
@@ -0,0 +1,185 @@
+Index: xlockmore-5.31/modes/Makefile.in
+===================================================================
+--- xlockmore-5.31.orig/modes/Makefile.in
++++ xlockmore-5.31/modes/Makefile.in
+@@ -329,6 +329,7 @@ DEFS = @DEFS@ $(DEFINES)
+ XLOCKINC = -I. -I.. -I$(top_srcdir) -I$(UTILDIR) -I../.. @XLOCKINC@
+ CFLAGS = @CFLAGS@
+ CXXFLAGS = @CXXFLAGS@
++LDFLAGS = @LDFLAGS@
+ #CFLAGS = -O
+ #CFLAGS = -g
+ XLOCKLDFLAGS = @XLOCKLDFLAGS@ $(CHECKLDFLAG)
+@@ -367,7 +368,7 @@ PURIFY = @PURIFY@
+ 
+ @MODULES@$(NORMMODULES) : %.xlk:%.o
+ @MODULES@	$(RM) $@
+-@MODULES@	$(CXX) $(CXXFLAGS) -shared -o $@ $<
++@MODULES@	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -o $@ $<
+ 
+ $(DOG)fire.xlk : $(DOG)xpm-ximage.o
+ $(DOG)lament.xlk : $(DOG)xpm-ximage.o
+@@ -375,60 +376,60 @@ $(DOG)sballs.xlk : $(DOG)xpm-ximage.o
+ 
+ @MODULES@@GL@$(DOG)fire.xlk $(DOG)lament.xlk $(DOG)sballs.xlk : %.xlk:%.o
+ @MODULES@@GL@	$(RM) $@
+-@MODULES@@GL@	$(CXX) $(CXXFLAGS) -shared -o $@ $(DOG)xpm-ximage.o $<
++@MODULES@@GL@	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -o $@ $(DOG)xpm-ximage.o $<
+ 
+ $(DOG)pipes.xlk : $(DOG)buildlwo.o $(DOG)pipeobjs.o
+ 
+ @MODULES@@GL@$(DOG)pipes.xlk : %.xlk:%.o
+ @MODULES@@GL@	$(RM) $@
+-@MODULES@@GL@	$(CXX) $(CXXFLAGS) -shared -o $@ $(DOG)buildlwo.o $(DOG)pipeobjs.o $<
++@MODULES@@GL@	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -o $@ $(DOG)buildlwo.o $(DOG)pipeobjs.o $<
+ 
+ $(DOG)sproingies.xlk : $(SPROINGIESOBJS)
+ 
+ @MODULES@@GL@$(DOG)sproingies.xlk : %.xlk:%.o
+ @MODULES@@GL@	$(RM) $@
+-@MODULES@@GL@	$(CXX) $(CXXFLAGS) -shared -o $@ $(SPROINGIESOBJS) $<
++@MODULES@@GL@	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -o $@ $(SPROINGIESOBJS) $<
+ 
+ $(DOG)atlantis.xlk : $(ATLANTISOBJS)
+ 
+ @MODULES@@GL@$(DOG)atlantis.xlk : %.xlk:%.o
+ @MODULES@@GL@	$(RM) $@
+-@MODULES@@GL@	$(CXX) $(CXXFLAGS) -shared -o $@ $(ATLANTISOBJS) $<
++@MODULES@@GL@	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -o $@ $(ATLANTISOBJS) $<
+ 
+ $(DOG)bubble3d.xlk : $(BUBBLE3DOBJS)
+ 
+ @MODULES@@GL@$(DOG)bubble3d.xlk : %.xlk:%.o
+ @MODULES@@GL@	$(RM) $@
+-@MODULES@@GL@	$(CXX) $(CXXFLAGS) -shared -o $@ $(BUBBLE3DOBJS) $<
++@MODULES@@GL@	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -o $@ $(BUBBLE3DOBJS) $<
+ 
+ $(DOG)glplanet.xlk : $(GLPLANETOBJS)
+ 
+ @MODULES@@GL@$(DOG)glplanet.xlk : %.xlk:%.o
+ @MODULES@@GL@	$(RM) $@
+-@MODULES@@GL@	$(CXX) $(CXXFLAGS) -shared -o $@ $(GLPLANETOBJS) $<
++@MODULES@@GL@	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -o $@ $(GLPLANETOBJS) $<
+ 
+ $(DOG)molecul.xlk : $(MOLECULEOBJS)
+ 
+ @MODULES@@GL@$(DOG)molecule.xlk : %.xlk:%.o
+ @MODULES@@GL@	$(RM) $@
+-@MODULES@@GL@	$(CXX) $(CXXFLAGS) -shared -o $@ $(MOLECULEOBJS) $<
++@MODULES@@GL@	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -o $@ $(MOLECULEOBJS) $<
+ 
+ $(DOG)juggler3d.xlk : $(JUGGLER3DOBJS)
+ 
+ @MODULES@@GL@$(DOG)juggler3d.xlk : %.xlk:%.o
+ @MODULES@@GL@	$(RM) $@
+-@MODULES@@GL@	$(CXX) $(CXXFLAGS) -shared -o $@ $(JUGGLER3DOBJS) $<
++@MODULES@@GL@	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -o $@ $(JUGGLER3DOBJS) $<
+ 
+ $(DOG)invert.xlk : $(INVERTOBJS)
+ 
+ @MODULES@@CCC@@GL@$(DOG)invert.xlk : %.xlk:%.o
+ @MODULES@@CCC@@GL@	$(RM) $@
+-@MODULES@@CCC@@GL@	$(CXX) $(CXXFLAGS) -shared -o $@ $(INVERTOBJS) $<
++@MODULES@@CCC@@GL@	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -o $@ $(INVERTOBJS) $<
+ 
+ xlock : $(UTILOBJDIR)xlock
+ 
+ $(UTILOBJDIR)xlock : $(XLOCKOBJS)
+-	$(PURIFY) $(CXX) $(CXXFLAGS) -o $@ $(XLOCKOBJS) $(XLOCKLDFLAGS) $(XLOCKLIBS) $(MODULEFLAGS)
++	$(PURIFY) $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $(XLOCKOBJS) $(XLOCKLDFLAGS) $(XLOCKLIBS) $(MODULEFLAGS)
+ 	@ $(ECHO) "$@ BUILD COMPLETE"
+ 	@ $(ECHO) ""
+ 
+@@ -587,10 +588,10 @@ $(GLOBJDIR)tunnel_draw.o : $(GLDIR)tunne
+ .SUFFIXES : $(C) $(CX) $(O) $(M)
+ 
+ $(C)$(O) :
+-	$(CC) -c $(CPPFLAGS) $(DEFS) $(XLOCKINC) $(CFLAGS) $<
++	$(CC) -c $(CPPFLAGS) $(LDFLAGS) $(DEFS) $(XLOCKINC) $(CFLAGS) $<
+ 
+ $(CX)$(O) :
+-	$(CXX) -c $(CPPFLAGS) $(DEFS) $(XLOCKINC) $(CXXFLAGS) $<
++	$(CXX) -c $(CPPFLAGS) $(LDFLAGS) $(DEFS) $(XLOCKINC) $(CXXFLAGS) $<
+ 
+ install : install-program install-man install-ad
+ 	@ $(ECHO) "$@ COMPLETE"
+Index: xlockmore-5.31/xglock/Makefile.in
+===================================================================
+--- xlockmore-5.31.orig/xglock/Makefile.in
++++ xlockmore-5.31/xglock/Makefile.in
+@@ -90,6 +90,7 @@ ECHO = echo
+ DEFS = @DEFS@ $(DEFINES) -DXGLOCKRC_FILE=\"$(datadir)/xlock/xglockrc\"
+ XGLOCKINC = @XGLOCKINC@ -I.. -I$(top_srcdir)
+ CFLAGS = @GTK_CFLAGS@ @CFLAGS@
++LDFLAGS= @LDFLAGS@
+ #CFLAGS = -O
+ #CFLAGS = -g
+ XGLOCKLDFLAGS = @XGLOCKLDFLAGS@
+@@ -101,14 +102,14 @@ XGLOCKLIBS = @XGLOCKLIBS@
+ PURIFY = @PURIFY@
+ 
+ xglock : $(XGLOCKOBJS)
+-	$(PURIFY) $(CC) -o $@ $(XGLOCKOBJS) $(XGLOCKLDFLAGS) $(XGLOCKLIBS)
++	$(PURIFY) $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(XGLOCKOBJS) $(XGLOCKLDFLAGS) $(XGLOCKLIBS)
+ 	@ $(ECHO) "$@ BUILD COMPLETE"
+ 	@ $(ECHO) ""
+ 
+ .SUFFIXES : $(C) $(O)
+ 
+ $(C)$(O) :
+-	$(CC) -c $(CPPFLAGS) $(DEFS) $(XGLOCKINC) $(CFLAGS) $<
++	$(CC) -c $(CPPFLAGS) $(LDFLAGS) $(DEFS) $(XGLOCKINC) $(CFLAGS) $<
+ 
+ install : @INSTALL_XGLOCK@
+ 
+Index: xlockmore-5.31/xlock/Makefile.in
+===================================================================
+--- xlockmore-5.31.orig/xlock/Makefile.in
++++ xlockmore-5.31/xlock/Makefile.in
+@@ -118,6 +118,7 @@ XLOCKINC = -I. -I.. -I$(top_srcdir) @XLO
+ CFLAGS = @CFLAGS@
+ #CFLAGS = -O
+ #CFLAGS = -g
++LDFLAGS = @LDFLAGS@
+ 
+ #If you have purify, and want to use it, uncomment this definition or
+ # run the make as `make PURIFY=purify'
+@@ -127,7 +128,7 @@ PURIFY = @PURIFY@
+ .SUFFIXES : $(C) $(O)
+ 
+ $(C)$(O) :
+-	$(CC) -c $(CPPFLAGS) $(DEFS) $(XLOCKINC) $(CFLAGS) $<
++	$(CC) -c $(CPPFLAGS) $(LDFLAGS) $(DEFS) $(XLOCKINC) $(CFLAGS) $<
+ 
+ install :
+ 
+Index: xlockmore-5.31/xmlock/Makefile.in
+===================================================================
+--- xlockmore-5.31.orig/xmlock/Makefile.in
++++ xlockmore-5.31/xmlock/Makefile.in
+@@ -92,6 +92,8 @@ ECHO = echo
+ DEFS = @DEFS@ $(DEFINES)
+ XMLOCKINC = @XMLOCKINC@ -I.. -I$(top_srcdir)
+ CFLAGS = @CFLAGS@
++LDFLAGS= @LDFLAGS@
++
+ #CFLAGS = -O
+ #CFLAGS = -g
+ XMLOCKLDFLAGS = @XMLOCKLDFLAGS@
+@@ -103,14 +105,14 @@ XMLOCKLIBS = @XMLOCKLIBS@
+ PURIFY = @PURIFY@
+ 
+ xmlock : $(XMLOCKOBJS)
+-	$(PURIFY) $(CC) -o $@ $(XMLOCKOBJS) $(XMLOCKLDFLAGS) $(XMLOCKLIBS)
++	$(PURIFY) $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(XMLOCKOBJS) $(XMLOCKLDFLAGS) $(XMLOCKLIBS)
+ 	@ $(ECHO) "$@ BUILD COMPLETE"
+ 	@ $(ECHO) ""
+ 
+ .SUFFIXES : $(C) $(O)
+ 
+ $(C)$(O) :
+-	$(CC) -c $(CPPFLAGS) $(DEFS) $(XMLOCKINC) $(CFLAGS) $<
++	$(CC) -c $(CPPFLAGS) $(LDFLAGS) $(DEFS) $(XMLOCKINC) $(CFLAGS) $<
+ 
+ install : @INSTALL_XMLOCK@
+ 
diff --git a/x11-misc/xlockmore/files/xlockmore-5.43-freetype251.patch b/x11-misc/xlockmore/files/xlockmore-5.43-freetype251.patch
new file mode 100644
index 000000000000..da34870a8b40
--- /dev/null
+++ b/x11-misc/xlockmore/files/xlockmore-5.43-freetype251.patch
@@ -0,0 +1,18 @@
+Kludge to find >=freetyp2.5.1
+
+--- a/configure.in
++++ b/configure.in
+@@ -1983,6 +1983,13 @@
+     fi
+   done
+ 
++if test -z "$ac_freetype_includes" ; then
++  tt_inc=/usr/include/freetype2
++  if test -r "$tt_inc/freetype.h" ; then
++    no_freetype= ac_freetype_includes=$tt_inc
++  fi
++fi
++
+ # Check for the libraries.
+ # See if we find them without any special options.
+ # Do not add to $LIBS permanently.
diff --git a/x11-misc/xlockmore/metadata.xml b/x11-misc/xlockmore/metadata.xml
new file mode 100644
index 000000000000..48c7c37b15d0
--- /dev/null
+++ b/x11-misc/xlockmore/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>desktop-misc</herd>
+  <use>
+    <flag name="xlockrc">Enables xlockrc for people without PAM</flag>
+  </use>
+</pkgmetadata>
diff --git a/x11-misc/xlockmore/xlockmore-5.45.ebuild b/x11-misc/xlockmore/xlockmore-5.45.ebuild
new file mode 100644
index 000000000000..13a8428efc07
--- /dev/null
+++ b/x11-misc/xlockmore/xlockmore-5.45.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils flag-o-matic pam
+
+DESCRIPTION="Just another screensaver application for X"
+HOMEPAGE="http://www.tux.org/~bagleyd/xlockmore.html"
+SRC_URI="http://ftp.tux.org/pub/tux/bagleyd/${PN}/${P}/${P}.tar.bz2"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm hppa ppc ppc64 sparc x86"
+IUSE="crypt debug gtk imagemagick motif nas opengl pam truetype xinerama xlockrc"
+
+REQUIRED_USE="
+	|| ( crypt pam )
+	pam? ( !xlockrc )
+	xlockrc? ( !pam )
+"
+RDEPEND="
+	gtk? ( x11-libs/gtk+:2 )
+	imagemagick? ( media-gfx/imagemagick )
+	motif? ( >=x11-libs/motif-2.3:0 )
+	nas? ( media-libs/nas )
+	opengl? (
+		virtual/opengl
+		virtual/glu
+		truetype? ( >=media-libs/ftgl-2.1.3_rc5 )
+	)
+	pam? ( virtual/pam )
+	truetype? ( media-libs/freetype:2 )
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXmu
+	x11-libs/libXpm
+	x11-libs/libXt
+	xinerama? ( x11-libs/libXinerama )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	x11-proto/xineramaproto"
+
+MAKEOPTS="${MAKEOPTS} -j1"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-5.31-configure.in.patch \
+		"${FILESDIR}"/${PN}-5.31-ldflags.patch \
+		"${FILESDIR}"/${PN}-5.43-freetype251.patch
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=""
+
+	if use opengl && use truetype; then
+			myconf="${myconf} --with-ftgl"
+			append-flags -DFTGL213
+		else
+			myconf="${myconf} --without-ftgl"
+	fi
+
+	econf \
+		$(use_enable pam) \
+		$(use_enable xlockrc) \
+		$(use_with crypt) \
+		$(use_with debug editres) \
+		$(use_with gtk gtk2) \
+		$(use_with imagemagick magick) \
+		$(use_with motif) \
+		$(use_with nas) \
+		$(use_with opengl mesa) \
+		$(use_with opengl) \
+		$(use_with truetype freetype) \
+		$(use_with truetype ttf) \
+		$(use_with xinerama) \
+		--disable-mb \
+		--enable-appdefaultdir=/usr/share/X11/app-defaults \
+		--enable-syslog \
+		--enable-vtlock \
+		--without-esound \
+		--without-gtk \
+		${myconf}
+}
+
+src_install() {
+	einstall xapploaddir="${D}/usr/share/X11/app-defaults" \
+		mandir="${D}/usr/share/man/man1" INSTPGMFLAGS=""
+
+	pamd_mimic_system xlock auth
+
+	if use pam; then
+		fperms 755 /usr/bin/xlock
+	else
+		fperms 4755 /usr/bin/xlock
+	fi
+
+	dohtml docs/xlock.html
+	dodoc README docs/{3d.howto,cell_automata,HACKERS.GUIDE,Purify,Revisions,TODO}
+}
diff --git a/x11-misc/xlockmore/xlockmore-5.46.ebuild b/x11-misc/xlockmore/xlockmore-5.46.ebuild
new file mode 100644
index 000000000000..f3b9d0332a64
--- /dev/null
+++ b/x11-misc/xlockmore/xlockmore-5.46.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit flag-o-matic pam
+
+DESCRIPTION="Just another screensaver application for X"
+HOMEPAGE="http://www.tux.org/~bagleyd/xlockmore.html"
+SRC_URI="http://www.tux.org/~bagleyd/xlock/${P}.tar.xz"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="crypt debug gtk imagemagick motif nas opengl pam truetype xinerama xlockrc"
+
+REQUIRED_USE="
+	|| ( crypt pam )
+	pam? ( !xlockrc )
+	xlockrc? ( !pam )
+"
+RDEPEND="
+	gtk? ( x11-libs/gtk+:2 )
+	imagemagick? ( media-gfx/imagemagick )
+	motif? ( >=x11-libs/motif-2.3:0 )
+	nas? ( media-libs/nas )
+	opengl? (
+		virtual/opengl
+		virtual/glu
+		truetype? ( >=media-libs/ftgl-2.1.3_rc5 )
+	)
+	pam? ( virtual/pam )
+	truetype? ( media-libs/freetype:2 )
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXmu
+	x11-libs/libXpm
+	x11-libs/libXt
+	xinerama? ( x11-libs/libXinerama )
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	x11-proto/xineramaproto
+"
+
+src_configure() {
+	local myconf=""
+
+	if use opengl && use truetype; then
+			myconf="${myconf} --with-ftgl"
+			append-flags -DFTGL213
+		else
+			myconf="${myconf} --without-ftgl"
+	fi
+
+	econf \
+		$(use_enable pam) \
+		$(use_enable xlockrc) \
+		$(use_with crypt) \
+		$(use_with debug editres) \
+		$(use_with gtk gtk2) \
+		$(use_with imagemagick magick) \
+		$(use_with motif) \
+		$(use_with nas) \
+		$(use_with opengl mesa) \
+		$(use_with opengl) \
+		$(use_with truetype freetype) \
+		$(use_with truetype ttf) \
+		$(use_with xinerama) \
+		--disable-mb \
+		--enable-appdefaultdir=/usr/share/X11/app-defaults \
+		--enable-syslog \
+		--enable-vtlock \
+		--without-esound \
+		--without-gtk \
+		${myconf}
+}
+
+src_install() {
+	einstall xapploaddir="${D}/usr/share/X11/app-defaults" \
+		mandir="${D}/usr/share/man/man1" INSTPGMFLAGS=""
+
+	pamd_mimic_system xlock auth
+
+	if use pam; then
+		fperms 755 /usr/bin/xlock
+	else
+		fperms 4755 /usr/bin/xlock
+	fi
+
+	dohtml docs/xlock.html
+	dodoc README docs/{3d.howto,cell_automata,HACKERS.GUIDE,Purify,Revisions,TODO}
+}
diff --git a/x11-misc/xmobar/Manifest b/x11-misc/xmobar/Manifest
new file mode 100644
index 000000000000..7ac78eb9a313
--- /dev/null
+++ b/x11-misc/xmobar/Manifest
@@ -0,0 +1,5 @@
+DIST xmobar-0.20.1.tar.gz 83871 SHA256 73cb4bbb1186dbdd89b9dd75df95eb8bfe7a74bd6c41898de4b9e3c88c7d4e9a SHA512 b3fe69024a26bd8bc1728fced5f3c69afeb0b462c7b44acada3a6744ee686a789ceff260519bdc0feb398b520a5fc86b4ca1d8addfe8b51bfe95769ca6f8323a WHIRLPOOL bb0a4661b78e816dd29b55ed0f2f5f9b62ac0efc9ee102d30c3dd1ddde498a481cf6c7559800f75ed43e114294019b69a46d8299c54efd53cb7ce8b4fc3df631
+DIST xmobar-0.21.tar.gz 85387 SHA256 f576b6c090db0d8ea8497106dfa8098c529ec620d41d5e2791a47e04d0d20fc0 SHA512 0dd6e348ff05cb72d21491ee7c8b157b5da238fee569f4a30bf702f08b39aa648e7b51413864ffb333dbb80537d1f165532d52e86ae53e81e673d20e11d80859 WHIRLPOOL dc2707cfa9e0a496a178791a3082a8d10e579f4b5e4c1961fe091e13aa2eda47a5b55ef400fc4f7f484a3f68175cb6b5af6e763ddeb0a96baf2062ebdd3d7a60
+DIST xmobar-0.22.1.tar.gz 92790 SHA256 9feb62064e1eb85edce6ffbc4d9b5e1a3dd6a9d12970cb4674c475301de3dc56 SHA512 2f824e87502b0b7901583a2cbb95cbc8c34f12d031da56a4dab2427676aba91bb54bafe631c1e637422b5a6f250f7d4f1dcf51597c6f7192db01341baa6a1e9a WHIRLPOOL 24134f22861e45443d48c0ea1cbde3b664c97fd768f2e544fbc0f7da1f6066313bb6de8894e0728bfec554a893c1612052a5bb562622f7ea344f2c9b5a4a444d
+DIST xmobar-0.23.1.tar.gz 96169 SHA256 3b31558373bdb8561f06440da902dd0db8398e5c774fa027931785c263f5567a SHA512 0215c02d32d90efff4d041d48b663755ccfb1944281f8a2cabb3e88cc9fd77221da03dd709b9c96f5ca8d7204561fe33fdabf37a2d919a83374df71909cc5978 WHIRLPOOL 9357a6bb809c7fe65ac8fd2c52eba9807d41b358bac10417416fa8b9aa1bb17c8cd62495b102d56c8ff1cd8ed2550a33fad3bfce0b56510968308418b4a7e352
+DIST xmobar-0.23.tar.gz 95874 SHA256 bbe567762ce093b7be28bebb3c9669a16e9e57025da5130564ed57d448ab835a SHA512 5853a9d2479efbd217153a28416c37d68184335e184722bbdcd350bb015c99dc154817da6ba8ccb9120b6d5403d391d7cd792e38112dff3ee94c7d2e0d131eaf WHIRLPOOL 975483fbda6fb70f0a5a44f5dd8addc0b1e5bc411844eeab42bc90e7e93b5064c0fa3a71c30488c63b3a82d76bb176d705ea3ce264626c2fa5c1cd4776de59ff
diff --git a/x11-misc/xmobar/metadata.xml b/x11-misc/xmobar/metadata.xml
new file mode 100644
index 000000000000..e4837ee8bce8
--- /dev/null
+++ b/x11-misc/xmobar/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+	</maintainer>
+	<use>
+		<flag name='mpd'>Support mpd plugin</flag>
+		<flag name='mpris'>Enables MPRIS v1, v2  support</flag>
+		<flag name='timezone'>Enables localized date support</flag>
+	</use>
+	<longdescription>
+		Xmobar is a minimalistic text based status bar.
+		
+		Inspired by the Ion3 status bar, it supports similar
+		features, like dynamic color management, output templates,
+		and extensibility through plugins.
+	</longdescription>
+</pkgmetadata>
diff --git a/x11-misc/xmobar/xmobar-0.20.1-r1.ebuild b/x11-misc/xmobar/xmobar-0.20.1-r1.ebuild
new file mode 100644
index 000000000000..eadaa767f259
--- /dev/null
+++ b/x11-misc/xmobar/xmobar-0.20.1-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.3.6.9999
+#hackport: flags: -all_extensions,+with_threaded,+with_utf8,with_iwlib:wifi,with_alsa:alsa,with_xft:xft,with_datezone:timezone,with_dbus:dbus,with_mpd:mpd,with_inotify:inotify,with_mpris:mpris
+
+CABAL_FEATURES="bin"
+inherit haskell-cabal
+
+DESCRIPTION="A Minimalistic Text Based Status Bar"
+HOMEPAGE="http://projects.haskell.org/xmobar/"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa dbus inotify mpd mpris timezone wifi xft"
+
+RDEPEND="x11-libs/libXrandr
+	wifi? ( net-wireless/wireless-tools )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8.0.2
+	>=dev-haskell/http-4000
+	>=dev-haskell/mtl-2.0 <dev-haskell/mtl-2.3
+	>=dev-haskell/parsec-3.1 <dev-haskell/parsec-3.2
+	dev-haskell/regex-compat
+	>=dev-haskell/stm-2.3 <dev-haskell/stm-2.5
+	>=dev-haskell/utf8-string-0.3 <dev-haskell/utf8-string-0.4
+	>=dev-haskell/x11-1.6.1
+	>=dev-lang/ghc-6.12.1
+	alsa? ( >=dev-haskell/alsa-core-0.5 <dev-haskell/alsa-core-0.6
+		>=dev-haskell/alsa-mixer-0.2 <dev-haskell/alsa-mixer-0.3 )
+	dbus? ( >=dev-haskell/dbus-0.10 )
+	inotify? ( >=dev-haskell/hinotify-0.3 <dev-haskell/hinotify-0.4 )
+	mpd? ( >=dev-haskell/libmpd-0.8 <dev-haskell/libmpd-0.9 )
+	mpris? ( >=dev-haskell/dbus-0.10 )
+	timezone? ( >=dev-haskell/timezone-olson-0.1 <dev-haskell/timezone-olson-0.2
+			>=dev-haskell/timezone-series-0.1 <dev-haskell/timezone-series-0.2 )
+	xft? ( >=dev-haskell/x11-xft-0.2 <dev-haskell/x11-xft-0.4 )
+"
+
+src_prepare() {
+	cabal_chdeps \
+		'mtl >= 2.0 && < 2.2' 'mtl >= 2.0 && < 2.3'
+}
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-all_extensions \
+		$(cabal_flag alsa with_alsa) \
+		$(cabal_flag timezone with_datezone) \
+		$(cabal_flag dbus with_dbus) \
+		$(cabal_flag inotify with_inotify) \
+		$(cabal_flag wifi with_iwlib) \
+		$(cabal_flag mpd with_mpd) \
+		$(cabal_flag mpris with_mpris) \
+		--flag=with_threaded \
+		--flag=with_utf8 \
+		$(cabal_flag xft with_xft)
+}
+
+src_install() {
+	cabal_src_install
+
+	dodoc samples/xmobar.config readme.md news.md
+}
diff --git a/x11-misc/xmobar/xmobar-0.21.ebuild b/x11-misc/xmobar/xmobar-0.21.ebuild
new file mode 100644
index 000000000000..87b7739d94ee
--- /dev/null
+++ b/x11-misc/xmobar/xmobar-0.21.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.3.9999
+#hackport: flags: -all_extensions,+with_threaded,+with_utf8,with_iwlib:wifi,with_alsa:alsa,with_xft:xft,with_datezone:timezone,with_dbus:dbus,with_mpd:mpd,with_inotify:inotify,with_mpris:mpris
+
+CABAL_FEATURES="bin"
+inherit haskell-cabal
+
+DESCRIPTION="A Minimalistic Text Based Status Bar"
+HOMEPAGE="http://xmobar.org"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa dbus inotify mpd mpris timezone wifi xft"
+
+RDEPEND="x11-libs/libXrandr
+	wifi? ( net-wireless/wireless-tools )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.6
+	>=dev-haskell/http-4000
+	>=dev-haskell/mtl-2.0 <dev-haskell/mtl-2.3
+	>=dev-haskell/parsec-3.1 <dev-haskell/parsec-3.2
+	dev-haskell/regex-compat
+	>=dev-haskell/stm-2.3 <dev-haskell/stm-2.5
+	>=dev-haskell/utf8-string-0.3 <dev-haskell/utf8-string-0.4
+	>=dev-haskell/x11-1.6.1
+	>=dev-lang/ghc-7.4.1
+	alsa? ( >=dev-haskell/alsa-core-0.5 <dev-haskell/alsa-core-0.6
+		>=dev-haskell/alsa-mixer-0.2 <dev-haskell/alsa-mixer-0.3 )
+	dbus? ( >=dev-haskell/dbus-0.10 )
+	inotify? ( >=dev-haskell/hinotify-0.3 <dev-haskell/hinotify-0.4 )
+	mpd? ( >=dev-haskell/libmpd-0.8 <dev-haskell/libmpd-0.9 )
+	mpris? ( >=dev-haskell/dbus-0.10 )
+	timezone? ( >=dev-haskell/timezone-olson-0.1 <dev-haskell/timezone-olson-0.2
+			>=dev-haskell/timezone-series-0.1 <dev-haskell/timezone-series-0.2 )
+	xft? ( >=dev-haskell/x11-xft-0.2 <dev-haskell/x11-xft-0.4 )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-all_extensions \
+		$(cabal_flag alsa with_alsa) \
+		$(cabal_flag timezone with_datezone) \
+		$(cabal_flag dbus with_dbus) \
+		$(cabal_flag inotify with_inotify) \
+		$(cabal_flag wifi with_iwlib) \
+		$(cabal_flag mpd with_mpd) \
+		$(cabal_flag mpris with_mpris) \
+		--flag=with_threaded \
+		--flag=with_utf8 \
+		$(cabal_flag xft with_xft)
+}
+
+src_install() {
+	cabal_src_install
+
+	dodoc samples/xmobar.config readme.md news.md
+}
diff --git a/x11-misc/xmobar/xmobar-0.22.1.ebuild b/x11-misc/xmobar/xmobar-0.22.1.ebuild
new file mode 100644
index 000000000000..26b8e7ef17e4
--- /dev/null
+++ b/x11-misc/xmobar/xmobar-0.22.1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.4.9999
+#hackport: flags: -all_extensions,+with_threaded,+with_utf8,with_iwlib:wifi,with_alsa:alsa,with_xft:xft,with_datezone:timezone,with_dbus:dbus,with_mpd:mpd,with_inotify:inotify,with_mpris:mpris,with_xpm:xpm
+
+CABAL_FEATURES="bin"
+inherit haskell-cabal
+
+DESCRIPTION="A Minimalistic Text Based Status Bar"
+HOMEPAGE="http://xmobar.org"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa dbus inotify mpd mpris timezone wifi xft xpm"
+
+RDEPEND="x11-libs/libXrandr
+	wifi? ( net-wireless/wireless-tools )
+	xpm? ( x11-libs/libXpm )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.6
+	>=dev-haskell/http-4000
+	>=dev-haskell/mtl-2.1 <dev-haskell/mtl-2.3
+	>=dev-haskell/parsec-3.1 <dev-haskell/parsec-3.2
+	dev-haskell/regex-compat
+	>=dev-haskell/stm-2.3 <dev-haskell/stm-2.5
+	dev-haskell/transformers
+	>=dev-haskell/utf8-string-0.3 <dev-haskell/utf8-string-0.4
+	>=dev-haskell/x11-1.6.1
+	>=dev-lang/ghc-7.4.1
+	alsa? ( >=dev-haskell/alsa-core-0.5 <dev-haskell/alsa-core-0.6
+		>=dev-haskell/alsa-mixer-0.2 <dev-haskell/alsa-mixer-0.3 )
+	dbus? ( >=dev-haskell/dbus-0.10 )
+	inotify? ( >=dev-haskell/hinotify-0.3 <dev-haskell/hinotify-0.4 )
+	mpd? ( >=dev-haskell/libmpd-0.9 <dev-haskell/libmpd-0.10 )
+	mpris? ( >=dev-haskell/dbus-0.10 )
+	timezone? ( >=dev-haskell/timezone-olson-0.1 <dev-haskell/timezone-olson-0.2
+			>=dev-haskell/timezone-series-0.1 <dev-haskell/timezone-series-0.2 )
+	xft? ( >=dev-haskell/x11-xft-0.2 <dev-haskell/x11-xft-0.4 )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-all_extensions \
+		$(cabal_flag alsa with_alsa) \
+		$(cabal_flag timezone with_datezone) \
+		$(cabal_flag dbus with_dbus) \
+		$(cabal_flag inotify with_inotify) \
+		$(cabal_flag wifi with_iwlib) \
+		$(cabal_flag mpd with_mpd) \
+		$(cabal_flag mpris with_mpris) \
+		--flag=with_threaded \
+		--flag=with_utf8 \
+		$(cabal_flag xft with_xft) \
+		$(cabal_flag xpm with_xpm)
+}
+
+src_install() {
+	cabal_src_install
+
+	dodoc samples/xmobar.config readme.md news.md
+}
diff --git a/x11-misc/xmobar/xmobar-0.23.1.ebuild b/x11-misc/xmobar/xmobar-0.23.1.ebuild
new file mode 100644
index 000000000000..9ecbc72a887a
--- /dev/null
+++ b/x11-misc/xmobar/xmobar-0.23.1.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.5.9999
+#hackport: flags: -all_extensions,+with_threaded,+with_utf8,with_iwlib:wifi,with_alsa:alsa,with_xft:xft,with_datezone:timezone,with_dbus:dbus,with_mpd:mpd,with_inotify:inotify,with_mpris:mpris,with_xpm:xpm
+
+CABAL_FEATURES="bin"
+inherit haskell-cabal
+
+DESCRIPTION="A Minimalistic Text Based Status Bar"
+HOMEPAGE="http://xmobar.org"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa dbus inotify mpd mpris timezone wifi xft xpm"
+
+RDEPEND=">=dev-haskell/http-4000.2.4:=
+	>=dev-haskell/mtl-2.1:= <dev-haskell/mtl-2.3:=
+	dev-haskell/old-locale:=
+	>=dev-haskell/parsec-3.1:= <dev-haskell/parsec-3.2:=
+	dev-haskell/regex-compat:=
+	>=dev-haskell/stm-2.3:= <dev-haskell/stm-2.5:=
+	dev-haskell/transformers:=
+	>=dev-haskell/utf8-string-0.3:= <dev-haskell/utf8-string-1.1:=
+	>=dev-haskell/x11-1.6.1:=
+	>=dev-lang/ghc-7.4.1:=
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	alsa? ( >=dev-haskell/alsa-core-0.5:= <dev-haskell/alsa-core-0.6:=
+		>=dev-haskell/alsa-mixer-0.2:= <dev-haskell/alsa-mixer-0.3:= )
+	dbus? ( >=dev-haskell/dbus-0.10:= )
+	inotify? ( >=dev-haskell/hinotify-0.3:= <dev-haskell/hinotify-0.4:= )
+	mpd? ( >=dev-haskell/libmpd-0.9:= <dev-haskell/libmpd-0.10:= )
+	mpris? ( >=dev-haskell/dbus-0.10:= )
+	timezone? ( >=dev-haskell/timezone-olson-0.1:= <dev-haskell/timezone-olson-0.2:=
+			>=dev-haskell/timezone-series-0.1:= <dev-haskell/timezone-series-0.2:= )
+	wifi? ( net-wireless/wireless-tools )
+	xft? ( >=dev-haskell/x11-xft-0.2:= <dev-haskell/x11-xft-0.4:= )
+	xpm? ( x11-libs/libXpm )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.6
+"
+
+src_prepare() {
+	# xmobar is an idle multithreaded program
+	# which sits in 'while { sleep(1); }'
+	# loops in multiple threads.
+	# It has a pathological behaviour in GHC:
+	#   everything program does is thread context switch
+	#   100 times per second. It's easily seen with
+	#
+	#       $ strace -f -p `pidof xmobar`
+	#
+	#   where rt_sigreturn() manages to enter/exit
+	# kernel 32 times in each second to do nothing
+	# This workaround allows shrinkng wakeups/thread
+	# switches down to one per second (internal xmobar's
+	# cycle).
+	# Be careful when remove it :]
+	HCFLAGS+=" -with-rtsopts=-V0"
+}
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-all_extensions \
+		$(cabal_flag alsa with_alsa) \
+		$(cabal_flag timezone with_datezone) \
+		$(cabal_flag dbus with_dbus) \
+		$(cabal_flag inotify with_inotify) \
+		$(cabal_flag wifi with_iwlib) \
+		$(cabal_flag mpd with_mpd) \
+		$(cabal_flag mpris with_mpris) \
+		--flag=with_threaded \
+		--flag=with_utf8 \
+		$(cabal_flag xft with_xft) \
+		$(cabal_flag xpm with_xpm)
+}
+
+src_install() {
+	cabal_src_install
+
+	dodoc samples/xmobar.config readme.md news.md
+}
diff --git a/x11-misc/xmobar/xmobar-0.23.ebuild b/x11-misc/xmobar/xmobar-0.23.ebuild
new file mode 100644
index 000000000000..1e814f4023e2
--- /dev/null
+++ b/x11-misc/xmobar/xmobar-0.23.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.4.9999
+#hackport: flags: -all_extensions,+with_threaded,+with_utf8,with_iwlib:wifi,with_alsa:alsa,with_xft:xft,with_datezone:timezone,with_dbus:dbus,with_mpd:mpd,with_inotify:inotify,with_mpris:mpris,with_xpm:xpm
+
+CABAL_FEATURES="bin"
+inherit haskell-cabal
+
+DESCRIPTION="A Minimalistic Text Based Status Bar"
+HOMEPAGE="http://xmobar.org"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa dbus inotify mpd mpris timezone wifi xft xpm"
+
+RDEPEND="x11-libs/libXrandr
+	x11-libs/libXrender
+	wifi? ( net-wireless/wireless-tools )
+	xpm? ( x11-libs/libXpm )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.6
+	>=dev-haskell/http-4000.2.4
+	>=dev-haskell/mtl-2.1 <dev-haskell/mtl-2.3
+	dev-haskell/old-locale
+	>=dev-haskell/parsec-3.1 <dev-haskell/parsec-3.2
+	dev-haskell/regex-compat
+	>=dev-haskell/stm-2.3 <dev-haskell/stm-2.5
+	dev-haskell/transformers
+	>=dev-haskell/utf8-string-0.3 <dev-haskell/utf8-string-1.1
+	>=dev-haskell/x11-1.6.1
+	>=dev-lang/ghc-7.4.1
+	alsa? ( >=dev-haskell/alsa-core-0.5 <dev-haskell/alsa-core-0.6
+		>=dev-haskell/alsa-mixer-0.2 <dev-haskell/alsa-mixer-0.3 )
+	dbus? ( >=dev-haskell/dbus-0.10 )
+	inotify? ( >=dev-haskell/hinotify-0.3 <dev-haskell/hinotify-0.4 )
+	mpd? ( >=dev-haskell/libmpd-0.9 <dev-haskell/libmpd-0.10 )
+	mpris? ( >=dev-haskell/dbus-0.10 )
+	timezone? ( >=dev-haskell/timezone-olson-0.1 <dev-haskell/timezone-olson-0.2
+			>=dev-haskell/timezone-series-0.1 <dev-haskell/timezone-series-0.2 )
+	xft? ( >=dev-haskell/x11-xft-0.2 <dev-haskell/x11-xft-0.4 )
+"
+
+src_prepare() {
+	cabal_chdeps \
+	       "utf8-string == 0.3.*" "utf8-string >= 0.3 && <1.1"
+}
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-all_extensions \
+		$(cabal_flag alsa with_alsa) \
+		$(cabal_flag timezone with_datezone) \
+		$(cabal_flag dbus with_dbus) \
+		$(cabal_flag inotify with_inotify) \
+		$(cabal_flag wifi with_iwlib) \
+		$(cabal_flag mpd with_mpd) \
+		$(cabal_flag mpris with_mpris) \
+		--flag=with_threaded \
+		--flag=with_utf8 \
+		$(cabal_flag xft with_xft) \
+		$(cabal_flag xpm with_xpm)
+}
+
+src_install() {
+	cabal_src_install
+
+	dodoc samples/xmobar.config readme.md news.md
+}
diff --git a/x11-misc/xmonad-log-applet/Manifest b/x11-misc/xmonad-log-applet/Manifest
new file mode 100644
index 000000000000..25cc13b44be5
--- /dev/null
+++ b/x11-misc/xmonad-log-applet/Manifest
@@ -0,0 +1 @@
+DIST xmonad-log-applet-2.0.0.tar.gz 82881 SHA256 154bdb5b857195b318837ef086ddd3091d100884ada29a146ff18a5589549fa0 SHA512 1885ac97569d909ab1c6af99d9b271d0f782de905dfe035df27524f428d09cefa20a468103477132656dea8945faf886270fd70a49e5a08be538e04f3f05baca WHIRLPOOL 87bce2156b8a5f7a2c3b8b0597d24eee5238333e6a10c161a49e3cab08f3e1cdd3facfbf60ab879109b151143823e99d2d2c3470904e361fe892f950902e7d9f
diff --git a/x11-misc/xmonad-log-applet/files/xmonad.hs b/x11-misc/xmonad-log-applet/files/xmonad.hs
new file mode 100644
index 000000000000..54b0025a97c4
--- /dev/null
+++ b/x11-misc/xmonad-log-applet/files/xmonad.hs
@@ -0,0 +1,60 @@
+import XMonad
+import XMonad.Config.Gnome
+import XMonad.Hooks.DynamicLog
+
+import Control.OldException
+
+import DBus
+import DBus.Connection
+import DBus.Message
+
+main :: IO ()
+main =  withConnection Session $ \dbus -> do
+    getWellKnownName dbus
+    xmonad $ gnomeConfig
+         { logHook = dynamicLogWithPP (prettyPrinter dbus)
+         }
+
+prettyPrinter :: Connection -> PP
+prettyPrinter dbus = defaultPP
+    { ppOutput   = dbusOutput dbus
+    , ppTitle    = pangoSanitize
+    , ppCurrent  = pangoColor "green" . wrap "[" "]" . pangoSanitize
+    , ppVisible  = pangoColor "yellow" . wrap "(" ")" . pangoSanitize
+    , ppHidden   = const ""
+    , ppUrgent   = pangoColor "red"
+    , ppLayout   = const ""
+    , ppSep      = " "
+    }
+
+getWellKnownName :: Connection -> IO ()
+getWellKnownName dbus = tryGetName `catchDyn` (\(DBus.Error _ _) -> getWellKnownName dbus)
+  where
+    tryGetName = do
+        namereq <- newMethodCall serviceDBus pathDBus interfaceDBus "RequestName"
+        addArgs namereq [String "org.xmonad.Log", Word32 5]
+        sendWithReplyAndBlock dbus namereq 0
+        return ()
+
+dbusOutput :: Connection -> String -> IO ()
+dbusOutput dbus str = do
+    msg <- newSignal "/org/xmonad/Log" "org.xmonad.Log" "Update"
+    addArgs msg [String ("<b>" ++ str ++ "</b>")]
+    -- If the send fails, ignore it.
+    send dbus msg 0 `catchDyn` (\(DBus.Error _ _) -> return 0)
+    return ()
+
+pangoColor :: String -> String -> String
+pangoColor fg = wrap left right
+  where
+    left  = "<span foreground=\"" ++ fg ++ "\">"
+    right = "</span>"
+
+pangoSanitize :: String -> String
+pangoSanitize = foldr sanitize ""
+  where
+    sanitize '>'  xs = "&gt;" ++ xs
+    sanitize '<'  xs = "&lt;" ++ xs
+    sanitize '\"' xs = "&quot;" ++ xs
+    sanitize '&'  xs = "&amp;" ++ xs
+    sanitize x    xs = x:xs
diff --git a/x11-misc/xmonad-log-applet/metadata.xml b/x11-misc/xmonad-log-applet/metadata.xml
new file mode 100644
index 000000000000..1e501a4b3854
--- /dev/null
+++ b/x11-misc/xmonad-log-applet/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>haskell</herd>
+  <maintainer>
+    <email>haskell@gentoo.org</email>
+  </maintainer>
+  <maintainer>
+    <email>flo@geekplace.eu</email>
+    <description>Maintainer, CC him on bugs</description>
+  </maintainer>
+  <longdescription>
+	xmonad-log-applet is for Xmonad users who find the GNOME, MATE, or Xfce panel useful. The applet will show the active workspaces, the title of the selected window or whatever information you send it from your xmonad.hs.
+</longdescription>
+  <upstream>
+    <remote-id type="github">alexkay/xmonad-log-applet</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/x11-misc/xmonad-log-applet/xmonad-log-applet-2.0.0-r301.ebuild b/x11-misc/xmonad-log-applet/xmonad-log-applet-2.0.0-r301.ebuild
new file mode 100644
index 000000000000..89b75cd759d5
--- /dev/null
+++ b/x11-misc/xmonad-log-applet/xmonad-log-applet-2.0.0-r301.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit autotools gnome2
+
+DESCRIPTION="Gnome and XFCE applet for displaying XMonad log"
+HOMEPAGE="https://github.com/alexkay/xmonad-log-applet"
+SRC_URI="mirror://github/alexkay/${PN}/${P}.tar.gz"
+LICENSE="BSD"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RESTRICT="mirror"
+
+RDEPEND="
+	sys-apps/dbus
+	xfce-base/xfce4-panel
+	dev-libs/glib:2
+	dev-haskell/dbus
+	x11-libs/gtk+:3
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	eautoreconf
+}
+
+src_configure() {
+	econf --sysconfdir=/etc --with-panel=xfce4
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS.md README.md
+	dodoc "${FILESDIR}"/xmonad.hs
+}
+
+pkg_postinst() {
+	elog "Remember to update your xmonad.hs accordingly"
+	elog "a sample xmonad.hs is provided in /usr/share/doc/${PF}"
+}
diff --git a/x11-misc/xmountains/Manifest b/x11-misc/xmountains/Manifest
new file mode 100644
index 000000000000..44ee98912cab
--- /dev/null
+++ b/x11-misc/xmountains/Manifest
@@ -0,0 +1 @@
+DIST xmountains_2.9.tar.gz 27951 SHA256 3830f48ab46d770f0ce1c5e8fd1861e28fa1b8373aa82fac66a563f017aaee89
diff --git a/x11-misc/xmountains/metadata.xml b/x11-misc/xmountains/metadata.xml
new file mode 100644
index 000000000000..731225048652
--- /dev/null
+++ b/x11-misc/xmountains/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>desktop-misc</herd>
+</pkgmetadata>
diff --git a/x11-misc/xmountains/xmountains-2.9.ebuild b/x11-misc/xmountains/xmountains-2.9.ebuild
new file mode 100644
index 000000000000..8297a95ee44a
--- /dev/null
+++ b/x11-misc/xmountains/xmountains-2.9.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit toolchain-funcs
+
+MY_P=${P/-/_}
+
+DESCRIPTION="Fractal terrains of snow-capped mountains near water"
+HOMEPAGE="http://www.epcc.ed.ac.uk/~spb/xmountains/"
+SRC_URI="http://www.epcc.ed.ac.uk/~spb/${PN}/${MY_P}.tar.gz"
+
+LICENSE="HPND"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="x11-misc/xbitmaps
+	x11-libs/libX11"
+DEPEND="${RDEPEND}
+	x11-proto/xproto"
+
+S=${WORKDIR}
+
+src_prepare() {
+	# add missing include for strcmp
+	sed -i xmountains.c -e '1a#include <string.h> /* strcmp() */' || die
+	# remove obsolete references to global.*
+	sed -i Makefile.alt README -e 's|global\..||g' || die
+}
+
+src_compile() {
+	emake \
+		-f Makefile.alt \
+		CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
+		${PN}
+}
+
+src_install() {
+	dobin ${PN}
+	dodoc README
+	newman ${PN}.man ${PN}.1
+}
diff --git a/x11-misc/xnee/Manifest b/x11-misc/xnee/Manifest
new file mode 100644
index 000000000000..788514af8c20
--- /dev/null
+++ b/x11-misc/xnee/Manifest
@@ -0,0 +1 @@
+DIST xnee-3.19.tar.gz 1893109 SHA256 52a41e5cf62f81b7a3e5b58124eb3565e1e12028abda63f547fbbe0d98a2c212 SHA512 a4a82839a4597b0d7f5b65ad76092f03eb5c665d36298505a320475daacbf66f30b022c04284ce8795360e4481fdfb1d9138f0b8b173b66d23b7f1542d0acbe8 WHIRLPOOL 9b938ccc540e91d71860600cb6c120bd33dae214fe38a6004cee29bb0d96f813536d073a23874905302a2f2552afe2866ad19d1db12234d7ae1ecf80b305339d
diff --git a/x11-misc/xnee/files/xnee-3.18-linker.patch b/x11-misc/xnee/files/xnee-3.18-linker.patch
new file mode 100644
index 000000000000..b841bc0182e7
--- /dev/null
+++ b/x11-misc/xnee/files/xnee-3.18-linker.patch
@@ -0,0 +1,10 @@
+--- a/libxnee/src/Makefile.am
++++ b/libxnee/src/Makefile.am
+@@ -78,6 +78,7 @@
+ libxnee_la_LDFLAGS = -rpath '$(libdir)'
+ #dnl libxnee_la_SOURCES = $(LIB_XNEE_SOURCE_FILES) 
+ libxnee_a_CFLAGS = $(AM_CFLAGS)
++libxnee_la_LIBADD = @X11_LIBS@
+ 
+ #noinst_LIBRARIES = libxnee.a 
+ 
diff --git a/x11-misc/xnee/metadata.xml b/x11-misc/xnee/metadata.xml
new file mode 100644
index 000000000000..2518313f5241
--- /dev/null
+++ b/x11-misc/xnee/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+        <herd>desktop-misc</herd>
+</pkgmetadata>
diff --git a/x11-misc/xnee/xnee-3.19.ebuild b/x11-misc/xnee/xnee-3.19.ebuild
new file mode 100644
index 000000000000..eadc4fcaaa1a
--- /dev/null
+++ b/x11-misc/xnee/xnee-3.19.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils
+
+DESCRIPTION="Program suite to record, replay and distribute user actions"
+HOMEPAGE="http://www.sandklef.com/xnee/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 ~x86"
+IUSE="gnome static-libs xosd"
+
+RDEPEND="
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libXdmcp
+	x11-libs/libXext
+	x11-libs/libXi
+	x11-libs/libXtst
+	x11-libs/libxcb
+	gnome? (
+		x11-libs/gtk+:2
+		>=gnome-base/libgnomeui-2
+		>=gnome-base/gconf-2
+	)
+"
+DEPEND="${RDEPEND}
+	x11-proto/inputproto
+	virtual/pkgconfig
+	sys-devel/gettext
+	gnome? (
+		|| (
+			media-gfx/imagemagick[jpeg,png]
+			media-gfx/graphicsmagick[imagemagick,jpeg,png]
+		)
+	)
+"
+
+# This needs RECORD extension from X.org server which isn't necessarily
+# enabled. Xlib: extension "RECORD" missing on display ":0.0".
+RESTRICT="test"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-3.18-linker.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable gnome gui) \
+		$(use_enable static-libs static) \
+		$(use_enable xosd buffer_verbose) \
+		$(use_enable xosd verbose) \
+		$(use_enable xosd) \
+		--disable-gnome-applet \
+		--disable-static-programs \
+		--enable-cli \
+		--enable-lib
+}
+
+src_test() {
+	Xemake check
+}
+
+src_install() {
+	default
+	dodoc AUTHORS BUGS ChangeLog FAQ NEWS README TODO
+	use gnome && make_desktop_entry gnee Gnee ${PN} "Utility;GTK"
+	use static-libs || rm -f "${ED}"usr/lib*/lib*.la
+}
diff --git a/x11-misc/xnots/Manifest b/x11-misc/xnots/Manifest
new file mode 100644
index 000000000000..1183e16a836e
--- /dev/null
+++ b/x11-misc/xnots/Manifest
@@ -0,0 +1 @@
+DIST xnots-0.2.1.tar.gz 41442 SHA256 80bbab0334880f79aa12cf17ebffc5730a85dc537e8e6208169720656ecd72ca SHA512 bb1a334150aac932839c8d9e04d8c9f1c419f5221a218fbbe3523060fbb8d62e616f89ec06a8237fa290de37db103e98a560953ef820ef016f35dd5c844eb65c WHIRLPOOL 1ed783f7167fd8836bf939ec09eabc7e25a229e6f95c3d3f5e52975dc97e2b94064d48f5a8b03ec6d55121292ff661283943e0c2b562965b7bf74068232a70b7
diff --git a/x11-misc/xnots/metadata.xml b/x11-misc/xnots/metadata.xml
new file mode 100644
index 000000000000..d62a9e754cd5
--- /dev/null
+++ b/x11-misc/xnots/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>desktop-misc</herd>
+	<upstream>
+		<remote-id type="sourceforge">xnots</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-misc/xnots/xnots-0.2.1-r1.ebuild b/x11-misc/xnots/xnots-0.2.1-r1.ebuild
new file mode 100644
index 000000000000..89f8649b8da7
--- /dev/null
+++ b/x11-misc/xnots/xnots-0.2.1-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit toolchain-funcs
+
+DESCRIPTION="A desktop sticky note program for the unix geek"
+HOMEPAGE="http://xnots.sourceforge.net"
+SRC_URI="mirror://sourceforge/xnots/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="vim-syntax"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXrender
+	x11-libs/libXrandr
+	x11-libs/pango[X]"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	x11-proto/xextproto
+	x11-proto/renderproto
+	x11-proto/randrproto"
+
+src_prepare() {
+	sed -i -e 's|LICENCE||g' Makefile || die
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" NO_DEBUG=1
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		docdir=/usr/share/doc/${PF} \
+		mandir=/usr/share/man \
+		prefix=/usr \
+		install
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins etc/xnots.vim
+	fi
+}
diff --git a/x11-misc/xoo/Manifest b/x11-misc/xoo/Manifest
new file mode 100644
index 000000000000..6be36eb2803a
--- /dev/null
+++ b/x11-misc/xoo/Manifest
@@ -0,0 +1 @@
+DIST xoo-0.7.tar.gz 301563 RMD160 86865d8ade4441f7ad75b719fa6eb0c4a65d857f SHA1 dfdaa8bb1d2a4ff07c52b676648ce2c2c1adf7a1 SHA256 69796891a93887496d99c867bb70208830ceb6c3671fca0ecc70a564a14ae20a
diff --git a/x11-misc/xoo/metadata.xml b/x11-misc/xoo/metadata.xml
new file mode 100644
index 000000000000..6a17403e0ad0
--- /dev/null
+++ b/x11-misc/xoo/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>gpe</herd>
+</pkgmetadata>
diff --git a/x11-misc/xoo/xoo-0.7.ebuild b/x11-misc/xoo/xoo-0.7.ebuild
new file mode 100644
index 000000000000..1b0ef725816b
--- /dev/null
+++ b/x11-misc/xoo/xoo-0.7.ebuild
@@ -0,0 +1,35 @@
+# Copyright 2006-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+DESCRIPTION="A graphical wrapper around xnest"
+HOMEPAGE="http://projects.o-hand.com/xoo"
+SRC_URI="http://projects.o-hand.com/sources/xoo/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE="gnome"
+
+DEPEND="gnome? ( gnome-base/gconf )
+	gnome-base/libglade
+	x11-libs/libXtst
+	x11-base/xorg-server"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	# Fix default Xnest binary path.
+	sed -e "s:/usr/X11R6/bin/Xnest:$(type -P Xnest):" -i src/main.c || die
+}
+
+src_compile() {
+	econf \
+		$(use_enable gnome gconf)
+	emake || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS Changelog NEWS README TODO
+}
diff --git a/x11-misc/xorg-cf-files/Manifest b/x11-misc/xorg-cf-files/Manifest
new file mode 100644
index 000000000000..af31ecad8357
--- /dev/null
+++ b/x11-misc/xorg-cf-files/Manifest
@@ -0,0 +1,2 @@
+DIST xorg-cf-files-1.0.4.tar.bz2 367380 SHA256 36e9ce83e4978f59909c6f44c43002d9b240ae66e23984ea1086f0b18c810669 SHA512 e00ba2273b8ec7ca4ae84c176075170ae74162064463e9b48fb5c6ad62f7984a93fafa626caf0a9079b796f4deec57759a1d0fc148e77793eae130a9441baf42 WHIRLPOOL bee8bd9b8b72e19bf1429aefe86db6b4eed39132e4080f9e3c9a4acb9d6b40e73e5d6dfd75304d29654feaa4c88f64ffd34c097896417ab3285e10090c3915ff
+DIST xorg-cf-files-1.0.5.tar.bz2 377835 SHA256 ed23b85043edecc38fad4229e0ebdb7ff80b570e746bc03a7c8678d601be7ed4 SHA512 139d2c51538257eac79118ea367cdfbebebcd095f353e784b61c109e008bf8e43eb4ef15bb0c8df74339dbed9d96af4c4d1e023c23d02d5de31dc2ea5b85ce5c WHIRLPOOL 8621de9d25a9672d30d9ee3ed6a617e9c9e9d5a34c945fa458b0318b9bf157569f97ea1697efc463f3bb0ae8c6d0335dd30a6b5499c6baf00c5e172aaa5bf95b
diff --git a/x11-misc/xorg-cf-files/files/xorg-cf-files-1.0.2-solaris-prefix.patch b/x11-misc/xorg-cf-files/files/xorg-cf-files-1.0.2-solaris-prefix.patch
new file mode 100644
index 000000000000..b797b2588d1d
--- /dev/null
+++ b/x11-misc/xorg-cf-files/files/xorg-cf-files-1.0.2-solaris-prefix.patch
@@ -0,0 +1,663 @@
+--- sunLib.rules.orig	2008-12-18 13:43:19.032933408 +0100
++++ sunLib.rules	2008-12-18 13:51:12.494555406 +0100
+@@ -7,127 +7,268 @@
+ XCOMM $XFree86: xc/config/cf/sunLib.rules,v 1.3 2001/01/17 16:38:49 dawes Exp $
+ 
+ #ifndef HasSharedLibraries
+-#define HasSharedLibraries YES
++# define HasSharedLibraries YES
+ #endif
+-#ifndef SharedDataSeparation
+-#define SharedDataSeparation YES
++#ifndef ForceNormalLib
++# define ForceNormalLib NO
+ #endif
+-#ifndef SharedCodeDef
+-#define SharedCodeDef -DSHAREDCODE
+-#endif
+-#ifndef SharedLibraryDef
+-#define SharedLibraryDef -DSUNSHLIB
+-#endif
+-#ifndef ShLibIncludeFile
+-#define ShLibIncludeFile <sunLib.tmpl>
+-#endif
+-#ifndef SharedLibraryLoadFlags
+-#define SharedLibraryLoadFlags -assert pure-text
+-#endif
+-#ifndef PositionIndependentCFlags
+-#if HasGcc2
+-#define PositionIndependentCFlags -fPIC
+-#else
+-#define PositionIndependentCFlags -pic
++
++#ifndef UseRpath
++#define UseRpath NO
+ #endif
++
++#ifndef SharedOldX
++# define SharedOldX NO
+ #endif
+-#ifndef PositionIndependentCplusplusFlags
+-#if HasGcc2ForCplusplus
+-#define PositionIndependentCplusplusFlags -fPIC
++# ifndef SharedDataSeparation
++#  define SharedDataSeparation NO
++# endif
++# ifndef SharedCodeDef
++#  define SharedCodeDef /**/
++# endif
++# ifndef SharedLibraryDef
++#  define SharedLibraryDef /**/
++# endif
++# ifndef ShLibIncludeFile
++#  define ShLibIncludeFile <sunLib.tmpl>
++# endif
++#ifndef RpathLoadFlags
++#if UseRpath
++#define RpathLoadFlags -R$(USRLIBDIRPATH)
+ #else
+-#define PositionIndependentCplusplusFlags -pic
++#define RpathLoadFlags /**/
+ #endif
+ #endif
+-
+-/*
+- * SharedDSLibDependencies - shared library dependencies with data separation
+- */
+-#ifndef SharedDSLibDependencies
+-#define SharedDSLibDependencies(libname,libsource,revname) _UseCat($(USRLIBDIR)/lib,libsource/lib,libname.sa.$(revname))
++#ifndef LibraryRpathLoadFlags
++#define LibraryRpathLoadFlags RpathLoadFlags
+ #endif
++# ifndef SharedLibraryLoadFlags
++#  define SharedLibraryLoadFlags -shared
++# endif
++# ifndef PositionIndependentCFlags
++#  define PositionIndependentCFlags -fPIC
++# endif
++# ifndef PositionIndependentCplusplusFlags
++#  define PositionIndependentCplusplusFlags -fPIC
++# endif
++# ifndef ExtraLoadFlags
++#  if LinuxBinUtilsMajorVersion >= 26
++#   ifdef UseInstalled
++#    if LinuxBinUtilsMajorVersion < 27
++#     define ExtraLoadFlags RpathLoadFlags -Wl,-rpath-link,$(USRLIBDIRPATH)
++#    endif
++#   else
++#    define ExtraLoadFlags RpathLoadFlags -Wl,-rpath-link,$(BUILDLIBDIR)
++#   endif
++#  else
++#   define ExtraLoadFlags RpathLoadFlags
++#  endif
++# endif
++# ifndef HardCodeLibdirFlag
++#  define HardCodeLibdirFlag RpathLoadFlags
++# endif
++# if !defined(ShlibGlobalsFlags)
++#  define ShlibGlobalsFlags -Wl,-Bsymbolic
++# endif
+ 
+ /*
+  * InstallSharedLibrary - generate rules to install the shared library.
++ * NOTE: file must be executable, hence "INSTBINFLAGS"
+  */
+-#ifndef InstallSharedLibrary
+-#define	InstallSharedLibrary(libname,rev,dest)				@@\
+-InstallTarget(install,Concat(lib,libname.so.rev),$(INSTLIBFLAGS),dest)
+-#endif /* InstallSharedLibrary */
++# ifndef InstallSharedLibrary
++#  define	InstallSharedLibrary(libname,rev,dest)			@@\
++install:: Concat(lib,libname.so.rev) 					@@\
++	MakeDir($(DESTDIR)dest)						@@\
++	$(INSTALL) $(INSTALLFLAGS) $(INSTBINFLAGS) Concat(lib,libname.so.rev) $(DESTDIR)dest @@\
++	@T=`echo Concat($(DESTDIR)dest/lib,libname.so.rev) | sed 's/\(lib[^\.]*\.so\.[0-9]*\)\(\.[0-9]*\)\{1,2\}/\1/'`;\
++	  set -x; $(RM) $$T && $(LN) Concat(lib,libname.so.rev) $$T	@@\
++	@if $(SOSYMLINK); then (set -x; \
++	  $(RM) Concat($(DESTDIR)dest/lib,libname.so); \		@@\
++	  $(LN) Concat(lib,libname.so.rev) Concat($(DESTDIR)dest/lib,libname.so)); fi
++# endif /* InstallSharedLibrary */
++
++# ifndef InstallSharedLibtoolLibrary
++
++#  define SetRevisions(rev) V=`expr rev : '\([^:]*\)'`; \		@@\
++		R=`expr rev : '.*:\([^:]*\):'`; \			@@\
++		A=`expr rev : '.*:\([^:]*\)'`; \			@@\
++		MAJ=`expr $$V - $$A`; \					@@\
++		MIN=$$A.$$R
++
++#  define	InstallSharedLibtoolLibrary(libname,rev,dest)		@@\
++install:: Concat(lib,libname.so) 					@@\
++	MakeDir($(DESTDIR)dest)						@@\
++	@set +e; SetRevisions(rev); \					@@\
++		set -xe; \						@@\
++		$(INSTALL) $(INSTALLFLAGS) $(INSTBINFLAGS) Concat(lib,libname.so.$$MAJ.$$MIN) $(DESTDIR)dest; \ @@\
++		$(RM) Concat($(DESTDIR)dest/lib,libname.so.$$MAJ); \	@@\
++		$(LN) Concat(lib,libname.so.$$MAJ.$$MIN) Concat($(DESTDIR)dest/lib,libname.so.$$MAJ); \ @@\
++		$(RM) Concat($(DESTDIR)dest/lib,libname.so); \		@@\
++		$(LN) Concat(lib,libname.so.$$MAJ.$$MIN) Concat($(DESTDIR)dest/lib,libname.so)
++# endif /* InstallSharedLibrary */
+ 
+ /*
+  * InstallSharedLibraryData - generate rules to install the shared library data
+  */
+-#ifndef InstallSharedLibraryData
+-#define	InstallSharedLibraryData(libname,rev,dest)			@@\
+-install:: Concat(lib,libname.sa.rev)					@@\
+-	MakeDir($(DESTDIR)dest)						@@\
+-	$(INSTALL) $(INSTALLFLAGS) $(INSTLIBFLAGS) Concat(lib,libname.sa.rev) $(DESTDIR)dest @@\
+-	RanLibrary($(RANLIBINSTFLAGS) Concat($(DESTDIR)dest/lib,libname.sa.rev))
+-#endif /* InstallSharedLibraryData */
+-
+-#if HasPurify
+-#define PureCleanSharedLibrary(libname,rev)				@@\
+-clean clean.pure::							@@\
+-	$(RM) Concat3(lib,libname,_pure_*.so.rev)
+-#else
+-#define PureCleanSharedLibrary(libname,rev) /**/
+-#endif
++# ifndef InstallSharedLibraryData
++#  define	InstallSharedLibraryData(libname,rev,dest)
++# endif /* InstallSharedLibraryData */
++
+ 
+ /*
+  * SharedLibraryTarget - generate rules to create a shared library;
+  * build it into a different name so that we do not hose people by having
+  * the library gone for long periods.
+  */
+-#ifndef SharedLibraryTarget
+-#define SharedLibraryTarget(libname,rev,solist,down,up)			@@\
++# ifndef SharedLibraryTarget
++#  define SharedLibraryTarget(libname,rev,solist,down,up)		@@\
+ AllTarget(Concat(lib,libname.so.rev))					@@\
+ 									@@\
+ Concat(lib,libname.so.rev):  solist $(EXTRALIBRARYDEPS)			@@\
+ 	$(RM) $@~							@@\
+-	(cd down; $(LD) -o up/$@~ $(SHLIBLDFLAGS) solist $(REQUIREDLIBS)) @@\
++	@SONAME=`echo $@ | sed 's/\(lib[^\.]*\.so\.[0-9]*\)\(\.[0-9]*\)\{1,2\}/\1/'`; (set -x; \	@@\
++		cd down; $(CC) -o up/$@~ $(SHLIBLDFLAGS) -Wl,-soname,$$SONAME solist $(REQUIREDLIBS)) || exit 1; \ @@\
++		(set -x; $(RM) $$SONAME; $(LN) $@ $$SONAME); \		@@\
++		LinkBuildSonameLibrary($$SONAME)			@@\
+ 	$(RM) $@ 							@@\
+ 	$(MV) $@~ $@							@@\
++	@if $(SOSYMLINK); then (set -x; \				@@\
++	  $(RM) Concat(lib,libname.so); \				@@\
++	  $(LN) $@ Concat(lib,libname.so)); fi				@@\
+ 	LinkBuildLibrary($@)						@@\
++	LinkBuildLibraryMaybe(Concat(lib,libname.so),$(SOSYMLINK))	@@\
+ 									@@\
+ clean::									@@\
+-	$(RM) Concat(lib,libname.so.rev)				@@\
++	@MAJREV=`echo rev | sed 's/\([0-9]*\)\(\.[0-9]*\)\{1,2\}/\1/'`; \	@@\
++	set -x; $(RM) Concat(lib,libname.so.$$MAJREV)			@@\
++	$(RM) Concat(lib,libname.so.rev) Concat(lib,libname.so)
++
++# endif /* SharedLibraryTarget */
++
++
++# ifndef SharedLibtoolLibraryTarget
++#  define SharedLibtoolLibraryTarget(libname,rev,solist,down,up)	@@\
++AllTarget(Concat(lib,libname.so))					@@\
++									@@\
++Concat(lib,libname.so):  solist $(EXTRALIBRARYDEPS)			@@\
++	$(RM) $@~							@@\
++	@set +e; SetRevisions(rev); set -e; \				@@\
++		SONAME=$@.$$MAJ; \					@@\
++		(set -x; \						@@\
++		$(RM) $@.$$MAJ.$$MIN~; \				@@\
++		cd down; $(CC) -o up/$@.$$MAJ.$$MIN~ $(SHLIBLDFLAGS) -Wl,-soname,$$SONAME solist $(REQUIREDLIBS)) || exit 1; \ @@\
++		(set -x; \						@@\
++		$(RM) $$SONAME; $(LN) $@.$$MAJ.$$MIN $$SONAME); \	@@\
++		LinkBuildSonameLibrary($$SONAME); \			@@\
++		(set -x; \						@@\
++		$(RM) $@.$$MAJ.$$MIN; \					@@\
++		$(MV) $@.$$MAJ.$$MIN~ $@.$$MAJ.$$MIN; \			@@\
++	  	$(RM) $@; \						@@\
++	  	$(LN) $@.$$MAJ.$$MIN $@); \				@@\
++		LinkBuildLibraryInline($@.$$MAJ.$$MIN); \		@@\
++		LinkBuildLibraryInline($@)				@@\
+ 									@@\
+-PureCleanSharedLibrary(libname,rev)
+-#endif /* SharedLibraryTarget */
++clean::									@@\
++	@set +e; SetRevisions(rev); \					@@\
++		set -xe; \						@@\
++		$(RM) Concat(lib,libname.so.$$MAJ); \			@@\
++		$(RM) Concat(lib,libname.so.$$MAJ.$$MIN)		@@\
++	$(RM) Concat(lib,libname.so)
++
++# endif /* SharedLibtoolLibraryTarget */
+ 
+ /*
+  * SharedDepLibraryTarget - generate rules to create a shared library.
+  */
+-#ifndef SharedDepLibraryTarget
+-#define SharedDepLibraryTarget(libname,rev,deplist,solist,down,up)	@@\
++# ifndef SharedDepLibraryTarget
++#   define SharedDepLibraryTarget(libname,rev,deplist,solist,down,up)	@@\
+ AllTarget(Concat(lib,libname.so.rev))					@@\
+ 									@@\
+ Concat(lib,libname.so.rev):  deplist $(EXTRALIBRARYDEPS)		@@\
+ 	$(RM) $@~							@@\
+-	(cd down; $(LD) -o up/$@~ $(SHLIBLDFLAGS) solist $(REQUIREDLIBS)) @@\
++	@SONAME=`echo $@ | sed 's/\(lib[^\.]*\.so\.[0-9]*\)\(\.[0-9]*\)\{1,2\}/\1/'`; set -x; \		@@\
++		(cd down; $(CC) -o up/$@~ $(SHLIBLDFLAGS) -Wl,-soname,$$SONAME solist $(REQUIREDLIBS)); \ @@\
++		$(RM) $$SONAME; $(LN) $@ $$SONAME; \			@@\
++		LinkBuildSonameLibrary($$SONAME)			@@\
+ 	$(RM) $@ 							@@\
+ 	$(MV) $@~ $@							@@\
++	@if $(SOSYMLINK); then (set -x; \				@@\
++	  $(RM) Concat(lib,libname.so); \				@@\
++	  $(LN) $@ Concat(lib,libname.so)); fi				@@\
+ 	LinkBuildLibrary($@)						@@\
++	LinkBuildLibraryMaybe(Concat(lib,libname.so),$(SOSYMLINK))	@@\
+ 									@@\
+ clean::									@@\
+-	$(RM) Concat(lib,libname.so.rev)				@@\
+-									@@\
+-PureCleanSharedLibrary(libname,rev)
++	@MAJREV=`echo rev | sed 's/\([0-9]*\)\(\.[0-9]*\)\{1,2\}/\1/'`; \	@@\
++	set -x; $(RM) Concat(lib,libname.so.$$MAJREV)			@@\
++	$(RM) Concat(lib,libname.so.rev) Concat(lib,libname.so)
++
+ #endif /* SharedDepLibraryTarget */
+ 
+ /*
+- * SharedLibraryDataTarget - generate rules to create shlib data file;
++ * SharedDepCplusplusLibraryTarget - generate rules to create a shared library.
+  */
+-#ifndef SharedLibraryDataTarget
+-#define SharedLibraryDataTarget(libname,rev,salist)			@@\
+-AllTarget(Concat(lib,libname.sa.rev))					@@\
++#ifndef SharedDepCplusplusLibraryTarget
++#define SharedDepCplusplusLibraryTarget(libname,rev,deplist,solist,down,up) @@\
++AllTarget(Concat(lib,libname.so.rev))					@@\
+ 									@@\
+-Concat(lib,libname.sa.rev):  salist					@@\
+-	$(RM) $@							@@\
+-	$(AR) $@ salist							@@\
+-	RanLibrary($@)							@@\
++Concat(lib,libname.so.rev):  deplist $(EXTRALIBRARYDEPS)		@@\
++	$(RM) $@~							@@\
++	@SONAME=`echo $@ | sed 's/\(lib[^\.]*\.so\.[0-9]*\)\(\.[0-9]*\)\{1,2\}/\1/'`; set -x; \		@@\
++		(cd down; $(CXX) -o up/$@~ $(SHLIBLDFLAGS) -Wl,-soname,$$SONAME solist $(REQUIREDLIBS)); \ @@\
++		$(RM) $$SONAME; $(LN) $@ $$SONAME; \			@@\
++		LinkBuildSonameLibrary($$SONAME)			@@\
++	$(RM) $@ 							@@\
++	$(MV) $@~ $@							@@\
++	@if $(SOSYMLINK); then (set -x; \				@@\
++	  $(RM) Concat(lib,libname.so); \				@@\
++	  $(LN) $@ Concat(lib,libname.so)); fi				@@\
+ 	LinkBuildLibrary($@)						@@\
++	LinkBuildLibraryMaybe(Concat(lib,libname.so),$(SOSYMLINK))	@@\
+ 									@@\
+ clean::									@@\
+-	$(RM) Concat(lib,libname.sa.rev)
+-#endif /* SharedLibraryDataTarget */
++	@MAJREV=`echo rev | sed 's/\([0-9]*\)\(\.[0-9]*\)\{1,2\}/\1/'`; \	@@\
++	set -x; $(RM) Concat(lib,libname.so.$$MAJREV)			@@\
++	$(RM) Concat(lib,libname.so.rev) Concat(lib,libname.so)
++
++#endif /* SharedDepCplusplusLibraryTarget */
++
++# ifndef SharedDepModuleTarget
++#  define SharedDepModuleTarget(name,deps,solist)			@@\
++AllTarget(name)								@@\
++									@@\
++name: deps								@@\
++	$(RM) $@~							@@\
++	$(CC) -o $@~ $(SHLIBLDFLAGS) solist $(REQUIREDLIBS) @@\
++	$(RM) $@							@@\
++	$(MV) $@~ $@							@@\
++									@@\
++clean::									@@\
++	$(RM) name
++
++# endif /* SharedDepModuleTarget */
++
++# ifndef SharedDriModuleTarget
++#  define SharedDriModuleTarget(name,deps,solist)			@@\
++AllTarget(name)								@@\
++									@@\
++name: deps								@@\
++	$(RM) $@~ $@.map						@@\
++	@(echo 'DRI_MODULE { global: __dri*; local: *; };' > $@.map)	@@\
++	$(CC) -o $@~ -Wl,--version-script=$@.map $(SHLIBLDFLAGS) solist $(REQUIREDLIBS) @@\
++	$(RM) $@ $@.map							@@\
++	$(MV) $@~ $@							@@\
++									@@\
++clean::									@@\
++	$(RM) name							@@\
++	$(RM) name.map
++
++# endif /* SharedDriModuleTarget */
++
++/*
++ * SharedLibraryDataTarget - generate rules to create shlib data file;
++ */
++# ifndef SharedLibraryDataTarget
++#  define SharedLibraryDataTarget(libname,rev,salist)
++# endif /* SharedLibraryTarget */
++
+--- sunLib.tmpl.orig	2008-12-18 13:43:14.856762538 +0100
++++ sunLib.tmpl	2008-12-18 13:53:25.489781023 +0100
+@@ -7,252 +7,71 @@
+ 
+ XCOMM $XFree86: xc/config/cf/sunLib.tmpl,v 3.12tsi Exp $
+ 
+-/*
+- * SunOS shared library template
+- */
+-
+-#if OSMajorVersion <= 4
+-
+-# if SunPost411FCSLd
+-#  define SharedXmuReqs $(LDPRELIBS) $(XTOOLLIB) $(XLIB)
+-#  define SharedXrenderReqs $(LDPRELIB) $(XLIB)
+-# endif
+-
+-#ifndef SharedX11Rev
+-#define SharedX11Rev 4.30
+-#endif
+-#ifndef SharedOldXRev
+-#define SharedOldXRev 4.20
+-#endif
+-#ifndef SharedXtRev
+-#define SharedXtRev 4.20
+-#endif
+-#ifndef SharedXawRev
+-#define SharedXawRev 6.10
+-#endif
+-#ifndef SharedXmuRev
+-#define SharedXmuRev 4.20
+-#endif
+-#ifndef SharedXextRev
+-#define SharedXextRev 4.50
+-#endif
+-#ifndef SharedXiRev
+-#define SharedXiRev 4.20
+-#endif
+-#ifndef SharedXtstRev
+-#define SharedXtstRev 1.20
+-#endif
+-
+-#else				/* else it's Solaris */
+-
+-/* Solaris uses single digit library versions, and versions of libraries
+- * defined in SVID specs should match the versions specified there.
+- */
+-
+-#ifndef SharedX11Rev
+-# define SharedX11Rev 4
+-#endif
+-#ifndef SharedOldXRev
+-# define SharedOldXRev 6
+-#endif
+-#ifndef SharedXextRev
+-# define SharedXextRev 0
+-#endif
+-#ifndef SharedXauRev
+-# define SharedXauRev 6
+-#endif
+-#ifndef SharedXdmcpRev
+-# define SharedXdmcpRev 6
+-#endif
+-#ifndef SharedXmuRev
+-# define SharedXmuRev 4
+-#endif
+-#ifndef SharedXmuuRev
+-# define SharedXmuuRev 1
+-#endif
+-#ifndef SharedXpRev
+-# define SharedXpRev 1
+-#endif
+-#ifndef SharedXpmRev
+-# define SharedXpmRev 4
+-#endif
+-#ifndef SharedXtRev
+-# define SharedXtRev 4
+-#endif
+-#ifndef SharedXaw6Rev
+-# define SharedXaw6Rev 5
+-#endif
+-#ifndef SharedXiRev
+-# define SharedXiRev 5
+-#endif
+-#ifndef SharedXtstRev
+-# define SharedXtstRev 1
+-#endif
+-#ifndef SharedFSRev
+-# define SharedFSRev 5
+-#endif
+-#ifndef SharedICERev
+-# define SharedICERev 6
+-#endif
+-#ifndef SharedSMRev
+-# define SharedSMRev 6
+-#endif
+-#ifndef SharedXcursor
+-# define SharedXcursorRev 1
+-#endif
+-#ifndef SharedXdamageRev
+-# define SharedXdamageRev 1
+-#endif
+-#ifndef SharedXevieRev
+-# define SharedXevieRev 1
+-#endif
+-#ifndef SharedXfixesRev
+-# define SharedXfixesRev 1
+-#endif
+-#ifndef SharedXftRev
+-# define SharedXftRev 2
+-#endif
+-#ifndef SharedXineramaRev
+-# define SharedXineramaRev 1
+-#endif
+-#ifndef SharedXrenderRev
+-# define SharedXrenderRev 1
+-#endif
+-#ifndef SharedXResRev
+-# define SharedXResRev 1
+-#endif
+-#ifndef SharedXvRev
+-# define SharedXvRev 1
+-#endif
+-#ifndef SharedXvMCRev
+-# define SharedXvMCRev 1
+-#endif
+-#ifndef SharedXrandrRev
+-# define SharedXrandrRev 2
+-#endif
+-#ifndef SharedXssRev
+-# define SharedXssRev 1
+-#endif
+-#ifndef SharedFontconfigRev
+-# define SharedFontconfigRev 1
+-#endif
+-#ifndef SharedGlxRev
+-# define SharedGlxRev 1
+-#endif
+-#ifndef SharedGluRev
+-# define SharedGluRev 1
+-#endif
+-#ifndef SharedGLwRev
+-# define SharedGLwRev 1
+-#endif
+-#ifndef SharedOSMesaRev
+-# define SharedOSMesaRev 4
+-#endif
+-#ifndef SharedxkbfileRev
+-# define SharedxkbfileRev 5
+-#endif
+-#ifndef SharedXxf86miscRev
+-# define SharedXxf86miscRev 1
+-#endif
+-#ifndef SharedXxf86vmRev
+-# define SharedXxf86vmRev 1
+-#endif
+-
+-# if ThreadedX
+-#  if OSMinorVersion > 3
+-#   define SharedThreadReqs /**/
+-#  endif
+-# endif
+-
+-# define SharedX11Reqs $(LDPRELIB) SharedThreadReqs $(EXTRA_LIBRARIES) -lc DlLibrary
+-# define SharedXlibi18nReqs $(LDPRELIB) $(XLIBONLY) -lc
+-# define SharedOldXReqs $(LDPRELIB) $(XLIBONLY) -lc
+-# define SharedXtReqs $(LDPRELIB) $(XLIBONLY) $(SMLIB) $(ICELIB) -lc
+-# define SharedXawReqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(EXTRAXAWREQS) $(XLIB) -lc
+-# define SharedXaw7Reqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(XLIB) -lc
+-# define SharedXaw6Reqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XLIB) -lc
+-# define SharedXmuReqs $(LDPRELIB) $(XTOOLLIB) $(XLIB) -lnsl -lc
+-# define SharedXmuuReqs $(LDPRELIB) $(XLIBONLY) -lc
+-# define SharedXextReqs $(LDPRELIB) $(XLIBONLY) -lc
+-# define SharedXiReqs $(LDPRELIB) $(XLIB) -lc
+-# define SharedXtstReqs $(LDPRELIB) $(XLIB) -lc
+-# define SharedFSReqs $(EXTRA_LIBRARIES) -lc
+-# define SharedICEReqs $(EXTRA_LIBRARIES) -lc
+-# define SharedSMReqs $(LDPRELIB) $(ICELIB) $(EXTRA_LIBRARIES) -lc
+-# define SharedXineramaReqs $(LDPRELIB) $(XLIB) -lc
+-# define SharedXpReqs $(LDPRELIB) $(XLIB) -lc
+-# define SharedXpmReqs $(LDPRELIB) $(XLIBONLY) -lc
+-# define SharedXResReqs $(LDPRELIB) $(XLIB) -lc
+-# define SharedXrenderReqs $(LDPRELIB) $(XLIBONLY) -lc
+-# define SharedXrandrReqs  $(LDPRELIB) $(XRENDERLIB) $(XLIB) -lc
+-# define SharedXssReqs $(LDPRELIB) $(XLIB) -lc
+-# define SharedXvReqs $(LDPRELIB) $(XLIB) -lc
+-# define SharedXvMCReqs $(LDPRELIB) $(XLIB) -lc
+-# define SharedXfontReqs $(LDPRELIB) $(FREETYPE2LIB) GzipLibrary -lsocket MathLibrary -lc
+-# define SharedXfontcacheReqs $(LDPRELIB) $(XLIB)
+-# define SharedFontencReqs $(LDPRELIB) GzipLibrary -lc
+-# define SharedXxf86dgaReqs $(LDPRELIB) $(XLIB) -lc
+-# define SharedXxf86miscReqs $(LDPRELIB) $(XLIB) -lc
+-# define SharedXxf86vmReqs $(LDPRELIB) $(XLIB) -lc
+-# define SharedDPSReqs $(LDPRELIB) $(SMLIB) $(ICELIB) $(XTOOLLIB) $(XLIBONLY) $(EXTRA_LIBRARIES) -lc
+-# define SharedDPSTKReqs $(LDPRELIB) $(SMLIB) $(ICELIB) $(XTOOLLIB) $(DPSLIB) $(XLIBONLY) -lc
+-# define SharedPSResReqs -lc
+-# define SharedGLReqs $(LDPRELIB) $(XLIB) -lc
+-# define SharedGLUReqs $(LDPRELIBS) $(XLIB) $(GLXLIB) $(CXXLIB) MathLibrary -lc
+-# define SharedGLwReqs $(LDPRELIBS) $(MOTIFLIB) $(GLXLIB) $(XTOOLLIB) $(XLIB)
+-# define SharedOSMesaReqs $(LDPRELIB) $(XLIB) $(GLXLIB) MathLibrary -lc
+-# define SharedxkbfileReqs $(LDPRELIB) $(XONLYLIB) -lc
+-# define SharedxkbuiReqs $(LDPRELIB) $(XKBFILELIB) $(XONLYLIB) MathLibrary -lc
+-# define SharedXfixesReqs $(LDPRELIB) $(XLIB) -lc
+-# define SharedXdamageReqs $(LDPRELIB) $(XLIB) -lc
+-# define SharedXauReqs -lc
+-# define SharedXdmcpReqs -lsocket -lc
+-# define SharedXcompositeReqs $(LDPRELIB) $(XDAMAGELIB) $(XFIXESLIB) $(XLIB) -lc
+-# define SharedXcursorReqs $(LDPRELIB) $(XRENDERLIB) $(XONLYLIB) -lc
+-# define SharedXevieReqs $(LDPRELIB) $(XLIB)
+-
+-# define FixupLibReferences() /**/
+-
+-# define SharedPamReqs DlLibrary
+-# define SharedPamUnixReqs $(LDPRELIBS) -lpam $(LDPOSTLIBS) -lnsl -lmp -lcmd SharedThreadReqs
+-# define SharedPamSampleReqs $(LDPRELIBS) -lpam $(LDPOSTLIBS) SharedThreadReqs
+-# define SharedPamDialAuthReqs $(LDPRELIBS) -lpam $(LDPOSTLIBS) SharedThreadReqs
+-# define SharedPamRhostsAuthReqs $(LDPRELIBS) -lpam $(LDPOSTLIBS) -lsocket SharedThreadReqs
+-# define SharedPamDceAuthReqs $(LDPRELIBS) -lpam $(LDPOSTLIBS) -ldce -lnsl -lsocket SharedThreadReqs
+-# define SharedTtReqs -lnsl -lsocket -lintl DlLibrary -lc -lw
+-# define SharedDtSvcReqs $(LDPRELIBS) $(TTLIB) $(XMLIB) $(XTOOLLIB) $(XPLIB) $(XLIB) $(LDPOSTLIBS) SharedThreadReqs -lgen -lc -lsocket -lnsl DlLibrary
+-# define SharedDtMmdbReqs $(LDPRELIBS) $(DTSVCLIB) $(TTLIB) $(XMLIB) $(XTOOLLIB) $(XPLIB) $(XLIB) $(LDPOSTLIBS) SharedThreadReqs -lgen -lc -lsocket -lnsl DlLibrary
+-# define SharedDtSearchReqs -lm -lc
+-# define SharedDtWidgetReqs $(LDPRELIBS) $(DTSVCLIB) $(XMLIB) -lintl $(LDPOSTLIBS) -lw -lm -lc
+-# define SharedDtHelpReqs $(LDPRELIBS) $(DTSVCLIB) $(XMLIB) $(XTOOLLIB) $(XPLIB) $(XLIB) $(LDPOSTLIBS) -lw -lgen -lm -lc
+-# define SharedDtPrintReqs $(LDPRELIBS) $(DTSVCLIB) $(DTHELPLIB) $(XMLIB) -lintl $(LDPOSTLIBS) -lw -lm -lc
+-# define SharedDtTermReqs SharedDtHelpReqs DlLibrary -lgen
+-# define SharedDtMrmReqs $(LDPRELIBS) $(DTTERMLIB) $(DTPRINTLIB) $(DTHELPLIB) $(DTWIDGETLIB) $(MRESOURCELIB) $(XMLIB) $(XTOOLLIB) $(XPLIB) $(XLIB) $(LDPOSTLIBS) -lw -lsocket -lnsl -lc
+-# define SharedDtMailReqs $(LDPRELIBS) -lw $(CXXLIB) -lm DlLibrary
+-# define SharedCsaReqs $(LDPRELIBS) $(DTSVCLIB) $(XMLIB) SharedXmReqs
+-
+-# define DtClientExtraLibs -lintl
+-
+-/* The inbuf paramter to iconv(3) is "const char**", not "char **" */
+-ICONV_INBUF_DEFINE = -DICONV_INBUF_CONST=const
+-
+-# if HasCplusplus
+-#  if HasGcc2ForCplusplus
+-UNSHARED_CXXLIB = -static -lC
+-#  elif HasSunCplusplus
+-#   if CplusplusCompilerMajorVersion > 3
+-#    ifdef CplusplusWhatdir
+-UNSHARED_CXXLIB = -Bstatic -L`CplusplusWhatdir CC`/../lib -lC -Bdynamic
+-#    else
+-UNSHARED_CXXLIB = -Bstatic -L/opt/SUNWspro/SC4.0/lib -lC -Bdynamic
+-#    endif
+-#   else
+-UNSHARED_CXXLIB = -Bstatic -lC -Bdynamic -lm -lc -Bstatic
+-#   endif
+-#  endif
+-# endif
+-
+-# define IafSysLib	/**/
+-# include <sv4Lib.tmpl>
++#ifndef FixupLibReferences
++#define FixupLibReferences()						@@\
++XMULIBONLY = -lXmu							@@\
++XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB)
++#endif
++
++#ifndef XawClientLibs
++#define XawClientLibs $(XAWLIB) $(XMULIBONLY) $(XTOOLLIB) $(XPMLIB) $(EXTRAXAWCLIENTLIBS) $(XLIB)
++#endif
++
++#define SharedX11Reqs
++#define SharedXlibi18nReqs $(LDPRELIB) $(XONLYLIB)
++#define SharedOldXReqs	  $(LDPRELIB) $(XONLYLIB)
++#define SharedXtReqs	  $(LDPRELIB) $(XONLYLIB) $(SMLIB) $(ICELIB)
++#define SharedXaw6Reqs	  $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XLIB)
++#define SharedXaw7Reqs	  $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(XLIB)
++#define SharedXawReqs	  $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(EXTRAXAWREQS) $(XLIB)
++#define SharedXmuReqs	  $(LDPRELIB) $(XTOOLLIB) $(XLIB)
++#define SharedXmuuReqs	  $(LDPRELIB) $(XONLYLIB)
++#define SharedXextReqs	  $(LDPRELIB) $(XONLYLIB)
++#define SharedXiReqs	  $(LDPRELIB) $(XLIB)
++#define SharedXpReqs	  $(LDPRELIB) $(XLIB)
++#define SharedXpmReqs	  $(LDPRELIB) $(XLIB)
++#define SharedXrandrReqs  $(LDPRELIB) $(XRENDERLIB) $(XLIB)
++#define SharedXrenderReqs $(LDPRELIB) $(XLIB)
++#define SharedXtstReqs	  $(LDPRELIB) $(XLIB)
++#define SharedXvReqs	  $(LDPRELIB) $(XLIB)
++#define SharedSMReqs	  $(LDPRELIB) $(ICELIB)
++#define SharedXcursorReqs $(LDPRELIB) $(XRENDERLIB) $(XLIB)
++#define SharedFontencReqs $(LDPRELIB) GzipLibrary
++
++#if GlxUseBuiltInDRIDriver
++#define ExtraSharedGLReqs /**/
++#else
++#define ExtraSharedGLReqs -ldl
++#endif
++#define SharedGLReqs	  $(LDPRELIB) $(XLIB) ExtraSharedGLReqs
++#ifndef SharedGLUReqs
++#define SharedGLUReqs	  $(LDPRELIB) $(XLIB) $(GLXLIB)
++#endif
++#define SharedDPSReqs	  $(LDPRELIB) $(SMLIB) $(ICELIB) $(XTOOLLIB) $(XLIB)
++#define SharedDPSTKReqs	  $(LDPRELIB) $(SMLIB) $(ICELIB) $(XTOOLLIB) $(DPSLIB) $(XLIB)
++#define SharedpsresReqs	  $(LDPRELIB) $(SMLIB) $(ICELIB) $(XTOOLLIB) $(XLIB)
++
++#define SharedXResReqs	  $(LDPRELIB) $(XLIB)
++#define SharedXfontcacheReqs	$(LDPRELIB) $(XLIB)
++#define SharedXineramaReqs	$(LDPRELIB) $(XLIB)
++#define SharedXssReqs	$(LDPRELIB) $(XLIB)
++#define SharedXvMCReqs	$(LDPRELIB) $(XLIB)
++#define SharedXxf86dgaReqs	$(LDPRELIB) $(XLIB)
++#define SharedXxf86miscReqs	$(LDPRELIB) $(XLIB)
++#define SharedXxf86vmReqs	$(LDPRELIB) $(XLIB)
++#define SharedxkbfileReqs	$(LDPRELIB) $(XONLYLIB)
++#define SharedxkbuiReqs $(LDPRELIB) $(XKBFILELIB) $(XONLYLIB)
++
++#ifndef SharedXReqs
++# define SharedXReqs $(XTOOLLIB) $(XPLIB) $(XLIB) $(LDPOSTLIBS)
++#endif
++
++#ifndef SharedXmReqs
++# define SharedXmReqs $(LDPRELIBS) SharedXReqs -lc
++#endif
+ 
++#ifndef SharedTtReqs
++# define SharedTtReqs $(LDPRELIBS) SharedXReqs $(CXXLIB)
+ #endif
++
++#define NoMessageCatalog
diff --git a/x11-misc/xorg-cf-files/metadata.xml b/x11-misc/xorg-cf-files/metadata.xml
new file mode 100644
index 000000000000..01c4c004e735
--- /dev/null
+++ b/x11-misc/xorg-cf-files/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>x11</herd>
+</pkgmetadata>
diff --git a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.4-r1.ebuild b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.4-r1.ebuild
new file mode 100644
index 000000000000..a640f2faa619
--- /dev/null
+++ b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.4-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit xorg-2
+
+DESCRIPTION="Old Imake-related build files"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.0.2-solaris-prefix.patch
+)
+
+src_install() {
+	xorg-2_src_install
+	echo "#define ManDirectoryRoot ${EPREFIX}/usr/share/man" >> "${ED}"/usr/$(get_libdir)/X11/config/host.def
+	sed -i -e "s/LibDirName *lib$/LibDirName $(get_libdir)/" "${ED}"/usr/$(get_libdir)/X11/config/Imake.tmpl || die "failed libdir sed"
+	sed -i -e "s|LibDir Concat(ProjectRoot,/lib/X11)|LibDir Concat(ProjectRoot,/$(get_libdir)/X11)|" "${ED}"/usr/$(get_libdir)/X11/config/X11.tmpl || die "failed libdir sed"
+	sed -i -e "s|\(EtcX11Directory \)\(/etc/X11$\)|\1${EPREFIX}\2|" "${ED}"/usr/$(get_libdir)/X11/config/X11.tmpl || die "failed etcx11dir sed"
+	sed -i -e "/#  define Solaris64bitSubdir/d" "${ED}"/usr/$(get_libdir)/X11/config/sun.cf
+	sed -i -e 's/-DNOSTDHDRS//g' "${ED}"/usr/$(get_libdir)/X11/config/sun.cf
+
+	sed -r -i -e "s|LibDirName[[:space:]]+lib.*$|LibDirName $(get_libdir)|" "${ED}"/usr/$(get_libdir)/X11/config/linux.cf || die "failed libdir sed"
+	sed -r -i -e "s|SystemUsrLibDir[[:space:]]+/usr/lib.*$|SystemUsrLibDir /usr/$(get_libdir)|" "${ED}"/usr/$(get_libdir)/X11/config/linux.cf || die "failed libdir sed"
+	sed -r -i -e "s|TkLibDir[[:space:]]+/usr/lib.*$|TkLibDir /usr/$(get_libdir)|" "${ED}"/usr/$(get_libdir)/X11/config/linux.cf || die "failed libdir sed"
+}
diff --git a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.4.ebuild b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.4.ebuild
new file mode 100644
index 000000000000..de5f9564baa7
--- /dev/null
+++ b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.4.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=3
+
+inherit xorg-2
+
+DESCRIPTION="Old Imake-related build files"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.0.2-solaris-prefix.patch
+)
+
+src_install() {
+	xorg-2_src_install
+	echo "#define ManDirectoryRoot ${EPREFIX}/usr/share/man" >> ${ED}/usr/$(get_libdir)/X11/config/host.def
+	sed -i -e "s/LibDirName *lib$/LibDirName $(get_libdir)/" "${ED}"/usr/$(get_libdir)/X11/config/Imake.tmpl || die "failed libdir sed"
+	sed -i -e "s|LibDir Concat(ProjectRoot,/lib/X11)|LibDir Concat(ProjectRoot,/$(get_libdir)/X11)|" ${ED}/usr/$(get_libdir)/X11/config/X11.tmpl || die "failed libdir sed"
+	sed -i -e "s|\(EtcX11Directory \)\(/etc/X11$\)|\1${EPREFIX}\2|" ${ED}/usr/$(get_libdir)/X11/config/X11.tmpl || die "failed etcx11dir sed"
+	sed -i -e "/#  define Solaris64bitSubdir/d" ${ED}/usr/$(get_libdir)/X11/config/sun.cf
+	sed -i -e 's/-DNOSTDHDRS//g' ${ED}/usr/$(get_libdir)/X11/config/sun.cf
+}
diff --git a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.5.ebuild b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.5.ebuild
new file mode 100644
index 000000000000..12bb563a3106
--- /dev/null
+++ b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.5.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit xorg-2
+
+DESCRIPTION="Old Imake-related build files"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.0.2-solaris-prefix.patch
+)
+
+src_install() {
+	xorg-2_src_install
+	echo "#define ManDirectoryRoot ${EPREFIX}/usr/share/man" >> "${ED}"/usr/$(get_libdir)/X11/config/host.def
+	sed -i -e "s/LibDirName *lib$/LibDirName $(get_libdir)/" "${ED}"/usr/$(get_libdir)/X11/config/Imake.tmpl || die "failed libdir sed"
+	sed -i -e "s|LibDir Concat(ProjectRoot,/lib/X11)|LibDir Concat(ProjectRoot,/$(get_libdir)/X11)|" "${ED}"/usr/$(get_libdir)/X11/config/X11.tmpl || die "failed libdir sed"
+	sed -i -e "s|\(EtcX11Directory \)\(/etc/X11$\)|\1${EPREFIX}\2|" "${ED}"/usr/$(get_libdir)/X11/config/X11.tmpl || die "failed etcx11dir sed"
+	sed -i -e "/#  define Solaris64bitSubdir/d" "${ED}"/usr/$(get_libdir)/X11/config/sun.cf
+	sed -i -e 's/-DNOSTDHDRS//g' "${ED}"/usr/$(get_libdir)/X11/config/sun.cf
+
+	sed -r -i -e "s|LibDirName[[:space:]]+lib.*$|LibDirName $(get_libdir)|" "${ED}"/usr/$(get_libdir)/X11/config/linux.cf || die "failed libdir sed"
+	sed -r -i -e "s|SystemUsrLibDir[[:space:]]+/usr/lib.*$|SystemUsrLibDir /usr/$(get_libdir)|" "${ED}"/usr/$(get_libdir)/X11/config/linux.cf || die "failed libdir sed"
+	sed -r -i -e "s|TkLibDir[[:space:]]+/usr/lib.*$|TkLibDir /usr/$(get_libdir)|" "${ED}"/usr/$(get_libdir)/X11/config/linux.cf || die "failed libdir sed"
+}
diff --git a/x11-misc/xosview/Manifest b/x11-misc/xosview/Manifest
new file mode 100644
index 000000000000..8bf8b5e929c5
--- /dev/null
+++ b/x11-misc/xosview/Manifest
@@ -0,0 +1,3 @@
+DIST xosview-1.14.tar.gz 135178 SHA256 d2f8c0b9e25ad259d114963d64aa9d3c532398fcbbb4213f24a876a94fb23012 SHA512 0d3e2e17c000358183ca8438fef621d7ec10533171a7cf92db7ae9e9fc5e5dbde0dc81d82431e5b252322ba0d07b7917ec4462c1bc1364e17f12b1f0acaaf7e7 WHIRLPOOL e75e7caa439a768c85c850c419e8682e69e24cd3b89cb9f224ac6c0888f091b652c0b70109825d0ec5352b3b53abac2ed62871e78a4a8bcc7186eeeffd5c9129
+DIST xosview-1.15.tar.gz 135553 SHA256 cd43bfbada900db2b2709251c50e8fb9299c44758742cd76e324fed623d1de84 SHA512 dec560fe801bac713e92ffdf036ec3995c10d11621fd880c5314d69650fbc5a718bf17da1a68e60eddd97be7bded1fcb1f5bdf201bb18267d57b9fa2b42f0124 WHIRLPOOL c45eccd04564c6d32c7c9864069f39804c919e6ef438cfaedc71ee317c4d10c2cca9646cf35b816634a03df399baef22c918cfc537d35bd21f383bbed11ff43d
+DIST xosview-1.16.tar.gz 137097 SHA256 8e9e130d1bbb30b68419d12f0d74609c10eeed4d6c6a85f35d9941ea3c7b23a0 SHA512 f83cddebd260a5468110418172623d1367a50eeb69cdce63bff8e93a1908a2d6d860978f7d96eac700e238b270984df1802788400080ccd27ad76c964534e1c2 WHIRLPOOL 36ab8fa63f3bea4b8d87fbd4559fa1d7a8df47f25a558f80c25065b62e7b7c51121aa91604fed4c095fd7fae853cfe37c911710faef5b7f1d0de6e2db7816879
diff --git a/x11-misc/xosview/metadata.xml b/x11-misc/xosview/metadata.xml
new file mode 100644
index 000000000000..2518313f5241
--- /dev/null
+++ b/x11-misc/xosview/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+        <herd>desktop-misc</herd>
+</pkgmetadata>
diff --git a/x11-misc/xosview/xosview-1.14.ebuild b/x11-misc/xosview/xosview-1.14.ebuild
new file mode 100644
index 000000000000..3ff3262d81ea
--- /dev/null
+++ b/x11-misc/xosview/xosview-1.14.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="X11 operating system viewer"
+HOMEPAGE="http://www.pogo.org.uk/~mark/xosview/"
+SRC_URI="http://www.pogo.org.uk/~mark/${PN}/releases/${P}.tar.gz"
+
+LICENSE="GPL-2 BSD"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86"
+IUSE="suid"
+
+COMMON_DEPS="x11-libs/libX11
+	x11-libs/libXpm
+	x11-libs/libXt"
+RDEPEND="${COMMON_DEPS}
+	media-fonts/font-misc-misc"
+DEPEND="${COMMON_DEPS}
+	x11-proto/xproto"
+
+src_prepare() {
+	sed -e 's:lib/X11/app:share/X11/app:g' \
+		-i xosview.1 || die
+	tc-export CXX
+}
+
+src_compile() {
+	emake OPTFLAGS="${CXXFLAGS}"
+}
+
+src_install() {
+	dobin ${PN}
+	use suid && fperms 4755 /usr/bin/${PN}
+	insinto /usr/share/X11/app-defaults
+	newins Xdefaults XOsview
+	doman *.1
+	dodoc CHANGES README.linux TODO
+}
+
+pkg_postinst() {
+	if ! use suid ; then
+		ewarn "If you want to use serial meters ${PN} needs to be executed as root."
+		ewarn "Please see ${EPREFIX}/usr/share/doc/${PF}/README.linux for details."
+	fi
+}
diff --git a/x11-misc/xosview/xosview-1.15.ebuild b/x11-misc/xosview/xosview-1.15.ebuild
new file mode 100644
index 000000000000..363ea6cf59fb
--- /dev/null
+++ b/x11-misc/xosview/xosview-1.15.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="X11 operating system viewer"
+HOMEPAGE="http://www.pogo.org.uk/~mark/xosview/"
+SRC_URI="http://www.pogo.org.uk/~mark/${PN}/releases/${P}.tar.gz"
+
+LICENSE="GPL-2 BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="suid"
+
+COMMON_DEPS="x11-libs/libX11
+	x11-libs/libXpm
+	x11-libs/libXt"
+RDEPEND="${COMMON_DEPS}
+	media-fonts/font-misc-misc"
+DEPEND="${COMMON_DEPS}
+	x11-proto/xproto"
+
+src_prepare() {
+	sed -e 's:lib/X11/app:share/X11/app:g' \
+		-i xosview.1 || die
+	tc-export CXX
+}
+
+src_compile() {
+	emake OPTFLAGS=''
+}
+
+src_install() {
+	dobin ${PN}
+	use suid && fperms 4755 /usr/bin/${PN}
+	insinto /usr/share/X11/app-defaults
+	newins Xdefaults XOsview
+	doman *.1
+	dodoc CHANGES README.linux TODO
+}
+
+pkg_postinst() {
+	if ! use suid ; then
+		ewarn "If you want to use serial meters ${PN} needs to be executed as root."
+		ewarn "Please see ${EPREFIX}/usr/share/doc/${PF}/README.linux for details."
+	fi
+}
diff --git a/x11-misc/xosview/xosview-1.16.ebuild b/x11-misc/xosview/xosview-1.16.ebuild
new file mode 100644
index 000000000000..d622a2500b50
--- /dev/null
+++ b/x11-misc/xosview/xosview-1.16.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="X11 operating system viewer"
+HOMEPAGE="http://www.pogo.org.uk/~mark/xosview/"
+SRC_URI="http://www.pogo.org.uk/~mark/${PN}/releases/${P}.tar.gz"
+
+LICENSE="GPL-2 BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="suid"
+
+COMMON_DEPS="x11-libs/libX11
+	x11-libs/libXpm
+	x11-libs/libXt"
+RDEPEND="${COMMON_DEPS}
+	media-fonts/font-misc-misc"
+DEPEND="${COMMON_DEPS}
+	x11-proto/xproto"
+
+src_prepare() {
+	sed -i -e 's:lib/X11/app:share/X11/app:g' -i ${PN}.1 || die
+	sed -i -e "s:Git:${PV}:g" ${PN}.cc || die
+	tc-export CXX
+}
+
+src_compile() {
+	emake OPTFLAGS=''
+}
+
+src_install() {
+	dobin ${PN}
+	use suid && fperms 4755 /usr/bin/${PN}
+	insinto /usr/share/X11/app-defaults
+	newins Xdefaults XOsview
+	doman *.1
+	dodoc CHANGES README.linux TODO
+}
+
+pkg_postinst() {
+	if ! use suid ; then
+		ewarn "If you want to use serial meters ${PN} needs to be executed as root."
+		ewarn "Please see ${EPREFIX}/usr/share/doc/${PF}/README.linux for details."
+	fi
+}
diff --git a/x11-misc/xpad/Manifest b/x11-misc/xpad/Manifest
new file mode 100644
index 000000000000..ccda068ff603
--- /dev/null
+++ b/x11-misc/xpad/Manifest
@@ -0,0 +1 @@
+DIST xpad-4.2.tar.bz2 244275 SHA256 d51b0e5f813a790ca55c3a0390650cbe1c567407e0f224b8b23c6f49403ea813 SHA512 4d619c9198198f4380d37b29243b76069c0e036fd30d7c6e2aa9105e8b7b1e0520c0c35fbf71f6cbd58be4a8799ddb04602694971cb46f70789b732eaa4d59b7 WHIRLPOOL 69166df7b1dd9be00115a13e2b9dcdb17a2bc7926e285cf2a9aee1ade9e1bb0d3fd19fc98e4c131510aa4f66332394676fb083019e3c02a8a399b76919e499d5
diff --git a/x11-misc/xpad/files/xpad-4.1-glib_includes.patch b/x11-misc/xpad/files/xpad-4.1-glib_includes.patch
new file mode 100644
index 000000000000..752e9ca551a6
--- /dev/null
+++ b/x11-misc/xpad/files/xpad-4.1-glib_includes.patch
@@ -0,0 +1,14 @@
+Description: Don't directly include glib2 header files.
+Author: Kyrill Detinov <lazy.kent@opensuse.org>
+Index: src/xpad-undo.c
+===================================================================
+--- a/src/xpad-undo.c
++++ b/src/xpad-undo.c
+@@ -23,7 +23,6 @@ Foundation, Inc., 59 Temple Place, Suite
+ #include "../config.h"
+ #include <stdlib.h>
+ #include <glib.h>
+-#include <glib/glist.h>
+ #include "xpad-undo.h"
+ #include "xpad-text-buffer.h"
+ 
diff --git a/x11-misc/xpad/metadata.xml b/x11-misc/xpad/metadata.xml
new file mode 100644
index 000000000000..f16af1d84223
--- /dev/null
+++ b/x11-misc/xpad/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>desktop-misc</herd>
+	<upstream>
+		<remote-id type="launchpad">xpad</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-misc/xpad/xpad-4.2.ebuild b/x11-misc/xpad/xpad-4.2.ebuild
new file mode 100644
index 000000000000..9eee062d904e
--- /dev/null
+++ b/x11-misc/xpad/xpad-4.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils
+
+DESCRIPTION="a sticky note application for jotting down things to remember"
+HOMEPAGE="http://mterry.name/xpad"
+SRC_URI="http://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 ~arm ppc x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="
+	>=x11-libs/gtk+-2.12:2
+	>=dev-libs/glib-2.38:2
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/pango
+"
+DEPEND="
+	${RDEPEND}
+	>=dev-util/intltool-0.31
+	virtual/pkgconfig
+	sys-devel/gettext
+"
+
+DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
diff --git a/x11-misc/xplanet/Manifest b/x11-misc/xplanet/Manifest
new file mode 100644
index 000000000000..a78d4c37865e
--- /dev/null
+++ b/x11-misc/xplanet/Manifest
@@ -0,0 +1,2 @@
+DIST xplanet-1.2.2.tar.gz 1217169 SHA256 6f8f8c59b4d5d1dd5018ed4b1367e55f6296f0253596b7705f714a9b3ccdd3ca SHA512 1a5dbad62b79adce28239615e3a2fd00300fca085f9400f2735c5dc015f06c63e182ed0d78399324bf6049374f2c034e6026a4054f26c34e11024b956695a53f WHIRLPOOL 155f436b339e345dadabbf618d79ee6ee39ea039d51c245523e7e2fdd3c50e5148c10f25c75c1b287558ada1baf2ddbbf5a3a67deec543dcaa6239d47a6b93c1
+DIST xplanet-1.3.0.tar.gz 1227385 SHA256 44fb742bb93e5661ea8b11ccabcc12896693e051f3dd5083c9227224c416b442 SHA512 c9f0db21c457d0702f8b1fb6d632838f45e80ea45b9cade80d6ab0ae956fdca03cfeed9582548c69b349a354afc27308309656d7e06ac46bc416c3e1038f8efd WHIRLPOOL e4fe013eeef4868d28f8a53c194f54865dd4cf29137936eb609352fba4a3481e0a6db9664944cb67d9e7896b150b5e640c95136e6b9f33dc4810591316d0371a
diff --git a/x11-misc/xplanet/files/xplanet-1.3.0-giflib.patch b/x11-misc/xplanet/files/xplanet-1.3.0-giflib.patch
new file mode 100644
index 000000000000..193719ea2a3d
--- /dev/null
+++ b/x11-misc/xplanet/files/xplanet-1.3.0-giflib.patch
@@ -0,0 +1,741 @@
+Fixes from upstream SVN, to support giflib-4.2 and giflib-5.
+
+Index: src/libimage/gif.c
+===================================================================
+--- src/libimage/gif.c	(revision 184)
++++ src/libimage/gif.c	(revision 186)
+@@ -20,222 +20,581 @@
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <string.h>
+ 
+ #include <gif_lib.h>
+ 
+ /*
+-  A lot of this is based on the gif2rgb and rgb2gif codes in the libungif 
+-  distribution. 
++  Based on the gif2rgb and rgb2gif codes in the libgif distribution. 
+ */
+ 
+ int
+ read_gif(const char *filename, int *width, int *height, unsigned char **rgb)
+ {
+-    int interlace_offset[] = { 0, 4, 2, 1 };
+-    int interlace_jump[] = { 8, 8, 4, 2 };
+-    GifColorType *colormap;
+-    GifFileType *infile;
+-    GifRecordType record_type;
+-    GifRowType *buffer = NULL;
++    int	BackGround = 0;
++    /* The way Interlaced image should be read - offsets and
++       jumps... */
++    int InterlacedOffset[] = { 0, 4, 2, 1 }; 
++    int InterlacedJumps[] = { 8, 8, 4, 2 };
++    ColorMapObject *ColorMap;
+ 
+-    int i, j;
+-    int color_index;
+-    unsigned char *ptr = NULL;
++    int	i, j, Size, Row, Col, Width, Height, ExtCode, Count;
++    GifRecordType RecordType;
++    GifByteType *Extension;
++    GifRowType *ScreenBuffer;
+ 
+-    infile = DGifOpenFileName(filename);
++    GifRowType GifRow;
++    GifColorType *ColorMapEntry;
++    unsigned char *BufferP;
+ 
+-    if (infile == NULL)
++    GifFileType *GifFile;
++#if GIFLIB_MAJOR >= 5
++    GifFile = DGifOpenFileName(filename, NULL);
++#else
++    GifFile = DGifOpenFileName(filename);
++#endif
++    if (GifFile == NULL) {
++	fprintf(stderr, "Can't open GIF file %s\n", filename);
++	return(0);
++    }
++    /* (Following comment was probably written on a 286 running under DOS.)  */
++    /* Allocate the screen as vector of column of rows. We can't allocate the*/
++    /* whole screen at once, as this broken minded CPU can allocate up to    */
++    /* 64k at a time and our image can be bigger than that:		     */
++    /* Note this screen is device independent - it's the screen defined by   */
++    /* the GIF file parameters.						     */
++    if ((ScreenBuffer = (GifRowType *)
++	 malloc(GifFile->SHeight * sizeof(GifRowType))) == NULL)
+     {
+-        PrintGifError();
+-        return(0);
++	fprintf(stderr, "Failed to allocate memory required, aborted.");
++	return(0);
+     }
+ 
+-    do
++    Size = GifFile->SWidth * sizeof(GifPixelType);/* Size in bytes one row.*/
++    if ((ScreenBuffer[0] = (GifRowType) malloc(Size)) == NULL) /* First row. */
+     {
+-        if (DGifGetRecordType(infile, &record_type) == GIF_ERROR) 
+-        {
+-            PrintGifError();
+-            return(0);
++	fprintf(stderr, "Failed to allocate memory required, aborted.");
++	return(0);
++    }
++
++    for (i = 0; i < GifFile->SWidth; i++)  /* Set its color to BackGround. */
++	ScreenBuffer[0][i] = GifFile->SBackGroundColor;
++    for (i = 1; i < GifFile->SHeight; i++) {
++	/* Allocate the other rows, and set their color to background too: */
++	if ((ScreenBuffer[i] = (GifRowType) malloc(Size)) == NULL)
++	{
++	    fprintf(stderr, "Failed to allocate memory required, aborted.\n");
++	    return(0);
++	}
++
++	memcpy(ScreenBuffer[i], ScreenBuffer[0], Size);
++    }
++
++    /* Scan the content of the GIF file and load the image(s) in: */
++    do {
++	if (DGifGetRecordType(GifFile, &RecordType) == GIF_ERROR) {
++	    fprintf(stderr, "Can't read GIF file\n");
++	    return(0);
++	}
++	switch (RecordType) {
++	case IMAGE_DESC_RECORD_TYPE:
++	    if (DGifGetImageDesc(GifFile) == GIF_ERROR) {
++		return(0);
++	    }
++	    Row = GifFile->Image.Top; /* Image Position relative to Screen. */
++	    Col = GifFile->Image.Left;
++	    Width = GifFile->Image.Width;
++	    Height = GifFile->Image.Height;
++	    if (GifFile->Image.Left + GifFile->Image.Width > GifFile->SWidth ||
++		GifFile->Image.Top + GifFile->Image.Height > GifFile->SHeight) {
++		return(0);
++	    }
++	    if (GifFile->Image.Interlace) {
++		/* Need to perform 4 passes on the images: */
++		for (Count = i = 0; i < 4; i++)
++		    for (j = Row + InterlacedOffset[i]; j < Row + Height;
++			 j += InterlacedJumps[i]) {
++			if (DGifGetLine(GifFile, &ScreenBuffer[j][Col],
++					Width) == GIF_ERROR) {
++			    return(0);
++			}
++		    }
++	    }
++	    else {
++		for (i = 0; i < Height; i++) {
++		    if (DGifGetLine(GifFile, &ScreenBuffer[Row++][Col],
++				    Width) == GIF_ERROR) {
++			return(0);
++		    }
++		}
++	    }
++	    break;
++	case EXTENSION_RECORD_TYPE:
++	    /* Skip any extension blocks in file: */
++	    if (DGifGetExtension(GifFile, &ExtCode, &Extension) == GIF_ERROR) {
++		return(0);
++	    }
++	    while (Extension != NULL) {
++		if (DGifGetExtensionNext(GifFile, &Extension) == GIF_ERROR) {
++		    return(0);
++		}
++	    }
++	    break;
++	case TERMINATE_RECORD_TYPE:
++	    break;
++	default:		    /* Should be traps by DGifGetRecordType. */
++	    break;
++	}
++    } while (RecordType != TERMINATE_RECORD_TYPE);
++
++    /* Lets dump it - set the global variables required and do it: */
++    BackGround = GifFile->SBackGroundColor;
++    ColorMap = (GifFile->Image.ColorMap
++		? GifFile->Image.ColorMap
++		: GifFile->SColorMap);
++    if (ColorMap == NULL) {
++	fprintf(stderr, "Gif Image does not have a colormap\n");
++	return(0);
++    }
++
++    *width = GifFile->SWidth;
++    *height = GifFile->SHeight;
++
++    rgb[0] = malloc(3 * *width * *height);
++    if (rgb[0] == NULL)
++    {
++	fprintf(stderr, "Can't allocate memory for GIF file.\n");
++	return(0);
++    }
++
++    BufferP = rgb[0];
++    
++    for (i = 0; i < *height; i++) {
++	GifRow = ScreenBuffer[i];
++	for (j = 0; j < *width; j++) {
++	    ColorMapEntry = &ColorMap->Colors[GifRow[j]];
++	    *BufferP++ = ColorMapEntry->Red;
++	    *BufferP++ = ColorMapEntry->Green;
++	    *BufferP++ = ColorMapEntry->Blue;
++	}
++    }
++    
++    if (DGifCloseFile(GifFile) == GIF_ERROR) {
++	return(0);
++    }
++
++    return(1);
++}
++
++/* Make some variables global, so we could access them faster: */
++static int
++    ExpNumOfColors = 8,
++    ColorMapSize = 256;
++
++/******************************************************************************
++ * Code to quantize high resolution image into lower one. You may want to
++ * peek into the following article this code is based on:
++ * "Color Image Quantization for frame buffer Display", by Paul Heckbert
++ * SIGGRAPH 1982 page 297-307.
++ ******************************************************************************
++ * History:
++ * 5 Jan 90 - Version 1.0 by Gershon Elber.
++ *****************************************************************************/
++
++#define ABS(x)    ((x) > 0 ? (x) : (-(x)))
++
++#define COLOR_ARRAY_SIZE 32768
++#define BITS_PER_PRIM_COLOR 5
++#define MAX_PRIM_COLOR      0x1f
++
++static int SortRGBAxis;
++
++typedef struct QuantizedColorType {
++    GifByteType RGB[3];
++    GifByteType NewColorIndex;
++    long Count;
++    struct QuantizedColorType *Pnext;
++} QuantizedColorType;
++
++typedef struct NewColorMapType {
++    GifByteType RGBMin[3], RGBWidth[3];
++    unsigned int NumEntries; /* # of QuantizedColorType in linked list below */
++    unsigned long Count; /* Total number of pixels in all the entries */
++    QuantizedColorType *QuantizedColors;
++} NewColorMapType;
++
++static int SubdivColorMap(NewColorMapType * NewColorSubdiv,
++                          unsigned int ColorMapSize,
++                          unsigned int *NewColorMapSize);
++static int SortCmpRtn(const void *Entry1, const void *Entry2);
++
++/******************************************************************************
++ * Quantize high resolution image into lower one. Input image consists of a
++ * 2D array for each of the RGB colors with size Width by Height. There is no
++ * Color map for the input. Output is a quantized image with 2D array of
++ * indexes into the output color map.
++ *   Note input image can be 24 bits at the most (8 for red/green/blue) and
++ * the output has 256 colors at the most (256 entries in the color map.).
++ * ColorMapSize specifies size of color map up to 256 and will be updated to
++ * real size before returning.
++ *   Also non of the parameter are allocated by this routine.
++ *   This function returns GIF_OK if succesfull, GIF_ERROR otherwise.
++ ******************************************************************************/
++static int
++QuantizeBuffer(unsigned int Width,
++               unsigned int Height,
++               int *ColorMapSize,
++               GifByteType * RedInput,
++               GifByteType * GreenInput,
++               GifByteType * BlueInput,
++               GifByteType * OutputBuffer,
++               GifColorType * OutputColorMap) {
++
++    unsigned int Index, NumOfEntries;
++    int i, j, MaxRGBError[3];
++    unsigned int NewColorMapSize;
++    long Red, Green, Blue;
++    NewColorMapType NewColorSubdiv[256];
++    QuantizedColorType *ColorArrayEntries, *QuantizedColor;
++
++    ColorArrayEntries = (QuantizedColorType *)malloc(
++                           sizeof(QuantizedColorType) * COLOR_ARRAY_SIZE);
++    if (ColorArrayEntries == NULL) {
++        return GIF_ERROR;
++    }
++
++    for (i = 0; i < COLOR_ARRAY_SIZE; i++) {
++        ColorArrayEntries[i].RGB[0] = i >> (2 * BITS_PER_PRIM_COLOR);
++        ColorArrayEntries[i].RGB[1] = (i >> BITS_PER_PRIM_COLOR) &
++           MAX_PRIM_COLOR;
++        ColorArrayEntries[i].RGB[2] = i & MAX_PRIM_COLOR;
++        ColorArrayEntries[i].Count = 0;
++    }
++
++    /* Sample the colors and their distribution: */
++    for (i = 0; i < (int)(Width * Height); i++) {
++        Index = ((RedInput[i] >> (8 - BITS_PER_PRIM_COLOR)) <<
++                  (2 * BITS_PER_PRIM_COLOR)) +
++                ((GreenInput[i] >> (8 - BITS_PER_PRIM_COLOR)) <<
++                  BITS_PER_PRIM_COLOR) +
++                (BlueInput[i] >> (8 - BITS_PER_PRIM_COLOR));
++        ColorArrayEntries[Index].Count++;
++    }
++
++    /* Put all the colors in the first entry of the color map, and call the
++     * recursive subdivision process.  */
++    for (i = 0; i < 256; i++) {
++        NewColorSubdiv[i].QuantizedColors = NULL;
++        NewColorSubdiv[i].Count = NewColorSubdiv[i].NumEntries = 0;
++        for (j = 0; j < 3; j++) {
++            NewColorSubdiv[i].RGBMin[j] = 0;
++            NewColorSubdiv[i].RGBWidth[j] = 255;
+         }
++    }
+ 
+-        switch (record_type)
+-        {
+-        case IMAGE_DESC_RECORD_TYPE:
+-            if (DGifGetImageDesc(infile) == GIF_ERROR)
+-            {
+-                PrintGifError();
+-                return(0);
++    /* Find the non empty entries in the color table and chain them: */
++    for (i = 0; i < COLOR_ARRAY_SIZE; i++)
++        if (ColorArrayEntries[i].Count > 0)
++            break;
++    QuantizedColor = NewColorSubdiv[0].QuantizedColors = &ColorArrayEntries[i];
++    NumOfEntries = 1;
++    while (++i < COLOR_ARRAY_SIZE)
++        if (ColorArrayEntries[i].Count > 0) {
++            QuantizedColor->Pnext = &ColorArrayEntries[i];
++            QuantizedColor = &ColorArrayEntries[i];
++            NumOfEntries++;
++        }
++    QuantizedColor->Pnext = NULL;
++
++    NewColorSubdiv[0].NumEntries = NumOfEntries; /* Different sampled colors */
++    NewColorSubdiv[0].Count = ((long)Width) * Height; /* Pixels */
++    NewColorMapSize = 1;
++    if (SubdivColorMap(NewColorSubdiv, *ColorMapSize, &NewColorMapSize) !=
++       GIF_OK) {
++        free((char *)ColorArrayEntries);
++        return GIF_ERROR;
++    }
++    if (NewColorMapSize < *ColorMapSize) {
++        /* And clear rest of color map: */
++        for (i = NewColorMapSize; i < *ColorMapSize; i++)
++            OutputColorMap[i].Red = OutputColorMap[i].Green =
++                OutputColorMap[i].Blue = 0;
++    }
++
++    /* Average the colors in each entry to be the color to be used in the
++     * output color map, and plug it into the output color map itself. */
++    for (i = 0; i < NewColorMapSize; i++) {
++        if ((j = NewColorSubdiv[i].NumEntries) > 0) {
++            QuantizedColor = NewColorSubdiv[i].QuantizedColors;
++            Red = Green = Blue = 0;
++            while (QuantizedColor) {
++                QuantizedColor->NewColorIndex = i;
++                Red += QuantizedColor->RGB[0];
++                Green += QuantizedColor->RGB[1];
++                Blue += QuantizedColor->RGB[2];
++                QuantizedColor = QuantizedColor->Pnext;
+             }
++            OutputColorMap[i].Red = (Red << (8 - BITS_PER_PRIM_COLOR)) / j;
++            OutputColorMap[i].Green = (Green << (8 - BITS_PER_PRIM_COLOR)) / j;
++            OutputColorMap[i].Blue = (Blue << (8 - BITS_PER_PRIM_COLOR)) / j;
++        } else
++            fprintf(stderr,
++                    "Null entry in quantized color map - that's weird.\n");
++    }
+ 
+-            *width = infile->Image.Width;
+-            *height = infile->Image.Height;
++    /* Finally scan the input buffer again and put the mapped index in the
++     * output buffer.  */
++    MaxRGBError[0] = MaxRGBError[1] = MaxRGBError[2] = 0;
++    for (i = 0; i < (int)(Width * Height); i++) {
++        Index = ((RedInput[i] >> (8 - BITS_PER_PRIM_COLOR)) <<
++                 (2 * BITS_PER_PRIM_COLOR)) +
++                ((GreenInput[i] >> (8 - BITS_PER_PRIM_COLOR)) <<
++                 BITS_PER_PRIM_COLOR) +
++                (BlueInput[i] >> (8 - BITS_PER_PRIM_COLOR));
++        Index = ColorArrayEntries[Index].NewColorIndex;
++        OutputBuffer[i] = Index;
++        if (MaxRGBError[0] < ABS(OutputColorMap[Index].Red - RedInput[i]))
++            MaxRGBError[0] = ABS(OutputColorMap[Index].Red - RedInput[i]);
++        if (MaxRGBError[1] < ABS(OutputColorMap[Index].Green - GreenInput[i]))
++            MaxRGBError[1] = ABS(OutputColorMap[Index].Green - GreenInput[i]);
++        if (MaxRGBError[2] < ABS(OutputColorMap[Index].Blue - BlueInput[i]))
++            MaxRGBError[2] = ABS(OutputColorMap[Index].Blue - BlueInput[i]);
++    }
+ 
+-            buffer = malloc(*height * sizeof(GifRowType *));
+-            if (buffer == NULL)
+-            {
+-                fprintf(stderr, "Can't allocate memory for GIF file.\n");
+-                return(0);
+-            }
+-            
+-            for (i = 0; i < *height; i++) 
+-            {
+-                buffer[i] = malloc(*width * sizeof(GifPixelType));
+-                if (buffer[i] == NULL)
+-                {
+-                    fprintf(stderr, "Can't allocate memory for GIF line.\n");
+-                    return(0);
++    free((char *)ColorArrayEntries);
++
++    *ColorMapSize = NewColorMapSize;
++
++    return GIF_OK;
++}
++
++/******************************************************************************
++ * Routine to subdivide the RGB space recursively using median cut in each
++ * axes alternatingly until ColorMapSize different cubes exists.
++ * The biggest cube in one dimension is subdivide unless it has only one entry.
++ * Returns GIF_ERROR if failed, otherwise GIF_OK.
++ ******************************************************************************/
++static int
++SubdivColorMap(NewColorMapType * NewColorSubdiv,
++               unsigned int ColorMapSize,
++               unsigned int *NewColorMapSize) {
++
++    int MaxSize;
++    unsigned int i, j, Index = 0, NumEntries, MinColor, MaxColor;
++    long Sum, Count;
++    QuantizedColorType *QuantizedColor, **SortArray;
++
++    while (ColorMapSize > *NewColorMapSize) {
++        /* Find candidate for subdivision: */
++        MaxSize = -1;
++        for (i = 0; i < *NewColorMapSize; i++) {
++            for (j = 0; j < 3; j++) {
++                if ((((int)NewColorSubdiv[i].RGBWidth[j]) > MaxSize) &&
++                      (NewColorSubdiv[i].NumEntries > 1)) {
++                    MaxSize = NewColorSubdiv[i].RGBWidth[j];
++                    Index = i;
++                    SortRGBAxis = j;
+                 }
+             }
+-            
+-            if (infile->Image.Interlace)
+-            {
+-                for (i = 0; i < 4; i++)
+-                    for (j = interlace_offset[i]; j < *height; 
+-                         j += interlace_jump[i])
+-                        DGifGetLine(infile, buffer[j], *width);
+-            }
+-            else
+-            {
+-                for (i = 0; i < *height; i++)
+-                    DGifGetLine(infile, buffer[i], *width);
+-            }
+-            break;
+-        case EXTENSION_RECORD_TYPE:
+-        {
+-            /* Skip extension blocks */
+-            int ext_code;
+-            GifByteType *ext;
+-            if (DGifGetExtension(infile, &ext_code, &ext) == GIF_ERROR) 
+-            {
+-                PrintGifError();
+-                return(0);
+-            }
+-            while (ext != NULL) 
+-            {
+-                if (DGifGetExtensionNext(infile, &ext) == GIF_ERROR) 
+-                {
+-                    PrintGifError();
+-                    return(0);
+-                }
+-            }
+         }
+-        break;
+-        case TERMINATE_RECORD_TYPE:
+-            break;
+-        default:
+-            fprintf(stderr, "unknown record type in GIF file\n");
+-            break;
+-        }
+-    } while (record_type != TERMINATE_RECORD_TYPE);
+ 
+-    colormap = (infile->Image.ColorMap ? infile->Image.ColorMap->Colors
+-                : infile->SColorMap->Colors);
++        if (MaxSize == -1)
++            return GIF_OK;
+ 
+-    rgb[0] = malloc(3 * *width * *height);
+-    if (rgb[0] == NULL)
+-    {
+-        fprintf(stderr, "Can't allocate memory for GIF file.\n");
+-        return(0);
+-    }
++        /* Split the entry Index into two along the axis SortRGBAxis: */
+ 
+-    ptr = rgb[0];
++        /* Sort all elements in that entry along the given axis and split at
++         * the median.  */
++        SortArray = (QuantizedColorType **)malloc(
++                      sizeof(QuantizedColorType *) * 
++                      NewColorSubdiv[Index].NumEntries);
++        if (SortArray == NULL)
++            return GIF_ERROR;
++        for (j = 0, QuantizedColor = NewColorSubdiv[Index].QuantizedColors;
++             j < NewColorSubdiv[Index].NumEntries && QuantizedColor != NULL;
++             j++, QuantizedColor = QuantizedColor->Pnext)
++            SortArray[j] = QuantizedColor;
+ 
+-    for (j = 0; j < *height; j++)
+-    {
+-        for (i = 0; i < *width; i++)
+-        {
+-            color_index = (int) buffer[j][i];
+-            *ptr++ = (unsigned char) colormap[color_index].Red;
+-            *ptr++ = (unsigned char) colormap[color_index].Green;
+-            *ptr++ = (unsigned char) colormap[color_index].Blue;
++        qsort(SortArray, NewColorSubdiv[Index].NumEntries,
++              sizeof(QuantizedColorType *), SortCmpRtn);
++
++        /* Relink the sorted list into one: */
++        for (j = 0; j < NewColorSubdiv[Index].NumEntries - 1; j++)
++            SortArray[j]->Pnext = SortArray[j + 1];
++        SortArray[NewColorSubdiv[Index].NumEntries - 1]->Pnext = NULL;
++        NewColorSubdiv[Index].QuantizedColors = QuantizedColor = SortArray[0];
++        free((char *)SortArray);
++
++        /* Now simply add the Counts until we have half of the Count: */
++        Sum = NewColorSubdiv[Index].Count / 2 - QuantizedColor->Count;
++        NumEntries = 1;
++        Count = QuantizedColor->Count;
++        while (QuantizedColor->Pnext != NULL &&
++	       (Sum -= QuantizedColor->Pnext->Count) >= 0 &&
++               QuantizedColor->Pnext->Pnext != NULL) {
++            QuantizedColor = QuantizedColor->Pnext;
++            NumEntries++;
++            Count += QuantizedColor->Count;
+         }
+-        free(buffer[j]);
++        /* Save the values of the last color of the first half, and first
++         * of the second half so we can update the Bounding Boxes later.
++         * Also as the colors are quantized and the BBoxes are full 0..255,
++         * they need to be rescaled.
++         */
++        MaxColor = QuantizedColor->RGB[SortRGBAxis]; /* Max. of first half */
++	/* coverity[var_deref_op] */
++        MinColor = QuantizedColor->Pnext->RGB[SortRGBAxis]; /* of second */
++        MaxColor <<= (8 - BITS_PER_PRIM_COLOR);
++        MinColor <<= (8 - BITS_PER_PRIM_COLOR);
++
++        /* Partition right here: */
++        NewColorSubdiv[*NewColorMapSize].QuantizedColors =
++           QuantizedColor->Pnext;
++        QuantizedColor->Pnext = NULL;
++        NewColorSubdiv[*NewColorMapSize].Count = Count;
++        NewColorSubdiv[Index].Count -= Count;
++        NewColorSubdiv[*NewColorMapSize].NumEntries =
++           NewColorSubdiv[Index].NumEntries - NumEntries;
++        NewColorSubdiv[Index].NumEntries = NumEntries;
++        for (j = 0; j < 3; j++) {
++            NewColorSubdiv[*NewColorMapSize].RGBMin[j] =
++               NewColorSubdiv[Index].RGBMin[j];
++            NewColorSubdiv[*NewColorMapSize].RGBWidth[j] =
++               NewColorSubdiv[Index].RGBWidth[j];
++        }
++        NewColorSubdiv[*NewColorMapSize].RGBWidth[SortRGBAxis] =
++           NewColorSubdiv[*NewColorMapSize].RGBMin[SortRGBAxis] +
++           NewColorSubdiv[*NewColorMapSize].RGBWidth[SortRGBAxis] - MinColor;
++        NewColorSubdiv[*NewColorMapSize].RGBMin[SortRGBAxis] = MinColor;
++
++        NewColorSubdiv[Index].RGBWidth[SortRGBAxis] =
++           MaxColor - NewColorSubdiv[Index].RGBMin[SortRGBAxis];
++
++        (*NewColorMapSize)++;
+     }
+-    
+-    free(buffer);
+ 
+-    DGifCloseFile(infile);
+-    return(1);
++    return GIF_OK;
+ }
+ 
++/****************************************************************************
++ * Routine called by qsort to compare two entries.
++ ****************************************************************************/
++static int
++SortCmpRtn(const void *Entry1,
++           const void *Entry2) {
++
++    return (*((QuantizedColorType **) Entry1))->RGB[SortRGBAxis] -
++       (*((QuantizedColorType **) Entry2))->RGB[SortRGBAxis];
++}
++
++/******************************************************************************
++* Close output file (if open), and exit.
++******************************************************************************/
++static void QuitGifError(GifFileType *GifFile)
++{
++    fprintf(stderr, "Error writing GIF file\n");
++    if (GifFile != NULL) EGifCloseFile(GifFile);
++}
++
+ int 
+ write_gif(const char *filename, int width, int height, char *rgb)
+ {
+     int i;
+-    int colormap_size = 256;
+-    GifByteType *red, *green, *blue, *buffer, *ptr;
+-    GifFileType *outfile;
+-    ColorMapObject *colormap;
++    GifByteType *red, *green, *blue;
+ 
++    GifByteType *OutputBuffer = NULL;
++    ColorMapObject *OutputColorMap = NULL;
++
++    GifFileType *GifFile;
++    GifByteType *Ptr;
++
++    bool GifTestExistance = false;
++
++    ColorMapSize = 1 << ExpNumOfColors;
++
++#if GIFLIB_MAJOR >= 5
++    OutputColorMap = GifMakeMapObject(ColorMapSize, NULL);
++#else
++    OutputColorMap = MakeMapObject(ColorMapSize, NULL);
++#endif
++    
++    if (OutputColorMap == NULL ||
++	(OutputBuffer = (GifByteType *) malloc(width * height *
++					       sizeof(GifByteType))) == NULL)
++    {
++	fprintf(stderr,"Failed to allocate memory required, aborted.");
++	return(0);
++    }
++
+     red = malloc(width * height * sizeof(GifByteType));
+     green = malloc(width * height * sizeof(GifByteType));
+     blue = malloc(width * height * sizeof(GifByteType));
+-    buffer = malloc(width * height * sizeof(GifByteType));
+-
+-    if (red == NULL || green == NULL || blue == NULL || buffer == NULL)
++    if (red == NULL || green == NULL || blue == NULL)
+     {
+-        fprintf(stderr, "Can't allocate memory for GIF file.\n");
+-        return(0);
++	fprintf(stderr, "Can't allocate memory for GIF file.\n");
++	return(0);
+     }
+-
+-    colormap = MakeMapObject(colormap_size, NULL);
+-
+     for (i = 0; i < width * height; i++)
+     {
+-        red[i]   = (GifByteType) rgb[3*i  ];
+-        green[i] = (GifByteType) rgb[3*i+1];
+-        blue[i]  = (GifByteType) rgb[3*i+2];
++	red[i]   = (GifByteType) rgb[3*i  ];
++	green[i] = (GifByteType) rgb[3*i+1];
++	blue[i]  = (GifByteType) rgb[3*i+2];
+     }
+-  
+-    if (QuantizeBuffer(width, height, &colormap_size, red, green, blue,   
+-                       buffer, colormap->Colors) == GIF_ERROR)
++
++    if (QuantizeBuffer(width, height, &ColorMapSize,
++		       red, green, blue,
++		       OutputBuffer, OutputColorMap->Colors) == GIF_ERROR)
++
+     {
+-        PrintGifError();
+-        return(0);
++	QuitGifError(NULL);
++	return(0);
+     }
+ 
+     free(red);
+     free(green);
+     free(blue);
+ 
+-    outfile = EGifOpenFileName((char *) filename, FALSE);
+-    if (outfile == NULL)
++    Ptr = OutputBuffer;
++
++#if GIFLIB_MAJOR >= 5
++    GifFile = EGifOpenFileName(filename, GifTestExistance, NULL);
++#else
++    GifFile = EGifOpenFileName(filename, GifTestExistance);
++#endif
++    /* Open stdout for the output file: */
++    if (GifFile == NULL)
+     {
+-        PrintGifError();
+-        return(0);
++	QuitGifError(GifFile);
++	return(0);
+     }
+ 
+-    if (EGifPutScreenDesc(outfile, width, height, colormap_size, 0, colormap)
+-        == GIF_ERROR)
++    if (EGifPutScreenDesc(GifFile,
++			  width, height, ExpNumOfColors, 0,
++			  OutputColorMap) == GIF_ERROR ||
++	EGifPutImageDesc(GifFile,
++			 0, 0, width, height, false, NULL) == GIF_ERROR)
++
+     {
+-        PrintGifError();
+-        return(0);
++	QuitGifError(GifFile);
++	return(0);
+     }
+ 
+-    if (EGifPutImageDesc(outfile, 0, 0, width, height, FALSE, NULL)
+-        == GIF_ERROR)
+-    {
+-        PrintGifError();
+-        return(0);
++    for (i = 0; i < height; i++) {
++	if (EGifPutLine(GifFile, Ptr, width) == GIF_ERROR)
++
++	{
++	    QuitGifError(GifFile);
++	    return(0);
++	}
++	Ptr += width;
+     }
+ 
+-    ptr = buffer;
+-    for (i = 0; i < height; i++)
++    if (EGifCloseFile(GifFile) == GIF_ERROR)
++
+     {
+-        if (EGifPutLine(outfile, ptr, width) == GIF_ERROR)
+-        {
+-            PrintGifError();
+-            return(0);
+-        }
+-        ptr += width;
++	QuitGifError(GifFile);
++	return(0);
+     }
+ 
+-    EGifSpew(outfile);
+-
+-    if (EGifCloseFile(outfile) == GIF_ERROR) 
+-        PrintGifError();
+-
+-    free(buffer);
+-
+     return(1);
+ }
diff --git a/x11-misc/xplanet/metadata.xml b/x11-misc/xplanet/metadata.xml
new file mode 100644
index 000000000000..a565416dca3c
--- /dev/null
+++ b/x11-misc/xplanet/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>desktop-misc</herd>
+	<upstream>
+		<remote-id type="sourceforge">xplanet</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-misc/xplanet/xplanet-1.2.2.ebuild b/x11-misc/xplanet/xplanet-1.2.2.ebuild
new file mode 100644
index 000000000000..de8744fba95b
--- /dev/null
+++ b/x11-misc/xplanet/xplanet-1.2.2.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+DESCRIPTION="Render images of the earth into the X root window"
+HOMEPAGE="http://xplanet.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~hppa ppc ppc64 ~sparc x86"
+IUSE="gif jpeg X truetype tiff png"
+
+RDEPEND="
+	X? (
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXScrnSaver
+		x11-libs/libXt )
+	gif? ( media-libs/giflib )
+	jpeg? ( virtual/jpeg )
+	png? (
+		media-libs/libpng:0
+		media-libs/netpbm )
+	tiff? ( media-libs/tiff:0 )
+	truetype? (
+		media-libs/freetype:2
+		x11-libs/pango )"
+DEPEND="${RDEPEND}
+	X? (
+	x11-proto/xproto
+	x11-proto/scrnsaverproto )"
+
+src_configure() {
+	local myconf
+
+	use X \
+		&& myconf="${myconf} --with-x --with-xscreensaver" \
+		|| myconf="${myconf} --with-x=no --with-xscreensaver=no"
+
+	use gif \
+		&& myconf="${myconf} --with-gif" \
+		|| myconf="${myconf} --with-gif=no"
+
+	use jpeg \
+		&& myconf="${myconf} --with-jpeg" \
+		|| myconf="${myconf} --with-jpeg=no"
+
+	use tiff \
+		&& myconf="${myconf} --with-tiff" \
+		|| myconf="${myconf} --with-tiff=no"
+
+	use png \
+		&& myconf="${myconf} --with-png --with-pnm" \
+		|| myconf="${myconf} --with-png=no --with-pnm=no"
+
+	use truetype \
+		&& myconf="${myconf} --with-freetype --with-pango" \
+		|| myconf="${myconf} --with-freetype=no --with-pango=no"
+
+	econf \
+		--with-cspice=no \
+		${myconf}
+}
diff --git a/x11-misc/xplanet/xplanet-1.3.0-r1.ebuild b/x11-misc/xplanet/xplanet-1.3.0-r1.ebuild
new file mode 100644
index 000000000000..978bfb7f59d4
--- /dev/null
+++ b/x11-misc/xplanet/xplanet-1.3.0-r1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit base flag-o-matic
+
+DESCRIPTION="Render images of the earth into the X root window"
+HOMEPAGE="http://xplanet.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="gif jpeg png tiff truetype X"
+
+RDEPEND="gif? ( >media-libs/giflib-4.2 )
+	jpeg? ( virtual/jpeg )
+	png? (
+		media-libs/libpng:0
+		media-libs/netpbm
+		)
+	tiff? ( media-libs/tiff:0 )
+	truetype? (
+		media-libs/freetype:2
+		x11-libs/pango
+		)
+	X? (
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXScrnSaver
+		x11-libs/libXt
+		)"
+DEPEND="${RDEPEND}
+	truetype? ( virtual/pkgconfig )
+	X? (
+		x11-proto/scrnsaverproto
+		x11-proto/xproto
+		)"
+
+DOCS="AUTHORS ChangeLog NEWS README TODO"
+
+PATCHES=( "${FILESDIR}"/xplanet-1.3.0-giflib.patch )
+
+src_configure() {
+	# econf says 'checking pnm.h presence... no'
+	use png && append-cppflags -I/usr/include/netpbm
+
+	local myconf
+
+	use X \
+		&& myconf+=" --with-x --with-xscreensaver" \
+		|| myconf+=" --with-x=no --with-xscreensaver=no"
+
+	use gif \
+		&& myconf+=" --with-gif" \
+		|| myconf+=" --with-gif=no"
+
+	use jpeg \
+		&& myconf+=" --with-jpeg" \
+		|| myconf+=" --with-jpeg=no"
+
+	use tiff \
+		&& myconf+=" --with-tiff" \
+		|| myconf+=" --with-tiff=no"
+
+	use png \
+		&& myconf+=" --with-png --with-pnm" \
+		|| myconf+=" --with-png=no --with-pnm=no"
+
+	use truetype \
+		&& myconf+=" --with-freetype --with-pango" \
+		|| myconf+=" --with-freetype=no --with-pango=no"
+
+	econf \
+		--with-cspice=no \
+		${myconf}
+}
diff --git a/x11-misc/xplanet/xplanet-1.3.0.ebuild b/x11-misc/xplanet/xplanet-1.3.0.ebuild
new file mode 100644
index 000000000000..03a11d7ee063
--- /dev/null
+++ b/x11-misc/xplanet/xplanet-1.3.0.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit base flag-o-matic
+
+DESCRIPTION="Render images of the earth into the X root window"
+HOMEPAGE="http://xplanet.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~hppa ppc ppc64 ~sparc x86"
+IUSE="gif jpeg png tiff truetype X"
+
+RDEPEND="gif? ( <media-libs/giflib-4.2 )
+	jpeg? ( virtual/jpeg )
+	png? (
+		media-libs/libpng:0
+		media-libs/netpbm
+		)
+	tiff? ( media-libs/tiff:0 )
+	truetype? (
+		media-libs/freetype:2
+		x11-libs/pango
+		)
+	X? (
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXScrnSaver
+		x11-libs/libXt
+		)"
+DEPEND="${RDEPEND}
+	truetype? ( virtual/pkgconfig )
+	X? (
+		x11-proto/scrnsaverproto
+		x11-proto/xproto
+		)"
+
+DOCS="AUTHORS ChangeLog NEWS README TODO"
+
+src_configure() {
+	# econf says 'checking pnm.h presence... no'
+	use png && append-cppflags -I/usr/include/netpbm
+
+	local myconf
+
+	use X \
+		&& myconf+=" --with-x --with-xscreensaver" \
+		|| myconf+=" --with-x=no --with-xscreensaver=no"
+
+	use gif \
+		&& myconf+=" --with-gif" \
+		|| myconf+=" --with-gif=no"
+
+	use jpeg \
+		&& myconf+=" --with-jpeg" \
+		|| myconf+=" --with-jpeg=no"
+
+	use tiff \
+		&& myconf+=" --with-tiff" \
+		|| myconf+=" --with-tiff=no"
+
+	use png \
+		&& myconf+=" --with-png --with-pnm" \
+		|| myconf+=" --with-png=no --with-pnm=no"
+
+	use truetype \
+		&& myconf+=" --with-freetype --with-pango" \
+		|| myconf+=" --with-freetype=no --with-pango=no"
+
+	econf \
+		--with-cspice=no \
+		${myconf}
+}
diff --git a/x11-misc/xplanetFX/Manifest b/x11-misc/xplanetFX/Manifest
new file mode 100644
index 000000000000..c6d44c6c5cfa
--- /dev/null
+++ b/x11-misc/xplanetFX/Manifest
@@ -0,0 +1 @@
+DIST xplanetfx-2.6.4_all.tar.gz 36871474 SHA256 0c7ea5783103f00867eecc1603e598b89fd52bd19954fd2976e3aa89390813ca SHA512 dd8a31d77dcf536be712239b73d185b19dde8bfe3ba3c3acdeb31ce1101e5d9c524c89a645cd737d824f44c6553d7bd2962c4bd2a7e2ac11f405e5828cfcac91 WHIRLPOOL 2cde850922e0c67e73c55dc104a1e4dca91da1cefe5bf79149e2818e3184af8d71d1436021e964957dd5bcc5b7d858326ea242d5a8158382628acde42ecd07c4
diff --git a/x11-misc/xplanetFX/files/xplanetFX-2.6.4-gentoo-path.patch b/x11-misc/xplanetFX/files/xplanetFX-2.6.4-gentoo-path.patch
new file mode 100644
index 000000000000..0777e076c831
--- /dev/null
+++ b/x11-misc/xplanetFX/files/xplanetFX-2.6.4-gentoo-path.patch
@@ -0,0 +1,42 @@
+diff -Naur usr.orig/bin/xplanetFX usr/bin/xplanetFX
+--- usr.orig/bin/xplanetFX	2015-03-05 19:58:41.000000000 +0100
++++ usr/bin/xplanetFX	2015-03-16 14:28:28.235256123 +0100
+@@ -115,7 +115,7 @@
+     WGETPROXY="-e use_proxy=on -e http_proxy="$PROXY
+ fi
+ 
+-if which gsed; then
++if which gsed > /dev/null 2>&1; then
+     SEDEXE='gsed'
+ else
+     SEDEXE='sed'
+diff -Naur usr.orig/share/xplanetFX/xplanetFX_gtk usr/share/xplanetFX/xplanetFX_gtk
+--- usr.orig/share/xplanetFX/xplanetFX_gtk	2015-02-17 16:55:12.000000000 +0100
++++ usr/share/xplanetFX/xplanetFX_gtk	2015-03-16 14:28:53.147271051 +0100
+@@ -44,10 +44,7 @@
+ 
+ gobject.threads_init()
+ 
+-basedir = os.path.dirname(os.path.realpath(__file__))
+-if not os.path.exists(os.path.join(basedir, "xplanetFX_gtk.py")):
+-    if os.path.exists(os.path.join(os.getcwd(), "xplanetFX_gtk.py")):
+-        basedir = os.getcwd()
++basedir = "/usr/share/xplanetFX"
+ sys.path.insert(0, basedir)
+ 
+ class GUI():
+diff -Naur usr.orig/share/xplanetFX/xplanetFX_tray usr/share/xplanetFX/xplanetFX_tray
+--- usr.orig/share/xplanetFX/xplanetFX_tray	2014-05-08 01:46:44.000000000 +0200
++++ usr/share/xplanetFX/xplanetFX_tray	2015-03-16 14:29:20.634287466 +0100
+@@ -27,10 +27,7 @@
+     
+ gobject.threads_init()
+ 
+-basedir = os.path.dirname(os.path.realpath(__file__))
+-if not os.path.exists(os.path.join(basedir, "xplanetFX_gtk.py")):
+-    if os.path.exists(os.path.join(os.getcwd(), "xplanetFX_gtk.py")):
+-        basedir = os.getcwd()
++basedir = "/usr/share/xplanetFX"
+ sys.path.insert(0, basedir)
+ 
+ 
diff --git a/x11-misc/xplanetFX/metadata.xml b/x11-misc/xplanetFX/metadata.xml
new file mode 100644
index 000000000000..a0e7a1f1bdfe
--- /dev/null
+++ b/x11-misc/xplanetFX/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>voyageur@gentoo.org</email>
+		<name>Bernard Cafarelli</name>
+	</maintainer>
+	<longdescription>Create high quality renderings of mother earth with realistic clouding and lighting effects as your desktop wallpaper with “realtime” capabilities.
+
+xplanet (by Hari Nair) is a great piece of software capable of creating renderings inside our solar system. To raise the quality of it’s output adding some graphical effects, it was a great candidate to link with imagemagick.
+
+The result is xplanetFX, a user-friendly piece of software to configure, run or daemonize xplanet with h/q capabilities to create wallpapers of mother earth on your desktop.
+
+More realistic maps and backgrounds and a sophisticated graphics handling produce nearly photo realistic images of our mothership. It’s GTK GUI makes it really easy to use and provides a lot of settings and a user friendly access to xplanetFX. And even the templating capabilities give xplanetFX an individual and stylish touch.</longdescription>
+</pkgmetadata>
diff --git a/x11-misc/xplanetFX/xplanetFX-2.6.4.ebuild b/x11-misc/xplanetFX/xplanetFX-2.6.4.ebuild
new file mode 100644
index 000000000000..c233273cae8f
--- /dev/null
+++ b/x11-misc/xplanetFX/xplanetFX-2.6.4.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils python-r1
+
+DESCRIPTION="User-friendly interface to configure, run or daemonize xplanet with HQ capabilities"
+HOMEPAGE="http://mein-neues-blog.de/xplanetFX/"
+SRC_URI="http://repository.mein-neues-blog.de:9000/archive/${P/FX/fx}_all.tar.gz"
+
+LICENSE="WTFPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libnotify"
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	dev-python/pygtk[${PYTHON_USEDEP}]
+	media-gfx/imagemagick
+	sys-devel/bc
+	x11-misc/xplanet
+	libnotify? ( x11-libs/libnotify )"
+#python
+
+S="${WORKDIR}/usr"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gentoo-path.patch
+	sed -e "s/Application;//" -i share/applications/*desktop || die
+
+	# These will be installed separately
+	mkdir gentoo || die
+	mv share/${PN}/{autostart,flipview.py,stars/catalog.py,xplanetFX_gtk,xplanetFX_tray} \
+		gentoo || die
+}
+
+src_install() {
+	dobin bin/${PN}
+	insinto /usr/share/applications
+	doins share/applications/${PN}.desktop
+	insinto /usr/share/pixmaps
+	doins share/pixmaps/*
+	insinto /usr/share/${PN}
+	doins -r share/${PN}/*
+
+	exeinto /usr/share/${PN}
+	doexe gentoo/autostart
+
+	dodoc share/doc/${PN}/{changelog,README}
+
+	python_scriptinto /usr/share/${PN}/stars
+	python_foreach_impl python_doscript gentoo/catalog.py
+	python_scriptinto /usr/share/${PN}
+	python_foreach_impl python_doscript gentoo/{xplanetFX_gtk,xplanetFX_tray}
+	python_foreach_impl python_domodule gentoo/flipview.py
+}
diff --git a/x11-misc/xrestop/Manifest b/x11-misc/xrestop/Manifest
new file mode 100644
index 000000000000..f0b6d926a85b
--- /dev/null
+++ b/x11-misc/xrestop/Manifest
@@ -0,0 +1 @@
+DIST xrestop-0.4.tar.gz 92308 SHA256 67c2fc94a7ecedbaae0d1837e82e93d1d98f4a6d759828860e552119af3ce257 SHA512 eb7bf2f3ab7b73708c96d56fd466cb362d711242dd46992fa3e693af2d26995e9baa91075eb445ef227e1342deec5e0e22b37139e80399e4051c9f5cad8fd9b6 WHIRLPOOL 87f3679b529728d4dc16fb5b93e0ef19908c9304bd540d8bc8b7b813da5d43668878592f056c8f849a21b7b7f6ab0c72503e9b0456fec3a1234894bf302b8c09
diff --git a/x11-misc/xrestop/files/xrestop-0.4-tinfo.patch b/x11-misc/xrestop/files/xrestop-0.4-tinfo.patch
new file mode 100644
index 000000000000..ef2de121e839
--- /dev/null
+++ b/x11-misc/xrestop/files/xrestop-0.4-tinfo.patch
@@ -0,0 +1,10 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -65,6 +65,7 @@
+ 
+ # check for ncurses, fall back to curses
+ AC_CHECK_LIB([ncurses], [initscr],,AC_CHECK_LIB([curses], [initscr]))
++AC_SEARCH_LIBS([stdscr], [tinfo])
+ 
+ if test "x$GCC" = "xyes"; then
+         GCC_WARNINGS="-Wall -fno-strict-aliasing"
diff --git a/x11-misc/xrestop/metadata.xml b/x11-misc/xrestop/metadata.xml
new file mode 100644
index 000000000000..2518313f5241
--- /dev/null
+++ b/x11-misc/xrestop/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+        <herd>desktop-misc</herd>
+</pkgmetadata>
diff --git a/x11-misc/xrestop/xrestop-0.4.ebuild b/x11-misc/xrestop/xrestop-0.4.ebuild
new file mode 100644
index 000000000000..1041aaba4afb
--- /dev/null
+++ b/x11-misc/xrestop/xrestop-0.4.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils
+
+DESCRIPTION="'Top' like statistics of X11 client's server side resource usage"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/xrestop"
+SRC_URI="http://projects.o-hand.com/sources/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ppc sparc x86 ~x86-fbsd"
+
+RDEPEND="
+	x11-libs/libX11
+	x11-libs/libXres
+	x11-libs/libXt
+"
+DEPEND="
+	${RDEPEND}
+	x11-proto/xproto
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-tinfo.patch
+	eautoreconf
+}
+
+DOCS=( AUTHORS ChangeLog NEWS README )
diff --git a/x11-misc/xrmap/Manifest b/x11-misc/xrmap/Manifest
new file mode 100644
index 000000000000..4294244dc699
--- /dev/null
+++ b/x11-misc/xrmap/Manifest
@@ -0,0 +1,7 @@
+DIST CIA_WDB2.jpd.gz 7391060 SHA256 6bd5c4dc9b31814fdd724563ad27a5a08484d2e8b4f410f8a3a6941491dc13e1 SHA512 bd17b556369e4b5b4882448888f7d6e4b2557eaf3ed649706f7e06b333cc16c15c556c122234eae6a37535df553aefbbafe326be0a352a3dea42c955d94ca63c WHIRLPOOL 78ff5eb17d294b2a9a2bc76315a00d4ee10e4e921eb76bbb481feab6193abd6f8569b61be22270e5b5edc89036006a8e5b16c37ffb89b935dc8606b56fe4c596
+DIST anthems-1.3.tar.bz2 204506 SHA256 69457f8834e004192884abdccfe4b46d75a08c8c7c5f8e8dae3efe46ef022662 SHA512 08be5ec1b7134214129753626210a6f1b7f644a5615cae33377bbd4bfe3f8ad6fd06874c9cf07d60012c27e30a8b30f713c427b10026e72d559f2008a37b9278 WHIRLPOOL 6c0dd0f804b0fb94ac829fa5ee55c691266cee98d1a4a1d38dbe0031b0e1151cffa707c087efdc334883e5d252e2fe26f1ae53930bd2df63b80624bacf63f9cd
+DIST earthdata_low_res.tar.bz2 8399634 SHA256 659b03d2e461de2d78315dc27a3ddbeb58b9aa434687dfa0920eefd645315de3 SHA512 c4b5d13e4b890ecb16e2f8f9622c0d9c2a4bb148c1dc6f1e3e0fa1987ccef1872727a31d94f5bc45b605c60ba4a21e341c438ce5fa3e6a7f57d69f47d483b6eb WHIRLPOOL 65d1ea801bf25fb98b3d354aa0fbb012ecc0cf546acdd7f0fdce8fe3ebc98c0149f2eb614f2019b56dac89738dec99ad93265f21a02d3fb59adbab08f849d037
+DIST factbook_html_2008.tar.bz2 42761187 SHA256 bd260ecbf2c2fac92486d2136d9a7fc4cee84e16ca658cee756977262aa45b0f SHA512 a501eb7f23310a48bacc40e8e37b451ec7fb87d129fb8839024898d16562130269eea930dac0626979e313ebe76f70dc077cda44c6f60374268439f0f8a93150 WHIRLPOOL 347a8ec4ccf1c5db8d5f98ecf346e3f854ca7930aba80492c2b25d3cff34af796d3613132f2644424efc12724419cfd47be1a80cf503c8d9f6d9fbd55da4bfc3
+DIST flags-2.9-xpm_150.tar.bz2 1248162 SHA256 e26cd5d66fe48949e00ffe492b89a06916a3cb1b07fd1d3f62eca8a042128b12 SHA512 fde4959bd702867d11745dc85af6a0fa19ab87f66938626292f657d9baa17a2ac444686a0c3db9090935ebe822ff0779c0de6457dbdb5fa08f1cb701e328875d WHIRLPOOL 414edfd7efc5113138ed00e58d40cbaef2c8ed31b9e92454262aa1dc19c5db7e5d1e326be34c6ff7f6efaff37122db9ee8fac1bff26d1d044c406eda5eff314d
+DIST hymns-1.4.tar.bz2 841330 SHA256 a2197d99bfe88be6bc728dda1160f58a8b8e5be0ce4ee94b886da35dd8754b0d SHA512 331147e18ee258ed4179986c96b919ce0e884c952291beacf76787380a8e0737ca2f8f2add5363e08f9687540ed3092d7172db28ca3bb5bf1456d19060ed49f6 WHIRLPOOL 6faef4996a4c447148b62abbe221d2ada3fa61b529bb9e3dac5e3464f6f0ef5a7671e03908e20c790228e572bf1e5f99e984880b77ac9bb969c67c4e326389d9
+DIST xrmap-2.33.tar.bz2 1224699 SHA256 120bb1544a7f375e2ed2ec036e7b170081a963b559c3b3b0b5eefe52f56c8440 SHA512 039f13f34b6c72f09858f381847c5f1eaa45d841688244491d0249f9cf74f3883edaa5498a908f12716892d703956272b3bea1b64bc7881306caa2fbaa601158 WHIRLPOOL bfc54ae6a1d8437671d75ab7a0a75107afcc9bb2bad1691b1dbcc982101aed3c36e1bc53299024572ac3b11a3fb8460e73f5e0224330795a335b5b15ccd626ab
diff --git a/x11-misc/xrmap/files/xrmap-2.33-Makefile.kit.patch b/x11-misc/xrmap/files/xrmap-2.33-Makefile.kit.patch
new file mode 100644
index 000000000000..9cf26c7551cb
--- /dev/null
+++ b/x11-misc/xrmap/files/xrmap-2.33-Makefile.kit.patch
@@ -0,0 +1,20 @@
+Index: xrmap-2.33/editkit/Makefile.kit
+===================================================================
+--- xrmap-2.33.orig/editkit/Makefile.kit
++++ xrmap-2.33/editkit/Makefile.kit
+@@ -15,13 +15,14 @@
+ 
+ SHAREDIR=/usr/share/editkit
+ 
+-CFLAGS = -O2 -fomit-frame-pointer -pipe -Wall -DTHREED -DGREEK -DJUSTIFY -DSHAREDIR="\"$(SHAREDIR)\""
++CFLAGS = -O2 -fomit-frame-pointer -pipe -Wall -DTHREED -DGREEK -DJUSTIFY -DSHAREDIR="\"$(SHAREDIR)\"" -DSHAREDIR="\"$(SHARE_DIR)\""
+ 
+ #CFLAGS = -O2 -fomit-frame-pointer -pipe -Wall -DMINIMAL -DTWOBUTN -DVERTCURS -DTLL
+ 
+ #CFLAGS = -g -pipe
+ 
+ TLIBS = -L/usr/lib -ltermcap
++TLIBS = -L/usr/lib -lcurses
+ XLIBS = -L/usr/X11R6/lib -lX11
+ 
+ # Use this for solaris
diff --git a/x11-misc/xrmap/files/xrmap-2.33-as-needed.patch b/x11-misc/xrmap/files/xrmap-2.33-as-needed.patch
new file mode 100644
index 000000000000..82f29f5e3e8a
--- /dev/null
+++ b/x11-misc/xrmap/files/xrmap-2.33-as-needed.patch
@@ -0,0 +1,13 @@
+Index: xrmap-2.33/Makefile.noimake
+===================================================================
+--- xrmap-2.33.orig/Makefile.noimake
++++ xrmap-2.33/Makefile.noimake
+@@ -20,7 +20,7 @@ LDOPTIONS=-O6 -g -Wall  -lXpm -lX11 -ljp
+ ## LDOPTIONS=-O6 -g -Wall libxpm/libXpm.a -lX11 -lz -lm -L/usr/X11R6/lib
+ 
+ all: explorer.o image.o xrmap.o
+-	gcc $(LDOPTIONS) -o xrmap explorer.o image.o xrmap.o
++	gcc -o xrmap explorer.o image.o xrmap.o $(LDOPTIONS)
+ 	cd editkit ; make -f Makefile.kit DESTDIR=$(DESTDIR)
+ 	cd earthview ; make DESTDIR=$(DESTDIR)	
+ 	@cat EXTRADATA
diff --git a/x11-misc/xrmap/files/xrmap-2.33-libpng15.patch b/x11-misc/xrmap/files/xrmap-2.33-libpng15.patch
new file mode 100644
index 000000000000..48cd29a430f2
--- /dev/null
+++ b/x11-misc/xrmap/files/xrmap-2.33-libpng15.patch
@@ -0,0 +1,10 @@
+--- image.c
++++ image.c
+@@ -18,6 +18,7 @@
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <zlib.h> /* gzFile */
+ #include <png.h>
+ #include <jpeglib.h>
+ 
diff --git a/x11-misc/xrmap/files/xrmap-2.33-parallel-make.patch b/x11-misc/xrmap/files/xrmap-2.33-parallel-make.patch
new file mode 100644
index 000000000000..64681c6c119a
--- /dev/null
+++ b/x11-misc/xrmap/files/xrmap-2.33-parallel-make.patch
@@ -0,0 +1,45 @@
+Parallel make fixes
+
+Patch by Kevin McCarthy <signals@gentoo.org>
+
+--- Makefile.noimake
++++ Makefile.noimake
+@@ -21,12 +21,12 @@
+ 
+ all: explorer.o image.o xrmap.o
+ 	gcc -o xrmap explorer.o image.o xrmap.o $(LDOPTIONS)
+-	cd editkit ; make -f Makefile.kit DESTDIR=$(DESTDIR)
+-	cd earthview ; make DESTDIR=$(DESTDIR)	
++	$(MAKE) -C editkit -f Makefile.kit DESTDIR=$(DESTDIR)
++	$(MAKE) -C earthview DESTDIR=$(DESTDIR)	
+ 	@cat EXTRADATA
+ 	
+ numdefs.h:
+-	cd tools ; make
++	$(MAKE) -C tools
+ 
+ explorer.o: xrmap.h version.h bitmaps.h numdefs.h menudefs.h xrmap.c
+ 	gcc $(CCOPTIONS) -c explorer.c
+--- tools/Makefile
++++ tools/Makefile
+@@ -3,16 +3,16 @@
+ 	./preproc > ../numdefs.h
+ 
+ locutils:
+-	cd locutils; make
++	$(MAKE) -C locutils
+ 
+ cbd2else:
+-	cd cbd2else; make
++	$(MAKE) -C cbd2else
+ 
+ jpd2else:
+-	cd jpd2else; make
++	$(MAKE) -C jpd2else
+ 
+ rez2else:
+-	cd rez2else; make
++	$(MAKE) -C rez2else
+ 
+ world: locutils cbd2else jpd2else rez2else
+ 
diff --git a/x11-misc/xrmap/files/xrmap-2.33-zlib.patch b/x11-misc/xrmap/files/xrmap-2.33-zlib.patch
new file mode 100644
index 000000000000..8b7301b7b61e
--- /dev/null
+++ b/x11-misc/xrmap/files/xrmap-2.33-zlib.patch
@@ -0,0 +1,20 @@
+--- xrmap-2.33.orig/earthview/earthview.c	2005-07-12 06:56:41.000000000 -0700
++++ xrmap-2.33/earthview/earthview.c	2013-12-27 15:59:14.068667773 -0800
+@@ -96,7 +96,7 @@
+ char *data_file = NULL;
+ char *cps_file, *cps_dir;
+ FILE *fd = NULL;
+-gzFile *gzd = NULL;
++gzFile gzd = NULL;
+ 
+ /* Predefined color schemes */
+ /* You can of course add as many as you like... */
+@@ -212,7 +212,7 @@
+     return n;
+ }
+ 
+-int ngzread(gzFile *gzd)
++int ngzread(gzFile gzd)
+ {
+ unsigned char c;
+ int n;
diff --git a/x11-misc/xrmap/metadata.xml b/x11-misc/xrmap/metadata.xml
new file mode 100644
index 000000000000..731225048652
--- /dev/null
+++ b/x11-misc/xrmap/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>desktop-misc</herd>
+</pkgmetadata>
diff --git a/x11-misc/xrmap/xrmap-2.33-r1.ebuild b/x11-misc/xrmap/xrmap-2.33-r1.ebuild
new file mode 100644
index 000000000000..35d63ebe0be3
--- /dev/null
+++ b/x11-misc/xrmap/xrmap-2.33-r1.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+inherit eutils toolchain-funcs
+
+FLAGS_VER=2.9
+ANTHEMS_VER=1.3
+HYMNS_VER=1.4
+FACTBOOK_VER=2008
+DESCRIPTION="a X client for generating images of the Earth and manipulating the CIA World data bank"
+HOMEPAGE="http://frmas.free.fr/li_1.htm#_Xrmap_"
+SRC_URI="ftp://ftp.ac-grenoble.fr/ge/geosciences/${PN}/${P}.tar.bz2
+		 ftp://ftp.ac-grenoble.fr/ge/geosciences/${PN}/data/factbook_html_${FACTBOOK_VER}.tar.bz2
+		 ftp://ftp.ac-grenoble.fr/ge/geosciences/${PN}/data/anthems-${ANTHEMS_VER}.tar.bz2
+		 ftp://ftp.ac-grenoble.fr/ge/geosciences/${PN}/data/flags-${FLAGS_VER}-xpm_150.tar.bz2
+		 ftp://ftp.ac-grenoble.fr/ge/geosciences/${PN}/data/hymns-${HYMNS_VER}.tar.bz2
+		 ftp://ftp.ac-grenoble.fr/ge/geosciences/${PN}/data/earthdata_low_res.tar.bz2
+		 ftp://ftp.ac-grenoble.fr/ge/geosciences/CIA_WDB2.jpd.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc x86"
+IUSE=""
+
+CDEPEND="x11-libs/libX11
+	x11-libs/libXpm
+	virtual/jpeg
+	>=media-libs/libpng-1.4
+	sys-libs/zlib"
+RDEPEND="${CDEPEND}
+	x11-misc/xdg-utils
+	app-text/gv
+	|| ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] )
+	sys-apps/less
+	media-sound/timidity++"
+DEPEND="${CDEPEND}
+	x11-proto/xproto
+	>=sys-apps/sed-4"
+
+pkg_setup() {
+	tc-export CC
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-Makefile.kit.patch \
+		"${FILESDIR}"/${P}-as-needed.patch \
+		"${FILESDIR}"/${P}-parallel-make.patch \
+		"${FILESDIR}"/${P}-libpng15.patch \
+		"${FILESDIR}"/${P}-zlib.patch
+
+	sed  -e 's,^\(X11DIR=\).*,\1/usr/,g' \
+		 -e 's,^\(EDITOR=\).*,\1less,g'   \
+		 -e 's,^\(SHAREDIR=\).*,\1/usr/share/xrmap,g' \
+		 -e 's,^\(CCOPTIONS=\)-O6 -g,\1${CFLAGS},g' \
+		 -e 's,^\(LDOPTIONS=\)-O6 -g,\1${LDFLAGS},g' \
+		 -e 's,gcc,$(CC),' \
+			Makefile.noimake > Makefile || die
+	sed -i 's,^\(#define DEFAULT_JPD_FILE \"/usr/share/\),\1x,g' \
+		tools/jpd2else/jpd2else.c || die
+	sed -i -e 's,^\(#define RCFILE \)SHAREDIR\",\1\"/etc/xrmap,g'  \
+		   -e 's,^\(#define SHAREDIR \"/usr/share/\),\1x,g' xrmap.h || die
+	# bug #323065
+	sed -i "/^image.o/s/image.o:/& numdefs.h/" Makefile || die
+	# Respect CFLAGS, LDFLAGS, CC
+	sed -i -e 's,cc,$(CC) $(CFLAGS) $(LDFLAGS),' tools/Makefile || die
+	sed -i -e 's,gcc,$(CC) $(CFLAGS) $(LDFLAGS),' \
+		tools/jpd2else/Makefile tools/cbd2else/Makefile \
+		earthview/Makefile editkit/Makefile.kit || die
+	# Fix implicit decl of strlen
+	sed -i -e '3 i #include <string.h>' tools/preproc.c || die
+	# Fix array subscript below bounds (Eliminates unnecessary cast to char)
+	sed -i -e '2495 s/(char)//' xrmap.c || die
+	# Fix datadir for earthview
+	sed -i -e 's,^DATADIR=.*$,DATADIR=/usr/share/xrmap/earthdata,' earthview/Makefile || die
+}
+
+src_compile() {
+	emake HTML_VIEWER="xdg-open" || die
+	emake -C tools || die
+	emake -C tools/jpd2else || die
+	emake -C tools/cbd2else || die
+}
+
+src_install() {
+	dobin xrmap tools/preproc tools/jpd2else/jpd2else tools/cbd2else/cbd2else \
+		earthview/earthview || die
+	dodir /etc/xrmap  || die
+	insinto /etc/xrmap
+	doins Xrmaprc  || die
+	dodoc CHANGES README TODO tools/cbd2else/README.cbd tools/jpd2else/README.jpd tools/rez2else/README.rez || die
+	newman xrmap.man xrmap.1 || die "newman failed"
+	mv "${WORKDIR}"/hymns-${HYMNS_VER} hymns || die
+	mv "${WORKDIR}"/anthems-${ANTHEMS_VER} anthems || die
+	dodir /usr/share/${PN}/ || die
+	insinto /usr/share/${PN}
+	doins -r i18n hymns anthems Locations pixmaps \
+		"${WORKDIR}"/{factbook,flags,earthdata,CIA_WDB2.jpd}  || die
+}
diff --git a/x11-misc/xrootconsole/Manifest b/x11-misc/xrootconsole/Manifest
new file mode 100644
index 000000000000..4f3b14d72721
--- /dev/null
+++ b/x11-misc/xrootconsole/Manifest
@@ -0,0 +1 @@
+DIST xrootconsole-0.6.tar.gz 15951 SHA256 8306de6f4d3f39677334ee65214e46729cf2dd89aeff1705df3c499738a4076d
diff --git a/x11-misc/xrootconsole/files/xrootconsole-0.4.parse-color.patch b/x11-misc/xrootconsole/files/xrootconsole-0.4.parse-color.patch
new file mode 100644
index 000000000000..78114de4df5b
--- /dev/null
+++ b/x11-misc/xrootconsole/files/xrootconsole-0.4.parse-color.patch
@@ -0,0 +1,23 @@
+diff -u xrootconsole-0.4/util.c xrootconsole-0.4.new/util.c
+--- xrootconsole-0.4/util.c	2000-10-10 04:17:53.000000000 +0200
++++ xrootconsole-0.4.new/util.c	2004-02-17 23:59:45.000000000 +0100
+@@ -53,16 +53,16 @@
+ 
+ 
+ unsigned long load_color(const char* s, Display *dpy) {
+-    XColor ce, cs;
++    XColor ce;
+     Colormap colormap = DefaultColormap(dpy, DefaultScreen(dpy));
+ 
+-    if (XLookupColor(dpy, colormap, s, &ce, &cs)) {
++    if (XParseColor(dpy, colormap, s, &ce)) {
+         if (XAllocColor(dpy, colormap, &ce)) return ce.pixel;
+ 	
+         fprintf(stderr, "Warning: could not allocate color\n");
+         return WhitePixel(dpy, DefaultScreen(dpy));
+     }
+ 
+-    fprintf(stderr, "Warning: could not lookup color\n");
++    fprintf(stderr, "Warning: could not parse color\n");
+     return WhitePixel(dpy, DefaultScreen(dpy));
+ }
diff --git a/x11-misc/xrootconsole/files/xrootconsole-0.6.makefile.patch b/x11-misc/xrootconsole/files/xrootconsole-0.6.makefile.patch
new file mode 100644
index 000000000000..37fd4fb074a9
--- /dev/null
+++ b/x11-misc/xrootconsole/files/xrootconsole-0.6.makefile.patch
@@ -0,0 +1,36 @@
+--- xrootconsole-0.6/Makefile.org	2004-02-20 22:53:28.000000000 +0100
++++ xrootconsole-0.6/Makefile	2010-02-08 12:01:11.000000000 +0100
+@@ -43,20 +43,16 @@
+             else echo Bleeding Edge Version; \
+         fi;)
+ 
+-CC = gcc
+-CPPFLAGS =
+-
+ # for production
+-CFLAGS = -O2 -DNDEBUG -Wall "-DXROOTCONSOLE_VERSION=\"$(VERSION)\"" \
+-    -I /usr/X11R6/include
+-LDFLAGS = -s
++CFLAGS += -DNDEBUG -Wall "-DXROOTCONSOLE_VERSION=\"$(VERSION)\"" \
++    $(shell pkg-config --cflags x11)
+ 
+ # for testing
+ #CFLAGS = -g -Wall "-DXROOTCONSOLE_VERSION=\"$(VERSION) (debug build)\"" \
+     -I /usr/X11R6/include
+ #LDFLAGS = 
+ 
+-LIBS = -L/usr/X11R6/lib -lX11 -lutil
++LIBS = $(shell pkg-config --libs x11) -lutil
+ 
+ OBJS = main.o util.o
+ 
+@@ -76,5 +72,7 @@
+ 	rm -f $(EXEC) *.o core *~
+ 
+ install: $(EXEC)
+-	cp $(EXEC) $(BINDIR)
+-	cp $(MANFILE) $(MANDIR)
++	install -d $(BINDIR)
++	install -d $(MANDIR)
++	install $(EXEC) $(BINDIR)
++	install $(MANFILE) $(MANDIR)
diff --git a/x11-misc/xrootconsole/files/xrootconsole-0.6.manpage.patch b/x11-misc/xrootconsole/files/xrootconsole-0.6.manpage.patch
new file mode 100644
index 000000000000..55718f222383
--- /dev/null
+++ b/x11-misc/xrootconsole/files/xrootconsole-0.6.manpage.patch
@@ -0,0 +1,22 @@
+--- xrootconsole.1.orig	2005-03-06 16:59:05.837673328 +0900
++++ xrootconsole.1	2005-03-06 17:04:36.493406016 +0900
+@@ -38,6 +38,9 @@
+ .Ar number
+ columns wide.  Text is written vertically down each column in the order in
+ which text is received from the input file.  The default is 1.
++.It Fl -solid
++This option makes the background a solid color.  The default is to use a
++shaded/transparent background.
+ .It Fl -topdown
+ Forces xrootconsole to display new lines from its input at the top of the
+ screen, scrolling previous lines down.  Default behavior is to insert new
+@@ -45,6 +48,9 @@
+ .It Fl -wrap
+ Rather than truncating long lines, this option specifies that xrootconsole
+ should wrap excess text to the following line or lines, as necessary.
++.It Fl -noversion
++Tells xrootconsole not to display its version as the first line of output in
++the root window.  Default behavior is to include version information.
+ .It Fl geometry Ar geometry
+ This option specifies the preferred size and position of the window; see
+ .Xr X 1 .
diff --git a/x11-misc/xrootconsole/files/xrootconsole-0.6.noversion.patch b/x11-misc/xrootconsole/files/xrootconsole-0.6.noversion.patch
new file mode 100644
index 000000000000..b1ede4023113
--- /dev/null
+++ b/x11-misc/xrootconsole/files/xrootconsole-0.6.noversion.patch
@@ -0,0 +1,52 @@
+--- main.c.orig	2004-02-21 07:31:53.000000000 +0900
++++ main.c	2005-03-06 16:34:27.949346504 +0900
+@@ -68,6 +68,7 @@
+ "  --solid          make background a solid color, not shaded-transparent\n" \
+ "  --topdown        insert lines at the top and scroll the rest down\n" \
+ "  --wrap           wrap long lines, instead of cutting them off\n" \
++"  --noversion      do not display xrootwindow version in output\n" \
+ "  -h or --help     a familiar-looking help screen\n" \
+ "  -v or --version  displays the version number\n" \
+ "  [console]        filename to read (defaults to standard input)\n" \
+@@ -102,6 +103,7 @@
+     int wrap;
+     int topdown;
+     int solid;
++    int show_version;
+ } InitOptions;
+ 
+ typedef struct {
+@@ -219,6 +221,7 @@
+     io->wrap = DEFAULT_WRAP;
+     io->topdown = DEFAULT_TOPDOWN;
+     io->solid = DEFAULT_SOLID;
++    io->show_version = 1;
+      
+     /* Process command-line arguments */
+     while (*++argv != NULL) {
+@@ -236,6 +239,8 @@
+             io->bw = atoi(*++argv);
+         else if (!strcmp(*argv, "-columns") || !strcmp(*argv, "-c"))
+             io->tc = atoi(*++argv);
++        else if (!strcmp(*argv, "--noversion"))
++            io->show_version = 0;
+         else if (!strcmp(*argv, "--solid"))
+             io->solid = True;
+         else if (!strcmp(*argv, "--wrap"))
+@@ -560,10 +565,12 @@
+     init_console(io.console_name, ws.colwidth, ws.nlines, &cs);
+ 
+     /* Display a message */
+-    put("xrootconsole ",&io,&ws,&cs);
+-    put(XROOTCONSOLE_VERSION,&io,&ws,&cs);
+-    put("\n",&io,&ws,&cs);
+-    
++    if (io.show_version) {
++        put("xrootconsole ",&io,&ws,&cs);
++        put(XROOTCONSOLE_VERSION,&io,&ws,&cs);
++        put("\n",&io,&ws,&cs);
++    }
++
+     draw_pixmap(&io,&ws,&cs);
+ 
+     event_loop(&io,&ws,&cs);
diff --git a/x11-misc/xrootconsole/metadata.xml b/x11-misc/xrootconsole/metadata.xml
new file mode 100644
index 000000000000..b5be7343e366
--- /dev/null
+++ b/x11-misc/xrootconsole/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>desktop-misc</herd>
+	<upstream>
+		<remote-id type="sourceforge">xrootconsole</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-misc/xrootconsole/xrootconsole-0.6.ebuild b/x11-misc/xrootconsole/xrootconsole-0.6.ebuild
new file mode 100644
index 000000000000..7bf3fc6a8e18
--- /dev/null
+++ b/x11-misc/xrootconsole/xrootconsole-0.6.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="A utility that displays its input in a text box on your root window"
+HOMEPAGE="http://sourceforge.net/projects/xrootconsole/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+RDEPEND="x11-libs/libX11"
+DEPEND="${RDEPEND}
+	x11-proto/xproto"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}.noversion.patch"
+	epatch "${FILESDIR}/${P}.makefile.patch"
+	epatch "${FILESDIR}/${P}.manpage.patch"
+}
+
+src_compile() {
+	tc-export CC
+	emake || die "emake failed"
+}
+
+src_install() {
+	dodir /usr/bin
+
+	make \
+		MANDIR="${D}usr/share/man/man1" \
+		BINDIR="${D}usr/bin/" \
+		install || die "make install failed"
+
+	dodoc TODO NEWS CREDITS
+}
diff --git a/x11-misc/xscreensaver-app/Manifest b/x11-misc/xscreensaver-app/Manifest
new file mode 100644
index 000000000000..7290fc8b93ec
--- /dev/null
+++ b/x11-misc/xscreensaver-app/Manifest
@@ -0,0 +1 @@
+DIST XScreenSaver.App-2.3.tar.gz 47566 SHA256 f5ee06a00f57153f1f8e3dac480a6eb3ab93e74406c23ff6bf1dbc67d39138e1 SHA512 eb65cd14f70e6f152fced9f073dbc7737c855f27787472d0e7e9c4caaaf59026c0977c0f27ebd55b13391ab29491f4a96878236b78716b1f15dd9b772091f290 WHIRLPOOL 0dfdee9bcb57ec2deecd8889b1e74c88d95be1aa791fe16398b716b59fefde8f6ab0e6a2a5a4f3518d5881fda9c1ba153086c27dc26b2c5d8e24f1957c9c3fcb
diff --git a/x11-misc/xscreensaver-app/files/xscreensaver-app-2.3-underlinking.patch b/x11-misc/xscreensaver-app/files/xscreensaver-app-2.3-underlinking.patch
new file mode 100644
index 000000000000..5707e4fc7206
--- /dev/null
+++ b/x11-misc/xscreensaver-app/files/xscreensaver-app-2.3-underlinking.patch
@@ -0,0 +1,11 @@
+--- a/configure.in
++++ b/configure.in
+@@ -14,7 +14,6 @@
+ 	echo
+ 	exit 1)
+ 
+-LDFLAGS=`gtk-config --cflags`
++PKG_CHECK_MODULES(LIBX11, x11,[LIBS="$LIBS $LIBX11_LIBS";INCLUDES="$INCLUDES $LIBX11_CFLAGS"],[exit 1])
+ 
+-AC_SUBST(LDFLAGS)
+ AC_OUTPUT(Makefile)
diff --git a/x11-misc/xscreensaver-app/metadata.xml b/x11-misc/xscreensaver-app/metadata.xml
new file mode 100644
index 000000000000..7d6c82b3f272
--- /dev/null
+++ b/x11-misc/xscreensaver-app/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>desktop-misc</herd>
+  <upstream>
+    <remote-id type="sourceforge">xscreensaverapp</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/x11-misc/xscreensaver-app/xscreensaver-app-2.3-r2.ebuild b/x11-misc/xscreensaver-app/xscreensaver-app-2.3-r2.ebuild
new file mode 100644
index 000000000000..44560d48a596
--- /dev/null
+++ b/x11-misc/xscreensaver-app/xscreensaver-app-2.3-r2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils toolchain-funcs
+
+MY_PN=${PN/-a/.A}
+MY_PN=${MY_PN/xs/XS}
+MY_PN=${MY_PN/s/S}
+
+DESCRIPTION="XScreenSaver dockapp for the Window Maker window manager"
+HOMEPAGE="http://xscreensaverapp.sourceforge.net/"
+SRC_URI="mirror://sourceforge/project/xscreensaverapp/${MY_PN}/${PV}/${MY_PN}-${PV}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+CDEPEND="
+	x11-libs/libdockapp
+	x11-libs/libX11
+"
+DEPEND="
+	${CDEPEND}
+	x11-proto/xproto
+	virtual/pkgconfig
+"
+RDEPEND="
+	${CDEPEND}
+	x11-misc/xscreensaver
+"
+
+S=${WORKDIR}/${MY_PN}-${PV}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-underlinking.patch
+	eautoreconf
+}
+
+src_install() {
+	dobin ${MY_PN}
+	dodoc README NEWS ChangeLog TODO AUTHORS
+}
diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
new file mode 100644
index 000000000000..3b39b832267c
--- /dev/null
+++ b/x11-misc/xscreensaver/Manifest
@@ -0,0 +1,2 @@
+DIST xscreensaver-5.32.tar.gz 10571502 SHA256 4252a6079d2d2f5b342e8bdd172cbad5f0af73daf4e412b61a68344d91ca93bd SHA512 0d7f3d283998cdb2aec10c8f5e94c9cc6e28a72785c36759cee988f3592a5f8aae20ba593c8363eab8fe61f7caf325376a887cac42ecf300c60894bf20d2f75b WHIRLPOOL 1a99e36ac89cf7f3121d499da6bf06e02808465b7b500e0fc371a97df0d8e1b729bc20c57cd7fe560e151e1051e46dafc0b034cf72c343a185b1fddcf8fdb749
+DIST xscreensaver-5.33.tar.gz 10725482 SHA256 d4a0c1619219f2843fa8b68d4ae337ab0e9fcb79a6d231540adeb16b3d313f4d SHA512 a8126b165e96d89ada38c4bce0b6c6ef5769667477301f5388633d22b9aed7fa6defcd07b8768c1197556c565b8f220f75c1937e0151d66c3b8e05fbadf37d1d WHIRLPOOL d9210589b1b8263b46740b27c6fc5a64b4d2d5c69c8a7267d4650cf7ed54de1dc927e007ecb37110ead5229e0f9742181ce40b104478c9e0ec488caec07d5231
diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.05-interix.patch b/x11-misc/xscreensaver/files/xscreensaver-5.05-interix.patch
new file mode 100644
index 000000000000..2a5eead4879f
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-5.05-interix.patch
@@ -0,0 +1,32 @@
+diff -ru xscreensaver-5.05.orig/driver/prefs.c xscreensaver-5.05/driver/prefs.c
+--- xscreensaver-5.05.orig/driver/prefs.c	2006-05-24 00:03:47 +0200
++++ xscreensaver-5.05/driver/prefs.c	2008-03-11 09:20:58 +0100
+@@ -951,9 +951,12 @@
+ 	{
+ 	  p->init_file_date = write_date;
+ 
++/* Interix has no sync() or alike. */
++#ifndef __INTERIX
+ 	  /* Since the .xscreensaver file is used for IPC, let's try and make
+ 	     sure that the bits actually land on the disk right away. */
+ 	  sync ();
++#endif
+ 
+           status = 0;    /* wrote and renamed successfully! */
+ 	}
+diff -ru xscreensaver-5.05.orig/driver/setuid.c xscreensaver-5.05/driver/setuid.c
+--- xscreensaver-5.05.orig/driver/setuid.c	2006-02-09 03:33:29 +0100
++++ xscreensaver-5.05/driver/setuid.c	2008-03-11 09:22:59 +0100
+@@ -136,9 +136,12 @@
+   if (uid == (uid_t) -1) uid = (uid_t) -2;
+ 
+   errno = 0;
++
++#ifndef __INTERIX
+   if (setgroups_needed_p (gid) &&
+       setgroups (1, &gid) < 0)
+     sgs_errno = errno ? errno : -1;
++#endif
+ 
+   errno = 0;
+   if (setgid (gid) != 0)
diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.20-blurb-hndl-test-passwd.patch b/x11-misc/xscreensaver/files/xscreensaver-5.20-blurb-hndl-test-passwd.patch
new file mode 100644
index 000000000000..bfd48d1cc96e
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-5.20-blurb-hndl-test-passwd.patch
@@ -0,0 +1,12 @@
+http://pkgs.fedoraproject.org/cgit/xscreensaver.git/tree/xscreensaver-5.17-blurb-hndl-test-passwd.patch
+
+--- driver/test-passwd.c
++++ driver/test-passwd.c
+@@ -66,6 +66,7 @@
+ Bool update_screen_layout (saver_info *si) { return 0; }
+ 
+ const char *blurb(void) { return progname; }
++Bool in_signal_handler_p = 0;
+ Atom XA_SCREENSAVER, XA_DEMO, XA_PREFS;
+ 
+ void
diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.20-test-passwd-segv-tty.patch b/x11-misc/xscreensaver/files/xscreensaver-5.20-test-passwd-segv-tty.patch
new file mode 100644
index 000000000000..ab5deebc424a
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-5.20-test-passwd-segv-tty.patch
@@ -0,0 +1,13 @@
+http://pkgs.fedoraproject.org/cgit/xscreensaver.git/tree/xscreensaver-5.12-test-passwd-segv-tty.patch
+
+--- driver/passwd.c
++++ driver/passwd.c
+@@ -205,7 +205,7 @@
+ {
+ # ifdef HAVE_SYSLOG
+   struct passwd *pw = getpwuid (getuid ());
+-  char *d = DisplayString (si->dpy);
++  char *d = (si->dpy ? DisplayString (si->dpy) : 0);
+   char *u = (pw && pw->pw_name ? pw->pw_name : "???");
+   int opt = 0;
+   int fac = 0;
diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.20-tests-miscfix.patch b/x11-misc/xscreensaver/files/xscreensaver-5.20-tests-miscfix.patch
new file mode 100644
index 000000000000..995b4ea89608
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-5.20-tests-miscfix.patch
@@ -0,0 +1,23 @@
+http://pkgs.fedoraproject.org/cgit/xscreensaver.git/tree/xscreensaver-5.12-tests-miscfix.patch
+
+--- driver/test-xdpms.c
++++ driver/test-xdpms.c
+@@ -29,7 +29,6 @@
+ 
+ #include <X11/Xproto.h>
+ #include <X11/extensions/dpms.h>
+-#include <X11/extensions/dpmsstr.h>
+ 
+ extern Bool DPMSQueryExtension (Display *dpy, int *event_ret, int *error_ret);
+ extern Bool DPMSCapable (Display *dpy);
+--- driver/Makefile.in
++++ driver/Makefile.in
+@@ -850,7 +850,7 @@
+ test-mlstring: test-mlstring.o
+ 	$(CC) -DTEST $(LDFLAGS) -o $@ test-mlstring.o $(SAVER_LIBS)
+ 
+-TEST_FADE_OBJS = test-fade.o $(UTILS_SRC)/fade.o $(DEMO_UTIL_OBJS)
++TEST_FADE_OBJS = test-fade.o $(UTILS_BIN)/fade.o $(DEMO_UTIL_OBJS)
+ test-fade: test-fade.o $(UTILS_BIN)/fade.o
+ 	$(CC) $(LDFLAGS) -o $@ $(TEST_FADE_OBJS) $(SAVER_LIBS)
+ 
diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.21-gentoo.patch b/x11-misc/xscreensaver/files/xscreensaver-5.21-gentoo.patch
new file mode 100644
index 000000000000..b69e19783200
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-5.21-gentoo.patch
@@ -0,0 +1,106 @@
+--- xscreensaver-5.21/driver/XScreenSaver.ad.in
++++ xscreensaver-5.21/driver/XScreenSaver.ad.in
+@@ -31,21 +31,21 @@
+ *mode:			random
+ *timeout:		0:10:00
+ *cycle:			0:10:00
+-*lockTimeout:		0:00:00
++*lockTimeout:		0:30:00
+ *passwdTimeout:		0:00:30
+-*dpmsEnabled:		False
++*dpmsEnabled:		True
+ *dpmsQuickoffEnabled:	False
+ *dpmsStandby:		2:00:00
+ *dpmsSuspend:		2:00:00
+ *dpmsOff:		4:00:00
+-*grabDesktopImages:	True
++*grabDesktopImages:	False
+ *grabVideoFrames:	False
+ *chooseRandomImages:	@DEFAULT_IMAGES_P@
+ ! This can be a local directory name, or the URL of an RSS or Atom feed.
+ *imageDirectory:	@DEFAULT_IMAGE_DIRECTORY@
+ *nice:			10
+ *memoryLimit:		0
+-*lock:			False
++*lock:			True
+ *verbose:		False
+ *timestamp:		True
+ *fade:			True
+@@ -62,7 +62,7 @@
+ *textLiteral:		XScreenSaver
+ *textFile:		@DEFAULT_TEXT_FILE@
+ *textProgram:		fortune
+-*textURL:		http://en.wikipedia.org/w/index.php?title=Special:NewPages&feed=rss
++*textURL:		http://planet.gentoo.org/rss20.xml
+ 
+ *overlayTextForeground:	#FFFF00
+ *overlayTextBackground:	#000000
+@@ -122,7 +122,8 @@
+ 
+ ! The format used for printing the date and time in the password dialog box
+ ! (see the strftime(3) manual page for details.)
+-*dateFormat:		%d-%b-%y (%a); %I:%M %p
++!*dateFormat:		%d-%b-%y (%a); %I:%M %p
++*dateFormat:           %x %X
+ ! To show the time only:
+ ! *dateFormat:		%I:%M %p
+ ! For 24 hour time:
+--- xscreensaver-5.21/hacks/barcode.c
++++ xscreensaver-5.21/hacks/barcode.c
+@@ -131,7 +131,6 @@
+   "children",
+   "chocolate",
+   "CLONE",
+-  "cock",
+   "constriction",
+   "contrition",
+   "cop",
+@@ -265,7 +264,6 @@
+   "punishment",
+   "punk rock",
+   "punk",
+-  "pussy",
+   "quagmire",
+   "quarantine",
+   "quartz",
+@@ -333,8 +331,6 @@
+   "vegetarian",
+   "venom",
+   "verifiability",
+-  "viagra",
+-  "vibrator",
+   "victim",
+   "vignette",
+   "villainy",
+--- xscreensaver-5.21/hacks/glx/glsnake.c
++++ xscreensaver-5.21/hacks/glx/glsnake.c
+@@ -565,17 +565,17 @@
+ 	ZERO, PIN, ZERO, ZERO, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, ZERO,
+ 	ZERO, PIN, ZERO }
+     },
+-    { "erect penis",     /* thanks benno */
++    { "shuffle board",     /* thanks benno */
+       { PIN, ZERO, PIN, PIN, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, PIN,
+ 	PIN, ZERO, ZERO, ZERO, RIGHT, ZERO, ZERO, ZERO, ZERO, ZERO, ZERO,
+ 	ZERO, ZERO }
+     },
+-    { "flaccid penis",
++    { "flaccid anchor",
+       { PIN, ZERO, PIN, PIN, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, PIN,
+ 	PIN, ZERO, ZERO, ZERO, RIGHT, PIN, ZERO, ZERO, ZERO, ZERO, ZERO,
+ 	ZERO, ZERO }
+     },
+-    { "vagina",
++    { "engagement ring",
+       { RIGHT, ZERO, ZERO, ZERO, RIGHT, ZERO, ZERO, PIN, ZERO, ZERO,
+ 	LEFT, ZERO, ZERO, ZERO, LEFT, ZERO, LEFT, PIN, LEFT, PIN, RIGHT,
+ 	PIN, RIGHT, ZERO }
+@@ -995,7 +995,7 @@
+     { "Parrot",
+         { ZERO, ZERO, ZERO, ZERO, RIGHT, RIGHT, ZERO, LEFT, PIN, RIGHT, ZERO, RIGHT, ZERO, RIGHT, ZERO, RIGHT, PIN, LEFT, ZERO, RIGHT, LEFT, ZERO, PIN, ZERO }
+     },
+-    { "Penis",
++    { "Shuttle",
+         { PIN, PIN, RIGHT, ZERO, PIN, PIN, ZERO, PIN, ZERO, ZERO, RIGHT, PIN, LEFT, ZERO, ZERO, PIN, ZERO, PIN, PIN, ZERO, LEFT, PIN, PIN, ZERO }
+     },
+     { "PictureComingSoon",
diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.28-comment-style.patch b/x11-misc/xscreensaver/files/xscreensaver-5.28-comment-style.patch
new file mode 100644
index 000000000000..6c3143d758b7
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-5.28-comment-style.patch
@@ -0,0 +1,21 @@
+--- a/hacks/tessellimage.c
++++ b/hacks/tessellimage.c
+@@ -507,15 +507,15 @@
+       out[i].p = (n > 0
+                   ? (XPoint *) calloc (out[i].npoints + 1, sizeof (*out[i].p))
+                   : 0);
+-//printf("%d: ", i);
++/*printf("%d: ", i);*/
+       for (j = 0; j < out[i].npoints; j++)
+         {
+           ITRIANGLE *tt = &v[t->tri[j]];
+           out[i].p[j].x = (p[tt->p1].x + p[tt->p2].x + p[tt->p3].x) / 3;
+           out[i].p[j].y = (p[tt->p1].y + p[tt->p2].y + p[tt->p3].y) / 3;
+-//printf(" [%d: %d %d]", j, out[i].p[j].x, out[i].p[j].y);
++/*printf(" [%d: %d %d]", j, out[i].p[j].x, out[i].p[j].y);*/
+         }
+-//printf("\n");
++/*printf("\n");*/
+     }
+ 
+   free (vert_to_tri);
diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.31-pragma.patch b/x11-misc/xscreensaver/files/xscreensaver-5.31-pragma.patch
new file mode 100644
index 000000000000..97f4656344cb
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-5.31-pragma.patch
@@ -0,0 +1,11 @@
+--- a/hacks/memscroller.c
++++ b/hacks/memscroller.c
+@@ -307,7 +307,7 @@
+       -- sbrk(2) man page on BSD systems, as of 1995 or so.
+  */
+ #ifdef HAVE_SBRK
+-# if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2)) /* gcc >= 4.2 */
++# if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) /* gcc >= 4.6 */
+    /* Don't print "warning: 'sbrk' is deprecated". */
+ #  pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+ # endif
diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.33-gentoo.patch b/x11-misc/xscreensaver/files/xscreensaver-5.33-gentoo.patch
new file mode 100644
index 000000000000..e199c6def68e
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-5.33-gentoo.patch
@@ -0,0 +1,106 @@
+--- a/driver/XScreenSaver.ad.in
++++ b/driver/XScreenSaver.ad.in
+@@ -31,21 +31,21 @@
+ *mode:			random
+ *timeout:		0:10:00
+ *cycle:			0:10:00
+-*lockTimeout:		0:00:00
++*lockTimeout:		0:30:00
+ *passwdTimeout:		0:00:30
+-*dpmsEnabled:		False
++*dpmsEnabled:		True
+ *dpmsQuickoffEnabled:	False
+ *dpmsStandby:		2:00:00
+ *dpmsSuspend:		2:00:00
+ *dpmsOff:		4:00:00
+-*grabDesktopImages:	True
++*grabDesktopImages:	False
+ *grabVideoFrames:	False
+ *chooseRandomImages:	@DEFAULT_IMAGES_P@
+ ! This can be a local directory name, or the URL of an RSS or Atom feed.
+ *imageDirectory:	@DEFAULT_IMAGE_DIRECTORY@
+ *nice:			10
+ *memoryLimit:		0
+-*lock:			False
++*lock:			True
+ *verbose:		False
+ *timestamp:		True
+ *fade:			True
+@@ -63,7 +63,7 @@
+ *textLiteral:		XScreenSaver
+ *textFile:		@DEFAULT_TEXT_FILE@
+ *textProgram:		fortune
+-*textURL:		https://en.wikipedia.org/w/index.php?title=Special:NewPages&feed=rss
++*textURL:		https://planet.gentoo.org/rss20.xml
+ 
+ *overlayTextForeground:	#FFFF00
+ *overlayTextBackground:	#000000
+@@ -123,7 +123,8 @@
+ 
+ ! The format used for printing the date and time in the password dialog box
+ ! (see the strftime(3) manual page for details.)
+-*dateFormat:		%d-%b-%y (%a); %I:%M %p
++!*dateFormat:		%d-%b-%y (%a); %I:%M %p
++*dateFormat:		%x %X
+ ! To show the time only:
+ ! *dateFormat:		%I:%M %p
+ ! For 24 hour time:
+--- a/hacks/barcode.c
++++ a/hacks/barcode.c
+@@ -131,7 +131,6 @@
+   "children",
+   "chocolate",
+   "CLONE",
+-  "cock",
+   "constriction",
+   "contrition",
+   "cop",
+@@ -265,7 +264,6 @@
+   "punishment",
+   "punk rock",
+   "punk",
+-  "pussy",
+   "quagmire",
+   "quarantine",
+   "quartz",
+@@ -333,8 +331,6 @@
+   "vegetarian",
+   "venom",
+   "verifiability",
+-  "viagra",
+-  "vibrator",
+   "victim",
+   "vignette",
+   "villainy",
+--- a/hacks/glx/glsnake.c
++++ a/hacks/glx/glsnake.c
+@@ -565,17 +565,17 @@
+ 	ZERO, PIN, ZERO, ZERO, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, ZERO,
+ 	ZERO, PIN, ZERO }
+     },
+-    { "erect penis",     /* thanks benno */
++    { "shuffle board",     /* thanks benno */
+       { PIN, ZERO, PIN, PIN, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, PIN,
+ 	PIN, ZERO, ZERO, ZERO, RIGHT, ZERO, ZERO, ZERO, ZERO, ZERO, ZERO,
+ 	ZERO, ZERO }
+     },
+-    { "flaccid penis",
++    { "flaccid anchor",
+       { PIN, ZERO, PIN, PIN, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, PIN,
+ 	PIN, ZERO, ZERO, ZERO, RIGHT, PIN, ZERO, ZERO, ZERO, ZERO, ZERO,
+ 	ZERO, ZERO }
+     },
+-    { "vagina",
++    { "engagement ring",
+       { RIGHT, ZERO, ZERO, ZERO, RIGHT, ZERO, ZERO, PIN, ZERO, ZERO,
+ 	LEFT, ZERO, ZERO, ZERO, LEFT, ZERO, LEFT, PIN, LEFT, PIN, RIGHT,
+ 	PIN, RIGHT, ZERO }
+@@ -995,7 +995,7 @@
+     { "Parrot",
+         { ZERO, ZERO, ZERO, ZERO, RIGHT, RIGHT, ZERO, LEFT, PIN, RIGHT, ZERO, RIGHT, ZERO, RIGHT, ZERO, RIGHT, PIN, LEFT, ZERO, RIGHT, LEFT, ZERO, PIN, ZERO }
+     },
+-    { "Penis",
++    { "Shuttle",
+         { PIN, PIN, RIGHT, ZERO, PIN, PIN, ZERO, PIN, ZERO, ZERO, RIGHT, PIN, LEFT, ZERO, ZERO, PIN, ZERO, PIN, PIN, ZERO, LEFT, PIN, PIN, ZERO }
+     },
+     { "PictureComingSoon",
diff --git a/x11-misc/xscreensaver/metadata.xml b/x11-misc/xscreensaver/metadata.xml
new file mode 100644
index 000000000000..2e1f1016e536
--- /dev/null
+++ b/x11-misc/xscreensaver/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>desktop-misc</herd>
+  <upstream>
+    <maintainer>
+      <email>jwz@jwz.org</email>
+      <name>Jamie Zawinski</name>
+    </maintainer>
+  </upstream>
+  <use>
+    <flag name='gdm'>Use gdmflexiserver from <pkg>gnome-base/gdm</pkg> instead of <pkg>x11-misc/lightdm</pkg></flag>
+    <flag name='new-login'>Enable user switching support using gdmflexiserver (<pkg>x11-misc/lightdm</pkg>) or kdmctl (<pkg>kde-base/kdm</pkg>)</flag>
+  </use>
+</pkgmetadata>
diff --git a/x11-misc/xscreensaver/xscreensaver-5.32.ebuild b/x11-misc/xscreensaver/xscreensaver-5.32.ebuild
new file mode 100644
index 000000000000..90786229102b
--- /dev/null
+++ b/x11-misc/xscreensaver/xscreensaver-5.32.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils flag-o-matic multilib pam
+
+DESCRIPTION="A modular screen saver and locker for the X Window System"
+HOMEPAGE="http://www.jwz.org/xscreensaver/"
+SRC_URI="
+	http://www.jwz.org/xscreensaver/${P}.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE="gdm jpeg new-login opengl pam +perl selinux suid xinerama"
+
+COMMON_DEPEND="
+	>=gnome-base/libglade-2
+	dev-libs/libxml2
+	media-libs/netpbm
+	x11-apps/appres
+	x11-apps/xwininfo
+	x11-libs/gtk+:2
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXi
+	x11-libs/libXmu
+	x11-libs/libXrandr
+	x11-libs/libXt
+	x11-libs/libXxf86misc
+	x11-libs/libXxf86vm
+	jpeg? ( virtual/jpeg:0 )
+	new-login? (
+		gdm? ( gnome-base/gdm )
+		!gdm? ( || ( x11-misc/lightdm kde-base/kdm ) )
+		)
+	opengl? (
+		virtual/glu
+		virtual/opengl
+	)
+	pam? ( virtual/pam )
+	xinerama? ( x11-libs/libXinerama )
+"
+# For USE="perl" see output of `qlist xscreensaver | grep bin | xargs grep '::'`
+RDEPEND="
+	${COMMON_DEPEND}
+	perl? (
+		dev-lang/perl
+		dev-perl/libwww-perl
+		virtual/perl-Digest-MD5
+	)
+	selinux? ( sec-policy/selinux-xscreensaver )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	dev-util/intltool
+	sys-devel/bc
+	sys-devel/gettext
+	virtual/pkgconfig
+	x11-proto/recordproto
+	x11-proto/scrnsaverproto
+	x11-proto/xextproto
+	x11-proto/xf86miscproto
+	x11-proto/xf86vidmodeproto
+	xinerama? ( x11-proto/xineramaproto )
+"
+
+src_prepare() {
+	sed -i configure.in -e '/^ALL_LINGUAS=/d' || die
+	strip-linguas -i po/
+	export ALL_LINGUAS="${LINGUAS}"
+
+	if use new-login && ! use gdm; then #392967
+		sed -i \
+			-e "/default_l.*1/s:gdmflexiserver -ls:${EPREFIX}/usr/libexec/lightdm/&:" \
+			configure{,.in} || die
+	fi
+
+	epatch \
+		"${FILESDIR}"/${PN}-5.21-gentoo.patch \
+		"${FILESDIR}"/${PN}-5.05-interix.patch \
+		"${FILESDIR}"/${PN}-5.20-blurb-hndl-test-passwd.patch \
+		"${FILESDIR}"/${PN}-5.20-test-passwd-segv-tty.patch \
+		"${FILESDIR}"/${PN}-5.20-tests-miscfix.patch \
+		"${FILESDIR}"/${PN}-5.28-comment-style.patch \
+		"${FILESDIR}"/${PN}-5.31-pragma.patch
+
+	epatch_user
+
+	eautoconf
+	eautoheader
+}
+
+src_configure() {
+	if use ppc || use ppc64; then
+		filter-flags -maltivec -mabi=altivec
+		append-flags -U__VEC__
+	fi
+
+	unset BC_ENV_ARGS #24568
+	export RPM_PACKAGE_VERSION=no #368025
+
+	econf \
+		$(use_with jpeg) \
+		$(use_with new-login login-manager) \
+		$(use_with opengl gl) \
+		$(use_with pam) \
+		$(use_with suid setuid-hacks) \
+		$(use_with xinerama xinerama-ext) \
+		--enable-locking \
+		--with-configdir="${EPREFIX}"/usr/share/${PN}/config \
+		--with-dpms-ext \
+		--with-gtk \
+		--with-hackdir="${EPREFIX}"/usr/$(get_libdir)/misc/${PN} \
+		--with-pixbuf \
+		--with-proc-interrupts \
+		--with-randr-ext \
+		--with-text-file="${EPREFIX}"/etc/gentoo-release \
+		--with-x-app-defaults="${EPREFIX}"/usr/share/X11/app-defaults \
+		--with-xdbe-ext \
+		--with-xf86gamma-ext \
+		--with-xf86vmode-ext \
+		--with-xinput-ext \
+		--with-xshm-ext \
+		--without-gle \
+		--without-kerberos \
+		--x-includes="${EPREFIX}"/usr/include \
+		--x-libraries="${EPREFIX}"/usr/$(get_libdir)
+}
+
+src_install() {
+	emake install_prefix="${D}" install
+
+	dodoc README{,.hacking}
+
+	use pam && fperms 755 /usr/bin/${PN}
+	pamd_mimic_system ${PN} auth
+
+	rm -f "${ED}"/usr/share/${PN}/config/{electricsheep,fireflies}.xml
+}
diff --git a/x11-misc/xscreensaver/xscreensaver-5.33.ebuild b/x11-misc/xscreensaver/xscreensaver-5.33.ebuild
new file mode 100644
index 000000000000..ef011eebcb30
--- /dev/null
+++ b/x11-misc/xscreensaver/xscreensaver-5.33.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils flag-o-matic multilib pam
+
+DESCRIPTION="A modular screen saver and locker for the X Window System"
+HOMEPAGE="http://www.jwz.org/xscreensaver/"
+SRC_URI="
+	http://www.jwz.org/xscreensaver/${P}.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE="gdm jpeg new-login opengl pam +perl selinux suid xinerama"
+
+COMMON_DEPEND="
+	>=gnome-base/libglade-2
+	dev-libs/libxml2
+	media-libs/netpbm
+	x11-apps/appres
+	x11-apps/xwininfo
+	x11-libs/gtk+:2
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXi
+	x11-libs/libXmu
+	x11-libs/libXrandr
+	x11-libs/libXt
+	x11-libs/libXxf86misc
+	x11-libs/libXxf86vm
+	jpeg? ( virtual/jpeg:0 )
+	new-login? (
+		gdm? ( gnome-base/gdm )
+		!gdm? ( || ( x11-misc/lightdm kde-base/kdm ) )
+		)
+	opengl? (
+		virtual/glu
+		virtual/opengl
+	)
+	pam? ( virtual/pam )
+	xinerama? ( x11-libs/libXinerama )
+"
+# For USE="perl" see output of `qlist xscreensaver | grep bin | xargs grep '::'`
+RDEPEND="
+	${COMMON_DEPEND}
+	perl? (
+		dev-lang/perl
+		dev-perl/libwww-perl
+		virtual/perl-Digest-MD5
+	)
+	selinux? ( sec-policy/selinux-xscreensaver )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	dev-util/intltool
+	sys-devel/bc
+	sys-devel/gettext
+	virtual/pkgconfig
+	x11-proto/recordproto
+	x11-proto/scrnsaverproto
+	x11-proto/xextproto
+	x11-proto/xf86miscproto
+	x11-proto/xf86vidmodeproto
+	xinerama? ( x11-proto/xineramaproto )
+"
+
+src_prepare() {
+	sed -i configure.in -e '/^ALL_LINGUAS=/d' || die
+	strip-linguas -i po/
+	export ALL_LINGUAS="${LINGUAS}"
+
+	if use new-login && ! use gdm; then #392967
+		sed -i \
+			-e "/default_l.*1/s:gdmflexiserver -ls:${EPREFIX}/usr/libexec/lightdm/&:" \
+			configure{,.in} || die
+	fi
+
+	epatch \
+		"${FILESDIR}"/${PN}-5.33-gentoo.patch \
+		"${FILESDIR}"/${PN}-5.05-interix.patch \
+		"${FILESDIR}"/${PN}-5.20-blurb-hndl-test-passwd.patch \
+		"${FILESDIR}"/${PN}-5.20-test-passwd-segv-tty.patch \
+		"${FILESDIR}"/${PN}-5.20-tests-miscfix.patch \
+		"${FILESDIR}"/${PN}-5.28-comment-style.patch \
+		"${FILESDIR}"/${PN}-5.31-pragma.patch
+
+	epatch_user
+
+	eautoconf
+	eautoheader
+}
+
+src_configure() {
+	if use ppc || use ppc64; then
+		filter-flags -maltivec -mabi=altivec
+		append-flags -U__VEC__
+	fi
+
+	unset BC_ENV_ARGS #24568
+	export RPM_PACKAGE_VERSION=no #368025
+
+	econf \
+		$(use_with jpeg) \
+		$(use_with new-login login-manager) \
+		$(use_with opengl gl) \
+		$(use_with pam) \
+		$(use_with suid setuid-hacks) \
+		$(use_with xinerama xinerama-ext) \
+		--enable-locking \
+		--with-configdir="${EPREFIX}"/usr/share/${PN}/config \
+		--with-dpms-ext \
+		--with-gtk \
+		--with-hackdir="${EPREFIX}"/usr/$(get_libdir)/misc/${PN} \
+		--with-pixbuf \
+		--with-proc-interrupts \
+		--with-randr-ext \
+		--with-text-file="${EPREFIX}"/etc/gentoo-release \
+		--with-x-app-defaults="${EPREFIX}"/usr/share/X11/app-defaults \
+		--with-xdbe-ext \
+		--with-xf86gamma-ext \
+		--with-xf86vmode-ext \
+		--with-xinput-ext \
+		--with-xshm-ext \
+		--without-gle \
+		--without-kerberos \
+		--x-includes="${EPREFIX}"/usr/include \
+		--x-libraries="${EPREFIX}"/usr/$(get_libdir)
+}
+
+src_install() {
+	emake install_prefix="${D}" install
+
+	dodoc README{,.hacking}
+
+	use pam && fperms 755 /usr/bin/${PN}
+	pamd_mimic_system ${PN} auth
+
+	rm -f "${ED}"/usr/share/${PN}/config/{electricsheep,fireflies}.xml
+}
diff --git a/x11-misc/xsel/Manifest b/x11-misc/xsel/Manifest
new file mode 100644
index 000000000000..73658586e8d1
--- /dev/null
+++ b/x11-misc/xsel/Manifest
@@ -0,0 +1 @@
+DIST xsel-1.2.0.tar.gz 169155 SHA256 b927ce08dc82f4c30140223959b90cf65e1076f000ce95e520419ec32f5b141c
diff --git a/x11-misc/xsel/metadata.xml b/x11-misc/xsel/metadata.xml
new file mode 100644
index 000000000000..731225048652
--- /dev/null
+++ b/x11-misc/xsel/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>desktop-misc</herd>
+</pkgmetadata>
diff --git a/x11-misc/xsel/xsel-1.2.0.ebuild b/x11-misc/xsel/xsel-1.2.0.ebuild
new file mode 100644
index 000000000000..66c559b24ca7
--- /dev/null
+++ b/x11-misc/xsel/xsel-1.2.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+DESCRIPTION="XSel is a command-line program for getting and setting the contents of the X selection"
+HOMEPAGE="http://www.vergenet.net/~conrad/software/xsel"
+SRC_URI="http://www.vergenet.net/~conrad/software/${PN}/download/${P}.tar.gz"
+
+LICENSE="HPND"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~mips ppc ~ppc64 x86 ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext"
+DEPEND="${RDEPEND}
+	x11-proto/xproto
+	x11-libs/libXt"
+
+src_compile() {
+	emake CFLAGS="${CFLAGS}"
+}
diff --git a/x11-misc/xsensors/Manifest b/x11-misc/xsensors/Manifest
new file mode 100644
index 000000000000..6ca8e2267688
--- /dev/null
+++ b/x11-misc/xsensors/Manifest
@@ -0,0 +1 @@
+DIST xsensors-0.70.tar.gz 115430 SHA256 907f21afd19fe88b70f000d6531ddcd53569ba0c0712e2b0afaab3fd9ca637ea
diff --git a/x11-misc/xsensors/files/xsensors-0.70-gtk220.patch b/x11-misc/xsensors/files/xsensors-0.70-gtk220.patch
new file mode 100644
index 000000000000..0aaf2c8026bf
--- /dev/null
+++ b/x11-misc/xsensors/files/xsensors-0.70-gtk220.patch
@@ -0,0 +1,38 @@
+--- src/gui.c
++++ src/gui.c
+@@ -84,7 +84,7 @@
+     while ( *digit ) {
+         get_pm_location( *digit, &x, &y, &w );
+         gdk_draw_drawable( widget->window,
+-                           widget->style->fg_gc[ GTK_WIDGET_STATE
++                           widget->style->fg_gc[ gtk_widget_get_state
+                            (widget) ], theme, x, y + highLow,
+                            pos, 0, w, 30 );
+         pos += w;
+@@ -121,7 +121,7 @@
+ 
+             /* Display RPM */
+             gdk_draw_drawable( widget->window, 
+-                               widget->style->fg_gc[ GTK_WIDGET_STATE 
++                               widget->style->fg_gc[ gtk_widget_get_state 
+                                (widget) ], theme, 0, 120 + highLow, 
+                                90, 0, 57, 30 );
+             break;
+@@ -142,7 +142,7 @@
+             else
+                 x = 57;
+             gdk_draw_drawable( widget->window, 
+-                             widget->style->fg_gc[ GTK_WIDGET_STATE 
++                             widget->style->fg_gc[ gtk_widget_get_state 
+                              (widget) ], theme, x, 60 + highLow, 
+                              96, 0, 57, 30 );
+             
+@@ -158,7 +158,7 @@
+ 
+             /* Display V */
+             gdk_draw_drawable( widget->window, 
+-                             widget->style->fg_gc[ GTK_WIDGET_STATE 
++                             widget->style->fg_gc[ gtk_widget_get_state 
+                              (widget) ], theme, 114, 60 + highLow, 
+                              96, 0, 57, 30 );
+ 
diff --git a/x11-misc/xsensors/metadata.xml b/x11-misc/xsensors/metadata.xml
new file mode 100644
index 000000000000..731225048652
--- /dev/null
+++ b/x11-misc/xsensors/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>desktop-misc</herd>
+</pkgmetadata>
diff --git a/x11-misc/xsensors/xsensors-0.70.ebuild b/x11-misc/xsensors/xsensors-0.70.ebuild
new file mode 100644
index 000000000000..badf480b1fb2
--- /dev/null
+++ b/x11-misc/xsensors/xsensors-0.70.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+inherit autotools eutils
+
+DESCRIPTION="A hardware health information viewer, interface to lm-sensors"
+HOMEPAGE="http://www.linuxhardware.org/xsensors/"
+SRC_URI="http://www.linuxhardware.org/xsensors/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+RDEPEND="x11-libs/gtk+:2
+	>=sys-apps/lm_sensors-3"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gtk220.patch
+
+	sed -i \
+		-e '/-DG.*_DISABLE_DEPRECATED/d' \
+		-e 's:-Werror:-Wall:' \
+		src/Makefile.am configure.in || die
+
+	eautoreconf
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog README TODO
+}
diff --git a/x11-misc/xsetleds/Manifest b/x11-misc/xsetleds/Manifest
new file mode 100644
index 000000000000..652f5ea0de23
--- /dev/null
+++ b/x11-misc/xsetleds/Manifest
@@ -0,0 +1 @@
+DIST xsetleds-0.1.3.tar.gz 221399 SHA256 e844ea61a11bde39e9b46f2eacd08b88bfadd29ee7857fc0b8455357640d3b96 SHA512 7fe6baa77b4b2c8f57dfc331776bb457520facdb2f54a5c101764c590d7c5556cd00477e56d36e64cb7264a8de28698422b99ec4852798069189fbe6c1c19f72 WHIRLPOOL 1d3edc2247595f283846ea4f25bffbc226a33dc541d79af842a014e5d4f6ebe6eb8f177e4a5897e86cb6c1c559539393d662cb46d76dc8cab22a1a9f8c8b8616
diff --git a/x11-misc/xsetleds/files/xsetleds-0.1.3-assignment.patch b/x11-misc/xsetleds/files/xsetleds-0.1.3-assignment.patch
new file mode 100644
index 000000000000..bc929813a3fc
--- /dev/null
+++ b/x11-misc/xsetleds/files/xsetleds-0.1.3-assignment.patch
@@ -0,0 +1,11 @@
+--- a/src/utils.c
++++ b/src/utils.c
+@@ -38,7 +38,7 @@
+ {
+ 	const char *p;
+ 
+-	if (p = strrchr (filename, '/'))
++	if ((p = strrchr (filename, '/')))
+ 		p = strrchr (filename, '/') + 1;
+ 	else
+ 		p = filename;
diff --git a/x11-misc/xsetleds/files/xsetleds-0.1.3-isalpha.patch b/x11-misc/xsetleds/files/xsetleds-0.1.3-isalpha.patch
new file mode 100644
index 000000000000..b256bdb2da66
--- /dev/null
+++ b/x11-misc/xsetleds/files/xsetleds-0.1.3-isalpha.patch
@@ -0,0 +1,13 @@
+--- a/src/xsetleds.c
++++ b/src/xsetleds.c
+@@ -29,8 +29,9 @@
+ #include <string.h>
+ #include <stdlib.h>
+ #include <stdarg.h>
++#include <ctype.h> /* isalpha() */
+ 
+-#include <xsetleds.h>
++#include "xsetleds.h"
+ 
+ 
+ struct key keytab[] = {
diff --git a/x11-misc/xsetleds/metadata.xml b/x11-misc/xsetleds/metadata.xml
new file mode 100644
index 000000000000..09b04e7fe07d
--- /dev/null
+++ b/x11-misc/xsetleds/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>desktop-misc</herd>
+	<herd>proxy-maintainers</herd>
+<maintainer>
+  <email>jss2k2@chello.no</email>
+  <name>Unknown</name>
+  <description>seemant@gentoo.org as a proxy maintainer.  Please refer to jss2k2</description>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-misc/xsetleds/xsetleds-0.1.3-r1.ebuild b/x11-misc/xsetleds/xsetleds-0.1.3-r1.ebuild
new file mode 100644
index 000000000000..042721f90317
--- /dev/null
+++ b/x11-misc/xsetleds/xsetleds-0.1.3-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils toolchain-funcs
+
+DESCRIPTION="small tool to report and change the keyboard LED states of an X display"
+HOMEPAGE="ftp://ftp.unix-ag.org/user/bmeurer/xsetleds/"
+SRC_URI="ftp://ftp.unix-ag.org/user/bmeurer/xsetleds/src/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86"
+
+RDEPEND="
+	x11-libs/libX11
+	x11-libs/libXtst
+"
+DEPEND="
+	${RDEPEND}
+	x11-proto/inputproto
+	x11-proto/xextproto
+	x11-proto/xproto
+"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-assignment.patch \
+		"${FILESDIR}"/${P}-isalpha.patch
+	tc-export CC
+}
+
+DOCS=( AUTHORS ChangeLog README TODO )
diff --git a/x11-misc/xsetleds/xsetleds-0.1.3.ebuild b/x11-misc/xsetleds/xsetleds-0.1.3.ebuild
new file mode 100644
index 000000000000..db42b1f96781
--- /dev/null
+++ b/x11-misc/xsetleds/xsetleds-0.1.3.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils toolchain-funcs
+
+DESCRIPTION="small tool to report and change the keyboard LED states of an X display"
+HOMEPAGE="ftp://ftp.unix-ag.org/user/bmeurer/xsetleds/"
+SRC_URI="ftp://ftp.unix-ag.org/user/bmeurer/xsetleds/src/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86 ppc sparc alpha hppa ~mips amd64 ia64"
+
+RDEPEND="
+	x11-libs/libX11
+	x11-libs/libXtst
+"
+DEPEND="
+	${RDEPEND}
+	x11-proto/inputproto
+	x11-proto/xextproto
+	x11-proto/xproto
+"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-assignment.patch \
+		"${FILESDIR}"/${P}-isalpha.patch
+	tc-export CC
+}
+
+DOCS=( AUTHORS ChangeLog README TODO )
diff --git a/x11-misc/xsnap/Manifest b/x11-misc/xsnap/Manifest
new file mode 100644
index 000000000000..67385adafc40
--- /dev/null
+++ b/x11-misc/xsnap/Manifest
@@ -0,0 +1,3 @@
+DIST xsnap-1.5.10.tar.bz2 54172 SHA256 6839586dd3bdcef8c4fcc1e11d52716fb6a92b3a1d7613801f880da3b5ce332f SHA512 d82414d1d5a99eba692b32b30b434119b60567eb89b62b1ea3cb3dfbc9e71e2196ee6ca667a02bfdb8d27fd3ec6df3589fe97702fff9758d3139881b32697b55 WHIRLPOOL 6c7137f2544cf9cef566e5e269967d15562578c0010ba20db596b0581971142fe375c4f0b59a7fc6dcb6b3440e0e584eaf2784e7dfbcad3b67ae2f59f3c26706
+DIST xsnap-1.5.11.tar.bz2 46031 SHA256 9076bb1041921771e6d2bae374aa12296fe963897a9f2ad259b4922914b7c179 SHA512 41659d5e7608dfc16d020b3b4ac9452522922c0d0a0a240ce8fecf2aec35ed5d5f1ec01151204dc66eb24c68c29449e4ba2e8fe8f376de1089e8761f6c30513c WHIRLPOOL 343ae02b583d223ebefceeae2022665c9b4d703bc7a75d9526df7fc6e11d0f4f00d2cc2bcfc644dd3fbfbb1c07dcb3ac765307a922d9fd5d8fa68b1f5269003f
+DIST xsnap-1.5.15.tar.bz2 46574 SHA256 e83cd5dc98fb682effd15db5a7423392236cf88f73fc98ca3972a2555c080fb9 SHA512 898914dd0bfec93b641815cc07522d4ea6168266a7f5efe75715cf68555e8959a72b40b0a02e75244348afc6aa77d267fbe7ee60670da5f33e6db2f6c4476dac WHIRLPOOL aeb8a26e92af4b6cb602d4d33293bca511c502443215b5cddb4f2185663481e3fd540df5d6ed73b6a640526e040129cb4c8698879f342faf38e03b173385d53c
diff --git a/x11-misc/xsnap/files/xsnap-1.5.10-prefix.patch b/x11-misc/xsnap/files/xsnap-1.5.10-prefix.patch
new file mode 100644
index 000000000000..ac4f96f3fd75
--- /dev/null
+++ b/x11-misc/xsnap/files/xsnap-1.5.10-prefix.patch
@@ -0,0 +1,40 @@
+From: Nathan Phillip Brink <binki@gentoo.org>
+Subject: Fix installation of xsnap on gentoo-prefix.
+
+--- a/po/Makefile
++++ b/po/Makefile
+@@ -19,7 +19,6 @@
+ #       along with this program. If not, see <http://www.gnu.org/licenses/>.
+ 
+ CATALOGS="fr"
+-LOCALEDIR=/usr/share/locale
+ 
+ all:
+ 	for cat in $(CATALOGS) ; do msgfmt -o $$cat.mo -v $$cat.po ; done
+
+--- a/Imakefile
++++ b/Imakefile
+@@ -37,9 +37,10 @@
+ /* This is the right link order [Steff] */
+ LOCAL_LIBRARIES = -lz $(XPMLIB) $(XFTLIB) $(PNGLIB) $(JPEGLIB) $(XLIB)
+ 
+-	DEFINES = -DENABLE_NLS -DXPM -DPNG -DJPG -DPACKAGE=\"xsnap\" -DLOCALEDIR=\"/usr/share/locale\"
++LOCALEDIR = /usr/share/locale
++	DEFINES = -DENABLE_NLS -DXPM -DPNG -DJPG -DPACKAGE=\"xsnap\" -DLOCALEDIR=\"$(LOCALEDIR)\"
+ 
+-#        DEFINES = -DXPM -DPNG -DJPG -DPACKAGE=\"xsnap\" -DLOCALEDIR=\"/usr/share/locale\"
++#        DEFINES = -DXPM -DPNG -DJPG -DPACKAGE=\"xsnap\" -DLOCALEDIR=\"$(LOCALEDIR)\"
+ 
+ ComplexProgramTarget(xsnap)
+ 
+@@ -55,8 +56,8 @@
+ install::
+ 	cp -f xsnap-ocr $(DESTDIR)/$(BINDIR)
+ 	chmod a+rx $(DESTDIR)/$(BINDIR)/xsnap-ocr
+-	cp -f xsnap.1.gz xsnap-ocr.1.gz $(DESTDIR)/usr/share/man/man1
+-	cd po ; $(MAKE) install
++	cp -f xsnap.1.gz xsnap-ocr.1.gz $(DESTDIR)/$(MANDIR)
++	cd po ; $(MAKE) LOCALEDIR='$(LOCALEDIR)' install
+ 
+ clean::
+ 	cd po ; $(MAKE) clean
diff --git a/x11-misc/xsnap/files/xsnap-1.5.15-root_name.patch b/x11-misc/xsnap/files/xsnap-1.5.15-root_name.patch
new file mode 100644
index 000000000000..48076680f207
--- /dev/null
+++ b/x11-misc/xsnap/files/xsnap-1.5.15-root_name.patch
@@ -0,0 +1,11 @@
+--- a/xsnap.c
++++ b/xsnap.c
+@@ -2254,7 +2254,7 @@
+ 	if (op_mode == 0)
+ 	    exitXsnap (NULL, NULL, snap_pixmap, copy_gc);
+ 
+-	if (!root_name)
++	if (*root_name == '\0')
+ 		strcpy(output_name, "(stdout)");
+ 
+ 	if (op_mode == 2) {
diff --git a/x11-misc/xsnap/metadata.xml b/x11-misc/xsnap/metadata.xml
new file mode 100644
index 000000000000..540f810e069d
--- /dev/null
+++ b/x11-misc/xsnap/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>desktop-misc</herd>
+</pkgmetadata>
diff --git a/x11-misc/xsnap/xsnap-1.5.10.ebuild b/x11-misc/xsnap/xsnap-1.5.10.ebuild
new file mode 100644
index 000000000000..e0daa27f595c
--- /dev/null
+++ b/x11-misc/xsnap/xsnap-1.5.10.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Program to interactively take a 'snapshot' of a region of the screen"
+HOMEPAGE="ftp://ftp.ac-grenoble.fr/ge/Xutils/"
+SRC_URI="ftp://ftp.ac-grenoble.fr/ge/Xutils/${P}.tar.bz2"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~amd64-linux"
+IUSE=""
+
+COMMON_DEPEND="
+	media-libs/libpng:0
+	virtual/jpeg:0
+	x11-libs/libX11
+	x11-libs/libXft
+	x11-libs/libXpm
+"
+RDEPEND="${COMMON_DEPEND}
+	media-fonts/font-misc-misc"
+DEPEND="${COMMON_DEPEND}
+	app-text/rman
+	dev-lang/perl
+	x11-misc/imake
+	x11-proto/xproto"
+
+DOCS=( AUTHORS Changelog README )
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-prefix.patch
+
+	xmkmf || die
+	sed -i \
+		-e '/ CC = /d' \
+		-e '/ LD = /d' \
+		-e '/ CDEBUGFLAGS = /d' \
+		-e '/ CCOPTIONS = /d' \
+		-e 's|CPP = cpp|CPP = $(CC)|g' \
+		Makefile || die
+}
+
+src_compile() {
+	tc-export CC
+	emake CCOPTIONS="${CFLAGS}" EXTRA_LDOPTIONS="${LDFLAGS}"
+}
+
+src_install() {
+	dodir /usr/share/man/man1
+	default
+}
diff --git a/x11-misc/xsnap/xsnap-1.5.11.ebuild b/x11-misc/xsnap/xsnap-1.5.11.ebuild
new file mode 100644
index 000000000000..bcb89dd63983
--- /dev/null
+++ b/x11-misc/xsnap/xsnap-1.5.11.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit toolchain-funcs
+
+DESCRIPTION="Program to interactively take a 'snapshot' of a region of the screen"
+HOMEPAGE="ftp://ftp.ac-grenoble.fr/ge/Xutils/"
+SRC_URI="ftp://ftp.ac-grenoble.fr/ge/Xutils/${P}.tar.bz2"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux"
+IUSE=""
+
+COMMON_DEPEND="
+	media-libs/libpng:0
+	virtual/jpeg:0
+	x11-libs/libX11
+	x11-libs/libXft
+	x11-libs/libXpm
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	media-fonts/font-misc-misc
+"
+DEPEND="
+	${COMMON_DEPEND}
+	app-text/rman
+	dev-lang/perl
+	x11-misc/imake
+	x11-proto/xproto
+"
+
+DOCS=( AUTHORS Changelog README )
+
+src_prepare() {
+	sed -i \
+		-e 's|/usr/share/locale|$(LOCALEDIR)|g' \
+		-e 's|/usr/share/man/man1|$(MANDIR)|g' \
+		-e '/cd po.*install/s|cd.*|$(MAKE) -C po LOCALEDIR=$(LOCALEDIR) install|' \
+		-e '21s|.*|LOCALEDIR = /usr/share/locale|' \
+		Imakefile || die
+	sed -i \
+		-e '/^LOCALEDIR=/d' \
+		po/Makefile || die
+
+	xmkmf || die
+
+	sed -i \
+		-e '/ CC = /d' \
+		-e '/ LD = /d' \
+		-e '/ CDEBUGFLAGS = /d' \
+		-e '/ CCOPTIONS = /d' \
+		-e 's|CPP = cpp|CPP = $(CC)|g' \
+		Makefile || die
+}
+
+src_compile() {
+	tc-export CC
+	emake CCOPTIONS="${CFLAGS}" EXTRA_LDOPTIONS="${LDFLAGS}"
+}
diff --git a/x11-misc/xsnap/xsnap-1.5.15.ebuild b/x11-misc/xsnap/xsnap-1.5.15.ebuild
new file mode 100644
index 000000000000..3d0c69a1c69f
--- /dev/null
+++ b/x11-misc/xsnap/xsnap-1.5.15.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Program to interactively take a 'snapshot' of a region of the screen"
+HOMEPAGE="ftp://ftp.ac-grenoble.fr/ge/Xutils/"
+SRC_URI="ftp://ftp.ac-grenoble.fr/ge/Xutils/${P}.tar.bz2"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux"
+IUSE=""
+
+COMMON_DEPEND="
+	media-libs/libpng:0
+	virtual/jpeg:0
+	x11-libs/libX11
+	x11-libs/libXft
+	x11-libs/libXpm
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	media-fonts/font-misc-misc
+"
+DEPEND="
+	${COMMON_DEPEND}
+	app-text/rman
+	dev-lang/perl
+	x11-misc/imake
+	x11-proto/xproto
+"
+
+DOCS=( AUTHORS Changelog README )
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-root_name.patch
+
+	sed -i \
+		-e 's|/usr/share/locale|$(LOCALEDIR)|g' \
+		-e 's|/usr/share/man/man1|$(MANDIR)|g' \
+		-e '/cd po.*install/s|cd.*|$(MAKE) -C po LOCALEDIR=$(LOCALEDIR) install|' \
+		-e '21s|.*|LOCALEDIR = /usr/share/locale|' \
+		Imakefile || die
+	sed -i \
+		-e '/^LOCALEDIR=/d' \
+		po/Makefile || die
+
+	xmkmf || die
+
+	sed -i \
+		-e '/ CC = /d' \
+		-e '/ LD = /d' \
+		-e '/ CDEBUGFLAGS = /d' \
+		-e '/ CCOPTIONS = /d' \
+		-e 's|CPP = cpp|CPP = $(CC)|g' \
+		Makefile || die
+}
+
+src_compile() {
+	tc-export CC
+	emake CCOPTIONS="${CFLAGS}" EXTRA_LDOPTIONS="${LDFLAGS}"
+}
diff --git a/x11-misc/xsnow/Manifest b/x11-misc/xsnow/Manifest
new file mode 100644
index 000000000000..845ff250e988
--- /dev/null
+++ b/x11-misc/xsnow/Manifest
@@ -0,0 +1 @@
+DIST xsnow-1.42.tar.gz 56752 SHA256 d0d7c8f1fb91ca096995b1c30797e8f443c2e97d6f1e5f574b31318ed05d561a
diff --git a/x11-misc/xsnow/metadata.xml b/x11-misc/xsnow/metadata.xml
new file mode 100644
index 000000000000..731225048652
--- /dev/null
+++ b/x11-misc/xsnow/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>desktop-misc</herd>
+</pkgmetadata>
diff --git a/x11-misc/xsnow/xsnow-1.42-r1.ebuild b/x11-misc/xsnow/xsnow-1.42-r1.ebuild
new file mode 100644
index 000000000000..4b3c186e86c2
--- /dev/null
+++ b/x11-misc/xsnow/xsnow-1.42-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+inherit toolchain-funcs
+
+DESCRIPTION="snow, reindeer, and santa on the root window"
+HOMEPAGE="http://dropmix.xs4all.nl/rick/Xsnow/"
+SRC_URI="http://dropmix.xs4all.nl/rick/Xsnow/${P}.tar.gz"
+
+LICENSE="freedist"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 sparc x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXt
+	x11-libs/libXext
+	x11-libs/libXpm"
+DEPEND="${RDEPEND}
+	app-text/rman
+	x11-misc/imake
+	x11-misc/gccmakedep
+	x11-proto/xextproto
+	x11-proto/xproto"
+
+src_compile() {
+	xmkmf || die
+	make depend || die
+	emake CC="$(tc-getCC)" CDEBUGFLAGS="${CFLAGS}" \
+		LOCAL_LDFLAGS="${LDFLAGS}" || die
+}
+
+src_install() {
+	dobin xsnow || die
+	rman -f HTML < xsnow._man > xsnow.1-html || die
+	newman xsnow._man xsnow.1 || die
+	newdoc xsnow.1-html xsnow.1.html || die
+	dodoc README || die
+}
diff --git a/x11-misc/xsri/Manifest b/x11-misc/xsri/Manifest
new file mode 100644
index 000000000000..889b14f18ca7
--- /dev/null
+++ b/x11-misc/xsri/Manifest
@@ -0,0 +1 @@
+DIST xsri-2.1.0-17.fc12.src.rpm 79266 SHA256 0fc0d459de22ea28ada1d4059ee9487a194fa2e35e38fd07bcb75c946586a95b SHA512 1e0948b4f03eef797fdef63732f592ebaa3aeff7010941c2df9ae0a3656a9c477adad48c72cf59531227f2427330cca13ae09c5c60739ec66411dcce10f44ee9 WHIRLPOOL a3b08d710f37eb7b743cb5a53b313c2a8db4c5caf6e0a43f3e1ddce697db7466a0d2da480a66e600de6432aca1913babe05c70d48519e3e3fd76dd3ee91b905a
diff --git a/x11-misc/xsri/files/xsri-2.1.0-configure.patch b/x11-misc/xsri/files/xsri-2.1.0-configure.patch
new file mode 100644
index 000000000000..c000e7091092
--- /dev/null
+++ b/x11-misc/xsri/files/xsri-2.1.0-configure.patch
@@ -0,0 +1,26 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,8 +1,5 @@
+ INCLUDES =					\
+	$(GTK_CFLAGS)				\
+-	-DG_DISABLE_DEPRECATED			\
+-	-DGDK_DISABLE_DEPRECATED		\
+-	-DGTK_DISABLE_DEPRECATED		\
+	-DSYSCONFDIR=\"$(sysconfdir)\"
+ 
+ bin_PROGRAMS = xsri
+--- a/configure.in
++++ b/configure.in
+@@ -26,9 +26,11 @@
+ 
+ dnl library checks (not using macros/ directory)
+ 
+-PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 1.3.13,,
++PKG_CHECK_MODULES(GTK, x11  gtk+-2.0 >= 1.3.13,,
+     AC_MSG_ERROR([*** GTK+-2.0 must be installed to compile xsri]))
+ 
++AC_CHECK_LIB(m, sqrt)
++
+ AC_SUBST(GTK_CFLAGS)
+ AC_SUBST(GTK_LIBS)
+ 
diff --git a/x11-misc/xsri/metadata.xml b/x11-misc/xsri/metadata.xml
new file mode 100644
index 000000000000..40838bc36783
--- /dev/null
+++ b/x11-misc/xsri/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>desktop-misc</herd>
+</pkgmetadata>
diff --git a/x11-misc/xsri/xsri-2.1.0-r3.ebuild b/x11-misc/xsri/xsri-2.1.0-r3.ebuild
new file mode 100644
index 000000000000..4bfd7d42a4f7
--- /dev/null
+++ b/x11-misc/xsri/xsri-2.1.0-r3.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils rpm
+
+DESCRIPTION="The xsri wallpaper setter from RedHat"
+HOMEPAGE="http://fedoraproject.org"
+SRC_URI="http://download.fedoraproject.org/pub/fedora/linux/releases/15/Everything/source/SRPMS/${P}-17.fc12.src.rpm"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86 ~x86-fbsd"
+
+RDEPEND="x11-libs/gtk+:2"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-configure.patch
+	eautoreconf
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS README
+	doman ../${PN}.1
+}
diff --git a/x11-misc/xssstate/Manifest b/x11-misc/xssstate/Manifest
new file mode 100644
index 000000000000..5e0d2e9d8b3c
--- /dev/null
+++ b/x11-misc/xssstate/Manifest
@@ -0,0 +1 @@
+DIST xssstate-1.1.tar.gz 3725 SHA256 c4b6f504a6a8eb247bc60960bd65cbf9631c008449a1d71ac4c55e34be1c6011 SHA512 96c59e9cc7b78aec8a95040cd1c4c6aaeb85f092c5a52cf64a62ceeb3fed65bdd3eb6f070b3d66ae8ec2544371a236f32e83e0a5c45e6d21f2bf7791b5c0d519 WHIRLPOOL a4325df86a593530975c758446d496d3815aab606bed0f768f52365438aa25339498cc32cd7b5d4e7a4a72e99649b388be2c3f3a9c2bdb093915f3e2ac750144
diff --git a/x11-misc/xssstate/files/xssstate-1.0.20130103-gentoo.patch b/x11-misc/xssstate/files/xssstate-1.0.20130103-gentoo.patch
new file mode 100644
index 000000000000..b951afe91a88
--- /dev/null
+++ b/x11-misc/xssstate/files/xssstate-1.0.20130103-gentoo.patch
@@ -0,0 +1,89 @@
+--- a/Makefile
++++ b/Makefile
+@@ -5,7 +5,7 @@
+ SRC = xssstate.c
+ OBJ = ${SRC:.c=.o}
+ 
+-all: options xssstate
++all: xssstate
+ 
+ options:
+ 	@echo xssstate build options:
+@@ -14,42 +14,34 @@
+ 	@echo "CC       = ${CC}"
+ 
+ .c.o:
+-	@echo CC $<
+-	@${CC} -c ${CFLAGS} $<
++	${CC} -c ${CFLAGS} $<
+ 
+ ${OBJ}: config.mk
+ 
+-xssstate: xssstate.o
+-	@echo CC -o $@
+-	@${CC} -o $@ xssstate.o ${LDFLAGS}
++xssstate: options xssstate.o
++	${CC} -o $@ xssstate.o ${LDFLAGS}
+ 
+ clean:
+-	@echo cleaning
+ 	@rm -f xssstate ${OBJ} xssstate-${VERSION}.tar.gz
+ 
+ dist: clean
+-	@echo creating dist tarball
+-	@mkdir -p xssstate-${VERSION}
+-	@cp -R LICENSE README Makefile config.mk xsidle.sh \
++	mkdir -p xssstate-${VERSION}
++	cp -R LICENSE README Makefile config.mk xsidle.sh \
+ 		xssstate.1 arg.h ${SRC} xssstate-${VERSION}
+-	@tar -cf xssstate-${VERSION}.tar xssstate-${VERSION}
+-	@gzip xssstate-${VERSION}.tar
+-	@rm -rf xssstate-${VERSION}
++	tar -cf xssstate-${VERSION}.tar xssstate-${VERSION}
++	gzip xssstate-${VERSION}.tar
++	rm -rf xssstate-${VERSION}
+ 
+ install: all
+-	@echo installing executable file to ${DESTDIR}${PREFIX}/bin
+-	@mkdir -p ${DESTDIR}${PREFIX}/bin
+-	@cp -f xssstate ${DESTDIR}${PREFIX}/bin
+-	@chmod 755 ${DESTDIR}${PREFIX}/bin/xssstate
+-	@echo installing manual page to ${DESTDIR}${MANPREFIX}/man1
+-	@mkdir -p ${DESTDIR}${MANPREFIX}/man1
+-	@sed "s/VERSION/${VERSION}/g" < xssstate.1 > ${DESTDIR}${MANPREFIX}/man1/xssstate.1
+-	@chmod 644 ${DESTDIR}${MANPREFIX}/man1/xssstate.1
++	mkdir -p ${DESTDIR}${PREFIX}/bin
++	cp -f xssstate ${DESTDIR}${PREFIX}/bin
++	chmod 755 ${DESTDIR}${PREFIX}/bin/xssstate
++#	mkdir -p ${DESTDIR}${MANPREFIX}/man1
++#	@sed "s/VERSION/${VERSION}/g" < xssstate.1 > ${DESTDIR}${MANPREFIX}/man1/xssstate.1
++#	@chmod 644 ${DESTDIR}${MANPREFIX}/man1/xssstate.1
+ 
+ uninstall:
+-	@echo removing executable file from ${DESTDIR}${PREFIX}/bin
+-	@rm -f ${DESTDIR}${PREFIX}/bin/xssstate
+-	@echo removing manual page from ${DESTDIR}${MANPREFIX}/man1
+-	@rm -f ${DESTDIR}${MANPREFIX}/man1/xssstate.1
++	rm -f ${DESTDIR}${PREFIX}/bin/xssstate
++#	@rm -f ${DESTDIR}${MANPREFIX}/man1/xssstate.1
+ 
+ .PHONY: all options clean dist install uninstall
+--- a/config.mk
++++ b/config.mk
+@@ -13,13 +13,13 @@
+ 
+ # flags
+ CPPFLAGS = -DVERSION=\"${VERSION}\"
+-CFLAGS = -g -std=c99 -pedantic -Wall -O0 ${INCS} ${CPPFLAGS}
+-LDFLAGS = -g ${LIBS}
++CFLAGS += -std=c99 -pedantic -Wall ${INCS} ${CPPFLAGS}
++LDFLAGS += ${LIBS}
+ 
+ # Solaris
+ #CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\"
+ #LDFLAGS = ${LIBS}
+ 
+ # compiler and linker
+-CC = cc
++CC ?= cc
+ 
diff --git a/x11-misc/xssstate/metadata.xml b/x11-misc/xssstate/metadata.xml
new file mode 100644
index 000000000000..d6e0a0f7eded
--- /dev/null
+++ b/x11-misc/xssstate/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>desktop-misc</herd>
+<maintainer>
+<email>jer@gentoo.org</email>
+<name>Jeroen Roovers</name>
+</maintainer>
+</pkgmetadata>
+
diff --git a/x11-misc/xssstate/xssstate-1.1.ebuild b/x11-misc/xssstate/xssstate-1.1.ebuild
new file mode 100644
index 000000000000..460229ec0b2e
--- /dev/null
+++ b/x11-misc/xssstate/xssstate-1.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils toolchain-funcs
+
+DESCRIPTION="A simple tool to retrieve the X screensaver state"
+HOMEPAGE="http://tools.suckless.org/xssstate"
+SRC_URI="http://dl.suckless.org/tools/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	x11-libs/libX11
+	x11-libs/libXScrnSaver
+"
+DEPEND="
+	${RDEPEND}
+	x11-proto/scrnsaverproto
+	x11-proto/xproto
+"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.0.20130103-gentoo.patch
+	tc-export CC
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX='/usr' install
+	dodoc README xsidle.sh
+	doman ${PN}.1
+}
diff --git a/x11-misc/xstroke/Manifest b/x11-misc/xstroke/Manifest
new file mode 100644
index 000000000000..c4b50ddf6ae5
--- /dev/null
+++ b/x11-misc/xstroke/Manifest
@@ -0,0 +1 @@
+DIST xstroke-0.6.tar.bz2 140237 SHA256 814a38ec6dada26a7bda5439fe34995d5ac812bf2e8c008f8b297ab08b42fb5f SHA512 0fb75f20dfcb8db68bb17d50a9dea2906e17ee1d8675bb7b4dea964189aa69c8bfcc101d7e7fac22209da3f83fc0d0afd569d443d3f585bffa2d62ce11ad772a WHIRLPOOL 233caa7771c2dd62e3bebbcfcb54addbcc149d889289142ac024016593618e746f4f80e8173c1605d9142be09a752b0552d92ef829763777111715b62b0c5c61
diff --git a/x11-misc/xstroke/files/xstroke-0.6-sigsegv_sprintf.patch b/x11-misc/xstroke/files/xstroke-0.6-sigsegv_sprintf.patch
new file mode 100644
index 000000000000..b36958849f53
--- /dev/null
+++ b/x11-misc/xstroke/files/xstroke-0.6-sigsegv_sprintf.patch
@@ -0,0 +1,13 @@
+diff -Nru xstroke-0.6.vanilla/sprintf_alloc.c xstroke-0.6/sprintf_alloc.c
+--- xstroke-0.6.vanilla/sprintf_alloc.c	2005-11-26 01:55:32.000000000 +0100
++++ xstroke-0.6/sprintf_alloc.c	2005-11-26 01:55:55.000000000 +0100
+@@ -74,7 +74,8 @@
+ {
+     char *new_str;
+     /* Guess we need no more than 100 bytes. */
+-    int n, size = 100;
++	/* yeah... right... */
++    int n, size = 512;
+  
+     if ((*str = malloc (size)) == NULL)
+ 	return -1;
diff --git a/x11-misc/xstroke/files/xstroke-0.6-underlinking.patch b/x11-misc/xstroke/files/xstroke-0.6-underlinking.patch
new file mode 100644
index 000000000000..52b39ddf4512
--- /dev/null
+++ b/x11-misc/xstroke/files/xstroke-0.6-underlinking.patch
@@ -0,0 +1,11 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -40,7 +40,7 @@
+ BUILT_SOURCES = rec_parse.h rec_lex.h rec_lex.c
+ AM_YFLAGS = -d
+ 
+-xstroke_LDADD = @XSTROKE_LIBS@ -lm -lpthread $(X_LIBS) -lXpm -lXtst
++xstroke_LDADD = @XSTROKE_LIBS@ -lm -lpthread $(X_LIBS) -lXpm -lXtst -lX11 -lXrender -lXext -ldl
+ AM_CFLAGS = @XSTROKE_CFLAGS@ -DXSTROKE_CONF_DIR='"$(sysconfdir)/xstroke"' $(X_CFLAGS)
+ 
+ EXTRA_DIST = xstroke_active.xpm xstroke_inactive.xpm etc/alphabet
diff --git a/x11-misc/xstroke/metadata.xml b/x11-misc/xstroke/metadata.xml
new file mode 100644
index 000000000000..6b3af6a2eb25
--- /dev/null
+++ b/x11-misc/xstroke/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>desktop-misc</herd>
+	<upstream>
+		<remote-id type="freshmeat">xstroke</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-misc/xstroke/xstroke-0.6-r1.ebuild b/x11-misc/xstroke/xstroke-0.6-r1.ebuild
new file mode 100644
index 000000000000..3d7e1e8d17cf
--- /dev/null
+++ b/x11-misc/xstroke/xstroke-0.6-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit autotools eutils
+
+DESCRIPTION="Gesture/Handwriting recognition engine for X"
+# Dead upstream?
+#HOMEPAGE="http://www.xstroke.org/"
+HOMEPAGE="http://freshmeat.net/projects/xstroke/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha ~amd64 hppa ~mips ppc sparc x86"
+IUSE=""
+
+RDEPEND="
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXft
+	x11-libs/libXpm
+	x11-libs/libXrender
+	x11-libs/libXtst
+"
+DEPEND="
+	${RDEPEND}
+	sys-devel/flex
+	virtual/pkgconfig
+	virtual/yacc
+	x11-proto/inputproto
+	x11-proto/xextproto
+	x11-proto/xproto
+"
+
+DOCS=( AUTHORS ChangeLog NEWS README TODO )
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-sigsegv_sprintf.patch \
+		"${FILESDIR}"/${P}-underlinking.patch
+	eautoreconf
+}
diff --git a/x11-misc/xteddy/Manifest b/x11-misc/xteddy/Manifest
new file mode 100644
index 000000000000..e0d2095b8159
--- /dev/null
+++ b/x11-misc/xteddy/Manifest
@@ -0,0 +1 @@
+DIST xteddy-2.2.tar.gz 867005 SHA256 d8885a1e2e08787cb469857a9404619cadab9bddcae7fa398a565d53633291e2 SHA512 e48f1f616980b747b3e528a7bb3a46605986e87e05cbad1385992931098acd8857cdd9fa7c38bca94007e74d1ab13cfd567fe6e502eecf8691e24272bd98159b WHIRLPOOL 3c479fa2ea3bc1f097a32c33bc15ea57c1cdb11fb830488865020a79c277a9d668c8e38ce6bc77da5398e7fcd92f91ce936bb88decce7fe0e94e8aa7755352fc
diff --git a/x11-misc/xteddy/files/xteddy-2.2-linking.patch b/x11-misc/xteddy/files/xteddy-2.2-linking.patch
new file mode 100644
index 000000000000..6dd01e48f5e9
--- /dev/null
+++ b/x11-misc/xteddy/files/xteddy-2.2-linking.patch
@@ -0,0 +1,22 @@
+--- a/configure.in
++++ b/configure.in
+@@ -5,6 +5,8 @@
+ 
+ AC_PATH_XTRA
+ PKG_CHECK_MODULES(IMLIB2, imlib2)
++PKG_CHECK_MODULES(X11, x11)
++PKG_CHECK_MODULES(XEXT, xext)
+ 
+ PIXMAP_PATH="/usr/share/xteddy"
+ AC_SUBST(PIXMAP_PATH)
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -7,7 +7,7 @@
+ bin_SCRIPTS = xtoys xteddy_test
+ 
+ AM_CFLAGS  = @IMLIB2_CFLAGS@
+-AM_LDFLAGS = @IMLIB2_LIBS@ -lX11
++xteddy_LDADD = @IMLIB2_LIBS@ @X11_LIBS@ @XEXT_LIBS@
+ 
+ DEFS = -DPIXMAP_PATH=\"@PIXMAP_PATH@\" -Wall
+ 
diff --git a/x11-misc/xteddy/metadata.xml b/x11-misc/xteddy/metadata.xml
new file mode 100644
index 000000000000..61b5fb040877
--- /dev/null
+++ b/x11-misc/xteddy/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>desktop-misc</herd>
+	<longdescription lang="en">
+		Normally, xteddy just sits around doing nothing. After all, that's what
+		teddy bears are for. Look at him, talk to him, place heavy windows on
+		top of him, zap him around until he becomes dizzy, do what you like; he
+		will always be your true (albeit virtual) friend. Now you can load other
+		pixmaps than the nice teddy, too.
+	</longdescription>
+</pkgmetadata>
diff --git a/x11-misc/xteddy/xteddy-2.2.ebuild b/x11-misc/xteddy/xteddy-2.2.ebuild
new file mode 100644
index 000000000000..fcc6fd287e28
--- /dev/null
+++ b/x11-misc/xteddy/xteddy-2.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils
+
+DESCRIPTION="A cuddly teddy bear (or other image) for your X desktop"
+HOMEPAGE="http://webstaff.itn.liu.se/~stegu/xteddy/"
+SRC_URI="http://webstaff.itn.liu.se/~stegu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="media-libs/imlib2[X,png]
+	x11-libs/libX11
+	x11-libs/libXext"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS README ChangeLog NEWS xteddy.README )
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-linking.patch
+
+	# Fix paths in xtoys script wrt bug #404899
+	sed -i -e "s:/usr/games:/usr/bin:" xtoys || die
+	eautoreconf
+}
diff --git a/x11-misc/xtermcontrol/Manifest b/x11-misc/xtermcontrol/Manifest
new file mode 100644
index 000000000000..e2c34a08b3ea
--- /dev/null
+++ b/x11-misc/xtermcontrol/Manifest
@@ -0,0 +1,2 @@
+DIST xtermcontrol-3.0.tar.gz 134440 SHA256 289c261b21c6b88e5b04f0387ae02d5cba754a9584b2a2054894cd2e5af5f9cf SHA512 610c817812311b8c8de7caa6d4a353de15a41835a00c9578e82cc722328ab9406d6ebd32d70da64f2a8d7f55581051347634233a90e074b4453fd115e6a16fa4 WHIRLPOOL d605a763adb1d16fab4d1c05cc6493ab7a4fc79c8ec54ca70c25e2f8ec1b3ae18ee2a415902938b6d8d7def604b88b21799fc306249e1feb4cad40f6bf931048
+DIST xtermcontrol-3.2.tar.gz 141574 SHA256 6e4f1de182aa0d1623405d831c01a99940390e3af45deadc43a171f4c432d1e1 SHA512 cfda6595508d2aa3c1a4c0bf5e158717592c471e80b0124a496f9966aa8221a00d62f1aa1642cd9c02c3110287f0fbbe86d1cf0b55d0f790e0434dcffd4cb286 WHIRLPOOL 0b3c22ffa305492e203b9bb1671fe23039cf087ee0f1cd331934bb27ca2045655305078640599fdf9988e8a705c29fce0ea1464e9a94e97b4c4e5bd984523489
diff --git a/x11-misc/xtermcontrol/metadata.xml b/x11-misc/xtermcontrol/metadata.xml
new file mode 100644
index 000000000000..546318348d25
--- /dev/null
+++ b/x11-misc/xtermcontrol/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>x11</herd>
+<longdescription>
+xtermcontrol enables dynamic control of xterm properties.
+It makes it easy to change colors, title, font and geometry of a running xterm,
+as well as to report the current settings of the aforementioned properties.
+Window manipulations de-/iconify, raise/lower, maximize/restore and reset are also supported.
+To complete the feature set; xtermcontrol lets advanced users issue any xterm control
+sequence of their choosing.
+</longdescription>
+</pkgmetadata>
diff --git a/x11-misc/xtermcontrol/xtermcontrol-3.0.ebuild b/x11-misc/xtermcontrol/xtermcontrol-3.0.ebuild
new file mode 100644
index 000000000000..0d6f341b3114
--- /dev/null
+++ b/x11-misc/xtermcontrol/xtermcontrol-3.0.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="xtermcontrol enables dynamic control of XFree86 xterm properties"
+HOMEPAGE="http://www.thrysoee.dk/xtermcontrol/"
+SRC_URI="http://www.thrysoee.dk/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="alpha amd64 ia64 ppc ~sparc x86"
+IUSE=""
diff --git a/x11-misc/xtermcontrol/xtermcontrol-3.2.ebuild b/x11-misc/xtermcontrol/xtermcontrol-3.2.ebuild
new file mode 100644
index 000000000000..7ef5948a3990
--- /dev/null
+++ b/x11-misc/xtermcontrol/xtermcontrol-3.2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="xtermcontrol enables dynamic control of XFree86 xterm properties"
+HOMEPAGE="http://www.thrysoee.dk/xtermcontrol/"
+SRC_URI="http://www.thrysoee.dk/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="alpha amd64 ia64 ppc ~sparc x86"
+IUSE=""
diff --git a/x11-misc/xtoolwait/Manifest b/x11-misc/xtoolwait/Manifest
new file mode 100644
index 000000000000..b9a9b50a85d7
--- /dev/null
+++ b/x11-misc/xtoolwait/Manifest
@@ -0,0 +1 @@
+DIST xtoolwait-1.3.tar.gz 14315 RMD160 db75a684c5655d2cafad9eadedcf875e812f98d7 SHA1 544fbf1deca73324087272d22655a67cf72a5c6f SHA256 c6d075b75294d92440a37a45a6b8bbda07b9d58df5bf585f5a265679f16cb485
diff --git a/x11-misc/xtoolwait/metadata.xml b/x11-misc/xtoolwait/metadata.xml
new file mode 100644
index 000000000000..731225048652
--- /dev/null
+++ b/x11-misc/xtoolwait/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>desktop-misc</herd>
+</pkgmetadata>
diff --git a/x11-misc/xtoolwait/xtoolwait-1.3-r2.ebuild b/x11-misc/xtoolwait/xtoolwait-1.3-r2.ebuild
new file mode 100644
index 000000000000..c30e9640a7b3
--- /dev/null
+++ b/x11-misc/xtoolwait/xtoolwait-1.3-r2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit toolchain-funcs
+
+DESCRIPTION="Xtoolwait notably decreases the startup time of an X session"
+HOMEPAGE="http://ftp.x.org/contrib/utilities/xtoolwait-1.3.README"
+SRC_URI="http://ftp.x.org/contrib/utilities/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext"
+DEPEND="${RDEPEND}
+	app-text/rman
+	x11-misc/imake
+	x11-proto/xproto"
+
+src_prepare() {
+	xmkmf || die
+	sed -i \
+		-e '/CC = /d' -e '/EXTRA_LDOPTIONS = /d' \
+		Makefile || die
+}
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		CCOPTIONS="${CFLAGS}" \
+		EXTRA_LDOPTIONS="${LDFLAGS}"
+}
+
+src_install() {
+	emake \
+		BINDIR=/usr/bin \
+		MANPATH=/usr/share/man \
+		DOCDIR=/usr/share/doc/${PF} \
+		DESTDIR="${D}" \
+		install{,.man}
+
+	dodoc CHANGES README
+}
diff --git a/x11-misc/xtrace/Manifest b/x11-misc/xtrace/Manifest
new file mode 100644
index 000000000000..b1215cfd6e56
--- /dev/null
+++ b/x11-misc/xtrace/Manifest
@@ -0,0 +1 @@
+DIST xtrace_1.3.0.orig.tar.gz 183803 SHA256 725d6a42d760744d053b912de3259f391f3560dc4b0a624c1f4f2ba9db35dcad
diff --git a/x11-misc/xtrace/metadata.xml b/x11-misc/xtrace/metadata.xml
new file mode 100644
index 000000000000..9f624545b1b0
--- /dev/null
+++ b/x11-misc/xtrace/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>proxy-maintainers</herd>
+<maintainer>
+	<email>nightnord@gmail.com</email>
+	<name>Andrian Nord</name>
+</maintainer>
+<maintainer>
+	<email>maksbotan@gentoo.org</email>
+	<name>Maxim Koltsov</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-misc/xtrace/xtrace-1.3.0.ebuild b/x11-misc/xtrace/xtrace-1.3.0.ebuild
new file mode 100644
index 000000000000..b51a5e67adde
--- /dev/null
+++ b/x11-misc/xtrace/xtrace-1.3.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit autotools-utils
+
+MY_CODE="3694"
+
+DESCRIPTION="X11 protocol trace utility"
+HOMEPAGE="http://xtrace.alioth.debian.org/"
+SRC_URI="https://alioth.debian.org/frs/download.php/${MY_CODE}/${P/-/_}.orig.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~s390 ~sh ~x86"
+IUSE=""
+
+DEPEND="x11-libs/libX11"
+RDEPEND="${DEPEND}"
+
+DOCS=(AUTHORS ChangeLog README NEWS)
+
+src_configure() {
+	local myeconfargs=(
+		--program-transform-name="s/^x/x11/"
+	)
+
+	autotools-utils_src_configure
+}
+
+pkg_postinst () {
+	einfo "To avoid collision with glibc (/usr/bin/xtrace)"
+	einfo "binary was renamed to x11trace, as suggested by author"
+}
diff --git a/x11-misc/xtrlock/Manifest b/x11-misc/xtrlock/Manifest
new file mode 100644
index 000000000000..604d00790660
--- /dev/null
+++ b/x11-misc/xtrlock/Manifest
@@ -0,0 +1 @@
+DIST xtrlock_2.7.tar.gz 20939 SHA256 9993e099fe1c74176fa4b7863cbcf1f746307ee6c90c9ad1e4d2dae1871be6b9 SHA512 44693dfa7b8b109b19c4f61902ac5c181af1d8fb6044115517391211411239a506108e6fd5b998978030f997f9094e9df18e5d40499c6b3b83a42cf9dd1b7f92 WHIRLPOOL 687572be8b7e5118e7d9afedb8c54c74afb647caebc5f4c14c59af2871d86cf25a1c596563e2c903774ab11842b92d2c6245e1c3c9762036c4bcdcfe5373a2e6
diff --git a/x11-misc/xtrlock/metadata.xml b/x11-misc/xtrlock/metadata.xml
new file mode 100644
index 000000000000..2518313f5241
--- /dev/null
+++ b/x11-misc/xtrlock/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+        <herd>desktop-misc</herd>
+</pkgmetadata>
diff --git a/x11-misc/xtrlock/xtrlock-2.7.ebuild b/x11-misc/xtrlock/xtrlock-2.7.ebuild
new file mode 100644
index 000000000000..7b1db7a53169
--- /dev/null
+++ b/x11-misc/xtrlock/xtrlock-2.7.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit toolchain-funcs
+
+#Note: there's no difference vs 2.0-12
+MY_P=${P/-/_}
+
+DESCRIPTION="A simplistic screen locking program for X"
+SRC_URI="mirror://debian/pool/main/x/xtrlock/${MY_P}.tar.gz"
+HOMEPAGE="http://ftp.debian.org/debian/pool/main/x/xtrlock/"
+
+SLOT="0"
+LICENSE="GPL-3"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+RDEPEND="x11-libs/libX11"
+DEPEND="${RDEPEND}
+	x11-proto/xproto
+	x11-misc/imake"
+
+src_prepare() {
+	sed -i -e 's|".*"|"'"${PV}"'"|g' patchlevel.h || die
+}
+
+src_compile() {
+	xmkmf || die
+	emake CDEBUGFLAGS="${CFLAGS} -DSHADOW_PWD" CC="$(tc-getCC)" \
+		EXTRA_LDOPTIONS="${LDFLAGS}" xtrlock
+}
+
+src_install() {
+	dobin xtrlock
+	chmod u+s "${D}"/usr/bin/xtrlock
+	newman xtrlock.man xtrlock.1
+	dodoc debian/changelog
+}
diff --git a/x11-misc/xtscal/Manifest b/x11-misc/xtscal/Manifest
new file mode 100644
index 000000000000..9d08e6a21b3f
--- /dev/null
+++ b/x11-misc/xtscal/Manifest
@@ -0,0 +1,3 @@
+DIST xtscal-0.6.3-patches-0.1.tar.bz2 6142 SHA256 b1cd33ec1bf9fea9d6035bf849f28ebb90d734c4d7ce8d1bc3ddc358d0325b96 SHA512 cd5f83d7e9dcb0f0552a0a9edea58f00abfaa0af8fcc84e416715675d07d5130afcb8cda2b7266a746189c1dce0fa886d7d4945ff3134066fd493b821ae56fe3 WHIRLPOOL a6e4e96ba3a32ab8bce93e85cc974cf4c91531d10924c98c89a87aab37b6709ad99130ab67df35f5091e8e5906e5c6367ca11f01efde4e1f249714e4a642d55e
+DIST xtscal-0.6.3-patches-0.2.tar.bz2 6152 SHA256 a2c421e48b8d43dc2a5461f26a22ce43b5ed40df1053efce8f85f4cda13f971c SHA512 ee2285b380e62e661c1765658dc8fe970b7bc970b15b0bc257d7dec40391bc3ddeae74ec083ce0142ea103d4a9711df100f3bd3a486924fd731cf9d8fe3e26ea WHIRLPOOL bacb3d55571dc764e71cc80540d8bce42aa65533fa7fb8ae0c272b7c7bee183dace03f9e21ac67c562cfeef02bcfa693f6d36a737250f4258f74ada545b6b953
+DIST xtscal-0.6.3.tar.bz2 80155 SHA256 27b9dc2203de9b1706ca39fa6ca80ecab8807909ec901c4a345b8e41178800a1 SHA512 f6f0ea5332f707151873e7130d4275d584a77d764b4d79e02602b777a67be4e0c02562a31b0cd988490ab89069fb01e7d589e8cd21838988dfabf7b774d79153 WHIRLPOOL 6a05820fdf0540bc91a525f09959632dadc61074d653305b7bfa75feeeff6f3e80faa177bb4c9903c6f7390cb7713c1e726de99ec9b583a4393c136b78bf7975
diff --git a/x11-misc/xtscal/metadata.xml b/x11-misc/xtscal/metadata.xml
new file mode 100644
index 000000000000..d7e55682affc
--- /dev/null
+++ b/x11-misc/xtscal/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>x11</herd>
+<herd>embedded</herd>
+</pkgmetadata>
diff --git a/x11-misc/xtscal/xtscal-0.6.3-r1.ebuild b/x11-misc/xtscal/xtscal-0.6.3-r1.ebuild
new file mode 100644
index 000000000000..b0cf5f791292
--- /dev/null
+++ b/x11-misc/xtscal/xtscal-0.6.3-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools eutils
+
+DESCRIPTION="Touchscreen calibration utility"
+HOMEPAGE="http://gpe.linuxtogo.org/"
+SRC_URI="http://gpe.linuxtogo.org/download/source/${P}.tar.bz2 mirror://gentoo/xtscal-0.6.3-patches-0.2.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="x11-libs/libX11"
+DEPEND="${RDEPEND}
+	x11-libs/libXCalibrate
+	x11-libs/libXft
+	x11-proto/xcalibrateproto"
+
+src_prepare() {
+	epatch "${WORKDIR}"/patch/*.patch
+	eautoreconf
+}
+
+src_install() {
+	dobin xtscal
+}
diff --git a/x11-misc/xtscal/xtscal-0.6.3.ebuild b/x11-misc/xtscal/xtscal-0.6.3.ebuild
new file mode 100644
index 000000000000..3851fd54dea6
--- /dev/null
+++ b/x11-misc/xtscal/xtscal-0.6.3.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit autotools eutils
+
+DESCRIPTION="Touchscreen calibration utility"
+HOMEPAGE="http://gpe.linuxtogo.org/"
+SRC_URI="http://gpe.linuxtogo.org/download/source/${P}.tar.bz2 mirror://gentoo/xtscal-0.6.3-patches-0.1.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="x11-libs/libX11"
+DEPEND="${RDEPEND}
+	x11-libs/libXCalibrate
+	x11-libs/libXft
+	x11-proto/xcalibrateproto"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${WORKDIR}"/patch/*.patch
+	eautoreconf
+}
+
+src_install() {
+	dobin xtscal || die
+}
diff --git a/x11-misc/xvkbd/Manifest b/x11-misc/xvkbd/Manifest
new file mode 100644
index 000000000000..d9966d8744bd
--- /dev/null
+++ b/x11-misc/xvkbd/Manifest
@@ -0,0 +1,3 @@
+DIST xvkbd-3.4a.tar.gz 79694 SHA256 a81dd585d642ee6df71fb8d2b86290ec33930fa2c029a412aeae1b4af665fb7b SHA512 f905c6c57c9b1243354dd0c3f7865cfbe26a53ebb66cfa9f46f5176882a5e05a074ac50555c4fe0195264b3e9d79f5191820aa3aac51e995ca286a4df8031f1d WHIRLPOOL 0d7b98db90a4e96502827cfb485c0915e5c0e0fa447518ab4d48a80349af728dfd877306bbc7084667ea02031b8001ce5db591b9be760ee85c15b727f18f6880
+DIST xvkbd-3.5.tar.gz 108351 SHA256 8819bdba359f1d0894bfc0b3314d5cdb9107387de6f19d2f409dba15e82b8fee SHA512 e847512bf023a540127297420829cb73cc142fa06e3044a6a8b3d051f3fca38427f2a262c50e57afc94317acdd05f9d4e880faf4826887255e081c460bc4d305 WHIRLPOOL 1615c1095acd99b4c89cde08dcced1dcf055229032f14e5f3b3583a0251733f98a0eadd3ca2fd552316733a8a1e12e678fc67c9870a34a1ff199baf256196c8e
+DIST xvkbd-3.6.tar.gz 81613 SHA256 2678541c23336a0795bf5684c9f38d382a6566e6509794a39952d6da47da5bae SHA512 55f4ab7959e66320d094938e8c87bef5ae243c7e37f35aa7b01dc1be76182c18e493964e3dccc1ee78c797d380d9a55fcbebf3a0219c4a6d0bbb999840a31b6e WHIRLPOOL 54454523465ec3353eaebcdc64210040b4a83eedb407e2bc2814757749331996b376da7e1ba90eca849b3c143622a2a0c63429905459e1d4e588d368be3fa4dd
diff --git a/x11-misc/xvkbd/files/xvkbd-3.6-last_altgr_mask.patch b/x11-misc/xvkbd/files/xvkbd-3.6-last_altgr_mask.patch
new file mode 100644
index 000000000000..7fe70773acca
--- /dev/null
+++ b/x11-misc/xvkbd/files/xvkbd-3.6-last_altgr_mask.patch
@@ -0,0 +1,11 @@
+--- a/xvkbd.c
++++ b/xvkbd.c
+@@ -681,7 +681,7 @@
+     }
+   }
+ 
+-  last_altgr_mask = (altgr_mask | last_altgr_mask);
++  last_altgr_mask = altgr_mask;
+   alt_mask = 0;
+   meta_mask = 0;
+   altgr_mask = 0;
diff --git a/x11-misc/xvkbd/metadata.xml b/x11-misc/xvkbd/metadata.xml
new file mode 100644
index 000000000000..731225048652
--- /dev/null
+++ b/x11-misc/xvkbd/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>desktop-misc</herd>
+</pkgmetadata>
diff --git a/x11-misc/xvkbd/xvkbd-3.4a-r1.ebuild b/x11-misc/xvkbd/xvkbd-3.4a-r1.ebuild
new file mode 100644
index 000000000000..357b82203dd9
--- /dev/null
+++ b/x11-misc/xvkbd/xvkbd-3.4a-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit toolchain-funcs eutils
+
+DESCRIPTION="virtual keyboard for X window system"
+HOMEPAGE="http://homepage3.nifty.com/tsato/xvkbd/"
+SRC_URI="http://homepage3.nifty.com/tsato/xvkbd/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+RDEPEND="
+	x11-libs/libX11
+	x11-libs/libXaw
+	x11-libs/libXaw3d
+	x11-libs/libXmu
+	x11-libs/libXt
+	x11-libs/libXtst
+"
+DEPEND="
+	${RDEPEND}
+	app-text/rman
+	x11-misc/gccmakedep
+	x11-misc/imake
+	x11-proto/inputproto
+	x11-proto/xextproto
+	x11-proto/xproto
+"
+
+src_prepare() {
+	epatch_user
+}
+
+src_configure() {
+	xmkmf -a || die
+}
+
+src_compile() {
+	emake \
+		CC=$(tc-getCC) LD=$(tc-getCC) \
+		XAPPLOADDIR="/etc/X11/app-defaults" \
+		LOCAL_LDFLAGS="${LDFLAGS}" \
+		CDEBUGFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	emake \
+		XAPPLOADDIR="/etc/X11/app-defaults" \
+		DESTDIR="${D}" \
+		install
+
+	rm -rf "${D}"/usr/lib "${D}"/etc
+
+	dodoc README
+	newman ${PN}.man ${PN}.1
+}
diff --git a/x11-misc/xvkbd/xvkbd-3.5-r1.ebuild b/x11-misc/xvkbd/xvkbd-3.5-r1.ebuild
new file mode 100644
index 000000000000..ac2a38cd765e
--- /dev/null
+++ b/x11-misc/xvkbd/xvkbd-3.5-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="virtual keyboard for X window system"
+HOMEPAGE="http://homepage3.nifty.com/tsato/xvkbd/"
+SRC_URI="http://homepage3.nifty.com/tsato/xvkbd/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND="
+	x11-libs/libX11
+	x11-libs/libXaw
+	x11-libs/libXaw3d
+	x11-libs/libXmu
+	x11-libs/libXt
+	x11-libs/libXtst
+"
+DEPEND="
+	${RDEPEND}
+	app-text/rman
+	x11-misc/gccmakedep
+	x11-misc/imake
+	x11-proto/inputproto
+	x11-proto/xextproto
+	x11-proto/xproto
+"
+
+src_prepare() {
+	epatch_user
+}
+
+src_configure() {
+	xmkmf -a || die
+}
+
+src_compile() {
+	emake \
+		CC=$(tc-getCC) LD=$(tc-getCC) \
+		XAPPLOADDIR="/usr/share/X11/app-defaults" \
+		LOCAL_LDFLAGS="${LDFLAGS}" \
+		CDEBUGFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	emake \
+		XAPPLOADDIR="/usr/share/X11/app-defaults" \
+		DESTDIR="${D}" \
+		install
+
+	rm -r "${D}"/usr/$(get_libdir) "${D}"/etc || die
+
+	dodoc README
+	newman ${PN}.man ${PN}.1
+}
diff --git a/x11-misc/xvkbd/xvkbd-3.6.ebuild b/x11-misc/xvkbd/xvkbd-3.6.ebuild
new file mode 100644
index 000000000000..11ad60c77a5f
--- /dev/null
+++ b/x11-misc/xvkbd/xvkbd-3.6.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="virtual keyboard for X window system"
+HOMEPAGE="http://homepage3.nifty.com/tsato/xvkbd/"
+SRC_URI="http://homepage3.nifty.com/tsato/xvkbd/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND="
+	x11-libs/libX11
+	x11-libs/libXaw
+	x11-libs/libXaw3d
+	x11-libs/libXmu
+	x11-libs/libXt
+	x11-libs/libXtst
+"
+DEPEND="
+	${RDEPEND}
+	app-text/rman
+	x11-misc/gccmakedep
+	x11-misc/imake
+	x11-proto/inputproto
+	x11-proto/xextproto
+	x11-proto/xproto
+"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-last_altgr_mask.patch
+
+	epatch_user
+}
+
+src_configure() {
+	xmkmf -a || die
+}
+
+src_compile() {
+	emake \
+		CC=$(tc-getCC) LD=$(tc-getCC) \
+		XAPPLOADDIR="/usr/share/X11/app-defaults" \
+		LOCAL_LDFLAGS="${LDFLAGS}" \
+		CDEBUGFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	emake \
+		XAPPLOADDIR="/usr/share/X11/app-defaults" \
+		DESTDIR="${D}" \
+		install
+
+	rm -r "${D}"/usr/$(get_libdir) "${D}"/etc || die
+
+	dodoc README
+	newman ${PN}.man ${PN}.1
+}
diff --git a/x11-misc/xwinwrap/Manifest b/x11-misc/xwinwrap/Manifest
new file mode 100644
index 000000000000..c634fca85d73
--- /dev/null
+++ b/x11-misc/xwinwrap/Manifest
@@ -0,0 +1 @@
+DIST xwinwrap-0_p4.tar.gz 4905 SHA256 d2df2dd04c79546f41f6fca3d6948eaf1b07b4742aec3cabfd2739509ca0763b SHA512 c209e1e0be366e63180f1e58844e7870d83786e912edd2e21912c6d404b44e9186a5f91be6f12ccb78c96c5bac23df02cc6d3d8fdb54743be3ef2586604bd853 WHIRLPOOL 91ccb7e80ae36c4612f59bdd5b05d3e3807f4eea9ac124beacfb67a6e45bffb128209d9032df268e26f01e8d316e029b925ac0611b2970f70b980669e6a5f5a5
diff --git a/x11-misc/xwinwrap/metadata.xml b/x11-misc/xwinwrap/metadata.xml
new file mode 100644
index 000000000000..59acc2cc580e
--- /dev/null
+++ b/x11-misc/xwinwrap/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+<email>xmw@gentoo.org</email>
+<name>Michael Weber</name>
+</maintainer>
+</pkgmetadata>
+
diff --git a/x11-misc/xwinwrap/xwinwrap-0_p4.ebuild b/x11-misc/xwinwrap/xwinwrap-0_p4.ebuild
new file mode 100644
index 000000000000..6b7770e9a1af
--- /dev/null
+++ b/x11-misc/xwinwrap/xwinwrap-0_p4.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit toolchain-funcs vcs-snapshot
+
+DESCRIPTION="replace a desktop background with a movie or screensaver"
+HOMEPAGE="http://tech.shantanugoel.com/projects/linux/shantz-xwinwrap"
+SRC_URI="http://bazaar.launchpad.net/~shantanu-goel/xwinwrap/devel/tarball/4 -> ${P}.tar.gz"
+
+LICENSE="HPND"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/libXext
+	x11-libs/libXrender"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${P}/${PN}/devel
+
+src_compile() {
+	local cmd="$(tc-getCC) -Wall ${CFLAGS} ${PN}.c -o ${PN} ${LDFLAGS} \
+		 $(pkg-config --libs x11 xext xrender)"
+	echo $cmd
+	$cmd || die
+}
+
+src_install() {
+	dobin ${PN}
+}
diff --git a/x11-misc/xwit/Manifest b/x11-misc/xwit/Manifest
new file mode 100644
index 000000000000..e1d32c6e0b94
--- /dev/null
+++ b/x11-misc/xwit/Manifest
@@ -0,0 +1 @@
+DIST xwit-3.4.tar.gz 14536 SHA256 d915a7f2f8809da41edcc7784c2618be3f8ce179d82d8ace6d27ba264332c729 SHA512 db0cc8cd7e899790493ca97fa4f12869385d1cfaa807298476d961401004d752531fe75ec72520733e78d81dcd91009c1b4437295056dc1de6219d766235cc5f WHIRLPOOL a72beed7ee71abc4b1679979bb05185f97fe905f2bf36b1bab6cc9874fc282b303ce458e5f1acdc9497fdc545444582f1e943d014c2747782bbbd0b70f961b08
diff --git a/x11-misc/xwit/files/Makefile b/x11-misc/xwit/files/Makefile
new file mode 100644
index 000000000000..7b106f0d7168
--- /dev/null
+++ b/x11-misc/xwit/files/Makefile
@@ -0,0 +1,6 @@
+src = xwit.c dsimple.c ClientWin.c
+
+all: xwit
+
+xwit: $(o)
+	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $(src) -o xwit -lX11
diff --git a/x11-misc/xwit/files/malloc.patch b/x11-misc/xwit/files/malloc.patch
new file mode 100644
index 000000000000..41c3a7b82eff
--- /dev/null
+++ b/x11-misc/xwit/files/malloc.patch
@@ -0,0 +1,11 @@
+--- dsimple.c_	2005-06-05 16:07:10.000000000 +0200
++++ dsimple.c	2005-06-05 16:07:47.000000000 +0200
+@@ -46,7 +46,7 @@
+ char *Malloc(size)
+      unsigned size;
+ {
+-	char *data, *malloc();
++	char *data; //, *malloc();
+ 
+ 	if (!(data = malloc(size)))
+ 	  Fatal_Error("Out of memory!");
diff --git a/x11-misc/xwit/files/xwit-3.4-malloc-includes.patch b/x11-misc/xwit/files/xwit-3.4-malloc-includes.patch
new file mode 100644
index 000000000000..beda933c19f3
--- /dev/null
+++ b/x11-misc/xwit/files/xwit-3.4-malloc-includes.patch
@@ -0,0 +1,49 @@
+--- a/dsimple.c	1995-10-19 00:59:17.000000000 +0100
++++ b/dsimple.c	2013-08-03 18:27:16.670506562 +0200
+@@ -5,6 +5,8 @@
+ #include <X11/Xutil.h>
+ #include <X11/cursorfont.h>
+ #include <stdio.h>
++#include <stdlib.h> /* malloc() */
++#include <unistd.h> /* exit() */
+ /*
+  * Other_stuff.h: Definitions of routines in other_stuff.
+  *
+@@ -46,7 +48,7 @@
+ char *Malloc(size)
+      unsigned size;
+ {
+-	char *data, *malloc();
++	char *data; /*, *malloc(); */
+ 
+ 	if (!(data = malloc(size)))
+ 	  Fatal_Error("Out of memory!");
+@@ -62,7 +64,7 @@
+         char *ptr;
+         int size;
+ {
+-	char *new_ptr, *realloc();
++	char *new_ptr; /*, *realloc(); */
+ 
+ 	if (!ptr)
+ 	  return(Malloc(size));
+--- a/xwit.c	1997-10-21 03:32:54.000000000 +0200
++++ b/xwit.c	2013-08-03 18:38:52.075456902 +0200
+@@ -31,6 +31,8 @@
+ #include <X11/Xutil.h>
+ #include <X11/Xproto.h>
+ #include <stdio.h>
++#include <stdlib.h> /* atoi() */
++#include <sys/select.h> /* select() */                                                                                              
+ #include <sys/time.h>
+ #include "dsimple.h"
+ 
+@@ -134,7 +136,7 @@
+     struct timeval tv;
+     tv.tv_sec = ms/1000;
+     tv.tv_usec = (ms%1000)*1000;
+-    select(0,(int*)0,(int*)0,(int*)0,&tv);
++    select(0,0,0,0,&tv);
+ }
+ 
+ /*
diff --git a/x11-misc/xwit/metadata.xml b/x11-misc/xwit/metadata.xml
new file mode 100644
index 000000000000..2518313f5241
--- /dev/null
+++ b/x11-misc/xwit/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+        <herd>desktop-misc</herd>
+</pkgmetadata>
diff --git a/x11-misc/xwit/xwit-3.4-r1.ebuild b/x11-misc/xwit/xwit-3.4-r1.ebuild
new file mode 100644
index 000000000000..758c1a806724
--- /dev/null
+++ b/x11-misc/xwit/xwit-3.4-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils toolchain-funcs
+
+DESCRIPTION="A collection of simple routines to call some of those X11 functions"
+HOMEPAGE="http://ftp.x.org/contrib/utilities/xwit-3.4.README"
+SRC_URI="http://ftp.x.org/contrib/utilities/${P}.tar.gz"
+
+LICENSE="public-domain HPND"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/libX11"
+DEPEND="${RDEPEND}
+	x11-proto/xproto"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-malloc-includes.patch
+
+	cp -vf "${FILESDIR}"/Makefile .
+
+	tc-export CC
+}
+
+src_install() {
+	dobin xwit
+	newman xwit.man xwit.1
+	dodoc README
+}
diff --git a/x11-misc/xwit/xwit-3.4.ebuild b/x11-misc/xwit/xwit-3.4.ebuild
new file mode 100644
index 000000000000..efacade6cb14
--- /dev/null
+++ b/x11-misc/xwit/xwit-3.4.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+inherit eutils toolchain-funcs
+
+DESCRIPTION="A collection of simple routines to call some of those X11 functions"
+HOMEPAGE="http://ftp.x.org/contrib/utilities/xwit-3.4.README"
+SRC_URI="http://ftp.x.org/contrib/utilities/${P}.tar.gz"
+
+LICENSE="public-domain HPND"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc x86"
+IUSE=""
+
+RDEPEND="x11-libs/libX11"
+DEPEND="${RDEPEND}
+	x11-proto/xproto"
+
+src_prepare() {
+	epatch "${FILESDIR}"/malloc.patch
+	cp -vf "${FILESDIR}"/Makefile .
+}
+
+src_compile() {
+	tc-export CC
+	emake || die
+}
+
+src_install() {
+	dobin xwit || die
+	newman xwit.man xwit.1 || die
+}
diff --git a/x11-misc/xwrits/Manifest b/x11-misc/xwrits/Manifest
new file mode 100644
index 000000000000..264ebe8609c3
--- /dev/null
+++ b/x11-misc/xwrits/Manifest
@@ -0,0 +1 @@
+DIST xwrits-2.26.tar.gz 196529 SHA256 aaca4809b4cd62a627335ca14a231d4ab556fc872458bdb6fdbf6e76b103fed8
diff --git a/x11-misc/xwrits/metadata.xml b/x11-misc/xwrits/metadata.xml
new file mode 100644
index 000000000000..731225048652
--- /dev/null
+++ b/x11-misc/xwrits/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>desktop-misc</herd>
+</pkgmetadata>
diff --git a/x11-misc/xwrits/xwrits-2.26.ebuild b/x11-misc/xwrits/xwrits-2.26.ebuild
new file mode 100644
index 000000000000..0c749387a657
--- /dev/null
+++ b/x11-misc/xwrits/xwrits-2.26.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+DESCRIPTION="Reminds you to take wrist breaks, which will hopefully help you prevent repetitive stress injury"
+HOMEPAGE="http://www.lcdf.org/xwrits/"
+SRC_URI="http://www.lcdf.org/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXinerama"
+DEPEND="${RDEPEND}
+	x11-proto/xproto
+	x11-proto/xineramaproto"
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc GESTURES NEWS README TODO
+}
diff --git a/x11-misc/xxkb/Manifest b/x11-misc/xxkb/Manifest
new file mode 100644
index 000000000000..a0c2b87bc9d7
--- /dev/null
+++ b/x11-misc/xxkb/Manifest
@@ -0,0 +1,3 @@
+DIST xxkb-1.11-src.tar.gz 37262 SHA256 596d465bd39b2b660c1d19390a82cc5515cbf8f7e9600e82135564469e11bd3c SHA512 12675bee3be5a37b5e471fa763e2f8600859d5621dcf7ea9f004bad8f2200035582661cfb36938e9606582a86570e6de99c30dcf2d988c96604daf1185592c14 WHIRLPOOL da14d3ee40c35efa1dc3eb3b5df17a53540ed9eb007a7b8a42039dbf8bb97052d27ee77d04b3f115c002daebc0a7229aafb855621b057ab294b45cecb5beed87
+DIST xxkb-1.11.1-src.tar.gz 38123 SHA256 ceaa33bed81d8ae5bf77e89787d0736f7564c3de047c35a57bcbf6f4d1888142 SHA512 081629ccee41016cd468bd411c8584298bf64d4d791bf803490f6286a330401b933f895fbff2f4a6d1fcfe86c0490267f86d334436c1cea743ad08d97b26038f WHIRLPOOL 62b4847722ee8f23cc7db6f9bb21b1d01dacd2eb68d5d0db09933b9970c6846bc239d1388bd3d7ada2490a42ce1d56cffa1e1a7e55df029864ae426a0adaf96a
+DIST xxkb-flags.tar.bz2 2541 SHA256 f777c676a58ecab97c242efd703c0e8056cc2a93bb5b7a2fdb1f677348d6727c SHA512 c75929bf78a8aa84ffb615c85c2ad70110a9f7b0465891651a57e4772eae5e0ded61d10197f430f9cdd0cf707903af3d0af4250ff1743fdd59d9ff19bc0c33a9 WHIRLPOOL 7c626b2e6ec805b888ebcaeba658978efcbd4528729966a087ac7692b6c2e18ee5deb6dcb5eefea5a31826dce3ebb9c81a87cfc9e01efa5c18d800d8cd0bad6f
diff --git a/x11-misc/xxkb/files/README b/x11-misc/xxkb/files/README
new file mode 100644
index 000000000000..edac9540b241
--- /dev/null
+++ b/x11-misc/xxkb/files/README
@@ -0,0 +1,9 @@
+Additional information to the manpage for english speaking users
+(written by Patrick Kursawe <phosphan@gentoo.org>):
+
+The XFree86 documentation (for 4.3 and later) contains the file
+/usr/X11R6/lib/X11/doc/README.XKB-Config where you can find
+information on how to use mutiple keyboard layouts.
+
+Xxkb has no own configuration section where you can specify the keymaps -
+just configure them for X and let xxkb switch between them.
diff --git a/x11-misc/xxkb/files/de15.xpm b/x11-misc/xxkb/files/de15.xpm
new file mode 100644
index 000000000000..c0ba71d91934
--- /dev/null
+++ b/x11-misc/xxkb/files/de15.xpm
@@ -0,0 +1,22 @@
+/* XPM */
+static char * de15_xpm[] = {
+"15 15 4 1",
+" 	c None",
+".	c #000000",
+"+	c #FF0000",
+"@	c #FFE900",
+"...............",
+"...............",
+"...............",
+"...............",
+"...............",
+"+++++++++++++++",
+"+++++++++++++++",
+"+++++++++++++++",
+"+++++++++++++++",
+"+++++++++++++++",
+"@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@"};
diff --git a/x11-misc/xxkb/files/de48.xpm b/x11-misc/xxkb/files/de48.xpm
new file mode 100644
index 000000000000..5cae8928b68d
--- /dev/null
+++ b/x11-misc/xxkb/files/de48.xpm
@@ -0,0 +1,55 @@
+/* XPM */
+static char * de48_xpm[] = {
+"48 48 4 1",
+" 	c None",
+".	c #000000",
+"+	c #FF0000",
+"@	c #FFE900",
+"................................................",
+"................................................",
+"................................................",
+"................................................",
+"................................................",
+"................................................",
+"................................................",
+"................................................",
+"................................................",
+"................................................",
+"................................................",
+"................................................",
+"................................................",
+"................................................",
+"................................................",
+"................................................",
+"++++++++++++++++++++++++++++++++++++++++++++++++",
+"++++++++++++++++++++++++++++++++++++++++++++++++",
+"++++++++++++++++++++++++++++++++++++++++++++++++",
+"++++++++++++++++++++++++++++++++++++++++++++++++",
+"++++++++++++++++++++++++++++++++++++++++++++++++",
+"++++++++++++++++++++++++++++++++++++++++++++++++",
+"++++++++++++++++++++++++++++++++++++++++++++++++",
+"++++++++++++++++++++++++++++++++++++++++++++++++",
+"++++++++++++++++++++++++++++++++++++++++++++++++",
+"++++++++++++++++++++++++++++++++++++++++++++++++",
+"++++++++++++++++++++++++++++++++++++++++++++++++",
+"++++++++++++++++++++++++++++++++++++++++++++++++",
+"++++++++++++++++++++++++++++++++++++++++++++++++",
+"++++++++++++++++++++++++++++++++++++++++++++++++",
+"++++++++++++++++++++++++++++++++++++++++++++++++",
+"++++++++++++++++++++++++++++++++++++++++++++++++",
+"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"};
diff --git a/x11-misc/xxkb/files/missing_init.patch b/x11-misc/xxkb/files/missing_init.patch
new file mode 100644
index 000000000000..56f9e8ff53a1
--- /dev/null
+++ b/x11-misc/xxkb/files/missing_init.patch
@@ -0,0 +1,22 @@
+--- a/xxkb.c
++++ b/xxkb.c
+@@ -667,12 +667,14 @@
+ 					Window rwin, parent, *children;
+ 					int num;
+ 
+-					XQueryTree(dpy, temp_win, &rwin, &parent, &children, &num);
+-					AddWindow(temp_win, parent);
++					if (XQueryTree(dpy, temp_win, &rwin, &parent, &children, &num) != 0)
++                    {
++                        AddWindow(temp_win, parent);
+ 
+-					if (children != None) {
+-						XFree(children);
+-					}
++                        if (children != None) {
++                            XFree(children);
++                        }
++                    }
+ 				}
+ 				break;
+ 
diff --git a/x11-misc/xxkb/files/pl15.xpm b/x11-misc/xxkb/files/pl15.xpm
new file mode 100644
index 000000000000..709baccacf29
--- /dev/null
+++ b/x11-misc/xxkb/files/pl15.xpm
@@ -0,0 +1,21 @@
+/* XPM */
+static char * pl15_xpm[] = {
+"15 15 3 1",
+" 	c None",
+".	c #FFFFFF",
+"+	c #FF0000",
+"...............",
+"...............",
+"...............",
+"...............",
+"...............",
+"...............",
+"...............",
+"+++++++++++++++",
+"+++++++++++++++",
+"+++++++++++++++",
+"+++++++++++++++",
+"+++++++++++++++",
+"+++++++++++++++",
+"+++++++++++++++",
+"+++++++++++++++"};
diff --git a/x11-misc/xxkb/files/pl48.xpm b/x11-misc/xxkb/files/pl48.xpm
new file mode 100644
index 000000000000..1f3482946b41
--- /dev/null
+++ b/x11-misc/xxkb/files/pl48.xpm
@@ -0,0 +1,54 @@
+/* XPM */
+static char * pl48_xpm[] = {
+"48 48 3 1",
+" 	c None",
+".	c #FFFFFF",
+"+	c #FF0000",
+"................................................",
+"................................................",
+"................................................",
+"................................................",
+"................................................",
+"................................................",
+"................................................",
+"................................................",
+"................................................",
+"................................................",
+"................................................",
+"................................................",
+"................................................",
+"................................................",
+"................................................",
+"................................................",
+"................................................",
+"................................................",
+"................................................",
+"................................................",
+"................................................",
+"................................................",
+"................................................",
+"................................................",
+"++++++++++++++++++++++++++++++++++++++++++++++++",
+"++++++++++++++++++++++++++++++++++++++++++++++++",
+"++++++++++++++++++++++++++++++++++++++++++++++++",
+"++++++++++++++++++++++++++++++++++++++++++++++++",
+"++++++++++++++++++++++++++++++++++++++++++++++++",
+"++++++++++++++++++++++++++++++++++++++++++++++++",
+"++++++++++++++++++++++++++++++++++++++++++++++++",
+"++++++++++++++++++++++++++++++++++++++++++++++++",
+"++++++++++++++++++++++++++++++++++++++++++++++++",
+"++++++++++++++++++++++++++++++++++++++++++++++++",
+"++++++++++++++++++++++++++++++++++++++++++++++++",
+"++++++++++++++++++++++++++++++++++++++++++++++++",
+"++++++++++++++++++++++++++++++++++++++++++++++++",
+"++++++++++++++++++++++++++++++++++++++++++++++++",
+"++++++++++++++++++++++++++++++++++++++++++++++++",
+"++++++++++++++++++++++++++++++++++++++++++++++++",
+"++++++++++++++++++++++++++++++++++++++++++++++++",
+"++++++++++++++++++++++++++++++++++++++++++++++++",
+"++++++++++++++++++++++++++++++++++++++++++++++++",
+"++++++++++++++++++++++++++++++++++++++++++++++++",
+"++++++++++++++++++++++++++++++++++++++++++++++++",
+"++++++++++++++++++++++++++++++++++++++++++++++++",
+"++++++++++++++++++++++++++++++++++++++++++++++++",
+"++++++++++++++++++++++++++++++++++++++++++++++++"};
diff --git a/x11-misc/xxkb/files/svg-appdefaults.patch b/x11-misc/xxkb/files/svg-appdefaults.patch
new file mode 100644
index 000000000000..2e8ca3ef0b93
--- /dev/null
+++ b/x11-misc/xxkb/files/svg-appdefaults.patch
@@ -0,0 +1,30 @@
+--- a/XXkb.ad.var
++++ b/XXkb.ad.var
+@@ -4,10 +4,10 @@
+ XXkb.group.alt: 2
+ 
+ XXkb.mainwindow.enable: yes
+-XXkb.mainwindow.geometry: 48x48
+-XXkb.mainwindow.image.1: en48.xpm
+-XXkb.mainwindow.image.2: ru48.xpm
+-XXkb.mainwindow.image.3: su48.xpm
++XXkb.mainwindow.geometry: 48x48+0+0
++XXkb.mainwindow.image.1: en.svg
++XXkb.mainwindow.image.2: ru.svg
++XXkb.mainwindow.image.3: su.svg
+ XXkb.mainwindow.image.4:
+ XXkb.mainwindow.label.font: -misc-*-r-*-20-*
+ 
+@@ -23,9 +23,9 @@
+ 
+ XXkb.button.enable: yes
+ XXkb.button.geometry: 15x15-60+7
+-XXkb.button.image.1: en15.xpm
+-XXkb.button.image.2: ru15.xpm
+-XXkb.button.image.3: su15.xpm
++XXkb.button.image.1: en.svg
++XXkb.button.image.2: ru.svg
++XXkb.button.image.3: su.svg
+ XXkb.button.image.4:
+ XXkb.button.label.font: -misc-*-r-*-13-*
+ 
diff --git a/x11-misc/xxkb/files/svg-flags.patch b/x11-misc/xxkb/files/svg-flags.patch
new file mode 100644
index 000000000000..971d5d264742
--- /dev/null
+++ b/x11-misc/xxkb/files/svg-flags.patch
@@ -0,0 +1,122 @@
+--- a/flags/bg.svg
++++ b/flags/bg.svg
+@@ -0,0 +1,6 @@
++<?xml version="1.0" encoding="UTF-8" standalone="no"?>
++<svg xmlns="http://www.w3.org/2000/svg" width="1000" height="600" viewBox="0 0 5 3">
++<rect width="5" height="3" fill="#fff"/>
++<rect width="5" height="2" y="1" fill="#00966E"/>
++<rect width="5" height="1" y="2" fill="#D62612"/>
++</svg>
+--- a/flags/by.svg
++++ b/flags/by.svg
+@@ -0,0 +1,20 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<svg xmlns="http://www.w3.org/2000/svg" width="1200px" height="600px" viewBox="0 0 360 180" xmlns:xlink="http://www.w3.org/1999/xlink">
++<rect fill="#090" width="360" height="180"/>
++<rect fill="#c00" width="360" height="120"/>
++<rect fill="#fff" width="40" height="180"/>
++<g id="g2">
++<g id="g1" fill="#c00">
++<path d="M20,90v-1h-1v-2h-1v-2h-2v2h1v2h1v1z M10,90v-2h-2v-3h-1v-3h-2v-3h-1v-4h2v3h2v3h2v3h1v-3h2v-3h2v-3h2v-3h2v-4h-2v-5h-2v-4h-2v5h1v5h-1v4h-2v4h-1v-4h-2v-4h-2v-5h-1v-4h1v-4h2v-4h1v-4h2v-4h2v4h2v4h2v4h2v5h1v15h-2v3h-2v3h-2v3h-1v3h-2v2z M11,37h2v-4h2v-4h2v-4h2v-4h1v-4h-1v-4h-2v-4h-2v-4h-2v-4h-2v4h-2v4h-2v4h-2v4h-1v4h1v4h2v4h2v4h2v4z M4,9v-4h2v4zM4,33v-4h2v4z M4,52v-4h2v4z M4,74v-4h2v4z M4,90v-2h2v2z M14,90v-2h2v2z M19,84v-4h1v4z M19,52v-4h1v4z M19,33v-4h2v4z M19,9v-4h1v4z"/>
++<path fill="#fff" d="M11,29h2v-4h2v-4h2v-4h-2v-4h-2v-4h-2v4h-2v4h-2v4h2v4h2v4z"/>
++<path d="M11,21h2v-4h-2v4z"/>
++<g id="g3">
++<path d="M17,48h1v-3h1v-3h1v-3h-1v-3h-1v-3h-1v3h-1v3h-1v3h1v3h1v3z"/>
++<path fill="#fff" d="M17,39h1v3h-1v-3z"/>
++</g>
++<use xlink:href="#g3" transform="translate(-10)"/>
++</g>
++<use xlink:href="#g1" transform="rotate(180, 20,90)"/>
++</g>
++<use xlink:href="#g2" transform="translate(0,180) scale(1,-1)"/>
++</svg>
+\ Kein Zeilenumbruch am Dateiende.
+--- a/flags/de.svg
++++ b/flags/de.svg
+@@ -0,0 +1,9 @@
++<?xml version="1.0" encoding="UTF-8" standalone="no"?>
++<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
++	"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
++<svg xmlns="http://www.w3.org/2000/svg" width="1000" height="600" viewBox="0 0 5 3">
++	<desc>Flag of Germany</desc>
++	<rect id="black_stripe" width="5" height="3" y="0" x="0" fill="#000"/>
++	<rect id="red_stripe" width="5" height="2" y="1" x="0" fill="#D00"/>
++	<rect id="gold_stripe" width="5" height="1" y="2" x="0" fill="#FFCE00"/>
++</svg>
+--- a/flags/en.svg
++++ b/flags/en.svg
+@@ -0,0 +1,10 @@
++<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 60 30" width="1200" height="600">
++<clipPath id="t">
++	<path d="M30,15 h30 v15 z v15 h-30 z h-30 v-15 z v-15 h30 z"/>
++</clipPath>
++<path d="M0,0 v30 h60 v-30 z" fill="#00247d"/>
++<path d="M0,0 L60,30 M60,0 L0,30" stroke="#fff" stroke-width="6"/>
++<path d="M0,0 L60,30 M60,0 L0,30" clip-path="url(#t)" stroke="#cf142b" stroke-width="4"/>
++<path d="M30,0 v30 M0,15 h60" stroke="#fff" stroke-width="10"/>
++<path d="M30,0 v30 M0,15 h60" stroke="#cf142b" stroke-width="6"/>
++</svg>
+--- a/flags/il.svg
++++ b/flags/il.svg
+@@ -0,0 +1,35 @@
++<?xml version="1.0" encoding="utf-8"?>
++<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
++  "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
++<svg xmlns="http://www.w3.org/2000/svg" version="1.1"
++  xmlns:xlink="http://www.w3.org/1999/xlink"
++  width="660" height="480" viewBox="0 0 220 160">
++  <desc>Flag of Israel</desc>
++  <defs>
++    <!-- Specs are taken from "The Provisional Council of State Proclamation of
++      the Flag of the State of Israel," 25 Tishrei 5709 (28 October 1948)
++    For Magen David, the "Israel Science and Technology Homepage" at
++      http://www.science.co.il/Israel-flag.asp specifies each side as 60 cm.
++      Outer radius is then 30 / cos(30) = 20 * sqrt(3)
++    For equilateral triangles, middle radius = outer radius - width:
++      20 * sqrt(3) - 5.5
++    Coordinates for upward-pointing triangle relative to center are then:
++      (                            0,-(20*sqrt(3) - 5.5)          )
++      (-(20*sqrt(3) - 5.5) * cos(30), (20*sqrt(3) - 5.5) * sin(30))
++      ( (20*sqrt(3) - 5.5) * cos(30), (20*sqrt(3) - 5.5) * sin(30)) -->
++    <polygon id="triangle" points="0,-29.1410161513775421
++                -25.2368602791855814, 14.5705080756887710
++                 25.2368602791855814, 14.5705080756887710"
++      stroke="#0038b8" stroke-width="5.5" fill-opacity="0"/>
++  </defs>
++  <!-- "The flag is 220 cm long and 160 cm wide.  The background is white" -->
++  <rect width="220" height="160" fill="white"/>
++  <!-- "...two stripes of dark sky-blue, 25 cm broad, over the whole length of
++    the flag, at a distance of 15 cm from the top and from the bottom..."
++    Legislation does not specify exact shade of blue; "#0038b8" is typical of
++    flags used in Israel -->
++  <rect width="220" height="25" fill="#0038b8" y="15"/>
++  <rect width="220" height="25" fill="#0038b8" y="120"/>
++  <use xlink:href="#triangle" transform="translate(110,80)"/>
++  <use xlink:href="#triangle" transform="translate(110,80) rotate(180)"/>
++</svg>
+--- a/flags/pl.svg
++++ b/flags/pl.svg
+@@ -0,0 +1,6 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
++<svg width="1280" height="800" id="Flag of Poland" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 10">
++<rect width="16" height="5" fill="#fff"/>
++<rect width="16" height="5" fill="#dc143c" y="5"/>
++</svg>
+--- a/flags/ru.svg
++++ b/flags/ru.svg
+@@ -0,0 +1 @@
++<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 9 6" width="900" height="600"><rect fill="#FFF" width="9" height="3"/><rect fill="#F00" y="3" width="9" height="3"/><rect fill="#00F" y="2" width="9" height="2"/></svg>
+\ Kein Zeilenumbruch am Dateiende.
+--- a/flags/su.svg
++++ b/flags/su.svg
+@@ -0,0 +1 @@
++<?xml version="1.0" encoding="UTF-8"?><svg xmlns="http://www.w3.org/2000/svg" width="600" height="300" viewBox="0 0 600 300"><rect width="600" height="300" style="fill:#c00"/><path d="M 67.8,79.9 L 76.5,88.6 L 83.6,81.3 C 99.4,97.6 115.2,114 131,130.3 C 134.5,129.5 136.4,128.1 137.5,124.1 L 88.8,76.2 L 98.6,67.4 L 84.3,63.5 L 67.8,79.9 L 67.8,79.9 z" id="hammer" style="fill:#ffd700"/><path d="M 95.8,30.7 L 82.3,30.7 L 93.2,38.7 L 89.1,51.5 L 100,43.6 L 110.9,51.5 L 106.8,38.6 L 117.7,30.7 L 104.2,30.7 L 100,17.8008 L 100,17.8 L 95.8,30.7 z M 100,25.8 L 102.4,33.2 L 110.1,33.2 L 103.9,37.7 L 106.26115,45.055357 L 99.99998,40.501778 L 93.73881,45.1 L 96.1,37.7 L 89.9,33.17 L 97.62,33.17 L 100,25.8 L 100,25.8 z" id="star" style="fill:#ffd700"/><path d="M 100.1,55.3 C 121.1,63 134.3,80.6 134.38,93.6 C 134.6,122.3 103.3,136.1 83.1,113 L 81.7,114 L 82,116.5 C 75.9,115.9 70.4,134.6 63.8,129.4 C 57.8,121.8 74.4,118.3 76.1,110.6 L 78.5,110.8 L 80.5,108.7 L 82.4,109 L 84.8,106.5 C 104.5,127.3 129.4,111.2 125.9,90.5 C 123.4,74.6 113.4,65.5 100,55.3 L 100.1,55.3 L 100.1,55.3 L 100.1,55.3 L 100.1,55.3 L 100.1,55.3 L 100.1,55.3 z" id="sichel" style="fill:#ffd700"/></svg>
+--- a/flags/ua.svg
++++ b/flags/ua.svg
+@@ -0,0 +1,4 @@
++<svg xmlns="http://www.w3.org/2000/svg" width="1200" height="800">
++<rect width="1200" height="800" fill="#005BBB"/>
++<rect width="1200" height="400" y="400" fill="#FFD500"/>
++</svg>
+\ Kein Zeilenumbruch am Dateiende.
diff --git a/x11-misc/xxkb/metadata.xml b/x11-misc/xxkb/metadata.xml
new file mode 100644
index 000000000000..37b1d4e5f29c
--- /dev/null
+++ b/x11-misc/xxkb/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>desktop-misc</herd>
+	<upstream>
+		<remote-id type="sourceforge">xxkb</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-misc/xxkb/xxkb-1.11-r3.ebuild b/x11-misc/xxkb/xxkb-1.11-r3.ebuild
new file mode 100644
index 000000000000..c89979d6a01c
--- /dev/null
+++ b/x11-misc/xxkb/xxkb-1.11-r3.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils multilib
+
+DESCRIPTION="eXtended XKB - assign different keymaps to different windows"
+HOMEPAGE="http://sourceforge.net/projects/xxkb/"
+SRC_URI="
+	mirror://sourceforge/${PN}/${P}-src.tar.gz
+	svg? ( https://dev.gentoo.org/~jer/${PN}-flags.tar.bz2 )
+"
+
+LICENSE="Artistic"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="svg"
+
+RDEPEND="
+	x11-libs/libX11
+	x11-libs/libXpm
+	x11-libs/libXt
+	svg? (
+		dev-libs/glib:2
+		gnome-base/librsvg:2
+		x11-libs/gtk+:2
+	)
+"
+DEPEND="
+	${RDEPEND}
+	app-text/rman
+	svg? ( virtual/pkgconfig )
+	x11-misc/imake
+"
+
+S="${WORKDIR}/${PN}"
+
+src_prepare() {
+	if use svg; then
+		mv "${WORKDIR}"/flags . || die
+		epatch "${FILESDIR}"/svg-flags.patch
+		epatch "${FILESDIR}"/svg-appdefaults.patch
+	fi
+
+	epatch "${FILESDIR}"/missing_init.patch
+}
+
+src_configure() {
+	xmkmf $(usex svg -DWITH_SVG_SUPPORT '') || die
+}
+
+src_compile() {
+	emake \
+		CDEBUGFLAGS="${CFLAGS}" \
+		EXTRA_LIBRARIES="-lXext" \
+		LOCAL_LDFLAGS="${LDFLAGS}" \
+		PIXMAPDIR=/usr/share/xxkb \
+		PROJECTROOT=/usr
+}
+
+src_install() {
+	local myopts
+	if use svg; then
+		myopts="PIXMAPS=flags/de.svg flags/pl.svg flags/il.svg flags/by.svg \
+		flags/ua.svg flags/su.svg flags/ru.svg flags/bg.svg flags/en.svg"
+	else
+		myopts="FOOBAR=buzz"
+	fi
+
+	emake "${myopts}"  DESTDIR="${D}" install
+	rm -r "${D}"/usr/$(get_libdir)/X11/app-defaults || die
+
+	emake DESTDIR="${D}" install.man
+
+	insinto /usr/share/xxkb
+	use svg || doins "${FILESDIR}"/*.xpm
+	dodoc README* CHANGES*
+}
diff --git a/x11-misc/xxkb/xxkb-1.11.1.ebuild b/x11-misc/xxkb/xxkb-1.11.1.ebuild
new file mode 100644
index 000000000000..8eea724bbc28
--- /dev/null
+++ b/x11-misc/xxkb/xxkb-1.11.1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils multilib
+
+DESCRIPTION="eXtended XKB - assign different keymaps to different windows"
+HOMEPAGE="http://sourceforge.net/projects/xxkb/"
+SRC_URI="
+	mirror://sourceforge/${PN}/${P}-src.tar.gz
+	svg? ( https://dev.gentoo.org/~jer/${PN}-flags.tar.bz2 )
+"
+
+LICENSE="Artistic-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="svg"
+
+RDEPEND="
+	x11-libs/libX11
+	x11-libs/libXpm
+	x11-libs/libXt
+	svg? (
+		dev-libs/glib:2
+		gnome-base/librsvg:2
+		x11-libs/gtk+:2
+	)
+"
+DEPEND="
+	${RDEPEND}
+	app-text/rman
+	svg? ( virtual/pkgconfig )
+	x11-misc/imake
+"
+
+src_prepare() {
+	if use svg; then
+		mv "${WORKDIR}"/flags . || die
+		epatch "${FILESDIR}"/svg-flags.patch
+		epatch "${FILESDIR}"/svg-appdefaults.patch
+	fi
+
+	epatch "${FILESDIR}"/missing_init.patch
+}
+
+src_configure() {
+	xmkmf $(usex svg -DWITH_SVG_SUPPORT '') || die
+}
+
+src_compile() {
+	emake \
+		CDEBUGFLAGS="${CFLAGS}" \
+		EXTRA_LIBRARIES="-lXext" \
+		LOCAL_LDFLAGS="${LDFLAGS}" \
+		PIXMAPDIR=/usr/share/xxkb \
+		PROJECTROOT=/usr
+}
+
+src_install() {
+	local myopts
+	if use svg; then
+		myopts="PIXMAPS=flags/de.svg flags/pl.svg flags/il.svg flags/by.svg \
+		flags/ua.svg flags/su.svg flags/ru.svg flags/bg.svg flags/en.svg"
+	else
+		myopts="FOOBAR=buzz"
+	fi
+
+	emake "${myopts}"  DESTDIR="${D}" install
+	rm -r "${D}"/usr/$(get_libdir)/X11/app-defaults || die
+
+	emake DESTDIR="${D}" install.man
+
+	insinto /usr/share/xxkb
+	use svg || doins "${FILESDIR}"/*.xpm
+	dodoc README* CHANGES*
+}
diff --git a/x11-misc/zim/Manifest b/x11-misc/zim/Manifest
new file mode 100644
index 000000000000..06fa239bcada
--- /dev/null
+++ b/x11-misc/zim/Manifest
@@ -0,0 +1,3 @@
+DIST zim-0.61.tar.gz 1733251 SHA256 5843a9b2fb41f153b7b628732ac157889709b9937b4921c05099af81dceccc4a SHA512 381f1d740bedaecf52c4b7178e7ac17aac98971cc5292476396a28b965b93195a2e07e55f7872048b3577123cd6afb44c2a0e2dee220b02a84fed2a13fb67f61 WHIRLPOOL d0f9d8ce65e8970226f8878cc4e89d228c76e06f9772692d7bc3653b4fc85b4b9ed22d2b0aa91aa724384062a4b1b93859594089c9b1799c2eded313cea7deba
+DIST zim-0.62.tar.gz 1772246 SHA256 19d62aebd2c1a92d84d80720c6c1dcdb779c39a2120468fed01b7f252511bdc2 SHA512 53dc97052ee8ec57a61adf9d540f7721ee7e8d8d2500fc4d6ca7bc1b82dc07c5596b8b900c312d155bb1c06e7fbf661e667e0da391ac8f1e326caa2942f7cb1f WHIRLPOOL f1b44e27b49577868f5374b196fe5d59fd111664568141af1aa809fdcf916f830e385320f87c075242ad0ec7fa3db4d6d87fcbe7b70c850c1f1b3725abc66978
+DIST zim-0.63.tar.gz 1864169 SHA256 1584547150b6c96dacdb540c2b88e16d2cd673fa8026d9179aab4a082071fb1c SHA512 052f65c98badfcb1a6d9ed9d09eb84a01878384430affcb97d48d51ef5853478c8d489f9337600fc28b9949f8e1ff97e7e4070ed9a4f488f684a392ad2bff791 WHIRLPOOL 12c884fdaeac1c0c4766637d96e9699491cac1d3421368c073f852e78995a969303dd510172ef89b70c65226cfd1de794968b31313e1ee63aeb6e2f63d610451
diff --git a/x11-misc/zim/files/zim-0.60-remove-ubuntu-theme.patch b/x11-misc/zim/files/zim-0.60-remove-ubuntu-theme.patch
new file mode 100644
index 000000000000..8c2d19599893
--- /dev/null
+++ b/x11-misc/zim/files/zim-0.60-remove-ubuntu-theme.patch
@@ -0,0 +1,18 @@
+# don't install /usr/share/icons/ubuntu-mono-{dark,light}
+# it's only used in conjunction with appindicator
+# and clutters the icon-themes menu in gnome
+--- a/setup.py
++++ b/setup.py
+@@ -94,12 +94,6 @@
+ 			files = [os.path.join(dir, f) for f in files]
+ 			data_files.append((target, files))
+ 
+-	# mono icons -> PREFIX/share/icons/ubuntu-mono-light | -dark
+-	for theme in ('ubuntu-mono-light', 'ubuntu-mono-dark'):
+-		file = os.path.join('icons', theme, 'zim-panel.svg')
+-		target = os.path.join('share', 'icons', theme, 'apps', '22')
+-		data_files.append((target, [file]))
+-
+ 	# data -> PREFIX/share/zim
+ 	for dir, dirs, files in os.walk('data'):
+ 		if '.zim' in dirs:
diff --git a/x11-misc/zim/files/zim-0.62-desktop.patch b/x11-misc/zim/files/zim-0.62-desktop.patch
new file mode 100644
index 000000000000..b2494509b381
--- /dev/null
+++ b/x11-misc/zim/files/zim-0.62-desktop.patch
@@ -0,0 +1,11 @@
+--- a/xdg/zim.desktop
++++ b/xdg/zim.desktop
+@@ -7,7 +7,7 @@
+ Terminal=false
+ Categories=Utility;TextEditor;GTK;
+ MimeType=application/x-zim-notebook;text/x-zim-wiki;application/x-gjots;
+-Keywords=Text;Editor;Write;Wiki;Notes;Notebook;Journal
++Keywords=Text;Editor;Write;Wiki;Notes;Notebook;Journal;
+ Name=Zim Desktop Wiki
+ Comment=Edit text files "wiki style"
+ GenericName=Text Editor
diff --git a/x11-misc/zim/metadata.xml b/x11-misc/zim/metadata.xml
new file mode 100644
index 000000000000..82797295f61e
--- /dev/null
+++ b/x11-misc/zim/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>desktop-misc</herd>
+<longdescription lang="en">
+Zim is a graphical text editor used to maintain a collection of wiki pages.
+Each page can contain links to other pages, simple formatting and images. Pages
+are stored in a folder structure, like in an outliner, and can have
+attachments. Creating a new page is as easy as linking to a nonexistent page.
+All data is stored in plain text files with wiki formatting. Various plugins
+provide additional functionality, like a task list manager, an equation editor,
+a tray icon, and support for version control.
+</longdescription>
+</pkgmetadata>
diff --git a/x11-misc/zim/zim-0.61.ebuild b/x11-misc/zim/zim-0.61.ebuild
new file mode 100644
index 000000000000..8d5163cac7b8
--- /dev/null
+++ b/x11-misc/zim/zim-0.61.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite"
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1 gnome2-utils fdo-mime 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}]"
+DEPEND="${RDEPEND}
+	x11-misc/xdg-utils
+	test? (
+		dev-vcs/bzr
+		dev-vcs/git
+		dev-vcs/mercurial )"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.60-remove-ubuntu-theme.patch )
+
+python_prepare() {
+	sed -i -e "s/'USER'/'LOGNAME'/g" zim/__init__.py zim/fs.py || die
+	distutils-r1_python_prepare
+}
+
+python_test() {
+	VIRTUALX_COMMAND="${PYTHON}" virtualmake test.py
+}
+
+python_install() {
+	distutils-r1_python_install --skip-xdg-cmd
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	fdo-mime_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 "    gnome-extra/zeitgeist"
+		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() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
diff --git a/x11-misc/zim/zim-0.62.ebuild b/x11-misc/zim/zim-0.62.ebuild
new file mode 100644
index 000000000000..f9f9e5d0005b
--- /dev/null
+++ b/x11-misc/zim/zim-0.62.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite"
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1 gnome2-utils fdo-mime 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}]"
+DEPEND="${RDEPEND}
+	x11-misc/xdg-utils
+	test? (
+		dev-vcs/bzr
+		dev-vcs/git
+		dev-vcs/mercurial )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.60-remove-ubuntu-theme.patch
+	"${FILESDIR}"/${P}-desktop.patch
+)
+
+python_prepare() {
+	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
+}
+
+python_test() {
+	VIRTUALX_COMMAND="${PYTHON}" virtualmake test.py
+}
+
+python_install() {
+	distutils-r1_python_install --skip-xdg-cmd
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	fdo-mime_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 "    gnome-extra/zeitgeist"
+		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() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
diff --git a/x11-misc/zim/zim-0.63.ebuild b/x11-misc/zim/zim-0.63.ebuild
new file mode 100644
index 000000000000..9a1f5f1079e7
--- /dev/null
+++ b/x11-misc/zim/zim-0.63.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite"
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1 gnome2-utils fdo-mime 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}]"
+DEPEND="${RDEPEND}
+	x11-misc/xdg-utils
+	test? (
+		dev-vcs/bzr
+		dev-vcs/git
+		dev-vcs/mercurial )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.60-remove-ubuntu-theme.patch
+)
+
+python_prepare() {
+	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
+}
+
+python_test() {
+	VIRTUALX_COMMAND="${PYTHON}" virtualmake test.py
+}
+
+python_install() {
+	distutils-r1_python_install --skip-xdg-cmd
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	fdo-mime_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 "    gnome-extra/zeitgeist"
+		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() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
author	Robin H. Johnson <robbat2@gentoo.org>	2015-08-08 13:49:04 -0700
committer	Robin H. Johnson <robbat2@gentoo.org>	2015-08-08 17:38:18 -0700
commit	56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree	3f91093cdb475e565ae857f1c5a7fd339e2d781e /x11-misc
download	gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip