Merge branch 'master' of git://github.com/Keruspe/Keruspe-overlay

Conflicts:
	gnome-base/gnome-settings-daemon/files/0001-Make-colord-optional.patch
	gnome-base/gnome-settings-daemon/files/0002-Disable-wacom.patch

For 0001 and 0002, keep mines

21 files changed, 37 insertions, 145 deletions

diff --git a/app-paludis/paludis-scripts/Manifest b/app-paludis/paludis-scripts/Manifest
index 29d6ed20..2242e778 100644
--- a/app-paludis/paludis-scripts/Manifest
+++ b/app-paludis/paludis-scripts/Manifest
@@ -1 +1 @@
-EBUILD paludis-scripts-9999.ebuild 607 RMD160 aec681c6e282cf65806f4782f7c99ad3b8d23729 SHA1 f06a13acb8bba5d94396252116414be381aced40 SHA256 2efe9f5c8a1a1934723ebd6ad906213ceb7d64876273c7de55acb3b5fbd6ee4f
+EBUILD paludis-scripts-9999.ebuild 619 RMD160 409e05b53655a5afbc04837e6dd2f739e047d10d SHA1 2fe67aa788f524c78b499890ad7a8de5312abbe2 SHA256 4ce6db10e94bb0920ea2ca2497e081a93beed71b68c7f48c2eb59a9917a4824c
diff --git a/app-paludis/paludis-scripts/paludis-scripts-9999.ebuild b/app-paludis/paludis-scripts/paludis-scripts-9999.ebuild
index c19138ea..54b841ce 100644
--- a/app-paludis/paludis-scripts/paludis-scripts-9999.ebuild
+++ b/app-paludis/paludis-scripts/paludis-scripts-9999.ebuild
@@ -6,9 +6,9 @@ EAPI="4"
 inherit git-2
 
 DESCRIPTION="Scripts for paludis, the other package mangler"
-HOMEPAGE="http://paludis.pioto.org/"
+HOMEPAGE="http://paludis.exherbo.org/"
 SRC_URI=""
-EGIT_REPO_URI="git://git.pioto.org/paludis-scripts.git"
+EGIT_REPO_URI="git://git.exherbo.org/paludis/paludis-scripts.git"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/dev-util/valgrind/Manifest b/dev-util/valgrind/Manifest
index 260dcd06..2c50ade9 100644
--- a/dev-util/valgrind/Manifest
+++ b/dev-util/valgrind/Manifest
@@ -1,6 +1,5 @@
 AUX valgrind-3.6.0-local-labels.patch 1388 RMD160 e9c0064d1e857f1e616c5d9ca7a03e78eae3d5ab SHA1 173820d5671f56c864850c2d8df9d6d301dfda38 SHA256 34ae13eda378677f1e662e0813f138de9b897d6592d20872c58ed8ac1bcf7def
-AUX valgrind-3.7.0-fix-gcc-regex.patch 581 RMD160 ab1bcd6f79b208f73ea6cc1f4cde1cefc07b74ca SHA1 63820c292db0b245f056629f2cf4247bcad7ecff SHA256 697049e69b5fe85211dab18e471ac4c8d18a50c1fa650466dcba2cacca322bd1
 AUX valgrind-3.7.0-fno-stack-protector.patch 554 RMD160 df9a699ff35cf867e17b04a200c5e68015955167 SHA1 ed6368061d47448a597f6a2a9635f66e244b5a13 SHA256 83ed90a0e8a8b06dca8aad4e7f1a12e3c84621d502427c0913b72740b310f479
 AUX valgrind-3.7.0-non-exec-stack.patch 5644 RMD160 86178ee97653b2b4074e98e2342c5104583fa759 SHA1 8074a41b2e8915fa3a63ce827a14088949057bed SHA256 4de10480b6e27379083203df3cfedccdace68d0aad611440478ca2f1b2f89751
 AUX valgrind-3.7.0-respect-flags.patch 360 RMD160 b3ca9a393a68d312fa12cd272720e67c8661cfc4 SHA1 2ca0d9474bd4a81d45981bc8433359832d1ce8b9 SHA256 6b1e5938ecafc29428a698296423c71924848b1e746d6ee8a0f1dd91141f1019
