diff --git a/x11-misc/cairo-dock/Manifest b/x11-misc/cairo-dock/Manifest
deleted file mode 100644
index 55be643..0000000
--- a/x11-misc/cairo-dock/Manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-AUX fix_lib6464.patch 840 RMD160 8044edc2498caf088b47acae698551cb610f6841 SHA1 6921f0471ae79635d3969fbdaf5ad3c793414d0e SHA256 5fdb6dc28faf56988e339da5344e88531f5cc89c045b6ba8287df1d4fafae315
-AUX glib-include.patch 490 RMD160 9ebff56fc96538baee7d25c7339bf07047634994 SHA1 be41f05f98cb4cd82ac1f23deace67f61240bdb9 SHA256 3cc33d6069e2e5c95227377e10ec06e485289edd4be49c3ab2e9d57fc720e45a
-AUX improved-cairo-dock-session.patch 5129 RMD160 33000789484425f77ade2f9016c37ac514183b67 SHA1 3cc8dbea855e11c51804183c6156b71fb2608fa1 SHA256 015147962c7e9a0a131b8ec52334d6ad51409e12f814011ce31653a7024cceb2
-DIST cairo-dock-2.4.0~2.tar.gz 2281677 RMD160 662810cf0bf67be75cde36bb6c31c150abebc391 SHA1 140670d97985a8a623bc126fa86eed00e7b5a69e SHA256 8087e68c174d06dcd62bb9acfdd54cc534cc09ddbfffcc0f9cfac967d882123c
-DIST cairo-dock-3.0.0.tar.gz 2325081 RMD160 5d04384132f9c97e6b87a402ee519c59fb4dd478 SHA1 2b6f961e0ac13a44e733ae6a19f61f7fe2e8a859 SHA256 bef0794405f86bc397c4c077e48cb8e6df8f256f1c530e76aebd8612251a9b82
-DIST cairo-dock-3.0.2.tar.gz 2335988 RMD160 8b146f345ca11bcbb7fde68227232c4c89b94153 SHA1 e9bba08508aa5147c535f0b73910bf944a97953e SHA256 592054ebabdb49956d4a0693355772e7c617ee060413ff14e302d69b5a7e9aca
-DIST cairo-dock-3.1.2.tar.gz 2449689 RMD160 6a59e98b97e819b3b1ce65a9865bd22d47035ca2 SHA1 f7d3aec6b8b81ff25e58376528dda215ba492eb1 SHA256 a6600f9805006ea5bbaa178e2df16540130eeca62775a7ab57e88d2c51b6f694
-EBUILD cairo-dock-2.4.0.2.ebuild 2030 RMD160 0e60a9a318ef1e65b0e228a8c2c83a1cc1164118 SHA1 79dda4ddaac8f80d9fa5f7844d75ccab314ad5c9 SHA256 5c7d6b05ae2512fc196f167172fe17a958d01bb63d2f89b6eed2157a73379436
-EBUILD cairo-dock-3.0.0-r2.ebuild 1725 RMD160 3d2f28a41bb2bdea30ac64d6849d708dcc510baa SHA1 a82cbdfcd78e82caa59ec47414f731a681a84c1b SHA256 c376d5ff599c899026fc2efa37c1df6b8bcb37f3f2888807a0a970045596c085
-EBUILD cairo-dock-3.0.2.ebuild 1683 RMD160 ce2400aa30add7b3b2122b38455bee366b158c55 SHA1 c66fc06d7daafc6044cb062a5301c99b4bb5fe01 SHA256 fcc2a26a03125c412ac129e06efbf17b0d13758a42913d002b19b640777a2b72
-EBUILD cairo-dock-3.1.2.ebuild 1623 RMD160 9006f88a547331677775d58289fdeed8ab7c0959 SHA1 367737116ca69ef7e3bb02f7e99c28417cf14d5f SHA256 56625b3e45ab8ab131e9552a679901102a78ea7d518eb978ff459f0f7c66d50d
diff --git a/x11-misc/cairo-dock/cairo-dock-2.4.0.2.ebuild b/x11-misc/cairo-dock/cairo-dock-2.4.0.2.ebuild
deleted file mode 100644
index ef41590..0000000
--- a/x11-misc/cairo-dock/cairo-dock-2.4.0.2.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="3"
-
-inherit cmake-utils eutils versionator
-
-MY_PN="${PN}-core"
-MY_PV=$(replace_version_separator 3 '~')
-MM_PV=$(get_version_component_range '1-2')
-MMD_PV=$(get_version_component_range '1-3')
-
-DESCRIPTION="Cairo-dock is a fast, responsive, Mac OS X-like dock."
-HOMEPAGE="https://launchpad.net/cairo-dock-core/"
-SRC_URI="http://launchpad.net/${MY_PN}/${MM_PV}/${MMD_PV}/+download/${PN}-${MY_PV}.tar.gz"
-echo $SRC_URI
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="crypt xcomposite"
-
-RDEPEND="
-	dev-libs/dbus-glib
-	dev-libs/glib:2
-	dev-libs/libxml2:2
-	gnome-base/librsvg:2
-	net-misc/curl	
-	sys-apps/dbus
-	x11-libs/cairo
-	x11-libs/gtk+:2
-	x11-libs/gtkglext
-	x11-libs/libXrender
-	crypt? ( sys-libs/glibc )
-	xcomposite? (
-		x11-libs/libXcomposite
-		x11-libs/libXinerama
-		x11-libs/libXtst
-	)
-"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	dev-util/pkgconfig
-	sys-devel/gettext
-"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_prepare() {
-	epatch "${FILESDIR}/improved-cairo-dock-session.patch" || die
-	# intltoolize --automake --copy --force || die "intltoolize failed"
-	# eautoreconf
-}
-
-src_configure() {
-	# glitz support has been dropped from recent cairo, so drop it here as well.
-	mycmakeargs+=( "-DENABLE_GLITZ=OFF" )
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	elog "Additional plugins are available to extend the functionality"
-	elog "of Cairo-Dock. It is recommended to install at least"
-	elog "x11-misc/cairo-dock-plugins-core."
-	elog
-	elog "Cairo-Dock is an app that draws on a RGBA GLX visual."
-	elog "Some users have noticed that if the dock is launched,"
-	elog "severals qt4-based applications could crash, like skype or vlc."
-	elog "If you have this problem, add the following line into your bashrc :"
-	echo
-	elog "alias vlc='export XLIB_SKIP_ARGB_VISUALS=1; vlc; unset XLIB_SKIP_ARGB_VISUALS'"
-	elog "see http://www.qtforum.org/article/26669/qt4-mess-up-the-opengl-context.html for more details."
-}
diff --git a/x11-misc/cairo-dock/cairo-dock-3.0.0-r2.ebuild b/x11-misc/cairo-dock/cairo-dock-3.0.0-r2.ebuild
deleted file mode 100644
index 80af023..0000000
--- a/x11-misc/cairo-dock/cairo-dock-3.0.0-r2.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="3"
-
-inherit cmake-utils eutils versionator
-
-MY_PN="${PN}-core"
-MM_PV=$(get_version_component_range '1-2')
-
-DESCRIPTION="Cairo-dock is a fast, responsive, Mac OS X-like dock."
-HOMEPAGE="http://www.glx-dock.org"
-SRC_URI="http://launchpad.net/${MY_PN}/${MM_PV}/${PV}/+download/${PN}-${PV}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="crypt xcomposite gtk3"
-
-RDEPEND="
-	dev-libs/dbus-glib
-	dev-libs/glib:2
-	dev-libs/libxml2:2
-	gnome-base/librsvg:2
-	net-misc/curl	
-	sys-apps/dbus
-	x11-libs/cairo
-	x11-libs/pango
-	x11-libs/gtk+:2
-	x11-libs/gtkglext
-	x11-libs/libXrender
-	gtk3? ( x11-libs/gtk+:3 )
-	crypt? ( sys-libs/glibc )
-	xcomposite? (
-		x11-libs/libXcomposite
-		x11-libs/libXinerama
-		x11-libs/libXtst
-	)
-"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	dev-util/pkgconfig
-	sys-devel/gettext
-"
-
-S="${WORKDIR}/${PN}-${PV}"
-
-src_prepare() {
-	epatch "${FILESDIR}/fix_lib6464.patch" 
-	epatch "${FILESDIR}/glib-include.patch" 
-}
-
-pkg_postinst() {
-	elog "Additional plugins are available to extend the functionality"
-	elog "of Cairo-Dock. It is recommended to install at least"
-	elog "x11-misc/cairo-dock-plugins-core."
-	elog
-	elog "Cairo-Dock is an app that draws on a RGBA GLX visual."
-	elog "Some users have noticed that if the dock is launched,"
-	elog "severals qt4-based applications could crash, like skype or vlc."
-	elog "If you have this problem, add the following line into your bashrc :"
-	echo
-	elog "alias vlc='export XLIB_SKIP_ARGB_VISUALS=1; vlc; unset XLIB_SKIP_ARGB_VISUALS'"
-	elog "see http://www.qtforum.org/article/26669/qt4-mess-up-the-opengl-context.html for more details."
-}
diff --git a/x11-misc/cairo-dock/cairo-dock-3.0.2.ebuild b/x11-misc/cairo-dock/cairo-dock-3.0.2.ebuild
deleted file mode 100644
index c8c2023..0000000
--- a/x11-misc/cairo-dock/cairo-dock-3.0.2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="3"
-
-inherit cmake-utils eutils versionator
-
-MY_PN="${PN}-core"
-MM_PV=$(get_version_component_range '1-2')
-
-DESCRIPTION="Cairo-dock is a fast, responsive, Mac OS X-like dock."
-HOMEPAGE="http://www.glx-dock.org"
-SRC_URI="http://launchpad.net/${MY_PN}/${MM_PV}/${PV}/+download/${PN}-${PV}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="crypt xcomposite gtk3"
-
-RDEPEND="
-	dev-libs/dbus-glib
-	dev-libs/glib:2
-	dev-libs/libxml2:2
-	gnome-base/librsvg:2
-	net-misc/curl	
-	sys-apps/dbus
-	x11-libs/cairo
-	x11-libs/pango
-	x11-libs/gtk+:2
-	x11-libs/gtkglext
-	x11-libs/libXrender
-	gtk3? ( x11-libs/gtk+:3 )
-	crypt? ( sys-libs/glibc )
-	xcomposite? (
-		x11-libs/libXcomposite
-		x11-libs/libXinerama
-		x11-libs/libXtst
-	)
-"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	dev-util/pkgconfig
-	sys-devel/gettext
-"
-
-S="${WORKDIR}/${PN}-${PV}"
-
-src_prepare() {
-	epatch "${FILESDIR}/fix_lib6464.patch" 
-}
-
-pkg_postinst() {
-	elog "Additional plugins are available to extend the functionality"
-	elog "of Cairo-Dock. It is recommended to install at least"
-	elog "x11-misc/cairo-dock-plugins-core."
-	elog
-	elog "Cairo-Dock is an app that draws on a RGBA GLX visual."
-	elog "Some users have noticed that if the dock is launched,"
-	elog "severals qt4-based applications could crash, like skype or vlc."
-	elog "If you have this problem, add the following line into your bashrc :"
-	echo
-	elog "alias vlc='export XLIB_SKIP_ARGB_VISUALS=1; vlc; unset XLIB_SKIP_ARGB_VISUALS'"
-	elog "see http://www.qtforum.org/article/26669/qt4-mess-up-the-opengl-context.html for more details."
-}
diff --git a/x11-misc/cairo-dock/cairo-dock-3.1.2.ebuild b/x11-misc/cairo-dock/cairo-dock-3.1.2.ebuild
deleted file mode 100644
index 18903d1..0000000
--- a/x11-misc/cairo-dock/cairo-dock-3.1.2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="3"
-
-inherit cmake-utils eutils versionator
-
-MY_PN="${PN}-core"
-MM_PV=$(get_version_component_range '1-2')
-
-DESCRIPTION="Cairo-dock is a fast, responsive, Mac OS X-like dock."
-HOMEPAGE="http://www.glx-dock.org"
-SRC_URI="http://launchpad.net/${MY_PN}/${MM_PV}/${PV}/+download/${PN}-${PV}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="crypt xcomposite gtk3"
-
-RDEPEND="
-	dev-libs/dbus-glib
-	dev-libs/glib:2
-	dev-libs/libxml2:2
-	gnome-base/librsvg:2
-	net-misc/curl	
-	sys-apps/dbus
-	x11-libs/cairo
-	x11-libs/pango
-	x11-libs/gtk+:2
-	x11-libs/gtkglext
-	x11-libs/libXrender
-	gtk3? ( x11-libs/gtk+:3 )
-	crypt? ( sys-libs/glibc )
-	xcomposite? (
-		x11-libs/libXcomposite
-		x11-libs/libXinerama
-		x11-libs/libXtst
-	)
-"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	dev-util/pkgconfig
-	sys-devel/gettext
-"
-
-S="${WORKDIR}/${PN}-${PV}"
-
-pkg_postinst() {
-	elog "Additional plugins are available to extend the functionality"
-	elog "of Cairo-Dock. It is recommended to install at least"
-	elog "x11-misc/cairo-dock-plugins-core."
-	elog
-	elog "Cairo-Dock is an app that draws on a RGBA GLX visual."
-	elog "Some users have noticed that if the dock is launched,"
-	elog "severals qt4-based applications could crash, like skype or vlc."
-	elog "If you have this problem, add the following line into your bashrc :"
-	echo
-	elog "alias vlc='export XLIB_SKIP_ARGB_VISUALS=1; vlc; unset XLIB_SKIP_ARGB_VISUALS'"
-	elog "see http://www.qtforum.org/article/26669/qt4-mess-up-the-opengl-context.html for more details."
-}
diff --git a/x11-misc/cairo-dock/files/fix_lib6464.patch b/x11-misc/cairo-dock/files/fix_lib6464.patch
deleted file mode 100644
index c42c35a..0000000
--- a/x11-misc/cairo-dock/files/fix_lib6464.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -ru cairo-dock-3.0.0/CMakeLists.txt cairo-dock-3.0.0.new//CMakeLists.txt
---- cairo-dock-3.0.0/CMakeLists.txt	2012-04-18 10:36:48.240150064 -0700
-+++ cairo-dock-3.0.0.new//CMakeLists.txt	2012-04-18 10:37:11.259152049 -0700
-@@ -44,6 +44,7 @@
- 	message(FATAL_ERROR "Cairo-Dock requires an air-conditioned room. Please close Windows!")
- endif( WIN32 )
- 
-+set (CMAKE_SKIP_RPATH TRUE)
- set (PACKAGE ${CMAKE_PROJECT_NAME})
- set (GETTEXT_PACKAGE ${PACKAGE})
- 
-@@ -58,7 +59,7 @@
- if( CMAKE_SIZEOF_VOID_P EQUAL 8 AND "${FORCE_LIB64}" STREQUAL "yes")  # 64bits and force install in lib64
- 	set (libdir "${prefix}/lib64")
- else()
--	set (libdir "${prefix}/${CMAKE_INSTALL_LIBDIR}${LIB_SUFFIX}")  # (...)/lib
-+	set (libdir "${CMAKE_INSTALL_LIBDIR}")  # (...)/lib
- endif()
- 
- set (includedir "${prefix}/${CMAKE_INSTALL_INCLUDEDIR}")  # (...)/include
diff --git a/x11-misc/cairo-dock/files/glib-include.patch b/x11-misc/cairo-dock/files/glib-include.patch
deleted file mode 100644
index 2d04327..0000000
--- a/x11-misc/cairo-dock/files/glib-include.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN cairo-dock-3.0.0.orig/src/gldit/cairo-dock-keybinder.h cairo-dock-3.0.0/src/gldit/cairo-dock-keybinder.h
---- cairo-dock-3.0.0.orig/src/gldit/cairo-dock-keybinder.h	2012-04-19 23:09:27.610906117 +0600
-+++ cairo-dock-3.0.0/src/gldit/cairo-dock-keybinder.h	2012-04-19 23:11:13.424875527 +0600
-@@ -31,7 +31,7 @@
- #ifndef __CD_KEY_BINDER_H__
- #define __CD_KEY_BINDER_H__
- 
--#include <glib/gtypes.h>
-+#include <glib.h>
- #include "cairo-dock-struct.h"
- #include "cairo-dock-manager.h"
- 
diff --git a/x11-misc/cairo-dock/files/improved-cairo-dock-session.patch b/x11-misc/cairo-dock/files/improved-cairo-dock-session.patch
deleted file mode 100644
index c76ae98..0000000
--- a/x11-misc/cairo-dock/files/improved-cairo-dock-session.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-## From: Matthieu Baerts (matttbe) <matttbe@gmail.com>
-## Description: Improved the launch of our Cairo-Dock session (by removing Unity
-##               Compiz plugin and by launching the dock with a short delay)
-## Origin: upstream, http://bazaar.launchpad.net/~cairo-dock-team/cairo-dock-core/cairo-dock/revision/885
-## Forwarded: yes
-Index: cairo-dock/data/desktop-manager/CMakeLists.txt
-===================================================================
---- cairo-dock.orig/data/desktop-manager/CMakeLists.txt	2011-10-06 12:02:24.494184799 +0200
-+++ cairo-dock/data/desktop-manager/CMakeLists.txt	2011-10-06 12:02:17.554184897 +0200
-@@ -7,3 +7,7 @@
- 	cairo-dock.session
- 	cairo-dock-fallback.session
- 	DESTINATION /usr/share/gnome-session/sessions)
-+
-+install (FILES cairo-dock-session
-+	DESTINATION ${bindir}
-+	PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
-Index: cairo-dock/data/desktop-manager/cairo-dock-fallback.desktop
-===================================================================
---- cairo-dock.orig/data/desktop-manager/cairo-dock-fallback.desktop	2011-10-06 12:02:24.578184798 +0200
-+++ cairo-dock/data/desktop-manager/cairo-dock-fallback.desktop	2011-10-06 12:02:17.554184897 +0200
-@@ -2,6 +2,6 @@
- Name=Cairo-Dock (with Gnome and without effect)
- Comment=This session logs you into GNOME with Cairo-Dock and without any graphical effect.
- Exec=gnome-session --session=cairo-dock-fallback
--TryExec=gnome-session
-+TryExec=cairo-dock-session
- Icon=
- Type=Application
-Index: cairo-dock/data/desktop-manager/cairo-dock-session
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ cairo-dock/data/desktop-manager/cairo-dock-session	2011-10-06 12:02:17.554184897 +0200
-@@ -0,0 +1,47 @@
-+#!/bin/bash
-+
-+# Script for the 'desktop-manager' subproject of Cairo-Dock
-+#
-+# Copyright : (C) see the 'copyright' file.
-+# E-mail    : see the 'copyright' file.
-+#
-+#
-+# This program is free software; you can redistribute it and/or
-+# modify it under the terms of the GNU General Public License
-+# as published by the Free Software Foundation; either version 3
-+# of the License, or (at your option) any later version.
-+#
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+# http://www.gnu.org/licenses/licenses.html#GPL
-+
-+# This script removes Unity Compiz plugin and launches Cairo-Dock with a short delay
-+
-+UNITY_NAME="unityshell"
-+COMPIZ_FLAT_FILE="$HOME/.config/compiz-1/compizconfig/Default.ini"
-+COMPIZ_GCONF="/apps/compiz-1/general/screen0/options/active_plugins"
-+
-+if test -d "$HOME/.config/compiz-1"; then # compiz >= 0.9
-+	# plug-ins in double are NO LONGER filtered by Compiz in this version... (and if plugins are in double or wrong, compiz crashes :) )
-+	# flat file
-+	if test -f "$COMPIZ_FLAT_FILE"; then
-+		pluginsFlat=`grep "s0_active_plugins" $COMPIZ_FLAT_FILE`
-+		if test `echo $pluginsFlat | grep -c $UNITY_NAME` -gt 0; then
-+			pluginsFlatWithoutUnity=`echo $pluginsFlat | sed -e "s/$UNITY_NAME;//g"`
-+			sed -i "/s0_active_plugins/ s/$pluginsFlat/$pluginsFlatWithoutUnity/g" $COMPIZ_FLAT_FILE
-+		fi
-+	fi
-+	# gconf
-+	plugins=`gconftool-2 -g $COMPIZ_GCONF`
-+	if test `echo $plugins | grep -c $UNITY_NAME` -gt 0; then
-+		pluginsWithoutUnity=`echo $plugins | sed -e "s/$UNITY_NAME,//g"`
-+		gconftool-2 -s $COMPIZ_GCONF --type=list --list-type=string "$pluginsWithoutUnity"
-+		killall unity-panel-service
-+	fi
-+fi
-+
-+if test `ps aux | grep -c " [c]airo-dock"` -eq 0; then # cairo-dock not launched
-+	cairo-dock -w 3
-+fi
-Index: cairo-dock/data/desktop-manager/cairo-dock.desktop
-===================================================================
---- cairo-dock.orig/data/desktop-manager/cairo-dock.desktop	2011-10-06 12:02:24.450184800 +0200
-+++ cairo-dock/data/desktop-manager/cairo-dock.desktop	2011-10-06 12:02:17.554184897 +0200
-@@ -2,6 +2,6 @@
- Name=Cairo-Dock (with Gnome and effects)
- Comment=This session logs you into GNOME with Cairo-Dock and with graphical effects.
- Exec=gnome-session --session=cairo-dock
--TryExec=gnome-session
-+TryExec=cairo-dock-session
- Icon=
- Type=Application
-Index: cairo-dock/data/scripts/help_scripts.sh
-===================================================================
---- cairo-dock.orig/data/scripts/help_scripts.sh	2011-10-06 12:02:24.294184802 +0200
-+++ cairo-dock/data/scripts/help_scripts.sh	2011-10-06 12:02:17.554184897 +0200
-@@ -115,7 +115,7 @@
- 		# flat file
- 		if test -f "$HOME/.config/compiz-1/compizconfig/Default.ini"; then
- 			pluginsList="s0_active_plugins = "`echo $ARG2 |sed -e 's/,/;/g'`";" # , => ;
--			sed -i "/s0_active_plugins/ s/.*/$ARG2/g" $HOME/.config/compiz-1/compizconfig/Default.ini
-+			sed -i "/s0_active_plugins/ s/.*/$pluginsList/g" $HOME/.config/compiz-1/compizconfig/Default.ini
- 		fi
- 		# gconf
- 		gconftool-2 -s /apps/compiz-1/general/screen0/options/active_plugins --type=list --list-type=string "[$ARG2]"
diff --git a/x11-misc/gsimplecal/Manifest b/x11-misc/gsimplecal/Manifest
new file mode 100644
index 0000000..7c1b46c
--- /dev/null
+++ b/x11-misc/gsimplecal/Manifest
@@ -0,0 +1,2 @@
+DIST v2.1.tar.gz 14133 SHA256 660cac7333d3507203a008e142e2b8f5dfcf0735b6ccabdd8d3d902b5d2c40e9 SHA512 f9f31b1c6ef11d08b44e120608e794d86fdd2b963cae750c9990db4f0849f5d5370ab074f2b49704b10fbbb24aab5f0c7b95b9d09f005716f861ab30e2dbaddd WHIRLPOOL 72b7fdb423dfa9aec7450e8ee82e5e23a6d84c232b9b557074c5b1804841314d972fc0cd53b652129d0010e5ed2fdc60eddca5212ebee303bd4df8d49477f13c
+EBUILD gsimplecal-2.1.ebuild 611 SHA256 bbb41e42fb65fc19d983be94a347b42253935ec28ea44eab7c1164d7e2ff1251 SHA512 791b44d8055ee5d9835c994623826ebad599202571a11736f0d33a53702fcfd8463b6e47f49db06b0b055903368e36df5ccf72a0df7679580b025d4a166c829a WHIRLPOOL 08a3647fa38fc46387178322e8f3204c3620b3abe94a7d11eb0674781c33a0ad6eb65f2708b1d0ceacd17278c222079ecb327c4a9312de2a16712d0520793922
diff --git a/x11-misc/gsimplecal/gsimplecal-2.1.ebuild b/x11-misc/gsimplecal/gsimplecal-2.1.ebuild
new file mode 100644
index 0000000..54eb09a
--- /dev/null
+++ b/x11-misc/gsimplecal/gsimplecal-2.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="3"
+
+inherit autotools
+
+DESCRIPTION="A lightweight calendar designed for tint2"
+HOMEPAGE="https://github.com/dmedvinsky/gsimplecal"
+SRC_URI="https://github.com/dmedvinsky/${PN}/archive/v${PV}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/gtk+:2"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	>=sys-devel/autoconf-2.65"
+
+S=$WORKDIR/$PF
+
+src_prepare() {
+	eautoreconf
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc README NEWS AUTHORS ChangeLog
+}
diff --git a/x11-misc/tint2/Manifest b/x11-misc/tint2/Manifest
deleted file mode 100644
index 6833fb4..0000000
--- a/x11-misc/tint2/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST tint2patchfiles.tar.gz 3894 SHA256 bb24d1ff1a60b9a5abe36db8a7642d03ecaa42c96a1610aedd517e9ebb02cf09 SHA512 fbfe30d298e46ce2dd7482f4471b2fdb4de85b5ff585538c674f3968db3af546e5820bf4a704b169b1aad1112e2897fe00ff9f9a8b402089d345412e9924d754 WHIRLPOOL d4c51103e41d271cab42f3c7f84690b3274943a86f3441c09ee0468bbb16e7e74d0347baef3957a13976efc7f50bbf95a2ebb5436b1ed778a4d16459b40a4c55
-EBUILD tint2-9999.ebuild 1442 SHA256 12eb97fe6009965ed28c777c7f644fd79c26248870c50da2d40edc039218f523 SHA512 5e1876e9cd86712784f1d4342675366d34f4e08ea7244e67f67f16df20fccb6b0c88b95a3f57ba1bbefe0d136c02a2ce1b9ea8e31f8bd3eb80578a380f493710 WHIRLPOOL 751e23b66a38884163d29ca16f3b7660db390536f7e12bbb57e0b886212afa15136c6a0e8ea47784174118fe0a75cab6b02ef643d31974132998f2af3c1db4a6
diff --git a/x11-misc/tint2/tint2-9999.ebuild b/x11-misc/tint2/tint2-9999.ebuild
deleted file mode 100644
index 5988e89..0000000
--- a/x11-misc/tint2/tint2-9999.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: x11-misc/tint2/tint2-9999.ebuild,v 1.6 2014/10/31 17:38:41 -tclover Exp $
-
-EAPI=5
-
-inherit eutils cmake-utils subversion
-
-DESCRIPTION="A lightweight panel/taskbar"
-HOMEPAGE="http://code.google.com/p/tint2/"
-ESVN_REPO_URI="http://tint2.googlecode.com/svn/trunk/"
-SRC_URI="https://dl.dropbox.com/s/gmko5d6sy8qjpao/tint2patchfiles.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="battery examples tint2conf"
-
-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]
-	virtual/pkgconfig
-	x11-proto/xineramaproto"
-
-RDEPEND="${COMMON_DEPEND}
-	tint2conf? ( x11-misc/tintwizard )"
-
-PATCHES=(
-	"${WORKDIR}"/freespace.patch
-	"${WORKDIR}"/launcher_apps_dir-v2.patch
-	"${WORKDIR}"/src-task-align.patch
-)
-
-src_unpack()
-{
-	subversion_src_unpack
-	unpack "${A}"
-}
-
-src_prepare()
-{
-	subversion_src_prepare
-	cmake-utils_src_prepare
-}
-
-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"
-	dodoc
-}
-