diff --git a/app-admin/eselect/Manifest b/app-admin/eselect/Manifest
index aa9a3a017670..764fc81aad7c 100644
--- a/app-admin/eselect/Manifest
+++ b/app-admin/eselect/Manifest
@@ -1,4 +1,3 @@
-DIST eselect-1.3.1.tar.xz 163908 SHA256 4fc1c3f1b021dd8d28475ab2115f6a2de843bbbb941a0f70999389d1e0d56444 SHA512 b62e3e9f9c145a92625d136ea14ffa9705fa312971160ee3bb33f285dd67f6e6f415c7b9909b902b872500663a7a79c6fe53f52d179de7b7e120c5de994effd3 WHIRLPOOL a04a20c25617c3a53b0937c7f01f6dc89677beb5e1917a8d078a7f4403d4d77b7342da47766a061bc9158962ada190901db5b99d4b9603c49d9b90d3ad57feb5
 DIST eselect-1.3.8.tar.xz 168040 SHA256 d0c50bfe0faaddc54fc184f698ee74a6029a21f5155c4670a2bea3ead954c138 SHA512 159bf3ddb05b1966318eaf62d09e454a024f8be7ead2300392abbcbaa54ef748a1c4db1b2f96162994bcab43071396eb96a0b47268f04cb8557f8804818da18e WHIRLPOOL 9c4da0bde2ae2b53e8949d59b13498f55ef2c849dcc8cac503a7d0dda2511311d94dfc7aa27a97432f13aa0b430fec0ab280594dc165bbb40e573dce8c8a74b0
 DIST eselect-1.4.1.tar.xz 168616 SHA256 c60eb7e3b6eea36560ea16f8378de3c86926988a1eee3e6dd98c12f0340869c0 SHA512 c6754c3bb71efda36b807f2275aff0cc7bf5c3f58cbc7543b8255592940dae341e4b597ff1376b0997c37bcd0b736d813630b9fe4a4da2f85765217d8634deab WHIRLPOOL a9fb2dc6904c57878c744f70f0bd66a18b574eec04f042fa5ab60f608f31a0c90554153f3362c633742bb9918cb14f146269e0972cdf97998c60c236ae966f66
 DIST eselect-1.4.tar.xz 168580 SHA256 38f457567ac6a400763e49c215a78d5a7efc3edad589dda37bbd70847e3e7260 SHA512 4c28df99d3a235ccda60cb576634cde6110d3b7bc2fb7b8e3e9a69f7e09377dd9a5c615d6bf0ab8d668c137e8f658484fd28c0fe45e6ad3b7915925a3384b999 WHIRLPOOL 6646c023283b111bf7a973993dfe8537bdd3fab4c6c738af1f37c1aed1bddefbf834562036386dce1359d1b04da89049e7c60e4498733ac56587e037ca0ea87f
diff --git a/app-admin/eselect/eselect-1.3.1.ebuild b/app-admin/eselect/eselect-1.3.1.ebuild
deleted file mode 100644
index e276dcb1fd3b..000000000000
--- a/app-admin/eselect/eselect-1.3.1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect/eselect-1.3.1.ebuild,v 1.13 2013/12/07 19:08:28 ulm Exp $
-
-EAPI=3
-
-inherit bash-completion-r1
-
-DESCRIPTION="Gentoo's multi-purpose configuration and management tool"
-HOMEPAGE="http://www.gentoo.org/proj/en/eselect/"
-SRC_URI="http://dev.gentoo.org/~ulm/eselect/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="alpha amd64 arm 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 ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc"
-
-RDEPEND="sys-apps/sed
-	|| (
-		sys-apps/coreutils
-		sys-freebsd/freebsd-bin
-		app-misc/realpath
-	)"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	doc? ( dev-python/docutils )"
-RDEPEND="!app-admin/eselect-news
-	${RDEPEND}
-	sys-apps/file
-	sys-libs/ncurses"
-
-# Commented out: only few users of eselect will edit its source
-#PDEPEND="emacs? ( app-emacs/gentoo-syntax )
-#	vim-syntax? ( app-vim/eselect-syntax )"
-
-src_compile() {
-	emake || die
-
-	if use doc; then
-		emake html || die
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	newbashcomp misc/${PN}.bashcomp ${PN} || die
-	dodoc AUTHORS ChangeLog NEWS README TODO doc/*.txt || die
-
-	if use doc; then
-		dohtml *.html doc/* || die
-	fi
-
-	# needed by news module
-	keepdir /var/lib/gentoo/news
-	if ! use prefix; then
-		fowners root:portage /var/lib/gentoo/news || die
-		fperms g+w /var/lib/gentoo/news || die
-	fi
-}
-
-pkg_postinst() {
-	# fowners in src_install doesn't work for the portage group:
-	# merging changes the group back to root
-	if ! use prefix; then
-		chgrp portage "${EROOT}/var/lib/gentoo/news" \
-			&& chmod g+w "${EROOT}/var/lib/gentoo/news"
-	fi
-}
diff --git a/app-arch/sharutils/files/sharutils-4.14-popen-rb.patch b/app-arch/sharutils/files/sharutils-4.14-popen-rb.patch
index 7c3c909c7a2a..c502a623c1f6 100644
--- a/app-arch/sharutils/files/sharutils-4.14-popen-rb.patch
+++ b/app-arch/sharutils/files/sharutils-4.14-popen-rb.patch
@@ -26,7 +26,7 @@ we know the answer already, so hardcode it to true.
 -}
 -_ACEOF
 -if ac_fn_c_try_run "$LINENO"; then :
-+if true; then
++if false; then
 +if true; then
  
  $as_echo "#define BINARY_MODE_POPEN 1" >>confdefs.h
diff --git a/app-arch/sharutils/sharutils-4.14.ebuild b/app-arch/sharutils/sharutils-4.14-r1.ebuild
similarity index 93%
rename from app-arch/sharutils/sharutils-4.14.ebuild
rename to app-arch/sharutils/sharutils-4.14-r1.ebuild
index cbad78ee8b3b..cf7edb37d654 100644
--- a/app-arch/sharutils/sharutils-4.14.ebuild
+++ b/app-arch/sharutils/sharutils-4.14-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-arch/sharutils/sharutils-4.14.ebuild,v 1.4 2014/03/16 17:14:55 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/sharutils/sharutils-4.14-r1.ebuild,v 1.1 2014/03/25 20:50:36 vapier Exp $
 
 EAPI="5"
 
diff --git a/app-backup/obnam/Manifest b/app-backup/obnam/Manifest
index 8ba4a8626dcd..ca9768ca258b 100644
--- a/app-backup/obnam/Manifest
+++ b/app-backup/obnam/Manifest
@@ -1,2 +1,2 @@
 DIST obnam_1.6.1.orig.tar.gz 177104 SHA256 69bca2d17d7b4ebc0f2ca15a4d0777e266aa5214a8de1537ecc35f1cadb42510 SHA512 5223dabae927a91825041d755c0c410c9579c946210653b25a8d84dcf8f3c754d3dd460bb097d88a488bd2fb88c7edc8550d74130841e6caf13113ceefe5fffb WHIRLPOOL 6f1fa2be34bead5f2887b505708c9e1ed05dddd457b59362dd166f5be5ef7302a74746a9bfde17eaee142ebdb8389ef8b73281f936a1e80ea161c9b04dc8c0d1
-DIST obnam_1.7.orig.tar.gz 256458 SHA256 a753e4985f1437841417047d11ebd489efeca53626df8beb86f9714307f8b0b5 SHA512 d2f1cfa9e70811a27e8c3006b773013279a5c28c208f8a27f5d8c35d880170655aae7118ed4b0196bfa5739d4fc1722925717e4158ccb18fc6269289a631313f WHIRLPOOL 07db90ac5ac9d13d134786f9d4a3ba986fdadcd64e98fbe444b3c8b194ab132726ac36bf7a980b91435ae20fdae4ec9a120e30784b8c8b38dde5004db47de332
+DIST obnam_1.7.2.orig.tar.gz 257675 SHA256 f7431e9d7d2aba7e1dfdc831f796177fb8944725f77c0c2a5558d6ef7733a17c SHA512 f05ca3bc8b8acabf0592353e0e95c742af7e7544e6d91236c54c1f74adb290d969d9afb16d2951c1f522e75e42c7044f30c4932391d29f0f3efb6be2999909f7 WHIRLPOOL 3b891afdc3fd70a96d82e1a84b8b92a68cce5a1410b725444e0c3796a21f6afbc1216d0ea18e0e8ff55e5a6bdee901b2856c5e8c4ac68f7f238a2a98a6600512
diff --git a/app-backup/obnam/obnam-1.7.ebuild b/app-backup/obnam/obnam-1.7.2.ebuild
similarity index 90%
rename from app-backup/obnam/obnam-1.7.ebuild
rename to app-backup/obnam/obnam-1.7.2.ebuild
index a58351a7cbe6..c8a2eedf82ce 100644
--- a/app-backup/obnam/obnam-1.7.ebuild
+++ b/app-backup/obnam/obnam-1.7.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-backup/obnam/obnam-1.7.ebuild,v 1.1 2014/03/16 17:58:00 mschiff Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/obnam/obnam-1.7.2.ebuild,v 1.1 2014/03/25 21:37:28 mschiff Exp $
 
 EAPI=5
 
@@ -24,7 +24,6 @@ DEPEND="${PYTHON_DEPS}
 	dev-python/cliapp
 	dev-python/larch
 	dev-python/paramiko
-	dev-python/pyyaml
 	dev-python/tracing
 	dev-python/ttystatus
 	"
diff --git a/app-crypt/cardpeek/Manifest b/app-crypt/cardpeek/Manifest
index 4c44e69f549e..7e2efedb9c29 100644
--- a/app-crypt/cardpeek/Manifest
+++ b/app-crypt/cardpeek/Manifest
@@ -1,2 +1,3 @@
 DIST cardpeek-0.7.1.tar.gz 599238 SHA256 fa7f4fcabf211fefb968a5a49099e9a07430995556b7d59e95eeefef59538546 SHA512 8ea7f69e096de37543fec779372355a6f6cad709e43a4a66a072b453f962ebe55d25e432fb426cd88824f7165d724ddc6da55a6106e571608162b8094823be45 WHIRLPOOL 95f41d53840969beb3b98729c22ed8fe1e781ab6fe36ad3387cddf52963c2d56f5bca95955681cea839ce64ab6afddfc4d3cbf403e320d8dfec37ac0bd3a68bd
 DIST cardpeek-0.7.2.tar.gz 1130295 SHA256 9908b38a91b4df80ec5a6d6a89780dd41684dc1f203587c1bcc8e4a13cb24ed2 SHA512 9fd1790794b8d092859670bb36a0cdd235e7d098d563032ccdb8143eac00bb77532f1ab918897c4b753afd184079975de34a6f645e31eadb28b6c5a81d344ecd WHIRLPOOL 777397ca535d820453e4d315be495fc5cf845feea457c666cf935d19b8e2c7556b51e4e23f8d009c6165626c450fe5b92413841d0ee56fd6f1d549716ee05e56
+DIST cardpeek-0.8.2.tar.gz 1361187 SHA256 5c616aca68918ce35c8c8378006afdb524f9eef76a2ccc296f5365d389b46c61 SHA512 184539ef926a6ac63d41926b05160d6b91c0ca041d1b40a3e2f5314f9cb35730fbcb9be7c08d2be6f94bc121021168c45235bfa4ccac0fbd28c47159c7a89602 WHIRLPOOL 88e81a52fa485cd56a6e40f99cd5bcfb0532bb86b4c6ac4a789d0118de1468004ddb8963f778eaf5329a5bccf663a2040dc3c2a32d2c0f9124778239212e783d
diff --git a/app-crypt/cardpeek/cardpeek-0.8.2.ebuild b/app-crypt/cardpeek/cardpeek-0.8.2.ebuild
new file mode 100644
index 000000000000..72c8da8bc0b6
--- /dev/null
+++ b/app-crypt/cardpeek/cardpeek-0.8.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/cardpeek/cardpeek-0.8.2.ebuild,v 1.1 2014/03/25 13:26:24 alonbl Exp $
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="Tool to read the contents of smartcards"
+HOMEPAGE="http://pannetrat.com/Cardpeek"
+SRC_URI="http://downloads.pannetrat.com/install/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+RDEPEND="sys-apps/pcsc-lite
+	=dev-lang/lua-5.2*
+	x11-libs/gtk+:3
+	net-misc/curl
+	dev-libs/openssl"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
diff --git a/app-emacs/auctex/Manifest b/app-emacs/auctex/Manifest
index db8c63e8d71e..08a732c54f53 100644
--- a/app-emacs/auctex/Manifest
+++ b/app-emacs/auctex/Manifest
@@ -1,2 +1 @@
-DIST auctex-11.86.tar.gz 1179117 SHA256 3fc2cdbc0c8be1d385061ccb2e8c920b57344ea40eb44e014faf501c5d20e43b SHA512 fd7a7074e6f4c764d3164137a471e4b0ba59fead2ca85cef0b0da634cd679efefbca7ead6def3dedc7322cb9260f596ee6fc6c05ff20eac4a1d911a9ce73b4c4 WHIRLPOOL cf87c6a96309110181d506177104a7599cbd2db6137c5c79d4dc1697dfa230e5cef0fea9287151b0591a99feeea183822a80b0510c01ba72dde9324e783ba8ed
 DIST auctex-11.87.tar.gz 1206073 SHA256 63d57229e585dbf727f5545337615b997488bfdf475274da0718c90b77bd5cf2 SHA512 41a575a36ef2c111f214ad2e87a06c246751859a14ad3f8af77aaf180d8357a4c8d44c2f344b673404d2e011cdf4a193abda93f1b26ffff663f310ed430c5fa1 WHIRLPOOL d3bee56c1b940a2eb041a5b3b6e5ffe876b740e97c5793dd9295b42723abb5febd1fc40d9a0007df5d63f00547a5a59202eca2c102dfb878924ac07dac504eb0
diff --git a/app-emacs/auctex/auctex-11.86-r1.ebuild b/app-emacs/auctex/auctex-11.86-r1.ebuild
deleted file mode 100644
index ee0ffc59f9ab..000000000000
--- a/app-emacs/auctex/auctex-11.86-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/auctex/auctex-11.86-r1.ebuild,v 1.9 2012/12/03 22:04:59 ulm Exp $
-
-EAPI=3
-
-inherit elisp eutils latex-package
-
-DESCRIPTION="Extended support for writing, formatting and using (La)TeX, Texinfo and BibTeX files"
-HOMEPAGE="http://www.gnu.org/software/auctex/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+ FDL-1.3+"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
-IUSE="preview-latex"
-
-DEPEND="virtual/latex-base
-	preview-latex? (
-		app-text/dvipng
-		app-text/ghostscript-gpl )"
-RDEPEND="${DEPEND}"
-
-ELISP_PATCHES="${P}-ghostscript9.patch"
-TEXMF="/usr/share/texmf-site"
-
-src_prepare() {
-	elisp_src_prepare
-
-	# Remove broken Info file (will be recreated by the build system)
-	rm doc/auctex.info*
-}
-
-src_configure() {
-	EMACS_NAME=emacs EMACS_FLAVOUR=emacs econf --disable-build-dir-test \
-		--with-auto-dir="${EPREFIX}/var/lib/auctex" \
-		--with-lispdir="${EPREFIX}${SITELISP}/${PN}" \
-		--with-packagelispdir="${EPREFIX}${SITELISP}/${PN}" \
-		--with-packagedatadir="${EPREFIX}${SITEETC}/${PN}" \
-		--with-texmf-dir="${EPREFIX}${TEXMF}" \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		$(use_enable preview-latex preview)
-}
-
-src_compile() {
-	export VARTEXFONTS="${T}"/fonts
-	emake || die "emake failed"
-	cd doc; emake tex-ref.pdf || die "creation of tex-ref.pdf failed"
-}
-
-src_install() {
-	emake -j1 DESTDIR="${D}" install || die "emake install failed"
-	elisp-site-file-install "${FILESDIR}/50${PN}-gentoo.el" || die
-	if use preview-latex; then
-		elisp-site-file-install "${FILESDIR}/60${PN}-gentoo.el" || die
-	fi
-	keepdir /var/lib/auctex
-	dodoc ChangeLog CHANGES README RELEASE TODO FAQ INSTALL*
-}
-
-pkg_postinst() {
-	# rebuild TeX-inputfiles-database
-	use preview-latex && latex-package_pkg_postinst
-	elisp-site-regen
-}
-
-pkg_postrm(){
-	use preview-latex && latex-package_pkg_postrm
-	elisp-site-regen
-}
diff --git a/app-emacs/auctex/files/auctex-11.86-ghostscript9.patch b/app-emacs/auctex/files/auctex-11.86-ghostscript9.patch
deleted file mode 100644
index e8ca32b183d8..000000000000
--- a/app-emacs/auctex/files/auctex-11.86-ghostscript9.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-http://bugs.gentoo.org/351774
-Patch from upstream CVS
-
---- auctex-11.86-orig/preview/preview.el
-+++ auctex-11.86/preview/preview.el
-@@ -355,7 +355,7 @@
-   :group 'preview-gs
-   :type 'string)
- 
--(defcustom preview-gs-options '("-q" "-dSAFER" "-dNOPAUSE"
-+(defcustom preview-gs-options '("-q" "-dDELAYSAFER" "-dNOPAUSE"
- 				"-DNOPLATFONTS" "-dPrinted"
- 				"-dTextAlphaBits=4"
- 				"-dGraphicsAlphaBits=4")
-@@ -1066,14 +1066,21 @@
- 
- (defun preview-prepare-fast-conversion ()
-   "This fixes up all parameters for fast conversion."
--  (let ((file (if (consp (car preview-ps-file))
--		  (if (consp (caar preview-ps-file))
--		      (car (last (caar preview-ps-file)))
--		    (caar preview-ps-file))
--		(car preview-ps-file))))
-+  (let* ((file (if (consp (car preview-ps-file))
-+		   (if (consp (caar preview-ps-file))
-+		       (car (last (caar preview-ps-file)))
-+		     (caar preview-ps-file))
-+		 (car preview-ps-file)))
-+	 (all-files (if (and (consp (car preview-ps-file))
-+			     (consp (caar preview-ps-file)))
-+			(caar preview-ps-file)
-+		      (list file))))
-     (setq preview-gs-dsc (preview-dsc-parse file))
-     (setq preview-gs-init-string
--	  (concat preview-gs-init-string
-+	  (concat (format "{<</PermitFileReading[%s]>> setuserparams \
-+.locksafe} stopped pop "
-+			  (mapconcat 'preview-ps-quote-filename all-files ""))
-+		  preview-gs-init-string
- 		  (format "[%s(r)file]aload exch %s .runandhide aload pop "
- 			  (preview-ps-quote-filename file)
- 			  (preview-gs-dsc-cvx 0 preview-gs-dsc))))))
diff --git a/app-emacs/blogmax/Manifest b/app-emacs/blogmax/Manifest
index c93324c94311..495513a3a834 100644
--- a/app-emacs/blogmax/Manifest
+++ b/app-emacs/blogmax/Manifest
@@ -1,2 +1 @@
-DIST blogmax-20041208.tar.bz2 84894 SHA256 2b62d84d2e8b0c0964fca9d66de7057019ad93732e081d042bd0fbbfb67a3542 SHA512 82f1ed2358189b3094584d926e28c7eb2e78389e4330dea7e72883164690c0c38fcadcdb102b8ea54646bbf339c4d4883497692db4dfa2d79f41a8e4f693ad59 WHIRLPOOL ecff5d7c2f095a13156a764d5bfd61b1686adced662b41ff8162580c61806bce44b6844c291f04f388f8fb0ccd993c3244cfa43e7e1a68d27f1066cb8588b733
 DIST blogmax-20110305.zip 194956 SHA256 c2143b7df9d194f0f97d9ddddf5e4bcabe5fdc78fd0b9cad200e2a528b5632c5 SHA512 dc0529c5d61ea9beaecf9dfdfe0631ae31fb9737845aa81f2ac7c19df7aa30eb7392f73ea96a00b678cd441f0815129bb04d521e697ce2cb3938d8699483d19b WHIRLPOOL f8fce4a9f37058f209c2076ba2473d6b57825204feb0ec68b39074c74e56b0fb6481bd640894e83dbb175b9cdec3df18b12bb408046b8186948deddfe8ede26f
diff --git a/app-emacs/blogmax/blogmax-20041208.ebuild b/app-emacs/blogmax/blogmax-20041208.ebuild
deleted file mode 100644
index 0148efcf855d..000000000000
--- a/app-emacs/blogmax/blogmax-20041208.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/blogmax/blogmax-20041208.ebuild,v 1.6 2007/07/04 23:32:59 opfer Exp $
-
-inherit elisp
-
-DESCRIPTION="Blogging in Emacs"
-HOMEPAGE="http://billstclair.com/blogmax/index.html"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-src_unpack() {
-	unpack ${A}; rm -f *.elc
-}
-
-src_install() {
-	elisp-install ${PN} blogmax.{el,elc}
-	elisp-site-file-install "${FILESDIR}/50blogmax-gentoo.el"
-	dodoc "${FILESDIR}/README.Gentoo"
-	dodir /usr/share/doc/${PF}/example
-	cp -r * "${D}/usr/share/doc/${PF}/example"
-	pushd "${D}/usr/share/doc/${PF}/example"
-	rm -f blogmax.{el,elc}
-}
diff --git a/app-emacs/blogmax/blogmax-20110305.ebuild b/app-emacs/blogmax/blogmax-20110305.ebuild
index bf93fbb413a5..807e2c74bc62 100644
--- a/app-emacs/blogmax/blogmax-20110305.ebuild
+++ b/app-emacs/blogmax/blogmax-20110305.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/blogmax/blogmax-20110305.ebuild,v 1.1 2014/02/16 11:52:46 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/blogmax/blogmax-20110305.ebuild,v 1.2 2014/03/25 20:37:48 ulm Exp $
 
 EAPI=5
 
@@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~ppc ~x86"
 DEPEND="app-arch/unzip"
 
 S="${WORKDIR}/${PN}"
-SITEFILE="50${PN}-gentoo-${PV}.el"
+SITEFILE="50${PN}-gentoo.el"
 
 src_prepare() {
 	rm *.elc gpl.txt || die
diff --git a/app-emacs/blogmax/files/50blogmax-gentoo-20110305.el b/app-emacs/blogmax/files/50blogmax-gentoo-20110305.el
deleted file mode 100644
index fc110114b3a6..000000000000
--- a/app-emacs/blogmax/files/50blogmax-gentoo-20110305.el
+++ /dev/null
@@ -1,4 +0,0 @@
-(add-to-list 'load-path "@SITELISP@")
-(autoload 'weblog-mode "blogmax" "Weblog" t)
-(autoload 'weblog-set-buffer-mode "blogmax"
-  "Set the mode to weblog-mode for text files in the *weblog-directory*" t)
diff --git a/app-emacs/blogmax/files/50blogmax-gentoo.el b/app-emacs/blogmax/files/50blogmax-gentoo.el
index 93853eedcb14..fc110114b3a6 100644
--- a/app-emacs/blogmax/files/50blogmax-gentoo.el
+++ b/app-emacs/blogmax/files/50blogmax-gentoo.el
@@ -1,5 +1,4 @@
-
-;;; blogmax site-lisp configuration 
-
 (add-to-list 'load-path "@SITELISP@")
-(require 'blogmax)
\ No newline at end of file
+(autoload 'weblog-mode "blogmax" "Weblog" t)
+(autoload 'weblog-set-buffer-mode "blogmax"
+  "Set the mode to weblog-mode for text files in the *weblog-directory*" t)
diff --git a/app-emacs/color-moccur/Manifest b/app-emacs/color-moccur/Manifest
index 7ee177d42e18..648e88124de7 100644
--- a/app-emacs/color-moccur/Manifest
+++ b/app-emacs/color-moccur/Manifest
@@ -1,2 +1 @@
-DIST color-moccur-2.66.el.bz2 22149 SHA256 33093325392023286f6389efd542e4846fe19de347e19e4daa10e40a2ebc6ddf SHA512 cb20a02531efc17ce1b736a4f6476ed580eed034dae53bb6619e26d05fc5fb97cb8f447cb5ae3108a0186b89ac840acf9690a0cfe231d4fec003efbaff7172a7 WHIRLPOOL cb044fe66c6aee608f17f21a7df8ccd5df1f460991a714499774f37f5931b00788a7673bb66f345b848a874a18d2012180acc6676f6d8ccd6c7d3aa1b05a18cc
 DIST color-moccur-2.73.el.xz 22252 SHA256 5abd5ac46edd213c5b6065f549d969104465c91cd0c4226c83d283355652469f SHA512 15ce4c9776e5a5bb273c31b8552a8f434a2a4065e874ee558ef2b9dd19ccda6f5807430e7588c4e2e1add8d0d94dba3e19be2745138ea440d4ac2705efdbf528 WHIRLPOOL af48750930e2dda291e1a360a0e981faad4849c572f2f36b6ce8701409c9853be7966716ff5d293f83a3acbc76a3bbdf5f3868111d27c63fb655aafc5ad1a7eb
diff --git a/app-emacs/color-moccur/color-moccur-2.66.ebuild b/app-emacs/color-moccur/color-moccur-2.66.ebuild
deleted file mode 100644
index a4ebc53c84c8..000000000000
--- a/app-emacs/color-moccur/color-moccur-2.66.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/color-moccur/color-moccur-2.66.ebuild,v 1.1 2010/04/01 18:55:33 ulm Exp $
-
-inherit elisp
-
-DESCRIPTION="Major mode for color moccur"
-HOMEPAGE="http://www.bookshelf.jp/
-	http://www.emacswiki.org/cgi-bin/wiki/SearchBuffers"
-# taken from http://www.bookshelf.jp/elc/color-moccur.el
-SRC_URI="mirror://gentoo/${P}.el.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/gnuserv-programs/Manifest b/app-emacs/gnuserv-programs/Manifest
deleted file mode 100644
index 561973dda534..000000000000
--- a/app-emacs/gnuserv-programs/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST gnuserv-3.12.8.tar.gz 124070 SHA256 c9ba560e7d773c175ef1cbced8fae17d7a921b050a11457971a7b7a6216aeed9 SHA512 e8f387a554c22fb2eb166d388085b9d68a0d865ae56ab71f3ffe09ff46bef04a4ba5b05ca51a1110e1dff67ae2cd6acc8b18a0fb9df9299dbbf4a001f0924f31 WHIRLPOOL 56203ac84fe967f8c602ac5eaf9d3e9ad5f2b0feb68c8719ff3ca7b61d44c676e0c52f42c7919eed39ffaa25683f28b558a0b55b23ef8a11bdbf3665f8017616
diff --git a/app-emacs/gnuserv-programs/gnuserv-programs-3.12.8-r1.ebuild b/app-emacs/gnuserv-programs/gnuserv-programs-3.12.8-r1.ebuild
deleted file mode 100644
index 0a38586ea768..000000000000
--- a/app-emacs/gnuserv-programs/gnuserv-programs-3.12.8-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/gnuserv-programs/gnuserv-programs-3.12.8-r1.ebuild,v 1.3 2010/08/12 02:38:12 phajdan.jr Exp $
-
-EAPI="3"
-
-inherit multilib
-
-DESCRIPTION="Binary programs for app-emacs/gnuserv"
-HOMEPAGE="http://meltin.net/hacks/emacs/"
-SRC_URI="http://meltin.net/hacks/emacs/src/gnuserv-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~x86-linux ~ppc-macos"
-IUSE="X"
-
-DEPEND="!app-editors/xemacs
-	!<=app-emacs/gnuserv-3.12.7
-	X? ( x11-libs/libXau )"
-RDEPEND="${DEPEND}"
-PDEPEND="~app-emacs/gnuserv-${PV}"
-
-S="${WORKDIR}/gnuserv-${PV}"
-
-src_configure() {
-	# bug #83112
-	unset LDFLAGS
-
-	econf $(use_enable X xauth) \
-		--x-includes="${EPREFIX}"/usr/include \
-		--x-libraries="${EPREFIX}"/usr/$(get_libdir)
-}
-
-src_compile() {
-	emake ELC="" || die "emake failed"
-}
-
-src_install() {
-	emake -j1 ELC="" \
-		prefix="${ED}"/usr \
-		man1dir="${ED}"/usr/share/man/man1 \
-		install || die "emake install failed"
-}
diff --git a/app-emacs/gnuserv-programs/metadata.xml b/app-emacs/gnuserv-programs/metadata.xml
deleted file mode 100644
index bc306fe58224..000000000000
--- a/app-emacs/gnuserv-programs/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>emacs</herd>
-</pkgmetadata>
diff --git a/app-emacs/mode-compile/Manifest b/app-emacs/mode-compile/Manifest
index f60af0d21915..35f72a72a54c 100644
--- a/app-emacs/mode-compile/Manifest
+++ b/app-emacs/mode-compile/Manifest
@@ -1,2 +1 @@
 DIST mode-compile-2.29.1.tar.gz 22924 SHA256 9c7dafa3a5c5706316a01071a2769beeecf228d0831fceb53d27d4e47c9d0421 SHA512 bc43d9cae411f5177ce70c736041db74c6db1dc5b766b22b92227e9e1324d304276bd104d8e3cac9ff5a877fc48b6da5b904e1acdb6cca7396fc7c26cc572815 WHIRLPOOL 3980e43e28438f5eefbd1d8e689cc18d9cc922857ec3e32b58c6aa6d056cc6798c2094b65de28705db6dfc95e493a06858a208c536f2c9d217027d47c4b311a9
-DIST mode-compile-2.29.el.bz2 21579 SHA256 c7cd617d5b1445638621b37f21a062de41f9b3b3eef829d9aa045a5571cb6556 SHA512 31573552298f2ffa8e89dbdb4155f3c95c5e354966ec4966098fe90bffd0e8fd8ecd86a7453adc10fb551622b9929aa58ce3abeb90b605373d6d4a874aa5ba7c WHIRLPOOL 85f1f740d3f3fe311bbc888bcdeba0a9ebb614b0adaae231d0aeb0912862e79c44130880d1e636a7465c9bc8f92261e0eecf961ecf800b60bbba1d76ee5b0e40
diff --git a/app-emacs/mode-compile/mode-compile-2.29.ebuild b/app-emacs/mode-compile/mode-compile-2.29.ebuild
deleted file mode 100644
index 1349f6e892e5..000000000000
--- a/app-emacs/mode-compile/mode-compile-2.29.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/mode-compile/mode-compile-2.29.ebuild,v 1.3 2008/06/14 23:28:25 ulm Exp $
-
-inherit elisp
-
-DESCRIPTION="Smart command for compiling files according to major-mode"
-HOMEPAGE="http://perso.tls.cena.fr/boubaker/Emacs/"
-# Taken from http://perso.tls.cena.fr/boubaker/distrib/${PN}.el
-SRC_URI="mirror://gentoo/${P}.el.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-SITEFILE=50${PN}-gentoo.el
diff --git a/app-emacs/paredit/Manifest b/app-emacs/paredit/Manifest
index 97c263bb5443..77822c9c255e 100644
--- a/app-emacs/paredit/Manifest
+++ b/app-emacs/paredit/Manifest
@@ -1,2 +1 @@
-DIST paredit-22.tar.bz2 23140 SHA256 51786d7c78261e2f282f9045c1fac202c7055d82517fdd5fe0accb03fea2a03c SHA512 2ccfe1afee96f8755bf007710cebbcd6e74a89c740c0975d814820d67d592878c6fb505138613894e164628b41ae491a992f5f060f943e79a95dd4026fdd9f6d WHIRLPOOL 5b548ca59af48c095feb63f88750201636665a70224b92f14509f1a55be666359bba8c4fae21d027a56a59c01ec6651f9e444b540876fe2c6e349a8532f609cb
 DIST paredit-23.tar.xz 24204 SHA256 c501d5a716258a6b6758cc40d3e12b3d7271e62b457202271402e8ad43053478 SHA512 33ae10d95d3b2d8fe2466fba20d6aa0abac56684807fb381ab0db2798e99e2358c6dca71794b95768b53be661b9181f458e932bb37c31ba7ebba155a57f1bb01 WHIRLPOOL 4e2f6ee89f6cf9edd4b0b88e03f8b26f288f646cca14324025d022d34d756e44cfb8bb8289345ca77f3bdeecc1d1c114c90a496d094149d4d0f59ce28affce93
diff --git a/app-emacs/paredit/paredit-22.ebuild b/app-emacs/paredit/paredit-22.ebuild
deleted file mode 100644
index 088d344c4bc2..000000000000
--- a/app-emacs/paredit/paredit-22.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/paredit/paredit-22.ebuild,v 1.1 2010/10/09 21:01:34 ulm Exp $
-
-inherit elisp
-
-DESCRIPTION="Minor mode for performing structured editing of S-expressions"
-HOMEPAGE="http://mumble.net/~campbell/emacs/
-	http://www.emacswiki.org/cgi-bin/wiki/ParEdit"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE=""
-
-SITEFILE="50${PN}-gentoo.el"
-
-src_install() {
-	elisp_src_install
-	dohtml *.html || die
-}
diff --git a/app-emacs/quack/Manifest b/app-emacs/quack/Manifest
index 328ae30e3b70..fbe43305a328 100644
--- a/app-emacs/quack/Manifest
+++ b/app-emacs/quack/Manifest
@@ -1,2 +1 @@
-DIST quack-0.37.el.bz2 42676 SHA256 933d7fe3e909e3e6aa560105cb5973d275d9acf8cbd60d0bd128e109b5d7e939 SHA512 e9548b73e97cdd1a896df84744341b2dfa62055b2e8ff44f6af2fdbb43ef9f6c213675366cd8aa081ea48ec0f99b2fc87b6551a77393bd39fbd121c4325e06c2 WHIRLPOOL bef800d9478ff5314d4a47216a6d01375bbf1381154269bdaf787569be069fc2b40b4fc67be0f4e873b472a7a3690b17bb35c73becc6c12852fbb0d3a7c12773
 DIST quack-0.47.el.xz 44508 SHA256 9f3173d0b8ab9bf070ef8e823c0d7c65e4992cef47df94f1a6eeaed96316956e SHA512 41775f5850518a8738aae9d7185c733ad4d5a778859a9d9a7235c84184fb7b84dd49d37a607291f39fac4ddc1cd507806a01dd19ab3351646ecf35e747feb8ce WHIRLPOOL ab284d3d520b49368726ed00164811ac8601a0d298d2bddc54f4677a621ca1c0ff2ebb3c244c59c18f7929e9dc8c2c6014f95036bf325ec531c3cc597e9d69c5
diff --git a/app-emacs/quack/quack-0.37.ebuild b/app-emacs/quack/quack-0.37.ebuild
deleted file mode 100644
index 61bf3c657882..000000000000
--- a/app-emacs/quack/quack-0.37.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/quack/quack-0.37.ebuild,v 1.1 2009/10/15 19:07:48 ulm Exp $
-
-inherit elisp
-
-DESCRIPTION="Enhances Emacs support for Scheme"
-HOMEPAGE="http://www.neilvandyke.org/quack/"
-SRC_URI="mirror://gentoo/${P}.el.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/scala-mode/Manifest b/app-emacs/scala-mode/Manifest
index a041ba08f5e8..8c4f03cf1ed6 100644
--- a/app-emacs/scala-mode/Manifest
+++ b/app-emacs/scala-mode/Manifest
@@ -1,2 +1 @@
 DIST scala-tool-support-2.10.3.tgz 26040 SHA256 d0f67730614f81e7387cdc3cbab633bd0b823a8d84e9d01ac545fd91c5d8e050 SHA512 77bd695d1e577d05884a8b70d4edcc6a0af1da13de0f8cdf54d5636e0e93c22ec919ccd3d79e92382b6a9fe8085a08af37b9f5428c1ed14359faf8fc860a81b5 WHIRLPOOL be1742f55c03f80a819a4336bf01d89d32ab6d0cfc080e08c7b27479cb76d19a2d03aefc66ee286f5eb28e0aa9952586801534dba2df2ab24f2d317b245be780
-DIST scala-tool-support-2.9.0.1.zip 183929 SHA256 f597707fd2f14a569b0b3cfa233cda6f5996bceab37ca930cd3f182a9874fc3a SHA512 ae535c9e51e3fc4481a85e1a3b5f5fd44357425cef417d9e74ba9f30ae72f8630c85d50b26c48f1f7743ad10c15f9a0e00df1bda52aef613c927061269d53ac4 WHIRLPOOL 17c3226dcf817356471bcbe001c2c39538d4ebc8742dabb7e4260608ce391355d070a8e4896208d61eacf3b325d54dc5ef26fe3755d7f3bdabc14e7126e2f361
diff --git a/app-emacs/scala-mode/scala-mode-2.10.3.ebuild b/app-emacs/scala-mode/scala-mode-2.10.3.ebuild
index 83b78d393b48..0a5ca4a124cb 100644
--- a/app-emacs/scala-mode/scala-mode-2.10.3.ebuild
+++ b/app-emacs/scala-mode/scala-mode-2.10.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/app-emacs/scala-mode/scala-mode-2.10.3.ebuild,v 1.1 2014/02/10 20:03:19 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/scala-mode/scala-mode-2.10.3.ebuild,v 1.2 2014/03/25 19:17:04 ulm Exp $
 
 EAPI=5
 
@@ -15,7 +15,6 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-DEPEND="app-arch/unzip"
 RDEPEND="dev-lang/scala"
 
 S="${WORKDIR}/${MY_P}/scala-emacs-mode"
diff --git a/app-emacs/scala-mode/scala-mode-2.9.0.1.ebuild b/app-emacs/scala-mode/scala-mode-2.9.0.1.ebuild
deleted file mode 100644
index fca068eb110a..000000000000
--- a/app-emacs/scala-mode/scala-mode-2.9.0.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/scala-mode/scala-mode-2.9.0.1.ebuild,v 1.1 2011/06/07 08:10:36 ali_bush Exp $
-
-EAPI=2
-
-inherit elisp
-
-MY_P="scala-tool-support-${PV}"
-DESCRIPTION="Scala mode for Emacs"
-HOMEPAGE="http://www.scala-lang.org/"
-SRC_URI="http://www.scala-lang.org/downloads/distrib/files/scala-packages/${MY_P}.sbp -> ${MY_P}.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="app-arch/unzip"
-RDEPEND="dev-lang/scala"
-
-S="${WORKDIR}/misc/scala-tool-support/emacs/"
-SITEFILE="50${PN}-gentoo.el"
-DOCS="AUTHORS FUTURE README"
diff --git a/app-emacs/ssh/Manifest b/app-emacs/ssh/Manifest
index aa2b10751f16..9606c6656b72 100644
--- a/app-emacs/ssh/Manifest
+++ b/app-emacs/ssh/Manifest
@@ -1,2 +1 @@
-DIST ssh-1.9.tar.gz 5486 SHA256 63a460b698846481cfbb298f98627a5d1adbdf28804782201ebd390eb5c38173 SHA512 f0282dcb4387d4b7aa6a47ea1462c4a2963de6dc1648b4bbea5c552c6079f9a23f5f789f180e759114b94434072b789a37e9d672927dfeac9d713e7d5c5b8876 WHIRLPOOL 8f126f82819be347a89408ce3ab6838c1d81a2208837ee5d5ec2ac55aab978a4fb2a257da6458d1bb7d41767fb3324b7cc1cc658ad8990f212705dbaa8187800
 DIST ssh-20120709.el.xz 4876 SHA256 7e3553c4d19c695c6955f89f62991a4a019e78504318956321f8771f9d615910 SHA512 69048f160bdd1b8ca29f0d49734cff7f9c4360ca9dd2abdacfcbca61bb964e84c962bf6388f424c0eb0161f1e8c8c9787dafebc084826b27d94300fba475ab9c WHIRLPOOL 81af759215bf637099aff22685abdae08241dcb37eb2e2eb61a523d94e079b7d3fa511d10f1bb305b059041e2f6a8cbd9288f7cc949fd51e9df15cb40681fa50
diff --git a/app-emacs/ssh/ssh-1.9.ebuild b/app-emacs/ssh/ssh-1.9.ebuild
deleted file mode 100644
index 216b444baffc..000000000000
--- a/app-emacs/ssh/ssh-1.9.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/ssh/ssh-1.9.ebuild,v 1.1 2006/03/06 17:15:24 mkennedy Exp $
-
-inherit elisp
-
-DESCRIPTION="Directory tracking and special character handling support for SSH sessions in Emacs shell buffers."
-HOMEPAGE="http://www.splode.com/~friedman/software/emacs-lisp/index.html#ssh"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~sparc"
-IUSE=""
-
-SITEFILE=50ssh-gentoo.el
diff --git a/app-emacs/ssh/ssh-20120709.ebuild b/app-emacs/ssh/ssh-20120709.ebuild
index 29edec7cece0..b0aed7194c79 100644
--- a/app-emacs/ssh/ssh-20120709.ebuild
+++ b/app-emacs/ssh/ssh-20120709.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/ssh/ssh-20120709.ebuild,v 1.1 2014/02/15 10:26:16 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/ssh/ssh-20120709.ebuild,v 1.2 2014/03/25 20:40:38 ulm Exp $
 
 EAPI=5
 
@@ -12,6 +12,6 @@ SRC_URI="http://dev.gentoo.org/~ulm/distfiles/${P}.el.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~sparc"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 
 SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/tnt/Manifest b/app-emacs/tnt/Manifest
deleted file mode 100644
index 28526b111cfc..000000000000
--- a/app-emacs/tnt/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST tnt-2.6.tar.gz 112490 SHA256 207ee988867537f8707c26503c6c7c9c2f9f818720199a813360d60e66d272eb SHA512 379338e53c9236809ffb48e8e46ef6c02774f2d8a105c88d8d093f6bcb798dafb9addbbce665b0f98b3e1b6aa1ebb81c15bbc475cfb8d5cf9ed28ea3f673e5f3 WHIRLPOOL 15fca08180550bfdf89e3647100044198d010e86f9b37ebf0fd9779da7ed2901b1aa01f5a6a0bfa471cddc581285a49de3eb34011737cf05c6fd2b40d6ac29ff
diff --git a/app-emacs/tnt/files/50tnt-gentoo.el b/app-emacs/tnt/files/50tnt-gentoo.el
deleted file mode 100644
index 04eb0d16b7b4..000000000000
--- a/app-emacs/tnt/files/50tnt-gentoo.el
+++ /dev/null
@@ -1,5 +0,0 @@
-(add-to-list 'load-path "@SITELISP@")
-(autoload 'tnt-open "tnt" "Start TNT" t)
-(autoload 'tnt-proxy-switch-servers "tnt" "Switch TNT proxy servers." t)
-(autoload 'tnt-proxy-toggle-proxy-use "tnt" "Toggle use of TNT proxy server." t)
-(autoload 'tnt-customize "tnt" "Customization of the group 'tnt'." t)
diff --git a/app-emacs/tnt/files/tnt-2.6-sound.patch b/app-emacs/tnt/files/tnt-2.6-sound.patch
deleted file mode 100644
index f8bd12df5a85..000000000000
--- a/app-emacs/tnt/files/tnt-2.6-sound.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- tnt-2.6-orig/tnt.el
-+++ tnt-2.6/tnt.el
-@@ -4132,7 +4132,7 @@
-        (tnt-sound-exec
-         (with-output-to-string
-           (call-process shell-file-name nil t nil shell-command-switch (concat tnt-sound-exec " " tnt-sound-exec-args " " sound-file))))
--       (tnt-running-xemacs (play-sound-file sound-file))
-+       ((fboundp 'play-sound-file) (play-sound-file sound-file))
-        (t (message "Warning: tnt-sound-exec is not set")))
-   (message "Warning: %s is not a readable file" sound-file)))
- 
diff --git a/app-emacs/tnt/metadata.xml b/app-emacs/tnt/metadata.xml
deleted file mode 100644
index bc306fe58224..000000000000
--- a/app-emacs/tnt/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>emacs</herd>
-</pkgmetadata>
diff --git a/app-emacs/tnt/tnt-2.6-r2.ebuild b/app-emacs/tnt/tnt-2.6-r2.ebuild
deleted file mode 100644
index 3656924b72eb..000000000000
--- a/app-emacs/tnt/tnt-2.6-r2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/tnt/tnt-2.6-r2.ebuild,v 1.3 2010/02/18 09:33:36 ulm Exp $
-
-inherit elisp
-
-DESCRIPTION="Client for the AOL Instant Messenging service using Emacs as its UI"
-HOMEPAGE="http://tnt.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="AOL Artistic"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DOCS="ChangeLog PROTOCOL README"
-ELISP_PATCHES="${P}-sound.patch"
-SITEFILE="50${PN}-gentoo.el"
-
-src_install() {
-	elisp_src_install
-
-	insinto "${SITEETC}/${PN}"
-	doins sounds/* || die
-
-	docinto procmail
-	dodoc procmail/* || die
-}
diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest
index 87da9de39ef9..d42ef6942ec4 100644
--- a/app-misc/mc/Manifest
+++ b/app-misc/mc/Manifest
@@ -1,5 +1 @@
-DIST mc-4.8.10.tar.xz 2152000 SHA256 5bda5a10bd0447da4b3b36c55d10fdf26e279d29fd30792467d68bdb7c2f2788 SHA512 388cd8f8714d3c946a165ed2ce17086ee345bec49f1eb0a71663dd6e07ad53a568df0edd4532b2098382a7dda81eaafdb71f54763e23f26a4db86c26022b8088 WHIRLPOOL 7966b0960d2e357d8de9e25476c4773fc6add07064647eb083f740cb109d2bce69867a6dfc7fceca882bd1a1bd964154b4b03c869282c12f2d4887774515968f
 DIST mc-4.8.11.tar.xz 2211144 SHA256 1877ea844f9d71e133b9e03ca3bebcd7b10b9ba5b419b8d268e255816fe1993a SHA512 5afb9e0704b8c0e98cd4787f03baf40131a0ab40027103e42f44b2ebd5b6c33b8702d7f534ca8175f3b8efbb25a04f08f0f51a1eb3a1783a99e6117472344fbc WHIRLPOOL bbe6dbad549f45b9d4aab0985ce9a2c35e42017d2f2020972d27d8d43c66473c49fea8754fd6635195b72e6a531625a28327c0f2aa65f5e79cea0db0d54ea7e6
-DIST mc-4.8.7.tar.xz 2106020 SHA256 88f620f7944d629087e0f3518a7e7bff7600fd1c4fa157767cdcca95f2cb3074 SHA512 f5c0f533e4e056246d5918233b9932f751589db613f1c591be3168b607a9b73919e93b631151c1c4dbc692b54e7ec1b2f8ec2ae875a24012744e7257735fa1d8 WHIRLPOOL 768b08f2ff0ce1de8893aec2a083269ecde6c62e6e7ea5379a96eec81ad56791e4adbfe712014cece323857fb96862a29dc97893b53f8d5316707e933f015342
-DIST mc-4.8.8.tar.xz 2150988 SHA256 b898a343b2b11274a20b2a491f9f5422b6d041e65e152c56d7255084fd04b78b SHA512 407998e653d0758ff47c13d2d47c77628b764ec5e51369fe0ff28d31962d8d4635e23fade2d159bf6b063c8b84e3e3f558c3b3155d3358e520c3436a57412815 WHIRLPOOL 1785a836bf5070e52f75fd120031829ced772c9b3bdacf517b2e03f05ca850144960fe17f4f283d256ee46e3f3d9c3d104ac0110637534feae2ca684f18bd032
-DIST mc-4.8.9.tar.xz 2169836 SHA256 1253fbed3d471473c4eb9709dd6b981333754e122ddbfaa99d7cfb57508477a2 SHA512 43d231659261a73eaeac8cb9b3c25b6f753a98ee09a88b4f4213cbdee39e1f3dd27ea58b437566a904cfb6af8f000cead99b0712890bb59045b67ca989f448f6 WHIRLPOOL 49615ffa03096297a9ebf299f2f4ae4466c7f5d5cacf7577fd085c9148b0e60cc0876e4d876f81f5e5c065295e839db1d9ea83cde9744657c237f56d70e4f51e
diff --git a/app-misc/mc/files/mc-4.8.8-race_cond_create_tmp_dir.patch b/app-misc/mc/files/mc-4.8.8-race_cond_create_tmp_dir.patch
deleted file mode 100644
index a4439447926e..000000000000
--- a/app-misc/mc/files/mc-4.8.8-race_cond_create_tmp_dir.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Index: lib/vfs/interface.c
-===================================================================
---- lib/vfs/interface.c	(revision 2640b21bb9700aa51a70f35f9e10732c82a7366f)
-+++ lib/vfs/interface.c	(revision 33c47b5734771e54f10b2e3cf42cf2ae943b09c1)
-@@ -841,18 +841,18 @@
-     canonicalize_pathname (buffer);
- 
--    if (lstat (buffer, &st) == 0)
--    {
--        /* Sanity check for existing directory */
--        if (!S_ISDIR (st.st_mode))
--            error = _("%s is not a directory\n");
--        else if (st.st_uid != getuid ())
--            error = _("Directory %s is not owned by you\n");
--        else if (((st.st_mode & 0777) != 0700) && (chmod (buffer, 0700) != 0))
--            error = _("Cannot set correct permissions for directory %s\n");
--    }
--    else
--    {
--        /* Need to create directory */
--        if (mkdir (buffer, S_IRWXU) != 0)
-+    /* Try to create directory */
-+    if (mkdir (buffer, S_IRWXU) != 0)
-+    {
-+        if (errno == EEXIST && lstat (buffer, &st) == 0)
-+        {
-+            /* Sanity check for existing directory */
-+            if (!S_ISDIR (st.st_mode))
-+                error = _("%s is not a directory\n");
-+            else if (st.st_uid != getuid ())
-+                error = _("Directory %s is not owned by you\n");
-+            else if (((st.st_mode & 0777) != 0700) && (chmod (buffer, 0700) != 0))
-+                error = _("Cannot set correct permissions for directory %s\n");
-+        }
-+        else
-         {
-             fprintf (stderr,
diff --git a/app-misc/mc/files/mc-4.8.8-segfault-unowned-temp-dir.patch b/app-misc/mc/files/mc-4.8.8-segfault-unowned-temp-dir.patch
deleted file mode 100644
index 59c6661d9e02..000000000000
--- a/app-misc/mc/files/mc-4.8.8-segfault-unowned-temp-dir.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-fix for mc/mcedit segfault when mc's tempdir doesn't belong to the correct user
-
-https://bugs.gentoo.org/show_bug.cgi?id=473244
-https://www.midnight-commander.org/ticket/3021
---- src/main.c
-+++ src/main.c
-@@ -154,7 +154,4 @@
- 
-     mc_global.share_data_dir = g_strdup (DATADIR);
--
--    /* Set up temporary directory */
--    mc_tmpdir ();
- }
- 
-@@ -299,4 +296,7 @@
-     vfs_setup_work_dir ();
- 
-+    /* Set up temporary directory after VFS initialization */
-+    mc_tmpdir ();
-+
-     /* do this after vfs initialization due to mc_setctl() call in mc_setup_by_args() */
-     if (!mc_setup_by_args (argc, argv, &error))
diff --git a/app-misc/mc/files/mc-4.8.8-wrong_char_in_menu_file.patch b/app-misc/mc/files/mc-4.8.8-wrong_char_in_menu_file.patch
deleted file mode 100644
index 7eaac2bd35d9..000000000000
--- a/app-misc/mc/files/mc-4.8.8-wrong_char_in_menu_file.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-Index: misc/mc.menu
-===================================================================
---- misc/mc.menu	(revision be2883dc86d01fa54003ec75b0a1fc9ed93c9358)
-+++ misc/mc.menu	(revision a467bb4b6e2bec83dae4bbdd98ee529ffc45e4b1)
-@@ -66,5 +66,5 @@
- = f \.c$ & t r
- + f \.c$ & t r & ! t t
--с       Compile and link current .c file
-+c       Compile and link current .c file
-         make `basename %f .c` 2>/dev/null || cc -O -o `basename %f .c` %f
- 
diff --git a/app-misc/mc/files/mc-4.8.9-ncurses-include-fix.patch b/app-misc/mc/files/mc-4.8.9-ncurses-include-fix.patch
deleted file mode 100644
index 6193374359f7..000000000000
--- a/app-misc/mc/files/mc-4.8.9-ncurses-include-fix.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-ncurses detection fix
-
-https://bugs.gentoo.org/show_bug.cgi?id=476932
-
---- mc-4.8.9.orig/lib/tty/tty-ncurses.h
-+++ mc-4.8.9/lib/tty/tty-ncurses.h
-@@ -5,8 +5,10 @@
- #ifdef USE_NCURSES
- #ifdef HAVE_NCURSES_CURSES_H
- #include <ncurses/curses.h>
--#elif HAVE_NCURSES_NCURSES_H || HAVE_NCURSESW_CURSES_H
-+#elif HAVE_NCURSES_NCURSES_H
- #include <ncurses/ncurses.h>
-+#elif HAVE_NCURSESW_CURSES_H
-+#include <ncursesw/ncurses.h>
- #elif HAVE_NCURSES_HCURSES_H || HAVE_NCURSES_H
- #include <ncurses.h>
- #else
diff --git a/app-misc/mc/files/mc-4.8.9-unknown-opts.patch b/app-misc/mc/files/mc-4.8.9-unknown-opts.patch
deleted file mode 100644
index 95f626925815..000000000000
--- a/app-misc/mc/files/mc-4.8.9-unknown-opts.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From f71ea50702cd9d17d1a8a913ee87a5d9ae2d5bc9 Mon Sep 17 00:00:00 2001
-From: Sergei Trofimovich <slyfox@gentoo.org>
-Date: Wed, 3 Jul 2013 10:21:36 +0300
-Subject: [PATCH] configure.ac: warn about unknown '--with-' / '--enable-'
- options
-
-As we use 'AC_CONFIG_SUBDIRS' macro for samba sources
-option checking is disabled for us.
-
-Before the patch:
-
-    $ ./configure --with-i-have-misspelled-editor-for-edit
-    ...
-    # no warnings
-
-The patch enables warnings back only for top-level ./configure:
-
-    $ ./configure --with-i-have-misspelled-editor-for-edit
-    ...
-    configure: WARNING: unrecognized options: --with-i-have-misspelled-editor-for-edit
-
-Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
----
- configure.ac | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/configure.ac b/configure.ac
-index c12c2e7..5581a14 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -652,3 +652,12 @@ Configuration:
-   Support for charset:        ${charset_msg}
-   Search type:                ${SEARCH_TYPE}
- ])
-+
-+dnl option checking is disable by default due to AC_CONFIG_SUBDIRS
-+dnl we enable it back for top-level ./configure
-+if test -n "$ac_unrecognized_opts"; then
-+  case $enable_option_checking in
-+    fatal) AC_MSG_ERROR([unrecognized options: $ac_unrecognized_opts]) ;;
-+    *)     AC_MSG_WARN( [unrecognized options: $ac_unrecognized_opts]) ;;
-+  esac
-+fi
--- 
-1.8.2.1
-
diff --git a/app-misc/mc/mc-4.8.10.ebuild b/app-misc/mc/mc-4.8.10.ebuild
deleted file mode 100644
index 12a042184ad5..000000000000
--- a/app-misc/mc/mc-4.8.10.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/mc-4.8.10.ebuild,v 1.1 2013/08/03 07:54:15 slyfox Exp $
-
-EAPI=5
-
-inherit eutils flag-o-matic
-
-MY_P=${P/_/-}
-
-DESCRIPTION="GNU Midnight Commander is a text based file manager"
-HOMEPAGE="http://www.midnight-commander.org"
-SRC_URI="http://www.midnight-commander.org/downloads/${MY_P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
-IUSE="+edit gpm mclib nls samba sftp +slang spell test X +xdg"
-
-REQUIRED_USE="spell? ( edit )"
-
-RDEPEND=">=dev-libs/glib-2.8:2
-	gpm? ( sys-libs/gpm )
-	kernel_linux? ( sys-fs/e2fsprogs )
-	samba? ( net-fs/samba )
-	sftp? ( net-libs/libssh2 )
-	slang? ( >=sys-libs/slang-2 )
-	!slang? ( sys-libs/ncurses )
-	spell? ( app-text/aspell )
-	X? ( x11-libs/libX11
-		x11-libs/libICE
-		x11-libs/libXau
-		x11-libs/libXdmcp
-		x11-libs/libSM )"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	test? ( dev-libs/check )
-	"
-
-[[ -n ${LIVE_EBUILD} ]] && DEPEND="${DEPEND} dev-vcs/cvs" # needed only for SCM source tree (autopoint uses cvs)
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-4.8.9-unknown-opts.patch"
-
-	[[ -n ${LIVE_EBUILD} ]] && ./autogen.sh
-}
-
-S=${WORKDIR}/${MY_P}
-
-src_configure() {
-	local myscreen=ncurses
-	use slang && myscreen=slang
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags "-lnsl -lsocket"
-
-	local homedir=".mc"
-	use xdg && homedir="XDG"
-
-	econf \
-		--disable-silent-rules \
-		--disable-dependency-tracking \
-		$(use_enable nls) \
-		--enable-vfs \
-		$(use_enable kernel_linux vfs-undelfs) \
-		--enable-charset \
-		$(use_with X x) \
-		$(use_enable samba vfs-smb) \
-		$(use_enable sftp vfs-sftp) \
-		$(use_enable spell aspell) \
-		$(use_with gpm gpm-mouse) \
-		--with-screen=${myscreen} \
-		$(use_with edit internal-edit) \
-		$(use_enable mclib) \
-		$(use_enable test tests) \
-		--with-homedir=${homedir}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS README NEWS
-
-	# fix bug #334383
-	if use kernel_linux && [[ ${EUID} == 0 ]] ; then
-		fowners root:tty /usr/libexec/mc/cons.saver
-		fperms g+s /usr/libexec/mc/cons.saver
-	fi
-
-	if ! use xdg ; then
-		sed 's@MC_XDG_OPEN="xdg-open"@MC_XDG_OPEN="/bin/false"@' \
-			-i "${ED}"/usr/libexec/mc/ext.d/*.sh || die
-	fi
-}
-
-pkg_postinst() {
-	elog "To enable exiting to latest working directory,"
-	elog "put this into your ~/.bashrc:"
-	elog ". ${EPREFIX}/usr/libexec/mc/mc.sh"
-}
diff --git a/app-misc/mc/mc-4.8.7-r1.ebuild b/app-misc/mc/mc-4.8.7-r1.ebuild
deleted file mode 100644
index 902b63f36f2d..000000000000
--- a/app-misc/mc/mc-4.8.7-r1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/mc-4.8.7-r1.ebuild,v 1.1 2013/01/11 11:38:42 polynomial-c Exp $
-
-EAPI=4
-
-inherit eutils flag-o-matic
-
-MY_P=${P/_/-}
-
-DESCRIPTION="GNU Midnight Commander is a text based file manager"
-HOMEPAGE="http://www.midnight-commander.org"
-SRC_URI="http://www.midnight-commander.org/downloads/${MY_P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
-IUSE="+edit gpm mclib nls samba sftp +slang spell test X +xdg"
-
-REQUIRED_USE="spell? ( edit )"
-
-RDEPEND=">=dev-libs/glib-2.8:2
-	gpm? ( sys-libs/gpm )
-	kernel_linux? ( sys-fs/e2fsprogs )
-	samba? ( net-fs/samba )
-	sftp? ( net-libs/libssh2 )
-	slang? ( >=sys-libs/slang-2 )
-	!slang? ( sys-libs/ncurses )
-	spell? ( app-text/aspell )
-	X? ( x11-libs/libX11
-		x11-libs/libICE
-		x11-libs/libXau
-		x11-libs/libXdmcp
-		x11-libs/libSM )"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	test? ( dev-libs/check )
-	"
-
-[[ -n ${LIVE_EBUILD} ]] && DEPEND="${DEPEND} dev-vcs/cvs" # needed only for SCM source tree (autopoint uses cvs)
-
-src_prepare() {
-	[[ -n ${LIVE_EBUILD} ]] && ./autogen.sh
-}
-
-S=${WORKDIR}/${MY_P}
-
-src_configure() {
-	local myscreen=ncurses
-	use slang && myscreen=slang
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags "-lnsl -lsocket"
-
-	local homedir=".mc"
-	use xdg && homedir="XDG"
-
-	econf \
-		--disable-silent-rules \
-		--disable-dependency-tracking \
-		$(use_enable nls) \
-		--enable-vfs \
-		$(use_enable kernel_linux vfs-undelfs) \
-		--enable-charset \
-		$(use_with X x) \
-		$(use_enable samba vfs-smb) \
-		$(use_enable sftp vfs-sftp) \
-		$(use_enable spell aspell) \
-		$(use_with gpm gpm-mouse) \
-		--with-screen=${myscreen} \
-		$(use_with edit) \
-		$(use_enable mclib) \
-		$(use_enable test tests) \
-		--with-homedir=${homedir}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS README NEWS
-
-	# fix bug #334383
-	if use kernel_linux && [[ ${EUID} == 0 ]] ; then
-		fowners root:tty /usr/libexec/mc/cons.saver
-		fperms g+s /usr/libexec/mc/cons.saver
-	fi
-
-	if ! use xdg ; then
-		sed 's@MC_XDG_OPEN="xdg-open"@MC_XDG_OPEN="/bin/false"@' \
-			-i "${ED}"/usr/libexec/mc/ext.d/*.sh || die
-	fi
-}
-
-pkg_postinst() {
-	elog "To enable exiting to latest working directory,"
-	elog "put this into your ~/.bashrc:"
-	elog ". ${EPREFIX}/usr/libexec/mc/mc.sh"
-}
diff --git a/app-misc/mc/mc-4.8.7.ebuild b/app-misc/mc/mc-4.8.7.ebuild
deleted file mode 100644
index 86857a2c7253..000000000000
--- a/app-misc/mc/mc-4.8.7.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/mc-4.8.7.ebuild,v 1.11 2013/01/13 19:34:37 armin76 Exp $
-
-EAPI=4
-
-inherit eutils flag-o-matic
-
-MY_P=${P/_/-}
-
-DESCRIPTION="GNU Midnight Commander is a text based file manager"
-HOMEPAGE="http://www.midnight-commander.org"
-SRC_URI="http://www.midnight-commander.org/downloads/${MY_P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
-IUSE="+edit gpm mclib nls samba sftp +slang spell test X +xdg"
-
-REQUIRED_USE="spell? ( edit )"
-
-RDEPEND=">=dev-libs/glib-2.8:2
-	gpm? ( sys-libs/gpm )
-	kernel_linux? ( sys-fs/e2fsprogs )
-	samba? ( net-fs/samba )
-	sftp? ( net-libs/libssh2 )
-	slang? ( >=sys-libs/slang-2 )
-	!slang? ( sys-libs/ncurses )
-	spell? ( app-text/aspell )
-	X? ( x11-libs/libX11
-		x11-libs/libICE
-		x11-libs/libXau
-		x11-libs/libXdmcp
-		x11-libs/libSM )"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	test? ( dev-libs/check )
-	"
-
-[[ -n ${LIVE_EBUILD} ]] && DEPEND="${DEPEND} dev-vcs/cvs" # needed only for SCM source tree (autopoint uses cvs)
-
-src_prepare() {
-	[[ -n ${LIVE_EBUILD} ]] && ./autogen.sh
-}
-
-S=${WORKDIR}/${MY_P}
-
-src_configure() {
-	local myscreen=ncurses
-	use slang && myscreen=slang
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags "-lnsl -lsocket"
-
-	local homedir=".mc"
-	use xdg && homedir="XDG"
-
-	econf \
-		--disable-silent-rules \
-		--disable-dependency-tracking \
-		$(use_enable nls) \
-		--enable-vfs \
-		$(use_enable kernel_linux vfs-undelfs) \
-		--enable-charset \
-		$(use_with X x) \
-		$(use_enable samba vfs-smb) \
-		$(use_enable sftp vfs-sftp) \
-		$(use_enable spell aspell) \
-		$(use_with gpm gpm-mouse) \
-		--with-screen=${myscreen} \
-		$(use_with edit) \
-		$(use_enable mclib) \
-		$(use_enable test tests) \
-		--with-homedir=${homedir}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS README NEWS
-
-	# fix bug #334383
-	if use kernel_linux && [[ ${EUID} == 0 ]] ; then
-		fowners root:tty /usr/libexec/mc/cons.saver
-		fperms g+s /usr/libexec/mc/cons.saver
-	fi
-}
-
-pkg_postinst() {
-	elog "To enable exiting to latest working directory,"
-	elog "put this into your ~/.bashrc:"
-	elog ". ${EPREFIX}/usr/libexec/mc/mc.sh"
-}
diff --git a/app-misc/mc/mc-4.8.8-r1.ebuild b/app-misc/mc/mc-4.8.8-r1.ebuild
deleted file mode 100644
index 48cec639c99a..000000000000
--- a/app-misc/mc/mc-4.8.8-r1.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/mc-4.8.8-r1.ebuild,v 1.1 2013/06/19 13:35:32 wired Exp $
-
-EAPI=4
-
-inherit eutils flag-o-matic
-
-MY_P=${P/_/-}
-
-DESCRIPTION="GNU Midnight Commander is a text based file manager"
-HOMEPAGE="http://www.midnight-commander.org"
-SRC_URI="http://www.midnight-commander.org/downloads/${MY_P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
-IUSE="+edit gpm mclib nls samba sftp +slang spell test X +xdg"
-
-REQUIRED_USE="spell? ( edit )"
-
-RDEPEND=">=dev-libs/glib-2.8:2
-	gpm? ( sys-libs/gpm )
-	kernel_linux? ( sys-fs/e2fsprogs )
-	samba? ( net-fs/samba )
-	sftp? ( net-libs/libssh2 )
-	slang? ( >=sys-libs/slang-2 )
-	!slang? ( sys-libs/ncurses )
-	spell? ( app-text/aspell )
-	X? ( x11-libs/libX11
-		x11-libs/libICE
-		x11-libs/libXau
-		x11-libs/libXdmcp
-		x11-libs/libSM )"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	test? ( dev-libs/check )
-	"
-
-[[ -n ${LIVE_EBUILD} ]] && DEPEND="${DEPEND} dev-vcs/cvs" # needed only for SCM source tree (autopoint uses cvs)
-
-src_prepare() {
-	[[ -n ${LIVE_EBUILD} ]] && ./autogen.sh
-
-	# bug #473244
-	epatch "${FILESDIR}/${P}-segfault-unowned-temp-dir.patch"
-}
-
-S=${WORKDIR}/${MY_P}
-
-src_configure() {
-	local myscreen=ncurses
-	use slang && myscreen=slang
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags "-lnsl -lsocket"
-
-	local homedir=".mc"
-	use xdg && homedir="XDG"
-
-	econf \
-		--disable-silent-rules \
-		--disable-dependency-tracking \
-		$(use_enable nls) \
-		--enable-vfs \
-		$(use_enable kernel_linux vfs-undelfs) \
-		--enable-charset \
-		$(use_with X x) \
-		$(use_enable samba vfs-smb) \
-		$(use_enable sftp vfs-sftp) \
-		$(use_enable spell aspell) \
-		$(use_with gpm gpm-mouse) \
-		--with-screen=${myscreen} \
-		$(use_with edit) \
-		$(use_enable mclib) \
-		$(use_enable test tests) \
-		--with-homedir=${homedir}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS README NEWS
-
-	# fix bug #334383
-	if use kernel_linux && [[ ${EUID} == 0 ]] ; then
-		fowners root:tty /usr/libexec/mc/cons.saver
-		fperms g+s /usr/libexec/mc/cons.saver
-	fi
-
-	if ! use xdg ; then
-		sed 's@MC_XDG_OPEN="xdg-open"@MC_XDG_OPEN="/bin/false"@' \
-			-i "${ED}"/usr/libexec/mc/ext.d/*.sh || die
-	fi
-}
-
-pkg_postinst() {
-	elog "To enable exiting to latest working directory,"
-	elog "put this into your ~/.bashrc:"
-	elog ". ${EPREFIX}/usr/libexec/mc/mc.sh"
-}
diff --git a/app-misc/mc/mc-4.8.8-r2.ebuild b/app-misc/mc/mc-4.8.8-r2.ebuild
deleted file mode 100644
index 40a8b85babfb..000000000000
--- a/app-misc/mc/mc-4.8.8-r2.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/mc-4.8.8-r2.ebuild,v 1.1 2013/07/09 10:11:06 polynomial-c Exp $
-
-EAPI=5
-
-inherit eutils flag-o-matic
-
-MY_P=${P/_/-}
-
-DESCRIPTION="GNU Midnight Commander is a text based file manager"
-HOMEPAGE="http://www.midnight-commander.org"
-SRC_URI="http://www.midnight-commander.org/downloads/${MY_P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
-IUSE="+edit gpm mclib nls samba sftp +slang spell test X +xdg"
-
-REQUIRED_USE="spell? ( edit )"
-
-RDEPEND=">=dev-libs/glib-2.8:2
-	gpm? ( sys-libs/gpm )
-	kernel_linux? ( sys-fs/e2fsprogs )
-	samba? ( net-fs/samba )
-	sftp? ( net-libs/libssh2 )
-	slang? ( >=sys-libs/slang-2 )
-	!slang? ( sys-libs/ncurses )
-	spell? ( app-text/aspell )
-	X? ( x11-libs/libX11
-		x11-libs/libICE
-		x11-libs/libXau
-		x11-libs/libXdmcp
-		x11-libs/libSM )"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	test? ( dev-libs/check )
-	"
-
-[[ -n ${LIVE_EBUILD} ]] && DEPEND="${DEPEND} dev-vcs/cvs" # needed only for SCM source tree (autopoint uses cvs)
-
-src_prepare() {
-	[[ -n ${LIVE_EBUILD} ]] && ./autogen.sh
-
-	# bug #473244
-	epatch "${FILESDIR}/${P}-segfault-unowned-temp-dir.patch"
-	# bug #403863
-	epatch "${FILESDIR}/${P}-race_cond_create_tmp_dir.patch"
-	# bug #461284
-	epatch "${FILESDIR}/${P}-wrong_char_in_menu_file.patch"
-}
-
-S=${WORKDIR}/${MY_P}
-
-src_configure() {
-	local myscreen=ncurses
-	use slang && myscreen=slang
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags "-lnsl -lsocket"
-
-	local homedir=".mc"
-	use xdg && homedir="XDG"
-
-	econf \
-		--disable-silent-rules \
-		--disable-dependency-tracking \
-		$(use_enable nls) \
-		--enable-vfs \
-		$(use_enable kernel_linux vfs-undelfs) \
-		--enable-charset \
-		$(use_with X x) \
-		$(use_enable samba vfs-smb) \
-		$(use_enable sftp vfs-sftp) \
-		$(use_enable spell aspell) \
-		$(use_with gpm gpm-mouse) \
-		--with-screen=${myscreen} \
-		$(use_with edit) \
-		$(use_enable mclib) \
-		$(use_enable test tests) \
-		--with-homedir=${homedir}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS README NEWS
-
-	# fix bug #334383
-	if use kernel_linux && [[ ${EUID} == 0 ]] ; then
-		fowners root:tty /usr/libexec/mc/cons.saver
-		fperms g+s /usr/libexec/mc/cons.saver
-	fi
-
-	if ! use xdg ; then
-		sed 's@MC_XDG_OPEN="xdg-open"@MC_XDG_OPEN="/bin/false"@' \
-			-i "${ED}"/usr/libexec/mc/ext.d/*.sh || die
-	fi
-}
-
-pkg_postinst() {
-	elog "To enable exiting to latest working directory,"
-	elog "put this into your ~/.bashrc:"
-	elog ". ${EPREFIX}/usr/libexec/mc/mc.sh"
-}
diff --git a/app-misc/mc/mc-4.8.9.ebuild b/app-misc/mc/mc-4.8.9.ebuild
deleted file mode 100644
index dca1ecfebbd5..000000000000
--- a/app-misc/mc/mc-4.8.9.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/mc-4.8.9.ebuild,v 1.11 2014/01/18 20:02:23 ago Exp $
-
-EAPI=5
-
-inherit eutils flag-o-matic
-
-MY_P=${P/_/-}
-
-DESCRIPTION="GNU Midnight Commander is a text based file manager"
-HOMEPAGE="http://www.midnight-commander.org"
-SRC_URI="http://www.midnight-commander.org/downloads/${MY_P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
-IUSE="+edit gpm mclib nls samba sftp +slang spell test X +xdg"
-
-REQUIRED_USE="spell? ( edit )"
-
-RDEPEND=">=dev-libs/glib-2.8:2
-	gpm? ( sys-libs/gpm )
-	kernel_linux? ( sys-fs/e2fsprogs )
-	samba? ( net-fs/samba )
-	sftp? ( net-libs/libssh2 )
-	slang? ( >=sys-libs/slang-2 )
-	!slang? ( sys-libs/ncurses )
-	spell? ( app-text/aspell )
-	X? ( x11-libs/libX11
-		x11-libs/libICE
-		x11-libs/libXau
-		x11-libs/libXdmcp
-		x11-libs/libSM )"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	test? ( dev-libs/check )
-	"
-
-[[ -n ${LIVE_EBUILD} ]] && DEPEND="${DEPEND} dev-vcs/cvs" # needed only for SCM source tree (autopoint uses cvs)
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-4.8.9-unknown-opts.patch"
-	epatch "${FILESDIR}/${PN}-4.8.9-ncurses-include-fix.patch"
-
-	[[ -n ${LIVE_EBUILD} ]] && ./autogen.sh
-}
-
-S=${WORKDIR}/${MY_P}
-
-src_configure() {
-	local myscreen=ncurses
-	use slang && myscreen=slang
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags "-lnsl -lsocket"
-
-	local homedir=".mc"
-	use xdg && homedir="XDG"
-
-	econf \
-		--disable-silent-rules \
-		--disable-dependency-tracking \
-		$(use_enable nls) \
-		--enable-vfs \
-		$(use_enable kernel_linux vfs-undelfs) \
-		--enable-charset \
-		$(use_with X x) \
-		$(use_enable samba vfs-smb) \
-		$(use_enable sftp vfs-sftp) \
-		$(use_enable spell aspell) \
-		$(use_with gpm gpm-mouse) \
-		--with-screen=${myscreen} \
-		$(use_with edit internal-edit) \
-		$(use_enable mclib) \
-		$(use_enable test tests) \
-		--with-homedir=${homedir}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS README NEWS
-
-	# fix bug #334383
-	if use kernel_linux && [[ ${EUID} == 0 ]] ; then
-		fowners root:tty /usr/libexec/mc/cons.saver
-		fperms g+s /usr/libexec/mc/cons.saver
-	fi
-
-	if ! use xdg ; then
-		sed 's@MC_XDG_OPEN="xdg-open"@MC_XDG_OPEN="/bin/false"@' \
-			-i "${ED}"/usr/libexec/mc/ext.d/*.sh || die
-	fi
-}
-
-pkg_postinst() {
-	elog "To enable exiting to latest working directory,"
-	elog "put this into your ~/.bashrc:"
-	elog ". ${EPREFIX}/usr/libexec/mc/mc.sh"
-}
diff --git a/app-office/libreoffice/libreoffice-4.2.1.1.ebuild b/app-office/libreoffice/libreoffice-4.2.1.1.ebuild
index b42a4a80870a..163444e812e3 100644
--- a/app-office/libreoffice/libreoffice-4.2.1.1.ebuild
+++ b/app-office/libreoffice/libreoffice-4.2.1.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-office/libreoffice/libreoffice-4.2.1.1.ebuild,v 1.3 2014/03/10 08:48:41 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.2.1.1.ebuild,v 1.4 2014/03/25 20:59:17 dilfridge Exp $
 
 EAPI=5
 
@@ -117,7 +117,7 @@ COMMON_DEPEND="
 	>=dev-libs/hyphen-2.7.1
 	>=dev-libs/icu-4.8.1.1:=
 	>=dev-libs/libatomic_ops-7.2d
-	>=dev-libs/liborcus-0.5.1:=
+	=dev-libs/liborcus-0.5*
 	>=dev-libs/nspr-4.8.8
 	>=dev-libs/nss-3.12.9
 	>=dev-lang/perl-5.0
diff --git a/app-office/libreoffice/libreoffice-9999-r2.ebuild b/app-office/libreoffice/libreoffice-9999-r2.ebuild
index 27f49c77af25..bb6a6792eb2a 100644
--- a/app-office/libreoffice/libreoffice-9999-r2.ebuild
+++ b/app-office/libreoffice/libreoffice-9999-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/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.211 2014/03/10 08:48:41 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.214 2014/03/25 10:28:58 scarabeus Exp $
 
 EAPI=5
 
@@ -117,7 +117,7 @@ COMMON_DEPEND="
 	>=dev-libs/hyphen-2.7.1
 	>=dev-libs/icu-4.8.1.1:=
 	>=dev-libs/libatomic_ops-7.2d
-	>=dev-libs/liborcus-0.5.1:=
+	>=dev-libs/liborcus-0.7.0:=
 	>=dev-libs/nspr-4.8.8
 	>=dev-libs/nss-3.12.9
 	>=dev-lang/perl-5.0
@@ -126,6 +126,7 @@ COMMON_DEPEND="
 	media-gfx/graphite2
 	>=media-libs/fontconfig-2.8.0
 	media-libs/freetype:2
+	>=media-libs/glew-1.10
 	>=media-libs/harfbuzz-0.9.18:=[icu(+)]
 	media-libs/lcms:2
 	>=media-libs/libpng-1.4
@@ -210,7 +211,7 @@ DEPEND="${COMMON_DEPEND}
 	>=dev-util/gperf-3
 	dev-util/intltool
 	>=dev-util/mdds-0.10.2:=
-	virtual/pkgconfig
+	media-libs/glm
 	net-misc/npapi-sdk
 	>=sys-apps/findutils-4.4.2
 	sys-devel/bison
@@ -220,6 +221,7 @@ DEPEND="${COMMON_DEPEND}
 	>=sys-devel/make-3.82
 	sys-devel/ucpp
 	sys-libs/zlib
+	virtual/pkgconfig
 	x11-libs/libXt
 	x11-libs/libXtst
 	x11-proto/randrproto
diff --git a/app-text/XML-Schema-learner/XML-Schema-learner-1.0.0.ebuild b/app-text/XML-Schema-learner/XML-Schema-learner-1.0.0.ebuild
index 5c4c113b8cfc..6e3fc4d9cef9 100644
--- a/app-text/XML-Schema-learner/XML-Schema-learner-1.0.0.ebuild
+++ b/app-text/XML-Schema-learner/XML-Schema-learner-1.0.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/app-text/XML-Schema-learner/XML-Schema-learner-1.0.0.ebuild,v 1.1 2014/01/09 03:31:56 mjo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/XML-Schema-learner/XML-Schema-learner-1.0.0.ebuild,v 1.2 2014/03/25 09:25:53 nimiux Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="test"
 
 # PHP dependency can be inferred from .travis.yml in the repository.
diff --git a/dev-lang/parrot/Manifest b/dev-lang/parrot/Manifest
index 45135a86001e..b69539fcd73b 100644
--- a/dev-lang/parrot/Manifest
+++ b/dev-lang/parrot/Manifest
@@ -1,4 +1 @@
-DIST parrot-5.10.0.tar.gz 4595044 SHA256 417d504ccf557528d179c9f25df4f8430d5ec1e703ea63126d722452bfd38be3 SHA512 abd627545f85e42a9d20e13f73ef30595cea6ad252b1fd6d06982ec9afb0534520affc99a77bd2d648deb4090a22c818b03e30b5c5a7f99041da5b1776025f33 WHIRLPOOL 0f5b1fa6c4accea9ba6836b2be2db7478d61bf6f3f7d533e4aadb1cfc074547d08d8d506616d8f5d1216d8b2a2db92072476bd883e56eb828a8a606c6103bace
-DIST parrot-5.7.0.tar.gz 4604326 SHA256 0d07c210a8b90d368cde600351173b8c90a28d376379836ba36edf83acf7a21f SHA512 6db01c4c092f64cb7dbaab99972ddcea73183bbca18a9005871992ca57035d0adca5408af944e40e84095cc35badc6ebf611177fc3d73112577a2f1b7745de75 WHIRLPOOL dac3f775d67fc4f6c3baffc0e8d5176f7466827e19b2a96e0f3ae8ac6e0ecce5de7aa66a93e0265ed8867341169f0bc332501b05bf3fa251f35be2dd2a8663e1
-DIST parrot-6.0.0.tar.gz 4592131 SHA256 e150d4c5a3f12ae9d300f019bf03cca58d8e8051dd0b934222b4e4c91160cd54 SHA512 763f390948581e00cfc4bfec46bdc0ef19052c98db35fbf515a7ad2315e96db2f7a537fb0918e6edf16eb620b415d6bf14100f2a46de80893c9850c20509e81c WHIRLPOOL da676a49e7c4ebdf40ddc17387d7c7e6502a531816a7851c3fc46976da97ecd2aa817d3950cf77005d4d0d47283d58efc090f3f44c237f5e410b4ac391cc408f
 DIST parrot-6.1.0.tar.gz 4602229 SHA256 87d25119c73acdb26f89ac4c68d73f3d996451ada51f3cb2cd4878b6f0e0a34c SHA512 f6945a44566cb4a4f6e4cc6c056ecb0038caf0b1b20927c12427ec24f22ba77d19043b403bde3d212324bc8f1fa83fa619661255a13e13d7066bbeb1f407b74f WHIRLPOOL cac154c3d8c78ba9ac1b86144c809261229e16fa86236303cce193ca726c914ab39aa5dc093f2678e63d117a6628242f50b936430c9a2b774203d0382f6af179
diff --git a/dev-lang/parrot/files/perldoc-5.10.patch b/dev-lang/parrot/files/perldoc-5.10.patch
deleted file mode 100644
index 43a7fddee142..000000000000
--- a/dev-lang/parrot/files/perldoc-5.10.patch
+++ /dev/null
@@ -1,146 +0,0 @@
-diff --git a/config/auto/perldoc.pm b/config/auto/perldoc.pm
-index 4d87aca..7e54156 100644
---- a/config/auto/perldoc.pm
-+++ b/config/auto/perldoc.pm
-@@ -66,24 +66,12 @@ E_NOTE
-     foreach my $ops (@ops) {
-         my $pod = $ops;
-         $pod =~ s/\.ops$/.pod/;
--        if ( $new_perldoc ) {
--            $TEMP_pod_build .= <<"END";
-+        $TEMP_pod_build .= <<"END";
- ops/$pod: ../src/ops/$ops
--\t\$(PERLDOC) -ud ops/$pod ../src/ops/$ops
-+\t\$(PODEXTRACT) ../src/ops/$ops ops/$pod
- \t\$(CHMOD) 0644 ops/$pod
- \t\$(ADDGENERATED) "docs/\$\@" "[doc]"
--
--END
--        }
--        else {
--            $TEMP_pod_build .= <<"END";
--ops/$pod: ../src/ops/$ops
--\t\$(PERLDOC) -u ../ops/$ops > ops/$pod
--\t\$(CHMOD) 0644 ../ops/$pod
--\t\$(ADDGENERATED) "docs/\$\@" "[doc]"
--
- END
--        }
-     }
- 
-     $conf->data->set(
-diff --git a/config/gen/makefiles/docs.in b/config/gen/makefiles/docs.in
-index 3e8c74b..4e8f35d 100644
---- a/config/gen/makefiles/docs.in
-+++ b/config/gen/makefiles/docs.in
-@@ -11,6 +11,7 @@ RM_RF   = @rm_rf@
- PERLDOC = @perldoc@
- POD2MAN = @pod2man@
- VERSION = @VERSION@@DEVEL@
-+PODEXTRACT   = $(PERL) ../tools/build/podextract.pl
- ADDGENERATED = $(PERL) ../tools/build/addgenerated.pl
- OPS_SUMMARY = ../tools/docs/ops_summary.pl
- 
-@@ -63,8 +64,7 @@ doc-prep:
- 	$(TOUCH) doc-prep
- 
- packfile-c.pod: ../src/packfile/api.c
--#IF(new_perldoc):	$(PERLDOC) -ud packfile-c.pod ../src/packfile/api.c
--#ELSE:	$(PERLDOC) -u ../src/packfile/api.c > packfile-c.pod
-+	$(PODEXTRACT) ../src/packfile/api.c packfile-c.pod
- 	$(ADDGENERATED) "docs/$@" "[doc]"
- 
- .pod.1 : # suffix rule (limited support)
-diff --git a/config/gen/makefiles/root.in b/config/gen/makefiles/root.in
-index c1f0c19..36e853a 100644
---- a/config/gen/makefiles/root.in
-+++ b/config/gen/makefiles/root.in
-@@ -115,6 +115,7 @@ LDFLAGS          = @ldflags@ @ld_debug@
- INNO_SETUP       = iscc
- TEMPDIR          = @tempdir@
- RPATH_BLIB       = @rpath_blib@
-+PODEXTRACT       = $(PERL) $(BUILD_TOOLS_DIR)/podextract.pl
- ADDGENERATED     = $(PERL) $(BUILD_TOOLS_DIR)/addgenerated.pl
- #IF(darwin):export MACOSX_DEPLOYMENT_TARGET = @osx_version@
- 
-diff --git a/tools/build/podextract.pl b/tools/build/podextract.pl
-new file mode 100644
-index 0000000..0979b6b
---- /dev/null
-+++ b/tools/build/podextract.pl
-@@ -0,0 +1,75 @@
-+#! perl
-+
-+=head1 NAME
-+
-+tools/build/podextract.pl
-+
-+=head1 DESCRIPTION
-+
-+Simple POD Extraction
-+
-+=head1 SYNOPSIS
-+
-+Previously:
-+
-+    perldoc -ud $target $source
-+
-+or
-+
-+    perldoc -u $source > $target
-+
-+Now:
-+
-+    perl podextract.pl $source $target
-+
-+=head1 RATIONALE
-+
-+C<perldoc> does many things, and is somewhat complex.
-+
-+For instance, normally,
-+
-+    perldoc perldoc
-+
-+Inspects various paths, and paths that are controlled by C<%ENV> to find relevant documentation for "perldoc".
-+
-+And because of this, it is a little security concious, and pre-emptively drops root to UID=nobody
-+
-+But Parrot is not using this feature of C<perldoc>
-+
-+Parrot is simply using C<perldoc> as a content filter to extract C<POD> from source files.
-+
-+And as such, it only needs the alternative function
-+
-+    perldoc $PATH
-+
-+To work, which doesn't require C<%ENV>, and additionally, dropping root to C<UID=nobody> makes it impossible
-+for some parrot to invoke C<perldoc -ud $target $source> on some systems, because it drops privelages and can then no longer read C<$source>, and can no longer write C<$target>.
-+
-+However, some means vendor tooling that B<MUST> execute C<make install> as root, by proxy, C<MUST> invoke C<perldoc> as root, and as such, invokes the security problem, which is impossible to work around.
-+
-+Given a simple C<chmod> is not enough, because parent directories also are not readable or writeable by C<UID=nobody>, and additionally, vendor tooling causes fatal access violations when a process running as C<UID=nobody> even attempts to do directory lookaround ( which C<perldoc> does much of as part of C<%ENV> handling )
-+
-+So this tool is simple:
-+
-+It takes the very core utility in C<PerlDoc> that parrot needed to utilize, and calls it directly.
-+
-+And this avoids the misguided attempts of increasing security, which simply does nothing useful.
-+
-+=cut
-+
-+use strict;
-+use warnings;
-+
-+if ( not $ARGV[1] ) {
-+    die "pod_extract <src> <target>";
-+}
-+if ( not -e $ARGV[0] ) {
-+    die "<src> $ARGV[0] does not exist";
-+}
-+require Pod::Perldoc::ToPod;
-+my $parser = Pod::Perldoc::ToPod->new();
-+open my $output, '>', $ARGV[1] or die "Cant write to $ARGV[1] $! $?";
-+$parser->parse_from_file( $ARGV[0], $output );
-+
-+1
-+
diff --git a/dev-lang/parrot/files/perldoc.patch b/dev-lang/parrot/files/perldoc.patch
deleted file mode 100644
index 710148949435..000000000000
--- a/dev-lang/parrot/files/perldoc.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -Naur parrot-5.5.0/config/auto/perldoc.pm parrot-5.5.0/config/auto/perldoc.pm
---- parrot-5.5.0/config/auto/perldoc.pm	2013-04-30 19:11:28.000000000 +0000
-+++ parrot-5.5.0/config/auto/perldoc.pm	2013-06-26 15:44:31.031675583 +0000
-@@ -38,7 +38,7 @@
- 
-     my $cmd = File::Spec->catfile($conf->data->get('scriptdirexp_provisional'), q{perldoc});
-     my ( $fh, $filename ) = tempfile( UNLINK => 1 );
--    my $content = capture_output("$cmd -ud $filename perldoc") || undef;
-+    my $content = capture_output("$cmd -u perldoc > $filename") || undef;
- 
-     return 1 unless defined( $self->_initial_content_check($conf, $content) );
- 
-@@ -67,7 +67,7 @@
-         if ( $new_perldoc ) {
-             $TEMP_pod_build .= <<"END";
- ops/$pod: ../src/ops/$ops
--\t\$(PERLDOC) -ud ops/$pod ../src/ops/$ops
-+\t\$(PERLDOC) -u ../src/ops/$ops > ops/$pod
- \t\$(CHMOD) 0644 ops/$pod
- \t\$(ADDGENERATED) "docs/\$\@" "[doc]"
- 
-diff -Naur parrot-5.5.0/config/gen/makefiles/docs.in parrot-5.5.0/config/gen/makefiles/docs.in
---- parrot-5.5.0/config/gen/makefiles/docs.in	2013-06-15 17:36:41.000000000 +0000
-+++ parrot-5.5.0/config/gen/makefiles/docs.in	2013-06-26 15:39:41.109881123 +0000
-@@ -63,7 +63,7 @@
- 	$(TOUCH) doc-prep
- 
- packfile-c.pod: ../src/packfile/api.c
--#IF(new_perldoc):	$(PERLDOC) -ud packfile-c.pod ../src/packfile/api.c
-+#IF(new_perldoc):	$(PERLDOC) -u ../src/packfile/api.c > packfile-c.pod
- #ELSE:	$(PERLDOC) -u ../src/packfile/api.c > packfile-c.pod
- 	$(ADDGENERATED) "docs/$@" "[doc]"
- 
diff --git a/dev-lang/parrot/parrot-5.10.0.ebuild b/dev-lang/parrot/parrot-5.10.0.ebuild
deleted file mode 100644
index ca57b057ee29..000000000000
--- a/dev-lang/parrot/parrot-5.10.0.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/parrot/parrot-5.10.0.ebuild,v 1.2 2013/12/11 02:50:25 patrick Exp $
-
-EAPI=3
-
-inherit eutils multilib
-
-# weird failures
-RESTRICT="test"
-
-DESCRIPTION="Virtual machine designed to efficiently compile and execute bytecode for dynamic languages"
-HOMEPAGE="http://www.parrot.org/"
-SRC_URI="ftp://ftp.parrot.org/pub/parrot/releases/devel/${PV}/${P}.tar.gz"
-
-LICENSE="Artistic-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="opengl nls doc examples gdbm gmp ssl +unicode pcre"
-
-RDEPEND="sys-libs/readline
-	opengl? ( media-libs/freeglut )
-	nls? ( sys-devel/gettext )
-	unicode? ( >=dev-libs/icu-2.6 )
-	gdbm? ( >=sys-libs/gdbm-1.8.3-r1 )
-	gmp? ( >=dev-libs/gmp-4.1.4 )
-	ssl? ( dev-libs/openssl )
-	pcre? ( dev-libs/libpcre )
-	doc? ( dev-perl/JSON )"
-
-DEPEND="dev-lang/perl[doc?]
-	${RDEPEND}"
-
-src_prepare() {
-	# Fix perldoc sandbox madness
-	epatch "${FILESDIR}/perldoc-5.10.patch" || die
-}
-
-src_configure() {
-	myconf="--disable-rpath"
-	use unicode || myconf+=" --without-icu"
-	use ssl     || myconf+=" --without-crypto"
-	use gdbm    || myconf+=" --without-gdbm"
-	use nls     || myconf+=" --without-gettext"
-	use gmp     || myconf+=" --without-gmp"
-	use opengl  || myconf+=" --without-opengl"
-	use pcre    || myconf+=" --without-pcre"
-
-	perl Configure.pl \
-		--ccflags="${CFLAGS}" \
-		--linkflags="${LDFLAGS}" \
-		--prefix="${EPREFIX}"/usr \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		--mandir="${EPREFIX}"/usr/share/man \
-		--sysconfdir="${EPREFIX}"/etc \
-		--sharedstatedir="${EPREFIX}"/var/lib/parrot \
-		$myconf || die
-}
-
-src_compile() {
-	export LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}"${S}"/blib/lib
-	# occasionally dies in parallel make
-	emake -j1 || die
-	if use doc ; then
-		emake -j1 html || die
-	fi
-}
-
-src_test() {
-	emake -j1 test || die
-}
-
-src_install() {
-	emake -j1 install-dev DESTDIR="${D}" DOC_DIR="${EPREFIX}/usr/share/doc/${PF}" || die
-	dodoc CREDITS DONORS.pod PBC_COMPAT PLATFORMS RESPONSIBLE_PARTIES TODO || die
-	if use examples; then
-		insinto "/usr/share/doc/${PF}/examples"
-		doins -r examples/* || die
-	fi
-	if use doc; then
-		insinto "/usr/share/doc/${PF}/editor"
-		doins -r editor || die
-		cd docs/html
-		dohtml -r developer.html DONORS.pod.html index.html ops.html parrotbug.html pdds.html \
-			pmc.html tools.html docs src tools || die
-	fi
-}
diff --git a/dev-lang/parrot/parrot-5.7.0.ebuild b/dev-lang/parrot/parrot-5.7.0.ebuild
deleted file mode 100644
index 72505bab6ebe..000000000000
--- a/dev-lang/parrot/parrot-5.7.0.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/parrot/parrot-5.7.0.ebuild,v 1.1 2013/09/24 07:07:09 patrick Exp $
-
-EAPI=3
-
-inherit eutils multilib
-
-DESCRIPTION="Virtual machine designed to efficiently compile and execute bytecode for dynamic languages"
-HOMEPAGE="http://www.parrot.org/"
-SRC_URI="ftp://ftp.parrot.org/pub/parrot/releases/devel/${PV}/${P}.tar.gz"
-
-LICENSE="Artistic-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="opengl nls doc examples gdbm gmp ssl +unicode pcre"
-
-RDEPEND="sys-libs/readline
-	opengl? ( media-libs/freeglut )
-	nls? ( sys-devel/gettext )
-	unicode? ( >=dev-libs/icu-2.6 )
-	gdbm? ( >=sys-libs/gdbm-1.8.3-r1 )
-	gmp? ( >=dev-libs/gmp-4.1.4 )
-	ssl? ( dev-libs/openssl )
-	pcre? ( dev-libs/libpcre )"
-
-DEPEND="dev-lang/perl[doc?]
-	${RDEPEND}"
-
-src_prepare() {
-	# Fix for #404195 - pcre detection is wonky
-	sed -i 's:libpcre.so.0:libpcre.so.1:' runtime/parrot/library/pcre.pir || die "Couldn't fix pcre location"
-	# Fix perldoc sandbox madness
-	epatch "${FILESDIR}/perldoc.patch" || die
-}
-
-src_configure() {
-	myconf="--disable-rpath"
-	use unicode || myconf+=" --without-icu"
-	use ssl     || myconf+=" --without-crypto"
-	use gdbm    || myconf+=" --without-gdbm"
-	use nls     || myconf+=" --without-gettext"
-	use gmp     || myconf+=" --without-gmp"
-	use opengl  || myconf+=" --without-opengl"
-	use pcre    || myconf+=" --without-pcre"
-
-	perl Configure.pl \
-		--ccflags="${CFLAGS}" \
-		--linkflags="${LDFLAGS}" \
-		--prefix="${EPREFIX}"/usr \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		--mandir="${EPREFIX}"/usr/share/man \
-		--sysconfdir="${EPREFIX}"/etc \
-		--sharedstatedir="${EPREFIX}"/var/lib/parrot \
-		$myconf || die
-}
-
-src_compile() {
-	export LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}"${S}"/blib/lib
-	# occasionally dies in parallel make
-	emake -j1 || die
-	if use doc ; then
-		emake -j1 html || die
-	fi
-}
-
-src_test() {
-	emake -j1 test || die
-}
-
-src_install() {
-	emake -j1 install-dev DESTDIR="${D}" DOC_DIR="${EPREFIX}/usr/share/doc/${PF}" || die
-	dodoc CREDITS DONORS.pod PBC_COMPAT PLATFORMS RESPONSIBLE_PARTIES TODO || die
-	if use examples; then
-		insinto "/usr/share/doc/${PF}/examples"
-		doins -r examples/* || die
-	fi
-	if use doc; then
-		insinto "/usr/share/doc/${PF}/editor"
-		doins -r editor || die
-		cd docs/html
-		dohtml -r developer.html DONORS.pod.html index.html ops.html parrotbug.html pdds.html \
-			pmc.html tools.html docs src tools || die
-	fi
-}
diff --git a/dev-lang/parrot/parrot-6.0.0.ebuild b/dev-lang/parrot/parrot-6.0.0.ebuild
deleted file mode 100644
index 5b544e7d02e7..000000000000
--- a/dev-lang/parrot/parrot-6.0.0.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/parrot/parrot-6.0.0.ebuild,v 1.1 2014/01/27 05:40:13 patrick Exp $
-
-EAPI=3
-
-inherit eutils multilib
-
-# weird failures
-RESTRICT="test"
-
-DESCRIPTION="Virtual machine designed to efficiently compile and execute bytecode for dynamic languages"
-HOMEPAGE="http://www.parrot.org/"
-SRC_URI="ftp://ftp.parrot.org/pub/parrot/releases/supported/${PV}/${P}.tar.gz"
-
-LICENSE="Artistic-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="opengl nls doc examples gdbm gmp ssl +unicode pcre"
-
-RDEPEND="sys-libs/readline
-	opengl? ( media-libs/freeglut )
-	nls? ( sys-devel/gettext )
-	unicode? ( >=dev-libs/icu-2.6 )
-	gdbm? ( >=sys-libs/gdbm-1.8.3-r1 )
-	gmp? ( >=dev-libs/gmp-4.1.4 )
-	ssl? ( dev-libs/openssl )
-	pcre? ( dev-libs/libpcre )
-	doc? ( dev-perl/JSON )"
-
-DEPEND="dev-lang/perl[doc?]
-	${RDEPEND}"
-
-src_prepare() {
-	# Fix perldoc sandbox madness
-	epatch "${FILESDIR}/perldoc-5.10.patch" || die
-}
-
-src_configure() {
-	myconf="--disable-rpath"
-	use unicode || myconf+=" --without-icu"
-	use ssl     || myconf+=" --without-crypto"
-	use gdbm    || myconf+=" --without-gdbm"
-	use nls     || myconf+=" --without-gettext"
-	use gmp     || myconf+=" --without-gmp"
-	use opengl  || myconf+=" --without-opengl"
-	use pcre    || myconf+=" --without-pcre"
-
-	perl Configure.pl \
-		--ccflags="${CFLAGS}" \
-		--linkflags="${LDFLAGS}" \
-		--prefix="${EPREFIX}"/usr \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		--mandir="${EPREFIX}"/usr/share/man \
-		--sysconfdir="${EPREFIX}"/etc \
-		--sharedstatedir="${EPREFIX}"/var/lib/parrot \
-		$myconf || die
-}
-
-src_compile() {
-	export LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}"${S}"/blib/lib
-	# occasionally dies in parallel make
-	emake -j1 || die
-	if use doc ; then
-		emake -j1 html || die
-	fi
-}
-
-src_test() {
-	emake -j1 test || die
-}
-
-src_install() {
-	emake -j1 install-dev DESTDIR="${D}" DOC_DIR="${EPREFIX}/usr/share/doc/${PF}" || die
-	dodoc CREDITS DONORS.pod PBC_COMPAT PLATFORMS RESPONSIBLE_PARTIES TODO || die
-	if use examples; then
-		insinto "/usr/share/doc/${PF}/examples"
-		doins -r examples/* || die
-	fi
-	if use doc; then
-		insinto "/usr/share/doc/${PF}/editor"
-		doins -r editor || die
-		cd docs/html
-		dohtml -r developer.html DONORS.pod.html index.html ops.html parrotbug.html pdds.html \
-			pmc.html tools.html docs src tools || die
-	fi
-}
diff --git a/dev-libs/glib/glib-2.38.2-r1.ebuild b/dev-libs/glib/glib-2.38.2-r1.ebuild
index 0ed559404fe9..aade32f82ee2 100644
--- a/dev-libs/glib/glib-2.38.2-r1.ebuild
+++ b/dev-libs/glib/glib-2.38.2-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/dev-libs/glib/glib-2.38.2-r1.ebuild,v 1.3 2014/03/15 11:25:49 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.38.2-r1.ebuild,v 1.4 2014/03/26 05:47:53 vapier Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python2_{6,7} )
@@ -16,7 +16,7 @@ SRC_URI="${SRC_URI}
 LICENSE="LGPL-2+"
 SLOT="2"
 IUSE="debug fam kernel_linux selinux static-libs systemtap test utils xattr"
-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"
+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"
 
 # FIXME: want libselinux[${MULTILIB_USEDEP}] - bug #480960
 RDEPEND="
diff --git a/dev-libs/gmp/Manifest b/dev-libs/gmp/Manifest
index b7cf3acf0d10..e3496e9016e8 100644
--- a/dev-libs/gmp/Manifest
+++ b/dev-libs/gmp/Manifest
@@ -8,6 +8,7 @@ DIST gmp-5.1.0.tar.xz 1806216 SHA256 c232d96b92ee251a6b8fdbf0a45d4db17a784846dfd
 DIST gmp-5.1.1.tar.xz 1812988 SHA256 4bd64d782fdeb61aeed45b434fca5246d66baa9de76f87cba30c38460d8834c2 SHA512 4cc3307411eb2144e87b791ee2f52e0020711638f911dfa3cc5929a57eda5ac7d9ca10c1c0bb75c96afc7ff7a9c6ad165bc87409b036c562867b4e5da15ba571 WHIRLPOOL 8a7afe06d530a15edb75a0c37c8497d1ab209dfeffebd44aecfcfe6b75586c182384cfdf8ea9b696ce968aed04944ec7c1c271730b65c34b2e3504d26565240e
 DIST gmp-5.1.2.tar.xz 1819560 SHA256 c7d943a6eceb4f0d3d3ab1176aec37853831cdfa281e012f8a344ba3ceefcbc2 SHA512 2c135bb6be908e93e63fe8828b2128b4e22e8ba29adf3cc917493ab66b42d54654dad7f101f902105e854731a69a202c38e34f119f642828fa5568ef21075c5a WHIRLPOOL dc18f8b2f7f592a52872f477ff375a29d58bca6661877bd0e4ef26766ed439e98172e277fed9f91d7204990b3030423bf6b3bff0b996ec371d6e681f8c21e504
 DIST gmp-5.1.3.tar.xz 1818812 SHA256 dee2eda37f4ff541f30019932db0c37f6f77a30ba3609234933b1818f9b07071 SHA512 44bbec2b2a6480d4c9a9a633cca4fe0de966c13bc08bdcd8b934d81e21f3dfacaecf273f149dc613d365277d280ecee43cffdafaec1bd1239a7ed903f8658b5b WHIRLPOOL 0c4365a129136655046a8e46c4e2487a981c03de97ec47899f752cbd6e61661c6068b19c547acce8436f7a9af91396545c9bf7aa9de73a0f29384bbfebef927f
+DIST gmp-6.0.0a.tar.xz 1904112 SHA256 9156d32edac6955bc53b0218f5f3763facb890b73a835d5e1b901dcf8eb8b764 SHA512 50368f4368b244b442438ce1768cf0f1166e490d1bafb8feda1ffc90fea3807e7328f30f3faa861799e4f5ff6e3113049ca3231b2f48571e4583fc3d60441816 WHIRLPOOL 81639a9d433ce9ccb26527af309c7c41437bb3463e5986cce3b35f81b527068a2304ec3287e660454f850dedab61463a077f49d4ea2b7ee87eec94b15730c394
 DIST gmp-man-5.0.2.pdf 1024222 SHA256 fcdd621dea0215b8920bdbfacf374ae8ef4f548a2d0c3e8d65d904f1b9d174d4 SHA512 95ea00ee16e87e9f379e76cd6c1a850866e5f22c0e6fc6e5deaae1213a694d28dd6fc09c105b5e71d4bb24e07ca8b77c56d756ef680beac1f64cc17ab51b246c WHIRLPOOL eaa78db21ee7dc8076a752cc949f336c1699c752626496d1490babc2d00115b08fa954ba9f732405d63bbdb43d97c43bed1917629fee1106e2e87942c78d6da8
 DIST gmp-man-5.0.3.pdf 1159053 SHA256 8f12da7b0665a2a0b5e1bc83c702e67b1b854382af5cba58c2859564fc930550 SHA512 4be246f234379033922255ece26f8f7b6056ee637f0d3964459829a946368ae01e2434b22fb1a180cf0a4efa7ad18d332d3e1a89cf9040d5f9f27e43cd3ca8ab WHIRLPOOL 50b27cccd274d84d2b35d2551089755b5b88837fb28a24c5e244c8706004925fe86ff81c2cc68d6125f2113b68a741b9a6615b931bf8260f2cd384dcd5115336
 DIST gmp-man-5.0.4.pdf 1160172 SHA256 c577d4dea9964e85c07f859d60833fc56d10aba16fd42f380939b0360f79defb SHA512 0159c748e75ba12a4fe3164e7071966e39475fa95b477e16de9cff095dd67c144c3aed24a611cf44c434bff9942faa432fb2222a7a27c587ed22a2df2f33a8c0 WHIRLPOOL df53ea3df9069c3958427ae18d29247c7502e5140b7c6f8c2b15d38aab308a9fa8dea8f3b636907ce5588cc738393e600e4f7160d502f42b6df339a7f76ad5ca
@@ -16,3 +17,4 @@ DIST gmp-man-5.1.0.pdf 1156063 SHA256 def7bae39aaf2756cd074207c02afca8b3dde66111
 DIST gmp-man-5.1.1.pdf 1156487 SHA256 c8c33650c321022c417275321b75e3b0c1bf87275f17323fa843778097449504 SHA512 3e855b882a039099bdc3719c94e4c18d0025e3a903b770752271a41dd9c5cf2b70654f6f59c32edfd4320e9954f679610764f379bd21b9d883d4fc20bd312f76 WHIRLPOOL b87d92601f3c170527192f78c60d6a137043f39772baabdd17957344207fbaae1ad88f03e22348e6e572f0a8a28ee1d80b3dc52015704cb52676b545ccb9f4e5
 DIST gmp-man-5.1.2.pdf 1156466 SHA256 2f059a5179c2ea971b9b16553b9f15504e82ef0b7bc7f0b80b1b4fe33147c21f SHA512 b6fc8d82bf15b3d550bf2388fefbba4c7e1bdd5b324d6be52e6398d7b8fb72dd4a59f498bec80a7c8382fe3b5c026434766f0c319742c1263326e0a5b589bb21 WHIRLPOOL b43d41bdf97b94c284fbff305d9968d3142f748b79df51b3e34aa4a576e1655ebe2d3c90473b95d90f79670ae7b100a7b5e5d26ae353470ef2e2f853748dce95
 DIST gmp-man-5.1.3.pdf 1159009 SHA256 56b0e21329f46ef1d59c1f191afc82c59f8b72273a8131ed9b5000b7d0689c38 SHA512 ba6a4b0bd2b5ee4d284dd13e9c5531fcb9cfbbbc80f40df458d73c80a1aa250b750cfdd5039998e8b0c7259a8b4d24bd0c7b59a90108f9b680bee62e6948d59e WHIRLPOOL ade206d7e1f543ed028f51e247067eec4511bd0f2499103e1e6296fad2bf50c4f8e09cf7688cc5dd56ee572cf889508ac7918f85e5f91d29d088882f7734a4e0
+DIST gmp-man-6.0.0a.pdf 1187496 SHA256 b38ed1d760b20c01b734b65380ab667373fa48d8203f762a434cd3f326c67a38 SHA512 528972502d65d23b58c47a594a628e648f11cc027bd0894a39b8f892bb421ceabb7f35640a9eede21cea791f5f597ed4661a1f73444c56a6fb31fa6e362d96c2 WHIRLPOOL e6c4eb3a9adc82496a1872223ceb153e05c3aabd2323aeb38064739a5200eb8fc24fa3bb96f5fb1e632cc90a2576bd3966bae3c7a7a0c750ca56faeb30837eea
diff --git a/dev-libs/gmp/gmp-5.1.3-r1.ebuild b/dev-libs/gmp/gmp-5.1.3-r1.ebuild
index 93b5d7571e42..19f747745976 100644
--- a/dev-libs/gmp/gmp-5.1.3-r1.ebuild
+++ b/dev-libs/gmp/gmp-5.1.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/dev-libs/gmp/gmp-5.1.3-r1.ebuild,v 1.8 2014/01/18 03:59:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmp/gmp-5.1.3-r1.ebuild,v 1.9 2014/03/26 05:37:56 vapier Exp $
 
 EAPI="4"
 
@@ -17,7 +17,7 @@ SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.xz
 
 LICENSE="LGPL-3"
 SLOT="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"
 IUSE="doc cxx pgo static-libs"
 
 DEPEND="sys-devel/m4
diff --git a/dev-libs/gmp/gmp-6.0.0a.ebuild b/dev-libs/gmp/gmp-6.0.0a.ebuild
new file mode 100644
index 000000000000..b1d76297cd06
--- /dev/null
+++ b/dev-libs/gmp/gmp-6.0.0a.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmp/gmp-6.0.0a.ebuild,v 1.1 2014/03/26 05:52:05 vapier Exp $
+
+EAPI="4"
+
+inherit flag-o-matic eutils libtool toolchain-funcs multilib-minimal
+
+MY_PV=${PV/_p*}
+MY_P=${PN}-${MY_PV}
+PLEVEL=${PV/*p}
+DESCRIPTION="Library for arithmetic on arbitrary precision integers, rational numbers, and floating-point numbers"
+HOMEPAGE="http://gmplib.org/"
+SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.xz
+	ftp://ftp.gmplib.org/pub/${MY_P}/${MY_P}.tar.xz
+	doc? ( http://gmplib.org/${PN}-man-${MY_PV}.pdf )"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+IUSE="doc cxx pgo static-libs"
+
+DEPEND="sys-devel/m4
+	app-arch/xz-utils"
+RDEPEND="abi_x86_32? (
+	!<=app-emulation/emul-linux-x86-baselibs-20131008-r1
+	!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+)"
+
+S=${WORKDIR}/${MY_P%a}
+
+DOCS=( AUTHORS ChangeLog NEWS README doc/configuration doc/isa_abi_headache )
+HTML_DOCS=( doc )
+MULTILIB_WRAPPED_HEADERS=( /usr/include/gmp.h )
+
+src_prepare() {
+	[[ -d ${FILESDIR}/${PV} ]] && EPATCH_SUFFIX="diff" EPATCH_FORCE="yes" epatch "${FILESDIR}"/${PV}
+
+	# note: we cannot run autotools here as gcc depends on this package
+	elibtoolize
+
+	# GMP uses the "ABI" env var during configure as does Gentoo (econf).
+	# So, to avoid patching the source constantly, wrap things up.
+	mv configure configure.wrapped || die
+	cat <<-\EOF > configure
+	#!/bin/sh
+	exec env ABI="$GMPABI" "$0.wrapped" "$@"
+	EOF
+	chmod a+rx configure
+}
+
+multilib_src_configure() {
+	# Because of our 32-bit userland, 1.0 is the only HPPA ABI that works
+	# http://gmplib.org/manual/ABI-and-ISA.html#ABI-and-ISA (bug #344613)
+	if [[ ${CHOST} == hppa2.0-* ]] ; then
+		export GMPABI="1.0"
+	fi
+
+	# ABI mappings (needs all architectures supported)
+	case ${ABI} in
+		32|x86)       GMPABI=32;;
+		64|amd64|n64) GMPABI=64;;
+		[onx]32)      GMPABI=${ABI};;
+	esac
+	export GMPABI
+
+	tc-export CC
+	ECONF_SOURCE="${S}" econf \
+		--localstatedir=/var/state/gmp \
+		--enable-shared \
+		$(use_enable cxx) \
+		$(use_enable static-libs static)
+}
+
+multilib_src_compile() {
+	emake
+
+	if use pgo ; then
+		emake -j1 -C tune tuneup
+		ebegin "Trying to generate tuned data"
+		./tune/tuneup | tee gmp.mparam.h.new
+		if eend $(( 0 + ${PIPESTATUS[*]/#/+} )) ; then
+			mv gmp-mparam.h.new gmp-mparam.h
+			emake clean
+			emake
+		fi
+	fi
+}
+
+multilib_src_test() {
+	emake check
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+
+	# should be a standalone lib
+	rm -f "${D}"/usr/$(get_libdir)/libgmp.la
+	# this requires libgmp
+	local la="${D}/usr/$(get_libdir)/libgmpxx.la"
+	use static-libs \
+		&& sed -i 's:/[^ ]*/libgmp.la:-lgmp:' "${la}" \
+		|| rm -f "${la}"
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	use doc && cp "${DISTDIR}"/gmp-man-${MY_PV}.pdf "${D}"/usr/share/doc/${PF}/
+}
+
+pkg_preinst() {
+	preserve_old_lib /usr/$(get_libdir)/libgmp.so.3
+}
+
+pkg_postinst() {
+	preserve_old_lib_notify /usr/$(get_libdir)/libgmp.so.3
+}
diff --git a/dev-libs/libffi/libffi-3.0.11.ebuild b/dev-libs/libffi/libffi-3.0.11.ebuild
index fac3be527b28..3df8aaad4dcd 100644
--- a/dev-libs/libffi/libffi-3.0.11.ebuild
+++ b/dev-libs/libffi/libffi-3.0.11.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/libffi/libffi-3.0.11.ebuild,v 1.20 2013/03/28 23:48:12 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libffi/libffi-3.0.11.ebuild,v 1.21 2014/03/25 20:04:37 vapier Exp $
 
 EAPI=4
 
diff --git a/dev-libs/libffi/libffi-3.0.12.ebuild b/dev-libs/libffi/libffi-3.0.12.ebuild
index 234b9adeac71..22008b900ab9 100644
--- a/dev-libs/libffi/libffi-3.0.12.ebuild
+++ b/dev-libs/libffi/libffi-3.0.12.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/libffi/libffi-3.0.12.ebuild,v 1.3 2013/03/28 23:48:12 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libffi/libffi-3.0.12.ebuild,v 1.4 2014/03/25 20:04:37 vapier Exp $
 
 EAPI=5
 
diff --git a/dev-libs/libffi/libffi-3.0.13-r1.ebuild b/dev-libs/libffi/libffi-3.0.13-r1.ebuild
index fe66a47081ac..13f2384c7f43 100644
--- a/dev-libs/libffi/libffi-3.0.13-r1.ebuild
+++ b/dev-libs/libffi/libffi-3.0.13-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/dev-libs/libffi/libffi-3.0.13-r1.ebuild,v 1.4 2014/01/18 02:49:00 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libffi/libffi-3.0.13-r1.ebuild,v 1.5 2014/03/25 20:04:37 vapier Exp $
 
 EAPI=5
 inherit eutils libtool multilib toolchain-funcs multilib-minimal
@@ -11,7 +11,7 @@ SRC_URI="ftp://sourceware.org/pub/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 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"
+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"
 IUSE="debug pax_kernel static-libs test"
 
 RDEPEND="abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r1
diff --git a/dev-libs/libffi/libffi-3.0.13.ebuild b/dev-libs/libffi/libffi-3.0.13.ebuild
index 4d59bbbb61f8..8a8070f3bc4b 100644
--- a/dev-libs/libffi/libffi-3.0.13.ebuild
+++ b/dev-libs/libffi/libffi-3.0.13.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/libffi/libffi-3.0.13.ebuild,v 1.3 2013/05/18 11:47:54 zorry Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libffi/libffi-3.0.13.ebuild,v 1.4 2014/03/25 20:04:37 vapier Exp $
 
 EAPI=5
 inherit eutils libtool multilib toolchain-funcs
diff --git a/dev-libs/libixion/Manifest b/dev-libs/libixion/Manifest
index c1b443e941e9..d491bea0655e 100644
--- a/dev-libs/libixion/Manifest
+++ b/dev-libs/libixion/Manifest
@@ -1 +1,2 @@
 DIST libixion-0.5.0.tar.bz2 338072 SHA256 ebe7e7d83b437cf03e9040c9f46cf15ed50adaac65b64c32127db2e9d6181304 SHA512 30cc696332ff2bad0540a84dc22ad2a0c73e909607fcfb73c4026e6cac271f99bf46cece6e427b4f794f01c5c158faee3426fbb068cf4652f5f1142d8c46b83a WHIRLPOOL f69478e7c57ef251191d20f0ac1ef1a5a3f8dfad71dc5dac43286a92ba12892e5fd6d1b3295939a9ec19e7966edc1987bba704fa6400fd713813d337728ecd51
+DIST libixion-0.7.0.tar.bz2 398089 SHA256 c9594ec93e911b40b26784ccdae47df8ea3a7d9b57bbad876733e4efcedf5581 SHA512 bda96a9cefb4bd842cd399a74c2fb5791d2a1d1d06d07106e1a121dc0bc02c00bef371b480ab1a7f922d5292c4d94fa8f7faaa2c6cd7596f2bc08b6ddfc929f5 WHIRLPOOL 0881a4b350eb6e8dc30ec166630cf46f85af07f41010b51b1b359787641d7f742ae10f1d4b1b3e438460bdb72468f43158c5baf1da95a0b70ed9d380c230f7d3
diff --git a/dev-libs/libixion/libixion-0.7.0.ebuild b/dev-libs/libixion/libixion-0.7.0.ebuild
new file mode 100644
index 000000000000..e2bd9e679689
--- /dev/null
+++ b/dev-libs/libixion/libixion-0.7.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libixion/libixion-0.7.0.ebuild,v 1.1 2014/03/25 10:24:49 scarabeus Exp $
+
+EAPI=5
+
+EGIT_REPO_URI="git://gitorious.org/ixion/ixion.git"
+
+[[ ${PV} == 9999 ]] && GITECLASS="git-2 autotools"
+inherit eutils ${GITECLASS}
+unset GITECLASS
+
+DESCRIPTION="General purpose formula parser & interpreter"
+HOMEPAGE="http://gitorious.org/ixion/pages/Home"
+[[ ${PV} == 9999 ]] || SRC_URI="http://kohei.us/files/ixion/src/${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0/0.7"
+[[ ${PV} == 9999 ]] || \
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE="static-libs"
+
+RDEPEND="dev-libs/boost:="
+DEPEND="${RDEPEND}
+	>=dev-util/mdds-0.7.1:=
+"
+
+src_prepare() {
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	default
+
+	prune_libtool_files --all
+}
diff --git a/dev-libs/libixion/libixion-9999.ebuild b/dev-libs/libixion/libixion-9999.ebuild
index c383ae8b397f..a29e4fda0dcd 100644
--- a/dev-libs/libixion/libixion-9999.ebuild
+++ b/dev-libs/libixion/libixion-9999.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/libixion/libixion-9999.ebuild,v 1.5 2013/07/10 07:49:25 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libixion/libixion-9999.ebuild,v 1.6 2014/03/25 10:24:49 scarabeus Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ HOMEPAGE="http://gitorious.org/ixion/pages/Home"
 [[ ${PV} == 9999 ]] || SRC_URI="http://kohei.us/files/ixion/src/${P}.tar.bz2"
 
 LICENSE="MIT"
-SLOT="0/0.5"
+SLOT="0/0.7"
 [[ ${PV} == 9999 ]] || \
 KEYWORDS="~amd64 ~arm ~ppc ~x86"
 IUSE="static-libs"
diff --git a/dev-libs/liborcus/Manifest b/dev-libs/liborcus/Manifest
index 8bc003422740..270900eacdc7 100644
--- a/dev-libs/liborcus/Manifest
+++ b/dev-libs/liborcus/Manifest
@@ -1,2 +1,3 @@
 DIST liborcus-0.5.1.tar.bz2 1445106 SHA256 e632373149c0b29a971aa74c079f8825bc6bc7b09c0899c8de004ee7e72ad765 SHA512 ca69c89d09a514285b119d1cda67e20856ee6897ca5e33223cc5f8163a488fc367dec10a6e2a33a7b09b337dbab2c461e9dcf1b2c72bafebd6861a1eb03683d7 WHIRLPOOL 32c8f0f50b239ae164a4ac04ee79c2bee22391cf01cbb875ca92451dbf2d26f2a24db22e5f0b2ab82e2da4c5ff04663c16ceed305da145542855ec0645bf24e4
+DIST liborcus-0.7.0.tar.bz2 1665988 SHA256 7773a8f5f0b810e0f146dbcf3dbb42e89dd8af0868235e01d9f0cdefde41a8a9 SHA512 63aad5154e25d7d7bfd10f07e614e4c1ed2691a31c61c2b1e7ec029fa4d9168eba5b4303f5164ab29ef92843ce8f8afa9682772515c8b5e8ae65f4561b331db8 WHIRLPOOL b555b005b41fb41571ac7dbc63e32541decd0b79d61435a6730de9438761afe363d063905b671e1b724c02f2846e65e2af7fffca40282d08d35e1c4ff787fc63
 DIST liborcus_0.3.0.tar.bz2 1373518 SHA256 30829484b2328d0666c859b32370d3826b3468f3945d054abdac8234f4083c77 SHA512 13eb493fa6fade073f6747860ee5d9c0fe486f3ef3285def7d1c62ddb98caac53346f7fd185097d899d10042bb6bc7ea12c069e70f5a49218486d6ba8add6eeb WHIRLPOOL 2d91b2feaa2804be2f488ef19d55caabb3b18034eced171fa956a8c628bbe93a8f8eaae2aa9900aa6b71379610467dd782f9085b788919e6708dc2b46b15e814
diff --git a/dev-libs/liborcus/liborcus-0.7.0.ebuild b/dev-libs/liborcus/liborcus-0.7.0.ebuild
new file mode 100644
index 000000000000..304abb439145
--- /dev/null
+++ b/dev-libs/liborcus/liborcus-0.7.0.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/dev-libs/liborcus/liborcus-0.7.0.ebuild,v 1.1 2014/03/25 10:28:37 scarabeus Exp $
+
+EAPI=5
+
+EGIT_REPO_URI="git://gitorious.org/orcus/orcus.git"
+
+[[ ${PV} == 9999 ]] && GITECLASS="git-2 autotools"
+inherit eutils ${GITECLASS}
+unset GITECLASS
+
+DESCRIPTION="Standalone file import filter library for spreadsheet documents"
+HOMEPAGE="http://gitorious.org/orcus/pages/Home"
+[[ ${PV} == 9999 ]] || SRC_URI="http://kohei.us/files/orcus/src/${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0/0.5"
+[[ ${PV} == 9999 ]] || \
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE="static-libs"
+
+RDEPEND="
+	>=dev-libs/boost-1.51.0:=
+	>=dev-libs/libixion-0.7.0:=
+"
+DEPEND="${RDEPEND}
+	>=dev-util/mdds-0.8.1
+"
+
+src_prepare() {
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-werror \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	default
+
+	prune_libtool_files --all
+}
diff --git a/dev-libs/liborcus/liborcus-9999.ebuild b/dev-libs/liborcus/liborcus-9999.ebuild
index ae7d40f1868e..c61257b8c872 100644
--- a/dev-libs/liborcus/liborcus-9999.ebuild
+++ b/dev-libs/liborcus/liborcus-9999.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/liborcus/liborcus-9999.ebuild,v 1.9 2013/07/10 07:46:58 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/liborcus/liborcus-9999.ebuild,v 1.10 2014/03/25 10:28:37 scarabeus Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ HOMEPAGE="http://gitorious.org/orcus/pages/Home"
 [[ ${PV} == 9999 ]] || SRC_URI="http://kohei.us/files/orcus/src/${P}.tar.bz2"
 
 LICENSE="MIT"
-SLOT="0/0.5"
+SLOT="0/0.7"
 [[ ${PV} == 9999 ]] || \
 KEYWORDS="~amd64 ~arm ~ppc ~x86"
 IUSE="static-libs"
diff --git a/dev-libs/mpfr/files/3.1.2/patch01 b/dev-libs/mpfr/files/3.1.2/patch01
new file mode 100644
index 000000000000..731ea92f4395
--- /dev/null
+++ b/dev-libs/mpfr/files/3.1.2/patch01
@@ -0,0 +1,45 @@
+diff -Naurd mpfr-3.1.2-a/PATCHES mpfr-3.1.2-b/PATCHES
+--- mpfr-3.1.2-a/PATCHES	2013-09-26 10:52:52.000000000 +0000
++++ mpfr-3.1.2-b/PATCHES	2013-09-26 10:52:52.000000000 +0000
+@@ -0,0 +1 @@
++exp_2
+diff -Naurd mpfr-3.1.2-a/VERSION mpfr-3.1.2-b/VERSION
+--- mpfr-3.1.2-a/VERSION	2013-03-13 15:37:28.000000000 +0000
++++ mpfr-3.1.2-b/VERSION	2013-09-26 10:52:52.000000000 +0000
+@@ -1 +1 @@
+-3.1.2
++3.1.2-p1
+diff -Naurd mpfr-3.1.2-a/src/exp_2.c mpfr-3.1.2-b/src/exp_2.c
+--- mpfr-3.1.2-a/src/exp_2.c	2013-03-13 15:37:28.000000000 +0000
++++ mpfr-3.1.2-b/src/exp_2.c	2013-09-26 10:52:52.000000000 +0000
+@@ -204,7 +204,7 @@
+           for (k = 0; k < K; k++)
+             {
+               mpz_mul (ss, ss, ss);
+-              exps <<= 1;
++              exps *= 2;
+               exps += mpz_normalize (ss, ss, q);
+             }
+           mpfr_set_z (s, ss, MPFR_RNDN);
+diff -Naurd mpfr-3.1.2-a/src/mpfr.h mpfr-3.1.2-b/src/mpfr.h
+--- mpfr-3.1.2-a/src/mpfr.h	2013-03-13 15:37:37.000000000 +0000
++++ mpfr-3.1.2-b/src/mpfr.h	2013-09-26 10:52:52.000000000 +0000
+@@ -27,7 +27,7 @@
+ #define MPFR_VERSION_MAJOR 3
+ #define MPFR_VERSION_MINOR 1
+ #define MPFR_VERSION_PATCHLEVEL 2
+-#define MPFR_VERSION_STRING "3.1.2"
++#define MPFR_VERSION_STRING "3.1.2-p1"
+ 
+ /* Macros dealing with MPFR VERSION */
+ #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
+diff -Naurd mpfr-3.1.2-a/src/version.c mpfr-3.1.2-b/src/version.c
+--- mpfr-3.1.2-a/src/version.c	2013-03-13 15:37:34.000000000 +0000
++++ mpfr-3.1.2-b/src/version.c	2013-09-26 10:52:52.000000000 +0000
+@@ -25,5 +25,5 @@
+ const char *
+ mpfr_get_version (void)
+ {
+-  return "3.1.2";
++  return "3.1.2-p1";
+ }
diff --git a/dev-libs/mpfr/files/3.1.2/patch02 b/dev-libs/mpfr/files/3.1.2/patch02
new file mode 100644
index 000000000000..b229c18d093c
--- /dev/null
+++ b/dev-libs/mpfr/files/3.1.2/patch02
@@ -0,0 +1,605 @@
+diff -Naurd mpfr-3.1.2-a/PATCHES mpfr-3.1.2-b/PATCHES
+--- mpfr-3.1.2-a/PATCHES	2013-09-26 10:56:55.000000000 +0000
++++ mpfr-3.1.2-b/PATCHES	2013-09-26 10:56:55.000000000 +0000
+@@ -0,0 +1 @@
++fits-smallneg
+diff -Naurd mpfr-3.1.2-a/VERSION mpfr-3.1.2-b/VERSION
+--- mpfr-3.1.2-a/VERSION	2013-09-26 10:52:52.000000000 +0000
++++ mpfr-3.1.2-b/VERSION	2013-09-26 10:56:55.000000000 +0000
+@@ -1 +1 @@
+-3.1.2-p1
++3.1.2-p2
+diff -Naurd mpfr-3.1.2-a/src/fits_u.h mpfr-3.1.2-b/src/fits_u.h
+--- mpfr-3.1.2-a/src/fits_u.h	2013-03-13 15:37:35.000000000 +0000
++++ mpfr-3.1.2-b/src/fits_u.h	2013-09-26 10:56:55.000000000 +0000
+@@ -32,17 +32,20 @@
+   int res;
+ 
+   if (MPFR_UNLIKELY (MPFR_IS_SINGULAR (f)))
+-    /* Zero always fit */
+-    return MPFR_IS_ZERO (f) ? 1 : 0;
+-  else if (MPFR_IS_NEG (f))
+-    /* Negative numbers don't fit */
+-    return 0;
+-  /* now it fits if
+-     (a) f <= MAXIMUM
+-     (b) round(f, prec(slong), rnd) <= MAXIMUM */
++    return MPFR_IS_ZERO (f) ? 1 : 0;  /* Zero always fits */
+ 
+   e = MPFR_GET_EXP (f);
+ 
++  if (MPFR_IS_NEG (f))
++    return e >= 1 ? 0  /* f <= -1 does not fit */
++      : rnd != MPFR_RNDN ? MPFR_IS_LIKE_RNDU (rnd, -1)  /* directed mode */
++      : e < 0 ? 1  /* f > -1/2 fits in MPFR_RNDN */
++      : mpfr_powerof2_raw(f);  /* -1/2 fits, -1 < f < -1/2 don't */
++
++  /* Now it fits if
++     (a) f <= MAXIMUM
++     (b) round(f, prec(slong), rnd) <= MAXIMUM */
++
+   /* first compute prec(MAXIMUM); fits in an int */
+   for (s = MAXIMUM, prec = 0; s != 0; s /= 2, prec ++);
+ 
+diff -Naurd mpfr-3.1.2-a/src/fits_uintmax.c mpfr-3.1.2-b/src/fits_uintmax.c
+--- mpfr-3.1.2-a/src/fits_uintmax.c	2013-03-13 15:37:33.000000000 +0000
++++ mpfr-3.1.2-b/src/fits_uintmax.c	2013-09-26 10:56:55.000000000 +0000
+@@ -27,51 +27,19 @@
+ #include "mpfr-intmax.h"
+ #include "mpfr-impl.h"
+ 
+-#ifdef _MPFR_H_HAVE_INTMAX_T
+-
+-/* We can't use fits_u.h <= mpfr_cmp_ui */
+-int
+-mpfr_fits_uintmax_p (mpfr_srcptr f, mpfr_rnd_t rnd)
+-{
+-  mpfr_exp_t e;
+-  int prec;
+-  uintmax_t s;
+-  mpfr_t x;
+-  int res;
+-
+-  if (MPFR_UNLIKELY (MPFR_IS_SINGULAR (f)))
+-    /* Zero always fit */
+-    return MPFR_IS_ZERO (f) ? 1 : 0;
+-  else if (MPFR_IS_NEG (f))
+-    /* Negative numbers don't fit */
+-    return 0;
+-  /* now it fits if
+-     (a) f <= MAXIMUM
+-     (b) round(f, prec(slong), rnd) <= MAXIMUM */
+-
+-  e = MPFR_GET_EXP (f);
+-
+-  /* first compute prec(MAXIMUM); fits in an int */
+-  for (s = MPFR_UINTMAX_MAX, prec = 0; s != 0; s /= 2, prec ++);
+-
+-  /* MAXIMUM needs prec bits, i.e. MAXIMUM = 2^prec - 1 */
+-
+-  /* if e <= prec - 1, then f < 2^(prec-1) < MAXIMUM */
+-  if (e <= prec - 1)
+-    return 1;
++/* Note: though mpfr-impl.h is included in fits_u.h, we also include it
++   above so that it gets included even when _MPFR_H_HAVE_INTMAX_T is not
++   defined; this is necessary to avoid an empty translation unit, which
++   is forbidden by ISO C. Without this, a failing test can be reproduced
++   by creating an invalid stdint.h somewhere in the default include path
++   and by compiling MPFR with "gcc -ansi -pedantic-errors". */
+ 
+-  /* if e >= prec + 1, then f >= 2^prec > MAXIMUM */
+-  if (e >= prec + 1)
+-    return 0;
++#ifdef _MPFR_H_HAVE_INTMAX_T
+ 
+-  MPFR_ASSERTD (e == prec);
++#define FUNCTION   mpfr_fits_uintmax_p
++#define MAXIMUM    MPFR_UINTMAX_MAX
++#define TYPE       uintmax_t
+ 
+-  /* hard case: first round to prec bits, then check */
+-  mpfr_init2 (x, prec);
+-  mpfr_set (x, f, rnd);
+-  res = MPFR_GET_EXP (x) == e;
+-  mpfr_clear (x);
+-  return res;
+-}
++#include "fits_u.h"
+ 
+ #endif
+diff -Naurd mpfr-3.1.2-a/src/mpfr.h mpfr-3.1.2-b/src/mpfr.h
+--- mpfr-3.1.2-a/src/mpfr.h	2013-09-26 10:52:52.000000000 +0000
++++ mpfr-3.1.2-b/src/mpfr.h	2013-09-26 10:56:55.000000000 +0000
+@@ -27,7 +27,7 @@
+ #define MPFR_VERSION_MAJOR 3
+ #define MPFR_VERSION_MINOR 1
+ #define MPFR_VERSION_PATCHLEVEL 2
+-#define MPFR_VERSION_STRING "3.1.2-p1"
++#define MPFR_VERSION_STRING "3.1.2-p2"
+ 
+ /* Macros dealing with MPFR VERSION */
+ #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
+diff -Naurd mpfr-3.1.2-a/src/version.c mpfr-3.1.2-b/src/version.c
+--- mpfr-3.1.2-a/src/version.c	2013-09-26 10:52:52.000000000 +0000
++++ mpfr-3.1.2-b/src/version.c	2013-09-26 10:56:55.000000000 +0000
+@@ -25,5 +25,5 @@
+ const char *
+ mpfr_get_version (void)
+ {
+-  return "3.1.2-p1";
++  return "3.1.2-p2";
+ }
+diff -Naurd mpfr-3.1.2-a/tests/tfits.c mpfr-3.1.2-b/tests/tfits.c
+--- mpfr-3.1.2-a/tests/tfits.c	2013-03-13 15:37:45.000000000 +0000
++++ mpfr-3.1.2-b/tests/tfits.c	2013-09-26 10:56:55.000000000 +0000
+@@ -33,155 +33,176 @@
+ #include "mpfr-intmax.h"
+ #include "mpfr-test.h"
+ 
+-#define ERROR1 { printf("Initial error for x="); mpfr_dump(x); exit(1); }
+-#define ERROR2 { printf("Error for x="); mpfr_dump(x); exit(1); }
++#define ERROR1(N)                                               \
++  do                                                            \
++    {                                                           \
++      printf("Error %d for rnd = %s and x = ", N,               \
++             mpfr_print_rnd_mode ((mpfr_rnd_t) r));             \
++      mpfr_dump(x);                                             \
++      exit(1);                                                  \
++    }                                                           \
++  while (0)
+ 
+ static void check_intmax (void);
+ 
+ int
+ main (void)
+ {
+-  mpfr_t x;
++  mpfr_t x, y;
++  int i, r;
+ 
+   tests_start_mpfr ();
+ 
+   mpfr_init2 (x, 256);
++  mpfr_init2 (y, 8);
+ 
+-  /* Check NAN */
+-  mpfr_set_nan (x);
+-  if (mpfr_fits_ulong_p (x, MPFR_RNDN))
+-    ERROR1;
+-  if (mpfr_fits_slong_p (x, MPFR_RNDN))
+-    ERROR1;
+-  if (mpfr_fits_uint_p (x, MPFR_RNDN))
+-    ERROR1;
+-  if (mpfr_fits_sint_p (x, MPFR_RNDN))
+-    ERROR1;
+-  if (mpfr_fits_ushort_p (x, MPFR_RNDN))
+-    ERROR1;
+-  if (mpfr_fits_sshort_p (x, MPFR_RNDN))
+-    ERROR1;
++  RND_LOOP (r)
++    {
+ 
+-  /* Check INF */
+-  mpfr_set_inf (x, 1);
+-  if (mpfr_fits_ulong_p (x, MPFR_RNDN))
+-    ERROR1;
+-  if (mpfr_fits_slong_p (x, MPFR_RNDN))
+-    ERROR1;
+-  if (mpfr_fits_uint_p (x, MPFR_RNDN))
+-    ERROR1;
+-  if (mpfr_fits_sint_p (x, MPFR_RNDN))
+-    ERROR1;
+-  if (mpfr_fits_ushort_p (x, MPFR_RNDN))
+-    ERROR1;
+-  if (mpfr_fits_sshort_p (x, MPFR_RNDN))
+-    ERROR1;
++      /* Check NAN */
++      mpfr_set_nan (x);
++      if (mpfr_fits_ulong_p (x, (mpfr_rnd_t) r))
++        ERROR1 (1);
++      if (mpfr_fits_slong_p (x, (mpfr_rnd_t) r))
++        ERROR1 (2);
++      if (mpfr_fits_uint_p (x, (mpfr_rnd_t) r))
++        ERROR1 (3);
++      if (mpfr_fits_sint_p (x, (mpfr_rnd_t) r))
++        ERROR1 (4);
++      if (mpfr_fits_ushort_p (x, (mpfr_rnd_t) r))
++        ERROR1 (5);
++      if (mpfr_fits_sshort_p (x, (mpfr_rnd_t) r))
++        ERROR1 (6);
+ 
+-  /* Check Zero */
+-  MPFR_SET_ZERO (x);
+-  if (!mpfr_fits_ulong_p (x, MPFR_RNDN))
+-    ERROR2;
+-  if (!mpfr_fits_slong_p (x, MPFR_RNDN))
+-    ERROR2;
+-  if (!mpfr_fits_uint_p (x, MPFR_RNDN))
+-    ERROR2;
+-  if (!mpfr_fits_sint_p (x, MPFR_RNDN))
+-    ERROR2;
+-  if (!mpfr_fits_ushort_p (x, MPFR_RNDN))
+-    ERROR2;
+-  if (!mpfr_fits_sshort_p (x, MPFR_RNDN))
+-    ERROR2;
++      /* Check INF */
++      mpfr_set_inf (x, 1);
++      if (mpfr_fits_ulong_p (x, (mpfr_rnd_t) r))
++        ERROR1 (7);
++      if (mpfr_fits_slong_p (x, (mpfr_rnd_t) r))
++        ERROR1 (8);
++      if (mpfr_fits_uint_p (x, (mpfr_rnd_t) r))
++        ERROR1 (9);
++      if (mpfr_fits_sint_p (x, (mpfr_rnd_t) r))
++        ERROR1 (10);
++      if (mpfr_fits_ushort_p (x, (mpfr_rnd_t) r))
++        ERROR1 (11);
++      if (mpfr_fits_sshort_p (x, (mpfr_rnd_t) r))
++        ERROR1 (12);
+ 
+-  /* Check small op */
+-  mpfr_set_str1 (x, "1@-1");
+-  if (!mpfr_fits_ulong_p (x, MPFR_RNDN))
+-    ERROR2;
+-  if (!mpfr_fits_slong_p (x, MPFR_RNDN))
+-    ERROR2;
+-  if (!mpfr_fits_uint_p (x, MPFR_RNDN))
+-    ERROR2;
+-  if (!mpfr_fits_sint_p (x, MPFR_RNDN))
+-    ERROR2;
+-  if (!mpfr_fits_ushort_p (x, MPFR_RNDN))
+-    ERROR2;
+-  if (!mpfr_fits_sshort_p (x, MPFR_RNDN))
+-    ERROR2;
++      /* Check Zero */
++      MPFR_SET_ZERO (x);
++      if (!mpfr_fits_ulong_p (x, (mpfr_rnd_t) r))
++        ERROR1 (13);
++      if (!mpfr_fits_slong_p (x, (mpfr_rnd_t) r))
++        ERROR1 (14);
++      if (!mpfr_fits_uint_p (x, (mpfr_rnd_t) r))
++        ERROR1 (15);
++      if (!mpfr_fits_sint_p (x, (mpfr_rnd_t) r))
++        ERROR1 (16);
++      if (!mpfr_fits_ushort_p (x, (mpfr_rnd_t) r))
++        ERROR1 (17);
++      if (!mpfr_fits_sshort_p (x, (mpfr_rnd_t) r))
++        ERROR1 (18);
+ 
+-  /* Check 17 */
+-  mpfr_set_ui (x, 17, MPFR_RNDN);
+-  if (!mpfr_fits_ulong_p (x, MPFR_RNDN))
+-    ERROR2;
+-  if (!mpfr_fits_slong_p (x, MPFR_RNDN))
+-    ERROR2;
+-  if (!mpfr_fits_uint_p (x, MPFR_RNDN))
+-    ERROR2;
+-  if (!mpfr_fits_sint_p (x, MPFR_RNDN))
+-    ERROR2;
+-  if (!mpfr_fits_ushort_p (x, MPFR_RNDN))
+-    ERROR2;
+-  if (!mpfr_fits_sshort_p (x, MPFR_RNDN))
+-    ERROR2;
++      /* Check small positive op */
++      mpfr_set_str1 (x, "1@-1");
++      if (!mpfr_fits_ulong_p (x, (mpfr_rnd_t) r))
++        ERROR1 (19);
++      if (!mpfr_fits_slong_p (x, (mpfr_rnd_t) r))
++        ERROR1 (20);
++      if (!mpfr_fits_uint_p (x, (mpfr_rnd_t) r))
++        ERROR1 (21);
++      if (!mpfr_fits_sint_p (x, (mpfr_rnd_t) r))
++        ERROR1 (22);
++      if (!mpfr_fits_ushort_p (x, (mpfr_rnd_t) r))
++        ERROR1 (23);
++      if (!mpfr_fits_sshort_p (x, (mpfr_rnd_t) r))
++        ERROR1 (24);
+ 
+-  /* Check all other values */
+-  mpfr_set_ui (x, ULONG_MAX, MPFR_RNDN);
+-  mpfr_mul_2exp (x, x, 1, MPFR_RNDN);
+-  if (mpfr_fits_ulong_p (x, MPFR_RNDN))
+-    ERROR1;
+-  if (mpfr_fits_slong_p (x, MPFR_RNDN))
+-    ERROR1;
+-  mpfr_mul_2exp (x, x, 40, MPFR_RNDN);
+-  if (mpfr_fits_ulong_p (x, MPFR_RNDN))
+-    ERROR1;
+-  if (mpfr_fits_uint_p (x, MPFR_RNDN))
+-    ERROR1;
+-  if (mpfr_fits_sint_p (x, MPFR_RNDN))
+-    ERROR1;
+-  if (mpfr_fits_ushort_p (x, MPFR_RNDN))
+-    ERROR1;
+-  if (mpfr_fits_sshort_p (x, MPFR_RNDN))
+-    ERROR1;
++      /* Check 17 */
++      mpfr_set_ui (x, 17, MPFR_RNDN);
++      if (!mpfr_fits_ulong_p (x, (mpfr_rnd_t) r))
++        ERROR1 (25);
++      if (!mpfr_fits_slong_p (x, (mpfr_rnd_t) r))
++        ERROR1 (26);
++      if (!mpfr_fits_uint_p (x, (mpfr_rnd_t) r))
++        ERROR1 (27);
++      if (!mpfr_fits_sint_p (x, (mpfr_rnd_t) r))
++        ERROR1 (28);
++      if (!mpfr_fits_ushort_p (x, (mpfr_rnd_t) r))
++        ERROR1 (29);
++      if (!mpfr_fits_sshort_p (x, (mpfr_rnd_t) r))
++        ERROR1 (30);
+ 
+-  mpfr_set_ui (x, ULONG_MAX, MPFR_RNDN);
+-  if (!mpfr_fits_ulong_p (x, MPFR_RNDN))
+-    ERROR2;
+-  mpfr_set_ui (x, LONG_MAX, MPFR_RNDN);
+-  if (!mpfr_fits_slong_p (x, MPFR_RNDN))
+-    ERROR2;
+-  mpfr_set_ui (x, UINT_MAX, MPFR_RNDN);
+-  if (!mpfr_fits_uint_p (x, MPFR_RNDN))
+-    ERROR2;
+-  mpfr_set_ui (x, INT_MAX, MPFR_RNDN);
+-  if (!mpfr_fits_sint_p (x, MPFR_RNDN))
+-    ERROR2;
+-  mpfr_set_ui (x, USHRT_MAX, MPFR_RNDN);
+-  if (!mpfr_fits_ushort_p (x, MPFR_RNDN))
+-    ERROR2;
+-  mpfr_set_ui (x, SHRT_MAX, MPFR_RNDN);
+-  if (!mpfr_fits_sshort_p (x, MPFR_RNDN))
+-    ERROR2;
++      /* Check all other values */
++      mpfr_set_ui (x, ULONG_MAX, MPFR_RNDN);
++      mpfr_mul_2exp (x, x, 1, MPFR_RNDN);
++      if (mpfr_fits_ulong_p (x, (mpfr_rnd_t) r))
++        ERROR1 (31);
++      if (mpfr_fits_slong_p (x, (mpfr_rnd_t) r))
++        ERROR1 (32);
++      mpfr_mul_2exp (x, x, 40, MPFR_RNDN);
++      if (mpfr_fits_ulong_p (x, (mpfr_rnd_t) r))
++        ERROR1 (33);
++      if (mpfr_fits_uint_p (x, (mpfr_rnd_t) r))
++        ERROR1 (34);
++      if (mpfr_fits_sint_p (x, (mpfr_rnd_t) r))
++        ERROR1 (35);
++      if (mpfr_fits_ushort_p (x, (mpfr_rnd_t) r))
++        ERROR1 (36);
++      if (mpfr_fits_sshort_p (x, (mpfr_rnd_t) r))
++        ERROR1 (37);
+ 
+-  mpfr_set_si (x, 1, MPFR_RNDN);
+-  if (!mpfr_fits_sint_p (x, MPFR_RNDN))
+-    ERROR2;
+-  if (!mpfr_fits_sshort_p (x, MPFR_RNDN))
+-    ERROR2;
++      mpfr_set_ui (x, ULONG_MAX, MPFR_RNDN);
++      if (!mpfr_fits_ulong_p (x, (mpfr_rnd_t) r))
++        ERROR1 (38);
++      mpfr_set_ui (x, LONG_MAX, MPFR_RNDN);
++      if (!mpfr_fits_slong_p (x, (mpfr_rnd_t) r))
++        ERROR1 (39);
++      mpfr_set_ui (x, UINT_MAX, MPFR_RNDN);
++      if (!mpfr_fits_uint_p (x, (mpfr_rnd_t) r))
++        ERROR1 (40);
++      mpfr_set_ui (x, INT_MAX, MPFR_RNDN);
++      if (!mpfr_fits_sint_p (x, (mpfr_rnd_t) r))
++        ERROR1 (41);
++      mpfr_set_ui (x, USHRT_MAX, MPFR_RNDN);
++      if (!mpfr_fits_ushort_p (x, (mpfr_rnd_t) r))
++        ERROR1 (42);
++      mpfr_set_ui (x, SHRT_MAX, MPFR_RNDN);
++      if (!mpfr_fits_sshort_p (x, (mpfr_rnd_t) r))
++        ERROR1 (43);
+ 
+-  /* Check negative value */
+-  mpfr_set_si (x, -1, MPFR_RNDN);
+-  if (!mpfr_fits_sint_p (x, MPFR_RNDN))
+-    ERROR2;
+-  if (!mpfr_fits_sshort_p (x, MPFR_RNDN))
+-    ERROR2;
+-  if (!mpfr_fits_slong_p (x, MPFR_RNDN))
+-    ERROR2;
+-  if (mpfr_fits_uint_p (x, MPFR_RNDN))
+-    ERROR1;
+-  if (mpfr_fits_ushort_p (x, MPFR_RNDN))
+-    ERROR1;
+-  if (mpfr_fits_ulong_p (x, MPFR_RNDN))
+-    ERROR1;
++      mpfr_set_si (x, 1, MPFR_RNDN);
++      if (!mpfr_fits_sint_p (x, (mpfr_rnd_t) r))
++        ERROR1 (44);
++      if (!mpfr_fits_sshort_p (x, (mpfr_rnd_t) r))
++        ERROR1 (45);
++
++      /* Check negative op */
++      for (i = 1; i <= 4; i++)
++        {
++          int inv;
++
++          mpfr_set_si_2exp (x, -i, -2, MPFR_RNDN);
++          mpfr_rint (y, x, (mpfr_rnd_t) r);
++          inv = MPFR_NOTZERO (y);
++          if (!mpfr_fits_ulong_p (x, (mpfr_rnd_t) r) ^ inv)
++            ERROR1 (46);
++          if (!mpfr_fits_slong_p (x, (mpfr_rnd_t) r))
++            ERROR1 (47);
++          if (!mpfr_fits_uint_p (x, (mpfr_rnd_t) r) ^ inv)
++            ERROR1 (48);
++          if (!mpfr_fits_sint_p (x, (mpfr_rnd_t) r))
++            ERROR1 (49);
++          if (!mpfr_fits_ushort_p (x, (mpfr_rnd_t) r) ^ inv)
++            ERROR1 (50);
++          if (!mpfr_fits_sshort_p (x, (mpfr_rnd_t) r))
++            ERROR1 (51);
++        }
++    }
+ 
+   mpfr_clear (x);
++  mpfr_clear (y);
+ 
+   check_intmax ();
+ 
+@@ -189,85 +210,98 @@
+   return 0;
+ }
+ 
+-static void check_intmax (void)
++static void
++check_intmax (void)
+ {
+ #ifdef _MPFR_H_HAVE_INTMAX_T
+-  mpfr_t x;
++  mpfr_t x, y;
++  int i, r;
+ 
+-  mpfr_init2 (x, sizeof (uintmax_t)*CHAR_BIT);
++  mpfr_init2 (x, sizeof (uintmax_t) * CHAR_BIT);
++  mpfr_init2 (y, 8);
+ 
+-  /* Check NAN */
+-  mpfr_set_nan (x);
+-  if (mpfr_fits_uintmax_p (x, MPFR_RNDN))
+-    ERROR1;
+-  if (mpfr_fits_intmax_p (x, MPFR_RNDN))
+-    ERROR1;
++  RND_LOOP (r)
++    {
++      /* Check NAN */
++      mpfr_set_nan (x);
++      if (mpfr_fits_uintmax_p (x, (mpfr_rnd_t) r))
++        ERROR1 (52);
++      if (mpfr_fits_intmax_p (x, (mpfr_rnd_t) r))
++        ERROR1 (53);
+ 
+-  /* Check INF */
+-  mpfr_set_inf (x, 1);
+-  if (mpfr_fits_uintmax_p (x, MPFR_RNDN))
+-    ERROR1;
+-  if (mpfr_fits_intmax_p (x, MPFR_RNDN))
+-    ERROR1;
++      /* Check INF */
++      mpfr_set_inf (x, 1);
++      if (mpfr_fits_uintmax_p (x, (mpfr_rnd_t) r))
++        ERROR1 (54);
++      if (mpfr_fits_intmax_p (x, (mpfr_rnd_t) r))
++        ERROR1 (55);
+ 
+-  /* Check Zero */
+-  MPFR_SET_ZERO (x);
+-  if (!mpfr_fits_uintmax_p (x, MPFR_RNDN))
+-    ERROR2;
+-  if (!mpfr_fits_intmax_p (x, MPFR_RNDN))
+-    ERROR2;
++      /* Check Zero */
++      MPFR_SET_ZERO (x);
++      if (!mpfr_fits_uintmax_p (x, (mpfr_rnd_t) r))
++        ERROR1 (56);
++      if (!mpfr_fits_intmax_p (x, (mpfr_rnd_t) r))
++        ERROR1 (57);
+ 
+-  /* Check small op */
+-  mpfr_set_str1 (x, "1@-1");
+-  if (!mpfr_fits_uintmax_p (x, MPFR_RNDN))
+-    ERROR2;
+-  if (!mpfr_fits_intmax_p (x, MPFR_RNDN))
+-    ERROR2;
++      /* Check positive small op */
++      mpfr_set_str1 (x, "1@-1");
++      if (!mpfr_fits_uintmax_p (x, (mpfr_rnd_t) r))
++        ERROR1 (58);
++      if (!mpfr_fits_intmax_p (x, (mpfr_rnd_t) r))
++        ERROR1 (59);
+ 
+-  /* Check 17 */
+-  mpfr_set_ui (x, 17, MPFR_RNDN);
+-  if (!mpfr_fits_uintmax_p (x, MPFR_RNDN))
+-    ERROR2;
+-  if (!mpfr_fits_intmax_p (x, MPFR_RNDN))
+-    ERROR2;
++      /* Check 17 */
++      mpfr_set_ui (x, 17, MPFR_RNDN);
++      if (!mpfr_fits_uintmax_p (x, (mpfr_rnd_t) r))
++        ERROR1 (60);
++      if (!mpfr_fits_intmax_p (x, (mpfr_rnd_t) r))
++        ERROR1 (61);
+ 
+-  /* Check hugest */
+-  mpfr_set_ui_2exp (x, 42, sizeof (uintmax_t) * 32, MPFR_RNDN);
+-  if (mpfr_fits_uintmax_p (x, MPFR_RNDN))
+-    ERROR1;
+-  if (mpfr_fits_intmax_p (x, MPFR_RNDN))
+-    ERROR1;
++      /* Check hugest */
++      mpfr_set_ui_2exp (x, 42, sizeof (uintmax_t) * 32, MPFR_RNDN);
++      if (mpfr_fits_uintmax_p (x, (mpfr_rnd_t) r))
++        ERROR1 (62);
++      if (mpfr_fits_intmax_p (x, (mpfr_rnd_t) r))
++        ERROR1 (63);
+ 
+-  /* Check all other values */
+-  mpfr_set_uj (x, MPFR_UINTMAX_MAX, MPFR_RNDN);
+-  mpfr_add_ui (x, x, 1, MPFR_RNDN);
+-  if (mpfr_fits_uintmax_p (x, MPFR_RNDN))
+-    ERROR1;
+-  mpfr_set_uj (x, MPFR_UINTMAX_MAX, MPFR_RNDN);
+-  if (!mpfr_fits_uintmax_p (x, MPFR_RNDN))
+-    ERROR2;
+-  mpfr_set_sj (x, MPFR_INTMAX_MAX, MPFR_RNDN);
+-  mpfr_add_ui (x, x, 1, MPFR_RNDN);
+-  if (mpfr_fits_intmax_p (x, MPFR_RNDN))
+-    ERROR1;
+-  mpfr_set_sj (x, MPFR_INTMAX_MAX, MPFR_RNDN);
+-  if (!mpfr_fits_intmax_p (x, MPFR_RNDN))
+-    ERROR2;
+-  mpfr_set_sj (x, MPFR_INTMAX_MIN, MPFR_RNDN);
+-  if (!mpfr_fits_intmax_p (x, MPFR_RNDN))
+-    ERROR2;
+-  mpfr_sub_ui (x, x, 1, MPFR_RNDN);
+-  if (mpfr_fits_intmax_p (x, MPFR_RNDN))
+-    ERROR1;
++      /* Check all other values */
++      mpfr_set_uj (x, MPFR_UINTMAX_MAX, MPFR_RNDN);
++      mpfr_add_ui (x, x, 1, MPFR_RNDN);
++      if (mpfr_fits_uintmax_p (x, (mpfr_rnd_t) r))
++        ERROR1 (64);
++      mpfr_set_uj (x, MPFR_UINTMAX_MAX, MPFR_RNDN);
++      if (!mpfr_fits_uintmax_p (x, (mpfr_rnd_t) r))
++        ERROR1 (65);
++      mpfr_set_sj (x, MPFR_INTMAX_MAX, MPFR_RNDN);
++      mpfr_add_ui (x, x, 1, MPFR_RNDN);
++      if (mpfr_fits_intmax_p (x, (mpfr_rnd_t) r))
++        ERROR1 (66);
++      mpfr_set_sj (x, MPFR_INTMAX_MAX, MPFR_RNDN);
++      if (!mpfr_fits_intmax_p (x, (mpfr_rnd_t) r))
++        ERROR1 (67);
++      mpfr_set_sj (x, MPFR_INTMAX_MIN, MPFR_RNDN);
++      if (!mpfr_fits_intmax_p (x, (mpfr_rnd_t) r))
++        ERROR1 (68);
++      mpfr_sub_ui (x, x, 1, MPFR_RNDN);
++      if (mpfr_fits_intmax_p (x, (mpfr_rnd_t) r))
++        ERROR1 (69);
+ 
+-  /* Check negative value */
+-  mpfr_set_si (x, -1, MPFR_RNDN);
+-  if (!mpfr_fits_intmax_p (x, MPFR_RNDN))
+-    ERROR2;
+-  if (mpfr_fits_uintmax_p (x, MPFR_RNDN))
+-    ERROR1;
++      /* Check negative op */
++      for (i = 1; i <= 4; i++)
++        {
++          int inv;
++
++          mpfr_set_si_2exp (x, -i, -2, MPFR_RNDN);
++          mpfr_rint (y, x, (mpfr_rnd_t) r);
++          inv = MPFR_NOTZERO (y);
++          if (!mpfr_fits_uintmax_p (x, (mpfr_rnd_t) r) ^ inv)
++            ERROR1 (70);
++          if (!mpfr_fits_intmax_p (x, (mpfr_rnd_t) r))
++            ERROR1 (71);
++        }
++    }
+ 
+   mpfr_clear (x);
++  mpfr_clear (y);
+ #endif
+ }
+-
diff --git a/dev-libs/mpfr/files/3.1.2/patch03 b/dev-libs/mpfr/files/3.1.2/patch03
new file mode 100644
index 000000000000..8e0cd8e04b7e
--- /dev/null
+++ b/dev-libs/mpfr/files/3.1.2/patch03
@@ -0,0 +1,129 @@
+diff -Naurd mpfr-3.1.2-a/PATCHES mpfr-3.1.2-b/PATCHES
+--- mpfr-3.1.2-a/PATCHES	2013-10-09 13:34:21.000000000 +0000
++++ mpfr-3.1.2-b/PATCHES	2013-10-09 13:34:21.000000000 +0000
+@@ -0,0 +1 @@
++clang-divby0
+diff -Naurd mpfr-3.1.2-a/VERSION mpfr-3.1.2-b/VERSION
+--- mpfr-3.1.2-a/VERSION	2013-09-26 10:52:52.000000000 +0000
++++ mpfr-3.1.2-b/VERSION	2013-10-09 13:34:21.000000000 +0000
+@@ -1 +1 @@
+-3.1.2-p2
++3.1.2-p3
+diff -Naurd mpfr-3.1.2-a/src/mpfr-impl.h mpfr-3.1.2-b/src/mpfr-impl.h
+--- mpfr-3.1.2-a/src/mpfr-impl.h	2013-03-13 15:37:36.000000000 +0000
++++ mpfr-3.1.2-b/src/mpfr-impl.h	2013-10-09 13:34:21.000000000 +0000
+@@ -468,8 +468,16 @@
+ #define MPFR_LIMBS_PER_FLT ((IEEE_FLT_MANT_DIG-1)/GMP_NUMB_BITS+1)
+ 
+ /* Visual C++ doesn't support +1.0/0.0, -1.0/0.0 and 0.0/0.0
+-   at compile time. */
+-#if defined(_MSC_VER) && defined(_WIN32) && (_MSC_VER >= 1200)
++   at compile time.
++   Clang with -fsanitize=undefined is a bit similar due to a bug:
++     http://llvm.org/bugs/show_bug.cgi?id=17381
++   but even without its sanitizer, it may be better to use the
++   double_zero version until IEEE 754 division by zero is properly
++   supported:
++     http://llvm.org/bugs/show_bug.cgi?id=17000
++*/
++#if (defined(_MSC_VER) && defined(_WIN32) && (_MSC_VER >= 1200)) || \
++    defined(__clang__)
+ static double double_zero = 0.0;
+ # define DBL_NAN (double_zero/double_zero)
+ # define DBL_POS_INF ((double) 1.0/double_zero)
+@@ -501,6 +509,8 @@
+    (with Xcode 2.4.1, i.e. the latest one). */
+ #define LVALUE(x) (&(x) == &(x) || &(x) != &(x))
+ #define DOUBLE_ISINF(x) (LVALUE(x) && ((x) > DBL_MAX || (x) < -DBL_MAX))
++/* The DOUBLE_ISNAN(x) macro is also valid on long double x
++   (assuming that the compiler isn't too broken). */
+ #ifdef MPFR_NANISNAN
+ /* Avoid MIPSpro / IRIX64 / gcc -ffast-math (incorrect) optimizations.
+    The + must not be replaced by a ||. With gcc -ffast-math, NaN is
+diff -Naurd mpfr-3.1.2-a/src/mpfr.h mpfr-3.1.2-b/src/mpfr.h
+--- mpfr-3.1.2-a/src/mpfr.h	2013-09-26 10:52:52.000000000 +0000
++++ mpfr-3.1.2-b/src/mpfr.h	2013-10-09 13:34:21.000000000 +0000
+@@ -27,7 +27,7 @@
+ #define MPFR_VERSION_MAJOR 3
+ #define MPFR_VERSION_MINOR 1
+ #define MPFR_VERSION_PATCHLEVEL 2
+-#define MPFR_VERSION_STRING "3.1.2-p2"
++#define MPFR_VERSION_STRING "3.1.2-p3"
+ 
+ /* Macros dealing with MPFR VERSION */
+ #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
+diff -Naurd mpfr-3.1.2-a/src/version.c mpfr-3.1.2-b/src/version.c
+--- mpfr-3.1.2-a/src/version.c	2013-09-26 10:52:52.000000000 +0000
++++ mpfr-3.1.2-b/src/version.c	2013-10-09 13:34:21.000000000 +0000
+@@ -25,5 +25,5 @@
+ const char *
+ mpfr_get_version (void)
+ {
+-  return "3.1.2-p2";
++  return "3.1.2-p3";
+ }
+diff -Naurd mpfr-3.1.2-a/tests/tget_flt.c mpfr-3.1.2-b/tests/tget_flt.c
+--- mpfr-3.1.2-a/tests/tget_flt.c	2013-03-13 15:37:44.000000000 +0000
++++ mpfr-3.1.2-b/tests/tget_flt.c	2013-10-09 13:34:21.000000000 +0000
+@@ -28,9 +28,17 @@
+ main (void)
+ {
+   mpfr_t x, y;
+-  float f, g, infp;
++  float f, g;
+   int i;
++#if !defined(MPFR_ERRDIVZERO)
++  float infp;
++#endif
++
++  tests_start_mpfr ();
+ 
++#if !defined(MPFR_ERRDIVZERO)
++  /* The definition of DBL_POS_INF involves a division by 0. This makes
++     "clang -O2 -fsanitize=undefined -fno-sanitize-recover" fail. */
+   infp = (float) DBL_POS_INF;
+   if (infp * 0.5 != infp)
+     {
+@@ -38,8 +46,7 @@
+       fprintf (stderr, "(this is probably a compiler bug, please report)\n");
+       exit (1);
+     }
+-
+-  tests_start_mpfr ();
++#endif
+ 
+   mpfr_init2 (x, 24);
+   mpfr_init2 (y, 24);
+@@ -353,6 +360,7 @@
+       printf ("expected %.8e, got %.8e\n", g, f);
+       exit (1);
+     }
++#if !defined(MPFR_ERRDIVZERO)
+   f = mpfr_get_flt (x, MPFR_RNDN); /* first round to 2^128 (even rule),
+                                       thus we should get +Inf */
+   g = infp;
+@@ -376,6 +384,7 @@
+       printf ("expected %.8e, got %.8e\n", g, f);
+       exit (1);
+     }
++#endif
+ 
+   mpfr_clear (x);
+   mpfr_clear (y);
+diff -Naurd mpfr-3.1.2-a/tests/tset_ld.c mpfr-3.1.2-b/tests/tset_ld.c
+--- mpfr-3.1.2-a/tests/tset_ld.c	2013-03-13 15:37:44.000000000 +0000
++++ mpfr-3.1.2-b/tests/tset_ld.c	2013-10-09 13:34:21.000000000 +0000
+@@ -47,8 +47,11 @@
+ static int
+ Isnan_ld (long double d)
+ {
+-  double e = (double) d;
+-  if (DOUBLE_ISNAN (e))
++  /* Do not convert d to double as this can give an overflow, which
++     may confuse compilers without IEEE 754 support (such as clang
++     -fsanitize=undefined), or trigger a trap if enabled.
++     The DOUBLE_ISNAN macro should work fine on long double. */
++  if (DOUBLE_ISNAN (d))
+     return 1;
+   LONGDOUBLE_NAN_ACTION (d, goto yes);
+   return 0;
diff --git a/dev-libs/mpfr/files/3.1.2/patch04 b/dev-libs/mpfr/files/3.1.2/patch04
new file mode 100644
index 000000000000..2451f36027e0
--- /dev/null
+++ b/dev-libs/mpfr/files/3.1.2/patch04
@@ -0,0 +1,84 @@
+diff -Naurd mpfr-3.1.2-a/PATCHES mpfr-3.1.2-b/PATCHES
+--- mpfr-3.1.2-a/PATCHES	2013-11-15 00:51:49.211333830 +0000
++++ mpfr-3.1.2-b/PATCHES	2013-11-15 00:51:49.323334999 +0000
+@@ -0,0 +1 @@
++printf-alt0
+diff -Naurd mpfr-3.1.2-a/VERSION mpfr-3.1.2-b/VERSION
+--- mpfr-3.1.2-a/VERSION	2013-11-15 00:51:49.211333830 +0000
++++ mpfr-3.1.2-b/VERSION	2013-11-15 00:51:49.323334999 +0000
+@@ -1 +1 @@
+-3.1.2-p3
++3.1.2-p4
+diff -Naurd mpfr-3.1.2-a/src/mpfr.h mpfr-3.1.2-b/src/mpfr.h
+--- mpfr-3.1.2-a/src/mpfr.h	2013-11-15 00:51:49.211333830 +0000
++++ mpfr-3.1.2-b/src/mpfr.h	2013-11-15 00:51:49.323334999 +0000
+@@ -27,7 +27,7 @@
+ #define MPFR_VERSION_MAJOR 3
+ #define MPFR_VERSION_MINOR 1
+ #define MPFR_VERSION_PATCHLEVEL 2
+-#define MPFR_VERSION_STRING "3.1.2-p3"
++#define MPFR_VERSION_STRING "3.1.2-p4"
+ 
+ /* Macros dealing with MPFR VERSION */
+ #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
+diff -Naurd mpfr-3.1.2-a/src/vasprintf.c mpfr-3.1.2-b/src/vasprintf.c
+--- mpfr-3.1.2-a/src/vasprintf.c	2013-03-13 15:37:37.000000000 +0000
++++ mpfr-3.1.2-b/src/vasprintf.c	2013-11-15 00:51:49.267334408 +0000
+@@ -1040,7 +1040,7 @@
+ }
+ 
+ /* Determine the different parts of the string representation of the regular
+-   number P when SPEC.SPEC is 'e', 'E', 'g', or 'G'.
++   number P when spec.spec is 'e', 'E', 'g', or 'G'.
+    DEC_INFO contains the previously computed exponent and string or is NULL.
+ 
+    return -1 if some field > INT_MAX */
+@@ -1167,7 +1167,7 @@
+ }
+ 
+ /* Determine the different parts of the string representation of the regular
+-   number P when SPEC.SPEC is 'f', 'F', 'g', or 'G'.
++   number P when spec.spec is 'f', 'F', 'g', or 'G'.
+    DEC_INFO contains the previously computed exponent and string or is NULL.
+ 
+    return -1 if some field of number_parts is greater than INT_MAX */
+@@ -1559,7 +1559,7 @@
+             /* fractional part */
+             {
+               np->point = MPFR_DECIMAL_POINT;
+-              np->fp_trailing_zeros = (spec.spec == 'g' && spec.spec == 'G') ?
++              np->fp_trailing_zeros = (spec.spec == 'g' || spec.spec == 'G') ?
+                 spec.prec - 1 : spec.prec;
+             }
+           else if (spec.alt)
+diff -Naurd mpfr-3.1.2-a/src/version.c mpfr-3.1.2-b/src/version.c
+--- mpfr-3.1.2-a/src/version.c	2013-11-15 00:51:49.211333830 +0000
++++ mpfr-3.1.2-b/src/version.c	2013-11-15 00:51:49.323334999 +0000
+@@ -25,5 +25,5 @@
+ const char *
+ mpfr_get_version (void)
+ {
+-  return "3.1.2-p3";
++  return "3.1.2-p4";
+ }
+diff -Naurd mpfr-3.1.2-a/tests/tsprintf.c mpfr-3.1.2-b/tests/tsprintf.c
+--- mpfr-3.1.2-a/tests/tsprintf.c	2013-03-13 15:37:44.000000000 +0000
++++ mpfr-3.1.2-b/tests/tsprintf.c	2013-11-15 00:51:49.267334408 +0000
+@@ -456,10 +456,16 @@
+   check_sprintf ("1.999900  ", "%-#10.7RG", x);
+   check_sprintf ("1.9999    ", "%-10.7RG", x);
+   mpfr_set_ui (x, 1, MPFR_RNDN);
++  check_sprintf ("1.", "%#.1Rg", x);
++  check_sprintf ("1.   ", "%-#5.1Rg", x);
++  check_sprintf ("  1.0", "%#5.2Rg", x);
+   check_sprintf ("1.00000000000000000000000000000", "%#.30Rg", x);
+   check_sprintf ("1", "%.30Rg", x);
+   mpfr_set_ui (x, 0, MPFR_RNDN);
+-  check_sprintf ("0.000000000000000000000000000000", "%#.30Rg", x);
++  check_sprintf ("0.", "%#.1Rg", x);
++  check_sprintf ("0.   ", "%-#5.1Rg", x);
++  check_sprintf ("  0.0", "%#5.2Rg", x);
++  check_sprintf ("0.00000000000000000000000000000", "%#.30Rg", x);
+   check_sprintf ("0", "%.30Rg", x);
+ 
+   /* following tests with precision 53 bits */
diff --git a/dev-libs/mpfr/files/3.1.2/patch05 b/dev-libs/mpfr/files/3.1.2/patch05
new file mode 100644
index 000000000000..669b91d54dac
--- /dev/null
+++ b/dev-libs/mpfr/files/3.1.2/patch05
@@ -0,0 +1,42 @@
+diff -Naurd mpfr-3.1.2-a/PATCHES mpfr-3.1.2-b/PATCHES
+--- mpfr-3.1.2-a/PATCHES	2013-12-01 11:07:49.575329762 +0000
++++ mpfr-3.1.2-b/PATCHES	2013-12-01 11:07:49.751331625 +0000
+@@ -0,0 +1 @@
++custom_init_set
+diff -Naurd mpfr-3.1.2-a/VERSION mpfr-3.1.2-b/VERSION
+--- mpfr-3.1.2-a/VERSION	2013-12-01 11:07:49.571329714 +0000
++++ mpfr-3.1.2-b/VERSION	2013-12-01 11:07:49.747331585 +0000
+@@ -1 +1 @@
+-3.1.2-p4
++3.1.2-p5
+diff -Naurd mpfr-3.1.2-a/src/mpfr.h mpfr-3.1.2-b/src/mpfr.h
+--- mpfr-3.1.2-a/src/mpfr.h	2013-12-01 11:07:49.571329714 +0000
++++ mpfr-3.1.2-b/src/mpfr.h	2013-12-01 11:07:49.747331585 +0000
+@@ -27,7 +27,7 @@
+ #define MPFR_VERSION_MAJOR 3
+ #define MPFR_VERSION_MINOR 1
+ #define MPFR_VERSION_PATCHLEVEL 2
+-#define MPFR_VERSION_STRING "3.1.2-p4"
++#define MPFR_VERSION_STRING "3.1.2-p5"
+ 
+ /* Macros dealing with MPFR VERSION */
+ #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
+@@ -861,7 +861,7 @@
+     _t = (mpfr_kind_t) _k;                                     \
+     _s = 1;                                                    \
+   } else {                                                     \
+-    _t = (mpfr_kind_t) -k;                                     \
++    _t = (mpfr_kind_t) - _k;                                   \
+     _s = -1;                                                   \
+   }                                                            \
+   _e = _t == MPFR_REGULAR_KIND ? (e) :                         \
+diff -Naurd mpfr-3.1.2-a/src/version.c mpfr-3.1.2-b/src/version.c
+--- mpfr-3.1.2-a/src/version.c	2013-12-01 11:07:49.575329762 +0000
++++ mpfr-3.1.2-b/src/version.c	2013-12-01 11:07:49.747331585 +0000
+@@ -25,5 +25,5 @@
+ const char *
+ mpfr_get_version (void)
+ {
+-  return "3.1.2-p4";
++  return "3.1.2-p5";
+ }
diff --git a/dev-libs/mpfr/mpfr-3.1.2_p5.ebuild b/dev-libs/mpfr/mpfr-3.1.2_p5.ebuild
new file mode 100644
index 000000000000..54e5057f7d95
--- /dev/null
+++ b/dev-libs/mpfr/mpfr-3.1.2_p5.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/dev-libs/mpfr/mpfr-3.1.2_p5.ebuild,v 1.1 2014/03/26 05:45:18 vapier Exp $
+
+EAPI="3"
+
+# NOTE: we cannot depend on autotools here starting with gcc-4.3.x
+inherit eutils libtool multilib
+
+MY_PV=${PV/_p*}
+MY_P=${PN}-${MY_PV}
+PLEVEL=${PV/*p}
+DESCRIPTION="library for multiple-precision floating-point computations with exact rounding"
+HOMEPAGE="http://www.mpfr.org/"
+SRC_URI="http://www.mpfr.org/mpfr-${MY_PV}/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2.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"
+IUSE="static-libs"
+
+RDEPEND=">=dev-libs/gmp-4.1.4-r2[static-libs?]"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	if [[ ${PLEVEL} != ${PV} ]] ; then
+		for ((i=1; i<=PLEVEL; ++i)) ; do
+			patch=patch$(printf '%02d' ${i})
+			if [[ -f ${FILESDIR}/${MY_PV}/${patch} ]] ; then
+				epatch "${FILESDIR}"/${MY_PV}/${patch}
+			elif [[ -f ${DISTDIR}/${PN}-${MY_PV}_p${i} ]] ; then
+				epatch "${DISTDIR}"/${PN}-${MY_PV}_p${i}
+			else
+				ewarn "${DISTDIR}/${PN}-${MY_PV}_p${i}"
+				die "patch ${i} missing - please report to bugs.gentoo.org"
+			fi
+		done
+	fi
+	sed -i '/if test/s:==:=:' configure #261016
+	find . -type f -exec touch -r configure {} +
+	elibtoolize
+}
+
+src_configure() {
+	# Make sure mpfr doesn't go probing toolchains it shouldn't #476336#19
+	user_redefine_cc=yes \
+	econf \
+		--docdir="\$(datarootdir)/doc/${PF}" \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die
+	use static-libs || rm -f "${ED}"/usr/$(get_libdir)/libmpfr.la
+
+	# clean up html/license install
+	pushd "${ED}"/usr/share/doc/${PF} >/dev/null
+	dohtml *.html && rm COPYING* *.html || die
+	popd >/dev/null
+	# some, but not all, are already installed
+	dodoc AUTHORS BUGS ChangeLog NEWS README TODO
+	prepalldocs
+}
+
+pkg_preinst() {
+	preserve_old_lib /usr/$(get_libdir)/libmpfr$(get_libname 1)
+}
+
+pkg_postinst() {
+	preserve_old_lib_notify /usr/$(get_libdir)/libmpfr$(get_libname 1)
+}
diff --git a/dev-ml/extlib/extlib-1.6.1.ebuild b/dev-ml/extlib/extlib-1.6.1.ebuild
index 72af37e0008e..68d0a37b5060 100644
--- a/dev-ml/extlib/extlib-1.6.1.ebuild
+++ b/dev-ml/extlib/extlib-1.6.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/dev-ml/extlib/extlib-1.6.1.ebuild,v 1.1 2013/12/11 19:24:33 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/extlib/extlib-1.6.1.ebuild,v 1.2 2014/03/25 10:19:40 nimiux Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ LICENSE="LGPL-2.1"
 DEPEND=">=dev-lang/ocaml-3.10.2:=[ocamlopt?]"
 RDEPEND="${DEPEND}"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="doc +ocamlopt"
 
 src_compile() {
diff --git a/dev-ml/pomap/pomap-3.0.3.ebuild b/dev-ml/pomap/pomap-3.0.3.ebuild
index 1d3028255e9a..f13869dba52a 100644
--- a/dev-ml/pomap/pomap-3.0.3.ebuild
+++ b/dev-ml/pomap/pomap-3.0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/pomap/pomap-3.0.3.ebuild,v 1.1 2014/01/19 13:14:00 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/pomap/pomap-3.0.3.ebuild,v 1.2 2014/03/25 10:30:49 nimiux Exp $
 
 EAPI=5
 
@@ -16,7 +16,7 @@ LICENSE="LGPL-2.1-with-linking-exception"
 DEPEND=""
 RDEPEND="${DEPEND}"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE="examples"
 
 DOCS=( "AUTHORS.txt" "CHANGES.txt" "README.md" )
diff --git a/dev-ml/res/res-4.0.4.ebuild b/dev-ml/res/res-4.0.4.ebuild
index bb34be860c64..08080b744f9b 100644
--- a/dev-ml/res/res-4.0.4.ebuild
+++ b/dev-ml/res/res-4.0.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/dev-ml/res/res-4.0.4.ebuild,v 1.1 2014/01/19 12:36:16 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/res/res-4.0.4.ebuild,v 1.2 2014/03/25 10:32:58 nimiux Exp $
 
 EAPI=5
 
@@ -16,7 +16,7 @@ LICENSE="LGPL-2.1-with-linking-exception"
 DEPEND=""
 RDEPEND="${DEPEND}"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE="examples"
 
 DOCS=( "AUTHORS.txt" "CHANGES.txt" "README.md" )
diff --git a/dev-perl/Geo-IP/Geo-IP-1.400.0.ebuild b/dev-perl/Geo-IP/Geo-IP-1.400.0.ebuild
deleted file mode 100644
index 661c287d6c10..000000000000
--- a/dev-perl/Geo-IP/Geo-IP-1.400.0.ebuild
+++ /dev/null
@@ -1,21 +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/Geo-IP/Geo-IP-1.400.0.ebuild,v 1.6 2012/02/19 15:47:22 armin76 Exp $
-
-EAPI=4
-
-MODULE_AUTHOR=BORISZ
-MODULE_VERSION=1.40
-inherit perl-module multilib
-
-DESCRIPTION="Look up country by IP Address"
-
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc sparc x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND="dev-libs/geoip"
-RDEPEND="${DEPEND}"
-
-SRC_TEST=no
-myconf="LIBS=-L/usr/$(get_libdir)"
diff --git a/dev-perl/Geo-IP/Geo-IP-1.410.0.ebuild b/dev-perl/Geo-IP/Geo-IP-1.410.0.ebuild
deleted file mode 100644
index 20d383c43a37..000000000000
--- a/dev-perl/Geo-IP/Geo-IP-1.410.0.ebuild
+++ /dev/null
@@ -1,21 +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/Geo-IP/Geo-IP-1.410.0.ebuild,v 1.9 2013/06/29 16:19:46 ago Exp $
-
-EAPI=5
-
-MODULE_AUTHOR=BORISZ
-MODULE_VERSION=1.41
-inherit perl-module multilib
-
-DESCRIPTION="Look up country by IP Address"
-
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc sparc x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND="dev-libs/geoip"
-RDEPEND="${DEPEND}"
-
-SRC_TEST=no
-myconf="LIBS=-L/usr/$(get_libdir)"
diff --git a/dev-perl/Geo-IP/Manifest b/dev-perl/Geo-IP/Manifest
index 4ddd01e82266..87f707d9f12e 100644
--- a/dev-perl/Geo-IP/Manifest
+++ b/dev-perl/Geo-IP/Manifest
@@ -1,4 +1,2 @@
-DIST Geo-IP-1.40.tar.gz 111898 SHA256 ca48babd3e944cb1bc5cac56f618c9f94f3a329dd2716d6b49b658ae28848ab3 SHA512 6c5e3d136dcbaebf291ea14004cb775e0b4ef3ccaa4a200609a16818d34f6c9f1c2550b3f4d98626b6d58cfb372d1a7db86002506eddeceb592b800a056f11f2 WHIRLPOOL c4e91c22de1bc34b36c9d400c827577e878fa977098c7f0de68d35cae1b2354f4899b7e3663f9ec3c93f05b7fdf8015bbc9d55f285b30c30ef541b413ccf6889
-DIST Geo-IP-1.41.tar.gz 111749 SHA256 d6afe868033f2620377de3d311c277fa2e70ccf02266b72efe03358b87ded348 SHA512 ddf5eaee87cf8e60e9516495a8d34ad7776dedb70db7c3ccfe970c37e03806f18a94d99f0086ce8981f5a35488395e91ae6f45e1aa549d678506b261fab0c01c WHIRLPOOL b1999dcebad5ad0e9c2abaa71ae552d4a8d5eb0e4048e2dd08146544e76757798f00b0d85d8c384e2bc92202ef73166e6c6e6376cfa7c1a98ef28f4537d963ed
 DIST Geo-IP-1.42.tar.gz 111881 SHA256 c44b517490346e870cea22a1686937537088a85abf75eb8a01b136fc41cf81f5 SHA512 289d42a479fa5b7916bbb222a6c4f8be535c4bc1169413725b11a1291d49d795e59df963e432cbdf865a624e98e7448807a79c207cae84155607e4adceb585ab WHIRLPOOL 76303a43e633b669cce60004835ef09268699de833e4edea46affd96967041f346156baeb01a9d9f52a39b67749a5a24838b7bc8d7859a01c30becdb71f1bfe3
 DIST Geo-IP-1.43.tar.gz 112349 SHA256 587ab026e377d609e1ce0057439cd90f57849e0faa38713a5d19ee9f8965f55c SHA512 f848b4204138db82213b09d9193afc98d8bff04290cb4ad147196e136e3f2e17205bbc3123892208fedb20ae2785d0573517cd3c7de7804ce9424ee9688ce5fb WHIRLPOOL 8d0ecd0da39eb10bebfeda396b322956b5b309af627040a7abcef018d23d2a345fa52a102951878b74d6b06f8e148ff59c7244ccffceedf1b511cd009bb3ffc6
diff --git a/dev-python/cvxopt/cvxopt-1.1.6.ebuild b/dev-python/cvxopt/cvxopt-1.1.6-r2.ebuild
similarity index 53%
rename from dev-python/cvxopt/cvxopt-1.1.6.ebuild
rename to dev-python/cvxopt/cvxopt-1.1.6-r2.ebuild
index 50d4dc6d37f9..f5334f7ea83e 100644
--- a/dev-python/cvxopt/cvxopt-1.1.6.ebuild
+++ b/dev-python/cvxopt/cvxopt-1.1.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/dev-python/cvxopt/cvxopt-1.1.6.ebuild,v 1.3 2014/01/16 18:44:31 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cvxopt/cvxopt-1.1.6-r2.ebuild,v 1.1 2014/03/26 00:04:00 bicatali Exp $
 
 EAPI=5
 
@@ -21,35 +21,47 @@ RDEPEND="
 	virtual/blas
 	virtual/cblas
 	virtual/lapack
-	sci-libs/cholmod
-	sci-libs/umfpack
-	dsdp? ( sci-libs/dsdp )
-	fftw? ( sci-libs/fftw:3.0 )
-	glpk? ( sci-mathematics/glpk:= )
-	gsl? ( sci-libs/gsl )"
+	sci-libs/cholmod:0=
+	sci-libs/umfpack:0=
+	dsdp? ( sci-libs/dsdp:0= )
+	fftw? ( sci-libs/fftw:3.0= )
+	glpk? ( sci-mathematics/glpk:0= )
+	gsl? ( sci-libs/gsl:0= )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	doc? ( dev-python/sphinx )"
 
 python_prepare_all(){
-	local PATCHES=(	"${FILESDIR}"/${PN}-1.1.6-setup.patch )
+	epatch "${FILESDIR}"/${PN}-1.1.6-setup.patch
+
 	has_version ">=sci-mathematics/glpk-4.49" && \
-		epatch "${FILESDIR}"/${PN}-1.1.6-glpk.patch
-	rm -r src/C/SuiteSparse*/ || die
+		epatch "${FILESDIR}"/${PN}-1.1.6-glpk449.patch
 
-	distutils-r1_python_prepare_all
+	rm -r src/C/SuiteSparse*/ || die
 
 	pkg_lib() {
-		local pylib=\'$($(tc-getPKG_CONFIG) --libs-only-l ${1} | sed \
-			-e 's/^-l//' \
-			-e "s/ -l/\',\'/g" \
-			-e 's/.,.pthread//g' \
-			-e "s:[[:space:]]::g")\'
-		sed -i -e "/_LIB = /s:\(.*\)'${1}'\(.*\):\1${pylib}\2:" setup.py || die
+		local pkg=$(echo $1 | tr '[:lower:]' '[:upper:]')
+		local libs="$($(tc-getPKG_CONFIG) --libs-only-l $1 | \
+			sed -e 's:[ ]-l*\(pthread\|m\)\([ ]\|$\)::g' -e 's:[ ]*$::' | \
+			tr ' ' '\n' | sort -u | sed -e "s:^-l\(.*\):'\1':g" | \
+			tr '\n' ',' | sed -e 's:,$::')"
+		local libdir="$($(tc-getPKG_CONFIG) --libs-only-L $1 | \
+			sed -e 's:[ ]*$::' | \
+			tr ' ' '\n' | sort -u | sed -e "s:^-L\(.*\):'\1':g" | \
+			tr '\n' ',' | sed -e 's:,$::')"
+		local incdir="$($(tc-getPKG_CONFIG) --cflags-only-I $1 | \
+			sed -e 's:[ ]*$::' | \
+			tr ' ' '\n' | sort -u | sed -e "s:^-L\(.*\):'\1':g" | \
+			tr '\n' ',' | sed -e 's:,$::')"
+		sed -i \
+			-e "/${pkg}_LIB[ ]*=/s:\(.*[ ]*=[ ]*\[\).*${1}.*:\1${libs}\]:" \
+			-e "s:\(${pkg}_INC_DIR[ ]*=\).*$:\1 ${incdir}:" \
+			-e "s:\[ BLAS_LIB_DIR \]:\[ ${libdir} \]:g" \
+			setup.py || die
 	}
 
 	use_cvx() {
-		if use ${1}; then
+		if use $1 ; then
 			sed -i \
 				-e "s/\(BUILD_${1^^} =\) 0/\1 1/" \
 				setup.py || die
@@ -59,17 +71,12 @@ python_prepare_all(){
 	pkg_lib blas
 	pkg_lib lapack
 
-	# Deal with blas/lapck libraries that are not in /usr/lib{64}
-	local lapackdir=\'$($(tc-getPKG_CONFIG) --libs-only-L lapack | sed \
-			-e 's/^-L//' \
-			-e "s/ -L/\',\'/g" \
-			-e "s:[[:space:]]::g")\'
-	sed -i -e "s:BLAS_LIB_DIR = '':BLAS_LIB_DIR = ${lapackdir}:" setup.py || die
-
 	use_cvx gsl
 	use_cvx fftw
 	use_cvx glpk
 	use_cvx dsdp
+
+	distutils-r1_python_prepare_all
 }
 
 python_compile_all() {
diff --git a/dev-python/cvxopt/files/cvxopt-1.1.6-setup.patch b/dev-python/cvxopt/files/cvxopt-1.1.6-setup.patch
index 440e1158ef93..c95f31bf6048 100644
--- a/dev-python/cvxopt/files/cvxopt-1.1.6-setup.patch
+++ b/dev-python/cvxopt/files/cvxopt-1.1.6-setup.patch
@@ -102,7 +102,7 @@
      library_dirs = [ BLAS_LIB_DIR ],
      define_macros = MACROS,
      extra_link_args = BLAS_EXTRA_LINK_ARGS,
-@@ -105,61 +98,35 @@
+@@ -105,61 +98,36 @@
      extra_link_args = BLAS_EXTRA_LINK_ARGS,
      sources = ['src/C/blas.c'] )
  
@@ -155,9 +155,10 @@
 -        glob('src/C/SuiteSparse/CHOLMOD/Cholesky/c*.c') +
 -        ['src/C/SuiteSparse/CHOLMOD/Check/cholmod_check.c'] +
 -        glob('src/C/SuiteSparse/CHOLMOD/Supernodal/c*.c') )
-+     libraries = ['cholmod'] + BLAS_LIB,
-+     define_macros = MACROS + [('NPARTITION', '1'), ('NTIMER', '1')],
-+     sources = [ 'src/C/cholmod.c' ])
++    library_dirs = [ BLAS_LIB_DIR ],
++    libraries = ['cholmod'] + BLAS_LIB,
++    define_macros = MACROS + [('NPARTITION', '1'), ('NTIMER', '1')],
++    sources = [ 'src/C/cholmod.c' ])
  
  amd = Extension('amd', 
 -    include_dirs = [ 'src/C/SuiteSparse/AMD/Include', 
diff --git a/dev-python/django-extensions/Manifest b/dev-python/django-extensions/Manifest
index 982ec730da5b..6c965f1dd5e9 100644
--- a/dev-python/django-extensions/Manifest
+++ b/dev-python/django-extensions/Manifest
@@ -1 +1,2 @@
 DIST django-extensions-1.0.2.tgz 152935 SHA256 aebc3ddcd8f460109839c2b43c315628843a1bad3ef6ee9e4db93158df94b932 SHA512 57f8bf340115242e66c7f6c2e6eec17cb8966e03f8d932aad891201fdc720bd98f175c74adad25f26cf12c2c1dcbff0a6abf97690034517c370cd1027bef9ed9 WHIRLPOOL 49b97481705ee103b9435d7ad16ac7aaa149fc028e609f6d04f163fa6357b4490585715d31261aecefdfd76da18656b9ec64696542bee3f207960d54ac77b445
+DIST django-extensions-1.3.3.tgz 169961 SHA256 09bf65fe3ce80187d5d85088ae469a146f7b5d286c2e2a6d6acfb4c520f6ceed SHA512 51a0bf46a944647cf5510b6527ec0a95fddd6423f62fdaaedc4fa04cb4ea1d2413ffdf606d8c6440d92a3162f7cf6432ccaf4c4184b2eeac0106c6090a586ffd WHIRLPOOL 5f9fe79177b552b03d9ab8c016b153d55abe854889cbce39b85066bbdee6295ae51d326212c51c1d748da29b8175e9ec7835c66765f9564abed277b57c011e87
diff --git a/dev-python/django-extensions/django-extensions-1.3.3.ebuild b/dev-python/django-extensions/django-extensions-1.3.3.ebuild
new file mode 100644
index 000000000000..0dc817a05764
--- /dev/null
+++ b/dev-python/django-extensions/django-extensions-1.3.3.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django-extensions/django-extensions-1.3.3.ebuild,v 1.1 2014/03/26 03:38:36 idella4 Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7,3_3} )
+
+inherit distutils-r1
+
+GIT_HASH_TAG="47a531c"
+
+DESCRIPTION="Django Command Extensions"
+HOMEPAGE="http://github.com/django-extensions/django-extensions http://code.google.com/p/django-command-extensions/"
+SRC_URI="http://github.com/django-extensions/django-extensions/tarball/${PV}/${P}.tgz"
+
+LICENSE="BSD || ( MIT GPL-2 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc graphviz mysql postgres s3 sqlite test vcard"
+# Req'd for tests
+DISTUTILS_IN_SOURCE_BUILD=1
+
+PY2_USEDEP=$(python_gen_usedep 'python2*')
+RDEPEND=">=dev-python/django-1.5.4[${PYTHON_USEDEP},mysql?,postgres?,sqlite?]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/werkzeug[${PYTHON_USEDEP}]
+	graphviz? ( dev-python/pygraphviz[${PY2_USEDEP}] )
+	s3? ( dev-python/boto[${PY2_USEDEP}] )
+	vcard? ( dev-python/vobject[${PY2_USEDEP}] )"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/pygments[${PYTHON_USEDEP}] )
+	test? ( ${RDEPEND} )"
+
+S="${WORKDIR}/${PN}-${PN}-${GIT_HASH_TAG}"
+
+PY2_REQUSE="|| ( $(python_gen_useflags python2* ) )"
+REQUIRED_USE="
+	graphviz? ( ${PY2_REQUSE} )
+	s3? ( ${PY2_REQUSE} )
+	vcard? ( ${PY2_REQUSE} )"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	"${PYTHON}" run_tests.py || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/numpy/numpy-1.8.0-r1.ebuild b/dev-python/numpy/numpy-1.8.0-r1.ebuild
index 7b7746384182..096855d4d241 100644
--- a/dev-python/numpy/numpy-1.8.0-r1.ebuild
+++ b/dev-python/numpy/numpy-1.8.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/dev-python/numpy/numpy-1.8.0-r1.ebuild,v 1.12 2014/03/18 20:21:22 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.8.0-r1.ebuild,v 1.13 2014/03/25 19:26:53 bicatali Exp $
 
 EAPI=5
 
@@ -51,19 +51,19 @@ src_unpack() {
 
 pc_incdir() {
 	$(tc-getPKG_CONFIG) --cflags-only-I $@ | \
-		sed -e 's/^-I//' -e 's/[ ]*-I/:/g' -e 's/[ ]*$//'
+		sed -e 's/^-I//' -e 's/[ ]*-I/:/g' -e 's/[ ]*$//' -e 's|^:||'
 }
 
 pc_libdir() {
 	$(tc-getPKG_CONFIG) --libs-only-L $@ | \
-		sed -e 's/^-L//' -e 's/[ ]*-L/:/g' -e 's/[ ]*$//'
+		sed -e 's/^-L//' -e 's/[ ]*-L/:/g' -e 's/[ ]*$//' -e 's|^:||'
 }
 
 pc_libs() {
 	$(tc-getPKG_CONFIG) --libs-only-l $@ | \
 		sed -e 's/[ ]-l*\(pthread\|m\)\([ ]\|$\)//g' \
 		-e 's/^-l//' -e 's/[ ]*-l/,/g' -e 's/[ ]*$//' \
-		| tr ',' '\n' | sort | uniq | tr '\n' ','
+		| tr ',' '\n' | sort -u | tr '\n' ',' | sed -e 's|,$||'
 }
 
 python_prepare_all() {
diff --git a/dev-python/py-amqp/Manifest b/dev-python/py-amqp/Manifest
index ca995c53e984..de5480f7965d 100644
--- a/dev-python/py-amqp/Manifest
+++ b/dev-python/py-amqp/Manifest
@@ -2,3 +2,4 @@ DIST amqp-1.0.13.tar.gz 70458 SHA256 15fed1a2f0326f198a9d3d16ce1dc4296385d33859b
 DIST amqp-1.2.1.tar.gz 74050 SHA256 9d688b8da8051b0cbb97131c42a27923e3afd943c557cd30718b3d8f346dbeac SHA512 4ec9eae5c586808dae83c0409d1083da7df60898d6c5d5c999848c94b351a6fc0c0e89eacfc2c002dd153d6e6e0b9291357a608a3fdf508b06e20f85d793c962 WHIRLPOOL 65d7737540720708feacb2ef65450f978ad8c9b4c6667544e1a452d7421e81c9edac3714a819e8f49cd0a549ad9f0ebea1093239da4bc1db7d549d63b9e360d2
 DIST amqp-1.3.3.tar.gz 75574 SHA256 e65da719efcd1d0a9cff44431e2476f88de8ffeeb7abc0c77e82361c9281170f SHA512 16b0d5b51b8fb01bb3c14109b2ebdb59aeca227b313d16075151ccb631df2aabdc69c0eb70972f40975934fab55d8809ae9da0e9afa5bce5b7ab9a50a72d43c9 WHIRLPOOL 5228114037f9a217b251fe40a99015e38f49de5930b1723b47b9ccb7fb599308ff94efa4cc199fa1d9076ce62d0788b798202bce4ca5b0321bf6ea6f6957d8e7
 DIST amqp-1.4.2.tar.gz 77984 SHA256 1de818a1472bf625712c5d3a430130d37749cf8a9413cb61e9411e2ebe17da89 SHA512 953ba1cacc01e906350c9506507ed35d6483071b0bbe7a78b422fff93e8ac9d4a1b3ace36b500ba41bf315d0e231bb2c19ed2817c7f4758210a07833a169b8ab WHIRLPOOL eb15d598d1db37605537d8eb9a677a29ad49ce63c7e74f1e34811a8747b0b4c5b19505a290e392365eee07a7834f16a919d57020f17c989642a5f92b8db6dbff
+DIST amqp-1.4.4.tar.gz 77196 SHA256 86ffc9563311e4e2b343366c51880d973b1388f8e10e8d620689b381201ffe95 SHA512 0c097542c9388cdc50a366654bf0fc4ae036376d3d30d6f1c8561ac27e1b60fea7c3d4ccf1a55abe2d565f51c0e007759c10c1411da9717f5af0a0142173ddd7 WHIRLPOOL 493c5b1c94e208646670ebd38986a2468086376114f48a69d0cd8a8a18db011d8a649cb9104895465f1a8679bc8973e0e11c9620055ff048bc13023a5c305ca2
diff --git a/dev-python/py-amqp/py-amqp-1.4.4.ebuild b/dev-python/py-amqp/py-amqp-1.4.4.ebuild
new file mode 100644
index 000000000000..a65e3ec02cf9
--- /dev/null
+++ b/dev-python/py-amqp/py-amqp-1.4.4.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/py-amqp/py-amqp-1.4.4.ebuild,v 1.1 2014/03/25 21:03:49 prometheanfire Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
+
+inherit distutils-r1
+
+MY_PN="amqp"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Low-level AMQP client for Python (fork of amqplib)"
+HOMEPAGE="https://github.com/celery/py-amqp http://pypi.python.org/pypi/amqp/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples extras test"
+
+RDEPEND=""
+DEPEND="test? ( virtual/python-unittest2[${PYTHON_USEDEP}]
+				dev-python/nose[${PYTHON_USEDEP}]
+				dev-python/nose-cover3[${PYTHON_USEDEP}]
+				>=dev-python/coverage-3.0[${PYTHON_USEDEP}]
+				dev-python/mock[${PYTHON_USEDEP}]
+				doc? (	dev-python/sphinx[${PYTHON_USEDEP}]
+						>=dev-python/sphinxcontrib-issuetracker-0.9[${PYTHON_USEDEP}]
+				)
+			)"
+
+# Same tests from before require a socket connection
+PATCHES=( "${FILESDIR}"/${PN}-1.3.3-disable_socket_tests.patch )
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	cp -r -l funtests "${BUILD_DIR}"/lib/ || die
+	cd "${BUILD_DIR}"/lib || die
+	if [[ ${EPYTHON:6:1} == 3 ]]; then
+		#   -n causes Python to write into hardlinked files
+		2to3 --no-diffs -w funtests || die
+	fi
+	"${PYTHON}" funtests/run_all.py || die "Tests failed under ${EPYTHON}"
+	rm -rf funtests/ || die
+}
+
+python_install_all() {
+	use examples && local EXAMPLES=( demo/. )
+	use doc && local HTML_DOCS=( docs/.build/html/. )
+	if use extras; then
+		insinto /usr/share/${PF}/extras
+		doins -r extra
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/python-gnupg/Manifest b/dev-python/python-gnupg/Manifest
index 83e81e7eb036..746ac70aefa1 100644
--- a/dev-python/python-gnupg/Manifest
+++ b/dev-python/python-gnupg/Manifest
@@ -1,3 +1 @@
-DIST python-gnupg-0.3.1.tar.gz 17226 SHA256 05a04a1c5dc562ff49e3bc7ebb32144c25e19b5a2d65c8ada064ceae08c87d86 SHA512 993989b7978ef18b6e2e5488829fc879b8dc90029f5a689c8f8f970b91257cdb579f0e46dccafc28f0e09006797bd3786ff0eda03c66f43eba63c09f56adbc85 WHIRLPOOL 4f8174087fbfaacaced781a994c12850ce295dbb649eb9af7c059ec05185bba4245f5f6400c2a62c79a6fff84d0bd25efc4c1cbb2365b82351e2f1e9b6230d6d
-DIST python-gnupg-0.3.2.tar.gz 17645 SHA256 e38e724a021767673054d54338f621c53edd48f2cdbc1226f5a9bffc831c3418 SHA512 6ce427231210bb1a19ed0a9676e7c2b82985ca4407ba3c13c6fa1624c97ddf76839badc23681d877c054bea3d098abfc700938d4b1e5454e4b0c3952ba552a52 WHIRLPOOL ee6a1dba881b6a65750a1ab0d1e4e3257e7f13d457fecc4e68ed6b37c8ec3fa51499f98a797c45bebc316e42640050e67f2c031cb483676d299296a5736e000c
 DIST python-gnupg-0.3.6.tar.gz 20855 SHA256 ffdfad1824fbde8ab94c50e08040edd6a82b4095c187994954471a38c45a094a SHA512 4444ce57190ddfdfbe8ebb39ecdf79ef2ab70f227e2f0b12ce913801b3949f444a458cc884883e8811d649537003afd722cd5c933765c045edf07867a51814f8 WHIRLPOOL 5d62cf023b0da3a0fde61f648f49b672f09bc5899a1f8c847d231dcc204c1c3192d7b7d28fe080b699e26b44d6074033d2788e142b9183c58940a1af2511a4d7
diff --git a/dev-python/python-gnupg/python-gnupg-0.3.1-r1.ebuild b/dev-python/python-gnupg/python-gnupg-0.3.1-r1.ebuild
deleted file mode 100644
index 14a25c179c55..000000000000
--- a/dev-python/python-gnupg/python-gnupg-0.3.1-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-gnupg/python-gnupg-0.3.1-r1.ebuild,v 1.2 2013/09/05 18:46:54 mgorny Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python wrapper for GNU Privacy Guard"
-HOMEPAGE="http://code.google.com/p/python-gnupg/"
-SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="app-crypt/gnupg"
-
-# Tests hang, bug #449638.
-RESTRICT=test
-
-python_test() {
-	"${PYTHON}" test_gnupg.py || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/python-gnupg/python-gnupg-0.3.2.ebuild b/dev-python/python-gnupg/python-gnupg-0.3.2.ebuild
deleted file mode 100644
index 0c989f8b88a8..000000000000
--- a/dev-python/python-gnupg/python-gnupg-0.3.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-gnupg/python-gnupg-0.3.2.ebuild,v 1.2 2013/09/05 18:46:54 mgorny Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python wrapper for GNU Privacy Guard"
-HOMEPAGE="http://code.google.com/p/python-gnupg/"
-SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="app-crypt/gnupg"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-fast-random.patch
-)
-
-python_test() {
-	cd "${BUILD_DIR}" || die
-	"${PYTHON}" "${S}"/test_gnupg.py || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/pythonmagick/files/pythonmagick-0.9.8-build.patch b/dev-python/pythonmagick/files/pythonmagick-0.9.8-build.patch
new file mode 100644
index 000000000000..95d3b4d29ded
--- /dev/null
+++ b/dev-python/pythonmagick/files/pythonmagick-0.9.8-build.patch
@@ -0,0 +1,14 @@
+Index: PythonMagick-0.9.8/pythonmagick_src/_Image.cpp
+===================================================================
+--- pythonmagick_src/_Image.cpp
++++ pythonmagick_src/_Image.cpp
+@@ -93,7 +93,7 @@ void Export_pyste_src_Image()
+         .def("colorize", (void (Magick::Image::*)(const unsigned int, const unsigned int, const unsigned int, const Magick::Color&) )&Magick::Image::colorize)
+         .def("colorize", (void (Magick::Image::*)(const unsigned int, const Magick::Color&) )&Magick::Image::colorize)
+         .def("comment", (void (Magick::Image::*)(const std::string&) )&Magick::Image::comment)
+-        .def("compare", &Magick::Image::compare)
++        .def("compare", (bool (Magick::Image::*)(const Magick::Image&) )&Magick::Image::compare)
+         .def("composite", (void (Magick::Image::*)(const Magick::Image&, const ::ssize_t, const ::ssize_t, const MagickCore::CompositeOperator) )&Magick::Image::composite, Magick_Image_composite_overloads_3_4())
+         .def("composite", (void (Magick::Image::*)(const Magick::Image&, const Magick::Geometry&, const MagickCore::CompositeOperator) )&Magick::Image::composite, Magick_Image_composite_overloads_2_3())
+         .def("composite", (void (Magick::Image::*)(const Magick::Image&, const MagickCore::GravityType, const MagickCore::CompositeOperator) )&Magick::Image::composite, Magick_Image_composite_overloads_2_3())
+
diff --git a/dev-python/pythonmagick/pythonmagick-0.9.8.ebuild b/dev-python/pythonmagick/pythonmagick-0.9.8.ebuild
index 9dc97aaf44c5..4e5b3ff924c8 100644
--- a/dev-python/pythonmagick/pythonmagick-0.9.8.ebuild
+++ b/dev-python/pythonmagick/pythonmagick-0.9.8.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-python/pythonmagick/pythonmagick-0.9.8.ebuild,v 1.4 2013/04/23 05:35:51 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pythonmagick/pythonmagick-0.9.8.ebuild,v 1.5 2014/03/25 11:31:54 idella4 Exp $
 
 EAPI="4"
 PYTHON_DEPEND="*:2.6"
@@ -37,6 +37,7 @@ PYTHON_CXXFLAGS=("2.* + -fno-strict-aliasing")
 src_prepare() {
 	epatch "${FILESDIR}/${PN}-0.9.1-use_active_python_version.patch"
 	epatch "${FILESDIR}/${PN}-0.9.2-fix_detection_of_python_includedir.patch"
+	epatch "${FILESDIR}/${P}-build.patch"
 
 	sed -e "s/AM_PATH_PYTHON(3.1)/AM_PATH_PYTHON(2.6)/" -i configure.ac || die "sed failed"
 
diff --git a/dev-python/sqlalchemy/sqlalchemy-0.9.1.ebuild b/dev-python/sqlalchemy/sqlalchemy-0.9.1.ebuild
index 2d07baf2b967..4d23ae5b82a6 100644
--- a/dev-python/sqlalchemy/sqlalchemy-0.9.1.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-0.9.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/dev-python/sqlalchemy/sqlalchemy-0.9.1.ebuild,v 1.1 2014/01/08 04:20:02 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sqlalchemy/sqlalchemy-0.9.1.ebuild,v 1.2 2014/03/26 05:40:51 idella4 Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
@@ -48,17 +48,18 @@ python_compile() {
 python_test() {
 	# Create copies of necessary files in BUILD_DIR.
 	cp -pR examples sqla_nose.py setup.cfg test "${BUILD_DIR}" || die
-	pushd "${BUILD_DIR}" || die
-
-	# No longer has postgresql support
-	"${PYTHON}" sqla_nose.py -I test_postgresql || die "Testsuite failed under ${EPYTHON}"
-	popd || die
+	pushd "${BUILD_DIR}" > /dev/null
+	if [[ "${EPYTHON}" == "python3.2" ]]; then
+		2to3 --no-diffs -w test
+	fi
+	"${PYTHON}" sqla_nose.py || die "Testsuite failed under ${EPYTHON}"
+	popd > /dev/null
 }
 
 python_install_all() {
 	use doc && HTML_DOCS=( doc/. )
 
-	use examples && local EXAMPLES=( examples )
+	use examples && local EXAMPLES=( examples/. )
 
 	distutils-r1_python_install_all
 }
diff --git a/dev-python/sqlalchemy/sqlalchemy-0.9.2.ebuild b/dev-python/sqlalchemy/sqlalchemy-0.9.2.ebuild
index fd43c6cba4ae..1fd35254fbe4 100644
--- a/dev-python/sqlalchemy/sqlalchemy-0.9.2.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-0.9.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/dev-python/sqlalchemy/sqlalchemy-0.9.2.ebuild,v 1.1 2014/02/08 07:07:39 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sqlalchemy/sqlalchemy-0.9.2.ebuild,v 1.2 2014/03/26 05:40:51 idella4 Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
@@ -48,17 +48,18 @@ python_compile() {
 python_test() {
 	# Create copies of necessary files in BUILD_DIR.
 	cp -pR examples sqla_nose.py setup.cfg test "${BUILD_DIR}" || die
-	pushd "${BUILD_DIR}" || die
-
-	# No longer has postgresql support
-	"${PYTHON}" sqla_nose.py -I test_postgresql || die "Testsuite failed under ${EPYTHON}"
-	popd || die
+	pushd "${BUILD_DIR}" > /dev/null
+	if [[ "${EPYTHON}" == "python3.2" ]]; then
+		2to3 --no-diffs -w test
+	fi
+	"${PYTHON}" sqla_nose.py || die "Testsuite failed under ${EPYTHON}"
+	popd > /dev/null
 }
 
 python_install_all() {
 	use doc && HTML_DOCS=( doc/. )
 
-	use examples && local EXAMPLES=( examples )
+	use examples && local EXAMPLES=( examples/. )
 
 	distutils-r1_python_install_all
 }
diff --git a/dev-ruby/colorize/Manifest b/dev-ruby/colorize/Manifest
index 7ba7d365d5c4..d57ded70b515 100644
--- a/dev-ruby/colorize/Manifest
+++ b/dev-ruby/colorize/Manifest
@@ -1 +1,2 @@
 DIST colorize-0.6.0.gem 7680 SHA256 9e94b288ccbf9a8857076d24f56b0292c173a3f30adb6259e88ae1497b276369 SHA512 739b52a83834db5a37866e481f99829c18b9e4004ff0ad49a4c5f6287465e0779b9c5e1bf982a720015026afe878a1682cecbb917c4c0d8b2dbd13558c9bb5fc WHIRLPOOL 6f297e9d8fdf9e49e0552ab16391f7273d72e244edf6282f6baa852ea033bd9310a914d5f74e2fd5b09ed76193fcdc80a87aeb66594d79bfce3323fb9f7fb233
+DIST colorize-0.7.0.gem 14336 SHA256 fc6ef14053496ed8aeecc6576f1b978f8d7ff10fcd47ac4650d45ccaffb6c1d8 SHA512 341be543f85d02864a3cfb9bc59f025811a6127f583f19fb1ea1a982d830c186f1824045fc38e22a5449af3f69d915749d2451dcee0319368fd9546f0e96466d WHIRLPOOL 3235c04c2ba02ece6f3021fdfb757825f4c9ae3351be301883b301f78b28b30efbee06a2c452d5ac7d045b8dc1121a669fdfff3e3271ef472fe04575deb49998
diff --git a/dev-ruby/colorize/colorize-0.7.0.ebuild b/dev-ruby/colorize/colorize-0.7.0.ebuild
new file mode 100644
index 000000000000..0397ae4d582d
--- /dev/null
+++ b/dev-ruby/colorize/colorize-0.7.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/colorize/colorize-0.7.0.ebuild,v 1.1 2014/03/25 14:44:43 mrueg Exp $
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21 jruby"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.md"
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Add some methods to set color, background color and text effect on console easier"
+HOMEPAGE="https://github.com/fazibear/colorize http://colorize.rubyforge.org"
+LICENSE="GPL-2+"
+
+KEYWORDS="~amd64"
+SLOT="0"
+IUSE=""
+
+each_ruby_test() {
+	cd test || die
+	${RUBY} test_colorize.rb || die
+}
diff --git a/dev-ruby/domain_name/Manifest b/dev-ruby/domain_name/Manifest
index 0cc74bf04419..a2fcdf9250c7 100644
--- a/dev-ruby/domain_name/Manifest
+++ b/dev-ruby/domain_name/Manifest
@@ -1,4 +1,3 @@
 DIST domain_name-0.5.13.gem 81408 SHA256 bbafaaf2d663a9985d99d7b35b92bd0dbff2bfa35e3e92c075ad2e2199daa754 SHA512 a9d89fd90a195402bf4c14a7bc53a6478b958877af2e4e3f0651b36adda5fef74dd54f9afb19709dabdc6997e6bd1a7220e4baa6ff42d9531fc30d41ec8a6860 WHIRLPOOL 3dd254689730cb908313f16b2f9530c8b4cd4837579018841ec7502333519200062873a7eb415195ef2aed8d0ea89a6d783ed6b894157e2a2bb7f1138be85767
-DIST domain_name-0.5.14.gem 82944 SHA256 01cfd3317652336686f5133db10707658b163e873da16ce1dbb2935f27471ef2 SHA512 9a630f00c54cc00d3d201647741086b71f6326e9a3f9357ed50c3b9cb1c2a97a41858fade8330836ddb42d7b6c9e4d0a4a3b4ce9e1886ff9de4a686f74c4141d WHIRLPOOL d3e30023a05ad8d1637b697834b8406886beedd77095c84dc2ba82ee8190b575dd7d8e113887d58c8f832aa4ea0dd640fd7b43398f72304a257b0988bc468010
-DIST domain_name-0.5.15.gem 83968 SHA256 fb2ba4f2d9bb4cdc7b6eceaa1a793b65fc775b0ab94e2d2d8ae0645a22c0ff88 SHA512 04a8ae80fbd29afa5046bdf92ebe5600f9e6f9946877247d272b721a4f5716532b0f2059deace834523626f0c970c8c25fd3aebc8f2a6a894aebce575a2d7364 WHIRLPOOL aa5370ebeee15faaa9a272daffd245556bdceabdcd6423c4cff225c2b68981e6659e66a4c0df3ec85ad2c58edbc9bf6f02ff10f24eba72c942388f5eab3d8e26
 DIST domain_name-0.5.16.gem 87040 SHA256 ac0a58faac65a33dad514a4dc7ae40d0b7a391d99fdf96ca9f1b8f887a3f1011 SHA512 a3b78269a706083331f4a6dfa2f3a72153cf1c6ace64c4321137a3728e151be5795e27ccea8fde7b3ae331861af583a85e8255e84f2c09b7b0f1d01008a6096b WHIRLPOOL 525d161e13355c9581888e96da9993c7b131e9d4a50f72939305f2db2ed4711b58f423f2c9d8151d75874f8221c5476b1cfe72f3fef3bcfa7ce3a13b3b33354f
+DIST domain_name-0.5.17.gem 89600 SHA256 10905b25c882b2b3930047d56c7b398511ca054f2fe11ec9c0f349be5f6dcce7 SHA512 7aa78189ef8e81b70e3c32d660cd711283bbb06e63b6cd7af19a295884838395bebeadc96469f139afd173d8b5a7319f690ac185f5a5b810b020250eec053bb3 WHIRLPOOL dafa44ed372d5320d23bfff353d2e80293d706e9c54f603349dd1ef343291495ca80e8c126d5da9c2a2058d3e4a8bbec8d110ab86c261048a1373915fc2dc877
diff --git a/dev-ruby/domain_name/domain_name-0.5.15.ebuild b/dev-ruby/domain_name/domain_name-0.5.15.ebuild
deleted file mode 100644
index 3826baa8a72b..000000000000
--- a/dev-ruby/domain_name/domain_name-0.5.15.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/domain_name/domain_name-0.5.15.ebuild,v 1.1 2013/11/18 02:27:53 mrueg Exp $
-
-EAPI=5
-
-USE_RUBY="ruby18 ruby19 ruby20 jruby"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Domain Name manipulation library for Ruby"
-HOMEPAGE="https://github.com/knu/ruby-domain_name"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE="test"
-
-ruby_add_rdepend ">=dev-ruby/unf-0.0.5-r1:0"
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/test-unit-2.5.1-r1
-		dev-ruby/shoulda
-	)"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/,/end/ d; i gem "unf"' test/helper.rb || die
-	rm Gemfile* || die
-
-	# Remove development dependencies
-	sed -i -e '/dependency.*\(shoulda\|bundler\|jeweler\|rdoc\)/d' \
-		${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Avoid dependency on git.
-	sed -i -e 's/`git ls-files`/""/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_test() {
-	ruby-ng_testrb-2 -Ilib:test test/test_*.rb
-}
diff --git a/dev-ruby/domain_name/domain_name-0.5.14.ebuild b/dev-ruby/domain_name/domain_name-0.5.17.ebuild
similarity index 89%
rename from dev-ruby/domain_name/domain_name-0.5.14.ebuild
rename to dev-ruby/domain_name/domain_name-0.5.17.ebuild
index a3beccaea587..ab3093437209 100644
--- a/dev-ruby/domain_name/domain_name-0.5.14.ebuild
+++ b/dev-ruby/domain_name/domain_name-0.5.17.ebuild
@@ -1,10 +1,10 @@
-# 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-ruby/domain_name/domain_name-0.5.14.ebuild,v 1.1 2013/10/19 05:51:45 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/domain_name/domain_name-0.5.17.ebuild,v 1.1 2014/03/25 14:53:48 mrueg Exp $
 
 EAPI=5
 
-USE_RUBY="ruby18 ruby19 jruby"
+USE_RUBY="ruby19 ruby20 jruby"
 
 RUBY_FAKEGEM_RECIPE_TEST="none"
 RUBY_FAKEGEM_TASK_DOC=""
diff --git a/dev-ruby/lumberjack/Manifest b/dev-ruby/lumberjack/Manifest
index 698a076a8f3e..de2d117ab6af 100644
--- a/dev-ruby/lumberjack/Manifest
+++ b/dev-ruby/lumberjack/Manifest
@@ -1 +1,2 @@
 DIST lumberjack-1.0.4.gem 23552 SHA256 2d85f466e25623f5c1d8476523f5e4b7903fa622007ac109fd7b560b45a846d6 SHA512 8baf16b124a1b0bb4751619e117029d3199ed2bf6577a889338f841af75b6702294c4e8ed00ba92236db392729417904dad41ee077dbc5ff8d9287a7a7f969f8 WHIRLPOOL 69928f1615d0fc4433d4c88287142a0e2aacb67cc5436ac92c3434eb25855ffeae42ff08a62ae08a3e2f44dde46585f5d73f8e24be774c5333b3f3cab1d3b191
+DIST lumberjack-1.0.5.gem 25088 SHA256 ba75a913a3d6eacf4a9235cc3e3886fdcfb11302a5083a1a121108bc9ece57bc SHA512 0b07b52d420180044854a584aafb5099e4624a9da3cb2970e8f7f290037d2c619c06697a62574e2fb01774819c233e6557ee16c45a2942990b2cd826e78afb26 WHIRLPOOL 3488607fc9729f4daa9e1b23a9199340a682e28e5d087a87e9f587b8d3a1d2ae9d8219a924f2063080f3bb8e30176c556d8114d9d706a8f46ebf3e84c26d9ac4
diff --git a/dev-ruby/lumberjack/lumberjack-1.0.5.ebuild b/dev-ruby/lumberjack/lumberjack-1.0.5.ebuild
new file mode 100644
index 000000000000..1b2de46bf77a
--- /dev/null
+++ b/dev-ruby/lumberjack/lumberjack-1.0.5.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/lumberjack/lumberjack-1.0.5.ebuild,v 1.1 2014/03/25 14:51:55 mrueg Exp $
+
+EAPI=5
+USE_RUBY="ruby19 ruby20"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec"
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="README.rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A simple, powerful, and very fast logging utility"
+HOMEPAGE="http://github.com/bdurand/lumberjack"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
diff --git a/dev-ruby/mercenary/Manifest b/dev-ruby/mercenary/Manifest
index 39d16c19c2f3..d33d8dfe501b 100644
--- a/dev-ruby/mercenary/Manifest
+++ b/dev-ruby/mercenary/Manifest
@@ -1,3 +1,4 @@
 DIST mercenary-0.2.0.gem 10240 SHA256 bda4bcdf4c209e26d5cbfab3befead2ad0ae19aa987aea4422ac46b2374ed4c8 SHA512 805ed5f0d497407e76c01f741161f4df4dcca7c5dda8f94e36d37310fdf880e25aa2198a1db3b55655a9d83e56dc3d7f251a2b2e8f872d017a3f7cd2f891ae34 WHIRLPOOL c27327e17f07b4bb5d595632fdff1cde68462ec993db516509826a52d43b2d990c7de61548142d777dd1a830258a45664ed061eff2805d5eb62eedaed4c9be8f
 DIST mercenary-0.2.1.gem 10240 SHA256 a394a8a52f997c620ab814e31d76c3d3265ab68a1c5bedb6d32e9cdc1bc755a4 SHA512 fd92dec357ea6b4e86157c27af22b0b4fe4a199c8fc3eedfafe45265b3bf5a8bce6ab354697369d87ce5bffed0e7458c517a8587ef03338628f947039a487016 WHIRLPOOL e868c58ffa308e68b1cc4617c482aa1a08822398d587d772da9abfb4581c96802ebd996f787df6d10b71fd196a0d685dd1f1649147c96888f78530f64baba515
 DIST mercenary-0.3.1.gem 14336 SHA256 f90dc2500008555a4d39aa9ef21a630ab69e32a8a02930db7a3a14b0b06064fa SHA512 3d6185189b48175c7bb0fd77cd0722fb5ac26ecdb97ee7b0b6ff31d72ffc0a5498937f97c629dbe054b301fd2efaccdc83a1fbd612e37dfaef3f6615aef76526 WHIRLPOOL f80a7440753a3d464cd826458c4ae6b2154800b6f7938401e844e7de86d4b6db760dd28072e289f73243dbf8255a32df8491cb8683c57cd060fcbe407ce27c01
+DIST mercenary-0.3.2.gem 16384 SHA256 995e700500621a77f0101236302d0bb52c09d4722010ee737e3ce2b049e20429 SHA512 9f3b5d2cbc426136627193940864d592c8831939be130861f057f26283c27ed4720834f7e8d6e1ae3c49c758d8019d0b34f4414194be60a3eb10bd257dc9a30b WHIRLPOOL 7704540372f181ddfa3b907a67f50da44eae98c06debdeaadc5d5c2bbdb8206c49d0c36905cc4b62c18c7e0187b5a9a6b9859ff652c14c1d06cc1cd574fe5f84
diff --git a/dev-ruby/mercenary/mercenary-0.3.2.ebuild b/dev-ruby/mercenary/mercenary-0.3.2.ebuild
new file mode 100644
index 000000000000..c5e457d05586
--- /dev/null
+++ b/dev-ruby/mercenary/mercenary-0.3.2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mercenary/mercenary-0.3.2.ebuild,v 1.1 2014/03/25 14:46:03 mrueg Exp $
+
+EAPI=5
+
+USE_RUBY="ruby19 ruby20 jruby"
+
+RUBY_FAKEGEM_EXTRADOC="History.markdown README.md"
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_RECIPE_TEST="rspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Lightweight and flexible library for writing command-line apps"
+HOMEPAGE="https://github.com/jekyll/mercenary"
+
+IUSE=""
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
diff --git a/dev-ruby/oauth/oauth-0.4.7.ebuild b/dev-ruby/oauth/oauth-0.4.7.ebuild
index 6a476b8c3267..2a6bd40f2bbd 100644
--- a/dev-ruby/oauth/oauth-0.4.7.ebuild
+++ b/dev-ruby/oauth/oauth-0.4.7.ebuild
@@ -1,9 +1,9 @@
-# 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-ruby/oauth/oauth-0.4.7.ebuild,v 1.2 2013/11/30 15:58:53 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/oauth/oauth-0.4.7.ebuild,v 1.3 2014/03/25 10:54:43 graaff Exp $
 
 EAPI=4
-USE_RUBY="ruby18 ree18 ruby19 jruby"
+USE_RUBY="ruby18 ruby19 jruby"
 
 RUBY_FAKEGEM_TASK_DOC=""
 
@@ -41,10 +41,6 @@ each_ruby_prepare() {
 			# Ignore hash ordering test failures
 			sed -i -e '183s:^:#:' -e '224s:^:#:' test/integration/consumer_test.rb || die
 			;;
-		*rubyee18)
-			# Ignore hash ordering test failures
-			sed -i -e '183s:^:#:' -e '224s:^:#:' test/integration/consumer_test.rb || die
-			;;
 		*ruby19)
 			# Remove tests depending on rails.
 			;;
diff --git a/dev-ruby/redcarpet/Manifest b/dev-ruby/redcarpet/Manifest
index 469f16a24796..0c347e5bcd4c 100644
--- a/dev-ruby/redcarpet/Manifest
+++ b/dev-ruby/redcarpet/Manifest
@@ -1 +1,2 @@
 DIST redcarpet-2.3.0.tar.gz 93355 SHA256 e9f614c28c64bc87f452b0f0d892f43f4f92cceac223bae6b1d378acd3608905 SHA512 41ee359a06238d62cf0bb023f74c68b4c9811edb11e61b2c469742f1462f782a8d265d4191391e43e036924265e29aba3a277d0d1237bcf2733f77fd269c73e6 WHIRLPOOL 18d2ec1696c030dd4fcf413cbdca977e2412d6d7eeb53a266c0c09f9689f707be4e181af6b16101155af9cee613c884e82636cbd894c4a7cc8da73292ea19b70
+DIST redcarpet-3.1.1.tar.gz 98182 SHA256 78480c9685dc135a3dfe4abb4b150b2ced59b8388f929223dfa21f61222dfd7a SHA512 96bb2e6d5c50badc39cabe09d5b7c97e51f6df863ed042a7f330c168e712a9ef529635b446c75140faf05ee0b00eeb1d20b6c234555e99d6878e755fa7f892bf WHIRLPOOL f0143f76da18e5a3729ceefd5a1a9073a2d2675c8626bbbb500c9b83925250b23852bbc2315f9fd99636b477c4c5225a80d33a3c7f69154c15187e18f663d51c
diff --git a/dev-ruby/redcarpet/redcarpet-3.1.1.ebuild b/dev-ruby/redcarpet/redcarpet-3.1.1.ebuild
new file mode 100644
index 000000000000..2c204f0f0f54
--- /dev/null
+++ b/dev-ruby/redcarpet/redcarpet-3.1.1.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/dev-ruby/redcarpet/redcarpet-3.1.1.ebuild,v 1.1 2014/03/25 16:25:56 mrueg Exp $
+
+EAPI=5
+USE_RUBY="ruby19 ruby20"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOCS="README.markdown CONTRIBUTING.md CHANGELOG.md doc"
+RUBY_FAKEGEM_TASK_TEST="test:unit"
+inherit multilib ruby-fakegem
+
+SRC_URI="https://github.com/vmg/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+DESCRIPTION="A Ruby wrapper for Upskirt."
+HOMEPAGE="https://github.com/vmg/redcarpet"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/nokogiri )"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/d' -e 's/=> :compile//'  Rakefile || die
+	rm test/benchmark.rb 
+}
+
+each_ruby_configure() {
+	${RUBY} -Cext/redcarpet extconf.rb || die
+}
+
+each_ruby_compile() {
+	emake V=1 -Cext/${PN}
+	cp ext/${PN}/*$(get_modname) lib || die
+}
diff --git a/dev-ruby/sexp_processor/Manifest b/dev-ruby/sexp_processor/Manifest
index ed037a97e40f..d899083b6d60 100644
--- a/dev-ruby/sexp_processor/Manifest
+++ b/dev-ruby/sexp_processor/Manifest
@@ -1,3 +1,4 @@
 DIST sexp_processor-3.2.0.gem 35328 SHA256 5951f8d33ede2f68686c701142c6cc1004d6f525b0aa8e8279a1bf075542b0f0 SHA512 1a0330dcccf36ededcba07f0dccecb9964277c82541b66c416f3fc6513da3a785597f22115f7434a0a95401a334740620a734e1a6f71b73b4f0152c88b641c2c WHIRLPOOL 47f7256ffa199d862068886493ec95487ebe6003f60f6c66d16f99e7a9659bed7538d5bc2b2c5966dbfd33defd55eba6ccbf723a0cad4bfdf0519599aa1124c8
 DIST sexp_processor-4.2.1.gem 35328 SHA256 dfc3eef6ef13c5750c3faab782c4db6c74a7bcc5d03e56e4edeec21aab034185 SHA512 9dd079dbd374d33e1bfa0e4002946993e355425281873e612667feeb2f521f8eceab22d6f68b5b2a8063dd94f0661ab2a583f212f22c1322d4dfa1bff063d4a7 WHIRLPOOL 586fe27770a3fd6747c66aad14cfd1311faae83b55ed5f057f285721c7a4a756174fcb3b0db91d17aee351a0c082bb82371d72b3c2d0ca1c0d7926fba6b9ba8c
 DIST sexp_processor-4.4.1.gem 38400 SHA256 8a10333552216bf3d3846476cfe78dbc9b5724864e3f5016837724622d828f16 SHA512 e7d657f2a3588440f74ed17b1dbb8532af1f4f8831fdbdcd56fbe864d1bf4dd43bf5cfd134f61190ab7c4c03a5ac888df7f9601adacd00295a322433abae3b06 WHIRLPOOL c39472e0e412d8ae88318d97f5229417ed05e823dc96b803a2c33f505a0d28bbe366ae2868fd4e1c34e805db02bc36901f1f40196a0a5cc48d4a9ea0f79da932
+DIST sexp_processor-4.4.3.gem 38400 SHA256 b3eb96da1fe998f1c00665a9c645878518134cca7c35d39c4bb716e866f4cc57 SHA512 b8456165978ce7bc0ed13842971fac0babbe1a302d17fc1681085e78475438b459c0b7a24352f317b4e6f1d35b7d6286ffd12cd3a95b5110e9a8a2c4c086138c WHIRLPOOL 9e25508e1a1963dbe2b34a82d8e8e24064b4b1f4e54dacedc3f2cf4ac4dff4727e2461a1d69e2c6769bf40c9f3aeb37f3206c686d9e21a77a78b56de5701d8c8
diff --git a/dev-ruby/sexp_processor/sexp_processor-4.4.3.ebuild b/dev-ruby/sexp_processor/sexp_processor-4.4.3.ebuild
new file mode 100644
index 000000000000..9c85e4f25db7
--- /dev/null
+++ b/dev-ruby/sexp_processor/sexp_processor-4.4.3.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/sexp_processor/sexp_processor-4.4.3.ebuild,v 1.1 2014/03/25 14:48:15 mrueg Exp $
+
+EAPI=5
+
+USE_RUBY="ruby19 ruby20 jruby"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="README.txt History.txt"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Processor for s-expressions created as part of the ParseTree project."
+HOMEPAGE="http://www.zenspider.com/ZSS/Products/ParseTree/"
+
+LICENSE="GPL-2"
+SLOT="4"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/hoe
+		dev-ruby/hoe-seattlerb
+		dev-ruby/minitest
+	)"
diff --git a/dev-ruby/snmplib/Manifest b/dev-ruby/snmplib/Manifest
index ab7232b64bf5..be3d59ae4a7e 100644
--- a/dev-ruby/snmplib/Manifest
+++ b/dev-ruby/snmplib/Manifest
@@ -1,2 +1 @@
-DIST snmp-1.1.0.gem 203776 SHA256 f121fd6cb3382f49967d1406ddb2d54ce5215118564be5146f110d9b4ef53f85 SHA512 d2166b16e0097149501bfb409839304b319206bc21cbf63900a88ad25e7d9ac2c1de375f159707092928bfaa7fa16fbd4044c81da120588f99101c82bebf6781 WHIRLPOOL ad67713b8f07e51d79a6c27f104c06c60c74f1a4fc0bf8c87aaa389877fedc7918c02a510c714b73d1d1b1ea39556e38be0f8b2583b84b8531fdbf7a517ee50f
 DIST snmp-1.1.1.gem 203776 SHA256 6af90f3d9156d15d78e07a819c5829d70f8d5b26349f679e13735060885ba796 SHA512 4dca33a9e3d1030beae0d6f8c864969b1b725823efc9950c89f0f7d1b4042f032b78ab2d301d87220813fd00cf179997f9c8369e5e9ac83912847103b6ee1e6c WHIRLPOOL c2dc411da0ada24471c73c364c9557c743435fcbb974a083015cb0adf0820176b5d60dd0fab049814dc844cba152ee776224d01c467f6ab6ba21a8ce0f076e1e
diff --git a/dev-ruby/snmplib/snmplib-1.1.0.ebuild b/dev-ruby/snmplib/snmplib-1.1.0.ebuild
deleted file mode 100644
index dc964ee2b28d..000000000000
--- a/dev-ruby/snmplib/snmplib-1.1.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/snmplib/snmplib-1.1.0.ebuild,v 1.5 2012/09/28 22:09:18 blueness Exp $
-
-EAPI=4
-USE_RUBY="ruby18 ruby19 ree18"
-
-RUBY_FAKEGEM_NAME="snmp"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.rdoc"
-RUBY_FAKEGEM_EXTRAINSTALL="data"
-
-inherit ruby-fakegem
-
-IUSE=""
-
-DESCRIPTION="SNMP library implemented in pure Ruby"
-HOMEPAGE="http://snmplib.rubyforge.org/"
-
-KEYWORDS="amd64 ppc x86"
-LICENSE="Ruby"
-SLOT="0"
-
-each_ruby_test() {
-	${RUBY} -Ilib -S testrb test/test_*.rb || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	insinto /usr/share/doc/${PF}
-	doins -r examples
-}
diff --git a/dev-ruby/syntax/syntax-1.0.0-r4.ebuild b/dev-ruby/syntax/syntax-1.0.0-r4.ebuild
index 255f3ab3cc17..070b78a90ef9 100644
--- a/dev-ruby/syntax/syntax-1.0.0-r4.ebuild
+++ b/dev-ruby/syntax/syntax-1.0.0-r4.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-ruby/syntax/syntax-1.0.0-r4.ebuild,v 1.4 2014/03/16 17:13:21 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/syntax/syntax-1.0.0-r4.ebuild,v 1.5 2014/03/25 10:00:27 nimiux Exp $
 
 EAPI=5
 
@@ -16,7 +16,7 @@ HOMEPAGE="http://syntax.rubyforge.org"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-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 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 all_ruby_prepare() {
diff --git a/dev-tex/feynmf/feynmf-1.08-r3.ebuild b/dev-tex/feynmf/feynmf-1.08-r3.ebuild
index 6054f436670a..0f43f1c34e7f 100644
--- a/dev-tex/feynmf/feynmf-1.08-r3.ebuild
+++ b/dev-tex/feynmf/feynmf-1.08-r3.ebuild
@@ -1,16 +1,18 @@
-# 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-tex/feynmf/feynmf-1.08-r3.ebuild,v 1.17 2012/05/09 17:07:05 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tex/feynmf/feynmf-1.08-r3.ebuild,v 1.18 2014/03/25 13:00:47 ulm Exp $
+
+EAPI=5
 
 inherit eutils latex-package
 
 DESCRIPTION="Combined LaTeX/Metafont package for drawing of Feynman diagrams"
 HOMEPAGE="http://www.ctan.org/tex-archive/macros/latex/contrib/feynmf/"
 #Taken from: ftp.tug.ctan.org/tex-archive/macros/latex/contrib/${PN}.tar.gz
-SRC_URI="mirror://gentoo/${P}.tar.gz
-	doc? ( mirror://gentoo/${PN}-cnl.tar.gz )"
+SRC_URI="http://dev.gentoo.org/~ulm/distfiles/${P}.tar.gz
+	doc? ( http://dev.gentoo.org/~ulm/distfiles/${PN}-cnl.tar.gz )"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc"
@@ -22,18 +24,15 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/${PN}"
 TEXMF="/usr/share/texmf-site"
 
-src_unpack() {
-	unpack ${A}
+src_prepare() {
 	epatch "${FILESDIR}/${P}.patch"
 	epatch "${FILESDIR}/${P}-tempfile.patch"
 }
 
 src_compile() {
 	export VARTEXFONTS="${T}"/fonts
-	emake MP=mpost all manual.ps || die "emake failed"
-	if use doc; then
-		emake -f Makefile.cnl ps || die "emake fmfcnl failed"
-	fi
+	emake MP=mpost all manual.ps
+	use doc && emake -f Makefile.cnl ps
 }
 
 src_install() {
diff --git a/dev-util/cmake/cmake-2.8.12.2.ebuild b/dev-util/cmake/cmake-2.8.12.2.ebuild
index bb0a286eaef5..4c166ddcf95a 100644
--- a/dev-util/cmake/cmake-2.8.12.2.ebuild
+++ b/dev-util/cmake/cmake-2.8.12.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/dev-util/cmake/cmake-2.8.12.2.ebuild,v 1.3 2014/03/22 14:48:10 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.8.12.2.ebuild,v 1.4 2014/03/25 09:05:03 nimiux Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ HOMEPAGE="http://www.cmake.org/"
 SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.tar.gz"
 
 LICENSE="CMake"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~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 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE="emacs ncurses qt4 qt5"
 
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.38.2.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.38.2.ebuild
index 1aa58aa0a5d3..cadbfe754700 100644
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.38.2.ebuild
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.38.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/dev-util/gdbus-codegen/gdbus-codegen-2.38.2.ebuild,v 1.5 2014/03/13 19:46:44 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/gdbus-codegen/gdbus-codegen-2.38.2.ebuild,v 1.6 2014/03/26 05:47:08 vapier Exp $
 
 EAPI="5"
 GNOME_ORG_MODULE="glib"
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.gtk.org/"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-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 ~x64-macos"
 IUSE=""
 
 RDEPEND="${PYTHON_DEPS}"
diff --git a/dev-vcs/stgit/Manifest b/dev-vcs/stgit/Manifest
index bbda008ea801..efd4006933b7 100644
--- a/dev-vcs/stgit/Manifest
+++ b/dev-vcs/stgit/Manifest
@@ -1,2 +1,3 @@
 DIST stgit-0.16-missing-patches.tar.gz 1667 SHA256 f105bb417592be3c68d830ad1cf2e212e6e5cb809bf64cdffb516a0f7badd4f4 SHA512 29d4c3e68121654153b4e5142dd70d818737b09bbc8371d644a36dd9d18afaf78fdda91bc16f953c330bcbae19084384d8bcd216cdfe674df784e33165186db1 WHIRLPOOL c7628853e6c1eff498a95ff22ec3eb3bb69b60dfb0c6dcd5895a650b8d3aba966166dfd426a0c728e3d292f0a2ed197325b0af5ccd63fc99011b5b2e841e7194
 DIST stgit-0.16.tar.gz 362687 SHA256 02f1a19350ccf4a26abac1421df8c2d021e78f995c913f9562718a1700318a42 SHA512 782de3d5855aad4f5d040478745990517ebe2b26dc315a3ed41db95399bb46e075d63a70baa0e3aa2ab1012b59e6ad1f5940a904f296ef09d6bca60f66e417dd WHIRLPOOL e2334c041cb260455d549d33b6628fd4f6e1e7da850f2987ba86922504e07aed8177d092550348b52cad8894b0335d20ee1608b855fa1cb6545bdd301a9d38f1
+DIST stgit-0.17.1.tar.gz 398466 SHA256 d43365a0c22e41a6fb9ba1a86de164d6475e79054e7f33805d6a829eb4056ade SHA512 3efdfb9bc024c3a7c0d74d49e85f157d5d5209c9a2ad0ce63a07138c02fb1580e92ac4a91796e79bbd221e6884317e975f9f44e35db0b484fd916bc67cd61abe WHIRLPOOL a7c4c83cfeace12ced60e846ed9daaffadea3ed201a90e72239e3f8df310164e00ce5a89174df177f89df4a609a66ac35e905f31419ed654081c3ab0c2cba859
diff --git a/dev-vcs/stgit/metadata.xml b/dev-vcs/stgit/metadata.xml
index cd9d0b6f05dd..6ad69ab1f95c 100644
--- a/dev-vcs/stgit/metadata.xml
+++ b/dev-vcs/stgit/metadata.xml
@@ -7,6 +7,10 @@
   <name>René 'Necoro' Neumann</name>
   <description>Proxy maintainer, assign bugs</description>
 </maintainer>
+<maintainer>
+  <email>dlan@gentoo.org</email>
+  <description>Co maintainer, CC bugs</description>
+</maintainer>
 <maintainer>
   <email>flameeyes@gentoo.org</email>
   <description>Proxy/Backup, CC bugs</description>
diff --git a/dev-vcs/stgit/stgit-0.16-r2.ebuild b/dev-vcs/stgit/stgit-0.16-r2.ebuild
index bb88fcea3d39..99d9918eeba9 100644
--- a/dev-vcs/stgit/stgit-0.16-r2.ebuild
+++ b/dev-vcs/stgit/stgit-0.16-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/dev-vcs/stgit/stgit-0.16-r2.ebuild,v 1.1 2013/09/23 11:38:21 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/stgit/stgit-0.16-r2.ebuild,v 1.2 2014/03/25 15:12:43 dlan Exp $
 
 EAPI="5"
 
@@ -15,7 +15,7 @@ SRC_URI="http://download.gna.org/${PN}/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 RDEPEND=">=dev-vcs/git-1.6.3.3"
diff --git a/dev-vcs/stgit/stgit-0.17.1.ebuild b/dev-vcs/stgit/stgit-0.17.1.ebuild
new file mode 100644
index 000000000000..e0a8d806f6ea
--- /dev/null
+++ b/dev-vcs/stgit/stgit-0.17.1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/stgit/stgit-0.17.1.ebuild,v 1.1 2014/03/25 17:35:55 dlan Exp $
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="Manage a stack of patches using GIT as a backend"
+HOMEPAGE="http://www.procode.org/stgit/"
+SRC_URI="http://download.gna.org/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc"
+
+RDEPEND=">=dev-vcs/git-1.6.3.3"
+
+# NOTE: It seems to be quite important which asciidoc version to use.
+# So keep an eye on it for the future.
+DEPEND="${RDEPEND}
+	doc? (
+		app-text/asciidoc
+		app-text/xmlto
+		dev-lang/perl
+	)"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.16-man-linkfix.patch"
+)
+
+pkg_setup() {
+	if ! use doc; then
+		echo
+		ewarn "Manpages will not be built and installed."
+		ewarn "Enable the 'doc' useflag, if you want them."
+		echo
+	fi
+}
+
+python_prepare_all() {
+	# this will be a noop, as we are working with a tarball,
+	# but throws git errors --> just get rid of it
+	sed -i -e 's/version\.write_builtin_version()//' setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		emake DESTDIR="${D}" \
+			htmldir="${EPREFIX}/usr/share/doc/${PF}/html/" \
+			mandir="${EPREFIX}/usr/share/man/" \
+			doc
+	fi
+}
+
+python_install_all() {
+	if use doc; then
+		emake DESTDIR="${D}" \
+			htmldir="${EPREFIX}/usr/share/doc/${PF}/html/" \
+			mandir="${EPREFIX}/usr/share/man/" \
+			install-doc install-html
+	fi
+
+	distutils-r1_python_install_all
+
+	newbashcomp stgit-completion.bash ${PN}
+}
diff --git a/media-gfx/sane-backends/sane-backends-1.0.24-r3.ebuild b/media-gfx/sane-backends/sane-backends-1.0.24-r3.ebuild
index cf619c0528e9..e8b0584734ba 100644
--- a/media-gfx/sane-backends/sane-backends-1.0.24-r3.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.0.24-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.24-r3.ebuild,v 1.1 2014/03/03 16:50:33 teiresias Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.24-r3.ebuild,v 1.2 2014/03/25 22:15:48 vapier Exp $
 
 EAPI="5"
 
@@ -97,13 +97,18 @@ IUSE_SANE_BACKENDS="
 IUSE="avahi doc gphoto2 ipv6 threads usb v4l xinetd snmp systemd"
 
 for backend in ${IUSE_SANE_BACKENDS}; do
-	if [ ${backend} = pnm ]; then
-		IUSE="${IUSE} -sane_backends_pnm"
-	elif [ ${backend} = mustek_usb2 -o ${backend} = kvs40xx ]; then
-		IUSE="${IUSE} sane_backends_${backend}"
-	else
-		IUSE="${IUSE} +sane_backends_${backend}"
-	fi
+	case ${backend} in
+	# Disable backends that require parallel ports as no one has those anymore.
+	canon_pp|hpsj5s|mustek_pp|\
+	pnm)
+		IUSE+=" -sane_backends_${backend}"
+		;;
+	mustek_usb2|kvs40xx)
+		IUSE+=" sane_backends_${backend}"
+		;;
+	*)
+		IUSE+=" +sane_backends_${backend}"
+	esac
 done
 
 REQUIRED_USE="
diff --git a/media-libs/x265/x265-9999.ebuild b/media-libs/x265/x265-9999.ebuild
index fce836a7006c..59f0a3f91f69 100644
--- a/media-libs/x265/x265-9999.ebuild
+++ b/media-libs/x265/x265-9999.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/x265/x265-9999.ebuild,v 1.1 2014/03/12 20:45:18 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/x265/x265-9999.ebuild,v 1.2 2014/03/25 13:57:46 ssuominen Exp $
 
 EAPI=5
 
-inherit cmake-multilib
+inherit cmake-multilib multilib
 
 if [[ ${PV} = 9999* ]]; then
 	inherit mercurial
@@ -28,11 +28,6 @@ DEPEND="${RDEPEND}
 	abi_x86_32? ( ${ASM_DEPEND} )
 	abi_x86_64? ( ${ASM_DEPEND} )"
 
-PATCHES=(
-	"${FILESDIR}/${PN}-libdir.patch"
-	"${FILESDIR}/${PN}-libdir_pkgconfig.patch"
-)
-
 src_unpack() {
 	if [[ ${PV} = 9999* ]]; then
 		mercurial_src_unpack
@@ -49,6 +44,7 @@ multilib_src_configure() {
 		$(cmake-utils_use_enable test TESTS)
 		$(multilib_build_binaries || echo "-DENABLE_CLI=OFF")
 		-DHIGH_BIT_DEPTH=$(usex 10bit "ON" "OFF")
+		-DLIB_INSTALL_DIR="$(get_libdir)"
 	)
 	cmake-utils_src_configure
 }
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index d622524c9f79..217f78efa70a 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Tue, 25 Mar 2014 09:07:00 +0000
+Wed, 26 Mar 2014 06:37:01 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 5ed5f8a94056..217f78efa70a 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Tue, 25 Mar 2014 09:07:01 +0000
+Wed, 26 Mar 2014 06:37:01 +0000
diff --git a/metadata/md5-cache/app-admin/eselect-1.3.1 b/metadata/md5-cache/app-admin/eselect-1.3.1
deleted file mode 100644
index 329f654edaac..000000000000
--- a/metadata/md5-cache/app-admin/eselect-1.3.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst
-DEPEND=sys-apps/sed || ( sys-apps/coreutils sys-freebsd/freebsd-bin app-misc/realpath ) app-arch/xz-utils doc? ( dev-python/docutils )
-DESCRIPTION=Gentoo's multi-purpose configuration and management tool
-EAPI=3
-HOMEPAGE=http://www.gentoo.org/proj/en/eselect/
-IUSE=doc
-KEYWORDS=alpha amd64 arm 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 ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2+
-RDEPEND=!app-admin/eselect-news sys-apps/sed || ( sys-apps/coreutils sys-freebsd/freebsd-bin app-misc/realpath ) sys-apps/file sys-libs/ncurses
-SLOT=0
-SRC_URI=http://dev.gentoo.org/~ulm/eselect/eselect-1.3.1.tar.xz
-_eclasses_=bash-completion-r1	db412e427e3317ffd3e15f17df269c5e	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=41ab69fecdb4784bdafb756841c68118
diff --git a/metadata/md5-cache/app-arch/sharutils-4.14 b/metadata/md5-cache/app-arch/sharutils-4.14-r1
similarity index 94%
rename from metadata/md5-cache/app-arch/sharutils-4.14
rename to metadata/md5-cache/app-arch/sharutils-4.14-r1
index 37e5be33a67a..a63e32b94032 100644
--- a/metadata/md5-cache/app-arch/sharutils-4.14
+++ b/metadata/md5-cache/app-arch/sharutils-4.14-r1
@@ -9,4 +9,4 @@ LICENSE=GPL-3
 SLOT=0
 SRC_URI=mirror://gnu/sharutils/sharutils-4.14.tar.xz
 _eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=89dc6c59cdf80031e038ac01e654ac33
+_md5_=2ba4b4b58c79aeff3564dfb1a971d306
diff --git a/metadata/md5-cache/app-backup/obnam-1.7 b/metadata/md5-cache/app-backup/obnam-1.7.2
similarity index 59%
rename from metadata/md5-cache/app-backup/obnam-1.7
rename to metadata/md5-cache/app-backup/obnam-1.7.2
index 56eb5b890bf4..4d21b9923a63 100644
--- a/metadata/md5-cache/app-backup/obnam-1.7
+++ b/metadata/md5-cache/app-backup/obnam-1.7.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6[threads] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/cliapp dev-python/larch dev-python/paramiko dev-python/pyyaml dev-python/tracing dev-python/ttystatus userland_GNU? ( >=sys-apps/coreutils-8.5 ) python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6[threads] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
+DEPEND=python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6[threads] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/cliapp dev-python/larch dev-python/paramiko dev-python/tracing dev-python/ttystatus userland_GNU? ( >=sys-apps/coreutils-8.5 ) python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6[threads] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
 DESCRIPTION=A backup program that supports encryption and deduplication
 EAPI=5
 HOMEPAGE=http://liw.fi/obnam/
 IUSE=python_targets_python2_6 python_targets_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6[threads] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/cliapp dev-python/larch dev-python/paramiko dev-python/pyyaml dev-python/tracing dev-python/ttystatus python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6[threads] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
+RDEPEND=python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6[threads] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/cliapp dev-python/larch dev-python/paramiko dev-python/tracing dev-python/ttystatus python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6[threads] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
-SRC_URI=http://code.liw.fi/debian/pool/main/o/obnam/obnam_1.7.orig.tar.gz
+SRC_URI=http://code.liw.fi/debian/pool/main/o/obnam/obnam_1.7.2.orig.tar.gz
 _eclasses_=distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	af81d52c25ec93fbdff71e0efb0de7b7	multibuild	56d4120419072116417e8de1bd1040ff	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	3bb814ab7959a36067101a6bef683b6f	python-utils-r1	18d8279a3382bf4453e7ff35208ce907	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=8fc92a8978b4fe95860d8023cdfd2ea5
+_md5_=7178dfc6ce04f29dcfd7ddfa7168d2d1
diff --git a/metadata/md5-cache/app-crypt/cardpeek-0.8.2 b/metadata/md5-cache/app-crypt/cardpeek-0.8.2
new file mode 100644
index 000000000000..ed4ca15ffc40
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/cardpeek-0.8.2
@@ -0,0 +1,11 @@
+DEFINED_PHASES=-
+DEPEND=sys-apps/pcsc-lite =dev-lang/lua-5.2* x11-libs/gtk+:3 net-misc/curl dev-libs/openssl virtual/pkgconfig
+DESCRIPTION=Tool to read the contents of smartcards
+EAPI=5
+HOMEPAGE=http://pannetrat.com/Cardpeek
+LICENSE=GPL-3
+RDEPEND=sys-apps/pcsc-lite =dev-lang/lua-5.2* x11-libs/gtk+:3 net-misc/curl dev-libs/openssl
+SLOT=0
+SRC_URI=http://downloads.pannetrat.com/install/cardpeek-0.8.2.tar.gz
+_eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=ccf63547dc739124cc70f94da4e59cad
diff --git a/metadata/md5-cache/app-emacs/auctex-11.86-r1 b/metadata/md5-cache/app-emacs/auctex-11.86-r1
deleted file mode 100644
index 7c4e72501135..000000000000
--- a/metadata/md5-cache/app-emacs/auctex-11.86-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=virtual/latex-base preview-latex? ( app-text/dvipng app-text/ghostscript-gpl ) >=virtual/emacs-21 virtual/latex-base >=sys-apps/texinfo-4.2-r5
-DESCRIPTION=Extended support for writing, formatting and using (La)TeX, Texinfo and BibTeX files
-EAPI=3
-HOMEPAGE=http://www.gnu.org/software/auctex/
-IUSE=preview-latex
-KEYWORDS=amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
-LICENSE=GPL-3+ FDL-1.3+
-RDEPEND=virtual/latex-base preview-latex? ( app-text/dvipng app-text/ghostscript-gpl ) >=virtual/emacs-21 virtual/latex-base
-SLOT=0
-SRC_URI=mirror://gnu/auctex/auctex-11.86.tar.gz
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	elisp	ae11b438eee6c692e6c94c9a86999514	elisp-common	cec01e54df1bfd2fcca76a13ce2b2d27	eutils	af81d52c25ec93fbdff71e0efb0de7b7	latex-package	999c52f495ebb8dd3b69bda982bb2817	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=91cb1fb09fb7df19811f3b6ef351ebfa
diff --git a/metadata/md5-cache/app-emacs/blogmax-20041208 b/metadata/md5-cache/app-emacs/blogmax-20041208
deleted file mode 100644
index fbdba973dbf6..000000000000
--- a/metadata/md5-cache/app-emacs/blogmax-20041208
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm setup unpack
-DEPEND=>=virtual/emacs-21
-DESCRIPTION=Blogging in Emacs
-HOMEPAGE=http://billstclair.com/blogmax/index.html
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=>=virtual/emacs-21
-SLOT=0
-SRC_URI=mirror://gentoo/blogmax-20041208.tar.bz2
-_eclasses_=elisp	ae11b438eee6c692e6c94c9a86999514	elisp-common	cec01e54df1bfd2fcca76a13ce2b2d27	eutils	af81d52c25ec93fbdff71e0efb0de7b7	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=efabd2e24e1fd727b2f8e61e29e85530
diff --git a/metadata/md5-cache/app-emacs/blogmax-20110305 b/metadata/md5-cache/app-emacs/blogmax-20110305
index e3566c545af1..cfd6e46eb7ee 100644
--- a/metadata/md5-cache/app-emacs/blogmax-20110305
+++ b/metadata/md5-cache/app-emacs/blogmax-20110305
@@ -9,4 +9,4 @@ RDEPEND=>=virtual/emacs-21
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~ulm/distfiles/blogmax-20110305.zip
 _eclasses_=elisp	ae11b438eee6c692e6c94c9a86999514	elisp-common	cec01e54df1bfd2fcca76a13ce2b2d27	eutils	af81d52c25ec93fbdff71e0efb0de7b7	multilib	fac675dcccf94392371a6abee62d909f	readme.gentoo	be2652cdd5c20f4689ccb4769072ea99	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=c1e321bcd162d2dbbf249ed920fe3c43
+_md5_=ef86b94614fc781cb91d64a09a5535bd
diff --git a/metadata/md5-cache/app-emacs/color-moccur-2.66 b/metadata/md5-cache/app-emacs/color-moccur-2.66
deleted file mode 100644
index 383e046f731f..000000000000
--- a/metadata/md5-cache/app-emacs/color-moccur-2.66
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm setup unpack
-DEPEND=>=virtual/emacs-21
-DESCRIPTION=Major mode for color moccur
-HOMEPAGE=http://www.bookshelf.jp/ http://www.emacswiki.org/cgi-bin/wiki/SearchBuffers
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=>=virtual/emacs-21
-SLOT=0
-SRC_URI=mirror://gentoo/color-moccur-2.66.el.bz2
-_eclasses_=elisp	ae11b438eee6c692e6c94c9a86999514	elisp-common	cec01e54df1bfd2fcca76a13ce2b2d27	eutils	af81d52c25ec93fbdff71e0efb0de7b7	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=b9afc1919cdbfc5279ac3712e5edf3b5
diff --git a/metadata/md5-cache/app-emacs/gnuserv-programs-3.12.8-r1 b/metadata/md5-cache/app-emacs/gnuserv-programs-3.12.8-r1
deleted file mode 100644
index 23c4a9f2b1e7..000000000000
--- a/metadata/md5-cache/app-emacs/gnuserv-programs-3.12.8-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install
-DEPEND=!app-editors/xemacs !<=app-emacs/gnuserv-3.12.7 X? ( x11-libs/libXau )
-DESCRIPTION=Binary programs for app-emacs/gnuserv
-EAPI=3
-HOMEPAGE=http://meltin.net/hacks/emacs/
-IUSE=X
-KEYWORDS=amd64 ~ppc x86 ~x86-linux ~ppc-macos
-LICENSE=GPL-2
-PDEPEND=~app-emacs/gnuserv-3.12.8
-RDEPEND=!app-editors/xemacs !<=app-emacs/gnuserv-3.12.7 X? ( x11-libs/libXau )
-SLOT=0
-SRC_URI=http://meltin.net/hacks/emacs/src/gnuserv-3.12.8.tar.gz
-_eclasses_=multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=f6ac4d73c838054828b7a10f1c333781
diff --git a/metadata/md5-cache/app-emacs/mode-compile-2.29 b/metadata/md5-cache/app-emacs/mode-compile-2.29
deleted file mode 100644
index e95f8ac68fd7..000000000000
--- a/metadata/md5-cache/app-emacs/mode-compile-2.29
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm setup unpack
-DEPEND=>=virtual/emacs-21
-DESCRIPTION=Smart command for compiling files according to major-mode
-HOMEPAGE=http://perso.tls.cena.fr/boubaker/Emacs/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=virtual/emacs-21
-SLOT=0
-SRC_URI=mirror://gentoo/mode-compile-2.29.el.bz2
-_eclasses_=elisp	ae11b438eee6c692e6c94c9a86999514	elisp-common	cec01e54df1bfd2fcca76a13ce2b2d27	eutils	af81d52c25ec93fbdff71e0efb0de7b7	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=8febecc90480d1fddede8b0dbc7ef861
diff --git a/metadata/md5-cache/app-emacs/paredit-22 b/metadata/md5-cache/app-emacs/paredit-22
deleted file mode 100644
index 603a39bb81c4..000000000000
--- a/metadata/md5-cache/app-emacs/paredit-22
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm setup unpack
-DEPEND=>=virtual/emacs-21
-DESCRIPTION=Minor mode for performing structured editing of S-expressions
-HOMEPAGE=http://mumble.net/~campbell/emacs/ http://www.emacswiki.org/cgi-bin/wiki/ParEdit
-KEYWORDS=~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos
-LICENSE=GPL-3
-RDEPEND=>=virtual/emacs-21
-SLOT=0
-SRC_URI=mirror://gentoo/paredit-22.tar.bz2
-_eclasses_=elisp	ae11b438eee6c692e6c94c9a86999514	elisp-common	cec01e54df1bfd2fcca76a13ce2b2d27	eutils	af81d52c25ec93fbdff71e0efb0de7b7	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=791b910227204a2f3b544a699d115874
diff --git a/metadata/md5-cache/app-emacs/quack-0.37 b/metadata/md5-cache/app-emacs/quack-0.37
deleted file mode 100644
index e18f482bb194..000000000000
--- a/metadata/md5-cache/app-emacs/quack-0.37
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm setup unpack
-DEPEND=>=virtual/emacs-21
-DESCRIPTION=Enhances Emacs support for Scheme
-HOMEPAGE=http://www.neilvandyke.org/quack/
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=>=virtual/emacs-21
-SLOT=0
-SRC_URI=mirror://gentoo/quack-0.37.el.bz2
-_eclasses_=elisp	ae11b438eee6c692e6c94c9a86999514	elisp-common	cec01e54df1bfd2fcca76a13ce2b2d27	eutils	af81d52c25ec93fbdff71e0efb0de7b7	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=fe7e9fd395a1dee714d6068548f93240
diff --git a/metadata/md5-cache/app-emacs/scala-mode-2.10.3 b/metadata/md5-cache/app-emacs/scala-mode-2.10.3
index 8941882695b0..87ca207a20e1 100644
--- a/metadata/md5-cache/app-emacs/scala-mode-2.10.3
+++ b/metadata/md5-cache/app-emacs/scala-mode-2.10.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=app-arch/unzip >=virtual/emacs-21
+DEPEND=>=virtual/emacs-21
 DESCRIPTION=Scala mode for Emacs
 EAPI=5
 HOMEPAGE=http://www.scala-lang.org/
@@ -9,4 +9,4 @@ RDEPEND=dev-lang/scala >=virtual/emacs-21
 SLOT=0
 SRC_URI=http://www.scala-lang.org/files/archive/scala-tool-support-2.10.3.tgz
 _eclasses_=elisp	ae11b438eee6c692e6c94c9a86999514	elisp-common	cec01e54df1bfd2fcca76a13ce2b2d27	eutils	af81d52c25ec93fbdff71e0efb0de7b7	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=7a221eeadfb1d81615950970f8a35641
+_md5_=c255730558f650fe2118a680de74de00
diff --git a/metadata/md5-cache/app-emacs/scala-mode-2.9.0.1 b/metadata/md5-cache/app-emacs/scala-mode-2.9.0.1
deleted file mode 100644
index 1036437475a1..000000000000
--- a/metadata/md5-cache/app-emacs/scala-mode-2.9.0.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=app-arch/unzip >=virtual/emacs-21
-DESCRIPTION=Scala mode for Emacs
-EAPI=2
-HOMEPAGE=http://www.scala-lang.org/
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-lang/scala >=virtual/emacs-21
-SLOT=0
-SRC_URI=http://www.scala-lang.org/downloads/distrib/files/scala-packages/scala-tool-support-2.9.0.1.sbp -> scala-tool-support-2.9.0.1.zip
-_eclasses_=elisp	ae11b438eee6c692e6c94c9a86999514	elisp-common	cec01e54df1bfd2fcca76a13ce2b2d27	eutils	af81d52c25ec93fbdff71e0efb0de7b7	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=16da50ed2deff1af224adac5212579c4
diff --git a/metadata/md5-cache/app-emacs/ssh-1.9 b/metadata/md5-cache/app-emacs/ssh-1.9
deleted file mode 100644
index 286234be0c18..000000000000
--- a/metadata/md5-cache/app-emacs/ssh-1.9
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm setup unpack
-DEPEND=>=virtual/emacs-21
-DESCRIPTION=Directory tracking and special character handling support for SSH sessions in Emacs shell buffers.
-HOMEPAGE=http://www.splode.com/~friedman/software/emacs-lisp/index.html#ssh
-KEYWORDS=~amd64 ~ppc ~x86 ~sparc
-LICENSE=GPL-2
-RDEPEND=>=virtual/emacs-21
-SLOT=0
-SRC_URI=mirror://gentoo/ssh-1.9.tar.gz
-_eclasses_=elisp	ae11b438eee6c692e6c94c9a86999514	elisp-common	cec01e54df1bfd2fcca76a13ce2b2d27	eutils	af81d52c25ec93fbdff71e0efb0de7b7	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=e12b39f69f80ad052284d2098667771b
diff --git a/metadata/md5-cache/app-emacs/ssh-20120709 b/metadata/md5-cache/app-emacs/ssh-20120709
index 3e2da0748897..eb2fa7b03331 100644
--- a/metadata/md5-cache/app-emacs/ssh-20120709
+++ b/metadata/md5-cache/app-emacs/ssh-20120709
@@ -3,10 +3,10 @@ DEPEND=>=virtual/emacs-21
 DESCRIPTION=Directory tracking and special character handling support for SSH sessions in Emacs shell buffers
 EAPI=5
 HOMEPAGE=http://www.splode.com/~friedman/software/emacs-lisp/index.html#ssh
-KEYWORDS=~amd64 ~ppc ~x86 ~sparc
+KEYWORDS=~amd64 ~ppc ~sparc ~x86
 LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-21
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~ulm/distfiles/ssh-20120709.el.xz
 _eclasses_=elisp	ae11b438eee6c692e6c94c9a86999514	elisp-common	cec01e54df1bfd2fcca76a13ce2b2d27	eutils	af81d52c25ec93fbdff71e0efb0de7b7	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=472a523beb5bf8fe0177ed01fcd1d151
+_md5_=70becab0b4a95bec071b07435a080fbb
diff --git a/metadata/md5-cache/app-emacs/tnt-2.6-r2 b/metadata/md5-cache/app-emacs/tnt-2.6-r2
deleted file mode 100644
index 55058dd1cf1d..000000000000
--- a/metadata/md5-cache/app-emacs/tnt-2.6-r2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm setup unpack
-DEPEND=>=virtual/emacs-21
-DESCRIPTION=Client for the AOL Instant Messenging service using Emacs as its UI
-HOMEPAGE=http://tnt.sourceforge.net/
-KEYWORDS=amd64 x86
-LICENSE=AOL Artistic
-RDEPEND=>=virtual/emacs-21
-SLOT=0
-SRC_URI=mirror://sourceforge/tnt/tnt-2.6.tar.gz
-_eclasses_=elisp	ae11b438eee6c692e6c94c9a86999514	elisp-common	cec01e54df1bfd2fcca76a13ce2b2d27	eutils	af81d52c25ec93fbdff71e0efb0de7b7	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=501546234e153715c93eb3794cf8543c
diff --git a/metadata/md5-cache/app-misc/mc-4.8.10 b/metadata/md5-cache/app-misc/mc-4.8.10
deleted file mode 100644
index 1b6efea6d510..000000000000
--- a/metadata/md5-cache/app-misc/mc-4.8.10
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=>=dev-libs/glib-2.8:2 gpm? ( sys-libs/gpm ) kernel_linux? ( sys-fs/e2fsprogs ) samba? ( net-fs/samba ) sftp? ( net-libs/libssh2 ) slang? ( >=sys-libs/slang-2 ) !slang? ( sys-libs/ncurses ) spell? ( app-text/aspell ) X? ( x11-libs/libX11 x11-libs/libICE x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM ) app-arch/xz-utils virtual/pkgconfig nls? ( sys-devel/gettext ) test? ( dev-libs/check )
-DESCRIPTION=GNU Midnight Commander is a text based file manager
-EAPI=5
-HOMEPAGE=http://www.midnight-commander.org
-IUSE=+edit gpm mclib nls samba sftp +slang spell test X +xdg
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris
-LICENSE=GPL-3
-RDEPEND=>=dev-libs/glib-2.8:2 gpm? ( sys-libs/gpm ) kernel_linux? ( sys-fs/e2fsprogs ) samba? ( net-fs/samba ) sftp? ( net-libs/libssh2 ) slang? ( >=sys-libs/slang-2 ) !slang? ( sys-libs/ncurses ) spell? ( app-text/aspell ) X? ( x11-libs/libX11 x11-libs/libICE x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM )
-REQUIRED_USE=spell? ( edit )
-SLOT=0
-SRC_URI=http://www.midnight-commander.org/downloads/mc-4.8.10.tar.xz
-_eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=e1ca3030cbf19868d01e4affe73498b4
diff --git a/metadata/md5-cache/app-misc/mc-4.8.7 b/metadata/md5-cache/app-misc/mc-4.8.7
deleted file mode 100644
index ac78c89d32b6..000000000000
--- a/metadata/md5-cache/app-misc/mc-4.8.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=>=dev-libs/glib-2.8:2 gpm? ( sys-libs/gpm ) kernel_linux? ( sys-fs/e2fsprogs ) samba? ( net-fs/samba ) sftp? ( net-libs/libssh2 ) slang? ( >=sys-libs/slang-2 ) !slang? ( sys-libs/ncurses ) spell? ( app-text/aspell ) X? ( x11-libs/libX11 x11-libs/libICE x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM ) app-arch/xz-utils virtual/pkgconfig nls? ( sys-devel/gettext ) test? ( dev-libs/check )
-DESCRIPTION=GNU Midnight Commander is a text based file manager
-EAPI=4
-HOMEPAGE=http://www.midnight-commander.org
-IUSE=+edit gpm mclib nls samba sftp +slang spell test X +xdg
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris
-LICENSE=GPL-3
-RDEPEND=>=dev-libs/glib-2.8:2 gpm? ( sys-libs/gpm ) kernel_linux? ( sys-fs/e2fsprogs ) samba? ( net-fs/samba ) sftp? ( net-libs/libssh2 ) slang? ( >=sys-libs/slang-2 ) !slang? ( sys-libs/ncurses ) spell? ( app-text/aspell ) X? ( x11-libs/libX11 x11-libs/libICE x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM )
-REQUIRED_USE=spell? ( edit )
-SLOT=0
-SRC_URI=http://www.midnight-commander.org/downloads/mc-4.8.7.tar.xz
-_eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=b0b769dbc5b80ba048ed89c238779eb4
diff --git a/metadata/md5-cache/app-misc/mc-4.8.7-r1 b/metadata/md5-cache/app-misc/mc-4.8.7-r1
deleted file mode 100644
index a92ce6906a7b..000000000000
--- a/metadata/md5-cache/app-misc/mc-4.8.7-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=>=dev-libs/glib-2.8:2 gpm? ( sys-libs/gpm ) kernel_linux? ( sys-fs/e2fsprogs ) samba? ( net-fs/samba ) sftp? ( net-libs/libssh2 ) slang? ( >=sys-libs/slang-2 ) !slang? ( sys-libs/ncurses ) spell? ( app-text/aspell ) X? ( x11-libs/libX11 x11-libs/libICE x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM ) app-arch/xz-utils virtual/pkgconfig nls? ( sys-devel/gettext ) test? ( dev-libs/check )
-DESCRIPTION=GNU Midnight Commander is a text based file manager
-EAPI=4
-HOMEPAGE=http://www.midnight-commander.org
-IUSE=+edit gpm mclib nls samba sftp +slang spell test X +xdg
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris
-LICENSE=GPL-3
-RDEPEND=>=dev-libs/glib-2.8:2 gpm? ( sys-libs/gpm ) kernel_linux? ( sys-fs/e2fsprogs ) samba? ( net-fs/samba ) sftp? ( net-libs/libssh2 ) slang? ( >=sys-libs/slang-2 ) !slang? ( sys-libs/ncurses ) spell? ( app-text/aspell ) X? ( x11-libs/libX11 x11-libs/libICE x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM )
-REQUIRED_USE=spell? ( edit )
-SLOT=0
-SRC_URI=http://www.midnight-commander.org/downloads/mc-4.8.7.tar.xz
-_eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=c921ca77c52f33b267c58a81f36a82e1
diff --git a/metadata/md5-cache/app-misc/mc-4.8.8-r1 b/metadata/md5-cache/app-misc/mc-4.8.8-r1
deleted file mode 100644
index 81b41ed48c35..000000000000
--- a/metadata/md5-cache/app-misc/mc-4.8.8-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=>=dev-libs/glib-2.8:2 gpm? ( sys-libs/gpm ) kernel_linux? ( sys-fs/e2fsprogs ) samba? ( net-fs/samba ) sftp? ( net-libs/libssh2 ) slang? ( >=sys-libs/slang-2 ) !slang? ( sys-libs/ncurses ) spell? ( app-text/aspell ) X? ( x11-libs/libX11 x11-libs/libICE x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM ) app-arch/xz-utils virtual/pkgconfig nls? ( sys-devel/gettext ) test? ( dev-libs/check )
-DESCRIPTION=GNU Midnight Commander is a text based file manager
-EAPI=4
-HOMEPAGE=http://www.midnight-commander.org
-IUSE=+edit gpm mclib nls samba sftp +slang spell test X +xdg
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris
-LICENSE=GPL-3
-RDEPEND=>=dev-libs/glib-2.8:2 gpm? ( sys-libs/gpm ) kernel_linux? ( sys-fs/e2fsprogs ) samba? ( net-fs/samba ) sftp? ( net-libs/libssh2 ) slang? ( >=sys-libs/slang-2 ) !slang? ( sys-libs/ncurses ) spell? ( app-text/aspell ) X? ( x11-libs/libX11 x11-libs/libICE x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM )
-REQUIRED_USE=spell? ( edit )
-SLOT=0
-SRC_URI=http://www.midnight-commander.org/downloads/mc-4.8.8.tar.xz
-_eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=58090641617da2258bde122ead81ab3b
diff --git a/metadata/md5-cache/app-misc/mc-4.8.8-r2 b/metadata/md5-cache/app-misc/mc-4.8.8-r2
deleted file mode 100644
index 7e64fa0220c2..000000000000
--- a/metadata/md5-cache/app-misc/mc-4.8.8-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=>=dev-libs/glib-2.8:2 gpm? ( sys-libs/gpm ) kernel_linux? ( sys-fs/e2fsprogs ) samba? ( net-fs/samba ) sftp? ( net-libs/libssh2 ) slang? ( >=sys-libs/slang-2 ) !slang? ( sys-libs/ncurses ) spell? ( app-text/aspell ) X? ( x11-libs/libX11 x11-libs/libICE x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM ) app-arch/xz-utils virtual/pkgconfig nls? ( sys-devel/gettext ) test? ( dev-libs/check )
-DESCRIPTION=GNU Midnight Commander is a text based file manager
-EAPI=5
-HOMEPAGE=http://www.midnight-commander.org
-IUSE=+edit gpm mclib nls samba sftp +slang spell test X +xdg
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris
-LICENSE=GPL-3
-RDEPEND=>=dev-libs/glib-2.8:2 gpm? ( sys-libs/gpm ) kernel_linux? ( sys-fs/e2fsprogs ) samba? ( net-fs/samba ) sftp? ( net-libs/libssh2 ) slang? ( >=sys-libs/slang-2 ) !slang? ( sys-libs/ncurses ) spell? ( app-text/aspell ) X? ( x11-libs/libX11 x11-libs/libICE x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM )
-REQUIRED_USE=spell? ( edit )
-SLOT=0
-SRC_URI=http://www.midnight-commander.org/downloads/mc-4.8.8.tar.xz
-_eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=dbbb11928699a4b2cc4a4de9da97a8ce
diff --git a/metadata/md5-cache/app-misc/mc-4.8.9 b/metadata/md5-cache/app-misc/mc-4.8.9
deleted file mode 100644
index 23b2580bc698..000000000000
--- a/metadata/md5-cache/app-misc/mc-4.8.9
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=>=dev-libs/glib-2.8:2 gpm? ( sys-libs/gpm ) kernel_linux? ( sys-fs/e2fsprogs ) samba? ( net-fs/samba ) sftp? ( net-libs/libssh2 ) slang? ( >=sys-libs/slang-2 ) !slang? ( sys-libs/ncurses ) spell? ( app-text/aspell ) X? ( x11-libs/libX11 x11-libs/libICE x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM ) app-arch/xz-utils virtual/pkgconfig nls? ( sys-devel/gettext ) test? ( dev-libs/check )
-DESCRIPTION=GNU Midnight Commander is a text based file manager
-EAPI=5
-HOMEPAGE=http://www.midnight-commander.org
-IUSE=+edit gpm mclib nls samba sftp +slang spell test X +xdg
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris
-LICENSE=GPL-3
-RDEPEND=>=dev-libs/glib-2.8:2 gpm? ( sys-libs/gpm ) kernel_linux? ( sys-fs/e2fsprogs ) samba? ( net-fs/samba ) sftp? ( net-libs/libssh2 ) slang? ( >=sys-libs/slang-2 ) !slang? ( sys-libs/ncurses ) spell? ( app-text/aspell ) X? ( x11-libs/libX11 x11-libs/libICE x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM )
-REQUIRED_USE=spell? ( edit )
-SLOT=0
-SRC_URI=http://www.midnight-commander.org/downloads/mc-4.8.9.tar.xz
-_eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=44dbe7552e63fac88319f19b20c5acb2
diff --git a/metadata/md5-cache/app-office/libreoffice-4.2.1.1 b/metadata/md5-cache/app-office/libreoffice-4.2.1.1
index 79c5d90729d9..59a69d793826 100644
--- a/metadata/md5-cache/app-office/libreoffice-4.2.1.1
+++ b/metadata/md5-cache/app-office/libreoffice-4.2.1.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,xml] ) python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[threads,xml] ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_single_target_python2_7(+)?,python_single_target_python3_3(+)?] app-arch/zip app-arch/unzip >=app-text/hunspell-1.3.2-r3 app-text/mythes app-text/libabw >=app-text/libexttextcat-3.2 app-text/libebook app-text/libetonyek app-text/liblangtag app-text/libmspub >=app-text/libmwaw-0.2 >=app-text/libodfgen-0.0.3 app-text/libwpd:0.9[tools] app-text/libwpg:0.2 >=app-text/libwps-0.2.2 >=app-text/poppler-0.16:=[xpdf-headers(+),cxx] >=dev-cpp/clucene-2.3.3.4-r2 dev-cpp/libcmis:0.4 dev-db/unixODBC >=dev-libs/boost-1.46:= dev-libs/expat >=dev-libs/hyphen-2.7.1 >=dev-libs/icu-4.8.1.1:= >=dev-libs/libatomic_ops-7.2d >=dev-libs/liborcus-0.5.1:= >=dev-libs/nspr-4.8.8 >=dev-libs/nss-3.12.9 >=dev-lang/perl-5.0 >=dev-libs/openssl-1.0.0d >=dev-libs/redland-1.0.16[ssl] media-gfx/graphite2 >=media-libs/fontconfig-2.8.0 media-libs/freetype:2 >=media-libs/harfbuzz-0.9.18:=[icu(+)] media-libs/lcms:2 >=media-libs/libpng-1.4 >=media-libs/libcdr-0.0.5 media-libs/libfreehand media-libs/libvisio >=net-misc/curl-7.21.4 net-nds/openldap sci-mathematics/lpsolve virtual/jpeg:0 >=x11-libs/cairo-1.10.0[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender bluetooth? ( net-wireless/bluez ) cups? ( net-print/cups ) dbus? ( >=dev-libs/dbus-glib-0.92 ) eds? ( gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-2.5 ) gnome? ( gnome-base/gconf:2 ) gtk? ( x11-libs/gdk-pixbuf[X] >=x11-libs/gtk+-2.24:2 ) gtk3? ( >=x11-libs/gtk+-3.2:3 ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) jemalloc? ( dev-libs/jemalloc ) libreoffice_extensions_scripting-beanshell? ( >=dev-java/bsh-2.0_beta4 ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) libreoffice_extensions_wiki-publisher? ( dev-java/commons-codec:0 dev-java/commons-httpclient:3 dev-java/commons-lang:2.1 dev-java/commons-logging:0 dev-java/tomcat-servlet-api:3.0 ) mysql? ( >=dev-db/mysql-connector-c++-1.1.0 ) opengl? ( virtual/glu virtual/opengl ) postgres? ( >=dev-db/postgresql-base-9.0[kerberos] ) telepathy? ( dev-libs/glib:2 >=net-libs/telepathy-glib-0.18.0 >=x11-libs/gtk+-2.24:2 ) webdav? ( net-libs/neon ) >=dev-libs/libxml2-2.7.8 dev-libs/libxslt dev-perl/Archive-Zip dev-util/cppunit >=dev-util/gperf-3 dev-util/intltool >=dev-util/mdds-0.10.2:= virtual/pkgconfig net-misc/npapi-sdk >=sys-apps/findutils-4.4.2 sys-devel/bison sys-apps/coreutils sys-devel/flex sys-devel/gettext >=sys-devel/make-3.82 sys-devel/ucpp sys-libs/zlib x11-libs/libXt x11-libs/libXtst x11-proto/randrproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto java? ( >=virtual/jdk-1.6 >=dev-java/ant-core-1.7 ) odk? ( >=app-doc/doxygen-1.8.4 ) 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 java? ( >=dev-java/java-config-2.1.9-r1 ) >=sys-apps/sed-4 kde? ( dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) ) kde? ( dev-lang/perl >=dev-qt/qt3support-4.7.4:4[accessibility] >=dev-qt/qtcore-4.7.4:4[qt3support,ssl] >=dev-qt/qtdbus-4.7.4: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.7.4:4 >=dev-qt/qtsql-4.7.4:4[qt3support] >=dev-qt/qtsvg-4.7.4:4 >=dev-qt/qttest-4.7.4:4 >=dev-qt/qtwebkit-4.7.4:4 >=kde-base/kdelibs-4.4:4[aqua=] ) app-arch/unzip
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,xml] ) python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[threads,xml] ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_single_target_python2_7(+)?,python_single_target_python3_3(+)?] app-arch/zip app-arch/unzip >=app-text/hunspell-1.3.2-r3 app-text/mythes app-text/libabw >=app-text/libexttextcat-3.2 app-text/libebook app-text/libetonyek app-text/liblangtag app-text/libmspub >=app-text/libmwaw-0.2 >=app-text/libodfgen-0.0.3 app-text/libwpd:0.9[tools] app-text/libwpg:0.2 >=app-text/libwps-0.2.2 >=app-text/poppler-0.16:=[xpdf-headers(+),cxx] >=dev-cpp/clucene-2.3.3.4-r2 dev-cpp/libcmis:0.4 dev-db/unixODBC >=dev-libs/boost-1.46:= dev-libs/expat >=dev-libs/hyphen-2.7.1 >=dev-libs/icu-4.8.1.1:= >=dev-libs/libatomic_ops-7.2d =dev-libs/liborcus-0.5* >=dev-libs/nspr-4.8.8 >=dev-libs/nss-3.12.9 >=dev-lang/perl-5.0 >=dev-libs/openssl-1.0.0d >=dev-libs/redland-1.0.16[ssl] media-gfx/graphite2 >=media-libs/fontconfig-2.8.0 media-libs/freetype:2 >=media-libs/harfbuzz-0.9.18:=[icu(+)] media-libs/lcms:2 >=media-libs/libpng-1.4 >=media-libs/libcdr-0.0.5 media-libs/libfreehand media-libs/libvisio >=net-misc/curl-7.21.4 net-nds/openldap sci-mathematics/lpsolve virtual/jpeg:0 >=x11-libs/cairo-1.10.0[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender bluetooth? ( net-wireless/bluez ) cups? ( net-print/cups ) dbus? ( >=dev-libs/dbus-glib-0.92 ) eds? ( gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-2.5 ) gnome? ( gnome-base/gconf:2 ) gtk? ( x11-libs/gdk-pixbuf[X] >=x11-libs/gtk+-2.24:2 ) gtk3? ( >=x11-libs/gtk+-3.2:3 ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) jemalloc? ( dev-libs/jemalloc ) libreoffice_extensions_scripting-beanshell? ( >=dev-java/bsh-2.0_beta4 ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) libreoffice_extensions_wiki-publisher? ( dev-java/commons-codec:0 dev-java/commons-httpclient:3 dev-java/commons-lang:2.1 dev-java/commons-logging:0 dev-java/tomcat-servlet-api:3.0 ) mysql? ( >=dev-db/mysql-connector-c++-1.1.0 ) opengl? ( virtual/glu virtual/opengl ) postgres? ( >=dev-db/postgresql-base-9.0[kerberos] ) telepathy? ( dev-libs/glib:2 >=net-libs/telepathy-glib-0.18.0 >=x11-libs/gtk+-2.24:2 ) webdav? ( net-libs/neon ) >=dev-libs/libxml2-2.7.8 dev-libs/libxslt dev-perl/Archive-Zip dev-util/cppunit >=dev-util/gperf-3 dev-util/intltool >=dev-util/mdds-0.10.2:= virtual/pkgconfig net-misc/npapi-sdk >=sys-apps/findutils-4.4.2 sys-devel/bison sys-apps/coreutils sys-devel/flex sys-devel/gettext >=sys-devel/make-3.82 sys-devel/ucpp sys-libs/zlib x11-libs/libXt x11-libs/libXtst x11-proto/randrproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto java? ( >=virtual/jdk-1.6 >=dev-java/ant-core-1.7 ) odk? ( >=app-doc/doxygen-1.8.4 ) 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 java? ( >=dev-java/java-config-2.1.9-r1 ) >=sys-apps/sed-4 kde? ( dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) ) kde? ( dev-lang/perl >=dev-qt/qt3support-4.7.4:4[accessibility] >=dev-qt/qtcore-4.7.4:4[qt3support,ssl] >=dev-qt/qtdbus-4.7.4: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.7.4:4 >=dev-qt/qtsql-4.7.4:4[qt3support] >=dev-qt/qtsvg-4.7.4:4 >=dev-qt/qttest-4.7.4:4 >=dev-qt/qtwebkit-4.7.4:4 >=kde-base/kdelibs-4.4:4[aqua=] ) app-arch/unzip
 DESCRIPTION=LibreOffice, a full office productivity suite.
 EAPI=5
 HOMEPAGE=http://www.libreoffice.org
@@ -7,9 +7,9 @@ IUSE=bluetooth +branding +cups dbus debug eds firebird gnome gstreamer +gtk gtk3
 KEYWORDS=~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( LGPL-3 MPL-1.1 )
 PDEPEND=~app-office/libreoffice-l10n-4.2.1.1
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,xml] ) python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[threads,xml] ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_single_target_python2_7(+)?,python_single_target_python3_3(+)?] app-arch/zip app-arch/unzip >=app-text/hunspell-1.3.2-r3 app-text/mythes app-text/libabw >=app-text/libexttextcat-3.2 app-text/libebook app-text/libetonyek app-text/liblangtag app-text/libmspub >=app-text/libmwaw-0.2 >=app-text/libodfgen-0.0.3 app-text/libwpd:0.9[tools] app-text/libwpg:0.2 >=app-text/libwps-0.2.2 >=app-text/poppler-0.16:=[xpdf-headers(+),cxx] >=dev-cpp/clucene-2.3.3.4-r2 dev-cpp/libcmis:0.4 dev-db/unixODBC >=dev-libs/boost-1.46:= dev-libs/expat >=dev-libs/hyphen-2.7.1 >=dev-libs/icu-4.8.1.1:= >=dev-libs/libatomic_ops-7.2d >=dev-libs/liborcus-0.5.1:= >=dev-libs/nspr-4.8.8 >=dev-libs/nss-3.12.9 >=dev-lang/perl-5.0 >=dev-libs/openssl-1.0.0d >=dev-libs/redland-1.0.16[ssl] media-gfx/graphite2 >=media-libs/fontconfig-2.8.0 media-libs/freetype:2 >=media-libs/harfbuzz-0.9.18:=[icu(+)] media-libs/lcms:2 >=media-libs/libpng-1.4 >=media-libs/libcdr-0.0.5 media-libs/libfreehand media-libs/libvisio >=net-misc/curl-7.21.4 net-nds/openldap sci-mathematics/lpsolve virtual/jpeg:0 >=x11-libs/cairo-1.10.0[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender bluetooth? ( net-wireless/bluez ) cups? ( net-print/cups ) dbus? ( >=dev-libs/dbus-glib-0.92 ) eds? ( gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-2.5 ) gnome? ( gnome-base/gconf:2 ) gtk? ( x11-libs/gdk-pixbuf[X] >=x11-libs/gtk+-2.24:2 ) gtk3? ( >=x11-libs/gtk+-3.2:3 ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) jemalloc? ( dev-libs/jemalloc ) libreoffice_extensions_scripting-beanshell? ( >=dev-java/bsh-2.0_beta4 ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) libreoffice_extensions_wiki-publisher? ( dev-java/commons-codec:0 dev-java/commons-httpclient:3 dev-java/commons-lang:2.1 dev-java/commons-logging:0 dev-java/tomcat-servlet-api:3.0 ) mysql? ( >=dev-db/mysql-connector-c++-1.1.0 ) opengl? ( virtual/glu virtual/opengl ) postgres? ( >=dev-db/postgresql-base-9.0[kerberos] ) telepathy? ( dev-libs/glib:2 >=net-libs/telepathy-glib-0.18.0 >=x11-libs/gtk+-2.24:2 ) webdav? ( net-libs/neon ) !app-office/libreoffice-bin !app-office/libreoffice-bin-debug !<app-office/openoffice-bin-3.4.0-r1 !app-office/openoffice media-fonts/libertine-ttf media-fonts/liberation-fonts media-fonts/urw-fonts java? ( >=virtual/jre-1.6 ) vlc? ( media-video/vlc ) java? ( >=dev-java/java-config-2.1.9-r1 ) kde? ( >=kde-base/oxygen-icons-4.4:4[aqua=] ) kde? ( dev-lang/perl >=dev-qt/qt3support-4.7.4:4[accessibility] >=dev-qt/qtcore-4.7.4:4[qt3support,ssl] >=dev-qt/qtdbus-4.7.4: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.7.4:4 >=dev-qt/qtsql-4.7.4:4[qt3support] >=dev-qt/qtsvg-4.7.4:4 >=dev-qt/qttest-4.7.4:4 >=dev-qt/qtwebkit-4.7.4:4 >=kde-base/kdelibs-4.4:4[aqua=] )
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,xml] ) python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[threads,xml] ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_single_target_python2_7(+)?,python_single_target_python3_3(+)?] app-arch/zip app-arch/unzip >=app-text/hunspell-1.3.2-r3 app-text/mythes app-text/libabw >=app-text/libexttextcat-3.2 app-text/libebook app-text/libetonyek app-text/liblangtag app-text/libmspub >=app-text/libmwaw-0.2 >=app-text/libodfgen-0.0.3 app-text/libwpd:0.9[tools] app-text/libwpg:0.2 >=app-text/libwps-0.2.2 >=app-text/poppler-0.16:=[xpdf-headers(+),cxx] >=dev-cpp/clucene-2.3.3.4-r2 dev-cpp/libcmis:0.4 dev-db/unixODBC >=dev-libs/boost-1.46:= dev-libs/expat >=dev-libs/hyphen-2.7.1 >=dev-libs/icu-4.8.1.1:= >=dev-libs/libatomic_ops-7.2d =dev-libs/liborcus-0.5* >=dev-libs/nspr-4.8.8 >=dev-libs/nss-3.12.9 >=dev-lang/perl-5.0 >=dev-libs/openssl-1.0.0d >=dev-libs/redland-1.0.16[ssl] media-gfx/graphite2 >=media-libs/fontconfig-2.8.0 media-libs/freetype:2 >=media-libs/harfbuzz-0.9.18:=[icu(+)] media-libs/lcms:2 >=media-libs/libpng-1.4 >=media-libs/libcdr-0.0.5 media-libs/libfreehand media-libs/libvisio >=net-misc/curl-7.21.4 net-nds/openldap sci-mathematics/lpsolve virtual/jpeg:0 >=x11-libs/cairo-1.10.0[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender bluetooth? ( net-wireless/bluez ) cups? ( net-print/cups ) dbus? ( >=dev-libs/dbus-glib-0.92 ) eds? ( gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-2.5 ) gnome? ( gnome-base/gconf:2 ) gtk? ( x11-libs/gdk-pixbuf[X] >=x11-libs/gtk+-2.24:2 ) gtk3? ( >=x11-libs/gtk+-3.2:3 ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) jemalloc? ( dev-libs/jemalloc ) libreoffice_extensions_scripting-beanshell? ( >=dev-java/bsh-2.0_beta4 ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) libreoffice_extensions_wiki-publisher? ( dev-java/commons-codec:0 dev-java/commons-httpclient:3 dev-java/commons-lang:2.1 dev-java/commons-logging:0 dev-java/tomcat-servlet-api:3.0 ) mysql? ( >=dev-db/mysql-connector-c++-1.1.0 ) opengl? ( virtual/glu virtual/opengl ) postgres? ( >=dev-db/postgresql-base-9.0[kerberos] ) telepathy? ( dev-libs/glib:2 >=net-libs/telepathy-glib-0.18.0 >=x11-libs/gtk+-2.24:2 ) webdav? ( net-libs/neon ) !app-office/libreoffice-bin !app-office/libreoffice-bin-debug !<app-office/openoffice-bin-3.4.0-r1 !app-office/openoffice media-fonts/libertine-ttf media-fonts/liberation-fonts media-fonts/urw-fonts java? ( >=virtual/jre-1.6 ) vlc? ( media-video/vlc ) java? ( >=dev-java/java-config-2.1.9-r1 ) kde? ( >=kde-base/oxygen-icons-4.4:4[aqua=] ) kde? ( dev-lang/perl >=dev-qt/qt3support-4.7.4:4[accessibility] >=dev-qt/qtcore-4.7.4:4[qt3support,ssl] >=dev-qt/qtdbus-4.7.4: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.7.4:4 >=dev-qt/qtsql-4.7.4:4[qt3support] >=dev-qt/qtsvg-4.7.4:4 >=dev-qt/qttest-4.7.4:4 >=dev-qt/qtwebkit-4.7.4:4 >=kde-base/kdelibs-4.4:4[aqua=] )
 REQUIRED_USE=python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_3? ( python_targets_python3_3 ) ^^ ( python_single_target_python2_7 python_single_target_python3_3 ) bluetooth? ( dbus ) gnome? ( gtk ) eds? ( gnome ) telepathy? ( gtk ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) libreoffice_extensions_scripting-javascript? ( java ) libreoffice_extensions_wiki-publisher? ( java )
 SLOT=0
 SRC_URI=branding? ( http://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.8.tar.xz ) http://dev-builds.libreoffice.org/pre-releases/src/libreoffice-4.2.1.1.tar.xz http://dev-builds.libreoffice.org/pre-releases/src/libreoffice-help-4.2.1.1.tar.xz http://download.documentfoundation.org/libreoffice/src/4.2.1//libreoffice-4.2.1.1.tar.xz http://download.documentfoundation.org/libreoffice/src/4.2.1//libreoffice-help-4.2.1.1.tar.xz http://download.documentfoundation.org/libreoffice/old/4.2.1.1//libreoffice-4.2.1.1.tar.xz http://download.documentfoundation.org/libreoffice/old/4.2.1.1//libreoffice-help-4.2.1.1.tar.xz http://dev-www.libreoffice.org/src//d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz http://dev-www.libreoffice.org/src//1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz java? ( http://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) libreoffice_extensions_wiki-publisher? ( http://dev-www.libreoffice.org/src//a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ) libreoffice_extensions_scripting-javascript? ( http://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) libreoffice_extensions_scripting-javascript? ( http://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
 _eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	bash-completion-r1	db412e427e3317ffd3e15f17df269c5e	check-reqs	0efdf29c9002a1995388968bf54e9d3d	eutils	af81d52c25ec93fbdff71e0efb0de7b7	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8d0d93b7a8605ea346cce4604f6db516	kde4-base	878b2df7577220756ff2e7e9a0c3476c	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	libtool	b9b3340e3a19510f0d9f05cfccbf209f	mozextension	ba6829881080a663d68531424a3dfbc6	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	nsplugins	7ea51b2f6cbd5b36b9c0163cc3ee03a2	pax-utils	2424f959506320f5196de8f79fa05297	python-single-r1	82a55861314bbcedaf1e08ed4dd651b3	python-utils-r1	18d8279a3382bf4453e7ff35208ce907	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=ea3bd10519f63e14df720510f7d27c7c
+_md5_=940da06d9401ec157bee6d20aae9c1d0
diff --git a/metadata/md5-cache/app-office/libreoffice-9999-r2 b/metadata/md5-cache/app-office/libreoffice-9999-r2
index 296eff7d2c41..58b4163393ae 100644
--- a/metadata/md5-cache/app-office/libreoffice-9999-r2
+++ b/metadata/md5-cache/app-office/libreoffice-9999-r2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,xml] ) python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[threads,xml] ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_single_target_python2_7(+)?,python_single_target_python3_3(+)?] app-arch/zip app-arch/unzip >=app-text/hunspell-1.3.2-r3 app-text/mythes app-text/libabw >=app-text/libexttextcat-3.2 app-text/libebook app-text/libetonyek app-text/liblangtag app-text/libmspub >=app-text/libmwaw-0.2 >=app-text/libodfgen-0.0.3 app-text/libwpd:0.9[tools] app-text/libwpg:0.2 >=app-text/libwps-0.2.2 >=app-text/poppler-0.16:=[xpdf-headers(+),cxx] >=dev-cpp/clucene-2.3.3.4-r2 dev-cpp/libcmis:0.4 dev-db/unixODBC >=dev-libs/boost-1.46:= dev-libs/expat >=dev-libs/hyphen-2.7.1 >=dev-libs/icu-4.8.1.1:= >=dev-libs/libatomic_ops-7.2d >=dev-libs/liborcus-0.5.1:= >=dev-libs/nspr-4.8.8 >=dev-libs/nss-3.12.9 >=dev-lang/perl-5.0 >=dev-libs/openssl-1.0.0d >=dev-libs/redland-1.0.16[ssl] media-gfx/graphite2 >=media-libs/fontconfig-2.8.0 media-libs/freetype:2 >=media-libs/harfbuzz-0.9.18:=[icu(+)] media-libs/lcms:2 >=media-libs/libpng-1.4 >=media-libs/libcdr-0.0.5 media-libs/libfreehand media-libs/libvisio >=net-misc/curl-7.21.4 net-nds/openldap sci-mathematics/lpsolve virtual/jpeg:0 >=x11-libs/cairo-1.10.0[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender bluetooth? ( net-wireless/bluez ) cups? ( net-print/cups ) dbus? ( >=dev-libs/dbus-glib-0.92 ) eds? ( gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-2.5 ) gnome? ( gnome-base/gconf:2 ) gtk? ( x11-libs/gdk-pixbuf[X] >=x11-libs/gtk+-2.24:2 ) gtk3? ( >=x11-libs/gtk+-3.2:3 ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) jemalloc? ( dev-libs/jemalloc ) libreoffice_extensions_scripting-beanshell? ( >=dev-java/bsh-2.0_beta4 ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) libreoffice_extensions_wiki-publisher? ( dev-java/commons-codec:0 dev-java/commons-httpclient:3 dev-java/commons-lang:2.1 dev-java/commons-logging:0 dev-java/tomcat-servlet-api:3.0 ) mysql? ( >=dev-db/mysql-connector-c++-1.1.0 ) opengl? ( virtual/glu virtual/opengl ) postgres? ( >=dev-db/postgresql-base-9.0[kerberos] ) telepathy? ( dev-libs/glib:2 >=net-libs/telepathy-glib-0.18.0 >=x11-libs/gtk+-2.24:2 ) webdav? ( net-libs/neon ) >=dev-libs/libxml2-2.7.8 dev-libs/libxslt dev-perl/Archive-Zip dev-util/cppunit >=dev-util/gperf-3 dev-util/intltool >=dev-util/mdds-0.10.2:= virtual/pkgconfig net-misc/npapi-sdk >=sys-apps/findutils-4.4.2 sys-devel/bison sys-apps/coreutils sys-devel/flex sys-devel/gettext >=sys-devel/make-3.82 sys-devel/ucpp sys-libs/zlib x11-libs/libXt x11-libs/libXtst x11-proto/randrproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto java? ( >=virtual/jdk-1.6 >=dev-java/ant-core-1.7 ) odk? ( >=app-doc/doxygen-1.8.4 ) 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 java? ( >=dev-java/java-config-2.1.9-r1 ) >=sys-apps/sed-4 >=dev-vcs/git-1.8.2.1 kde? ( dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) ) kde? ( dev-lang/perl >=dev-qt/qt3support-4.7.4:4[accessibility] >=dev-qt/qtcore-4.7.4:4[qt3support,ssl] >=dev-qt/qtdbus-4.7.4: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.7.4:4 >=dev-qt/qtsql-4.7.4:4[qt3support] >=dev-qt/qtsvg-4.7.4:4 >=dev-qt/qttest-4.7.4:4 >=dev-qt/qtwebkit-4.7.4:4 >=kde-base/kdelibs-4.4:4[aqua=] ) app-arch/unzip dev-vcs/git
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,xml] ) python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[threads,xml] ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_single_target_python2_7(+)?,python_single_target_python3_3(+)?] app-arch/zip app-arch/unzip >=app-text/hunspell-1.3.2-r3 app-text/mythes app-text/libabw >=app-text/libexttextcat-3.2 app-text/libebook app-text/libetonyek app-text/liblangtag app-text/libmspub >=app-text/libmwaw-0.2 >=app-text/libodfgen-0.0.3 app-text/libwpd:0.9[tools] app-text/libwpg:0.2 >=app-text/libwps-0.2.2 >=app-text/poppler-0.16:=[xpdf-headers(+),cxx] >=dev-cpp/clucene-2.3.3.4-r2 dev-cpp/libcmis:0.4 dev-db/unixODBC >=dev-libs/boost-1.46:= dev-libs/expat >=dev-libs/hyphen-2.7.1 >=dev-libs/icu-4.8.1.1:= >=dev-libs/libatomic_ops-7.2d >=dev-libs/liborcus-0.7.0:= >=dev-libs/nspr-4.8.8 >=dev-libs/nss-3.12.9 >=dev-lang/perl-5.0 >=dev-libs/openssl-1.0.0d >=dev-libs/redland-1.0.16[ssl] media-gfx/graphite2 >=media-libs/fontconfig-2.8.0 media-libs/freetype:2 >=media-libs/glew-1.10 >=media-libs/harfbuzz-0.9.18:=[icu(+)] media-libs/lcms:2 >=media-libs/libpng-1.4 >=media-libs/libcdr-0.0.5 media-libs/libfreehand media-libs/libvisio >=net-misc/curl-7.21.4 net-nds/openldap sci-mathematics/lpsolve virtual/jpeg:0 >=x11-libs/cairo-1.10.0[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender bluetooth? ( net-wireless/bluez ) cups? ( net-print/cups ) dbus? ( >=dev-libs/dbus-glib-0.92 ) eds? ( gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-2.5 ) gnome? ( gnome-base/gconf:2 ) gtk? ( x11-libs/gdk-pixbuf[X] >=x11-libs/gtk+-2.24:2 ) gtk3? ( >=x11-libs/gtk+-3.2:3 ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) jemalloc? ( dev-libs/jemalloc ) libreoffice_extensions_scripting-beanshell? ( >=dev-java/bsh-2.0_beta4 ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) libreoffice_extensions_wiki-publisher? ( dev-java/commons-codec:0 dev-java/commons-httpclient:3 dev-java/commons-lang:2.1 dev-java/commons-logging:0 dev-java/tomcat-servlet-api:3.0 ) mysql? ( >=dev-db/mysql-connector-c++-1.1.0 ) opengl? ( virtual/glu virtual/opengl ) postgres? ( >=dev-db/postgresql-base-9.0[kerberos] ) telepathy? ( dev-libs/glib:2 >=net-libs/telepathy-glib-0.18.0 >=x11-libs/gtk+-2.24:2 ) webdav? ( net-libs/neon ) >=dev-libs/libxml2-2.7.8 dev-libs/libxslt dev-perl/Archive-Zip dev-util/cppunit >=dev-util/gperf-3 dev-util/intltool >=dev-util/mdds-0.10.2:= media-libs/glm net-misc/npapi-sdk >=sys-apps/findutils-4.4.2 sys-devel/bison sys-apps/coreutils sys-devel/flex sys-devel/gettext >=sys-devel/make-3.82 sys-devel/ucpp sys-libs/zlib virtual/pkgconfig x11-libs/libXt x11-libs/libXtst x11-proto/randrproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto java? ( >=virtual/jdk-1.6 >=dev-java/ant-core-1.7 ) odk? ( >=app-doc/doxygen-1.8.4 ) 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 java? ( >=dev-java/java-config-2.1.9-r1 ) >=sys-apps/sed-4 >=dev-vcs/git-1.8.2.1 kde? ( dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) ) kde? ( dev-lang/perl >=dev-qt/qt3support-4.7.4:4[accessibility] >=dev-qt/qtcore-4.7.4:4[qt3support,ssl] >=dev-qt/qtdbus-4.7.4: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.7.4:4 >=dev-qt/qtsql-4.7.4:4[qt3support] >=dev-qt/qtsvg-4.7.4:4 >=dev-qt/qttest-4.7.4:4 >=dev-qt/qtwebkit-4.7.4:4 >=kde-base/kdelibs-4.4:4[aqua=] ) app-arch/unzip dev-vcs/git
 DESCRIPTION=LibreOffice, a full office productivity suite.
 EAPI=5
 HOMEPAGE=http://www.libreoffice.org
 IUSE=bluetooth +branding +cups dbus debug eds firebird gnome gstreamer +gtk gtk3 jemalloc kde mysql odk opengl postgres telepathy test +vba vlc +webdav libreoffice_extensions_nlpsolver libreoffice_extensions_scripting-beanshell libreoffice_extensions_scripting-javascript libreoffice_extensions_wiki-publisher elibc_FreeBSD java aqua kde python_targets_python2_7 python_targets_python3_3 python_single_target_python2_7 python_single_target_python3_3
 LICENSE=|| ( LGPL-3 MPL-1.1 )
 PDEPEND=!app-office/libreoffice-l10n
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,xml] ) python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[threads,xml] ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_single_target_python2_7(+)?,python_single_target_python3_3(+)?] app-arch/zip app-arch/unzip >=app-text/hunspell-1.3.2-r3 app-text/mythes app-text/libabw >=app-text/libexttextcat-3.2 app-text/libebook app-text/libetonyek app-text/liblangtag app-text/libmspub >=app-text/libmwaw-0.2 >=app-text/libodfgen-0.0.3 app-text/libwpd:0.9[tools] app-text/libwpg:0.2 >=app-text/libwps-0.2.2 >=app-text/poppler-0.16:=[xpdf-headers(+),cxx] >=dev-cpp/clucene-2.3.3.4-r2 dev-cpp/libcmis:0.4 dev-db/unixODBC >=dev-libs/boost-1.46:= dev-libs/expat >=dev-libs/hyphen-2.7.1 >=dev-libs/icu-4.8.1.1:= >=dev-libs/libatomic_ops-7.2d >=dev-libs/liborcus-0.5.1:= >=dev-libs/nspr-4.8.8 >=dev-libs/nss-3.12.9 >=dev-lang/perl-5.0 >=dev-libs/openssl-1.0.0d >=dev-libs/redland-1.0.16[ssl] media-gfx/graphite2 >=media-libs/fontconfig-2.8.0 media-libs/freetype:2 >=media-libs/harfbuzz-0.9.18:=[icu(+)] media-libs/lcms:2 >=media-libs/libpng-1.4 >=media-libs/libcdr-0.0.5 media-libs/libfreehand media-libs/libvisio >=net-misc/curl-7.21.4 net-nds/openldap sci-mathematics/lpsolve virtual/jpeg:0 >=x11-libs/cairo-1.10.0[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender bluetooth? ( net-wireless/bluez ) cups? ( net-print/cups ) dbus? ( >=dev-libs/dbus-glib-0.92 ) eds? ( gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-2.5 ) gnome? ( gnome-base/gconf:2 ) gtk? ( x11-libs/gdk-pixbuf[X] >=x11-libs/gtk+-2.24:2 ) gtk3? ( >=x11-libs/gtk+-3.2:3 ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) jemalloc? ( dev-libs/jemalloc ) libreoffice_extensions_scripting-beanshell? ( >=dev-java/bsh-2.0_beta4 ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) libreoffice_extensions_wiki-publisher? ( dev-java/commons-codec:0 dev-java/commons-httpclient:3 dev-java/commons-lang:2.1 dev-java/commons-logging:0 dev-java/tomcat-servlet-api:3.0 ) mysql? ( >=dev-db/mysql-connector-c++-1.1.0 ) opengl? ( virtual/glu virtual/opengl ) postgres? ( >=dev-db/postgresql-base-9.0[kerberos] ) telepathy? ( dev-libs/glib:2 >=net-libs/telepathy-glib-0.18.0 >=x11-libs/gtk+-2.24:2 ) webdav? ( net-libs/neon ) !app-office/libreoffice-bin !app-office/libreoffice-bin-debug !<app-office/openoffice-bin-3.4.0-r1 !app-office/openoffice media-fonts/libertine-ttf media-fonts/liberation-fonts media-fonts/urw-fonts java? ( >=virtual/jre-1.6 ) vlc? ( media-video/vlc ) java? ( >=dev-java/java-config-2.1.9-r1 ) kde? ( >=kde-base/oxygen-icons-4.4:4[aqua=] ) kde? ( dev-lang/perl >=dev-qt/qt3support-4.7.4:4[accessibility] >=dev-qt/qtcore-4.7.4:4[qt3support,ssl] >=dev-qt/qtdbus-4.7.4: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.7.4:4 >=dev-qt/qtsql-4.7.4:4[qt3support] >=dev-qt/qtsvg-4.7.4:4 >=dev-qt/qttest-4.7.4:4 >=dev-qt/qtwebkit-4.7.4:4 >=kde-base/kdelibs-4.4:4[aqua=] )
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,xml] ) python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[threads,xml] ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_single_target_python2_7(+)?,python_single_target_python3_3(+)?] app-arch/zip app-arch/unzip >=app-text/hunspell-1.3.2-r3 app-text/mythes app-text/libabw >=app-text/libexttextcat-3.2 app-text/libebook app-text/libetonyek app-text/liblangtag app-text/libmspub >=app-text/libmwaw-0.2 >=app-text/libodfgen-0.0.3 app-text/libwpd:0.9[tools] app-text/libwpg:0.2 >=app-text/libwps-0.2.2 >=app-text/poppler-0.16:=[xpdf-headers(+),cxx] >=dev-cpp/clucene-2.3.3.4-r2 dev-cpp/libcmis:0.4 dev-db/unixODBC >=dev-libs/boost-1.46:= dev-libs/expat >=dev-libs/hyphen-2.7.1 >=dev-libs/icu-4.8.1.1:= >=dev-libs/libatomic_ops-7.2d >=dev-libs/liborcus-0.7.0:= >=dev-libs/nspr-4.8.8 >=dev-libs/nss-3.12.9 >=dev-lang/perl-5.0 >=dev-libs/openssl-1.0.0d >=dev-libs/redland-1.0.16[ssl] media-gfx/graphite2 >=media-libs/fontconfig-2.8.0 media-libs/freetype:2 >=media-libs/glew-1.10 >=media-libs/harfbuzz-0.9.18:=[icu(+)] media-libs/lcms:2 >=media-libs/libpng-1.4 >=media-libs/libcdr-0.0.5 media-libs/libfreehand media-libs/libvisio >=net-misc/curl-7.21.4 net-nds/openldap sci-mathematics/lpsolve virtual/jpeg:0 >=x11-libs/cairo-1.10.0[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender bluetooth? ( net-wireless/bluez ) cups? ( net-print/cups ) dbus? ( >=dev-libs/dbus-glib-0.92 ) eds? ( gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-2.5 ) gnome? ( gnome-base/gconf:2 ) gtk? ( x11-libs/gdk-pixbuf[X] >=x11-libs/gtk+-2.24:2 ) gtk3? ( >=x11-libs/gtk+-3.2:3 ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) jemalloc? ( dev-libs/jemalloc ) libreoffice_extensions_scripting-beanshell? ( >=dev-java/bsh-2.0_beta4 ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) libreoffice_extensions_wiki-publisher? ( dev-java/commons-codec:0 dev-java/commons-httpclient:3 dev-java/commons-lang:2.1 dev-java/commons-logging:0 dev-java/tomcat-servlet-api:3.0 ) mysql? ( >=dev-db/mysql-connector-c++-1.1.0 ) opengl? ( virtual/glu virtual/opengl ) postgres? ( >=dev-db/postgresql-base-9.0[kerberos] ) telepathy? ( dev-libs/glib:2 >=net-libs/telepathy-glib-0.18.0 >=x11-libs/gtk+-2.24:2 ) webdav? ( net-libs/neon ) !app-office/libreoffice-bin !app-office/libreoffice-bin-debug !<app-office/openoffice-bin-3.4.0-r1 !app-office/openoffice media-fonts/libertine-ttf media-fonts/liberation-fonts media-fonts/urw-fonts java? ( >=virtual/jre-1.6 ) vlc? ( media-video/vlc ) java? ( >=dev-java/java-config-2.1.9-r1 ) kde? ( >=kde-base/oxygen-icons-4.4:4[aqua=] ) kde? ( dev-lang/perl >=dev-qt/qt3support-4.7.4:4[accessibility] >=dev-qt/qtcore-4.7.4:4[qt3support,ssl] >=dev-qt/qtdbus-4.7.4: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.7.4:4 >=dev-qt/qtsql-4.7.4:4[qt3support] >=dev-qt/qtsvg-4.7.4:4 >=dev-qt/qttest-4.7.4:4 >=dev-qt/qtwebkit-4.7.4:4 >=kde-base/kdelibs-4.4:4[aqua=] )
 REQUIRED_USE=python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_3? ( python_targets_python3_3 ) ^^ ( python_single_target_python2_7 python_single_target_python3_3 ) bluetooth? ( dbus ) gnome? ( gtk ) eds? ( gnome ) telepathy? ( gtk ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) libreoffice_extensions_scripting-javascript? ( java ) libreoffice_extensions_wiki-publisher? ( java )
 SLOT=0
 SRC_URI=branding? ( http://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.8.tar.xz ) http://dev-www.libreoffice.org/src//d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz http://dev-www.libreoffice.org/src//1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz java? ( http://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) libreoffice_extensions_wiki-publisher? ( http://dev-www.libreoffice.org/src//a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ) libreoffice_extensions_scripting-javascript? ( http://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) libreoffice_extensions_scripting-javascript? ( http://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
 _eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	base	ec46b36a6f6fd1d0b505a33e0b74e413	bash-completion-r1	db412e427e3317ffd3e15f17df269c5e	check-reqs	0efdf29c9002a1995388968bf54e9d3d	eutils	af81d52c25ec93fbdff71e0efb0de7b7	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	6b256c6cd82cd5989bcb82e80a0fbac9	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8d0d93b7a8605ea346cce4604f6db516	kde4-base	878b2df7577220756ff2e7e9a0c3476c	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	libtool	b9b3340e3a19510f0d9f05cfccbf209f	mozextension	ba6829881080a663d68531424a3dfbc6	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	nsplugins	7ea51b2f6cbd5b36b9c0163cc3ee03a2	pax-utils	2424f959506320f5196de8f79fa05297	python-single-r1	82a55861314bbcedaf1e08ed4dd651b3	python-utils-r1	18d8279a3382bf4453e7ff35208ce907	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=9220221265f8e24a519644dcda9b93ad
+_md5_=c737037408973041bf34bbea11578a64
diff --git a/metadata/md5-cache/app-text/XML-Schema-learner-1.0.0 b/metadata/md5-cache/app-text/XML-Schema-learner-1.0.0
index 5b03ec790dc9..51c76dabbbca 100644
--- a/metadata/md5-cache/app-text/XML-Schema-learner-1.0.0
+++ b/metadata/md5-cache/app-text/XML-Schema-learner-1.0.0
@@ -4,9 +4,9 @@ DESCRIPTION=Algorithmic inferencing of XML schema definitions and DTDs
 EAPI=5
 HOMEPAGE=https://github.com/kore/XML-Schema-learner
 IUSE=test
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=GPL-3
 RDEPEND=dev-lang/php[cli,xml,xmlreader]
 SLOT=0
 SRC_URI=https://github.com/kore/XML-Schema-learner/archive/1.0.0.tar.gz -> XML-Schema-learner-1.0.0.tar.gz
-_md5_=36065b8f6028ac68de366a005eb94a02
+_md5_=30559242056e4bbc5578b979f7ed0f4a
diff --git a/metadata/md5-cache/dev-lang/parrot-5.10.0 b/metadata/md5-cache/dev-lang/parrot-5.10.0
deleted file mode 100644
index 4b10bd59b0c0..000000000000
--- a/metadata/md5-cache/dev-lang/parrot-5.10.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-lang/perl[doc?] sys-libs/readline opengl? ( media-libs/freeglut ) nls? ( sys-devel/gettext ) unicode? ( >=dev-libs/icu-2.6 ) gdbm? ( >=sys-libs/gdbm-1.8.3-r1 ) gmp? ( >=dev-libs/gmp-4.1.4 ) ssl? ( dev-libs/openssl ) pcre? ( dev-libs/libpcre ) doc? ( dev-perl/JSON )
-DESCRIPTION=Virtual machine designed to efficiently compile and execute bytecode for dynamic languages
-EAPI=3
-HOMEPAGE=http://www.parrot.org/
-IUSE=opengl nls doc examples gdbm gmp ssl +unicode pcre
-KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=Artistic-2
-RDEPEND=sys-libs/readline opengl? ( media-libs/freeglut ) nls? ( sys-devel/gettext ) unicode? ( >=dev-libs/icu-2.6 ) gdbm? ( >=sys-libs/gdbm-1.8.3-r1 ) gmp? ( >=dev-libs/gmp-4.1.4 ) ssl? ( dev-libs/openssl ) pcre? ( dev-libs/libpcre ) doc? ( dev-perl/JSON )
-RESTRICT=test
-SLOT=0
-SRC_URI=ftp://ftp.parrot.org/pub/parrot/releases/devel/5.10.0/parrot-5.10.0.tar.gz
-_eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=f31714eae7b25c9e8986f607dfe039d1
diff --git a/metadata/md5-cache/dev-lang/parrot-5.7.0 b/metadata/md5-cache/dev-lang/parrot-5.7.0
deleted file mode 100644
index f5d4f1e47d25..000000000000
--- a/metadata/md5-cache/dev-lang/parrot-5.7.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-lang/perl[doc?] sys-libs/readline opengl? ( media-libs/freeglut ) nls? ( sys-devel/gettext ) unicode? ( >=dev-libs/icu-2.6 ) gdbm? ( >=sys-libs/gdbm-1.8.3-r1 ) gmp? ( >=dev-libs/gmp-4.1.4 ) ssl? ( dev-libs/openssl ) pcre? ( dev-libs/libpcre )
-DESCRIPTION=Virtual machine designed to efficiently compile and execute bytecode for dynamic languages
-EAPI=3
-HOMEPAGE=http://www.parrot.org/
-IUSE=opengl nls doc examples gdbm gmp ssl +unicode pcre
-KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=Artistic-2
-RDEPEND=sys-libs/readline opengl? ( media-libs/freeglut ) nls? ( sys-devel/gettext ) unicode? ( >=dev-libs/icu-2.6 ) gdbm? ( >=sys-libs/gdbm-1.8.3-r1 ) gmp? ( >=dev-libs/gmp-4.1.4 ) ssl? ( dev-libs/openssl ) pcre? ( dev-libs/libpcre )
-SLOT=0
-SRC_URI=ftp://ftp.parrot.org/pub/parrot/releases/devel/5.7.0/parrot-5.7.0.tar.gz
-_eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=0a4017a94e99fc3a612c23920287bc83
diff --git a/metadata/md5-cache/dev-lang/parrot-6.0.0 b/metadata/md5-cache/dev-lang/parrot-6.0.0
deleted file mode 100644
index f38df3157b4b..000000000000
--- a/metadata/md5-cache/dev-lang/parrot-6.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-lang/perl[doc?] sys-libs/readline opengl? ( media-libs/freeglut ) nls? ( sys-devel/gettext ) unicode? ( >=dev-libs/icu-2.6 ) gdbm? ( >=sys-libs/gdbm-1.8.3-r1 ) gmp? ( >=dev-libs/gmp-4.1.4 ) ssl? ( dev-libs/openssl ) pcre? ( dev-libs/libpcre ) doc? ( dev-perl/JSON )
-DESCRIPTION=Virtual machine designed to efficiently compile and execute bytecode for dynamic languages
-EAPI=3
-HOMEPAGE=http://www.parrot.org/
-IUSE=opengl nls doc examples gdbm gmp ssl +unicode pcre
-KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=Artistic-2
-RDEPEND=sys-libs/readline opengl? ( media-libs/freeglut ) nls? ( sys-devel/gettext ) unicode? ( >=dev-libs/icu-2.6 ) gdbm? ( >=sys-libs/gdbm-1.8.3-r1 ) gmp? ( >=dev-libs/gmp-4.1.4 ) ssl? ( dev-libs/openssl ) pcre? ( dev-libs/libpcre ) doc? ( dev-perl/JSON )
-RESTRICT=test
-SLOT=0
-SRC_URI=ftp://ftp.parrot.org/pub/parrot/releases/supported/6.0.0/parrot-6.0.0.tar.gz
-_eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=bb952a9bde4d4f7e324bc829c61536f9
diff --git a/metadata/md5-cache/dev-libs/glib-2.38.2-r1 b/metadata/md5-cache/dev-libs/glib-2.38.2-r1
index ef247a46e4f2..d63689d3d127 100644
--- a/metadata/md5-cache/dev-libs/glib-2.38.2-r1
+++ b/metadata/md5-cache/dev-libs/glib-2.38.2-r1
@@ -4,11 +4,11 @@ DESCRIPTION=The GLib library of C routines
 EAPI=5
 HOMEPAGE=http://www.gtk.org/
 IUSE=debug fam kernel_linux selinux static-libs systemtap test utils xattr python_targets_python2_6 python_targets_python2_7 test 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 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
+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
 LICENSE=LGPL-2+
 PDEPEND=x11-misc/shared-mime-info !<gnome-base/gvfs-1.6.4-r990
 RDEPEND=virtual/libiconv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] virtual/libffi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] || ( >=dev-libs/elfutils-0.142 >=dev-libs/libelf-0.8.12 >=sys-freebsd/freebsd-lib-9.2_rc1 ) selinux? ( sys-libs/libselinux ) xattr? ( sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) fam? ( virtual/fam[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) utils? ( python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] >=dev-util/gdbus-codegen-2.38.2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=2
 SRC_URI=mirror://gnome/sources/glib/2.38/glib-2.38.2.tar.xz http://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz
 _eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	bash-completion-r1	db412e427e3317ffd3e15f17df269c5e	eutils	af81d52c25ec93fbdff71e0efb0de7b7	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	b9b3340e3a19510f0d9f05cfccbf209f	linux-info	90944ede7e9761bd7ef07602acdef9e3	multibuild	56d4120419072116417e8de1bd1040ff	multilib	fac675dcccf94392371a6abee62d909f	multilib-build	198e1c7095dbce1ca2848aed0f96bf60	multilib-minimal	a481090a413ba6970bd9643494ef982f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	pax-utils	2424f959506320f5196de8f79fa05297	python-r1	3bb814ab7959a36067101a6bef683b6f	python-utils-r1	18d8279a3382bf4453e7ff35208ce907	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=2a0667d85ec0f07d4341b8ae71285e86
+_md5_=5db3b359d3fc7391f41da60f7c698fd4
diff --git a/metadata/md5-cache/dev-libs/gmp-5.1.3-r1 b/metadata/md5-cache/dev-libs/gmp-5.1.3-r1
index 63cd5cc397cc..255ed8088a00 100644
--- a/metadata/md5-cache/dev-libs/gmp-5.1.3-r1
+++ b/metadata/md5-cache/dev-libs/gmp-5.1.3-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Library for arithmetic on arbitrary precision integers, rational num
 EAPI=4
 HOMEPAGE=http://gmplib.org/
 IUSE=doc cxx pgo static-libs 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 ~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=LGPL-3
 RDEPEND=abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20131008-r1 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=mirror://gnu/gmp/gmp-5.1.3.tar.xz ftp://ftp.gmplib.org/pub/gmp-5.1.3/gmp-5.1.3.tar.xz doc? ( http://gmplib.org/gmp-man-5.1.3.pdf )
 _eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multibuild	56d4120419072116417e8de1bd1040ff	multilib	fac675dcccf94392371a6abee62d909f	multilib-build	198e1c7095dbce1ca2848aed0f96bf60	multilib-minimal	a481090a413ba6970bd9643494ef982f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=37612d1eda1bd1a735065eafbd9f8487
+_md5_=1aaa384d2cf6840def3beb1ad9124ba5
diff --git a/metadata/md5-cache/dev-libs/gmp-6.0.0a b/metadata/md5-cache/dev-libs/gmp-6.0.0a
new file mode 100644
index 000000000000..e466038fd46b
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/gmp-6.0.0a
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare test
+DEPEND=sys-devel/m4 app-arch/xz-utils userland_GNU? ( >=sys-apps/coreutils-8.5 )
+DESCRIPTION=Library for arithmetic on arbitrary precision integers, rational numbers, and floating-point numbers
+EAPI=4
+HOMEPAGE=http://gmplib.org/
+IUSE=doc cxx pgo static-libs 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 ~sparc-fbsd ~x86-fbsd
+LICENSE=LGPL-3
+RDEPEND=abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20131008-r1 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
+SLOT=0
+SRC_URI=mirror://gnu/gmp/gmp-6.0.0a.tar.xz ftp://ftp.gmplib.org/pub/gmp-6.0.0a/gmp-6.0.0a.tar.xz doc? ( http://gmplib.org/gmp-man-6.0.0a.pdf )
+_eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multibuild	56d4120419072116417e8de1bd1040ff	multilib	fac675dcccf94392371a6abee62d909f	multilib-build	198e1c7095dbce1ca2848aed0f96bf60	multilib-minimal	a481090a413ba6970bd9643494ef982f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=ade85fac7237aa0ac5444a5915c95f88
diff --git a/metadata/md5-cache/dev-libs/libffi-3.0.11 b/metadata/md5-cache/dev-libs/libffi-3.0.11
index ee341fd30284..c53967b16818 100644
--- a/metadata/md5-cache/dev-libs/libffi-3.0.11
+++ b/metadata/md5-cache/dev-libs/libffi-3.0.11
@@ -9,4 +9,4 @@ LICENSE=MIT
 SLOT=0
 SRC_URI=ftp://sourceware.org/pub/libffi/libffi-3.0.11.tar.gz
 _eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=ff4ec3136d0794077db381c54a4c56d4
+_md5_=8f71def68dff5455e4cc5feafebd395c
diff --git a/metadata/md5-cache/dev-libs/libffi-3.0.12 b/metadata/md5-cache/dev-libs/libffi-3.0.12
index b64b8216528b..bb2cf2d7162f 100644
--- a/metadata/md5-cache/dev-libs/libffi-3.0.12
+++ b/metadata/md5-cache/dev-libs/libffi-3.0.12
@@ -9,4 +9,4 @@ LICENSE=MIT
 SLOT=0
 SRC_URI=ftp://sourceware.org/pub/libffi/libffi-3.0.12.tar.gz
 _eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=3a40edafa6a46c2779c1bbc58c8b0ce1
+_md5_=7704d165d402fa20418c14769d673029
diff --git a/metadata/md5-cache/dev-libs/libffi-3.0.13 b/metadata/md5-cache/dev-libs/libffi-3.0.13
index eec35138b241..92c41c3f542f 100644
--- a/metadata/md5-cache/dev-libs/libffi-3.0.13
+++ b/metadata/md5-cache/dev-libs/libffi-3.0.13
@@ -9,4 +9,4 @@ LICENSE=MIT
 SLOT=0
 SRC_URI=ftp://sourceware.org/pub/libffi/libffi-3.0.13.tar.gz
 _eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=801c7bc33a9448df624b840548df7cd3
+_md5_=80a7ced4772dc4837321ebea35bc2a94
diff --git a/metadata/md5-cache/dev-libs/libffi-3.0.13-r1 b/metadata/md5-cache/dev-libs/libffi-3.0.13-r1
index 206776b817f8..dd2cf065204d 100644
--- a/metadata/md5-cache/dev-libs/libffi-3.0.13-r1
+++ b/metadata/md5-cache/dev-libs/libffi-3.0.13-r1
@@ -4,10 +4,10 @@ DESCRIPTION=a portable, high level programming interface to various calling conv
 EAPI=5
 HOMEPAGE=http://sourceware.org/libffi/
 IUSE=debug pax_kernel static-libs test 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 ~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
+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
 LICENSE=MIT
 RDEPEND=abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r1 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=ftp://sourceware.org/pub/libffi/libffi-3.0.13.tar.gz
 _eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multibuild	56d4120419072116417e8de1bd1040ff	multilib	fac675dcccf94392371a6abee62d909f	multilib-build	198e1c7095dbce1ca2848aed0f96bf60	multilib-minimal	a481090a413ba6970bd9643494ef982f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=56059208a6804ae2b3e9e99144f436e2
+_md5_=6ede5450ff28630ced27b26723593675
diff --git a/metadata/md5-cache/dev-libs/libixion-0.7.0 b/metadata/md5-cache/dev-libs/libixion-0.7.0
new file mode 100644
index 000000000000..cf8a60bfd158
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libixion-0.7.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=dev-libs/boost:= >=dev-util/mdds-0.7.1:=
+DESCRIPTION=General purpose formula parser & interpreter
+EAPI=5
+HOMEPAGE=http://gitorious.org/ixion/pages/Home
+IUSE=static-libs
+KEYWORDS=~amd64 ~arm ~ppc ~x86
+LICENSE=MIT
+RDEPEND=dev-libs/boost:=
+SLOT=0/0.7
+SRC_URI=http://kohei.us/files/ixion/src/libixion-0.7.0.tar.bz2
+_eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=9c19131c8446a75b063daada5c1e3c16
diff --git a/metadata/md5-cache/dev-libs/libixion-9999 b/metadata/md5-cache/dev-libs/libixion-9999
index 97e71fdf4d59..213936a53c8f 100644
--- a/metadata/md5-cache/dev-libs/libixion-9999
+++ b/metadata/md5-cache/dev-libs/libixion-9999
@@ -6,6 +6,6 @@ HOMEPAGE=http://gitorious.org/ixion/pages/Home
 IUSE=static-libs
 LICENSE=MIT
 RDEPEND=dev-libs/boost:=
-SLOT=0/0.5
+SLOT=0/0.7
 _eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	af81d52c25ec93fbdff71e0efb0de7b7	git-2	2027b81a576527fa16bece425941e094	git-r3	6b256c6cd82cd5989bcb82e80a0fbac9	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=5052c5b60c440372f072b7fee183951c
+_md5_=545aeeac1d17add107513a38e9ee3660
diff --git a/metadata/md5-cache/dev-libs/liborcus-0.7.0 b/metadata/md5-cache/dev-libs/liborcus-0.7.0
new file mode 100644
index 000000000000..01a3e89132c8
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/liborcus-0.7.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=>=dev-libs/boost-1.51.0:= >=dev-libs/libixion-0.7.0:= >=dev-util/mdds-0.8.1
+DESCRIPTION=Standalone file import filter library for spreadsheet documents
+EAPI=5
+HOMEPAGE=http://gitorious.org/orcus/pages/Home
+IUSE=static-libs
+KEYWORDS=~amd64 ~arm ~ppc ~x86
+LICENSE=MIT
+RDEPEND=>=dev-libs/boost-1.51.0:= >=dev-libs/libixion-0.7.0:=
+SLOT=0/0.5
+SRC_URI=http://kohei.us/files/orcus/src/liborcus-0.7.0.tar.bz2
+_eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=eefad56279c590e38790b22cc30c20af
diff --git a/metadata/md5-cache/dev-libs/liborcus-9999 b/metadata/md5-cache/dev-libs/liborcus-9999
index 43a6b7622caf..970d30b1b838 100644
--- a/metadata/md5-cache/dev-libs/liborcus-9999
+++ b/metadata/md5-cache/dev-libs/liborcus-9999
@@ -6,6 +6,6 @@ HOMEPAGE=http://gitorious.org/orcus/pages/Home
 IUSE=static-libs
 LICENSE=MIT
 RDEPEND=>=dev-libs/boost-1.51.0:= >=dev-libs/libixion-0.5.0:=
-SLOT=0/0.5
+SLOT=0/0.7
 _eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	af81d52c25ec93fbdff71e0efb0de7b7	git-2	2027b81a576527fa16bece425941e094	git-r3	6b256c6cd82cd5989bcb82e80a0fbac9	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=5bb8b5692c607185ad063ea2b0a2d5c4
+_md5_=9350f0c63e431feaf4f876576e70d5bb
diff --git a/metadata/md5-cache/dev-libs/mpfr-3.1.2_p5 b/metadata/md5-cache/dev-libs/mpfr-3.1.2_p5
new file mode 100644
index 000000000000..8eeb920e0606
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/mpfr-3.1.2_p5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst preinst prepare
+DEPEND=>=dev-libs/gmp-4.1.4-r2[static-libs?]
+DESCRIPTION=library for multiple-precision floating-point computations with exact rounding
+EAPI=3
+HOMEPAGE=http://www.mpfr.org/
+IUSE=static-libs
+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
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-libs/gmp-4.1.4-r2[static-libs?]
+SLOT=0
+SRC_URI=http://www.mpfr.org/mpfr-3.1.2/mpfr-3.1.2.tar.xz
+_eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=c6708fd3a3c92a4f439fd4555977339b
diff --git a/metadata/md5-cache/dev-ml/extlib-1.6.1 b/metadata/md5-cache/dev-ml/extlib-1.6.1
index f62e0987b54f..6aea92005efe 100644
--- a/metadata/md5-cache/dev-ml/extlib-1.6.1
+++ b/metadata/md5-cache/dev-ml/extlib-1.6.1
@@ -4,10 +4,10 @@ DESCRIPTION=Standard library extensions for O'Caml
 EAPI=5
 HOMEPAGE=http://code.google.com/p/ocaml-extlib/
 IUSE=doc +ocamlopt
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-lang/ocaml-3.10.2:=[ocamlopt?]
 SLOT=0/1.6.1
 SRC_URI=http://ocaml-extlib.googlecode.com/files/extlib-1.6.1.tar.gz
 _eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	findlib	9cf6020ee5481f39f1aa566a323f9868	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=2fe1aa4681f5236a65ac9b9b46e28400
+_md5_=dbadd3548a99a1ae27d6af380239a490
diff --git a/metadata/md5-cache/dev-ml/pomap-3.0.3 b/metadata/md5-cache/dev-ml/pomap-3.0.3
index 9a6ee1b0b578..4ef83812d6b8 100644
--- a/metadata/md5-cache/dev-ml/pomap-3.0.3
+++ b/metadata/md5-cache/dev-ml/pomap-3.0.3
@@ -4,10 +4,10 @@ DESCRIPTION=Partially Ordered Map ADT for O'Caml
 EAPI=5
 HOMEPAGE=http://bitbucket.org/mmottl/pomap
 IUSE=examples +ocamlopt debug doc
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc ~x86
 LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?]
 SLOT=0/3.0.3
 SRC_URI=http://bitbucket.org/mmottl/pomap/downloads/pomap-3.0.3.tar.gz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	af81d52c25ec93fbdff71e0efb0de7b7	findlib	9cf6020ee5481f39f1aa566a323f9868	multilib	fac675dcccf94392371a6abee62d909f	oasis	d59efb9f3ae0e24a1932b2147425fb8d	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=0108325b542fe071497d92ba8ee5d510
+_md5_=2f7f760c2b5ccd73583565a462443aed
diff --git a/metadata/md5-cache/dev-ml/res-4.0.4 b/metadata/md5-cache/dev-ml/res-4.0.4
index b9c9d0f9e869..9cd936291736 100644
--- a/metadata/md5-cache/dev-ml/res-4.0.4
+++ b/metadata/md5-cache/dev-ml/res-4.0.4
@@ -4,10 +4,10 @@ DESCRIPTION=Resizable Array and Buffer modules for O'Caml
 EAPI=5
 HOMEPAGE=http://bitbucket.org/mmottl/res
 IUSE=examples +ocamlopt debug doc
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc ~x86
 LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?]
 SLOT=0/4.0.4
 SRC_URI=https://bitbucket.org/mmottl/res/downloads/res-4.0.4.tar.gz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	af81d52c25ec93fbdff71e0efb0de7b7	findlib	9cf6020ee5481f39f1aa566a323f9868	multilib	fac675dcccf94392371a6abee62d909f	oasis	d59efb9f3ae0e24a1932b2147425fb8d	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=4ab10cbfd4dd9e79d41583e35223ef5b
+_md5_=1617c639ca11aa89d99e9bbb4eca71c8
diff --git a/metadata/md5-cache/dev-perl/Geo-IP-1.400.0 b/metadata/md5-cache/dev-perl/Geo-IP-1.400.0
deleted file mode 100644
index 2e7202ff4ea5..000000000000
--- a/metadata/md5-cache/dev-perl/Geo-IP-1.400.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-libs/geoip || ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
-DESCRIPTION=Look up country by IP Address
-EAPI=4
-HOMEPAGE=http://search.cpan.org/dist/Geo-IP/
-KEYWORDS=alpha amd64 hppa ia64 ppc sparc x86 ~x86-fbsd
-LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
-RDEPEND=dev-libs/geoip || ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/B/BO/BORISZ/Geo-IP-1.40.tar.gz
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	af81d52c25ec93fbdff71e0efb0de7b7	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	1d50a6ea2d8d319e3205b005b3ed0dfa	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=94fa1b7014774555b05c8778c29cb5cb
diff --git a/metadata/md5-cache/dev-perl/Geo-IP-1.410.0 b/metadata/md5-cache/dev-perl/Geo-IP-1.410.0
deleted file mode 100644
index c5018469f023..000000000000
--- a/metadata/md5-cache/dev-perl/Geo-IP-1.410.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-libs/geoip dev-lang/perl:=[-build(-)]
-DESCRIPTION=Look up country by IP Address
-EAPI=5
-HOMEPAGE=http://search.cpan.org/dist/Geo-IP/
-KEYWORDS=alpha amd64 hppa ia64 ppc sparc x86 ~x86-fbsd
-LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
-RDEPEND=dev-libs/geoip dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/B/BO/BORISZ/Geo-IP-1.41.tar.gz
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	af81d52c25ec93fbdff71e0efb0de7b7	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	1d50a6ea2d8d319e3205b005b3ed0dfa	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=8fd44c55f90b0d203db66cde3d66b427
diff --git a/metadata/md5-cache/dev-python/cvxopt-1.1.6 b/metadata/md5-cache/dev-python/cvxopt-1.1.6
deleted file mode 100644
index 694277911a7b..000000000000
--- a/metadata/md5-cache/dev-python/cvxopt-1.1.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/blas virtual/cblas virtual/lapack sci-libs/cholmod sci-libs/umfpack dsdp? ( sci-libs/dsdp ) fftw? ( sci-libs/fftw:3.0 ) glpk? ( sci-mathematics/glpk:= ) gsl? ( sci-libs/gsl ) virtual/pkgconfig doc? ( dev-python/sphinx ) 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=Python package for convex optimization
-EAPI=5
-HOMEPAGE=http://cvxopt.org/
-IUSE=doc +dsdp examples fftw +glpk gsl python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-3
-RDEPEND=virtual/blas virtual/cblas virtual/lapack sci-libs/cholmod sci-libs/umfpack dsdp? ( sci-libs/dsdp ) fftw? ( sci-libs/fftw:3.0 ) glpk? ( sci-mathematics/glpk:= ) gsl? ( sci-libs/gsl ) 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=https://github.com/cvxopt/cvxopt/archive/1.1.6.tar.gz -> cvxopt-1.1.6.tar.gz
-_eclasses_=distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	af81d52c25ec93fbdff71e0efb0de7b7	multibuild	56d4120419072116417e8de1bd1040ff	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	3bb814ab7959a36067101a6bef683b6f	python-utils-r1	18d8279a3382bf4453e7ff35208ce907	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=a5bb96303d506220bf96f68ef4f4eb7a
diff --git a/metadata/md5-cache/dev-python/cvxopt-1.1.6-r2 b/metadata/md5-cache/dev-python/cvxopt-1.1.6-r2
new file mode 100644
index 000000000000..9ec44dd8c3c0
--- /dev/null
+++ b/metadata/md5-cache/dev-python/cvxopt-1.1.6-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=virtual/blas virtual/cblas virtual/lapack sci-libs/cholmod:0= sci-libs/umfpack:0= dsdp? ( sci-libs/dsdp:0= ) fftw? ( sci-libs/fftw:3.0= ) glpk? ( sci-mathematics/glpk:0= ) gsl? ( sci-libs/gsl:0= ) virtual/pkgconfig doc? ( dev-python/sphinx ) 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=Python package for convex optimization
+EAPI=5
+HOMEPAGE=http://cvxopt.org/
+IUSE=doc +dsdp examples fftw +glpk gsl python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-3
+RDEPEND=virtual/blas virtual/cblas virtual/lapack sci-libs/cholmod:0= sci-libs/umfpack:0= dsdp? ( sci-libs/dsdp:0= ) fftw? ( sci-libs/fftw:3.0= ) glpk? ( sci-mathematics/glpk:0= ) gsl? ( sci-libs/gsl:0= ) 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=https://github.com/cvxopt/cvxopt/archive/1.1.6.tar.gz -> cvxopt-1.1.6.tar.gz
+_eclasses_=distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	af81d52c25ec93fbdff71e0efb0de7b7	multibuild	56d4120419072116417e8de1bd1040ff	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	3bb814ab7959a36067101a6bef683b6f	python-utils-r1	18d8279a3382bf4453e7ff35208ce907	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=8f36ef9c797360ffa20d3b21e8bd4af7
diff --git a/metadata/md5-cache/dev-python/django-extensions-1.3.3 b/metadata/md5-cache/dev-python/django-extensions-1.3.3
new file mode 100644
index 000000000000..84f6f41759b6
--- /dev/null
+++ b/metadata/md5-cache/dev-python/django-extensions-1.3.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-)] doc? ( dev-python/sphinx[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-)] dev-python/pygments[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-)] ) test? ( >=dev-python/django-1.5.4[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),mysql?,postgres?,sqlite?] dev-python/six[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-)] dev-python/pygments[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-)] dev-python/werkzeug[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-)] graphviz? ( dev-python/pygraphviz[python_targets_python2_6(-)?,-python_single_target_python2_6(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) s3? ( dev-python/boto[python_targets_python2_6(-)?,-python_single_target_python2_6(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) vcard? ( dev-python/vobject[python_targets_python2_6(-)?,-python_single_target_python2_6(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) 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_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_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-)]
+DESCRIPTION=Django Command Extensions
+EAPI=5
+HOMEPAGE=http://github.com/django-extensions/django-extensions http://code.google.com/p/django-command-extensions/
+IUSE=doc graphviz mysql postgres s3 sqlite test vcard python_targets_python2_6 python_targets_python2_7 python_targets_python3_3
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD || ( MIT GPL-2 )
+RDEPEND=>=dev-python/django-1.5.4[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),mysql?,postgres?,sqlite?] dev-python/six[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-)] dev-python/pygments[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-)] dev-python/werkzeug[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-)] graphviz? ( dev-python/pygraphviz[python_targets_python2_6(-)?,-python_single_target_python2_6(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) s3? ( dev-python/boto[python_targets_python2_6(-)?,-python_single_target_python2_6(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) vcard? ( dev-python/vobject[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_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_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-)]
+REQUIRED_USE=graphviz? ( || ( python_targets_python2_6 python_targets_python2_7 ) ) s3? ( || ( python_targets_python2_6 python_targets_python2_7 ) ) vcard? ( || ( python_targets_python2_6 python_targets_python2_7 ) ) || ( python_targets_python2_6 python_targets_python2_7 python_targets_python3_3 )
+SLOT=0
+SRC_URI=http://github.com/django-extensions/django-extensions/tarball/1.3.3/django-extensions-1.3.3.tgz
+_eclasses_=distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	af81d52c25ec93fbdff71e0efb0de7b7	multibuild	56d4120419072116417e8de1bd1040ff	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	3bb814ab7959a36067101a6bef683b6f	python-utils-r1	18d8279a3382bf4453e7ff35208ce907	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=fee4a4db8b6092318a2c5166cbb3f29a
diff --git a/metadata/md5-cache/dev-python/numpy-1.8.0-r1 b/metadata/md5-cache/dev-python/numpy-1.8.0-r1
index 3edd401c3bf8..b4af53839576 100644
--- a/metadata/md5-cache/dev-python/numpy-1.8.0-r1
+++ b/metadata/md5-cache/dev-python/numpy-1.8.0-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/n/numpy/numpy-1.8.0.tar.gz doc? ( http://docs.scipy.org/doc/numpy-1.8.0/numpy-html-1.8.0.zip http://docs.scipy.org/doc/numpy-1.8.0/numpy-ref-1.8.0.pdf http://docs.scipy.org/doc/numpy-1.8.0/numpy-user-1.8.0.pdf )
 _eclasses_=distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	af81d52c25ec93fbdff71e0efb0de7b7	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	fortran-2	db8710b355fc5598015c4bc3aad3bdb0	multibuild	56d4120419072116417e8de1bd1040ff	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	3bb814ab7959a36067101a6bef683b6f	python-utils-r1	18d8279a3382bf4453e7ff35208ce907	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=c2debe591683089273a240a84a2aaf03
+_md5_=ef5140aaf9d5a2a7787ae63aba92a12e
diff --git a/metadata/md5-cache/dev-python/py-amqp-1.4.4 b/metadata/md5-cache/dev-python/py-amqp-1.4.4
new file mode 100644
index 000000000000..2bd075e4595e
--- /dev/null
+++ b/metadata/md5-cache/dev-python/py-amqp-1.4.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=test? ( virtual/python-unittest2[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(-)] dev-python/nose[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(-)] dev-python/nose-cover3[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(-)] >=dev-python/coverage-3.0[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(-)] dev-python/mock[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(-)] doc? ( dev-python/sphinx[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(-)] >=dev-python/sphinxcontrib-issuetracker-0.9[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(-)] ) ) 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=Low-level AMQP client for Python (fork of amqplib)
+EAPI=5
+HOMEPAGE=https://github.com/celery/py-amqp http://pypi.python.org/pypi/amqp/
+IUSE=doc examples extras test python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_pypy2_0
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-3
+RDEPEND=python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) 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 )
+SLOT=0
+SRC_URI=mirror://pypi/a/amqp/amqp-1.4.4.tar.gz
+_eclasses_=distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	af81d52c25ec93fbdff71e0efb0de7b7	multibuild	56d4120419072116417e8de1bd1040ff	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	3bb814ab7959a36067101a6bef683b6f	python-utils-r1	18d8279a3382bf4453e7ff35208ce907	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=72f5ec3957450ef10c52917fa212bffc
diff --git a/metadata/md5-cache/dev-python/python-gnupg-0.3.1-r1 b/metadata/md5-cache/dev-python/python-gnupg-0.3.1-r1
deleted file mode 100644
index 2d7bd7315f14..000000000000
--- a/metadata/md5-cache/dev-python/python-gnupg-0.3.1-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=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=Python wrapper for GNU Privacy Guard
-EAPI=5
-HOMEPAGE=http://code.google.com/p/python-gnupg/
-IUSE=python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_pypy2_0
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=app-crypt/gnupg 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=http://python-gnupg.googlecode.com/files/python-gnupg-0.3.1.tar.gz
-_eclasses_=distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	af81d52c25ec93fbdff71e0efb0de7b7	multibuild	56d4120419072116417e8de1bd1040ff	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	3bb814ab7959a36067101a6bef683b6f	python-utils-r1	18d8279a3382bf4453e7ff35208ce907	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=7d82e721212b0bf4d8e1e3f417a61882
diff --git a/metadata/md5-cache/dev-python/python-gnupg-0.3.2 b/metadata/md5-cache/dev-python/python-gnupg-0.3.2
deleted file mode 100644
index 631f284d295f..000000000000
--- a/metadata/md5-cache/dev-python/python-gnupg-0.3.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=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=Python wrapper for GNU Privacy Guard
-EAPI=5
-HOMEPAGE=http://code.google.com/p/python-gnupg/
-IUSE=python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_pypy2_0
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=app-crypt/gnupg 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 )
-SLOT=0
-SRC_URI=http://python-gnupg.googlecode.com/files/python-gnupg-0.3.2.tar.gz
-_eclasses_=distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	af81d52c25ec93fbdff71e0efb0de7b7	multibuild	56d4120419072116417e8de1bd1040ff	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	3bb814ab7959a36067101a6bef683b6f	python-utils-r1	18d8279a3382bf4453e7ff35208ce907	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=aa900b56a31e14769ee49f6822ccca7e
diff --git a/metadata/md5-cache/dev-python/pythonmagick-0.9.8 b/metadata/md5-cache/dev-python/pythonmagick-0.9.8
index 68797d88e79a..0728801c620a 100644
--- a/metadata/md5-cache/dev-python/pythonmagick-0.9.8
+++ b/metadata/md5-cache/dev-python/pythonmagick-0.9.8
@@ -9,4 +9,4 @@ RDEPEND=>=dev-libs/boost-1.48[python] >=media-gfx/imagemagick-6.4 || ( =dev-lang
 SLOT=0
 SRC_URI=http://www.imagemagick.org/download/python/PythonMagick-0.9.8.tar.xz
 _eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	af81d52c25ec93fbdff71e0efb0de7b7	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python	be9965681d83c3980660a2660ac95e95	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=648fea20b9be8cb083870e05785768c8
+_md5_=3380b5bc423c60f4d4605efa13ddd73e
diff --git a/metadata/md5-cache/dev-python/sqlalchemy-0.9.1 b/metadata/md5-cache/dev-python/sqlalchemy-0.9.1
index 7f557f74da97..7d921559e2bd 100644
--- a/metadata/md5-cache/dev-python/sqlalchemy-0.9.1
+++ b/metadata/md5-cache/dev-python/sqlalchemy-0.9.1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/S/SQLAlchemy/SQLAlchemy-0.9.1.tar.gz
 _eclasses_=distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	af81d52c25ec93fbdff71e0efb0de7b7	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	multibuild	56d4120419072116417e8de1bd1040ff	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	3bb814ab7959a36067101a6bef683b6f	python-utils-r1	18d8279a3382bf4453e7ff35208ce907	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=a31eb14d6a4e82b77e278c34c2941e9f
+_md5_=98641f2eab71114d24d0279aab2592cc
diff --git a/metadata/md5-cache/dev-python/sqlalchemy-0.9.2 b/metadata/md5-cache/dev-python/sqlalchemy-0.9.2
index f191cdc1a871..26b542ec7450 100644
--- a/metadata/md5-cache/dev-python/sqlalchemy-0.9.2
+++ b/metadata/md5-cache/dev-python/sqlalchemy-0.9.2
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/S/SQLAlchemy/SQLAlchemy-0.9.2.tar.gz
 _eclasses_=distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	af81d52c25ec93fbdff71e0efb0de7b7	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	multibuild	56d4120419072116417e8de1bd1040ff	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	3bb814ab7959a36067101a6bef683b6f	python-utils-r1	18d8279a3382bf4453e7ff35208ce907	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=c45f397949abd5ff1ba23f071ef85862
+_md5_=7ad55b56104ce5f662dd9fa2eafabe2b
diff --git a/metadata/md5-cache/dev-ruby/colorize-0.7.0 b/metadata/md5-cache/dev-ruby/colorize-0.7.0
new file mode 100644
index 000000000000..e91338bb8f46
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/colorize-0.7.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=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_ruby19? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/rdoc[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rake[ruby_targets_jruby] ) ) 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_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=Add some methods to set color, background color and text effect on console easier
+EAPI=5
+HOMEPAGE=https://github.com/fazibear/colorize http://colorize.rubyforge.org
+IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby doc test test
+KEYWORDS=~amd64
+LICENSE=GPL-2+
+RDEPEND=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_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_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby )
+SLOT=0
+SRC_URI=mirror://rubygems/colorize-0.7.0.gem
+_eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	java-utils-2	8d0d93b7a8605ea346cce4604f6db516	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	4021487250c740e3dc16b181228db818	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=047d0988085219b6a2fc0605978c5265
diff --git a/metadata/md5-cache/dev-ruby/domain_name-0.5.14 b/metadata/md5-cache/dev-ruby/domain_name-0.5.14
deleted file mode 100644
index b6325dc75ab2..000000000000
--- a/metadata/md5-cache/dev-ruby/domain_name-0.5.14
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby18? ( >=dev-ruby/unf-0.0.5-r1:0[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >=dev-ruby/unf-0.0.5-r1:0[ruby_targets_ruby19] ) ruby_targets_jruby? ( >=dev-ruby/unf-0.0.5-r1:0[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby18] dev-ruby/shoulda[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby19] dev-ruby/shoulda[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_jruby] dev-ruby/shoulda[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] ) 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=Domain Name manipulation library for Ruby
-EAPI=5
-HOMEPAGE=https://github.com/knu/ruby-domain_name
-IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_jruby test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
-LICENSE=BSD-2
-RDEPEND=ruby_targets_ruby18? ( >=dev-ruby/unf-0.0.5-r1:0[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >=dev-ruby/unf-0.0.5-r1:0[ruby_targets_ruby19] ) ruby_targets_jruby? ( >=dev-ruby/unf-0.0.5-r1: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=0
-SRC_URI=mirror://rubygems/domain_name-0.5.14.gem
-_eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	java-utils-2	8d0d93b7a8605ea346cce4604f6db516	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	4021487250c740e3dc16b181228db818	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=d6d0550a0461e9e11488fa8bc6b3b4bd
diff --git a/metadata/md5-cache/dev-ruby/domain_name-0.5.15 b/metadata/md5-cache/dev-ruby/domain_name-0.5.15
deleted file mode 100644
index 2c4e6abdbc49..000000000000
--- a/metadata/md5-cache/dev-ruby/domain_name-0.5.15
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby18? ( >=dev-ruby/unf-0.0.5-r1:0[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >=dev-ruby/unf-0.0.5-r1:0[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/unf-0.0.5-r1:0[ruby_targets_ruby20] ) ruby_targets_jruby? ( >=dev-ruby/unf-0.0.5-r1:0[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby18] dev-ruby/shoulda[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby19] dev-ruby/shoulda[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby20] dev-ruby/shoulda[ruby_targets_ruby20] ) ) ruby_targets_jruby? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_jruby] dev-ruby/shoulda[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? ( 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=Domain Name manipulation library for Ruby
-EAPI=5
-HOMEPAGE=https://github.com/knu/ruby-domain_name
-IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
-LICENSE=BSD-2
-RDEPEND=ruby_targets_ruby18? ( >=dev-ruby/unf-0.0.5-r1:0[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >=dev-ruby/unf-0.0.5-r1:0[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/unf-0.0.5-r1:0[ruby_targets_ruby20] ) ruby_targets_jruby? ( >=dev-ruby/unf-0.0.5-r1:0[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? ( 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/domain_name-0.5.15.gem
-_eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	java-utils-2	8d0d93b7a8605ea346cce4604f6db516	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	4021487250c740e3dc16b181228db818	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=6fe21db8509cc36a62cc96b860f7f35b
diff --git a/metadata/md5-cache/dev-ruby/domain_name-0.5.17 b/metadata/md5-cache/dev-ruby/domain_name-0.5.17
new file mode 100644
index 000000000000..e7942b53b1dc
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/domain_name-0.5.17
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby19? ( >=dev-ruby/unf-0.0.5-r1:0[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/unf-0.0.5-r1:0[ruby_targets_ruby20] ) ruby_targets_jruby? ( >=dev-ruby/unf-0.0.5-r1:0[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby19] dev-ruby/shoulda[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby20] dev-ruby/shoulda[ruby_targets_ruby20] ) ) ruby_targets_jruby? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_jruby] dev-ruby/shoulda[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+DESCRIPTION=Domain Name manipulation library for Ruby
+EAPI=5
+HOMEPAGE=https://github.com/knu/ruby-domain_name
+IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby test
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+LICENSE=BSD-2
+RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/unf-0.0.5-r1:0[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/unf-0.0.5-r1:0[ruby_targets_ruby20] ) ruby_targets_jruby? ( >=dev-ruby/unf-0.0.5-r1:0[ruby_targets_jruby] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) 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_ruby19 ruby_targets_ruby20 ruby_targets_jruby )
+SLOT=0
+SRC_URI=mirror://rubygems/domain_name-0.5.17.gem
+_eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	java-utils-2	8d0d93b7a8605ea346cce4604f6db516	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	4021487250c740e3dc16b181228db818	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=ac3bb96d037408204e3f09a5b2613ce6
diff --git a/metadata/md5-cache/dev-ruby/lumberjack-1.0.5 b/metadata/md5-cache/dev-ruby/lumberjack-1.0.5
new file mode 100644
index 000000000000..7ed9302304c0
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/lumberjack-1.0.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[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=A simple, powerful, and very fast logging utility
+EAPI=5
+HOMEPAGE=http://github.com/bdurand/lumberjack
+IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=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=0
+SRC_URI=mirror://rubygems/lumberjack-1.0.5.gem
+_eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	java-utils-2	8d0d93b7a8605ea346cce4604f6db516	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	4021487250c740e3dc16b181228db818	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=4fb7a753af7e89ec3abf6724ca41065f
diff --git a/metadata/md5-cache/dev-ruby/mercenary-0.3.2 b/metadata/md5-cache/dev-ruby/mercenary-0.3.2
new file mode 100644
index 000000000000..8d10f030d77d
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/mercenary-0.3.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) 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_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rspec:2[ruby_targets_jruby] ) ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+DESCRIPTION=Lightweight and flexible library for writing command-line apps
+EAPI=5
+HOMEPAGE=https://github.com/jekyll/mercenary
+IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby doc test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) 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_ruby19 ruby_targets_ruby20 ruby_targets_jruby )
+SLOT=0
+SRC_URI=mirror://rubygems/mercenary-0.3.2.gem
+_eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	java-utils-2	8d0d93b7a8605ea346cce4604f6db516	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	4021487250c740e3dc16b181228db818	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=f7160ffb9c88eeade3961b562230de83
diff --git a/metadata/md5-cache/dev-ruby/oauth-0.4.7 b/metadata/md5-cache/dev-ruby/oauth-0.4.7
index dc65da99d66e..d0e88e93bb2d 100644
--- a/metadata/md5-cache/dev-ruby/oauth-0.4.7
+++ b/metadata/md5-cache/dev-ruby/oauth-0.4.7
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby18? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby18] dev-ruby/mocha:0.12[ruby_targets_ruby18] dev-ruby/webmock[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( dev-ruby/test-unit:2[ruby_targets_ree18] dev-ruby/mocha:0.12[ruby_targets_ree18] dev-ruby/webmock[ruby_targets_ree18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby19] dev-ruby/mocha:0.12[ruby_targets_ruby19] dev-ruby/webmock[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( test? ( dev-ruby/test-unit:2[ruby_targets_jruby] dev-ruby/mocha:0.12[ruby_targets_jruby] dev-ruby/webmock[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise: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_ree18? ( test? ( dev-ruby/rake[ruby_targets_ree18] ) ) 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_ree18? ( virtual/rubygems[ruby_targets_ree18] ) 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_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+DEPEND=ruby_targets_ruby18? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby18] dev-ruby/mocha:0.12[ruby_targets_ruby18] dev-ruby/webmock[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby19] dev-ruby/mocha:0.12[ruby_targets_ruby19] dev-ruby/webmock[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( test? ( dev-ruby/test-unit:2[ruby_targets_jruby] dev-ruby/mocha:0.12[ruby_targets_jruby] dev-ruby/webmock[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? ( 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=A RubyGem for implementing both OAuth clients and servers.
 EAPI=4
 HOMEPAGE=http://oauth.rubyforge.org/
-IUSE=elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 ruby_targets_ruby19 ruby_targets_jruby test test
+IUSE=elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_jruby test test
 KEYWORDS=~amd64 ~x86 ~x86-macos
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise: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_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ree18 ruby_targets_ruby19 ruby_targets_jruby )
+RDEPEND=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=0
 SRC_URI=mirror://rubygems/oauth-0.4.7.gem
 _eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	java-utils-2	8d0d93b7a8605ea346cce4604f6db516	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	4021487250c740e3dc16b181228db818	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=c0fd6786d4842adcd9fa444dea80d0a3
+_md5_=1fd4b72d4159bb082599dac43b29bc0b
diff --git a/metadata/md5-cache/dev-ruby/redcarpet-3.1.1 b/metadata/md5-cache/dev-ruby/redcarpet-3.1.1
new file mode 100644
index 000000000000..796ac2a50101
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/redcarpet-3.1.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby19? ( test? ( dev-ruby/nokogiri[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/nokogiri[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) 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=A Ruby wrapper for Upskirt.
+EAPI=5
+HOMEPAGE=https://github.com/vmg/redcarpet
+IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 doc test test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=MIT
+RDEPEND=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=0
+SRC_URI=https://github.com/vmg/redcarpet/archive/v3.1.1.tar.gz -> redcarpet-3.1.1.tar.gz
+_eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	java-utils-2	8d0d93b7a8605ea346cce4604f6db516	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	4021487250c740e3dc16b181228db818	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=be94fb94b4a6cfb7d8056f37122faa65
diff --git a/metadata/md5-cache/dev-ruby/sexp_processor-4.4.3 b/metadata/md5-cache/dev-ruby/sexp_processor-4.4.3
new file mode 100644
index 000000000000..907e50ed5639
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/sexp_processor-4.4.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby19? ( test? ( dev-ruby/hoe[ruby_targets_ruby19] dev-ruby/hoe-seattlerb[ruby_targets_ruby19] dev-ruby/minitest[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/hoe[ruby_targets_ruby20] dev-ruby/hoe-seattlerb[ruby_targets_ruby20] dev-ruby/minitest[ruby_targets_ruby20] ) ) ruby_targets_jruby? ( test? ( dev-ruby/hoe[ruby_targets_jruby] dev-ruby/hoe-seattlerb[ruby_targets_jruby] dev-ruby/minitest[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) 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_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rake[ruby_targets_jruby] ) ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+DESCRIPTION=Processor for s-expressions created as part of the ParseTree project.
+EAPI=5
+HOMEPAGE=http://www.zenspider.com/ZSS/Products/ParseTree/
+IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby doc test test
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) 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_ruby19 ruby_targets_ruby20 ruby_targets_jruby )
+SLOT=4
+SRC_URI=mirror://rubygems/sexp_processor-4.4.3.gem
+_eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	java-utils-2	8d0d93b7a8605ea346cce4604f6db516	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	4021487250c740e3dc16b181228db818	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=75fe9157635def9314036e559fc6586b
diff --git a/metadata/md5-cache/dev-ruby/snmplib-1.1.0 b/metadata/md5-cache/dev-ruby/snmplib-1.1.0
deleted file mode 100644
index 6c8130b933af..000000000000
--- a/metadata/md5-cache/dev-ruby/snmplib-1.1.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) )
-DESCRIPTION=SNMP library implemented in pure Ruby
-EAPI=4
-HOMEPAGE=http://snmplib.rubyforge.org/
-IUSE=elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 test test
-KEYWORDS=amd64 ppc x86
-LICENSE=Ruby
-RDEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 )
-SLOT=0
-SRC_URI=mirror://rubygems/snmp-1.1.0.gem
-_eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	java-utils-2	8d0d93b7a8605ea346cce4604f6db516	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	4021487250c740e3dc16b181228db818	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=a01e9d184fd653921b69f4416a5d7338
diff --git a/metadata/md5-cache/dev-ruby/syntax-1.0.0-r4 b/metadata/md5-cache/dev-ruby/syntax-1.0.0-r4
index db2f09541c2f..708f44ac3d7e 100644
--- a/metadata/md5-cache/dev-ruby/syntax-1.0.0-r4
+++ b/metadata/md5-cache/dev-ruby/syntax-1.0.0-r4
@@ -4,11 +4,11 @@ DESCRIPTION=Syntax highlighting for sourcecode and HTML
 EAPI=5
 HOMEPAGE=http://syntax.rubyforge.org
 IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby test
-KEYWORDS=~alpha ~amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-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 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD
 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/syntax-1.0.0.gem
 _eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	java-utils-2	8d0d93b7a8605ea346cce4604f6db516	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	4021487250c740e3dc16b181228db818	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=7e5ba6b37b855178282528cd846eb1f7
+_md5_=0da4751c05ed00f0eae12d129208f34f
diff --git a/metadata/md5-cache/dev-tex/feynmf-1.08-r3 b/metadata/md5-cache/dev-tex/feynmf-1.08-r3
index 97b3b3319660..b49f8daf8b7d 100644
--- a/metadata/md5-cache/dev-tex/feynmf-1.08-r3
+++ b/metadata/md5-cache/dev-tex/feynmf-1.08-r3
@@ -1,12 +1,13 @@
-DEFINED_PHASES=compile install postinst postrm unpack
+DEFINED_PHASES=compile configure install postinst postrm prepare unpack
 DEPEND=dev-texlive/texlive-metapost dev-lang/perl virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DESCRIPTION=Combined LaTeX/Metafont package for drawing of Feynman diagrams
+EAPI=5
 HOMEPAGE=http://www.ctan.org/tex-archive/macros/latex/contrib/feynmf/
 IUSE=doc
 KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
+LICENSE=GPL-2+
 RDEPEND=dev-texlive/texlive-metapost virtual/latex-base
 SLOT=0
-SRC_URI=mirror://gentoo/feynmf-1.08.tar.gz doc? ( mirror://gentoo/feynmf-cnl.tar.gz )
+SRC_URI=http://dev.gentoo.org/~ulm/distfiles/feynmf-1.08.tar.gz doc? ( http://dev.gentoo.org/~ulm/distfiles/feynmf-cnl.tar.gz )
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	af81d52c25ec93fbdff71e0efb0de7b7	latex-package	999c52f495ebb8dd3b69bda982bb2817	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=50b8f201a1151dd59086e025af6c2760
+_md5_=8cae7352f8ecb2e13e190dce5001fef8
diff --git a/metadata/md5-cache/dev-util/cmake-2.8.12.2 b/metadata/md5-cache/dev-util/cmake-2.8.12.2
index f8ab4e4763a3..1fd1d26fb83e 100644
--- a/metadata/md5-cache/dev-util/cmake-2.8.12.2
+++ b/metadata/md5-cache/dev-util/cmake-2.8.12.2
@@ -4,11 +4,11 @@ DESCRIPTION=Cross platform Make
 EAPI=5
 HOMEPAGE=http://www.cmake.org/
 IUSE=emacs ncurses qt4 qt5 test
-KEYWORDS=~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~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 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=CMake
 RDEPEND=>=app-arch/libarchive-2.8.0:= >=dev-libs/expat-2.0.1 >=net-misc/curl-7.20.0-r1[ssl] sys-libs/zlib virtual/pkgconfig ncurses? ( sys-libs/ncurses ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) emacs? ( virtual/emacs )
 REQUIRED_USE=?? ( qt4 qt5 )
 SLOT=0
 SRC_URI=http://www.cmake.org/files/v2.8/cmake-2.8.12.2.tar.gz
 _eclasses_=bash-completion-r1	db412e427e3317ffd3e15f17df269c5e	cmake-utils	f28d5be602208540bebed26c4d22c61f	elisp-common	cec01e54df1bfd2fcca76a13ce2b2d27	eutils	af81d52c25ec93fbdff71e0efb0de7b7	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=8977c6321d9dbe79fc6850bc6af77037
+_md5_=a4256c7e3413fa5c290365aa1a546fa5
diff --git a/metadata/md5-cache/dev-util/gdbus-codegen-2.38.2 b/metadata/md5-cache/dev-util/gdbus-codegen-2.38.2
index 0d7ba2ad778b..2a5d3e0388c2 100644
--- a/metadata/md5-cache/dev-util/gdbus-codegen-2.38.2
+++ b/metadata/md5-cache/dev-util/gdbus-codegen-2.38.2
@@ -4,7 +4,7 @@ DESCRIPTION=GDBus code and documentation generator
 EAPI=5
 HOMEPAGE=http://www.gtk.org/
 IUSE=python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-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 ~x64-macos
 LICENSE=LGPL-2+
 PDEPEND=>=dev-libs/glib-2.38.2: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(-)] 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(-)]
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://gnome/sources/glib/2.38/glib-2.38.2.tar.xz
 _eclasses_=distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	af81d52c25ec93fbdff71e0efb0de7b7	gnome.org	8fef8f967214f56e08fa92d61163d891	multibuild	56d4120419072116417e8de1bd1040ff	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	3bb814ab7959a36067101a6bef683b6f	python-utils-r1	18d8279a3382bf4453e7ff35208ce907	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=cf81c661c4d7e0b285cadc83eee4e7d6
+_md5_=c51390597a7ccfff76512b7a514aa194
diff --git a/metadata/md5-cache/dev-vcs/stgit-0.16-r2 b/metadata/md5-cache/dev-vcs/stgit-0.16-r2
index b5f37ba45bce..b427ba62db55 100644
--- a/metadata/md5-cache/dev-vcs/stgit-0.16-r2
+++ b/metadata/md5-cache/dev-vcs/stgit-0.16-r2
@@ -4,11 +4,11 @@ DESCRIPTION=Manage a stack of patches using GIT as a backend
 EAPI=5
 HOMEPAGE=http://www.procode.org/stgit/
 IUSE=doc python_targets_python2_7
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=dev-vcs/git-1.6.3.3 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://download.gna.org/stgit/stgit-0.16.tar.gz mirror://gentoo/stgit-0.16-missing-patches.tar.gz
 _eclasses_=bash-completion-r1	db412e427e3317ffd3e15f17df269c5e	distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	af81d52c25ec93fbdff71e0efb0de7b7	multibuild	56d4120419072116417e8de1bd1040ff	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	3bb814ab7959a36067101a6bef683b6f	python-utils-r1	18d8279a3382bf4453e7ff35208ce907	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=464f681c601c1125111c3451697354a0
+_md5_=fee124d45b2759f685b722107142352a
diff --git a/metadata/md5-cache/dev-vcs/stgit-0.17.1 b/metadata/md5-cache/dev-vcs/stgit-0.17.1
new file mode 100644
index 000000000000..a32f01bc0e29
--- /dev/null
+++ b/metadata/md5-cache/dev-vcs/stgit-0.17.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=>=dev-vcs/git-1.6.3.3 doc? ( app-text/asciidoc app-text/xmlto dev-lang/perl ) userland_GNU? ( >=sys-apps/coreutils-8.5 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Manage a stack of patches using GIT as a backend
+EAPI=5
+HOMEPAGE=http://www.procode.org/stgit/
+IUSE=doc python_targets_python2_7
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=>=dev-vcs/git-1.6.3.3 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=http://download.gna.org/stgit/stgit-0.17.1.tar.gz
+_eclasses_=bash-completion-r1	db412e427e3317ffd3e15f17df269c5e	distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	af81d52c25ec93fbdff71e0efb0de7b7	multibuild	56d4120419072116417e8de1bd1040ff	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	3bb814ab7959a36067101a6bef683b6f	python-utils-r1	18d8279a3382bf4453e7ff35208ce907	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=15f5d8b5b1632890a90a52bf4a03c566
diff --git a/metadata/md5-cache/media-gfx/sane-backends-1.0.24-r3 b/metadata/md5-cache/media-gfx/sane-backends-1.0.24-r3
index c1b5725a53ad..196bd79a5f18 100644
--- a/metadata/md5-cache/media-gfx/sane-backends-1.0.24-r3
+++ b/metadata/md5-cache/media-gfx/sane-backends-1.0.24-r3
@@ -3,7 +3,7 @@ DEPEND=sane_backends_dc210? ( virtual/jpeg ) sane_backends_dc240? ( virtual/jpeg
 DESCRIPTION=Scanner Access Now Easy - Backends
 EAPI=5
 HOMEPAGE=http://www.sane-project.org/
-IUSE=avahi doc gphoto2 ipv6 threads usb v4l xinetd snmp systemd +sane_backends_abaton +sane_backends_agfafocus +sane_backends_apple +sane_backends_artec +sane_backends_artec_eplus48u +sane_backends_as6e +sane_backends_avision +sane_backends_bh +sane_backends_canon +sane_backends_canon630u +sane_backends_canon_dr +sane_backends_canon_pp +sane_backends_cardscan +sane_backends_coolscan +sane_backends_coolscan2 +sane_backends_coolscan3 +sane_backends_dc210 +sane_backends_dc240 +sane_backends_dc25 +sane_backends_dell1600n_net +sane_backends_dmc +sane_backends_epjitsu +sane_backends_epson +sane_backends_epson2 +sane_backends_fujitsu +sane_backends_genesys +sane_backends_gt68xx +sane_backends_hp +sane_backends_hp3500 +sane_backends_hp3900 +sane_backends_hp4200 +sane_backends_hp5400 +sane_backends_hp5590 +sane_backends_hpljm1005 +sane_backends_hpsj5s +sane_backends_hs2p +sane_backends_ibm +sane_backends_kodak +sane_backends_kodakaio +sane_backends_kvs1025 +sane_backends_kvs20xx sane_backends_kvs40xx +sane_backends_leo +sane_backends_lexmark +sane_backends_ma1509 +sane_backends_magicolor +sane_backends_matsushita +sane_backends_microtek +sane_backends_microtek2 +sane_backends_mustek +sane_backends_mustek_pp +sane_backends_mustek_usb sane_backends_mustek_usb2 +sane_backends_nec +sane_backends_net +sane_backends_niash +sane_backends_p5 +sane_backends_pie +sane_backends_pixma +sane_backends_plustek +sane_backends_plustek_pp -sane_backends_pnm +sane_backends_qcam +sane_backends_ricoh +sane_backends_rts8891 +sane_backends_s9036 +sane_backends_sceptre +sane_backends_sharp +sane_backends_sm3600 +sane_backends_sm3840 +sane_backends_snapscan +sane_backends_sp15c +sane_backends_st400 +sane_backends_stv680 +sane_backends_tamarack +sane_backends_teco1 +sane_backends_teco2 +sane_backends_teco3 +sane_backends_test +sane_backends_u12 +sane_backends_umax +sane_backends_umax1220u +sane_backends_umax_pp +sane_backends_xerox_mfp
+IUSE=avahi doc gphoto2 ipv6 threads usb v4l xinetd snmp systemd +sane_backends_abaton +sane_backends_agfafocus +sane_backends_apple +sane_backends_artec +sane_backends_artec_eplus48u +sane_backends_as6e +sane_backends_avision +sane_backends_bh +sane_backends_canon +sane_backends_canon630u +sane_backends_canon_dr -sane_backends_canon_pp +sane_backends_cardscan +sane_backends_coolscan +sane_backends_coolscan2 +sane_backends_coolscan3 +sane_backends_dc210 +sane_backends_dc240 +sane_backends_dc25 +sane_backends_dell1600n_net +sane_backends_dmc +sane_backends_epjitsu +sane_backends_epson +sane_backends_epson2 +sane_backends_fujitsu +sane_backends_genesys +sane_backends_gt68xx +sane_backends_hp +sane_backends_hp3500 +sane_backends_hp3900 +sane_backends_hp4200 +sane_backends_hp5400 +sane_backends_hp5590 +sane_backends_hpljm1005 -sane_backends_hpsj5s +sane_backends_hs2p +sane_backends_ibm +sane_backends_kodak +sane_backends_kodakaio +sane_backends_kvs1025 +sane_backends_kvs20xx sane_backends_kvs40xx +sane_backends_leo +sane_backends_lexmark +sane_backends_ma1509 +sane_backends_magicolor +sane_backends_matsushita +sane_backends_microtek +sane_backends_microtek2 +sane_backends_mustek -sane_backends_mustek_pp +sane_backends_mustek_usb sane_backends_mustek_usb2 +sane_backends_nec +sane_backends_net +sane_backends_niash +sane_backends_p5 +sane_backends_pie +sane_backends_pixma +sane_backends_plustek +sane_backends_plustek_pp -sane_backends_pnm +sane_backends_qcam +sane_backends_ricoh +sane_backends_rts8891 +sane_backends_s9036 +sane_backends_sceptre +sane_backends_sharp +sane_backends_sm3600 +sane_backends_sm3840 +sane_backends_snapscan +sane_backends_sp15c +sane_backends_st400 +sane_backends_stv680 +sane_backends_tamarack +sane_backends_teco1 +sane_backends_teco2 +sane_backends_teco3 +sane_backends_test +sane_backends_u12 +sane_backends_umax +sane_backends_umax1220u +sane_backends_umax_pp +sane_backends_xerox_mfp
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2 public-domain
 RDEPEND=sane_backends_dc210? ( virtual/jpeg ) sane_backends_dc240? ( virtual/jpeg ) sane_backends_dell1600n_net? ( virtual/jpeg media-libs/tiff ) avahi? ( >=net-dns/avahi-0.6.24 ) sane_backends_canon_pp? ( sys-libs/libieee1284 ) sane_backends_hpsj5s? ( sys-libs/libieee1284 ) sane_backends_mustek_pp? ( sys-libs/libieee1284 ) usb? ( virtual/libusb:1 ) gphoto2? ( media-libs/libgphoto2:= virtual/jpeg ) v4l? ( media-libs/libv4l ) xinetd? ( sys-apps/xinetd ) snmp? ( net-analyzer/net-snmp ) systemd? ( sys-apps/systemd ) !<sys-fs/udev-114
@@ -11,4 +11,4 @@ REQUIRED_USE=sane_backends_mustek_usb2? ( threads ) sane_backends_kvs40xx? ( thr
 SLOT=0
 SRC_URI=https://alioth.debian.org/frs/download.php/file/3958/sane-backends-1.0.24.tar.gz
 _eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	af81d52c25ec93fbdff71e0efb0de7b7	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=b00ab9b89fb1255f559bbbca30756479
+_md5_=a479d64e3be02ffb83ad37c2694879dd
diff --git a/metadata/md5-cache/media-libs/x265-9999 b/metadata/md5-cache/media-libs/x265-9999
index 8c5d26eb2e5b..15743dd17910 100644
--- a/metadata/md5-cache/media-libs/x265-9999
+++ b/metadata/md5-cache/media-libs/x265-9999
@@ -7,4 +7,4 @@ IUSE=+10bit test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi
 LICENSE=GPL-2
 SLOT=0/9
 _eclasses_=cmake-multilib	8339f7796a9fe34e9c2e8d5288e183e8	cmake-utils	f28d5be602208540bebed26c4d22c61f	eutils	af81d52c25ec93fbdff71e0efb0de7b7	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	mercurial	6bb94b704fb44f17b02994ca3fa756a9	multibuild	56d4120419072116417e8de1bd1040ff	multilib	fac675dcccf94392371a6abee62d909f	multilib-build	198e1c7095dbce1ca2848aed0f96bf60	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=71d4b744158e8e32c542f8fde102ecc3
+_md5_=25f265549affafe5acbc64669b6148dc
diff --git a/metadata/md5-cache/net-dns/nsd-3.2.17 b/metadata/md5-cache/net-dns/nsd-3.2.17
new file mode 100644
index 000000000000..178093bfdf6e
--- /dev/null
+++ b/metadata/md5-cache/net-dns/nsd-3.2.17
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install setup
+DEPEND=dev-libs/openssl virtual/yacc sys-devel/flex
+DESCRIPTION=An authoritative only, high performance, open source name server
+EAPI=4
+HOMEPAGE=http://www.nlnetlabs.nl/projects/nsd
+IUSE=bind8-stats ipv6 minimal-responses mmap +nsec3 ratelimit root-server runtime-checks zone-stats
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-libs/openssl virtual/yacc
+SLOT=0
+SRC_URI=http://www.nlnetlabs.nl/downloads/nsd/nsd-3.2.17.tar.gz
+_eclasses_=user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=4792c4545d570b469b5bcc6bf5938e75
diff --git a/metadata/md5-cache/net-dns/nsd-4.0.3 b/metadata/md5-cache/net-dns/nsd-4.0.3
new file mode 100644
index 000000000000..31218def951d
--- /dev/null
+++ b/metadata/md5-cache/net-dns/nsd-4.0.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare setup
+DEPEND=dev-libs/openssl virtual/yacc libevent? ( dev-libs/libevent ) ssl? ( dev-libs/openssl ) munin? ( net-analyzer/munin ) sys-devel/flex
+DESCRIPTION=An authoritative only, high performance, open source name server
+EAPI=4
+HOMEPAGE=http://www.nlnetlabs.nl/projects/nsd
+IUSE=bind8-stats ipv6 libevent minimal-responses mmap munin +nsec3 ratelimit root-server runtime-checks ssl
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-libs/openssl virtual/yacc libevent? ( dev-libs/libevent ) ssl? ( dev-libs/openssl ) munin? ( net-analyzer/munin )
+SLOT=0
+SRC_URI=http://www.nlnetlabs.nl/downloads/nsd/nsd-4.0.3.tar.gz
+_eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=317c2be41ff4dff576d6af1a05557e2e
diff --git a/metadata/md5-cache/net-ftp/lftp-4.4.14 b/metadata/md5-cache/net-ftp/lftp-4.4.14
deleted file mode 100644
index ea6482c8fdeb..000000000000
--- a/metadata/md5-cache/net-ftp/lftp-4.4.14
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=sys-libs/ncurses-5.1 >=sys-libs/readline-5.1 dev-libs/expat sys-libs/zlib convert-mozilla-cookies? ( dev-perl/DBI ) socks5? ( >=net-proxy/dante-1.1.12 virtual/pam ) ssl? ( gnutls? ( >=net-libs/gnutls-1.2.3 ) openssl? ( >=dev-libs/openssl-0.9.6 ) ) verify-file? ( dev-perl/string-crc32 virtual/perl-Digest-MD5 ) =sys-devel/libtool-2* app-arch/xz-utils nls? ( sys-devel/gettext ) 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
-DESCRIPTION=A sophisticated ftp/sftp/http/https/torrent client and file transfer program
-EAPI=5
-HOMEPAGE=http://lftp.yar.ru/
-IUSE=convert-mozilla-cookies +gnutls nls openssl socks5 +ssl verify-file linguas_cs linguas_de linguas_es linguas_fr linguas_it linguas_ja linguas_ko linguas_pl linguas_pt_BR linguas_ru linguas_zh_CN linguas_zh_HK linguas_zh_TW
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
-LICENSE=GPL-3
-RDEPEND=>=sys-libs/ncurses-5.1 >=sys-libs/readline-5.1 dev-libs/expat sys-libs/zlib convert-mozilla-cookies? ( dev-perl/DBI ) socks5? ( >=net-proxy/dante-1.1.12 virtual/pam ) ssl? ( gnutls? ( >=net-libs/gnutls-1.2.3 ) openssl? ( >=dev-libs/openssl-0.9.6 ) ) verify-file? ( dev-perl/string-crc32 virtual/perl-Digest-MD5 )
-REQUIRED_USE=ssl? ( ^^ ( openssl gnutls ) )
-SLOT=0
-SRC_URI=http://lftp.yar.ru/ftp/lftp-4.4.14.tar.xz
-_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	af81d52c25ec93fbdff71e0efb0de7b7	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=cc235981c195f345f5c744fa0fdef9ae
diff --git a/metadata/md5-cache/net-ftp/lftp-4.4.99.20140317 b/metadata/md5-cache/net-ftp/lftp-4.4.99.20140317
deleted file mode 100644
index 53c1e4dbf11b..000000000000
--- a/metadata/md5-cache/net-ftp/lftp-4.4.99.20140317
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=sys-libs/ncurses-5.1 >=sys-libs/readline-5.1 dev-libs/expat sys-libs/zlib convert-mozilla-cookies? ( dev-perl/DBI ) socks5? ( >=net-proxy/dante-1.1.12 virtual/pam ) ssl? ( gnutls? ( >=net-libs/gnutls-1.2.3 ) openssl? ( >=dev-libs/openssl-0.9.6 ) ) verify-file? ( dev-perl/string-crc32 virtual/perl-Digest-MD5 ) =sys-devel/libtool-2* nls? ( sys-devel/gettext ) 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
-DESCRIPTION=A sophisticated ftp/sftp/http/https/torrent client and file transfer program
-EAPI=5
-HOMEPAGE=http://lftp.yar.ru/
-IUSE=convert-mozilla-cookies +gnutls nls openssl socks5 +ssl verify-file linguas_cs linguas_de linguas_es linguas_fr linguas_it linguas_ja linguas_ko linguas_pl linguas_pt_BR linguas_ru linguas_zh_CN linguas_zh_HK linguas_zh_TW
-LICENSE=GPL-3
-RDEPEND=>=sys-libs/ncurses-5.1 >=sys-libs/readline-5.1 dev-libs/expat sys-libs/zlib convert-mozilla-cookies? ( dev-perl/DBI ) socks5? ( >=net-proxy/dante-1.1.12 virtual/pam ) ssl? ( gnutls? ( >=net-libs/gnutls-1.2.3 ) openssl? ( >=dev-libs/openssl-0.9.6 ) ) verify-file? ( dev-perl/string-crc32 virtual/perl-Digest-MD5 )
-REQUIRED_USE=ssl? ( ^^ ( openssl gnutls ) )
-SLOT=0
-SRC_URI=http://lftp.yar.ru/ftp/devel/lftp-4.4.99.20140317.tar.gz
-_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	af81d52c25ec93fbdff71e0efb0de7b7	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=f8191e71127577f0774b0da14293dd09
diff --git a/metadata/md5-cache/net-misc/lksctp-tools-1.0.11-r1 b/metadata/md5-cache/net-misc/lksctp-tools-1.0.11-r1
deleted file mode 100644
index 63003865f57f..000000000000
--- a/metadata/md5-cache/net-misc/lksctp-tools-1.0.11-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=sys-kernel/linux-headers-2.6
-DESCRIPTION=Tools for Linux Kernel Stream Control Transmission Protocol implementation
-EAPI=4
-HOMEPAGE=http://lksctp.sourceforge.net/
-IUSE=kernel_linux static-libs
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2
-REQUIRED_USE=kernel_linux
-SLOT=0
-SRC_URI=mirror://sourceforge/lksctp/lksctp-tools-1.0.11.tar.gz
-_eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=1cc754132e3ce714e0fcb9364a3d8ddf
diff --git a/metadata/md5-cache/net-misc/lksctp-tools-1.0.16 b/metadata/md5-cache/net-misc/lksctp-tools-1.0.16
new file mode 100644
index 000000000000..96f95d22d481
--- /dev/null
+++ b/metadata/md5-cache/net-misc/lksctp-tools-1.0.16
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=sys-kernel/linux-headers-2.6 !<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=Tools for Linux Kernel Stream Control Transmission Protocol implementation
+EAPI=5
+HOMEPAGE=http://lksctp.sourceforge.net/
+IUSE=kernel_linux static-libs
+KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=|| ( GPL-2+ LGPL-2.1 )
+REQUIRED_USE=kernel_linux
+SLOT=0
+SRC_URI=mirror://sourceforge/lksctp/lksctp-tools-1.0.16.tar.gz
+_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	autotools-utils	fb74970befc9b65ceec689d2ccff3022	eutils	af81d52c25ec93fbdff71e0efb0de7b7	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=10b9068b57fc20c0467bba775b31c36f
diff --git a/metadata/md5-cache/net-misc/youtube-dl-2014.03.25.1 b/metadata/md5-cache/net-misc/youtube-dl-2014.03.25.1
new file mode 100644
index 000000000000..a1ba01a15b3d
--- /dev/null
+++ b/metadata/md5-cache/net-misc/youtube-dl-2014.03.25.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-python/setuptools[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?,python_single_target_python3_3(+)?] test? ( dev-python/nose[coverage(+)] ) 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 ) python_single_target_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_3(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?,python_single_target_python3_3(+)?]
+DESCRIPTION=Download videos from YouTube.com (and mores sites...)
+EAPI=5
+HOMEPAGE=http://rg3.github.com/youtube-dl/
+IUSE=offensive test python_targets_python2_6 python_targets_python2_7 python_targets_python3_3 python_single_target_python2_6 python_single_target_python2_7 python_single_target_python3_3
+KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+LICENSE=public-domain
+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 ) python_single_target_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_3(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?,python_single_target_python3_3(+)?]
+REQUIRED_USE=python_single_target_python2_6? ( python_targets_python2_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_3? ( python_targets_python3_3 ) ^^ ( python_single_target_python2_6 python_single_target_python2_7 python_single_target_python3_3 )
+SLOT=0
+SRC_URI=http://youtube-dl.org/downloads/2014.03.25.1/youtube-dl-2014.03.25.1.tar.gz
+_eclasses_=bash-completion-r1	db412e427e3317ffd3e15f17df269c5e	distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	af81d52c25ec93fbdff71e0efb0de7b7	multilib	fac675dcccf94392371a6abee62d909f	python-single-r1	82a55861314bbcedaf1e08ed4dd651b3	python-utils-r1	18d8279a3382bf4453e7ff35208ce907	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=7125d920466d48178bdb60b3faa02b6a
diff --git a/metadata/md5-cache/net-wireless/chirp-0.4.0 b/metadata/md5-cache/net-wireless/chirp-0.4.0
new file mode 100644
index 000000000000..8fe27dee1ca5
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/chirp-0.4.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/pyserial dev-libs/libxml2[python] userland_GNU? ( >=sys-apps/coreutils-8.5 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Free open-source tool for programming your amateur radio
+EAPI=5
+HOMEPAGE=http://chirp.danplanet.com
+IUSE=python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-python/pyserial dev-libs/libxml2[python] dev-python/pygtk python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+RESTRICT=test
+SLOT=0
+SRC_URI=http://chirp.danplanet.com/download/0.4.0/chirp-0.4.0.tar.gz
+_eclasses_=distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	af81d52c25ec93fbdff71e0efb0de7b7	multibuild	56d4120419072116417e8de1bd1040ff	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	3bb814ab7959a36067101a6bef683b6f	python-utils-r1	18d8279a3382bf4453e7ff35208ce907	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=8ae92788fa1ff7842b8f5ca03994e9c8
diff --git a/metadata/md5-cache/net-wireless/chirp-9999 b/metadata/md5-cache/net-wireless/chirp-9999
index 57a2f92f83d4..fa30951b1270 100644
--- a/metadata/md5-cache/net-wireless/chirp-9999
+++ b/metadata/md5-cache/net-wireless/chirp-9999
@@ -1,10 +1,12 @@
-DEFINED_PHASES=compile install postinst postrm prepare setup test unpack
-DEPEND=dev-python/pyserial dev-libs/libxml2[python] || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) dev-vcs/mercurial
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=dev-python/pyserial dev-libs/libxml2[python] userland_GNU? ( >=sys-apps/coreutils-8.5 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-vcs/mercurial
 DESCRIPTION=Free open-source tool for programming your amateur radio
 EAPI=5
 HOMEPAGE=http://chirp.danplanet.com
+IUSE=python_targets_python2_7
 LICENSE=GPL-3
-RDEPEND=dev-python/pyserial dev-libs/libxml2[python] dev-python/pygtk || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
+RDEPEND=dev-python/pyserial dev-libs/libxml2[python] dev-python/pygtk python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=distutils	34e0f373c466bb0e97ba194735f1acf2	eutils	af81d52c25ec93fbdff71e0efb0de7b7	mercurial	6bb94b704fb44f17b02994ca3fa756a9	multilib	fac675dcccf94392371a6abee62d909f	python	be9965681d83c3980660a2660ac95e95	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=64628bbf15b91cfd859ea3ebac52473e
+_eclasses_=distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	af81d52c25ec93fbdff71e0efb0de7b7	mercurial	6bb94b704fb44f17b02994ca3fa756a9	multibuild	56d4120419072116417e8de1bd1040ff	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	3bb814ab7959a36067101a6bef683b6f	python-utils-r1	18d8279a3382bf4453e7ff35208ce907	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=bb48688e3ca056ab9bccc06ac0045eb3
diff --git a/metadata/md5-cache/perl-core/version-0.990.800 b/metadata/md5-cache/perl-core/version-0.990.800
new file mode 100644
index 000000000000..4c61482c65f0
--- /dev/null
+++ b/metadata/md5-cache/perl-core/version-0.990.800
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=dev-lang/perl:=[-build(-)]
+DESCRIPTION=Perl extension for Version Objects
+EAPI=5
+HOMEPAGE=http://search.cpan.org/dist/version/
+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=|| ( Artistic GPL-1 GPL-2 GPL-3 )
+RDEPEND=dev-lang/perl:=[-build(-)]
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/J/JP/JPEACOCK/version-0.9908.tar.gz
+_eclasses_=alternatives	326031758c86cd08f5844f475f03ac01	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	af81d52c25ec93fbdff71e0efb0de7b7	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	1d50a6ea2d8d319e3205b005b3ed0dfa	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=39851f181404359cf0a899477ebad2b5
diff --git a/metadata/md5-cache/sci-chemistry/ccpn-2.3.1_p140325 b/metadata/md5-cache/sci-chemistry/ccpn-2.3.1_p140325
new file mode 100644
index 000000000000..90175a66f4dc
--- /dev/null
+++ b/metadata/md5-cache/sci-chemistry/ccpn-2.3.1_p140325
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install prepare setup
+DEPEND=python_single_target_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6[ssl,tk] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ssl,tk] ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] dev-lang/tk[threads] dev-python/numpy[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] dev-tcltk/tix =sci-libs/ccpn-data-2.3.1*[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] sci-biology/psipred x11-libs/libXext x11-libs/libX11 opengl? ( media-libs/freeglut dev-python/pyglet[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] )
+DESCRIPTION=The Collaborative Computing Project for NMR
+EAPI=5
+HOMEPAGE=http://www.ccpn.ac.uk/ccpn
+IUSE=+opengl python_targets_python2_6 python_targets_python2_7 python_single_target_python2_6 python_single_target_python2_7
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=|| ( CCPN LGPL-2.1 )
+RDEPEND=python_single_target_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6[ssl,tk] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ssl,tk] ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] dev-lang/tk[threads] dev-python/numpy[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] dev-tcltk/tix =sci-libs/ccpn-data-2.3.1*[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] sci-biology/psipred x11-libs/libXext x11-libs/libX11 opengl? ( media-libs/freeglut dev-python/pyglet[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] )
+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 )
+RESTRICT=mirror
+SLOT=0
+SRC_URI=http://www-old.ccpn.ac.uk/download/ccpnmr/analysis2.3.1r2.tar.gz http://dev.gentoo.org/~jlec/distfiles/ccpn-update-2.3.1-140325.patch.xz
+_eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	multilib	fac675dcccf94392371a6abee62d909f	portability	536c5e70c5fb252ed3b769e04aa3f05b	python-single-r1	82a55861314bbcedaf1e08ed4dd651b3	python-utils-r1	18d8279a3382bf4453e7ff35208ce907	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=4fcbfade18a07f13ca2745ff6f7cbc46
diff --git a/metadata/md5-cache/sci-libs/scipy-0.13.3 b/metadata/md5-cache/sci-libs/scipy-0.13.3
index 7ddf7ae79520..e4fa9d095726 100644
--- a/metadata/md5-cache/sci-libs/scipy-0.13.3
+++ b/metadata/md5-cache/sci-libs/scipy-0.13.3
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://sourceforge/scipy/scipy-0.13.3.tar.gz doc? ( http://docs.scipy.org/doc/scipy-0.13.0/scipy-html.zip -> scipy-0.13.0-html.zip http://docs.scipy.org/doc/scipy-0.13.0/scipy-ref.pdf -> scipy-0.13.0-ref.pdf )
 _eclasses_=distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	af81d52c25ec93fbdff71e0efb0de7b7	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	fortran-2	db8710b355fc5598015c4bc3aad3bdb0	multibuild	56d4120419072116417e8de1bd1040ff	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	3bb814ab7959a36067101a6bef683b6f	python-utils-r1	18d8279a3382bf4453e7ff35208ce907	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=4ff70ba3d1631da17dde2fb4ba7288cb
+_md5_=edc9e9f3c03ce4a0dc0cf312e5868fa4
diff --git a/metadata/md5-cache/sys-apps/netplug-1.2.9-r5 b/metadata/md5-cache/sys-apps/netplug-1.2.9-r5
deleted file mode 100644
index 491d21c994b9..000000000000
--- a/metadata/md5-cache/sys-apps/netplug-1.2.9-r5
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DESCRIPTION=Brings up/down ethernet ports automatically with cable detection
-HOMEPAGE=http://www.red-bean.com/~bos/
-KEYWORDS=amd64 arm ppc sparc x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://www.red-bean.com/~bos/netplug/netplug-1.2.9.tar.bz2
-_eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=acd385eaedbdd85cc94d73d2129fb9d0
diff --git a/metadata/md5-cache/sys-apps/netplug-1.2.9.1 b/metadata/md5-cache/sys-apps/netplug-1.2.9.1
deleted file mode 100644
index 30d8844ba1f7..000000000000
--- a/metadata/md5-cache/sys-apps/netplug-1.2.9.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=doc? ( app-text/ghostscript-gpl media-gfx/graphviz )
-DESCRIPTION=Brings up/down ethernet ports automatically with cable detection
-EAPI=2
-HOMEPAGE=http://www.red-bean.com/~bos/
-IUSE=debug doc
-KEYWORDS=~amd64 ~arm ~ppc ~sparc ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://www.red-bean.com/~bos/netplug/netplug-1.2.9.1.tar.bz2
-_eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=05a770d6fcc7add2194a7789aa3c125c
diff --git a/metadata/md5-cache/sys-apps/netplug-1.2.9.2-r1 b/metadata/md5-cache/sys-apps/netplug-1.2.9.2-r1
index 7fb125db51cc..2b714fbf442a 100644
--- a/metadata/md5-cache/sys-apps/netplug-1.2.9.2-r1
+++ b/metadata/md5-cache/sys-apps/netplug-1.2.9.2-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=compile install prepare
 DEPEND=doc? ( app-text/ghostscript-gpl media-gfx/graphviz )
 DESCRIPTION=Brings up/down ethernet ports automatically with cable detection
-EAPI=4
+EAPI=5
 HOMEPAGE=http://www.red-bean.com/~bos/
 IUSE=debug doc
 KEYWORDS=amd64 arm ~mips ppc sparc x86
@@ -9,4 +9,4 @@ LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.red-bean.com/~bos/netplug/netplug-1.2.9.2.tar.bz2
 _eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=53d522c898bb4aec81006c7fe041e43c
+_md5_=99275689254dd7653abecaf1c0d30a8c
diff --git a/metadata/md5-cache/sys-apps/portage-2.1.11.62 b/metadata/md5-cache/sys-apps/portage-2.1.11.62
deleted file mode 100644
index 595ab2856e56..000000000000
--- a/metadata/md5-cache/sys-apps/portage-2.1.11.62
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=python3? ( =dev-lang/python-3* ) !pypy2_0? ( !python2? ( !python3? ( || ( >=dev-lang/python-2.7 dev-lang/python:2.6[threads] ) ) ) ) pypy2_0? ( !python2? ( !python3? ( virtual/pypy:2.0[bzip2] ) ) ) python2? ( !python3? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] ) ) ) python_targets_pypy2_0? ( virtual/pypy:2.0 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=sys-devel/make-3.82 >=sys-apps/sed-4.0.5 sys-devel/patch doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) epydoc? ( >=dev-python/epydoc-2.0 !<=dev-python/pysqlite-2.4.1 )
-DESCRIPTION=Portage is the package management and distribution system for Gentoo
-EAPI=2
-HOMEPAGE=http://www.gentoo.org/proj/en/portage/index.xml
-IUSE=build doc epydoc +ipc linguas_pl linguas_ru pypy2_0 python2 python3 selinux xattr python_targets_pypy2_0 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 python_targets_python2_6 python_targets_python2_7
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd
-LICENSE=GPL-2
-PDEPEND=!build? ( >=net-misc/rsync-2.6.4 userland_GNU? ( >=sys-apps/coreutils-6.4 ) )
-RDEPEND=python3? ( =dev-lang/python-3* ) !pypy2_0? ( !python2? ( !python3? ( || ( >=dev-lang/python-2.7 dev-lang/python:2.6[threads] ) ) ) ) pypy2_0? ( !python2? ( !python3? ( virtual/pypy:2.0[bzip2] ) ) ) python2? ( !python3? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] ) ) ) python_targets_pypy2_0? ( virtual/pypy:2.0 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) !build? ( >=sys-apps/sed-4.0.5 || ( >=app-shells/bash-4.2_p37[readline] ( <app-shells/bash-4.2_p37 >=app-shells/bash-3.2_p17 ) ) >=app-admin/eselect-1.2 || ( python3? ( =dev-lang/python-3*[ssl] ) !pypy2_0? ( !python2? ( !python3? ( || ( >=dev-lang/python-2.7[ssl] dev-lang/python:2.6[threads,ssl] ) ) ) ) pypy2_0? ( !python2? ( !python3? ( virtual/pypy:2.0[bzip2] ) ) ) python2? ( !python3? ( || ( dev-lang/python:2.7[ssl] dev-lang/python:2.6[ssl,threads] ) ) ) dev-python/python-mhash ) ) elibc_FreeBSD? ( sys-freebsd/freebsd-bin ) elibc_glibc? ( >=sys-apps/sandbox-2.2 ) elibc_uclibc? ( >=sys-apps/sandbox-2.2 ) >=app-misc/pax-utils-0.1.17 xattr? ( kernel_linux? ( || ( >=dev-lang/python-3.3_pre20110902 dev-python/pyxattr ) ) ) selinux? ( || ( >=sys-libs/libselinux-2.0.94[python] <sys-libs/libselinux-2.0.94 ) ) !<app-shells/bash-3.2_p17 !<app-admin/logrotate-3.8.0
-SLOT=0
-SRC_URI=mirror://gentoo/portage-2.1.11.62.tar.bz2 http://dev.gentoo.org/~zmedico/portage/archives/portage-2.1.11.62.tar.bz2 linguas_pl? ( mirror://gentoo/portage-man-pl-2.1.2.tar.bz2 http://dev.gentoo.org/~zmedico/portage/archives/portage-man-pl-2.1.2.tar.bz2 )
-_eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=61ff32950df7ae5509e8a2e333e6d0f2
diff --git a/metadata/md5-cache/sys-apps/portage-2.1.6.7_p1 b/metadata/md5-cache/sys-apps/portage-2.1.6.7_p1
index 74041df333cd..b81c7fcee734 100644
--- a/metadata/md5-cache/sys-apps/portage-2.1.6.7_p1
+++ b/metadata/md5-cache/sys-apps/portage-2.1.6.7_p1
@@ -3,11 +3,11 @@ DEPEND=>=dev-lang/python-2.4 <dev-lang/python-3 >=sys-apps/sed-4.0.5 sys-devel/p
 DESCRIPTION=Portage is the package management and distribution system for Gentoo
 HOMEPAGE=http://www.gentoo.org/proj/en/portage/index.xml
 IUSE=build doc epydoc less linguas_pl
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd
+KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd
 LICENSE=GPL-2
 PDEPEND=!build? ( less? ( sys-apps/less ) >=net-misc/rsync-2.6.4 userland_GNU? ( >=sys-apps/coreutils-6.4 ) )
 RDEPEND=>=dev-lang/python-2.4 <dev-lang/python-3 !build? ( >=sys-apps/sed-4.0.5 >=app-shells/bash-3.2_p17 >=app-admin/eselect-1.2 ) elibc_FreeBSD? ( sys-freebsd/freebsd-bin ) elibc_glibc? ( >=sys-apps/sandbox-1.2.17 !mips? ( >=sys-apps/sandbox-1.2.18.1-r2 ) ) elibc_uclibc? ( >=sys-apps/sandbox-1.2.17 !mips? ( >=sys-apps/sandbox-1.2.18.1-r2 ) ) >=app-misc/pax-utils-0.1.17 !>=dev-util/debugedit-4.4.6-r2
 SLOT=0
 SRC_URI=mirror://gentoo/portage-2.1.6.tar.bz2 http://dev.gentoo.org/~zmedico/portage/archives/portage-2.1.6.tar.bz2 linguas_pl? ( mirror://gentoo/portage-man-pl-2.1.2.tar.bz2 http://dev.gentoo.org/~zmedico/portage/archives/portage-man-pl-2.1.2.tar.bz2 ) mirror://gentoo/portage-2.1.6.7.patch.bz2 http://dev.gentoo.org/~zmedico/portage/archives/portage-2.1.6.7.patch.bz2 mirror://gentoo/portage-2.1.6.7_p1.patch.bz2 http://dev.gentoo.org/~zmedico/portage/archives/portage-2.1.6.7_p1.patch.bz2
 _eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=f6fbbe3c789206ba406d96789cd790eb
+_md5_=8ef99dca43eb7403b3da2a77c3bc4b03
diff --git a/metadata/md5-cache/sys-apps/portage-2.2.8 b/metadata/md5-cache/sys-apps/portage-2.2.10
similarity index 95%
rename from metadata/md5-cache/sys-apps/portage-2.2.8
rename to metadata/md5-cache/sys-apps/portage-2.2.10
index 3df67590aed5..284b5e39fa79 100644
--- a/metadata/md5-cache/sys-apps/portage-2.2.8
+++ b/metadata/md5-cache/sys-apps/portage-2.2.10
@@ -9,6 +9,6 @@ LICENSE=GPL-2
 PDEPEND=!build? ( >=net-misc/rsync-2.6.4 userland_GNU? ( >=sys-apps/coreutils-6.4 ) )
 RDEPEND=python3? ( =dev-lang/python-3* ) !pypy2_0? ( !python2? ( !python3? ( || ( >=dev-lang/python-2.7 dev-lang/python:2.6[threads] ) ) ) ) pypy2_0? ( !python2? ( !python3? ( virtual/pypy:2.0[bzip2] ) ) ) python2? ( !python3? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] ) ) ) python_targets_pypy2_0? ( virtual/pypy:2.0 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) !build? ( >=sys-apps/sed-4.0.5 || ( >=app-shells/bash-4.2_p37[readline] ( <app-shells/bash-4.2_p37 >=app-shells/bash-3.2_p17 ) ) >=app-admin/eselect-1.2 || ( python3? ( =dev-lang/python-3*[ssl] ) !pypy2_0? ( !python2? ( !python3? ( || ( >=dev-lang/python-2.7[ssl] dev-lang/python:2.6[threads,ssl] ) ) ) ) pypy2_0? ( !python2? ( !python3? ( virtual/pypy:2.0[bzip2] ) ) ) python2? ( !python3? ( || ( dev-lang/python:2.7[ssl] dev-lang/python:2.6[ssl,threads] ) ) ) dev-python/python-mhash ) ) elibc_FreeBSD? ( sys-freebsd/freebsd-bin ) elibc_glibc? ( >=sys-apps/sandbox-2.2 ) elibc_uclibc? ( >=sys-apps/sandbox-2.2 ) >=app-misc/pax-utils-0.1.17 selinux? ( || ( >=sys-libs/libselinux-2.0.94[python] <sys-libs/libselinux-2.0.94 ) ) xattr? ( kernel_linux? ( python_targets_python2_6? ( dev-python/pyxattr[python_targets_python2_6] ) python_targets_python2_7? ( dev-python/pyxattr[python_targets_python2_7] ) python_targets_python3_2? ( dev-python/pyxattr[python_targets_python3_2] ) python_targets_pypy2_0? ( dev-python/pyxattr[python_targets_pypy2_0] ) ) ) !<app-shells/bash-3.2_p17 !<app-admin/logrotate-3.8.0
 SLOT=0
-SRC_URI=mirror://gentoo/portage-2.2.8.tar.bz2 http://dev.gentoo.org/~dolsen/releases/portage/portage-2.2.8.tar.bz2
+SRC_URI=mirror://gentoo/portage-2.2.10.tar.bz2 http://dev.gentoo.org/~dolsen/releases/portage/portage-2.2.10.tar.bz2
 _eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=ceb784f2cc46d7a96fc600b30d7faa64
+_md5_=0831a641ece9a10c09983207e3381320
diff --git a/metadata/md5-cache/sys-apps/portage-2.2.6 b/metadata/md5-cache/sys-apps/portage-2.2.6
deleted file mode 100644
index 7f4db47b9ac9..000000000000
--- a/metadata/md5-cache/sys-apps/portage-2.2.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst preinst prepare setup test
-DEPEND=python3? ( =dev-lang/python-3* ) !pypy2_0? ( !python2? ( !python3? ( || ( >=dev-lang/python-2.7 dev-lang/python:2.6[threads] ) ) ) ) pypy2_0? ( !python2? ( !python3? ( virtual/pypy:2.0[bzip2] ) ) ) python2? ( !python3? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] ) ) ) python_targets_pypy2_0? ( virtual/pypy:2.0 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=sys-devel/make-3.82 >=sys-apps/sed-4.0.5 sys-devel/patch doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) epydoc? ( >=dev-python/epydoc-2.0 !<=dev-python/pysqlite-2.4.1 )
-DESCRIPTION=Portage is the package management and distribution system for Gentoo
-EAPI=2
-HOMEPAGE=http://www.gentoo.org/proj/en/portage/index.xml
-IUSE=build doc epydoc +ipc linguas_ru pypy2_0 python2 python3 selinux xattr python_targets_pypy2_0 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 python_targets_python2_6 python_targets_python2_7
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
-LICENSE=GPL-2
-PDEPEND=!build? ( >=net-misc/rsync-2.6.4 userland_GNU? ( >=sys-apps/coreutils-6.4 ) )
-RDEPEND=python3? ( =dev-lang/python-3* ) !pypy2_0? ( !python2? ( !python3? ( || ( >=dev-lang/python-2.7 dev-lang/python:2.6[threads] ) ) ) ) pypy2_0? ( !python2? ( !python3? ( virtual/pypy:2.0[bzip2] ) ) ) python2? ( !python3? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] ) ) ) python_targets_pypy2_0? ( virtual/pypy:2.0 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) !build? ( >=sys-apps/sed-4.0.5 || ( >=app-shells/bash-4.2_p37[readline] ( <app-shells/bash-4.2_p37 >=app-shells/bash-3.2_p17 ) ) >=app-admin/eselect-1.2 || ( python3? ( =dev-lang/python-3*[ssl] ) !pypy2_0? ( !python2? ( !python3? ( || ( >=dev-lang/python-2.7[ssl] dev-lang/python:2.6[threads,ssl] ) ) ) ) pypy2_0? ( !python2? ( !python3? ( virtual/pypy:2.0[bzip2] ) ) ) python2? ( !python3? ( || ( dev-lang/python:2.7[ssl] dev-lang/python:2.6[ssl,threads] ) ) ) dev-python/python-mhash ) ) elibc_FreeBSD? ( sys-freebsd/freebsd-bin ) elibc_glibc? ( >=sys-apps/sandbox-2.2 ) elibc_uclibc? ( >=sys-apps/sandbox-2.2 ) >=app-misc/pax-utils-0.1.17 xattr? ( kernel_linux? ( || ( >=dev-lang/python-3.3_pre20110902 dev-python/pyxattr ) ) ) selinux? ( || ( >=sys-libs/libselinux-2.0.94[python] <sys-libs/libselinux-2.0.94 ) ) !<app-shells/bash-3.2_p17 !<app-admin/logrotate-3.8.0
-SLOT=0
-SRC_URI=mirror://gentoo/portage-2.2.6.tar.bz2 http://dev.gentoo.org/~zmedico/portage/archives/portage-2.2.6.tar.bz2
-_eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=76ea25c9dd7dce43a7693d52ff6637d7
diff --git a/metadata/md5-cache/sys-apps/portage-2.2.8-r1 b/metadata/md5-cache/sys-apps/portage-2.2.8-r1
index 21e70a97f437..b1bc5a6b2ccf 100644
--- a/metadata/md5-cache/sys-apps/portage-2.2.8-r1
+++ b/metadata/md5-cache/sys-apps/portage-2.2.8-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Portage is the package management and distribution system for Gentoo
 EAPI=2
 HOMEPAGE=http://www.gentoo.org/proj/en/portage/index.xml
 IUSE=build doc epydoc +ipc linguas_ru pypy2_0 python2 python3 selinux xattr python_targets_pypy2_0 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 python_targets_python2_6 python_targets_python2_7
-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=GPL-2
 PDEPEND=!build? ( >=net-misc/rsync-2.6.4 userland_GNU? ( >=sys-apps/coreutils-6.4 ) )
 RDEPEND=python3? ( =dev-lang/python-3* ) !pypy2_0? ( !python2? ( !python3? ( || ( >=dev-lang/python-2.7 dev-lang/python:2.6[threads] ) ) ) ) pypy2_0? ( !python2? ( !python3? ( virtual/pypy:2.0[bzip2] ) ) ) python2? ( !python3? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] ) ) ) python_targets_pypy2_0? ( virtual/pypy:2.0 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) !build? ( >=sys-apps/sed-4.0.5 || ( >=app-shells/bash-4.2_p37[readline] ( <app-shells/bash-4.2_p37 >=app-shells/bash-3.2_p17 ) ) >=app-admin/eselect-1.2 || ( python3? ( =dev-lang/python-3*[ssl] ) !pypy2_0? ( !python2? ( !python3? ( || ( >=dev-lang/python-2.7[ssl] dev-lang/python:2.6[threads,ssl] ) ) ) ) pypy2_0? ( !python2? ( !python3? ( virtual/pypy:2.0[bzip2] ) ) ) python2? ( !python3? ( || ( dev-lang/python:2.7[ssl] dev-lang/python:2.6[ssl,threads] ) ) ) dev-python/python-mhash ) ) elibc_FreeBSD? ( sys-freebsd/freebsd-bin ) elibc_glibc? ( >=sys-apps/sandbox-2.2 ) elibc_uclibc? ( >=sys-apps/sandbox-2.2 ) >=app-misc/pax-utils-0.1.17 selinux? ( || ( >=sys-libs/libselinux-2.0.94[python] <sys-libs/libselinux-2.0.94 ) ) xattr? ( kernel_linux? ( python_targets_python2_6? ( dev-python/pyxattr[python_targets_python2_6] ) python_targets_python2_7? ( dev-python/pyxattr[python_targets_python2_7] ) python_targets_python3_2? ( dev-python/pyxattr[python_targets_python3_2] ) python_targets_pypy2_0? ( dev-python/pyxattr[python_targets_pypy2_0] ) ) ) !<app-shells/bash-3.2_p17 !<app-admin/logrotate-3.8.0
 SLOT=0
 SRC_URI=mirror://gentoo/portage-2.2.8.tar.bz2 http://dev.gentoo.org/~dolsen/releases/portage/portage-2.2.8.tar.bz2
 _eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=4503531de6f04d0f25c6580eab8ea816
+_md5_=80c0b9e9ac67f7a8da87fc1b2d40f4aa
diff --git a/metadata/md5-cache/sys-apps/portage-2.2.9-r1 b/metadata/md5-cache/sys-apps/portage-2.2.9-r1
deleted file mode 100644
index 4356ac3e8a7b..000000000000
--- a/metadata/md5-cache/sys-apps/portage-2.2.9-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst preinst prepare setup test
-DEPEND=python3? ( =dev-lang/python-3* ) !pypy2_0? ( !python2? ( !python3? ( || ( >=dev-lang/python-2.7 dev-lang/python:2.6[threads] ) ) ) ) pypy2_0? ( !python2? ( !python3? ( virtual/pypy:2.0[bzip2] ) ) ) python2? ( !python3? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] ) ) ) python_targets_pypy2_0? ( virtual/pypy:2.0 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=sys-devel/make-3.82 >=sys-apps/sed-4.0.5 sys-devel/patch doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) epydoc? ( >=dev-python/epydoc-2.0 !<=dev-python/pysqlite-2.4.1 )
-DESCRIPTION=Portage is the package management and distribution system for Gentoo
-EAPI=2
-HOMEPAGE=http://www.gentoo.org/proj/en/portage/index.xml
-IUSE=build doc epydoc +ipc linguas_ru pypy2_0 python2 python3 selinux xattr python_targets_pypy2_0 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 python_targets_python2_6 python_targets_python2_7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
-LICENSE=GPL-2
-PDEPEND=!build? ( >=net-misc/rsync-2.6.4 userland_GNU? ( >=sys-apps/coreutils-6.4 ) )
-RDEPEND=python3? ( =dev-lang/python-3* ) !pypy2_0? ( !python2? ( !python3? ( || ( >=dev-lang/python-2.7 dev-lang/python:2.6[threads] ) ) ) ) pypy2_0? ( !python2? ( !python3? ( virtual/pypy:2.0[bzip2] ) ) ) python2? ( !python3? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] ) ) ) python_targets_pypy2_0? ( virtual/pypy:2.0 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) !build? ( >=sys-apps/sed-4.0.5 || ( >=app-shells/bash-4.2_p37[readline] ( <app-shells/bash-4.2_p37 >=app-shells/bash-3.2_p17 ) ) >=app-admin/eselect-1.2 || ( python3? ( =dev-lang/python-3*[ssl] ) !pypy2_0? ( !python2? ( !python3? ( || ( >=dev-lang/python-2.7[ssl] dev-lang/python:2.6[threads,ssl] ) ) ) ) pypy2_0? ( !python2? ( !python3? ( virtual/pypy:2.0[bzip2] ) ) ) python2? ( !python3? ( || ( dev-lang/python:2.7[ssl] dev-lang/python:2.6[ssl,threads] ) ) ) dev-python/python-mhash ) ) elibc_FreeBSD? ( sys-freebsd/freebsd-bin ) elibc_glibc? ( >=sys-apps/sandbox-2.2 ) elibc_uclibc? ( >=sys-apps/sandbox-2.2 ) >=app-misc/pax-utils-0.1.17 selinux? ( || ( >=sys-libs/libselinux-2.0.94[python] <sys-libs/libselinux-2.0.94 ) ) xattr? ( kernel_linux? ( python_targets_python2_6? ( dev-python/pyxattr[python_targets_python2_6] ) python_targets_python2_7? ( dev-python/pyxattr[python_targets_python2_7] ) python_targets_python3_2? ( dev-python/pyxattr[python_targets_python3_2] ) python_targets_pypy2_0? ( dev-python/pyxattr[python_targets_pypy2_0] ) ) ) !<app-shells/bash-3.2_p17 !<app-admin/logrotate-3.8.0
-SLOT=0
-SRC_URI=mirror://gentoo/portage-2.2.9.tar.bz2 http://dev.gentoo.org/~dolsen/releases/portage/portage-2.2.9.tar.bz2
-_eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=3bd7804f10f71d762bb1337af084cef3
diff --git a/metadata/md5-cache/sys-cluster/nova-2013.2.2 b/metadata/md5-cache/sys-cluster/nova-2013.2.2-r1
similarity index 99%
rename from metadata/md5-cache/sys-cluster/nova-2013.2.2
rename to metadata/md5-cache/sys-cluster/nova-2013.2.2-r1
index 7e2a3f993d60..f9e2be2f0e98 100644
--- a/metadata/md5-cache/sys-cluster/nova-2013.2.2
+++ b/metadata/md5-cache/sys-cluster/nova-2013.2.2-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( mysql postgres sqlite ) || ( kvm xen ) || ( python_targets_pyt
 SLOT=0
 SRC_URI=http://launchpad.net/nova/havana/2013.2.2/+download/nova-2013.2.2.tar.gz
 _eclasses_=distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	af81d52c25ec93fbdff71e0efb0de7b7	multibuild	56d4120419072116417e8de1bd1040ff	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	3bb814ab7959a36067101a6bef683b6f	python-utils-r1	18d8279a3382bf4453e7ff35208ce907	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=bbc7cdc586196a1006fa3617bbc4c3a0
+_md5_=1bcacdb97623f3698303302e4a8ab90f
diff --git a/metadata/md5-cache/sys-fs/udev-211 b/metadata/md5-cache/sys-fs/udev-212
similarity index 95%
rename from metadata/md5-cache/sys-fs/udev-211
rename to metadata/md5-cache/sys-fs/udev-212
index f69d20a1644c..e62bda33591b 100644
--- a/metadata/md5-cache/sys-fs/udev-211
+++ b/metadata/md5-cache/sys-fs/udev-212
@@ -10,6 +10,6 @@ PDEPEND=>=virtual/udev-208 >=sys-apps/hwids-20140304[udev] openrc? ( >=sys-fs/ud
 RDEPEND=>=sys-apps/util-linux-2.20 acl? ( sys-apps/acl ) gudev? ( >=dev-libs/glib-2.22 ) introspection? ( >=dev-libs/gobject-introspection-1.31.1 ) kmod? ( >=sys-apps/kmod-16 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) !<sys-libs/glibc-2.11 !sys-apps/gentoo-systemd-integration !sys-apps/systemd abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r7 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) !<sys-fs/lvm2-2.02.103 !<sec-policy/selinux-base-2.20120725-r10
 RESTRICT=test
 SLOT=0
-SRC_URI=http://www.freedesktop.org/software/systemd/systemd-211.tar.xz
+SRC_URI=http://www.freedesktop.org/software/systemd/systemd-212.tar.xz
 _eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	bash-completion-r1	db412e427e3317ffd3e15f17df269c5e	eutils	af81d52c25ec93fbdff71e0efb0de7b7	libtool	b9b3340e3a19510f0d9f05cfccbf209f	linux-info	90944ede7e9761bd7ef07602acdef9e3	multibuild	56d4120419072116417e8de1bd1040ff	multilib	fac675dcccf94392371a6abee62d909f	multilib-build	198e1c7095dbce1ca2848aed0f96bf60	multilib-minimal	a481090a413ba6970bd9643494ef982f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=badbe443ff19c1d1477fe91781a6c8df
+_md5_=dad68dbb1d9f91a79f0dee5359cc50d5
diff --git a/metadata/md5-cache/sys-fs/udev-9999 b/metadata/md5-cache/sys-fs/udev-9999
index 7e41b12f1121..469e6b15a60b 100644
--- a/metadata/md5-cache/sys-fs/udev-9999
+++ b/metadata/md5-cache/sys-fs/udev-9999
@@ -10,4 +10,4 @@ RDEPEND=>=sys-apps/util-linux-2.20 acl? ( sys-apps/acl ) gudev? ( >=dev-libs/gli
 RESTRICT=test
 SLOT=0
 _eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	bash-completion-r1	db412e427e3317ffd3e15f17df269c5e	eutils	af81d52c25ec93fbdff71e0efb0de7b7	git-2	2027b81a576527fa16bece425941e094	git-r3	6b256c6cd82cd5989bcb82e80a0fbac9	libtool	b9b3340e3a19510f0d9f05cfccbf209f	linux-info	90944ede7e9761bd7ef07602acdef9e3	multibuild	56d4120419072116417e8de1bd1040ff	multilib	fac675dcccf94392371a6abee62d909f	multilib-build	198e1c7095dbce1ca2848aed0f96bf60	multilib-minimal	a481090a413ba6970bd9643494ef982f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=1708f0d00c567a6555e16fe2c6f9c9a0
+_md5_=def29ad80614f5659e3eccf5b5118f53
diff --git a/metadata/md5-cache/sys-fs/udisks-1.0.4-r5 b/metadata/md5-cache/sys-fs/udisks-1.0.4-r5
deleted file mode 100644
index 0a57b083c29b..000000000000
--- a/metadata/md5-cache/sys-fs/udisks-1.0.4-r5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare setup test
-DEPEND=>=dev-libs/dbus-glib-0.100 >=dev-libs/glib-2.30 >=dev-libs/libatasmart-0.19 >=sys-auth/polkit-0.110 >=sys-apps/dbus-1.6 >=sys-apps/sg3_utils-1.27.20090411 >=sys-block/parted-3 >=sys-fs/lvm2-2.02.66 >=virtual/udev-208[gudev] selinux? ( sec-policy/selinux-devicekit ) app-text/docbook-xsl-stylesheets dev-libs/libxslt dev-util/intltool virtual/pkgconfig virtual/pkgconfig
-DESCRIPTION=Daemon providing interfaces to work with storage devices
-EAPI=5
-HOMEPAGE=http://www.freedesktop.org/wiki/Software/udisks
-IUSE=debug nls remote-access selinux
-KEYWORDS=alpha amd64 arm ia64 ~mips ppc ppc64 sh sparc x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/dbus-glib-0.100 >=dev-libs/glib-2.30 >=dev-libs/libatasmart-0.19 >=sys-auth/polkit-0.110 >=sys-apps/dbus-1.6 >=sys-apps/sg3_utils-1.27.20090411 >=sys-block/parted-3 >=sys-fs/lvm2-2.02.66 >=virtual/udev-208[gudev] selinux? ( sec-policy/selinux-devicekit ) >=sys-apps/util-linux-2.20.1-r2 virtual/eject remote-access? ( net-dns/avahi )
-SLOT=0
-SRC_URI=http://hal.freedesktop.org/releases/udisks-1.0.4.tar.gz
-_eclasses_=bash-completion-r1	db412e427e3317ffd3e15f17df269c5e	eutils	af81d52c25ec93fbdff71e0efb0de7b7	linux-info	90944ede7e9761bd7ef07602acdef9e3	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	udev	a9a8d051efb42bfe884c1db82ce161de	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=db049694f66fbfbe0b76cb03edb30657
diff --git a/metadata/md5-cache/sys-fs/udisks-2.1.0 b/metadata/md5-cache/sys-fs/udisks-2.1.0
deleted file mode 100644
index 2f1f087a38a0..000000000000
--- a/metadata/md5-cache/sys-fs/udisks-2.1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=>=dev-libs/glib-2.32 >=dev-libs/libatasmart-0.19 >=sys-auth/polkit-0.110 virtual/acl >=virtual/udev-208[gudev] introspection? ( >=dev-libs/gobject-introspection-1.30 ) selinux? ( sec-policy/selinux-devicekit ) systemd? ( >=sys-apps/systemd-208 ) app-text/docbook-xsl-stylesheets dev-libs/libxslt >=dev-util/gdbus-codegen-2.32 dev-util/intltool >=sys-kernel/linux-headers-3.1 virtual/pkgconfig virtual/pkgconfig virtual/pkgconfig
-DESCRIPTION=Daemon providing interfaces to work with storage devices
-EAPI=5
-HOMEPAGE=http://www.freedesktop.org/wiki/Software/udisks
-IUSE=debug cryptsetup +gptfdisk +introspection selinux systemd
-KEYWORDS=alpha amd64 arm ia64 ~mips ppc ppc64 sh sparc x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.32 >=dev-libs/libatasmart-0.19 >=sys-auth/polkit-0.110 virtual/acl >=virtual/udev-208[gudev] introspection? ( >=dev-libs/gobject-introspection-1.30 ) selinux? ( sec-policy/selinux-devicekit ) systemd? ( >=sys-apps/systemd-208 ) >=sys-apps/util-linux-2.20.1-r2 >=sys-block/parted-3 virtual/eject cryptsetup? ( sys-fs/cryptsetup[udev(+)] sys-fs/lvm2[udev(+)] ) gptfdisk? ( >=sys-apps/gptfdisk-0.8 )
-SLOT=2
-SRC_URI=http://udisks.freedesktop.org/releases/udisks-2.1.0.tar.bz2
-_eclasses_=bash-completion-r1	db412e427e3317ffd3e15f17df269c5e	eutils	af81d52c25ec93fbdff71e0efb0de7b7	linux-info	90944ede7e9761bd7ef07602acdef9e3	multilib	fac675dcccf94392371a6abee62d909f	systemd	9f063b2cc19c5e8030911372aa246c4e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	udev	a9a8d051efb42bfe884c1db82ce161de	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=73a83b24bea8888fd2e0acac5b4f99bc
diff --git a/metadata/md5-cache/sys-fs/udisks-2.1.1 b/metadata/md5-cache/sys-fs/udisks-2.1.1
deleted file mode 100644
index ef4f47636a89..000000000000
--- a/metadata/md5-cache/sys-fs/udisks-2.1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=>=dev-libs/glib-2.32 >=dev-libs/libatasmart-0.19 >=sys-auth/polkit-0.110 virtual/acl >=virtual/udev-208[gudev] introspection? ( >=dev-libs/gobject-introspection-1.30 ) selinux? ( sec-policy/selinux-devicekit ) systemd? ( >=sys-apps/systemd-208 ) app-text/docbook-xsl-stylesheets dev-libs/libxslt >=dev-util/gdbus-codegen-2.32 dev-util/intltool >=sys-kernel/linux-headers-3.1 virtual/pkgconfig virtual/pkgconfig virtual/pkgconfig
-DESCRIPTION=Daemon providing interfaces to work with storage devices
-EAPI=5
-HOMEPAGE=http://www.freedesktop.org/wiki/Software/udisks
-IUSE=debug cryptsetup +gptfdisk +introspection selinux systemd
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.32 >=dev-libs/libatasmart-0.19 >=sys-auth/polkit-0.110 virtual/acl >=virtual/udev-208[gudev] introspection? ( >=dev-libs/gobject-introspection-1.30 ) selinux? ( sec-policy/selinux-devicekit ) systemd? ( >=sys-apps/systemd-208 ) >=sys-apps/util-linux-2.20.1-r2 >=sys-block/parted-3 virtual/eject cryptsetup? ( sys-fs/cryptsetup[udev(+)] sys-fs/lvm2[udev(+)] ) gptfdisk? ( >=sys-apps/gptfdisk-0.8 )
-SLOT=2
-SRC_URI=http://udisks.freedesktop.org/releases/udisks-2.1.1.tar.bz2
-_eclasses_=bash-completion-r1	db412e427e3317ffd3e15f17df269c5e	eutils	af81d52c25ec93fbdff71e0efb0de7b7	linux-info	90944ede7e9761bd7ef07602acdef9e3	multilib	fac675dcccf94392371a6abee62d909f	systemd	9f063b2cc19c5e8030911372aa246c4e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	udev	a9a8d051efb42bfe884c1db82ce161de	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=0c21b1b44218c1e6e5835349a7610f10
diff --git a/metadata/md5-cache/sys-fs/udisks-2.1.2 b/metadata/md5-cache/sys-fs/udisks-2.1.2
deleted file mode 100644
index 751afb5a2ce5..000000000000
--- a/metadata/md5-cache/sys-fs/udisks-2.1.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=>=dev-libs/glib-2.32 >=dev-libs/libatasmart-0.19 >=sys-auth/polkit-0.110 virtual/acl >=virtual/udev-208[gudev] introspection? ( >=dev-libs/gobject-introspection-1.30 ) selinux? ( sec-policy/selinux-devicekit ) systemd? ( >=sys-apps/systemd-208 ) app-text/docbook-xsl-stylesheets dev-libs/libxslt >=dev-util/gdbus-codegen-2.32 dev-util/intltool >=sys-kernel/linux-headers-3.1 virtual/pkgconfig virtual/pkgconfig virtual/pkgconfig
-DESCRIPTION=Daemon providing interfaces to work with storage devices
-EAPI=5
-HOMEPAGE=http://www.freedesktop.org/wiki/Software/udisks
-IUSE=debug cryptsetup +gptfdisk +introspection selinux systemd
-KEYWORDS=~alpha amd64 arm ~ia64 ~mips ppc ~ppc64 ~sh ~sparc x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.32 >=dev-libs/libatasmart-0.19 >=sys-auth/polkit-0.110 virtual/acl >=virtual/udev-208[gudev] introspection? ( >=dev-libs/gobject-introspection-1.30 ) selinux? ( sec-policy/selinux-devicekit ) systemd? ( >=sys-apps/systemd-208 ) >=sys-apps/util-linux-2.20.1-r2 >=sys-block/parted-3 virtual/eject cryptsetup? ( sys-fs/cryptsetup[udev(+)] sys-fs/lvm2[udev(+)] ) gptfdisk? ( >=sys-apps/gptfdisk-0.8 )
-SLOT=2
-SRC_URI=http://udisks.freedesktop.org/releases/udisks-2.1.2.tar.bz2
-_eclasses_=bash-completion-r1	db412e427e3317ffd3e15f17df269c5e	eutils	af81d52c25ec93fbdff71e0efb0de7b7	linux-info	90944ede7e9761bd7ef07602acdef9e3	multilib	fac675dcccf94392371a6abee62d909f	systemd	9f063b2cc19c5e8030911372aa246c4e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	udev	a9a8d051efb42bfe884c1db82ce161de	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=79b13ab192a0d7c9e6f3c288061ceff9
diff --git a/metadata/md5-cache/sys-kernel/git-sources-3.14_rc8 b/metadata/md5-cache/sys-kernel/git-sources-3.14_rc8
new file mode 100644
index 000000000000..10a55a4096f3
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/git-sources-3.14_rc8
@@ -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 )
+DESCRIPTION=The very latest -git version of the Linux kernel
+EAPI=5
+HOMEPAGE=http://www.kernel.org
+IUSE=symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86
+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.14_rc8
+SRC_URI=mirror://kernel/linux/kernel/v3.x/testing/patch-3.14-rc8.xz mirror://kernel/linux/kernel/v3.x/linux-3.13.tar.xz
+_eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	kernel-2	263afd0e4a90481352469cff577efe1b	multilib	fac675dcccf94392371a6abee62d909f	python-any-r1	08d3455b23110d650f173ab0a090818b	python-utils-r1	18d8279a3382bf4453e7ff35208ce907	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=5b5db1aec7d98d013259527e2181ad4a
diff --git a/metadata/md5-cache/sys-libs/timezone-data-2014b b/metadata/md5-cache/sys-libs/timezone-data-2014b
new file mode 100644
index 000000000000..672e19956d9f
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/timezone-data-2014b
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile config install postinst prepare setup
+DESCRIPTION=Timezone data (/usr/share/zoneinfo) and utilities (tzselect/zic/zdump)
+EAPI=3
+HOMEPAGE=http://www.iana.org/time-zones http://www.twinsun.com/tz/tz-link.htm
+IUSE=nls elibc_FreeBSD elibc_glibc
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=BSD public-domain
+RDEPEND=!<sys-libs/glibc-2.3.5
+SLOT=0
+SRC_URI=http://www.iana.org/time-zones/repository/releases/tzdata2014b.tar.gz http://www.iana.org/time-zones/repository/releases/tzcode2014b.tar.gz ftp://munnari.oz.au/pub/oldtz/tzdata2014b.tar.gz ftp://munnari.oz.au/pub/oldtz/tzcode2014b.tar.gz
+_eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=30accd52ed727e21540616c5e2f2a23d
diff --git a/metadata/md5-cache/virtual/libffi-3.0.13-r1 b/metadata/md5-cache/virtual/libffi-3.0.13-r1
index 54bda32a8432..6c3e29811464 100644
--- a/metadata/md5-cache/virtual/libffi-3.0.13-r1
+++ b/metadata/md5-cache/virtual/libffi-3.0.13-r1
@@ -3,8 +3,8 @@ DEPEND=userland_GNU? ( >=sys-apps/coreutils-8.5 )
 DESCRIPTION=A virtual for the Foreign Function Interface implementation
 EAPI=5
 IUSE=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 ~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 ~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 ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=>=dev-libs/libffi-3.0.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?]
 SLOT=0
 _eclasses_=multibuild	56d4120419072116417e8de1bd1040ff	multilib	fac675dcccf94392371a6abee62d909f	multilib-build	198e1c7095dbce1ca2848aed0f96bf60	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=41985571b037f59d2a853f89629588be
+_md5_=438157ee55d530ce172483afe81dd46c
diff --git a/metadata/md5-cache/virtual/perl-version-0.990.800 b/metadata/md5-cache/virtual/perl-version-0.990.800
new file mode 100644
index 000000000000..8c3800bb6f5f
--- /dev/null
+++ b/metadata/md5-cache/virtual/perl-version-0.990.800
@@ -0,0 +1,6 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual for version
+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
+RDEPEND=~perl-core/version-0.990.800
+SLOT=0
+_md5_=9738f0246ff43e16ebc1c7a7bfbc2fab
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-synaptics-1.7.4 b/metadata/md5-cache/x11-drivers/xf86-input-synaptics-1.7.4
new file mode 100644
index 000000000000..e0c80d59d894
--- /dev/null
+++ b/metadata/md5-cache/x11-drivers/xf86-input-synaptics-1.7.4
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
+DEPEND=sys-libs/mtdev >=x11-base/xorg-server-1.12 >=x11-libs/libXi-1.2 >=x11-libs/libXtst-1.1.0 >=sys-kernel/linux-headers-2.6.37 >=x11-proto/inputproto-2.1.99.3 >=x11-proto/recordproto-1.14 !<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 x11-proto/inputproto x11-proto/kbproto x11-proto/xproto x11-base/xorg-server[xorg]
+DESCRIPTION=Driver for Synaptics touchpads
+EAPI=5
+HOMEPAGE=http://cgit.freedesktop.org/xorg/driver/xf86-input-synaptics/
+KEYWORDS=~amd64 ~arm ~mips ~ppc ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=sys-libs/mtdev >=x11-base/xorg-server-1.12 >=x11-libs/libXi-1.2 >=x11-libs/libXtst-1.1.0 x11-base/xorg-server:= x11-base/xorg-server[xorg]
+SLOT=0
+SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-input-synaptics-1.7.4.tar.bz2
+_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	autotools-utils	fb74970befc9b65ceec689d2ccff3022	eutils	af81d52c25ec93fbdff71e0efb0de7b7	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	libtool	b9b3340e3a19510f0d9f05cfccbf209f	linux-info	90944ede7e9761bd7ef07602acdef9e3	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	xorg-2	69479ff7a35a30e863a475568d29b9be
+_md5_=7802e9005da3a669c0c9e1518335adbc
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-vmware-13.0.1-r1 b/metadata/md5-cache/x11-drivers/xf86-video-vmware-13.0.1-r1
new file mode 100644
index 000000000000..e984056b4864
--- /dev/null
+++ b/metadata/md5-cache/x11-drivers/xf86-video-vmware-13.0.1-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=x11-libs/libdrm[libkms,video_cards_vmware] >=media-libs/mesa-10[xa] !<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 ) >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 virtual/pkgconfig x11-proto/xf86driproto x11-proto/glproto x11-proto/dri2proto x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[-minimal] x11-libs/libdrm x11-base/xorg-server[xorg] x11-libs/libpciaccess
+DESCRIPTION=VMware SVGA video driver
+EAPI=5
+HOMEPAGE=http://xorg.freedesktop.org/
+KEYWORDS=~amd64 ~x86 ~x86-fbsd
+LICENSE=MIT
+RDEPEND=x11-libs/libdrm[libkms,video_cards_vmware] >=media-libs/mesa-10[xa] x11-base/xorg-server:= x11-base/xorg-server[-minimal] x11-libs/libdrm x11-base/xorg-server[xorg] x11-libs/libpciaccess
+SLOT=0
+SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-vmware-13.0.1.tar.bz2
+_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	autotools-utils	fb74970befc9b65ceec689d2ccff3022	eutils	af81d52c25ec93fbdff71e0efb0de7b7	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	xorg-2	69479ff7a35a30e863a475568d29b9be
+_md5_=f534458934b4f6af52f80590803df818
diff --git a/metadata/md5-cache/x11-plugins/asapm-3.1-r1 b/metadata/md5-cache/x11-plugins/asapm-3.1-r1
index c293f2c6b2ac..c41cc4682444 100644
--- a/metadata/md5-cache/x11-plugins/asapm-3.1-r1
+++ b/metadata/md5-cache/x11-plugins/asapm-3.1-r1
@@ -1,5 +1,5 @@
-DEFINED_PHASES=install prepare setup
-DEPEND=x11-libs/libX11 x11-libs/libXpm x11-proto/xproto
+DEFINED_PHASES=install prepare
+DEPEND=x11-libs/libX11 x11-libs/libXpm 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
 DESCRIPTION=APM monitor for AfterStep
 EAPI=5
 HOMEPAGE=http://tigr.net/afterstep/applets/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/libXpm
 SLOT=0
 SRC_URI=http://www.tigr.net/afterstep/download/asapm/asapm-3.1.tar.gz
-_eclasses_=eutils	af81d52c25ec93fbdff71e0efb0de7b7	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=e888d89860f75e15ca7da7951c3e5720
+_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	af81d52c25ec93fbdff71e0efb0de7b7	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=23e89fd99ea83f8e5b31059458a8a024
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 0529d425716a..f581340b0817 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Tue, 25 Mar 2014 09:07:03 +0000
+Wed, 26 Mar 2014 06:37:03 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index c06498d97b87..3aabffb9f622 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Tue Mar 25 09:07:00 UTC 2014
+Wed Mar 26 06:37:01 UTC 2014
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 82f37e4af7ac..c0af2794ffc7 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Tue, 25 Mar 2014 09:30:01 +0000
+Wed, 26 Mar 2014 07:00:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index c82ebc8f7e5f..fd320d3c13b7 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1395738301 Tue Mar 25 09:05:01 2014 UTC
+1395815701 Wed 26 Mar 2014 06:35:01 AM UTC UTC
diff --git a/net-dns/nsd/Manifest b/net-dns/nsd/Manifest
index 8753d1ca54fd..5350eb37458b 100644
--- a/net-dns/nsd/Manifest
+++ b/net-dns/nsd/Manifest
@@ -1,2 +1,4 @@
 DIST nsd-3.2.16.tar.gz 917815 SHA256 15a5fd69ea80345eefced83a58b40e8f262a06ac4f7f83606d33033b167d6604 SHA512 361934717b1975a68c074e0f1fe324259a5939871a6e76f5d7d0535f02a129f0940b16fb544b111c8c8849439c75387e2f50223a2ef3442bac66a2be23bcd529 WHIRLPOOL a3f86839aa24548f033d21b1cbe40b95ef45ea6fc6a7e89e84667a9224fc0b3fe5f57c162a774a2b9a18ae0c98ade397eef3e65a0b7985d9b84318b55740ff84
+DIST nsd-3.2.17.tar.gz 921978 SHA256 f566fa408ac45944a264e80e53adf2c7d479ce8b545dce2caa7e50d4d21d330d SHA512 f405597ab8de47e50e4683287e4040f9256347a780b899d1f134721e663c60c849e33cfe862bcdc43cfb219f36c6a861c1c1fc743702273b466a3810fd62d474 WHIRLPOOL f0e268a60d96feb9e7cef270dfc7a96aa91f33a8398647f853c96b0bdd26e44435a96756ea0e5a5c5e4ce7d556c66702feb8b51d461bcd47f4d8f54e47178329
 DIST nsd-4.0.0.tar.gz 1035710 SHA256 62608a409d0f68c9d8d4595031b9de9130ac02efe39733be5dee40d5a90e991c SHA512 75969e0b448a84e16431cbde1a693f4df59e3a036a89ad20cfbda28d31841c31240da3fd69125aae5f19578ef9c9ffc1ddfe8b9bc7877c2df1cef377675fd731 WHIRLPOOL a654b92d6b4e33acca4768b0243a521380286b8879f7a46dbbaecd66ee0baec6d82d0c03226049ae1986fc331e882631f26646abf08d70c3fd5c20a3a953aadd
+DIST nsd-4.0.3.tar.gz 1043993 SHA256 4bf05f2234e1b41899198aa1070f409201fc3c4980feef6567cd92c7074c4a8b SHA512 19a2ea2c34e54c89a642a974ad42108a8eb58568e684d03eb9e3e939b70cd5882af6071bee3d9fe6bdd6bf545265447d5f527ddbfdd8ffeb76b414734397f01f WHIRLPOOL 945f821b5689c5ed0b5128653a071a889d8db1afbd531f02a384bfa1cd5d9bdd57b6a2a7a0165e67fbcbd7c98fb8fd995b3022d07c3aeb5390ae6c8bf0108ec6
diff --git a/net-dns/nsd/nsd-3.2.17.ebuild b/net-dns/nsd/nsd-3.2.17.ebuild
new file mode 100644
index 000000000000..1a9d79e3661c
--- /dev/null
+++ b/net-dns/nsd/nsd-3.2.17.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/nsd/nsd-3.2.17.ebuild,v 1.1 2014/03/25 22:29:20 wschlich Exp $
+
+EAPI=4
+
+inherit user
+
+DESCRIPTION="An authoritative only, high performance, open source name server"
+HOMEPAGE="http://www.nlnetlabs.nl/projects/nsd"
+SRC_URI="http://www.nlnetlabs.nl/downloads/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="bind8-stats ipv6 minimal-responses mmap +nsec3 ratelimit root-server runtime-checks zone-stats"
+
+RDEPEND="
+	dev-libs/openssl
+	virtual/yacc
+"
+DEPEND="
+	${RDEPEND}
+	sys-devel/flex
+"
+
+pkg_setup() {
+	enewgroup nsd
+	enewuser nsd -1 -1 -1 nsd
+}
+
+src_configure() {
+	# ebuild.sh sets localstatedir to /var/lib, but nsd expects /var in several locations
+	# some of these cannot be changed by arguments to econf/configure, f.i. logfile
+	econf \
+		--localstatedir="${EPREFIX}/var" \
+		--with-pidfile="${EPREFIX}/var/run/nsd/nsd.pid" \
+		--with-zonesdir="${EPREFIX}/var/lib/nsd" \
+		--enable-largefile \
+		$(use_enable bind8-stats) \
+		$(use_enable ipv6) \
+		$(use_enable minimal-responses) \
+		$(use_enable mmap) \
+		$(use_enable nsec3) \
+		$(use_enable ratelimit) \
+		$(use_enable root-server) \
+		$(use_enable runtime-checks checking) \
+		$(use_enable zone-stats)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	dodoc doc/{ChangeLog,CREDITS,NSD-FOR-BIND-USERS,README,RELNOTES,REQUIREMENTS}
+
+	insinto /usr/share/nsd
+	doins contrib/nsd.zones2nsd.conf
+
+	exeinto /etc/cron.daily
+	newexe "${FILESDIR}"/nsd3-patch.cron nsd-patch.cron
+
+	newinitd "${FILESDIR}"/nsd3.initd-r1 nsd
+
+	# database directory, writable by nsd for database updates and zone transfers
+	dodir /var/db/nsd
+	fowners nsd:nsd /var/db/nsd
+	fperms 750 /var/db/nsd
+
+	# zones directory, writable by root for 'nsdc patch'
+	dodir /var/lib/nsd
+	fowners root:nsd /var/lib/nsd
+	fperms 750 /var/lib/nsd
+
+	# remove /var/run data created by Makefile, handled by initd script
+	rm -r "${D}"/var/run || die "could not remove /var/run/ directory"
+
+}
diff --git a/net-dns/nsd/nsd-4.0.3.ebuild b/net-dns/nsd/nsd-4.0.3.ebuild
new file mode 100644
index 000000000000..e5f3f7220b44
--- /dev/null
+++ b/net-dns/nsd/nsd-4.0.3.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/nsd/nsd-4.0.3.ebuild,v 1.1 2014/03/25 22:29:20 wschlich Exp $
+
+EAPI=4
+
+inherit user eutils
+
+DESCRIPTION="An authoritative only, high performance, open source name server"
+HOMEPAGE="http://www.nlnetlabs.nl/projects/nsd"
+# version voodoo needed only for non-release tarballs: 4.0.0_rc1 => 4.0.0rc1
+MY_PV=${PV/_rc/rc}
+MY_PV=${MY_PV/_beta/b}
+MY_P=${PN}-${MY_PV}
+S="${WORKDIR}/${MY_P}"
+SRC_URI="http://www.nlnetlabs.nl/downloads/${PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="bind8-stats ipv6 libevent minimal-responses mmap munin +nsec3 ratelimit root-server runtime-checks ssl"
+
+RDEPEND="
+	dev-libs/openssl
+	virtual/yacc
+	libevent? ( dev-libs/libevent )
+	ssl? ( dev-libs/openssl )
+	munin? ( net-analyzer/munin )
+"
+DEPEND="
+	${RDEPEND}
+	sys-devel/flex
+"
+
+pkg_setup() {
+	enewgroup nsd
+	enewuser nsd -1 -1 -1 nsd
+}
+
+src_prepare() {
+	# Fix the paths in the munin plugin to match our install
+	epatch "${FILESDIR}"/nsd_munin_.patch
+}
+
+src_configure() {
+	econf \
+		--enable-largefile \
+		--with-logfile="${EPREFIX}"/var/log/nsd.log \
+		--with-pidfile="${EPREFIX}"/run/nsd/nsd.pid \
+		--with-dbfile="${EPREFIX}"/var/db/nsd/nsd.db \
+		--with-xfrdir="${EPREFIX}"/var/db/nsd \
+		--with-xfrdfile="${EPREFIX}"/var/db/nsd/xfrd.state \
+		--with-zonelistfile="${EPREFIX}"/var/db/nsd/zone.list \
+		--with-zonesdir="${EPREFIX}"/var/lib/nsd \
+		$(use_enable bind8-stats) \
+		$(use_enable ipv6) \
+		$(use_enable minimal-responses) \
+		$(use_enable mmap) \
+		$(use_enable nsec3) \
+		$(use_enable ratelimit) \
+		$(use_enable root-server) \
+		$(use_enable runtime-checks checking) \
+		$(use_with libevent) \
+		$(use_with ssl)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	dodoc doc/{ChangeLog,CREDITS,NSD-4-features,NSD-FOR-BIND-USERS,README,RELNOTES,REQUIREMENTS}
+
+	newinitd "${FILESDIR}"/nsd.initd nsd
+
+	# database directory, writable by nsd for database updates and zone transfers
+	dodir /var/db/nsd
+	fowners nsd:nsd /var/db/nsd
+	fperms 750 /var/db/nsd
+
+	# zones directory, writable by nsd for zone file updates (nsd-control write)
+	dodir /var/lib/nsd
+	fowners nsd:nsd /var/lib/nsd
+	fperms 750 /var/lib/nsd
+
+	# install munin plugin and config
+	if use munin; then
+		exeinto /usr/libexec/munin/plugins
+		doexe contrib/nsd_munin_
+		insinto /etc/munin/plugin-conf.d
+		newins "${FILESDIR}"/nsd.munin-conf nsd_munin
+	fi
+
+	# remove the /run directory that usually resides on tmpfs and is
+	# being taken care of by the nsd init script anyway (checkpath)
+	rm -rf "${D}"/run || die "Failed to remove /run"
+}
diff --git a/net-ftp/lftp/Manifest b/net-ftp/lftp/Manifest
index 10d9e882e40e..35a8c77c89a9 100644
--- a/net-ftp/lftp/Manifest
+++ b/net-ftp/lftp/Manifest
@@ -1,4 +1,2 @@
-DIST lftp-4.4.14.tar.xz 1459988 SHA256 61ceaefbd476061e728e2b1294c27866402237d1d6539ed9ca98769dba3c9189 SHA512 4915392317115ab497b3eb722ef96a17ad3edb114cd639ec39b9eb586d2e5cc0a4c5fa769704095347df774c600e2f8a30a062f27903185c1c2e69e403357928 WHIRLPOOL 65aeca83a5570c0c53de4045d20d7bb8767b0e96fc10525de3b6552ae40ac8845b0cb1cb770f2bebed0dc973aac436a66d3372a722e969757d98ee9097b36f9a
 DIST lftp-4.4.15.tar.xz 1460568 SHA256 75f40b7ab438a7b295410eb3e1ec8460e36ad2d48785383a6fc9201905db6868 SHA512 1d828a7b2ff808a0ee78f51c265d58df677e67cec9b4744cbd3a34816aba324199202094fa4144665e8d64385df7e76a54c6dc415e9ff33e97adab2eb0edaf4e WHIRLPOOL 3bf4d220b5581d87fb34d72f6129c2d660f80e3142560543c238dfaafd8cde5834f57884247c75e583ab6a9d4c12766b28c90e2b49889e44759d663591bbc7e0
-DIST lftp-4.4.99.20140317.tar.gz 2550149 SHA256 839463f44701e2ade27bbf5238c66ab0c52669c1eb2af0970e76d3dcb1f7d107 SHA512 c8d9d3cc3c63b098af1a68a753f75b3690ce6e72dcde335e7f34d47eb71c4eecd9cbd8e066413a6f46cca253b56f7597da7b6b4d24cebf5aa8f07790ff891a34 WHIRLPOOL 88aa6b0fdc81587ab3e5fb2edd85b1d23d6a6032053718537a0dba869d56ef6ec62d776025b243dbca0f091e07e819d7425612405aae320d18659882f7d646a6
 DIST lftp-4.4.99.20140321.tar.gz 2550384 SHA256 f326f567b5ab04f2529b172336c12e0a08330b1d10f453b77a66013bbd60ae47 SHA512 f503027d43f5dd8b54599cda7041f8e8c5b9721239a5e104772355e0bba3777e4c27dbd866a93de15fb39376f4bd8d77fc186371a9ce37c41661a3ea7605701f WHIRLPOOL 5ebbef212c4cff72069d55dec59e630c5ef84891ef60d6fdca9fde8d387da3ded8d18bed96048047319dbb524ef70d9e756a7168a5eedba1d98d42e522cfd2ad
diff --git a/net-ftp/lftp/lftp-4.4.14.ebuild b/net-ftp/lftp/lftp-4.4.14.ebuild
deleted file mode 100644
index cec7fe9d27db..000000000000
--- a/net-ftp/lftp/lftp-4.4.14.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/lftp-4.4.14.ebuild,v 1.10 2014/01/26 12:22:08 ago Exp $
-
-EAPI=5
-inherit autotools eutils libtool
-
-DESCRIPTION="A sophisticated ftp/sftp/http/https/torrent client and file transfer program"
-HOMEPAGE="http://lftp.yar.ru/"
-SRC_URI="http://${PN}.yar.ru/ftp/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-
-IUSE="convert-mozilla-cookies +gnutls nls openssl socks5 +ssl verify-file"
-LFTP_LINGUAS=( cs de es fr it ja ko pl pt_BR ru zh_CN zh_HK zh_TW )
-IUSE+=" ${LFTP_LINGUAS[@]/#/linguas_}"
-
-REQUIRED_USE="
-	ssl? ( ^^ ( openssl gnutls ) )
-"
-
-RDEPEND="
-	>=sys-libs/ncurses-5.1
-	>=sys-libs/readline-5.1
-	dev-libs/expat
-	sys-libs/zlib
-	convert-mozilla-cookies? ( dev-perl/DBI )
-	socks5? (
-		>=net-proxy/dante-1.1.12
-		virtual/pam
-	)
-	ssl? (
-		gnutls? ( >=net-libs/gnutls-1.2.3 )
-		openssl? ( >=dev-libs/openssl-0.9.6 )
-	)
-	verify-file? (
-		dev-perl/string-crc32
-		virtual/perl-Digest-MD5
-	)
-"
-
-DEPEND="
-	${RDEPEND}
-	=sys-devel/libtool-2*
-	app-arch/xz-utils
-	nls? ( sys-devel/gettext )
-	virtual/pkgconfig
-"
-
-DOCS=(
-	BUGS ChangeLog FAQ FEATURES MIRRORS NEWS README README.debug-levels
-	README.dnssec README.modules THANKS TODO
-)
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}/${PN}-4.0.2.91-lafile.patch" \
-		"${FILESDIR}/${PN}-4.3.5-autopoint.patch" \
-		"${FILESDIR}/${PN}-4.3.8-gets.patch"
-	sed -i configure.ac -e 's|^AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' || die
-	eautoreconf
-	elibtoolize # for Darwin bundles
-}
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		$(use_with gnutls) \
-		$(use_with openssl openssl "${EPREFIX}"/usr) \
-		$(use_with socks5 socksdante "${EPREFIX}"/usr) \
-		--enable-packager-mode \
-		--sysconfdir="${EPREFIX}"/etc/${PN} \
-		--with-modules \
-		--without-included-regex
-}
-
-src_install() {
-	default
-	local script
-	for script in {convert-mozilla-cookies,verify-file}; do
-		use ${script} || { rm "${ED}"/usr/share/${PN}/${script} || die ;}
-	done
-}
diff --git a/net-ftp/lftp/lftp-4.4.99.20140317.ebuild b/net-ftp/lftp/lftp-4.4.99.20140317.ebuild
deleted file mode 100644
index da624f47ff1d..000000000000
--- a/net-ftp/lftp/lftp-4.4.99.20140317.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/lftp-4.4.99.20140317.ebuild,v 1.1 2014/03/17 20:07:44 jer Exp $
-
-EAPI=5
-inherit autotools eutils libtool
-
-DESCRIPTION="A sophisticated ftp/sftp/http/https/torrent client and file transfer program"
-HOMEPAGE="http://lftp.yar.ru/"
-SRC_URI="http://${PN}.yar.ru/ftp/devel/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS=""
-
-IUSE="convert-mozilla-cookies +gnutls nls openssl socks5 +ssl verify-file"
-LFTP_LINGUAS=( cs de es fr it ja ko pl pt_BR ru zh_CN zh_HK zh_TW )
-IUSE+=" ${LFTP_LINGUAS[@]/#/linguas_}"
-
-REQUIRED_USE="
-	ssl? ( ^^ ( openssl gnutls ) )
-"
-
-RDEPEND="
-	>=sys-libs/ncurses-5.1
-	>=sys-libs/readline-5.1
-	dev-libs/expat
-	sys-libs/zlib
-	convert-mozilla-cookies? ( dev-perl/DBI )
-	socks5? (
-		>=net-proxy/dante-1.1.12
-		virtual/pam
-	)
-	ssl? (
-		gnutls? ( >=net-libs/gnutls-1.2.3 )
-		openssl? ( >=dev-libs/openssl-0.9.6 )
-	)
-	verify-file? (
-		dev-perl/string-crc32
-		virtual/perl-Digest-MD5
-	)
-"
-
-DEPEND="
-	${RDEPEND}
-	=sys-devel/libtool-2*
-	nls? ( sys-devel/gettext )
-	virtual/pkgconfig
-"
-
-DOCS=(
-	BUGS ChangeLog FAQ FEATURES MIRRORS NEWS README README.debug-levels
-	README.dnssec README.modules THANKS TODO
-)
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}/${PN}-4.0.2.91-lafile.patch" \
-		"${FILESDIR}/${PN}-4.3.5-autopoint.patch" \
-		"${FILESDIR}/${PN}-4.3.8-gets.patch"
-	sed -i configure.ac -e 's|^AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' || die
-	eautoreconf
-	elibtoolize # for Darwin bundles
-}
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		$(use_with gnutls) \
-		$(use_with openssl openssl "${EPREFIX}"/usr) \
-		$(use_with socks5 socksdante "${EPREFIX}"/usr) \
-		--enable-packager-mode \
-		--sysconfdir="${EPREFIX}"/etc/${PN} \
-		--with-modules \
-		--without-included-regex
-}
-
-src_install() {
-	default
-	local script
-	for script in {convert-mozilla-cookies,verify-file}; do
-		use ${script} || { rm "${ED}"/usr/share/${PN}/${script} || die ;}
-	done
-}
diff --git a/net-misc/lksctp-tools/Manifest b/net-misc/lksctp-tools/Manifest
index 7e4372d55b5c..1a7cdd135e66 100644
--- a/net-misc/lksctp-tools/Manifest
+++ b/net-misc/lksctp-tools/Manifest
@@ -1,2 +1,2 @@
-DIST lksctp-tools-1.0.11.tar.gz 698450 SHA256 86ace6c1586e99caedbc6148277cfaad30a58c1cccbbd8a0399de55ee86bbab3 SHA512 89daca9181c40a7467a6d7d61458ada5f2868f46b95aa4fba47e17abafa21c39a0146bccfe5cb4ac2cc04c8ee92dbf58623e0c8c7cad7e40ad0d9c1820890a52 WHIRLPOOL 4797dc85a5e3595153f75b82f15575acbbcea3826aab5d0576b1c637f09f800334c6d35c6484285197644df7395bc6a9bc5b00141f59b23912062d80142023e3
 DIST lksctp-tools-1.0.13.tar.gz 564530 SHA256 7c681868a95afc420f941d2f7dc6bfe07658de109aba6969c407ddf213c2f2a5 SHA512 bdcf06223641ca062fd528ad87efbd3ac2a4e721b691bade528ae6d2ad8eaee5a6c0516eff42c83a3afed812c378f3ce782b93efe8ec830d91280b7419ce17b4 WHIRLPOOL a6d02d4ce9a05d40c28d34437f79da2158684d3cab7b9c2ea0ddac61d2c2464af0eb1931865a80bc889a17ea544a93e2125314d9b53c576cf719a09608ef37d4
+DIST lksctp-tools-1.0.16.tar.gz 565446 SHA256 0903dd526b7f30a89d5031aa2c82757612becc38ed7bc6e4f972f8deae351f26 SHA512 ea771f3ffeef4630638ee9cbdf01723d01b1b0ca2e8f147a2b61b907339bd1a0c5d621a58638a3b700b6ffc41de06c7b9002645254a471e279663b64b313f467 WHIRLPOOL cebff8ede44ce9ca82da14b6d5a622876e0b86805672320364bab9ca5c8fc92197c806a88898fbd06598c9120ec5b044d2fd94e3f1814d2742c743217ef12cee
diff --git a/net-misc/lksctp-tools/lksctp-tools-1.0.11-r1.ebuild b/net-misc/lksctp-tools/lksctp-tools-1.0.16.ebuild
similarity index 63%
rename from net-misc/lksctp-tools/lksctp-tools-1.0.11-r1.ebuild
rename to net-misc/lksctp-tools/lksctp-tools-1.0.16.ebuild
index 2ccddff2752c..3e2128b5260e 100644
--- a/net-misc/lksctp-tools/lksctp-tools-1.0.11-r1.ebuild
+++ b/net-misc/lksctp-tools/lksctp-tools-1.0.16.ebuild
@@ -1,18 +1,18 @@
-# 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-misc/lksctp-tools/lksctp-tools-1.0.11-r1.ebuild,v 1.7 2012/03/19 19:10:56 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/lksctp-tools/lksctp-tools-1.0.16.ebuild,v 1.1 2014/03/25 10:20:53 polynomial-c Exp $
 
-EAPI=4
+EAPI=5
 
-inherit eutils multilib flag-o-matic
+inherit eutils multilib flag-o-matic autotools autotools-utils
 
 DESCRIPTION="Tools for Linux Kernel Stream Control Transmission Protocol implementation"
 HOMEPAGE="http://lksctp.sourceforge.net/"
 SRC_URI="mirror://sourceforge/lksctp/${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="|| ( GPL-2+ LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="kernel_linux static-libs"
 
 # This is only supposed to work with Linux to begin with.
@@ -23,24 +23,24 @@ REQUIRED_USE="kernel_linux"
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-1.0.8-prefix.patch #181602
+	eautoreconf
 }
 
 src_configure() {
 	append-flags -fno-strict-aliasing
 
-	econf $(use_enable static-libs static) \
-		--enable-shared
+	autotools-utils_src_configure
 }
 
+DOCS=( AUTHORS ChangeLog INSTALL NEWS README ROADMAP )
+
 src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog INSTALL NEWS README ROADMAP doc/*txt || die
+	autotools-utils_src_install
 
-	newdoc src/withsctp/README README.withsctp || die
+	dodoc doc/*txt
+	newdoc src/withsctp/README README.withsctp
 
 	# Don't install static library or libtool file, since this is used
 	# only as preloadable library.
 	use static-libs && rm "${D}"/usr/$(get_libdir)/${PN}/*.a
-
-	find "${D}" -name '*.la' -delete || die
 }
diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index 28d83c03930c..841775091096 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -1,3 +1,4 @@
 DIST youtube-dl-2014.02.10.tar.gz 642951 SHA256 fa037ae7d3a3b47f57b91e57f89689c4277465152267809811ad5bf9f76a3d3f SHA512 2770b4721063ad3b06a06dc80c9ec81eb012b18b8d5e8aaace5b1e89d875e6e762e611f7c3ec9978e6dded3d27f8b12b1a7615be6dfa6cb283272e22e50f0545 WHIRLPOOL a8b7a4690fdee9c3053eb3d7ccc42862a05e1b75dabe81648e7ea28582b89981936559315b7bd9d0408a203efde09ff0bc23841a089cb4fb273c8d6d91581ad5
 DIST youtube-dl-2014.03.21.5.tar.gz 721731 SHA256 82c1c9de140b5030ee836c9b0f3586e812fc5bc5881703322d97ed5eb35b064d SHA512 9f3499243e04dfc82f17576d756483bc1f4117b6b546702f7e4be5f86e556394dd3dfe1d465df3ced72f4f6b39e3073cab97df4ce393f8b76929d9f14d1e5c47 WHIRLPOOL d1b81faa57fdd0cc0c41726a6f7a139cd4561378082ca0a23e2e51dc125aef7fb6787cbc18543895f759dc3ac1d85fc8bd91d2b989c6444546e93a813d522416
 DIST youtube-dl-2014.03.24.1.tar.gz 734012 SHA256 1ead0b3fbbeff5d74733f1fd11eb4aa80bfdd839dd15dec1d9a8964836deb008 SHA512 963d19333679afd5c134078921c5d737c52a45430dc71f94a6a5665a97de23dd3152bb1d4a71b264bf8e225c50acc3f3c84793b8c0c4ba43a68136cf39fd0420 WHIRLPOOL cbce5e07d97884d5ef8a5ec89ee64f328c3c4fa6f1eb6cec0dab328b58b58946e3f814c928eab5fd66e2fba2d7683e24b236a99c5d1ba6b05e2e19631e72fbe5
+DIST youtube-dl-2014.03.25.1.tar.gz 734605 SHA256 c818776981e3f8b5a9ddebb5e18c5f0275d148a79feb01cd7d17040b72f44a26 SHA512 eff3612e8f316f9a2d356330e1cbf041e04334029f257208e2318d062b6db0464fd61217eabb5bbb4c26b8612796e15a1a13527937c1e3baa9994ee2a83e3f07 WHIRLPOOL 7187d45c34db80391bf4abff32b8f42c8ebd853e3e70776ee4f15c9ca9f4f9d6eb06ef20566e0ab5d5f08241d15ea5735f57cc92a1610d12b1b85b8f75c3015f
diff --git a/net-misc/youtube-dl/youtube-dl-2014.03.25.1.ebuild b/net-misc/youtube-dl/youtube-dl-2014.03.25.1.ebuild
new file mode 100644
index 000000000000..fab0fe8f0c37
--- /dev/null
+++ b/net-misc/youtube-dl/youtube-dl-2014.03.25.1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/youtube-dl/youtube-dl-2014.03.25.1.ebuild,v 1.1 2014/03/25 13:37:08 jer Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=(python{2_6,2_7,3_3})
+DISTUTILS_SINGLE_IMPL=true
+inherit bash-completion-r1 distutils-r1 eutils
+
+DESCRIPTION="Download videos from YouTube.com (and mores sites...)"
+HOMEPAGE="http://rg3.github.com/youtube-dl/"
+SRC_URI="http://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+IUSE="offensive test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[coverage(+)] )
+"
+
+S="${WORKDIR}/${PN}"
+
+src_prepare() {
+	if ! use offensive; then
+		sed -i -e "/__version__/s|'$|-gentoo_no_offensive_sites'|g" \
+			youtube_dl/version.py || die
+		local xxx=(
+			extremetube fourtube mofosex pornhd pornhub pornotube redtube
+			spankwire thisav trutube tube8 xbef xhamster xnxx xtube xvideos youjizz youporn
+		)
+		sed -i -e $( printf '/%s/d;' ${xxx[@]} ) youtube_dl/extractor/__init__.py || die
+		rm $( printf 'youtube_dl/extractor/%s.py ' ${xxx[@]} ) \
+			test/test_age_restriction.py || die
+	fi
+}
+
+src_compile() {
+	distutils-r1_src_compile
+}
+
+src_test() {
+	emake test
+}
+
+src_install() {
+	python_domodule youtube_dl
+	dobin bin/${PN}
+	dodoc CHANGELOG README.txt
+	doman ${PN}.1
+	newbashcomp ${PN}.bash-completion ${PN}
+	python_fix_shebang "${ED}"
+}
diff --git a/net-wireless/chirp/Manifest b/net-wireless/chirp/Manifest
index 3e24e08b07f6..b2216ef7746a 100644
--- a/net-wireless/chirp/Manifest
+++ b/net-wireless/chirp/Manifest
@@ -1,2 +1,3 @@
 DIST chirp-0.2.3.tar.gz 176249 SHA256 ff278c1abc828ac3f553253cf29e3d854c80087794c6f48c14712c681751c161 SHA512 63287c5baad34768804dc82fb4852ea42080a3156651e1ef304fda9d499aa462427dd1a58cddfd733762b6897ac01d3d1fdd982c68283da3af54aadd5bba4010 WHIRLPOOL 3e6449879d7c500e5d944b25ef66c5239c72ba06c5ef105d5414ea4b8f1841fbe83426a2c70c9751edba7107f13c66c5161a7a82f684f5c210e8c56b90396b4d
 DIST chirp-0.3.0.tar.gz 279241 SHA256 8499d48460e56c93fb86f75b5c917e820fce1c92ca8af9928117d5aa19ae0afb SHA512 3515df8d67def3e805db987fb788fabe09faa9ac28ea1913a275898d1b015fb4b22d4aadd54301fe0f6df58677e0b5666a7a502699f95021303cc75921bc785e WHIRLPOOL 8349e2b38a11395933f30f3ec9826f47d3a6d9c6137ccd28a3ae2a13a709c1148b372e373b750c99c315ee8679a4f7480b16a2c6c3123aef1b19d5a2f28c6d91
+DIST chirp-0.4.0.tar.gz 416572 SHA256 8b45a70db6dcb6fb147017f71875fde3187c48df4c9b7d82773c215e92a3e497 SHA512 553981f3dae3b691710f05ae41c909ea437bb9a40fe5380acab1a3e556aef65e52ba6f27ca3e8ed549447fd0813f5baebc6b888d8b5a75f6e0243b6cbbf0c8e9 WHIRLPOOL fb3258283748693a55917b1773fa9f1f440ba6ad6d2751f6620d45cd12f224661e9a9283c6b714116fb77bd95d8fc9099e61ecd3fa3a3afd623cb7816231a9b2
diff --git a/net-wireless/chirp/chirp-0.4.0.ebuild b/net-wireless/chirp/chirp-0.4.0.ebuild
new file mode 100644
index 000000000000..10777c9d6d30
--- /dev/null
+++ b/net-wireless/chirp/chirp-0.4.0.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/net-wireless/chirp/chirp-0.4.0.ebuild,v 1.1 2014/03/26 02:39:15 zerochaos Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+if [[ ${PV} == "9999" ]] ; then
+	SCM=mercurial
+	EHG_REPO_URI="http://d-rats.com/hg/chirp.hg"
+fi
+
+inherit distutils-r1 ${SCM}
+
+DESCRIPTION="Free open-source tool for programming your amateur radio"
+HOMEPAGE="http://chirp.danplanet.com"
+
+if [[ ${PV} == "9999" ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="http://chirp.danplanet.com/download/${PV}/${P}.tar.gz"
+fi
+LICENSE="GPL-3"
+SLOT="0"
+IUSE=""
+RESTRICT=test
+
+DEPEND="dev-python/pyserial
+	dev-libs/libxml2[python]"
+RDEPEND="${DEPEND}
+	dev-python/pygtk"
+
+src_prepare() {
+	sed -i -e "/share\/doc\/chirp/d" setup.py || die
+	distutils-r1_src_prepare
+}
diff --git a/net-wireless/chirp/chirp-9999.ebuild b/net-wireless/chirp/chirp-9999.ebuild
index 6d0a3ff976e4..7dec1cb2c80d 100644
--- a/net-wireless/chirp/chirp-9999.ebuild
+++ b/net-wireless/chirp/chirp-9999.ebuild
@@ -1,18 +1,16 @@
-# 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-wireless/chirp/chirp-9999.ebuild,v 1.3 2013/02/09 23:36:43 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/chirp/chirp-9999.ebuild,v 1.4 2014/03/26 02:39:15 zerochaos Exp $
 
 EAPI=5
-PYTHON_DEPEND="2:2.6"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.5 3.*"
+PYTHON_COMPAT=( python2_7 )
 
 if [[ ${PV} == "9999" ]] ; then
 	SCM=mercurial
 	EHG_REPO_URI="http://d-rats.com/hg/chirp.hg"
 fi
 
-inherit distutils ${SCM}
+inherit distutils-r1 ${SCM}
 
 DESCRIPTION="Free open-source tool for programming your amateur radio"
 HOMEPAGE="http://chirp.danplanet.com"
@@ -34,14 +32,11 @@ RDEPEND="${DEPEND}
 
 src_prepare() {
 	sed -i -e "/share\/doc\/chirp/d" setup.py || die
-	distutils_src_prepare
+	distutils-r1_src_prepare
 }
 
-src_test() {
-	testing() {
-		pushd tests &> /dev/null
-		PYTHONPATH="../build-${PYTHON_ABI}/lib" "$(PYTHON)" run_tests
-		popd &> /dev/null
-	}
-	python_execute_function testing
+python_test() {
+	pushd tests > /dev/null
+	"${PYTHON}" run_tests || die
+	popd > /dev/null
 }
diff --git a/perl-core/version/Manifest b/perl-core/version/Manifest
index 58c28ff4d227..7f26ab7bdb67 100644
--- a/perl-core/version/Manifest
+++ b/perl-core/version/Manifest
@@ -14,3 +14,4 @@ DIST version-0.9901.tar.gz 106769 SHA256 36999843c6e4bdc1cb3e85abd241c83ee459569
 DIST version-0.9902.tar.gz 107296 SHA256 9cc35db010df5e9d16c159942fc080962e5f9fb4110e7915bd63e8d9e190cd9d SHA512 cdcea81dac79e147e610e32440e1326e358399377e573f13e548fb0ee25a327922f4dc0d02573757f6f105a8af613bd63802bd945b66cd0dba68b006022d946e WHIRLPOOL 98e95ab7b2c72c9aca2d9f749309cd274b4b3b8c13affd90aa4d4c063989c61858ad4c80286e75ae08f5f1ed1292a8b0e6e8299a9f36eabbd091507e22ac6f79
 DIST version-0.9903.tar.gz 108336 SHA256 ea14e8ac8ecb0f084a32e6599d15bdc5a883674bd58b6b01ab5efb1452b66e0c SHA512 15588f0f34859294ab6880fd0e676759a603b27cfec23fc895be92e463fb2454aa647f613c354ee1a56ba7189a5989b0ecbbb93cb3bec969002201e3f9dd4db7 WHIRLPOOL 9fb5920fa575e37ae54d9f0054cebf8023d34d193ae5a834d18ba3ba2345cfc4d133f60942bd55ada4e36da010e0b9358f3c04fdf8645c0dfd63b771eb22072d
 DIST version-0.9904.tar.gz 108464 SHA256 96dc1f2f86444693ae880c2af6a0a0b83070501519a69fd6ae8517dfa893a541 SHA512 2e003694055bc26487127198c53c0da89b8103916b4cf4c7ba18a63c352a83cdcb2ca1cb62ca30e69ca5a47b38f75df37bffa54c5ba420abca2d2b1e61c5f560 WHIRLPOOL 7f78b241b5e18d2af9b389f66e3999e094f1bef1de4059511ccac42f7f44dd068703b547a6deaf23ff636d2b2b45e79c53c79b4a89670427f6f113d7ce27d221
+DIST version-0.9908.tar.gz 117483 SHA256 c45647ed172443608d201461b918348f3cf2bfc7d6f72ef98c014c1d4324085b SHA512 180624c6e274cce4f8be822f8335ec73e0cb392938b2b2b3e4e00136b02ca76bebe0a06481a21f97a701cf612a1d9f4fcadfc2f69153ebe9f82fa7d6ef8eb491 WHIRLPOOL be5dc6e58f0a56dbeb15ff0b4ae2b2fdfaec1d6b331a3b49d55fe81e99587ca623978438dd5e560f3e516aa191855b609c8f636bfa4ed8f7c55fe2ddff16040f
diff --git a/perl-core/version/version-0.990.800.ebuild b/perl-core/version/version-0.990.800.ebuild
new file mode 100644
index 000000000000..51daa8f74f94
--- /dev/null
+++ b/perl-core/version/version-0.990.800.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/perl-core/version/version-0.990.800.ebuild,v 1.1 2014/03/25 18:11:53 zlogene Exp $
+
+EAPI=5
+
+MODULE_AUTHOR=JPEACOCK
+MODULE_VERSION=0.9908
+inherit perl-module
+
+DESCRIPTION="Perl extension for Version Objects"
+
+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"
+IUSE=""
+
+SRC_TEST="do"
diff --git a/profiles/arch/powerpc/ppc32/use.stable.mask b/profiles/arch/powerpc/ppc32/use.stable.mask
new file mode 100644
index 000000000000..e2d647633fa7
--- /dev/null
+++ b/profiles/arch/powerpc/ppc32/use.stable.mask
@@ -0,0 +1,3 @@
+# Chí-Thanh Christopher Nguyễn (25 Mar 2014)
+# appears to not work correctly since mesa-10
+opencl
diff --git a/profiles/package.mask b/profiles/package.mask
index 29b9e5bb8bcb..b6efd0be791c 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
 ####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.15509 2014/03/24 21:40:51 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.15511 2014/03/25 17:24:32 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
@@ -48,12 +48,6 @@ media-plugins/vdr-ac3mode
 # not converted to xgettext handling, dead on upstream since ~2008
 media-plugins/vdr-bitstreamout
 
-# Ulrich Müller <ulm@gentoo.org> (23 Mar 2014)
-# Reintegrated into app-emacs/gnuserv.
-# See bug 177936, comment #9 and following for details.
-# Masked for removal in 30 days, bug 505432.
-app-emacs/gnuserv-programs
-
 # Rick Farina <zerochaos@gentoo.org> (22 Mar 2014)
 # Upstream has replaced dev-util/dissy with dev-util/emilpro
 # Please switch to emilpro or report issues in bug #505380
@@ -213,12 +207,6 @@ lxde-base/lxpolkit
 # Masked for removal in 60 days, bug 502168.
 app-emacs/delicious
 
-# Ulrich Müller <ulm@gentoo.org> (24 Feb 2014)
-# Does not work any more, AOL has shut off
-# the TOC2 protocol for the AIM service.
-# Masked for removal in 30 days, bug 502322.
-app-emacs/tnt
-
 # Ulrich Müller <ulm@gentoo.org> (15 Feb 2014)
 # Support library for app-emacs/prime-el, which is masked
 # for removal itself. No other reverse dependencies.
diff --git a/sci-chemistry/ccpn/Manifest b/sci-chemistry/ccpn/Manifest
index b8ae872bc310..35d840d1672d 100644
--- a/sci-chemistry/ccpn/Manifest
+++ b/sci-chemistry/ccpn/Manifest
@@ -9,3 +9,4 @@ DIST ccpn-update-2.3.1-140120.patch.xz 11404 SHA256 b01310884ccf27450d767b63e2f4
 DIST ccpn-update-2.3.1-140131.patch.xz 12620 SHA256 58906f4c2ee0845743d4b90e01bc95cd5051f05274dcc811040769e3b412345d SHA512 2e34f76ab396ebd925054f62d83a6dfca23ccffe6410f14149a39cf570700919e312f02b9e30db0d74a505cba4602e6b8d089d08035a52f22f4a59d2f77fadeb WHIRLPOOL 431f4fc1eb36b33fa306d75232e31ded222da20d345cad1d9715a255352ef0462720a8df6e7412927cf05ddce40b33805dd18edc2943906769634115d39829a0
 DIST ccpn-update-2.3.1-140205.patch.xz 14572 SHA256 b21b45375f52a968acbfd4c3371ba1b0417a0399ca7362214818467b1e4552d2 SHA512 8b9d5d35b0555341b5219a511fcf54a3f00249234a594f66c84c4e62f99bde7ff21937662fdd0c1c561bf3fd4d83830088b772e2bb474a071a1a7fe5ba970913 WHIRLPOOL 2f031e7540efa0c88db7e2b9c122210f9fd1a09c6c1d0eccaecbdebee116f8c1ac6baa65bc62b95e68296aa76072f090e4db9c2066631a787d4d3897bed66900
 DIST ccpn-update-2.3.1-140310.patch.xz 15000 SHA256 e589f02a41e6019fbb151af40275b574f36ac1a590ebec000d55c64b364ead47 SHA512 adfded0e611b0eae69e8e870d647c984f78cbcc2b7af1517abcc2fe3dee216ec7a513aca8346658dac17a47546f793f0ca0c9dcc6d4de8cbace731ee1f0826d6 WHIRLPOOL 67752aa2ed85902439fd7f5258afe8538ff5457c3fae47c57f268d393a4ae94e2ff18ba33091268d896da3fe5908732dc13a4909542df5684652ccb2e53020f3
+DIST ccpn-update-2.3.1-140325.patch.xz 18364 SHA256 956c92fbd54411703ad1c3457395107110aa9bdd28fbe1e5f2abf8f0645af00a SHA512 f1e2e7a7f5a57cf5bc88d0a043eae902fbbedf8473e641fa724fd6c54ff75f0e24c3dbcd595b0e9c5a839446ab215a9d48727f0236005e53b1d5d949481ad9c7 WHIRLPOOL a17ffa9a6845675a1b09683f2ebdd9353fe756f20df7211127d273a5622efce79b315af6eeff170a33db9c0fe02bd1923bf47c4ef2f99760710f758c6422ff5f
diff --git a/sci-chemistry/ccpn/ccpn-2.3.1_p140325.ebuild b/sci-chemistry/ccpn/ccpn-2.3.1_p140325.ebuild
new file mode 100644
index 000000000000..ce5c7cbbbe64
--- /dev/null
+++ b/sci-chemistry/ccpn/ccpn-2.3.1_p140325.ebuild
@@ -0,0 +1,166 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ccpn-2.3.1_p140325.ebuild,v 1.1 2014/03/25 17:37:39 jlec Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+PYTHON_REQ_USE="ssl,tk"
+
+inherit eutils flag-o-matic multilib portability python-single-r1 toolchain-funcs versionator
+
+PATCHSET="${PV##*_p}"
+MY_PN="${PN}mr"
+MY_PV="$(replace_version_separator 3 _ ${PV%%_p*})"
+MY_MAJOR="$(get_version_component_range 1-3)"
+
+DESCRIPTION="The Collaborative Computing Project for NMR"
+HOMEPAGE="http://www.ccpn.ac.uk/ccpn"
+SRC_URI="http://www-old.ccpn.ac.uk/download/${MY_PN}/analysis${MY_PV}r2.tar.gz"
+[[ -n ${PATCHSET} ]] \
+	&& SRC_URI+=" http://dev.gentoo.org/~jlec/distfiles/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch.xz"
+
+SLOT="0"
+LICENSE="|| ( CCPN LGPL-2.1 )"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+opengl"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	dev-lang/tk[threads]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-tcltk/tix
+	=sci-libs/ccpn-data-"${MY_MAJOR}"*[${PYTHON_USEDEP}]
+	sci-biology/psipred
+	x11-libs/libXext
+	x11-libs/libX11
+	opengl? (
+		media-libs/freeglut
+		dev-python/pyglet[${PYTHON_USEDEP}] )"
+DEPEND="${RDEPEND}"
+
+RESTRICT="mirror"
+
+S="${WORKDIR}"/${MY_PN}/${MY_PN}$(get_version_component_range 1-2)
+
+src_prepare() {
+	[[ -n ${PATCHSET} ]] && \
+		EPATCH_OPTS="-p2" epatch "${WORKDIR}"/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch
+
+	epatch "${FILESDIR}"/${MY_PV}-parallel.patch
+
+	append-lfs-flags
+
+	sed \
+		-e "/PSIPRED_DIR/s:'data':'share/psipred/data':g" \
+		-e "s:weights_s:weights:g" \
+		-i python/ccpnmr/analysis/wrappers/Psipred.py || die
+
+	local tk_ver
+	local myconf
+
+	tk_ver="$(best_version dev-lang/tk | cut -d- -f3 | cut -d. -f1,2)"
+
+	if use opengl; then
+		GLUT_NEED_INIT="-DNEED_GLUT_INIT"
+		IGNORE_GL_FLAG=""
+		GL_FLAG="-DUSE_GL_TRUE"
+		GL_DIR="${EPREFIX}/usr"
+		GL_LIB="-lglut -lGLU -lGL"
+		GL_INCLUDE_FLAGS="-I\$(GL_DIR)/include"
+		GL_LIB_FLAGS="-L\$(GL_DIR)/$(get_libdir)"
+
+	else
+		IGNORE_GL_FLAG="-DIGNORE_GL"
+		GL_FLAG="-DUSE_GL_FALSE"
+	fi
+
+	GLUT_NOT_IN_GL=""
+	GLUT_FLAG="\$(GLUT_NEED_INIT) \$(GLUT_NOT_IN_GL)"
+
+	rm -rf data model doc license || die
+
+	sed \
+		-e "s|/usr|${EPREFIX}/usr|g" \
+		-e "s|^\(CC =\).*|\1 $(tc-getCC)|g" \
+		-e "s|^\(OPT_FLAG =\).*|\1 ${CPPFLAGS} ${CFLAGS}|g" \
+		-e "s|^\(LINK_FLAGS =.*\)|\1 ${LDFLAGS}|g" \
+		-e "s|^\(IGNORE_GL_FLAG =\).*|\1 ${IGNORE_GL_FLAG}|g" \
+		-e "s|^\(GL_FLAG =\).*|\1 ${GL_FLAG}|g" \
+		-e "s|^\(GL_DIR =\).*|\1 ${GL_DIR}|g" \
+		-e "s|^\(GL_LIB =\).*|\1 ${GL_LIB}|g" \
+		-e "s|^\(GL_LIB_FLAGS =\).*|\1 ${GL_LIB_FLAGS}|g" \
+		-e "s|^\(GL_INCLUDE_FLAGS =\).*|\1 ${GL_INCLUDE_FLAGS}|g" \
+		-e "s|^\(GLUT_NEED_INIT =\).*|\1 ${GLUT_NEED_INIT}|g" \
+		-e "s|^\(GLUT_NOT_IN_GL =\).*|\1|g" \
+		-e "s|^\(X11_LIB_FLAGS =\).*|\1 -L${EPREFIX}/usr/$(get_libdir)|g" \
+		-e "s|^\(TCL_LIB_FLAGS =\).*|\1 -L${EPREFIX}/usr/$(get_libdir)|g" \
+		-e "s|^\(TK_LIB =\).*|\1 -ltk|g" \
+		-e "s|^\(TK_LIB_FLAGS =\).*|\1 -L${EPREFIX}/usr/$(get_libdir)|g" \
+		-e "s|^\(PYTHON_INCLUDE_FLAGS =\).*|\1 -I$(python_get_includedir)|g" \
+		-e "s|^\(PYTHON_LIB =\).*|\1 -l${EPYTHON}|g" \
+		c/environment_default.txt > c/environment.txt || die
+
+	sed \
+		-e 's:ln -s:cp -f:g' \
+		-i $(find python -name linkSharedObjs) || die
+}
+
+src_compile() {
+	emake -C c all
+	emake -C c links
+}
+
+src_install() {
+	local libdir
+	local tkver
+	local _wrapper
+
+	find . -name "*.pyc" -type f -delete || die
+
+	libdir=$(get_libdir)
+	tkver=$(best_version dev-lang/tk | cut -d- -f3 | cut -d. -f1,2)
+
+	_wrapper="analysis dangle dataShifter depositionFileImporter eci formatConverter pipe2azara xeasy2azara extendNmr"
+	for wrapper in ${_wrapper}; do
+		sed \
+			-e "s|gentoo_sitedir|$(python_get_sitedir)|g" \
+		   -e "s|gentoolibdir|${EPREFIX}/usr/${libdir}|g" \
+			-e "s|gentootk|${EPREFIX}/usr/${libdir}/tk${tkver}|g" \
+			-e "s|gentootcl|${EPREFIX}/usr/${libdir}/tclk${tkver}|g" \
+			-e "s|gentoopython|${EPYTHON}|g" \
+			-e "s|gentoousr|${EPREFIX}/usr|g" \
+			-e "s|//|/|g" \
+			"${FILESDIR}"/${wrapper} > "${T}"/${wrapper} || die "Fail fix ${wrapper}"
+		dobin "${T}"/${wrapper}
+	done
+
+	local in_path=$(python_get_sitedir)/${PN}
+	local files
+	local pydocs
+
+	pydocs="$(find python -name doc -type d)"
+	rm -rf ${pydocs} || die
+
+	for i in python/memops/format/compatibility/{Converters,part2/Converters2}.py; do
+	sed \
+		-e 's|#from __future__|from __future__|g' \
+		-i ${i} || die
+	done
+
+	dodir ${in_path#${EPREFIX}}/c
+
+	ebegin "Installing main files"
+		python_moduleinto ${PN}
+		python_domodule python
+	eend
+
+	ebegin "Adjusting permissions"
+	for _file in $(find "${ED}" -type f -name "*so"); do
+		chmod 755 ${_file}
+	done
+	eend
+	python_optimize
+}
diff --git a/sci-libs/scipy/scipy-0.13.3.ebuild b/sci-libs/scipy/scipy-0.13.3.ebuild
index f0f27dca3c87..97a4803a7fdd 100644
--- a/sci-libs/scipy/scipy-0.13.3.ebuild
+++ b/sci-libs/scipy/scipy-0.13.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/sci-libs/scipy/scipy-0.13.3.ebuild,v 1.2 2014/03/18 20:26:21 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/scipy-0.13.3.ebuild,v 1.4 2014/03/25 19:42:14 bicatali Exp $
 
 EAPI=5
 
@@ -53,19 +53,19 @@ src_unpack() {
 
 pc_incdir() {
 	$(tc-getPKG_CONFIG) --cflags-only-I $@ | \
-		sed -e 's/^-I//' -e 's/[ ]*-I/:/g' -e 's/[ ]*$//'
+		sed -e 's/^-I//' -e 's/[ ]*-I/:/g' -e 's/[ ]*$//' -e 's|^:||'
 }
 
 pc_libdir() {
 	$(tc-getPKG_CONFIG) --libs-only-L $@ | \
-		sed -e 's/^-L//' -e 's/[ ]*-L/:/g' -e 's/[ ]*$//'
+		sed -e 's/^-L//' -e 's/[ ]*-L/:/g' -e 's/[ ]*$//' -e 's|^:||'
 }
 
 pc_libs() {
 	$(tc-getPKG_CONFIG) --libs-only-l $@ | \
 		sed -e 's/[ ]-l*\(pthread\|m\)\([ ]\|$\)//g' \
 		-e 's/^-l//' -e 's/[ ]*-l/,/g' -e 's/[ ]*$//' \
-		tr ',' '\n' | sort | uniq | tr '\n' ','
+		| tr ',' '\n' | sort -u | tr '\n' ',' | sed -e 's|,$||'
 }
 
 python_prepare_all() {
diff --git a/sys-apps/netplug/Manifest b/sys-apps/netplug/Manifest
index 8f7b014b6e1f..ebf69a0f3b6f 100644
--- a/sys-apps/netplug/Manifest
+++ b/sys-apps/netplug/Manifest
@@ -1,3 +1 @@
-DIST netplug-1.2.9.1.tar.bz2 22288 SHA256 bcc7d83975e25b8b2148835f21da3e722c1a0d8a84e828b4dbbf685b3086d056 SHA512 da6a50c3b837d5df9c7736e87782cdf3bb4e493943dab61dac45265f7eb998041efbc5b0cf5a105c4040c44c5a9455374ed0f2a4fa84d8e6a5df1b0cf0294efc WHIRLPOOL 51c3cebd1bfd5278f8c54024d793c79ce313068c0048ee991e0a1946c499932d604f6fa5d01a4de52bd4a5dd0f533ae7fe85c230d3605d860534d478e196786a
 DIST netplug-1.2.9.2.tar.bz2 22332 SHA256 5180dfd9a7d3d0633a027b0a04f01b45a6a64623813cd48bd54423b90814864e SHA512 b68a00eb8874ec7dd6aa9f7b7f529a6e1d9ecece4b798c8cee996b7f3534c556656f642de0ac4b2a6d06fbaf18e3bfaab00934a9292b95939a4935e673e9ca8c WHIRLPOOL 51d54d4c7784b82b71b3a8964c9df3f17e8df1b21b11a95250f911c6f0917aabab1bf0fe5117884623b3222b1df0c443ce4416ad74f63c0d761f762e5f39216f
-DIST netplug-1.2.9.tar.bz2 21786 SHA256 15e7928c819c72108432b0d573110630ff6eb2f7be05e5a6dc1dc04fa05f63b1 SHA512 fb3feb2658e3314b04c2922b9fa461df9560be54a502307f090b4a86b3c4109e68bfd6fdf5a574199fa527de52002dfbc935994cb667c9242194c82499ac746e WHIRLPOOL 2844f99b3557f299cf43402bf0ba1e18c22efe1801dee5ebe660418cc92a297366fd4efaecff049464a40be858c02ef82f147212109b43cac97c98ec604ee953
diff --git a/sys-apps/netplug/files/netplug b/sys-apps/netplug/files/netplug
deleted file mode 100755
index 9105656d9c57..000000000000
--- a/sys-apps/netplug/files/netplug
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/bin/sh
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-#
-# Gentoo-specific netplug script 
-#
-# This file gets called by netplug when it wants to bring an interface
-# up or down.
-#
-
-IFACE="$1"
-ACTION="$2"
-
-if grep -q initng /proc/1/cmdline 
-then
-    EXEC="/sbin/ngc"
-    INITNG="yes"
-else
-    EXEC="/etc/init.d/net.${IFACE}"
-    INITNG="no"
-fi
-
-case "${ACTION}" in
-    in)
-	if [ "${INITNG}" = "yes" ]
-	then
-	    ARGS="-u net/${IFACE}"
-	else
-	    ARGS="--quiet start"
-	fi
-	;;
-    out)
-	if [ "${INITNG}" = "yes" ]
-	then
-	    ARGS="-d net/${IFACE}"
-	else
-	    ARGS="--quiet stop"
-	fi
-	;;
-    probe)
-	# Do nothing as we should already be up
-	exit 0
-	;;
-    *)
-	echo "$0: wrong arguments" >&2
-	echo "Call with <interface> <in|out|probe>" >&2
-	exit 1
-	;;
-esac
-
-export IN_BACKGROUND=true
-
-if [ -x "${EXEC}" ]
-then
-    ${EXEC} ${ARGS}
-    exit 0
-else
-    logger -t netplug "Error: Couldn't configure ${IFACE}, no ${EXEC} !"
-    exit 1
-fi
-
-# vim: set ts=4
diff --git a/sys-apps/netplug/files/netplug-1.2.9-gcc4.patch b/sys-apps/netplug/files/netplug-1.2.9-gcc4.patch
deleted file mode 100644
index 6a9d420400a7..000000000000
--- a/sys-apps/netplug/files/netplug-1.2.9-gcc4.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- netlink.c.orig	2005-09-02 11:06:57.045223697 +0100
-+++ netlink.c	2005-09-02 11:11:30.637151062 +0100
-@@ -284,7 +284,7 @@
-         exit(1);
-     }
- 
--    int addr_len = sizeof(addr);
-+    socklen_t addr_len = sizeof(addr);
- 
-     if (getsockname(fd, (struct sockaddr *) &addr, &addr_len) == -1) {
-         do_log(LOG_ERR, "Could not get socket details: %m");
diff --git a/sys-apps/netplug/files/netplug-1.2.9-remove-werror.patch b/sys-apps/netplug/files/netplug-1.2.9-remove-werror.patch
deleted file mode 100644
index a15fdd269d9e..000000000000
--- a/sys-apps/netplug/files/netplug-1.2.9-remove-werror.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile	2009-02-25 23:31:40.000000000 +0000
-+++ Makefile	2009-02-25 23:30:52.000000000 +0000
-@@ -9,7 +9,7 @@
- 
- install_opts :=
- 
--CFLAGS += -Wall -Werror -std=gnu99 -DNP_ETC_DIR='"$(etcdir)"' \
-+CFLAGS += -Wall -std=gnu99 -DNP_ETC_DIR='"$(etcdir)"' \
- 	-DNP_SCRIPT_DIR='"$(scriptdir)"' -DNP_VERSION='"$(version)"'
- 
- netplugd: config.o netlink.o lib.o if_info.o main.o
diff --git a/sys-apps/netplug/files/netplug-1.2.9-warn_unused_result_write_call.patch b/sys-apps/netplug/files/netplug-1.2.9-warn_unused_result_write_call.patch
deleted file mode 100644
index 023fbe8e55c9..000000000000
--- a/sys-apps/netplug/files/netplug-1.2.9-warn_unused_result_write_call.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/main.c	2005-01-08 06:57:09.000000000 +0100
-+++ b/main.c	2009-02-07 11:30:37.017300663 +0100
-@@ -155,13 +155,22 @@
- {
-     struct child_exit ce;
-     int ret;
-+    ssize_t s = 0;
- 
-     assert(sig == SIGCHLD);
- 
-     ce.pid = info->si_pid;
-     ret = waitpid(info->si_pid, &ce.status, 0);
-     if (ret == info->si_pid)
--        write(child_handler_pipe[1], &ce, sizeof(ce));
-+    {
-+        s = write(child_handler_pipe[1], &ce, sizeof(ce));
-+
-+	if (s == -1)
-+	{
-+	    do_log(LOG_ERR, "can't write into pipe");
-+	    exit(1);
-+	}
-+    }
- }
- 
- /* Poll the existing interface state, so we can catch any state
diff --git a/sys-apps/netplug/netplug-1.2.9-r5.ebuild b/sys-apps/netplug/netplug-1.2.9-r5.ebuild
deleted file mode 100644
index 9c78a56de05e..000000000000
--- a/sys-apps/netplug/netplug-1.2.9-r5.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/netplug/netplug-1.2.9-r5.ebuild,v 1.5 2012/03/17 22:49:47 mattst88 Exp $
-
-inherit eutils toolchain-funcs
-DESCRIPTION="Brings up/down ethernet ports automatically with cable detection"
-HOMEPAGE="http://www.red-bean.com/~bos/"
-SRC_URI="http://www.red-bean.com/~bos/netplug/${P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ppc sparc x86"
-IUSE=""
-
-hax_bitkeeper() {
-	# the makefiles have support for bk ...
-	# basically we have to do this or bk will try to write
-	# to files in /opt/bitkeeper causing sandbox violations ;(
-	mkdir "${T}/fakebin"
-	echo "#!/bin/sh"$'\n'"exit 1" > "${T}/fakebin/bk"
-	chmod a+x "${T}/fakebin/bk"
-	export PATH="${T}/fakebin:${PATH}"
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Remove debugging from Makefile
-	# Remove -O3 if we have -O[0-9,s] in our CFLAGS
-	local remove=" -ggdb3 "
-	[[ " ${CFLAGS} " == *" -O"[0-9,s]" "* ]] && remove="${remove}-O3 "
-	sed -i -e "s/${remove}/ /" Makefile
-
-	# Use correct structure for getsockname arg 3
-	epatch "${FILESDIR}/${P}-gcc4.patch"
-
-	# Remove nested functions, #116140
-	epatch "${FILESDIR}/${P}-remove-nest.patch"
-
-	# Ignore wireless events
-	epatch "${FILESDIR}/${P}-ignore-wireless.patch"
-
-	# warn_unused_result of write POSIX function (which can fails)
-	epatch "${FILESDIR}/${P}-warn_unused_result_write_call.patch"
-
-	# remove -Werror from makefile
-	epatch "${FILESDIR}/${P}-remove-werror.patch"
-}
-
-src_compile() {
-	tc-export CC
-	hax_bitkeeper
-	make CC="${CC}" || die "emake failed"
-}
-
-src_install() {
-	into /
-	dosbin netplugd
-	doman man/man8/netplugd.8
-
-	dodir /etc/netplug.d
-	exeinto /etc/netplug.d
-	doexe "${FILESDIR}/netplug"
-
-	dodir /etc/netplug
-	echo "eth*" > "${D}"/etc/netplug/netplugd.conf
-}
diff --git a/sys-apps/netplug/netplug-1.2.9.1.ebuild b/sys-apps/netplug/netplug-1.2.9.1.ebuild
deleted file mode 100644
index b2caa161ce93..000000000000
--- a/sys-apps/netplug/netplug-1.2.9.1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/netplug/netplug-1.2.9.1.ebuild,v 1.1 2010/02/22 09:50:14 volkmar Exp $
-
-EAPI="2"
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Brings up/down ethernet ports automatically with cable detection"
-HOMEPAGE="http://www.red-bean.com/~bos/"
-SRC_URI="http://www.red-bean.com/~bos/netplug/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"
-IUSE="debug doc"
-
-DEPEND="doc? ( app-text/ghostscript-gpl
-		media-gfx/graphviz )"
-RDEPEND=""
-
-src_prepare() {
-	# Remove debug flags from CFLAGS
-	if ! use debug; then
-		sed -i -e "s/ -ggdb3//" Makefile || die "sed failed"
-	fi
-
-	# Remove -O3 and -Werror from CFLAGS
-	sed -i -e "s/ -O3//" -e "s/ -Werror//" Makefile || die "sed failed"
-
-	# Remove nested functions, #116140
-	epatch "${FILESDIR}/${PN}-1.2.9-remove-nest.patch"
-
-	# Ignore wireless events
-	epatch "${FILESDIR}/${PN}-1.2.9-ignore-wireless.patch"
-
-	# warn_unused_result of write POSIX function (which can fails)
-	epatch "${FILESDIR}/${PN}-1.2.9-warn_unused_result_write_call.patch"
-}
-
-src_compile() {
-	tc-export CC
-	emake CC="${CC}" || die "emake failed"
-
-	if use doc; then
-		emake -C docs/ || die "emake failed"
-	fi
-}
-
-src_install() {
-	into /
-	dosbin netplugd
-	doman man/man8/netplugd.8
-
-	dodir /etc/netplug.d
-	exeinto /etc/netplug.d
-	doexe "${FILESDIR}/netplug"
-
-	dodir /etc/netplug
-	echo "eth*" > "${D}"/etc/netplug/netplugd.conf
-
-	dodoc ChangeLog NEWS README TODO || die "dodoc failed"
-
-	if use doc; then
-		dodoc docs/state-machine.ps || die "dodoc failed"
-	fi
-}
diff --git a/sys-apps/netplug/netplug-1.2.9.2-r1.ebuild b/sys-apps/netplug/netplug-1.2.9.2-r1.ebuild
index f49577c25ab0..d505050c44b0 100644
--- a/sys-apps/netplug/netplug-1.2.9.2-r1.ebuild
+++ b/sys-apps/netplug/netplug-1.2.9.2-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/netplug/netplug-1.2.9.2-r1.ebuild,v 1.7 2014/03/12 10:10:48 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/netplug/netplug-1.2.9.2-r1.ebuild,v 1.8 2014/03/25 11:03:47 polynomial-c Exp $
 
-EAPI=4
+EAPI=5
 
 inherit eutils toolchain-funcs
 
@@ -22,11 +22,11 @@ RDEPEND=""
 src_prepare() {
 	# Remove debug flags from CFLAGS
 	if ! use debug; then
-		sed -i -e "s/ -ggdb3//" Makefile || die "sed failed"
+		sed -i -e "s/ -ggdb3//" Makefile || die
 	fi
 
 	# Remove -O3 and -Werror from CFLAGS
-	sed -i -e "s/ -O3//" -e "s/ -Werror//" Makefile || die "sed failed"
+	sed -i -e "s/ -O3//" -e "s/ -Werror//" Makefile || die
 
 	# Remove nested functions, #116140
 	epatch "${FILESDIR}/${PN}-1.2.9-remove-nest.patch"
@@ -37,10 +37,10 @@ src_prepare() {
 
 src_compile() {
 	tc-export CC
-	emake CC="${CC}" || die "emake failed"
+	emake CC="${CC}"
 
 	if use doc; then
-		emake -C docs/ || die "emake failed"
+		emake -C docs/
 	fi
 }
 
@@ -54,11 +54,11 @@ src_install() {
 	newexe "${FILESDIR}/netplug-2" netplug
 
 	dodir /etc/netplug
-	echo "eth*" > "${D}"/etc/netplug/netplugd.conf
+	echo "eth*" > "${D}"/etc/netplug/netplugd.conf || die
 
-	dodoc ChangeLog NEWS README TODO || die "dodoc failed"
+	dodoc ChangeLog NEWS README TODO
 
 	if use doc; then
-		dodoc docs/state-machine.ps || die "dodoc failed"
+		dodoc docs/state-machine.ps
 	fi
 }
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 3d04ef2fbaf3..f71447bba360 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,11 +1,9 @@
-DIST portage-2.1.11.62.tar.bz2 916085 SHA256 894bd50830264d222210f5417448263355830d5d8d2de446c1b6b3a4c7a14bfb SHA512 1a969c5164871ce12cc87014f69d44fc54c11a2c58d472fc0dfaa82e9561fbfeac442a3b8a0d5cccd39b117f762acfc0e7abcc00c2e16719940e93746a7c4ba7 WHIRLPOOL b681b290e98162ba7f770b4e5d63d5b42398ecd325629a166b158a6e3becd15de5bae8b4a5808612a5a9529683e544473f33d030f20838fb03086501b7e89cc2
 DIST portage-2.1.12.2.tar.bz2 868695 SHA256 700cf7118d60aa14a2d759887e50988a3e527e04fe980100f25cc69357ae2437 SHA512 53bfbcad9743b2613501191f4883d0b99d1e99ca6fdff550996121cb47c7b8333837d825f6174cb82f83cc16069ebe66a0aba0cc7b13f86a65a055d961e2c70b WHIRLPOOL 736dcc71a323d83c7fd75aa9f5c047b0fe234c66545a1744a2d69ca1b15af4d9bc60d9dfb2f9e76f1645e4d9c061f86bc56f4beac4e146b5cef970198b9010f6
 DIST portage-2.1.6.7.patch.bz2 50118 SHA256 5f0605b51a24d23703330b040d2f7154322284db3e0cefa7499002ff1fa733c0 SHA512 dd2acc1d436cad77cfc83c4dec79316763c1fb88d61b7702e8e47e6f31b2b9fe49e8a4cf4a947614a2acd6db2ef080ed8b4ae5fce9d9be29d7e218a0ec1576c0 WHIRLPOOL 050f923249fde7c4774a2a8a944889e4270a89b00441f1923c01ab0be38f107503e018d7ab7a7f42615e7e375f0f6c0eb3bdbf3ff4ce1ce226957238a729b1ee
 DIST portage-2.1.6.7_p1.patch.bz2 4741 SHA256 ddaae2ad8c01e6477bfe22e23a4da57eb9d079a27a17a08385d56fe2c49eec30 SHA512 39058d815827b340787d813515ed4fb8c52c4fb0caa12ae70c8a9a97b9ba16c2bf4177190cb7d1c508055ce8a7aaa390ba9b31642c7d74bfb4a14d729e720617 WHIRLPOOL 8eab9574ed2e6cabac593d93f8b6ff71465c01376e7eec4cf357c336b5ed3d4f3fb3521991148ba4e34ba00c56bec5534c98311167c03866812277a8d88b0494
 DIST portage-2.1.6.tar.bz2 518771 SHA256 b1c507445b3858449c861568f477e1cfab8b2326ded906b852c5193fb3839647 SHA512 d035f84601802ecaea3c0edea037a783fec743733bd40895eb5bb8a220449eb24cf1e2623cbca2e378197caba63a833d8cc54f1e49d886266307288b0adcfbdc WHIRLPOOL 25b6a6e3810f428c630ec7a6dc3cf2cfbe6bfdf276553786e1436b2630532ab442186e427bc75f249a224c5171b508a92303ce352b07be1a8a4d805c568ec10f
 DIST portage-2.2.1.tar.bz2 901964 SHA256 fe75ead9460bae22d66c18e263e3fc71b9e9415c8d5aa737351997fd2a42dde7 SHA512 775544325d3258d958126241c3a6c332eb222da6f3aeb7b4363d1ab76839cf50c8fcce0d3108648045bbcae4470ef2314806ca5ff71abf1bae6d0b51ea3c5803 WHIRLPOOL 6a0b24d7df52e07716e5518f1c31ac52d5d14c0ad5e117c40ba8e852e7aa3c63ecbdf375b83127f1070a0e2a5083820f81799da1b7ec1d18dcd0455e3ed985fd
-DIST portage-2.2.6.tar.bz2 905246 SHA256 fec92d3315537c83893b7baed2db52d59fc173adebb4a4469f840978643f4feb SHA512 6721e3e9b42412aea3a4df58f8b61d5d4a7aa0c90de977517442580144bef3d4a62cd65c138f3dcf70369286d2838d57ee5096f44ee11bf57c6e0b0e782b3da3 WHIRLPOOL ee54737d0b75dc2ee2106650a6c9a17d5e37148dc9dad670186b8552a4410b93b525b7e872448c99f9e1675aa18cf444353aa76f79e3d1f35e4d9e07e08bbea6
+DIST portage-2.2.10.tar.bz2 878039 SHA256 f463a98062f09f41da680ba7d20621b3076de86844a04340725df7d734965fa2 SHA512 4f563a67388b2593f08833281f6da004dd6af3a7e697b89d735ab24b8b9f43e1d1e66202f8607710dcde6423672d6f97c7ad32c7f983f8491a05543e453fedae WHIRLPOOL 0f2fd79ba4117c1cf328c9e08ac35990869b0518ee8eba10453b6c957a351159de4f3c0b7e7242f8b89c2504d4403e7ed36c8c2da010fa2ec75e3f9e67858069
 DIST portage-2.2.7.tar.bz2 906952 SHA256 005af49dbf9a58425b1f47904ce4d2398eb2155082169ec50215319e876273af SHA512 326623785bdf80e11a05a3c9ed0549a659d4549f1636d4fed2b204a3b751941ea101a12f75323eda86c224f7a7b67638e2fe0572327879a73d1721cfaf5be40b WHIRLPOOL 1c989c016503b1ad189fcdff26fce3e77aa5b0f9c1d4830fd99e5120a49c9dafb1220a30b61cddd84b3db824e738eac993e8944fafed85417fafa0dda6eeedbc
 DIST portage-2.2.8.tar.bz2 874672 SHA256 c1074e01173df5384e003598dbc5f64f09e92f83fd26faab2f88f9f0bc64aa7e SHA512 acc47d94ff8c08e5a7bf2d4c4e600863430dd1e7d0bb8b4254d6477a498933cae663db84debf9487d2243c2cba689629ef8e8b6cf108e10d40e89e8e8d7e1257 WHIRLPOOL d54290ede8d3d85e5211cda7e86ed740178121ef2f47cf0858c27941d8679d29c11445befff962986d40a47ded50d0d4654de19e7d4aef3fdf2546655a0d6fe2
-DIST portage-2.2.9.tar.bz2 882379 SHA256 2711c41e4411ea2cf855312d5f9ea55b4f96df4f47e7fa74ebebd3d208b3f860 SHA512 713563e95f8196011b53cbcc6f5251ff94b5a390264d23a1948c4ee5f6c664abf86aef1c944d73c2381008c7f4eeb0a647ffcb2dfcda7d709da4d549a69a1c5a WHIRLPOOL 8759b333a062e47f07ef52ef77d075e1daf01196805e7f57f109ce3d798d90d92e48b1377be56cbd19d766e17d577a000afed8bf598b2a4320d0689e51131ca0
 DIST portage-man-pl-2.1.2.tar.bz2 53893 SHA256 960eaa7c6f3a2af44bdc665266a8e884628a562373cc477d301597ecc5ef961f SHA512 5f5c8dd1559048546633b1e7291ff8c0f5d637595f1a4c98405424b08c30c089fc9359e0214f78fbe358754f20d327794f4692b9b67639585c29b755975ee853 WHIRLPOOL 756e267b84077501d976f46fa448cda5368cd52aeca6ec43d109c81fe8e2364e0cd0f35630d68a4186c70e3b440b7c870b86ac7ef83cc0afa43e10f9f8e1f422
diff --git a/sys-apps/portage/portage-2.1.11.62.ebuild b/sys-apps/portage/portage-2.1.11.62.ebuild
deleted file mode 100644
index 92019463a7e9..000000000000
--- a/sys-apps/portage/portage-2.1.11.62.ebuild
+++ /dev/null
@@ -1,402 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.11.62.ebuild,v 1.15 2014/01/17 06:16:22 vapier Exp $
-
-# Require EAPI 2 since we now require at least python-2.6 (for python 3
-# syntax support) which also requires EAPI 2.
-EAPI=2
-PYTHON_COMPAT=(
-	pypy2_0
-	python3_2 python3_3 python3_4
-	python2_6 python2_7
-)
-inherit eutils multilib
-
-DESCRIPTION="Portage is the package management and distribution system for Gentoo"
-HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-SLOT="0"
-IUSE="build doc epydoc +ipc linguas_pl linguas_ru pypy2_0 python2 python3 selinux xattr"
-
-for _pyimpl in ${PYTHON_COMPAT[@]} ; do
-	IUSE+=" python_targets_${_pyimpl}"
-done
-unset _pyimpl
-
-# Import of the io module in python-2.6 raises ImportError for the
-# thread module if threading is disabled.
-python_dep_ssl="python3? ( =dev-lang/python-3*[ssl] )
-	!pypy2_0? ( !python2? ( !python3? (
-		|| ( >=dev-lang/python-2.7[ssl] dev-lang/python:2.6[threads,ssl] )
-	) ) )
-	pypy2_0? ( !python2? ( !python3? ( virtual/pypy:2.0[bzip2] ) ) )
-	python2? ( !python3? ( || ( dev-lang/python:2.7[ssl] dev-lang/python:2.6[ssl,threads] ) ) )"
-python_dep="${python_dep_ssl//\[ssl\]}"
-python_dep="${python_dep//,ssl}"
-python_dep="${python_dep//ssl,}"
-
-python_dep="${python_dep}
-	python_targets_pypy2_0? ( virtual/pypy:2.0 )
-	python_targets_python2_6? ( dev-lang/python:2.6 )
-	python_targets_python2_7? ( dev-lang/python:2.7 )
-	python_targets_python3_2? ( dev-lang/python:3.2 )
-	python_targets_python3_3? ( dev-lang/python:3.3 )
-	python_targets_python3_4? ( dev-lang/python:3.4 )
-"
-
-# The pysqlite blocker is for bug #282760.
-# make-3.82 is for bug #455858
-DEPEND="${python_dep}
-	>=sys-devel/make-3.82
-	>=sys-apps/sed-4.0.5 sys-devel/patch
-	doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
-	epydoc? ( >=dev-python/epydoc-2.0 !<=dev-python/pysqlite-2.4.1 )"
-# Require sandbox-2.2 for bug #288863.
-# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's
-# quite slow, so it's not considered in the dependencies as an alternative to
-# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so
-# for now, don't pull in xattr deps for other kernels.
-# For whirlpool hash, require python[ssl] or python-mhash (bug #425046).
-# For compgen, require bash[readline] (bug #445576).
-RDEPEND="${python_dep}
-	!build? ( >=sys-apps/sed-4.0.5
-		|| ( >=app-shells/bash-4.2_p37[readline] ( <app-shells/bash-4.2_p37 >=app-shells/bash-3.2_p17 ) )
-		>=app-admin/eselect-1.2
-		|| ( ${python_dep_ssl} dev-python/python-mhash )
-	)
-	elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
-	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
-	elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
-	>=app-misc/pax-utils-0.1.17
-	xattr? ( kernel_linux? ( || ( >=dev-lang/python-3.3_pre20110902 dev-python/pyxattr ) ) )
-	selinux? ( || ( >=sys-libs/libselinux-2.0.94[python] <sys-libs/libselinux-2.0.94 ) )
-	!<app-shells/bash-3.2_p17
-	!<app-admin/logrotate-3.8.0"
-PDEPEND="
-	!build? (
-		>=net-misc/rsync-2.6.4
-		userland_GNU? ( >=sys-apps/coreutils-6.4 )
-	)"
-# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
-# NOTE: FEATURES=installsources requires debugedit and rsync
-
-SRC_ARCHIVES="http://dev.gentoo.org/~zmedico/portage/archives"
-
-prefix_src_archives() {
-	local x y
-	for x in ${@}; do
-		for y in ${SRC_ARCHIVES}; do
-			echo ${y}/${x}
-		done
-	done
-}
-
-PV_PL="2.1.2"
-PATCHVER_PL=""
-TARBALL_PV=$PV
-SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
-	$(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)
-	linguas_pl? ( mirror://gentoo/${PN}-man-pl-${PV_PL}.tar.bz2
-		$(prefix_src_archives ${PN}-man-pl-${PV_PL}.tar.bz2) )"
-
-PATCHVER=
-[[ $TARBALL_PV = $PV ]] || PATCHVER=$PV
-if [ -n "${PATCHVER}" ]; then
-	SRC_URI="${SRC_URI} mirror://gentoo/${PN}-${PATCHVER}.patch.bz2
-	$(prefix_src_archives ${PN}-${PATCHVER}.patch.bz2)"
-fi
-
-S="${WORKDIR}"/${PN}-${TARBALL_PV}
-S_PL="${WORKDIR}"/${PN}-${PV_PL}
-
-compatible_python_is_selected() {
-	[[ $(/usr/bin/python -c 'import sys ; sys.stdout.write(sys.hexversion >= 0x2060000 and "good" or "bad")') = good ]]
-}
-
-current_python_has_xattr() {
-	[[ ${EPYTHON} ]] || die 'No Python implementation set (EPYTHON is null).'
-	local PYTHON=/usr/bin/${EPYTHON}
-	[[ $("${PYTHON}" -c 'import sys ; sys.stdout.write(sys.hexversion >= 0x3030000 and "yes" or "no")') = yes ]] || \
-	"${PYTHON}" -c 'import xattr' 2>/dev/null
-}
-
-call_with_python_impl() {
-	[[ ${EPYTHON} ]] || die 'No Python implementation set (EPYTHON is null).'
-	env EPYTHON=${EPYTHON} "$@"
-}
-
-get_python_interpreter() {
-	[ $# -eq 1 ] || die "expected 1 argument, got $#: $*"
-	local impl=$1 python
-	case "${impl}" in
-		python*)
-			python=${impl/_/.}
-			;;
-		pypy*)
-			python=${impl/_/.}
-			python=${python/pypy/pypy-c}
-			;;
-		*)
-			die "Unrecognized python target: ${impl}"
-	esac
-	echo ${python}
-}
-
-get_python_sitedir() {
-	[ $# -eq 1 ] || die "expected 1 argument, got $#: $*"
-	local impl=$1
-	local site_dir=/usr/$(get_libdir)/${impl/_/.}/site-packages
-	[[ -d ${ROOT}${site_dir} ]] || \
-		ewarn "site-packages dir missing for ${impl}: ${ROOT}${site_dir}"
-	echo "${site_dir}"
-}
-
-python_compileall() {
-	[[ ${EPYTHON} ]] || die 'No Python implementation set (EPYTHON is null).'
-	local d=$1 PYTHON=/usr/bin/${EPYTHON}
-	local d_image=${D}${d#/}
-	[[ -d ${d_image} ]] || die "directory does not exist: ${d_image}"
-	case "${EPYTHON}" in
-		python*)
-			"${PYTHON}" -m compileall -q -f -d "${d}" "${d_image}" || die
-			# Note: Using -OO breaks emaint, since it requires __doc__,
-			# and __doc__ is None when -OO is used.
-			"${PYTHON}" -O -m compileall -q -f -d "${d}" "${d_image}" || die
-			;;
-		pypy*)
-			"${PYTHON}" -m compileall -q -f -d "${d}" "${d_image}" || die
-			;;
-		*)
-			die "Unrecognized EPYTHON value: ${EPYTHON}"
-	esac
-}
-
-pkg_setup() {
-	if use python2 && use python3 ; then
-		ewarn "Both python2 and python3 USE flags are enabled, but only one"
-		ewarn "can be in the shebangs. Using python3."
-	fi
-	if use pypy2_0 && use python3 ; then
-		ewarn "Both pypy2_0 and python3 USE flags are enabled, but only one"
-		ewarn "can be in the shebangs. Using python3."
-	fi
-	if use pypy2_0 && use python2 ; then
-		ewarn "Both pypy2_0 and python2 USE flags are enabled, but only one"
-		ewarn "can be in the shebangs. Using python2"
-	fi
-	if ! use pypy2_0 && ! use python2 && ! use python3 && \
-		! compatible_python_is_selected ; then
-		ewarn "Attempting to select a compatible default python interpreter"
-		local x success=0
-		for x in /usr/bin/python2.* ; do
-			x=${x#/usr/bin/python2.}
-			if [[ $x -ge 6 ]] 2>/dev/null ; then
-				eselect python set python2.$x
-				if compatible_python_is_selected ; then
-					elog "Default python interpreter is now set to python-2.$x"
-					success=1
-					break
-				fi
-			fi
-		done
-		if [ $success != 1 ] ; then
-			eerror "Unable to select a compatible default python interpreter!"
-			die "This version of portage requires at least python-2.6 to be selected as the default python interpreter (see \`eselect python --help\`)."
-		fi
-	fi
-
-	# We use EPYTHON to designate the active python interpreter,
-	# but we only export when needed, via call_with_python_impl.
-	EPYTHON=python
-	export -n EPYTHON
-	if use python3; then
-		EPYTHON=python3
-	elif use python2; then
-		EPYTHON=python2
-	elif use pypy2_0; then
-		EPYTHON=pypy-c2.0
-	fi
-}
-
-src_prepare() {
-	if [ -n "${PATCHVER}" ] ; then
-		if [[ -L $S/bin/ebuild-helpers/portageq ]] ; then
-			rm "$S/bin/ebuild-helpers/portageq" \
-				|| die "failed to remove portageq helper symlink"
-		fi
-		epatch "${WORKDIR}/${PN}-${PATCHVER}.patch"
-	fi
-	einfo "Setting portage.VERSION to ${PVR} ..."
-	sed -e "s/^VERSION=.*/VERSION=\"${PVR}\"/" -i pym/portage/__init__.py || \
-		die "Failed to patch portage.VERSION"
-	sed -e "1s/VERSION/${PVR}/" -i doc/fragment/version || \
-		die "Failed to patch VERSION in doc/fragment/version"
-	sed -e "1s/VERSION/${PVR}/" -i $(find man -type f) || \
-		die "Failed to patch VERSION in man page headers"
-
-	if ! use ipc ; then
-		einfo "Disabling ipc..."
-		sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
-			-i pym/_emerge/AbstractEbuildProcess.py || \
-			die "failed to patch AbstractEbuildProcess.py"
-	fi
-
-	if use xattr && use kernel_linux ; then
-		einfo "Adding FEATURES=xattr to make.globals ..."
-		echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
-			|| die "failed to append to make.globals"
-	fi
-
-	local set_shebang=
-	if use python3; then
-		set_shebang=python3
-	elif use python2; then
-		set_shebang=python2
-	elif use pypy2_0; then
-		set_shebang=pypy-c2.0
-	fi
-	if [[ -n ${set_shebang} ]] ; then
-		einfo "Converting shebangs for ${set_shebang}..."
-		while read -r -d $'\0' ; do
-			local shebang=$(head -n1 "$REPLY")
-			if [[ ${shebang} == "#!/usr/bin/python"* ]] ; then
-				sed -i -e "1s:python:${set_shebang}:" "$REPLY" || \
-					die "sed failed"
-			fi
-		done < <(find . -type f -print0)
-	fi
-
-	cd "${S}/cnf" || die
-	if [ -f "make.conf.${ARCH}".diff ]; then
-		patch make.conf "make.conf.${ARCH}".diff || \
-			die "Failed to patch make.conf.example"
-	else
-		eerror ""
-		eerror "Portage does not have an arch-specific configuration for this arch."
-		eerror "Please notify the arch maintainer about this issue. Using generic."
-		eerror ""
-	fi
-}
-
-src_compile() {
-	if use doc; then
-		call_with_python_impl \
-		emake docbook || die
-	fi
-
-	if use epydoc; then
-		einfo "Generating api docs"
-		call_with_python_impl \
-		emake epydoc || die
-	fi
-}
-
-src_test() {
-	call_with_python_impl \
-	emake test || die
-}
-
-src_install() {
-	call_with_python_impl \
-	emake DESTDIR="${D}" \
-		sysconfdir="/etc" \
-		prefix="/usr" \
-		install || die
-
-	# Extended set config is currently disabled in portage-2.1.x.
-	rm -rf "${D}/usr/share/portage/config/sets" || die
-
-	# Use dodoc for compression, since the Makefile doesn't do that.
-	dodoc "${S}"/{ChangeLog,NEWS,RELEASE-NOTES} || die
-
-	if use linguas_pl; then
-		doman -i18n=pl "${S_PL}"/man/pl/*.[0-9] || die
-		doman -i18n=pl_PL.UTF-8 "${S_PL}"/man/pl_PL.UTF-8/*.[0-9] || die
-	fi
-
-	# Allow external portage API consumers to import portage python modules
-	# (this used to be done with PYTHONPATH setting in /etc/env.d).
-	# For each of PYTHON_TARGETS, install a tree of *.py symlinks in
-	# site-packages, and compile with the corresponding interpreter.
-	local impl files mod_dir dest_mod_dir python relative_path x
-	for impl in "${PYTHON_COMPAT[@]}" ; do
-		use "python_targets_${impl}" || continue
-		if use build && [[ ${ROOT} == / &&
-			! -x /usr/bin/$(get_python_interpreter ${impl}) ]] ; then
-			# Tolerate --nodeps at beginning of stage1 for catalyst
-			ewarn "skipping python_targets_${impl}, interpreter not found"
-			continue
-		fi
-		while read -r mod_dir ; do
-			cd "${D}/usr/lib/portage/pym/${mod_dir}" || die
-			files=$(echo *.py)
-			if [ -z "${files}" ] || [ "${files}" = "*.py" ]; then
-				# __pycache__ directories contain no py files
-				continue
-			fi
-			dest_mod_dir=$(get_python_sitedir ${impl})/${mod_dir}
-			dodir "${dest_mod_dir}" || die
-			relative_path=../../../lib/portage/pym/${mod_dir}
-			x=/${mod_dir}
-			while [ -n "${x}" ] ; do
-				relative_path=../${relative_path}
-				x=${x%/*}
-			done
-			for x in ${files} ; do
-				dosym "${relative_path}/${x}" \
-					"${dest_mod_dir}/${x}" || die
-			done
-		done < <(cd "${D}"/usr/lib/portage/pym || die ; find * -type d ! -path "portage/tests*")
-		cd "${S}" || die
-		EPYTHON=$(get_python_interpreter ${impl}) \
-		python_compileall "$(get_python_sitedir ${impl})"
-	done
-
-	# Compile /usr/lib/portage/pym with the active interpreter, since portage
-	# internal commands force this directory to the beginning of sys.path.
-	python_compileall /usr/lib/portage/pym
-}
-
-pkg_preinst() {
-	if [[ $ROOT == / ]] ; then
-		# Run some minimal tests as a sanity check.
-		local test_runner=$(find "$D" -name runTests)
-		if [[ -n $test_runner && -x $test_runner ]] ; then
-			einfo "Running preinst sanity tests..."
-			"$test_runner" || die "preinst sanity tests failed"
-		fi
-	fi
-
-	if use xattr && ! current_python_has_xattr ; then
-		ewarn "For optimal performance in xattr handling, install"
-		ewarn "dev-python/pyxattr, or install >=dev-lang/python-3.3 and"
-		ewarn "enable USE=python3 for $CATEGORY/$PN."
-	fi
-
-	# elog dir must exist to avoid logrotate error for bug #415911.
-	# This code runs in preinst in order to bypass the mapping of
-	# portage:portage to root:root which happens after src_install.
-	keepdir /var/log/portage/elog
-	# This is allowed to fail if the user/group are invalid for prefix users.
-	if chown portage:portage "${D}"var/log/portage{,/elog} 2>/dev/null ; then
-		chmod g+s,ug+rwx "${D}"var/log/portage{,/elog}
-	fi
-
-	if [[ -d ${ROOT}var/log/portage && \
-		$(ls -ld "${ROOT}var/log/portage") != *" portage portage "* ]] && \
-		has_version '<sys-apps/portage-2.1.10.11' ; then
-		# Initialize permissions for bug #378451 and bug #377177, since older
-		# portage does not create /var/log/portage with the desired default
-		# permissions.
-		einfo "Applying portage group permission to ${ROOT}var/log/portage for bug #378451"
-		chown portage:portage "${ROOT}var/log/portage"
-		chmod g+ws "${ROOT}var/log/portage"
-	fi
-
-	if has_version '<sys-apps/portage-2.1.10.61' ; then
-		ewarn "FEATURES=config-protect-if-modified is now enabled by default."
-		ewarn "This causes the CONFIG_PROTECT behavior to be skipped for"
-		ewarn "files that have not been modified since they were installed."
-	fi
-}
diff --git a/sys-apps/portage/portage-2.1.6.7_p1.ebuild b/sys-apps/portage/portage-2.1.6.7_p1.ebuild
index fb59cc5f7b8d..642c5a8244cb 100644
--- a/sys-apps/portage/portage-2.1.6.7_p1.ebuild
+++ b/sys-apps/portage/portage-2.1.6.7_p1.ebuild
@@ -1,13 +1,13 @@
-# 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/sys-apps/portage/portage-2.1.6.7_p1.ebuild,v 1.10 2013/07/01 02:24:59 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.6.7_p1.ebuild,v 1.11 2014/03/25 17:24:02 vapier Exp $
 
 inherit eutils multilib
 
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
 SLOT="0"
 IUSE="build doc epydoc less linguas_pl"
 
diff --git a/sys-apps/portage/portage-2.2.9-r1.ebuild b/sys-apps/portage/portage-2.2.10.ebuild
similarity index 99%
rename from sys-apps/portage/portage-2.2.9-r1.ebuild
rename to sys-apps/portage/portage-2.2.10.ebuild
index 7e6e77aa5af9..11e427f582c8 100644
--- a/sys-apps/portage/portage-2.2.9-r1.ebuild
+++ b/sys-apps/portage/portage-2.2.10.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/portage/portage-2.2.9-r1.ebuild,v 1.1 2014/03/23 14:56:35 dolsen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.10.ebuild,v 1.1 2014/03/26 02:27:41 dolsen Exp $
 
 # Require EAPI 2 since we now require at least python-2.6 (for python 3
 # syntax support) which also requires EAPI 2.
diff --git a/sys-apps/portage/portage-2.2.6.ebuild b/sys-apps/portage/portage-2.2.6.ebuild
deleted file mode 100644
index 6a163976772e..000000000000
--- a/sys-apps/portage/portage-2.2.6.ebuild
+++ /dev/null
@@ -1,572 +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/portage/portage-2.2.6.ebuild,v 1.2 2013/09/20 00:45:10 zmedico Exp $
-
-# Require EAPI 2 since we now require at least python-2.6 (for python 3
-# syntax support) which also requires EAPI 2.
-EAPI=2
-PYTHON_COMPAT=(
-	pypy2_0
-	python3_2 python3_3 python3_4
-	python2_6 python2_7
-)
-inherit eutils multilib
-
-DESCRIPTION="Portage is the package management and distribution system for Gentoo"
-HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-SLOT="0"
-IUSE="build doc epydoc +ipc linguas_ru pypy2_0 python2 python3 selinux xattr"
-
-for _pyimpl in ${PYTHON_COMPAT[@]} ; do
-	IUSE+=" python_targets_${_pyimpl}"
-done
-unset _pyimpl
-
-# Import of the io module in python-2.6 raises ImportError for the
-# thread module if threading is disabled.
-python_dep_ssl="python3? ( =dev-lang/python-3*[ssl] )
-	!pypy2_0? ( !python2? ( !python3? (
-		|| ( >=dev-lang/python-2.7[ssl] dev-lang/python:2.6[threads,ssl] )
-	) ) )
-	pypy2_0? ( !python2? ( !python3? ( virtual/pypy:2.0[bzip2] ) ) )
-	python2? ( !python3? ( || ( dev-lang/python:2.7[ssl] dev-lang/python:2.6[ssl,threads] ) ) )"
-python_dep="${python_dep_ssl//\[ssl\]}"
-python_dep="${python_dep//,ssl}"
-python_dep="${python_dep//ssl,}"
-
-python_dep="${python_dep}
-	python_targets_pypy2_0? ( virtual/pypy:2.0 )
-	python_targets_python2_6? ( dev-lang/python:2.6 )
-	python_targets_python2_7? ( dev-lang/python:2.7 )
-	python_targets_python3_2? ( dev-lang/python:3.2 )
-	python_targets_python3_3? ( dev-lang/python:3.3 )
-	python_targets_python3_4? ( dev-lang/python:3.4 )
-"
-
-# The pysqlite blocker is for bug #282760.
-# make-3.82 is for bug #455858
-DEPEND="${python_dep}
-	>=sys-devel/make-3.82
-	>=sys-apps/sed-4.0.5 sys-devel/patch
-	doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
-	epydoc? ( >=dev-python/epydoc-2.0 !<=dev-python/pysqlite-2.4.1 )"
-# Require sandbox-2.2 for bug #288863.
-# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's
-# quite slow, so it's not considered in the dependencies as an alternative to
-# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so
-# for now, don't pull in xattr deps for other kernels.
-# For whirlpool hash, require python[ssl] or python-mhash (bug #425046).
-# For compgen, require bash[readline] (bug #445576).
-RDEPEND="${python_dep}
-	!build? ( >=sys-apps/sed-4.0.5
-		|| ( >=app-shells/bash-4.2_p37[readline] ( <app-shells/bash-4.2_p37 >=app-shells/bash-3.2_p17 ) )
-		>=app-admin/eselect-1.2
-		|| ( ${python_dep_ssl} dev-python/python-mhash )
-	)
-	elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
-	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
-	elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
-	>=app-misc/pax-utils-0.1.17
-	xattr? ( kernel_linux? ( || ( >=dev-lang/python-3.3_pre20110902 dev-python/pyxattr ) ) )
-	selinux? ( || ( >=sys-libs/libselinux-2.0.94[python] <sys-libs/libselinux-2.0.94 ) )
-	!<app-shells/bash-3.2_p17
-	!<app-admin/logrotate-3.8.0"
-PDEPEND="
-	!build? (
-		>=net-misc/rsync-2.6.4
-		userland_GNU? ( >=sys-apps/coreutils-6.4 )
-	)"
-# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
-# NOTE: FEATURES=installsources requires debugedit and rsync
-
-SRC_ARCHIVES="http://dev.gentoo.org/~zmedico/portage/archives"
-
-prefix_src_archives() {
-	local x y
-	for x in ${@}; do
-		for y in ${SRC_ARCHIVES}; do
-			echo ${y}/${x}
-		done
-	done
-}
-
-PV_PL="2.1.2"
-PATCHVER_PL=""
-TARBALL_PV=${PV}
-SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
-	$(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)"
-
-PATCHVER=
-[[ $TARBALL_PV = $PV ]] || PATCHVER=$PV
-if [ -n "${PATCHVER}" ]; then
-	SRC_URI="${SRC_URI} mirror://gentoo/${PN}-${PATCHVER}.patch.bz2
-	$(prefix_src_archives ${PN}-${PATCHVER}.patch.bz2)"
-fi
-
-S="${WORKDIR}"/${PN}-${TARBALL_PV}
-S_PL="${WORKDIR}"/${PN}-${PV_PL}
-
-compatible_python_is_selected() {
-	[[ $("${EPREFIX}/usr/bin/python" -c 'import sys ; sys.stdout.write(sys.hexversion >= 0x2060000 and "good" or "bad")') = good ]]
-}
-
-current_python_has_xattr() {
-	[[ ${EPYTHON} ]] || die 'No Python implementation set (EPYTHON is null).'
-	local PYTHON=${EPREFIX}/usr/bin/${EPYTHON}
-	[[ $("${PYTHON}" -c 'import sys ; sys.stdout.write(sys.hexversion >= 0x3030000 and "yes" or "no")') = yes ]] || \
-	"${PYTHON}" -c 'import xattr' 2>/dev/null
-}
-
-call_with_python_impl() {
-	[[ ${EPYTHON} ]] || die 'No Python implementation set (EPYTHON is null).'
-	env EPYTHON=${EPYTHON} "$@"
-}
-
-get_python_interpreter() {
-	[ $# -eq 1 ] || die "expected 1 argument, got $#: $*"
-	local impl=$1 python
-	case "${impl}" in
-		python*)
-			python=${impl/_/.}
-			;;
-		pypy*)
-			python=${impl/_/.}
-			python=${python/pypy/pypy-c}
-			;;
-		*)
-			die "Unrecognized python target: ${impl}"
-	esac
-	echo ${python}
-}
-
-get_python_sitedir() {
-	[ $# -eq 1 ] || die "expected 1 argument, got $#: $*"
-	local impl=$1
-	local site_dir=usr/$(get_libdir)/${impl/_/.}/site-packages
-	[[ -d ${EROOT:-${ROOT}}${site_dir} ]] || \
-		ewarn "site-packages dir missing for ${impl}: ${EROOT:-${ROOT}}${site_dir}"
-	echo "/${site_dir}"
-}
-
-python_compileall() {
-	[[ ${EPYTHON} ]] || die 'No Python implementation set (EPYTHON is null).'
-	local d=${EPREFIX}$1 PYTHON=${EPREFIX}/usr/bin/${EPYTHON}
-	local d_image=${D}${d#/}
-	[[ -d ${d_image} ]] || die "directory does not exist: ${d_image}"
-	case "${EPYTHON}" in
-		python*)
-			"${PYTHON}" -m compileall -q -f -d "${d}" "${d_image}" || die
-			# Note: Using -OO breaks emaint, since it requires __doc__,
-			# and __doc__ is None when -OO is used.
-			"${PYTHON}" -O -m compileall -q -f -d "${d}" "${d_image}" || die
-			;;
-		pypy*)
-			"${PYTHON}" -m compileall -q -f -d "${d}" "${d_image}" || die
-			;;
-		*)
-			die "Unrecognized EPYTHON value: ${EPYTHON}"
-	esac
-}
-
-pkg_setup() {
-	if use python2 && use python3 ; then
-		ewarn "Both python2 and python3 USE flags are enabled, but only one"
-		ewarn "can be in the shebangs. Using python3."
-	fi
-	if use pypy2_0 && use python3 ; then
-		ewarn "Both pypy2_0 and python3 USE flags are enabled, but only one"
-		ewarn "can be in the shebangs. Using python3."
-	fi
-	if use pypy2_0 && use python2 ; then
-		ewarn "Both pypy2_0 and python2 USE flags are enabled, but only one"
-		ewarn "can be in the shebangs. Using python2"
-	fi
-	if ! use pypy2_0 && ! use python2 && ! use python3 && \
-		! compatible_python_is_selected ; then
-		ewarn "Attempting to select a compatible default python interpreter"
-		local x success=0
-		for x in "${EPREFIX}"/usr/bin/python2.* ; do
-			x=${x#${EPREFIX}/usr/bin/python2.}
-			if [[ $x -ge 6 ]] 2>/dev/null ; then
-				eselect python set python2.$x
-				if compatible_python_is_selected ; then
-					elog "Default python interpreter is now set to python-2.$x"
-					success=1
-					break
-				fi
-			fi
-		done
-		if [ $success != 1 ] ; then
-			eerror "Unable to select a compatible default python interpreter!"
-			die "This version of portage requires at least python-2.6 to be selected as the default python interpreter (see \`eselect python --help\`)."
-		fi
-	fi
-
-	# We use EPYTHON to designate the active python interpreter,
-	# but we only export when needed, via call_with_python_impl.
-	EPYTHON=python
-	export -n EPYTHON
-	if use python3; then
-		EPYTHON=python3
-	elif use python2; then
-		EPYTHON=python2
-	elif use pypy2_0; then
-		EPYTHON=pypy-c2.0
-	fi
-}
-
-src_prepare() {
-	if [ -n "${PATCHVER}" ] ; then
-		if [[ -L $S/bin/ebuild-helpers/portageq ]] ; then
-			rm "$S/bin/ebuild-helpers/portageq" \
-				|| die "failed to remove portageq helper symlink"
-		fi
-		epatch "${WORKDIR}/${PN}-${PATCHVER}.patch"
-	fi
-	einfo "Setting portage.VERSION to ${PVR} ..."
-	sed -e "s/^VERSION=.*/VERSION=\"${PVR}\"/" -i pym/portage/__init__.py || \
-		die "Failed to patch portage.VERSION"
-	sed -e "1s/VERSION/${PVR}/" -i doc/fragment/version || \
-		die "Failed to patch VERSION in doc/fragment/version"
-	sed -e "1s/VERSION/${PVR}/" -i $(find man -type f) || \
-		die "Failed to patch VERSION in man page headers"
-
-	if ! use ipc ; then
-		einfo "Disabling ipc..."
-		sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
-			-i pym/_emerge/AbstractEbuildProcess.py || \
-			die "failed to patch AbstractEbuildProcess.py"
-	fi
-
-	if use xattr && use kernel_linux ; then
-		einfo "Adding FEATURES=xattr to make.globals ..."
-		echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
-			|| die "failed to append to make.globals"
-	fi
-
-	local set_shebang=
-	if use python3; then
-		set_shebang=python3
-	elif use python2; then
-		set_shebang=python2
-	elif use pypy2_0; then
-		set_shebang=pypy-c2.0
-	fi
-	if [[ -n ${set_shebang} ]] ; then
-		einfo "Converting shebangs for ${set_shebang}..."
-		while read -r -d $'\0' ; do
-			local shebang=$(head -n1 "$REPLY")
-			if [[ ${shebang} == "#!/usr/bin/python"* ]] ; then
-				sed -i -e "1s:python:${set_shebang}:" "$REPLY" || \
-					die "sed failed"
-			fi
-		done < <(find . -type f -print0)
-	fi
-
-	if [[ -n ${EPREFIX} ]] ; then
-		einfo "Setting portage.const.EPREFIX ..."
-		sed -e "s|^\(SANDBOX_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/sandbox\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(FAKEROOT_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/fakeroot\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(BASH_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/bash\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(MOVE_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/mv\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(PRELINK_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/sbin/prelink\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(EPREFIX[[:space:]]*=[[:space:]]*\"\).*|\\1${EPREFIX}\"|" \
-			-i pym/portage/const.py || \
-			die "Failed to patch portage.const.EPREFIX"
-
-		einfo "Prefixing shebangs ..."
-		while read -r -d $'\0' ; do
-			local shebang=$(head -n1 "$REPLY")
-			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
-				sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \
-					die "sed failed"
-			fi
-		done < <(find . -type f -print0)
-
-		einfo "Adjusting make.globals ..."
-		sed -e "s|\(/usr/portage\)|${EPREFIX}\\1|" \
-			-e "s|^\(PORTAGE_TMPDIR=\"\)\(/var/tmp\"\)|\\1${EPREFIX}\\2|" \
-			-i cnf/make.globals || die "sed failed"
-
-		einfo "Adjusting repos.conf ..."
-		sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
-			-e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
-			-e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(sync-uri = \).*|\\1rsync://prefix.gentooexperimental.org/gentoo-portage-prefix|" \
-			-i cnf/repos.conf || die "sed failed"
-
-		einfo "Adding FEATURES=force-prefix to make.globals ..."
-		echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
-			|| die "failed to append to make.globals"
-	fi
-
-	cd "${S}/cnf" || die
-	if [ -f "make.conf.example.${ARCH}".diff ]; then
-		patch make.conf.example "make.conf.example.${ARCH}".diff || \
-			die "Failed to patch make.conf.example"
-	else
-		eerror ""
-		eerror "Portage does not have an arch-specific configuration for this arch."
-		eerror "Please notify the arch maintainer about this issue. Using generic."
-		eerror ""
-	fi
-}
-
-src_compile() {
-	if use doc; then
-		call_with_python_impl \
-		emake docbook || die
-	fi
-
-	if use epydoc; then
-		einfo "Generating api docs"
-		call_with_python_impl \
-		emake epydoc || die
-	fi
-}
-
-src_test() {
-	# make files executable, in case they were created by patch
-	find bin -type f | xargs chmod +x
-	call_with_python_impl \
-	emake test || die
-}
-
-src_install() {
-	call_with_python_impl \
-	emake DESTDIR="${D}" \
-		sysconfdir="${EPREFIX}/etc" \
-		prefix="${EPREFIX}/usr" \
-		install || die
-
-	# Use dodoc for compression, since the Makefile doesn't do that.
-	dodoc "${S}"/{ChangeLog,NEWS,RELEASE-NOTES} || die
-
-	# Allow external portage API consumers to import portage python modules
-	# (this used to be done with PYTHONPATH setting in /etc/env.d).
-	# For each of PYTHON_TARGETS, install a tree of *.py symlinks in
-	# site-packages, and compile with the corresponding interpreter.
-	local impl files mod_dir dest_mod_dir python relative_path x
-	for impl in "${PYTHON_COMPAT[@]}" ; do
-		use "python_targets_${impl}" || continue
-		if use build && [[ ${ROOT} == / &&
-			! -x ${EPREFIX}/usr/bin/$(get_python_interpreter ${impl}) ]] ; then
-			# Tolerate --nodeps at beginning of stage1 for catalyst
-			ewarn "skipping python_targets_${impl}, interpreter not found"
-			continue
-		fi
-		while read -r mod_dir ; do
-			cd "${ED:-${D}}usr/lib/portage/pym/${mod_dir}" || die
-			files=$(echo *.py)
-			if [ -z "${files}" ] || [ "${files}" = "*.py" ]; then
-				# __pycache__ directories contain no py files
-				continue
-			fi
-			dest_mod_dir=$(get_python_sitedir ${impl})/${mod_dir}
-			dodir "${dest_mod_dir}" || die
-			relative_path=../../../lib/portage/pym/${mod_dir}
-			x=/${mod_dir}
-			while [ -n "${x}" ] ; do
-				relative_path=../${relative_path}
-				x=${x%/*}
-			done
-			for x in ${files} ; do
-				dosym "${relative_path}/${x}" \
-					"${dest_mod_dir}/${x}" || die
-			done
-		done < <(cd "${ED:-${D}}"usr/lib/portage/pym || die ; find * -type d ! -path "portage/tests*")
-		cd "${S}" || die
-		EPYTHON=$(get_python_interpreter ${impl}) \
-		python_compileall "$(get_python_sitedir ${impl})"
-	done
-
-	# Compile /usr/lib/portage/pym with the active interpreter, since portage
-	# internal commands force this directory to the beginning of sys.path.
-	python_compileall /usr/lib/portage/pym
-}
-
-pkg_preinst() {
-	if [[ $ROOT == / ]] ; then
-		# Run some minimal tests as a sanity check.
-		local test_runner=$(find "${ED:-${D}}" -name runTests)
-		if [[ -n $test_runner && -x $test_runner ]] ; then
-			einfo "Running preinst sanity tests..."
-			"$test_runner" || die "preinst sanity tests failed"
-		fi
-	fi
-
-	if use xattr && ! current_python_has_xattr ; then
-		ewarn "For optimal performance in xattr handling, install"
-		ewarn "dev-python/pyxattr, or install >=dev-lang/python-3.3 and"
-		ewarn "enable USE=python3 for $CATEGORY/$PN."
-	fi
-
-	# elog dir must exist to avoid logrotate error for bug #415911.
-	# This code runs in preinst in order to bypass the mapping of
-	# portage:portage to root:root which happens after src_install.
-	keepdir /var/log/portage/elog
-	# This is allowed to fail if the user/group are invalid for prefix users.
-	if chown portage:portage "${ED:-${D}}"var/log/portage{,/elog} 2>/dev/null ; then
-		chmod g+s,ug+rwx "${ED:-${D}}"var/log/portage{,/elog}
-	fi
-
-	# If portage-2.1.6 is installed and the preserved_libs_registry exists,
-	# assume that the NEEDED.ELF.2 files have already been generated.
-	has_version "<=${CATEGORY}/${PN}-2.2_pre7" && \
-		! { [ -e "${EROOT:-${ROOT}}"var/lib/portage/preserved_libs_registry ] && \
-		has_version ">=${CATEGORY}/${PN}-2.1.6_rc" ; } \
-		&& NEEDED_REBUILD_UPGRADE=true || NEEDED_REBUILD_UPGRADE=false
-
-	if has_version "<${CATEGORY}/${PN}-2.1.13" || \
-		{
-			has_version ">=${CATEGORY}/${PN}-2.2_rc0" && \
-			has_version "<${CATEGORY}/${PN}-2.2.0_alpha189"
-		} ; then
-		USERPRIV_UPGRADE=true
-		USERSYNC_UPGRADE=true
-		REPOS_CONF_UPGRADE=true
-		REPOS_CONF_SYNC=
-		type -P portageq >/dev/null 2>&1 && \
-			REPOS_CONF_SYNC=$("$(type -P portageq)" envvar SYNC)
-	else
-		USERPRIV_UPGRADE=false
-		USERSYNC_UPGRADE=false
-		REPOS_CONF_UPGRADE=false
-	fi
-}
-
-get_ownership() {
-	case ${USERLAND} in
-		BSD)
-			stat -f '%Su:%Sg' "${1}"
-			;;
-		*)
-			stat -c '%U:%G' "${1}"
-			;;
-	esac
-}
-
-new_config_protect() {
-	# Generate a ._cfg file even if the target file
-	# does not exist, ensuring that the user will
-	# notice the config change.
-	local basename=${1##*/}
-	local dirname=${1%/*}
-	local i=0
-	while true ; do
-		local filename=$(
-			echo -n "${dirname}/._cfg"
-			printf "%04d" ${i}
-			echo -n "_${basename}"
-		)
-		[[ -e ${filename} ]] || break
-		(( i++ ))
-	done
-	echo "${filename}"
-}
-
-pkg_postinst() {
-
-	if ${REPOS_CONF_UPGRADE} ; then
-		einfo "Generating repos.conf"
-		local repo_name=
-		[[ -f ${PORTDIR}/profiles/repo_name ]] && \
-			repo_name=$(< "${PORTDIR}/profiles/repo_name")
-		if [[ -z ${REPOS_CONF_SYNC} ]] ; then
-			REPOS_CONF_SYNC=$(grep "^sync-uri =" "${EROOT:-${ROOT}}usr/share/portage/config/repos.conf")
-			REPOS_CONF_SYNC=${REPOS_CONF_SYNC##* }
-		fi
-		local sync_type=
-		[[ ${REPOS_CONF_SYNC} == git://* ]] && sync_type=git
-
-		if [[ ${REPOS_CONF_SYNC} == cvs://* ]]; then
-			sync_type=cvs
-			REPOS_CONF_SYNC=${REPOS_CONF_SYNC#cvs://}
-		fi
-
-		cat <<-EOF > "${T}/repos.conf"
-		[DEFAULT]
-		main-repo = ${repo_name:-gentoo}
-
-		[${repo_name:-gentoo}]
-		location = ${PORTDIR:-${EPREFIX}/usr/portage}
-		sync-type = ${sync_type:-rsync}
-		sync-uri = ${REPOS_CONF_SYNC}
-		EOF
-
-		[[ ${sync_type} == cvs ]] && echo "sync-cvs-repo = $(<"${PORTDIR}/CVS/Repository")" >> "${T}/repos.conf"
-
-		local dest=${EROOT:-${ROOT}}etc/portage/repos.conf
-		if [[ ! -f ${dest} ]] && mkdir -p "${dest}" 2>/dev/null ; then
-			dest=${EROOT:-${ROOT}}etc/portage/repos.conf/${repo_name:-gentoo}.conf
-		fi
-		# Don't install the config update if the desired repos.conf directory
-		# and config file exist, since users may accept it blindly and break
-		# their config (bug #478726).
-		[[ -e ${EROOT:-${ROOT}}etc/portage/repos.conf/${repo_name:-gentoo}.conf ]] || \
-			mv "${T}/repos.conf" "$(new_config_protect "${dest}")"
-
-		if [[ ${PORTDIR} == ${EPREFIX}/usr/portage ]] ; then
-			einfo "Generating make.conf PORTDIR setting for backward compatibility"
-			for dest in "${EROOT:-${ROOT}}etc/make.conf" "${EROOT:-${ROOT}}etc/portage/make.conf" ; do
-				[[ -e ${dest} ]] && break
-			done
-			[[ -d ${dest} ]] && dest=${dest}/portdir.conf
-			rm -rf "${T}/make.conf"
-			[[ -f ${dest} ]] && cat "${dest}" > "${T}/make.conf"
-			cat <<-EOF >> "${T}/make.conf"
-
-			# Set PORTDIR for backward compatibility with various tools:
-			#   gentoo-bashcomp - bug #478444
-			#   euse - bug #474574
-			#   euses and ufed - bug #478318
-			PORTDIR="${EPREFIX}/usr/portage"
-			EOF
-			mkdir -p "${dest%/*}"
-			mv "${T}/make.conf" "$(new_config_protect "${dest}")"
-		fi
-	fi
-
-	if ${NEEDED_REBUILD_UPGRADE} ; then
-		einfo "rebuilding NEEDED.ELF.2 files"
-		local cpv filename line newline
-		for cpv in "${EROOT:-${ROOT}}var/db/pkg"/*/*; do
-			[[ -f "${cpv}/NEEDED" && ! -f "${cpv}/NEEDED.ELF.2" ]] || continue
-			while read -r line; do
-				filename=${line% *}
-				newline=$(scanelf -BF "%a;%F;%S;%r;%n" "${ROOT%/}${filename}")
-				newline=${newline//  -  }
-				[[ ${#ROOT} -gt 1 ]] && newline=${newline/${ROOT%/}}
-				echo "${newline:3}" >> "${cpv}/NEEDED.ELF.2"
-			done < "${cpv}/NEEDED"
-		done
-	fi
-
-	local distdir=${PORTAGE_ACTUAL_DISTDIR-${DISTDIR}}
-
-	if ${USERSYNC_UPGRADE} && \
-		[[ -d ${PORTDIR} && -w ${PORTDIR} ]] ; then
-		local ownership=$(get_ownership "${PORTDIR}")
-		if [[ -n ${ownership} ]] ; then
-			einfo "Adjusting PORTDIR permissions for usersync"
-			find "${PORTDIR}" -path "${distdir%/}" -prune -o \
-				! \( -user "${ownership%:*}" -a -group "${ownership#*:}" \) \
-				-exec chown "${ownership}" {} +
-		fi
-	fi
-
-	# Do this last, since it could take a long time if there
-	# are lots of live sources, and the user may be tempted
-	# to kill emerge while it is running.
-	if ${USERPRIV_UPGRADE} && \
-		[[ -d ${distdir} && -w ${distdir} ]] ; then
-		local ownership=$(get_ownership "${distdir}")
-		if [[ ${ownership#*:} == portage ]] ; then
-			einfo "Adjusting DISTDIR permissions for userpriv"
-			find "${distdir}" -mindepth 1 -maxdepth 1 -type d -uid 0 \
-				-exec chown -R portage:portage {} +
-		fi
-	fi
-}
diff --git a/sys-apps/portage/portage-2.2.8-r1.ebuild b/sys-apps/portage/portage-2.2.8-r1.ebuild
index 8a5e7f3a86e5..3bd00a523cc5 100644
--- a/sys-apps/portage/portage-2.2.8-r1.ebuild
+++ b/sys-apps/portage/portage-2.2.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/sys-apps/portage/portage-2.2.8-r1.ebuild,v 1.10 2014/03/24 15:08:24 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.8-r1.ebuild,v 1.11 2014/03/25 17:24:02 vapier Exp $
 
 # Require EAPI 2 since we now require at least python-2.6 (for python 3
 # syntax support) which also requires EAPI 2.
@@ -15,7 +15,7 @@ inherit eutils multilib
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
 LICENSE="GPL-2"
-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"
 SLOT="0"
 IUSE="build doc epydoc +ipc linguas_ru pypy2_0 python2 python3 selinux xattr"
 
diff --git a/sys-apps/portage/portage-2.2.8.ebuild b/sys-apps/portage/portage-2.2.8.ebuild
deleted file mode 100644
index ba21a2210530..000000000000
--- a/sys-apps/portage/portage-2.2.8.ebuild
+++ /dev/null
@@ -1,575 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.8.ebuild,v 1.3 2014/01/20 17:41:31 floppym Exp $
-
-# Require EAPI 2 since we now require at least python-2.6 (for python 3
-# syntax support) which also requires EAPI 2.
-EAPI=2
-PYTHON_COMPAT=(
-	pypy2_0
-	python3_2 python3_3 python3_4
-	python2_6 python2_7
-)
-inherit eutils multilib
-
-DESCRIPTION="Portage is the package management and distribution system for Gentoo"
-HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-SLOT="0"
-IUSE="build doc epydoc +ipc linguas_ru pypy2_0 python2 python3 selinux xattr"
-
-for _pyimpl in ${PYTHON_COMPAT[@]} ; do
-	IUSE+=" python_targets_${_pyimpl}"
-done
-unset _pyimpl
-
-# Import of the io module in python-2.6 raises ImportError for the
-# thread module if threading is disabled.
-python_dep_ssl="python3? ( =dev-lang/python-3*[ssl] )
-	!pypy2_0? ( !python2? ( !python3? (
-		|| ( >=dev-lang/python-2.7[ssl] dev-lang/python:2.6[threads,ssl] )
-	) ) )
-	pypy2_0? ( !python2? ( !python3? ( virtual/pypy:2.0[bzip2] ) ) )
-	python2? ( !python3? ( || ( dev-lang/python:2.7[ssl] dev-lang/python:2.6[ssl,threads] ) ) )"
-python_dep="${python_dep_ssl//\[ssl\]}"
-python_dep="${python_dep//,ssl}"
-python_dep="${python_dep//ssl,}"
-
-python_dep="${python_dep}
-	python_targets_pypy2_0? ( virtual/pypy:2.0 )
-	python_targets_python2_6? ( dev-lang/python:2.6 )
-	python_targets_python2_7? ( dev-lang/python:2.7 )
-	python_targets_python3_2? ( dev-lang/python:3.2 )
-	python_targets_python3_3? ( dev-lang/python:3.3 )
-	python_targets_python3_4? ( dev-lang/python:3.4 )
-"
-
-# The pysqlite blocker is for bug #282760.
-# make-3.82 is for bug #455858
-DEPEND="${python_dep}
-	>=sys-devel/make-3.82
-	>=sys-apps/sed-4.0.5 sys-devel/patch
-	doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
-	epydoc? ( >=dev-python/epydoc-2.0 !<=dev-python/pysqlite-2.4.1 )"
-# Require sandbox-2.2 for bug #288863.
-# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's
-# quite slow, so it's not considered in the dependencies as an alternative to
-# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so
-# for now, don't pull in xattr deps for other kernels.
-# For whirlpool hash, require python[ssl] or python-mhash (bug #425046).
-# For compgen, require bash[readline] (bug #445576).
-RDEPEND="${python_dep}
-	!build? ( >=sys-apps/sed-4.0.5
-		|| ( >=app-shells/bash-4.2_p37[readline] ( <app-shells/bash-4.2_p37 >=app-shells/bash-3.2_p17 ) )
-		>=app-admin/eselect-1.2
-		|| ( ${python_dep_ssl} dev-python/python-mhash )
-	)
-	elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
-	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
-	elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
-	>=app-misc/pax-utils-0.1.17
-	selinux? ( || ( >=sys-libs/libselinux-2.0.94[python] <sys-libs/libselinux-2.0.94 ) )
-	xattr? ( kernel_linux? (
-		$(for python_impl in python{2_6,2_7,3_2} pypy2_0; do
-			echo "python_targets_${python_impl}? ( dev-python/pyxattr[python_targets_${python_impl}] )"
-		done) ) )
-	!<app-shells/bash-3.2_p17
-	!<app-admin/logrotate-3.8.0"
-PDEPEND="
-	!build? (
-		>=net-misc/rsync-2.6.4
-		userland_GNU? ( >=sys-apps/coreutils-6.4 )
-	)"
-# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
-# NOTE: FEATURES=installsources requires debugedit and rsync
-
-SRC_ARCHIVES="http://dev.gentoo.org/~dolsen/releases/portage"
-
-prefix_src_archives() {
-	local x y
-	for x in ${@}; do
-		for y in ${SRC_ARCHIVES}; do
-			echo ${y}/${x}
-		done
-	done
-}
-
-PV_PL="2.1.2"
-PATCHVER_PL=""
-TARBALL_PV=${PV}
-SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
-	$(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)"
-
-PATCHVER=
-[[ $TARBALL_PV = $PV ]] || PATCHVER=$PV
-if [ -n "${PATCHVER}" ]; then
-	SRC_URI="${SRC_URI} mirror://gentoo/${PN}-${PATCHVER}.patch.bz2
-	$(prefix_src_archives ${PN}-${PATCHVER}.patch.bz2)"
-fi
-
-S="${WORKDIR}"/${PN}-${TARBALL_PV}
-S_PL="${WORKDIR}"/${PN}-${PV_PL}
-
-compatible_python_is_selected() {
-	[[ $("${EPREFIX}/usr/bin/python" -c 'import sys ; sys.stdout.write(sys.hexversion >= 0x2060000 and "good" or "bad")') = good ]]
-}
-
-current_python_has_xattr() {
-	[[ ${EPYTHON} ]] || die 'No Python implementation set (EPYTHON is null).'
-	local PYTHON=${EPREFIX}/usr/bin/${EPYTHON}
-	[[ $("${PYTHON}" -c 'import sys ; sys.stdout.write(sys.hexversion >= 0x3030000 and "yes" or "no")') = yes ]] || \
-	"${PYTHON}" -c 'import xattr' 2>/dev/null
-}
-
-call_with_python_impl() {
-	[[ ${EPYTHON} ]] || die 'No Python implementation set (EPYTHON is null).'
-	env EPYTHON=${EPYTHON} "$@"
-}
-
-get_python_interpreter() {
-	[ $# -eq 1 ] || die "expected 1 argument, got $#: $*"
-	local impl=$1 python
-	case "${impl}" in
-		python*)
-			python=${impl/_/.}
-			;;
-		pypy*)
-			python=${impl/_/.}
-			python=${python/pypy/pypy-c}
-			;;
-		*)
-			die "Unrecognized python target: ${impl}"
-	esac
-	echo ${python}
-}
-
-get_python_sitedir() {
-	[ $# -eq 1 ] || die "expected 1 argument, got $#: $*"
-	local impl=$1
-	local site_dir=usr/$(get_libdir)/${impl/_/.}/site-packages
-	[[ -d ${EROOT:-${ROOT}}${site_dir} ]] || \
-		ewarn "site-packages dir missing for ${impl}: ${EROOT:-${ROOT}}${site_dir}"
-	echo "/${site_dir}"
-}
-
-python_compileall() {
-	[[ ${EPYTHON} ]] || die 'No Python implementation set (EPYTHON is null).'
-	local d=${EPREFIX}$1 PYTHON=${EPREFIX}/usr/bin/${EPYTHON}
-	local d_image=${D}${d#/}
-	[[ -d ${d_image} ]] || die "directory does not exist: ${d_image}"
-	case "${EPYTHON}" in
-		python*)
-			"${PYTHON}" -m compileall -q -f -d "${d}" "${d_image}" || die
-			# Note: Using -OO breaks emaint, since it requires __doc__,
-			# and __doc__ is None when -OO is used.
-			"${PYTHON}" -O -m compileall -q -f -d "${d}" "${d_image}" || die
-			;;
-		pypy*)
-			"${PYTHON}" -m compileall -q -f -d "${d}" "${d_image}" || die
-			;;
-		*)
-			die "Unrecognized EPYTHON value: ${EPYTHON}"
-	esac
-}
-
-pkg_setup() {
-	if use python2 && use python3 ; then
-		ewarn "Both python2 and python3 USE flags are enabled, but only one"
-		ewarn "can be in the shebangs. Using python3."
-	fi
-	if use pypy2_0 && use python3 ; then
-		ewarn "Both pypy2_0 and python3 USE flags are enabled, but only one"
-		ewarn "can be in the shebangs. Using python3."
-	fi
-	if use pypy2_0 && use python2 ; then
-		ewarn "Both pypy2_0 and python2 USE flags are enabled, but only one"
-		ewarn "can be in the shebangs. Using python2"
-	fi
-	if ! use pypy2_0 && ! use python2 && ! use python3 && \
-		! compatible_python_is_selected ; then
-		ewarn "Attempting to select a compatible default python interpreter"
-		local x success=0
-		for x in "${EPREFIX}"/usr/bin/python2.* ; do
-			x=${x#${EPREFIX}/usr/bin/python2.}
-			if [[ $x -ge 6 ]] 2>/dev/null ; then
-				eselect python set python2.$x
-				if compatible_python_is_selected ; then
-					elog "Default python interpreter is now set to python-2.$x"
-					success=1
-					break
-				fi
-			fi
-		done
-		if [ $success != 1 ] ; then
-			eerror "Unable to select a compatible default python interpreter!"
-			die "This version of portage requires at least python-2.6 to be selected as the default python interpreter (see \`eselect python --help\`)."
-		fi
-	fi
-
-	# We use EPYTHON to designate the active python interpreter,
-	# but we only export when needed, via call_with_python_impl.
-	EPYTHON=python
-	export -n EPYTHON
-	if use python3; then
-		EPYTHON=python3
-	elif use python2; then
-		EPYTHON=python2
-	elif use pypy2_0; then
-		EPYTHON=pypy-c2.0
-	fi
-}
-
-src_prepare() {
-	if [ -n "${PATCHVER}" ] ; then
-		if [[ -L $S/bin/ebuild-helpers/portageq ]] ; then
-			rm "$S/bin/ebuild-helpers/portageq" \
-				|| die "failed to remove portageq helper symlink"
-		fi
-		epatch "${WORKDIR}/${PN}-${PATCHVER}.patch"
-	fi
-	einfo "Setting portage.VERSION to ${PVR} ..."
-	sed -e "s/^VERSION=.*/VERSION=\"${PVR}\"/" -i pym/portage/__init__.py || \
-		die "Failed to patch portage.VERSION"
-	sed -e "1s/VERSION/${PVR}/" -i doc/fragment/version || \
-		die "Failed to patch VERSION in doc/fragment/version"
-	sed -e "1s/VERSION/${PVR}/" -i $(find man -type f) || \
-		die "Failed to patch VERSION in man page headers"
-
-	if ! use ipc ; then
-		einfo "Disabling ipc..."
-		sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
-			-i pym/_emerge/AbstractEbuildProcess.py || \
-			die "failed to patch AbstractEbuildProcess.py"
-	fi
-
-	if use xattr && use kernel_linux ; then
-		einfo "Adding FEATURES=xattr to make.globals ..."
-		echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
-			|| die "failed to append to make.globals"
-	fi
-
-	local set_shebang=
-	if use python3; then
-		set_shebang=python3
-	elif use python2; then
-		set_shebang=python2
-	elif use pypy2_0; then
-		set_shebang=pypy-c2.0
-	fi
-	if [[ -n ${set_shebang} ]] ; then
-		einfo "Converting shebangs for ${set_shebang}..."
-		while read -r -d $'\0' ; do
-			local shebang=$(head -n1 "$REPLY")
-			if [[ ${shebang} == "#!/usr/bin/python"* ]] ; then
-				sed -i -e "1s:python:${set_shebang}:" "$REPLY" || \
-					die "sed failed"
-			fi
-		done < <(find . -type f -print0)
-	fi
-
-	if [[ -n ${EPREFIX} ]] ; then
-		einfo "Setting portage.const.EPREFIX ..."
-		sed -e "s|^\(SANDBOX_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/sandbox\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(FAKEROOT_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/fakeroot\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(BASH_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/bash\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(MOVE_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/mv\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(PRELINK_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/sbin/prelink\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(EPREFIX[[:space:]]*=[[:space:]]*\"\).*|\\1${EPREFIX}\"|" \
-			-i pym/portage/const.py || \
-			die "Failed to patch portage.const.EPREFIX"
-
-		einfo "Prefixing shebangs ..."
-		while read -r -d $'\0' ; do
-			local shebang=$(head -n1 "$REPLY")
-			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
-				sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \
-					die "sed failed"
-			fi
-		done < <(find . -type f -print0)
-
-		einfo "Adjusting make.globals ..."
-		sed -e "s|\(/usr/portage\)|${EPREFIX}\\1|" \
-			-e "s|^\(PORTAGE_TMPDIR=\"\)\(/var/tmp\"\)|\\1${EPREFIX}\\2|" \
-			-i cnf/make.globals || die "sed failed"
-
-		einfo "Adjusting repos.conf ..."
-		sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
-			-e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
-			-e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(sync-uri = \).*|\\1rsync://prefix.gentooexperimental.org/gentoo-portage-prefix|" \
-			-i cnf/repos.conf || die "sed failed"
-
-		einfo "Adding FEATURES=force-prefix to make.globals ..."
-		echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
-			|| die "failed to append to make.globals"
-	fi
-
-	cd "${S}/cnf" || die
-	if [ -f "make.conf.example.${ARCH}".diff ]; then
-		patch make.conf.example "make.conf.example.${ARCH}".diff || \
-			die "Failed to patch make.conf.example"
-	else
-		eerror ""
-		eerror "Portage does not have an arch-specific configuration for this arch."
-		eerror "Please notify the arch maintainer about this issue. Using generic."
-		eerror ""
-	fi
-}
-
-src_compile() {
-	if use doc; then
-		call_with_python_impl \
-		emake docbook || die
-	fi
-
-	if use epydoc; then
-		einfo "Generating api docs"
-		call_with_python_impl \
-		emake epydoc || die
-	fi
-}
-
-src_test() {
-	# make files executable, in case they were created by patch
-	find bin -type f | xargs chmod +x
-	call_with_python_impl \
-	emake test || die
-}
-
-src_install() {
-	call_with_python_impl \
-	emake DESTDIR="${D}" \
-		sysconfdir="${EPREFIX}/etc" \
-		prefix="${EPREFIX}/usr" \
-		install || die
-
-	# Use dodoc for compression, since the Makefile doesn't do that.
-	dodoc "${S}"/{ChangeLog,NEWS,RELEASE-NOTES} || die
-
-	# Allow external portage API consumers to import portage python modules
-	# (this used to be done with PYTHONPATH setting in /etc/env.d).
-	# For each of PYTHON_TARGETS, install a tree of *.py symlinks in
-	# site-packages, and compile with the corresponding interpreter.
-	local impl files mod_dir dest_mod_dir python relative_path x
-	for impl in "${PYTHON_COMPAT[@]}" ; do
-		use "python_targets_${impl}" || continue
-		if use build && [[ ${ROOT} == / &&
-			! -x ${EPREFIX}/usr/bin/$(get_python_interpreter ${impl}) ]] ; then
-			# Tolerate --nodeps at beginning of stage1 for catalyst
-			ewarn "skipping python_targets_${impl}, interpreter not found"
-			continue
-		fi
-		while read -r mod_dir ; do
-			cd "${ED:-${D}}usr/lib/portage/pym/${mod_dir}" || die
-			files=$(echo *.py)
-			if [ -z "${files}" ] || [ "${files}" = "*.py" ]; then
-				# __pycache__ directories contain no py files
-				continue
-			fi
-			dest_mod_dir=$(get_python_sitedir ${impl})/${mod_dir}
-			dodir "${dest_mod_dir}" || die
-			relative_path=../../../lib/portage/pym/${mod_dir}
-			x=/${mod_dir}
-			while [ -n "${x}" ] ; do
-				relative_path=../${relative_path}
-				x=${x%/*}
-			done
-			for x in ${files} ; do
-				dosym "${relative_path}/${x}" \
-					"${dest_mod_dir}/${x}" || die
-			done
-		done < <(cd "${ED:-${D}}"usr/lib/portage/pym || die ; find * -type d ! -path "portage/tests*")
-		cd "${S}" || die
-		EPYTHON=$(get_python_interpreter ${impl}) \
-		python_compileall "$(get_python_sitedir ${impl})"
-	done
-
-	# Compile /usr/lib/portage/pym with the active interpreter, since portage
-	# internal commands force this directory to the beginning of sys.path.
-	python_compileall /usr/lib/portage/pym
-}
-
-pkg_preinst() {
-	if [[ $ROOT == / ]] ; then
-		# Run some minimal tests as a sanity check.
-		local test_runner=$(find "${ED:-${D}}" -name runTests)
-		if [[ -n $test_runner && -x $test_runner ]] ; then
-			einfo "Running preinst sanity tests..."
-			"$test_runner" || die "preinst sanity tests failed"
-		fi
-	fi
-
-	if use xattr && ! current_python_has_xattr ; then
-		ewarn "For optimal performance in xattr handling, install"
-		ewarn "dev-python/pyxattr, or install >=dev-lang/python-3.3 and"
-		ewarn "enable USE=python3 for $CATEGORY/$PN."
-	fi
-
-	# elog dir must exist to avoid logrotate error for bug #415911.
-	# This code runs in preinst in order to bypass the mapping of
-	# portage:portage to root:root which happens after src_install.
-	keepdir /var/log/portage/elog
-	# This is allowed to fail if the user/group are invalid for prefix users.
-	if chown portage:portage "${ED:-${D}}"var/log/portage{,/elog} 2>/dev/null ; then
-		chmod g+s,ug+rwx "${ED:-${D}}"var/log/portage{,/elog}
-	fi
-
-	# If portage-2.1.6 is installed and the preserved_libs_registry exists,
-	# assume that the NEEDED.ELF.2 files have already been generated.
-	has_version "<=${CATEGORY}/${PN}-2.2_pre7" && \
-		! { [ -e "${EROOT:-${ROOT}}"var/lib/portage/preserved_libs_registry ] && \
-		has_version ">=${CATEGORY}/${PN}-2.1.6_rc" ; } \
-		&& NEEDED_REBUILD_UPGRADE=true || NEEDED_REBUILD_UPGRADE=false
-
-	if has_version "<${CATEGORY}/${PN}-2.1.13" || \
-		{
-			has_version ">=${CATEGORY}/${PN}-2.2_rc0" && \
-			has_version "<${CATEGORY}/${PN}-2.2.0_alpha189"
-		} ; then
-		USERPRIV_UPGRADE=true
-		USERSYNC_UPGRADE=true
-		REPOS_CONF_UPGRADE=true
-		REPOS_CONF_SYNC=
-		type -P portageq >/dev/null 2>&1 && \
-			REPOS_CONF_SYNC=$("$(type -P portageq)" envvar SYNC)
-	else
-		USERPRIV_UPGRADE=false
-		USERSYNC_UPGRADE=false
-		REPOS_CONF_UPGRADE=false
-	fi
-}
-
-get_ownership() {
-	case ${USERLAND} in
-		BSD)
-			stat -f '%Su:%Sg' "${1}"
-			;;
-		*)
-			stat -c '%U:%G' "${1}"
-			;;
-	esac
-}
-
-new_config_protect() {
-	# Generate a ._cfg file even if the target file
-	# does not exist, ensuring that the user will
-	# notice the config change.
-	local basename=${1##*/}
-	local dirname=${1%/*}
-	local i=0
-	while true ; do
-		local filename=$(
-			echo -n "${dirname}/._cfg"
-			printf "%04d" ${i}
-			echo -n "_${basename}"
-		)
-		[[ -e ${filename} ]] || break
-		(( i++ ))
-	done
-	echo "${filename}"
-}
-
-pkg_postinst() {
-
-	if ${REPOS_CONF_UPGRADE} ; then
-		einfo "Generating repos.conf"
-		local repo_name=
-		[[ -f ${PORTDIR}/profiles/repo_name ]] && \
-			repo_name=$(< "${PORTDIR}/profiles/repo_name")
-		if [[ -z ${REPOS_CONF_SYNC} ]] ; then
-			REPOS_CONF_SYNC=$(grep "^sync-uri =" "${EROOT:-${ROOT}}usr/share/portage/config/repos.conf")
-			REPOS_CONF_SYNC=${REPOS_CONF_SYNC##* }
-		fi
-		local sync_type=
-		[[ ${REPOS_CONF_SYNC} == git://* ]] && sync_type=git
-
-		if [[ ${REPOS_CONF_SYNC} == cvs://* ]]; then
-			sync_type=cvs
-			REPOS_CONF_SYNC=${REPOS_CONF_SYNC#cvs://}
-		fi
-
-		cat <<-EOF > "${T}/repos.conf"
-		[DEFAULT]
-		main-repo = ${repo_name:-gentoo}
-
-		[${repo_name:-gentoo}]
-		location = ${PORTDIR:-${EPREFIX}/usr/portage}
-		sync-type = ${sync_type:-rsync}
-		sync-uri = ${REPOS_CONF_SYNC}
-		EOF
-
-		[[ ${sync_type} == cvs ]] && echo "sync-cvs-repo = $(<"${PORTDIR}/CVS/Repository")" >> "${T}/repos.conf"
-
-		local dest=${EROOT:-${ROOT}}etc/portage/repos.conf
-		if [[ ! -f ${dest} ]] && mkdir -p "${dest}" 2>/dev/null ; then
-			dest=${EROOT:-${ROOT}}etc/portage/repos.conf/${repo_name:-gentoo}.conf
-		fi
-		# Don't install the config update if the desired repos.conf directory
-		# and config file exist, since users may accept it blindly and break
-		# their config (bug #478726).
-		[[ -e ${EROOT:-${ROOT}}etc/portage/repos.conf/${repo_name:-gentoo}.conf ]] || \
-			mv "${T}/repos.conf" "$(new_config_protect "${dest}")"
-
-		if [[ ${PORTDIR} == ${EPREFIX}/usr/portage ]] ; then
-			einfo "Generating make.conf PORTDIR setting for backward compatibility"
-			for dest in "${EROOT:-${ROOT}}etc/make.conf" "${EROOT:-${ROOT}}etc/portage/make.conf" ; do
-				[[ -e ${dest} ]] && break
-			done
-			[[ -d ${dest} ]] && dest=${dest}/portdir.conf
-			rm -rf "${T}/make.conf"
-			[[ -f ${dest} ]] && cat "${dest}" > "${T}/make.conf"
-			cat <<-EOF >> "${T}/make.conf"
-
-			# Set PORTDIR for backward compatibility with various tools:
-			#   gentoo-bashcomp - bug #478444
-			#   euse - bug #474574
-			#   euses and ufed - bug #478318
-			PORTDIR="${EPREFIX}/usr/portage"
-			EOF
-			mkdir -p "${dest%/*}"
-			mv "${T}/make.conf" "$(new_config_protect "${dest}")"
-		fi
-	fi
-
-	if ${NEEDED_REBUILD_UPGRADE} ; then
-		einfo "rebuilding NEEDED.ELF.2 files"
-		local cpv filename line newline
-		for cpv in "${EROOT:-${ROOT}}var/db/pkg"/*/*; do
-			[[ -f "${cpv}/NEEDED" && ! -f "${cpv}/NEEDED.ELF.2" ]] || continue
-			while read -r line; do
-				filename=${line% *}
-				newline=$(scanelf -BF "%a;%F;%S;%r;%n" "${ROOT%/}${filename}")
-				newline=${newline//  -  }
-				[[ ${#ROOT} -gt 1 ]] && newline=${newline/${ROOT%/}}
-				echo "${newline:3}" >> "${cpv}/NEEDED.ELF.2"
-			done < "${cpv}/NEEDED"
-		done
-	fi
-
-	local distdir=${PORTAGE_ACTUAL_DISTDIR-${DISTDIR}}
-
-	if ${USERSYNC_UPGRADE} && \
-		[[ -d ${PORTDIR} && -w ${PORTDIR} ]] ; then
-		local ownership=$(get_ownership "${PORTDIR}")
-		if [[ -n ${ownership} ]] ; then
-			einfo "Adjusting PORTDIR permissions for usersync"
-			find "${PORTDIR}" -path "${distdir%/}" -prune -o \
-				! \( -user "${ownership%:*}" -a -group "${ownership#*:}" \) \
-				-exec chown "${ownership}" {} +
-		fi
-	fi
-
-	# Do this last, since it could take a long time if there
-	# are lots of live sources, and the user may be tempted
-	# to kill emerge while it is running.
-	if ${USERPRIV_UPGRADE} && \
-		[[ -d ${distdir} && -w ${distdir} ]] ; then
-		local ownership=$(get_ownership "${distdir}")
-		if [[ ${ownership#*:} == portage ]] ; then
-			einfo "Adjusting DISTDIR permissions for userpriv"
-			find "${distdir}" -mindepth 1 -maxdepth 1 -type d -uid 0 \
-				-exec chown -R portage:portage {} +
-		fi
-	fi
-}
diff --git a/sys-cluster/nova/files/2013.2.2-CVE-2014-0134.patch b/sys-cluster/nova/files/2013.2.2-CVE-2014-0134.patch
new file mode 100644
index 000000000000..4aab09443087
--- /dev/null
+++ b/sys-cluster/nova/files/2013.2.2-CVE-2014-0134.patch
@@ -0,0 +1,576 @@
+From e2527e64f77ca0211c744908031cf056cb144f07 Mon Sep 17 00:00:00 2001
+From: David Ripton <dripton@redhat.com>
+Date: Mon, 17 Mar 2014 22:18:05 -0400
+Subject: [PATCH] Persist image format to a file, to prevent attacks based on
+ changing it
+
+The attack is based on creating a raw image that looks like a qcow2
+image, and taking advantage of the code that used 'qemu-img info' to
+autodetect the image format.
+
+Now we store the image format to a 'disk.info' file, for Qcow2 and Raw
+images, and only autodetect for images that have never been written to
+that file.  Since glance takes the appropriate security precautions on
+image upload, this should be sufficient and backward-compatible.
+
+Manually resolved one conflict in nova/virt/libvirt/imagebackend.py:
+snapshot_delete was removed in icehouse, but is still there in havana
+
+Change-Id: I2016efdb3f49a44ec4d677ac596eacc97871f30a
+Closes-bug: #1221190
+---
+ nova/tests/virt/libvirt/test_imagebackend.py | 331 ++++++++++++++++++++++-----
+ nova/virt/libvirt/imagebackend.py            |  57 ++++-
+ 2 files changed, 324 insertions(+), 64 deletions(-)
+
+diff --git a/nova/tests/virt/libvirt/test_imagebackend.py b/nova/tests/virt/libvirt/test_imagebackend.py
+index 2455ec8..3df22fa 100644
+--- a/nova/tests/virt/libvirt/test_imagebackend.py
++++ b/nova/tests/virt/libvirt/test_imagebackend.py
+@@ -16,6 +16,8 @@
+ #    under the License.
+ 
+ import os
++import shutil
++import tempfile
+ 
+ import fixtures
+ from oslo.config import cfg
+@@ -31,7 +33,6 @@ CONF = cfg.CONF
+ 
+ 
+ class _ImageTestCase(object):
+-    INSTANCES_PATH = '/instances_path'
+ 
+     def mock_create_image(self, image):
+         def create_image(fn, base, size, *args, **kwargs):
+@@ -40,10 +41,13 @@ class _ImageTestCase(object):
+ 
+     def setUp(self):
+         super(_ImageTestCase, self).setUp()
++        self.INSTANCES_PATH = tempfile.mkdtemp(suffix='instances')
+         self.flags(disable_process_locking=True,
+                    instances_path=self.INSTANCES_PATH)
+         self.INSTANCE = {'name': 'instance',
+                          'uuid': uuidutils.generate_uuid()}
++        self.DISK_INFO_PATH = os.path.join(self.INSTANCES_PATH,
++                                           self.INSTANCE['uuid'], 'disk.info')
+         self.NAME = 'fake.vm'
+         self.TEMPLATE = 'template'
+ 
+@@ -61,6 +65,70 @@ class _ImageTestCase(object):
+             'nova.virt.libvirt.imagebackend.libvirt_utils',
+             fake_libvirt_utils))
+ 
++    def tearDown(self):
++        super(_ImageTestCase, self).tearDown()
++        shutil.rmtree(self.INSTANCES_PATH)
++
++    def test_prealloc_image(self):
++        CONF.set_override('preallocate_images', 'space')
++
++        fake_processutils.fake_execute_clear_log()
++        fake_processutils.stub_out_processutils_execute(self.stubs)
++        image = self.image_class(self.INSTANCE, self.NAME)
++
++        def fake_fetch(target, *args, **kwargs):
++            return
++
++        self.stubs.Set(os.path, 'exists', lambda _: True)
++        self.stubs.Set(os, 'access', lambda p, w: True)
++
++        # Call twice to verify testing fallocate is only called once.
++        image.cache(fake_fetch, self.TEMPLATE_PATH, self.SIZE)
++        image.cache(fake_fetch, self.TEMPLATE_PATH, self.SIZE)
++
++        self.assertEqual(fake_processutils.fake_execute_get_log(),
++            ['fallocate -n -l 1 %s.fallocate_test' % self.PATH,
++             'fallocate -n -l %s %s' % (self.SIZE, self.PATH),
++             'fallocate -n -l %s %s' % (self.SIZE, self.PATH)])
++
++    def test_prealloc_image_without_write_access(self):
++        CONF.set_override('preallocate_images', 'space')
++
++        fake_processutils.fake_execute_clear_log()
++        fake_processutils.stub_out_processutils_execute(self.stubs)
++        image = self.image_class(self.INSTANCE, self.NAME)
++
++        def fake_fetch(target, *args, **kwargs):
++            return
++
++        self.stubs.Set(image, 'check_image_exists', lambda: True)
++        self.stubs.Set(image, '_can_fallocate', lambda: True)
++        self.stubs.Set(os.path, 'exists', lambda _: True)
++        self.stubs.Set(os, 'access', lambda p, w: False)
++
++        # Testing fallocate is only called when user has write access.
++        image.cache(fake_fetch, self.TEMPLATE_PATH, self.SIZE)
++
++        self.assertEqual(fake_processutils.fake_execute_get_log(), [])
++
++
++class RawTestCase(_ImageTestCase, test.NoDBTestCase):
++
++    SIZE = 1024
++
++    def setUp(self):
++        self.image_class = imagebackend.Raw
++        super(RawTestCase, self).setUp()
++        self.stubs.Set(imagebackend.Raw, 'correct_format', lambda _: None)
++
++    def prepare_mocks(self):
++        fn = self.mox.CreateMockAnything()
++        self.mox.StubOutWithMock(imagebackend.utils.synchronized,
++                                 '__call__')
++        self.mox.StubOutWithMock(imagebackend.libvirt_utils, 'copy_image')
++        self.mox.StubOutWithMock(imagebackend.disk, 'extend')
++        return fn
++
+     def test_cache(self):
+         self.mox.StubOutWithMock(os.path, 'exists')
+         if self.OLD_STYLE_INSTANCE_PATH:
+@@ -128,66 +196,6 @@ class _ImageTestCase(object):
+ 
+         self.mox.VerifyAll()
+ 
+-    def test_prealloc_image(self):
+-        CONF.set_override('preallocate_images', 'space')
+-
+-        fake_processutils.fake_execute_clear_log()
+-        fake_processutils.stub_out_processutils_execute(self.stubs)
+-        image = self.image_class(self.INSTANCE, self.NAME)
+-
+-        def fake_fetch(target, *args, **kwargs):
+-            return
+-
+-        self.stubs.Set(os.path, 'exists', lambda _: True)
+-        self.stubs.Set(os, 'access', lambda p, w: True)
+-
+-        # Call twice to verify testing fallocate is only called once.
+-        image.cache(fake_fetch, self.TEMPLATE_PATH, self.SIZE)
+-        image.cache(fake_fetch, self.TEMPLATE_PATH, self.SIZE)
+-
+-        self.assertEqual(fake_processutils.fake_execute_get_log(),
+-            ['fallocate -n -l 1 %s.fallocate_test' % self.PATH,
+-             'fallocate -n -l %s %s' % (self.SIZE, self.PATH),
+-             'fallocate -n -l %s %s' % (self.SIZE, self.PATH)])
+-
+-    def test_prealloc_image_without_write_access(self):
+-        CONF.set_override('preallocate_images', 'space')
+-
+-        fake_processutils.fake_execute_clear_log()
+-        fake_processutils.stub_out_processutils_execute(self.stubs)
+-        image = self.image_class(self.INSTANCE, self.NAME)
+-
+-        def fake_fetch(target, *args, **kwargs):
+-            return
+-
+-        self.stubs.Set(image, 'check_image_exists', lambda: True)
+-        self.stubs.Set(image, '_can_fallocate', lambda: True)
+-        self.stubs.Set(os.path, 'exists', lambda _: True)
+-        self.stubs.Set(os, 'access', lambda p, w: False)
+-
+-        # Testing fallocate is only called when user has write access.
+-        image.cache(fake_fetch, self.TEMPLATE_PATH, self.SIZE)
+-
+-        self.assertEqual(fake_processutils.fake_execute_get_log(), [])
+-
+-
+-class RawTestCase(_ImageTestCase, test.NoDBTestCase):
+-
+-    SIZE = 1024
+-
+-    def setUp(self):
+-        self.image_class = imagebackend.Raw
+-        super(RawTestCase, self).setUp()
+-        self.stubs.Set(imagebackend.Raw, 'correct_format', lambda _: None)
+-
+-    def prepare_mocks(self):
+-        fn = self.mox.CreateMockAnything()
+-        self.mox.StubOutWithMock(imagebackend.utils.synchronized,
+-                                 '__call__')
+-        self.mox.StubOutWithMock(imagebackend.libvirt_utils, 'copy_image')
+-        self.mox.StubOutWithMock(imagebackend.disk, 'extend')
+-        return fn
+-
+     def test_create_image(self):
+         fn = self.prepare_mocks()
+         fn(target=self.TEMPLATE_PATH, max_size=None, image_id=None)
+@@ -222,16 +230,17 @@ class RawTestCase(_ImageTestCase, test.NoDBTestCase):
+         self.mox.VerifyAll()
+ 
+     def test_correct_format(self):
+-        info = self.mox.CreateMockAnything()
+         self.stubs.UnsetAll()
+ 
+         self.mox.StubOutWithMock(os.path, 'exists')
+         self.mox.StubOutWithMock(imagebackend.images, 'qemu_img_info')
+ 
+         os.path.exists(self.PATH).AndReturn(True)
++        os.path.exists(self.DISK_INFO_PATH).AndReturn(False)
+         info = self.mox.CreateMockAnything()
+         info.file_format = 'foo'
+         imagebackend.images.qemu_img_info(self.PATH).AndReturn(info)
++        os.path.exists(CONF.instances_path).AndReturn(True)
+         self.mox.ReplayAll()
+ 
+         image = self.image_class(self.INSTANCE, self.NAME, path=self.PATH)
+@@ -239,6 +248,11 @@ class RawTestCase(_ImageTestCase, test.NoDBTestCase):
+ 
+         self.mox.VerifyAll()
+ 
++    def test_resolve_driver_format(self):
++        image = self.image_class(self.INSTANCE, self.NAME)
++        driver_format = image.resolve_driver_format()
++        self.assertEqual(driver_format, 'raw')
++
+ 
+ class Qcow2TestCase(_ImageTestCase, test.NoDBTestCase):
+     SIZE = 1024 * 1024 * 1024
+@@ -259,6 +273,77 @@ class Qcow2TestCase(_ImageTestCase, test.NoDBTestCase):
+         self.mox.StubOutWithMock(imagebackend.disk, 'extend')
+         return fn
+ 
++    def test_cache(self):
++        self.mox.StubOutWithMock(os.path, 'exists')
++        if self.OLD_STYLE_INSTANCE_PATH:
++            os.path.exists(self.OLD_STYLE_INSTANCE_PATH).AndReturn(False)
++        os.path.exists(self.DISK_INFO_PATH).AndReturn(False)
++        os.path.exists(CONF.instances_path).AndReturn(True)
++        os.path.exists(self.TEMPLATE_DIR).AndReturn(False)
++        os.path.exists(self.INSTANCES_PATH).AndReturn(True)
++        os.path.exists(self.PATH).AndReturn(False)
++        fn = self.mox.CreateMockAnything()
++        fn(target=self.TEMPLATE_PATH)
++        self.mox.ReplayAll()
++
++        image = self.image_class(self.INSTANCE, self.NAME)
++        self.mock_create_image(image)
++        image.cache(fn, self.TEMPLATE)
++
++        self.mox.VerifyAll()
++
++    def test_cache_image_exists(self):
++        self.mox.StubOutWithMock(os.path, 'exists')
++        if self.OLD_STYLE_INSTANCE_PATH:
++            os.path.exists(self.OLD_STYLE_INSTANCE_PATH).AndReturn(False)
++        os.path.exists(self.DISK_INFO_PATH).AndReturn(False)
++        os.path.exists(self.INSTANCES_PATH).AndReturn(True)
++        os.path.exists(self.TEMPLATE_DIR).AndReturn(True)
++        os.path.exists(self.PATH).AndReturn(True)
++        os.path.exists(self.TEMPLATE_PATH).AndReturn(True)
++        self.mox.ReplayAll()
++
++        image = self.image_class(self.INSTANCE, self.NAME)
++        image.cache(None, self.TEMPLATE)
++
++        self.mox.VerifyAll()
++
++    def test_cache_base_dir_exists(self):
++        self.mox.StubOutWithMock(os.path, 'exists')
++        if self.OLD_STYLE_INSTANCE_PATH:
++            os.path.exists(self.OLD_STYLE_INSTANCE_PATH).AndReturn(False)
++        os.path.exists(self.DISK_INFO_PATH).AndReturn(False)
++        os.path.exists(self.INSTANCES_PATH).AndReturn(True)
++        os.path.exists(self.TEMPLATE_DIR).AndReturn(True)
++        os.path.exists(self.PATH).AndReturn(False)
++        fn = self.mox.CreateMockAnything()
++        fn(target=self.TEMPLATE_PATH)
++        self.mox.ReplayAll()
++
++        image = self.image_class(self.INSTANCE, self.NAME)
++        self.mock_create_image(image)
++        image.cache(fn, self.TEMPLATE)
++
++        self.mox.VerifyAll()
++
++    def test_cache_template_exists(self):
++        self.mox.StubOutWithMock(os.path, 'exists')
++        if self.OLD_STYLE_INSTANCE_PATH:
++            os.path.exists(self.OLD_STYLE_INSTANCE_PATH).AndReturn(False)
++        os.path.exists(self.DISK_INFO_PATH).AndReturn(False)
++        os.path.exists(self.INSTANCES_PATH).AndReturn(True)
++        os.path.exists(self.TEMPLATE_DIR).AndReturn(True)
++        os.path.exists(self.PATH).AndReturn(False)
++        fn = self.mox.CreateMockAnything()
++        fn(target=self.TEMPLATE_PATH)
++        self.mox.ReplayAll()
++
++        image = self.image_class(self.INSTANCE, self.NAME)
++        self.mock_create_image(image)
++        image.cache(fn, self.TEMPLATE)
++
++        self.mox.VerifyAll()
++
+     def test_create_image(self):
+         fn = self.prepare_mocks()
+         fn(max_size=None, target=self.TEMPLATE_PATH)
+@@ -277,6 +362,8 @@ class Qcow2TestCase(_ImageTestCase, test.NoDBTestCase):
+         self.mox.StubOutWithMock(os.path, 'exists')
+         if self.OLD_STYLE_INSTANCE_PATH:
+             os.path.exists(self.OLD_STYLE_INSTANCE_PATH).AndReturn(False)
++        os.path.exists(self.DISK_INFO_PATH).AndReturn(False)
++        os.path.exists(self.INSTANCES_PATH).AndReturn(True)
+         os.path.exists(self.TEMPLATE_PATH).AndReturn(False)
+         os.path.exists(self.PATH).AndReturn(False)
+         os.path.exists(self.PATH).AndReturn(False)
+@@ -296,6 +383,8 @@ class Qcow2TestCase(_ImageTestCase, test.NoDBTestCase):
+         self.mox.StubOutWithMock(imagebackend.disk, 'get_disk_size')
+         if self.OLD_STYLE_INSTANCE_PATH:
+             os.path.exists(self.OLD_STYLE_INSTANCE_PATH).AndReturn(False)
++        os.path.exists(self.DISK_INFO_PATH).AndReturn(False)
++        os.path.exists(self.INSTANCES_PATH).AndReturn(True)
+         os.path.exists(self.TEMPLATE_PATH).AndReturn(True)
+         imagebackend.disk.get_disk_size(self.TEMPLATE_PATH
+                                        ).AndReturn(self.SIZE)
+@@ -314,6 +403,8 @@ class Qcow2TestCase(_ImageTestCase, test.NoDBTestCase):
+                                  'get_disk_backing_file')
+         if self.OLD_STYLE_INSTANCE_PATH:
+             os.path.exists(self.OLD_STYLE_INSTANCE_PATH).AndReturn(False)
++        os.path.exists(self.DISK_INFO_PATH).AndReturn(False)
++        os.path.exists(CONF.instances_path).AndReturn(True)
+         os.path.exists(self.TEMPLATE_PATH).AndReturn(False)
+         os.path.exists(self.PATH).AndReturn(True)
+ 
+@@ -340,6 +431,9 @@ class Qcow2TestCase(_ImageTestCase, test.NoDBTestCase):
+                                  'get_disk_backing_file')
+         if self.OLD_STYLE_INSTANCE_PATH:
+             os.path.exists(self.OLD_STYLE_INSTANCE_PATH).AndReturn(False)
++        os.path.exists(self.DISK_INFO_PATH).AndReturn(False)
++        os.path.exists(self.INSTANCES_PATH).AndReturn(True)
++
+         os.path.exists(self.TEMPLATE_PATH).AndReturn(False)
+         os.path.exists(self.PATH).AndReturn(True)
+ 
+@@ -353,6 +447,55 @@ class Qcow2TestCase(_ImageTestCase, test.NoDBTestCase):
+ 
+         self.mox.VerifyAll()
+ 
++    def test_resolve_driver_format(self):
++        image = self.image_class(self.INSTANCE, self.NAME)
++        driver_format = image.resolve_driver_format()
++        self.assertEqual(driver_format, 'qcow2')
++
++    def test_prealloc_image(self):
++        CONF.set_override('preallocate_images', 'space')
++
++        fake_processutils.fake_execute_clear_log()
++        fake_processutils.stub_out_processutils_execute(self.stubs)
++        image = self.image_class(self.INSTANCE, self.NAME)
++
++        def fake_fetch(target, *args, **kwargs):
++            return
++
++        self.stubs.Set(os.path, 'exists', lambda _: True)
++        self.stubs.Set(os, 'access', lambda p, w: True)
++
++        # Call twice to verify testing fallocate is only called once.
++        image.cache(fake_fetch, self.TEMPLATE_PATH, self.SIZE)
++        image.cache(fake_fetch, self.TEMPLATE_PATH, self.SIZE)
++
++        self.assertEqual(fake_processutils.fake_execute_get_log(),
++            ['chown root:root %s' % self.DISK_INFO_PATH,
++             'fallocate -n -l 1 %s.fallocate_test' % self.PATH,
++             'fallocate -n -l %s %s' % (self.SIZE, self.PATH),
++             'fallocate -n -l %s %s' % (self.SIZE, self.PATH)])
++
++    def test_prealloc_image_without_write_access(self):
++        CONF.set_override('preallocate_images', 'space')
++
++        fake_processutils.fake_execute_clear_log()
++        fake_processutils.stub_out_processutils_execute(self.stubs)
++        image = self.image_class(self.INSTANCE, self.NAME)
++
++        def fake_fetch(target, *args, **kwargs):
++            return
++
++        self.stubs.Set(image, 'check_image_exists', lambda: True)
++        self.stubs.Set(image, '_can_fallocate', lambda: True)
++        self.stubs.Set(os.path, 'exists', lambda _: True)
++        self.stubs.Set(os, 'access', lambda p, w: False)
++
++        # Testing fallocate is only called when user has write access.
++        image.cache(fake_fetch, self.TEMPLATE_PATH, self.SIZE)
++
++        self.assertEqual(fake_processutils.fake_execute_get_log(),
++            ['chown root:root %s' % self.DISK_INFO_PATH])
++
+ 
+ class LvmTestCase(_ImageTestCase, test.NoDBTestCase):
+     VG = 'FakeVG'
+@@ -429,6 +572,56 @@ class LvmTestCase(_ImageTestCase, test.NoDBTestCase):
+ 
+         self.mox.VerifyAll()
+ 
++    def test_cache(self):
++        self.mox.StubOutWithMock(os.path, 'exists')
++        if self.OLD_STYLE_INSTANCE_PATH:
++            os.path.exists(self.OLD_STYLE_INSTANCE_PATH).AndReturn(False)
++        os.path.exists(self.TEMPLATE_DIR).AndReturn(False)
++        os.path.exists(self.PATH).AndReturn(False)
++
++        fn = self.mox.CreateMockAnything()
++        fn(target=self.TEMPLATE_PATH)
++        self.mox.StubOutWithMock(imagebackend.fileutils, 'ensure_tree')
++        imagebackend.fileutils.ensure_tree(self.TEMPLATE_DIR)
++        self.mox.ReplayAll()
++
++        image = self.image_class(self.INSTANCE, self.NAME)
++        self.mock_create_image(image)
++        image.cache(fn, self.TEMPLATE)
++
++        self.mox.VerifyAll()
++
++    def test_cache_image_exists(self):
++        self.mox.StubOutWithMock(os.path, 'exists')
++        if self.OLD_STYLE_INSTANCE_PATH:
++            os.path.exists(self.OLD_STYLE_INSTANCE_PATH).AndReturn(False)
++        os.path.exists(self.TEMPLATE_DIR).AndReturn(True)
++        os.path.exists(self.PATH).AndReturn(True)
++        os.path.exists(self.TEMPLATE_PATH).AndReturn(True)
++        self.mox.ReplayAll()
++
++        image = self.image_class(self.INSTANCE, self.NAME)
++        image.cache(None, self.TEMPLATE)
++
++        self.mox.VerifyAll()
++
++    def test_cache_base_dir_exists(self):
++        self.mox.StubOutWithMock(os.path, 'exists')
++        if self.OLD_STYLE_INSTANCE_PATH:
++            os.path.exists(self.OLD_STYLE_INSTANCE_PATH).AndReturn(False)
++        os.path.exists(self.TEMPLATE_DIR).AndReturn(True)
++        os.path.exists(self.PATH).AndReturn(False)
++        fn = self.mox.CreateMockAnything()
++        fn(target=self.TEMPLATE_PATH)
++        self.mox.StubOutWithMock(imagebackend.fileutils, 'ensure_tree')
++        self.mox.ReplayAll()
++
++        image = self.image_class(self.INSTANCE, self.NAME)
++        self.mock_create_image(image)
++        image.cache(fn, self.TEMPLATE)
++
++        self.mox.VerifyAll()
++
+     def test_create_image(self):
+         self._create_image(False)
+ 
+@@ -594,6 +787,20 @@ class RbdTestCase(_ImageTestCase, test.NoDBTestCase):
+ 
+         self.mox.VerifyAll()
+ 
++    def test_cache_base_dir_exists(self):
++        self.mox.StubOutWithMock(os.path, 'exists')
++        os.path.exists(self.TEMPLATE_DIR).AndReturn(True)
++        fn = self.mox.CreateMockAnything()
++        fn(target=self.TEMPLATE_PATH)
++        self.mox.StubOutWithMock(imagebackend.fileutils, 'ensure_tree')
++        self.mox.ReplayAll()
++
++        image = self.image_class(self.INSTANCE, self.NAME)
++        self.mock_create_image(image)
++        image.cache(fn, self.TEMPLATE)
++
++        self.mox.VerifyAll()
++
+     def test_create_image(self):
+         fn = self.prepare_mocks()
+         fn(max_size=None, rbd=self.rbd, target=self.TEMPLATE_PATH)
+diff --git a/nova/virt/libvirt/imagebackend.py b/nova/virt/libvirt/imagebackend.py
+index e900789..21c7641 100644
+--- a/nova/virt/libvirt/imagebackend.py
++++ b/nova/virt/libvirt/imagebackend.py
+@@ -88,6 +88,11 @@ class Image(object):
+         self.is_block_dev = is_block_dev
+         self.preallocate = False
+ 
++        # NOTE(dripton): We store lines of json (path, disk_format) in this
++        # file, for some image types, to prevent attacks based on changing the
++        # disk_format.
++        self.disk_info_path = None
++
+         # NOTE(mikal): We need a lock directory which is shared along with
+         # instance files, to cover the scenario where multiple compute nodes
+         # are trying to create a base file at the same time
+@@ -232,6 +237,46 @@ class Image(object):
+     def snapshot_delete(self):
+         raise NotImplementedError()
+ 
++    def _get_driver_format(self):
++        return self.driver_format
++
++    def resolve_driver_format(self):
++        """Return the driver format for self.path.
++
++        First checks self.disk_info_path for an entry.
++        If it's not there, calls self._get_driver_format(), and then
++        stores the result in self.disk_info_path
++
++        See https://bugs.launchpad.net/nova/+bug/1221190
++        """
++        @utils.synchronized(self.disk_info_path, external=False,
++                            lock_path=self.lock_path)
++        def write_to_disk_info_file():
++            with open(self.disk_info_path, "w") as disk_info_file:
++                disk_info_file.write('%s\n' %
++                                  jsonutils.dumps((self.path, driver_format)))
++            # Ensure the file is always owned by root so qemu can't write it.
++            utils.execute('chown', 'root:root', self.disk_info_path,
++                          run_as_root=True)
++
++        if (self.disk_info_path is not None and
++                    os.path.exists(self.disk_info_path)):
++            with open(self.disk_info_path) as disk_info_file:
++                line = disk_info_file.read().rstrip()
++                try:
++                    parts = jsonutils.loads(line)
++                except (TypeError, ValueError):
++                    parts = []
++                if len(parts) == 2:
++                    (path, driver_format) = parts
++                    if path == self.path:
++                        return driver_format
++        driver_format = self._get_driver_format()
++        if self.disk_info_path is not None:
++            fileutils.ensure_tree(os.path.dirname(self.disk_info_path))
++            write_to_disk_info_file()
++        return driver_format
++
+ 
+ class Raw(Image):
+     def __init__(self, instance=None, disk_name=None, path=None,
+@@ -243,12 +288,17 @@ class Raw(Image):
+                                   disk_name))
+         self.snapshot_name = snapshot_name
+         self.preallocate = CONF.preallocate_images != 'none'
++        self.disk_info_path = os.path.join(os.path.dirname(self.path),
++                                           'disk.info')
+         self.correct_format()
+ 
++    def _get_driver_format(self):
++        data = images.qemu_img_info(self.path)
++        return data.file_format or 'raw'
++
+     def correct_format(self):
+         if os.path.exists(self.path):
+-            data = images.qemu_img_info(self.path)
+-            self.driver_format = data.file_format or 'raw'
++            self.driver_format = self.resolve_driver_format()
+ 
+     def create_image(self, prepare_template, base, size, *args, **kwargs):
+         @utils.synchronized(base, external=True, lock_path=self.lock_path)
+@@ -291,6 +341,9 @@ class Qcow2(Image):
+                                   disk_name))
+         self.snapshot_name = snapshot_name
+         self.preallocate = CONF.preallocate_images != 'none'
++        self.disk_info_path = os.path.join(os.path.dirname(self.path),
++                                           'disk.info')
++        self.resolve_driver_format()
+ 
+     def create_image(self, prepare_template, base, size, *args, **kwargs):
+         @utils.synchronized(base, external=True, lock_path=self.lock_path)
+-- 
+1.8.5.3
+
+
+
diff --git a/sys-cluster/nova/nova-2013.2.2.ebuild b/sys-cluster/nova/nova-2013.2.2-r1.ebuild
similarity index 97%
rename from sys-cluster/nova/nova-2013.2.2.ebuild
rename to sys-cluster/nova/nova-2013.2.2-r1.ebuild
index 25d94ea03322..917e62cd12d4 100644
--- a/sys-cluster/nova/nova-2013.2.2.ebuild
+++ b/sys-cluster/nova/nova-2013.2.2-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/sys-cluster/nova/nova-2013.2.2.ebuild,v 1.1 2014/02/20 21:15:02 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/nova/nova-2013.2.2-r1.ebuild,v 1.1 2014/03/25 20:51:33 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -71,6 +71,7 @@ RDEPEND="sqlite? ( >=dev-python/sqlalchemy-0.7.8[sqlite,${PYTHON_USEDEP}]
 			   app-emulation/xen-tools )"
 
 PATCHES=(
+		"${FILESDIR}/2013.2.2-CVE-2014-0134.patch"
 )
 
 pkg_setup() {
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index 486ccca63c42..e858a0d45f29 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -1,3 +1,3 @@
 DIST systemd-208-r1.tar.xz 2382904 SHA256 aa64fa864466fd5727005c55d61c092828b94b4f857272c0b503695022146390 SHA512 c21989b747f5e73ba2311919e1ae558132e4ab2e0d8715c25f51e5e90069e147a52e04280c736ecca6b675af7d79def576171a9b08aaeda45fcd52bcdca011cb WHIRLPOOL e86fdbf96c75c4c94c9507900a5696ff811f5439e0cb45bdc765dc42c62a855c9d2e7d3414df7ec7e18013d937c9148e42c861d0e28e8b4c2fabebd234fbee03
-DIST systemd-211.tar.xz 2664508 SHA256 f278c1ff6f0f0efadf0f7fff01ed6a0ead1a7868b5a9e1baa240e1673e516648 SHA512 fd33920825d0b63bf6e6a583cbfbf44fe577428f5fa6993b659d7f310f8fbdb3f5b22d585818ec4b834fd0703bc5d6bf93e6925e5c391f14ee65f44c0878d5e5 WHIRLPOOL 26205fc02cb13fb8f43c23888d83c31daa676c117a32e65adbc372e8eb974fe7e37f560b85b72abb4cfc832a45a6658858a1cca17a526baa967ba2d95904a448
+DIST systemd-212.tar.xz 2722692 SHA256 652906b43704fe705cb47757ea9bbbf3c1ab4a1d55ea38b0013a6f2d0863f2c2 SHA512 3e6dac77785cb2f928886886f92cdd11ed00a4db1453699e0102d3ecffa03d1795f44df10239105e4b2b039f0e3e4b5d44c9f876f25c10a6dc4f7e1fbf87c333 WHIRLPOOL 31d1a967435963155c60ca5016f207aa105e9ddcb7d73e9fcde20f7e1fb66701384b81ee01134bf4d75dfa1ea0d412bb352ff11ac6f8c05e836135baf94bbe37
 DIST udev-208-patches-1.tar.xz 964 SHA256 b2df84afd8631736aceee1317d332fd9bee347df503aa55cd78bcf1b375e8f75 SHA512 6e85daaf8639255bbaa76364cda02f8b034ec5f687730a7e3ea7427b53031b4cdcbe1b8758e1474104d52e04781605ee3c1e31bbec2df33c95e606cee8eb0f28 WHIRLPOOL 054d1e954c4eacd10fcdacf130bf6cf2dd165f3da10ba5629f4bd8e488a221e8e5d7db3ab821593af8dd92011dee98daadf09e5dd726a4c99861f4abaea6aca0
diff --git a/sys-fs/udev/udev-211.ebuild b/sys-fs/udev/udev-212.ebuild
similarity index 97%
rename from sys-fs/udev/udev-211.ebuild
rename to sys-fs/udev/udev-212.ebuild
index 3bec6470e103..839513b0108a 100644
--- a/sys-fs/udev/udev-211.ebuild
+++ b/sys-fs/udev/udev-212.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-fs/udev/udev-211.ebuild,v 1.2 2014/03/19 16:23:12 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-212.ebuild,v 1.1 2014/03/26 06:13:06 ssuominen Exp $
 
 EAPI=5
 
@@ -163,13 +163,6 @@ src_prepare() {
 		-e '/--enable-static is not supported by systemd/s:as_fn_error:echo:' \
 		configure || die
 
-	# Force ld.bfd for arches with no -Wl,--gc-sections support in ld.gold wrt #504700
-	# Do this here to make use of CC_CHECK_FLAGS_APPEND in configure.ac, as older binutils
-	# version doesn't necessarily support whole -Wl,-fuse-ld= flag
-	if use ia64; then
-		sed -i -e '/fuse-ld/s:gold:bfd:' configure || die
-	fi
-
 	if ! use elibc_glibc; then #443030
 		echo '#define secure_getenv(x) NULL' >> config.h.in
 		sed -i -e '/error.*secure_getenv/s:.*:#define secure_getenv(x) NULL:' src/shared/missing.h || die
@@ -192,7 +185,6 @@ multilib_src_configure() {
 		--disable-dbus
 		--disable-seccomp
 		--disable-xz
-		--disable-tcpwrap
 		--disable-pam
 		--disable-xattr
 		--disable-gcrypt
@@ -200,6 +192,7 @@ multilib_src_configure() {
 		--disable-libcryptsetup
 		--disable-qrencode
 		--disable-microhttpd
+		--disable-gnutls
 		--disable-readahead
 		--disable-quotacheck
 		--disable-logind
diff --git a/sys-fs/udev/udev-9999.ebuild b/sys-fs/udev/udev-9999.ebuild
index 0f9354749796..42a397345927 100644
--- a/sys-fs/udev/udev-9999.ebuild
+++ b/sys-fs/udev/udev-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/sys-fs/udev/udev-9999.ebuild,v 1.288 2014/03/19 16:23:12 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.289 2014/03/26 06:13:06 ssuominen Exp $
 
 EAPI=5
 
@@ -163,13 +163,6 @@ src_prepare() {
 		-e '/--enable-static is not supported by systemd/s:as_fn_error:echo:' \
 		configure || die
 
-	# Force ld.bfd for arches with no -Wl,--gc-sections support in ld.gold wrt #504700
-	# Do this here to make use of CC_CHECK_FLAGS_APPEND in configure.ac, as older binutils
-	# version doesn't necessarily support whole -Wl,-fuse-ld= flag
-	if use ia64; then
-		sed -i -e '/fuse-ld/s:gold:bfd:' configure || die
-	fi
-
 	if ! use elibc_glibc; then #443030
 		echo '#define secure_getenv(x) NULL' >> config.h.in
 		sed -i -e '/error.*secure_getenv/s:.*:#define secure_getenv(x) NULL:' src/shared/missing.h || die
@@ -192,7 +185,6 @@ multilib_src_configure() {
 		--disable-dbus
 		--disable-seccomp
 		--disable-xz
-		--disable-tcpwrap
 		--disable-pam
 		--disable-xattr
 		--disable-gcrypt
@@ -200,6 +192,7 @@ multilib_src_configure() {
 		--disable-libcryptsetup
 		--disable-qrencode
 		--disable-microhttpd
+		--disable-gnutls
 		--disable-readahead
 		--disable-quotacheck
 		--disable-logind
diff --git a/sys-fs/udisks/Manifest b/sys-fs/udisks/Manifest
index ca9c34bb6426..62d05193e0f1 100644
--- a/sys-fs/udisks/Manifest
+++ b/sys-fs/udisks/Manifest
@@ -1,6 +1,2 @@
-DIST udisks-1.0.4.tar.gz 719889 SHA256 854b89368733b9c3a577101b761ad5397ae75a05110c8698ac5b29de9a8bf8f5 SHA512 8c9ac4e234cd7680ab1b024dfa9786ec127961c6bbcef352f7bac09972a39632b824587718177ed35bf036702d716bc893a8f71a374bf99de79342a46907a8ac WHIRLPOOL 9fcbb7112258aec4f0fb4926246521b54805ca850e6ad9d951fda819945c2c15ced1798463da8ba49729ea525e2710c58e4180107b50ab0f1e07af2e494cc421
 DIST udisks-1.0.5.tar.gz 736221 SHA256 f2ec82eb0ea7e01dc299b5b29b3c18cdf861236ec43dcff66b3552b4b31c6f71 SHA512 bdf4970113975221ff0e17866db18fd969ff9c8e1e851c8ad7572630814ab0c46b59df59433edcb2e7cc41cc8152afd35807f45e07f6d0fa87b21b5a77d0965a WHIRLPOOL 4698911bf53532b5149a71ab1a031fa836193476114ba26f0cde588c3095661f21492feb855e1eb3aa8f1c87ad8125bdc32b7cf56ac43f2de84073f3085f39eb
-DIST udisks-2.1.0.tar.bz2 823805 SHA256 310208e5a10335dae4b52a0125c24d31cf292cce3d15cf65da4cd308e38d15a8 SHA512 dffbceda998aee62f56819111db7c33fd65b8295d14885f28f8209be332ab319353116d51e2c006e434865ac515db04c7d8f5d2639ab9870247cf49136747811 WHIRLPOOL a891e1fed94b6c516a31b291ae4bfcfb8764df51f93781a6da4b1aa4051b7164ddb5ba7d28067dd4418c756af3056dddabc952f531c4d78c8ff60e7ce305835a
-DIST udisks-2.1.1.tar.bz2 837872 SHA256 013b09ff38aa256b89c01525771f4565cb088724d5c8c79b32e9f811e88086fb SHA512 d232bcf60365c8f5687af2c9f95752c6ed4be1aee218f0e3e509c4da5853714642a622298755516e1b9802a2a7acf04100300dee8d94953360d00f53897a4491 WHIRLPOOL 2eaf7a1adfe67a6af166fcb6cafbd5645a66d99c653afa4561ca8a90ce2a797632e8dbb6adc32ee4a6cee2a06c448cb41a91c1295953c21e44b1b53b74967da8
-DIST udisks-2.1.2.tar.bz2 899694 SHA256 afe928fe7f44086b835257efc3fcbe503e2da7c988a773c997d0291bbab4a637 SHA512 24c321627bcc8b5a3e4d048669b35d25ca92cb7f606819c8375fac3994106ce56766fd2a32eb55b6b6f4838e90dc841139faaea52f3cc2229a134963af27c934 WHIRLPOOL 670f4e9c64343a0ad86bf40389e732b39935e061d07c5d59ba6c8cecd47f47845c5f404eacb8e2bc03fd7bc5cabb2fc82cc5db3ac449ac8cc5345ef9166de46d
 DIST udisks-2.1.3.tar.bz2 909945 SHA256 5cc92fd651ee49a7888f90d091282b949afc629b31fdb34e187208750720632d SHA512 52f15ecdb700e91919ce0e2017aa1c185afaf86d936036a0a380b91b322c3d949263c09c16fe02fbe7385c0d0055ca3ddc5f6b69ed3ea87df3acc78413aef494 WHIRLPOOL f81f0a9b030ac25c9aa1c800ed20bd5bd8848da72420ef86567f459bf37ddc59bc09e169f9a58fd9d774c41ef312b7f6f83fef541666a578cea01870df4dbc8a
diff --git a/sys-fs/udisks/files/udisks-1.0.4-drop-pci-db.patch b/sys-fs/udisks/files/udisks-1.0.4-drop-pci-db.patch
deleted file mode 100644
index 852835b0287e..000000000000
--- a/sys-fs/udisks/files/udisks-1.0.4-drop-pci-db.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-commit c73b5ab54378ec6d7df9948c46ce87f98587af9a
-Author: Tom Gundersen <teg@jklm.no>
-Date:   2 days ago
-
-    udev: remove redundant call to deprecated pci-db
-
-    The binary is no longer shipped with systemd/udev. The functionality
-    is taken over by a builtin, which is ran for all devices, rendering
-    this rule superfluous.
-
-    Cc: Jan de Groot <jgc@archlinux.org>
-    Signed-off-by: Tom Gundersen <teg@jklm.no>
-
-diff --git a/data/80-udisks.rules b/data/80-udisks.rules
-index d1c8c5d..4bf2b37 100644
---- a/data/80-udisks.rules
-+++ b/data/80-udisks.rules
-@@ -1,10 +1,6 @@
- # Do not edit this file, it will be overwritten on updates
- #
-
--# import names for PCI storage controllers
--#
--SUBSYSTEM=="pci", ACTION=="add|change", ENV{ID_MODEL_FROM_DATABASE}=="", ATTR{class}=="0x01*", IMPORT{program}="pci-db %p"
--
- # Set eSATA port type for known eSATA CardBus adapters - first we want to ensure
- # the device is on a cardbus controller (upper PCI device) - then we check
- # vid/pid (lower PCI device)
diff --git a/sys-fs/udisks/files/udisks-1.0.4-kernel-2.6.36-compat.patch b/sys-fs/udisks/files/udisks-1.0.4-kernel-2.6.36-compat.patch
deleted file mode 100644
index fef15ea20852..000000000000
--- a/sys-fs/udisks/files/udisks-1.0.4-kernel-2.6.36-compat.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From bf5c28a8dd4eedae51db27fa7b9f84dec425f8bd Mon Sep 17 00:00:00 2001
-From: Edward Sheldrake <ejsheldrake@gmail.com>
-Date: Sun, 04 Sep 2011 18:42:17 +0000
-Subject: Fix power/level deprecation kernel warning
-
-If present, use power/control instead.
-
-https://bugs.freedesktop.org/show_bug.cgi?id=32056
-
-Signed-off-by: David Zeuthen <zeuthen@gmail.com>
----
-diff --git a/src/helpers/job-drive-detach.c b/src/helpers/job-drive-detach.c
-index fc88043..eeafcab 100644
---- a/src/helpers/job-drive-detach.c
-+++ b/src/helpers/job-drive-detach.c
-@@ -235,7 +235,12 @@ main (int argc,
-   if (endp != NULL && num_interfaces == 1)
-     {
-       g_printerr ("Suspending USB device: ");
--      if (!sysfs_write (udev_device_get_syspath (udevice_usb_device), "power/level", "auto") ||
-+      if (sysfs_exists (udev_device_get_syspath (udevice_usb_device), "power/control"))
-+        power_level_path = "power/control";
-+      else
-+        power_level_path = "power/level";
-+      
-+      if (!sysfs_write (udev_device_get_syspath (udevice_usb_device), power_level_path, "auto") ||
-           !sysfs_write (udev_device_get_syspath (udevice_usb_device), "power/autosuspend", "0"))
-         goto out;
-       g_printerr ("OK\n");
-@@ -259,7 +264,6 @@ main (int argc,
-  out:
-   g_free (usb_interface_name);
-   g_free (unbind_path);
--  g_free (power_level_path);
-   if (sg_fd > 0)
-     sg_cmds_close_device (sg_fd);
-   if (udevice != NULL)
---
-cgit v0.9.0.2-2-gbebe
diff --git a/sys-fs/udisks/files/udisks-2.1.0-ieee1394.patch b/sys-fs/udisks/files/udisks-2.1.0-ieee1394.patch
deleted file mode 100644
index 9df3ad41c09a..000000000000
--- a/sys-fs/udisks/files/udisks-2.1.0-ieee1394.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From b841e30a98459816dfc49a735d3db4355a88edcd Mon Sep 17 00:00:00 2001
-From: David Zeuthen <zeuthen@gmail.com>
-Date: Tue, 19 Mar 2013 04:31:40 +0000
-Subject: Properly identify firewire devices as non-system devices
-
-This was reported in bug 62077.
-
-https://bugs.freedesktop.org/show_bug.cgi?id=62077
-
-Signed-off-by: David Zeuthen <zeuthen@gmail.com>
----
-diff --git a/src/udiskslinuxblock.c b/src/udiskslinuxblock.c
-index a1781cf..d619850 100644
---- a/src/udiskslinuxblock.c
-+++ b/src/udiskslinuxblock.c
-@@ -354,7 +354,7 @@ update_hints (UDisksLinuxBlock  *block,
-       connection_bus = udisks_drive_get_connection_bus (drive);
-       removable = udisks_drive_get_media_removable (drive);
-       if (removable ||
--          (g_strcmp0 (connection_bus, "usb") == 0 || g_strcmp0 (connection_bus, "firewire") == 0) ||
-+          (g_strcmp0 (connection_bus, "usb") == 0 || g_strcmp0 (connection_bus, "ieee1394") == 0) ||
-           (g_str_has_prefix (device_file, "/dev/mmcblk") || g_str_has_prefix (device_file, "/dev/mspblk")))
-         {
-           hint_system = FALSE;
---
-cgit v0.9.0.2-2-gbebe
diff --git a/sys-fs/udisks/udisks-1.0.4-r5.ebuild b/sys-fs/udisks/udisks-1.0.4-r5.ebuild
deleted file mode 100644
index 134b76e97f84..000000000000
--- a/sys-fs/udisks/udisks-1.0.4-r5.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udisks/udisks-1.0.4-r5.ebuild,v 1.13 2014/02/02 16:35:32 ssuominen Exp $
-
-EAPI=5
-inherit eutils bash-completion-r1 linux-info udev
-
-DESCRIPTION="Daemon providing interfaces to work with storage devices"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/udisks"
-SRC_URI="http://hal.freedesktop.org/releases/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sh sparc x86"
-IUSE="debug nls remote-access selinux"
-
-COMMON_DEPEND=">=dev-libs/dbus-glib-0.100
-	>=dev-libs/glib-2.30
-	>=dev-libs/libatasmart-0.19
-	>=sys-auth/polkit-0.110
-	>=sys-apps/dbus-1.6
-	>=sys-apps/sg3_utils-1.27.20090411
-	>=sys-block/parted-3
-	>=sys-fs/lvm2-2.02.66
-	>=virtual/udev-208[gudev]
-	selinux? ( sec-policy/selinux-devicekit )"
-# util-linux -> mount, umount, swapon, swapoff (see also #403073)
-RDEPEND="${COMMON_DEPEND}
-	>=sys-apps/util-linux-2.20.1-r2
-	virtual/eject
-	remote-access? ( net-dns/avahi )"
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	dev-util/intltool
-	virtual/pkgconfig"
-
-pkg_setup() {
-	# Listing only major arch's here to avoid tracking kernel's defconfig
-	if use amd64 || use arm || use ppc || use ppc64 || use x86; then
-		CONFIG_CHECK="~!IDE" #319829
-		CONFIG_CHECK+=" ~NLS_UTF8" #425562
-		kernel_is lt 3 10 && CONFIG_CHECK+=" ~USB_SUSPEND" #331065, #477278
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-1.0.2-ntfs-3g.patch \
-		"${FILESDIR}"/${P}-kernel-2.6.36-compat.patch \
-		"${FILESDIR}"/${P}-drop-pci-db.patch \
-		"${FILESDIR}"/${P}-revert-floppy.patch
-
-	sed -i -e "s:/lib/udev:$(udev_get_udevdir):" data/80-udisks.rules || die
-}
-
-src_configure() {
-	# device-mapper -> lvm2 -> mandatory depend -> force enabled
-	econf \
-		--localstatedir="${EPREFIX}"/var \
-		--disable-static \
-		$(use_enable debug verbose-mode) \
-		--enable-man-pages \
-		--disable-gtk-doc \
-		--enable-lvm2 \
-		--enable-dmmp \
-		$(use_enable remote-access) \
-		$(use_enable nls) \
-		--with-html-dir="${EPREFIX}"/deprecated
-}
-
-src_test() {
-	ewarn "Skipping testsuite because sys-fs/udisks:0 is deprecated"
-	ewarn "in favour of sys-fs/udisks:2."
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		slashsbindir=/usr/sbin \
-		slashlibdir=/usr/lib \
-		udevhelperdir="$(udev_get_udevdir)" \
-		udevrulesdir="$(udev_get_udevdir)"/rules.d \
-		install #398081
-
-	dodoc AUTHORS HACKING NEWS README
-
-	rm -f "${ED}"/etc/profile.d/udisks-bash-completion.sh
-	newbashcomp tools/udisks-bash-completion.sh ${PN}
-
-	prune_libtool_files --all
-
-	keepdir /media
-	keepdir /var/lib/udisks #383091
-
-	rm -rf "${ED}"/deprecated
-}
diff --git a/sys-fs/udisks/udisks-2.1.0.ebuild b/sys-fs/udisks/udisks-2.1.0.ebuild
deleted file mode 100644
index 78fe6dbcb5bc..000000000000
--- a/sys-fs/udisks/udisks-2.1.0.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udisks/udisks-2.1.0.ebuild,v 1.16 2014/02/02 16:35:32 ssuominen Exp $
-
-EAPI=5
-inherit bash-completion-r1 eutils linux-info systemd udev
-
-DESCRIPTION="Daemon providing interfaces to work with storage devices"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/udisks"
-SRC_URI="http://udisks.freedesktop.org/releases/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sh sparc x86"
-IUSE="debug cryptsetup +gptfdisk +introspection selinux systemd"
-
-UDEV_VERSION="208"
-COMMON_DEPEND=">=dev-libs/glib-2.32
-	>=dev-libs/libatasmart-0.19
-	>=sys-auth/polkit-0.110
-	virtual/acl
-	>=virtual/udev-${UDEV_VERSION}[gudev]
-	introspection? ( >=dev-libs/gobject-introspection-1.30 )
-	selinux? ( sec-policy/selinux-devicekit )
-	systemd? ( >=sys-apps/systemd-${UDEV_VERSION} )"
-# gptfdisk -> src/udiskslinuxpartition.c -> sgdisk (see also #412801#c1)
-# util-linux -> mount, umount, swapon, swapoff (see also #403073)
-RDEPEND="${COMMON_DEPEND}
-	>=sys-apps/util-linux-2.20.1-r2
-	>=sys-block/parted-3
-	virtual/eject
-	cryptsetup? (
-		sys-fs/cryptsetup[udev(+)]
-		sys-fs/lvm2[udev(+)]
-		)
-	gptfdisk? ( >=sys-apps/gptfdisk-0.8 )"
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	>=dev-util/gdbus-codegen-2.32
-	dev-util/intltool
-	>=sys-kernel/linux-headers-3.1
-	virtual/pkgconfig"
-
-QA_MULTILIB_PATHS="usr/lib/udisks2/udisksd"
-
-DOCS="AUTHORS HACKING NEWS README"
-
-pkg_setup() {
-	# Listing only major arch's here to avoid tracking kernel's defconfig
-	if use amd64 || use arm || use ppc || use ppc64 || use x86; then
-		CONFIG_CHECK="~!IDE" #319829
-		CONFIG_CHECK+=" ~TMPFS_POSIX_ACL" #412377
-		CONFIG_CHECK+=" ~SWAP" # http://forums.gentoo.org/viewtopic-t-923640.html
-		CONFIG_CHECK+=" ~NLS_UTF8" #425562
-		kernel_is lt 3 10 && CONFIG_CHECK+=" ~USB_SUSPEND" #331065, #477278
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-ieee1394.patch \
-		"${FILESDIR}"/${P}-W_define.patch
-	use systemd || { sed -i -e 's:libsystemd-login:&disable:' configure || die; }
-}
-
-src_configure() {
-	econf \
-		--localstatedir="${EPREFIX}"/var \
-		--disable-static \
-		$(use_enable debug) \
-		--disable-gtk-doc \
-		$(use_enable introspection) \
-		--with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		--with-udevdir="$(get_udevdir)" \
-		"$(systemd_with_unitdir)"
-}
-
-src_install() {
-	default
-	prune_libtool_files
-	keepdir /var/lib/udisks2 #383091
-
-	rm -rf "${ED}"/usr/share/bash-completion
-	dobashcomp data/completions/udisksctl
-
-	local htmldir=udisks2
-	if [[ -d ${ED}/usr/share/doc/${PF}/html/${htmldir} ]]; then
-		dosym /usr/share/doc/${PF}/html/${htmldir} /usr/share/gtk-doc/html/${htmldir}
-	fi
-}
-
-pkg_postinst() {
-	mkdir -p "${EROOT}"/run #415987
-
-	# See pkg_postinst() of >=sys-apps/baselayout-2.1-r1. Keep in sync?
-	if ! grep -qs "^tmpfs.*/run " "${EROOT}"/proc/mounts ; then
-		echo
-		ewarn "You should reboot the system now to get /run mounted with tmpfs!"
-	fi
-}
diff --git a/sys-fs/udisks/udisks-2.1.1.ebuild b/sys-fs/udisks/udisks-2.1.1.ebuild
deleted file mode 100644
index 65a0030c557f..000000000000
--- a/sys-fs/udisks/udisks-2.1.1.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udisks/udisks-2.1.1.ebuild,v 1.2 2014/02/02 16:35:32 ssuominen Exp $
-
-EAPI=5
-inherit bash-completion-r1 eutils linux-info systemd udev
-
-DESCRIPTION="Daemon providing interfaces to work with storage devices"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/udisks"
-SRC_URI="http://udisks.freedesktop.org/releases/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
-IUSE="debug cryptsetup +gptfdisk +introspection selinux systemd"
-
-UDEV_VERSION="208"
-COMMON_DEPEND=">=dev-libs/glib-2.32
-	>=dev-libs/libatasmart-0.19
-	>=sys-auth/polkit-0.110
-	virtual/acl
-	>=virtual/udev-${UDEV_VERSION}[gudev]
-	introspection? ( >=dev-libs/gobject-introspection-1.30 )
-	selinux? ( sec-policy/selinux-devicekit )
-	systemd? ( >=sys-apps/systemd-${UDEV_VERSION} )"
-# gptfdisk -> src/udiskslinuxpartition.c -> sgdisk (see also #412801#c1)
-# util-linux -> mount, umount, swapon, swapoff (see also #403073)
-RDEPEND="${COMMON_DEPEND}
-	>=sys-apps/util-linux-2.20.1-r2
-	>=sys-block/parted-3
-	virtual/eject
-	cryptsetup? (
-		sys-fs/cryptsetup[udev(+)]
-		sys-fs/lvm2[udev(+)]
-		)
-	gptfdisk? ( >=sys-apps/gptfdisk-0.8 )"
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	>=dev-util/gdbus-codegen-2.32
-	dev-util/intltool
-	>=sys-kernel/linux-headers-3.1
-	virtual/pkgconfig"
-
-QA_MULTILIB_PATHS="usr/lib/udisks2/udisksd"
-
-DOCS="AUTHORS HACKING NEWS README"
-
-pkg_setup() {
-	# Listing only major arch's here to avoid tracking kernel's defconfig
-	if use amd64 || use arm || use ppc || use ppc64 || use x86; then
-		CONFIG_CHECK="~!IDE" #319829
-		CONFIG_CHECK+=" ~TMPFS_POSIX_ACL" #412377
-		CONFIG_CHECK+=" ~SWAP" # http://forums.gentoo.org/viewtopic-t-923640.html
-		CONFIG_CHECK+=" ~NLS_UTF8" #425562
-		kernel_is lt 3 10 && CONFIG_CHECK+=" ~USB_SUSPEND" #331065, #477278
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.1.0-W_define.patch
-	use systemd || { sed -i -e 's:libsystemd-login:&disable:' configure || die; }
-}
-
-src_configure() {
-	econf \
-		--localstatedir="${EPREFIX}"/var \
-		--disable-static \
-		$(use_enable debug) \
-		--disable-gtk-doc \
-		$(use_enable introspection) \
-		--with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		--with-udevdir="$(get_udevdir)" \
-		"$(systemd_with_unitdir)"
-}
-
-src_install() {
-	default
-	prune_libtool_files
-	keepdir /var/lib/udisks2 #383091
-
-	rm -rf "${ED}"/usr/share/bash-completion
-	dobashcomp data/completions/udisksctl
-
-	local htmldir=udisks2
-	if [[ -d ${ED}/usr/share/doc/${PF}/html/${htmldir} ]]; then
-		dosym /usr/share/doc/${PF}/html/${htmldir} /usr/share/gtk-doc/html/${htmldir}
-	fi
-}
-
-pkg_postinst() {
-	mkdir -p "${EROOT}"/run #415987
-
-	# See pkg_postinst() of >=sys-apps/baselayout-2.1-r1. Keep in sync?
-	if ! grep -qs "^tmpfs.*/run " "${EROOT}"/proc/mounts ; then
-		echo
-		ewarn "You should reboot the system now to get /run mounted with tmpfs!"
-	fi
-}
diff --git a/sys-fs/udisks/udisks-2.1.2.ebuild b/sys-fs/udisks/udisks-2.1.2.ebuild
deleted file mode 100644
index ef1c74719c1b..000000000000
--- a/sys-fs/udisks/udisks-2.1.2.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udisks/udisks-2.1.2.ebuild,v 1.5 2014/02/23 08:48:50 ago Exp $
-
-EAPI=5
-inherit bash-completion-r1 eutils linux-info systemd udev
-
-DESCRIPTION="Daemon providing interfaces to work with storage devices"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/udisks"
-SRC_URI="http://udisks.freedesktop.org/releases/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="~alpha amd64 arm ~ia64 ~mips ppc ~ppc64 ~sh ~sparc x86"
-IUSE="debug cryptsetup +gptfdisk +introspection selinux systemd"
-
-UDEV_VERSION="208"
-COMMON_DEPEND=">=dev-libs/glib-2.32
-	>=dev-libs/libatasmart-0.19
-	>=sys-auth/polkit-0.110
-	virtual/acl
-	>=virtual/udev-${UDEV_VERSION}[gudev]
-	introspection? ( >=dev-libs/gobject-introspection-1.30 )
-	selinux? ( sec-policy/selinux-devicekit )
-	systemd? ( >=sys-apps/systemd-${UDEV_VERSION} )"
-# gptfdisk -> src/udiskslinuxpartition.c -> sgdisk (see also #412801#c1)
-# util-linux -> mount, umount, swapon, swapoff (see also #403073)
-RDEPEND="${COMMON_DEPEND}
-	>=sys-apps/util-linux-2.20.1-r2
-	>=sys-block/parted-3
-	virtual/eject
-	cryptsetup? (
-		sys-fs/cryptsetup[udev(+)]
-		sys-fs/lvm2[udev(+)]
-		)
-	gptfdisk? ( >=sys-apps/gptfdisk-0.8 )"
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	>=dev-util/gdbus-codegen-2.32
-	dev-util/intltool
-	>=sys-kernel/linux-headers-3.1
-	virtual/pkgconfig"
-
-QA_MULTILIB_PATHS="usr/lib/udisks2/udisksd"
-
-DOCS="AUTHORS HACKING NEWS README"
-
-pkg_setup() {
-	# Listing only major arch's here to avoid tracking kernel's defconfig
-	if use amd64 || use arm || use ppc || use ppc64 || use x86; then
-		CONFIG_CHECK="~!IDE" #319829
-		CONFIG_CHECK+=" ~TMPFS_POSIX_ACL" #412377
-		CONFIG_CHECK+=" ~SWAP" # http://forums.gentoo.org/viewtopic-t-923640.html
-		CONFIG_CHECK+=" ~NLS_UTF8" #425562
-		kernel_is lt 3 10 && CONFIG_CHECK+=" ~USB_SUSPEND" #331065, #477278
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.1.0-W_define.patch
-	use systemd || { sed -i -e 's:libsystemd-login:&disable:' configure || die; }
-}
-
-src_configure() {
-	econf \
-		--localstatedir="${EPREFIX}"/var \
-		--disable-static \
-		$(use_enable debug) \
-		--disable-gtk-doc \
-		$(use_enable introspection) \
-		--with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		--with-udevdir="$(get_udevdir)" \
-		"$(systemd_with_unitdir)"
-}
-
-src_install() {
-	default
-	prune_libtool_files
-	keepdir /var/lib/udisks2 #383091
-
-	rm -rf "${ED}"/usr/share/bash-completion
-	dobashcomp data/completions/udisksctl
-
-	local htmldir=udisks2
-	if [[ -d ${ED}/usr/share/doc/${PF}/html/${htmldir} ]]; then
-		dosym /usr/share/doc/${PF}/html/${htmldir} /usr/share/gtk-doc/html/${htmldir}
-	fi
-}
-
-pkg_postinst() {
-	mkdir -p "${EROOT}"/run #415987
-
-	# See pkg_postinst() of >=sys-apps/baselayout-2.1-r1. Keep in sync?
-	if ! grep -qs "^tmpfs.*/run " "${EROOT}"/proc/mounts ; then
-		echo
-		ewarn "You should reboot the system now to get /run mounted with tmpfs!"
-	fi
-}
diff --git a/sys-kernel/git-sources/Manifest b/sys-kernel/git-sources/Manifest
index 26d6b4730911..f0e5edf744b0 100644
--- a/sys-kernel/git-sources/Manifest
+++ b/sys-kernel/git-sources/Manifest
@@ -6,3 +6,4 @@ DIST patch-3.14-rc4.xz 5956656 SHA256 ab616ac7d0b944746e33b396e48bdea290442dfd6b
 DIST patch-3.14-rc5.xz 5986800 SHA256 355cbe9e7130a4421b835ee6de1d031f4f71bfb010547f3233dcdefb29872f86 SHA512 1e536fa0c2ea620cef7700a31a6e63ccb9f3f7f654438e7fe203b406ab6cdfcbadc63416f034ed046d5874dfc19be0f66b25c9d0bcb31d75886c4d41439854c7 WHIRLPOOL b3432d2edad966a587185a722e7a4af2b4aed1477dc31088871906d96345c3135500d69acfbc7691c3a519c14ea0521f16b1eb115c7871f09dfab24fd4426cca
 DIST patch-3.14-rc6.xz 6034740 SHA256 a472b524b8da73340dd8b185cc3d488f7cbd20a8029493caf8ddb11fdb670198 SHA512 2d62dc934865d46d7cb475b6f8a8c8f429d2e52fe593a85a301c8cbf3c2260a427d458ee264c8652e91f804453408ed1855a1ad59aee69f2146b1cdfa4121676 WHIRLPOOL 42f6cc512bbb61c8c8bf34c59ed959a97dc19f6e600d2e22cbad107524da6afce36a26b0de310b664f19da2697556c5b741d2bf709649141b06e49a92657eed7
 DIST patch-3.14-rc7.xz 6059308 SHA256 42d173dac00fa4f2375cf50a9a921779a02c607725e3e10487c5ff776e809ee0 SHA512 bb6023df4c1548e53331931bb7d7177e67556813d98e91ad803f785b0636852036d711fb8208211e609993e270223bfe490e90f8b1d61742282961fead2a07c8 WHIRLPOOL 2d19d6b3ec83952d36e5b87fa6791e37ae83adf08b75c91c8297edd385658df842a6a71ef9c949e161d9647676afb99a082ff53e7af43ff5b86e3740f27ccded
+DIST patch-3.14-rc8.xz 6079212 SHA256 9f8602209979f39150a6d01a3279f6059b303381dde7d426bab78f056339818d SHA512 bc4019fb8b4c86ae0969c10f8a078cafcdb04a0db18367f5f698cf27838a136b3a7c612d0b1f0607b119f1580ef58ea937dfcb556eea1755b2bd2c6bb7cf2837 WHIRLPOOL 56098576ad8abb1eec926ebc00fd4fa498185df15109f716465832b916561ff25071e57f2e3d41289449524481de95fd58e1c978fe00e9a9c20df5049d6e165c
diff --git a/sys-kernel/git-sources/git-sources-3.14_rc8.ebuild b/sys-kernel/git-sources/git-sources-3.14_rc8.ebuild
new file mode 100644
index 000000000000..24b353bfb3bd
--- /dev/null
+++ b/sys-kernel/git-sources/git-sources-3.14_rc8.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/git-sources/git-sources-3.14_rc8.ebuild,v 1.1 2014/03/25 16:53:24 mpagano Exp $
+
+EAPI="5"
+UNIPATCH_STRICTORDER="yes"
+K_NOUSENAME="yes"
+K_NOSETEXTRAVERSION="yes"
+K_NOUSEPR="yes"
+K_SECURITY_UNSUPPORTED="yes"
+K_DEBLOB_AVAILABLE=0
+ETYPE="sources"
+CKV="${PVR/-r/-git}"
+
+# only use this if it's not an _rc/_pre release
+[ "${PV/_pre}" == "${PV}" ] && [ "${PV/_rc}" == "${PV}" ] && OKV="${PV}"
+inherit kernel-2
+detect_version
+
+DESCRIPTION="The very latest -git version of the Linux kernel"
+HOMEPAGE="http://www.kernel.org"
+SRC_URI="${KERNEL_URI}"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+IUSE=""
+
+K_EXTRAEINFO="This kernel is not supported by Gentoo due to its unstable and
+experimental nature. If you have any issues, try a matching vanilla-sources
+ebuild -- if the problem is not there, please contact the upstream kernel
+developers at http://bugzilla.kernel.org and on the linux-kernel mailing list to
+report the problem so it can be fixed in time for the next kernel release."
+
+pkg_postinst() {
+	postinst_sources
+}
diff --git a/sys-libs/timezone-data/Manifest b/sys-libs/timezone-data/Manifest
index ac3856c553d2..c2a7a0dd18b8 100644
--- a/sys-libs/timezone-data/Manifest
+++ b/sys-libs/timezone-data/Manifest
@@ -9,6 +9,7 @@ DIST tzcode2013g.tar.gz 171550 SHA256 c7c358b459bb65cfab7b7bdd6a9689233fc393f1f9
 DIST tzcode2013h.tar.gz 172896 SHA256 e14addfc4e0da3cf17ccc1c08cb8094a2a0d3ae9524f565b74e6373c9b83ca0e SHA512 c8570396b5f78f886bd8658206fbb863428dfe1dcbd51262d124f1a1bd650e57bf4c558ee083a8cd2445e23942b2982121a58e3c2491d677a2835ea5b9a2e8f1 WHIRLPOOL 5e34acf43d9e2318ccc302a001b9f9ee7bdee4cf3e260e7cb83c21484a73999d89eff62d97ca43870aa91d6c2d8017de6c7a285a5f8cb604f61adcbc6236d62b
 DIST tzcode2013i.tar.gz 173169 SHA256 63bba6790afc1cb2ea0af2b998a35fc237e247608140dbe4e08b4216a8c31358 SHA512 863d181339d8b44ae9876a02e436da33b723f81e592a0e0f51f1300a2dac277bc18ed422b8631e27032769620323c94c848f3abc926d8bc28074d3d4b4bb8a28 WHIRLPOOL 9de16a388ac7a1e7965b1aaed4461657a2f822a08fe6c8c5f025bdad6512b53ef0ea6960ef03bc372df3541f9c8588797cd1e2b2dcecb10afb9041965b3684a1
 DIST tzcode2014a.tar.gz 174391 SHA256 05b93ba541b167a4c10f2e81a7baf972c24ff12db27d85f6c2dd328443c4d3f5 SHA512 bd48ce8b0bea23e7ab766acee7caf72bcd515ad3e039ab7d0356cde3d295d06a94497e4400b272bafcbca6fe9bef7c4f79fc58b7e2522e4aaa6dc43158f80745 WHIRLPOOL 32d6f2cb692b888fd2fd2dba3d3bbbe989fc387cb30778230e4b6c63aad8eaf274648f8fb14574a60620d4ae13cf66b462f480c97bd37f9edf70b838a112b44e
+DIST tzcode2014b.tar.gz 175361 SHA256 b5dad3b0c7880e3fc030f87354b93776d9c0e761a56f363d917ab02e1754a78b SHA512 0c72ae51240f3d5d56cafed76977e00ff6a8f228a07f17a0fcda2d1a86b25351114aaf79e8ca8d70a234bc0f089d699fe05280a2285c4ea39e067fe5dcb205c5 WHIRLPOOL 233c7d19e58774c1f2875968a89e898f4d40c59fa5985ad3966b6844c0da16ce68bc82dca89bfa499b9ea8467bf043c3ff82559501af73331f0d35ebdc598d81
 DIST tzdata2011n.tar.gz 204684 SHA256 a343e542486b2b8ebdeca474eed79f1c04f69420ca943c2b9bdea1d2385e38cd SHA512 2081fa44f00ace6539ecc1296f454fb96bb4afa61114ffbc58f46f82ef8ba2cfa22d7e48456a293502433dccca6d921db8f70d6c6e18a074996cfeb74534d2df WHIRLPOOL e7004894829c63baef91fd5fbc14b77a7fbd92ae2a6e001f279c8b1169bd5be009ae07af336ddaca148eadeba3383896b247a19c9e72d894e80ad60fc896f3f3
 DIST tzdata2012j.tar.gz 214075 SHA256 4b6a3c2831bdbb68ab1a1bf906bcf11d18ab78009713a0339da6fe96b6afceaa SHA512 98515b92268a2ee49386f6955211c14b9fe47460ba1c3ec5d60681b1a934688c3de4452f8f757ca3a6924e15784585967c768e7c86be730378d0332c249584fe WHIRLPOOL 17af29d05587bea2b05762751d146101a8bcc647346aa22a33e06a095805ecf4feab62693b3216ba5d75cf87f8a63d8cbcee9167be4b6dfe7936e1828bbc4b8a
 DIST tzdata2013a.tar.gz 217511 SHA256 ed9f273f52d5df9ec09fdcf6684176bbdc86d0fbafcbc27b97e5a9c103024afc SHA512 c5b07246218f5c3c751b7ddc5c4ee127432fc19187019321beeff589596ae91c4d64400a63b6e335cf6a30643a8d9c8b9bd37d31c553424718626d7591aab995 WHIRLPOOL d1bb9d9e0d9e4d3df6f866dcd1b6d35cb07da0f2066e7d92140605f917f52e20f3acfabf65ff9e31f8885a088430cbef141b787088c37bcd8e7bca42d9f3007a
@@ -20,3 +21,4 @@ DIST tzdata2013g.tar.gz 226943 SHA256 b6cdd3998dcc732a6ae5e101e1394f9d4d6dff68bd
 DIST tzdata2013h.tar.gz 227411 SHA256 6b9e17e823eec0e09e12f74b452a70be4face1ef14c2fb1917b7c7e60564de27 SHA512 4f584e4a71726182e9cc2f13baea2f02b15f4c5603595f6493318a3920903074ad0b073b4c6f888baa33f648422a02600a6fd8d3345120f45da0f5d5453fb8d8 WHIRLPOOL 21f9d9e1e651861eeb29c372267888c6fbd5bcb501bcb0704ed309001b81ca413397d780cd194b93b2b29ff94190325f04bb834e3be5e4b7a5f013968062358d
 DIST tzdata2013i.tar.gz 218866 SHA256 1cd56a6ee964143ef0c65229968a5093988335b95e9115235b5e7b7e45e67dda SHA512 679645837b940c0d4c63cb070e26c042461a520caa5fbe1ed12897a6bfb5c440352d54a9e1ffb8b7098a10dd9e2f33cf4c6f9cb0b6fc84c0dfc3898501ce4082 WHIRLPOOL f5c559b8bd3869e2f90792079329582d26d3e95f744543c40b5c3aa6429390a39e04697d68151730019e60cfa3c6fe6b4f8d3d3e79b6b4bed28dc4e81cffa9ce
 DIST tzdata2014a.tar.gz 219826 SHA256 7cff254ce85e11b21c994b284bccd1e12ecda9dadf947fbb32e1912fd520e8b1 SHA512 91493a5ea85be2db6334c71d742e490e109896de28b08f6a76fa6cd30c03edb8b45c2ed4cab254464f1e559aaf22b1533f6b3582718f56142114178846cd5a96 WHIRLPOOL 0318f5ad11a0985bfcb26b63f03624b9a035059327728c90c368a00db6976bf063a22c5e9d48d5209feb12c28362820002d849109b1bb5ad4315403add22b1db
+DIST tzdata2014b.tar.gz 220771 SHA256 d1e1f3e0c253a8ac0b35ffe27ef95f6366c37beb953391806cd922efce2b1cb5 SHA512 8f4884c2576ab91de062ed6277818b220ee43facbe5721f51d33a99fde5b3e299936e94d579662dd813076199efa348d8f26fff1c06b92055b0efba98c0ed226 WHIRLPOOL 8817ce37ae69cde263f72ec09e5df250a4b94848a3a24a482492958c5b33e67d74c9c63bd688850d0139c288e792f6b11c1c3fa527a061f29ad87d6ed7434a92
diff --git a/sys-libs/timezone-data/timezone-data-2014b.ebuild b/sys-libs/timezone-data/timezone-data-2014b.ebuild
new file mode 100644
index 000000000000..cc11e29e9fc3
--- /dev/null
+++ b/sys-libs/timezone-data/timezone-data-2014b.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/timezone-data-2014b.ebuild,v 1.1 2014/03/25 14:51:11 vapier Exp $
+
+EAPI="3"
+
+inherit eutils toolchain-funcs flag-o-matic
+
+code_ver=${PV}
+data_ver=${PV}
+DESCRIPTION="Timezone data (/usr/share/zoneinfo) and utilities (tzselect/zic/zdump)"
+HOMEPAGE="http://www.iana.org/time-zones http://www.twinsun.com/tz/tz-link.htm"
+SRC_URI="http://www.iana.org/time-zones/repository/releases/tzdata${data_ver}.tar.gz
+	http://www.iana.org/time-zones/repository/releases/tzcode${code_ver}.tar.gz
+	ftp://munnari.oz.au/pub/oldtz/tzdata${data_ver}.tar.gz
+	ftp://munnari.oz.au/pub/oldtz/tzcode${data_ver}.tar.gz"
+
+LICENSE="BSD public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="nls elibc_FreeBSD elibc_glibc"
+
+RDEPEND="!<sys-libs/glibc-2.3.5"
+
+S=${WORKDIR}
+
+pkg_setup() {
+	# Deal with the case where older timezone-data installed a
+	# dir here, but newer one installs symlinks.  Portage will
+	# barf when you try to transition file types.
+	if cd "${EROOT}"/usr/share/zoneinfo 2>/dev/null ; then
+		if [[ -d posix ]] ; then
+			rm -rf .gentoo-upgrade #487192
+			mv posix .gentoo-upgrade || die
+			ln -s .gentoo-upgrade posix || die
+		fi
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2013h-makefile.patch
+	tc-is-cross-compiler && cp -pR "${S}" "${S}"-native
+}
+
+src_compile() {
+	local LDLIBS
+	tc-export CC
+	if use elibc_FreeBSD || use elibc_Darwin ; then
+		append-cppflags -DSTD_INSPIRED #138251
+	fi
+	export NLS=$(usex nls 1 0)
+	if use nls && ! use elibc_glibc ; then
+		LDLIBS+=" -lintl" #154181
+	fi
+	# TOPDIR is used in some utils when compiling.
+	emake \
+		TOPDIR="${EPREFIX}/usr" \
+		CFLAGS="${CPPFLAGS} ${CFLAGS} -std=gnu99" \
+		LDFLAGS="${LDFLAGS}" \
+		LDLIBS="${LDLIBS}" \
+		|| die
+	if tc-is-cross-compiler ; then
+		emake -C "${S}"-native \
+			CC=$(tc-getBUILD_CC) \
+			CFLAGS="${BUILD_CFLAGS}" \
+			LDFLAGS="${BUILD_LDFLAGS}" \
+			LDLIBS="${LDLIBS}" \
+			zic || die
+	fi
+}
+
+src_install() {
+	local zic=""
+	tc-is-cross-compiler && zic="zic=${S}-native/zic"
+	emake install ${zic} DESTDIR="${ED}" || die
+	dodoc README Theory
+	dohtml *.htm
+}
+
+pkg_config() {
+	# make sure the /etc/localtime file does not get stale #127899
+	local tz src etc_lt="${EROOT}etc/localtime"
+
+	if has_version '<sys-apps/baselayout-2' ; then
+		src="${EROOT}etc/conf.d/clock"
+		tz=$(unset TIMEZONE ; source "${src}" ; echo ${TIMEZONE-FOOKABLOIE})
+	else
+		src="${EROOT}etc/timezone"
+		if [[ -e ${src} ]] ; then
+			tz=$(sed -e 's:#.*::' -e 's:[[:space:]]*::g' -e '/^$/d' "${src}")
+		else
+			tz="FOOKABLOIE"
+		fi
+	fi
+	[[ -z ${tz} ]] && return 0
+
+	if [[ ${tz} == "FOOKABLOIE" ]] ; then
+		elog "You do not have TIMEZONE set in ${src}."
+
+		if [[ ! -e ${etc_lt} ]] ; then
+			# if /etc/localtime is a symlink somewhere, assume they
+			# know what they're doing and they're managing it themselves
+			if [[ ! -L ${etc_lt} ]] ; then
+				cp -f "${EROOT}"/usr/share/zoneinfo/Factory "${etc_lt}"
+				elog "Setting ${etc_lt} to Factory."
+			else
+				elog "Assuming your ${etc_lt} symlink is what you want; skipping update."
+			fi
+		else
+			elog "Skipping auto-update of ${etc_lt}."
+		fi
+		return 0
+	fi
+
+	if [[ ! -e ${EROOT}/usr/share/zoneinfo/${tz} ]] ; then
+		elog "You have an invalid TIMEZONE setting in ${src}"
+		elog "Your ${etc_lt} has been reset to Factory; enjoy!"
+		tz="Factory"
+	fi
+	einfo "Updating ${etc_lt} with ${EROOT}usr/share/zoneinfo/${tz}"
+	[[ -L ${etc_lt} ]] && rm -f "${etc_lt}"
+	cp -f "${EROOT}"/usr/share/zoneinfo/"${tz}" "${etc_lt}"
+}
+
+pkg_postinst() {
+	rm -rf "${EROOT}"/usr/share/zoneinfo/.gentoo-upgrade &
+	pkg_config
+	wait
+}
diff --git a/virtual/libffi/libffi-3.0.13-r1.ebuild b/virtual/libffi/libffi-3.0.13-r1.ebuild
index cfa9bfe7e0a6..87cfd17edd6a 100644
--- a/virtual/libffi/libffi-3.0.13-r1.ebuild
+++ b/virtual/libffi/libffi-3.0.13-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/virtual/libffi/libffi-3.0.13-r1.ebuild,v 1.3 2014/01/18 02:49:06 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/libffi/libffi-3.0.13-r1.ebuild,v 1.4 2014/03/25 20:06:24 vapier Exp $
 
 # The purpose of this ebuild is to provide quick fallback if and when we need to
 # switch back to internal copy of libffi from sys-devel/gcc.
@@ -15,7 +15,7 @@ SRC_URI=""
 
 LICENSE=""
 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 ~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 ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=dev-libs/libffi-3.0.13-r1[${MULTILIB_USEDEP}]"
diff --git a/virtual/perl-version/perl-version-0.990.800.ebuild b/virtual/perl-version/perl-version-0.990.800.ebuild
new file mode 100644
index 000000000000..178e49441b08
--- /dev/null
+++ b/virtual/perl-version/perl-version-0.990.800.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-version/perl-version-0.990.800.ebuild,v 1.1 2014/03/25 18:13:43 zlogene Exp $
+
+DESCRIPTION="Virtual for ${PN#perl-}"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+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"
+IUSE=""
+
+RDEPEND="~perl-core/${PN#perl-}-${PV}"
diff --git a/x11-drivers/xf86-input-synaptics/Manifest b/x11-drivers/xf86-input-synaptics/Manifest
index c5f194df3f04..df8f57be7744 100644
--- a/x11-drivers/xf86-input-synaptics/Manifest
+++ b/x11-drivers/xf86-input-synaptics/Manifest
@@ -5,3 +5,4 @@ DIST xf86-input-synaptics-1.6.4.tar.bz2 447004 SHA256 fe15b1afc61b40800f74a0dcf9
 DIST xf86-input-synaptics-1.7.1.tar.bz2 441407 SHA256 db5825660e1fb23190697f609bf75d4450fe707344a14298e1c9b47039bbb58e SHA512 0c281013cd587d72de72a7c562be38259d6a2d4f5bfd997ec276989ad96feb89f499124191a88fe9163931de67b1a188c95ecb825058ccd5edfba318bf040a61 WHIRLPOOL ac4125616840f954abd6dbf281f17a63503e4a5676950590970563d15e4f37d3d2afc36c7f68783ffe40029eee270d91efb8744eaa92210611994a4666b73a5e
 DIST xf86-input-synaptics-1.7.2.tar.bz2 448170 SHA256 63957fa55f0d8662ef8c57f6325155c9884a854554d33921f0738e097f2a7dcd SHA512 1eae9e28fdd6448e5aa1521d1cb37289cbfdc767c14e9a7e4cfd27250599e8b7ff6af78427e9e121b3e047a2ec5ac6df8b45a3ca4b2318ebca5211af09618b86 WHIRLPOOL 56927bb512a398ed523dd855ad53c7c045ed6530da828f7f85bcb278aa93a4da2ec44fb3cfb5f5de32fd9b745f2ecd2eb2b926647a3d81e6d1cfa5ffcde7c169
 DIST xf86-input-synaptics-1.7.3.tar.bz2 448253 SHA256 8b2a972043961195d056b84346317ec42bfa029095c9ee7aaf6deceba12e32d5 SHA512 e41134d7a9468d6ea1ed9a893c481df39c8de3070cfcd5562c07720bfe78b7f5a5c3ad5dfce6fe560fdea83c63e0f04741d2fb1caebdb959959a5caf0275036d WHIRLPOOL b32c9896187dd8549ba1494138a32a5917051cbaecd523e5c25b4afde11c4a77dc016b4383ea66d9329e16c47821e72147287e122cc4ba48e0941ccc08f4fa80
+DIST xf86-input-synaptics-1.7.4.tar.bz2 451614 SHA256 56a2d2df7bd39e29f56102c62f153e023f3e9b2f5e255309d33fab8e81945af7 SHA512 66db2e51be11e582ba3ea761d5ab65d05278230ddbe7741d7ae58cd844136feb9fc934e1ddc4845bb9961fa5a63743c3e612893d9196b1745140e4105b69220a WHIRLPOOL 914b8fa1db25c0c550368ccdd0e8856b5aefe091e1f29744c6bd350f5156018a6124c75f45517161a91773e54a045d09099c4d9cffa5800fd6e06b025f2822ce
diff --git a/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.7.4.ebuild b/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.7.4.ebuild
new file mode 100644
index 000000000000..d103e37c8186
--- /dev/null
+++ b/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.7.4.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/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.7.4.ebuild,v 1.1 2014/03/25 14:40:07 chithanh Exp $
+
+EAPI=5
+
+inherit linux-info xorg-2
+
+DESCRIPTION="Driver for Synaptics touchpads"
+HOMEPAGE="http://cgit.freedesktop.org/xorg/driver/xf86-input-synaptics/"
+
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="sys-libs/mtdev
+	>=x11-base/xorg-server-1.12
+	>=x11-libs/libXi-1.2
+	>=x11-libs/libXtst-1.1.0"
+DEPEND="${RDEPEND}
+	>=sys-kernel/linux-headers-2.6.37
+	>=x11-proto/inputproto-2.1.99.3
+	>=x11-proto/recordproto-1.14"
+
+DOCS=( "README" )
+
+pkg_pretend() {
+	linux-info_pkg_setup
+	# Just a friendly warning
+	if ! linux_config_exists \
+			|| ! linux_chkconfig_present INPUT_EVDEV; then
+		echo
+		ewarn "This driver requires event interface support in your kernel"
+		ewarn "  Device Drivers --->"
+		ewarn "    Input device support --->"
+		ewarn "      <*>     Event interface"
+		echo
+	fi
+}
diff --git a/x11-drivers/xf86-video-vmware/files/xf86-video-vmware-13.0.1-xa-compat-2.patch b/x11-drivers/xf86-video-vmware/files/xf86-video-vmware-13.0.1-xa-compat-2.patch
new file mode 100644
index 000000000000..15f603c3c569
--- /dev/null
+++ b/x11-drivers/xf86-video-vmware/files/xf86-video-vmware-13.0.1-xa-compat-2.patch
@@ -0,0 +1,26 @@
+From 93228f3dd3355a25583d22dbb96791678b93be3e Mon Sep 17 00:00:00 2001
+From: Thomas Hellstrom <thellstrom@vmware.com>
+Date: Wed, 11 Dec 2013 14:54:02 +0000
+Subject: vmwgfx: Really allow XA version 2.
+
+When XA starts to correctly advertise version 2, we didn't allow it.
+Fix this.
+
+Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
+Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
+---
+diff --git a/vmwgfx/vmwgfx_driver.c b/vmwgfx/vmwgfx_driver.c
+index 6301c29..4e28097 100644
+--- a/vmwgfx/vmwgfx_driver.c
++++ b/vmwgfx/vmwgfx_driver.c
+@@ -79,7 +79,7 @@ typedef uint8_t uint8;
+ 
+ #define XA_VERSION_MINOR_REQUIRED 0
+ #define XA_VERSION_MAJOR_REQUIRED 1
+-#define XA_VERSION_MAJOR_COMPAT 1
++#define XA_VERSION_MAJOR_COMPAT 2
+ 
+ #define DRM_VERSION_MAJOR_REQUIRED 2
+ #define DRM_VERSION_MINOR_REQUIRED 3
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/x11-drivers/xf86-video-vmware/files/xf86-video-vmware-13.0.1-xatracker-2.patch b/x11-drivers/xf86-video-vmware/files/xf86-video-vmware-13.0.1-xatracker-2.patch
new file mode 100644
index 000000000000..9435f06ddd7b
--- /dev/null
+++ b/x11-drivers/xf86-video-vmware/files/xf86-video-vmware-13.0.1-xatracker-2.patch
@@ -0,0 +1,179 @@
+From 0945bea5fc32eacb7bf42639efbd45dcd43e7ab5 Mon Sep 17 00:00:00 2001
+From: Rob Clark <robdclark@gmail.com>
+Date: Mon, 10 Jun 2013 17:31:31 +0000
+Subject: vmwgfx: update for XA API changes
+
+Signed-off-by: Rob Clark <robdclark@gmail.com>
+Signed-off-by: Jakob Bornecrantz <jakob@vmware.com>
+Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
+Tested-by: Jakob Bornecrantz <jakob@vmware.com>
+---
+diff --git a/configure.ac b/configure.ac
+index 0631bcc..dccfb27 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -118,7 +118,7 @@ if test x$BUILD_VMWGFX = xyes; then
+ 	PKG_CHECK_MODULES([LIBDRM], [libdrm],[],[BUILD_VMWGFX=no])
+ fi
+ if test x$BUILD_VMWGFX = xyes; then
+-	PKG_CHECK_MODULES([XATRACKER], [xatracker >= 0.4.0],[],[BUILD_VMWGFX=no])
++	PKG_CHECK_MODULES([XATRACKER], [xatracker >= 2.0.0],[],[BUILD_VMWGFX=no])
+ fi
+ 
+ DRIVER_NAME=vmware
+diff --git a/vmwgfx/vmwgfx_dri2.c b/vmwgfx/vmwgfx_dri2.c
+index 7de0772..2f007f0 100644
+--- a/vmwgfx/vmwgfx_dri2.c
++++ b/vmwgfx/vmwgfx_dri2.c
+@@ -201,7 +201,8 @@ dri2_do_create_buffer(DrawablePtr pDraw, DRI2Buffer2Ptr buffer, unsigned int for
+     }
+ 
+     private->srf = srf;
+-    if (xa_surface_handle(srf, &buffer->name, &buffer->pitch) != 0)
++    if (xa_surface_handle(srf, xa_handle_type_shared,
++	    &buffer->name, &buffer->pitch) != 0)
+ 	return FALSE;
+ 
+     buffer->cpp = xa_format_depth(xa_surface_format(srf)) / 8;
+@@ -222,7 +223,7 @@ dri2_do_destroy_buffer(DrawablePtr pDraw, DRI2BufferPtr buffer)
+     struct vmwgfx_saa_pixmap *vpix = vmwgfx_saa_pixmap(private->pPixmap);
+ 
+     if (--private->refcount == 0 && srf) {
+-	xa_surface_destroy(srf);
++	xa_surface_unref(srf);
+     }
+ 
+     /*
+diff --git a/vmwgfx/vmwgfx_driver.c b/vmwgfx/vmwgfx_driver.c
+index 7863ba2..3002285 100644
+--- a/vmwgfx/vmwgfx_driver.c
++++ b/vmwgfx/vmwgfx_driver.c
+@@ -617,7 +617,8 @@ vmwgfx_scanout_present(ScreenPtr pScreen, int drm_fd,
+ 	return FALSE;
+     }
+ 
+-    if (xa_surface_handle(vpix->hw, &handle, &dummy) != 0) {
++    if (xa_surface_handle(vpix->hw, xa_handle_type_shared,
++	    &handle, &dummy) != 0) {
+ 	LogMessage(X_ERROR, "Could not get present surface handle.\n");
+ 	return FALSE;
+     }
+diff --git a/vmwgfx/vmwgfx_saa.c b/vmwgfx/vmwgfx_saa.c
+index 63df3a1..ed3c1ee 100644
+--- a/vmwgfx/vmwgfx_saa.c
++++ b/vmwgfx/vmwgfx_saa.c
+@@ -140,7 +140,7 @@ vmwgfx_pixmap_free_storage(struct vmwgfx_saa_pixmap *vpix)
+ 	vpix->malloc = NULL;
+     }
+     if (!(vpix->backing & VMWGFX_PIX_SURFACE) && vpix->hw) {
+-	xa_surface_destroy(vpix->hw);
++	xa_surface_unref(vpix->hw);
+ 	vpix->hw = NULL;
+     }
+     if (!(vpix->backing & VMWGFX_PIX_GMR) && vpix->gmr) {
+@@ -286,7 +286,8 @@ vmwgfx_saa_dma(struct vmwgfx_saa *vsaa,
+     if (vpix->gmr && vsaa->can_optimize_dma) {
+ 	uint32_t handle, dummy;
+ 
+-	if (xa_surface_handle(vpix->hw, &handle, &dummy) != 0)
++	if (xa_surface_handle(vpix->hw, xa_handle_type_shared,
++		 &handle, &dummy) != 0)
+ 	    goto out_err;
+ 	if (vmwgfx_dma(0, 0, reg, vpix->gmr, pixmap->devKind, handle,
+ 		       to_hw) != 0)
+@@ -305,6 +306,8 @@ vmwgfx_saa_dma(struct vmwgfx_saa *vsaa,
+ 			     (int) to_hw,
+ 			     (struct xa_box *) REGION_RECTS(reg),
+ 			     REGION_NUM_RECTS(reg));
++	if (to_hw)
++	    xa_context_flush(vsaa->xa_ctx);
+ 	if (vpix->gmr)
+ 	    vmwgfx_dmabuf_unmap(vpix->gmr);
+ 	if (ret)
+@@ -441,7 +444,7 @@ vmwgfx_hw_kill(struct vmwgfx_saa *vsaa,
+ 				 &spix->dirty_hw))
+ 	return FALSE;
+ 
+-    xa_surface_destroy(vpix->hw);
++    xa_surface_unref(vpix->hw);
+     vpix->hw = NULL;
+ 
+     /*
+@@ -683,7 +686,8 @@ vmwgfx_present_prepare(struct vmwgfx_saa *vsaa,
+ 
+     (void) pScreen;
+     if (src_vpix == dst_vpix || !src_vpix->hw ||
+-	xa_surface_handle(src_vpix->hw, &vsaa->src_handle, &dummy) != 0)
++	xa_surface_handle(src_vpix->hw, xa_handle_type_shared,
++		&vsaa->src_handle, &dummy) != 0)
+ 	return FALSE;
+ 
+     REGION_NULL(pScreen, &vsaa->present_region);
+@@ -784,7 +788,7 @@ vmwgfx_create_hw(struct vmwgfx_saa *vsaa,
+     return TRUE;
+ 
+ out_no_damage:
+-    xa_surface_destroy(hw);
++    xa_surface_unref(hw);
+     return FALSE;
+ }
+ 
+@@ -929,6 +933,7 @@ vmwgfx_copy_prepare(struct saa_driver *driver,
+ 
+ 	if (!vmwgfx_hw_validate(src_pixmap, src_reg)) {
+ 	    xa_copy_done(vsaa->xa_ctx);
++	    xa_context_flush(vsaa->xa_ctx);
+ 	    return FALSE;
+ 	}
+ 
+@@ -1029,6 +1034,7 @@ vmwgfx_copy_done(struct saa_driver *driver)
+ 	return;
+     }
+     xa_copy_done(vsaa->xa_ctx);
++    xa_context_flush(vsaa->xa_ctx);
+ }
+ 
+ static Bool
+@@ -1175,6 +1181,7 @@ vmwgfx_composite_done(struct saa_driver *driver)
+    struct vmwgfx_saa *vsaa = to_vmwgfx_saa(driver);
+ 
+    xa_composite_done(vsaa->xa_ctx);
++   xa_context_flush(vsaa->xa_ctx);
+ }
+ 
+ static void
+@@ -1436,7 +1443,8 @@ vmwgfx_scanout_ref(struct vmwgfx_screen_entry  *entry)
+ 	     */
+ 	    if (!vmwgfx_hw_accel_validate(pixmap, 0, XA_FLAG_SCANOUT, 0, NULL))
+ 		goto out_err;
+-	    if (xa_surface_handle(vpix->hw, &handle, &dummy) != 0)
++	    if (xa_surface_handle(vpix->hw, xa_handle_type_shared,
++			 &handle, &dummy) != 0)
+ 		goto out_err;
+ 	    depth = xa_format_depth(xa_surface_format(vpix->hw));
+ 
+diff --git a/vmwgfx/vmwgfx_tex_video.c b/vmwgfx/vmwgfx_tex_video.c
+index 449266b..2971ed7 100644
+--- a/vmwgfx/vmwgfx_tex_video.c
++++ b/vmwgfx/vmwgfx_tex_video.c
+@@ -199,7 +199,7 @@ stop_video(ScrnInfoPtr pScrn, pointer data, Bool shutdown)
+ 
+        for (i=0; i<3; ++i) {
+ 	   if (priv->yuv[i]) {
+-	       xa_surface_destroy(priv->yuv[i]);
++	       xa_surface_unref(priv->yuv[i]);
+ 	       priv->yuv[i] = NULL;
+ 	   }
+ 	   for (j=0; j<2; ++j) {
+@@ -539,7 +539,8 @@ copy_packed_data(ScrnInfoPtr pScrn,
+ 	       REGION_RESET(pScrn->pScreen, &reg, &box);
+ 	   }
+ 
+-	   if (xa_surface_handle(srf, &handle, &stride) != 0) {
++	   if (xa_surface_handle(srf, xa_handle_type_shared,
++			&handle, &stride) != 0) {
+ 	       ret = BadAlloc;
+ 	       break;
+ 	   }
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/x11-drivers/xf86-video-vmware/xf86-video-vmware-13.0.1-r1.ebuild b/x11-drivers/xf86-video-vmware/xf86-video-vmware-13.0.1-r1.ebuild
new file mode 100644
index 000000000000..d63733b65f17
--- /dev/null
+++ b/x11-drivers/xf86-video-vmware/xf86-video-vmware-13.0.1-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-vmware/xf86-video-vmware-13.0.1-r1.ebuild,v 1.1 2014/03/25 15:26:53 chithanh Exp $
+
+EAPI=5
+
+XORG_DRI=always
+XORG_EAUTORECONF=yes
+inherit xorg-2
+
+DESCRIPTION="VMware SVGA video driver"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="x11-libs/libdrm[libkms,video_cards_vmware]
+	>=media-libs/mesa-10[xa]"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-damageunregister.patch
+	"${FILESDIR}"/${P}-xatracker-2.patch
+	"${FILESDIR}"/${P}-xa-compat-2.patch
+)
diff --git a/x11-plugins/asapm/asapm-3.1-r1.ebuild b/x11-plugins/asapm/asapm-3.1-r1.ebuild
index 68c90ff8c29a..1ce5c869d664 100644
--- a/x11-plugins/asapm/asapm-3.1-r1.ebuild
+++ b/x11-plugins/asapm/asapm-3.1-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/asapm/asapm-3.1-r1.ebuild,v 1.1 2014/03/23 17:32:23 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/asapm/asapm-3.1-r1.ebuild,v 1.3 2014/03/25 14:26:30 jer Exp $
 
 EAPI=5
 
-inherit eutils toolchain-funcs
+inherit autotools eutils toolchain-funcs
 
 DESCRIPTION="APM monitor for AfterStep"
 HOMEPAGE="http://tigr.net/afterstep/applets/"
@@ -21,12 +21,11 @@ RDEPEND="x11-libs/libX11
 DEPEND="${RDEPEND}
 	x11-proto/xproto"
 
-pkg_setup() {
-	tc-export CC
-}
-
 src_prepare() {
-	epatch "${FILESDIR}/${P}-ldflags.patch"
+	epatch "${FILESDIR}"/${P}-{ldflags,include,autoconf}.patch
+	cp autoconf/configure.in . || die
+	AT_M4DIR=autoconf eautoconf
+	tc-export CC
 }
 
 src_install() {
diff --git a/x11-plugins/asapm/files/asapm-3.1-autoconf.patch b/x11-plugins/asapm/files/asapm-3.1-autoconf.patch
new file mode 100644
index 000000000000..0051d49ac8a8
--- /dev/null
+++ b/x11-plugins/asapm/files/asapm-3.1-autoconf.patch
@@ -0,0 +1,21 @@
+--- a/autoconf/configure.in
++++ b/autoconf/configure.in
+@@ -59,7 +59,6 @@
+ AC_CHECK_HEADERS(sys/wait.h sys/time.h)
+ AC_CHECK_HEADERS(sys/statvfs.h sys/vfs.h sys/mount.h ustat.h)
+ AC_CHECK_HEADERS(machine/soundcard.h linux/soundcard.h linux/radio.h)
+-AC_CONFIG_HEADER(config.h)
+ 
+ dnl# Check for X
+ 
+@@ -117,10 +116,6 @@
+ AC_SUBST(with_gnustep_lib)
+ AC_SUBST(with_afterdir)
+ 
+-dnl# Write results
+-
+-AC_CONFIG_HEADER(config.h)
+-
+ dnl# Common parts of the Makefile
+ MAKEFILEDEFINES=./autoconf/Makefile.defines
+ MAKEFILECOMMON=./autoconf/Makefile.common
diff --git a/x11-plugins/asapm/files/asapm-3.1-include.patch b/x11-plugins/asapm/files/asapm-3.1-include.patch
new file mode 100644
index 000000000000..529d994ef122
--- /dev/null
+++ b/x11-plugins/asapm/files/asapm-3.1-include.patch
@@ -0,0 +1,10 @@
+--- a/apm_read.c
++++ b/apm_read.c
+@@ -13,6 +13,7 @@
+  */
+ 
+ #include <stdio.h>
++#include <stdlib.h> /* exit(), free() */
+ #include <errno.h>
+ #include <fcntl.h>
+ #include <unistd.h>
diff --git a/x11-plugins/asapm/files/asapm-3.1-ldflags.patch b/x11-plugins/asapm/files/asapm-3.1-ldflags.patch
index 11466cdbb1bd..a90d7baf2e4e 100644
--- a/x11-plugins/asapm/files/asapm-3.1-ldflags.patch
+++ b/x11-plugins/asapm/files/asapm-3.1-ldflags.patch
@@ -1,5 +1,5 @@
---- autoconf/Makefile.common.in
-+++ autoconf/Makefile.common.in
+--- a/autoconf/Makefile.common.in
++++ b/autoconf/Makefile.common.in
 @@ -34,7 +34,7 @@
  		done