-EBUILD valgrind-9999.ebuild 2547 RMD160 0d971c5a81a19fd901044394b7293ec4c63dee87 SHA1 c8c38e1ac059a4bee42f0c3bb3ac9f400d3c7b92 SHA256 8694f474eb8f25410a7ba42499062132717d983fc87d0bda1112ac2418197082
+EBUILD valgrind-9999.ebuild 2454 RMD160 0c85ae56b9565c5ed9575b05428419b70a255969 SHA1 13eae1700cf6ac92e1f550bc1906ecc5c1f6f341 SHA256 16749943e7bf1f10b1f9d89da993e019718103da517eef227869549a7c5d203d
diff --git a/dev-util/valgrind/files/valgrind-3.7.0-fix-gcc-regex.patch b/dev-util/valgrind/files/valgrind-3.7.0-fix-gcc-regex.patch
deleted file mode 100644
index 3233333c..00000000
--- a/dev-util/valgrind/files/valgrind-3.7.0-fix-gcc-regex.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur valgrind-3.7.0.orig//configure.in valgrind-3.7.0/configure.in
---- valgrind-3.7.0.orig//configure.in	2011-11-05 07:13:30.000000000 -0400
-+++ valgrind-3.7.0/configure.in	2011-11-10 18:13:39.000000000 -0500
-@@ -109,7 +109,7 @@
-              | head -n 1 \
-              | $SED 's/i686-apple-darwin10//' \
-              | $SED 's/i686-apple-darwin11//' \
--             | $SED 's/^[^0-9]*\([0-9.]*\).*$/\1/'`]
-+             | $SED 's/.*\s\([.0-9]*\)$/\1/'`]
- 
- is_clang="notclang"
- if test "x`${CC} --version | head -n 1 | $SED 's/\(clang\) version.*/\1/'`" = "xclang" ; then
diff --git a/dev-util/valgrind/valgrind-9999.ebuild b/dev-util/valgrind/valgrind-9999.ebuild
index a451bb4f..c8d5684b 100644
--- a/dev-util/valgrind/valgrind-9999.ebuild
+++ b/dev-util/valgrind/valgrind-9999.ebuild
@@ -34,9 +34,6 @@ src_prepare() {
 	# warning about executable stacks.
 	epatch "${FILESDIR}"/${PN}-3.7.0-non-exec-stack.patch
 
-	# Fix the regex to get gcc's version
-	epatch "${FILESDIR}"/${PN}-3.7.0-fix-gcc-regex.patch
-
 	# Regenerate autotools files
 	eautoreconf
 }
