diff --git a/app-admin/emacs-updater/emacs-updater-1.13.ebuild b/app-admin/emacs-updater/emacs-updater-1.13.ebuild
index fb0e4a8a16aa..f4063647fbcf 100644
--- a/app-admin/emacs-updater/emacs-updater-1.13.ebuild
+++ b/app-admin/emacs-updater/emacs-updater-1.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/emacs-updater/emacs-updater-1.13.ebuild,v 1.8 2013/05/16 16:36:10 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/emacs-updater/emacs-updater-1.13.ebuild,v 1.9 2013/05/18 05:32:14 ago Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~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"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~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=""
 
 DEPEND="app-arch/xz-utils"
diff --git a/app-admin/haskell-updater/haskell-updater-1.2.0.9.ebuild b/app-admin/haskell-updater/haskell-updater-1.2.0.9.ebuild
index 9396dd9be39f..654721f31db5 100644
--- a/app-admin/haskell-updater/haskell-updater-1.2.0.9.ebuild
+++ b/app-admin/haskell-updater/haskell-updater-1.2.0.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/haskell-updater/haskell-updater-1.2.0.9.ebuild,v 1.3 2013/05/16 15:38:49 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/haskell-updater/haskell-updater-1.2.0.9.ebuild,v 1.5 2013/05/17 22:53:02 ago Exp $
 
 EAPI=4
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ppc ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" # Add keywords as those archs have a binpkg
+KEYWORDS="~alpha amd64 ia64 ppc ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" # Add keywords as those archs have a binpkg
 IUSE=""
 
 DEPEND=">=dev-lang/ghc-6.12.1"
diff --git a/app-arch/lbzip2/lbzip2-2.2-r1.ebuild b/app-arch/lbzip2/lbzip2-2.2-r1.ebuild
index 53e42a728323..24ad21ea7106 100644
--- a/app-arch/lbzip2/lbzip2-2.2-r1.ebuild
+++ b/app-arch/lbzip2/lbzip2-2.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/lbzip2/lbzip2-2.2-r1.ebuild,v 1.5 2013/05/16 16:31:52 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/lbzip2/lbzip2-2.2-r1.ebuild,v 1.7 2013/05/17 22:52:11 ago Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://github/kjn/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="debug symlink"
 
 PATCHES=(
diff --git a/app-dicts/aspell-da/aspell-da-1.7.42.ebuild b/app-dicts/aspell-da/aspell-da-1.7.42.ebuild
index 70b448df7aba..7d687eface71 100644
--- a/app-dicts/aspell-da/aspell-da-1.7.42.ebuild
+++ b/app-dicts/aspell-da/aspell-da-1.7.42.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-dicts/aspell-da/aspell-da-1.7.42.ebuild,v 1.6 2013/05/16 16:35:59 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-dicts/aspell-da/aspell-da-1.7.42.ebuild,v 1.7 2013/05/18 05:31:59 ago Exp $
 
 ASPELL_LANG="Danish"
 
@@ -9,7 +9,7 @@ inherit aspell-dict
 LICENSE="GPL-2"
 HOMEPAGE="http://da.speling.org"
 
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos"
 IUSE=""
 
 SRC_URI="http://da.speling.org/filer/new_${P}.tar.bz2"
diff --git a/app-editors/emacs/emacs-24.3-r1.ebuild b/app-editors/emacs/emacs-24.3-r1.ebuild
index 282d63bfbc5b..924f007ab809 100644
--- a/app-editors/emacs/emacs-24.3-r1.ebuild
+++ b/app-editors/emacs/emacs-24.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-24.3-r1.ebuild,v 1.9 2013/05/16 16:35:47 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-24.3-r1.ebuild,v 1.10 2013/05/18 05:33:12 ago Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.xz
 
 LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
 SLOT="24"
-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"
+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"
 IUSE="alsa aqua athena dbus games gconf gif gnutls gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm"
 REQUIRED_USE="?? ( aqua X )"
 
diff --git a/app-emacs/autoconf-mode/autoconf-mode-2.69.ebuild b/app-emacs/autoconf-mode/autoconf-mode-2.69.ebuild
index ceef44bbbf1e..22796adda458 100644
--- a/app-emacs/autoconf-mode/autoconf-mode-2.69.ebuild
+++ b/app-emacs/autoconf-mode/autoconf-mode-2.69.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/autoconf-mode/autoconf-mode-2.69.ebuild,v 1.6 2013/05/16 16:35:22 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/autoconf-mode/autoconf-mode-2.69.ebuild,v 1.7 2013/05/18 05:30:36 ago Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/autoconf/autoconf-${PV}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
 IUSE=""
 
 SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/emacs-daemon/emacs-daemon-0.20.ebuild b/app-emacs/emacs-daemon/emacs-daemon-0.20.ebuild
index b98ce08ea9a4..e5f48ba122a2 100644
--- a/app-emacs/emacs-daemon/emacs-daemon-0.20.ebuild
+++ b/app-emacs/emacs-daemon/emacs-daemon-0.20.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-daemon/emacs-daemon-0.20.ebuild,v 1.7 2013/05/16 16:36:21 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-daemon/emacs-daemon-0.20.ebuild,v 1.8 2013/05/18 05:32:26 ago Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
 
 DEPEND=">=virtual/emacs-23"
 RDEPEND="${DEPEND}"
diff --git a/app-emacs/gentoo-syntax/gentoo-syntax-1.21.ebuild b/app-emacs/gentoo-syntax/gentoo-syntax-1.21.ebuild
index f22fccca1a37..480ae8d83cb5 100644
--- a/app-emacs/gentoo-syntax/gentoo-syntax-1.21.ebuild
+++ b/app-emacs/gentoo-syntax/gentoo-syntax-1.21.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/gentoo-syntax/gentoo-syntax-1.21.ebuild,v 1.7 2013/05/16 15:42:24 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/gentoo-syntax/gentoo-syntax-1.21.ebuild,v 1.8 2013/05/18 05:29:19 ago Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 ~sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 hppa ia64 ppc ppc64 ~sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 
 DOCS="ChangeLog keyword-generation.sh"
 ELISP_TEXINFO="${PN}.texi"
diff --git a/app-emulation/xen-tools/files/xen-tools-4-qemu-xen-doc.patch b/app-emulation/xen-tools/files/xen-tools-4-qemu-xen-doc.patch
new file mode 100644
index 000000000000..cd9658cd1e89
--- /dev/null
+++ b/app-emulation/xen-tools/files/xen-tools-4-qemu-xen-doc.patch
@@ -0,0 +1,29 @@
+diff -ur xen-4.2.2.orig/tools/qemu-xen/qemu-options.hx xen-4.2.2/tools/qemu-xen/qemu-options.hx
+--- tools/qemu-xen/qemu-options.hx	2013-04-06 07:39:54.000000000 +0800
++++ tools/qemu-xen/qemu-options.hx	2013-05-17 22:16:56.924728753 +0800
+@@ -1799,18 +1799,13 @@
+ devices.
+ 
+ Syntax for specifying a sheepdog device
+-@table @list
+-``sheepdog:<vdiname>''
+-
+-``sheepdog:<vdiname>:<snapid>''
+-
+-``sheepdog:<vdiname>:<tag>''
+-
+-``sheepdog:<host>:<port>:<vdiname>''
+-
+-``sheepdog:<host>:<port>:<vdiname>:<snapid>''
+-
+-``sheepdog:<host>:<port>:<vdiname>:<tag>''
++@table @code
++@item sheepdog:<vdiname>
++@item sheepdog:<vdiname>:<snapid>
++@item sheepdog:<vdiname>:<tag>
++@item sheepdog:<host>:<port>:<vdiname>
++@item sheepdog:<host>:<port>:<vdiname>:<snapid>
++@item sheepdog:<host>:<port>:<vdiname>:<tag>
+ @end table
+ 
+ Example
diff --git a/app-emulation/xen-tools/xen-tools-4.2.1-r3.ebuild b/app-emulation/xen-tools/xen-tools-4.2.1-r3.ebuild
index 2b9750101d55..e386dd2f71f4 100644
--- a/app-emulation/xen-tools/xen-tools-4.2.1-r3.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.2.1-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.2.1-r3.ebuild,v 1.2 2013/05/16 05:26:22 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.2.1-r3.ebuild,v 1.3 2013/05/17 15:15:57 idella4 Exp $
 
 EAPI=5
 
@@ -67,8 +67,8 @@ DEPEND="${CDEPEND}
 		dev-texlive/texlive-pictures
 		dev-texlive/texlive-latexrecommended
 	)
-	hvm? (  x11-proto/xproto
-	)"
+	hvm? (  x11-proto/xproto )
+	qemu? ( >=sys-apps/texinfo-5 )"
 RDEPEND="${CDEPEND}
 	sys-apps/iproute2
 	net-misc/bridge-utils
@@ -165,8 +165,9 @@ src_prepare() {
 		sed -e "s:install-tools\: tools/ioemu-dir:install-tools\: :g" -i Makefile || die
 	fi
 
-	# Fix texi2html build error with new texi2html
-	epatch "${FILESDIR}"/${PN}-4-docfix.patch
+	# Fix texi2html build error with new texi2html, qemu.doc.html
+	epatch "${FILESDIR}"/${PN}-4-docfix.patch \
+		"${FILESDIR}"/${PN}-4-qemu-xen-doc.patch
 
 	# Fix network broadcast on bridged networks
 	epatch "${FILESDIR}/${PN}-3.4.0-network-bridge-broadcast.patch"
diff --git a/app-emulation/xen-tools/xen-tools-4.2.2-r1.ebuild b/app-emulation/xen-tools/xen-tools-4.2.2-r1.ebuild
index cca5a597617a..345b82fe5be8 100644
--- a/app-emulation/xen-tools/xen-tools-4.2.2-r1.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.2.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.2.2-r1.ebuild,v 1.2 2013/05/16 05:26:22 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.2.2-r1.ebuild,v 1.3 2013/05/17 15:15:57 idella4 Exp $
 
 EAPI=5
 
@@ -32,7 +32,7 @@ DOCS=( README docs/README.xen-bugtool )
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="api custom-cflags debug doc flask hvm qemu pygrub screen static-libs xend"
+IUSE="api custom-cflags debug doc flask hvm qemu ocaml pygrub screen static-libs xend"
 
 REQUIRED_USE="hvm? ( qemu )"
 
@@ -68,11 +68,12 @@ DEPEND="${CDEPEND}
 		dev-texlive/texlive-pictures
 		dev-texlive/texlive-latexrecommended
 	)
-	hvm? (  x11-proto/xproto
-	)"
+	hvm? (  x11-proto/xproto )
+	qemu? ( >=sys-apps/texinfo-5 )"
 RDEPEND="${CDEPEND}
 	sys-apps/iproute2
 	net-misc/bridge-utils
+	ocaml? ( >=dev-lang/ocaml-4 )
 	screen? (
 		app-misc/screen
 		app-admin/logrotate
@@ -165,8 +166,9 @@ src_prepare() {
 		sed -e "s:install-tools\: tools/ioemu-dir:install-tools\: :g" -i Makefile || die
 	fi
 
-	# Fix texi2html build error with new texi2html
-	epatch "${FILESDIR}"/${PN}-4-docfix.patch
+	# Fix texi2html build error with new texi2html, qemu.doc.html
+	epatch "${FILESDIR}"/${PN}-4-docfix.patch \
+		"${FILESDIR}"/${PN}-4-qemu-xen-doc.patch
 
 	# Fix network broadcast on bridged networks
 	epatch "${FILESDIR}/${PN}-3.4.0-network-bridge-broadcast.patch"
@@ -197,7 +199,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/xen-4-ulong.patch \
 		"${FILESDIR}"/${PN}-4.2-xen_disk_leak.patch
 
-	#Sec patch, currently valid
+	#Security patches, currently valid
 	epatch "${FILESDIR}"/xen-4-CVE-2012-6075-XSA-41.patch \
 		"${FILESDIR}"/xen-4-CVE-2013-1922-XSA-48.patch \
 		"${FILESDIR}"/xen-4-CVE-2013-1952-XSA-49.patch
diff --git a/app-misc/clockywock/Manifest b/app-misc/clockywock/Manifest
index d90169332d46..403e7ccf7ea1 100644
--- a/app-misc/clockywock/Manifest
+++ b/app-misc/clockywock/Manifest
@@ -1,2 +1 @@
-DIST clockywock-0.2.3F.tar.gz 13540 SHA256 7418caf5b652adb18ce7a351c58ae95eeefc617a48912de13f8bace2d6f94cc4 SHA512 9d77e2a2c2748c83b79cdf4551cb67cb5419b7110a6f8fbb0fcfb6198fa7a5430ac74e5fc9d881c54ef78d9cfb6e7d06731946b0e5bb1e74edbced4cc48904e0 WHIRLPOOL 77d1337fd510c22af1f0d700e2cd44f1643ee63ba9f2e4f76bc73301f771e833eb4971361d2dd148e3ad133d9cf399e420f81b0455b61f740b97c21af19d7f42
 DIST clockywock-0.3.1a.tar.gz 15004 SHA256 278c01e0adf650b21878e593b84b3594b21b296d601ee0f73330126715a4cce4 SHA512 1d4f6e0a2e9cd8f459346aa4778ed4da0f1ce8e2b0b8bfed97a90c286d79199cefa609976c6d6139f1acdaccfc07f5f84e46d2f54e397ff8e9b2b450d06399a9 WHIRLPOOL 9e65dc9ca1716d81d59b8b4b7fea2a131ec50606f7420b2ca3f69988f618657237fab150ab02e40d3229e66e6b59fd4a384d277acbeca2158e5dc3cb3c0eb806
diff --git a/app-misc/clockywock/clockywock-0.2.3f.ebuild b/app-misc/clockywock/clockywock-0.2.3f.ebuild
deleted file mode 100644
index 86c66f5c3668..000000000000
--- a/app-misc/clockywock/clockywock-0.2.3f.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/clockywock/clockywock-0.2.3f.ebuild,v 1.6 2012/03/20 18:27:34 sping Exp $
-
-EAPI="4"
-
-inherit eutils toolchain-funcs
-
-MY_P=${P/f/F}
-
-DESCRIPTION="ncurses based analog clock"
-HOMEPAGE="http://dentar.com/ourway/opensource"
-SRC_URI="http://dentar.com/opensource/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="sys-libs/ncurses"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-makefile.patch
-	sed -i 's:\<timex\>:timecw:g' clockywock.cpp || die #371383
-}
-
-src_compile() {
-	tc-export CXX
-	emake || die
-}
-
-src_install() {
-	dobin ${PN}
-	doman ${PN}.7
-	dodoc README CREDITS
-}
diff --git a/app-misc/clockywock/files/clockywock-0.2.3f-makefile.patch b/app-misc/clockywock/files/clockywock-0.2.3f-makefile.patch
deleted file mode 100644
index b7fcff558897..000000000000
--- a/app-misc/clockywock/files/clockywock-0.2.3f-makefile.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- Makefile
-+++ Makefile
-@@ -1,5 +1,5 @@
- all:
--	g++ -O3 -Wall -o clockywock clockywock.cpp -lncurses -lpthread
-+	${CXX} ${CXXFLAGS} ${LDFLAGS} -o clockywock clockywock.cpp -lncurses -lpthread
- 
- # install is done completely lazily
- install:
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index 73b41f5e58a4..7de3cc52361d 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -1,3 +1,3 @@
 DIST calibre-0.9.27.tar.xz 28696180 SHA256 8fd3779c8f878420333f6919f80493bf69d4b64bf427697ebc365497d2450d1f SHA512 91970f7c7349f661fc582eb43b89b81e77350b1cf2237c78e55c9f028a94b803b5d72bdac3ac11722c4fcf93077c1f8042567f8e380ad03423ba6c7f5dec7318 WHIRLPOOL 2313f94ee2417343693e1b48736434d1bf356795eb781abbaf68b858ba9fd57eb2a78e8afe04b9c992a1879a99eb9cf65527ccea7ed1a91d7554a62dcee7822b
-DIST calibre-0.9.29.tar.xz 28819456 SHA256 29a789108772665000e895d0798b758068a4143807213de68fdd39aa85059058 SHA512 30a551a5108332741c80454264fa00fc1f332ccb9cd3c75b1c48253f027d84e4407e9e223325b0a0c36fc78ab1cd26b5dc02f7bb4d5dce486796bf3921b0252c WHIRLPOOL 349a4df78d3ad072b18133f398e72445fa74544e945a9d0e0cf3f4960c694d9d3ebd89cf43569d1020e319f1b4286858ad720cd8aaa5e79b1c12b907665ad5f6
 DIST calibre-0.9.30.tar.xz 28894864 SHA256 eab88d0d5ade70dd1bae9522f444ddd3ab71b2d57a159d6ecc6276cd674fc927 SHA512 330a1bdd7b43f6aea06d6a6e056c63991a3c763c2ccbf0fd70adedf2c943813872f9997340455442c8bb0d36fbeae9554a86d131dded662f57fc138ae8c5c231 WHIRLPOOL 1ea65422bb9b4e628ceb847c331148d22f323d82431e2bdee8cfa7f18d8068a6436e54140faeb6f4596ed1a6645d193d983ca2bc4938b5bb4fddc3c0a38fe025
+DIST calibre-0.9.31.tar.xz 28982364 SHA256 94346e605f72bac5cd4fc26d5a6b8644511d68837bc5f29bb30f9b13474ccd1b SHA512 4b287dcbc0ec8db86f8e41e87c7d7ece9781ede7309e84b0ff660efba08267f980fe95c733b0624945f99b805a84f0fbb479d825d4a7673bc68168ccd0059628 WHIRLPOOL af0741eb02296123e6348c6d157535336147d15d34028214536a2e10b66de5e9538d10aa29fff461c480dc4cf6db1091d03eade12be05dd7d36be9847fd6a85c
diff --git a/app-text/calibre/calibre-0.9.29.ebuild b/app-text/calibre/calibre-0.9.31.ebuild
similarity index 99%
rename from app-text/calibre/calibre-0.9.29.ebuild
rename to app-text/calibre/calibre-0.9.31.ebuild
index d0cf47f8583a..1c1f3c8377ed 100644
--- a/app-text/calibre/calibre-0.9.29.ebuild
+++ b/app-text/calibre/calibre-0.9.31.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.9.29.ebuild,v 1.1 2013/05/05 02:07:32 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.9.31.ebuild,v 1.1 2013/05/17 20:13:39 zmedico Exp $
 
 EAPI=5
 
diff --git a/app-text/djvu/djvu-3.5.25.3.ebuild b/app-text/djvu/djvu-3.5.25.3.ebuild
index c837a3e28123..f57ccb345dfa 100644
--- a/app-text/djvu/djvu-3.5.25.3.ebuild
+++ b/app-text/djvu/djvu-3.5.25.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/djvu/djvu-3.5.25.3.ebuild,v 1.7 2013/05/16 16:32:16 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/djvu/djvu-3.5.25.3.ebuild,v 1.9 2013/05/17 22:52:37 ago Exp $
 
 EAPI=5
 inherit autotools eutils fdo-mime flag-o-matic
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/djvu/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="debug doc jpeg tiff xml"
 
 RDEPEND="jpeg? ( virtual/jpeg )
diff --git a/app-text/docbook-xsl-ns-stylesheets/docbook-xsl-ns-stylesheets-1.78.0.ebuild b/app-text/docbook-xsl-ns-stylesheets/docbook-xsl-ns-stylesheets-1.78.0.ebuild
index c2de51969f23..f8b16e94e62d 100644
--- a/app-text/docbook-xsl-ns-stylesheets/docbook-xsl-ns-stylesheets-1.78.0.ebuild
+++ b/app-text/docbook-xsl-ns-stylesheets/docbook-xsl-ns-stylesheets-1.78.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-xsl-ns-stylesheets/docbook-xsl-ns-stylesheets-1.78.0.ebuild,v 1.5 2013/05/16 16:32:03 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-xsl-ns-stylesheets/docbook-xsl-ns-stylesheets-1.78.0.ebuild,v 1.7 2013/05/17 22:52:49 ago Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/docbook/${MY_P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
 IUSE="ruby"
 
 RDEPEND=">=app-text/build-docbook-catalog-1.4
diff --git a/app-text/xdvik/Manifest b/app-text/xdvik/Manifest
index 71b087b4d689..25e214f04822 100644
--- a/app-text/xdvik/Manifest
+++ b/app-text/xdvik/Manifest
@@ -1,2 +1,2 @@
-DIST xdvik-22.84.16.tar.gz 2185822 SHA256 3e41620f1783bd8265620c93d2597b82a155833f93639add8e877f8eb5f47dbf SHA512 e95c94bd9e6c161cef3f7b9278761eee0dfa34c5bf1765426a33152fe2cec3705de183d981d68421b7b1b2877e75d7c4b9d0c0056ae8aa3f50d6b6275384af8a WHIRLPOOL fcee7737c9367dce21ed19651d08de5dba8b750f3675f15203da8482ce3f90069c1ba2abf992165476bb3d160b70f6fdfbae8da5a95b9ab2a2f43156b62c4fda
 DIST xdvik-22.85.tar.gz 4128828 SHA256 91f08103e53ab46efc83053e648bdd07aa100043233dadcb7384efc83fa2dde8 SHA512 9220bac0dea21d617b4ea7129ca8133fd447fb1adc26c699970cae7d3e168e32f4745b0936d18d8f769f3926c526e085f0c92a4d99d5faff8301e3c4ebc297b5 WHIRLPOOL 57ffc2d6a326b754b63aed54836c05b2e9431b01faba6d9bdc347b07094a62a7569d7746f556366b282808cc93a41a81cbda4fd82cdf4972133f8addc74e4e75
+DIST xdvik-22.86.tar.gz 4412419 SHA256 a3dffb8d878e6039ebc168d3bd82d194912dac53177673f818d0baac2dc27203 SHA512 f2cf15b8f94ae1a43b749fc9355eac1b427a41d690299ad4a221d51ef21eb0adcf6986c13f03d8c681e6cc2522229a2843b5c6f1ad359c5f0a28933e6d11c8eb WHIRLPOOL 8031f1ddc0eb8de415446752c07c0b7a22f35ffcd6f44a2b025cdb1bf1593bbe37306da5c93d620fe9f00b14fd6fc061c0f432afd7294ccf774e5e4e4fbd8f9d
diff --git a/app-text/xdvik/files/xdvik-22.84.16-cvararg.patch b/app-text/xdvik/files/xdvik-22.84.16-cvararg.patch
deleted file mode 100644
index 25efb5d51382..000000000000
--- a/app-text/xdvik/files/xdvik-22.84.16-cvararg.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-c-vararg is an internal header of kpathsea, not installed by the system version.
-
-Index: xdvik-22.84.16/texk/xdvik/dvi-draw.c
-===================================================================
---- xdvik-22.84.16.orig/texk/xdvik/dvi-draw.c
-+++ xdvik-22.84.16/texk/xdvik/dvi-draw.c
-@@ -43,7 +43,6 @@ in xdvi.c.
- #include "kpathsea/c-stat.h"
- #include "kpathsea/magstep.h"
- #include "kpathsea/tex-file.h"
--#include "kpathsea/c-vararg.h"
- 
- #include <string.h>
- 
-Index: xdvik-22.84.16/texk/xdvik/gui/message-window.c
-===================================================================
---- xdvik-22.84.16.orig/texk/xdvik/gui/message-window.c
-+++ xdvik-22.84.16/texk/xdvik/gui/message-window.c
-@@ -78,7 +78,6 @@ by the user (as a rough guide: a delay o
- # include <X11/Xaw/Dialog.h>
- #endif
- 
--#include "kpathsea/c-vararg.h"
- #include "xdvi.h"
- #include "util.h"
- #include "string-utils.h"
-Index: xdvik-22.84.16/texk/xdvik/gui/statusline.c
-===================================================================
---- xdvik-22.84.16.orig/texk/xdvik/gui/statusline.c
-+++ xdvik-22.84.16/texk/xdvik/gui/statusline.c
-@@ -32,7 +32,6 @@
- #include "pagehist.h"
- #include "util.h"
- 
--#include "kpathsea/c-vararg.h"
- #include "my-vsnprintf.h"
- 
- #include <ctype.h>
-Index: xdvik-22.84.16/texk/xdvik/string-utils.h
-===================================================================
---- xdvik-22.84.16.orig/texk/xdvik/string-utils.h
-+++ xdvik-22.84.16/texk/xdvik/string-utils.h
-@@ -2,7 +2,6 @@
- #define STRING_UTILS_H_
- 
- #include "xdvi-config.h"
--#include "kpathsea/c-vararg.h"
- #include "my-vsnprintf.h"
- 
- extern Boolean str_is_prefix(const char *, const char *, Boolean case_sensitive);
-Index: xdvik-22.84.16/texk/xdvik/tests/test_string_utils.c
-===================================================================
---- xdvik-22.84.16.orig/texk/xdvik/tests/test_string_utils.c
-+++ xdvik-22.84.16/texk/xdvik/tests/test_string_utils.c
-@@ -1,6 +1,5 @@
- #include "xdvi-config.h"
- #include "xdvi.h"
--#include "kpathsea/c-vararg.h"
- 
- #include <stdio.h>
- #include <stdlib.h>
-Index: xdvik-22.84.16/texk/xdvik/xdvi.h
-===================================================================
---- xdvik-22.84.16.orig/texk/xdvik/xdvi.h
-+++ xdvik-22.84.16/texk/xdvik/xdvi.h
-@@ -261,7 +261,6 @@ extern KPSEDLL char *kpathsea_version_st
- #  define NeedVarargsPrototypes	NeedFunctionPrototypes
- #endif
- 
--#include "kpathsea/c-vararg.h"
- #include "kpathsea/c-fopen.h"
- 
- #ifndef	_XFUNCPROTOBEGIN
diff --git a/app-text/xdvik/files/xdvik-22.84.16-kpathsea_version.patch b/app-text/xdvik/files/xdvik-22.84.16-kpathsea_version.patch
deleted file mode 100644
index fb69d3d1294e..000000000000
--- a/app-text/xdvik/files/xdvik-22.84.16-kpathsea_version.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-kpathsea from TeX Live 2009 and later provides a version.h header with this
-definition. Use it because it causes definition conflicts with kpathsea from TeX
-Live 2010.
-
-Index: xdvik-22.84.16/texk/xdvik/xdvi.h
-===================================================================
---- xdvik-22.84.16.orig/texk/xdvik/xdvi.h
-+++ xdvik-22.84.16/texk/xdvik/xdvi.h
-@@ -242,8 +242,7 @@ typedef unsigned long xuint32;
- #define LENGTH_OF_ULONG ((sizeof(unsigned long) * CHAR_BIT + 2) / 3 + 1 + 1)
- 
- #include "kpathsea/c-dir.h" /* dirent.h, NAMLEN */
--
--extern KPSEDLL char *kpathsea_version_string;
-+#include "kpathsea/version.h"
- 
- #ifndef	NeedFunctionPrototypes
- #  if	__STDC__
diff --git a/app-text/xdvik/files/xdvik-22.84.16-open-mode.patch b/app-text/xdvik/files/xdvik-22.84.16-open-mode.patch
deleted file mode 100644
index 76ee267dc1a3..000000000000
--- a/app-text/xdvik/files/xdvik-22.84.16-open-mode.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -pruN xdvik-22.84.14.orig/texk/xdvik/util.c xdvik-22.84.14/texk/xdvik/util.c
---- xdvik-22.84.14.orig/texk/xdvik/util.c	2009-09-02 21:30:39.812675433 +0200
-+++ xdvik-22.84.14/texk/xdvik/util.c	2008-05-03 21:45:10.000000000 +0200
-@@ -273,7 +273,7 @@ try_open_mode(const char *fname, int fla
-     int fd = open(fname, flags, mode);
-     if (fd < 0 && (errno == EMFILE || errno == ENFILE)) {
- 	close_a_file();
--	fd = open(fname, flags);
-+	fd = open(fname, flags, mode);
-     }
-     return fd;
- }
diff --git a/app-text/xdvik/files/xdvik-22.84.16-parallel_make.patch b/app-text/xdvik/files/xdvik-22.84.16-parallel_make.patch
deleted file mode 100644
index af80fb38cd09..000000000000
--- a/app-text/xdvik/files/xdvik-22.84.16-parallel_make.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-http://bugs.gentoo.org/show_bug.cgi?id=293541
-
---- Makefile.in
-+++ Makefile.in
-@@ -46,11 +46,13 @@ LIBKPATHSEADEP=@LIBKPATHSEADEP@
- x_link = $(LDLIBT1) $(LDLIBKPATHSEA) $(x_ldflags) $(x_tool_libs) $(x_xmu_lib) -lXt $(x_pre_libs) $(x_ext_lib) $(x_xpm_libs) -lX11 $(x_extra_libs)
- 
- TESTS=./tests/run_tests
--TESTS_DEP=$(TESTS)
-+TESTS_DEP=tests
-+.PHONY: $(TESTS_DEP)
- 
- # various xdvik GUI elements
- LIBGUI=./gui/libgui.a
--LIBGUIDEP=$(LIBGUI)
-+LIBGUIDEP=gui
-+.PHONY: $(LIBGUIDEP)
- 
- 
- # Extra xdvi-specific compiler options.
-@@ -106,18 +108,14 @@ objects = \
- perlprog = t1mapper
- manpage = xdvi
- 
--default all: libguibuild @final_exec_name@ $(manpage).1
-+default all: $(LIBGUIDEP) @final_exec_name@ $(manpage).1
- 
--$(LIBGUI):
-+$(LIBGUIDEP):
- 	cd gui; $(MAKE) $(makeargs) libgui.a
- 
--$(TESTS):
-+$(TESTS_DEP):
- 	cd tests; $(MAKE) $(makeargs)
- 
--### we need this additional target so that libgui is always checked to be up-to-date ...
--libguibuild:
--	cd gui; $(MAKE) $(makeargs) libgui.a
--
- test:
- 	cd tests; $(MAKE) $(makeargs) test
- 
diff --git a/app-text/xdvik/xdvik-22.84.16.ebuild b/app-text/xdvik/xdvik-22.86.ebuild
similarity index 53%
rename from app-text/xdvik/xdvik-22.84.16.ebuild
rename to app-text/xdvik/xdvik-22.86.ebuild
index fe12901d5d45..189de9ca4144 100644
--- a/app-text/xdvik/xdvik-22.84.16.ebuild
+++ b/app-text/xdvik/xdvik-22.86.ebuild
@@ -1,20 +1,20 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xdvik/xdvik-22.84.16.ebuild,v 1.19 2013/03/03 23:09:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xdvik/xdvik-22.86.ebuild,v 1.1 2013/05/18 00:17:33 aballier Exp $
 
-EAPI=3
-inherit eutils flag-o-matic elisp-common toolchain-funcs
+EAPI=4
+inherit eutils flag-o-matic elisp-common toolchain-funcs multilib
 
 DESCRIPTION="DVI previewer for X Window System"
 HOMEPAGE="http://xdvi.sourceforge.net/"
 SRC_URI="mirror://sourceforge/xdvi/${P}.tar.gz"
 
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+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 ~sparc-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 LICENSE="GPL-2"
 IUSE="motif neXt Xaw3d emacs"
 
-RDEPEND=">=media-libs/t1lib-5.0.2
+RDEPEND="media-libs/freetype:2
 	x11-libs/libXmu
 	x11-libs/libXp
 	x11-libs/libXpm
@@ -26,29 +26,22 @@ RDEPEND=">=media-libs/t1lib-5.0.2
 			!Xaw3d? ( x11-libs/libXaw )
 		)
 	)
-	virtual/latex-base
-	!<app-text/texlive-2007"
+	dev-libs/kpathsea"
 DEPEND="sys-devel/flex
 	virtual/yacc
 	${RDEPEND}"
-TEXMF_PATH=/usr/share/texmf
+RDEPEND="${RDEPEND}
+	virtual/latex-base
+	!<app-text/texlive-2007"
 S=${WORKDIR}/${P}/texk/xdvik
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-open-mode.patch \
-		"${FILESDIR}"/${P}-cvararg.patch \
-		"${FILESDIR}"/${P}-parallel_make.patch
-	has_version '>=app-text/texlive-core-2009' && epatch "${FILESDIR}"/${P}-kpathsea_version.patch
 	# Make sure system kpathsea headers are used
 	cd "${WORKDIR}/${P}/texk/kpathsea"
 	for i in *.h ; do echo "#include_next \"$i\"" > $i; done
 }
 
 src_configure() {
-	cd "${WORKDIR}/${P}"
-
-	tc-export CC AR RANLIB
-
 	local toolkit
 
 	if use motif ; then
@@ -64,32 +57,28 @@ src_configure() {
 		toolkit="xaw"
 	fi
 
-	econf --disable-multiplatform \
-		--enable-t1lib \
-		--enable-gf \
-		--with-system-t1lib \
+	econf \
+		--with-system-freetype2 \
 		--with-system-kpathsea \
 		--with-kpathsea-include="${EPREFIX}"/usr/include/kpathsea \
-		--with-xdvi-x-toolkit="${toolkit}"
+		--with-xdvi-x-toolkit="${toolkit}" \
+		--x-includes="${EPREFIX}"/usr/include \
+		--x-libraries="${EPREFIX}"/usr/$(get_libdir)
 }
 
 src_compile() {
-	emake kpathsea_dir="${EPREFIX}/usr/include/kpathsea" texmf="${EPREFIX}${TEXMF_PATH}" || die
+	emake kpathsea_dir="${EPREFIX}/usr/include/kpathsea"
 	use emacs && elisp-compile xdvi-search.el
 }
 
 src_install() {
-	einstall kpathsea_dir="${EPREFIX}/usr/include/kpathsea" texmf="${ED}${TEXMF_PATH}" || die "install failed"
+	dodir /usr/share/texmf-dist/dvips/config
+
+	emake DESTDIR="${D}" install
 
-	dodir /etc/texmf/xdvi /etc/X11/app-defaults
-	mv "${ED}${TEXMF_PATH}/xdvi/XDvi" "${ED}etc/X11/app-defaults" || die "failed to move config file"
-	dosym {/etc/X11/app-defaults,"${TEXMF_PATH}/xdvi"}/XDvi || die "failed to symlink config file"
-	for i in $(find "${ED}${TEXMF_PATH}/xdvi" -maxdepth 1 -type f) ; do
-		mv ${i} "${ED}etc/texmf/xdvi" || die "failed to move $i"
-		dosym {/etc/texmf,"${TEXMF_PATH}"}/xdvi/$(basename ${i}) || die "failed	to symlink $i"
-	done
+	dosym /usr/share/texmf-dist/xdvi/XDvi /usr/share/X11/app-defaults/XDvi
 
-	dodoc BUGS FAQ README.* || die "dodoc failed"
+	dodoc BUGS FAQ README.*
 
 	use emacs && elisp-install tex-utils *.el *.elc
 
diff --git a/app-vim/colorschemes/colorschemes-20130124.ebuild b/app-vim/colorschemes/colorschemes-20130124.ebuild
index b8d79f58bf1e..adfe88ae4f12 100644
--- a/app-vim/colorschemes/colorschemes-20130124.ebuild
+++ b/app-vim/colorschemes/colorschemes-20130124.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-vim/colorschemes/colorschemes-20130124.ebuild,v 1.6 2013/05/16 16:29:20 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-vim/colorschemes/colorschemes-20130124.ebuild,v 1.7 2013/05/18 05:32:39 ago Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ DESCRIPTION="vim plugin: a collection of color schemes from vim.org"
 HOMEPAGE="http://www.vim.org/"
 
 LICENSE="vim GPL-2 GPL-2+ GPL-3 GPL-3+ MIT BSD WTFPL-2 public-domain"
-KEYWORDS="~alpha amd64 hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 hppa ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 IUSE=""
 
 VIM_PLUGIN_HELPTEXT=\
diff --git a/app-vim/gtk-syntax/gtk-syntax-20121015.ebuild b/app-vim/gtk-syntax/gtk-syntax-20121015.ebuild
index e50bcd7fa3e0..710299be09fa 100644
--- a/app-vim/gtk-syntax/gtk-syntax-20121015.ebuild
+++ b/app-vim/gtk-syntax/gtk-syntax-20121015.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-vim/gtk-syntax/gtk-syntax-20121015.ebuild,v 1.8 2013/05/16 15:41:58 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-vim/gtk-syntax/gtk-syntax-20121015.ebuild,v 1.9 2013/05/18 05:24:11 ago Exp $
 
 EAPI=5
 
@@ -9,5 +9,5 @@ inherit vim-plugin
 DESCRIPTION="vim plugin: Syntax highlighting for GLib, Gtk+, Xlib, Gimp, Gnome, and more"
 HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=1000"
 LICENSE="vim"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris"
 IUSE=""
diff --git a/app-vim/vim-latex/vim-latex-1.8.23.20130116.ebuild b/app-vim/vim-latex/vim-latex-1.8.23.20130116.ebuild
index 41502b087cea..b86009608369 100644
--- a/app-vim/vim-latex/vim-latex-1.8.23.20130116.ebuild
+++ b/app-vim/vim-latex/vim-latex-1.8.23.20130116.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-vim/vim-latex/vim-latex-1.8.23.20130116.ebuild,v 1.5 2013/05/16 16:28:30 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-vim/vim-latex/vim-latex-1.8.23.20130116.ebuild,v 1.6 2013/05/18 05:31:30 ago Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_5,2_6,2_7} )
@@ -15,7 +15,7 @@ HOMEPAGE="http://vim-latex.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 
 LICENSE="vim"
-KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
 IUSE="html python"
 
 RDEPEND="|| ( app-editors/vim[python?] app-editors/gvim[python?] )
diff --git a/dev-db/mysql++/mysql++-3.1.0.ebuild b/dev-db/mysql++/mysql++-3.1.0.ebuild
index e73f63e82929..bdf4c73aa28d 100644
--- a/dev-db/mysql++/mysql++-3.1.0.ebuild
+++ b/dev-db/mysql++/mysql++-3.1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql++/mysql++-3.1.0.ebuild,v 1.3 2013/05/16 13:10:46 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql++/mysql++-3.1.0.ebuild,v 1.4 2013/05/17 15:23:57 jer Exp $
 
 EAPI="5"
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.tangentsoft.net/mysql++/releases/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0/3"
-KEYWORDS="~alpha amd64 ~hppa ~mips ppc ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 hppa ~mips ppc ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE=""
 
 RDEPEND=">=virtual/mysql-4.0"
diff --git a/dev-haskell/ansi-wl-pprint/ansi-wl-pprint-0.6.6.ebuild b/dev-haskell/ansi-wl-pprint/ansi-wl-pprint-0.6.6.ebuild
index 394fd07ede69..aa6692b7abc3 100644
--- a/dev-haskell/ansi-wl-pprint/ansi-wl-pprint-0.6.6.ebuild
+++ b/dev-haskell/ansi-wl-pprint/ansi-wl-pprint-0.6.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/ansi-wl-pprint/ansi-wl-pprint-0.6.6.ebuild,v 1.3 2013/05/16 15:43:37 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/ansi-wl-pprint/ansi-wl-pprint-0.6.6.ebuild,v 1.5 2013/05/18 05:25:27 ago Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~ia64 ppc ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ia64 ppc ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=dev-haskell/ansi-terminal-0.4.0:=[profile?]
diff --git a/dev-haskell/utf8-string/utf8-string-0.3.7-r1.ebuild b/dev-haskell/utf8-string/utf8-string-0.3.7-r1.ebuild
index 557a23c825a3..75cada8d859f 100644
--- a/dev-haskell/utf8-string/utf8-string-0.3.7-r1.ebuild
+++ b/dev-haskell/utf8-string/utf8-string-0.3.7-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/utf8-string/utf8-string-0.3.7-r1.ebuild,v 1.3 2013/05/16 15:46:58 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/utf8-string/utf8-string-0.3.7-r1.ebuild,v 1.5 2013/05/18 05:26:03 ago Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~ia64 ppc ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ia64 ppc ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x86-macos"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-6.10.4:="
diff --git a/dev-lang/go/Manifest b/dev-lang/go/Manifest
index 249586880287..240bc66d5664 100644
--- a/dev-lang/go/Manifest
+++ b/dev-lang/go/Manifest
@@ -1 +1,2 @@
 DIST go1.0.3.src.tar.gz 7404849 SHA256 7fba3533d172f13629d3d8a79e57c620632b0bd075abe11d7698b338be0ae3df SHA512 8006b1c38b7d49f3ae040e405d1897218cbc941a81349f270e6f5fdfeb84ed9267cfcbadb414da4cef1135bb0e2377b295ade3f3d6411c6ae15149f7e1b717b1 WHIRLPOOL 15d8576a7210dcac0da45e3e43686e2b3135c01cc047f8881338fb437a54fd56c69b8eacbc1a395ebc0813e6940bbdfcde37518b214ba162851bc669a268b0f4
+DIST go1.1.src.tar.gz 9041413 SHA256 bf1d057d8386e840f9cd3f787252e26d8ee196852e9232a6f9ce762337b19cb6 SHA512 5ae241f2893a39f872214a1b008d28a19d68ece81700422dc917160a69a8388b6fcb27442ea10b533a3c6f94ef09e24425727d2a315c3457ce076bbe42fd033a WHIRLPOOL b3cde4ab5ecb5697c195c33f4bbe11ede0428910f208ded11f4a7fc567697be7af62153fc16105a5f33dcbb84bfcdd182ec44ea1a0722a0bce74b2adc2328d03
diff --git a/dev-lang/go/files/go-1.1-no-Werror.patch b/dev-lang/go/files/go-1.1-no-Werror.patch
new file mode 100644
index 000000000000..f5c45767ae5c
--- /dev/null
+++ b/dev-lang/go/files/go-1.1-no-Werror.patch
@@ -0,0 +1,12 @@
+Disable -Werror.
+
+--- a/src/cmd/dist/build.c
++++ b/src/cmd/dist/build.c
+@@ -384,7 +384,6 @@ static char *proto_gccargs[] = {
+ 	"-Wno-unknown-pragmas",
+ 	"-Wno-switch",
+ 	"-Wno-comment",
+-	"-Werror",
+ 	"-fno-common",
+ 	"-ggdb",
+ 	"-O2",
diff --git a/dev-lang/go/go-1.1.ebuild b/dev-lang/go/go-1.1.ebuild
new file mode 100644
index 000000000000..da9938914ceb
--- /dev/null
+++ b/dev-lang/go/go-1.1.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/go/go-1.1.ebuild,v 1.1 2013/05/17 22:55:44 williamh Exp $
+
+EAPI=5
+
+export CTARGET=${CTARGET:-${CHOST}}
+
+inherit bash-completion-r1 elisp-common eutils
+
+if [[ ${PV} = 9999 ]]; then
+	EHG_REPO_URI="https://go.googlecode.com/hg"
+	inherit mercurial
+else
+	SRC_URI="http://go.googlecode.com/files/go${PV}.src.tar.gz"
+	# Upstream only supports go on amd64, arm and x86 architectures.
+	KEYWORDS="-* ~amd64 ~arm ~x86"
+fi
+
+DESCRIPTION="A concurrent garbage collected and typesafe programming language"
+HOMEPAGE="http://www.golang.org"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="bash-completion emacs vim-syntax zsh-completion"
+
+DEPEND="sys-apps/ed"
+RDEPEND="bash-completion? ( app-shells/bash-completion )
+	emacs? ( virtual/emacs )
+	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+	zsh-completion? ( app-shells/zsh-completion )"
+
+# The tools in /usr/lib/go should not cause the multilib-strict check to fail.
+QA_MULTILIB_PATHS="usr/lib/go/pkg/tool/linux*/*"
+
+# The go language uses *.a files which are _NOT_ libraries and should not be
+# stripped.
+STRIP_MASK="/usr/lib/go/pkg/linux*/*.a"
+
+if [[ ${PV} != 9999 ]]; then
+	S="${WORKDIR}"/go
+fi
+
+src_prepare()
+{
+	if [[ ${PV} != 9999 ]]; then
+		epatch "${FILESDIR}"/${P}-no-Werror.patch
+	fi
+	epatch_user
+}
+
+src_compile()
+{
+	export GOROOT_FINAL=/usr/lib/go
+	export GOROOT="$(pwd)"
+	export GOBIN="${GOROOT}/bin"
+	if [[ $CTARGET = armv5* ]]
+	then
+		export GOARM=5
+	fi
+
+	cd src
+	./make.bash || die "build failed"
+	cd ..
+
+	if use emacs; then
+		elisp-compile misc/emacs/*.el
+	fi
+}
+
+src_test()
+{
+	cd src
+	PATH="${GOBIN}:${PATH}" \
+		./run.bash --no-rebuild --banner || die "tests failed"
+}
+
+src_install()
+{
+	dobin bin/*
+	dodoc AUTHORS CONTRIBUTORS PATENTS README
+
+	dodir /usr/lib/go
+	insinto /usr/lib/go
+
+	# There is a known issue which requires the source tree to be installed [1].
+	# Once this is fixed, we can consider using the doc use flag to control
+	# installing the doc and src directories.
+	# [1] http://code.google.com/p/go/issues/detail?id=2775
+	doins -r doc include lib pkg src
+
+	if use bash-completion; then
+		dobashcomp misc/bash/go
+	fi
+
+	if use emacs; then
+		elisp-install ${PN} misc/emacs/*.el misc/emacs/*.elc
+	fi
+
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles
+		doins -r misc/vim/ftdetect
+		doins -r misc/vim/ftplugin
+		doins -r misc/vim/syntax
+		doins -r misc/vim/plugin
+		doins -r misc/vim/indent
+	fi
+
+	if use zsh-completion; then
+		insinto /usr/share/zsh/site-functions
+		doins misc/zsh/go
+	fi
+
+	fperms -R +x /usr/lib/go/pkg/tool
+}
+
+pkg_postinst()
+{
+	if use emacs; then
+		elisp-site-regen
+	fi
+
+	# If the go tool sees a package file timestamped older than a dependancy it
+	# will rebuild that file.  So, in order to stop go from rebuilding lots of
+	# packages for every build we need to fix the timestamps.  The compiler and
+	# linker are also checked - so we need to fix them too.
+	ebegin "fixing timestamps to avoid unnecessary rebuilds"
+	tref="usr/lib/go/pkg/*/runtime.a"
+	find "${ROOT}"usr/lib/go -type f \
+		-exec touch -r "${ROOT}"${tref} {} \;
+	eend $?
+}
+
+pkg_postrm()
+{
+	if use emacs; then
+		elisp-site-regen
+	fi
+}
diff --git a/dev-lang/go/go-9999.ebuild b/dev-lang/go/go-9999.ebuild
index 44b0f95fb5ea..48835820c6ec 100644
--- a/dev-lang/go/go-9999.ebuild
+++ b/dev-lang/go/go-9999.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/go/go-9999.ebuild,v 1.10 2013/04/16 16:10:18 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/go/go-9999.ebuild,v 1.11 2013/05/17 22:55:44 williamh Exp $
 
-EAPI=4
+EAPI=5
 
 export CTARGET=${CTARGET:-${CHOST}}
 
@@ -33,8 +33,8 @@ RDEPEND="bash-completion? ( app-shells/bash-completion )
 # The tools in /usr/lib/go should not cause the multilib-strict check to fail.
 QA_MULTILIB_PATHS="usr/lib/go/pkg/tool/linux*/*"
 
-	# The go language stores binary data for packages in *.a files.
-	# These are _NOT_ libraries, and should not be stripped.
+# The go language uses *.a files which are _NOT_ libraries and should not be
+# stripped.
 STRIP_MASK="/usr/lib/go/pkg/linux*/*.a"
 
 if [[ ${PV} != 9999 ]]; then
@@ -44,7 +44,7 @@ fi
 src_prepare()
 {
 	if [[ ${PV} != 9999 ]]; then
-		epatch "${FILESDIR}"/${P}-hardened.patch
+		epatch "${FILESDIR}"/${P}-no-Werror.patch
 	fi
 	epatch_user
 }
diff --git a/dev-libs/libburn/Manifest b/dev-libs/libburn/Manifest
index e0771789b6ae..6b233b90fb04 100644
--- a/dev-libs/libburn/Manifest
+++ b/dev-libs/libburn/Manifest
@@ -1,2 +1,3 @@
 DIST libburn-1.2.4.tar.gz 917837 SHA256 f0598fa76d157a935b576778ab8cc772f96480894239da14be84986ef1313e4b SHA512 4d8c34bdb2c829931b2a8860580319f8e374d6ea04622e40d6b97fc2120dddcd0836d31011c7797508fce0e9e5a4bcd763332bb9d505058ce656e1118c85fe0e WHIRLPOOL ab175c6af51ab1cd1982e5b96480e3b6d17dcf6c70cd6fe3509cb0d440de81c30c5e88d9add269ebf6f4c031c814c56d299d3c125dcf6fdfae16b6ff974917f7
 DIST libburn-1.2.8.tar.gz 926601 SHA256 5f33c8616c49950729133a4eb751b1bfe4a61943b59ea0a6e5968d475448845c SHA512 0fcab29201292a4a7341806281b550f36d3849268e5de25b9fe8d5e1610da457897eafdf2b7f2a2b9d3adb1258b5e072bdfd717675dea28ecab11d1f1c8951f1 WHIRLPOOL e07498fbd278bd930f842da01d1ebfe3eeca3f83ff2be4493716bbaf361a87bdfb19da883d887aecaa73920bca08717144853833807bff967ad104ee150f095b
+DIST libburn-1.3.0.tar.gz 928091 SHA256 c0005515e25b960890d8ab6e3bcc0f6d0b258e164fad6c0aade996f1906e40ba SHA512 b81c7e78508f2622b0a6640c4bb6dbcbae91dea3536ff3f7c65e011ed863d36ded2d84d2b4812096fbf3b9b3a6fd25cf37bfd9785c9fb86d15cca0355a0bb819 WHIRLPOOL 81f1b1c313f999e5b32aa3826ec6e8dac43ebfdc60f6a1c93ac811e49ae173f8a7bfd54ba587e4f1ac195be7ba7364ec12c3876f1f4e5d2a986204c70b6061ae
diff --git a/dev-libs/libburn/libburn-1.3.0.ebuild b/dev-libs/libburn/libburn-1.3.0.ebuild
new file mode 100644
index 000000000000..6b2420133ee2
--- /dev/null
+++ b/dev-libs/libburn/libburn-1.3.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libburn/libburn-1.3.0.ebuild,v 1.1 2013/05/18 08:11:05 billie Exp $
+
+EAPI=5
+
+DESCRIPTION="Libburn is an open-source library for reading, mastering and writing optical discs."
+HOMEPAGE="http://libburnia-project.org"
+SRC_URI="http://files.libburnia-project.org/releases/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="cdio debug static-libs track-src-odirect"
+
+RDEPEND="cdio? ( >=dev-libs/libcdio-0.83 )"
+DEPEND="$RDEPEND
+	virtual/pkgconfig"
+
+src_configure() {
+	econf \
+	$(use_enable static-libs static) \
+	$(use_enable track-src-odirect) \
+	--enable-pkg-check-modules \
+	$(use_enable cdio libcdio) \
+	--disable-ldconfig-at-install \
+	$(use_enable debug)
+}
+
+src_install() {
+	default
+
+	dodoc CONTRIBUTORS doc/{comments,*.txt}
+
+	cd "${S}"/cdrskin
+	docinto cdrskin
+	dodoc *.txt README
+	docinto cdrskin/html
+	dohtml cdrskin_eng.html
+
+	find "${D}" -name '*.la' -exec rm -rf '{}' '+' || die "la removal failed"
+}
diff --git a/dev-libs/libdbusmenu/libdbusmenu-0.6.2.ebuild b/dev-libs/libdbusmenu/libdbusmenu-0.6.2.ebuild
index 904cb07edd0b..5533abc85a9a 100644
--- a/dev-libs/libdbusmenu/libdbusmenu-0.6.2.ebuild
+++ b/dev-libs/libdbusmenu/libdbusmenu-0.6.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdbusmenu/libdbusmenu-0.6.2.ebuild,v 1.8 2013/05/17 01:42:44 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdbusmenu/libdbusmenu-0.6.2.ebuild,v 1.9 2013/05/17 14:30:19 jer Exp $
 
 EAPI=4
 VALA_MIN_API_VERSION=0.16
@@ -14,7 +14,7 @@ SRC_URI="http://launchpad.net/${PN/lib}/${PV%.*}/${PV}/+download/${P}.tar.gz"
 
 LICENSE="LGPL-2.1 LGPL-3"
 SLOT="3"
-KEYWORDS="~amd64 ~arm ~mips ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~x86"
 IUSE="debug gtk +introspection"
 
 RDEPEND=">=dev-libs/glib-2.32
diff --git a/dev-libs/libindicate/libindicate-12.10.1.ebuild b/dev-libs/libindicate/libindicate-12.10.1.ebuild
index 9b70513cb4b9..7dd671f2af8b 100644
--- a/dev-libs/libindicate/libindicate-12.10.1.ebuild
+++ b/dev-libs/libindicate/libindicate-12.10.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libindicate/libindicate-12.10.1.ebuild,v 1.5 2013/05/17 01:46:43 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libindicate/libindicate-12.10.1.ebuild,v 1.6 2013/05/17 14:30:44 jer Exp $
 
 EAPI=5
 VALA_MIN_API_VERSION="0.16"
@@ -14,7 +14,7 @@ SRC_URI="http://launchpad.net/${PN}/${PV%.*}/${PV}/+download/${P}.tar.gz"
 
 LICENSE="LGPL-2.1 LGPL-3"
 SLOT="3"
-KEYWORDS="~amd64 ~arm ~mips ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~x86"
 IUSE="gtk +introspection"
 
 RESTRICT="test" # consequence of the -no-mono.patch
diff --git a/dev-libs/libisoburn/Manifest b/dev-libs/libisoburn/Manifest
index 0f83c18a8f7b..e279c6fae3a6 100644
--- a/dev-libs/libisoburn/Manifest
+++ b/dev-libs/libisoburn/Manifest
@@ -1,2 +1,3 @@
 DIST libisoburn-1.2.4.tar.gz 1279036 SHA256 be5c3adfcf8c32e8489ac77de5842c39cfefd8e994edebabb8353262945a85bf SHA512 379febdaad104cdb020d2fee94da0843f8ae7db497eb4e5fe55cb4da20f88fd07c8ae766767c905abbe7120684a38b2eae7d62169ce00305d4d420204db72390 WHIRLPOOL 07e05f872c7ba7b7546edfe9b18ce44fdbb0d2e0e0d5369ca30c67a116026eb9e17461220035afccbafec3635fd799a6ac99749ad07eb851c435d4ed73025607
 DIST libisoburn-1.2.8.tar.gz 1370701 SHA256 f6fc41f1ad00ae5edb2ef7e204e3c3465bd348dc2fee27c327bb31741cae0e88 SHA512 5706cf15008e5fb280d3c6f7172a06aea3cfb2090ab709ee79983962da220139d68940c0db154ccea44b97b63017f50c90b64570bca90b190238c750db60abe7 WHIRLPOOL 9e472848a80dff2e123c4f8b5de6b1ae6de04de8f79ea94969f246380bc93922e82f5849a3d62280411ef63e72a4524385ce40a6fc73ce58bf69e0c53f1c0214
+DIST libisoburn-1.3.0.tar.gz 1376920 SHA256 f90128ed2d6b3771a0f5e869eea351a0dc11eed3e82e823f3323924cf85aea7d SHA512 ceae1a339362ca63b3987dc8e54f4ea6ffc993087dd19a06e5d6e7e3dc28616d950ecce5788c7ecb743a5d2cacd2210410139e3936617c2d3a98252e983b8d05 WHIRLPOOL afe65e53ac2543e54ff2cfb48ec2a55cdb3f0e461d75c11fca199120df7bfeb76eec621343adb999c166fcb52274ddb0066a351d02c31be18a9df1d5e253a431
diff --git a/dev-libs/libisoburn/libisoburn-1.3.0.ebuild b/dev-libs/libisoburn/libisoburn-1.3.0.ebuild
new file mode 100644
index 000000000000..a78fa69c3fc7
--- /dev/null
+++ b/dev-libs/libisoburn/libisoburn-1.3.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libisoburn/libisoburn-1.3.0.ebuild,v 1.1 2013/05/18 08:27:35 billie Exp $
+
+EAPI=5
+
+DESCRIPTION="Enables creation and expansion of ISO-9660 filesystems on all CD/DVD media supported by libburn"
+HOMEPAGE="http://libburnia-project.org/"
+SRC_URI="http://files.libburnia-project.org/releases/${P}.tar.gz"
+
+LICENSE="GPL-2 GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+IUSE="acl cdio debug external-filters external-filters-setuid frontend-optional launch-frontend launch-frontend-setuid readline static-libs xattr zlib"
+
+REQUIRED_USE="frontend-optional? ( || ( launch-frontend launch-frontend-setuid ) )"
+
+RDEPEND=">=dev-libs/libburn-1.3.0
+	>=dev-libs/libisofs-1.3.0
+	readline? ( sys-libs/readline )
+	acl? ( virtual/acl )
+	xattr? ( sys-apps/attr )
+	zlib? ( sys-libs/zlib )
+	cdio? ( >=dev-libs/libcdio-0.83 )
+	launch-frontend? ( dev-lang/tcl:0 dev-lang/tk:0 )
+	launch-frontend-setuid? ( dev-lang/tcl:0 dev-lang/tk:0 )
+	frontend-optional? ( dev-tcltk/bwidget )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_configure() {
+	econf \
+	$(use_enable static-libs static) \
+	$(use_enable readline libreadline) \
+	$(use_enable acl libacl) \
+	$(use_enable xattr) \
+	$(use_enable zlib) \
+	--disable-libjte \
+	$(use_enable cdio libcdio) \
+	$(use_enable external-filters) \
+	$(use_enable external-filters-setuid) \
+	$(use_enable launch-frontend) \
+	$(use_enable launch-frontend-setuid) \
+	--disable-ldconfig-at-install \
+	--enable-pkg-check-modules \
+	$(use_enable debug)
+}
+
+src_install() {
+	default
+
+	dodoc CONTRIBUTORS doc/{comments,*.wiki,startup_file.txt}
+
+	cd "${S}"/xorriso
+	docinto xorriso
+	dodoc changelog.txt README_gnu_xorriso
+
+	find "${D}" -name '*.la' -exec rm -rf '{}' '+' || die "la removal failed"
+}
diff --git a/dev-libs/libisofs/Manifest b/dev-libs/libisofs/Manifest
index 727afeae9161..f80a36f902e6 100644
--- a/dev-libs/libisofs/Manifest
+++ b/dev-libs/libisofs/Manifest
@@ -1,2 +1,3 @@
 DIST libisofs-1.2.4.tar.gz 763300 SHA256 d0875e51f229c5e34491dce58f3cdddf8c98fadeae9e84b62b27cff7800a967f SHA512 4ebdab4b1d7c2b4b8ffd5431e27e765a405db14117f55a0c749ffa30ca705529f692762959b6e136bee78924524dd38fdbadbd722be1bd11be10ec23d928ab26 WHIRLPOOL 056f4176a84145eacd654648d7df122da843db4f66e76bb54ef579995718ead240bf3abe512fe405f6535245014bb92dec9a101c56a4849928f908afe1ce618b
 DIST libisofs-1.2.8.tar.gz 764335 SHA256 665f07752d416d05bc780ff12cccc438b9b0a9917b943750f2b3236ddeac65a0 SHA512 707a220fe49ff5ecd6816ac69d614823a3fa38e79d29c03f0bf696551cdeb6489b0f251ec7532fe79887cddb31183e5233862ce0b859fde46092588fd4313a38 WHIRLPOOL 81082eca7f73d8efac457138320f9a0bc8c5a4f42e4b252ee11b86f6e14bdc5f6dffc8508a1311ea258bb1975fdabd72e9952e9379f4aa75fd69028754d69a44
+DIST libisofs-1.3.0.tar.gz 768516 SHA256 6a4b84b9faf3c017725ee8edf4461a0dc325d25a272f884244dea94b19191f91 SHA512 1033038cf4a88bc701562a6b386a50925189f2780c6abfdbac78635f3855db18b6de6bbc6e5744a804c5bb84814175dc079e64572db713bec4939c6767b7597e WHIRLPOOL 67d2d5a3f5be6a8da2994dde4b45f6ad890b917110bbe896910b19619316e4f531e6a1a0e09340e63fd59c5950218b1c312d5f8395221519f55ebeaf92891472
diff --git a/dev-libs/libisofs/libisofs-1.3.0.ebuild b/dev-libs/libisofs/libisofs-1.3.0.ebuild
new file mode 100644
index 000000000000..333cd738bc9f
--- /dev/null
+++ b/dev-libs/libisofs/libisofs-1.3.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libisofs/libisofs-1.3.0.ebuild,v 1.1 2013/05/18 08:18:33 billie Exp $
+
+EAPI=5
+
+DESCRIPTION="libisofs is an open-source library for reading, mastering and writing optical discs."
+HOMEPAGE="http://libburnia-project.org/"
+SRC_URI="http://files.libburnia-project.org/releases/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="acl debug static-libs verbose-debug xattr zlib"
+
+RDEPEND="acl? ( virtual/acl )
+	xattr? ( sys-apps/attr )
+	zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_configure() {
+	econf \
+	$(use_enable static-libs static) \
+	$(use_enable debug) \
+	$(use_enable verbose-debug) \
+	$(use_enable acl libacl) \
+	$(use_enable xattr) \
+	$(use_enable zlib) \
+	--disable-libjte \
+	--disable-ldconfig-at-install
+}
+
+src_install() {
+	default
+
+	dodoc Roadmap doc/{checksums.txt,susp_aaip*,Tutorial,zisofs_format.txt}
+
+	find "${D}" -name '*.la' -exec rm -rf '{}' '+' || die "la removal failed"
+}
diff --git a/dev-libs/libnl/libnl-1.1.3.ebuild b/dev-libs/libnl/libnl-1.1.3.ebuild
index 204644765aef..2d6350e8808f 100644
--- a/dev-libs/libnl/libnl-1.1.3.ebuild
+++ b/dev-libs/libnl/libnl-1.1.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libnl/libnl-1.1.3.ebuild,v 1.7 2013/05/12 14:08:31 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libnl/libnl-1.1.3.ebuild,v 1.8 2013/05/18 05:31:05 ago Exp $
 
 EAPI=5
 inherit eutils multilib toolchain-funcs
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.infradead.org/~tgr/libnl/"
 SRC_URI="http://www.infradead.org/~tgr/libnl/files/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="1.1"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~ia64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~ia64-linux ~x86-linux"
 IUSE="doc"
 
 DEPEND="doc? ( app-doc/doxygen )"
diff --git a/dev-libs/ppl/ppl-0.12.1-r1.ebuild b/dev-libs/ppl/ppl-0.12.1-r1.ebuild
index 88863a5c2b2a..05db919516fb 100644
--- a/dev-libs/ppl/ppl-0.12.1-r1.ebuild
+++ b/dev-libs/ppl/ppl-0.12.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/ppl/ppl-0.12.1-r1.ebuild,v 1.8 2013/05/12 14:08:18 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/ppl/ppl-0.12.1-r1.ebuild,v 1.9 2013/05/18 05:33:26 ago Exp $
 
 EAPI="3"
 
@@ -12,7 +12,7 @@ SRC_URI="http://bugseng.com/products/ppl/download/ftp/releases/${PV}/${P}.tar.bz
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~sparc-solaris"
 IUSE="doc lpsol pch static-libs test"
 
 RDEPEND=">=dev-libs/gmp-4.1.3[cxx]
diff --git a/dev-perl/Carp-Assert-More/Carp-Assert-More-1.140.0.ebuild b/dev-perl/Carp-Assert-More/Carp-Assert-More-1.140.0.ebuild
index 7ef3b1622ec5..274012a20671 100644
--- a/dev-perl/Carp-Assert-More/Carp-Assert-More-1.140.0.ebuild
+++ b/dev-perl/Carp-Assert-More/Carp-Assert-More-1.140.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Carp-Assert-More/Carp-Assert-More-1.140.0.ebuild,v 1.3 2013/05/15 14:14:52 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Carp-Assert-More/Carp-Assert-More-1.140.0.ebuild,v 1.4 2013/05/18 05:26:17 ago Exp $
 
 EAPI=5
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="convenience wrappers around Carp::Assert"
 
 SLOT="0"
-KEYWORDS="amd64 ~ia64 ~ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ia64 ~ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="test"
 
 RDEPEND="virtual/perl-Scalar-List-Utils
diff --git a/dev-perl/Email-Address/Email-Address-1.898.0.ebuild b/dev-perl/Email-Address/Email-Address-1.898.0.ebuild
index d54af216b836..10a28520c8d8 100644
--- a/dev-perl/Email-Address/Email-Address-1.898.0.ebuild
+++ b/dev-perl/Email-Address/Email-Address-1.898.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Email-Address/Email-Address-1.898.0.ebuild,v 1.5 2013/05/16 15:39:03 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Email-Address/Email-Address-1.898.0.ebuild,v 1.6 2013/05/17 22:53:15 ago Exp $
 
 EAPI=5
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="RFC 2822 Address Parsing and Creation"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-perl/File-Sync/File-Sync-0.110.0.ebuild b/dev-perl/File-Sync/File-Sync-0.110.0.ebuild
index 1f16e8a533ca..572e9f9cc51d 100644
--- a/dev-perl/File-Sync/File-Sync-0.110.0.ebuild
+++ b/dev-perl/File-Sync/File-Sync-0.110.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/File-Sync/File-Sync-0.110.0.ebuild,v 1.5 2013/05/16 15:47:24 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/File-Sync/File-Sync-0.110.0.ebuild,v 1.6 2013/05/18 05:26:35 ago Exp $
 
 EAPI=5
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Perl access to fsync() and sync() function calls"
 
 SLOT="0"
-KEYWORDS="amd64 ~ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 ia64 ppc ppc64 ~sparc x86"
 IUSE=""
 
 SRC_TEST="do"
diff --git a/dev-perl/LWP-Protocol-https/LWP-Protocol-https-6.30.0.ebuild b/dev-perl/LWP-Protocol-https/LWP-Protocol-https-6.30.0.ebuild
index dd229c945a27..4a83a77aab95 100644
--- a/dev-perl/LWP-Protocol-https/LWP-Protocol-https-6.30.0.ebuild
+++ b/dev-perl/LWP-Protocol-https/LWP-Protocol-https-6.30.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/LWP-Protocol-https/LWP-Protocol-https-6.30.0.ebuild,v 1.9 2013/05/16 20:07:23 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/LWP-Protocol-https/LWP-Protocol-https-6.30.0.ebuild,v 1.10 2013/05/18 05:27:12 ago Exp $
 
 EAPI=4
 
@@ -13,7 +13,7 @@ SRC_URI+=" http://dev.gentoo.org/~tove/distfiles/${CATEGORY}/${PN}/${PN}_ca-cert
 
 SLOT="0"
 IUSE=""
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	app-misc/ca-certificates
diff --git a/dev-perl/Locale-PO/Locale-PO-0.230.0.ebuild b/dev-perl/Locale-PO/Locale-PO-0.230.0.ebuild
index 4562162dff9f..9620a3d42dda 100644
--- a/dev-perl/Locale-PO/Locale-PO-0.230.0.ebuild
+++ b/dev-perl/Locale-PO/Locale-PO-0.230.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Locale-PO/Locale-PO-0.230.0.ebuild,v 1.7 2013/05/16 20:08:25 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Locale-PO/Locale-PO-0.230.0.ebuild,v 1.8 2013/05/18 05:27:25 ago Exp $
 
 EAPI=5
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Object-oriented interface to gettext po-file entries"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ppc ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~m68k ppc ppc64 ~s390 ~sh ~sparc x86"
 IUSE=""
 
 RDEPEND="sys-devel/gettext
diff --git a/dev-perl/MIME-Types/MIME-Types-1.380.0.ebuild b/dev-perl/MIME-Types/MIME-Types-1.380.0.ebuild
index 3fab7ea04d80..cd6327f73d08 100644
--- a/dev-perl/MIME-Types/MIME-Types-1.380.0.ebuild
+++ b/dev-perl/MIME-Types/MIME-Types-1.380.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/MIME-Types/MIME-Types-1.380.0.ebuild,v 1.6 2013/05/16 20:07:46 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/MIME-Types/MIME-Types-1.380.0.ebuild,v 1.7 2013/05/18 05:26:48 ago Exp $
 
 EAPI=5
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Definition of MIME types"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 SRC_TEST="do"
diff --git a/dev-perl/MIME-tools/MIME-tools-5.504.0.ebuild b/dev-perl/MIME-tools/MIME-tools-5.504.0.ebuild
index 48af863a91e7..512e3444984f 100644
--- a/dev-perl/MIME-tools/MIME-tools-5.504.0.ebuild
+++ b/dev-perl/MIME-tools/MIME-tools-5.504.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/MIME-tools/MIME-tools-5.504.0.ebuild,v 1.6 2013/05/16 20:08:08 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/MIME-tools/MIME-tools-5.504.0.ebuild,v 1.7 2013/05/18 05:27:00 ago Exp $
 
 EAPI=5
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="A Perl module for parsing and creating MIME entities"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 ~s390 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 hppa ia64 ppc ppc64 ~s390 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="test"
 
 RDEPEND=">=virtual/perl-MIME-Base64-3.05
diff --git a/dev-perl/Mail-DKIM/Mail-DKIM-0.400.0.ebuild b/dev-perl/Mail-DKIM/Mail-DKIM-0.400.0.ebuild
index ae2d222f2245..d7271b503dc6 100644
--- a/dev-perl/Mail-DKIM/Mail-DKIM-0.400.0.ebuild
+++ b/dev-perl/Mail-DKIM/Mail-DKIM-0.400.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Mail-DKIM/Mail-DKIM-0.400.0.ebuild,v 1.6 2013/05/16 20:08:37 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Mail-DKIM/Mail-DKIM-0.400.0.ebuild,v 1.7 2013/05/18 05:27:37 ago Exp $
 
 EAPI=5
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Mail::DKIM - Signs/verifies Internet mail using DKIM message signatures"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm hppa ia64 ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
 IUSE=""
 
 DEPEND=">=dev-perl/Crypt-OpenSSL-RSA-0.24
diff --git a/dev-perl/Package-Stash/Package-Stash-0.340.0.ebuild b/dev-perl/Package-Stash/Package-Stash-0.340.0.ebuild
index b432d701de83..35f65a73f5c4 100644
--- a/dev-perl/Package-Stash/Package-Stash-0.340.0.ebuild
+++ b/dev-perl/Package-Stash/Package-Stash-0.340.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Package-Stash/Package-Stash-0.340.0.ebuild,v 1.6 2013/05/16 20:07:56 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Package-Stash/Package-Stash-0.340.0.ebuild,v 1.7 2013/05/18 05:30:12 ago Exp $
 
 EAPI=5
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Routines for manipulating stashes"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Pango/Pango-1.224.0.ebuild b/dev-perl/Pango/Pango-1.224.0.ebuild
index 2921cb94317b..f02e2f340e7c 100644
--- a/dev-perl/Pango/Pango-1.224.0.ebuild
+++ b/dev-perl/Pango/Pango-1.224.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Pango/Pango-1.224.0.ebuild,v 1.6 2013/05/16 20:08:48 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Pango/Pango-1.224.0.ebuild,v 1.7 2013/05/18 05:27:50 ago Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ DESCRIPTION="Layout and render international text"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm hppa ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-perl/Sub-Override/Sub-Override-0.90.0.ebuild b/dev-perl/Sub-Override/Sub-Override-0.90.0.ebuild
index 07663c326418..fea92b6489a5 100644
--- a/dev-perl/Sub-Override/Sub-Override-0.90.0.ebuild
+++ b/dev-perl/Sub-Override/Sub-Override-0.90.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Sub-Override/Sub-Override-0.90.0.ebuild,v 1.5 2013/05/16 13:18:34 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Sub-Override/Sub-Override-0.90.0.ebuild,v 1.6 2013/05/18 05:28:16 ago Exp $
 
 EAPI=5
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Perl extension for easily overriding subroutines"
 
 SLOT="0"
-KEYWORDS="amd64 ~ia64 ppc ~ppc64 ~sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="amd64 ia64 ppc ~ppc64 ~sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
 IUSE="test"
 
 DEPEND="
diff --git a/dev-perl/Text-CSV_XS/Text-CSV_XS-0.950.0.ebuild b/dev-perl/Text-CSV_XS/Text-CSV_XS-0.950.0.ebuild
index 37f4c5b746a3..f9cd0f40a5dc 100644
--- a/dev-perl/Text-CSV_XS/Text-CSV_XS-0.950.0.ebuild
+++ b/dev-perl/Text-CSV_XS/Text-CSV_XS-0.950.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Text-CSV_XS/Text-CSV_XS-0.950.0.ebuild,v 1.7 2013/05/16 20:09:22 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Text-CSV_XS/Text-CSV_XS-0.950.0.ebuild,v 1.8 2013/05/18 05:28:28 ago Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ inherit perl-module
 DESCRIPTION="Comma-separated values manipulation routines"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-perl/TimeDate/TimeDate-2.300.0.ebuild b/dev-perl/TimeDate/TimeDate-2.300.0.ebuild
index edbaadaeb10f..4d4dca333b7e 100644
--- a/dev-perl/TimeDate/TimeDate-2.300.0.ebuild
+++ b/dev-perl/TimeDate/TimeDate-2.300.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/TimeDate/TimeDate-2.300.0.ebuild,v 1.7 2013/05/16 20:08:58 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/TimeDate/TimeDate-2.300.0.ebuild,v 1.8 2013/05/18 05:28:41 ago Exp $
 
 EAPI=5
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="A Date/Time Parsing Perl Module"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 SRC_TEST=do
diff --git a/dev-perl/extutils-pkgconfig/extutils-pkgconfig-1.140.0.ebuild b/dev-perl/extutils-pkgconfig/extutils-pkgconfig-1.140.0.ebuild
index c7e74f34ccc7..b6a01d877190 100644
--- a/dev-perl/extutils-pkgconfig/extutils-pkgconfig-1.140.0.ebuild
+++ b/dev-perl/extutils-pkgconfig/extutils-pkgconfig-1.140.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/extutils-pkgconfig/extutils-pkgconfig-1.140.0.ebuild,v 1.7 2013/05/16 20:07:34 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/extutils-pkgconfig/extutils-pkgconfig-1.140.0.ebuild,v 1.8 2013/05/18 05:23:57 ago Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ DESCRIPTION="Simplistic perl interface to pkg-config"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE=""
 
 DEPEND="virtual/pkgconfig"
diff --git a/dev-perl/glib-perl/glib-perl-1.280.0.ebuild b/dev-perl/glib-perl/glib-perl-1.280.0.ebuild
index 7c90cd2ec332..7a36127596e3 100644
--- a/dev-perl/glib-perl/glib-perl-1.280.0.ebuild
+++ b/dev-perl/glib-perl/glib-perl-1.280.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/glib-perl/glib-perl-1.280.0.ebuild,v 1.7 2013/05/16 20:09:58 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/glib-perl/glib-perl-1.280.0.ebuild,v 1.8 2013/05/18 05:28:53 ago Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ HOMEPAGE="http://gtk2-perl.sf.net/ ${HOMEPAGE}"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=dev-libs/glib-2"
diff --git a/dev-perl/perl-ldap/perl-ldap-0.530.0.ebuild b/dev-perl/perl-ldap/perl-ldap-0.530.0.ebuild
index 74f9e4aac8bc..f8cd83f7ffab 100644
--- a/dev-perl/perl-ldap/perl-ldap-0.530.0.ebuild
+++ b/dev-perl/perl-ldap/perl-ldap-0.530.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/perl-ldap/perl-ldap-0.530.0.ebuild,v 1.7 2013/05/16 20:10:10 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/perl-ldap/perl-ldap-0.530.0.ebuild,v 1.8 2013/05/18 05:29:32 ago Exp $
 
 EAPI=5
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="A collection of perl modules which provide an object-oriented interface to LDAP servers."
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="sasl xml ssl"
 
 RDEPEND="
diff --git a/dev-python/beautifulsoup/Manifest b/dev-python/beautifulsoup/Manifest
index d93180cc0c9c..1fabece7220d 100644
--- a/dev-python/beautifulsoup/Manifest
+++ b/dev-python/beautifulsoup/Manifest
@@ -2,3 +2,4 @@ DIST BeautifulSoup-3.1.0.1.tar.gz 71460 SHA256 820a80f473240d9d30047f36c959d530a
 DIST BeautifulSoup-3.2.0.tar.gz 31056 SHA256 a0ea3377a1055bf2e17594c0808414afb65e11f25ce8998f1ed3e9b871de6ff6 SHA512 2bee35d0d0f3909eb09fe74c5ed1ebccb9fa134e200f5e9f00266fe1f3453d1794e920dbe4129fd3f445abe19a5acaa7dab207b2e752ac0102ae5fd9441df8ce WHIRLPOOL a537228dd5b686fd8d033eb4329ecf79fdcdfaf9e5ec4eed9a2b25aba0f41ddc980dbca6cefe26b24b721a0fe0d4804974b504767e034eef35c07ad99ef51f37
 DIST BeautifulSoup-3.2.1.tar.gz 31224 SHA256 f5ba85e907e7dfd78e44e4000b3eaef3a650aefc57831e8a645702db2e5b50db SHA512 365b7b045a2069cf437877543577bc0aa99256a6dc4c9743670b46bfceab5494a06628012d6eccecfe99c25d5c9e0c65814964b47026f15ba1a538444cfb7789 WHIRLPOOL c2f84b29421d0153fb1fecc87d63e00a61182e03bc0683132babca5d6c94143b4875a60a19124a36e4e6e78ce80bff9e1e81b37335700efc14084da933307e26
 DIST beautifulsoup4-4.1.3.tar.gz 131292 SHA256 a295b93b30e1126f3fd64edc106f6939349280dde2ba47cef1e5a92dad9319bf SHA512 79ed4f65bcb5599a0d278d5462a67e80f532cdddcb753e0703b28347d84512165ee0bffd09795a501f3b55e6e4869354f04efdceae9de9093a4d85381fee660e WHIRLPOOL 53713ca72b5a409b3755e28d69de65b7994fb387d21ba9a1827f3e4dda2355f318660f69a706825ecb3852447823ffb8bae2cee6bacc093e6ad73347852f29c6
+DIST beautifulsoup4-4.2.0.tar.gz 138400 SHA256 9565ce6f6d28808007ab6248c37d59a49934e358276da5d3ac211ea1ccfd0782 SHA512 50c7514f2a1de49df6300d292e1f00e746b341e9c70dbfc3508663870ddf92f5c8e0ea981dc7742f888428845e90bce2cce8b158e8548039be4c2c06ee76db97 WHIRLPOOL 95db573c6c291d27187af9403694bcff27add7ad378b105df96f988074480b7a1491710681a93f1396dfa33cfa8c493637564ab7fc228e9e92659c385aa769a2
diff --git a/dev-python/beautifulsoup/beautifulsoup-4.2.0.ebuild b/dev-python/beautifulsoup/beautifulsoup-4.2.0.ebuild
new file mode 100644
index 000000000000..35f90600d2a6
--- /dev/null
+++ b/dev-python/beautifulsoup/beautifulsoup-4.2.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/beautifulsoup/beautifulsoup-4.2.0.ebuild,v 1.1 2013/05/18 07:01:07 radhermit Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} )
+
+inherit distutils-r1
+
+MY_PN=${PN}4
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Provides pythonic idioms for iterating, searching, and modifying an HTML/XML parse tree"
+HOMEPAGE="http://www.crummy.com/software/BeautifulSoup/
+	http://pypi.python.org/pypi/beautifulsoup4"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="4"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="doc test"
+
+DEPEND="doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+	)"
+
+S=${WORKDIR}/${MY_P}
+
+python_compile_all() {
+	if use doc; then
+		emake -C doc html
+	fi
+}
+
+python_test() {
+	nosetests -w "${BUILD_DIR}"/lib || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=doc/build/html/.
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/cherrypy/cherrypy-3.2.2-r1.ebuild b/dev-python/cherrypy/cherrypy-3.2.2-r1.ebuild
index 8dc025475dcd..794b157cc1d2 100644
--- a/dev-python/cherrypy/cherrypy-3.2.2-r1.ebuild
+++ b/dev-python/cherrypy/cherrypy-3.2.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/cherrypy/cherrypy-3.2.2-r1.ebuild,v 1.4 2013/05/16 13:19:59 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cherrypy/cherrypy-3.2.2-r1.ebuild,v 1.5 2013/05/18 05:29:06 ago Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2} pypy{1_9,2_0} )
@@ -15,7 +15,7 @@ SRC_URI="http://download.cherrypy.org/${PN}/${PV}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ppc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 ~arm ia64 ppc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="test"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/dbus-python/dbus-python-1.2.0.ebuild b/dev-python/dbus-python/dbus-python-1.2.0.ebuild
index f156daa954d9..6ad0cff1d982 100644
--- a/dev-python/dbus-python/dbus-python-1.2.0.ebuild
+++ b/dev-python/dbus-python/dbus-python-1.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/dbus-python/dbus-python-1.2.0.ebuild,v 1.6 2013/05/16 13:13:56 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/dbus-python/dbus-python-1.2.0.ebuild,v 1.7 2013/05/18 05:25:51 ago Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="http://dbus.freedesktop.org/releases/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="doc examples test"
 # API docs generated with epydoc, which is python2-only
 REQUIRED_USE="doc? ( || ( python_targets_python2_6 python_targets_python2_7 ) )"
diff --git a/dev-python/django-pipeline/Manifest b/dev-python/django-pipeline/Manifest
index abe1be2109b6..d735831f74b2 100644
--- a/dev-python/django-pipeline/Manifest
+++ b/dev-python/django-pipeline/Manifest
@@ -1,2 +1,4 @@
+DIST django-pipeline-1.2.24.tar.gz 35938 SHA256 7c4f98f45f4cfda925d3b8a8848adaf41aa8f317b0c19269cc74df048ffaa611 SHA512 9912be18eedbe24615798581c252c7a23a18cebd8594877da852b07aa16f1febad209c561c41131f092ea2bbc232f2d0f954175cfa4c5ca609be0295dbcd0a22 WHIRLPOOL 669fcf99b74de76aa23d2b7b210a56bb570f1409eb2cd95a9bcccbcc9d37af212241e6dd2c88e8b2b313fd179454cb4aeaffc167fd19fa78e03219036dc99e93
 DIST django-pipeline-1.2.6.tar.gz 27135 SHA256 8de30a83ff1a1ea2683713580aae8be4ecc5bd1a4a22da6296115caaff67c60f SHA512 8dc02d1f0021179d4f430be18597f704d04c41580d523877bfe1206fa713f7ff7687f101ccd2dd50d1b729bf500015fc55303c740068d171bec41433eaf2a75a WHIRLPOOL 9847cedd633c75d04240e20b3529579701335bd29f21d3dc5f69a2146a887f7186c545775bd20b8933464957db7a9ddb329517be5a00ca2ec126524860211a84
 DIST django-pipeline-1.2.9.tar.gz 31805 SHA256 2838b7fb359112121d4fcb06c96ab5e1de8d9abbb578016747dc0c6c2cf0ae8a SHA512 d02b4a65738b794d919e88c4f57ab587c22f032d8e9e4cf951ba49580b986f4d8d6c533804e89ab06649aaed7b9893671530319ae3e627fa755f261c35a6c68c WHIRLPOOL ac574eb4fb9b69500825da7587ff6afacda9c2dd5345896a7a99c0c65ade5087d541cb465ef1121e6060d9a035bf52c310985d8bddc01443887386a6423aaee5
+DIST django-pipeline-1.3.9.tar.gz 23990 SHA256 b859d0c3cb729b9980c6c91fb509b0ff10cca1f659d1273a60676d018214ea3a SHA512 85a577752c35d3486de8b1e706aa2ed61069f425b1df65c3e003e2e4bcfce950e5277cfaf988b071a7367c9d855869985f31d59513803013819208aa1cebbee6 WHIRLPOOL 69776fb7902a24ca52de43bd0c7c1dd0b1120be927822e0c862d4d2f7ec357b8cf01ceb9ff2654af3cc297c1cde009b6b78c85b787d34ea4de56079da85985d5
diff --git a/dev-python/django-pipeline/django-pipeline-1.2.24.ebuild b/dev-python/django-pipeline/django-pipeline-1.2.24.ebuild
new file mode 100644
index 000000000000..d385cfda6207
--- /dev/null
+++ b/dev-python/django-pipeline/django-pipeline-1.2.24.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django-pipeline/django-pipeline-1.2.24.ebuild,v 1.1 2013/05/17 13:37:03 idella4 Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit distutils-r1
+
+DESCRIPTION="An asset packaging library for Django"
+HOMEPAGE="http://pypi.python.org/pypi/django-pipeline/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+RDEPEND=">=dev-python/django-1.4[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_compile_all() {
+	use doc && emake -C docs html
+	rm -f docs/_build/doctrees/environment.pickle || die
+}
+
+python_compile() {
+	# Remove tests before reaching distutils-r1_src_install
+	rm -rf tests/ || die
+	distutils-r1_python_compile
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/django-pipeline/django-pipeline-1.3.9.ebuild b/dev-python/django-pipeline/django-pipeline-1.3.9.ebuild
new file mode 100644
index 000000000000..7625c8f7f224
--- /dev/null
+++ b/dev-python/django-pipeline/django-pipeline-1.3.9.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django-pipeline/django-pipeline-1.3.9.ebuild,v 1.1 2013/05/17 13:37:03 idella4 Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
+
+inherit distutils-r1
+
+DESCRIPTION="An asset packaging library for Django"
+HOMEPAGE="http://pypi.python.org/pypi/django-pipeline/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND=">=dev-python/django-1.4.1[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/futures[$(python_gen_usedep python{2_6,2_7})] )"
+
+python_compile_all() {
+	use doc && emake -C docs html
+	rm -f docs/_build/doctrees/environment.pickle || die
+}
+
+python_compile() {
+	# Need remove tests before reaching distutils-r1_src_install
+	if ! use test; then
+		rm -rf tests/ || die
+	fi
+	distutils-r1_python_compile
+}
+
+python_test() {
+	export DJANGO_SETTINGS_MODULE="django.conf"
+	local test
+	pushd "${BUILD_DIR}"/lib/tests/tests/ > /dev/null || die
+	for test in [a-z]*.py
+	do
+		if ! "${PYTHON}" -c \
+			"from django.conf import global_settings;global_settings.SECRET_KEY='green'" ${test}
+		then
+			die "test ${test} failed under ${EPYTHON}"
+		else
+			einfo "test ${test} passed under ${EPYTHON}"
+		fi
+	done
+	cd ../../
+	rm -rf tests/ || die
+	rm -rf "${S}"/tests/ || einfo "tests folder already removed"
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/docutils-glep/docutils-glep-0.4-r1.ebuild b/dev-python/docutils-glep/docutils-glep-0.4-r1.ebuild
index 484a11862528..641987e562ca 100644
--- a/dev-python/docutils-glep/docutils-glep-0.4-r1.ebuild
+++ b/dev-python/docutils-glep/docutils-glep-0.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils-glep/docutils-glep-0.4-r1.ebuild,v 1.9 2013/05/16 15:41:32 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils-glep/docutils-glep-0.4-r1.ebuild,v 1.11 2013/05/18 05:23:44 ago Exp $
 
 EAPI=5
 
@@ -16,7 +16,7 @@ SRC_URI="mirror://gentoo/${MY_P}.tbz2"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~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"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~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=""
 
 RDEPEND=">=dev-python/docutils-0.10[${PYTHON_USEDEP}]"
diff --git a/dev-python/docutils/docutils-0.10.ebuild b/dev-python/docutils/docutils-0.10.ebuild
index 9c3cdf813f02..c868badda876 100644
--- a/dev-python/docutils/docutils-0.10.ebuild
+++ b/dev-python/docutils/docutils-0.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/docutils-0.10.ebuild,v 1.10 2013/05/16 15:41:24 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/docutils-0.10.ebuild,v 1.12 2013/05/18 05:23:36 ago Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2 GPL-3 public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~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"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~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="glep"
 
 DEPEND="dev-python/pygments[${PYTHON_USEDEP}]"
diff --git a/dev-python/fpconst/fpconst-0.7.3-r1.ebuild b/dev-python/fpconst/fpconst-0.7.3-r1.ebuild
index eae045d0ad2b..5770f24d3734 100644
--- a/dev-python/fpconst/fpconst-0.7.3-r1.ebuild
+++ b/dev-python/fpconst/fpconst-0.7.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/fpconst/fpconst-0.7.3-r1.ebuild,v 1.5 2013/05/16 16:34:57 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/fpconst/fpconst-0.7.3-r1.ebuild,v 1.7 2013/05/18 05:29:44 ago Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ DESCRIPTION="Python Module for handling IEEE 754 floating point special values"
 HOMEPAGE="http://chaco.bst.rochester.edu:8080/statcomp/projects/RStatServer/fpconst/ http://pypi.python.org/pypi/fpconst http://sourceforge.net/projects/rsoap/files/"
 SRC_URI="mirror://sourceforge/rsoap/${P}.tar.gz"
 
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 SLOT="0"
 LICENSE="GPL-2"
 IUSE=""
diff --git a/dev-python/pygame/pygame-1.9.2_pre20120101-r2.ebuild b/dev-python/pygame/pygame-1.9.2_pre20120101-r2.ebuild
index d4a8b9999ad5..d17a97b06450 100644
--- a/dev-python/pygame/pygame-1.9.2_pre20120101-r2.ebuild
+++ b/dev-python/pygame/pygame-1.9.2_pre20120101-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygame/pygame-1.9.2_pre20120101-r2.ebuild,v 1.4 2013/05/16 13:21:31 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygame/pygame-1.9.2_pre20120101-r2.ebuild,v 1.6 2013/05/18 05:29:58 ago Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_5,2_6,2_7,3_2,3_3} )
@@ -17,7 +17,7 @@ fi
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm hppa ia64 ppc ~sparc x86 ~x86-fbsd"
 IUSE="doc examples X"
 
 DEPEND="dev-python/numpy[${PYTHON_USEDEP}]
diff --git a/dev-python/pygments/pygments-1.6.ebuild b/dev-python/pygments/pygments-1.6.ebuild
index f03bee69354c..4c9cf7f8dfaa 100644
--- a/dev-python/pygments/pygments-1.6.ebuild
+++ b/dev-python/pygments/pygments-1.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygments/pygments-1.6.ebuild,v 1.6 2013/05/16 16:35:34 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygments/pygments-1.6.ebuild,v 1.8 2013/05/18 05:30:50 ago Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/python-dateutil/python-dateutil-2.1-r1.ebuild b/dev-python/python-dateutil/python-dateutil-2.1-r1.ebuild
index eaa0e36af45f..185a068f3d3c 100644
--- a/dev-python/python-dateutil/python-dateutil-2.1-r1.ebuild
+++ b/dev-python/python-dateutil/python-dateutil-2.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-dateutil/python-dateutil-2.1-r1.ebuild,v 1.3 2013/03/07 16:06:08 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-dateutil/python-dateutil-2.1-r1.ebuild,v 1.4 2013/05/17 16:37:33 jer Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="examples"
 
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]
diff --git a/dev-python/six/six-1.3.0.ebuild b/dev-python/six/six-1.3.0.ebuild
index 019ab03b9250..3729373db9f0 100644
--- a/dev-python/six/six-1.3.0.ebuild
+++ b/dev-python/six/six-1.3.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/six/six-1.3.0.ebuild,v 1.1 2013/03/24 18:23:44 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/six/six-1.3.0.ebuild,v 1.2 2013/05/17 16:36:35 jer Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_8,1_9,2_0} )
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="doc test"
 
 DEPEND="doc? ( dev-python/sphinx )
diff --git a/dev-python/south/Manifest b/dev-python/south/Manifest
index 622988259232..08f74918f46f 100644
--- a/dev-python/south/Manifest
+++ b/dev-python/south/Manifest
@@ -2,3 +2,4 @@ DIST south-0.7.2.tar.gz 110527 SHA256 003fdcc1af01fda473d0f92f7f5afc25a75756a2a0
 DIST south-0.7.3.tar.gz 112673 SHA256 ab1c72cd013fab2ddbef3100f2bf7a7f3d9fbc7169cd3e6c181060c17fdeea97 SHA512 09b8cd649523e42b4f469083fb563855c4382f68413571cad746c82b1e777c3725e595884eef339f73bde9c2ab8e137769df84ad9a912243e8cb2fcfed9a96c2 WHIRLPOOL 0839fe0bc37d508363959c70062cb3b3b3039207877265c9b1f0897470ab4f8f6f2406fe11730a21b434b9cdf84a9f7408d8a952d13cd65cfe37922c0ac24c56
 DIST south-0.7.4.tar.gz 131682 SHA256 431aea5aee19944f3c18ffc44e873aa3444c40c6492900dfed9f0b47c7938c50 SHA512 2e2b88688880acb489eb959a0798155a25fbf0ff5ee4e6a501375872e6e43ac74e6e5d191ea881f1eb56f6b5fea2b91513f73dac120d9a2f84ed1cfa488b5aab WHIRLPOOL 11550efebdd3cb785717e9a443e3910135a1a367a2a1253dc6c3d83cf75539d2aaf8b78f0261a76af129c7858e184fea4291dfb1026baa840129530ccef5ae40
 DIST south-0.7.5.tar.gz 134536 SHA256 e1f8bb50750b4e3eedf85106ea5d581488b6533885afdba91de81e07ac57ad12 SHA512 6696bb0b75132a1f6d11600834589af26008bdf53e55b1d8ab141392d68c62316abbeb02a3f850155b852232b5bc8326d2b415261eec667d5f591302ec952b70 WHIRLPOOL 417986c9fc7896f1f542c4ae49415e941bc641440d71de6c4093b87861d019342c7caca39e7ee43910ccb0dfd0ab2d8f3d9106d1f6974c4ea4d8ea8a24b3a588
+DIST south-0.7.6.tar.gz 136861 SHA256 481197a915a017291f34b0e01a004f7e1a4c1b43354809177849d46def1d9a03 SHA512 4c2dce16d30a3739347a8b8578ad32a80f256d2d9c3f3d63c82a39bc531dbb0a0c7d548c3dcf2de3bf414accf934cb87d11b4c8eac3f8abf40949a2c112d77bd WHIRLPOOL 04115995db09c7c6c06125ebc4242cef29f1a5ee8c6d99c726f5a86d5b6b7d663cf9463fce05a347213ec17c0b5a4639aa744420a9124135fc78e49060c227c6
diff --git a/dev-python/south/files/south-0.7.5-tests.patch b/dev-python/south/files/south-0.7.5-tests.patch
new file mode 100644
index 000000000000..2e4da84d975d
--- /dev/null
+++ b/dev-python/south/files/south-0.7.5-tests.patch
@@ -0,0 +1,23 @@
+http://south.aeracode.org/ticket/1256
+diff -ur south-0.7.5.orig/south/tests/db.py south-0.7.5/south/tests/db.py
+--- south/tests/db.py	2012-05-08 18:37:14.000000000 +0800
++++ south/tests/db.py	2013-05-18 15:46:23.920225709 +0800
+@@ -1,5 +1,8 @@
+-import datetime
+-import unittest
++import datetime, sys
++if sys.version_info == (2, 7):
++    import unittest
++else:
++    import unittest2 as unittest
+ 
+ from south.db import db, generic
+ from django.db import connection, models
+@@ -71,6 +74,7 @@
+         else:
+             self.fail("Just-deleted table could be selected!")
+     
++    @unittest.expectedFailure
+     def test_nonexistent_delete(self):
+         """
+         Test deletion of nonexistent tables.
diff --git a/dev-python/south/south-0.7.5-r1.ebuild b/dev-python/south/south-0.7.5-r1.ebuild
new file mode 100644
index 000000000000..f2d965e610c5
--- /dev/null
+++ b/dev-python/south/south-0.7.5-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/south/south-0.7.5-r1.ebuild,v 1.1 2013/05/18 08:26:04 idella4 Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Intelligent schema migrations for Django apps."
+HOMEPAGE="http://south.aeracode.org/"
+SRC_URI="https://bitbucket.org/andrewgodwin/south/get/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND="dev-python/django[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}]
+		 dev-python/jinja[${PYTHON_USEDEP}] )"
+
+PATCHES=( "${FILESDIR}"/${P}-tests.patch )
+
+src_unpack() {
+	default
+	mv "${WORKDIR}"/*-south-* "${S}"
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+}
+
+python_compile_all() {
+	if use test; then
+		django-admin.py-${EPYTHON} startproject southtest \
+			|| die "setting up test env failed"
+		cd southtest
+		sed -i \
+			-e "/^INSTALLED_APPS/a\    'south'," \
+			-e 's/\(django.db.backends.\)/\1sqlite3/' \
+			-e "s/\(NAME': '\)/\1test.db/" \
+			southtest/settings.py || die "sed failed"
+		echo "SKIP_SOUTH_TESTS=False" >> southtest/settings.py
+	fi
+}
+
+python_test() {
+	# http://south.aeracode.org/ticket/1256
+	cd "${S}"/southtest
+	cp -a ../south/tests/non_managed "${BUILD_DIR}"/lib/${PN}/tests/ || die
+	PYTHONPATH="${PYTHONPATH}:${S}"/${PN}/tests/ "${PYTHON}" manage.py test south \
+		|| die "tests failed"
+}
+
+pkg_postinst() {
+	elog "In order to use the south schema migrations for your Django project,"
+	elog "just add 'south' to your INSTALLED_APPS in the settings.py file."
+	elog "manage.py will now automagically offer the new functions."
+}
diff --git a/dev-python/south/south-0.7.6.ebuild b/dev-python/south/south-0.7.6.ebuild
new file mode 100644
index 000000000000..b9e40d8b484b
--- /dev/null
+++ b/dev-python/south/south-0.7.6.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/south/south-0.7.6.ebuild,v 1.1 2013/05/18 08:26:04 idella4 Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Intelligent schema migrations for Django apps."
+HOMEPAGE="http://south.aeracode.org/"
+SRC_URI="https://bitbucket.org/andrewgodwin/south/get/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND="dev-python/django"
+DEPEND="${RDEPEND}
+	dev-python/setuptools
+	doc? ( dev-python/sphinx dev-python/jinja )"
+
+# we are setting up the tests, but they fail
+
+src_unpack() {
+	default
+	mv "${WORKDIR}"/*-south-* "${S}"
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+}
+
+python_compile_all() {
+	if use test; then
+		django-admin.py-${EPYTHON} startproject southtest \
+			|| die "setting up test env failed"
+		cd southtest
+		sed -i \
+			-e "/^INSTALLED_APPS/a\    'south'," \
+			-e 's/\(django.db.backends.\)/\1sqlite3/' \
+			-e "s/\(NAME': '\)/\1test.db/" \
+			southtest/settings.py || die "sed failed"
+		echo "SKIP_SOUTH_TESTS=False" >> southtest/settings.py
+	fi
+}
+
+python_test() {
+	# http://south.aeracode.org/ticket/1256
+	cd "${S}"/southtest
+	"${PYTHON}" manage.py test south \
+		|| die "tests failed"	
+}
+
+pkg_postinst() {
+	elog "In order to use the south schema migrations for your Django project,"
+	elog "just add 'south' to your INSTALLED_APPS in the settings.py file."
+	elog "manage.py will now automagically offer the new functions."
+}
diff --git a/dev-python/tempita/tempita-0.5.1-r1.ebuild b/dev-python/tempita/tempita-0.5.1-r1.ebuild
index c6b4da670627..b19d768872dd 100644
--- a/dev-python/tempita/tempita-0.5.1-r1.ebuild
+++ b/dev-python/tempita/tempita-0.5.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/tempita/tempita-0.5.1-r1.ebuild,v 1.5 2013/05/16 16:33:03 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/tempita/tempita-0.5.1-r1.ebuild,v 1.7 2013/05/18 05:25:02 ago Exp $
 
 EAPI=5
 
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="test"
 
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/testtools/testtools-0.9.24-r1.ebuild b/dev-python/testtools/testtools-0.9.24-r1.ebuild
index 6fb7d8f71d9d..3541e856d166 100644
--- a/dev-python/testtools/testtools-0.9.24-r1.ebuild
+++ b/dev-python/testtools/testtools-0.9.24-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/testtools/testtools-0.9.24-r1.ebuild,v 1.6 2013/05/16 16:33:16 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/testtools/testtools-0.9.24-r1.ebuild,v 1.7 2013/05/18 05:25:15 ago Exp $
 
 EAPI=5
 
@@ -16,7 +16,7 @@ SRC_URI="http://launchpad.net/${PN}/${SERIES}/${PV}/+download/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 DEPEND=""
diff --git a/dev-scheme/guile-lib/Manifest b/dev-scheme/guile-lib/Manifest
index fa8c0c749189..1c11f09c5d74 100644
--- a/dev-scheme/guile-lib/Manifest
+++ b/dev-scheme/guile-lib/Manifest
@@ -1,3 +1,3 @@
 DIST guile-lib-0.1.3.tar.gz 470740 SHA256 4001919460e4c00c0924007fd38d779fd6044c34d2b9e90fbf18d0a6acb7d5ee
-DIST guile-lib-0.1.6.tar.gz 508682 SHA256 827744c7954078f1f37e0bf70252ec70b4d60c1482a3542a49bd09723cf65d12
+DIST guile-lib-0.1.6.tar.gz 508682 SHA256 827744c7954078f1f37e0bf70252ec70b4d60c1482a3542a49bd09723cf65d12 SHA512 5ccde61ae3e3fb5289d0cc03c8230adc6b9a4afb8bdc48af04270461cc9a24327bcd9f3a173ff8b0349ff3237bafe3942ac7e3416ca21731bd45f5db3dfd4ea8 WHIRLPOOL 108520a386fc63a913b6d6849985c91e0357f2147d263532d19e19551a749d9e053b64faab44902e6ff22a40e9a42a43877ef0c4179dcf890354cd28843bc259
 DIST guile-lib-0.1.9.tar.gz 499394 SHA256 563dd0bfa8acc359e5d72b2618b98f1e1c2615f44bf164947bae66d053174c8f SHA512 53a00064783c6cdc450f3130808ca57696fdcd1aa25172b448f6d18861425e1dfa9a004df0405df0629950e80c43b4aebbef28be1e75a37f0d9cd4608ecc309e WHIRLPOOL 0b958a9acede7fc5e7475ee95ca7fc208ea104af62b93f8e77c14fe0882fd0311add7b71181c293ea9ad84e97d52c213eb988da164616133b276d2238aa2de2f
diff --git a/dev-scheme/guile-lib/guile-lib-0.1.9.ebuild b/dev-scheme/guile-lib/guile-lib-0.1.9.ebuild
index 32c389d18130..e30c04bc5e42 100644
--- a/dev-scheme/guile-lib/guile-lib-0.1.9.ebuild
+++ b/dev-scheme/guile-lib/guile-lib-0.1.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/guile-lib/guile-lib-0.1.9.ebuild,v 1.5 2013/05/16 16:29:33 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-scheme/guile-lib/guile-lib-0.1.9.ebuild,v 1.6 2013/05/17 15:26:47 jer Exp $
 
 EAPI="3"
 
@@ -12,7 +12,7 @@ SRC_URI="http://download.savannah.gnu.org/releases/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 hppa ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="dev-scheme/guile[regex,deprecated]"
diff --git a/dev-tex/glossaries/Manifest b/dev-tex/glossaries/Manifest
index eb4658d0c185..5bb00010f33a 100644
--- a/dev-tex/glossaries/Manifest
+++ b/dev-tex/glossaries/Manifest
@@ -1,4 +1 @@
-DIST glossaries-3.01.zip 3863131 SHA256 4e7bcf9b2729e5c00df02c85b98a16e7f47e95d639d2ba59b44485dc219a2161 SHA512 947529912e6bc9cd28688dba23874b6c5b25afed8fd1f518307ac3cf54b894b077d9e98f09f95298abda932ae0eb6e15b736ce1ea034f9796638732c52254ae3 WHIRLPOOL 9ea6b3983226ec3f566cb1c8ef234fdd649d6515a70c8e8ace8d819b8b56af7fb7865d9ab86d3aa4f4121106bca17996327ab82afc6df30f826fe196d0e4ad97
-DIST glossaries-3.02.zip 3710217 SHA256 3f6c0a7b04ade81fab64f55f709edf09ce6854e30624c79b04ef3b08ef0a3d3c SHA512 53ae95d19f01cb523bc89076c8c50418621b5f5d32e753e7d3d5316e8a31bf295a5014ac9ae7435359eb58ac87b749ad4a890b50654daa08cf320d857871c224 WHIRLPOOL 41cc8450e647aa3b7f17fae2a052636a3d6ebf07b30ee69aa3aed2b8e6bc03a29d54eaf4922ce206f92c0e92a215e54032ab1a8561369daa89432cd50d3e1051
-DIST glossaries-3.03.zip 3723615 SHA256 348cb822690fff8120204816eb43a60f56e3583212b242d4a75637ab1e5ae217 SHA512 25d35b084d1d069c0edaeda38a48232980bf56ab4506545761082d055fa096c786ea926bd978d5f2575524d35114743f56694d9322486ddc0e3be4b11f21ada3 WHIRLPOOL 3c03ffd55ba6ad3a7bb107e6cc8c512bc33dc4353a50ba56ce7a1276dbc0762cc9cf5f326aab9e94732c425f92c7054851cee5522ca4c099130665dd21adba72
 DIST glossaries-3.04.zip 3838009 SHA256 7597d2b61b2a253e562e6b16c33c8db09ea9bd940968d3e5ac96857503f30669 SHA512 1669c2288c31f1b1b79dc9776c55c2abfc8fd216482cf6175e9f788a2882cfe997ca13c9d93d317e4d31fcc9eba8dc977bc806874179654141ca7235ec7c3889 WHIRLPOOL 003016d2a2aaa8241d17464b74d902f228e2aad2730804af3e41075a5bbd176284a7f69ed95493fdd02842a502afde680be0e22b13b27740996563deaf35ba93
diff --git a/dev-tex/glossaries/glossaries-3.01.ebuild b/dev-tex/glossaries/glossaries-3.01.ebuild
deleted file mode 100644
index fb256613db9c..000000000000
--- a/dev-tex/glossaries/glossaries-3.01.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tex/glossaries/glossaries-3.01.ebuild,v 1.12 2012/05/09 17:24:02 aballier Exp $
-
-EAPI=4
-
-inherit latex-package
-
-DESCRIPTION="Create glossaries and lists of acronyms."
-HOMEPAGE="http://www.ctan.org/tex-archive/help/Catalogue/entries/glossaries.html"
-SRC_URI="mirror://gentoo/${P}.zip"
-
-# Taken from :
-# ftp://tug.ctan.org/tex-archive/macros/latex/contrib/${PN}.zip"
-
-LICENSE="LPPL-1.2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc examples"
-
-RDEPEND="dev-lang/perl
-	dev-texlive/texlive-latexrecommended
-	>=dev-texlive/texlive-latexextra-2008"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-TEXMF="/usr/share/texmf-site"
-S=${WORKDIR}/${PN}
-
-src_install() {
-	latex-package_src_doinstall styles
-
-	dobin makeglossaries
-
-	dodoc CHANGES README
-	insinto "${TEXMF}/tex/latex/${PN}/dict"
-	doins *.dict
-	if use doc ; then
-		latex-package_src_doinstall pdf
-	fi
-	if use examples ; then
-		docinto examples
-		dodoc samples/*.tex
-	fi
-}
diff --git a/dev-tex/glossaries/glossaries-3.02.ebuild b/dev-tex/glossaries/glossaries-3.02.ebuild
deleted file mode 100644
index c591b15490a7..000000000000
--- a/dev-tex/glossaries/glossaries-3.02.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tex/glossaries/glossaries-3.02.ebuild,v 1.1 2012/09/02 04:11:48 radhermit Exp $
-
-EAPI=4
-
-inherit latex-package
-
-DESCRIPTION="Create glossaries and lists of acronyms."
-HOMEPAGE="http://www.ctan.org/tex-archive/help/Catalogue/entries/glossaries.html"
-SRC_URI="mirror://gentoo/${P}.zip"
-
-# Taken from :
-# ftp://tug.ctan.org/tex-archive/macros/latex/contrib/${PN}.zip"
-
-LICENSE="LPPL-1.2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc examples"
-
-RDEPEND="dev-lang/perl
-	dev-texlive/texlive-latexrecommended
-	>=dev-texlive/texlive-latexextra-2008"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-TEXMF="/usr/share/texmf-site"
-S=${WORKDIR}/${PN}
-
-src_install() {
-	latex-package_src_doinstall styles
-
-	dobin makeglossaries
-
-	dodoc CHANGES README
-	insinto "${TEXMF}/tex/latex/${PN}/dict"
-	doins *.dict
-	if use doc ; then
-		latex-package_src_doinstall pdf
-	fi
-	if use examples ; then
-		docinto examples
-		dodoc samples/*.tex
-	fi
-}
diff --git a/dev-tex/glossaries/glossaries-3.03.ebuild b/dev-tex/glossaries/glossaries-3.03.ebuild
deleted file mode 100644
index e35846890a2d..000000000000
--- a/dev-tex/glossaries/glossaries-3.03.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tex/glossaries/glossaries-3.03.ebuild,v 1.1 2012/10/25 08:35:29 radhermit Exp $
-
-EAPI=4
-
-inherit latex-package
-
-DESCRIPTION="Create glossaries and lists of acronyms."
-HOMEPAGE="http://www.ctan.org/tex-archive/help/Catalogue/entries/glossaries.html"
-SRC_URI="mirror://gentoo/${P}.zip"
-
-# Taken from :
-# ftp://tug.ctan.org/tex-archive/macros/latex/contrib/${PN}.zip"
-
-LICENSE="LPPL-1.2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc examples"
-
-RDEPEND="dev-lang/perl
-	dev-texlive/texlive-latexrecommended
-	>=dev-texlive/texlive-latexextra-2008"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-TEXMF="/usr/share/texmf-site"
-S=${WORKDIR}/${PN}
-
-src_install() {
-	latex-package_src_doinstall styles
-
-	dobin makeglossaries
-
-	dodoc CHANGES README
-	insinto "${TEXMF}/tex/latex/${PN}/dict"
-	doins *.dict
-	if use doc ; then
-		latex-package_src_doinstall pdf
-	fi
-	if use examples ; then
-		docinto examples
-		dodoc samples/*.tex
-	fi
-}
diff --git a/dev-tex/glossaries/glossaries-3.04.ebuild b/dev-tex/glossaries/glossaries-3.04.ebuild
index bf34c600d7ca..c9da4298c988 100644
--- a/dev-tex/glossaries/glossaries-3.04.ebuild
+++ b/dev-tex/glossaries/glossaries-3.04.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tex/glossaries/glossaries-3.04.ebuild,v 1.13 2013/02/24 17:45:00 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tex/glossaries/glossaries-3.04.ebuild,v 1.14 2013/05/17 16:26:32 aballier Exp $
 
 EAPI=5
 
@@ -17,7 +17,7 @@ IUSE="doc examples"
 
 RDEPEND="dev-lang/perl
 	dev-texlive/texlive-latexrecommended
-	>=dev-texlive/texlive-latexextra-2008"
+	>=dev-texlive/texlive-latexextra-2012"
 DEPEND="${RDEPEND}
 	app-arch/unzip"
 
diff --git a/dev-tex/serienbrief/Manifest b/dev-tex/serienbrief/Manifest
index 94e7985b9205..cbed5360d431 100644
--- a/dev-tex/serienbrief/Manifest
+++ b/dev-tex/serienbrief/Manifest
@@ -1,2 +1,3 @@
 DIST serienbrief-0.2.2.tar.gz 14602 SHA256 b97d0955b4150b2582df217be61ba4af9eae312d14d9a2cf9dc9657524440a98 SHA512 dd1f145effcb139bfd664ad77a185a44db82af03845c093c62e99b03131161d82c7a86f2982d1ca84e7e9c9f2b5a1684691b735b603296f817e06121c05d0f34 WHIRLPOOL 1ce67b57caaec02e88c5e968ba53e1944686859bca42d6c750844531080c242fdf9fdaa903d20ff36ae9ccff0bd5ef6f48ed79108d04256a44b8aff437fec6ca
 DIST serienbrief-0.2.3.tar.gz 15351 SHA256 b165b401f2da1d3584a1115fa295c7aa8bd53b62b15d75fe978315d5decc409d SHA512 3513db6dcb203addf368495f3e04c0f81ae2a7a31b6d076e5ac7b089daf5fcca21333b945c15dfe19c5efaf9944d3130cc2f89544106e69907f7d56cc2f43bac WHIRLPOOL c5e3a34ae62f772b348fe9d3238e8b79cd8d0928c2caf35985281171b2209b2f9a7a211205b4425517c9e1f1df636f3c82726e8823f0dc96807fbfdc961b1b9e
+DIST serienbrief-0.2.4.tar.gz 16666 SHA256 0ba8d11f8ab4dd7212a3beec94e721d7de93fc5713cbce758f51b82bc9fe8051 SHA512 9c941712086b52fc19761872628bb2546b638cdc4d72c02687af2a79e789b8b5ee4c321176f8b94016b7ba80b772633c0ecfcc8ece850396fbaed9da20262627 WHIRLPOOL 4f2c99b45b6178af27155d89a47ccf65a1d9259a14d55cf4c1a4be58c4e34cc393b1da7bcfc37b12c7da54b3e4637f68d54a86eecba90cdc559fd3dec16a9a20
diff --git a/dev-tex/serienbrief/serienbrief-0.2.4.ebuild b/dev-tex/serienbrief/serienbrief-0.2.4.ebuild
new file mode 100644
index 000000000000..41610674b2a3
--- /dev/null
+++ b/dev-tex/serienbrief/serienbrief-0.2.4.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-tex/serienbrief/serienbrief-0.2.4.ebuild,v 1.1 2013/05/17 15:44:14 aballier Exp $
+
+EAPI=4
+
+DESCRIPTION="Easy creation of form letters written in LaTeX"
+HOMEPAGE="http://nasauber.de/opensource/serienbrief/"
+SRC_URI="http://nasauber.de/opensource/serienbrief/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+LINS=("de")
+
+for ((i=0; i<${#LINS[@]}; i++)) do
+	IUSE="${IUSE} linguas_${LINS[$i]}"
+done
+
+KEYWORDS="~amd64 ~x86"
+
+DEPEND=""
+RDEPEND=">=dev-lang/perl-5.8.6
+	virtual/perl-Getopt-Long
+	>=virtual/perl-Term-ANSIColor-1.08
+	>=dev-perl/libintl-perl-1.16
+	virtual/latex-base"
+
+src_install() {
+	dobin bin/serienbrief
+	doman doc/serienbrief.1
+	if use linguas_de; then
+		mv po/de.mo serienbrief.mo
+		insinto /usr/share/locale/de/LC_MESSAGES
+		doins serienbrief.mo
+	fi
+	dodoc ChangeLog doc/example/*
+}
diff --git a/dev-util/debhelper/Manifest b/dev-util/debhelper/Manifest
index 82f70df4d8af..654c550b21d2 100644
--- a/dev-util/debhelper/Manifest
+++ b/dev-util/debhelper/Manifest
@@ -2,3 +2,4 @@ DIST debhelper_9.20120909.tar.gz 464785 SHA256 fabcdb9c41975ea0a1ccc66d6e065e424
 DIST debhelper_9.20130504.tar.gz 470050 SHA256 7d6ee2657430afcb477396c32c4bc170aa7fae97332045aa8f4ebec889051f01 SHA512 79ac8c1f6eee72a69b759733f7cfd75eb28a2557eb10f7f8f5fee174a62a89436923c3ab28563b6e00e874224ed050bb5981f41a822a40cd35c1b796aec053f1 WHIRLPOOL 5d71fe9308268943adb1bfd97d3b7271b1aa0ef77001ff8fbe821a0e4aa373e89d9952401ccdf323bfaed0d9fcf033f15a0200753f723c6141afee8a618f9000
 DIST debhelper_9.20130507.tar.gz 471022 SHA256 5c2d4dae513af6bcb3f63c27a1eb16c130b488b5dc7e0bf43d2e125dd5129bd8 SHA512 9f5dcbca3c0e9e3468e55914eec4abfe9e23e75e808660efda7641217365b30a60f5fc3121845d90faae26c5b57dfd89cd1c1fc6a61512abe7cbd8cd343b3112 WHIRLPOOL d56a822b74d22a4642f695b82f1fbc2fb9b0095a5fa0dd8fb5a1901cabc483d592c5687bc950a29f210a2319ec6f11c8c3b69cb8393e0eb856f8d407f668039c
 DIST debhelper_9.20130509.tar.gz 471480 SHA256 b08e071a4389f841df1dc177e60936c9ff10dea4d242bacaebc94965d93f3310 SHA512 735673a9c3b26b13babe84f014570d31d10a7f5f616ea51a8db2f826946234b9390d92ef6b4e3e8b4ac55e1fabda2dbb9728a8ad080751582de0edcba312c183 WHIRLPOOL 6a8c838dceacccc3674f3a50b1189e316e594ccad73d74526f79d2134cdd0b82650e70374f80b360245ed61290f86e72b71d7ef5e2bdfe3393ebd3e28694fe45
+DIST debhelper_9.20130516.tar.gz 471787 SHA256 72bef243c71726b28b833e1ca14b3f4619f10e809939d0b150cbb13cb4bc85b9 SHA512 c21a2171ba5568326d635ea4f4cca3dacc051e9d3e78e4b01cd2ff0753854a3be34c0259e530defa04991bb069ec4a9c6a6aa3bf2cdf033f2b4ce090dddea152 WHIRLPOOL c471b64907f1407ab4d1daa2096facabf5ee88e4b468aef5a3cac17af2e0748f78446e45df6995e8b3c462bc24cf15fffdf84ad18b47304fb677a84beabaebee
diff --git a/dev-util/debhelper/debhelper-9.20130516.ebuild b/dev-util/debhelper/debhelper-9.20130516.ebuild
new file mode 100644
index 000000000000..26c9a242b853
--- /dev/null
+++ b/dev-util/debhelper/debhelper-9.20130516.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/debhelper/debhelper-9.20130516.ebuild,v 1.1 2013/05/17 13:31:39 jer Exp $
+
+EAPI=5
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Collection of programs that can be used to automate common tasks in debian/rules"
+HOMEPAGE="http://packages.qa.debian.org/d/debhelper.html http://joeyh.name/code/debhelper/"
+SRC_URI="mirror://debian/pool/main/d/${PN}/${P/-/_}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="test"
+DH_LINGUAS=( de es fr )
+IUSE+=" ${DH_LINGUAS[@]/#/linguas_}"
+
+NLS_DEPEND=$(
+	printf "linguas_%s? ( >=app-text/po4a-0.24 )\n" ${DH_LINGUAS[@]}
+)
+
+RDEPEND="
+	>=dev-lang/perl-5.10
+	app-arch/dpkg
+	dev-perl/TimeDate
+	virtual/perl-Getopt-Long
+"
+DEPEND="${RDEPEND}
+	${NLS_DEPEND}
+	test? ( dev-perl/Test-Pod )
+"
+
+S=${WORKDIR}/${PN}
+
+src_compile() {
+	tc-export CC
+
+	local LANGS="" USE_NLS=no lingua
+	for lingua in ${DH_LINGUAS[@]}; do
+		if use linguas_${lingua}; then
+			LANGS+=" ${lingua}"
+			USE_NLS=yes
+		fi
+	done
+
+	emake USE_NLS="${USE_NLS}" LANGS="${LANGS}" build
+}
+
+src_install() {
+	default
+	dodoc doc/* debian/changelog
+	docinto examples
+	dodoc examples/*
+	local lingua
+	for manfile in *.1 *.7 ; do
+		for lingua in ${DH_LINGUAS[@]}; do
+			case ${manfile} in
+				*.${lingua}.?)
+					use linguas_${lingua} \
+						&& cp ${manfile} "${T}"/${manfile/.${lingua}/} \
+						&& doman -i18n=${lingua} "${T}"/${manfile/.${lingua}/}
+					;;
+				*)
+					doman ${manfile}
+					;;
+			esac
+		done
+	done
+}
diff --git a/games-engines/renpy/renpy-6.15.4.ebuild b/games-engines/renpy/renpy-6.15.4.ebuild
index fc2208ef9892..2b1e26cab54b 100644
--- a/games-engines/renpy/renpy-6.15.4.ebuild
+++ b/games-engines/renpy/renpy-6.15.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-engines/renpy/renpy-6.15.4.ebuild,v 1.1 2013/04/19 23:44:43 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-engines/renpy/renpy-6.15.4.ebuild,v 1.2 2013/05/17 22:14:24 ago Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_6 python2_7 )
@@ -14,7 +14,7 @@ SRC_URI="http://www.renpy.org/dl/${PV}/${P}-source.tar.bz2"
 LICENSE="MIT"
 SLOT="$(get_version_component_range 1-2)"
 MYSLOT=$(delete_all_version_separators ${SLOT})
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="development doc examples"
 REQUIRED_USE="examples? ( development )"
 
diff --git a/games-strategy/dunelegacy/dunelegacy-0.96.3.ebuild b/games-strategy/dunelegacy/dunelegacy-0.96.3.ebuild
index dc3338f4b4e1..beb77aeba0e5 100644
--- a/games-strategy/dunelegacy/dunelegacy-0.96.3.ebuild
+++ b/games-strategy/dunelegacy/dunelegacy-0.96.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/dunelegacy/dunelegacy-0.96.3.ebuild,v 1.3 2013/05/14 21:05:56 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/dunelegacy/dunelegacy-0.96.3.ebuild,v 1.4 2013/05/17 22:20:35 ago Exp $
 
 # do not use autotools related stuff in stable ebuilds
 # unless you like random breakage: 469796, 469798, 424041
@@ -16,7 +16,7 @@ SRC_URI="${SRC_URI} http://dev.gentoo.org/~hasufell/distfiles/${P}-no-autoreconf
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE="+alsa pulseaudio"
 
 RDEPEND="media-libs/libsdl[X,alsa?,audio,pulseaudio?,video]
diff --git a/kde-misc/adjustableclock/Manifest b/kde-misc/adjustableclock/Manifest
index d55755bbee48..096d5ef9f2ca 100644
--- a/kde-misc/adjustableclock/Manifest
+++ b/kde-misc/adjustableclock/Manifest
@@ -1 +1,2 @@
 DIST 92825-adjustableclock-3.2.tar.bz2 40660 SHA256 a106c1a8dcbbffa7c5d69eeea47d6a669dd3fa91ec35224755ecf16a7326cd53 SHA512 81be7662efc553526783b6e6ee2f19017300b7451cef40311f75efb531c6d47dd9017331f8ac4bbb5565d5f4b3257df87481ed9c7bf87501ceedbfeb3bb9949a WHIRLPOOL 845fe2ed207b7a4d68f502c4ef2d53c56ee2931e9539e37e772d162c7f0b9bcf316ad209365655ef0a72ee32cab3860323b4f6a80bb4450c39255f2453e361b5
+DIST 92825-adjustableclock-4.1.tar.bz2 48914 SHA256 9eed77cecd66ac65e8988ace2f547d4f925e469da607fa5dcab9c8880aa1f629 SHA512 8868eefdafbd711581da4deaa897c3a8a276f34deb29b80383ee2d94d9cc1215c374e5b01987b63767c4248471cc2595d8cff69b24cf6f7f6c4ebceb6409264b WHIRLPOOL db67ab69b0ae786a7b8aea385a04fe98383fe7861a7af46864c02a81d9ec58b0c5cae7955692bcf511444f47898c1fdf0afc1e626d437c796970995af0bbe4d6
diff --git a/kde-misc/adjustableclock/adjustableclock-4.1.ebuild b/kde-misc/adjustableclock/adjustableclock-4.1.ebuild
new file mode 100644
index 000000000000..9bbb24fde318
--- /dev/null
+++ b/kde-misc/adjustableclock/adjustableclock-4.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/adjustableclock/adjustableclock-4.1.ebuild,v 1.1 2013/05/17 18:28:40 johu Exp $
+
+EAPI=5
+
+KDE_LINGUAS_DIR="applet/locale"
+KDE_LINGUAS="de et pl pt pt_BR sv tr uk"
+inherit kde4-base
+
+DESCRIPTION="Plasmoid to show date and time in adjustable format using rich text."
+HOMEPAGE="http://kde-look.org/content/show.php/Adjustable+Clock?content=92825"
+SRC_URI="http://kde-look.org/CONTENT/content-files/92825-${P}.tar.bz2"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+SLOT="4"
+IUSE="debug"
+
+DEPEND="
+	$(add_kdebase_dep libplasmaclock)
+"
+RDEPEND="${DEPEND}
+	$(add_kdebase_dep plasma-workspace)
+"
+
+src_prepare() {
+	kde4-base_src_prepare
+
+	local lang
+	for lang in ${KDE_LINGUAS} ; do
+		if ! use linguas_${lang} ; then
+			rm ${KDE_LINGUAS_DIR}/${lang}.mo
+		fi
+	done
+}
+
+pkg_postinst() {
+	elog "Version 4.0 (and newer) is not backwards compatible with 3.x."
+	elog "All custom formats need to be exported and manually converted."
+}
diff --git a/mail-client/roundcube/Manifest b/mail-client/roundcube/Manifest
index eb76f1103617..32b9f9c6a39a 100644
--- a/mail-client/roundcube/Manifest
+++ b/mail-client/roundcube/Manifest
@@ -1,2 +1,3 @@
 DIST roundcubemail-0.8.6.tar.gz 3724565 SHA256 88128db0dc57651e08beb3c4811bc9e33aca1c39a50cfc9efb5d14b0baa17704 SHA512 b49956ab923bee773aeaa140c24c6ca012a6fae05bb2cb664e874f4bb14436d9aaedee6c2d82638f1a1db6ab58dfd8cc3b9d0144d256d07f662565c4fa287d63 WHIRLPOOL 365ac75966df392554a138e150a9c1d93f982aa7f742682147bb14d2987f110b8b8d416e0241bf3bb3221aeb8c0aa587ab6372896f7484e78df37d5d4c40f47e
 DIST roundcubemail-0.9.0.tar.gz 3711615 SHA256 7edab9579cd2a6353c30de3fcfc86da231f0a46f7ad4ce707090813173f662c2 SHA512 33a2026027e20f3ed8915806e0d8dcfd1f14143761b22c9bf452e7520c0b15304e74d34c524a3811a7c85e8f69bdfe40f44f0a92ff8993c94c68dfe56585da73 WHIRLPOOL 08d01f465304acffd49e4cf247cd84175d7ab4da872e4c8a2988015e948f37f3811a1518841fa1139667e994301afa23428eed2b2f58dec71a625f5de1ca37e1
+DIST roundcubemail-0.9.1.tar.gz 3734373 SHA256 95962f90eebcf17521f66f4057a030b3eabd4a8cb5748f22bf0d4518816b8938 SHA512 1ec3fc475746b89a865786e075366e1de88a959cbd44738b807693b92be9a615cee6ce81e35e713d486ef9aa1f0618dc231674ba7dc911551cc807005083b0be WHIRLPOOL 96386c18c9af366dc4ae35dbb4152c4d056b50af3003c70bb418fd5ea19134bdd336696d6e3746839789e71bf88c6be685e86956c54d6047c5873fd934c9a627
diff --git a/mail-client/roundcube/roundcube-0.9.1.ebuild b/mail-client/roundcube/roundcube-0.9.1.ebuild
new file mode 100644
index 000000000000..a8a7974dde85
--- /dev/null
+++ b/mail-client/roundcube/roundcube-0.9.1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/roundcube/roundcube-0.9.1.ebuild,v 1.1 2013/05/18 02:00:29 radhermit Exp $
+
+EAPI=5
+
+inherit webapp
+
+MY_PN=${PN}mail
+MY_P=${MY_PN}-${PV/_/-}
+
+DESCRIPTION="A browser-based multilingual IMAP client with an application-like user interface"
+HOMEPAGE="http://roundcube.net"
+SRC_URI="mirror://sourceforge/${MY_PN}/${MY_P}.tar.gz"
+
+# roundcube is GPL-licensed, the rest of the licenses here are
+# for bundled PEAR components, googiespell and utf8.class.php
+LICENSE="GPL-3 BSD PHP-2.02 PHP-3 MIT public-domain"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="ldap +mysql postgres sqlite ssl spell"
+
+RDEPEND="virtual/httpd-php
+	>=dev-lang/php-5.3[crypt,gd,iconv,json,ldap?,pdo,postgres?,session,sockets,ssl?,xml,unicode]
+	mysql? ( || ( dev-lang/php[mysql] dev-lang/php[mysqli] ) )
+	spell? ( dev-lang/php[curl,spell] )
+	sqlite? ( || ( dev-lang/php[sqlite] dev-lang/php[sqlite3] ) )
+	>=dev-php/PEAR-Mail_Mime-1.8.1
+	>=dev-php/PEAR-Net_SMTP-1.4.2
+	>=dev-php/PEAR-Net_IDNA2-0.1.1
+	>=dev-php/PEAR-Auth_SASL-1.0.3"
+
+need_httpd_cgi
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	cp config/db.inc.php{.dist,} || die
+	cp config/main.inc.php{.dist,} || die
+
+	# Remove bundled PEAR packages
+	rm -r program/lib/{Auth,Mail,Net,PEAR*} || die
+}
+
+src_install() {
+	webapp_src_preinst
+	dodoc CHANGELOG INSTALL README.md UPGRADING
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r [[:lower:]]* SQL
+	doins .htaccess
+
+	webapp_serverowned "${MY_HTDOCSDIR}"/logs
+	webapp_serverowned "${MY_HTDOCSDIR}"/temp
+
+	webapp_configfile "${MY_HTDOCSDIR}"/config/{db,main}.inc.php
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en-0.6.txt
+	webapp_postupgrade_txt en "${FILESDIR}"/postupgrade-en-0.6.txt
+	webapp_postupgrade_txt en UPGRADING
+	webapp_src_install
+}
diff --git a/mail-filter/dovecot-antispam/dovecot-antispam-2.0_pre20120226.ebuild b/mail-filter/dovecot-antispam/dovecot-antispam-2.0_pre20120226.ebuild
index 837c78ac3718..9266a895abff 100644
--- a/mail-filter/dovecot-antispam/dovecot-antispam-2.0_pre20120226.ebuild
+++ b/mail-filter/dovecot-antispam/dovecot-antispam-2.0_pre20120226.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/dovecot-antispam/dovecot-antispam-2.0_pre20120226.ebuild,v 1.1 2012/03/03 19:51:09 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/dovecot-antispam/dovecot-antispam-2.0_pre20120226.ebuild,v 1.2 2013/05/17 20:31:20 radhermit Exp $
 
 EAPI="4"
 
@@ -15,7 +15,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND=">=net-mail/dovecot-2.1.0"
+DEPEND="=net-mail/dovecot-2.1*"
 RDEPEND="${DEPEND}"
 
 DOCS=( README )
diff --git a/mail-filter/dovecot-antispam/dovecot-antispam-2.0_pre20130429.ebuild b/mail-filter/dovecot-antispam/dovecot-antispam-2.0_pre20130429.ebuild
index e6ce1b89fd71..78c26538bca2 100644
--- a/mail-filter/dovecot-antispam/dovecot-antispam-2.0_pre20130429.ebuild
+++ b/mail-filter/dovecot-antispam/dovecot-antispam-2.0_pre20130429.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/dovecot-antispam/dovecot-antispam-2.0_pre20130429.ebuild,v 1.2 2013/05/16 21:08:32 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/dovecot-antispam/dovecot-antispam-2.0_pre20130429.ebuild,v 1.3 2013/05/17 20:31:20 radhermit Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-DEPEND=">=net-mail/dovecot-2.1.0"
+DEPEND=">=net-mail/dovecot-2.1.16"
 RDEPEND="${DEPEND}"
 
 DOCS=( README )
diff --git a/media-fonts/culmus/culmus-0.120-r4.ebuild b/media-fonts/culmus/culmus-0.120-r4.ebuild
index 9e26a5661296..d5ed2623749c 100644
--- a/media-fonts/culmus/culmus-0.120-r4.ebuild
+++ b/media-fonts/culmus/culmus-0.120-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/culmus/culmus-0.120-r4.ebuild,v 1.5 2013/05/16 16:36:33 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/culmus/culmus-0.120-r4.ebuild,v 1.7 2013/05/18 05:32:55 ago Exp $
 
 EAPI="2"
 
@@ -37,7 +37,7 @@ SRC_URI+=" taamey? ( $(printf "http://culmus.sourceforge.net/taamim/%s.zip " ${T
 
 LICENSE="|| ( GPL-2 LICENSE-BITSTREAM ) ancient? ( MIT ) fancy? ( GPL-2 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="ancient fancy fontforge taamey"
 
 FONT_CONF=( "${T}/65-culmus.conf" )
diff --git a/media-gfx/dpic/Manifest b/media-gfx/dpic/Manifest
index 573f8efdb9ff..50ec416763fa 100644
--- a/media-gfx/dpic/Manifest
+++ b/media-gfx/dpic/Manifest
@@ -1 +1,2 @@
-DIST dpic-20090713.tar.gz 301085 SHA256 2cb4ef4434c88ffd73910bf97e657a976ed6b0f243f0fc7bd77a4bb9f79cfc6c
+DIST dpic-20090713.tar.gz 301085 SHA256 2cb4ef4434c88ffd73910bf97e657a976ed6b0f243f0fc7bd77a4bb9f79cfc6c SHA512 d587a5f9abab4d29d479c2d7faab8364ce3e1631c0212732accdefa3702f4d06070af0fad7b58999035ade524b9d1e77c031d7f83089ee253320d9818500abc1 WHIRLPOOL e37a05cd2ce3e54ed132f75343e1b972ed615f7f7768287f023c7bebdd78cb52e3222e6e040cb0e8864b4711a973f46cb1248347912ca6ce85db202171e3ce54
+DIST dpic-2013.03.10.tar.gz 583366 SHA256 3ba961675f23ee2b9c035b60e43ce672007ad29a8ab810404f64a4098edcdac1 SHA512 a1c29f32bddeabfcfba1e0253ab502ca2c32c9ad4d490c8b2a7569643972a65ebdc26215888aaba7b2954b217e1667b469d49affb0a771832e98aa5ad25dd9f5 WHIRLPOOL e01915a94a6cd587945e12dc15eed23607914e219f4ef8586d8c221201d6073fff749dfd0838c8adc23848db59b1015e01cffad0f802b386e20a671391a96780
diff --git a/media-gfx/dpic/dpic-20130310.ebuild b/media-gfx/dpic/dpic-20130310.ebuild
new file mode 100644
index 000000000000..6099d89cb4a0
--- /dev/null
+++ b/media-gfx/dpic/dpic-20130310.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/dpic/dpic-20130310.ebuild,v 1.1 2013/05/17 16:37:11 aballier Exp $
+
+EAPI=5
+
+inherit toolchain-funcs
+
+DESCRIPTION="Converts PIC plots into pstricks, PGF/TikZ, PostScript, MetaPost and TeX"
+HOMEPAGE="http://ece.uwaterloo.ca/~aplevich/dpic"
+SRC_URI="https://ece.uwaterloo.ca/~aplevich/dpic/${PN}-2013.03.10.tar.gz"
+
+LICENSE="BSD-2 CC-BY-3.0 GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+DEPEND=""
+RDEPEND=""
+
+S="${WORKDIR}/${PN}"
+
+src_compile () {
+	emake CC="$(tc-getCC)"
+}
+
+src_install () {
+	dobin dpic
+	doman doc/dpic.1
+	dodoc README CHANGES doc/dpicdoc.pdf doc/gpic.pdf
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/media-gfx/pydot/pydot-1.0.28-r1.ebuild b/media-gfx/pydot/pydot-1.0.28-r1.ebuild
index 52f3766c5ff4..06fc72c0f95a 100644
--- a/media-gfx/pydot/pydot-1.0.28-r1.ebuild
+++ b/media-gfx/pydot/pydot-1.0.28-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/pydot/pydot-1.0.28-r1.ebuild,v 1.6 2013/05/16 16:36:45 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/pydot/pydot-1.0.28-r1.ebuild,v 1.7 2013/05/18 05:33:38 ago Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="http://pydot.googlecode.com/files/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
 IUSE=""
 
 RDEPEND="virtual/pyparsing[${PYTHON_USEDEP}]
diff --git a/media-libs/libcdr/Manifest b/media-libs/libcdr/Manifest
index 45a20cf7fcd8..e873a0ca5c6a 100644
--- a/media-libs/libcdr/Manifest
+++ b/media-libs/libcdr/Manifest
@@ -1 +1,2 @@
 DIST libcdr-0.0.13.tar.xz 570080 SHA256 a14bb9a91f667616aac04d5d02f8e0cca02a49baa988906ab8d80a787eb918c9 SHA512 70ae9ea6f4b60d34b980cacc33159abc2ad400ed9cd75591e75646f546947c0c4c7cb6b715c4ce947916a8bef49a868fd5a4be1c726bc25838569d22b6b45831 WHIRLPOOL b095cf162592c0c83e9db432bd6e739afd7e4e618e0e589f8aa5b8f00d13e3bf1b28447d18f3236ff6cd6a6bb648c7ee0087d1eb2db376be3c0c0447eb83ef44
+DIST libcdr-0.0.14.tar.xz 570728 SHA256 720b693ba5e777f099f41ecd40418a16674ab29d823f7d62a23be170781dd8a0 SHA512 08f5cdf6926f2305ffc24ca7f03709c4f6045ed6c3aad15bc524b8c8d6bf1b873bb8bf9acd39ca112f0f51ba5324f1cf6a72d2f04ec9139d6c61a58a337a92a8 WHIRLPOOL fad944466269e1b8794fa7a3bd4ab471c5b0ff8cf0122c9eeaf109f51ad7092334e326c7e60c0ef1a7ae670425e2a5edf70c742bca9fc8c52a042322e66e058d
diff --git a/media-libs/libcdr/libcdr-0.0.14.ebuild b/media-libs/libcdr/libcdr-0.0.14.ebuild
new file mode 100644
index 000000000000..278b6f235366
--- /dev/null
+++ b/media-libs/libcdr/libcdr-0.0.14.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libcdr/libcdr-0.0.14.ebuild,v 1.1 2013/05/17 14:31:44 scarabeus Exp $
+
+EAPI=5
+
+EGIT_REPO_URI="git://anongit.freedesktop.org/git/libreoffice/libcdr/"
+inherit base eutils
+[[ ${PV} == 9999 ]] && inherit autotools git-2
+
+DESCRIPTION="Library parsing the Corel cdr documents"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/libcdr"
+[[ ${PV} == 9999 ]] || SRC_URI="http://dev-www.libreoffice.org/src/${P}.tar.xz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+[[ ${PV} == 9999 ]] || KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE="doc static-libs"
+
+RDEPEND="
+	app-text/libwpd:0.9
+	app-text/libwpg:0.2
+	dev-libs/icu:=
+	media-libs/lcms:2
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+	sys-devel/libtool
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+
+src_prepare() {
+	base_src_prepare
+	[[ -d m4 ]] || mkdir "m4"
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
+src_configure() {
+	econf \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		$(use_enable static-libs static) \
+		--disable-werror \
+		$(use_with doc docs)
+}
+
+src_install() {
+	default
+	prune_libtool_files --all
+}
diff --git a/media-libs/raptor/raptor-2.0.9.ebuild b/media-libs/raptor/raptor-2.0.9.ebuild
index a8675b79ce1a..3de4167311d6 100644
--- a/media-libs/raptor/raptor-2.0.9.ebuild
+++ b/media-libs/raptor/raptor-2.0.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/raptor/raptor-2.0.9.ebuild,v 1.9 2013/05/16 15:49:01 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/raptor/raptor-2.0.9.ebuild,v 1.10 2013/05/18 05:28:03 ago Exp $
 
 EAPI=5
 inherit eutils libtool
@@ -14,7 +14,7 @@ SRC_URI="http://download.librdf.org/source/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0 GPL-2 LGPL-2.1"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+curl debug json static-libs unicode"
 
 RDEPEND="dev-libs/libxml2
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index e00b618c14cf..fb5a5f5f259a 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Fri, 17 May 2013 12:06:54 +0000
+Sat, 18 May 2013 08:36:56 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index faaf5f13eb96..97e2deea1b84 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Fri, 17 May 2013 12:06:55 +0000
+Sat, 18 May 2013 08:36:57 +0000
diff --git a/metadata/md5-cache/app-admin/emacs-updater-1.13 b/metadata/md5-cache/app-admin/emacs-updater-1.13
index 43d6f8933966..b838b50329d4 100644
--- a/metadata/md5-cache/app-admin/emacs-updater-1.13
+++ b/metadata/md5-cache/app-admin/emacs-updater-1.13
@@ -3,9 +3,9 @@ DEPEND=app-arch/xz-utils
 DESCRIPTION=Rebuild Emacs packages
 EAPI=5
 HOMEPAGE=http://www.gentoo.org/proj/en/lisp/emacs/
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~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
+KEYWORDS=~alpha amd64 arm hppa ia64 ~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=GPL-2+
 RDEPEND=>=app-portage/portage-utils-0.3 virtual/emacs
 SLOT=0
 SRC_URI=mirror://gentoo/emacs-updater-1.13.tar.xz
-_md5_=b2ab6d5db3f9bd15a0a435e1bd3177a3
+_md5_=4d53ea23f3dbd76b432d7ae2ab2643a3
diff --git a/metadata/md5-cache/app-admin/haskell-updater-1.2.0.9 b/metadata/md5-cache/app-admin/haskell-updater-1.2.0.9
index 214e375d7f18..27c25ab8b242 100644
--- a/metadata/md5-cache/app-admin/haskell-updater-1.2.0.9
+++ b/metadata/md5-cache/app-admin/haskell-updater-1.2.0.9
@@ -3,10 +3,10 @@ DEPEND=>=dev-lang/ghc-6.12.1
 DESCRIPTION=Rebuild Haskell dependencies in Gentoo
 EAPI=4
 HOMEPAGE=http://haskell.org/haskellwiki/Gentoo#haskell-updater
-KEYWORDS=~alpha ~amd64 ~ia64 ppc ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ia64 ppc ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=|| ( >=sys-apps/portage-2.1.6 sys-apps/pkgcore sys-apps/paludis )
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/haskell-updater/1.2.0.9/haskell-updater-1.2.0.9.tar.gz
 _eclasses_=eutils	b8fdb86895c268cca7ae1626264a30f4	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	0fe5ac58a8b877fae07bb258b762852e	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=b486fece56f52c09ff3b2384ce178a12
+_md5_=450a2dabfead78a1e9467dbfd2c975ce
diff --git a/metadata/md5-cache/app-arch/lbzip2-2.2-r1 b/metadata/md5-cache/app-arch/lbzip2-2.2-r1
index 6598a3026c15..f900dc57513c 100644
--- a/metadata/md5-cache/app-arch/lbzip2-2.2-r1
+++ b/metadata/md5-cache/app-arch/lbzip2-2.2-r1
@@ -3,10 +3,10 @@ DESCRIPTION=Parallel bzip2 utility
 EAPI=4
 HOMEPAGE=https://github.com/kjn/lbzip2/
 IUSE=debug symlink
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-3
 RDEPEND=symlink? ( !app-arch/pbzip2[symlink] )
 SLOT=0
 SRC_URI=mirror://github/kjn/lbzip2/lbzip2-2.2.tar.gz
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	autotools-utils	7c11ec0c4b75b50282ec943ef9df2b17	eutils	b8fdb86895c268cca7ae1626264a30f4	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=b693fb2bc1d3be0bf8a06d2bd3bda337
+_md5_=eb30d837ee35091a9d4b70a9c74457d8
diff --git a/metadata/md5-cache/app-dicts/aspell-da-1.7.42 b/metadata/md5-cache/app-dicts/aspell-da-1.7.42
index 93a1c40f31b5..90f4cb670d0a 100644
--- a/metadata/md5-cache/app-dicts/aspell-da-1.7.42
+++ b/metadata/md5-cache/app-dicts/aspell-da-1.7.42
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile install
 DEPEND=>=app-text/aspell-0.50
 DESCRIPTION=Danish language dictionary for aspell
 HOMEPAGE=http://da.speling.org
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos
+KEYWORDS=~alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos
 LICENSE=GPL-2
 RDEPEND=>=app-text/aspell-0.50
 SLOT=0
 SRC_URI=http://da.speling.org/filer/new_aspell-da-1.7.42.tar.bz2
 _eclasses_=aspell-dict	8fec0fbbba24fb7023cdc7be53b64548
-_md5_=0443d73a04035634c05cc37812df56cd
+_md5_=ae683e0df9f7558ef6a00534946e49f9
diff --git a/metadata/md5-cache/app-editors/emacs-24.3-r1 b/metadata/md5-cache/app-editors/emacs-24.3-r1
index a3f509f44ff7..2280ef7ef9da 100644
--- a/metadata/md5-cache/app-editors/emacs-24.3-r1
+++ b/metadata/md5-cache/app-editors/emacs-24.3-r1
@@ -4,11 +4,11 @@ DESCRIPTION=The extensible, customizable, self-documenting real-time display edi
 EAPI=5
 HOMEPAGE=http://www.gnu.org/software/emacs/
 IUSE=alsa aqua athena dbus games gconf gif gnutls gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm
-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
+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
 LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
 RDEPEND=sys-libs/ncurses >=app-admin/eselect-emacs-1.2 >=app-emacs/emacs-common-gentoo-1.3-r3[games?,X?] net-libs/liblockfile hesiod? ( net-dns/hesiod ) kerberos? ( virtual/krb5 ) alsa? ( media-libs/alsa-lib ) gpm? ( sys-libs/gpm ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) selinux? ( sys-libs/libselinux ) X? ( x11-libs/libXmu x11-libs/libXt x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib ) jpeg? ( virtual/jpeg ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2 ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( Xaw3d? ( x11-libs/libXaw3d ) !Xaw3d? ( athena? ( x11-libs/libXaw ) ) ) ) ) !<app-editors/emacs-vcs-24.3
 REQUIRED_USE=?? ( aqua X )
 SLOT=24
 SRC_URI=mirror://gnu/emacs/emacs-24.3.tar.xz mirror://gentoo/emacs-24.3-patches-1.tar.xz
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	b8fdb86895c268cca7ae1626264a30f4	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	readme.gentoo	2705553a0f031d715b57878cc0d9bf64	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=ec7727d9e55eeb0ea570fca3ce2545cc
+_md5_=fd6250f248532b2a053af4af484876a2
diff --git a/metadata/md5-cache/app-emacs/autoconf-mode-2.69 b/metadata/md5-cache/app-emacs/autoconf-mode-2.69
index fc8a6617e856..65e6ccdce5f9 100644
--- a/metadata/md5-cache/app-emacs/autoconf-mode-2.69
+++ b/metadata/md5-cache/app-emacs/autoconf-mode-2.69
@@ -3,10 +3,10 @@ DEPEND=>=virtual/emacs-21
 DESCRIPTION=Emacs major modes for editing autoconf and autotest input
 EAPI=4
 HOMEPAGE=http://www.gnu.org/software/autoconf/autoconf.html
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos
+KEYWORDS=~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos
 LICENSE=GPL-3
 RDEPEND=>=virtual/emacs-21
 SLOT=0
 SRC_URI=mirror://gnu/autoconf/autoconf-2.69.tar.xz
 _eclasses_=elisp	ae11b438eee6c692e6c94c9a86999514	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	b8fdb86895c268cca7ae1626264a30f4	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=9cb6fb06c8a614389ad85c33c306a915
+_md5_=114cb3e002eed774d4afb30dca9f994c
diff --git a/metadata/md5-cache/app-emacs/emacs-daemon-0.20 b/metadata/md5-cache/app-emacs/emacs-daemon-0.20
index 2eff6b5ddaa5..9dd035b126d6 100644
--- a/metadata/md5-cache/app-emacs/emacs-daemon-0.20
+++ b/metadata/md5-cache/app-emacs/emacs-daemon-0.20
@@ -3,10 +3,10 @@ DEPEND=>=virtual/emacs-23 >=virtual/emacs-21
 DESCRIPTION=Gentoo support for Emacs running as a server in the background
 EAPI=5
 HOMEPAGE=http://www.gentoo.org/proj/en/lisp/emacs/
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd
 LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23 >=virtual/emacs-21
 SLOT=0
 SRC_URI=mirror://gentoo/emacs-daemon-0.20.tar.xz
 _eclasses_=elisp	ae11b438eee6c692e6c94c9a86999514	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	b8fdb86895c268cca7ae1626264a30f4	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=d8e98d9959b4ed827e394d66dfa15858
+_md5_=16e19ce2ec1ba2fdee38358dbd379eba
diff --git a/metadata/md5-cache/app-emacs/gentoo-syntax-1.21 b/metadata/md5-cache/app-emacs/gentoo-syntax-1.21
index b3796d32cd9c..5304fcd381bc 100644
--- a/metadata/md5-cache/app-emacs/gentoo-syntax-1.21
+++ b/metadata/md5-cache/app-emacs/gentoo-syntax-1.21
@@ -3,10 +3,10 @@ DEPEND=>=virtual/emacs-21
 DESCRIPTION=Emacs modes for editing ebuilds and other Gentoo specific files
 EAPI=5
 HOMEPAGE=http://www.gentoo.org/proj/en/lisp/emacs/
-KEYWORDS=~alpha amd64 hppa ~ia64 ppc ppc64 ~sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=~alpha amd64 hppa ia64 ppc ppc64 ~sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-21
 SLOT=0
 SRC_URI=mirror://gentoo/gentoo-syntax-1.21.tar.xz
 _eclasses_=elisp	ae11b438eee6c692e6c94c9a86999514	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	b8fdb86895c268cca7ae1626264a30f4	multilib	892e597faee02a5b94eb02ab512e7622	readme.gentoo	2705553a0f031d715b57878cc0d9bf64	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=8a2b14eb1b796f90baf6d93387ff4439
+_md5_=567ff961b5c5937c9c283978dbfefbf9
diff --git a/metadata/md5-cache/app-emulation/xen-tools-4.2.1-r3 b/metadata/md5-cache/app-emulation/xen-tools-4.2.1-r3
index 7552ac9e8163..fbcbff53ffd5 100644
--- a/metadata/md5-cache/app-emulation/xen-tools-4.2.1-r3
+++ b/metadata/md5-cache/app-emulation/xen-tools-4.2.1-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst prepare setup
-DEPEND=dev-libs/yajl dev-python/lxml[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] dev-python/pypam[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] dev-python/pyxml[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] sys-libs/zlib sys-power/iasl ocaml? ( dev-ml/findlib ) hvm? ( media-libs/libsdl ) python_single_target_python2_6? ( dev-lang/python:2.6[xml,threads] ) python_single_target_python2_7? ( dev-lang/python:2.7[xml,threads] ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] api? ( dev-libs/libxml2 net-misc/curl ) python_single_target_python2_6? ( dev-lang/python:2.6[xml,threads] ) python_single_target_python2_7? ( dev-lang/python:2.7[xml,threads] ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] pygrub? ( python_single_target_python2_6? ( dev-lang/python:2.6[ncurses] ) python_single_target_python2_7? ( dev-lang/python:2.7[ncurses] ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) sys-devel/bin86 sys-devel/dev86 dev-lang/perl app-misc/pax-utils doc? ( app-doc/doxygen dev-tex/latex2html[png,gif] media-gfx/transfig media-gfx/graphviz dev-tex/xcolor dev-texlive/texlive-latexextra virtual/latex-base dev-tex/latexmk dev-texlive/texlive-latex dev-texlive/texlive-pictures dev-texlive/texlive-latexrecommended ) hvm? ( x11-proto/xproto ) virtual/pkgconfig
+DEPEND=dev-libs/yajl dev-python/lxml[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] dev-python/pypam[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] dev-python/pyxml[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] sys-libs/zlib sys-power/iasl ocaml? ( dev-ml/findlib ) hvm? ( media-libs/libsdl ) python_single_target_python2_6? ( dev-lang/python:2.6[xml,threads] ) python_single_target_python2_7? ( dev-lang/python:2.7[xml,threads] ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] api? ( dev-libs/libxml2 net-misc/curl ) python_single_target_python2_6? ( dev-lang/python:2.6[xml,threads] ) python_single_target_python2_7? ( dev-lang/python:2.7[xml,threads] ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] pygrub? ( python_single_target_python2_6? ( dev-lang/python:2.6[ncurses] ) python_single_target_python2_7? ( dev-lang/python:2.7[ncurses] ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) sys-devel/bin86 sys-devel/dev86 dev-lang/perl app-misc/pax-utils doc? ( app-doc/doxygen dev-tex/latex2html[png,gif] media-gfx/transfig media-gfx/graphviz dev-tex/xcolor dev-texlive/texlive-latexextra virtual/latex-base dev-tex/latexmk dev-texlive/texlive-latex dev-texlive/texlive-pictures dev-texlive/texlive-latexrecommended ) hvm? ( x11-proto/xproto ) qemu? ( >=sys-apps/texinfo-5 ) virtual/pkgconfig
 DESCRIPTION=Xend daemon and tools
 EAPI=5
 HOMEPAGE=http://xen.org/
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://bits.xensource.com/oss-xen/release/4.2.1/xen-4.2.1.tar.gz http://dev.gentoo.org/~idella4/tarballs/ipxe.tar.gz http://dev.gentoo.org/~idella4/tarballs/seabios-0-20121121.tar.bz2
 _eclasses_=eutils	b8fdb86895c268cca7ae1626264a30f4	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	python-single-r1	432ebc09c192bb4c808568896d6145d2	python-utils-r1	9fc80a4f06f33ede447b5647fddca301	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=e519b19cd84d2523983c2b2d79af41df
+_md5_=eed46d60a45f1fd999113191d15a7206
diff --git a/metadata/md5-cache/app-emulation/xen-tools-4.2.2-r1 b/metadata/md5-cache/app-emulation/xen-tools-4.2.2-r1
index 27633c6bab59..ab264c9163cb 100644
--- a/metadata/md5-cache/app-emulation/xen-tools-4.2.2-r1
+++ b/metadata/md5-cache/app-emulation/xen-tools-4.2.2-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile install postinst prepare setup
-DEPEND=dev-libs/lzo:2 dev-libs/yajl dev-python/lxml[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] dev-python/pypam[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] dev-python/pyxml[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] sys-libs/zlib sys-power/iasl dev-ml/findlib hvm? ( media-libs/libsdl ) python_single_target_python2_6? ( dev-lang/python:2.6[xml,threads] ) python_single_target_python2_7? ( dev-lang/python:2.7[xml,threads] ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] api? ( dev-libs/libxml2 net-misc/curl ) python_single_target_python2_6? ( dev-lang/python:2.6[xml,threads] ) python_single_target_python2_7? ( dev-lang/python:2.7[xml,threads] ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] pygrub? ( python_single_target_python2_6? ( dev-lang/python:2.6[ncurses] ) python_single_target_python2_7? ( dev-lang/python:2.7[ncurses] ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) sys-devel/bin86 sys-devel/dev86 dev-lang/perl app-misc/pax-utils doc? ( app-doc/doxygen dev-tex/latex2html[png,gif] media-gfx/transfig media-gfx/graphviz dev-tex/xcolor dev-texlive/texlive-latexextra virtual/latex-base dev-tex/latexmk dev-texlive/texlive-latex dev-texlive/texlive-pictures dev-texlive/texlive-latexrecommended ) hvm? ( x11-proto/xproto ) virtual/pkgconfig
+DEPEND=dev-libs/lzo:2 dev-libs/yajl dev-python/lxml[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] dev-python/pypam[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] dev-python/pyxml[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] sys-libs/zlib sys-power/iasl dev-ml/findlib hvm? ( media-libs/libsdl ) python_single_target_python2_6? ( dev-lang/python:2.6[xml,threads] ) python_single_target_python2_7? ( dev-lang/python:2.7[xml,threads] ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] api? ( dev-libs/libxml2 net-misc/curl ) python_single_target_python2_6? ( dev-lang/python:2.6[xml,threads] ) python_single_target_python2_7? ( dev-lang/python:2.7[xml,threads] ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] pygrub? ( python_single_target_python2_6? ( dev-lang/python:2.6[ncurses] ) python_single_target_python2_7? ( dev-lang/python:2.7[ncurses] ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) sys-devel/bin86 sys-devel/dev86 dev-lang/perl app-misc/pax-utils doc? ( app-doc/doxygen dev-tex/latex2html[png,gif] media-gfx/transfig media-gfx/graphviz dev-tex/xcolor dev-texlive/texlive-latexextra virtual/latex-base dev-tex/latexmk dev-texlive/texlive-latex dev-texlive/texlive-pictures dev-texlive/texlive-latexrecommended ) hvm? ( x11-proto/xproto ) qemu? ( >=sys-apps/texinfo-5 ) virtual/pkgconfig
 DESCRIPTION=Xend daemon and tools
 EAPI=5
 HOMEPAGE=http://xen.org/
-IUSE=api custom-cflags debug doc flask hvm qemu pygrub screen static-libs xend python_targets_python2_6 python_targets_python2_7 python_single_target_python2_6 python_single_target_python2_7
+IUSE=api custom-cflags debug doc flask hvm qemu ocaml pygrub screen static-libs xend python_targets_python2_6 python_targets_python2_7 python_single_target_python2_6 python_single_target_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=dev-libs/lzo:2 dev-libs/yajl dev-python/lxml[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] dev-python/pypam[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] dev-python/pyxml[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] sys-libs/zlib sys-power/iasl dev-ml/findlib hvm? ( media-libs/libsdl ) python_single_target_python2_6? ( dev-lang/python:2.6[xml,threads] ) python_single_target_python2_7? ( dev-lang/python:2.7[xml,threads] ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] api? ( dev-libs/libxml2 net-misc/curl ) python_single_target_python2_6? ( dev-lang/python:2.6[xml,threads] ) python_single_target_python2_7? ( dev-lang/python:2.7[xml,threads] ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] pygrub? ( python_single_target_python2_6? ( dev-lang/python:2.6[ncurses] ) python_single_target_python2_7? ( dev-lang/python:2.7[ncurses] ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) sys-apps/iproute2 net-misc/bridge-utils screen? ( app-misc/screen app-admin/logrotate ) virtual/udev
+RDEPEND=dev-libs/lzo:2 dev-libs/yajl dev-python/lxml[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] dev-python/pypam[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] dev-python/pyxml[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] sys-libs/zlib sys-power/iasl dev-ml/findlib hvm? ( media-libs/libsdl ) python_single_target_python2_6? ( dev-lang/python:2.6[xml,threads] ) python_single_target_python2_7? ( dev-lang/python:2.7[xml,threads] ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] api? ( dev-libs/libxml2 net-misc/curl ) python_single_target_python2_6? ( dev-lang/python:2.6[xml,threads] ) python_single_target_python2_7? ( dev-lang/python:2.7[xml,threads] ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] pygrub? ( python_single_target_python2_6? ( dev-lang/python:2.6[ncurses] ) python_single_target_python2_7? ( dev-lang/python:2.7[ncurses] ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) sys-apps/iproute2 net-misc/bridge-utils ocaml? ( >=dev-lang/ocaml-4 ) screen? ( app-misc/screen app-admin/logrotate ) virtual/udev
 REQUIRED_USE=hvm? ( qemu )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://bits.xensource.com/oss-xen/release/4.2.2/xen-4.2.2.tar.gz http://dev.gentoo.org/~idella4/tarballs/ipxe.tar.gz http://dev.gentoo.org/~idella4/tarballs/seabios-0-20121121.tar.bz2
 _eclasses_=eutils	b8fdb86895c268cca7ae1626264a30f4	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	python-single-r1	432ebc09c192bb4c808568896d6145d2	python-utils-r1	9fc80a4f06f33ede447b5647fddca301	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=18ab107237f003e8f7b00177a401b758
+_md5_=a3ef902c4e6b0943567614444cbaa2d4
diff --git a/metadata/md5-cache/app-misc/clockywock-0.2.3f b/metadata/md5-cache/app-misc/clockywock-0.2.3f
deleted file mode 100644
index e502a10c5dc4..000000000000
--- a/metadata/md5-cache/app-misc/clockywock-0.2.3f
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=sys-libs/ncurses
-DESCRIPTION=ncurses based analog clock
-EAPI=4
-HOMEPAGE=http://dentar.com/ourway/opensource
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=sys-libs/ncurses
-SLOT=0
-SRC_URI=http://dentar.com/opensource/clockywock-0.2.3F.tar.gz
-_eclasses_=eutils	b8fdb86895c268cca7ae1626264a30f4	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=d2dcf7dde41208cc448c6dcbd45780a6
diff --git a/metadata/md5-cache/app-text/calibre-0.9.29 b/metadata/md5-cache/app-text/calibre-0.9.31
similarity index 94%
rename from metadata/md5-cache/app-text/calibre-0.9.29
rename to metadata/md5-cache/app-text/calibre-0.9.31
index 3c9bcb510261..3bbd9baf2a0f 100644
--- a/metadata/md5-cache/app-text/calibre-0.9.29
+++ b/metadata/md5-cache/app-text/calibre-0.9.31
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=app-text/podofo-0.8.2:= >=app-text/poppler-0.12.3-r3:=[qt4,xpdf-headers(+)] >=dev-lang/python-2.7.1:2.7[sqlite,ssl] >=dev-libs/chmlib-0.40:= >=dev-libs/icu-4.4:= >=dev-python/beautifulsoup-3.0.5:python-2 dev-python/netifaces dev-python/python-dateutil >=dev-python/dnspython-1.6.0 >=dev-python/cssselect-0.7.1 >=dev-python/cssutils-0.9.9 >=dev-python/dbus-python-0.82.2 >=dev-python/imaging-1.1.6 >=dev-python/lxml-2.2.1 >=dev-python/mechanize-0.1.11 >=dev-python/python-dateutil-1.4.1 >=dev-python/PyQt4-4.9.1[X,svg,webkit] media-fonts/liberation-fonts >=media-gfx/imagemagick-6.5.9[jpeg,png] >=media-libs/freetype-2:= >=media-libs/libwmf-0.2.8 >=media-libs/libmtp-1.1.4:= virtual/libusb:1= dev-qt/qtdbus:4= dev-qt/qtsvg:4= >=x11-misc/xdg-utils-1.0.2-r2 udisks? ( || ( sys-fs/udisks:2 sys-fs/udisks:0 ) )
 SLOT=0
-SRC_URI=http://sourceforge.net/projects/calibre/files/0.9.29/calibre-0.9.29.tar.xz
+SRC_URI=http://sourceforge.net/projects/calibre/files/0.9.31/calibre-0.9.31.tar.xz
 _eclasses_=bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	b8fdb86895c268cca7ae1626264a30f4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=29bab198605a62fec06e22b4e65eecad
+_md5_=65bb8093c618f11abe795aa4835ca212
diff --git a/metadata/md5-cache/app-text/djvu-3.5.25.3 b/metadata/md5-cache/app-text/djvu-3.5.25.3
index e86cbfc20009..0a4779eca1fb 100644
--- a/metadata/md5-cache/app-text/djvu-3.5.25.3
+++ b/metadata/md5-cache/app-text/djvu-3.5.25.3
@@ -4,10 +4,10 @@ DESCRIPTION=DjVu viewers, encoders and utilities
 EAPI=5
 HOMEPAGE=http://djvu.sourceforge.net/
 IUSE=debug doc jpeg tiff xml
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=jpeg? ( virtual/jpeg ) tiff? ( media-libs/tiff:0= )
 SLOT=0
 SRC_URI=mirror://sourceforge/djvu/djvulibre-3.5.25.3.tar.gz
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	b8fdb86895c268cca7ae1626264a30f4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=9dfc5230a8a1b46d191a4edc59a5514a
+_md5_=d119fa71fdf3a213d314c9dfc6539306
diff --git a/metadata/md5-cache/app-text/docbook-xsl-ns-stylesheets-1.78.0 b/metadata/md5-cache/app-text/docbook-xsl-ns-stylesheets-1.78.0
index 7bfb14b8d9c4..eff9591eb289 100644
--- a/metadata/md5-cache/app-text/docbook-xsl-ns-stylesheets-1.78.0
+++ b/metadata/md5-cache/app-text/docbook-xsl-ns-stylesheets-1.78.0
@@ -3,10 +3,10 @@ DESCRIPTION=XSL Stylesheets for Docbook
 EAPI=5
 HOMEPAGE=http://wiki.docbook.org/topic/DocBookXslStylesheets
 IUSE=ruby
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd
 LICENSE=BSD
 RDEPEND=>=app-text/build-docbook-catalog-1.4 ruby? ( dev-lang/ruby )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/docbook/docbook-xsl-ns-1.78.0.tar.bz2
-_md5_=a32296ebbbb84a87f627ff5c65d175a3
+_md5_=c58d78b5819736a6596e8df499f443f3
diff --git a/metadata/md5-cache/app-text/xdvik-22.84.16 b/metadata/md5-cache/app-text/xdvik-22.84.16
deleted file mode 100644
index 2dedfd5e50d8..000000000000
--- a/metadata/md5-cache/app-text/xdvik-22.84.16
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=sys-devel/flex virtual/yacc >=media-libs/t1lib-5.0.2 x11-libs/libXmu x11-libs/libXp x11-libs/libXpm motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( neXt? ( x11-libs/neXtaw ) !neXt? ( Xaw3d? ( x11-libs/libXaw3d ) !Xaw3d? ( x11-libs/libXaw ) ) ) virtual/latex-base !<app-text/texlive-2007
-DESCRIPTION=DVI previewer for X Window System
-EAPI=3
-HOMEPAGE=http://xdvi.sourceforge.net/
-IUSE=motif neXt Xaw3d emacs
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=>=media-libs/t1lib-5.0.2 x11-libs/libXmu x11-libs/libXp x11-libs/libXpm motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( neXt? ( x11-libs/neXtaw ) !neXt? ( Xaw3d? ( x11-libs/libXaw3d ) !Xaw3d? ( x11-libs/libXaw ) ) ) virtual/latex-base !<app-text/texlive-2007
-SLOT=0
-SRC_URI=mirror://sourceforge/xdvi/xdvik-22.84.16.tar.gz
-_eclasses_=elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	b8fdb86895c268cca7ae1626264a30f4	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=e8fd06b01f22a2dcc0218fca37402af8
diff --git a/metadata/md5-cache/app-text/xdvik-22.86 b/metadata/md5-cache/app-text/xdvik-22.86
new file mode 100644
index 000000000000..b4b631b51b4e
--- /dev/null
+++ b/metadata/md5-cache/app-text/xdvik-22.86
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare
+DEPEND=sys-devel/flex virtual/yacc media-libs/freetype:2 x11-libs/libXmu x11-libs/libXp x11-libs/libXpm motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( neXt? ( x11-libs/neXtaw ) !neXt? ( Xaw3d? ( x11-libs/libXaw3d ) !Xaw3d? ( x11-libs/libXaw ) ) ) dev-libs/kpathsea
+DESCRIPTION=DVI previewer for X Window System
+EAPI=4
+HOMEPAGE=http://xdvi.sourceforge.net/
+IUSE=motif neXt Xaw3d emacs
+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 ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=media-libs/freetype:2 x11-libs/libXmu x11-libs/libXp x11-libs/libXpm motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( neXt? ( x11-libs/neXtaw ) !neXt? ( Xaw3d? ( x11-libs/libXaw3d ) !Xaw3d? ( x11-libs/libXaw ) ) ) dev-libs/kpathsea virtual/latex-base !<app-text/texlive-2007
+SLOT=0
+SRC_URI=mirror://sourceforge/xdvi/xdvik-22.86.tar.gz
+_eclasses_=elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	b8fdb86895c268cca7ae1626264a30f4	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=c24b5d8f2eb3df9e8d1fc73177bf78ca
diff --git a/metadata/md5-cache/app-vim/colorschemes-20130124 b/metadata/md5-cache/app-vim/colorschemes-20130124
index b18955e4071b..6a88e2fb06f9 100644
--- a/metadata/md5-cache/app-vim/colorschemes-20130124
+++ b/metadata/md5-cache/app-vim/colorschemes-20130124
@@ -3,10 +3,10 @@ DEPEND=|| ( >=app-editors/vim-7.0 >=app-editors/gvim-7.0 )
 DESCRIPTION=vim plugin: a collection of color schemes from vim.org
 EAPI=5
 HOMEPAGE=http://www.vim.org/
-KEYWORDS=~alpha amd64 hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
+KEYWORDS=~alpha amd64 hppa ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=vim GPL-2 GPL-2+ GPL-3 GPL-3+ MIT BSD WTFPL-2 public-domain
 RDEPEND=|| ( >=app-editors/vim-7.0 >=app-editors/gvim-7.0 )
 SLOT=0
 SRC_URI=mirror://gentoo/colorschemes-20130124.tar.bz2 http://dev.gentoo.org/~radhermit/vim/colorschemes-20130124.tar.bz2
 _eclasses_=eutils	b8fdb86895c268cca7ae1626264a30f4	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	vim-doc	1c18baeec98cec3287524cbf2fee2bd2	vim-plugin	3e2b8e3b7a061cd56a91f1583248b89f
-_md5_=1d4b2b8db8ece4ff436ba0aa9e75d7f0
+_md5_=67dcf9480820c1a1ed494a4f4bd58de7
diff --git a/metadata/md5-cache/app-vim/gtk-syntax-20121015 b/metadata/md5-cache/app-vim/gtk-syntax-20121015
index a641203d49a3..bae3190b71de 100644
--- a/metadata/md5-cache/app-vim/gtk-syntax-20121015
+++ b/metadata/md5-cache/app-vim/gtk-syntax-20121015
@@ -3,10 +3,10 @@ DEPEND=|| ( >=app-editors/vim-7.0 >=app-editors/gvim-7.0 )
 DESCRIPTION=vim plugin: Syntax highlighting for GLib, Gtk+, Xlib, Gimp, Gnome, and more
 EAPI=5
 HOMEPAGE=http://www.vim.org/scripts/script.php?script_id=1000
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris
 LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.0 >=app-editors/gvim-7.0 )
 SLOT=0
 SRC_URI=mirror://gentoo/gtk-syntax-20121015.tar.bz2 http://dev.gentoo.org/~radhermit/vim/gtk-syntax-20121015.tar.bz2
 _eclasses_=vim-doc	1c18baeec98cec3287524cbf2fee2bd2	vim-plugin	3e2b8e3b7a061cd56a91f1583248b89f
-_md5_=3f21a43c8437be3e0649c808d49dcd28
+_md5_=5cb1fec37b2bbcc61d996b187213b58b
diff --git a/metadata/md5-cache/app-vim/vim-latex-1.8.23.20130116 b/metadata/md5-cache/app-vim/vim-latex-1.8.23.20130116
index a5b511f6b6e9..6090ebc607a4 100644
--- a/metadata/md5-cache/app-vim/vim-latex-1.8.23.20130116
+++ b/metadata/md5-cache/app-vim/vim-latex-1.8.23.20130116
@@ -4,10 +4,10 @@ DESCRIPTION=vim plugin: a comprehensive set of tools to view, edit and compile L
 EAPI=5
 HOMEPAGE=http://vim-latex.sourceforge.net/
 IUSE=html python python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 python_single_target_python2_5 python_single_target_python2_6 python_single_target_python2_7
-KEYWORDS=~alpha amd64 ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
+KEYWORDS=~alpha amd64 ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
 LICENSE=vim
 RDEPEND=|| ( app-editors/vim[python?] app-editors/gvim[python?] ) virtual/latex-base || ( >=app-editors/vim-7.0 >=app-editors/gvim-7.0 )
 SLOT=0
 SRC_URI=mirror://sourceforge/vim-latex/vim-latex-1.8.23-20130116.788-git2ef9956.tar.gz
 _eclasses_=eutils	b8fdb86895c268cca7ae1626264a30f4	multilib	892e597faee02a5b94eb02ab512e7622	python-single-r1	432ebc09c192bb4c808568896d6145d2	python-utils-r1	9fc80a4f06f33ede447b5647fddca301	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim-doc	1c18baeec98cec3287524cbf2fee2bd2	vim-plugin	3e2b8e3b7a061cd56a91f1583248b89f
-_md5_=f52f35626a8e95b89b3b0e5f79ee9824
+_md5_=9326255627804cf8a4e32f657b5aed78
diff --git a/metadata/md5-cache/dev-db/mysql++-3.1.0 b/metadata/md5-cache/dev-db/mysql++-3.1.0
index 8a5cc3d83dfc..24bee4420db2 100644
--- a/metadata/md5-cache/dev-db/mysql++-3.1.0
+++ b/metadata/md5-cache/dev-db/mysql++-3.1.0
@@ -3,10 +3,10 @@ DEPEND=>=virtual/mysql-4.0 || ( >=sys-devel/gcc-3 >=sys-devel/gcc-apple-4 )
 DESCRIPTION=C++ API interface to the MySQL database
 EAPI=5
 HOMEPAGE=http://tangentsoft.net/mysql++/
-KEYWORDS=~alpha amd64 ~hppa ~mips ppc ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~alpha amd64 hppa ~mips ppc ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=LGPL-2
 RDEPEND=>=virtual/mysql-4.0
 SLOT=0/3
 SRC_URI=http://www.tangentsoft.net/mysql++/releases/mysql++-3.1.0.tar.gz
 _eclasses_=eutils	b8fdb86895c268cca7ae1626264a30f4	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=1de093623d860134e0aff1744bc31a00
+_md5_=56839acff46f00bab6590b5cc5fec6bb
diff --git a/metadata/md5-cache/dev-haskell/ansi-wl-pprint-0.6.6 b/metadata/md5-cache/dev-haskell/ansi-wl-pprint-0.6.6
index 4bdf8e2f34c1..27dad7652e29 100644
--- a/metadata/md5-cache/dev-haskell/ansi-wl-pprint-0.6.6
+++ b/metadata/md5-cache/dev-haskell/ansi-wl-pprint-0.6.6
@@ -4,10 +4,10 @@ DESCRIPTION=The Wadler/Leijen Pretty Printer for colored ANSI terminal output
 EAPI=5
 HOMEPAGE=http://github.com/batterseapower/ansi-wl-pprint
 IUSE=doc hscolour profile
-KEYWORDS=~alpha ~amd64 ~ia64 ppc ppc64 ~sparc ~x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 ia64 ppc ppc64 ~sparc ~x86 ~x86-fbsd
 LICENSE=BSD
 RDEPEND=>=dev-haskell/ansi-terminal-0.4.0:=[profile?] <dev-haskell/ansi-terminal-0.7:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.6.6
 SRC_URI=mirror://hackage/packages/archive/ansi-wl-pprint/0.6.6/ansi-wl-pprint-0.6.6.tar.gz
 _eclasses_=eutils	b8fdb86895c268cca7ae1626264a30f4	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	0fe5ac58a8b877fae07bb258b762852e	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=ff8a9b0852e12ebfee4d0147141221d3
+_md5_=28b1bae4e5fa61f74c99faaed690710a
diff --git a/metadata/md5-cache/dev-haskell/utf8-string-0.3.7-r1 b/metadata/md5-cache/dev-haskell/utf8-string-0.3.7-r1
index 53d1ca80da34..062dfe7eba03 100644
--- a/metadata/md5-cache/dev-haskell/utf8-string-0.3.7-r1
+++ b/metadata/md5-cache/dev-haskell/utf8-string-0.3.7-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Support for reading and writing UTF8 Strings
 EAPI=5
 HOMEPAGE=http://github.com/glguy/utf8-string/
 IUSE=doc hscolour profile
-KEYWORDS=~alpha ~amd64 ~ia64 ppc ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x86-macos
+KEYWORDS=~alpha amd64 ia64 ppc ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x86-macos
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.4:=
 SLOT=0/0.3.7
 SRC_URI=mirror://hackage/packages/archive/utf8-string/0.3.7/utf8-string-0.3.7.tar.gz
 _eclasses_=eutils	b8fdb86895c268cca7ae1626264a30f4	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	0fe5ac58a8b877fae07bb258b762852e	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=049a3be8b3b1616ecad31a7e1048898d
+_md5_=b07ea4be92652773a92015c139e60a2b
diff --git a/metadata/md5-cache/dev-lang/go-1.1 b/metadata/md5-cache/dev-lang/go-1.1
new file mode 100644
index 000000000000..a007038dee7f
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/go-1.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm prepare test
+DEPEND=sys-apps/ed
+DESCRIPTION=A concurrent garbage collected and typesafe programming language
+EAPI=5
+HOMEPAGE=http://www.golang.org
+IUSE=bash-completion emacs vim-syntax zsh-completion
+KEYWORDS=-* ~amd64 ~arm ~x86
+LICENSE=BSD
+RDEPEND=bash-completion? ( app-shells/bash-completion ) emacs? ( virtual/emacs ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) zsh-completion? ( app-shells/zsh-completion )
+SLOT=0
+SRC_URI=http://go.googlecode.com/files/go1.1.src.tar.gz
+_eclasses_=bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	b8fdb86895c268cca7ae1626264a30f4	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=0ed78e1128ce43fab3f5056e300495e4
diff --git a/metadata/md5-cache/dev-lang/go-9999 b/metadata/md5-cache/dev-lang/go-9999
index f60f6617b8e9..54eae5643ac5 100644
--- a/metadata/md5-cache/dev-lang/go-9999
+++ b/metadata/md5-cache/dev-lang/go-9999
@@ -1,11 +1,11 @@
 DEFINED_PHASES=compile install postinst postrm prepare test unpack
 DEPEND=sys-apps/ed dev-vcs/mercurial
 DESCRIPTION=A concurrent garbage collected and typesafe programming language
-EAPI=4
+EAPI=5
 HOMEPAGE=http://www.golang.org
 IUSE=bash-completion emacs vim-syntax zsh-completion
 LICENSE=BSD
 RDEPEND=bash-completion? ( app-shells/bash-completion ) emacs? ( virtual/emacs ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) zsh-completion? ( app-shells/zsh-completion )
 SLOT=0
 _eclasses_=bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	b8fdb86895c268cca7ae1626264a30f4	mercurial	5fcb2f60868c283ece4cadfce78a5b24	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=bc0f003e6719a99c50dc4321a6047e12
+_md5_=4e592e113980810d2703f71119b048e2
diff --git a/metadata/md5-cache/dev-libs/libburn-1.3.0 b/metadata/md5-cache/dev-libs/libburn-1.3.0
new file mode 100644
index 000000000000..860ebe338624
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libburn-1.3.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=cdio? ( >=dev-libs/libcdio-0.83 ) virtual/pkgconfig
+DESCRIPTION=Libburn is an open-source library for reading, mastering and writing optical discs.
+EAPI=5
+HOMEPAGE=http://libburnia-project.org
+IUSE=cdio debug static-libs track-src-odirect
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=cdio? ( >=dev-libs/libcdio-0.83 )
+SLOT=0
+SRC_URI=http://files.libburnia-project.org/releases/libburn-1.3.0.tar.gz
+_md5_=9d2a59d7a35663129dcc18cdcdec487b
diff --git a/metadata/md5-cache/dev-libs/libdbusmenu-0.6.2 b/metadata/md5-cache/dev-libs/libdbusmenu-0.6.2
index 6d5cae2159eb..432100dd274b 100644
--- a/metadata/md5-cache/dev-libs/libdbusmenu-0.6.2
+++ b/metadata/md5-cache/dev-libs/libdbusmenu-0.6.2
@@ -4,10 +4,10 @@ DESCRIPTION=Library to pass menu structure across DBus
 EAPI=4
 HOMEPAGE=http://launchpad.net/dbusmenu
 IUSE=debug gtk +introspection
-KEYWORDS=~amd64 ~arm ~mips ~x86
+KEYWORDS=~amd64 ~arm ~hppa ~mips ~x86
 LICENSE=LGPL-2.1 LGPL-3
 RDEPEND=>=dev-libs/glib-2.32 >=dev-libs/dbus-glib-0.100 dev-libs/libxml2 gtk? ( >=x11-libs/gtk+-3.2:3 ) introspection? ( >=dev-libs/gobject-introspection-1 ) !<dev-libs/libdbusmenu-0.5.1-r200
 SLOT=3
 SRC_URI=http://launchpad.net/dbusmenu/0.6/0.6.2/+download/libdbusmenu-0.6.2.tar.gz
 _eclasses_=eutils	b8fdb86895c268cca7ae1626264a30f4	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	vala	aa890daf29e67d32e9bff8e12ef653ca
-_md5_=62549ad886403abd4b6a5c242cc1cc26
+_md5_=abb16867c5b53e77e23dee5c35c4df51
diff --git a/metadata/md5-cache/dev-libs/libindicate-12.10.1 b/metadata/md5-cache/dev-libs/libindicate-12.10.1
index 12063f486cfe..913fb3121e03 100644
--- a/metadata/md5-cache/dev-libs/libindicate-12.10.1
+++ b/metadata/md5-cache/dev-libs/libindicate-12.10.1
@@ -4,11 +4,11 @@ DESCRIPTION=A library to raise flags on DBus for other components of the desktop
 EAPI=5
 HOMEPAGE=http://launchpad.net/libindicate
 IUSE=gtk +introspection
-KEYWORDS=~amd64 ~arm ~mips ~x86
+KEYWORDS=~amd64 ~arm ~hppa ~mips ~x86
 LICENSE=LGPL-2.1 LGPL-3
 RDEPEND=>=dev-libs/dbus-glib-0.100 >=dev-libs/glib-2.30 >=dev-libs/libdbusmenu-0.6.2:3[gtk?,introspection?] dev-libs/libxml2 gtk? ( >=x11-libs/gtk+-3.2:3 ) introspection? ( >=dev-libs/gobject-introspection-1 ) !<dev-libs/libindicate-0.6.1-r201
 RESTRICT=test
 SLOT=3
 SRC_URI=http://launchpad.net/libindicate/12.10/12.10.1/+download/libindicate-12.10.1.tar.gz
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	b8fdb86895c268cca7ae1626264a30f4	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	vala	aa890daf29e67d32e9bff8e12ef653ca
-_md5_=9182c60aed1547f5ab8cc9979dbb69b1
+_md5_=eefc70a5d7747e2e78de822b55734c5f
diff --git a/metadata/md5-cache/dev-libs/libisoburn-1.3.0 b/metadata/md5-cache/dev-libs/libisoburn-1.3.0
new file mode 100644
index 000000000000..c250644401de
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libisoburn-1.3.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install
+DEPEND=>=dev-libs/libburn-1.3.0 >=dev-libs/libisofs-1.3.0 readline? ( sys-libs/readline ) acl? ( virtual/acl ) xattr? ( sys-apps/attr ) zlib? ( sys-libs/zlib ) cdio? ( >=dev-libs/libcdio-0.83 ) launch-frontend? ( dev-lang/tcl:0 dev-lang/tk:0 ) launch-frontend-setuid? ( dev-lang/tcl:0 dev-lang/tk:0 ) frontend-optional? ( dev-tcltk/bwidget ) virtual/pkgconfig
+DESCRIPTION=Enables creation and expansion of ISO-9660 filesystems on all CD/DVD media supported by libburn
+EAPI=5
+HOMEPAGE=http://libburnia-project.org/
+IUSE=acl cdio debug external-filters external-filters-setuid frontend-optional launch-frontend launch-frontend-setuid readline static-libs xattr zlib
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86
+LICENSE=GPL-2 GPL-3
+RDEPEND=>=dev-libs/libburn-1.3.0 >=dev-libs/libisofs-1.3.0 readline? ( sys-libs/readline ) acl? ( virtual/acl ) xattr? ( sys-apps/attr ) zlib? ( sys-libs/zlib ) cdio? ( >=dev-libs/libcdio-0.83 ) launch-frontend? ( dev-lang/tcl:0 dev-lang/tk:0 ) launch-frontend-setuid? ( dev-lang/tcl:0 dev-lang/tk:0 ) frontend-optional? ( dev-tcltk/bwidget )
+REQUIRED_USE=frontend-optional? ( || ( launch-frontend launch-frontend-setuid ) )
+SLOT=0
+SRC_URI=http://files.libburnia-project.org/releases/libisoburn-1.3.0.tar.gz
+_md5_=4697874d2dabcd2d7d81b8b0b8e26eb8
diff --git a/metadata/md5-cache/dev-libs/libisofs-1.3.0 b/metadata/md5-cache/dev-libs/libisofs-1.3.0
new file mode 100644
index 000000000000..00e0a1da4579
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libisofs-1.3.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=acl? ( virtual/acl ) xattr? ( sys-apps/attr ) zlib? ( sys-libs/zlib ) virtual/pkgconfig
+DESCRIPTION=libisofs is an open-source library for reading, mastering and writing optical discs.
+EAPI=5
+HOMEPAGE=http://libburnia-project.org/
+IUSE=acl debug static-libs verbose-debug xattr zlib
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=acl? ( virtual/acl ) xattr? ( sys-apps/attr ) zlib? ( sys-libs/zlib )
+SLOT=0
+SRC_URI=http://files.libburnia-project.org/releases/libisofs-1.3.0.tar.gz
+_md5_=00b9a7595e4fa23446f9488d4186b361
diff --git a/metadata/md5-cache/dev-libs/libnl-1.1.3 b/metadata/md5-cache/dev-libs/libnl-1.1.3
index dac6292efaab..b33fccd53228 100644
--- a/metadata/md5-cache/dev-libs/libnl-1.1.3
+++ b/metadata/md5-cache/dev-libs/libnl-1.1.3
@@ -4,9 +4,9 @@ DESCRIPTION=A library for applications dealing with netlink socket
 EAPI=5
 HOMEPAGE=http://www.infradead.org/~tgr/libnl/
 IUSE=doc
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~ia64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~ia64-linux ~x86-linux
 LICENSE=LGPL-2.1
 SLOT=1.1
 SRC_URI=http://www.infradead.org/~tgr/libnl/files/libnl-1.1.3.tar.gz
 _eclasses_=eutils	b8fdb86895c268cca7ae1626264a30f4	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=dae9e459b061075f2f042b45dc656596
+_md5_=6235a8a301fa742317acd20dae5f7bac
diff --git a/metadata/md5-cache/dev-libs/ppl-0.12.1-r1 b/metadata/md5-cache/dev-libs/ppl-0.12.1-r1
index 5346cda87ec8..821aad46f8a2 100644
--- a/metadata/md5-cache/dev-libs/ppl-0.12.1-r1
+++ b/metadata/md5-cache/dev-libs/ppl-0.12.1-r1
@@ -4,10 +4,10 @@ DESCRIPTION=The Parma Polyhedra Library provides numerical abstractions for anal
 EAPI=3
 HOMEPAGE=http://bugseng.com/products/ppl
 IUSE=doc lpsol pch static-libs test
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~sparc-solaris
+KEYWORDS=~alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~sparc-solaris
 LICENSE=GPL-3
 RDEPEND=>=dev-libs/gmp-4.1.3[cxx] lpsol? ( sci-mathematics/glpk ) !<dev-libs/cloog-ppl-0.15.10
 SLOT=0
 SRC_URI=http://bugseng.com/products/ppl/download/ftp/releases/0.12.1/ppl-0.12.1.tar.bz2
 _eclasses_=eutils	b8fdb86895c268cca7ae1626264a30f4	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=cf5d619f0bfdcb027b0e1ca937804baf
+_md5_=fa7a10a01c130459844532e9dc2b4988
diff --git a/metadata/md5-cache/dev-perl/Carp-Assert-More-1.140.0 b/metadata/md5-cache/dev-perl/Carp-Assert-More-1.140.0
index fef4e0c745af..f4640a2bfa47 100644
--- a/metadata/md5-cache/dev-perl/Carp-Assert-More-1.140.0
+++ b/metadata/md5-cache/dev-perl/Carp-Assert-More-1.140.0
@@ -4,10 +4,10 @@ DESCRIPTION=convenience wrappers around Carp::Assert
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/Carp-Assert-More/
 IUSE=test
-KEYWORDS=amd64 ~ia64 ~ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=amd64 ia64 ~ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=virtual/perl-Scalar-List-Utils dev-perl/Carp-Assert dev-lang/perl[-build]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PE/PETDANCE/Carp-Assert-More-1.14.tar.gz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	b8fdb86895c268cca7ae1626264a30f4	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	ba21eba2562fc2643deeea95fd28665d	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=c10a1603de99e822cb048de05910b7eb
+_md5_=76ad7af1fc9383dc1a06dc5fa568fbdb
diff --git a/metadata/md5-cache/dev-perl/Email-Address-1.898.0 b/metadata/md5-cache/dev-perl/Email-Address-1.898.0
index 68e4c069b48e..9387bd713c14 100644
--- a/metadata/md5-cache/dev-perl/Email-Address-1.898.0
+++ b/metadata/md5-cache/dev-perl/Email-Address-1.898.0
@@ -4,10 +4,10 @@ DESCRIPTION=RFC 2822 Address Parsing and Creation
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/Email-Address/
 IUSE=test
-KEYWORDS=~alpha amd64 ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=dev-lang/perl[-build]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Email-Address-1.898.tar.gz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	b8fdb86895c268cca7ae1626264a30f4	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	ba21eba2562fc2643deeea95fd28665d	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=99c782800f1abf74bf36606632c48a18
+_md5_=44089e2f41a0e89738953be40397ed6e
diff --git a/metadata/md5-cache/dev-perl/File-Sync-0.110.0 b/metadata/md5-cache/dev-perl/File-Sync-0.110.0
index 168c7f5b0b93..710907a0daf1 100644
--- a/metadata/md5-cache/dev-perl/File-Sync-0.110.0
+++ b/metadata/md5-cache/dev-perl/File-Sync-0.110.0
@@ -3,10 +3,10 @@ DEPEND=dev-lang/perl[-build]
 DESCRIPTION=Perl access to fsync() and sync() function calls
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/File-Sync/
-KEYWORDS=amd64 ~ia64 ppc ppc64 ~sparc x86
+KEYWORDS=amd64 ia64 ppc ppc64 ~sparc x86
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=dev-lang/perl[-build]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BR/BRIANSKI/File-Sync-0.11.tar.gz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	b8fdb86895c268cca7ae1626264a30f4	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	ba21eba2562fc2643deeea95fd28665d	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=3b6b0d9dbad7902010261d0f89114a4a
+_md5_=4147bf4dd87fe809dd5f250f8a1a8a7f
diff --git a/metadata/md5-cache/dev-perl/LWP-Protocol-https-6.30.0 b/metadata/md5-cache/dev-perl/LWP-Protocol-https-6.30.0
index 4fe6ce744b47..06aad426cd85 100644
--- a/metadata/md5-cache/dev-perl/LWP-Protocol-https-6.30.0
+++ b/metadata/md5-cache/dev-perl/LWP-Protocol-https-6.30.0
@@ -3,10 +3,10 @@ DEPEND=app-misc/ca-certificates >=dev-perl/libwww-perl-6.20.0 >=dev-perl/Net-HTT
 DESCRIPTION=Provide https support for LWP::UserAgent
 EAPI=4
 HOMEPAGE=http://search.cpan.org/dist/LWP-Protocol-https/
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=app-misc/ca-certificates >=dev-perl/libwww-perl-6.20.0 >=dev-perl/Net-HTTP-6 >=dev-perl/IO-Socket-SSL-1.540.0 dev-lang/perl[-build]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GA/GAAS/LWP-Protocol-https-6.03.tar.gz http://dev.gentoo.org/~tove/distfiles/dev-perl/LWP-Protocol-https/LWP-Protocol-https_ca-cert-r1.patch.gz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	b8fdb86895c268cca7ae1626264a30f4	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	ba21eba2562fc2643deeea95fd28665d	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=13fc90e21d9cdb38acf41cf8f24315ec
+_md5_=10d8a7364f97675c70f1336f4a79b787
diff --git a/metadata/md5-cache/dev-perl/Locale-PO-0.230.0 b/metadata/md5-cache/dev-perl/Locale-PO-0.230.0
index c2f2f5f32227..98ccce9d8878 100644
--- a/metadata/md5-cache/dev-perl/Locale-PO-0.230.0
+++ b/metadata/md5-cache/dev-perl/Locale-PO-0.230.0
@@ -3,10 +3,10 @@ DEPEND=sys-devel/gettext dev-perl/File-Slurp dev-lang/perl[-build]
 DESCRIPTION=Object-oriented interface to gettext po-file entries
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/Locale-PO/
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~m68k ppc ppc64 ~s390 ~sh ~sparc x86
+KEYWORDS=~alpha amd64 arm hppa ia64 ~m68k ppc ppc64 ~s390 ~sh ~sparc x86
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=sys-devel/gettext dev-perl/File-Slurp dev-lang/perl[-build]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CO/COSIMO/Locale-PO-0.23.tar.gz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	b8fdb86895c268cca7ae1626264a30f4	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	ba21eba2562fc2643deeea95fd28665d	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=ce225266e02dfd259cb71f13b9abdb5e
+_md5_=3913e5f82809ac637298c480992a315f
diff --git a/metadata/md5-cache/dev-perl/MIME-Types-1.380.0 b/metadata/md5-cache/dev-perl/MIME-Types-1.380.0
index ab2d8895163c..9267970c624c 100644
--- a/metadata/md5-cache/dev-perl/MIME-Types-1.380.0
+++ b/metadata/md5-cache/dev-perl/MIME-Types-1.380.0
@@ -3,10 +3,10 @@ DEPEND=dev-lang/perl[-build]
 DESCRIPTION=Definition of MIME types
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/MIME-Types/
-KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=dev-lang/perl[-build]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MARKOV/MIME-Types-1.38.tar.gz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	b8fdb86895c268cca7ae1626264a30f4	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	ba21eba2562fc2643deeea95fd28665d	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=91d60fccc078f7264ff814c3f5296853
+_md5_=34fd4d93f1950dc7fe798512ca33f96c
diff --git a/metadata/md5-cache/dev-perl/MIME-tools-5.504.0 b/metadata/md5-cache/dev-perl/MIME-tools-5.504.0
index ad58c5d09693..4ae4af55fdfb 100644
--- a/metadata/md5-cache/dev-perl/MIME-tools-5.504.0
+++ b/metadata/md5-cache/dev-perl/MIME-tools-5.504.0
@@ -4,10 +4,10 @@ DESCRIPTION=A Perl module for parsing and creating MIME entities
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/MIME-tools/
 IUSE=test
-KEYWORDS=~alpha amd64 hppa ~ia64 ppc ppc64 ~s390 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha amd64 hppa ia64 ppc ppc64 ~s390 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=>=virtual/perl-MIME-Base64-3.05 virtual/perl-libnet dev-perl/URI virtual/perl-Digest-MD5 dev-perl/libwww-perl dev-perl/HTML-Tagset dev-perl/HTML-Parser dev-perl/MailTools virtual/perl-File-Temp dev-lang/perl[-build]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DS/DSKOLL/MIME-tools-5.504.tar.gz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	b8fdb86895c268cca7ae1626264a30f4	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	ba21eba2562fc2643deeea95fd28665d	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=00bd9aa20a1e876b8dba1a333c0cbba2
+_md5_=5ff49f4dd35c1b39b73167ed9dba3236
diff --git a/metadata/md5-cache/dev-perl/Mail-DKIM-0.400.0 b/metadata/md5-cache/dev-perl/Mail-DKIM-0.400.0
index de87ef0387bf..a554b1d2b083 100644
--- a/metadata/md5-cache/dev-perl/Mail-DKIM-0.400.0
+++ b/metadata/md5-cache/dev-perl/Mail-DKIM-0.400.0
@@ -3,10 +3,10 @@ DEPEND=>=dev-perl/Crypt-OpenSSL-RSA-0.24 virtual/perl-Digest-SHA virtual/perl-MI
 DESCRIPTION=Mail::DKIM - Signs/verifies Internet mail using DKIM message signatures
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/Mail-DKIM/
-KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm hppa ia64 ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=>=dev-perl/Crypt-OpenSSL-RSA-0.24 virtual/perl-Digest-SHA virtual/perl-MIME-Base64 dev-perl/Net-DNS dev-perl/MailTools dev-lang/perl[-build]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JA/JASLONG/Mail-DKIM-0.40.tar.gz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	b8fdb86895c268cca7ae1626264a30f4	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	ba21eba2562fc2643deeea95fd28665d	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=06b2b9cf00c5255400302e6c52916e2b
+_md5_=877751ca14751c4bc104707c4f34c6f5
diff --git a/metadata/md5-cache/dev-perl/Package-Stash-0.340.0 b/metadata/md5-cache/dev-perl/Package-Stash-0.340.0
index 460f424a369e..e740215b751c 100644
--- a/metadata/md5-cache/dev-perl/Package-Stash-0.340.0
+++ b/metadata/md5-cache/dev-perl/Package-Stash-0.340.0
@@ -4,10 +4,10 @@ DESCRIPTION=Routines for manipulating stashes
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/Package-Stash/
 IUSE=test
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ia64 ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=>=dev-perl/Dist-CheckConflicts-0.20.0 >=dev-perl/Module-Implementation-0.60.0 dev-perl/Package-DeprecationManager >=dev-perl/Package-Stash-XS-0.260.0 dev-lang/perl[-build]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DO/DOY/Package-Stash-0.34.tar.gz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	b8fdb86895c268cca7ae1626264a30f4	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	ba21eba2562fc2643deeea95fd28665d	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=eb9af15492c5b6e0631be3d2737d960a
+_md5_=cd422b52056482cc0f5143efd6734561
diff --git a/metadata/md5-cache/dev-perl/Pango-1.224.0 b/metadata/md5-cache/dev-perl/Pango-1.224.0
index 96575cd5588d..34ea2523e3ea 100644
--- a/metadata/md5-cache/dev-perl/Pango-1.224.0
+++ b/metadata/md5-cache/dev-perl/Pango-1.224.0
@@ -3,10 +3,10 @@ DEPEND=>=dev-perl/glib-perl-1.220.0 >=dev-perl/Cairo-1.0.0 >=x11-libs/pango-1.0.
 DESCRIPTION=Layout and render international text
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/Pango/
-KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm hppa ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-perl/glib-perl-1.220.0 >=dev-perl/Cairo-1.0.0 >=x11-libs/pango-1.0.0 dev-lang/perl[-build]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/X/XA/XAOC/Pango-1.224.tar.gz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	b8fdb86895c268cca7ae1626264a30f4	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	ba21eba2562fc2643deeea95fd28665d	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=f2aa985a784d1a3cd6583b07ccb1db27
+_md5_=97664f0fa4558693da957ea8345b56db
diff --git a/metadata/md5-cache/dev-perl/Sub-Override-0.90.0 b/metadata/md5-cache/dev-perl/Sub-Override-0.90.0
index 97a0358d476a..9c976edc4732 100644
--- a/metadata/md5-cache/dev-perl/Sub-Override-0.90.0
+++ b/metadata/md5-cache/dev-perl/Sub-Override-0.90.0
@@ -4,10 +4,10 @@ DESCRIPTION=Perl extension for easily overriding subroutines
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/Sub-Override/
 IUSE=test
-KEYWORDS=amd64 ~ia64 ppc ~ppc64 ~sparc x86 ~amd64-linux ~arm-linux ~x86-linux
+KEYWORDS=amd64 ia64 ppc ~ppc64 ~sparc x86 ~amd64-linux ~arm-linux ~x86-linux
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=dev-lang/perl[-build]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/O/OV/OVID/Sub-Override-0.09.tar.gz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	b8fdb86895c268cca7ae1626264a30f4	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	ba21eba2562fc2643deeea95fd28665d	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=262a4e52ebbabcb6d39363c8e14010ff
+_md5_=7597547f9bb8c673cad9e011cd72a108
diff --git a/metadata/md5-cache/dev-perl/Text-CSV_XS-0.950.0 b/metadata/md5-cache/dev-perl/Text-CSV_XS-0.950.0
index 62f65e581e5a..a2be6fa3d2fe 100644
--- a/metadata/md5-cache/dev-perl/Text-CSV_XS-0.950.0
+++ b/metadata/md5-cache/dev-perl/Text-CSV_XS-0.950.0
@@ -4,10 +4,10 @@ DESCRIPTION=Comma-separated values manipulation routines
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/Text-CSV_XS/
 IUSE=test
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=dev-lang/perl[-build]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/H/HM/HMBRAND/Text-CSV_XS-0.95.tgz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	b8fdb86895c268cca7ae1626264a30f4	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	ba21eba2562fc2643deeea95fd28665d	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=5b22f910f4ca201d2b1955a290739fb6
+_md5_=e970699a239be863e8a8662ac920ee82
diff --git a/metadata/md5-cache/dev-perl/TimeDate-2.300.0 b/metadata/md5-cache/dev-perl/TimeDate-2.300.0
index 672d0ddd0b2a..7ba12128a8bd 100644
--- a/metadata/md5-cache/dev-perl/TimeDate-2.300.0
+++ b/metadata/md5-cache/dev-perl/TimeDate-2.300.0
@@ -3,10 +3,10 @@ DEPEND=dev-lang/perl[-build]
 DESCRIPTION=A Date/Time Parsing Perl Module
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/TimeDate/
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-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/G/GB/GBARR/TimeDate-2.30.tar.gz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	b8fdb86895c268cca7ae1626264a30f4	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	ba21eba2562fc2643deeea95fd28665d	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=72dde8ca18a424959970409b05af7991
+_md5_=52534414851a59c47a7fbe237b4ffa8f
diff --git a/metadata/md5-cache/dev-perl/extutils-pkgconfig-1.140.0 b/metadata/md5-cache/dev-perl/extutils-pkgconfig-1.140.0
index 32c93e36c56f..8be41a65b5ad 100644
--- a/metadata/md5-cache/dev-perl/extutils-pkgconfig-1.140.0
+++ b/metadata/md5-cache/dev-perl/extutils-pkgconfig-1.140.0
@@ -3,10 +3,10 @@ DEPEND=virtual/pkgconfig dev-lang/perl[-build]
 DESCRIPTION=Simplistic perl interface to pkg-config
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/ExtUtils-PkgConfig/
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=LGPL-2+
 RDEPEND=virtual/pkgconfig dev-lang/perl[-build]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/X/XA/XAOC/ExtUtils-PkgConfig-1.14.tar.gz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	b8fdb86895c268cca7ae1626264a30f4	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	ba21eba2562fc2643deeea95fd28665d	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=560291707e57a7435f95fd167db6812f
+_md5_=18fd890eb5de8045123b9a9b733c150e
diff --git a/metadata/md5-cache/dev-perl/glib-perl-1.280.0 b/metadata/md5-cache/dev-perl/glib-perl-1.280.0
index b2c2b2d0e26b..2b478d290052 100644
--- a/metadata/md5-cache/dev-perl/glib-perl-1.280.0
+++ b/metadata/md5-cache/dev-perl/glib-perl-1.280.0
@@ -3,10 +3,10 @@ DEPEND=>=dev-libs/glib-2 virtual/pkgconfig >=dev-perl/extutils-pkgconfig-1.0.0 >
 DESCRIPTION=Glib - Perl wrappers for the GLib utility and Object libraries
 EAPI=5
 HOMEPAGE=http://gtk2-perl.sf.net/ http://search.cpan.org/dist/Glib/
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ia64 ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/glib-2 dev-lang/perl[-build]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TS/TSCH/Glib-1.280.tar.gz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	b8fdb86895c268cca7ae1626264a30f4	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	ba21eba2562fc2643deeea95fd28665d	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=485fcc9e642925cc8f853e21f294f676
+_md5_=967637c4950a2bf982cac64cee0f6e27
diff --git a/metadata/md5-cache/dev-perl/perl-ldap-0.530.0 b/metadata/md5-cache/dev-perl/perl-ldap-0.530.0
index 9ef313e2093c..c23d9f6fb9be 100644
--- a/metadata/md5-cache/dev-perl/perl-ldap-0.530.0
+++ b/metadata/md5-cache/dev-perl/perl-ldap-0.530.0
@@ -4,10 +4,10 @@ DESCRIPTION=A collection of perl modules which provide an object-oriented interf
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/perl-ldap/
 IUSE=sasl xml ssl
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=dev-perl/Convert-ASN1 dev-perl/URI sasl? ( virtual/perl-Digest-MD5 dev-perl/Authen-SASL ) xml? ( dev-perl/XML-Parser dev-perl/XML-SAX dev-perl/XML-SAX-Writer ) ssl? ( >=dev-perl/IO-Socket-SSL-1.26 ) dev-lang/perl[-build]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MARSCHAP/perl-ldap-0.53.tar.gz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	b8fdb86895c268cca7ae1626264a30f4	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	ba21eba2562fc2643deeea95fd28665d	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=c4e80e3a30cf066970a9583584c4ad19
+_md5_=1fd507272820aa03d9896e09a5460a5a
diff --git a/metadata/md5-cache/dev-python/beautifulsoup-4.2.0 b/metadata/md5-cache/dev-python/beautifulsoup-4.2.0
new file mode 100644
index 000000000000..33d494540a80
--- /dev/null
+++ b/metadata/md5-cache/dev-python/beautifulsoup-4.2.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=doc? ( dev-python/sphinx[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] ) test? ( dev-python/nose[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] dev-python/lxml[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_1? ( dev-lang/python:3.1 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)]
+DESCRIPTION=Provides pythonic idioms for iterating, searching, and modifying an HTML/XML parse tree
+EAPI=5
+HOMEPAGE=http://www.crummy.com/software/BeautifulSoup/ http://pypi.python.org/pypi/beautifulsoup4
+IUSE=doc test python_targets_python2_6 python_targets_python2_7 python_targets_python3_1 python_targets_python3_2 python_targets_python3_3
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_1? ( dev-lang/python:3.1 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)]
+SLOT=4
+SRC_URI=mirror://pypi/b/beautifulsoup4/beautifulsoup4-4.2.0.tar.gz
+_eclasses_=distutils-r1	10e59ecabebf0c37ad5cd8827434b108	eutils	b8fdb86895c268cca7ae1626264a30f4	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	0e2bc7326c807a3e8133847eadc3dd26	python-utils-r1	9fc80a4f06f33ede447b5647fddca301	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=239145f6a4c39f0621eea474ad86c87f
diff --git a/metadata/md5-cache/dev-python/cherrypy-3.2.2-r1 b/metadata/md5-cache/dev-python/cherrypy-3.2.2-r1
index 6efe5888f265..824fb780face 100644
--- a/metadata/md5-cache/dev-python/cherrypy-3.2.2-r1
+++ b/metadata/md5-cache/dev-python/cherrypy-3.2.2-r1
@@ -4,10 +4,10 @@ DESCRIPTION=CherryPy is a pythonic, object-oriented HTTP framework
 EAPI=5
 HOMEPAGE=http://www.cherrypy.org/ http://pypi.python.org/pypi/CherryPy
 IUSE=test python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 python_targets_python3_1 python_targets_python3_2 python_targets_pypy1_9 python_targets_pypy2_0
-KEYWORDS=amd64 ~arm ~ia64 ppc ~x86 ~amd64-linux ~x86-linux ~x86-macos
+KEYWORDS=amd64 ~arm ia64 ppc ~x86 ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=BSD
 RDEPEND=python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_1? ( dev-lang/python:3.1 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_pypy1_9? ( dev-python/pypy:1.9 ) python_targets_pypy2_0? ( dev-python/pypy:2.0 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)]
 SLOT=0
 SRC_URI=http://download.cherrypy.org/cherrypy/3.2.2/CherryPy-3.2.2.tar.gz
 _eclasses_=distutils-r1	10e59ecabebf0c37ad5cd8827434b108	eutils	b8fdb86895c268cca7ae1626264a30f4	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	0e2bc7326c807a3e8133847eadc3dd26	python-utils-r1	9fc80a4f06f33ede447b5647fddca301	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=f9f4cb1d546b68d12615a74d699018ac
+_md5_=7c3de8670a4bab5de4d0826e27c5fedc
diff --git a/metadata/md5-cache/dev-python/dbus-python-1.2.0 b/metadata/md5-cache/dev-python/dbus-python-1.2.0
index e368df066c54..9e40e4ab9bc3 100644
--- a/metadata/md5-cache/dev-python/dbus-python-1.2.0
+++ b/metadata/md5-cache/dev-python/dbus-python-1.2.0
@@ -4,11 +4,11 @@ DESCRIPTION=Python bindings for the D-Bus messagebus
 EAPI=5
 HOMEPAGE=http://www.freedesktop.org/wiki/Software/DBusBindings http://dbus.freedesktop.org/doc/dbus-python/
 IUSE=doc examples test python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=>=dev-libs/dbus-glib-0.100:= >=sys-apps/dbus-1.6:= 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 ) dev-python/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=doc? ( || ( python_targets_python2_6 python_targets_python2_7 ) )
 SLOT=0
 SRC_URI=http://dbus.freedesktop.org/releases/dbus-python/dbus-python-1.2.0.tar.gz
 _eclasses_=eutils	b8fdb86895c268cca7ae1626264a30f4	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	0e2bc7326c807a3e8133847eadc3dd26	python-utils-r1	9fc80a4f06f33ede447b5647fddca301	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=c0468ee0ad2d2bdf30107da6947372fc
+_md5_=936ca82847c19debb5878ac62aa57ba5
diff --git a/metadata/md5-cache/dev-python/django-pipeline-1.2.24 b/metadata/md5-cache/dev-python/django-pipeline-1.2.24
new file mode 100644
index 000000000000..4a3ea52e80dc
--- /dev/null
+++ b/metadata/md5-cache/dev-python/django-pipeline-1.2.24
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/django-1.4[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
+DESCRIPTION=An asset packaging library for Django
+EAPI=5
+HOMEPAGE=http://pypi.python.org/pypi/django-pipeline/
+IUSE=doc python_targets_python2_6 python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/django-1.4[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
+SLOT=0
+SRC_URI=mirror://pypi/d/django-pipeline/django-pipeline-1.2.24.tar.gz
+_eclasses_=distutils-r1	10e59ecabebf0c37ad5cd8827434b108	eutils	b8fdb86895c268cca7ae1626264a30f4	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	0e2bc7326c807a3e8133847eadc3dd26	python-utils-r1	9fc80a4f06f33ede447b5647fddca301	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=8e34d19387198d7a42b59fd9edb7adf1
diff --git a/metadata/md5-cache/dev-python/django-pipeline-1.3.9 b/metadata/md5-cache/dev-python/django-pipeline-1.3.9
new file mode 100644
index 000000000000..6501652a9274
--- /dev/null
+++ b/metadata/md5-cache/dev-python/django-pipeline-1.3.9
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/django-1.4.1[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] dev-python/setuptools[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] test? ( dev-python/futures[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 ) 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 ) dev-python/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=An asset packaging library for Django
+EAPI=5
+HOMEPAGE=http://pypi.python.org/pypi/django-pipeline/
+IUSE=doc test python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/django-1.4.1[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 ) 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 ) dev-python/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(-)]
+SLOT=0
+SRC_URI=mirror://pypi/d/django-pipeline/django-pipeline-1.3.9.tar.gz
+_eclasses_=distutils-r1	10e59ecabebf0c37ad5cd8827434b108	eutils	b8fdb86895c268cca7ae1626264a30f4	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	0e2bc7326c807a3e8133847eadc3dd26	python-utils-r1	9fc80a4f06f33ede447b5647fddca301	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=13147a74ed9638f26d816cc16324b0a7
diff --git a/metadata/md5-cache/dev-python/docutils-0.10 b/metadata/md5-cache/dev-python/docutils-0.10
index 490dd6da6a2b..db94d246c4f5 100644
--- a/metadata/md5-cache/dev-python/docutils-0.10
+++ b/metadata/md5-cache/dev-python/docutils-0.10
@@ -4,10 +4,10 @@ DESCRIPTION=Python Documentation Utilities
 EAPI=5
 HOMEPAGE=http://docutils.sourceforge.net/ http://pypi.python.org/pypi/docutils
 IUSE=glep python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 python_targets_python3_1 python_targets_python3_2 python_targets_python3_3 python_targets_pypy1_9 python_targets_pypy2_0
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~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
+KEYWORDS=~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~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=BSD-2 GPL-3 public-domain
 RDEPEND=dev-python/pygments[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)] glep? ( dev-python/docutils-glep[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)] ) python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_1? ( dev-lang/python:3.1 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) python_targets_pypy1_9? ( dev-python/pypy:1.9 ) python_targets_pypy2_0? ( dev-python/pypy:2.0 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)]
 SLOT=0
 SRC_URI=mirror://sourceforge/docutils/docutils-0.10.tar.gz
 _eclasses_=distutils-r1	10e59ecabebf0c37ad5cd8827434b108	eutils	b8fdb86895c268cca7ae1626264a30f4	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	0e2bc7326c807a3e8133847eadc3dd26	python-utils-r1	9fc80a4f06f33ede447b5647fddca301	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=4290feace340e8c0682daf81654f46ff
+_md5_=a3188db04e6fa3bbc56a9e9454b3f098
diff --git a/metadata/md5-cache/dev-python/docutils-glep-0.4-r1 b/metadata/md5-cache/dev-python/docutils-glep-0.4-r1
index 45d7eb45aabe..c1e97c39982a 100644
--- a/metadata/md5-cache/dev-python/docutils-glep-0.4-r1
+++ b/metadata/md5-cache/dev-python/docutils-glep-0.4-r1
@@ -3,10 +3,10 @@ DESCRIPTION=Gentoo GLEP support for docutils
 EAPI=5
 HOMEPAGE=http://www.gentoo.org/proj/en/glep/
 IUSE=python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 python_targets_python3_1 python_targets_python3_2 python_targets_python3_3 python_targets_pypy1_9 python_targets_pypy2_0
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~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
+KEYWORDS=~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~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=public-domain
 RDEPEND=>=dev-python/docutils-0.10[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)]
 SLOT=0
 SRC_URI=mirror://gentoo/glep-0.4-r1.tbz2
 _eclasses_=eutils	b8fdb86895c268cca7ae1626264a30f4	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	0e2bc7326c807a3e8133847eadc3dd26	python-utils-r1	9fc80a4f06f33ede447b5647fddca301	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=274522d8616b870a846cab61f99a5270
+_md5_=cbbd241f3f4296e76ce96567159cca24
diff --git a/metadata/md5-cache/dev-python/fpconst-0.7.3-r1 b/metadata/md5-cache/dev-python/fpconst-0.7.3-r1
index 99cf160e931b..61de8cab6aa9 100644
--- a/metadata/md5-cache/dev-python/fpconst-0.7.3-r1
+++ b/metadata/md5-cache/dev-python/fpconst-0.7.3-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Python Module for handling IEEE 754 floating point special values
 EAPI=5
 HOMEPAGE=http://chaco.bst.rochester.edu:8080/statcomp/projects/RStatServer/fpconst/ http://pypi.python.org/pypi/fpconst http://sourceforge.net/projects/rsoap/files/
 IUSE=python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 python_targets_pypy1_9 python_targets_pypy2_0
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=GPL-2
 RDEPEND=python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_pypy1_9? ( dev-python/pypy:1.9 ) python_targets_pypy2_0? ( dev-python/pypy:2.0 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)]
 SLOT=0
 SRC_URI=mirror://sourceforge/rsoap/fpconst-0.7.3.tar.gz
 _eclasses_=distutils-r1	10e59ecabebf0c37ad5cd8827434b108	eutils	b8fdb86895c268cca7ae1626264a30f4	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	0e2bc7326c807a3e8133847eadc3dd26	python-utils-r1	9fc80a4f06f33ede447b5647fddca301	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=b3e5fa2206fdf854df939214f7a120da
+_md5_=f4ebf67851709bbd6c71ec33b084c62f
diff --git a/metadata/md5-cache/dev-python/pygame-1.9.2_pre20120101-r2 b/metadata/md5-cache/dev-python/pygame-1.9.2_pre20120101-r2
index c8db6bd6fd75..181b9380329d 100644
--- a/metadata/md5-cache/dev-python/pygame-1.9.2_pre20120101-r2
+++ b/metadata/md5-cache/dev-python/pygame-1.9.2_pre20120101-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Python bindings for SDL multimedia library
 EAPI=5
 HOMEPAGE=http://www.pygame.org/
 IUSE=doc examples X python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 test
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ppc ~sparc x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm hppa ia64 ppc ~sparc x86 ~x86-fbsd
 LICENSE=LGPL-2.1
 RDEPEND=dev-python/numpy[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] >=media-libs/sdl-image-1.2.2[png,jpeg] >=media-libs/sdl-mixer-1.2.4 >=media-libs/sdl-ttf-2.0.6 >=media-libs/smpeg-0.4.4-r1 X? ( >=media-libs/libsdl-1.2.5[X,video] ) !X? ( >=media-libs/libsdl-1.2.5 ) python_targets_python2_5? ( dev-lang/python:2.5 ) 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 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)]
 SLOT=0
 SRC_URI=http://people.apache.org/~Arfrever/gentoo/pygame-1.9.2_pre20120101.tar.xz
 _eclasses_=distutils-r1	10e59ecabebf0c37ad5cd8827434b108	eutils	b8fdb86895c268cca7ae1626264a30f4	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	0e2bc7326c807a3e8133847eadc3dd26	python-utils-r1	9fc80a4f06f33ede447b5647fddca301	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=e82e5f6ac521548327e854f94c78afd4
+_md5_=274476b99912b35f4d91a7acb958c963
diff --git a/metadata/md5-cache/dev-python/pygments-1.6 b/metadata/md5-cache/dev-python/pygments-1.6
index ae24602ded1e..4f3a0ff7b868 100644
--- a/metadata/md5-cache/dev-python/pygments-1.6
+++ b/metadata/md5-cache/dev-python/pygments-1.6
@@ -4,10 +4,10 @@ DESCRIPTION=Pygments is a syntax highlighting package written in Python.
 EAPI=5
 HOMEPAGE=http://pygments.org/ http://pypi.python.org/pypi/Pygments
 IUSE=doc test python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 python_targets_python3_1 python_targets_python3_2 python_targets_python3_3 python_targets_pypy1_9 python_targets_pypy2_0
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=dev-python/setuptools[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)] python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_1? ( dev-lang/python:3.1 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) python_targets_pypy1_9? ( dev-python/pypy:1.9 ) python_targets_pypy2_0? ( dev-python/pypy:2.0 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)]
 SLOT=0
 SRC_URI=mirror://pypi/P/Pygments/Pygments-1.6.tar.gz
 _eclasses_=distutils-r1	10e59ecabebf0c37ad5cd8827434b108	eutils	b8fdb86895c268cca7ae1626264a30f4	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	0e2bc7326c807a3e8133847eadc3dd26	python-utils-r1	9fc80a4f06f33ede447b5647fddca301	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=493553f7b8fda1811b705aaff91268ac
+_md5_=fec6541ed89448cb58a992ea80555e23
diff --git a/metadata/md5-cache/dev-python/python-dateutil-2.1-r1 b/metadata/md5-cache/dev-python/python-dateutil-2.1-r1
index 70c1958594c9..ab374d7d434a 100644
--- a/metadata/md5-cache/dev-python/python-dateutil-2.1-r1
+++ b/metadata/md5-cache/dev-python/python-dateutil-2.1-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Extensions to the standard Python datetime module
 EAPI=5
 HOMEPAGE=https://launchpad.net/dateutil http://pypi.python.org/pypi/python-dateutil
 IUSE=examples python_targets_python2_6 python_targets_python2_7 python_targets_python3_1 python_targets_python3_2 python_targets_python3_3 python_targets_pypy1_9 python_targets_pypy2_0
-KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=BSD
 RDEPEND=dev-python/six[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)] sys-libs/timezone-data !<dev-python/python-dateutil-2.1 python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_1? ( dev-lang/python:3.1 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) python_targets_pypy1_9? ( dev-python/pypy:1.9 ) python_targets_pypy2_0? ( dev-python/pypy:2.0 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)]
 SLOT=0
 SRC_URI=mirror://pypi/p/python-dateutil/python-dateutil-2.1.tar.gz
 _eclasses_=distutils-r1	10e59ecabebf0c37ad5cd8827434b108	eutils	b8fdb86895c268cca7ae1626264a30f4	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	0e2bc7326c807a3e8133847eadc3dd26	python-utils-r1	9fc80a4f06f33ede447b5647fddca301	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=26f53d24e60cc136be2fe4692bc399fb
+_md5_=def6901644640dfdf9eb3750c786f553
diff --git a/metadata/md5-cache/dev-python/six-1.3.0 b/metadata/md5-cache/dev-python/six-1.3.0
index 01af39454cc3..b3e06b4a857e 100644
--- a/metadata/md5-cache/dev-python/six-1.3.0
+++ b/metadata/md5-cache/dev-python/six-1.3.0
@@ -4,10 +4,10 @@ DESCRIPTION=Python 2 and 3 compatibility library
 EAPI=5
 HOMEPAGE=https://bitbucket.org/gutworth/six http://pypi.python.org/pypi/six
 IUSE=doc test python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 python_targets_python3_1 python_targets_python3_2 python_targets_python3_3 python_targets_pypy1_9 python_targets_pypy2_0
-KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
+KEYWORDS=~amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=MIT
 RDEPEND=python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_1? ( dev-lang/python:3.1 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) python_targets_pypy1_9? ( dev-python/pypy:1.9 ) python_targets_pypy2_0? ( dev-python/pypy:2.0 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)]
 SLOT=0
 SRC_URI=mirror://pypi/s/six/six-1.3.0.tar.gz
 _eclasses_=distutils-r1	10e59ecabebf0c37ad5cd8827434b108	eutils	b8fdb86895c268cca7ae1626264a30f4	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	0e2bc7326c807a3e8133847eadc3dd26	python-utils-r1	9fc80a4f06f33ede447b5647fddca301	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=1b152705fa54b4b5e4aa2c374067550a
+_md5_=f5a30ae078fbf83ca8f0872b07b29a19
diff --git a/metadata/md5-cache/dev-python/south-0.7.5-r1 b/metadata/md5-cache/dev-python/south-0.7.5-r1
new file mode 100644
index 000000000000..c86d29ea9a4e
--- /dev/null
+++ b/metadata/md5-cache/dev-python/south-0.7.5-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare test unpack
+DEPEND=dev-python/django[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] doc? ( dev-python/sphinx[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/jinja[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
+DESCRIPTION=Intelligent schema migrations for Django apps.
+EAPI=5
+HOMEPAGE=http://south.aeracode.org/
+IUSE=doc test python_targets_python2_6 python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-python/django[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
+SLOT=0
+SRC_URI=https://bitbucket.org/andrewgodwin/south/get/0.7.5.tar.gz -> south-0.7.5.tar.gz
+_eclasses_=distutils-r1	10e59ecabebf0c37ad5cd8827434b108	eutils	b8fdb86895c268cca7ae1626264a30f4	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	0e2bc7326c807a3e8133847eadc3dd26	python-utils-r1	9fc80a4f06f33ede447b5647fddca301	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=f39301ac62cbaceca6fca1fa97278b24
diff --git a/metadata/md5-cache/dev-python/south-0.7.6 b/metadata/md5-cache/dev-python/south-0.7.6
new file mode 100644
index 000000000000..3304cc1e31d0
--- /dev/null
+++ b/metadata/md5-cache/dev-python/south-0.7.6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare test unpack
+DEPEND=dev-python/django dev-python/setuptools doc? ( dev-python/sphinx dev-python/jinja ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
+DESCRIPTION=Intelligent schema migrations for Django apps.
+EAPI=5
+HOMEPAGE=http://south.aeracode.org/
+IUSE=doc test python_targets_python2_6 python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-python/django python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
+SLOT=0
+SRC_URI=https://bitbucket.org/andrewgodwin/south/get/0.7.6.tar.gz -> south-0.7.6.tar.gz
+_eclasses_=distutils-r1	10e59ecabebf0c37ad5cd8827434b108	eutils	b8fdb86895c268cca7ae1626264a30f4	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	0e2bc7326c807a3e8133847eadc3dd26	python-utils-r1	9fc80a4f06f33ede447b5647fddca301	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=f7da57c3b22af639b3c3e0e976a7214b
diff --git a/metadata/md5-cache/dev-python/tempita-0.5.1-r1 b/metadata/md5-cache/dev-python/tempita-0.5.1-r1
index 7ec92c6c5653..449fdc4a3adf 100644
--- a/metadata/md5-cache/dev-python/tempita-0.5.1-r1
+++ b/metadata/md5-cache/dev-python/tempita-0.5.1-r1
@@ -4,10 +4,10 @@ DESCRIPTION=A very small text templating language
 EAPI=5
 HOMEPAGE=http://pythonpaste.org/tempita http://pypi.python.org/pypi/Tempita
 IUSE=test python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 python_targets_pypy1_9 python_targets_pypy2_0
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 ~sh ~sparc ~x86
+KEYWORDS=~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=MIT
 RDEPEND=dev-python/setuptools[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)] python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_pypy1_9? ( dev-python/pypy:1.9 ) python_targets_pypy2_0? ( dev-python/pypy:2.0 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)]
 SLOT=0
 SRC_URI=mirror://pypi/T/Tempita/Tempita-0.5.1.tar.gz
 _eclasses_=distutils-r1	10e59ecabebf0c37ad5cd8827434b108	eutils	b8fdb86895c268cca7ae1626264a30f4	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	0e2bc7326c807a3e8133847eadc3dd26	python-utils-r1	9fc80a4f06f33ede447b5647fddca301	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=224050068bc94741051c83adc715d499
+_md5_=94c0e37346cf9aeac197b41dbf1cb3fa
diff --git a/metadata/md5-cache/dev-python/testtools-0.9.24-r1 b/metadata/md5-cache/dev-python/testtools-0.9.24-r1
index d6e8cd1580a5..c4e6645872f5 100644
--- a/metadata/md5-cache/dev-python/testtools-0.9.24-r1
+++ b/metadata/md5-cache/dev-python/testtools-0.9.24-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Extensions to the Python unittest library
 EAPI=5
 HOMEPAGE=https://launchpad.net/testtools http://pypi.python.org/pypi/testtools
 IUSE=python_targets_python2_6 python_targets_python2_7 python_targets_python3_1 python_targets_python3_2 python_targets_python3_3 python_targets_pypy1_9 python_targets_pypy2_0
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 RDEPEND=python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_1? ( dev-lang/python:3.1 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) python_targets_pypy1_9? ( dev-python/pypy:1.9 ) python_targets_pypy2_0? ( dev-python/pypy:2.0 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)]
 SLOT=0
 SRC_URI=http://launchpad.net/testtools/0.9/0.9.24/+download/testtools-0.9.24.tar.gz
 _eclasses_=distutils-r1	10e59ecabebf0c37ad5cd8827434b108	eutils	b8fdb86895c268cca7ae1626264a30f4	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	0e2bc7326c807a3e8133847eadc3dd26	python-utils-r1	9fc80a4f06f33ede447b5647fddca301	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=151a23a6471c7dd7f3d9f434bdc08af5
+_md5_=0e33ca9dcc8d17ca42a4b46b525ea7e6
diff --git a/metadata/md5-cache/dev-scheme/guile-lib-0.1.9 b/metadata/md5-cache/dev-scheme/guile-lib-0.1.9
index 90fa9f687ee5..df487b423b70 100644
--- a/metadata/md5-cache/dev-scheme/guile-lib-0.1.9
+++ b/metadata/md5-cache/dev-scheme/guile-lib-0.1.9
@@ -3,10 +3,10 @@ DEPEND=dev-scheme/guile[regex,deprecated] !<dev-libs/g-wrap-1.9.8
 DESCRIPTION=An accumulation place for pure-scheme Guile modules
 EAPI=3
 HOMEPAGE=http://www.nongnu.org/guile-lib/
-KEYWORDS=~alpha amd64 ~hppa ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 hppa ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=dev-scheme/guile[regex,deprecated]
 SLOT=0
 SRC_URI=http://download.savannah.gnu.org/releases/guile-lib/guile-lib-0.1.9.tar.gz
 _eclasses_=eutils	b8fdb86895c268cca7ae1626264a30f4	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=1b5738b83e9cbb8d9d27ddc1965c87a6
+_md5_=7c2f8ca890971c5f3ecbf88e31cb5228
diff --git a/metadata/md5-cache/dev-tex/glossaries-3.01 b/metadata/md5-cache/dev-tex/glossaries-3.01
deleted file mode 100644
index cb63b723e775..000000000000
--- a/metadata/md5-cache/dev-tex/glossaries-3.01
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare unpack
-DEPEND=dev-lang/perl dev-texlive/texlive-latexrecommended >=dev-texlive/texlive-latexextra-2008 app-arch/unzip virtual/latex-base >=sys-apps/texinfo-4.2-r5
-DESCRIPTION=Create glossaries and lists of acronyms.
-EAPI=4
-HOMEPAGE=http://www.ctan.org/tex-archive/help/Catalogue/entries/glossaries.html
-IUSE=doc examples
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=LPPL-1.2
-RDEPEND=dev-lang/perl dev-texlive/texlive-latexrecommended >=dev-texlive/texlive-latexextra-2008 virtual/latex-base
-SLOT=0
-SRC_URI=mirror://gentoo/glossaries-3.01.zip
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	b8fdb86895c268cca7ae1626264a30f4	latex-package	e7bfe03b27224512702eac009812cc50	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=f96d7a10bbcd1536f916bd0b18a77182
diff --git a/metadata/md5-cache/dev-tex/glossaries-3.02 b/metadata/md5-cache/dev-tex/glossaries-3.02
deleted file mode 100644
index bf2cd3407f55..000000000000
--- a/metadata/md5-cache/dev-tex/glossaries-3.02
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare unpack
-DEPEND=dev-lang/perl dev-texlive/texlive-latexrecommended >=dev-texlive/texlive-latexextra-2008 app-arch/unzip virtual/latex-base >=sys-apps/texinfo-4.2-r5
-DESCRIPTION=Create glossaries and lists of acronyms.
-EAPI=4
-HOMEPAGE=http://www.ctan.org/tex-archive/help/Catalogue/entries/glossaries.html
-IUSE=doc examples
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=LPPL-1.2
-RDEPEND=dev-lang/perl dev-texlive/texlive-latexrecommended >=dev-texlive/texlive-latexextra-2008 virtual/latex-base
-SLOT=0
-SRC_URI=mirror://gentoo/glossaries-3.02.zip
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	b8fdb86895c268cca7ae1626264a30f4	latex-package	e7bfe03b27224512702eac009812cc50	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=1d016c755c91494425f1bc5ddf341970
diff --git a/metadata/md5-cache/dev-tex/glossaries-3.03 b/metadata/md5-cache/dev-tex/glossaries-3.03
deleted file mode 100644
index ad99188a10ae..000000000000
--- a/metadata/md5-cache/dev-tex/glossaries-3.03
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare unpack
-DEPEND=dev-lang/perl dev-texlive/texlive-latexrecommended >=dev-texlive/texlive-latexextra-2008 app-arch/unzip virtual/latex-base >=sys-apps/texinfo-4.2-r5
-DESCRIPTION=Create glossaries and lists of acronyms.
-EAPI=4
-HOMEPAGE=http://www.ctan.org/tex-archive/help/Catalogue/entries/glossaries.html
-IUSE=doc examples
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=LPPL-1.2
-RDEPEND=dev-lang/perl dev-texlive/texlive-latexrecommended >=dev-texlive/texlive-latexextra-2008 virtual/latex-base
-SLOT=0
-SRC_URI=mirror://gentoo/glossaries-3.03.zip
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	b8fdb86895c268cca7ae1626264a30f4	latex-package	e7bfe03b27224512702eac009812cc50	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=679d1e1758c942b73f29b39617b30991
diff --git a/metadata/md5-cache/dev-tex/glossaries-3.04 b/metadata/md5-cache/dev-tex/glossaries-3.04
index 3acefbd7b6c1..0269971141da 100644
--- a/metadata/md5-cache/dev-tex/glossaries-3.04
+++ b/metadata/md5-cache/dev-tex/glossaries-3.04
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare unpack
-DEPEND=dev-lang/perl dev-texlive/texlive-latexrecommended >=dev-texlive/texlive-latexextra-2008 app-arch/unzip virtual/latex-base >=sys-apps/texinfo-4.2-r5
+DEPEND=dev-lang/perl dev-texlive/texlive-latexrecommended >=dev-texlive/texlive-latexextra-2012 app-arch/unzip virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DESCRIPTION=Create glossaries and lists of acronyms.
 EAPI=5
 HOMEPAGE=http://www.ctan.org/tex-archive/help/Catalogue/entries/glossaries.html
 IUSE=doc examples
 KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=LPPL-1.2
-RDEPEND=dev-lang/perl dev-texlive/texlive-latexrecommended >=dev-texlive/texlive-latexextra-2008 virtual/latex-base
+RDEPEND=dev-lang/perl dev-texlive/texlive-latexrecommended >=dev-texlive/texlive-latexextra-2012 virtual/latex-base
 SLOT=0
 SRC_URI=mirror://gentoo/glossaries-3.04.zip
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	b8fdb86895c268cca7ae1626264a30f4	latex-package	e7bfe03b27224512702eac009812cc50	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=59fcdb330a6fc2e2713ed6f1b895cf3a
+_md5_=ecdcabb530b808c11361a5b100fb5c93
diff --git a/metadata/md5-cache/dev-tex/serienbrief-0.2.4 b/metadata/md5-cache/dev-tex/serienbrief-0.2.4
new file mode 100644
index 000000000000..3c38059d7758
--- /dev/null
+++ b/metadata/md5-cache/dev-tex/serienbrief-0.2.4
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DESCRIPTION=Easy creation of form letters written in LaTeX
+EAPI=4
+HOMEPAGE=http://nasauber.de/opensource/serienbrief/
+IUSE=linguas_de
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-lang/perl-5.8.6 virtual/perl-Getopt-Long >=virtual/perl-Term-ANSIColor-1.08 >=dev-perl/libintl-perl-1.16 virtual/latex-base
+SLOT=0
+SRC_URI=http://nasauber.de/opensource/serienbrief/serienbrief-0.2.4.tar.gz
+_md5_=4a2485e243d9a26946d0d28cee577d5d
diff --git a/metadata/md5-cache/dev-util/debhelper-9.20130516 b/metadata/md5-cache/dev-util/debhelper-9.20130516
new file mode 100644
index 000000000000..043d27eb8edc
--- /dev/null
+++ b/metadata/md5-cache/dev-util/debhelper-9.20130516
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install
+DEPEND=>=dev-lang/perl-5.10 app-arch/dpkg dev-perl/TimeDate virtual/perl-Getopt-Long linguas_de? ( >=app-text/po4a-0.24 ) linguas_es? ( >=app-text/po4a-0.24 ) linguas_fr? ( >=app-text/po4a-0.24 ) test? ( dev-perl/Test-Pod )
+DESCRIPTION=Collection of programs that can be used to automate common tasks in debian/rules
+EAPI=5
+HOMEPAGE=http://packages.qa.debian.org/d/debhelper.html http://joeyh.name/code/debhelper/
+IUSE=test linguas_de linguas_es linguas_fr
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-lang/perl-5.10 app-arch/dpkg dev-perl/TimeDate virtual/perl-Getopt-Long
+SLOT=0
+SRC_URI=mirror://debian/pool/main/d/debhelper/debhelper_9.20130516.tar.gz
+_eclasses_=eutils	b8fdb86895c268cca7ae1626264a30f4	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=638a6112ffde7570535738a21b0f8510
diff --git a/metadata/md5-cache/games-engines/renpy-6.15.4 b/metadata/md5-cache/games-engines/renpy-6.15.4
index c81ebed5f33b..629a19b39e15 100644
--- a/metadata/md5-cache/games-engines/renpy-6.15.4
+++ b/metadata/md5-cache/games-engines/renpy-6.15.4
@@ -4,11 +4,11 @@ DESCRIPTION=Visual novel engine written in python
 EAPI=5
 HOMEPAGE=http://www.renpy.org
 IUSE=development doc examples python_targets_python2_6 python_targets_python2_7
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=MIT
 RDEPEND=>=app-admin/eselect-renpy-0.2 dev-libs/fribidi dev-python/pygame[X,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] >=dev-python/python-exec-0.3[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] media-libs/glew media-libs/libpng:0 media-libs/libsdl[X,video] media-libs/freetype:2 sys-libs/zlib virtual/ffmpeg virtual/python-argparse[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
 REQUIRED_USE=examples? ( development )
 SLOT=6.15
 SRC_URI=http://www.renpy.org/dl/6.15.4/renpy-6.15.4-source.tar.bz2
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	distutils-r1	10e59ecabebf0c37ad5cd8827434b108	eutils	b8fdb86895c268cca7ae1626264a30f4	games	0fb7637597e0869f6c8be79b11d0135a	gnome2-utils	794d2847b4af390a1e020924876c8297	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	0e2bc7326c807a3e8133847eadc3dd26	python-utils-r1	9fc80a4f06f33ede447b5647fddca301	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=0f524c02b0147ce2769903aac45326f5
+_md5_=664dd810e2903a6fc988a2169bc4b896
diff --git a/metadata/md5-cache/games-strategy/dunelegacy-0.96.3 b/metadata/md5-cache/games-strategy/dunelegacy-0.96.3
index 7ebce303d97d..b08b5a3357bb 100644
--- a/metadata/md5-cache/games-strategy/dunelegacy-0.96.3
+++ b/metadata/md5-cache/games-strategy/dunelegacy-0.96.3
@@ -4,11 +4,11 @@ DESCRIPTION=Updated clone of Westood Studios' Dune2
 EAPI=5
 HOMEPAGE=http://dunelegacy.sourceforge.net
 IUSE=+alsa pulseaudio
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm ~x86
 LICENSE=GPL-2
 RDEPEND=media-libs/libsdl[X,alsa?,audio,pulseaudio?,video] media-libs/sdl-mixer[midi,mp3,vorbis]
 REQUIRED_USE=|| ( alsa pulseaudio )
 SLOT=0
 SRC_URI=mirror://sourceforge/dunelegacy/dunelegacy-0.96.3-src.tar.bz2 http://dev.gentoo.org/~hasufell/distfiles/dunelegacy-0.96.3-no-autoreconf.patch.xz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	b8fdb86895c268cca7ae1626264a30f4	games	0fb7637597e0869f6c8be79b11d0135a	gnome2-utils	794d2847b4af390a1e020924876c8297	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=0819fe95664cf0489be671df3a31f428
+_md5_=9d9243080c3b80f8d9863c7696078987
diff --git a/metadata/md5-cache/kde-misc/adjustableclock-4.1 b/metadata/md5-cache/kde-misc/adjustableclock-4.1
new file mode 100644
index 000000000000..8cc3b162af1c
--- /dev/null
+++ b/metadata/md5-cache/kde-misc/adjustableclock-4.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-base/libplasmaclock-4.4:4[aqua=] >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 >=dev-qt/qtgui-4.8.0:4[accessibility,dbus] >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
+DESCRIPTION=Plasmoid to show date and time in adjustable format using rich text.
+EAPI=5
+HOMEPAGE=http://kde-look.org/content/show.php/Adjustable+Clock?content=92825
+IUSE=debug linguas_de linguas_et linguas_pl linguas_pt linguas_pt_BR linguas_sv linguas_tr linguas_uk aqua
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-base/libplasmaclock-4.4:4[aqua=] >=kde-base/plasma-workspace-4.4:4[aqua=] >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_et? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_et(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sv(+)] ) linguas_tr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_tr(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_uk(+)] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 >=dev-qt/qtgui-4.8.0:4[accessibility,dbus] >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
+SLOT=4
+SRC_URI=http://kde-look.org/CONTENT/content-files/92825-adjustableclock-4.1.tar.bz2
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	bc8bbf26de246f74e2901a3696ad96d6	eutils	b8fdb86895c268cca7ae1626264a30f4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome2-utils	794d2847b4af390a1e020924876c8297	kde4-base	2cedb58982ff5f6a497a00d05779530a	kde4-functions	597dae8331dc9b795e3a5797bf7da048	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_md5_=a698d6bd0bf08ac6895e849d8663c973
diff --git a/metadata/md5-cache/mail-client/roundcube-0.9.1 b/metadata/md5-cache/mail-client/roundcube-0.9.1
new file mode 100644
index 000000000000..762337865d88
--- /dev/null
+++ b/metadata/md5-cache/mail-client/roundcube-0.9.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst prepare prerm setup
+DEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
+DESCRIPTION=A browser-based multilingual IMAP client with an application-like user interface
+EAPI=5
+HOMEPAGE=http://roundcube.net
+IUSE=ldap +mysql postgres sqlite ssl spell vhosts
+KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-3 BSD PHP-2.02 PHP-3 MIT public-domain
+RDEPEND=virtual/httpd-php >=dev-lang/php-5.3[crypt,gd,iconv,json,ldap?,pdo,postgres?,session,sockets,ssl?,xml,unicode] mysql? ( || ( dev-lang/php[mysql] dev-lang/php[mysqli] ) ) spell? ( dev-lang/php[curl,spell] ) sqlite? ( || ( dev-lang/php[sqlite] dev-lang/php[sqlite3] ) ) >=dev-php/PEAR-Mail_Mime-1.8.1 >=dev-php/PEAR-Net_SMTP-1.4.2 >=dev-php/PEAR-Net_IDNA2-0.1.1 >=dev-php/PEAR-Auth_SASL-1.0.3 >=app-admin/webapp-config-1.50.15
+SLOT=0.9.1
+SRC_URI=mirror://sourceforge/roundcubemail/roundcubemail-0.9.1.tar.gz
+_eclasses_=webapp	25b9b1696f5e698711f47d45c3d45e3e
+_md5_=3bdb4881670929e06b7ac88a81e30c39
diff --git a/metadata/md5-cache/mail-filter/dovecot-antispam-2.0_pre20120226 b/metadata/md5-cache/mail-filter/dovecot-antispam-2.0_pre20120226
index a7884ebaa19a..c227e5ffc055 100644
--- a/metadata/md5-cache/mail-filter/dovecot-antispam-2.0_pre20120226
+++ b/metadata/md5-cache/mail-filter/dovecot-antispam-2.0_pre20120226
@@ -1,12 +1,12 @@
 DEFINED_PHASES=postinst prepare
-DEPEND=>=net-mail/dovecot-2.1.0 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND==net-mail/dovecot-2.1* || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A dovecot antispam plugin supporting multiple backends
 EAPI=4
 HOMEPAGE=http://wiki2.dovecot.org/Plugins/Antispam
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=net-mail/dovecot-2.1.0
+RDEPEND==net-mail/dovecot-2.1*
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~radhermit/distfiles/dovecot-antispam-2.0_pre20120226.tar.bz2
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
-_md5_=654ed437ce023736ded9e7619b492eee
+_md5_=fd434d2ca32be7c5c710dd970c3cd297
diff --git a/metadata/md5-cache/mail-filter/dovecot-antispam-2.0_pre20130429 b/metadata/md5-cache/mail-filter/dovecot-antispam-2.0_pre20130429
index 185c085925b9..64334a4fc505 100644
--- a/metadata/md5-cache/mail-filter/dovecot-antispam-2.0_pre20130429
+++ b/metadata/md5-cache/mail-filter/dovecot-antispam-2.0_pre20130429
@@ -1,12 +1,12 @@
 DEFINED_PHASES=postinst prepare
-DEPEND=>=net-mail/dovecot-2.1.0 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=net-mail/dovecot-2.1.16 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A dovecot antispam plugin supporting multiple backends
 EAPI=5
 HOMEPAGE=http://wiki2.dovecot.org/Plugins/Antispam/
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=net-mail/dovecot-2.1.0
+RDEPEND=>=net-mail/dovecot-2.1.16
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~radhermit/distfiles/dovecot-antispam-2.0_pre20130429.tar.bz2
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
-_md5_=dae8ebf9072221ea8bdc744cdcef4532
+_md5_=6706f48ee259d81d39c96b332ca2ae9c
diff --git a/metadata/md5-cache/media-fonts/culmus-0.120-r4 b/metadata/md5-cache/media-fonts/culmus-0.120-r4
index 32ecbe7bd09f..926abc73afae 100644
--- a/metadata/md5-cache/media-fonts/culmus-0.120-r4
+++ b/metadata/md5-cache/media-fonts/culmus-0.120-r4
@@ -4,10 +4,10 @@ DESCRIPTION=Hebrew Type1 fonts
 EAPI=2
 HOMEPAGE=http://culmus.sourceforge.net/
 IUSE=ancient fancy fontforge taamey X
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
 LICENSE=|| ( GPL-2 LICENSE-BITSTREAM ) ancient? ( MIT ) fancy? ( GPL-2 )
 RDEPEND=!media-fonts/culmus-ancient X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0
 SLOT=0
 SRC_URI=mirror://sourceforge/culmus/culmus-0.120.tar.gz mirror://sourceforge/culmus/culmus-type1-0.105.tar.gz fontforge? ( mirror://sourceforge/culmus/culmus-src-0.120.tar.gz ) ancient? ( !fontforge? ( mirror://sourceforge/culmus/AncientSemiticFonts-0.06-1.TTF.tgz ) fontforge? ( mirror://sourceforge/culmus/AncientSemiticFonts-0.06-1.tgz ) ) fancy? ( http://culmus.sourceforge.net/fancy/journal.tar.gz http://culmus.sourceforge.net/fancy/hillel.tar.gz http://culmus.sourceforge.net/fancy/anka.tar.gz http://culmus.sourceforge.net/fancy/comix.tar.gz http://culmus.sourceforge.net/fancy/gan.tar.gz http://culmus.sourceforge.net/fancy/ozrad.tar.gz http://culmus.sourceforge.net/fancy/ktav-yad.tar.gz http://culmus.sourceforge.net/fancy/dorian.tar.gz http://culmus.sourceforge.net/fancy/gladia.tar.gz http://culmus.sourceforge.net/fancy/horev.tar.gz ) fancy? ( http://culmus.sourceforge.net/fancy-yg/ShmuelCLM.zip http://culmus.sourceforge.net/fancy-yg/MakabiYG.zip ) taamey? ( http://culmus.sourceforge.net/taamim/TaameyDavidCLM.zip http://culmus.sourceforge.net/taamim/TaameyFrankCLM.zip http://culmus.sourceforge.net/taamim/KeterAramTsova.zip http://culmus.sourceforge.net/taamim/KeterYG.zip )
 _eclasses_=eutils	b8fdb86895c268cca7ae1626264a30f4	font	496e78852e1e48010965fdd33a505f9c	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=8c9488239992747abbc17c1bf8a64c35
+_md5_=c275359e92f938a64c4e5e099a91e736
diff --git a/metadata/md5-cache/media-gfx/dpic-20130310 b/metadata/md5-cache/media-gfx/dpic-20130310
new file mode 100644
index 000000000000..afab4ddf7a3f
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/dpic-20130310
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install
+DESCRIPTION=Converts PIC plots into pstricks, PGF/TikZ, PostScript, MetaPost and TeX
+EAPI=5
+HOMEPAGE=http://ece.uwaterloo.ca/~aplevich/dpic
+IUSE=examples
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-2 CC-BY-3.0 GPL-2+
+SLOT=0
+SRC_URI=https://ece.uwaterloo.ca/~aplevich/dpic/dpic-2013.03.10.tar.gz
+_eclasses_=multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
+_md5_=15d1249b3d806ff4e0123d4abf96c9c2
diff --git a/metadata/md5-cache/media-gfx/pydot-1.0.28-r1 b/metadata/md5-cache/media-gfx/pydot-1.0.28-r1
index 7be96ff3b12b..3bcf073fba62 100644
--- a/metadata/md5-cache/media-gfx/pydot-1.0.28-r1
+++ b/metadata/md5-cache/media-gfx/pydot-1.0.28-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Python interface to Graphviz's Dot language
 EAPI=5
 HOMEPAGE=http://code.google.com/p/pydot/ http://pypi.python.org/pypi/pydot
 IUSE=python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 python_targets_pypy1_9 python_targets_pypy2_0
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris
+KEYWORDS=~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris
 LICENSE=MIT
 RDEPEND=virtual/pyparsing[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)] media-gfx/graphviz python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_pypy1_9? ( dev-python/pypy:1.9 ) python_targets_pypy2_0? ( dev-python/pypy:2.0 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)]
 SLOT=0
 SRC_URI=http://pydot.googlecode.com/files/pydot-1.0.28.tar.gz
 _eclasses_=distutils-r1	10e59ecabebf0c37ad5cd8827434b108	eutils	b8fdb86895c268cca7ae1626264a30f4	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	0e2bc7326c807a3e8133847eadc3dd26	python-utils-r1	9fc80a4f06f33ede447b5647fddca301	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=138b1fead30a43e2e254195fdb2a7680
+_md5_=ffbfb9b5ef7aed77bf2c06422b1ed928
diff --git a/metadata/md5-cache/media-libs/libcdr-0.0.14 b/metadata/md5-cache/media-libs/libcdr-0.0.14
new file mode 100644
index 000000000000..30bb1f1572dc
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libcdr-0.0.14
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare unpack
+DEPEND=app-text/libwpd:0.9 app-text/libwpg:0.2 dev-libs/icu:= media-libs/lcms:2 sys-libs/zlib dev-libs/boost sys-devel/libtool virtual/pkgconfig doc? ( app-doc/doxygen )
+DESCRIPTION=Library parsing the Corel cdr documents
+EAPI=5
+HOMEPAGE=http://www.freedesktop.org/wiki/Software/libcdr
+IUSE=doc static-libs
+KEYWORDS=~amd64 ~arm ~ppc ~x86
+LICENSE=LGPL-2.1
+RDEPEND=app-text/libwpd:0.9 app-text/libwpg:0.2 dev-libs/icu:= media-libs/lcms:2 sys-libs/zlib
+SLOT=0
+SRC_URI=http://dev-www.libreoffice.org/src/libcdr-0.0.14.tar.xz
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	b8fdb86895c268cca7ae1626264a30f4	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=37de59626863480e734b4aca5bc2da6d
diff --git a/metadata/md5-cache/media-libs/raptor-2.0.9 b/metadata/md5-cache/media-libs/raptor-2.0.9
index 263b2efa3f5d..c162ff34b1bf 100644
--- a/metadata/md5-cache/media-libs/raptor-2.0.9
+++ b/metadata/md5-cache/media-libs/raptor-2.0.9
@@ -4,10 +4,10 @@ DESCRIPTION=The RDF Parser Toolkit
 EAPI=5
 HOMEPAGE=http://librdf.org/raptor/
 IUSE=+curl debug json static-libs unicode
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0 GPL-2 LGPL-2.1
 RDEPEND=dev-libs/libxml2 dev-libs/libxslt curl? ( net-misc/curl ) json? ( dev-libs/yajl ) unicode? ( dev-libs/icu:= ) !media-libs/raptor:0
 SLOT=2
 SRC_URI=http://download.librdf.org/source/raptor2-2.0.9.tar.gz
 _eclasses_=eutils	b8fdb86895c268cca7ae1626264a30f4	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=57a269244834946ddfcae05cd8711ee2
+_md5_=be4e62152d15fdb0e16084ee009206f9
diff --git a/metadata/md5-cache/net-dns/c-ares-1.9.1 b/metadata/md5-cache/net-dns/c-ares-1.9.1
index 6f68bcc43f85..0f79374e66f5 100644
--- a/metadata/md5-cache/net-dns/c-ares-1.9.1
+++ b/metadata/md5-cache/net-dns/c-ares-1.9.1
@@ -3,8 +3,8 @@ DESCRIPTION=C library that resolves names asynchronously
 EAPI=4
 HOMEPAGE=http://c-ares.haxx.se/
 IUSE=static-libs
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc64-solaris
+KEYWORDS=~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc64-solaris
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://c-ares.haxx.se/download/c-ares-1.9.1.tar.gz
-_md5_=8135289131125e5afa0d1f4b4cc37226
+_md5_=c0e219f6399762b19392f42c693b54e3
diff --git a/metadata/md5-cache/net-firewall/xtables-addons-2.2 b/metadata/md5-cache/net-firewall/xtables-addons-2.2
new file mode 100644
index 000000000000..edfe7d057ab9
--- /dev/null
+++ b/metadata/md5-cache/net-firewall/xtables-addons-2.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
+DEPEND=>=net-firewall/iptables-1.4.5 virtual/linux-sources kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
+DESCRIPTION=extensions not yet accepted in the main kernel/iptables (patch-o-matic(-ng) successor)
+EAPI=5
+HOMEPAGE=http://xtables-addons.sourceforge.net/
+IUSE=modules xtables_addons_quota2 xtables_addons_psd xtables_addons_pknock xtables_addons_lscan xtables_addons_length2 xtables_addons_ipv4options xtables_addons_ipp2p xtables_addons_iface xtables_addons_gradm xtables_addons_geoip xtables_addons_fuzzy xtables_addons_condition xtables_addons_tarpit xtables_addons_sysrq xtables_addons_steal xtables_addons_rawnat xtables_addons_logmark xtables_addons_ipmark xtables_addons_echo xtables_addons_dnetmap xtables_addons_dhcpmac xtables_addons_delude xtables_addons_chaos xtables_addons_account kernel_linux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=net-firewall/iptables-1.4.5 xtables_addons_geoip? ( app-arch/unzip dev-perl/Text-CSV_XS virtual/perl-Getopt-Long ) kernel_linux? ( virtual/modutils )
+SLOT=0
+SRC_URI=mirror://sourceforge/xtables-addons/xtables-addons-2.2.tar.xz
+_eclasses_=eutils	b8fdb86895c268cca7ae1626264a30f4	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	linux-mod	c9d4931960ba253061ad823a8508bff5	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=2c98d94a00eeebb81ac91b54bee62874
diff --git a/metadata/md5-cache/net-ftp/lftp-4.4.5-r1 b/metadata/md5-cache/net-ftp/lftp-4.4.6
similarity index 93%
rename from metadata/md5-cache/net-ftp/lftp-4.4.5-r1
rename to metadata/md5-cache/net-ftp/lftp-4.4.6
index 2a6db5b9b667..3075f6a32a37 100644
--- a/metadata/md5-cache/net-ftp/lftp-4.4.5-r1
+++ b/metadata/md5-cache/net-ftp/lftp-4.4.6
@@ -9,6 +9,6 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/expat >=sys-libs/ncurses-5.1 socks5? ( >=net-proxy/dante-1.1.12 virtual/pam ) ssl? ( gnutls? ( >=net-libs/gnutls-1.2.3 ) openssl? ( >=dev-libs/openssl-0.9.6 ) ) >=sys-libs/readline-5.1
 REQUIRED_USE=ssl? ( ^^ ( openssl gnutls ) )
 SLOT=0
-SRC_URI=ftp://ftp.yars.free.net/pub/source/lftp/lftp-4.4.5.tar.xz
+SRC_URI=ftp://ftp.yars.free.net/pub/source/lftp/lftp-4.4.6.tar.xz
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	b8fdb86895c268cca7ae1626264a30f4	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=bd7c85008cc88d75a4e505c36fb53c62
+_md5_=0f709ee6479349f0f7628fc68bfaed4c
diff --git a/metadata/md5-cache/net-misc/netkit-rsh-0.17-r10 b/metadata/md5-cache/net-misc/netkit-rsh-0.17-r10
index 16d073acae93..2f20e64bc44f 100644
--- a/metadata/md5-cache/net-misc/netkit-rsh-0.17-r10
+++ b/metadata/md5-cache/net-misc/netkit-rsh-0.17-r10
@@ -4,10 +4,10 @@ DESCRIPTION=Netkit's Remote Shell Suite: rexec{,d} rlogin{,d} rsh{,d}
 EAPI=4
 HOMEPAGE=ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/
 IUSE=pam +filecaps
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
 LICENSE=BSD
 RDEPEND=>=sys-libs/ncurses-5.2 pam? ( >=sys-auth/pambase-20080219.1 )
 SLOT=0
 SRC_URI=ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-rsh-0.17.tar.gz mirror://gentoo/rexec-1.5.tar.gz mirror://gentoo/netkit-rsh-0.17-patches-3.tar.lzma
 _eclasses_=eutils	b8fdb86895c268cca7ae1626264a30f4	fcaps	c95d1e7b4fd7f7f2a445bc9b17382679	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=ba2e0e0f2ceb0fc21616b7c3faba2b71
+_md5_=99827416771615cb1f836c5223e276a3
diff --git a/metadata/md5-cache/net-misc/smb4k-1.0.7 b/metadata/md5-cache/net-misc/smb4k-1.0.7
new file mode 100644
index 000000000000..39f93479126c
--- /dev/null
+++ b/metadata/md5-cache/net-misc/smb4k-1.0.7
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
+DEPEND=>=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=dev-qt/qt3support-4.7:4[accessibility] >=dev-qt/qtcore-4.7:4[qt3support,ssl] >=dev-qt/qtdbus-4.7:4 >=dev-qt/qtgui-4.7:4[accessibility,dbus] >=dev-qt/qtscript-4.7:4 >=dev-qt/qtsql-4.7:4[qt3support] >=dev-qt/qtsvg-4.7:4 >=dev-qt/qttest-4.7:4 >=dev-qt/qtwebkit-4.7:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
+DESCRIPTION=The advanced network neighborhood browser for KDE
+EAPI=5
+HOMEPAGE=http://sourceforge.net/projects/smb4k/
+IUSE=debug linguas_bg linguas_cs linguas_da linguas_de linguas_en_GB linguas_eo linguas_es linguas_et linguas_fr linguas_ga linguas_gl linguas_hu linguas_is linguas_it linguas_ja linguas_lt linguas_mai linguas_nb linguas_nds linguas_nl linguas_pl linguas_pt linguas_pt_BR linguas_ru linguas_sk linguas_sv linguas_tr linguas_ug linguas_uk linguas_zh_CN linguas_zh_TW +handbook aqua
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=>=net-fs/samba-3.4.2[cups] >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_bg? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_bg(+)] ) linguas_cs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_en_GB? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_en_GB(+)] ) linguas_eo? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_eo(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_et(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fr(+)] ) linguas_ga? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ga(+)] ) linguas_gl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_gl(+)] ) linguas_hu? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hu(+)] ) linguas_is? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_is(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_it(+)] ) linguas_ja? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ja(+)] ) linguas_lt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_lt(+)] ) linguas_mai? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_mai(+)] ) linguas_nb? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nb(+)] ) linguas_nds? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nds(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nl(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) linguas_ru? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ru(+)] ) linguas_sk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sk(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sv(+)] ) linguas_tr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_tr(+)] ) linguas_ug? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ug(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_uk(+)] ) linguas_zh_CN? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_CN(+)] ) linguas_zh_TW? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_TW(+)] ) handbook? ( >=kde-base/kdelibs-4.4:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.7:4[accessibility] >=dev-qt/qtcore-4.7:4[qt3support,ssl] >=dev-qt/qtdbus-4.7:4 >=dev-qt/qtgui-4.7:4[accessibility,dbus] >=dev-qt/qtscript-4.7:4 >=dev-qt/qtsql-4.7:4[qt3support] >=dev-qt/qtsvg-4.7:4 >=dev-qt/qttest-4.7:4 >=dev-qt/qtwebkit-4.7:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
+SLOT=4
+SRC_URI=mirror://sourceforge/smb4k/smb4k-1.0.7.tar.bz2
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	bc8bbf26de246f74e2901a3696ad96d6	eutils	b8fdb86895c268cca7ae1626264a30f4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome2-utils	794d2847b4af390a1e020924876c8297	kde4-base	2cedb58982ff5f6a497a00d05779530a	kde4-functions	597dae8331dc9b795e3a5797bf7da048	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_md5_=4c56edb5cd3d41ced9e3d27eb39bdf2c
diff --git a/metadata/md5-cache/net-nntp/nzbget-11.0_pre684 b/metadata/md5-cache/net-nntp/nzbget-11.0_pre684
new file mode 100644
index 000000000000..e85a00ca5147
--- /dev/null
+++ b/metadata/md5-cache/net-nntp/nzbget-11.0_pre684
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst preinst prepare
+DEPEND=dev-libs/libxml2 ncurses? ( sys-libs/ncurses ) parcheck? ( app-arch/libpar2 dev-libs/libsigc++:2 ) ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( dev-libs/openssl ) ) zlib? ( sys-libs/zlib ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DESCRIPTION=A command-line based binary newsgrapper supporting .nzb files
+EAPI=5
+HOMEPAGE=http://nzbget.sourceforge.net/
+IUSE=debug gnutls ncurses parcheck ssl zlib
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/libxml2 ncurses? ( sys-libs/ncurses ) parcheck? ( app-arch/libpar2 dev-libs/libsigc++:2 ) ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( dev-libs/openssl ) ) zlib? ( sys-libs/zlib )
+SLOT=0
+SRC_URI=mirror://sourceforge/nzbget/nzbget-11.0-testing-r684.tar.gz
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	b8fdb86895c268cca7ae1626264a30f4	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=1210f4c11559dded1b0956690ae408a8
diff --git a/metadata/md5-cache/net-print/hplip-3.13.5 b/metadata/md5-cache/net-print/hplip-3.13.5
new file mode 100644
index 000000000000..8080eec03fbf
--- /dev/null
+++ b/metadata/md5-cache/net-print/hplip-3.13.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst preinst prepare setup
+DEPEND=virtual/jpeg hpijs? ( >=net-print/foomatic-filters-3.0.20080507[cups] ) !minimal? ( python_single_target_python2_6? ( dev-lang/python:2.6[threads,xml] ) python_single_target_python2_7? ( dev-lang/python:2.7[threads,xml] ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] >=net-print/cups-1.4.0 !libusb0? ( virtual/libusb:1 ) libusb0? ( virtual/libusb:0 ) scanner? ( >=media-gfx/sane-backends-1.0.19-r1 ) fax? ( >=sys-apps/dbus-1.6.8-r1 ) snmp? ( net-analyzer/net-snmp dev-libs/openssl:0 ) ) virtual/pkgconfig virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DESCRIPTION=HP Linux Imaging and Printing. Includes printer, scanner, fax drivers and service tools.
+EAPI=5
+HOMEPAGE=http://hplipopensource.com/hplip-web/index.html
+IUSE=doc fax +hpcups hpijs kde libnotify -libusb0 minimal parport policykit qt4 scanner snmp static-ppds X python_targets_python2_6 python_targets_python2_7 python_single_target_python2_6 python_single_target_python2_7
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=virtual/jpeg hpijs? ( >=net-print/foomatic-filters-3.0.20080507[cups] ) !minimal? ( python_single_target_python2_6? ( dev-lang/python:2.6[threads,xml] ) python_single_target_python2_7? ( dev-lang/python:2.7[threads,xml] ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] >=net-print/cups-1.4.0 !libusb0? ( virtual/libusb:1 ) libusb0? ( virtual/libusb:0 ) scanner? ( >=media-gfx/sane-backends-1.0.19-r1 ) fax? ( >=sys-apps/dbus-1.6.8-r1 ) snmp? ( net-analyzer/net-snmp dev-libs/openssl:0 ) ) >=app-text/ghostscript-gpl-8.71-r3 >=dev-python/dbus-python-1.1.1-r1[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] policykit? ( sys-auth/polkit ) !minimal? ( >=dev-python/pygobject-2.28.6-r53:2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] kernel_linux? ( virtual/udev !<sys-fs/udev-114 ) scanner? ( >=dev-python/reportlab-2.6[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] >=dev-python/imaging-1.1.7-r2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] X? ( || ( kde? ( kde-misc/skanlite ) media-gfx/xsane media-gfx/sane-frontends ) ) ) fax? ( >=dev-python/reportlab-2.6[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] >=dev-python/dbus-python-1.1.1-r1[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) qt4? ( >=dev-python/PyQt4-4.9.6-r2[dbus,X,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] libnotify? ( >=dev-python/notify-python-0.1.1-r3[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) ) )
+SLOT=0
+SRC_URI=mirror://sourceforge/hplip/hplip-3.13.5.tar.gz http://dev.gentoo.org/~billie/distfiles/hplip-3.13.5-patches-1.tar.xz
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	b8fdb86895c268cca7ae1626264a30f4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	libtool	b1c8688e60f9580bcb9bb46e08737eb1	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	432ebc09c192bb4c808568896d6145d2	python-utils-r1	9fc80a4f06f33ede447b5647fddca301	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=96d17b9183b58646aab85fd4898933ea
diff --git a/metadata/md5-cache/sys-apps/dbus-1.6.10 b/metadata/md5-cache/sys-apps/dbus-1.6.10
index c3a8051c9f01..a1796669acb4 100644
--- a/metadata/md5-cache/sys-apps/dbus-1.6.10
+++ b/metadata/md5-cache/sys-apps/dbus-1.6.10
@@ -4,10 +4,10 @@ DESCRIPTION=A message bus system, a simple way for applications to talk to each
 EAPI=5
 HOMEPAGE=http://dbus.freedesktop.org/
 IUSE=debug doc selinux static-libs systemd test X test
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux
 LICENSE=|| ( AFL-2.1 GPL-2 )
 RDEPEND=>=dev-libs/expat-2 selinux? ( sec-policy/selinux-dbus sys-libs/libselinux ) systemd? ( sys-apps/systemd ) X? ( x11-libs/libX11 x11-libs/libXt )
 SLOT=0
 SRC_URI=http://dbus.freedesktop.org/releases/dbus/dbus-1.6.10.tar.gz
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	b8fdb86895c268cca7ae1626264a30f4	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	b1c8688e60f9580bcb9bb46e08737eb1	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-any-r1	7ed4a8181d62a098eaa6c8eeacf190c9	python-utils-r1	9fc80a4f06f33ede447b5647fddca301	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=6248cb34c1fd87974edaceadf7dcc526
+_md5_=1e20cc6c71f83a8bdb0e227160072cf9
diff --git a/metadata/md5-cache/sys-apps/ethtool-3.8 b/metadata/md5-cache/sys-apps/ethtool-3.8
index 09a34eb34f6f..2b7572f77d9e 100644
--- a/metadata/md5-cache/sys-apps/ethtool-3.8
+++ b/metadata/md5-cache/sys-apps/ethtool-3.8
@@ -3,8 +3,8 @@ DEPEND=app-arch/xz-utils
 DESCRIPTION=Utility for examining and tuning ethernet-based network interfaces
 EAPI=4
 HOMEPAGE=http://www.kernel.org/pub/software/network/ethtool/
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86
+KEYWORDS=~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://kernel/software/network/ethtool/ethtool-3.8.tar.xz
-_md5_=50e24dda149c7a5be2fd2feaa70cb60c
+_md5_=9836bd0c24e390e5c634f2a1505c5754
diff --git a/metadata/md5-cache/sys-apps/file-5.12-r1 b/metadata/md5-cache/sys-apps/file-5.12-r1
index 410791356f82..1ba44899880e 100644
--- a/metadata/md5-cache/sys-apps/file-5.12-r1
+++ b/metadata/md5-cache/sys-apps/file-5.12-r1
@@ -4,10 +4,10 @@ DESCRIPTION=identify a file's format by scanning binary data for patterns
 EAPI=2
 HOMEPAGE=ftp://ftp.astron.com/pub/file/
 IUSE=python static-libs zlib
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
 LICENSE=BSD-2
 RDEPEND=zlib? ( sys-libs/zlib ) python? ( dev-lang/python )
 SLOT=0
 SRC_URI=ftp://ftp.astron.com/pub/file/file-5.12.tar.gz ftp://ftp.gw.com/mirrors/pub/unix/file/file-5.12.tar.gz mirror://gentoo/file-5.12-magic-updates-4d53f0549fb40b179eaee53c63c42e1685e4ebab.patch.bz2
 _eclasses_=distutils	77fc6005d2dfcc7bdb5ec363a49d9912	eutils	b8fdb86895c268cca7ae1626264a30f4	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=e7b5ada8fcfdd83263074c27cafd5471
+_md5_=ac070fdd721d0f4fae7a70bfcf8ebe62
diff --git a/metadata/md5-cache/sys-apps/pciutils-3.2.0 b/metadata/md5-cache/sys-apps/pciutils-3.2.0
index 8f8155b00736..46c8edaf1965 100644
--- a/metadata/md5-cache/sys-apps/pciutils-3.2.0
+++ b/metadata/md5-cache/sys-apps/pciutils-3.2.0
@@ -4,10 +4,10 @@ DESCRIPTION=Various utilities dealing with the PCI bus
 EAPI=5
 HOMEPAGE=http://mj.ucw.cz/sw/pciutils/ http://git.kernel.org/?p=utils/pciutils/pciutils.git
 IUSE=+kmod static-libs zlib
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=kmod? ( sys-apps/kmod ) static-libs? ( zlib? ( sys-libs/zlib[static-libs(+)] ) ) !static-libs? ( zlib? ( sys-libs/zlib ) ) sys-apps/hwids
 SLOT=0
 SRC_URI=ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/pciutils-3.2.0.tar.gz
 _eclasses_=eutils	b8fdb86895c268cca7ae1626264a30f4	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=af7468b5b4bc660302bb6bb3a8cd3216
+_md5_=de52f823c3bd13db135c1db28bda35f5
diff --git a/metadata/md5-cache/sys-apps/sg3_utils-1.35 b/metadata/md5-cache/sys-apps/sg3_utils-1.35
index 6a4020c67f6d..a690360aeb7b 100644
--- a/metadata/md5-cache/sys-apps/sg3_utils-1.35
+++ b/metadata/md5-cache/sys-apps/sg3_utils-1.35
@@ -4,11 +4,11 @@ DESCRIPTION=Apps for querying the sg SCSI interface
 EAPI=4
 HOMEPAGE=http://sg.danny.cz/sg/
 IUSE=static-libs
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc ~x86
+KEYWORDS=~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh ~sparc ~x86
 LICENSE=GPL-2
 PDEPEND=>=sys-apps/rescan-scsi-bus-1.24
 RDEPEND=sys-apps/sdparm
 SLOT=0
 SRC_URI=http://sg.danny.cz/sg/p/sg3_utils-1.35.tgz
 _eclasses_=eutils	b8fdb86895c268cca7ae1626264a30f4	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=5aa224f32339ff62a8bc54e669a5af31
+_md5_=70ef09ff276b2c5ab01cf32eecd69e39
diff --git a/metadata/md5-cache/sys-auth/keystone-2012.2.4-r2 b/metadata/md5-cache/sys-auth/keystone-2012.2.4-r3
similarity index 98%
rename from metadata/md5-cache/sys-auth/keystone-2012.2.4-r2
rename to metadata/md5-cache/sys-auth/keystone-2012.2.4-r3
index 2ed1c292d5cc..5b9f6ae1ee86 100644
--- a/metadata/md5-cache/sys-auth/keystone-2012.2.4-r2
+++ b/metadata/md5-cache/sys-auth/keystone-2012.2.4-r3
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=folsom
 SRC_URI=http://launchpad.net/keystone/folsom/2012.2.4/+download/keystone-2012.2.4.tar.gz
 _eclasses_=distutils-r1	10e59ecabebf0c37ad5cd8827434b108	eutils	b8fdb86895c268cca7ae1626264a30f4	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	0e2bc7326c807a3e8133847eadc3dd26	python-utils-r1	9fc80a4f06f33ede447b5647fddca301	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=8bebf08feaa719d98c5ac32aacb72d1e
+_md5_=a1d6b95ecb28e9d9074906c06dd27d51
diff --git a/metadata/md5-cache/sys-cluster/nova-2012.2.4-r1 b/metadata/md5-cache/sys-cluster/nova-2012.2.4-r2
similarity index 98%
rename from metadata/md5-cache/sys-cluster/nova-2012.2.4-r1
rename to metadata/md5-cache/sys-cluster/nova-2012.2.4-r2
index d520bdbb2da2..89fb9bc8ec7a 100644
--- a/metadata/md5-cache/sys-cluster/nova-2012.2.4-r1
+++ b/metadata/md5-cache/sys-cluster/nova-2012.2.4-r2
@@ -10,4 +10,4 @@ RDEPEND==dev-python/amqplib-0.6.1 >=dev-python/anyjson-0.2.4[python_targets_pyth
 SLOT=0
 SRC_URI=http://launchpad.net/nova/folsom/2012.2.4/+download/nova-2012.2.4.tar.gz
 _eclasses_=distutils-r1	10e59ecabebf0c37ad5cd8827434b108	eutils	b8fdb86895c268cca7ae1626264a30f4	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	0e2bc7326c807a3e8133847eadc3dd26	python-utils-r1	9fc80a4f06f33ede447b5647fddca301	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=8974f30ef65846b0944d10157ae2e04b
+_md5_=d9719c8579bd7df37997856361477f88
diff --git a/metadata/md5-cache/sys-cluster/nova-2013.1.1-r1 b/metadata/md5-cache/sys-cluster/nova-2013.1.1-r2
similarity index 98%
rename from metadata/md5-cache/sys-cluster/nova-2013.1.1-r1
rename to metadata/md5-cache/sys-cluster/nova-2013.1.1-r2
index 76f51b338801..0b9acda432bc 100644
--- a/metadata/md5-cache/sys-cluster/nova-2013.1.1-r1
+++ b/metadata/md5-cache/sys-cluster/nova-2013.1.1-r2
@@ -10,4 +10,4 @@ RDEPEND=>=dev-python/amqplib-0.6.1[python_targets_python2_7(-)?,-python_single_t
 SLOT=0
 SRC_URI=http://launchpad.net/nova/grizzly/2013.1.1/+download/nova-2013.1.1.tar.gz
 _eclasses_=distutils-r1	10e59ecabebf0c37ad5cd8827434b108	eutils	b8fdb86895c268cca7ae1626264a30f4	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	0e2bc7326c807a3e8133847eadc3dd26	python-utils-r1	9fc80a4f06f33ede447b5647fddca301	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=b1bbdc46f218c8117e06f0f552a44375
+_md5_=a89b14c5babef401ded0ba4e45d38c50
diff --git a/metadata/md5-cache/sys-fs/dosfstools-3.0.16 b/metadata/md5-cache/sys-fs/dosfstools-3.0.16
index ceae3d2e5c7d..8ffa910078a5 100644
--- a/metadata/md5-cache/sys-fs/dosfstools-3.0.16
+++ b/metadata/md5-cache/sys-fs/dosfstools-3.0.16
@@ -2,10 +2,10 @@ DEFINED_PHASES=install prepare
 DESCRIPTION=DOS filesystem tools - provides mkdosfs, mkfs.msdos, mkfs.vfat
 EAPI=5
 HOMEPAGE=http://www.daniel-baumann.ch/software/dosfstools/
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~arm-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~arm-linux ~x86-linux
 LICENSE=GPL-3
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.daniel-baumann.ch/files/software/dosfstools/dosfstools-3.0.16.tar.xz
 _eclasses_=eutils	b8fdb86895c268cca7ae1626264a30f4	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=e73a8f5e2d552f7d23411c5b28d79912
+_md5_=9d82075bcd2295eab057bb9a825dbb66
diff --git a/metadata/md5-cache/sys-fs/fatsort-1.0.1.314 b/metadata/md5-cache/sys-fs/fatsort-1.0.1.314
new file mode 100644
index 000000000000..47f6174d43c7
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/fatsort-1.0.1.314
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile prepare
+DESCRIPTION=Sorts files on FAT16/32 partitions, ideal for basic audio players.
+EAPI=5
+HOMEPAGE=http://fatsort.sourceforge.net/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=mirror://sourceforge/fatsort/fatsort-1.0.1.314.tar.gz
+_eclasses_=multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
+_md5_=019a5490ddaed832b094ef2c9f7445e9
diff --git a/metadata/md5-cache/sys-fs/udev-9999 b/metadata/md5-cache/sys-fs/udev-9999
index f0c7219d3294..7e020009636e 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	16761a2f972abd686713e5967ff3c754	eutils	b8fdb86895c268cca7ae1626264a30f4	git-2	e92e09651292b1bef5656592364550f7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=ce7421a531aa3d040bf63e067b75946f
+_md5_=e4896e0367f053cf212d2d30b1d67b4d
diff --git a/metadata/md5-cache/sys-fs/vzquota-3.1 b/metadata/md5-cache/sys-fs/vzquota-3.1
index 389ddfb0c6d5..7036a34d71a3 100644
--- a/metadata/md5-cache/sys-fs/vzquota-3.1
+++ b/metadata/md5-cache/sys-fs/vzquota-3.1
@@ -2,9 +2,9 @@ DEFINED_PHASES=install prepare
 DESCRIPTION=OpenVZ VPS disk quota utility
 EAPI=5
 HOMEPAGE=http://openvz.org/download/utils/vzquota/
-KEYWORDS=~amd64 ~ia64 ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~ia64 ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://download.openvz.org/utils/vzquota/3.1/src/vzquota-3.1.tar.bz2
 _eclasses_=multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
-_md5_=16ffaa30559538dbd5137a1b05271ad4
+_md5_=49a6a5ab078b0b1ced7b3f11c62c1326
diff --git a/metadata/md5-cache/sys-process/procenv-0.22 b/metadata/md5-cache/sys-process/procenv-0.22
new file mode 100644
index 000000000000..95d13394ed79
--- /dev/null
+++ b/metadata/md5-cache/sys-process/procenv-0.22
@@ -0,0 +1,9 @@
+DEFINED_PHASES=-
+DESCRIPTION=A command-line utility that simply dumps all attributes of its environment
+EAPI=5
+HOMEPAGE=https://launchpad.net/procenv/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+SLOT=0
+SRC_URI=https://launchpad.net/procenv/trunk/0.22/+download/procenv-0.22.tar.gz
+_md5_=a032283904cb500d2365b6e51aa0bb6e
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 5c37bd9246e9..692a2ad148f4 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Fri, 17 May 2013 12:06:56 +0000
+Sat, 18 May 2013 08:36:59 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 4176a0afca07..0b086c98adf3 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Fri May 17 12:06:54 UTC 2013
+Sat May 18 08:36:56 UTC 2013
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index c8cd87975d61..0c7cef4189a9 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Fri, 17 May 2013 12:30:01 +0000
+Sat, 18 May 2013 09:00:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 5e18fe5969b4..e9f3958840b9 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1368792301 Fri May 17 12:05:01 2013 UTC
+1368866101 Sat May 18 08:35:01 2013 UTC
diff --git a/net-dns/c-ares/c-ares-1.9.1.ebuild b/net-dns/c-ares/c-ares-1.9.1.ebuild
index f94eacee0c18..601ef3b70a18 100644
--- a/net-dns/c-ares/c-ares-1.9.1.ebuild
+++ b/net-dns/c-ares/c-ares-1.9.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/c-ares/c-ares-1.9.1.ebuild,v 1.7 2013/05/16 16:28:05 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/c-ares/c-ares-1.9.1.ebuild,v 1.8 2013/05/18 05:30:24 ago Exp $
 
 EAPI=4
 
@@ -10,7 +10,7 @@ SRC_URI="http://${PN}.haxx.se/download/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc64-solaris"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc64-solaris"
 IUSE="static-libs"
 
 DOCS=( AUTHORS CHANGES NEWS README RELEASE-NOTES TODO )
diff --git a/net-firewall/xtables-addons/Manifest b/net-firewall/xtables-addons/Manifest
index 746eebd14ee7..84a7850755e6 100644
--- a/net-firewall/xtables-addons/Manifest
+++ b/net-firewall/xtables-addons/Manifest
@@ -4,3 +4,4 @@ DIST xtables-addons-1.39.tar.xz 379928 SHA256 ef7a89405c97879efee9944237373c3ecf
 DIST xtables-addons-1.45.tar.xz 317316 SHA256 b18113ca9320240eb7f33997a3d5b5da33d12c5f03cbe13da11c98fe0983341c SHA512 4853b37d489e922a2a315bc5c871cb2f73d66cd1d219cbdbc28a4419d24995be704526f91b576977b1ff5e51a21e5e49f78ae41e6ebf3b169c60f891676a080b WHIRLPOOL 199cfd156eaca9d31fd61434ae2c6a5f09453d7f6ce7d0a2ab92723e0ee78df20f7a30cb7eb74d6111790577bcc1a2cfdfbee0d74f1980535ddd7025559c6083
 DIST xtables-addons-1.47.1.tar.xz 323312 SHA256 06535dbefaa7725870750048842b4b53f5a4f8d8b16d5ce61bb4cc28e0b99326 SHA512 4920c9fae1a5b026f48562590b9221d497127197806f52f2eeba269faf8203b3da2e2ab6ff01f273ecac457d19399c42b4d163c18fa405bfe15b54f46478227d WHIRLPOOL 6654fb33c96eb052b94047445682a26f141532c2db5404ec62c29d40741a34ac9138ba1a5de494d7f1b8706a5de425b1188f79fa6195a824d2642ba506f6bdc1
 DIST xtables-addons-2.1.tar.xz 316412 SHA256 1d788bf647d96cfbcc2e61c3a32702cfdde40fea857407d2674731b41ac3ae79 SHA512 df8617f8dbc386e1264063fa1650a18021a199e8d301b7a2133c840f1cd54d348d5b6e46b823a778feb9682d65d898c8d31c0df35ee2b914865b126485973973 WHIRLPOOL d9146f96fb5c166e2944d45b69c929f56fb8104df9599fb9bdc4be83fc6540f26782dd8fd8866a06b7b0531207db7ce41f95439efdb07f0fa5d73a34e2028cd0
+DIST xtables-addons-2.2.tar.xz 316840 SHA256 bafaf53b896272adcf17f240339c866eff07d30b51be8893a08deaf69f8f13ef SHA512 1bfdfe5a540a4aeb32511c8092662a9694bc8b58c5b369065380fdca2044b24edb1e47ed7bf301771ee36c782f8ff457fd1f8cfa76ded5aaadf35f41292f6f8e WHIRLPOOL 154f3dbc8e3e4c7063bef0cca8fa999099d8136c4e11245f058590325c09c8d1ea1a96a8927be5f5d9ff359c1bfdcd760892b9a1ea14e6056a01c304d4b1d777
diff --git a/net-firewall/xtables-addons/xtables-addons-2.2.ebuild b/net-firewall/xtables-addons/xtables-addons-2.2.ebuild
new file mode 100644
index 000000000000..10ecc59d761a
--- /dev/null
+++ b/net-firewall/xtables-addons/xtables-addons-2.2.ebuild
@@ -0,0 +1,169 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/xtables-addons/xtables-addons-2.2.ebuild,v 1.1 2013/05/17 18:59:32 maksbotan Exp $
+
+EAPI="5"
+
+inherit eutils linux-info linux-mod multilib
+
+DESCRIPTION="extensions not yet accepted in the main kernel/iptables (patch-o-matic(-ng) successor)"
+HOMEPAGE="http://xtables-addons.sourceforge.net/"
+SRC_URI="mirror://sourceforge/xtables-addons/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="modules"
+
+MODULES="quota2 psd pknock lscan length2 ipv4options ipp2p iface gradm geoip fuzzy condition tarpit sysrq steal rawnat logmark ipmark echo dnetmap dhcpmac delude chaos account"
+
+for mod in ${MODULES}; do
+	IUSE="${IUSE} xtables_addons_${mod}"
+done
+
+DEPEND=">=net-firewall/iptables-1.4.5"
+
+RDEPEND="${DEPEND}
+	xtables_addons_geoip? (
+		app-arch/unzip
+		dev-perl/Text-CSV_XS
+		virtual/perl-Getopt-Long
+	)
+"
+
+DEPEND="${DEPEND}
+	virtual/linux-sources"
+
+SKIP_MODULES=""
+
+# XA_kernel_check tee "2 6 32"
+XA_check4internal_module() {
+	local mod=${1}
+	local version=${2}
+	local kconfigname=${3}
+
+	if use xtables_addons_${mod} && kernel_is -gt ${version}; then
+		ewarn "${kconfigname} should be provided by the kernel. Skipping its build..."
+		if ! linux_chkconfig_present ${kconfigname}; then
+			ewarn "Please enable ${kconfigname} target in your kernel
+			configuration or disable checksum module in ${PN}."
+		fi
+		# SKIP_MODULES in case we need to disable building of everything
+		# like having this USE disabled
+		SKIP_MODULES+=" ${mod}"
+	fi
+}
+
+pkg_setup()	{
+	if use modules; then
+		get_version
+		check_modules_supported
+		CONFIG_CHECK="NF_CONNTRACK NF_CONNTRACK_MARK ~CONNECTOR"
+		ERROR_CONNECTOR="Please, enable CONFIG_CONNECTOR if you wish to receive userspace notifications from pknock through netlink/connector"
+		linux-mod_pkg_setup
+
+		if ! linux_chkconfig_present IPV6; then
+			SKIP_IPV6_MODULES="ip6table_rawpost"
+			ewarn "No IPV6 support in kernel. Disabling: ${SKIP_IPV6_MODULES}"
+		fi
+		kernel_is -lt 3 7 && die "${P} requires kernel version >= 3.7, if you have older kernel please use 1.x version instead"
+	fi
+}
+
+# Helper for maintainer: cheks if all possible MODULES are listed.
+XA_qa_check() {
+	local all_modules
+	all_modules=$(sed -n '/^build_/{s/build_\(.*\)=.*/\L\1/;G;s/\n/ /;s/ $//;h}; ${x;p}' "${S}/mconfig")
+	if [[ ${all_modules} != ${MODULES} ]]; then
+		ewarn "QA: Modules in mconfig differ from \$MODULES in ebuild."
+		ewarn "Please, update MODULES in ebuild."
+		ewarn "'${all_modules}'"
+	fi
+}
+
+# Is there any use flag set?
+XA_has_something_to_build() {
+	local mod
+	for mod in ${MODULES}; do
+		use xtables_addons_${mod} && return
+	done
+
+	eerror "All modules are disabled. What do you want me to build?"
+	eerror "Please, set XTABLES_ADDONS to any combination of"
+	eerror "${MODULES}"
+	die "All modules are disabled."
+}
+
+# Parse Kbuid files and generates list of sources
+XA_get_module_name() {
+	[[ $# != 1 ]] && die "XA_get_sources_for_mod: needs exactly one argument."
+	local mod objdir build_mod sources_list
+	mod=${1}
+	objdir=${S}/extensions
+	# Take modules name from mconfig
+	build_mod=$(sed -n "s/\(build_${mod}\)=.*/\1/Ip" "${S}/mconfig")
+	# strip .o, = and everything before = and print
+	sources_list=$(sed -n "/^obj-[$][{]${build_mod}[}]/\
+		{s:obj-[^+]\+ [+]=[[:space:]]*::;s:[.]o::g;p}" \
+				"${objdir}/Kbuild")
+
+	if [[ -d ${S}/extensions/${sources_list} ]]; then
+		objdir=${S}/extensions/${sources_list}
+		sources_list=$(sed -n "/^obj-m/\
+			{s:obj-[^+]\+ [+]=[[:space:]]*::;s:[.]o::g;p}" \
+				"${objdir}/Kbuild")
+	fi
+	for mod_src in ${sources_list}; do
+		has ${mod_src} ${SKIP_IPV6_MODULES} || \
+			echo " ${mod_src}(xtables_addons:${S}/extensions:${objdir})"
+	done
+}
+
+src_prepare() {
+	XA_qa_check
+	XA_has_something_to_build
+
+	local mod module_name
+	if use modules; then
+		MODULE_NAMES="compat_xtables(xtables_addons:${S}/extensions:)"
+	fi
+	for mod in ${MODULES}; do
+		if ! has ${mod} ${SKIP_MODULES} && use xtables_addons_${mod}; then
+			sed "s/\(build_${mod}=\).*/\1m/I" -i mconfig || die
+			if use modules; then
+				for module_name in $(XA_get_module_name ${mod}); do
+					MODULE_NAMES+=" ${module_name}"
+				done
+			fi
+		else
+			sed "s/\(build_${mod}=\).*/\1n/I" -i mconfig || die
+		fi
+	done
+	einfo "${MODULE_NAMES}" # for debugging
+
+	sed -e 's/depmod -a/true/' -i Makefile.in || die
+	sed -e '/^all-local:/{s: modules::}' \
+		-e '/^install-exec-local:/{s: modules_install::}' \
+			-i extensions/Makefile.in || die
+
+	use xtables_addons_geoip || sed  -e '/^SUBDIRS/{s/geoip//}' -i Makefile.in
+}
+
+src_configure() {
+	set_arch_to_kernel # .. or it'll look for /arch/amd64/Makefile
+	econf --prefix="${EPREFIX}/" \
+		--libexecdir="${EPREFIX}/$(get_libdir)/" \
+		--with-kbuild="${KV_DIR}"
+}
+
+src_compile() {
+	emake CFLAGS="${CFLAGS}" CC="$(tc-getCC)" V=1
+	use modules && BUILD_PARAMS="V=1" BUILD_TARGETS="modules" linux-mod_src_compile
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	use modules && linux-mod_src_install
+	dodoc -r README doc/*
+	find "${ED}" -type f -name '*.la' -exec rm -rf '{}' '+'
+}
diff --git a/net-ftp/lftp/Manifest b/net-ftp/lftp/Manifest
index a4689a83bf55..cad2db7aa318 100644
--- a/net-ftp/lftp/Manifest
+++ b/net-ftp/lftp/Manifest
@@ -1 +1,2 @@
 DIST lftp-4.4.5.tar.xz 1429592 SHA256 b8dfd5faf64c18df9a9233d208eb61595a5b2ef29dbf3d186f3759259aee76dc SHA512 02873fb0c5b899d04b9db3a7183d7d03259a363cd4782b1ce56313240c1960819aad528031202f07d54bf7bb146f7a34bd9c5fa4870cf8df970933019298f7ce WHIRLPOOL 4d1c3227811f38e8d13b6db6967304b19d6d4adb39ff07650495ec531aeb8da4cc326422b101699706b0c1f505ff70886dc3b8723e0f2d91f23a5cfd3be7ee89
+DIST lftp-4.4.6.tar.xz 1429480 SHA256 cb8c591d08ac6626a865548adb9e6263ef8af0699d93da7633ee295d762f8d50 SHA512 aaf7ea03fab63fd748d91c55f50f6ee439bcf34366a0c03e3836338b970d1a0b9e4d6f66a757bcebf43e034c26ff0d7fc04df7b1c0a38fdf63f8b55e641f5ddc WHIRLPOOL 7090d024c458fb114cb7a7cf2eeaa3cba24bbeaa4910934e59e0ed8350bcea3ce91c2a10189f816e821dcd19d7a373e0c0ae576c32f15b7c85984c38dfa59391
diff --git a/net-ftp/lftp/lftp-4.4.5-r1.ebuild b/net-ftp/lftp/lftp-4.4.6.ebuild
similarity index 93%
rename from net-ftp/lftp/lftp-4.4.5-r1.ebuild
rename to net-ftp/lftp/lftp-4.4.6.ebuild
index 9400e0aee038..7c5dbf7614ba 100644
--- a/net-ftp/lftp/lftp-4.4.5-r1.ebuild
+++ b/net-ftp/lftp/lftp-4.4.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/lftp-4.4.5-r1.ebuild,v 1.2 2013/04/24 14:27:01 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/lftp-4.4.6.ebuild,v 1.1 2013/05/17 13:41:03 jer Exp $
 
 EAPI=5
 inherit autotools eutils libtool
@@ -26,7 +26,8 @@ RDEPEND="
 	>=sys-libs/ncurses-5.1
 	socks5? (
 		>=net-proxy/dante-1.1.12
-		virtual/pam )
+		virtual/pam
+	)
 	ssl? (
 		gnutls? ( >=net-libs/gnutls-1.2.3 )
 		openssl? ( >=dev-libs/openssl-0.9.6 )
diff --git a/net-misc/netkit-rsh/netkit-rsh-0.17-r10.ebuild b/net-misc/netkit-rsh/netkit-rsh-0.17-r10.ebuild
index ea97bacda955..0e898a0c2bd6 100644
--- a/net-misc/netkit-rsh/netkit-rsh-0.17-r10.ebuild
+++ b/net-misc/netkit-rsh/netkit-rsh-0.17-r10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/netkit-rsh/netkit-rsh-0.17-r10.ebuild,v 1.6 2013/05/16 16:32:27 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/netkit-rsh/netkit-rsh-0.17-r10.ebuild,v 1.7 2013/05/17 22:52:24 ago Exp $
 
 EAPI="4"
 
@@ -15,7 +15,7 @@ SRC_URI="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="pam"
 
 RDEPEND=">=sys-libs/ncurses-5.2
diff --git a/net-misc/smb4k/Manifest b/net-misc/smb4k/Manifest
index 00eae9e4a34c..e1e9fb43dc3a 100644
--- a/net-misc/smb4k/Manifest
+++ b/net-misc/smb4k/Manifest
@@ -1 +1,2 @@
 DIST smb4k-1.0.5.tar.bz2 2642481 SHA256 07eafe074b2cd9f47e5d9557d53d7e9376f903f4c532576805317d4d68df8574 SHA512 075679bbb3d31aa7bd0d9fbc42a6672fdec5edb35877475f1ee14279b5ae3942505b2e99a183bc5cb27e89373bbf30b2c7f5263f97b3ee6f1484e9c5ecaa1c86 WHIRLPOOL f75628d199004ba635460eb9f66afccc817251b86ff536ad8505352dfe81d8a91bcfa6424b177259fc617ed31d4e17d725a43a356613644dc2613b431c1c19b9
+DIST smb4k-1.0.7.tar.bz2 2638980 SHA256 50aac5be742c4d08b9dbc11a8268fe57ac28965f7549bafd7c0c88f2c6cb558b SHA512 f08d9d64c1cb95fa1cae4796f7d929ad9eeebac9c65d9bf27f8e8bf373fb99330a65e034eb45954d402942097dffd420f48ed14ac64ef61fb391cc7d83235b1a WHIRLPOOL 978289befb68b1cb8402cfbf4b39124ebadecfbdcccafc41784fe912b3c9440afd2063ce5176508361995cf37b797db86f24d2903124f50140e374b3941e7581
diff --git a/net-misc/smb4k/smb4k-1.0.7.ebuild b/net-misc/smb4k/smb4k-1.0.7.ebuild
new file mode 100644
index 000000000000..4bf4b40ad08e
--- /dev/null
+++ b/net-misc/smb4k/smb4k-1.0.7.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/smb4k/smb4k-1.0.7.ebuild,v 1.1 2013/05/17 18:17:48 johu Exp $
+
+EAPI=5
+
+KDE_LINGUAS="bg cs da de en_GB eo es et fr ga gl hu is it ja lt mai nb nds nl pl
+pt pt_BR ru sk sv tr ug uk zh_CN zh_TW"
+KDE_HANDBOOK="optional"
+KDE_DOC_DIRS="doc doc-translations/%lingua_${PN}"
+QT_MINIMAL="4.7"
+inherit kde4-base
+
+DESCRIPTION="The advanced network neighborhood browser for KDE"
+HOMEPAGE="http://sourceforge.net/projects/smb4k/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="4"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug"
+
+RDEPEND=">=net-fs/samba-3.4.2[cups]"
+
+DOCS=( AUTHORS BUGS ChangeLog README TODO )
diff --git a/net-nntp/nzbget/Manifest b/net-nntp/nzbget/Manifest
index c54efc5d514e..1f0b5f1ad742 100644
--- a/net-nntp/nzbget/Manifest
+++ b/net-nntp/nzbget/Manifest
@@ -1,4 +1,5 @@
 DIST nzbget-0.8.0.tar.gz 321351 SHA256 646939596097fafdeb0b4064b433463419e7d0d9af7fe32f6689d6b95ad77d95 SHA512 ea9830effcfece3cc60592924840de3f65cf3c5581ed5afbc97c819c248c6b703a228e71bfb5997947c52c7efa84a5aa5457f7a7babc97ffae5b729179463ab3 WHIRLPOOL 692013bbf84c47f1bd22bdfce9554e3f5b2fb42892bf5b36e1a4612be7f3e85bad64897dfa48fa69ca96d2e9bd2fe923fca6171bf8843b96986f9ec55f949e2b
 DIST nzbget-10.1.tar.gz 672113 SHA256 40ba509af1b4eef1feb9c952432230497cab85f42aafbeb2d473cbf76cbd6246 SHA512 ffc6f4f5a5344e8f005b37406679388e5906eceb2cbc812a398eafe9f9cf65e3c6579372122c031a37dbbe5126fe52bcf0e70eff9a7edeae7daab57498d16478 WHIRLPOOL d3638639994a913b2cfe00f0f31469a2e120ab5f830e51c7fe70e8b645496fb6701d269e7fcbb9444f811eb60407ad8ca87663da1678abe5746bfb86376445f0
 DIST nzbget-10.2.tar.gz 671808 SHA256 c9b878744c162e7721ffc8b048a2e4550a8ed8da6e706ee4cbd026ed2d612ec2 SHA512 be37d8a3a1a7899885a4186dba3bf5cee46ef325c60a0e09e9102a38f5b7694bf6e02d0794cb68a226111f4813c4d61354790710340b446edca5216f3c441b01 WHIRLPOOL 14e82696dc410caedba4b56f4c0dbab11533b981b2e5d98440de47467982d14817cb697893c0eedef4095b0dffb821bf5a878db86928b1df2afb6b88065a1990
+DIST nzbget-11.0-testing-r684.tar.gz 684829 SHA256 f0a2bae53bba64796b2fdd2e18b824f493f2be5d8af264094e0b03c6ad9e73ac SHA512 613442cd5f3061019e4e899484add5d20ef82ef6271d107b5b7d39eb40b0910a0d20b3b3a77824b9fa210ee77064556b7f934d2709c3400a910414ed283dab8f WHIRLPOOL 298ba20ec25d069692326f6c0fbef370f987503460dc66dbe7f319a646ae3c411317c9ea1ca980a937011401dc05e81232e1e25950d9e46488aed0322d30c240
 DIST nzbget-9.1.tar.gz 658935 SHA256 0cd20e1c78359c720862c19c5fd908dc10d6b54658441b86f9caaa71f66e5633 SHA512 902cb2a261d551dad238d7d4751cd47a559e80bf40a63bfd28e2701324f7d29df976e00001606ba850cc7d9a45e1ccb1f03240b08aa2acac0e0490b8324c75b8 WHIRLPOOL 47e8ade8beef8ea4159a9606c7b805a5708ee93a07e4077111f9c56e47f14e116839b5fab62d721801a492b3749ff170f820581327126cbcc302e94d02c5cd98
diff --git a/net-nntp/nzbget/nzbget-11.0_pre684.ebuild b/net-nntp/nzbget/nzbget-11.0_pre684.ebuild
new file mode 100644
index 000000000000..1bdf6934f4d7
--- /dev/null
+++ b/net-nntp/nzbget/nzbget-11.0_pre684.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-nntp/nzbget/nzbget-11.0_pre684.ebuild,v 1.1 2013/05/18 07:18:22 radhermit Exp $
+
+EAPI=5
+
+inherit eutils autotools user
+
+MY_P=${P/_pre/-testing-r}
+
+DESCRIPTION="A command-line based binary newsgrapper supporting .nzb files"
+HOMEPAGE="http://nzbget.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug gnutls ncurses parcheck ssl zlib "
+
+RDEPEND="dev-libs/libxml2
+	ncurses? ( sys-libs/ncurses )
+	parcheck? (
+		app-arch/libpar2
+		dev-libs/libsigc++:2
+	)
+	ssl? (
+		gnutls? ( net-libs/gnutls )
+		!gnutls? ( dev-libs/openssl )
+	)
+	zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS ChangeLog README nzbget.conf )
+
+S=${WORKDIR}/${P/_pre*/-testing}
+
+src_prepare() {
+	sed -i 's:^ScriptDir=.*:ScriptDir=/usr/share/nzbget/ppscripts:' nzbget.conf || die
+
+	sed -e 's:^MainDir=.*:MainDir=/var/lib/nzbget:' \
+		-e 's:^LockFile=.*:LockFile=/run/nzbget/nzbget.pid:' \
+		-e 's:^LogFile=.*:LogFile=/var/log/nzbget/nzbget.log:' \
+		"${S}"/nzbget.conf > "${S}"/nzbgetd.conf || die
+
+	sed -i "/^dist_doc_DATA/d" Makefile.am || die
+
+	epatch "${FILESDIR}"/${PN}-9.0_pre477-buffer-overflows.patch
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable debug) \
+		$(use_enable ncurses curses) \
+		$(use_enable parcheck) \
+		--disable-libpar2-bugfixes-check \
+		$(use_enable ssl tls) \
+		$(use_enable zlib gzip) \
+		--with-tlslib=$(usex gnutls GnuTLS OpenSSL)
+}
+
+src_install() {
+	default
+
+	# remove unneeded service script
+	rm "${D}"/usr/sbin/nzbgetd || die
+
+	insinto /etc
+	doins nzbget.conf
+	doins nzbgetd.conf
+
+	# remove duplicate script/config
+	rm "${D}"/usr/share/nzbget/nzbget.conf || die
+
+	keepdir /var/lib/nzbget/{dst,nzb,queue,tmp}
+	keepdir /var/log/nzbget
+
+	newinitd "${FILESDIR}"/nzbget.initd nzbget
+	newconfd "${FILESDIR}"/nzbget.confd nzbget
+}
+
+pkg_preinst() {
+	enewgroup nzbget
+	enewuser nzbget -1 -1 /var/lib/nzbget nzbget
+
+	fowners nzbget:nzbget /var/lib/nzbget/{dst,nzb,queue,tmp}
+	fperms 750 /var/lib/nzbget/{queue,tmp}
+	fperms 770 /var/lib/nzbget/{dst,nzb}
+
+	fowners nzbget:nzbget /var/log/nzbget
+	fperms 750 /var/log/nzbget
+
+	fowners root:nzbget /etc/nzbgetd.conf
+	fperms 640 /etc/nzbgetd.conf
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		elog
+		elog "Please add users that you want to be able to use the system-wide"
+		elog "nzbget daemon to the nzbget group. To access the daemon run nzbget"
+		elog "with the --configfile /etc/nzbgetd.conf option."
+		elog
+	fi
+}
diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest
index f63197315a95..8dd6223d6f3c 100644
--- a/net-print/hplip/Manifest
+++ b/net-print/hplip/Manifest
@@ -1,3 +1,5 @@
 DIST hplip-3.12.10-patches-1.tar.xz 10496 SHA256 7b8f10c1e58ca60778c5c240e51d68472237a45235a03f0b54cd1ffc9dac9632 SHA512 4947077b17bc9f4714302c99917d359cc7dda728393c8fe88d21f26e923dcb5d0535fc56c403920fce359be2951e6ac0c92cb5ba3a659bca452e08f83d8a09a8 WHIRLPOOL f759953c8495eddd0df0bbb3f2ad29e28004659d39f1d415c89604fdebf6729e914ab6830c540ff9c3f693ceb609aff882265bc0ff8a8d1e2637285d7d51158f
 DIST hplip-3.12.10a.tar.gz 21827613 SHA256 616a30f260407f959874d35d351eaf73c74f7f8f016a7826286c88d923a4b1fc SHA512 870a794fdd729aa69b392c3d5cba764ee77141be16313adaf43089c82de397b64517e88d986ecc6f1766cdd5381fa103528ee214358e7b9398f7d4bd70d5f33c WHIRLPOOL 45d2831f593b609b4e4e774c0bf446dd98cb8ad4eba797baafbc43d8af4897764973066348dde08f97ae90635becbe3e91419fbc080d4fdb0a3771b8e63d3c89
 DIST hplip-3.13.4.tar.gz 20680774 SHA256 1adad3b15578bf81eae93d554f877fea78c734f4b4f2e34606230b2fe62d6956 SHA512 4b1b02f4cf3b0f7d7e030b8981d72f4dae03cf9b2b0515c05d1ab83cefb8d69c446cd9825aadf2625d53a0e51ae45287e0c546ea998737a030bb93a1703900d8 WHIRLPOOL 6ff3949fa7cf8f3b4acc0e722686197a868bd6fd248bc55f8b86f20cbd0a255915ed90ff5c3f596692a2918620bc8fa3614a54981e99e9f1c4e25bea3065383a
+DIST hplip-3.13.5-patches-1.tar.xz 10200 SHA256 72d2b5d455c56bf97401298419c18bb21824a84785a7c05eb047139aa17efb93 SHA512 e2dc03689c09a4cc473391d0593c699e8c7affbf553fe0190488a86533d6deaeb8a108ecc0a58a97ffdac15770923d03803977aa59c0ce762f9ea17b8eeee862 WHIRLPOOL 410995e1564eea0d2982f957613a1d5862ca0c87dd524a053a69f603ad6b53c4837cbd88394610c3aa4883b8893cf3d99712a409f921a5e682cc97537fc0dbdd
+DIST hplip-3.13.5.tar.gz 20737422 SHA256 cf50cb93353b142fa0e2aa18f6c97e1f46b7f462d3187ed7a3800aef924cd474 SHA512 928d22d746103cf83c1ea59b9a05e63ec581d3c1f77ec1bfe3742f3aabdba4b265cbaad9291bdbdcea62a5352e2a06018454cb2a0316567a92678bd16f0b2941 WHIRLPOOL d0cce0c66e27fa96e1437600ebf8d883d0f7abd5e75f6374f67e569c535108db6173d4a19e3ed09f8f3d79de590f18f0866ab6b1804437f96f39a3d4794a435b
diff --git a/net-print/hplip/hplip-3.13.5.ebuild b/net-print/hplip/hplip-3.13.5.ebuild
new file mode 100644
index 000000000000..7a4253af3d64
--- /dev/null
+++ b/net-print/hplip/hplip-3.13.5.ebuild
@@ -0,0 +1,269 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.13.5.ebuild,v 1.1 2013/05/18 08:07:20 billie Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+PYTHON_REQ_USE="threads,xml"
+
+inherit eutils fdo-mime linux-info python-single-r1 udev autotools toolchain-funcs
+
+DESCRIPTION="HP Linux Imaging and Printing. Includes printer, scanner, fax drivers and service tools."
+HOMEPAGE="http://hplipopensource.com/hplip-web/index.html"
+SRC_URI="mirror://sourceforge/hplip/${P}.tar.gz
+		http://dev.gentoo.org/~billie/distfiles/${PN}-3.13.5-patches-1.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+
+# zeroconf does not work properly with >=cups-1.4.
+# Thus support for it is also disabled in hplip.
+IUSE="doc fax +hpcups hpijs kde libnotify -libusb0 minimal parport policykit qt4 scanner snmp static-ppds X"
+
+# TODO: check if net-print/cups, net-analyzer/net-snmp
+# are migrated to python-r1
+
+COMMON_DEPEND="
+	virtual/jpeg
+	hpijs? ( >=net-print/foomatic-filters-3.0.20080507[cups] )
+	!minimal? (
+		${PYTHON_DEPS}
+		>=net-print/cups-1.4.0
+		!libusb0? ( virtual/libusb:1 )
+		libusb0? ( virtual/libusb:0 )
+		scanner? ( >=media-gfx/sane-backends-1.0.19-r1 )
+		fax? ( >=sys-apps/dbus-1.6.8-r1 )
+		snmp? (
+			net-analyzer/net-snmp
+			dev-libs/openssl:0
+		)
+	)"
+
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig"
+
+RDEPEND="${COMMON_DEPEND}
+	>=app-text/ghostscript-gpl-8.71-r3
+	>=dev-python/dbus-python-1.1.1-r1[${PYTHON_USEDEP}]
+	policykit? (
+		sys-auth/polkit
+	)
+	!minimal? (
+		>=dev-python/pygobject-2.28.6-r53:2[${PYTHON_USEDEP}]
+		kernel_linux? ( virtual/udev !<sys-fs/udev-114 )
+		scanner? (
+			>=dev-python/reportlab-2.6[${PYTHON_USEDEP}]
+			>=dev-python/imaging-1.1.7-r2[${PYTHON_USEDEP}]
+			X? ( || (
+				kde? ( kde-misc/skanlite )
+				media-gfx/xsane
+				media-gfx/sane-frontends
+			) )
+		)
+		fax? (
+			>=dev-python/reportlab-2.6[${PYTHON_USEDEP}]
+			>=dev-python/dbus-python-1.1.1-r1[${PYTHON_USEDEP}]
+		)
+		qt4? (
+			>=dev-python/PyQt4-4.9.6-r2[dbus,X,${PYTHON_USEDEP}]
+			libnotify? (
+				>=dev-python/notify-python-0.1.1-r3[${PYTHON_USEDEP}]
+			)
+		)
+	)"
+
+CONFIG_CHECK="~PARPORT ~PPDEV"
+ERROR_PARPORT="Please make sure kernel parallel port support is enabled (PARPORT and PPDEV)."
+
+pkg_setup() {
+	use !minimal && python-single-r1_pkg_setup
+
+	! use qt4 && ewarn "You need USE=qt4 for the hplip GUI."
+
+	use scanner && ! use X && ewarn "You need USE=X for the scanner GUI."
+
+	if ! use hpcups && ! use hpijs ; then
+		ewarn "Installing neither hpcups (USE=-hpcups) nor hpijs (USE=-hpijs) driver,"
+		ewarn "which is probably not what you want."
+		ewarn "You will almost certainly not be able to print."
+	fi
+
+	if use minimal ; then
+		ewarn "Installing driver portions only, make sure you know what you are doing."
+		ewarn "Depending on the USE flags set for hpcups or hpijs the appropiate driver"
+		ewarn "is installed. If both USE flags are set hpijs overrides hpcups."
+	else
+		use parport && linux-info_pkg_setup
+	fi
+}
+
+src_prepare() {
+	if use !minimal ; then
+		python_export EPYTHON PYTHON
+		python_fix_shebang .
+	fi
+
+	EPATCH_SUFFIX="patch" \
+	EPATCH_FORCE="yes" \
+	epatch "${WORKDIR}"
+
+	# Make desktop files follow the specification
+	# Gentoo bug: https://bugs.gentoo.org/show_bug.cgi?id=443680
+	# Upstream bug: https://bugs.launchpad.net/hplip/+bug/1080324
+	sed -i -e '/^Categories=/s/Application;//' \
+		-e '/^Encoding=.*/d' hplip.desktop.in || die
+	sed -i -e '/^Categories=/s/Application;//' \
+		-e '/^Version=.*/d' \
+		-e '/^Comment=.*/d' hplip-systray.desktop.in || die
+
+	# Fix for Gentoo bug https://bugs.gentoo.org/show_bug.cgi?id=345725
+	# Upstream bug: https://bugs.launchpad.net/hplip/+bug/880847,
+	# https://bugs.launchpad.net/hplip/+bug/500086
+	local udevdir=$(udev_get_udevdir)
+	sed -i -e "s|/etc/udev|${udevdir}|g" \
+		$(find . -type f -exec grep -l /etc/udev {} +) || die
+
+	# Force recognition of Gentoo distro by hp-check
+	sed -i \
+		-e "s:file('/etc/issue', 'r').read():'Gentoo':" \
+		installer/core_install.py || die
+
+	# Use system foomatic-rip for hpijs driver instead of foomatic-rip-hplip
+	# The hpcups driver does not use foomatic-rip
+	local i
+	for i in ppd/hpijs/*.ppd.gz ; do
+		rm -f ${i}.temp || die
+		gunzip -c ${i} | sed 's/foomatic-rip-hplip/foomatic-rip/g' | \
+			gzip > ${i}.temp || die
+		mv ${i}.temp ${i} || die
+	done
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf drv_build minimal_build
+
+	if use fax || use qt4 ; then
+		myconf="${myconf} --enable-dbus-build"
+	else
+		myconf="${myconf} --disable-dbus-build"
+	fi
+
+	if use libusb0 ; then
+		myconf="${myconf} --enable-libusb01_build"
+	else
+		myconf="${myconf} --disable-libusb01_build"
+	fi
+
+	if use hpcups ; then
+		drv_build="$(use_enable hpcups hpcups-install)"
+		if use static-ppds ; then
+			drv_build="${drv_build} --enable-cups-ppd-install"
+			drv_build="${drv_build} --disable-cups-drv-install"
+		else
+			drv_build="${drv_build} --enable-cups-drv-install"
+			drv_build="${drv_build} --disable-cups-ppd-install"
+		fi
+	else
+		drv_build="--disable-hpcups-install"
+		drv_build="${drv_build} --disable-cups-drv-install"
+		drv_build="${drv_build} --disable-cups-ppd-install"
+	fi
+
+	if use hpijs ; then
+		drv_build="${drv_build} $(use_enable hpijs hpijs-install)"
+		if use static-ppds ; then
+			drv_build="${drv_build} --enable-foomatic-ppd-install"
+			drv_build="${drv_build} --disable-foomatic-drv-install"
+		else
+			drv_build="${drv_build} --enable-foomatic-drv-install"
+			drv_build="${drv_build} --disable-foomatic-ppd-install"
+		fi
+	else
+		drv_build="${drv_build} --disable-hpijs-install"
+		drv_build="${drv_build} --disable-foomatic-drv-install"
+		drv_build="${drv_build} --disable-foomatic-ppd-install"
+	fi
+
+	if use minimal ; then
+		if use hpijs ; then
+			minimal_build="--enable-hpijs-only-build"
+		else
+			minimal_build="--disable-hpijs-only-build"
+		fi
+		if use hpcups ; then
+			minimal_build="${minimal_build} --enable-hpcups-only-build"
+		else
+			minimal_build="${minimal_build} --disable-hpcups-only-build"
+		fi
+	fi
+
+	econf \
+		--disable-cups11-build \
+		--disable-lite-build \
+		--disable-foomatic-rip-hplip-install \
+		--disable-shadow-build \
+		--disable-qt3 \
+		--disable-udev_sysfs_rules \
+		--disable-udev-acl-rules \
+		--with-cupsbackenddir=$(cups-config --serverbin)/backend \
+		--with-cupsfilterdir=$(cups-config --serverbin)/filter \
+		--with-docdir=/usr/share/doc/${PF} \
+		--with-htmldir=/usr/share/doc/${PF}/html \
+		${myconf} \
+		${drv_build} \
+		${minimal_build} \
+		$(use_enable doc doc-build) \
+		$(use_enable fax fax-build) \
+		$(use_enable parport pp-build) \
+		$(use_enable scanner scan-build) \
+		$(use_enable snmp network-build) \
+		$(use_enable qt4 gui-build) \
+		$(use_enable qt4) \
+		$(use_enable policykit)
+}
+
+src_install() {
+	default
+
+	# Installed by sane-backends
+	# Gentoo Bug: https://bugs.gentoo.org/show_bug.cgi?id=201023
+	rm -f "${D}"/etc/sane.d/dll.conf || die
+
+	rm -f "${D}"/usr/share/doc/${PF}/{copyright,README_LIBJPG,COPYING} || die
+	rmdir --ignore-fail-on-non-empty "${D}"/usr/share/doc/${PF}/ || die
+
+	# Remove hal fdi files
+	rm -rf "${D}"/usr/share/hal || die
+
+	find "${D}" -name '*.la' -exec rm -rf {} + || die
+
+	if use !minimal ; then
+		python_export EPYTHON PYTHON
+		python_optimize "${D}"/usr/share/hplip
+	fi
+}
+
+pkg_preinst() {
+	# remove temporary directory so it is recreated with correct permissions
+	# this ensures correct permissions when upgrading from vulnerable versions
+	# remove this after some time
+	# Gentoo bug: https://bugs.gentoo.org/show_bug.cgi?id=452586
+	# Upstream bug: https://bugs.launchpad.net/hplip/+bug/1016507
+	if [[ $(stat -c '%A' /var/lib/hp/) =~ w.$ ]] ; then
+		rm -rf "${ROOT%/}/var/log/hp"
+	fi
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog "For more information on setting up your printer please take"
+		elog "a look at the hplip section of the gentoo printing guide:"
+		elog "http://www.gentoo.org/doc/en/printing-howto.xml"
+		elog
+		elog "Any user who wants to print must be in the lp group."
+	fi
+}
diff --git a/profiles/arch/hppa/package.use.mask b/profiles/arch/hppa/package.use.mask
index 030000b331e5..e682619f866a 100644
--- a/profiles/arch/hppa/package.use.mask
+++ b/profiles/arch/hppa/package.use.mask
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/hppa/package.use.mask,v 1.122 2013/03/31 14:24:38 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/hppa/package.use.mask,v 1.123 2013/05/17 14:46:41 jer Exp $
 
 # DON'T TOUCH THIS FILE. Instead, file a bug and assign it to <hppa@gentoo.org>.
 
@@ -110,7 +110,6 @@ net-im/pidgin gstreamer
 x11-misc/xscreensaver gdm new-login
 x11-libs/wxGTK gstreamer
 net-p2p/mldonkey guionly gtk
-media-libs/libcanberra gtk gtk3
 dev-vcs/git gtk
 app-cdr/cdrdao gcdmaster
 net-im/pidgin eds
diff --git a/profiles/hardened/linux/amd64/no-multilib/package.mask b/profiles/hardened/linux/amd64/no-multilib/package.mask
index bc5cde5031fd..301ccf3957c5 100644
--- a/profiles/hardened/linux/amd64/no-multilib/package.mask
+++ b/profiles/hardened/linux/amd64/no-multilib/package.mask
@@ -1,6 +1,18 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/amd64/no-multilib/package.mask,v 1.16 2013/05/16 19:29:27 zorry Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/amd64/no-multilib/package.mask,v 1.17 2013/05/17 16:26:30 zorry Exp $
+
+# These are broken as reported by Halcy0n, Aug, 23, 2011
+net-misc/teamviewer
+dev-lang/rebol-bin
+games-action/trine2
+games-action/swordandsworcery
+games-action/beathazardultra
+games-action/solar2
+games-arcade/dynamitejack
+games-kids/crayon-physics
+games-rpg/dungeon-defenders
+games-rpg/bastion
 
 # Mirror profile/amd64/no-multilib/package.mask
 app-accessibility/mbrola
diff --git a/sys-apps/dbus/dbus-1.6.10.ebuild b/sys-apps/dbus/dbus-1.6.10.ebuild
index a01084fbd2f4..4c4e0856f813 100644
--- a/sys-apps/dbus/dbus-1.6.10.ebuild
+++ b/sys-apps/dbus/dbus-1.6.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-1.6.10.ebuild,v 1.6 2013/05/16 13:13:44 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-1.6.10.ebuild,v 1.7 2013/05/18 05:25:43 ago Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -12,7 +12,7 @@ SRC_URI="http://dbus.freedesktop.org/releases/dbus/${P}.tar.gz"
 
 LICENSE="|| ( AFL-2.1 GPL-2 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
 IUSE="debug doc selinux static-libs systemd test X"
 
 RDEPEND=">=dev-libs/expat-2
diff --git a/sys-apps/ethtool/ethtool-3.8.ebuild b/sys-apps/ethtool/ethtool-3.8.ebuild
index ca20fb9965ab..be6476e9c07d 100644
--- a/sys-apps/ethtool/ethtool-3.8.ebuild
+++ b/sys-apps/ethtool/ethtool-3.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/ethtool/ethtool-3.8.ebuild,v 1.6 2013/05/16 15:50:18 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ethtool/ethtool-3.8.ebuild,v 1.7 2013/05/18 05:24:36 ago Exp $
 
 EAPI="4"
 
@@ -10,6 +10,6 @@ SRC_URI="mirror://kernel/software/network/ethtool/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86"
 
 DEPEND="app-arch/xz-utils"
diff --git a/sys-apps/file/file-5.12-r1.ebuild b/sys-apps/file/file-5.12-r1.ebuild
index 2ca7e9bee802..9df424463f14 100644
--- a/sys-apps/file/file-5.12-r1.ebuild
+++ b/sys-apps/file/file-5.12-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/file-5.12-r1.ebuild,v 1.4 2013/05/12 14:04:21 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/file-5.12-r1.ebuild,v 1.5 2013/05/18 05:31:46 ago Exp $
 
 EAPI="2"
 PYTHON_DEPEND="python? *"
@@ -17,7 +17,7 @@ SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE="python static-libs zlib"
 
 RDEPEND="zlib? ( sys-libs/zlib )"
diff --git a/sys-apps/pciutils/pciutils-3.2.0.ebuild b/sys-apps/pciutils/pciutils-3.2.0.ebuild
index 10a1c3930a59..b2467b5980e9 100644
--- a/sys-apps/pciutils/pciutils-3.2.0.ebuild
+++ b/sys-apps/pciutils/pciutils-3.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/pciutils-3.2.0.ebuild,v 1.7 2013/05/14 09:37:38 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/pciutils-3.2.0.ebuild,v 1.8 2013/05/18 05:24:49 ago Exp $
 
 EAPI="5"
 
@@ -12,7 +12,7 @@ SRC_URI="ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux"
 IUSE="+kmod static-libs zlib"
 
 # Have the sub-libs in RDEPEND with [static-libs] since, logically,
diff --git a/sys-apps/sg3_utils/sg3_utils-1.35.ebuild b/sys-apps/sg3_utils/sg3_utils-1.35.ebuild
index 85c3d31f9490..1dacbe4d3028 100644
--- a/sys-apps/sg3_utils/sg3_utils-1.35.ebuild
+++ b/sys-apps/sg3_utils/sg3_utils-1.35.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sg3_utils/sg3_utils-1.35.ebuild,v 1.6 2013/05/16 16:32:51 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sg3_utils/sg3_utils-1.35.ebuild,v 1.7 2013/05/18 05:24:23 ago Exp $
 
 EAPI="4"
 
@@ -12,7 +12,7 @@ SRC_URI="http://sg.danny.cz/sg/p/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh ~sparc ~x86"
 IUSE="static-libs"
 
 DEPEND="sys-devel/libtool"
diff --git a/sys-auth/keystone/files/keystone-folsom-4-CVE-2013-1977.patch b/sys-auth/keystone/files/keystone-folsom-4-CVE-2013-1977.patch
new file mode 100644
index 000000000000..91084fc23fb3
--- /dev/null
+++ b/sys-auth/keystone/files/keystone-folsom-4-CVE-2013-1977.patch
@@ -0,0 +1,21 @@
+diff -Naur keystone-2012.2.4/keystone/config.py keystone-2012.2.4.new/keystone/config.py
+--- keystone-2012.2.4/keystone/config.py	2013-04-11 15:02:19.000000000 -0400
++++ keystone-2012.2.4.new/keystone/config.py	2013-05-17 11:26:57.557918817 -0400
+@@ -110,7 +110,7 @@
+     group = kw.pop('group', None)
+     return conf.register_cli_opt(cfg.IntOpt(*args, **kw), group=group)
+ 
+-register_str('admin_token', default='ADMIN')
++register_str('admin_token', secret=True, default='ADMIN')
+ register_str('bind_host', default='0.0.0.0')
+ register_str('compute_port', default=8774)
+ register_str('admin_port', default=35357)
+@@ -162,7 +162,7 @@
+ #ldap
+ register_str('url', group='ldap', default='ldap://localhost')
+ register_str('user', group='ldap', default='dc=Manager,dc=example,dc=com')
+-register_str('password', group='ldap', default='freeipa4all')
++register_str('password', group='ldap', secret=True, default='freeipa4all')
+ register_str('suffix', group='ldap', default='cn=example,cn=com')
+ register_bool('use_dumb_member', group='ldap', default=False)
+ register_str('user_name_attribute', group='ldap', default='sn')
diff --git a/sys-auth/keystone/files/keystone-grizzly-1-CVE-2013-1977.patch b/sys-auth/keystone/files/keystone-grizzly-1-CVE-2013-1977.patch
new file mode 100644
index 000000000000..355d4a33edd2
--- /dev/null
+++ b/sys-auth/keystone/files/keystone-grizzly-1-CVE-2013-1977.patch
@@ -0,0 +1,40 @@
+From d43e2a51a1ed7adbed3c5ddf001d46bc4a824ae8 Mon Sep 17 00:00:00 2001
+From: Xuhan Peng <xuhanp@cn.ibm.com>
+Date: Fri, 12 Apr 2013 16:19:37 +0800
+Subject: [PATCH] Mark LDAP password and admin_token secret
+
+Add secret=True to LDAP password and admin_token
+of keystone configuration.
+
+Fix bug #1172195
+
+Change-Id: I8ef7f705e3f6b374ff427c20eb761892d5146a75
+---
+ keystone/common/config.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/keystone/common/config.py b/keystone/common/config.py
+index d7b6ff7..84ea83f 100644
+--- a/keystone/common/config.py
++++ b/keystone/common/config.py
+@@ -188,7 +188,7 @@ def configure():
+     register_cli_str('pydev-debug-host', default=None)
+     register_cli_int('pydev-debug-port', default=None)
+ 
+-    register_str('admin_token', default='ADMIN')
++    register_str('admin_token', secret=True, default='ADMIN')
+     register_str('bind_host', default='0.0.0.0')
+     register_int('compute_port', default=8774)
+     register_int('admin_port', default=35357)
+@@ -286,7 +286,7 @@ def configure():
+     # ldap
+     register_str('url', group='ldap', default='ldap://localhost')
+     register_str('user', group='ldap', default=None)
+-    register_str('password', group='ldap', default=None)
++    register_str('password', group='ldap', secret=True, default=None)
+     register_str('suffix', group='ldap', default='cn=example,cn=com')
+     register_bool('use_dumb_member', group='ldap', default=False)
+     register_str('dumb_member', group='ldap', default='cn=dumb,dc=nonexistent')
+-- 
+1.8.1.5
+
diff --git a/sys-auth/keystone/keystone-2012.2.4-r2.ebuild b/sys-auth/keystone/keystone-2012.2.4-r3.ebuild
similarity index 95%
rename from sys-auth/keystone/keystone-2012.2.4-r2.ebuild
rename to sys-auth/keystone/keystone-2012.2.4-r3.ebuild
index c17b197b8cbc..b4e12026585f 100644
--- a/sys-auth/keystone/keystone-2012.2.4-r2.ebuild
+++ b/sys-auth/keystone/keystone-2012.2.4-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/keystone/keystone-2012.2.4-r2.ebuild,v 1.1 2013/05/10 16:14:06 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/keystone/keystone-2012.2.4-r3.ebuild,v 1.1 2013/05/17 15:35:49 prometheanfire Exp $
 
 EAPI=5
 #test restricted becaues of bad requirements given (old webob for instance)
@@ -72,6 +72,7 @@ RDEPEND="${DEPEND}
 PATCHES=(
 	"${FILESDIR}/keystone-folsom-4-CVE-2013-2030.patch"
 	"${FILESDIR}/keystone-folsom-4-CVE-2013-2059.patch"
+	"${FILESDIR}/keystone-folsom-4-CVE-2013-1977.patch"
 )
 
 python_install() {
diff --git a/sys-cluster/nova/files/nova-folsom-4-CVE-2013-2096.patch b/sys-cluster/nova/files/nova-folsom-4-CVE-2013-2096.patch
new file mode 100644
index 000000000000..304a61f9d20f
--- /dev/null
+++ b/sys-cluster/nova/files/nova-folsom-4-CVE-2013-2096.patch
@@ -0,0 +1,115 @@
+From 6740c4141ea1152529b82cbf6e5b808eaba912e7 Mon Sep 17 00:00:00 2001
+From: Chet Burgess <cfb@metacloud.com>
+Date: Thu, 9 May 2013 09:57:28 +0000
+Subject: [PATCH] Check QCOW2 image size during root disk creation
+
+glance can only tell us the size of the file, not the virtual
+size of the QCOW2. As such we need to check the virtual size of
+the image once its cached and ensure it's <= to the flavor's
+root disk size.
+
+Change-Id: I833467284126557eb598b8350a84e10c06292fa9
+Fixes: bug 1177830
+(cherry picked from commit 44a8aba1d5da87d54db48079103fdef946666d80)
+---
+ nova/tests/test_imagebackend.py   | 18 ++++++++++++++++++
+ nova/virt/libvirt/imagebackend.py | 12 ++++++++++++
+ 2 files changed, 30 insertions(+)
+
+diff --git a/nova/tests/test_imagebackend.py b/nova/tests/test_imagebackend.py
+index f0bb718..da14f20 100644
+--- a/nova/tests/test_imagebackend.py
++++ b/nova/tests/test_imagebackend.py
+@@ -17,6 +17,7 @@
+ 
+ import os
+ 
++from nova import exception
+ from nova import flags
+ from nova import test
+ from nova.tests import fake_libvirt_utils
+@@ -190,7 +191,10 @@ class Qcow2TestCase(_ImageTestCase):
+         fn = self.prepare_mocks()
+         fn(target=self.TEMPLATE_PATH)
+         self.mox.StubOutWithMock(os.path, 'exists')
++        self.mox.StubOutWithMock(imagebackend.disk, 'get_disk_size')
+         os.path.exists(self.QCOW2_BASE).AndReturn(False)
++        imagebackend.disk.get_disk_size(self.TEMPLATE_PATH
++                                       ).AndReturn(self.SIZE)
+         imagebackend.libvirt_utils.copy_image(self.TEMPLATE_PATH,
+                                               self.QCOW2_BASE)
+         imagebackend.disk.extend(self.QCOW2_BASE, self.SIZE)
+@@ -203,11 +207,25 @@ class Qcow2TestCase(_ImageTestCase):
+ 
+         self.mox.VerifyAll()
+ 
++    def test_create_image_too_small(self):
++        self.mox.StubOutWithMock(imagebackend.disk, 'get_disk_size')
++        imagebackend.disk.get_disk_size(self.TEMPLATE_PATH
++                                       ).AndReturn(self.SIZE)
++        self.mox.ReplayAll()
++
++        image = self.image_class(self.INSTANCE, self.NAME)
++        self.assertRaises(exception.ImageTooLarge, image.create_image, None,
++                          self.TEMPLATE_PATH, 1)
++        self.mox.VerifyAll()
++
+     def test_create_image_with_size_template_exists(self):
+         fn = self.prepare_mocks()
+         fn(target=self.TEMPLATE_PATH)
+         self.mox.StubOutWithMock(os.path, 'exists')
++        self.mox.StubOutWithMock(imagebackend.disk, 'get_disk_size')
+         os.path.exists(self.QCOW2_BASE).AndReturn(True)
++        imagebackend.disk.get_disk_size(self.TEMPLATE_PATH
++                                       ).AndReturn(self.SIZE)
+         imagebackend.libvirt_utils.create_cow_image(self.QCOW2_BASE,
+                                                     self.PATH)
+         self.mox.ReplayAll()
+diff --git a/nova/virt/libvirt/imagebackend.py b/nova/virt/libvirt/imagebackend.py
+index 0f2f044..5e7023e 100644
+--- a/nova/virt/libvirt/imagebackend.py
++++ b/nova/virt/libvirt/imagebackend.py
+@@ -19,14 +19,17 @@ import abc
+ import contextlib
+ import os
+ 
++from nova import exception
+ from nova import flags
+ from nova.openstack.common import cfg
+ from nova.openstack.common import excutils
++from nova.openstack.common import log as logging
+ from nova import utils
+ from nova.virt.disk import api as disk
+ from nova.virt.libvirt import config
+ from nova.virt.libvirt import utils as libvirt_utils
+ 
++
+ __imagebackend_opts = [
+     cfg.StrOpt('libvirt_images_type',
+             default='default',
+@@ -46,6 +49,8 @@ __imagebackend_opts = [
+ FLAGS = flags.FLAGS
+ FLAGS.register_opts(__imagebackend_opts)
+ 
++LOG = logging.getLogger(__name__)
++
+ 
+ class Image(object):
+     __metaclass__ = abc.ABCMeta
+@@ -170,6 +175,13 @@ class Qcow2(Image):
+                         disk.extend(qcow2_base, size)
+             libvirt_utils.create_cow_image(qcow2_base, target)
+ 
++        # NOTE(cfb): Having a flavor that sets the root size to 0 and having
++        #            nova effectively ignore that size and use the size of the
++        #            image is considered a feature at this time, not a bug.
++        if size and size < disk.get_disk_size(base):
++            LOG.error('%s virtual size larger than flavor root disk size %s' %
++                      (base, size))
++            raise exception.ImageTooLarge()
+         prepare_template(target=base, *args, **kwargs)
+         with utils.remove_path_on_error(self.path):
+             copy_qcow2_image(base, self.path, size)
+-- 
+1.8.1.5
+
diff --git a/sys-cluster/nova/files/nova-grizzly-1-CVE-2013-2096.patch b/sys-cluster/nova/files/nova-grizzly-1-CVE-2013-2096.patch
new file mode 100644
index 000000000000..5067ca97d77f
--- /dev/null
+++ b/sys-cluster/nova/files/nova-grizzly-1-CVE-2013-2096.patch
@@ -0,0 +1,96 @@
+From a4fc0c800502338e4530cad910efb64a5483e1ea Mon Sep 17 00:00:00 2001
+From: Chet Burgess <cfb@metacloud.com>
+Date: Thu, 9 May 2013 09:57:28 +0000
+Subject: [PATCH] Check QCOW2 image size during root disk creation
+
+glance can only tell us the size of the file, not the virtual
+size of the QCOW2. As such we need to check the virtual size of
+the image once its cached and ensure it's <= to the flavor's
+root disk size.
+
+Change-Id: I833467284126557eb598b8350a84e10c06292fa9
+Fixes: bug 1177830
+(cherry picked from commit 44a8aba1d5da87d54db48079103fdef946666d80)
+---
+ nova/tests/test_imagebackend.py   | 21 +++++++++++++++++++++
+ nova/virt/libvirt/imagebackend.py |  8 ++++++++
+ 2 files changed, 29 insertions(+)
+
+diff --git a/nova/tests/test_imagebackend.py b/nova/tests/test_imagebackend.py
+index d571bbf..4ec36da 100644
+--- a/nova/tests/test_imagebackend.py
++++ b/nova/tests/test_imagebackend.py
+@@ -20,6 +20,7 @@ import os
+ import fixtures
+ from oslo.config import cfg
+ 
++from nova import exception
+ from nova.openstack.common import uuidutils
+ from nova import test
+ from nova.tests import fake_libvirt_utils
+@@ -253,9 +254,12 @@ class Qcow2TestCase(_ImageTestCase, test.TestCase):
+         fn = self.prepare_mocks()
+         fn(target=self.TEMPLATE_PATH)
+         self.mox.StubOutWithMock(os.path, 'exists')
++        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.TEMPLATE_PATH).AndReturn(False)
++        imagebackend.disk.get_disk_size(self.TEMPLATE_PATH
++                                       ).AndReturn(self.SIZE)
+         os.path.exists(self.PATH).AndReturn(False)
+         imagebackend.libvirt_utils.create_cow_image(self.TEMPLATE_PATH,
+                                                     self.PATH)
+@@ -267,6 +271,23 @@ class Qcow2TestCase(_ImageTestCase, test.TestCase):
+ 
+         self.mox.VerifyAll()
+ 
++    def test_create_image_too_small(self):
++        fn = self.prepare_mocks()
++        fn(target=self.TEMPLATE_PATH)
++        self.mox.StubOutWithMock(os.path, 'exists')
++        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.TEMPLATE_PATH).AndReturn(False)
++        imagebackend.disk.get_disk_size(self.TEMPLATE_PATH
++                                       ).AndReturn(self.SIZE)
++        self.mox.ReplayAll()
++
++        image = self.image_class(self.INSTANCE, self.NAME)
++        self.assertRaises(exception.ImageTooLarge, image.create_image, fn,
++                          self.TEMPLATE_PATH, 1)
++        self.mox.VerifyAll()
++
+ 
+ class LvmTestCase(_ImageTestCase, test.TestCase):
+     VG = 'FakeVG'
+diff --git a/nova/virt/libvirt/imagebackend.py b/nova/virt/libvirt/imagebackend.py
+index b6b1b88..2ca71cc 100755
+--- a/nova/virt/libvirt/imagebackend.py
++++ b/nova/virt/libvirt/imagebackend.py
+@@ -21,6 +21,7 @@ import os
+ 
+ from oslo.config import cfg
+ 
++from nova import exception
+ from nova.openstack.common import excutils
+ from nova.openstack.common import fileutils
+ from nova.openstack.common import lockutils
+@@ -255,6 +256,13 @@ class Qcow2(Image):
+ 
+         if not os.path.exists(base):
+             prepare_template(target=base, *args, **kwargs)
++        # NOTE(cfb): Having a flavor that sets the root size to 0 and having
++        #            nova effectively ignore that size and use the size of the
++        #            image is considered a feature at this time, not a bug.
++        if size and size < disk.get_disk_size(base):
++            LOG.error('%s virtual size larger than flavor root disk size %s' %
++                      (base, size))
++            raise exception.ImageTooLarge()
+         if not os.path.exists(self.path):
+             with utils.remove_path_on_error(self.path):
+                 copy_qcow2_image(base, self.path, size)
+-- 
+1.8.1.5
+
diff --git a/sys-cluster/nova/nova-2012.2.4-r1.ebuild b/sys-cluster/nova/nova-2012.2.4-r2.ebuild
similarity index 95%
rename from sys-cluster/nova/nova-2012.2.4-r1.ebuild
rename to sys-cluster/nova/nova-2012.2.4-r2.ebuild
index 27086453c574..4fc43413aaaa 100644
--- a/sys-cluster/nova/nova-2012.2.4-r1.ebuild
+++ b/sys-cluster/nova/nova-2012.2.4-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/nova/nova-2012.2.4-r1.ebuild,v 1.1 2013/05/10 04:11:00 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/nova/nova-2012.2.4-r2.ebuild,v 1.1 2013/05/17 14:57:48 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -45,6 +45,7 @@ RDEPEND="=dev-python/amqplib-0.6.1
 
 PATCHES=(
 	"${FILESDIR}/nova-folsom-4-CVE-2013-2030.patch"
+	"${FILESDIR}/nova-folsom-4-CVE-2013-2096.patch"
 )
 
 python_install() {
diff --git a/sys-cluster/nova/nova-2013.1.1-r1.ebuild b/sys-cluster/nova/nova-2013.1.1-r2.ebuild
similarity index 95%
rename from sys-cluster/nova/nova-2013.1.1-r1.ebuild
rename to sys-cluster/nova/nova-2013.1.1-r2.ebuild
index 848dec859c56..951e1e2a61a6 100644
--- a/sys-cluster/nova/nova-2013.1.1-r1.ebuild
+++ b/sys-cluster/nova/nova-2013.1.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/nova/nova-2013.1.1-r1.ebuild,v 1.1 2013/05/16 01:11:03 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/nova/nova-2013.1.1-r2.ebuild,v 1.1 2013/05/17 14:57:48 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -53,6 +53,7 @@ RDEPEND=">=dev-python/amqplib-0.6.1[${PYTHON_USEDEP}]
 		virtual/python-argparse[${PYTHON_USEDEP}]"
 
 PATCHES=(
+	"${FILESDIR}/nova-grizzly-1-CVE-2013-2096.patch"
 )
 
 python_install() {
diff --git a/sys-fs/dosfstools/dosfstools-3.0.16.ebuild b/sys-fs/dosfstools/dosfstools-3.0.16.ebuild
index fdbc82e954c2..ff7030c9a0fa 100644
--- a/sys-fs/dosfstools/dosfstools-3.0.16.ebuild
+++ b/sys-fs/dosfstools/dosfstools-3.0.16.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/dosfstools/dosfstools-3.0.16.ebuild,v 1.8 2013/05/13 14:52:45 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/dosfstools/dosfstools-3.0.16.ebuild,v 1.9 2013/05/18 05:31:18 ago Exp $
 
 EAPI="5"
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.daniel-baumann.ch/files/software/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
 IUSE=""
 RESTRICT="test" # there is no test target #239071
 
diff --git a/sys-fs/fatsort/Manifest b/sys-fs/fatsort/Manifest
index 22b2835e099c..a733ef8d2059 100644
--- a/sys-fs/fatsort/Manifest
+++ b/sys-fs/fatsort/Manifest
@@ -1,2 +1,3 @@
 DIST fatsort-0.9.17.269.tar.gz 30130 SHA256 9c00d870b76d263496ad4b3815f8293f228adf62a5221279b05a42bbf3491a99 SHA512 ed6210c3429fb81ae41a09d36c11abcffbf70126f0db00ee1f79d2d0e092359551d26de795f61af9c294e1880795174e7a2cde84f5e2281b1ebcc8c5efae9db8 WHIRLPOOL 08c3d72c4dc3d852edb624b2499eeaf524c5509e3e7d96bb51495a6f11c3f6655c4ca89c245ab51eada8266f8d2597c5eb747721bf1c0d62bfb5bd5552dc83db
+DIST fatsort-1.0.1.314.tar.gz 45565 SHA256 3bd76ce2ce41d2ee701d48096cdbec8ae205dbd63d812cf55d9e2e7ef927dc3e SHA512 cead2c71b29be76923ffedbec094d9f5a5f7852d49f99ab9aaab1b58da0360074b5749aabcffabe5f5435a85617cfc0b6311681cc9c12015088f6299f3f7fe17 WHIRLPOOL 5b353bf3a8885ae46fdcb90b05c2044c2a8b45205df39773f871f69ae89132f724da4ae8dc4180cfe43311c749b30249cdf3e006d16d48ebe9975a394ca0d069
 DIST fatsort-1.0.275.tar.gz 30116 SHA256 0473083f6c91d591d906a80426b80a9bd613da1e58668248df8275cdc3930250 SHA512 6ef97e4e2cc60cd8445cde1a5611d91475862402a9dcac8811cd4b751f80c07099aa1c25e3fadface9b06d12f486d9b466882939785a279a52bc5ef63ee2f814 WHIRLPOOL d0a4d8c6602761bed004a9af0aecc7417f0920b527a057c92f9b4ab377c90b52cb4e8712805ad4cc195cbbe368ff299a00dbc019f133f481ab4d1b5e928716be
diff --git a/sys-fs/fatsort/fatsort-1.0.1.314.ebuild b/sys-fs/fatsort/fatsort-1.0.1.314.ebuild
new file mode 100644
index 000000000000..928e18846d33
--- /dev/null
+++ b/sys-fs/fatsort/fatsort-1.0.1.314.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/fatsort/fatsort-1.0.1.314.ebuild,v 1.1 2013/05/18 08:09:17 billie Exp $
+
+EAPI=5
+
+inherit toolchain-funcs
+
+DESCRIPTION="Sorts files on FAT16/32 partitions, ideal for basic audio players."
+HOMEPAGE="http://fatsort.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+src_prepare() {
+	sed -i -e '/^\(MANDIR=\|SBINDIR=\)/s|/usr/local|/usr|' \
+		$(find ./ -name Makefile) || die
+
+	sed -i -e 's/install#/install #/g' Makefile || die
+}
+
+src_compile() {
+	emake CC=$(tc-getCC) LD=$(tc-getCC) \
+		CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
+		DESTDIR="${D}"
+}
diff --git a/sys-fs/udev/udev-9999.ebuild b/sys-fs/udev/udev-9999.ebuild
index 2cd24b5099f0..8b3e61346a0f 100644
--- a/sys-fs/udev/udev-9999.ebuild
+++ b/sys-fs/udev/udev-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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.226 2013/05/09 16:16:02 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.228 2013/05/17 13:50:18 ssuominen Exp $
 
 EAPI=5
 
diff --git a/sys-fs/vzquota/vzquota-3.1.ebuild b/sys-fs/vzquota/vzquota-3.1.ebuild
index 2753eea6d222..2dfd606d47fe 100644
--- a/sys-fs/vzquota/vzquota-3.1.ebuild
+++ b/sys-fs/vzquota/vzquota-3.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/vzquota/vzquota-3.1.ebuild,v 1.1 2012/12/13 09:14:36 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/vzquota/vzquota-3.1.ebuild,v 1.2 2013/05/17 22:20:24 ago Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="http://download.openvz.org/utils/${PN}/${PV}/src/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~ia64 ~ppc64 ~sparc ~x86"
 IUSE=""
 
 src_prepare() {
diff --git a/sys-process/procenv/Manifest b/sys-process/procenv/Manifest
index c071fc637e7f..4912e8fb2202 100644
--- a/sys-process/procenv/Manifest
+++ b/sys-process/procenv/Manifest
@@ -1,3 +1,4 @@
 DIST procenv-0.19.tar.gz 210428 SHA256 0184dfcf3db561dc45d1b241987329d993ebc15c023925c6c46d0acf170d6e1a SHA512 121cf763d25e605dcca99c8a8f094f3e079ee87eddd7cd50aa0dda767ec02e4b268e32c3d4f1810ac257167c33a6f49e2ce0a02ef6a5684c38a2dec9bc0e4e6a WHIRLPOOL 786227599c374fe3f4fe918e4dab7903b26fa8c002b2bc5fd84ebd0ca96ccfdf3f368294c51062c074d70f249b2531219901b57cf2056d29eeb466c64c42c052
 DIST procenv-0.20.tar.gz 210631 SHA256 5405daba9373bc410ad227c0a1be1e960fe52f3ea070d55593cec46d11b7fe6a SHA512 956a1a33470d8234091e85b34251a1408011b0748b74e33feef32b7bd391787354f96d56a5541f0135708aefa408cf9e9320fa82df53754145bc126a4e0bade3 WHIRLPOOL 8b0a66ed9049ce2ef9faf284bdaf1f055692e0fb85f87c4da4042cb611f53570df7ba2ed328d3557e9fcd25eae85ce62d826335cd0052de7b7b7d2ff8a7462b8
 DIST procenv-0.21.tar.gz 211693 SHA256 c29e7a0a4a1f882a456cb0c7d27c7ca9991da86d20f975cf131e5fc96f81fcae SHA512 15e8a384cf2ef554453b6cc74918d9c10b368ddc0ecaa21ca793383123ffa0d4adcff799ee85699ad1024c7dd82b2c8ec52a5924338250cc350aa8fec47cb3f8 WHIRLPOOL d40a58dff8702125baba611a322ab86c19d6f565b3d130047447ed13de49a3ff01c4f4890291e0ddc22c7d2e5f1bb35468be6f269d0b95d42693b2fd86976579
+DIST procenv-0.22.tar.gz 212489 SHA256 10e17892f0229d83e2afae4fc43ed7fe95472e5f3df4ae9be4003322a2d431b9 SHA512 c6c62f2d052d2cc548b3620345fb13a4da40080516c4bdc0a0592ab57fb2606f4e5d6d97d70e4f943ad0b013bca3b268ecf1ce829fbf7b210261d3af04f44260 WHIRLPOOL 22c40a47b53106ef44467cb9f683bd42d68505439f9bbc8dd58c4771edfbbbe9dddedd15a29f652824aeba4ac874bf5392f3d7b97ceff9d8a79e732d81b812d1
diff --git a/sys-process/procenv/procenv-0.22.ebuild b/sys-process/procenv/procenv-0.22.ebuild
new file mode 100644
index 000000000000..d42aa55ebc22
--- /dev/null
+++ b/sys-process/procenv/procenv-0.22.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-process/procenv/procenv-0.22.ebuild,v 1.1 2013/05/18 04:58:22 radhermit Exp $
+
+EAPI=5
+
+DESCRIPTION="A command-line utility that simply dumps all attributes of its environment"
+HOMEPAGE="https://launchpad.net/procenv/"
+SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"