diff --git a/app-crypt/p11-kit/p11-kit-0.20.2.ebuild b/app-crypt/p11-kit/p11-kit-0.20.2.ebuild
index 300255437f6e..c32c57f3eef2 100644
--- a/app-crypt/p11-kit/p11-kit-0.20.2.ebuild
+++ b/app-crypt/p11-kit/p11-kit-0.20.2.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/app-crypt/p11-kit/p11-kit-0.20.2.ebuild,v 1.1 2014/01/24 09:00:35 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/p11-kit/p11-kit-0.20.2.ebuild,v 1.3 2014/02/18 20:56:22 pacho Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="http://p11-glue.freedesktop.org/releases/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
 IUSE="+asn1 debug +trust"
 REQUIRED_USE="trust? ( asn1 )"
 
diff --git a/app-emacs/apel/apel-10.8-r1.ebuild b/app-emacs/apel/apel-10.8-r1.ebuild
index 5457a95f4ab1..37c61c96a56f 100644
--- a/app-emacs/apel/apel-10.8-r1.ebuild
+++ b/app-emacs/apel/apel-10.8-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/app-emacs/apel/apel-10.8-r1.ebuild,v 1.2 2014/01/15 06:59:48 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/apel/apel-10.8-r1.ebuild,v 1.3 2014/02/18 16:07:45 jer Exp $
 
 EAPI=4
 
@@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.jpl.org/pub/elisp/apel/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
 IUSE=""
 
 ELISP_PATCHES=("${FILESDIR}/${PN}-10.8-020_Prevent-fontset-error.patch"
diff --git a/app-emacs/color-theme/color-theme-6.6.0-r1.ebuild b/app-emacs/color-theme/color-theme-6.6.0-r1.ebuild
index 56fb4a384093..74fe976043a7 100644
--- a/app-emacs/color-theme/color-theme-6.6.0-r1.ebuild
+++ b/app-emacs/color-theme/color-theme-6.6.0-r1.ebuild
@@ -1,37 +1,34 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/color-theme/color-theme-6.6.0-r1.ebuild,v 1.7 2009/11/24 20:54:40 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/color-theme/color-theme-6.6.0-r1.ebuild,v 1.8 2014/02/18 20:12:15 ulm Exp $
 
-inherit elisp eutils
+EAPI=5
+
+inherit readme.gentoo elisp
 
 DESCRIPTION="Install color themes (includes many themes and allows you to share your own with the world)"
 HOMEPAGE="http://www.nongnu.org/color-theme/"
 SRC_URI="http://download.savannah.gnu.org/releases-noredirect/${PN}/${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 ppc sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
-IUSE=""
 
+ELISP_PATCHES="${P}-replace-in-string.patch"
+ELISP_REMOVE="color-theme-autoloads.*"
 SITEFILE="50${PN}-gentoo.el"
 
-src_unpack() {
-	unpack ${A}
-	rm "${S}"/*.elc "${S}"/color-theme-autoloads*
-	epatch "${FILESDIR}/${P}-replace-in-string.patch"
-}
-
 src_install() {
-	elisp-install ${PN} *.el *.elc || die
-	elisp-install ${PN}/themes themes/*.el || die
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
-	dodoc AUTHORS BUGS ChangeLog README || die
-}
+	elisp-install ${PN} *.el *.elc
+	elisp-install ${PN}/themes themes/*.el
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	dodoc AUTHORS BUGS ChangeLog README
 
-pkg_postinst() {
-	elisp-site-regen
-	elog "To use color-theme non-interactively, initialise it in your ~/.emacs"
-	elog "as in the following example (which is for the \"Blue Sea\" theme):"
-	elog "   (color-theme-initialize)"
-	elog "   (color-theme-blue-sea)"
+	DOC_CONTENTS="To use color-theme non-interactively, initialise it
+		in your ~/.emacs file as in the following example (which is
+		for the \"Blue Sea\" theme):
+		\n
+		\n(color-theme-initialize)
+		\n(color-theme-blue-sea)"
+	readme.gentoo_create_doc
 }
diff --git a/app-emacs/dictionary/Manifest b/app-emacs/dictionary/Manifest
index 1c0166cea95d..f64645812a79 100644
--- a/app-emacs/dictionary/Manifest
+++ b/app-emacs/dictionary/Manifest
@@ -1 +1,2 @@
+DIST dictionary-1.10.tar.gz 33332 SHA256 9a8e0111590b09d3587f790ed1cd6d117bf82887cb10135be93af3e1e8e5ea60 SHA512 7f5ec0e023ea2ab3f42fbf9200c1ac86cbcb330c14d2fce791f65cdce010d7e6a6c72e0589769dd94fe3c3d7543b730aacfb373e496933caccf8542224bfa356 WHIRLPOOL bd1d2efad94679981de38b3e14497c256d4bfe23a532e16e6457c89aa1a27e5ffe68433e50647cc42c6090d4f15f9fd6616f38c3819a4fbe8f3718bfa93d10d2
 DIST dictionary-1.8.7.tar.gz 32764 SHA256 c2b6445df24d9e105e5e6dcad03de1d5fe93c44b39408142d118245771ce4432 SHA512 29bba42bc8996430696e74dd3490e748c58fed19c87dbf40e1ffe73b85ace6998fc9fc20562626be127219bf274be49de6fb5cf5b0a3c64f0e7c66a963ecca76 WHIRLPOOL bc5754db222449046019adf0d7887935ea95329cdfdd67f827914c816c78c2f3f39c5cb390a114de2ce08871a716417d86d56b9da77f53f4402d594f67cf4431
diff --git a/app-emacs/dictionary/dictionary-1.10.ebuild b/app-emacs/dictionary/dictionary-1.10.ebuild
new file mode 100644
index 000000000000..2571f37d5fd1
--- /dev/null
+++ b/app-emacs/dictionary/dictionary-1.10.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/dictionary/dictionary-1.10.ebuild,v 1.1 2014/02/18 23:30:12 ulm Exp $
+
+EAPI=5
+
+inherit elisp
+
+DESCRIPTION="Emacs package for talking to a dictionary server"
+HOMEPAGE="http://www.myrkr.in-berlin.de/dictionary/index.html"
+SRC_URI="http://www.myrkr.in-berlin.de/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+ELISP_REMOVE="install-package.el lpath.el"
+SITEFILE="50${PN}-gentoo-${PV}.el"
+DOCS="README"
diff --git a/app-emacs/dictionary/files/50dictionary-gentoo-1.10.el b/app-emacs/dictionary/files/50dictionary-gentoo-1.10.el
new file mode 100644
index 000000000000..b2a907f6fedf
--- /dev/null
+++ b/app-emacs/dictionary/files/50dictionary-gentoo-1.10.el
@@ -0,0 +1,2 @@
+(add-to-list 'load-path "@SITELISP@")
+(load "dictionary-init")
diff --git a/app-emacs/elscreen/elscreen-1.4.6-r1.ebuild b/app-emacs/elscreen/elscreen-1.4.6-r1.ebuild
index da91bbdaea9c..6c0b87759b7d 100644
--- a/app-emacs/elscreen/elscreen-1.4.6-r1.ebuild
+++ b/app-emacs/elscreen/elscreen-1.4.6-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/elscreen/elscreen-1.4.6-r1.ebuild,v 1.1 2013/10/03 11:36:26 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/elscreen/elscreen-1.4.6-r1.ebuild,v 1.2 2014/02/18 16:08:13 jer Exp $
 
 EAPI="4"
 
@@ -12,7 +12,7 @@ SRC_URI="ftp://ftp.morishima.net/pub/morishima.net/naoto/ElScreen/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 DEPEND=">=app-emacs/apel-10.8-r1"
diff --git a/app-emacs/emacs-wget/emacs-wget-0.5.0-r1.ebuild b/app-emacs/emacs-wget/emacs-wget-0.5.0-r1.ebuild
new file mode 100644
index 000000000000..5c0d464d6a1a
--- /dev/null
+++ b/app-emacs/emacs-wget/emacs-wget-0.5.0-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-wget/emacs-wget-0.5.0-r1.ebuild,v 1.1 2014/02/19 07:00:53 ulm Exp $
+
+EAPI=5
+
+inherit elisp
+
+DESCRIPTION="Wget interface for Emacs"
+HOMEPAGE="http://www.emacswiki.org/emacs/EmacsWget"
+SRC_URI="http://pop-club.hp.infoseek.co.jp/emacs/emacs-wget/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86"
+IUSE="linguas_ja"
+
+RDEPEND=">=net-misc/wget-1.8.2"
+
+ELISP_REMOVE="lpath.el"
+SITEFILE="50${PN}-gentoo.el"
+
+src_install() {
+	elisp_src_install
+	dodoc ChangeLog README USAGE
+	use linguas_ja && dodoc README.ja USAGE.ja
+}
diff --git a/app-emacs/emacs-wget/files/50emacs-wget-gentoo.el b/app-emacs/emacs-wget/files/50emacs-wget-gentoo.el
new file mode 100644
index 000000000000..51afcaf6d4c1
--- /dev/null
+++ b/app-emacs/emacs-wget/files/50emacs-wget-gentoo.el
@@ -0,0 +1,4 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'wget "wget" "wget interface for Emacs." t)
+(autoload 'wget-web-page "wget" "wget interface to download whole web page." t)
+(add-hook 'w3m-mode-hook (lambda () (require 'w3m-wget)))
diff --git a/app-emacs/limit/limit-1.14.10_pre200811252332.ebuild b/app-emacs/limit/limit-1.14.10_pre200811252332.ebuild
index 4ee16f7ef7ec..66bef9ae3c31 100644
--- a/app-emacs/limit/limit-1.14.10_pre200811252332.ebuild
+++ b/app-emacs/limit/limit-1.14.10_pre200811252332.ebuild
@@ -1,20 +1,21 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/limit/limit-1.14.10_pre200811252332.ebuild,v 1.6 2009/07/16 16:42:57 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/limit/limit-1.14.10_pre200811252332.ebuild,v 1.7 2014/02/18 19:53:10 ulm Exp $
 
-inherit elisp versionator
+EAPI=5
 
-MY_PV=( $(get_version_components) )
-MY_P="${PN}-${MY_PV[0]}_${MY_PV[1]}-${MY_PV[3]#pre}"
+inherit elisp
+
+MY_PV="${PV/./_}"; MY_PV="${MY_PV/.*_pre/-}"
+MY_P="${PN}-${MY_PV}"
 
 DESCRIPTION="Library about Internet Message, for IT generation"
-HOMEPAGE="http://cvs.m17n.org/elisp/FLIM/"
+HOMEPAGE="http://git.chise.org/elisp/flim/"
 SRC_URI="http://www.jpl.org/ftp/pub/m17n/${MY_P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="alpha amd64 ppc sparc x86"
-IUSE=""
 
 DEPEND=">=app-emacs/apel-10.3"
 RDEPEND="${DEPEND}
@@ -26,16 +27,15 @@ SITEFILE="60flim-gentoo.el"
 src_compile() {
 	emake PREFIX="${D}/usr" \
 		LISPDIR="${D}/${SITELISP}" \
-		VERSION_SPECIFIC_LISPDIR="${D}/${SITELISP}" || die "emake failed"
+		VERSION_SPECIFIC_LISPDIR="${D}/${SITELISP}"
 }
 
 src_install() {
 	emake PREFIX="${D}/usr" \
 		LISPDIR="${D}/${SITELISP}" \
-		VERSION_SPECIFIC_LISPDIR="${D}/${SITELISP}" install \
-		|| die "emake install failed"
+		VERSION_SPECIFIC_LISPDIR="${D}/${SITELISP}" install
 
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
 
-	dodoc FLIM-API.en NEWS VERSION README* ChangeLog || die "dodoc failed"
+	dodoc FLIM-API.en NEWS VERSION README* ChangeLog
 }
diff --git a/app-emacs/paredit/Manifest b/app-emacs/paredit/Manifest
index ddbca8844369..97c263bb5443 100644
--- a/app-emacs/paredit/Manifest
+++ b/app-emacs/paredit/Manifest
@@ -1,2 +1,2 @@
 DIST paredit-22.tar.bz2 23140 SHA256 51786d7c78261e2f282f9045c1fac202c7055d82517fdd5fe0accb03fea2a03c SHA512 2ccfe1afee96f8755bf007710cebbcd6e74a89c740c0975d814820d67d592878c6fb505138613894e164628b41ae491a992f5f060f943e79a95dd4026fdd9f6d WHIRLPOOL 5b548ca59af48c095feb63f88750201636665a70224b92f14509f1a55be666359bba8c4fae21d027a56a59c01ec6651f9e444b540876fe2c6e349a8532f609cb
-DIST paredit-23.tar.xz 24244 SHA256 615d90df0d3e551a340fdc824cc5fa197e796677e6bc4f0985f2985d6f2560bf SHA512 e63ff4b694d3ed2761b08efda7c4a1386cb2f1d243f8f456b89f12d9383a16f71ccc508d27d961a735677183c30681d35000134a8456bb2209e58c8f8ff6b289 WHIRLPOOL 5651125e233d9d2042c24d004ed507125bdb694e52fba47e867daf6088b8eaacc9c555f8376739b360531acc91fb2763bc142331f19ab8289a6c2b3723b741ac
+DIST paredit-23.tar.xz 24204 SHA256 c501d5a716258a6b6758cc40d3e12b3d7271e62b457202271402e8ad43053478 SHA512 33ae10d95d3b2d8fe2466fba20d6aa0abac56684807fb381ab0db2798e99e2358c6dca71794b95768b53be661b9181f458e932bb37c31ba7ebba155a57f1bb01 WHIRLPOOL 4e2f6ee89f6cf9edd4b0b88e03f8b26f288f646cca14324025d022d34d756e44cfb8bb8289345ca77f3bdeecc1d1c114c90a496d094149d4d0f59ce28affce93
diff --git a/app-emacs/paredit/paredit-23.ebuild b/app-emacs/paredit/paredit-23-r1.ebuild
similarity index 82%
rename from app-emacs/paredit/paredit-23.ebuild
rename to app-emacs/paredit/paredit-23-r1.ebuild
index dc63ceff590d..b60fb4494509 100644
--- a/app-emacs/paredit/paredit-23.ebuild
+++ b/app-emacs/paredit/paredit-23-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/app-emacs/paredit/paredit-23.ebuild,v 1.1 2014/02/15 20:25:02 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/paredit/paredit-23-r1.ebuild,v 1.1 2014/02/18 13:13:08 ulm Exp $
 
 EAPI=5
 
diff --git a/app-emacs/qwerty/qwerty-1.1.ebuild b/app-emacs/qwerty/qwerty-1.1.ebuild
index 3c1607e7712f..d04baf05fa44 100644
--- a/app-emacs/qwerty/qwerty-1.1.ebuild
+++ b/app-emacs/qwerty/qwerty-1.1.ebuild
@@ -1,17 +1,18 @@
-# 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/app-emacs/qwerty/qwerty-1.1.ebuild,v 1.14 2010/03/05 23:01:21 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/qwerty/qwerty-1.1.ebuild,v 1.15 2014/02/18 23:05:53 ulm Exp $
+
+EAPI=5
 
 inherit elisp
 
 DESCRIPTION="Switch between QWERTY and DVORAK without changing the console keymap"
-# gnu.emacs.sources Message-ID: <NJ104.93Mar1125218@bootes.cus.cam.ac.uk>"
+# gnu.emacs.sources Message-ID: <NJ104.93Mar1125218@bootes.cus.cam.ac.uk>
 HOMEPAGE="http://groups.google.com/group/gnu.emacs.sources/msg/eab31c752dfdd3a5"
 SRC_URI="mirror://gentoo/${P}.tar.gz"
 
-LICENSE="GPL-1"
+LICENSE="GPL-1+"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
-IUSE=""
 
 SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/wanderlust/Manifest b/app-emacs/wanderlust/Manifest
index 0b3aac8ec8a5..59aaa7093871 100644
--- a/app-emacs/wanderlust/Manifest
+++ b/app-emacs/wanderlust/Manifest
@@ -1,4 +1,4 @@
 DIST wanderlust-2.14.0-20050405.patch.gz 3926 SHA256 240f32ece554b2afe7142ea557b41d0eb9667b8003ca00d390abe62e4b68ce16 SHA512 103e8eda374eab453363f3a735d877e313ff341e09abd66093bd090b404738d42d98edf5d1c9c8e8966963bf972d462aebc28ea6e470126af9266188247c4044 WHIRLPOOL 22518205351c26fe38e4c734778a3754fced5309a21395bd471b82f76e19baddeb333561572b8b4be9d02d744c8d9f7212c97270167af463e983d336393b280b
-DIST wanderlust-2.15.9_pre20101102.tar.bz2 874598 SHA256 99b9fea0b9edbcdf00461abc73450bd41b87489f701b3371d2d5bf86035ccf16 SHA512 266786be2d6fd1eb748c01f2cd1175a0a75309ce6ef435d3297963324d967e1c6f5b71dc5d858cfa0d5a59f5ef28f5c8b6497e3e68703ea601b5b9bccb4fb187 WHIRLPOOL 869b1b89cd9c6509f841c3ee37fadd68a5e6ed303412a3b0789181e1b621b67956033bebde9b574246e2ea4928325a4347145b4cedbabcde1a22149bc7c20589
+DIST wanderlust-2.15.9_p20130619.tar.xz 818124 SHA256 cabc2f1a025d6c93484bc60dcda0672a9a8eef6c2c1932a21cfa6f2e2f377bcb SHA512 91bdcc1b29370b7be7a2072f4d8c638b3c0604ba31b5419952b848af268e73a3f199f07a88caabec56f66b38013e0f9cd7c1de26b46d1062ddff782e8080d4e0 WHIRLPOOL 99eac7cb2a623389161dc1e9cc0883b89e92d411c93757180140d94c7ce352d0b76a392bdd4439f551ecc5bd934b70a15391df6a60103ad97f1b3fd63de6b95a
 DIST wanderlust-2.15.9_pre20120923.tar.xz 815844 SHA256 651dcbf171909d00f09f53821baae2b01e63cec1396d3b9142ed5b2e45a07c14 SHA512 2b58354e129db0dbe20c28d478bec7e0c5e9b26e115894f64fac223aa93df943758c7207ec1f00a4d75cf76991265fbc33899b1cc6871f13fe56ba001001e58b WHIRLPOOL 8f5f75963c1dd3d933e6ccc97317609fd483a8eb2ef41f584a725ecd65d9cd4d47f5287edb482cff08173cc79f5b4e7e22b026099022ee94104216a54ebd6b3b
 DIST wl-2.14.0.tar.gz 1101505 SHA256 883b61e7e9560aff35efcf7d0d48b0ddd7cde598895ffd111ff214072253eb1f SHA512 edb49c0c9ddbd50cba4ce4cdd1b2d609cee9553d063aeb4775d0b43e0ed83cc6374aa47b11b3ff94a55827f7a9a29f7c1054e0fd9b3a5a25a2c410b241d268d2 WHIRLPOOL 14e3c879e98ffbe2ae7e4ed1b63328f1937b7ca31aebae500b1bf100a6ca5db78f72c87ecd2f0aa65d1e3468741d2753e0ac2ddc98d9108482935bef0590a03b
diff --git a/app-emacs/wanderlust/wanderlust-2.15.9_pre20101102.ebuild b/app-emacs/wanderlust/wanderlust-2.15.9_p20130619.ebuild
similarity index 68%
rename from app-emacs/wanderlust/wanderlust-2.15.9_pre20101102.ebuild
rename to app-emacs/wanderlust/wanderlust-2.15.9_p20130619.ebuild
index 65baf0f2f317..dce0b2f1899e 100644
--- a/app-emacs/wanderlust/wanderlust-2.15.9_pre20101102.ebuild
+++ b/app-emacs/wanderlust/wanderlust-2.15.9_p20130619.ebuild
@@ -1,14 +1,15 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/wanderlust/wanderlust-2.15.9_pre20101102.ebuild,v 1.2 2013/01/21 23:02:01 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/wanderlust/wanderlust-2.15.9_p20130619.ebuild,v 1.1 2014/02/18 19:38:29 ulm Exp $
 
-EAPI=3
+EAPI=5
 
 inherit elisp
 
 DESCRIPTION="Yet Another Message Interface on Emacsen"
-HOMEPAGE="http://www.gohome.org/wl/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
+HOMEPAGE="https://github.com/wanderlust/wanderlust
+	http://emacswiki.org/emacs/WanderLust"
+SRC_URI="http://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
@@ -19,8 +20,7 @@ DEPEND=">=app-emacs/apel-10.6
 	virtual/emacs-flim
 	app-emacs/semi
 	bbdb? ( app-emacs/bbdb )"
-RDEPEND="!app-emacs/wanderlust-cvs
-	${DEPEND}"
+RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${PN}"
 SITEFILE="50${PN}-gentoo.el"
@@ -33,26 +33,26 @@ src_configure() {
 }
 
 src_compile() {
-	emake || die "emake failed"
-	emake info || die "emake info failed"
+	emake
+	emake info
 }
 
 src_install() {
 	emake \
 		LISPDIR="${ED}${SITELISP}" \
 		PIXMAPDIR="${ED}${SITEETC}/wl/icons" \
-		install || die "emake install failed"
+		install
 
 	elisp-site-file-install "${FILESDIR}/${SITEFILE}" wl || die
 
 	insinto "${SITEETC}/wl/samples/en"
-	doins samples/en/* || die
-	doinfo doc/wl*.info || die
-	dodoc BUGS ChangeLog INSTALL NEWS README
+	doins samples/en/*
+	doinfo doc/wl*.info
+	dodoc BUGS ChangeLog INSTALL NEWS README.md
 
 	if use linguas_ja; then
 		insinto "${SITEETC}/wl/samples/ja"
-		doins samples/ja/* || die
+		doins samples/ja/*
 		dodoc BUGS.ja INSTALL.ja NEWS.ja README.ja
 	fi
 }
diff --git a/app-emulation/xen-pvgrub/Manifest b/app-emulation/xen-pvgrub/Manifest
index 744197250273..f8192d38ac69 100644
--- a/app-emulation/xen-pvgrub/Manifest
+++ b/app-emulation/xen-pvgrub/Manifest
@@ -7,5 +7,7 @@ DIST polarssl-1.1.4-gpl.tgz 611340 SHA256 2d29fd04a0d0ba29dae6bd29fb418944c08d39
 DIST xen-4.2.2.tar.gz 15602746 SHA256 c9bfe91a5e72f8545acebad9889d64368020359bfe18044c0e683133e55ae005 SHA512 4943b18016ed8c2b194a3b55e6655b3b734b39ffb8cb7ee0a0580f2f4460a1d0e92e1de8ac23f5186272914fad1650586af51fd7c3644d0310eb16f2e11c5e80 WHIRLPOOL 519eb87cb2da694696cbc3e72070a0a3bdb07c46fa266d855d8379eec3a92adfa4d434af3ac01c37834ce4a9174081a6c40030b185a70902329b185cb8d0bbea
 DIST xen-4.2.3-upstream-patches-0.tar.xz 84436 SHA256 7c2477b9b29c9d84bb26ed60bfc2700f2a614ed8040b93906e801831f3498b41 SHA512 a4e8b53a0efb9d64d4dc65ee3107422c8007537e03f9c8e6f1b2c838cf62e6819d447c1ed44aacb5c4e9979f0dad7ed313d2db61df6e6ad2d7708a81964a7e12 WHIRLPOOL cc3c2224bba3b2e5f057ec95f9e85e58b17bc0dce338da429c7970877967cddf69228258ff491be9c1d022169a90fcde34ef1bcb0c198c9123ca219707a5a99f
 DIST xen-4.2.3.tar.gz 15613235 SHA256 69b6a73701383d609ad094a38925004e8595755fb39a6fafd579ba754e8667db SHA512 01521c8724354f92a2555683a8b103e5e16aedeb2c6166cc3ce40a0cc6cd9e07a601aa24930bb7391e00eb97f04003e6523dead09382cf86eb56f5b886509b9a WHIRLPOOL e7f7848ad632e5e77db95b2eb37c82f31a73021af4b6bb44091cc14103faa193bc2d6deb089e2a196daab5a08dbc08f135a8937a25a4ff5d31fe37c789bae1e9
+DIST xen-4.2.4.tar.gz 15663999 SHA256 e23e6292affd7a6d82da99527e8bf3964e57eb7322144c67c2025692b1a21550 SHA512 3e5263511e7c40899f580f3384bd987f9c875b8e6816202fd1a5a64fe7e336803d09e58148af074938ef261f0ceeafad121ac541ddd2bf66b76c5aa4ad07c357 WHIRLPOOL 25d23f5d921139ba0f853fcd76ae998647d32292bccfd4e7c4f3b12f860a38fbb33ebda67c839657bf3a25d837c9c02b80d663362263d16d42284ffde09f0bc2
 DIST xen-4.3.1.tar.gz 16429423 SHA256 3b5b7cc508b1739753585b5c25635471cdcef680e8770a78bf6ef9333d26a9fd SHA512 f5250ad5ad3defc5dc1207eb6208a3928128ef57ac4162018bd92b750dc1df1eaaf37835528aca33a0f9e04c82d5f8c4ba79c03a1780d2b72cbb90cc26f77275 WHIRLPOOL 087390786cea9aee273a5d81988436303991aa5ea92faf111d3b619517368f8c8feef84f4f8c602cac723980a344eb90414887db4ca88a2ee14bc6b0253e36ca
+DIST xen-4.3.2.tar.gz 16472188 SHA256 17611d95f955302560ff72d97c08933b4e62bc2e8ffb71400fc54e388746ff69 SHA512 ec94d849b56ec590b89022075ce43768d8ef44b7be9580ce032509b44c085f0f66495845607a18cd3dea6b89c69bc2a18012705556f59288cd8653c3e5eca302 WHIRLPOOL 72250369fb2c90ba608e1da018cb6417b3089642c8ba59af9f2825ec5ba7c4e6c5d6f86140b20825817e4625727c6d58c5d38b00863c994e31c8a04927997bd3
 DIST zlib-1.2.3.tar.gz 496597 SHA256 1795c7d067a43174113fdf03447532f373e1c6c57c08d61d9e4e9be5e244b05e SHA512 021b958fcd0d346c4ba761bcf0cc40f3522de6186cf5a0a6ea34a70504ce9622b1c2626fce40675bc8282cf5f5ade18473656abc38050f72f5d6480507a2106e WHIRLPOOL 8fd7010faf6a48a9c7ff4bcfe3ce4fe9061eb541259e0a2d0def214e8c4becf2b22e8d6f96f65ca827abffeaa9d96e95ed2402844f99835f7b079fc9f3e84276
diff --git a/app-emulation/xen-pvgrub/xen-pvgrub-4.2.4.ebuild b/app-emulation/xen-pvgrub/xen-pvgrub-4.2.4.ebuild
new file mode 100644
index 000000000000..3aea1bcadd1c
--- /dev/null
+++ b/app-emulation/xen-pvgrub/xen-pvgrub-4.2.4.ebuild
@@ -0,0 +1,161 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-pvgrub/xen-pvgrub-4.2.4.ebuild,v 1.1 2014/02/19 07:06:02 dlan Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+PYTHON_REQ_USE='xml,threads'
+
+inherit flag-o-matic eutils multilib python-single-r1 toolchain-funcs
+
+XEN_EXTFILES_URL="http://xenbits.xensource.com/xen-extfiles"
+LIBPCI_URL=ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci
+GRUB_URL=mirror://gnu-alpha/grub
+
+UPSTREAM_VER=
+GENTOO_VER=
+
+[[ -n ${UPSTREAM_VER} ]] && \
+	UPSTREAM_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P/-pvgrub/}-upstream-patches-${UPSTREAM_VER}.tar.xz"
+[[ -n ${GENTOO_VER} ]] && \
+	GENTOO_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P/-pvgrub/}-gentoo-patches-${GENTOO_VER}.tar.xz"
+
+SRC_URI="
+		http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz
+		$GRUB_URL/grub-0.97.tar.gz
+		$XEN_EXTFILES_URL/zlib-1.2.3.tar.gz
+		$LIBPCI_URL/pciutils-2.2.9.tar.bz2
+		$XEN_EXTFILES_URL/lwip-1.3.0.tar.gz
+		$XEN_EXTFILES_URL/newlib/newlib-1.16.0.tar.gz
+		${UPSTREAM_PATCHSET_URI}
+		${GENTOO_PATCHSET_URI}
+		"
+
+S="${WORKDIR}/xen-${PV}"
+
+DESCRIPTION="allows to boot Xen domU kernels from a menu.lst laying inside guest filesystem"
+HOMEPAGE="http://xen.org/"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="custom-cflags"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="sys-devel/gettext"
+
+RDEPEND=">=app-emulation/xen-4.2.1"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+retar-externals() {
+	# Purely to unclutter src_prepare
+	local set="grub-0.97.tar.gz lwip-1.3.0.tar.gz newlib-1.16.0.tar.gz zlib-1.2.3.tar.gz"
+
+	# epatch can't patch in $WORKDIR, requires a sed; Bug #455194. Patchable, but sed informative
+	sed -e s':AR=${AR-"ar rc"}:AR=${AR-"ar"}:' \
+		-i "${WORKDIR}"/zlib-1.2.3/configure
+	sed -e 's:^AR=ar rc:AR=ar:' \
+		-e s':$(AR) $@:$(AR) rc $@:' \
+		-i "${WORKDIR}"/zlib-1.2.3/{Makefile,Makefile.in}
+	einfo "zlib Makefile edited"
+
+	cd "${WORKDIR}"
+	tar czp zlib-1.2.3 -f zlib-1.2.3.tar.gz
+	tar czp grub-0.97 -f grub-0.97.tar.gz
+	tar czp lwip -f lwip-1.3.0.tar.gz
+	tar czp newlib-1.16.0 -f newlib-1.16.0.tar.gz
+	mv $set "${S}"/stubdom/
+	einfo "tarballs moved to source"
+}
+
+src_prepare() {
+	# Upstream's patchset
+	if [[ -n ${UPSTREAM_VER} ]]; then
+		EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" \
+			epatch "${WORKDIR}"/patches-upstream
+	fi
+
+	# Gentoo's patchset
+	if [[ -n ${GENTOO_VER} ]]; then
+		EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" \
+			epatch "${WORKDIR}"/patches-gentoo
+	fi
+
+	# if the user *really* wants to use their own custom-cflags, let them
+	if use custom-cflags; then
+		einfo "User wants their own CFLAGS - removing defaults"
+		# try and remove all the default custom-cflags
+		find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \
+			-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
+			-i {} \;
+	fi
+
+	# Patch the unmergeable newlib, fix most of the leftover gcc QA issues
+	cp "${FILESDIR}"/newlib-implicits.patch stubdom || die
+
+	# Patch stubdom/Makefile to patch insource newlib & prevent internal downloading
+	epatch "${FILESDIR}"/${PN/-pvgrub/}-4.2.1-externals.patch
+
+	# Drop .config and Fix gcc-4.6
+	epatch 	"${FILESDIR}"/${PN/-pvgrub/}-4-fix_dotconfig-gcc.patch
+
+	# fix jobserver in Makefile
+	epatch "${FILESDIR}"/${PN}-4.2-jserver.patch
+
+	# gcc warnings/QA fix
+	epatch "${FILESDIR}"/${PN}-4.2.3-qa.patch
+
+	#Substitute for internal downloading. pciutils copied only due to the only .bz2
+	cp "${DISTDIR}"/pciutils-2.2.9.tar.bz2 ./stubdom/ || die "pciutils not copied to stubdom"
+	retar-externals || die "re-tar procedure failed"
+}
+
+src_compile() {
+	use custom-cflags || unset CFLAGS
+	if test-flag-CC -fno-strict-overflow; then
+		append-flags -fno-strict-overflow
+	fi
+
+	emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" -C tools/include
+
+	if use x86; then
+		emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" \
+		XEN_TARGET_ARCH="x86_32" -C stubdom pv-grub
+	elif use amd64; then
+		emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" \
+		XEN_TARGET_ARCH="x86_64" -C stubdom pv-grub
+		if has_multilib_profile; then
+			multilib_toolchain_setup x86
+			emake CC="$(tc-getCC)" AR="$(tc-getAR)" \
+			XEN_TARGET_ARCH="x86_32" -C stubdom pv-grub
+		fi
+	fi
+}
+
+src_install() {
+	if use x86; then
+		emake XEN_TARGET_ARCH="x86_32" DESTDIR="${D}" -C stubdom install-grub
+	fi
+	if use amd64; then
+		emake XEN_TARGET_ARCH="x86_64" DESTDIR="${D}" -C stubdom install-grub
+		if has_multilib_profile; then
+			emake XEN_TARGET_ARCH="x86_32" DESTDIR="${D}" -C stubdom install-grub
+		fi
+	fi
+}
+
+pkg_postinst() {
+	elog "Official Xen Guide and the offical wiki page:"
+	elog "http://www.gentoo.org/doc/en/xen-guide.xml"
+	elog "http://wiki.xen.org/wiki/Main_Page"
+}
diff --git a/app-emulation/xen-pvgrub/xen-pvgrub-4.3.2.ebuild b/app-emulation/xen-pvgrub/xen-pvgrub-4.3.2.ebuild
new file mode 100644
index 000000000000..6e7c6001e537
--- /dev/null
+++ b/app-emulation/xen-pvgrub/xen-pvgrub-4.3.2.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-pvgrub/xen-pvgrub-4.3.2.ebuild,v 1.1 2014/02/19 07:06:02 dlan Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+PYTHON_REQ_USE='xml,threads'
+
+inherit flag-o-matic eutils multilib python-single-r1 toolchain-funcs
+
+XEN_EXTFILES_URL="http://xenbits.xensource.com/xen-extfiles"
+LIBPCI_URL=ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci
+GRUB_URL=mirror://gnu-alpha/grub
+SRC_URI="
+		http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz
+		$GRUB_URL/grub-0.97.tar.gz
+		$XEN_EXTFILES_URL/zlib-1.2.3.tar.gz
+		$LIBPCI_URL/pciutils-2.2.9.tar.bz2
+		$XEN_EXTFILES_URL/lwip-1.3.0.tar.gz
+		$XEN_EXTFILES_URL/newlib/newlib-1.16.0.tar.gz
+		$XEN_EXTFILES_URL/polarssl-1.1.4-gpl.tgz"
+
+S="${WORKDIR}/xen-${PV}"
+
+DESCRIPTION="allows to boot Xen domU kernels from a menu.lst laying inside guest filesystem"
+HOMEPAGE="http://xen.org/"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="custom-cflags"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="sys-devel/gettext
+	sys-apps/texinfo"
+
+RDEPEND=">=app-emulation/xen-4.2.1"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+retar-externals() {
+	# Purely to unclutter src_prepare
+	local set="grub-0.97.tar.gz lwip-1.3.0.tar.gz newlib-1.16.0.tar.gz polarssl-1.1.4-gpl.tgz zlib-1.2.3.tar.gz"
+
+	# epatch can't patch in $WORKDIR, requires a sed; Bug #455194. Patchable, but sed informative
+	sed -e s':AR=${AR-"ar rc"}:AR=${AR-"ar"}:' \
+		-i "${WORKDIR}"/zlib-1.2.3/configure
+	sed -e 's:^AR=ar rc:AR=ar:' \
+		-e s':$(AR) $@:$(AR) rc $@:' \
+		-i "${WORKDIR}"/zlib-1.2.3/{Makefile,Makefile.in}
+	einfo "zlib Makefile edited"
+
+	cd "${WORKDIR}"
+	tar czp zlib-1.2.3 -f zlib-1.2.3.tar.gz
+	tar czp grub-0.97 -f grub-0.97.tar.gz
+	tar czp lwip -f lwip-1.3.0.tar.gz
+	tar czp newlib-1.16.0 -f newlib-1.16.0.tar.gz
+	tar czp polarssl-1.1.4 -f polarssl-1.1.4-gpl.tgz
+	mv $set "${S}"/stubdom/
+	einfo "tarballs moved to source"
+}
+
+src_prepare() {
+	# if the user *really* wants to use their own custom-cflags, let them
+	if use custom-cflags; then
+		einfo "User wants their own CFLAGS - removing defaults"
+		# try and remove all the default custom-cflags
+		find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \
+			-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
+			-i {} \;
+	fi
+
+	# Patch the unmergeable newlib, fix most of the leftover gcc QA issues
+	cp "${FILESDIR}"/newlib-implicits.patch stubdom || die
+
+	# Patch stubdom/Makefile to patch insource newlib & prevent internal downloading
+	epatch "${FILESDIR}"/${PN/-pvgrub/}-4.3-externals.patch
+
+	# Drop .config and Fix gcc-4.6
+	epatch 	"${FILESDIR}"/${PN/-pvgrub/}-4.3-fix_dotconfig-gcc.patch
+
+	# fix jobserver in Makefile
+	epatch "${FILESDIR}"/${PN}-4.2-jserver.patch
+
+	# gcc warnings/QA fix
+	epatch "${FILESDIR}"/${PN}-4.3.1-qa.patch
+
+	#Substitute for internal downloading. pciutils copied only due to the only .bz2
+	cp "${DISTDIR}"/pciutils-2.2.9.tar.bz2 ./stubdom/ || die "pciutils not copied to stubdom"
+	retar-externals || die "re-tar procedure failed"
+}
+
+src_compile() {
+	use custom-cflags || unset CFLAGS
+	if test-flag-CC -fno-strict-overflow; then
+		append-flags -fno-strict-overflow
+	fi
+
+	emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" -C tools/include
+
+	if use x86; then
+		emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" \
+		XEN_TARGET_ARCH="x86_32" -C stubdom pv-grub
+	elif use amd64; then
+		emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" \
+		XEN_TARGET_ARCH="x86_64" -C stubdom pv-grub
+		if has_multilib_profile; then
+			multilib_toolchain_setup x86
+			emake CC="$(tc-getCC)" AR="$(tc-getAR)" \
+			XEN_TARGET_ARCH="x86_32" -C stubdom pv-grub
+		fi
+	fi
+}
+
+src_install() {
+	if use x86; then
+		emake XEN_TARGET_ARCH="x86_32" DESTDIR="${D}" -C stubdom install-grub
+	fi
+	if use amd64; then
+		emake XEN_TARGET_ARCH="x86_64" DESTDIR="${D}" -C stubdom install-grub
+		if has_multilib_profile; then
+			emake XEN_TARGET_ARCH="x86_32" DESTDIR="${D}" -C stubdom install-grub
+		fi
+	fi
+}
+
+pkg_postinst() {
+	elog "Official Xen Guide and the offical wiki page:"
+	elog "https://wiki.gentoo.org/wiki/Xen"
+	elog "http://wiki.xen.org/wiki/Main_Page"
+}
diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest
index e364613e4da0..343e928ae378 100644
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@@ -5,4 +5,6 @@ DIST seabios-dir-remote-20130720.tar.gz 3201017 SHA256 0cf06b54e8ae1cfc25f2942ee
 DIST xen-4.2.2.tar.gz 15602746 SHA256 c9bfe91a5e72f8545acebad9889d64368020359bfe18044c0e683133e55ae005 SHA512 4943b18016ed8c2b194a3b55e6655b3b734b39ffb8cb7ee0a0580f2f4460a1d0e92e1de8ac23f5186272914fad1650586af51fd7c3644d0310eb16f2e11c5e80 WHIRLPOOL 519eb87cb2da694696cbc3e72070a0a3bdb07c46fa266d855d8379eec3a92adfa4d434af3ac01c37834ce4a9174081a6c40030b185a70902329b185cb8d0bbea
 DIST xen-4.2.3-upstream-patches-0.tar.xz 84436 SHA256 7c2477b9b29c9d84bb26ed60bfc2700f2a614ed8040b93906e801831f3498b41 SHA512 a4e8b53a0efb9d64d4dc65ee3107422c8007537e03f9c8e6f1b2c838cf62e6819d447c1ed44aacb5c4e9979f0dad7ed313d2db61df6e6ad2d7708a81964a7e12 WHIRLPOOL cc3c2224bba3b2e5f057ec95f9e85e58b17bc0dce338da429c7970877967cddf69228258ff491be9c1d022169a90fcde34ef1bcb0c198c9123ca219707a5a99f
 DIST xen-4.2.3.tar.gz 15613235 SHA256 69b6a73701383d609ad094a38925004e8595755fb39a6fafd579ba754e8667db SHA512 01521c8724354f92a2555683a8b103e5e16aedeb2c6166cc3ce40a0cc6cd9e07a601aa24930bb7391e00eb97f04003e6523dead09382cf86eb56f5b886509b9a WHIRLPOOL e7f7848ad632e5e77db95b2eb37c82f31a73021af4b6bb44091cc14103faa193bc2d6deb089e2a196daab5a08dbc08f135a8937a25a4ff5d31fe37c789bae1e9
+DIST xen-4.2.4.tar.gz 15663999 SHA256 e23e6292affd7a6d82da99527e8bf3964e57eb7322144c67c2025692b1a21550 SHA512 3e5263511e7c40899f580f3384bd987f9c875b8e6816202fd1a5a64fe7e336803d09e58148af074938ef261f0ceeafad121ac541ddd2bf66b76c5aa4ad07c357 WHIRLPOOL 25d23f5d921139ba0f853fcd76ae998647d32292bccfd4e7c4f3b12f860a38fbb33ebda67c839657bf3a25d837c9c02b80d663362263d16d42284ffde09f0bc2
 DIST xen-4.3.1.tar.gz 16429423 SHA256 3b5b7cc508b1739753585b5c25635471cdcef680e8770a78bf6ef9333d26a9fd SHA512 f5250ad5ad3defc5dc1207eb6208a3928128ef57ac4162018bd92b750dc1df1eaaf37835528aca33a0f9e04c82d5f8c4ba79c03a1780d2b72cbb90cc26f77275 WHIRLPOOL 087390786cea9aee273a5d81988436303991aa5ea92faf111d3b619517368f8c8feef84f4f8c602cac723980a344eb90414887db4ca88a2ee14bc6b0253e36ca
+DIST xen-4.3.2.tar.gz 16472188 SHA256 17611d95f955302560ff72d97c08933b4e62bc2e8ffb71400fc54e388746ff69 SHA512 ec94d849b56ec590b89022075ce43768d8ef44b7be9580ce032509b44c085f0f66495845607a18cd3dea6b89c69bc2a18012705556f59288cd8653c3e5eca302 WHIRLPOOL 72250369fb2c90ba608e1da018cb6417b3089642c8ba59af9f2825ec5ba7c4e6c5d6f86140b20825817e4625727c6d58c5d38b00863c994e31c8a04927997bd3
diff --git a/app-emulation/xen-tools/files/xen-tools-4-unbundle-ipxe.patch b/app-emulation/xen-tools/files/xen-tools-4-unbundle-ipxe.patch
new file mode 100644
index 000000000000..902c9ac4efbd
--- /dev/null
+++ b/app-emulation/xen-tools/files/xen-tools-4-unbundle-ipxe.patch
@@ -0,0 +1,33 @@
+--- xen-4.2.0/tools/firmware/hvmloader/Makefile.orig	2012-05-27 21:57:04.481812859 +0100
++++ xen-4.2.0/tools/firmware/hvmloader/Makefile	2012-06-02 18:52:44.935034128 +0100
+@@ -48,7 +48,7 @@
+ else
+ CIRRUSVGA_ROM := ../vgabios/VGABIOS-lgpl-latest.cirrus.bin
+ endif
+-ETHERBOOT_ROMS := $(addprefix ../etherboot/ipxe/src/bin/, $(addsuffix .rom, $(ETHERBOOT_NICS)))
++ETHERBOOT_ROMS := $(addprefix /usr/share/ipxe/, $(addsuffix .rom, $(ETHERBOOT_NICS)))
+ endif
+ 
+ ROMS := 
+--- xen-4.2.0/Config.mk.orig	2012-05-27 21:57:04.479812884 +0100
++++ xen-4.2.0/Config.mk	2012-06-02 18:55:14.087169469 +0100
+@@ -206,7 +206,7 @@
+ # Wed Jun 26 16:30:45 2013 +0100
+ # xen: Don't perform SMP setup.
+ 
+-ETHERBOOT_NICS ?= rtl8139 8086100e
++ETHERBOOT_NICS ?= 10ec8139 8086100e
+ 
+ # Specify which qemu-dm to use. This may be `ioemu' to use the old
+ # Mercurial in-tree version, or a local directory, or a git URL.
+--- xen-4.2.0/tools/firmware/Makefile.orig	2012-05-27 21:57:04.480812871 +0100
++++ xen-4.2.0/tools/firmware/Makefile	2012-06-02 19:03:52.254691484 +0100
+@@ -10,7 +10,7 @@
+ #SUBDIRS-$(CONFIG_SEABIOS) += seabios-dir
+ SUBDIRS-$(CONFIG_ROMBIOS) += rombios
+ SUBDIRS-$(CONFIG_ROMBIOS) += vgabios
+-SUBDIRS-$(CONFIG_ROMBIOS) += etherboot
++#SUBDIRS-$(CONFIG_ROMBIOS) += etherboot
+ SUBDIRS-y += hvmloader
+ 
+ ovmf:
diff --git a/app-emulation/xen-tools/files/xen-tools-4-unbundle-seabios.patch b/app-emulation/xen-tools/files/xen-tools-4-unbundle-seabios.patch
new file mode 100644
index 000000000000..86d46aa40de4
--- /dev/null
+++ b/app-emulation/xen-tools/files/xen-tools-4-unbundle-seabios.patch
@@ -0,0 +1,22 @@
+--- xen-4.2.0/tools/firmware/Makefile.orig	2012-05-12 16:40:47.000000000 +0100
++++ xen-4.2.0/tools/firmware/Makefile	2012-05-27 21:55:23.438076078 +0100
+@@ -7,7 +7,7 @@
+ 
+ SUBDIRS-y :=
+ SUBDIRS-$(CONFIG_OVMF) += ovmf
+-SUBDIRS-$(CONFIG_SEABIOS) += seabios-dir
++#SUBDIRS-$(CONFIG_SEABIOS) += seabios-dir
+ SUBDIRS-$(CONFIG_ROMBIOS) += rombios
+ SUBDIRS-$(CONFIG_ROMBIOS) += vgabios
+ SUBDIRS-$(CONFIG_ROMBIOS) += etherboot
+--- xen-4.2.0/tools/firmware/hvmloader/Makefile.orig	2012-05-12 16:40:47.000000000 +0100
++++ xen-4.2.0/tools/firmware/hvmloader/Makefile	2012-05-27 21:53:45.625298906 +0100
+@@ -70,7 +70,7 @@
+ ifeq ($(CONFIG_SEABIOS),y)
+ OBJS += seabios.o
+ CFLAGS += -DENABLE_SEABIOS
+-SEABIOS_ROM := $(SEABIOS_DIR)/out/bios.bin
++SEABIOS_ROM := /usr/share/seabios/bios.bin
+ ROMS += $(SEABIOS_ROM)
+ endif
+ 
diff --git a/app-emulation/xen-tools/metadata.xml b/app-emulation/xen-tools/metadata.xml
index d4b0bc5a1dc4..bd4d8c1491bc 100644
--- a/app-emulation/xen-tools/metadata.xml
+++ b/app-emulation/xen-tools/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>xen</herd>
-	<maintainer>
-		<email>idella4@gentoo.org</email>
-		<name>Ian 'idella4' Delaney</name>
-	</maintainer>
 	<use>
 		<flag name='api'>Build the C libxenapi bindings</flag>
 		<flag name='flask'>Enable the Flask XSM module from NSA</flag>
diff --git a/app-emulation/xen-tools/xen-tools-4.2.3-r1.ebuild b/app-emulation/xen-tools/xen-tools-4.2.3-r1.ebuild
new file mode 100644
index 000000000000..c754bec87013
--- /dev/null
+++ b/app-emulation/xen-tools/xen-tools-4.2.3-r1.ebuild
@@ -0,0 +1,400 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.2.3-r1.ebuild,v 1.1 2014/02/18 10:37:12 dlan Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+PYTHON_REQ_USE='xml,threads'
+
+if [[ $PV == *9999 ]]; then
+	KEYWORDS=""
+	REPO="xen-unstable.hg"
+	EHG_REPO_URI="http://xenbits.xensource.com/${REPO}"
+	S="${WORKDIR}/${REPO}"
+	live_eclass="mercurial"
+else
+	KEYWORDS="~amd64 ~x86"
+	UPSTREAM_VER=0
+	GENTOO_VER=
+
+	[[ -n ${UPSTREAM_VER} ]] && \
+		UPSTRAM_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz"
+	[[ -n ${GENTOO_VER} ]] && \
+		GENTOO_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-gentoo-patches-${GENTOO_VER}.tar.xz"
+
+	SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz
+	${UPSTRAM_PATCHSET_URI}
+	${GENTOO_PATCHSET_URI}"
+	S="${WORKDIR}/xen-${PV}"
+fi
+
+inherit bash-completion-r1 eutils flag-o-matic multilib python-single-r1 toolchain-funcs udev ${live_eclass}
+
+DESCRIPTION="Xend daemon and tools"
+HOMEPAGE="http://xen.org/"
+DOCS=( README docs/README.xen-bugtool )
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="api custom-cflags debug doc flask hvm qemu ocaml pygrub screen static-libs xend"
+
+REQUIRED_USE="hvm? ( qemu )
+	${PYTHON_REQUIRED_USE}"
+
+DEPEND="dev-libs/lzo:2
+	dev-libs/glib:2
+	dev-libs/yajl
+	dev-libs/libgcrypt
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/pypam[${PYTHON_USEDEP}]
+	sys-libs/zlib
+	sys-power/iasl
+	sys-firmware/seabios
+	sys-firmware/ipxe
+	dev-ml/findlib
+	hvm? ( media-libs/libsdl )
+	${PYTHON_DEPS}
+	api? ( dev-libs/libxml2
+		net-misc/curl )
+	${PYTHON_DEPS}
+	pygrub? ( ${PYTHON_DEPS//${PYTHON_REQ_USE}/ncurses} )
+	sys-devel/bin86
+	sys-devel/dev86
+	dev-lang/perl
+	app-misc/pax-utils
+	doc? (
+		app-doc/doxygen
+		dev-tex/latex2html[png,gif]
+		media-gfx/transfig
+		media-gfx/graphviz
+		dev-tex/xcolor
+		dev-texlive/texlive-latexextra
+		virtual/latex-base
+		dev-tex/latexmk
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-pictures
+		dev-texlive/texlive-latexrecommended
+	)
+	hvm? (  x11-proto/xproto
+		!net-libs/libiscsi )"
+RDEPEND="sys-apps/iproute2
+	net-misc/bridge-utils
+	ocaml? ( >=dev-lang/ocaml-4 )
+	screen? (
+		app-misc/screen
+		app-admin/logrotate
+	)
+	virtual/udev"
+
+# hvmloader is used to bootstrap a fully virtualized kernel
+# Approved by QA team in bug #144032
+QA_WX_LOAD="usr/lib/xen/boot/hvmloader"
+
+RESTRICT="test"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	export "CONFIG_LOMOUNT=y"
+
+	if has_version dev-libs/libgcrypt; then
+		export "CONFIG_GCRYPT=y"
+	fi
+
+	if use qemu; then
+		export "CONFIG_IOEMU=y"
+	else
+		export "CONFIG_IOEMU=n"
+	fi
+
+	if ! use x86 && ! has x86 $(get_all_abis) && use hvm; then
+		eerror "HVM (VT-x and AMD-v) cannot be built on this system. An x86 or"
+		eerror "an amd64 multilib profile is required. Remove the hvm use flag"
+		eerror "to build xen-tools on your current profile."
+		die "USE=hvm is unsupported on this system."
+	fi
+
+	if [[ -z ${XEN_TARGET_ARCH} ]] ; then
+		if use x86 && use amd64; then
+			die "Confusion! Both x86 and amd64 are set in your use flags!"
+		elif use x86; then
+			export XEN_TARGET_ARCH="x86_32"
+		elif use amd64 ; then
+			export XEN_TARGET_ARCH="x86_64"
+		else
+			die "Unsupported architecture!"
+		fi
+	fi
+
+	use api     && export "LIBXENAPI_BINDINGS=y"
+	use flask   && export "FLASK_ENABLE=y"
+}
+
+src_prepare() {
+	# Upstream's patchset
+	if [[ -n ${UPSTREAM_VER} ]]; then
+		EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" \
+			epatch "${WORKDIR}"/patches-upstream
+	fi
+
+	# Gentoo's patchset
+	if [[ -n ${GENTOO_VER} ]]; then
+		EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" \
+			epatch "${WORKDIR}"/patches-gentoo
+	fi
+
+	# Drop .config, fixes to gcc-4.6
+	epatch "${FILESDIR}"/${PN/-tools/}-4-fix_dotconfig-gcc.patch
+
+	# Xend
+	if ! use xend; then
+		sed -e 's:xm xen-bugtool xen-python-path xend:xen-bugtool xen-python-path:' \
+			-i tools/misc/Makefile || die "Disabling xend failed"
+		sed -e 's:^XEND_INITD:#XEND_INITD:' \
+			-i tools/examples/Makefile || die "Disabling xend failed"
+	fi
+
+	# if the user *really* wants to use their own custom-cflags, let them
+	if use custom-cflags; then
+		einfo "User wants their own CFLAGS - removing defaults"
+
+		# try and remove all the default cflags
+		find "${S}" \( -name Makefile -o -name Rules.mk -o -name Config.mk \) \
+			-exec sed \
+				-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
+				-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
+				-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
+				-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
+				-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
+				-i {} + || die "failed to re-set custom-cflags"
+	fi
+
+	if ! use pygrub; then
+		sed -e '/^SUBDIRS-$(PYTHON_TOOLS) += pygrub$/d' -i tools/Makefile || die
+	fi
+
+	# Disable hvm support on systems that don't support x86_32 binaries.
+	if ! use hvm; then
+		sed -e '/^CONFIG_IOEMU := y$/d' -i config/*.mk || die
+		sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die
+	fi
+
+	# Don't bother with qemu, only needed for fully virtualised guests
+	if ! use qemu; then
+		sed -e "/^CONFIG_IOEMU := y$/d" -i config/*.mk || die
+		sed -e "s:install-tools\: tools/ioemu-dir:install-tools\: :g" -i Makefile || die
+	fi
+
+	# Fix texi2html build error with new texi2html, qemu.doc.html
+	epatch "${FILESDIR}"/${PN}-4-docfix.patch \
+		"${FILESDIR}"/${PN}-4-qemu-xen-doc.patch
+
+	# Fix network broadcast on bridged networks
+	epatch "${FILESDIR}/${PN}-3.4.0-network-bridge-broadcast.patch"
+
+	# Bug 496708
+	epatch "${FILESDIR}"/${PN}-4-unbundle-ipxe.patch
+	epatch "${FILESDIR}"/${PN}-4-unbundle-seabios.patch
+
+	# Fix bridge by idella4, bug #362575
+	epatch "${FILESDIR}/${PN}-4.1.1-bridge.patch"
+
+	# Don't build ipxe with pie on hardened, Bug #360805
+	if gcc-specs-pie; then
+		epatch "${FILESDIR}"/ipxe-nopie.patch
+	fi
+
+	# Prevent double stripping of files at install
+	epatch "${FILESDIR}"/${PN/-tools/}-4.2.0-nostrip.patch
+
+	# fix jobserver in Makefile
+	epatch "${FILESDIR}"/${PN/-tools/}-4.2.0-jserver.patch
+
+	# add missing header, Bug #467200
+	epatch "${FILESDIR}"/xen-4-ulong.patch \
+		"${FILESDIR}"/${PN}-4.2-xen_disk_leak.patch
+
+	# Set dom0-min-mem to kb; Bug #472982
+	epatch "${FILESDIR}"/${PN/-tools/}-4.2-configsxp.patch
+
+	# Bug 463840
+	epatch "${FILESDIR}"/${PN}-4.2.2-install.patch
+	epatch "${FILESDIR}"/${PN}-4.2.2-rt-link.patch
+
+	# Bug 379537
+	epatch "${FILESDIR}"/fix-gold-ld.patch
+
+	# Bug 472438
+	sed -e 's:^BASH_COMPLETION_DIR ?= $(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(SHARE_DIR)/bash-completion:' \
+		-i Config.mk || die
+
+	# Bug 445986
+	sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" PYTHON=$(PYTHON) subdirs-$@:' -i tools/firmware/Makefile || die
+
+
+	# fix QA warning, create /var/run/, /var/lock dynamically
+	sed -i -e "/\$(INSTALL_DIR) \$(DESTDIR)\$(XEN_RUN_DIR)/d" \
+		tools/libxl/Makefile || die
+
+	sed -i -e "/\/var\/run\//d" \
+		tools/xenstore/Makefile \
+		tools/pygrub/Makefile || die
+
+	sed -i -e "/\/var\/lock\/subsys/d" \
+		tools/Makefile || die
+
+	# xencommons, Bug #492332, sed lighter weight than patching
+	sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \
+		-i tools/hotplug/Linux/init.d/xencommons || die
+
+	epatch_user
+}
+
+src_compile() {
+	export VARTEXFONTS="${T}/fonts"
+	local myopt
+	use debug && myopt="${myopt} debug=y"
+
+	use custom-cflags || unset CFLAGS
+	if test-flag-CC -fno-strict-overflow; then
+		append-flags -fno-strict-overflow
+	fi
+
+	unset LDFLAGS
+	unset CFLAGS
+	emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" -C tools ${myopt}
+
+	use doc && emake -C docs txt html
+	emake -C docs man-pages
+}
+
+src_install() {
+	# Override auto-detection in the build system, bug #382573
+	export INITD_DIR=/tmp/init.d
+	export CONFIG_LEAF_DIR=../tmp/default
+
+	# Let the build system compile installed Python modules.
+	local PYTHONDONTWRITEBYTECODE
+	export PYTHONDONTWRITEBYTECODE
+
+	emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" install-tools \
+		XEN_PYTHON_NATIVE_INSTALL=y install-tools
+	# Fix the remaining Python shebangs.
+	python_fix_shebang "${ED}"
+
+	# Remove RedHat-specific stuff
+	rm -rf "${D}"tmp || die
+
+	# uncomment lines in xl.conf
+	sed -e 's:^#autoballoon=1:autoballoon=1:' \
+		-e 's:^#lockfile="/var/lock/xl":lockfile="/var/lock/xl":' \
+		-e 's:^#vifscript="vif-bridge":vifscript="vif-bridge":' \
+		-i tools/examples/xl.conf  || die
+
+	# Reset bash completion dir; Bug 472438
+	mv "${D}"bash-completion "${D}"usr/share/ || die
+
+	if use doc; then
+		emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs
+
+		dohtml -r docs/
+		docinto pdf
+		dodoc ${DOCS[@]}
+		[ -d "${D}"/usr/share/doc/xen ] && mv "${D}"/usr/share/doc/xen/* "${D}"/usr/share/doc/${PF}/html
+	fi
+
+	rm -rf "${D}"/usr/share/doc/xen/
+	doman docs/man?/*
+
+	if use xend; then
+		newinitd "${FILESDIR}"/xend.initd-r2 xend || die "Couldn't install xen.initd"
+	fi
+	newconfd "${FILESDIR}"/xendomains.confd xendomains
+	newconfd "${FILESDIR}"/xenstored.confd xenstored
+	newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled
+	newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains
+	newinitd "${FILESDIR}"/xenstored.initd xenstored
+	newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled
+	newinitd "${FILESDIR}"/xencommons.initd xencommons
+	newconfd "${FILESDIR}"/xencommons.confd xencommons
+
+	if use screen; then
+		cat "${FILESDIR}"/xendomains-screen.confd >> "${ED}"/etc/conf.d/xendomains || die
+		cp "${FILESDIR}"/xen-consoles.logrotate "${ED}"/etc/xen/ || die
+		keepdir /var/log/xen-consoles
+	fi
+
+	if [[ "${ARCH}" == 'amd64' ]] && use qemu; then
+		mkdir -p "${D}"usr/$(get_libdir)/xen/bin || die
+		mv "${D}"usr/lib/xen/bin/qemu* "${D}"usr/$(get_libdir)/xen/bin/ || die
+	fi
+
+	# For -static-libs wrt Bug 384355
+	if ! use static-libs; then
+		rm -f "${D}"usr/$(get_libdir)/*.a "${D}"usr/$(get_libdir)/ocaml/*/*.a
+	fi
+
+	# xend expects these to exist
+	keepdir /var/run/xenstored /var/lib/xenstored /var/xen/dump /var/lib/xen /var/log/xen
+
+	# for xendomains
+	keepdir /etc/xen/auto
+
+	# Temp QA workaround
+	dodir "$(udev_get_udevdir)"
+	mv "${D}"/etc/udev/* "${D}/$(udev_get_udevdir)"
+	rm -rf "${D}"/etc/udev
+
+	# Remove files failing QA AFTER emake installs them, avoiding seeking absent files
+	find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \
+		-o -name openbios-ppc -o -name palcode-clipper \) -delete || die
+}
+
+pkg_postinst() {
+	elog "Official Xen Guide and the offical wiki page:"
+	elog "http://www.gentoo.org/doc/en/xen-gu"${D}"usr/ide.xml"
+	elog "http://wiki.xen.org/wiki/Main_Page"
+	elog ""
+	elog "Recommended to utilise the xencommons script to config sytem at boot."
+	elog "Add by use of rc-update on completion of the install"
+
+	if [[ "$(scanelf -s __guard -q "${PYTHON}")" ]] ; then
+		echo
+		ewarn "xend may not work when python is built with stack smashing protection (ssp)."
+		ewarn "If 'xm create' fails with '<ProtocolError for /RPC2: -1 >', see bug #141866"
+		ewarn "This problem may be resolved as of Xen 3.0.4, if not post in the bug."
+	fi
+
+	# TODO: we need to have the current Python slot here.
+	if ! has_version "dev-lang/python[ncurses]"; then
+		echo
+		ewarn "NB: Your dev-lang/python is built without USE=ncurses."
+		ewarn "Please rebuild python with USE=ncurses to make use of xenmon.py."
+	fi
+
+	if has_version "sys-apps/iproute2[minimal]"; then
+		echo
+		ewarn "Your sys-apps/iproute2 is built with USE=minimal. Networking"
+		ewarn "will not work until you rebuild iproute2 without USE=minimal."
+	fi
+
+	if ! use hvm; then
+		echo
+		elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm"
+		elog "support enable the hvm use flag."
+		elog "An x86 or amd64 multilib system is required to build HVM support."
+	fi
+
+	if use xend; then
+		echo
+		elog "xend capability has been enabled and installed"
+	fi
+
+	if grep -qsF XENSV= "${ROOT}/etc/conf.d/xend"; then
+		echo
+		elog "xensv is broken upstream (Gentoo bug #142011)."
+		elog "Please remove '${ROOT%/}/etc/conf.d/xend', as it is no longer needed."
+	fi
+}
diff --git a/app-emulation/xen-tools/xen-tools-4.2.4.ebuild b/app-emulation/xen-tools/xen-tools-4.2.4.ebuild
new file mode 100644
index 000000000000..57aaab9b90d0
--- /dev/null
+++ b/app-emulation/xen-tools/xen-tools-4.2.4.ebuild
@@ -0,0 +1,400 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.2.4.ebuild,v 1.1 2014/02/19 06:54:00 dlan Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+PYTHON_REQ_USE='xml,threads'
+
+if [[ $PV == *9999 ]]; then
+	KEYWORDS=""
+	REPO="xen-unstable.hg"
+	EHG_REPO_URI="http://xenbits.xensource.com/${REPO}"
+	S="${WORKDIR}/${REPO}"
+	live_eclass="mercurial"
+else
+	KEYWORDS="~amd64 ~x86"
+	UPSTREAM_VER=
+	GENTOO_VER=
+
+	[[ -n ${UPSTREAM_VER} ]] && \
+		UPSTRAM_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz"
+	[[ -n ${GENTOO_VER} ]] && \
+		GENTOO_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-gentoo-patches-${GENTOO_VER}.tar.xz"
+
+	SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz
+	${UPSTRAM_PATCHSET_URI}
+	${GENTOO_PATCHSET_URI}"
+	S="${WORKDIR}/xen-${PV}"
+fi
+
+inherit bash-completion-r1 eutils flag-o-matic multilib python-single-r1 toolchain-funcs udev ${live_eclass}
+
+DESCRIPTION="Xend daemon and tools"
+HOMEPAGE="http://xen.org/"
+DOCS=( README docs/README.xen-bugtool )
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="api custom-cflags debug doc flask hvm qemu ocaml pygrub screen static-libs xend"
+
+REQUIRED_USE="hvm? ( qemu )
+	${PYTHON_REQUIRED_USE}"
+
+DEPEND="dev-libs/lzo:2
+	dev-libs/glib:2
+	dev-libs/yajl
+	dev-libs/libgcrypt
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/pypam[${PYTHON_USEDEP}]
+	sys-libs/zlib
+	sys-power/iasl
+	sys-firmware/seabios
+	sys-firmware/ipxe
+	dev-ml/findlib
+	hvm? ( media-libs/libsdl )
+	${PYTHON_DEPS}
+	api? ( dev-libs/libxml2
+		net-misc/curl )
+	${PYTHON_DEPS}
+	pygrub? ( ${PYTHON_DEPS//${PYTHON_REQ_USE}/ncurses} )
+	sys-devel/bin86
+	sys-devel/dev86
+	dev-lang/perl
+	app-misc/pax-utils
+	doc? (
+		app-doc/doxygen
+		dev-tex/latex2html[png,gif]
+		media-gfx/transfig
+		media-gfx/graphviz
+		dev-tex/xcolor
+		dev-texlive/texlive-latexextra
+		virtual/latex-base
+		dev-tex/latexmk
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-pictures
+		dev-texlive/texlive-latexrecommended
+	)
+	hvm? (  x11-proto/xproto
+		!net-libs/libiscsi )"
+RDEPEND="sys-apps/iproute2
+	net-misc/bridge-utils
+	ocaml? ( >=dev-lang/ocaml-4 )
+	screen? (
+		app-misc/screen
+		app-admin/logrotate
+	)
+	virtual/udev"
+
+# hvmloader is used to bootstrap a fully virtualized kernel
+# Approved by QA team in bug #144032
+QA_WX_LOAD="usr/lib/xen/boot/hvmloader"
+
+RESTRICT="test"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	export "CONFIG_LOMOUNT=y"
+
+	if has_version dev-libs/libgcrypt; then
+		export "CONFIG_GCRYPT=y"
+	fi
+
+	if use qemu; then
+		export "CONFIG_IOEMU=y"
+	else
+		export "CONFIG_IOEMU=n"
+	fi
+
+	if ! use x86 && ! has x86 $(get_all_abis) && use hvm; then
+		eerror "HVM (VT-x and AMD-v) cannot be built on this system. An x86 or"
+		eerror "an amd64 multilib profile is required. Remove the hvm use flag"
+		eerror "to build xen-tools on your current profile."
+		die "USE=hvm is unsupported on this system."
+	fi
+
+	if [[ -z ${XEN_TARGET_ARCH} ]] ; then
+		if use x86 && use amd64; then
+			die "Confusion! Both x86 and amd64 are set in your use flags!"
+		elif use x86; then
+			export XEN_TARGET_ARCH="x86_32"
+		elif use amd64 ; then
+			export XEN_TARGET_ARCH="x86_64"
+		else
+			die "Unsupported architecture!"
+		fi
+	fi
+
+	use api     && export "LIBXENAPI_BINDINGS=y"
+	use flask   && export "FLASK_ENABLE=y"
+}
+
+src_prepare() {
+	# Upstream's patchset
+	if [[ -n ${UPSTREAM_VER} ]]; then
+		EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" \
+			epatch "${WORKDIR}"/patches-upstream
+	fi
+
+	# Gentoo's patchset
+	if [[ -n ${GENTOO_VER} ]]; then
+		EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" \
+			epatch "${WORKDIR}"/patches-gentoo
+	fi
+
+	# Drop .config, fixes to gcc-4.6
+	epatch "${FILESDIR}"/${PN/-tools/}-4-fix_dotconfig-gcc.patch
+
+	# Xend
+	if ! use xend; then
+		sed -e 's:xm xen-bugtool xen-python-path xend:xen-bugtool xen-python-path:' \
+			-i tools/misc/Makefile || die "Disabling xend failed"
+		sed -e 's:^XEND_INITD:#XEND_INITD:' \
+			-i tools/examples/Makefile || die "Disabling xend failed"
+	fi
+
+	# if the user *really* wants to use their own custom-cflags, let them
+	if use custom-cflags; then
+		einfo "User wants their own CFLAGS - removing defaults"
+
+		# try and remove all the default cflags
+		find "${S}" \( -name Makefile -o -name Rules.mk -o -name Config.mk \) \
+			-exec sed \
+				-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
+				-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
+				-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
+				-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
+				-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
+				-i {} + || die "failed to re-set custom-cflags"
+	fi
+
+	if ! use pygrub; then
+		sed -e '/^SUBDIRS-$(PYTHON_TOOLS) += pygrub$/d' -i tools/Makefile || die
+	fi
+
+	# Disable hvm support on systems that don't support x86_32 binaries.
+	if ! use hvm; then
+		sed -e '/^CONFIG_IOEMU := y$/d' -i config/*.mk || die
+		sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die
+	fi
+
+	# Don't bother with qemu, only needed for fully virtualised guests
+	if ! use qemu; then
+		sed -e "/^CONFIG_IOEMU := y$/d" -i config/*.mk || die
+		sed -e "s:install-tools\: tools/ioemu-dir:install-tools\: :g" -i Makefile || die
+	fi
+
+	# Fix texi2html build error with new texi2html, qemu.doc.html
+	epatch "${FILESDIR}"/${PN}-4-docfix.patch \
+		"${FILESDIR}"/${PN}-4-qemu-xen-doc.patch
+
+	# Fix network broadcast on bridged networks
+	epatch "${FILESDIR}/${PN}-3.4.0-network-bridge-broadcast.patch"
+
+	# Bug 496708
+	epatch "${FILESDIR}"/${PN}-4-unbundle-ipxe.patch
+	epatch "${FILESDIR}"/${PN}-4-unbundle-seabios.patch
+
+	# Fix bridge by idella4, bug #362575
+	epatch "${FILESDIR}/${PN}-4.1.1-bridge.patch"
+
+	# Don't build ipxe with pie on hardened, Bug #360805
+	if gcc-specs-pie; then
+		epatch "${FILESDIR}"/ipxe-nopie.patch
+	fi
+
+	# Prevent double stripping of files at install
+	epatch "${FILESDIR}"/${PN/-tools/}-4.2.0-nostrip.patch
+
+	# fix jobserver in Makefile
+	epatch "${FILESDIR}"/${PN/-tools/}-4.2.0-jserver.patch
+
+	# add missing header, Bug #467200
+	epatch "${FILESDIR}"/xen-4-ulong.patch \
+		"${FILESDIR}"/${PN}-4.2-xen_disk_leak.patch
+
+	# Set dom0-min-mem to kb; Bug #472982
+	epatch "${FILESDIR}"/${PN/-tools/}-4.2-configsxp.patch
+
+	# Bug 463840
+	epatch "${FILESDIR}"/${PN}-4.2.2-install.patch
+	epatch "${FILESDIR}"/${PN}-4.2.2-rt-link.patch
+
+	# Bug 379537
+	epatch "${FILESDIR}"/fix-gold-ld.patch
+
+	# Bug 472438
+	sed -e 's:^BASH_COMPLETION_DIR ?= $(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(SHARE_DIR)/bash-completion:' \
+		-i Config.mk || die
+
+	# Bug 445986
+	sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" PYTHON=$(PYTHON) subdirs-$@:' -i tools/firmware/Makefile || die
+
+
+	# fix QA warning, create /var/run/, /var/lock dynamically
+	sed -i -e "/\$(INSTALL_DIR) \$(DESTDIR)\$(XEN_RUN_DIR)/d" \
+		tools/libxl/Makefile || die
+
+	sed -i -e "/\/var\/run\//d" \
+		tools/xenstore/Makefile \
+		tools/pygrub/Makefile || die
+
+	sed -i -e "/\/var\/lock\/subsys/d" \
+		tools/Makefile || die
+
+	# xencommons, Bug #492332, sed lighter weight than patching
+	sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \
+		-i tools/hotplug/Linux/init.d/xencommons || die
+
+	epatch_user
+}
+
+src_compile() {
+	export VARTEXFONTS="${T}/fonts"
+	local myopt
+	use debug && myopt="${myopt} debug=y"
+
+	use custom-cflags || unset CFLAGS
+	if test-flag-CC -fno-strict-overflow; then
+		append-flags -fno-strict-overflow
+	fi
+
+	unset LDFLAGS
+	unset CFLAGS
+	emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" -C tools ${myopt}
+
+	use doc && emake -C docs txt html
+	emake -C docs man-pages
+}
+
+src_install() {
+	# Override auto-detection in the build system, bug #382573
+	export INITD_DIR=/tmp/init.d
+	export CONFIG_LEAF_DIR=../tmp/default
+
+	# Let the build system compile installed Python modules.
+	local PYTHONDONTWRITEBYTECODE
+	export PYTHONDONTWRITEBYTECODE
+
+	emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" install-tools \
+		XEN_PYTHON_NATIVE_INSTALL=y install-tools
+	# Fix the remaining Python shebangs.
+	python_fix_shebang "${ED}"
+
+	# Remove RedHat-specific stuff
+	rm -rf "${D}"tmp || die
+
+	# uncomment lines in xl.conf
+	sed -e 's:^#autoballoon=1:autoballoon=1:' \
+		-e 's:^#lockfile="/var/lock/xl":lockfile="/var/lock/xl":' \
+		-e 's:^#vifscript="vif-bridge":vifscript="vif-bridge":' \
+		-i tools/examples/xl.conf  || die
+
+	# Reset bash completion dir; Bug 472438
+	mv "${D}"bash-completion "${D}"usr/share/ || die
+
+	if use doc; then
+		emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs
+
+		dohtml -r docs/
+		docinto pdf
+		dodoc ${DOCS[@]}
+		[ -d "${D}"/usr/share/doc/xen ] && mv "${D}"/usr/share/doc/xen/* "${D}"/usr/share/doc/${PF}/html
+	fi
+
+	rm -rf "${D}"/usr/share/doc/xen/
+	doman docs/man?/*
+
+	if use xend; then
+		newinitd "${FILESDIR}"/xend.initd-r2 xend || die "Couldn't install xen.initd"
+	fi
+	newconfd "${FILESDIR}"/xendomains.confd xendomains
+	newconfd "${FILESDIR}"/xenstored.confd xenstored
+	newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled
+	newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains
+	newinitd "${FILESDIR}"/xenstored.initd xenstored
+	newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled
+	newinitd "${FILESDIR}"/xencommons.initd xencommons
+	newconfd "${FILESDIR}"/xencommons.confd xencommons
+
+	if use screen; then
+		cat "${FILESDIR}"/xendomains-screen.confd >> "${ED}"/etc/conf.d/xendomains || die
+		cp "${FILESDIR}"/xen-consoles.logrotate "${ED}"/etc/xen/ || die
+		keepdir /var/log/xen-consoles
+	fi
+
+	if [[ "${ARCH}" == 'amd64' ]] && use qemu; then
+		mkdir -p "${D}"usr/$(get_libdir)/xen/bin || die
+		mv "${D}"usr/lib/xen/bin/qemu* "${D}"usr/$(get_libdir)/xen/bin/ || die
+	fi
+
+	# For -static-libs wrt Bug 384355
+	if ! use static-libs; then
+		rm -f "${D}"usr/$(get_libdir)/*.a "${D}"usr/$(get_libdir)/ocaml/*/*.a
+	fi
+
+	# xend expects these to exist
+	keepdir /var/run/xenstored /var/lib/xenstored /var/xen/dump /var/lib/xen /var/log/xen
+
+	# for xendomains
+	keepdir /etc/xen/auto
+
+	# Temp QA workaround
+	dodir "$(udev_get_udevdir)"
+	mv "${D}"/etc/udev/* "${D}/$(udev_get_udevdir)"
+	rm -rf "${D}"/etc/udev
+
+	# Remove files failing QA AFTER emake installs them, avoiding seeking absent files
+	find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \
+		-o -name openbios-ppc -o -name palcode-clipper \) -delete || die
+}
+
+pkg_postinst() {
+	elog "Official Xen Guide and the offical wiki page:"
+	elog "http://www.gentoo.org/doc/en/xen-gu"${D}"usr/ide.xml"
+	elog "http://wiki.xen.org/wiki/Main_Page"
+	elog ""
+	elog "Recommended to utilise the xencommons script to config sytem at boot."
+	elog "Add by use of rc-update on completion of the install"
+
+	if [[ "$(scanelf -s __guard -q "${PYTHON}")" ]] ; then
+		echo
+		ewarn "xend may not work when python is built with stack smashing protection (ssp)."
+		ewarn "If 'xm create' fails with '<ProtocolError for /RPC2: -1 >', see bug #141866"
+		ewarn "This problem may be resolved as of Xen 3.0.4, if not post in the bug."
+	fi
+
+	# TODO: we need to have the current Python slot here.
+	if ! has_version "dev-lang/python[ncurses]"; then
+		echo
+		ewarn "NB: Your dev-lang/python is built without USE=ncurses."
+		ewarn "Please rebuild python with USE=ncurses to make use of xenmon.py."
+	fi
+
+	if has_version "sys-apps/iproute2[minimal]"; then
+		echo
+		ewarn "Your sys-apps/iproute2 is built with USE=minimal. Networking"
+		ewarn "will not work until you rebuild iproute2 without USE=minimal."
+	fi
+
+	if ! use hvm; then
+		echo
+		elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm"
+		elog "support enable the hvm use flag."
+		elog "An x86 or amd64 multilib system is required to build HVM support."
+	fi
+
+	if use xend; then
+		echo
+		elog "xend capability has been enabled and installed"
+	fi
+
+	if grep -qsF XENSV= "${ROOT}/etc/conf.d/xend"; then
+		echo
+		elog "xensv is broken upstream (Gentoo bug #142011)."
+		elog "Please remove '${ROOT%/}/etc/conf.d/xend', as it is no longer needed."
+	fi
+}
diff --git a/app-emulation/xen-tools/xen-tools-4.3.1-r5.ebuild b/app-emulation/xen-tools/xen-tools-4.3.1-r5.ebuild
index 7b17e44ef78d..1a321814cd28 100644
--- a/app-emulation/xen-tools/xen-tools-4.3.1-r5.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.3.1-r5.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/app-emulation/xen-tools/xen-tools-4.3.1-r5.ebuild,v 1.3 2014/02/15 21:28:04 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.3.1-r5.ebuild,v 1.4 2014/02/18 10:37:12 dlan Exp $
 
 EAPI=5
 
@@ -17,7 +17,7 @@ if [[ $PV == *9999 ]]; then
 	S="${WORKDIR}/${REPO}"
 	live_eclass="mercurial"
 else
-	KEYWORDS="amd64 x86"
+	KEYWORDS="amd64 -x86"
 	SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz
 	$IPXE_TARBALL_URL
 	$XEN_SEABIOS_URL"
diff --git a/app-emulation/xen-tools/xen-tools-4.3.1-r3.ebuild b/app-emulation/xen-tools/xen-tools-4.3.1-r6.ebuild
similarity index 94%
rename from app-emulation/xen-tools/xen-tools-4.3.1-r3.ebuild
rename to app-emulation/xen-tools/xen-tools-4.3.1-r6.ebuild
index 96716429ac73..9617d3628d9e 100644
--- a/app-emulation/xen-tools/xen-tools-4.3.1-r3.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.3.1-r6.ebuild
@@ -1,15 +1,12 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.3.1-r3.ebuild,v 1.5 2014/01/27 08:58:09 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.3.1-r6.ebuild,v 1.1 2014/02/18 10:37:12 dlan Exp $
 
 EAPI=5
 
 PYTHON_COMPAT=( python{2_6,2_7} )
 PYTHON_REQ_USE='xml,threads'
 
-IPXE_TARBALL_URL="http://dev.gentoo.org/~idella4/tarballs/ipxe.tar.gz"
-XEN_SEABIOS_URL="http://dev.gentoo.org/~idella4/tarballs/seabios-dir-remote-20130720.tar.gz"
-
 if [[ $PV == *9999 ]]; then
 	KEYWORDS=""
 	REPO="xen-unstable.hg"
@@ -17,10 +14,8 @@ if [[ $PV == *9999 ]]; then
 	S="${WORKDIR}/${REPO}"
 	live_eclass="mercurial"
 else
-	KEYWORDS="amd64 x86"
-	SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz
-	$IPXE_TARBALL_URL
-	$XEN_SEABIOS_URL"
+	KEYWORDS="~amd64 -x86"
+	SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz"
 	S="${WORKDIR}/xen-${PV}"
 fi
 
@@ -42,12 +37,15 @@ REQUIRED_USE="hvm? ( qemu )
 	pygrub? ( python )"
 
 DEPEND="dev-libs/lzo:2
+	dev-libs/glib:2
 	dev-libs/yajl
 	dev-libs/libgcrypt
 	dev-python/lxml[${PYTHON_USEDEP}]
 	pam? ( dev-python/pypam[${PYTHON_USEDEP}] )
 	sys-libs/zlib
 	sys-power/iasl
+	sys-firmware/seabios
+	sys-firmware/ipxe
 	hvm? ( media-libs/libsdl )
 	${PYTHON_DEPS}
 	api? ( dev-libs/libxml2
@@ -90,6 +88,13 @@ QA_WX_LOAD="usr/lib/xen/boot/hvmloader"
 
 RESTRICT="test"
 
+# Security patches
+XSA_PATCHES=(
+	"${FILESDIR}"/${PN/-tools/}-4-CVE-2012-6075-XSA-41.patch
+	"${FILESDIR}"/${PN/-tools/}-4-CVE-XSA-86.patch		#bug #500530
+	"${FILESDIR}"/${PN}-4-CVE-2014-1950-XSA-88.patch	#bug #501080
+)
+
 pkg_setup() {
 	python-single-r1_pkg_setup
 	export "CONFIG_LOMOUNT=y"
@@ -178,13 +183,9 @@ src_prepare() {
 	# Fix network broadcast on bridged networks
 	epatch "${FILESDIR}/${PN}-3.4.0-network-bridge-broadcast.patch"
 
-	# Prevent the downloading of ipxe, seabios
-	epatch "${FILESDIR}"/${PN/-tools/}-4.3-anti-download.patch
-	cp "${DISTDIR}"/ipxe.tar.gz tools/firmware/etherboot/ || die
-	mv ../seabios-dir-remote tools/firmware/ || die
-	pushd tools/firmware/ > /dev/null
-	ln -s seabios-dir-remote seabios-dir || die
-	popd > /dev/null
+	# Bug 496708
+	epatch "${FILESDIR}"/${PN}-4-unbundle-ipxe.patch
+	epatch "${FILESDIR}"/${PN}-4-unbundle-seabios.patch
 
 	# Fix bridge by idella4, bug #362575
 	epatch "${FILESDIR}/${PN}-4.1.1-bridge.patch"
@@ -206,8 +207,7 @@ src_prepare() {
 	# Set dom0-min-mem to kb; Bug #472982
 	epatch "${FILESDIR}"/${PN/-tools/}-4.2-configsxp.patch
 
-	#Security patches, currently valid
-	epatch "${FILESDIR}"/xen-4-CVE-2012-6075-XSA-41.patch
+	[[ ${XSA_PATCHES[@]} ]] && epatch "${XSA_PATCHES[@]}"
 
 	# Bug 472438
 	sed -e 's:^BASH_COMPLETION_DIR ?= $(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(SHARE_DIR)/bash-completion:' \
diff --git a/app-emulation/xen-tools/xen-tools-4.3.2.ebuild b/app-emulation/xen-tools/xen-tools-4.3.2.ebuild
new file mode 100644
index 000000000000..b5e28347a298
--- /dev/null
+++ b/app-emulation/xen-tools/xen-tools-4.3.2.ebuild
@@ -0,0 +1,437 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.3.2.ebuild,v 1.1 2014/02/19 06:54:00 dlan Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+PYTHON_REQ_USE='xml,threads'
+
+if [[ $PV == *9999 ]]; then
+	KEYWORDS=""
+	REPO="xen-unstable.hg"
+	EHG_REPO_URI="http://xenbits.xensource.com/${REPO}"
+	S="${WORKDIR}/${REPO}"
+	live_eclass="mercurial"
+else
+	KEYWORDS="~amd64 -x86"
+	UPSTREAM_VER=
+	GENTOO_VER=
+
+	[[ -n ${UPSTREAM_VER} ]] && \
+		UPSTRAM_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz"
+	[[ -n ${GENTOO_VER} ]] && \
+		GENTOO_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-gentoo-patches-${GENTOO_VER}.tar.xz"
+
+	SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz
+	${UPSTRAM_PATCHSET_URI}
+	${GENTOO_PATCHSET_URI}"
+	S="${WORKDIR}/xen-${PV}"
+fi
+
+inherit bash-completion-r1 eutils flag-o-matic multilib python-single-r1 toolchain-funcs udev ${live_eclass}
+
+DESCRIPTION="Xend daemon and tools"
+HOMEPAGE="http://xen.org/"
+DOCS=( README docs/README.xen-bugtool )
+
+LICENSE="GPL-2"
+SLOT="0"
+# Inclusion of IUSE ocaml on stabalizing requires maintainer of ocaml to (get off his hands and) make 
+# >=dev-lang/ocaml-4 stable
+# Masked in profiles/eapi-5-files instead
+IUSE="api custom-cflags debug doc flask hvm qemu ocaml +pam python pygrub screen static-libs xend"
+
+REQUIRED_USE="hvm? ( qemu )
+	${PYTHON_REQUIRED_USE}
+	pygrub? ( python )"
+
+DEPEND="dev-libs/lzo:2
+	dev-libs/glib:2
+	dev-libs/yajl
+	dev-libs/libgcrypt
+	dev-python/lxml[${PYTHON_USEDEP}]
+	pam? ( dev-python/pypam[${PYTHON_USEDEP}] )
+	sys-libs/zlib
+	sys-power/iasl
+	sys-firmware/seabios
+	sys-firmware/ipxe
+	hvm? ( media-libs/libsdl )
+	${PYTHON_DEPS}
+	api? ( dev-libs/libxml2
+		net-misc/curl )
+	pygrub? ( ${PYTHON_DEPS//${PYTHON_REQ_USE}/ncurses} )
+	sys-devel/bin86
+	sys-devel/dev86
+	dev-lang/perl
+	app-misc/pax-utils
+	dev-python/markdown
+	doc? (
+		app-doc/doxygen
+		dev-tex/latex2html[png,gif]
+		media-gfx/graphviz
+		dev-tex/xcolor
+		media-gfx/transfig
+		dev-texlive/texlive-latexextra
+		virtual/latex-base
+		dev-tex/latexmk
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-pictures
+		dev-texlive/texlive-latexrecommended
+	)
+	hvm? ( x11-proto/xproto
+		!net-libs/libiscsi )
+	qemu? ( x11-libs/pixman )
+	ocaml? ( dev-ml/findlib
+		>=dev-lang/ocaml-4 )"
+RDEPEND="sys-apps/iproute2
+	net-misc/bridge-utils
+	screen? (
+		app-misc/screen
+		app-admin/logrotate
+	)
+	virtual/udev"
+
+# hvmloader is used to bootstrap a fully virtualized kernel
+# Approved by QA team in bug #144032
+QA_WX_LOAD="usr/lib/xen/boot/hvmloader"
+
+RESTRICT="test"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	export "CONFIG_LOMOUNT=y"
+
+	if has_version dev-libs/libgcrypt; then
+		export "CONFIG_GCRYPT=y"
+	fi
+
+	if use qemu; then
+		export "CONFIG_IOEMU=y"
+	else
+		export "CONFIG_IOEMU=n"
+	fi
+
+	if ! use x86 && ! has x86 $(get_all_abis) && use hvm; then
+		eerror "HVM (VT-x and AMD-v) cannot be built on this system. An x86 or"
+		eerror "an amd64 multilib profile is required. Remove the hvm use flag"
+		eerror "to build xen-tools on your current profile."
+		die "USE=hvm is unsupported on this system."
+	fi
+
+	if [[ -z ${XEN_TARGET_ARCH} ]] ; then
+		if use x86 && use amd64; then
+			die "Confusion! Both x86 and amd64 are set in your use flags!"
+		elif use x86; then
+			export XEN_TARGET_ARCH="x86_32"
+		elif use amd64 ; then
+			export XEN_TARGET_ARCH="x86_64"
+		else
+			die "Unsupported architecture!"
+		fi
+	fi
+}
+
+src_prepare() {
+	# Upstream's patchset
+	if [[ -n ${UPSTREAM_VER} ]]; then
+		EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" \
+			epatch "${WORKDIR}"/patches-upstream
+	fi
+
+	# Gentoo's patchset
+	if [[ -n ${GENTOO_VER} ]]; then
+		EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" \
+			epatch "${WORKDIR}"/patches-gentoo
+	fi
+
+	# Drop .config, fixes to gcc-4.6
+	epatch "${FILESDIR}"/${PN/-tools/}-4.3-fix_dotconfig-gcc.patch
+
+	# Fix texi2html build error with new texi2html, qemu.doc.html
+	epatch "${FILESDIR}"/${PN}-4-docfix.patch \
+		"${FILESDIR}"/${PN}-4-qemu-xen-doc.patch
+
+	# Fix network broadcast on bridged networks
+	epatch "${FILESDIR}/${PN}-3.4.0-network-bridge-broadcast.patch"
+
+	# Bug 496708
+	epatch "${FILESDIR}"/${PN}-4-unbundle-ipxe.patch
+	epatch "${FILESDIR}"/${PN}-4-unbundle-seabios.patch
+
+	# Fix bridge by idella4, bug #362575
+	epatch "${FILESDIR}/${PN}-4.1.1-bridge.patch"
+
+	# Prevent double stripping of files at install
+	epatch "${FILESDIR}"/${PN/-tools/}-4.2.0-nostrip.patch
+
+	# fix jobserver in Makefile
+	epatch "${FILESDIR}"/${PN/-tools/}-4.3-jserver.patch
+
+	# add missing header
+	epatch "${FILESDIR}"/xen-4-ulong.patch
+
+	# Set dom0-min-mem to kb; Bug #472982
+	epatch "${FILESDIR}"/${PN/-tools/}-4.2-configsxp.patch
+
+	# Bug 477676
+	epatch "${FILESDIR}"/${PN}-4.3-ar-cc.patch
+
+	# Bug 379537
+	epatch "${FILESDIR}"/fix-gold-ld.patch
+
+	# Prevent file collision with qemu package Bug 478064
+	epatch "${FILESDIR}"/qemu-bridge.patch
+	mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die
+
+	# Xend
+	if ! use xend; then
+		sed -e 's:xm xen-bugtool xen-python-path xend:xen-bugtool xen-python-path:' \
+			-i tools/misc/Makefile || die "Disabling xend failed"
+		sed -e 's:^XEND_INITD:#XEND_INITD:' \
+			-i tools/examples/Makefile || die "Disabling xend failed"
+	fi
+
+	# if the user *really* wants to use their own custom-cflags, let them
+	if use custom-cflags; then
+		einfo "User wants their own CFLAGS - removing defaults"
+
+		# try and remove all the default cflags
+		find "${S}" \( -name Makefile -o -name Rules.mk -o -name Config.mk \) \
+			-exec sed \
+				-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
+				-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
+				-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
+				-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
+				-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
+				-i {} + || die "failed to re-set custom-cflags"
+	fi
+
+	if ! use pygrub; then
+		sed -e '/^SUBDIRS-y += pygrub/d' -i tools/Makefile || die
+	fi
+
+	if ! use python; then
+		sed -e '/^SUBDIRS-y += python$/d' -i tools/Makefile || die
+	fi
+
+	# Disable hvm support on systems that don't support x86_32 binaries.
+	if ! use hvm; then
+		sed -e '/^CONFIG_IOEMU := y$/d' -i config/*.mk || die
+		sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die
+	fi
+
+	# Don't bother with qemu, only needed for fully virtualised guests
+	if ! use qemu; then
+		sed -e "/^CONFIG_IOEMU := y$/d" -i config/*.mk || die
+		sed -e "s:install-tools\: tools/ioemu-dir:install-tools\: :g" -i Makefile || die
+	fi
+
+
+	# Bug 472438
+	sed -e 's:^BASH_COMPLETION_DIR ?= $(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(SHARE_DIR)/bash-completion:' \
+		-i Config.mk || die
+
+	use flask || sed -e "/SUBDIRS-y += flask/d" -i tools/Makefile || die
+	use api   || sed -e "/SUBDIRS-\$(LIBXENAPI_BINDINGS) += libxen/d" -i tools/Makefile || die
+	sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" PYTHON=$(PYTHON) subdirs-$@:' \
+		 -i tools/firmware/Makefile || die
+
+	# xencommons, Bug #492332, sed lighter weight than patching
+	sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \
+		-i tools/hotplug/Linux/init.d/xencommons || die
+
+	# Bug 493232 fix from http://bugzilla.xensource.com/bugzilla/show_bug.cgi?id=1844
+	sed -e 's:bl->argsspace = 7 + :bl->argsspace = 9 + :' \
+		-i tools/libxl/libxl_bootloader.c || die
+
+	# fix QA warning, create /var/run/, /var/lock dynamically
+	sed -i -e "/\$(INSTALL_DIR) \$(DESTDIR)\$(XEN_RUN_DIR)/d" \
+		tools/libxl/Makefile || die
+
+	sed -i -e "/\/var\/run\//d" \
+		tools/xenstore/Makefile \
+		tools/pygrub/Makefile || die
+
+	sed -i -e "/\/var\/lock\/subsys/d" \
+		tools/Makefile || die
+
+	epatch_user
+}
+
+src_configure() {
+	local myconf="--prefix=/usr --disable-werror"
+
+	if use ocaml
+	then
+		myconf="${myconf} $(use_enable ocaml ocamltools)"
+	else
+		myconf="${myconf} --disable-ocamltools"
+	fi
+
+	if ! use pam
+	then
+		myconf="${myconf} --disable-pam"
+	fi
+
+	econf ${myconf}
+}
+
+src_compile() {
+	export VARTEXFONTS="${T}/fonts"
+	local myopt
+	use debug && myopt="${myopt} debug=y"
+
+	use custom-cflags || unset CFLAGS
+	if test-flag-CC -fno-strict-overflow; then
+		append-flags -fno-strict-overflow
+	fi
+
+	unset LDFLAGS
+	unset CFLAGS
+	emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" -C tools ${myopt}
+
+	use doc && emake -C docs txt html
+	emake -C docs man-pages
+}
+
+src_install() {
+	# Override auto-detection in the build system, bug #382573
+	export INITD_DIR=/tmp/init.d
+	export CONFIG_LEAF_DIR=../tmp/default
+
+	# Let the build system compile installed Python modules.
+	local PYTHONDONTWRITEBYTECODE
+	export PYTHONDONTWRITEBYTECODE
+
+	emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" \
+		XEN_PYTHON_NATIVE_INSTALL=y install-tools
+
+	# Fix the remaining Python shebangs.
+	python_fix_shebang "${D}"
+
+	# Remove RedHat-specific stuff
+	rm -rf "${D}"tmp || die
+
+	# uncomment lines in xl.conf
+	sed -e 's:^#autoballoon=1:autoballoon=1:' \
+		-e 's:^#lockfile="/var/lock/xl":lockfile="/var/lock/xl":' \
+		-e 's:^#vifscript="vif-bridge":vifscript="vif-bridge":' \
+		-i tools/examples/xl.conf  || die
+
+	# Reset bash completion dir; Bug 472438
+	mv "${D}"bash-completion "${D}"usr/share/ || die
+
+	if use doc; then
+		emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs
+
+		dohtml -r docs/
+		docinto pdf
+		dodoc ${DOCS[@]}
+		[ -d "${D}"/usr/share/doc/xen ] && mv "${D}"/usr/share/doc/xen/* "${D}"/usr/share/doc/${PF}/html
+	fi
+
+	rm -rf "${D}"/usr/share/doc/xen/
+	doman docs/man?/*
+
+	if use xend; then
+		newinitd "${FILESDIR}"/xend.initd-r2 xend || die "Couldn't install xen.initd"
+	fi
+	newconfd "${FILESDIR}"/xendomains.confd xendomains
+	newconfd "${FILESDIR}"/xenstored.confd xenstored
+	newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled
+	newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains
+	newinitd "${FILESDIR}"/xenstored.initd xenstored
+	newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled
+	newinitd "${FILESDIR}"/xencommons.initd xencommons
+	newconfd "${FILESDIR}"/xencommons.confd xencommons
+	newinitd "${FILESDIR}"/xenqemudev.initd xenqemudev
+	newconfd "${FILESDIR}"/xenqemudev.confd xenqemudev
+
+	if use screen; then
+		cat "${FILESDIR}"/xendomains-screen.confd >> "${D}"/etc/conf.d/xendomains || die
+		cp "${FILESDIR}"/xen-consoles.logrotate "${D}"/etc/xen/ || die
+		keepdir /var/log/xen-consoles
+	fi
+
+	# Move files built with use qemu, Bug #477884
+	if [[ "${ARCH}" == 'amd64' ]] && use qemu; then
+		mkdir -p "${D}"usr/$(get_libdir)/xen/bin || die
+		mv "${D}"usr/lib/xen/bin/* "${D}"usr/$(get_libdir)/xen/bin/ || die
+	fi
+
+	# For -static-libs wrt Bug 384355
+	if ! use static-libs; then
+		rm -f "${D}"usr/$(get_libdir)/*.a "${D}"usr/$(get_libdir)/ocaml/*/*.a
+	fi
+
+	# xend expects these to exist
+	keepdir /var/lib/xenstored /var/xen/dump /var/lib/xen /var/log/xen
+
+	# for xendomains
+	keepdir /etc/xen/auto
+
+	# Temp QA workaround
+	dodir "$(udev_get_udevdir)"
+	mv "${D}"/etc/udev/* "${D}/$(udev_get_udevdir)"
+	rm -rf "${D}"/etc/udev
+
+	# Remove files failing QA AFTER emake installs them, avoiding seeking absent files
+	find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \
+		-o -name openbios-ppc -o -name palcode-clipper \) -delete || die
+}
+
+pkg_postinst() {
+	elog "Official Xen Guide and the offical wiki page:"
+	elog "https://wiki.gentoo.org/wiki/Xen"
+	elog "http://wiki.xen.org/wiki/Main_Page"
+	elog ""
+	elog "Recommended to utilise the xencommons script to config sytem At boot"
+	elog "Add by use of rc-update on completion of the install"
+
+	if [[ "$(scanelf -s __guard -q "${PYTHON}")" ]] ; then
+		echo
+		ewarn "xend may not work when python is built with stack smashing protection (ssp)."
+		ewarn "If 'xm create' fails with '<ProtocolError for /RPC2: -1 >', see bug #141866"
+		ewarn "This problem may be resolved as of Xen 3.0.4, if not post in the bug."
+	fi
+
+	# TODO: we need to have the current Python slot here.
+	if ! has_version "dev-lang/python[ncurses]"; then
+		echo
+		ewarn "NB: Your dev-lang/python is built without USE=ncurses."
+		ewarn "Please rebuild python with USE=ncurses to make use of xenmon.py."
+	fi
+
+	if has_version "sys-apps/iproute2[minimal]"; then
+		echo
+		ewarn "Your sys-apps/iproute2 is built with USE=minimal. Networking"
+		ewarn "will not work until you rebuild iproute2 without USE=minimal."
+	fi
+
+	if ! use hvm; then
+		echo
+		elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm"
+		elog "support enable the hvm use flag."
+		elog "An x86 or amd64 multilib system is required to build HVM support."
+	fi
+
+	if use xend; then
+		elog"";elog "xend capability has been enabled and installed"
+	fi
+
+	if use qemu; then
+		elog "The qemu-bridge-helper is renamed to the xen-bridge-helper in the in source"
+		elog "build of qemu.  This allows for app-emulation/qemu to be emerged concurrently"
+		elog "with the qemu capable xen.  It is up to the user to distinguish between and utilise"
+		elog "the qemu-bridge-helper and the xen-bridge-helper.  File bugs of any issues that arise"
+	fi
+
+	if grep -qsF XENSV= "${ROOT}/etc/conf.d/xend"; then
+		echo
+		elog "xensv is broken upstream (Gentoo bug #142011)."
+		elog "Please remove '${ROOT%/}/etc/conf.d/xend', as it is no longer needed."
+	fi
+}
diff --git a/app-emulation/xen/Manifest b/app-emulation/xen/Manifest
index 1ac5bf2d8a03..ed9ae73d486e 100644
--- a/app-emulation/xen/Manifest
+++ b/app-emulation/xen/Manifest
@@ -1,4 +1,6 @@
 DIST xen-4.2.2.tar.gz 15602746 SHA256 c9bfe91a5e72f8545acebad9889d64368020359bfe18044c0e683133e55ae005 SHA512 4943b18016ed8c2b194a3b55e6655b3b734b39ffb8cb7ee0a0580f2f4460a1d0e92e1de8ac23f5186272914fad1650586af51fd7c3644d0310eb16f2e11c5e80 WHIRLPOOL 519eb87cb2da694696cbc3e72070a0a3bdb07c46fa266d855d8379eec3a92adfa4d434af3ac01c37834ce4a9174081a6c40030b185a70902329b185cb8d0bbea
 DIST xen-4.2.3-upstream-patches-0.tar.xz 84436 SHA256 7c2477b9b29c9d84bb26ed60bfc2700f2a614ed8040b93906e801831f3498b41 SHA512 a4e8b53a0efb9d64d4dc65ee3107422c8007537e03f9c8e6f1b2c838cf62e6819d447c1ed44aacb5c4e9979f0dad7ed313d2db61df6e6ad2d7708a81964a7e12 WHIRLPOOL cc3c2224bba3b2e5f057ec95f9e85e58b17bc0dce338da429c7970877967cddf69228258ff491be9c1d022169a90fcde34ef1bcb0c198c9123ca219707a5a99f
 DIST xen-4.2.3.tar.gz 15613235 SHA256 69b6a73701383d609ad094a38925004e8595755fb39a6fafd579ba754e8667db SHA512 01521c8724354f92a2555683a8b103e5e16aedeb2c6166cc3ce40a0cc6cd9e07a601aa24930bb7391e00eb97f04003e6523dead09382cf86eb56f5b886509b9a WHIRLPOOL e7f7848ad632e5e77db95b2eb37c82f31a73021af4b6bb44091cc14103faa193bc2d6deb089e2a196daab5a08dbc08f135a8937a25a4ff5d31fe37c789bae1e9
+DIST xen-4.2.4.tar.gz 15663999 SHA256 e23e6292affd7a6d82da99527e8bf3964e57eb7322144c67c2025692b1a21550 SHA512 3e5263511e7c40899f580f3384bd987f9c875b8e6816202fd1a5a64fe7e336803d09e58148af074938ef261f0ceeafad121ac541ddd2bf66b76c5aa4ad07c357 WHIRLPOOL 25d23f5d921139ba0f853fcd76ae998647d32292bccfd4e7c4f3b12f860a38fbb33ebda67c839657bf3a25d837c9c02b80d663362263d16d42284ffde09f0bc2
 DIST xen-4.3.1.tar.gz 16429423 SHA256 3b5b7cc508b1739753585b5c25635471cdcef680e8770a78bf6ef9333d26a9fd SHA512 f5250ad5ad3defc5dc1207eb6208a3928128ef57ac4162018bd92b750dc1df1eaaf37835528aca33a0f9e04c82d5f8c4ba79c03a1780d2b72cbb90cc26f77275 WHIRLPOOL 087390786cea9aee273a5d81988436303991aa5ea92faf111d3b619517368f8c8feef84f4f8c602cac723980a344eb90414887db4ca88a2ee14bc6b0253e36ca
+DIST xen-4.3.2.tar.gz 16472188 SHA256 17611d95f955302560ff72d97c08933b4e62bc2e8ffb71400fc54e388746ff69 SHA512 ec94d849b56ec590b89022075ce43768d8ef44b7be9580ce032509b44c085f0f66495845607a18cd3dea6b89c69bc2a18012705556f59288cd8653c3e5eca302 WHIRLPOOL 72250369fb2c90ba608e1da018cb6417b3089642c8ba59af9f2825ec5ba7c4e6c5d6f86140b20825817e4625727c6d58c5d38b00863c994e31c8a04927997bd3
diff --git a/app-emulation/xen/metadata.xml b/app-emulation/xen/metadata.xml
index 78acefc48221..67c5e0f5daf2 100644
--- a/app-emulation/xen/metadata.xml
+++ b/app-emulation/xen/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>xen</herd>
-	<maintainer>
-		<email>idella4@gentoo.org</email>
-		<name>Ian Delaney</name>
-	</maintainer>
 	<use>
 		<flag name='flask'>Enable the Flask XSM module from NSA</flag>
 		<flag name='pae'>Enable support for PAE kernels (usually x86-32 with >4GB memory)</flag>
diff --git a/app-emulation/xen/xen-4.2.4.ebuild b/app-emulation/xen/xen-4.2.4.ebuild
new file mode 100644
index 000000000000..29a697d2cda0
--- /dev/null
+++ b/app-emulation/xen/xen-4.2.4.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-4.2.4.ebuild,v 1.1 2014/02/19 06:49:59 dlan Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+if [[ $PV == *9999 ]]; then
+	KEYWORDS=""
+	REPO="xen-unstable.hg"
+	EHG_REPO_URI="http://xenbits.xensource.com/${REPO}"
+	S="${WORKDIR}/${REPO}"
+	live_eclass="mercurial"
+else
+	KEYWORDS="~amd64 ~x86"
+	UPSTREAM_VER=
+	GENTOO_VER=
+
+	[[ -n ${UPSTREAM_VER} ]] && \
+		UPSTRAM_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz"
+	[[ -n ${GENTOO_VER} ]] && \
+		GENTOO_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P}-gentoo-patches-${GENTOO_VER}.tar.xz"
+	SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz
+		${UPSTRAM_PATCHSET_URI}
+		${GENTOO_PATCHSET_URI}"
+fi
+
+inherit mount-boot flag-o-matic python-any-r1 toolchain-funcs eutils ${live_eclass}
+
+DESCRIPTION="The Xen virtual machine monitor"
+HOMEPAGE="http://xen.org/"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="custom-cflags debug efi flask pae xsm"
+
+DEPEND="${PYTHON_DEPS}
+	efi? ( >=sys-devel/binutils-2.22[multitarget] )
+	!efi? ( >=sys-devel/binutils-2.22[-multitarget] )"
+RDEPEND=""
+PDEPEND="~app-emulation/xen-tools-${PV}"
+
+RESTRICT="test"
+
+# Approved by QA team in bug #144032
+QA_WX_LOAD="boot/xen-syms-${PV}"
+
+REQUIRED_USE="
+	flask? ( xsm )
+	"
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+	if [[ -z ${XEN_TARGET_ARCH} ]]; then
+		if use x86 && use amd64; then
+			die "Confusion! Both x86 and amd64 are set in your use flags!"
+		elif use x86; then
+			export XEN_TARGET_ARCH="x86_32"
+		elif use amd64; then
+			export XEN_TARGET_ARCH="x86_64"
+		else
+			die "Unsupported architecture!"
+		fi
+	fi
+
+	if use flask ; then
+		export "XSM_ENABLE=y"
+		export "FLASK_ENABLE=y"
+	elif use xsm ; then
+		export "XSM_ENABLE=y"
+	fi
+}
+
+src_prepare() {
+	# Upstream's patchset
+	if [[ -n ${UPSTREAM_VER} ]]; then
+		EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" \
+			epatch "${WORKDIR}"/patches-upstream
+	fi
+
+	# Gentoo's patchset
+	if [[ -n ${GENTOO_VER} ]]; then
+		EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" \
+			epatch "${WORKDIR}"/patches-gentoo
+	fi
+
+	# Drop .config and fix gcc-4.6
+	epatch  "${FILESDIR}"/${PN/-pvgrub/}-4-fix_dotconfig-gcc.patch
+
+	if use efi; then
+		epatch "${FILESDIR}"/${PN}-4.2-efi.patch
+		export EFI_VENDOR="gentoo"
+		export EFI_MOUNTPOINT="boot"
+	fi
+
+	# if the user *really* wants to use their own custom-cflags, let them
+	if use custom-cflags; then
+		einfo "User wants their own CFLAGS - removing defaults"
+		# try and remove all the default custom-cflags
+		find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \
+			-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
+			-i {} \; || die "failed to re-set custom-cflags"
+	fi
+
+	# not strictly necessary to fix this
+	sed -i 's/, "-Werror"//' "${S}/tools/python/setup.py" || die "failed to re-set setup.py"
+
+	epatch_user
+}
+
+src_configure() {
+	use debug && myopt="${myopt} debug=y"
+	use pae && myopt="${myopt} pae=y"
+
+	if use custom-cflags; then
+		filter-flags -fPIE -fstack-protector
+		replace-flags -O3 -O2
+	else
+		unset CFLAGS
+	fi
+}
+
+src_compile() {
+	# Send raw LDFLAGS so that --as-needed works
+	emake CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt}
+}
+
+src_install() {
+	local myopt
+	use debug && myopt="${myopt} debug=y"
+	use pae && myopt="${myopt} pae=y"
+
+	# The 'make install' doesn't 'mkdir -p' the subdirs
+	if use efi; then
+		mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die
+	fi
+
+	emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install
+}
+
+pkg_postinst() {
+	elog "Official Xen Guide and the unoffical wiki page:"
+	elog " http://www.gentoo.org/doc/en/xen-guide.xml"
+	elog " http://en.gentoo-wiki.com/wiki/Xen/"
+
+	use pae && ewarn "This is a PAE build of Xen. It will *only* boot PAE kernels!"
+	use efi && einfo "The efi executable is installed in boot/efi/gentoo"
+}
diff --git a/app-emulation/xen/xen-4.3.2.ebuild b/app-emulation/xen/xen-4.3.2.ebuild
new file mode 100644
index 000000000000..b0361ac257c2
--- /dev/null
+++ b/app-emulation/xen/xen-4.3.2.ebuild
@@ -0,0 +1,150 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-4.3.2.ebuild,v 1.1 2014/02/19 06:49:59 dlan Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+if [[ $PV == *9999 ]]; then
+	KEYWORDS=""
+	REPO="xen-unstable.hg"
+	EHG_REPO_URI="http://xenbits.xensource.com/${REPO}"
+	S="${WORKDIR}/${REPO}"
+	live_eclass="mercurial"
+else
+	# Set to match entry in stable 4.3.1-r1, Bug 493944
+	KEYWORDS="~amd64 -x86"
+	UPSTREAM_VER=
+	GENTOO_VER=
+
+	[[ -n ${UPSTREAM_VER} ]] && \
+		UPSTRAM_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz"
+	[[ -n ${GENTOO_VER} ]] && \
+		GENTOO_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P}-gentoo-patches-${GENTOO_VER}.tar.xz"
+	SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz
+		${UPSTRAM_PATCHSET_URI}
+		${GENTOO_PATCHSET_URI}"
+fi
+
+inherit mount-boot flag-o-matic python-any-r1 toolchain-funcs eutils ${live_eclass}
+
+DESCRIPTION="The Xen virtual machine monitor"
+HOMEPAGE="http://xen.org/"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="custom-cflags debug efi flask xsm"
+
+DEPEND="${PYTHON_DEPS}
+	efi? ( >=sys-devel/binutils-2.22[multitarget] )
+	!efi? ( >=sys-devel/binutils-2.22[-multitarget] )"
+RDEPEND=""
+PDEPEND="~app-emulation/xen-tools-${PV}"
+
+RESTRICT="test"
+
+# Approved by QA team in bug #144032
+QA_WX_LOAD="boot/xen-syms-${PV}"
+
+REQUIRED_USE="flask? ( xsm )"
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+	if [[ -z ${XEN_TARGET_ARCH} ]]; then
+		if use x86 && use amd64; then
+			die "Confusion! Both x86 and amd64 are set in your use flags!"
+		elif use x86; then
+			export XEN_TARGET_ARCH="x86_32"
+		elif use amd64; then
+			export XEN_TARGET_ARCH="x86_64"
+		else
+			die "Unsupported architecture!"
+		fi
+	fi
+
+	if use flask ; then
+		export "XSM_ENABLE=y"
+		export "FLASK_ENABLE=y"
+	elif use xsm ; then
+		export "XSM_ENABLE=y"
+	fi
+}
+
+src_prepare() {
+	# Upstream's patchset
+	if [[ -n ${UPSTREAM_VER} ]]; then
+		EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" \
+			epatch "${WORKDIR}"/patches-upstream
+	fi
+
+	# Gentoo's patchset
+	if [[ -n ${GENTOO_VER} ]]; then
+		EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" \
+			epatch "${WORKDIR}"/patches-gentoo
+	fi
+
+	# Drop .config and fix gcc-4.6
+	epatch  "${FILESDIR}"/${PN/-pvgrub/}-4.3-fix_dotconfig-gcc.patch
+
+	if use efi; then
+		epatch "${FILESDIR}"/${PN}-4.2-efi.patch
+		export EFI_VENDOR="gentoo"
+		export EFI_MOUNTPOINT="boot"
+	fi
+
+	# if the user *really* wants to use their own custom-cflags, let them
+	if use custom-cflags; then
+		einfo "User wants their own CFLAGS - removing defaults"
+		# try and remove all the default custom-cflags
+		find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \
+			-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
+			-i {} \; || die "failed to re-set custom-cflags"
+	fi
+
+	# not strictly necessary to fix this
+	sed -i 's/, "-Werror"//' "${S}/tools/python/setup.py" || die "failed to re-set setup.py"
+
+	epatch_user
+}
+
+src_configure() {
+	use debug && myopt="${myopt} debug=y"
+
+	if use custom-cflags; then
+		filter-flags -fPIE -fstack-protector
+		replace-flags -O3 -O2
+	else
+		unset CFLAGS
+	fi
+}
+
+src_compile() {
+	# Send raw LDFLAGS so that --as-needed works
+	emake V=1 CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt}
+}
+
+src_install() {
+	local myopt
+	use debug && myopt="${myopt} debug=y"
+
+	# The 'make install' doesn't 'mkdir -p' the subdirs
+	if use efi; then
+		mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die
+	fi
+
+	emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install
+}
+
+pkg_postinst() {
+	elog "Official Xen Guide and the unoffical wiki page:"
+	elog " http://www.gentoo.org/doc/en/xen-guide.xml"
+	elog " http://en.gentoo-wiki.com/wiki/Xen/"
+
+	use efi && einfo "The efi executable is installed in boot/efi/gentoo"
+}
diff --git a/app-forensics/lynis/Manifest b/app-forensics/lynis/Manifest
index 5e6bf9266631..df84107188d8 100644
--- a/app-forensics/lynis/Manifest
+++ b/app-forensics/lynis/Manifest
@@ -1,3 +1,2 @@
 DIST lynis-1.3.0.tar.gz 119797 SHA256 fe265965eb1ce8fac352e0bddea1d5ec6508c319bf88a5f63c2edecf2af6de54 SHA512 a2cf40fbc245e9ed89740026374f3b61110cc1e0282899284699a2271cb4996f30d0a91562d3e2eaf5eb165ab89d0860127ceeb5767aec1d5538b879657a76a8 WHIRLPOOL c19aaaf2f9ccd8141a86b1eeecf129ab83006b50ed428eb1801b58811b441f3c5cfea37d1333cf58fd372b3f40026735bdc2e44ace3de399a27e2e0dd8300fa3
-DIST lynis-1.3.9.tar.gz 138169 SHA256 78abf32de8ba0d0a67617e61fa1cb640b7508cd32d15ea092104768963766702 SHA512 cf72d7091a3638bf939cff7efaf15713d6f192d6951bb4ac06ab131ba1710304524bb1592656fcb6dd1543091c433f4daedcc5920fd9e1cf613ac11ad2954ba6 WHIRLPOOL 02876aa39b91f52da19588191bf8abea961f62019f221834b07e8d9f422544bf4dc7dcc5077f3357221c2658f165d28c883e3387fe504aa784ff9e771a36ebd5
-DIST lynis-1.4.0.tar.gz 138563 SHA256 fb2cda4617d1625eeed6c9d9ba9aa64a72737f25b4b8bff588a69620d7c4f1cb SHA512 b1897c93d7a2207858abdf83a74024575dd3c58aece6c136160b6f26a9a24c45915a6f9d65a771c7f2f1e3d85911516edbb5a69f0b962200cbdaeef736cb51b8 WHIRLPOOL 3ea7d573d194e5aec1f20922fb0e41a87108ea6e3aa90bcc0c3628ebaaedfc07f89eac52d7704c96f46768c6d112c110c10cdb8a1ad8cd1d413566f6c4d1555c
+DIST lynis-1.4.1.tar.gz 139412 SHA256 6df617ee79fb23beec2f85b10909b8120664dc293d9dff1a3386c94869b72931 SHA512 b408ce1366d23d510ba5185f09b9bc032b75a10b9fae82e250563501acd3d77bcf2f762cb59d12e04fd5eb8b6a8f1cb9ce70ef37d5f18a3313d670d8e88689af WHIRLPOOL ad350473c42a980b946eb7e312506e5cd21a4d34571e155d11b15558d7f9837a5b09778c0b76a1befbc5407ac179d37d76d2ddb049d40efda6d1f6a6aab9330a
diff --git a/app-forensics/lynis/lynis-1.3.9.ebuild b/app-forensics/lynis/lynis-1.3.9.ebuild
deleted file mode 100644
index f462e539d233..000000000000
--- a/app-forensics/lynis/lynis-1.3.9.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-forensics/lynis/lynis-1.3.9.ebuild,v 1.1 2014/01/09 22:57:08 idl0r Exp $
-
-EAPI="5"
-
-DESCRIPTION="Security and system auditing tool"
-HOMEPAGE="http://www.rootkit.nl/projects/lynis.html"
-SRC_URI="http://cisofy.com/files/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="app-shells/bash"
-
-src_install() {
-	insinto /usr/share/${PN}
-	doins -r db/ include/ plugins/ || die "failed to install lynis base files"
-
-	insopts -m0640
-	doins -r include/
-	insopts -m0644
-
-	dosbin lynis
-
-	insinto /etc/${PN}
-	doins default.prf
-
-	doman lynis.8
-	dodoc CHANGELOG FAQ README dev/TODO
-
-	# Remove the old one during the next stabilize progress
-	exeinto /etc/cron.daily
-	newexe "${FILESDIR}"/lynis.cron-new lynis
-}
-
-pkg_postinst() {
-	einfo
-	einfo "A cron script has been installed to ${ROOT}etc/cron.daily/lynis."
-	einfo
-}
diff --git a/app-forensics/lynis/lynis-1.4.0.ebuild b/app-forensics/lynis/lynis-1.4.1.ebuild
similarity index 95%
rename from app-forensics/lynis/lynis-1.4.0.ebuild
rename to app-forensics/lynis/lynis-1.4.1.ebuild
index 100bdfd52d43..66516af2f4c0 100644
--- a/app-forensics/lynis/lynis-1.4.0.ebuild
+++ b/app-forensics/lynis/lynis-1.4.1.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/app-forensics/lynis/lynis-1.4.0.ebuild,v 1.1 2014/01/29 19:01:51 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/lynis/lynis-1.4.1.ebuild,v 1.1 2014/02/18 18:50:07 idl0r Exp $
 
 EAPI="5"
 
diff --git a/app-misc/byobu/Manifest b/app-misc/byobu/Manifest
index da183287c08d..17a788016183 100644
--- a/app-misc/byobu/Manifest
+++ b/app-misc/byobu/Manifest
@@ -2,3 +2,4 @@ DIST byobu_5.69.orig.tar.gz 635271 SHA256 ac380555b3760982ef91fc840f44f5363515e3
 DIST byobu_5.70.orig.tar.gz 635429 SHA256 40668fef1fe5cbafaf6b73470cd175976ae50e2802d193918477307c201617f0 SHA512 5d6bba4dc6a01ba758619ba37defcfc371fb84ecba4fce7db98a0ffd88304649a40c2de844dc26cab1aabfc588f749a46ccb71707c3c8314454dbff65749c70d WHIRLPOOL fc12b82f605d4d8459c2b743856898942e86c9f311e3d176ada3975b5a3c9815297002ac58e42e80ba4fe3b723151d4782a8a53937f954e941e52fb4b3c9e1dd
 DIST byobu_5.71.orig.tar.gz 635621 SHA256 031fff3858f336fc5e29e98c2dcf3edd42804c025cb751de2c9847cd59c7acff SHA512 37edeaf13dbe43b9beae06f72d7b072f2755644c693793cc5d1737329356887ad1b594d0e09f590da9b6547ab76a3e6c6c0c09d63f6437fb891588efea08875d WHIRLPOOL ae961ef2c01c44275fed1d18c195bbecdd20c257654d0fd5a58e44a5f883d8c24c79158ff60b8ccd870bb8fc6da2a8f884b767bd5ec5b12747422a8e98475289
 DIST byobu_5.72.orig.tar.gz 635637 SHA256 185d192f2a95bf2b2ee5bfa52452df52eb31f8c23df27edbd24e5788fad3d069 SHA512 b427f71950b761c0bc416260304f3f1ea8c5399d39d38746934bd605bde449a284f24a9dd877d8b4188c6b21fa27798f26d3860012eeae759dee8ebc557687eb WHIRLPOOL f6a9e9e4aaf939b9bcd0b3044be1ddb07d2259602aabb2f99dea18d0b49d4d814109b0e9006e2cb4bc440889cbeb01784a80d1239d5263347ffecf0a4c9e91f5
+DIST byobu_5.73.orig.tar.gz 635985 SHA256 c5508b591f4bb1f9cbfb3e9264b3e123eac791c395c5864b9ccb3da10e684ce1 SHA512 d7acc1636b160e37470cb8637284abcd2a7df4b8832aa41adaaacf62599f1d9af11456ef3bde6b29f221bd64fab0866ac64401f9a782378639c886782138ff06 WHIRLPOOL c26cd5349da1497d7c8888c0ab3d018bd890a1cb17bd9d1d99cc34d678c6909049ed35241d9a6af967597747be0fca52ffcdc466be57616024d7aca57e5501d4
diff --git a/app-misc/byobu/byobu-5.73.ebuild b/app-misc/byobu/byobu-5.73.ebuild
new file mode 100644
index 000000000000..39e4314ec6fc
--- /dev/null
+++ b/app-misc/byobu/byobu-5.73.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/byobu/byobu-5.73.ebuild,v 1.1 2014/02/19 10:07:24 radhermit Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit python-single-r1
+
+DESCRIPTION="A set of profiles for the GNU Screen console window manager (app-misc/screen)"
+HOMEPAGE="http://byobu.co"
+SRC_URI="http://launchpad.net/${PN}/trunk/${PV}/+download/${P/-/_}.orig.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="screen"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-libs/newt[${PYTHON_USEDEP}]
+	screen? ( app-misc/screen )
+	!screen? ( app-misc/tmux )"
+
+src_prepare() {
+	python_fix_shebang .
+
+	# Set default system backend to screen
+	if use screen ; then
+		sed -i -e 's/#\(BYOBU_BACKEND\).*/\1="screen"/' etc/byobu/backend || die
+	fi
+}
+
+src_install() {
+	default
+
+	# Create symlinks for backends
+	dosym ${PN} /usr/bin/${PN}-screen
+	dosym ${PN} /usr/bin/${PN}-tmux
+
+	docompress -x /usr/share/doc/${PN}
+}
diff --git a/app-misc/ca-certificates/ca-certificates-20130906.ebuild b/app-misc/ca-certificates/ca-certificates-20130906.ebuild
index 76a741e6d9e3..900daba23b77 100644
--- a/app-misc/ca-certificates/ca-certificates-20130906.ebuild
+++ b/app-misc/ca-certificates/ca-certificates-20130906.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/app-misc/ca-certificates/ca-certificates-20130906.ebuild,v 1.2 2014/01/17 04:23:20 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/ca-certificates/ca-certificates-20130906.ebuild,v 1.3 2014/02/18 10:43:46 jer Exp $
 
 EAPI="4"
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${PV}${NMU_PR:++nmu}${NMU_PR}_a
 
 LICENSE="MPL-1.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 # platforms like AIX don't have a good ar
diff --git a/app-misc/freemind/freemind-1.0.0.ebuild b/app-misc/freemind/freemind-1.0.0-r1.ebuild
similarity index 96%
rename from app-misc/freemind/freemind-1.0.0.ebuild
rename to app-misc/freemind/freemind-1.0.0-r1.ebuild
index 64c11eacfef6..d9693a646b12 100644
--- a/app-misc/freemind/freemind-1.0.0.ebuild
+++ b/app-misc/freemind/freemind-1.0.0-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/app-misc/freemind/freemind-1.0.0.ebuild,v 1.1 2014/01/20 19:09:48 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/freemind/freemind-1.0.0-r1.ebuild,v 1.1 2014/02/18 22:43:38 tomwij Exp $
 
 EAPI="5"
 
@@ -45,8 +45,6 @@ java_prepare() {
 	# disable dmg build on Mac OS X
 	sed -i -e 's:<antcall target="dist_\(macos\|icon\)"/>::p' 'build.xml' || die
 
-	java-ant_remove-taskdefs --name jarbundler # macOS only
-
 	use groovy || rm plugins/build_scripting.xml || die
 	use latex || rm plugins/build_latex.xml || die
 	use pdf || use svg || rm plugins/build_svg.xml || die
diff --git a/app-misc/mediacrush-cli/mediacrush-cli-9999.ebuild b/app-misc/mediacrush-cli/mediacrush-cli-9999.ebuild
index 633d64483cfd..34c6c599bf29 100644
--- a/app-misc/mediacrush-cli/mediacrush-cli-9999.ebuild
+++ b/app-misc/mediacrush-cli/mediacrush-cli-9999.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/app-misc/mediacrush-cli/mediacrush-cli-9999.ebuild,v 1.1 2014/02/17 17:29:54 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/mediacrush-cli/mediacrush-cli-9999.ebuild,v 1.2 2014/02/18 14:24:03 maksbotan Exp $
 
 EAPI=5
 
@@ -26,7 +26,6 @@ DEPEND="
 	app-text/asciidoc
 "
 RDEPEND="
-	app-editors/vim-core
 	net-misc/curl
 	sys-apps/file
 	sys-apps/sed
diff --git a/app-office/lyx/metadata.xml b/app-office/lyx/metadata.xml
index c7e171a57df9..5fb0e29f6f2a 100644
--- a/app-office/lyx/metadata.xml
+++ b/app-office/lyx/metadata.xml
@@ -4,13 +4,15 @@
 <herd>tex</herd>
 <herd>proxy-maintainers</herd>
 <herd>cjk</herd>
-<maintainer>
-  <email>aballier@gentoo.org</email>
-  <name>Alexis Ballier</name>
-</maintainer>
 <maintainer>
   <email>ps@twin.jikos.cz</email>
   <name>Pavel Sanda</name>
+  <description>Primary Maintainer, Assign bugs</description>
+</maintainer>
+<maintainer>
+  <email>aballier@gentoo.org</email>
+  <name>Alexis Ballier</name>
+  <description>Proxy Maintainer, CC bugs</description>
 </maintainer>
 <use>
   <flag name='docbook'>Add support for docbook export</flag>
diff --git a/app-office/odeskteam/Manifest b/app-office/odeskteam/Manifest
index fea5345fa573..14e8bf1a6726 100644
--- a/app-office/odeskteam/Manifest
+++ b/app-office/odeskteam/Manifest
@@ -1,2 +1,4 @@
+DIST odeskteam-3.10.5-1fc19.i386.rpm 1579803 SHA256 87d8689660f36384d1703c8164aecf2babfcfad669739ec9ff732b608d36d046 SHA512 32dff3addd42476c7690e33b12da1d455a8c22c63ab210502075a06ff0cf461a87268755cc98a6076232fd1e2c7491b009558c5735ee249bb55fad6e71ba4a50 WHIRLPOOL 502b82fa9cbb81f7c01be7b650a8842f042863b2fa20538b2801f535f7887bb53b5937bbe6dd20f52dea452220e2fc14873d7557ee6addb21ceabd2e007dbb98
+DIST odeskteam-3.10.5-1fc19.x86_64.rpm 1637105 SHA256 9a071e29fa261dda061196dc43417ce5d4b3c23af00c781bf417075bec4ad5e1 SHA512 a962240026422e3be7a6b4311b1bb09bfb46a0dc0bc16b01140b00402b539082deba33423abec27e028f8a7cefb7d829d30ce699fa3c7513da61be9e1b53bc5c WHIRLPOOL 7aac6f0d69bac900485f5a77bc5feae03eebbd8066c413d3048b1dfde09241d943bc09b522466b0cfe591c0a0825d5af9b64e0d3f51f74bb41b4049cce52de45
 DIST odeskteam-3.6.1-1fc17.i386.rpm 1495558 SHA256 a2e3708a04f4441b8626a2608469c88a5993241e8baef13ff503a0ac627f76e9 SHA512 2fd2d5906a1ede4f1e014ad8c67b696e265f38765d5ec3d870aca797ab4471a5b6868adf8730dbdd14254421ca3b579f6d63b4688174e2d9f098f9e6b865be67 WHIRLPOOL 6a75262e42038707fe0659e3418b578ec253e9f85fab7c91176b6e5456e5d78863546f64c079fa53cc30e8c9ebb45388a6965ba468d9437ff24a5040a53e4df6
 DIST odeskteam-3.6.1-1fc17.x86_64.rpm 1545261 SHA256 1444234e08db33237f336817d32f6655c1a2c41b98f7e899919f2bdfca4577f3 SHA512 1dda4998597739977fc607e5da12fcbb1d6843235c911d9b7ea1b4696d293bcb6b4865a605256e13d512741ee46e5dbfc194363261facf3af90105a2656367a2 WHIRLPOOL 0e326c20e8baadba08ece0b37014f727b50feded614a56ce839fcca41df98852c83898fb12fd1672e9d1e4966262a6e8b9fcc651112a9d0a91b7a2fce5983be7
diff --git a/app-office/odeskteam/odeskteam-3.10.5.ebuild b/app-office/odeskteam/odeskteam-3.10.5.ebuild
new file mode 100644
index 000000000000..f3089e6f9a2e
--- /dev/null
+++ b/app-office/odeskteam/odeskteam-3.10.5.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/app-office/odeskteam/odeskteam-3.10.5.ebuild,v 1.1 2014/02/19 01:41:57 titanofold Exp $
+
+EAPI=5
+
+inherit rpm eutils
+
+# Binary only distribution
+QA_PREBUILT="*"
+
+DESCRIPTION="Project collaboration and tracking software for oDesk.com"
+HOMEPAGE="https://www.odesk.com/"
+SRC_URI="amd64? ( https://www.odesk.com/downloads/linux/beta/${P}-1fc19.x86_64.rpm )
+		 x86? ( https://www.odesk.com/downloads/linux/beta/${P}-1fc19.i386.rpm )
+"
+
+LICENSE="ODESK"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+S=${WORKDIR}
+
+RDEPEND=">=dev-libs/glib-2
+		 app-arch/bzip2
+		 dev-libs/libxml2
+		 dev-qt/qtcore:4[ssl]
+		 dev-qt/qtdbus:4
+		 dev-qt/qtdeclarative:4
+		 dev-qt/qtgui:4
+		 dev-qt/qtopengl:4
+		 dev-qt/qtscript:4
+		 dev-qt/qtsql:4
+		 dev-qt/qtsvg:4
+		 dev-qt/qtxmlpatterns:4
+		 x11-libs/libX11
+		 x11-libs/libXScrnSaver
+		 x11-libs/libXext
+		 x11-libs/libXi
+"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-3.6.1_desktop_file.patch"
+}
+
+src_install() {
+	into /opt
+	dobin usr/bin/odeskteam-qt4
+
+	domenu usr/share/applications/odeskteam.desktop
+
+	doicon usr/share/pixmaps/odeskteam.png
+}
diff --git a/app-portage/gentoolkit-dev/gentoolkit-dev-0.2.8.3-r1.ebuild b/app-portage/gentoolkit-dev/gentoolkit-dev-0.2.8.3-r1.ebuild
index 3040fbc6ca35..eff10771f42d 100644
--- a/app-portage/gentoolkit-dev/gentoolkit-dev-0.2.8.3-r1.ebuild
+++ b/app-portage/gentoolkit-dev/gentoolkit-dev-0.2.8.3-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/app-portage/gentoolkit-dev/gentoolkit-dev-0.2.8.3-r1.ebuild,v 1.4 2014/01/19 02:10:20 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit-dev/gentoolkit-dev-0.2.8.3-r1.ebuild,v 1.5 2014/02/18 16:09:19 jer Exp $
 
 EAPI="5"
 
@@ -16,7 +16,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/app-shells/dash/Manifest b/app-shells/dash/Manifest
index 7eb544b5a14d..1da22b2c28ee 100644
--- a/app-shells/dash/Manifest
+++ b/app-shells/dash/Manifest
@@ -1,6 +1,4 @@
-DIST dash-0.5.5.1.tar.gz 208094 SHA256 1c6717a1014c73aa16bc78a4767f1e00b40ff2a01a6c2cf2cce9a5335c24493f SHA512 2beab4575808ab9855c13397b25c89e42fd78ea43b1bc11f69e064f4dbe807216012732b01ba5f1177c83b9c31dc9e994ba2a75471bb209ce06b051bec74110c WHIRLPOOL ec6741e41b30388b351d81d2cada4750a73779ea862ee381e4bb8754069ae4db78bc9a97a13d02324fa854e465f12d93ac3080ed1126f64a3dc88fa2c1894a2a
 DIST dash-0.5.7.tar.gz 223794 SHA256 ae89fa9f1145b7748cf0740e1df04cd52fdf8a285da4911dd0f04983efba4e39 SHA512 77ad016fa5fb3fcb0d940b29d3fa914f546d79cdf2221ed47e4dec6d3a005b25d2d32ee1fdd4f662a7a84274572b72235b82e4c39995c7ca0bb049a7d88595b5 WHIRLPOOL cc11d46a76aa201cb02c4f58e6b1b77fe859d34d7f8b6e6320263a2446dc4d229549823e6628875e0caa21a90fe3743026ba5809ba1a78788d8dd9c94207aa48
-DIST dash_0.5.5.1-2.diff.gz 30224 SHA256 fd5bf5db5719804b1f8b49911b07de66ec18d3a3312ba5c3c233a888823f1739 SHA512 95733f9ab72a1d50ba4c6e3ba0804a451a0de07a3c23269b2b54660ebb4ce727a5b1c917e079aae7ad376ffdbb8d183f23aee99749300c959bc91d05f9fa53fa WHIRLPOOL 25323257f40620e2e0a062cc15d92e6c03f3da88968c423ce966aaf0ce361eccf5f092c8cb8c8ce8551e7315da1fcf2cad190b3e076d15c2761435d84e2937db
-DIST dash_0.5.5.1-7.diff.gz 48211 SHA256 aea83843e9e7ab15d642237081d229b3ab44ca33b9565efcdc637865053a32ba SHA512 f8e459ed799204ba9ac12ababc53065b85c0cbc5e3f95e14b767d2eaa5d518b14bc60aeeb1aa6d20e76544953c076bb85137832aa388cf45b7d7170d37ed4fc8 WHIRLPOOL d33d75ab7b4ef140061e1d00dbdb073e7f204d60c76c653cfe9240c3511b93012472b92fe22dec4c752414faedbe4aaac696e022d3a4f7985c3c425bcef64e2e
 DIST dash_0.5.7-1.diff.gz 39151 SHA256 d928ac4862dcea1b796a517709d3a102e23f812c14e9e6f9dc3d3ad7d4d7b6f4 SHA512 f793ba9a34801a111e1112fb15629c2897da0002da7bf59b881873a2f4e4ca28a17d07eebaecf528cb26fbe7ba45bf719b0faaa5ecc9076934c879818004a29d WHIRLPOOL efaa43bafd425abab32f861ae5d1ce919cef120fa14b61d94eec20937447c8109504270c3eaa8089d93c633c6e29be1e27fc4f8e1273e706afe5229a03298d92
 DIST dash_0.5.7-3.diff.gz 41631 SHA256 ee6aa93c49487e699286347ee5709efdfd7e040b02c85b467e629bb457cdfee7 SHA512 db82213a0e9ab96139931586e59ca9cc17d819a6f7897cb2e86106fe414f868164bcb1353296e2d7d30582ab2ea4c8d441ba4f46c08028e9a875674f001f83f1 WHIRLPOOL ac368be55af0effb746b0d7fd3ab80eb1a1adf15542862ba1ddabc27e46554ed62d0f858076efe71a6a166738f0692d70f36234f154f6b3965fc1e9422a11117
+DIST dash_0.5.7-4.diff.gz 42834 SHA256 649d97aa0c48dc0db73c08d7e89a004b9d413279a823388161940342016284f0 SHA512 6b53684deebb9ac8ac0f42fa25ff5cad7f717b01473bdb29e968ea2cf3753f83013d70dcea4d4d3e7906b09760f086b10acaff0ebb3445bd392d8276fb865224 WHIRLPOOL efa53e58c6223ef8d9b84780ef873d2a268fc1f40f879f5c731cf37717050b2333a01eb01a44d55e58c14e1c78c6e6d41b4652278311d72657089632358a9aab
diff --git a/app-shells/dash/dash-0.5.5.1.2.ebuild b/app-shells/dash/dash-0.5.5.1.2.ebuild
deleted file mode 100644
index 972d1ead1bdc..000000000000
--- a/app-shells/dash/dash-0.5.5.1.2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/dash/dash-0.5.5.1.2.ebuild,v 1.8 2010/07/25 17:36:53 armin76 Exp $
-
-inherit autotools eutils flag-o-matic
-
-DEB_PV=${PV%.*}
-DEB_PATCH=${PV##*.}
-DEB_PF="${PN}_${DEB_PV}-${DEB_PATCH}"
-MY_P="${PN}-${DEB_PV}"
-
-DESCRIPTION="DASH is a direct descendant of the NetBSD version of ash (the Almquist SHell) and is POSIX compliant"
-HOMEPAGE="http://gondor.apana.org.au/~herbert/dash/"
-SRC_URI="http://gondor.apana.org.au/~herbert/dash/files/${PN}-${DEB_PV}.tar.gz
-	mirror://debian/pool/main/d/dash/${DEB_PF}.diff.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
-IUSE="libedit static"
-
-DEPEND="libedit? ( dev-libs/libedit )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-
-	epatch "${WORKDIR}"/${DEB_PF}.diff
-	cd "${S}"
-	epatch debian/diff/*
-
-	# Fix the invalid sort
-	sed -i -e 's/LC_COLLATE=C/LC_ALL=C/g' src/mkbuiltins
-
-	# Always statically link libedit in to ensure we always boot if it changes
-	# which it has done in the past.
-	local s="s/-ledit/-Wl,-Bstatic -ledit -Wl,-Bdynamic -lcurses/g"
-	use static && s="s/-ledit/-ledit -lcurses/g"
-	sed -i -e "${s}" configure.ac || die "Failed to sed configure.ac"
-
-	# May as well, as the debian patches force this anyway
-	eautoreconf
-}
-
-src_compile() {
-	use static && append-ldflags -static
-	econf \
-		--bindir=/bin \
-		$(use_with libedit) \
-		|| die "econf failed"
-	emake || die
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-	dodoc ChangeLog debian/changelog
-}
diff --git a/app-shells/dash/dash-0.5.5.1.7.ebuild b/app-shells/dash/dash-0.5.7.4.ebuild
similarity index 75%
rename from app-shells/dash/dash-0.5.5.1.7.ebuild
rename to app-shells/dash/dash-0.5.7.4.ebuild
index e1d9590ade41..025cf5165c48 100644
--- a/app-shells/dash/dash-0.5.5.1.7.ebuild
+++ b/app-shells/dash/dash-0.5.7.4.ebuild
@@ -1,8 +1,8 @@
-# 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/app-shells/dash/dash-0.5.5.1.7.ebuild,v 1.10 2012/05/02 20:29:50 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/dash/dash-0.5.7.4.ebuild,v 1.1 2014/02/18 12:03:40 polynomial-c Exp $
 
-EAPI="2"
+EAPI="4"
 
 inherit autotools eutils flag-o-matic toolchain-funcs
 
@@ -18,7 +18,7 @@ SRC_URI="http://gondor.apana.org.au/~herbert/dash/files/${PN}-${DEB_PV}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="libedit static"
 
 RDEPEND="!static? ( libedit? ( dev-libs/libedit ) )"
@@ -37,7 +37,7 @@ src_prepare() {
 	sed -i -e 's/LC_COLLATE=C/LC_ALL=C/g' src/mkbuiltins
 
 	# Use pkg-config for libedit linkage
-	sed -i "/LIBS/s:-ledit:\`$(tc-getPKG_CONFIG) --libs libedit $(use static && echo --static)\`:" configure.ac
+	sed -i "/LIBS/s:-ledit:\`$(tc-getPKG_CONFIG) --libs libedit $(usex static --static '')\`:" configure.ac
 
 	# May as well, as the debian patches force this anyway
 	eautoreconf
@@ -45,12 +45,14 @@ src_prepare() {
 
 src_configure() {
 	use static && append-ldflags -static
+	# Do not pass --enable-glob due to #443552.
 	econf \
 		--bindir=/bin \
+		--enable-fnmatch \
 		$(use_with libedit)
 }
 
 src_install() {
-	emake install DESTDIR="${D}" || die
-	dodoc ChangeLog */debian/changelog
+	default
+	dodoc */debian/changelog
 }
diff --git a/app-text/jabref/Manifest b/app-text/jabref/Manifest
index 3138cdbea683..d542b46945d9 100644
--- a/app-text/jabref/Manifest
+++ b/app-text/jabref/Manifest
@@ -1,3 +1,4 @@
 DIST JabRef-2.10b2-src.tar.bz2 16796962 SHA256 296a55bd480c252facfae25b6ee36b4d490ec6e1852d79609b01d6ad6d12d941 SHA512 611456d0fcc310987876b0210537ed5cc648bed43de543b465b93613bf6f2449ba4514e3086dc633005e630216ac776f716671b9085623940e380b5133cb4323 WHIRLPOOL 220548bf28ffef14e488838fbe7b2e130043518369de9bc95fc7ee7207f49a6995dd59f3e2857e2afabe3762739e6b0ecfc36ead5a46114bcf1932dfe08e25eb
+DIST JabRef-2.10b3-src.tar.bz2 16799104 SHA256 0ff6084d55273644210a6caaa1a2c465c7ccda772a82cf5b16405fd773addfb3 SHA512 02698b390b319ff31d8ff979ad63df4ca5ec324466b3470056fac47e2f34549ef046fb763c5890a729b598512d46fcb08f59dd8caac365365bbfb6caf566b114 WHIRLPOOL f4afa892485ae5bd84635e04d9ee5f077ccfb2d5817cc6b557d43f1193a51f26eec53d033fba3191645c2c1858fdd0ac1600326dc5e97f7ab414f3fecf2c080c
 DIST JabRef-2.6-src.tar.bz2 7028591 SHA256 fd7551b796cdeca8db0b3cb8f089fcb673b03d797b6ff0e68216b1201792d02c SHA512 63302871ed8724451d76fed451b585f13b776f2ab5b765ba4d95b55652ea5c8ffccbdecbe3cd4d4e9f43bd03268da4e24896a0ac6f61e54c985c7f11cab411ec WHIRLPOOL 01a3681644b2782ebd5ed3f0413a79f50ed9a514ef53421e90907263add8a80da675d6f27004ac5231b73eef24a3ecf022bfb7da48c89c4a764c58da3aa858ad
 DIST JabRef-2.9.2-src.tar.bz2 16664284 SHA256 12bc7e489709bc6f57327bf8e15c6bc9ceaa600369dca6452b7c13d792215e83 SHA512 40eb5d3f3528e92c4d5c62abce12d87ea63b84a58778a32151cd1af2a0198c49aa354ee295f8b3c9449d5b078f7119163babd3c29f358b0d56b3776980292463 WHIRLPOOL d2115e497066f31a3772085510f6820e46a55fbe36778471e6c81a4973f45607761cca80655cfefffb1308f65315ef72fb17791fe964d004826f345322ca0dcf
diff --git a/app-text/jabref/jabref-2.10_beta3.ebuild b/app-text/jabref/jabref-2.10_beta3.ebuild
new file mode 100644
index 000000000000..b32289848faa
--- /dev/null
+++ b/app-text/jabref/jabref-2.10_beta3.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/jabref/jabref-2.10_beta3.ebuild,v 1.1 2014/02/19 04:10:12 nicolasbock Exp $
+
+EAPI=5
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+inherit eutils java-pkg-2 java-ant-2 java-utils-2
+
+MY_PV="${PV/_beta/b}"
+
+DESCRIPTION="Java GUI for managing BibTeX and other bibliographies"
+HOMEPAGE="http://jabref.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/JabRef-${MY_PV}-src.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc"
+
+COMMON_DEP="
+	dev-java/antlr:3
+	dev-java/fontbox:1.7
+	dev-java/jempbox:1.7
+	dev-java/log4j:0
+	dev-java/spin:0
+	"
+
+DEPEND="
+	>=virtual/jdk-1.6
+	${COMMON_DEP}"
+
+RDEPEND="
+	>=virtual/jre-1.6
+	${COMMON_DEP}"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+java_prepare() {
+	# Remove bundled dependencies.
+	rm lib/antlr*.jar || die
+	rm lib/fontbox*.jar || die
+	rm lib/jempbox*.jar || die
+	rm lib/spin.jar || die
+
+	# Remove unjarlib target (do this only once we have removed all
+	# bundled dependencies in lib).
+	#sed -i -e 's:depends="build, unjarlib":depends="build":' build.xml
+
+	# Fix incorrect version information.
+	sed -i -e 's:2.10b2:2.10b3:' build.xml
+}
+
+src_compile() {
+	local EXTERNAL_JARS="antlr-3,fontbox-1.7,jempbox-1.7,spin"
+	local CLASSPATH="$(java-pkg_getjars --with-dependencies ${EXTERNAL_JARS})"
+	eant \
+		-Dgentoo.classpath=${CLASSPATH} \
+		jars \
+		$(usex doc docs "")
+}
+
+src_install() {
+	java-pkg_newjar build/lib/JabRef-${MY_PV}.jar
+
+	use doc && java-pkg_dojavadoc build/docs/API
+	dodoc src/txt/README
+
+	java-pkg_dolauncher ${PN} --main net.sf.jabref.JabRef
+	newicon src/images/JabRef-icon-48.png JabRef-icon.png
+	make_desktop_entry ${PN} JabRef JabRef-icon Office
+}
diff --git a/app-text/libpaper/libpaper-1.1.24-r2.ebuild b/app-text/libpaper/libpaper-1.1.24-r2.ebuild
index 38d3d79e858e..5cf69fd87e8e 100644
--- a/app-text/libpaper/libpaper-1.1.24-r2.ebuild
+++ b/app-text/libpaper/libpaper-1.1.24-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/libpaper/libpaper-1.1.24-r2.ebuild,v 1.2 2013/10/13 19:34:20 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/libpaper/libpaper-1.1.24-r2.ebuild,v 1.3 2014/02/18 16:00:28 jer Exp $
 
 EAPI=4
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://debian/pool/main/libp/libpaper/${PN}_${MY_PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 RDEPEND="abi_x86_32? (
 		!<=app-emulation/emul-linux-x86-baselibs-20130224-r10
diff --git a/dev-cpp/ctemplate/Manifest b/dev-cpp/ctemplate/Manifest
index 7f2d6ede7c0c..00f1fdcfe0a0 100644
--- a/dev-cpp/ctemplate/Manifest
+++ b/dev-cpp/ctemplate/Manifest
@@ -1,3 +1,2 @@
-DIST ctemplate-1.0.tar.gz 837995 SHA256 731279f1717527cf85ff79ed19b8674f91c3768d8bc20b09440e8dd1ca1b5bf8 SHA512 0a0ac1d7211422d8fa85fbe7fc67a0208314dbc73e0b602de9615ee30e05848dd128d3d967dbcc7ef39e8d759e7da704265721408424a99e6cb1d1edc9480b11 WHIRLPOOL 3f0332662d938818135bf9c8d05d51c2beab507ddb705e5198bf069f64b337e3dcb9266ecbbad19aa07abe121fd435cf6b3c9949039f48075075fccc26f8bb9b
-DIST ctemplate-2.0.tar.gz 874846 SHA256 ca2dfe9474b1fb1a20f92d934a6b47cbaf170a08b201335594c93b7417c68d69 SHA512 66ef5428b5aaabbe7c99f36bd3251c9112b6952418c27689090777324d00eb4e68095c7f03e7e1a539839e21a8e839f2ac0f36f93f147ddc40e616cccb3e1866 WHIRLPOOL 536f6fc4049198d0357bf3e021b5b6620061216d87034bd2b7e2bc06487cb2e3a495dfaa823ac88757d1a0963686323af50bbb2c222fd4003f28ac8556ce571b
 DIST ctemplate-2.2.tar.gz 889458 SHA256 04f3cbc0f7ff36adedc904bce776a0817cc6b704b3c4a04b4df5de66fd7e686f SHA512 b8f2cbebb3988ce5248ef3b4c224a02626bbc77e3ab4cff8d2fb967f421000048c0923c8410cc800ed29f5fa68e1172aefcfde1e2a610372462018cb1b6809bb WHIRLPOOL 242972d6fcc7592e18e3adff93a6279c543d8bc10408aa0c6f543e13c92d8597a8888d64dd8b729cc92dc8f758d6aa03020cb494428f5f033a845262213204c2
+DIST ctemplate-2.2_p129.tar.bz2 581172 SHA256 1903533180ed9604e548ee7dfb3b704368bda5ce5e5b84f1e448f966730500d7 SHA512 049ae4a9269f668ae6fc6207609a10609d59d7731c999a2ede191cef26d9203ab32ae87a48d5b08457a83a8dbd2be61621dbb8b2361e2747c63502f4caf4f8e7 WHIRLPOOL 790c2242a003ba8ceba3783be26a6a4a0af71605a6ee867d16eff6771f02b071a51e94d620233420aba6da1a9797a0cebcb9e1dce6626703077546c53873dcad
diff --git a/dev-cpp/ctemplate/ctemplate-1.0.ebuild b/dev-cpp/ctemplate/ctemplate-1.0.ebuild
deleted file mode 100644
index f6c2b810e14c..000000000000
--- a/dev-cpp/ctemplate/ctemplate-1.0.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/ctemplate/ctemplate-1.0.ebuild,v 1.7 2012/05/24 19:27:18 vapier Exp $
-
-EAPI="4"
-
-inherit elisp-common python eutils
-
-DESCRIPTION="A simple but powerful template language for C++"
-HOMEPAGE="http://code.google.com/p/google-ctemplate/"
-SRC_URI="http://google-ctemplate.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm ~ppc x86 ~amd64-linux ~x86-linux"
-IUSE="doc emacs vim-syntax static-libs test"
-
-DEPEND="test? ( =dev-lang/python-2* )"
-RDEPEND="vim-syntax? ( >=app-editors/vim-core-7 )
-	emacs? ( virtual/emacs )"
-
-SITEFILE="70ctemplate-gentoo.el"
-
-pkg_setup() {
-	if use test ; then
-		python_set_active_version 2
-		python_pkg_setup
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gcc-4.7.patch
-}
-
-src_configure() {
-	econf \
-		--enable-shared \
-		$(use_enable static-libs static)
-}
-
-src_compile() {
-	default
-
-	if use emacs ; then
-		elisp-compile contrib/tpl-mode.el || die "elisp-compile failed"
-	fi
-}
-
-src_install() {
-	default
-
-	# Installs just every piece
-	rm -rf "${ED}/usr/share/doc"
-
-	dodoc AUTHORS ChangeLog NEWS README
-	use doc && dohtml doc/*
-
-	if use vim-syntax ; then
-		cd "${S}/contrib"
-		sh highlighting.vim || die "unpacking vim scripts failed"
-		insinto /usr/share/vim/vimfiles
-		doins -r .vim/*
-	fi
-
-	if use emacs ; then
-		cd "${S}/contrib"
-		elisp-install ${PN} tpl-mode.el tpl-mode.elc || die "elisp-install failed"
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-
-	find "${ED}"/usr -name '*.la' -delete
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-cpp/ctemplate/ctemplate-2.0.ebuild b/dev-cpp/ctemplate/ctemplate-2.2_p129.ebuild
similarity index 65%
rename from dev-cpp/ctemplate/ctemplate-2.0.ebuild
rename to dev-cpp/ctemplate/ctemplate-2.2_p129.ebuild
index 1f4f0c2b2cde..d062f51bd12a 100644
--- a/dev-cpp/ctemplate/ctemplate-2.0.ebuild
+++ b/dev-cpp/ctemplate/ctemplate-2.2_p129.ebuild
@@ -1,41 +1,37 @@
-# 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/dev-cpp/ctemplate/ctemplate-2.0.ebuild,v 1.2 2012/03/07 19:07:34 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/ctemplate/ctemplate-2.2_p129.ebuild,v 1.1 2014/02/18 12:14:42 pinkbyte Exp $
 
-EAPI="4"
+EAPI="5"
 
-inherit elisp-common python
+AM_OPTS="--force-missing"
+AUTOTOOLS_AUTORECONF=1
+AUTOTOOLS_IN_SOURCE_BUILD=1
+PYTHON_COMPAT=( python2_7 )
+inherit autotools-utils elisp-common python-any-r1
 
 DESCRIPTION="A simple but powerful template language for C++"
 HOMEPAGE="http://code.google.com/p/ctemplate/"
-SRC_URI="http://ctemplate.googlecode.com/files/${P}.tar.gz"
+SRC_URI="http://dev.gentoo.org/~pinkbyte/distfiles/snapshots/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc emacs vim-syntax static-libs test"
 
-DEPEND="test? ( =dev-lang/python-2* )"
+DEPEND="test? ( ${PYTHON_DEPS} )"
 RDEPEND="vim-syntax? ( >=app-editors/vim-core-7 )
 	emacs? ( virtual/emacs )"
 
-SITEFILE="70ctemplate-gentoo.el"
+DOCS=( AUTHORS ChangeLog NEWS README )
 
-pkg_setup() {
-	if use test ; then
-		python_set_active_version 2
-		python_pkg_setup
-	fi
-}
+SITEFILE="70ctemplate-gentoo.el"
 
-src_configure() {
-	econf \
-		--enable-shared \
-		$(use_enable static-libs static)
-}
+# Some tests are broken in 2.2_p129
+RESTRICT="test"
 
 src_compile() {
-	default
+	autotools-utils_src_compile
 
 	if use emacs ; then
 		elisp-compile contrib/tpl-mode.el || die "elisp-compile failed"
@@ -43,12 +39,11 @@ src_compile() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
+	autotools-utils_src_install
 
 	# Installs just every piece
 	rm -rf "${ED}/usr/share/doc"
 
-	dodoc AUTHORS ChangeLog NEWS README
 	use doc && dohtml doc/*
 
 	if use vim-syntax ; then
@@ -63,8 +58,6 @@ src_install() {
 		elisp-install ${PN} tpl-mode.el tpl-mode.elc || die "elisp-install failed"
 		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
 	fi
-
-	find "${ED}" -name '*.la' -exec rm -f {} +
 }
 
 pkg_postinst() {
diff --git a/dev-cpp/ctemplate/files/ctemplate-1.0-gcc-4.7.patch b/dev-cpp/ctemplate/files/ctemplate-1.0-gcc-4.7.patch
deleted file mode 100644
index a8eaaa6fa13e..000000000000
--- a/dev-cpp/ctemplate/files/ctemplate-1.0-gcc-4.7.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-backported fix from ctemplate-2.2 for building with gcc-4.7+
-
---- ctemplate-1.0/src/base/small_map.h
-+++ ctemplate-1.0/src/base/small_map.h
-@@ -360,20 +360,20 @@ class small_map {
-     if (size_ >= 0) {
-       for (int i = 0; i < size_; i++) {
-         if (compare(array_[i]->first, x.first)) {
--          return make_pair(iterator(array_ + i), false);
-+          return std::make_pair(iterator(array_ + i), false);
-         }
-       }
-       if (size_ == kArraySize) {
-         ConvertToRealMap();  // Invalidates all iterators!
-         std::pair<typename NormalMap::iterator, bool> ret = map_->insert(x);
--        return make_pair(iterator(ret.first), ret.second);
-+        return std::make_pair(iterator(ret.first), ret.second);
-       } else {
-         array_[size_].Init(x);
--        return make_pair(iterator(array_ + size_++), true);
-+        return std::make_pair(iterator(array_ + size_++), true);
-       }
-     } else {
-       std::pair<typename NormalMap::iterator, bool> ret = map_->insert(x);
--      return make_pair(iterator(ret.first), ret.second);
-+      return std::make_pair(iterator(ret.first), ret.second);
-     }
-   }
- 
diff --git a/dev-java/jspeex/files/jspeex-0.9.7-remove-junit-report.patch b/dev-java/jspeex/files/jspeex-0.9.7-remove-junit-report.patch
index 40ddfd6fe981..d3446420f720 100644
--- a/dev-java/jspeex/files/jspeex-0.9.7-remove-junit-report.patch
+++ b/dev-java/jspeex/files/jspeex-0.9.7-remove-junit-report.patch
@@ -1,6 +1,7 @@
---- a/build.xml
-+++ b/build.xml
-@@ -218,12 +218,6 @@
+diff -Naur a/build.xml b/build.xml
+--- a/build.xml	2014-02-18 23:32:25.440819710 +0100
++++ b/build.xml	2014-02-18 23:32:43.017053558 +0100
+@@ -218,12 +218,6 @@
          </fileset>
        </batchtest>
      </junit>
diff --git a/dev-java/jspeex/files/jspeex-0.9.7-remove-proguard-taskdef.patch b/dev-java/jspeex/files/jspeex-0.9.7-remove-proguard-taskdef.patch
new file mode 100644
index 000000000000..eb9e6fc24af2
--- /dev/null
+++ b/dev-java/jspeex/files/jspeex-0.9.7-remove-proguard-taskdef.patch
@@ -0,0 +1,53 @@
+diff -Naur a/build.xml b/build.xml
+--- a/build.xml	2014-02-18 23:32:25.440819710 +0100
++++ b/build.xml	2014-02-18 23:33:26.308555686 +0100
+@@ -57,10 +57,6 @@
+ 
+   <property name="version" value="0.9.7"/>
+ 
+-  <!-- Define additional tasks -->
+-  <taskdef name="proguard" classname="proguard.ant.ProGuardTask"
+-           classpath="${lib}/proguard3.2.jar" />
+-
+   <target name="init" description="Initialise ant" depends="clean">
+     <tstamp>
+       <format property="NOW" pattern="dd/MM/yyyy HH:mm" locale="en"/>
+@@ -138,19 +134,6 @@
+   <target name="compress" depends="package"
+           description="Package obfuscated JSpeex library" >
+     <mkdir dir="${log}"/>
+-    <proguard>
+--libraryjars ${java.home}/lib/rt.jar
+--injars      ${dist}/jspeex.jar
+--outjar      ${dist}/jspeex-obf.jar
+--renamesourcefileattribute SourceFile
+--keepattributes InnerClasses,SourceFile
+--printmapping ${log}/jspeex-obf.map
+--overloadaggressively
+-
+--keep public class * {
+-    public protected *;
+-}
+-    </proguard>
+   </target>
+ 
+   <target name="compress-dec-nb" depends="compile-nb"
+@@ -161,18 +144,6 @@
+         <attribute name="Main-Class" value="JSpeexDec"/>
+       </manifest>
+     </jar>
+-    <proguard>
+--libraryjars ${java.home}/lib/rt.jar
+--injars      ${dist}/jspeex-dec-nb.jar
+--outjar      ${dist}/jspeex-dec-nb-obf.jar
+--printmapping ${log}/jspeex-dec-nb-obf.map
+--overloadaggressively
+--defaultpackage ''
+-
+--keep public class JSpeexDec {
+-    public static void main(java.lang.String[]);
+-}
+-    </proguard>
+   </target>
+ 
+   <!-- ******************************************************************** -->
diff --git a/dev-java/jspeex/jspeex-0.9.7.ebuild b/dev-java/jspeex/jspeex-0.9.7-r1.ebuild
similarity index 83%
rename from dev-java/jspeex/jspeex-0.9.7.ebuild
rename to dev-java/jspeex/jspeex-0.9.7-r1.ebuild
index 20df340844ad..07e90e075e6d 100644
--- a/dev-java/jspeex/jspeex-0.9.7.ebuild
+++ b/dev-java/jspeex/jspeex-0.9.7-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jspeex/jspeex-0.9.7.ebuild,v 1.1 2013/06/29 21:40:04 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jspeex/jspeex-0.9.7-r1.ebuild,v 1.1 2014/02/18 22:37:56 tomwij Exp $
 
 EAPI="5"
 
@@ -36,9 +36,8 @@ EANT_BUILD_TARGET="package"
 S="${WORKDIR}/${PN}"
 
 java_prepare() {
-	java-ant_remove-taskdefs --name proguard
-
 	epatch "${FILESDIR}"/${P}-remove-junit-report.patch
+	epatch "${FILESDIR}"/${P}-remove-proguard-taskdef.patch
 
 	find . -name "*.jar" -delete || die "Failed to remove bundled libraries."
 
diff --git a/dev-lang/mercury-extras/Manifest b/dev-lang/mercury-extras/Manifest
index e9eeb0e8c5df..ca06916e9ef4 100644
--- a/dev-lang/mercury-extras/Manifest
+++ b/dev-lang/mercury-extras/Manifest
@@ -8,5 +8,7 @@ DIST mercury-extras-11.07.2.tar.gz 774067 SHA256 424cd1e642a49f4c463e20851ba185c
 DIST mercury-extras-11.07.tar.gz 776589 SHA256 25eaf999666ceb4217cfe0f9fbcb38b892c57fb36efaa16099a471287a7a9019 SHA512 ea2c3231cbb32dc91f36d1d09a5bdac65b468bff64f79aab46baa0e7e9460f75fa5239c96b5b2a616aebb499954b62d8ac7acea93fa971df1e7d81955ca0c5ea WHIRLPOOL 9617163e15b44bf373d5e9204dd8882c4921ed56a38ec41aabd7a81eda1aebedade70e7cfa0eeb21d46349e64fc9ed565cb1eb12dd49c98b8d5dfacdb49fd229
 DIST mercury-extras-13.05-gentoo-patchset-0.tar.gz 6333 SHA256 36d286a20f70e21262ac8d19004400df0a356ef7a85763027ef36f16d7de17cc SHA512 78c1391607e1a8a76c091deef112e9c4e0004fb63b9fe461c3100f2dd6ca03efe069036b081b4de8b4399052a1b10f0ef02188cc2def3d47f6aceb1b61c168c3 WHIRLPOOL 72b16b5948b2fb8048496f094e0c2343af0723f33ebbd024a7e8c0785fc949b2226f3ef78fba16a65903b1675f1280f6a3d35dab1d276203b845f140ccd3e4a7
 DIST mercury-extras-13.05.1-gentoo-patchset-0.tar.gz 3423 SHA256 b15b87c86313e9a038f6ab55c9b47bc9f8eaca51aedf578a9d9e6ab1dc785d9b SHA512 51ade5a5c99fdd0417afb8c0f78c6a5c77d2161091894b62d570ad8d614f2f614e07bb07cbdf5212fd2ca8b6d67778717856a7939e506c56b1597ec05d18c6c4 WHIRLPOOL 7ed609dcde3ac5a89ddebc99365f4e13f50eddb8d6685e40fdf227842b5edfbcaf0bf6a8621696d1484970666fb303e828c5a0d4877e98fb6df6cca147b73a70
+DIST mercury-extras-13.05.2-gentoo-patchset-0.tar.gz 3434 SHA256 4c9d7bd5cd098a9e21981053d854307e8b27efcfd4ea86e4bc44532a1707a2c6 SHA512 7212bce048ac6cda4678bcf5f5046efab101c040324078ab01d5dea1436a495d19574c4d07810447795aec49d79b69a557f60a558e9b6837fe55ccaff80d3077 WHIRLPOOL 239461342b164209fd876f5925b7b03ff9082210cc1242c7fa897bad9029caa6dd6f457feb51e963bd2ce2839cba33146ee7c4daa45c204e6ef2a4f59fe3f7c2
 DIST mercury-srcdist-13.05.1.tar.gz 54558577 SHA256 a90de00fc5905a8421675b04dc3c9d5eda54bedaf8b2ebcefae4de551fbcfd2c SHA512 784069af3ba470e9618e5b7917873e8ad7f4e9dc27eb54afa74eb6d6e659dcfab7007ae93163937412f9eb1b997a327d4378dcd868810c08880d4fa4542dfade WHIRLPOOL ec7281a6e01523b296dcfce595189cb96ad693c9b36ab60cbc6b61672333f5c8d7d9def10cc3c5bba876fddf0eefea3e9c22c1b98ee577d1b6d6aab6d1267915
+DIST mercury-srcdist-13.05.2.tar.gz 53847394 SHA256 8491cf419b996a315bf8664154dd91aed940274ded98e3aded733dbe1939f95f SHA512 2298804d3a04bca6be4bd3046643c7c0d0b22c447423017869cd9bf3a4fb6ec9fd29b5d8e1a386d5d52d07be5cad73608f1fcacf46732a7add93a01dcd199c08 WHIRLPOOL 2a81bebfd4b97b9bb1b0e174025e6050149c8e5f812cd97cbdc41818faa18c15f9494925f1f320682087cc45264bc00db07bef6862afef12317f77cc169a7f86
 DIST mercury-srcdist-13.05.tar.gz 54533409 SHA256 71f1f97484eaecf2c2f91f6731e23afc5cee966e149b61a7525b2bd9a2712d55 SHA512 d76fd3a0c487b2c65168b19ec6a5ea6b792c96692e029afe0589f93132422fc39e0aec856ae02e676cc30dc83780f9c4d4e0ea5f71681442279b900146b58c47 WHIRLPOOL b2cc0f1b074d980701c6d364f30f8bb2dd2556cbc23dca5a982b7c16b71c6834d7c81ea76bfcea25e369f32d606698b77eea168e3b25d4850f924dfa4f6929f4
diff --git a/dev-lang/mercury-extras/mercury-extras-13.05.2.ebuild b/dev-lang/mercury-extras/mercury-extras-13.05.2.ebuild
new file mode 100644
index 000000000000..4ab94cd94db5
--- /dev/null
+++ b/dev-lang/mercury-extras/mercury-extras-13.05.2.ebuild
@@ -0,0 +1,194 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/mercury-extras-13.05.2.ebuild,v 1.1 2014/02/18 10:36:37 keri Exp $
+
+EAPI=2
+
+inherit eutils multilib
+
+PATCHSET_VER="0"
+MY_P=mercury-srcdist-${PV}
+
+DESCRIPTION="Additional libraries and tools that are not part of the Mercury standard library"
+HOMEPAGE="http://www.mercurylang.org/index.html"
+SRC_URI="http://dl.mercurylang.org/release/${MY_P}.tar.gz
+	mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="X cairo examples glut iodbc ncurses odbc opengl ssl tcl tk xml"
+
+RDEPEND="~dev-lang/mercury-${PV}
+	cairo? ( >=x11-libs/cairo-1.10.0 )
+	glut? ( media-libs/freeglut )
+	odbc? ( dev-db/unixODBC )
+	iodbc? ( !odbc? ( dev-db/libiodbc ) )
+	ncurses? ( sys-libs/ncurses )
+	opengl? ( virtual/opengl )
+	tcl? ( tk? (
+			dev-lang/tcl
+			dev-lang/tk
+			x11-libs/libX11
+			x11-libs/libXmu ) )"
+
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}"/${MY_P}/extras
+
+src_prepare() {
+	cd "${WORKDIR}"
+
+	EPATCH_FORCE=yes
+	EPATCH_SUFFIX=patch
+	epatch "${WORKDIR}"/${PV}
+
+	if use odbc; then
+		epatch "${WORKDIR}"/${PV}-odbc/${P}-odbc.patch
+	elif use iodbc; then
+		epatch "${WORKDIR}"/${PV}-odbc/${P}-iodbc.patch
+	fi
+
+	cd "${S}"
+	sed -i	-e "s:references:references solver_types/library:" \
+		-e "s:windows_installer_generator::" \
+		Mmakefile || die "sed default packages failed"
+
+	if use cairo; then
+		sed -i -e "s:lex[ \t]*\\\\:graphics/mercury_cairo lex \\\\:" Mmakefile \
+			|| die "sed cairo failed"
+	fi
+
+	if use glut; then
+		sed -i -e "s:lex[ \t]*\\\\:graphics/mercury_glut lex \\\\:" Mmakefile \
+			|| die "sed glut failed"
+	fi
+
+	if use opengl; then
+		sed -i -e "s:lex[ \t]*\\\\:graphics/mercury_opengl lex \\\\:" Mmakefile \
+			|| die "sed opengl failed"
+	fi
+
+	if use tcl && use tk; then
+		sed -i -e "s:lex[ \t]*\\\\:graphics/mercury_tcltk lex \\\\:" Mmakefile \
+			|| die "sed tcltk failed"
+	fi
+
+	if use odbc || use iodbc; then
+		sed -i -e "s:moose:moose odbc:" Mmakefile \
+			|| die "sed odbc failed"
+	fi
+
+	if use ncurses; then
+		sed -i -e "s:complex_numbers:complex_numbers curs curses:" Mmakefile \
+			|| die "sed ncurses failed"
+	fi
+
+	if ! use xml; then
+		sed -i -e "s:xml::" Mmakefile \
+			|| die "sed xml failed"
+	fi
+
+	sed -i -e "s:@libdir@:$(get_libdir):" \
+		dynamic_linking/Mmakefile \
+		|| die "sed libdir failed"
+
+	# disable broken packages
+	sed -i -e "s:references::" Mmakefile \
+		|| die "sed broken packages failed"
+}
+
+src_compile() {
+	# Mercury dependency generation must be run single-threaded
+	mmake \
+		-j1 depend || die "mmake depend failed"
+
+	# Compiling Mercury submodules is not thread-safe
+	mmake -j1 \
+		EXTRA_MLFLAGS=--no-strip \
+		EXTRA_LDFLAGS="${LDFLAGS}" \
+		EXTRA_LD_LIBFLAGS="${LDFLAGS}" \
+		|| die "mmake failed"
+}
+
+src_install() {
+	# Compiling Mercury submodules is not thread-safe
+	mmake -j1 \
+		EXTRA_LD_LIBFLAGS="${LDFLAGS}" \
+		INSTALL_PREFIX="${D}"/usr \
+		install || die "mmake install failed"
+
+	find "${D}"/usr/$(get_libdir)/mercury -type l | xargs rm
+
+	cd "${S}"
+	if use examples; then
+		insinto /usr/share/doc/${PF}/samples/base64
+		doins base64/*.m || die
+
+		insinto /usr/share/doc/${PF}/samples/complex_numbers
+		doins complex_numbers/samples/* || die
+
+		insinto /usr/share/doc/${PF}/samples/dynamic_linking
+		doins dynamic_linking/hello.m || die
+
+		insinto /usr/share/doc/${PF}/samples/error
+		doins error/* || die
+
+		insinto /usr/share/doc/${PF}/samples/fixed
+		doins fixed/*.m || die
+
+		insinto /usr/share/doc/${PF}/samples/gator
+		doins -r gator/* || die
+
+		insinto /usr/share/doc/${PF}/samples/lex
+		doins lex/samples/* || die
+
+		insinto /usr/share/doc/${PF}/samples/log4m
+		doins log4m/*.m || die
+
+		insinto /usr/share/doc/${PF}/samples/monte
+		doins monte/*.m || die
+
+		insinto /usr/share/doc/${PF}/samples/moose
+		doins moose/samples/* || die
+
+		insinto /usr/share/doc/${PF}/samples/net
+		doins net/*.m || die
+
+		if use ncurses; then
+			insinto /usr/share/doc/${PF}/samples/curs
+			doins curs/samples/* || die
+
+			insinto /usr/share/doc/${PF}/samples/curses
+			doins curses/sample/* || die
+		fi
+
+		if use X; then
+			insinto /usr/share/doc/${PF}/samples/graphics
+			doins graphics/easyx/samples/*.m || die
+		fi
+
+		if use glut && use opengl; then
+			insinto /usr/share/doc/${PF}/samples/graphics
+			doins graphics/samples/calc/* || die
+			doins graphics/samples/gears/* || die
+			doins graphics/samples/maze/* || die
+			doins graphics/samples/pent/* || die
+		fi
+
+		if use opengl && use tcl && use tk; then
+			insinto /usr/share/doc/${PF}/samples/graphics
+			doins graphics/samples/pent/*.m || die
+		fi
+
+		if use ssl; then
+			insinto /usr/share/doc/${PF}/samples/mopenssl
+			doins mopenssl/*.m || die
+		fi
+
+		rm -rf $(find "${D}"/usr/share/doc/${PF}/samples -name CVS)
+	fi
+
+	dodoc README || die
+}
diff --git a/dev-lang/mercury/Manifest b/dev-lang/mercury/Manifest
index 5e25cb9efe7a..ee92806a6222 100644
--- a/dev-lang/mercury/Manifest
+++ b/dev-lang/mercury/Manifest
@@ -4,11 +4,13 @@ DIST mercury-11.07.1-gentoo-patchset-4.tar.gz 7336 SHA256 477cde26b06650b96accdc
 DIST mercury-11.07.2-gentoo-patchset-0.tar.gz 7265 SHA256 d400e40ae62c5cb8e777c2409d70eee7f71f231733a95fd6549f82c6c2933500 SHA512 110e0aacd1ef274d9c7154b359267ec0277e680fe2bb9ec4942dfc167c4f02dfef85fbd205120875e485f1b186432157814891ea9f1d0d55f0cdf236b0a80257 WHIRLPOOL 9002362cc04943558399dc4350a9368d12ce6d9717afe42e7c150ad55c8b2fe326697bdea6e457c1b3611d448ecdf7b171219e23a123aec2d0e70f14ab443afa
 DIST mercury-13.05-gentoo-patchset-0.tar.gz 5947 SHA256 8af2076b571215e403079fab840bf4a769ff67ec1ebfdf7b92bf203a503acb99 SHA512 0662126b9802fe9cd6156b204dc28b4e02a7d55fc5f88e97717c7aeb764014ed537822c5a2d2a5520a6b78c092d2fe25b603f05e1e6d19821b7b2905aad53d0c WHIRLPOOL 56a10ac2503fe87099f29294d44a58902192c18a95d438908fbb31969050289ecd8461fc3188368309d1693bd89e1380c140e58d165d02bf5d8f10e4ccbf30e5
 DIST mercury-13.05.1-gentoo-patchset-0.tar.gz 6013 SHA256 d9cfe7017f234d361f51e0dad1a0f6cdcbf82bf841c312660ffd76d6cdada71a SHA512 8f0a8cd4bf814c8d6903843b4e264da4708cf352439116766a63d5d68ef1043543d53b5729f38e5fef0272c006913b3e6c839c37f1e3486fc6f8d382b280aaee WHIRLPOOL a89cf3170498af1f3ffbd5d56db216932f9c96109b4f2c1c267b51e3f81f1f9e0fe7e755a8d86e8a0cc7eb6c4487918ea2ae9738377a7dd4d369f328b3f7d208
+DIST mercury-13.05.2-gentoo-patchset-0.tar.gz 5155 SHA256 647fb5931a76b86a003063e7f17f929866bb2f2791c98a444a1e9765e70ab4c4 SHA512 8c7305be8c97eebb2107f9ec9debdb572e19b77dbc2e9b5879387322acf06bb0a0a200583d1f01f892640991817c3f17d7c723825c6c1a94d365415cf1d648c6 WHIRLPOOL ce41a9eb302416125816dc09df87b97daeb39253b6ef686ef7ae783366a15e387390b03d63a5ee582a1ddd0244bd109e9da4c6ebbfaa8ad8ee574c87b286a91f
 DIST mercury-compiler-11.01.tar.gz 25122699 SHA256 2d12dc9bfaed46b1b30689b0592177bc871b21cf8852c8326c86371258bb18b0 SHA512 628eb95cc647a3334ed6cc9cdb19256dece544cac34600db2a495815215b494db74b1f196e3c48ba1cbb37b51404158d5a583caa20fd3e53488111927615b666 WHIRLPOOL 6720586514dfa954e8e777986d7b62fd2fb10ce1a309034bdc4e40431762c834cba98e93b129e69ba5a78451cd0f776fe916bce2b15996d1621cab59215481a6
 DIST mercury-compiler-11.07.1.tar.gz 25308185 SHA256 f3f1d4f0fb34567a69aaa9fb6f4ecff52b97a66ab6c8a868c4e284eb61d3dc11 SHA512 c102a1f2c2ed4384919685e3e11ba3b7da0152f6fe8899c2124e9bbb056ab81a5e2fc1dbb07934ca011ed96e7c6af168308c64eb4901db7d247fffd2ff226c4f WHIRLPOOL 6df5a68a9c0adc6d5ae490bd909951d8330db2c4e0bb704ab9be0fe8cdf7177093cd0943256fcbea8d666793d3d53c20b8c703deca43121114d89f1a508f32d5
 DIST mercury-compiler-11.07.2.tar.gz 25311504 SHA256 8afee5732d6d52343fbba8d6b9dd3f87b819673743a408a564eede17956ea659 SHA512 144f496cdfbdb88e15a18b3c295d326ebb1054055c42cb1a5fd634b79797c8dbd46ef5d1731f4c4cb1add02795e9b7d1d72e0426c39e672e208f10068e65df8b WHIRLPOOL a443bad02d714737aa2e1875205915db78bc776cf75f01f98e99efab992a5a542c86772615e9a4066b1143977e354441f07a033ef81a2d8f464226004f5de198
 DIST mercury-compiler-11.07.tar.gz 25298643 SHA256 77940d03834a3967e4505c4a92253c19aaea0fed4650ee94e772078abd6be6a2 SHA512 671bebb67ceca8af0844c2ba0d9db538564d3b324a913141be29c7632adb7a343b93fe771533173d5460ac34d5a69fd18b3ef7f55b26c0d0ee70b7cc2e35f10d WHIRLPOOL 992f5f52292066b775b264401f25b5e8ef246ced9b79c0ec06701f715e22e068ad81a17dea49f62bd72bc9cc0539b2ef7beb9be1401391209e2ab1e3876d0bfc
 DIST mercury-srcdist-13.05.1.tar.gz 54558577 SHA256 a90de00fc5905a8421675b04dc3c9d5eda54bedaf8b2ebcefae4de551fbcfd2c SHA512 784069af3ba470e9618e5b7917873e8ad7f4e9dc27eb54afa74eb6d6e659dcfab7007ae93163937412f9eb1b997a327d4378dcd868810c08880d4fa4542dfade WHIRLPOOL ec7281a6e01523b296dcfce595189cb96ad693c9b36ab60cbc6b61672333f5c8d7d9def10cc3c5bba876fddf0eefea3e9c22c1b98ee577d1b6d6aab6d1267915
+DIST mercury-srcdist-13.05.2.tar.gz 53847394 SHA256 8491cf419b996a315bf8664154dd91aed940274ded98e3aded733dbe1939f95f SHA512 2298804d3a04bca6be4bd3046643c7c0d0b22c447423017869cd9bf3a4fb6ec9fd29b5d8e1a386d5d52d07be5cad73608f1fcacf46732a7add93a01dcd199c08 WHIRLPOOL 2a81bebfd4b97b9bb1b0e174025e6050149c8e5f812cd97cbdc41818faa18c15f9494925f1f320682087cc45264bc00db07bef6862afef12317f77cc169a7f86
 DIST mercury-srcdist-13.05.tar.gz 54533409 SHA256 71f1f97484eaecf2c2f91f6731e23afc5cee966e149b61a7525b2bd9a2712d55 SHA512 d76fd3a0c487b2c65168b19ec6a5ea6b792c96692e029afe0589f93132422fc39e0aec856ae02e676cc30dc83780f9c4d4e0ea5f71681442279b900146b58c47 WHIRLPOOL b2cc0f1b074d980701c6d364f30f8bb2dd2556cbc23dca5a982b7c16b71c6834d7c81ea76bfcea25e369f32d606698b77eea168e3b25d4850f924dfa4f6929f4
 DIST mercury-tests-11.01.tar.gz 1351134 SHA256 862b70a589eb2d36c9fd82dbd2e0490dc4556f6edff604a54dfd6fc0ad6cccad SHA512 7cd0c2a5f3ef2b05ea32ea8867f788c583a9da96b6e3b4ed9c2ec5705fc7384c0811da782ed50b6d7f60963680036e116684b5bcc3f5f72cf6f0b319480ad997 WHIRLPOOL 298a898b970da20f64530cf736b5f901cc61ef028117f2434135b9efc77223e120a71e97373d494cdb89b422ef9bbf02ef51db4be3c383ffd6facaabb2018c6a
 DIST mercury-tests-11.07.1.tar.gz 1648437 SHA256 01558a6ddd28d2f832d88da8bbf38fec542d091fc53b5adf92fac5e2564c2057 SHA512 1b8f3749091e6a3cd8d3f07ca7ff87c20d9c90761c6dbf35253f68f4cb4ccb42310d66ebc98742508a4e1f6fb4d6497e7e34f10b2601ffec73694702f1b363b5 WHIRLPOOL 66cd530de280d34a037cc191818abb6f11bf4ea8f6f3143629883ff2d885350bdd8841215b6076d5b6ea2102d6ef913a9324d997fd287af12eed0cbe708692b2
diff --git a/dev-lang/mercury/mercury-13.05.2.ebuild b/dev-lang/mercury/mercury-13.05.2.ebuild
new file mode 100644
index 000000000000..0d9c51c59bed
--- /dev/null
+++ b/dev-lang/mercury/mercury-13.05.2.ebuild
@@ -0,0 +1,197 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/mercury-13.05.2.ebuild,v 1.1 2014/02/18 10:34:16 keri Exp $
+
+EAPI=2
+
+inherit autotools elisp-common eutils flag-o-matic java-pkg-opt-2 multilib
+
+PATCHSET_VER="0"
+MY_P=${PN}-srcdist-${PV}
+
+DESCRIPTION="Mercury is a modern general-purpose logic/functional programming language"
+HOMEPAGE="http://www.mercurylang.org/index.html"
+SRC_URI="http://dl.mercurylang.org/release/${MY_P}.tar.gz
+	mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="debug emacs erlang examples java minimal readline threads"
+
+DEPEND="!dev-libs/mpatrol
+	!dev-util/mono-debugger
+	readline? ( sys-libs/readline )
+	erlang? ( dev-lang/erlang )
+	java? ( >=virtual/jdk-1.5 )"
+
+RDEPEND="${DEPEND}
+	emacs? ( virtual/emacs )"
+
+S="${WORKDIR}"/${MY_P}
+
+SITEFILE=50${PN}-gentoo.el
+
+src_prepare() {
+	cd "${WORKDIR}"
+	EPATCH_FORCE=yes
+	EPATCH_SUFFIX=patch
+	epatch "${WORKDIR}"/${PV}
+
+	sed -i -e "s/@libdir@/$(get_libdir)/" \
+		"${S}"/scripts/Mmake.vars.in \
+		|| die "sed libdir failed"
+
+	cd "${S}"
+	eautoconf
+}
+
+src_configure() {
+	strip-flags
+
+	local myconf
+	myconf="--libdir=/usr/$(get_libdir) \
+		--disable-deep-profiler \
+		--disable-dotnet-grades \
+		--without-hwloc \
+		$(use_enable erlang erlang-grade) \
+		$(use_enable java java-grade) \
+		$(use_enable debug debug-grades) \
+		$(use_enable threads par-grades) \
+		$(use_enable !minimal most-grades) \
+		$(use_with readline)"
+
+	econf ${myconf}
+}
+
+src_compile() {
+	# Build Mercury using base llds grade
+	emake \
+		PARALLEL=${MAKEOPTS} \
+		MMAKEFLAGS="EXTRA_MLFLAGS=--no-strip \
+			    EXTRA_LDFLAGS='${LDFLAGS}' \
+			    EXTRA_LD_LIBFLAGS='${LDFLAGS}'" \
+		|| die "emake failed"
+
+	# We can now patch .m Mercury compiler files since we
+	# have just built mercury_compiler.
+	EPATCH_FORCE=yes
+	EPATCH_SUFFIX=patch
+	epatch "${WORKDIR}"/${PV}-mmc
+
+	sed -i -e "s/@libdir@/$(get_libdir)/" \
+		"${S}"/compiler/file_util.m \
+		"${S}"/compiler/make.program_target.m \
+		|| die "sed libdir failed"
+
+	# Rebuild Mercury compiler using the just built mercury_compiler
+	emake \
+		PARALLEL=${MAKEOPTS} \
+		MMAKEFLAGS="EXTRA_MLFLAGS=--no-strip \
+			    EXTRA_LDFLAGS='${LDFLAGS}' \
+			    EXTRA_LD_LIBFLAGS='${LDFLAGS}'" \
+		MERCURY_COMPILER="${S}"/compiler/mercury_compile \
+		compiler || die "emake compiler failed"
+
+	# The default Mercury grade may not be the same as the grade used to
+	# compile the llds base grade. Since src_test() is run before
+	# src_install() we compile the default grade now
+	emake \
+		PARALLEL=${MAKEOPTS} \
+		MMAKEFLAGS="EXTRA_MLFLAGS=--no-strip \
+			    EXTRA_LDFLAGS='${LDFLAGS}' \
+			    EXTRA_LD_LIBFLAGS='${LDFLAGS}'" \
+		MERCURY_COMPILER="${S}"/compiler/mercury_compile \
+		default_grade || die "emake default_grade failed"
+}
+
+src_test() {
+	TEST_GRADE=`scripts/ml --print-grade`
+	if [ -d "${S}"/install_grade_dir.${TEST_GRADE} ] ; then
+		TWS="${S}"/install_grade_dir.${TEST_GRADE}
+		cp runtime/mer_rt.init "${TWS}"/runtime/
+		cp mdbcomp/mer_mdbcomp.init "${TWS}"/mdbcomp/
+		cp browser/mer_browser.init "${TWS}"/browser/
+	else
+		TWS="${S}"
+	fi
+
+	cd "${S}"/tests
+	sed -e "s:@WORKSPACE@:${TWS}:" < WS_FLAGS.ws > WS_FLAGS \
+		|| die "sed WORKSPACE failed"
+
+	# Mercury tests must be run in C locale since Mercury output is
+	# compared to hard-coded warnings/errors
+	LC_ALL="C" \
+	PATH="${TWS}"/scripts:"${TWS}"/util:"${S}"/slice:"${PATH}" \
+	TERM="" \
+	WORKSPACE="${TWS}" \
+	WORKSPACE_FLAGS=yes \
+	MERCURY_COMPILER="${TWS}"/compiler/mercury_compile \
+	MMAKE_DIR="${TWS}"/scripts \
+	MERCURY_SUPPRESS_STACK_TRACE=yes \
+	GRADE=${TEST_GRADE} \
+	MERCURY_ALL_LOCAL_C_INCL_DIRS=" -I${TWS}/boehm_gc/include \
+					-I${TWS}/runtime \
+					-I${TWS}/library" \
+		mmake || die "mmake test failed"
+}
+
+src_install() {
+	emake \
+		PARALLEL=${MAKEOPTS} \
+		MMAKEFLAGS="EXTRA_LDFLAGS='${LDFLAGS}' \
+			    EXTRA_LD_LIBFLAGS='${LDFLAGS}'" \
+		MERCURY_COMPILER="${S}"/compiler/mercury_compile \
+		INSTALL_PREFIX="${D}"/usr \
+		INSTALL_MAN_DIR="${D}"/usr/share/man \
+		INSTALL_INFO_DIR="${D}"/usr/share/info \
+		INSTALL_HTML_DIR="${D}"/usr/share/doc/${PF}/html \
+		INSTALL_ELISP_DIR="${D}/${SITELISP}"/${PN} \
+		install || die "emake install failed"
+
+	if use emacs; then
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}" \
+			|| die "elisp-site-file-install failed"
+	fi
+
+	dodoc \
+		BUGS HISTORY LIMITATIONS NEWS README README.Linux \
+		README.Linux-Alpha README.Linux-m68k README.Linux-PPC \
+		RELEASE_NOTES TODO VERSION WORK_IN_PROGRESS || die
+
+	if use erlang; then
+		dodoc README.Erlang || die
+	fi
+
+	if use java; then
+		dodoc README.Java || die
+	fi
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/samples
+		doins samples/{*.m,README,Mmakefile} || die
+		doins -r samples/c_interface \
+			samples/diff \
+			samples/muz \
+			samples/rot13 \
+			samples/solutions \
+			samples/solver_types || die
+
+		if use java; then
+			doins -r samples/java_interface || die
+		fi
+
+		rm -rf $(find "${D}"/usr/share/doc/${PF}/samples \
+				-name CVS -o -name .cvsignore)
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-libs/cdk/cdk-5.0.20131107.ebuild b/dev-libs/cdk/cdk-5.0.20131107.ebuild
index 157857b20cc0..0dc59196ef5b 100644
--- a/dev-libs/cdk/cdk-5.0.20131107.ebuild
+++ b/dev-libs/cdk/cdk-5.0.20131107.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cdk/cdk-5.0.20131107.ebuild,v 1.1 2013/12/02 10:10:45 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cdk/cdk-5.0.20131107.ebuild,v 1.2 2014/02/18 16:01:22 jer Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ SRC_URI="ftp://invisible-island.net/cdk/${MY_P}.tgz"
 
 LICENSE="BSD"
 SLOT="0/5" # subslot = soname version
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha ~amd64 hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="examples static-libs unicode"
 
 DEPEND=">=sys-libs/ncurses-5.2[unicode?]"
diff --git a/dev-libs/check/check-0.9.11.ebuild b/dev-libs/check/check-0.9.11.ebuild
index 18cfd457ffb8..47416010decb 100644
--- a/dev-libs/check/check-0.9.11.ebuild
+++ b/dev-libs/check/check-0.9.11.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/check/check-0.9.11.ebuild,v 1.3 2014/01/20 07:07:13 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/check/check-0.9.11.ebuild,v 1.4 2014/02/18 10:34:45 jer Exp $
 
 EAPI=4
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs subunit"
 
 DEPEND="subunit? ( dev-python/subunit )"
diff --git a/dev-libs/libebml/libebml-1.3.0.ebuild b/dev-libs/libebml/libebml-1.3.0.ebuild
index f94436324baf..33a4985101e0 100644
--- a/dev-libs/libebml/libebml-1.3.0.ebuild
+++ b/dev-libs/libebml/libebml-1.3.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libebml/libebml-1.3.0.ebuild,v 1.1 2013/03/21 09:10:12 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libebml/libebml-1.3.0.ebuild,v 1.2 2014/02/18 10:37:24 jer Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/Matroska-Org/${PN}/archive/release-${PV}.tar.gz -> $
 
 LICENSE="LGPL-2.1"
 SLOT="0/4" # subslot = soname major version
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="debug static-libs"
 
 S=${WORKDIR}/${PN}-release-${PV}/make/linux
diff --git a/dev-perl/Config-Tiny/Config-Tiny-2.140.0-r1.ebuild b/dev-perl/Config-Tiny/Config-Tiny-2.140.0-r1.ebuild
deleted file mode 100644
index 41effb360d07..000000000000
--- a/dev-perl/Config-Tiny/Config-Tiny-2.140.0-r1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Config-Tiny/Config-Tiny-2.140.0-r1.ebuild,v 1.1 2013/09/10 15:03:12 idella4 Exp $
-
-EAPI=5
-
-MODULE_AUTHOR=ADAMK
-MODULE_VERSION=2.14
-inherit perl-module
-
-DESCRIPTION="Read/Write .ini style files with as little code as possible"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
-IUSE=""
-
-SRC_TEST="do"
diff --git a/dev-perl/Config-Tiny/Config-Tiny-2.140.0.ebuild b/dev-perl/Config-Tiny/Config-Tiny-2.140.0.ebuild
deleted file mode 100644
index e376f7525fdc..000000000000
--- a/dev-perl/Config-Tiny/Config-Tiny-2.140.0.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Config-Tiny/Config-Tiny-2.140.0.ebuild,v 1.8 2012/03/18 18:18:46 armin76 Exp $
-
-EAPI=3
-
-MODULE_AUTHOR=ADAMK
-MODULE_VERSION=2.14
-inherit perl-module
-
-DESCRIPTION="Read/Write .ini style files with as little code as possible"
-
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
-IUSE=""
-
-SRC_TEST="do"
diff --git a/dev-perl/Config-Tiny/Config-Tiny-2.160.0.ebuild b/dev-perl/Config-Tiny/Config-Tiny-2.160.0.ebuild
index 9160494d2fb9..534f9743e8d2 100644
--- a/dev-perl/Config-Tiny/Config-Tiny-2.160.0.ebuild
+++ b/dev-perl/Config-Tiny/Config-Tiny-2.160.0.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-perl/Config-Tiny/Config-Tiny-2.160.0.ebuild,v 1.3 2014/02/11 18:49:33 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Config-Tiny/Config-Tiny-2.160.0.ebuild,v 1.9 2014/02/18 19:51:26 zlogene Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ inherit perl-module
 DESCRIPTION="Read/Write .ini style files with as little code as possible"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 hppa ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
 IUSE=""
 
 SRC_TEST="do"
diff --git a/dev-perl/Config-Tiny/Manifest b/dev-perl/Config-Tiny/Manifest
index 78dce4038437..29e5123392a1 100644
--- a/dev-perl/Config-Tiny/Manifest
+++ b/dev-perl/Config-Tiny/Manifest
@@ -1,2 +1 @@
-DIST Config-Tiny-2.14.tar.gz 16963 SHA256 787b0fa658d8acef092de02059a99da44c75229834a275f07d8808a1e796e1a8 SHA512 8be1a3477b84f2772e501f974827e4fdeacade3fc649466fd18216f32f685ff104cdeb3d26960c5bb47b2452ded054dfea23ef96e331fb32370c84ee426aa49b WHIRLPOOL 1775735a2ee8f4e4894affbeacb4a56f418e68598cf0e27ea8f3a62b76d19107ffb661d63ee956ce13e8619fea71aa0d6965b471a6c5248554f7ec24a5d0c04d
 DIST Config-Tiny-2.16.tgz 23972 SHA256 22ba95108d362b1029c324f2fd152c1958bee66a2fae7ea4309c0c63c862ae4b SHA512 8faea2b1ecc54adf05778b76fdbd8c5df7a86b32da9ecee43f9a7c6659d72b4902940e003430e7b86cffffff8e93f3b39d08bad263c41e4329a9a39aea0ebb00 WHIRLPOOL 1492f67572ed4bb583c9336339526fe67e6efd3496069c2419af954887ef6ba3d442d2a2681e211729ecab16dc6fa2511f5abba86ac1eb387b07267c91f29004
diff --git a/dev-perl/Net-SSLeay/Net-SSLeay-1.550.ebuild b/dev-perl/Net-SSLeay/Net-SSLeay-1.550.ebuild
index 791dd9f983e4..fff18c267f71 100644
--- a/dev-perl/Net-SSLeay/Net-SSLeay-1.550.ebuild
+++ b/dev-perl/Net-SSLeay/Net-SSLeay-1.550.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-perl/Net-SSLeay/Net-SSLeay-1.550.ebuild,v 1.2 2014/01/20 20:41:04 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Net-SSLeay/Net-SSLeay-1.550.ebuild,v 1.3 2014/02/18 15:54:30 jer Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ DESCRIPTION="Net::SSLeay module for perl"
 
 LICENSE="SSLeay"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="dev-libs/openssl"
diff --git a/dev-perl/Package-Stash-XS/Package-Stash-XS-0.280.0.ebuild b/dev-perl/Package-Stash-XS/Package-Stash-XS-0.280.0.ebuild
index fa8038f56fd2..5d0ff3451f82 100644
--- a/dev-perl/Package-Stash-XS/Package-Stash-XS-0.280.0.ebuild
+++ b/dev-perl/Package-Stash-XS/Package-Stash-XS-0.280.0.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-perl/Package-Stash-XS/Package-Stash-XS-0.280.0.ebuild,v 1.2 2014/02/01 23:57:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Package-Stash-XS/Package-Stash-XS-0.280.0.ebuild,v 1.3 2014/02/18 15:56:05 jer Exp $
 
 EAPI=5
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Faster and more correct implementation of the Package::Stash API"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-perl/Package-Stash/Package-Stash-0.360.0.ebuild b/dev-perl/Package-Stash/Package-Stash-0.360.0.ebuild
index 43e9b68554a3..a3124e4e7812 100644
--- a/dev-perl/Package-Stash/Package-Stash-0.360.0.ebuild
+++ b/dev-perl/Package-Stash/Package-Stash-0.360.0.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-perl/Package-Stash/Package-Stash-0.360.0.ebuild,v 1.2 2014/02/01 23:58:29 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Package-Stash/Package-Stash-0.360.0.ebuild,v 1.3 2014/02/18 15:55:42 jer Exp $
 
 EAPI=5
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Routines for manipulating stashes"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Pod-Coverage/Pod-Coverage-0.230.0.ebuild b/dev-perl/Pod-Coverage/Pod-Coverage-0.230.0.ebuild
index 46d10e686a1d..9a375c47af0d 100644
--- a/dev-perl/Pod-Coverage/Pod-Coverage-0.230.0.ebuild
+++ b/dev-perl/Pod-Coverage/Pod-Coverage-0.230.0.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-perl/Pod-Coverage/Pod-Coverage-0.230.0.ebuild,v 1.2 2014/01/20 20:40:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Pod-Coverage/Pod-Coverage-0.230.0.ebuild,v 1.3 2014/02/18 15:56:58 jer Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Checks if the documentation of a module is comprehensive"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Sub-Exporter/Sub-Exporter-0.986.0.ebuild b/dev-perl/Sub-Exporter/Sub-Exporter-0.986.0.ebuild
index df01754361a0..06dbbb8318d8 100644
--- a/dev-perl/Sub-Exporter/Sub-Exporter-0.986.0.ebuild
+++ b/dev-perl/Sub-Exporter/Sub-Exporter-0.986.0.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-perl/Sub-Exporter/Sub-Exporter-0.986.0.ebuild,v 1.2 2014/02/01 23:55:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Sub-Exporter/Sub-Exporter-0.986.0.ebuild,v 1.3 2014/02/18 15:57:30 jer Exp $
 
 EAPI=5
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="A sophisticated exporter for custom-built routines"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-perl/Sys-SigAction/Sys-SigAction-0.210.0.ebuild b/dev-perl/Sys-SigAction/Sys-SigAction-0.210.0.ebuild
new file mode 100644
index 000000000000..b17875d33dd8
--- /dev/null
+++ b/dev-perl/Sys-SigAction/Sys-SigAction-0.210.0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Sys-SigAction/Sys-SigAction-0.210.0.ebuild,v 1.1 2014/02/18 19:57:25 zlogene Exp $
+
+EAPI=5
+
+MODULE_AUTHOR=LBAXTER
+MODULE_VERSION=0.20
+inherit perl-module
+
+DESCRIPTION="Perl extension for Consistent Signal Handling"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE=""
+
+SRC_TEST=do
diff --git a/dev-perl/Test-Exception/Test-Exception-0.320.0.ebuild b/dev-perl/Test-Exception/Test-Exception-0.320.0.ebuild
index 01ca0743a929..417f3602bca7 100644
--- a/dev-perl/Test-Exception/Test-Exception-0.320.0.ebuild
+++ b/dev-perl/Test-Exception/Test-Exception-0.320.0.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-perl/Test-Exception/Test-Exception-0.320.0.ebuild,v 1.2 2014/02/01 23:35:48 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Test-Exception/Test-Exception-0.320.0.ebuild,v 1.3 2014/02/18 15:58:16 jer Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="test functions for exception based code"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=virtual/perl-Test-Simple-0.64
diff --git a/dev-perl/Test-Pod/Test-Pod-1.480.0.ebuild b/dev-perl/Test-Pod/Test-Pod-1.480.0.ebuild
index 13094fdbceba..beeb5bff71f8 100644
--- a/dev-perl/Test-Pod/Test-Pod-1.480.0.ebuild
+++ b/dev-perl/Test-Pod/Test-Pod-1.480.0.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-perl/Test-Pod/Test-Pod-1.480.0.ebuild,v 1.2 2014/01/20 20:37:19 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Test-Pod/Test-Pod-1.480.0.ebuild,v 1.3 2014/02/18 15:59:00 jer Exp $
 
 EAPI=5
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="check for POD errors in files"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-perl/Try-Tiny/Try-Tiny-0.180.0.ebuild b/dev-perl/Try-Tiny/Try-Tiny-0.180.0.ebuild
index f09d22ee12a0..b3055eaae376 100644
--- a/dev-perl/Try-Tiny/Try-Tiny-0.180.0.ebuild
+++ b/dev-perl/Try-Tiny/Try-Tiny-0.180.0.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-perl/Try-Tiny/Try-Tiny-0.180.0.ebuild,v 1.4 2014/02/01 23:36:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Try-Tiny/Try-Tiny-0.180.0.ebuild,v 1.5 2014/02/18 16:00:01 jer Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ DESCRIPTION="Minimal try/catch with proper localization of $@"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE="test"
 
 DEPEND="test? ( dev-perl/Sub-Name )"
diff --git a/dev-python/kazoo/Manifest b/dev-python/kazoo/Manifest
new file mode 100644
index 000000000000..06719083ecce
--- /dev/null
+++ b/dev-python/kazoo/Manifest
@@ -0,0 +1 @@
+DIST kazoo-1.3.1.zip 138816 SHA256 51c6dec001b0ffabeab2f1516c92999e1554d0072e517a5a39d4428decf4d7c8 SHA512 fa93210a361086ca40c2b2eebeb0062e055420cf4de4fecb94c96b9cddc5b0404135b0344cce37d7e91462c3022f348a5b007a6ec20c4bb29e1817335f1fbcc3 WHIRLPOOL 8f2ce9b9db8450bb011d59b956997406a672a38331a86b2a79b5270da1a733d086b1f88a10acf75803f64f1781bcd8f2645ab34b4daf3d397a4b8ecf1ffcc740
diff --git a/dev-python/kazoo/kazoo-1.3.1.ebuild b/dev-python/kazoo/kazoo-1.3.1.ebuild
new file mode 100644
index 000000000000..0ac8721c2760
--- /dev/null
+++ b/dev-python/kazoo/kazoo-1.3.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/kazoo/kazoo-1.3.1.ebuild,v 1.1 2014/02/19 10:03:51 radhermit Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
+
+inherit distutils-r1
+
+DESCRIPTION="A high-level Python library that makes it easier to use Apache Zookeeper"
+HOMEPAGE="https://kazoo.readthedocs.org/ https://github.com/python-zk/kazoo/ https://pypi.python.org/pypi/kazoo/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc gevent test"
+
+RDEPEND="
+	>=net-zope/zope-interface-3.8.0[${PYTHON_USEDEP}]
+	gevent? ( dev-python/gevent[$(python_gen_usedep 'python2*')] )
+"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/repoze-sphinx-autointerface[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	)
+	test? ( dev-python/mock[${PYTHON_USEDEP}] )
+"
+
+# not all test deps are in the tree
+RESTRICT="test"
+
+python_compile_all() {
+	use doc && { sphinx-build -b html docs docs/_build/html || die; }
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	local DOCS=( {CHANGES,CONTRIBUTING,README}.rst )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/kazoo/metadata.xml b/dev-python/kazoo/metadata.xml
new file mode 100644
index 000000000000..5567affd2234
--- /dev/null
+++ b/dev-python/kazoo/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>python</herd>
+	<maintainer>
+		<email>radhermit@gentoo.org</email>
+		<name>Tim Harder</name>
+	</maintainer>
+	<use>
+		<flag name="gevent">Enable support for the gevent based handler</flag>
+	</use>
+	<upstream>
+		<remote-id type="pypi">kazoo</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/lxml/lxml-3.3.0.ebuild b/dev-python/lxml/lxml-3.3.0.ebuild
index e7909c901aef..953cdcc9657c 100644
--- a/dev-python/lxml/lxml-3.3.0.ebuild
+++ b/dev-python/lxml/lxml-3.3.0.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-python/lxml/lxml-3.3.0.ebuild,v 1.1 2014/01/26 07:35:13 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/lxml/lxml-3.3.0.ebuild,v 1.2 2014/02/18 10:38:44 jer Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD ElementTree GPL-2 PSF-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="beautifulsoup3 doc examples +threads"
 
 # Note: lib{xml2,xslt} are used as C libraries, not Python modules.
diff --git a/dev-python/repoze-sphinx-autointerface/Manifest b/dev-python/repoze-sphinx-autointerface/Manifest
new file mode 100644
index 000000000000..3d4129088b3a
--- /dev/null
+++ b/dev-python/repoze-sphinx-autointerface/Manifest
@@ -0,0 +1 @@
+DIST repoze.sphinx.autointerface-0.7.1.tar.gz 7892 SHA256 97ef5fac0ab0a96f1578017f04aea448651fa9f063fc43393a8253bff8d8d504 SHA512 e2b2a41647a6e349bd33df8fcc08d2560f2a58b94a054bfcc9176cdcd97513ce78cc31945c7c12fd14f7906d21b23ba9c3fac0a06ed0c92ad7b89f73b5bf7ff4 WHIRLPOOL 2589c2ec262a9784d7a686550a748795a3892996d8c1efa05c300001471a273f801c085db394b80465ad1f0b2d7afbb680095d201cdbe4102447e8e4b62ffd05
diff --git a/dev-python/repoze-sphinx-autointerface/metadata.xml b/dev-python/repoze-sphinx-autointerface/metadata.xml
new file mode 100644
index 000000000000..266dfde2c0ad
--- /dev/null
+++ b/dev-python/repoze-sphinx-autointerface/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>python</herd>
+	<upstream>
+		<remote-id type="pypi">repoze.sphinx.autointerface</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/repoze-sphinx-autointerface/repoze-sphinx-autointerface-0.7.1.ebuild b/dev-python/repoze-sphinx-autointerface/repoze-sphinx-autointerface-0.7.1.ebuild
new file mode 100644
index 000000000000..6bdb04d14f23
--- /dev/null
+++ b/dev-python/repoze-sphinx-autointerface/repoze-sphinx-autointerface-0.7.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/repoze-sphinx-autointerface/repoze-sphinx-autointerface-0.7.1.ebuild,v 1.1 2014/02/19 09:47:36 radhermit Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
+
+inherit distutils-r1
+
+MY_PN=${PN//-/.}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Sphinx extension: auto-generates API docs from Zope interfaces"
+HOMEPAGE="https://pypi.python.org/pypi/repoze.sphinx.autointerface/"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="repoze"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/sphinx[${PYTHON_USEDEP}]
+	net-zope/zope-interface[${PYTHON_USEDEP}]
+"
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+S=${WORKDIR}/${MY_P}
diff --git a/dev-ruby/actionmailer/Manifest b/dev-ruby/actionmailer/Manifest
index c59664de9a2a..e36ef7e2a9f5 100644
--- a/dev-ruby/actionmailer/Manifest
+++ b/dev-ruby/actionmailer/Manifest
@@ -1,2 +1,4 @@
 DIST rails-3.2.16.tgz 3566631 SHA256 8fe61b98496e40d8aaef5f8db217f2aad56c9add1bf8417c37a0cbd24f74a57e SHA512 304ef964c33eccfdd4dc1a1c47d43b05e7498d869c64a2ba7a62e8356a07d03cd3f48e1edb9b80d2de1cafc8d91f6ac491df9b0abf3c30d6d22f34f39571965e WHIRLPOOL 5a6ba360c741a7aa3979722ae20790df65e05347a4bad77eea805a9601de2e4cc50a02b8f75d7b7e827da8bef62e8e4e72bb4d4c1de9e783f8f5b95d156bceac
+DIST rails-3.2.17.tgz 3566537 SHA256 f94972ed71c005ae1f7520d8840852872fbdf6c834bb2eaf1516fe63e406d609 SHA512 4ad32d71108d444bd791ffb2fded25deed69a304a4d6497fb12a586e07348bf4cd1a453614eb932a907063ad6166b89f4778742cb5c2c420f17a116e11b964f6 WHIRLPOOL 0b0911120202e3152a74d31f3b7f8a24261f8e163577ad88c12fd85be088871a0f8ed46b305325250bb830f786231ff349e847b2f642cba02905a95a9a022d68
 DIST rails-4.0.2.tgz 3720518 SHA256 cd973b85cfff735da80d8ed4e11421e2242be735d96cbe4d83ac0c4b6ca7c8d1 SHA512 67d7580c0081deeec4271f96caca6d6db8f65864c876a237e7e3f0e8c6e495d299f103dcbe7627385fa4fd3699dac5015e20be90187ef3b2af49352ad9c8d6af WHIRLPOOL 5b496df36ca4de6a4b55951fab2403bd8b31b3505d17d450bf2edf084429a7689c4fdeb8d19d0be40b2d4d0ada8cefd6c3fc104c2428769d2ca8e434d97c6465
+DIST rails-4.0.3.tgz 3721788 SHA256 deed80da9b800789a718f95dde5a0a13f18fe6d0169987165a54e7b6d8edd4f8 SHA512 4ac37e5f2c3992aa33020cb7287c9415a014c475dc176b2b51e6112da8bef3b8626216134c5495a8643a9452c7bd78af9a4e2bc77e9c098f8908335d4a27a918 WHIRLPOOL 52bdd5ad2cfe74976b2565963cddc6cefd51ec95fa4f6ca6cc81fe7444271e734caa0800b3cc7a425be0f7dfa47298079b10cacc5909925072935661cfc78974
diff --git a/dev-ruby/actionmailer/actionmailer-3.2.17.ebuild b/dev-ruby/actionmailer/actionmailer-3.2.17.ebuild
new file mode 100644
index 000000000000..ea978a145468
--- /dev/null
+++ b/dev-ruby/actionmailer/actionmailer-3.2.17.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/dev-ruby/actionmailer/actionmailer-3.2.17.ebuild,v 1.1 2014/02/19 07:19:35 graaff Exp $
+
+EAPI=5
+USE_RUBY="ruby18 ruby19"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="actionmailer.gemspec"
+
+inherit ruby-fakegem versionator
+
+DESCRIPTION="Framework for designing email-service layers"
+HOMEPAGE="http://rubyforge.org/projects/actionmailer/"
+SRC_URI="http://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(get_version_component_range 1-2)"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "~dev-ruby/actionpack-${PV}
+	>=dev-ruby/mail-2.5.4:2.5"
+ruby_add_bdepend "test? (
+	dev-ruby/test-unit:2
+	dev-ruby/mocha:0.13
+)"
+
+all_ruby_prepare() {
+	# Set test environment to our hand.
+	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
+	sed -i -e '/\/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
+
+	# Make sure we use the test-unit gem since ruby18 does not provide
+	# all the test-unit features needed.
+	sed -i -e '1igem "test-unit"' test/abstract_unit.rb || die
+}
diff --git a/dev-ruby/actionmailer/actionmailer-4.0.3.ebuild b/dev-ruby/actionmailer/actionmailer-4.0.3.ebuild
new file mode 100644
index 000000000000..dff76f323f76
--- /dev/null
+++ b/dev-ruby/actionmailer/actionmailer-4.0.3.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/dev-ruby/actionmailer/actionmailer-4.0.3.ebuild,v 1.1 2014/02/19 08:05:06 graaff Exp $
+
+EAPI=5
+USE_RUBY="ruby19"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="actionmailer.gemspec"
+
+inherit ruby-fakegem versionator
+
+DESCRIPTION="Framework for designing email-service layers"
+HOMEPAGE="http://rubyforge.org/projects/actionmailer/"
+SRC_URI="http://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(get_version_component_range 1-2)"
+KEYWORDS="~amd64 ~arm"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "~dev-ruby/actionpack-${PV}
+	>=dev-ruby/mail-2.5.3:2.5"
+ruby_add_bdepend "test? (
+	dev-ruby/test-unit:2
+	dev-ruby/mocha:0.13
+)"
+
+all_ruby_prepare() {
+	# Set test environment to our hand.
+	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
+	sed -i -e '/\/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
+
+	# Make sure we use the test-unit gem since ruby18 does not provide
+	# all the test-unit features needed.
+	sed -i -e '1igem "test-unit"' test/abstract_unit.rb || die
+}
diff --git a/dev-ruby/actionpack/Manifest b/dev-ruby/actionpack/Manifest
index c59664de9a2a..e36ef7e2a9f5 100644
--- a/dev-ruby/actionpack/Manifest
+++ b/dev-ruby/actionpack/Manifest
@@ -1,2 +1,4 @@
 DIST rails-3.2.16.tgz 3566631 SHA256 8fe61b98496e40d8aaef5f8db217f2aad56c9add1bf8417c37a0cbd24f74a57e SHA512 304ef964c33eccfdd4dc1a1c47d43b05e7498d869c64a2ba7a62e8356a07d03cd3f48e1edb9b80d2de1cafc8d91f6ac491df9b0abf3c30d6d22f34f39571965e WHIRLPOOL 5a6ba360c741a7aa3979722ae20790df65e05347a4bad77eea805a9601de2e4cc50a02b8f75d7b7e827da8bef62e8e4e72bb4d4c1de9e783f8f5b95d156bceac
+DIST rails-3.2.17.tgz 3566537 SHA256 f94972ed71c005ae1f7520d8840852872fbdf6c834bb2eaf1516fe63e406d609 SHA512 4ad32d71108d444bd791ffb2fded25deed69a304a4d6497fb12a586e07348bf4cd1a453614eb932a907063ad6166b89f4778742cb5c2c420f17a116e11b964f6 WHIRLPOOL 0b0911120202e3152a74d31f3b7f8a24261f8e163577ad88c12fd85be088871a0f8ed46b305325250bb830f786231ff349e847b2f642cba02905a95a9a022d68
 DIST rails-4.0.2.tgz 3720518 SHA256 cd973b85cfff735da80d8ed4e11421e2242be735d96cbe4d83ac0c4b6ca7c8d1 SHA512 67d7580c0081deeec4271f96caca6d6db8f65864c876a237e7e3f0e8c6e495d299f103dcbe7627385fa4fd3699dac5015e20be90187ef3b2af49352ad9c8d6af WHIRLPOOL 5b496df36ca4de6a4b55951fab2403bd8b31b3505d17d450bf2edf084429a7689c4fdeb8d19d0be40b2d4d0ada8cefd6c3fc104c2428769d2ca8e434d97c6465
+DIST rails-4.0.3.tgz 3721788 SHA256 deed80da9b800789a718f95dde5a0a13f18fe6d0169987165a54e7b6d8edd4f8 SHA512 4ac37e5f2c3992aa33020cb7287c9415a014c475dc176b2b51e6112da8bef3b8626216134c5495a8643a9452c7bd78af9a4e2bc77e9c098f8908335d4a27a918 WHIRLPOOL 52bdd5ad2cfe74976b2565963cddc6cefd51ec95fa4f6ca6cc81fe7444271e734caa0800b3cc7a425be0f7dfa47298079b10cacc5909925072935661cfc78974
diff --git a/dev-ruby/actionpack/actionpack-3.2.17.ebuild b/dev-ruby/actionpack/actionpack-3.2.17.ebuild
new file mode 100644
index 000000000000..fffb1be15a61
--- /dev/null
+++ b/dev-ruby/actionpack/actionpack-3.2.17.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/actionpack/actionpack-3.2.17.ebuild,v 1.1 2014/02/19 07:19:19 graaff Exp $
+
+EAPI=5
+
+USE_RUBY="ruby18 ruby19"
+
+# The default test task tries to test activerecord with SQLite as well.
+RUBY_FAKEGEM_TASK_TEST="test_action_pack"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="actionpack.gemspec"
+
+inherit ruby-fakegem versionator
+
+DESCRIPTION="Eases web-request routing, handling, and response."
+HOMEPAGE="http://rubyforge.org/projects/actionpack/"
+SRC_URI="http://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(get_version_component_range 1-2)"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	~dev-ruby/activemodel-${PV}
+	~dev-ruby/activesupport-${PV}
+	>=dev-ruby/rack-cache-1.2
+	>=dev-ruby/builder-3.0.0:3
+	>=dev-ruby/rack-1.4.5:1.4
+	>=dev-ruby/rack-test-0.6.1:0.6
+	>=dev-ruby/journey-1.0.4:1.0
+	>=dev-ruby/sprockets-2.2.1:2.2
+	>=dev-ruby/erubis-2.7.0"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/mocha:0.13
+		dev-ruby/bundler
+		~dev-ruby/activerecord-${PV}
+		~dev-ruby/actionmailer-${PV}
+		>=dev-ruby/tzinfo-0.3.29:0
+		>=dev-ruby/uglifier-1.0.3
+	)"
+
+all_ruby_prepare() {
+	# Remove items from the common Gemfile that we don't need for this
+	# test run. This also requires handling some gemspecs.
+	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|jquery-rails\|'mysql'\|journey\|ruby-prof\|benchmark-ips\)/d" ../Gemfile || die
+
+	sed -i -e '/rack-ssl/d' -e 's/~> 3.4/>= 3.4/' ../railties/railties.gemspec || die
+	sed -i -e '/mail/d' ../actionmailer/actionmailer.gemspec || die
+
+	sed -i -e '/bcrypt/ s/3.0.0/3.0/' ../Gemfile || die
+
+	# Avoid fragile tests depending on hash ordering
+	sed -i -e '/cookie_3=chocolate/ s:^:#:' test/controller/integration_test.rb || die
+	sed -i -e '/test_to_s/,/end/ s:^:#:' test/template/html-scanner/tag_node_test.rb || die
+	sed -i -e '/"name":"david"/ s:^:#:' test/controller/mime_responds_test.rb || die
+	sed -i -e '/test_option_html_attributes_with_multiple_element_hash/, / end/ s:^:#:' test/template/form_options_helper_test.rb || die
+	sed -i -e '/test_option_html_attributes_with_multiple_hashes/, / end/ s:^:#:' test/template/form_options_helper_test.rb || die
+
+	# Avoid fragile test that gets more output than it expects.
+	sed -i -e '/test_locals_option_to_assert_template_is_not_supported/,/end/ s:^:#:'  test/controller/render_test.rb || die
+
+	# Avoid test broken by security updates in i18n.
+	sed -i -e '/test_number_to_i18n_currency/,/end/ s:^:#:' test/template/number_helper_i18n_test.rb || die
+}
diff --git a/dev-ruby/actionpack/actionpack-4.0.3.ebuild b/dev-ruby/actionpack/actionpack-4.0.3.ebuild
new file mode 100644
index 000000000000..a71ac21b3020
--- /dev/null
+++ b/dev-ruby/actionpack/actionpack-4.0.3.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/actionpack/actionpack-4.0.3.ebuild,v 1.1 2014/02/19 08:04:36 graaff Exp $
+
+EAPI=5
+
+USE_RUBY="ruby19"
+
+# The default test task tries to test activerecord with SQLite as well.
+RUBY_FAKEGEM_TASK_TEST="test_action_pack"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="actionpack.gemspec"
+
+inherit ruby-fakegem versionator
+
+DESCRIPTION="Eases web-request routing, handling, and response."
+HOMEPAGE="http://rubyforge.org/projects/actionpack/"
+SRC_URI="http://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(get_version_component_range 1-2)"
+KEYWORDS="~amd64 ~arm"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	~dev-ruby/activesupport-${PV}
+	>=dev-ruby/builder-3.1.0:3.1
+	>=dev-ruby/rack-1.5.2:1.5
+	>=dev-ruby/rack-test-0.6.2:0.6
+	>=dev-ruby/sprockets-2.2.1:2.2
+	>=dev-ruby/erubis-2.7.0"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/mocha:0.13
+		dev-ruby/bundler
+		~dev-ruby/activemodel-${PV}
+		~dev-ruby/activerecord-${PV}
+		~dev-ruby/actionmailer-${PV}
+		dev-ruby/sprockets-rails:2.0
+		>=dev-ruby/tzinfo-0.3.29:0
+		>=dev-ruby/uglifier-1.0.3
+	)"
+
+all_ruby_prepare() {
+	# Remove items from the common Gemfile that we don't need for this
+	# test run. This also requires handling some gemspecs.
+	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|jquery-rails\|'mysql'\|journey\|ruby-prof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\)/d" ../Gemfile || die
+
+	sed -i -e '/rack-ssl/d' -e 's/~> 3.4/>= 3.4/' ../railties/railties.gemspec || die
+	sed -i -e '/mail/d' ../actionmailer/actionmailer.gemspec || die
+
+	sed -i -e '/bcrypt/ s/3.0.0/3.0/' ../Gemfile || die
+
+	# Add back json in the Gemfile because we dropped some dependencies
+	# earlier that implicitly required it.
+	sed -i -e '$agem "json"' ../Gemfile || die
+
+	# Avoid fragile tests depending on hash ordering
+	sed -i -e '/cookie_3=chocolate/ s:^:#:' test/controller/integration_test.rb || die
+	sed -i -e '/test_to_s/,/end/ s:^:#:' test/template/html-scanner/tag_node_test.rb || die
+	sed -i -e '/"name":"david"/ s:^:#:' test/controller/mime_responds_test.rb || die
+	sed -i -e '/test_option_html_attributes_with_multiple_element_hash/, / end/ s:^:#:' test/template/form_options_helper_test.rb || die
+	sed -i -e '/test_option_html_attributes_with_multiple_hashes/, / end/ s:^:#:' test/template/form_options_helper_test.rb || die
+
+	# Avoid fragile test that gets more output than it expects.
+	sed -i -e '/test_locals_option_to_assert_template_is_not_supported/,/end/ s:^:#:'  test/controller/render_test.rb || die
+}
diff --git a/dev-ruby/activemodel/Manifest b/dev-ruby/activemodel/Manifest
index c59664de9a2a..e36ef7e2a9f5 100644
--- a/dev-ruby/activemodel/Manifest
+++ b/dev-ruby/activemodel/Manifest
@@ -1,2 +1,4 @@
 DIST rails-3.2.16.tgz 3566631 SHA256 8fe61b98496e40d8aaef5f8db217f2aad56c9add1bf8417c37a0cbd24f74a57e SHA512 304ef964c33eccfdd4dc1a1c47d43b05e7498d869c64a2ba7a62e8356a07d03cd3f48e1edb9b80d2de1cafc8d91f6ac491df9b0abf3c30d6d22f34f39571965e WHIRLPOOL 5a6ba360c741a7aa3979722ae20790df65e05347a4bad77eea805a9601de2e4cc50a02b8f75d7b7e827da8bef62e8e4e72bb4d4c1de9e783f8f5b95d156bceac
+DIST rails-3.2.17.tgz 3566537 SHA256 f94972ed71c005ae1f7520d8840852872fbdf6c834bb2eaf1516fe63e406d609 SHA512 4ad32d71108d444bd791ffb2fded25deed69a304a4d6497fb12a586e07348bf4cd1a453614eb932a907063ad6166b89f4778742cb5c2c420f17a116e11b964f6 WHIRLPOOL 0b0911120202e3152a74d31f3b7f8a24261f8e163577ad88c12fd85be088871a0f8ed46b305325250bb830f786231ff349e847b2f642cba02905a95a9a022d68
 DIST rails-4.0.2.tgz 3720518 SHA256 cd973b85cfff735da80d8ed4e11421e2242be735d96cbe4d83ac0c4b6ca7c8d1 SHA512 67d7580c0081deeec4271f96caca6d6db8f65864c876a237e7e3f0e8c6e495d299f103dcbe7627385fa4fd3699dac5015e20be90187ef3b2af49352ad9c8d6af WHIRLPOOL 5b496df36ca4de6a4b55951fab2403bd8b31b3505d17d450bf2edf084429a7689c4fdeb8d19d0be40b2d4d0ada8cefd6c3fc104c2428769d2ca8e434d97c6465
+DIST rails-4.0.3.tgz 3721788 SHA256 deed80da9b800789a718f95dde5a0a13f18fe6d0169987165a54e7b6d8edd4f8 SHA512 4ac37e5f2c3992aa33020cb7287c9415a014c475dc176b2b51e6112da8bef3b8626216134c5495a8643a9452c7bd78af9a4e2bc77e9c098f8908335d4a27a918 WHIRLPOOL 52bdd5ad2cfe74976b2565963cddc6cefd51ec95fa4f6ca6cc81fe7444271e734caa0800b3cc7a425be0f7dfa47298079b10cacc5909925072935661cfc78974
diff --git a/dev-ruby/activemodel/activemodel-3.2.17.ebuild b/dev-ruby/activemodel/activemodel-3.2.17.ebuild
new file mode 100644
index 000000000000..30a573f5ff06
--- /dev/null
+++ b/dev-ruby/activemodel/activemodel-3.2.17.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activemodel/activemodel-3.2.17.ebuild,v 1.1 2014/02/19 07:18:33 graaff Exp $
+
+EAPI=5
+
+USE_RUBY="ruby18 ruby19"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_DOCDIR=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="activemodel.gemspec"
+
+inherit ruby-fakegem versionator
+
+DESCRIPTION="A toolkit for building modeling frameworks like Active Record and Active Resource."
+HOMEPAGE="http://github.com/rails/rails"
+SRC_URI="http://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(get_version_component_range 1-2)"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	~dev-ruby/activesupport-${PV}
+	>=dev-ruby/builder-3.0.0:3
+	>=dev-ruby/bcrypt-ruby-3.0.0"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/test-unit:2
+		>=dev-ruby/mocha-0.13.0:0.13
+	)"
+
+all_ruby_prepare() {
+	# Set test environment to our hand.
+	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
+	sed -i -e '/load_paths/d' test/cases/helper.rb || die "Unable to remove load paths"
+
+	# Make sure we use the test-unit gem since ruby18 does not provide
+	# all the test-unit features needed.
+	sed -i -e '1igem "test-unit"' test/cases/helper.rb || die
+
+	# Fix bcrypt dependency since bcrypt uses semantic versioning.
+	sed -i -e '/bcrypt-ruby/ s/3.0.0/3.0/' lib/active_model/secure_password.rb || die
+}
diff --git a/dev-ruby/activemodel/activemodel-4.0.3.ebuild b/dev-ruby/activemodel/activemodel-4.0.3.ebuild
new file mode 100644
index 000000000000..eea75d4d5f6b
--- /dev/null
+++ b/dev-ruby/activemodel/activemodel-4.0.3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activemodel/activemodel-4.0.3.ebuild,v 1.1 2014/02/19 08:04:13 graaff Exp $
+
+EAPI=5
+
+USE_RUBY="ruby19"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_DOCDIR=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="activemodel.gemspec"
+
+inherit ruby-fakegem versionator
+
+DESCRIPTION="A toolkit for building modeling frameworks like Active Record and Active Resource."
+HOMEPAGE="http://github.com/rails/rails"
+SRC_URI="http://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(get_version_component_range 1-2)"
+KEYWORDS="~amd64 ~arm"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	~dev-ruby/activesupport-${PV}
+	>=dev-ruby/builder-3.1.0:3.1
+	>=dev-ruby/bcrypt-ruby-3.0.0"
+
+ruby_add_bdepend "
+	test? (
+		>=dev-ruby/railties-4.0.0
+		dev-ruby/test-unit:2
+		>=dev-ruby/mocha-0.13.0:0.13
+	)"
+
+all_ruby_prepare() {
+	# Set test environment to our hand.
+	sed -i -e '/load_paths/d' test/cases/helper.rb || die "Unable to remove load paths"
+
+	# Fix bcrypt dependency since bcrypt uses semantic versioning.
+	sed -i -e '/bcrypt-ruby/ s/3.0.0/3.0/' lib/active_model/secure_password.rb || die
+}
diff --git a/dev-ruby/activerecord/Manifest b/dev-ruby/activerecord/Manifest
index c59664de9a2a..e36ef7e2a9f5 100644
--- a/dev-ruby/activerecord/Manifest
+++ b/dev-ruby/activerecord/Manifest
@@ -1,2 +1,4 @@
 DIST rails-3.2.16.tgz 3566631 SHA256 8fe61b98496e40d8aaef5f8db217f2aad56c9add1bf8417c37a0cbd24f74a57e SHA512 304ef964c33eccfdd4dc1a1c47d43b05e7498d869c64a2ba7a62e8356a07d03cd3f48e1edb9b80d2de1cafc8d91f6ac491df9b0abf3c30d6d22f34f39571965e WHIRLPOOL 5a6ba360c741a7aa3979722ae20790df65e05347a4bad77eea805a9601de2e4cc50a02b8f75d7b7e827da8bef62e8e4e72bb4d4c1de9e783f8f5b95d156bceac
+DIST rails-3.2.17.tgz 3566537 SHA256 f94972ed71c005ae1f7520d8840852872fbdf6c834bb2eaf1516fe63e406d609 SHA512 4ad32d71108d444bd791ffb2fded25deed69a304a4d6497fb12a586e07348bf4cd1a453614eb932a907063ad6166b89f4778742cb5c2c420f17a116e11b964f6 WHIRLPOOL 0b0911120202e3152a74d31f3b7f8a24261f8e163577ad88c12fd85be088871a0f8ed46b305325250bb830f786231ff349e847b2f642cba02905a95a9a022d68
 DIST rails-4.0.2.tgz 3720518 SHA256 cd973b85cfff735da80d8ed4e11421e2242be735d96cbe4d83ac0c4b6ca7c8d1 SHA512 67d7580c0081deeec4271f96caca6d6db8f65864c876a237e7e3f0e8c6e495d299f103dcbe7627385fa4fd3699dac5015e20be90187ef3b2af49352ad9c8d6af WHIRLPOOL 5b496df36ca4de6a4b55951fab2403bd8b31b3505d17d450bf2edf084429a7689c4fdeb8d19d0be40b2d4d0ada8cefd6c3fc104c2428769d2ca8e434d97c6465
+DIST rails-4.0.3.tgz 3721788 SHA256 deed80da9b800789a718f95dde5a0a13f18fe6d0169987165a54e7b6d8edd4f8 SHA512 4ac37e5f2c3992aa33020cb7287c9415a014c475dc176b2b51e6112da8bef3b8626216134c5495a8643a9452c7bd78af9a4e2bc77e9c098f8908335d4a27a918 WHIRLPOOL 52bdd5ad2cfe74976b2565963cddc6cefd51ec95fa4f6ca6cc81fe7444271e734caa0800b3cc7a425be0f7dfa47298079b10cacc5909925072935661cfc78974
diff --git a/dev-ruby/activerecord/activerecord-3.2.17.ebuild b/dev-ruby/activerecord/activerecord-3.2.17.ebuild
new file mode 100644
index 000000000000..f6fb93b9e728
--- /dev/null
+++ b/dev-ruby/activerecord/activerecord-3.2.17.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activerecord/activerecord-3.2.17.ebuild,v 1.1 2014/02/19 07:26:51 graaff Exp $
+
+EAPI=5
+USE_RUBY="ruby18 ruby19"
+
+# this is not null so that the dependencies will actually be filled
+RUBY_FAKEGEM_TASK_TEST="test"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="activerecord.gemspec"
+
+inherit ruby-fakegem versionator
+
+DESCRIPTION="Implements the ActiveRecord pattern (Fowler, PoEAA) for ORM"
+HOMEPAGE="http://rubyforge.org/projects/activerecord/"
+SRC_URI="http://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(get_version_component_range 1-2)"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="mysql postgres sqlite3"
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "~dev-ruby/activesupport-${PV}
+	~dev-ruby/activemodel-${PV}
+	>=dev-ruby/arel-3.0.2:3.0
+	>=dev-ruby/tzinfo-0.3.29:0
+	sqlite3? ( >=dev-ruby/sqlite3-1.3.5 )
+	mysql? ( >=dev-ruby/mysql2-0.3.10:0.3 )
+	postgres? ( >=dev-ruby/pg-0.11.0 )"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/bundler
+		~dev-ruby/actionpack-${PV}
+		>=dev-ruby/sqlite3-1.3.5
+		dev-ruby/mocha:0.13
+	)"
+
+all_ruby_prepare() {
+	# Remove items from the common Gemfile that we don't need for this
+	# test run. This also requires handling some gemspecs.
+	sed -i -e "/\(uglifier\|system_timer\|sdoc\|w3c_validators\|pg\|jquery-rails\|'mysql'\|journey\|ruby-prof\|benchmark-ips\)/d" ../Gemfile || die
+	sed -i -e '/rack-ssl/d' -e 's/~> 3.4/>= 3.4/' ../railties/railties.gemspec || die
+	sed -i -e '/mail/d' ../actionmailer/actionmailer.gemspec || die
+
+	sed -i -e '/bcrypt/ s/3.0.0/3.0/' ../Gemfile || die
+
+	# Avoid tests depending on hash ordering
+	sed -i -e '/test_should_automatically_build_new_associated/,/ end/ s:^:#:' test/cases/nested_attributes_test.rb || die
+
+	# Avoid test depending on mysql adapter which we don't support for
+	# this Rails version to simplify our dependencies.
+	rm test/cases/connection_specification/resolver_test.rb || die
+
+	# Avoid test depending on specific sqlite3 binding or database version.
+	sed -i -e '/test_uniqueness_violations_are_translated/,/^    end/ s:^:#:' test/cases/adapter_test.rb || die
+}
+
+each_ruby_test() {
+	case ${RUBY} in
+		*jruby)
+			;;
+		*)
+			if use sqlite3; then
+				${RUBY} -S rake test_sqlite3 || die "sqlite3 tests failed"
+			fi
+			;;
+	esac
+}
diff --git a/dev-ruby/activerecord/activerecord-4.0.3.ebuild b/dev-ruby/activerecord/activerecord-4.0.3.ebuild
new file mode 100644
index 000000000000..3c5be73fda25
--- /dev/null
+++ b/dev-ruby/activerecord/activerecord-4.0.3.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activerecord/activerecord-4.0.3.ebuild,v 1.1 2014/02/19 08:05:27 graaff Exp $
+
+EAPI=5
+USE_RUBY="ruby19"
+
+# this is not null so that the dependencies will actually be filled
+RUBY_FAKEGEM_TASK_TEST="test"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="activerecord.gemspec"
+
+inherit ruby-fakegem versionator
+
+DESCRIPTION="Implements the ActiveRecord pattern (Fowler, PoEAA) for ORM"
+HOMEPAGE="http://rubyforge.org/projects/activerecord/"
+SRC_URI="http://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(get_version_component_range 1-2)"
+KEYWORDS="~amd64 ~arm"
+IUSE="mysql postgres sqlite3"
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "~dev-ruby/activesupport-${PV}
+	~dev-ruby/activemodel-${PV}
+	>=dev-ruby/activerecord-deprecated_finders-1.0.2:1.0
+	>=dev-ruby/arel-4.0.0:4.0
+	sqlite3? ( >=dev-ruby/sqlite3-1.3.5 )
+	mysql? ( >=dev-ruby/mysql2-0.3.10:0.3 )
+	postgres? ( >=dev-ruby/pg-0.11.0 )"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/bundler
+		~dev-ruby/actionpack-${PV}
+		>=dev-ruby/sqlite3-1.3.5
+		dev-ruby/mocha:0.13
+	)"
+
+all_ruby_prepare() {
+	# Remove items from the common Gemfile that we don't need for this
+	# test run. This also requires handling some gemspecs.
+	sed -i -e "/\(uglifier\|system_timer\|sdoc\|w3c_validators\|pg\|jquery-rails\|'mysql'\|journey\|ruby-prof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\)/d" ../Gemfile || die
+	sed -i -e '/rack-ssl/d' -e 's/~> 3.4/>= 3.4/' ../railties/railties.gemspec || die
+	sed -i -e '/mail/d' ../actionmailer/actionmailer.gemspec || die
+
+	sed -i -e '/bcrypt/ s/3.0.0/3.0/' ../Gemfile || die
+
+	# Add back json in the Gemfile because we dropped some dependencies
+	# earlier that implicitly required it.
+	sed -i -e '$agem "json"' ../Gemfile || die
+
+	# Avoid tests depending on hash ordering
+	sed -i -e '/test_should_automatically_build_new_associated/,/ end/ s:^:#:' test/cases/nested_attributes_test.rb || die
+
+	# Avoid test depending on mysql adapter which we don't support for
+	# this Rails version to simplify our dependencies.
+	rm test/cases/connection_specification/resolver_test.rb || die
+
+	# Avoid single test using mysql dependencies.
+	rm test/cases/invalid_connection_test.rb || die
+
+	# Avoid test depending on specific sqlite3 binding or database version.
+	sed -i -e '/test_uniqueness_violations_are_translated/,/^    end/ s:^:#:' test/cases/adapter_test.rb || die
+}
+
+each_ruby_test() {
+	case ${RUBY} in
+		*jruby)
+			;;
+		*rubyee18)
+			# Turn on travis support to avoid tripping bugs in ree18.
+			TRAVIS=true ${RUBY} -S rake test_sqlite3
+			;;
+		*)
+			if use sqlite3; then
+				${RUBY} -S rake test_sqlite3 || die "sqlite3 tests failed"
+			fi
+			;;
+	esac
+}
diff --git a/dev-ruby/activeresource/Manifest b/dev-ruby/activeresource/Manifest
index f1b60a2fe845..a3c5b88cbf35 100644
--- a/dev-ruby/activeresource/Manifest
+++ b/dev-ruby/activeresource/Manifest
@@ -1,2 +1,3 @@
 DIST activeresource-4.0.0.tgz 69142 SHA256 b2f8094b56c589193fa9c275e4a970fdcd4eb7e7885c8a7a12c86eda6c8d2f37 SHA512 bad94922b7125f79988fb8c6694d6a0370ff1271b47d031e1c249441079e98f75a8069602c1eebf2ec8d7e28aab21b0ca42502c79fe06f46dfa5d42659ff79ab WHIRLPOOL 04120c0a81e140435194ae28a98b4c2ba69e3ef663b7fbf02783839b842c92db70742e4c5d204168dfe4a28caac8d3a8d4c2aea81842959819590544b648d867
 DIST rails-3.2.16.tgz 3566631 SHA256 8fe61b98496e40d8aaef5f8db217f2aad56c9add1bf8417c37a0cbd24f74a57e SHA512 304ef964c33eccfdd4dc1a1c47d43b05e7498d869c64a2ba7a62e8356a07d03cd3f48e1edb9b80d2de1cafc8d91f6ac491df9b0abf3c30d6d22f34f39571965e WHIRLPOOL 5a6ba360c741a7aa3979722ae20790df65e05347a4bad77eea805a9601de2e4cc50a02b8f75d7b7e827da8bef62e8e4e72bb4d4c1de9e783f8f5b95d156bceac
+DIST rails-3.2.17.tgz 3566537 SHA256 f94972ed71c005ae1f7520d8840852872fbdf6c834bb2eaf1516fe63e406d609 SHA512 4ad32d71108d444bd791ffb2fded25deed69a304a4d6497fb12a586e07348bf4cd1a453614eb932a907063ad6166b89f4778742cb5c2c420f17a116e11b964f6 WHIRLPOOL 0b0911120202e3152a74d31f3b7f8a24261f8e163577ad88c12fd85be088871a0f8ed46b305325250bb830f786231ff349e847b2f642cba02905a95a9a022d68
diff --git a/dev-ruby/activeresource/activeresource-3.2.17.ebuild b/dev-ruby/activeresource/activeresource-3.2.17.ebuild
new file mode 100644
index 000000000000..088f4ccf6c7c
--- /dev/null
+++ b/dev-ruby/activeresource/activeresource-3.2.17.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activeresource/activeresource-3.2.17.ebuild,v 1.1 2014/02/19 07:18:57 graaff Exp $
+
+EAPI=5
+
+USE_RUBY="ruby18 ruby19"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="activeresource.gemspec"
+
+inherit ruby-fakegem versionator
+
+DESCRIPTION="Think Active Record for web resources.."
+HOMEPAGE="http://rubyforge.org/projects/activeresource/"
+SRC_URI="http://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(get_version_component_range 1-2)"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "~dev-ruby/activesupport-${PV}
+	dev-ruby/builder:3"
+ruby_add_bdepend "
+	test? (
+		dev-ruby/test-unit:2
+		>=dev-ruby/mocha-0.13.0:0.13
+	)"
+
+all_ruby_prepare() {
+	# Set test environment to our hand.
+	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
+	sed -i -e '/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
+
+	# Make sure we use the test-unit gem since ruby18 does not provide
+	# all the test-unit features needed.
+	sed -i -e '1igem "test-unit"' test/abstract_unit.rb || die
+}
diff --git a/dev-ruby/activesupport/Manifest b/dev-ruby/activesupport/Manifest
index c59664de9a2a..e36ef7e2a9f5 100644
--- a/dev-ruby/activesupport/Manifest
+++ b/dev-ruby/activesupport/Manifest
@@ -1,2 +1,4 @@
 DIST rails-3.2.16.tgz 3566631 SHA256 8fe61b98496e40d8aaef5f8db217f2aad56c9add1bf8417c37a0cbd24f74a57e SHA512 304ef964c33eccfdd4dc1a1c47d43b05e7498d869c64a2ba7a62e8356a07d03cd3f48e1edb9b80d2de1cafc8d91f6ac491df9b0abf3c30d6d22f34f39571965e WHIRLPOOL 5a6ba360c741a7aa3979722ae20790df65e05347a4bad77eea805a9601de2e4cc50a02b8f75d7b7e827da8bef62e8e4e72bb4d4c1de9e783f8f5b95d156bceac
+DIST rails-3.2.17.tgz 3566537 SHA256 f94972ed71c005ae1f7520d8840852872fbdf6c834bb2eaf1516fe63e406d609 SHA512 4ad32d71108d444bd791ffb2fded25deed69a304a4d6497fb12a586e07348bf4cd1a453614eb932a907063ad6166b89f4778742cb5c2c420f17a116e11b964f6 WHIRLPOOL 0b0911120202e3152a74d31f3b7f8a24261f8e163577ad88c12fd85be088871a0f8ed46b305325250bb830f786231ff349e847b2f642cba02905a95a9a022d68
 DIST rails-4.0.2.tgz 3720518 SHA256 cd973b85cfff735da80d8ed4e11421e2242be735d96cbe4d83ac0c4b6ca7c8d1 SHA512 67d7580c0081deeec4271f96caca6d6db8f65864c876a237e7e3f0e8c6e495d299f103dcbe7627385fa4fd3699dac5015e20be90187ef3b2af49352ad9c8d6af WHIRLPOOL 5b496df36ca4de6a4b55951fab2403bd8b31b3505d17d450bf2edf084429a7689c4fdeb8d19d0be40b2d4d0ada8cefd6c3fc104c2428769d2ca8e434d97c6465
+DIST rails-4.0.3.tgz 3721788 SHA256 deed80da9b800789a718f95dde5a0a13f18fe6d0169987165a54e7b6d8edd4f8 SHA512 4ac37e5f2c3992aa33020cb7287c9415a014c475dc176b2b51e6112da8bef3b8626216134c5495a8643a9452c7bd78af9a4e2bc77e9c098f8908335d4a27a918 WHIRLPOOL 52bdd5ad2cfe74976b2565963cddc6cefd51ec95fa4f6ca6cc81fe7444271e734caa0800b3cc7a425be0f7dfa47298079b10cacc5909925072935661cfc78974
diff --git a/dev-ruby/activesupport/activesupport-3.2.17.ebuild b/dev-ruby/activesupport/activesupport-3.2.17.ebuild
new file mode 100644
index 000000000000..4bc165a8483f
--- /dev/null
+++ b/dev-ruby/activesupport/activesupport-3.2.17.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activesupport/activesupport-3.2.17.ebuild,v 1.1 2014/02/19 07:18:00 graaff Exp $
+
+EAPI=5
+
+USE_RUBY="ruby18 ruby19 jruby"
+
+RUBY_FAKEGEM_TASK_DOC=""
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="activesupport.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem versionator
+
+DESCRIPTION="Utility Classes and Extension to the Standard Library"
+HOMEPAGE="http://rubyforge.org/projects/activesupport/"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(get_version_component_range 1-2)"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	>=dev-ruby/multi_json-1.0
+	>=dev-ruby/i18n-0.6.4:0.6
+	!!<dev-ruby/activesupport-3.0.11-r1:3.0"
+
+# memcache-client, nokogiri, and builder are not strictly
+# needed, but there are tests using this code.
+ruby_add_bdepend "test? (
+	dev-ruby/test-unit:2
+	>=dev-ruby/memcache-client-1.5.8
+	dev-ruby/nokogiri
+	>=dev-ruby/builder-3.0.3:3
+	>=dev-ruby/tzinfo-0.3.29
+	)"
+
+# libxml is not strictly needed, there are tests using this code. jruby
+# uses a different xml implementation.
+USE_RUBY=${USE_RUBY/jruby/} ruby_add_bdepend "test? ( >=dev-ruby/libxml-2.0.0 )"
+
+all_ruby_prepare() {
+	# Set test environment to our hand.
+#	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
+	sed -i -e '/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
+
+	# Make sure we use the test-unit gem since ruby18 does not provide
+	# all the test-unit features needed.
+	sed -i -e '1igem "test-unit"' test/abstract_unit.rb || die
+}
+
+each_ruby_prepare() {
+	case ${RUBY} in
+		*ruby18)
+			# Skip failing ruby18 tests related to JSON serialization
+			rm test/message_encryptor_test.rb test/message_verifier_test.rb || die
+			;;
+		*jruby)
+			# Ignore failing tests on jruby in the interest of a security update
+			sed -i -e '/test_not_allowed_to_expand_parameter_entities_to_files/,/^    end/ s:^:#:' \
+				-e '/test_exception_thrown_on_expansion_attack/,/^    end/ s:^:#:' \
+				test/xml_mini/jdom_engine_test.rb || die
+			sed -i \
+				-e '/test_exception_thrown_on_expansion_attack/,/^  end/ s:^:#:' \
+				test/xml_mini/nokogiri_engine_test.rb || die
+			;;
+	esac
+}
diff --git a/dev-ruby/activesupport/activesupport-4.0.3.ebuild b/dev-ruby/activesupport/activesupport-4.0.3.ebuild
new file mode 100644
index 000000000000..76fc15ee6e30
--- /dev/null
+++ b/dev-ruby/activesupport/activesupport-4.0.3.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activesupport/activesupport-4.0.3.ebuild,v 1.1 2014/02/19 08:03:40 graaff Exp $
+
+EAPI=5
+
+USE_RUBY="ruby19 ruby20"
+
+RUBY_FAKEGEM_TASK_DOC=""
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="activesupport.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem versionator
+
+DESCRIPTION="Utility Classes and Extension to the Standard Library"
+HOMEPAGE="http://rubyforge.org/projects/activesupport/"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(get_version_component_range 1-2)"
+KEYWORDS=" ~amd64 ~arm"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	>=dev-ruby/multi_json-1.3:0
+	>=dev-ruby/i18n-0.6.4:0.6
+	>=dev-ruby/tzinfo-0.3.37:0
+	>=dev-ruby/minitest-4.2:0
+	>=dev-ruby/thread_safe-0.1:0
+	!!<dev-ruby/activesupport-3.0.11-r1:3.0"
+
+# memcache-client, nokogiri, and builder are not strictly
+# needed, but there are tests using this code.
+ruby_add_bdepend "test? (
+	>=dev-ruby/dalli-2.2.1
+	>=dev-ruby/nokogiri-1.4.5
+	>=dev-ruby/builder-3.1.0
+	>=dev-ruby/libxml-2.0.0
+	)"
+
+all_ruby_prepare() {
+	# Set the secure permissions that tests expect.
+	chmod 0755 "${HOME}" || die "Failed to fix permissions on home"
+
+	# Set test environment to our hand.
+#	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
+	sed -i -e '/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
+
+	# Make sure a compatible version of minitest is used everywhere.
+	sed -i -e "s/gem 'minitest'/gem 'minitest', '~> 4.2'/" lib/active_support/test_case.rb || die
+	sed -i -e "1igem 'minitest', '~> 4.2'" test/abstract_unit.rb || die
+}
diff --git a/dev-ruby/rails/Manifest b/dev-ruby/rails/Manifest
index c4d98d91e9ba..e6ba16c6f7a3 100644
--- a/dev-ruby/rails/Manifest
+++ b/dev-ruby/rails/Manifest
@@ -1,2 +1,4 @@
 DIST rails-3.2.16.gem 4608 SHA256 fc470010d70c7628e9e6c4bd535f85571a24cdfadf9b58560e6b2d5f3d396ab0 SHA512 b51706922426c6f5f7bf531dca4f0d0c45f60cf1a2ac0b7cd9f1a39d38f27018bc46931c6ba041c31268a7616294d81c91f93fc0663047a80a92b00a71a16e28 WHIRLPOOL 27a069a2fdcd3cac99f086d9c5ab31fa0b67f3caffc845dd52fe28a755ca58fb1ffc7b94e03b4cbb56736839e2b4494bba70d6fb3ba9945588dc86d8541bacbc
+DIST rails-3.2.17.gem 3584 SHA256 8eff1bbf9f22fa943e58e9b71c6bdbe5d5d95caf022bec38ce083599961cb984 SHA512 cd8ebfbd78f4ee415121d24f490024bcbab0e1b18f4ed5572ba7be7c27409055e3d233e26aa7e10cdc919b310be5ac85409d3f0371144b21913a772c958543e3 WHIRLPOOL 92ebf09cb682185e5bbec7af6d2da6c6397a1f31d94b41c9482b0ad060b4dbef5f1d5dcb74d181be7befd72bbb5536faccc5491cbed94c59aebc20b22e55bdce
 DIST rails-4.0.2.gem 1548800 SHA256 b7485afabce7c526eee714f7daf020cc7f18be66567a55ad806b81294cc19ffa SHA512 98e07f98ca457ccba7f26d486712a5f6a8ce4c0d2b134a19278e354ea7bb152c175418425a2ff3c502b7ae47e7daa16e0ee3233c9463492f493de8b49f67eb6d WHIRLPOOL ee701680cbaa833e5082c51a18709f9ba0d44b17be7f2cc70aacab875816fccc936ca186c6bee09c08dd22edcf470af778c6e6a5c0c6ee6850bed4b9c5dae1ac
+DIST rails-4.0.3.gem 1549824 SHA256 649f8ca0cdc10d47e6bef73e098937a2a61f5aabbcf2fde930d28675021e81be SHA512 5c5addf2cc136300befee1e021f71936e3719f88047d390ec6e338efe0aa475bc4f18a0a1de1f5f2ed6c7fe49d9e0b4eacff154054210a77239784e6a49a994e WHIRLPOOL 312d934851c83f6181c45301af21a4d17287252def045fdeddd32b970199db06e3673defe203e12e1df3f9c6206ba687953b0169239357206a991aaf3bf3d2e5
diff --git a/dev-ruby/rails/rails-3.2.17.ebuild b/dev-ruby/rails/rails-3.2.17.ebuild
new file mode 100644
index 000000000000..5501828fdd7c
--- /dev/null
+++ b/dev-ruby/rails/rails-3.2.17.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rails/rails-3.2.17.ebuild,v 1.1 2014/02/19 07:27:59 graaff Exp $
+
+EAPI=5
+USE_RUBY="ruby18 ruby19"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_TASK_TEST=""
+
+inherit ruby-fakegem versionator
+
+DESCRIPTION="ruby on rails is a web-application and persistance framework"
+HOMEPAGE="http://www.rubyonrails.org"
+
+LICENSE="MIT"
+SLOT="$(get_version_component_range 1-2)"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+IUSE="+asset-pipeline"
+
+ruby_add_rdepend "
+	~dev-ruby/actionmailer-${PV}
+	~dev-ruby/actionpack-${PV}
+	~dev-ruby/activerecord-${PV}
+	~dev-ruby/activeresource-${PV}
+	~dev-ruby/activesupport-${PV}
+	=dev-ruby/bundler-1*
+	~dev-ruby/railties-${PV}
+	asset-pipeline? (
+		dev-ruby/jquery-rails
+		>=dev-ruby/sass-rails-3.2.3:3.2
+		>=dev-ruby/uglifier-1.0.3
+		>=dev-ruby/coffee-rails-3.2.1:3.2
+	)"
diff --git a/dev-ruby/rails/rails-4.0.3.ebuild b/dev-ruby/rails/rails-4.0.3.ebuild
new file mode 100644
index 000000000000..6644c5a3b84b
--- /dev/null
+++ b/dev-ruby/rails/rails-4.0.3.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rails/rails-4.0.3.ebuild,v 1.1 2014/02/19 08:05:55 graaff Exp $
+
+EAPI=5
+USE_RUBY="ruby19"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+# The guides are now here but we'd need to rebuilt them first.
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_FAKEGEM_EXTRADOC="README.md guides/CHANGELOG.md"
+
+inherit ruby-fakegem versionator
+
+DESCRIPTION="ruby on rails is a web-application and persistance framework"
+HOMEPAGE="http://www.rubyonrails.org"
+
+LICENSE="MIT"
+SLOT="$(get_version_component_range 1-2)"
+KEYWORDS="~amd64 ~arm"
+
+IUSE="+asset-pipeline"
+
+ruby_add_rdepend "
+	~dev-ruby/actionmailer-${PV}
+	~dev-ruby/actionpack-${PV}
+	~dev-ruby/activerecord-${PV}
+	~dev-ruby/activesupport-${PV}
+	~dev-ruby/railties-${PV}
+	>=dev-ruby/bundler-1.3 =dev-ruby/bundler-1*
+	>=dev-ruby/sprockets-rails-2.0.0:2.0
+	asset-pipeline? (
+		dev-ruby/jquery-rails
+		>=dev-ruby/sass-rails-4.0.0:4.0
+		>=dev-ruby/uglifier-1.3.0
+		>=dev-ruby/coffee-rails-4.0.0:4.0
+	)"
+
+# also: turbolinks, >=jbuilder-1.2:1
diff --git a/dev-ruby/railties/Manifest b/dev-ruby/railties/Manifest
index c59664de9a2a..e36ef7e2a9f5 100644
--- a/dev-ruby/railties/Manifest
+++ b/dev-ruby/railties/Manifest
@@ -1,2 +1,4 @@
 DIST rails-3.2.16.tgz 3566631 SHA256 8fe61b98496e40d8aaef5f8db217f2aad56c9add1bf8417c37a0cbd24f74a57e SHA512 304ef964c33eccfdd4dc1a1c47d43b05e7498d869c64a2ba7a62e8356a07d03cd3f48e1edb9b80d2de1cafc8d91f6ac491df9b0abf3c30d6d22f34f39571965e WHIRLPOOL 5a6ba360c741a7aa3979722ae20790df65e05347a4bad77eea805a9601de2e4cc50a02b8f75d7b7e827da8bef62e8e4e72bb4d4c1de9e783f8f5b95d156bceac
+DIST rails-3.2.17.tgz 3566537 SHA256 f94972ed71c005ae1f7520d8840852872fbdf6c834bb2eaf1516fe63e406d609 SHA512 4ad32d71108d444bd791ffb2fded25deed69a304a4d6497fb12a586e07348bf4cd1a453614eb932a907063ad6166b89f4778742cb5c2c420f17a116e11b964f6 WHIRLPOOL 0b0911120202e3152a74d31f3b7f8a24261f8e163577ad88c12fd85be088871a0f8ed46b305325250bb830f786231ff349e847b2f642cba02905a95a9a022d68
 DIST rails-4.0.2.tgz 3720518 SHA256 cd973b85cfff735da80d8ed4e11421e2242be735d96cbe4d83ac0c4b6ca7c8d1 SHA512 67d7580c0081deeec4271f96caca6d6db8f65864c876a237e7e3f0e8c6e495d299f103dcbe7627385fa4fd3699dac5015e20be90187ef3b2af49352ad9c8d6af WHIRLPOOL 5b496df36ca4de6a4b55951fab2403bd8b31b3505d17d450bf2edf084429a7689c4fdeb8d19d0be40b2d4d0ada8cefd6c3fc104c2428769d2ca8e434d97c6465
+DIST rails-4.0.3.tgz 3721788 SHA256 deed80da9b800789a718f95dde5a0a13f18fe6d0169987165a54e7b6d8edd4f8 SHA512 4ac37e5f2c3992aa33020cb7287c9415a014c475dc176b2b51e6112da8bef3b8626216134c5495a8643a9452c7bd78af9a4e2bc77e9c098f8908335d4a27a918 WHIRLPOOL 52bdd5ad2cfe74976b2565963cddc6cefd51ec95fa4f6ca6cc81fe7444271e734caa0800b3cc7a425be0f7dfa47298079b10cacc5909925072935661cfc78974
diff --git a/dev-ruby/railties/railties-3.2.17.ebuild b/dev-ruby/railties/railties-3.2.17.ebuild
new file mode 100644
index 000000000000..f8251f6283ef
--- /dev/null
+++ b/dev-ruby/railties/railties-3.2.17.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/railties/railties-3.2.17.ebuild,v 1.1 2014/02/19 07:27:11 graaff Exp $
+
+EAPI=5
+USE_RUBY="ruby18 ruby19"
+
+RUBY_FAKEGEM_TASK_TEST="test:regular"
+RUBY_FAKEGEM_TASK_DOC="generate_guides"
+RUBY_FAKEGEM_DOCDIR="guides/output"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="railties.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem versionator
+
+DESCRIPTION="Tools for creating, working with, and running Rails applications."
+HOMEPAGE="http://github.com/rails/rails"
+SRC_URI="http://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(get_version_component_range 1-2)"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+# The test suite has many failures, most likely due to a mismatch in
+# exact dependencies or environment specifics. Needs further
+# investigation.
+RESTRICT="test"
+
+RDEPEND+=">=app-admin/eselect-rails-0.18"
+
+ruby_add_rdepend "
+	~dev-ruby/activesupport-${PV}
+	~dev-ruby/actionpack-${PV}
+	>=dev-ruby/rdoc-3.4
+	>=dev-ruby/thor-0.14.6
+	>=dev-ruby/rack-ssl-1.3.2:1.3
+	>=dev-ruby/rake-0.8.7"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/mocha:0.13
+	)
+	doc? (
+		>=dev-ruby/redcloth-4.1.1
+	)"
+
+all_ruby_prepare() {
+	# Remove items from the common Gemfile that we don't need for this
+	# test run. This also requires handling some gemspecs.
+	sed -i -e '/\(uglifier\|system_timer\|sdoc\|w3c_validators\|pg\)/d' ../Gemfile || die
+
+	# Also allow rdoc 4.x
+	sed -i -e 's/~> 3.4/>= 3.4/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	if use doc ; then
+		mv guides/output guides/guides || die
+		dohtml -r guides/guides
+	fi
+
+	ruby_fakegem_binwrapper rails rails-${PV}
+}
+
+pkg_postinst() {
+	elog "To select between slots of rails, use:"
+	elog "\teselect rails"
+
+	eselect rails update
+}
+
+pkg_postrm() {
+	eselect rails update
+}
diff --git a/dev-ruby/railties/railties-4.0.3.ebuild b/dev-ruby/railties/railties-4.0.3.ebuild
new file mode 100644
index 000000000000..43dfaa6ed41b
--- /dev/null
+++ b/dev-ruby/railties/railties-4.0.3.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/railties/railties-4.0.3.ebuild,v 1.1 2014/02/19 08:05:40 graaff Exp $
+
+EAPI=5
+USE_RUBY="ruby19"
+
+RUBY_FAKEGEM_TASK_TEST="test:regular"
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="railties.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem versionator
+
+DESCRIPTION="Tools for creating, working with, and running Rails applications."
+HOMEPAGE="http://github.com/rails/rails"
+SRC_URI="http://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(get_version_component_range 1-2)"
+KEYWORDS="~amd64 ~arm"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+# The test suite has many failures, most likely due to a mismatch in
+# exact dependencies or environment specifics. Needs further
+# investigation.
+RESTRICT="test"
+
+RDEPEND+=">=app-admin/eselect-rails-0.19"
+
+ruby_add_rdepend "
+	~dev-ruby/activesupport-${PV}
+	~dev-ruby/actionpack-${PV}
+	>=dev-ruby/thor-0.18.1
+	>=dev-ruby/rake-0.8.7"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/mocha:0.13
+	)"
+
+all_ruby_prepare() {
+	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
+	sed -i -e '/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
+	sed -i -e '1igem "minitest", "~>4.0"' test/abstract_unit.rb || die
+
+	# Also allow rdoc 4.x
+	sed -i -e 's/~> 3.4/>= 3.4/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	ruby_fakegem_binwrapper rails rails-${PV}
+}
+
+pkg_postinst() {
+	elog "To select between slots of rails, use:"
+	elog "\teselect rails"
+
+	eselect rails update
+}
+
+pkg_postrm() {
+	eselect rails update
+}
diff --git a/dev-ruby/safe_yaml/Manifest b/dev-ruby/safe_yaml/Manifest
index 56b687c66fcc..968813ca9feb 100644
--- a/dev-ruby/safe_yaml/Manifest
+++ b/dev-ruby/safe_yaml/Manifest
@@ -1 +1,2 @@
 DIST safe_yaml-0.9.7.gem 26112 SHA256 139285ff8e70413d2a3721da4e742c736b4948682f0b80330a353e34d5dd6478 SHA512 d1beedbcb7c6c1bc15f3f920d00a705f88a7d45bd43b762a0dcb6c8c467286d1042f7ab4a9be187ae99412f6e43e41d89e34c0451a9845127718a17f4bf877c2 WHIRLPOOL d37849d36c87910f71d41da6b35eedbc4ea3c699f5e7a279dce2c843a8f6337e5cfd3edf1fb9ab50c83cbf49042a9b408c623d3c1c4236929c80bb3518ae1f04
+DIST safe_yaml-1.0.1.gem 27648 SHA256 4fc5bbbc0fc89c228fb1bb0788571d91b3ffbb354d9b00da106f28acace515f5 SHA512 176ac39cd01b3055fdd7160c9c8c8171fc26ff102fd2f79c1bb9ca10cc7ead77232dc32421db19c01820b15ac2589ee3ab27e8ebbad2dfd8b7b5ca3873ce8763 WHIRLPOOL 7a9d51daf21fcbc54d80bfed419c9c3edcf73063521641f793d05d86cb6ddd91e887ea93f4ef1a4bb91d7a6c28d484cc887b203baca568e6c111105a9353fb9f
diff --git a/dev-ruby/safe_yaml/safe_yaml-1.0.1.ebuild b/dev-ruby/safe_yaml/safe_yaml-1.0.1.ebuild
new file mode 100644
index 000000000000..ca2cdbb87f83
--- /dev/null
+++ b/dev-ruby/safe_yaml/safe_yaml-1.0.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/safe_yaml/safe_yaml-1.0.1.ebuild,v 1.1 2014/02/19 01:31:27 mrueg Exp $
+
+EAPI=5
+
+USE_RUBY="ruby18 ruby19 ruby20 jruby"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Parse YAML safely, without that pesky arbitrary object deserialization vulnerability"
+HOMEPAGE="https://dtao.github.com/safe_yaml"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+ruby_add_bdepend "test? ( dev-ruby/hashie
+	dev-ruby/heredoc_unindent
+	dev-ruby/rspec:2 )"
+
+each_ruby_test() {
+	# Run specs with monkeypatch
+	${RUBY} -S rspec --tag ~libraries || die
+
+	# Running specs without monkeypatch
+	${RUBY} -S rspec --tag libraries || die
+}
diff --git a/dev-ruby/session/Manifest b/dev-ruby/session/Manifest
index 2844bb5b05fb..d5135d7a0bb7 100644
--- a/dev-ruby/session/Manifest
+++ b/dev-ruby/session/Manifest
@@ -1 +1,2 @@
 DIST session-3.1.0.gem 15872 SHA256 4be736d4d0110dbac8cf0e5b0c08278c7ae017308b04267179e9ef0769089869 SHA512 60dcc0d0f196a2a77cc880b9d5a796b68dcee7bfac388c02e3442e3d179aa1c59afd203edf6d81ca7b7e5e6338e522067a1407422b944834d6ed632ada34eac4 WHIRLPOOL f4461cb9de0eefd4fc51da3eae2a79d7564b7e699cbbbf0cded82b3ddae08c3c2bd2752cb9ab974eaea61f9fa610eb7cd8dba5abe01ba236363d1aee79944eff
+DIST session-3.1.1.gem 17920 SHA256 e390bec9115067c6fdd58992fe0f0854a86aa47e53ddf3b2cd201be1c9ce88c6 SHA512 a67d35c00ffe3278529ee615f1f9ab571a8e365a9b1f01bd890af84f183d7d4a2239ac3ca38d7f48d48fa3901dc98cc6d6ca7b703a787593a50ece5fc4ffb099 WHIRLPOOL ed45e2a8cc8925a2af7f6a802cd25947017af95759a248f8c6ed6beafb856c09321925d51b2fcb01b4ec248c878a95fa78c1a27286a0a7106c501f6624e8767f
diff --git a/dev-ruby/session/session-3.1.1.ebuild b/dev-ruby/session/session-3.1.1.ebuild
new file mode 100644
index 000000000000..eaee82a2c1eb
--- /dev/null
+++ b/dev-ruby/session/session-3.1.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/session/session-3.1.1.ebuild,v 1.1 2014/02/19 01:38:32 mrueg Exp $
+
+EAPI=5
+
+USE_RUBY="ruby18 ruby19 ruby20 ruby21 jruby"
+
+RUBY_FAKEGEM_TASK_TEST=""
+RUBY_FAKEGEM_TASK_DOC=""
+
+RUBY_FAKEGEM_EXTRADOC="README"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A set of classes to drive external programs via pipe"
+HOMEPAGE="http://codeforpeople.com/lib/ruby/session/"
+#SRC_URI="http://codeforpeople.com/lib/ruby/session/${P}.tgz"
+
+# License info based on http://github.com/ahoward/session as indicated
+# by author.
+LICENSE="Ruby"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="test"
+
+DEPEND+=" test? ( || ( sys-apps/coreutils sys-freebsd/freebsd-bin ) )"
+
+all_ruby_prepare() {
+	# needed to void a collision with the Timeout::Error alias in Ruby
+	# 1.8.7 at least.
+	sed -i -e 's:TimeoutError:SessionTimeoutError:' test/session.rb || die
+}
+
+each_ruby_prepare() {
+	case ${RUBY} in
+		*jruby)
+			epatch "${FILESDIR}"/${PN}-3.1.0-jruby.patch
+			;;
+	esac
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib test/*.rb || die "tests failed"
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	docinto examples
+	dodoc sample/*
+}
diff --git a/dev-vcs/git/git-1.8.5.5.ebuild b/dev-vcs/git/git-1.8.5.5.ebuild
index 75afdc453aab..acaebf0a8edc 100644
--- a/dev-vcs/git/git-1.8.5.5.ebuild
+++ b/dev-vcs/git/git-1.8.5.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/dev-vcs/git/git-1.8.5.5.ebuild,v 1.1 2014/02/13 23:20:44 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.8.5.5.ebuild,v 1.2 2014/02/18 21:21:45 jer Exp $
 
 EAPI=5
 
@@ -32,7 +32,7 @@ if [[ ${PV} != *9999 ]]; then
 			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
 			${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
 			)"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 else
 	SRC_URI=""
 	KEYWORDS=""
diff --git a/gnome-extra/zenity/files/zenity-3.8.0-broken-autoclose.patch b/gnome-extra/zenity/files/zenity-3.8.0-broken-autoclose.patch
new file mode 100644
index 000000000000..0b4f1c77d400
--- /dev/null
+++ b/gnome-extra/zenity/files/zenity-3.8.0-broken-autoclose.patch
@@ -0,0 +1,95 @@
+From c89ce9c3812fdc3a2637fd76b42a07385ad50684 Mon Sep 17 00:00:00 2001
+From: Arx Cruz <arxcruz@gnome.org>
+Date: Tue, 04 Jun 2013 19:27:48 +0000
+Subject: Bug #653468. Fixed by Kurt Miller <kurt@intricatesoftware.com>.
+
+Fix the broken auto-close option in progress and list dialogs.
+---
+diff --git a/src/progress.c b/src/progress.c
+index c382d74..055699c 100644
+--- a/src/progress.c
++++ b/src/progress.c
+@@ -81,12 +81,13 @@ zenity_progress_handle_stdin (GIOChannel   *channel,
+   static GObject *progress_bar;
+   static GObject *progress_label;
+   float percentage = 0.0;
++  GIOStatus status = G_IO_STATUS_NORMAL;
+   
+   progress_data = (ZenityProgressData *) data;
+   progress_bar = gtk_builder_get_object (builder, "zenity_progress_bar");
+   progress_label = gtk_builder_get_object (builder, "zenity_progress_text");
+ 
+-  if ((condition == G_IO_IN) || (condition == G_IO_IN + G_IO_HUP)) {
++  if ((condition & G_IO_IN) != 0) {
+     GString *string;
+     GError *error = NULL;
+ 
+@@ -95,8 +96,6 @@ zenity_progress_handle_stdin (GIOChannel   *channel,
+     while (channel->is_readable != TRUE)
+       ;
+     do {
+-      gint status;
+-
+       do {
+         status = g_io_channel_read_line_string (channel, string, NULL, &error);
+ 
+@@ -175,11 +174,11 @@ zenity_progress_handle_stdin (GIOChannel   *channel,
+         }
+       }
+ 
+-    } while (g_io_channel_get_buffer_condition (channel) == G_IO_IN);
++    } while ((g_io_channel_get_buffer_condition (channel) & G_IO_IN) == G_IO_IN && status != G_IO_STATUS_EOF);
+     g_string_free (string, TRUE);
+   }
+ 
+-  if ((condition != G_IO_IN) && (condition != G_IO_IN + G_IO_HUP)) {
++  if ((condition & G_IO_IN) != G_IO_IN || status == G_IO_STATUS_EOF) {
+     /* We assume that we are done, so stop the pulsating and de-sensitize the buttons */
+     GtkWidget *button;
+ 
+diff --git a/src/tree.c b/src/tree.c
+index 031765e..4634ba1 100644
+--- a/src/tree.c
++++ b/src/tree.c
+@@ -139,6 +139,7 @@ zenity_tree_handle_stdin (GIOChannel  *channel,
+   static gboolean editable;
+   static gboolean toggles;
+   static gboolean first_time = TRUE;
++  GIOStatus status = G_IO_STATUS_NORMAL;
+ 
+   tree_view = GTK_TREE_VIEW (data);
+   n_columns = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (tree_view), "n_columns"));
+@@ -152,7 +153,7 @@ zenity_tree_handle_stdin (GIOChannel  *channel,
+     gtk_list_store_append (GTK_LIST_STORE (model), &iter);
+   }
+ 
+-  if ((condition == G_IO_IN) || (condition == G_IO_IN + G_IO_HUP)) {
++  if ((condition & G_IO_IN) == G_IO_IN) {
+     GString *string;
+     GError *error = NULL;
+ 
+@@ -161,8 +162,6 @@ zenity_tree_handle_stdin (GIOChannel  *channel,
+     while ((g_io_channel_get_flags(channel) & G_IO_FLAG_IS_READABLE) != G_IO_FLAG_IS_READABLE)
+       ;
+     do {
+-      gint status;
+-
+       do {
+         if (g_io_channel_get_flags(channel) & G_IO_FLAG_IS_READABLE)
+           status = g_io_channel_read_line_string (channel, string, NULL, &error);
+@@ -221,11 +220,11 @@ zenity_tree_handle_stdin (GIOChannel  *channel,
+ 
+       column_count++;
+ 
+-    } while (g_io_channel_get_buffer_condition (channel) == G_IO_IN); 
++    } while ((g_io_channel_get_buffer_condition (channel) & G_IO_IN) == G_IO_IN && status != G_IO_STATUS_EOF); 
+     g_string_free (string, TRUE);
+   }
+ 
+-  if ((condition != G_IO_IN) && (condition != G_IO_IN + G_IO_HUP)) {
++  if ((condition & G_IO_IN) != G_IO_IN || status == G_IO_STATUS_EOF) {
+     g_io_channel_shutdown (channel, TRUE, NULL);
+     return FALSE;
+   }
+--
+cgit v0.9.2
diff --git a/gnome-extra/zenity/files/zenity-3.8.0-listbox-expand.patch b/gnome-extra/zenity/files/zenity-3.8.0-listbox-expand.patch
new file mode 100644
index 000000000000..41e90fedd59f
--- /dev/null
+++ b/gnome-extra/zenity/files/zenity-3.8.0-listbox-expand.patch
@@ -0,0 +1,20 @@
+From 80bc8ce643979fec201c4ebd5cd6405b6310357f Mon Sep 17 00:00:00 2001
+From: Arx Cruz <arxcruz@gnome.org>
+Date: Thu, 10 Oct 2013 19:52:38 +0000
+Subject: But #702535 - List box doesn't expand to fill window
+
+---
+diff --git a/src/zenity.ui b/src/zenity.ui
+index ee89093..7c0ab1f 100644
+--- a/src/zenity.ui
++++ b/src/zenity.ui
+@@ -1021,6 +1021,7 @@
+                 <property name="visible">True</property>
+                 <property name="can_focus">True</property>
+                 <property name="shadow_type">in</property>
++                <property name="expand">True</property>
+                 <child>
+                   <object class="GtkTreeView" id="zenity_tree_view">
+                     <property name="visible">True</property>
+--
+cgit v0.9.2
diff --git a/gnome-extra/zenity/zenity-3.8.0-r1.ebuild b/gnome-extra/zenity/zenity-3.8.0-r2.ebuild
similarity index 76%
rename from gnome-extra/zenity/zenity-3.8.0-r1.ebuild
rename to gnome-extra/zenity/zenity-3.8.0-r2.ebuild
index 98cfb4be8427..3926e57b54ed 100644
--- a/gnome-extra/zenity/zenity-3.8.0-r1.ebuild
+++ b/gnome-extra/zenity/zenity-3.8.0-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/zenity/zenity-3.8.0-r1.ebuild,v 1.1 2013/12/24 12:41:09 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/zenity/zenity-3.8.0-r2.ebuild,v 1.1 2014/02/19 06:21:19 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="yes"
@@ -8,7 +8,7 @@ GCONF_DEBUG="yes"
 inherit eutils gnome2
 
 DESCRIPTION="Tool to display dialogs from the commandline and shell scripts"
-HOMEPAGE="https://wiki.gnome.org/action/show/Projects/Zenity"
+HOMEPAGE="https://wiki.gnome.org/Projects/Zenity"
 
 LICENSE="LGPL-2+"
 SLOT="0"
@@ -36,6 +36,13 @@ DEPEND="${RDEPEND}
 src_prepare() {
 	# Fix double clicking an item or hitting enter after selecting an item (from 'master')
 	epatch "${FILESDIR}/${PN}-3.8.0-double-click.patch"
+
+	# Fix the broken auto-close option in progress and list dialogs (from 'master')
+	epatch "${FILESDIR}/${PN}-3.8.0-broken-autoclose.patch"
+
+	# List box doesn't expand to fill window (from 'master')
+	epatch "${FILESDIR}/${PN}-3.8.0-listbox-expand.patch"
+
 	gnome2_src_prepare
 }
 
diff --git a/media-libs/libogg/libogg-1.3.1.ebuild b/media-libs/libogg/libogg-1.3.1.ebuild
index 6beab9573aba..12d5cfa45e8d 100644
--- a/media-libs/libogg/libogg-1.3.1.ebuild
+++ b/media-libs/libogg/libogg-1.3.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libogg/libogg-1.3.1.ebuild,v 1.5 2013/07/04 14:41:30 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libogg/libogg-1.3.1.ebuild,v 1.6 2014/02/18 16:05:02 jer Exp $
 
 EAPI=5
 inherit autotools-multilib
@@ -11,7 +11,7 @@ SRC_URI="http://downloads.xiph.org/releases/ogg/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND="
diff --git a/media-libs/nas/Manifest b/media-libs/nas/Manifest
index cabd7fe73d09..2575b68cb32e 100644
--- a/media-libs/nas/Manifest
+++ b/media-libs/nas/Manifest
@@ -1,3 +1,3 @@
-DIST nas-1.9.2.src.tar.gz 1484369 SHA256 722d4f567f61e89e735277a0c1d3cfed98842160e3349bf956b1db525eacd2d3
+DIST nas-1.9.2.src.tar.gz 1484369 SHA256 722d4f567f61e89e735277a0c1d3cfed98842160e3349bf956b1db525eacd2d3 SHA512 3692740818d6f7852e46e702b42d9c4b76b5949ea9a13628651cfdb7ccd5a34240bfd84ae71ac7cd9744f112a35d098bd6aa7775a9db3e5e5497799b12da4c4f WHIRLPOOL 968fef1f1b5d3b5a096313a671f20fb74c09faff640baf4eb410311cb5089a8c178871e94316630a41cb1de389137697766b5cc5a4e2af9785bfc8a1b8039719
 DIST nas-1.9.3.src.tar.gz 1485222 SHA256 cd2c12980f812d6c7e08f48d00a2b7f85a040b3f587b177d4c1f03600a6ae7a9 SHA512 a21d469d43d70e1077c4cb8e78abdd4624207e15253ef7c47c7a72bc39ef85fa74f29dc64aecdb74aab23250afc4cf4d7322d865968147f7eca14a12e73381bf WHIRLPOOL 475321224f40f4d47c785ea7116140d1effd796e98b8caf302d88265e06165c089c2e3f783e572cfa715bb90f5add2516694ebcc91ace845cce51aaafde5c42b
 DIST nas-1.9.4.src.tar.gz 1464598 SHA256 cf36ea63751ce86cfd3b76c1659ce0d6a361a2e7cb34069854e156532703b39d SHA512 3f8bd60f8ce0f25a2605af17caaadfe4f21223ba4cd3fa02078d1427b17cdf33ebda887e5dc30cd68eb7f64bfad80aafc9071ff0a26f0d3a4a93caacac03b5bb WHIRLPOOL 6c8e13d18bb9824dafc722ae6bb29d8adbfb778c9feddef56b41da77faceb730a5dc265fc7b613ae491fab0e6dbc4ede47d2abb98b313d3408783aee4e9a5db2
diff --git a/media-libs/nas/nas-1.9.4.ebuild b/media-libs/nas/nas-1.9.4.ebuild
index 1746de4427ac..6e4bcd112b9d 100644
--- a/media-libs/nas/nas-1.9.4.ebuild
+++ b/media-libs/nas/nas-1.9.4.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/nas/nas-1.9.4.ebuild,v 1.1 2014/02/16 16:40:08 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/nas/nas-1.9.4.ebuild,v 1.2 2014/02/18 11:03:03 jer Exp $
 
 EAPI=5
 inherit eutils multilib toolchain-funcs multilib-minimal
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.src.tar.gz"
 
 LICENSE="HPND MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="doc static-libs"
 
 RDEPEND="x11-libs/libICE
diff --git a/media-plugins/alsa-plugins/alsa-plugins-1.0.27-r1.ebuild b/media-plugins/alsa-plugins/alsa-plugins-1.0.27-r1.ebuild
index 8304258c3ecf..92d36938e0ec 100644
--- a/media-plugins/alsa-plugins/alsa-plugins-1.0.27-r1.ebuild
+++ b/media-plugins/alsa-plugins/alsa-plugins-1.0.27-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/media-plugins/alsa-plugins/alsa-plugins-1.0.27-r1.ebuild,v 1.3 2014/02/17 19:36:30 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/alsa-plugins/alsa-plugins-1.0.27-r1.ebuild,v 1.4 2014/02/18 16:02:43 jer Exp $
 
 EAPI=5
 inherit autotools eutils flag-o-matic multilib
@@ -11,7 +11,7 @@ SRC_URI="mirror://alsaproject/plugins/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux"
 IUSE="debug ffmpeg jack libsamplerate pulseaudio speex"
 
 RDEPEND=">=media-libs/alsa-lib-${PV}:=
diff --git a/media-plugins/vdr-vompserver/Manifest b/media-plugins/vdr-vompserver/Manifest
index ae00ce6ceef5..7b5125a9e68f 100644
--- a/media-plugins/vdr-vompserver/Manifest
+++ b/media-plugins/vdr-vompserver/Manifest
@@ -1,2 +1,3 @@
 DIST vdr-vompserver-0.3.1.tgz 84183 SHA256 bb9838b1139926bc0bd35e87a750a5aaf937015d78b351361c8611a7610488bd
 DIST vdr-vompserver-0.4.0.tgz 87166 SHA256 21437dfaa0a5cec57e211ea5819a96d1b2b56a700bd3e76033a1fb1bd8702b06 SHA512 027b3b63fc8fa34da11cc1841602e89fb48a7345717c22cf796cb24134504991b3056354b459358deb983da93fd6a3e74ddd965e894afcd6ba2bf69c37d058fa WHIRLPOOL 780ee9dd51692456d6b5a8d67c4d273baf77a9c549650416dc7307c0a4386fbf83b2e4df00856008b445875cc21ee665fe06349bf2cf691bae2e7ed91cbbbff2
+DIST vdr-vompserver-0.4.1.tgz 87056 SHA256 c5d2ba4d48c230de1223dcee6edff3a8cdc574a47779569136b39f4f810fdbd9 SHA512 79fbc311b48a752206842f21ec8d864df67aa7614f092b4e6a6623d732d4e053c2e35af7981aaed7d392f6510ebaac59f60640acae540e13c4f38cce04ddd1bd WHIRLPOOL 89ff2f8472a3dae695685417e85b6eef07a993c52ce81b4fee3ed4461b6f9394bf3ee04e41d74bfbc65da2ccb2cf8fff7e66010e083fff9320195a098817372f
diff --git a/media-plugins/vdr-vompserver/vdr-vompserver-0.4.1.ebuild b/media-plugins/vdr-vompserver/vdr-vompserver-0.4.1.ebuild
new file mode 100644
index 000000000000..6e2ea13fce7b
--- /dev/null
+++ b/media-plugins/vdr-vompserver/vdr-vompserver-0.4.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-vompserver/vdr-vompserver-0.4.1.ebuild,v 1.1 2014/02/18 13:27:22 hd_brummy Exp $
+
+EAPI=5
+
+inherit vdr-plugin-2
+
+DESCRIPTION="VDR Plugin: server part for MediaMVP device"
+HOMEPAGE="http://www.loggytronic.com/vomp.php"
+SRC_URI="http://www.loggytronic.com/dl/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=">=media-video/vdr-1.7.36-r1"
+RDEPEND="${DEPEND}"
+
+KEEP_I18NOBJECT="yes"
+
+src_install() {
+	vdr-plugin-2_src_install
+
+	insinto /etc/vdr/plugins/vompserver
+	newins vomp.conf.sample vomp.conf
+	newins vomp-00-00-00-00-00-00.conf.sample vomp-00-00-00-00-00-00.conf
+}
+
+pkg_postinst() {
+	vdr-plugin-2_pkg_postinst
+
+	elog "\nHave a look to the VOMP sample files in /etc/vdr/plugins.\n"
+
+	elog "You have to download the dongle file (i.e. firmware) and adapt"
+	elog "the vomp configuration files accordingly."
+}
diff --git a/media-sound/mikmod/mikmod-3.2.5.ebuild b/media-sound/mikmod/mikmod-3.2.5.ebuild
index 23f01ae78a5f..db0007459c83 100644
--- a/media-sound/mikmod/mikmod-3.2.5.ebuild
+++ b/media-sound/mikmod/mikmod-3.2.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/media-sound/mikmod/mikmod-3.2.5.ebuild,v 1.1 2014/01/11 14:30:04 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mikmod/mikmod-3.2.5.ebuild,v 1.3 2014/02/18 11:07:39 jer Exp $
 
 EAPI=5
 
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index b8ecc0483956..c0a97215488f 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Tue, 18 Feb 2014 09:37:00 +0000
+Wed, 19 Feb 2014 11:07:03 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 2ac0027198a9..c0a97215488f 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Tue, 18 Feb 2014 09:37:01 +0000
+Wed, 19 Feb 2014 11:07:03 +0000
diff --git a/metadata/md5-cache/app-crypt/p11-kit-0.20.2 b/metadata/md5-cache/app-crypt/p11-kit-0.20.2
index 75fe1a74c4ba..b54f8671236c 100644
--- a/metadata/md5-cache/app-crypt/p11-kit-0.20.2
+++ b/metadata/md5-cache/app-crypt/p11-kit-0.20.2
@@ -4,11 +4,11 @@ DESCRIPTION=Provides a standard configuration setup for installing PKCS#11.
 EAPI=5
 HOMEPAGE=http://p11-glue.freedesktop.org/p11-kit.html
 IUSE=+asn1 debug +trust
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=asn1? ( >=dev-libs/libtasn1-2.14 )
 REQUIRED_USE=trust? ( asn1 )
 SLOT=0
 SRC_URI=http://p11-glue.freedesktop.org/releases/p11-kit-0.20.2.tar.gz
 _eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=ec7b69d6f734e827bcbb422f12c94da6
+_md5_=944043b9bd2bab03fc8cc57bce0249c4
diff --git a/metadata/md5-cache/app-emacs/apel-10.8-r1 b/metadata/md5-cache/app-emacs/apel-10.8-r1
index 231f4bf1fada..f44bc06b5c8b 100644
--- a/metadata/md5-cache/app-emacs/apel-10.8-r1
+++ b/metadata/md5-cache/app-emacs/apel-10.8-r1
@@ -3,10 +3,10 @@ DEPEND=>=virtual/emacs-21
 DESCRIPTION=A Portable Emacs Library is a library for making portable Emacs Lisp programs.
 EAPI=4
 HOMEPAGE=http://cvs.m17n.org/elisp/APEL/
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
+KEYWORDS=~alpha ~amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
 LICENSE=GPL-2
 RDEPEND=>=virtual/emacs-21
 SLOT=0
 SRC_URI=ftp://ftp.jpl.org/pub/elisp/apel/apel-10.8.tar.gz http://dev.gentoo.org/~gienah/2big4tree/app-emacs/apel/apel-10.8-030_Use-new-style-backquotes.patch.gz
 _eclasses_=elisp	ae11b438eee6c692e6c94c9a86999514	elisp-common	cec01e54df1bfd2fcca76a13ce2b2d27	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=faced1d3e5a48c971cc97631839c6fe4
+_md5_=521e2e99bfd12018808827f260c0a70b
diff --git a/metadata/md5-cache/app-emacs/color-theme-6.6.0-r1 b/metadata/md5-cache/app-emacs/color-theme-6.6.0-r1
index 966eaaf7a488..139a63f27d25 100644
--- a/metadata/md5-cache/app-emacs/color-theme-6.6.0-r1
+++ b/metadata/md5-cache/app-emacs/color-theme-6.6.0-r1
@@ -1,11 +1,12 @@
-DEFINED_PHASES=compile install postinst postrm setup unpack
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DEPEND=>=virtual/emacs-21
 DESCRIPTION=Install color themes (includes many themes and allows you to share your own with the world)
+EAPI=5
 HOMEPAGE=http://www.nongnu.org/color-theme/
 KEYWORDS=amd64 ppc sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos
-LICENSE=GPL-2
+LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-21
 SLOT=0
 SRC_URI=http://download.savannah.gnu.org/releases-noredirect/color-theme/color-theme-6.6.0.tar.gz
-_eclasses_=elisp	ae11b438eee6c692e6c94c9a86999514	elisp-common	cec01e54df1bfd2fcca76a13ce2b2d27	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=b34ff2ceaa6d3df935b7899686332ede
+_eclasses_=elisp	ae11b438eee6c692e6c94c9a86999514	elisp-common	cec01e54df1bfd2fcca76a13ce2b2d27	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	readme.gentoo	2466b2f6a77a9600954c6b99ebca6e02	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=f4a9ca306b625d9f8d094dd93e0aa644
diff --git a/metadata/md5-cache/app-emacs/dictionary-1.10 b/metadata/md5-cache/app-emacs/dictionary-1.10
new file mode 100644
index 000000000000..2875fb81053f
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/dictionary-1.10
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DEPEND=>=virtual/emacs-21
+DESCRIPTION=Emacs package for talking to a dictionary server
+EAPI=5
+HOMEPAGE=http://www.myrkr.in-berlin.de/dictionary/index.html
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2+
+RDEPEND=>=virtual/emacs-21
+SLOT=0
+SRC_URI=http://www.myrkr.in-berlin.de/dictionary/dictionary-1.10.tar.gz
+_eclasses_=elisp	ae11b438eee6c692e6c94c9a86999514	elisp-common	cec01e54df1bfd2fcca76a13ce2b2d27	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=03664ccd26a5ce132947956ef1d43e70
diff --git a/metadata/md5-cache/app-emacs/elscreen-1.4.6-r1 b/metadata/md5-cache/app-emacs/elscreen-1.4.6-r1
index 4a5a561a62ea..3bd0c5111952 100644
--- a/metadata/md5-cache/app-emacs/elscreen-1.4.6-r1
+++ b/metadata/md5-cache/app-emacs/elscreen-1.4.6-r1
@@ -3,10 +3,10 @@ DEPEND=>=app-emacs/apel-10.8-r1 >=virtual/emacs-21
 DESCRIPTION=Frame configuration management for GNU Emacs modelled after GNU Screen
 EAPI=4
 HOMEPAGE=http://www.morishima.net/~naoto/j/software/elscreen/
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=>=app-emacs/apel-10.8-r1 >=virtual/emacs-21
 SLOT=0
 SRC_URI=ftp://ftp.morishima.net/pub/morishima.net/naoto/ElScreen/elscreen-1.4.6.tar.gz
 _eclasses_=elisp	ae11b438eee6c692e6c94c9a86999514	elisp-common	cec01e54df1bfd2fcca76a13ce2b2d27	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=977c7992dab4da670bef3b16e9262b37
+_md5_=645395edfd82516881bba50b67ed94e4
diff --git a/metadata/md5-cache/app-emacs/emacs-wget-0.5.0-r1 b/metadata/md5-cache/app-emacs/emacs-wget-0.5.0-r1
new file mode 100644
index 000000000000..5458d14db507
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/emacs-wget-0.5.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DEPEND=>=virtual/emacs-21
+DESCRIPTION=Wget interface for Emacs
+EAPI=5
+HOMEPAGE=http://www.emacswiki.org/emacs/EmacsWget
+IUSE=linguas_ja
+KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=net-misc/wget-1.8.2 >=virtual/emacs-21
+SLOT=0
+SRC_URI=http://pop-club.hp.infoseek.co.jp/emacs/emacs-wget/emacs-wget-0.5.0.tar.gz
+_eclasses_=elisp	ae11b438eee6c692e6c94c9a86999514	elisp-common	cec01e54df1bfd2fcca76a13ce2b2d27	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=b779eea098733ecaf317dc65af468f19
diff --git a/metadata/md5-cache/app-emacs/limit-1.14.10_pre200811252332 b/metadata/md5-cache/app-emacs/limit-1.14.10_pre200811252332
index a1f3b27bb17c..8d5db1509e96 100644
--- a/metadata/md5-cache/app-emacs/limit-1.14.10_pre200811252332
+++ b/metadata/md5-cache/app-emacs/limit-1.14.10_pre200811252332
@@ -1,11 +1,12 @@
-DEFINED_PHASES=compile install postinst postrm setup unpack
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DEPEND=>=app-emacs/apel-10.3 >=virtual/emacs-21
 DESCRIPTION=Library about Internet Message, for IT generation
-HOMEPAGE=http://cvs.m17n.org/elisp/FLIM/
+EAPI=5
+HOMEPAGE=http://git.chise.org/elisp/flim/
 KEYWORDS=alpha amd64 ppc sparc x86
-LICENSE=GPL-2
+LICENSE=GPL-2+
 RDEPEND=>=app-emacs/apel-10.3 !app-emacs/flim >=virtual/emacs-21
 SLOT=0
 SRC_URI=http://www.jpl.org/ftp/pub/m17n/limit-1_14-200811252332.tar.gz
-_eclasses_=elisp	ae11b438eee6c692e6c94c9a86999514	elisp-common	cec01e54df1bfd2fcca76a13ce2b2d27	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=0c54cfaf1ad27a3d5b3e91b1f2c53b6c
+_eclasses_=elisp	ae11b438eee6c692e6c94c9a86999514	elisp-common	cec01e54df1bfd2fcca76a13ce2b2d27	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=b07799cc0c3d76e0e8a76e296e75688d
diff --git a/metadata/md5-cache/app-emacs/paredit-23 b/metadata/md5-cache/app-emacs/paredit-23-r1
similarity index 94%
rename from metadata/md5-cache/app-emacs/paredit-23
rename to metadata/md5-cache/app-emacs/paredit-23-r1
index a2de9d53d7b4..2ffa9854838e 100644
--- a/metadata/md5-cache/app-emacs/paredit-23
+++ b/metadata/md5-cache/app-emacs/paredit-23-r1
@@ -9,4 +9,4 @@ RDEPEND=>=virtual/emacs-21
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~ulm/distfiles/paredit-23.tar.xz
 _eclasses_=elisp	ae11b438eee6c692e6c94c9a86999514	elisp-common	cec01e54df1bfd2fcca76a13ce2b2d27	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=1373109ef2b66592116481db39e0807f
+_md5_=88671d80d42e340d596bcd5bb07bf663
diff --git a/metadata/md5-cache/app-emacs/qwerty-1.1 b/metadata/md5-cache/app-emacs/qwerty-1.1
index f1f37d067086..b49aa8806079 100644
--- a/metadata/md5-cache/app-emacs/qwerty-1.1
+++ b/metadata/md5-cache/app-emacs/qwerty-1.1
@@ -1,11 +1,12 @@
-DEFINED_PHASES=compile install postinst postrm setup unpack
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DEPEND=>=virtual/emacs-21
 DESCRIPTION=Switch between QWERTY and DVORAK without changing the console keymap
+EAPI=5
 HOMEPAGE=http://groups.google.com/group/gnu.emacs.sources/msg/eab31c752dfdd3a5
 KEYWORDS=amd64 ppc x86
-LICENSE=GPL-1
+LICENSE=GPL-1+
 RDEPEND=>=virtual/emacs-21
 SLOT=0
 SRC_URI=mirror://gentoo/qwerty-1.1.tar.gz
 _eclasses_=elisp	ae11b438eee6c692e6c94c9a86999514	elisp-common	cec01e54df1bfd2fcca76a13ce2b2d27	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=00f28ee0425b63a4859cd065c72be80d
+_md5_=dff331d2326d5330fe521fa6d7ef2c26
diff --git a/metadata/md5-cache/app-emacs/wanderlust-2.15.9_pre20101102 b/metadata/md5-cache/app-emacs/wanderlust-2.15.9_p20130619
similarity index 65%
rename from metadata/md5-cache/app-emacs/wanderlust-2.15.9_pre20101102
rename to metadata/md5-cache/app-emacs/wanderlust-2.15.9_p20130619
index a7634a89b4fd..9908f9b51ad4 100644
--- a/metadata/md5-cache/app-emacs/wanderlust-2.15.9_pre20101102
+++ b/metadata/md5-cache/app-emacs/wanderlust-2.15.9_p20130619
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DEPEND=>=app-emacs/apel-10.6 virtual/emacs-flim app-emacs/semi bbdb? ( app-emacs/bbdb ) >=virtual/emacs-21
 DESCRIPTION=Yet Another Message Interface on Emacsen
-EAPI=3
-HOMEPAGE=http://www.gohome.org/wl/
+EAPI=5
+HOMEPAGE=https://github.com/wanderlust/wanderlust http://emacswiki.org/emacs/WanderLust
 IUSE=bbdb ssl linguas_ja
 KEYWORDS=~alpha ~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=GPL-2+
-RDEPEND=!app-emacs/wanderlust-cvs >=app-emacs/apel-10.6 virtual/emacs-flim app-emacs/semi bbdb? ( app-emacs/bbdb ) >=virtual/emacs-21
+RDEPEND=>=app-emacs/apel-10.6 virtual/emacs-flim app-emacs/semi bbdb? ( app-emacs/bbdb ) >=virtual/emacs-21
 SLOT=0
-SRC_URI=mirror://gentoo/wanderlust-2.15.9_pre20101102.tar.bz2
+SRC_URI=http://dev.gentoo.org/~ulm/distfiles/wanderlust-2.15.9_p20130619.tar.xz
 _eclasses_=elisp	ae11b438eee6c692e6c94c9a86999514	elisp-common	cec01e54df1bfd2fcca76a13ce2b2d27	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=1cc4790750f0501edfcb8a9acf2bab9c
+_md5_=45ffabeee49edda129c2ceb5ef7f440e
diff --git a/metadata/md5-cache/app-emulation/xen-4.2.4 b/metadata/md5-cache/app-emulation/xen-4.2.4
new file mode 100644
index 000000000000..8d7047936626
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/xen-4.2.4
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm setup
+DEPEND=|| ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-2.6.8-r3:2.6 ) efi? ( >=sys-devel/binutils-2.22[multitarget] ) !efi? ( >=sys-devel/binutils-2.22[-multitarget] )
+DESCRIPTION=The Xen virtual machine monitor
+EAPI=5
+HOMEPAGE=http://xen.org/
+IUSE=custom-cflags debug efi flask pae xsm
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+PDEPEND=~app-emulation/xen-tools-4.2.4
+REQUIRED_USE=flask? ( xsm )
+RESTRICT=test
+SLOT=0
+SRC_URI=http://bits.xensource.com/oss-xen/release/4.2.4/xen-4.2.4.tar.gz
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	mount-boot	02dd3bb4c5f025fef0fc3ade0f27c217	multilib	fac675dcccf94392371a6abee62d909f	python-any-r1	08d3455b23110d650f173ab0a090818b	python-utils-r1	ceb3e4c3ba203e28bb02eeb182d88acf	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=bda8c092fb254625c69848865748b449
diff --git a/metadata/md5-cache/app-emulation/xen-4.3.2 b/metadata/md5-cache/app-emulation/xen-4.3.2
new file mode 100644
index 000000000000..2b9d9af384aa
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/xen-4.3.2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm setup
+DEPEND=|| ( >=dev-lang/python-2.7.5-r2:2.7 ) efi? ( >=sys-devel/binutils-2.22[multitarget] ) !efi? ( >=sys-devel/binutils-2.22[-multitarget] )
+DESCRIPTION=The Xen virtual machine monitor
+EAPI=5
+HOMEPAGE=http://xen.org/
+IUSE=custom-cflags debug efi flask xsm
+KEYWORDS=~amd64 -x86
+LICENSE=GPL-2
+PDEPEND=~app-emulation/xen-tools-4.3.2
+REQUIRED_USE=flask? ( xsm )
+RESTRICT=test
+SLOT=0
+SRC_URI=http://bits.xensource.com/oss-xen/release/4.3.2/xen-4.3.2.tar.gz
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	mount-boot	02dd3bb4c5f025fef0fc3ade0f27c217	multilib	fac675dcccf94392371a6abee62d909f	python-any-r1	08d3455b23110d650f173ab0a090818b	python-utils-r1	ceb3e4c3ba203e28bb02eeb182d88acf	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=aab476f6be1556e31636b6798455e282
diff --git a/metadata/md5-cache/app-emulation/xen-pvgrub-4.2.4 b/metadata/md5-cache/app-emulation/xen-pvgrub-4.2.4
new file mode 100644
index 000000000000..e77daf27baf8
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/xen-pvgrub-4.2.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst prepare setup
+DEPEND=sys-devel/gettext
+DESCRIPTION=allows to boot Xen domU kernels from a menu.lst laying inside guest filesystem
+EAPI=5
+HOMEPAGE=http://xen.org/
+IUSE=custom-cflags python_targets_python2_6 python_targets_python2_7 python_single_target_python2_6 python_single_target_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=app-emulation/xen-4.2.1
+REQUIRED_USE=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://bits.xensource.com/oss-xen/release/4.2.4/xen-4.2.4.tar.gz mirror://gnu-alpha/grub/grub-0.97.tar.gz http://xenbits.xensource.com/xen-extfiles/zlib-1.2.3.tar.gz ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/pciutils-2.2.9.tar.bz2 http://xenbits.xensource.com/xen-extfiles/lwip-1.3.0.tar.gz http://xenbits.xensource.com/xen-extfiles/newlib/newlib-1.16.0.tar.gz
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	multilib	fac675dcccf94392371a6abee62d909f	python-single-r1	82a55861314bbcedaf1e08ed4dd651b3	python-utils-r1	ceb3e4c3ba203e28bb02eeb182d88acf	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=e8dd4f0c653bbcbdd1b5ef8a016437ed
diff --git a/metadata/md5-cache/app-emulation/xen-pvgrub-4.3.2 b/metadata/md5-cache/app-emulation/xen-pvgrub-4.3.2
new file mode 100644
index 000000000000..1ecb867633f9
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/xen-pvgrub-4.3.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst prepare setup
+DEPEND=sys-devel/gettext sys-apps/texinfo
+DESCRIPTION=allows to boot Xen domU kernels from a menu.lst laying inside guest filesystem
+EAPI=5
+HOMEPAGE=http://xen.org/
+IUSE=custom-cflags python_targets_python2_6 python_targets_python2_7 python_single_target_python2_6 python_single_target_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=app-emulation/xen-4.2.1
+REQUIRED_USE=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://bits.xensource.com/oss-xen/release/4.3.2/xen-4.3.2.tar.gz mirror://gnu-alpha/grub/grub-0.97.tar.gz http://xenbits.xensource.com/xen-extfiles/zlib-1.2.3.tar.gz ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/pciutils-2.2.9.tar.bz2 http://xenbits.xensource.com/xen-extfiles/lwip-1.3.0.tar.gz http://xenbits.xensource.com/xen-extfiles/newlib/newlib-1.16.0.tar.gz http://xenbits.xensource.com/xen-extfiles/polarssl-1.1.4-gpl.tgz
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	multilib	fac675dcccf94392371a6abee62d909f	python-single-r1	82a55861314bbcedaf1e08ed4dd651b3	python-utils-r1	ceb3e4c3ba203e28bb02eeb182d88acf	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=75d10c90581017e4bad4575f33d7630d
diff --git a/metadata/md5-cache/app-emulation/xen-tools-4.2.3-r1 b/metadata/md5-cache/app-emulation/xen-tools-4.2.3-r1
new file mode 100644
index 000000000000..e24c01e7d224
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/xen-tools-4.2.3-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst prepare setup
+DEPEND=dev-libs/lzo:2 dev-libs/glib:2 dev-libs/yajl dev-libs/libgcrypt dev-python/lxml[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] dev-python/pypam[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] sys-libs/zlib sys-power/iasl sys-firmware/seabios sys-firmware/ipxe dev-ml/findlib hvm? ( media-libs/libsdl ) python_single_target_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6[xml,threads] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml,threads] ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] api? ( dev-libs/libxml2 net-misc/curl ) python_single_target_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6[xml,threads] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml,threads] ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] pygrub? ( python_single_target_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6[ncurses] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses] ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) sys-devel/bin86 sys-devel/dev86 dev-lang/perl app-misc/pax-utils doc? ( app-doc/doxygen dev-tex/latex2html[png,gif] media-gfx/transfig media-gfx/graphviz dev-tex/xcolor dev-texlive/texlive-latexextra virtual/latex-base dev-tex/latexmk dev-texlive/texlive-latex dev-texlive/texlive-pictures dev-texlive/texlive-latexrecommended ) hvm? ( x11-proto/xproto !net-libs/libiscsi ) virtual/pkgconfig
+DESCRIPTION=Xend daemon and tools
+EAPI=5
+HOMEPAGE=http://xen.org/
+IUSE=api custom-cflags debug doc flask hvm qemu ocaml pygrub screen static-libs xend python_targets_python2_6 python_targets_python2_7 python_single_target_python2_6 python_single_target_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=sys-apps/iproute2 net-misc/bridge-utils ocaml? ( >=dev-lang/ocaml-4 ) screen? ( app-misc/screen app-admin/logrotate ) virtual/udev
+REQUIRED_USE=hvm? ( qemu ) 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=http://bits.xensource.com/oss-xen/release/4.2.3/xen-4.2.3.tar.gz http://dev.gentoo.org/~dlan/distfiles/xen-4.2.3-upstream-patches-0.tar.xz
+_eclasses_=bash-completion-r1	db412e427e3317ffd3e15f17df269c5e	eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	multilib	fac675dcccf94392371a6abee62d909f	python-single-r1	82a55861314bbcedaf1e08ed4dd651b3	python-utils-r1	ceb3e4c3ba203e28bb02eeb182d88acf	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	udev	a9a8d051efb42bfe884c1db82ce161de
+_md5_=b73eab47fbe8716677bb4fcc1b8f25d7
diff --git a/metadata/md5-cache/app-emulation/xen-tools-4.2.4 b/metadata/md5-cache/app-emulation/xen-tools-4.2.4
new file mode 100644
index 000000000000..ec335dc99912
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/xen-tools-4.2.4
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst prepare setup
+DEPEND=dev-libs/lzo:2 dev-libs/glib:2 dev-libs/yajl dev-libs/libgcrypt dev-python/lxml[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] dev-python/pypam[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] sys-libs/zlib sys-power/iasl sys-firmware/seabios sys-firmware/ipxe dev-ml/findlib hvm? ( media-libs/libsdl ) python_single_target_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6[xml,threads] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml,threads] ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] api? ( dev-libs/libxml2 net-misc/curl ) python_single_target_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6[xml,threads] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml,threads] ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] pygrub? ( python_single_target_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6[ncurses] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses] ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) sys-devel/bin86 sys-devel/dev86 dev-lang/perl app-misc/pax-utils doc? ( app-doc/doxygen dev-tex/latex2html[png,gif] media-gfx/transfig media-gfx/graphviz dev-tex/xcolor dev-texlive/texlive-latexextra virtual/latex-base dev-tex/latexmk dev-texlive/texlive-latex dev-texlive/texlive-pictures dev-texlive/texlive-latexrecommended ) hvm? ( x11-proto/xproto !net-libs/libiscsi ) virtual/pkgconfig
+DESCRIPTION=Xend daemon and tools
+EAPI=5
+HOMEPAGE=http://xen.org/
+IUSE=api custom-cflags debug doc flask hvm qemu ocaml pygrub screen static-libs xend python_targets_python2_6 python_targets_python2_7 python_single_target_python2_6 python_single_target_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=sys-apps/iproute2 net-misc/bridge-utils ocaml? ( >=dev-lang/ocaml-4 ) screen? ( app-misc/screen app-admin/logrotate ) virtual/udev
+REQUIRED_USE=hvm? ( qemu ) 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=http://bits.xensource.com/oss-xen/release/4.2.4/xen-4.2.4.tar.gz
+_eclasses_=bash-completion-r1	db412e427e3317ffd3e15f17df269c5e	eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	multilib	fac675dcccf94392371a6abee62d909f	python-single-r1	82a55861314bbcedaf1e08ed4dd651b3	python-utils-r1	ceb3e4c3ba203e28bb02eeb182d88acf	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	udev	a9a8d051efb42bfe884c1db82ce161de
+_md5_=30dff661e2eb9a24b1a966aaebf54f51
diff --git a/metadata/md5-cache/app-emulation/xen-tools-4.3.1-r3 b/metadata/md5-cache/app-emulation/xen-tools-4.3.1-r3
deleted file mode 100644
index 7c7903b769f5..000000000000
--- a/metadata/md5-cache/app-emulation/xen-tools-4.3.1-r3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=dev-libs/lzo:2 dev-libs/yajl dev-libs/libgcrypt dev-python/lxml[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] pam? ( dev-python/pypam[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) sys-libs/zlib sys-power/iasl hvm? ( media-libs/libsdl ) python_single_target_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6[xml,threads] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml,threads] ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] api? ( dev-libs/libxml2 net-misc/curl ) pygrub? ( python_single_target_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6[ncurses] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses] ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) sys-devel/bin86 sys-devel/dev86 dev-lang/perl app-misc/pax-utils dev-python/markdown doc? ( app-doc/doxygen dev-tex/latex2html[png,gif] media-gfx/graphviz dev-tex/xcolor media-gfx/transfig dev-texlive/texlive-latexextra virtual/latex-base dev-tex/latexmk dev-texlive/texlive-latex dev-texlive/texlive-pictures dev-texlive/texlive-latexrecommended ) hvm? ( x11-proto/xproto !net-libs/libiscsi ) qemu? ( x11-libs/pixman ) ocaml? ( dev-ml/findlib >=dev-lang/ocaml-4 ) virtual/pkgconfig
-DESCRIPTION=Xend daemon and tools
-EAPI=5
-HOMEPAGE=http://xen.org/
-IUSE=api custom-cflags debug doc flask hvm qemu ocaml +pam python pygrub screen static-libs xend python_targets_python2_6 python_targets_python2_7 python_single_target_python2_6 python_single_target_python2_7
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=sys-apps/iproute2 net-misc/bridge-utils screen? ( app-misc/screen app-admin/logrotate ) virtual/udev
-REQUIRED_USE=hvm? ( qemu ) 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 ) pygrub? ( python )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://bits.xensource.com/oss-xen/release/4.3.1/xen-4.3.1.tar.gz http://dev.gentoo.org/~idella4/tarballs/ipxe.tar.gz http://dev.gentoo.org/~idella4/tarballs/seabios-dir-remote-20130720.tar.gz
-_eclasses_=bash-completion-r1	db412e427e3317ffd3e15f17df269c5e	eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	multilib	fac675dcccf94392371a6abee62d909f	python-single-r1	82a55861314bbcedaf1e08ed4dd651b3	python-utils-r1	ceb3e4c3ba203e28bb02eeb182d88acf	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	udev	a9a8d051efb42bfe884c1db82ce161de
-_md5_=2ac70368f04ea8aaf6b795184edabaa2
diff --git a/metadata/md5-cache/app-emulation/xen-tools-4.3.1-r5 b/metadata/md5-cache/app-emulation/xen-tools-4.3.1-r5
index 55db296d7d24..352ae4f55a3a 100644
--- a/metadata/md5-cache/app-emulation/xen-tools-4.3.1-r5
+++ b/metadata/md5-cache/app-emulation/xen-tools-4.3.1-r5
@@ -4,7 +4,7 @@ DESCRIPTION=Xend daemon and tools
 EAPI=5
 HOMEPAGE=http://xen.org/
 IUSE=api custom-cflags debug doc flask hvm qemu ocaml +pam python pygrub screen static-libs xend python_targets_python2_6 python_targets_python2_7 python_single_target_python2_6 python_single_target_python2_7
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 -x86
 LICENSE=GPL-2
 RDEPEND=sys-apps/iproute2 net-misc/bridge-utils screen? ( app-misc/screen app-admin/logrotate ) virtual/udev
 REQUIRED_USE=hvm? ( qemu ) 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 ) pygrub? ( python )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://bits.xensource.com/oss-xen/release/4.3.1/xen-4.3.1.tar.gz http://dev.gentoo.org/~idella4/tarballs/ipxe.tar.gz http://dev.gentoo.org/~idella4/tarballs/seabios-dir-remote-20130720.tar.gz
 _eclasses_=bash-completion-r1	db412e427e3317ffd3e15f17df269c5e	eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	multilib	fac675dcccf94392371a6abee62d909f	python-single-r1	82a55861314bbcedaf1e08ed4dd651b3	python-utils-r1	ceb3e4c3ba203e28bb02eeb182d88acf	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	udev	a9a8d051efb42bfe884c1db82ce161de
-_md5_=0a43975be605dfd34b7858910a611d0d
+_md5_=191333ce8567029cbd96cfc7deec53ce
diff --git a/metadata/md5-cache/app-emulation/xen-tools-4.3.1-r6 b/metadata/md5-cache/app-emulation/xen-tools-4.3.1-r6
new file mode 100644
index 000000000000..8b6c47f74307
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/xen-tools-4.3.1-r6
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=dev-libs/lzo:2 dev-libs/glib:2 dev-libs/yajl dev-libs/libgcrypt dev-python/lxml[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] pam? ( dev-python/pypam[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) sys-libs/zlib sys-power/iasl sys-firmware/seabios sys-firmware/ipxe hvm? ( media-libs/libsdl ) python_single_target_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6[xml,threads] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml,threads] ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] api? ( dev-libs/libxml2 net-misc/curl ) pygrub? ( python_single_target_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6[ncurses] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses] ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) sys-devel/bin86 sys-devel/dev86 dev-lang/perl app-misc/pax-utils dev-python/markdown doc? ( app-doc/doxygen dev-tex/latex2html[png,gif] media-gfx/graphviz dev-tex/xcolor media-gfx/transfig dev-texlive/texlive-latexextra virtual/latex-base dev-tex/latexmk dev-texlive/texlive-latex dev-texlive/texlive-pictures dev-texlive/texlive-latexrecommended ) hvm? ( x11-proto/xproto !net-libs/libiscsi ) qemu? ( x11-libs/pixman ) ocaml? ( dev-ml/findlib >=dev-lang/ocaml-4 ) virtual/pkgconfig
+DESCRIPTION=Xend daemon and tools
+EAPI=5
+HOMEPAGE=http://xen.org/
+IUSE=api custom-cflags debug doc flask hvm qemu ocaml +pam python pygrub screen static-libs xend python_targets_python2_6 python_targets_python2_7 python_single_target_python2_6 python_single_target_python2_7
+KEYWORDS=~amd64 -x86
+LICENSE=GPL-2
+RDEPEND=sys-apps/iproute2 net-misc/bridge-utils screen? ( app-misc/screen app-admin/logrotate ) virtual/udev
+REQUIRED_USE=hvm? ( qemu ) 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 ) pygrub? ( python )
+RESTRICT=test
+SLOT=0
+SRC_URI=http://bits.xensource.com/oss-xen/release/4.3.1/xen-4.3.1.tar.gz
+_eclasses_=bash-completion-r1	db412e427e3317ffd3e15f17df269c5e	eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	multilib	fac675dcccf94392371a6abee62d909f	python-single-r1	82a55861314bbcedaf1e08ed4dd651b3	python-utils-r1	ceb3e4c3ba203e28bb02eeb182d88acf	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	udev	a9a8d051efb42bfe884c1db82ce161de
+_md5_=3bcb47ecb56a56d8e8a17a9aac55fec5
diff --git a/metadata/md5-cache/app-emulation/xen-tools-4.3.2 b/metadata/md5-cache/app-emulation/xen-tools-4.3.2
new file mode 100644
index 000000000000..8c799015d49a
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/xen-tools-4.3.2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=dev-libs/lzo:2 dev-libs/glib:2 dev-libs/yajl dev-libs/libgcrypt dev-python/lxml[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] pam? ( dev-python/pypam[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) sys-libs/zlib sys-power/iasl sys-firmware/seabios sys-firmware/ipxe hvm? ( media-libs/libsdl ) python_single_target_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6[xml,threads] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml,threads] ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] api? ( dev-libs/libxml2 net-misc/curl ) pygrub? ( python_single_target_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6[ncurses] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses] ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) sys-devel/bin86 sys-devel/dev86 dev-lang/perl app-misc/pax-utils dev-python/markdown doc? ( app-doc/doxygen dev-tex/latex2html[png,gif] media-gfx/graphviz dev-tex/xcolor media-gfx/transfig dev-texlive/texlive-latexextra virtual/latex-base dev-tex/latexmk dev-texlive/texlive-latex dev-texlive/texlive-pictures dev-texlive/texlive-latexrecommended ) hvm? ( x11-proto/xproto !net-libs/libiscsi ) qemu? ( x11-libs/pixman ) ocaml? ( dev-ml/findlib >=dev-lang/ocaml-4 ) virtual/pkgconfig
+DESCRIPTION=Xend daemon and tools
+EAPI=5
+HOMEPAGE=http://xen.org/
+IUSE=api custom-cflags debug doc flask hvm qemu ocaml +pam python pygrub screen static-libs xend python_targets_python2_6 python_targets_python2_7 python_single_target_python2_6 python_single_target_python2_7
+KEYWORDS=~amd64 -x86
+LICENSE=GPL-2
+RDEPEND=sys-apps/iproute2 net-misc/bridge-utils screen? ( app-misc/screen app-admin/logrotate ) virtual/udev
+REQUIRED_USE=hvm? ( qemu ) 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 ) pygrub? ( python )
+RESTRICT=test
+SLOT=0
+SRC_URI=http://bits.xensource.com/oss-xen/release/4.3.2/xen-4.3.2.tar.gz
+_eclasses_=bash-completion-r1	db412e427e3317ffd3e15f17df269c5e	eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	multilib	fac675dcccf94392371a6abee62d909f	python-single-r1	82a55861314bbcedaf1e08ed4dd651b3	python-utils-r1	ceb3e4c3ba203e28bb02eeb182d88acf	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	udev	a9a8d051efb42bfe884c1db82ce161de
+_md5_=4b01f9e53663f41e6c385da50e59a663
diff --git a/metadata/md5-cache/app-forensics/lynis-1.4.0 b/metadata/md5-cache/app-forensics/lynis-1.4.0
deleted file mode 100644
index 645e21fb380d..000000000000
--- a/metadata/md5-cache/app-forensics/lynis-1.4.0
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install postinst
-DESCRIPTION=Security and system auditing tool
-EAPI=5
-HOMEPAGE=http://www.rootkit.nl/projects/lynis.html
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=app-shells/bash
-SLOT=0
-SRC_URI=http://cisofy.com/files/lynis-1.4.0.tar.gz
-_md5_=fc9c94ae1e3c9afbbc0d7ca9cb34de0d
diff --git a/metadata/md5-cache/app-forensics/lynis-1.3.9 b/metadata/md5-cache/app-forensics/lynis-1.4.1
similarity index 69%
rename from metadata/md5-cache/app-forensics/lynis-1.3.9
rename to metadata/md5-cache/app-forensics/lynis-1.4.1
index c489dce9479c..84bb0a9fd6f0 100644
--- a/metadata/md5-cache/app-forensics/lynis-1.3.9
+++ b/metadata/md5-cache/app-forensics/lynis-1.4.1
@@ -6,5 +6,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=app-shells/bash
 SLOT=0
-SRC_URI=http://cisofy.com/files/lynis-1.3.9.tar.gz
-_md5_=ac900a59b11d20998de6f69c623f820a
+SRC_URI=http://cisofy.com/files/lynis-1.4.1.tar.gz
+_md5_=0414bf6b2eb3180bb108b5513beac395
diff --git a/metadata/md5-cache/app-misc/byobu-5.73 b/metadata/md5-cache/app-misc/byobu-5.73
new file mode 100644
index 000000000000..6f409da4b861
--- /dev/null
+++ b/metadata/md5-cache/app-misc/byobu-5.73
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install prepare setup
+DESCRIPTION=A set of profiles for the GNU Screen console window manager (app-misc/screen)
+EAPI=5
+HOMEPAGE=http://byobu.co
+IUSE=screen 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_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-libs/newt[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] screen? ( app-misc/screen ) !screen? ( app-misc/tmux )
+REQUIRED_USE=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://launchpad.net/byobu/trunk/5.73/+download/byobu_5.73.orig.tar.gz
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	python-single-r1	82a55861314bbcedaf1e08ed4dd651b3	python-utils-r1	ceb3e4c3ba203e28bb02eeb182d88acf	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=1dad84b1cee64eebd47a25a666e003be
diff --git a/metadata/md5-cache/app-misc/ca-certificates-20130906 b/metadata/md5-cache/app-misc/ca-certificates-20130906
index fe77a7e7a3e2..64ceff68b012 100644
--- a/metadata/md5-cache/app-misc/ca-certificates-20130906
+++ b/metadata/md5-cache/app-misc/ca-certificates-20130906
@@ -3,10 +3,10 @@ DEPEND=kernel_AIX? ( app-arch/deb2targz ) !<sys-apps/portage-2.1.10.41
 DESCRIPTION=Common CA Certificates PEM files
 EAPI=4
 HOMEPAGE=http://packages.debian.org/sid/ca-certificates
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=MPL-1.1
 RDEPEND=kernel_AIX? ( app-arch/deb2targz ) !<sys-apps/portage-2.1.10.41 dev-libs/openssl sys-apps/debianutils
 SLOT=0
 SRC_URI=mirror://debian/pool/main/c/ca-certificates/ca-certificates_20130906_all.deb
 _eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	unpacker	738214fbf4fe7254493d5fc8a248262a
-_md5_=e4c146e41e263a24415239fb2f2d7b4b
+_md5_=1f7840a354d1c66ab14f6e55d7dbc5eb
diff --git a/metadata/md5-cache/app-misc/freemind-1.0.0 b/metadata/md5-cache/app-misc/freemind-1.0.0-r1
similarity index 97%
rename from metadata/md5-cache/app-misc/freemind-1.0.0
rename to metadata/md5-cache/app-misc/freemind-1.0.0-r1
index 5ba6140f6743..705b6fd11076 100644
--- a/metadata/md5-cache/app-misc/freemind-1.0.0
+++ b/metadata/md5-cache/app-misc/freemind-1.0.0-r1
@@ -10,4 +10,4 @@ RDEPEND=dev-java/javahelp:0 dev-java/jgoodies-forms:0 dev-java/jibx:0 dev-java/j
 SLOT=0
 SRC_URI=mirror://sourceforge/freemind/freemind-src-1.0.0.tar.gz
 _eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	java-ant-2	8f79fa38524086d2b7d4e9cd442ca6cc	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	8d0d93b7a8605ea346cce4604f6db516	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=99398fda8ad57ad1299338d71205cf8b
+_md5_=ce6a54328046637aaf6076332033dae8
diff --git a/metadata/md5-cache/app-misc/mediacrush-cli-9999 b/metadata/md5-cache/app-misc/mediacrush-cli-9999
index e338e2ce5c54..b085e16d7b86 100644
--- a/metadata/md5-cache/app-misc/mediacrush-cli-9999
+++ b/metadata/md5-cache/app-misc/mediacrush-cli-9999
@@ -4,7 +4,7 @@ DESCRIPTION=A bash script for working with MediaCrush from a shell
 EAPI=5
 HOMEPAGE=https://github.com/MediaCrush/MediaCrush-cli
 LICENSE=MIT
-RDEPEND=app-editors/vim-core net-misc/curl sys-apps/file sys-apps/sed
+RDEPEND=net-misc/curl sys-apps/file sys-apps/sed
 SLOT=0
 _eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	git-r3	f089608c770d9ad72a2c92b547d2b20d	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=fd2331936660d2abfbd6b406842cffdb
+_md5_=1d9b116cf106aa0abc78a065a57714bc
diff --git a/metadata/md5-cache/app-office/odeskteam-3.10.5 b/metadata/md5-cache/app-office/odeskteam-3.10.5
new file mode 100644
index 000000000000..79d2afaf4dec
--- /dev/null
+++ b/metadata/md5-cache/app-office/odeskteam-3.10.5
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare unpack
+DEPEND=>=app-arch/rpm2targz-9.0.0.3g
+DESCRIPTION=Project collaboration and tracking software for oDesk.com
+EAPI=5
+HOMEPAGE=https://www.odesk.com/
+KEYWORDS=~amd64 ~x86
+LICENSE=ODESK
+RDEPEND=>=dev-libs/glib-2 app-arch/bzip2 dev-libs/libxml2 dev-qt/qtcore:4[ssl] dev-qt/qtdbus:4 dev-qt/qtdeclarative:4 dev-qt/qtgui:4 dev-qt/qtopengl:4 dev-qt/qtscript:4 dev-qt/qtsql:4 dev-qt/qtsvg:4 dev-qt/qtxmlpatterns:4 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXext x11-libs/libXi
+SLOT=0
+SRC_URI=amd64? ( https://www.odesk.com/downloads/linux/beta/odeskteam-3.10.5-1fc19.x86_64.rpm ) x86? ( https://www.odesk.com/downloads/linux/beta/odeskteam-3.10.5-1fc19.i386.rpm )
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	rpm	b94b54b44f14d6bee3e966c8f5c86fba	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=d1f7242d10a5f41efcfb28123a06806d
diff --git a/metadata/md5-cache/app-portage/gentoolkit-dev-0.2.8.3-r1 b/metadata/md5-cache/app-portage/gentoolkit-dev-0.2.8.3-r1
index 6ae14a091282..869d37768c87 100644
--- a/metadata/md5-cache/app-portage/gentoolkit-dev-0.2.8.3-r1
+++ b/metadata/md5-cache/app-portage/gentoolkit-dev-0.2.8.3-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Collection of developer scripts for Gentoo
 EAPI=5
 HOMEPAGE=http://www.gentoo.org/proj/en/portage/tools/index.xml
 IUSE=test python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6[xml] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2[xml] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[xml] ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] sys-apps/portage[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] dev-lang/perl sys-apps/diffutils
 REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 )
 SLOT=0
 SRC_URI=mirror://gentoo/gentoolkit-dev-0.2.8.3.tar.gz
 _eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	multibuild	56d4120419072116417e8de1bd1040ff	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	3bb814ab7959a36067101a6bef683b6f	python-utils-r1	ceb3e4c3ba203e28bb02eeb182d88acf	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=3cbd6b30fbad0f112a5252ebff0d6fb9
+_md5_=2366040dfcfdf3c74cdf1a5176f41d08
diff --git a/metadata/md5-cache/app-shells/dash-0.5.5.1.2 b/metadata/md5-cache/app-shells/dash-0.5.5.1.2
deleted file mode 100644
index 60ce27deb266..000000000000
--- a/metadata/md5-cache/app-shells/dash-0.5.5.1.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=libedit? ( dev-libs/libedit ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13 >=sys-devel/automake-1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
-DESCRIPTION=DASH is a direct descendant of the NetBSD version of ash (the Almquist SHell) and is POSIX compliant
-HOMEPAGE=http://gondor.apana.org.au/~herbert/dash/
-IUSE=libedit static
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86
-LICENSE=BSD
-RDEPEND=libedit? ( dev-libs/libedit )
-SLOT=0
-SRC_URI=http://gondor.apana.org.au/~herbert/dash/files/dash-0.5.5.1.tar.gz mirror://debian/pool/main/d/dash/dash_0.5.5.1-2.diff.gz
-_eclasses_=autotools	b0a4d5334d34abe7b6829eb87cf3c544	eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=ee06d7434ec67fd7d21bf0640b8092be
diff --git a/metadata/md5-cache/app-shells/dash-0.5.5.1.7 b/metadata/md5-cache/app-shells/dash-0.5.7.4
similarity index 82%
rename from metadata/md5-cache/app-shells/dash-0.5.5.1.7
rename to metadata/md5-cache/app-shells/dash-0.5.7.4
index 8e604b0799d4..6c14b55ef69f 100644
--- a/metadata/md5-cache/app-shells/dash-0.5.5.1.7
+++ b/metadata/md5-cache/app-shells/dash-0.5.7.4
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure install prepare
 DEPEND=!static? ( libedit? ( dev-libs/libedit ) ) virtual/pkgconfig libedit? ( static? ( dev-libs/libedit[static-libs] ) ) !<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=DASH is a direct descendant of the NetBSD version of ash (the Almquist SHell) and is POSIX compliant
-EAPI=2
+EAPI=4
 HOMEPAGE=http://gondor.apana.org.au/~herbert/dash/
 IUSE=libedit static
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=BSD
 RDEPEND=!static? ( libedit? ( dev-libs/libedit ) )
 SLOT=0
-SRC_URI=http://gondor.apana.org.au/~herbert/dash/files/dash-0.5.5.1.tar.gz mirror://debian/pool/main/d/dash/dash_0.5.5.1-7.diff.gz
+SRC_URI=http://gondor.apana.org.au/~herbert/dash/files/dash-0.5.7.tar.gz mirror://debian/pool/main/d/dash/dash_0.5.7-4.diff.gz
 _eclasses_=autotools	b0a4d5334d34abe7b6829eb87cf3c544	eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=f605c759411cbf3dd0e0e29311a03921
+_md5_=7d9c53fa18ac35ddb9017230bf47bdc4
diff --git a/metadata/md5-cache/app-text/jabref-2.10_beta3 b/metadata/md5-cache/app-text/jabref-2.10_beta3
new file mode 100644
index 000000000000..30b7d6ad16d6
--- /dev/null
+++ b/metadata/md5-cache/app-text/jabref-2.10_beta3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install preinst prepare setup
+DEPEND=>=virtual/jdk-1.6 dev-java/antlr:3 dev-java/fontbox:1.7 dev-java/jempbox:1.7 dev-java/log4j:0 dev-java/spin:0 >=dev-java/java-config-2.1.9-r1 >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4
+DESCRIPTION=Java GUI for managing BibTeX and other bibliographies
+EAPI=5
+HOMEPAGE=http://jabref.sourceforge.net/
+IUSE=doc elibc_FreeBSD elibc_FreeBSD elibc_FreeBSD
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=>=virtual/jre-1.6 dev-java/antlr:3 dev-java/fontbox:1.7 dev-java/jempbox:1.7 dev-java/log4j:0 dev-java/spin:0 >=dev-java/java-config-2.1.9-r1
+SLOT=0
+SRC_URI=mirror://sourceforge/jabref/JabRef-2.10b3-src.tar.bz2
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	java-ant-2	8f79fa38524086d2b7d4e9cd442ca6cc	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	8d0d93b7a8605ea346cce4604f6db516	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=1b16ff23ac7e054e35f779491f19a6cd
diff --git a/metadata/md5-cache/app-text/libpaper-1.1.24-r2 b/metadata/md5-cache/app-text/libpaper-1.1.24-r2
index 0d59868d86e3..c9fcf30c4cde 100644
--- a/metadata/md5-cache/app-text/libpaper-1.1.24-r2
+++ b/metadata/md5-cache/app-text/libpaper-1.1.24-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Library for handling paper characteristics
 EAPI=4
 HOMEPAGE=http://packages.debian.org/unstable/source/libpaper
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r10 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/libp/libpaper/libpaper_1.1.24.tar.gz
 _eclasses_=autotools	b0a4d5334d34abe7b6829eb87cf3c544	eutils	40081e8c7e7f7c4f9db349a1d6d52925	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multibuild	56d4120419072116417e8de1bd1040ff	multilib	fac675dcccf94392371a6abee62d909f	multilib-build	198e1c7095dbce1ca2848aed0f96bf60	multilib-minimal	a481090a413ba6970bd9643494ef982f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=1c7175e8f4b82913f72e9ca3de38e94d
+_md5_=b952bcfa580c507c56216b5cef553d5c
diff --git a/metadata/md5-cache/dev-cpp/ctemplate-1.0 b/metadata/md5-cache/dev-cpp/ctemplate-1.0
deleted file mode 100644
index d7525562a36e..000000000000
--- a/metadata/md5-cache/dev-cpp/ctemplate-1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup
-DEPEND=test? ( =dev-lang/python-2* )
-DESCRIPTION=A simple but powerful template language for C++
-EAPI=4
-HOMEPAGE=http://code.google.com/p/google-ctemplate/
-IUSE=doc emacs vim-syntax static-libs test
-KEYWORDS=amd64 arm ~ppc x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=vim-syntax? ( >=app-editors/vim-core-7 ) emacs? ( virtual/emacs )
-SLOT=0
-SRC_URI=http://google-ctemplate.googlecode.com/files/ctemplate-1.0.tar.gz
-_eclasses_=elisp-common	cec01e54df1bfd2fcca76a13ce2b2d27	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	python	be9965681d83c3980660a2660ac95e95	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=c169b8730521c80c2466008fb5631eae
diff --git a/metadata/md5-cache/dev-cpp/ctemplate-2.0 b/metadata/md5-cache/dev-cpp/ctemplate-2.0
deleted file mode 100644
index 3bc4c1428a29..000000000000
--- a/metadata/md5-cache/dev-cpp/ctemplate-2.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm setup
-DEPEND=test? ( =dev-lang/python-2* )
-DESCRIPTION=A simple but powerful template language for C++
-EAPI=4
-HOMEPAGE=http://code.google.com/p/ctemplate/
-IUSE=doc emacs vim-syntax static-libs test
-KEYWORDS=~amd64 ~arm ppc ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=vim-syntax? ( >=app-editors/vim-core-7 ) emacs? ( virtual/emacs )
-SLOT=0
-SRC_URI=http://ctemplate.googlecode.com/files/ctemplate-2.0.tar.gz
-_eclasses_=elisp-common	cec01e54df1bfd2fcca76a13ce2b2d27	multilib	fac675dcccf94392371a6abee62d909f	python	be9965681d83c3980660a2660ac95e95	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=53d069f098217aae759442c63b72f6e3
diff --git a/metadata/md5-cache/dev-cpp/ctemplate-2.2_p129 b/metadata/md5-cache/dev-cpp/ctemplate-2.2_p129
new file mode 100644
index 000000000000..c5ae8f7aa592
--- /dev/null
+++ b/metadata/md5-cache/dev-cpp/ctemplate-2.2_p129
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=test? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) ) !<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=A simple but powerful template language for C++
+EAPI=5
+HOMEPAGE=http://code.google.com/p/ctemplate/
+IUSE=doc emacs vim-syntax static-libs test
+KEYWORDS=~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=vim-syntax? ( >=app-editors/vim-core-7 ) emacs? ( virtual/emacs )
+RESTRICT=test
+SLOT=0
+SRC_URI=http://dev.gentoo.org/~pinkbyte/distfiles/snapshots/ctemplate-2.2_p129.tar.bz2
+_eclasses_=autotools	b0a4d5334d34abe7b6829eb87cf3c544	autotools-utils	559ed17194292ec42d68145dcca2fa32	elisp-common	cec01e54df1bfd2fcca76a13ce2b2d27	eutils	40081e8c7e7f7c4f9db349a1d6d52925	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-any-r1	08d3455b23110d650f173ab0a090818b	python-utils-r1	ceb3e4c3ba203e28bb02eeb182d88acf	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=03fa319c3dd87418f71c50d1210704fc
diff --git a/metadata/md5-cache/dev-java/jspeex-0.9.7 b/metadata/md5-cache/dev-java/jspeex-0.9.7-r1
similarity index 96%
rename from metadata/md5-cache/dev-java/jspeex-0.9.7
rename to metadata/md5-cache/dev-java/jspeex-0.9.7-r1
index 5ea5e00d8a5e..96c258bd7fdf 100644
--- a/metadata/md5-cache/dev-java/jspeex-0.9.7
+++ b/metadata/md5-cache/dev-java/jspeex-0.9.7-r1
@@ -10,4 +10,4 @@ RDEPEND=dev-java/ant-core:0 >=virtual/jre-1.4 >=dev-java/java-config-2.1.9-r1 so
 SLOT=0
 SRC_URI=mirror://sourceforge/jspeex/jspeex-0.9.7.zip
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	java-ant-2	8f79fa38524086d2b7d4e9cd442ca6cc	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	8d0d93b7a8605ea346cce4604f6db516	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=84b50b1ad07bb16c0d1c9ffe56f1c66b
+_md5_=4712da3790d2a26821c5faf967bf73de
diff --git a/metadata/md5-cache/dev-lang/mercury-13.05.2 b/metadata/md5-cache/dev-lang/mercury-13.05.2
new file mode 100644
index 000000000000..5869901725e3
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/mercury-13.05.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=!dev-libs/mpatrol !dev-util/mono-debugger readline? ( sys-libs/readline ) erlang? ( dev-lang/erlang ) java? ( >=virtual/jdk-1.5 ) !<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 java? ( >=dev-java/java-config-2.1.9-r1 )
+DESCRIPTION=Mercury is a modern general-purpose logic/functional programming language
+EAPI=2
+HOMEPAGE=http://www.mercurylang.org/index.html
+IUSE=debug emacs erlang examples java minimal readline threads elibc_FreeBSD java
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 LGPL-2
+RDEPEND=!dev-libs/mpatrol !dev-util/mono-debugger readline? ( sys-libs/readline ) erlang? ( dev-lang/erlang ) java? ( >=virtual/jdk-1.5 ) emacs? ( virtual/emacs ) java? ( >=dev-java/java-config-2.1.9-r1 )
+SLOT=0
+SRC_URI=http://dl.mercurylang.org/release/mercury-srcdist-13.05.2.tar.gz mirror://gentoo/mercury-13.05.2-gentoo-patchset-0.tar.gz
+_eclasses_=autotools	b0a4d5334d34abe7b6829eb87cf3c544	elisp-common	cec01e54df1bfd2fcca76a13ce2b2d27	eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8d0d93b7a8605ea346cce4604f6db516	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=9cc41e8f96dd3b5f8cc52d8f62d51e6d
diff --git a/metadata/md5-cache/dev-lang/mercury-extras-13.05.2 b/metadata/md5-cache/dev-lang/mercury-extras-13.05.2
new file mode 100644
index 000000000000..cc150676efa0
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/mercury-extras-13.05.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=~dev-lang/mercury-13.05.2 cairo? ( >=x11-libs/cairo-1.10.0 ) glut? ( media-libs/freeglut ) odbc? ( dev-db/unixODBC ) iodbc? ( !odbc? ( dev-db/libiodbc ) ) ncurses? ( sys-libs/ncurses ) opengl? ( virtual/opengl ) tcl? ( tk? ( dev-lang/tcl dev-lang/tk x11-libs/libX11 x11-libs/libXmu ) )
+DESCRIPTION=Additional libraries and tools that are not part of the Mercury standard library
+EAPI=2
+HOMEPAGE=http://www.mercurylang.org/index.html
+IUSE=X cairo examples glut iodbc ncurses odbc opengl ssl tcl tk xml
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 LGPL-2
+RDEPEND=~dev-lang/mercury-13.05.2 cairo? ( >=x11-libs/cairo-1.10.0 ) glut? ( media-libs/freeglut ) odbc? ( dev-db/unixODBC ) iodbc? ( !odbc? ( dev-db/libiodbc ) ) ncurses? ( sys-libs/ncurses ) opengl? ( virtual/opengl ) tcl? ( tk? ( dev-lang/tcl dev-lang/tk x11-libs/libX11 x11-libs/libXmu ) )
+SLOT=0
+SRC_URI=http://dl.mercurylang.org/release/mercury-srcdist-13.05.2.tar.gz mirror://gentoo/mercury-extras-13.05.2-gentoo-patchset-0.tar.gz
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=c1fdd07f078b6676b7ec3a5d5380aeee
diff --git a/metadata/md5-cache/dev-libs/cdk-5.0.20131107 b/metadata/md5-cache/dev-libs/cdk-5.0.20131107
index 29c072fa638f..fd6fe0b8c22e 100644
--- a/metadata/md5-cache/dev-libs/cdk-5.0.20131107
+++ b/metadata/md5-cache/dev-libs/cdk-5.0.20131107
@@ -4,10 +4,10 @@ DESCRIPTION=A library of curses widgets
 EAPI=5
 HOMEPAGE=http://dickey.his.com/cdk/cdk.html
 IUSE=examples static-libs unicode
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha ~amd64 hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=BSD
 RDEPEND=>=sys-libs/ncurses-5.2[unicode?]
 SLOT=0/5
 SRC_URI=ftp://invisible-island.net/cdk/cdk-5.0-20131107.tgz
 _eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=36b02752b3862f9b4ebc7b56c7245f95
+_md5_=4464a5d13e4493eb2697c670753d30fe
diff --git a/metadata/md5-cache/dev-libs/check-0.9.11 b/metadata/md5-cache/dev-libs/check-0.9.11
index 12f7bec1727c..58e7db448b43 100644
--- a/metadata/md5-cache/dev-libs/check-0.9.11
+++ b/metadata/md5-cache/dev-libs/check-0.9.11
@@ -4,10 +4,10 @@ DESCRIPTION=A unit test framework for C
 EAPI=4
 HOMEPAGE=http://sourceforge.net/projects/check/
 IUSE=static-libs subunit abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32
-KEYWORDS=alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1
 RDEPEND=subunit? ( dev-python/subunit )
 SLOT=0
 SRC_URI=mirror://sourceforge/check/check-0.9.11.tar.gz
 _eclasses_=autotools	b0a4d5334d34abe7b6829eb87cf3c544	autotools-multilib	5beadd9860130ff93bfad7eb91d499e9	autotools-utils	559ed17194292ec42d68145dcca2fa32	eutils	40081e8c7e7f7c4f9db349a1d6d52925	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multibuild	56d4120419072116417e8de1bd1040ff	multilib	fac675dcccf94392371a6abee62d909f	multilib-build	198e1c7095dbce1ca2848aed0f96bf60	multilib-minimal	a481090a413ba6970bd9643494ef982f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=24a10cde10c51366a9b36408826ffe07
+_md5_=bc8e27d9d3d9ce714676dc4de1209a4f
diff --git a/metadata/md5-cache/dev-libs/libebml-1.3.0 b/metadata/md5-cache/dev-libs/libebml-1.3.0
index b54a5efc6561..548dda46ffd6 100644
--- a/metadata/md5-cache/dev-libs/libebml-1.3.0
+++ b/metadata/md5-cache/dev-libs/libebml-1.3.0
@@ -3,9 +3,9 @@ DESCRIPTION=Extensible binary format library (kinda like XML)
 EAPI=5
 HOMEPAGE=http://www.matroska.org/ https://github.com/Matroska-Org/libebml/
 IUSE=debug static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha ~amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=LGPL-2.1
 SLOT=0/4
 SRC_URI=https://github.com/Matroska-Org/libebml/archive/release-1.3.0.tar.gz -> libebml-1.3.0.tar.gz
 _eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=6a64538f1404ca3637c70fb9c4309ed0
+_md5_=903092b50eeba4bc5e6afdbdb32860ef
diff --git a/metadata/md5-cache/dev-perl/Archive-Zip-1.370.0 b/metadata/md5-cache/dev-perl/Archive-Zip-1.370.0
new file mode 100644
index 000000000000..76ce2b2884b9
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Archive-Zip-1.370.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=>=virtual/perl-Compress-Raw-Zlib-2.017 >=virtual/perl-File-Spec-0.80 dev-lang/perl:=[-build(-)]
+DESCRIPTION=A wrapper that lets you read Zip archive members as if they were files
+EAPI=5
+HOMEPAGE=http://search.cpan.org/dist/Archive-Zip/
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
+RDEPEND=>=virtual/perl-Compress-Raw-Zlib-2.017 >=virtual/perl-File-Spec-0.80 dev-lang/perl:=[-build(-)]
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/P/PH/PHRED/Archive-Zip-1.37.tar.gz
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	1d50a6ea2d8d319e3205b005b3ed0dfa	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=8bbb5cf3566298f8faeb9d3c81e50f13
diff --git a/metadata/md5-cache/dev-perl/BerkeleyDB-0.540.0 b/metadata/md5-cache/dev-perl/BerkeleyDB-0.540.0
new file mode 100644
index 000000000000..778b095219ad
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/BerkeleyDB-0.540.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=>=sys-libs/db-2.0 test? ( dev-perl/Test-Pod ) dev-lang/perl:=[-build(-)]
+DESCRIPTION=This module provides Berkeley DB interface for Perl.
+EAPI=5
+HOMEPAGE=http://search.cpan.org/dist/BerkeleyDB/
+IUSE=test
+KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
+RDEPEND=>=sys-libs/db-2.0 dev-lang/perl:=[-build(-)]
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/P/PM/PMQS/BerkeleyDB-0.54.tar.gz
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	db-use	1c719875d6599536f956fafea9e1f404	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	1d50a6ea2d8d319e3205b005b3ed0dfa	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=7f7ad579c88874141b9d4d5a47d09922
diff --git a/metadata/md5-cache/dev-perl/Clone-0.340.0 b/metadata/md5-cache/dev-perl/Clone-0.340.0
deleted file mode 100644
index e230e276325a..000000000000
--- a/metadata/md5-cache/dev-perl/Clone-0.340.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=|| ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
-DESCRIPTION=Recursively copy Perl datatypes
-EAPI=4
-HOMEPAGE=http://search.cpan.org/dist/Clone/
-KEYWORDS=alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
-LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
-RDEPEND=|| ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/G/GA/GARU/Clone-0.34.tar.gz
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	1d50a6ea2d8d319e3205b005b3ed0dfa	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=4bbc59ee8b433de8166b1b90ee67eb9a
diff --git a/metadata/md5-cache/dev-perl/Clone-0.310.0 b/metadata/md5-cache/dev-perl/Clone-0.360.0
similarity index 54%
rename from metadata/md5-cache/dev-perl/Clone-0.310.0
rename to metadata/md5-cache/dev-perl/Clone-0.360.0
index 38c4b2b34f4c..5c0b91603e4e 100644
--- a/metadata/md5-cache/dev-perl/Clone-0.310.0
+++ b/metadata/md5-cache/dev-perl/Clone-0.360.0
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=|| ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
+DEPEND=dev-lang/perl:=[-build(-)]
 DESCRIPTION=Recursively copy Perl datatypes
-EAPI=4
+EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/Clone/
-KEYWORDS=alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
-RDEPEND=|| ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
+RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
-SRC_URI=mirror://cpan/authors/id/R/RD/RDF/Clone-0.31.tar.gz
+SRC_URI=mirror://cpan/authors/id/G/GA/GARU/Clone-0.36.tar.gz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	1d50a6ea2d8d319e3205b005b3ed0dfa	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=2ff5403400b9b62b2c6dceb39e7f5ae8
+_md5_=1c49a36da900065cc61a2ae51b65c2be
diff --git a/metadata/md5-cache/dev-perl/Config-Tiny-2.140.0-r1 b/metadata/md5-cache/dev-perl/Config-Crontab-1.400.0
similarity index 56%
rename from metadata/md5-cache/dev-perl/Config-Tiny-2.140.0-r1
rename to metadata/md5-cache/dev-perl/Config-Crontab-1.400.0
index 324ab7421d26..336817b4fe42 100644
--- a/metadata/md5-cache/dev-perl/Config-Tiny-2.140.0-r1
+++ b/metadata/md5-cache/dev-perl/Config-Crontab-1.400.0
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=dev-lang/perl:=[-build(-)]
-DESCRIPTION=Read/Write .ini style files with as little code as possible
+DESCRIPTION=Read/Write Vixie compatible crontab(5) files
 EAPI=5
-HOMEPAGE=http://search.cpan.org/dist/Config-Tiny/
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
+HOMEPAGE=http://search.cpan.org/dist/Config-Crontab/
+KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
-SRC_URI=mirror://cpan/authors/id/A/AD/ADAMK/Config-Tiny-2.14.tar.gz
+SRC_URI=mirror://cpan/authors/id/S/SC/SCOTTW/Config-Crontab-1.40.tar.gz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	1d50a6ea2d8d319e3205b005b3ed0dfa	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=01779474b985dd4d9ce5d7fb88f03817
+_md5_=5b63b5a282d7357eebf4bb9ace02803d
diff --git a/metadata/md5-cache/dev-perl/Config-IniFiles-2.830.0 b/metadata/md5-cache/dev-perl/Config-IniFiles-2.830.0
new file mode 100644
index 000000000000..848ed0a92baa
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Config-IniFiles-2.830.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=dev-perl/IO-stringy dev-perl/List-MoreUtils >=virtual/perl-Module-Build-0.36 test? ( dev-perl/Test-Pod dev-perl/Test-Pod-Coverage ) dev-lang/perl:=[-build(-)]
+DESCRIPTION=A module for reading .ini-style configuration files
+EAPI=5
+HOMEPAGE=http://search.cpan.org/dist/Config-IniFiles/
+IUSE=test
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
+RDEPEND=dev-perl/IO-stringy dev-perl/List-MoreUtils dev-lang/perl:=[-build(-)]
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/S/SH/SHLOMIF/Config-IniFiles-2.83.tar.gz
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	1d50a6ea2d8d319e3205b005b3ed0dfa	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=2c9b21091f9be23f47eaa5a53d2a8177
diff --git a/metadata/md5-cache/dev-perl/Config-Properties-1.760.0 b/metadata/md5-cache/dev-perl/Config-Properties-1.760.0
new file mode 100644
index 000000000000..a6a8f44798a1
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Config-Properties-1.760.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=test? ( virtual/perl-File-Temp virtual/perl-Test-Simple ) dev-lang/perl:=[-build(-)]
+DESCRIPTION=Configuration using Java style properties
+EAPI=5
+HOMEPAGE=http://search.cpan.org/dist/Config-Properties/
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
+RDEPEND=dev-lang/perl:=[-build(-)]
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/S/SA/SALVA/Config-Properties-1.76.tar.gz
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	1d50a6ea2d8d319e3205b005b3ed0dfa	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=67ef0d92931e2a692602dd99e03c396f
diff --git a/metadata/md5-cache/dev-perl/Config-Tiny-2.140.0 b/metadata/md5-cache/dev-perl/Config-Tiny-2.140.0
deleted file mode 100644
index c1adb59220d4..000000000000
--- a/metadata/md5-cache/dev-perl/Config-Tiny-2.140.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=|| ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
-DESCRIPTION=Read/Write .ini style files with as little code as possible
-EAPI=3
-HOMEPAGE=http://search.cpan.org/dist/Config-Tiny/
-KEYWORDS=alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
-LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
-RDEPEND=|| ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/A/AD/ADAMK/Config-Tiny-2.14.tar.gz
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	1d50a6ea2d8d319e3205b005b3ed0dfa	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=0c1159d42cae234bf4e7accb29dfbb5f
diff --git a/metadata/md5-cache/dev-perl/Config-Tiny-2.160.0 b/metadata/md5-cache/dev-perl/Config-Tiny-2.160.0
index b297a4026d29..3e3fc0cb5512 100644
--- a/metadata/md5-cache/dev-perl/Config-Tiny-2.160.0
+++ b/metadata/md5-cache/dev-perl/Config-Tiny-2.160.0
@@ -3,10 +3,10 @@ DEPEND=dev-lang/perl:=[-build(-)]
 DESCRIPTION=Read/Write .ini style files with as little code as possible
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/Config-Tiny/
-KEYWORDS=~alpha ~amd64 hppa ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
+KEYWORDS=alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RS/RSAVAGE/Config-Tiny-2.16.tgz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	1d50a6ea2d8d319e3205b005b3ed0dfa	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=9e3574236a2daf63ea3ac353d6033021
+_md5_=6c831902cd14055f90578294b43a0e97
diff --git a/metadata/md5-cache/dev-perl/Crypt-Blowfish-2.140.0 b/metadata/md5-cache/dev-perl/Crypt-Blowfish-2.140.0
index 5210a553f35a..355b1ace3b21 100644
--- a/metadata/md5-cache/dev-perl/Crypt-Blowfish-2.140.0
+++ b/metadata/md5-cache/dev-perl/Crypt-Blowfish-2.140.0
@@ -3,10 +3,10 @@ DEPEND=|| ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
 DESCRIPTION=Crypt::Blowfish module for perl
 EAPI=4
 HOMEPAGE=http://search.cpan.org/dist/Crypt-Blowfish/
-KEYWORDS=~alpha ~amd64 hppa ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+KEYWORDS=alpha amd64 hppa ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=|| ( Artistic GPL-2 )
 RDEPEND=|| ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DP/DPARIS/Crypt-Blowfish-2.14.tar.gz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	1d50a6ea2d8d319e3205b005b3ed0dfa	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=d5512d2661a9ec2c8b521e5c9f796888
+_md5_=609df435327048a6450ae026038bea1e
diff --git a/metadata/md5-cache/dev-perl/Net-SSLeay-1.550 b/metadata/md5-cache/dev-perl/Net-SSLeay-1.550
index 2cb3c38096f4..8b5bd4caa707 100644
--- a/metadata/md5-cache/dev-perl/Net-SSLeay-1.550
+++ b/metadata/md5-cache/dev-perl/Net-SSLeay-1.550
@@ -3,10 +3,10 @@ DEPEND=dev-libs/openssl dev-lang/perl:=[-build(-)]
 DESCRIPTION=Net::SSLeay module for perl
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/Net-SSLeay/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=SSLeay
 RDEPEND=dev-libs/openssl dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MI/MIKEM/Net-SSLeay-1.55.tar.gz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	1d50a6ea2d8d319e3205b005b3ed0dfa	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=3ac60b878a039c03b5e9b517ddc8f00e
+_md5_=a478f00b5ac6e9f5b0b3ca9ca510b1c4
diff --git a/metadata/md5-cache/dev-perl/Package-Stash-0.360.0 b/metadata/md5-cache/dev-perl/Package-Stash-0.360.0
index ea43eba78121..7770769f3b4e 100644
--- a/metadata/md5-cache/dev-perl/Package-Stash-0.360.0
+++ b/metadata/md5-cache/dev-perl/Package-Stash-0.360.0
@@ -4,10 +4,10 @@ DESCRIPTION=Routines for manipulating stashes
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/Package-Stash/
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=>=dev-perl/Dist-CheckConflicts-0.20.0 >=dev-perl/Module-Implementation-0.60.0 dev-perl/Package-DeprecationManager >=dev-perl/Package-Stash-XS-0.260.0 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DO/DOY/Package-Stash-0.36.tar.gz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	1d50a6ea2d8d319e3205b005b3ed0dfa	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=2840f1b81f01c5eb00337f134f1e97bb
+_md5_=c872d1fdda83db08a5bda7f9af53f062
diff --git a/metadata/md5-cache/dev-perl/Package-Stash-XS-0.280.0 b/metadata/md5-cache/dev-perl/Package-Stash-XS-0.280.0
index 5200d507b9da..a30fac9aa3fa 100644
--- a/metadata/md5-cache/dev-perl/Package-Stash-XS-0.280.0
+++ b/metadata/md5-cache/dev-perl/Package-Stash-XS-0.280.0
@@ -4,10 +4,10 @@ DESCRIPTION=Faster and more correct implementation of the Package::Stash API
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/Package-Stash-XS/
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DO/DOY/Package-Stash-XS-0.28.tar.gz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	1d50a6ea2d8d319e3205b005b3ed0dfa	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=77b35165dcab8e2d98b4c601bf4b179e
+_md5_=b68d023b474dae8a415925a6cf94d14e
diff --git a/metadata/md5-cache/dev-perl/Pod-Coverage-0.230.0 b/metadata/md5-cache/dev-perl/Pod-Coverage-0.230.0
index 7cfdc229b8f5..2e02207e15af 100644
--- a/metadata/md5-cache/dev-perl/Pod-Coverage-0.230.0
+++ b/metadata/md5-cache/dev-perl/Pod-Coverage-0.230.0
@@ -4,10 +4,10 @@ DESCRIPTION=Checks if the documentation of a module is comprehensive
 EAPI=4
 HOMEPAGE=http://search.cpan.org/dist/Pod-Coverage/
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=>=virtual/perl-PodParser-1.13 >=dev-perl/Devel-Symdump-2.01 || ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RC/RCLAMP/Pod-Coverage-0.23.tar.gz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	1d50a6ea2d8d319e3205b005b3ed0dfa	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=165ab6befb673c1478329185c2972457
+_md5_=798f30d84098e40801cb41c66dc8955a
diff --git a/metadata/md5-cache/dev-perl/Sub-Exporter-0.986.0 b/metadata/md5-cache/dev-perl/Sub-Exporter-0.986.0
index ee102769a6d5..fd60d3203d19 100644
--- a/metadata/md5-cache/dev-perl/Sub-Exporter-0.986.0
+++ b/metadata/md5-cache/dev-perl/Sub-Exporter-0.986.0
@@ -3,10 +3,10 @@ DEPEND=>=dev-perl/Sub-Install-0.920.0 >=dev-perl/Data-OptList-0.100.0 >=dev-perl
 DESCRIPTION=A sophisticated exporter for custom-built routines
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/Sub-Exporter/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=>=dev-perl/Sub-Install-0.920.0 >=dev-perl/Data-OptList-0.100.0 >=dev-perl/Params-Util-0.140.0 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Sub-Exporter-0.986.tar.gz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	1d50a6ea2d8d319e3205b005b3ed0dfa	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=34de8362093e9f672c86d6b3a82d4b5b
+_md5_=7d65cf8d349f1f1c135facc2247b29cb
diff --git a/metadata/md5-cache/dev-perl/Sys-SigAction-0.210.0 b/metadata/md5-cache/dev-perl/Sys-SigAction-0.210.0
new file mode 100644
index 000000000000..8a82d170bc71
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Sys-SigAction-0.210.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=dev-lang/perl:=[-build(-)]
+DESCRIPTION=Perl extension for Consistent Signal Handling
+EAPI=5
+HOMEPAGE=http://search.cpan.org/dist/Sys-SigAction/
+KEYWORDS=~amd64 ~arm ~ppc ~x86
+LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
+RDEPEND=dev-lang/perl:=[-build(-)]
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/L/LB/LBAXTER/Sys-SigAction-0.20.tar.gz
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	1d50a6ea2d8d319e3205b005b3ed0dfa	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=b6535264929c915f6b2cc1da99db245c
diff --git a/metadata/md5-cache/dev-perl/Test-Exception-0.320.0 b/metadata/md5-cache/dev-perl/Test-Exception-0.320.0
index 1ef3bd56b519..c0eca06f9d5a 100644
--- a/metadata/md5-cache/dev-perl/Test-Exception-0.320.0
+++ b/metadata/md5-cache/dev-perl/Test-Exception-0.320.0
@@ -3,10 +3,10 @@ DEPEND=>=virtual/perl-Test-Simple-0.64 >=dev-perl/Sub-Uplevel-0.18 >=virtual/per
 DESCRIPTION=test functions for exception based code
 EAPI=4
 HOMEPAGE=http://search.cpan.org/dist/Test-Exception/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=>=virtual/perl-Test-Simple-0.64 >=dev-perl/Sub-Uplevel-0.18 || ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AD/ADIE/Test-Exception-0.32.tar.gz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	1d50a6ea2d8d319e3205b005b3ed0dfa	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=36f1a732c122d70e7077ee1745468126
+_md5_=9ba20196afd502e196ba30d48b47ca28
diff --git a/metadata/md5-cache/dev-perl/Test-Number-Delta-1.40.0 b/metadata/md5-cache/dev-perl/Test-Number-Delta-1.40.0
new file mode 100644
index 000000000000..3656bb2cbbf5
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Test-Number-Delta-1.40.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=virtual/perl-Module-Build dev-lang/perl:=[-build(-)]
+DESCRIPTION=Compare the difference between numbers against a given tolerance
+EAPI=5
+HOMEPAGE=http://search.cpan.org/dist/Test-Number-Delta/
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+LICENSE=Apache-2.0
+RDEPEND=dev-lang/perl:=[-build(-)]
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/D/DA/DAGOLDEN/Test-Number-Delta-1.04.tar.gz
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	1d50a6ea2d8d319e3205b005b3ed0dfa	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=0220d2bd9e88788ca99349e0267388ae
diff --git a/metadata/md5-cache/dev-perl/Test-Pod-1.480.0 b/metadata/md5-cache/dev-perl/Test-Pod-1.480.0
index b9b713118019..8d7d5952d326 100644
--- a/metadata/md5-cache/dev-perl/Test-Pod-1.480.0
+++ b/metadata/md5-cache/dev-perl/Test-Pod-1.480.0
@@ -3,10 +3,10 @@ DEPEND=>=virtual/perl-Pod-Simple-3.50.0 >=virtual/perl-Test-Simple-0.620.0 >=vir
 DESCRIPTION=check for POD errors in files
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/Test-Pod/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=>=virtual/perl-Pod-Simple-3.50.0 >=virtual/perl-Test-Simple-0.620.0 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DW/DWHEELER/Test-Pod-1.48.tar.gz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	1d50a6ea2d8d319e3205b005b3ed0dfa	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=1c1a0a712bd58abaf7bb15ffcee212e6
+_md5_=e04d8aeec89a0534f2d47fabd87fbc2c
diff --git a/metadata/md5-cache/dev-perl/Try-Tiny-0.180.0 b/metadata/md5-cache/dev-perl/Try-Tiny-0.180.0
index 01a2712be7f8..25d89590e398 100644
--- a/metadata/md5-cache/dev-perl/Try-Tiny-0.180.0
+++ b/metadata/md5-cache/dev-perl/Try-Tiny-0.180.0
@@ -4,10 +4,10 @@ DESCRIPTION=Minimal try/catch with proper localization of
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/Try-Tiny/
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
 LICENSE=MIT
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DO/DOY/Try-Tiny-0.18.tar.gz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	1d50a6ea2d8d319e3205b005b3ed0dfa	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=88adaaf651af6ddeb1118d93f912187d
+_md5_=311d2a5e64e4faabefb6c0c3fb3e437e
diff --git a/metadata/md5-cache/dev-perl/boolean-0.320.0 b/metadata/md5-cache/dev-perl/boolean-0.320.0
new file mode 100644
index 000000000000..a2f9d816cc24
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/boolean-0.320.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=dev-lang/perl:=[-build(-)]
+DESCRIPTION=Boolean support for Perl
+EAPI=5
+HOMEPAGE=http://search.cpan.org/dist/boolean/
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
+RDEPEND=dev-lang/perl:=[-build(-)]
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/I/IN/INGY/boolean-0.32.tar.gz
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	1d50a6ea2d8d319e3205b005b3ed0dfa	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=02326283e98437a0783c87e2c05b399c
diff --git a/metadata/md5-cache/dev-python/kazoo-1.3.1 b/metadata/md5-cache/dev-python/kazoo-1.3.1
new file mode 100644
index 000000000000..6e554c725ae1
--- /dev/null
+++ b/metadata/md5-cache/dev-python/kazoo-1.3.1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=net-zope/zope-interface-3.8.0[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] gevent? ( dev-python/gevent[python_targets_python2_6(-)?,-python_single_target_python2_6(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) app-arch/unzip dev-python/setuptools[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] doc? ( dev-python/repoze-sphinx-autointerface[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] dev-python/sphinx[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] ) test? ( dev-python/mock[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] ) userland_GNU? ( >=sys-apps/coreutils-8.5 ) 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 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)]
+DESCRIPTION=A high-level Python library that makes it easier to use Apache Zookeeper
+EAPI=5
+HOMEPAGE=https://kazoo.readthedocs.org/ https://github.com/python-zk/kazoo/ https://pypi.python.org/pypi/kazoo/
+IUSE=doc gevent test python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=net-zope/zope-interface-3.8.0[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] gevent? ( dev-python/gevent[python_targets_python2_6(-)?,-python_single_target_python2_6(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) 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 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)]
+REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://pypi/k/kazoo/kazoo-1.3.1.zip
+_eclasses_=distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multibuild	56d4120419072116417e8de1bd1040ff	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	3bb814ab7959a36067101a6bef683b6f	python-utils-r1	ceb3e4c3ba203e28bb02eeb182d88acf	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=04e48327b7efec9460c0b79bb07820a0
diff --git a/metadata/md5-cache/dev-python/lxml-3.3.0 b/metadata/md5-cache/dev-python/lxml-3.3.0
index 7e94e3e2dec6..e07248d7a691 100644
--- a/metadata/md5-cache/dev-python/lxml-3.3.0
+++ b/metadata/md5-cache/dev-python/lxml-3.3.0
@@ -4,11 +4,11 @@ DESCRIPTION=A Pythonic binding for the libxml2 and libxslt libraries
 EAPI=5
 HOMEPAGE=http://lxml.de/ http://pypi.python.org/pypi/lxml/
 IUSE=beautifulsoup3 doc examples +threads python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD ElementTree GPL-2 PSF-2
 RDEPEND=>=dev-libs/libxml2-2.7.2 >=dev-libs/libxslt-1.1.15 beautifulsoup3? ( python_targets_python2_6? ( dev-python/beautifulsoup:python-2[python_targets_python2_6] ) python_targets_python2_7? ( dev-python/beautifulsoup:python-2[python_targets_python2_7] ) python_targets_python3_2? ( dev-python/beautifulsoup:python-3[python_targets_python3_2] ) python_targets_python3_3? ( dev-python/beautifulsoup:python-3[python_targets_python3_3] ) ) 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 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)]
 REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 )
 SLOT=0
 SRC_URI=mirror://pypi/l/lxml/lxml-3.3.0.tar.gz
 _eclasses_=distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	multibuild	56d4120419072116417e8de1bd1040ff	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	3bb814ab7959a36067101a6bef683b6f	python-utils-r1	ceb3e4c3ba203e28bb02eeb182d88acf	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=5206b78b6f656ff213b961d4f124fe57
+_md5_=a324d31543b488f8f84f3aaaffd8193a
diff --git a/metadata/md5-cache/dev-python/repoze-sphinx-autointerface-0.7.1 b/metadata/md5-cache/dev-python/repoze-sphinx-autointerface-0.7.1
new file mode 100644
index 000000000000..151a1430f493
--- /dev/null
+++ b/metadata/md5-cache/dev-python/repoze-sphinx-autointerface-0.7.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/sphinx[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] net-zope/zope-interface[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] dev-python/setuptools[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] userland_GNU? ( >=sys-apps/coreutils-8.5 ) 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 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)]
+DESCRIPTION=Sphinx extension: auto-generates API docs from Zope interfaces
+EAPI=5
+HOMEPAGE=https://pypi.python.org/pypi/repoze.sphinx.autointerface/
+IUSE=python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3
+KEYWORDS=~amd64 ~x86
+LICENSE=repoze
+RDEPEND=dev-python/sphinx[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] net-zope/zope-interface[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] 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 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)]
+REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 )
+SLOT=0
+SRC_URI=mirror://pypi/r/repoze.sphinx.autointerface/repoze.sphinx.autointerface-0.7.1.tar.gz
+_eclasses_=distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multibuild	56d4120419072116417e8de1bd1040ff	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	3bb814ab7959a36067101a6bef683b6f	python-utils-r1	ceb3e4c3ba203e28bb02eeb182d88acf	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=b4f3faf51c8859d2501ce2c3f51a30a9
diff --git a/metadata/md5-cache/dev-ruby/actionmailer-3.2.17 b/metadata/md5-cache/dev-ruby/actionmailer-3.2.17
new file mode 100644
index 000000000000..0ec918316be8
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/actionmailer-3.2.17
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby18? ( ~dev-ruby/actionpack-3.2.17[ruby_targets_ruby18] >=dev-ruby/mail-2.5.4:2.5[ruby_targets_ruby18] ) ruby_targets_ruby19? ( ~dev-ruby/actionpack-3.2.17[ruby_targets_ruby19] >=dev-ruby/mail-2.5.4:2.5[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby18] dev-ruby/mocha:0.13[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby19] dev-ruby/mocha:0.13[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
+DESCRIPTION=Framework for designing email-service layers
+EAPI=5
+HOMEPAGE=http://rubyforge.org/projects/actionmailer/
+IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 test test
+KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby18? ( ~dev-ruby/actionpack-3.2.17[ruby_targets_ruby18] >=dev-ruby/mail-2.5.4:2.5[ruby_targets_ruby18] ) ruby_targets_ruby19? ( ~dev-ruby/actionpack-3.2.17[ruby_targets_ruby19] >=dev-ruby/mail-2.5.4:2.5[ruby_targets_ruby19] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
+REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 )
+SLOT=3.2
+SRC_URI=http://github.com/rails/rails/archive/v3.2.17.tar.gz -> rails-3.2.17.tgz
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	java-utils-2	8d0d93b7a8605ea346cce4604f6db516	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	4021487250c740e3dc16b181228db818	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=f208996b942c9e2a69c2d7311a383c41
diff --git a/metadata/md5-cache/dev-ruby/actionmailer-4.0.3 b/metadata/md5-cache/dev-ruby/actionmailer-4.0.3
new file mode 100644
index 000000000000..2f5ed1242f42
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/actionmailer-4.0.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby19? ( ~dev-ruby/actionpack-4.0.3[ruby_targets_ruby19] >=dev-ruby/mail-2.5.3:2.5[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby19] dev-ruby/mocha:0.13[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
+DESCRIPTION=Framework for designing email-service layers
+EAPI=5
+HOMEPAGE=http://rubyforge.org/projects/actionmailer/
+IUSE=test elibc_FreeBSD ruby_targets_ruby19 test test
+KEYWORDS=~amd64 ~arm
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby19? ( ~dev-ruby/actionpack-4.0.3[ruby_targets_ruby19] >=dev-ruby/mail-2.5.3:2.5[ruby_targets_ruby19] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 )
+SLOT=4.0
+SRC_URI=http://github.com/rails/rails/archive/v4.0.3.tar.gz -> rails-4.0.3.tgz
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	java-utils-2	8d0d93b7a8605ea346cce4604f6db516	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	4021487250c740e3dc16b181228db818	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=314400c150bd5dbe6ec3ef62f75f628f
diff --git a/metadata/md5-cache/dev-ruby/actionpack-3.2.17 b/metadata/md5-cache/dev-ruby/actionpack-3.2.17
new file mode 100644
index 000000000000..4010a40e7f02
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/actionpack-3.2.17
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby18? ( ~dev-ruby/activemodel-3.2.17[ruby_targets_ruby18] ~dev-ruby/activesupport-3.2.17[ruby_targets_ruby18] >=dev-ruby/rack-cache-1.2[ruby_targets_ruby18] >=dev-ruby/builder-3.0.0:3[ruby_targets_ruby18] >=dev-ruby/rack-1.4.5:1.4[ruby_targets_ruby18] >=dev-ruby/rack-test-0.6.1:0.6[ruby_targets_ruby18] >=dev-ruby/journey-1.0.4:1.0[ruby_targets_ruby18] >=dev-ruby/sprockets-2.2.1:2.2[ruby_targets_ruby18] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby18] ) ruby_targets_ruby19? ( ~dev-ruby/activemodel-3.2.17[ruby_targets_ruby19] ~dev-ruby/activesupport-3.2.17[ruby_targets_ruby19] >=dev-ruby/rack-cache-1.2[ruby_targets_ruby19] >=dev-ruby/builder-3.0.0:3[ruby_targets_ruby19] >=dev-ruby/rack-1.4.5:1.4[ruby_targets_ruby19] >=dev-ruby/rack-test-0.6.1:0.6[ruby_targets_ruby19] >=dev-ruby/journey-1.0.4:1.0[ruby_targets_ruby19] >=dev-ruby/sprockets-2.2.1:2.2[ruby_targets_ruby19] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/mocha:0.13[ruby_targets_ruby18] dev-ruby/bundler[ruby_targets_ruby18] ~dev-ruby/activerecord-3.2.17[ruby_targets_ruby18] ~dev-ruby/actionmailer-3.2.17[ruby_targets_ruby18] >=dev-ruby/tzinfo-0.3.29:0[ruby_targets_ruby18] >=dev-ruby/uglifier-1.0.3[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/mocha:0.13[ruby_targets_ruby19] dev-ruby/bundler[ruby_targets_ruby19] ~dev-ruby/activerecord-3.2.17[ruby_targets_ruby19] ~dev-ruby/actionmailer-3.2.17[ruby_targets_ruby19] >=dev-ruby/tzinfo-0.3.29:0[ruby_targets_ruby19] >=dev-ruby/uglifier-1.0.3[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
+DESCRIPTION=Eases web-request routing, handling, and response.
+EAPI=5
+HOMEPAGE=http://rubyforge.org/projects/actionpack/
+IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 doc test test
+KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby18? ( ~dev-ruby/activemodel-3.2.17[ruby_targets_ruby18] ~dev-ruby/activesupport-3.2.17[ruby_targets_ruby18] >=dev-ruby/rack-cache-1.2[ruby_targets_ruby18] >=dev-ruby/builder-3.0.0:3[ruby_targets_ruby18] >=dev-ruby/rack-1.4.5:1.4[ruby_targets_ruby18] >=dev-ruby/rack-test-0.6.1:0.6[ruby_targets_ruby18] >=dev-ruby/journey-1.0.4:1.0[ruby_targets_ruby18] >=dev-ruby/sprockets-2.2.1:2.2[ruby_targets_ruby18] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby18] ) ruby_targets_ruby19? ( ~dev-ruby/activemodel-3.2.17[ruby_targets_ruby19] ~dev-ruby/activesupport-3.2.17[ruby_targets_ruby19] >=dev-ruby/rack-cache-1.2[ruby_targets_ruby19] >=dev-ruby/builder-3.0.0:3[ruby_targets_ruby19] >=dev-ruby/rack-1.4.5:1.4[ruby_targets_ruby19] >=dev-ruby/rack-test-0.6.1:0.6[ruby_targets_ruby19] >=dev-ruby/journey-1.0.4:1.0[ruby_targets_ruby19] >=dev-ruby/sprockets-2.2.1:2.2[ruby_targets_ruby19] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby19] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
+REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 )
+SLOT=3.2
+SRC_URI=http://github.com/rails/rails/archive/v3.2.17.tar.gz -> rails-3.2.17.tgz
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	java-utils-2	8d0d93b7a8605ea346cce4604f6db516	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	4021487250c740e3dc16b181228db818	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=9ac53b209250595b31011774c00ceb08
diff --git a/metadata/md5-cache/dev-ruby/actionpack-4.0.3 b/metadata/md5-cache/dev-ruby/actionpack-4.0.3
new file mode 100644
index 000000000000..c1bd979729c4
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/actionpack-4.0.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby19? ( ~dev-ruby/activesupport-4.0.3[ruby_targets_ruby19] >=dev-ruby/builder-3.1.0:3.1[ruby_targets_ruby19] >=dev-ruby/rack-1.5.2:1.5[ruby_targets_ruby19] >=dev-ruby/rack-test-0.6.2:0.6[ruby_targets_ruby19] >=dev-ruby/sprockets-2.2.1:2.2[ruby_targets_ruby19] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/mocha:0.13[ruby_targets_ruby19] dev-ruby/bundler[ruby_targets_ruby19] ~dev-ruby/activemodel-4.0.3[ruby_targets_ruby19] ~dev-ruby/activerecord-4.0.3[ruby_targets_ruby19] ~dev-ruby/actionmailer-4.0.3[ruby_targets_ruby19] dev-ruby/sprockets-rails:2.0[ruby_targets_ruby19] >=dev-ruby/tzinfo-0.3.29:0[ruby_targets_ruby19] >=dev-ruby/uglifier-1.0.3[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
+DESCRIPTION=Eases web-request routing, handling, and response.
+EAPI=5
+HOMEPAGE=http://rubyforge.org/projects/actionpack/
+IUSE=test elibc_FreeBSD ruby_targets_ruby19 doc test test
+KEYWORDS=~amd64 ~arm
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby19? ( ~dev-ruby/activesupport-4.0.3[ruby_targets_ruby19] >=dev-ruby/builder-3.1.0:3.1[ruby_targets_ruby19] >=dev-ruby/rack-1.5.2:1.5[ruby_targets_ruby19] >=dev-ruby/rack-test-0.6.2:0.6[ruby_targets_ruby19] >=dev-ruby/sprockets-2.2.1:2.2[ruby_targets_ruby19] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby19] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 )
+SLOT=4.0
+SRC_URI=http://github.com/rails/rails/archive/v4.0.3.tar.gz -> rails-4.0.3.tgz
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	java-utils-2	8d0d93b7a8605ea346cce4604f6db516	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	4021487250c740e3dc16b181228db818	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=0c1d4cd1f34d72574555c30315c408f6
diff --git a/metadata/md5-cache/dev-ruby/activemodel-3.2.17 b/metadata/md5-cache/dev-ruby/activemodel-3.2.17
new file mode 100644
index 000000000000..6c566a9f623e
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/activemodel-3.2.17
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby18? ( ~dev-ruby/activesupport-3.2.17[ruby_targets_ruby18] >=dev-ruby/builder-3.0.0:3[ruby_targets_ruby18] >=dev-ruby/bcrypt-ruby-3.0.0[ruby_targets_ruby18] ) ruby_targets_ruby19? ( ~dev-ruby/activesupport-3.2.17[ruby_targets_ruby19] >=dev-ruby/builder-3.0.0:3[ruby_targets_ruby19] >=dev-ruby/bcrypt-ruby-3.0.0[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby18] >=dev-ruby/mocha-0.13.0:0.13[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby19] >=dev-ruby/mocha-0.13.0:0.13[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
+DESCRIPTION=A toolkit for building modeling frameworks like Active Record and Active Resource.
+EAPI=5
+HOMEPAGE=http://github.com/rails/rails
+IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 test test
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby18? ( ~dev-ruby/activesupport-3.2.17[ruby_targets_ruby18] >=dev-ruby/builder-3.0.0:3[ruby_targets_ruby18] >=dev-ruby/bcrypt-ruby-3.0.0[ruby_targets_ruby18] ) ruby_targets_ruby19? ( ~dev-ruby/activesupport-3.2.17[ruby_targets_ruby19] >=dev-ruby/builder-3.0.0:3[ruby_targets_ruby19] >=dev-ruby/bcrypt-ruby-3.0.0[ruby_targets_ruby19] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
+REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 )
+SLOT=3.2
+SRC_URI=http://github.com/rails/rails/archive/v3.2.17.tar.gz -> rails-3.2.17.tgz
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	java-utils-2	8d0d93b7a8605ea346cce4604f6db516	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	4021487250c740e3dc16b181228db818	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=1b873e2656e87b2f0dee81e967b54b54
diff --git a/metadata/md5-cache/dev-ruby/activemodel-4.0.3 b/metadata/md5-cache/dev-ruby/activemodel-4.0.3
new file mode 100644
index 000000000000..9814806314c7
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/activemodel-4.0.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby19? ( ~dev-ruby/activesupport-4.0.3[ruby_targets_ruby19] >=dev-ruby/builder-3.1.0:3.1[ruby_targets_ruby19] >=dev-ruby/bcrypt-ruby-3.0.0[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( test? ( >=dev-ruby/railties-4.0.0[ruby_targets_ruby19] dev-ruby/test-unit:2[ruby_targets_ruby19] >=dev-ruby/mocha-0.13.0:0.13[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
+DESCRIPTION=A toolkit for building modeling frameworks like Active Record and Active Resource.
+EAPI=5
+HOMEPAGE=http://github.com/rails/rails
+IUSE=test elibc_FreeBSD ruby_targets_ruby19 test test
+KEYWORDS=~amd64 ~arm
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby19? ( ~dev-ruby/activesupport-4.0.3[ruby_targets_ruby19] >=dev-ruby/builder-3.1.0:3.1[ruby_targets_ruby19] >=dev-ruby/bcrypt-ruby-3.0.0[ruby_targets_ruby19] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 )
+SLOT=4.0
+SRC_URI=http://github.com/rails/rails/archive/v4.0.3.tar.gz -> rails-4.0.3.tgz
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	java-utils-2	8d0d93b7a8605ea346cce4604f6db516	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	4021487250c740e3dc16b181228db818	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=86c4f1cb1796920c8938b879adc5d0d5
diff --git a/metadata/md5-cache/dev-ruby/activerecord-3.2.17 b/metadata/md5-cache/dev-ruby/activerecord-3.2.17
new file mode 100644
index 000000000000..b1f62da07676
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/activerecord-3.2.17
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby18? ( ~dev-ruby/activesupport-3.2.17[ruby_targets_ruby18] ~dev-ruby/activemodel-3.2.17[ruby_targets_ruby18] >=dev-ruby/arel-3.0.2:3.0[ruby_targets_ruby18] >=dev-ruby/tzinfo-0.3.29:0[ruby_targets_ruby18] sqlite3? ( >=dev-ruby/sqlite3-1.3.5[ruby_targets_ruby18] ) mysql? ( >=dev-ruby/mysql2-0.3.10:0.3[ruby_targets_ruby18] ) postgres? ( >=dev-ruby/pg-0.11.0[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( ~dev-ruby/activesupport-3.2.17[ruby_targets_ruby19] ~dev-ruby/activemodel-3.2.17[ruby_targets_ruby19] >=dev-ruby/arel-3.0.2:3.0[ruby_targets_ruby19] >=dev-ruby/tzinfo-0.3.29:0[ruby_targets_ruby19] sqlite3? ( >=dev-ruby/sqlite3-1.3.5[ruby_targets_ruby19] ) mysql? ( >=dev-ruby/mysql2-0.3.10:0.3[ruby_targets_ruby19] ) postgres? ( >=dev-ruby/pg-0.11.0[ruby_targets_ruby19] ) ) ) ruby_targets_ruby18? ( test? ( dev-ruby/bundler[ruby_targets_ruby18] ~dev-ruby/actionpack-3.2.17[ruby_targets_ruby18] >=dev-ruby/sqlite3-1.3.5[ruby_targets_ruby18] dev-ruby/mocha:0.13[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/bundler[ruby_targets_ruby19] ~dev-ruby/actionpack-3.2.17[ruby_targets_ruby19] >=dev-ruby/sqlite3-1.3.5[ruby_targets_ruby19] dev-ruby/mocha:0.13[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
+DESCRIPTION=Implements the ActiveRecord pattern (Fowler, PoEAA) for ORM
+EAPI=5
+HOMEPAGE=http://rubyforge.org/projects/activerecord/
+IUSE=mysql postgres sqlite3 test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 test test
+KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby18? ( ~dev-ruby/activesupport-3.2.17[ruby_targets_ruby18] ~dev-ruby/activemodel-3.2.17[ruby_targets_ruby18] >=dev-ruby/arel-3.0.2:3.0[ruby_targets_ruby18] >=dev-ruby/tzinfo-0.3.29:0[ruby_targets_ruby18] sqlite3? ( >=dev-ruby/sqlite3-1.3.5[ruby_targets_ruby18] ) mysql? ( >=dev-ruby/mysql2-0.3.10:0.3[ruby_targets_ruby18] ) postgres? ( >=dev-ruby/pg-0.11.0[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( ~dev-ruby/activesupport-3.2.17[ruby_targets_ruby19] ~dev-ruby/activemodel-3.2.17[ruby_targets_ruby19] >=dev-ruby/arel-3.0.2:3.0[ruby_targets_ruby19] >=dev-ruby/tzinfo-0.3.29:0[ruby_targets_ruby19] sqlite3? ( >=dev-ruby/sqlite3-1.3.5[ruby_targets_ruby19] ) mysql? ( >=dev-ruby/mysql2-0.3.10:0.3[ruby_targets_ruby19] ) postgres? ( >=dev-ruby/pg-0.11.0[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
+REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 )
+SLOT=3.2
+SRC_URI=http://github.com/rails/rails/archive/v3.2.17.tar.gz -> rails-3.2.17.tgz
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	java-utils-2	8d0d93b7a8605ea346cce4604f6db516	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	4021487250c740e3dc16b181228db818	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=dee74023e06381b6be93449a5ea70e27
diff --git a/metadata/md5-cache/dev-ruby/activerecord-4.0.3 b/metadata/md5-cache/dev-ruby/activerecord-4.0.3
new file mode 100644
index 000000000000..491bbacc27c2
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/activerecord-4.0.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby19? ( ~dev-ruby/activesupport-4.0.3[ruby_targets_ruby19] ~dev-ruby/activemodel-4.0.3[ruby_targets_ruby19] >=dev-ruby/activerecord-deprecated_finders-1.0.2:1.0[ruby_targets_ruby19] >=dev-ruby/arel-4.0.0:4.0[ruby_targets_ruby19] sqlite3? ( >=dev-ruby/sqlite3-1.3.5[ruby_targets_ruby19] ) mysql? ( >=dev-ruby/mysql2-0.3.10:0.3[ruby_targets_ruby19] ) postgres? ( >=dev-ruby/pg-0.11.0[ruby_targets_ruby19] ) ) ) ruby_targets_ruby19? ( test? ( dev-ruby/bundler[ruby_targets_ruby19] ~dev-ruby/actionpack-4.0.3[ruby_targets_ruby19] >=dev-ruby/sqlite3-1.3.5[ruby_targets_ruby19] dev-ruby/mocha:0.13[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
+DESCRIPTION=Implements the ActiveRecord pattern (Fowler, PoEAA) for ORM
+EAPI=5
+HOMEPAGE=http://rubyforge.org/projects/activerecord/
+IUSE=mysql postgres sqlite3 test elibc_FreeBSD ruby_targets_ruby19 test test
+KEYWORDS=~amd64 ~arm
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby19? ( ~dev-ruby/activesupport-4.0.3[ruby_targets_ruby19] ~dev-ruby/activemodel-4.0.3[ruby_targets_ruby19] >=dev-ruby/activerecord-deprecated_finders-1.0.2:1.0[ruby_targets_ruby19] >=dev-ruby/arel-4.0.0:4.0[ruby_targets_ruby19] sqlite3? ( >=dev-ruby/sqlite3-1.3.5[ruby_targets_ruby19] ) mysql? ( >=dev-ruby/mysql2-0.3.10:0.3[ruby_targets_ruby19] ) postgres? ( >=dev-ruby/pg-0.11.0[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 )
+SLOT=4.0
+SRC_URI=http://github.com/rails/rails/archive/v4.0.3.tar.gz -> rails-4.0.3.tgz
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	java-utils-2	8d0d93b7a8605ea346cce4604f6db516	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	4021487250c740e3dc16b181228db818	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=275c864d62eb9f90d501cfcc5a3f41e8
diff --git a/metadata/md5-cache/dev-ruby/activeresource-3.2.17 b/metadata/md5-cache/dev-ruby/activeresource-3.2.17
new file mode 100644
index 000000000000..a5ae1a1ec71a
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/activeresource-3.2.17
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby18? ( ~dev-ruby/activesupport-3.2.17[ruby_targets_ruby18] dev-ruby/builder:3[ruby_targets_ruby18] ) ruby_targets_ruby19? ( ~dev-ruby/activesupport-3.2.17[ruby_targets_ruby19] dev-ruby/builder:3[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby18] >=dev-ruby/mocha-0.13.0:0.13[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby19] >=dev-ruby/mocha-0.13.0:0.13[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
+DESCRIPTION=Think Active Record for web resources..
+EAPI=5
+HOMEPAGE=http://rubyforge.org/projects/activeresource/
+IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 doc test test
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby18? ( ~dev-ruby/activesupport-3.2.17[ruby_targets_ruby18] dev-ruby/builder:3[ruby_targets_ruby18] ) ruby_targets_ruby19? ( ~dev-ruby/activesupport-3.2.17[ruby_targets_ruby19] dev-ruby/builder:3[ruby_targets_ruby19] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
+REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 )
+SLOT=3.2
+SRC_URI=http://github.com/rails/rails/archive/v3.2.17.tar.gz -> rails-3.2.17.tgz
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	java-utils-2	8d0d93b7a8605ea346cce4604f6db516	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	4021487250c740e3dc16b181228db818	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=e8cea3bd0288d81892ac1d8228fd0ae4
diff --git a/metadata/md5-cache/dev-ruby/activesupport-3.2.17 b/metadata/md5-cache/dev-ruby/activesupport-3.2.17
new file mode 100644
index 000000000000..42ee63bc04a9
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/activesupport-3.2.17
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby18? ( >=dev-ruby/multi_json-1.0[ruby_targets_ruby18] >=dev-ruby/i18n-0.6.4:0.6[ruby_targets_ruby18] !!<dev-ruby/activesupport-3.0.11-r1:3.0[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >=dev-ruby/multi_json-1.0[ruby_targets_ruby19] >=dev-ruby/i18n-0.6.4:0.6[ruby_targets_ruby19] !!<dev-ruby/activesupport-3.0.11-r1:3.0[ruby_targets_ruby19] ) ruby_targets_jruby? ( >=dev-ruby/multi_json-1.0[ruby_targets_jruby] >=dev-ruby/i18n-0.6.4:0.6[ruby_targets_jruby] !!<dev-ruby/activesupport-3.0.11-r1:3.0[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby18] >=dev-ruby/memcache-client-1.5.8[ruby_targets_ruby18] dev-ruby/nokogiri[ruby_targets_ruby18] >=dev-ruby/builder-3.0.3:3[ruby_targets_ruby18] >=dev-ruby/tzinfo-0.3.29[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby19] >=dev-ruby/memcache-client-1.5.8[ruby_targets_ruby19] dev-ruby/nokogiri[ruby_targets_ruby19] >=dev-ruby/builder-3.0.3:3[ruby_targets_ruby19] >=dev-ruby/tzinfo-0.3.29[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( test? ( dev-ruby/test-unit:2[ruby_targets_jruby] >=dev-ruby/memcache-client-1.5.8[ruby_targets_jruby] dev-ruby/nokogiri[ruby_targets_jruby] >=dev-ruby/builder-3.0.3:3[ruby_targets_jruby] >=dev-ruby/tzinfo-0.3.29[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( test? ( >=dev-ruby/libxml-2.0.0[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( >=dev-ruby/libxml-2.0.0[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+DESCRIPTION=Utility Classes and Extension to the Standard Library
+EAPI=5
+HOMEPAGE=http://rubyforge.org/projects/activesupport/
+IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_jruby test test
+KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby18? ( >=dev-ruby/multi_json-1.0[ruby_targets_ruby18] >=dev-ruby/i18n-0.6.4:0.6[ruby_targets_ruby18] !!<dev-ruby/activesupport-3.0.11-r1:3.0[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >=dev-ruby/multi_json-1.0[ruby_targets_ruby19] >=dev-ruby/i18n-0.6.4:0.6[ruby_targets_ruby19] !!<dev-ruby/activesupport-3.0.11-r1:3.0[ruby_targets_ruby19] ) ruby_targets_jruby? ( >=dev-ruby/multi_json-1.0[ruby_targets_jruby] >=dev-ruby/i18n-0.6.4:0.6[ruby_targets_jruby] !!<dev-ruby/activesupport-3.0.11-r1:3.0[ruby_targets_jruby] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
+REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_jruby )
+SLOT=3.2
+SRC_URI=https://github.com/rails/rails/archive/v3.2.17.tar.gz -> rails-3.2.17.tgz
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	java-utils-2	8d0d93b7a8605ea346cce4604f6db516	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	4021487250c740e3dc16b181228db818	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=60901bbe3aaf49cda23de70b7a50ce3e
diff --git a/metadata/md5-cache/dev-ruby/activesupport-4.0.3 b/metadata/md5-cache/dev-ruby/activesupport-4.0.3
new file mode 100644
index 000000000000..37af992e9da9
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/activesupport-4.0.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby19? ( >=dev-ruby/multi_json-1.3:0[ruby_targets_ruby19] >=dev-ruby/i18n-0.6.4:0.6[ruby_targets_ruby19] >=dev-ruby/tzinfo-0.3.37:0[ruby_targets_ruby19] >=dev-ruby/minitest-4.2:0[ruby_targets_ruby19] >=dev-ruby/thread_safe-0.1:0[ruby_targets_ruby19] !!<dev-ruby/activesupport-3.0.11-r1:3.0[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/multi_json-1.3:0[ruby_targets_ruby20] >=dev-ruby/i18n-0.6.4:0.6[ruby_targets_ruby20] >=dev-ruby/tzinfo-0.3.37:0[ruby_targets_ruby20] >=dev-ruby/minitest-4.2:0[ruby_targets_ruby20] >=dev-ruby/thread_safe-0.1:0[ruby_targets_ruby20] !!<dev-ruby/activesupport-3.0.11-r1:3.0[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( test? ( >=dev-ruby/dalli-2.2.1[ruby_targets_ruby19] >=dev-ruby/nokogiri-1.4.5[ruby_targets_ruby19] >=dev-ruby/builder-3.1.0[ruby_targets_ruby19] >=dev-ruby/libxml-2.0.0[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( >=dev-ruby/dalli-2.2.1[ruby_targets_ruby20] >=dev-ruby/nokogiri-1.4.5[ruby_targets_ruby20] >=dev-ruby/builder-3.1.0[ruby_targets_ruby20] >=dev-ruby/libxml-2.0.0[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) )
+DESCRIPTION=Utility Classes and Extension to the Standard Library
+EAPI=5
+HOMEPAGE=http://rubyforge.org/projects/activesupport/
+IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 test test
+KEYWORDS=~amd64 ~arm
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/multi_json-1.3:0[ruby_targets_ruby19] >=dev-ruby/i18n-0.6.4:0.6[ruby_targets_ruby19] >=dev-ruby/tzinfo-0.3.37:0[ruby_targets_ruby19] >=dev-ruby/minitest-4.2:0[ruby_targets_ruby19] >=dev-ruby/thread_safe-0.1:0[ruby_targets_ruby19] !!<dev-ruby/activesupport-3.0.11-r1:3.0[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/multi_json-1.3:0[ruby_targets_ruby20] >=dev-ruby/i18n-0.6.4:0.6[ruby_targets_ruby20] >=dev-ruby/tzinfo-0.3.37:0[ruby_targets_ruby20] >=dev-ruby/minitest-4.2:0[ruby_targets_ruby20] >=dev-ruby/thread_safe-0.1:0[ruby_targets_ruby20] !!<dev-ruby/activesupport-3.0.11-r1:3.0[ruby_targets_ruby20] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
+SLOT=4.0
+SRC_URI=https://github.com/rails/rails/archive/v4.0.3.tar.gz -> rails-4.0.3.tgz
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	java-utils-2	8d0d93b7a8605ea346cce4604f6db516	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	4021487250c740e3dc16b181228db818	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=8be094e799238f0707b748f74e17ab63
diff --git a/metadata/md5-cache/dev-ruby/rails-3.2.17 b/metadata/md5-cache/dev-ruby/rails-3.2.17
new file mode 100644
index 000000000000..da7b28756fa6
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/rails-3.2.17
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby18? ( ~dev-ruby/actionmailer-3.2.17[ruby_targets_ruby18] ~dev-ruby/actionpack-3.2.17[ruby_targets_ruby18] ~dev-ruby/activerecord-3.2.17[ruby_targets_ruby18] ~dev-ruby/activeresource-3.2.17[ruby_targets_ruby18] ~dev-ruby/activesupport-3.2.17[ruby_targets_ruby18] =dev-ruby/bundler-1*[ruby_targets_ruby18] ~dev-ruby/railties-3.2.17[ruby_targets_ruby18] asset-pipeline? ( dev-ruby/jquery-rails[ruby_targets_ruby18] >=dev-ruby/sass-rails-3.2.3:3.2[ruby_targets_ruby18] >=dev-ruby/uglifier-1.0.3[ruby_targets_ruby18] >=dev-ruby/coffee-rails-3.2.1:3.2[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( ~dev-ruby/actionmailer-3.2.17[ruby_targets_ruby19] ~dev-ruby/actionpack-3.2.17[ruby_targets_ruby19] ~dev-ruby/activerecord-3.2.17[ruby_targets_ruby19] ~dev-ruby/activeresource-3.2.17[ruby_targets_ruby19] ~dev-ruby/activesupport-3.2.17[ruby_targets_ruby19] =dev-ruby/bundler-1*[ruby_targets_ruby19] ~dev-ruby/railties-3.2.17[ruby_targets_ruby19] asset-pipeline? ( dev-ruby/jquery-rails[ruby_targets_ruby19] >=dev-ruby/sass-rails-3.2.3:3.2[ruby_targets_ruby19] >=dev-ruby/uglifier-1.0.3[ruby_targets_ruby19] >=dev-ruby/coffee-rails-3.2.1:3.2[ruby_targets_ruby19] ) ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
+DESCRIPTION=ruby on rails is a web-application and persistance framework
+EAPI=5
+HOMEPAGE=http://www.rubyonrails.org
+IUSE=+asset-pipeline test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 test
+KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby18? ( ~dev-ruby/actionmailer-3.2.17[ruby_targets_ruby18] ~dev-ruby/actionpack-3.2.17[ruby_targets_ruby18] ~dev-ruby/activerecord-3.2.17[ruby_targets_ruby18] ~dev-ruby/activeresource-3.2.17[ruby_targets_ruby18] ~dev-ruby/activesupport-3.2.17[ruby_targets_ruby18] =dev-ruby/bundler-1*[ruby_targets_ruby18] ~dev-ruby/railties-3.2.17[ruby_targets_ruby18] asset-pipeline? ( dev-ruby/jquery-rails[ruby_targets_ruby18] >=dev-ruby/sass-rails-3.2.3:3.2[ruby_targets_ruby18] >=dev-ruby/uglifier-1.0.3[ruby_targets_ruby18] >=dev-ruby/coffee-rails-3.2.1:3.2[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( ~dev-ruby/actionmailer-3.2.17[ruby_targets_ruby19] ~dev-ruby/actionpack-3.2.17[ruby_targets_ruby19] ~dev-ruby/activerecord-3.2.17[ruby_targets_ruby19] ~dev-ruby/activeresource-3.2.17[ruby_targets_ruby19] ~dev-ruby/activesupport-3.2.17[ruby_targets_ruby19] =dev-ruby/bundler-1*[ruby_targets_ruby19] ~dev-ruby/railties-3.2.17[ruby_targets_ruby19] asset-pipeline? ( dev-ruby/jquery-rails[ruby_targets_ruby19] >=dev-ruby/sass-rails-3.2.3:3.2[ruby_targets_ruby19] >=dev-ruby/uglifier-1.0.3[ruby_targets_ruby19] >=dev-ruby/coffee-rails-3.2.1:3.2[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
+REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 )
+SLOT=3.2
+SRC_URI=mirror://rubygems/rails-3.2.17.gem
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	java-utils-2	8d0d93b7a8605ea346cce4604f6db516	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	4021487250c740e3dc16b181228db818	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=eb1d0156059bbbc60efbdddf036da844
diff --git a/metadata/md5-cache/dev-ruby/rails-4.0.3 b/metadata/md5-cache/dev-ruby/rails-4.0.3
new file mode 100644
index 000000000000..c43011798f01
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/rails-4.0.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby19? ( ~dev-ruby/actionmailer-4.0.3[ruby_targets_ruby19] ~dev-ruby/actionpack-4.0.3[ruby_targets_ruby19] ~dev-ruby/activerecord-4.0.3[ruby_targets_ruby19] ~dev-ruby/activesupport-4.0.3[ruby_targets_ruby19] ~dev-ruby/railties-4.0.3[ruby_targets_ruby19] >=dev-ruby/bundler-1.3[ruby_targets_ruby19] =dev-ruby/bundler-1*[ruby_targets_ruby19] >=dev-ruby/sprockets-rails-2.0.0:2.0[ruby_targets_ruby19] asset-pipeline? ( dev-ruby/jquery-rails[ruby_targets_ruby19] >=dev-ruby/sass-rails-4.0.0:4.0[ruby_targets_ruby19] >=dev-ruby/uglifier-1.3.0[ruby_targets_ruby19] >=dev-ruby/coffee-rails-4.0.0:4.0[ruby_targets_ruby19] ) ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
+DESCRIPTION=ruby on rails is a web-application and persistance framework
+EAPI=5
+HOMEPAGE=http://www.rubyonrails.org
+IUSE=+asset-pipeline test elibc_FreeBSD ruby_targets_ruby19 test
+KEYWORDS=~amd64 ~arm
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby19? ( ~dev-ruby/actionmailer-4.0.3[ruby_targets_ruby19] ~dev-ruby/actionpack-4.0.3[ruby_targets_ruby19] ~dev-ruby/activerecord-4.0.3[ruby_targets_ruby19] ~dev-ruby/activesupport-4.0.3[ruby_targets_ruby19] ~dev-ruby/railties-4.0.3[ruby_targets_ruby19] >=dev-ruby/bundler-1.3[ruby_targets_ruby19] =dev-ruby/bundler-1*[ruby_targets_ruby19] >=dev-ruby/sprockets-rails-2.0.0:2.0[ruby_targets_ruby19] asset-pipeline? ( dev-ruby/jquery-rails[ruby_targets_ruby19] >=dev-ruby/sass-rails-4.0.0:4.0[ruby_targets_ruby19] >=dev-ruby/uglifier-1.3.0[ruby_targets_ruby19] >=dev-ruby/coffee-rails-4.0.0:4.0[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 )
+SLOT=4.0
+SRC_URI=mirror://rubygems/rails-4.0.3.gem
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	java-utils-2	8d0d93b7a8605ea346cce4604f6db516	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	4021487250c740e3dc16b181228db818	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=b7995dab73c51ab4bf0f49fe4ffbfebb
diff --git a/metadata/md5-cache/dev-ruby/railties-3.2.17 b/metadata/md5-cache/dev-ruby/railties-3.2.17
new file mode 100644
index 000000000000..b6edff9e09ef
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/railties-3.2.17
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby18? ( ~dev-ruby/activesupport-3.2.17[ruby_targets_ruby18] ~dev-ruby/actionpack-3.2.17[ruby_targets_ruby18] >=dev-ruby/rdoc-3.4[ruby_targets_ruby18] >=dev-ruby/thor-0.14.6[ruby_targets_ruby18] >=dev-ruby/rack-ssl-1.3.2:1.3[ruby_targets_ruby18] >=dev-ruby/rake-0.8.7[ruby_targets_ruby18] ) ruby_targets_ruby19? ( ~dev-ruby/activesupport-3.2.17[ruby_targets_ruby19] ~dev-ruby/actionpack-3.2.17[ruby_targets_ruby19] >=dev-ruby/rdoc-3.4[ruby_targets_ruby19] >=dev-ruby/thor-0.14.6[ruby_targets_ruby19] >=dev-ruby/rack-ssl-1.3.2:1.3[ruby_targets_ruby19] >=dev-ruby/rake-0.8.7[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/mocha:0.13[ruby_targets_ruby18] ) doc? ( >=dev-ruby/redcloth-4.1.1[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/mocha:0.13[ruby_targets_ruby19] ) doc? ( >=dev-ruby/redcloth-4.1.1[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( doc? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
+DESCRIPTION=Tools for creating, working with, and running Rails applications.
+EAPI=5
+HOMEPAGE=http://github.com/rails/rails
+IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 doc test test
+KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=>=app-admin/eselect-rails-0.18 ruby_targets_ruby18? ( ~dev-ruby/activesupport-3.2.17[ruby_targets_ruby18] ~dev-ruby/actionpack-3.2.17[ruby_targets_ruby18] >=dev-ruby/rdoc-3.4[ruby_targets_ruby18] >=dev-ruby/thor-0.14.6[ruby_targets_ruby18] >=dev-ruby/rack-ssl-1.3.2:1.3[ruby_targets_ruby18] >=dev-ruby/rake-0.8.7[ruby_targets_ruby18] ) ruby_targets_ruby19? ( ~dev-ruby/activesupport-3.2.17[ruby_targets_ruby19] ~dev-ruby/actionpack-3.2.17[ruby_targets_ruby19] >=dev-ruby/rdoc-3.4[ruby_targets_ruby19] >=dev-ruby/thor-0.14.6[ruby_targets_ruby19] >=dev-ruby/rack-ssl-1.3.2:1.3[ruby_targets_ruby19] >=dev-ruby/rake-0.8.7[ruby_targets_ruby19] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
+REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 )
+RESTRICT=test
+SLOT=3.2
+SRC_URI=http://github.com/rails/rails/archive/v3.2.17.tar.gz -> rails-3.2.17.tgz
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	java-utils-2	8d0d93b7a8605ea346cce4604f6db516	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	4021487250c740e3dc16b181228db818	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=8f8ce1e17ff67a162aa235e30432bf97
diff --git a/metadata/md5-cache/dev-ruby/railties-4.0.3 b/metadata/md5-cache/dev-ruby/railties-4.0.3
new file mode 100644
index 000000000000..46c46bea01d0
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/railties-4.0.3
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby19? ( ~dev-ruby/activesupport-4.0.3[ruby_targets_ruby19] ~dev-ruby/actionpack-4.0.3[ruby_targets_ruby19] >=dev-ruby/thor-0.18.1[ruby_targets_ruby19] >=dev-ruby/rake-0.8.7[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/mocha:0.13[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
+DESCRIPTION=Tools for creating, working with, and running Rails applications.
+EAPI=5
+HOMEPAGE=http://github.com/rails/rails
+IUSE=test elibc_FreeBSD ruby_targets_ruby19 test test
+KEYWORDS=~amd64 ~arm
+LICENSE=MIT
+RDEPEND=>=app-admin/eselect-rails-0.19 ruby_targets_ruby19? ( ~dev-ruby/activesupport-4.0.3[ruby_targets_ruby19] ~dev-ruby/actionpack-4.0.3[ruby_targets_ruby19] >=dev-ruby/thor-0.18.1[ruby_targets_ruby19] >=dev-ruby/rake-0.8.7[ruby_targets_ruby19] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 )
+RESTRICT=test
+SLOT=4.0
+SRC_URI=http://github.com/rails/rails/archive/v4.0.3.tar.gz -> rails-4.0.3.tgz
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	java-utils-2	8d0d93b7a8605ea346cce4604f6db516	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	4021487250c740e3dc16b181228db818	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=d68520bbf25ff26f19c5f7bfdbb830fc
diff --git a/metadata/md5-cache/dev-ruby/safe_yaml-1.0.1 b/metadata/md5-cache/dev-ruby/safe_yaml-1.0.1
new file mode 100644
index 000000000000..f7b621e8b2fd
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/safe_yaml-1.0.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby18? ( test? ( dev-ruby/hashie[ruby_targets_ruby18] dev-ruby/heredoc_unindent[ruby_targets_ruby18] dev-ruby/rspec:2[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/hashie[ruby_targets_ruby19] dev-ruby/heredoc_unindent[ruby_targets_ruby19] dev-ruby/rspec:2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/hashie[ruby_targets_ruby20] dev-ruby/heredoc_unindent[ruby_targets_ruby20] dev-ruby/rspec:2[ruby_targets_ruby20] ) ) ruby_targets_jruby? ( test? ( dev-ruby/hashie[ruby_targets_jruby] dev-ruby/heredoc_unindent[ruby_targets_jruby] dev-ruby/rspec:2[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/rdoc[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+DESCRIPTION=Parse YAML safely, without that pesky arbitrary object deserialization vulnerability
+EAPI=5
+HOMEPAGE=https://dtao.github.com/safe_yaml
+IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby doc test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
+REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby )
+SLOT=0
+SRC_URI=mirror://rubygems/safe_yaml-1.0.1.gem
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	java-utils-2	8d0d93b7a8605ea346cce4604f6db516	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	4021487250c740e3dc16b181228db818	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=ffc69497c95efccf729b1b4acb9b74ca
diff --git a/metadata/md5-cache/dev-ruby/session-3.1.1 b/metadata/md5-cache/dev-ruby/session-3.1.1
new file mode 100644
index 000000000000..4f7e73737e0a
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/session-3.1.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( || ( sys-apps/coreutils sys-freebsd/freebsd-bin ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+DESCRIPTION=A set of classes to drive external programs via pipe
+EAPI=5
+HOMEPAGE=http://codeforpeople.com/lib/ruby/session/
+IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby test
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+LICENSE=Ruby
+RDEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
+REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby )
+SLOT=0
+SRC_URI=mirror://rubygems/session-3.1.1.gem
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	java-utils-2	8d0d93b7a8605ea346cce4604f6db516	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	4021487250c740e3dc16b181228db818	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=e48bf1e8cf55c5db30ce2bcff5ddcb9b
diff --git a/metadata/md5-cache/dev-util/molecule-core-1.0.1 b/metadata/md5-cache/dev-util/molecule-core-1.0.1
index 9d8d2782832c..1338db37ad60 100644
--- a/metadata/md5-cache/dev-util/molecule-core-1.0.1
+++ b/metadata/md5-cache/dev-util/molecule-core-1.0.1
@@ -5,8 +5,8 @@ EAPI=5
 HOMEPAGE=http://www.sabayon.org
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=!<dev-util/molecule-1.0 sys-process/lsof dev-lang/python
+RDEPEND=!<dev-util/molecule-1 sys-process/lsof dev-lang/python
 SLOT=0
 SRC_URI=mirror://sabayon/dev-util/molecule-core-1.0.1.tar.bz2
 _eclasses_=multilib	fac675dcccf94392371a6abee62d909f	python	be9965681d83c3980660a2660ac95e95	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=936104aa4459ff66bf6a6a2164f67fc7
+_md5_=3d1681418cc0b31e6df6f93d9c964711
diff --git a/metadata/md5-cache/dev-util/molecule-plugins-1.0.1 b/metadata/md5-cache/dev-util/molecule-plugins-1.0.1
index b76700549023..5409e022df41 100644
--- a/metadata/md5-cache/dev-util/molecule-plugins-1.0.1
+++ b/metadata/md5-cache/dev-util/molecule-plugins-1.0.1
@@ -1,12 +1,12 @@
 DEFINED_PHASES=install postinst postrm setup
-DEPEND=~dev-util/molecule-core-1.0.1 !<dev-util/molecule-1.0 dev-lang/python
+DEPEND=~dev-util/molecule-core-1.0.1 !<dev-util/molecule-1 dev-lang/python
 DESCRIPTION=A set fo base plugins for Molecule
 EAPI=5
 HOMEPAGE=http://www.sabayon.org
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=~dev-util/molecule-core-1.0.1 !<dev-util/molecule-1.0 net-misc/rsync sys-fs/squashfs-tools sys-process/lsof virtual/cdrtools dev-lang/python
+RDEPEND=~dev-util/molecule-core-1.0.1 !<dev-util/molecule-1 net-misc/rsync sys-fs/squashfs-tools sys-process/lsof virtual/cdrtools dev-lang/python
 SLOT=0
 SRC_URI=mirror://sabayon/dev-util/molecule-plugins-1.0.1.tar.bz2
 _eclasses_=multilib	fac675dcccf94392371a6abee62d909f	python	be9965681d83c3980660a2660ac95e95	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=c1f1246770bdeb8f687c484f80a40110
+_md5_=2b901402cc7a16722cd65822cf1787db
diff --git a/metadata/md5-cache/dev-vcs/git-1.8.5.5 b/metadata/md5-cache/dev-vcs/git-1.8.5.5
index 9669f670fec9..221c7dd6b7eb 100644
--- a/metadata/md5-cache/dev-vcs/git-1.8.5.5
+++ b/metadata/md5-cache/dev-vcs/git-1.8.5.5
@@ -4,11 +4,11 @@ DESCRIPTION=GIT - the stupid content tracker, the revision control system heavil
 EAPI=5
 HOMEPAGE=http://www.git-scm.com/
 IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv mediawiki +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test python_targets_python2_6 python_targets_python2_7 python_single_target_python2_6 python_single_target_python2_7
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=dev-libs/openssl sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gnome-keyring? ( gnome-base/gnome-keyring ) gpg? ( app-crypt/gnupg ) mediawiki? ( dev-perl/HTML-Tree dev-perl/MediaWiki-API ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( virtual/perl-CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( gtk? ( >=dev-python/pygtk-2.8[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] >=dev-python/pygtksourceview-2.10.1-r1:2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) 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=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) subversion? ( perl ) webdav? ( curl ) gtk? ( python ) 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://git-core.googlecode.com/files/git-1.8.5.5.tar.gz mirror://kernel/software/scm/git/git-1.8.5.5.tar.gz http://git-core.googlecode.com/files/git-manpages-1.8.5.5.tar.gz mirror://kernel/software/scm/git/git-manpages-1.8.5.5.tar.gz doc? ( mirror://kernel/software/scm/git/git-htmldocs-1.8.5.5.tar.gz http://git-core.googlecode.com/files/git-htmldocs-1.8.5.5.tar.gz )
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	bash-completion-r1	db412e427e3317ffd3e15f17df269c5e	elisp-common	cec01e54df1bfd2fcca76a13ce2b2d27	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	1d50a6ea2d8d319e3205b005b3ed0dfa	python-single-r1	82a55861314bbcedaf1e08ed4dd651b3	python-utils-r1	ceb3e4c3ba203e28bb02eeb182d88acf	systemd	9f063b2cc19c5e8030911372aa246c4e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=3e6ce7820618a737eb2a6cf4fd396cf5
+_md5_=56e15b42992189891bc1440b24613481
diff --git a/metadata/md5-cache/gnome-extra/zenity-3.8.0-r1 b/metadata/md5-cache/gnome-extra/zenity-3.8.0-r2
similarity index 92%
rename from metadata/md5-cache/gnome-extra/zenity-3.8.0-r1
rename to metadata/md5-cache/gnome-extra/zenity-3.8.0-r2
index 7a1fad52074c..686ccfd438df 100644
--- a/metadata/md5-cache/gnome-extra/zenity-3.8.0-r1
+++ b/metadata/md5-cache/gnome-extra/zenity-3.8.0-r2
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
 DEPEND=>=dev-libs/glib-2.8:2 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3:3 x11-libs/libX11 x11-libs/pango libnotify? ( >=x11-libs/libnotify-0.6.1:= ) webkit? ( >=net-libs/webkit-gtk-1.4.0:3 ) >=dev-util/intltool-0.40 >=sys-devel/gettext-0.14 virtual/pkgconfig test? ( app-text/yelp-tools ) app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=Tool to display dialogs from the commandline and shell scripts
 EAPI=5
-HOMEPAGE=https://wiki.gnome.org/action/show/Projects/Zenity
+HOMEPAGE=https://wiki.gnome.org/Projects/Zenity
 IUSE=libnotify test +webkit debug
 KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux
 LICENSE=LGPL-2+
@@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/glib-2.8:2 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3:3 x11-libs
 SLOT=0
 SRC_URI=mirror://gnome/sources/zenity/3.8/zenity-3.8.0.tar.xz
 _eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	d7c71c6a7d871f567b416a363d65c3dc	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=11a92ca21a5a19a0e38ed12448553557
+_md5_=5e7cdeb096c6cf35d325e9ab3d7bc18b
diff --git a/metadata/md5-cache/media-libs/libogg-1.3.1 b/metadata/md5-cache/media-libs/libogg-1.3.1
index 9b6aa3dfc85f..b3ca64409fad 100644
--- a/metadata/md5-cache/media-libs/libogg-1.3.1
+++ b/metadata/md5-cache/media-libs/libogg-1.3.1
@@ -4,10 +4,10 @@ DESCRIPTION=the Ogg media file format library
 EAPI=5
 HOMEPAGE=http://xiph.org/ogg/
 IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=abi_x86_32? ( !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://downloads.xiph.org/releases/ogg/libogg-1.3.1.tar.xz
 _eclasses_=autotools	b0a4d5334d34abe7b6829eb87cf3c544	autotools-multilib	5beadd9860130ff93bfad7eb91d499e9	autotools-utils	559ed17194292ec42d68145dcca2fa32	eutils	40081e8c7e7f7c4f9db349a1d6d52925	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multibuild	56d4120419072116417e8de1bd1040ff	multilib	fac675dcccf94392371a6abee62d909f	multilib-build	198e1c7095dbce1ca2848aed0f96bf60	multilib-minimal	a481090a413ba6970bd9643494ef982f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=422812754e60000500a40841e0a6d051
+_md5_=c37e4ad01c82c51bb8c320f622fa9ad9
diff --git a/metadata/md5-cache/media-libs/nas-1.9.4 b/metadata/md5-cache/media-libs/nas-1.9.4
index 69790fe31c02..e30ebdcc9891 100644
--- a/metadata/md5-cache/media-libs/nas-1.9.4
+++ b/metadata/md5-cache/media-libs/nas-1.9.4
@@ -4,10 +4,10 @@ DESCRIPTION=Network Audio System
 EAPI=5
 HOMEPAGE=http://radscan.com/nas.html
 IUSE=doc static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd
+KEYWORDS=~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd
 LICENSE=HPND MIT
 RDEPEND=x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] x11-libs/libXaw x11-libs/libXext x11-libs/libXmu x11-libs/libXpm x11-libs/libXt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?]
 SLOT=0
 SRC_URI=mirror://sourceforge/nas/nas-1.9.4.src.tar.gz
 _eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	multibuild	56d4120419072116417e8de1bd1040ff	multilib	fac675dcccf94392371a6abee62d909f	multilib-build	198e1c7095dbce1ca2848aed0f96bf60	multilib-minimal	a481090a413ba6970bd9643494ef982f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=156e38df6538bf7171da89acec99aee8
+_md5_=f418416ab09520210fcd9f5ea98f70df
diff --git a/metadata/md5-cache/media-plugins/alsa-plugins-1.0.27-r1 b/metadata/md5-cache/media-plugins/alsa-plugins-1.0.27-r1
index 5e824a4238c6..c7f5d7696b44 100644
--- a/metadata/md5-cache/media-plugins/alsa-plugins-1.0.27-r1
+++ b/metadata/md5-cache/media-plugins/alsa-plugins-1.0.27-r1
@@ -4,10 +4,10 @@ DESCRIPTION=ALSA extra plugins
 EAPI=5
 HOMEPAGE=http://www.alsa-project.org/
 IUSE=debug ffmpeg jack libsamplerate pulseaudio speex
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux
+KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=>=media-libs/alsa-lib-1.0.27:= ffmpeg? ( virtual/ffmpeg ) jack? ( >=media-sound/jack-audio-connection-kit-0.98 ) libsamplerate? ( media-libs/libsamplerate:= ) pulseaudio? ( media-sound/pulseaudio ) speex? ( media-libs/speex:= )
 SLOT=0
 SRC_URI=mirror://alsaproject/plugins/alsa-plugins-1.0.27.tar.bz2
 _eclasses_=autotools	b0a4d5334d34abe7b6829eb87cf3c544	eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=9f2f99416996826555452a8e63989394
+_md5_=c78aa8a323e8e833f3d7c6dde2dcc210
diff --git a/metadata/md5-cache/media-plugins/vdr-vompserver-0.4.1 b/metadata/md5-cache/media-plugins/vdr-vompserver-0.4.1
new file mode 100644
index 000000000000..c4d6ca6b0504
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/vdr-vompserver-0.4.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
+DEPEND=>=media-video/vdr-1.7.36-r1 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DESCRIPTION=VDR Plugin: server part for MediaMVP device
+EAPI=5
+HOMEPAGE=http://www.loggytronic.com/vomp.php
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=media-video/vdr-1.7.36-r1 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
+SLOT=0
+SRC_URI=http://www.loggytronic.com/dl/vdr-vompserver-0.4.1.tgz
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	unpacker	738214fbf4fe7254493d5fc8a248262a	vdr-plugin-2	cfafcfb326f4cadfe8ea1267ffc14825
+_md5_=e7eb3e3dd6e5fe6b51d5deb37fbfa82f
diff --git a/metadata/md5-cache/media-sound/mikmod-3.2.5 b/metadata/md5-cache/media-sound/mikmod-3.2.5
index 18fb0e66e383..0cbda0943df8 100644
--- a/metadata/md5-cache/media-sound/mikmod-3.2.5
+++ b/metadata/md5-cache/media-sound/mikmod-3.2.5
@@ -8,4 +8,4 @@ LICENSE=GPL-2
 RDEPEND=>=media-libs/libmikmod-3.2.0 >=sys-libs/ncurses-5.7-r7
 SLOT=0
 SRC_URI=mirror://sourceforge/mikmod/mikmod-3.2.5.tar.gz
-_md5_=88ab1f029c6e8ae30f85483eb4e7b762
+_md5_=2cace8271f1db6e5936d6d4630162636
diff --git a/metadata/md5-cache/net-dialup/ppp-2.4.5-r1 b/metadata/md5-cache/net-dialup/ppp-2.4.5-r1
deleted file mode 100644
index 2608639731f2..000000000000
--- a/metadata/md5-cache/net-dialup/ppp-2.4.5-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=activefilter? ( net-libs/libpcap ) atm? ( net-dialup/linux-atm ) pam? ( virtual/pam ) gtk? ( x11-libs/gtk+:2 ) eap-tls? ( net-misc/curl dev-libs/openssl )
-DESCRIPTION=Point-to-Point Protocol (PPP)
-EAPI=2
-HOMEPAGE=http://www.samba.org/ppp
-IUSE=activefilter atm dhcp eap-tls gtk ipv6 pam radius
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86
-LICENSE=BSD GPL-2
-RDEPEND=activefilter? ( net-libs/libpcap ) atm? ( net-dialup/linux-atm ) pam? ( virtual/pam ) gtk? ( x11-libs/gtk+:2 ) eap-tls? ( net-misc/curl dev-libs/openssl )
-SLOT=0
-SRC_URI=ftp://ftp.samba.org/pub/ppp/ppp-2.4.5.tar.gz mirror://gentoo/ppp-2.4.5-gentoo-20101127.tar.gz dhcp? ( http://www.netservers.co.uk/gpl/ppp-dhcpc.tgz )
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	linux-info	a9cbd6bbe2b28166e403321882f3c73c	multilib	fac675dcccf94392371a6abee62d909f	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=c9b5e20b16ac23fd9b4f1eb864ae5be8
diff --git a/metadata/md5-cache/net-dialup/ppp-2.4.5-r2 b/metadata/md5-cache/net-dialup/ppp-2.4.6
similarity index 74%
rename from metadata/md5-cache/net-dialup/ppp-2.4.5-r2
rename to metadata/md5-cache/net-dialup/ppp-2.4.6
index 265a9a1b38a1..13573f1a7eef 100644
--- a/metadata/md5-cache/net-dialup/ppp-2.4.5-r2
+++ b/metadata/md5-cache/net-dialup/ppp-2.4.6
@@ -1,13 +1,13 @@
-DEFINED_PHASES=compile configure install postinst prepare setup
+DEFINED_PHASES=compile install postinst prepare setup
 DEPEND=activefilter? ( net-libs/libpcap ) atm? ( net-dialup/linux-atm ) pam? ( virtual/pam ) gtk? ( x11-libs/gtk+:2 ) eap-tls? ( net-misc/curl dev-libs/openssl )
 DESCRIPTION=Point-to-Point Protocol (PPP)
-EAPI=2
+EAPI=5
 HOMEPAGE=http://www.samba.org/ppp
 IUSE=activefilter atm dhcp eap-tls gtk ipv6 pam radius
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=BSD GPL-2
 RDEPEND=activefilter? ( net-libs/libpcap ) atm? ( net-dialup/linux-atm ) pam? ( virtual/pam ) gtk? ( x11-libs/gtk+:2 ) eap-tls? ( net-misc/curl dev-libs/openssl )
-SLOT=0
-SRC_URI=ftp://ftp.samba.org/pub/ppp/ppp-2.4.5.tar.gz http://dev.gentoo.org/~flameeyes/qa-copies/ppp-2.4.5-gentoo-20111111.tar.gz dhcp? ( http://www.netservers.co.uk/gpl/ppp-dhcpc.tgz )
+SLOT=0/2.4.6
+SRC_URI=ftp://ftp.samba.org/pub/ppp/ppp-2.4.6.tar.gz http://dev.gentoo.org/~polynomial-c/ppp-2.4.6-patches-1.tar.xz http://www.netservers.net.uk/gpl/ppp-dhcpc.tgz
 _eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	linux-info	a9cbd6bbe2b28166e403321882f3c73c	multilib	fac675dcccf94392371a6abee62d909f	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=f0f242c07752206d0c23c1dfe3dd59c9
+_md5_=4c6f49c6974a119509d2befd9bf02b32
diff --git a/metadata/md5-cache/net-firewall/iptables-1.4.21-r1 b/metadata/md5-cache/net-firewall/iptables-1.4.21-r1
new file mode 100644
index 000000000000..05465521dd10
--- /dev/null
+++ b/metadata/md5-cache/net-firewall/iptables-1.4.21-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=netlink? ( net-libs/libnfnetlink ) virtual/os-headers virtual/pkgconfig virtual/pkgconfig
+DESCRIPTION=Linux kernel (2.4+) firewall, NAT and packet mangling tools
+EAPI=5
+HOMEPAGE=http://www.netfilter.org/projects/iptables/
+IUSE=ipv6 netlink static-libs
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=netlink? ( net-libs/libnfnetlink )
+SLOT=0
+SRC_URI=http://www.netfilter.org/projects/iptables/files/iptables-1.4.21.tar.bz2
+_eclasses_=autotools	b0a4d5334d34abe7b6829eb87cf3c544	eutils	40081e8c7e7f7c4f9db349a1d6d52925	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	systemd	9f063b2cc19c5e8030911372aa246c4e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=12aa9d4cd4f1328bc664694c51d3ea8a
diff --git a/metadata/md5-cache/net-fs/samba-4.0.13 b/metadata/md5-cache/net-fs/samba-4.0.15
similarity index 96%
rename from metadata/md5-cache/net-fs/samba-4.0.13
rename to metadata/md5-cache/net-fs/samba-4.0.15
index 472f829f41a6..473f420d2a1f 100644
--- a/metadata/md5-cache/net-fs/samba-4.0.13
+++ b/metadata/md5-cache/net-fs/samba-4.0.15
@@ -10,6 +10,6 @@ RDEPEND=python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targ
 REQUIRED_USE=ads? ( acl ldap )
 RESTRICT=mirror
 SLOT=0
-SRC_URI=mirror://samba/stable/samba-4.0.13.tar.gz
+SRC_URI=mirror://samba/stable/samba-4.0.15.tar.gz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	linux-info	a9cbd6bbe2b28166e403321882f3c73c	multibuild	56d4120419072116417e8de1bd1040ff	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	3bb814ab7959a36067101a6bef683b6f	python-utils-r1	ceb3e4c3ba203e28bb02eeb182d88acf	systemd	9f063b2cc19c5e8030911372aa246c4e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	waf-utils	6fae459bd65a96ab400f7b9dc8a3fc72
-_md5_=22db328b0c952291ceedca715cba258e
+_md5_=5a0e7a2f0cbb5d6fc8d7fd8cc6b9e4fc
diff --git a/metadata/md5-cache/net-im/gajim-0.15.3-r1 b/metadata/md5-cache/net-im/gajim-0.15.3-r1
index a30cbd9895fa..faa20197c267 100644
--- a/metadata/md5-cache/net-im/gajim-0.15.3-r1
+++ b/metadata/md5-cache/net-im/gajim-0.15.3-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Jabber client written in PyGTK
 EAPI=5
 HOMEPAGE=http://www.gajim.org/
 IUSE=avahi crypt dbus gnome kde idle jingle libnotify networkmanager nls spell +srv test X xhtml python_targets_python2_6 python_targets_python2_7
-KEYWORDS=alpha amd64 ~arm ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd
+KEYWORDS=alpha amd64 ~arm ia64 ppc ppc64 sparc x86 ~x86-fbsd
 LICENSE=GPL-3
 RDEPEND=python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6[sqlite,xml] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,xml] ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/pygtk:2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] x11-libs/gtk+:2 dev-python/pyasn1[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/pyopenssl[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] crypt? ( app-crypt/gnupg dev-python/pycrypto[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) dbus? ( dev-python/dbus-python[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-libs/dbus-glib libnotify? ( dev-python/notify-python[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) avahi? ( net-dns/avahi[dbus,gtk,python] ) ) gnome? ( dev-python/libgnome-python dev-python/gnome-keyring-python dev-python/egg-python ) idle? ( x11-libs/libXScrnSaver ) jingle? ( net-libs/farstream:0.1[python] ) kde? ( kde-base/kwallet ) networkmanager? ( dev-python/dbus-python[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] net-misc/networkmanager ) spell? ( app-text/gtkspell:2 ) srv? ( || ( dev-python/libasyncns-python net-dns/bind-tools ) ) xhtml? ( dev-python/docutils )
 REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 ) libnotify? ( dbus ) avahi? ( dbus )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://www.gajim.org/downloads/0.15/gajim-0.15.3.tar.bz2
 _eclasses_=autotools	b0a4d5334d34abe7b6829eb87cf3c544	autotools-utils	559ed17194292ec42d68145dcca2fa32	eutils	40081e8c7e7f7c4f9db349a1d6d52925	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multibuild	56d4120419072116417e8de1bd1040ff	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	3bb814ab7959a36067101a6bef683b6f	python-utils-r1	ceb3e4c3ba203e28bb02eeb182d88acf	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=51d470a8d6f479000eebd93a3160f847
+_md5_=0873453436462db12fe5143c34cf4fea
diff --git a/metadata/md5-cache/net-im/gajim-0.15.4 b/metadata/md5-cache/net-im/gajim-0.15.4
index ec0f4e51b709..a367eac0bf16 100644
--- a/metadata/md5-cache/net-im/gajim-0.15.4
+++ b/metadata/md5-cache/net-im/gajim-0.15.4
@@ -4,7 +4,7 @@ DESCRIPTION=Jabber client written in PyGTK
 EAPI=5
 HOMEPAGE=http://www.gajim.org/
 IUSE=avahi crypt dbus gnome gnome-keyring kde idle jingle libnotify networkmanager nls spell +srv test X xhtml python_targets_python2_6 python_targets_python2_7
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
 LICENSE=GPL-3
 RDEPEND=python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6[sqlite,xml] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,xml] ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/pygtk:2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] x11-libs/gtk+:2 dev-python/pyasn1[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/pyopenssl[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] crypt? ( app-crypt/gnupg dev-python/pycrypto[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) dbus? ( dev-python/dbus-python[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-libs/dbus-glib libnotify? ( dev-python/notify-python[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) avahi? ( net-dns/avahi[dbus,gtk,python] ) ) gnome? ( dev-python/libgnome-python dev-python/egg-python ) gnome-keyring? ( dev-python/gnome-keyring-python ) idle? ( x11-libs/libXScrnSaver ) jingle? ( net-libs/farstream:0.1[python] ) kde? ( kde-base/kwallet ) networkmanager? ( dev-python/dbus-python[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] net-misc/networkmanager ) spell? ( app-text/gtkspell:2 ) srv? ( || ( dev-python/libasyncns-python net-dns/bind-tools ) ) xhtml? ( dev-python/docutils )
 REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 ) libnotify? ( dbus ) avahi? ( dbus ) gnome? ( gnome-keyring )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://www.gajim.org/downloads/0.15/gajim-0.15.4.tar.bz2
 _eclasses_=autotools	b0a4d5334d34abe7b6829eb87cf3c544	autotools-utils	559ed17194292ec42d68145dcca2fa32	eutils	40081e8c7e7f7c4f9db349a1d6d52925	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multibuild	56d4120419072116417e8de1bd1040ff	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	3bb814ab7959a36067101a6bef683b6f	python-utils-r1	ceb3e4c3ba203e28bb02eeb182d88acf	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=3690be0f54c1057ebb847c541cadb247
+_md5_=f8dc33f69c36770f9ceaad40cd42177e
diff --git a/metadata/md5-cache/net-im/gajim-0.16_beta1 b/metadata/md5-cache/net-im/gajim-0.16_beta1
index c552d226bf6a..ba02841a170f 100644
--- a/metadata/md5-cache/net-im/gajim-0.16_beta1
+++ b/metadata/md5-cache/net-im/gajim-0.16_beta1
@@ -4,7 +4,7 @@ DESCRIPTION=Jabber client written in PyGTK
 EAPI=5
 HOMEPAGE=http://www.gajim.org/
 IUSE=avahi crypt dbus gnome gnome-keyring kde idle jingle libnotify networkmanager nls spell +srv test X xhtml python_targets_python2_6 python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~hppa ~x86 ~x86-fbsd
+KEYWORDS=~amd64 ~arm ~x86 ~x86-fbsd
 LICENSE=GPL-3
 RDEPEND=python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6[sqlite,xml] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,xml] ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/pygtk:2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] x11-libs/gtk+:2 dev-python/pyasn1[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/pyopenssl[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/python-nbxmpp[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] crypt? ( app-crypt/gnupg dev-python/pycrypto[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) dbus? ( dev-python/dbus-python[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-libs/dbus-glib libnotify? ( dev-python/notify-python[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) avahi? ( net-dns/avahi[dbus,gtk,python,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) ) gnome? ( dev-python/libgnome-python dev-python/egg-python ) gnome-keyring? ( dev-python/gnome-keyring-python ) idle? ( x11-libs/libXScrnSaver ) jingle? ( net-libs/farstream:0.1[python] ) kde? ( kde-base/kwallet ) networkmanager? ( dev-python/dbus-python[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] net-misc/networkmanager ) spell? ( app-text/gtkspell:2 ) srv? ( || ( dev-python/libasyncns-python net-dns/bind-tools ) ) xhtml? ( dev-python/docutils[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] )
 REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 ) libnotify? ( dbus ) avahi? ( dbus ) gnome? ( gnome-keyring )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://www.gajim.org/downloads/0.16/gajim-0.16-beta1.tar.bz2
 _eclasses_=autotools	b0a4d5334d34abe7b6829eb87cf3c544	autotools-utils	559ed17194292ec42d68145dcca2fa32	eutils	40081e8c7e7f7c4f9db349a1d6d52925	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multibuild	56d4120419072116417e8de1bd1040ff	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	3bb814ab7959a36067101a6bef683b6f	python-utils-r1	ceb3e4c3ba203e28bb02eeb182d88acf	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=3a30a1acef17e3bb2b85f3fd2b868ade
+_md5_=62d25db56ddd3d16e2f4f9ca014ac65d
diff --git a/metadata/md5-cache/net-im/gajim-0.16_beta2 b/metadata/md5-cache/net-im/gajim-0.16_beta2
index 87d37a3eaf39..ab5529f1c031 100644
--- a/metadata/md5-cache/net-im/gajim-0.16_beta2
+++ b/metadata/md5-cache/net-im/gajim-0.16_beta2
@@ -4,7 +4,7 @@ DESCRIPTION=Jabber client written in PyGTK
 EAPI=5
 HOMEPAGE=http://www.gajim.org/
 IUSE=avahi crypt dbus gnome gnome-keyring kde idle jingle libnotify networkmanager nls spell +srv test X xhtml python_targets_python2_6 python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~hppa ~x86 ~x86-fbsd
+KEYWORDS=~amd64 ~arm ~x86 ~x86-fbsd
 LICENSE=GPL-3
 RDEPEND=python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6[sqlite,xml] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,xml] ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/pygtk:2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] x11-libs/gtk+:2 dev-python/pyasn1[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/pyopenssl[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] >=dev-python/python-nbxmpp-0.3[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] crypt? ( app-crypt/gnupg dev-python/pycrypto[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) dbus? ( dev-python/dbus-python[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-libs/dbus-glib libnotify? ( dev-python/notify-python[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) avahi? ( net-dns/avahi[dbus,gtk,python,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) ) gnome? ( dev-python/libgnome-python dev-python/egg-python ) gnome-keyring? ( dev-python/gnome-keyring-python ) idle? ( x11-libs/libXScrnSaver ) jingle? ( net-libs/farstream:0.1[python] ) kde? ( kde-base/kwallet ) networkmanager? ( dev-python/dbus-python[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] net-misc/networkmanager ) spell? ( app-text/gtkspell:2 ) srv? ( || ( dev-python/libasyncns-python[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] net-dns/bind-tools ) ) xhtml? ( dev-python/docutils[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] )
 REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 ) libnotify? ( dbus ) avahi? ( dbus ) gnome? ( gnome-keyring )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://www.gajim.org/downloads/0.16/gajim-0.16-beta2.tar.bz2
 _eclasses_=autotools	b0a4d5334d34abe7b6829eb87cf3c544	autotools-utils	559ed17194292ec42d68145dcca2fa32	eutils	40081e8c7e7f7c4f9db349a1d6d52925	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multibuild	56d4120419072116417e8de1bd1040ff	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	3bb814ab7959a36067101a6bef683b6f	python-utils-r1	ceb3e4c3ba203e28bb02eeb182d88acf	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=d442cb5824b5ea861d92f683663c60f1
+_md5_=6f926a502bbbef8591e5e5b86eed1ae2
diff --git a/metadata/md5-cache/net-libs/libkpeople-0.2.0 b/metadata/md5-cache/net-libs/libkpeople-0.2.0
new file mode 100644
index 000000000000..075708496b8b
--- /dev/null
+++ b/metadata/md5-cache/net-libs/libkpeople-0.2.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
+DEPEND=dev-libs/shared-desktop-ontologies dev-libs/soprano >=kde-base/nepomuk-core-4.4:4[aqua=] >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.4:4[aqua=]
+DESCRIPTION=KDE contact person abstraction library
+EAPI=5
+HOMEPAGE=https://projects.kde.org/projects/playground/network/libkpeople
+IUSE=debug examples test linguas_bs linguas_cs linguas_da linguas_de linguas_el linguas_fr linguas_hu linguas_lt linguas_nl linguas_pt linguas_pt_BR linguas_sk linguas_sl linguas_sv linguas_uk test aqua
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=dev-libs/shared-desktop-ontologies dev-libs/soprano >=kde-base/nepomuk-core-4.4:4[aqua=] >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_bs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_bs(+)] ) linguas_cs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_el? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_el(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fr(+)] ) linguas_hu? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hu(+)] ) linguas_lt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_lt(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) linguas_sk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sk(+)] ) linguas_sl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sl(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sv(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_uk(+)] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 >=kde-base/kdelibs-4.4:4[aqua=]
+SLOT=4
+SRC_URI=mirror://kde/unstable/libkpeople/0.2.0/src/libkpeople-0.2.0.tar.bz2
+_eclasses_=cmake-utils	db5236989678f4de51b2588767b5b69d	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	gnome2-utils	d7c71c6a7d871f567b416a363d65c3dc	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_md5_=0924c714a6ae06e87432621463e62eba
diff --git a/metadata/md5-cache/net-libs/libmm-qt-0.5.1 b/metadata/md5-cache/net-libs/libmm-qt-1.0.1
similarity index 80%
rename from metadata/md5-cache/net-libs/libmm-qt-0.5.1
rename to metadata/md5-cache/net-libs/libmm-qt-1.0.1
index 2d42616b1885..03ecc73d987b 100644
--- a/metadata/md5-cache/net-libs/libmm-qt-0.5.1
+++ b/metadata/md5-cache/net-libs/libmm-qt-1.0.1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=dev-qt/qtcore:4 dev-qt/qtdbus:4 net-misc/mobile-broadband-provider-info >=net-misc/networkmanager-0.9.0[modemmanager] >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+DEPEND=dev-qt/qtcore:4 dev-qt/qtdbus:4 net-misc/mobile-broadband-provider-info >=net-misc/networkmanager-0.9.8[modemmanager] >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
 DESCRIPTION=Modemmanager bindings for Qt
 EAPI=5
 HOMEPAGE=https://projects.kde.org/projects/extragear/libs/libmm-qt
 IUSE=debug aqua
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2
-RDEPEND=dev-qt/qtcore:4 dev-qt/qtdbus:4 net-misc/mobile-broadband-provider-info >=net-misc/networkmanager-0.9.0[modemmanager]
+RDEPEND=dev-qt/qtcore:4 dev-qt/qtdbus:4 net-misc/mobile-broadband-provider-info >=net-misc/networkmanager-0.9.8[modemmanager]
 SLOT=0
-SRC_URI=mirror://kde/unstable/modemmanager-qt/0.5.1/src/libmm-qt-0.5.1.tar.xz
+SRC_URI=mirror://kde/unstable/modemmanager-qt/1.0.1/src/libmm-qt-1.0.1.tar.xz
 _eclasses_=cmake-utils	db5236989678f4de51b2588767b5b69d	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	gnome2-utils	d7c71c6a7d871f567b416a363d65c3dc	kde4-base	69202d76db3d1d9f8c87db021f493824	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=0d21628850000f9d6e5d672414df7aea
+_md5_=3316efac86321fb93a5f0911a67cbecb
diff --git a/metadata/md5-cache/net-mail/notmuch-0.17 b/metadata/md5-cache/net-mail/notmuch-0.17
index 5271c14ad6bb..eb59d8bcc07f 100644
--- a/metadata/md5-cache/net-mail/notmuch-0.17
+++ b/metadata/md5-cache/net-mail/notmuch-0.17
@@ -4,11 +4,11 @@ DESCRIPTION=Thread-based e-mail indexer, supporting quick search and tagging
 EAPI=5
 HOMEPAGE=http://notmuchmail.org/
 IUSE=bash-completion crypt debug doc emacs mutt nmbug python test zsh-completion python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=>=dev-libs/glib-2.22 >=dev-libs/gmime-2.6.7 !=dev-libs/gmime-2.6.19 <dev-libs/xapian-1.3 sys-libs/talloc debug? ( dev-util/valgrind ) emacs? ( >=virtual/emacs-23 ) python? ( 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 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] ) x86? ( >=dev-libs/xapian-1.2.7-r2 ) crypt? ( app-crypt/gnupg ) nmbug? ( dev-vcs/git virtual/perl-File-Temp virtual/perl-PodParser ) mutt? ( dev-perl/File-Which dev-perl/Mail-Box dev-perl/MailTools dev-perl/String-ShellQuote dev-perl/Term-ReadLine-Gnu virtual/perl-Digest-SHA virtual/perl-File-Path virtual/perl-Getopt-Long virtual/perl-PodParser ) zsh-completion? ( app-shells/zsh )
 REQUIRED_USE=python? ( || ( python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 ) ) test? ( crypt emacs python )
 SLOT=0
 SRC_URI=http://notmuchmail.org/releases/notmuch-0.17.tar.gz
 _eclasses_=distutils-r1	364122897f9dc771167ee5ff362e54e1	elisp-common	cec01e54df1bfd2fcca76a13ce2b2d27	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multibuild	56d4120419072116417e8de1bd1040ff	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	pax-utils	2424f959506320f5196de8f79fa05297	python-r1	3bb814ab7959a36067101a6bef683b6f	python-utils-r1	ceb3e4c3ba203e28bb02eeb182d88acf	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=45ab0bd503652647ffcea52f6ff6bf44
+_md5_=0e6cd332c6a63b2e460cf52090f4043b
diff --git a/metadata/md5-cache/net-misc/rabbitmq-server-3.2.1 b/metadata/md5-cache/net-misc/rabbitmq-server-3.2.1
deleted file mode 100644
index 75203c2687cb..000000000000
--- a/metadata/md5-cache/net-misc/rabbitmq-server-3.2.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst setup
-DEPEND=dev-lang/erlang app-arch/zip app-arch/unzip app-text/docbook-xml-dtd:4.5 app-text/xmlto dev-libs/libxslt dev-python/simplejson virtual/pkgconfig
-DESCRIPTION=RabbitMQ is a high-performance AMQP-compliant message broker written in Erlang.
-EAPI=5
-HOMEPAGE=http://www.rabbitmq.com/
-IUSE=python_targets_python2_6 python_targets_python2_7 python_single_target_python2_6 python_single_target_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 MPL-1.1
-RDEPEND=dev-lang/erlang
-SLOT=0
-SRC_URI=http://www.rabbitmq.com/releases/rabbitmq-server/v3.2.1/rabbitmq-server-3.2.1.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	python-single-r1	82a55861314bbcedaf1e08ed4dd651b3	python-utils-r1	ceb3e4c3ba203e28bb02eeb182d88acf	systemd	9f063b2cc19c5e8030911372aa246c4e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=d8f4ef89f749284610b8fbc84e68ee8a
diff --git a/metadata/md5-cache/net-misc/rabbitmq-server-3.1.3 b/metadata/md5-cache/net-misc/rabbitmq-server-3.2.3
similarity index 86%
rename from metadata/md5-cache/net-misc/rabbitmq-server-3.1.3
rename to metadata/md5-cache/net-misc/rabbitmq-server-3.2.3
index 182f2cc68467..5eb2c518d987 100644
--- a/metadata/md5-cache/net-misc/rabbitmq-server-3.1.3
+++ b/metadata/md5-cache/net-misc/rabbitmq-server-3.2.3
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2 MPL-1.1
 RDEPEND=dev-lang/erlang
 SLOT=0
-SRC_URI=http://www.rabbitmq.com/releases/rabbitmq-server/v3.1.3/rabbitmq-server-3.1.3.tar.gz
+SRC_URI=http://www.rabbitmq.com/releases/rabbitmq-server/v3.2.3/rabbitmq-server-3.2.3.tar.gz
 _eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	python-single-r1	82a55861314bbcedaf1e08ed4dd651b3	python-utils-r1	ceb3e4c3ba203e28bb02eeb182d88acf	systemd	9f063b2cc19c5e8030911372aa246c4e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=6e8aabf10c93e3fd7b1a52fb4e0f12a0
+_md5_=32e9dfb482c57d5643dd8a90de12b7db
diff --git a/metadata/md5-cache/net-misc/stuntman-1.2.6-r1 b/metadata/md5-cache/net-misc/stuntman-1.2.6-r1
new file mode 100644
index 000000000000..e6aa3b6ddb42
--- /dev/null
+++ b/metadata/md5-cache/net-misc/stuntman-1.2.6-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install test
+DEPEND=dev-libs/boost dev-libs/openssl
+DESCRIPTION=STUNTMAN is an open source implementation of the STUN protocol.
+EAPI=5
+HOMEPAGE=http://www.stunprotocol.org
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-libs/boost dev-libs/openssl
+SLOT=0
+SRC_URI=http://www.stunprotocol.org/stunserver-1.2.6.tgz
+_md5_=6576fc743a8bf6e4264b7414af082e40
diff --git a/metadata/md5-cache/net-proxy/squid-3.4.3 b/metadata/md5-cache/net-proxy/squid-3.4.3
new file mode 100644
index 000000000000..6faf872ff002
--- /dev/null
+++ b/metadata/md5-cache/net-proxy/squid-3.4.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst prepare pretend setup
+DEPEND=caps? ( >=sys-libs/libcap-2.16 ) pam? ( virtual/pam ) ldap? ( net-nds/openldap ) kerberos? ( virtual/krb5 ) qos? ( net-libs/libnetfilter_conntrack ) ssl? ( dev-libs/openssl ) sasl? ( dev-libs/cyrus-sasl ) ecap? ( net-libs/libecap:0.2 ) selinux? ( sec-policy/selinux-squid ) !x86-fbsd? ( logrotate? ( app-admin/logrotate ) ) >=sys-libs/db-4 sys-devel/libtool dev-lang/perl sys-devel/libtool sys-apps/ed test? ( dev-util/cppunit ) !<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=A full-featured web proxy cache
+EAPI=5
+HOMEPAGE=http://www.squid-cache.org/
+IUSE=caps ipv6 pam ldap samba sasl kerberos nis radius ssl snmp selinux logrotate test ecap icap-client ssl-crtd mysql postgres sqlite qos tproxy +htcp +wccp +wccp2 pf-transparent ipf-transparent kqueue elibc_uclibc kernel_linux
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=caps? ( >=sys-libs/libcap-2.16 ) pam? ( virtual/pam ) ldap? ( net-nds/openldap ) kerberos? ( virtual/krb5 ) qos? ( net-libs/libnetfilter_conntrack ) ssl? ( dev-libs/openssl ) sasl? ( dev-libs/cyrus-sasl ) ecap? ( net-libs/libecap:0.2 ) selinux? ( sec-policy/selinux-squid ) !x86-fbsd? ( logrotate? ( app-admin/logrotate ) ) >=sys-libs/db-4 sys-devel/libtool dev-lang/perl sys-devel/libtool samba? ( net-fs/samba ) mysql? ( dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg ) sqlite? ( dev-perl/DBD-SQLite ) !<=sci-biology/meme-4.8.1-r1
+REQUIRED_USE=tproxy? ( caps ) qos? ( caps )
+SLOT=0
+SRC_URI=ftp://ftp.squid-cache.org/pub/archive/3.4/squid-3.4.3.tar.xz
+_eclasses_=autotools	b0a4d5334d34abe7b6829eb87cf3c544	eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	libtool	b9b3340e3a19510f0d9f05cfccbf209f	linux-info	a9cbd6bbe2b28166e403321882f3c73c	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=fd1452589fe2312e85d8721df700d59e
diff --git a/metadata/md5-cache/net-wireless/blueman-1.21-r1 b/metadata/md5-cache/net-wireless/blueman-1.21-r1
index 080d2a8926c5..0eb413246aee 100644
--- a/metadata/md5-cache/net-wireless/blueman-1.21-r1
+++ b/metadata/md5-cache/net-wireless/blueman-1.21-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=dev-libs/glib:2 >=x11-libs/gtk+-2.12:2 x11-libs/startup-notification dev-python/pygobject:2 >=net-wireless/bluez-4.21 nls? ( dev-util/intltool sys-devel/gettext ) virtual/pkgconfig >=dev-python/pyrex-0.9.8 =dev-lang/python-2* >=sys-apps/sed-4
+DEPEND=dev-libs/glib:2 >=x11-libs/gtk+-2.12:2 x11-libs/startup-notification dev-python/pygobject:2 <net-wireless/bluez-5 >=net-wireless/bluez-4.21 nls? ( dev-util/intltool sys-devel/gettext ) virtual/pkgconfig >=dev-python/pyrex-0.9.8 =dev-lang/python-2* >=sys-apps/sed-4
 DESCRIPTION=GTK+ Bluetooth Manager, designed to be simple and intuitive for everyday bluetooth tasks.
 EAPI=3
 HOMEPAGE=http://blueman-project.org/
 IUSE=gnome network nls policykit pulseaudio
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-3
-RDEPEND=dev-libs/glib:2 >=x11-libs/gtk+-2.12:2 x11-libs/startup-notification dev-python/pygobject:2 >=net-wireless/bluez-4.21 >=app-mobilephone/obex-data-server-0.4.4 sys-apps/dbus dev-python/pygtk dev-python/notify-python dev-python/dbus-python gnome? ( dev-python/gconf-python ) network? ( || ( net-dns/dnsmasq =net-misc/dhcp-3* >=net-misc/networkmanager-0.8 ) ) policykit? ( sys-auth/polkit ) pulseaudio? ( media-sound/pulseaudio ) =dev-lang/python-2*
+RDEPEND=dev-libs/glib:2 >=x11-libs/gtk+-2.12:2 x11-libs/startup-notification dev-python/pygobject:2 <net-wireless/bluez-5 >=net-wireless/bluez-4.21 >=app-mobilephone/obex-data-server-0.4.4 sys-apps/dbus dev-python/pygtk dev-python/notify-python dev-python/dbus-python gnome? ( dev-python/gconf-python ) network? ( || ( net-dns/dnsmasq =net-misc/dhcp-3* >=net-misc/networkmanager-0.8 ) ) policykit? ( sys-auth/polkit ) pulseaudio? ( media-sound/pulseaudio ) =dev-lang/python-2*
 SLOT=0
 SRC_URI=http://download.tuxfamily.org/blueman/blueman-1.21.tar.gz
 _eclasses_=gnome2-utils	d7c71c6a7d871f567b416a363d65c3dc	multilib	fac675dcccf94392371a6abee62d909f	python	be9965681d83c3980660a2660ac95e95	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=a69de6bc2952917d665a1f9977e50edb
+_md5_=bafd6ac47095d2a05580248ea1ae1e2d
diff --git a/metadata/md5-cache/net-wireless/blueman-1.23 b/metadata/md5-cache/net-wireless/blueman-1.23
index 9c612f5bcb27..f287200349ae 100644
--- a/metadata/md5-cache/net-wireless/blueman-1.23
+++ b/metadata/md5-cache/net-wireless/blueman-1.23
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=dev-libs/glib:2 >=x11-libs/gtk+-2.12:2 x11-libs/startup-notification dev-python/pygobject:2 >=net-wireless/bluez-4.21 nls? ( dev-util/intltool sys-devel/gettext ) virtual/pkgconfig >=dev-python/pyrex-0.9.8 =dev-lang/python-2* >=sys-apps/sed-4
+DEPEND=dev-libs/glib:2 >=x11-libs/gtk+-2.12:2 x11-libs/startup-notification dev-python/pygobject:2 <net-wireless/bluez-5 >=net-wireless/bluez-4.21 nls? ( dev-util/intltool sys-devel/gettext ) virtual/pkgconfig >=dev-python/pyrex-0.9.8 =dev-lang/python-2* >=sys-apps/sed-4
 DESCRIPTION=GTK+ Bluetooth Manager, designed to be simple and intuitive for everyday bluetooth tasks.
 EAPI=4
 HOMEPAGE=http://blueman-project.org/
 IUSE=gconf sendto network nls policykit pulseaudio
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-3
-RDEPEND=dev-libs/glib:2 >=x11-libs/gtk+-2.12:2 x11-libs/startup-notification dev-python/pygobject:2 >=net-wireless/bluez-4.21 >=app-mobilephone/obex-data-server-0.4.4 sys-apps/dbus dev-python/pygtk dev-python/notify-python dev-python/dbus-python x11-themes/hicolor-icon-theme gconf? ( dev-python/gconf-python ) sendto? ( gnome-base/nautilus ) network? ( || ( net-dns/dnsmasq =net-misc/dhcp-3* >=net-misc/networkmanager-0.8 ) ) policykit? ( sys-auth/polkit ) pulseaudio? ( media-sound/pulseaudio ) =dev-lang/python-2*
+RDEPEND=dev-libs/glib:2 >=x11-libs/gtk+-2.12:2 x11-libs/startup-notification dev-python/pygobject:2 <net-wireless/bluez-5 >=net-wireless/bluez-4.21 >=app-mobilephone/obex-data-server-0.4.4 sys-apps/dbus dev-python/pygtk dev-python/notify-python dev-python/dbus-python x11-themes/hicolor-icon-theme gconf? ( dev-python/gconf-python ) sendto? ( gnome-base/nautilus ) network? ( || ( net-dns/dnsmasq =net-misc/dhcp-3* >=net-misc/networkmanager-0.8 ) ) policykit? ( sys-auth/polkit ) pulseaudio? ( media-sound/pulseaudio ) =dev-lang/python-2*
 SLOT=0
 SRC_URI=http://download.tuxfamily.org/blueman/blueman-1.23.tar.gz
 _eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	gnome2-utils	d7c71c6a7d871f567b416a363d65c3dc	multilib	fac675dcccf94392371a6abee62d909f	python	be9965681d83c3980660a2660ac95e95	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=d0edde34c058126cf4581d8b2332ca4b
+_md5_=ad46df819159221b2be9d4d9a8f2fac4
diff --git a/metadata/md5-cache/net-wireless/blueman-1.23-r1 b/metadata/md5-cache/net-wireless/blueman-1.23-r1
index e58c4a9860eb..82d9c752134d 100644
--- a/metadata/md5-cache/net-wireless/blueman-1.23-r1
+++ b/metadata/md5-cache/net-wireless/blueman-1.23-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=dev-libs/glib:2 >=x11-libs/gtk+-2.12:2 x11-libs/startup-notification dev-python/pygobject:2 >=net-wireless/bluez-4.21 nls? ( dev-util/intltool sys-devel/gettext ) virtual/pkgconfig >=dev-python/pyrex-0.9.8 =dev-lang/python-2.7* >=sys-apps/sed-4
+DEPEND=dev-libs/glib:2 >=x11-libs/gtk+-2.12:2 x11-libs/startup-notification dev-python/pygobject:2 <net-wireless/bluez-5 >=net-wireless/bluez-4.21 nls? ( dev-util/intltool sys-devel/gettext ) virtual/pkgconfig >=dev-python/pyrex-0.9.8 =dev-lang/python-2.7* >=sys-apps/sed-4
 DESCRIPTION=GTK+ Bluetooth Manager, designed to be simple and intuitive for everyday bluetooth tasks.
 EAPI=4
 HOMEPAGE=http://blueman-project.org/
 IUSE=gconf sendto network nls policykit pulseaudio
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-3
-RDEPEND=dev-libs/glib:2 >=x11-libs/gtk+-2.12:2 x11-libs/startup-notification dev-python/pygobject:2 >=net-wireless/bluez-4.21 >=app-mobilephone/obex-data-server-0.4.4 sys-apps/dbus dev-python/pygtk dev-python/notify-python dev-python/dbus-python x11-themes/hicolor-icon-theme gconf? ( dev-python/gconf-python ) sendto? ( gnome-base/nautilus ) network? ( || ( net-dns/dnsmasq =net-misc/dhcp-3* >=net-misc/networkmanager-0.8 ) ) policykit? ( sys-auth/polkit ) pulseaudio? ( media-sound/pulseaudio ) =dev-lang/python-2.7*
+RDEPEND=dev-libs/glib:2 >=x11-libs/gtk+-2.12:2 x11-libs/startup-notification dev-python/pygobject:2 <net-wireless/bluez-5 >=net-wireless/bluez-4.21 >=app-mobilephone/obex-data-server-0.4.4 sys-apps/dbus dev-python/pygtk dev-python/notify-python dev-python/dbus-python x11-themes/hicolor-icon-theme gconf? ( dev-python/gconf-python ) sendto? ( gnome-base/nautilus ) network? ( || ( net-dns/dnsmasq =net-misc/dhcp-3* >=net-misc/networkmanager-0.8 ) ) policykit? ( sys-auth/polkit ) pulseaudio? ( media-sound/pulseaudio ) =dev-lang/python-2.7*
 SLOT=0
 SRC_URI=http://download.tuxfamily.org/blueman/blueman-1.23.tar.gz
 _eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	gnome2-utils	d7c71c6a7d871f567b416a363d65c3dc	multilib	fac675dcccf94392371a6abee62d909f	python	be9965681d83c3980660a2660ac95e95	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=25620c51432bcd2f2ea3b9931b87f460
+_md5_=f6f7ccd067294d140521fc5cd17c247a
diff --git a/metadata/md5-cache/net-wireless/blueman-1.23-r2 b/metadata/md5-cache/net-wireless/blueman-1.23-r2
index 19fe174f6a9a..c2cf051146db 100644
--- a/metadata/md5-cache/net-wireless/blueman-1.23-r2
+++ b/metadata/md5-cache/net-wireless/blueman-1.23-r2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=dev-libs/glib:2 >=x11-libs/gtk+-2.12:2 x11-libs/startup-notification dev-python/pygobject:2 >=net-wireless/bluez-4.21 nls? ( dev-util/intltool sys-devel/gettext ) virtual/pkgconfig >=dev-python/pyrex-0.9.8 =dev-lang/python-2.7* >=sys-apps/sed-4
+DEPEND=dev-libs/glib:2 >=x11-libs/gtk+-2.12:2 x11-libs/startup-notification dev-python/pygobject:2 <net-wireless/bluez-5 >=net-wireless/bluez-4.21 nls? ( dev-util/intltool sys-devel/gettext ) virtual/pkgconfig >=dev-python/pyrex-0.9.8 =dev-lang/python-2.7* >=sys-apps/sed-4
 DESCRIPTION=GTK+ Bluetooth Manager, designed to be simple and intuitive for everyday bluetooth tasks.
 EAPI=4
 HOMEPAGE=http://blueman-project.org/
 IUSE=gconf sendto network nls policykit pulseaudio
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-3
-RDEPEND=dev-libs/glib:2 >=x11-libs/gtk+-2.12:2 x11-libs/startup-notification dev-python/pygobject:2 >=net-wireless/bluez-4.21 >=app-mobilephone/obex-data-server-0.4.4 sys-apps/dbus dev-python/pygtk dev-python/notify-python dev-python/dbus-python x11-themes/hicolor-icon-theme gconf? ( dev-python/gconf-python ) sendto? ( gnome-base/nautilus ) network? ( || ( net-dns/dnsmasq =net-misc/dhcp-3* >=net-misc/networkmanager-0.8 ) ) policykit? ( sys-auth/polkit ) pulseaudio? ( media-sound/pulseaudio ) =dev-lang/python-2.7*
+RDEPEND=dev-libs/glib:2 >=x11-libs/gtk+-2.12:2 x11-libs/startup-notification dev-python/pygobject:2 <net-wireless/bluez-5 >=net-wireless/bluez-4.21 >=app-mobilephone/obex-data-server-0.4.4 sys-apps/dbus dev-python/pygtk dev-python/notify-python dev-python/dbus-python x11-themes/hicolor-icon-theme gconf? ( dev-python/gconf-python ) sendto? ( gnome-base/nautilus ) network? ( || ( net-dns/dnsmasq =net-misc/dhcp-3* >=net-misc/networkmanager-0.8 ) ) policykit? ( sys-auth/polkit ) pulseaudio? ( media-sound/pulseaudio ) =dev-lang/python-2.7*
 SLOT=0
 SRC_URI=http://download.tuxfamily.org/blueman/blueman-1.23.tar.gz
 _eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	gnome2-utils	d7c71c6a7d871f567b416a363d65c3dc	multilib	fac675dcccf94392371a6abee62d909f	python	be9965681d83c3980660a2660ac95e95	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=08802bba0eb7f44b4d9af1c2c69cfc26
+_md5_=b3ca6238539186aa47840ceebeb3f3aa
diff --git a/metadata/md5-cache/net-zope/zope-interface-4.0.5 b/metadata/md5-cache/net-zope/zope-interface-4.0.5
index e98ecca5c6a9..e8366c426064 100644
--- a/metadata/md5-cache/net-zope/zope-interface-4.0.5
+++ b/metadata/md5-cache/net-zope/zope-interface-4.0.5
@@ -8,7 +8,8 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=ZPL
 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 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_pypy2_0? ( >=virtual/pypy-2.0.2:2.0 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy2_0(-)]
 REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_pypy2_0 )
+RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/z/zope.interface/zope.interface-4.0.5.zip
 _eclasses_=distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	multibuild	56d4120419072116417e8de1bd1040ff	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	3bb814ab7959a36067101a6bef683b6f	python-utils-r1	ceb3e4c3ba203e28bb02eeb182d88acf	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=1409bea35e6da696952be2cdea7f66cc
+_md5_=eebf32e38cd56fbeef519db9aef089f1
diff --git a/metadata/md5-cache/net-zope/zope-interface-4.1.0 b/metadata/md5-cache/net-zope/zope-interface-4.1.0
new file mode 100644
index 000000000000..b039267f40d0
--- /dev/null
+++ b/metadata/md5-cache/net-zope/zope-interface-4.1.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy2_0(-)] net-zope/zope-fixers[python_targets_python3_2(-)?,-python_single_target_python3_2(-),python_targets_python3_3(-)?,-python_single_target_python3_3(-)] userland_GNU? ( >=sys-apps/coreutils-8.5 ) 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 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_pypy2_0? ( >=virtual/pypy-2.0.2:2.0 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy2_0(-)]
+DESCRIPTION=Interfaces for Python
+EAPI=5
+HOMEPAGE=http://pypi.python.org/pypi/zope.interface
+IUSE=python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_pypy2_0
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=ZPL
+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 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_pypy2_0? ( >=virtual/pypy-2.0.2:2.0 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy2_0(-)]
+REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_pypy2_0 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://pypi/z/zope.interface/zope.interface-4.1.0.tar.gz
+_eclasses_=distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	multibuild	56d4120419072116417e8de1bd1040ff	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	3bb814ab7959a36067101a6bef683b6f	python-utils-r1	ceb3e4c3ba203e28bb02eeb182d88acf	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=e0776d929b1e4d86332c916ecd867099
diff --git a/metadata/md5-cache/sci-geosciences/qlandkartegt-1.7.6-r1 b/metadata/md5-cache/sci-geosciences/qlandkartegt-1.7.6-r2
similarity index 92%
rename from metadata/md5-cache/sci-geosciences/qlandkartegt-1.7.6-r1
rename to metadata/md5-cache/sci-geosciences/qlandkartegt-1.7.6-r2
index 1d052e76469f..03dc56098647 100644
--- a/metadata/md5-cache/sci-geosciences/qlandkartegt-1.7.6-r1
+++ b/metadata/md5-cache/sci-geosciences/qlandkartegt-1.7.6-r2
@@ -1,4 +1,4 @@
-DEFINED_PHASES=compile configure install prepare test
+DEFINED_PHASES=compile configure install postinst prepare test
 DEPEND=>=sci-libs/gdal-1.8 >=sci-libs/proj-4.7 sys-libs/zlib dev-qt/qtgui:4 dev-qt/qtscript:4 dev-qt/qtsql:4[sqlite] dev-qt/qtwebkit:4 dbus? ( dev-qt/qtdbus:4 ) dmtx? ( media-libs/libdmtx ) exif? ( media-libs/libexif ) gps? ( >=sci-geosciences/gpsd-2.90 ) gpsbabel? ( sci-geosciences/gpsbabel ) dev-qt/qtopengl:4 virtual/glu sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
 DESCRIPTION=View and upload map files, track and waypoint data to your Garmin GPS device
 EAPI=5
@@ -10,4 +10,4 @@ RDEPEND=>=sci-libs/gdal-1.8 >=sci-libs/proj-4.7 sys-libs/zlib dev-qt/qtgui:4 dev
 SLOT=0
 SRC_URI=mirror://sourceforge/qlandkartegt/qlandkartegt-1.7.6.tar.gz
 _eclasses_=cmake-utils	db5236989678f4de51b2588767b5b69d	eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=70b5a7f1b14a71564340e7f540a72548
+_md5_=3d55b327509963568884562c87634d85
diff --git a/metadata/md5-cache/sci-mathematics/octave-3.8.0 b/metadata/md5-cache/sci-mathematics/octave-3.8.0
new file mode 100644
index 000000000000..af6f22747aad
--- /dev/null
+++ b/metadata/md5-cache/sci-mathematics/octave-3.8.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install preinst prepare pretend setup test
+DEPEND=app-text/ghostscript-gpl dev-libs/libpcre sys-libs/ncurses jit? ( !hppa? ( sys-devel/llvm ) ) virtual/lapack curl? ( net-misc/curl ) fftw? ( sci-libs/fftw:3.0 ) glpk? ( sci-mathematics/glpk ) gnuplot? ( sci-visualization/gnuplot ) hdf5? ( sci-libs/hdf5 ) imagemagick? ( || ( media-gfx/graphicsmagick[cxx] >=media-gfx/imagemagick-6.8.8.5[cxx] ) ) opengl? ( media-libs/freetype:2 media-libs/fontconfig >=x11-libs/fltk-1.3:1[opengl] !hppa? ( x11-libs/gl2ps ) virtual/glu ) postscript? ( app-text/epstool media-gfx/pstoedit media-gfx/transfig ) qhull? ( media-libs/qhull ) qrupdate? ( sci-libs/qrupdate ) readline? ( sys-libs/readline ) sparse? ( sci-libs/arpack sci-libs/camd sci-libs/ccolamd sci-libs/cholmod sci-libs/colamd sci-libs/cxsparse sci-libs/umfpack ) X? ( x11-libs/libX11 ) zlib? ( sys-libs/zlib ) 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
+HOMEPAGE=http://www.octave.org/
+IUSE=curl doc fftw +glpk gnuplot hdf5 +imagemagick java jit opengl postscript +qhull +qrupdate readline +sparse static-libs X zlib elibc_FreeBSD java
+KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=GPL-3
+RDEPEND=app-text/ghostscript-gpl dev-libs/libpcre sys-libs/ncurses jit? ( !hppa? ( sys-devel/llvm ) ) virtual/lapack curl? ( net-misc/curl ) fftw? ( sci-libs/fftw:3.0 ) glpk? ( sci-mathematics/glpk ) gnuplot? ( sci-visualization/gnuplot ) hdf5? ( sci-libs/hdf5 ) imagemagick? ( || ( media-gfx/graphicsmagick[cxx] >=media-gfx/imagemagick-6.8.8.5[cxx] ) ) opengl? ( media-libs/freetype:2 media-libs/fontconfig >=x11-libs/fltk-1.3:1[opengl] !hppa? ( x11-libs/gl2ps ) virtual/glu ) postscript? ( app-text/epstool media-gfx/pstoedit media-gfx/transfig ) qhull? ( media-libs/qhull ) qrupdate? ( sci-libs/qrupdate ) readline? ( sys-libs/readline ) sparse? ( sci-libs/arpack sci-libs/camd sci-libs/ccolamd sci-libs/cholmod sci-libs/colamd sci-libs/cxsparse sci-libs/umfpack ) X? ( x11-libs/libX11 ) zlib? ( sys-libs/zlib ) virtual/fortran java? ( >=dev-java/java-config-2.1.9-r1 )
+SLOT=0/3.8.0
+SRC_URI=mirror://gnu/octave/octave-3.8.0.tar.bz2
+_eclasses_=autotools	b0a4d5334d34abe7b6829eb87cf3c544	autotools-utils	559ed17194292ec42d68145dcca2fa32	eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	fortran-2	db8710b355fc5598015c4bc3aad3bdb0	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8d0d93b7a8605ea346cce4604f6db516	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	pax-utils	2424f959506320f5196de8f79fa05297	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=19b1547c8641fff28ff419b11e5cf0aa
diff --git a/metadata/md5-cache/sci-physics/lammps-20140212 b/metadata/md5-cache/sci-physics/lammps-20140212
index 3b8bfddc0ed5..22f02d6d7bde 100644
--- a/metadata/md5-cache/sci-physics/lammps-20140212
+++ b/metadata/md5-cache/sci-physics/lammps-20140212
@@ -10,4 +10,4 @@ RDEPEND=mpi? ( virtual/mpi ) lammps-package-meam? ( virtual/fortran )
 SLOT=0
 SRC_URI=http://lammps.sandia.gov/tars/lammps-12Feb14.tar.gz
 _eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	fortran-2	db8710b355fc5598015c4bc3aad3bdb0	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=4a9baaef1ad5691c14cdbc6e10ed164d
+_md5_=c302bf26741439b204dd0ae2a144707b
diff --git a/metadata/md5-cache/sci-physics/lammps-20140214 b/metadata/md5-cache/sci-physics/lammps-20140214
new file mode 100644
index 000000000000..3f7618b621b7
--- /dev/null
+++ b/metadata/md5-cache/sci-physics/lammps-20140214
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare setup
+DEPEND=mpi? ( virtual/mpi ) virtual/fortran
+DESCRIPTION=Large-scale Atomic/Molecular Massively Parallel Simulator
+EAPI=5
+HOMEPAGE=http://lammps.sandia.gov/
+IUSE=doc examples gzip lammps-memalign mpi
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=mpi? ( virtual/mpi ) virtual/fortran
+SLOT=0
+SRC_URI=http://lammps.sandia.gov/tars/lammps-14Feb14.tar.gz
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	fortran-2	db8710b355fc5598015c4bc3aad3bdb0	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=673d0b21cb38f1145540f211e3e4a093
diff --git a/metadata/md5-cache/sys-apps/file-5.17 b/metadata/md5-cache/sys-apps/file-5.17
index 483e4c4d593d..b5ab4e5fcd16 100644
--- a/metadata/md5-cache/sys-apps/file-5.17
+++ b/metadata/md5-cache/sys-apps/file-5.17
@@ -4,10 +4,10 @@ DESCRIPTION=identify a file's format by scanning binary data for patterns
 EAPI=4
 HOMEPAGE=http://www.darwinsys.com/file/
 IUSE=python static-libs zlib python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_pypy2_0
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
 LICENSE=BSD-2
 RDEPEND=python? ( 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 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_pypy2_0? ( >=virtual/pypy-2.0.2:2.0 ) dev-lang/python-exec:2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy2_0(-)] ) zlib? ( sys-libs/zlib ) python? ( !dev-python/python-magic )
 SLOT=0
 SRC_URI=ftp://ftp.astron.com/pub/file/file-5.17.tar.gz ftp://ftp.gw.com/mirrors/pub/unix/file/file-5.17.tar.gz
 _eclasses_=distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	40081e8c7e7f7c4f9db349a1d6d52925	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multibuild	56d4120419072116417e8de1bd1040ff	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	3bb814ab7959a36067101a6bef683b6f	python-utils-r1	ceb3e4c3ba203e28bb02eeb182d88acf	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=eba0623d093b394c182ccf15cd2394f9
+_md5_=a3b19f00739ebee1038d20ddfdf95922
diff --git a/metadata/md5-cache/sys-apps/gawk-3.1.8 b/metadata/md5-cache/sys-apps/gawk-3.1.8
index bde81054c5c3..655600267923 100644
--- a/metadata/md5-cache/sys-apps/gawk-3.1.8
+++ b/metadata/md5-cache/sys-apps/gawk-3.1.8
@@ -1,12 +1,13 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=nls? ( sys-devel/gettext )
+DEPEND=!>=virtual/awk-1 nls? ( sys-devel/gettext )
 DESCRIPTION=GNU awk pattern-matching language
 EAPI=2
 HOMEPAGE=http://www.gnu.org/software/gawk/gawk.html
 IUSE=nls
 KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd
 LICENSE=GPL-2
+RDEPEND=!>=virtual/awk-1
 SLOT=0
 SRC_URI=mirror://gnu/gawk/gawk-3.1.8.tar.bz2
 _eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=106ce824db99d18279a2bf3d829f0672
+_md5_=3385c5d8aa775eeaf57455509102ad4e
diff --git a/metadata/md5-cache/sys-apps/man-pages-3.53 b/metadata/md5-cache/sys-apps/man-pages-3.53
deleted file mode 100644
index b5bb4ddd3888..000000000000
--- a/metadata/md5-cache/sys-apps/man-pages-3.53
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install
-DESCRIPTION=A somewhat comprehensive collection of Linux man pages
-EAPI=3
-HOMEPAGE=http://www.kernel.org/doc/man-pages/
-IUSE=nls linguas_da linguas_de linguas_fr linguas_it linguas_ja linguas_nl linguas_pl linguas_ro linguas_ru linguas_zh_CN
-KEYWORDS=alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux
-LICENSE=man-pages GPL-2+ BSD
-PDEPEND=nls? ( linguas_da? ( app-i18n/man-pages-da ) linguas_de? ( app-i18n/man-pages-de ) linguas_fr? ( app-i18n/man-pages-fr ) linguas_it? ( app-i18n/man-pages-it ) linguas_ja? ( app-i18n/man-pages-ja ) linguas_nl? ( app-i18n/man-pages-nl ) linguas_pl? ( app-i18n/man-pages-pl ) linguas_ro? ( app-i18n/man-pages-ro ) linguas_ru? ( app-i18n/man-pages-ru ) linguas_zh_CN? ( app-i18n/man-pages-zh_CN ) ) sys-apps/man-pages-posix
-RDEPEND=virtual/man !<dev-libs/libaio-0.3.109-r2
-RESTRICT=binchecks
-SLOT=0
-SRC_URI=mirror://kernel/linux/docs/man-pages/Archive/man-pages-3.53.tar.xz mirror://kernel/linux/docs/man-pages/man-pages-3.53.tar.xz http://man7.org/linux/man-pages/download/man-pages-3.53.tar.xz mirror://gentoo/man-pages-gentoo-2.tar.bz2 http://dev.gentoo.org/~cardoe/files/man-pages-gentoo-2.tar.bz2
-_md5_=5321c966d32860a4cdde14581dcd3e6a
diff --git a/metadata/md5-cache/sys-apps/man-pages-3.55 b/metadata/md5-cache/sys-apps/man-pages-3.60
similarity index 76%
rename from metadata/md5-cache/sys-apps/man-pages-3.55
rename to metadata/md5-cache/sys-apps/man-pages-3.60
index 826f2142a57d..7929f13f2862 100644
--- a/metadata/md5-cache/sys-apps/man-pages-3.55
+++ b/metadata/md5-cache/sys-apps/man-pages-3.60
@@ -3,11 +3,11 @@ DESCRIPTION=A somewhat comprehensive collection of Linux man pages
 EAPI=3
 HOMEPAGE=http://www.kernel.org/doc/man-pages/
 IUSE=nls linguas_da linguas_de linguas_fr linguas_it linguas_ja linguas_nl linguas_pl linguas_ro linguas_ru linguas_zh_CN
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux
 LICENSE=man-pages GPL-2+ BSD
 PDEPEND=nls? ( linguas_da? ( app-i18n/man-pages-da ) linguas_de? ( app-i18n/man-pages-de ) linguas_fr? ( app-i18n/man-pages-fr ) linguas_it? ( app-i18n/man-pages-it ) linguas_ja? ( app-i18n/man-pages-ja ) linguas_nl? ( app-i18n/man-pages-nl ) linguas_pl? ( app-i18n/man-pages-pl ) linguas_ro? ( app-i18n/man-pages-ro ) linguas_ru? ( app-i18n/man-pages-ru ) linguas_zh_CN? ( app-i18n/man-pages-zh_CN ) ) sys-apps/man-pages-posix
 RDEPEND=virtual/man !<dev-libs/libaio-0.3.109-r2
 RESTRICT=binchecks
 SLOT=0
-SRC_URI=mirror://kernel/linux/docs/man-pages/Archive/man-pages-3.55.tar.xz mirror://kernel/linux/docs/man-pages/man-pages-3.55.tar.xz http://man7.org/linux/man-pages/download/man-pages-3.55.tar.xz mirror://gentoo/man-pages-gentoo-2.tar.bz2 http://dev.gentoo.org/~cardoe/files/man-pages-gentoo-2.tar.bz2
-_md5_=57c713b4dbab7f71c7e364960672b059
+SRC_URI=mirror://kernel/linux/docs/man-pages/Archive/man-pages-3.60.tar.xz mirror://kernel/linux/docs/man-pages/man-pages-3.60.tar.xz http://man7.org/linux/man-pages/download/man-pages-3.60.tar.xz mirror://gentoo/man-pages-gentoo-2.tar.bz2 http://dev.gentoo.org/~cardoe/files/man-pages-gentoo-2.tar.bz2
+_md5_=93b91a83d30f0570aa4643009cea5193
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-3.2.55 b/metadata/md5-cache/sys-kernel/gentoo-sources-3.2.55
new file mode 100644
index 000000000000..f2c005dc1cae
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-3.2.55
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-2.6.8-r3:2.6 ) )
+DESCRIPTION=Full sources including the Gentoo patchset for the 3.2 kernel tree
+EAPI=5
+HOMEPAGE=http://dev.gentoo.org/~mpagano/genpatches
+IUSE=deblob symlink build deblob
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2 !deblob? ( freedist )
+PDEPEND=!build? ( virtual/dev-manager )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=3.2.55
+SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.2.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-3.2 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-check -> deblob-check-3.2 ) mirror://gentoo/genpatches-3.2-33.base.tar.xz mirror://gentoo/genpatches-3.2-33.extras.tar.xz
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	kernel-2	263afd0e4a90481352469cff577efe1b	multilib	fac675dcccf94392371a6abee62d909f	python-any-r1	08d3455b23110d650f173ab0a090818b	python-utils-r1	ceb3e4c3ba203e28bb02eeb182d88acf	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=49c809a76f8ea95a52a63b17812dcec1
diff --git a/metadata/md5-cache/sys-kernel/hardened-sources-3.12.8-r1 b/metadata/md5-cache/sys-kernel/hardened-sources-3.12.8-r1
new file mode 100644
index 000000000000..e1514b1dbd2b
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/hardened-sources-3.12.8-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-2.6.8-r3:2.6 ) )
+DESCRIPTION=Hardened kernel sources (kernel series 3.12)
+EAPI=5
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/
+IUSE=deblob symlink build deblob
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2 !deblob? ( freedist )
+PDEPEND=!build? ( virtual/dev-manager )
+RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=3.12.8-r1
+SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.12.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.12.N/deblob-3.12 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.12.N/deblob-check -> deblob-check-3.12 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-3.12.8-2.extras.tar.bz2 mirror://gentoo/genpatches-3.12-9.base.tar.xz
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	kernel-2	263afd0e4a90481352469cff577efe1b	multilib	fac675dcccf94392371a6abee62d909f	python-any-r1	08d3455b23110d650f173ab0a090818b	python-utils-r1	ceb3e4c3ba203e28bb02eeb182d88acf	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=b4e58fc6a3b32909b40ef4ddfe6dd372
diff --git a/metadata/md5-cache/sys-kernel/zen-sources-3.13.9999 b/metadata/md5-cache/sys-kernel/zen-sources-3.13.9999
new file mode 100644
index 000000000000..c09ab6814a81
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/zen-sources-3.13.9999
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) dev-vcs/git
+DESCRIPTION=The Zen Kernel Live Sources
+EAPI=5
+HOMEPAGE=http://zen-kernel.org
+IUSE=symlink build
+LICENSE=GPL-2 freedist
+PDEPEND=!build? ( virtual/dev-manager )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=3.13.9999
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	git-2	2027b81a576527fa16bece425941e094	git-r3	f089608c770d9ad72a2c92b547d2b20d	kernel-2	263afd0e4a90481352469cff577efe1b	multilib	fac675dcccf94392371a6abee62d909f	python-any-r1	08d3455b23110d650f173ab0a090818b	python-utils-r1	ceb3e4c3ba203e28bb02eeb182d88acf	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=0ba96fb1eaebf0cfb625de17b2f90959
diff --git a/metadata/md5-cache/virtual/awk-1 b/metadata/md5-cache/virtual/awk-1
index 48263675b902..2dab92c26174 100644
--- a/metadata/md5-cache/virtual/awk-1
+++ b/metadata/md5-cache/virtual/awk-1
@@ -1,6 +1,6 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for awk implementation
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x86-macos
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x86-macos
 RDEPEND=|| ( >=sys-apps/gawk-4.0.1-r1 sys-apps/mawk sys-apps/nawk sys-apps/busybox ) !<sys-apps/gawk-4.0.1-r1
 SLOT=0
-_md5_=0707e1b2a96979d0351f247713d97384
+_md5_=e4bfdfaa2d39d36fcfbaa149d3c6700e
diff --git a/metadata/md5-cache/www-servers/apache-2.2.26 b/metadata/md5-cache/www-servers/apache-2.2.26
index 26f04df8e871..bb4267fa0a85 100644
--- a/metadata/md5-cache/www-servers/apache-2.2.26
+++ b/metadata/md5-cache/www-servers/apache-2.2.26
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=>=dev-libs/openssl-0.9.8m apache2_modules_deflate? ( sys-libs/zlib ) !<sys-devel/gettext-0.18.1.1-r3 =sys-devel/automake-1.11* >=sys-devel/autoconf-2.68 sys-devel/libtool ssl? ( dev-libs/openssl ) dev-lang/perl =dev-libs/apr-1* =dev-libs/apr-util-1*[ldap?] dev-libs/libpcre ldap? ( =net-nds/openldap-2* ) selinux? ( sec-policy/selinux-apache ) ssl? ( >=dev-libs/openssl-0.9.8f ) !=www-servers/apache-1* virtual/pkgconfig
+DEPEND=>=dev-libs/openssl-0.9.8m apache2_modules_deflate? ( sys-libs/zlib ) !<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 ssl? ( dev-libs/openssl ) dev-lang/perl =dev-libs/apr-1* =dev-libs/apr-util-1*[ldap?] dev-libs/libpcre ldap? ( =net-nds/openldap-2* ) selinux? ( sec-policy/selinux-apache ) ssl? ( >=dev-libs/openssl-0.9.8f ) !=www-servers/apache-1* virtual/pkgconfig
 DESCRIPTION=The Apache Web Server.
 EAPI=5
 HOMEPAGE=http://httpd.apache.org/
@@ -11,4 +11,4 @@ RDEPEND=>=dev-libs/apr-1.4.5 >=dev-libs/openssl-0.9.8m apache2_modules_mime? ( a
 SLOT=2
 SRC_URI=mirror://apache/httpd/httpd-2.2.26.tar.bz2 http://dev.gentoo.org/~patrick/dist/apache/gentoo-apache-2.2.23-20121012.tar.bz2
 _eclasses_=apache-2	903dd3cd41cb0ad872a8320a6d55a216	autotools	b0a4d5334d34abe7b6829eb87cf3c544	eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	ssl-cert	0b45da48a22fda62c57c1809b8b55315	systemd	9f063b2cc19c5e8030911372aa246c4e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=78b0bc017ad6fa95392a02576a0009e3
+_md5_=3e9d8236657135b2c4f324dd45ab0416
diff --git a/metadata/md5-cache/www-servers/apache-2.4.6-r1 b/metadata/md5-cache/www-servers/apache-2.4.6-r1
deleted file mode 100644
index fac0bd7f38ff..000000000000
--- a/metadata/md5-cache/www-servers/apache-2.4.6-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=>=dev-libs/openssl-0.9.8m apache2_modules_deflate? ( sys-libs/zlib ) !<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 ssl? ( dev-libs/openssl ) dev-lang/perl =dev-libs/apr-1* =dev-libs/apr-util-1*[ldap?] dev-libs/libpcre ldap? ( =net-nds/openldap-2* ) selinux? ( sec-policy/selinux-apache ) ssl? ( >=dev-libs/openssl-0.9.8f ) !=www-servers/apache-1* virtual/pkgconfig
-DESCRIPTION=The Apache Web Server.
-EAPI=2
-HOMEPAGE=http://httpd.apache.org/
-IUSE=ssl debug doc ldap selinux ssl static suexec threads apache2_modules_access_compat apache2_modules_actions apache2_modules_alias apache2_modules_asis apache2_modules_auth_basic apache2_modules_auth_digest apache2_modules_authn_alias apache2_modules_authn_anon apache2_modules_authn_core apache2_modules_authn_dbd apache2_modules_authn_dbm apache2_modules_authn_file apache2_modules_authz_core apache2_modules_authz_dbm apache2_modules_authz_groupfile apache2_modules_authz_host apache2_modules_authz_owner apache2_modules_authz_user apache2_modules_autoindex apache2_modules_cache apache2_modules_cache_disk apache2_modules_cern_meta apache2_modules_charset_lite apache2_modules_cgi apache2_modules_cgid apache2_modules_dav apache2_modules_dav_fs apache2_modules_dav_lock apache2_modules_dbd apache2_modules_deflate apache2_modules_dir apache2_modules_dumpio apache2_modules_env apache2_modules_expires apache2_modules_ext_filter apache2_modules_file_cache apache2_modules_filter apache2_modules_headers apache2_modules_ident apache2_modules_imagemap apache2_modules_include apache2_modules_info apache2_modules_lbmethod_byrequests apache2_modules_lbmethod_bytraffic apache2_modules_lbmethod_bybusyness apache2_modules_lbmethod_heartbeat apache2_modules_log_config apache2_modules_log_forensic apache2_modules_logio apache2_modules_mime apache2_modules_mime_magic apache2_modules_negotiation apache2_modules_proxy apache2_modules_proxy_ajp apache2_modules_proxy_balancer apache2_modules_proxy_connect apache2_modules_proxy_ftp apache2_modules_proxy_http apache2_modules_proxy_scgi apache2_modules_proxy_fcgi apache2_modules_rewrite apache2_modules_ratelimit apache2_modules_remoteip apache2_modules_reqtimeout apache2_modules_setenvif apache2_modules_slotmem_shm apache2_modules_speling apache2_modules_socache_shmcb apache2_modules_status apache2_modules_substitute apache2_modules_unique_id apache2_modules_userdir apache2_modules_usertrack apache2_modules_unixd apache2_modules_version apache2_modules_vhost_alias apache2_mpms_itk apache2_mpms_peruser apache2_mpms_prefork apache2_mpms_event apache2_mpms_worker
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
-LICENSE=Apache-2.0 Apache-1.1
-PDEPEND=~app-admin/apache-tools-2.4.6
-RDEPEND=>=dev-libs/apr-1.4.5 >=dev-libs/openssl-0.9.8m apache2_modules_mime? ( app-misc/mime-types ) dev-lang/perl =dev-libs/apr-1* =dev-libs/apr-util-1*[ldap?] dev-libs/libpcre ldap? ( =net-nds/openldap-2* ) selinux? ( sec-policy/selinux-apache ) ssl? ( >=dev-libs/openssl-0.9.8f ) !=www-servers/apache-1*
-SLOT=2
-SRC_URI=mirror://apache/httpd/httpd-2.4.6.tar.bz2 http://dev.gentoo.org/~kensington/dist/apache/gentoo-apache-2.4.4-20130725.tar.bz2
-_eclasses_=apache-2	903dd3cd41cb0ad872a8320a6d55a216	autotools	b0a4d5334d34abe7b6829eb87cf3c544	eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	ssl-cert	0b45da48a22fda62c57c1809b8b55315	systemd	9f063b2cc19c5e8030911372aa246c4e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=878e03c25fe6a4fb023ad16c698239c2
diff --git a/metadata/md5-cache/www-servers/apache-2.4.6-r2 b/metadata/md5-cache/www-servers/apache-2.4.6-r2
index 18f7c556b491..0b3a6c046791 100644
--- a/metadata/md5-cache/www-servers/apache-2.4.6-r2
+++ b/metadata/md5-cache/www-servers/apache-2.4.6-r2
@@ -11,4 +11,4 @@ RDEPEND=>=dev-libs/apr-1.4.5 >=dev-libs/openssl-0.9.8m apache2_modules_mime? ( a
 SLOT=2
 SRC_URI=mirror://apache/httpd/httpd-2.4.6.tar.bz2 http://dev.gentoo.org/~kensington/dist/apache/gentoo-apache-2.4.4-20130801.tar.bz2
 _eclasses_=apache-2	903dd3cd41cb0ad872a8320a6d55a216	autotools	b0a4d5334d34abe7b6829eb87cf3c544	eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	ssl-cert	0b45da48a22fda62c57c1809b8b55315	systemd	9f063b2cc19c5e8030911372aa246c4e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=dd740cb3c1c03fed55c61c1379d108b9
+_md5_=38083bb60f24d81df22f976c918efaa9
diff --git a/metadata/md5-cache/www-servers/apache-2.4.7 b/metadata/md5-cache/www-servers/apache-2.4.7
index 894ba269d109..b6228b1a1a32 100644
--- a/metadata/md5-cache/www-servers/apache-2.4.7
+++ b/metadata/md5-cache/www-servers/apache-2.4.7
@@ -11,4 +11,4 @@ RDEPEND=>=dev-libs/apr-1.5.0 >=dev-libs/openssl-0.9.8m apache2_modules_mime? ( a
 SLOT=2
 SRC_URI=mirror://apache/httpd/httpd-2.4.7.tar.bz2 http://dev.gentoo.org/~kensington/dist/apache/gentoo-apache-2.4.4-20130801.tar.bz2
 _eclasses_=apache-2	903dd3cd41cb0ad872a8320a6d55a216	autotools	b0a4d5334d34abe7b6829eb87cf3c544	eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	ssl-cert	0b45da48a22fda62c57c1809b8b55315	systemd	9f063b2cc19c5e8030911372aa246c4e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=ad94160c0a4046ba2ea47180d811a53d
+_md5_=21e9a144002eb0158ceaaa2e2a20c0bb
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-334.16-r6 b/metadata/md5-cache/x11-drivers/nvidia-drivers-334.16-r7
similarity index 98%
rename from metadata/md5-cache/x11-drivers/nvidia-drivers-334.16-r6
rename to metadata/md5-cache/x11-drivers/nvidia-drivers-334.16-r7
index 67a7416000b6..bc369a41b2a3 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-334.16-r6
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-334.16-r7
@@ -12,4 +12,4 @@ RESTRICT=bindist mirror strip
 SLOT=0
 SRC_URI=amd64-fbsd? ( http://us.download.nvidia.com/XFree86/FreeBSD-x86_64/334.16/NVIDIA-FreeBSD-x86_64-334.16.tar.gz ) amd64? ( http://us.download.nvidia.com/XFree86/Linux-x86_64/334.16/NVIDIA-Linux-x86_64-334.16.run ) x86-fbsd? ( http://us.download.nvidia.com/XFree86/FreeBSD-x86/334.16/NVIDIA-FreeBSD-x86-334.16.tar.gz ) x86? ( http://us.download.nvidia.com/XFree86/Linux-x86/334.16/NVIDIA-Linux-x86-334.16.run )
 _eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	linux-info	a9cbd6bbe2b28166e403321882f3c73c	linux-mod	101302d4b7b694ea9622bbffb187d0de	multilib	fac675dcccf94392371a6abee62d909f	nvidia-driver	92e88a2e33d056779baa88f1061c662e	portability	536c5e70c5fb252ed3b769e04aa3f05b	readme.gentoo	2466b2f6a77a9600954c6b99ebca6e02	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	udev	a9a8d051efb42bfe884c1db82ce161de	unpacker	738214fbf4fe7254493d5fc8a248262a	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=1265413fc30ce9fd902c6a269507edf9
+_md5_=dd7084d441f3cd9302f8006879b82845
diff --git a/metadata/md5-cache/x11-libs/startup-notification-0.12-r1 b/metadata/md5-cache/x11-libs/startup-notification-0.12-r1
new file mode 100644
index 000000000000..d37eb15792ee
--- /dev/null
+++ b/metadata/md5-cache/x11-libs/startup-notification-0.12-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=>=x11-libs/libX11-1.4.3 >x11-libs/libxcb-1.6 >=x11-libs/xcb-util-0.3.8 x11-proto/xproto !<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 x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DESCRIPTION=Application startup notification and feedback library
+EAPI=5
+HOMEPAGE=http://www.freedesktop.org/wiki/Software/startup-notification
+IUSE=static-libs
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=LGPL-2 MIT
+RDEPEND=>=x11-libs/libX11-1.4.3 >x11-libs/libxcb-1.6 >=x11-libs/xcb-util-0.3.8
+SLOT=0
+SRC_URI=http://www.freedesktop.org/software/startup-notification/releases/startup-notification-0.12.tar.gz
+_eclasses_=autotools	b0a4d5334d34abe7b6829eb87cf3c544	autotools-utils	559ed17194292ec42d68145dcca2fa32	eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	xorg-2	17812f511eef87a499b62ab14e6aeaad
+_md5_=536d441dbdde63c8a51c5b9e9641a4bf
diff --git a/metadata/md5-cache/x11-misc/xscreensaver-5.26 b/metadata/md5-cache/x11-misc/xscreensaver-5.26
index 4a4f084ff989..55eb83156aa7 100644
--- a/metadata/md5-cache/x11-misc/xscreensaver-5.26
+++ b/metadata/md5-cache/x11-misc/xscreensaver-5.26
@@ -4,10 +4,10 @@ DESCRIPTION=A modular screen saver and locker for the X Window System
 EAPI=5
 HOMEPAGE=http://www.jwz.org/xscreensaver/
 IUSE=gdm jpeg new-login opengl pam +perl selinux suid xinerama
-KEYWORDS=~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=dev-libs/libxml2 >=gnome-base/libglade-2 media-libs/netpbm x11-apps/appres x11-apps/xwininfo x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXmu x11-libs/libXrandr x11-libs/libXt x11-libs/libXxf86misc x11-libs/libXxf86vm jpeg? ( virtual/jpeg:0 ) new-login? ( gdm? ( gnome-base/gdm ) !gdm? ( || ( x11-misc/lightdm kde-base/kdm ) ) ) opengl? ( virtual/opengl ) pam? ( virtual/pam ) selinux? ( sec-policy/selinux-xscreensaver ) xinerama? ( x11-libs/libXinerama ) perl? ( dev-lang/perl dev-perl/libwww-perl virtual/perl-Digest-MD5 )
 SLOT=0
 SRC_URI=http://www.jwz.org/xscreensaver/xscreensaver-5.26.tar.gz
 _eclasses_=autotools	b0a4d5334d34abe7b6829eb87cf3c544	eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=f43e120d9c36b5a04b08acf68ef599e3
+_md5_=92856f37c1eb351546df0a751d5e6e55
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index bd79a858f1f4..b3c43f2a4cf3 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Tue, 18 Feb 2014 10:07:03 +0000
+Wed, 19 Feb 2014 11:07:05 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 002a9f14b2c3..2552130a53c6 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Tue Feb 18 09:37:00 UTC 2014
+Wed Feb 19 11:07:03 UTC 2014
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 6faefbebd0a1..baf85c9b0c85 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Tue, 18 Feb 2014 10:00:01 +0000
+Wed, 19 Feb 2014 11:30:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index d9b7b71d449e..cfb146290c6b 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1392716101 Tue Feb 18 09:35:01 2014 UTC
+1392807901 Wed Feb 19 11:05:01 2014 UTC
diff --git a/net-dialup/ppp/Manifest b/net-dialup/ppp/Manifest
index 38a203ad24f4..62d784499a8d 100644
--- a/net-dialup/ppp/Manifest
+++ b/net-dialup/ppp/Manifest
@@ -1,7 +1,7 @@
 DIST ppp-2.4.4-gentoo-20091116.tar.gz 54932 SHA256 52f174b3df36110d14c522869c507f64aef4d2d01db2dec2936cc9917c9fa716 SHA512 6669294cac124f78f197558f28872adaf08cb6ba3344093946c02d3581e70efea6992b30b0be726637a4122d8354bb1e25e73af71f1e7da8bdbf63db5aa0eeb6 WHIRLPOOL ff633a5e740f38bc665bec435613eb423de0f8370d119fc3cf36dee100cb02e5ec78eb88f2b530498bd49c76a792d97c76dd188b7ce02c8eb4efe85d9af67938
 DIST ppp-2.4.4.tar.gz 688763 SHA256 58af45fc07e5f326eea2408df770ea40e4626d1a15e7d564dd054d74880e91ea SHA512 70bde7121a0a2e150a7eec85731ca1055a2741da7886a8b8734c075637703d223bb579c3d14ad32a009488e07deaa62e7948e2d3e73077e6fb3db076841f7270 WHIRLPOOL 12aa49200253afd3958c7fc078ac7333080c6d0ca96c541e39e70b05d6b8c8e90fe98553d4cbef7804cf66c74b2798e1839b44db9e0cc0e6093d87b53bf24b6f
-DIST ppp-2.4.5-gentoo-20101127.tar.gz 41562 SHA256 d49f51dd10dfc97f25bb5dbc4acc61c708d890da231295467ac3710751d2bcdd SHA512 f24d9bdb8ee1cea7effcb314d88337672a4423a74249153da34999117f056e118981956c49cb8b3801054a38a52c4fcc3cd048fac9b339ad77f0f8b0ea9c99c6 WHIRLPOOL 421c2c78266eeda12ead02711a4d6c38f6cc7fe32c0f128a9a66e402a5c99b5ad6af9f109132ad437588e807846fb3945144126660414d7775a95335ada6bd8e
-DIST ppp-2.4.5-gentoo-20111111.tar.gz 41883 SHA256 950e06cb9e9c844e88cb99c3fc1dbb7515814d75f7f6e87a81fbb245e48ba4ed SHA512 ff9ac176e532ece8f0b13adf75c6999bd81a6f8a75a9edb490219c160cc7a2f055ace7a6ff73bc84965fafa2eb8a689a7106a349923be8c73464e2c00ab16ab6 WHIRLPOOL fb2d7a408ceebae22c83246d441fa5955ed013e9eeadb6247f06fe41512eb47860578768b3fe2f9a0683844e7c40e271e4b22b9f401a87dec376c17fcc9825e9
 DIST ppp-2.4.5-patches-3.tar.xz 37000 SHA256 9e251b0339f665054c24692396115b1f9afb7fdb8593242b1a5bc369dce642bf SHA512 e0d0d077050e97ea88d08fd15a7597393ff7842a1bf3129e2fd7eb182d4fc49a625635cf24fc1798efde2250d4c2ae013b3ae143ef245fe87f764fcf752e5c27 WHIRLPOOL 11e2d4529dd0ddfca11574bbc64459f553674b3b78f63e265dcb1247b611732ee1d6e2dc43e33d0e8371e1fcb7f9282930be1a05c147e2f141f7806dd32e4269
 DIST ppp-2.4.5.tar.gz 684342 SHA256 43317afec9299f9920b96f840414c977f0385410202d48e56d2fdb8230003505 SHA512 3688720a0f9ee47802e72dc6aa3d47c7312c195007f37a6ceb087fdb6f1f77ad75e922a568cffed6d1a857f06d79460d6d38b56e179310e493a0380a0c5a4f6e WHIRLPOOL 210dbcfc754256e5317cffa0b6f51e7ae9e45d88815e4952e893ab85d024daef8131747624e355b97225f0b365e677fa4bd82ee2a7890810bc25c5521324b83f
+DIST ppp-2.4.6-patches-1.tar.xz 36284 SHA256 0536971bbdef0c65cde1ccad85a454bf2ad491d851c7b09d639e8fec8bf1c97d SHA512 7bc2188486749fceb9dac7c1e4dc339946ab3acc9a388ae3158f723bf3a5e61e2dcd315235e68692a0cbd3ad5b08c2d7167f179660c9491d835c3439d46f4a71 WHIRLPOOL 48f1dfe2103351bbf63982efe59cdd5b2382e359c822c92c83ad1cc467cbf2f7283ee1c2887660245bd36a0e45833dc9c737953b82b9582bb8070c97b4ded382
+DIST ppp-2.4.6.tar.gz 687744 SHA256 1b33181a03962c8a092c055fb9980e9722728a8d98a4bb7ec7acda17c1b1b49d SHA512 65d6967ba43cd8b4d3f63f52ff69f6fed964f748fc780dff982629668213c2cd1891671f6f4a0c1c22118a382e282fabdd2328e60a120d9b984d3c17f9355cc6 WHIRLPOOL 1f83ca8383486d76779c28ba0b107887584b2991c7d6fd4e86d6fecb7988e0422ec1f7e35d092f410b462a97f006cc11121c1a7cc00f7e35d856dd3861cdd828
 DIST ppp-dhcpc.tgz 33497 SHA256 977fd980bb1d285963d8e27a87b7601ea84317faadfdb40989b258d1853db644 SHA512 aeaf791b14f5a09c0e2079072a157e65132cbff46e608bc0724e6a5827a01da934f5006e2774eb7105f83e607a52cb4987238f4385cf6f5cc86cbe305a556738 WHIRLPOOL 74e5e0d7f9bc52d1b9cfeff83fe74c2b38cc10c60636cd9c0f5d67d61dc7da56dbf2bcc84afa29444546792876cb36afbc853a6515ce9b3d83d6de98eacedd1e
diff --git a/net-dialup/ppp/ppp-2.4.5-r1.ebuild b/net-dialup/ppp/ppp-2.4.5-r1.ebuild
deleted file mode 100644
index 5e862cc4efcb..000000000000
--- a/net-dialup/ppp/ppp-2.4.5-r1.ebuild
+++ /dev/null
@@ -1,282 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ppp-2.4.5-r1.ebuild,v 1.8 2012/06/14 01:48:45 zmedico Exp $
-
-EAPI="2"
-
-inherit eutils multilib toolchain-funcs linux-info pam
-
-DESCRIPTION="Point-to-Point Protocol (PPP)"
-HOMEPAGE="http://www.samba.org/ppp"
-SRC_URI="ftp://ftp.samba.org/pub/ppp/${P}.tar.gz
-	mirror://gentoo/${P}-gentoo-20101127.tar.gz
-	dhcp? ( http://www.netservers.co.uk/gpl/ppp-dhcpc.tgz )"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="activefilter atm dhcp eap-tls gtk ipv6 pam radius"
-
-DEPEND="activefilter? ( net-libs/libpcap )
-	atm? ( net-dialup/linux-atm )
-	pam? ( virtual/pam )
-	gtk? ( x11-libs/gtk+:2 )
-	eap-tls? ( net-misc/curl dev-libs/openssl )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${WORKDIR}/patch/make-vars.patch"
-	epatch "${WORKDIR}/patch/mpls.patch"
-	epatch "${WORKDIR}/patch/killaddr-smarter.patch"
-	epatch "${WORKDIR}/patch/wait-children.patch"
-	epatch "${WORKDIR}/patch/defaultgateway.patch"
-	epatch "${WORKDIR}/patch/linkpidfile.patch"
-	epatch "${WORKDIR}/patch/qa-fixes.patch"
-	epatch "${WORKDIR}/patch/auth-fail.patch"
-	epatch "${WORKDIR}/patch/defaultmetric.patch"
-	epatch "${WORKDIR}/patch/dev-ppp.patch"
-	epatch "${WORKDIR}/patch/gtk2.patch"
-	epatch "${WORKDIR}/patch/passwordfd-read-early.patch"
-	epatch "${WORKDIR}/patch/pppd-usepeerwins.patch"
-	epatch "${WORKDIR}/patch/connect-errors.patch"
-	epatch "${WORKDIR}/patch/Makefile.patch"
-	epatch "${WORKDIR}/patch/pppol2tpv3-2.6.35.patch"
-	epatch "${WORKDIR}/patch/pado-timeout.patch"
-	epatch "${WORKDIR}/patch/lcp-echo-adaptive.patch"
-
-	use eap-tls && {
-		# see http://www.nikhef.nl/~janjust/ppp for more info
-		einfo "Enabling EAP-TLS support"
-		epatch "${WORKDIR}/patch/eaptls-mppe-0.98-gentoo.patch"
-	}
-
-	use atm && {
-		einfo "Enabling PPPoATM support"
-		sed -i "s/^#HAVE_LIBATM=yes/HAVE_LIBATM=yes/" pppd/plugins/pppoatm/Makefile.linux
-	}
-
-	use activefilter || {
-		einfo "Disabling active filter"
-		sed -i "s/^FILTER=y/#FILTER=y/" pppd/Makefile.linux
-	}
-
-	use pam && {
-		einfo "Enabling PAM"
-		sed -i "s/^#USE_PAM=y/USE_PAM=y/" pppd/Makefile.linux
-	}
-
-	use ipv6 && {
-		einfo "Enabling IPv6"
-		sed -i "s/#HAVE_INET6/HAVE_INET6/" pppd/Makefile.linux
-	}
-
-	einfo "Enabling CBCP"
-	sed -i "s/^#CBCP=y/CBCP=y/" pppd/Makefile.linux
-
-	use dhcp && {
-		# copy the ppp-dhcp plugin files
-		einfo "Adding ppp-dhcp plugin files..."
-		mv "${WORKDIR}/dhcp" "${S}/pppd/plugins" \
-			&& sed -i -e 's/\(SUBDIRS := .*rp-pppoe.*\)$/\1 dhcp/' pppd/plugins/Makefile.linux \
-			|| die "ppp-dhcp plugin addition failed"
-		epatch "${WORKDIR}/patch/dhcp-make-vars.patch"
-		epatch "${WORKDIR}/patch/dhcp-sys_error_to_strerror.patch"
-	}
-
-	# Set correct libdir
-	sed -i -e "s:/lib/pppd:/$(get_libdir)/pppd:" \
-		pppd/{pathnames.h,pppd.8}
-
-	if use radius; then
-		#set the right paths in radiusclient.conf
-		sed -i -e "s:/usr/local/etc:/etc:" \
-			-e "s:/usr/local/sbin:/usr/sbin:" pppd/plugins/radius/etc/radiusclient.conf
-		#set config dir to /etc/ppp/radius
-		sed -i -e "s:/etc/radiusclient:/etc/ppp/radius:g" \
-			pppd/plugins/radius/{*.8,*.c,*.h} \
-			pppd/plugins/radius/etc/*
-	else
-		einfo "Disabling radius"
-		sed -i -e '/+= radius/s:^:#:' pppd/plugins/Makefile.linux
-	fi
-}
-
-src_configure() {
-	export CC="$(tc-getCC)"
-	export AR="$(tc-getAR)"
-	econf || die "econf failed"
-}
-
-src_compile() {
-	emake COPTS="${CFLAGS} -D_GNU_SOURCE" || die "compile failed"
-
-	#build pppgetpass
-	cd contrib/pppgetpass
-	if use gtk; then
-		emake -f Makefile.linux || die "failed to build pppgetpass"
-	else
-		emake pppgetpass.vt || die "failed to build pppgetpass"
-	fi
-}
-
-src_install() {
-	local i
-	for i in chat pppd pppdump pppstats ; do
-		doman ${i}/${i}.8 || die "man page for ${i} not build"
-		dosbin ${i}/${i} || die "${i} not build"
-	done
-	fperms u+s-w /usr/sbin/pppd
-
-	# Install pppd header files
-	pushd pppd >/dev/null
-	emake INSTROOT="${D}" install-devel || die "emake install-devel failed"
-	popd >/dev/null
-
-	dosbin pppd/plugins/rp-pppoe/pppoe-discovery || die "pppoe-discovery not build"
-
-	dodir /etc/ppp/peers
-	insinto /etc/ppp
-	insopts -m0600
-	newins etc.ppp/pap-secrets pap-secrets.example || die "pap-secrets.example not found"
-	newins etc.ppp/chap-secrets chap-secrets.example || die "chap-secrets.example not found"
-
-	insopts -m0644
-	doins etc.ppp/options
-
-	exeinto /etc/ppp
-	for i in ip-up ip-down ; do
-		doexe "${WORKDIR}/scripts/${i}" || die "failed to install ${i} script"
-		insinto /etc/ppp/${i}.d
-		use ipv6 && dosym ${i} /etc/ppp/${i/ip/ipv6}
-		doins "${WORKDIR}/scripts/${i}.d"/* || die "failed to install ${i}.d scripts"
-	done
-
-	pamd_mimic_system ppp auth account session
-
-	local PLUGINS_DIR=/usr/$(get_libdir)/pppd/$(awk -F '"' '/VERSION/ {print $2}' pppd/patchlevel.h)
-	#closing " for syntax coloring
-	insinto "${PLUGINS_DIR}"
-	insopts -m0755
-	doins pppd/plugins/minconn.so || die "minconn.so not build"
-	doins pppd/plugins/passprompt.so || die "passprompt.so not build"
-	doins pppd/plugins/passwordfd.so || die "passwordfd.so not build"
-	doins pppd/plugins/winbind.so || die "winbind.so not build"
-	doins pppd/plugins/rp-pppoe/rp-pppoe.so || die "rp-pppoe.so not build"
-	doins pppd/plugins/pppol2tp/openl2tp.so || die "openl2tp.so not build"
-	doins pppd/plugins/pppol2tp/pppol2tp.so || die "pppol2tp.so not build"
-	if use atm; then
-		doins pppd/plugins/pppoatm/pppoatm.so || die "pppoatm.so not build"
-	fi
-	if use dhcp; then
-		doins pppd/plugins/dhcp/dhcpc.so || die "dhcpc.so not build"
-	fi
-	if use radius; then
-		doins pppd/plugins/radius/radius.so || die "radius.so not build"
-		doins pppd/plugins/radius/radattr.so || die "radattr.so not build"
-		doins pppd/plugins/radius/radrealms.so || die "radrealms.so not build"
-
-		#Copy radiusclient configuration files (#92878)
-		insinto /etc/ppp/radius
-		insopts -m0644
-		doins pppd/plugins/radius/etc/{dictionary*,issue,port-id-map,radiusclient.conf,realms,servers}
-
-		doman pppd/plugins/radius/pppd-radius.8
-		doman pppd/plugins/radius/pppd-radattr.8
-	fi
-
-	insinto /etc/modprobe.d
-	insopts -m0644
-	newins "${FILESDIR}/modules.ppp" ppp.conf
-
-	dodoc PLUGINS README* SETUP Changes-2.3 FAQ
-	dodoc "${FILESDIR}/README.mpls"
-
-	dosbin scripts/pon && \
-	    dosbin scripts/poff && \
-	    dosbin scripts/plog && \
-	    doman scripts/pon.1 || die "failed to install pon&poff scripts"
-
-	# Adding misc. specialized scripts to doc dir
-	insinto /usr/share/doc/${PF}/scripts/chatchat
-	doins scripts/chatchat/* || die "failed to install chat scripts in doc dir"
-	insinto /usr/share/doc/${PF}/scripts
-	doins scripts/* || die "failed to install scripts in doc dir"
-
-	if use gtk; then
-		dosbin contrib/pppgetpass/{pppgetpass.vt,pppgetpass.gtk}
-		newsbin contrib/pppgetpass/pppgetpass.sh pppgetpass
-	else
-		newsbin contrib/pppgetpass/pppgetpass.vt pppgetpass
-	fi
-	doman contrib/pppgetpass/pppgetpass.8
-}
-
-pkg_postinst() {
-	if linux-info_get_any_version && linux_config_src_exists; then
-		echo
-		ewarn "If the following test report contains a missing kernel configuration option that you need,"
-		ewarn "you should reconfigure and rebuild your kernel before running pppd."
-		CONFIG_CHECK="~PPP ~PPP_ASYNC ~PPP_SYNC_TTY"
-		local ERROR_PPP="CONFIG_PPP:\t missing PPP support (REQUIRED)"
-		local ERROR_PPP_ASYNC="CONFIG_PPP_ASYNC:\t missing asynchronous serial line discipline (optional, but highly recommended)"
-		local WARNING_PPP_SYNC_TTY="CONFIG_PPP_SYNC_TTY:\t missing synchronous serial line discipline (optional; used by 'sync' pppd option)"
-		if use activefilter ; then
-			CONFIG_CHECK="${CONFIG_CHECK} ~PPP_FILTER"
-			local ERROR_PPP_FILTER="CONFIG_PPP_FILTER:\t missing PPP filtering support (REQUIRED)"
-		fi
-		CONFIG_CHECK="${CONFIG_CHECK} ~PPP_DEFLATE ~PPP_BSDCOMP ~PPP_MPPE"
-		local ERROR_PPP_DEFLATE="CONFIG_PPP_DEFLATE:\t missing Deflate compression (optional, but highly recommended)"
-		local ERROR_PPP_BSDCOMP="CONFIG_PPP_BSDCOMP:\t missing BSD-Compress compression (optional, but highly recommended)"
-		local WARNING_PPP_MPPE="CONFIG_PPP_MPPE:\t missing MPPE encryption (optional, mostly used by PPTP links)"
-		CONFIG_CHECK="${CONFIG_CHECK} ~PPPOE ~PACKET"
-		local WARNING_PPPOE="CONFIG_PPPOE:\t missing PPPoE support (optional, needed by rp-pppoe plugin)"
-		local WARNING_PACKET="CONFIG_PACKET:\t missing AF_PACKET support (optional, used by rp-pppoe and dhcpc plugins)"
-		if use atm ; then
-			CONFIG_CHECK="${CONFIG_CHECK} ~PPPOATM"
-			local WARNING_PPPOATM="CONFIG_PPPOATM:\t missing PPPoA support (optional, needed by pppoatm plugin)"
-		fi
-		check_extra_config
-	fi
-
-	if [ ! -e "${ROOT}/dev/.devfsd" ] && [ ! -e "${ROOT}/dev/.udev" ] && [ ! -e "${ROOT}/dev/ppp" ]; then
-		mknod "${ROOT}/dev/ppp" c 108 0
-	fi
-	if [ "$ROOT" = "/" ]; then
-		if [ -x /sbin/update-modules ]; then
-			/sbin/update-modules
-		else
-			/sbin/modules-update
-		fi
-	fi
-
-	# create *-secrets files if not exists
-	[ -f "${ROOT}/etc/ppp/pap-secrets" ] || \
-		cp -pP "${ROOT}/etc/ppp/pap-secrets.example" "${ROOT}/etc/ppp/pap-secrets"
-	[ -f "${ROOT}/etc/ppp/chap-secrets" ] || \
-		cp -pP "${ROOT}/etc/ppp/chap-secrets.example" "${ROOT}/etc/ppp/chap-secrets"
-
-	# lib name has changed
-	sed -i -e "s:^pppoe.so:rp-pppoe.so:" "${ROOT}/etc/ppp/options"
-
-	if use radius && [[ $previous_less_than_2_4_3_r5 = 0 ]] ; then
-		echo
-		ewarn "As of ${PN}-2.4.3-r5, the RADIUS configuration files have moved from"
-		ewarn "   /etc/radiusclient to /etc/ppp/radius."
-		einfo "For your convenience, radiusclient directory was copied to the new location."
-	fi
-
-	echo
-	elog "Pon, poff and plog scripts have been supplied for experienced users."
-	elog "Users needing particular scripts (ssh,rsh,etc.) should check out the"
-	elog "/usr/share/doc/${PF}/scripts directory."
-
-	# move the old user-defined files into ip-{up,down}.d directories
-	# TO BE REMOVED AFTER SEPT 2008
-	local i
-	for i in ip-up ip-down; do
-		if [ -f "${ROOT}"/etc/ppp/${i}.local ]; then
-			mv /etc/ppp/${i}.local /etc/ppp/${i}.d/90-local.sh && \
-				ewarn "/etc/ppp/${i}.local has been moved to /etc/ppp/${i}.d/90-local.sh"
-		fi
-	done
-}
diff --git a/net-dialup/ppp/ppp-2.4.5-r2.ebuild b/net-dialup/ppp/ppp-2.4.5-r2.ebuild
deleted file mode 100644
index a2619426dc17..000000000000
--- a/net-dialup/ppp/ppp-2.4.5-r2.ebuild
+++ /dev/null
@@ -1,284 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ppp-2.4.5-r2.ebuild,v 1.4 2012/08/07 15:05:23 vapier Exp $
-
-EAPI="2"
-
-inherit eutils multilib toolchain-funcs linux-info pam
-
-DESCRIPTION="Point-to-Point Protocol (PPP)"
-HOMEPAGE="http://www.samba.org/ppp"
-SRC_URI="ftp://ftp.samba.org/pub/ppp/${P}.tar.gz
-	http://dev.gentoo.org/~flameeyes/qa-copies/${P}-gentoo-20111111.tar.gz
-	dhcp? ( http://www.netservers.co.uk/gpl/ppp-dhcpc.tgz )"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="activefilter atm dhcp eap-tls gtk ipv6 pam radius"
-
-DEPEND="activefilter? ( net-libs/libpcap )
-	atm? ( net-dialup/linux-atm )
-	pam? ( virtual/pam )
-	gtk? ( x11-libs/gtk+:2 )
-	eap-tls? ( net-misc/curl dev-libs/openssl )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	# Use the headers from the kernel #427684
-	rm include/linux/if_pppol2tp.h || die
-
-	epatch "${WORKDIR}/patch/make-vars.patch"
-	epatch "${WORKDIR}/patch/mpls.patch"
-	epatch "${WORKDIR}/patch/killaddr-smarter.patch"
-	epatch "${WORKDIR}/patch/wait-children.patch"
-	epatch "${WORKDIR}/patch/defaultgateway.patch"
-	epatch "${WORKDIR}/patch/linkpidfile.patch"
-	epatch "${WORKDIR}/patch/qa-fixes.patch"
-	epatch "${WORKDIR}/patch/auth-fail.patch"
-	epatch "${WORKDIR}/patch/defaultmetric.patch"
-	epatch "${WORKDIR}/patch/dev-ppp.patch"
-	epatch "${WORKDIR}/patch/gtk2.patch"
-	epatch "${WORKDIR}/patch/passwordfd-read-early.patch"
-	epatch "${WORKDIR}/patch/pppd-usepeerwins.patch"
-	epatch "${WORKDIR}/patch/connect-errors.patch"
-	epatch "${WORKDIR}/patch/Makefile.patch"
-	epatch "${WORKDIR}/patch/pado-timeout.patch"
-	epatch "${WORKDIR}/patch/lcp-echo-adaptive.patch"
-
-	use eap-tls && {
-		# see http://www.nikhef.nl/~janjust/ppp for more info
-		einfo "Enabling EAP-TLS support"
-		epatch "${WORKDIR}/patch/eaptls-mppe-0.991-gentoo.patch"
-	}
-
-	use atm && {
-		einfo "Enabling PPPoATM support"
-		sed -i "s/^#HAVE_LIBATM=yes/HAVE_LIBATM=yes/" pppd/plugins/pppoatm/Makefile.linux
-	}
-
-	use activefilter || {
-		einfo "Disabling active filter"
-		sed -i "s/^FILTER=y/#FILTER=y/" pppd/Makefile.linux
-	}
-
-	use pam && {
-		einfo "Enabling PAM"
-		sed -i "s/^#USE_PAM=y/USE_PAM=y/" pppd/Makefile.linux
-	}
-
-	use ipv6 && {
-		einfo "Enabling IPv6"
-		sed -i "s/#HAVE_INET6/HAVE_INET6/" pppd/Makefile.linux
-	}
-
-	einfo "Enabling CBCP"
-	sed -i "s/^#CBCP=y/CBCP=y/" pppd/Makefile.linux
-
-	use dhcp && {
-		# copy the ppp-dhcp plugin files
-		einfo "Adding ppp-dhcp plugin files..."
-		mv "${WORKDIR}/dhcp" "${S}/pppd/plugins" \
-			&& sed -i -e 's/\(SUBDIRS := .*rp-pppoe.*\)$/\1 dhcp/' pppd/plugins/Makefile.linux \
-			|| die "ppp-dhcp plugin addition failed"
-		epatch "${WORKDIR}/patch/dhcp-make-vars.patch"
-		epatch "${WORKDIR}/patch/dhcp-sys_error_to_strerror.patch"
-	}
-
-	# Set correct libdir
-	sed -i -e "s:/lib/pppd:/$(get_libdir)/pppd:" \
-		pppd/{pathnames.h,pppd.8}
-
-	if use radius; then
-		#set the right paths in radiusclient.conf
-		sed -i -e "s:/usr/local/etc:/etc:" \
-			-e "s:/usr/local/sbin:/usr/sbin:" pppd/plugins/radius/etc/radiusclient.conf
-		#set config dir to /etc/ppp/radius
-		sed -i -e "s:/etc/radiusclient:/etc/ppp/radius:g" \
-			pppd/plugins/radius/{*.8,*.c,*.h} \
-			pppd/plugins/radius/etc/*
-	else
-		einfo "Disabling radius"
-		sed -i -e '/+= radius/s:^:#:' pppd/plugins/Makefile.linux
-	fi
-}
-
-src_configure() {
-	export CC="$(tc-getCC)"
-	export AR="$(tc-getAR)"
-	econf || die "econf failed"
-}
-
-src_compile() {
-	emake COPTS="${CFLAGS} -D_GNU_SOURCE" || die "compile failed"
-
-	#build pppgetpass
-	cd contrib/pppgetpass
-	if use gtk; then
-		emake -f Makefile.linux || die "failed to build pppgetpass"
-	else
-		emake pppgetpass.vt || die "failed to build pppgetpass"
-	fi
-}
-
-src_install() {
-	local i
-	for i in chat pppd pppdump pppstats ; do
-		doman ${i}/${i}.8 || die "man page for ${i} not build"
-		dosbin ${i}/${i} || die "${i} not build"
-	done
-	fperms u+s-w /usr/sbin/pppd
-
-	# Install pppd header files
-	pushd pppd >/dev/null
-	emake INSTROOT="${D}" install-devel || die "emake install-devel failed"
-	popd >/dev/null
-
-	dosbin pppd/plugins/rp-pppoe/pppoe-discovery || die "pppoe-discovery not build"
-
-	dodir /etc/ppp/peers
-	insinto /etc/ppp
-	insopts -m0600
-	newins etc.ppp/pap-secrets pap-secrets.example || die "pap-secrets.example not found"
-	newins etc.ppp/chap-secrets chap-secrets.example || die "chap-secrets.example not found"
-
-	insopts -m0644
-	doins etc.ppp/options
-
-	exeinto /etc/ppp
-	for i in ip-up ip-down ; do
-		doexe "${WORKDIR}/scripts/${i}" || die "failed to install ${i} script"
-		insinto /etc/ppp/${i}.d
-		use ipv6 && dosym ${i} /etc/ppp/${i/ip/ipv6}
-		doins "${WORKDIR}/scripts/${i}.d"/* || die "failed to install ${i}.d scripts"
-	done
-
-	pamd_mimic_system ppp auth account session
-
-	local PLUGINS_DIR=/usr/$(get_libdir)/pppd/$(awk -F '"' '/VERSION/ {print $2}' pppd/patchlevel.h)
-	#closing " for syntax coloring
-	insinto "${PLUGINS_DIR}"
-	insopts -m0755
-	doins pppd/plugins/minconn.so || die "minconn.so not build"
-	doins pppd/plugins/passprompt.so || die "passprompt.so not build"
-	doins pppd/plugins/passwordfd.so || die "passwordfd.so not build"
-	doins pppd/plugins/winbind.so || die "winbind.so not build"
-	doins pppd/plugins/rp-pppoe/rp-pppoe.so || die "rp-pppoe.so not build"
-	doins pppd/plugins/pppol2tp/openl2tp.so || die "openl2tp.so not build"
-	doins pppd/plugins/pppol2tp/pppol2tp.so || die "pppol2tp.so not build"
-	if use atm; then
-		doins pppd/plugins/pppoatm/pppoatm.so || die "pppoatm.so not build"
-	fi
-	if use dhcp; then
-		doins pppd/plugins/dhcp/dhcpc.so || die "dhcpc.so not build"
-	fi
-	if use radius; then
-		doins pppd/plugins/radius/radius.so || die "radius.so not build"
-		doins pppd/plugins/radius/radattr.so || die "radattr.so not build"
-		doins pppd/plugins/radius/radrealms.so || die "radrealms.so not build"
-
-		#Copy radiusclient configuration files (#92878)
-		insinto /etc/ppp/radius
-		insopts -m0644
-		doins pppd/plugins/radius/etc/{dictionary*,issue,port-id-map,radiusclient.conf,realms,servers}
-
-		doman pppd/plugins/radius/pppd-radius.8
-		doman pppd/plugins/radius/pppd-radattr.8
-	fi
-
-	insinto /etc/modprobe.d
-	insopts -m0644
-	newins "${FILESDIR}/modules.ppp" ppp.conf
-
-	dodoc PLUGINS README* SETUP Changes-2.3 FAQ
-	dodoc "${FILESDIR}/README.mpls"
-
-	dosbin scripts/pon && \
-		dosbin scripts/poff && \
-		dosbin scripts/plog && \
-		doman scripts/pon.1 || die "failed to install pon&poff scripts"
-
-	# Adding misc. specialized scripts to doc dir
-	insinto /usr/share/doc/${PF}/scripts/chatchat
-	doins scripts/chatchat/* || die "failed to install chat scripts in doc dir"
-	insinto /usr/share/doc/${PF}/scripts
-	doins scripts/* || die "failed to install scripts in doc dir"
-
-	if use gtk; then
-		dosbin contrib/pppgetpass/{pppgetpass.vt,pppgetpass.gtk}
-		newsbin contrib/pppgetpass/pppgetpass.sh pppgetpass
-	else
-		newsbin contrib/pppgetpass/pppgetpass.vt pppgetpass
-	fi
-	doman contrib/pppgetpass/pppgetpass.8
-}
-
-pkg_postinst() {
-	if linux-info_get_any_version && linux_config_src_exists; then
-		echo
-		ewarn "If the following test report contains a missing kernel configuration option that you need,"
-		ewarn "you should reconfigure and rebuild your kernel before running pppd."
-		CONFIG_CHECK="~PPP ~PPP_ASYNC ~PPP_SYNC_TTY"
-		local ERROR_PPP="CONFIG_PPP:\t missing PPP support (REQUIRED)"
-		local ERROR_PPP_ASYNC="CONFIG_PPP_ASYNC:\t missing asynchronous serial line discipline (optional, but highly recommended)"
-		local WARNING_PPP_SYNC_TTY="CONFIG_PPP_SYNC_TTY:\t missing synchronous serial line discipline (optional; used by 'sync' pppd option)"
-		if use activefilter ; then
-			CONFIG_CHECK="${CONFIG_CHECK} ~PPP_FILTER"
-			local ERROR_PPP_FILTER="CONFIG_PPP_FILTER:\t missing PPP filtering support (REQUIRED)"
-		fi
-		CONFIG_CHECK="${CONFIG_CHECK} ~PPP_DEFLATE ~PPP_BSDCOMP ~PPP_MPPE"
-		local ERROR_PPP_DEFLATE="CONFIG_PPP_DEFLATE:\t missing Deflate compression (optional, but highly recommended)"
-		local ERROR_PPP_BSDCOMP="CONFIG_PPP_BSDCOMP:\t missing BSD-Compress compression (optional, but highly recommended)"
-		local WARNING_PPP_MPPE="CONFIG_PPP_MPPE:\t missing MPPE encryption (optional, mostly used by PPTP links)"
-		CONFIG_CHECK="${CONFIG_CHECK} ~PPPOE ~PACKET"
-		local WARNING_PPPOE="CONFIG_PPPOE:\t missing PPPoE support (optional, needed by rp-pppoe plugin)"
-		local WARNING_PACKET="CONFIG_PACKET:\t missing AF_PACKET support (optional, used by rp-pppoe and dhcpc plugins)"
-		if use atm ; then
-			CONFIG_CHECK="${CONFIG_CHECK} ~PPPOATM"
-			local WARNING_PPPOATM="CONFIG_PPPOATM:\t missing PPPoA support (optional, needed by pppoatm plugin)"
-		fi
-		check_extra_config
-	fi
-
-	if [ ! -e "${ROOT}/dev/.devfsd" ] && [ ! -e "${ROOT}/dev/.udev" ] && [ ! -e "${ROOT}/dev/ppp" ]; then
-		mknod "${ROOT}/dev/ppp" c 108 0
-	fi
-	if [ "$ROOT" = "/" ]; then
-		if [ -x /sbin/update-modules ]; then
-			/sbin/update-modules
-		else
-			/sbin/modules-update
-		fi
-	fi
-
-	# create *-secrets files if not exists
-	[ -f "${ROOT}/etc/ppp/pap-secrets" ] || \
-		cp -pP "${ROOT}/etc/ppp/pap-secrets.example" "${ROOT}/etc/ppp/pap-secrets"
-	[ -f "${ROOT}/etc/ppp/chap-secrets" ] || \
-		cp -pP "${ROOT}/etc/ppp/chap-secrets.example" "${ROOT}/etc/ppp/chap-secrets"
-
-	# lib name has changed
-	sed -i -e "s:^pppoe.so:rp-pppoe.so:" "${ROOT}/etc/ppp/options"
-
-	if use radius && [[ $previous_less_than_2_4_3_r5 = 0 ]] ; then
-		echo
-		ewarn "As of ${PN}-2.4.3-r5, the RADIUS configuration files have moved from"
-		ewarn "   /etc/radiusclient to /etc/ppp/radius."
-		einfo "For your convenience, radiusclient directory was copied to the new location."
-	fi
-
-	echo
-	elog "Pon, poff and plog scripts have been supplied for experienced users."
-	elog "Users needing particular scripts (ssh,rsh,etc.) should check out the"
-	elog "/usr/share/doc/${PF}/scripts directory."
-
-	# move the old user-defined files into ip-{up,down}.d directories
-	# TO BE REMOVED AFTER SEPT 2008
-	local i
-	for i in ip-up ip-down; do
-		if [ -f "${ROOT}"/etc/ppp/${i}.local ]; then
-			mv /etc/ppp/${i}.local /etc/ppp/${i}.d/90-local.sh && \
-				ewarn "/etc/ppp/${i}.local has been moved to /etc/ppp/${i}.d/90-local.sh"
-		fi
-	done
-}
diff --git a/net-dialup/ppp/ppp-2.4.6.ebuild b/net-dialup/ppp/ppp-2.4.6.ebuild
new file mode 100644
index 000000000000..12028691741b
--- /dev/null
+++ b/net-dialup/ppp/ppp-2.4.6.ebuild
@@ -0,0 +1,223 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ppp-2.4.6.ebuild,v 1.1 2014/02/19 09:56:32 polynomial-c Exp $
+
+EAPI=5
+
+inherit eutils multilib toolchain-funcs linux-info pam
+
+PATCH_VER="1"
+DESCRIPTION="Point-to-Point Protocol (PPP)"
+HOMEPAGE="http://www.samba.org/ppp"
+SRC_URI="ftp://ftp.samba.org/pub/ppp/${P}.tar.gz
+	http://dev.gentoo.org/~polynomial-c/${P}-patches-${PATCH_VER}.tar.xz
+	http://www.netservers.net.uk/gpl/ppp-dhcpc.tgz"
+
+LICENSE="BSD GPL-2"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="activefilter atm dhcp eap-tls gtk ipv6 pam radius"
+
+DEPEND="activefilter? ( net-libs/libpcap )
+	atm? ( net-dialup/linux-atm )
+	pam? ( virtual/pam )
+	gtk? ( x11-libs/gtk+:2 )
+	eap-tls? ( net-misc/curl dev-libs/openssl )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	mv "${WORKDIR}/dhcp" "${S}/pppd/plugins" || die
+
+	use eap-tls || EPATCH_EXCLUDE+=" 8?_all_eaptls-*"
+	EPATCH_SUFFIX="patch" \
+	epatch "${WORKDIR}"/patch
+
+	if use atm ; then
+		einfo "Enabling PPPoATM support"
+		sed -i '/^#HAVE_LIBATM=yes/s:#::' \
+			pppd/plugins/pppoatm/Makefile.linux || die
+	fi
+
+	if ! use activefilter ; then
+		einfo "Disabling active filter"
+		sed -i '/^FILTER=y/s:^:#:' pppd/Makefile.linux || die
+	fi
+
+	if use pam ; then
+		einfo "Enabling PAM"
+		sed -i '/^#USE_PAM=y/s:^#::' pppd/Makefile.linux || die
+	fi
+
+	if use ipv6 ; then
+		einfo "Enabling IPv6"
+		sed -i '/#HAVE_INET6/s:#::' pppd/Makefile.linux || die
+	fi
+
+	einfo "Enabling CBCP"
+	sed -i '/^#CBCP=y/s:#::' pppd/Makefile.linux || die
+
+	if use dhcp ; then
+		einfo "Adding ppp-dhcp plugin files"
+		sed -i \
+			-e '/^SUBDIRS :=/s:$: dhcp:' \
+				pppd/plugins/Makefile.linux || die
+	fi
+
+	# Set correct libdir
+	sed -i -e "s:/lib/pppd:/$(get_libdir)/pppd:" \
+		pppd/{pathnames.h,pppd.8}
+
+	if use radius ; then
+		#set the right paths in radiusclient.conf
+		sed -i -e "s:/usr/local/etc:/etc:" \
+			-e "s:/usr/local/sbin:/usr/sbin:" \
+				pppd/plugins/radius/etc/radiusclient.conf
+		#set config dir to /etc/ppp/radius
+		sed -i -e "s:/etc/radiusclient:/etc/ppp/radius:g" \
+			pppd/plugins/radius/{*.8,*.c,*.h} \
+			pppd/plugins/radius/etc/*
+	else
+		einfo "Disabling radius"
+		sed -i -e '/+= radius/s:^:#:' pppd/plugins/Makefile.linux
+	fi
+}
+
+src_compile() {
+	tc-export AR CC
+	emake COPTS="${CFLAGS} -D_GNU_SOURCE"
+
+	# build pppgetpass
+	cd contrib/pppgetpass || die
+	if use gtk ; then
+		emake -f Makefile.linux
+	else
+		emake pppgetpass.vt
+	fi
+}
+
+src_install() {
+	local i
+	for i in chat pppd pppdump pppstats ; do
+		doman ${i}/${i}.8
+		dosbin ${i}/${i}
+	done
+	fperms u+s-w /usr/sbin/pppd
+
+	# Install pppd header files
+	emake -C pppd INSTROOT="${D}" install-devel
+
+	dosbin pppd/plugins/rp-pppoe/pppoe-discovery
+
+	dodir /etc/ppp/peers
+	insinto /etc/ppp
+	insopts -m0600
+	newins etc.ppp/pap-secrets pap-secrets.example
+	newins etc.ppp/chap-secrets chap-secrets.example
+
+	insopts -m0644
+	doins etc.ppp/options
+
+	exeinto /etc/ppp
+	for i in ip-up ip-down ; do
+		doexe "${WORKDIR}/scripts/${i}"
+		insinto /etc/ppp/${i}.d
+		use ipv6 && dosym ${i} /etc/ppp/${i/ip/ipv6}
+		doins "${WORKDIR}/scripts/${i}.d"/*
+	done
+
+	pamd_mimic_system ppp auth account session
+
+	local PLUGINS_DIR=/usr/$(get_libdir)/pppd/$(awk -F '"' '/VERSION/ {print $2}' pppd/patchlevel.h)
+	# closing " for syntax coloring
+	insinto "${PLUGINS_DIR}"
+	insopts -m0755
+	doins pppd/plugins/minconn.so
+	doins pppd/plugins/passprompt.so
+	doins pppd/plugins/passwordfd.so
+	doins pppd/plugins/winbind.so
+	doins pppd/plugins/rp-pppoe/rp-pppoe.so
+	doins pppd/plugins/pppol2tp/openl2tp.so
+	doins pppd/plugins/pppol2tp/pppol2tp.so
+	if use atm ; then
+		doins pppd/plugins/pppoatm/pppoatm.so
+	fi
+	if use dhcp ; then
+		doins pppd/plugins/dhcp/dhcpc.so
+	fi
+	if use radius ; then
+		doins pppd/plugins/radius/rad{ius,attr,realms}.so
+
+		#Copy radiusclient configuration files (#92878)
+		insinto /etc/ppp/radius
+		insopts -m0644
+		doins pppd/plugins/radius/etc/{dictionary*,issue,port-id-map,radiusclient.conf,realms,servers}
+
+		doman pppd/plugins/radius/pppd-rad{ius,attr}.8
+	fi
+
+	insinto /etc/modprobe.d
+	insopts -m0644
+	newins "${FILESDIR}/modules.ppp" ppp.conf
+
+	dodoc PLUGINS README* SETUP Changes-2.3 FAQ
+	dodoc "${FILESDIR}/README.mpls"
+
+	dosbin scripts/p{on,off,log}
+	doman scripts/pon.1
+
+	# Adding misc. specialized scripts to doc dir
+	insinto /usr/share/doc/${PF}/scripts/chatchat
+	doins scripts/chatchat/*
+	insinto /usr/share/doc/${PF}/scripts
+	doins scripts/*
+
+	if use gtk ; then
+		dosbin contrib/pppgetpass/{pppgetpass.vt,pppgetpass.gtk}
+		newsbin contrib/pppgetpass/pppgetpass.sh pppgetpass
+	else
+		newsbin contrib/pppgetpass/pppgetpass.vt pppgetpass
+	fi
+	doman contrib/pppgetpass/pppgetpass.8
+}
+
+pkg_postinst() {
+	if linux-info_get_any_version && linux_config_src_exists ; then
+		echo
+		ewarn "If the following test report contains a missing kernel configuration option that you need,"
+		ewarn "you should reconfigure and rebuild your kernel before running pppd."
+		CONFIG_CHECK="~PPP ~PPP_ASYNC ~PPP_SYNC_TTY"
+		local ERROR_PPP="CONFIG_PPP:\t missing PPP support (REQUIRED)"
+		local ERROR_PPP_ASYNC="CONFIG_PPP_ASYNC:\t missing asynchronous serial line discipline (optional, but highly recommended)"
+		local WARNING_PPP_SYNC_TTY="CONFIG_PPP_SYNC_TTY:\t missing synchronous serial line discipline (optional; used by 'sync' pppd option)"
+		if use activefilter ; then
+			CONFIG_CHECK="${CONFIG_CHECK} ~PPP_FILTER"
+			local ERROR_PPP_FILTER="CONFIG_PPP_FILTER:\t missing PPP filtering support (REQUIRED)"
+		fi
+		CONFIG_CHECK="${CONFIG_CHECK} ~PPP_DEFLATE ~PPP_BSDCOMP ~PPP_MPPE"
+		local ERROR_PPP_DEFLATE="CONFIG_PPP_DEFLATE:\t missing Deflate compression (optional, but highly recommended)"
+		local ERROR_PPP_BSDCOMP="CONFIG_PPP_BSDCOMP:\t missing BSD-Compress compression (optional, but highly recommended)"
+		local WARNING_PPP_MPPE="CONFIG_PPP_MPPE:\t missing MPPE encryption (optional, mostly used by PPTP links)"
+		CONFIG_CHECK="${CONFIG_CHECK} ~PPPOE ~PACKET"
+		local WARNING_PPPOE="CONFIG_PPPOE:\t missing PPPoE support (optional, needed by rp-pppoe plugin)"
+		local WARNING_PACKET="CONFIG_PACKET:\t missing AF_PACKET support (optional, used by rp-pppoe and dhcpc plugins)"
+		if use atm ; then
+			CONFIG_CHECK="${CONFIG_CHECK} ~PPPOATM"
+			local WARNING_PPPOATM="CONFIG_PPPOATM:\t missing PPPoA support (optional, needed by pppoatm plugin)"
+		fi
+		check_extra_config
+	fi
+
+	# create *-secrets files if not exists
+	[ -f "${ROOT}/etc/ppp/pap-secrets" ] || \
+		cp -pP "${ROOT}/etc/ppp/pap-secrets.example" "${ROOT}/etc/ppp/pap-secrets"
+	[ -f "${ROOT}/etc/ppp/chap-secrets" ] || \
+		cp -pP "${ROOT}/etc/ppp/chap-secrets.example" "${ROOT}/etc/ppp/chap-secrets"
+
+	# lib name has changed
+	sed -i -e "s:^pppoe.so:rp-pppoe.so:" "${ROOT}/etc/ppp/options"
+
+	echo
+	elog "Pon, poff and plog scripts have been supplied for experienced users."
+	elog "Users needing particular scripts (ssh,rsh,etc.) should check out the"
+	elog "/usr/share/doc/${PF}/scripts directory."
+}
diff --git a/net-firewall/iptables/files/systemd/ip6tables-restore.service b/net-firewall/iptables/files/systemd/ip6tables-restore.service
new file mode 100644
index 000000000000..88415fa37a64
--- /dev/null
+++ b/net-firewall/iptables/files/systemd/ip6tables-restore.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=Restore ip6tables firewall rules
+# if both are queued for some reason, don't store before restoring :)
+Before=ip6tables-store.service
+# sounds reasonable to have firewall up before any of the services go up
+Before=network.target
+Conflicts=shutdown.target
+
+[Service]
+Type=oneshot
+ExecStart=/sbin/ip6tables-restore /var/lib/ip6tables/rules-save
+
+[Install]
+WantedBy=basic.target
diff --git a/net-firewall/iptables/files/systemd/ip6tables-store.service b/net-firewall/iptables/files/systemd/ip6tables-store.service
new file mode 100644
index 000000000000..9975378353d3
--- /dev/null
+++ b/net-firewall/iptables/files/systemd/ip6tables-store.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Store ip6tables firewall rules
+Before=shutdown.target
+DefaultDependencies=No
+
+[Service]
+Type=oneshot
+ExecStart=/bin/sh -c "/sbin/ip6tables-save --counters > /var/lib/ip6tables/rules-save"
+
+[Install]
+WantedBy=shutdown.target
diff --git a/net-firewall/iptables/files/systemd/ip6tables.service b/net-firewall/iptables/files/systemd/ip6tables.service
new file mode 100644
index 000000000000..0a6d7fa1c8ab
--- /dev/null
+++ b/net-firewall/iptables/files/systemd/ip6tables.service
@@ -0,0 +1,6 @@
+[Unit]
+Description=Store and restore ip6tables firewall rules
+
+[Install]
+Also=ip6tables-store.service
+Also=ip6tables-restore.service
diff --git a/net-firewall/iptables/files/systemd/iptables-restore.service b/net-firewall/iptables/files/systemd/iptables-restore.service
new file mode 100644
index 000000000000..9d568d78b309
--- /dev/null
+++ b/net-firewall/iptables/files/systemd/iptables-restore.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=Restore iptables firewall rules
+# if both are queued for some reason, don't store before restoring :)
+Before=iptables-store.service
+# sounds reasonable to have firewall up before any of the services go up
+Before=network.target
+Conflicts=shutdown.target
+
+[Service]
+Type=oneshot
+ExecStart=/sbin/iptables-restore /var/lib/iptables/rules-save
+
+[Install]
+WantedBy=basic.target
diff --git a/net-firewall/iptables/files/systemd/iptables-store.service b/net-firewall/iptables/files/systemd/iptables-store.service
new file mode 100644
index 000000000000..aa16e75e9ccf
--- /dev/null
+++ b/net-firewall/iptables/files/systemd/iptables-store.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Store iptables firewall rules
+Before=shutdown.target
+DefaultDependencies=No
+
+[Service]
+Type=oneshot
+ExecStart=/bin/sh -c "/sbin/iptables-save --counters > /var/lib/iptables/rules-save"
+
+[Install]
+WantedBy=shutdown.target
diff --git a/net-firewall/iptables/files/systemd/iptables.service b/net-firewall/iptables/files/systemd/iptables.service
new file mode 100644
index 000000000000..3643a3e31034
--- /dev/null
+++ b/net-firewall/iptables/files/systemd/iptables.service
@@ -0,0 +1,6 @@
+[Unit]
+Description=Store and restore iptables firewall rules
+
+[Install]
+Also=iptables-store.service
+Also=iptables-restore.service
diff --git a/net-firewall/iptables/iptables-1.4.21-r1.ebuild b/net-firewall/iptables/iptables-1.4.21-r1.ebuild
new file mode 100644
index 000000000000..3becf43be2d9
--- /dev/null
+++ b/net-firewall/iptables/iptables-1.4.21-r1.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.4.21-r1.ebuild,v 1.1 2014/02/18 15:49:19 mgorny Exp $
+
+EAPI="5"
+
+# Force users doing their own patches to install their own tools
+AUTOTOOLS_AUTO_DEPEND=no
+
+inherit eutils multilib systemd toolchain-funcs autotools
+
+DESCRIPTION="Linux kernel (2.4+) firewall, NAT and packet mangling tools"
+HOMEPAGE="http://www.netfilter.org/projects/iptables/"
+SRC_URI="http://www.netfilter.org/projects/iptables/files/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="ipv6 netlink static-libs"
+
+RDEPEND="
+	netlink? ( net-libs/libnfnetlink )
+"
+DEPEND="${RDEPEND}
+	virtual/os-headers
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	# use the saner headers from the kernel
+	rm -f include/linux/{kernel,types}.h
+
+	# Only run autotools if user patched something
+	epatch_user && eautoreconf || elibtoolize
+}
+
+src_configure() {
+	# Some libs use $(AR) rather than libtool to build #444282
+	tc-export AR
+
+	sed -i \
+		-e "/nfnetlink=[01]/s:=[01]:=$(usex netlink 1 0):" \
+		configure || die
+
+	econf \
+		--sbindir="${EPREFIX}/sbin" \
+		--libexecdir="${EPREFIX}/$(get_libdir)" \
+		--enable-devel \
+		--enable-shared \
+		$(use_enable static-libs static) \
+		$(use_enable ipv6)
+}
+
+src_compile() {
+	emake V=1
+}
+
+src_install() {
+	default
+	dodoc INCOMPATIBILITIES iptables/iptables.xslt
+
+	# all the iptables binaries are in /sbin, so might as well
+	# put these small files in with them
+	into /
+	dosbin iptables/iptables-apply
+	dosym iptables-apply /sbin/ip6tables-apply
+	doman iptables/iptables-apply.8
+
+	insinto /usr/include
+	doins include/iptables.h $(use ipv6 && echo include/ip6tables.h)
+	insinto /usr/include/iptables
+	doins include/iptables/internal.h
+
+	keepdir /var/lib/iptables
+	newinitd "${FILESDIR}"/${PN}-1.4.13-r1.init iptables
+	newconfd "${FILESDIR}"/${PN}-1.4.13.confd iptables
+	if use ipv6 ; then
+		keepdir /var/lib/ip6tables
+		newinitd "${FILESDIR}"/iptables-1.4.13-r1.init ip6tables
+		newconfd "${FILESDIR}"/ip6tables-1.4.13.confd ip6tables
+	fi
+
+	systemd_dounit "${FILESDIR}"/systemd/iptables{,-{re,}store}.service
+	if use ipv6 ; then
+		systemd_dounit "${FILESDIR}"/systemd/ip6tables{,-{re,}store}.service
+	fi
+
+	# Move important libs to /lib
+	gen_usr_ldscript -a ip{4,6}tc iptc xtables
+
+	prune_libtool_files
+}
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index d3b957c9fc57..cd9ddc8434ea 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -4,8 +4,8 @@ DIST samba-3.6.19.tar.gz 34115773 SHA256 addecc6acb05d3ffd0934f7f91d8e83852705b9
 DIST samba-3.6.20.tar.gz 34112208 SHA256 5fb5daa65c06c890cdc938fd30daca40945afe2880e6a4b95b8eea418e003a0f SHA512 c87233f00051b98968a9aed1aa7c44e44bb0195efe460a55bd2541a02732afc02115fd6f5d75b3a9df568bfa4492d17d03f2fbe8b8dc6a5f984da87668b6708a WHIRLPOOL 22df9b68ce942dcb8a867e6a3840775760dc2017ba8691a17bdfc517b501147a30c4e6e50ecb915b97e7a46c22ae60d19ed813265c79001f6d8a7a009397a408
 DIST samba-3.6.21.tar.gz 34116243 SHA256 6b960abee66058a9390be036ae42efc463790b2cf4c53f842660fa36a3dc979e SHA512 c9ad1cf019bbb29fb34ade6dfebfa23d2a56fe05878c5f4f3660b406a4e3415c77a14862d34c7fca9d7da7527a1866fd42d1eaf2090a81e00e33581b5afa71cf WHIRLPOOL 42f381d3eefaa48e356d0fd99358e77b15adcb005b5ee88b3d364bd0ae1bccf231afd5c76b860811e09023711c34322b11d13cc9e1a298ed84aa93ddbb1a59e1
 DIST samba-3.6.22.tar.gz 34122131 SHA256 30bdf20e7788785573196a33905e7e27083a32d749285c22958edce0721cdeea SHA512 13b7d4c7ee24434626cf7e835e302252a281f00dfff1b83fd3c28f8264c1ce7afa0aa6ad237c28015fd2a39a38954189a140b36c27d8b0434a48b46d56936981 WHIRLPOOL 0daaeee4a7c7c3807ceda6558041708cca6c28ad20051cfff5547477f2acab8b896a4168f44a85eb7722dec5d3772bbc59566e79e1876820057f1f3107962cb5
-DIST samba-4.0.13.tar.gz 22105105 SHA256 cb970bb016fd6403a31a2002b8db57f9201c6333feaafcc6b689eb5bd24174ac SHA512 9170d7f9e5d586091fbba6c8f7fe6b23c969310ab5a1f6e51f5b700385a02086b70ccc5686bddf3687dacf5a6f67aa4ba60360e9eb1ff9dd0d6ac3c5731228e4 WHIRLPOOL 07785fe0b3573fe0a30b55d23a958586a942f3dcfdc341ade5c5aa52c402b12c6f069f090b50f84037da01b97a4159d68a4743112aa420f24700f64e74a4f090
 DIST samba-4.0.14.tar.gz 22108111 SHA256 0f9796579246ac57fd2d9bfd2be1fe2ed5aaccbce1098c03eb528570286636a6 SHA512 651ad1e40b0206390d59ea2dee49fd6769d361a69f3b37683e0ea46c6d0454776c6ea092a063428ee558a6988f5e75a723296253d97cde3d5430b7c843bef7cb WHIRLPOOL 88704645dfe8e4802bc03c07d6029ad3b7a5c59d1705ed7b3e6ea2c2127bc63c195ab1a8a64240dbe5696dba60e94f4027ef8e40ab53b24949b76a0f0fb6cf98
+DIST samba-4.0.15.tar.gz 22114484 SHA256 2866aee5ab46a57cff9838b25e6960b3ca75218195eeff0823ed72b5dfd464b2 SHA512 a98c42fe07e26f7dd12d364e279d591216cbfb0dc53e41448d4e60482a8af13e8900573926c496be081b057672e82fa1ad983f1a2e02046b749c6ea37942c365 WHIRLPOOL 8846be2a562716c29522cb839549d5e68297b636a7c1c08a99fe6a33fa0d0983da0c4b2d83555cae93e90792af46b13425b03feef38fa8e6ed4d8360db327fed
 DIST samba-4.1.3.tar.gz 23161646 SHA256 71da208d412b8d15ee26d2a76b2247df357242177d995fe5d9320355432e24db SHA512 c3e08df4e23c02ab759e819809ac8b146972508bbbbfc666e47ac180dea75dde85564e839aa4935e43f9b894bdf650fd3ed36463e70e9065c6e1c745142984d5 WHIRLPOOL e8f3025f66ae3cb3086642f2115bb23191b16f57f4e4d818ae5572664c969857873c5074205c17450c43507fd7391b22bd021be120971377f040a25775f7efa9
 DIST samba-4.1.4.tar.gz 23169480 SHA256 1733e1aaa37b4fcb0fc781b07fc6f20831023ce971d8bcd97940c3fbe35766a7 SHA512 a7cc48e00af6637fd464ce8e364b887155fa4ae4e1f6f1c6a0262d38a9c9a35711cb248664b0f81f356ca6afaf0ad44cba6d465207feaf86cde7c4c35e57b596 WHIRLPOOL adbf19246ca216f807ae17c8aa2a3626e81437f11f570d406d3099d6a3606417423e6a36d730aa90619ff18208207e7ca8b13475429ae98a2e47132ffe5620a1
 DIST smb_traffic_analyzer_v2.diff.bz2 12226 SHA256 1bae7eafbe8ac2382313d5ab9d43d73ba64b63a714f0f588516952d476fb868d SHA512 aa0e457a0dd282e61e6dfcd5705c29b319832dca9711b1b5baf8373e2f079991399c3537c050219ccb861a93f86353ebff677a5c625d2e3f1f3a13ee5c4087d0 WHIRLPOOL 85ee72a360f67ebe71be5cd400ecd635280a0d7c64ebb8b94656a5ef1a94f74a987de86408af00ce1b81cc8363b1b3cf14726860d29b72ee610d4bab73d6b139
diff --git a/net-fs/samba/samba-4.0.13.ebuild b/net-fs/samba/samba-4.0.15.ebuild
similarity index 96%
rename from net-fs/samba/samba-4.0.13.ebuild
rename to net-fs/samba/samba-4.0.15.ebuild
index faa7881f766b..3dbf735cbacb 100644
--- a/net-fs/samba/samba-4.0.13.ebuild
+++ b/net-fs/samba/samba-4.0.15.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# 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.0.13.ebuild,v 1.2 2013/12/11 07:15:47 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-4.0.15.ebuild,v 1.1 2014/02/19 07:15:06 polynomial-c Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_{6,7} )
diff --git a/net-im/gajim/gajim-0.15.3-r1.ebuild b/net-im/gajim/gajim-0.15.3-r1.ebuild
index bb2a4f1dbfd3..2364cdd6d573 100644
--- a/net-im/gajim/gajim-0.15.3-r1.ebuild
+++ b/net-im/gajim/gajim-0.15.3-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/gajim-0.15.3-r1.ebuild,v 1.9 2013/05/29 11:19:38 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/gajim-0.15.3-r1.ebuild,v 1.10 2014/02/19 01:12:27 jer Exp $
 
 EAPI=5
 
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="avahi crypt dbus gnome kde idle jingle libnotify networkmanager nls spell +srv test X xhtml"
 
 REQUIRED_USE="
diff --git a/net-im/gajim/gajim-0.15.4.ebuild b/net-im/gajim/gajim-0.15.4.ebuild
index 0868834450be..e28a22837d20 100644
--- a/net-im/gajim/gajim-0.15.4.ebuild
+++ b/net-im/gajim/gajim-0.15.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/gajim-0.15.4.ebuild,v 1.3 2013/06/13 05:51:09 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/gajim-0.15.4.ebuild,v 1.4 2014/02/19 01:12:27 jer Exp $
 
 EAPI=5
 
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="avahi crypt dbus gnome gnome-keyring kde idle jingle libnotify networkmanager nls spell +srv test X xhtml"
 
 REQUIRED_USE="
diff --git a/net-im/gajim/gajim-0.16_beta1.ebuild b/net-im/gajim/gajim-0.16_beta1.ebuild
index cea76f680ef0..918beea9e3db 100644
--- a/net-im/gajim/gajim-0.16_beta1.ebuild
+++ b/net-im/gajim/gajim-0.16_beta1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/gajim-0.16_beta1.ebuild,v 1.2 2013/11/17 11:14:14 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/gajim-0.16_beta1.ebuild,v 1.3 2014/02/19 01:12:27 jer Exp $
 
 EAPI=5
 
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS=" ~amd64 ~arm ~hppa ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~arm ~x86 ~x86-fbsd"
 IUSE="avahi crypt dbus gnome gnome-keyring kde idle jingle libnotify networkmanager nls spell +srv test X xhtml"
 
 REQUIRED_USE="
diff --git a/net-im/gajim/gajim-0.16_beta2.ebuild b/net-im/gajim/gajim-0.16_beta2.ebuild
index 24691e71d46f..7188a86198b3 100644
--- a/net-im/gajim/gajim-0.16_beta2.ebuild
+++ b/net-im/gajim/gajim-0.16_beta2.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/net-im/gajim/gajim-0.16_beta2.ebuild,v 1.2 2014/01/09 07:28:55 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/gajim-0.16_beta2.ebuild,v 1.3 2014/02/19 01:12:27 jer Exp $
 
 EAPI=5
 
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS=" ~amd64 ~arm ~hppa ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~arm ~x86 ~x86-fbsd"
 IUSE="avahi crypt dbus gnome gnome-keyring kde idle jingle libnotify networkmanager nls spell +srv test X xhtml"
 
 REQUIRED_USE="
diff --git a/net-libs/libkpeople/Manifest b/net-libs/libkpeople/Manifest
index f58c58c35217..42ca9f03af0c 100644
--- a/net-libs/libkpeople/Manifest
+++ b/net-libs/libkpeople/Manifest
@@ -1 +1,2 @@
 DIST libkpeople-0.1.0.tar.bz2 55593 SHA256 62cfd21102dfe120b82491eca8cda6100793c7f1996a94935b4b6606d123fc01 SHA512 96b36a15e81f61a3489ee31e360ed9af4f0edbbe4458fbf13abeb3e3c8ec81bf6db4ef64d297d02f43af57796b3392603a531a3f2e6b3fa73226269e1799562b WHIRLPOOL 7e4397f09bbe9c2472d34e7ee933e7d1d12e518f98ea43421b6b05586b9dc4803184a2189567a6e7b55450ef517c9814e903c8280bd1cbc66e4e427c0d85c0bc
+DIST libkpeople-0.2.0.tar.bz2 50195 SHA256 0cac973b4733c9543a111c8858fca558ec7e81c88525bed8e29509c3f3fa0f0d SHA512 408366496624b35003ba8bb81b87c4a53ad63c428f3d8a491c70caeabae3bf7abde0e1a0d1ff4dac6f285322413dc2188c3db7fb1369fe7bf66559de46714d99 WHIRLPOOL 6fb31b60a5d1ff98156e92b0564a9f0ba5ad7af4466c4aa1cfda5b601b5a3e0e7b53f8efeacfb408880977ecb876b0ac72058dd7f9d39dddbaadc46e9a47307c
diff --git a/net-libs/libkpeople/libkpeople-0.2.0.ebuild b/net-libs/libkpeople/libkpeople-0.2.0.ebuild
new file mode 100644
index 000000000000..e683435e896c
--- /dev/null
+++ b/net-libs/libkpeople/libkpeople-0.2.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libkpeople/libkpeople-0.2.0.ebuild,v 1.1 2014/02/18 13:34:17 mrueg Exp $
+
+EAPI=5
+
+VIRTUALX_REQUIRED="test"
+KDE_LINGUAS="bs cs da de el fr hu lt nl pt pt_BR sk sl sv uk"
+inherit kde4-base
+
+if [[ ${KDE_BUILD_TYPE} != live ]]; then
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="mirror://kde/unstable/${PN}/${PV}/src/${P}.tar.bz2"
+else
+	KEYWORDS=""
+fi
+
+DESCRIPTION="KDE contact person abstraction library"
+HOMEPAGE="https://projects.kde.org/projects/playground/network/libkpeople"
+
+LICENSE="LGPL-2.1"
+SLOT="4"
+IUSE="debug examples test"
+
+DEPEND="
+	dev-libs/shared-desktop-ontologies
+	dev-libs/soprano
+	$(add_kdebase_dep nepomuk-core)
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_with examples)
+	)
+
+	kde4-base_src_configure
+}
diff --git a/net-libs/libmm-qt/Manifest b/net-libs/libmm-qt/Manifest
index 6f916dce55b7..612cdcfd0c59 100644
--- a/net-libs/libmm-qt/Manifest
+++ b/net-libs/libmm-qt/Manifest
@@ -1,2 +1,2 @@
-DIST libmm-qt-0.5.1.tar.xz 36920 SHA256 2b151512f16abfc4d9c96231fdc16de520cfe6838b1e68b1d13873b5a4c9ae7a SHA512 e828b16b82d90f67afbb07fd4324deac780ada482514d345bb0441f905289694b4d3bb8376af1298f2a239f67ad8480e969932b8793d04c23f1b72ef3e9efd0a WHIRLPOOL 6c64f291379ea38a2fbb6c5a32b96ac35b88f5465ba2d785b59817937c4d8a08b423b79578fa7a3fd4a444b872a2f9c48ddd28a9b48051b359da5b264db74163
 DIST libmm-qt-1.0.0.tar.xz 69340 SHA256 ddb5ff03b2cc3a8f7c9db04842c2df46bcb0fc04b6f12296a3ae2851c4b609e2 SHA512 f2b731f3a662d1cced6741041e8e1134758c85c6024decfba0f65c3c042bacd5d0ddcca4993148590f641c198f28456a164275509d4e5bd703158f00570d6ba3 WHIRLPOOL 597f537b6ede7bd616e82848f1a4beea1d88b8f3387dad5576c17c27d60621764b323f5aa681ffdbd7ad3f097a27374987c7bb607101bd3160e88a063a90c637
+DIST libmm-qt-1.0.1.tar.xz 69448 SHA256 0ad57815a904ddb2660a7327c0bda5da47a2a60ce57b2b12f4aaff99b174f74a SHA512 608f413510935639d226f59c8e5b125931077020ee8d7fd85d653add118dd98f605c33962462ba41c4702c8a254559d60dfd0b16a76be4cd7bcbf4c57b704dbe WHIRLPOOL 3c556bf8430badc8c166513111d11d1340255ba59d4c6ee4f0926cee209ca119c800b78fb7d248a29ad9cc27efb7e979c99d0e51950ee41271975ab195cd541b
diff --git a/net-libs/libmm-qt/libmm-qt-0.5.1.ebuild b/net-libs/libmm-qt/libmm-qt-1.0.1.ebuild
similarity index 72%
rename from net-libs/libmm-qt/libmm-qt-0.5.1.ebuild
rename to net-libs/libmm-qt/libmm-qt-1.0.1.ebuild
index 7f2516cde03f..bd9f16f78c08 100644
--- a/net-libs/libmm-qt/libmm-qt-0.5.1.ebuild
+++ b/net-libs/libmm-qt/libmm-qt-1.0.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libmm-qt/libmm-qt-0.5.1.ebuild,v 1.1 2013/10/15 22:20:57 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libmm-qt/libmm-qt-1.0.1.ebuild,v 1.1 2014/02/18 13:42:56 mrueg Exp $
 
 EAPI=5
 
@@ -25,6 +25,6 @@ RDEPEND="
 	dev-qt/qtcore:4
 	dev-qt/qtdbus:4
 	net-misc/mobile-broadband-provider-info
-	>=net-misc/networkmanager-0.9.0[modemmanager]
+	>=net-misc/networkmanager-0.9.8[modemmanager]
 "
 DEPEND="${RDEPEND}"
diff --git a/net-mail/notmuch/notmuch-0.17.ebuild b/net-mail/notmuch/notmuch-0.17.ebuild
index ea5421807641..216bca9541a7 100644
--- a/net-mail/notmuch/notmuch-0.17.ebuild
+++ b/net-mail/notmuch/notmuch-0.17.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/net-mail/notmuch/notmuch-0.17.ebuild,v 1.2 2014/02/15 20:15:03 aidecoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/notmuch/notmuch-0.17.ebuild,v 1.3 2014/02/18 14:30:05 nimiux Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ SRC_URI="${HOMEPAGE%/}/releases/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 REQUIRED_USE="
 	python? ( ${PYTHON_REQUIRED_USE} )
 	test? ( crypt emacs python )
diff --git a/net-misc/rabbitmq-server/Manifest b/net-misc/rabbitmq-server/Manifest
index 483954b59873..fcb99cc3531a 100644
--- a/net-misc/rabbitmq-server/Manifest
+++ b/net-misc/rabbitmq-server/Manifest
@@ -1,4 +1,3 @@
-DIST rabbitmq-server-3.1.3.tar.gz 3531924 SHA256 ebb8b0dba8ef82e5523194072f465f2abe451783e09255bf1474c560667a67a5 SHA512 f6230dd87bae9ed8df0196ca59e6d7308a08b0c7158ba8935792fdffe245ec6c2b427f1cba83ab87d8fea67f95ce799337931964a9288613468eda8c71230bc4 WHIRLPOOL fd34c08507580bdde20d908a7e3e2612aee34f2d6fc6f1adf016180cfa28b2f0081bd35d72ac621b4d2aa460b6c8db9389908fee80fa24e9771c6cf025edf7a6
 DIST rabbitmq-server-3.1.4.tar.gz 3562602 SHA256 46184bfef01f5c5a40746f29d10f0964feffb4aa4bfc62f28dcb11483441d0f9 SHA512 6cb7bc184515d5ece7dca7f9d5230fa6898e67584b51b1440ddb1450197beb2cb0db8e9c4e04a9c89697a93a67975fb884480401376bb2d7aab81491c51251a7 WHIRLPOOL fc6ee5a17da3f9a91dd7c3d16f2da0da6d4e4995b407b10052cad0f617a4af4cc3336a8034e8d528cb40f6f5265f2623bd2bb98bdd787b55367c4283ed4ebf42
-DIST rabbitmq-server-3.2.1.tar.gz 3583903 SHA256 0e30f6a1368c819a4c1f0d9a08cae6dc3c25942a46cb0f04047bbea689e93e49 SHA512 abcff9dd2c42324e53169486b379d6d9a4e945029e65f83ea5da603399bb2a62b62c6ef087607f0c8825443811c4186813c80eebc2d76af9be62505cde474868 WHIRLPOOL 3ca33c1164d55b414e2a9af5473f8884f42377fce13bb0126499b179d051677f4c73e73c333427e79357021f96f6ec70ee2679a5a3c15edb1225e51a819bb895
 DIST rabbitmq-server-3.2.2.tar.gz 3583974 SHA256 c6f985d2bf69de60fa543ebfff190f233d2ab8faee78a10cfb065b4e4d1406ba SHA512 bced51c448e6465218ea01745059002cdc6bd5db5e3cfdbf3a98cc190b189336b31545e265b5c48b6365d3f8e7f9f4e127a9325563794cbd6f4e937ed62df841 WHIRLPOOL ffd18dc2b58a58edb6008c014ee937ede549f651f5c28072f362ff43a618331ffd3c439e2d2fecbd1acde9dd8a1a3bc98f219e7efa1d24ceb9d434a93c1ee573
+DIST rabbitmq-server-3.2.3.tar.gz 3586619 SHA256 eb2c73338f4c477ea4ba496c4c5e18793b42f3abbd23010133b0163f85faf868 SHA512 e138393cdd510cd428544a4272d6ccf4e9e4e70132c34f21923041f5f426a5639654945c8eac485dfdb89d8e69dc87cee6fa9d4cbec786e2453595ce3d04abad WHIRLPOOL fa4ff801aa391bd115bfda8023dee48ac4a33684d4e1e461296dabb9f092ced10878023edd6a11a38f5ef79d00363f76c3015de316b46f8c45c8710fbb37aed0
diff --git a/net-misc/rabbitmq-server/rabbitmq-server-3.2.1.ebuild b/net-misc/rabbitmq-server/rabbitmq-server-3.2.1.ebuild
deleted file mode 100644
index 77babb80fb57..000000000000
--- a/net-misc/rabbitmq-server/rabbitmq-server-3.2.1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/rabbitmq-server/rabbitmq-server-3.2.1.ebuild,v 1.2 2014/01/08 06:34:33 vapier Exp $
-
-EAPI="5"
-PYTHON_DEPEND="2"
-
-PYTHON_COMPAT=( python{2_6,2_7} )
-
-inherit eutils python-single-r1 systemd user
-
-DESCRIPTION="RabbitMQ is a high-performance AMQP-compliant message broker written in Erlang."
-HOMEPAGE="http://www.rabbitmq.com/"
-SRC_URI="http://www.rabbitmq.com/releases/rabbitmq-server/v${PV}/rabbitmq-server-${PV}.tar.gz"
-
-LICENSE="GPL-2 MPL-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-lang/erlang"
-DEPEND="${RDEPEND}
-	app-arch/zip
-	app-arch/unzip
-	app-text/docbook-xml-dtd:4.5
-	app-text/xmlto
-	dev-libs/libxslt
-	dev-python/simplejson
-"
-
-pkg_setup() {
-	enewgroup rabbitmq
-	enewuser rabbitmq -1 -1 /var/lib/rabbitmq rabbitmq
-	python-single-r1_pkg_setup
-}
-
-src_compile() {
-	emake all docs_all
-	gunzip docs/*.gz
-}
-
-src_install() {
-	# erlang module
-	local targetdir="/usr/$(get_libdir)/erlang/lib/rabbitmq_server-${PV}"
-
-	einfo "Setting correct RABBITMQ_HOME in scripts"
-	sed -e "s:^RABBITMQ_HOME=.*:RABBITMQ_HOME=\"${targetdir}\":g" \
-		-i scripts/rabbitmq-env
-
-	einfo "Installing Erlang modules to ${targetdir}"
-	insinto "${targetdir}"
-	doins -r ebin include plugins
-
-	einfo "Installing server scripts to /usr/sbin"
-	for script in rabbitmq-env rabbitmq-server rabbitmqctl rabbitmq-defaults rabbitmq-plugins; do
-		exeinto /usr/libexec/rabbitmq
-		doexe scripts/${script}
-		newsbin "${FILESDIR}"/rabbitmq-script-wrapper ${script}
-	done
-
-	# create the directory where our log file will go.
-	diropts -m 0770 -o rabbitmq -g rabbitmq
-	keepdir /var/log/rabbitmq /etc/rabbitmq
-
-	# create the mnesia directory
-	diropts -m 0770 -o rabbitmq -g rabbitmq
-	dodir /var/lib/rabbitmq{,/mnesia}
-
-	# install the init script
-	newinitd "${FILESDIR}"/rabbitmq-server.init-r3 rabbitmq
-	systemd_dounit "${FILESDIR}/rabbitmq.service"
-
-	# install documentation
-	doman docs/*.[15]
-	dodoc README
-}
-
-pkg_preinst() {
-	if has_version "<=net-misc/rabbitmq-server-1.8.0"; then
-		elog "IMPORTANT UPGRADE NOTICE:"
-		elog
-		elog "RabbitMQ is now running as an unprivileged user instead of root."
-		elog "Therefore you need to fix the permissions for RabbitMQs Mnesia database."
-		elog "Please run the following commands as root:"
-		elog
-		elog "  usermod -d /var/lib/rabbitmq rabbitmq"
-		elog "  chown rabbitmq:rabbitmq -R /var/lib/rabbitmq"
-		elog
-	elif has_version "<net-misc/rabbitmq-server-2.1.1"; then
-		elog "IMPORTANT UPGRADE NOTICE:"
-		elog
-		elog "Please read release notes before upgrading:"
-		elog
-		elog "http://www.rabbitmq.com/release-notes/README-3.0.0.txt"
-	fi
-}
diff --git a/net-misc/rabbitmq-server/rabbitmq-server-3.1.3.ebuild b/net-misc/rabbitmq-server/rabbitmq-server-3.2.3.ebuild
similarity index 97%
rename from net-misc/rabbitmq-server/rabbitmq-server-3.1.3.ebuild
rename to net-misc/rabbitmq-server/rabbitmq-server-3.2.3.ebuild
index da7ec4496eb1..22daefaf41d6 100644
--- a/net-misc/rabbitmq-server/rabbitmq-server-3.1.3.ebuild
+++ b/net-misc/rabbitmq-server/rabbitmq-server-3.2.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/net-misc/rabbitmq-server/rabbitmq-server-3.1.3.ebuild,v 1.3 2014/01/08 06:34:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rabbitmq-server/rabbitmq-server-3.2.3.ebuild,v 1.1 2014/02/18 15:32:18 ultrabug Exp $
 
 EAPI="5"
 PYTHON_DEPEND="2"
diff --git a/net-misc/stuntman/files/stuntman.confd b/net-misc/stuntman/files/stuntman.confd
new file mode 100644
index 000000000000..a49d512843e8
--- /dev/null
+++ b/net-misc/stuntman/files/stuntman.confd
@@ -0,0 +1,7 @@
+# Stuntman's stunserver normally starts in simple mode.
+# It's recommended to run stunserver in full mode, there are
+# basically two options, bind it to two separate interfaces,
+# or more conveniently, to IP addresses.  There are numerous
+# other options for stunserver, just run stunserver --help
+# for more information.
+#STUNTMAN_PARAMS="--mode full --primaryinterface 1.2.3.4 --altinterface 1.2.3.5"
diff --git a/net-misc/stuntman/files/stuntman.initd b/net-misc/stuntman/files/stuntman.initd
new file mode 100644
index 000000000000..b9a704ddc3a8
--- /dev/null
+++ b/net-misc/stuntman/files/stuntman.initd
@@ -0,0 +1,13 @@
+#!/sbin/runscript
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/stuntman/files/stuntman.initd,v 1.1 2014/02/18 19:11:58 polynomial-c Exp $
+
+pidfile="/run/stunserver.pid"
+command="/usr/sbin/stunserver"
+command_args="${STUNTMAN_PARAMS}"
+command_background="true"
+
+depend() {
+	need net
+}
diff --git a/net-misc/stuntman/stuntman-1.2.6-r1.ebuild b/net-misc/stuntman/stuntman-1.2.6-r1.ebuild
new file mode 100644
index 000000000000..7d58217e3e7e
--- /dev/null
+++ b/net-misc/stuntman/stuntman-1.2.6-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/stuntman/stuntman-1.2.6-r1.ebuild,v 1.1 2014/02/18 19:11:58 polynomial-c Exp $
+
+EAPI=5
+
+DESCRIPTION="STUNTMAN is an open source implementation of the STUN protocol."
+HOMEPAGE="http://www.stunprotocol.org"
+SRC_URI="http://www.stunprotocol.org/stunserver-${PV}.tgz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-libs/boost
+	dev-libs/openssl"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/stunserver"
+
+src_compile() {
+	emake T=""
+}
+
+src_install() {
+	dobin stunclient
+	dosbin stunserver
+	dodoc HISTORY README
+	newinitd "${FILESDIR}/${PN}.initd" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+}
+
+src_test() {
+	./stuntestcode
+}
diff --git a/net-proxy/squid/Manifest b/net-proxy/squid/Manifest
index f13fd1843883..033e24b75475 100644
--- a/net-proxy/squid/Manifest
+++ b/net-proxy/squid/Manifest
@@ -5,3 +5,4 @@ DIST squid-3.3.11.tar.xz 2186712 SHA256 3b7849cc1336642c671e4eae457ed72253377634
 DIST squid-3.3.8.tar.gz 4201652 SHA256 70d12505f2d91a64c05792406e12f2e6bd3082976bb7b6b49c4d982479d8c7d0 SHA512 6a4c95cffc23af44c985d0e897f3f1c66dbe3c282836e7e3724065b132dc59c6c512fd3914893be6a934f2b1fb72ba9a12bc3a1f953624760153616d5818f55f WHIRLPOOL 61c6b5e52138104634dd2ea602f251f10f7925c0ccba1823037d7a064141372d7a064f73d77747e1789b8e875819ca5939384d6a1c266889d07b7e0ee47170df
 DIST squid-3.3.9.tar.gz 4226863 SHA256 0bbb10739bcd8d3ede982246990445ff9b84348b9c5a38021c5afbfd28d9b413 SHA512 26c91d20804bf35fe36f4efdb790ef7b589383e75e6e4656d5fee6b05dc1a48b7491b4ce4d3bc8acf7f4caab8c395a43eaa84f88cd41a1d2efad529504f2ddd4 WHIRLPOOL 2f4eeee0c8376fe0bb422deda81a33470b84e871385d34129b9801fb4a5111687694c7947a4b36cdbb0dd831d69f9be966cc36bc7d60a1f52b2025c3ccd8bbeb
 DIST squid-3.4.2.tar.xz 2224616 SHA256 4c381334ab4d3ae25bf517fae91bbd739151bae1c727c935d464b546ff461d41 SHA512 c31a4cfda9a3a8f3bacb49a9b3cc15f00993099ca78aad3a37f56a1e0b2777d40af6b9848ffde98cf764a9dc7172b9b2f6291ca8717085879f1d4aebb5223d00 WHIRLPOOL c754e0fd2b2ebf14d6ae9b481008be38a14ab75a27a50d130afff1dcefb0192f94d412ca2c3b12122c569fc64d07fb5c7c5ba7a601082f3cdc027962eb8509eb
+DIST squid-3.4.3.tar.xz 2225044 SHA256 c3ef45e7f1ae1bac0ec3ab2f4ed9af9b1f33f9a30304be0f2ad5d352a3eaf114 SHA512 478113511a56f0347e1f71afd680c7147686e606980c9062b6b1b7131faaae43f2206de2658f30d8c3f0219b72744563e72ad9b2c1039fc64190d047bd832b4e WHIRLPOOL 0eb3ebcd68674ebf76f6363c064553a2c83f6aabb52d46daee2ca5e91f003255d0791eefc30e0695a3d355d4f2f1641363cc169e78970314edf9044f483f20d2
diff --git a/net-proxy/squid/metadata.xml b/net-proxy/squid/metadata.xml
index dfcc2af1f751..4f40ef311023 100644
--- a/net-proxy/squid/metadata.xml
+++ b/net-proxy/squid/metadata.xml
@@ -11,6 +11,7 @@
     <flag name="epoll">Enables Linux epoll() support</flag>
     <flag name="ecap">Adds support for loadable content adaptation modules
 		(http://www.e-cap.org)</flag>
+	<flag name="htcp">Enable HTCP protocol</flag>
     <flag name="icap-client">Adds ICAP client support</flag>
     <flag name="ipf-transparent">Adds transparent proxy support for systems
 		using IP-Filter (only for *bsd)</flag>
@@ -25,6 +26,8 @@
 		SslBump environments</flag>
     <flag name="tproxy">Enables real Transparent Proxy support for Linux Netfilter
 		TPROXY</flag>
+	<flag name="wccp">Enable Web Cache Coordination Protocol</flag>
+	<flag name="wccp2">Enable Web Cache Coordination V2 Protocol</flag>
     <flag name="zero-penalty-hit">Add Zero Penalty Hit patch
 		(http://zph.bratcheda.org)</flag>
   </use>
diff --git a/net-proxy/squid/squid-3.4.3.ebuild b/net-proxy/squid/squid-3.4.3.ebuild
new file mode 100644
index 000000000000..4082826aab03
--- /dev/null
+++ b/net-proxy/squid/squid-3.4.3.ebuild
@@ -0,0 +1,247 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.4.3.ebuild,v 1.1 2014/02/18 15:01:58 eras Exp $
+
+EAPI=5
+
+inherit autotools eutils linux-info pam toolchain-funcs user versionator
+
+DESCRIPTION="A full-featured web proxy cache"
+HOMEPAGE="http://www.squid-cache.org/"
+SRC_URI="ftp://ftp.squid-cache.org/pub/archive/3.4/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="caps ipv6 pam ldap samba sasl kerberos nis radius ssl snmp selinux logrotate test \
+	ecap icap-client ssl-crtd \
+	mysql postgres sqlite \
+	qos tproxy \
+	+htcp +wccp +wccp2 \
+	pf-transparent ipf-transparent kqueue \
+	elibc_uclibc kernel_linux"
+
+COMMON_DEPEND="caps? ( >=sys-libs/libcap-2.16 )
+	pam? ( virtual/pam )
+	ldap? ( net-nds/openldap )
+	kerberos? ( virtual/krb5 )
+	qos? ( net-libs/libnetfilter_conntrack )
+	ssl? ( dev-libs/openssl )
+	sasl? ( dev-libs/cyrus-sasl )
+	ecap? ( net-libs/libecap:0.2 )
+	selinux? ( sec-policy/selinux-squid )
+	!x86-fbsd? ( logrotate? ( app-admin/logrotate ) )
+	>=sys-libs/db-4
+	sys-devel/libtool
+	dev-lang/perl
+	sys-devel/libtool"
+DEPEND="${COMMON_DEPEND}
+	sys-apps/ed
+	test? ( dev-util/cppunit )"
+RDEPEND="${COMMON_DEPEND}
+	samba? ( net-fs/samba )
+	mysql? ( dev-perl/DBD-mysql )
+	postgres? ( dev-perl/DBD-Pg )
+	sqlite? ( dev-perl/DBD-SQLite )
+	!<=sci-biology/meme-4.8.1-r1"
+
+REQUIRED_USE="tproxy? ( caps )
+			qos? ( caps )"
+
+pkg_pretend() {
+	if use tproxy; then
+		local CONFIG_CHECK="~NF_CONNTRACK ~NETFILTER_TPROXY ~NETFILTER_XT_MATCH_SOCKET ~NETFILTER_XT_TARGET_TPROXY"
+		linux-info_pkg_setup
+	fi
+}
+
+pkg_setup() {
+	enewgroup squid 31
+	enewuser squid 31 -1 /var/cache/squid squid
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-3.3.4-gentoo.patch"
+	#sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' \
+	#	lib/libTrie/configure.ac || die
+	sed -i -e 's:/usr/local/squid/etc:/etc/squid:' \
+		INSTALL QUICKSTART \
+		helpers/basic_auth/MSNT/README.html \
+		helpers/basic_auth/MSNT/confload.cc \
+		helpers/basic_auth/MSNT/msntauth.conf.default \
+		scripts/fileno-to-pathname.pl \
+		scripts/check_cache.pl \
+		tools/cachemgr.cgi.8 \
+		tools/purge/conffile.hh \
+		tools/purge/README  || die
+	sed -i -e 's:/usr/local/squid/sbin:/usr/sbin:' \
+		INSTALL QUICKSTART || die
+	sed -i -e 's:/usr/local/squid/var/cache:/var/cache/squid:' \
+		QUICKSTART || die
+	sed -i -e 's:/usr/local/squid/var/logs:/var/log/squid:' \
+		QUICKSTART \
+		src/log/access_log.cc || die
+	sed -i -e 's:/usr/local/squid/logs:/var/log/squid:' \
+		src/log/access_log.cc || die
+	sed -i -e 's:/usr/local/squid/bin:/usr/bin:' \
+		helpers/basic_auth/MSNT/README.html || die
+	sed -i -e 's:/usr/local/squid/libexec:/usr/libexec/squid:' \
+		helpers/external_acl/unix_group/ext_unix_group_acl.8 \
+		helpers/external_acl/session/ext_session_acl.8 \
+		src/ssl/ssl_crtd.8 || die
+	sed -i -e 's:/usr/local/squid/cache:/var/cache/squid:' \
+		scripts/check_cache.pl || die
+	sed -i -e 's:/usr/local/squid/ssl_cert:/etc/ssl/squid:' \
+		src/ssl/ssl_crtd.8 || die
+	sed -i -e 's:/usr/local/squid/var/lib/ssl_db:/var/lib/squid/ssl_db:' \
+		src/ssl/ssl_crtd.8 || die
+	sed -i -e 's:/var/lib/ssl_db:/var/lib/squid/ssl_db:' \
+		src/ssl/ssl_crtd.8 || die
+	# /var/run/squid to /run/squid
+	sed -i -e 's:$(localstatedir)::' \
+		src/ipc/Makefile.am
+
+	# Bug #419685 - eautoreconf in src_prepare() fails in libltdl/
+	#               aclocal-1.11: `configure.ac' or `configure.in' is required
+	MAKEOPTS="${MAKEOPTS} -j1" eautoreconf
+}
+
+src_configure() {
+	local basic_modules="MSNT,MSNT-multi-domain,NCSA,POP3,getpwnam"
+	use samba && basic_modules+=",SMB"
+	use ldap && basic_modules+=",LDAP"
+	use pam && basic_modules+=",PAM"
+	use sasl && basic_modules+=",SASL"
+	use nis && ! use elibc_uclibc && basic_modules+=",NIS"
+	use radius && basic_modules+=",RADIUS"
+	if use mysql || use postgres || use sqlite ; then
+		basic_modules+=",DB"
+	fi
+
+	local digest_modules="file"
+	use ldap && digest_modules+=",LDAP,eDirectory"
+
+	local negotiate_modules="none"
+	use kerberos && negotiate_modules="kerberos,wrapper"
+
+	local ntlm_modules="none"
+	use samba && ntlm_modules="smb_lm"
+
+	local ext_helpers="file_userip,session,unix_group"
+	use samba && ext_helpers+=",wbinfo_group"
+	use ldap && ext_helpers+=",LDAP_group,eDirectory_userip"
+	use ldap && use kerberos && ext_helpers+=",kerberos_ldap_group"
+
+	# uclibc does not have aio support - needed for coss (#61175)
+	local storeio_modules="aufs,diskd,rock,ufs"
+	# not stable enough yet
+	#! use elibc_uclibc && storeio_modules+=",coss"
+
+	local transparent
+	if use kernel_linux ; then
+		transparent+=" --enable-linux-netfilter"
+		use qos && transparent+=" --enable-zph-qos --with-netfilter-conntrack"
+	fi
+
+	if use kernel_FreeBSD || use kernel_OpenBSD || use kernel_NetBSD ; then
+		transparent+=" $(use_enable kqueue)"
+		if use pf-transparent; then
+			transparent+=" --enable-pf-transparent"
+		elif use ipf-transparent; then
+			transparent+=" --enable-ipf-transparent"
+		fi
+	fi
+
+	tc-export CC AR
+
+	econf \
+		--sysconfdir=/etc/squid \
+		--libexecdir=/usr/libexec/squid \
+		--localstatedir=/var \
+		--with-pidfile=/run/squid.pid \
+		--datadir=/usr/share/squid \
+		--with-logdir=/var/log/squid \
+		--with-default-user=squid \
+		--enable-removal-policies="lru,heap" \
+		--enable-storeio="${storeio_modules}" \
+		--enable-disk-io \
+		--enable-auth \
+		--enable-auth-basic="${basic_modules}" \
+		--enable-auth-digest="${digest_modules}" \
+		--enable-auth-ntlm="${ntlm_modules}" \
+		--enable-auth-negotiate="${negotiate_modules}" \
+		--enable-external-acl-helpers="${ext_helpers}" \
+		--enable-log-daemon-helpers \
+		--enable-url-rewrite-helpers \
+		--enable-cache-digests \
+		--enable-delay-pools \
+		--enable-eui \
+		--enable-icmp \
+		--enable-follow-x-forwarded-for \
+		--enable-esi \
+		--with-large-files \
+		--disable-strict-error-checking \
+		$(use_with caps libcap) \
+		$(use_enable ipv6) \
+		$(use_enable snmp) \
+		$(use_enable ssl) \
+		$(use_enable ssl-crtd) \
+		$(use_enable icap-client) \
+		$(use_enable ecap) \
+		$(use_enable htcp) \
+		$(use_enable wccp) \
+		$(use_enable wccp2) \
+		${transparent}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	# need suid root for looking into /etc/shadow
+	fowners root:squid /usr/libexec/squid/basic_ncsa_auth
+	fperms 4750 /usr/libexec/squid/basic_ncsa_auth
+	if use pam; then
+		fowners root:squid /usr/libexec/squid/basic_pam_auth
+		fperms 4750 /usr/libexec/squid/basic_pam_auth
+	fi
+	# pinger needs suid as well
+	fowners root:squid /usr/libexec/squid/pinger
+	fperms 4750 /usr/libexec/squid/pinger
+
+	# some cleanups
+	rm -f "${D}"/usr/bin/Run*
+	rm -rf "${D}"/run/squid "${D}"/var/cache/squid
+
+	dodoc CONTRIBUTORS CREDITS ChangeLog INSTALL QUICKSTART README SPONSORS doc/*.txt
+	newdoc helpers/negotiate_auth/kerberos/README README.kerberos
+	newdoc helpers/basic_auth/MSNT-multi-domain/README.txt README.MSNT-multi-domain
+	newdoc helpers/basic_auth/LDAP/README README.LDAP
+	newdoc helpers/basic_auth/RADIUS/README README.RADIUS
+	newdoc helpers/external_acl/kerberos_ldap_group/README README.kerberos_ldap_group
+	newdoc tools/purge/README README.purge
+	newdoc tools/helper-mux.README README.helper-mux
+	dohtml RELEASENOTES.html
+
+	newpamd "${FILESDIR}/squid.pam" squid
+	newconfd "${FILESDIR}/squid.confd-r1" squid
+	newinitd "${FILESDIR}/squid.initd-r4" squid
+	if use logrotate; then
+		insinto /etc/logrotate.d
+		newins "${FILESDIR}/squid.logrotate" squid
+	else
+		exeinto /etc/cron.weekly
+		newexe "${FILESDIR}/squid.cron" squid.cron
+	fi
+
+	diropts -m0750 -o squid -g squid
+	keepdir /var/log/squid /etc/ssl/squid /var/lib/squid
+}
+
+pkg_postinst() {
+	if [[ $(get_version_component_range 1 ${REPLACING_VERSIONS}) -lt 3 ]] || \
+		[[ $(get_version_component_range 2 ${REPLACING_VERSIONS}) -lt 4 ]]; then
+		elog "Please read the release notes at:"
+		elog "  http://www.squid-cache.org/Versions/v3/3.4/RELEASENOTES.html"
+		echo
+	fi
+}
diff --git a/net-wireless/blueman/Manifest b/net-wireless/blueman/Manifest
index 3a4be4a9ca78..d10f5114617b 100644
--- a/net-wireless/blueman/Manifest
+++ b/net-wireless/blueman/Manifest
@@ -1,2 +1,2 @@
 DIST blueman-1.21.tar.gz 1086099 SHA256 86200dab50b1595c9a9537586c07de90ccfa084b954bb74f3e8732cc000fe3af
-DIST blueman-1.23.tar.gz 1223094 SHA256 50b261bcdc2e99e176c7c194825da1259500aaacaccb92714d97af0209a4f011
+DIST blueman-1.23.tar.gz 1223094 SHA256 50b261bcdc2e99e176c7c194825da1259500aaacaccb92714d97af0209a4f011 SHA512 529a43dace73bf362baac69404a9e87d14f5bcb7b07b18194434c7a6c1dbc22f8fecdb4923c92a77b65656405a492b9e147e77cb7a161df4a93e8b78a003eba7 WHIRLPOOL 4070b4d86cbe743278730e4ee3022bcfdea590b5b76e545cc67912a3498de993ed0c62cb67ac2cd3ad3b8e3c17c5d5a8b1f8fa6e214234a64a784146c6d6d542
diff --git a/net-wireless/blueman/blueman-1.21-r1.ebuild b/net-wireless/blueman/blueman-1.21-r1.ebuild
index f00e284b1950..79f589e652ed 100644
--- a/net-wireless/blueman/blueman-1.21-r1.ebuild
+++ b/net-wireless/blueman/blueman-1.21-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/net-wireless/blueman/blueman-1.21-r1.ebuild,v 1.8 2012/05/04 06:41:54 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/blueman/blueman-1.21-r1.ebuild,v 1.9 2014/02/18 18:35:16 mgorny Exp $
 
 EAPI="3"
 
@@ -21,6 +21,7 @@ CDEPEND="dev-libs/glib:2
 	>=x11-libs/gtk+-2.12:2
 	x11-libs/startup-notification
 	dev-python/pygobject:2
+	<net-wireless/bluez-5
 	>=net-wireless/bluez-4.21"
 DEPEND="${CDEPEND}
 	nls? ( dev-util/intltool sys-devel/gettext )
diff --git a/net-wireless/blueman/blueman-1.23-r1.ebuild b/net-wireless/blueman/blueman-1.23-r1.ebuild
index 80843743470d..b66c45949e56 100644
--- a/net-wireless/blueman/blueman-1.23-r1.ebuild
+++ b/net-wireless/blueman/blueman-1.23-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/net-wireless/blueman/blueman-1.23-r1.ebuild,v 1.2 2012/06/20 06:12:44 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/blueman/blueman-1.23-r1.ebuild,v 1.3 2014/02/18 18:35:16 mgorny Exp $
 
 EAPI="4"
 
@@ -21,6 +21,7 @@ CDEPEND="dev-libs/glib:2
 	>=x11-libs/gtk+-2.12:2
 	x11-libs/startup-notification
 	dev-python/pygobject:2
+	<net-wireless/bluez-5
 	>=net-wireless/bluez-4.21"
 DEPEND="${CDEPEND}
 	nls? ( dev-util/intltool sys-devel/gettext )
diff --git a/net-wireless/blueman/blueman-1.23-r2.ebuild b/net-wireless/blueman/blueman-1.23-r2.ebuild
index 1064e585cabd..878534826347 100644
--- a/net-wireless/blueman/blueman-1.23-r2.ebuild
+++ b/net-wireless/blueman/blueman-1.23-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/net-wireless/blueman/blueman-1.23-r2.ebuild,v 1.1 2012/06/20 06:12:44 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/blueman/blueman-1.23-r2.ebuild,v 1.2 2014/02/18 18:35:17 mgorny Exp $
 
 EAPI="4"
 
@@ -21,6 +21,7 @@ CDEPEND="dev-libs/glib:2
 	>=x11-libs/gtk+-2.12:2
 	x11-libs/startup-notification
 	dev-python/pygobject:2
+	<net-wireless/bluez-5
 	>=net-wireless/bluez-4.21"
 DEPEND="${CDEPEND}
 	nls? ( dev-util/intltool sys-devel/gettext )
diff --git a/net-wireless/blueman/blueman-1.23.ebuild b/net-wireless/blueman/blueman-1.23.ebuild
index 64d9bc656787..ebb5121551d6 100644
--- a/net-wireless/blueman/blueman-1.23.ebuild
+++ b/net-wireless/blueman/blueman-1.23.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/net-wireless/blueman/blueman-1.23.ebuild,v 1.1 2012/06/13 08:31:27 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/blueman/blueman-1.23.ebuild,v 1.2 2014/02/18 18:35:16 mgorny Exp $
 
 EAPI="4"
 
@@ -21,6 +21,7 @@ CDEPEND="dev-libs/glib:2
 	>=x11-libs/gtk+-2.12:2
 	x11-libs/startup-notification
 	dev-python/pygobject:2
+	<net-wireless/bluez-5
 	>=net-wireless/bluez-4.21"
 DEPEND="${CDEPEND}
 	nls? ( dev-util/intltool sys-devel/gettext )
diff --git a/net-zope/zope-interface/Manifest b/net-zope/zope-interface/Manifest
index 8dea915e642e..f60ce9c9653d 100644
--- a/net-zope/zope-interface/Manifest
+++ b/net-zope/zope-interface/Manifest
@@ -1,2 +1,3 @@
 DIST zope.interface-3.8.0.tar.gz 111537 SHA256 1d5411ff82fd3a73bad6efb38deddb3f98d61d590344deb0cdd308e8aa94d3ff SHA512 7874d46cf23c4525e4bab3c91408966cc2f813ec91ff65c9428ca0e355f5334206e87eee1e7d37705ca3f2294dd162aa4ab239222ab45fee575c2dee6bd0e776 WHIRLPOOL 3ec7ff66eb7e96e6070e223b435fe5efeb0e0b7024482e5b3217b35466f4aa9a0176ba905287b80c63838ace7bcfa51632aa81a6fe3c6972c292ad6c5dea672f
 DIST zope.interface-4.0.5.zip 173379 SHA256 1a7c84716bbd9981915b64a81d8a3f076a5934a8c8df4224655469b3564940cc SHA512 1b5e3ff4796c97704e528601bbabc47ea9bc1e55e6f607c7951e50a26d2118617f2f9974d7314e6bcdac701a2d3f4c541cd563e83abbff720d2c62182686ea4d WHIRLPOOL 488e5bab20712cd31876e3e70420371478e744aca260039ed39ca854716755d45d47006a73743ea72a372b30c4020e6ea9a9089efae7213acd39486bfb6c454d
+DIST zope.interface-4.1.0.tar.gz 854873 SHA256 7a03f08e26a9f88ceadcd51df684ca55864387d3c4fb8654eb3c1d83657840b8 SHA512 1bfa7f006b8cecf5baf1a0ee023c63aa14702c292092361016e78d6f80604135089586dbe4862bec95f7e2506c45eea92f83b3a59f16c90ea3831bcebeaaad87 WHIRLPOOL a2019cdd3e3558c7a4c77774dae11be5b714bf6ec523428d5e1531d4c52bd5eaf3877d8e8baa50872dc6ca53d132ddf24a73ab3022551d4b19233430b9f2b193
diff --git a/net-zope/zope-interface/zope-interface-4.0.5.ebuild b/net-zope/zope-interface/zope-interface-4.0.5.ebuild
index b23dbfd78a14..7f9599dfa768 100644
--- a/net-zope/zope-interface/zope-interface-4.0.5.ebuild
+++ b/net-zope/zope-interface/zope-interface-4.0.5.ebuild
@@ -1,10 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/zope-interface/zope-interface-4.0.5.ebuild,v 1.5 2013/11/01 00:29:15 yac Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zope-interface/zope-interface-4.0.5.ebuild,v 1.6 2014/02/19 09:30:50 radhermit Exp $
 
 EAPI=5
-
-# Tests fail with py3.1
 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1 flag-o-matic
@@ -29,6 +27,9 @@ RDEPEND=""
 
 S="${WORKDIR}/${MY_P}"
 
+# until all deps are in the tree (bug #442794)
+RESTRICT="test"
+
 python_compile() {
 	if [[ ${EPYTHON} != python3* ]]; then
 		local CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}"
diff --git a/net-zope/zope-interface/zope-interface-4.1.0.ebuild b/net-zope/zope-interface/zope-interface-4.1.0.ebuild
new file mode 100644
index 000000000000..9cbbc13133a9
--- /dev/null
+++ b/net-zope/zope-interface/zope-interface-4.1.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zope-interface/zope-interface-4.1.0.ebuild,v 1.2 2014/02/19 09:30:50 radhermit Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
+
+inherit distutils-r1 flag-o-matic
+
+MY_PN=${PN/-/.}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Interfaces for Python"
+HOMEPAGE="http://pypi.python.org/pypi/zope.interface"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="ZPL"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+# net-zope/zope-fixers is required for building with Python 3.
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	net-zope/zope-fixers[$(python_gen_usedep 'python3*')]"
+RDEPEND=""
+
+S=${WORKDIR}/${MY_P}
+
+# until all deps are in the tree (bug #442794)
+RESTRICT="test"
+
+python_compile() {
+	if [[ ${EPYTHON} != python3* ]]; then
+		local CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}"
+		append-flags -fno-strict-aliasing
+	fi
+
+	distutils-r1_python_compile
+}
+
+python_test() {
+	esetup.py test
+}
diff --git a/profiles/arch/hppa/package.use.mask b/profiles/arch/hppa/package.use.mask
index b8755677e6f3..566943c56b74 100644
--- a/profiles/arch/hppa/package.use.mask
+++ b/profiles/arch/hppa/package.use.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/hppa/package.use.mask,v 1.135 2014/01/31 15:37:16 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/hppa/package.use.mask,v 1.136 2014/02/18 11:31:12 jer Exp $
 
 # DON'T TOUCH THIS FILE. Instead, file a bug and assign it to <hppa@gentoo.org>.
 
@@ -62,7 +62,9 @@ dev-libs/libpcre jit
 # Arun Raghavan <ford_prefect@gentoo.org> (24 May 2012)
 # media-sound/pulseaudio needs PyQt4[dbus] for making the equalizer module
 # usable. Mask until this is available.
-media-sound/pulseaudio equalizer
+# Jeroen Roovers <jer@gentoo.org> (18 Feb 2014)
+# OSS is the only kernel audio interface that works on HPPA
+media-sound/pulseaudio equalizer -oss
 
 # Jeroen Roovers <jer@gentoo.org> (21 May 2012)
 # media-sound/lilypond has problems running mpost (bug #416961)
diff --git a/profiles/license_groups b/profiles/license_groups
index 26ead615c79a..6989576eacc9 100644
--- a/profiles/license_groups
+++ b/profiles/license_groups
@@ -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/license_groups,v 1.231 2014/02/15 21:42:08 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/license_groups,v 1.232 2014/02/18 19:27:53 ulm Exp $
 
 # Please report bugs or other requests at bugs.gentoo.org and assign to
 # licenses@gentoo.org
@@ -30,7 +30,7 @@ OSI-APPROVED AFL-3.0 AGPL-3 Apache-1.1 Apache-2.0 APL-1.0 APSL-2 Artistic Artist
 # TODO: maybe add a category for BSD-alike MISC-FREE licenses for easy
 # separation?
 # BSD-4 alikes: dom4j FastCGI icu JDOM
-MISC-FREE ACE Allegro alternate bea.ri.jsr173 BEER-WARE boehm-gc BSD-1 BSD-with-attribution buddy bufexplorer.vim BZIP2 canfep CDDL-Schily CeCILL-C CFS CMake CPL-0.5 CRACKLIB Crypt-IDEA cryptopp czyborra DES docbook dom4j eGenixPublic-1.1 ElementTree Emacs ErlPL-1.1 FastCGI feh Flashpix FLEX flexmock FLTK freemarker FVWM GBuffy gd gnuplot gsm HTML-Tidy htmlc iASL IBPP-1.1 icu IDPL IJG imagemagick Info-ZIP inner-net ipadic ipx-utils Ispell JasPer2.0 JDOM JNIC JOVE keynote LambdaMOO LIBGLOSS libmng libodialog libpng libtiff LLGPL-2.1 LPPL-1.3 LPPL-1.3b lsof Mail-Sendmail mapm-4.9.5 matplotlib Mini-XML minpack MIT-with-advertising mm mpich2 nap NCSA-HDF netcat NEWLIB ngrep noweb Old-MIT openafs-krb5-a Openwall otter PCRE perforce photopc PHP-2.02 PIZZA-WARE pngcrush pngnq Princeton psutils qmail-nelson rc regexp-UofT RSA rwpng scanlogd Sendmail shrimp skype-4.0.0.7-third-party_attributions.txt SMAIL Snd SNIA SSLeay Subversion SVFL tablelist tcltk tcp_wrappers_license TermReadKey TeX TeX-other-free Time-modules tm-align totd URT w3m wxWinLL-3 x2x xbatt xboing XC Xdebug xtrs xvt YaTeX zpaq ZSH
+MISC-FREE ACE Allegro alternate bea.ri.jsr173 BEER-WARE boehm-gc BSD-1 BSD-with-attribution buddy bufexplorer.vim BZIP2 canfep CDDL-Schily CeCILL-C CFS CMake CPL-0.5 CRACKLIB Crypt-IDEA cryptopp czyborra DES docbook dom4j eGenixPublic-1.1 ElementTree Emacs ErlPL-1.1 FastCGI feh Flashpix FLEX flexmock FLTK freemarker FVWM GBuffy gd gnuplot gsm HTML-Tidy htmlc iASL IBPP-1.1 icu IDPL IJG imagemagick Info-ZIP inner-net ipadic ipx-utils Ispell JasPer2.0 JDOM JNIC JOVE keynote LambdaMOO LIBGLOSS libmng libodialog libpng libtiff LLGPL-2.1 LPPL-1.3 LPPL-1.3b lsof Mail-Sendmail mapm-4.9.5 matplotlib Mini-XML minpack MIT-with-advertising mm mpich2 nap NCSA-HDF netcat NEWLIB ngrep noweb Old-MIT openafs-krb5-a Openwall otter PCRE perforce photopc PHP-2.02 PIZZA-WARE pngcrush pngnq Princeton psutils qmail-nelson rc regexp-UofT RSA rwpng scanlogd Sendmail Sendmail-Open-Source shrimp skype-4.0.0.7-third-party_attributions.txt SMAIL Snd SNIA SSLeay Subversion SVFL tablelist tcltk tcp_wrappers_license TermReadKey TeX TeX-other-free Time-modules tm-align totd URT w3m wxWinLL-3 x2x xbatt xboing XC Xdebug xtrs xvt YaTeX zpaq ZSH
 # The following are NOT valid in @MISC-FREE:
 # arj - usage restrictions
 # freedist - Doesn't grant the right to do modifications.
diff --git a/profiles/package.mask b/profiles/package.mask
index 75b4b53b89de..1a3dbc368a52 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
 ####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.15409 2014/02/18 08:15:09 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.15410 2014/02/18 20:17:13 ulm Exp $
 #
 # When you add an entry to the top of this file, add your name, the date, and
 # an explanation of why something is getting masked. Please be extremely
@@ -36,14 +36,6 @@
 # Masked for removal in 30 days, bug 501660.
 app-emacs/view-process
 
-# Ulrich Müller <ulm@gentoo.org> (17 Feb 2014)
-# Masked for testing, bug 177936.
-=app-admin/eselect-ctags-1.15
-=app-admin/eselect-emacs-1.15
-=app-editors/xemacs-21.4.22-r3
-=app-editors/xemacs-21.5.34-r2
-=app-emacs/gnuserv-3.12.8-r2
-
 # Mike Gilbert <floppym@gentoo.org> (17 Feb 2014)
 # Masked for testing.
 dev-lang/python:3.4
@@ -56,11 +48,6 @@ dev-lang/python:3.4
 =net-mail/dovecot-2.1*
 mail-filter/dovecot_deleted_to_trash
 
-# Ulrich Müller <ulm@gentoo.org> (17 Feb 2014)
-# Masked, until issue with XEmacs blocker is resolved.
-# Bug 177936.
-=app-emacs/gnuserv-3.12.8-r1
-
 # Ulrich Müller <ulm@gentoo.org> (16 Feb 2014)
 # Last upstream release in 2005.
 # Does not work with Emacs 24.
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 4b92964e4d83..9ffdcab772bb 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -1929,6 +1929,7 @@ dev-python/ipython:notebook - Install requirements for the web notebook based on
 dev-python/ipython:octave - Enable octave bridge via dev-python/oct2py
 dev-python/jinja:i18n - Enables support for i18n with dev-python/Babel
 dev-python/kaa-base:tls - SSL/TLS support via dev-python/tlslite
+dev-python/kazoo:gevent - Enable support for the gevent based handler
 dev-python/kombu:amqplib - Enable amqplib support
 dev-python/ldaptor:web - enable the web front end for ldaptor (uses dev-python/nevow)
 dev-python/lxml:beautifulsoup3 - Enable support for Beautiful Soup 3
@@ -5586,6 +5587,7 @@ net-proxy/obfsproxy:daemon - Run obfsproxy as a standalone daemon
 net-proxy/rejik:banlists - Install upstream provided simple banlists
 net-proxy/squid:ecap - Adds support for loadable content adaptation modules (http://www.e-cap.org)
 net-proxy/squid:epoll - Enables Linux epoll() support
+net-proxy/squid:htcp - Enable HTCP protocol
 net-proxy/squid:icap-client - Adds ICAP client support
 net-proxy/squid:ipf-transparent - Adds transparent proxy support for systems using IP-Filter (only for *bsd)
 net-proxy/squid:kqueue - Enables *BSD kqueue() support
@@ -5594,6 +5596,8 @@ net-proxy/squid:pf-transparent - Adds transparent proxy support for systems usin
 net-proxy/squid:qos - Adds support for Quality of Service using netfilter conntrack - see qos_flow directive for more info
 net-proxy/squid:ssl-crtd - Adds support for dynamic SSL certificate generation in SslBump environments
 net-proxy/squid:tproxy - Enables real Transparent Proxy support for Linux Netfilter TPROXY
+net-proxy/squid:wccp - Enable Web Cache Coordination Protocol
+net-proxy/squid:wccp2 - Enable Web Cache Coordination V2 Protocol
 net-proxy/squid:zero-penalty-hit - Add Zero Penalty Hit patch (http://zph.bratcheda.org)
 net-proxy/sshproxy:client-only - Install only the client wrappers
 net-proxy/tinyproxy:filter-proxy - Enable filtering of domains/URLS
@@ -6020,6 +6024,7 @@ sci-mathematics/msieve:ecm - Enable support for the GMP-ECM library
 sci-mathematics/normaliz:extras - Install sci-mathematics/Macaulay2 and sci-mathematics/singular packages as shipped by upstream
 sci-mathematics/nusmv:minisat - Enable support for MiniSat
 sci-mathematics/octave:glpk - Add support for sci-libs/glpk for linear programming
+sci-mathematics/octave:jit - (EXPERIMENTAL) enable JIT compiler
 sci-mathematics/octave:qhull - Add support for sci-libs/qhull, to allow `delaunay', `convhull', and related functions
 sci-mathematics/octave:qrupdate - Add support for sci-libs/qrupdatefor QR and Cholesky update functions
 sci-mathematics/octave:sparse - Add enhanced support for sparse matrix algebra with SuiteSparse
diff --git a/sci-geosciences/qlandkartegt/files/qlandkartegt-1.7.6-openstreetmaps.patch b/sci-geosciences/qlandkartegt/files/qlandkartegt-1.7.6-openstreetmaps.patch
deleted file mode 100644
index 17309ec3b005..000000000000
--- a/sci-geosciences/qlandkartegt/files/qlandkartegt-1.7.6-openstreetmaps.patch
+++ /dev/null
@@ -1,23 +0,0 @@
- src/CMapTms.cpp | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/CMapTms.cpp b/src/CMapTms.cpp
-index 71ee5ff..035fcae 100644
---- a/src/CMapTms.cpp
-+++ b/src/CMapTms.cpp
-@@ -26,6 +26,7 @@
- #include "CDlgMapTmsConfig.h"
- #include "CMapSelectionRaster.h"
- #include "CSettings.h"
-+#include "version.h"
- 
- #include <QtGui>
- #include <QtNetwork>
-@@ -598,6 +599,7 @@ void CMapTms::checkQueue()
-         QNetworkRequest request;
- 
-         request.setUrl(req.url);
-+        request.setRawHeader("User-Agent" , "QLandkarteGT/" VER_STR);
-         req.reply = accessManager->get(request);
- 
-         pendRequests[req.url.toString()] = req;
diff --git a/sci-geosciences/qlandkartegt/qlandkartegt-1.7.6-r1.ebuild b/sci-geosciences/qlandkartegt/qlandkartegt-1.7.6-r2.ebuild
similarity index 82%
rename from sci-geosciences/qlandkartegt/qlandkartegt-1.7.6-r1.ebuild
rename to sci-geosciences/qlandkartegt/qlandkartegt-1.7.6-r2.ebuild
index bb4ef1c19f0c..59ed9a6d67b0 100644
--- a/sci-geosciences/qlandkartegt/qlandkartegt-1.7.6-r1.ebuild
+++ b/sci-geosciences/qlandkartegt/qlandkartegt-1.7.6-r2.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-geosciences/qlandkartegt/qlandkartegt-1.7.6-r1.ebuild,v 1.1 2014/02/17 17:37:20 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/qlandkartegt/qlandkartegt-1.7.6-r2.ebuild,v 1.1 2014/02/18 11:55:40 jlec Exp $
 
 EAPI=5
 
@@ -33,8 +33,6 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
-PATCHES=( "${FILESDIR}"/${P}-openstreetmaps.patch )
-
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use dbus DBUS)
@@ -54,3 +52,9 @@ src_install() {
 		-e 's:\(Geography;\):\1Education;:g' \
 		-i ./qlandkartegt.desktop || die
 }
+
+pkg_postinst() {
+	elog "OSM and Opencyclemap internal definitions were dropped upstream"
+	elog "Add it through File -> Load Online Map"
+	elog "or add a tsm definition (http://wiki.openstreetmap.org/wiki/MapQuest#Tile_URLs)"
+}
diff --git a/sci-mathematics/octave/Manifest b/sci-mathematics/octave/Manifest
index 35fd87684313..d74082c526f7 100644
--- a/sci-mathematics/octave/Manifest
+++ b/sci-mathematics/octave/Manifest
@@ -1 +1,2 @@
 DIST octave-3.6.4.tar.bz2 15627315 SHA256 fa185df9591f5d740f4d37ff6eaf06db576fdd3e0ddd9d0737365799e5d1c962 SHA512 a49ef50161272618c9543057be5903e1e50b7f4ecb929777f6715d4b3a07a92c36a5b13958c52d8b942b6c7e7e3f7844409d0062eb02bdb3972d7194312b7a81 WHIRLPOOL f51c764ce1ed911661bb3dd1d31a2321f09c0d887ead7bbe8c1f4ad1ebe05137223afb5ff18fc57b83d631936975964a85e4fed9a087760935acb5a35050cda0
+DIST octave-3.8.0.tar.bz2 17669638 SHA256 519330c6dd34eb69ca26a811722948fceac2acebd67ba924eba9b34a2e5a94f9 SHA512 2e8b81b418e235cddd6678d7cc83b8441c64b36f98854ab704c1b34d5ff711d3f6cce7ffe33f5f70a7bc231b2219b39d16033e6b9d04174cbab68f21c5a8abec WHIRLPOOL ace3d162722b0e47d78fbf8029396c3e5690a4260d5fcef09be4a1a58f7a1144888f5829a47f77d344ca20fa6844c55b80955e7093c5cd2e98a89188b6ec3708
diff --git a/sci-mathematics/octave/files/octave-3.8.0-JIT-64-bit-indexing.patch b/sci-mathematics/octave/files/octave-3.8.0-JIT-64-bit-indexing.patch
new file mode 100644
index 000000000000..fc8d6c5884c3
--- /dev/null
+++ b/sci-mathematics/octave/files/octave-3.8.0-JIT-64-bit-indexing.patch
@@ -0,0 +1,77 @@
+
+# HG changeset patch
+# User Lasse Schuirmann <lasse@schuirmann.net>
+# Date 1389727640 28800
+# Node ID e243b705a726cbcef27fc3c88da984614eece2bc
+# Parent  ec975e8267288372e957d5b81c8185b504492ba3
+Fix building JIT with 64-bit indexing (bug #41163).
+
+jit-typeinfo.cc (jit_typeinfo): Create two constants for the value 1.  One
+constant (one_idx) is of type index_t and the other (one_int) is of int_t.  Use
+these constants when comparing to objects of the matching type.
+
+diff --git a/libinterp/corefcn/jit-typeinfo.cc b/libinterp/corefcn/jit-typeinfo.cc
+--- a/libinterp/corefcn/jit-typeinfo.cc
++++ b/libinterp/corefcn/jit-typeinfo.cc
+@@ -1609,12 +1609,8 @@
+   body = fn.new_block ();
+   builder.SetInsertPoint (body);
+   {
+-    llvm::Value *one = llvm::ConstantInt::get (index_t, 1);
+-    llvm::Value *ione;
+-    if (index_t == int_t)
+-      ione = one;
+-    else
+-      ione = llvm::ConstantInt::get (int_t, 1);
++    llvm::Value *one_idx = llvm::ConstantInt::get (index_t, 1);
++    llvm::Value *one_int = llvm::ConstantInt::get (int_t, 1);
+ 
+     llvm::Value *undef = llvm::UndefValue::get (scalar_t);
+     llvm::Value *mat = fn.argument (builder, 0);
+@@ -1624,7 +1620,7 @@
+     llvm::Value *int_idx = builder.CreateFPToSI (idx, index_t);
+     llvm::Value *check_idx = builder.CreateSIToFP (int_idx, scalar_t);
+     llvm::Value *cond0 = builder.CreateFCmpUNE (idx, check_idx);
+-    llvm::Value *cond1 = builder.CreateICmpSLT (int_idx, one);
++    llvm::Value *cond1 = builder.CreateICmpSLT (int_idx, one_idx);
+     llvm::Value *cond = builder.CreateOr (cond0, cond1);
+ 
+     llvm::BasicBlock *done = fn.new_block ("done");
+@@ -1647,7 +1643,7 @@
+     builder.CreateCondBr (cond, bounds_error, success);
+ 
+     builder.SetInsertPoint (bounds_error);
+-    gindex_range.call (builder, ione, ione, int_idx, len);
++    gindex_range.call (builder, one_int, one_int, int_idx, len);
+     builder.CreateBr (done);
+ 
+     builder.SetInsertPoint (success);
+@@ -1681,7 +1677,8 @@
+   body = fn.new_block ();
+   builder.SetInsertPoint (body);
+   {
+-    llvm::Value *one = llvm::ConstantInt::get (index_t, 1);
++    llvm::Value *one_idx = llvm::ConstantInt::get (index_t, 1);
++    llvm::Value *one_int = llvm::ConstantInt::get (int_t, 1);
+ 
+     llvm::Value *mat = fn.argument (builder, 0);
+     llvm::Value *idx = fn.argument (builder, 1);
+@@ -1690,7 +1687,7 @@
+     llvm::Value *int_idx = builder.CreateFPToSI (idx, index_t);
+     llvm::Value *check_idx = builder.CreateSIToFP (int_idx, scalar_t);
+     llvm::Value *cond0 = builder.CreateFCmpUNE (idx, check_idx);
+-    llvm::Value *cond1 = builder.CreateICmpSLT (int_idx, one);
++    llvm::Value *cond1 = builder.CreateICmpSLT (int_idx, one_idx);
+     llvm::Value *cond = builder.CreateOr (cond0, cond1);
+ 
+     llvm::BasicBlock *done = fn.new_block ("done");
+@@ -1708,7 +1705,7 @@
+ 
+     llvm::Value *rcount = builder.CreateExtractValue (mat, 0);
+     rcount = builder.CreateLoad (rcount);
+-    cond1 = builder.CreateICmpSGT (rcount, one);
++    cond1 = builder.CreateICmpSGT (rcount, one_int);
+     cond = builder.CreateOr (cond0, cond1);
+ 
+     llvm::BasicBlock *bounds_error = fn.new_block ("bounds_error", done);
+
diff --git a/sci-mathematics/octave/files/octave-3.8.0-disable-getcwd-path-max-test-as-it-is-too-slow.patch b/sci-mathematics/octave/files/octave-3.8.0-disable-getcwd-path-max-test-as-it-is-too-slow.patch
new file mode 100644
index 000000000000..135330d2f45a
--- /dev/null
+++ b/sci-mathematics/octave/files/octave-3.8.0-disable-getcwd-path-max-test-as-it-is-too-slow.patch
@@ -0,0 +1,11 @@
+--- octave-3.8.0-orig/m4/getcwd.m4	2013-12-28 09:00:39.000000000 +1100
++++ octave-3.8.0/m4/getcwd.m4	2014-02-15 13:11:06.783512435 +1100
+@@ -108,7 +108,7 @@
+ 
+   gl_abort_bug=no
+   case "$host_os" in
+-    mingw*)
++    *-gnu* | gnu* | mingw*)
+       gl_cv_func_getcwd_path_max=yes
+       ;;
+     *)
diff --git a/sci-mathematics/octave/files/octave-3.8.0-fix-compile.patch b/sci-mathematics/octave/files/octave-3.8.0-fix-compile.patch
new file mode 100644
index 000000000000..72931ee66283
--- /dev/null
+++ b/sci-mathematics/octave/files/octave-3.8.0-fix-compile.patch
@@ -0,0 +1,11 @@
+--- octave-3.8.0-orig/libinterp/corefcn/jit-typeinfo.cc	2013-12-28 08:57:41.000000000 +1100
++++ octave-3.8.0/libinterp/corefcn/jit-typeinfo.cc	2014-02-14 15:45:47.388031654 +1100
+@@ -872,7 +872,7 @@
+ jit_operation::to_idx (const std::vector<jit_type*>& types) const
+ {
+   octave_idx_type numel = types.size ();
+-  numel = std::max (2, numel);
++  numel = std::max (static_cast<octave_idx_type>(2), numel);
+ 
+   Array<octave_idx_type> idx (dim_vector (1, numel));
+   for (octave_idx_type i = 0; i < static_cast<octave_idx_type> (types.size ());
diff --git a/sci-mathematics/octave/files/octave-3.8.0-imagemagick-configure.patch b/sci-mathematics/octave/files/octave-3.8.0-imagemagick-configure.patch
new file mode 100644
index 000000000000..1406237fea44
--- /dev/null
+++ b/sci-mathematics/octave/files/octave-3.8.0-imagemagick-configure.patch
@@ -0,0 +1,16 @@
+--- octave-3.8.0-orig/configure.ac	2013-12-28 08:58:28.000000000 +1100
++++ octave-3.8.0/configure.ac	2014-02-15 20:11:53.821172574 +1100
+@@ -995,11 +995,11 @@
+ MAGICK_LIBS=
+ 
+ PKG_CHECK_EXISTS([$magick++], [
+-  ## Make sure we only get -I, -L, and -l flags.  Some Graphics/ImageMagick++
++  ## Make sure we only get -I, -D, -L, and -l flags.  Some Graphics/ImageMagick++
+   ## packages add extra flags that are useful when building
+   ## Graphics/ImageMagick++ extentions.  These extra flags break the
+   ## Octave build. 
+-  MAGICK_CPPFLAGS=`$PKG_CONFIG --cflags-only-I $magick++`
++  MAGICK_CPPFLAGS=`$PKG_CONFIG --cflags $magick++ | sed -e 's/\(-@<:@DI@:>@@<:@^ \t@:>@*\)\|\(-@<:@^ \t@:>@*\)/\1/g'`
+   MAGICK_LDFLAGS=`$PKG_CONFIG --libs-only-L $magick++`
+   MAGICK_LIBS=`$PKG_CONFIG --libs-only-l $magick++`
+ 
diff --git a/sci-mathematics/octave/files/octave-3.8.0-imagemagick.patch b/sci-mathematics/octave/files/octave-3.8.0-imagemagick.patch
new file mode 100644
index 000000000000..8dc94ca6feb2
--- /dev/null
+++ b/sci-mathematics/octave/files/octave-3.8.0-imagemagick.patch
@@ -0,0 +1,110 @@
+--- octave-3.8.0-orig/libinterp/dldfcn/__magick_read__.cc	2013-12-28 08:57:41.000000000 +1100
++++ octave-3.8.0/libinterp/dldfcn/__magick_read__.cc	2014-02-15 00:12:10.909254448 +1100
+@@ -38,7 +38,7 @@
+ #include "gripes.h"
+ 
+ #ifdef HAVE_MAGICK
+-
++#define MAGICKCORE_EXCLUDE_DEPRECATED 1
+ #include <Magick++.h>
+ #include <clocale>
+ 
+@@ -332,7 +332,10 @@
+   if (imvec[def_elem].depth () == 32)
+     divisor = std::numeric_limits<uint32_t>::max ();
+   else
+-    divisor = MaxRGB / ((uint64_t (1) << imvec[def_elem].depth ()) - 1);
++  {
++    using namespace Magick;
++    divisor = QuantumRange / ((uint64_t (1) << imvec[def_elem].depth ()) - 1);
++  }
+ 
+   // FIXME: this workaround should probably be fixed in GM by creating a
+   //        new ImageType BilevelMatteType
+@@ -463,7 +466,8 @@
+                 for (octave_idx_type row = 0; row < nRows; row++)
+                   {
+                     img_fvec[idx] = pix->red / divisor;
+-                    a_fvec[idx]   = (MaxRGB - pix->opacity) / divisor;
++                    using namespace Magick;
++                    a_fvec[idx]   = (QuantumRange - pix->opacity) / divisor;
+                     pix += row_shift;
+                     idx++;
+                   }
+@@ -538,7 +542,8 @@
+                     rbuf[idx]     = pix->red     / divisor;
+                     gbuf[idx]     = pix->green   / divisor;
+                     bbuf[idx]     = pix->blue    / divisor;
+-                    a_fvec[a_idx++] = (MaxRGB - pix->opacity) / divisor;
++                    using namespace Magick;
++                    a_fvec[a_idx++] = (QuantumRange - pix->opacity) / divisor;
+                     pix += row_shift;
+                     idx++;
+                   }
+@@ -620,7 +625,8 @@
+                     mbuf[idx]     = pix->green   / divisor;
+                     ybuf[idx]     = pix->blue    / divisor;
+                     kbuf[idx]     = pix->opacity / divisor;
+-                    a_fvec[a_idx++] = (MaxRGB - *apix) / divisor;
++                    using namespace Magick;
++                    a_fvec[a_idx++] = (QuantumRange - *apix) / divisor;
+                     pix += row_shift;
+                     idx++;
+                   }
+@@ -678,9 +684,10 @@
+       // Restore locale from before GraphicsMagick initialisation
+       setlocale (LC_ALL, locale.c_str ());
+ 
+-      if (QuantumDepth < 32)
++      using namespace Magick;
++      if (MAGICKCORE_QUANTUM_DEPTH < 32)
+         warning ("your version of %s limits images to %d bits per pixel",
+-                 MagickPackageName, QuantumDepth);
++                 MagickPackageName, MAGICKCORE_QUANTUM_DEPTH);
+ 
+       initialized = true;
+     }
+@@ -1053,8 +1060,9 @@
+   // From GM documentation:
+   //  Color arguments are must be scaled to fit the Quantum size according to
+   //  the range of MaxRGB
++  using namespace Magick;
+   const double divisor = static_cast<double>((uint64_t (1) << bitdepth) - 1)
+-                         / MaxRGB;
++                         / QuantumRange;
+ 
+   const P *img_fvec = img.fortran_vec ();
+   const P *a_fvec   = alpha.fortran_vec ();
+@@ -1105,7 +1113,8 @@
+                   {
+                     Magick::Color c;
+                     c.redQuantum   (double (*img_fvec) / divisor);
+-                    c.alphaQuantum (MaxRGB - (double (*a_fvec) / divisor));
++                    using namespace Magick;
++                    c.alphaQuantum (QuantumRange - (double (*a_fvec) / divisor));
+                     pix[GM_idx] = c;
+                     img_fvec++;
+                     a_fvec++;
+@@ -1170,10 +1179,11 @@
+               {
+                 for (octave_idx_type row = 0; row < nRows; row++)
+                   {
++                    using namespace Magick;
+                     Magick::Color c (double (*img_fvec)          / divisor,
+                                      double (img_fvec[G_offset]) / divisor,
+                                      double (img_fvec[B_offset]) / divisor,
+-                                     MaxRGB - (double (*a_fvec) / divisor));
++                                     QuantumRange - (double (*a_fvec) / divisor));
+                     pix[GM_idx] = c;
+                     img_fvec++;
+                     a_fvec++;
+@@ -1247,7 +1257,8 @@
+                                      double (img_fvec[Y_offset]) / divisor,
+                                      double (img_fvec[K_offset]) / divisor);
+                     pix[GM_idx] = c;
+-                    ind[GM_idx] = MaxRGB - (double (*a_fvec) / divisor);
++                    using namespace Magick;
++                    ind[GM_idx] = QuantumRange - (double (*a_fvec) / divisor);
+                     img_fvec++;
+                     a_fvec++;
+                     GM_idx += nCols;
diff --git a/sci-mathematics/octave/files/octave-3.8.0-llvm-3.4.patch b/sci-mathematics/octave/files/octave-3.8.0-llvm-3.4.patch
new file mode 100644
index 000000000000..63c5303d13c7
--- /dev/null
+++ b/sci-mathematics/octave/files/octave-3.8.0-llvm-3.4.patch
@@ -0,0 +1,63 @@
+diff -aur octave-3.8.0/libinterp/corefcn/jit-util.h octave-3.8.0.fix/libinterp/corefcn/jit-util.h
+--- octave-3.8.0/libinterp/corefcn/jit-util.h	2013-12-27 15:57:41.000000000 -0600
++++ octave-3.8.0.fix/libinterp/corefcn/jit-util.h	2014-01-16 17:06:47.512782643 -0600
+@@ -42,8 +42,10 @@
+ {
+   class Value;
+   class Module;
+-  class FunctionPassManager;
+-  class PassManager;
++  namespace legacy {
++    class FunctionPassManager;
++    class PassManager;
++  }
+   class ExecutionEngine;
+   class Function;
+   class BasicBlock;
+diff -aur octave-3.8.0/libinterp/corefcn/pt-jit.cc octave-3.8.0.fix/libinterp/corefcn/pt-jit.cc
+--- octave-3.8.0/libinterp/corefcn/pt-jit.cc	2013-12-27 15:58:17.000000000 -0600
++++ octave-3.8.0.fix/libinterp/corefcn/pt-jit.cc	2014-01-16 17:08:28.030924785 -0600
+@@ -52,7 +52,7 @@
+ #include <llvm/Bitcode/ReaderWriter.h>
+ #include <llvm/ExecutionEngine/ExecutionEngine.h>
+ #include <llvm/ExecutionEngine/JIT.h>
+-#include <llvm/PassManager.h>
++#include <llvm/IR/LegacyPassManager.h>
+ 
+ #ifdef HAVE_LLVM_IR_FUNCTION_H
+ #include <llvm/IR/LLVMContext.h>
+@@ -1888,10 +1888,10 @@
+   if (! engine)
+     return false;
+ 
+-  module_pass_manager = new llvm::PassManager ();
++  module_pass_manager = new llvm::legacy::PassManager ();
+   module_pass_manager->add (llvm::createAlwaysInlinerPass ());
+ 
+-  pass_manager = new llvm::FunctionPassManager (module);
++  pass_manager = new llvm::legacy::FunctionPassManager (module);
+ #ifdef HAVE_LLVM_DATALAYOUT
+   pass_manager->add (new llvm::DataLayout (*engine->getDataLayout ()));
+ #else
+@@ -2007,7 +2007,7 @@
+     {
+       std::string error;
+       llvm::raw_fd_ostream fout ("test.bc", error,
+-                                 llvm::raw_fd_ostream::F_Binary);
++                                 llvm::sys::fs::F_Binary);
+       llvm::WriteBitcodeToFile (module, fout);
+     }
+ }
+diff -aur octave-3.8.0/libinterp/corefcn/pt-jit.h octave-3.8.0.fix/libinterp/corefcn/pt-jit.h
+--- octave-3.8.0/libinterp/corefcn/pt-jit.h	2013-12-27 15:58:17.000000000 -0600
++++ octave-3.8.0.fix/libinterp/corefcn/pt-jit.h	2014-01-16 17:05:08.224619116 -0600
+@@ -384,8 +384,8 @@
+   size_t trip_count (const octave_value& bounds) const;
+ 
+   llvm::Module *module;
+-  llvm::PassManager *module_pass_manager;
+-  llvm::FunctionPassManager *pass_manager;
++  llvm::legacy::PassManager *module_pass_manager;
++  llvm::legacy::FunctionPassManager *pass_manager;
+   llvm::ExecutionEngine *engine;
+ };
diff --git a/sci-mathematics/octave/files/octave-3.8.0-llvm-configure.patch b/sci-mathematics/octave/files/octave-3.8.0-llvm-configure.patch
new file mode 100644
index 000000000000..82c6c1458093
--- /dev/null
+++ b/sci-mathematics/octave/files/octave-3.8.0-llvm-configure.patch
@@ -0,0 +1,12 @@
+--- octave-3.8.0-orig/configure.ac	2013-12-28 08:58:28.000000000 +1100
++++ octave-3.8.0/configure.ac	2014-02-15 20:51:21.431570121 +1100
+@@ -805,7 +805,8 @@
+     dnl Use -isystem so we don't get warnings from llvm headers
+     LLVM_CPPFLAGS="$LLVM_INCLUDE_FLAG `$LLVM_CONFIG --includedir`"
+     LLVM_CXXFLAGS=
+-    LLVM_LDFLAGS="-L`$LLVM_CONFIG --libdir`"
++    dnl If llvm-config --ldflags has -L ending with /llvm then specify this directory with -R
++    LLVM_LDFLAGS="`$LLVM_CONFIG --ldflags | sed -e 's/-L\(@<:@^ \t@:>@*\/llvm\)/-L\1 -R\1/' -e 's/-@<:@^LR@:>@.*@<:@ \t@:>@//g'`"
+ 
+ 
+     LDFLAGS="$LDFLAGS $LLVM_LDFLAGS"
diff --git a/sci-mathematics/octave/files/octave-3.8.0-pkgbuilddir.patch b/sci-mathematics/octave/files/octave-3.8.0-pkgbuilddir.patch
new file mode 100644
index 000000000000..983f6b54ac57
--- /dev/null
+++ b/sci-mathematics/octave/files/octave-3.8.0-pkgbuilddir.patch
@@ -0,0 +1,40 @@
+--- octave-3.8.0-orig/scripts/pkg/private/install.m	2013-12-28 08:57:42.000000000 +1100
++++ octave-3.8.0/scripts/pkg/private/install.m	2014-02-10 00:59:40.747194765 +1100
+@@ -63,6 +63,14 @@
+       tgz = files{i};
+ 
+       if (exist (tgz, "file"))
++      ## The filename pointed to an uncompressed package to begin with.
++      if (exist (tgz, "dir"))
++        if (tgz(1) == '/')
++          packdir = tgz;
++        else
++          packdir = fullfile (pwd(), tgz);
++        endif
++      elseif (exist (tgz, "file"))
+         ## Create a temporary directory.
+         tmpdir = tmpnam ();
+         tmpdirs{end+1} = tmpdir;
+@@ -89,20 +97,12 @@
+         if (length (dirlist) > 3)
+           error ("bundles of packages are not allowed");
+         endif
+-      endif
+ 
+-      ## The filename pointed to an uncompressed package to begin with.
+-      if (exist (tgz, "dir"))
+-        dirlist = {".", "..", tgz};
++        ## The two first entries of dirlist are "." and "..".
++        packdir = fullfile (tmpdir, dirlist{3});
+       endif
+ 
+       if (exist (tgz, "file") || exist (tgz, "dir"))
+-        ## The two first entries of dirlist are "." and "..".
+-        if (exist (tgz, "file"))
+-          packdir = fullfile (tmpdir, dirlist{3});
+-        else
+-          packdir = fullfile (pwd (), dirlist{3});
+-        endif
+         packdirs{end+1} = packdir;
+ 
+         ## Make sure the package contains necessary files.
diff --git a/sci-mathematics/octave/metadata.xml b/sci-mathematics/octave/metadata.xml
index c2dde1ee64bd..96894a89c9c3 100644
--- a/sci-mathematics/octave/metadata.xml
+++ b/sci-mathematics/octave/metadata.xml
@@ -11,6 +11,7 @@
 </longdescription>
   <use>
     <flag name="glpk">Add support for <pkg>sci-libs/glpk</pkg> for linear programming</flag>
+    <flag name="jit">(EXPERIMENTAL) enable JIT compiler</flag>
     <flag name="qhull">Add support for <pkg>sci-libs/qhull</pkg>, to allow `delaunay', `convhull', and related functions</flag>
     <flag name="qrupdate">Add support for <pkg>sci-libs/qrupdate</pkg>for QR and Cholesky update functions</flag>
     <flag name="sparse">Add enhanced support for sparse matrix algebra with SuiteSparse</flag>
diff --git a/sci-mathematics/octave/octave-3.8.0.ebuild b/sci-mathematics/octave/octave-3.8.0.ebuild
new file mode 100644
index 000000000000..807336a03133
--- /dev/null
+++ b/sci-mathematics/octave/octave-3.8.0.ebuild
@@ -0,0 +1,202 @@
+# 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.0.ebuild,v 1.1 2014/02/19 00:52:33 gienah Exp $
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=1
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
+inherit autotools-utils multilib toolchain-funcs fortran-2 flag-o-matic java-pkg-opt-2 pax-utils
+
+DESCRIPTION="High-level interactive language for numerical computations"
+LICENSE="GPL-3"
+HOMEPAGE="http://www.octave.org/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
+
+SLOT="0/${PV}"
+IUSE="curl doc fftw +glpk gnuplot hdf5 +imagemagick java jit opengl postscript
+	+qhull +qrupdate readline +sparse static-libs X zlib"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	app-text/ghostscript-gpl
+	dev-libs/libpcre
+	sys-libs/ncurses
+	jit? ( !hppa? ( sys-devel/llvm ) )
+	virtual/lapack
+	curl? ( net-misc/curl )
+	fftw? ( sci-libs/fftw:3.0 )
+	glpk? ( sci-mathematics/glpk )
+	gnuplot? ( sci-visualization/gnuplot )
+	hdf5? ( sci-libs/hdf5 )
+	imagemagick? ( || (
+			media-gfx/graphicsmagick[cxx]
+			>=media-gfx/imagemagick-6.8.8.5[cxx] ) )
+	opengl? (
+		media-libs/freetype:2
+		media-libs/fontconfig
+		>=x11-libs/fltk-1.3:1[opengl]
+		!hppa? ( x11-libs/gl2ps )
+		virtual/glu )
+	postscript? (
+		app-text/epstool
+		media-gfx/pstoedit
+		media-gfx/transfig )
+	qhull? ( media-libs/qhull )
+	qrupdate? ( sci-libs/qrupdate )
+	readline? ( sys-libs/readline )
+	sparse? (
+		sci-libs/arpack
+		sci-libs/camd
+		sci-libs/ccolamd
+		sci-libs/cholmod
+		sci-libs/colamd
+		sci-libs/cxsparse
+		sci-libs/umfpack )
+	X? ( x11-libs/libX11 )
+	zlib? ( sys-libs/zlib )"
+
+DEPEND="${RDEPEND}
+	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"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.8.0-pkgbuilddir.patch
+	"${FILESDIR}"/${PN}-3.4.3-texi.patch
+	"${FILESDIR}"/${PN}-3.8.0-imagemagick-configure.patch
+	"${FILESDIR}"/${PN}-3.8.0-imagemagick.patch
+	"${FILESDIR}"/${PN}-3.8.0-fix-compile.patch
+	"${FILESDIR}"/${PN}-3.8.0-llvm-configure.patch
+	"${FILESDIR}"/${PN}-3.8.0-JIT-64-bit-indexing.patch
+	"${FILESDIR}"/${PN}-3.8.0-disable-getcwd-path-max-test-as-it-is-too-slow.patch
+)
+
+pkg_pretend() {
+	if use qrupdate || use sparse; then
+		local blaslib=$(pkg-config --libs-only-l "blas" | sed -e 's@.*-l@lib@' | cut -d' ' -f 1)
+		einfo "Checking dependencies are built wtih the same blas lib = ${blaslib}"
+		local usr_lib="${ROOT}usr/$(get_libdir)"
+		local libs=( )
+		use qrupdate && libs+=( "${usr_lib}"/libqrupdate.so )
+		use sparse && libs+=(
+			"${usr_lib}"/libarpack.so
+			"${usr_lib}"/libcholmod.so
+			"${usr_lib}"/libspqr.so
+			"${usr_lib}"/libumfpack.so
+		)
+		for i in ${libs[*]}
+		do
+			# Is it not linked with the current blas?  This check is not enough though, as
+			# earlier versions of sci-libs/cholmod were not linked with blas, while as later
+			# versions are if built with the lapack use flag.
+			scanelf -n ${i} | grep -q "${blaslib}"
+			if [[ $? != 0 ]]; then
+				# Does it appear to be linked with some blas or lapack library?
+				scanelf -n ${i} | egrep -q "blas|lapack"
+				if [[ $? == 0 ]]; then
+					eerror "*******************************************************************************"
+					eerror "${i} must be rebuilt with ${blaslib}"
+					eerror ""
+					eerror "To check the libaries ${i} is currently built with:"
+					eerror ""
+					eerror "scanelf -n ${i}"
+					eerror ""
+					eerror "To find the package that needs to be rebuilt:"
+					eerror ""
+					eerror "equery belongs ${i}"
+					eerror "*******************************************************************************"
+					die
+				fi
+			fi
+		done
+	fi
+}
+
+src_prepare() {
+	# nasty prefix hack for fltk:1 linking
+	if use prefix && use opengl; then
+		sed -i \
+			-e "s:ldflags\`:ldflags\` -Wl,-rpath,${EPREFIX}/usr/$(get_libdir)/fltk-1:" \
+			configure.ac
+	fi
+	if has_version ">=sys-devel/llvm-3.4"; then
+		epatch "${FILESDIR}"/${PN}-3.8.0-llvm-3.4.patch
+	fi
+	if use hppa && use opengl; then
+		ewarn "http://www.gnu.org/software/octave/NEWS-3.8.html says Printing or saving figures"
+		ewarn "with OpenGL graphics requires the gl2ps - but at the time of writing x11-libs/gl2ps"
+		ewarn "does not have the hppa keyword"
+	fi
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	# occasional fail on install, force regeneration (bug #401189)
+	rm doc/interpreter/contributors.texi || die
+
+	# unfortunate dependency on mpi from hdf5 (bug #302621)
+	use hdf5 && has_version sci-libs/hdf5[mpi] && \
+		export CXX=mpicxx CC=mpicc FC=mpif77 F77=mpif77
+
+	local myeconfargs=(
+		--localstatedir="${EPREFIX}/var/state/octave"
+		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)"
+		--with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)"
+		$(use_enable doc docs)
+		$(use_enable java)
+		$(use_enable opengl gui)
+		$(use_enable jit)
+		$(use_enable readline)
+		$(use_with curl)
+		$(use_with fftw fftw3)
+		$(use_with fftw fftw3f)
+		$(use_enable fftw fftw-threads)
+		$(use_with glpk)
+		$(use_with hdf5)
+		$(use_with opengl)
+		$(use_with qhull)
+		$(use_with qrupdate)
+		$(use_with sparse arpack)
+		$(use_with sparse umfpack)
+		$(use_with sparse colamd)
+		$(use_with sparse ccolamd)
+		$(use_with sparse cholmod)
+		$(use_with sparse cxsparse)
+		$(use_with X x)
+		$(use_with zlib z)
+	)
+	if use imagemagick; then
+		if has_version media-gfx/graphicsmagick[cxx]; then
+			myeconfargs+=( "--with-magick=GraphicsMagick" )
+		else
+			myeconfargs+=( "--with-magick=ImageMagick" )
+		fi
+	else
+		myeconfargs+=( "--without-magick" )
+	fi
+	autotools-utils_src_configure
+}
+
+src_compile() {
+	emake
+	if use java || use jit ; then
+		pax-mark m "${S}/src/.libs/octave-cli"
+	fi
+}
+
+src_install() {
+	autotools-utils_src_install
+	use doc && dodoc $(find doc -name \*.pdf)
+	[[ -e test/fntests.log ]] && dodoc test/fntests.log
+	use java && java-pkg_regjar "${ED}/usr/share/${PN}/${PV}/m/java/octave.jar"
+	echo "LDPATH=${EROOT%/}/usr/$(get_libdir)/${P}" > 99octave
+	doenvd 99octave
+}
diff --git a/sci-physics/lammps/Manifest b/sci-physics/lammps/Manifest
index 0082a2d487f2..32592a5dbbb3 100644
--- a/sci-physics/lammps/Manifest
+++ b/sci-physics/lammps/Manifest
@@ -1,4 +1,5 @@
 DIST lammps-12Feb14.tar.gz 58143004 SHA256 31f3dcc33524d56405c06306c4ef02fc4d41d72dc0b7ac3cd9ef033f42e08c3d SHA512 525b592e3b4779fffa7a96a92d6972b1bfed8b3727746b6065c9743628421aaf4fa8ba6e72d891c2c6f016f776b9155bdff9b8dfeb8ed4dec164b334253255a2 WHIRLPOOL e15a2b56ee2918a478c979239565ad01346b60d026f2a5a6051b339f08e9328c0940767843b7fd08aaa225d097fe254d0cebbd07902671404874b9d63c91916f
+DIST lammps-14Feb14.tar.gz 58547063 SHA256 188aa10c8984457e5559c30396ef56a0af51c69242b6b1ac10afa29b11ace4d9 SHA512 9fea6054e507eebc3eb41e7a6685d91bd58afd4b4c4eac692bf21bfadf48d34dfe6143d1775be89badfcb3ef5ec5a81e15c06797ac055cdf149f8139c868a0f7 WHIRLPOOL 7460b93649e9c3a6e0648e6368291205e97796b536a7b51ef59766d9db65ef7b8c2a43f24194980762c9c5b2b896d75b13c14e1350ea344fc46075269c87b098
 DIST lammps-16Dec13.tar.gz 57769723 SHA256 178fa012ddb7f6b476fa5a951da04e8929bd383c4a5d8ca09c510f73a5644432 SHA512 672c7575f96c2ef03813d161c27757b17282b58f3dea466ae7297394a6519962fe72c8b4a501c193dc41398c7e49f8b1bd1059e8f4ed31600fcc813d88f3aa12 WHIRLPOOL 0976b1a2b49f09b39c2c45f4373291a5da91b0b206d691579f3324c427f4931bd358941fffe890194490ad20b1805ef69be58342b75af33c1cb935942fdf4b0f
 DIST lammps-17Dec13.tar.gz 57780188 SHA256 857b577b857b12144823249ba010b4d58029bc8616c1e4a9203fe9be3b551eda SHA512 f8a715e876f68429e9ddbb7ad67f9b9c128e3c6639436ff97f3d37b36eff3e3a51ec3ce8cafb11f526afd43ae30989f783a742393a72e698653f1e47843183bc WHIRLPOOL 5a4478e457a382031ca98cdbed32bfaeb2f37cffc5c1494f46cfbda2f04381ead09c124e0b2b2972b5ef4442bb9e88c5035e72f038833034cf1fe0f826db4bab
 DIST lammps-1Dec13.tar.gz 57750078 SHA256 44ef69f31f2066fec31a6b7c9511395c21ead00030d3a5e00efa7eb27e6314d9 SHA512 1c5b0f5e9e2e09243f6ec3ac045021f8506626f8311082fb57314246f25f7ea6bd90dacd3d89db6561d5f0039f6476fd1d9e6d09c57c1bcc63be53ac519aec07 WHIRLPOOL ea3796dbca79f97eb7f9fc5f72972a882357108792f7bb96a8a5e7f3f1614917b452e129143b4e12964e51aeaa80dde6e414ec3f4a89220a3d36d012a829f2d7
diff --git a/sci-physics/lammps/lammps-20140212.ebuild b/sci-physics/lammps/lammps-20140212.ebuild
index 111a1c788dc3..de120c4e842f 100644
--- a/sci-physics/lammps/lammps-20140212.ebuild
+++ b/sci-physics/lammps/lammps-20140212.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-physics/lammps/lammps-20140212.ebuild,v 1.2 2014/02/15 02:01:57 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/lammps/lammps-20140212.ebuild,v 1.3 2014/02/18 12:12:39 nicolasbock Exp $
 
 EAPI=5
 
@@ -80,8 +80,12 @@ lmp_emake() {
 src_prepare() {
 	# Fix inconsistent use of SHFLAGS.
 	sed -i -e 's:$(CCFLAGS):$(CCFLAGS) -fPIC:' src/STUBS/Makefile || die
-	use !lammps-package-meam || sed -i -e 's:$(F90FLAGS):$(F90FLAGS) -fPIC:' lib/meam/Makefile.gfortran || die
-	use !lammps-package-reax || sed -i -e 's:$(F90FLAGS):$(F90FLAGS) -fPIC:' lib/reax/Makefile.gfortran || die
+	if use lammps-package-meam; then
+		sed -i -e 's:$(F90FLAGS):$(F90FLAGS) -fPIC:' lib/meam/Makefile.gfortran || die
+	fi
+	if use lammps-package-reax; then
+		sed -i -e 's:$(F90FLAGS):$(F90FLAGS) -fPIC:' lib/reax/Makefile.gfortran || die
+	fi
 }
 
 src_compile() {
diff --git a/sci-physics/lammps/lammps-20140214.ebuild b/sci-physics/lammps/lammps-20140214.ebuild
new file mode 100644
index 000000000000..5e30f650e8d0
--- /dev/null
+++ b/sci-physics/lammps/lammps-20140214.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/lammps/lammps-20140214.ebuild,v 1.1 2014/02/18 13:02:44 nicolasbock Exp $
+
+EAPI=5
+
+inherit eutils fortran-2
+
+convert_month() {
+	case $1 in
+		01) echo Jan
+			;;
+		02) echo Feb
+			;;
+		03) echo Mar
+			;;
+		04) echo Apr
+			;;
+		05) echo May
+			;;
+		06) echo Jun
+			;;
+		07) echo Jul
+			;;
+		08) echo Aug
+			;;
+		09) echo Sep
+			;;
+		10) echo Oct
+			;;
+		11) echo Nov
+			;;
+		12) echo Dec
+			;;
+		*)  echo unknown
+			;;
+	esac
+}
+
+MY_P=${PN}-$((10#${PV:6:2}))$(convert_month ${PV:4:2})${PV:2:2}
+
+DESCRIPTION="Large-scale Atomic/Molecular Massively Parallel Simulator"
+HOMEPAGE="http://lammps.sandia.gov/"
+SRC_URI="http://lammps.sandia.gov/tars/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc examples gzip lammps-memalign mpi"
+
+DEPEND="mpi? ( virtual/mpi )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+lmp_emake() {
+	local LAMMPS_INCLUDEFLAGS
+	LAMMPS_INCLUDEFLAGS="$(usex gzip '-DLAMMPS_GZIP' '')"
+	LAMMPS_INCLUDEFLAGS+="$(usex lammps-memalign ' -DLAMMPS_MEMALIGN' '')"
+
+	# The lammps makefile uses CC to indicate the C++ compiler.
+	emake \
+		ARCHIVE=$(tc-getAR) \
+		CC=$(usex mpi "mpic++" "$(tc-getCXX)") \
+		F90=$(usex mpi "mpif90" "$(tc-getFC)") \
+		LINK=$(usex mpi "mpic++" "$(tc-getCXX)") \
+		CCFLAGS="${CXXFLAGS}" \
+		F90FLAGS="${FCFLAGS}" \
+		LINKFLAGS="${LDFLAGS}" \
+		LMP_INC="${LAMMPS_INCLUDEFLAGS}" \
+		MPI_INC=$(usex mpi '' "-I../STUBS") \
+		MPI_PATH=$(usex mpi '' '-L../STUBS') \
+		MPI_LIB=$(usex mpi '' '-lmpi_stubs') \
+		"$@"
+}
+
+src_prepare() {
+	# Fix inconsistent use of SHFLAGS.
+	sed -i -e 's:$(CCFLAGS):$(CCFLAGS) -fPIC:' src/STUBS/Makefile || die
+	sed -i -e 's:$(F90FLAGS):$(F90FLAGS) -fPIC:' lib/meam/Makefile.gfortran || die
+	sed -i -e 's:$(F90FLAGS):$(F90FLAGS) -fPIC:' lib/reax/Makefile.gfortran || die
+
+	# Fix makefile in tools.
+	sed -i \
+		-e 's:g++:$(CXX) $(CXXFLAGS):' \
+		-e 's:gcc:$(CC) $(CCFLAGS):' \
+		-e 's:ifort:$(FC) $(FCFLAGS):' \
+		tools/Makefile
+}
+
+src_compile() {
+	# Compile stubs for serial version.
+	use mpi || lmp_emake -C src stubs
+
+	# Build packages
+	emake -C src yes-dipole
+	emake -C src yes-kspace
+	emake -C src yes-mc
+	lmp_emake -C src yes-meam
+	lmp_emake -j1 -C lib/meam -f Makefile.gfortran
+	emake -C src yes-reax
+	emake -C src yes-replica
+	lmp_emake -j1 -C lib/reax -f Makefile.gfortran
+	emake -C src yes-rigid
+	emake -C src yes-shock
+	emake -C src yes-xtc
+
+	# Build static library.
+	lmp_emake -C src makelib
+	lmp_emake -C src -f Makefile.lib serial
+
+	# Build shared library.
+	lmp_emake -C src makeshlib
+	lmp_emake -C src -f Makefile.shlib serial
+
+	# Compile main executable.
+	lmp_emake -C src serial
+
+	# Compile tools.
+	emake -C tools binary2txt
+}
+
+src_install() {
+	newlib.a "src/liblammps_serial.a" "liblammps.a"
+	newlib.so "src/liblammps_serial.so" "liblammps.so"
+	newbin "src/lmp_serial" "lmp"
+	dobin tools/binary2txt
+
+	local LAMMPS_POTENTIALS="/usr/share/${PF}/potentials"
+	insinto "${LAMMPS_POTENTIALS}"
+	doins potentials/*
+	echo "LAMMPS_POTENTIALS=${LAMMPS_POTENTIALS}" > 99lammps
+	doenvd 99lammps
+
+	if use examples; then
+		local LAMMPS_EXAMPLES="/usr/share/${PF}/examples"
+		insinto "${LAMMPS_EXAMPLES}"
+		doins -r examples/*
+	fi
+
+	dodoc README
+	if use doc; then
+		dodoc doc/Manual.pdf
+		dohtml -r doc/*
+	fi
+}
diff --git a/sci-physics/lammps/metadata.xml b/sci-physics/lammps/metadata.xml
index d20d1ba937ac..9c421e140c75 100644
--- a/sci-physics/lammps/metadata.xml
+++ b/sci-physics/lammps/metadata.xml
@@ -19,13 +19,13 @@
 		<flag name="lammps-memalign">Enables the use of the posix_memalign()
 			call instead of malloc() when large chunks or memory are allocated
 			by LAMMPS</flag>
-		<flag name="package-meam">modified EAM potential</flag>
 		<flag name="package-dipole">point dipole particles</flag>
+		<flag name="package-meam">modified EAM potential</flag>
 		<flag name="package-rigid">rigid bodies</flag>
-		<flag name="lammps-package-meam">modified EAM potential</flag>
 		<flag name="lammps-package-dipole">point dipole particles</flag>
-		<flag name="lammps-package-rigid">rigid bodies</flag>
+		<flag name="lammps-package-meam">modified EAM potential</flag>
 		<flag name="lammps-package-reax">ReaxFF potential</flag>
+		<flag name="lammps-package-rigid">rigid bodies</flag>
 	</use>
 	<herd>sci-physics</herd>
 	<maintainer>
diff --git a/sys-apps/file/file-5.17.ebuild b/sys-apps/file/file-5.17.ebuild
index bb7a90ad5b5a..9ce6f6a450cd 100644
--- a/sys-apps/file/file-5.17.ebuild
+++ b/sys-apps/file/file-5.17.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-apps/file/file-5.17.ebuild,v 1.2 2014/02/17 20:22:07 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/file-5.17.ebuild,v 1.5 2014/02/18 20:30:20 zlogene Exp $
 
 EAPI="4"
 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz
 		ftp://ftp.gw.com/mirrors/pub/unix/file/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+	KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 fi
 
 DESCRIPTION="identify a file's format by scanning binary data for patterns"
diff --git a/sys-apps/gawk/gawk-3.1.8.ebuild b/sys-apps/gawk/gawk-3.1.8.ebuild
index 69a2c0de601c..dd2f5a323a7e 100644
--- a/sys-apps/gawk/gawk-3.1.8.ebuild
+++ b/sys-apps/gawk/gawk-3.1.8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gawk/gawk-3.1.8.ebuild,v 1.7 2011/08/05 19:08:07 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gawk/gawk-3.1.8.ebuild,v 1.8 2014/02/18 18:58:12 ottxor Exp $
 
 EAPI="2"
 
@@ -15,7 +15,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
 IUSE="nls"
 
-RDEPEND=""
+RDEPEND="!>=virtual/awk-1"
 DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )"
 
diff --git a/sys-apps/man-pages/Manifest b/sys-apps/man-pages/Manifest
index 98e51d0df483..85115598948b 100644
--- a/sys-apps/man-pages/Manifest
+++ b/sys-apps/man-pages/Manifest
@@ -1,6 +1,5 @@
-DIST man-pages-3.53.tar.xz 1167444 SHA256 d4764d8225d73fd3ca9202b73da0ab52614faa8e727c45cd5ec715c3b393f34f SHA512 a7c350b44c6c7806e17acc4c33c594384583fec0f0c6a5fed8d6f54235e1febff8fa86beec61ce384fa2f246055a81aa9fc808f8a482a2d1283342ef7d61f23f WHIRLPOOL 62eaba9e72f090daf556ca90c17c39e7911e9f42cb1e74701abbb17ed2278db446675e6d4ecc0b8fd4ac8b447a02f0a380273214d3e67b1f92ace2b224838001
-DIST man-pages-3.55.tar.xz 1177352 SHA256 91b57467a5464ec8c0a089277a7a7960b316c75c5a0c91dcf002df6d8bf1e818 SHA512 182427ecdce3d8845e8d7f1a263df28fdb123746c13d463d95e33fe20516ecc01ef7dba61aa597e81fd0a7f640b9ba807f3a43149d78c88466fa77f58fea76c3 WHIRLPOOL 12229f5eab1c6a0429fe72826e981cb96a021d5c080b2152f4d89c71f7cda12a7dc23c324a9c87cf83f0fdab399dd73a99b41d64188536db99774767e347928d
 DIST man-pages-3.56.tar.xz 1189304 SHA256 a0cbdf5e90e21138d4e5cb0b932d51f34907e4e0d2d200c77b2bababc93828aa SHA512 371bb44b0f4efa8243a65801be815cc3de31d1eabe423fff2693bda854216e235b7817e8e04a93faf0125c7fd5bb3d0d3c10405c6c26b5ff7fc5c271b59ba957 WHIRLPOOL a397f61007804a50bbec070ee5bc298d9d47e07fb426ba6ae69eea62cfa32bdaf50bb820c297bafd9046e8ddeacaabbba88bc23e7702828e76e8d22bd2e25049
 DIST man-pages-3.57.tar.xz 1195700 SHA256 910ba04a792fe5769957d91701066e57ce6e9ff7f2ea6479ff3f2cde147706e5 SHA512 3f080c2a81efcf033ada73d40c14b23b87714793d7068e5a54be2c9c3242cdb70922457161d66439076e3450e44033a89b8b4be3751704b703e46b05400ba63e WHIRLPOOL a2e74cc4769389f4c3b9651da2a32cde4edd863fa50f9502aec0858fa0cf31c317a8ae38a25e6276d192f14a046da5a37ce96b07caf5323ed4e0a9e2d96cb3a2
 DIST man-pages-3.58.tar.xz 1197540 SHA256 296ea69a27bd6d35c80f19d5e5f9b85e70dd4839adafa69b4c4ea5fe92a76b17 SHA512 a6be6c6d1acb4b1bc080f3cb46335f57059d02092d8f18eb951cf4db6b1c1b8b8affcb01f15186fe570f60999c3f5bd380e6e9c346a9dc997c5a6a44465c356f WHIRLPOOL 8fe95a37e276ece898707c4cb4824b07ea45497455f09aa0bb4e0562c54bc2366f8bdf87960da79a249e31da4698603d4f3ade3d1050125ef4928eff166d95a6
+DIST man-pages-3.60.tar.xz 1199996 SHA256 6695fc40f827abbededf475a1f1ca147ebef570818bc60f95f18869f99fc9c40 SHA512 7924c43846e476a7cbabff033922f6d2f83876e977eee9ab7af2cda972c713ab59a4f5f904f09e4af10f0b24bc6c312d85dff375182bbebe8fe5aaed6aae58ef WHIRLPOOL e565fbd20a6305438757320b05fac57236b47f399fd17ae46f2ca00f6c5d467f5af2d4a948501376edccd922ecb9676cddcc97a6be4614ab46c4f3136af91063
 DIST man-pages-gentoo-2.tar.bz2 5141 SHA256 b7d9423c2069e587deb7671273d4a1ffed7d31b9f95a689b128a759d636762f0 SHA512 6e6524b8ad6f1b8c9b147665ee32af49e05603dac61d433acd6b4f1164adef27cd542898f272b07d8659725013dac59c7f34a858968cc054a4785c945e14a770 WHIRLPOOL dcacb319a54ccd2a965786c816684de286581dee6f7b3f8ba4c97cc368e2e50abc92aad403dbdb7b0c15764accb06cd562046bcf14229ad12be242bb2bc7f651
diff --git a/sys-apps/man-pages/man-pages-3.53.ebuild b/sys-apps/man-pages/man-pages-3.53.ebuild
deleted file mode 100644
index 6fd955e545ef..000000000000
--- a/sys-apps/man-pages/man-pages-3.53.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/man-pages/man-pages-3.53.ebuild,v 1.3 2013/11/06 07:36:01 pinkbyte Exp $
-
-EAPI=3
-
-GENTOO_PATCH=2
-
-DESCRIPTION="A somewhat comprehensive collection of Linux man pages"
-HOMEPAGE="http://www.kernel.org/doc/man-pages/"
-SRC_URI="mirror://kernel/linux/docs/man-pages/Archive/${P}.tar.xz
-	mirror://kernel/linux/docs/man-pages/${P}.tar.xz
-	http://man7.org/linux/man-pages/download/${P}.tar.xz
-	mirror://gentoo/man-pages-gentoo-${GENTOO_PATCH}.tar.bz2
-	http://dev.gentoo.org/~cardoe/files/man-pages-gentoo-${GENTOO_PATCH}.tar.bz2"
-
-LICENSE="man-pages GPL-2+ BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux"
-IUSE_LINGUAS=" da de fr it ja nl pl ro ru zh_CN"
-IUSE="nls ${IUSE_LINGUAS// / linguas_}"
-RESTRICT="binchecks"
-
-RDEPEND="virtual/man
-	!<dev-libs/libaio-0.3.109-r2" #341953
-PDEPEND="nls? (
-	linguas_da? ( app-i18n/man-pages-da )
-	linguas_de? ( app-i18n/man-pages-de )
-	linguas_fr? ( app-i18n/man-pages-fr )
-	linguas_it? ( app-i18n/man-pages-it )
-	linguas_ja? ( app-i18n/man-pages-ja )
-	linguas_nl? ( app-i18n/man-pages-nl )
-	linguas_pl? ( app-i18n/man-pages-pl )
-	linguas_ro? ( app-i18n/man-pages-ro )
-	linguas_ru? ( app-i18n/man-pages-ru )
-	linguas_zh_CN? ( app-i18n/man-pages-zh_CN )
-	)
-	sys-apps/man-pages-posix"
-
-src_configure() { :; }
-
-src_compile() { :; }
-
-src_install() {
-	emake install prefix="${EPREFIX}/usr" DESTDIR="${D}" || die
-	dodoc man-pages-*.Announce README Changes*
-
-	# Override with Gentoo specific or additional Gentoo pages
-	cd "${WORKDIR}"/man-pages-gentoo
-	doman */* || die
-	dodoc README.Gentoo
-}
diff --git a/sys-apps/man-pages/man-pages-3.55.ebuild b/sys-apps/man-pages/man-pages-3.60.ebuild
similarity index 88%
rename from sys-apps/man-pages/man-pages-3.55.ebuild
rename to sys-apps/man-pages/man-pages-3.60.ebuild
index b91f825bd1ac..97f0969aebae 100644
--- a/sys-apps/man-pages/man-pages-3.55.ebuild
+++ b/sys-apps/man-pages/man-pages-3.60.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-apps/man-pages/man-pages-3.55.ebuild,v 1.3 2014/01/18 05:07:01 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/man-pages/man-pages-3.60.ebuild,v 1.1 2014/02/18 14:56:01 polynomial-c Exp $
 
 EAPI=3
 
@@ -16,7 +16,7 @@ SRC_URI="mirror://kernel/linux/docs/man-pages/Archive/${P}.tar.xz
 
 LICENSE="man-pages GPL-2+ BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux"
 IUSE_LINGUAS=" da de fr it ja nl pl ro ru zh_CN"
 IUSE="nls ${IUSE_LINGUAS// / linguas_}"
 RESTRICT="binchecks"
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index 3ec7ff1da662..83dfafcec77e 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -64,6 +64,8 @@ DIST genpatches-3.13-6.experimental.tar.xz 51008 SHA256 9f15466cbb76f7c9d2b13df5
 DIST genpatches-3.13-6.extras.tar.xz 18168 SHA256 a00603ac5ca73f37261c2dca4f8c396a9d2b988fd326c793d9016fe8355e790a SHA512 25fd010838a4de56a513dbb21cb1ffd3c99566cdfd55011f1fe25811d1b2c882c62be6d6904115f1f1aa894bc917a61fdf5009c119e2a2614d39d3c258382453 WHIRLPOOL 7d245c855d6ac0b501317d33924fdd8c92ac2dd5b13ea0377fd169e01df27442413dd4e648d7f71e96a1e071f5788553dfcc7db3f12ea9ecf5efbbd3614eaaeb
 DIST genpatches-3.2-32.base.tar.xz 1171648 SHA256 5952ac0d066becd898c4b0c67ed27aecdc58eb644516970c60d9cb11395c0270 SHA512 7462547c47c6dc6edb87613a159941d8c53f0b5fc32856200f2920867a5c3491897f109d60ef7995f7faeb9895d5ccacd9a9cca322815ec95332183124bb9a1d WHIRLPOOL 98a8ef8991b58abec60791bd150fa33a7f06f505e87b247e88cf03bda119d662424e2d10037054e581507c6f574d1e39b4ce5061407947f690b907a7e5c7a6f5
 DIST genpatches-3.2-32.extras.tar.xz 17908 SHA256 6a8cd7efb310ec18da7ec4e67385b5ea5ce0b062c05f39661867db2f53d8ceae SHA512 5ca8b54d792ba1c06ed42187d89aab192b879d606583c0a5f5b947bb1d70773e73c41e0a442a07d03241ee997758f2e6ebc18d5aa11609a1ad7f9d5f41b92211 WHIRLPOOL 023f67b7edabdb6359ba5397bc505ebdae9fcdc91e15c482b0210be937acc37bf8602367063187aab90655b95e03a302cb153fdc464153140841a01c01b57cdb
+DIST genpatches-3.2-33.base.tar.xz 1189004 SHA256 d52a458fc10862d47e606441329e6987d182b69cb705e99a8bd39684e0032c26 SHA512 fe9ad5818c8845623a6bce68fac4c172ea15924d5969cdda12f496bf1040744a12b833f807fb89170a2001569e8d87933e043029d20f18e3c48c793c61e6230b WHIRLPOOL 8fd55302cca2c12936ef0c47ce8a0218b14427662d52e2e952976f6da836625ec99d6888d8da5ed0fb1c8134b25b758bb68f23bdfe8d727f16fa20f84fcb13b3
+DIST genpatches-3.2-33.extras.tar.xz 17896 SHA256 98143e6dc6f706e85dca6a9ca6f0c4316a5c3f97ca00622b751fa2ec96fa87d1 SHA512 d96b8b45cd1eded1e96f2b8a0bbc2e24fc32cbb120c70f1e8093e680a9ae906775b2bff2b66a1160158f3ce36cc655bc68e947de998a48df2f2ae1f6e5f9da66 WHIRLPOOL f82d41ff42c520e835a02f9edb5cda23a1e3829c2ddc25da67aa547e8163ee6f0f1b365c9603afcc8e347def472b73b879e178e62239248b2b1267848503c2b4
 DIST genpatches-3.4-56.base.tar.xz 910908 SHA256 f7ecd58ab309effc02f74e68af60dfc53689d71a08aa155ef8679e5beb5b3718 SHA512 ecf48a4a7c7c13f3c84389b467f07913ef7a779f44ac16074e3bc147515a555c90d8f51a620a207527e71aa25859e1b123ad5171d1da361d13f2f0840b517569 WHIRLPOOL 03c5cfb2bb78517c15d59f3d1ff79dcac32f5d2c447e360312f3c099a2f70fbc080157e6dd6f792fb9d0dd163d91ecac184f69c3807f3ead000e98db74dd38fa
 DIST genpatches-3.4-56.extras.tar.xz 18156 SHA256 9e1b05a44b97a13c0fea1df6533a68b6163cce1bf50fa39caee2691288b871ff SHA512 cd9ec0450ae9c87407fbea1440b4281afb0b3842d3a14cfb15058e7f179efc60003ed7f5d824fca07fa8cafacf35a507340b089b75235f2c1823ff11ebb4de96 WHIRLPOOL e3b42b8205a4d528b200a0d41b601e8c1b8310c1164f5d04f302ef804179418b0fc76fa0432a45637791818aedf39e6b947e6c9d2abae04f1f1d15f0fc7900f4
 DIST genpatches-3.4-57.base.tar.xz 916360 SHA256 15540ece8415f90a5798dc6bdd1f41429b9311012b8128565af12f8957a830da SHA512 98e253880c147c7fe3c1ea7d0ddffe38ce5ec804981badeb53a5d55d50bbf012ba2e5738874884420fbc9310c356c65e71392be7e5488d8c416ce14e45701b43 WHIRLPOOL 02f14fbfca699d8d6c601dc17a1e5eca4e26902d6a8c72acc15091a6ce86d9e9bde0403979df9cd2f69895c428ff89fc6161b2f4f77ade4438cf33fa31a22f69
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-3.2.55.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-3.2.55.ebuild
new file mode 100644
index 000000000000..24641760d9e0
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-3.2.55.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-3.2.55.ebuild,v 1.1 2014/02/18 22:41:26 mpagano Exp $
+
+EAPI="5"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras"
+K_GENPATCHES_VER="33"
+K_DEBLOB_AVAILABLE="1"
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches"
+IUSE="deblob"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/hardened-sources/Manifest b/sys-kernel/hardened-sources/Manifest
index 4f041fd8f5de..b68e773b4411 100644
--- a/sys-kernel/hardened-sources/Manifest
+++ b/sys-kernel/hardened-sources/Manifest
@@ -1,11 +1,13 @@
 DIST deblob-2.6.32 84094 SHA256 de625f0bd221c9c38d4453f1b709622f222d86a0ae9350d2b7b0e17795e6de6d SHA512 81263cf9f0e8232f9d56966082514f58c147d12cce0bce384f6830a450006006274f3009dd11c38638cd083d0efc14dc2edd1b79ca22a18835eeee4e9ea15eab WHIRLPOOL c53c3f114e7536426c7f303c8d67ee5d26929ca59b25b5fdcf18b2748acc4699cda42f63908db6f78ab338301da8cad3b3ecbab45ee5c1f15679d4e44042dec4
 DIST deblob-3.10 117299 SHA256 d48cad04fab6a802b3a3e34955c8e35b539c2441f9a62522ec5a132c3a5ae684 SHA512 7b30f0f97ed97bf6b096d4a321b4b1e62f4b48f07972f2511870c3eaaf4f3877b0c6af2f30f6b985edf9c9c79267d40448b504c59016acfe06374630d1fdcba9 WHIRLPOOL 03a5963367cc6cb4f87e3d315ab61a8b3cb1fe577b20d7e2fb6ad83464075b3ed8176f543bb4c3b4e607d78cd55ef940f446bb75be09eb7496321930413ce2b9
 DIST deblob-3.11 119401 SHA256 78bf8169e466a2082c6bedca0431bdbe15a55f4ba96c16a631587f23e0cdef25 SHA512 d6f87cf2d9c0a7f59a52c5a890015e050ba684d34f9e81ff8386ab57247718d0b10b6cd8a68ce3dd25711936b660b7cf512cacf31a3467b9b70a3e3e8433e142 WHIRLPOOL 026a2ff10994be722b08b1638366be8311c685c69214db9449e605477f81b817a8c2ca1e4d8617d61f7f66a6f287c74f68a679bc81ff3364d0245eb3ea84fe36
+DIST deblob-3.12 120320 SHA256 1d767acd3f461bcaa7ebef744dce1ca3eefde1cd41fde4c69a449e2470ab8c0e SHA512 61073cb763e3e0c21a84c0ee888087fbbf37b667ce0efbbc6c2ebc46ccae8460553511e347cf23d3c3603eec64df738ad4552a1b527453c7d795b8f90c4cf678 WHIRLPOOL c64cc566944ac241149a2a517da069185830be5b8ee25168b2b6b942bcf24fe3f2c0fe487b51a5b7e73e2910af2cabd7167cd1497ab7272c865d1eb3e68e4efe
 DIST deblob-3.13 122060 SHA256 8fc8f5242cd58f8560d1caecdc6ab786d6470660280f910a8b70bc47fae5eabb SHA512 90c329c7b2e49ca8e51b3ccd5ede999f01a70ce1b227f958f34306d32414787192d51481a22ae831c30179e2ef83bdf4eb5c356b49864ab8d7b5a9ed6baed294 WHIRLPOOL 56a7dc599ece173ace43a633ddf2d1fc4876b392e8cd31dfe840a6109eebed18a8a9c33c7e191ea9cf0b605818a59312c76787c77aa479b6c84feb23083c0fb4
 DIST deblob-3.2 107602 SHA256 5db88405af6d51a77d84354afc3b2bdf673b1a5dcff37bb8db4ccbd12d91db20 SHA512 f34b7128adf716c908cbbbfefe72149fcd88b727d27edab43be65d4e6a55112b6d937d5c2bed86454d58781f3766ba4cc6db668cb6174a6039d276499da37cb4 WHIRLPOOL 0922457f7ca413c9d8115182964a7c051560799c4724452f81cb4c0383cf62c45b0364d6e639bd9d2b9000411d8773cabd2e8af99e8b0dc7f7bdc886db432d6d
 DIST deblob-check-2.6.32 247608 SHA256 da1aecdf3ab7f1207b90642d303e52262ccc2ed9e49739b729512b88950d17f3 SHA512 2ba5c7615164a96847afc40af9c9883dc39d8be633e8f07d0d4a6c16b1a22117faf68d5aa40c5aee843dc687a635e2195a4be3bfa40f87dc2b89554d869616b6 WHIRLPOOL ea5dcfd0ee58f1e9ff8dc16229401d37c0271fcae9d065ec648828088cd8d0b8eb8a80efc772d1ed0f075017485609ebf19c01156586728dd335af2dee2bbeff
 DIST deblob-check-3.10 565672 SHA256 748df2cf5c1f012f9942948827e57b12bb05c569cae220416b3c0339520d9855 SHA512 341ea8a755c4f1f42ddbc4e7dfe8d786e8b29f497bee3fd72154c8c1c0bcadcb9efff04f2663090bd8741e5b5baafed26a62b9d16c31f3b31665cd3cd3e779d5 WHIRLPOOL 7e6c8eefa9b44e7d50011a9390baf7999533b4016122992c0ac0722cce05dbb8e4b7e96f1f05e9bfdd2ce3e4c08f0e06c8955b68ed8c044ff75f3a314a405824
 DIST deblob-check-3.11 589384 SHA256 6931c59ed9f03e2f11038997e430e9c04d51fe2d00dc6f8a134d92e1eba72fdb SHA512 315c50141967adb7952bc83a374f94d9b70a1027d6cd4a4b76d4fa4108ea7159cedb599e65ba531af1c1ef869e203aa1a03225e210cddd996120977d4886a25a WHIRLPOOL c079786436dc55773de9f5fc1bccd265049e58b74618fba534cd5964d881c107ecb705de68e3a7f02d1e285ebad9b2d7e985a4b6603fa3460b503c6db1ff1ad2
+DIST deblob-check-3.12 601108 SHA256 e6c07b4220f86007ea31f9ed5d01023253296ddaa0710e65e08f231eccf6085a SHA512 fb293fb5093c410b319203cf0a65457a3ef28430ad6257b08a6e3eb77011d79708c51121c0a8776f55124259719782b4ac9b4c54155c13bb05a2679541816887 WHIRLPOOL e056b4edccd36911fe415cd1780bb484875a16237dce89316144c8ee07df3253bc19abdbee2e51ab3dd9248682470e80409819584c188e22601026e8df222754
 DIST deblob-check-3.13 612002 SHA256 55a9264ad886259c9b20f1365245a993482a0f593d01e1824eddb748bc57e271 SHA512 64d93694acc9dd1046e967b0d0f285068cc248815a3c84c58aa4cb3b6bbc3fdcda4bce3b119b44f522a9cb6cfc10a0992cb5d19f880c7d6055c5c0ed3201905c WHIRLPOOL 1b196a945f5f07c78eff5e8742472b0d8ff570c7e11e2cd3d4d954f8fbd260b27b2779f2d794a30992e4d492b873d5f73163501a0c04372e0167e98640d587c5
 DIST deblob-check-3.2 423268 SHA256 9e67dd0885aa8ef356dbc15d487c8dea5a54f74c5b03a5d7946b65ee43f12638 SHA512 3abb9968ef4750fda90e4e2283981fd4691b7f9854244413b31d17bb60382a6d809fec929d8d3f9b52397dd9f9fa26783f4c3a25f3f4115b76ed585ea68e9916 WHIRLPOOL 891c3f809af470d680ae896c843c09612fb5124f2805e03d67b28ec4353bff0bc346ae9f680d900f0f63e681be86a0195f9baab7dcf3b5accfda739b106766fa
 DIST genpatches-2.6.32-48.base.tar.xz 907780 SHA256 aafa99cbd0ff38c9fccd3ce6780b2f3c261e3e66415dc8b14870959b94498c73 SHA512 eebadf08d5a01165d7e57e0d5adc70de33854b5b57c69edba5c0e6672288479da33f57c89a0fe838067aa5ca3663c47b22c98c34929ef66c5740e945af5c0317 WHIRLPOOL 3906c3e0c9a7a66c4cc710d506ec56d97fc6ac878c2aa22b1a2ad3ce10d3aae8cfbd54d9f78fa78b3ce41fdf291b8ee955692e4759758f2edac5e24e9f342c41
@@ -13,6 +15,7 @@ DIST genpatches-2.6.32-48.extras.tar.xz 24436 SHA256 87b9ba845a35f73708836292172
 DIST genpatches-3.10-3.base.tar.xz 52604 SHA256 56b05e27e86960023523c06e9c8f9fbd52285d2ef52cef6028bfbf10802ae094 SHA512 7bff65187302839e1407f72dc5d61652e362fb824126db9653a2a2db98d512e96b9675d99a400caaf500458d8a7b2b8050345ddfdf574653d3c1315fbf066c80 WHIRLPOOL 6c9ff586694fc60206e2f84ac97017c954dce45688528482bf329b2f3d6eeb953c6cc27bfad619ea94270201a2d80b1eea9ad729220b651ddc6b4468819bfa97
 DIST genpatches-3.11-10.base.tar.xz 164896 SHA256 02cea38d624fb6c830af164fe709e22c92cdfbfac2c752af4ff145681f5ae0ac SHA512 c80625740d5670ee511b90b7a2b29881b7b5f14b5276e0be7d7e307404788355cde252c46440c2c60fe117c1bb43bc24ba3323beaaf3aa415d44aabd194b52ef WHIRLPOOL 67f3825dd6a7c1b35d3a198c595646acb4f150904599ee8aab9999a92bebcb18ddd02f14fd01eac423518a94bdfc1fb61c97d1cc616ab96d326f622fe99a2bb2
 DIST genpatches-3.11-4.base.tar.xz 11644 SHA256 5f731b81d81686837d65baadabb9c415c78a0d0356cc78d9931d4cec816fd5b6 SHA512 11f92ce478277c7e3beb9a6980d8eb2778847d81c7bc992c223a2fcf932b392b9716446c7947b3842565a813b5f3cfcf16125067f7808518f746f87a553f99e8 WHIRLPOOL 1d2742e512a54d45e22bb1f0761fb7aecd8de14799d6bb5115c2c3d748f70ab7286844f89304eb0b369d07543f0964ba262dc144ed57f3a108418718093eb2a7
+DIST genpatches-3.12-9.base.tar.xz 255288 SHA256 cb298100c98f0532113e798026da02cad6436c4bdb6391d142cf35655fa90e49 SHA512 1bc58569399d98d4a0bf38fad07fe56eed52c00f69afc4cde1ad46144be6719855e8dca0148fa4b675525ff69fb79bf06c93f494a2cf7c8dd80898bab6bccab6 WHIRLPOOL 6f9c0a11209b11a182f8a21d2fc6b29ff379f9aea4828609a1ec5f56262fb594b1049ab414de631be8414d233866ba7aee873e36b2d42a33e4d7b5d3a187f119
 DIST genpatches-3.13-5.base.tar.xz 60572 SHA256 a1be8e79aee0e85dc1c36e863031bfe6e9836ecfdecbd274045e65af09f1cf1d SHA512 5c402a3870e106d0c14732c10b0eec5bf671d1057241a3cd7449620f875f5362ef1747b5748bcd301429e5cbd8995c9438c8e3696f5d3599198c3ebec33a4ad0 WHIRLPOOL 69eb9fd79c4b4d3ba7718582585457045abe12a86f93263706acc385357b139597ea1ada1258e64ccaffc8325e5fe7f91213240695f920ac01f8a1aa9989f1bc
 DIST genpatches-3.13-6.base.tar.xz 103192 SHA256 1794e009f81c8789e9a3040a1cb8ce93d40752d85a170281650ecd55df093264 SHA512 e53e1d0aece9c28afb52328e94fe2a1c9feb5c3148dfa47e865eddf3547cce7fb17a33e85e7d09c552d72cb164a26c059fd48ffd893f5cd224f1301f9bbc4af9 WHIRLPOOL c67446c81d05969a0ccaca85c58b118cae413c57059e73b36b89e82712cb0df06e9de59b2075678b6a195179ee5303af49ce416740188f8ab958ae23402d5d02
 DIST genpatches-3.2-16.base.tar.xz 410332 SHA256 d3ad97b119c5b8cfd8e34f1cf118dc7d5bbe61fe908a5627f8ab6365517d7190 SHA512 6c917efbdd26dada3e68241c4d55833968e8ee7044ea7fa2edeffdd4d7eb0edac157057abb75da09ac6d2b5368d228ecd1c2ac6006a9d45b91dbb264eae33625 WHIRLPOOL 155a5b3297ec53a6bdb76e20c8c89d4f4c35ed2bb47e20281ce305bf9edd413e4d89168e250a699ace0561c151ef2f484c05e59013dbd971d43184c5f072a71a
@@ -22,6 +25,7 @@ DIST hardened-patches-2.6.32-194.extras.tar.bz2 990161 SHA256 595ab80548a88d0d16
 DIST hardened-patches-3.10.1-2.extras.tar.bz2 722434 SHA256 16c35d0b79f667833d6439760c4e494409ed171d8893dffcdc1515f504663682 SHA512 e33fe8d1ce0a1eb90a632054c4f5530f57c69a6c4b7cc2557e45293d7732fd49c9bcae69af9a67e26686255384cc1eeb463254e015066de4518c2421b59bf47d WHIRLPOOL 1b0e3c70a1755b20f9bedfc9f7e9e3788f1be5a5462ef487bbe54b562f3515b632ca40ccc05f7393445c7f4a83e067204a43853479b4ec7e36830975877d2ad5
 DIST hardened-patches-3.11.2-1.extras.tar.bz2 805489 SHA256 ad499bf570c9e078ee13a9dedfd95f0ba89acf8734833155974063e7f39f7df0 SHA512 53bf9b5218251914bd22856cfba4b40495b1622773b33e6b76d9c3e65bc6598bd57db21abc99f246161dd0ba92e15b5603657bdb3e4dac8fb590743acd8240ed WHIRLPOOL 988041bd4aa0f1608a97755fa5996c7f99323d0af26810a8d67c28e986d7b22a1634fd1aefad8f323b82ee66ea9cbcf2b48a72eafe80b728d1d39eda576f9c0d
 DIST hardened-patches-3.11.7-2.extras.tar.bz2 767238 SHA256 908678fe53c768ef564b4c47e00f0e22a7c7c16cc1ea0d931662d19fe6ca7cd8 SHA512 703f8c57931eeced09d3cf77525252b69cb369d8da40c16b8d4521a1b9657ce1075cc4138c5d1678e051575928fab292f59cf2b9638dc538f7d957e4a64dd418 WHIRLPOOL 315b1520631b06ba6ce6683fdbf6a7a3689f278844e2df37879069f2c1d0680c111a6783a4122d96a2d7d4824cdba4e9cf68dce44a1ea5adb1765b55fc67dd7a
+DIST hardened-patches-3.12.8-2.extras.tar.bz2 814107 SHA256 bff0692337f216fd3b08a43c34e1f4103db2b4fe4dee45bbc79f820b8b1bfa98 SHA512 3263431abea31d863163bd973b6faf7f467523d936d0cb0cd8ad1ff2e9c9d16aa9dd5d7dcb9b6cca8563e8fb6f1c979c6d8f7f0510a29205dc78bf13f85155df WHIRLPOOL bad75b13263b9e9de4553d75e8fe593d8e5edc5b9a04c05a6b03df0add3fe918d36e12f4b8cfa9baa5249a43deda12db96f168e4af0726696f71315f90aed9e7
 DIST hardened-patches-3.13.2-3.extras.tar.bz2 795752 SHA256 62a7e320788b209172aa1eb044e828fa7e31a36e258f330412ceba37af2ec3a1 SHA512 a60391a3f82121641ffc559233c096a6c947c1d3fe895df23d97aae2b30926e4e0b2a9a9554b78af8eb1c0f61084588fe3e0cfb5b1890eaeca5ae92577fe0ba2 WHIRLPOOL 93ee435240c1c907325029d94e818818e22bd301f1b4bd31f53e9b7156ff25513be276c3370ba1e2c8296f8655488d2ed41c4876da755b4fa9d27181bfc3aff9
 DIST hardened-patches-3.13.2-4.extras.tar.bz2 795506 SHA256 ecac830959d8a1f5da58477b244d8075983a514eb3c93cf94eff6889967ab7a7 SHA512 87424813f794b2401fdc9b0afa5d1b992eea133674997116747dee98cb8cf6b990debd7cfc6676aee8efcc8c95974e97c2b27362e597a875a68b3b41bce98335 WHIRLPOOL 4f614af739bd8de553a900bb942b6d0430f9d3826ff01d47257600e348c300d77f1141814048ad5bf07f2b5c161d91ddff2a6a0bab9b26b764eb85698fe8292c
 DIST hardened-patches-3.13.3-1.extras.tar.bz2 795842 SHA256 ccd24d1fb119c22caae2f0253fa34160e9e488781dcf96d4bf2c14d61765e3d0 SHA512 edb8dc078925bd50a6f713dba0ef691785ed3197c9cf8fe6f9966fc8c89a463b235fac0602f5accf36b0371cdf5c6c3ebbf27a9e0a416492cf8824c996b008f6 WHIRLPOOL b50aa2e2072295482d09338ee6effeb57efc72a7336dccb34057af7e9d8bf47327a9a0f843437987a58ec8566b94ddfa6d5a525d0daabcf70dac4aa7bc2f5de7
@@ -33,5 +37,6 @@ DIST hardened-patches-3.2.55-1.extras.tar.bz2 1788155 SHA256 4a8197b13c1a607d2c6
 DIST linux-2.6.32.tar.xz 52620720 SHA256 723106c298c5ba8733bb51ecc106b05e332a18490edc5f61cc6e57dbb36dcc46 SHA512 f8570daf2806eb191fce54cc7358577b0571bb295a75bd86db630d6136b328ae48e4732554b2d1886c64b0a0018bf0b9105dcface978a5005d1b77789aa40312 WHIRLPOOL bfcb4b186f7c4b60e69674a85d20a8e92b5efd05941b550401ef446cc6b20c9ed197f920d1cd9250c0e518c05308b9225f7ababe41cdfc83570412117b2ee555
 DIST linux-3.10.tar.xz 73175088 SHA256 df27fa92d27a9c410bfe6c4a89f141638500d7eadcca5cce578954efc2ad3544 SHA512 5fb109fcbd59bf3dffc911b853894f0a84afa75151368f783a1252c5ff60c7a1504de216c0012be446df983e2dea400ad8eeed3ce04f24dc61d0ef76c174dc35 WHIRLPOOL e7c0ccc2231e430b831218fc66f1940d095d2d5447d391329c6a7373d4a1d16708f64778b32e4847802ee2dae4fcf7cb67a1238fd4eb204fd0c4bce2d8134053
 DIST linux-3.11.tar.xz 75082460 SHA256 803ec8f0ad4b2ddedcb0332a590cd2b5e10dfc57c3b1c95bc9c46af81d51d7f9 SHA512 b3680d3a45a7308383cf8634a7f1908e94f6e1c6d1cb587332a9418a95fb93bd3c73ab70c6976c7330508d7c8c6b0f43c2a9a2efde5fe1f76e9bfffb1de5686c WHIRLPOOL 96c9c27ffe155fe2c1760b53d87ef981943d58ab2dcf1ed6bd2c1e762e18bceec81d85d49c523947ec6fe52e41f25c4a86310347705c8d4b80a1748cec5b90d3
+DIST linux-3.12.tar.xz 76384600 SHA256 2e120ec7fde19fa51dc6b6cc11c81860a0775defcad5a5bf910ed9a50e845a02 SHA512 4ba5797e0772726d05c9f2eee66dc6dc2a5033c749ef44764c805a83da739ed5d0c6443b76785e38fe1ef74cc7ade787e48144faed0cfcb6f124f05248c700ff WHIRLPOOL a40195f6b53ba3440cf90a44495f6a59670f750851d1518e2bdfe3b949f0e898d1df5d37e271c31c555087026ddb6cc2c9109b22b9639e3222735e6f650a1417
 DIST linux-3.13.tar.xz 77187032 SHA256 4d5e5eee5f276424c32e9591f1b6c971baedc7b49f28ce03d1f48b1e5d6226a2 SHA512 1ba223bb4b885d691a67196d86a8aaf7b4a1c351bf2a762f50f1b0c32da00dd0c28895872a66b49e8d244498d996876609268e64861d28ac4048886ef9f79b87 WHIRLPOOL 2992257a17e85b3eb16fcaf21678fa6dbf31f80c2099fd1ad0ff9852ac1d16122ac8e2c0b46421d8895d4368253a724e439cd625307ee7af7bd1e50cb2c9b62a
 DIST linux-3.2.tar.xz 65065516 SHA256 dd96ed02b53fb5d57762e4b1f573460909de472ca588f81ec6660e4a172e7ba7 SHA512 77e9a52d78d6c8e951df1e166023eebe5defc5ef3c45d3ac84b613137b3c2e55cee5693d828ebd06c5034bd89ea2a5f862f55824f2b7839c9ad7212c81e3ecb0 WHIRLPOOL 7cc68baac4441740e2171fbbc4195ee6c0351de099aadaee8cb3487f6d1f8b7e1d3144ee54ba38dbd24d6be431a1ea3b921ffce82ff84df21a98da7bc61c1d17
diff --git a/sys-kernel/hardened-sources/hardened-sources-3.12.8-r1.ebuild b/sys-kernel/hardened-sources/hardened-sources-3.12.8-r1.ebuild
new file mode 100644
index 000000000000..0bb1a4425734
--- /dev/null
+++ b/sys-kernel/hardened-sources/hardened-sources-3.12.8-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/hardened-sources-3.12.8-r1.ebuild,v 1.3 2014/02/18 14:15:06 blueness Exp $
+
+EAPI="5"
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base"
+K_GENPATCHES_VER="9"
+K_DEBLOB_AVAILABLE="1"
+
+inherit kernel-2
+detect_version
+
+HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-2"
+HGPV_URI="http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-${HGPV}.extras.tar.bz2"
+SRC_URI="${KERNEL_URI} ${HGPV_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+UNIPATCH_LIST="${DISTDIR}/hardened-patches-${HGPV}.extras.tar.bz2"
+UNIPATCH_EXCLUDE="
+	1500_XATTR_USER_PREFIX.patch
+	2900_dev-root-proc-mount-fix.patch"
+
+DESCRIPTION="Hardened kernel sources (kernel series ${KV_MAJOR}.${KV_MINOR})"
+HOMEPAGE="http://www.gentoo.org/proj/en/hardened/"
+IUSE="deblob"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND=">=sys-devel/gcc-4.5"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+
+	local GRADM_COMPAT="sys-apps/gradm-3.0*"
+
+	ewarn
+	ewarn "Users of grsecurity's RBAC system must ensure they are using"
+	ewarn "${GRADM_COMPAT}, which is compatible with ${PF}."
+	ewarn "It is strongly recommended that the following command is issued"
+	ewarn "prior to booting a ${PF} kernel for the first time:"
+	ewarn
+	ewarn "emerge -na =${GRADM_COMPAT}"
+	ewarn
+}
diff --git a/sys-kernel/zen-sources/metadata.xml b/sys-kernel/zen-sources/metadata.xml
index 507bf6a4385a..df5ec0287618 100644
--- a/sys-kernel/zen-sources/metadata.xml
+++ b/sys-kernel/zen-sources/metadata.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+<herd>proxy-maintainers</herd>
 <maintainer>
-	<email>hwoarang@gentoo.org</email>
-	<name>Markos Chandras</name>
+	<email>vicegentoo@gmail.com</email>
+	<name>Daniel Weiss</name>
+	<description>Maintainer. Assign bugs to him</description>
 </maintainer>
 <upstream>
 	<remote-id type="cpe">cpe:/o:linux:linux_kernel</remote-id>
diff --git a/sys-kernel/zen-sources/zen-sources-3.13.9999.ebuild b/sys-kernel/zen-sources/zen-sources-3.13.9999.ebuild
new file mode 100644
index 000000000000..879f5ca5ef8a
--- /dev/null
+++ b/sys-kernel/zen-sources/zen-sources-3.13.9999.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/zen-sources/zen-sources-3.13.9999.ebuild,v 1.1 2014/02/18 21:17:50 hwoarang Exp $
+
+EAPI="5"
+
+K_PREPATCHED="yes"
+UNIPATCH_STRICTORDER="yes"
+K_SECURITY_UNSUPPORTED="1"
+K_DEBLOB_AVAILABLE=0
+CKV="${PV/99/}"
+
+ETYPE="sources"
+
+EGIT_BRANCH="${PV/.9999/}/master"
+EGIT_REPO_URI="git://github.com/damentz/zen-kernel.git
+	https://github.com/damentz/zen-kernel.git"
+
+inherit kernel-2 git-2
+detect_version
+
+K_NOSETEXTRAVERSION="don't_set_it"
+DESCRIPTION="The Zen Kernel Live Sources"
+HOMEPAGE="http://zen-kernel.org"
+
+IUSE=""
+
+KEYWORDS=""
+
+K_EXTRAEINFO="For more info on zen-sources, and for how to report problems, see: \
+${HOMEPAGE}, also go to #zen-sources on freenode"
+
+pkg_setup(){
+	ewarn "Be carefull!! You are about to install live kernel sources."
+	ewarn "Git zen-sources are extremely unsupported, even from the upstream"
+	ewarn "developers. Use them at your own risk and don't bite us if your"
+	ewarn "system explodes"
+	kernel-2_pkg_setup
+}
diff --git a/sys-process/runit/Manifest b/sys-process/runit/Manifest
index fece9cd4d36f..2a7dab981dd1 100644
--- a/sys-process/runit/Manifest
+++ b/sys-process/runit/Manifest
@@ -1,3 +1,3 @@
-DIST runit-1.7.0.tar.gz 101315 RMD160 418db787290586a003481f938f4fa01934b9f063 SHA1 a49810a0c8c77dfec19f7282ac9c82b129554243 SHA256 f6bcd04bb300710ba4ade3b6c64298cb3e22090a8866455491ad086243453984
-DIST runit-2.0.0.tar.gz 104373 RMD160 fc55f22462b5b05d991558adf99468777789671a SHA1 a48d8579478fbcef37c347c3aa986f23fe528241 SHA256 2eb22e37946e479249a0b0e1fb0fb4651cebfd3d88aa116a39c07a0ec253fe28
-DIST runit-2.1.1.tar.gz 109661 RMD160 60f3d3b377bc9741ca96d2e953f86461368d6d29 SHA1 8eee39639dcb79ba251ca4ab2c7cde38059f09c2 SHA256 ffcf2d27b32f59ac14f2d4b0772a3eb80d9342685a2042b7fbbc472c07cf2a2c
+DIST runit-1.7.0.tar.gz 101315 SHA256 f6bcd04bb300710ba4ade3b6c64298cb3e22090a8866455491ad086243453984
+DIST runit-2.0.0.tar.gz 104373 SHA256 2eb22e37946e479249a0b0e1fb0fb4651cebfd3d88aa116a39c07a0ec253fe28
+DIST runit-2.1.1.tar.gz 109661 SHA256 ffcf2d27b32f59ac14f2d4b0772a3eb80d9342685a2042b7fbbc472c07cf2a2c
diff --git a/sys-process/runit/metadata.xml b/sys-process/runit/metadata.xml
index 96a2d586367d..9f0135754bf7 100644
--- a/sys-process/runit/metadata.xml
+++ b/sys-process/runit/metadata.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+<maintainer>
+<email>
+williamh@gentoo.org
+</email>
+</maintainer>
 <herd>base-system</herd>
 </pkgmetadata>
diff --git a/virtual/awk/awk-1.ebuild b/virtual/awk/awk-1.ebuild
index 11b454a95f1e..10507225e945 100644
--- a/virtual/awk/awk-1.ebuild
+++ b/virtual/awk/awk-1.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/virtual/awk/awk-1.ebuild,v 1.2 2014/01/18 02:58:37 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/awk/awk-1.ebuild,v 1.3 2014/02/18 20:55:12 ottxor Exp $
 
 DESCRIPTION="Virtual for awk implementation"
 HOMEPAGE=""
@@ -8,7 +8,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x86-macos"
 IUSE=""
 
 DEPEND=""
diff --git a/www-servers/apache/Manifest b/www-servers/apache/Manifest
index 8db20ceef13d..a9c23b00d4c1 100644
--- a/www-servers/apache/Manifest
+++ b/www-servers/apache/Manifest
@@ -1,5 +1,4 @@
 DIST gentoo-apache-2.2.23-20121012.tar.bz2 64135 SHA256 711a88f26c58b10b082f7ff411366cd768f9450101da050438a2f77abeab7333 SHA512 92a49f954b82d4427862f41977625a60641731cc25ab3efdd666be8db839038e7b1c2ef2f878d5efed243eaa63237e88ee4993cd25cca1dfbb0f56a6b2093d57 WHIRLPOOL 221d9c0cf999430afc11a8e48ae67019c7f31daca827a5db7615aca24859788743e5da00e4c99b7b7b375e58fafd6c148339e5671be939dbc30735031e12c49f
-DIST gentoo-apache-2.4.4-20130725.tar.bz2 24525 SHA256 c155dae39d87acc43ef34b385a2eaf2a45ff9c11d31b1c1791a74f9946335c39 SHA512 95489af418e3674b9d20dc988f4473d5d088d892bb2e6660a46a225667b0427c904d883a19fa3a847778fa00eb8ac0f27e1a5f76f0d65a28eaf0a39747353bbb WHIRLPOOL 1fd36df2db6814d01846cb40be9443aa963a0df9b45647859e901981872f64a8b4ba95aff9a14a8985feb74d51c551ab10c6734a63d5e9d001c53ab3c4383c42
 DIST gentoo-apache-2.4.4-20130801.tar.bz2 24536 SHA256 bae819de1ded2104a65dabc759e8a7bc6b442d2588ffb99e563be8482b3d87bf SHA512 97474e7d7f17d6537337b51385be4d093f9a15cf3a0a5f567ad883c4cc653d9bd3bed6e5f308e1bb9cf648be2c4a67a3099a95bd36b1be7c15ca8c512e01b2b0 WHIRLPOOL 4b75f5477b601f4159cb1b12c5f76ae4f678c83cef4441eba0e90a9be8222e4abd981a0d2205a54ddeebd8276567670c5ad827aa19f22f17196986bfd5c05c73
 DIST httpd-2.2.24.tar.bz2 5490439 SHA256 0453f5d2d7e3b1975a1c6a8a22b6d6ff768715a3b0a89b51e5f7b5851628fad7 SHA512 e1c24535bb0ae309c249c0a6fbd390064a929d960241e5e68737744f120a88b615bd5d9065fc2f749ee664ed96621c9373576e6ca32bd189d625fcd4dc1b8f01 WHIRLPOOL b24bf388e1be29cc52341d66af00318b3a60ad6db6b4df8c6cc0abf496c4e603d3b733529d21d3d1c37dad0008cacafa8078abdff6c25cb42b3874b6e176713e
 DIST httpd-2.2.25.tar.bz2 5524905 SHA256 4bcaf3524796a514b31aa5c64ce80b0cdb484bab5735416de29d00f6d50fa65a SHA512 4750e79bdab4ca28c602a808531dfc1482e86bf425d5cb3bcb42a9ccfbbfde5bfd05e66649ea741523c96de6582f5e12facbb1e7d67257bcf78a3ed7a66f80d9 WHIRLPOOL 7ce37be9b66de24cc7259c6e8a0696b496c893933b1c5dbdff5147c279fb644b5d5fc77ed02531b0f081f0c217f684d1bcd98bac26938b23c1d7a4ec085162f6
diff --git a/www-servers/apache/apache-2.2.26.ebuild b/www-servers/apache/apache-2.2.26.ebuild
index 99a55e1413da..c8481a7697a5 100644
--- a/www-servers/apache/apache-2.2.26.ebuild
+++ b/www-servers/apache/apache-2.2.26.ebuild
@@ -1,11 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.2.26.ebuild,v 1.3 2014/01/31 08:32:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.2.26.ebuild,v 1.4 2014/02/19 08:51:52 polynomial-c Exp $
 
 EAPI=5
 
-WANT_AUTOMAKE="1.11"
-
 # latest gentoo apache files
 GENTOO_PATCHSTAMP="20121012"
 GENTOO_DEVELOPER="patrick"
diff --git a/www-servers/apache/apache-2.4.6-r1.ebuild b/www-servers/apache/apache-2.4.6-r1.ebuild
deleted file mode 100644
index 5eb293a6ed07..000000000000
--- a/www-servers/apache/apache-2.4.6-r1.ebuild
+++ /dev/null
@@ -1,226 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.4.6-r1.ebuild,v 1.5 2014/01/31 08:32:28 vapier Exp $
-
-EAPI="2"
-
-# latest gentoo apache files
-GENTOO_PATCHSTAMP="20130725"
-GENTOO_DEVELOPER="kensington"
-GENTOO_PATCHNAME="gentoo-apache-2.4.4"
-
-# IUSE/USE_EXPAND magic
-IUSE_MPMS_FORK="itk peruser prefork"
-IUSE_MPMS_THREAD="event worker"
-
-# << obsolete modules:
-# authn_default authz_default mem_cache
-# mem_cache is replaced by cache_disk
-# ?? buggy modules
-# proxy_scgi: startup error: undefined symbol "ap_proxy_release_connection", no fix found
-# >> added modules for reason:
-# compat: compatibility with 2.2 access control
-# authz_host: new module for access control
-# authn_core: functionality provided by authn_alias in previous versions
-# authz_core: new module, provides core authorization capabilities
-# cache_disk: replacement for mem_cache
-# lbmethod_byrequests: Split off from mod_proxy_balancer in 2.3
-# lbmethod_bytraffic: Split off from mod_proxy_balancer in 2.3
-# lbmethod_bybusyness: Split off from mod_proxy_balancer in 2.3
-# lbmethod_heartbeat: Split off from mod_proxy_balancer in 2.3
-# slotmem_shm: Slot-based shared memory provider (for lbmethod_byrequests).
-# socache_shmcb: shared object cache provider. Default config with ssl needs it
-# unixd: fixes startup error: Invalid command 'User'
-IUSE_MODULES="access_compat actions alias asis auth_basic auth_digest authn_alias authn_anon
-authn_core authn_dbd authn_dbm authn_file authz_core authz_dbm
-authz_groupfile authz_host authz_owner authz_user autoindex cache cache_disk cern_meta
-charset_lite cgi cgid dav dav_fs dav_lock dbd deflate dir dumpio
-env expires ext_filter file_cache filter headers ident imagemap include info
-lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness lbmethod_heartbeat
-log_config log_forensic logio mime mime_magic negotiation proxy
-proxy_ajp proxy_balancer proxy_connect proxy_ftp proxy_http proxy_scgi proxy_fcgi
-rewrite ratelimit remoteip reqtimeout setenvif slotmem_shm speling socache_shmcb status substitute
-unique_id userdir usertrack unixd version vhost_alias"
-# The following are also in the source as of this version, but are not available
-# for user selection:
-# bucketeer case_filter case_filter_in echo http isapi optional_fn_export
-# optional_fn_import optional_hook_export optional_hook_import
-
-# inter-module dependencies
-# TODO: this may still be incomplete
-MODULE_DEPENDS="
-	dav_fs:dav
-	dav_lock:dav
-	deflate:filter
-	cache_disk:cache
-	ext_filter:filter
-	file_cache:cache
-	lbmethod_byrequests:proxy_balancer
-	lbmethod_byrequests:slotmem_shm
-	lbmethod_bytraffic:proxy_balancer
-	lbmethod_bybusyness:proxy_balancer
-	lbmethod_heartbeat:proxy_balancer
-	log_forensic:log_config
-	logio:log_config
-	cache_disk:cache
-	mime_magic:mime
-	proxy_ajp:proxy
-	proxy_balancer:proxy
-	proxy_connect:proxy
-	proxy_ftp:proxy
-	proxy_http:proxy
-	proxy_scgi:proxy
-	proxy_fcgi:proxy
-	substitute:filter
-"
-
-# module<->define mappings
-MODULE_DEFINES="
-	auth_digest:AUTH_DIGEST
-	authnz_ldap:AUTHNZ_LDAP
-	cache:CACHE
-	cache_disk:CACHE
-	dav:DAV
-	dav_fs:DAV
-	dav_lock:DAV
-	file_cache:CACHE
-	info:INFO
-	ldap:LDAP
-	proxy:PROXY
-	proxy_ajp:PROXY
-	proxy_balancer:PROXY
-	proxy_connect:PROXY
-	proxy_ftp:PROXY
-	proxy_http:PROXY
-	proxy_fcgi:PROXY
-	socache_shmcb:SSL
-	ssl:SSL
-	status:STATUS
-	suexec:SUEXEC
-	userdir:USERDIR
-"
-
-# critical modules for the default config
-MODULE_CRITICAL="
-	authn_core
-	authz_core
-	authz_host
-	dir
-	mime
-	unixd
-"
-# dependend criticals
-use ssl && MODULE_CRITICAL+=" socache_shmcb"
-use doc && MODULE_CRITICAL+=" alias negotiation setenvif"
-
-inherit eutils apache-2 systemd toolchain-funcs
-
-DESCRIPTION="The Apache Web Server."
-HOMEPAGE="http://httpd.apache.org/"
-
-# some helper scripts are Apache-1.1, thus both are here
-LICENSE="Apache-2.0 Apache-1.1"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE=""
-
-DEPEND="${DEPEND}
-	>=dev-libs/openssl-0.9.8m
-	apache2_modules_deflate? ( sys-libs/zlib )"
-
-# dependency on >=dev-libs/apr-1.4.5 for bug #368651
-RDEPEND="${RDEPEND}
-	>=dev-libs/apr-1.4.5
-	>=dev-libs/openssl-0.9.8m
-	apache2_modules_mime? ( app-misc/mime-types )"
-
-# init script fixup - should be rolled into next tarball #389965
-src_prepare() {
-	# the following patch can be removed once it is included in
-	# GENTOO_PATCHNAME="gentoo-apache-2.4.1" ...
-	if [ -f "${FILESDIR}/${GENTOO_PATCHNAME}-${GENTOO_DEVELOPER}-${GENTOO_PATCHSTAMP}-${PVR}.patch" ]; then
-		cd "${GENTOO_PATCHDIR}" || die "Failed to cd to ${GENTOO_PATCHDIR}"
-		epatch "${FILESDIR}/${GENTOO_PATCHNAME}-${GENTOO_DEVELOPER}-${GENTOO_PATCHSTAMP}-${PVR}.patch" \
-			|| die "epatch failed"
-		cd "${S}" || die "Failed to cd to ${S}"
-	fi
-	apache-2_src_prepare
-	pushd "${GENTOO_PATCHDIR}" &>/dev/null || die
-	epatch "${FILESDIR}"/gentoo-apache-2.2.23-initd_fixups.patch
-	popd &>/dev/null || die
-}
-
-src_configure() {
-	# Brain dead check.
-	tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
-
-	apache-2_src_configure
-}
-
-src_install() {
-	apache-2_src_install
-	for i in /usr/bin/{htdigest,logresolve,htpasswd,htdbm,ab,httxt2dbm}; do
-		rm "${D}"/$i || die "Failed to prune apache-tools bits"
-	done
-	for i in /usr/share/man/man8/{rotatelogs.8,htcacheclean.8}; do
-		rm "${D}"/$i || die "Failed to prune apache-tools bits"
-	done
-	for i in /usr/share/man/man1/{logresolve.1,htdbm.1,htdigest.1,htpasswd.1,dbmmanage.1,ab.1}; do
-		rm "${D}"/$i || die "Failed to prune apache-tools bits"
-	done
-	for i in /usr/sbin/{checkgid,fcgistarter,htcacheclean,rotatelogs}; do
-		rm "${D}/"$i || die "Failed to prune apache-tools bits"
-	done
-
-	# well, actually installing things makes them more installed, I guess?
-	cp "${S}"/support/apxs "${D}"/usr/sbin/apxs || die "Failed to install apxs"
-	chmod 0755 "${D}"/usr/sbin/apxs
-
-	# Note: wait for mod_systemd to be included in the next release,
-	# then apache2.4.service can be used and systemd support controlled
-	# through --enable-systemd
-	systemd_newunit "${FILESDIR}/apache2.2.service" "apache2.service"
-	systemd_dotmpfilesd "${FILESDIR}/apache.conf"
-	#insinto /etc/apache2/modules.d
-	#doins "${FILESDIR}/00_systemd.conf"
-}
-
-pkg_postinst()
-{
-	apache-2_pkg_postinst || die "apache-2_pkg_postinst failed"
-	# warnings that default config might not work out of the box
-	for mod in $MODULE_CRITICAL; do
-		if ! use "apache2_modules_${mod}"; then
-			echo
-			ewarn "Warning: Critical module not installed!"
-			ewarn "Modules 'authn_core', 'authz_core' and 'unixd'"
-			ewarn "are highly recomended but might not be in the base profile yet."
-			ewarn "Default config for ssl needs module 'socache_shmcb'."
-			ewarn "Enabling the following flags is highly recommended:"
-			for cmod in $MODULE_CRITICAL; do
-				use "apache2_modules_${cmod}" || \
-					ewarn "+ apache2_modules_${cmod}"
-			done
-			echo
-			break
-		fi
-	done
-	# warning for proxy_balancer and missing load balancing scheduler
-	if use apache2_modules_proxy_balancer; then
-		local lbset=
-		for mod in lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness lbmethod_heartbeat; do
-			if use "apache2_modules_${mod}"; then
-				lbset=1 && break
-			fi
-		done
-		if [ ! $lbset ]; then
-			echo
-			ewarn "Info: Missing load balancing scheduler algorithm module"
-			ewarn "(They were split off from proxy_balancer in 2.3)"
-			ewarn "In order to get the ability of load balancing, at least"
-			ewarn "one of these modules has to be present:"
-			ewarn "lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness lbmethod_heartbeat"
-			echo
-		fi
-	fi
-}
diff --git a/www-servers/apache/apache-2.4.6-r2.ebuild b/www-servers/apache/apache-2.4.6-r2.ebuild
index f6f4d2bf6a55..97735c08368a 100644
--- a/www-servers/apache/apache-2.4.6-r2.ebuild
+++ b/www-servers/apache/apache-2.4.6-r2.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/www-servers/apache/apache-2.4.6-r2.ebuild,v 1.4 2014/01/31 08:32:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.4.6-r2.ebuild,v 1.5 2014/02/19 09:20:39 polynomial-c Exp $
 
 EAPI="2"
 
@@ -109,9 +109,6 @@ MODULE_CRITICAL="
 	mime
 	unixd
 "
-# dependend criticals
-use ssl && MODULE_CRITICAL+=" socache_shmcb"
-use doc && MODULE_CRITICAL+=" alias negotiation setenvif"
 
 inherit eutils apache-2 systemd toolchain-funcs
 
@@ -134,6 +131,14 @@ RDEPEND="${RDEPEND}
 	>=dev-libs/openssl-0.9.8m
 	apache2_modules_mime? ( app-misc/mime-types )"
 
+pkg_setup() {
+	# dependend critical modules which are not allowed in global scope due
+	# to USE flag conditionals (bug #499260)
+	use ssl && MODULE_CRITICAL+=" socache_shmcb"
+	use doc && MODULE_CRITICAL+=" alias negotiation setenvif"
+	apache-2_pkg_setup
+}
+
 # init script fixup - should be rolled into next tarball #389965
 src_prepare() {
 	# the following patch can be removed once it is included in
diff --git a/www-servers/apache/apache-2.4.7.ebuild b/www-servers/apache/apache-2.4.7.ebuild
index 46829b173d76..1141ddd0bc9a 100644
--- a/www-servers/apache/apache-2.4.7.ebuild
+++ b/www-servers/apache/apache-2.4.7.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/www-servers/apache/apache-2.4.7.ebuild,v 1.7 2014/01/31 08:48:40 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.4.7.ebuild,v 1.8 2014/02/19 09:20:39 polynomial-c Exp $
 
 EAPI=5
 
@@ -111,10 +111,6 @@ MODULE_CRITICAL="
 	mime
 	unixd
 "
-# dependend criticals
-use ssl && MODULE_CRITICAL+=" socache_shmcb"
-use doc && MODULE_CRITICAL+=" alias negotiation setenvif"
-
 inherit eutils apache-2 systemd toolchain-funcs
 
 DESCRIPTION="The Apache Web Server."
@@ -136,6 +132,14 @@ RDEPEND="${RDEPEND}
 	>=dev-libs/openssl-0.9.8m
 	apache2_modules_mime? ( app-misc/mime-types )"
 
+pkg_setup() {
+	# dependend critical modules which are not allowed in global scope due
+	# to USE flag conditionals (bug #499260)
+	use ssl && MODULE_CRITICAL+=" socache_shmcb"
+	use doc && MODULE_CRITICAL+=" alias negotiation setenvif"
+	apache-2_pkg_setup
+}
+
 # init script fixup - should be rolled into next tarball #389965
 src_prepare() {
 	# the following patch can be removed once it is included in
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-334.16-r6.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-334.16-r7.ebuild
similarity index 98%
rename from x11-drivers/nvidia-drivers/nvidia-drivers-334.16-r6.ebuild
rename to x11-drivers/nvidia-drivers/nvidia-drivers-334.16-r7.ebuild
index 9c11dc0f1e2c..120f114e8e29 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-334.16-r6.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-334.16-r7.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/x11-drivers/nvidia-drivers/nvidia-drivers-334.16-r6.ebuild,v 1.2 2014/02/17 20:14:20 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-334.16-r7.ebuild,v 1.1 2014/02/18 12:01:11 jer Exp $
 
 EAPI=5
 
@@ -121,6 +121,11 @@ pkg_setup() {
 		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)"
 
@@ -129,8 +134,6 @@ pkg_setup() {
 		# 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/')"
-
-		linux-mod_pkg_setup
 	fi
 
 	# set variables to where files are in the package structure
diff --git a/x11-libs/startup-notification/files/startup-notification-0.12-sys-select_h.patch b/x11-libs/startup-notification/files/startup-notification-0.12-sys-select_h.patch
new file mode 100644
index 000000000000..8c579a71522f
--- /dev/null
+++ b/x11-libs/startup-notification/files/startup-notification-0.12-sys-select_h.patch
@@ -0,0 +1,30 @@
+From ea9f7e4cc6fd8c08d175ed7774ed2c5bd11c8ef0 Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters@verbum.org>
+Date: Mon, 17 Feb 2014 19:37:09 +0000
+Subject: Add include of <sys/select.h> for previous patch
+
+Unfortunately while the standard says that <sys/types.h> is the
+correct header to get suseconds_t, at least with glibc, that requires
+-DXOPEN_SOURCE.  Which is problematic for a public header, because
+then all *users* of startup-notification will be required to define
+that.
+
+Poking around a bit, it looks like at least with glibc, <sys/select.h>
+will give us an unconditional define.
+
+Signed-off-by: Julien Danjou <julien@danjou.info>
+---
+diff --git a/libsn/sn-monitor.h b/libsn/sn-monitor.h
+index 2f639df..cea4e12 100644
+--- a/libsn/sn-monitor.h
++++ b/libsn/sn-monitor.h
+@@ -28,6 +28,7 @@
+ #define __SN_MONITOR_H__
+ 
+ #include <libsn/sn-common.h>
++#include <sys/select.h>
+ 
+ SN_BEGIN_DECLS
+ 
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/x11-libs/startup-notification/files/startup-notification-0.12-time_t-crash-with-32bit.patch b/x11-libs/startup-notification/files/startup-notification-0.12-time_t-crash-with-32bit.patch
new file mode 100644
index 000000000000..710d29e93976
--- /dev/null
+++ b/x11-libs/startup-notification/files/startup-notification-0.12-time_t-crash-with-32bit.patch
@@ -0,0 +1,66 @@
+From a7e49fefde18ea8d5bada8096d32f23bcfb5a6dc Mon Sep 17 00:00:00 2001
+From: Federico G. Schwindt <fgsch@openbsd.org>
+Date: Mon, 17 Feb 2014 14:48:12 +0000
+Subject: Fix crash on 32bit architectures where time_t is 64 bit
+
+This is an ABI change on platforms where sizeof(time_t) doesn't equal
+sizeof(long). For most platforms this change shouldn't make a difference
+at present. OpenBSD recently switched to 64bit time_t on all architectures
+to avoid time_t overflow in 2038 on 32bit machines.
+
+This fix extends to consumers of startup-notification, for instance
+the window manager of XFCE, which is how I got involved in this.
+See http://mail.xfce.org/pipermail/xfce4-dev/2014-February/030611.html
+and follow-ups. The XFCE devs pointed out that my patch to fix a
+crash in XFCE's window manager depends on this startup-notification patch.
+
+Signed-off-by: Julien Danjou <julien@danjou.info>
+---
+diff --git a/libsn/sn-monitor.c b/libsn/sn-monitor.c
+index 2a9ad16..f419bc1 100644
+--- a/libsn/sn-monitor.c
++++ b/libsn/sn-monitor.c
+@@ -364,8 +364,8 @@ sn_startup_sequence_get_screen (SnStartupSequence *sequence)
+  **/
+ void
+ sn_startup_sequence_get_initiated_time (SnStartupSequence *sequence,
+-                                        long              *tv_sec,
+-                                        long              *tv_usec)
++                                        time_t            *tv_sec,
++                                        suseconds_t       *tv_usec)
+ {
+   if (tv_sec)
+     *tv_sec = sequence->initiation_time.tv_sec;
+@@ -386,8 +386,8 @@ sn_startup_sequence_get_initiated_time (SnStartupSequence *sequence,
+  **/
+ void
+ sn_startup_sequence_get_last_active_time (SnStartupSequence *sequence,
+-                                          long              *tv_sec,
+-                                          long              *tv_usec)
++                                          time_t            *tv_sec,
++                                          suseconds_t       *tv_usec)
+ {
+   /* for now the same as get_initiated_time */
+   if (tv_sec)
+diff --git a/libsn/sn-monitor.h b/libsn/sn-monitor.h
+index b58581f..2f639df 100644
+--- a/libsn/sn-monitor.h
++++ b/libsn/sn-monitor.h
+@@ -77,11 +77,11 @@ const char* sn_startup_sequence_get_application_id        (SnStartupSequence *se
+ int         sn_startup_sequence_get_screen                (SnStartupSequence *sequence);
+ 
+ void        sn_startup_sequence_get_initiated_time        (SnStartupSequence *sequence,
+-                                                           long              *tv_sec,
+-                                                           long              *tv_usec);
++                                                           time_t            *tv_sec,
++                                                           suseconds_t       *tv_usec);
+ void        sn_startup_sequence_get_last_active_time      (SnStartupSequence *sequence,
+-                                                           long              *tv_sec,
+-                                                           long              *tv_usec);
++                                                           time_t            *tv_sec,
++                                                           suseconds_t       *tv_usec);
+ 
+ void        sn_startup_sequence_complete                  (SnStartupSequence *sequence);
+ 
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/x11-libs/startup-notification/startup-notification-0.12-r1.ebuild b/x11-libs/startup-notification/startup-notification-0.12-r1.ebuild
new file mode 100644
index 000000000000..76ba82df3fe7
--- /dev/null
+++ b/x11-libs/startup-notification/startup-notification-0.12-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/startup-notification/startup-notification-0.12-r1.ebuild,v 1.1 2014/02/19 03:40:55 ssuominen Exp $
+
+EAPI=5
+inherit eutils xorg-2
+
+DESCRIPTION="Application startup notification and feedback library"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/startup-notification"
+SRC_URI="http://www.freedesktop.org/software/${PN}/releases/${P}.tar.gz"
+
+LICENSE="LGPL-2 MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND=">=x11-libs/libX11-1.4.3
+	>x11-libs/libxcb-1.6
+	>=x11-libs/xcb-util-0.3.8"
+DEPEND="${RDEPEND}
+	x11-proto/xproto"
+
+DOCS=( AUTHORS ChangeLog NEWS doc/${PN}.txt )
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-sys-select_h.patch \
+		"${FILESDIR}"/${P}-time_t-crash-with-32bit.patch
+	elibtoolize
+}
diff --git a/x11-misc/xscreensaver/xscreensaver-5.26.ebuild b/x11-misc/xscreensaver/xscreensaver-5.26.ebuild
index 649866554bd4..80cd7c372687 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.26.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.26.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/x11-misc/xscreensaver/xscreensaver-5.26.ebuild,v 1.2 2014/02/03 10:51:13 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-5.26.ebuild,v 1.3 2014/02/19 10:43:55 nimiux Exp $
 
 EAPI=5
 inherit autotools eutils flag-o-matic multilib pam
@@ -11,7 +11,7 @@ SRC_URI="http://www.jwz.org/xscreensaver/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE="gdm jpeg new-login opengl pam +perl selinux suid xinerama"
 
 COMMON_DEPEND="dev-libs/libxml2