diff --git a/app-doc/gnucash-docs/Manifest b/app-doc/gnucash-docs/Manifest
index e8a6e58c7b38..6cefca3a11ac 100644
--- a/app-doc/gnucash-docs/Manifest
+++ b/app-doc/gnucash-docs/Manifest
@@ -1,2 +1 @@
-DIST gnucash-docs-2.4.2.tar.gz 52521317 SHA256 b1a41082acaf86358cba3656e43e01a68e18570ec698906430bcdc8b2a103654 SHA512 db8a1e23a58002ce1eac93fe5f40248d7e4074d900fbc12f8c3c5f038349073999ef71fa7ed9f34123911409a68b2bcbee5d6a304db50a1949cbf6c828d906b1 WHIRLPOOL 3274d3cb7513dccddafb2f141293b6cda36785ff3e5be000e378f2784945328549bab00276f159ecb5b693a1b1f9de63a4ac1912e6430d85066890dcf9cdb638
 DIST gnucash-docs-2.6.1.tar.gz 58923509 SHA256 b0e978970c74a5c3d2745073eed7c98e6405276f1a418ae8173ff621de584ada SHA512 14660b7db2dfd4e95404e2ed6ab6b6e34c53d294e8e74526d56cd5c5c056da20b91ad9612cc54f79e17f72fc2ddf1a30b6cc6a8e522e32e7ce89855f294ecde9 WHIRLPOOL 0d70dce7d639f559668dc63e953bce3758c6afdf8cf52db0cf24591f5fa70688b9048bdf8cf9ea6d32572eebe908a4ed3d01553fbfc69f2be7f4b6e2e3784a80
diff --git a/app-doc/gnucash-docs/gnucash-docs-2.4.2.ebuild b/app-doc/gnucash-docs/gnucash-docs-2.4.2.ebuild
deleted file mode 100644
index 0b214154f79b..000000000000
--- a/app-doc/gnucash-docs/gnucash-docs-2.4.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/gnucash-docs/gnucash-docs-2.4.2.ebuild,v 1.4 2013/03/26 16:47:20 ago Exp $
-
-EAPI=5
-GCONF_DEBUG=no
-
-inherit gnome2
-
-DESCRIPTION="Documentation package for GnuCash"
-HOMEPAGE="http://www.gnucash.org/"
-SRC_URI="mirror://sourceforge/gnucash/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2 FDL-1.1"
-KEYWORDS="amd64 ppc ~ppc64 x86"
-IUSE=""
-
-RDEPEND="!<=app-office/gnucash-2.2.1"
-
-DEPEND="${RDEPEND}
-	>=dev-libs/libxml2-2.5.10
-	dev-libs/libxslt
-	app-text/docbook-xsl-stylesheets
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/rarian"
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	has_version dev-java/fop || elog "You need dev-java/fop to generate pdf files."
-	has_version gnome-extra/yelp || elog "You need gnome-extra/yelp to view the docs."
-}
diff --git a/app-misc/screen/Manifest b/app-misc/screen/Manifest
index b8af24c8b47e..9546f9e86dda 100644
--- a/app-misc/screen/Manifest
+++ b/app-misc/screen/Manifest
@@ -1 +1,2 @@
 DIST screen-4.0.3.tar.gz 840602 SHA256 78f0d5b1496084a5902586304d4a73954b2bfe33ea13edceecf21615c39e6c77 SHA512 24c1f598972f3dc9ed49cd2c05852190a0190d22fa01401eee8484627c8dd2815f0a422d9b2697faa8aaa0b3efc6730a94e2d5aa787dbe5e9ec719143176c338 WHIRLPOOL 6774786126eb05749d432593bc2c1febdc57896959220a609feb138bdc16b8da278aea63af1ccfd5c7d38ccaa9e7d28980e9e14d0009d36a54cdbd9e4cb0fca7
+DIST screen-4.2.0.tar.gz 786565 SHA256 7dc1b7a3e7669eefe7e65f32e201704d7a11cc688244fcf71757f7792a5ff413 SHA512 be9b04de668864c1e9ebabe76dc35be60ece15bda16d983d8fee0331ddbf6d732ca354a136cd602dda76baf155d8f324e1ef16cc10b4b13ee07c74d37af49350 WHIRLPOOL 8922a0766e3e55fcc7d2f255fd9c38eb6145f78363c6173cbb66336aec956ace29b8786fa93fa967920b3cc5468b2c031c90fd6f5a1c76cec0e60500acba9dc8
diff --git a/app-misc/screen/files/4.2.0-tinfo.patch b/app-misc/screen/files/4.2.0-tinfo.patch
new file mode 100644
index 000000000000..0718181d8c41
--- /dev/null
+++ b/app-misc/screen/files/4.2.0-tinfo.patch
@@ -0,0 +1,20 @@
+--- a/configure.in
++++ b/configure.in
+@@ -674,10 +674,16 @@
+ LIBS="-lncursesw $olibs"
+ AC_CHECKING(libncursesw)
+ AC_TRY_LINK(,tgetent((char *)0, (char *)0);,,
++LIBS="-ltinfow $olibs"
++AC_CHECKING(libtinfow)
++AC_TRY_LINK(,tgetent((char *)0, (char *)0);,,
+ LIBS="-lncurses $olibs"
+ AC_CHECKING(libncurses)
+ AC_TRY_LINK(,tgetent((char *)0, (char *)0);,,
+-AC_MSG_ERROR(!!! no tgetent - no screen)))))))
++LIBS="-ltinfo $olibs"
++AC_CHECKING(libtinfo)
++AC_TRY_LINK(,tgetent((char *)0, (char *)0);,,
++AC_MSG_ERROR(!!! no tgetent - no screen)))))))))
+ 
+ AC_TRY_RUN([
+ main()
diff --git a/app-misc/screen/screen-4.2.0.ebuild b/app-misc/screen/screen-4.2.0.ebuild
new file mode 100644
index 000000000000..5f7bc7aaf743
--- /dev/null
+++ b/app-misc/screen/screen-4.2.0.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/screen-4.2.0.ebuild,v 1.2 2014/04/17 15:43:29 jer Exp $
+
+EAPI=5
+
+inherit autotools eutils flag-o-matic pam toolchain-funcs user
+
+DESCRIPTION="Full-screen window manager that multiplexes physical terminals between several processes"
+HOMEPAGE="http://www.gnu.org/software/screen/"
+SRC_URI="http://download.savannah.gnu.org/releases/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="debug nethack pam selinux multiuser"
+
+RDEPEND=">=sys-libs/ncurses-5.2
+	pam? ( virtual/pam )
+	selinux? ( sec-policy/selinux-screen )"
+DEPEND="${RDEPEND}
+	sys-apps/texinfo"
+RDEPEND="${RDEPEND}
+	>=sys-apps/openrc-0.11.6"
+
+pkg_setup() {
+	# Make sure utmp group exists, as it's used later on.
+	enewgroup utmp 406
+}
+
+src_prepare() {
+	# Don't use utempter even if it is found on the system
+	epatch "${FILESDIR}"/4.0.2-no-utempter.patch
+
+	# Fix building against sys-libs/ncurses[tinfo]
+	epatch "${FILESDIR}"/4.2.0-tinfo.patch
+
+	# sched.h is a system header and causes problems with some C libraries
+	mv sched.h _sched.h || die
+	sed -i '/include/ s:sched.h:_sched.h:' screen.h || die
+
+	# Fix manpage.
+	sed -i \
+		-e "s:/usr/local/etc/screenrc:${EPREFIX}/etc/screenrc:g" \
+		-e "s:/usr/local/screens:${EPREFIX}/run/screen:g" \
+		-e "s:/local/etc/screenrc:${EPREFIX}/etc/screenrc:g" \
+		-e "s:/etc/utmp:${EPREFIX}/var/run/utmp:g" \
+		-e "s:/local/screens/S-:${EPREFIX}/run/screen/S-:g" \
+		doc/screen.1 \
+		|| die "sed doc/screen.1 failed"
+
+	# reconfigure
+	eautoreconf
+}
+
+src_configure() {
+	append-cppflags "-DMAXWIN=${MAX_SCREEN_WINDOWS:-100}"
+
+	[[ ${CHOST} == *-solaris* ]] && append-libs -lsocket -lnsl
+
+	use nethack || append-cppflags "-DNONETHACK"
+	use debug && append-cppflags "-DDEBUG"
+
+	econf \
+		--with-socket-dir="${EPREFIX}/run/screen" \
+		--with-sys-screenrc="${EPREFIX}/etc/screenrc" \
+		--with-pty-mode=0620 \
+		--with-pty-group=5 \
+		--enable-rxvt_osc \
+		--enable-telnet \
+		--enable-colors256 \
+		$(use_enable pam)
+
+	LC_ALL=POSIX emake term.h
+	emake osdef.h
+
+	emake -C doc screen.info
+}
+
+src_install() {
+	local tmpfiles_perms tmpfiles_group
+
+	dobin screen
+
+	if use multiuser || use prefix
+	then
+		fperms 4755 /usr/bin/screen
+		tmpfiles_perms="0755"
+		tmpfiles_group="root"
+	else
+		fowners root:utmp /usr/bin/screen
+		fperms 2755 /usr/bin/screen
+		tmpfiles_perms="0775"
+		tmpfiles_group="utmp"
+	fi
+
+	dodir /etc/tmpfiles.d
+	echo "d /run/screen ${tmpfiles_perms} root ${tmpfiles_group}" >"${ED}"/etc/tmpfiles.d/screen.conf
+
+	insinto /usr/share/screen
+	doins terminfo/{screencap,screeninfo.src}
+	insinto /usr/share/screen/utf8encodings
+	doins utf8encodings/??
+	insinto /etc
+	doins "${FILESDIR}"/screenrc
+
+	pamd_mimic_system screen auth
+
+	dodoc \
+		README ChangeLog INSTALL TODO NEWS* patchlevel.h \
+		doc/{FAQ,README.DOTSCREEN,fdpat.ps,window_to_display.ps}
+
+	doman doc/screen.1
+	doinfo doc/screen.info
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]
+	then
+		elog "Some dangerous key bindings have been removed or changed to more safe values."
+		elog "We enable some xterm hacks in our default screenrc, which might break some"
+		elog "applications. Please check /etc/screenrc for information on these changes."
+	fi
+
+	ewarn "This revision changes the screen socket location to /run/screen."
+}
diff --git a/app-office/abiword-docs/Manifest b/app-office/abiword-docs/Manifest
index 66c342b9a538..07e29a080672 100644
--- a/app-office/abiword-docs/Manifest
+++ b/app-office/abiword-docs/Manifest
@@ -1,2 +1 @@
-DIST abiword-docs-2.8.6.tar.gz 1460563 SHA256 b6620b5887151a44c61ed63118ebe9044e332015f36b624724ab007d3465b502 SHA512 f1ab642071211e17c055a1655cfb4eefa4f017b4241531b63198cb100591bd178a067eb9a6c0eb540d2644a3fa020b5bb3c766e5c9a17debe4d0ee0b0678775e WHIRLPOOL 0285e4b0111a8de7968caf130c98bcbf180746485f9caf5112da477b41dfdb36721a42df9e3cfad80b924c23a05a3cd988283e096027118e6415d6200e11c8ef
 DIST abiword-docs-3.0.0.tar.gz 1482576 SHA256 11bb83cacbead8dd91e14f8dc49473843c683ee997e3974ec3167e7665bc89ad SHA512 13ca23026e162e7e50ef5f287507ea850f15fb1668bec31ea3c7bb90b8c11abff6bebfdadffb53856c895ba286fbe37aa625d241d908e702603c758b1e4ed12d WHIRLPOOL 5d3fb67aa2640d8d5a63a17a14d8d86260747b53a768bfcd0ec8713ee736870949bad203380d5950aaff2630694924b6a1c02f64ca4829100a0bd02f3424eb70
diff --git a/app-office/abiword-docs/abiword-docs-2.8.6.ebuild b/app-office/abiword-docs/abiword-docs-2.8.6.ebuild
deleted file mode 100644
index 4dedf55303d9..000000000000
--- a/app-office/abiword-docs/abiword-docs-2.8.6.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/abiword-docs/abiword-docs-2.8.6.ebuild,v 1.3 2011/07/23 15:31:28 tomka Exp $
-
-EAPI="3"
-GCONF_DEBUG="no"
-
-inherit gnome2
-
-DESCRIPTION="Fully featured yet light and fast cross platform word processor"
-HOMEPAGE="http://www.abisource.com/"
-SRC_URI="http://www.abisource.com/downloads/abiword/${PV}/source/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=app-office/abiword-${PV}"
-DEPEND="${RDEPEND}"
diff --git a/app-office/abiword/Manifest b/app-office/abiword/Manifest
index 4a008f6ba4c7..84affbbea311 100644
--- a/app-office/abiword/Manifest
+++ b/app-office/abiword/Manifest
@@ -1,2 +1 @@
-DIST abiword-2.8.6.tar.gz 9218827 SHA256 d99089a63a6cfc1a6a4a026be9278028d47d224088d24b1853acb67e95683a15 SHA512 327ffa6da73f7a1b74d1bc374239ac087ee76672da590626da3a068f972684b0963c50641718c39a7fb2429a56c1076bdfd67e8f7f0eab0eda90b70cf846bbbd WHIRLPOOL 15f060e6e31028ebb507e8b2e4b82670dd4d0850be256851d21081d42d83e81efcd33457bd634d99bb82686dbdc6ccd6d24794ce063ec4751c511a3ff6b463ee
 DIST abiword-3.0.0.tar.gz 10956892 SHA256 d17e318c00ff4eb353e0e7994b098b1d4f9ddd8712ac0261a0e38b89081fac01 SHA512 3f9804b17f27b8afa2f5bcccdb1b5d6270339ad4f518523208f2e2cde54cb28391575cfd3639aaadc13ab50d5908260b159ca7b41fd92ed5a449d7012e5a4637 WHIRLPOOL 54cb234dbaae070d4f9dfa215e3c5a80a45666b7363febf4b56c7ec685c7b084bf78f2f3a6827cb8585bec4ead5c6fd8bd71bc51c35bf3423f3b31a296bdb144
diff --git a/app-office/abiword/abiword-2.8.6-r2.ebuild b/app-office/abiword/abiword-2.8.6-r2.ebuild
deleted file mode 100644
index c3d207a40324..000000000000
--- a/app-office/abiword/abiword-2.8.6-r2.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/abiword-2.8.6-r2.ebuild,v 1.11 2012/08/05 21:44:50 blueness Exp $
-
-EAPI="4"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-
-inherit alternatives eutils gnome2 versionator autotools
-
-MY_MAJORV=$(get_version_component_range 1-2)
-
-DESCRIPTION="Fully featured yet light and fast cross platform word processor"
-HOMEPAGE="http://www.abisource.com/"
-SRC_URI="http://www.abisource.com/downloads/${PN}/${PV}/source/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="alpha amd64 ~arm ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="collab cups gnome grammar latex math ots openxml +plugins readline spell wordperfect wmf thesaurus" # svg
-
-# You need 'plugins' enabled if want to enable the extra plugins
-REQUIRED_USE="!plugins? ( !collab !grammar !latex !math !openxml !ots !readline !thesaurus !wordperfect !wmf )"
-
-# libgsf raised to make sure it provides gio backend
-# not enabling telepathy backend for collab, it depends on libempathy-gtk which
-# has be removed from empathy-2.30 already
-RDEPEND="
-	>=app-text/wv-1.2
-	>=dev-libs/fribidi-0.10.4
-	>=dev-libs/glib-2.16:2
-	>=gnome-base/librsvg-2.16:2
-	>=gnome-extra/libgsf-1.14.15
-	>=media-libs/libpng-1.2
-	virtual/jpeg
-	>=x11-libs/cairo-1.8[X]
-	>=x11-libs/gtk+-2.14:2[cups?]
-	gnome? ( >=x11-libs/goffice-0.8:0.8 )
-	plugins? (
-		collab? (
-			>=dev-libs/boost-1.33.1
-			>=dev-libs/libxml2-2.4
-			>=net-libs/loudmouth-1
-			net-libs/libsoup:2.4
-			net-libs/gnutls )
-		grammar? ( >=dev-libs/link-grammar-4.2.1 )
-		latex? ( dev-libs/libxslt )
-		math? ( >=x11-libs/gtkmathview-0.7.5 )
-		openxml? ( dev-libs/boost )
-		ots? ( >=app-text/ots-0.5 )
-		readline? ( sys-libs/readline )
-		thesaurus? ( >=app-text/aiksaurus-1.2[gtk] )
-		wordperfect? (
-			app-text/libwpd:0.9
-			app-text/libwpg:0.2 )
-		wmf? ( >=media-libs/libwmf-0.2.8 )
-	)
-	spell? ( >=app-text/enchant-1.2 )
-	!<app-office/abiword-plugins-2.8"
-#		svg? ( >=gnome-base/librsvg-2 )
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	collab? ( dev-cpp/asio )"
-
-pkg_setup() {
-	# do not enable gnome-vfs
-	G2CONF="${G2CONF}
-		--enable-shave
-		--disable-static
-		--disable-default-plugins
-		--disable-builtin-plugins
-		--disable-collab-backend-telepathy
-		--enable-clipart
-		--enable-statusbar
-		--enable-templates
-		--with-gio
-		--without-gnomevfs
-		$(use_with gnome goffice)
-		$(use_enable cups print)
-		$(use_enable collab collab-backend-xmpp)
-		$(use_enable collab collab-backend-tcp)
-		$(use_enable collab collab-backend-service)
-		$(use_enable spell)"
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-libpng15.patch
-	epatch "${FILESDIR}"/${P}-gcc46.patch
-	epatch "${FILESDIR}"/${P}-libwpd.patch
-	epatch "${FILESDIR}"/${P}-glib-2.31.patch
-
-	# install icon to pixmaps (bug #220097)
-	sed 's:$(datadir)/icons:$(datadir)/pixmaps:' \
-		-i Makefile.am Makefile.in || die "sed 1 failed"
-	# readme.txt will be installed using dodoc
-	sed '/readme\.txt\|abw/d' \
-		-i user/wp/Makefile.am user/wp/Makefile.in || die "sed 2 failed"
-
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	local plugins=""
-
-	if use plugins; then
-		# Plugins depending on libgsf
-		plugins="t602 docbook clarisworks wml kword hancom openwriter pdf
-			loadbindings mswrite garble pdb applix opendocument sdw xslfo"
-
-		# Plugins not depending on anything
-		plugins="${plugins} gimp bmp freetranslation iscii s5 babelfish opml eml
-			wikipedia gdict passepartout google presentation urldict hrtext mif"
-
-		# inter7eps: eps.h
-		# libtidy: gsf + tidy.h
-		# paint: windows only ?
-		use collab && plugins="${plugins} collab"
-		use gnome && plugins="${plugins} goffice"
-		use latex && plugins="${plugins} latex"
-		use math && plugins="${plugins} mathview"
-		use openxml && plugins="${plugins} openxml"
-		use ots && plugins="${plugins} ots"
-		# psion: >=psiconv-0.9.4
-		use readline && plugins="${plugins} command"
-		# plugin doesn't build
-		#use svg && plugins="${plugins} rsvg"
-		use thesaurus && plugins="${plugins} aiksaurus"
-		use wmf && plugins="${plugins} wmf"
-		# wordperfect: >=wpd-0.9 >=wpg-0.2
-		use wordperfect && plugins="${plugins} wpg"
-	fi
-
-	gnome2_src_configure --enable-plugins="$(echo ${plugins})"
-}
-
-src_install() {
-	gnome2_src_install
-
-	sed "s:Exec=abiword:Exec=abiword-${MY_MAJORV}:" \
-		-i "${ED}"/usr/share/applications/abiword.desktop || die "sed 3 failed"
-
-	mv "${ED}/usr/bin/abiword" "${ED}/usr/bin/AbiWord-${MY_MAJORV}"
-	dosym AbiWord-${MY_MAJORV} /usr/bin/abiword-${MY_MAJORV}
-
-	dodoc AUTHORS user/wp/readme.txt
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	alternatives_auto_makesym "/usr/bin/abiword" "/usr/bin/abiword-[0-9].[0-9]"
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-	alternatives_auto_makesym "/usr/bin/abiword" "/usr/bin/abiword-[0-9].[0-9]"
-}
diff --git a/app-office/abiword/files/abiword-2.8.6-gcc46.patch b/app-office/abiword/files/abiword-2.8.6-gcc46.patch
deleted file mode 100644
index c07000edbfa3..000000000000
--- a/app-office/abiword/files/abiword-2.8.6-gcc46.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -u -r abiword-2.8.6.orig/src/Makefile.am abiword-2.8.6/src/Makefile.am
---- abiword-2.8.6.orig/src/Makefile.am	2009-09-09 15:11:01.000000000 +0200
-+++ abiword-2.8.6/src/Makefile.am	2011-08-02 23:35:51.904761961 +0200
-@@ -107,7 +107,7 @@
- 
- AbiWord_LDFLAGS = \
- 	$(DEPS_LIBS) \
--	--no-undefined \
-+	-Wl,--no-undefined \
- 	-avoid-version \
- 	-export-dynamic \
- 	-headerpad_max_install_names 
-@@ -129,7 +129,7 @@
- 
- abiword_LDFLAGS = \
- 	$(platform_ldflags) \
--	--no-undefined      \
-+	-Wl,--no-undefined      \
- 	-avoid-version      \
- 	-export-dynamic
- 
diff --git a/app-office/abiword/files/abiword-2.8.6-glib-2.31.patch b/app-office/abiword/files/abiword-2.8.6-glib-2.31.patch
deleted file mode 100644
index 8b938cc25a7e..000000000000
--- a/app-office/abiword/files/abiword-2.8.6-glib-2.31.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-------------------------------------------------------------------------
-r30479 | hub | 2011-11-29 00:39:09 -0500 (Tue, 29 Nov 2011) | 2 lines
-Changed paths:
-   M /abiword/trunk/src/af/util/xp/ut_go_file.h
-
-Bug 13197: only import glib.h
-Patch by Dominique Leuenberger.
-------------------------------------------------------------------------
-r30602 | hub | 2012-01-30 02:00:38 -0500 (Mon, 30 Jan 2012) | 2 lines
-Changed paths:
-   M /abiword/trunk/goffice-bits/goffice/app/goffice-app.h
-
-Bug 13247 - Fix glib headers. Patch by Funda Wang
-(safe to backport)
-------------------------------------------------------------------------
-Index: src/af/util/xp/ut_go_file.h
-===================================================================
---- src/af/util/xp/ut_go_file.h	(revision 30478)
-+++ src/af/util/xp/ut_go_file.h	(revision 30479)
-@@ -31,7 +31,6 @@
- 
- #include <glib.h>
- #include <gsf/gsf.h>
--#include <glib/gerror.h>
- #include <time.h>
- 
- G_BEGIN_DECLS
-Index: goffice-bits/goffice/app/goffice-app.h
-===================================================================
---- goffice-bits/goffice/app/goffice-app.h	(revision 30601)
-+++ goffice-bits/goffice/app/goffice-app.h	(revision 30602)
-@@ -22,7 +22,7 @@
- #ifndef GOFFICE_APP_H
- #define GOFFICE_APP_H
- 
--#include <glib/gmacros.h>
-+#include <glib.h>
- 
- G_BEGIN_DECLS
- 
diff --git a/app-office/abiword/files/abiword-2.8.6-libpng15.patch b/app-office/abiword/files/abiword-2.8.6-libpng15.patch
deleted file mode 100644
index 7eded4c837b2..000000000000
--- a/app-office/abiword/files/abiword-2.8.6-libpng15.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-$NetBSD: patch-plugins_bmp_xp_ie__impGraphic__BMP.cpp,v 1.1 2011/02/01 10:48:15 wiz Exp $
-
-Fix build with png-1.5.
-
---- plugins/bmp/xp/ie_impGraphic_BMP.cpp.orig	2009-06-25 04:02:06.000000000 +0000
-+++ plugins/bmp/xp/ie_impGraphic_BMP.cpp
-@@ -191,7 +191,10 @@ UT_Error IE_ImpGraphic_BMP::_convertGrap
- 
- 	/* Clean Up Memory Used */
- 		
--	FREEP(m_pPNGInfo->palette);
-+	png_colorp palette;
-+	int num_palette;
-+	png_get_PLTE( m_pPNG, m_pPNGInfo, &palette, &num_palette );
-+	FREEP(palette);
- 	DELETEP(pBB);
- 	png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
-    
-@@ -313,7 +316,7 @@ UT_Error IE_ImpGraphic_BMP::Initialize_P
- 	 * the normal method of doing things with libpng).  REQUIRED unless you
- 	 * set up your own error handlers in the png_create_read_struct() earlier.
- 	 */
--	if (setjmp(m_pPNG->jmpbuf))
-+	if (setjmp(png_jmpbuf(m_pPNG)))
- 	{
- 		/* Free all of the memory associated with the png_ptr and info_ptr */
- 		png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
-@@ -332,7 +335,7 @@ UT_Error IE_ImpGraphic_BMP::Initialize_P
- 	UT_Error IE_ImpGraphic_BMP::Convert_BMP_Pallet(UT_ByteBuf* pBB)
- 	{
- 		/* Reset error handling for libpng */
--		if (setjmp(m_pPNG->jmpbuf))
-+		if (setjmp(png_jmpbuf(m_pPNG)))
- 		{
- 			png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
- 			return UT_ERROR;
-@@ -372,7 +375,7 @@ UT_Error IE_ImpGraphic_BMP::Initialize_P
- UT_Error IE_ImpGraphic_BMP::Convert_BMP(UT_ByteBuf* pBB)
- {
- 	/* Reset error handling for libpng */
--	if (setjmp(m_pPNG->jmpbuf))
-+	if (setjmp(png_jmpbuf(m_pPNG)))
- 	{
- 		png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
- 		return UT_ERROR;
-
-$NetBSD: patch-plugins_garble_xp_abiword-garble-png.cpp,v 1.1 2011/02/01 10:48:15 wiz Exp $
-
-Fix build with png-1.5.
-
---- plugins/garble/xp/abiword-garble-png.cpp.orig	2009-09-05 15:34:44.000000000 +0000
-+++ plugins/garble/xp/abiword-garble-png.cpp
-@@ -79,7 +79,7 @@ bool abiword_document::garble_png( void*
- 		png_set_strip_alpha( png_ptr );
- 		png_set_interlace_handling( png_ptr );
- 		png_set_bgr( png_ptr );
--		rowbytes = info_ptr->rowbytes;
-+		rowbytes = png_get_rowbytes( png_ptr, info_ptr );
- 		png_destroy_read_struct( &png_ptr, &info_ptr, NULL );
- 	}
- 
-$NetBSD: patch-af,v 1.12 2011/01/15 15:07:11 wiz Exp $
-
-Fix build with png-1.5.
-
---- src/wp/impexp/gtk/ie_impGraphic_GdkPixbuf.cpp.orig	2009-07-01 04:02:04.000000000 +0000
-+++ src/wp/impexp/gtk/ie_impGraphic_GdkPixbuf.cpp
-@@ -185,7 +185,7 @@ UT_Error IE_ImpGraphic_GdkPixbuf::import
- /** needed for the stejmp context */
- UT_Error IE_ImpGraphic_GdkPixbuf::_png_write(GdkPixbuf * pixbuf)
- {
--	if (setjmp(m_pPNG->jmpbuf))
-+	if (setjmp(png_jmpbuf(m_pPNG)))
- 	{
- 		DELETEP(m_pPngBB);
- 		png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
-@@ -446,7 +446,7 @@ UT_Error IE_ImpGraphic_GdkPixbuf::Initia
- 	 * the normal method of doing things with libpng).  REQUIRED unless you
- 	 * set up your own error handlers in the png_create_read_struct() earlier.
- 	 */
--	if (setjmp(m_pPNG->jmpbuf))
-+	if (setjmp(png_jmpbuf(m_pPNG)))
- 	{
- 		/* Free all of the memory associated with the png_ptr and info_ptr */
- 		png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
-$NetBSD: patch-ae,v 1.21 2011/01/15 15:07:11 wiz Exp $
-
-Fix build with png-1.5.
-
---- src/af/util/xp/ut_png.cpp.orig	2008-02-24 03:33:07.000000000 +0000
-+++ src/af/util/xp/ut_png.cpp
-@@ -71,7 +71,7 @@ bool UT_PNG_getDimensions(const UT_ByteB
- 	 * the normal method of doing things with libpng).  REQUIRED unless you
- 	 * set up your own error handlers in the png_create_read_struct() earlier.
- 	 */
--	if (setjmp(png_ptr->jmpbuf))
-+	if (setjmp(png_jmpbuf(png_ptr)))
- 	{
- 		/* Free all of the memory associated with the png_ptr and info_ptr */
- 		png_destroy_read_struct(&png_ptr, &info_ptr, static_cast<png_infopp>(NULL));
diff --git a/app-office/abiword/files/abiword-2.8.6-libwpd.patch b/app-office/abiword/files/abiword-2.8.6-libwpd.patch
deleted file mode 100644
index a4765e00c739..000000000000
--- a/app-office/abiword/files/abiword-2.8.6-libwpd.patch
+++ /dev/null
@@ -1,413 +0,0 @@
---- plugins/wordperfect/xp/ie_imp_WordPerfect.cpp	(revision 29401)
-+++ plugins/wordperfect/xp/ie_imp_WordPerfect.cpp	(revision 29403)
-@@ -60,7 +60,7 @@
- 
- // Stream class
- 
--#include <libwpd/WPXStream.h>
-+#include <libwpd-stream/libwpd-stream.h>
- 
- #include <gsf/gsf-input.h>
- #include <gsf/gsf-infile.h>
-@@ -70,12 +70,7 @@
- #include <libwps/libwps.h>
- #endif
- 
--class AbiWordperfectInputStream :
--#ifdef HAVE_LIBWPS
--	public WPSInputStream
--#else
--    public WPXInputStream
--#endif
-+class AbiWordperfectInputStream : public WPXInputStream
- {
- public:
- 	AbiWordperfectInputStream(GsfInput *input);
-@@ -86,7 +81,7 @@
- 
- 	virtual WPXInputStream * getDocumentOLEStream(const char * name);
- 
--	virtual const uint8_t *read(size_t numBytes, size_t &numBytesRead);
-+	virtual const unsigned char *read(unsigned long numBytes, unsigned long &numBytesRead);
- 	virtual int seek(long offset, WPX_SEEK_TYPE seekType);
- 	virtual long tell();
- 	virtual bool atEOS();
-@@ -98,11 +93,7 @@
- };
- 
- AbiWordperfectInputStream::AbiWordperfectInputStream(GsfInput *input) :
--#ifdef HAVE_LIBWPS
--	WPSInputStream(),
--#else
--	WPXInputStream(true),
--#endif
-+	WPXInputStream(),
- 	m_input(input),
- 	m_ole(NULL)
- {
-@@ -117,9 +108,9 @@
- 	g_object_unref(G_OBJECT(m_input));
- }
- 
--const uint8_t * AbiWordperfectInputStream::read(size_t numBytes, size_t &numBytesRead)
-+const unsigned char * AbiWordperfectInputStream::read(unsigned long numBytes, unsigned long &numBytesRead)
- {
--	const uint8_t *buf = gsf_input_read(m_input, numBytes, NULL);
-+	const unsigned char *buf = gsf_input_read(m_input, numBytes, NULL);
- 
- 	if (buf == NULL)
- 		numBytesRead = 0;
-@@ -256,19 +247,12 @@
- {
- 	AbiWordperfectInputStream gsfInput(input);
- 
--	WPDConfidence confidence = WPDocument::isFileFormatSupported(&gsfInput, true);
-+	WPDConfidence confidence = WPDocument::isFileFormatSupported(&gsfInput);
- 
- 	switch (confidence)
- 	{
- 		case WPD_CONFIDENCE_NONE:
--		// libwpd > 0.7.1 reports POOR if the text file is plain text (that _could_ be a WP4x document)
--		// however, we'll let the text importer handle such cases
--		case WPD_CONFIDENCE_POOR: 
- 			return UT_CONFIDENCE_ZILCH;
--		case WPD_CONFIDENCE_LIKELY:
--			return UT_CONFIDENCE_SOSO;
--		case WPD_CONFIDENCE_GOOD:
--			return UT_CONFIDENCE_GOOD;
- 		case WPD_CONFIDENCE_EXCELLENT:
- 			return UT_CONFIDENCE_PERFECT;
- 		default:
-@@ -328,7 +312,7 @@
- UT_Error IE_Imp_WordPerfect::_loadFile(GsfInput * input)
- {
- 	AbiWordperfectInputStream gsfInput(input);
--	WPDResult error = WPDocument::parse(&gsfInput, static_cast<WPXHLListenerImpl *>(this));
-+	WPDResult error = WPDocument::parse(&gsfInput, static_cast<WPXDocumentInterface *>(this), NULL);
- 
- 	if (error != WPD_OK)
- 	{
-@@ -381,9 +365,9 @@
- 	float marginLeft = 1.0f, marginRight = 1.0f;
- 
- 	if (propList["fo:margin-left"])
--		marginLeft = propList["fo:margin-left"]->getFloat();
-+		marginLeft = propList["fo:margin-left"]->getDouble();
- 	if (propList["fo:margin-right"])
--		marginRight = propList["fo:margin-right"]->getFloat();
-+		marginRight = propList["fo:margin-right"]->getDouble();
- 
- 	if (marginLeft != m_leftPageMargin || marginRight != m_rightPageMargin /* || */
- 		/* marginTop != m_marginBottom || marginBottom != m_marginBottom */ )
-@@ -456,15 +440,15 @@
- 	float marginTop = 0.0f, marginBottom = 0.0f;
- 	float marginLeft = 0.0f, marginRight = 0.0f, textIndent = 0.0f;
- 	if (propList["fo:margin-top"])
--	    marginTop = propList["fo:margin-top"]->getFloat();
-+	    marginTop = propList["fo:margin-top"]->getDouble();
- 	if (propList["fo:margin-bottom"])
--	    marginBottom = propList["fo:margin-bottom"]->getFloat();
-+	    marginBottom = propList["fo:margin-bottom"]->getDouble();
- 	if (propList["fo:margin-left"])
--	    marginLeft = propList["fo:margin-left"]->getFloat();
-+	    marginLeft = propList["fo:margin-left"]->getDouble();
- 	if (propList["fo:margin-right"])
--	    marginRight = propList["fo:margin-right"]->getFloat();
-+	    marginRight = propList["fo:margin-right"]->getDouble();
- 	if (propList["fo:text-indent"])
--	    textIndent = propList["fo:text-indent"]->getFloat();
-+	    textIndent = propList["fo:text-indent"]->getDouble();
- 
- 	m_topMargin = marginTop;
- 	m_bottomMargin = marginBottom;
-@@ -487,7 +471,7 @@
- 
- 	float lineSpacing = 1.0f;
- 	if (propList["fo:line-height"])
--		lineSpacing = propList["fo:line-height"]->getFloat();
-+		lineSpacing = propList["fo:line-height"]->getDouble();
- 	
- 	UT_String tmpBuffer;
- 	UT_String_sprintf(tmpBuffer, "; margin-top:%.4fin; margin-bottom:%.4fin; margin-left:%.4fin; margin-right:%.4fin; text-indent:%.4fin; line-height:%.4f",
-@@ -504,7 +488,7 @@
- 			propBuffer += tmpBuffer;
- 			if (i()["style:position"])
- 			{
--				UT_String_sprintf(tmpBuffer, "%.4fin", i()["style:position"]->getFloat());
-+				UT_String_sprintf(tmpBuffer, "%.4fin", i()["style:position"]->getDouble());
- 				propBuffer += tmpBuffer;
- 			}
- 
-@@ -520,10 +504,10 @@
- 			else // Left aligned is default
- 				propBuffer += "/L";
- 
--			if (i()["style:leader-char"])
--				if (i()["style:leader-char"]->getStr() == "-")
-+			if (i()["style:leader-text"])
-+				if (i()["style:leader-text"]->getStr() == "-")
- 					propBuffer += "2";
--				else if (i()["style:leader-char"]->getStr() == "_")
-+				else if (i()["style:leader-text"]->getStr() == "_")
- 					propBuffer += "3";
- 				else // default to dot leader if the given leader is dot or is not supported by AbiWord
- 					propBuffer += "1";
-@@ -586,12 +570,12 @@
- 			propBuffer += "subscript";
- 	}
- 
--	if (propList["style:text-underline"] || propList["style:text-crossing-out"])
-+	if (propList["style:text-underline-type"] || propList["style:text-line-through-type"])
- 	{
- 		propBuffer += "; text-decoration:";
--		if (propList["style:text-underline"])
-+		if (propList["style:text-underline-type"])
- 			propBuffer += "underline ";
--		if (propList["style:text-crossing-out"])
-+		if (propList["style:text-line-through-type"])
- 			propBuffer += "line-through";
- 
- 	}
-@@ -615,10 +599,10 @@
- 		propBuffer += propList["fo:color"]->getStr().cstr();
- 	}
- 
--	if (propList["style:text-background-color"])
-+	if (propList["fo:background-color"])
- 	{
- 		propBuffer += "; bgcolor:";
--		propBuffer += propList["style:text-background-color"]->getStr().cstr();
-+		propBuffer += propList["fo:background-color"]->getStr().cstr();
- 	}
- 
- 	UT_DEBUGMSG(("AbiWordPerfect: Appending span format: %s\n", propBuffer.c_str()));
-@@ -639,10 +623,10 @@
- 	int columnsCount = ((columns.count() == 0) ? 1 : columns.count());
- 
- 	// TODO: support spaceAfter
--	if (propList["fo:margin-left"])
--		marginLeft = propList["fo:margin-left"]->getFloat();
--	if (propList["fo:margin-right"])
--		marginRight = propList["fo:margin-right"]->getFloat();
-+	if (propList["fo:start-indent"])
-+		marginLeft = propList["fo:start-indent"]->getDouble();
-+	if (propList["fo:end-indent"])
-+		marginRight = propList["fo:end-indent"]->getDouble();
- 
- 	if (marginLeft != m_leftSectionMargin || marginRight != m_rightSectionMargin || m_sectionColumnsCount != columnsCount)
- 		m_bSectionChanged = true;
-@@ -709,9 +693,9 @@
- 	if (propList["style:num-format"])
- 		listType = propList["style:num-format"]->getStr().cstr()[0];
- 	if (propList["text:space-before"])
--		listLeftOffset = propList["text:space-before"]->getFloat();
-+		listLeftOffset = propList["text:space-before"]->getDouble();
- 	if (propList["text:min-label-width"])
--		listMinLabelWidth = propList["text:min-label-width"]->getFloat();
-+		listMinLabelWidth = propList["text:min-label-width"]->getDouble();
- 
- 	if (!m_pCurrentListDefinition || 
- 		m_pCurrentListDefinition->getOutlineHash() != listID ||
-@@ -749,9 +733,9 @@
- 	if (propList["libwpd:level"])
- 		level = propList["libwpd:level"]->getInt();
- 	if (propList["text:space-before"])
--		listLeftOffset = propList["text:space-before"]->getFloat();
-+		listLeftOffset = propList["text:space-before"]->getDouble();
- 	if (propList["text:min-label-width"])
--		listMinLabelWidth = propList["text:min-label-width"]->getFloat();
-+		listMinLabelWidth = propList["text:min-label-width"]->getDouble();
- 
- 	if (!m_pCurrentListDefinition || m_pCurrentListDefinition->getOutlineHash() != listID)
- 	{
-@@ -871,10 +855,10 @@
- 
- 	UT_String_sprintf(tempBuffer, "margin-left:%.4fin; ", m_pCurrentListDefinition->getListLeftOffset(m_iCurrentListLevel)
- 					+ m_pCurrentListDefinition->getListMinLabelWidth(m_iCurrentListLevel)
--					- (propList["fo:text-indent"] ? propList["fo:text-indent"]->getFloat() : 0.0f));
-+					- (propList["fo:text-indent"] ? propList["fo:text-indent"]->getDouble() : 0.0f));
- 	propBuffer += tempBuffer;
- 	UT_String_sprintf(tempBuffer, "text-indent:%.4fin", - m_pCurrentListDefinition->getListMinLabelWidth(m_iCurrentListLevel)
--					+ (propList["fo:text-indent"] ? propList["fo:text-indent"]->getFloat() : 0.0f));
-+					+ (propList["fo:text-indent"] ? propList["fo:text-indent"]->getDouble() : 0.0f));
- 	propBuffer += tempBuffer;
- 
- 	listAttribs[attribsCount++] = PT_PROPS_ATTRIBUTE_NAME;
-@@ -1263,7 +1247,7 @@
-     virtual UT_Error _loadFile(GsfInput * input)
- 	{
- 		AbiWordperfectInputStream gsfInput(input);
--		WPSResult error = WPSDocument::parse(&gsfInput, static_cast<WPXHLListenerImpl *>(this));
-+		WPSResult error = WPSDocument::parse(&gsfInput, static_cast<WPXDocumentInterface *>(this));
- 
- 		if (error != WPS_OK)
- 			{
-@@ -1302,18 +1286,12 @@
- {
- 	AbiWordperfectInputStream gsfInput(input);
- 
--	WPSConfidence confidence = WPSDocument::isFileFormatSupported(&gsfInput, true);
-+	WPSConfidence confidence = WPSDocument::isFileFormatSupported(&gsfInput);
- 
- 	switch (confidence)
- 	{
- 		case WPS_CONFIDENCE_NONE:
- 			return UT_CONFIDENCE_ZILCH;
--		case WPS_CONFIDENCE_POOR: 
--			return UT_CONFIDENCE_POOR;
--		case WPS_CONFIDENCE_LIKELY:
--			return UT_CONFIDENCE_SOSO;
--		case WPS_CONFIDENCE_GOOD:
--			return UT_CONFIDENCE_GOOD;
- 		case WPS_CONFIDENCE_EXCELLENT:
- 			return UT_CONFIDENCE_PERFECT;
- 		default:
---- plugins/wordperfect/xp/ie_imp_WordPerfect.h	(revision 29401)
-+++ plugins/wordperfect/xp/ie_imp_WordPerfect.h	(revision 29403)
-@@ -30,13 +30,7 @@
- #define IE_IMP_WP_H
- 
- #include <stdio.h>
--#ifdef _WIN32
--#define POINT WPX_POINT
--#endif
- #include <libwpd/libwpd.h>
--#ifdef _WIN32
--#undef POINT
--#endif
- #include "ie_imp.h"
- #include "ut_string.h"
- #include "ut_string_class.h"
-@@ -98,7 +92,7 @@
- 					IE_Imp ** ppie);
- };
- 
--class IE_Imp_WordPerfect : public IE_Imp, public WPXHLListenerImpl
-+class IE_Imp_WordPerfect : public IE_Imp, public WPXDocumentInterface
- {
- public:
-     IE_Imp_WordPerfect(PD_Document * pDocument);
-@@ -154,6 +148,21 @@
-     virtual void insertCoveredTableCell(const WPXPropertyList & /*propList*/) {}
-     virtual void closeTable();
- 
-+    virtual void definePageStyle(const WPXPropertyList&) {}
-+    virtual void defineParagraphStyle(const WPXPropertyList&, const WPXPropertyListVector&) {}
-+    virtual void defineCharacterStyle(const WPXPropertyList&) {}
-+    virtual void defineSectionStyle(const WPXPropertyList&, const WPXPropertyListVector&) {}
-+    virtual void insertSpace() {}
-+    virtual void insertField(const WPXString&, const WPXPropertyList&) {}
-+    virtual void openComment(const WPXPropertyList&) {}
-+    virtual void closeComment() {}
-+    virtual void openTextBox(const WPXPropertyList&) {}
-+    virtual void closeTextBox() {}
-+    virtual void openFrame(const WPXPropertyList&) {}
-+    virtual void closeFrame() {}
-+    virtual void insertBinaryObject(const WPXPropertyList&, const WPXBinaryData&) {}
-+    virtual void insertEquation(const WPXPropertyList&, const WPXString&) {}
-+
-     
- protected:
- 	virtual UT_Error _loadFile(GsfInput * input);
---- plugins/wordperfect/plugin.m4	(revision 29401)
-+++ plugins/wordperfect/plugin.m4	(revision 29403)
-@@ -1,6 +1,6 @@
- 
--wordperfect_pkgs="libwpd-0.8 >= 0.8.0 $gsf_req"
--wordperfect_wps_pkgs='libwps-0.1 >= 0.1.0'
-+wordperfect_pkgs="libwpg-0.2 >= 0.2.0 libwpd-0.9 >= 0.9.0 libwpd-stream-0.9 >= 0.9.0 $gsf_req"
-+wordperfect_wps_pkgs='libwps-0.2 >= 0.1.0'
- wordperfect_deps="no"
- 
- WORDPERFECT_CFLAGS=
---- plugins/wpg/xp/ie_impGraphic_WPG.cpp	(revision 29401)
-+++ plugins/wpg/xp/ie_impGraphic_WPG.cpp	(revision 29403)
-@@ -31,11 +31,10 @@
- #include <gsf/gsf-input-memory.h>
- #include <gsf/gsf-input-stdio.h>
- #include <gsf/gsf-infile-msole.h>
--#include <libwpd/WPXStream.h>
-+#include <libwpd-stream/libwpd-stream.h>
- #include "xap_Module.h"
- 
- using libwpg::WPGraphics;
--using libwpg::WPGString;
- 
- ABI_PLUGIN_DECLARE("WPG")
- 
-@@ -48,7 +47,7 @@
- 	virtual bool isOLEStream();
- 	virtual WPXInputStream * getDocumentOLEStream();
- 	virtual WPXInputStream * getDocumentOLEStream(const char * name);
--	virtual const uint8_t *read(size_t numBytes, size_t &numBytesRead);
-+	virtual const unsigned char *read(unsigned long numBytes, unsigned long &numBytesRead);
- 	virtual int seek(long offset, WPX_SEEK_TYPE seekType);
- 	virtual long tell();
- 	virtual bool atEOS();
-@@ -60,7 +59,7 @@
- };
- 
- AbiWordPerfectGraphicsInputStream::AbiWordPerfectGraphicsInputStream(GsfInput *input) :
--	WPXInputStream(true),
-+	WPXInputStream(),
- 	m_input(input),
- 	m_ole(NULL)
- {
-@@ -75,9 +74,9 @@
- 	g_object_unref(G_OBJECT(m_input));
- }
- 
--const uint8_t * AbiWordPerfectGraphicsInputStream::read(size_t numBytes, size_t &numBytesRead)
-+const unsigned char * AbiWordPerfectGraphicsInputStream::read(unsigned long numBytes, unsigned long &numBytesRead)
- {
--	const uint8_t *buf = gsf_input_read(m_input, numBytes, NULL);
-+	const unsigned char *buf = gsf_input_read(m_input, numBytes, NULL);
- 
- 	if (buf == NULL)
- 		numBytesRead = 0;
-@@ -245,10 +244,10 @@
- UT_Error IE_Imp_WordPerfectGraphics::importGraphic(GsfInput *input, FG_Graphic **ppfg)
- {
- 	AbiWordPerfectGraphicsInputStream gsfInput(input);
--	WPGString svgOutput;
-+	WPXString svgOutput;
- 	if (WPGraphics::generateSVG(&gsfInput, svgOutput))
- 	{
--		GsfInput * svgInput = gsf_input_memory_new((const guint8*)svgOutput.cstr(), svgOutput.length(), false);
-+		GsfInput * svgInput = gsf_input_memory_new((const guint8*)svgOutput.cstr(), svgOutput.len(), false);
- 		UT_Error result = IE_ImpGraphic::loadGraphic(svgInput, IE_ImpGraphic::fileTypeForSuffix(".svg"), ppfg);
- 		g_object_unref(svgInput);
- 		return result;
---- plugins/wpg/plugin.m4	(revision 29401)
-+++ plugins/wpg/plugin.m4	(revision 29403)
-@@ -1,5 +1,5 @@
- 
--wpg_pkgs="$gsf_req libwpg-0.1 >= 0.1.0 libwpd-0.8 >= 0.8.0"
-+wpg_pkgs="$gsf_req libwpg-0.2 >= 0.2.0 libwpd-0.9 >= 0.9.0 libwpd-stream-0.9 >= 0.9.0"
- wpg_deps="no"
- 
- if test "$enable_wpg" != ""; then
-
-
---- plugin-configure.m4~	2010-06-13 23:17:27.000000000 +0200
-+++ plugin-configure.m4	2011-12-17 11:02:51.870252482 +0100
-@@ -794,7 +794,7 @@
- AC_SUBST([OPENXML_LIBS])
- 
- 
--wpg_pkgs="$gsf_req libwpg-0.1 >= 0.1.0 libwpd-0.8 >= 0.8.0"
-+wpg_pkgs="$gsf_req libwpg-0.2 >= 0.2.0 libwpd-0.9 >= 0.9.0 libwpd-stream-0.9 >= -0.9.0"
- wpg_deps="no"
- 
- if test "$enable_wpg" != ""; then
-@@ -1497,8 +1497,8 @@
- AC_SUBST([EML_LIBS])
- 
- 
--wordperfect_pkgs="libwpd-0.8 >= 0.8.0 $gsf_req"
--wordperfect_wps_pkgs='libwps-0.1 >= 0.1.0'
-+wordperfect_pkgs="libwpd-0.9 >= 0.9.0 libwpd-stream-0.9 >= 0.9.0 $gsf_req"
-+wordperfect_wps_pkgs='libwps-0.2 >= 0.2.0'
- wordperfect_deps="no"
- 
- WORDPERFECT_CFLAGS=
diff --git a/app-office/abiword/metadata.xml b/app-office/abiword/metadata.xml
index f1dd897ee602..62f4bfa79459 100644
--- a/app-office/abiword/metadata.xml
+++ b/app-office/abiword/metadata.xml
@@ -8,7 +8,6 @@
 	<flag name='grammar'>Enable grammar checking via <pkg>dev-libs/link-grammar</pkg></flag>
 	<flag name="map">Enable world map support through <pkg>media-libs/libchamplain</pkg></flag>
 	<flag name='math'>Enable support for <pkg>x11-libs/gtkmathview</pkg></flag>
-	<flag name='openxml'>Enable OpenXML support</flag>
 	<flag name='ots'>Enable Text Summarizer plugin</flag>
 	<flag name='plugins'>Enable plugins build (see http://www.abisource.com/wiki/PluginMatrix for more information). If your
 		file cannot be opened due lack of support, try enabling this.</flag>
diff --git a/app-office/gnucash/Manifest b/app-office/gnucash/Manifest
index 9eb4f80c3192..370d31dcf4fa 100644
--- a/app-office/gnucash/Manifest
+++ b/app-office/gnucash/Manifest
@@ -1,3 +1 @@
-DIST gnucash-2.4.11.tar.bz2 9408193 SHA256 93c3d66af8d75da66dad814cabeb35aac417018ccc98e833af93b2ab4d7b7761 SHA512 220d0097f39bc359b97da388bbbddb233c6bfb7070cb793ae3a2848e6895fc35891ac72178c8fdaf0e0ac9da730b22c2443783eb3b66a99746488ebf8cbcd41b WHIRLPOOL 1d298051cd59f0b13e5c074de73b29522eb61b4727088851dcb66d8c9a85e08f366d050294325e0a8b7e11b26bdbf784b301828222851fe080555bff82e5731c
-DIST gnucash-2.4.13.tar.bz2 9400405 SHA256 f6025200eab90c098026310dc332272d922ce2d3a34fe926cc0c863c14009548 SHA512 805a98951dc2325db951c6435d6b84639d5f6f7f2dd82d97398520e9a0df859177826f8b3fde45710c03483be4e1b4995eb2a324de9609acd9c18472697fc046 WHIRLPOOL 5585eb2bf50a5db013f6583705a5164c050f7d14b9da34205e79c2b38846fea1c2808fed9cca26fff2a021c73585445ff47ed2f1e36bea6c90acf955ed1ffe8f
 DIST gnucash-2.6.1.tar.bz2 10944714 SHA256 c9e66f84c7706e3c8e7a1c88dcd58c5c3d102e285012b51f5af25052502cd8a4 SHA512 55dade97243ac9a10aaeca8950faf8732c44022d73ca8b0e6059830ea2b8a3033f2795da009133b55c0d652f9c0c4f6346791f849fd98e1083b6525973d119e6 WHIRLPOOL 8dce1abc93d7560b6121519abd97bad2ad2262f24214ced70ebb4f5cd9b1d223db873d803e15cf375d85d2d44261bcba9221e7c5230260b61b0e7d5473199f6a
diff --git a/app-office/gnucash/files/gnucash-2.4.11-potfiles-skip.patch b/app-office/gnucash/files/gnucash-2.4.11-potfiles-skip.patch
deleted file mode 100644
index 6fef3a1dcd38..000000000000
--- a/app-office/gnucash/files/gnucash-2.4.11-potfiles-skip.patch
+++ /dev/null
@@ -1,147 +0,0 @@
-Index: gnucash/branches/2.4/po/POTFILES.skip
-===================================================================
---- gnucash/branches/2.4/po/POTFILES.skip	(revision 18623)
-+++ gnucash/branches/2.4/po/POTFILES.skip	(revision 22300)
-@@ -19,2 +19,142 @@
- src/libqof/qof/qofquery-serialize.c
- src/libqof/qof/qofsql.c
-+
-+# The scheme files are handled by intl-scm/guile-strings.c because
-+# intltool wouldn't scan scheme files. They're here now because
-+# intltool 0.50 *does* scan them, and it creates an error during make
-+# check. Once the whole world has upgraded to intltool 0.50, intl-scm
-+# can be deleted and these files added to POTFILES.in.
-+
-+src/app-utils/date-utilities.scm
-+src/app-utils/prefs.scm
-+src/business/business-utils/business-prefs.scm
-+src/business/business-utils/business-utils.scm
-+src/business/business-utils/gnucash/business-utils.scm
-+src/import-export/qif-import/qif-dialog-utils.scm
-+src/import-export/qif-import/qif-file.scm
-+src/import-export/qif-import/qif-import/qif-dialog-utils.scm
-+src/import-export/qif-import/qif-import/qif-file.scm
-+src/import-export/qif-import/qif-import/qif-merge-groups.scm
-+src/import-export/qif-import/qif-import/qif-parse.scm
-+src/import-export/qif-import/qif-import/qif-to-gnc.scm
-+src/import-export/qif-import/qif-merge-groups.scm
-+src/import-export/qif-import/qif-parse.scm
-+src/import-export/qif-import/qif-to-gnc.scm
-+src/report/business-reports/aging.scm
-+src/report/business-reports/balsheet-eg.eguile.scm
-+src/report/business-reports/balsheet-eg.scm
-+src/report/business-reports/business-reports.scm
-+src/report/business-reports/customer-summary.scm
-+src/report/business-reports/easy-invoice.scm
-+src/report/business-reports/fancy-invoice.scm
-+src/report/business-reports/gnucash/report/aging.scm
-+src/report/business-reports/gnucash/report/balsheet-eg.eguile.scm
-+src/report/business-reports/gnucash/report/balsheet-eg.scm
-+src/report/business-reports/gnucash/report/business-reports.scm
-+src/report/business-reports/gnucash/report/customer-summary.scm
-+src/report/business-reports/gnucash/report/easy-invoice.scm
-+src/report/business-reports/gnucash/report/fancy-invoice.scm
-+src/report/business-reports/gnucash/report/invoice.scm
-+src/report/business-reports/gnucash/report/job-report.scm
-+src/report/business-reports/gnucash/report/owner-report.scm
-+src/report/business-reports/gnucash/report/payables.scm
-+src/report/business-reports/gnucash/report/receivables.scm
-+src/report/business-reports/gnucash/report/taxinvoice.eguile.scm
-+src/report/business-reports/gnucash/report/taxinvoice.scm
-+src/report/business-reports/invoice.scm
-+src/report/business-reports/job-report.scm
-+src/report/business-reports/owner-report.scm
-+src/report/business-reports/payables.scm
-+src/report/business-reports/receivables.scm
-+src/report/business-reports/taxinvoice.eguile.scm
-+src/report/business-reports/taxinvoice.scm
-+src/report/locale-specific/us/gnucash/report/taxtxf-de_DE.scm
-+src/report/locale-specific/us/gnucash/report/taxtxf.scm
-+src/report/locale-specific/us/taxtxf-de_DE.scm
-+src/report/locale-specific/us/taxtxf.scm
-+src/report/report-gnome/gnucash/report/report-gnome.scm
-+src/report/report-gnome/report-gnome.scm
-+src/report/report-system/eguile-gnc.scm
-+src/report/report-system/gnucash/report/eguile-gnc.scm
-+src/report/report-system/html-acct-table.scm
-+src/report/report-system/html-fonts.scm
-+src/report/report-system/html-style-sheet.scm
-+src/report/report-system/html-utilities.scm
-+src/report/report-system/options-utilities.scm
-+src/report/report-system/report-utilities.scm
-+src/report/report-system/report.scm
-+src/report/standard-reports/account-piecharts.scm
-+src/report/standard-reports/account-summary.scm
-+src/report/standard-reports/advanced-portfolio.scm
-+src/report/standard-reports/average-balance.scm
-+src/report/standard-reports/balance-sheet.scm
-+src/report/standard-reports/budget-balance-sheet.scm
-+src/report/standard-reports/budget-barchart.scm
-+src/report/standard-reports/budget-flow.scm
-+src/report/standard-reports/budget-income-statement.scm
-+src/report/standard-reports/budget.scm
-+src/report/standard-reports/cash-flow.scm
-+src/report/standard-reports/category-barchart.scm
-+src/report/standard-reports/daily-reports.scm
-+src/report/standard-reports/equity-statement.scm
-+src/report/standard-reports/general-journal.scm
-+src/report/standard-reports/general-ledger.scm
-+src/report/standard-reports/gnucash/report/standard-reports/account-piecharts.scm
-+src/report/standard-reports/gnucash/report/standard-reports/account-summary.scm
-+src/report/standard-reports/gnucash/report/standard-reports/advanced-portfolio.scm
-+src/report/standard-reports/gnucash/report/standard-reports/average-balance.scm
-+src/report/standard-reports/gnucash/report/standard-reports/balance-sheet.scm
-+src/report/standard-reports/gnucash/report/standard-reports/budget-balance-sheet.scm
-+src/report/standard-reports/gnucash/report/standard-reports/budget-barchart.scm
-+src/report/standard-reports/gnucash/report/standard-reports/budget-flow.scm
-+src/report/standard-reports/gnucash/report/standard-reports/budget-income-statement.scm
-+src/report/standard-reports/gnucash/report/standard-reports/budget.scm
-+src/report/standard-reports/gnucash/report/standard-reports/cash-flow.scm
-+src/report/standard-reports/gnucash/report/standard-reports/category-barchart.scm
-+src/report/standard-reports/gnucash/report/standard-reports/daily-reports.scm
-+src/report/standard-reports/gnucash/report/standard-reports/equity-statement.scm
-+src/report/standard-reports/gnucash/report/standard-reports/general-journal.scm
-+src/report/standard-reports/gnucash/report/standard-reports/general-ledger.scm
-+src/report/standard-reports/gnucash/report/standard-reports/income-statement.scm
-+src/report/standard-reports/gnucash/report/standard-reports/net-barchart.scm
-+src/report/standard-reports/gnucash/report/standard-reports/net-linechart.scm
-+src/report/standard-reports/gnucash/report/standard-reports/portfolio.scm
-+src/report/standard-reports/gnucash/report/standard-reports/price-scatter.scm
-+src/report/standard-reports/gnucash/report/standard-reports/register.scm
-+src/report/standard-reports/gnucash/report/standard-reports/sx-summary.scm
-+src/report/standard-reports/gnucash/report/standard-reports/transaction.scm
-+src/report/standard-reports/gnucash/report/standard-reports/trial-balance.scm
-+src/report/standard-reports/income-statement.scm
-+src/report/standard-reports/net-barchart.scm
-+src/report/standard-reports/net-linechart.scm
-+src/report/standard-reports/portfolio.scm
-+src/report/standard-reports/price-scatter.scm
-+src/report/standard-reports/register.scm
-+src/report/standard-reports/sx-summary.scm
-+src/report/standard-reports/transaction.scm
-+src/report/standard-reports/trial-balance.scm
-+src/report/stylesheets/gnucash/report/stylesheet-easy.scm
-+src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
-+src/report/stylesheets/gnucash/report/stylesheet-footer.scm
-+src/report/stylesheets/gnucash/report/stylesheet-plain.scm
-+src/report/stylesheets/stylesheet-easy.scm
-+src/report/stylesheets/stylesheet-fancy.scm
-+src/report/stylesheets/stylesheet-footer.scm
-+src/report/stylesheets/stylesheet-plain.scm
-+src/report/utility-reports/gnucash/report/hello-world.scm
-+src/report/utility-reports/gnucash/report/view-column.scm
-+src/report/utility-reports/gnucash/report/welcome-to-gnucash.scm
-+src/report/utility-reports/hello-world.scm
-+src/report/utility-reports/view-column.scm
-+src/report/utility-reports/welcome-to-gnucash.scm
-+src/scm/build-config.scm
-+src/scm/build-config.scm.in
-+src/scm/command-line.scm
-+src/scm/gnucash/price-quotes.scm
-+src/scm/main-window.scm
-+src/scm/price-quotes.scm
-+src/tax/us/de_DE.scm
-+src/tax/us/gnucash/tax/de_DE.scm
-+src/tax/us/txf-de_DE.scm
-+src/tax/us/txf.scm
-+
diff --git a/app-office/gnucash/gnucash-2.4.11-r1.ebuild b/app-office/gnucash/gnucash-2.4.11-r1.ebuild
deleted file mode 100644
index e1e76904dd73..000000000000
--- a/app-office/gnucash/gnucash-2.4.11-r1.ebuild
+++ /dev/null
@@ -1,151 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/gnucash/gnucash-2.4.11-r1.ebuild,v 1.4 2013/03/26 16:47:41 ago Exp $
-
-EAPI="4"
-GNOME2_LA_PUNT="yes"
-GCONF_DEBUG="no"
-PYTHON_DEPEND="python? 2:2.5"
-
-inherit gnome2 python eutils
-
-DOC_VER="2.2.0"
-
-DESCRIPTION="A personal finance manager"
-HOMEPAGE="http://www.gnucash.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ppc ~ppc64 x86"
-IUSE="chipcard debug +doc hbci mysql ofx postgres python quotes sqlite webkit"
-
-# FIXME: rdepend on dev-libs/qof when upstream fix their mess (see configure.ac)
-RDEPEND=">=dev-libs/glib-2.13:2
-	>=dev-libs/popt-1.5
-	>=dev-libs/libxml2-2.5.10:2
-	>=dev-scheme/guile-1.8.3:12[deprecated,regex]
-	dev-scheme/guile-www
-	>=dev-scheme/slib-3.1.4
-	>=gnome-base/gconf-2:2
-	>=gnome-base/libgnomeui-2.4
-	>=gnome-base/libglade-2.4:2.0
-	gnome-base/libgnome-keyring
-	media-libs/libart_lgpl
-	>=sys-libs/zlib-1.1.4
-	>=x11-libs/gtk+-2.14:2
-	x11-libs/goffice:0.8[gnome]
-	x11-libs/pango
-	ofx? ( >=dev-libs/libofx-0.9.1 )
-	hbci? ( >=net-libs/aqbanking-5[gtk,ofx?]
-		sys-libs/gwenhywfar[gtk]
-		chipcard? ( sys-libs/libchipcard )
-	)
-	quotes? ( dev-perl/DateManip
-		>=dev-perl/Finance-Quote-1.11
-		dev-perl/HTML-TableExtract )
-	webkit? ( net-libs/webkit-gtk:2 )
-	!webkit? ( >=gnome-extra/gtkhtml-3.16:3.14 )
-	sqlite? ( dev-db/libdbi dev-db/libdbi-drivers[sqlite] )
-	postgres? ( dev-db/libdbi dev-db/libdbi-drivers[postgres] )
-	mysql? ( dev-db/libdbi dev-db/libdbi-drivers[mysql] )
-"
-DEPEND="${RDEPEND}
-	>=app-text/scrollkeeper-0.3
-	virtual/pkgconfig
-	dev-util/intltool
-	gnome-base/gnome-common
-	sys-devel/libtool
-"
-
-PDEPEND="doc? ( >=app-doc/gnucash-docs-${DOC_VER} )"
-
-pkg_setup() {
-	if use python ; then
-		python_set_active_version 2
-		python_pkg_setup
-	fi
-}
-
-src_prepare() {
-	# https://bugzilla.gnome.org/show_bug.cgi?id=680402
-	epatch "${FILESDIR}/${P}-potfiles-skip.patch"
-
-	if use python; then
-		python_convert_shebangs -r 2 .
-		python_clean_py-compile_files
-	fi
-
-	# Disable python binding tests because of missing file
-	sed 's/^\(SUBDIRS =.*\)tests\(.*\)$/\1\2/' \
-		-i src/optional/python-bindings/Makefile.{am,in} \
-		|| die "python tests sed failed"
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	DOCS="doc/README.OFX doc/README.HBCI"
-
-	if use webkit ; then
-		G2CONF+=" --with-html-engine=webkit"
-	else
-		G2CONF+=" --with-html-engine=gtkhtml"
-	fi
-
-	if use sqlite || use mysql || use postgres ; then
-		G2CONF+=" --enable-dbi"
-	else
-		G2CONF+=" --disable-dbi"
-	fi
-
-	G2CONF+="
-		$(use_enable debug)
-		$(use_enable ofx)
-		$(use_enable hbci aqbanking)
-		$(use_enable python python-bindings)
-		--disable-doxygen
-		--enable-locale-specific-tax
-		--disable-error-on-warning"
-
-	# gtkmm is experimental and shouldn't be enabled, upstream bug #684166
-	G2CONF+=" --disable-gtkmm"
-
-	# guile wrongly exports LDFLAGS as LIBS which breaks modules
-	# Filter until a better ebuild is available, bug #202205
-	local GUILE_LIBS=""
-	local lib
-	for lib in $(guile-config link); do
-		if [ "${lib#-Wl}" = "$lib" ]; then
-			GUILE_LIBS="$GUILE_LIBS $lib"
-		fi
-	done
-
-	econf GUILE_LIBS="${GUILE_LIBS}" ${G2CONF}
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	GUILE_WARN_DEPRECATED=no \
-	GNC_DOT_DIR="${T}"/.gnucash \
-	emake check
-}
-
-src_install() {
-	# Parallel installation fails from time to time, bug #359123
-	MAKEOPTS="${MAKEOPTS} -j1" gnome2_src_install GNC_DOC_INSTALL_DIR=/usr/share/doc/${PF}
-
-	rm -rf "${ED}"/usr/share/doc/${PF}/{examples/,COPYING,INSTALL,*win32-bin.txt,projects.html}
-	mv "${ED}"/usr/share/doc/${PF} "${T}"/cantuseprepalldocs || die
-	dodoc "${T}"/cantuseprepalldocs/*
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	use python && python_mod_optimize gnucash
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-	use python && python_mod_cleanup gnucash
-}
diff --git a/app-office/gnucash/gnucash-2.4.13.ebuild b/app-office/gnucash/gnucash-2.4.13.ebuild
deleted file mode 100644
index 529f6c615354..000000000000
--- a/app-office/gnucash/gnucash-2.4.13.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/gnucash/gnucash-2.4.13.ebuild,v 1.3 2013/12/08 17:45:42 pacho Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-PYTHON_COMPAT=( python{2_6,2_7} )
-
-inherit gnome2 python-single-r1 eutils
-
-DESCRIPTION="A personal finance manager"
-HOMEPAGE="http://www.gnucash.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE="chipcard debug +doc hbci mysql ofx postgres python quotes sqlite webkit"
-
-# FIXME: rdepend on dev-libs/qof when upstream fix their mess (see configure.ac)
-# libdbi version requirement for sqlite taken from bug #455134
-RDEPEND="
-	>=dev-libs/glib-2.32.0:2
-	>=dev-libs/popt-1.5
-	>=dev-libs/libxml2-2.5.10:2
-	>=dev-scheme/guile-1.8.3:12[deprecated,regex]
-	dev-scheme/guile-www
-	>=dev-scheme/slib-3.1.4
-	>=gnome-base/gconf-2:2
-	>=gnome-base/libgnomeui-2.4
-	>=gnome-base/libglade-2.4:2.0
-	gnome-base/libgnome-keyring
-	media-libs/libart_lgpl
-	>=sys-libs/zlib-1.1.4
-	>=x11-libs/gtk+-2.14:2
-	x11-libs/goffice:0.8[gnome]
-	x11-libs/pango
-	ofx? ( >=dev-libs/libofx-0.9.1 )
-	hbci? ( >=net-libs/aqbanking-5[gtk,ofx?]
-		sys-libs/gwenhywfar[gtk]
-		chipcard? ( sys-libs/libchipcard )
-	)
-	python? ( ${PYTHON_DEPS} )
-	quotes? ( dev-perl/DateManip
-		>=dev-perl/Finance-Quote-1.11
-		dev-perl/HTML-TableExtract )
-	webkit? ( net-libs/webkit-gtk:2 )
-	!webkit? ( >=gnome-extra/gtkhtml-3.16:3.14 )
-	sqlite? ( >=dev-db/libdbi-0.9.0
-		>=dev-db/libdbi-drivers-0.9.0[sqlite] )
-	postgres? ( dev-db/libdbi dev-db/libdbi-drivers[postgres] )
-	mysql? ( dev-db/libdbi dev-db/libdbi-drivers[mysql] )
-"
-DEPEND="${RDEPEND}
-	>=app-text/scrollkeeper-0.3
-	virtual/pkgconfig
-	dev-util/intltool
-	gnome-base/gnome-common
-	sys-devel/libtool
-"
-
-PDEPEND="doc? ( >=app-doc/gnucash-docs-2.2.0 )"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	local myconf
-
-	DOCS="doc/README.OFX doc/README.HBCI"
-
-	if use webkit ; then
-		myconf+=" --with-html-engine=webkit"
-	else
-		myconf+=" --with-html-engine=gtkhtml"
-	fi
-
-	if use sqlite || use mysql || use postgres ; then
-		myconf+=" --enable-dbi"
-	else
-		myconf+=" --disable-dbi"
-	fi
-
-	myconf+="
-		$(use_enable debug)
-		$(use_enable ofx)
-		$(use_enable hbci aqbanking)
-		$(use_enable python python-bindings)
-		--disable-doxygen
-		--enable-locale-specific-tax
-		--disable-error-on-warning"
-
-	# gtkmm is experimental and shouldn't be enabled, upstream bug #684166
-	myconf+=" --disable-gtkmm"
-
-	# guile wrongly exports LDFLAGS as LIBS which breaks modules
-	# Filter until a better ebuild is available, bug #202205
-	local GUILE_LIBS=""
-	local lib
-	for lib in $(guile-config link); do
-		if [ "${lib#-Wl}" = "$lib" ]; then
-			GUILE_LIBS="$GUILE_LIBS $lib"
-		fi
-	done
-
-	econf GUILE_LIBS="${GUILE_LIBS}" ${myconf}
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	GUILE_WARN_DEPRECATED=no \
-	GNC_DOT_DIR="${T}"/.gnucash \
-	emake check
-}
-
-src_install() {
-	# Parallel installation fails from time to time, bug #359123
-	MAKEOPTS="${MAKEOPTS} -j1" gnome2_src_install GNC_DOC_INSTALL_DIR=/usr/share/doc/${PF}
-
-	rm -rf "${ED}"/usr/share/doc/${PF}/{examples/,COPYING,INSTALL,*win32-bin.txt,projects.html}
-	mv "${ED}"/usr/share/doc/${PF} "${T}"/cantuseprepalldocs || die
-	dodoc "${T}"/cantuseprepalldocs/*
-}
diff --git a/app-office/gnucash/metadata.xml b/app-office/gnucash/metadata.xml
index 858e55cdb22b..f4c575aabf47 100644
--- a/app-office/gnucash/metadata.xml
+++ b/app-office/gnucash/metadata.xml
@@ -8,7 +8,5 @@
 	<flag name='hbci'>Enable HBCI support, for connecting to some internet
 		banks</flag>
 	<flag name='quotes'>Enable Online Stock Quote retrieval</flag>
-	<flag name='webkit'>Use <pkg>net-libs/webkit-gtk</pkg> for rendering rather
-		than <pkg>gnome-extra/gtkhtml</pkg></flag>
 </use>
 </pkgmetadata>
diff --git a/app-office/gnumeric/Manifest b/app-office/gnumeric/Manifest
index b336238bbd17..12ad4037456b 100644
--- a/app-office/gnumeric/Manifest
+++ b/app-office/gnumeric/Manifest
@@ -1,4 +1,3 @@
-DIST gnumeric-1.12.0-annotation-syntax.patch.xz 13408 SHA256 8cc904ced03d1cdb894afa896c7fc8be22bd3cf16f0c8427c965eb813a406a48 SHA512 b1062a75750630e4e0cb479a994db2c98aae4668355a7756bd6ca9f64407571d73af0fd428453e373d4d0d9f77d842869cbe4f7d5ba0054103cd8add0e09d5b6 WHIRLPOOL aec5b51c9af1e6b3806c7f5f22930c41d42ed0dfbcb66407a18ded9cf565b78daae76d2b8a5952ce4f7379b11c9bad68a02982f7248a62d0c5a87e8ae60a71f4
-DIST gnumeric-1.12.0.tar.xz 15631708 SHA256 037b53d909e5d1454b2afda8c4fb1e7838e260343e36d4e36245f4a5d0e04111 SHA512 5bcf5e04d3c871d755a560207db2bce9d81bbe24f9c330a8a0555a386c38f505997c0a24a44afe0ab28539f03a921ce13f82ea8c6e828e17d998ce4951639223 WHIRLPOOL 2de92f2fecc9389e92a1e50f3c37361e0c06e792d0e75ca17beb1a5c6a9b344bc14d3eeef561ecdda5a3e6c60f4fe73f6fb2fd22e343b6edf842f7a81d64a825
 DIST gnumeric-1.12.12.tar.xz 18081428 SHA256 00cbc0816142dd3bde5ca39b2585965758f11cea5d53c23611dd44b24c4fd124 SHA512 65df37c882082e94a44a8df1319df8872c6768fffd32fa3152a6c14cba10b4112db36d284bbd4a3f6c59669265704fc117a1adeb1c0cf3e9a6846ad0fbdbc600 WHIRLPOOL 414b2f9b73dabb4eaa5570132829494c1d5e66119dcb7ad55f3cd0d1cd8ef7ef4c110011dd82ce5304c88a596ca7c220e430fd1eb867a4049eb1205fe7da047a
 DIST gnumeric-1.12.13.tar.xz 17996140 SHA256 f74a23ebfca5d4f283313580aca8e51dc500ce148224c35fa9eb977df7361067 SHA512 89f34ec0c781a43a2de7321f50fd26738bdaf4ef95ebd9c54ab11de147ad282cd09a9a06e00c303fff276fdf3847e9f6ceca3bc2cde851cf646e03cc4564049a WHIRLPOOL aaf9c12c9d11226f0c717588c5fe30673e69b4761b0bfb6477e1e6c2f5d00cf9f37cbef9938569ee491bf1aee78535c47ed1859ebcc43f072ef09b03fc8f186b
+DIST gnumeric-1.12.14.tar.xz 18004076 SHA256 964b98098e7ddc17890fec575f88a48acceaaf078dc1522836b0df755224ca27 SHA512 9b18a7f86bdfe3f31d12fbd4a6e60c92f83637f98554aa4d822ca899c44ba7807fb7f4ede9448010d5534f4472709b3df94bd1646823d0a8a7012d4da3bfef93 WHIRLPOOL 1fe72ef1f1df27e500ba4a01ef1e3888254cd8cfb9c069b3ec4cdc4b82071e128c1d16e5f735ab708f07d2a88363f4b60a36c6783d3e1a845d61d54f0334864e
diff --git a/app-office/gnumeric/gnumeric-1.12.0-r1.ebuild b/app-office/gnumeric/gnumeric-1.12.0-r1.ebuild
deleted file mode 100644
index 9d588d1cde12..000000000000
--- a/app-office/gnumeric/gnumeric-1.12.0-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/gnumeric-1.12.0-r1.ebuild,v 1.8 2013/04/01 18:23:27 ago Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python{2_6,2_7} )
-
-inherit eutils gnome2 flag-o-matic python-single-r1
-
-DESCRIPTION="The GNOME Spreadsheet"
-HOMEPAGE="http://projects.gnome.org/gnumeric/"
-LICENSE="GPL-2"
-SRC_URI="${SRC_URI}
-	http://dev.gentoo.org/~tetromino/distfiles/${PN}/${PN}-1.12.0-annotation-syntax.patch.xz"
-
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-
-IUSE="+introspection perl python"
-# Missing gnome-extra/libgnomedb required version in tree
-# but its upstream is dead and will be dropped soon.
-
-# lots of missing files, wait for next release
-# also fails tests due to 80-bit long story
-RESTRICT="test"
-
-RDEPEND="sys-libs/zlib
-	app-arch/bzip2
-	>=dev-libs/glib-2.28.0:2
-	>=gnome-extra/libgsf-1.14.24:=
-	>=x11-libs/goffice-0.10.0:0.10
-	>=dev-libs/libxml2-2.4.12:2
-	>=x11-libs/pango-1.24.0:=
-
-	>=x11-libs/gtk+-3.0.0:3
-	x11-libs/cairo:=[svg]
-
-	introspection? ( >=dev-libs/gobject-introspection-1.0.0:= )
-	perl? ( dev-lang/perl )
-	python? ( ${PYTHON_DEPS}
-		>=dev-python/pygobject-3.0.0:3[${PYTHON_USEDEP}] )
-"
-#	libgda? (
-#		>=gnome-extra/libgda-4.1.1:4.0
-#		>=gnome-extra/libgnomedb-3.99.6:4.0 )
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.35.0
-	virtual/pkgconfig
-	app-text/scrollkeeper"
-
-src_prepare() {
-	# Fix gtk-doc annotation syntax for gobject-introspection-1.34; bug #448992
-	# https://bugzilla.gnome.org/show_bug.cgi?id=684159
-	epatch "../${PN}-1.12.0-annotation-syntax.patch"
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--enable-ssindex \
-		--disable-static \
-		--without-gda \
-		--with-zlib \
-		$(use_enable introspection) \
-		$(use_with perl) \
-		$(use_with python)
-}
diff --git a/app-office/gnumeric/gnumeric-1.12.14.ebuild b/app-office/gnumeric/gnumeric-1.12.14.ebuild
new file mode 100644
index 000000000000..6ce23d15b572
--- /dev/null
+++ b/app-office/gnumeric/gnumeric-1.12.14.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/gnumeric-1.12.14.ebuild,v 1.1 2014/04/17 13:02:06 pacho Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit gnome2 flag-o-matic python-single-r1
+
+DESCRIPTION="The GNOME Spreadsheet"
+HOMEPAGE="http://www.gnumeric.org/"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+
+IUSE="+introspection libgda perl python"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# Missing gnome-extra/libgnomedb required version in tree
+# but its upstream is dead and will be dropped soon.
+
+# lots of missing files, also fails tests due to 80-bit long story
+# upstream bug #721556
+RESTRICT="test"
+
+RDEPEND="
+	app-arch/bzip2
+	sys-libs/zlib
+	>=dev-libs/glib-2.28:2
+	>=gnome-extra/libgsf-1.14.24:=
+	>=x11-libs/goffice-0.10.14:0.10
+	>=dev-libs/libxml2-2.4.12:2
+	>=x11-libs/pango-1.24.0:=
+
+	>=x11-libs/gtk+-3.2:3
+	x11-libs/cairo:=[svg]
+
+	introspection? ( >=dev-libs/gobject-introspection-1:= )
+	perl? ( dev-lang/perl )
+	python? ( ${PYTHON_DEPS}
+		>=dev-python/pygobject-3:3[${PYTHON_USEDEP}] )
+	libgda? ( gnome-extra/libgda:5[gtk] )
+"
+DEPEND="${RDEPEND}
+	app-text/scrollkeeper
+	>=dev-util/intltool-0.35.0
+	virtual/pkgconfig
+"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		--with-zlib \
+		$(use_with libgda gda) \
+		$(use_enable introspection) \
+		$(use_with perl) \
+		$(use_with python)
+}
diff --git a/app-text/llpp/Manifest b/app-text/llpp/Manifest
index 79f11048b6be..305f9d80c559 100644
--- a/app-text/llpp/Manifest
+++ b/app-text/llpp/Manifest
@@ -1,3 +1,4 @@
 DIST llpp-13_p20121123.tar.gz 110436 SHA256 367c01e14478b18c39a34bc515f495b980789e536744e7b698d1639e6935eb35 SHA512 2c8f47adb619416743eb2ee9f43df38989af4e255626810bc9ac34020e37d5e6637589a4e20324184184c1da21d2ed9c3f6083d02cc98a8364946091831edc60 WHIRLPOOL e8ccfbf7a6c782913ea8ba4851b42f30eba171f0c03a14946697e0763f4b95c0f56e629d0d1747f169b6bb138cedbe0bb2487012d9e1b76a902722aaf6866c59
 DIST llpp-15.tar.gz 109546 SHA256 cc415775a62144f8e4185f5d550952b6d2d573072b5b7d91bc8c09c564ce156c SHA512 96f4720f2ee0d9d2d5903ed452e7314e08d14a5806b13d439e01bfd4121fe714f5146e0cb6b33bced3c9c4b652ed8c9334070643e66276f07ea9e9b50d8b5b93 WHIRLPOOL 097871bcb121807eb1d5211254e8670c0cc08eb79787d9255217d10841a0e2436ee50194f038023efa052a4db4e5ac251dd88215ef44ae966689ff03cf79252a
 DIST llpp-17_p20140112.tar.gz 118951 SHA256 7d1ae89762054d9cb4fc06af11f766ab1c638ed230213dbcf36837b9379cc612 SHA512 38249f67a7151622833cba7e19de218f43110724ca9a304f4b80ac95661c71d01a1024fac30cf66c5013669545fb08bf320225d9463d2c31844446dc3c99de0c WHIRLPOOL c67b3e60bce82dc142624d3183144230d5a42921a203f19337f0a14942aec6fb395c57edf123b1d8127ce92c90df142b3caa11b4c14ec986aa2ad6d2fae6a383
+DIST llpp-18.tar.gz 119085 SHA256 fd87f99198c26071e898e65f9d7ee2b698a8a39768a44d740733ba935fb9fe4f SHA512 994d48fe690514078a708b9a52d94f96506693863ec0c277014fc2ab5b3aa831254a3b6e227524eb46d094bb06cfe3c51ec0f2dfe50cf83d6e97198e43e9cd1c WHIRLPOOL 51862737ca0144d09db19a46a456b808a9db9d2a78a637118dc4277170f43a287e1396d0634b9d90565de120bdf86a6b625c41e27b78f7fd534ca8504e380011
diff --git a/app-text/llpp/llpp-18.ebuild b/app-text/llpp/llpp-18.ebuild
new file mode 100644
index 000000000000..7d58e9c4660c
--- /dev/null
+++ b/app-text/llpp/llpp-18.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/llpp/llpp-18.ebuild,v 1.2 2014/04/17 14:40:41 xmw Exp $
+
+EAPI=5
+
+inherit eutils multilib toolchain-funcs vcs-snapshot
+
+DESCRIPTION="graphical PDF viewer which aims to superficially resemble less(1)"
+HOMEPAGE="http://repo.or.cz/w/llpp.git"
+#SRC_URI="http://repo.or.cz/w/llpp.git/snapshot/23585c732e608b486dffd2c210dc2cab43b1d4cb.tar.gz -> ${P}.tar.gz"
+SRC_URI="http://dev.gentoo.org/~xmw/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="+ocamlopt static"
+
+LIB_DEPEND=">app-text/mupdf-1.3_p20140118:0=[static-libs]
+	media-libs/openjpeg:2[static-libs]
+	media-libs/freetype:2[static-libs]
+	media-libs/jbig2dec[static-libs]
+	sys-libs/zlib[static-libs]
+	virtual/jpeg:0[static-libs]
+	x11-libs/libX11[static-libs]"
+RDEPEND="x11-misc/xsel
+	!static? ( ${LIB_DEPEND//\[static-libs]} )"
+DEPEND="${RDEPEND}
+	static? ( ${LIB_DEPEND}
+		app-arch/bzip2[static-libs]
+		media-libs/libXcm[static-libs]
+		x11-libs/libXau[static-libs]
+		x11-libs/libXdmcp[static-libs]
+		x11-libs/libXmu[static-libs] )
+	dev-lang/ocaml[ocamlopt?]
+	dev-ml/lablgl[glut,ocamlopt?]"
+
+RESTRICT="!ocamlopt? ( strip )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-11-WM_CLASS.patch
+}
+
+src_compile() {
+	local ocaml=$(usex ocamlopt ocamlopt.opt ocamlc.opt)
+	local cmo=$(usex ocamlopt cmx cmo)
+	local cma=$(usex ocamlopt cmxa cma)
+	local ccopt="$(freetype-config --cflags ) -O -include ft2build.h -D_GNU_SOURCE"
+	if use static ; then
+		local cclib=""
+		local slib=""
+		local spath=( ${EROOT}usr/$(get_libdir) $($(tc-getPKG_CONFIG) --libs-only-L --static mupdf x11 | sed 's:-L::g') )
+		for slib in $($(tc-getPKG_CONFIG) --libs-only-l --static mupdf x11) -ljpeg -ljbig2dec ; do
+			case ${slib} in
+				-lm|-ldl|-lpthread)
+					einfo "${slib}: shared"
+					cclib+="${slib} " ;;
+				*)
+					local ccnew=$(find ${spath} -name "lib${slib/-l}.a")
+					einfo "${slib}: use ${ccnew}"
+					cclib+="${ccnew} " ;;
+			esac
+		done
+	else
+		local cclib="$($(tc-getPKG_CONFIG) --libs mupdf x11) -lpthread"
+	fi
+
+	verbose() { echo "$@" >&2 ; "$@" || die ; }
+	verbose ocaml str.cma keystoml.ml < KEYS > help.ml
+	verbose printf 'let version ="%s";;\n' ${PV} >> help.ml
+	verbose ${ocaml} -c -o link.o -ccopt "${ccopt}" link.c
+	verbose ${ocaml} -c -o help.${cmo} help.ml
+	verbose ${ocaml} -c -o utils.${cmo} utils.ml
+	verbose ${ocaml} -c -o wsi.cmi wsi.mli
+	verbose ${ocaml} -c -o wsi.${cmo} wsi.ml
+	verbose ${ocaml} -c -o parser.${cmo} parser.ml
+	verbose ${ocaml} -c -o main.${cmo} -I +lablGL main.ml
+	verbose ${ocaml} $(usex ocamlopt "" -custom) -o llpp -I +lablGL\
+		str.${cma} unix.${cma} lablgl.${cma} link.o \
+	    -cclib "${cclib}" \
+		help.${cmo} utils.${cmo} parser.${cmo} wsi.${cmo} main.${cmo}
+}
+
+src_install() {
+	dobin ${PN}
+	dodoc KEYS README Thanks fixme
+}
diff --git a/dev-lang/spidermonkey/spidermonkey-17.0.0-r3.ebuild b/dev-lang/spidermonkey/spidermonkey-17.0.0-r3.ebuild
index 42624cd6f870..7caff36f1b21 100644
--- a/dev-lang/spidermonkey/spidermonkey-17.0.0-r3.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-17.0.0-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/spidermonkey-17.0.0-r3.ebuild,v 1.4 2014/04/17 07:48:10 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/spidermonkey-17.0.0-r3.ebuild,v 1.5 2014/04/17 13:23:52 anarchy Exp $
 
 EAPI="5"
 WANT_AUTOCONF="2.1"
@@ -45,6 +45,8 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-${SLOT}-js-config-shebang.patch
 	epatch "${FILESDIR}"/${PN}-${SLOT}-ia64-mmap.patch
 	epatch "${FILESDIR}"/${PN}-17.0.0-fix-file-permissions.patch
+	# Remove obsolete jsuword bug #506160
+	sed -i -e '/jsuword/d' "${BUILDDIR}"/jsval.h ||die "sed failed"
 	epatch_user
 
 	if [[ ${CHOST} == *-freebsd* ]]; then
diff --git a/dev-lang/swi-prolog/Manifest b/dev-lang/swi-prolog/Manifest
index bc9244524dd8..10bb3df881d5 100644
--- a/dev-lang/swi-prolog/Manifest
+++ b/dev-lang/swi-prolog/Manifest
@@ -3,16 +3,12 @@ DIST pl-6.5.3.tar.gz 14842161 SHA256 1a959724ff170a8f4d10a531d7d298187b6b9658c0c
 DIST pl-6.6.2.tar.gz 14823664 SHA256 e4996e363a19353f8b4eb1c19284fa73612b0137b32ba3cb066210567260b6cd SHA512 9e6a38103b5f9cca281926c3d5dc17b6c4bf2990d34edaab52939421ce02e6f36b3918257827181fde39acc77715b6bf3220f4625e2eda5d8acf0a04b5466e84 WHIRLPOOL c70b77baa12f652e198a83647c54b5d95a1003509d546d5f7f8b52e9891383d2d9ce49a116ab3b143de4a5a56c2ad2f22d6b03b27cd06328803c1a610611a621
 DIST pl-6.6.3.tar.gz 14826153 SHA256 e35b741ab26c98e502d5e3abba5fff35bb2dd70ac7735379df5dd47c9a31b905 SHA512 5d8d864fb04a3c5c1caef1241e97279bab6923c6a39d8ff536535417d64c3381663019a35d1a30f6288b888b7996a38557ec986c973b8c1d211bef71e0fa0e58 WHIRLPOOL f37d24532a4204a8183e05c4c01c27bdd9470dfc233fca211363989fdd5e03f428ab42d8ff5f2e6268b8e3ec6af76f314e27727271036f312802237a29aca82b
 DIST pl-6.6.4.tar.gz 14830255 SHA256 663977959979e389df0f87c2eb426ab71105c12206605ec40925893b91733cef SHA512 fea012ce97b62940618ce2e137fbeed39c7698544ece22da8c4d13f98d9cf809d990f912e406a939868471ef5517552a2ccf842be4b7e849aeaa6c1d38331b4a WHIRLPOOL 10e4243fa473c168a50268e7d2240976626cf20ae1440e94c496a6d93a1d1c5631ac7523695174baa8423396d4af57d84c6f0be59775cf7bff0aebf7be135d5d
-DIST pl-7.1.10.tar.gz 15675173 SHA256 deff590cef62d07fc39bb775402738d0bd6f897316d302951a9a8f1c0c20779e SHA512 effa3aafb693b3e379031d6f92e7abc047954ca37301bb8bb318ee0824bed3d0939ef9c49c63b7805d4a0d256318f5e3c495f204f9d7af9a75ea97ea53c4e9f0 WHIRLPOOL e892d823f0b33187e2a1a669b9b5368302298595abd7d0059e2449dc37a4ea6fe67f6492b71ab1e4b9f5c78163720377108ec3bcf340be581408814cb9c63090
 DIST pl-7.1.11.tar.gz 15694089 SHA256 87848bb775943f2418eeb56fa970dd4b0f1b79c16f3eb5090bfcdbcc89de66df SHA512 98d1ec542e90c90b1988ef2135a3ee7a44494183d2ac917a578dabad5e09eb813c09bf19c09be30f8ad3d16e81240f90714cc9c854cf41d9351cc6dc9d0aec97 WHIRLPOOL 7169dd6f026f0aecf20030ebb7b64506a30c23422b453b05a63dc846cd3d5978b566d74c4cb8178973c04e947f2a0bbb639fa097784dda542ada3bfcd640bc97
-DIST pl-7.1.8.tar.gz 15541077 SHA256 bab18008e0c76363cbb413578ef706d5755809caf1d9bebb9815c8193da08f65 SHA512 1a3de3c16d63c0872508bb5e837429d2acaebf9db876647d3f44d722bdf9269d87754abaf672613cfca37581fd560a8ca105fe3b2b840883423f4cc92bf0d790 WHIRLPOOL 0fc6a8f10d47b0d9b41b945d81a052a868c9db858945dec0581fed049af2d45704ceef51593b85df1dd24bc356e57d4ecb72f7b204c2fa0f9cb59b81bb8d78c7
-DIST pl-7.1.9.tar.gz 15658740 SHA256 92f3c3ed714478bd62e1feb6c1da2c7c8ced9ff23e33b63e159133cd97a4cdff SHA512 2f8e96783e3c720043230c0ccc8612f5ebfe511caae9966aa05e5aef6c65855f6b6cfccb0509f11768aa6576afb043ae3d725ba570c502be8924405e43afbcce WHIRLPOOL ace612402c6e5d23bf20768605738fb0ac1b23e084b6630ee1e7c40f71a55fc01aecb899497a5d0f422774426f09397a5e77145ef63b926463e09f650eab5d29
+DIST pl-7.1.12.tar.gz 15695341 SHA256 6945911c86c1b10e1ed07fab0ed928dd1b0ae368e30b454e2a8dfa4885950102 SHA512 08ce1941a68cf1b787136115eb1aadc4d44443bcd5ba207b6c23562412a270ea96c0c793e42421ec97bb41ba9ae106c9c2b9f0d95f0cfabe5ca9cafeb931acc9 WHIRLPOOL eeb5eb2f8724dc0b3e0ceb8b9393c438b7d01fa8e008de17ed4bc731543d0a63c990ca345dcbf7934c174d6769108a205686a6159298bd8300e9ef0791b303c9
 DIST swi-prolog-6.4.1-gentoo-patchset-0.tar.gz 1593 SHA256 c57b19f6d6f31855db9f6c5c14edb7a20b30ed4b9cfde805bf95182c7dda6565 SHA512 7be7f1bd3a10bb6a436b3f679210aa48de5774c728a4f12de69983458200095b5fe377aa30429566ec5e91c4ea172cc3d4bdfb6486731ed47d045dfa40afacfc WHIRLPOOL e3a135438947eedb71070d3df903c65aefd94c1c1b724f94df396ed0b1e354882c83e6a938816ba64df45b639b00a8cff9c591405f44a472eea4578ab95f232d
 DIST swi-prolog-6.5.3-gentoo-patchset-0.tar.gz 1602 SHA256 e8fdfa7789c037b8ef293d19cc900251dc71eca33db6add2e140f6791a6cd837 SHA512 bf59cc8488e2d46da971ea78a4ae9e383da04c6b79925d73ac5f69f3ed53beaa869d9f78a853f31768461020de1a959bb39c5b0f0a2569683cffb737f9f615de WHIRLPOOL 90bb6ccb21f7f1390b7c28493150840e8cc0fce1d3c31b5c3a56aade8b8bb828783cb5daf9677b78fb33962f478e1d24cffbee93704544dd7e087bb0d36f9784
 DIST swi-prolog-6.6.2-gentoo-patchset-1.tar.gz 1851 SHA256 23d7481204d2e1f064c7f4f44856a09b4e568ac906ee92f1f4b9ef92309a84e7 SHA512 1725a4a71084c6749f77f634e3b6191b993e06971ce294a52e1ecbce6f4144439d7bc25a3c6b8f66ac5f380b0ad4222a4c73f5e4e348d3122cd67423b8d78ca5 WHIRLPOOL 825d772721b21bb9ed893ab9f91c7b489a72e8ff5872877e09b37a4987d697b919e40ad87dc8baeb44f2eed868386b63b0ade1d066cca5c7f53bd65ca0ea9858
 DIST swi-prolog-6.6.3-gentoo-patchset-0.tar.gz 1608 SHA256 8f7e49dfe527a28aa0da1c756841f1bfdeb354b4a7332ddef9664e5dda4d6592 SHA512 5b000f25d3fc5b921fbf1e01d746fd28ba6aa4ac98419aab7ec43c34c30d2078ae2844d87ceefe493ffb6f09796615eb698f71b213bca13d5be8c32ba57bef02 WHIRLPOOL 0488fae4ffc42dec825e79d97260b2911ab7f45145a3216edcef6bd1aedaf969806955eed185fa6a4ff141896bb1b0ca1ca51b381a89d8f5bf1b2509f475458c
 DIST swi-prolog-6.6.4-gentoo-patchset-0.tar.gz 1596 SHA256 727a9ed67cdd8a23bc5d0bd5b2463353071370e58667a73c4ae403ef8a94671f SHA512 98d42047ec54155f7d34928bce3050edd65259b552ea82b763f15391f0283f5229a9a513e5f31c441294c5a7f2f2c4e6f133ff031eccfeaaf7c1037665240be9 WHIRLPOOL 3b4c0b6888e450176483bb5371c5f023864390852b9cf0d6f12b356a8460189e5e6cb85399b378c4b6bda314ce690e9a7ede1f79c74d78f033d7caff3a2fc408
-DIST swi-prolog-7.1.10-gentoo-patchset-0.tar.gz 1610 SHA256 6d90183fe3f33917f8736ecbe9a477dc8bfea475541f5b6935ba1474c66cdcde SHA512 60ac5fb583f212be86c81ddca851fa71991961364b55f61b48275f1fbf64d5944d3d9a17270f3340ba1e92c1d57c3d3d9dde287e8a040a5ff491ddd130d85c47 WHIRLPOOL 7306dbe09f75122b78bbbd9cd2f71e35f7b14aa0d415b68347b73f2e14b0165d5b89526fdd0d37454662331c37d8aec056268215d6b6a7e0533442ed559e4a99
 DIST swi-prolog-7.1.11-gentoo-patchset-0.tar.gz 1603 SHA256 0a39b5fb7b36d00a85bc50ea102380a729dc1a4378193ce614da10a6645b753c SHA512 2e8af66d9671762d4c7d5d7a873cde722e6d2eb6bb9c2c37de835e11daaa613c9aade9961d47d987c866d62417d335e2eeffb74a6510029eeedfa6eb590d4868 WHIRLPOOL 9eeccc290b695ab81a1de58e42768f6bb3b65078fd1b83ac0ece91f5696fd7bee20e8878a476b06bd80f860769ce229332ea87df84e62802c8f9b16c856f85d9
-DIST swi-prolog-7.1.8-gentoo-patchset-0.tar.gz 1595 SHA256 8b8678b3c068859d7171edd3b42f317d033a5bdd4e7fac2f05601aa248529955 SHA512 21e8b8deeab7d615963f7f827a2210bd5b9792b49beda12c6b1436e236a85687037177296b3809f35ce716e0e627289757a3ddb58e0f671252899f2f433ef0c7 WHIRLPOOL 41d705ee815fa984fcdecd6fac570a062377b667bf21085de0ca5ab842edaf68ffa6941e211a0b9c9237f8c434ae4026d958de62469342c4175a08d39c138f06
-DIST swi-prolog-7.1.9-gentoo-patchset-1.tar.gz 1858 SHA256 847b040489dfcbb863e7c105af7a01c9478b0dcc07f92e72734151835149a4a4 SHA512 fd0250d0a33e78a3b49ce523a8103264e0e2231e162d03bba96c2ddc8ec6ab63a1f8625651d72aece349064532b3ab87418b606dc5260faaf4e8446be30d5e22 WHIRLPOOL aaaa2e0f402b49bfeb06f8493c2b6b5ee14e33b3702c88cb00f373868127fb966eeac5a10dd8649b2a6ea7a7b21e3606e5513f1f3e931a55794bc5ec953aace8
+DIST swi-prolog-7.1.12-gentoo-patchset-0.tar.gz 1602 SHA256 1f5ebb767af5059431fae8f5326aa8374075945a9077f4ed83357ed6b917ba8e SHA512 855dd48783d6d6ecd035b22fb020ca2680ea77f32b53d57a2d9c138fc88e008b83047eb9ac792e69d59dc00f4d5be03c718a9d6889ea086cf02735e5db717aa5 WHIRLPOOL 7e28128ff657e7b351685e6faee6b6c48b0e86292ff6449ac24369a1b437ee56aedac8c060d394b61b11f9b560685df3ff5af302ca01070c87727d346e4144e0
diff --git a/dev-lang/swi-prolog/swi-prolog-7.1.10.ebuild b/dev-lang/swi-prolog/swi-prolog-7.1.10.ebuild
deleted file mode 100644
index 7420f40f645e..000000000000
--- a/dev-lang/swi-prolog/swi-prolog-7.1.10.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/swi-prolog-7.1.10.ebuild,v 1.1 2014/03/20 13:05:33 keri Exp $
-
-EAPI=4
-
-inherit eutils flag-o-matic java-pkg-opt-2 multilib
-
-PATCHSET_VER="0"
-
-DESCRIPTION="free, small, and standard compliant Prolog compiler"
-HOMEPAGE="http://www.swi-prolog.org/"
-SRC_URI="http://www.swi-prolog.org/download/devel/src/pl-${PV}.tar.gz
-	mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="archive debug doc +gmp hardened java minimal odbc +readline ssl static-libs test zlib X"
-
-RDEPEND="sys-libs/ncurses
-	archive? ( app-arch/libarchive )
-	zlib? ( sys-libs/zlib )
-	odbc? ( dev-db/unixODBC )
-	readline? ( sys-libs/readline )
-	gmp? ( dev-libs/gmp )
-	ssl? ( dev-libs/openssl )
-	java? ( >=virtual/jdk-1.4 )
-	X? (
-		virtual/jpeg
-		x11-libs/libX11
-		x11-libs/libXft
-		x11-libs/libXpm
-		x11-libs/libXt
-		x11-libs/libICE
-		x11-libs/libSM )"
-
-DEPEND="${RDEPEND}
-	X? ( x11-proto/xproto )
-	java? ( test? ( =dev-java/junit-3.8* ) )"
-
-S="${WORKDIR}/pl-${PV}"
-
-src_prepare() {
-	EPATCH_FORCE=yes
-	EPATCH_SUFFIX=patch
-	epatch "${WORKDIR}"/${PV}
-
-	# OSX/Intel ld doesn't like an archive without table of contents
-	sed -i -e 's/-cru/-scru/' packages/nlp/libstemmer_c/Makefile.pl || die
-}
-
-src_configure() {
-	append-flags -fno-strict-aliasing
-	use ppc && append-flags -mno-altivec
-	use hardened && append-flags -fno-unit-at-a-time
-	use debug && append-flags -DO_DEBUG
-
-	# ARCH is used in the configure script to figure out host and target
-	# specific stuff
-	export ARCH=${CHOST}
-
-	export CC_FOR_BUILD=$(tc-getBUILD_CC)
-
-	cd "${S}"/src || die
-	econf \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		$(use_enable gmp) \
-		$(use_enable readline) \
-		$(use_enable static-libs static) \
-		--enable-shared \
-		--enable-custom-flags COFLAGS="${CFLAGS}"
-
-	if ! use minimal ; then
-		local jpltestconf
-		if use java && use test ; then
-			jpltestconf="--with-junit=$(java-config --classpath junit)"
-		fi
-
-		cd "${S}/packages" || die
-		econf \
-			--libdir="${EPREFIX}"/usr/$(get_libdir) \
-			$(use_with archive) \
-			$(use_with java jpl) \
-			${jpltestconf} \
-			$(use_with odbc) \
-			$(use_with ssl) \
-			$(use_with X xpce) \
-			$(use_with zlib) \
-			COFLAGS='"${CFLAGS}"'
-	fi
-}
-
-src_compile() {
-	cd "${S}"/src || die
-	emake
-
-	if ! use minimal ; then
-		cd "${S}/packages" || die
-		emake
-	fi
-}
-
-src_test() {
-	cd "${S}/src" || die
-	emake check
-
-	if ! use minimal ; then
-		cd "${S}/packages" || die
-		emake check
-	fi
-}
-
-src_install() {
-	emake -C src DESTDIR="${D}" install
-
-	if ! use minimal ; then
-		emake -C packages DESTDIR="${D}" install
-		if use doc ; then
-			emake -C packages DESTDIR="${D}" html-install
-		fi
-	fi
-
-	dodoc ReleaseNotes/relnotes-5.10 INSTALL README VERSION
-}
diff --git a/dev-lang/swi-prolog/swi-prolog-7.1.8.ebuild b/dev-lang/swi-prolog/swi-prolog-7.1.12.ebuild
similarity index 98%
rename from dev-lang/swi-prolog/swi-prolog-7.1.8.ebuild
rename to dev-lang/swi-prolog/swi-prolog-7.1.12.ebuild
index cea1f68a5d43..3a3640c20148 100644
--- a/dev-lang/swi-prolog/swi-prolog-7.1.8.ebuild
+++ b/dev-lang/swi-prolog/swi-prolog-7.1.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/swi-prolog-7.1.8.ebuild,v 1.1 2014/02/18 08:51:36 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/swi-prolog-7.1.12.ebuild,v 1.1 2014/04/17 14:13:18 keri Exp $
 
 EAPI=4
 
diff --git a/dev-lang/swi-prolog/swi-prolog-7.1.9.ebuild b/dev-lang/swi-prolog/swi-prolog-7.1.9.ebuild
deleted file mode 100644
index 5e77a6544bfa..000000000000
--- a/dev-lang/swi-prolog/swi-prolog-7.1.9.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/swi-prolog-7.1.9.ebuild,v 1.2 2014/03/06 08:40:41 keri Exp $
-
-EAPI=4
-
-inherit eutils flag-o-matic java-pkg-opt-2 multilib
-
-PATCHSET_VER="1"
-
-DESCRIPTION="free, small, and standard compliant Prolog compiler"
-HOMEPAGE="http://www.swi-prolog.org/"
-SRC_URI="http://www.swi-prolog.org/download/devel/src/pl-${PV}.tar.gz
-	mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="archive debug doc +gmp hardened java minimal odbc +readline ssl static-libs test zlib X"
-
-RDEPEND="sys-libs/ncurses
-	archive? ( app-arch/libarchive )
-	zlib? ( sys-libs/zlib )
-	odbc? ( dev-db/unixODBC )
-	readline? ( sys-libs/readline )
-	gmp? ( dev-libs/gmp )
-	ssl? ( dev-libs/openssl )
-	java? ( >=virtual/jdk-1.4 )
-	X? (
-		virtual/jpeg
-		x11-libs/libX11
-		x11-libs/libXft
-		x11-libs/libXpm
-		x11-libs/libXt
-		x11-libs/libICE
-		x11-libs/libSM )"
-
-DEPEND="${RDEPEND}
-	X? ( x11-proto/xproto )
-	java? ( test? ( =dev-java/junit-3.8* ) )"
-
-S="${WORKDIR}/pl-${PV}"
-
-src_prepare() {
-	EPATCH_FORCE=yes
-	EPATCH_SUFFIX=patch
-	epatch "${WORKDIR}"/${PV}
-
-	# OSX/Intel ld doesn't like an archive without table of contents
-	sed -i -e 's/-cru/-scru/' packages/nlp/libstemmer_c/Makefile.pl || die
-}
-
-src_configure() {
-	append-flags -fno-strict-aliasing
-	use ppc && append-flags -mno-altivec
-	use hardened && append-flags -fno-unit-at-a-time
-	use debug && append-flags -DO_DEBUG
-
-	# ARCH is used in the configure script to figure out host and target
-	# specific stuff
-	export ARCH=${CHOST}
-
-	export CC_FOR_BUILD=$(tc-getBUILD_CC)
-
-	cd "${S}"/src || die
-	econf \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		$(use_enable gmp) \
-		$(use_enable readline) \
-		$(use_enable static-libs static) \
-		--enable-shared \
-		--enable-custom-flags COFLAGS="${CFLAGS}"
-
-	if ! use minimal ; then
-		local jpltestconf
-		if use java && use test ; then
-			jpltestconf="--with-junit=$(java-config --classpath junit)"
-		fi
-
-		cd "${S}/packages" || die
-		econf \
-			--libdir="${EPREFIX}"/usr/$(get_libdir) \
-			$(use_with archive) \
-			$(use_with java jpl) \
-			${jpltestconf} \
-			$(use_with odbc) \
-			$(use_with ssl) \
-			$(use_with X xpce) \
-			$(use_with zlib) \
-			COFLAGS='"${CFLAGS}"'
-	fi
-}
-
-src_compile() {
-	cd "${S}"/src || die
-	emake
-
-	if ! use minimal ; then
-		cd "${S}/packages" || die
-		emake
-	fi
-}
-
-src_test() {
-	cd "${S}/src" || die
-	emake check
-
-	if ! use minimal ; then
-		cd "${S}/packages" || die
-		emake check
-	fi
-}
-
-src_install() {
-	emake -C src DESTDIR="${D}" install
-
-	if ! use minimal ; then
-		emake -C packages DESTDIR="${D}" install
-		if use doc ; then
-			emake -C packages DESTDIR="${D}" html-install
-		fi
-	fi
-
-	dodoc ReleaseNotes/relnotes-5.10 INSTALL README VERSION
-}
diff --git a/dev-libs/efl/Manifest b/dev-libs/efl/Manifest
index 0e62c48ea40a..8ec8650e760f 100644
--- a/dev-libs/efl/Manifest
+++ b/dev-libs/efl/Manifest
@@ -1,4 +1,4 @@
 DIST efl-1.8.5.tar.bz2 28175735 SHA256 4456ce34bdc8294336c451a44e12f2f928ac9b857040da6d72c10432611646de SHA512 155542aa900980c59745dd2b25244d52b38de0de400b8432f9183c53c9770efdbca9d6e31f3305cf16d19357660ff8383447442d6a08c9ddec2e83a5b054e6df WHIRLPOOL d8efbc474a6d62837ab94c7ab6a060c1440fa16a2e798c2d722d6029ac17421afb8b07b3cf614c94fa9fed9f55fad8994377bc7a37b1e024fcf28423b45221a0
 DIST efl-1.8.6.tar.bz2 28101148 SHA256 0cc0a559ee7b249000771734e4c037695284d4980839436b57ac3afbaffb2089 SHA512 8bd02faa155500cdeab5dab878e7884c05829c5e6e7c645cd4802ffe597bb4abca8e783e771595be56a72ba2a10c8e361626b51f94292a05a8747985dbba064e WHIRLPOOL 35353c081872fb316e61f4a379a650be18bd61c213872715c4b363d3664afc92bdb2f90d454862b31e0523739071a716d1e4bbe7d25482ff82ba2681f611e098
-DIST efl-1.9.0.tar.bz2 28182561 SHA256 9641cad419a07efabb5657b166502d04f0e867341128ed30c73cd147aa29b553 SHA512 35c52cafa3f051865efb65ab145c6bfd8a6c2b03a08690b2a5c8b2e5a2d2613b43577cd49288d1b9d3638d3f15b896b3a0c500f758ab42bef9f494530312f85b WHIRLPOOL c09a649e1b0fdc92a6c8977c6a24c92fa2b5b9a5b33902bcd5a6fba5cc19bcb9bd66e632b8d5a240ee5ec095cc6ee3a59bce3913b669f3d755e3db1de8d79681
 DIST efl-1.9.2.tar.bz2 28193583 SHA256 5dbeb99e1d26ccc74c9d054de5607a7e1020052b313c4b60c9a9794b45307501 SHA512 d93ae726bf814e8e21e6584ad1d38c1733f7f1782aa6ca7d0ccedfbdbe6455bc62f965d5dcb85e55a1041ccb6b997395bb4ba433345cfa089280d3a293d59751 WHIRLPOOL b2eaefdf8a9e2f548255e222ef087ae9857308ac0dc3d1e712b1fa0db59a7736f16b1aee3985a1b4a911374fd3103d0e5be9ccc718fb8a37cb9cb690e058cd38
+DIST efl-1.9.3.tar.bz2 28181470 SHA256 1a911ababb7786969a361628f972db1158c25dc0b62ca55e12a00d6c290b6e15 SHA512 7920010ef736ab041ea71584e6767420cff8b4bd5f1cfecfff90768ce37f7b137aa7ebe1b6b3fa0d4a3b5cdda0ac44d510320a3f654e0777072cd9bb862d36da WHIRLPOOL 47119accab0ca8eb0fcec5efa65afacc63096dec5b0c0ae50488e496c48f4a5006b2e06d237ea526a924cd583147ee292e4f87d9c2b86bf46d1e8ad09181eb09
diff --git a/dev-libs/efl/efl-1.9.0.ebuild b/dev-libs/efl/efl-1.9.3.ebuild
similarity index 90%
rename from dev-libs/efl/efl-1.9.0.ebuild
rename to dev-libs/efl/efl-1.9.3.ebuild
index 848a08c5ef84..fa6f5241b53a 100644
--- a/dev-libs/efl/efl-1.9.0.ebuild
+++ b/dev-libs/efl/efl-1.9.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/efl/efl-1.9.0.ebuild,v 1.3 2014/03/06 01:04:33 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/efl/efl-1.9.3.ebuild,v 1.1 2014/04/17 14:55:34 tommy Exp $
 
 EAPI="5"
 
@@ -25,18 +25,17 @@ DESCRIPTION="Enlightenment Foundation Libraries all-in-one package"
 LICENSE="BSD-2 GPL-2 LGPL-2.1 ZLIB"
 KEYWORDS="~amd64 ~arm ~x86"
 
-IUSE="audio +bmp debug drm +eet egl fbcon +fontconfig fribidi gif gles glib gnutls gstreamer harfbuzz +ico ibus jp2k +jpeg oldlua opengl ssl physics pixman +png +ppm +psd pulseaudio scim sdl systemd tga tiff tslib v4l2 wayland webp X xcb xim xine xpm"
+IUSE="audio +bmp debug drm +eet egl fbcon +fontconfig fribidi gif gles glib gnutls gstreamer harfbuzz +ico ibus jp2k +jpeg oldlua opengl ssl physics pixman +png +ppm +psd pulseaudio scim sdl systemd tga tiff tslib v4l2 wayland webp X xim xine xpm"
 
 REQUIRED_USE="
-	X?		( !xcb )
 	pulseaudio?	( audio )
-	opengl?		( || ( X xcb sdl wayland ) )
-	gles?		( || ( X xcb sdl wayland ) )
+	opengl?		( || ( X sdl wayland ) )
+	gles?		( || ( X wayland ) )
+	gles?		( !sdl )
 	gles?		( egl )
-	xcb?		( pixman )
-	sdl?		( || ( opengl gles ) )
+	sdl?		( opengl )
 	wayland?	( egl !opengl gles )
-	xim?		( || ( X xcb ) )
+	xim?		( X )
 "
 
 RDEPEND="
@@ -103,23 +102,6 @@ RDEPEND="
 			virtual/opengl
 		)
 	)
-	xcb? (
-		x11-libs/libxcb
-
-		opengl? (
-			x11-libs/libX11
-			x11-libs/libXrender
-			virtual/opengl
-			x11-libs/xcb-util-renderutil
-		)
-
-		gles? (
-			x11-libs/libX11
-			x11-libs/libXrender
-			virtual/opengl
-			x11-libs/xcb-util-renderutil
-		)
-	)
 	xine? ( >=media-libs/xine-lib-1.1.1 )
 	xpm? ( x11-libs/libXpm )
 
@@ -194,10 +176,9 @@ src_configure() {
 	local enable_graphics=""
 
 	use X && x11="xlib"
-	use xcb && x11="xcb"
 
 	local MY_ECONF
-	( use X || use xcb ) && MY_ECONF+=" --with-x"
+	 use X && MY_ECONF+=" --with-x"
 
 	local opengl="none"
 
diff --git a/games-emulation/kigb/Manifest b/games-emulation/kigb/Manifest
index 551c409e0b24..7c69ac762927 100644
--- a/games-emulation/kigb/Manifest
+++ b/games-emulation/kigb/Manifest
@@ -1 +1 @@
-DIST kigb-2.02.tar.gz 477324 RMD160 f77e572f8b5250b63c0a8a7bc4cc7d26f42318ac SHA1 466a7758ead0b36592a83c038c8a2aa97e16ca2e SHA256 71adb8018ba80b80b7aa454161d47ec447e74c4797ba752b130d46e79ffcf3b3
+DIST kigb_lin.tar.gz 477324 SHA256 71adb8018ba80b80b7aa454161d47ec447e74c4797ba752b130d46e79ffcf3b3 SHA512 ca8b10cc05884c92157dde2b034c7e95f28ed7eed771d0383265f942f0cacea791284516b551e96ba07a035068a7039c8faa19ec417ee117b6a350692bbff01d WHIRLPOOL 1772c689e28bd7a6095737b7327867624fe381a452fbf8ec984e8becdb06da37aa914cecf45c2ee3059db8a9563f445c33f8b3f30854304fed6e20c3c42a9f01
diff --git a/games-emulation/kigb/kigb-2.02.ebuild b/games-emulation/kigb/kigb-2.02.ebuild
index 32fbc863c565..8c0ac114c32d 100644
--- a/games-emulation/kigb/kigb-2.02.ebuild
+++ b/games-emulation/kigb/kigb-2.02.ebuild
@@ -1,20 +1,18 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/kigb/kigb-2.02.ebuild,v 1.5 2009/08/22 19:11:36 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/kigb/kigb-2.02.ebuild,v 1.6 2014/04/17 16:06:33 ulm Exp $
 
 inherit games
 
 DESCRIPTION="A Gameboy (GB, SGB, GBA) Emulator for Linux"
-HOMEPAGE="http://kigb.emuunlim.com"
-# No version upstream
-#SRC_URI="http://kigb.emuunlim.com/${PN}_lin.tar.gz"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
+HOMEPAGE="http://kigb.emuunlim.com/"
+SRC_URI="http://kigb.emuunlim.com/${PN}_lin.tar.gz"
 
-LICENSE="as-is"
+LICENSE="all-rights-reserved"
 SLOT="0"
 KEYWORDS="-* x86"
-RESTRICT="strip"
 IUSE=""
+RESTRICT="mirror bindist strip"
 
 RDEPEND="x11-libs/libXext
 	sys-libs/zlib
diff --git a/games-puzzle/triptych-demo/Manifest b/games-puzzle/triptych-demo/Manifest
index 8abfae021ee6..00ce2a83a240 100644
--- a/games-puzzle/triptych-demo/Manifest
+++ b/games-puzzle/triptych-demo/Manifest
@@ -1 +1 @@
-DIST triptych.tar.gz 1748316 RMD160 4e0c6f63a4ce44088a18e0491fa4841f547072a3 SHA1 2590456a04d7173660bc30147e89585043105074 SHA256 2d583edc1b974fc346087ab73adb24d476cee040fb59912e28fbf7a8467db5a8
+DIST triptych.tar.gz 1748316 SHA256 2d583edc1b974fc346087ab73adb24d476cee040fb59912e28fbf7a8467db5a8 SHA512 614de78c9f90dd2145ff3dfa6f7a799a069c5add80bc8b0494a752346a163ab0eff7b707292b815adbffa34e4fec446035cfb65df4dd6cf284f270bb732b6daa WHIRLPOOL 53fb746b02c91a4434042a21b5b36f27b17528ac51ea9a3dcf4339cdf75c3ff93db2ffe71fb0c3123e3fbe9720264a18e183558cfda14c0320440e010c21b78d
diff --git a/games-puzzle/triptych-demo/triptych-demo-0.ebuild b/games-puzzle/triptych-demo/triptych-demo-0.ebuild
index 472c28f76c53..c0d252aa0163 100644
--- a/games-puzzle/triptych-demo/triptych-demo-0.ebuild
+++ b/games-puzzle/triptych-demo/triptych-demo-0.ebuild
@@ -1,22 +1,23 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/triptych-demo/triptych-demo-0.ebuild,v 1.9 2008/03/13 18:18:59 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/triptych-demo/triptych-demo-0.ebuild,v 1.10 2014/04/17 16:21:16 ulm Exp $
 
 inherit eutils games
 
 DESCRIPTION="fast-paced tetris-like puzzler"
 HOMEPAGE="http://www.chroniclogic.com/triptych.htm"
-SRC_URI="http://www.chroniclogic.com/demo/triptych.tar.gz"
+SRC_URI="http://s159260531.onlinehome.us/demos/triptych.tar.gz"
 
-LICENSE="as-is"
+LICENSE="all-rights-reserved"
 SLOT="0"
 KEYWORDS="-* x86"
-RESTRICT="strip"
 IUSE=""
+RESTRICT="mirror bindist strip"
 
 DEPEND="x11-libs/libXext
 	media-libs/libsdl
 	virtual/opengl"
+RDEPEND=""
 
 S=${WORKDIR}/triptych
 
diff --git a/games-rpg/nwn-penultima/Manifest b/games-rpg/nwn-penultima/Manifest
index 38ef83566dfe..aba92a6f13f6 100644
--- a/games-rpg/nwn-penultima/Manifest
+++ b/games-rpg/nwn-penultima/Manifest
@@ -1,6 +1,6 @@
-DIST Penultima_0_Penultima_City.zip 328125 RMD160 4454a7ba8a27ca69454cf0dfbf77eba9b412e731 SHA1 342b5ab7784de931e9efe23d8103e98281679499 SHA256 6040fc52ccd9ab21f2e3fc8aa596357c325c264932d7a4776ed2edb1424f23aa
-DIST Penultima_1_Pest_Control.zip 175522 RMD160 b04cc6fe1d68d51df59ac859b32bb483a62b18c9 SHA1 fbacbcee795583e790e6300e416bf10fd5ea3b7e SHA256 46cd4c3c3ffc4797fc17f5a22ac15ce848d2f339ae41e6b19eee2cd0fcb9974f
-DIST Penultima_2_Deweys_Decimal.zip 372994 RMD160 65b7d2de9e012b4a4b658cc0fb9c5cf4d680f7d0 SHA1 34ccb4972fe5641762c9677457dbc224a45bf736 SHA256 2331bf16cd927048ee159aac869601aa5cd4e9465d3dc8562e6fff0b72f93537
-DIST Penultima_3_Hazard_Pay.zip 385090 RMD160 1e4fa7fbef68dbb77a6b051a5c775735254159f2 SHA1 fee5f1bcbe148597c2e87680449fc28f279e978d SHA256 3907374ad0bbf57acd8239bcfa4b3676c23ba8b63c0b743076d697ccc83c7e0a
-DIST Penultima_4_Clucking_Hositle.zip 309353 RMD160 ffe0b3c8e961f4dbda346e19913a2acb6fea6ec2 SHA1 b913e0665561b741db565b6b2b75e701e32557d2 SHA256 c58b61a7bfff5961a583aeca13f5823d68f96f3828dafae6bc391a60191a7edb
-DIST Penultima_5_Home_Sweet_Home.zip 418774 RMD160 70c772f3e5f26301244200ddd95b2c92bb33197f SHA1 041dc1a83cc984de4b5ff7a01fd9d09d1171468e SHA256 220c2275446bb796931b9c4828e34ff419b5667c99656fd5f12cf16b06322e87
+DIST Penultima_0_Penultima_City.zip 328125 SHA256 6040fc52ccd9ab21f2e3fc8aa596357c325c264932d7a4776ed2edb1424f23aa SHA512 2b2f9e7e72642baa6784bd010cee5aed947ee69670a18fe574a2bb458c890b3145f10417b6df9393b9cb715cac8e34673c75359b9a3e97b1c7b596f2ff8796da WHIRLPOOL a4ccfcb93db827dac6062e4a3aa02829920e2b0a600598e2997ed34a33fb77f7d5b71581bd564292957bde9e4505657e90777b38995b8dc3ceb269ed23fd409f
+DIST Penultima_1_Pest_Control.zip 175522 SHA256 46cd4c3c3ffc4797fc17f5a22ac15ce848d2f339ae41e6b19eee2cd0fcb9974f SHA512 fe6937846ec190a6decb68040d485565e184e6725399491385a03f538db89ae1f653669dbeb7594dbf82d938375f41d56e4540d564a5d87781843c1971f121e9 WHIRLPOOL 54b71dac89e16de23f164dfa4c6463941155ecc46c6cd364665f43af19b9f0a59469611b8d5de11a224d6770c6f2d7b5c3215644d52f026faa845ae054f30d89
+DIST Penultima_2_Deweys_Decimal.zip 372994 SHA256 2331bf16cd927048ee159aac869601aa5cd4e9465d3dc8562e6fff0b72f93537 SHA512 7bdd96bc7013a903ae1e098156436b6fe342fc14ffc620c94055cfc40640fa4494ba2e759fa91ec2dc96c5ea4c86aa4d01298c5f153039ea56485d86f4859659 WHIRLPOOL 42fe175dd832eebf4ad60cec76cd99323dd9da172602b092ca1fbb9782cc3a98374a0b8b816e25222727ea2fcb0918504532ceb1f7694c3ac20966b714c0c337
+DIST Penultima_3_Hazard_Pay.zip 385090 SHA256 3907374ad0bbf57acd8239bcfa4b3676c23ba8b63c0b743076d697ccc83c7e0a SHA512 9650683713b7fa07a9397ba3f0c2279852266d0d93692968ace90385dc079df8d302951dc60ad140712bfb742886d7eb773d9034ace884d48fc837ff86e15602 WHIRLPOOL 9d3a8714d2289535c82b027b49301844e7491a619f8f89c1b6f0f253c2d1708ec011ee5c6a69a76c4a72883f41d1811e25291fc90e505af08ebb26b190057ac1
+DIST Penultima_4_Clucking_Hositle.zip 309353 SHA256 c58b61a7bfff5961a583aeca13f5823d68f96f3828dafae6bc391a60191a7edb SHA512 57919023bf6ab4041976f2517b56a2eb94ab1b09d3de5cff133d3b3943e09501be8170a94c8e61d74dacbf25971153ef2478cacde23a6f1a1285b35e0461adef WHIRLPOOL 46faff5dea5eb11fb9b27f5f372310137f96718dd2b9950bc6ad8b18a8d7e967ad1389de67cc8138e541f4d17ea85b509e8e3a577d5519bed7f2d50abfe8299b
+DIST Penultima_5_Home_Sweet_Home.zip 418774 SHA256 220c2275446bb796931b9c4828e34ff419b5667c99656fd5f12cf16b06322e87 SHA512 6aa0dcef9ae572daba480a723d9de6eca4f282b6ab15dd5198177dbe105db0f361f54854ac2bf89e73167f15c5c8d3c4890e5bb22b878178c28bd4372cb790ff WHIRLPOOL 0498ec1e8eb47d888df22a99ec8c93e861edad0eef2bc6eafe45e0c09bd66c90ea9e33d7062fd4f7780542c4784a8898e857bd3ce81e51433e82f40d19bb7367
diff --git a/games-rpg/nwn-penultima/nwn-penultima-1-r1.ebuild b/games-rpg/nwn-penultima/nwn-penultima-1-r1.ebuild
index eee9acb70395..32e7bfccdc45 100644
--- a/games-rpg/nwn-penultima/nwn-penultima-1-r1.ebuild
+++ b/games-rpg/nwn-penultima/nwn-penultima-1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/nwn-penultima/nwn-penultima-1-r1.ebuild,v 1.2 2012/02/05 13:33:30 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/nwn-penultima/nwn-penultima-1-r1.ebuild,v 1.3 2014/04/17 16:31:35 ulm Exp $
 
 inherit games
 
@@ -13,7 +13,8 @@ SRC_URI="http://c.vnfiles.ign.com/nwvault.ign.com/fms/files/modules/1661/Penulti
 	http://c.vnfiles.ign.com/nwvault.ign.com/fms/files/modules/1671/Penultima_4_Clucking_Hositle.zip
 	http://c.vnfiles.ign.com/nwvault.ign.com/fms/files/modules/1673/Penultima_5_Home_Sweet_Home.zip"
 
-LICENSE="as-is"
+# redistributable per http://stefangagne.com/penultima/modules.html
+LICENSE="freedist"
 SLOT="0"
 KEYWORDS="-* ~amd64 x86"
 IUSE=""
diff --git a/games-rpg/nwn-penultima/nwn-penultima-1.ebuild b/games-rpg/nwn-penultima/nwn-penultima-1.ebuild
index 84b67a7700d7..42ad77c51697 100644
--- a/games-rpg/nwn-penultima/nwn-penultima-1.ebuild
+++ b/games-rpg/nwn-penultima/nwn-penultima-1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/nwn-penultima/nwn-penultima-1.ebuild,v 1.2 2010/06/28 22:30:21 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/nwn-penultima/nwn-penultima-1.ebuild,v 1.3 2014/04/17 16:31:35 ulm Exp $
 
 inherit games
 
@@ -13,7 +13,8 @@ SRC_URI="http://c.vnfiles.ign.com/nwvault.ign.com/fms/files/modules/1661/Penulti
 	http://c.vnfiles.ign.com/nwvault.ign.com/fms/files/modules/1671/Penultima_4_Clucking_Hositle.zip
 	http://c.vnfiles.ign.com/nwvault.ign.com/fms/files/modules/1673/Penultima_5_Home_Sweet_Home.zip"
 
-LICENSE="as-is"
+# redistributable per http://stefangagne.com/penultima/modules.html
+LICENSE="freedist"
 SLOT="0"
 KEYWORDS="-* amd64 x86"
 IUSE=""
diff --git a/mate-base/mate-applets/Manifest b/mate-base/mate-applets/Manifest
index 97cd991d981e..9f50de321117 100644
--- a/mate-base/mate-applets/Manifest
+++ b/mate-base/mate-applets/Manifest
@@ -1 +1,2 @@
 DIST mate-applets-1.6.2.tar.xz 7102728 SHA256 a5607bf5f5bbd7bc75fcdc5d6eb9d2a4e45d0eb5c3b0e73ee6bb9d711c970cb1 SHA512 fb60e4c0e96d103f75720e17c7e6e847a603ecc7b639330fa845abc3b742147503d686ffb7a4d825c0f0fe78c9fe95514d911ee166d6bcd3d37445653b7fe353 WHIRLPOOL 3990f722538edb394a0aed4f9089f25b8d569fd90e1304b1828f9cb0fc3b9c726405d55a562eb3ae4eb1159f942ede2196b40c9d86acc9a92def0e42267dd01d
+DIST mate-applets-1.8.0.tar.xz 6911348 SHA256 e1798784cf2828803e8bae4660a7bcd4c5a44b510217a50c650cfcaacadf71c1 SHA512 d5d211377df4e7bb0135babee7f49fb1fdc894d3fee3a4a485efe0b47d392d0534a1aa978743730e927420f9607efb761b4d3e6814a76aa393aa892788055e35 WHIRLPOOL 69bc6167b2907463660e75fa9a69a97ee9f4d106c8ace983492c78631f603198f93396ed5d58abd87ffd123188503ddee222527aac28a998aa738b4aa76ad288
diff --git a/mate-base/mate-applets/mate-applets-1.8.0.ebuild b/mate-base/mate-applets/mate-applets-1.8.0.ebuild
new file mode 100644
index 000000000000..a126af2dd1ef
--- /dev/null
+++ b/mate-base/mate-applets/mate-applets-1.8.0.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mate-base/mate-applets/mate-applets-1.8.0.ebuild,v 1.1 2014/04/17 15:45:48 tomwij Exp $
+
+EAPI="5"
+
+GCONF_DEBUG="no"
+PYTHON_COMPAT=( python2_{6,7} )
+
+inherit gnome2 python-single-r1 versionator
+
+MATE_BRANCH="$(get_version_component_range 1-2)"
+
+SRC_URI="http://pub.mate-desktop.org/releases/${MATE_BRANCH}/${P}.tar.xz"
+DESCRIPTION="Applets for the MATE Desktop and Panel"
+HOMEPAGE="http://mate-desktop.org"
+
+LICENSE="GPL-2 FDL-1.1 LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE="X ipv6 networkmanager policykit"
+
+RDEPEND="${PYTHON_DEPS}
+	app-text/rarian:0
+	dev-libs/atk:0
+	>=dev-libs/dbus-glib-0.74:0
+	>=dev-libs/glib-2.22:2
+	>=dev-libs/libmateweather-1.6.1:0
+	>=dev-libs/libxml2-2.5:2
+	dev-python/pygobject:3
+	>=gnome-base/libgtop-2.11.92:2
+	>=mate-base/mate-desktop-1.6:0
+	>=mate-base/mate-panel-1.8:0
+	>=mate-base/mate-settings-daemon-1.6:0
+	>=sys-apps/dbus-1.1.2:0
+	sys-power/cpufrequtils:0
+	>=sys-power/upower-0.9.4:0
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-2.24:2
+	>=x11-libs/libnotify-0.7:0
+	x11-libs/libX11:0
+	>=x11-libs/libxklavier-4:0
+	>=x11-libs/libwnck-2.30:1
+	x11-libs/pango:0
+	>=x11-themes/mate-icon-theme-1.6:0
+	virtual/libintl:0
+	networkmanager? ( >=net-misc/networkmanager-0.7:0 )
+	policykit? ( >=sys-auth/polkit-0.92:0 )"
+
+DEPEND="${RDEPEND}
+	app-text/docbook-xml-dtd:4.3
+	>=app-text/scrollkeeper-dtd-1:1.0
+	app-text/yelp-tools:0
+	>=dev-util/intltool-0.35:*
+	dev-libs/libxslt:0
+	>=mate-base/mate-common-1.6:0
+	sys-devel/gettext:*
+	virtual/pkgconfig:*"
+
+src_configure() {
+	gnome2_src_configure \
+		--libexecdir=/usr/libexec/mate-applets \
+		--without-hal \
+		$(use_enable ipv6) \
+		$(use_enable networkmanager) \
+		$(use_enable policykit polkit) \
+		$(use_with X x)
+}
+
+src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS
+	emake check
+}
+
+DOCS="AUTHORS ChangeLog NEWS README"
+
+src_install() {
+	python_fix_shebang invest-applet timer-applet/src
+	gnome2_src_install
+
+	local APPLETS="accessx-status battstat charpick command cpufreq drivemount
+			geyes invest-applet mateweather mini-commander mixer multiload
+			null_applet stickynotes timerapplet trashapplet"
+
+	for applet in ${APPLETS}; do
+		docinto ${applet}
+
+		for d in AUTHORS ChangeLog NEWS README README.themes TODO; do
+			[ -s ${applet}/${d} ] && dodoc ${applet}/${d}
+		done
+	done
+}
diff --git a/mate-base/mate-session-manager/Manifest b/mate-base/mate-session-manager/Manifest
index e61979dc5c2f..19a35bf82870 100644
--- a/mate-base/mate-session-manager/Manifest
+++ b/mate-base/mate-session-manager/Manifest
@@ -1 +1,2 @@
 DIST mate-session-manager-1.6.1.tar.xz 641524 SHA256 4ee7b4ae18df5becd986b05634428edf0ad8de150a14dc29848b6d34ab312ce9 SHA512 dfbfc782cd09b401565ed6021687cfb11f66cd0a05609c3f344b9b1059215f1717054b021166ca5956162794398905f36e51d13b6720e8005a923843af10129d WHIRLPOOL da47bc33b96a646e29f2bc3d957473c892b660c268a966487bb5f31beeacb1720ec8277e87d24afce99c8a8529fb0539d809705e26c9684d31c6ac7d6b599dbd
+DIST mate-session-manager-1.8.1.tar.xz 524204 SHA256 2f85a714704bc475d08809be6ecf24a5d94d2e2d0ea5ac704d67557c349d7b8c SHA512 1b09a471db710193a643ec90c9b153468d9a303957b9c4da4e30cf470aa5f582b6992f5e0ed69129943aa44f7c4e372e2a8554fc6020627817a3c49d656ca5b5 WHIRLPOOL 8c771ac713da92c2ae8bccc173a9cba4fc5bb16a943e588c679624e3e945555f2c37511426e666f38440947ec37139452ee230d07bc3a414a65629c04bfd31a6
diff --git a/mate-base/mate-session-manager/mate-session-manager-1.8.1.ebuild b/mate-base/mate-session-manager/mate-session-manager-1.8.1.ebuild
new file mode 100644
index 000000000000..fa4255820eb8
--- /dev/null
+++ b/mate-base/mate-session-manager/mate-session-manager-1.8.1.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mate-base/mate-session-manager/mate-session-manager-1.8.1.ebuild,v 1.1 2014/04/17 15:11:08 tomwij Exp $
+
+EAPI="5"
+
+GCONF_DEBUG="yes"
+
+inherit autotools 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 session manager"
+HOMEPAGE="http://mate-desktop.org/"
+
+LICENSE="GPL-2 LGPL-2 FDL-1.1"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE="ipv6 elibc_FreeBSD gnome-keyring systemd upower"
+
+# x11-misc/xdg-user-dirs{,-gtk} are needed to create the various XDG_*_DIRs, and
+# create .config/user-dirs.dirs which is read by glib to get G_USER_DIRECTORY_*
+# xdg-user-dirs-update is run during login (see 10-user-dirs-update-gnome below).
+
+RDEPEND=">=dev-libs/dbus-glib-0.76:0
+	>=dev-libs/glib-2.25:2
+	dev-libs/libxslt:0
+	sys-apps/dbus:0
+	x11-apps/xdpyinfo:0
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-2.14:2
+	x11-libs/libICE:0
+	x11-libs/libSM:0
+	x11-libs/libX11:0
+	x11-libs/libXau:0
+	x11-libs/libXext:0
+	x11-libs/libXrender:0
+	x11-libs/libXtst:0
+	x11-libs/pango:0
+	x11-libs/xtrans:0
+	x11-misc/xdg-user-dirs:0
+	x11-misc/xdg-user-dirs-gtk:0
+	virtual/libintl:0
+	elibc_FreeBSD? ( dev-libs/libexecinfo:0 )
+	gnome-keyring? ( gnome-base/gnome-keyring:0 )
+	upower? ( >=sys-power/upower-0.9.0:0 )"
+
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.40:*
+	>=dev-lang/perl-5:0
+	>=mate-base/mate-common-1.6:0
+	>=sys-devel/gettext-0.10.40:*
+	virtual/pkgconfig:*
+	!<gnome-base/gdm-2.20.4:0
+	systemd? ( sys-apps/systemd:0 )"
+
+src_prepare() {
+	# Add "session saving" button back,
+	# see https://bugzilla.gnome.org/show_bug.cgi?id=575544
+	epatch "${FILESDIR}"/${PN}-1.5.2-save-session-ui.patch
+
+	# Fix race condition in idle monitor, GNOME bug applies to MATE too,
+	# see https://bugzilla.gnome.org/show_bug.cgi?id=627903
+	epatch "${FILESDIR}"/${PN}-1.2.0-idle-transition.patch
+
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--with-default-wm=mate-wm \
+		--with-gtk=2.0 \
+		$(use_enable ipv6) \
+		$(use_with systemd) \
+		$(use_enable upower)
+}
+
+DOCS="AUTHORS ChangeLog NEWS README"
+
+src_install() {
+	gnome2_src_install
+
+	dodir /etc/X11/Sessions/
+	exeinto /etc/X11/Sessions/
+	doexe "${FILESDIR}"/MATE
+
+	dodir /usr/share/mate/applications/
+	insinto /usr/share/mate/applications/
+	doins "${FILESDIR}"/defaults.list
+
+	dodir /etc/X11/xinit/xinitrc.d/
+	exeinto /etc/X11/xinit/xinitrc.d/
+	doexe "${FILESDIR}"/15-xdg-data-mate
+
+	# This should be done in MATE too, see Gentoo bug #270852
+	doexe "${FILESDIR}"/10-user-dirs-update-mate
+}
diff --git a/mate-base/mate-session-manager/metadata.xml b/mate-base/mate-session-manager/metadata.xml
index dca1781cb290..67915edd6e20 100644
--- a/mate-base/mate-session-manager/metadata.xml
+++ b/mate-base/mate-session-manager/metadata.xml
@@ -5,4 +5,8 @@
 		<email>TomWij@gentoo.org</email>
 		<name>Tom Wijsman</name>
 	</maintainer>
+	<use>
+		<flag name="upower">Suspend and hibernate using 
+			<pkg>sys-power/upower</pkg>.</flag>
+	</use>
 </pkgmetadata>
diff --git a/mate-base/mate-settings-daemon/Manifest b/mate-base/mate-settings-daemon/Manifest
index e81949d14398..3cbd735dcac0 100644
--- a/mate-base/mate-settings-daemon/Manifest
+++ b/mate-base/mate-settings-daemon/Manifest
@@ -1 +1,2 @@
 DIST mate-settings-daemon-1.6.2.tar.xz 768012 SHA256 e85019e00890ab81080dbd505b76d72d7c91e870ebad701384794aa1ee48b0a8 SHA512 0fae8671a8471782ec94ed25d96dfcc969f3df5b29c382746db90b645eb3d5fd3a25951722cc8048a4af8e27da0871cd5137f7c4a3f57778be18993abbc8da26 WHIRLPOOL 7404cd8681dfcd0fb183775fe6a3ad7d6b378e5552fff4173fbbd0f77f115344a06f5d41b410ab6983a06a352da672367ff4277be231d76ec65a8d2c4892edc1
+DIST mate-settings-daemon-1.8.0.tar.xz 781648 SHA256 dfe3b86835a099223a6a93e1c367f48fcbbcc4fbc56da193218c71049e7d39b7 SHA512 405fc70b99ab65f70df4ae8a1390f2585d888c8668c620b977577498d3acce4462506be8e57ae2f6a3f61aad041d709429d5f6cd041a69944920ef0300c00f5a WHIRLPOOL 3234d9b523d90397400c7d0e0c21d4e6c96fc11132ddfe144518f0fd13f50e2a222e377f8bdbc53c352bcbb013234296cea152078059a5a0c7a33a8a5f24fa75
diff --git a/mate-base/mate-settings-daemon/mate-settings-daemon-1.8.0.ebuild b/mate-base/mate-settings-daemon/mate-settings-daemon-1.8.0.ebuild
new file mode 100644
index 000000000000..b4ffcc4127f7
--- /dev/null
+++ b/mate-base/mate-settings-daemon/mate-settings-daemon-1.8.0.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mate-base/mate-settings-daemon/mate-settings-daemon-1.8.0.ebuild,v 1.1 2014/04/17 14:52:48 tomwij Exp $
+
+EAPI="5"
+
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+
+inherit eutils 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 Settings Daemon"
+HOMEPAGE="http://mate-desktop.org"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE="X debug libnotify policykit pulseaudio smartcard"
+
+RDEPEND=">=dev-libs/dbus-glib-0.74:0
+	>=dev-libs/glib-2.17.3:2
+	>=mate-base/libmatekbd-1.6.1:0
+	>=mate-base/mate-desktop-1.6:0
+	media-libs/fontconfig:1.0
+	>=gnome-base/dconf-0.13.4:0
+	x11-libs/cairo:0
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-2.24:2
+	x11-libs/libX11:0
+	x11-libs/libXi:0
+	x11-libs/libXext:0
+	x11-libs/libXxf86misc:0
+	>=x11-libs/libxklavier-5:0
+	virtual/libintl:0
+	libnotify? ( >=x11-libs/libnotify-0.7:0 )
+	policykit? (
+		>=dev-libs/dbus-glib-0.71:0
+		>=sys-apps/dbus-1.1.2:0
+		>=sys-auth/polkit-0.97:0
+	)
+	pulseaudio? (
+		media-libs/libcanberra:0[gtk]
+		>=media-sound/pulseaudio-0.9.15:0
+	)
+	!pulseaudio? (
+		>=media-libs/gstreamer-0.10.1.2:0.10
+		>=media-libs/gst-plugins-base-0.10.1.2:0.10
+	)
+	smartcard? ( >=dev-libs/nss-3.11.2:0 )"
+
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.37.1:0
+	sys-devel/gettext:0
+	virtual/pkgconfig:0
+	x11-proto/inputproto:0
+	x11-proto/xproto:0"
+
+src_prepare() {
+	# More network filesystems not to monitor, upstream bug #606421
+	epatch "${FILESDIR}/${PN}-1.4.0-netfs-monitor.patch"
+
+	# mouse: Use event driven mode for syndaemon
+	epatch "${FILESDIR}/${PN}-1.2.0-syndaemon-mode.patch"
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		$(use_with libnotify) \
+		$(use_enable debug) \
+		$(use_enable policykit polkit) \
+		$(use_enable pulseaudio pulse) \
+		$(use_enable !pulseaudio gstreamer) \
+		$(use_enable smartcard smartcard-support) \
+		$(use_with X x)
+
+	if use pulseaudio; then
+		elog "Building volume media keys using Pulseaudio"
+	else
+		elog "Building volume media keys using GStreamer"
+	fi
+}
+
+DOCS="AUTHORS NEWS ChangeLog"
diff --git a/media-libs/elementary/Manifest b/media-libs/elementary/Manifest
index 994736e07965..47f2009fa3d4 100644
--- a/media-libs/elementary/Manifest
+++ b/media-libs/elementary/Manifest
@@ -1,6 +1,5 @@
-DIST elementary-1.7.8.tar.bz2 9390559 SHA256 4b5911ff736157c8271fc83e5176963cbf505aedef26469eb74caf175ae83b53 SHA512 58c93914f1f7b1c5ce878b6138a37235a536b721fa8b0bfeeb14c2733ff840a03ae8bab3351f1a875fe0e441f0e6eb1bdf6fe30d17d0f4679c2b9fd2b588ac63 WHIRLPOOL 86e5c212fed12f9af4a4cf2b260810d3c81364984fa65eab6e5a10ddf9cf32a600c7d1be4f0ece77b06e5595e0d2e24cd04d900971315e0795a108e257e831a8
 DIST elementary-1.7.9.tar.bz2 9393168 SHA256 56febdf1b82b4b748272b7be144698267b78dce2ea61a37d55c14d5cfcfbbd2e SHA512 de1ffc425a05ae65032a195d7c9c6834dfcb5913ae136e4411ba3dbe99cc5fb258f0567636ee6abc10c74a5480d3cd18a7d2b88ece2e3201ab44eb86fc94b477 WHIRLPOOL 7a252780106678f8855bf15f49e260c4bd05685ed4e059231ea53d0e0413cd31cc845a4f781c72ad0877aff3e52dd276a8f0d6057fa11845c733b34e0aad6c23
 DIST elementary-1.8.4.tar.bz2 12125663 SHA256 b3597896cd977387172e300c3df43404b6bf48c423610416b350043d4c270cb5 SHA512 c87612b38d9c123bf378e2e2b47cfb6636e4ed71ad5660bda97d9decbc6c0505de0a0e28b123908fbd9252be3b5c51c8fd44fdbd4268cef70d872b7a880a995f WHIRLPOOL 5dd53b1c4d810ee657324d8988c8aef8f5d24ee55f3ac8433e0d21e651a52ccf840c9612ce4e0991e7ca01a0e43302d9f525f0b5c6b14701e86194810a983005
 DIST elementary-1.8.5.tar.bz2 12134869 SHA256 427d0d3619a410d924ea44856ea9ddd7ce01e827be16f113627cef226eefa73f SHA512 94d32b4a2311c54fcc4549e82f825f61fe0ce63cfba8f3bdc3c02b263ed4bb622c3e119b8bb657fdd73a154ace5cceabf6f748ca561c0063271083a144729c98 WHIRLPOOL efe6bf99f1216c1ec426326490f4c751416e96d5941913e84666ca28d57a9bcada28775edc03532ce92cc18a39f5fd58deb2df202a781575eb39215a8b8393be
-DIST elementary-1.9.0.tar.bz2 12189213 SHA256 444e0f5cf9508ad821a7b2fd470c8f1d0fbbe80cb320f330044120ea6e1c839f SHA512 2841d25f654fa9880f20ee1ce912f5c5934860b0a560f66fab84c4b7c15e8a88ff01c2a759b6096412d5438a9eb9b80e95391c7385c3a1f71ce5737ca924029b WHIRLPOOL 93870c70e57885cdcd3373002e3ed16c79f971e930bf00d85134b61ae2c505afa07fcd3f7492988798dc9b7b4316a189f457e0e9bbea578a946d30e517eea2f0
 DIST elementary-1.9.2.tar.bz2 12192434 SHA256 e1a8a77e5ff7ac934b5622131301787bc6cfc068b7117ffdbd5e1d855448f3cf SHA512 f680cde8839888e5f52946082d8e9afacdbb8765b006c1f78f7386384a6908c2d7a836ddf7ba154b754b35324e9e40431b4d740c46b16456abbf330c9314cc90 WHIRLPOOL e17ba88122cfc16494258480df79a764fb9b13fcf038a6803198152035121cbe2253df9398698c894963c207a21b9a3b92bdc5feb55bf78eb2a21f1f1327f7c3
+DIST elementary-1.9.3.tar.bz2 12193205 SHA256 3d52c0100acc1d7cf4b29a39e4cb5ff5a249507fe927225784937db35e728c95 SHA512 d8a87a3439674931f8e7e7032e897e36609dcbac66b191299b98b4b74a8803395c0aa3e68350251de3f1a1645beda973e91202494fd02ffad5a8662d6bddb33f WHIRLPOOL e92ff3f0062940d20669e8f15e5e3a4f8bcfea7dcb74bec47e87f2903b4938e755586866b11e83ab7db1015c8c7f7c7100f2c578f256668deb99ff1bfd31fb75
diff --git a/media-libs/elementary/elementary-1.7.8.ebuild b/media-libs/elementary/elementary-1.7.8.ebuild
deleted file mode 100644
index afc4ec007cc7..000000000000
--- a/media-libs/elementary/elementary-1.7.8.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/elementary/elementary-1.7.8.ebuild,v 1.1 2013/08/06 20:01:06 tommy Exp $
-
-EAPI=2
-
-inherit autotools enlightenment
-
-DESCRIPTION="Basic widget set, based on EFL for mobile touch-screen devices."
-HOMEPAGE="http://trac.enlightenment.org/e/wiki/Elementary"
-SRC_URI="http://download.enlightenment.org/releases/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~x86"
-IUSE="dbus debug emotion ethumb examples fbcon opengl quicklaunch sdl X xcb xdg static-libs"
-
-DEPEND="
-	>=dev-libs/ecore-1.7.8[evas,fbcon?,opengl?,sdl?,X?,xcb?]
-	>=dev-libs/eet-1.7.8
-	>=media-libs/evas-1.7.8[fbcon?,opengl?,X?,xcb?]
-	>=media-libs/edje-1.7.8
-	dbus? ( >=dev-libs/e_dbus-1.7.6 )
-	emotion? ( >=media-libs/emotion-1.7.6 )
-	ethumb? ( >=media-libs/ethumb-1.7.6 )
-	xdg? ( >=dev-libs/efreet-1.7.8 )
-	"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	sed -i "s:1.7.8:1.7.6:g" configure.ac
-	eautoreconf
-}
-
-src_configure() {
-	MY_ECONF="$(use_enable dbus edbus)
-		$(use_enable debug)
-		$(use_enable doc)
-		--disable-ecore-cocoa
-		--disable-ecore-psl1ght
-		--disable-ecore-wayland
-		--disable-ecore-win32
-		--disable-ecore-wince
-		--disable-emap
-		$(use_enable emotion)
-		$(use_enable ethumb)
-		--disable-eweather
-		$(use_enable examples build-examples)
-		$(use_enable examples install-examples)
-		$(use_enable fbcon ecore-fb)
-		$(use_enable sdl ecore-sdl)
-		--disable-web
-		$(use_enable X ecore-x)
-		$(use_enable quicklaunch quick-launch)
-		$(use_enable xdg efreet)"
-
-	enlightenment_src_configure
-}
diff --git a/media-libs/elementary/elementary-1.9.0.ebuild b/media-libs/elementary/elementary-1.9.3.ebuild
similarity index 92%
rename from media-libs/elementary/elementary-1.9.0.ebuild
rename to media-libs/elementary/elementary-1.9.3.ebuild
index ef21be90ceb6..82c649a25327 100644
--- a/media-libs/elementary/elementary-1.9.0.ebuild
+++ b/media-libs/elementary/elementary-1.9.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/elementary/elementary-1.9.0.ebuild,v 1.1 2014/03/01 16:33:09 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/elementary/elementary-1.9.3.ebuild,v 1.1 2014/04/17 14:58:37 tommy Exp $
 
 EAPI=3
 
@@ -24,7 +24,7 @@ KEYWORDS="~amd64 ~arm ~x86"
 IUSE="debug examples fbcon quicklaunch sdl wayland X static-libs"
 
 DEPEND="
-	>=dev-libs/efl-1.9.0_beta2[sdl?,png,wayland?,X?]
+	>=dev-libs/efl-1.9.2[sdl?,png,wayland?,X?]
 	"
 RDEPEND="${DEPEND}"
 
diff --git a/media-radio/qsstv/Manifest b/media-radio/qsstv/Manifest
index 25207227abe1..08de784d345f 100644
--- a/media-radio/qsstv/Manifest
+++ b/media-radio/qsstv/Manifest
@@ -1,3 +1,4 @@
 DIST qsstv_7.1.7.tgz 2116410 SHA256 ae713985af1072ab267c280dcb81c830a9a026545cf402444e1f72a3e7f25f00 SHA512 1b7c554d3d7e1638f8ca5477db3dec09e2ed89347bcd4272684e2da0667f69a9f3a3819a6dd3cae85d13c0fd5c33e69ddc42b74805f91a57197a948b237d630b WHIRLPOOL 1179b4b10a77bb292e75876a23761473d5e6b46e9ef03d0d90c4e9e7f936829149be898630deb3d046f7e792064db61a6f41107b8f8b13035f8b664544e10764
 DIST qsstv_8.1.14.tar.gz 634880 SHA256 5c40cc6299de44a1b97add6b999d8055947f69e83105586df3c3706e260b09ee SHA512 e271181569b0fbe2a213420769e0c86d0017869bfb68551aeae28490f3b71f4ac480ed59e08288737a01bcc2db2ec4bb3f110266066a88d8a587764e927e82f0 WHIRLPOOL 8eac0233facf4528a78e43bcb1fce078915eb6620a9975a8186bd05e5f8ecc71c5b22da292e17c5aa3a7e233c36d2f0836937d19d57e957d3fc02efcda6187ed
 DIST qsstv_8.1.17.tar.gz 634880 SHA256 2184fe9b8c1113d3e14eab786b47d7e15881c73bf167e8df58bdca8e074c9dd9 SHA512 c903604719516d844bfe6df19f3528926586c82b38eb2bfec1ee4cb345a16cac88e0c351af456405152dd715b4e3ad471f42bc65e6839655625aafc0f79f22e5 WHIRLPOOL fa36e572dbb5df67a5ff1b9d3fdb23f846fcfbc7184b6dc50985131a0e64e1c32d9635c5d2deea17e52e47cbc5e087d5493215bc3ca13fe93dbb4cb334d92070
+DIST qsstv_8.2.7.tar.gz 655360 SHA256 85dff982ac64586e49c5472109a2dfbb17cd4598f2bb390169367da76eba6c82 SHA512 d45327be42f2ff78b8ca9c442cdac16438ae24ab91aed6706bd73bd91371ffaa66f80b116287a7a60861af51d02f35ef5375769193fc5f07c135aa501d00cd4f WHIRLPOOL 17aba4d706a091354f0a904bfc4728fef53a32848be532db204688f836957fbb9ac981a77db2440292297cc57e957c6ff5b1c36d5f4191638c0300a744ba8bd3
diff --git a/media-radio/qsstv/qsstv-8.2.7.ebuild b/media-radio/qsstv/qsstv-8.2.7.ebuild
new file mode 100644
index 000000000000..c7fac868b0b2
--- /dev/null
+++ b/media-radio/qsstv/qsstv-8.2.7.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-radio/qsstv/qsstv-8.2.7.ebuild,v 1.1 2014/04/17 16:59:53 tomjbe Exp $
+
+EAPI=5
+
+inherit eutils multilib qt4-r2
+
+MY_P=${P/-/_}
+
+DESCRIPTION="Amateur radio SSTV software"
+HOMEPAGE="http://users.telenet.be/on4qz/"
+SRC_URI="http://users.telenet.be/on4qz/qsstv/downloads/${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-qt/qtcore:4[qt3support]
+	dev-qt/qtgui:4
+	media-libs/hamlib
+	media-libs/jasper
+	media-libs/alsa-lib
+	sci-libs/fftw:3.0"
+RDEPEND="${DEPEND}
+	x11-misc/xdg-utils"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	# fix docdirectory, install path and hamlib search path
+	sed -i -e "s:/doc/\$\$TARGET:/doc/${PF}:" \
+		-e "s:-lhamlib:-L/usr/$(get_libdir)/hamlib -lhamlib:g" qsstv_8.pro
+}
diff --git a/media-sound/gnome-music/Manifest b/media-sound/gnome-music/Manifest
index 5f0f58794873..7828be2bea01 100644
--- a/media-sound/gnome-music/Manifest
+++ b/media-sound/gnome-music/Manifest
@@ -1 +1,2 @@
 DIST gnome-music-3.10.3.tar.xz 1380356 SHA256 c07e8dcde2cc67bcd0b9d6b8dfb6b16c73c65700d7bd80087068da6e037faf68 SHA512 5baa47c05df8aacaa7896675da976800f2469b51af9e55590094e4b64ef3669984a2e02cf8367d8882a703ff8a975f6de3670ee7137b5e7958de119ddf8a213e WHIRLPOOL 0265163bb71781c931b1be971e94a6e3d30b25e82a23d6795df6d739c77e14e4042e61b543921cf77f3dfefe1d0e6c28ff89bf96df3fd79103a77c96ba080c95
+DIST gnome-music-3.10.4.tar.xz 1381036 SHA256 64220d4c0f9115a6ed27ec99c7ec7afc065d12e5a32371936f303ef981f5325f SHA512 94e0d9b1bd7108646d0ae8480604dfe6a6093ff9b507754dc4966bf15d03a867a1ef1b56d5b798c54a24e6b782831d662b1678bf866988d7aaef65c89a7d08e7 WHIRLPOOL 0f5deee410dac707082f0cfce6be26ae962f74ef7ec8ae3ce647f7120dbeaeb52d583755780d97d8c05455a906193b5e6bd238c365f5e87cdd6e0751659921e3
diff --git a/media-sound/gnome-music/gnome-music-3.10.4.ebuild b/media-sound/gnome-music/gnome-music-3.10.4.ebuild
new file mode 100644
index 000000000000..d8d981cd9964
--- /dev/null
+++ b/media-sound/gnome-music/gnome-music-3.10.4.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gnome-music/gnome-music-3.10.4.ebuild,v 1.1 2014/04/17 13:05:39 pacho Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+PYTHON_COMPAT=( python{3_2,3_3} )
+
+inherit gnome2 python-single-r1
+
+DESCRIPTION="Music management for Gnome"
+HOMEPAGE="http://wiki.gnome.org/Apps/Music"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE=""
+# Let people emerge this by default, bug #472932
+IUSE+=" python_single_target_python3_2 +python_single_target_python3_3"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+KEYWORDS="~amd64 ~x86"
+
+COMMON_DEPEND="
+	${PYTHON_DEPS}
+	>=dev-libs/glib-2.28:2
+	>=dev-libs/gobject-introspection-1.35.9
+	>=media-libs/grilo-0.2.6:0.2[introspection]
+	>=x11-libs/gtk+-3.9:3[introspection]
+"
+RDEPEND="${COMMON_DEPEND}
+	app-misc/tracker[introspection(+)]
+	|| (
+		app-misc/tracker[gstreamer]
+		app-misc/tracker[xine]
+	)
+	dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	media-libs/gstreamer:1.0[introspection]
+	media-libs/gst-plugins-base:1.0[introspection]
+	media-plugins/gst-plugins-meta:1.0
+	media-plugins/grilo-plugins:0.2[tracker]
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/intltool-0.26
+	virtual/pkgconfig
+"
diff --git a/media-video/vcdgear/Manifest b/media-video/vcdgear/Manifest
index 0b6001be8918..1df26e51ac7c 100644
--- a/media-video/vcdgear/Manifest
+++ b/media-video/vcdgear/Manifest
@@ -1 +1 @@
-DIST vcdgear176-040415_linux.tar.gz 442937 SHA256 d6fc156b5c4960cf5e7cf047ae1101da772e13255ec02f71cbc07b2a8ca567a7
+DIST vcdgear176-040415_linux.tar.gz 442937 SHA256 d6fc156b5c4960cf5e7cf047ae1101da772e13255ec02f71cbc07b2a8ca567a7 SHA512 c6fbefc2a5f96a629f70611da61245f7b23b03a524e67f75db5a873952abcb1db226f4b9bdee18298a8a21d0ae14ffee816ffcd7a732605c0a445015b7507b19 WHIRLPOOL 0aa2b1a1fcfc1a74ed62a0546cf465deb97dfd584086c081198310615feb6242e8450b22641e1848f3bc5384e3d2f2fe9fdfcac618e25d1258070f28283fe604
diff --git a/media-video/vcdgear/vcdgear-1.76-r2.ebuild b/media-video/vcdgear/vcdgear-1.76-r2.ebuild
index 7b93594ccf04..cda1cf67e79a 100644
--- a/media-video/vcdgear/vcdgear-1.76-r2.ebuild
+++ b/media-video/vcdgear/vcdgear-1.76-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vcdgear/vcdgear-1.76-r2.ebuild,v 1.7 2012/09/24 00:46:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vcdgear/vcdgear-1.76-r2.ebuild,v 1.8 2014/04/17 15:45:26 ulm Exp $
 
 EAPI=2
 
@@ -12,10 +12,11 @@ DESCRIPTION="extract MPEG streams from CD images, convert VCD files to MPEG, cor
 HOMEPAGE="http://www.vcdgear.com/"
 SRC_URI="http://www.vcdgear.com/files/vcdgear${PV//.}-${STAMP}_linux.tar.gz"
 
-LICENSE="as-is"
+LICENSE="all-rights-reserved"
 SLOT="0"
 KEYWORDS="-* amd64 x86"
 IUSE=""
+RESTRICT="mirror bindist"
 
 RDEPEND="virtual/libstdc++:3.3"
 DEPEND=""
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 5cf1ef0730f8..7efee41a031b 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Thu, 17 Apr 2014 12:07:03 +0000
+Thu, 17 Apr 2014 17:07:02 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 10dba3bf8c8c..7efee41a031b 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Thu, 17 Apr 2014 12:07:04 +0000
+Thu, 17 Apr 2014 17:07:02 +0000
diff --git a/metadata/md5-cache/app-doc/gnucash-docs-2.4.2 b/metadata/md5-cache/app-doc/gnucash-docs-2.4.2
deleted file mode 100644
index ac7ef13853a3..000000000000
--- a/metadata/md5-cache/app-doc/gnucash-docs-2.4.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=!<=app-office/gnucash-2.2.1 >=dev-libs/libxml2-2.5.10 dev-libs/libxslt app-text/docbook-xsl-stylesheets app-text/docbook-xml-dtd:4.1.2 app-text/rarian app-arch/xz-utils >=sys-apps/sed-4
-DESCRIPTION=Documentation package for GnuCash
-EAPI=5
-HOMEPAGE=http://www.gnucash.org/
-KEYWORDS=amd64 ppc ~ppc64 x86
-LICENSE=GPL-2 FDL-1.1
-RDEPEND=!<=app-office/gnucash-2.2.1
-SLOT=0
-SRC_URI=mirror://sourceforge/gnucash/gnucash-docs-2.4.2.tar.gz
-_eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=f4cf39e98b85532f2100fc626454a54e
diff --git a/metadata/md5-cache/app-misc/screen-4.2.0 b/metadata/md5-cache/app-misc/screen-4.2.0
new file mode 100644
index 000000000000..985bf900e5b9
--- /dev/null
+++ b/metadata/md5-cache/app-misc/screen-4.2.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install postinst prepare setup
+DEPEND=>=sys-libs/ncurses-5.2 pam? ( virtual/pam ) selinux? ( sec-policy/selinux-screen ) sys-apps/texinfo !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DESCRIPTION=Full-screen window manager that multiplexes physical terminals between several processes
+EAPI=5
+HOMEPAGE=http://www.gnu.org/software/screen/
+IUSE=debug nethack pam selinux multiuser
+LICENSE=GPL-2
+RDEPEND=>=sys-libs/ncurses-5.2 pam? ( virtual/pam ) selinux? ( sec-policy/selinux-screen ) >=sys-apps/openrc-0.11.6
+SLOT=0
+SRC_URI=http://download.savannah.gnu.org/releases/screen/screen-4.2.0.tar.gz
+_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	af81d52c25ec93fbdff71e0efb0de7b7	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=bc5aa1735e3d84d7c3dacbafbc1b48ef
diff --git a/metadata/md5-cache/app-office/abiword-2.8.6-r2 b/metadata/md5-cache/app-office/abiword-2.8.6-r2
deleted file mode 100644
index 3ef6d367fc57..000000000000
--- a/metadata/md5-cache/app-office/abiword-2.8.6-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=app-text/wv-1.2 >=dev-libs/fribidi-0.10.4 >=dev-libs/glib-2.16:2 >=gnome-base/librsvg-2.16:2 >=gnome-extra/libgsf-1.14.15 >=media-libs/libpng-1.2 virtual/jpeg >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.14:2[cups?] gnome? ( >=x11-libs/goffice-0.8:0.8 ) plugins? ( collab? ( >=dev-libs/boost-1.33.1 >=dev-libs/libxml2-2.4 >=net-libs/loudmouth-1 net-libs/libsoup:2.4 net-libs/gnutls ) grammar? ( >=dev-libs/link-grammar-4.2.1 ) latex? ( dev-libs/libxslt ) math? ( >=x11-libs/gtkmathview-0.7.5 ) openxml? ( dev-libs/boost ) ots? ( >=app-text/ots-0.5 ) readline? ( sys-libs/readline ) thesaurus? ( >=app-text/aiksaurus-1.2[gtk] ) wordperfect? ( app-text/libwpd:0.9 app-text/libwpg:0.2 ) wmf? ( >=media-libs/libwmf-0.2.8 ) ) spell? ( >=app-text/enchant-1.2 ) !<app-office/abiword-plugins-2.8 virtual/pkgconfig collab? ( dev-cpp/asio ) app-arch/xz-utils >=sys-apps/sed-4 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
-DESCRIPTION=Fully featured yet light and fast cross platform word processor
-EAPI=4
-HOMEPAGE=http://www.abisource.com/
-IUSE=collab cups gnome grammar latex math ots openxml +plugins readline spell wordperfect wmf thesaurus debug
-KEYWORDS=alpha amd64 ~arm ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=>=app-text/wv-1.2 >=dev-libs/fribidi-0.10.4 >=dev-libs/glib-2.16:2 >=gnome-base/librsvg-2.16:2 >=gnome-extra/libgsf-1.14.15 >=media-libs/libpng-1.2 virtual/jpeg >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.14:2[cups?] gnome? ( >=x11-libs/goffice-0.8:0.8 ) plugins? ( collab? ( >=dev-libs/boost-1.33.1 >=dev-libs/libxml2-2.4 >=net-libs/loudmouth-1 net-libs/libsoup:2.4 net-libs/gnutls ) grammar? ( >=dev-libs/link-grammar-4.2.1 ) latex? ( dev-libs/libxslt ) math? ( >=x11-libs/gtkmathview-0.7.5 ) openxml? ( dev-libs/boost ) ots? ( >=app-text/ots-0.5 ) readline? ( sys-libs/readline ) thesaurus? ( >=app-text/aiksaurus-1.2[gtk] ) wordperfect? ( app-text/libwpd:0.9 app-text/libwpg:0.2 ) wmf? ( >=media-libs/libwmf-0.2.8 ) ) spell? ( >=app-text/enchant-1.2 ) !<app-office/abiword-plugins-2.8
-REQUIRED_USE=!plugins? ( !collab !grammar !latex !math !openxml !ots !readline !thesaurus !wordperfect !wmf )
-SLOT=2
-SRC_URI=http://www.abisource.com/downloads/abiword/2.8.6/source/abiword-2.8.6.tar.gz
-_eclasses_=alternatives	326031758c86cd08f5844f475f03ac01	autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	af81d52c25ec93fbdff71e0efb0de7b7	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=219e2277b6628452d97222295ab1061d
diff --git a/metadata/md5-cache/app-office/abiword-docs-2.8.6 b/metadata/md5-cache/app-office/abiword-docs-2.8.6
deleted file mode 100644
index 9f448c1ad0e7..000000000000
--- a/metadata/md5-cache/app-office/abiword-docs-2.8.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=app-office/abiword-2.8.6 >=sys-apps/sed-4
-DESCRIPTION=Fully featured yet light and fast cross platform word processor
-EAPI=3
-HOMEPAGE=http://www.abisource.com/
-KEYWORDS=amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=app-office/abiword-2.8.6
-SLOT=0
-SRC_URI=http://www.abisource.com/downloads/abiword/2.8.6/source/abiword-docs-2.8.6.tar.gz
-_eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=fdfe93064e7d02c3830aef8bd69c92a6
diff --git a/metadata/md5-cache/app-office/gnucash-2.4.11-r1 b/metadata/md5-cache/app-office/gnucash-2.4.11-r1
deleted file mode 100644
index dfaaf79ce06e..000000000000
--- a/metadata/md5-cache/app-office/gnucash-2.4.11-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-libs/glib-2.13:2 >=dev-libs/popt-1.5 >=dev-libs/libxml2-2.5.10:2 >=dev-scheme/guile-1.8.3:12[deprecated,regex] dev-scheme/guile-www >=dev-scheme/slib-3.1.4 >=gnome-base/gconf-2:2 >=gnome-base/libgnomeui-2.4 >=gnome-base/libglade-2.4:2.0 gnome-base/libgnome-keyring media-libs/libart_lgpl >=sys-libs/zlib-1.1.4 >=x11-libs/gtk+-2.14:2 x11-libs/goffice:0.8[gnome] x11-libs/pango ofx? ( >=dev-libs/libofx-0.9.1 ) hbci? ( >=net-libs/aqbanking-5[gtk,ofx?] sys-libs/gwenhywfar[gtk] chipcard? ( sys-libs/libchipcard ) ) quotes? ( dev-perl/DateManip >=dev-perl/Finance-Quote-1.11 dev-perl/HTML-TableExtract ) webkit? ( net-libs/webkit-gtk:2 ) !webkit? ( >=gnome-extra/gtkhtml-3.16:3.14 ) sqlite? ( dev-db/libdbi dev-db/libdbi-drivers[sqlite] ) postgres? ( dev-db/libdbi dev-db/libdbi-drivers[postgres] ) mysql? ( dev-db/libdbi dev-db/libdbi-drivers[mysql] ) >=app-text/scrollkeeper-0.3 virtual/pkgconfig dev-util/intltool gnome-base/gnome-common sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) )
-DESCRIPTION=A personal finance manager
-EAPI=4
-HOMEPAGE=http://www.gnucash.org/
-IUSE=chipcard debug +doc hbci mysql ofx postgres python quotes sqlite webkit
-KEYWORDS=amd64 ppc ~ppc64 x86
-LICENSE=GPL-2
-PDEPEND=doc? ( >=app-doc/gnucash-docs-2.2.0 )
-RDEPEND=>=dev-libs/glib-2.13:2 >=dev-libs/popt-1.5 >=dev-libs/libxml2-2.5.10:2 >=dev-scheme/guile-1.8.3:12[deprecated,regex] dev-scheme/guile-www >=dev-scheme/slib-3.1.4 >=gnome-base/gconf-2:2 >=gnome-base/libgnomeui-2.4 >=gnome-base/libglade-2.4:2.0 gnome-base/libgnome-keyring media-libs/libart_lgpl >=sys-libs/zlib-1.1.4 >=x11-libs/gtk+-2.14:2 x11-libs/goffice:0.8[gnome] x11-libs/pango ofx? ( >=dev-libs/libofx-0.9.1 ) hbci? ( >=net-libs/aqbanking-5[gtk,ofx?] sys-libs/gwenhywfar[gtk] chipcard? ( sys-libs/libchipcard ) ) quotes? ( dev-perl/DateManip >=dev-perl/Finance-Quote-1.11 dev-perl/HTML-TableExtract ) webkit? ( net-libs/webkit-gtk:2 ) !webkit? ( >=gnome-extra/gtkhtml-3.16:3.14 ) sqlite? ( dev-db/libdbi dev-db/libdbi-drivers[sqlite] ) postgres? ( dev-db/libdbi dev-db/libdbi-drivers[postgres] ) mysql? ( dev-db/libdbi dev-db/libdbi-drivers[mysql] ) python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) )
-SLOT=0
-SRC_URI=mirror://sourceforge/gnucash/gnucash-2.4.11.tar.bz2
-_eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	python	be9965681d83c3980660a2660ac95e95	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=0c030ac64816490ed08b3974d60ce3fd
diff --git a/metadata/md5-cache/app-office/gnucash-2.4.13 b/metadata/md5-cache/app-office/gnucash-2.4.13
deleted file mode 100644
index 25a0f9be45d5..000000000000
--- a/metadata/md5-cache/app-office/gnucash-2.4.13
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-libs/glib-2.32.0:2 >=dev-libs/popt-1.5 >=dev-libs/libxml2-2.5.10:2 >=dev-scheme/guile-1.8.3:12[deprecated,regex] dev-scheme/guile-www >=dev-scheme/slib-3.1.4 >=gnome-base/gconf-2:2 >=gnome-base/libgnomeui-2.4 >=gnome-base/libglade-2.4:2.0 gnome-base/libgnome-keyring media-libs/libart_lgpl >=sys-libs/zlib-1.1.4 >=x11-libs/gtk+-2.14:2 x11-libs/goffice:0.8[gnome] x11-libs/pango ofx? ( >=dev-libs/libofx-0.9.1 ) hbci? ( >=net-libs/aqbanking-5[gtk,ofx?] sys-libs/gwenhywfar[gtk] chipcard? ( sys-libs/libchipcard ) ) python? ( python_single_target_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) quotes? ( dev-perl/DateManip >=dev-perl/Finance-Quote-1.11 dev-perl/HTML-TableExtract ) webkit? ( net-libs/webkit-gtk:2 ) !webkit? ( >=gnome-extra/gtkhtml-3.16:3.14 ) sqlite? ( >=dev-db/libdbi-0.9.0 >=dev-db/libdbi-drivers-0.9.0[sqlite] ) postgres? ( dev-db/libdbi dev-db/libdbi-drivers[postgres] ) mysql? ( dev-db/libdbi dev-db/libdbi-drivers[mysql] ) >=app-text/scrollkeeper-0.3 virtual/pkgconfig dev-util/intltool gnome-base/gnome-common sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
-DESCRIPTION=A personal finance manager
-EAPI=5
-HOMEPAGE=http://www.gnucash.org/
-IUSE=chipcard debug +doc hbci mysql ofx postgres python quotes sqlite webkit python_targets_python2_6 python_targets_python2_7 python_single_target_python2_6 python_single_target_python2_7
-KEYWORDS=amd64 ~ppc ~ppc64 x86
-LICENSE=GPL-2
-PDEPEND=doc? ( >=app-doc/gnucash-docs-2.2.0 )
-RDEPEND=>=dev-libs/glib-2.32.0:2 >=dev-libs/popt-1.5 >=dev-libs/libxml2-2.5.10:2 >=dev-scheme/guile-1.8.3:12[deprecated,regex] dev-scheme/guile-www >=dev-scheme/slib-3.1.4 >=gnome-base/gconf-2:2 >=gnome-base/libgnomeui-2.4 >=gnome-base/libglade-2.4:2.0 gnome-base/libgnome-keyring media-libs/libart_lgpl >=sys-libs/zlib-1.1.4 >=x11-libs/gtk+-2.14:2 x11-libs/goffice:0.8[gnome] x11-libs/pango ofx? ( >=dev-libs/libofx-0.9.1 ) hbci? ( >=net-libs/aqbanking-5[gtk,ofx?] sys-libs/gwenhywfar[gtk] chipcard? ( sys-libs/libchipcard ) ) python? ( python_single_target_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) quotes? ( dev-perl/DateManip >=dev-perl/Finance-Quote-1.11 dev-perl/HTML-TableExtract ) webkit? ( net-libs/webkit-gtk:2 ) !webkit? ( >=gnome-extra/gtkhtml-3.16:3.14 ) sqlite? ( >=dev-db/libdbi-0.9.0 >=dev-db/libdbi-drivers-0.9.0[sqlite] ) postgres? ( dev-db/libdbi dev-db/libdbi-drivers[postgres] ) mysql? ( dev-db/libdbi dev-db/libdbi-drivers[mysql] )
-SLOT=0
-SRC_URI=mirror://sourceforge/gnucash/gnucash-2.4.13.tar.bz2
-_eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	python-single-r1	82a55861314bbcedaf1e08ed4dd651b3	python-utils-r1	30d5d7986d3f80d0f2c2726366426859	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=a96311a12a85a8fa5303bd385f216365
diff --git a/metadata/md5-cache/app-office/gnumeric-1.12.0-r1 b/metadata/md5-cache/app-office/gnumeric-1.12.0-r1
deleted file mode 100644
index af48d6e53a15..000000000000
--- a/metadata/md5-cache/app-office/gnumeric-1.12.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=sys-libs/zlib app-arch/bzip2 >=dev-libs/glib-2.28.0:2 >=gnome-extra/libgsf-1.14.24:= >=x11-libs/goffice-0.10.0:0.10 >=dev-libs/libxml2-2.4.12:2 >=x11-libs/pango-1.24.0:= >=x11-libs/gtk+-3.0.0:3 x11-libs/cairo:=[svg] introspection? ( >=dev-libs/gobject-introspection-1.0.0:= ) perl? ( dev-lang/perl ) python? ( python_single_target_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] >=dev-python/pygobject-3.0.0:3[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) >=dev-util/intltool-0.35.0 virtual/pkgconfig app-text/scrollkeeper app-arch/xz-utils >=sys-apps/sed-4
-DESCRIPTION=The GNOME Spreadsheet
-EAPI=5
-HOMEPAGE=http://projects.gnome.org/gnumeric/
-IUSE=+introspection perl python python_targets_python2_6 python_targets_python2_7 python_single_target_python2_6 python_single_target_python2_7
-KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=sys-libs/zlib app-arch/bzip2 >=dev-libs/glib-2.28.0:2 >=gnome-extra/libgsf-1.14.24:= >=x11-libs/goffice-0.10.0:0.10 >=dev-libs/libxml2-2.4.12:2 >=x11-libs/pango-1.24.0:= >=x11-libs/gtk+-3.0.0:3 x11-libs/cairo:=[svg] introspection? ( >=dev-libs/gobject-introspection-1.0.0:= ) perl? ( dev-lang/perl ) python? ( python_single_target_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] >=dev-python/pygobject-3.0.0:3[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnumeric/1.12/gnumeric-1.12.0.tar.xz http://dev.gentoo.org/~tetromino/distfiles/gnumeric/gnumeric-1.12.0-annotation-syntax.patch.xz
-_eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	python-single-r1	82a55861314bbcedaf1e08ed4dd651b3	python-utils-r1	30d5d7986d3f80d0f2c2726366426859	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=80ad8341359db0e7ff598580ea9a68a2
diff --git a/metadata/md5-cache/app-office/gnumeric-1.12.14 b/metadata/md5-cache/app-office/gnumeric-1.12.14
new file mode 100644
index 000000000000..84e349c4ea9d
--- /dev/null
+++ b/metadata/md5-cache/app-office/gnumeric-1.12.14
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
+DEPEND=app-arch/bzip2 sys-libs/zlib >=dev-libs/glib-2.28:2 >=gnome-extra/libgsf-1.14.24:= >=x11-libs/goffice-0.10.14:0.10 >=dev-libs/libxml2-2.4.12:2 >=x11-libs/pango-1.24.0:= >=x11-libs/gtk+-3.2:3 x11-libs/cairo:=[svg] introspection? ( >=dev-libs/gobject-introspection-1:= ) perl? ( dev-lang/perl ) python? ( python_single_target_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] >=dev-python/pygobject-3:3[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) libgda? ( gnome-extra/libgda:5[gtk] ) app-text/scrollkeeper >=dev-util/intltool-0.35.0 virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4
+DESCRIPTION=The GNOME Spreadsheet
+EAPI=5
+HOMEPAGE=http://www.gnumeric.org/
+IUSE=+introspection libgda perl python python_targets_python2_6 python_targets_python2_7 python_single_target_python2_6 python_single_target_python2_7
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=app-arch/bzip2 sys-libs/zlib >=dev-libs/glib-2.28:2 >=gnome-extra/libgsf-1.14.24:= >=x11-libs/goffice-0.10.14:0.10 >=dev-libs/libxml2-2.4.12:2 >=x11-libs/pango-1.24.0:= >=x11-libs/gtk+-3.2:3 x11-libs/cairo:=[svg] introspection? ( >=dev-libs/gobject-introspection-1:= ) perl? ( dev-lang/perl ) python? ( python_single_target_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] >=dev-python/pygobject-3:3[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) libgda? ( gnome-extra/libgda:5[gtk] )
+REQUIRED_USE=python? ( python_single_target_python2_6? ( python_targets_python2_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) ^^ ( python_single_target_python2_6 python_single_target_python2_7 ) )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnumeric/1.12/gnumeric-1.12.14.tar.xz
+_eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	python-single-r1	82a55861314bbcedaf1e08ed4dd651b3	python-utils-r1	30d5d7986d3f80d0f2c2726366426859	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=8994d2fbfd8a45b3266abbc4eda51efd
diff --git a/metadata/md5-cache/app-text/llpp-18 b/metadata/md5-cache/app-text/llpp-18
new file mode 100644
index 000000000000..3c5a6206b5c4
--- /dev/null
+++ b/metadata/md5-cache/app-text/llpp-18
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install prepare unpack
+DEPEND=x11-misc/xsel !static? ( >app-text/mupdf-1.3_p20140118:0= media-libs/openjpeg:2 media-libs/freetype:2 media-libs/jbig2dec sys-libs/zlib virtual/jpeg:0 x11-libs/libX11 ) static? ( >app-text/mupdf-1.3_p20140118:0=[static-libs] media-libs/openjpeg:2[static-libs] media-libs/freetype:2[static-libs] media-libs/jbig2dec[static-libs] sys-libs/zlib[static-libs] virtual/jpeg:0[static-libs] x11-libs/libX11[static-libs] app-arch/bzip2[static-libs] media-libs/libXcm[static-libs] x11-libs/libXau[static-libs] x11-libs/libXdmcp[static-libs] x11-libs/libXmu[static-libs] ) dev-lang/ocaml[ocamlopt?] dev-ml/lablgl[glut,ocamlopt?]
+DESCRIPTION=graphical PDF viewer which aims to superficially resemble less(1)
+EAPI=5
+HOMEPAGE=http://repo.or.cz/w/llpp.git
+IUSE=+ocamlopt static
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-3
+RDEPEND=x11-misc/xsel !static? ( >app-text/mupdf-1.3_p20140118:0= media-libs/openjpeg:2 media-libs/freetype:2 media-libs/jbig2dec sys-libs/zlib virtual/jpeg:0 x11-libs/libX11 )
+RESTRICT=!ocamlopt? ( strip )
+SLOT=0
+SRC_URI=http://dev.gentoo.org/~xmw/llpp-18.tar.gz
+_eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66
+_md5_=d2a4f58dd47e7eeb5f10a9dd0285664c
diff --git a/metadata/md5-cache/dev-lang/spidermonkey-17.0.0-r3 b/metadata/md5-cache/dev-lang/spidermonkey-17.0.0-r3
index eb3d8f95ab2c..efb7fd0626f4 100644
--- a/metadata/md5-cache/dev-lang/spidermonkey-17.0.0-r3
+++ b/metadata/md5-cache/dev-lang/spidermonkey-17.0.0-r3
@@ -12,4 +12,4 @@ RESTRICT=ia64? ( test )
 SLOT=17
 SRC_URI=http://ftp.mozilla.org/pub/mozilla.org/js/mozjs17.0.0.tar.gz
 _eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	multilib	fac675dcccf94392371a6abee62d909f	pax-utils	2424f959506320f5196de8f79fa05297	python-any-r1	4560effd96d3d2a82e50af7cf87166da	python-utils-r1	30d5d7986d3f80d0f2c2726366426859	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=84b276072a5a754f444db5566caa2837
+_md5_=9343312525544b5110d18476293f4220
diff --git a/metadata/md5-cache/dev-lang/swi-prolog-7.1.10 b/metadata/md5-cache/dev-lang/swi-prolog-7.1.12
similarity index 90%
rename from metadata/md5-cache/dev-lang/swi-prolog-7.1.10
rename to metadata/md5-cache/dev-lang/swi-prolog-7.1.12
index 876bc41e046f..5b17eaa82f92 100644
--- a/metadata/md5-cache/dev-lang/swi-prolog-7.1.10
+++ b/metadata/md5-cache/dev-lang/swi-prolog-7.1.12
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=LGPL-2.1
 RDEPEND=sys-libs/ncurses archive? ( app-arch/libarchive ) zlib? ( sys-libs/zlib ) odbc? ( dev-db/unixODBC ) readline? ( sys-libs/readline ) gmp? ( dev-libs/gmp ) ssl? ( dev-libs/openssl ) java? ( >=virtual/jdk-1.4 ) X? ( virtual/jpeg x11-libs/libX11 x11-libs/libXft x11-libs/libXpm x11-libs/libXt x11-libs/libICE x11-libs/libSM ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
-SRC_URI=http://www.swi-prolog.org/download/devel/src/pl-7.1.10.tar.gz mirror://gentoo/swi-prolog-7.1.10-gentoo-patchset-0.tar.gz
+SRC_URI=http://www.swi-prolog.org/download/devel/src/pl-7.1.12.tar.gz mirror://gentoo/swi-prolog-7.1.12-gentoo-patchset-0.tar.gz
 _eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=c189c4576a1e50494382b3632c49075d
+_md5_=e4bfa1c1cf623a930bdfbaf1b8e76262
diff --git a/metadata/md5-cache/dev-lang/swi-prolog-7.1.8 b/metadata/md5-cache/dev-lang/swi-prolog-7.1.8
deleted file mode 100644
index 33ac58e02edf..000000000000
--- a/metadata/md5-cache/dev-lang/swi-prolog-7.1.8
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=sys-libs/ncurses archive? ( app-arch/libarchive ) zlib? ( sys-libs/zlib ) odbc? ( dev-db/unixODBC ) readline? ( sys-libs/readline ) gmp? ( dev-libs/gmp ) ssl? ( dev-libs/openssl ) java? ( >=virtual/jdk-1.4 ) X? ( virtual/jpeg x11-libs/libX11 x11-libs/libXft x11-libs/libXpm x11-libs/libXt x11-libs/libICE x11-libs/libSM ) X? ( x11-proto/xproto ) java? ( test? ( =dev-java/junit-3.8* ) ) java? ( >=dev-java/java-config-2.1.9-r1 )
-DESCRIPTION=free, small, and standard compliant Prolog compiler
-EAPI=4
-HOMEPAGE=http://www.swi-prolog.org/
-IUSE=archive debug doc +gmp hardened java minimal odbc +readline ssl static-libs test zlib X elibc_FreeBSD java
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=LGPL-2.1
-RDEPEND=sys-libs/ncurses archive? ( app-arch/libarchive ) zlib? ( sys-libs/zlib ) odbc? ( dev-db/unixODBC ) readline? ( sys-libs/readline ) gmp? ( dev-libs/gmp ) ssl? ( dev-libs/openssl ) java? ( >=virtual/jdk-1.4 ) X? ( virtual/jpeg x11-libs/libX11 x11-libs/libXft x11-libs/libXpm x11-libs/libXt x11-libs/libICE x11-libs/libSM ) java? ( >=dev-java/java-config-2.1.9-r1 )
-SLOT=0
-SRC_URI=http://www.swi-prolog.org/download/devel/src/pl-7.1.8.tar.gz mirror://gentoo/swi-prolog-7.1.8-gentoo-patchset-0.tar.gz
-_eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=35d708e2864c369e16011bd619709bac
diff --git a/metadata/md5-cache/dev-lang/swi-prolog-7.1.9 b/metadata/md5-cache/dev-lang/swi-prolog-7.1.9
deleted file mode 100644
index ab82683fb1c8..000000000000
--- a/metadata/md5-cache/dev-lang/swi-prolog-7.1.9
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=sys-libs/ncurses archive? ( app-arch/libarchive ) zlib? ( sys-libs/zlib ) odbc? ( dev-db/unixODBC ) readline? ( sys-libs/readline ) gmp? ( dev-libs/gmp ) ssl? ( dev-libs/openssl ) java? ( >=virtual/jdk-1.4 ) X? ( virtual/jpeg x11-libs/libX11 x11-libs/libXft x11-libs/libXpm x11-libs/libXt x11-libs/libICE x11-libs/libSM ) X? ( x11-proto/xproto ) java? ( test? ( =dev-java/junit-3.8* ) ) java? ( >=dev-java/java-config-2.1.9-r1 )
-DESCRIPTION=free, small, and standard compliant Prolog compiler
-EAPI=4
-HOMEPAGE=http://www.swi-prolog.org/
-IUSE=archive debug doc +gmp hardened java minimal odbc +readline ssl static-libs test zlib X elibc_FreeBSD java
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=LGPL-2.1
-RDEPEND=sys-libs/ncurses archive? ( app-arch/libarchive ) zlib? ( sys-libs/zlib ) odbc? ( dev-db/unixODBC ) readline? ( sys-libs/readline ) gmp? ( dev-libs/gmp ) ssl? ( dev-libs/openssl ) java? ( >=virtual/jdk-1.4 ) X? ( virtual/jpeg x11-libs/libX11 x11-libs/libXft x11-libs/libXpm x11-libs/libXt x11-libs/libICE x11-libs/libSM ) java? ( >=dev-java/java-config-2.1.9-r1 )
-SLOT=0
-SRC_URI=http://www.swi-prolog.org/download/devel/src/pl-7.1.9.tar.gz mirror://gentoo/swi-prolog-7.1.9-gentoo-patchset-1.tar.gz
-_eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=a5f710ec043ae60e24f438492484d1e0
diff --git a/metadata/md5-cache/dev-libs/efl-1.9.0 b/metadata/md5-cache/dev-libs/efl-1.9.3
similarity index 67%
rename from metadata/md5-cache/dev-libs/efl-1.9.0
rename to metadata/md5-cache/dev-libs/efl-1.9.3
index 25e6700d5238..dded4684ac6a 100644
--- a/metadata/md5-cache/dev-libs/efl-1.9.0
+++ b/metadata/md5-cache/dev-libs/efl-1.9.3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=!!dev-libs/ecore !!dev-libs/edbus !!dev-libs/eet !!dev-libs/eeze !!dev-libs/efreet !!dev-libs/eina !!dev-libs/eio !!dev-libs/embryo !!dev-libs/eobj !!dev-libs/ephysics !!media-libs/edje !!media-libs/emotion !!media-libs/ethumb !!media-libs/evas audio? ( media-libs/libsndfile ) debug? ( dev-util/valgrind ) fontconfig? ( media-libs/fontconfig ) fribidi? ( dev-libs/fribidi ) gif? ( media-libs/giflib ) glib? ( dev-libs/glib ) gnutls? ( net-libs/gnutls ) !gnutls? ( ssl? ( dev-libs/openssl ) ) gstreamer? ( =media-libs/gstreamer-0.10* =media-libs/gst-plugins-good-0.10* =media-plugins/gst-plugins-ffmpeg-0.10* ) harfbuzz? ( media-libs/harfbuzz ) ibus? ( app-i18n/ibus ) jp2k? ( media-libs/openjpeg ) jpeg? ( virtual/jpeg ) !oldlua? ( >=dev-lang/luajit-2.0.0 ) oldlua? ( dev-lang/lua ) physics? ( sci-physics/bullet ) pixman? ( x11-libs/pixman ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) scim? ( app-i18n/scim ) sdl? ( media-libs/libsdl virtual/opengl ) systemd? ( sys-apps/systemd ) tiff? ( media-libs/tiff ) tslib? ( x11-libs/tslib ) wayland? ( >=dev-libs/wayland-1.3.0 >=x11-libs/libxkbcommon-0.3.1 media-libs/mesa[gles2,wayland] ) webp? ( media-libs/libwebp ) X? ( x11-libs/libXcursor x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXp x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libXScrnSaver opengl? ( x11-libs/libX11 x11-libs/libXrender virtual/opengl ) gles? ( x11-libs/libX11 x11-libs/libXrender virtual/opengl ) ) xcb? ( x11-libs/libxcb opengl? ( x11-libs/libX11 x11-libs/libXrender virtual/opengl x11-libs/xcb-util-renderutil ) gles? ( x11-libs/libX11 x11-libs/libXrender virtual/opengl x11-libs/xcb-util-renderutil ) ) xine? ( >=media-libs/xine-lib-1.1.1 ) xpm? ( x11-libs/libXpm ) sys-apps/dbus >=sys-apps/util-linux-2.20.0 sys-libs/zlib !dev-libs/ecore !dev-libs/edbus !dev-libs/eet !dev-libs/eeze !dev-libs/efreet !dev-libs/eina !dev-libs/eio !dev-libs/embryo !dev-libs/eobj !dev-libs/ephysics !media-libs/edje !media-libs/emotion !media-libs/ethumb !media-libs/evas doc? ( app-doc/doxygen ) doc? ( app-doc/doxygen )
+DEPEND=!!dev-libs/ecore !!dev-libs/edbus !!dev-libs/eet !!dev-libs/eeze !!dev-libs/efreet !!dev-libs/eina !!dev-libs/eio !!dev-libs/embryo !!dev-libs/eobj !!dev-libs/ephysics !!media-libs/edje !!media-libs/emotion !!media-libs/ethumb !!media-libs/evas audio? ( media-libs/libsndfile ) debug? ( dev-util/valgrind ) fontconfig? ( media-libs/fontconfig ) fribidi? ( dev-libs/fribidi ) gif? ( media-libs/giflib ) glib? ( dev-libs/glib ) gnutls? ( net-libs/gnutls ) !gnutls? ( ssl? ( dev-libs/openssl ) ) gstreamer? ( =media-libs/gstreamer-0.10* =media-libs/gst-plugins-good-0.10* =media-plugins/gst-plugins-ffmpeg-0.10* ) harfbuzz? ( media-libs/harfbuzz ) ibus? ( app-i18n/ibus ) jp2k? ( media-libs/openjpeg ) jpeg? ( virtual/jpeg ) !oldlua? ( >=dev-lang/luajit-2.0.0 ) oldlua? ( dev-lang/lua ) physics? ( sci-physics/bullet ) pixman? ( x11-libs/pixman ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) scim? ( app-i18n/scim ) sdl? ( media-libs/libsdl virtual/opengl ) systemd? ( sys-apps/systemd ) tiff? ( media-libs/tiff ) tslib? ( x11-libs/tslib ) wayland? ( >=dev-libs/wayland-1.3.0 >=x11-libs/libxkbcommon-0.3.1 media-libs/mesa[gles2,wayland] ) webp? ( media-libs/libwebp ) X? ( x11-libs/libXcursor x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXp x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libXScrnSaver opengl? ( x11-libs/libX11 x11-libs/libXrender virtual/opengl ) gles? ( x11-libs/libX11 x11-libs/libXrender virtual/opengl ) ) xine? ( >=media-libs/xine-lib-1.1.1 ) xpm? ( x11-libs/libXpm ) sys-apps/dbus >=sys-apps/util-linux-2.20.0 sys-libs/zlib !dev-libs/ecore !dev-libs/edbus !dev-libs/eet !dev-libs/eeze !dev-libs/efreet !dev-libs/eina !dev-libs/eio !dev-libs/embryo !dev-libs/eobj !dev-libs/ephysics !media-libs/edje !media-libs/emotion !media-libs/ethumb !media-libs/evas doc? ( app-doc/doxygen ) doc? ( app-doc/doxygen )
 DESCRIPTION=Enlightenment Foundation Libraries all-in-one package
 EAPI=5
 HOMEPAGE=http://www.enlightenment.org/
-IUSE=audio +bmp debug drm +eet egl fbcon +fontconfig fribidi gif gles glib gnutls gstreamer harfbuzz +ico ibus jp2k +jpeg oldlua opengl ssl physics pixman +png +ppm +psd pulseaudio scim sdl systemd tga tiff tslib v4l2 wayland webp X xcb xim xine xpm nls doc
+IUSE=audio +bmp debug drm +eet egl fbcon +fontconfig fribidi gif gles glib gnutls gstreamer harfbuzz +ico ibus jp2k +jpeg oldlua opengl ssl physics pixman +png +ppm +psd pulseaudio scim sdl systemd tga tiff tslib v4l2 wayland webp X xim xine xpm nls doc
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=BSD-2 GPL-2 LGPL-2.1 ZLIB
-RDEPEND=audio? ( media-libs/libsndfile ) debug? ( dev-util/valgrind ) fontconfig? ( media-libs/fontconfig ) fribidi? ( dev-libs/fribidi ) gif? ( media-libs/giflib ) glib? ( dev-libs/glib ) gnutls? ( net-libs/gnutls ) !gnutls? ( ssl? ( dev-libs/openssl ) ) gstreamer? ( =media-libs/gstreamer-0.10* =media-libs/gst-plugins-good-0.10* =media-plugins/gst-plugins-ffmpeg-0.10* ) harfbuzz? ( media-libs/harfbuzz ) ibus? ( app-i18n/ibus ) jp2k? ( media-libs/openjpeg ) jpeg? ( virtual/jpeg ) !oldlua? ( >=dev-lang/luajit-2.0.0 ) oldlua? ( dev-lang/lua ) physics? ( sci-physics/bullet ) pixman? ( x11-libs/pixman ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) scim? ( app-i18n/scim ) sdl? ( media-libs/libsdl virtual/opengl ) systemd? ( sys-apps/systemd ) tiff? ( media-libs/tiff ) tslib? ( x11-libs/tslib ) wayland? ( >=dev-libs/wayland-1.3.0 >=x11-libs/libxkbcommon-0.3.1 media-libs/mesa[gles2,wayland] ) webp? ( media-libs/libwebp ) X? ( x11-libs/libXcursor x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXp x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libXScrnSaver opengl? ( x11-libs/libX11 x11-libs/libXrender virtual/opengl ) gles? ( x11-libs/libX11 x11-libs/libXrender virtual/opengl ) ) xcb? ( x11-libs/libxcb opengl? ( x11-libs/libX11 x11-libs/libXrender virtual/opengl x11-libs/xcb-util-renderutil ) gles? ( x11-libs/libX11 x11-libs/libXrender virtual/opengl x11-libs/xcb-util-renderutil ) ) xine? ( >=media-libs/xine-lib-1.1.1 ) xpm? ( x11-libs/libXpm ) sys-apps/dbus >=sys-apps/util-linux-2.20.0 sys-libs/zlib !dev-libs/ecore !dev-libs/edbus !dev-libs/eet !dev-libs/eeze !dev-libs/efreet !dev-libs/eina !dev-libs/eio !dev-libs/embryo !dev-libs/eobj !dev-libs/ephysics !media-libs/edje !media-libs/emotion !media-libs/ethumb !media-libs/evas nls? ( sys-devel/gettext )
-REQUIRED_USE=X? ( !xcb ) pulseaudio? ( audio ) opengl? ( || ( X xcb sdl wayland ) ) gles? ( || ( X xcb sdl wayland ) ) gles? ( egl ) xcb? ( pixman ) sdl? ( || ( opengl gles ) ) wayland? ( egl !opengl gles ) xim? ( || ( X xcb ) )
+RDEPEND=audio? ( media-libs/libsndfile ) debug? ( dev-util/valgrind ) fontconfig? ( media-libs/fontconfig ) fribidi? ( dev-libs/fribidi ) gif? ( media-libs/giflib ) glib? ( dev-libs/glib ) gnutls? ( net-libs/gnutls ) !gnutls? ( ssl? ( dev-libs/openssl ) ) gstreamer? ( =media-libs/gstreamer-0.10* =media-libs/gst-plugins-good-0.10* =media-plugins/gst-plugins-ffmpeg-0.10* ) harfbuzz? ( media-libs/harfbuzz ) ibus? ( app-i18n/ibus ) jp2k? ( media-libs/openjpeg ) jpeg? ( virtual/jpeg ) !oldlua? ( >=dev-lang/luajit-2.0.0 ) oldlua? ( dev-lang/lua ) physics? ( sci-physics/bullet ) pixman? ( x11-libs/pixman ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) scim? ( app-i18n/scim ) sdl? ( media-libs/libsdl virtual/opengl ) systemd? ( sys-apps/systemd ) tiff? ( media-libs/tiff ) tslib? ( x11-libs/tslib ) wayland? ( >=dev-libs/wayland-1.3.0 >=x11-libs/libxkbcommon-0.3.1 media-libs/mesa[gles2,wayland] ) webp? ( media-libs/libwebp ) X? ( x11-libs/libXcursor x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXp x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libXScrnSaver opengl? ( x11-libs/libX11 x11-libs/libXrender virtual/opengl ) gles? ( x11-libs/libX11 x11-libs/libXrender virtual/opengl ) ) xine? ( >=media-libs/xine-lib-1.1.1 ) xpm? ( x11-libs/libXpm ) sys-apps/dbus >=sys-apps/util-linux-2.20.0 sys-libs/zlib !dev-libs/ecore !dev-libs/edbus !dev-libs/eet !dev-libs/eeze !dev-libs/efreet !dev-libs/eina !dev-libs/eio !dev-libs/embryo !dev-libs/eobj !dev-libs/ephysics !media-libs/edje !media-libs/emotion !media-libs/ethumb !media-libs/evas nls? ( sys-devel/gettext )
+REQUIRED_USE=pulseaudio? ( audio ) opengl? ( || ( X sdl wayland ) ) gles? ( || ( X wayland ) ) gles? ( !sdl ) gles? ( egl ) sdl? ( opengl ) wayland? ( egl !opengl gles ) xim? ( X )
 SLOT=0
-SRC_URI=http://download.enlightenment.org/rel/libs/efl/efl-1.9.0.tar.bz2
+SRC_URI=http://download.enlightenment.org/rel/libs/efl/efl-1.9.3.tar.bz2
 _eclasses_=enlightenment	6aee6d669b6c495a4e151bd1bd85e57c	eutils	af81d52c25ec93fbdff71e0efb0de7b7	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=adc1691f50346e9e83e0d971f05de8e6
+_md5_=597ef82814bffd292715bbee15fba284
diff --git a/metadata/md5-cache/games-emulation/kigb-2.02 b/metadata/md5-cache/games-emulation/kigb-2.02
index 74343694cc63..f020a08bf960 100644
--- a/metadata/md5-cache/games-emulation/kigb-2.02
+++ b/metadata/md5-cache/games-emulation/kigb-2.02
@@ -1,11 +1,11 @@
 DEFINED_PHASES=compile install postinst preinst setup unpack
 DESCRIPTION=A Gameboy (GB, SGB, GBA) Emulator for Linux
-HOMEPAGE=http://kigb.emuunlim.com
+HOMEPAGE=http://kigb.emuunlim.com/
 KEYWORDS=-* x86
-LICENSE=as-is
+LICENSE=all-rights-reserved
 RDEPEND=x11-libs/libXext sys-libs/zlib dev-games/hawknl =virtual/libstdc++-3* games-misc/games-envd
-RESTRICT=strip
+RESTRICT=mirror bindist strip
 SLOT=0
-SRC_URI=mirror://gentoo/kigb-2.02.tar.gz
+SRC_URI=http://kigb.emuunlim.com/kigb_lin.tar.gz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	af81d52c25ec93fbdff71e0efb0de7b7	games	016d5de1968de77e56a90938ed6e5aba	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=42ac13c1518678f1e075a8eb77ec398a
+_md5_=225974ceb58150ce01e829ee1ec798fd
diff --git a/metadata/md5-cache/games-puzzle/triptych-demo-0 b/metadata/md5-cache/games-puzzle/triptych-demo-0
index 2f3487cee3f4..b65c8af168cd 100644
--- a/metadata/md5-cache/games-puzzle/triptych-demo-0
+++ b/metadata/md5-cache/games-puzzle/triptych-demo-0
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libXext media-libs/libsdl virtual/opengl
 DESCRIPTION=fast-paced tetris-like puzzler
 HOMEPAGE=http://www.chroniclogic.com/triptych.htm
 KEYWORDS=-* x86
-LICENSE=as-is
-RDEPEND=x11-libs/libXext media-libs/libsdl virtual/opengl games-misc/games-envd
-RESTRICT=strip
+LICENSE=all-rights-reserved
+RDEPEND=games-misc/games-envd
+RESTRICT=mirror bindist strip
 SLOT=0
-SRC_URI=http://www.chroniclogic.com/demo/triptych.tar.gz
+SRC_URI=http://s159260531.onlinehome.us/demos/triptych.tar.gz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	af81d52c25ec93fbdff71e0efb0de7b7	games	016d5de1968de77e56a90938ed6e5aba	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=89c8f16a8e2b81b77059e17f2947daef
+_md5_=311f255b713b4d3c466974dbe3976624
diff --git a/metadata/md5-cache/games-rpg/nwn-penultima-1 b/metadata/md5-cache/games-rpg/nwn-penultima-1
index d0d1d6feae78..1d06d6197d39 100644
--- a/metadata/md5-cache/games-rpg/nwn-penultima-1
+++ b/metadata/md5-cache/games-rpg/nwn-penultima-1
@@ -3,9 +3,9 @@ DEPEND=app-arch/unzip
 DESCRIPTION=A parodic fantasy module for Neverwinter Nights
 HOMEPAGE=http://pixelscapes.com/penultima
 KEYWORDS=-* amd64 x86
-LICENSE=as-is
+LICENSE=freedist
 RDEPEND=games-rpg/nwn games-misc/games-envd
 SLOT=0
 SRC_URI=http://c.vnfiles.ign.com/nwvault.ign.com/fms/files/modules/1661/Penultima_0_Penultima_City.zip http://c.vnfiles.ign.com/nwvault.ign.com/fms/files/modules/1665/Penultima_1_Pest_Control.zip http://c.vnfiles.ign.com/nwvault.ign.com/fms/files/modules/1667/Penultima_2_Deweys_Decimal.zip http://c.vnfiles.ign.com/nwvault.ign.com/fms/files/modules/1669/Penultima_3_Hazard_Pay.zip http://c.vnfiles.ign.com/nwvault.ign.com/fms/files/modules/1671/Penultima_4_Clucking_Hositle.zip http://c.vnfiles.ign.com/nwvault.ign.com/fms/files/modules/1673/Penultima_5_Home_Sweet_Home.zip
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	af81d52c25ec93fbdff71e0efb0de7b7	games	016d5de1968de77e56a90938ed6e5aba	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=b15bc3436ca120f4bbfd6b6cd26cc278
+_md5_=0db67a4270684ae2fec72cf596e47b30
diff --git a/metadata/md5-cache/games-rpg/nwn-penultima-1-r1 b/metadata/md5-cache/games-rpg/nwn-penultima-1-r1
index 583c3eb0796e..2eadd7037258 100644
--- a/metadata/md5-cache/games-rpg/nwn-penultima-1-r1
+++ b/metadata/md5-cache/games-rpg/nwn-penultima-1-r1
@@ -3,9 +3,9 @@ DEPEND=app-arch/unzip
 DESCRIPTION=A parodic fantasy module for Neverwinter Nights
 HOMEPAGE=http://pixelscapes.com/penultima
 KEYWORDS=-* ~amd64 x86
-LICENSE=as-is
+LICENSE=freedist
 RDEPEND=games-rpg/nwn games-misc/games-envd
 SLOT=0
 SRC_URI=http://c.vnfiles.ign.com/nwvault.ign.com/fms/files/modules/1661/Penultima_0_Penultima_City.zip http://c.vnfiles.ign.com/nwvault.ign.com/fms/files/modules/1665/Penultima_1_Pest_Control.zip http://c.vnfiles.ign.com/nwvault.ign.com/fms/files/modules/1667/Penultima_2_Deweys_Decimal.zip http://c.vnfiles.ign.com/nwvault.ign.com/fms/files/modules/1669/Penultima_3_Hazard_Pay.zip http://c.vnfiles.ign.com/nwvault.ign.com/fms/files/modules/1671/Penultima_4_Clucking_Hositle.zip http://c.vnfiles.ign.com/nwvault.ign.com/fms/files/modules/1673/Penultima_5_Home_Sweet_Home.zip
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	af81d52c25ec93fbdff71e0efb0de7b7	games	016d5de1968de77e56a90938ed6e5aba	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=d048648baa7a420631a2fe862e1ca112
+_md5_=54de292f6d27c5707c90ab570521ef3f
diff --git a/metadata/md5-cache/mate-base/mate-applets-1.8.0 b/metadata/md5-cache/mate-base/mate-applets-1.8.0
new file mode 100644
index 000000000000..afbb0e0d7ce2
--- /dev/null
+++ b/metadata/md5-cache/mate-base/mate-applets-1.8.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
+DEPEND=python_single_target_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] app-text/rarian:0 dev-libs/atk:0 >=dev-libs/dbus-glib-0.74:0 >=dev-libs/glib-2.22:2 >=dev-libs/libmateweather-1.6.1:0 >=dev-libs/libxml2-2.5:2 dev-python/pygobject:3 >=gnome-base/libgtop-2.11.92:2 >=mate-base/mate-desktop-1.6:0 >=mate-base/mate-panel-1.8:0 >=mate-base/mate-settings-daemon-1.6:0 >=sys-apps/dbus-1.1.2:0 sys-power/cpufrequtils:0 >=sys-power/upower-0.9.4:0 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.24:2 >=x11-libs/libnotify-0.7:0 x11-libs/libX11:0 >=x11-libs/libxklavier-4:0 >=x11-libs/libwnck-2.30:1 x11-libs/pango:0 >=x11-themes/mate-icon-theme-1.6:0 virtual/libintl:0 networkmanager? ( >=net-misc/networkmanager-0.7:0 ) policykit? ( >=sys-auth/polkit-0.92:0 ) app-text/docbook-xml-dtd:4.3 >=app-text/scrollkeeper-dtd-1:1.0 app-text/yelp-tools:0 >=dev-util/intltool-0.35:* dev-libs/libxslt:0 >=mate-base/mate-common-1.6:0 sys-devel/gettext:* virtual/pkgconfig:* app-arch/xz-utils >=sys-apps/sed-4
+DESCRIPTION=Applets for the MATE Desktop and Panel
+EAPI=5
+HOMEPAGE=http://mate-desktop.org
+IUSE=X ipv6 networkmanager policykit python_targets_python2_6 python_targets_python2_7 python_single_target_python2_6 python_single_target_python2_7
+KEYWORDS=~amd64
+LICENSE=GPL-2 FDL-1.1 LGPL-2
+RDEPEND=python_single_target_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] app-text/rarian:0 dev-libs/atk:0 >=dev-libs/dbus-glib-0.74:0 >=dev-libs/glib-2.22:2 >=dev-libs/libmateweather-1.6.1:0 >=dev-libs/libxml2-2.5:2 dev-python/pygobject:3 >=gnome-base/libgtop-2.11.92:2 >=mate-base/mate-desktop-1.6:0 >=mate-base/mate-panel-1.8:0 >=mate-base/mate-settings-daemon-1.6:0 >=sys-apps/dbus-1.1.2:0 sys-power/cpufrequtils:0 >=sys-power/upower-0.9.4:0 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.24:2 >=x11-libs/libnotify-0.7:0 x11-libs/libX11:0 >=x11-libs/libxklavier-4:0 >=x11-libs/libwnck-2.30:1 x11-libs/pango:0 >=x11-themes/mate-icon-theme-1.6:0 virtual/libintl:0 networkmanager? ( >=net-misc/networkmanager-0.7:0 ) policykit? ( >=sys-auth/polkit-0.92:0 )
+SLOT=0
+SRC_URI=http://pub.mate-desktop.org/releases/1.8/mate-applets-1.8.0.tar.xz
+_eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	python-single-r1	82a55861314bbcedaf1e08ed4dd651b3	python-utils-r1	30d5d7986d3f80d0f2c2726366426859	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=73b9056a50378989136115ab2c0a6e67
diff --git a/metadata/md5-cache/mate-base/mate-session-manager-1.8.1 b/metadata/md5-cache/mate-base/mate-session-manager-1.8.1
new file mode 100644
index 000000000000..9f2ee4e89274
--- /dev/null
+++ b/metadata/md5-cache/mate-base/mate-session-manager-1.8.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
+DEPEND=>=dev-libs/dbus-glib-0.76:0 >=dev-libs/glib-2.25:2 dev-libs/libxslt:0 sys-apps/dbus:0 x11-apps/xdpyinfo:0 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.14:2 x11-libs/libICE:0 x11-libs/libSM:0 x11-libs/libX11:0 x11-libs/libXau:0 x11-libs/libXext:0 x11-libs/libXrender:0 x11-libs/libXtst:0 x11-libs/pango:0 x11-libs/xtrans:0 x11-misc/xdg-user-dirs:0 x11-misc/xdg-user-dirs-gtk:0 virtual/libintl:0 elibc_FreeBSD? ( dev-libs/libexecinfo:0 ) gnome-keyring? ( gnome-base/gnome-keyring:0 ) upower? ( >=sys-power/upower-0.9.0:0 ) >=dev-util/intltool-0.40:* >=dev-lang/perl-5:0 >=mate-base/mate-common-1.6:0 >=sys-devel/gettext-0.10.40:* virtual/pkgconfig:* !<gnome-base/gdm-2.20.4:0 systemd? ( sys-apps/systemd:0 ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
+DESCRIPTION=MATE session manager
+EAPI=5
+HOMEPAGE=http://mate-desktop.org/
+IUSE=ipv6 elibc_FreeBSD gnome-keyring systemd upower debug
+KEYWORDS=~amd64
+LICENSE=GPL-2 LGPL-2 FDL-1.1
+RDEPEND=>=dev-libs/dbus-glib-0.76:0 >=dev-libs/glib-2.25:2 dev-libs/libxslt:0 sys-apps/dbus:0 x11-apps/xdpyinfo:0 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.14:2 x11-libs/libICE:0 x11-libs/libSM:0 x11-libs/libX11:0 x11-libs/libXau:0 x11-libs/libXext:0 x11-libs/libXrender:0 x11-libs/libXtst:0 x11-libs/pango:0 x11-libs/xtrans:0 x11-misc/xdg-user-dirs:0 x11-misc/xdg-user-dirs-gtk:0 virtual/libintl:0 elibc_FreeBSD? ( dev-libs/libexecinfo:0 ) gnome-keyring? ( gnome-base/gnome-keyring:0 ) upower? ( >=sys-power/upower-0.9.0:0 )
+SLOT=0
+SRC_URI=http://pub.mate-desktop.org/releases/1.8/mate-session-manager-1.8.1.tar.xz
+_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	af81d52c25ec93fbdff71e0efb0de7b7	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=3e2e26d56849c2c33c82cd423ad88bed
diff --git a/metadata/md5-cache/mate-base/mate-settings-daemon-1.8.0 b/metadata/md5-cache/mate-base/mate-settings-daemon-1.8.0
new file mode 100644
index 000000000000..d2858658e127
--- /dev/null
+++ b/metadata/md5-cache/mate-base/mate-settings-daemon-1.8.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
+DEPEND=>=dev-libs/dbus-glib-0.74:0 >=dev-libs/glib-2.17.3:2 >=mate-base/libmatekbd-1.6.1:0 >=mate-base/mate-desktop-1.6:0 media-libs/fontconfig:1.0 >=gnome-base/dconf-0.13.4:0 x11-libs/cairo:0 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.24:2 x11-libs/libX11:0 x11-libs/libXi:0 x11-libs/libXext:0 x11-libs/libXxf86misc:0 >=x11-libs/libxklavier-5:0 virtual/libintl:0 libnotify? ( >=x11-libs/libnotify-0.7:0 ) policykit? ( >=dev-libs/dbus-glib-0.71:0 >=sys-apps/dbus-1.1.2:0 >=sys-auth/polkit-0.97:0 ) pulseaudio? ( media-libs/libcanberra:0[gtk] >=media-sound/pulseaudio-0.9.15:0 ) !pulseaudio? ( >=media-libs/gstreamer-0.10.1.2:0.10 >=media-libs/gst-plugins-base-0.10.1.2:0.10 ) smartcard? ( >=dev-libs/nss-3.11.2:0 ) >=dev-util/intltool-0.37.1:0 sys-devel/gettext:0 virtual/pkgconfig:0 x11-proto/inputproto:0 x11-proto/xproto:0 app-arch/xz-utils >=sys-apps/sed-4
+DESCRIPTION=MATE Settings Daemon
+EAPI=5
+HOMEPAGE=http://mate-desktop.org
+IUSE=X debug libnotify policykit pulseaudio smartcard debug
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/dbus-glib-0.74:0 >=dev-libs/glib-2.17.3:2 >=mate-base/libmatekbd-1.6.1:0 >=mate-base/mate-desktop-1.6:0 media-libs/fontconfig:1.0 >=gnome-base/dconf-0.13.4:0 x11-libs/cairo:0 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.24:2 x11-libs/libX11:0 x11-libs/libXi:0 x11-libs/libXext:0 x11-libs/libXxf86misc:0 >=x11-libs/libxklavier-5:0 virtual/libintl:0 libnotify? ( >=x11-libs/libnotify-0.7:0 ) policykit? ( >=dev-libs/dbus-glib-0.71:0 >=sys-apps/dbus-1.1.2:0 >=sys-auth/polkit-0.97:0 ) pulseaudio? ( media-libs/libcanberra:0[gtk] >=media-sound/pulseaudio-0.9.15:0 ) !pulseaudio? ( >=media-libs/gstreamer-0.10.1.2:0.10 >=media-libs/gst-plugins-base-0.10.1.2:0.10 ) smartcard? ( >=dev-libs/nss-3.11.2:0 )
+SLOT=0
+SRC_URI=http://pub.mate-desktop.org/releases/1.8/mate-settings-daemon-1.8.0.tar.xz
+_eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=8e7101324e966ae6c6af8e6333b0b31e
diff --git a/metadata/md5-cache/media-libs/elementary-1.7.8 b/metadata/md5-cache/media-libs/elementary-1.7.8
deleted file mode 100644
index cc7384d672d6..000000000000
--- a/metadata/md5-cache/media-libs/elementary-1.7.8
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=>=dev-libs/ecore-1.7.8[evas,fbcon?,opengl?,sdl?,X?,xcb?] >=dev-libs/eet-1.7.8 >=media-libs/evas-1.7.8[fbcon?,opengl?,X?,xcb?] >=media-libs/edje-1.7.8 dbus? ( >=dev-libs/e_dbus-1.7.6 ) emotion? ( >=media-libs/emotion-1.7.6 ) ethumb? ( >=media-libs/ethumb-1.7.6 ) xdg? ( >=dev-libs/efreet-1.7.8 ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool doc? ( app-doc/doxygen )
-DESCRIPTION=Basic widget set, based on EFL for mobile touch-screen devices.
-EAPI=2
-HOMEPAGE=http://trac.enlightenment.org/e/wiki/Elementary
-IUSE=dbus debug emotion ethumb examples fbcon opengl quicklaunch sdl X xcb xdg static-libs nls doc
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-libs/ecore-1.7.8[evas,fbcon?,opengl?,sdl?,X?,xcb?] >=dev-libs/eet-1.7.8 >=media-libs/evas-1.7.8[fbcon?,opengl?,X?,xcb?] >=media-libs/edje-1.7.8 dbus? ( >=dev-libs/e_dbus-1.7.6 ) emotion? ( >=media-libs/emotion-1.7.6 ) ethumb? ( >=media-libs/ethumb-1.7.6 ) xdg? ( >=dev-libs/efreet-1.7.8 ) nls? ( sys-devel/gettext )
-SLOT=0
-SRC_URI=http://download.enlightenment.org/releases/elementary-1.7.8.tar.bz2
-_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	enlightenment	6aee6d669b6c495a4e151bd1bd85e57c	eutils	af81d52c25ec93fbdff71e0efb0de7b7	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=b00398b70660aa79f13863e7c9d8490e
diff --git a/metadata/md5-cache/media-libs/elementary-1.9.0 b/metadata/md5-cache/media-libs/elementary-1.9.3
similarity index 72%
rename from metadata/md5-cache/media-libs/elementary-1.9.0
rename to metadata/md5-cache/media-libs/elementary-1.9.3
index e6082946220d..0e6a498af307 100644
--- a/metadata/md5-cache/media-libs/elementary-1.9.0
+++ b/metadata/md5-cache/media-libs/elementary-1.9.3
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=>=dev-libs/efl-1.9.0_beta2[sdl?,png,wayland?,X?] doc? ( app-doc/doxygen )
+DEPEND=>=dev-libs/efl-1.9.2[sdl?,png,wayland?,X?] doc? ( app-doc/doxygen )
 DESCRIPTION=Basic widget set, based on EFL for mobile touch-screen devices.
 EAPI=3
 HOMEPAGE=http://trac.enlightenment.org/e/wiki/Elementary
 IUSE=debug examples fbcon quicklaunch sdl wayland X static-libs nls doc
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=LGPL-2.1
-RDEPEND=>=dev-libs/efl-1.9.0_beta2[sdl?,png,wayland?,X?] nls? ( sys-devel/gettext )
+RDEPEND=>=dev-libs/efl-1.9.2[sdl?,png,wayland?,X?] nls? ( sys-devel/gettext )
 SLOT=0
-SRC_URI=http://download.enlightenment.org/rel/libs/elementary/elementary-1.9.0.tar.bz2
+SRC_URI=http://download.enlightenment.org/rel/libs/elementary/elementary-1.9.3.tar.bz2
 _eclasses_=enlightenment	6aee6d669b6c495a4e151bd1bd85e57c	eutils	af81d52c25ec93fbdff71e0efb0de7b7	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=5d056d89762f13dd5c2403a45e761696
+_md5_=a8591b802b553f819df16708d84ae1db
diff --git a/metadata/md5-cache/media-radio/qsstv-8.2.7 b/metadata/md5-cache/media-radio/qsstv-8.2.7
new file mode 100644
index 000000000000..0dc6925d6f00
--- /dev/null
+++ b/metadata/md5-cache/media-radio/qsstv-8.2.7
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare unpack
+DEPEND=dev-qt/qtcore:4[qt3support] dev-qt/qtgui:4 media-libs/hamlib media-libs/jasper media-libs/alsa-lib sci-libs/fftw:3.0
+DESCRIPTION=Amateur radio SSTV software
+EAPI=5
+HOMEPAGE=http://users.telenet.be/on4qz/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-qt/qtcore:4[qt3support] dev-qt/qtgui:4 media-libs/hamlib media-libs/jasper media-libs/alsa-lib sci-libs/fftw:3.0 x11-misc/xdg-utils
+SLOT=0
+SRC_URI=http://users.telenet.be/on4qz/qsstv/downloads/qsstv_8.2.7.tar.gz
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	af81d52c25ec93fbdff71e0efb0de7b7	multilib	fac675dcccf94392371a6abee62d909f	qmake-utils	6f4ff01a55830f6d86647dc56dfaf3a7	qt4-r2	25e4f17ed047d9242cb40b70acfb2943	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=70b51c837b9be31afcae2a54c717066f
diff --git a/metadata/md5-cache/media-sound/gnome-music-3.10.4 b/metadata/md5-cache/media-sound/gnome-music-3.10.4
new file mode 100644
index 000000000000..fc7c3981d8ce
--- /dev/null
+++ b/metadata/md5-cache/media-sound/gnome-music-3.10.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
+DEPEND=python_single_target_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) dev-lang/python-exec:=[python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_single_target_python3_2(+)?,python_single_target_python3_3(+)?] >=dev-libs/glib-2.28:2 >=dev-libs/gobject-introspection-1.35.9 >=media-libs/grilo-0.2.6:0.2[introspection] >=x11-libs/gtk+-3.9:3[introspection] >=dev-util/intltool-0.26 virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4
+DESCRIPTION=Music management for Gnome
+EAPI=5
+HOMEPAGE=http://wiki.gnome.org/Apps/Music
+IUSE=python_single_target_python3_2 +python_single_target_python3_3 python_targets_python3_2 python_targets_python3_3 python_single_target_python3_2 python_single_target_python3_3
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=python_single_target_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) dev-lang/python-exec:=[python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_single_target_python3_2(+)?,python_single_target_python3_3(+)?] >=dev-libs/glib-2.28:2 >=dev-libs/gobject-introspection-1.35.9 >=media-libs/grilo-0.2.6:0.2[introspection] >=x11-libs/gtk+-3.9:3[introspection] app-misc/tracker[introspection(+)] || ( app-misc/tracker[gstreamer] app-misc/tracker[xine] ) dev-python/pygobject:3[cairo,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_single_target_python3_2(+)?,python_single_target_python3_3(+)?] dev-python/dbus-python[python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_single_target_python3_2(+)?,python_single_target_python3_3(+)?] media-libs/gstreamer:1.0[introspection] media-libs/gst-plugins-base:1.0[introspection] media-plugins/gst-plugins-meta:1.0 media-plugins/grilo-plugins:0.2[tracker]
+REQUIRED_USE=python_single_target_python3_2? ( python_targets_python3_2 ) python_single_target_python3_3? ( python_targets_python3_3 ) ^^ ( python_single_target_python3_2 python_single_target_python3_3 )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-music/3.10/gnome-music-3.10.4.tar.xz
+_eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	python-single-r1	82a55861314bbcedaf1e08ed4dd651b3	python-utils-r1	30d5d7986d3f80d0f2c2726366426859	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=c3de040e889021f5815dede1e0f20a34
diff --git a/metadata/md5-cache/media-video/vcdgear-1.76-r2 b/metadata/md5-cache/media-video/vcdgear-1.76-r2
index 2d6c50095326..682523b5ccf9 100644
--- a/metadata/md5-cache/media-video/vcdgear-1.76-r2
+++ b/metadata/md5-cache/media-video/vcdgear-1.76-r2
@@ -3,8 +3,9 @@ DESCRIPTION=extract MPEG streams from CD images, convert VCD files to MPEG, corr
 EAPI=2
 HOMEPAGE=http://www.vcdgear.com/
 KEYWORDS=-* amd64 x86
-LICENSE=as-is
+LICENSE=all-rights-reserved
 RDEPEND=virtual/libstdc++:3.3
+RESTRICT=mirror bindist
 SLOT=0
 SRC_URI=http://www.vcdgear.com/files/vcdgear176-040415_linux.tar.gz
-_md5_=19290795ddaafdc74156fe678c1dc658
+_md5_=50291146d7289b6c3ae1618e824d9329
diff --git a/metadata/md5-cache/net-fs/samba-4.1.7 b/metadata/md5-cache/net-fs/samba-4.1.7
new file mode 100644
index 000000000000..847088bb7d5b
--- /dev/null
+++ b/metadata/md5-cache/net-fs/samba-4.1.7
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test unpack
+DEPEND=python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] >=app-crypt/heimdal-1.5[-ssl] dev-libs/iniparser dev-libs/libaio dev-libs/popt sys-libs/readline virtual/libiconv dev-python/subunit sys-apps/attr sys-libs/libcap >=sys-libs/ntdb-1.0[python] >=sys-libs/ldb-1.1.16 >=sys-libs/tdb-1.2.11[python] >=sys-libs/talloc-2.0.8[python] >=sys-libs/tevent-0.9.18 sys-libs/zlib virtual/pam acl? ( virtual/acl ) addns? ( net-dns/bind-tools[gssapi] ) cluster? ( >=dev-db/ctdb-1.0.114_p1 ) cups? ( net-print/cups ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gnutls? ( dev-libs/libgcrypt:0 >=net-libs/gnutls-1.4.0 ) ldap? ( net-nds/openldap ) selinux? ( sec-policy/selinux-samba ) virtual/pkgconfig userland_GNU? ( >=sys-apps/coreutils-8.5 ) dev-lang/python !dev-lang/python[-threads] virtual/pkgconfig
+DESCRIPTION=Samba Suite Version 4
+EAPI=5
+HOMEPAGE=http://www.samba.org/
+IUSE=acl addns ads aio avahi client cluster cups dmapi fam gnutls iprint ldap quota selinux syslog test winbind python_targets_python2_6 python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] >=app-crypt/heimdal-1.5[-ssl] dev-libs/iniparser dev-libs/libaio dev-libs/popt sys-libs/readline virtual/libiconv dev-python/subunit sys-apps/attr sys-libs/libcap >=sys-libs/ntdb-1.0[python] >=sys-libs/ldb-1.1.16 >=sys-libs/tdb-1.2.11[python] >=sys-libs/talloc-2.0.8[python] >=sys-libs/tevent-0.9.18 sys-libs/zlib virtual/pam acl? ( virtual/acl ) addns? ( net-dns/bind-tools[gssapi] ) cluster? ( >=dev-db/ctdb-1.0.114_p1 ) cups? ( net-print/cups ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gnutls? ( dev-libs/libgcrypt:0 >=net-libs/gnutls-1.4.0 ) ldap? ( net-nds/openldap ) selinux? ( sec-policy/selinux-samba ) client? ( net-fs/cifs-utils[ads?] )
+REQUIRED_USE=ads? ( acl ldap )
+RESTRICT=mirror
+SLOT=0
+SRC_URI=mirror://samba/stable/samba-4.1.7.tar.gz
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	af81d52c25ec93fbdff71e0efb0de7b7	linux-info	90944ede7e9761bd7ef07602acdef9e3	multibuild	576bde67ccb00fe7175a23755deb2e66	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	f6a00e248ffeb4404b67a7a7645446c5	python-utils-r1	30d5d7986d3f80d0f2c2726366426859	systemd	9f063b2cc19c5e8030911372aa246c4e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	waf-utils	8ba4703b0e4f03e42a8f6e7b8aabd9e6
+_md5_=0b0fe9d2d7cd3e640d1100da42e58ba4
diff --git a/metadata/md5-cache/sci-mathematics/octave-3.8.1-r1 b/metadata/md5-cache/sci-mathematics/octave-3.8.1-r1
index 0b9c40ee2f7d..be9ce5a4c30b 100644
--- a/metadata/md5-cache/sci-mathematics/octave-3.8.1-r1
+++ b/metadata/md5-cache/sci-mathematics/octave-3.8.1-r1
@@ -1,4 +1,4 @@
-DEFINED_PHASES=compile configure install preinst prepare pretend setup test
+DEFINED_PHASES=compile configure install preinst prepare setup test
 DEPEND=app-text/ghostscript-gpl dev-libs/libpcre:3= sys-libs/ncurses:5= virtual/lapack curl? ( net-misc/curl:0= ) fftw? ( sci-libs/fftw:3.0= ) glpk? ( sci-mathematics/glpk:0= ) gnuplot? ( sci-visualization/gnuplot ) gui? ( x11-libs/qscintilla:0= ) hdf5? ( sci-libs/hdf5:0= ) imagemagick? ( || ( media-gfx/graphicsmagick:0=[cxx] media-gfx/imagemagick:0=[cxx] ) ) jit? ( sys-devel/llvm ) opengl? ( media-libs/freetype:2= media-libs/fontconfig:1.0= >=x11-libs/fltk-1.3:1=[opengl] x11-libs/gl2ps:0= virtual/glu ) postscript? ( app-text/epstool media-gfx/pstoedit media-gfx/transfig ) qhull? ( media-libs/qhull:0= ) qrupdate? ( sci-libs/qrupdate:0= ) readline? ( sys-libs/readline:0= ) sparse? ( sci-libs/arpack:0= sci-libs/camd:0= sci-libs/ccolamd:0= sci-libs/cholmod:0= sci-libs/colamd:0= sci-libs/cxsparse:0= sci-libs/umfpack:0= ) X? ( x11-libs/libX11:0= ) zlib? ( sys-libs/zlib:0= ) qrupdate? ( app-misc/pax-utils ) sparse? ( app-misc/pax-utils ) doc? ( virtual/latex-base dev-texlive/texlive-genericrecommended dev-texlive/texlive-metapost sys-apps/texinfo ) dev-util/gperf virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/fortran java? ( >=dev-java/java-config-2.1.9-r1 )
 DESCRIPTION=High-level interactive language for numerical computations
 EAPI=5
@@ -10,4 +10,4 @@ RDEPEND=app-text/ghostscript-gpl dev-libs/libpcre:3= sys-libs/ncurses:5= virtual
 SLOT=0/3.8.1
 SRC_URI=mirror://gnu/octave/octave-3.8.1.tar.bz2
 _eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	autotools-utils	fb74970befc9b65ceec689d2ccff3022	eutils	af81d52c25ec93fbdff71e0efb0de7b7	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	fortran-2	db8710b355fc5598015c4bc3aad3bdb0	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	pax-utils	2424f959506320f5196de8f79fa05297	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=30d66d1d8c6f1a87ffe942cbd83a172d
+_md5_=2d99eb65985a2b2857bcd0bd711b9a6f
diff --git a/metadata/md5-cache/sys-cluster/openmpi-1.7.5 b/metadata/md5-cache/sys-cluster/openmpi-1.7.5
index 19f8ce9b0ecc..29f08a1069a0 100644
--- a/metadata/md5-cache/sys-cluster/openmpi-1.7.5
+++ b/metadata/md5-cache/sys-cluster/openmpi-1.7.5
@@ -1,14 +1,14 @@
 DEFINED_PHASES=configure install prepare setup test
-DEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/mpiexec dev-libs/libevent >=sys-apps/hwloc-1.6 cuda? ( dev-util/nvidia-cuda-toolkit ) elibc_FreeBSD? ( dev-libs/libexecinfo ) openmpi_fabrics_ofed? ( sys-infiniband/ofed ) openmpi_fabrics_knem? ( sys-cluster/knem ) openmpi_fabrics_open-mx? ( sys-cluster/open-mx ) openmpi_fabrics_psm? ( sys-infiniband/infinipath-psm ) openmpi_rm_pbs? ( sys-cluster/torque ) openmpi_rm_slurm? ( sys-cluster/slurm ) openmpi_ofed_features_rdmacm? ( sys-infiniband/librdmacm ) fortran? ( virtual/fortran )
+DEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/mpiexec dev-libs/libevent >=sys-apps/hwloc-1.7.2 cuda? ( dev-util/nvidia-cuda-toolkit ) elibc_FreeBSD? ( dev-libs/libexecinfo ) openmpi_fabrics_ofed? ( sys-infiniband/ofed ) openmpi_fabrics_knem? ( sys-cluster/knem ) openmpi_fabrics_open-mx? ( sys-cluster/open-mx ) openmpi_fabrics_psm? ( sys-infiniband/infinipath-psm ) openmpi_rm_pbs? ( sys-cluster/torque ) openmpi_rm_slurm? ( sys-cluster/slurm ) openmpi_ofed_features_rdmacm? ( sys-infiniband/librdmacm ) fortran? ( virtual/fortran )
 DESCRIPTION=A high-performance message passing library (MPI)
 EAPI=5
 HOMEPAGE=http://www.open-mpi.org
 IUSE=cma cuda +cxx elibc_FreeBSD fortran heterogeneous ipv6 mpi-threads romio threads vt openmpi_fabrics_ofed openmpi_fabrics_knem openmpi_fabrics_open-mx openmpi_fabrics_psm openmpi_rm_pbs openmpi_rm_slurm openmpi_ofed_features_control-hdr-padding openmpi_ofed_features_connectx-xrc openmpi_ofed_features_rdmacm openmpi_ofed_features_dynamic-sl openmpi_ofed_features_failover
 KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux
 LICENSE=BSD
-RDEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/mpiexec dev-libs/libevent >=sys-apps/hwloc-1.6 cuda? ( dev-util/nvidia-cuda-toolkit ) elibc_FreeBSD? ( dev-libs/libexecinfo ) openmpi_fabrics_ofed? ( sys-infiniband/ofed ) openmpi_fabrics_knem? ( sys-cluster/knem ) openmpi_fabrics_open-mx? ( sys-cluster/open-mx ) openmpi_fabrics_psm? ( sys-infiniband/infinipath-psm ) openmpi_rm_pbs? ( sys-cluster/torque ) openmpi_rm_slurm? ( sys-cluster/slurm ) openmpi_ofed_features_rdmacm? ( sys-infiniband/librdmacm ) fortran? ( virtual/fortran )
+RDEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/mpiexec dev-libs/libevent >=sys-apps/hwloc-1.7.2 cuda? ( dev-util/nvidia-cuda-toolkit ) elibc_FreeBSD? ( dev-libs/libexecinfo ) openmpi_fabrics_ofed? ( sys-infiniband/ofed ) openmpi_fabrics_knem? ( sys-cluster/knem ) openmpi_fabrics_open-mx? ( sys-cluster/open-mx ) openmpi_fabrics_psm? ( sys-infiniband/infinipath-psm ) openmpi_rm_pbs? ( sys-cluster/torque ) openmpi_rm_slurm? ( sys-cluster/slurm ) openmpi_ofed_features_rdmacm? ( sys-infiniband/librdmacm ) fortran? ( virtual/fortran )
 REQUIRED_USE=openmpi_rm_slurm? ( !openmpi_rm_pbs ) openmpi_rm_pbs? ( !openmpi_rm_slurm ) openmpi_fabrics_psm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_control-hdr-padding? ( openmpi_fabrics_ofed ) openmpi_ofed_features_connectx-xrc? ( openmpi_fabrics_ofed ) openmpi_ofed_features_rdmacm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_dynamic-sl? ( openmpi_fabrics_ofed ) openmpi_ofed_features_failover? ( openmpi_fabrics_ofed )
 SLOT=0
 SRC_URI=http://www.open-mpi.org/software/ompi/v1.7/downloads/openmpi-1.7.5.tar.bz2
 _eclasses_=cuda	9be39ddb95b9b07ec931f30628d40757	eutils	af81d52c25ec93fbdff71e0efb0de7b7	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	fortran-2	db8710b355fc5598015c4bc3aad3bdb0	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=e74c6bcd62d6ef97fcbf7dcd526b25e5
+_md5_=121acfb8a40b330753609b640e94df75
diff --git a/metadata/md5-cache/sys-cluster/openmpi-1.8 b/metadata/md5-cache/sys-cluster/openmpi-1.8
index bce620c44154..fe2254a876f2 100644
--- a/metadata/md5-cache/sys-cluster/openmpi-1.8
+++ b/metadata/md5-cache/sys-cluster/openmpi-1.8
@@ -1,14 +1,14 @@
 DEFINED_PHASES=configure install prepare setup test
-DEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/mpiexec dev-libs/libevent >=sys-apps/hwloc-1.6 cuda? ( dev-util/nvidia-cuda-toolkit ) elibc_FreeBSD? ( dev-libs/libexecinfo ) openmpi_fabrics_ofed? ( sys-infiniband/ofed ) openmpi_fabrics_knem? ( sys-cluster/knem ) openmpi_fabrics_open-mx? ( sys-cluster/open-mx ) openmpi_fabrics_psm? ( sys-infiniband/infinipath-psm ) openmpi_rm_pbs? ( sys-cluster/torque ) openmpi_rm_slurm? ( sys-cluster/slurm ) openmpi_ofed_features_rdmacm? ( sys-infiniband/librdmacm ) fortran? ( virtual/fortran )
+DEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/mpiexec dev-libs/libevent >=sys-apps/hwloc-1.7.2 cuda? ( dev-util/nvidia-cuda-toolkit ) elibc_FreeBSD? ( dev-libs/libexecinfo ) openmpi_fabrics_ofed? ( sys-infiniband/ofed ) openmpi_fabrics_knem? ( sys-cluster/knem ) openmpi_fabrics_open-mx? ( sys-cluster/open-mx ) openmpi_fabrics_psm? ( sys-infiniband/infinipath-psm ) openmpi_rm_pbs? ( sys-cluster/torque ) openmpi_rm_slurm? ( sys-cluster/slurm ) openmpi_ofed_features_rdmacm? ( sys-infiniband/librdmacm ) fortran? ( virtual/fortran )
 DESCRIPTION=A high-performance message passing library (MPI)
 EAPI=5
 HOMEPAGE=http://www.open-mpi.org
 IUSE=cma cuda +cxx elibc_FreeBSD fortran heterogeneous ipv6 mpi-threads romio threads vt openmpi_fabrics_ofed openmpi_fabrics_knem openmpi_fabrics_open-mx openmpi_fabrics_psm openmpi_rm_pbs openmpi_rm_slurm openmpi_ofed_features_control-hdr-padding openmpi_ofed_features_connectx-xrc openmpi_ofed_features_udcm openmpi_ofed_features_rdmacm openmpi_ofed_features_dynamic-sl openmpi_ofed_features_failover
 KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux
 LICENSE=BSD
-RDEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/mpiexec dev-libs/libevent >=sys-apps/hwloc-1.6 cuda? ( dev-util/nvidia-cuda-toolkit ) elibc_FreeBSD? ( dev-libs/libexecinfo ) openmpi_fabrics_ofed? ( sys-infiniband/ofed ) openmpi_fabrics_knem? ( sys-cluster/knem ) openmpi_fabrics_open-mx? ( sys-cluster/open-mx ) openmpi_fabrics_psm? ( sys-infiniband/infinipath-psm ) openmpi_rm_pbs? ( sys-cluster/torque ) openmpi_rm_slurm? ( sys-cluster/slurm ) openmpi_ofed_features_rdmacm? ( sys-infiniband/librdmacm ) fortran? ( virtual/fortran )
+RDEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/mpiexec dev-libs/libevent >=sys-apps/hwloc-1.7.2 cuda? ( dev-util/nvidia-cuda-toolkit ) elibc_FreeBSD? ( dev-libs/libexecinfo ) openmpi_fabrics_ofed? ( sys-infiniband/ofed ) openmpi_fabrics_knem? ( sys-cluster/knem ) openmpi_fabrics_open-mx? ( sys-cluster/open-mx ) openmpi_fabrics_psm? ( sys-infiniband/infinipath-psm ) openmpi_rm_pbs? ( sys-cluster/torque ) openmpi_rm_slurm? ( sys-cluster/slurm ) openmpi_ofed_features_rdmacm? ( sys-infiniband/librdmacm ) fortran? ( virtual/fortran )
 REQUIRED_USE=openmpi_rm_slurm? ( !openmpi_rm_pbs ) openmpi_rm_pbs? ( !openmpi_rm_slurm ) openmpi_fabrics_psm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_control-hdr-padding? ( openmpi_fabrics_ofed ) openmpi_ofed_features_connectx-xrc? ( openmpi_fabrics_ofed ) openmpi_ofed_features_udcm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_rdmacm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_dynamic-sl? ( openmpi_fabrics_ofed ) openmpi_ofed_features_failover? ( openmpi_fabrics_ofed )
 SLOT=0
 SRC_URI=http://www.open-mpi.org/software/ompi/v1.8/downloads/openmpi-1.8.tar.bz2
 _eclasses_=cuda	9be39ddb95b9b07ec931f30628d40757	eutils	af81d52c25ec93fbdff71e0efb0de7b7	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	fortran-2	db8710b355fc5598015c4bc3aad3bdb0	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=6e9b9ee20797efb709b8fe45bccf4a8d
+_md5_=51c6551d1b21be417261667c583e4cff
diff --git a/metadata/md5-cache/sys-libs/ntdb-1.0 b/metadata/md5-cache/sys-libs/ntdb-1.0
new file mode 100644
index 000000000000..84b7c5629e11
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/ntdb-1.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=!<net-fs/samba-4.1.7 python? ( python_single_target_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) app-text/docbook-xml-dtd:4.2 dev-lang/python !dev-lang/python[-threads]
+DESCRIPTION=A not-so trivial keyword/data database system
+EAPI=5
+HOMEPAGE=http://tdb.samba.org/
+IUSE=python python_targets_python2_6 python_targets_python2_7 python_single_target_python2_6 python_single_target_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=python? ( python_single_target_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] )
+REQUIRED_USE=python? ( python_single_target_python2_6? ( python_targets_python2_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) ^^ ( python_single_target_python2_6 python_single_target_python2_7 ) )
+SLOT=0
+SRC_URI=http://samba.org/ftp/tdb/ntdb-1.0.tar.gz
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	af81d52c25ec93fbdff71e0efb0de7b7	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-single-r1	82a55861314bbcedaf1e08ed4dd651b3	python-utils-r1	30d5d7986d3f80d0f2c2726366426859	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	waf-utils	8ba4703b0e4f03e42a8f6e7b8aabd9e6
+_md5_=9d1af0ccb1e2e1e098b00a4633c847cf
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-331.49 b/metadata/md5-cache/x11-drivers/nvidia-drivers-331.49
deleted file mode 100644
index 33fe9f3a9117..000000000000
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-331.49
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare prerm pretend setup unpack
-DEPEND=app-admin/eselect-opencl kernel_linux? ( >=sys-libs/glibc-2.6.1 ) X? ( >=app-admin/eselect-opengl-1.0.9 ) app-arch/xz-utils kernel_linux? ( virtual/linux-sources ) kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) sys-apps/pciutils virtual/pkgconfig
-DESCRIPTION=NVIDIA Accelerated Graphics Driver
-EAPI=5
-HOMEPAGE=http://www.nvidia.com/
-IUSE=acpi multilib kernel_FreeBSD kernel_linux pax_kernel +tools +X uvm kernel_linux
-KEYWORDS=-* amd64 x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=GPL-2 NVIDIA-r2
-RDEPEND=app-admin/eselect-opencl kernel_linux? ( >=sys-libs/glibc-2.6.1 ) X? ( >=app-admin/eselect-opengl-1.0.9 ) acpi? ( sys-power/acpid ) tools? ( dev-libs/atk dev-libs/glib x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/pango[X] ) X? ( <x11-base/xorg-server-1.15.99 >=x11-libs/libvdpau-0.3-r1 multilib? ( || ( ( x11-libs/libX11[abi_x86_32] x11-libs/libXext[abi_x86_32] ) app-emulation/emul-linux-x86-xlibs ) ) ) kernel_linux? ( virtual/modutils )
-REQUIRED_USE=tools? ( X )
-RESTRICT=bindist mirror strip
-SLOT=0
-SRC_URI=amd64-fbsd? ( http://us.download.nvidia.com/XFree86/FreeBSD-x86_64/331.49/NVIDIA-FreeBSD-x86_64-331.49.tar.gz ) amd64? ( http://us.download.nvidia.com/XFree86/Linux-x86_64/331.49/NVIDIA-Linux-x86_64-331.49.run ) x86-fbsd? ( http://us.download.nvidia.com/XFree86/FreeBSD-x86/331.49/NVIDIA-FreeBSD-x86-331.49.tar.gz ) x86? ( http://us.download.nvidia.com/XFree86/Linux-x86/331.49/NVIDIA-Linux-x86-331.49.run )
-_eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	linux-info	90944ede7e9761bd7ef07602acdef9e3	linux-mod	101302d4b7b694ea9622bbffb187d0de	multilib	fac675dcccf94392371a6abee62d909f	nvidia-driver	92e88a2e33d056779baa88f1061c662e	portability	536c5e70c5fb252ed3b769e04aa3f05b	readme.gentoo	be2652cdd5c20f4689ccb4769072ea99	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	udev	a9a8d051efb42bfe884c1db82ce161de	unpacker	60422068bae2b3406a8a40db45ab5b95	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=62ea70d9cfdfe27f86b4c9ccecbb0a2b
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-334.21 b/metadata/md5-cache/x11-drivers/nvidia-drivers-334.21
deleted file mode 100644
index 771511d146a0..000000000000
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-334.21
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare prerm pretend setup unpack
-DEPEND=app-admin/eselect-opencl kernel_linux? ( >=sys-libs/glibc-2.6.1 ) X? ( >=app-admin/eselect-opengl-1.0.9 ) app-arch/xz-utils kernel_linux? ( virtual/linux-sources ) kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) sys-apps/pciutils virtual/pkgconfig
-DESCRIPTION=NVIDIA Accelerated Graphics Driver
-EAPI=5
-HOMEPAGE=http://www.nvidia.com/
-IUSE=acpi multilib kernel_FreeBSD kernel_linux pax_kernel +tools +X uvm kernel_linux
-KEYWORDS=-* amd64 x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=GPL-2 NVIDIA-r2
-RDEPEND=app-admin/eselect-opencl kernel_linux? ( >=sys-libs/glibc-2.6.1 ) X? ( >=app-admin/eselect-opengl-1.0.9 ) acpi? ( sys-power/acpid ) tools? ( dev-libs/atk dev-libs/glib x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/pango[X] ) X? ( <x11-base/xorg-server-1.15.99 >=x11-libs/libvdpau-0.3-r1 multilib? ( || ( ( x11-libs/libX11[abi_x86_32] x11-libs/libXext[abi_x86_32] ) app-emulation/emul-linux-x86-xlibs ) ) ) kernel_linux? ( virtual/modutils )
-REQUIRED_USE=tools? ( X )
-RESTRICT=bindist mirror strip
-SLOT=0
-SRC_URI=amd64-fbsd? ( http://us.download.nvidia.com/XFree86/FreeBSD-x86_64/334.21/NVIDIA-FreeBSD-x86_64-334.21.tar.gz ) amd64? ( http://us.download.nvidia.com/XFree86/Linux-x86_64/334.21/NVIDIA-Linux-x86_64-334.21.run ) x86-fbsd? ( http://us.download.nvidia.com/XFree86/FreeBSD-x86/334.21/NVIDIA-FreeBSD-x86-334.21.tar.gz ) x86? ( http://us.download.nvidia.com/XFree86/Linux-x86/334.21/NVIDIA-Linux-x86-334.21.run )
-_eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	linux-info	90944ede7e9761bd7ef07602acdef9e3	linux-mod	101302d4b7b694ea9622bbffb187d0de	multilib	fac675dcccf94392371a6abee62d909f	nvidia-driver	92e88a2e33d056779baa88f1061c662e	portability	536c5e70c5fb252ed3b769e04aa3f05b	readme.gentoo	be2652cdd5c20f4689ccb4769072ea99	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	udev	a9a8d051efb42bfe884c1db82ce161de	unpacker	60422068bae2b3406a8a40db45ab5b95	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=b765bd450ab9bf2ceba06c9cf9472244
diff --git a/metadata/md5-cache/x11-libs/goffice-0.10.0 b/metadata/md5-cache/x11-libs/goffice-0.10.0
deleted file mode 100644
index 8568fcb0ad78..000000000000
--- a/metadata/md5-cache/x11-libs/goffice-0.10.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=app-text/libspectre-0.2.6:= >=dev-libs/glib-2.28.0:2 >=gnome-base/librsvg-2.22.0:2 >=gnome-extra/libgsf-1.14.9:= >=dev-libs/libxml2-2.4.12:2 >=x11-libs/pango-1.24.0:= >=x11-libs/cairo-1.10.0:=[svg] x11-libs/libXext:= x11-libs/libXrender:= >=x11-libs/gdk-pixbuf-2.22.0:2 >=x11-libs/gtk+-3.0.0:3 introspection? ( >=dev-libs/gobject-introspection-1.0.0:= >=gnome-extra/libgsf-1.14.23:= ) virtual/pkgconfig >=dev-util/intltool-0.35 >=dev-util/gtk-doc-am-1.12 app-arch/xz-utils >=sys-apps/sed-4
-DESCRIPTION=A library of document-centric objects and utilities
-EAPI=5
-HOMEPAGE=http://git.gnome.org/browse/goffice/
-IUSE=+introspection
-KEYWORDS=alpha amd64 ~arm ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris
-LICENSE=GPL-2
-RDEPEND=>=app-text/libspectre-0.2.6:= >=dev-libs/glib-2.28.0:2 >=gnome-base/librsvg-2.22.0:2 >=gnome-extra/libgsf-1.14.9:= >=dev-libs/libxml2-2.4.12:2 >=x11-libs/pango-1.24.0:= >=x11-libs/cairo-1.10.0:=[svg] x11-libs/libXext:= x11-libs/libXrender:= >=x11-libs/gdk-pixbuf-2.22.0:2 >=x11-libs/gtk+-3.0.0:3 introspection? ( >=dev-libs/gobject-introspection-1.0.0:= >=gnome-extra/libgsf-1.14.23:= )
-SLOT=0.10
-SRC_URI=mirror://gnome/sources/goffice/0.10/goffice-0.10.0.tar.xz
-_eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=658a2e2fd87743cfae7e635c135d52c5
diff --git a/metadata/md5-cache/x11-libs/goffice-0.10.14 b/metadata/md5-cache/x11-libs/goffice-0.10.14
new file mode 100644
index 000000000000..f2431b983e52
--- /dev/null
+++ b/metadata/md5-cache/x11-libs/goffice-0.10.14
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
+DEPEND=>=app-text/libspectre-0.2.6:= >=dev-libs/glib-2.28:2 dev-libs/libxslt >=gnome-base/librsvg-2.22:2 >=gnome-extra/libgsf-1.14.9:=[introspection?] >=dev-libs/libxml2-2.4.12:2 >=x11-libs/pango-1.24:= >=x11-libs/cairo-1.10:=[svg] x11-libs/libXext:= x11-libs/libXrender:= >=x11-libs/gdk-pixbuf-2.22:2 >=x11-libs/gtk+-3.2:3 introspection? ( >=dev-libs/gobject-introspection-1:= >=gnome-extra/libgsf-1.14.23:= ) >=dev-util/gtk-doc-am-1.12 >=dev-util/intltool-0.35 virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4
+DESCRIPTION=A library of document-centric objects and utilities
+EAPI=5
+HOMEPAGE=http://git.gnome.org/browse/goffice/
+IUSE=+introspection
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris
+LICENSE=GPL-2
+RDEPEND=>=app-text/libspectre-0.2.6:= >=dev-libs/glib-2.28:2 dev-libs/libxslt >=gnome-base/librsvg-2.22:2 >=gnome-extra/libgsf-1.14.9:=[introspection?] >=dev-libs/libxml2-2.4.12:2 >=x11-libs/pango-1.24:= >=x11-libs/cairo-1.10:=[svg] x11-libs/libXext:= x11-libs/libXrender:= >=x11-libs/gdk-pixbuf-2.22:2 >=x11-libs/gtk+-3.2:3 introspection? ( >=dev-libs/gobject-introspection-1:= >=gnome-extra/libgsf-1.14.23:= )
+SLOT=0.10
+SRC_URI=mirror://gnome/sources/goffice/0.10/goffice-0.10.14.tar.xz
+_eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=144a92bef930ab9aaa8fdd4613a090e1
diff --git a/metadata/md5-cache/x11-terms/mate-terminal-1.8.0 b/metadata/md5-cache/x11-terms/mate-terminal-1.8.0
new file mode 100644
index 000000000000..6a46021ff81a
--- /dev/null
+++ b/metadata/md5-cache/x11-terms/mate-terminal-1.8.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
+DEPEND=app-text/rarian:0 dev-libs/atk:0 >=dev-libs/glib-2.25:2 >=gnome-base/dconf-0.10:0 >=mate-base/mate-desktop-1.6:0 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.18:2 x11-libs/libICE:0 x11-libs/libSM:0 x11-libs/libX11:0 x11-libs/pango:0 >=x11-libs/vte-0.27.1:0 >=app-text/scrollkeeper-dtd-1:1.0 app-text/yelp-tools:0 >=dev-util/intltool-0.40:* sys-devel/gettext:* virtual/pkgconfig:* app-arch/xz-utils >=sys-apps/sed-4
+DESCRIPTION=The MATE Terminal
+EAPI=5
+HOMEPAGE=http://mate-desktop.org
+KEYWORDS=~amd64
+LICENSE=GPL-3
+RDEPEND=app-text/rarian:0 dev-libs/atk:0 >=dev-libs/glib-2.25:2 >=gnome-base/dconf-0.10:0 >=mate-base/mate-desktop-1.6:0 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.18:2 x11-libs/libICE:0 x11-libs/libSM:0 x11-libs/libX11:0 x11-libs/pango:0 >=x11-libs/vte-0.27.1:0
+SLOT=0
+SRC_URI=http://pub.mate-desktop.org/releases/1.8/mate-terminal-1.8.0.tar.xz
+_eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=a93b6b8447d3e20319af03c6bd821498
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 44acc4a414ff..371515dc75bd 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Thu, 17 Apr 2014 12:07:06 +0000
+Thu, 17 Apr 2014 17:07:05 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 112a16e95943..34b1940d0335 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Thu Apr 17 12:07:03 UTC 2014
+Thu Apr 17 17:07:02 UTC 2014
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 4a9d5c7b2521..20c08f953e8d 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Thu, 17 Apr 2014 12:30:01 +0000
+Thu, 17 Apr 2014 17:30:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index c6254ad59def..303e4f76900f 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1397736301 Thu 17 Apr 2014 12:05:01 PM UTC UTC
+1397754301 Thu 17 Apr 2014 05:05:01 PM UTC UTC
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index fd766ac5e231..8513dc578452 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -5,4 +5,5 @@ DIST samba-3.6.23.tar.gz 34122387 SHA256 25bbfa81b9a26609a0be744240b63e1f5030bbc
 DIST samba-4.0.16.tar.gz 22113747 SHA256 50f45bb2c90fdef958d959b1c6bbac57731238e268301d5fc5e9bf304b62ed15 SHA512 e449e228a1603d78401d1ee4adced0f3911dbc3a07f19ed65d571d304a457c65fa7f190815513cd365b15fae29760c6230b0c2803df31ea0f43213fb79675981 WHIRLPOOL 89b9688f8e2bc04a65fd8edd8a3af780e6a1fa4029d089928ec8cbd9572e9d3b8d6fc1a6b25d103ada39ce72151cdf5059e83517766aea777912f958d19bfaf5
 DIST samba-4.0.17.tar.gz 22126553 SHA256 6775cc093dc1f5b4feec3b47b458b78ad44f14de11f4bc8838b69e86d1ddf6ed SHA512 507561d122d0628b95b6e5837d175d951e535523be6a519836390651cb552b4a7f695e3bd519bdee22bf5287e3981c8f042c15197ea47071f8213b5b4ed83adb WHIRLPOOL a99771797c4903173c701f0b726e22bae9efc19e9dc4e460923cff97ef5a6ee7d6637c68fbf43e87ed62d9ce0e2aa399f430e96494881ab05eaae02023ffe37b
 DIST samba-4.1.6.tar.gz 23177462 SHA256 6d3b25cb70acbd75352e1a6039093689ded373f6ac755c207635416786532e6b SHA512 3eaca534c475d57962088df6a23ae7230e05da4696b5b9314a6f21bff669bfd50c7f2abf04eb62462d69866545c8429f01d9886014c526eacf4009d81c8d7ff8 WHIRLPOOL b4d0e76be8740c54df07bb7e134c4727127be87df710cbd1b3e872c27a6b57bcb8499d2f4990eaff52031dd97280c654c995c2d58c43f101a840ab6a81b94e8b
+DIST samba-4.1.7.tar.gz 23187644 SHA256 15a0ccc2fd90166c4231574f4f1a1229769be2cc4da7af9c16304e8659529d89 SHA512 fc6fe651da34f27e4d7dd2c500b9c1d9de8190fc095021c492c32890c8682b50c8f2fccdb02f9bbaf832239b67b67d1af7d992009c2f2cf1912a11469ed291c1 WHIRLPOOL e9e9c83542144bd52863fbab4f6c7ec0cfcd75cc04e716849ebc74094c06b2ad8feb4e1d9eee883dbd7c3b91ed2463631d6c29b02e4d5f9d1ac85a3a347edea3
 DIST smb_traffic_analyzer_v2.diff.bz2 12226 SHA256 1bae7eafbe8ac2382313d5ab9d43d73ba64b63a714f0f588516952d476fb868d SHA512 aa0e457a0dd282e61e6dfcd5705c29b319832dca9711b1b5baf8373e2f079991399c3537c050219ccb861a93f86353ebff677a5c625d2e3f1f3a13ee5c4087d0 WHIRLPOOL 85ee72a360f67ebe71be5cd400ecd635280a0d7c64ebb8b94656a5ef1a94f74a987de86408af00ce1b81cc8363b1b3cf14726860d29b72ee610d4bab73d6b139
diff --git a/net-fs/samba/samba-4.1.7.ebuild b/net-fs/samba/samba-4.1.7.ebuild
new file mode 100644
index 000000000000..79cfb65fba19
--- /dev/null
+++ b/net-fs/samba/samba-4.1.7.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-4.1.7.ebuild,v 1.2 2014/04/17 13:08:07 polynomial-c Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_{6,7} )
+
+inherit python-r1 waf-utils multilib linux-info systemd
+
+MY_PV="${PV/_rc/rc}"
+MY_P="${PN}-${MY_PV}"
+
+SRC_URI="mirror://samba/stable/${MY_P}.tar.gz"
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="Samba Suite Version 4"
+HOMEPAGE="http://www.samba.org/"
+LICENSE="GPL-3"
+
+SLOT="0"
+
+IUSE="acl addns ads aio avahi client cluster cups dmapi fam gnutls iprint
+ldap quota selinux syslog test winbind"
+
+# sys-apps/attr is an automagic dependency (see bug #489748)
+# dev-libs/libaio is an automagic dependency (see bug #489764)
+# sys-libs/pam is an automagic dependency (see bug #489770)
+CDEPEND="${PYTHON_DEPS}
+	>=app-crypt/heimdal-1.5[-ssl]
+	dev-libs/iniparser
+	dev-libs/libaio
+	dev-libs/popt
+	sys-libs/readline
+	virtual/libiconv
+	dev-python/subunit
+	sys-apps/attr
+	sys-libs/libcap
+	>=sys-libs/ntdb-1.0[python]
+	>=sys-libs/ldb-1.1.16
+	>=sys-libs/tdb-1.2.11[python]
+	>=sys-libs/talloc-2.0.8[python]
+	>=sys-libs/tevent-0.9.18
+	sys-libs/zlib
+	virtual/pam
+	acl? ( virtual/acl )
+	addns? ( net-dns/bind-tools[gssapi] )
+	cluster? ( >=dev-db/ctdb-1.0.114_p1 )
+	cups? ( net-print/cups )
+	dmapi? ( sys-apps/dmapi )
+	fam? ( virtual/fam )
+	gnutls? ( dev-libs/libgcrypt:0
+		>=net-libs/gnutls-1.4.0 )
+	ldap? ( net-nds/openldap )
+	selinux? ( sec-policy/selinux-samba )"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+	client? ( net-fs/cifs-utils[ads?] )"
+
+REQUIRED_USE="ads? ( acl ldap )"
+
+RESTRICT="mirror"
+
+S="${WORKDIR}/${MY_P}"
+
+CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
+
+# sys-apps/dmapi is an automagic dependency (see bug #474492)
+PATCHES=(
+	"${FILESDIR}/${PN}-4.1.0-remove-dmapi-automagic.patch"
+	"${FILESDIR}/named.conf.dlz.patch"
+)
+
+WAF_BINARY="${S}/buildtools/bin/waf"
+
+pkg_setup() {
+	python_export_best
+	if use aio; then
+		if ! linux_config_exists || ! linux_chkconfig_present AIO; then
+				ewarn "You must enable AIO support in your kernel config, "
+				ewarn "to be able to support asynchronous I/O. "
+				ewarn "You can find it at"
+				ewarn
+				ewarn "General Support"
+				ewarn " Enable AIO support "
+				ewarn
+				ewarn "and recompile your kernel..."
+		fi
+	fi
+}
+
+src_configure() {
+	local myconf=''
+	use "cluster" && myconf+=" --with-ctdb-dir=/usr"
+	use "test" && myconf+=" --enable-selftest"
+	myconf="${myconf} \
+		--enable-fhs \
+		--sysconfdir=/etc \
+		--localstatedir=/var \
+		--with-modulesdir=/usr/$(get_libdir)/samba \
+		--with-pammodulesdir=/$(get_libdir)/security \
+		--with-piddir=/var/run/${PN} \
+		--disable-rpath \
+		--disable-rpath-install \
+		--nopyc \
+		--nopyo \
+		--bundled-libraries=NONE \
+		--builtin-libraries=NONE \
+		$(use_with addns dnsupdate) \
+		$(use_with acl acl-support) \
+		$(use_with ads) \
+		$(use_with aio aio-support) \
+		$(use_enable avahi) \
+		$(use_with cluster cluster-support) \
+		$(use_enable cups) \
+		$(use_with dmapi) \
+		$(use_with fam) \
+		$(use_enable gnutls) \
+		$(use_enable iprint) \
+		$(use_with ldap) \
+		--with-pam \
+		--with-pam_smbpass \
+		$(use_with quota quotas) \
+		$(use_with syslog) \
+		$(use_with winbind)
+		"
+	use "ads" && myconf+=" --with-shared-modules=idmap_ad"
+
+	CPPFLAGS="-I/usr/include/et ${CPPFLAGS}" \
+		waf-utils_src_configure ${myconf}
+}
+
+src_install() {
+	waf-utils_src_install
+
+	# install ldap schema for server (bug #491002)
+	if use ldap ; then
+		insinto /etc/openldap/schema
+		doins examples/LDAP/samba.schema
+	fi
+
+	# Make all .so files executable
+	find "${D}" -type f -name "*.so" -exec chmod +x {} +
+
+	# Install init script and conf.d file
+	newinitd "${CONFDIR}/samba4.initd-r1" samba
+	newconfd "${CONFDIR}/samba4.confd" samba
+
+	systemd_dotmpfilesd "${FILESDIR}"/samba.conf
+	systemd_dounit "${FILESDIR}"/nmbd.service
+	systemd_dounit "${FILESDIR}"/smbd.{service,socket}
+	systemd_newunit "${FILESDIR}"/smbd_at.service 'smbd@.service'
+	systemd_dounit "${FILESDIR}"/winbindd.service
+	systemd_dounit "${FILESDIR}"/samba.service
+}
+
+src_test() {
+	"${WAF_BINARY}" test || die "test failed"
+}
+
+pkg_postinst() {
+	ewarn "Be aware the this release contains the best of all of Samba's"
+	ewarn "technology parts, both a file server (that you can reasonably expect"
+	ewarn "to upgrade existing Samba 3.x releases to) and the AD domain"
+	ewarn "controller work previously known as 'samba4'."
+
+	elog "For further information and migration steps make sure to read "
+	elog "http://samba.org/samba/history/${P}.html "
+	elog "http://samba.org/samba/history/${PN}-4.0.0.html and"
+	elog "http://wiki.samba.org/index.php/Samba4/HOWTO "
+}
diff --git a/profiles/arch/alpha/use.stable.mask b/profiles/arch/alpha/use.stable.mask
index dcedd5a1e6a2..5073910d228b 100644
--- a/profiles/arch/alpha/use.stable.mask
+++ b/profiles/arch/alpha/use.stable.mask
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/alpha/use.stable.mask,v 1.2 2014/04/17 07:47:59 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/alpha/use.stable.mask,v 1.3 2014/04/17 13:01:46 pacho Exp $
 
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in use.mask
@@ -9,6 +9,7 @@
 # Dropped stable keywords after the discussion caused by
 # Gnome 3.8/3.10 stabilization on this arch   
 dia
+gnumeric
 
 # Pacho Ramos <pacho@gentoo.org> (13 Apr 2014)
 # Not going to be stabilized on this arch
diff --git a/profiles/arch/ia64/use.stable.mask b/profiles/arch/ia64/use.stable.mask
index 183ec6abfbb3..9b2b8d08c25a 100644
--- a/profiles/arch/ia64/use.stable.mask
+++ b/profiles/arch/ia64/use.stable.mask
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/ia64/use.stable.mask,v 1.2 2014/04/17 07:47:59 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/ia64/use.stable.mask,v 1.3 2014/04/17 13:01:46 pacho Exp $
 
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in use.mask
@@ -9,6 +9,7 @@
 # Dropped stable keywords after the discussion caused by
 # Gnome 3.8/3.10 stabilization on this arch   
 dia
+gnumeric
 
 # Pacho Ramos <pacho@gentoo.org> (13 Apr 2014)
 # Not going to be stabilized on this arch
diff --git a/profiles/arch/powerpc/use.stable.mask b/profiles/arch/powerpc/use.stable.mask
index 05759f2517cd..75cb76050d4f 100644
--- a/profiles/arch/powerpc/use.stable.mask
+++ b/profiles/arch/powerpc/use.stable.mask
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/powerpc/use.stable.mask,v 1.2 2014/04/17 07:48:00 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/powerpc/use.stable.mask,v 1.3 2014/04/17 13:01:46 pacho Exp $
 
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in use.mask
@@ -9,6 +9,7 @@
 # Dropped stable keywords after the discussion caused by
 # Gnome 3.8/3.10 stabilization on this arch
 dia
+gnumeric
 
 # Pacho Ramos <pacho@gentoo.org> (13 Apr 2014)
 # Not going to be stabilized on this arch
diff --git a/profiles/arch/sparc/use.stable.mask b/profiles/arch/sparc/use.stable.mask
index 45a3e13dddb5..8eeb18403cc9 100644
--- a/profiles/arch/sparc/use.stable.mask
+++ b/profiles/arch/sparc/use.stable.mask
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/sparc/use.stable.mask,v 1.2 2014/04/17 07:48:00 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/sparc/use.stable.mask,v 1.3 2014/04/17 13:01:46 pacho Exp $
 
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in use.mask
@@ -9,6 +9,7 @@
 # Dropped stable keywords after the discussion caused by
 # Gnome 3.8/3.10 stabilization on this arch   
 dia
+gnumeric
 
 # Pacho Ramos <pacho@gentoo.org> (13 Apr 2014)
 # Not going to be stabilized on this arch
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index cbb65343bca5..d05f8058641a 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -897,7 +897,6 @@ app-office/abiword:goffice - Enable goffice plugin
 app-office/abiword:grammar - Enable grammar checking via dev-libs/link-grammar
 app-office/abiword:map - Enable world map support through media-libs/libchamplain
 app-office/abiword:math - Enable support for x11-libs/gtkmathview
-app-office/abiword:openxml - Enable OpenXML support
 app-office/abiword:ots - Enable Text Summarizer plugin
 app-office/abiword:plugins - Enable plugins build (see http://www.abisource.com/wiki/PluginMatrix for more information). If your file cannot be opened due lack of support, try enabling this.
 app-office/abiword:redland - Enables support redland and raptor libs.
@@ -922,7 +921,6 @@ app-office/glabels:barcode - Enable barcode support through external libraries.
 app-office/gnucash:chipcard - Enable support for chipcard reading and processing.
 app-office/gnucash:hbci - Enable HBCI support, for connecting to some internet banks
 app-office/gnucash:quotes - Enable Online Stock Quote retrieval
-app-office/gnucash:webkit - Use net-libs/webkit-gtk for rendering rather than gnome-extra/gtkhtml
 app-office/gnumeric:libgda - Enable database support through gnome-extra/libgda.
 app-office/gnumeric:perl - Enable perl plugin loader.
 app-office/gnumeric:python - Enable python plugin loader.
@@ -3058,6 +3056,7 @@ mate-base/mate-file-manager:mate - Install x11-themes/mate-icon-theme which is n
 mate-base/mate-file-manager:unique - Enable single instance support using dev-libs/libunique.
 mate-base/mate-keyring:gpg-agent - Include GPG agent in mate-keyring.
 mate-base/mate-keyring:ssh-agent - Include SSH agent in mate-keyring.
+mate-base/mate-session-manager:upower - Suspend and hibernate using sys-power/upower.
 mate-extra/mate-file-manager-sendto:gajim - Enables support for net-im/gajim
 mate-extra/mate-file-manager-sendto:mail - Enables support for mailto using gnome-extra/evolution-data-server
 mate-extra/mate-file-manager-sendto:pidgin - Enables support for net-im/pidgin
diff --git a/sci-mathematics/octave/octave-3.8.1-r1.ebuild b/sci-mathematics/octave/octave-3.8.1-r1.ebuild
index dedbbb76fd05..95a8ab33b49b 100644
--- a/sci-mathematics/octave/octave-3.8.1-r1.ebuild
+++ b/sci-mathematics/octave/octave-3.8.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-3.8.1-r1.ebuild,v 1.2 2014/04/16 15:51:09 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-3.8.1-r1.ebuild,v 1.3 2014/04/17 16:02:52 bicatali Exp $
 
 EAPI=5
 
@@ -78,38 +78,6 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-3.8.1-pkgbuilddir.patch
 )
 
-pkg_pretend() {
-	# do we really need this test? it looks a deficiency of our framework
-	if use qrupdate || use sparse; then
-		local blaslib=$($(tc-getPKG_CONFIG) --libs-only-l blas \
-			| sed -e 's@-l\([^ \t]*\)@lib\1@' | cut -d' ' -f 1)
-		einfo "Checking linear algebra dependencies for ${blaslib}"
-		local libdir="${EROOT%/}/usr/$(get_libdir)"
-		local lib failed_libs libs=( )
-		use qrupdate && libs+=( "${libdir}"/libqrupdate.so )
-		use sparse && libs+=(
-			"${libdir}"/libarpack.so
-			"${libdir}"/libcholmod.so
-			"${libdir}"/libumfpack.so
-		)
-		for lib in ${libs[@]}; do
-			# linked with the current blas?
-			if ! scanelf -n ${lib} | grep -q "${blaslib}"; then
-				# linked with some blas or lapack library?
-				if ! scanelf -n ${lib} | egrep -q "blas|lapack"; then
-					failed_libs="${failed_libs} ${lib}"
-				fi
-			fi
-		done
-		if [[ -n ${failed_libs} ]]; then
-			eerror "${failed_libs} must be rebuilt with ${blaslib}"
-			eerror "Try re-installing ${failed_libs}"
-			die "check of blas/lapack consistency failed"
-		fi
-	fi
-
-}
-
 src_prepare() {
 	# nasty prefix hacks for fltk:1 and qt4 linking
 	if use prefix; then
diff --git a/sys-cluster/openmpi/openmpi-1.7.5.ebuild b/sys-cluster/openmpi/openmpi-1.7.5.ebuild
index d240b6d95f17..4b44dea1e52b 100644
--- a/sys-cluster/openmpi/openmpi-1.7.5.ebuild
+++ b/sys-cluster/openmpi/openmpi-1.7.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/openmpi-1.7.5.ebuild,v 1.1 2014/04/08 09:45:34 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/openmpi-1.7.5.ebuild,v 1.2 2014/04/17 14:59:46 jsbronder Exp $
 
 EAPI=5
 
@@ -57,7 +57,7 @@ RDEPEND="
 	!sys-cluster/mpich2
 	!sys-cluster/mpiexec
 	dev-libs/libevent
-	>=sys-apps/hwloc-1.6
+	>=sys-apps/hwloc-1.7.2
 	cuda? ( dev-util/nvidia-cuda-toolkit )
 	elibc_FreeBSD? ( dev-libs/libexecinfo )
 	openmpi_fabrics_ofed? ( sys-infiniband/ofed )
diff --git a/sys-cluster/openmpi/openmpi-1.8.ebuild b/sys-cluster/openmpi/openmpi-1.8.ebuild
index b92c0b0d939f..1e32bda882d3 100644
--- a/sys-cluster/openmpi/openmpi-1.8.ebuild
+++ b/sys-cluster/openmpi/openmpi-1.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/openmpi-1.8.ebuild,v 1.1 2014/04/08 09:45:34 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/openmpi-1.8.ebuild,v 1.2 2014/04/17 14:59:46 jsbronder Exp $
 
 EAPI=5
 
@@ -59,7 +59,7 @@ RDEPEND="
 	!sys-cluster/mpich2
 	!sys-cluster/mpiexec
 	dev-libs/libevent
-	>=sys-apps/hwloc-1.6
+	>=sys-apps/hwloc-1.7.2
 	cuda? ( dev-util/nvidia-cuda-toolkit )
 	elibc_FreeBSD? ( dev-libs/libexecinfo )
 	openmpi_fabrics_ofed? ( sys-infiniband/ofed )
diff --git a/sys-libs/ntdb/Manifest b/sys-libs/ntdb/Manifest
new file mode 100644
index 000000000000..08e6670a970e
--- /dev/null
+++ b/sys-libs/ntdb/Manifest
@@ -0,0 +1 @@
+DIST ntdb-1.0.tar.gz 794585 SHA256 817ae862b1e6976cab867468f209d8417a90c7c2fcf0ec079a45645d7e7ebf49 SHA512 27f550f85a7bfd105d4115b55f9919f1871964f576a8470688fe8040fb9e2be209246a291d78f55c61cf0920238d7f41917ad7e2d44b202382b3ea47c8c97100 WHIRLPOOL 71a007312eacf7805dadc0b0089f7344b270a628e9dc3c1d8aeb505efdeead3b66cb8006377550c672a15cbf814264cb16c93892f7319bc031b8fe669bf29747
diff --git a/sys-libs/ntdb/metadata.xml b/sys-libs/ntdb/metadata.xml
new file mode 100644
index 000000000000..c2d9e83c908a
--- /dev/null
+++ b/sys-libs/ntdb/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>samba</herd>
+  <maintainer>
+    <email>polynomial-c@gentoo.org</email>
+    <name>Lars Wendler</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/sys-libs/ntdb/ntdb-1.0.ebuild b/sys-libs/ntdb/ntdb-1.0.ebuild
new file mode 100644
index 000000000000..942fce85f8c3
--- /dev/null
+++ b/sys-libs/ntdb/ntdb-1.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ntdb/ntdb-1.0.ebuild,v 1.2 2014/04/17 13:01:02 polynomial-c Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit waf-utils python-single-r1
+
+DESCRIPTION="A not-so trivial keyword/data database system"
+HOMEPAGE="http://tdb.samba.org/"
+SRC_URI="http://samba.org/ftp/tdb/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="python"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="python? ( ${PYTHON_DEPS} )"
+DEPEND="!<net-fs/samba-4.1.7
+	${RDEPEND}
+	app-text/docbook-xml-dtd:4.2"
+
+WAF_BINARY="${S}/buildtools/bin/waf"
+
+src_configure() {
+	local extra_opts=""
+	use python || extra_opts+=" --disable-python"
+	waf-utils_src_configure \
+	${extra_opts}
+}
+
+src_test() {
+	# the default src_test runs 'make test' and 'make check', letting
+	# the tests fail occasionally (reason: unknown)
+	emake check
+}
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-331.49.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-331.49.ebuild
deleted file mode 100644
index c1f89f2593a7..000000000000
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-331.49.ebuild
+++ /dev/null
@@ -1,472 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-331.49.ebuild,v 1.5 2014/03/31 19:03:27 jer Exp $
-
-EAPI=5
-
-inherit eutils flag-o-matic linux-info linux-mod multilib nvidia-driver \
-	portability toolchain-funcs unpacker user udev
-
-NV_URI="http://us.download.nvidia.com/XFree86/"
-X86_NV_PACKAGE="NVIDIA-Linux-x86-${PV}"
-AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
-X86_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86-${PV}"
-AMD64_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86_64-${PV}"
-
-DESCRIPTION="NVIDIA Accelerated Graphics Driver"
-HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="
-	amd64-fbsd? ( ${NV_URI}FreeBSD-x86_64/${PV}/${AMD64_FBSD_NV_PACKAGE}.tar.gz )
-	amd64? ( ${NV_URI}Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run )
-	x86-fbsd? ( ${NV_URI}FreeBSD-x86/${PV}/${X86_FBSD_NV_PACKAGE}.tar.gz )
-	x86? ( ${NV_URI}Linux-x86/${PV}/${X86_NV_PACKAGE}.run )
-"
-
-LICENSE="GPL-2 NVIDIA-r2"
-SLOT="0"
-KEYWORDS="-* amd64 x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="acpi multilib kernel_FreeBSD kernel_linux pax_kernel +tools +X uvm"
-RESTRICT="bindist mirror strip"
-EMULTILIB_PKG="true"
-
-COMMON="
-	app-admin/eselect-opencl
-	kernel_linux? ( >=sys-libs/glibc-2.6.1 )
-	X? (
-		>=app-admin/eselect-opengl-1.0.9
-	)
-"
-DEPEND="
-	${COMMON}
-	app-arch/xz-utils
-	kernel_linux? ( virtual/linux-sources )
-"
-RDEPEND="
-	${COMMON}
-	acpi? ( sys-power/acpid )
-	tools? (
-		dev-libs/atk
-		dev-libs/glib
-		x11-libs/gdk-pixbuf
-		x11-libs/gtk+:2
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/pango[X]
-	)
-	X? (
-		<x11-base/xorg-server-1.15.99
-		>=x11-libs/libvdpau-0.3-r1
-		multilib? (
-			|| (
-				 (
-					x11-libs/libX11[abi_x86_32]
-					x11-libs/libXext[abi_x86_32]
-				 )
-				app-emulation/emul-linux-x86-xlibs
-			)
-		)
-	)
-"
-
-REQUIRED_USE="tools? ( X )"
-
-QA_PREBUILT="opt/* usr/lib*"
-
-S=${WORKDIR}/
-
-pkg_pretend() {
-
-	if use amd64 && has_multilib_profile && \
-		[ "${DEFAULT_ABI}" != "amd64" ]; then
-		eerror "This ebuild doesn't currently support changing your default ABI"
-		die "Unexpected \${DEFAULT_ABI} = ${DEFAULT_ABI}"
-	fi
-
-	if use kernel_linux && kernel_is ge 3 14 ; then
-		ewarn "Gentoo supports kernels which are supported by NVIDIA"
-		ewarn "which are limited to the following kernels:"
-		ewarn "<sys-kernel/gentoo-sources-3.14"
-		ewarn "<sys-kernel/vanilla-sources-3.14"
-		ewarn ""
-		ewarn "You are free to utilize epatch_user to provide whatever"
-		ewarn "support you feel is appropriate, but will not receive"
-		ewarn "support as a result of those changes."
-		ewarn ""
-		ewarn "Do not file a bug report about this."
-	fi
-
-	# Since Nvidia ships 3 different series of drivers, we need to give the user
-	# some kind of guidance as to what version they should install. This tries
-	# to point the user in the right direction but can't be perfect. check
-	# nvidia-driver.eclass
-	nvidia-driver-check-warning
-
-	# Kernel features/options to check for
-	CONFIG_CHECK="~ZONE_DMA ~MTRR ~SYSVIPC ~!LOCKDEP"
-	use x86 && CONFIG_CHECK+=" ~HIGHMEM"
-
-	# Now do the above checks
-	use kernel_linux && check_extra_config
-}
-
-pkg_setup() {
-	# try to turn off distcc and ccache for people that have a problem with it
-	export DISTCC_DISABLE=1
-	export CCACHE_DISABLE=1
-
-	if use kernel_linux; then
-		# Because of awkward limitations of linux-mod.eclass, the order in
-		# which the modules are listed somehow affects module dependencies,
-		# so we list nvidia-uvm first and then nvidia.
-		use uvm && MODULE_NAMES="nvidia-uvm(video:${S}/kernel/uvm)"
-		MODULE_NAMES+=" nvidia(video:${S}/kernel)"
-
-		# This needs to run after MODULE_NAMES (so that the eclass checks
-		# whether the kernel supports loadable modules) but before BUILD_PARAMS
-		# is set (so that KV_DIR is populated).
-		linux-mod_pkg_setup
-
-		BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} \
-		SYSOUT=${KV_OUT_DIR} CC=$(tc-getBUILD_CC)"
-
-		# linux-mod_src_compile calls set_arch_to_kernel, which
-		# sets the ARCH to x86 but NVIDIA's wrapping Makefile
-		# expects x86_64 or i386 and then converts it to x86
-		# later on in the build process
-		BUILD_FIXES="ARCH=$(uname -m | sed -e 's/i.86/i386/')"
-	fi
-
-	# set variables to where files are in the package structure
-	if use kernel_FreeBSD; then
-		use x86-fbsd   && S="${WORKDIR}/${X86_FBSD_NV_PACKAGE}"
-		use amd64-fbsd && S="${WORKDIR}/${AMD64_FBSD_NV_PACKAGE}"
-		NV_DOC="${S}/doc"
-		NV_OBJ="${S}/obj"
-		NV_SRC="${S}/src"
-		NV_MAN="${S}/x11/man"
-		NV_X11="${S}/obj"
-		NV_SOVER=1
-	elif use kernel_linux; then
-		NV_DOC="${S}"
-		NV_OBJ="${S}"
-		NV_SRC="${S}/kernel"
-		NV_MAN="${S}"
-		NV_X11="${S}"
-		NV_SOVER=${PV}
-	else
-		die "Could not determine proper NVIDIA package"
-	fi
-}
-
-src_unpack() {
-	if use kernel_FreeBSD; then
-		unpack ${A}
-	elif use kernel_linux; then
-		cd "${S}"
-		unpack_makeself
-	fi
-}
-
-src_prepare() {
-	# Please add a brief description for every added patch
-
-	if use kernel_linux; then
-		if kernel_is lt 2 6 9 ; then
-			eerror "You must build this against 2.6.9 or higher kernels."
-		fi
-
-		# If greater than 2.6.5 use M= instead of SUBDIR=
-#		convert_to_m "${NV_SRC}"/Makefile.kbuild
-	fi
-
-	if use pax_kernel; then
-		ewarn "Using PAX patches is not supported. You will be asked to"
-		ewarn "use a standard kernel should you have issues. Should you"
-		ewarn "need support with these patches, contact the PaX team."
-		epatch "${FILESDIR}"/${PN}-331.13-pax-usercopy.patch
-	fi
-
-	# Allow user patches so they can support RC kernels and whatever else
-	epatch_user
-}
-
-src_compile() {
-	# This is already the default on Linux, as there's no toplevel Makefile, but
-	# on FreeBSD there's one and triggers the kernel module build, as we install
-	# it by itself, pass this.
-
-	cd "${NV_SRC}"
-	if use kernel_FreeBSD; then
-		MAKE="$(get_bmake)" CFLAGS="-Wno-sign-compare" emake CC="$(tc-getCC)" \
-			LD="$(tc-getLD)" LDFLAGS="$(raw-ldflags)" || die
-	elif use kernel_linux; then
-		linux-mod_src_compile
-	fi
-}
-
-# Install nvidia library:
-# the first parameter is the library to install
-# the second parameter is the provided soversion
-# the third parameter is the target directory if its not /usr/lib
-donvidia() {
-	# Full path to library minus SOVER
-	MY_LIB="$1"
-
-	# SOVER to use
-	MY_SOVER="$2"
-
-	# Where to install
-	MY_DEST="$3"
-
-	if [[ -z "${MY_DEST}" ]]; then
-		MY_DEST="/usr/$(get_libdir)"
-		action="dolib.so"
-	else
-		exeinto ${MY_DEST}
-		action="doexe"
-	fi
-
-	# Get just the library name
-	libname=$(basename $1)
-
-	# Install the library with the correct SOVER
-	${action} ${MY_LIB}.${MY_SOVER} || \
-		die "failed to install ${libname}"
-
-	# If SOVER wasn't 1, then we need to create a .1 symlink
-	if [[ "${MY_SOVER}" != "1" ]]; then
-		dosym ${libname}.${MY_SOVER} \
-			${MY_DEST}/${libname}.1 || \
-			die "failed to create ${libname} symlink"
-	fi
-
-	# Always create the symlink from the raw lib to the .1
-	dosym ${libname}.1 \
-		${MY_DEST}/${libname} || \
-		die "failed to create ${libname} symlink"
-}
-
-src_install() {
-	if use kernel_linux; then
-		linux-mod_src_install
-
-		# Add the aliases
-		# This file is tweaked with the appropriate video group in
-		# pkg_preinst, see bug #491414
-		insinto /etc/modprobe.d
-		newins "${FILESDIR}"/nvidia-169.07 nvidia.conf
-
-		# Ensures that our device nodes are created when not using X
-		exeinto "$(udev_get_udevdir)"
-		doexe "${FILESDIR}"/nvidia-udev.sh
-		udev_newrules "${FILESDIR}"/nvidia.udev-rule 99-nvidia.rules
-	elif use kernel_FreeBSD; then
-		if use x86-fbsd; then
-			insinto /boot/modules
-			doins "${S}/src/nvidia.kld"
-		fi
-
-		exeinto /boot/modules
-		doexe "${S}/src/nvidia.ko"
-	fi
-
-	# NVIDIA kernel <-> userspace driver config lib
-	donvidia ${NV_OBJ}/libnvidia-cfg.so ${NV_SOVER}
-
-	# NVIDIA framebuffer capture library
-	donvidia ${NV_OBJ}/libnvidia-fbc.so ${NV_SOVER}
-
-	# NVIDIA video encode/decode <-> CUDA
-	if use kernel_linux; then
-		donvidia ${NV_OBJ}/libnvcuvid.so ${NV_SOVER}
-		donvidia ${NV_OBJ}/libnvidia-encode.so ${NV_SOVER}
-	fi
-
-	if use X; then
-		# Xorg DDX driver
-		insinto /usr/$(get_libdir)/xorg/modules/drivers
-		doins ${NV_X11}/nvidia_drv.so
-
-		# Xorg GLX driver
-		donvidia ${NV_X11}/libglx.so ${NV_SOVER} \
-			/usr/$(get_libdir)/opengl/nvidia/extensions
-	fi
-
-	# OpenCL ICD for NVIDIA
-	if use kernel_linux; then
-		insinto /etc/OpenCL/vendors
-		doins ${NV_OBJ}/nvidia.icd
-	fi
-
-	# Documentation
-	dohtml ${NV_DOC}/html/*
-	if use kernel_FreeBSD; then
-		dodoc "${NV_DOC}/README"
-		use X && doman "${NV_MAN}/nvidia-xconfig.1"
-		use tools && doman "${NV_MAN}/nvidia-settings.1"
-	else
-		# Docs
-		newdoc "${NV_DOC}/README.txt" README
-		dodoc "${NV_DOC}/NVIDIA_Changelog"
-		doman "${NV_MAN}/nvidia-smi.1.gz"
-		use X && doman "${NV_MAN}/nvidia-xconfig.1.gz"
-		use tools && doman "${NV_MAN}/nvidia-settings.1.gz"
-		doman "${NV_MAN}/nvidia-cuda-mps-control.1.gz"
-	fi
-
-	# Helper Apps
-	exeinto /opt/bin/
-
-	if use X; then
-		doexe ${NV_OBJ}/nvidia-xconfig
-	fi
-
-	if use kernel_linux ; then
-		doexe ${NV_OBJ}/nvidia-cuda-mps-control
-		doexe ${NV_OBJ}/nvidia-cuda-mps-server
-		doexe ${NV_OBJ}/nvidia-debugdump
-		doexe ${NV_OBJ}/nvidia-modprobe
-		doexe ${NV_OBJ}/nvidia-persistenced
-		doexe ${NV_OBJ}/nvidia-smi
-		doman nvidia-cuda-mps-control.1.gz
-		doman nvidia-modprobe.1.gz
-		doman nvidia-persistenced.1.gz
-		newinitd "${FILESDIR}/nvidia-smi.init" nvidia-smi
-	fi
-
-	if use tools; then
-		doexe ${NV_OBJ}/nvidia-settings
-	fi
-
-	exeinto /usr/bin/
-	doexe ${NV_OBJ}/nvidia-bug-report.sh
-
-	# Desktop entries for nvidia-settings
-	if use tools ; then
-		# There is no icon in the FreeBSD tarball.
-		use kernel_FreeBSD || newicon ${NV_OBJ}/nvidia-settings.png ${PN}-settings.png
-		domenu "${FILESDIR}"/${PN}-settings.desktop
-		exeinto /etc/X11/xinit/xinitrc.d
-		doexe "${FILESDIR}"/95-nvidia-settings
-	fi
-
-	#doenvd "${FILESDIR}"/50nvidia-prelink-blacklist
-
-	if has_multilib_profile && use multilib ; then
-		local OABI=${ABI}
-		for ABI in $(get_install_abis) ; do
-			src_install-libs
-		done
-		ABI=${OABI}
-		unset OABI
-	else
-		src_install-libs
-	fi
-
-	is_final_abi || die "failed to iterate through all ABIs"
-
-	readme.gentoo_create_doc
-}
-
-src_install-libs() {
-	local inslibdir=$(get_libdir)
-	local GL_ROOT="/usr/$(get_libdir)/opengl/nvidia/lib"
-	local CL_ROOT="/usr/$(get_libdir)/OpenCL/vendors/nvidia"
-	local libdir=${NV_OBJ}
-
-	if use kernel_linux && has_multilib_profile && \
-			[[ ${ABI} == "x86" ]] ; then
-		libdir=${NV_OBJ}/32
-	fi
-
-	if use X; then
-		# The GLX libraries
-		donvidia ${libdir}/libGL.so ${NV_SOVER} ${GL_ROOT}
-		donvidia ${libdir}/libnvidia-glcore.so ${NV_SOVER}
-		donvidia ${libdir}/libnvidia-ifr.so ${NV_SOVER}
-		if use kernel_FreeBSD; then
-			donvidia ${libdir}/libnvidia-tls.so ${NV_SOVER}
-		else
-			donvidia ${libdir}/tls/libnvidia-tls.so ${NV_SOVER}
-		fi
-
-		# VDPAU
-		donvidia ${libdir}/libvdpau_nvidia.so ${NV_SOVER}
-	fi
-
-	# NVIDIA monitoring library
-	if use kernel_linux ; then
-		donvidia ${libdir}/libnvidia-ml.so ${NV_SOVER}
-	fi
-
-	# CUDA & OpenCL
-	if use kernel_linux; then
-		donvidia ${libdir}/libcuda.so ${NV_SOVER}
-		donvidia ${libdir}/libnvidia-compiler.so ${NV_SOVER}
-		donvidia ${libdir}/libOpenCL.so 1.0.0 ${CL_ROOT}
-		donvidia ${libdir}/libnvidia-opencl.so ${NV_SOVER}
-	fi
-}
-
-pkg_preinst() {
-	if use kernel_linux; then
-		linux-mod_pkg_preinst
-
-		local videogroup="$(egetent group video | cut -d ':' -f 3)"
-		if [ -z "${videogroup}" ]; then
-			eerror "Failed to determine the video group gid"
-			die "Failed to determine the video group gid"
-		else
-			sed -i \
-				-e "s:PACKAGE:${PF}:g" \
-				-e "s:VIDEOGID:${videogroup}:" \
-				"${D}"/etc/modprobe.d/nvidia.conf || die
-		fi
-	fi
-
-	# Clean the dynamic libGL stuff's home to ensure
-	# we dont have stale libs floating around
-	if [ -d "${ROOT}"/usr/lib/opengl/nvidia ] ; then
-		rm -rf "${ROOT}"/usr/lib/opengl/nvidia/*
-	fi
-	# Make sure we nuke the old nvidia-glx's env.d file
-	if [ -e "${ROOT}"/etc/env.d/09nvidia ] ; then
-		rm -f "${ROOT}"/etc/env.d/09nvidia
-	fi
-}
-
-pkg_postinst() {
-	use kernel_linux && linux-mod_pkg_postinst
-
-	# Switch to the nvidia implementation
-	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old nvidia
-	"${ROOT}"/usr/bin/eselect opencl set --use-old nvidia
-
-	readme.gentoo_print_elog
-
-	if ! use X; then
-		elog "You have elected to not install the X.org driver. Along with"
-		elog "this the OpenGL libraries and VDPAU libraries were not"
-		elog "installed. Additionally, once the driver is loaded your card"
-		elog "and fan will run at max speed which may not be desirable."
-		elog "Use the 'nvidia-smi' init script to have your card and fan"
-		elog "speed scale appropriately."
-		elog
-	fi
-	if ! use tools; then
-		elog "USE=tools controls whether the nvidia-settings application"
-		elog "is installed. If you would like to use it, enable that"
-		elog "flag and re-emerge this ebuild. Optionally you can install"
-		elog "media-video/nvidia-settings"
-		elog
-	fi
-}
-
-pkg_prerm() {
-	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-}
-
-pkg_postrm() {
-	use kernel_linux && linux-mod_pkg_postrm
-	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-}
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-334.21.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-334.21.ebuild
deleted file mode 100644
index 5a2e41b34d97..000000000000
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-334.21.ebuild
+++ /dev/null
@@ -1,482 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-334.21.ebuild,v 1.3 2014/03/31 19:03:27 jer Exp $
-
-EAPI=5
-
-inherit eutils flag-o-matic linux-info linux-mod multilib nvidia-driver \
-	portability toolchain-funcs unpacker user udev
-
-NV_URI="http://us.download.nvidia.com/XFree86/"
-X86_NV_PACKAGE="NVIDIA-Linux-x86-${PV}"
-AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
-X86_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86-${PV}"
-AMD64_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86_64-${PV}"
-
-DESCRIPTION="NVIDIA Accelerated Graphics Driver"
-HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="
-	amd64-fbsd? ( ${NV_URI}FreeBSD-x86_64/${PV}/${AMD64_FBSD_NV_PACKAGE}.tar.gz )
-	amd64? ( ${NV_URI}Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run )
-	x86-fbsd? ( ${NV_URI}FreeBSD-x86/${PV}/${X86_FBSD_NV_PACKAGE}.tar.gz )
-	x86? ( ${NV_URI}Linux-x86/${PV}/${X86_NV_PACKAGE}.run )
-"
-
-LICENSE="GPL-2 NVIDIA-r2"
-SLOT="0"
-KEYWORDS="-* amd64 x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="acpi multilib kernel_FreeBSD kernel_linux pax_kernel +tools +X uvm"
-RESTRICT="bindist mirror strip"
-EMULTILIB_PKG="true"
-
-COMMON="
-	app-admin/eselect-opencl
-	kernel_linux? ( >=sys-libs/glibc-2.6.1 )
-	X? (
-		>=app-admin/eselect-opengl-1.0.9
-	)
-"
-DEPEND="
-	${COMMON}
-	app-arch/xz-utils
-	kernel_linux? ( virtual/linux-sources )
-"
-RDEPEND="
-	${COMMON}
-	acpi? ( sys-power/acpid )
-	tools? (
-		dev-libs/atk
-		dev-libs/glib
-		x11-libs/gdk-pixbuf
-		x11-libs/gtk+:2
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/pango[X]
-	)
-	X? (
-		<x11-base/xorg-server-1.15.99
-		>=x11-libs/libvdpau-0.3-r1
-		multilib? (
-			|| (
-				 (
-					x11-libs/libX11[abi_x86_32]
-					x11-libs/libXext[abi_x86_32]
-				 )
-				app-emulation/emul-linux-x86-xlibs
-			)
-		)
-	)
-"
-
-REQUIRED_USE="tools? ( X )"
-
-QA_PREBUILT="opt/* usr/lib*"
-
-S=${WORKDIR}/
-
-pkg_pretend() {
-
-	if use amd64 && has_multilib_profile && \
-		[ "${DEFAULT_ABI}" != "amd64" ]; then
-		eerror "This ebuild doesn't currently support changing your default ABI"
-		die "Unexpected \${DEFAULT_ABI} = ${DEFAULT_ABI}"
-	fi
-
-	if use kernel_linux && kernel_is ge 3 14 ; then
-		ewarn "Gentoo supports kernels which are supported by NVIDIA"
-		ewarn "which are limited to the following kernels:"
-		ewarn "<sys-kernel/gentoo-sources-3.14"
-		ewarn "<sys-kernel/vanilla-sources-3.14"
-		ewarn ""
-		ewarn "You are free to utilize epatch_user to provide whatever"
-		ewarn "support you feel is appropriate, but will not receive"
-		ewarn "support as a result of those changes."
-		ewarn ""
-		ewarn "Do not file a bug report about this."
-	fi
-
-	# Since Nvidia ships 3 different series of drivers, we need to give the user
-	# some kind of guidance as to what version they should install. This tries
-	# to point the user in the right direction but can't be perfect. check
-	# nvidia-driver.eclass
-	nvidia-driver-check-warning
-
-	# Kernel features/options to check for
-	CONFIG_CHECK="~ZONE_DMA ~MTRR ~SYSVIPC ~!LOCKDEP"
-	use x86 && CONFIG_CHECK+=" ~HIGHMEM"
-
-	# Now do the above checks
-	use kernel_linux && check_extra_config
-}
-
-pkg_setup() {
-	# try to turn off distcc and ccache for people that have a problem with it
-	export DISTCC_DISABLE=1
-	export CCACHE_DISABLE=1
-
-	if use kernel_linux; then
-		# Because of awkward limitations of linux-mod.eclass, the order in
-		# which the modules are listed somehow affects module dependencies,
-		# so we list nvidia-uvm first and then nvidia.
-		use uvm && MODULE_NAMES="nvidia-uvm(video:${S}/kernel/uvm)"
-		MODULE_NAMES+=" nvidia(video:${S}/kernel)"
-
-		# This needs to run after MODULE_NAMES (so that the eclass checks
-		# whether the kernel supports loadable modules) but before BUILD_PARAMS
-		# is set (so that KV_DIR is populated).
-		linux-mod_pkg_setup
-
-		BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} \
-		SYSOUT=${KV_OUT_DIR} CC=$(tc-getBUILD_CC)"
-
-		# linux-mod_src_compile calls set_arch_to_kernel, which
-		# sets the ARCH to x86 but NVIDIA's wrapping Makefile
-		# expects x86_64 or i386 and then converts it to x86
-		# later on in the build process
-		BUILD_FIXES="ARCH=$(uname -m | sed -e 's/i.86/i386/')"
-	fi
-
-	# set variables to where files are in the package structure
-	if use kernel_FreeBSD; then
-		use x86-fbsd   && S="${WORKDIR}/${X86_FBSD_NV_PACKAGE}"
-		use amd64-fbsd && S="${WORKDIR}/${AMD64_FBSD_NV_PACKAGE}"
-		NV_DOC="${S}/doc"
-		NV_OBJ="${S}/obj"
-		NV_SRC="${S}/src"
-		NV_MAN="${S}/x11/man"
-		NV_X11="${S}/obj"
-		NV_SOVER=1
-	elif use kernel_linux; then
-		NV_DOC="${S}"
-		NV_OBJ="${S}"
-		NV_SRC="${S}/kernel"
-		NV_MAN="${S}"
-		NV_X11="${S}"
-		NV_SOVER=${PV}
-	else
-		die "Could not determine proper NVIDIA package"
-	fi
-}
-
-src_unpack() {
-	if use kernel_FreeBSD; then
-		unpack ${A}
-	elif use kernel_linux; then
-		cd "${S}"
-		unpack_makeself
-	fi
-}
-
-src_prepare() {
-	# Please add a brief description for every added patch
-
-	if use kernel_linux; then
-		if kernel_is lt 2 6 9 ; then
-			eerror "You must build this against 2.6.9 or higher kernels."
-		fi
-
-		# If greater than 2.6.5 use M= instead of SUBDIR=
-#		convert_to_m "${NV_SRC}"/Makefile.kbuild
-	fi
-
-	if use pax_kernel; then
-		ewarn "Using PAX patches is not supported. You will be asked to"
-		ewarn "use a standard kernel should you have issues. Should you"
-		ewarn "need support with these patches, contact the PaX team."
-		epatch "${FILESDIR}"/${PN}-331.13-pax-usercopy.patch
-	fi
-
-	# Allow user patches so they can support RC kernels and whatever else
-	epatch_user
-}
-
-src_compile() {
-	# This is already the default on Linux, as there's no toplevel Makefile, but
-	# on FreeBSD there's one and triggers the kernel module build, as we install
-	# it by itself, pass this.
-
-	cd "${NV_SRC}"
-	if use kernel_FreeBSD; then
-		MAKE="$(get_bmake)" CFLAGS="-Wno-sign-compare" emake CC="$(tc-getCC)" \
-			LD="$(tc-getLD)" LDFLAGS="$(raw-ldflags)" || die
-	elif use kernel_linux; then
-		linux-mod_src_compile
-	fi
-}
-
-# Install nvidia library:
-# the first parameter is the library to install
-# the second parameter is the provided soversion
-# the third parameter is the target directory if its not /usr/lib
-donvidia() {
-	# Full path to library minus SOVER
-	MY_LIB="$1"
-
-	# SOVER to use
-	MY_SOVER="$2"
-
-	# Where to install
-	MY_DEST="$3"
-
-	if [[ -z "${MY_DEST}" ]]; then
-		MY_DEST="/usr/$(get_libdir)"
-		action="dolib.so"
-	else
-		exeinto ${MY_DEST}
-		action="doexe"
-	fi
-
-	# Get just the library name
-	libname=$(basename $1)
-
-	# Install the library with the correct SOVER
-	${action} ${MY_LIB}.${MY_SOVER} || \
-		die "failed to install ${libname}"
-
-	# If SOVER wasn't 1, then we need to create a .1 symlink
-	if [[ "${MY_SOVER}" != "1" ]]; then
-		dosym ${libname}.${MY_SOVER} \
-			${MY_DEST}/${libname}.1 || \
-			die "failed to create ${libname} symlink"
-	fi
-
-	# Always create the symlink from the raw lib to the .1
-	dosym ${libname}.1 \
-		${MY_DEST}/${libname} || \
-		die "failed to create ${libname} symlink"
-}
-
-src_install() {
-	if use kernel_linux; then
-		linux-mod_src_install
-
-		# Add the aliases
-		# This file is tweaked with the appropriate video group in
-		# pkg_preinst, see bug #491414
-		insinto /etc/modprobe.d
-		newins "${FILESDIR}"/nvidia-169.07 nvidia.conf
-
-		# Ensures that our device nodes are created when not using X
-		exeinto "$(udev_get_udevdir)"
-		doexe "${FILESDIR}"/nvidia-udev.sh
-		udev_newrules "${FILESDIR}"/nvidia.udev-rule 99-nvidia.rules
-	elif use kernel_FreeBSD; then
-		if use x86-fbsd; then
-			insinto /boot/modules
-			doins "${S}/src/nvidia.kld"
-		fi
-
-		exeinto /boot/modules
-		doexe "${S}/src/nvidia.ko"
-	fi
-
-	# NVIDIA kernel <-> userspace driver config lib
-	donvidia ${NV_OBJ}/libnvidia-cfg.so ${NV_SOVER}
-
-	# NVIDIA framebuffer capture library
-	donvidia ${NV_OBJ}/libnvidia-fbc.so ${NV_SOVER}
-
-	# NVIDIA video encode/decode <-> CUDA
-	if use kernel_linux; then
-		donvidia ${NV_OBJ}/libnvcuvid.so ${NV_SOVER}
-		donvidia ${NV_OBJ}/libnvidia-encode.so ${NV_SOVER}
-	fi
-
-	if use X; then
-		# Xorg DDX driver
-		insinto /usr/$(get_libdir)/xorg/modules/drivers
-		doins ${NV_X11}/nvidia_drv.so
-
-		# Xorg GLX driver
-		donvidia ${NV_X11}/libglx.so ${NV_SOVER} \
-			/usr/$(get_libdir)/opengl/nvidia/extensions
-	fi
-
-	# OpenCL ICD for NVIDIA
-	if use kernel_linux; then
-		insinto /etc/OpenCL/vendors
-		doins ${NV_OBJ}/nvidia.icd
-	fi
-
-	# Documentation
-	dohtml ${NV_DOC}/html/*
-	if use kernel_FreeBSD; then
-		dodoc "${NV_DOC}/README"
-		use X && doman "${NV_MAN}/nvidia-xconfig.1"
-		use tools && doman "${NV_MAN}/nvidia-settings.1"
-	else
-		# Docs
-		newdoc "${NV_DOC}/README.txt" README
-		dodoc "${NV_DOC}/NVIDIA_Changelog"
-		doman "${NV_MAN}/nvidia-smi.1.gz"
-		use X && doman "${NV_MAN}/nvidia-xconfig.1.gz"
-		use tools && doman "${NV_MAN}/nvidia-settings.1.gz"
-		doman "${NV_MAN}/nvidia-cuda-mps-control.1.gz"
-	fi
-
-	# Helper Apps
-	exeinto /opt/bin/
-
-	if use X; then
-		doexe ${NV_OBJ}/nvidia-xconfig
-	fi
-
-	if use kernel_linux ; then
-		doexe ${NV_OBJ}/nvidia-cuda-mps-control
-		doexe ${NV_OBJ}/nvidia-cuda-mps-server
-		doexe ${NV_OBJ}/nvidia-debugdump
-		doexe ${NV_OBJ}/nvidia-modprobe
-		doexe ${NV_OBJ}/nvidia-persistenced
-		doexe ${NV_OBJ}/nvidia-smi
-		doman nvidia-cuda-mps-control.1.gz
-		doman nvidia-modprobe.1.gz
-		doman nvidia-persistenced.1.gz
-		newinitd "${FILESDIR}/nvidia-smi.init" nvidia-smi
-	fi
-
-	if use tools; then
-		doexe ${NV_OBJ}/nvidia-settings
-	fi
-
-	exeinto /usr/bin/
-	doexe ${NV_OBJ}/nvidia-bug-report.sh
-
-	# Desktop entries for nvidia-settings
-	if use tools ; then
-		# There is no icon in the FreeBSD tarball.
-		use kernel_FreeBSD || newicon ${NV_OBJ}/nvidia-settings.png ${PN}-settings.png
-		domenu "${FILESDIR}"/${PN}-settings.desktop
-		exeinto /etc/X11/xinit/xinitrc.d
-		doexe "${FILESDIR}"/95-nvidia-settings
-	fi
-
-	#doenvd "${FILESDIR}"/50nvidia-prelink-blacklist
-
-	if has_multilib_profile && use multilib ; then
-		local OABI=${ABI}
-		for ABI in $(get_install_abis) ; do
-			src_install-libs
-		done
-		ABI=${OABI}
-		unset OABI
-	else
-		src_install-libs
-	fi
-
-	is_final_abi || die "failed to iterate through all ABIs"
-
-	readme.gentoo_create_doc
-}
-
-src_install-libs() {
-	local inslibdir=$(get_libdir)
-	local GL_ROOT="/usr/$(get_libdir)/opengl/nvidia/lib"
-	local CL_ROOT="/usr/$(get_libdir)/OpenCL/vendors/nvidia"
-	local libdir=${NV_OBJ}
-
-	if use kernel_linux && has_multilib_profile && \
-			[[ ${ABI} == "x86" ]] ; then
-		libdir=${NV_OBJ}/32
-	fi
-
-	if use X; then
-		# The GLX libraries
-		donvidia ${libdir}/libEGL.so ${NV_SOVER} ${GL_ROOT}
-		donvidia ${libdir}/libGL.so ${NV_SOVER} ${GL_ROOT}
-		donvidia ${libdir}/libGLESv1_CM.so ${NV_SOVER} ${GL_ROOT}
-		donvidia ${libdir}/libnvidia-eglcore.so ${NV_SOVER}
-		donvidia ${libdir}/libnvidia-glcore.so ${NV_SOVER}
-		donvidia ${libdir}/libnvidia-glsi.so ${NV_SOVER}
-		donvidia ${libdir}/libnvidia-ifr.so ${NV_SOVER}
-		if use kernel_FreeBSD; then
-			donvidia ${libdir}/libnvidia-tls.so ${NV_SOVER}
-		else
-			donvidia ${libdir}/tls/libnvidia-tls.so ${NV_SOVER}
-		fi
-
-		# VDPAU
-		donvidia ${libdir}/libvdpau_nvidia.so ${NV_SOVER}
-
-		# GLES v2 libraries
-		insinto ${GL_ROOT}
-		doexe ${libdir}/libGLESv2.so.${PV}
-		dosym libGLESv2.so.${PV} ${GL_ROOT}/libGLESv2.so.2
-		dosym libGLESv2.so.2 ${GL_ROOT}/libGLESv2.so
-	fi
-
-	# NVIDIA monitoring library
-	if use kernel_linux ; then
-		donvidia ${libdir}/libnvidia-ml.so ${NV_SOVER}
-	fi
-
-	# CUDA & OpenCL
-	if use kernel_linux; then
-		donvidia ${libdir}/libcuda.so ${NV_SOVER}
-		donvidia ${libdir}/libnvidia-compiler.so ${NV_SOVER}
-		donvidia ${libdir}/libOpenCL.so 1.0.0 ${CL_ROOT}
-		donvidia ${libdir}/libnvidia-opencl.so ${NV_SOVER}
-	fi
-}
-
-pkg_preinst() {
-	if use kernel_linux; then
-		linux-mod_pkg_preinst
-
-		local videogroup="$(egetent group video | cut -d ':' -f 3)"
-		if [ -z "${videogroup}" ]; then
-			eerror "Failed to determine the video group gid"
-			die "Failed to determine the video group gid"
-		else
-			sed -i \
-				-e "s:PACKAGE:${PF}:g" \
-				-e "s:VIDEOGID:${videogroup}:" \
-				"${D}"/etc/modprobe.d/nvidia.conf || die
-		fi
-	fi
-
-	# Clean the dynamic libGL stuff's home to ensure
-	# we dont have stale libs floating around
-	if [ -d "${ROOT}"/usr/lib/opengl/nvidia ] ; then
-		rm -rf "${ROOT}"/usr/lib/opengl/nvidia/*
-	fi
-	# Make sure we nuke the old nvidia-glx's env.d file
-	if [ -e "${ROOT}"/etc/env.d/09nvidia ] ; then
-		rm -f "${ROOT}"/etc/env.d/09nvidia
-	fi
-}
-
-pkg_postinst() {
-	use kernel_linux && linux-mod_pkg_postinst
-
-	# Switch to the nvidia implementation
-	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old nvidia
-	"${ROOT}"/usr/bin/eselect opencl set --use-old nvidia
-
-	readme.gentoo_print_elog
-
-	if ! use X; then
-		elog "You have elected to not install the X.org driver. Along with"
-		elog "this the OpenGL libraries and VDPAU libraries were not"
-		elog "installed. Additionally, once the driver is loaded your card"
-		elog "and fan will run at max speed which may not be desirable."
-		elog "Use the 'nvidia-smi' init script to have your card and fan"
-		elog "speed scale appropriately."
-		elog
-	fi
-	if ! use tools; then
-		elog "USE=tools controls whether the nvidia-settings application"
-		elog "is installed. If you would like to use it, enable that"
-		elog "flag and re-emerge this ebuild. Optionally you can install"
-		elog "media-video/nvidia-settings"
-		elog
-	fi
-}
-
-pkg_prerm() {
-	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-}
-
-pkg_postrm() {
-	use kernel_linux && linux-mod_pkg_postrm
-	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-}
diff --git a/x11-libs/goffice/Manifest b/x11-libs/goffice/Manifest
index 260c2d69bc52..49c205b7d300 100644
--- a/x11-libs/goffice/Manifest
+++ b/x11-libs/goffice/Manifest
@@ -1,4 +1,4 @@
-DIST goffice-0.10.0.tar.xz 2121692 SHA256 7e7577f69203b03c4966906bcaabc6e87a629efb1684630c2bee7907bed08439 SHA512 5d3df468129baaf64fb275f16c433ae40c3d3d33ea49bd9b3f62b3977083863e19c36e65c8d5d1ef3536a792bfb8817d199830115220f8f9fbd40d67cd121863 WHIRLPOOL 4870d7618f01314e3776ebcc29356621cd99ac91e26bc8a8d5d0aab2c4c1a5b7e9721469bc3d7676496ac2e51a2f82b8d65053df923d49ed5e606a0bdf0588bb
 DIST goffice-0.10.12.tar.xz 2257080 SHA256 ce91a3bf20416301f00ceb46c160631234e451a502f54ee0ef1ad9f262d3006e SHA512 277282e6945b24464b1ab03218ba816e81b085e5478304e6145aa92e2e439fee80ed598ab3d4980a6a75e2d9f3b01e18c79505aeb7d6ee1244fade2671bda1c7 WHIRLPOOL 4ade4a2b934d7f51303bc991d57f95bbada04458fe8b300c6757afcafb106953e3c1148950e4efb9c3304cbb072da71eccd930d713bdde1e9f7221b7ed166bbd
 DIST goffice-0.10.13.tar.xz 2259764 SHA256 660d97c59a152ba96b627aa3a6d61dafd85e01db804ae27f466fd6ce1b41d6c9 SHA512 709ccb113217b6faf7417f14191f3ebe9a8e799f2cb31573fb17c9af7425716e8f1937d306f31fd1c3737ef7d9382d5ea6293e4a34d6efa4a1825495b7db26fb WHIRLPOOL 2f96d1e100f38db45388c73bb63128dd889f62c1edda5ba09c9b37c9d000e0aa159f4b0a43123b35d7e23fa5e7a68f88737e5c689b6176d1d181ab8560fdad02
+DIST goffice-0.10.14.tar.xz 2267364 SHA256 c0783ca32828a64a65fe57609a692c1cb6627d3dfe8bed4fed8a70f32c8f404e SHA512 38a3a740041f0345b2a53f288a3c977fe35b706660dce7a0d347773a903dfbca77d91e9eb0039004063a374721d012e1e327a89713153fa574d45e3d5f70b767 WHIRLPOOL e5c534faf4c53f1c61c72e26a77693d0e640cab04b663e340bf407f9e20ab29334ffd6574275327caa975f837b6396b6d68bcd3c9f91a2aebebfef62f6bb0759
 DIST goffice-0.8.17.tar.xz 1814488 SHA256 165070beb67b84580afe80a8a100b674a81d553ab791acd72ac0c655f4fadb15 SHA512 61a3063d37e2ded4d4065d261f728c862daea04090ac38abe2524089ed1ee253e0d77e501f5b3451b1e011491a8225f90fd4914f28ce2a347ecf561098e6400c WHIRLPOOL 12ac2587af25c41686797b9bd5ff93429687217cb3d14e130067685701fd0685ed1c4f9900eb34a15cfb30dcdfe9ebe9f9856a1b4eb6684555d0a9cb1ef86ff1
diff --git a/x11-libs/goffice/goffice-0.10.0.ebuild b/x11-libs/goffice/goffice-0.10.0.ebuild
deleted file mode 100644
index cfab3e3618e5..000000000000
--- a/x11-libs/goffice/goffice-0.10.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/goffice/goffice-0.10.0.ebuild,v 1.9 2013/10/25 21:06:43 blueness Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2 flag-o-matic
-
-DESCRIPTION="A library of document-centric objects and utilities"
-HOMEPAGE="http://git.gnome.org/browse/goffice/"
-
-LICENSE="GPL-2"
-SLOT="0.10"
-KEYWORDS="alpha amd64 ~arm ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
-IUSE="+introspection"
-
-# Build fails with -gtk
-# FIXME: add lasem to tree
-RDEPEND=">=app-text/libspectre-0.2.6:=
-	>=dev-libs/glib-2.28.0:2
-	>=gnome-base/librsvg-2.22.0:2
-	>=gnome-extra/libgsf-1.14.9:=
-	>=dev-libs/libxml2-2.4.12:2
-	>=x11-libs/pango-1.24.0:=
-	>=x11-libs/cairo-1.10.0:=[svg]
-	x11-libs/libXext:=
-	x11-libs/libXrender:=
-	>=x11-libs/gdk-pixbuf-2.22.0:2
-	>=x11-libs/gtk+-3.0.0:3
-	introspection? ( >=dev-libs/gobject-introspection-1.0.0:=
-			>=gnome-extra/libgsf-1.14.23:= )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=dev-util/intltool-0.35
-	>=dev-util/gtk-doc-am-1.12"
-#	gnome-base/gnome-common"
-# eautoreconf requires: gnome-common
-
-src_prepare() {
-	G2CONF+="
-		--without-lasem
-		--with-gtk
-		--with-config-backend=gsettings
-		$(use_enable introspection)"
-	filter-flags -ffast-math
-}
diff --git a/x11-libs/goffice/goffice-0.10.14.ebuild b/x11-libs/goffice/goffice-0.10.14.ebuild
new file mode 100644
index 000000000000..4e241c664557
--- /dev/null
+++ b/x11-libs/goffice/goffice-0.10.14.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/goffice/goffice-0.10.14.ebuild,v 1.1 2014/04/17 12:53:40 pacho Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2 flag-o-matic
+
+DESCRIPTION="A library of document-centric objects and utilities"
+HOMEPAGE="http://git.gnome.org/browse/goffice/"
+
+LICENSE="GPL-2"
+SLOT="0.10"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
+IUSE="+introspection"
+
+# Build fails with -gtk
+# FIXME: add lasem to tree
+RDEPEND="
+	>=app-text/libspectre-0.2.6:=
+	>=dev-libs/glib-2.28:2
+	dev-libs/libxslt
+	>=gnome-base/librsvg-2.22:2
+	>=gnome-extra/libgsf-1.14.9:=[introspection?]
+	>=dev-libs/libxml2-2.4.12:2
+	>=x11-libs/pango-1.24:=
+	>=x11-libs/cairo-1.10:=[svg]
+	x11-libs/libXext:=
+	x11-libs/libXrender:=
+	>=x11-libs/gdk-pixbuf-2.22:2
+	>=x11-libs/gtk+-3.2:3
+	introspection? (
+		>=dev-libs/gobject-introspection-1:=
+		>=gnome-extra/libgsf-1.14.23:= )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.12
+	>=dev-util/intltool-0.35
+	virtual/pkgconfig
+"
+# eautoreconf requires:
+# gnome-base/gnome-common
+
+src_configure() {
+	filter-flags -ffast-math
+	gnome2_src_configure \
+		--without-lasem \
+		--with-gtk \
+		--with-config-backend=gsettings \
+		$(use_enable introspection)
+}
diff --git a/x11-terms/mate-terminal/Manifest b/x11-terms/mate-terminal/Manifest
index 4b5754d1ee3e..374d6e99a47d 100644
--- a/x11-terms/mate-terminal/Manifest
+++ b/x11-terms/mate-terminal/Manifest
@@ -1 +1,2 @@
 DIST mate-terminal-1.6.2.tar.xz 1569836 SHA256 ca921dad2dc64925ecba9edc10ba29b5461207853dc81371fd2e34183c704a3d SHA512 54aa93237c127058259b6f9f68752c2067bdbc023a0eeebc4603e525b824b9a50d6868a0678905af8736885a623885155c03c94798df0916765dc5017ffcff8c WHIRLPOOL 6ddd119269f2c8cdb3aee57d434c0b0e1b6143474f2b544fd8ef32a4645726bf6839d2b857b9449f09d4480ba5a783ab4131333c1d00621d701031c602db5a05
+DIST mate-terminal-1.8.0.tar.xz 1150588 SHA256 9efe1f9e3ee6ef9bc90e233ebe0a440cdb24761edfb9743dcc8b56f8b7a57c09 SHA512 c672a85afd5188cc883eadeae468750cbe1544a8d95fd6b3af0c5d8b41aaeb563227a4d4effdc4a13ea49d823d2ac28adf4caae4f7b3c68d69f0fc49adfc00fb WHIRLPOOL 6112fb99c37c8049b9d5c9f564a387556b734cc87892afe0cbd6e0cba9777514814a15f71a025da9a3cf1a240bc86ca5257f66a14c5278ce28753fffbf737caf
diff --git a/x11-terms/mate-terminal/mate-terminal-1.8.0.ebuild b/x11-terms/mate-terminal/mate-terminal-1.8.0.ebuild
new file mode 100644
index 000000000000..31af0db476d0
--- /dev/null
+++ b/x11-terms/mate-terminal/mate-terminal-1.8.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/mate-terminal/mate-terminal-1.8.0.ebuild,v 1.1 2014/04/17 16:07:05 tomwij Exp $
+
+EAPI="5"
+
+GCONF_DEBUG="no"
+
+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="The MATE Terminal"
+HOMEPAGE="http://mate-desktop.org"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="app-text/rarian:0
+	dev-libs/atk:0
+	>=dev-libs/glib-2.25:2
+	>=gnome-base/dconf-0.10:0
+	>=mate-base/mate-desktop-1.6:0
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-2.18:2
+	x11-libs/libICE:0
+	x11-libs/libSM:0
+	x11-libs/libX11:0
+	x11-libs/pango:0
+	>=x11-libs/vte-0.27.1:0"
+
+DEPEND="${RDEPEND}
+	>=app-text/scrollkeeper-dtd-1:1.0
+	app-text/yelp-tools:0
+	>=dev-util/intltool-0.40:*
+	sys-devel/gettext:*
+	virtual/pkgconfig:*"
+
+DOCS="AUTHORS ChangeLog HACKING NEWS README"