diff --git a/eclass/gnome2-live.eclass b/eclass/gnome2-live.eclass
index a7a0de41..5305310e 100644
--- a/eclass/gnome2-live.eclass
+++ b/eclass/gnome2-live.eclass
@@ -184,6 +184,8 @@ gnome2_src_prepare() {
 # @DESCRIPTION:
 # Must be run manually for ebuilds that have a custom pkg_postinst
 gnome2-live_pkg_postinst() {
+	gnome2_pkg_postinst
+
 	ewarn "This is a live ebuild, upstream scms will mostly be UNstable"
 	ewarn "Do NOT report bugs about this package to Gentoo"
 	ewarn "Report upstream bugs (with patches if possible) instead."
diff --git a/eclass/gnome2.eclass b/eclass/gnome2.eclass
index 2b196a79..e939260f 100644
--- a/eclass/gnome2.eclass
+++ b/eclass/gnome2.eclass
@@ -246,7 +246,7 @@ gnome2_pkg_postrm() {
 	fdo-mime_desktop_database_update
 	fdo-mime_mime_database_update
 	gnome2_icon_cache_update
-	gnome2_schemas_update --uninstall
+	gnome2_schemas_update
 
 	if [[ "${SCROLLKEEPER_UPDATE}" = "1" ]]; then
 		gnome2_scrollkeeper_update
diff --git a/games-action/bomb-her-man/Manifest b/games-action/bomb-her-man/Manifest
index 699aacdc..c826b052 100644
--- a/games-action/bomb-her-man/Manifest
+++ b/games-action/bomb-her-man/Manifest
@@ -1 +1 @@
-EBUILD bomb-her-man-9999.ebuild 860 RMD160 38325165187e3c2253f20c95ccbbc47b412004bc SHA1 23601f7f0893309420d014e7dd3b4e85d05af0ba SHA256 de43e5fa243b282633996bd78101d4ed55bb7d84be39f27b682c5980d9d0e0f2
+EBUILD bomb-her-man-9999.ebuild 853 RMD160 5eee42eb016e8535c8a6bc3de77ccdb359ef7fda SHA1 c99abcc1038e7965225ead8d8225ab1a1b5c157f SHA256 2453651215bea88481c8bc4939113c6c7955db34dca3c48cd2ad364b5f82ed5e
diff --git a/games-action/bomb-her-man/bomb-her-man-9999.ebuild b/games-action/bomb-her-man/bomb-her-man-9999.ebuild
index 6d47a586..481558c8 100644
--- a/games-action/bomb-her-man/bomb-her-man-9999.ebuild
+++ b/games-action/bomb-her-man/bomb-her-man-9999.ebuild
@@ -36,5 +36,5 @@ src_configure() {
 src_install() {
 	base_src_install
 	rm -f ${ED}${GAMES_DATADIR}/${PN}/biolinum.ttf
-	dosym /usr/share/fonts/libertine-ttf/LinBiolinum_Re-0.6.4.ttf ${GAMES_DATADIR}/${PN}/biolinum.ttf
+	dosym /usr/share/fonts/libertine-ttf/LinBiolinum_R.ttf ${GAMES_DATADIR}/${PN}/biolinum.ttf
 }
diff --git a/gnome-base/gnome-settings-daemon/Manifest b/gnome-base/gnome-settings-daemon/Manifest
index 0c648a3a..f4b37713 100644
--- a/gnome-base/gnome-settings-daemon/Manifest
+++ b/gnome-base/gnome-settings-daemon/Manifest
@@ -1,3 +1,3 @@
-AUX 0001-Make-colord-optional.patch 4478 RMD160 a8bfd5541018cc21b2818d4813c454a53e0c5394 SHA1 3c620b4ff439bdf2603309e778ff3b0a6c1ba8be SHA256 6cd403a470e954b7312bb56a1175a80c45d440afc40719a12cc5485531afc89f
-AUX gnome-settings-daemon-3.2.1-optional-colord.patch 2934 RMD160 cefc964b1c6449807043977b81ac4f593f37b7e3 SHA1 e1fa059374a429fe532af88f3a490d0ad5a2153a SHA256 2eb0e6cffd2fc579ece5cbe36950a28e9831d63764d8b5fae89df711ead4bf52
-EBUILD gnome-settings-daemon-9999-r1.ebuild 3465 RMD160 fd0c3b01ef0755b4149e7c90dcc5757b8f096ec5 SHA1 ae63c49cf876eac5380ff3056a7b69ee5bdb043c SHA256 1a361246f315ca2dade57450ae1ee88d61be37a882807aaba8b6e3c80e76813e
+AUX 0001-Make-colord-optional.patch 4497 RMD160 cb26ecd2232118120f9675c9215e0248fe6b652a SHA1 570bde3786a6ae1a270ea792a15cfbe537e0381c SHA256 59f1cdbe53161e2a57037ab8c4a0a53e67b5e39c2fdf840bb7d3023d174a88e6
+AUX 0002-Disable-wacom.patch 1389 RMD160 3add8c49da1c54adaf8bd55a1c7d420db4c98903 SHA1 5347bef5683a6d3aca7d497b5761aa955e46beff SHA256 6ac2a235419b3126c7afaf22275457e34928f8453a09c403de75601eec70532d
+EBUILD gnome-settings-daemon-9999-r1.ebuild 3512 RMD160 23d8205e06151842af123c496592cd5c346d8d0c SHA1 d5638f1f60f54b94194adc4c8fa4a31f9ee9aee8 SHA256 736aa9f4e28b94a69e4f1748da2bb26b6cc099aaa1bf753bc836653d8b1cc68e
diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.2.1-optional-colord.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.2.1-optional-colord.patch
deleted file mode 100644
index 98afbec6..00000000
--- a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.2.1-optional-colord.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-From e1e0584cec966dc58a51efaf534f129b4830399f Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Thu, 27 Oct 2011 23:30:41 -0400
-Subject: [PATCH] Make colord optional
-
----
- configure.ac        |   20 +++++++++++++++++++-
- data/Makefile.am    |    7 ++++++-
- plugins/Makefile.am |    7 ++++++-
- 3 files changed, 31 insertions(+), 3 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index fe74674..f1a8547 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -107,7 +107,25 @@ PKG_CHECK_MODULES(GNOME_DESKTOP, gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VE
- dnl ---------------------------------------------------------------------------
- dnl - Check for colord
- dnl ---------------------------------------------------------------------------
--PKG_CHECK_MODULES(COLORD, colord >= 0.1.12)
-+build_color=false
-+AC_ARG_ENABLE(color,
-+  AC_HELP_STRING([--disable-color],
-+                 [turn off color plugin]),
-+      [case "${enableval}" in
-+              yes) WANT_COLOR=yes ;;
-+	      no) WANT_COLOR=no ;;
-+	      *) AC_MSG_ERROR(bad value ${enableval} for --disable-color) ;;
-+      esac],
-+      [WANT_COLOR=yes]) dnl Default value
-+
-+if test x$WANT_COLOR = xyes; then
-+      PKG_CHECK_MODULES(COLORD, colord >= 0.1.12)
-+      build_color=true
-+fi
-+AM_CONDITIONAL(BUILD_COLOR, test "x$build_color" = "xtrue")
-+
-+AC_SUBST(COLORD_CFLAGS)
-+AC_SUBST(COLORD_LIBS)
- 
- dnl ---------------------------------------------------------------------------
- dnl - Check for libcanberra
-diff --git a/data/Makefile.am b/data/Makefile.am
-index 43ba27c..1f3bbef 100644
---- a/data/Makefile.am
-+++ b/data/Makefile.am
-@@ -11,7 +11,6 @@ gsettings_SCHEMAS =							\
- 	org.gnome.settings-daemon.plugins.gschema.xml			\
- 	org.gnome.settings-daemon.plugins.keyboard.gschema.xml		\
- 	org.gnome.settings-daemon.plugins.power.gschema.xml		\
--	org.gnome.settings-daemon.plugins.color.gschema.xml		\
- 	org.gnome.settings-daemon.plugins.media-keys.gschema.xml	\
- 	org.gnome.settings-daemon.plugins.xsettings.gschema.xml		\
- 	org.gnome.settings-daemon.plugins.housekeeping.gschema.xml	\
-@@ -21,6 +20,12 @@ gsettings_SCHEMAS =							\
- 
- all_schemas = $(gsettings_SCHEMAS)
- 
-+if BUILD_COLOR
-+gsettings_SCHEMAS += org.gnome.settings-daemon.plugins.color.gschema.xml
-+else
-+all_schemas += org.gnome.settings-daemon.plugins.color.gschema.xml
-+endif
-+
- if HAVE_PACKAGEKIT
- gsettings_SCHEMAS += org.gnome.settings-daemon.plugins.updates.gschema.xml
- else
-diff --git a/plugins/Makefile.am b/plugins/Makefile.am
-index 5e26811..d2404ab 100644
---- a/plugins/Makefile.am
-+++ b/plugins/Makefile.am
-@@ -6,7 +6,6 @@ enabled_plugins =	\
- 	automount	\
- 	background	\
- 	clipboard	\
--	color		\
- 	cursor		\
- 	datetime	\
- 	dummy		\
-@@ -24,6 +23,12 @@ enabled_plugins =	\
- 
- disabled_plugins = $(NULL)
- 
-+if BUILD_COLOR
-+enabled_plugins += color
-+else
-+disabled_plugins += color
-+endif
-+
- if BUILD_GCONF_BRIDGE
- enabled_plugins += gconf
- else
--- 
-1.7.7.1
-
diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999-r1.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999-r1.ebuild
index f543a14c..39fcca4d 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999-r1.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999-r1.ebuild
@@ -103,6 +103,7 @@ src_prepare() {
 
 	# Make colord optional; requires eautoreconf
 	epatch "${FILESDIR}/0001-Make-colord-optional.patch"
+	epatch "${FILESDIR}/0002-Disable-wacom.patch"
 
 	gnome2_src_prepare
 }
diff --git a/net-libs/libsoup-gnome/Manifest b/net-libs/libsoup-gnome/Manifest
index e454005b..230d474e 100644
--- a/net-libs/libsoup-gnome/Manifest
+++ b/net-libs/libsoup-gnome/Manifest
@@ -1,2 +1,2 @@
-AUX libsoup-gnome-9999-system-lib.patch 6795 RMD160 493ca34ced82c798b4b323c5bce51bb3ed0d4cf5 SHA1 58d62469253e82d650d20822369eaead0e0dfa60 SHA256 76015b579cbb399af929c17ba0eb232310934c80a5a0326f58a8220fae0b0846
+AUX libsoup-gnome-9999-system-lib.patch 6819 RMD160 5b7c81031ba869716d7acbb6b786304c764cdd87 SHA1 161f4e67b6df6dcc438efa37fdc195864fadb36b SHA256 012aedd8606d62d2fab347d3e5d407fa9e1d998cae58b1ca7007a18b4090899e
 EBUILD libsoup-gnome-9999-r1.ebuild 1260 RMD160 b3992fd34fb1afebbda70d53de3ad014218ee821 SHA1 cd637dd029b5c538049708b1fdde381d1e5f8fe1 SHA256 7c174c9a6fdf1326464f7c6c1a277b298a240e7dec8e9ba4b2e3a7d0dab0f155
diff --git a/net-libs/libsoup-gnome/files/libsoup-gnome-9999-system-lib.patch b/net-libs/libsoup-gnome/files/libsoup-gnome-9999-system-lib.patch
index b8b39c5a..66f79cf3 100644
--- a/net-libs/libsoup-gnome/files/libsoup-gnome-9999-system-lib.patch
+++ b/net-libs/libsoup-gnome/files/libsoup-gnome-9999-system-lib.patch
@@ -1,4 +1,4 @@
-From 4f4e9f3e2e54b485d6d1a43e5a94145a66289a9b Mon Sep 17 00:00:00 2001
+From 3abe0e9a7370324ffb7a4cf70dd068c492f0d502 Mon Sep 17 00:00:00 2001
 From: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
 Date: Thu, 13 Oct 2011 12:03:04 +0200
 Subject: [PATCH] gentoo shit
@@ -11,12 +11,12 @@ Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
  3 files changed, 76 insertions(+), 28 deletions(-)
 
 diff --git a/Makefile.am b/Makefile.am
-index 861daff..a6463fb 100644
+index bb94238..0562574 100644
 --- a/Makefile.am
 +++ b/Makefile.am
 @@ -1,7 +1,11 @@
  ## Process this file with automake to produce Makefile.in
- ACLOCAL_AMFLAGS = -I m4
+ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
  
 -SUBDIRS = libsoup tests docs
 +SUBDIRS = libsoup
@@ -41,25 +41,25 @@ index 861daff..a6463fb 100644
  if BUILD_LIBSOUP_GNOME
  pkgconfig_DATA += libsoup-gnome-2.4.pc
 diff --git a/configure.ac b/configure.ac
-index 443f300..2025eb6 100644
+index 899f7af..2a3e12c 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -72,15 +72,30 @@ dnl ***********************
  dnl *** Checks for glib ***
  dnl ***********************
  
--AM_PATH_GLIB_2_0(2.30.0,,,gobject gio)
+-AM_PATH_GLIB_2_0(2.31.0,,,gobject gio)
 -if test "$GLIB_LIBS" = ""; then
--   AC_MSG_ERROR(GLIB 2.30.0 or later is required to build libsoup)
+-   AC_MSG_ERROR(GLIB 2.31.0 or later is required to build libsoup)
 +PKG_PROG_PKG_CONFIG
 +enable_ssl=no
 +AC_ARG_WITH(libsoup-system,
 +   AS_HELP_STRING([--with-libsoup-system], [Use libsoup system library to build(default=no)]),
 +   [with_libsoup_system=$withval], [with_libsoup_system=no])
 +if test "$with_libsoup_system" = "no"; then
-+	AM_PATH_GLIB_2_0(2.30.0,,,gobject gio)
++	AM_PATH_GLIB_2_0(2.31.0,,,gobject gio)
 +	if test "$GLIB_LIBS" = ""; then
-+	   AC_MSG_ERROR(GLIB 2.30.0 or later is required to build libsoup)
++	   AC_MSG_ERROR(GLIB 2.31.0 or later is required to build libsoup)
 +	fi
 +	GLIB_CFLAGS="$GLIB_CFLAGS -DG_DISABLE_SINGLE_INCLUDES"
 +
@@ -241,5 +241,5 @@ index 096f0fb..416e523 100644
  SoupGNOME_2_4_gir_EXPORT_PACKAGES = libsoup-gnome-2.4
  
 -- 
-1.7.8.rc0.dirty
+1.7.8.163.g9859a.dirty
 
diff --git a/sys-apps/paludis/Manifest b/sys-apps/paludis/Manifest
index 71499cbb..0f9814f2 100644
--- a/sys-apps/paludis/Manifest
+++ b/sys-apps/paludis/Manifest
@@ -1,3 +1,3 @@
 AUX 0001-paludis-sort-world.patch 6309 RMD160 aed7ebcd6584cb48c9078b7b0f25686c8bd7c16a SHA1 ca105295391c8869f4f1a38b7689d08efdcc6a0a SHA256 b1f40b94776ea05d109d6b8c6ae3abf31cb362f5241beac8c3e30adb605f7650
 AUX 0002-cave-resolve-ask.patch 8415 RMD160 a55cb8150249bc233d0efc28d09590d8dd223d6c SHA1 ac8f552a2897b28228e87868f7271a078ee2bd2a SHA256 639174143d6b1d0ba47676f60e767a9b7e5b715eb452e32e8381a818ad3a11b5
-EBUILD paludis-9999.ebuild 3818 RMD160 8c71c1f7c304b51c42242dc56cea4b51df6d148d SHA1 5d11549f47595e5afd678a521cdf6c8aeb068157 SHA256 50cace062cbadb5c550829a2d22f89e17a5a62bb8a88b540e42bd9b880247e0b
+EBUILD paludis-9999.ebuild 3830 RMD160 dcfbd73cfd210b3dcc8df49214712fee3aaba116 SHA1 03cc83dc8df5bd22fd39c2ab1ddc8f49ea647511 SHA256 f2264354d58133b74aed3886dd5221259f6c3baece0c5256d9f851b8f4c38a39
diff --git a/sys-apps/paludis/paludis-9999.ebuild b/sys-apps/paludis/paludis-9999.ebuild
index 6ef722c8..16682cb8 100644
--- a/sys-apps/paludis/paludis-9999.ebuild
+++ b/sys-apps/paludis/paludis-9999.ebuild
@@ -6,9 +6,9 @@ EAPI="paludis-1"
 inherit bash-completion-r1 eutils git-2
 
 DESCRIPTION="paludis, the other package mangler"
-HOMEPAGE="http://paludis.pioto.org/"
+HOMEPAGE="http://paludis.exherbo.org/"
 SRC_URI=""
-EGIT_REPO_URI="git://git.pioto.org/paludis.git"
+EGIT_REPO_URI="git://git.exherbo.org/paludis/paludis.git"
 
 IUSE="ask doc gemcutter pbins pink portage python-bindings ruby-bindings search-index sort-world vim-syntax visibility xml zsh-completion"
 LICENSE="GPL-2 vim-syntax? ( vim )"
diff --git a/x11-misc/gpaste/Manifest b/x11-misc/gpaste/Manifest
index d453d4dd..f308ef6c 100644
--- a/x11-misc/gpaste/Manifest
+++ b/x11-misc/gpaste/Manifest
@@ -1,3 +1,3 @@
-DIST gpaste-2.1.tar.xz 143752 RMD160 ea4bcdc7031f70f7da4a9946831decbdc5340e84 SHA1 f51507f0e108acde727d4cd9d7c178af16dca6a6 SHA256 a5219365e1622daf34164d5e8e1b59e086b900e05a3909289020efcdd6bcb190
-EBUILD gpaste-2.1.ebuild 1182 RMD160 e7fa38cddb685fdc238b244e57aeaf3dc731983a SHA1 59813d388900ddda4d7874a3e2e52cb246462e90 SHA256 cd36c96ec7abea0ba8a9a3159a218c9909985d25cfa9eb105a92a3fee851f4e0
-EBUILD gpaste-9999.ebuild 1440 RMD160 d41eaf47e7b27cef334f6338840f044454dd4a0a SHA1 140bc60c1121afe7f9af95fafd2dd1bfd27bfaa3 SHA256 0f2b2f080974238bf04830ac576dea9f4884a8f9b48637a95e5782b5816cac55
+DIST gpaste-2.2.1.tar.xz 150896 RMD160 a7d39854467ff47d4891c2cff4b56effa5874b02 SHA1 358b56607319935168f633beb9233996f2eae00c SHA256 7f641750dc01455f8f49ade923070df32ed5afe2c30e99398caff1ff61464aff
+EBUILD gpaste-2.2.1.ebuild 1182 RMD160 e7fa38cddb685fdc238b244e57aeaf3dc731983a SHA1 59813d388900ddda4d7874a3e2e52cb246462e90 SHA256 cd36c96ec7abea0ba8a9a3159a218c9909985d25cfa9eb105a92a3fee851f4e0
+EBUILD gpaste-9999.ebuild 1427 RMD160 6af873c4e440e61e179a81e27b368aac0c976f21 SHA1 e76dba0422a6a2f1823a397eb0a96fcf476fc8b1 SHA256 b95adb28f6c815af0bf18e9f22f029ed258721fa1fd089bbb1508bc8f864c960
diff --git a/x11-misc/gpaste/gpaste-2.1.ebuild b/x11-misc/gpaste/gpaste-2.2.1.ebuild
index 805cb48c..805cb48c 100644
--- a/x11-misc/gpaste/gpaste-2.1.ebuild
+++ b/x11-misc/gpaste/gpaste-2.2.1.ebuild
diff --git a/x11-misc/gpaste/gpaste-9999.ebuild b/x11-misc/gpaste/gpaste-9999.ebuild
index a8ac3a8b..5fdb142c 100644
--- a/x11-misc/gpaste/gpaste-9999.ebuild
+++ b/x11-misc/gpaste/gpaste-9999.ebuild
@@ -14,19 +14,19 @@ SLOT="0"
 KEYWORDS=""
 IUSE="applet bash-completion +gnome-shell +vala zsh-completion"
 
-DEPEND=">=dev-libs/glib-2.28:2
+DEPEND=">=dev-libs/glib-2.30:2
 	>=sys-devel/gettext-0.17
 	>=dev-util/intltool-0.40
 	>=x11-libs/gtk+-3.0.0:3
 	dev-libs/libxml2
-	x11-base/xorg-server
-	>=dev-libs/gobject-introspection-1.31.0
+	x11-libs/libxcb
+	sys-apps/dbus
+	>=dev-libs/gobject-introspection-1.30.0
 	>=dev-lang/vala-0.14.0:0.14
 	vala? ( >=dev-lang/vala-0.14.0:0.14[vapigen] )"
 RDEPEND="${DEPEND}
 	bash-completion? ( app-shells/bash )
-	sys-apps/dbus
-	gnome-shell? ( >=gnome-base/gnome-shell-3.1.90 )
+	gnome-shell? ( >gnome-base/gnome-shell-3.3.2 )
 	zsh-completion? ( app-shells/zsh app-shells/zsh-completion )"
 
 WANT_AUTOMAKE="1.11"
@@ -39,7 +39,7 @@ G2CONF="
 	$(use_enable gnome-shell gnome-shell-extension)
 	$(use_enable vala)"
 
-DOCS="AUTHORS NEWS ChangeLog ChangeLog.pre2.0 TODO FIXME README"
+DOCS="AUTHORS NEWS ChangeLog ChangeLog.pre2.0 TODO README"
 
 REQUIRED_USE="|| ( gnome-shell applet )"
 
diff --git a/x11-terms/germinal/Manifest b/x11-terms/germinal/Manifest
index 598c7fd8..dc874410 100644
--- a/x11-terms/germinal/Manifest
+++ b/x11-terms/germinal/Manifest
@@ -1,3 +1,3 @@
-DIST germinal-2.tar.xz 86716 RMD160 48cebfde291e74b6e4aa946234804d305a39edd8 SHA1 40094042b7ee866b83facc04ed1d136313de046d SHA256 4ab0012aae8cf83424e15eba3ec4bf20950fce4e62ddf9e6ac9177497d855701
-EBUILD germinal-2.ebuild 634 RMD160 c252751212980f9a788e4cfef2851f98dc777813 SHA1 86abd410e49e681305c3c8617433e864b48426a4 SHA256 b416eaa913d7cd7abbb4d180b11f4dff643fcbc36b8189d5164e4c86124bee82
+DIST germinal-3.tar.xz 87384 RMD160 6790cbbb33461d65392ab07060880d646f9567eb SHA1 437ef381facc75544609e7c136b936763bd5f3d0 SHA256 b4349ba46abc93edbfc6889fc7e5fa668308758df1eeb282bc11b062e8ec68c1
+EBUILD germinal-3.ebuild 634 RMD160 c252751212980f9a788e4cfef2851f98dc777813 SHA1 86abd410e49e681305c3c8617433e864b48426a4 SHA256 b416eaa913d7cd7abbb4d180b11f4dff643fcbc36b8189d5164e4c86124bee82
 EBUILD germinal-9999.ebuild 611 RMD160 a7db2e66cc7f65c1ddae6f01d580687b29cfd35d SHA1 23ba84ff64aab71451eb26e79c05aadb892e7171 SHA256 562cc874b2c1f6cf8e92569c848dc94bb3964f249c49df62ca75803f195950ab
diff --git a/x11-terms/germinal/germinal-2.ebuild b/x11-terms/germinal/germinal-3.ebuild
index 441c4c13..441c4c13 100644
--- a/x11-terms/germinal/germinal-2.ebuild
+++ b/x11-terms/germinal/germinal-3.ebuild