diff --git a/app-accessibility/SphinxTrain/SphinxTrain-0.9.1-r1.ebuild b/app-accessibility/SphinxTrain/SphinxTrain-0.9.1-r1.ebuild
index 996ce9c5a1eb..4cf255f9dfec 100644
--- a/app-accessibility/SphinxTrain/SphinxTrain-0.9.1-r1.ebuild
+++ b/app-accessibility/SphinxTrain/SphinxTrain-0.9.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/SphinxTrain/SphinxTrain-0.9.1-r1.ebuild,v 1.17 2012/10/17 10:22:33 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/SphinxTrain/SphinxTrain-0.9.1-r1.ebuild,v 1.18 2012/12/28 18:14:24 ulm Exp $
 
 EAPI=4
 
@@ -10,7 +10,7 @@ DESCRIPTION="Speech Recognition (Training Module)"
 HOMEPAGE="http://cmusphinx.sourceforge.net/html/cmusphinx.php"
 SRC_URI="http://www.speech.cs.cmu.edu/${PN}/${P}-beta.tar.gz"
 
-LICENSE="BSD as-is"
+LICENSE="BSD-with-attribution"
 SLOT="0"
 KEYWORDS="~amd64 ppc x86"
 IUSE=""
diff --git a/app-accessibility/festival/festival-2.1-r1.ebuild b/app-accessibility/festival/festival-2.1-r1.ebuild
index 491975aee1e2..80888ea50913 100644
--- a/app-accessibility/festival/festival-2.1-r1.ebuild
+++ b/app-accessibility/festival/festival-2.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/festival/festival-2.1-r1.ebuild,v 1.1 2012/12/04 04:50:43 neurogeek Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/festival/festival-2.1-r1.ebuild,v 1.2 2012/12/28 18:19:42 ulm Exp $
 
 EAPI="2"
 inherit eutils multilib toolchain-funcs user
@@ -22,7 +22,7 @@ SRC_URI="${SITE}/${MY_P}.tar.gz
 	${SITE}/festvox_kallpc16k.tar.gz
 	${SITE}/speech_tools-${MY_PV}.tar.gz"
 
-LICENSE="FESTIVAL BSD as-is"
+LICENSE="FESTIVAL HPND BSD rc regexp-UofT free-noncomm"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE=""
diff --git a/app-accessibility/festival/festival-2.1.ebuild b/app-accessibility/festival/festival-2.1.ebuild
index 9f5a574ccaff..202cfa560048 100644
--- a/app-accessibility/festival/festival-2.1.ebuild
+++ b/app-accessibility/festival/festival-2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/festival/festival-2.1.ebuild,v 1.12 2012/05/31 02:14:16 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/festival/festival-2.1.ebuild,v 1.13 2012/12/28 18:19:42 ulm Exp $
 
 EAPI="2"
 inherit eutils multilib toolchain-funcs user
@@ -22,7 +22,7 @@ SRC_URI="${SITE}/${MY_P}.tar.gz
 	${SITE}/festvox_kallpc16k.tar.gz
 	${SITE}/speech_tools-${MY_PV}.tar.gz"
 
-LICENSE="FESTIVAL BSD as-is"
+LICENSE="FESTIVAL HPND BSD rc regexp-UofT free-noncomm"
 SLOT="0"
 KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE=""
diff --git a/app-accessibility/flite/flite-1.2-r1.ebuild b/app-accessibility/flite/flite-1.2-r1.ebuild
index 6988b601e9c2..5a368c54157a 100644
--- a/app-accessibility/flite/flite-1.2-r1.ebuild
+++ b/app-accessibility/flite/flite-1.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/flite/flite-1.2-r1.ebuild,v 1.14 2009/09/23 14:50:40 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/flite/flite-1.2-r1.ebuild,v 1.15 2012/12/28 18:44:22 ulm Exp $
 
 inherit eutils
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.speech.cs.cmu.edu/flite/index.html"
 SRC_URI="http://www.speech.cs.cmu.edu/flite/packed/${P}/${P}-release.tar.bz2
 	 http://www.speech.cs.cmu.edu/flite/packed/${P}/${PN}_lexfix.tar.gz"
 
-LICENSE="BSD as-is"
+LICENSE="BSD freetts public-domain regexp-UofT BSD-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 hppa ppc sparc x86"
 IUSE="static"
diff --git a/app-accessibility/flite/flite-1.3.ebuild b/app-accessibility/flite/flite-1.3.ebuild
index 00907b6d6c57..ff22ea771c1a 100644
--- a/app-accessibility/flite/flite-1.3.ebuild
+++ b/app-accessibility/flite/flite-1.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/flite/flite-1.3.ebuild,v 1.11 2010/02/28 23:14:49 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/flite/flite-1.3.ebuild,v 1.12 2012/12/28 18:44:22 ulm Exp $
 
 inherit eutils
 
@@ -8,7 +8,7 @@ DESCRIPTION="Flite text to speech engine"
 HOMEPAGE="http://www.speech.cs.cmu.edu/flite/index.html"
 SRC_URI="http://www.speech.cs.cmu.edu/flite/packed/${P}/${P}-release.tar.gz"
 
-LICENSE="BSD as-is"
+LICENSE="BSD freetts public-domain regexp-UofT BSD-2"
 SLOT="0"
 KEYWORDS="alpha amd64 -hppa ppc ppc64 sparc x86"
 IUSE="alsa static"
diff --git a/app-accessibility/flite/flite-1.4-r1.ebuild b/app-accessibility/flite/flite-1.4-r1.ebuild
index 5d590eedc730..5186cc13aa6e 100644
--- a/app-accessibility/flite/flite-1.4-r1.ebuild
+++ b/app-accessibility/flite/flite-1.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/flite/flite-1.4-r1.ebuild,v 1.5 2012/09/22 11:34:31 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/flite/flite-1.4-r1.ebuild,v 1.6 2012/12/28 18:44:22 ulm Exp $
 
 EAPI=4
 inherit autotools eutils
@@ -9,7 +9,7 @@ DESCRIPTION="Flite text to speech engine"
 HOMEPAGE="http://www.speech.cs.cmu.edu/flite/index.html"
 SRC_URI=" http://www.speech.cs.cmu.edu/${PN}/packed/${P}/${P}-release.tar.bz2"
 
-LICENSE="BSD as-is"
+LICENSE="BSD freetts public-domain regexp-UofT BSD-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 -hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE="alsa oss static-libs"
diff --git a/app-accessibility/speech-tools/speech-tools-1.2.96_beta-r2.ebuild b/app-accessibility/speech-tools/speech-tools-1.2.96_beta-r2.ebuild
index e23a8866ce11..1a78e868a5be 100644
--- a/app-accessibility/speech-tools/speech-tools-1.2.96_beta-r2.ebuild
+++ b/app-accessibility/speech-tools/speech-tools-1.2.96_beta-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-tools/speech-tools-1.2.96_beta-r2.ebuild,v 1.5 2012/05/31 02:18:35 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-tools/speech-tools-1.2.96_beta-r2.ebuild,v 1.6 2012/12/28 18:24:29 ulm Exp $
 
 EAPI="2"
 
@@ -13,7 +13,8 @@ DESCRIPTION="Speech tools for Festival Text to Speech engine"
 HOMEPAGE="http://www.cstr.ed.ac.uk/projects/speech_tools/"
 SRC_URI="http://www.festvox.org/packed/festival/1.96/${MY_P}.tar.gz
 	mirror://gentoo/${MY_P}-patches.tar.gz"
-LICENSE="FESTIVAL BSD as-is"
+
+LICENSE="FESTIVAL HPND BSD rc regexp-UofT"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="nas X"
diff --git a/app-accessibility/speech-tools/speech-tools-1.2.96_beta.ebuild b/app-accessibility/speech-tools/speech-tools-1.2.96_beta.ebuild
index b214284b6faa..49457ee2b3c1 100644
--- a/app-accessibility/speech-tools/speech-tools-1.2.96_beta.ebuild
+++ b/app-accessibility/speech-tools/speech-tools-1.2.96_beta.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-tools/speech-tools-1.2.96_beta.ebuild,v 1.16 2012/05/31 02:18:35 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-tools/speech-tools-1.2.96_beta.ebuild,v 1.17 2012/12/28 18:24:29 ulm Exp $
 
 inherit eutils multilib toolchain-funcs
 
@@ -10,7 +10,8 @@ MY_P=${MY_P/_beta/-beta}
 DESCRIPTION="Speech tools for Festival Text to Speech engine"
 HOMEPAGE="http://www.cstr.ed.ac.uk/projects/speech_tools/"
 SRC_URI="http://www.festvox.org/packed/festival/latest/${MY_P}.tar.gz"
-LICENSE="FESTIVAL BSD as-is"
+
+LICENSE="FESTIVAL HPND BSD rc regexp-UofT"
 SLOT="0"
 KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="nas X"
diff --git a/app-accessibility/speech-tools/speech-tools-2.0.95_beta.ebuild b/app-accessibility/speech-tools/speech-tools-2.0.95_beta.ebuild
index 27b38c7e0cac..abe4569d8e7d 100644
--- a/app-accessibility/speech-tools/speech-tools-2.0.95_beta.ebuild
+++ b/app-accessibility/speech-tools/speech-tools-2.0.95_beta.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-tools/speech-tools-2.0.95_beta.ebuild,v 1.5 2012/05/31 02:18:35 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-tools/speech-tools-2.0.95_beta.ebuild,v 1.6 2012/12/28 18:24:29 ulm Exp $
 
 EAPI="2"
 
@@ -13,7 +13,8 @@ DESCRIPTION="Speech tools for Festival Text to Speech engine"
 HOMEPAGE="http://www.cstr.ed.ac.uk/projects/speech_tools/"
 SRC_URI="http://www.festvox.org/packed/festival/${PV%_beta}/${MY_P}.tar.gz
 	mirror://gentoo/${MY_P}-patches.tar.gz"
-LICENSE="FESTIVAL BSD as-is"
+
+LICENSE="FESTIVAL HPND BSD rc regexp-UofT"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="nas X"
diff --git a/app-accessibility/speech-tools/speech-tools-2.1-r1.ebuild b/app-accessibility/speech-tools/speech-tools-2.1-r1.ebuild
index 86a1f27d9cb1..7f54649acd62 100644
--- a/app-accessibility/speech-tools/speech-tools-2.1-r1.ebuild
+++ b/app-accessibility/speech-tools/speech-tools-2.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-tools/speech-tools-2.1-r1.ebuild,v 1.9 2012/05/31 02:18:35 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-tools/speech-tools-2.1-r1.ebuild,v 1.10 2012/12/28 18:24:29 ulm Exp $
 
 EAPI="2"
 
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.cstr.ed.ac.uk/projects/speech_tools/"
 SRC_URI="http://www.festvox.org/packed/festival/${PV}/${MY_P}-release.tar.gz
 		 mirror://gentoo/${MY_P}-patches.tar.gz"
 
-LICENSE="FESTIVAL BSD as-is"
+LICENSE="FESTIVAL HPND BSD rc regexp-UofT"
 SLOT="0"
 KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="nas X"
diff --git a/app-accessibility/speech-tools/speech-tools-2.1-r2.ebuild b/app-accessibility/speech-tools/speech-tools-2.1-r2.ebuild
index 51d47321baa5..16a9ec93d0c9 100644
--- a/app-accessibility/speech-tools/speech-tools-2.1-r2.ebuild
+++ b/app-accessibility/speech-tools/speech-tools-2.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-tools/speech-tools-2.1-r2.ebuild,v 1.1 2012/12/04 04:09:02 neurogeek Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-tools/speech-tools-2.1-r2.ebuild,v 1.2 2012/12/28 18:24:29 ulm Exp $
 
 EAPI="2"
 
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.cstr.ed.ac.uk/projects/speech_tools/"
 SRC_URI="http://www.festvox.org/packed/festival/${PV}/${MY_P}-release.tar.gz
 		 http://dev.gentoo.org/~neurogeek/${PN}/${MY_P}-${PATCHSET}-patches.tar.gz"
 
-LICENSE="FESTIVAL BSD as-is"
+LICENSE="FESTIVAL HPND BSD rc regexp-UofT"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="nas X"
diff --git a/app-arch/xz-utils/xz-utils-5.0.4-r1.ebuild b/app-arch/xz-utils/xz-utils-5.0.4-r1.ebuild
index a7df0d0c00f4..8e76f65c607f 100644
--- a/app-arch/xz-utils/xz-utils-5.0.4-r1.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.0.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/xz-utils/xz-utils-5.0.4-r1.ebuild,v 1.2 2012/12/07 22:15:01 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/xz-utils/xz-utils-5.0.4-r1.ebuild,v 1.7 2012/12/28 17:24:36 jer Exp $
 
 # Remember: we cannot leverage autotools in this ebuild in order
 #           to avoid circular deps with autotools
@@ -17,7 +17,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MY_P="${PN/-utils}-${PV/_}"
 	SRC_URI="http://tukaani.org/xz/${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-aix ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~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 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	S=${WORKDIR}/${MY_P}
 	EXTRA_DEPEND=
 fi
diff --git a/app-crypt/ccid/Manifest b/app-crypt/ccid/Manifest
index e9e178f25175..f079120ce7fa 100644
--- a/app-crypt/ccid/Manifest
+++ b/app-crypt/ccid/Manifest
@@ -1,3 +1 @@
-DIST ccid-1.4.2.tar.bz2 445453 SHA256 348adcc84f328e1fa722a0326980621843de247d78ebefdc420096b4a94d2560 SHA512 5fd59eab283e3bc0493fb88e869de84ed30a0c603dbba732a22af39ce0b853725c1c9c35360282f61ca77a7ef6c590ecb1d9d62166d7a333d5343fcdb77ea555 WHIRLPOOL 5945a02b6776336956d2b10babe5fac72193aa7dbff760660f47cb5789f3d64ad5209c743b90af83c251c38051d9b83ff822e06f6892ab7d063d2e2fb3486c23
-DIST ccid-1.4.5.tar.bz2 461820 SHA256 8c41abea64b8c34f9a4fcf46b7add0462f5b18ba485e5a70c2874b4531bae7d1 SHA512 ca543cc7d56f0b948c77a5a362803a33320a61c687a039c8f5b1fd55c9d0eff0e0afc374dbb066372a0a248220c47ddefd126162c99e644a93fb315619a39d55 WHIRLPOOL 2fa913f83b935a9bc9973e64049be8be4b2c067d3b51ebe18a2c0fd1e850d77b3aafdad67d44a1964ee43b0d70bcfaa4f42852eea2fb12960130f50c14ec0bd3
 DIST ccid-1.4.8.tar.bz2 470158 SHA256 7aca09fa4b9099e423402fd5df424adbafa502888710d1fda6015b6c1ff637ef SHA512 1b5b56521e2469c23e033141236aae0791d50640f810a012d8420002a56a6929e476a1c8462653909e8939f9439b043a64b247aced7d1f511f96a7dd0071ffa0 WHIRLPOOL d0c51bf360ee63a72646af98e44b4b1940336dcf3400f249b075d8efcabdf650cfbaa6be2656d411195411646c82ac410487b8b274e88457edc8c4e4a23ac15d
diff --git a/app-crypt/ccid/ccid-1.4.2.ebuild b/app-crypt/ccid/ccid-1.4.2.ebuild
deleted file mode 100644
index e970614600d3..000000000000
--- a/app-crypt/ccid/ccid-1.4.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/ccid/ccid-1.4.2.ebuild,v 1.8 2012/12/11 14:53:14 ssuominen Exp $
-
-EAPI="3"
-
-STUPID_NUM="3518"
-
-inherit eutils udev
-
-DESCRIPTION="CCID free software driver"
-HOMEPAGE="http://pcsclite.alioth.debian.org/ccid.html"
-SRC_URI="http://alioth.debian.org/download.php/${STUPID_NUM}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm hppa ~ppc ppc64 x86"
-IUSE="twinserial +usb"
-
-DEPEND=">=sys-apps/pcsc-lite-1.6.5
-	usb? ( virtual/libusb:1 )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	sed -i -e 's:GROUP="pcscd":ENV{PCSCD}="1":' \
-		src/92_pcscd_ccid.rules || die
-}
-
-src_configure() {
-	econf \
-		LEX=: \
-		--docdir="/usr/share/doc/${PF}" \
-		$(use_enable twinserial) \
-		$(use_enable usb libusb)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc README AUTHORS || die
-	udev_newrules src/92_pcscd_ccid.rules
-}
diff --git a/app-crypt/ccid/ccid-1.4.5.ebuild b/app-crypt/ccid/ccid-1.4.5.ebuild
deleted file mode 100644
index 975d4dab2875..000000000000
--- a/app-crypt/ccid/ccid-1.4.5.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/ccid/ccid-1.4.5.ebuild,v 1.8 2012/12/11 14:53:14 ssuominen Exp $
-
-EAPI="4"
-
-STUPID_NUM="3672"
-
-inherit eutils udev
-
-DESCRIPTION="CCID free software driver"
-HOMEPAGE="http://pcsclite.alioth.debian.org/ccid.html"
-SRC_URI="http://alioth.debian.org/download.php/${STUPID_NUM}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm hppa ppc ppc64 x86"
-IUSE="twinserial +usb"
-
-DEPEND=">=sys-apps/pcsc-lite-1.6.5
-	usb? ( virtual/libusb:1 )"
-RDEPEND="${DEPEND}"
-
-DOCS=( README AUTHORS )
-
-src_prepare() {
-	sed -i -e 's:GROUP="pcscd":ENV{PCSCD}="1":' \
-		src/92_pcscd_ccid.rules || die
-}
-
-src_configure() {
-	econf \
-		LEX=: \
-		--docdir="/usr/share/doc/${PF}" \
-		$(use_enable twinserial) \
-		$(use_enable usb libusb)
-}
-
-src_install() {
-	default
-
-	udev_newrules src/92_pcscd_ccid.rules
-}
diff --git a/app-crypt/mcrypt/mcrypt-2.6.8-r2.ebuild b/app-crypt/mcrypt/mcrypt-2.6.8-r2.ebuild
index a462afa02b0a..fe7094fe024e 100644
--- a/app-crypt/mcrypt/mcrypt-2.6.8-r2.ebuild
+++ b/app-crypt/mcrypt/mcrypt-2.6.8-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/mcrypt/mcrypt-2.6.8-r2.ebuild,v 1.5 2012/12/24 20:11:04 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/mcrypt/mcrypt-2.6.8-r2.ebuild,v 1.6 2012/12/28 15:07:18 ago Exp $
 
 EAPI="2"
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/mcrypt/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc x86 ~x86-macos"
+KEYWORDS="amd64 ~ppc sparc x86 ~x86-macos"
 IUSE="nls"
 
 DEPEND=">=dev-libs/libmcrypt-2.5.8
diff --git a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20121028.ebuild b/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20121028.ebuild
index c585a8389b40..87826e90d14b 100644
--- a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20121028.ebuild
+++ b/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20121028.ebuild
@@ -1,12 +1,14 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20121028.ebuild,v 1.3 2012/11/25 19:26:53 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20121028.ebuild,v 1.4 2012/12/28 20:05:06 ulm Exp $
 
 EAPI="4"
 inherit emul-linux-x86
 
-LICENSE="Artistic GPL-1 GPL-2 GPL-3 BSD BSD-2 BZIP2 AFL-2.1 LGPL-2.1 BSD-4 MIT public-domain
-LGPL-3 LGPL-2 GPL-2-with-exceptions MPL-1.1 OPENLDAP Sleepycat UoI-NCSA ZLIB as-is openssl tcp_wrappers_license"
+LICENSE="Artistic GPL-1 GPL-2 GPL-3 BSD BSD-2 BZIP2 AFL-2.1 LGPL-2.1 BSD-4 MIT
+	public-domain LGPL-3 LGPL-2 GPL-2-with-exceptions MPL-1.1 OPENLDAP
+	Sleepycat UoI-NCSA ZLIB openafs-krb5-a HPND ISC RSA IJG libmng libtiff
+	openssl tcp_wrappers_license"
 
 KEYWORDS="-* amd64"
 
diff --git a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20121202.ebuild b/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20121202.ebuild
index 2442ffb16b44..687be1360bae 100644
--- a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20121202.ebuild
+++ b/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20121202.ebuild
@@ -1,13 +1,14 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20121202.ebuild,v 1.2 2012/12/25 19:00:01 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20121202.ebuild,v 1.3 2012/12/28 20:05:06 ulm Exp $
 
 EAPI=5
 inherit emul-linux-x86
 
 LICENSE="Artistic GPL-1 GPL-2 GPL-3 BSD BSD-2 BZIP2 AFL-2.1 LGPL-2.1 BSD-4 MIT
 	public-domain LGPL-3 LGPL-2 GPL-2-with-exceptions MPL-1.1 OPENLDAP
-	Sleepycat UoI-NCSA ZLIB as-is openssl tcp_wrappers_license"
+	Sleepycat UoI-NCSA ZLIB openafs-krb5-a HPND ISC RSA IJG libmng libtiff
+	openssl tcp_wrappers_license"
 
 KEYWORDS="-* amd64"
 
diff --git a/app-misc/getopt/Manifest b/app-misc/getopt/Manifest
index e74633b83d16..ef5b78b86218 100644
--- a/app-misc/getopt/Manifest
+++ b/app-misc/getopt/Manifest
@@ -1 +1,2 @@
 DIST getopt-1.1.4.tar.gz 37163 SHA256 41083d9993c26792851e79b81a0991996a3f61e14998fdd607615cc3bf933bab SHA512 9ec9b5ca50a02b6ae772b133408e61fb9fcb5840c00f23d1c836a9c7ee86778211dcb1ecf5cdcaf9e2488b2db0671e29bc8be55f1a7ca4f1d48cc3921dfe04ad WHIRLPOOL 64e4942064930303ecc8cd6ea22f93ccd0c34415815f1e4fc43d2786b1e3bd511fac6d0aa6ef470b0a026a7776c4e0b345b1beada0c972203808232d0c331727
+DIST getopt-1.1.5.tar.gz 51794 SHA256 11893276b94b1629606ab75772143918a5713259950fbf4216288e246f19fbb6 SHA512 43597a1a8dd1dc188b6b4f0a8f8d438456013276aa1c719889e242ba2b526dccbca2fccd3d82d1541f4e0920fd277c101a436ed0c208124227481f792cb1cf75 WHIRLPOOL c5de1797b0c294a404ef8e801d86677d0b84fd6974e5d5ad8d234ae28db5446d0b13766362ecac459b3f8ce07d56282a3f0274b460d5d95118000762d9374815
diff --git a/app-misc/getopt/files/getopt-1.1.5-libintl.patch b/app-misc/getopt/files/getopt-1.1.5-libintl.patch
new file mode 100644
index 000000000000..b40367105ed0
--- /dev/null
+++ b/app-misc/getopt/files/getopt-1.1.5-libintl.patch
@@ -0,0 +1,11 @@
+--- Makefile.orig	2012-12-28 11:40:09.524686698 +0100
++++ Makefile	2012-12-28 11:41:20.646157275 +0100
+@@ -61,7 +61,7 @@
+ 	-$(RM) $(objects) $(binaries) 
+ 
+ getopt: $(objects)
+-	$(CC) $(LDFLAGS) -o $@ $(objects)
++	$(CC) $(LDFLAGS) -o $@ $(objects) $(LIBINTL)
+ 
+ install: getopt install_po
+ 	$(INSTALL) -m 755 -d $(DESTDIR)$(bindir) $(DESTDIR)$(man1dir)
diff --git a/app-misc/getopt/files/getopt-1.1.5-longrename.patch b/app-misc/getopt/files/getopt-1.1.5-longrename.patch
new file mode 100644
index 000000000000..03f2ca5a7445
--- /dev/null
+++ b/app-misc/getopt/files/getopt-1.1.5-longrename.patch
@@ -0,0 +1,79 @@
+--- getopt-1.1.5/getopt-parse.bash
++++ getopt-1.1.5/getopt-parse.bash
+@@ -19,7 +19,7 @@
+ # Note that we use `"$@"' to let each command-line parameter expand to a 
+ # separate word. The quotes around `$@' are essential!
+ # We need TEMP as the `eval set --' would nuke the return value of getopt.
+-TEMP=`getopt -o ab:c:: --long a-long,b-long:,c-long:: \
++TEMP=`getopt-long -o ab:c:: --long a-long,b-long:,c-long:: \
+      -n 'example.bash' -- "$@"`
+ 
+ if [ $? != 0 ] ; then echo "Terminating..." >&2 ; exit 1 ; fi
+--- getopt-1.1.5/getopt-parse.tcsh
++++ getopt-1.1.5/getopt-parse.tcsh
+@@ -26,7 +26,7 @@
+ # as a list. The ':q`  copies that list without doing any substitutions:
+ # each element of argv becomes a separate argument for getopt. The braces
+ # are needed because the result is also a list.
+-set temp=(`getopt -s tcsh -o ab:c:: --long a-long,b-long:,c-long:: -- $argv:q`)
++set temp=(`getopt-long -s tcsh -o ab:c:: --long a-long,b-long:,c-long:: -- $argv:q`)
+ if ($? != 0) then 
+   echo "Terminating..." >/dev/stderr
+   exit 1
+--- getopt-1.1.5/getopt.c
++++ getopt-1.1.5/getopt.c
+@@ -320,10 +320,10 @@
+ 
+ static void __attribute__ ((__noreturn__)) print_help(void)
+ {
+-	fputs(_("Usage: getopt optstring parameters\n"), stderr);
+-	fputs(_("       getopt [options] [--] optstring parameters\n"), stderr);
+-	fputs(_("       getopt [options] -o|--options optstring [options] [--]\n"), stderr);
+-	fputs(_("              parameters\n"), stderr);
++	fputs(_("Usage: getopt-long optstring parameters\n"), stderr);
++	fputs(_("       getopt-long [options] [--] optstring parameters\n"), stderr);
++	fputs(_("       getopt-long [options] -o|--options optstring [options] [--]\n"), stderr);
++	fputs(_("                   parameters\n"), stderr);
+ 	fputs(_("\nOptions:\n"), stderr);
+ 	fputs(_(" -a, --alternative            Allow long options starting with single -\n"), stderr);
+ 	fputs(_(" -h, --help                   This small usage guide\n"), stderr);
+@@ -333,7 +333,7 @@
+ 	fputs(_(" -q, --quiet                  Disable error reporting by getopt(3)\n"), stderr);
+ 	fputs(_(" -Q, --quiet-output           No normal output\n"), stderr);
+ 	fputs(_(" -s, --shell <shell>          Set shell quoting conventions\n"), stderr);
+-	fputs(_(" -T, --test                   Test for getopt(1) version\n"), stderr);
++	fputs(_(" -T, --test                   Test for getopt-long(1) version\n"), stderr);
+ 	fputs(_(" -u, --unquote                Do not quote the output\n"), stderr);
+ 	fputs(_(" -V, --version                Output version information\n"), stderr);
+ 	fputc('\n', stderr);
+--- getopt-1.1.5/Makefile
++++ getopt-1.1.5/Makefile
+@@ -32,7 +32,7 @@
+ LANGUAGES = ca cs da de es et eu fi fr gl hu id it ja nl pl pt_BR ru sl sv tr uk vi zh_CN zh_TW
+ MOFILES:=$(patsubst %,po/%.mo,$(LANGUAGES))
+ 
+-CPPFLAGS=-DLIBCGETOPT=$(LIBCGETOPT) -DWITHOUT_GETTEXT=$(WITHOUT_GETTEXT) -DLOCALEDIR=\"$(localedir)\" -DNOT_UTIL_LINUX -Dprogram_invocation_short_name=\"$(PACKAGE)\"  -Dprogram_version=\"$(VERSION)\"
++CPPFLAGS=-DLIBCGETOPT=$(LIBCGETOPT) -DWITHOUT_GETTEXT=$(WITHOUT_GETTEXT) -DLOCALEDIR=\"$(localedir)\" -DNOT_UTIL_LINUX -Dprogram_invocation_short_name=\"$(PACKAGE)-long\"  -Dprogram_version=\"$(VERSION)\"
+ ifeq ($(LIBCGETOPT),0)
+ CPPFLAGS+=-I./gnu 
+ endif
+@@ -81,7 +81,7 @@
+ 	for lang in $(LANGUAGES) ; do \
+ 	  dir=$(localedir)/$$lang/LC_MESSAGES; \
+ 	  $(INSTALL) -m 755 -d $(DESTDIR)$$dir ;\
+-	  $(INSTALL) -m 644 po/$$lang.mo $(DESTDIR)$$dir/getopt.mo  ;\
++	  $(INSTALL) -m 644 po/$$lang.mo $(DESTDIR)$$dir/getopt-long.mo  ;\
+ 	done
+ clean_po:
+ 	$(RM) $(MOFILES)
+--- getopt-1.1.5/nls.h
++++ getopt-1.1.5/nls.h
+@@ -29,7 +29,7 @@
+ #ifndef GETOPT_NLS
+ #define GETOPT_NLS
+ 
+-#define PACKAGE "getopt"
++#define PACKAGE "getopt-long"
+ 
+ #if WITHOUT_GETTEXT
+ #define _(Text) (Text)
diff --git a/app-misc/getopt/files/getopt-1.1.5-setlocale.patch b/app-misc/getopt/files/getopt-1.1.5-setlocale.patch
new file mode 100644
index 000000000000..2d302d9c6a67
--- /dev/null
+++ b/app-misc/getopt/files/getopt-1.1.5-setlocale.patch
@@ -0,0 +1,12 @@
+setlocale: we need locale.h for LC_ALL on OpenIndiana
+
+--- getopt-1.1.5/nls.h
++++ getopt-1.1.5/nls.h
+@@ -40,6 +40,7 @@
+ #undef setlocale
+ #define setlocale(Category,Locale) /* empty */
+ #else /* not WITHOUT_GETTEXT */
++#include <locale.h>
+ #include <libintl.h>
+ #define _(Text) gettext (Text)
+ #endif /* WITHOUT_GETTEXT */
diff --git a/app-misc/getopt/getopt-1.1.5.ebuild b/app-misc/getopt/getopt-1.1.5.ebuild
new file mode 100644
index 000000000000..3d7be230035a
--- /dev/null
+++ b/app-misc/getopt/getopt-1.1.5.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/getopt/getopt-1.1.5.ebuild,v 1.2 2012/12/28 10:47:53 grobian Exp $
+
+EAPI=3
+
+inherit toolchain-funcs eutils
+
+DESCRIPTION="getopt(1) replacement supporting GNU-style long options"
+HOMEPAGE="http://software.frodo.looijaard.name/getopt/"
+SRC_URI="http://software.frodo.looijaard.name/getopt/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="nls"
+
+RDEPEND="nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-libintl.patch
+	epatch "${FILESDIR}"/${P}-setlocale.patch
+	epatch "${FILESDIR}"/${P}-longrename.patch
+
+	# hopefully this is portable enough
+	epatch "${FILESDIR}"/${PN}-1.1.4-irix.patch
+}
+
+src_compile() {
+	local nogettext="1"
+	local libintl=""
+	local libcgetopt=1
+
+	if use nls; then
+		nogettext=0
+		has_version sys-libs/glibc || libintl="-lintl"
+	fi
+
+	[[ ${CHOST} == *-irix* ]] && libcgetopt=0
+	[[ ${CHOST} == *-interix* ]] && libcgetopt=0
+
+	emake CC="$(tc-getCC)" prefix="${EPREFIX}/usr" \
+		LIBCGETOPT=${libcgetopt} \
+		WITHOUT_GETTEXT=${nogettext} LIBINTL=${libintl} \
+		CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" || die "emake failed"
+}
+
+src_install() {
+	use nls && make prefix="${EPREFIX}/usr" DESTDIR="${D}" install_po
+
+	into /usr
+	newbin getopt getopt-long
+
+	# at least on interix, the system getopt is ... broken...
+	# util-linux, which would provide the getopt binary, does not build &
+	# install on interix/prefix, so, this has to provide it.
+	[[ ${CHOST} == *-interix* || ${CHOST} == *-mint* ]] && \
+		dosym getopt-long /usr/bin/getopt
+
+	newman getopt.1 getopt-long.1
+
+	dodoc "${S}/getopt-"*sh
+}
diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest
index a5a9683ab9e6..cdbdf460b9c8 100644
--- a/app-misc/mc/Manifest
+++ b/app-misc/mc/Manifest
@@ -2,3 +2,4 @@ DIST mc-4.8.1.tar.xz 2057960 SHA256 3a734a12940e7f7db5b93a45823266c5ec2582838ac7
 DIST mc-4.8.3.tar.xz 2042276 SHA256 bd2855116f6dc9acf5b45d2794beeba3ddfb2e71cd9ac3b692dd6629019e42a3 SHA512 db52c53b7325974fb8f5b6077ea6e802b05f2993492d486607745d0dde1dc77a305865c86c0afcd3b39b9f0abbc8ad50a45e279a4072a1481b7969aaf2032843 WHIRLPOOL 9263d9dfd35b12ea379c8ea0f0e966ccc2ad86bf292324615735db92a324487dea2c27666a8be350971991cbdbccf402549b6a904bdd2f35a208d90a1d387556
 DIST mc-4.8.4.tar.xz 2114996 SHA256 b4be11c27857ec0c0896a7cd42dd1782a03d1e4c82c83f86b5cc880f6970863e SHA512 b0827f5a88dd65a12a15dc207ab2e97d5ed40c38921ad17c22a8316a62122238bb69077100744cc2fea20b6a202812bc8e38183546fe3ef63924017269a024c7 WHIRLPOOL 65aaf0a95911eade82a00513e71ca00d13c914412f9de33269e4b216df4e64025e42a20808cc265ef5fac3388a0ec832f3a3c64aadba82f1a725b9a92d070eb0
 DIST mc-4.8.6.tar.xz 2172316 SHA256 b39456f384123aba46124b93220f99e1b1c705112be55fc92275830132f28083 SHA512 6df489127f90c60e2041c5bac9a05f447c8de0ef7ec569b335b87da6fb308b809b2d9a693c076ba215d4b67c534f0b332426e3172ae71f634edfc0953143e974 WHIRLPOOL 20f130ec2b5ca95671914c53c83079c3d2026139f163bd32efa717c72854d34aaa05bab85639cde0a077f792d000ddc803bf3f8444f5740fa0b60a17d30a2777
+DIST mc-4.8.7.tar.xz 2106020 SHA256 88f620f7944d629087e0f3518a7e7bff7600fd1c4fa157767cdcca95f2cb3074 SHA512 f5c0f533e4e056246d5918233b9932f751589db613f1c591be3168b607a9b73919e93b631151c1c4dbc692b54e7ec1b2f8ec2ae875a24012744e7257735fa1d8 WHIRLPOOL 768b08f2ff0ce1de8893aec2a083269ecde6c62e6e7ea5379a96eec81ad56791e4adbfe712014cece323857fb96862a29dc97893b53f8d5316707e933f015342
diff --git a/app-misc/mc/mc-4.8.7.ebuild b/app-misc/mc/mc-4.8.7.ebuild
new file mode 100644
index 000000000000..f122b17554b6
--- /dev/null
+++ b/app-misc/mc/mc-4.8.7.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/mc-4.8.7.ebuild,v 1.1 2012/12/28 18:55:01 slyfox Exp $
+
+EAPI=4
+
+inherit eutils flag-o-matic
+
+MY_P=${P/_/-}
+
+DESCRIPTION="GNU Midnight Commander is a text based file manager"
+HOMEPAGE="http://www.midnight-commander.org"
+SRC_URI="http://www.midnight-commander.org/downloads/${MY_P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+IUSE="+edit gpm mclib nls samba sftp +slang spell test X +xdg"
+
+REQUIRED_USE="spell? ( edit )"
+
+RDEPEND=">=dev-libs/glib-2.8:2
+	gpm? ( sys-libs/gpm )
+	kernel_linux? ( sys-fs/e2fsprogs )
+	samba? ( net-fs/samba )
+	sftp? ( net-libs/libssh2 )
+	slang? ( >=sys-libs/slang-2 )
+	!slang? ( sys-libs/ncurses )
+	spell? ( app-text/aspell )
+	X? ( x11-libs/libX11
+		x11-libs/libICE
+		x11-libs/libXau
+		x11-libs/libXdmcp
+		x11-libs/libSM )"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	test? ( dev-libs/check )
+	"
+
+[[ -n ${LIVE_EBUILD} ]] && DEPEND="${DEPEND} dev-vcs/cvs" # needed only for SCM source tree (autopoint uses cvs)
+
+src_prepare() {
+	[[ -n ${LIVE_EBUILD} ]] && ./autogen.sh
+}
+
+S=${WORKDIR}/${MY_P}
+
+src_configure() {
+	local myscreen=ncurses
+	use slang && myscreen=slang
+	[[ ${CHOST} == *-solaris* ]] && append-ldflags "-lnsl -lsocket"
+
+	local homedir=".mc"
+	use xdg && homedir="XDG"
+
+	econf \
+		--disable-silent-rules \
+		--disable-dependency-tracking \
+		$(use_enable nls) \
+		--enable-vfs \
+		$(use_enable kernel_linux vfs-undelfs) \
+		--enable-charset \
+		$(use_with X x) \
+		$(use_enable samba vfs-smb) \
+		$(use_enable sftp vfs-sftp) \
+		$(use_enable spell aspell) \
+		$(use_with gpm gpm-mouse) \
+		--with-screen=${myscreen} \
+		$(use_with edit) \
+		$(use_enable mclib) \
+		$(use_enable test tests) \
+		--with-homedir=${homedir}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS README NEWS
+
+	# fix bug #334383
+	if use kernel_linux && [[ ${EUID} == 0 ]] ; then
+		fowners root:tty /usr/libexec/mc/cons.saver
+		fperms g+s /usr/libexec/mc/cons.saver
+	fi
+}
+
+pkg_postinst() {
+	elog "To enable exiting to latest working directory,"
+	elog "put this into your ~/.bashrc:"
+	elog ". ${EPREFIX}/usr/libexec/mc/mc.sh"
+}
diff --git a/app-misc/tmux/tmux-1.7.ebuild b/app-misc/tmux/tmux-1.7.ebuild
index 4aba8e28fbb4..d9c36a4f8d2f 100644
--- a/app-misc/tmux/tmux-1.7.ebuild
+++ b/app-misc/tmux/tmux-1.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tmux/tmux-1.7.ebuild,v 1.1 2012/10/13 17:18:59 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tmux/tmux-1.7.ebuild,v 1.3 2012/12/28 17:58:30 jer Exp $
 
 EAPI=4
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/tmux/${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="vim-syntax"
 
 COMMON_DEPEND="
diff --git a/app-portage/ufed/metadata.xml b/app-portage/ufed/metadata.xml
index d29ef5669c70..e5d5b206754b 100644
--- a/app-portage/ufed/metadata.xml
+++ b/app-portage/ufed/metadata.xml
@@ -1,5 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>tools-portage</herd>
+	<maintainer>
+		<email>yamakuzure@gmx.net</email>
+		<name>Sven Eden</name>
+		<description>Current maintainer, assign bugs</description>
+	</maintainer>
+	<maintainer>
+		<email>fuzzyray@gentoo.org</email>
+		<description>Proxy committer, CC bugs</description>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index efe81a09bea4..dbeb1fd17c12 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -1,3 +1,3 @@
-DIST calibre-0.9.10.tar.xz 27775784 SHA256 4e269320f883a17c6c6d577f7e4947dcda47e73917f297b33e402d4c9da042d9 SHA512 9c5aeb32f2910d236961ca58e8f079656f6844f2cc2d6c511a1dda561fb4b9b0247c47e5a3fd8c52472c0424ca3f3a8a8567d091f30bf412669255c7541de3fb WHIRLPOOL 2c39cfad0696075a1b3641c909cc6bf05d58742dea3fbc2fa6ad8ac2f45101e6ed8d98b14779838d7698223f8ccf3cf21720798b839516490ed1d89d81a535c3
 DIST calibre-0.9.11.tar.xz 27869620 SHA256 e83d62db1f27c46e2865599d3e4c4d1ba8eeca539dee982dd9eb0a213a135a4a SHA512 91fa1b022ff0f828551344a61adeb8f34be897dada5d2ea06692872c640b1f826270bbbeec40d4a18fb54f4a7efb0c503941c662e5ca916578b5908e69550c26 WHIRLPOOL 9d10377d2906b443aaf716be32f4fc863429f82165297d6b610be8fb4b4017f8cda565aa78933dfd384d0f52d7de5510ea8cdde8e1fce4a6c7b625fbe99adabf
+DIST calibre-0.9.12.tar.xz 27936676 SHA256 a1eff74aa0734fb0e899bde3076038e08c6472e41394a71dd56b496e37783420 SHA512 17fcdf4af0849bbd4e432c50b65225b344f0c86abc71c94b7aa2b9c4b638b434904dd03f14088eba72f0ea97357e3b9cd72ffcac50cb3d7b6735d800f5294f19 WHIRLPOOL 64ce70d1f14ae55e796f0e908a16ca3e96239b5ec3d331e0268c8321573bd7419e122116d665232f27e202888f578df8f226ef704ec9a9e7a9a3df16324db5cf
 DIST calibre-0.9.6.tar.xz 27346664 SHA256 d2cb83a8fc32b3258f3a491f33f4271bfd4020ac4fdbbf01131deb81bba9624f SHA512 6bbacc8ed9af318bdfc09807937ec5e3e2d99a9b1d408cbf4dd4976926b415736928a16ee8d712ae1b93e98ab612841123bb370440c78db9c350ebd6503f8e58 WHIRLPOOL 306662c0b7dae93ec0d5c63903e02fc6a9cdf6427290bd366464dca7c618f602380fec9767a23baafaf1257135f333553c345356bf06560785c0664f9d74cf36
diff --git a/app-text/calibre/calibre-0.9.10.ebuild b/app-text/calibre/calibre-0.9.12.ebuild
similarity index 95%
rename from app-text/calibre/calibre-0.9.10.ebuild
rename to app-text/calibre/calibre-0.9.12.ebuild
index b3ecdf428fbe..c08141ad4182 100644
--- a/app-text/calibre/calibre-0.9.10.ebuild
+++ b/app-text/calibre/calibre-0.9.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.9.10.ebuild,v 1.1 2012/12/14 18:20:44 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.9.12.ebuild,v 1.1 2012/12/28 22:55:48 zmedico Exp $
 
 EAPI=4
 PYTHON_DEPEND=2:2.7
@@ -88,12 +88,6 @@ src_prepare() {
 '-e', 's|^LFLAGS .*|\\\\\\\\0 ${LDFLAGS}|', \
 '-i', 'Makefile'])" \
 		-i setup/extensions.py || die "sed failed to patch extensions.py"
-
-	# Disable destructive regex for Bug #446790.
-	if has_version '>=dev-python/PyQt4-4.9.6' ; then
-		sed -e "s|dat = re\.compile(r'QtGui\.QApplication\.translate\\\\(\..*|#\\0|" \
-			-i src/calibre/gui2/__init__.py || die
-	fi
 }
 
 src_install() {
diff --git a/dev-haskell/cgi/cgi-3001.1.8.2.ebuild b/dev-haskell/cgi/cgi-3001.1.8.2.ebuild
index 8ef421614027..76408266f7dd 100644
--- a/dev-haskell/cgi/cgi-3001.1.8.2.ebuild
+++ b/dev-haskell/cgi/cgi-3001.1.8.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cgi/cgi-3001.1.8.2.ebuild,v 1.2 2012/09/12 14:37:53 qnikst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cgi/cgi-3001.1.8.2.ebuild,v 1.3 2012/12/28 22:24:15 slyfox Exp $
 
 # ebuild generated by hackport 0.2.9
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/monadcatchio-mtl
diff --git a/dev-haskell/hs-bibutils/Manifest b/dev-haskell/hs-bibutils/Manifest
index 4b61d935033d..5501300c3078 100644
--- a/dev-haskell/hs-bibutils/Manifest
+++ b/dev-haskell/hs-bibutils/Manifest
@@ -1 +1,2 @@
 DIST hs-bibutils-4.12.tar.gz 409820 SHA256 67949b90a3810774a40c77f87fffdb6cf740194f8afa521260651ead92897d2a SHA512 25ee09433fa0ce771dd358bb603fb615155e540b9a6cc6b89ee9914b5b5c3fd0bfb710a9dd1496bcbdf5b93bc7fb5ee47eb38309efe09da37bcadac55c113a1f WHIRLPOOL a1717fdb957eea00e6289be31fdcd59e3b471cf9d6028b14830ac93d403ef755e86243bc4098f83c2af9b51da7ff3bdab818f1c6644b309cb3d9547b287065c5
+DIST hs-bibutils-4.15.tar.gz 422396 SHA256 e9a75f9922667e6dd16556433d52b32a12061dc1fbe3b2dde5a9c3ea4dc45bc0 SHA512 e10701add4e751cc4b5fd59653da6d06c90f0559dabdf2ee2581c73cdc277c2d02106b6493cbcdf383925defa33dee4f4d53b24789ac1273184fcef8f0454a07 WHIRLPOOL 62948adc2b5b9f1a3d6c3d771453128a7bdd8835f505d331ea38d26ecf713d26211b1a8aef9b8f47c89216245b20202410778e2989b1ba821780e57306856279
diff --git a/dev-haskell/hs-bibutils/hs-bibutils-4.15-r1.ebuild b/dev-haskell/hs-bibutils/hs-bibutils-4.15-r1.ebuild
new file mode 100644
index 000000000000..8adf46f949e2
--- /dev/null
+++ b/dev-haskell/hs-bibutils/hs-bibutils-4.15-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hs-bibutils/hs-bibutils-4.15-r1.ebuild,v 1.1 2012/12/28 22:14:10 slyfox Exp $
+
+EAPI=5
+
+# ebuild generated by hackport 0.3.1.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Haskell bindings to bibutils, the bibliography
+conversion utilities."
+HOMEPAGE="http://gorgias.mine.nu/repos/hs-bibutils/"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/syb:=[profile?]
+		>=dev-lang/ghc-6.10.4:="
+DEPEND="${RDEPEND}
+		>=dev-haskell/cabal-1.4"
diff --git a/dev-libs/fribidi/fribidi-0.19.5.ebuild b/dev-libs/fribidi/fribidi-0.19.5.ebuild
index 275f863a4dda..9fdd9ccfda6f 100644
--- a/dev-libs/fribidi/fribidi-0.19.5.ebuild
+++ b/dev-libs/fribidi/fribidi-0.19.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/fribidi/fribidi-0.19.5.ebuild,v 1.4 2012/12/26 01:08:13 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/fribidi/fribidi-0.19.5.ebuild,v 1.7 2012/12/28 17:42:48 jer Exp $
 
 EAPI=4
 inherit autotools eutils
@@ -11,7 +11,7 @@ SRC_URI="http://fribidi.org/download/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RESTRICT="test" #397347
diff --git a/dev-libs/libgdata/libgdata-0.13.2-r2.ebuild b/dev-libs/libgdata/libgdata-0.13.2-r2.ebuild
index 8d4c2e5930f2..c02d6fbe90fe 100644
--- a/dev-libs/libgdata/libgdata-0.13.2-r2.ebuild
+++ b/dev-libs/libgdata/libgdata-0.13.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgdata/libgdata-0.13.2-r2.ebuild,v 1.1 2012/12/19 04:08:55 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgdata/libgdata-0.13.2-r2.ebuild,v 1.2 2012/12/28 20:08:06 eva Exp $
 
 EAPI="5"
 GCONF_DEBUG="yes"
@@ -33,6 +33,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	>=dev-util/gtk-doc-am-1.14
 	>=dev-util/intltool-0.40
+	>=gnome-base/gnome-common-3.6
 	virtual/pkgconfig
 "
 
diff --git a/dev-libs/nss/nss-3.14.ebuild b/dev-libs/nss/nss-3.14.ebuild
index 9109f04ca4c5..65a5eb405d04 100644
--- a/dev-libs/nss/nss-3.14.ebuild
+++ b/dev-libs/nss/nss-3.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.14.ebuild,v 1.8 2012/11/29 23:41:51 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.14.ebuild,v 1.9 2012/12/28 15:08:50 ago Exp $
 
 EAPI=3
 inherit eutils flag-o-matic multilib toolchain-funcs
@@ -16,7 +16,7 @@ SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${RTM_NAME}
 
 LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="utils"
 
 DEPEND="virtual/pkgconfig
diff --git a/dev-perl/Devel-NYTProf/Devel-NYTProf-4.120.0.ebuild b/dev-perl/Devel-NYTProf/Devel-NYTProf-4.120.0.ebuild
new file mode 100644
index 000000000000..67a363068df3
--- /dev/null
+++ b/dev-perl/Devel-NYTProf/Devel-NYTProf-4.120.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Devel-NYTProf/Devel-NYTProf-4.120.0.ebuild,v 1.1 2012/12/28 19:49:18 tove Exp $
+
+EAPI=5
+
+MODULE_AUTHOR=TIMB
+MODULE_VERSION=4.12
+inherit perl-module
+
+DESCRIPTION="Powerful feature-rich perl source code profiler"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	virtual/perl-Getopt-Long
+	dev-perl/JSON-Any
+"
+#	virtual/perl-XSLoader
+DEPEND="${RDEPEND}
+	test? (
+		virtual/perl-Scalar-List-Utils
+		>=virtual/perl-Test-Simple-0.84
+	)
+"
+SRC_TEST="do"
diff --git a/dev-perl/Devel-NYTProf/Manifest b/dev-perl/Devel-NYTProf/Manifest
index 4351507e1b1c..6dab7e2f91c8 100644
--- a/dev-perl/Devel-NYTProf/Manifest
+++ b/dev-perl/Devel-NYTProf/Manifest
@@ -1,3 +1,4 @@
 DIST Devel-NYTProf-4.08.tar.gz 413566 SHA256 e3ddb5c1ec8c44fbdecaa1990a28d16ea8d58036fcedef99d9fc2a15e6a39867 SHA512 ab19711e4dd13624673544e1383768a40e0413e45e0bdbaf5710972bd7fb6b13481d324f26b1cf5d0adcfeeed0fa10f20cb5503cd77e62efe0dc14c8cb67c3a4 WHIRLPOOL fd9caed73dde334c114f8f971dcfb98a351e978ff56387cb6fa4c9219a06227b0a90ee7dd0860f1e09f3eecde489d8ad694022bf9bae443195f9002e84b75aab
 DIST Devel-NYTProf-4.09.tar.gz 413599 SHA256 9270afc427e03c6c604bceba9450dde484191342435e85849b784d53b3c3a153 SHA512 2840e28f600ea9d814f588e6fe5df0b5b08955c12e301b67b535eab4c50fa34a63f0da514bfed5c9feea71fa01614eeaf9781ad12baf2ae0a8b019bdda6798db WHIRLPOOL 9fd878c13a90894f8269481286502751fd42afbd387ec06d5333f3e047d486edfa1d7e02aa6f773e6bdf651df3e150db83998c1183b5b6263977dfdabf02d833
 DIST Devel-NYTProf-4.11.tar.gz 413757 SHA256 307dcfb6499f047eacf1554e44e02b0fdc4335d1989a52617d0e4ccb6b7cd891 SHA512 c39f98755c46ab65e7dd3b67cb847924bb150955f8b3e357a5fcdfb835bda5d32c8b3392beab0c0c581a7463fb99e90790927fea34ab1ccb2d0354cc85d03af3 WHIRLPOOL 3133b726b84c823737032bdbd69bce03decdfa6998f46ac02373b4f3410d890878f839f923990790a7a4406b9cd8c024699aff5b0486731e39526eecee34ad20
+DIST Devel-NYTProf-4.12.tar.gz 412464 SHA256 3dc53c95dd992989c2871c23de6da4184c4a55a4d400d6cf223c8968cb765157 SHA512 4dccc3d1381e877c73b060efec2c7f3b21a55f085353a2bf77a948749a9cc12a052ef8ef105ecc3c57635692e5617484d54cfc366d1eaa2f329af37f79b5aff1 WHIRLPOOL cf28c93a4f626d5993340c332da5874842a4d103f776de6d433b9ad7fa4532a18bdc73519ddf142c2fe4c8299b73034e07a38d7ecfd4214b22e9837d336648f0
diff --git a/dev-perl/ExtUtils-XSpp/ExtUtils-XSpp-0.160.300.ebuild b/dev-perl/ExtUtils-XSpp/ExtUtils-XSpp-0.160.300.ebuild
new file mode 100644
index 000000000000..b5d9e1e177c2
--- /dev/null
+++ b/dev-perl/ExtUtils-XSpp/ExtUtils-XSpp-0.160.300.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/ExtUtils-XSpp/ExtUtils-XSpp-0.160.300.ebuild,v 1.1 2012/12/28 20:14:51 tove Exp $
+
+EAPI=5
+
+MODULE_AUTHOR=SMUELLER
+MODULE_VERSION=0.1603
+inherit perl-module
+
+DESCRIPTION="XS for C++"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="
+	>=virtual/perl-Module-Build-0.400.0
+	test? (
+		dev-perl/Test-Differences
+		dev-perl/Test-Base
+	)
+"
+RDEPEND="
+	>=virtual/perl-ExtUtils-ParseXS-2.22.02
+"
+
+SRC_TEST=do
diff --git a/dev-perl/ExtUtils-XSpp/Manifest b/dev-perl/ExtUtils-XSpp/Manifest
index 878b66f5c9c5..d0a6703add18 100644
--- a/dev-perl/ExtUtils-XSpp/Manifest
+++ b/dev-perl/ExtUtils-XSpp/Manifest
@@ -1 +1,2 @@
 DIST ExtUtils-XSpp-0.1602.tar.gz 173721 SHA256 3f54ebc00ee663fb014db9970ce789e1a4152caa5ef96212c567678339a3f78f SHA512 2a8dc7bbd9ad7e80217222bda3b6373d7b66c0a83a325bbcfb5b9306178397964e7f606a4b86cfa4032ba7444c370ea077d8573feb0b2dec8f558c5ed1ba1519 WHIRLPOOL bacd27a340f5ed0fae580e36ec008d4f1e4a876d536dd3f1b6b75e8f6355392b1a663798b2b7d746c149529bf98608dd2dc31b5c4dd665aa81aba303fb4eff82
+DIST ExtUtils-XSpp-0.1603.tar.gz 173271 SHA256 45f35ee240a4bfd76c2eed4bfcc623a0d23d32b8100f69e27fe5c7eca8712cab SHA512 fa8d2035de7ae6e456056c4817861854796434c7cc8664114a9f02c91aacd26a614c159cb750228eba757b78758e0e439e74e5ec33fcd675b8a0f4dccf4f597b WHIRLPOOL ed4c420f4f0af4921d290bd04cb9ec2cd87cff89ab2d6a638bd902cc8d18fb7ecd6430a02ac13f348c3655735fd7c2a71caf705289b3ba6f22ddc3650188355d
diff --git a/dev-perl/Net-DNS/Manifest b/dev-perl/Net-DNS/Manifest
index a86cf79253ef..dd4a4d2adaab 100644
--- a/dev-perl/Net-DNS/Manifest
+++ b/dev-perl/Net-DNS/Manifest
@@ -2,3 +2,4 @@ DIST Net-DNS-0.66.tar.gz 172366 SHA256 ee922a6ab1403820ad476713d62cb35e7092585eb
 DIST Net-DNS-0.68.tar.gz 184715 SHA256 a5740cb95d4778399440abb39fc8c6545d6eb2a2f8f1a62a66234d426bfbe002 SHA512 4159b557e4ab8b87d6715e052ee00a3d6c61dda435ed689a14c6df248e8c0c8ae13a1965c8846933d35778e88c9204dab31d481488a0af4919cd7adbc4093992 WHIRLPOOL 54b616cf488194c4071917c7629d136d50f74a57fa77ddf520ce90866babc9e770bc4d737588fe05660e7439882aa9a6493098b3e6bc808685807030576529e8
 DIST Net-DNS-0.70.tar.gz 191502 SHA256 567498a86c1a71889cf0cdf7b80694b22afe77afbe5cce9f6089c18cba3435c4 SHA512 d239cf13391e6681a64ffa09a34aa1c855918a5ceefb81f035cd5a1d9c1c734a6c65aec2f03f76e43dc70791b6ec0a3a2eef9e673aa47c6836f6a44a2a032c14 WHIRLPOOL b050f7c5734d2daba212d382a12ec6f062798cd13229b6e062c1c37c9128179ceb10b75aacc40062e83b55dd345b756bb04e91a1d81e808627cf8777690a1842
 DIST Net-DNS-0.71.tar.gz 194254 SHA256 69f4627eb0e84ed09cb3f59b53600b27924fc4cdc98bdf36869094769dfe9453 SHA512 8f708c5e3b1aeb0c8941690957b844779bdaf4e984fabf75c58d67f54956db070cf281ee42981caa2e6bdc0e20e42503088a2cd90fb6cbe41798aa295b0daa25 WHIRLPOOL d8d6cc736cee0385f9b9e048eecfc67fdf9b62340741ac0b5d3091c5b9d83ca1cb03231fab3c79382b41f25b515ed8e76b57e10c51d81272637956747b358a92
+DIST Net-DNS-0.72.tar.gz 194647 SHA256 a62cae0be54a9684c305456cb95515a0bd3128d6ef3093b6069fe8e8e8d5943f SHA512 a1ae209e909136a93acc75d2d51fa49624a70edd0d917e2051678bb3641200f59b1af7a43cf5b951b4f1fa53e276965e0289e88c2ad574ef90f50d59b2e4341b WHIRLPOOL 807012eb15952286bfed2dc74ec0e1c55bfda8708124f3124bd7aa121c58dae95876998f20e9867887123b1a74e575414cd337034692210b3be1a4ad6d97c922
diff --git a/dev-perl/Net-DNS/Net-DNS-0.720.0.ebuild b/dev-perl/Net-DNS/Net-DNS-0.720.0.ebuild
new file mode 100644
index 000000000000..7a0aba8b5d59
--- /dev/null
+++ b/dev-perl/Net-DNS/Net-DNS-0.720.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Net-DNS/Net-DNS-0.720.0.ebuild,v 1.1 2012/12/28 19:46:45 tove Exp $
+
+EAPI=5
+
+MODULE_AUTHOR=NLNETLABS
+MODULE_VERSION=0.72
+inherit perl-module
+
+DESCRIPTION="Perl Net::DNS - Perl DNS Resolver Module"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="ipv6 test"
+
+RDEPEND="
+	virtual/perl-Digest-MD5
+	dev-perl/Digest-HMAC
+	virtual/perl-Digest-SHA
+	dev-perl/Net-IP
+	virtual/perl-MIME-Base64
+	ipv6? (
+		dev-perl/IO-Socket-INET6
+	)
+"
+DEPEND="${RDEPEND}
+	test? (
+		virtual/perl-Test-Simple
+		dev-perl/Test-Pod
+	)"
+
+PATCHES=( ${FILESDIR}/${PN}-0.68-ar.patch )
+SRC_TEST="do"
+
+src_prepare() {
+	perl-module_src_prepare
+	mydoc="TODO"
+	# --IPv6-tests requires that you have external IPv6 connectivity
+	# as it connects to 2001:7b8:206:1:0:1234:be21:e31e
+	myconf="${myconf} --no-online-tests --no-IPv6-tests"
+}
diff --git a/dev-perl/Parallel-ForkManager/Parallel-ForkManager-1.20.0.ebuild b/dev-perl/Parallel-ForkManager/Parallel-ForkManager-1.20.0.ebuild
index dfc28e267afc..6e7df47752ee 100644
--- a/dev-perl/Parallel-ForkManager/Parallel-ForkManager-1.20.0.ebuild
+++ b/dev-perl/Parallel-ForkManager/Parallel-ForkManager-1.20.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Parallel-ForkManager/Parallel-ForkManager-1.20.0.ebuild,v 1.4 2012/12/25 22:28:06 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Parallel-ForkManager/Parallel-ForkManager-1.20.0.ebuild,v 1.5 2012/12/28 15:09:16 ago Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="A simple parallel processing fork manager"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ia64 ~ppc ~sparc x86 ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ia64 ~ppc sparc x86 ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 SRC_TEST=do
diff --git a/dev-perl/ZMQ-Constants/Manifest b/dev-perl/ZMQ-Constants/Manifest
index 557850a03cc0..875e5649d0e9 100644
--- a/dev-perl/ZMQ-Constants/Manifest
+++ b/dev-perl/ZMQ-Constants/Manifest
@@ -1 +1,2 @@
 DIST ZMQ-Constants-1.01.tar.gz 23367 SHA256 cd6ac0155c013c530e6ab852b5fdcb540ea52806e95b175b7be0ad7373e34a97 SHA512 7d6e221a0a0c649fcaa7de0a706621dac20a0a9a566525c14ae00b2088016e630c8392ae612cb2e2e859506695db93f0b1a80468d306c6c9b0b0651a6fbd3071 WHIRLPOOL b672fd0eff9e47768c829084817b8dc146940742fdaf42899c6c44877c0de110fedfe7ebfba262652c76613bf14548b382cfcb326556ca6c032f7b61a857d447
+DIST ZMQ-Constants-1.02.tar.gz 23649 SHA256 c00fb49af22ecb903deb37130038b7ba283baaedd3fdc11bb10ef55bca4fb65a SHA512 db3d53bc248742ddea7d0bdf58972f26470e071169d1cdba8a05b62bd415705fd9c3f74c8e2defce5a34add5e999dbba677736c6032583a3d2dce15f9b5e8d2f WHIRLPOOL e8a79e9b6a4fb824372a9e3618d50a29093b8d62b07a8ece93b5a8c5acb6cd50603dbb01d497ba6fc119aed876bbf42bcfdaccf2e1a2f1aaa46ba3bdd7198261
diff --git a/dev-perl/ZMQ-Constants/ZMQ-Constants-1.20.0.ebuild b/dev-perl/ZMQ-Constants/ZMQ-Constants-1.20.0.ebuild
new file mode 100644
index 000000000000..fb071c7a5e4e
--- /dev/null
+++ b/dev-perl/ZMQ-Constants/ZMQ-Constants-1.20.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/ZMQ-Constants/ZMQ-Constants-1.20.0.ebuild,v 1.1 2012/12/28 20:10:32 tove Exp $
+
+EAPI=5
+
+MODULE_AUTHOR=DMAKI
+MODULE_VERSION=1.02
+inherit perl-module
+
+DESCRIPTION="Constants for libzmq"
+
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="
+	net-libs/zeromq
+"
+DEPEND="${RDEPEND}"
+
+SRC_TEST=do
diff --git a/dev-ruby/bluecloth/bluecloth-2.2.0.ebuild b/dev-ruby/bluecloth/bluecloth-2.2.0.ebuild
index ee8c21fe1920..bde45ddd0e8c 100644
--- a/dev-ruby/bluecloth/bluecloth-2.2.0.ebuild
+++ b/dev-ruby/bluecloth/bluecloth-2.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/bluecloth/bluecloth-2.2.0.ebuild,v 1.8 2012/12/26 15:49:49 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/bluecloth/bluecloth-2.2.0.ebuild,v 1.9 2012/12/28 11:23:56 ago Exp $
 
 EAPI=4
 USE_RUBY="ruby18 ruby19 ree18"
@@ -19,7 +19,7 @@ HOMEPAGE="http://www.deveiate.org/projects/BlueCloth"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="test"
 
 DEPEND="${DEPEND} doc? ( dev-lang/perl )"
diff --git a/dev-ruby/minitest/minitest-3.5.0.ebuild b/dev-ruby/minitest/minitest-3.5.0.ebuild
index 164c93321112..4223d8cd6101 100644
--- a/dev-ruby/minitest/minitest-3.5.0.ebuild
+++ b/dev-ruby/minitest/minitest-3.5.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/minitest/minitest-3.5.0.ebuild,v 1.3 2012/12/25 22:33:18 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/minitest/minitest-3.5.0.ebuild,v 1.5 2012/12/28 11:22:40 ago Exp $
 
 EAPI=4
 # jruby → tests fail, reported upstream
@@ -19,7 +19,7 @@ HOMEPAGE="https://github.com/seattlerb/minitest"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "
diff --git a/dev-ruby/racc/racc-1.4.8.ebuild b/dev-ruby/racc/racc-1.4.8.ebuild
index 09147011321c..1756bc9b694f 100644
--- a/dev-ruby/racc/racc-1.4.8.ebuild
+++ b/dev-ruby/racc/racc-1.4.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/racc/racc-1.4.8.ebuild,v 1.7 2012/12/27 02:13:58 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/racc/racc-1.4.8.ebuild,v 1.8 2012/12/28 11:20:30 ago Exp $
 
 EAPI=4
 
@@ -17,7 +17,7 @@ HOMEPAGE="http://www.loveruby.net/en/racc.html"
 LICENSE="LGPL-2.1"
 SLOT="0"
 
-KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 
 ruby_add_bdepend "dev-ruby/rake
diff --git a/dev-ruby/tidy-ext/tidy-ext-0.1.14.ebuild b/dev-ruby/tidy-ext/tidy-ext-0.1.14.ebuild
index f790264b3bd8..2d8c25b920cf 100644
--- a/dev-ruby/tidy-ext/tidy-ext-0.1.14.ebuild
+++ b/dev-ruby/tidy-ext/tidy-ext-0.1.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/tidy-ext/tidy-ext-0.1.14.ebuild,v 1.4 2012/12/26 15:49:33 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/tidy-ext/tidy-ext-0.1.14.ebuild,v 1.5 2012/12/28 11:23:35 ago Exp $
 
 EAPI=4
 USE_RUBY="ruby18 ruby19 ree18"
@@ -16,7 +16,7 @@ HOMEPAGE="http://github.com/carld/tidy"
 
 LICENSE="HTML-Tidy"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/yard/yard-0.8.3.ebuild b/dev-ruby/yard/yard-0.8.3.ebuild
index a631c0520a73..2a49abf26256 100644
--- a/dev-ruby/yard/yard-0.8.3.ebuild
+++ b/dev-ruby/yard/yard-0.8.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/yard/yard-0.8.3.ebuild,v 1.8 2012/12/26 15:49:07 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/yard/yard-0.8.3.ebuild,v 1.9 2012/12/28 11:23:15 ago Exp $
 
 EAPI=4
 
@@ -25,7 +25,7 @@ RUBY_S="lsegal-yard-*"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 #RUBY_PATCHES=( ${P}-test-failures.patch )
diff --git a/dev-util/debootstrap/Manifest b/dev-util/debootstrap/Manifest
index 0aca461d3ffa..a7eb26dea8da 100644
--- a/dev-util/debootstrap/Manifest
+++ b/dev-util/debootstrap/Manifest
@@ -2,4 +2,5 @@ DIST debootstrap_1.0.42.tar.gz 56313 SHA256 e05b40eb30e37ee6f741d30f133de6a7e569
 DIST debootstrap_1.0.43.tar.gz 57969 SHA256 82a05e1c3eade02dedb766cde0cf12e1ece50f5060ff6a336b7303e93488ccb4 SHA512 d82257eef0c7dff556df0845f2746a9db11214e140b2cab2358031d2e7915e637e9ffb6fbd24721d6b2879087b85d9e7ba08ada00f7c7fcc4794178767704210 WHIRLPOOL 2f5f90c90cba1a42d2861bd40d806fc767ab891bd0d8c4eaab7bc5c016540a9bfc73291769f9fcefd800b07dd6c317b071ce99a6e9a9687e07dc604e3d0cd0fa
 DIST debootstrap_1.0.44.tar.gz 58467 SHA256 3a620a6caff157b8d46955024451f100d129dd41a2fe3fd1734f662e59a2c00b SHA512 42b0a7b1be4040738ca05f88321508117f1b9eb3ce090e5e4ea78c0eaec39195744fed9efe303042a873f69984fcf6ccd64f653020e6c701b25f82fe57aae95f WHIRLPOOL 4e65c23a9d7a0c59b88acfcddae43514a8c9cdacf55705646c23698d51ddae1ea7d964d885816c3a1101a2288251a9974cb8596d9a51bc5c6ba9d07e0ab1ca1c
 DIST debootstrap_1.0.45.tar.gz 58121 SHA256 323d27268289ed2b75a61a5735cd33a52e103c78609ae9addc193f1918bb51f2 SHA512 91b82b037135b80ed7499e52111dde7b369bcd09961c4ea14fa3ab6de833bba70cecfb35e1bb7973867c947b2fe9087eb5d82c8d3790e827c7e6a0fea9f44cf8 WHIRLPOOL 5b13069071856ff2690fce34441de3068b7853df2a76a064fa60ab1542bc10012345f001681154779b3f586a8987af31e1c129d4c2224116626b6b162e3a90d0
+DIST debootstrap_1.0.46.tar.gz 58884 SHA256 225232404b0729d7322d4428492338e3130153acf6d7075573d24db6563f6b27 SHA512 10a591533f241be475f781e8509136ca0d6386851e5e63248e14c7f226a4dcf499ced87680fb16deee1e6eb92c13664b77d25f7071a38b401ce2e04421edf2ed WHIRLPOOL 2c897df1d8b380b4635b87aee331f3b602eff78706479901e98ea0d12435c93590358280b24ff5190088079ec5f735654daa690bf45b72cf165e716ae638b36e
 DIST devices.tar.gz 47835 SHA256 0d93f93c8b21160069d14e74f8f990a2e0e1e5a90dc828b29e6b3f5aa5829e48 SHA512 994ec8d72e3d52d2d872f7ff0da2336e4cbd3a5fa73bb6cdb9e06f5e7f5b8c69cea639c738fdba1186f382d6dcf62e7746fface664bfbd744aac24b16f034432 WHIRLPOOL 222963bb920e1311bc2f481bba04e49f386b60cce6ce0576424896277e0c4fc6a339d4403d587744c32b0bfb1db6391f200fa8d66117e3f21e1c12f35365d732
diff --git a/dev-util/debootstrap/debootstrap-1.0.46.ebuild b/dev-util/debootstrap/debootstrap-1.0.46.ebuild
new file mode 100644
index 000000000000..4586a8d49946
--- /dev/null
+++ b/dev-util/debootstrap/debootstrap-1.0.46.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/debootstrap/debootstrap-1.0.46.ebuild,v 1.1 2012/12/28 15:33:15 jer Exp $
+
+EAPI=4
+inherit eutils
+
+DESCRIPTION="Debian/Ubuntu bootstrap scripts"
+HOMEPAGE="http://packages.qa.debian.org/d/debootstrap.html"
+SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.gz
+	mirror://gentoo/devices.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+IUSE=""
+
+RDEPEND="
+	app-arch/dpkg
+	net-misc/wget
+	sys-devel/binutils
+"
+
+DOCS=( TODO debian/changelog )
+
+src_unpack() {
+	unpack ${PN}_${PV}.tar.gz
+	cp "${DISTDIR}"/devices.tar.gz "${S}"
+}
+
+src_compile() {
+	return
+}
+
+src_install() {
+	default
+	doman debootstrap.8
+}
+
+pkg_postinst() {
+	elog "To check Release files against a keyring"
+	elog " (--keyring=K), please install app-crypt/gnupg."
+}
diff --git a/dev-util/memprof/memprof-0.6.2-r1.ebuild b/dev-util/memprof/memprof-0.6.2-r1.ebuild
index 1c44ed5a593d..1107a2d8e4df 100644
--- a/dev-util/memprof/memprof-0.6.2-r1.ebuild
+++ b/dev-util/memprof/memprof-0.6.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/memprof/memprof-0.6.2-r1.ebuild,v 1.1 2012/11/18 18:13:41 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/memprof/memprof-0.6.2-r1.ebuild,v 1.3 2012/12/28 11:28:37 ago Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.secretlabs.de/projects/memprof/releases/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="nls"
 
 RDEPEND="dev-libs/glib:2
diff --git a/dev-util/memprof/memprof-0.6.2.ebuild b/dev-util/memprof/memprof-0.6.2.ebuild
deleted file mode 100644
index ffd1483c01e1..000000000000
--- a/dev-util/memprof/memprof-0.6.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/memprof/memprof-0.6.2.ebuild,v 1.2 2010/04/13 14:57:28 phajdan.jr Exp $
-
-EAPI=2
-
-DESCRIPTION="MemProf - Profiling and leak detection"
-HOMEPAGE="http://www.secretlabs.de/projects/memprof/"
-SRC_URI="http://www.secretlabs.de/projects/memprof/releases/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 x86"
-IUSE="nls"
-
-RDEPEND=">=x11-libs/gtk+-2.6:2
-	>=gnome-base/libglade-2"
-DEPEND="${RDEPEND}
-	nls? ( dev-util/intltool
-		sys-devel/gettext )"
-
-src_configure() {
-	econf \
-		--disable-static \
-		--disable-dependency-tracking \
-		$(use_enable nls)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog README NEWS
-
-	find "${D}" -name '*.la' -delete
-}
diff --git a/dev-util/rbtools/rbtools-0.4.2.ebuild b/dev-util/rbtools/rbtools-0.4.2.ebuild
index 73026ae4c234..4f664d8a2ca2 100644
--- a/dev-util/rbtools/rbtools-0.4.2.ebuild
+++ b/dev-util/rbtools/rbtools-0.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/rbtools/rbtools-0.4.2.ebuild,v 1.1 2012/10/02 06:10:24 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/rbtools/rbtools-0.4.2.ebuild,v 1.2 2012/12/28 13:08:51 nimiux Exp $
 
 EAPI=4
 PYTHON_DEPEND=2
@@ -16,7 +16,7 @@ SRC_URI="http://downloads.reviewboard.org/releases/${MY_PN}/$(get_version_compon
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 DEPEND=""
diff --git a/dev-vcs/darcs/darcs-2.8.3-r1.ebuild b/dev-vcs/darcs/darcs-2.8.3-r1.ebuild
index 49324bb95f68..33c9dbb4cddb 100644
--- a/dev-vcs/darcs/darcs-2.8.3-r1.ebuild
+++ b/dev-vcs/darcs/darcs-2.8.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/darcs/darcs-2.8.3-r1.ebuild,v 1.2 2012/12/10 07:55:45 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/darcs/darcs-2.8.3-r1.ebuild,v 1.3 2012/12/28 08:03:56 gienah Exp $
 
 EAPI=5
 
@@ -71,6 +71,7 @@ src_prepare() {
 
 	epatch "${FILESDIR}/${PN}-2.8.1-tar-0.4.patch"
 	epatch "${FILESDIR}"/${P}-hack-for-haskeline-0.7-breaks-non-utf8.patch
+	epatch "${FILESDIR}"/${P}-tf-0.8.patch
 
 	# ghc-7.6
 	cabal_chdeps \
diff --git a/dev-vcs/darcs/files/darcs-2.8.3-tf-0.8.patch b/dev-vcs/darcs/files/darcs-2.8.3-tf-0.8.patch
new file mode 100644
index 000000000000..18f0bc5f55b9
--- /dev/null
+++ b/dev-vcs/darcs/files/darcs-2.8.3-tf-0.8.patch
@@ -0,0 +1,26 @@
+Fix build failure against dev-haskell/test-framework-0.8
+
+[147 of 147] Compiling Main             ( src/test.hs, dist/build/darcs-test/darcs-test-tmp/Main.o )
+
+src/test.hs:100:30:
+    No instance for (Typeable ShellTest) arising from a use of `Test'
+    Possible fix: add an instance declaration for (Typeable ShellTest)
+    In the expression: Test (file ++ " (" ++ show fmt ++ ")")
+    In the expression:
+      Test (file ++ " (" ++ show fmt ++ ")") $ ShellTest fmt file tdir dp
+    In an equation for `shellTest':
+        shellTest dp fmt tdir file
+          = Test (file ++ " (" ++ show fmt ++ ")")
+            $ ShellTest fmt file tdir dp
+diff --git a/src/test.hs b/src/test.hs
+index 39adcc1..9687074 100644
+--- a/src/test.hs
++++ b/src/test.hs
+@@ -49,6 +49,7 @@ data ShellTest = ShellTest { format :: Format
+                            , testdir  :: Maybe FilePath -- ^ only if you want to set it explicitly
+                            , _darcspath :: FilePath
+                            }
++    deriving Typeable
+ 
+ runtest' :: ShellTest -> FilePath -> ShIO Result
+ runtest' (ShellTest fmt _ _ dp) srcdir =
diff --git a/dev-vcs/subversion/subversion-1.7.7.ebuild b/dev-vcs/subversion/subversion-1.7.7.ebuild
index f90218537522..651a630aca3c 100644
--- a/dev-vcs/subversion/subversion-1.7.7.ebuild
+++ b/dev-vcs/subversion/subversion-1.7.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/subversion-1.7.7.ebuild,v 1.6 2012/12/26 09:08:56 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/subversion-1.7.7.ebuild,v 1.7 2012/12/28 16:22:03 jer Exp $
 
 EAPI="3"
 SUPPORT_PYTHON_ABIS="1"
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="Subversion GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-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 ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="apache2 berkdb ctypes-python debug doc +dso extras gnome-keyring java kde nls perl python ruby sasl vim-syntax +webdav-neon webdav-serf"
 
 CDEPEND=">=dev-db/sqlite-3.4
diff --git a/games-arcade/jardinains/Manifest b/games-arcade/jardinains/Manifest
index c2803de14796..0b5bff0d4631 100644
--- a/games-arcade/jardinains/Manifest
+++ b/games-arcade/jardinains/Manifest
@@ -1 +1 @@
-DIST JN2_1_FREE_LIN.tar.gz 17433159 RMD160 6d39f11b0d3d6e38d9167b8a065cc9e2df899e6c SHA1 9987adc68ed1232e09660dda8f6b1db750502683 SHA256 635eb4eb7813522e5d4ff737719c92c97d605712c3b1b94d5a32863889e949d8
+DIST JN2_1_FREE_LIN.tar.gz 17433159 SHA256 635eb4eb7813522e5d4ff737719c92c97d605712c3b1b94d5a32863889e949d8 SHA512 ddb6e48e071b42b7871cb6396c61fdf9bfb85e9bb9f88720e8ac1b7bff499c43784de6bf3f67d3fe61bc05ed0e3f6a24f646aa6c54e387b95e744c16525978e8 WHIRLPOOL 4d4a726afa60cc962d06b93fa0ea98523016e1831833eb4128dc9d218bd924a671d72d5fa5e902fc888c6518d3ecd72f44cd347633827337f8c9ebb0ec8eda85
diff --git a/games-arcade/jardinains/jardinains-2.0.ebuild b/games-arcade/jardinains/jardinains-2.0.ebuild
index 4e5420347017..b62e56ed4018 100644
--- a/games-arcade/jardinains/jardinains-2.0.ebuild
+++ b/games-arcade/jardinains/jardinains-2.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/jardinains/jardinains-2.0.ebuild,v 1.9 2010/02/27 17:59:50 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/jardinains/jardinains-2.0.ebuild,v 1.10 2012/12/28 16:43:28 tupone Exp $
 
 EAPI=2
 inherit eutils games
@@ -22,6 +22,9 @@ RDEPEND="virtual/opengl
 	virtual/libstdc++
 	amd64? ( >=app-emulation/emul-linux-x86-xlibs-1.0-r1 )"
 
+dir=${GAMES_PREFIX_OPT}/${PN}
+QA_PREBUILT="${dir:1}/${PN}"
+
 PATCHES=( "${FILESDIR}"/strings-pt.patch )
 
 src_unpack() {
@@ -36,8 +39,6 @@ src_prepare() {
 }
 
 src_install() {
-	local dir=${GAMES_PREFIX_OPT}/${PN}
-
 	exeinto "${dir}"
 	doexe jardinains || die
 	insinto "${dir}"
diff --git a/games-fps/soldieroffortune-demo/Manifest b/games-fps/soldieroffortune-demo/Manifest
index 7125ab3b6e9f..e9de29ba058f 100644
--- a/games-fps/soldieroffortune-demo/Manifest
+++ b/games-fps/soldieroffortune-demo/Manifest
@@ -1 +1 @@
-DIST sof-demo.run 92496052 RMD160 923a3d4e3abaa2401df40938251f4b7654be0860 SHA1 3ba928978306b660255160be8cf952b8794ab8e1 SHA256 30f671a7e53c9005fea8ef5760e4174e7f7a31114ed5bfd6c8525ceb1bb6d929
+DIST sof-demo.run 92496052 SHA256 30f671a7e53c9005fea8ef5760e4174e7f7a31114ed5bfd6c8525ceb1bb6d929 SHA512 d285cffe5ed9017409737120d63f1bb14a4ae2f54a83bc2b4d838e82440f43fe430ea63b7765496121633e6fbf40053fe2c5bbda37e48e6da8b18aaa2ff540a6 WHIRLPOOL f1744b789eb7818753e4287e60ec2ad0359697f622fb8a043a4d4ab8cec64f2f77150a81865d87b769ed4650e0bb1588a8364aa471f7b6a0881d8d958442309e
diff --git a/games-fps/soldieroffortune-demo/soldieroffortune-demo-0.57.ebuild b/games-fps/soldieroffortune-demo/soldieroffortune-demo-0.57.ebuild
index 0e695b1ba774..b19d08fb3aa7 100644
--- a/games-fps/soldieroffortune-demo/soldieroffortune-demo-0.57.ebuild
+++ b/games-fps/soldieroffortune-demo/soldieroffortune-demo-0.57.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/soldieroffortune-demo/soldieroffortune-demo-0.57.ebuild,v 1.9 2012/02/08 21:24:53 vapier Exp $
-
+# $Header: /var/cvsroot/gentoo-x86/games-fps/soldieroffortune-demo/soldieroffortune-demo-0.57.ebuild,v 1.10 2012/12/28 20:28:30 tupone Exp $
+EAPI=5
 inherit eutils unpacker games
 
 MY_PN=${PN/soldieroffortune/sof}
@@ -36,6 +36,7 @@ S=${WORKDIR}
 
 dir=${GAMES_PREFIX_OPT}/${PN}
 Ddir=${D}/${dir}
+QA_PREBUILT="${dir:1}/* ${dir:1}/base/*so"
 
 src_install() {
 	local demo="data/demos/sof_demo"
@@ -45,14 +46,14 @@ src_install() {
 
 	insinto "${dir}"
 	exeinto "${dir}"
-	doins -r "${demo}"/* || die "doins failed"
-	doexe "${demo}/${exe}" || die "doexe failed"
+	doins -r "${demo}"/*
+	doexe "${demo}/${exe}"
 
 	# Replace bad library
 	dosym /usr/$(use amd64 && echo lib32 || echo lib)/libSDL.so "${dir}"/libSDL-1.1.so.0
 
 	games_make_wrapper ${PN} "./${exe}" "${dir}" "${dir}"
-	newicon "${demo}"/launch/box.png ${PN}.png || die
+	newicon "${demo}"/launch/box.png ${PN}.png
 	make_desktop_entry ${PN} "Soldier of Fortune (Demo)"
 
 	prepgamesdirs
diff --git a/games-server/nwn-ded/Manifest b/games-server/nwn-ded/Manifest
index ebe8bf68eddd..9fb6986d49a5 100644
--- a/games-server/nwn-ded/Manifest
+++ b/games-server/nwn-ded/Manifest
@@ -1,9 +1,9 @@
-DIST NWNDedicatedServer1.68.zip 316032587 RMD160 86a192f3bdba0c070d36a9870969ebef7e41af19 SHA1 46b3edf71646bb3b85edc54df4cbd82127a2005c SHA256 7226892f85b644edc6dfb15290bd1037e7a143528f734d53400b196958fa1c6c
-DIST NWNDedicatedServer1.69.zip 606293816 RMD160 d4f78872272017e66cc3708e0c3b664e7452e5ff SHA1 a1f4457c77ba5097c0cd8a2324031e545f6cdefd SHA256 9df63ea1bf24b43be2c7568a1379cb7197fb591b0c0454ec2d20cec96234a45c
-DIST NWNEnglish1.68dialog.zip 3186122 RMD160 eb23337ae316de96b73b1ab9140cf576b8736d36 SHA1 d2fb48cba452ced0d2bba10a007c20500c26e4ed SHA256 6f68f7472b9be078f6a5b57e77308310c914ab3a5fd91d265f903e9daf53d4bb
-DIST NWNEnglish1.69dialog.zip 3200987 RMD160 8dcc752e3f19ee00aded2694b0ccd243ba0db16a SHA1 8fde240db8483ee9d559816a980ab43ff6795deb SHA256 357fd4c312d7598e9f563c61918f78c2235bd19acff8ac1b2d19140972828d66
-DIST NWNFrench1.68dialog.zip 6770835 RMD160 a7dfce3025c93bb2eeb110742df8eee59a11347c SHA1 dd99874c8d43d6cf2e676518246488da5723e89e SHA256 64f5fbb14cc8d0232eeaa36c452081bf5fdbc5ea81e58d8868c92ae86ee6a838
-DIST NWNGerman1.68dialog.zip 7229687 RMD160 7ccf79ff3ae799d246402fa916446bd413f0a31b SHA1 4c5920e602909b6f5bd8d93c1155af2dd3c2e6e7 SHA256 063bff4857f5f70dad98312129d43e047470de6144f011890949731f2071073b
-DIST NWNItalian1.68dialog.zip 6731492 RMD160 9f198cb9af840dba4d4a6735070aca0ad8db770a SHA1 1053c3dcdb6d15cb3f972adb82914ac29e8a3968 SHA256 95ab20460c2761602aaf94f2b021ce698e8e4f122f3c1fd1ea8ad349fb3b5842
-DIST NWNJapanese1.68dialog.zip 6343304 RMD160 aa7aa25947413cc117701255150b42a7f3a02ba5 SHA1 01af875876fc4025691200f1a630f4f43dfe35c5 SHA256 c8cc42038fb8c326caa432ff035621b200a397aa30f89862c8ba167f13144734
-DIST NWNSpanish1.68dialog.zip 6705882 RMD160 fd205ec81119bb410705019871f40f222bec86a1 SHA1 e650cf419136a98664f89bca8358057b41e3da39 SHA256 c6bd32e2156cd424598c8771b4cc2ca6ec97ecaffb29850412345b8b1a70bf7f
+DIST NWNDedicatedServer1.68.zip 316032587 SHA256 7226892f85b644edc6dfb15290bd1037e7a143528f734d53400b196958fa1c6c
+DIST NWNDedicatedServer1.69.zip 606293816 SHA256 9df63ea1bf24b43be2c7568a1379cb7197fb591b0c0454ec2d20cec96234a45c SHA512 0f91ab8d03d040389d9ad7ccc7d50079057d62d542fecfb2164a726511718ba982f7b2f9878bc1143f2c61b3ef7ab8f92e5e4007b515ad6aff51216c5b602ffd WHIRLPOOL 2f309f42a01c4fc01f600cb3d23e2e2c82e5ad42462e695cc56a90a59ab220bb6324a4aef9714567d8fdc9393624d63b310ff2fe225c49151932aa16d26f110a
+DIST NWNEnglish1.68dialog.zip 3186122 SHA256 6f68f7472b9be078f6a5b57e77308310c914ab3a5fd91d265f903e9daf53d4bb
+DIST NWNEnglish1.69dialog.zip 3200987 SHA256 357fd4c312d7598e9f563c61918f78c2235bd19acff8ac1b2d19140972828d66 SHA512 8c3214a3bcf137ea3b4b59d89055b7e22d15b8ab8d6007d81a9e70e156f8af611a8032ce5cf5c42ecd8c5af7eebe95f012a3f91723f273efa42701fd036482be WHIRLPOOL 09724f2ea25814ea98fe865207d6d7a160abfe0e582c71d2b8c649855a16b3596722525c52037f76a1cf9194053edbb19627eb16c27975646cc7247478554a1f
+DIST NWNFrench1.68dialog.zip 6770835 SHA256 64f5fbb14cc8d0232eeaa36c452081bf5fdbc5ea81e58d8868c92ae86ee6a838
+DIST NWNGerman1.68dialog.zip 7229687 SHA256 063bff4857f5f70dad98312129d43e047470de6144f011890949731f2071073b
+DIST NWNItalian1.68dialog.zip 6731492 SHA256 95ab20460c2761602aaf94f2b021ce698e8e4f122f3c1fd1ea8ad349fb3b5842
+DIST NWNJapanese1.68dialog.zip 6343304 SHA256 c8cc42038fb8c326caa432ff035621b200a397aa30f89862c8ba167f13144734
+DIST NWNSpanish1.68dialog.zip 6705882 SHA256 c6bd32e2156cd424598c8771b4cc2ca6ec97ecaffb29850412345b8b1a70bf7f
diff --git a/games-server/nwn-ded/nwn-ded-1.69.ebuild b/games-server/nwn-ded/nwn-ded-1.69.ebuild
index d1d4e770c6df..ce6cd5aa88b1 100644
--- a/games-server/nwn-ded/nwn-ded-1.69.ebuild
+++ b/games-server/nwn-ded/nwn-ded-1.69.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-server/nwn-ded/nwn-ded-1.69.ebuild,v 1.3 2011/10/24 19:55:23 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-server/nwn-ded/nwn-ded-1.69.ebuild,v 1.4 2012/12/28 17:55:51 tupone Exp $
 
 inherit games
 
@@ -24,6 +24,9 @@ RDEPEND="amd64? ( app-emulation/emul-linux-x86-baselibs
 
 S=${WORKDIR}
 
+dir=${GAMES_PREFIX_OPT}/${PN}
+QA_PREBUILT="${dir:1}/common/nwserver"
+
 src_unpack() {
 	mkdir common || die "Failed creating directory"
 	cd common
@@ -52,7 +55,6 @@ src_unpack() {
 }
 
 src_install() {
-	local dir=${GAMES_PREFIX_OPT}/${PN}
 	dodir ${dir}
 
 	local currentlocale
diff --git a/games-strategy/megaglest-data/megaglest-data-3.7.1-r1.ebuild b/games-strategy/megaglest-data/megaglest-data-3.7.1-r1.ebuild
index 422b393c8d5c..346d24dc4d5e 100644
--- a/games-strategy/megaglest-data/megaglest-data-3.7.1-r1.ebuild
+++ b/games-strategy/megaglest-data/megaglest-data-3.7.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/megaglest-data/megaglest-data-3.7.1-r1.ebuild,v 1.1 2012/12/25 15:40:59 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/megaglest-data/megaglest-data-3.7.1-r1.ebuild,v 1.3 2012/12/28 11:28:27 ago Exp $
 
 EAPI=4
 inherit cmake-utils eutils games
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${MY_PN}/${P}.tar.xz"
 
 LICENSE="CCPL-Attribution-ShareAlike-3.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc"
 
 RDEPEND="~games-strategy/megaglest-${PV}"
diff --git a/games-strategy/megaglest/megaglest-3.7.1.ebuild b/games-strategy/megaglest/megaglest-3.7.1.ebuild
index fd53b5e0ead4..58873205d890 100644
--- a/games-strategy/megaglest/megaglest-3.7.1.ebuild
+++ b/games-strategy/megaglest/megaglest-3.7.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/megaglest/megaglest-3.7.1.ebuild,v 1.1 2012/11/23 17:15:50 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/megaglest/megaglest-3.7.1.ebuild,v 1.3 2012/12/28 11:28:19 ago Exp $
 
 EAPI=4
 VIRTUALX_REQUIRED="manual"
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}-source-${PV}.tar.xz"
 
 LICENSE="GPL-3 BitstreamVera"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug +editor sse sse2 sse3 static +streflop +tools +unicode wxuniversal +model-viewer videos"
 
 RDEPEND="
diff --git a/gnome-base/gdm/files/gdm-3.6.2-gdm-slave.xml-unicode.patch b/gnome-base/gdm/files/gdm-3.6.2-gdm-slave.xml-unicode.patch
new file mode 100644
index 000000000000..2863b752961a
--- /dev/null
+++ b/gnome-base/gdm/files/gdm-3.6.2-gdm-slave.xml-unicode.patch
@@ -0,0 +1,27 @@
+From 72fd8c8da02b47403992945a61d2514d6ee78cf4 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Fri, 28 Dec 2012 18:50:37 -0500
+Subject: [PATCH] daemon: remove spurious unicode characters from dbus
+ introspection file
+
+https://bugzilla.gnome.org/show_bug.cgi?id=690842
+---
+ daemon/gdm-slave.xml | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/daemon/gdm-slave.xml b/daemon/gdm-slave.xml
+index 547c44e..d055252 100644
+--- a/daemon/gdm-slave.xml
++++ b/daemon/gdm-slave.xml
+@@ -14,6 +14,6 @@
+       <arg name="address" type="s" direction="out" />
+     </method>
+ 
+-    <property name="session_id" type="s" access="read"/>•
+-  </interface>•
++    <property name="session_id" type="s" access="read"/>
++  </interface>
+ </node>
+-- 
+1.8.0.2
+
diff --git a/gnome-base/gdm/gdm-3.6.2.ebuild b/gnome-base/gdm/gdm-3.6.2.ebuild
index 98ad0808961e..1f483250964f 100644
--- a/gnome-base/gdm/gdm-3.6.2.ebuild
+++ b/gnome-base/gdm/gdm-3.6.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-3.6.2.ebuild,v 1.1 2012/12/26 21:45:01 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-3.6.2.ebuild,v 1.2 2012/12/29 00:00:34 tetromino Exp $
 
 EAPI="5"
 GNOME2_LA_PUNT="yes"
@@ -136,6 +136,10 @@ src_prepare() {
 	# automagic selinux :/
 	epatch "${FILESDIR}/${PN}-3.6.0-selinux-automagic.patch"
 
+	# spurious unicode characters causing build failure, bug #449062
+	# https://bugzilla.gnome.org/show_bug.cgi?id=690842
+	LC_ALL=C epatch "${FILESDIR}/${PN}-3.6.2-gdm-slave.xml-unicode.patch"
+
 	# don't load accessibility support at runtime when USE=-accessibility
 	use accessibility || epatch "${FILESDIR}/${PN}-3.3.92.1-disable-accessibility.patch"
 
diff --git a/gnustep-base/gnustep-base/files/gnustep-base-1.24.0-libxml2-2.9_support.patch b/gnustep-base/gnustep-base/files/gnustep-base-1.24.0-libxml2-2.9_support.patch
new file mode 100644
index 000000000000..76865abce50e
--- /dev/null
+++ b/gnustep-base/gnustep-base/files/gnustep-base-1.24.0-libxml2-2.9_support.patch
@@ -0,0 +1,14 @@
+--- libs/base/trunk/Source/Additions/GSXML.m	2012/10/21 05:25:31	35729
++++ libs/base/trunk/Source/Additions/GSXML.m	2012/10/22 04:22:25	35730
+@@ -983,7 +983,11 @@
+ 	1,
+ 	"utf-8");
+       xmlOutputBufferFlush(buf);
++#if LIBXML_VERSION < 20900
+       string = UTF8StrLen(buf->buffer->content, buf->buffer->use);
++#else
++      string = UTF8StrLen(xmlBufContent(buf->buffer), xmlBufUse(buf->buffer));
++#endif
+       xmlOutputBufferClose(buf);
+     }
+   return string;
diff --git a/gnustep-base/gnustep-base/gnustep-base-1.24.0-r1.ebuild b/gnustep-base/gnustep-base/gnustep-base-1.24.0-r1.ebuild
index e539cbd8b0d3..489b4827d470 100644
--- a/gnustep-base/gnustep-base/gnustep-base-1.24.0-r1.ebuild
+++ b/gnustep-base/gnustep-base/gnustep-base-1.24.0-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-base/gnustep-base-1.24.0-r1.ebuild,v 1.6 2012/12/20 13:07:53 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-base/gnustep-base-1.24.0-r1.ebuild,v 1.7 2012/12/28 23:52:25 voyageur Exp $
 
 EAPI=4
-inherit gnustep-base
+inherit eutils gnustep-base
 
 DESCRIPTION="A library of general-purpose, non-graphical Objective C objects."
 HOMEPAGE="http://www.gnustep.org"
@@ -30,6 +30,10 @@ RDEPEND="${GNUSTEP_CORE_DEPEND}
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-libxml2-2.9_support.patch
+}
+
 src_configure() {
 	egnustep_env
 
diff --git a/licenses/MIT-with-advertising b/licenses/MIT-with-advertising
new file mode 100644
index 000000000000..d99348e079da
--- /dev/null
+++ b/licenses/MIT-with-advertising
@@ -0,0 +1,20 @@
+Copyright (C) <year> <copyright holders>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies of the Software, its documentation and marketing & publicity
+materials, and acknowledgment shall be given in the documentation, materials
+and software packages that this Software was used.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/mail-client/claws-mail-acpi-notifier/claws-mail-acpi-notifier-1.0.28.ebuild b/mail-client/claws-mail-acpi-notifier/claws-mail-acpi-notifier-1.0.28.ebuild
index 13dc7dfcc82c..9f0c15c13ea0 100644
--- a/mail-client/claws-mail-acpi-notifier/claws-mail-acpi-notifier-1.0.28.ebuild
+++ b/mail-client/claws-mail-acpi-notifier/claws-mail-acpi-notifier-1.0.28.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail-acpi-notifier/claws-mail-acpi-notifier-1.0.28.ebuild,v 1.1 2012/11/20 20:18:10 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail-acpi-notifier/claws-mail-acpi-notifier-1.0.28.ebuild,v 1.3 2012/12/28 16:39:23 ago Exp $
 
 inherit eutils
 
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.claws-mail.org/"
 SRC_URI="http://www.claws-mail.org/downloads/plugins/${MY_P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 RDEPEND=">=mail-client/claws-mail-3.9.0"
 DEPEND="${RDEPEND}
diff --git a/mail-client/claws-mail-address_keeper/claws-mail-address_keeper-1.0.7.ebuild b/mail-client/claws-mail-address_keeper/claws-mail-address_keeper-1.0.7.ebuild
index 34956af258e9..dffbdfe6cc47 100644
--- a/mail-client/claws-mail-address_keeper/claws-mail-address_keeper-1.0.7.ebuild
+++ b/mail-client/claws-mail-address_keeper/claws-mail-address_keeper-1.0.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail-address_keeper/claws-mail-address_keeper-1.0.7.ebuild,v 1.1 2012/11/20 20:21:01 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail-address_keeper/claws-mail-address_keeper-1.0.7.ebuild,v 1.3 2012/12/28 16:39:29 ago Exp $
 
 inherit eutils
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.claws-mail.org/"
 SRC_URI="http://www.claws-mail.org/downloads/plugins/${MY_P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 RDEPEND=">=mail-client/claws-mail-3.9.0"
 DEPEND="${RDEPEND}
diff --git a/mail-client/claws-mail-archive/claws-mail-archive-0.6.13.ebuild b/mail-client/claws-mail-archive/claws-mail-archive-0.6.13.ebuild
index 296c073096c3..24b97fee04be 100644
--- a/mail-client/claws-mail-archive/claws-mail-archive-0.6.13.ebuild
+++ b/mail-client/claws-mail-archive/claws-mail-archive-0.6.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail-archive/claws-mail-archive-0.6.13.ebuild,v 1.1 2012/11/20 20:22:08 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail-archive/claws-mail-archive-0.6.13.ebuild,v 1.3 2012/12/28 16:39:37 ago Exp $
 
 inherit eutils
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.claws-mail.org/"
 SRC_URI="http://www.claws-mail.org/downloads/plugins/${MY_P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE=""
 RDEPEND=">=mail-client/claws-mail-3.9.0
 	app-arch/libarchive
diff --git a/mail-client/claws-mail-att-remover/claws-mail-att-remover-1.0.15.ebuild b/mail-client/claws-mail-att-remover/claws-mail-att-remover-1.0.15.ebuild
index 508e9f19913d..382acb990180 100644
--- a/mail-client/claws-mail-att-remover/claws-mail-att-remover-1.0.15.ebuild
+++ b/mail-client/claws-mail-att-remover/claws-mail-att-remover-1.0.15.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail-att-remover/claws-mail-att-remover-1.0.15.ebuild,v 1.1 2012/11/20 20:28:24 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail-att-remover/claws-mail-att-remover-1.0.15.ebuild,v 1.4 2012/12/28 16:39:46 ago Exp $
 
 inherit eutils
 
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.claws-mail.org/"
 SRC_URI="http://www.claws-mail.org/downloads/plugins/${MY_P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ppc64 x86"
 IUSE=""
 RDEPEND=">=mail-client/claws-mail-3.9.0"
 DEPEND="${RDEPEND}
diff --git a/mail-client/claws-mail-attachwarner/claws-mail-attachwarner-1.0.ebuild b/mail-client/claws-mail-attachwarner/claws-mail-attachwarner-1.0.ebuild
index 16c58537e6f2..eb91e1d5b3a6 100644
--- a/mail-client/claws-mail-attachwarner/claws-mail-attachwarner-1.0.ebuild
+++ b/mail-client/claws-mail-attachwarner/claws-mail-attachwarner-1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail-attachwarner/claws-mail-attachwarner-1.0.ebuild,v 1.1 2012/11/20 20:25:21 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail-attachwarner/claws-mail-attachwarner-1.0.ebuild,v 1.3 2012/12/28 16:39:54 ago Exp $
 
 MY_P="${P#claws-mail-}"
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.claws-mail.org/"
 SRC_URI="http://www.claws-mail.org/downloads/plugins/${MY_P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="nls"
 RDEPEND=">=mail-client/claws-mail-3.9.0
 		nls? ( >=sys-devel/gettext-0.12.1 )"
diff --git a/mail-client/claws-mail-clamd/claws-mail-clamd-3.5.5.ebuild b/mail-client/claws-mail-clamd/claws-mail-clamd-3.5.5.ebuild
index aad561f9da13..e89d17a27a6d 100644
--- a/mail-client/claws-mail-clamd/claws-mail-clamd-3.5.5.ebuild
+++ b/mail-client/claws-mail-clamd/claws-mail-clamd-3.5.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail-clamd/claws-mail-clamd-3.5.5.ebuild,v 1.1 2012/11/20 20:31:41 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail-clamd/claws-mail-clamd-3.5.5.ebuild,v 1.3 2012/12/28 16:40:00 ago Exp $
 
 inherit eutils
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.claws-mail.org/"
 SRC_URI="http://www.claws-mail.org/downloads/plugins/${MY_P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 RDEPEND=">=mail-client/claws-mail-3.9.0"
 DEPEND="${RDEPEND}
diff --git a/mail-client/claws-mail-fancy/claws-mail-fancy-0.9.17.ebuild b/mail-client/claws-mail-fancy/claws-mail-fancy-0.9.17.ebuild
index 4bf96b57dbad..8c464fd6851f 100644
--- a/mail-client/claws-mail-fancy/claws-mail-fancy-0.9.17.ebuild
+++ b/mail-client/claws-mail-fancy/claws-mail-fancy-0.9.17.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail-fancy/claws-mail-fancy-0.9.17.ebuild,v 1.1 2012/11/20 20:33:48 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail-fancy/claws-mail-fancy-0.9.17.ebuild,v 1.3 2012/12/28 16:40:06 ago Exp $
 
 EAPI="3"
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.claws-mail.org/"
 SRC_URI="http://www.claws-mail.org/downloads/plugins/${MY_P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 RDEPEND=">=mail-client/claws-mail-3.9.0
 	>=net-libs/webkit-gtk-1.0:2"
diff --git a/mail-client/claws-mail-fetchinfo/claws-mail-fetchinfo-0.4.25.ebuild b/mail-client/claws-mail-fetchinfo/claws-mail-fetchinfo-0.4.25.ebuild
index 3c0fac9a703b..f35a78e73965 100644
--- a/mail-client/claws-mail-fetchinfo/claws-mail-fetchinfo-0.4.25.ebuild
+++ b/mail-client/claws-mail-fetchinfo/claws-mail-fetchinfo-0.4.25.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail-fetchinfo/claws-mail-fetchinfo-0.4.25.ebuild,v 1.4 2012/10/31 18:43:07 nativemad Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail-fetchinfo/claws-mail-fetchinfo-0.4.25.ebuild,v 1.5 2012/12/28 18:17:35 fauli Exp $
 
 MY_P="${PN#claws-mail-}-plugin-${PV}"
 
@@ -11,7 +11,7 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64 ~ppc ppc64 x86"
 IUSE=""
-RDEPEND=">=mail-client/claws-mail-3.8.1"
+RDEPEND=">=mail-client/claws-mail-3.9.0"
 DEPEND="${RDEPEND}
 		virtual/pkgconfig"
 
diff --git a/mail-client/claws-mail-gdata/claws-mail-gdata-0.5.ebuild b/mail-client/claws-mail-gdata/claws-mail-gdata-0.5.ebuild
index 0efa7a672587..ad1070d48edb 100644
--- a/mail-client/claws-mail-gdata/claws-mail-gdata-0.5.ebuild
+++ b/mail-client/claws-mail-gdata/claws-mail-gdata-0.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail-gdata/claws-mail-gdata-0.5.ebuild,v 1.2 2012/11/20 20:57:48 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail-gdata/claws-mail-gdata-0.5.ebuild,v 1.4 2012/12/28 16:40:12 ago Exp $
 
 EAPI=4
 
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.claws-mail.org/"
 SRC_URI="http://www.claws-mail.org/downloads/plugins/${MY_P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 RDEPEND=">=mail-client/claws-mail-3.9.0
 	>=dev-libs/libgdata-0.6.4"
diff --git a/mail-client/claws-mail-mailmbox/claws-mail-mailmbox-1.15.ebuild b/mail-client/claws-mail-mailmbox/claws-mail-mailmbox-1.15.ebuild
index 115e2357c806..279c3cae7b78 100644
--- a/mail-client/claws-mail-mailmbox/claws-mail-mailmbox-1.15.ebuild
+++ b/mail-client/claws-mail-mailmbox/claws-mail-mailmbox-1.15.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail-mailmbox/claws-mail-mailmbox-1.15.ebuild,v 1.1 2012/11/20 20:41:19 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail-mailmbox/claws-mail-mailmbox-1.15.ebuild,v 1.5 2012/12/28 16:40:22 ago Exp $
 
 MY_P="${P#claws-mail-}"
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.claws-mail.org/"
 SRC_URI="http://www.claws-mail.org/downloads/plugins/${MY_P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ppc ppc64 ~sparc x86"
 IUSE=""
 RDEPEND=">=mail-client/claws-mail-3.9.0"
 DEPEND="${RDEPEND}
diff --git a/mail-client/claws-mail-newmail/claws-mail-newmail-0.0.16.ebuild b/mail-client/claws-mail-newmail/claws-mail-newmail-0.0.16.ebuild
index 2cdb34157bf4..97572c3b5ed3 100644
--- a/mail-client/claws-mail-newmail/claws-mail-newmail-0.0.16.ebuild
+++ b/mail-client/claws-mail-newmail/claws-mail-newmail-0.0.16.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail-newmail/claws-mail-newmail-0.0.16.ebuild,v 1.1 2012/11/20 20:44:35 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail-newmail/claws-mail-newmail-0.0.16.ebuild,v 1.3 2012/12/28 16:40:29 ago Exp $
 
 MY_P="${P#claws-mail-}"
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.claws-mail.org/"
 SRC_URI="http://www.claws-mail.org/downloads/plugins/${MY_P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE=""
 RDEPEND=">=mail-client/claws-mail-3.9.0"
 DEPEND="${RDEPEND}
diff --git a/mail-client/claws-mail-notification/claws-mail-notification-0.31.ebuild b/mail-client/claws-mail-notification/claws-mail-notification-0.31.ebuild
index 55fdfea557e2..40211871018c 100644
--- a/mail-client/claws-mail-notification/claws-mail-notification-0.31.ebuild
+++ b/mail-client/claws-mail-notification/claws-mail-notification-0.31.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail-notification/claws-mail-notification-0.31.ebuild,v 1.1 2012/11/20 20:46:18 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail-notification/claws-mail-notification-0.31.ebuild,v 1.4 2012/12/28 16:40:38 ago Exp $
 
 EAPI=4
 inherit multilib
@@ -13,7 +13,7 @@ SRC_URI="http://www.claws-mail.org/downloads/plugins/${MY_P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="libnotify"
 
 RDEPEND=">=mail-client/claws-mail-3.9.0
diff --git a/mail-client/claws-mail-pdf-viewer/claws-mail-pdf-viewer-0.9.3.ebuild b/mail-client/claws-mail-pdf-viewer/claws-mail-pdf-viewer-0.9.3.ebuild
index 24d34f857990..d68620dfa8b0 100644
--- a/mail-client/claws-mail-pdf-viewer/claws-mail-pdf-viewer-0.9.3.ebuild
+++ b/mail-client/claws-mail-pdf-viewer/claws-mail-pdf-viewer-0.9.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail-pdf-viewer/claws-mail-pdf-viewer-0.9.3.ebuild,v 1.2 2012/11/20 21:19:10 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail-pdf-viewer/claws-mail-pdf-viewer-0.9.3.ebuild,v 1.3 2012/12/28 16:40:43 ago Exp $
 
 inherit eutils
 
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.claws-mail.org/"
 SRC_URI="http://www.claws-mail.org/downloads/plugins/${MY_P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE=""
 CDEPEND=">=mail-client/claws-mail-3.9.0"
 RDEPEND="app-text/ghostscript-gpl"
diff --git a/mail-client/claws-mail-perl/claws-mail-perl-0.9.20.ebuild b/mail-client/claws-mail-perl/claws-mail-perl-0.9.20.ebuild
index 223537adea51..c334b5d0a86b 100644
--- a/mail-client/claws-mail-perl/claws-mail-perl-0.9.20.ebuild
+++ b/mail-client/claws-mail-perl/claws-mail-perl-0.9.20.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail-perl/claws-mail-perl-0.9.20.ebuild,v 1.1 2012/11/20 20:46:41 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail-perl/claws-mail-perl-0.9.20.ebuild,v 1.4 2012/12/28 16:40:51 ago Exp $
 
 MY_P="${PN#claws-mail-}_plugin-${PV}"
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.claws-mail.org"
 SRC_URI="http://www.claws-mail.org/downloads/plugins/${MY_P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ppc64 x86"
 IUSE=""
 RDEPEND=">=mail-client/claws-mail-3.9.0
 		dev-lang/perl"
diff --git a/mail-client/claws-mail-python/claws-mail-python-0.11.ebuild b/mail-client/claws-mail-python/claws-mail-python-0.11.ebuild
index df9ba833308e..44085b102210 100644
--- a/mail-client/claws-mail-python/claws-mail-python-0.11.ebuild
+++ b/mail-client/claws-mail-python/claws-mail-python-0.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail-python/claws-mail-python-0.11.ebuild,v 1.1 2012/11/20 20:50:00 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail-python/claws-mail-python-0.11.ebuild,v 1.3 2012/12/28 16:40:59 ago Exp $
 
 EAPI=4
 inherit multilib
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.claws-mail.org/"
 SRC_URI="http://www.claws-mail.org/downloads/plugins/${MY_P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 RDEPEND=">=mail-client/claws-mail-3.9.0
 	>=dev-lang/python-2.5
diff --git a/mail-client/claws-mail-rssyl/claws-mail-rssyl-0.34.ebuild b/mail-client/claws-mail-rssyl/claws-mail-rssyl-0.34.ebuild
index a9e3641ad1ce..056ad87f6d9d 100644
--- a/mail-client/claws-mail-rssyl/claws-mail-rssyl-0.34.ebuild
+++ b/mail-client/claws-mail-rssyl/claws-mail-rssyl-0.34.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail-rssyl/claws-mail-rssyl-0.34.ebuild,v 1.1 2012/11/20 20:51:01 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail-rssyl/claws-mail-rssyl-0.34.ebuild,v 1.5 2012/12/28 16:41:08 ago Exp $
 
 EAPI="4"
 
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.claws-mail.org/"
 SRC_URI="http://www.claws-mail.org/downloads/plugins/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ppc ppc64 x86"
 IUSE="nls"
 RDEPEND=">=mail-client/claws-mail-3.9.0
 	net-misc/curl
diff --git a/mail-client/claws-mail-spam-report/claws-mail-spam-report-0.3.17.ebuild b/mail-client/claws-mail-spam-report/claws-mail-spam-report-0.3.17.ebuild
index c62c24189e65..1dccf3033444 100644
--- a/mail-client/claws-mail-spam-report/claws-mail-spam-report-0.3.17.ebuild
+++ b/mail-client/claws-mail-spam-report/claws-mail-spam-report-0.3.17.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail-spam-report/claws-mail-spam-report-0.3.17.ebuild,v 1.1 2012/11/20 21:16:44 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail-spam-report/claws-mail-spam-report-0.3.17.ebuild,v 1.3 2012/12/28 16:41:15 ago Exp $
 
 EAPI=4
 
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.claws-mail.org/"
 SRC_URI="http://www.claws-mail.org/downloads/plugins/${MY_P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE=""
 RDEPEND=">=mail-client/claws-mail-3.9.0
 		>=net-misc/curl-7.9.7"
diff --git a/mail-client/claws-mail-tnef-parse/claws-mail-tnef-parse-0.3.14.ebuild b/mail-client/claws-mail-tnef-parse/claws-mail-tnef-parse-0.3.14.ebuild
index a42ce13dbdc2..ebffd75c9814 100644
--- a/mail-client/claws-mail-tnef-parse/claws-mail-tnef-parse-0.3.14.ebuild
+++ b/mail-client/claws-mail-tnef-parse/claws-mail-tnef-parse-0.3.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail-tnef-parse/claws-mail-tnef-parse-0.3.14.ebuild,v 1.1 2012/11/20 21:11:02 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail-tnef-parse/claws-mail-tnef-parse-0.3.14.ebuild,v 1.3 2012/12/28 16:41:22 ago Exp $
 
 EAPI=4
 
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.claws-mail.org/"
 SRC_URI="http://www.claws-mail.org/downloads/plugins/${MY_P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE=""
 RDEPEND=">=mail-client/claws-mail-3.9.0"
 DEPEND="${RDEPEND}
diff --git a/mail-client/claws-mail-vcalendar/claws-mail-vcalendar-2.0.14.ebuild b/mail-client/claws-mail-vcalendar/claws-mail-vcalendar-2.0.14.ebuild
index 9203fc6a0f6a..c53e662e9877 100644
--- a/mail-client/claws-mail-vcalendar/claws-mail-vcalendar-2.0.14.ebuild
+++ b/mail-client/claws-mail-vcalendar/claws-mail-vcalendar-2.0.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail-vcalendar/claws-mail-vcalendar-2.0.14.ebuild,v 1.1 2012/11/20 20:58:30 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail-vcalendar/claws-mail-vcalendar-2.0.14.ebuild,v 1.5 2012/12/28 16:41:31 ago Exp $
 
 EAPI=4
 
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.claws-mail.org/"
 SRC_URI="http://www.claws-mail.org/downloads/plugins/${MY_P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ppc ppc64 ~sparc x86"
 IUSE=""
 RDEPEND=">=mail-client/claws-mail-3.8.1
 		>=net-misc/curl-7.9.7"
diff --git a/mail-client/claws-mail/claws-mail-3.9.0.ebuild b/mail-client/claws-mail/claws-mail-3.9.0.ebuild
index d3af4dac748d..ac3f4bace4da 100644
--- a/mail-client/claws-mail/claws-mail-3.9.0.ebuild
+++ b/mail-client/claws-mail/claws-mail-3.9.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail/claws-mail-3.9.0.ebuild,v 1.1 2012/11/20 20:17:33 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail/claws-mail-3.9.0.ebuild,v 1.5 2012/12/28 16:39:16 ago Exp $
 
 EAPI="4"
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/sylpheed-claws/${P}.tar.bz2"
 
 SLOT="0"
 LICENSE="GPL-3"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ppc ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="bogofilter crypt dbus dillo doc +imap ipv6 ldap nntp pda session smime spamassassin spell +ssl startup-notification xface"
 
 COMMONDEPEND=">=x11-libs/gtk+-2.20:2
diff --git a/mail-filter/libspf2/libspf2-1.2.9-r3.ebuild b/mail-filter/libspf2/libspf2-1.2.9-r3.ebuild
index e7cd9a88235e..fc2ae91e575e 100644
--- a/mail-filter/libspf2/libspf2-1.2.9-r3.ebuild
+++ b/mail-filter/libspf2/libspf2-1.2.9-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/libspf2/libspf2-1.2.9-r3.ebuild,v 1.5 2012/12/26 02:02:08 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/libspf2/libspf2-1.2.9-r3.ebuild,v 1.6 2012/12/28 11:21:51 ago Exp $
 
 EAPI=4
 inherit eutils autotools
@@ -11,7 +11,7 @@ SRC_URI="http://www.libspf2.org/spf/libspf2-${PV}.tar.gz"
 
 LICENSE="|| ( LGPL-2.1 BSD-2 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ia64 ~ppc ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="static static-libs"
 
 DEPEND=""
diff --git a/mail-mta/msmtp/msmtp-1.4.30.ebuild b/mail-mta/msmtp/msmtp-1.4.30.ebuild
index a5e6e03d3d34..0c4c788dab17 100644
--- a/mail-mta/msmtp/msmtp-1.4.30.ebuild
+++ b/mail-mta/msmtp/msmtp-1.4.30.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/msmtp/msmtp-1.4.30.ebuild,v 1.6 2012/12/26 07:47:51 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/msmtp/msmtp-1.4.30.ebuild,v 1.7 2012/12/28 11:24:51 ago Exp $
 
 EAPI=4
 inherit multilib python eutils
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/msmtp/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 ia64 ~ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ia64 ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="doc gnome-keyring gnutls idn +mta nls sasl ssl vim-syntax"
 
 CDEPEND="
diff --git a/media-gfx/cropgui/cropgui-0.1.1.ebuild b/media-gfx/cropgui/cropgui-0.1.1.ebuild
index 995206f7f435..1ca919361cb7 100644
--- a/media-gfx/cropgui/cropgui-0.1.1.ebuild
+++ b/media-gfx/cropgui/cropgui-0.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/cropgui/cropgui-0.1.1.ebuild,v 1.1 2012/11/27 08:49:11 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/cropgui/cropgui-0.1.1.ebuild,v 1.3 2012/12/28 16:41:41 ago Exp $
 
 EAPI="4"
 
@@ -16,7 +16,7 @@ SRC_URI="http://media.unpythonic.net/emergent-files/01248401946/${PN}_${PV}.tar.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND=""
diff --git a/media-gfx/graphite2/files/graphite2-1.2.0-solaris.patch b/media-gfx/graphite2/files/graphite2-1.2.0-solaris.patch
new file mode 100644
index 000000000000..c3bbe51e8695
--- /dev/null
+++ b/media-gfx/graphite2/files/graphite2-1.2.0-solaris.patch
@@ -0,0 +1,22 @@
+Bidi: undef conflicting constants
+
+On Solaris ES and CS are already defined, resulting in compilation
+errors.  Since we won't need Solaris' ones here, simply undef them.
+
+--- graphite2-1.2.0/src/Bidi.cpp
++++ graphite2-1.2.0/src/Bidi.cpp
+@@ -30,6 +30,14 @@
+ 
+ using namespace graphite2;
+ 
++/* Solaris' headers define these */
++#ifdef ES
++# undef ES
++#endif
++#ifdef CS
++# undef CS
++#endif
++
+ enum DirCode {  // Hungarian: dirc
+         Unk        = -1,
+         N          =  0,   // other neutrals (default) - ON
diff --git a/media-gfx/graphite2/graphite2-1.2.0.ebuild b/media-gfx/graphite2/graphite2-1.2.0.ebuild
index 2ef9813ccece..c76fc59039ee 100644
--- a/media-gfx/graphite2/graphite2-1.2.0.ebuild
+++ b/media-gfx/graphite2/graphite2-1.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphite2/graphite2-1.2.0.ebuild,v 1.5 2012/12/24 04:04:53 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphite2/graphite2-1.2.0.ebuild,v 1.6 2012/12/28 11:37:40 grobian Exp $
 
 EAPI=4
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/silgraphite/${PN}/${P}.tgz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~hppa ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris"
 IUSE="perl test"
 
 RDEPEND="
@@ -33,6 +33,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-1.1.0-includes-libs-perl.patch"
 	"${FILESDIR}/${PN}-1.0.2-no_harfbuzz_tests.patch"
 	"${FILESDIR}/${PN}-1.0.3-no-test-binaries.patch"
+	"${FILESDIR}/${PN}-1.2.0-solaris.patch"
 )
 
 pkg_setup() {
diff --git a/media-libs/glu/glu-9.0.0.ebuild b/media-libs/glu/glu-9.0.0.ebuild
index 86908c6ed652..530c1b26e74e 100644
--- a/media-libs/glu/glu-9.0.0.ebuild
+++ b/media-libs/glu/glu-9.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/glu/glu-9.0.0.ebuild,v 1.8 2012/12/17 19:57:47 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/glu/glu-9.0.0.ebuild,v 1.10 2012/12/28 17:32:18 ago Exp $
 
 EAPI=4
 
@@ -24,7 +24,7 @@ fi
 
 LICENSE="SGI-B-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="multilib static-libs"
 
 DEPEND="virtual/opengl"
diff --git a/media-libs/harfbuzz/harfbuzz-0.9.9.ebuild b/media-libs/harfbuzz/harfbuzz-0.9.9.ebuild
index 06c353c096d3..176ab668a6b8 100644
--- a/media-libs/harfbuzz/harfbuzz-0.9.9.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-0.9.9.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/harfbuzz/harfbuzz-0.9.9.ebuild,v 1.3 2012/12/24 04:05:25 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/harfbuzz/harfbuzz-0.9.9.ebuild,v 1.4 2012/12/28 12:28:27 grobian Exp $
 
 EAPI=5
 
 EGIT_REPO_URI="git://anongit.freedesktop.org/harfbuzz"
 [[ ${PV} == 9999 ]] && inherit git-2 autotools
 
-inherit eutils
+inherit eutils libtool
 
 DESCRIPTION="An OpenType text shaping engine"
 HOMEPAGE="http://www.freedesktop.org/wiki/Software/HarfBuzz"
@@ -16,7 +16,7 @@ HOMEPAGE="http://www.freedesktop.org/wiki/Software/HarfBuzz"
 LICENSE="MIT"
 SLOT="0"
 [[ ${PV} == 9999 ]] || \
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
 IUSE="static-libs"
 
 RDEPEND="
@@ -34,6 +34,7 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
 	[[ ${PV} == 9999 ]] && eautoreconf
+	elibtoolize  # for building a shared library on x64-solaris
 }
 
 src_configure() {
diff --git a/media-libs/harfbuzz/harfbuzz-9999.ebuild b/media-libs/harfbuzz/harfbuzz-9999.ebuild
index 9879c6a406cd..06e5839e6e5d 100644
--- a/media-libs/harfbuzz/harfbuzz-9999.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-9999.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/harfbuzz/harfbuzz-9999.ebuild,v 1.5 2012/12/16 10:19:03 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/harfbuzz/harfbuzz-9999.ebuild,v 1.6 2012/12/28 12:28:27 grobian Exp $
 
 EAPI=5
 
 EGIT_REPO_URI="git://anongit.freedesktop.org/harfbuzz"
 [[ ${PV} == 9999 ]] && inherit git-2 autotools
 
-inherit eutils
+inherit eutils libtool
 
 DESCRIPTION="An OpenType text shaping engine"
 HOMEPAGE="http://www.freedesktop.org/wiki/Software/HarfBuzz"
@@ -34,6 +34,7 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
 	[[ ${PV} == 9999 ]] && eautoreconf
+	elibtoolize  # for building a shared library on x64-solaris
 }
 
 src_configure() {
diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-1.2.1.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-1.2.1.ebuild
index 4ec11ecfe0df..d1339fdd3b1d 100644
--- a/media-libs/libjpeg-turbo/libjpeg-turbo-1.2.1.ebuild
+++ b/media-libs/libjpeg-turbo/libjpeg-turbo-1.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libjpeg-turbo/libjpeg-turbo-1.2.1.ebuild,v 1.7 2012/07/31 04:14:18 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libjpeg-turbo/libjpeg-turbo-1.2.1.ebuild,v 1.8 2012/12/28 16:10:14 ssuominen Exp $
 
 EAPI=4
 
@@ -20,7 +20,7 @@ HOMEPAGE="http://libjpeg-turbo.virtualgl.org/ http://sourceforge.net/projects/li
 SRC_URI="${SRC_URI}
 	mirror://debian/pool/main/libj/libjpeg${JPEG_ABI}/libjpeg${JPEG_ABI}_${JPEG_ABI}d-1.debian.tar.gz"
 
-LICENSE="BSD"
+LICENSE="BSD IJG"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="java static-libs"
diff --git a/media-libs/mesa/mesa-9.0.1.ebuild b/media-libs/mesa/mesa-9.0.1.ebuild
index 5ba8f9f7af6a..bf4cdf92be19 100644
--- a/media-libs/mesa/mesa-9.0.1.ebuild
+++ b/media-libs/mesa/mesa-9.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-9.0.1.ebuild,v 1.2 2012/12/03 02:42:08 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-9.0.1.ebuild,v 1.4 2012/12/28 17:32:53 ago Exp $
 
 EAPI=4
 
@@ -36,7 +36,7 @@ fi
 # GLES[2]/gl[2]{,ext,platform}.h are SGI-B-2.0
 LICENSE="MIT SGI-B-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 INTEL_CARDS="i915 i965 intel"
 RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
diff --git a/media-radio/fldigi/Manifest b/media-radio/fldigi/Manifest
index 0ac2cae25f67..7d0bb39e24a0 100644
--- a/media-radio/fldigi/Manifest
+++ b/media-radio/fldigi/Manifest
@@ -3,3 +3,4 @@ DIST fldigi-3.21.60.tar.gz 2120677 SHA256 72bbd9f1066642671fa50736224c186c2d4874
 DIST fldigi-3.21.61.tar.gz 2119162 SHA256 a00ef5e5b500ea55d7f179dfc4ec172fc2db147499c0665fd76825e5d370e709 SHA512 aa0f2d40ec18698fe67fdbd1210aea530083b7162519a9d1835a9d28b38b190b34e6f0757966042b98591a99ab4abef16f70bcc5e07ce6b3425db321efbdcac3 WHIRLPOOL e817dd3a55f226d02538d7bc332940db4e954ca4ef04330d9b7571999fd4da1e6dfba89ea1b2f4077b6ba5052ffcdcbf34093c217757a637c1c855332a8877ea
 DIST fldigi-3.21.62.tar.gz 2122596 SHA256 82d7882e8a7033d60dbcecdf24449ac33248cb2fbac3d46f0d6a8affff1d5d51 SHA512 acf3432a5dfe4af70da6e9d85350b8240a0b73786268cef9913bc829e188f28c0b1ec11762b9999a9ae52ff8f48cf4abc1251dfbcc52b19fadc9f10a89dbe0c0 WHIRLPOOL d953e45e48a0ea83840f869fac68dc8052d8d30b9dc0d604e4ecce656ec54286adb492c61f390ebe81ba9fb621d3dd700554dd4f47832548735c5a1a6472d55c
 DIST fldigi-3.21.63.tar.gz 2122998 SHA256 23c0f3d5551e0b5d5b51ca5eca0aa691e7cb96d92540822d4d66c7ea6aa2ff95 SHA512 aa98f9747cf7883c2b4e2269f3200b1a296f4d20faeff294dbaa38fe1c206ef483767e7eb390411d4e1cfe2b645cecada6dc96a3f5646f8df0b3b7ebd2cddfc8 WHIRLPOOL 4f63fa3ace7c900a639ed7de410e5fd4fc1667672dc7fbc5049078538b24757f4cb5137db20748e44f445f4b58f32b890cd8ef91e96c7d521fc8eca0c30d33cf
+DIST fldigi-3.21.64.tar.gz 2122566 SHA256 7dca0b0e69a489407530f285adc817e343a102ca866ed829ecb6c40c5173900f SHA512 ad4d0b0694bd23ef8a6cf4e53b52294da0edd566b46ac40c2b5b808d86a9cec7572c50ae69f8eba34791fc9272e98e543d5a8e4b50755997256592c0a3bc8f2a WHIRLPOOL 4cd701ac9edef5968e1caae178223c22747fcfa9c9fe22047a299fa74279c47df0284e3c5fe4b4d38aaad8547b7199a097b56ee9d3654ec2d8174187f17b1593
diff --git a/media-radio/fldigi/fldigi-3.21.64.ebuild b/media-radio/fldigi/fldigi-3.21.64.ebuild
new file mode 100644
index 000000000000..8c98f018681d
--- /dev/null
+++ b/media-radio/fldigi/fldigi-3.21.64.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-radio/fldigi/fldigi-3.21.64.ebuild,v 1.1 2012/12/28 14:31:22 tomjbe Exp $
+
+EAPI=4
+
+DESCRIPTION="Sound card based multimode software modem for Amateur Radio use"
+HOMEPAGE="http://www.w1hkj.com/Fldigi.html"
+SRC_URI="http://www.w1hkj.com/downloads/fldigi/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="hamlib nls portaudio pulseaudio sndfile xmlrpc"
+
+RDEPEND="x11-libs/fltk:1[threads,xft]
+	media-libs/libsamplerate
+	media-libs/libpng
+	x11-misc/xdg-utils
+	hamlib? ( media-libs/hamlib )
+	portaudio? ( >=media-libs/portaudio-19_pre20071207 )
+	pulseaudio? ( media-sound/pulseaudio )
+	sndfile? ( >=media-libs/libsndfile-1.0.10 )
+	xmlrpc? ( || ( >=dev-libs/xmlrpc-c-1.18.02[abyss] <dev-libs/xmlrpc-c-1.18.02 )
+		dev-perl/RPC-XML
+		dev-perl/Term-ReadLine-Perl )"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS ChangeLog NEWS README )
+
+src_configure() {
+	econf $(use_with sndfile) \
+		$(use_with portaudio) \
+		$(use_with hamlib) \
+		$(use_enable nls) \
+		$(use_with pulseaudio) \
+		$(use_with xmlrpc) \
+		--disable-silent-rules \
+		--without-asciidoc
+}
diff --git a/media-video/totem/totem-3.6.3-r1.ebuild b/media-video/totem/totem-3.6.3-r1.ebuild
index f50bbf1f188d..1ee63df95308 100644
--- a/media-video/totem/totem-3.6.3-r1.ebuild
+++ b/media-video/totem/totem-3.6.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-3.6.3-r1.ebuild,v 1.1 2012/12/24 12:40:39 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-3.6.3-r1.ebuild,v 1.2 2012/12/28 22:32:57 eva Exp $
 
 EAPI="5"
 GCONF_DEBUG="yes"
@@ -38,7 +38,7 @@ RDEPEND="
 	>=x11-themes/gnome-icon-theme-2.16
 	x11-libs/cairo
 	>=dev-libs/libxml2-2.6:2
-	>=media-libs/clutter-1.6.8:1.0
+	>=media-libs/clutter-1.10:1.0
 	>=media-libs/clutter-gst-1.5.5:2.0
 	>=media-libs/clutter-gtk-1.0.2:1.0
 	x11-libs/mx:1.0
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index dbd142c33d73..b18dd281f6e0 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Fri, 28 Dec 2012 08:06:51 +0000
+Sat, 29 Dec 2012 04:36:53 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index dbd142c33d73..71df63aa6d67 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Fri, 28 Dec 2012 08:06:51 +0000
+Sat, 29 Dec 2012 04:36:54 +0000
diff --git a/metadata/md5-cache/app-accessibility/SphinxTrain-0.9.1-r1 b/metadata/md5-cache/app-accessibility/SphinxTrain-0.9.1-r1
index 8faa4e651218..9f2cb29da977 100644
--- a/metadata/md5-cache/app-accessibility/SphinxTrain-0.9.1-r1
+++ b/metadata/md5-cache/app-accessibility/SphinxTrain-0.9.1-r1
@@ -4,9 +4,9 @@ DESCRIPTION=Speech Recognition (Training Module)
 EAPI=4
 HOMEPAGE=http://cmusphinx.sourceforge.net/html/cmusphinx.php
 KEYWORDS=~amd64 ppc x86
-LICENSE=BSD as-is
+LICENSE=BSD-with-attribution
 RDEPEND=app-accessibility/sphinx2 app-accessibility/festival
 SLOT=0
 SRC_URI=http://www.speech.cs.cmu.edu/SphinxTrain/SphinxTrain-0.9.1-beta.tar.gz
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=852dc0c6302a6621064b94f61c674419
+_md5_=012af66f1de2347ca2cf1c167f4eb7dd
diff --git a/metadata/md5-cache/app-accessibility/festival-2.1 b/metadata/md5-cache/app-accessibility/festival-2.1
index 95e2d94d9ca6..a8f8709afeb9 100644
--- a/metadata/md5-cache/app-accessibility/festival-2.1
+++ b/metadata/md5-cache/app-accessibility/festival-2.1
@@ -4,9 +4,9 @@ DESCRIPTION=Festival Text to Speech engine
 EAPI=2
 HOMEPAGE=http://www.cstr.ed.ac.uk/projects/festival/
 KEYWORDS=alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd
-LICENSE=FESTIVAL BSD as-is
+LICENSE=FESTIVAL HPND BSD rc regexp-UofT free-noncomm
 RDEPEND=~app-accessibility/speech-tools-2.1 >=sys-libs/ncurses-5.6-r2
 SLOT=0
 SRC_URI=http://www.festvox.org/packed/festival/2.1/festival-2.1-release.tar.gz http://www.festvox.org/packed/festival/2.1/festlex_CMU.tar.gz http://www.festvox.org/packed/festival/2.1/festlex_OALD.tar.gz http://www.festvox.org/packed/festival/2.1/festlex_POSLEX.tar.gz http://www.festvox.org/packed/festival/2.1/festvox_cmu_us_awb_cg.tar.gz http://www.festvox.org/packed/festival/2.1/festvox_cmu_us_rms_cg.tar.gz http://www.festvox.org/packed/festival/2.1/festvox_cmu_us_slt_arctic_hts.tar.gz http://www.festvox.org/packed/festival/2.1/festvox_rablpc16k.tar.gz http://www.festvox.org/packed/festival/2.1/festvox_kallpc16k.tar.gz http://www.festvox.org/packed/festival/2.1/speech_tools-2.1-release.tar.gz
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=4f8d47c26b7d34db2f61b8c5aadf3412
+_md5_=4e01cbbab9d04fd23a0df8dd21cebfb0
diff --git a/metadata/md5-cache/app-accessibility/festival-2.1-r1 b/metadata/md5-cache/app-accessibility/festival-2.1-r1
index 60cfa355a809..c1316e76656a 100644
--- a/metadata/md5-cache/app-accessibility/festival-2.1-r1
+++ b/metadata/md5-cache/app-accessibility/festival-2.1-r1
@@ -4,9 +4,9 @@ DESCRIPTION=Festival Text to Speech engine
 EAPI=2
 HOMEPAGE=http://www.cstr.ed.ac.uk/projects/festival/
 KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
-LICENSE=FESTIVAL BSD as-is
+LICENSE=FESTIVAL HPND BSD rc regexp-UofT free-noncomm
 RDEPEND=~app-accessibility/speech-tools-2.1 >=sys-libs/ncurses-5.6-r2
 SLOT=0
 SRC_URI=http://www.festvox.org/packed/festival/2.1/festival-2.1-release.tar.gz http://www.festvox.org/packed/festival/2.1/festlex_CMU.tar.gz http://www.festvox.org/packed/festival/2.1/festlex_OALD.tar.gz http://www.festvox.org/packed/festival/2.1/festlex_POSLEX.tar.gz http://www.festvox.org/packed/festival/2.1/festvox_cmu_us_awb_cg.tar.gz http://www.festvox.org/packed/festival/2.1/festvox_cmu_us_rms_cg.tar.gz http://www.festvox.org/packed/festival/2.1/festvox_cmu_us_slt_arctic_hts.tar.gz http://www.festvox.org/packed/festival/2.1/festvox_rablpc16k.tar.gz http://www.festvox.org/packed/festival/2.1/festvox_kallpc16k.tar.gz http://www.festvox.org/packed/festival/2.1/speech_tools-2.1-release.tar.gz
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=9f20f4be557fc0613d1fa8bb9e576ba8
+_md5_=e78fcc6e1143f0babe987d52cadcd840
diff --git a/metadata/md5-cache/app-accessibility/flite-1.2-r1 b/metadata/md5-cache/app-accessibility/flite-1.2-r1
index bb96ac3ec8d9..ccb839da63c4 100644
--- a/metadata/md5-cache/app-accessibility/flite-1.2-r1
+++ b/metadata/md5-cache/app-accessibility/flite-1.2-r1
@@ -3,8 +3,8 @@ DESCRIPTION=Flite text to speech engine
 HOMEPAGE=http://www.speech.cs.cmu.edu/flite/index.html
 IUSE=static
 KEYWORDS=~alpha amd64 hppa ppc sparc x86
-LICENSE=BSD as-is
+LICENSE=BSD freetts public-domain regexp-UofT BSD-2
 SLOT=0
 SRC_URI=http://www.speech.cs.cmu.edu/flite/packed/flite-1.2/flite-1.2-release.tar.bz2 http://www.speech.cs.cmu.edu/flite/packed/flite-1.2/flite_lexfix.tar.gz
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=20804fda582374030b25e461a9405d9e
+_md5_=619f93b18a07c002d9a422d8cf57fe2a
diff --git a/metadata/md5-cache/app-accessibility/flite-1.3 b/metadata/md5-cache/app-accessibility/flite-1.3
index 510025ac5307..6214cf78654a 100644
--- a/metadata/md5-cache/app-accessibility/flite-1.3
+++ b/metadata/md5-cache/app-accessibility/flite-1.3
@@ -3,8 +3,8 @@ DESCRIPTION=Flite text to speech engine
 HOMEPAGE=http://www.speech.cs.cmu.edu/flite/index.html
 IUSE=alsa static
 KEYWORDS=alpha amd64 -hppa ppc ppc64 sparc x86
-LICENSE=BSD as-is
+LICENSE=BSD freetts public-domain regexp-UofT BSD-2
 SLOT=0
 SRC_URI=http://www.speech.cs.cmu.edu/flite/packed/flite-1.3/flite-1.3-release.tar.gz
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=412ecda09b1f2ae509763bab763fb2d0
+_md5_=d8c0b683e8430fd221a8cf0f42d01264
diff --git a/metadata/md5-cache/app-accessibility/flite-1.4-r1 b/metadata/md5-cache/app-accessibility/flite-1.4-r1
index b80b567141a8..9262faa78895 100644
--- a/metadata/md5-cache/app-accessibility/flite-1.4-r1
+++ b/metadata/md5-cache/app-accessibility/flite-1.4-r1
@@ -5,9 +5,9 @@ EAPI=4
 HOMEPAGE=http://www.speech.cs.cmu.edu/flite/index.html
 IUSE=alsa oss static-libs
 KEYWORDS=~alpha ~amd64 -hppa ~ppc ~ppc64 ~sparc ~x86
-LICENSE=BSD as-is
+LICENSE=BSD freetts public-domain regexp-UofT BSD-2
 RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0.24.1 )
 SLOT=0
 SRC_URI=http://www.speech.cs.cmu.edu/flite/packed/flite-1.4/flite-1.4-release.tar.bz2
 _eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	eutils	d40dc948067bd3db1c8ebf7d51897313	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=0dc667007ae908e0710e7580a58e3e90
+_md5_=63f56a2ddbec2d36223a9336f83c27ee
diff --git a/metadata/md5-cache/app-accessibility/speech-tools-1.2.96_beta b/metadata/md5-cache/app-accessibility/speech-tools-1.2.96_beta
index 83d152ad6229..819ec55130c2 100644
--- a/metadata/md5-cache/app-accessibility/speech-tools-1.2.96_beta
+++ b/metadata/md5-cache/app-accessibility/speech-tools-1.2.96_beta
@@ -4,9 +4,9 @@ DESCRIPTION=Speech tools for Festival Text to Speech engine
 HOMEPAGE=http://www.cstr.ed.ac.uk/projects/speech_tools/
 IUSE=nas X
 KEYWORDS=alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd
-LICENSE=FESTIVAL BSD as-is
+LICENSE=FESTIVAL HPND BSD rc regexp-UofT
 RDEPEND=nas? ( media-libs/nas ) X? ( x11-libs/libX11 x11-libs/libXt ) !<app-accessibility/festival-1.96_beta !sys-power/powerman
 SLOT=0
 SRC_URI=http://www.festvox.org/packed/festival/latest/speech_tools-1.2.96-beta.tar.gz
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=3e882386be056e035b1d1f6bea1b0783
+_md5_=5498ef0532abff1ac4b61e719a0c54db
diff --git a/metadata/md5-cache/app-accessibility/speech-tools-1.2.96_beta-r2 b/metadata/md5-cache/app-accessibility/speech-tools-1.2.96_beta-r2
index 3376641473a9..b7ed9b8a6a06 100644
--- a/metadata/md5-cache/app-accessibility/speech-tools-1.2.96_beta-r2
+++ b/metadata/md5-cache/app-accessibility/speech-tools-1.2.96_beta-r2
@@ -5,9 +5,9 @@ EAPI=2
 HOMEPAGE=http://www.cstr.ed.ac.uk/projects/speech_tools/
 IUSE=nas X
 KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
-LICENSE=FESTIVAL BSD as-is
+LICENSE=FESTIVAL HPND BSD rc regexp-UofT
 RDEPEND=nas? ( media-libs/nas ) X? ( x11-libs/libX11 x11-libs/libXt ) !<app-accessibility/festival-1.96_beta !sys-power/powerman
 SLOT=0
 SRC_URI=http://www.festvox.org/packed/festival/1.96/speech_tools-1.2.96-beta.tar.gz mirror://gentoo/speech_tools-1.2.96-beta-patches.tar.gz
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=15b127c79707141c53129f0112a9a33e
+_md5_=8cc5b012f7aac071a0fb2583aacdba13
diff --git a/metadata/md5-cache/app-accessibility/speech-tools-2.0.95_beta b/metadata/md5-cache/app-accessibility/speech-tools-2.0.95_beta
index 8606a45d33c2..bf46d7db7523 100644
--- a/metadata/md5-cache/app-accessibility/speech-tools-2.0.95_beta
+++ b/metadata/md5-cache/app-accessibility/speech-tools-2.0.95_beta
@@ -5,9 +5,9 @@ EAPI=2
 HOMEPAGE=http://www.cstr.ed.ac.uk/projects/speech_tools/
 IUSE=nas X
 KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
-LICENSE=FESTIVAL BSD as-is
+LICENSE=FESTIVAL HPND BSD rc regexp-UofT
 RDEPEND=nas? ( media-libs/nas ) X? ( x11-libs/libX11 x11-libs/libXt ) !<app-accessibility/festival-1.96_beta !sys-power/powerman
 SLOT=0
 SRC_URI=http://www.festvox.org/packed/festival/2.0.95/speech_tools-2.0.95-beta.tar.gz mirror://gentoo/speech_tools-2.0.95-beta-patches.tar.gz
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=604ea2589cf2caafe943ec2dcd33b1c6
+_md5_=4f4c31d71c3d719f9d7c16f76e65653d
diff --git a/metadata/md5-cache/app-accessibility/speech-tools-2.1-r1 b/metadata/md5-cache/app-accessibility/speech-tools-2.1-r1
index fbadc9cfe282..f36d23e39d3b 100644
--- a/metadata/md5-cache/app-accessibility/speech-tools-2.1-r1
+++ b/metadata/md5-cache/app-accessibility/speech-tools-2.1-r1
@@ -5,9 +5,9 @@ EAPI=2
 HOMEPAGE=http://www.cstr.ed.ac.uk/projects/speech_tools/
 IUSE=nas X
 KEYWORDS=alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd
-LICENSE=FESTIVAL BSD as-is
+LICENSE=FESTIVAL HPND BSD rc regexp-UofT
 RDEPEND=nas? ( media-libs/nas ) X? ( x11-libs/libX11 x11-libs/libXt ) >=media-libs/alsa-lib-1.0.20-r1 !<app-accessibility/festival-1.96_beta !sys-power/powerman >=sys-libs/ncurses-5.6-r2
 SLOT=0
 SRC_URI=http://www.festvox.org/packed/festival/2.1/speech_tools-2.1-release.tar.gz mirror://gentoo/speech_tools-2.1-patches.tar.gz
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=8e21e2e8aaa45a7934ec7ffb9b63605e
+_md5_=d99c1dd45f2ac673ca028ca389d85153
diff --git a/metadata/md5-cache/app-accessibility/speech-tools-2.1-r2 b/metadata/md5-cache/app-accessibility/speech-tools-2.1-r2
index 7e8be06e4d71..02f55267f85b 100644
--- a/metadata/md5-cache/app-accessibility/speech-tools-2.1-r2
+++ b/metadata/md5-cache/app-accessibility/speech-tools-2.1-r2
@@ -5,9 +5,9 @@ EAPI=2
 HOMEPAGE=http://www.cstr.ed.ac.uk/projects/speech_tools/
 IUSE=nas X
 KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
-LICENSE=FESTIVAL BSD as-is
+LICENSE=FESTIVAL HPND BSD rc regexp-UofT
 RDEPEND=nas? ( media-libs/nas ) X? ( x11-libs/libX11 x11-libs/libXt ) >=media-libs/alsa-lib-1.0.20-r1 !<app-accessibility/festival-1.96_beta !sys-power/powerman >=sys-libs/ncurses-5.6-r2
 SLOT=0
 SRC_URI=http://www.festvox.org/packed/festival/2.1/speech_tools-2.1-release.tar.gz http://dev.gentoo.org/~neurogeek/speech-tools/speech_tools-2.1-r2-patches.tar.gz
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=fe20426f91c74a91005022baedd34b3a
+_md5_=4689d2c482dd0fd29591adf7a920b7c9
diff --git a/metadata/md5-cache/app-arch/xz-utils-5.0.4-r1 b/metadata/md5-cache/app-arch/xz-utils-5.0.4-r1
index 3143d1280b2c..b7cda4c2e97e 100644
--- a/metadata/md5-cache/app-arch/xz-utils-5.0.4-r1
+++ b/metadata/md5-cache/app-arch/xz-utils-5.0.4-r1
@@ -4,10 +4,10 @@ DESCRIPTION=utils for managing LZMA compressed files
 EAPI=4
 HOMEPAGE=http://tukaani.org/xz/
 IUSE=nls static-libs +threads
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-aix ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~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 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1
 RDEPEND=!<app-arch/lzma-4.63 !app-arch/lzma-utils !<app-arch/p7zip-4.57
 SLOT=0
 SRC_URI=http://tukaani.org/xz/xz-5.0.4.tar.gz
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=73291546f5f84a42c36019fbd91b419e
+_md5_=add58185e65646db831d05870ed68345
diff --git a/metadata/md5-cache/app-crypt/ccid-1.4.2 b/metadata/md5-cache/app-crypt/ccid-1.4.2
deleted file mode 100644
index 4ab4bbd06ec5..000000000000
--- a/metadata/md5-cache/app-crypt/ccid-1.4.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=sys-apps/pcsc-lite-1.6.5 usb? ( virtual/libusb:1 ) virtual/pkgconfig
-DESCRIPTION=CCID free software driver
-EAPI=3
-HOMEPAGE=http://pcsclite.alioth.debian.org/ccid.html
-IUSE=twinserial +usb
-KEYWORDS=amd64 arm hppa ~ppc ppc64 x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/pcsc-lite-1.6.5 usb? ( virtual/libusb:1 )
-SLOT=0
-SRC_URI=http://alioth.debian.org/download.php/3518/ccid-1.4.2.tar.bz2
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	udev	4f764d2b1e34e4ef12b9b0d6e680c0ee	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=90e8433e7058cf82e354f8482fc5a8b6
diff --git a/metadata/md5-cache/app-crypt/ccid-1.4.5 b/metadata/md5-cache/app-crypt/ccid-1.4.5
deleted file mode 100644
index 6ecc6758b6dc..000000000000
--- a/metadata/md5-cache/app-crypt/ccid-1.4.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=sys-apps/pcsc-lite-1.6.5 usb? ( virtual/libusb:1 ) virtual/pkgconfig
-DESCRIPTION=CCID free software driver
-EAPI=4
-HOMEPAGE=http://pcsclite.alioth.debian.org/ccid.html
-IUSE=twinserial +usb
-KEYWORDS=amd64 arm hppa ppc ppc64 x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/pcsc-lite-1.6.5 usb? ( virtual/libusb:1 )
-SLOT=0
-SRC_URI=http://alioth.debian.org/download.php/3672/ccid-1.4.5.tar.bz2
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	udev	4f764d2b1e34e4ef12b9b0d6e680c0ee	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=b6a4f68bea53d693795a6cc341558d12
diff --git a/metadata/md5-cache/app-crypt/mcrypt-2.6.8-r2 b/metadata/md5-cache/app-crypt/mcrypt-2.6.8-r2
index 3fa342d61fab..09142396ac63 100644
--- a/metadata/md5-cache/app-crypt/mcrypt-2.6.8-r2
+++ b/metadata/md5-cache/app-crypt/mcrypt-2.6.8-r2
@@ -4,10 +4,10 @@ DESCRIPTION=replacement of the old unix crypt(1)
 EAPI=2
 HOMEPAGE=http://mcrypt.sourceforge.net/
 IUSE=nls
-KEYWORDS=amd64 ~ppc ~sparc x86 ~x86-macos
+KEYWORDS=amd64 ~ppc sparc x86 ~x86-macos
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/libmcrypt-2.5.8 >=app-crypt/mhash-0.9.9 sys-libs/zlib
 SLOT=0
 SRC_URI=mirror://sourceforge/mcrypt/mcrypt-2.6.8.tar.gz
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=92533aa37bd7e60919b8e23dbe9dd12d
+_md5_=93138080dc1da349bf3768d94f7628f4
diff --git a/metadata/md5-cache/app-emulation/emul-linux-x86-baselibs-20121028 b/metadata/md5-cache/app-emulation/emul-linux-x86-baselibs-20121028
index c810b88f7a84..90535c903ad2 100644
--- a/metadata/md5-cache/app-emulation/emul-linux-x86-baselibs-20121028
+++ b/metadata/md5-cache/app-emulation/emul-linux-x86-baselibs-20121028
@@ -5,10 +5,10 @@ EAPI=4
 HOMEPAGE=http://dev.gentoo.org/~pacho/emul.html
 IUSE=development
 KEYWORDS=-* amd64
-LICENSE=Artistic GPL-1 GPL-2 GPL-3 BSD BSD-2 BZIP2 AFL-2.1 LGPL-2.1 BSD-4 MIT public-domain LGPL-3 LGPL-2 GPL-2-with-exceptions MPL-1.1 OPENLDAP Sleepycat UoI-NCSA ZLIB as-is openssl tcp_wrappers_license
+LICENSE=Artistic GPL-1 GPL-2 GPL-3 BSD BSD-2 BZIP2 AFL-2.1 LGPL-2.1 BSD-4 MIT public-domain LGPL-3 LGPL-2 GPL-2-with-exceptions MPL-1.1 OPENLDAP Sleepycat UoI-NCSA ZLIB openafs-krb5-a HPND ISC RSA IJG libmng libtiff openssl tcp_wrappers_license
 RDEPEND=!<app-emulation/emul-linux-x86-medialibs-10.2
 RESTRICT=strip
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~pacho/emul/emul-linux-x86-baselibs-20121028.tar.xz
 _eclasses_=emul-linux-x86	cd995126500762f062f4bc41f3ff229d	eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=81e2fcfa7ec11bacf677d3e5d1e4c921
+_md5_=b2dee38faef550c98a5a432c069a2558
diff --git a/metadata/md5-cache/app-emulation/emul-linux-x86-baselibs-20121202 b/metadata/md5-cache/app-emulation/emul-linux-x86-baselibs-20121202
index cdf250139d7b..68c3e8b8589c 100644
--- a/metadata/md5-cache/app-emulation/emul-linux-x86-baselibs-20121202
+++ b/metadata/md5-cache/app-emulation/emul-linux-x86-baselibs-20121202
@@ -5,10 +5,10 @@ EAPI=5
 HOMEPAGE=http://dev.gentoo.org/~pacho/emul.html
 IUSE=development
 KEYWORDS=-* amd64
-LICENSE=Artistic GPL-1 GPL-2 GPL-3 BSD BSD-2 BZIP2 AFL-2.1 LGPL-2.1 BSD-4 MIT public-domain LGPL-3 LGPL-2 GPL-2-with-exceptions MPL-1.1 OPENLDAP Sleepycat UoI-NCSA ZLIB as-is openssl tcp_wrappers_license
+LICENSE=Artistic GPL-1 GPL-2 GPL-3 BSD BSD-2 BZIP2 AFL-2.1 LGPL-2.1 BSD-4 MIT public-domain LGPL-3 LGPL-2 GPL-2-with-exceptions MPL-1.1 OPENLDAP Sleepycat UoI-NCSA ZLIB openafs-krb5-a HPND ISC RSA IJG libmng libtiff openssl tcp_wrappers_license
 RDEPEND=!<app-emulation/emul-linux-x86-medialibs-10.2 >=sys-libs/glibc-2.15
 RESTRICT=strip
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~pacho/emul/emul-linux-x86-baselibs-20121202.tar.xz
 _eclasses_=emul-linux-x86	cd995126500762f062f4bc41f3ff229d	eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=68af990040cb9a35f3731d3cb556eac6
+_md5_=810890bc0d78618de63322f226ac3284
diff --git a/metadata/md5-cache/app-misc/getopt-1.1.5 b/metadata/md5-cache/app-misc/getopt-1.1.5
new file mode 100644
index 000000000000..8e1e4d53cfc7
--- /dev/null
+++ b/metadata/md5-cache/app-misc/getopt-1.1.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=nls? ( virtual/libintl ) nls? ( sys-devel/gettext )
+DESCRIPTION=getopt(1) replacement supporting GNU-style long options
+EAPI=3
+HOMEPAGE=http://software.frodo.looijaard.name/getopt/
+IUSE=nls
+KEYWORDS=~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=nls? ( virtual/libintl )
+SLOT=0
+SRC_URI=http://software.frodo.looijaard.name/getopt/files/getopt-1.1.5.tar.gz
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=b128bd4debf405b9033b3220e005d137
diff --git a/metadata/md5-cache/app-misc/mc-4.8.7 b/metadata/md5-cache/app-misc/mc-4.8.7
new file mode 100644
index 000000000000..c285f46a456b
--- /dev/null
+++ b/metadata/md5-cache/app-misc/mc-4.8.7
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=>=dev-libs/glib-2.8:2 gpm? ( sys-libs/gpm ) kernel_linux? ( sys-fs/e2fsprogs ) samba? ( net-fs/samba ) sftp? ( net-libs/libssh2 ) slang? ( >=sys-libs/slang-2 ) !slang? ( sys-libs/ncurses ) spell? ( app-text/aspell ) X? ( x11-libs/libX11 x11-libs/libICE x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM ) app-arch/xz-utils virtual/pkgconfig nls? ( sys-devel/gettext ) test? ( dev-libs/check )
+DESCRIPTION=GNU Midnight Commander is a text based file manager
+EAPI=4
+HOMEPAGE=http://www.midnight-commander.org
+IUSE=+edit gpm mclib nls samba sftp +slang spell test X +xdg
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris
+LICENSE=GPL-3
+RDEPEND=>=dev-libs/glib-2.8:2 gpm? ( sys-libs/gpm ) kernel_linux? ( sys-fs/e2fsprogs ) samba? ( net-fs/samba ) sftp? ( net-libs/libssh2 ) slang? ( >=sys-libs/slang-2 ) !slang? ( sys-libs/ncurses ) spell? ( app-text/aspell ) X? ( x11-libs/libX11 x11-libs/libICE x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM )
+REQUIRED_USE=spell? ( edit )
+SLOT=0
+SRC_URI=http://www.midnight-commander.org/downloads/mc-4.8.7.tar.xz
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=c486e8a58500cbff858903b212b69e89
diff --git a/metadata/md5-cache/app-misc/tmux-1.7 b/metadata/md5-cache/app-misc/tmux-1.7
index 19018627aca6..0174b8e4704b 100644
--- a/metadata/md5-cache/app-misc/tmux-1.7
+++ b/metadata/md5-cache/app-misc/tmux-1.7
@@ -4,9 +4,9 @@ DESCRIPTION=Terminal multiplexer
 EAPI=4
 HOMEPAGE=http://tmux.sourceforge.net
 IUSE=vim-syntax
-KEYWORDS=~amd64 ~arm ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=ISC
 RDEPEND=>=dev-libs/libevent-2.0.10 sys-libs/ncurses vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/tmux/tmux-1.7.tar.gz
-_md5_=c82f39039054c10b19ecf9552044a35b
+_md5_=a6c4657fe33ae327700a05c64e428865
diff --git a/metadata/md5-cache/app-text/calibre-0.9.10 b/metadata/md5-cache/app-text/calibre-0.9.12
similarity index 94%
rename from metadata/md5-cache/app-text/calibre-0.9.10
rename to metadata/md5-cache/app-text/calibre-0.9.12
index f82a562b54e4..2f38f3eec2a0 100644
--- a/metadata/md5-cache/app-text/calibre-0.9.10
+++ b/metadata/md5-cache/app-text/calibre-0.9.12
@@ -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-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 x11-libs/qt-dbus:4 x11-libs/qt-svg:4 >=x11-misc/xdg-utils-1.0.2-r2 udisks? ( || ( sys-fs/udisks:2 sys-fs/udisks:0 ) ) =dev-lang/python-2.7* =dev-lang/python-2.7*[ssl,sqlite]
 SLOT=0
-SRC_URI=http://sourceforge.net/projects/calibre/files/0.9.10/calibre-0.9.10.tar.xz
+SRC_URI=http://sourceforge.net/projects/calibre/files/0.9.12/calibre-0.9.12.tar.xz
 _eclasses_=bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	d40dc948067bd3db1c8ebf7d51897313	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	multilib	9aa8a023e062fca0ba79362d9d0cc488	python	e5b3412fa9f03670a666c8a137bd1060	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=fb2c99db4d22bfded7c7e8b56f6f3ff9
+_md5_=59bb99ca8a4c3b6f656ef4085a89405c
diff --git a/metadata/md5-cache/dev-haskell/cgi-3001.1.8.2 b/metadata/md5-cache/dev-haskell/cgi-3001.1.8.2
index 83791dfafaa9..f867d28788eb 100644
--- a/metadata/md5-cache/dev-haskell/cgi-3001.1.8.2
+++ b/metadata/md5-cache/dev-haskell/cgi-3001.1.8.2
@@ -3,10 +3,10 @@ DEPEND=dev-haskell/monadcatchio-mtl >=dev-haskell/mtl-1.0 >=dev-haskell/network-
 DESCRIPTION=A library for writing CGI programs
 HOMEPAGE=http://andersk.mit.edu/haskell/cgi/
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~alpha ~amd64 ~ppc ~sparc ~x86
 LICENSE=BSD
 RDEPEND=dev-haskell/monadcatchio-mtl >=dev-haskell/mtl-1.0 >=dev-haskell/network-2.0 >=dev-haskell/parsec-2.0 >=dev-haskell/xhtml-3000.0.0 >=dev-lang/ghc-6.10.1 dev-lang/ghc
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/cgi/3001.1.8.2/cgi-3001.1.8.2.tar.gz
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	ghc-package	c50de19959be43d5c072ac4169f4dbfd	haskell-cabal	b4543046102ee4aec41502a7cb8fd6f2	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=4254151c0c59641a1bf0a51fe4f8e61a
+_md5_=bf677065b7c6ebf1d9f707500c29b75c
diff --git a/metadata/md5-cache/dev-haskell/hs-bibutils-4.15-r1 b/metadata/md5-cache/dev-haskell/hs-bibutils-4.15-r1
new file mode 100644
index 000000000000..9e504a149204
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/hs-bibutils-4.15-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prerm setup test
+DEPEND=dev-haskell/syb:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.4 doc? ( dev-haskell/haddock ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
+DESCRIPTION=Haskell bindings to bibutils, the bibliography conversion utilities.
+EAPI=5
+HOMEPAGE=http://gorgias.mine.nu/repos/hs-bibutils/
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-haskell/syb:=[profile?] >=dev-lang/ghc-6.10.4:= dev-lang/ghc
+SLOT=0/4.15
+SRC_URI=mirror://hackage/packages/archive/hs-bibutils/4.15/hs-bibutils-4.15.tar.gz
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	ghc-package	c50de19959be43d5c072ac4169f4dbfd	haskell-cabal	b4543046102ee4aec41502a7cb8fd6f2	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=62ea956825e55c6dd0f43e7c2fb09f2c
diff --git a/metadata/md5-cache/dev-libs/fribidi-0.19.5 b/metadata/md5-cache/dev-libs/fribidi-0.19.5
index ccf709eaf25d..9a9c0274870b 100644
--- a/metadata/md5-cache/dev-libs/fribidi-0.19.5
+++ b/metadata/md5-cache/dev-libs/fribidi-0.19.5
@@ -4,11 +4,11 @@ DESCRIPTION=A free implementation of the unicode bidirectional algorithm
 EAPI=4
 HOMEPAGE=http://fribidi.org/
 IUSE=static-libs
-KEYWORDS=~alpha amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/glib-2
 RESTRICT=test
 SLOT=0
 SRC_URI=http://fribidi.org/download/fribidi-0.19.5.tar.bz2
 _eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	eutils	d40dc948067bd3db1c8ebf7d51897313	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=abfb752cbd0e879d59e23ad8dc23a78b
+_md5_=7f768c36be54d19eacd937ba32ceafea
diff --git a/metadata/md5-cache/dev-libs/libgdata-0.13.2-r2 b/metadata/md5-cache/dev-libs/libgdata-0.13.2-r2
index 2e988020b60e..26880101afb0 100644
--- a/metadata/md5-cache/dev-libs/libgdata-0.13.2-r2
+++ b/metadata/md5-cache/dev-libs/libgdata-0.13.2-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=>=dev-libs/glib-2.31:2 >=dev-libs/libxml2-2:2 >=net-libs/liboauth-0.9.4 >=net-libs/libsoup-2.37.91:2.4[introspection?] >=x11-libs/gdk-pixbuf-2.14:2 gnome? ( app-crypt/gcr:= >=net-libs/gnome-online-accounts-3.2 >=net-libs/libsoup-gnome-2.37.91:2.4[introspection?] ) introspection? ( >=dev-libs/gobject-introspection-0.9.7 ) >=dev-util/gtk-doc-am-1.14 >=dev-util/intltool-0.40 virtual/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=>=dev-libs/glib-2.31:2 >=dev-libs/libxml2-2:2 >=net-libs/liboauth-0.9.4 >=net-libs/libsoup-2.37.91:2.4[introspection?] >=x11-libs/gdk-pixbuf-2.14:2 gnome? ( app-crypt/gcr:= >=net-libs/gnome-online-accounts-3.2 >=net-libs/libsoup-gnome-2.37.91:2.4[introspection?] ) introspection? ( >=dev-libs/gobject-introspection-0.9.7 ) >=dev-util/gtk-doc-am-1.14 >=dev-util/intltool-0.40 >=gnome-base/gnome-common-3.6 virtual/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=GLib-based library for accessing online service APIs using the GData protocol
 EAPI=5
 HOMEPAGE=http://live.gnome.org/libgdata
@@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/glib-2.31:2 >=dev-libs/libxml2-2:2 >=net-libs/liboauth-0.9.4
 SLOT=0/13
 SRC_URI=mirror://gnome/sources/libgdata/0.13/libgdata-0.13.2.tar.xz
 _eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	eutils	d40dc948067bd3db1c8ebf7d51897313	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	18cda077fa5f661f96aa70c192b4b4a5	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=10426f9eb5e71acfa4cd4982c9ec6d65
+_md5_=5ba62927bc1d3570cff0677248a5f454
diff --git a/metadata/md5-cache/dev-libs/nss-3.14 b/metadata/md5-cache/dev-libs/nss-3.14
index 88cd1a84211a..204db47de70b 100644
--- a/metadata/md5-cache/dev-libs/nss-3.14
+++ b/metadata/md5-cache/dev-libs/nss-3.14
@@ -4,10 +4,10 @@ DESCRIPTION=Mozilla's Network Security Services library that implements PKI supp
 EAPI=3
 HOMEPAGE=http://www.mozilla.org/projects/security/pki/nss/
 IUSE=utils
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( MPL-1.1 GPL-2 LGPL-2.1 )
 RDEPEND=>=dev-libs/nspr-4.9.2 >=dev-db/sqlite-3.5 sys-libs/zlib
 SLOT=0
 SRC_URI=ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_14_RTM/src/nss-3.14.tar.gz http://dev.gentoo.org/~anarchy/patches/nss-3.14-add_spi+cacerts_ca_certs.patch http://dev.gentoo.org/~anarchy/patches/nss-3.13.3_pem.support
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=6860fbcf984542aa3b69e082b50efd42
+_md5_=4ec6ffe41ba5997f874de73069ebb860
diff --git a/metadata/md5-cache/dev-perl/Devel-NYTProf-4.120.0 b/metadata/md5-cache/dev-perl/Devel-NYTProf-4.120.0
new file mode 100644
index 000000000000..782b2949f9e1
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Devel-NYTProf-4.120.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=virtual/perl-Getopt-Long dev-perl/JSON-Any test? ( virtual/perl-Scalar-List-Utils >=virtual/perl-Test-Simple-0.84 ) dev-lang/perl[-build]
+DESCRIPTION=Powerful feature-rich perl source code profiler
+EAPI=5
+HOMEPAGE=http://search.cpan.org/dist/Devel-NYTProf/
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
+RDEPEND=virtual/perl-Getopt-Long dev-perl/JSON-Any dev-lang/perl[-build]
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/T/TI/TIMB/Devel-NYTProf-4.12.tar.gz
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	825d3d7654c88c5c4dec7400d3612578	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=8bb13ac4a1070983cf8f23e24960d5ec
diff --git a/metadata/md5-cache/dev-perl/ExtUtils-XSpp-0.160.300 b/metadata/md5-cache/dev-perl/ExtUtils-XSpp-0.160.300
new file mode 100644
index 000000000000..08efcdd735d4
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/ExtUtils-XSpp-0.160.300
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=>=virtual/perl-Module-Build-0.400.0 test? ( dev-perl/Test-Differences dev-perl/Test-Base ) dev-lang/perl[-build]
+DESCRIPTION=XS for C++
+EAPI=5
+HOMEPAGE=http://search.cpan.org/dist/ExtUtils-XSpp/
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
+RDEPEND=>=virtual/perl-ExtUtils-ParseXS-2.22.02 dev-lang/perl[-build]
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/S/SM/SMUELLER/ExtUtils-XSpp-0.1603.tar.gz
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	825d3d7654c88c5c4dec7400d3612578	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=8f51f9078d15d37142a54271eb6ec952
diff --git a/metadata/md5-cache/dev-perl/Net-DNS-0.720.0 b/metadata/md5-cache/dev-perl/Net-DNS-0.720.0
new file mode 100644
index 000000000000..8f074bd909dc
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Net-DNS-0.720.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=virtual/perl-Digest-MD5 dev-perl/Digest-HMAC virtual/perl-Digest-SHA dev-perl/Net-IP virtual/perl-MIME-Base64 ipv6? ( dev-perl/IO-Socket-INET6 ) test? ( virtual/perl-Test-Simple dev-perl/Test-Pod ) dev-lang/perl[-build]
+DESCRIPTION=Perl Net::DNS - Perl DNS Resolver Module
+EAPI=5
+HOMEPAGE=http://search.cpan.org/dist/Net-DNS/
+IUSE=ipv6 test
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
+LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
+RDEPEND=virtual/perl-Digest-MD5 dev-perl/Digest-HMAC virtual/perl-Digest-SHA dev-perl/Net-IP virtual/perl-MIME-Base64 ipv6? ( dev-perl/IO-Socket-INET6 ) dev-lang/perl[-build]
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/N/NL/NLNETLABS/Net-DNS-0.72.tar.gz
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	825d3d7654c88c5c4dec7400d3612578	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=54ca541a98d2b563c839a81a421b06e3
diff --git a/metadata/md5-cache/dev-perl/Parallel-ForkManager-1.20.0 b/metadata/md5-cache/dev-perl/Parallel-ForkManager-1.20.0
index f1ebcb16ecdb..3afb3c173031 100644
--- a/metadata/md5-cache/dev-perl/Parallel-ForkManager-1.20.0
+++ b/metadata/md5-cache/dev-perl/Parallel-ForkManager-1.20.0
@@ -3,10 +3,10 @@ DEPEND=dev-lang/perl[-build]
 DESCRIPTION=A simple parallel processing fork manager
 EAPI=4
 HOMEPAGE=http://search.cpan.org/dist/Parallel-ForkManager/
-KEYWORDS=~alpha amd64 ia64 ~ppc ~sparc x86 ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ia64 ~ppc sparc x86 ~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/S/SZ/SZABGAB/Parallel-ForkManager-1.02.tar.gz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	825d3d7654c88c5c4dec7400d3612578	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=df7c066f324a028ce6fa5b9dea802885
+_md5_=19ccd7286a2a82ceb6dfa95bf1f5a947
diff --git a/metadata/md5-cache/dev-perl/ZMQ-Constants-1.20.0 b/metadata/md5-cache/dev-perl/ZMQ-Constants-1.20.0
new file mode 100644
index 000000000000..34bd50331f7d
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/ZMQ-Constants-1.20.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=net-libs/zeromq dev-lang/perl[-build]
+DESCRIPTION=Constants for libzmq
+EAPI=5
+HOMEPAGE=http://search.cpan.org/dist/ZMQ-Constants/
+KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
+RDEPEND=net-libs/zeromq dev-lang/perl[-build]
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/D/DM/DMAKI/ZMQ-Constants-1.02.tar.gz
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	825d3d7654c88c5c4dec7400d3612578	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=1c2839a9c37ab030bdf0de8d5eae41f5
diff --git a/metadata/md5-cache/dev-ruby/bluecloth-2.2.0 b/metadata/md5-cache/dev-ruby/bluecloth-2.2.0
index 5b5d6d11293f..bcfd68cf0cbf 100644
--- a/metadata/md5-cache/dev-ruby/bluecloth-2.2.0
+++ b/metadata/md5-cache/dev-ruby/bluecloth-2.2.0
@@ -4,11 +4,11 @@ DESCRIPTION=A Ruby implementation of Markdown
 EAPI=4
 HOMEPAGE=http://www.deveiate.org/projects/BlueCloth
 IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 doc test
-KEYWORDS=~alpha amd64 ~hppa ~ia64 ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+KEYWORDS=~alpha amd64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=BSD
 RDEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] )
 REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 )
 SLOT=0
 SRC_URI=mirror://rubygems/bluecloth-2.2.0.gem
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	java-utils-2	2d9eb3508fa5d6759e39354b74545567	multilib	9aa8a023e062fca0ba79362d9d0cc488	ruby-fakegem	2785c639b173dd603e95bd60b8d6c4c0	ruby-ng	10ca07a887e226622062d89bb959a175	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=230477db61440cef14debc86350a175a
+_md5_=675c2040c5c0d9a9477cb28e273c0f66
diff --git a/metadata/md5-cache/dev-ruby/minitest-3.5.0 b/metadata/md5-cache/dev-ruby/minitest-3.5.0
index 7986d2ba704d..d3bbbfb778fb 100644
--- a/metadata/md5-cache/dev-ruby/minitest-3.5.0
+++ b/metadata/md5-cache/dev-ruby/minitest-3.5.0
@@ -4,11 +4,11 @@ DESCRIPTION=minitest/unit is a small and fast replacement for ruby's huge and sl
 EAPI=4
 HOMEPAGE=https://github.com/seattlerb/minitest
 IUSE=elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 ruby_targets_jruby doc test test
-KEYWORDS=~alpha amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
 REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 ruby_targets_jruby )
 SLOT=0
 SRC_URI=mirror://rubygems/minitest-3.5.0.gem
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	java-utils-2	2d9eb3508fa5d6759e39354b74545567	multilib	9aa8a023e062fca0ba79362d9d0cc488	ruby-fakegem	2785c639b173dd603e95bd60b8d6c4c0	ruby-ng	10ca07a887e226622062d89bb959a175	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=83d5e3d88771e12740ed79c594332ac9
+_md5_=285fbfe81256f104b380fa7689a62463
diff --git a/metadata/md5-cache/dev-ruby/racc-1.4.8 b/metadata/md5-cache/dev-ruby/racc-1.4.8
index cbf858010abc..4cf10b7ad73a 100644
--- a/metadata/md5-cache/dev-ruby/racc-1.4.8
+++ b/metadata/md5-cache/dev-ruby/racc-1.4.8
@@ -4,11 +4,11 @@ DESCRIPTION=A LALR(1) parser generator for Ruby
 EAPI=4
 HOMEPAGE=http://www.loveruby.net/en/racc.html
 IUSE=doc test elibc_FreeBSD ruby_targets_ree18 ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_jruby doc test test
-KEYWORDS=~alpha amd64 ~arm ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1
 RDEPEND=ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
 REQUIRED_USE=|| ( ruby_targets_ree18 ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_jruby )
 SLOT=0
 SRC_URI=mirror://rubygems/racc-1.4.8.gem
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	java-utils-2	2d9eb3508fa5d6759e39354b74545567	multilib	9aa8a023e062fca0ba79362d9d0cc488	ruby-fakegem	2785c639b173dd603e95bd60b8d6c4c0	ruby-ng	10ca07a887e226622062d89bb959a175	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=f15830f6978f0a41dbb453071e0d2bf2
+_md5_=ceeab73306221caa9b04c313fbd04d4d
diff --git a/metadata/md5-cache/dev-ruby/tidy-ext-0.1.14 b/metadata/md5-cache/dev-ruby/tidy-ext-0.1.14
index de3bdff11ebd..4f5ee3bf2125 100644
--- a/metadata/md5-cache/dev-ruby/tidy-ext-0.1.14
+++ b/metadata/md5-cache/dev-ruby/tidy-ext-0.1.14
@@ -4,11 +4,11 @@ DESCRIPTION=W3C HTML Tidy library implemented as a Ruby extension.
 EAPI=4
 HOMEPAGE=http://github.com/carld/tidy
 IUSE=elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 doc test test
-KEYWORDS=~alpha amd64 ~hppa ~ia64 ~ppc ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~hppa ~ia64 ppc ppc64 ~sparc x86
 LICENSE=HTML-Tidy
 RDEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] )
 REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 )
 SLOT=0
 SRC_URI=mirror://rubygems/tidy-ext-0.1.14.gem
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	java-utils-2	2d9eb3508fa5d6759e39354b74545567	multilib	9aa8a023e062fca0ba79362d9d0cc488	ruby-fakegem	2785c639b173dd603e95bd60b8d6c4c0	ruby-ng	10ca07a887e226622062d89bb959a175	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=0887a3d081fe62cb4eb1d1131370e391
+_md5_=b350b421c3f926619afc049907da16f9
diff --git a/metadata/md5-cache/dev-ruby/yard-0.8.3 b/metadata/md5-cache/dev-ruby/yard-0.8.3
index 7f9730067015..677c8c3177cd 100644
--- a/metadata/md5-cache/dev-ruby/yard-0.8.3
+++ b/metadata/md5-cache/dev-ruby/yard-0.8.3
@@ -4,11 +4,11 @@ DESCRIPTION=Documentation generation tool for the Ruby programming language
 EAPI=4
 HOMEPAGE=http://yardoc.org/
 IUSE=elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 ruby_targets_jruby doc test test
-KEYWORDS=~alpha amd64 ~hppa ~ia64 ~ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
 REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 ruby_targets_jruby )
 SLOT=0
 SRC_URI=https://github.com/lsegal/yard/tarball/0.8.3 -> yard-0.8.3-git.tgz
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	java-utils-2	2d9eb3508fa5d6759e39354b74545567	multilib	9aa8a023e062fca0ba79362d9d0cc488	ruby-fakegem	2785c639b173dd603e95bd60b8d6c4c0	ruby-ng	10ca07a887e226622062d89bb959a175	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=333d0ec9fdf80c41b29c7c649d59ceb5
+_md5_=dad60f7a1e2bb9d490a858e6a04d7eab
diff --git a/metadata/md5-cache/dev-util/debootstrap-1.0.46 b/metadata/md5-cache/dev-util/debootstrap-1.0.46
new file mode 100644
index 000000000000..08df8b187089
--- /dev/null
+++ b/metadata/md5-cache/dev-util/debootstrap-1.0.46
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install postinst unpack
+DESCRIPTION=Debian/Ubuntu bootstrap scripts
+EAPI=4
+HOMEPAGE=http://packages.qa.debian.org/d/debootstrap.html
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86
+LICENSE=MIT
+RDEPEND=app-arch/dpkg net-misc/wget sys-devel/binutils
+SLOT=0
+SRC_URI=mirror://debian/pool/main/d/debootstrap/debootstrap_1.0.46.tar.gz mirror://gentoo/devices.tar.gz
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=d61085af13fb34bd350908207b9dbb12
diff --git a/metadata/md5-cache/dev-util/memprof-0.6.2 b/metadata/md5-cache/dev-util/memprof-0.6.2
deleted file mode 100644
index 5cf829bd76dd..000000000000
--- a/metadata/md5-cache/dev-util/memprof-0.6.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=>=x11-libs/gtk+-2.6:2 >=gnome-base/libglade-2 nls? ( dev-util/intltool sys-devel/gettext )
-DESCRIPTION=MemProf - Profiling and leak detection
-EAPI=2
-HOMEPAGE=http://www.secretlabs.de/projects/memprof/
-IUSE=nls
-KEYWORDS=~amd64 x86
-LICENSE=GPL-3
-RDEPEND=>=x11-libs/gtk+-2.6:2 >=gnome-base/libglade-2
-SLOT=0
-SRC_URI=http://www.secretlabs.de/projects/memprof/releases/memprof-0.6.2.tar.gz
-_md5_=b0ad2ff9e6c5901af7b9c6a3b8e9619f
diff --git a/metadata/md5-cache/dev-util/memprof-0.6.2-r1 b/metadata/md5-cache/dev-util/memprof-0.6.2-r1
index 9990b0f23ad6..30abc535b120 100644
--- a/metadata/md5-cache/dev-util/memprof-0.6.2-r1
+++ b/metadata/md5-cache/dev-util/memprof-0.6.2-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Profiling and leak detection tool
 EAPI=5
 HOMEPAGE=http://www.secretlabs.de/projects/memprof/
 IUSE=nls
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=dev-libs/glib:2 >=gnome-base/libglade-2 >=x11-libs/gtk+-2.6:2 nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=http://www.secretlabs.de/projects/memprof/releases/memprof-0.6.2.tar.gz
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=9c9e9a4f5df73da6ab0d7e2326a1dc77
+_md5_=2b4d3479976bf80f446876c742e78acc
diff --git a/metadata/md5-cache/dev-util/rbtools-0.4.2 b/metadata/md5-cache/dev-util/rbtools-0.4.2
index 80742072b61d..4daceaedc1bb 100644
--- a/metadata/md5-cache/dev-util/rbtools-0.4.2
+++ b/metadata/md5-cache/dev-util/rbtools-0.4.2
@@ -3,10 +3,10 @@ DEPEND==dev-lang/python-2*
 DESCRIPTION=Command line tools for use with Review Board
 EAPI=4
 HOMEPAGE=http://www.reviewboard.org/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=MIT
 RDEPEND==dev-lang/python-2*
 SLOT=0
 SRC_URI=http://downloads.reviewboard.org/releases/RBTools/0.4/RBTools-0.4.2.tar.gz
 _eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	python	e5b3412fa9f03670a666c8a137bd1060	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=8775ad852e2c5c1643a9e4c4a757bd4a
+_md5_=4efe7ce8241a6f242cce6d522753f5e4
diff --git a/metadata/md5-cache/dev-vcs/darcs-2.8.3-r1 b/metadata/md5-cache/dev-vcs/darcs-2.8.3-r1
index b5a40270932a..ccf95518a55e 100644
--- a/metadata/md5-cache/dev-vcs/darcs-2.8.3-r1
+++ b/metadata/md5-cache/dev-vcs/darcs-2.8.3-r1
@@ -10,4 +10,4 @@ RDEPEND==dev-haskell/extensible-exceptions-0.1*:=[profile?] >=dev-haskell/hashed
 SLOT=0/2.8.3
 SRC_URI=mirror://hackage/packages/archive/darcs/2.8.3/darcs-2.8.3.tar.gz
 _eclasses_=bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	d40dc948067bd3db1c8ebf7d51897313	ghc-package	c50de19959be43d5c072ac4169f4dbfd	haskell-cabal	b4543046102ee4aec41502a7cb8fd6f2	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=c8fea113011b07c8f5c2e3ccb1da33f4
+_md5_=b3207c02b6f7ee8cc4a1c0ca894ee02c
diff --git a/metadata/md5-cache/dev-vcs/subversion-1.7.7 b/metadata/md5-cache/dev-vcs/subversion-1.7.7
index 1c5b50b5ca3e..3af847006515 100644
--- a/metadata/md5-cache/dev-vcs/subversion-1.7.7
+++ b/metadata/md5-cache/dev-vcs/subversion-1.7.7
@@ -4,10 +4,10 @@ DESCRIPTION=Advanced version control system
 EAPI=3
 HOMEPAGE=http://subversion.apache.org/
 IUSE=apache2 berkdb ctypes-python debug doc +dso extras gnome-keyring java kde nls perl python ruby sasl vim-syntax +webdav-neon webdav-serf apache2 elibc_FreeBSD java
-KEYWORDS=~alpha amd64 ~arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-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 ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Subversion GPL-2
 RDEPEND=>=dev-db/sqlite-3.4 >=dev-libs/apr-1.3:1 >=dev-libs/apr-util-1.3:1 dev-libs/expat sys-libs/zlib berkdb? ( >=sys-libs/db-4.0.14 ) ctypes-python? ( =dev-lang/python-2* ) gnome-keyring? ( dev-libs/glib:2 sys-apps/dbus gnome-base/gnome-keyring ) kde? ( sys-apps/dbus x11-libs/qt-core:4 x11-libs/qt-dbus:4 x11-libs/qt-gui:4 >=kde-base/kdelibs-4:4 ) perl? ( dev-lang/perl ) python? ( =dev-lang/python-2* ) ruby? ( >=dev-lang/ruby-1.8.2:1.8 ) sasl? ( dev-libs/cyrus-sasl ) webdav-neon? ( >=net-libs/neon-0.28 ) webdav-serf? ( >=net-libs/serf-0.3.0 ) apache2? ( www-servers/apache[apache2_modules_dav] ) java? ( >=virtual/jre-1.5 ) kde? ( kde-base/kwalletd ) nls? ( virtual/libintl ) perl? ( dev-perl/URI ) apache2? ( =www-servers/apache-2* ) java? ( >=dev-java/java-config-2.1.9-r1 ) dev-lang/perl[-build]
 SLOT=0
 SRC_URI=mirror://apache/subversion/subversion-1.7.7.tar.bz2
 _eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	base	ec46b36a6f6fd1d0b505a33e0b74e413	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	db-use	2f5d6a2718559b90a51648d8ff58be83	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	elisp-common	cdb887d0e278ea6e82ea2a5d4792c52a	eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	2d9eb3508fa5d6759e39354b74545567	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	825d3d7654c88c5c4dec7400d3612578	python	e5b3412fa9f03670a666c8a137bd1060	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=8560f11615ac87ae395e08c14e7d5d86
+_md5_=dc0fccf1329a004242cd065686945b04
diff --git a/metadata/md5-cache/games-arcade/jardinains-2.0 b/metadata/md5-cache/games-arcade/jardinains-2.0
index 3f33745971aa..93aea79e4f19 100644
--- a/metadata/md5-cache/games-arcade/jardinains-2.0
+++ b/metadata/md5-cache/games-arcade/jardinains-2.0
@@ -9,4 +9,4 @@ RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://gentoo/JN2_1_FREE_LIN.tar.gz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	d40dc948067bd3db1c8ebf7d51897313	games	e0a83e3f3f024b8c8ef7a8217d716cbf	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=af620e2411525df8dc2a7d9b9a33d579
+_md5_=eb66c68c138f1fae9974196a78312c2e
diff --git a/metadata/md5-cache/games-fps/soldieroffortune-demo-0.57 b/metadata/md5-cache/games-fps/soldieroffortune-demo-0.57
index db1604cd0df8..4bbbd2229f4c 100644
--- a/metadata/md5-cache/games-fps/soldieroffortune-demo-0.57
+++ b/metadata/md5-cache/games-fps/soldieroffortune-demo-0.57
@@ -1,6 +1,7 @@
-DEFINED_PHASES=compile install postinst preinst setup unpack
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
 DEPEND=games-util/loki_patch
 DESCRIPTION=First-person shooter based on the mercenary trade
+EAPI=5
 HOMEPAGE=http://www.lokigames.com/products/sof/
 KEYWORDS=~amd64 ~x86
 LICENSE=LOKI-EULA
@@ -9,4 +10,4 @@ RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://lokigames/loki_demos/sof-demo.run
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	d40dc948067bd3db1c8ebf7d51897313	games	e0a83e3f3f024b8c8ef7a8217d716cbf	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	unpacker	50e1227854e96469a19a63f053496328	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=f1f38859b827867590104398115d14ea
+_md5_=6b5f474bb7f9bec5aa34de05d188c3a4
diff --git a/metadata/md5-cache/games-server/nwn-ded-1.69 b/metadata/md5-cache/games-server/nwn-ded-1.69
index db55dc738c77..23a6212e5a5e 100644
--- a/metadata/md5-cache/games-server/nwn-ded-1.69
+++ b/metadata/md5-cache/games-server/nwn-ded-1.69
@@ -10,4 +10,4 @@ RESTRICT=mirror strip
 SLOT=0
 SRC_URI=http://files.bioware.com/neverwinternights/updates/windows/server/NWNDedicatedServer1.69.zip linguas_en? ( http://files.bioware.com/neverwinternights/dialog//english/NWNEnglish1.69dialog.zip )
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	d40dc948067bd3db1c8ebf7d51897313	games	e0a83e3f3f024b8c8ef7a8217d716cbf	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=17f0085d56d1672f04c2fa1ad785491e
+_md5_=0a74b5831b204966dba1be26ebb23120
diff --git a/metadata/md5-cache/games-strategy/megaglest-3.7.1 b/metadata/md5-cache/games-strategy/megaglest-3.7.1
index 3ee9627663c9..a2a4747d53b3 100644
--- a/metadata/md5-cache/games-strategy/megaglest-3.7.1
+++ b/metadata/md5-cache/games-strategy/megaglest-3.7.1
@@ -4,11 +4,11 @@ DESCRIPTION=Cross-platform 3D realtime strategy game
 EAPI=4
 HOMEPAGE=http://www.megaglest.org/
 IUSE=debug +editor sse sse2 sse3 static +streflop +tools +unicode wxuniversal +model-viewer videos
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3 BitstreamVera
 PDEPEND=~games-strategy/megaglest-data-3.7.1
 RDEPEND=>=dev-lang/lua-5.1 dev-libs/libxml2 media-libs/fontconfig media-libs/freetype media-libs/libsdl[X,audio,joystick,opengl,video] media-libs/libvorbis media-libs/openal net-libs/gnutls >=net-libs/libircclient-1.6-r1 sys-libs/zlib virtual/opengl virtual/glu x11-libs/libX11 x11-libs/libXext editor? ( x11-libs/wxGTK:2.8[X,opengl] ) model-viewer? ( x11-libs/wxGTK:2.8[X] ) !static? ( dev-libs/xerces-c[icu] media-libs/ftgl media-libs/glew media-libs/libogg media-libs/libpng:0 net-libs/miniupnpc net-misc/curl virtual/jpeg ) videos? ( media-video/vlc )
 SLOT=0
 SRC_URI=mirror://sourceforge/megaglest/megaglest-source-3.7.1.tar.xz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	341ea44ed97a940b6ff74283ed5b94d7	eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	games	e0a83e3f3f024b8c8ef7a8217d716cbf	gnome2-utils	794d2847b4af390a1e020924876c8297	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	virtualx	73cfc129b4b9ba23aed1abb10c825d86	wxwidgets	fb1a306837717dfa2af841ecdf929565
-_md5_=f03be3b0ef6c8c6d910769557d9f68d8
+_md5_=caf07bdfe09028f1aa561a6bee42f5e5
diff --git a/metadata/md5-cache/games-strategy/megaglest-data-3.7.1-r1 b/metadata/md5-cache/games-strategy/megaglest-data-3.7.1-r1
index c561c26f1884..31cbcfe8ef28 100644
--- a/metadata/md5-cache/games-strategy/megaglest-data-3.7.1-r1
+++ b/metadata/md5-cache/games-strategy/megaglest-data-3.7.1-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Data files for the cross-platform 3D realtime strategy game MegaGles
 EAPI=4
 HOMEPAGE=http://www.megaglest.org/
 IUSE=doc
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=CCPL-Attribution-ShareAlike-3.0
 RDEPEND=~games-strategy/megaglest-3.7.1
 SLOT=0
 SRC_URI=mirror://sourceforge/megaglest/megaglest-data-3.7.1.tar.xz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	341ea44ed97a940b6ff74283ed5b94d7	eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	games	e0a83e3f3f024b8c8ef7a8217d716cbf	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=8bbe082d46ebcd812bf74646b8fe655e
+_md5_=aebbcffdf5e1e6f3e6368cbcdf904f7e
diff --git a/metadata/md5-cache/gnome-base/gdm-3.6.2 b/metadata/md5-cache/gnome-base/gdm-3.6.2
index 676e785ce8ad..0336ee26ad2f 100644
--- a/metadata/md5-cache/gnome-base/gdm-3.6.2
+++ b/metadata/md5-cache/gnome-base/gdm-3.6.2
@@ -10,4 +10,4 @@ RDEPEND=app-text/iso-codes >=dev-libs/glib-2.33.2:2 >=x11-libs/gtk+-2.91.1:3 dev
 SLOT=0
 SRC_URI=mirror://gnome/sources/gdm/3.6/gdm-3.6.2.tar.xz http://dev.gentoo.org/~tetromino/distfiles/gdm/gdm-gentoo-2012.09.25.tar.xz
 _eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	eutils	d40dc948067bd3db1c8ebf7d51897313	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	61ad55e732e494378165e7dcd4744b91	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	18cda077fa5f661f96aa70c192b4b4a5	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	systemd	94264c6516a1a0c2059c7fc6eed21fe4	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=2d4953552e3473f076e38dbc0cfa0688
+_md5_=19f974855eedb6e3561bb83ec6e93d5a
diff --git a/metadata/md5-cache/gnustep-base/gnustep-base-1.24.0-r1 b/metadata/md5-cache/gnustep-base/gnustep-base-1.24.0-r1
index eb882336677d..0d6a15c7f19a 100644
--- a/metadata/md5-cache/gnustep-base/gnustep-base-1.24.0-r1
+++ b/metadata/md5-cache/gnustep-base/gnustep-base-1.24.0-r1
@@ -10,4 +10,4 @@ RDEPEND=doc? ( virtual/texi2dvi dev-tex/latex2html app-text/texi2html ) >=gnuste
 SLOT=0
 SRC_URI=ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-base-1.24.0.tar.gz
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	gnustep-base	87d599af9a09a523d6d233e462f3758e	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=9cfa841aa5e32d378ffba0986731f1fe
+_md5_=c3a7509b250694113ba88ddd30ab7382
diff --git a/metadata/md5-cache/mail-client/claws-mail-3.9.0 b/metadata/md5-cache/mail-client/claws-mail-3.9.0
index df849c0eeca1..ccf332a42bcf 100644
--- a/metadata/md5-cache/mail-client/claws-mail-3.9.0
+++ b/metadata/md5-cache/mail-client/claws-mail-3.9.0
@@ -4,10 +4,10 @@ DESCRIPTION=An email client (and news reader) based on GTK+
 EAPI=4
 HOMEPAGE=http://www.claws-mail.org/
 IUSE=bogofilter crypt dbus dillo doc +imap ipv6 ldap nntp pda session smime spamassassin spell +ssl startup-notification xface
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~hppa ~mips ppc ppc64 ~sparc x86 ~x86-fbsd
 LICENSE=GPL-3
 RDEPEND=>=x11-libs/gtk+-2.20:2 pda? ( >=app-pda/jpilot-0.99 ) ssl? ( >=net-libs/gnutls-2.2.0 ) ldap? ( >=net-nds/openldap-2.0.7 ) crypt? ( >=app-crypt/gpgme-0.4.5 ) dbus? ( >=dev-libs/dbus-glib-0.60 ) dillo? ( www-client/dillo ) spell? ( >=app-text/enchant-1.0.0 ) imap? ( >=net-libs/libetpan-0.57 ) nntp? ( >=net-libs/libetpan-0.57 ) startup-notification? ( x11-libs/startup-notification ) bogofilter? ( mail-filter/bogofilter ) session? ( x11-libs/libSM x11-libs/libICE ) smime? ( >=app-crypt/gpgme-0.4.5 ) app-misc/mime-types x11-misc/shared-mime-info
 SLOT=0
 SRC_URI=mirror://sourceforge/sylpheed-claws/claws-mail-3.9.0.tar.bz2
 _eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	autotools-utils	f4dc5b0e643575b9bd31a2bd7deeee31	eutils	d40dc948067bd3db1c8ebf7d51897313	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=e0145854a2de06a4501f2facb61bf915
+_md5_=0c9c3a7f4777ea63e81d0b1e867df0fe
diff --git a/metadata/md5-cache/mail-client/claws-mail-acpi-notifier-1.0.28 b/metadata/md5-cache/mail-client/claws-mail-acpi-notifier-1.0.28
index 4154e8ce127b..a5498f9cece7 100644
--- a/metadata/md5-cache/mail-client/claws-mail-acpi-notifier-1.0.28
+++ b/metadata/md5-cache/mail-client/claws-mail-acpi-notifier-1.0.28
@@ -2,10 +2,10 @@ DEFINED_PHASES=install postinst
 DEPEND=>=mail-client/claws-mail-3.9.0 virtual/pkgconfig
 DESCRIPTION=This plugin enables mail notification via LEDs on some laptops.
 HOMEPAGE=http://www.claws-mail.org/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=>=mail-client/claws-mail-3.9.0
 SLOT=0
 SRC_URI=http://www.claws-mail.org/downloads/plugins/acpi_notifier-1.0.28.tar.gz
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=37e13782cefe178403d47462c152a240
+_md5_=9bb5d85f4fd97f4fc63f92cf12131bf3
diff --git a/metadata/md5-cache/mail-client/claws-mail-address_keeper-1.0.7 b/metadata/md5-cache/mail-client/claws-mail-address_keeper-1.0.7
index a223ff19be0d..8679cc29e14d 100644
--- a/metadata/md5-cache/mail-client/claws-mail-address_keeper-1.0.7
+++ b/metadata/md5-cache/mail-client/claws-mail-address_keeper-1.0.7
@@ -2,10 +2,10 @@ DEFINED_PHASES=install
 DEPEND=>=mail-client/claws-mail-3.9.0 virtual/pkgconfig
 DESCRIPTION=Plugin for Claws to collect all recipients in an address book folder
 HOMEPAGE=http://www.claws-mail.org/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=>=mail-client/claws-mail-3.9.0
 SLOT=0
 SRC_URI=http://www.claws-mail.org/downloads/plugins/address_keeper-1.0.7.tar.gz
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=308de8c499aa8bc46b07f9dd306c0dac
+_md5_=46bc31ea6d6f8d646dd18241a5bb29ee
diff --git a/metadata/md5-cache/mail-client/claws-mail-archive-0.6.13 b/metadata/md5-cache/mail-client/claws-mail-archive-0.6.13
index 1ea6a0a9ff45..ac3faa55c67a 100644
--- a/metadata/md5-cache/mail-client/claws-mail-archive-0.6.13
+++ b/metadata/md5-cache/mail-client/claws-mail-archive-0.6.13
@@ -2,10 +2,10 @@ DEFINED_PHASES=install
 DEPEND=>=mail-client/claws-mail-3.9.0 app-arch/libarchive >=net-misc/curl-7.9.7 virtual/pkgconfig
 DESCRIPTION=Plugin for Claws to add archiving features
 HOMEPAGE=http://www.claws-mail.org/
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-3
 RDEPEND=>=mail-client/claws-mail-3.9.0 app-arch/libarchive >=net-misc/curl-7.9.7
 SLOT=0
 SRC_URI=http://www.claws-mail.org/downloads/plugins/archive-0.6.13.tar.gz
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=31834056b5afed8d1834b16dc5ab2095
+_md5_=f9984d526f1e1c08a01c73cfd2b7f5a8
diff --git a/metadata/md5-cache/mail-client/claws-mail-att-remover-1.0.15 b/metadata/md5-cache/mail-client/claws-mail-att-remover-1.0.15
index 0ec31efdf252..0df696835273 100644
--- a/metadata/md5-cache/mail-client/claws-mail-att-remover-1.0.15
+++ b/metadata/md5-cache/mail-client/claws-mail-att-remover-1.0.15
@@ -2,10 +2,10 @@ DEFINED_PHASES=install
 DEPEND=>=mail-client/claws-mail-3.9.0 virtual/pkgconfig
 DESCRIPTION=This plugin lets you remove attachments from mails.
 HOMEPAGE=http://www.claws-mail.org/
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~ppc ppc64 x86
 LICENSE=GPL-3
 RDEPEND=>=mail-client/claws-mail-3.9.0
 SLOT=0
 SRC_URI=http://www.claws-mail.org/downloads/plugins/att_remover-1.0.15.tar.gz
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=d85dc4aa28363c5eb8f1a93116037f04
+_md5_=0f3b3edce711f28a2016dd12e72911c3
diff --git a/metadata/md5-cache/mail-client/claws-mail-attachwarner-1.0 b/metadata/md5-cache/mail-client/claws-mail-attachwarner-1.0
index e1f476525d95..b3a456ddaf89 100644
--- a/metadata/md5-cache/mail-client/claws-mail-attachwarner-1.0
+++ b/metadata/md5-cache/mail-client/claws-mail-attachwarner-1.0
@@ -3,9 +3,9 @@ DEPEND=>=mail-client/claws-mail-3.9.0 nls? ( >=sys-devel/gettext-0.12.1 ) virtua
 DESCRIPTION=Warn about missing attachment, if it's mentioned in message body.
 HOMEPAGE=http://www.claws-mail.org/
 IUSE=nls
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-3
 RDEPEND=>=mail-client/claws-mail-3.9.0 nls? ( >=sys-devel/gettext-0.12.1 )
 SLOT=0
 SRC_URI=http://www.claws-mail.org/downloads/plugins/attachwarner-1.0.tar.gz
-_md5_=d4b262b9e9c0538a9e61cae68a9b5ba5
+_md5_=276bff012d5201434b19b9dd79935be0
diff --git a/metadata/md5-cache/mail-client/claws-mail-clamd-3.5.5 b/metadata/md5-cache/mail-client/claws-mail-clamd-3.5.5
index 4f3427231e07..9d33ba48292a 100644
--- a/metadata/md5-cache/mail-client/claws-mail-clamd-3.5.5
+++ b/metadata/md5-cache/mail-client/claws-mail-clamd-3.5.5
@@ -2,10 +2,10 @@ DEFINED_PHASES=install
 DEPEND=>=mail-client/claws-mail-3.9.0 app-antivirus/clamav virtual/pkgconfig
 DESCRIPTION=Plugin for Claws to scan for viruses
 HOMEPAGE=http://www.claws-mail.org/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=>=mail-client/claws-mail-3.9.0
 SLOT=0
 SRC_URI=http://www.claws-mail.org/downloads/plugins/clamd-3.5.5.tar.gz
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=15dd44df60c456b651ccd61b30b5d8c1
+_md5_=a496c76aefc85c8d3441fe5103bd5072
diff --git a/metadata/md5-cache/mail-client/claws-mail-fancy-0.9.17 b/metadata/md5-cache/mail-client/claws-mail-fancy-0.9.17
index aae7ef0a08a6..c7e08ca43cd7 100644
--- a/metadata/md5-cache/mail-client/claws-mail-fancy-0.9.17
+++ b/metadata/md5-cache/mail-client/claws-mail-fancy-0.9.17
@@ -3,9 +3,9 @@ DEPEND=>=mail-client/claws-mail-3.9.0 >=net-libs/webkit-gtk-1.0:2 virtual/pkgcon
 DESCRIPTION=Plugin to display HTML with Webkit
 EAPI=3
 HOMEPAGE=http://www.claws-mail.org/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=>=mail-client/claws-mail-3.9.0 >=net-libs/webkit-gtk-1.0:2
 SLOT=0
 SRC_URI=http://www.claws-mail.org/downloads/plugins/fancy-0.9.17.tar.gz
-_md5_=236c4e3434176667dbd7aa8b2920516e
+_md5_=868211e76cdfc92d35495e7204973fdc
diff --git a/metadata/md5-cache/mail-client/claws-mail-fetchinfo-0.4.25 b/metadata/md5-cache/mail-client/claws-mail-fetchinfo-0.4.25
index 8c9e97fc3210..a1f5c385d82b 100644
--- a/metadata/md5-cache/mail-client/claws-mail-fetchinfo-0.4.25
+++ b/metadata/md5-cache/mail-client/claws-mail-fetchinfo-0.4.25
@@ -1,10 +1,10 @@
 DEFINED_PHASES=install
-DEPEND=>=mail-client/claws-mail-3.8.1 virtual/pkgconfig
+DEPEND=>=mail-client/claws-mail-3.9.0 virtual/pkgconfig
 DESCRIPTION=Plugin to add additional headers with download information
 HOMEPAGE=http://www.claws-mail.org/
 KEYWORDS=amd64 ~ppc ppc64 x86
 LICENSE=GPL-3
-RDEPEND=>=mail-client/claws-mail-3.8.1
+RDEPEND=>=mail-client/claws-mail-3.9.0
 SLOT=0
 SRC_URI=http://www.claws-mail.org/downloads/plugins/fetchinfo-plugin-0.4.25.tar.gz
-_md5_=09a0ad0c8c24705e0d192eae37509916
+_md5_=7980f466881d0986854245cdb2facb87
diff --git a/metadata/md5-cache/mail-client/claws-mail-gdata-0.5 b/metadata/md5-cache/mail-client/claws-mail-gdata-0.5
index 8d4b33135511..148a7bafd80f 100644
--- a/metadata/md5-cache/mail-client/claws-mail-gdata-0.5
+++ b/metadata/md5-cache/mail-client/claws-mail-gdata-0.5
@@ -3,10 +3,10 @@ DEPEND=>=mail-client/claws-mail-3.9.0 >=dev-libs/libgdata-0.6.4 virtual/pkgconfi
 DESCRIPTION=Plugin for Claws to use Google data providers
 EAPI=4
 HOMEPAGE=http://www.claws-mail.org/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=>=mail-client/claws-mail-3.9.0 >=dev-libs/libgdata-0.6.4
 SLOT=0
 SRC_URI=http://www.claws-mail.org/downloads/plugins/gdata_plugin-0.5.tar.gz
 _eclasses_=multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4
-_md5_=6326deb96ec96c34e54864e314bcdc77
+_md5_=361ce24f3b2fa001ecab3dc5d426f289
diff --git a/metadata/md5-cache/mail-client/claws-mail-mailmbox-1.15 b/metadata/md5-cache/mail-client/claws-mail-mailmbox-1.15
index f643ba3138d8..b1765f8c141d 100644
--- a/metadata/md5-cache/mail-client/claws-mail-mailmbox-1.15
+++ b/metadata/md5-cache/mail-client/claws-mail-mailmbox-1.15
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
 DEPEND=>=mail-client/claws-mail-3.9.0 virtual/pkgconfig
 DESCRIPTION=Plugin to operate on mbox type mailboxes
 HOMEPAGE=http://www.claws-mail.org/
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ppc ppc64 ~sparc x86
 LICENSE=GPL-3
 RDEPEND=>=mail-client/claws-mail-3.9.0
 SLOT=0
 SRC_URI=http://www.claws-mail.org/downloads/plugins/mailmbox-1.15.tar.gz
-_md5_=f60e0fbf4cf160c0362c31ed186f2e55
+_md5_=f42fc200477a14a412b22b494977cd3d
diff --git a/metadata/md5-cache/mail-client/claws-mail-newmail-0.0.16 b/metadata/md5-cache/mail-client/claws-mail-newmail-0.0.16
index 6d2074573c1b..166f9d8e4401 100644
--- a/metadata/md5-cache/mail-client/claws-mail-newmail-0.0.16
+++ b/metadata/md5-cache/mail-client/claws-mail-newmail-0.0.16
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
 DEPEND=>=mail-client/claws-mail-3.9.0 virtual/pkgconfig
 DESCRIPTION=Plugin which writes a header summary to a log file for each received mail
 HOMEPAGE=http://www.claws-mail.org/
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-3
 RDEPEND=>=mail-client/claws-mail-3.9.0
 SLOT=0
 SRC_URI=http://www.claws-mail.org/downloads/plugins/newmail-0.0.16.tar.gz
-_md5_=922e2f9370600fdf0ff8a74f4024bc81
+_md5_=9e6bba544de430dd75aa7fbb53117b13
diff --git a/metadata/md5-cache/mail-client/claws-mail-notification-0.31 b/metadata/md5-cache/mail-client/claws-mail-notification-0.31
index 7648aa083fa3..7ffd24e52553 100644
--- a/metadata/md5-cache/mail-client/claws-mail-notification-0.31
+++ b/metadata/md5-cache/mail-client/claws-mail-notification-0.31
@@ -4,10 +4,10 @@ DESCRIPTION=Plugin providing various ways to notify user of new and unread mail
 EAPI=4
 HOMEPAGE=http://www.claws-mail.org/
 IUSE=libnotify
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ppc x86
 LICENSE=GPL-3
 RDEPEND=>=mail-client/claws-mail-3.9.0 >=x11-libs/gtk+-2.10:2 libnotify? ( x11-libs/libnotify )
 SLOT=0
 SRC_URI=http://www.claws-mail.org/downloads/plugins/notification_plugin-0.31.tar.gz
 _eclasses_=multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4
-_md5_=be92c4885cfdb4b3461f2b31f2dd3f58
+_md5_=c93f8d79a198199b8b8ccdb7734e5b92
diff --git a/metadata/md5-cache/mail-client/claws-mail-pdf-viewer-0.9.3 b/metadata/md5-cache/mail-client/claws-mail-pdf-viewer-0.9.3
index 69456a8a63cc..efa1be3458a2 100644
--- a/metadata/md5-cache/mail-client/claws-mail-pdf-viewer-0.9.3
+++ b/metadata/md5-cache/mail-client/claws-mail-pdf-viewer-0.9.3
@@ -2,10 +2,10 @@ DEFINED_PHASES=install
 DEPEND=>=mail-client/claws-mail-3.9.0 app-text/poppler virtual/pkgconfig
 DESCRIPTION=A plugin for Claws to display PDF files directly
 HOMEPAGE=http://www.claws-mail.org/
-KEYWORDS=~x86
+KEYWORDS=x86
 LICENSE=GPL-3
 RDEPEND=app-text/ghostscript-gpl
 SLOT=0
 SRC_URI=http://www.claws-mail.org/downloads/plugins/pdf_viewer-0.9.3.tar.gz
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=e0e0468130464b528eb2ffab378a5607
+_md5_=4e20f40dee932e049b4b0c09ed1fe990
diff --git a/metadata/md5-cache/mail-client/claws-mail-perl-0.9.20 b/metadata/md5-cache/mail-client/claws-mail-perl-0.9.20
index eeb5fc9eb5af..2f31e45da9d6 100644
--- a/metadata/md5-cache/mail-client/claws-mail-perl-0.9.20
+++ b/metadata/md5-cache/mail-client/claws-mail-perl-0.9.20
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install postinst
 DEPEND=>=mail-client/claws-mail-3.9.0 dev-lang/perl virtual/pkgconfig
 DESCRIPTION=Plugin to use perl to write filtering rules
 HOMEPAGE=http://www.claws-mail.org
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~ppc ppc64 x86
 LICENSE=GPL-3
 RDEPEND=>=mail-client/claws-mail-3.9.0 dev-lang/perl
 SLOT=0
 SRC_URI=http://www.claws-mail.org/downloads/plugins/perl_plugin-0.9.20.tar.gz
-_md5_=fc56050637e0ba4aeed9b6fc59dc357b
+_md5_=3a8d9e556b48eec9d352632a0251bbad
diff --git a/metadata/md5-cache/mail-client/claws-mail-python-0.11 b/metadata/md5-cache/mail-client/claws-mail-python-0.11
index 59001e6bb9b6..86cdc91e1870 100644
--- a/metadata/md5-cache/mail-client/claws-mail-python-0.11
+++ b/metadata/md5-cache/mail-client/claws-mail-python-0.11
@@ -3,10 +3,10 @@ DEPEND=>=mail-client/claws-mail-3.9.0 >=dev-lang/python-2.5 >=dev-python/pygtk-2
 DESCRIPTION=Plugin to integrate with Python
 EAPI=4
 HOMEPAGE=http://www.claws-mail.org/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=>=mail-client/claws-mail-3.9.0 >=dev-lang/python-2.5 >=dev-python/pygtk-2.10.3
 SLOT=0
 SRC_URI=http://www.claws-mail.org/downloads/plugins/python_plugin-0.11.tar.gz
 _eclasses_=multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4
-_md5_=7445bc13dc9e4d7a8a5eb1da04c13c06
+_md5_=dec33e6be90995d065fb2ec1a629ec71
diff --git a/metadata/md5-cache/mail-client/claws-mail-rssyl-0.34 b/metadata/md5-cache/mail-client/claws-mail-rssyl-0.34
index 65c55f365e0c..5864afe323de 100644
--- a/metadata/md5-cache/mail-client/claws-mail-rssyl-0.34
+++ b/metadata/md5-cache/mail-client/claws-mail-rssyl-0.34
@@ -4,10 +4,10 @@ DESCRIPTION=Read your favorite newsfeeds in Claws Mail. RSS 1.0, 2.0 and Atom fe
 EAPI=4
 HOMEPAGE=http://www.claws-mail.org/
 IUSE=nls
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=~alpha amd64 ppc ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=mail-client/claws-mail-3.9.0 net-misc/curl dev-libs/libxml2 nls? ( >=sys-devel/gettext-0.12.1 )
 SLOT=0
 SRC_URI=http://www.claws-mail.org/downloads/plugins/rssyl-0.34.tar.gz
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=2cf7ac3ede436d348c9710275241525d
+_md5_=c31f1ca7b1ff978c54c9e94db060b85a
diff --git a/metadata/md5-cache/mail-client/claws-mail-spam-report-0.3.17 b/metadata/md5-cache/mail-client/claws-mail-spam-report-0.3.17
index 467d22a6866e..ca9433eb9448 100644
--- a/metadata/md5-cache/mail-client/claws-mail-spam-report-0.3.17
+++ b/metadata/md5-cache/mail-client/claws-mail-spam-report-0.3.17
@@ -3,10 +3,10 @@ DEPEND=>=mail-client/claws-mail-3.9.0 >=net-misc/curl-7.9.7 virtual/pkgconfig
 DESCRIPTION=Plugin for Claws to report spam to various places
 EAPI=4
 HOMEPAGE=http://www.claws-mail.org/
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-3
 RDEPEND=>=mail-client/claws-mail-3.9.0 >=net-misc/curl-7.9.7
 SLOT=0
 SRC_URI=http://www.claws-mail.org/downloads/plugins/spam_report-0.3.17.tar.gz
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=afc3f568b08831ccab80180aef9ad5b9
+_md5_=40fbb827bb404289b701ea9c2c245558
diff --git a/metadata/md5-cache/mail-client/claws-mail-tnef-parse-0.3.14 b/metadata/md5-cache/mail-client/claws-mail-tnef-parse-0.3.14
index 570be1ff0b46..a772fadd24a1 100644
--- a/metadata/md5-cache/mail-client/claws-mail-tnef-parse-0.3.14
+++ b/metadata/md5-cache/mail-client/claws-mail-tnef-parse-0.3.14
@@ -3,10 +3,10 @@ DEPEND=>=mail-client/claws-mail-3.9.0 virtual/pkgconfig
 DESCRIPTION=Plugin for Claws to support application/ms-tnef attachments
 EAPI=4
 HOMEPAGE=http://www.claws-mail.org/
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-3
 RDEPEND=>=mail-client/claws-mail-3.9.0
 SLOT=0
 SRC_URI=http://www.claws-mail.org/downloads/plugins/tnef_parse-0.3.14.tar.gz
 _eclasses_=multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4
-_md5_=29ebbee112a7aa8e325f1b1bd60202b7
+_md5_=2a021927b24bf3edc69a5792709a3097
diff --git a/metadata/md5-cache/mail-client/claws-mail-vcalendar-2.0.14 b/metadata/md5-cache/mail-client/claws-mail-vcalendar-2.0.14
index 02922b1fe5c3..8abc43e7b47e 100644
--- a/metadata/md5-cache/mail-client/claws-mail-vcalendar-2.0.14
+++ b/metadata/md5-cache/mail-client/claws-mail-vcalendar-2.0.14
@@ -3,10 +3,10 @@ DEPEND=>=mail-client/claws-mail-3.8.1 >=net-misc/curl-7.9.7 virtual/pkgconfig
 DESCRIPTION=Plugin for Claws to support the vCalendar meeting format
 EAPI=4
 HOMEPAGE=http://www.claws-mail.org/
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ppc ppc64 ~sparc x86
 LICENSE=GPL-3
 RDEPEND=>=mail-client/claws-mail-3.8.1 >=net-misc/curl-7.9.7
 SLOT=0
 SRC_URI=http://www.claws-mail.org/downloads/plugins/vcalendar-2.0.14.tar.gz
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=86b1d77a5fa1584723c3164e2d5d62cb
+_md5_=35126214eaa7089577f78be8bf36a52e
diff --git a/metadata/md5-cache/mail-filter/libspf2-1.2.9-r3 b/metadata/md5-cache/mail-filter/libspf2-1.2.9-r3
index 73ed86069b0d..b9a65b0dc309 100644
--- a/metadata/md5-cache/mail-filter/libspf2-1.2.9-r3
+++ b/metadata/md5-cache/mail-filter/libspf2-1.2.9-r3
@@ -4,11 +4,11 @@ DESCRIPTION=libspf2 implements the Sender Policy Framework, a part of the SPF/SR
 EAPI=4
 HOMEPAGE=http://www.libspf2.org
 IUSE=static static-libs
-KEYWORDS=~alpha amd64 ~hppa ia64 ~ppc ppc64 ~sparc x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 ~hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd
 LICENSE=|| ( LGPL-2.1 BSD-2 )
 RDEPEND=!dev-perl/Mail-SPF-Query
 REQUIRED_USE=static? ( static-libs )
 SLOT=0
 SRC_URI=http://www.libspf2.org/spf/libspf2-1.2.9.tar.gz
 _eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	eutils	d40dc948067bd3db1c8ebf7d51897313	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=c163c19727654bab07b2263596152f85
+_md5_=315689a266175797f4804304c12c9d77
diff --git a/metadata/md5-cache/mail-mta/msmtp-1.4.30 b/metadata/md5-cache/mail-mta/msmtp-1.4.30
index 46c3611d1b2c..68b536ef9c69 100644
--- a/metadata/md5-cache/mail-mta/msmtp-1.4.30
+++ b/metadata/md5-cache/mail-mta/msmtp-1.4.30
@@ -4,11 +4,11 @@ DESCRIPTION=An SMTP client and SMTP plugin for mail user agents such as Mutt
 EAPI=4
 HOMEPAGE=http://msmtp.sourceforge.net/
 IUSE=doc gnome-keyring gnutls idn +mta nls sasl ssl vim-syntax
-KEYWORDS=~alpha amd64 ia64 ~ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=~alpha amd64 ia64 ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=GPL-3
 RDEPEND=gnome-keyring? ( dev-python/gnome-keyring-python gnome-base/libgnome-keyring ) idn? ( net-dns/libidn ) nls? ( virtual/libintl ) sasl? ( virtual/gsasl ) ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( dev-libs/openssl ) ) net-mail/mailbase mta? ( !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !<mail-mta/ssmtp-2.64-r2 !>=mail-mta/ssmtp-2.64-r2[mta] )
 REQUIRED_USE=gnutls? ( ssl )
 SLOT=0
 SRC_URI=mirror://sourceforge/msmtp/msmtp-1.4.30.tar.bz2
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	python	e5b3412fa9f03670a666c8a137bd1060	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=67f6ebc467c2385413f79b619a8a4eee
+_md5_=7c5fea4a7af62afbe806f5997e53a2de
diff --git a/metadata/md5-cache/media-gfx/cropgui-0.1.1 b/metadata/md5-cache/media-gfx/cropgui-0.1.1
index f8b34cf87fbf..911eda0e2b57 100644
--- a/metadata/md5-cache/media-gfx/cropgui-0.1.1
+++ b/metadata/md5-cache/media-gfx/cropgui-0.1.1
@@ -3,10 +3,10 @@ DEPEND==dev-lang/python-2*
 DESCRIPTION=GUI for lossless cropping of jpeg images
 EAPI=4
 HOMEPAGE=http://emergent.unpythonic.net/01248401946
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=dev-python/imaging dev-python/pygobject:2 dev-python/pygtk:2 =dev-lang/python-2*
 SLOT=0
 SRC_URI=http://media.unpythonic.net/emergent-files/01248401946/cropgui_0.1.1.tar.gz
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	python	e5b3412fa9f03670a666c8a137bd1060	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=c52ce794aff8718ebf53a7ea37005ff0
+_md5_=4aae38ce1290167167925c6f975d6f83
diff --git a/metadata/md5-cache/media-gfx/graphite2-1.2.0 b/metadata/md5-cache/media-gfx/graphite2-1.2.0
index be6d8f3020c0..81b3331600d9 100644
--- a/metadata/md5-cache/media-gfx/graphite2-1.2.0
+++ b/metadata/md5-cache/media-gfx/graphite2-1.2.0
@@ -4,10 +4,10 @@ DESCRIPTION=Library providing rendering capabilities for complex non-Roman writi
 EAPI=4
 HOMEPAGE=http://graphite.sil.org/
 IUSE=perl test
-KEYWORDS=amd64 ~arm ~hppa ppc ~ppc64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~hppa ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris
 LICENSE=LGPL-2.1
 RDEPEND=perl? ( dev-lang/perl ) test? ( =dev-lang/python-2* )
 SLOT=0
 SRC_URI=mirror://sourceforge/silgraphite/graphite2/graphite2-1.2.0.tgz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	341ea44ed97a940b6ff74283ed5b94d7	eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	825d3d7654c88c5c4dec7400d3612578	python	e5b3412fa9f03670a666c8a137bd1060	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=112d8dc2f58349adb6e9b0f5bf1a8f61
+_md5_=df6ad860cde88f57c69a52fe80921986
diff --git a/metadata/md5-cache/media-libs/glu-9.0.0 b/metadata/md5-cache/media-libs/glu-9.0.0
index 349dd6f51ca7..2c07a3221a7b 100644
--- a/metadata/md5-cache/media-libs/glu-9.0.0
+++ b/metadata/md5-cache/media-libs/glu-9.0.0
@@ -4,10 +4,10 @@ DESCRIPTION=The OpenGL Utility Library
 EAPI=4
 HOMEPAGE=http://cgit.freedesktop.org/mesa/glu/
 IUSE=multilib static-libs
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=SGI-B-2.0
 RDEPEND=virtual/opengl !<media-libs/mesa-9 multilib? ( !app-emulation/emul-linux-x86-opengl )
 SLOT=0
 SRC_URI=ftp://ftp.freedesktop.org/pub/mesa/glu/glu-9.0.0.tar.bz2
 _eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	autotools-utils	f4dc5b0e643575b9bd31a2bd7deeee31	eutils	d40dc948067bd3db1c8ebf7d51897313	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=18ca0b9bf1d3201fb36cf5bb67b419c9
+_md5_=7ca2f5883b179def6f33ab8da2fe6317
diff --git a/metadata/md5-cache/media-libs/harfbuzz-0.9.9 b/metadata/md5-cache/media-libs/harfbuzz-0.9.9
index 73cc332e232b..3e2992befb5f 100644
--- a/metadata/md5-cache/media-libs/harfbuzz-0.9.9
+++ b/metadata/md5-cache/media-libs/harfbuzz-0.9.9
@@ -4,10 +4,10 @@ DESCRIPTION=An OpenType text shaping engine
 EAPI=5
 HOMEPAGE=http://www.freedesktop.org/wiki/Software/HarfBuzz
 IUSE=static-libs
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris
 LICENSE=MIT
 RDEPEND=dev-libs/glib:2 dev-libs/icu media-gfx/graphite2 media-libs/freetype:2 x11-libs/cairo
 SLOT=0
 SRC_URI=http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-0.9.9.tar.bz2
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=02a709b01d6d50a29b47500edf9e6eae
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=404f2af952169a7af7cf507e29cbfed0
diff --git a/metadata/md5-cache/media-libs/harfbuzz-9999 b/metadata/md5-cache/media-libs/harfbuzz-9999
index a85b979d6b9c..49459624f382 100644
--- a/metadata/md5-cache/media-libs/harfbuzz-9999
+++ b/metadata/md5-cache/media-libs/harfbuzz-9999
@@ -8,4 +8,4 @@ LICENSE=MIT
 RDEPEND=dev-libs/glib:2 dev-libs/icu media-gfx/graphite2 media-libs/freetype:2 x11-libs/cairo
 SLOT=0
 _eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	eutils	d40dc948067bd3db1c8ebf7d51897313	git-2	15733ab6a6feb34af9837b41623c2bad	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=973352a299f3bf40cca4f10d120b536d
+_md5_=c6745d93102539b0aa1593aad8859e5f
diff --git a/metadata/md5-cache/media-libs/libjpeg-turbo-1.2.1 b/metadata/md5-cache/media-libs/libjpeg-turbo-1.2.1
index 56fcbe53b0e8..7a2b490533e8 100644
--- a/metadata/md5-cache/media-libs/libjpeg-turbo-1.2.1
+++ b/metadata/md5-cache/media-libs/libjpeg-turbo-1.2.1
@@ -5,9 +5,9 @@ EAPI=4
 HOMEPAGE=http://libjpeg-turbo.virtualgl.org/ http://sourceforge.net/projects/libjpeg-turbo/
 IUSE=java static-libs elibc_FreeBSD java
 KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
-LICENSE=BSD
+LICENSE=BSD IJG
 RDEPEND=!media-libs/jpeg:0 java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
 SRC_URI=mirror://sourceforge/libjpeg-turbo/libjpeg-turbo-1.2.1.tar.gz mirror://debian/pool/main/libj/libjpeg8/libjpeg8_8d-1.debian.tar.gz
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	2d9eb3508fa5d6759e39354b74545567	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=53cb76ae2862e5518ed2da9884be6dfe
+_md5_=8364a24ef67a3769dcb8cb4a795ae11a
diff --git a/metadata/md5-cache/media-libs/mesa-9.0.1 b/metadata/md5-cache/media-libs/mesa-9.0.1
index b8bbc0b60e92..5517cd513ba8 100644
--- a/metadata/md5-cache/media-libs/mesa-9.0.1
+++ b/metadata/md5-cache/media-libs/mesa-9.0.1
@@ -4,11 +4,11 @@ DESCRIPTION=OpenGL-like graphic library for Linux
 EAPI=4
 HOMEPAGE=http://mesa3d.sourceforge.net/
 IUSE=video_cards_i915 video_cards_i965 video_cards_intel video_cards_r100 video_cards_r200 video_cards_r300 video_cards_r600 video_cards_radeon video_cards_radeonsi video_cards_nouveau video_cards_vmware bindist +classic debug +egl g3dvl +gallium gbm gles1 gles2 +llvm +nptl openvg osmesa pax_kernel pic r600-llvm-compiler selinux +shared-glapi vdpau wayland xvmc xa xorg kernel_FreeBSD
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT SGI-B-2.0
 RDEPEND=!<x11-base/xorg-server-1.7 !<=x11-proto/xf86driproto-2.0.3 classic? ( app-admin/eselect-mesa ) gallium? ( app-admin/eselect-mesa ) >=app-admin/eselect-opengl-1.2.6 dev-libs/expat gbm? ( virtual/udev x11-libs/libdrm[libkms] ) >=x11-libs/libX11-1.3.99.901 x11-libs/libXdamage x11-libs/libXext x11-libs/libXxf86vm >=x11-libs/libxcb-1.8.1 vdpau? ( >=x11-libs/libvdpau-0.4.1 ) wayland? ( dev-libs/wayland ) xorg? ( x11-base/xorg-server x11-libs/libdrm[libkms] ) xvmc? ( >=x11-libs/libXvMC-1.0.6 ) >=x11-libs/libdrm-2.4.39[video_cards_nouveau?,video_cards_vmware?] video_cards_i915? ( >=x11-libs/libdrm-2.4.39[video_cards_intel] ) video_cards_i965? ( >=x11-libs/libdrm-2.4.39[video_cards_intel] ) video_cards_intel? ( >=x11-libs/libdrm-2.4.39[video_cards_intel] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.39[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.39[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.39[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.39[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.39[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.39[video_cards_radeon] )
 REQUIRED_USE=g3dvl? ( gallium ) llvm? ( gallium ) openvg? ( egl gallium ) gbm? ( shared-glapi ) g3dvl? ( || ( vdpau xvmc ) ) vdpau? ( g3dvl ) r600-llvm-compiler? ( gallium llvm || ( video_cards_r600 video_cards_radeon ) ) xa? ( gallium ) xorg? ( gallium ) xvmc? ( g3dvl ) video_cards_intel? ( || ( classic gallium ) ) video_cards_i915? ( || ( classic gallium ) ) video_cards_i965? ( classic ) video_cards_nouveau? ( || ( classic gallium ) ) video_cards_radeon? ( || ( classic gallium ) ) video_cards_r100? ( classic ) video_cards_r200? ( classic ) video_cards_r300? ( gallium ) video_cards_r600? ( gallium ) video_cards_radeonsi? ( gallium llvm ) video_cards_vmware? ( gallium )
 SLOT=0
 SRC_URI=ftp://ftp.freedesktop.org/pub/mesa/9.0.1/MesaLib-9.0.1.tar.bz2
 _eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=5240b088a9e8531be2ad757985116220
+_md5_=54ded73211fdfd10cbcce35339e2db78
diff --git a/metadata/md5-cache/media-radio/fldigi-3.21.64 b/metadata/md5-cache/media-radio/fldigi-3.21.64
new file mode 100644
index 000000000000..a65e3c052d9f
--- /dev/null
+++ b/metadata/md5-cache/media-radio/fldigi-3.21.64
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure
+DEPEND=x11-libs/fltk:1[threads,xft] media-libs/libsamplerate media-libs/libpng x11-misc/xdg-utils hamlib? ( media-libs/hamlib ) portaudio? ( >=media-libs/portaudio-19_pre20071207 ) pulseaudio? ( media-sound/pulseaudio ) sndfile? ( >=media-libs/libsndfile-1.0.10 ) xmlrpc? ( || ( >=dev-libs/xmlrpc-c-1.18.02[abyss] <dev-libs/xmlrpc-c-1.18.02 ) dev-perl/RPC-XML dev-perl/Term-ReadLine-Perl ) nls? ( sys-devel/gettext ) virtual/pkgconfig
+DESCRIPTION=Sound card based multimode software modem for Amateur Radio use
+EAPI=4
+HOMEPAGE=http://www.w1hkj.com/Fldigi.html
+IUSE=hamlib nls portaudio pulseaudio sndfile xmlrpc
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=x11-libs/fltk:1[threads,xft] media-libs/libsamplerate media-libs/libpng x11-misc/xdg-utils hamlib? ( media-libs/hamlib ) portaudio? ( >=media-libs/portaudio-19_pre20071207 ) pulseaudio? ( media-sound/pulseaudio ) sndfile? ( >=media-libs/libsndfile-1.0.10 ) xmlrpc? ( || ( >=dev-libs/xmlrpc-c-1.18.02[abyss] <dev-libs/xmlrpc-c-1.18.02 ) dev-perl/RPC-XML dev-perl/Term-ReadLine-Perl )
+SLOT=0
+SRC_URI=http://www.w1hkj.com/downloads/fldigi/fldigi-3.21.64.tar.gz
+_md5_=2455fe881a3deec9b6580a8529232837
diff --git a/metadata/md5-cache/media-video/totem-3.6.3-r1 b/metadata/md5-cache/media-video/totem-3.6.3-r1
index 0100aa9321c2..67091b337402 100644
--- a/metadata/md5-cache/media-video/totem-3.6.3-r1
+++ b/metadata/md5-cache/media-video/totem-3.6.3-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=dev-libs/glib-2.33:2 >=x11-libs/gdk-pixbuf-2.23.0:2 >=x11-libs/gtk+-3.5.2:3[introspection?] >=dev-libs/totem-pl-parser-2.32.4[introspection?] >=dev-libs/libpeas-1.1.0[gtk] >=x11-themes/gnome-icon-theme-2.16 x11-libs/cairo >=dev-libs/libxml2-2.6:2 >=media-libs/clutter-1.6.8:1.0 >=media-libs/clutter-gst-1.5.5:2.0 >=media-libs/clutter-gtk-1.0.2:1.0 x11-libs/mx:1.0 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0[X,introspection?,pango] >=media-libs/gst-plugins-bad-1.0.2:1.0 media-libs/gst-plugins-good:1.0 media-plugins/gst-plugins-taglib:1.0 media-plugins/gst-plugins-meta:1.0 x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libXxf86vm-1.0.1 gnome-base/gsettings-desktop-schemas x11-themes/gnome-icon-theme-symbolic flash? ( dev-libs/totem-pl-parser[quvi] ) grilo? ( media-libs/grilo:0.2 ) introspection? ( >=dev-libs/gobject-introspection-0.6.7 ) lirc? ( app-misc/lirc ) nautilus? ( >=gnome-base/nautilus-2.91.3 ) nsplugin? ( >=dev-libs/dbus-glib-0.82 >=x11-misc/shared-mime-info-0.22 ) python? ( dev-python/python-exec[python_targets_python2_6?,python_targets_python2_7?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] python_single_target_python2_6? ( dev-lang/python:2.6[threads] ) python_single_target_python2_7? ( dev-lang/python:2.7[threads] ) >=dev-python/pygobject-2.90.3:3[python_targets_python2_6?,python_targets_python2_7?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] dev-python/pyxdg[python_targets_python2_6?,python_targets_python2_7?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] dev-python/dbus-python[python_targets_python2_6?,python_targets_python2_7?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] >=x11-libs/gtk+-2.91.7:3[introspection] ) zeitgeist? ( dev-libs/libzeitgeist ) app-text/docbook-xml-dtd:4.5 >=app-text/gnome-doc-utils-0.20.3 app-text/scrollkeeper >=dev-util/gtk-doc-am-1.14 >=dev-util/intltool-0.40 sys-devel/gettext x11-proto/xextproto x11-proto/xproto virtual/pkgconfig test? ( python? ( dev-python/pylint ) ) app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=>=dev-libs/glib-2.33:2 >=x11-libs/gdk-pixbuf-2.23.0:2 >=x11-libs/gtk+-3.5.2:3[introspection?] >=dev-libs/totem-pl-parser-2.32.4[introspection?] >=dev-libs/libpeas-1.1.0[gtk] >=x11-themes/gnome-icon-theme-2.16 x11-libs/cairo >=dev-libs/libxml2-2.6:2 >=media-libs/clutter-1.10:1.0 >=media-libs/clutter-gst-1.5.5:2.0 >=media-libs/clutter-gtk-1.0.2:1.0 x11-libs/mx:1.0 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0[X,introspection?,pango] >=media-libs/gst-plugins-bad-1.0.2:1.0 media-libs/gst-plugins-good:1.0 media-plugins/gst-plugins-taglib:1.0 media-plugins/gst-plugins-meta:1.0 x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libXxf86vm-1.0.1 gnome-base/gsettings-desktop-schemas x11-themes/gnome-icon-theme-symbolic flash? ( dev-libs/totem-pl-parser[quvi] ) grilo? ( media-libs/grilo:0.2 ) introspection? ( >=dev-libs/gobject-introspection-0.6.7 ) lirc? ( app-misc/lirc ) nautilus? ( >=gnome-base/nautilus-2.91.3 ) nsplugin? ( >=dev-libs/dbus-glib-0.82 >=x11-misc/shared-mime-info-0.22 ) python? ( dev-python/python-exec[python_targets_python2_6?,python_targets_python2_7?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] python_single_target_python2_6? ( dev-lang/python:2.6[threads] ) python_single_target_python2_7? ( dev-lang/python:2.7[threads] ) >=dev-python/pygobject-2.90.3:3[python_targets_python2_6?,python_targets_python2_7?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] dev-python/pyxdg[python_targets_python2_6?,python_targets_python2_7?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] dev-python/dbus-python[python_targets_python2_6?,python_targets_python2_7?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] >=x11-libs/gtk+-2.91.7:3[introspection] ) zeitgeist? ( dev-libs/libzeitgeist ) app-text/docbook-xml-dtd:4.5 >=app-text/gnome-doc-utils-0.20.3 app-text/scrollkeeper >=dev-util/gtk-doc-am-1.14 >=dev-util/intltool-0.40 sys-devel/gettext x11-proto/xextproto x11-proto/xproto virtual/pkgconfig test? ( python? ( dev-python/pylint ) ) app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=Media player for GNOME
 EAPI=5
 HOMEPAGE=http://projects.gnome.org/totem/
 IUSE=flash grilo +introspection lirc nautilus nsplugin +python test zeitgeist debug python_targets_python2_6 python_targets_python2_7 python_single_target_python2_6 python_single_target_python2_7
 KEYWORDS=~amd64 ~x86 ~x86-fbsd
 LICENSE=GPL-2+ LGPL-2+
-RDEPEND=>=dev-libs/glib-2.33:2 >=x11-libs/gdk-pixbuf-2.23.0:2 >=x11-libs/gtk+-3.5.2:3[introspection?] >=dev-libs/totem-pl-parser-2.32.4[introspection?] >=dev-libs/libpeas-1.1.0[gtk] >=x11-themes/gnome-icon-theme-2.16 x11-libs/cairo >=dev-libs/libxml2-2.6:2 >=media-libs/clutter-1.6.8:1.0 >=media-libs/clutter-gst-1.5.5:2.0 >=media-libs/clutter-gtk-1.0.2:1.0 x11-libs/mx:1.0 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0[X,introspection?,pango] >=media-libs/gst-plugins-bad-1.0.2:1.0 media-libs/gst-plugins-good:1.0 media-plugins/gst-plugins-taglib:1.0 media-plugins/gst-plugins-meta:1.0 x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libXxf86vm-1.0.1 gnome-base/gsettings-desktop-schemas x11-themes/gnome-icon-theme-symbolic flash? ( dev-libs/totem-pl-parser[quvi] ) grilo? ( media-libs/grilo:0.2 ) introspection? ( >=dev-libs/gobject-introspection-0.6.7 ) lirc? ( app-misc/lirc ) nautilus? ( >=gnome-base/nautilus-2.91.3 ) nsplugin? ( >=dev-libs/dbus-glib-0.82 >=x11-misc/shared-mime-info-0.22 ) python? ( dev-python/python-exec[python_targets_python2_6?,python_targets_python2_7?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] python_single_target_python2_6? ( dev-lang/python:2.6[threads] ) python_single_target_python2_7? ( dev-lang/python:2.7[threads] ) >=dev-python/pygobject-2.90.3:3[python_targets_python2_6?,python_targets_python2_7?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] dev-python/pyxdg[python_targets_python2_6?,python_targets_python2_7?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] dev-python/dbus-python[python_targets_python2_6?,python_targets_python2_7?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] >=x11-libs/gtk+-2.91.7:3[introspection] ) zeitgeist? ( dev-libs/libzeitgeist )
+RDEPEND=>=dev-libs/glib-2.33:2 >=x11-libs/gdk-pixbuf-2.23.0:2 >=x11-libs/gtk+-3.5.2:3[introspection?] >=dev-libs/totem-pl-parser-2.32.4[introspection?] >=dev-libs/libpeas-1.1.0[gtk] >=x11-themes/gnome-icon-theme-2.16 x11-libs/cairo >=dev-libs/libxml2-2.6:2 >=media-libs/clutter-1.10:1.0 >=media-libs/clutter-gst-1.5.5:2.0 >=media-libs/clutter-gtk-1.0.2:1.0 x11-libs/mx:1.0 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0[X,introspection?,pango] >=media-libs/gst-plugins-bad-1.0.2:1.0 media-libs/gst-plugins-good:1.0 media-plugins/gst-plugins-taglib:1.0 media-plugins/gst-plugins-meta:1.0 x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libXxf86vm-1.0.1 gnome-base/gsettings-desktop-schemas x11-themes/gnome-icon-theme-symbolic flash? ( dev-libs/totem-pl-parser[quvi] ) grilo? ( media-libs/grilo:0.2 ) introspection? ( >=dev-libs/gobject-introspection-0.6.7 ) lirc? ( app-misc/lirc ) nautilus? ( >=gnome-base/nautilus-2.91.3 ) nsplugin? ( >=dev-libs/dbus-glib-0.82 >=x11-misc/shared-mime-info-0.22 ) python? ( dev-python/python-exec[python_targets_python2_6?,python_targets_python2_7?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] python_single_target_python2_6? ( dev-lang/python:2.6[threads] ) python_single_target_python2_7? ( dev-lang/python:2.7[threads] ) >=dev-python/pygobject-2.90.3:3[python_targets_python2_6?,python_targets_python2_7?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] dev-python/pyxdg[python_targets_python2_6?,python_targets_python2_7?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] dev-python/dbus-python[python_targets_python2_6?,python_targets_python2_7?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] >=x11-libs/gtk+-2.91.7:3[introspection] ) zeitgeist? ( dev-libs/libzeitgeist )
 REQUIRED_USE=flash? ( nsplugin ) python? ( introspection ) zeitgeist? ( introspection ) || ( python_targets_python2_6 python_targets_python2_7 ) ^^ ( python_single_target_python2_6 python_single_target_python2_7 ) python_single_target_python2_6? ( python_targets_python2_6 ) python_single_target_python2_7? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/totem/3.6/totem-3.6.3.tar.xz
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	18cda077fa5f661f96aa70c192b4b4a5	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	python-single-r1	50388199dfecdef7b878a1b0a1349715	python-utils-r1	eb151cb59474a865a7ad7eec712b3c40	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=8687c4c4840aa861106257b989e81eab
+_md5_=ae127ab3e939af1990cdf0c13eb184bd
diff --git a/metadata/md5-cache/net-analyzer/arpoison-0.6 b/metadata/md5-cache/net-analyzer/arpoison-0.6
deleted file mode 100644
index c460ccbd1d2b..000000000000
--- a/metadata/md5-cache/net-analyzer/arpoison-0.6
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DEPEND=>=net-libs/libnet-1.1.0 >=sys-apps/sed-4
-DESCRIPTION=A utility to poison ARP caches
-HOMEPAGE=http://arpoison.sourceforge.net/
-KEYWORDS=~amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=>=net-libs/libnet-1.1.0
-SLOT=0
-SRC_URI=mirror://sourceforge/arpoison/arpoison-0.6.tar.gz
-_eclasses_=multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4
-_md5_=f7ab9f2ce7e4f9139d71c1f7ca7f06f0
diff --git a/metadata/md5-cache/net-analyzer/arpoison-0.6-r1 b/metadata/md5-cache/net-analyzer/arpoison-0.6-r1
deleted file mode 100644
index 0a3d3e85e19d..000000000000
--- a/metadata/md5-cache/net-analyzer/arpoison-0.6-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=>=net-libs/libnet-1.1.0 >=sys-apps/sed-4
-DESCRIPTION=A utility to poison ARP caches
-EAPI=2
-HOMEPAGE=http://arpoison.sourceforge.net/
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=>=net-libs/libnet-1.1.0
-SLOT=0
-SRC_URI=mirror://sourceforge/arpoison/arpoison-0.6.tar.gz
-_eclasses_=multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4
-_md5_=060bbbba76ab9a2b14b3cc2b0ec40640
diff --git a/metadata/md5-cache/net-analyzer/arpoison-0.6-r2 b/metadata/md5-cache/net-analyzer/arpoison-0.6-r2
index bc62280e5133..63a15034ce03 100644
--- a/metadata/md5-cache/net-analyzer/arpoison-0.6-r2
+++ b/metadata/md5-cache/net-analyzer/arpoison-0.6-r2
@@ -3,10 +3,10 @@ DEPEND=>=net-libs/libnet-1.1.0 >=sys-apps/sed-4
 DESCRIPTION=A utility to poison ARP caches
 EAPI=5
 HOMEPAGE=http://arpoison.sourceforge.net/
-KEYWORDS=amd64 ~arm ~ppc x86
+KEYWORDS=amd64 ~arm ppc x86
 LICENSE=GPL-2
 RDEPEND=>=net-libs/libnet-1.1.0
 SLOT=0
 SRC_URI=mirror://sourceforge/arpoison/arpoison-0.6.tar.gz
 _eclasses_=multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4
-_md5_=f0632e1d69a03e59dfcded081750d49e
+_md5_=8e8100977464b9bcd18551ed4d98ca7f
diff --git a/metadata/md5-cache/net-analyzer/fail2ban-0.8.8 b/metadata/md5-cache/net-analyzer/fail2ban-0.8.8
index 26a244a54f3d..e2a0d5df462e 100644
--- a/metadata/md5-cache/net-analyzer/fail2ban-0.8.8
+++ b/metadata/md5-cache/net-analyzer/fail2ban-0.8.8
@@ -4,10 +4,10 @@ DESCRIPTION=Bans IP that make too many password failures
 EAPI=4
 HOMEPAGE=http://www.fail2ban.org/
 IUSE=selinux
-KEYWORDS=amd64 ~hppa ~ppc ~ppc64 ~sparc x86 ~x86-fbsd
+KEYWORDS=amd64 hppa ~ppc ~ppc64 ~sparc x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=net-misc/whois virtual/mta virtual/logger net-firewall/iptables selinux? ( sec-policy/selinux-fail2ban ) =dev-lang/python-2*
 SLOT=0
 SRC_URI=https://github.com/fail2ban/fail2ban/tarball/0.8.8 -> fail2ban-0.8.8.tar.gz
 _eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	python	e5b3412fa9f03670a666c8a137bd1060	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	vcs-snapshot	d7572a392e0bd8e207deae5414f6a887
-_md5_=381e8e0bf8013157aaff377b6568183d
+_md5_=c4e8834f27fd4e3e0d54273cf21da6ef
diff --git a/metadata/md5-cache/net-dns/bind-9.9.2_p1 b/metadata/md5-cache/net-dns/bind-9.9.2_p1
index 2305e4743840..bd298ed9c0b9 100644
--- a/metadata/md5-cache/net-dns/bind-9.9.2_p1
+++ b/metadata/md5-cache/net-dns/bind-9.9.2_p1
@@ -4,11 +4,11 @@ DESCRIPTION=BIND - Berkeley Internet Name Domain - Name Server
 EAPI=4
 HOMEPAGE=http://www.isc.org/software/bind
 IUSE=berkdb caps dlz doc filter-aaaa geoip gost gssapi idn ipv6 ldap mysql odbc postgres python rpz rrl sdb-ldap selinux ssl static-libs threads urandom xml
-KEYWORDS=~alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=ISC BSD BSD-2 HPND JNIC RSA openssl
 RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6g ) mysql? ( >=virtual/mysql-4.0 ) odbc? ( >=dev-db/unixODBC-2.2.6 ) ldap? ( net-nds/openldap ) idn? ( net-dns/idnkit ) postgres? ( dev-db/postgresql-base ) caps? ( >=sys-libs/libcap-2.1.0 ) xml? ( dev-libs/libxml2 ) geoip? ( >=dev-libs/geoip-1.4.6 ) gssapi? ( virtual/krb5 ) sdb-ldap? ( net-nds/openldap ) gost? ( >=dev-libs/openssl-1.0.0[-bindist] ) python? ( virtual/python-argparse ) selinux? ( sec-policy/selinux-bind ) || ( sys-process/psmisc >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) python? ( || ( =dev-lang/python-3* =dev-lang/python-2.7* ) )
 REQUIRED_USE=postgres? ( dlz ) berkdb? ( dlz ) mysql? ( dlz !threads ) odbc? ( dlz ) ldap? ( dlz ) sdb-ldap? ( dlz ) gost? ( ssl ) threads? ( caps )
 SLOT=0
 SRC_URI=ftp://ftp.isc.org/isc/bind9/9.9.2-P1/bind-9.9.2-P1.tar.gz doc? ( mirror://gentoo/dyndns-samples.tbz2 ) geoip? ( http://bind-geoip.googlecode.com//files/bind-geoip-1.3-readme.txt http://bind-geoip.googlecode.com//files/bind-9.9.2-geoip-1.3.patch ) sdb-ldap? ( http://ftp.disconnected-by-peer.at/pub/bind-sdb-ldap-1.1.0-fc14.patch.bz2 ) rrl? ( http://ss.vix.com/~vixie/rl-9.9.2.patch )
 _eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	e5b3412fa9f03670a666c8a137bd1060	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=895841491e3e6479a2be60cdedc9733d
+_md5_=b9769225704e47bbc895b5c5c2619987
diff --git a/metadata/md5-cache/net-im/kadu-0.12.3 b/metadata/md5-cache/net-im/kadu-0.12.3
index fe13f91f0fda..f51ace339d66 100644
--- a/metadata/md5-cache/net-im/kadu-0.12.3
+++ b/metadata/md5-cache/net-im/kadu-0.12.3
@@ -4,11 +4,11 @@ DESCRIPTION=An open source Gadu-Gadu and Jabber/XMPP protocol Instant Messenger
 EAPI=4
 HOMEPAGE=http://www.kadu.net
 IUSE=ayatana +gadu mpd phonon sdk speech spell xmpp
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
 RDEPEND=>=app-crypt/qca-2.0.0-r2 x11-libs/libX11 x11-libs/libXfixes x11-libs/libXScrnSaver >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4 >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[sqlite] >=x11-libs/qt-webkit-4.7.0:4 ayatana? ( dev-libs/libindicate-qt ) gadu? ( >=net-libs/libgadu-1.11.1[threads] >=x11-libs/qt-xmlpatterns-4.7.0:4 ) mpd? ( media-libs/libmpdclient ) phonon? ( || ( media-libs/phonon >=x11-libs/qt-phonon-4.7.0:4 ) ) spell? ( app-text/enchant ) xmpp? ( net-dns/libidn sys-libs/zlib ) app-crypt/qca-ossl:2 >=x11-libs/qt-svg-4.7.0:4 speech? ( app-accessibility/powiedz )
 REQUIRED_USE=|| ( gadu xmpp )
 SLOT=0
 SRC_URI=http://download.kadu.im/stable/kadu-0.12.3.tar.bz2
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	341ea44ed97a940b6ff74283ed5b94d7	eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=b9bb10aee669a78f53272899ac98621c
+_md5_=a656503161b59fbcef9fbff5672890d8
diff --git a/metadata/md5-cache/net-im/pymsn-t-0.11.3 b/metadata/md5-cache/net-im/pymsn-t-0.11.3
deleted file mode 100644
index b4f31c32b500..000000000000
--- a/metadata/md5-cache/net-im/pymsn-t-0.11.3
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=net-im/jabber-base =dev-lang/python-2*
-DESCRIPTION=Python based jabber transport for MSN
-HOMEPAGE=http://msn-transport.jabberstudio.org/
-KEYWORDS=~amd64 ~x86 ~ppc
-LICENSE=GPL-2
-RDEPEND=net-im/jabber-base >=dev-python/twisted-2.5.0 >=dev-python/twisted-words-0.5.0 >=dev-python/twisted-web-0.7.0 >=dev-python/imaging-1.1 =dev-lang/python-2*
-SLOT=0
-SRC_URI=http://msn-transport.jabberstudio.org/tarballs/pymsnt-0.11.3.tar.gz
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	python	e5b3412fa9f03670a666c8a137bd1060	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=539ada31170b54e4f66206485442089b
diff --git a/metadata/md5-cache/net-im/pymsn-t-0.11.3-r1 b/metadata/md5-cache/net-im/pymsn-t-0.11.3-r1
deleted file mode 100644
index 79b13fb150e6..000000000000
--- a/metadata/md5-cache/net-im/pymsn-t-0.11.3-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst postrm unpack
-DEPEND=net-im/jabber-base =dev-lang/python-2*
-DESCRIPTION=Python based jabber transport for MSN
-HOMEPAGE=http://msn-transport.jabberstudio.org/
-KEYWORDS=amd64 ~ppc x86
-LICENSE=GPL-2
-RDEPEND=net-im/jabber-base >=dev-python/twisted-2.5.0 >=dev-python/twisted-words-0.5.0 >=dev-python/twisted-web-0.7.0 >=dev-python/imaging-1.1 =dev-lang/python-2*
-SLOT=0
-SRC_URI=http://msn-transport.jabberstudio.org/tarballs/pymsnt-0.11.3.tar.gz
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	python	e5b3412fa9f03670a666c8a137bd1060	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=b36a278f69de6387a86bcf3e5a21caa6
diff --git a/metadata/md5-cache/net-im/pymsn-t-0.11.3-r2 b/metadata/md5-cache/net-im/pymsn-t-0.11.3-r2
deleted file mode 100644
index fe0ad2006d8d..000000000000
--- a/metadata/md5-cache/net-im/pymsn-t-0.11.3-r2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst postrm unpack
-DEPEND=net-im/jabber-base =dev-lang/python-2*
-DESCRIPTION=Python based jabber transport for MSN
-HOMEPAGE=http://msn-transport.jabberstudio.org/
-KEYWORDS=amd64 ~ppc x86
-LICENSE=GPL-2
-RDEPEND=net-im/jabber-base >=dev-python/twisted-2.5.0 >=dev-python/twisted-words-0.5.0 >=dev-python/twisted-web-0.7.0 >=dev-python/imaging-1.1 =dev-lang/python-2*
-SLOT=0
-SRC_URI=http://msn-transport.jabberstudio.org/tarballs/pymsnt-0.11.3.tar.gz
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	python	e5b3412fa9f03670a666c8a137bd1060	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=34cafd6dcdd651a8ab33d25b2a7c0ffc
diff --git a/metadata/md5-cache/net-libs/neon-0.29.6-r2 b/metadata/md5-cache/net-libs/neon-0.29.6-r2
index 921c1ef6344b..6ecf723cc8a4 100644
--- a/metadata/md5-cache/net-libs/neon-0.29.6-r2
+++ b/metadata/md5-cache/net-libs/neon-0.29.6-r2
@@ -4,11 +4,11 @@ DESCRIPTION=HTTP and WebDAV client library
 EAPI=4
 HOMEPAGE=http://www.webdav.org/neon/
 IUSE=doc expat gnutls kerberos libproxy nls pkcs11 ssl static-libs zlib linguas_cs linguas_de linguas_fr linguas_ja linguas_nn linguas_pl linguas_ru linguas_tr linguas_zh_CN
-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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=expat? ( dev-libs/expat ) !expat? ( dev-libs/libxml2 ) gnutls? ( app-misc/ca-certificates >=net-libs/gnutls-2.0 pkcs11? ( dev-libs/pakchois ) ) !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6f pkcs11? ( dev-libs/pakchois ) ) ) kerberos? ( virtual/krb5 ) libproxy? ( net-libs/libproxy ) nls? ( virtual/libintl ) zlib? ( sys-libs/zlib )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.webdav.org/neon/neon-0.29.6.tar.gz
 _eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	eutils	d40dc948067bd3db1c8ebf7d51897313	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=288dbb0f388a6eccbe8d15182c6d0519
+_md5_=32edee81813fe0d93b005091d569dd97
diff --git a/metadata/md5-cache/net-misc/aria2-1.16.1 b/metadata/md5-cache/net-misc/aria2-1.16.1
new file mode 100644
index 000000000000..01fb07f90d11
--- /dev/null
+++ b/metadata/md5-cache/net-misc/aria2-1.16.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst prepare setup
+DEPEND=sys-libs/zlib ssl? ( app-misc/ca-certificates gnutls? ( >=net-libs/gnutls-1.2.9 ) !gnutls? ( dev-libs/openssl ) ) adns? ( >=net-dns/c-ares-1.5.0 ) bittorrent? ( ssl? ( gnutls? ( nettle? ( >=dev-libs/nettle-2.4[gmp] >=dev-libs/gmp-5 ) !nettle? ( >=dev-libs/libgcrypt-1.2.2 ) ) ) !ssl? ( nettle? ( >=dev-libs/nettle-2.4[gmp] >=dev-libs/gmp-5 ) !nettle? ( >=dev-libs/libgcrypt-1.2.2 ) ) ) metalink? ( libxml2? ( >=dev-libs/libxml2-2.6.26 ) !libxml2? ( dev-libs/expat ) ) sqlite? ( dev-db/sqlite:3 ) xmlrpc? ( libxml2? ( >=dev-libs/libxml2-2.6.26 ) !libxml2? ( dev-libs/expat ) ) virtual/pkgconfig nls? ( sys-devel/gettext ) test? ( >=dev-util/cppunit-1.12.0 )
+DESCRIPTION=A download utility with segmented downloading with BitTorrent support
+EAPI=5
+HOMEPAGE=http://aria2.sourceforge.net/
+IUSE=adns bittorrent +gnutls +libxml2 metalink +nettle nls sqlite scripts ssl test xmlrpc
+KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=GPL-2
+RDEPEND=sys-libs/zlib ssl? ( app-misc/ca-certificates gnutls? ( >=net-libs/gnutls-1.2.9 ) !gnutls? ( dev-libs/openssl ) ) adns? ( >=net-dns/c-ares-1.5.0 ) bittorrent? ( ssl? ( gnutls? ( nettle? ( >=dev-libs/nettle-2.4[gmp] >=dev-libs/gmp-5 ) !nettle? ( >=dev-libs/libgcrypt-1.2.2 ) ) ) !ssl? ( nettle? ( >=dev-libs/nettle-2.4[gmp] >=dev-libs/gmp-5 ) !nettle? ( >=dev-libs/libgcrypt-1.2.2 ) ) ) metalink? ( libxml2? ( >=dev-libs/libxml2-2.6.26 ) !libxml2? ( dev-libs/expat ) ) sqlite? ( dev-db/sqlite:3 ) xmlrpc? ( libxml2? ( >=dev-libs/libxml2-2.6.26 ) !libxml2? ( dev-libs/expat ) ) nls? ( virtual/libiconv virtual/libintl ) scripts? ( dev-lang/ruby )
+SLOT=0
+SRC_URI=mirror://sourceforge/aria2/aria2-1.16.1.tar.bz2
+_eclasses_=bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=5d4a414c2de8fcea22716e3a7cdf1651
diff --git a/metadata/md5-cache/net-misc/httpie-0.3.0-r1 b/metadata/md5-cache/net-misc/httpie-0.3.0-r1
new file mode 100644
index 000000000000..68c4abff9542
--- /dev/null
+++ b/metadata/md5-cache/net-misc/httpie-0.3.0-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare setup
+DEPEND=|| ( =dev-lang/python-3.3* =dev-lang/python-3.2* =dev-lang/python-3.1* =dev-lang/python-2.7* =dev-lang/python-2.6* )
+DESCRIPTION=A CLI, cURL-like tool for humans
+EAPI=4
+HOMEPAGE=http://httpie.org/ http://pypi.python.org/pypi/httpie
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-python/requests-0.10.1 <dev-python/requests-1.0 >=dev-python/pygments-1.5 virtual/python-argparse || ( =dev-lang/python-3.3* =dev-lang/python-3.2* =dev-lang/python-3.1* =dev-lang/python-2.7* =dev-lang/python-2.6* )
+SLOT=0
+SRC_URI=mirror://pypi/h/httpie/httpie-0.3.0.tar.gz
+_eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	multilib	9aa8a023e062fca0ba79362d9d0cc488	python	e5b3412fa9f03670a666c8a137bd1060	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4
+_md5_=2b0963f37223844eaa674998a2a12f06
diff --git a/metadata/md5-cache/net-misc/httpie-0.3.1 b/metadata/md5-cache/net-misc/httpie-0.3.1
new file mode 100644
index 000000000000..828c9cfd8a2b
--- /dev/null
+++ b/metadata/md5-cache/net-misc/httpie-0.3.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare setup
+DEPEND=|| ( =dev-lang/python-3.3* =dev-lang/python-3.2* =dev-lang/python-3.1* =dev-lang/python-2.7* =dev-lang/python-2.6* )
+DESCRIPTION=A CLI, cURL-like tool for humans
+EAPI=4
+HOMEPAGE=http://httpie.org/ http://pypi.python.org/pypi/httpie
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-python/requests-0.10.1 <dev-python/requests-1.0 >=dev-python/pygments-1.5 virtual/python-argparse || ( =dev-lang/python-3.3* =dev-lang/python-3.2* =dev-lang/python-3.1* =dev-lang/python-2.7* =dev-lang/python-2.6* )
+SLOT=0
+SRC_URI=mirror://pypi/h/httpie/httpie-0.3.1.tar.gz
+_eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	multilib	9aa8a023e062fca0ba79362d9d0cc488	python	e5b3412fa9f03670a666c8a137bd1060	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4
+_md5_=ae46a048502c86a162331994daf8f3de
diff --git a/metadata/md5-cache/net-misc/leechcraft-full-9999 b/metadata/md5-cache/net-misc/leechcraft-full-9999
index 0fec66a6b787..0766908aae45 100644
--- a/metadata/md5-cache/net-misc/leechcraft-full-9999
+++ b/metadata/md5-cache/net-misc/leechcraft-full-9999
@@ -4,6 +4,6 @@ EAPI=4
 HOMEPAGE=http://leechcraft.org/
 IUSE=kde
 LICENSE=GPL-3
-RDEPEND=~app-editors/leechcraft-popishu-9999 ~app-text/leechcraft-monocle-9999 ~media-sound/leechcraft-hotstreams-9999 ~media-sound/leechcraft-lmp-9999 ~media-sound/leechcraft-lastfmscrobble-9999 ~media-sound/leechcraft-musiczombie-9999 ~media-sound/leechcraft-touchstreams-9999 ~net-analyzer/leechcraft-networkmonitor-9999 ~net-im/leechcraft-azoth-9999 ~net-misc/leechcraft-advancednotifications-9999 kde? ( ~net-misc/leechcraft-anhero-9999 ) ~net-misc/leechcraft-auscrie-9999 ~net-misc/leechcraft-core-9999 ~net-misc/leechcraft-cstp-9999 ~net-misc/leechcraft-dbusmanager-9999 ~net-misc/leechcraft-gacts-9999 ~net-misc/leechcraft-glance-9999 ~net-misc/leechcraft-historyholder-9999 ~net-misc/leechcraft-kinotify-9999 ~net-misc/leechcraft-knowhow-9999 ~net-misc/leechcraft-lackman-9999 ~net-misc/leechcraft-launchy-9999 ~net-misc/leechcraft-lemon-9999 ~net-misc/leechcraft-liznoo-9999 ~net-misc/leechcraft-newlife-9999 ~net-misc/leechcraft-netstoremanager-9999 ~net-misc/leechcraft-otlozhu-9999 ~net-misc/leechcraft-qrosp-9999 ~net-misc/leechcraft-pintab-9999 ~net-misc/leechcraft-secman-9999 ~net-misc/leechcraft-summary-9999 ~net-misc/leechcraft-tabpp-9999 ~net-misc/leechcraft-tabslist-9999 ~net-misc/leechcraft-tabsessmanager-9999 ~net-news/leechcraft-aggregator-9999 ~net-p2p/leechcraft-bittorrent-9999 ~net-proxy/leechcraft-xproxy-9999 ~sys-fs/leechcraft-vrooby-9999 ~virtual/leechcraft-trayarea-9999 ~www-client/leechcraft-deadlyrics-9999 ~www-client/leechcraft-dolozhee-9999 ~www-client/leechcraft-poshuku-9999 ~www-client/leechcraft-vgrabber-9999 ~www-misc/leechcraft-pogooglue-9999 ~www-misc/leechcraft-seekthru-9999 ~x11-plugins/leechcraft-tpi-9999
+RDEPEND=~app-editors/leechcraft-popishu-9999 ~app-text/leechcraft-monocle-9999 ~media-sound/leechcraft-hotstreams-9999 ~media-sound/leechcraft-lmp-9999 ~media-sound/leechcraft-lastfmscrobble-9999 ~media-sound/leechcraft-musiczombie-9999 ~media-sound/leechcraft-touchstreams-9999 ~net-analyzer/leechcraft-networkmonitor-9999 ~net-im/leechcraft-azoth-9999 ~net-misc/leechcraft-advancednotifications-9999 kde? ( ~net-misc/leechcraft-anhero-9999 ) ~net-misc/leechcraft-auscrie-9999 ~net-misc/leechcraft-core-9999 ~net-misc/leechcraft-cstp-9999 ~net-misc/leechcraft-dbusmanager-9999 ~net-misc/leechcraft-gacts-9999 ~net-misc/leechcraft-glance-9999 ~net-misc/leechcraft-historyholder-9999 ~net-misc/leechcraft-kinotify-9999 ~net-misc/leechcraft-knowhow-9999 ~net-misc/leechcraft-lackman-9999 ~net-misc/leechcraft-launchy-9999 ~net-misc/leechcraft-lemon-9999 ~net-misc/leechcraft-liznoo-9999 ~net-misc/leechcraft-newlife-9999 ~net-misc/leechcraft-netstoremanager-9999 ~net-misc/leechcraft-otlozhu-9999 ~net-misc/leechcraft-qrosp-9999 ~net-misc/leechcraft-pintab-9999 ~net-misc/leechcraft-secman-9999 ~net-misc/leechcraft-summary-9999 ~net-misc/leechcraft-tabslist-9999 ~net-misc/leechcraft-tabsessmanager-9999 ~net-news/leechcraft-aggregator-9999 ~net-p2p/leechcraft-bittorrent-9999 ~net-proxy/leechcraft-xproxy-9999 ~sys-fs/leechcraft-vrooby-9999 ~virtual/leechcraft-trayarea-9999 ~www-client/leechcraft-deadlyrics-9999 ~www-client/leechcraft-dolozhee-9999 ~www-client/leechcraft-poshuku-9999 ~www-client/leechcraft-vgrabber-9999 ~www-misc/leechcraft-pogooglue-9999 ~www-misc/leechcraft-seekthru-9999 ~x11-plugins/leechcraft-tpi-9999
 SLOT=0
-_md5_=87f0255ced113da6c3d85f5a0f1b0be5
+_md5_=cc672418a1d5862cfe3ca1b81a468365
diff --git a/metadata/md5-cache/net-proxy/c-icap-0.1.7-r1 b/metadata/md5-cache/net-proxy/c-icap-0.1.7-r1
deleted file mode 100644
index a7c43ffa62b5..000000000000
--- a/metadata/md5-cache/net-proxy/c-icap-0.1.7-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=berkdb? ( sys-libs/db ) ldap? ( net-nds/openldap ) sys-libs/zlib || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
-DESCRIPTION=C Implementation of an ICAP server
-EAPI=2
-HOMEPAGE=http://c-icap.sourceforge.net/
-IUSE=berkdb ipv6 ldap
-KEYWORDS=amd64 ~arm x86
-LICENSE=LGPL-2.1
-RDEPEND=berkdb? ( sys-libs/db ) ldap? ( net-nds/openldap ) sys-libs/zlib sys-apps/openrc
-SLOT=0
-SRC_URI=mirror://sourceforge/c-icap/c_icap-0.1.7.tar.gz
-_eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=f9cab0d0e8a12ef40c5f5983bfb0699e
diff --git a/metadata/md5-cache/net-proxy/c-icap-0.2.3 b/metadata/md5-cache/net-proxy/c-icap-0.2.3-r1
similarity index 95%
rename from metadata/md5-cache/net-proxy/c-icap-0.2.3
rename to metadata/md5-cache/net-proxy/c-icap-0.2.3-r1
index 1db139699002..420b8c1a9b1b 100644
--- a/metadata/md5-cache/net-proxy/c-icap-0.2.3
+++ b/metadata/md5-cache/net-proxy/c-icap-0.2.3-r1
@@ -10,4 +10,4 @@ RDEPEND=berkdb? ( sys-libs/db ) ldap? ( net-nds/openldap ) sys-libs/zlib sys-app
 SLOT=0
 SRC_URI=mirror://sourceforge/c-icap/c_icap-0.2.3.tar.gz
 _eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=6aea9ea5c739360945b8e9d66fe2cc83
+_md5_=b419d2aea46a1246d9ae9dc0a0c21154
diff --git a/metadata/md5-cache/net-proxy/haproxy-1.4.21 b/metadata/md5-cache/net-proxy/haproxy-1.4.21
index ae3b7988ce46..fa564bbc9e70 100644
--- a/metadata/md5-cache/net-proxy/haproxy-1.4.21
+++ b/metadata/md5-cache/net-proxy/haproxy-1.4.21
@@ -10,4 +10,4 @@ RDEPEND=pcre? ( dev-libs/libpcre )
 SLOT=0
 SRC_URI=http://haproxy.1wt.eu/download/1.4/src/haproxy-1.4.21.tar.gz
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=0bc73849e523ab72dad5abe913b2ce70
+_md5_=01caa738f56ff6ebe1b6301e6c5cf25f
diff --git a/metadata/md5-cache/net-proxy/haproxy-1.4.22 b/metadata/md5-cache/net-proxy/haproxy-1.4.22
index b6a58c0cfea0..d18118d8353d 100644
--- a/metadata/md5-cache/net-proxy/haproxy-1.4.22
+++ b/metadata/md5-cache/net-proxy/haproxy-1.4.22
@@ -10,4 +10,4 @@ RDEPEND=pcre? ( dev-libs/libpcre )
 SLOT=0
 SRC_URI=http://haproxy.1wt.eu/download/1.4/src/haproxy-1.4.22.tar.gz
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=e0f9db058a2892f1fb8235fde41e10fe
+_md5_=9d8c4954a1c92171ca2ffd4d0d677414
diff --git a/metadata/md5-cache/net-proxy/haproxy-1.5_beta15 b/metadata/md5-cache/net-proxy/haproxy-1.5_beta15
index 6a9d1430fe9c..b16e47e80f48 100644
--- a/metadata/md5-cache/net-proxy/haproxy-1.5_beta15
+++ b/metadata/md5-cache/net-proxy/haproxy-1.5_beta15
@@ -10,4 +10,4 @@ RDEPEND=pcre? ( dev-libs/libpcre ) ssl? ( dev-libs/openssl[zlib?] ) zlib? ( sys-
 SLOT=0
 SRC_URI=http://haproxy.1wt.eu/download/1.5/src/devel/haproxy-1.5-dev15.tar.gz
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=b1f957028762aa0b130e131aef60dfaf
+_md5_=af338d66398414c254b3606d7329bad1
diff --git a/metadata/md5-cache/net-proxy/haproxy-1.5_beta16 b/metadata/md5-cache/net-proxy/haproxy-1.5_beta17
similarity index 87%
rename from metadata/md5-cache/net-proxy/haproxy-1.5_beta16
rename to metadata/md5-cache/net-proxy/haproxy-1.5_beta17
index 533350fb7e73..6a66d5c9acc4 100644
--- a/metadata/md5-cache/net-proxy/haproxy-1.5_beta16
+++ b/metadata/md5-cache/net-proxy/haproxy-1.5_beta17
@@ -1,4 +1,4 @@
-DEFINED_PHASES=compile install postinst prepare
+DEFINED_PHASES=compile install postinst setup
 DEPEND=pcre? ( dev-libs/libpcre ) ssl? ( dev-libs/openssl[zlib?] ) zlib? ( sys-libs/zlib )
 DESCRIPTION=A TCP/HTTP reverse proxy for high availability environments
 EAPI=4
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=pcre? ( dev-libs/libpcre ) ssl? ( dev-libs/openssl[zlib?] ) zlib? ( sys-libs/zlib )
 SLOT=0
-SRC_URI=http://haproxy.1wt.eu/download/1.5/src/devel/haproxy-1.5-dev16.tar.gz
+SRC_URI=http://haproxy.1wt.eu/download/1.5/src/devel/haproxy-1.5-dev17.tar.gz
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=79e197f5711abb407ff73df64961a335
+_md5_=ceae0fbd03c1f7915321a544eadcfaf5
diff --git a/metadata/md5-cache/net-proxy/squid-3.1.22 b/metadata/md5-cache/net-proxy/squid-3.1.22
index 8d158955de2a..c30e36f7bff5 100644
--- a/metadata/md5-cache/net-proxy/squid-3.1.22
+++ b/metadata/md5-cache/net-proxy/squid-3.1.22
@@ -4,11 +4,11 @@ DESCRIPTION=A full-featured web proxy cache
 EAPI=4
 HOMEPAGE=http://www.squid-cache.org/
 IUSE=caps ipv6 pam ldap samba sasl kerberos nis radius ssl snmp selinux logrotate test ecap icap-client mysql postgres sqlite zero-penalty-hit pf-transparent ipf-transparent kqueue elibc_uclibc kernel_linux +epoll tproxy
-KEYWORDS=~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=caps? ( >=sys-libs/libcap-2.16 ) pam? ( virtual/pam ) ldap? ( net-nds/openldap ) kerberos? ( virtual/krb5 ) ssl? ( dev-libs/openssl ) sasl? ( dev-libs/cyrus-sasl ) ecap? ( net-libs/libecap:0 ) selinux? ( sec-policy/selinux-squid ) !x86-fbsd? ( logrotate? ( app-admin/logrotate ) ) >=sys-libs/db-4 dev-lang/perl samba? ( net-fs/samba ) mysql? ( dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg ) sqlite? ( dev-perl/DBD-SQLite )
 REQUIRED_USE=tproxy? ( caps )
 SLOT=0
 SRC_URI=http://www.squid-cache.org/Versions/v3/3.1/squid-3.1.22.tar.gz
 _eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	f01ffb28843e2de3ea571f80f07e5078	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=5ea48b61236f1363ade1a50ffbb76b8d
+_md5_=f5fe788500e45dc7abd4d2930a3cde81
diff --git a/metadata/md5-cache/net-proxy/ufdbguard-1.27-r1 b/metadata/md5-cache/net-proxy/ufdbguard-1.27-r1
deleted file mode 100644
index 9ff38d1c53c9..000000000000
--- a/metadata/md5-cache/net-proxy/ufdbguard-1.27-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=dev-libs/openssl app-arch/bzip2 net-misc/wget sys-devel/bison sys-devel/flex
-DESCRIPTION=ufdbGuard is a redirector for the Squid internet proxy.
-EAPI=4
-HOMEPAGE=http://www.urlfilterdb.com/en/products/ufdbguard.html
-IUSE=+httpd doc
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/openssl app-arch/bzip2 net-misc/wget sys-apps/openrc
-SLOT=0
-SRC_URI=mirror://sourceforge/ufdbguard/ufdbGuard-1.27.tar.gz doc? ( mirror://sourceforge/ufdbguard/ReferenceManual_v1_27.pdf -> ufdbguard-1.27-manual.pdf )
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=0adb20cdaea24d5153c2d21372d794b1
diff --git a/metadata/md5-cache/net-proxy/ufdbguard-1.28 b/metadata/md5-cache/net-proxy/ufdbguard-1.28
deleted file mode 100644
index 78aed2824c0d..000000000000
--- a/metadata/md5-cache/net-proxy/ufdbguard-1.28
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=dev-libs/openssl app-arch/bzip2 net-misc/wget sys-devel/bison sys-devel/flex
-DESCRIPTION=ufdbGuard is a redirector for the Squid internet proxy.
-EAPI=4
-HOMEPAGE=http://www.urlfilterdb.com/en/products/ufdbguard.html
-IUSE=+httpd doc
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/openssl app-arch/bzip2 net-misc/wget sys-apps/openrc
-SLOT=0
-SRC_URI=mirror://sourceforge/ufdbguard/ufdbGuard-1.28.tar.gz doc? ( mirror://sourceforge/ufdbguard/ReferenceManual_v1_28.pdf -> ufdbguard-1.28-manual.pdf )
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=3260c318ef93eafb37238038dee1f34a
diff --git a/metadata/md5-cache/sci-misc/gcam-2010.07.27 b/metadata/md5-cache/sci-misc/gcam-2010.07.27
deleted file mode 100644
index efc3bff68b41..000000000000
--- a/metadata/md5-cache/sci-misc/gcam-2010.07.27
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=>=media-libs/libpng-1.5 x11-libs/gtk+:2 x11-libs/gtkglext
-DESCRIPTION=GNU Computer Aided Manufacturing
-EAPI=1
-HOMEPAGE=http://gcam.js.cx
-KEYWORDS=amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=>=media-libs/libpng-1.5 x11-libs/gtk+:2 x11-libs/gtkglext
-SLOT=0
-SRC_URI=http://gcam.js.cx/files/gcam-2010.07.27.tar.gz
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=be4054f5010645e6a3e0c7833bd76d76
diff --git a/metadata/md5-cache/sci-misc/gcam-2010.07.27-r1 b/metadata/md5-cache/sci-misc/gcam-2010.07.27-r1
index 13d259418a49..3cc86ccf1294 100644
--- a/metadata/md5-cache/sci-misc/gcam-2010.07.27-r1
+++ b/metadata/md5-cache/sci-misc/gcam-2010.07.27-r1
@@ -3,10 +3,10 @@ DEPEND=dev-libs/expat dev-libs/glib:2 >=media-libs/libpng-1.5 virtual/opengl vir
 DESCRIPTION=GNU Computer Aided Manufacturing
 EAPI=5
 HOMEPAGE=http://gcam.js.cx
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=dev-libs/expat dev-libs/glib:2 >=media-libs/libpng-1.5 virtual/opengl virtual/glu x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/gtkglext
 SLOT=0
 SRC_URI=http://gcam.js.cx/files/gcam-2010.07.27.tar.gz
 _eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	d40dc948067bd3db1c8ebf7d51897313	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=e6687c482c3178eef52e0372f0e43d6a
+_md5_=9eb9687671dbd4c907a6a1622c336033
diff --git a/metadata/md5-cache/sys-apps/haveged-1.4 b/metadata/md5-cache/sys-apps/haveged-1.4
deleted file mode 100644
index 8851d9547019..000000000000
--- a/metadata/md5-cache/sys-apps/haveged-1.4
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure install test
-DEPEND=sys-devel/gcc
-DESCRIPTION=A simple entropy daemon using the HAVEGE algorithm
-EAPI=4
-HOMEPAGE=http://www.issihosts.com/haveged/
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=sys-apps/openrc
-SLOT=0
-SRC_URI=http://www.issihosts.com/haveged/haveged-1.4.tar.gz
-_md5_=0c3bc579f5eebe7e64031193e4dbe53c
diff --git a/metadata/md5-cache/sys-apps/lm_sensors-3.3.3-r1 b/metadata/md5-cache/sys-apps/lm_sensors-3.3.3-r1
index 673b59177112..ed8c7e5b080b 100644
--- a/metadata/md5-cache/sys-apps/lm_sensors-3.3.3-r1
+++ b/metadata/md5-cache/sys-apps/lm_sensors-3.3.3-r1
@@ -10,4 +10,4 @@ RDEPEND=dev-lang/perl sensord? ( net-analyzer/rrdtool virtual/logger )
 SLOT=0
 SRC_URI=http://dl.lm-sensors.org/lm-sensors/releases/lm_sensors-3.3.3.tar.bz2
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	linux-info	f01ffb28843e2de3ea571f80f07e5078	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=5187b9b4cac7a9676f57def3753f4858
+_md5_=2828f46ca7e7b03f7eccc12ff33b53f0
diff --git a/metadata/md5-cache/sys-apps/openrc-0.11.8 b/metadata/md5-cache/sys-apps/openrc-0.11.8
index a032c0f78433..3b44288a135f 100644
--- a/metadata/md5-cache/sys-apps/openrc-0.11.8
+++ b/metadata/md5-cache/sys-apps/openrc-0.11.8
@@ -4,10 +4,10 @@ DESCRIPTION=OpenRC manages the services, startup and shutdown of a host
 EAPI=4
 HOMEPAGE=http://www.gentoo.org/proj/en/base/openrc/
 IUSE=debug elibc_glibc ncurses pam newnet prefix selinux static-libs unicode kernel_linux kernel_FreeBSD
-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=virtual/init kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) ) elibc_glibc? ( >=sys-libs/glibc-2.5 ) ncurses? ( sys-libs/ncurses ) pam? ( sys-auth/pambase ) >=sys-apps/baselayout-2.1-r1 kernel_linux? ( sys-process/psmisc ) !<sys-fs/udev-init-scripts-17 !<sys-fs/udev-133
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~williamh/dist/openrc-0.11.8.tar.bz2
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	multilib	9aa8a023e062fca0ba79362d9d0cc488	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=ddbb2c84d535ab34815e3c2760ec00bd
+_md5_=c96178184bd845c6a11ec4d46e2a8057
diff --git a/metadata/md5-cache/sys-apps/pcsc-lite-1.6.6-r2 b/metadata/md5-cache/sys-apps/pcsc-lite-1.6.6-r2
deleted file mode 100644
index 69cfe7ee7cee..000000000000
--- a/metadata/md5-cache/sys-apps/pcsc-lite-1.6.6-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst setup
-DEPEND=usb? ( virtual/libusb:1 ) virtual/pkgconfig virtual/pkgconfig
-DESCRIPTION=PC/SC Architecture smartcard middleware library
-EAPI=4
-HOMEPAGE=http://pcsclite.alioth.debian.org/
-IUSE=usb kernel_linux
-KEYWORDS=amd64 arm hppa ia64 m68k ppc ppc64 s390 sh sparc x86 ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos
-LICENSE=BSD ISC
-RDEPEND=usb? ( virtual/libusb:1 ) !<app-crypt/ccid-1.4.1-r1 kernel_linux? ( virtual/udev )
-SLOT=0
-SRC_URI=http://alioth.debian.org/download.php/3479/pcsc-lite-1.6.6.tar.bz2
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	udev	4f764d2b1e34e4ef12b9b0d6e680c0ee	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=30f5f10d6d2d82ae4a6d14add12c41a9
diff --git a/metadata/md5-cache/sys-cluster/vzctl-4.1.1 b/metadata/md5-cache/sys-cluster/vzctl-4.1.1-r1
similarity index 96%
rename from metadata/md5-cache/sys-cluster/vzctl-4.1.1
rename to metadata/md5-cache/sys-cluster/vzctl-4.1.1-r1
index 8b52549d84f0..bf4f629a9590 100644
--- a/metadata/md5-cache/sys-cluster/vzctl-4.1.1
+++ b/metadata/md5-cache/sys-cluster/vzctl-4.1.1-r1
@@ -10,4 +10,4 @@ RDEPEND=net-firewall/iptables sys-apps/ed >=sys-apps/iproute2-3.0 sys-fs/vzquota
 SLOT=0
 SRC_URI=http://download.openvz.org/utils/vzctl/4.1.1/src/vzctl-4.1.1.tar.bz2
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	udev	4f764d2b1e34e4ef12b9b0d6e680c0ee	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=6579d66f100e049bfde089d269570982
+_md5_=defa4beed26cc86eb8c10c9decde138f
diff --git a/metadata/md5-cache/sys-devel/autoconf-2.69 b/metadata/md5-cache/sys-devel/autoconf-2.69
index 07d4e259ad3a..ed4af5b2c4dc 100644
--- a/metadata/md5-cache/sys-devel/autoconf-2.69
+++ b/metadata/md5-cache/sys-devel/autoconf-2.69
@@ -4,10 +4,10 @@ DESCRIPTION=Used to create autoconfiguration files
 EAPI=3
 HOMEPAGE=http://www.gnu.org/software/autoconf/autoconf.html
 IUSE=emacs
-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=GPL-3
 PDEPEND=emacs? ( app-emacs/autoconf-mode )
 RDEPEND=>=sys-apps/texinfo-4.3 >=sys-devel/m4-1.4.16 >=dev-lang/perl-5.6 >=sys-devel/autoconf-wrapper-10
 SLOT=2.5
 SRC_URI=mirror://gnu/autoconf/autoconf-2.69.tar.xz ftp://alpha.gnu.org/pub/gnu/autoconf/autoconf-2.69.tar.xz
-_md5_=5a959cba67d369be1580c08462ce8396
+_md5_=92221c28189a83c29688b4bbca9a73c2
diff --git a/metadata/md5-cache/sys-fs/multipath-tools-0.4.9-r5 b/metadata/md5-cache/sys-fs/multipath-tools-0.4.9-r5
index 92fea25573a3..1e47177ecb9e 100644
--- a/metadata/md5-cache/sys-fs/multipath-tools-0.4.9-r5
+++ b/metadata/md5-cache/sys-fs/multipath-tools-0.4.9-r5
@@ -3,10 +3,10 @@ DEPEND=|| ( >=sys-fs/lvm2-2.02.45 >=sys-fs/device-mapper-1.00.19-r1 ) virtual/ud
 DESCRIPTION=Device mapper target autoconfig
 EAPI=4
 HOMEPAGE=http://christophe.varoqui.free.fr/
-KEYWORDS=amd64 ~arm ~ppc ppc64 x86
+KEYWORDS=amd64 ~arm ppc ppc64 x86
 LICENSE=GPL-2
 RDEPEND=|| ( >=sys-fs/lvm2-2.02.45 >=sys-fs/device-mapper-1.00.19-r1 ) virtual/udev dev-libs/libaio sys-libs/readline !<sys-apps/baselayout-2
 SLOT=0
 SRC_URI=http://christophe.varoqui.free.fr/multipath-tools/multipath-tools-0.4.9.tar.bz2
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	udev	4f764d2b1e34e4ef12b9b0d6e680c0ee	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=1a23b3a1c5424245203919b6042bfa44
+_md5_=581fd93ee86794e30b1ad4bbf2477a7d
diff --git a/metadata/md5-cache/sys-kernel/hardened-sources-3.7.1 b/metadata/md5-cache/sys-kernel/hardened-sources-3.7.1
new file mode 100644
index 000000000000..0a6c3c531b5b
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/hardened-sources-3.7.1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Hardened kernel sources (kernel series 3.7)
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/
+IUSE=deblob symlink build deblob
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2 !deblob? ( freedist )
+PDEPEND=!build? ( virtual/dev-manager )
+RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
+RESTRICT=binchecks strip
+SLOT=3.7.1
+SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.7.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.7.N/deblob-3.7 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.7.N/deblob-check -> deblob-check-3.7 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-3.7.1-1.extras.tar.bz2 mirror://gentoo/genpatches-3.7-3.base.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	kernel-2	dd451098928ff900df7c254820871c00	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=9ec5705d248534ed1c2c467adfb2b87e
diff --git a/metadata/md5-cache/sys-libs/glibc-2.16.0 b/metadata/md5-cache/sys-libs/glibc-2.16.0
index c88ecdbea37a..159e0b02335e 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.16.0
+++ b/metadata/md5-cache/sys-libs/glibc-2.16.0
@@ -8,6 +8,6 @@ LICENSE=LGPL-2
 RDEPEND=!sys-kernel/ps3-sources selinux? ( sys-libs/libselinux ) !sys-libs/nss-db vanilla? ( !sys-libs/timezone-data ) !vanilla? ( sys-libs/timezone-data )
 RESTRICT=strip
 SLOT=2.2
-SRC_URI=mirror://gnu/glibc/glibc-2.16.0.tar.xz ftp://sources.redhat.com/pub/glibc/releases/glibc-2.16.0.tar.xz ftp://sources.redhat.com/pub/glibc/snapshots/glibc-2.16.0.tar.xz mirror://gentoo/glibc-2.16.0.tar.xz mirror://gnu/glibc/glibc-ports-2.16.0.tar.xz ftp://sources.redhat.com/pub/glibc/releases/glibc-ports-2.16.0.tar.xz ftp://sources.redhat.com/pub/glibc/snapshots/glibc-ports-2.16.0.tar.xz mirror://gentoo/glibc-ports-2.16.0.tar.xz mirror://gentoo/glibc-2.16.0-patches-8.tar.bz2 http://dev.gentoo.org/~vapier/dist/glibc-2.16.0-patches-8.tar.bz2 http://dev.gentoo.org/~azarah/glibc/glibc-2.16.0-patches-8.tar.bz2
+SRC_URI=mirror://gnu/glibc/glibc-2.16.0.tar.xz ftp://sources.redhat.com/pub/glibc/releases/glibc-2.16.0.tar.xz ftp://sources.redhat.com/pub/glibc/snapshots/glibc-2.16.0.tar.xz mirror://gentoo/glibc-2.16.0.tar.xz mirror://gnu/glibc/glibc-ports-2.16.0.tar.xz ftp://sources.redhat.com/pub/glibc/releases/glibc-ports-2.16.0.tar.xz ftp://sources.redhat.com/pub/glibc/snapshots/glibc-ports-2.16.0.tar.xz mirror://gentoo/glibc-ports-2.16.0.tar.xz mirror://gentoo/glibc-2.16.0-patches-9.tar.bz2 http://dev.gentoo.org/~vapier/dist/glibc-2.16.0-patches-9.tar.bz2 http://dev.gentoo.org/~azarah/glibc/glibc-2.16.0-patches-9.tar.bz2
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	unpacker	50e1227854e96469a19a63f053496328	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=36a77bd6487adc63d07adde2691eccfa
+_md5_=15a92b50821b2700d940bb6d3b74f36b
diff --git a/metadata/md5-cache/sys-libs/glibc-2.17 b/metadata/md5-cache/sys-libs/glibc-2.17
index cbcfe1143c50..01f7d8e1586d 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.17
+++ b/metadata/md5-cache/sys-libs/glibc-2.17
@@ -9,4 +9,4 @@ RESTRICT=strip
 SLOT=2.2
 SRC_URI=mirror://gnu/glibc/glibc-2.17.tar.xz ftp://sources.redhat.com/pub/glibc/releases/glibc-2.17.tar.xz ftp://sources.redhat.com/pub/glibc/snapshots/glibc-2.17.tar.xz mirror://gentoo/glibc-2.17.tar.xz mirror://gentoo/glibc-2.17-patches-1.tar.bz2 http://dev.gentoo.org/~vapier/dist/glibc-2.17-patches-1.tar.bz2 http://dev.gentoo.org/~azarah/glibc/glibc-2.17-patches-1.tar.bz2
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	unpacker	50e1227854e96469a19a63f053496328	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=c305f111edf767eee6d17f3e974cd1c9
+_md5_=8554610e5aaa1b32e586af7139e65a7a
diff --git a/metadata/md5-cache/sys-libs/libhx-3.14 b/metadata/md5-cache/sys-libs/libhx-3.14
index 0c1bf2043c08..e244cbd48a2e 100644
--- a/metadata/md5-cache/sys-libs/libhx-3.14
+++ b/metadata/md5-cache/sys-libs/libhx-3.14
@@ -7,4 +7,5 @@ KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=mirror://sourceforge/libhx/libHX-3.14.tar.xz
-_md5_=23aa29a038ad3aea8d68da5e56ffb5ba
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=a42427429c479bf52981be7a8b105c8f
diff --git a/metadata/md5-cache/sys-libs/mtdev-1.1.3 b/metadata/md5-cache/sys-libs/mtdev-1.1.3
index 69f2cb4862d9..0a6afeb58647 100644
--- a/metadata/md5-cache/sys-libs/mtdev-1.1.3
+++ b/metadata/md5-cache/sys-libs/mtdev-1.1.3
@@ -4,8 +4,8 @@ DESCRIPTION=Multitouch Protocol Translation Library
 EAPI=4
 HOMEPAGE=http://bitmath.org/code/mtdev/
 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=MIT
 SLOT=0
 SRC_URI=http://bitmath.org/code/mtdev/mtdev-1.1.3.tar.bz2
-_md5_=3b967b9424c8ad3dfc2dfb54435f7f70
+_md5_=75789d141cbbb04099337fdd288343f4
diff --git a/metadata/md5-cache/virtual/glu-9.0 b/metadata/md5-cache/virtual/glu-9.0
index 62bbab26de09..b51b6531f2f5 100644
--- a/metadata/md5-cache/virtual/glu-9.0
+++ b/metadata/md5-cache/virtual/glu-9.0
@@ -1,6 +1,6 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for OpenGL utility library
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( media-libs/glu <media-libs/mesa-9 media-libs/opengl-apple )
 SLOT=0
-_md5_=48d1fe050e2eaf4c846587871e7b0faf
+_md5_=b4b60199bcd1132c9531f11f0dbd1cd8
diff --git a/metadata/md5-cache/www-apps/collectd-web-0.4.0 b/metadata/md5-cache/www-apps/collectd-web-0.4.0
index d80d585b3f3f..952129a9ae2e 100644
--- a/metadata/md5-cache/www-apps/collectd-web-0.4.0
+++ b/metadata/md5-cache/www-apps/collectd-web-0.4.0
@@ -2,7 +2,7 @@ DEFINED_PHASES=install postinst prerm setup
 DEPEND=dev-perl/HTML-Parser net-analyzer/rrdtool[perl] dev-perl/JSON virtual/perl-CGI dev-perl/URI virtual/perl-Time-Local virtual/ttf-fonts >=app-admin/webapp-config-1.50.15
 DESCRIPTION=Collectd-web is a web-based front-end for RRD data collected by collectd
 EAPI=3
-HOMEPAGE=http://kenny.belitzky.com/projects/collectd-web
+HOMEPAGE=http://collectdweb.appspot.com/
 IUSE=vhosts
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
@@ -10,4 +10,4 @@ RDEPEND=dev-perl/HTML-Parser net-analyzer/rrdtool[perl] dev-perl/JSON virtual/pe
 SLOT=0.4.0
 SRC_URI=https://github.com/httpdss/collectd-web/tarball/0.4.0 -> collectd-web-0.4.0.tar.gz
 _eclasses_=webapp	25b9b1696f5e698711f47d45c3d45e3e
-_md5_=e14230624ffc1cf7f82a4a0c2943c5f3
+_md5_=64dba4eb7e2531e0e04e305695e2efbf
diff --git a/metadata/md5-cache/www-client/opera-12.12_p1707 b/metadata/md5-cache/www-client/opera-12.12_p1707
index f378f079d5e1..415165eaa13a 100644
--- a/metadata/md5-cache/www-client/opera-12.12_p1707
+++ b/metadata/md5-cache/www-client/opera-12.12_p1707
@@ -10,4 +10,4 @@ RDEPEND=media-libs/fontconfig media-libs/freetype sys-apps/util-linux sys-libs/z
 SLOT=0
 SRC_URI=amd64? ( mirror://opera/linux/1212/opera-12.12-1707.x86_64.linux.tar.xz ) x86? ( mirror://opera/linux/1212/opera-12.12-1707.i386.linux.tar.xz ) x86-fbsd? ( mirror://opera/unix/1212/opera-12.12-1707.i386.freebsd.tar.xz )
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	multilib	9aa8a023e062fca0ba79362d9d0cc488	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=3055e80ab1741ba152a35e3037609a87
+_md5_=814f61fdd02e7d9196aef2250930b714
diff --git a/metadata/md5-cache/www-client/opera-next-12.12_pre1707 b/metadata/md5-cache/www-client/opera-next-12.12_pre1707
index d3a8c7a631d9..16cfc261e4a7 100644
--- a/metadata/md5-cache/www-client/opera-next-12.12_pre1707
+++ b/metadata/md5-cache/www-client/opera-next-12.12_pre1707
@@ -10,4 +10,4 @@ RDEPEND=media-libs/fontconfig media-libs/freetype sys-apps/util-linux sys-libs/z
 SLOT=0
 SRC_URI=amd64? ( http://snapshot.opera.com/unix/13497_12.12-1707/opera-next-12.12-1707.x86_64.linux.tar.xz ) x86? ( http://snapshot.opera.com/unix/13497_12.12-1707/opera-next-12.12-1707.i386.linux.tar.xz ) x86-fbsd? ( http://snapshot.opera.com/unix/13497_12.12-1707/opera-next-12.12-1707.i386.freebsd.tar.xz )
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	multilib	9aa8a023e062fca0ba79362d9d0cc488	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=172ea6aaa8bd5e5728edcf8ba69c531f
+_md5_=cf441aacaff3e3d797cb3a17ebb2fd04
diff --git a/metadata/md5-cache/www-misc/bookmarksync-0.3.4-r1 b/metadata/md5-cache/www-misc/bookmarksync-0.3.4-r1
deleted file mode 100644
index e1ebfddcb376..000000000000
--- a/metadata/md5-cache/www-misc/bookmarksync-0.3.4-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst
-DESCRIPTION=bookmarksync synchronizes various browser bookmark files
-HOMEPAGE=http://sourceforge.net/projects/booksync/
-IUSE=perl
-KEYWORDS=ppc x86
-LICENSE=GPL-2
-RDEPEND=perl? ( dev-lang/perl )
-RESTRICT=mirror
-SLOT=0
-SRC_URI=mirror://sourceforge/booksync/bookmarksync-0.3.4.tar.gz
-_md5_=269822f41c4ef061461867efaa729af0
diff --git a/metadata/md5-cache/www-misc/bookmarksync-0.3.4-r2 b/metadata/md5-cache/www-misc/bookmarksync-0.3.4-r2
index 5edff8d9b557..6bb5a37acafc 100644
--- a/metadata/md5-cache/www-misc/bookmarksync-0.3.4-r2
+++ b/metadata/md5-cache/www-misc/bookmarksync-0.3.4-r2
@@ -3,11 +3,11 @@ DESCRIPTION=bookmarksync synchronizes various browser bookmark files
 EAPI=2
 HOMEPAGE=http://sourceforge.net/projects/booksync/
 IUSE=perl
-KEYWORDS=~amd64 ~ppc x86
+KEYWORDS=~amd64 ppc x86
 LICENSE=GPL-2
 RDEPEND=perl? ( dev-lang/perl )
 RESTRICT=mirror
 SLOT=0
 SRC_URI=mirror://sourceforge/booksync/bookmarksync-0.3.4.tar.gz
 _eclasses_=multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4
-_md5_=08942fb1331ca189b85ac90c97dd825f
+_md5_=1406cbd5d6cecabd6ec14a8a73166aaa
diff --git a/metadata/md5-cache/x11-apps/xbacklight-1.2.0 b/metadata/md5-cache/x11-apps/xbacklight-1.2.0
index f3068d6d2d05..a2d885ef050d 100644
--- a/metadata/md5-cache/x11-apps/xbacklight-1.2.0
+++ b/metadata/md5-cache/x11-apps/xbacklight-1.2.0
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libxcb >=x11-libs/xcb-util-0.3.8 || ( >=sys-devel/automake-1.11.
 DESCRIPTION=Sets backlight level using the RandR 1.2 BACKLIGHT output property
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 RDEPEND=x11-libs/libxcb >=x11-libs/xcb-util-0.3.8
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xbacklight-1.2.0.tar.bz2
 _eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	autotools-utils	f4dc5b0e643575b9bd31a2bd7deeee31	eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	ff8fcdb08e36af162e7cfd65dd10be44
-_md5_=418554f834da726ff2bdb8a88bd30962
+_md5_=efe584fd1e72cd8aa77ab095f7c3a156
diff --git a/metadata/md5-cache/x11-base/xorg-drivers-1.13 b/metadata/md5-cache/x11-base/xorg-drivers-1.13
index 50b14073b4e1..82c89f2558c0 100644
--- a/metadata/md5-cache/x11-base/xorg-drivers-1.13
+++ b/metadata/md5-cache/x11-base/xorg-drivers-1.13
@@ -3,8 +3,8 @@ DESCRIPTION=Meta package containing deps on all xorg drivers
 EAPI=4
 HOMEPAGE=http://www.gentoo.org/
 IUSE=video_cards_apm video_cards_ark video_cards_ast video_cards_chips video_cards_cirrus video_cards_dummy video_cards_epson video_cards_fbdev video_cards_geode video_cards_glint video_cards_i128 video_cards_i740 video_cards_intel video_cards_mach64 video_cards_mga video_cards_modesetting video_cards_neomagic video_cards_newport video_cards_nouveau video_cards_nv video_cards_omap video_cards_omapfb video_cards_qxl video_cards_r128 video_cards_radeon video_cards_rendition video_cards_s3 video_cards_s3virge video_cards_savage video_cards_siliconmotion video_cards_sis video_cards_sisusb video_cards_sunbw2 video_cards_suncg14 video_cards_suncg3 video_cards_suncg6 video_cards_sunffb video_cards_sunleo video_cards_suntcx video_cards_tdfx video_cards_tga video_cards_trident video_cards_tseng video_cards_v4l video_cards_vesa video_cards_via video_cards_virtualbox video_cards_vmware video_cards_voodoo video_cards_fglrx video_cards_nvidia input_devices_acecad input_devices_aiptek input_devices_elographics input_devices_evdev input_devices_fpit input_devices_hyperpen input_devices_joystick input_devices_keyboard input_devices_mouse input_devices_mutouch input_devices_penmount input_devices_tslib input_devices_vmmouse input_devices_void input_devices_synaptics input_devices_wacom
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=metapackage
 PDEPEND=input_devices_acecad? ( x11-drivers/xf86-input-acecad ) input_devices_aiptek? ( x11-drivers/xf86-input-aiptek ) input_devices_elographics? ( x11-drivers/xf86-input-elographics ) input_devices_evdev? ( x11-drivers/xf86-input-evdev ) input_devices_fpit? ( x11-drivers/xf86-input-fpit ) input_devices_hyperpen? ( x11-drivers/xf86-input-hyperpen ) input_devices_joystick? ( x11-drivers/xf86-input-joystick ) input_devices_keyboard? ( x11-drivers/xf86-input-keyboard ) input_devices_mouse? ( x11-drivers/xf86-input-mouse ) input_devices_mutouch? ( x11-drivers/xf86-input-mutouch ) input_devices_penmount? ( x11-drivers/xf86-input-penmount ) input_devices_tslib? ( x11-drivers/xf86-input-tslib ) input_devices_vmmouse? ( x11-drivers/xf86-input-vmmouse ) input_devices_void? ( x11-drivers/xf86-input-void ) input_devices_synaptics? ( x11-drivers/xf86-input-synaptics ) input_devices_wacom? ( x11-drivers/xf86-input-wacom ) video_cards_apm? ( x11-drivers/xf86-video-apm ) video_cards_ark? ( x11-drivers/xf86-video-ark ) video_cards_ast? ( x11-drivers/xf86-video-ast ) video_cards_chips? ( x11-drivers/xf86-video-chips ) video_cards_cirrus? ( x11-drivers/xf86-video-cirrus ) video_cards_dummy? ( x11-drivers/xf86-video-dummy ) video_cards_fbdev? ( x11-drivers/xf86-video-fbdev ) video_cards_geode? ( x11-drivers/xf86-video-geode ) video_cards_glint? ( x11-drivers/xf86-video-glint ) video_cards_i128? ( x11-drivers/xf86-video-i128 ) video_cards_i740? ( x11-drivers/xf86-video-i740 ) video_cards_intel? ( x11-drivers/xf86-video-intel ) video_cards_mach64? ( x11-drivers/xf86-video-mach64 ) video_cards_mga? ( x11-drivers/xf86-video-mga ) video_cards_modesetting? ( x11-drivers/xf86-video-modesetting ) video_cards_neomagic? ( x11-drivers/xf86-video-neomagic ) video_cards_newport? ( x11-drivers/xf86-video-newport ) video_cards_nouveau? ( x11-drivers/xf86-video-nouveau ) video_cards_nv? ( x11-drivers/xf86-video-nv ) video_cards_omap? ( x11-drivers/xf86-video-omap ) video_cards_omapfb? ( x11-drivers/xf86-video-omapfb ) video_cards_qxl? ( x11-drivers/xf86-video-qxl ) video_cards_nvidia? ( x11-drivers/nvidia-drivers ) video_cards_fglrx? ( x11-drivers/ati-drivers ) video_cards_r128? ( x11-drivers/xf86-video-r128 ) video_cards_radeon? ( x11-drivers/xf86-video-ati ) video_cards_rendition? ( x11-drivers/xf86-video-rendition ) video_cards_s3? ( x11-drivers/xf86-video-s3 ) video_cards_s3virge? ( x11-drivers/xf86-video-s3virge ) video_cards_savage? ( x11-drivers/xf86-video-savage ) video_cards_siliconmotion? ( x11-drivers/xf86-video-siliconmotion ) video_cards_sis? ( x11-drivers/xf86-video-sis ) video_cards_sisusb? ( x11-drivers/xf86-video-sisusb ) video_cards_suncg14? ( x11-drivers/xf86-video-suncg14 ) video_cards_suncg3? ( x11-drivers/xf86-video-suncg3 ) video_cards_suncg6? ( x11-drivers/xf86-video-suncg6 ) video_cards_sunffb? ( x11-drivers/xf86-video-sunffb ) video_cards_sunleo? ( x11-drivers/xf86-video-sunleo ) video_cards_suntcx? ( x11-drivers/xf86-video-suntcx ) video_cards_tdfx? ( x11-drivers/xf86-video-tdfx ) video_cards_tga? ( x11-drivers/xf86-video-tga ) video_cards_trident? ( x11-drivers/xf86-video-trident ) video_cards_tseng? ( x11-drivers/xf86-video-tseng ) video_cards_v4l? ( x11-drivers/xf86-video-v4l ) video_cards_vesa? ( x11-drivers/xf86-video-vesa ) video_cards_via? ( x11-drivers/xf86-video-openchrome ) video_cards_virtualbox? ( x11-drivers/xf86-video-virtualbox ) video_cards_vmware? ( x11-drivers/xf86-video-vmware ) video_cards_voodoo? ( x11-drivers/xf86-video-voodoo ) !x11-drivers/xf86-input-citron !x11-drivers/xf86-video-cyrix !x11-drivers/xf86-video-impact !x11-drivers/xf86-video-nsc !x11-drivers/xf86-video-sunbw2
 SLOT=0
-_md5_=6889428ebc631261fd0cdf5f9b8b5ccb
+_md5_=07a504c47993ae3bb70bb94ec31258c6
diff --git a/metadata/md5-cache/x11-base/xorg-server-1.13.1 b/metadata/md5-cache/x11-base/xorg-server-1.13.1
index 0e5fa41fea1a..c78221453f2e 100644
--- a/metadata/md5-cache/x11-base/xorg-server-1.13.1
+++ b/metadata/md5-cache/x11-base/xorg-server-1.13.1
@@ -4,7 +4,7 @@ DESCRIPTION=X.Org X servers
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=dmx kdrive xnest xorg xvfb ipv6 minimal nptl selinux +suid tslib +udev static-libs doc
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 PDEPEND=xorg? ( >=x11-base/xorg-drivers-1.13 )
 RDEPEND=>=app-admin/eselect-opengl-1.0.8 dev-libs/openssl media-libs/freetype >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libdrm-2.4.20 >=x11-libs/libpciaccess-0.12.901 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont-1.4.2 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/pixman-0.21.8 >=x11-libs/xtrans-1.2.2 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 dmx? ( x11-libs/libXt >=x11-libs/libdmx-1.0.99.1 >=x11-libs/libX11-1.1.5 >=x11-libs/libXaw-1.0.4 >=x11-libs/libXext-1.0.99.4 >=x11-libs/libXfixes-5.0 >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXmu-1.0.3 x11-libs/libXrender >=x11-libs/libXres-1.0.3 >=x11-libs/libXtst-1.0.99.2 ) kdrive? ( >=x11-libs/libXext-1.0.5 x11-libs/libXv ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-8[nptl=] ) tslib? ( >=x11-libs/tslib-1.0 ) udev? ( >=virtual/udev-150 ) >=x11-apps/xinit-1.3 selinux? ( sec-policy/selinux-xserver )
@@ -12,4 +12,4 @@ REQUIRED_USE=!minimal? ( || ( dmx kdrive xnest xorg xvfb ) )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.13.1.tar.bz2
 _eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	autotools-utils	f4dc5b0e643575b9bd31a2bd7deeee31	eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xorg-2	ff8fcdb08e36af162e7cfd65dd10be44
-_md5_=341955629e086c882625dc19dabecd9d
+_md5_=9c99545ca04940d63a3562b2c95c99fb
diff --git a/metadata/md5-cache/x11-drivers/ati-drivers-12.6_beta_pre897 b/metadata/md5-cache/x11-drivers/ati-drivers-12.6_beta_pre897
index 52ac00b8e19c..416d6e705e46 100644
--- a/metadata/md5-cache/x11-drivers/ati-drivers-12.6_beta_pre897
+++ b/metadata/md5-cache/x11-drivers/ati-drivers-12.6_beta_pre897
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile install postinst postrm preinst prepare prerm pretend setup test unpack
-DEPEND=<=x11-base/xorg-server-1.12.49[-minimal] >=app-admin/eselect-opengl-1.0.7 app-admin/eselect-opencl sys-power/acpid x11-apps/xauth x11-libs/libX11 x11-libs/libXext x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender multilib? ( app-emulation/emul-linux-x86-opengl app-emulation/emul-linux-x86-xlibs ) qt4? ( x11-libs/libICE x11-libs/libSM x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXxf86vm x11-libs/qt-core x11-libs/qt-gui ) x11-proto/inputproto x11-proto/xf86miscproto x11-proto/xf86vidmodeproto x11-proto/xineramaproto x11-libs/libXtst sys-apps/findutils app-misc/pax-utils app-arch/unzip kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
+DEPEND=<=x11-base/xorg-server-1.12.49[-minimal] >=app-admin/eselect-opengl-1.0.7 app-admin/eselect-opencl sys-power/acpid x11-apps/xauth x11-libs/libX11 x11-libs/libXext x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender multilib? ( app-emulation/emul-linux-x86-opengl app-emulation/emul-linux-x86-xlibs ) qt4? ( x11-libs/libICE x11-libs/libSM x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXxf86vm x11-libs/qt-core:4 x11-libs/qt-gui:4 ) x11-proto/inputproto x11-proto/xf86miscproto x11-proto/xf86vidmodeproto x11-proto/xineramaproto x11-libs/libXtst sys-apps/findutils app-misc/pax-utils app-arch/unzip kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
 DESCRIPTION=Ati precompiled drivers for radeon r600 (HD Series) and newer chipsets
 EAPI=4
 HOMEPAGE=http://www.amd.com
 IUSE=debug +modules multilib qt4 static-libs kernel_linux
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=AMD GPL-2 QPL-1.0
-RDEPEND=<=x11-base/xorg-server-1.12.49[-minimal] >=app-admin/eselect-opengl-1.0.7 app-admin/eselect-opencl sys-power/acpid x11-apps/xauth x11-libs/libX11 x11-libs/libXext x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender multilib? ( app-emulation/emul-linux-x86-opengl app-emulation/emul-linux-x86-xlibs ) qt4? ( x11-libs/libICE x11-libs/libSM x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXxf86vm x11-libs/qt-core x11-libs/qt-gui ) kernel_linux? ( virtual/modutils )
+RDEPEND=<=x11-base/xorg-server-1.12.49[-minimal] >=app-admin/eselect-opengl-1.0.7 app-admin/eselect-opencl sys-power/acpid x11-apps/xauth x11-libs/libX11 x11-libs/libXext x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender multilib? ( app-emulation/emul-linux-x86-opengl app-emulation/emul-linux-x86-xlibs ) qt4? ( x11-libs/libICE x11-libs/libSM x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXxf86vm x11-libs/qt-core:4 x11-libs/qt-gui:4 ) kernel_linux? ( virtual/modutils )
 RESTRICT=bindist
 SLOT=1
 SRC_URI=http://www2.ati.com/drivers/legacy/amd-driver-installer-12.6-legacy-x86.x86_64.zip
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	linux-info	f01ffb28843e2de3ea571f80f07e5078	linux-mod	dbc722ed035721476f23ab7b0572985e	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=09fc5f539ae68a4019d5dcbaa62e9305
+_md5_=04437bbe73420f8bd99d966e01e60e4d
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-elographics-1.4.1 b/metadata/md5-cache/x11-drivers/xf86-input-elographics-1.4.1
index 3ed2d27bb5e0..7789240d55c7 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-elographics-1.4.1
+++ b/metadata/md5-cache/x11-drivers/xf86-input-elographics-1.4.1
@@ -3,10 +3,10 @@ DEPEND=|| ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=
 DESCRIPTION=Elographics input driver
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 arm ~hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 RDEPEND=x11-base/xorg-server[xorg]
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-input-elographics-1.4.1.tar.bz2
 _eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	autotools-utils	f4dc5b0e643575b9bd31a2bd7deeee31	eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	ff8fcdb08e36af162e7cfd65dd10be44
-_md5_=a8c92fe7fd718f99f005fcf52995af74
+_md5_=13ae969d165353d5eedd2812dc4bb95e
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-evdev-2.7.3 b/metadata/md5-cache/x11-drivers/xf86-input-evdev-2.7.3
index c50d1c053cff..ad2a2bace293 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-evdev-2.7.3
+++ b/metadata/md5-cache/x11-drivers/xf86-input-evdev-2.7.3
@@ -3,10 +3,10 @@ DEPEND=>=x11-base/xorg-server-1.10[udev] sys-libs/mtdev >=x11-proto/inputproto-2
 DESCRIPTION=Generic Linux input driver
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
-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=MIT
 RDEPEND=>=x11-base/xorg-server-1.10[udev] sys-libs/mtdev x11-base/xorg-server[xorg]
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-input-evdev-2.7.3.tar.bz2
 _eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	autotools-utils	f4dc5b0e643575b9bd31a2bd7deeee31	eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	ff8fcdb08e36af162e7cfd65dd10be44
-_md5_=86f7d9ce783ade1f2d0df561ab57b29d
+_md5_=78e9733cee60c1eef2f6628d4b305d70
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-keyboard-1.6.2 b/metadata/md5-cache/x11-drivers/xf86-input-keyboard-1.6.2
index ddac6ae3cd1e..1ed064ead35e 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-keyboard-1.6.2
+++ b/metadata/md5-cache/x11-drivers/xf86-input-keyboard-1.6.2
@@ -3,10 +3,10 @@ DEPEND=>=x11-base/xorg-server-1.6.3 || ( >=sys-devel/automake-1.11.1:1.11 >=sys-
 DESCRIPTION=Keyboard input driver
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.6.3 x11-base/xorg-server[xorg]
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-input-keyboard-1.6.2.tar.bz2
 _eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	autotools-utils	f4dc5b0e643575b9bd31a2bd7deeee31	eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	ff8fcdb08e36af162e7cfd65dd10be44
-_md5_=a1eba8b5ab1ff7a902e247c58a3a215c
+_md5_=3595f9d797b8ff727ea780beff05d9dc
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-mouse-1.8.1 b/metadata/md5-cache/x11-drivers/xf86-input-mouse-1.8.1
index 091c3da5fb94..6b85633f30f4 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-mouse-1.8.1
+++ b/metadata/md5-cache/x11-drivers/xf86-input-mouse-1.8.1
@@ -3,10 +3,10 @@ DEPEND=>=x11-base/xorg-server-1.7 || ( >=sys-devel/automake-1.11.1:1.11 >=sys-de
 DESCRIPTION=X.Org driver for mouse input devices
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.7 x11-base/xorg-server[xorg]
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-input-mouse-1.8.1.tar.bz2
 _eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	autotools-utils	f4dc5b0e643575b9bd31a2bd7deeee31	eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	ff8fcdb08e36af162e7cfd65dd10be44
-_md5_=04fbe0e48e42ccb3fcf4921b66a91701
+_md5_=8b6f5595cfcecfb18f0e398eb2c9c53c
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-apm-1.2.5 b/metadata/md5-cache/x11-drivers/xf86-video-apm-1.2.5
index d85e52bc6a92..f13f32c3b69a 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-apm-1.2.5
+++ b/metadata/md5-cache/x11-drivers/xf86-video-apm-1.2.5
@@ -3,10 +3,10 @@ DEPEND=>=x11-base/xorg-server-1.0.99 || ( >=sys-devel/automake-1.11.1:1.11 >=sys
 DESCRIPTION=Alliance ProMotion video driver
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=amd64 ~ia64 x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=amd64 ia64 x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-apm-1.2.5.tar.bz2
 _eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	autotools-utils	f4dc5b0e643575b9bd31a2bd7deeee31	eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	ff8fcdb08e36af162e7cfd65dd10be44
-_md5_=4d3a1875b0018ebf79c7f1b32797d9ec
+_md5_=3262cd242241d701982707eac3377970
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-ark-0.7.5 b/metadata/md5-cache/x11-drivers/xf86-video-ark-0.7.5
index 79b1d62a0bcc..7b1595a31541 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-ark-0.7.5
+++ b/metadata/md5-cache/x11-drivers/xf86-video-ark-0.7.5
@@ -3,10 +3,10 @@ DEPEND=>=x11-base/xorg-server-1.0.99 >=x11-libs/libpciaccess-0.12.901 || ( >=sys
 DESCRIPTION=X.Org driver for ark cards
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=amd64 ~ia64 x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=amd64 ia64 x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-ark-0.7.5.tar.bz2
 _eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	autotools-utils	f4dc5b0e643575b9bd31a2bd7deeee31	eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	ff8fcdb08e36af162e7cfd65dd10be44
-_md5_=64acca7a0abef6beafbf9a4139375724
+_md5_=2affea1fcad73c302cf8052aa55dda79
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-ati-7.0.0 b/metadata/md5-cache/x11-drivers/xf86-video-ati-7.0.0
index 9017fc519e30..a99502ffe171 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-ati-7.0.0
+++ b/metadata/md5-cache/x11-drivers/xf86-video-ati-7.0.0
@@ -4,10 +4,10 @@ DESCRIPTION=ATI video driver
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=glamor udev
-KEYWORDS=~alpha amd64 ~ia64 ppc ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ia64 ppc ppc64 sparc x86
 LICENSE=MIT
 RDEPEND=>=x11-libs/libdrm-2.4.36[video_cards_radeon] glamor? ( x11-libs/glamor ) udev? ( virtual/udev ) x11-base/xorg-server[-minimal] x11-libs/libdrm x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-ati-7.0.0.tar.bz2
 _eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	autotools-utils	f4dc5b0e643575b9bd31a2bd7deeee31	eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	ff8fcdb08e36af162e7cfd65dd10be44
-_md5_=730afb6e2987b9f09dbc486af4f24fa9
+_md5_=8f703b908bc6f5c4871149b76932d490
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-chips-1.2.5 b/metadata/md5-cache/x11-drivers/xf86-video-chips-1.2.5
index baf09a521f64..8376c1763636 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-chips-1.2.5
+++ b/metadata/md5-cache/x11-drivers/xf86-video-chips-1.2.5
@@ -3,10 +3,10 @@ DEPEND=|| ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=
 DESCRIPTION=Chips and Technologies video driver
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=amd64 ~ia64 ppc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=amd64 ia64 ppc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 RDEPEND=x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-chips-1.2.5.tar.bz2
 _eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	autotools-utils	f4dc5b0e643575b9bd31a2bd7deeee31	eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	ff8fcdb08e36af162e7cfd65dd10be44
-_md5_=a78503ee58273f9eb126900282bf7503
+_md5_=001932ceba2d4db31bad59b7fc9f12ad
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-cirrus-1.5.1 b/metadata/md5-cache/x11-drivers/xf86-video-cirrus-1.5.1
index dbad086b397c..f7d38b761666 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-cirrus-1.5.1
+++ b/metadata/md5-cache/x11-drivers/xf86-video-cirrus-1.5.1
@@ -3,10 +3,10 @@ DEPEND=>=x11-base/xorg-server-1.0.99 || ( >=sys-devel/automake-1.11.1:1.11 >=sys
 DESCRIPTION=Cirrus Logic video driver
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=~alpha amd64 ~ia64 ppc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 ia64 ppc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-cirrus-1.5.1.tar.bz2
 _eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	autotools-utils	f4dc5b0e643575b9bd31a2bd7deeee31	eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	ff8fcdb08e36af162e7cfd65dd10be44
-_md5_=395286f935c37b56c1c9e0fa9a438db6
+_md5_=fff4768140fa7a9bbb1be81aca43301a
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-dummy-0.3.6 b/metadata/md5-cache/x11-drivers/xf86-video-dummy-0.3.6
index 73c1bc2d1ffc..053b2ab9e391 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-dummy-0.3.6
+++ b/metadata/md5-cache/x11-drivers/xf86-video-dummy-0.3.6
@@ -4,10 +4,10 @@ DESCRIPTION=X.Org driver for dummy cards
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=dga
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-dummy-0.3.6.tar.bz2
 _eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	autotools-utils	f4dc5b0e643575b9bd31a2bd7deeee31	eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	ff8fcdb08e36af162e7cfd65dd10be44
-_md5_=1bd1bd576fef6199c1da85c1b359b607
+_md5_=6a07196b4f9120a7f0f2035f68e26fad
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-fbdev-0.4.3 b/metadata/md5-cache/x11-drivers/xf86-video-fbdev-0.4.3
index a1f86f3b6e12..ec60bfb32aa7 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-fbdev-0.4.3
+++ b/metadata/md5-cache/x11-drivers/xf86-video-fbdev-0.4.3
@@ -3,10 +3,10 @@ DEPEND=x11-base/xorg-server x11-proto/fontsproto x11-proto/randrproto x11-proto/
 DESCRIPTION=video driver for framebuffer device
 EAPI=3
 HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 RDEPEND=x11-base/xorg-server x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-fbdev-0.4.3.tar.bz2
 _eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	autotools-utils	f4dc5b0e643575b9bd31a2bd7deeee31	eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	ff8fcdb08e36af162e7cfd65dd10be44
-_md5_=59d617a8387135331acb9fb4f9877916
+_md5_=08848f3b839bcadfdb313ee099feec9d
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-glint-1.2.8 b/metadata/md5-cache/x11-drivers/xf86-video-glint-1.2.8
index 8e845c7374af..270bca6173b5 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-glint-1.2.8
+++ b/metadata/md5-cache/x11-drivers/xf86-video-glint-1.2.8
@@ -3,10 +3,10 @@ DEPEND=>=x11-base/xorg-server-1.0.99 x11-proto/videoproto x11-proto/xextproto x1
 DESCRIPTION=GLINT/Permedia video driver
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=~alpha amd64 ~ia64 ppc ~sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 ia64 ppc sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-glint-1.2.8.tar.bz2
 _eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	autotools-utils	f4dc5b0e643575b9bd31a2bd7deeee31	eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	ff8fcdb08e36af162e7cfd65dd10be44
-_md5_=b2de950e1b92dc86916edc91f9abfd87
+_md5_=6d7e26e346294ade486b04024977b0b5
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-i128-1.3.6 b/metadata/md5-cache/x11-drivers/xf86-video-i128-1.3.6
index 5d28206565d4..6cc58ebf7093 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-i128-1.3.6
+++ b/metadata/md5-cache/x11-drivers/xf86-video-i128-1.3.6
@@ -3,10 +3,10 @@ DEPEND=>=x11-base/xorg-server-1.0.99 || ( >=sys-devel/automake-1.11.1:1.11 >=sys
 DESCRIPTION=Number 9 I128 video driver
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=amd64 ~ia64 x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=amd64 ia64 x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-i128-1.3.6.tar.bz2
 _eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	autotools-utils	f4dc5b0e643575b9bd31a2bd7deeee31	eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	ff8fcdb08e36af162e7cfd65dd10be44
-_md5_=5279da026089abc2f38d6aab157218a1
+_md5_=3dc725bf529cf3a72b560ee8d3055471
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-i740-1.3.4 b/metadata/md5-cache/x11-drivers/xf86-video-i740-1.3.4
index 42ce3a9c731e..a0c94dd68e22 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-i740-1.3.4
+++ b/metadata/md5-cache/x11-drivers/xf86-video-i740-1.3.4
@@ -3,10 +3,10 @@ DEPEND=>=x11-base/xorg-server-1.0.99 || ( >=sys-devel/automake-1.11.1:1.11 >=sys
 DESCRIPTION=Intel i740 video driver
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=amd64 ~ia64 x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=amd64 ia64 x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-i740-1.3.4.tar.bz2
 _eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	autotools-utils	f4dc5b0e643575b9bd31a2bd7deeee31	eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	ff8fcdb08e36af162e7cfd65dd10be44
-_md5_=722acfd692caa1ebf43a1cfbabf787d8
+_md5_=7cd567debc437ca13ca3a09cccc00bcc
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-mach64-6.9.4 b/metadata/md5-cache/x11-drivers/xf86-video-mach64-6.9.4
index 4a7f5d740dbc..40fbe35dfc1f 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-mach64-6.9.4
+++ b/metadata/md5-cache/x11-drivers/xf86-video-mach64-6.9.4
@@ -4,10 +4,10 @@ DESCRIPTION=ATI Mach64 video driver
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=dri
-KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha ~amd64 ia64 ~ppc ~ppc64 sparc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.10 >=x11-libs/libpciaccess-0.12.901 dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-mach64-6.9.4.tar.bz2
 _eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	autotools-utils	f4dc5b0e643575b9bd31a2bd7deeee31	eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	ff8fcdb08e36af162e7cfd65dd10be44
-_md5_=b87d8b6873a64456bbb9c77a2f677558
+_md5_=5c800be5df02f3cc5dcf713166468349
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-mga-1.6.2 b/metadata/md5-cache/x11-drivers/xf86-video-mga-1.6.2
index 624431b51f69..ca97b3e21600 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-mga-1.6.2
+++ b/metadata/md5-cache/x11-drivers/xf86-video-mga-1.6.2
@@ -4,10 +4,10 @@ DESCRIPTION=Matrox video driver
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=dri dri
-KEYWORDS=~alpha amd64 ~ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 RDEPEND=<x11-base/xorg-server-1.13.99 dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-mga-1.6.2.tar.bz2
 _eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	autotools-utils	f4dc5b0e643575b9bd31a2bd7deeee31	eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	ff8fcdb08e36af162e7cfd65dd10be44
-_md5_=c96dc9ba9f9a99e1b11084ba8feeb394
+_md5_=ffc94f3b75fb689d391d6768e259ab7a
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-modesetting-0.5.0 b/metadata/md5-cache/x11-drivers/xf86-video-modesetting-0.5.0
index 95cb11dc44c8..4b430a260528 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-modesetting-0.5.0
+++ b/metadata/md5-cache/x11-drivers/xf86-video-modesetting-0.5.0
@@ -3,10 +3,10 @@ DEPEND=|| ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=
 DESCRIPTION=Unaccelerated generic driver for kernel modesetting
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 RDEPEND=x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-modesetting-0.5.0.tar.bz2
 _eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	autotools-utils	f4dc5b0e643575b9bd31a2bd7deeee31	eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	ff8fcdb08e36af162e7cfd65dd10be44
-_md5_=237c0890c10344c26347029271caef48
+_md5_=696344beb02bef9f5881f89cb8a38b7b
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-neomagic-1.2.7 b/metadata/md5-cache/x11-drivers/xf86-video-neomagic-1.2.7
index e00083663144..cbeed3e34262 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-neomagic-1.2.7
+++ b/metadata/md5-cache/x11-drivers/xf86-video-neomagic-1.2.7
@@ -3,10 +3,10 @@ DEPEND=<x11-base/xorg-server-1.12.99 || ( >=sys-devel/automake-1.11.1:1.11 >=sys
 DESCRIPTION=Neomagic video driver
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=amd64 ~ia64 x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=amd64 ia64 x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 RDEPEND=<x11-base/xorg-server-1.12.99 x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-neomagic-1.2.7.tar.bz2
 _eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	autotools-utils	f4dc5b0e643575b9bd31a2bd7deeee31	eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	ff8fcdb08e36af162e7cfd65dd10be44
-_md5_=7edd65257b2dd0743dec8d0550335838
+_md5_=a840e634a4c532f7fa0093db8c0b6165
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-nv-2.1.20 b/metadata/md5-cache/x11-drivers/xf86-video-nv-2.1.20
index 40b92dca974b..f25b17ed04c7 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-nv-2.1.20
+++ b/metadata/md5-cache/x11-drivers/xf86-video-nv-2.1.20
@@ -3,10 +3,10 @@ DEPEND=x11-base/xorg-server >=x11-libs/libpciaccess-0.10.7 || ( >=sys-devel/auto
 DESCRIPTION=Nvidia 2D only video driver
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=~alpha amd64 ~ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 RDEPEND=x11-base/xorg-server >=x11-libs/libpciaccess-0.10.7 x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-nv-2.1.20.tar.bz2
 _eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	autotools-utils	f4dc5b0e643575b9bd31a2bd7deeee31	eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	ff8fcdb08e36af162e7cfd65dd10be44
-_md5_=d6bd9e68776d46d23068e3c2dc7d2cc2
+_md5_=990b89e17607c8558ebcd0ae2c19d4ac
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-r128-6.9.1 b/metadata/md5-cache/x11-drivers/xf86-video-r128-6.9.1
index 133a9b7e9cc1..f27fe701f015 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-r128-6.9.1
+++ b/metadata/md5-cache/x11-drivers/xf86-video-r128-6.9.1
@@ -4,10 +4,10 @@ DESCRIPTION=ATI Rage128 video driver
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=dri dri
-KEYWORDS=~alpha amd64 ~ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.2 dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-r128-6.9.1.tar.bz2
 _eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	autotools-utils	f4dc5b0e643575b9bd31a2bd7deeee31	eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	ff8fcdb08e36af162e7cfd65dd10be44
-_md5_=6f80cb36bf33fbe3d8e181af45575a3b
+_md5_=546e672f070360c7c3ae71db67016219
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-rendition-4.2.5 b/metadata/md5-cache/x11-drivers/xf86-video-rendition-4.2.5
index ee3f3f7e279c..beff4e9aa169 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-rendition-4.2.5
+++ b/metadata/md5-cache/x11-drivers/xf86-video-rendition-4.2.5
@@ -3,10 +3,10 @@ DEPEND=>=x11-base/xorg-server-1.0.99 || ( >=sys-devel/automake-1.11.1:1.11 >=sys
 DESCRIPTION=Rendition video driver
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=~alpha amd64 ~ia64 x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 ia64 x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-rendition-4.2.5.tar.bz2
 _eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	autotools-utils	f4dc5b0e643575b9bd31a2bd7deeee31	eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	ff8fcdb08e36af162e7cfd65dd10be44
-_md5_=764d6031314056256ad36ad00f3b2801
+_md5_=4594a86df6d72d10954b164439aa3b08
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-s3-0.6.5 b/metadata/md5-cache/x11-drivers/xf86-video-s3-0.6.5
index a9a1e5268fb4..7873aa5d5b13 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-s3-0.6.5
+++ b/metadata/md5-cache/x11-drivers/xf86-video-s3-0.6.5
@@ -3,10 +3,10 @@ DEPEND=>=x11-base/xorg-server-1.0.99 || ( >=sys-devel/automake-1.11.1:1.11 >=sys
 DESCRIPTION=X.Org driver for s3 cards
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=~alpha amd64 ~ia64 ppc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 ia64 ppc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-s3-0.6.5.tar.bz2
 _eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	autotools-utils	f4dc5b0e643575b9bd31a2bd7deeee31	eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	ff8fcdb08e36af162e7cfd65dd10be44
-_md5_=3ac884b6a84dc10b3c596e5acdb51cbf
+_md5_=0a679bdc5085a4c8499e299ee7a5b896
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-s3virge-1.10.6 b/metadata/md5-cache/x11-drivers/xf86-video-s3virge-1.10.6
index 985f69d1da5e..80479dcc44a2 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-s3virge-1.10.6
+++ b/metadata/md5-cache/x11-drivers/xf86-video-s3virge-1.10.6
@@ -3,10 +3,10 @@ DEPEND=>=x11-base/xorg-server-1.0.99 || ( >=sys-devel/automake-1.11.1:1.11 >=sys
 DESCRIPTION=S3 ViRGE video driver
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=~alpha amd64 ~ia64 ppc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 ia64 ppc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-s3virge-1.10.6.tar.bz2
 _eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	autotools-utils	f4dc5b0e643575b9bd31a2bd7deeee31	eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	ff8fcdb08e36af162e7cfd65dd10be44
-_md5_=722f80d387b450976a7c16472ab2d174
+_md5_=73fb6cc47753a108eeec84ce3880a097
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-savage-2.3.6 b/metadata/md5-cache/x11-drivers/xf86-video-savage-2.3.6
index efb9de03c17a..35f876c43ee8 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-savage-2.3.6
+++ b/metadata/md5-cache/x11-drivers/xf86-video-savage-2.3.6
@@ -4,10 +4,10 @@ DESCRIPTION=S3 Savage video driver
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=dri dri
-KEYWORDS=~alpha amd64 ~ia64 ppc ~sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 ia64 ppc sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-savage-2.3.6.tar.bz2
 _eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	autotools-utils	f4dc5b0e643575b9bd31a2bd7deeee31	eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	ff8fcdb08e36af162e7cfd65dd10be44
-_md5_=9af69f5c4b3e152cbcd5570eb76ccfc9
+_md5_=3b4c656c5b7ebdf8c6028d8ee8bdef77
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-sis-0.10.7 b/metadata/md5-cache/x11-drivers/xf86-video-sis-0.10.7
index 6716888daef1..f284d799bc41 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-sis-0.10.7
+++ b/metadata/md5-cache/x11-drivers/xf86-video-sis-0.10.7
@@ -4,10 +4,10 @@ DESCRIPTION=SiS and XGI video driver
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=dri dri
-KEYWORDS=amd64 ~ia64 ppc x86 ~x86-fbsd
+KEYWORDS=amd64 ia64 ppc x86 ~x86-fbsd
 LICENSE=MIT
 RDEPEND=dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-sis-0.10.7.tar.bz2
 _eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	autotools-utils	f4dc5b0e643575b9bd31a2bd7deeee31	eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	ff8fcdb08e36af162e7cfd65dd10be44
-_md5_=a45fc945b30ec63a80521a4efedc4ce7
+_md5_=224d7372b33bd166343d506dd5e93326
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-sisusb-0.9.6 b/metadata/md5-cache/x11-drivers/xf86-video-sisusb-0.9.6
index db0c1ba6b33a..5c8752b46dee 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-sisusb-0.9.6
+++ b/metadata/md5-cache/x11-drivers/xf86-video-sisusb-0.9.6
@@ -3,10 +3,10 @@ DEPEND=>=x11-base/xorg-server-1.6 || ( >=sys-devel/automake-1.11.1:1.11 >=sys-de
 DESCRIPTION=SiS USB video driver
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=~alpha amd64 arm ~ia64 ppc ppc64 ~sh ~sparc x86
+KEYWORDS=~alpha amd64 arm ia64 ppc ppc64 ~sh sparc x86
 LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.6 x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-sisusb-0.9.6.tar.bz2
 _eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	autotools-utils	f4dc5b0e643575b9bd31a2bd7deeee31	eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	ff8fcdb08e36af162e7cfd65dd10be44
-_md5_=ce938c20df9a49c17fc95e07e1337687
+_md5_=853998f6c5335b10b50ca4caba64522f
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-tdfx-1.4.5 b/metadata/md5-cache/x11-drivers/xf86-video-tdfx-1.4.5
index 3744e84ebe38..3ca82b226e26 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-tdfx-1.4.5
+++ b/metadata/md5-cache/x11-drivers/xf86-video-tdfx-1.4.5
@@ -4,10 +4,10 @@ DESCRIPTION=3Dfx video driver
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=dri dri
-KEYWORDS=~alpha amd64 ~ia64 ppc ~sparc x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 ia64 ppc sparc x86 ~x86-fbsd
 LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-tdfx-1.4.5.tar.bz2
 _eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	autotools-utils	f4dc5b0e643575b9bd31a2bd7deeee31	eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	ff8fcdb08e36af162e7cfd65dd10be44
-_md5_=81acaf56618702041d098da4aedc07a3
+_md5_=3926f1e2898473f312277bac09a57c36
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-tga-1.2.2 b/metadata/md5-cache/x11-drivers/xf86-video-tga-1.2.2
index 1e234bbd846b..7649d161906c 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-tga-1.2.2
+++ b/metadata/md5-cache/x11-drivers/xf86-video-tga-1.2.2
@@ -3,10 +3,10 @@ DEPEND=>=x11-base/xorg-server-1.0.99 x11-proto/xf86dgaproto || ( >=sys-devel/aut
 DESCRIPTION=X.Org driver for tga cards
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=~alpha amd64 ~ia64 x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 ia64 x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-tga-1.2.2.tar.bz2
 _eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	autotools-utils	f4dc5b0e643575b9bd31a2bd7deeee31	eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	ff8fcdb08e36af162e7cfd65dd10be44
-_md5_=5c45f10463f32bd57bf81eeaf72417d6
+_md5_=1efc495e19c30fce50df5eeff7e88277
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-trident-1.3.6-r1 b/metadata/md5-cache/x11-drivers/xf86-video-trident-1.3.6-r1
index 8a2415a36dfc..ce6ffd7ba94d 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-trident-1.3.6-r1
+++ b/metadata/md5-cache/x11-drivers/xf86-video-trident-1.3.6-r1
@@ -3,10 +3,10 @@ DEPEND=>=x11-base/xorg-server-1.0.99 || ( >=sys-devel/automake-1.11.1:1.11 >=sys
 DESCRIPTION=Trident video driver
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=~amd64 ~ia64 ~ppc ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~amd64 ia64 ~ppc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-trident-1.3.6.tar.bz2
 _eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	autotools-utils	f4dc5b0e643575b9bd31a2bd7deeee31	eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	ff8fcdb08e36af162e7cfd65dd10be44
-_md5_=d4123e2f6409af6f7ec943be9e75fcf7
+_md5_=df0d2786aa449ea45ef648ed6fce64bc
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-tseng-1.2.5 b/metadata/md5-cache/x11-drivers/xf86-video-tseng-1.2.5
index f99858ace71e..7223ff66cada 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-tseng-1.2.5
+++ b/metadata/md5-cache/x11-drivers/xf86-video-tseng-1.2.5
@@ -3,10 +3,10 @@ DEPEND=>=x11-base/xorg-server-1.0.99 || ( >=sys-devel/automake-1.11.1:1.11 >=sys
 DESCRIPTION=Tseng Labs video driver
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=amd64 ~ia64 x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=amd64 ia64 x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-tseng-1.2.5.tar.bz2
 _eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	autotools-utils	f4dc5b0e643575b9bd31a2bd7deeee31	eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	ff8fcdb08e36af162e7cfd65dd10be44
-_md5_=610e7ca746bb7e781e19cf337a0aa725
+_md5_=5df699c09900105cdfc54e6109dd1986
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-vesa-2.3.2 b/metadata/md5-cache/x11-drivers/xf86-video-vesa-2.3.2
index 0fd247ec6e81..f02d1484a734 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-vesa-2.3.2
+++ b/metadata/md5-cache/x11-drivers/xf86-video-vesa-2.3.2
@@ -3,10 +3,10 @@ DEPEND=>=x11-base/xorg-server-1.0.99 >=x11-libs/libpciaccess-0.12.901 || ( >=sys
 DESCRIPTION=Generic VESA video driver
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=-* ~alpha amd64 ~ia64 x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=-* ~alpha amd64 ia64 x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 >=x11-libs/libpciaccess-0.12.901 x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-vesa-2.3.2.tar.bz2
 _eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	autotools-utils	f4dc5b0e643575b9bd31a2bd7deeee31	eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	ff8fcdb08e36af162e7cfd65dd10be44
-_md5_=66c3400bc1280542b91c69e3e311220c
+_md5_=1804f90268d0233bb07032621df04349
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-voodoo-1.2.5 b/metadata/md5-cache/x11-drivers/xf86-video-voodoo-1.2.5
index 7bd24dbbda27..f07fbe61b507 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-voodoo-1.2.5
+++ b/metadata/md5-cache/x11-drivers/xf86-video-voodoo-1.2.5
@@ -3,10 +3,10 @@ DEPEND=>=x11-base/xorg-server-1.0.99 x11-proto/xf86dgaproto || ( >=sys-devel/aut
 DESCRIPTION=Voodoo video driver
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=~alpha amd64 ~ia64 ppc ~sparc x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 ia64 ppc sparc x86 ~x86-fbsd
 LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-voodoo-1.2.5.tar.bz2
 _eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	autotools-utils	f4dc5b0e643575b9bd31a2bd7deeee31	eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	ff8fcdb08e36af162e7cfd65dd10be44
-_md5_=2854a4dcd096c1ad89938a7d205ddb09
+_md5_=705949a4fa11b3e507fc01dbb9c2e7a3
diff --git a/metadata/md5-cache/x11-libs/cairo-1.10.2-r3 b/metadata/md5-cache/x11-libs/cairo-1.10.2-r3
index 7964f9ecc418..367aa32178e5 100644
--- a/metadata/md5-cache/x11-libs/cairo-1.10.2-r3
+++ b/metadata/md5-cache/x11-libs/cairo-1.10.2-r3
@@ -4,11 +4,11 @@ DESCRIPTION=A vector graphics library with cross-device output support
 EAPI=3
 HOMEPAGE=http://cairographics.org/
 IUSE=X aqua debug directfb doc drm gallium +glib opengl openvg qt4 static-libs +svg xcb
-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 ~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-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( LGPL-2.1 MPL-1.1 )
 RDEPEND=media-libs/fontconfig media-libs/freetype:2 media-libs/libpng:0 sys-libs/zlib >=x11-libs/pixman-0.18.4 directfb? ( dev-libs/DirectFB ) glib? ( dev-libs/glib:2 ) opengl? ( || ( media-libs/mesa[egl] media-libs/opengl-apple ) ) openvg? ( media-libs/mesa[gallium] ) qt4? ( >=x11-libs/qt-gui-4.8:4 ) X? ( >=x11-libs/libXrender-0.6 x11-libs/libX11 drm? ( >=virtual/udev-136 gallium? ( media-libs/mesa[gallium] ) ) ) xcb? ( x11-libs/libxcb x11-libs/xcb-util )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://cairographics.org/releases/cairo-1.10.2.tar.gz
 _eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=b5375a76663d95fc08c845bad7cde254
+_md5_=4c582091b00bbd64fcf9aeb2d00a7185
diff --git a/metadata/md5-cache/x11-libs/glamor-0.5 b/metadata/md5-cache/x11-libs/glamor-0.5
index 734f73cb7c38..153ad845ec55 100644
--- a/metadata/md5-cache/x11-libs/glamor-0.5
+++ b/metadata/md5-cache/x11-libs/glamor-0.5
@@ -4,10 +4,10 @@ DESCRIPTION=OpenGL based 2D rendering acceleration library
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=gles static-libs
-KEYWORDS=amd64 ~ia64 ppc ppc64 x86
+KEYWORDS=amd64 ia64 ppc ppc64 sparc x86
 LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.10 media-libs/mesa[egl,gbm] gles? ( || ( media-libs/mesa[gles2] media-libs/mesa[gles] ) ) >=x11-libs/pixman-0.21.8 x11-base/xorg-server[-minimal] x11-libs/libdrm
 SLOT=0
 SRC_URI=mirror://gentoo/glamor-0.5.tar.gz
 _eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	autotools-utils	f4dc5b0e643575b9bd31a2bd7deeee31	eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	ff8fcdb08e36af162e7cfd65dd10be44
-_md5_=ed52c8f27415c2626d6199e7fff9ca52
+_md5_=59800baa525c2a7afba5502d5b8ca6e3
diff --git a/metadata/md5-cache/x11-libs/libXaw-1.0.11-r1 b/metadata/md5-cache/x11-libs/libXaw-1.0.11-r1
index 4703bb9c7e09..fbfbc267429c 100644
--- a/metadata/md5-cache/x11-libs/libXaw-1.0.11-r1
+++ b/metadata/md5-cache/x11-libs/libXaw-1.0.11-r1
@@ -4,10 +4,10 @@ DESCRIPTION=X.Org Xaw library
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=deprecated static-libs doc
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~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 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXt x11-libs/libXmu x11-libs/libXpm x11-proto/xproto x11-proto/xextproto
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXaw-1.0.11.tar.bz2
 _eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	autotools-utils	f4dc5b0e643575b9bd31a2bd7deeee31	eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	ff8fcdb08e36af162e7cfd65dd10be44
-_md5_=6c149f9d4197c7b7b123d9f12a495e27
+_md5_=77d26d94d3a0d38e4353cbc7e47a0de6
diff --git a/metadata/md5-cache/x11-libs/libXfont-1.4.5-r1 b/metadata/md5-cache/x11-libs/libXfont-1.4.5-r1
index 129a792e278c..754292199370 100644
--- a/metadata/md5-cache/x11-libs/libXfont-1.4.5-r1
+++ b/metadata/md5-cache/x11-libs/libXfont-1.4.5-r1
@@ -4,10 +4,10 @@ DESCRIPTION=X.Org Xfont library
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=bzip2 ipv6 truetype static-libs doc
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=x11-libs/xtrans x11-libs/libfontenc truetype? ( >=media-libs/freetype-2 ) bzip2? ( app-arch/bzip2 ) x11-proto/xproto x11-proto/fontsproto
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXfont-1.4.5.tar.bz2
 _eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	autotools-utils	f4dc5b0e643575b9bd31a2bd7deeee31	eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	ff8fcdb08e36af162e7cfd65dd10be44
-_md5_=6b612180cf1346e31ce8a028af701687
+_md5_=c17b73c391db5503495d96a794d91763
diff --git a/metadata/md5-cache/x11-libs/libXrandr-1.4.0 b/metadata/md5-cache/x11-libs/libXrandr-1.4.0
index 2a636ba200c7..eb217abf2ef8 100644
--- a/metadata/md5-cache/x11-libs/libXrandr-1.4.0
+++ b/metadata/md5-cache/x11-libs/libXrandr-1.4.0
@@ -4,10 +4,10 @@ DESCRIPTION=X.Org Xrandr library
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=static-libs
-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 ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+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 ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXrender x11-proto/randrproto x11-proto/renderproto x11-proto/xextproto
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXrandr-1.4.0.tar.bz2
 _eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	autotools-utils	f4dc5b0e643575b9bd31a2bd7deeee31	eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	ff8fcdb08e36af162e7cfd65dd10be44
-_md5_=793bde5d1d713f2963d10fc8a62c2b17
+_md5_=8177e1fca63efa2edc748d1fa58cbb62
diff --git a/metadata/md5-cache/x11-libs/libdrm-2.4.40 b/metadata/md5-cache/x11-libs/libdrm-2.4.40
index ecb6448d6384..da7ef1400d98 100644
--- a/metadata/md5-cache/x11-libs/libdrm-2.4.40
+++ b/metadata/md5-cache/x11-libs/libdrm-2.4.40
@@ -4,11 +4,11 @@ DESCRIPTION=X.Org libdrm library
 EAPI=4
 HOMEPAGE=http://dri.freedesktop.org/
 IUSE=video_cards_exynos video_cards_intel video_cards_nouveau video_cards_omap video_cards_radeon video_cards_vmware libkms static-libs
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=dev-libs/libpthread-stubs video_cards_intel? ( >=x11-libs/libpciaccess-0.10 )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://dri.freedesktop.org/libdrm/libdrm-2.4.40.tar.bz2
 _eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	autotools-utils	f4dc5b0e643575b9bd31a2bd7deeee31	eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	ff8fcdb08e36af162e7cfd65dd10be44
-_md5_=d325d6943d6901a9e41f78bdbb7a24ef
+_md5_=4851ab7da53938e6bd8bd741e9ab08c7
diff --git a/metadata/md5-cache/x11-libs/libxcb-1.9 b/metadata/md5-cache/x11-libs/libxcb-1.9
index be3470d5dc39..c3cea3eadbd9 100644
--- a/metadata/md5-cache/x11-libs/libxcb-1.9
+++ b/metadata/md5-cache/x11-libs/libxcb-1.9
@@ -4,10 +4,10 @@ DESCRIPTION=X C-language Bindings library
 EAPI=4
 HOMEPAGE=http://xcb.freedesktop.org/
 IUSE=selinux static-libs doc
-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 ~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-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=dev-libs/libpthread-stubs x11-libs/libXau x11-libs/libXdmcp
 SLOT=0
 SRC_URI=http://xcb.freedesktop.org/dist/libxcb-1.9.tar.bz2
 _eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	autotools-utils	f4dc5b0e643575b9bd31a2bd7deeee31	eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	ff8fcdb08e36af162e7cfd65dd10be44
-_md5_=0bd278c219f2d277ee3021924a06d7ab
+_md5_=5705b976f7ed14e641a06c5c8a8f13a5
diff --git a/metadata/md5-cache/x11-libs/pango-1.32.5 b/metadata/md5-cache/x11-libs/pango-1.32.5
index 7fa917a3cea8..6cfa569a33d7 100644
--- a/metadata/md5-cache/x11-libs/pango-1.32.5
+++ b/metadata/md5-cache/x11-libs/pango-1.32.5
@@ -10,4 +10,4 @@ RDEPEND=>=media-libs/harfbuzz-0.9.9:= >=dev-libs/glib-2.33.12:2 >=media-libs/fon
 SLOT=0
 SRC_URI=mirror://gnome/sources/pango/1.32/pango-1.32.5.tar.xz
 _eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	eutils	d40dc948067bd3db1c8ebf7d51897313	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	18cda077fa5f661f96aa70c192b4b4a5	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=b4d59611d57382b2786fae213348ffbb
+_md5_=79b2305f6df36892c613516ff1269ec9
diff --git a/metadata/md5-cache/x11-libs/pixman-0.28.0 b/metadata/md5-cache/x11-libs/pixman-0.28.0
index 06c2e4d04826..eb6896f22b89 100644
--- a/metadata/md5-cache/x11-libs/pixman-0.28.0
+++ b/metadata/md5-cache/x11-libs/pixman-0.28.0
@@ -4,9 +4,9 @@ DESCRIPTION=Low-level pixel manipulation routines
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=altivec iwmmxt mmx neon sse2 static-libs
-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 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+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 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/pixman-0.28.0.tar.bz2
 _eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	autotools-utils	f4dc5b0e643575b9bd31a2bd7deeee31	eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	xorg-2	ff8fcdb08e36af162e7cfd65dd10be44
-_md5_=dc77916b64830938a9a50dd7feba3824
+_md5_=78dcf6ae6b34a50d2d1084b1ae41f201
diff --git a/metadata/md5-cache/x11-misc/e16keyedit-0.4 b/metadata/md5-cache/x11-misc/e16keyedit-0.4
index 55a9e754d1f0..20d8dcfdc2ee 100644
--- a/metadata/md5-cache/x11-misc/e16keyedit-0.4
+++ b/metadata/md5-cache/x11-misc/e16keyedit-0.4
@@ -3,8 +3,8 @@ DEPEND==x11-libs/gtk+-2* virtual/pkgconfig
 DESCRIPTION=Key binding editor for enlightenment 16
 HOMEPAGE=http://www.enlightenment.org/
 KEYWORDS=amd64 ppc sparc x86
-LICENSE=as-is
+LICENSE=MIT-with-advertising
 RDEPEND==x11-libs/gtk+-2*
 SLOT=0
 SRC_URI=mirror://sourceforge/enlightenment/e16utils/e16keyedit-0.4.tar.gz
-_md5_=00f4171cee05ff2674ec7eeb6c7068a5
+_md5_=33bcc1132998c6b3a6f245ac693b8410
diff --git a/metadata/md5-cache/x11-misc/e16keyedit-0.6 b/metadata/md5-cache/x11-misc/e16keyedit-0.6
index d5729d23ac64..d9337015804e 100644
--- a/metadata/md5-cache/x11-misc/e16keyedit-0.6
+++ b/metadata/md5-cache/x11-misc/e16keyedit-0.6
@@ -3,8 +3,8 @@ DEPEND==x11-libs/gtk+-2* virtual/pkgconfig
 DESCRIPTION=Key binding editor for enlightenment 16
 HOMEPAGE=http://www.enlightenment.org/
 KEYWORDS=amd64 ppc sparc x86
-LICENSE=as-is
+LICENSE=MIT-with-advertising
 RDEPEND==x11-libs/gtk+-2*
 SLOT=0
 SRC_URI=mirror://sourceforge/enlightenment/e16keyedit-0.6.tar.gz
-_md5_=aba97e53310a33362b24381d3973f036
+_md5_=4949f82b306c9973a19ab127059e4201
diff --git a/metadata/md5-cache/x11-misc/e16keyedit-0.7 b/metadata/md5-cache/x11-misc/e16keyedit-0.7
index e28e047842aa..0579905751f3 100644
--- a/metadata/md5-cache/x11-misc/e16keyedit-0.7
+++ b/metadata/md5-cache/x11-misc/e16keyedit-0.7
@@ -3,8 +3,8 @@ DEPEND==x11-libs/gtk+-2* virtual/pkgconfig
 DESCRIPTION=Key binding editor for enlightenment 16
 HOMEPAGE=http://www.enlightenment.org/
 KEYWORDS=~amd64 ~ppc ~sparc ~x86
-LICENSE=as-is
+LICENSE=MIT-with-advertising
 RDEPEND==x11-libs/gtk+-2*
 SLOT=0
 SRC_URI=mirror://sourceforge/enlightenment/e16keyedit-0.7.tar.gz
-_md5_=20f112dc628547d5bff332867834c219
+_md5_=cb615d995e9509b1e99d47a1c9044cae
diff --git a/metadata/md5-cache/x11-misc/e16menuedit2-0.0.3 b/metadata/md5-cache/x11-misc/e16menuedit2-0.0.3
index 99af3480b034..27de620e7c5b 100644
--- a/metadata/md5-cache/x11-misc/e16menuedit2-0.0.3
+++ b/metadata/md5-cache/x11-misc/e16menuedit2-0.0.3
@@ -4,9 +4,9 @@ DESCRIPTION=Menu editor for enlightenment DR16 written in GTK2
 HOMEPAGE=http://www.enlightenment.org/
 IUSE=debug
 KEYWORDS=amd64 arm ~ppc sh sparc x86
-LICENSE=as-is
+LICENSE=MIT-with-advertising
 RDEPEND=>=x11-wm/enlightenment-0.16 >=gnome-base/libglade-2.4 =x11-libs/gtk+-2*
 SLOT=0
 SRC_URI=mirror://sourceforge/enlightenment/e16menuedit2-0.0.3.tar.gz
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	18cda077fa5f661f96aa70c192b4b4a5	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=816f8f093b24854caebc89f9c7a47d4f
+_md5_=1a283448962e572661075a839a2f1eb1
diff --git a/metadata/md5-cache/x11-misc/xfe-1.33 b/metadata/md5-cache/x11-misc/xfe-1.33
index 91a6af152e4d..3e73f7a3a097 100644
--- a/metadata/md5-cache/x11-misc/xfe-1.33
+++ b/metadata/md5-cache/x11-misc/xfe-1.33
@@ -4,10 +4,10 @@ DESCRIPTION=MS-Explorer-like minimalist file manager for X
 EAPI=4
 HOMEPAGE=http://roland65.free.fr/xfe
 IUSE=debug nls startup-notification linguas_bs linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_es_AR linguas_es linguas_fr linguas_hu linguas_it linguas_ja linguas_nl linguas_no linguas_pl linguas_pt_BR linguas_pt_PT linguas_ru linguas_sv linguas_tr linguas_zh_CN linguas_zh_TW
-KEYWORDS=amd64 ppc ~ppc64 ~sparc x86
+KEYWORDS=amd64 ppc ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=media-libs/libpng:0 startup-notification? ( x11-libs/startup-notification ) x11-libs/fox:1.6[truetype,png] x11-libs/libX11 x11-libs/libXft
 SLOT=0
 SRC_URI=mirror://sourceforge/xfe/xfe/1.33/xfe-1.33.tar.gz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=6d44bb47184bd3024e01b0100325bbda
+_md5_=020a4c1e7e8fb3b9426a5d05d5e5c944
diff --git a/metadata/md5-cache/x11-misc/xkeyboard-config-2.7 b/metadata/md5-cache/x11-misc/xkeyboard-config-2.7
index 839bcca82256..d004eb6c25c1 100644
--- a/metadata/md5-cache/x11-misc/xkeyboard-config-2.7
+++ b/metadata/md5-cache/x11-misc/xkeyboard-config-2.7
@@ -3,10 +3,10 @@ DEPEND=>=x11-apps/xkbcomp-1.2.3 >=x11-libs/libX11-1.4.3 dev-util/intltool >=x11-
 DESCRIPTION=X keyboard configuration database
 EAPI=4
 HOMEPAGE=http://www.freedesktop.org/wiki/Software/XKeyboardConfig
-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 ~x86-macos ~sparc-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 ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=>=x11-apps/xkbcomp-1.2.3 >=x11-libs/libX11-1.4.3
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/data/xkeyboard-config/xkeyboard-config-2.7.tar.bz2
 _eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	autotools-utils	f4dc5b0e643575b9bd31a2bd7deeee31	eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	ff8fcdb08e36af162e7cfd65dd10be44
-_md5_=1d131663bdbfb15bec40e784b8abf13d
+_md5_=6a6f1a37c65b52a8d9735c20e0b18f94
diff --git a/metadata/md5-cache/x11-proto/dri2proto-2.8 b/metadata/md5-cache/x11-proto/dri2proto-2.8
index e4af30c480d6..72c7d9716141 100644
--- a/metadata/md5-cache/x11-proto/dri2proto-2.8
+++ b/metadata/md5-cache/x11-proto/dri2proto-2.8
@@ -3,9 +3,9 @@ DEPEND=|| ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=
 DESCRIPTION=X.Org DRI2 protocol headers
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/dri2proto-2.8.tar.bz2
 _eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	autotools-utils	f4dc5b0e643575b9bd31a2bd7deeee31	eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	ff8fcdb08e36af162e7cfd65dd10be44
-_md5_=2ceef12fa3c4a40e17ca83d6a0374762
+_md5_=599df8cdd917eab2c7e73c95dd335c22
diff --git a/metadata/md5-cache/x11-proto/randrproto-1.4.0 b/metadata/md5-cache/x11-proto/randrproto-1.4.0
index 0aa6d9c72e8c..f65c63ff8e41 100644
--- a/metadata/md5-cache/x11-proto/randrproto-1.4.0
+++ b/metadata/md5-cache/x11-proto/randrproto-1.4.0
@@ -3,9 +3,9 @@ DEPEND=|| ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=
 DESCRIPTION=X.Org Randr protocol headers
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
-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 ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+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 ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/randrproto-1.4.0.tar.bz2
 _eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	autotools-utils	f4dc5b0e643575b9bd31a2bd7deeee31	eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	ff8fcdb08e36af162e7cfd65dd10be44
-_md5_=c68e34d9ef993f1cc1cdc239cb7096c6
+_md5_=7916f18f5dc8a77b43cfaa43e72c8ad9
diff --git a/metadata/md5-cache/x11-proto/xcb-proto-1.8 b/metadata/md5-cache/x11-proto/xcb-proto-1.8
index 08a69c69cb18..0bcf519cc01e 100644
--- a/metadata/md5-cache/x11-proto/xcb-proto-1.8
+++ b/metadata/md5-cache/x11-proto/xcb-proto-1.8
@@ -3,10 +3,10 @@ DEPEND=dev-libs/libxml2 dev-lang/python || ( >=sys-devel/automake-1.11.1:1.11 >=
 DESCRIPTION=X C-language Bindings protocol headers
 EAPI=4
 HOMEPAGE=http://xcb.freedesktop.org/
-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 ~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-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=dev-lang/python
 SLOT=0
 SRC_URI=http://xcb.freedesktop.org/dist/xcb-proto-1.8.tar.bz2
 _eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	autotools-utils	f4dc5b0e643575b9bd31a2bd7deeee31	eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	61ad55e732e494378165e7dcd4744b91	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	e5b3412fa9f03670a666c8a137bd1060	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	ff8fcdb08e36af162e7cfd65dd10be44
-_md5_=7045564fb2e101300b25ee248e81f139
+_md5_=5a329fadf15d80b43e9885572e9df6d4
diff --git a/metadata/md5-cache/x11-terms/xterm-285 b/metadata/md5-cache/x11-terms/xterm-285
index 2a6ba199d054..5d981322cf5e 100644
--- a/metadata/md5-cache/x11-terms/xterm-285
+++ b/metadata/md5-cache/x11-terms/xterm-285
@@ -4,10 +4,10 @@ DESCRIPTION=Terminal Emulator for X Windows
 EAPI=4
 HOMEPAGE=http://dickey.his.com/xterm/
 IUSE=toolbar truetype unicode Xaw3d
-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=MIT
 RDEPEND=kernel_linux? ( sys-libs/libutempter ) kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-lib-9.0 sys-libs/libutempter ) ) >=sys-libs/ncurses-5.7-r7 x11-apps/xmessage x11-libs/libX11 x11-libs/libXaw x11-libs/libXft x11-libs/libxkbfile x11-libs/libXmu x11-libs/libXrender x11-libs/libXt unicode? ( x11-apps/luit ) Xaw3d? ( x11-libs/libXaw3d ) media-fonts/font-misc-misc
 SLOT=0
 SRC_URI=ftp://invisible-island.net/xterm/xterm-285.tgz
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=e95ac3bd5a269a297ea32e6b30e642df
+_md5_=c86197aacb0e1a32f26642102096240c
diff --git a/metadata/md5-cache/x11-themes/gdm-themes-20070811-r1 b/metadata/md5-cache/x11-themes/gdm-themes-20070811-r1
index 74f7e974a1e0..a4e34cc9bdb7 100644
--- a/metadata/md5-cache/x11-themes/gdm-themes-20070811-r1
+++ b/metadata/md5-cache/x11-themes/gdm-themes-20070811-r1
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile install unpack
 DEPEND=app-arch/unzip
 DESCRIPTION=Some nice themes for the GDM Greeter
 HOMEPAGE=http://art.gnome.org/themes/gdm_greeter/
-KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~ia64 ppc ~ppc64 ~sparc x86
 LICENSE=CCPL-Attribution-NonCommercial-NoDerivs-2.0 CCPL-Attribution-2.0 GPL-2 LGPL-2.1 public-domain
 RDEPEND=gnome-base/gdm
 SLOT=0
 SRC_URI=http://art.gnome.org/download/themes/gdm_greeter/1327/GDM-Curve.tar.gz http://art.gnome.org/download/themes/gdm_greeter/1277/GDM-SoftFlowerWidescreen1280x800.tar.gz http://art.gnome.org/download/themes/gdm_greeter/1042/GDM-GDMLamp.tar.gz http://art.gnome.org/download/themes/gdm_greeter/1212/GDM-EarthLights.tar.gz http://art.gnome.org/download/themes/gdm_greeter/1229/GDM-SoftFlowerGdm.tar.gz http://art.gnome.org/download/themes/gdm_greeter/1201/GDM-BlueSwirl.tar.bz2 http://art.gnome.org/download/themes/gdm_greeter/1039/GDM-ManzanaTux.tar.gz http://art.gnome.org/download/themes/gdm_greeter/1209/GDM-Tango.tar.gz http://art.gnome.org/download/themes/gdm_greeter/1036/GDM-CleanLinux.tar.gz http://art.gnome.org/download/themes/gdm_greeter/1037/GDM-CleanX.tar.gz http://art.gnome.org/download/themes/gdm_greeter/1038/GDM-Sakura.tar.gz http://art.gnome.org/download/themes/gdm_greeter/1035/GDM-CleanGnome.tar.gz http://art.gnome.org/download/themes/gdm_greeter/1207/GDM-SimpleElegance.tar.gz http://art.gnome.org/download/themes/gdm_greeter/1226/GDM-Wolf.tar.gz http://art.gnome.org/download/themes/gdm_greeter/1046/GDM-DroplineFun.tar.bz2 http://art.gnome.org/download/themes/gdm_greeter/1210/GDM-SpanishNight.tar.gz http://art.gnome.org/download/themes/gdm_greeter/1072/GDM-SunPuttingInAlmeriaSpain.tar.gz http://art.gnome.org/download/themes/gdm_greeter/1073/GDM-Northside.tar.gz http://art.gnome.org/download/themes/gdm_greeter/1093/GDM-AproachOne.tar.gz http://art.gnome.org/download/themes/gdm_greeter/1293/GDM-EaseOfBlue.tar.bz2 http://art.gnome.org/download/themes/gdm_greeter/1174/GDM-GnomeBlack.tar.gz http://art.gnome.org/download/themes/gdm_greeter/1173/GDM-GnomeZen.tar.gz http://art.gnome.org/download/themes/gdm_greeter/1052/GDM-GNOMEPlanetByEmailandthingsCom.tar.gz http://art.gnome.org/download/themes/gdm_greeter/1152/GDM-Insectz.tar.gz http://art.gnome.org/download/themes/gdm_greeter/1034/GDM-FlyAway.tar.gz http://art.gnome.org/download/themes/gdm_greeter/1292/GDM-SunergosGDM.tar.gz http://art.gnome.org/download/themes/gdm_greeter/1132/GDM-CelticWXGA.tar.gz http://art.gnome.org/download/themes/gdm_greeter/1117/GDM-GnomeIsland.tar.gz http://art.gnome.org/download/themes/gdm_greeter/1328/GDM-DarkCleanLinux.tar.gz http://art.gnome.org/download/themes/gdm_greeter/1266/GDM-GnomeMoment.tar.gz http://art.gnome.org/download/themes/gdm_greeter/1159/GDM-PiratesOfGnome.tar.gz http://art.gnome.org/download/themes/gdm_greeter/1116/GDM-GNOMECorvette.tar.gz http://art.gnome.org/download/themes/gdm_greeter/1326/GDM-LoginScanFusion.tar.gz http://art.gnome.org/download/themes/gdm_greeter/1115/GDM-Earth.tar.gz http://art.gnome.org/download/themes/gdm_greeter/1208/GDM-BaltixNorthsidewithUserfaceList.tar.gz http://art.gnome.org/download/themes/gdm_greeter/1200/GDM-GreenForest.tar.gz http://art.gnome.org/download/themes/gdm_greeter/1260/GDM-GinzaGDMTheme.tar.gz http://art.gnome.org/download/themes/gdm_greeter/1145/GDM-FernandoAlonso.tar.gz http://art.gnome.org/download/themes/gdm_greeter/1211/GDM-ZX6R.tar.bz2 http://art.gnome.org/download/themes/gdm_greeter/1248/GDM-BackcountrySkiing.tar.gz http://art.gnome.org/download/themes/gdm_greeter/1321/GDM-GdmMadTux2.tar.gz http://art.gnome.org/download/themes/gdm_greeter/1282/GDM-GdmMadTux.tar.gz http://art.gnome.org/download/themes/gdm_greeter/1302/GDM-SimpleBlue.tar.gz http://art.gnome.org/download/themes/gdm_greeter/1320/GDM-Greenlines.tar.gz http://art.gnome.org/download/themes/gdm_greeter/1139/GDM-VarietyBrushed.tar.gz http://art.gnome.org/download/themes/gdm_greeter/1322/GDM-YZF600R.tar.gz http://art.gnome.org/download/themes/gdm_greeter/1262/GDM-LoznicaSerbia.tar.gz http://art.gnome.org/download/themes/gdm_greeter/1308/GDM-SunergosSimple.tar.gz http://art.gnome.org/download/themes/gdm_greeter/1137/GDM-WhiteFootOnGreen.tar.gz http://art.gnome.org/download/themes/gdm_greeter/1298/GDM-GNULinuxBuddhistGDMColourENG.tar.gz http://art.gnome.org/download/themes/gdm_greeter/1160/GDM-LandingClearance.tar.gz http://art.gnome.org/download/themes/gdm_greeter/1351/GDM-SharpGDM.tar.gz http://art.gnome.org/download/themes/gdm_greeter/1307/GDM-BalloonsBlueGDM.tar.gz http://art.gnome.org/download/themes/gdm_greeter/1310/GDM-ZenLogin.tar.gz http://art.gnome.org/download/themes/gdm_greeter/1349/GDM-LightCoffee.tar.gz
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=999a804712d1d2e780866d53fa9f5f81
+_md5_=95b5bbc37c7804d5dba32056e210a076
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 678bc0ff5efa..bcb51ee66a10 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Fri, 28 Dec 2012 08:06:53 +0000
+Sat, 29 Dec 2012 04:36:56 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index c3418e3e6d66..60c0f8601f84 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Fri Dec 28 08:06:51 UTC 2012
+Sat Dec 29 04:36:53 UTC 2012
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index dc135b1b50cc..1c3825d492d0 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Fri, 28 Dec 2012 08:30:01 +0000
+Sat, 29 Dec 2012 05:00:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 2069507d9b98..519311fb4de5 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1356681901 Fri Dec 28 08:05:01 2012 UTC
+1356755701 Sat Dec 29 04:35:01 2012 UTC
diff --git a/net-analyzer/arpoison/arpoison-0.6-r1.ebuild b/net-analyzer/arpoison/arpoison-0.6-r1.ebuild
deleted file mode 100644
index c1c8fab80f75..000000000000
--- a/net-analyzer/arpoison/arpoison-0.6-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/arpoison/arpoison-0.6-r1.ebuild,v 1.1 2010/09/18 23:54:35 jer Exp $
-
-EAPI="2"
-
-inherit toolchain-funcs
-
-DESCRIPTION="A utility to poison ARP caches"
-HOMEPAGE="http://arpoison.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND=">=net-libs/libnet-1.1.0"
-DEPEND="${RDEPEND}
-		>=sys-apps/sed-4"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	sed -i Makefile \
-		-e 's|gcc \(-Wall\)|$(CC) \1 $(CFLAGS) $(LDFLAGS)|' \
-		|| die "sed Makefile"
-}
-
-src_compile() {
-	emake CC=$(tc-getCC) || die
-}
-
-src_install() {
-	dosbin arpoison
-	doman arpoison.8
-	dodoc README TODO
-}
diff --git a/net-analyzer/arpoison/arpoison-0.6-r2.ebuild b/net-analyzer/arpoison/arpoison-0.6-r2.ebuild
index 28f6d648efd7..24a3a631f951 100644
--- a/net-analyzer/arpoison/arpoison-0.6-r2.ebuild
+++ b/net-analyzer/arpoison/arpoison-0.6-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/arpoison/arpoison-0.6-r2.ebuild,v 1.4 2012/12/26 15:50:13 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/arpoison/arpoison-0.6-r2.ebuild,v 1.5 2012/12/28 11:20:02 ago Exp $
 
 EAPI="5"
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc x86"
+KEYWORDS="amd64 ~arm ppc x86"
 IUSE=""
 
 RDEPEND=">=net-libs/libnet-1.1.0"
diff --git a/net-analyzer/arpoison/arpoison-0.6.ebuild b/net-analyzer/arpoison/arpoison-0.6.ebuild
deleted file mode 100644
index ca72e453c93d..000000000000
--- a/net-analyzer/arpoison/arpoison-0.6.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/arpoison/arpoison-0.6.ebuild,v 1.10 2012/10/09 07:57:16 pinkbyte Exp $
-
-inherit toolchain-funcs
-
-DESCRIPTION="A utility to poison ARP caches"
-HOMEPAGE="http://arpoison.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ppc x86"
-IUSE=""
-
-RDEPEND=">=net-libs/libnet-1.1.0"
-DEPEND="${RDEPEND}
-		>=sys-apps/sed-4"
-
-S="${WORKDIR}/${PN}"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	sed -i \
-		-e "s|\(-Wall\)|\1 ${CFLAGS}|" \
-		-e "s|gcc|$(tc-getCC)|" Makefile || die "sed Makefile failed"
-}
-
-src_install() {
-	dosbin arpoison
-	doman arpoison.8
-	dodoc README TODO
-}
diff --git a/net-analyzer/fail2ban/fail2ban-0.8.8.ebuild b/net-analyzer/fail2ban/fail2ban-0.8.8.ebuild
index c1f2d374817b..460ca5526cda 100644
--- a/net-analyzer/fail2ban/fail2ban-0.8.8.ebuild
+++ b/net-analyzer/fail2ban/fail2ban-0.8.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/fail2ban/fail2ban-0.8.8.ebuild,v 1.3 2012/12/26 17:19:10 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/fail2ban/fail2ban-0.8.8.ebuild,v 1.4 2012/12/28 16:29:58 jer Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2"
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/tarball/${PV} -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="amd64 hppa ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="selinux"
 
 DEPEND="selinux? ( sec-policy/selinux-fail2ban )"
diff --git a/net-dialup/freeradius/files/radius.conf-r3 b/net-dialup/freeradius/files/radius.conf-r3
index 2b29f0f940fd..3c1bf3228cb0 100644
--- a/net-dialup/freeradius/files/radius.conf-r3
+++ b/net-dialup/freeradius/files/radius.conf-r3
@@ -8,5 +8,9 @@
 pidfile=/var/run/radiusd/radiusd.pid
 
 # Change these values if you change them in /etc/raddb/radiusd.conf
-# RADIUSD_USER=radius
-# RADIUSD_GROUP=radius
+#RADIUSD_USER=radius
+#RADIUSD_GROUP=radius
+
+# If you set up logging to syslog in /etc/raddb/radiusd.conf, you want
+# to uncomment the following line.
+#rc_use="logger"
diff --git a/net-dialup/freeradius/files/radius.init-r3 b/net-dialup/freeradius/files/radius.init-r3
index 11dbd461bc6b..73a368a9505e 100644
--- a/net-dialup/freeradius/files/radius.init-r3
+++ b/net-dialup/freeradius/files/radius.init-r3
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/files/radius.init-r3,v 1.2 2012/10/22 02:58:59 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/files/radius.init-r3,v 1.3 2012/12/28 13:08:17 flameeyes Exp $
 
 command=/usr/sbin/radiusd
 command_args="${RADIUSD_OPTS}"
@@ -9,21 +9,22 @@ pidfile="${pidfile:-/var/run/radiusd/radiusd.pid}"
 extra_started_commands="reload"
 
 depend() {
-    use dns
+	need localmount
+	use dns
 }
 
 start_pre() {
-    if [ ! -f /etc/raddb/radiusd.conf ] ; then
-	eerror "No /etc/raddb/radiusd.conf file exists!"
-	return 1
-    fi
+	if [ ! -f /etc/raddb/radiusd.conf ] ; then
+		eerror "No /etc/raddb/radiusd.conf file exists!"
+		return 1
+	fi
 
-    checkpath -m0750 -o "${RADIUSD_USER:-root}:${RADIUSD_GROUP:-root}" -d \
-	$(dirname ${pidfile}) /var/log/radius
+	checkpath -m0750 -o "${RADIUSD_USER:-root}:${RADIUSD_GROUP:-root}" -d \
+		$(dirname ${pidfile}) /var/log/radius
 }
 
 reload() {
-    ebegin "Reloading radiusd"
-    kill -HUP $(cat /var/run/radiusd/radiusd.pid)
-    eend $?
+	ebegin "Reloading radiusd"
+	kill -HUP $(cat ${pidfile})
+	eend $?
 }
diff --git a/net-dns/bind/bind-9.9.2_p1.ebuild b/net-dns/bind/bind-9.9.2_p1.ebuild
index 57bc0764a2ba..56f5e6db0b92 100644
--- a/net-dns/bind/bind-9.9.2_p1.ebuild
+++ b/net-dns/bind/bind-9.9.2_p1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.9.2_p1.ebuild,v 1.7 2012/12/25 22:26:57 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.9.2_p1.ebuild,v 1.8 2012/12/28 15:08:18 ago Exp $
 
 # Re dlz/mysql and threads, needs to be verified..
 # MySQL uses thread local storage in its C api. Thus MySQL
@@ -52,7 +52,7 @@ SRC_URI="ftp://ftp.isc.org/isc/bind9/${MY_PV}/${MY_P}.tar.gz
 
 LICENSE="ISC BSD BSD-2 HPND JNIC RSA openssl"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="berkdb caps dlz doc filter-aaaa geoip gost gssapi idn ipv6 ldap mysql odbc
 postgres python rpz rrl sdb-ldap selinux ssl static-libs threads urandom xml"
 # no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687
diff --git a/net-im/kadu/kadu-0.12.3.ebuild b/net-im/kadu/kadu-0.12.3.ebuild
index ce3e28539469..9e5fd7ed8b12 100644
--- a/net-im/kadu/kadu-0.12.3.ebuild
+++ b/net-im/kadu/kadu-0.12.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/kadu/kadu-0.12.3.ebuild,v 1.1 2012/09/15 10:51:55 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/kadu/kadu-0.12.3.ebuild,v 1.4 2012/12/28 10:34:06 ago Exp $
 
 EAPI="4"
 
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.kadu.net"
 SRC_URI="http://download.kadu.im/stable/${P}.tar.bz2"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 SLOT="0"
 IUSE="ayatana +gadu mpd phonon sdk speech spell xmpp"
 REQUIRED_USE="
diff --git a/net-im/pymsn-t/Manifest b/net-im/pymsn-t/Manifest
index 48bf18090066..310f6ee13de9 100644
--- a/net-im/pymsn-t/Manifest
+++ b/net-im/pymsn-t/Manifest
@@ -1 +1 @@
-DIST pymsnt-0.11.3.tar.gz 162549 SHA256 777195feb6a70b683d691c54269099d319747fad7195cca36d86df366360ce2c
+DIST pymsnt-0.11.3.tar.gz 162549 SHA256 777195feb6a70b683d691c54269099d319747fad7195cca36d86df366360ce2c SHA512 57ed58c51ddaceb877e22c0703f59299fd1e75add6de9b6d937025a12f9ea669c24c8de70a5995500101a0537dd3549676df475d87df63ec29d6c773a2a31563 WHIRLPOOL f5af4d65f6e8d193ecef07739c29b30e841f4f7fb32c972a9c58e6550700da3c0ae3fdfa3bb9d077e7369b05f0582ab305f76c593c6457d43fa5455caa7386bb
diff --git a/net-im/pymsn-t/files/pymsn-t-0.11.2-initd b/net-im/pymsn-t/files/pymsn-t-0.11.2-initd
deleted file mode 100644
index 1f4810939618..000000000000
--- a/net-im/pymsn-t/files/pymsn-t-0.11.2-initd
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/pymsn-t/files/pymsn-t-0.11.2-initd,v 1.2 2007/06/04 20:48:44 griffon26 Exp $
-
-depend() {
-	need net
-	use jabber-server
-}
-
-start() {
-	ebegin "Starting MSN Jabber Transport"
-	start-stop-daemon --start --pidfile /var/run/jabber/pymsn-t.pid --chuid jabber:jabber \
-		--exec /usr/bin/python INSPATH/pymsn-t.py -- \
-		-b -c /etc/jabber/pymsn-t.xml -l /var/log/jabber/pymsn-t.log
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping MSN Jabber Transport"
-	start-stop-daemon --stop --quiet --pidfile /var/run/jabber/pymsn-t.pid
-	eend $?
-}
diff --git a/net-im/pymsn-t/pymsn-t-0.11.3-r1.ebuild b/net-im/pymsn-t/pymsn-t-0.11.3-r1.ebuild
deleted file mode 100644
index 59bb54895726..000000000000
--- a/net-im/pymsn-t/pymsn-t-0.11.3-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/pymsn-t/pymsn-t-0.11.3-r1.ebuild,v 1.4 2010/07/06 16:08:47 arfrever Exp $
-
-PYTHON_DEPEND="2"
-
-inherit eutils multilib python
-
-MY_PN="pymsnt"
-S=${WORKDIR}/${MY_PN}-${PV}
-DESCRIPTION="Python based jabber transport for MSN"
-HOMEPAGE="http://msn-transport.jabberstudio.org/"
-SRC_URI="http://msn-transport.jabberstudio.org/tarballs/${MY_PN}-${PV}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE=""
-
-DEPEND="net-im/jabber-base"
-RDEPEND="${DEPEND}
-	>=dev-python/twisted-2.5.0
-	>=dev-python/twisted-words-0.5.0
-	>=dev-python/twisted-web-0.7.0
-	>=dev-python/imaging-1.1"
-
-src_unpack() {
-	unpack ${A} && cd "${S}" || die "unpack failed"
-	epatch "${FILESDIR}/${P}-protocol-version.patch"
-}
-
-src_install() {
-	local inspath
-
-	inspath=$(python_get_sitedir)/${PN}
-	insinto ${inspath}
-	doins -r data src
-	newins PyMSNt.py ${PN}.py
-
-	insinto /etc/jabber
-	newins config-example.xml ${PN}.xml
-	fperms 600 /etc/jabber/${PN}.xml
-	fowners jabber:jabber /etc/jabber/${PN}.xml
-	dosed \
-		"s:<!-- <spooldir>[^\<]*</spooldir> -->:<spooldir>/var/spool/jabber</spooldir>:" \
-		/etc/jabber/${PN}.xml
-	dosed \
-		"s:<pid>[^\<]*</pid>:<pid>/var/run/jabber/${PN}.pid</pid>:" \
-		/etc/jabber/${PN}.xml
-	dosed \
-		"s:<host>[^\<]*</host>:<host>example.org</host>:" \
-		/etc/jabber/${PN}.xml
-	dosed \
-		"s:<jid>msn</jid>:<jid>msn.example.org</jid>:" \
-		/etc/jabber/${PN}.xml
-
-	newinitd "${FILESDIR}/${PN}-0.11.2-initd" ${PN}
-	dosed "s:INSPATH:${inspath}:" /etc/init.d/${PN}
-}
-
-pkg_postinst() {
-	python_mod_optimize $(python_get_sitedir)/${PN}
-
-	elog "A sample configuration file has been installed in /etc/jabber/${PN}.xml."
-	elog "Please edit it and the configuration of your Jabber server to match."
-}
-
-pkg_postrm() {
-	python_mod_cleanup $(python_get_sitedir)/${PN}
-}
diff --git a/net-im/pymsn-t/pymsn-t-0.11.3-r2.ebuild b/net-im/pymsn-t/pymsn-t-0.11.3-r2.ebuild
deleted file mode 100644
index a4d13509ffbe..000000000000
--- a/net-im/pymsn-t/pymsn-t-0.11.3-r2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/pymsn-t/pymsn-t-0.11.3-r2.ebuild,v 1.5 2010/07/06 16:08:47 arfrever Exp $
-
-PYTHON_DEPEND="2"
-
-inherit eutils multilib python
-
-MY_PN="pymsnt"
-S=${WORKDIR}/${MY_PN}-${PV}
-DESCRIPTION="Python based jabber transport for MSN"
-HOMEPAGE="http://msn-transport.jabberstudio.org/"
-SRC_URI="http://msn-transport.jabberstudio.org/tarballs/${MY_PN}-${PV}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE=""
-
-DEPEND="net-im/jabber-base"
-RDEPEND="${DEPEND}
-	>=dev-python/twisted-2.5.0
-	>=dev-python/twisted-words-0.5.0
-	>=dev-python/twisted-web-0.7.0
-	>=dev-python/imaging-1.1"
-
-src_unpack() {
-	unpack ${A} && cd "${S}" || die "unpack failed"
-	epatch "${FILESDIR}/${P}-protocol-version.patch"
-	epatch "${FILESDIR}/${P}-unexpected-xfr.patch"
-	epatch "${FILESDIR}/${P}-remove-pid.patch"
-	epatch "${FILESDIR}/${P}-delete-reactor.patch"
-}
-
-src_install() {
-	local inspath
-
-	inspath=$(python_get_sitedir)/${PN}
-	insinto ${inspath}
-	doins -r data src
-	newins PyMSNt.py ${PN}.py
-
-	insinto /etc/jabber
-	newins config-example.xml ${PN}.xml
-	fperms 600 /etc/jabber/${PN}.xml
-	fowners jabber:jabber /etc/jabber/${PN}.xml
-	dosed \
-		"s:<!-- <spooldir>[^\<]*</spooldir> -->:<spooldir>/var/spool/jabber</spooldir>:" \
-		/etc/jabber/${PN}.xml
-	dosed \
-		"s:<pid>[^\<]*</pid>:<pid>/var/run/jabber/${PN}.pid</pid>:" \
-		/etc/jabber/${PN}.xml
-	dosed \
-		"s:<host>[^\<]*</host>:<host>example.org</host>:" \
-		/etc/jabber/${PN}.xml
-	dosed \
-		"s:<jid>msn</jid>:<jid>msn.example.org</jid>:" \
-		/etc/jabber/${PN}.xml
-
-	newinitd "${FILESDIR}/${PN}-0.11.2-initd" ${PN}
-	dosed "s:INSPATH:${inspath}:" /etc/init.d/${PN}
-}
-
-pkg_postinst() {
-	python_mod_optimize $(python_get_sitedir)/${PN}
-
-	elog "A sample configuration file has been installed in /etc/jabber/${PN}.xml."
-	elog "Please edit it and the configuration of your Jabber server to match."
-}
-
-pkg_postrm() {
-	python_mod_cleanup $(python_get_sitedir)/${PN}
-}
diff --git a/net-im/pymsn-t/pymsn-t-0.11.3.ebuild b/net-im/pymsn-t/pymsn-t-0.11.3.ebuild
deleted file mode 100644
index 28139ad825ba..000000000000
--- a/net-im/pymsn-t/pymsn-t-0.11.3.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/pymsn-t/pymsn-t-0.11.3.ebuild,v 1.4 2010/07/06 16:08:47 arfrever Exp $
-
-PYTHON_DEPEND="2"
-
-inherit eutils multilib python
-
-MY_PN="pymsnt"
-S=${WORKDIR}/${MY_PN}-${PV}
-DESCRIPTION="Python based jabber transport for MSN"
-HOMEPAGE="http://msn-transport.jabberstudio.org/"
-SRC_URI="http://msn-transport.jabberstudio.org/tarballs/${MY_PN}-${PV}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~ppc"
-IUSE=""
-
-DEPEND="net-im/jabber-base"
-RDEPEND="${DEPEND}
-	>=dev-python/twisted-2.5.0
-	>=dev-python/twisted-words-0.5.0
-	>=dev-python/twisted-web-0.7.0
-	>=dev-python/imaging-1.1"
-
-src_install() {
-	local inspath
-
-	inspath=$(python_get_sitedir)/${PN}
-	insinto ${inspath}
-	doins -r data src
-	newins PyMSNt.py ${PN}.py
-
-	insinto /etc/jabber
-	newins config-example.xml ${PN}.xml
-	fperms 600 /etc/jabber/${PN}.xml
-	fowners jabber:jabber /etc/jabber/${PN}.xml
-	dosed \
-		"s:<!-- <spooldir>[^\<]*</spooldir> -->:<spooldir>/var/spool/jabber</spooldir>:" \
-		/etc/jabber/${PN}.xml
-	dosed \
-		"s:<pid>[^\<]*</pid>:<pid>/var/run/jabber/${PN}.pid</pid>:" \
-		/etc/jabber/${PN}.xml
-	dosed \
-		"s:<host>[^\<]*</host>:<host>example.org</host>:" \
-		/etc/jabber/${PN}.xml
-	dosed \
-		"s:<jid>msn</jid>:<jid>msn.example.org</jid>:" \
-		/etc/jabber/${PN}.xml
-
-	newinitd "${FILESDIR}/${PN}-0.11.2-initd" ${PN}
-	dosed "s:INSPATH:${inspath}:" /etc/init.d/${PN}
-}
-
-pkg_postinst() {
-	python_mod_optimize $(python_get_sitedir)/${PN}
-
-	elog "A sample configuration file has been installed in /etc/jabber/${PN}.xml."
-	elog "Please edit it and the configuration of your Jabber server to match."
-}
-
-pkg_postrm() {
-	python_mod_cleanup $(python_get_sitedir)/${PN}
-}
diff --git a/net-libs/neon/neon-0.29.6-r2.ebuild b/net-libs/neon/neon-0.29.6-r2.ebuild
index 72cfa3bf1a50..7c78e87663fa 100644
--- a/net-libs/neon/neon-0.29.6-r2.ebuild
+++ b/net-libs/neon/neon-0.29.6-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/neon/neon-0.29.6-r2.ebuild,v 1.3 2012/12/26 17:19:35 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/neon/neon-0.29.6-r2.ebuild,v 1.5 2012/12/28 11:25:40 ago Exp $
 
 EAPI="4"
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.webdav.org/neon/${P}.tar.gz"
 
 LICENSE="GPL-2"
 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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc expat gnutls kerberos libproxy nls pkcs11 ssl static-libs zlib"
 IUSE_LINGUAS="cs de fr ja nn pl ru tr zh_CN"
 for lingua in ${IUSE_LINGUAS}; do
diff --git a/net-misc/aria2/Manifest b/net-misc/aria2/Manifest
index eca95cc7f88b..c751cf4a0728 100644
--- a/net-misc/aria2/Manifest
+++ b/net-misc/aria2/Manifest
@@ -1,6 +1,7 @@
-DIST aria2-1.12.1.tar.bz2 1590472 SHA256 a8f01f211df3ecacb02cce2914f446b72e42d130691edbbbdbe99be3936ca366
-DIST aria2-1.14.1.tar.bz2 1636900 SHA256 a436ffaa9fd678a498d2599f00b3885cdc4eda13953dcf715c9ac4ff95b61ab1
+DIST aria2-1.12.1.tar.bz2 1590472 SHA256 a8f01f211df3ecacb02cce2914f446b72e42d130691edbbbdbe99be3936ca366 SHA512 e65a7880ffddb6835ffbc8a848d00fd9314bc62df13c018a8232efc55a1b3a44a84614c7f443726ccb1713454fef567fe71734b8c1cd383fa66f4799b1529ced WHIRLPOOL 4fb6a9593443ec882163f06fb7e0c5dd44320fc0fdf45adfac074b092b205db061095cdd6fbb368347d02247653d9ca00141ad6dd33ee056186a57b7ea4a1ce5
+DIST aria2-1.14.1.tar.bz2 1636900 SHA256 a436ffaa9fd678a498d2599f00b3885cdc4eda13953dcf715c9ac4ff95b61ab1 SHA512 ae604b870289d98ddb7104cc7ab8d951674322c5bc5f4a41c45fa8745d0b876e721fd90a4d9dd0ac770d566f1609af9a05260416eb1b7e6f28d57fd9964453db WHIRLPOOL 7e1ff6a9c3d6ae4ac58eaaf5bbf97f1e0c58c80211d991953f9ccdf74825f737ef6fc6492bc6e456972c9f77f7a4835bd3b8eb38cfdd85634a1bc7fb8faae104
 DIST aria2-1.15.0.tar.bz2 2080386 SHA256 02916b399946029674393c6a66d3544e88959610d3b2303fdd2d2365aa680be1 SHA512 a626904f7014ea45823f0a80bb4858b72d8a959b160d7a48c5f351d4b5558855af63769cb30cced51a33bf93d15145453dc3bab09b4ac3b0a9e5fafe8998dd6b WHIRLPOOL 994fa663a6ed8d7e19e20e3309cb3a272a6e4f797549d935f3d29a93d0ff25bf5dd71db02eb68083f4077f69a8c50162765564f2986a64db0a4f7672415df973
 DIST aria2-1.15.2.tar.bz2 2043212 SHA256 6400431f4248f7a779ae8216ec2711b56ad7481fc659f06db1f22ed97b260836 SHA512 6fc09ba1f682d13db829a3f5881a06ea0d0d2c1622511408f149cc109a12a01b19cec34caeeac10982061e9633bbb67e9ec40c23ee39a418fec6fb604af23bbe WHIRLPOOL b9544bb5359fc22dca5ba4e5328086deb0cf7d40fc69e7528ed57f14a89b30ffa6022ab7bfbe5f2fbd150b3974272286ff2f26d011bccaf5f973ccca00f2a44e
 DIST aria2-1.16.0.tar.bz2 2062545 SHA256 3d5760f5aa43b5d1199e373f93d704bd38f973706edd3b1661cc4ebe3fed0f1e SHA512 e44c1272036f632477e992e14b3fdf8be6cd0cd847cd0fdc6372c19f1f0b8549517b3e946c61e28dbdd3395cfd912f51aac0fa5aef20529553bd72250ebcc942 WHIRLPOOL 6d99ea0f722a200f30b6306429c080c58c55068118a562e969457d1def87b2eb43add6457c8cb8386f83750eef39cdbd98eab9b03a5dd57664c8853cf71c0b6f
+DIST aria2-1.16.1.tar.bz2 2079662 SHA256 8bbe1d741289e299edb12ff461455e4b57d7b18ed3e138da936e4906fd9368e1 SHA512 f09845052c831105a2b8ecf250b0990544c77a61ea4ced76f908f9b3cc785a132f6fb267df497515e691367b4928955f65b4048aec7dd099473fdc15941d2055 WHIRLPOOL f40d0d73715a0f5767227de400dc872835dfa59d9e0880b5f479a6c1eef5e83ef57015145d9e7d2087329ba457875156ac34d95d2434d04c8fc0c0fe126352b2
 DIST aria2-1.9.3.tar.bz2 1441999 SHA256 364f9e5d8dcf3f12bd2683ea0d17274e0088b6dd7f869db35feba4e30ade7613 SHA512 bea1c8fadb4f04e7c46816261ff38b4b81832b2a89b4d5621858b57cd19aee2b1123102aab13bb1edcec735e3b508ed6c2fa5bb6130f019c581844b0b2e28d65 WHIRLPOOL bd67c88cb09b2abcc9007fb191729e6b807f9c7e1a0b0c53dd5cc352004d3a8456fdccd8386513037028bacef51a903d1d530bd89f63efffc1130d2d63efc498
diff --git a/net-misc/aria2/aria2-1.16.1.ebuild b/net-misc/aria2/aria2-1.16.1.ebuild
new file mode 100644
index 000000000000..313e0ad6f6af
--- /dev/null
+++ b/net-misc/aria2/aria2-1.16.1.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/aria2/aria2-1.16.1.ebuild,v 1.1 2012/12/28 09:58:14 dev-zero Exp $
+
+EAPI="5"
+
+inherit bash-completion-r1 eutils
+
+DESCRIPTION="A download utility with segmented downloading with BitTorrent support"
+HOMEPAGE="http://aria2.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+SLOT="0"
+IUSE="adns bittorrent +gnutls +libxml2 metalink +nettle nls sqlite scripts ssl test xmlrpc"
+
+CDEPEND="sys-libs/zlib
+	ssl? (
+		app-misc/ca-certificates
+		gnutls? ( >=net-libs/gnutls-1.2.9 )
+		!gnutls? ( dev-libs/openssl ) )
+	adns? ( >=net-dns/c-ares-1.5.0 )
+	bittorrent? (
+		ssl? (
+			gnutls? (
+				nettle? ( >=dev-libs/nettle-2.4[gmp] >=dev-libs/gmp-5 )
+				!nettle? ( >=dev-libs/libgcrypt-1.2.2 ) ) )
+		!ssl? (
+			nettle? ( >=dev-libs/nettle-2.4[gmp] >=dev-libs/gmp-5 )
+			!nettle? ( >=dev-libs/libgcrypt-1.2.2 ) ) )
+	metalink? (
+		libxml2? ( >=dev-libs/libxml2-2.6.26 )
+		!libxml2? ( dev-libs/expat ) )
+	sqlite? ( dev-db/sqlite:3 )
+	xmlrpc? (
+		libxml2? ( >=dev-libs/libxml2-2.6.26 )
+		!libxml2? ( dev-libs/expat ) )"
+
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	test? ( >=dev-util/cppunit-1.12.0 )"
+RDEPEND="${CDEPEND}
+	nls? ( virtual/libiconv virtual/libintl )
+	scripts? ( dev-lang/ruby )"
+
+pkg_setup() {
+	if use scripts && use !xmlrpc && use !metalink; then
+		ewarn "Please note that you may need to enable USE=xmlrpc to run the aria2rpc"
+		ewarn "and aria2mon scripts against the local aria2."
+	fi
+}
+
+src_prepare() {
+	epatch_user
+	sed -i -e "s|/tmp|${T}|" test/*.cc test/*.txt || die "sed failed"
+}
+
+src_configure() {
+	# Notes:
+	# - always enable gzip/http compression since zlib should always be available anyway
+	# - always enable epoll since we can assume kernel 2.6.x
+	# - other options for threads: solaris, pth, win32
+	local myconf=(
+		--enable-epoll
+		--enable-threads=posix
+		--with-libz
+		--with-ca-bundle="${EPREFIX}/etc/ssl/certs/ca-certificates.crt"
+		$(use_enable nls)
+		$(use_enable metalink)
+		$(use_with sqlite sqlite3)
+		$(use_enable bittorrent)
+		$(use_with adns libcares)
+	)
+
+	# SSL := gnutls / openssl
+	# USE=ssl
+	#  + USE=gnutls -> gnutls
+	#  + USE=-gnutls -> openssl
+
+	if use ssl; then
+		myconf+=( $(use_with gnutls) $(use_with !gnutls openssl) )
+	else
+		myconf+=( --without-gnutls --without-openssl )
+	fi
+
+	# message-digest := nettle / gcrypt / openssl
+	# bignum := nettle+gmp / gcrypt / openssl
+	# bittorrent := message-digest + bignum
+	# USE=bittorrent
+	#  + USE=(ssl -gnutls) -> openssl
+	#  + USE=nettle -> nettle+gmp
+	#  + USE=-nettle -> gcrypt
+
+	if use !bittorrent || use ssl && use !gnutls; then
+		myconf+=( --without-libgcrypt --without-libnettle --without-libgmp )
+	else
+		myconf+=( $(use_with !nettle libgcrypt)
+			$(use_with nettle libnettle) $(use_with nettle libgmp) )
+	fi
+
+	# metalink+xmlrpc := libxml2 / expat
+	# USE=(metalink || xmlrpc)
+	#  + USE=libxml2 -> libxml2
+	#  + USE=-libxml2 -> expat
+
+	if use metalink || use xmlrpc; then
+		myconf+=( $(use_with !libxml2 libexpat) $(use_with libxml2) )
+	else
+		myconf+=( --without-libexpat --without-libxml2 )
+	fi
+
+	# Note:
+	# - always enable gzip/http compression since zlib should always be available anyway
+	# - always enable epoll since we can assume kernel 2.6.x
+	# - other options for threads: solaris, pth, win32
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	rm -rf "${D}"/usr/share/doc/aria2 \
+		"${D}"/usr/share/doc/${PF}/README{,.html}
+
+	dobashcomp doc/bash_completion/aria2c
+	use scripts && dobin doc/xmlrpc/aria2{mon,rpc}
+}
+
+pkg_postinst() {
+	if use xmlrpc || use metalink; then
+		elog "If you would like to use the additional aria2mon and aria2rpc tools,"
+		elog "you need to have \033[1mdev-lang/ruby\033[0m installed."
+	fi
+}
diff --git a/net-misc/httpie/Manifest b/net-misc/httpie/Manifest
index d301ade95bbf..bd469e075968 100644
--- a/net-misc/httpie/Manifest
+++ b/net-misc/httpie/Manifest
@@ -1 +1,2 @@
 DIST httpie-0.3.0.tar.gz 52907 SHA256 566d5a002f2a45147d219f46ee9018697d0be45ddb035ab6ad2cdc75538f4da0 SHA512 faa93d0268548294af3d6d91c3a17fe1ee633a1909e3c73e1ed827a878c4cc390f669cba9621f486182e79d2d47bfa0b32fbc852e89244ed22ec56ddff105a6a WHIRLPOOL 24244520bca0f669d94b621726bc6ff917bac7c0c2dd4d06334b3827d3b5ac47c02a6559e202bb05882f01937111cb1a07d242659fd75cfb2f14ec45aa2ab95d
+DIST httpie-0.3.1.tar.gz 52942 SHA256 ea74028681cd4641bdf2b1b9a1549975d6ea8a7ceb619082c2e6d61c199f7229 SHA512 c031c234f0539f2736047c025b4b551c56fb53303080d745348fa86cdf371b7fdffc831eebf802a287b927501dc6b142e96952f2c774f4721b64103d3fd8323a WHIRLPOOL f42020542b55ce60fdb5b8c4b154f7912b03f2b1396e7aae4262e361299ef7f6f397e64037be9dc863439e5c02000611b3cdfefd004871f93181f5adc7504834
diff --git a/net-misc/httpie/httpie-0.3.0-r1.ebuild b/net-misc/httpie/httpie-0.3.0-r1.ebuild
new file mode 100644
index 000000000000..7611a76fe819
--- /dev/null
+++ b/net-misc/httpie/httpie-0.3.0-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/httpie/httpie-0.3.0-r1.ebuild,v 1.1 2012/12/28 22:23:56 vikraman Exp $
+
+EAPI=4
+
+PYTHON_DEPEND="2:2.6 3:3.1"
+SUPPORT_PYTHON_ABIS="1"
+
+inherit distutils
+
+DESCRIPTION="A CLI, cURL-like tool for humans"
+HOMEPAGE="http://httpie.org/ http://pypi.python.org/pypi/httpie"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	>=dev-python/requests-0.10.1
+	<dev-python/requests-1.0
+	>=dev-python/pygments-1.5
+	virtual/python-argparse"
diff --git a/net-misc/httpie/httpie-0.3.1.ebuild b/net-misc/httpie/httpie-0.3.1.ebuild
new file mode 100644
index 000000000000..911dbd8b1129
--- /dev/null
+++ b/net-misc/httpie/httpie-0.3.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/httpie/httpie-0.3.1.ebuild,v 1.1 2012/12/28 22:26:21 vikraman Exp $
+
+EAPI=4
+
+PYTHON_DEPEND="2:2.6 3:3.1"
+SUPPORT_PYTHON_ABIS="1"
+
+inherit distutils
+
+DESCRIPTION="A CLI, cURL-like tool for humans"
+HOMEPAGE="http://httpie.org/ http://pypi.python.org/pypi/httpie"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	>=dev-python/requests-0.10.1
+	<dev-python/requests-1.0
+	>=dev-python/pygments-1.5
+	virtual/python-argparse"
diff --git a/net-misc/leechcraft-full/leechcraft-full-9999.ebuild b/net-misc/leechcraft-full/leechcraft-full-9999.ebuild
index da8bdbae3b24..1df15684914b 100644
--- a/net-misc/leechcraft-full/leechcraft-full-9999.ebuild
+++ b/net-misc/leechcraft-full/leechcraft-full-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/leechcraft-full/leechcraft-full-9999.ebuild,v 1.20 2012/12/20 14:12:34 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/leechcraft-full/leechcraft-full-9999.ebuild,v 1.21 2012/12/28 17:22:58 maksbotan Exp $
 
 EAPI="4"
 
@@ -44,7 +44,6 @@ RDEPEND="
 		~net-misc/leechcraft-pintab-${PV}
 		~net-misc/leechcraft-secman-${PV}
 		~net-misc/leechcraft-summary-${PV}
-		~net-misc/leechcraft-tabpp-${PV}
 		~net-misc/leechcraft-tabslist-${PV}
 		~net-misc/leechcraft-tabsessmanager-${PV}
 		~net-news/leechcraft-aggregator-${PV}
diff --git a/net-proxy/c-icap/Manifest b/net-proxy/c-icap/Manifest
index 5a654d74e082..e3e29a539019 100644
--- a/net-proxy/c-icap/Manifest
+++ b/net-proxy/c-icap/Manifest
@@ -1,3 +1,2 @@
-DIST c_icap-0.1.7.tar.gz 530022 SHA256 abc263426ca789bc182c04a5bfcf2820d9059902d36c8680baf1032218c50b09 SHA512 942ab3a6952e354e7cf3f09c0106bfc5cfe9df49b885e6863d8a55c1b2337a97d5220b7df8c8f2e0bcde70de7d8ed6b5845a46a9240563e70afed0f931ff0875 WHIRLPOOL fbb42d7c1d63d42e7b9c3f9dceb169b014b56e20eb81b78020c55c9d6ece3602004d1915bd5bd0f18b6f203ed7d122e72b5e34711f23e1b5472b4cda5aa2b4b3
 DIST c_icap-0.2.2.tar.gz 581607 SHA256 3236fb63b7cb08df46f591d4a5b0cd6c3806fcd8a9831aa01915acc9435f6ed1 SHA512 798aa5c485e12c623706b73486aee69776d60258e0c6e3fd2c5c08c5ec8eee92115e5883a5a761ce4aaafeab77aff8a94c62117504debbb63b67276837e07fcb WHIRLPOOL f4fe754555a1c0b708bce9a1084fb1ca9677724bbc19d99365c770dd9654057928ff75f0271cef81323689762f5cbf3932c9dad8856e9552654d752f95961e03
 DIST c_icap-0.2.3.tar.gz 581549 SHA256 78ae3d3a577bb8570d77ca5cf2f266deaf72d77c6df64399e64e3bee363122ee SHA512 319e3ef6a021d372e0f8a2226e107e8b7ea450d115f4f907fdea36db9ab22b3a6ddcb5b7d4fe2e334e23cb1f17abf586445779663d302c3ed94e27a637a554b1 WHIRLPOOL 32fd9fd9b83739234c3ea00f66fb46868a624f424413b20d18c5ffa45d5f2a733ebda63d5d81b1b46c4978e2cd522669d3bcd9922c6a43a489f53173b8efac51
diff --git a/net-proxy/c-icap/c-icap-0.1.7-r1.ebuild b/net-proxy/c-icap/c-icap-0.1.7-r1.ebuild
deleted file mode 100644
index 9870beb04cd2..000000000000
--- a/net-proxy/c-icap/c-icap-0.1.7-r1.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/c-icap/c-icap-0.1.7-r1.ebuild,v 1.5 2012/03/20 14:48:44 jer Exp $
-
-EAPI=2
-
-inherit eutils multilib flag-o-matic autotools
-
-MY_PN=${PN/-/_}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="C Implementation of an ICAP server"
-HOMEPAGE="http://c-icap.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="berkdb ipv6 ldap"
-
-RDEPEND="berkdb? ( sys-libs/db )
-	ldap? ( net-nds/openldap )
-	sys-libs/zlib"
-DEPEND="${RDEPEND}"
-RDEPEND="${RDEPEND}
-	sys-apps/openrc"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-0.1.3-asneeded.patch"
-	epatch "${FILESDIR}/${PN}-0.1.3-implicit.patch"
-	epatch "${FILESDIR}/${PN}-0.1.3+db-5.0.patch"
-	epatch "${FILESDIR}/${PN}-0.1.4-crosscompile.patch"
-	epatch "${FILESDIR}/${PN}-0.1.6-implicit.patch"
-	eautoreconf
-}
-
-src_configure() {
-	# some void *** pointers get casted around and can be troublesome to
-	# fix properly.
-	append-flags -fno-strict-aliasing
-
-	econf \
-		--sysconfdir=/etc/${PN} \
-		--disable-dependency-tracking \
-		--disable-maintainer-mode \
-		--disable-static \
-		--enable-large-files \
-		$(use_enable ipv6) \
-		$(use_with berkdb bdb) \
-		$(use_with ldap)
-}
-
-src_compile() {
-	emake LOGDIR="/var/log" || die
-}
-
-src_install() {
-	emake \
-		LOGDIR="/var/log" \
-		DESTDIR="${D}" install || die
-
-	find "${D}" -name '*.la' -delete || die
-
-	# Move the daemon out of the way
-	dodir /usr/libexec
-	mv "${D}"/usr/bin/c-icap "${D}"/usr/libexec || die
-
-	# Remove the default configuration files since we have etc-update to
-	# take care of it for us.
-	rm "${D}"/etc/${PN}/c-icap.*.default || die
-
-	# Fix the configuration file; for some reason it's a bit messy
-	# around.
-	sed -i \
-		-e 's:/usr/var/:/var/:g' \
-		-e 's:/var/log/:/var/log/c-icap/:g' \
-		-e 's:/usr/etc/:/etc/c-icap/:g' \
-		-e 's:/usr/local/c-icap/etc/:/etc/c-icap/:g' \
-		-e 's:/usr/lib/:/usr/'$(get_libdir)'/:g' \
-		"${D}"/etc/${PN}/c-icap.conf \
-		|| die
-
-	dodoc AUTHORS README TODO ChangeLog || die
-
-	newinitd "${FILESDIR}/${PN}.init.2" ${PN} || die
-	keepdir /var/log/c-icap || die
-
-	insopts -m0644
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotate ${PN}
-}
-
-pkg_postinst() {
-	elog "To enable Squid to call the ICAP modules from a local server you should set"
-	elog "the following in your squid.conf:"
-	elog ""
-	elog "    icap_enable on"
-	elog ""
-	elog "    # not strictly needed, but some modules might make use of these"
-	elog "    icap_send_client_ip on"
-	elog "    icap_send_client_username on"
-	elog ""
-	elog "    icap_service service_req reqmod_precache bypass=1 icap://localhost:1344/service"
-	elog "    adaptation_access service_req allow all"
-	elog ""
-	elog "    icap_service service_resp respmod_precache bypass=0 icap://localhost:1344/service"
-	elog "    adaptation_access service_resp allow all"
-	elog ""
-	elog "You obviously will have to replace \"service\" with the actual ICAP service to"
-	elog "use."
-}
diff --git a/net-proxy/c-icap/c-icap-0.2.3.ebuild b/net-proxy/c-icap/c-icap-0.2.3-r1.ebuild
similarity index 95%
rename from net-proxy/c-icap/c-icap-0.2.3.ebuild
rename to net-proxy/c-icap/c-icap-0.2.3-r1.ebuild
index eb9387abf70a..76f5d736bde7 100644
--- a/net-proxy/c-icap/c-icap-0.2.3.ebuild
+++ b/net-proxy/c-icap/c-icap-0.2.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/c-icap/c-icap-0.2.3.ebuild,v 1.1 2012/11/15 20:27:05 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/c-icap/c-icap-0.2.3-r1.ebuild,v 1.1 2012/12/28 12:42:46 flameeyes Exp $
 
 EAPI=4
 
@@ -83,7 +83,8 @@ src_install() {
 
 	dodoc AUTHORS README TODO ChangeLog
 
-	newinitd "${FILESDIR}/${PN}.init.2" ${PN}
+	newinitd "${FILESDIR}/${PN}.init.3" ${PN}
+	newconfd "${FILESDIR}/${PN}.conf" ${PN}
 	keepdir /var/log/c-icap
 
 	insopts -m0644
diff --git a/net-proxy/c-icap/files/c-icap.conf b/net-proxy/c-icap/files/c-icap.conf
new file mode 100644
index 000000000000..e5be18e7c2de
--- /dev/null
+++ b/net-proxy/c-icap/files/c-icap.conf
@@ -0,0 +1,13 @@
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/c-icap/files/c-icap.conf,v 1.1 2012/12/28 12:42:46 flameeyes Exp $
+
+# Use this to change the configuration file to use for c-icap.
+configfile=/etc/c-icap/c-icap.conf
+
+# Use this to set any extra option for the daemon. Do not use the -f
+# option here.
+EXTRA_OPTS=""
+
+# If you enabled LDAP support, and you'd like to access tables stored
+# in the local LDAP instance, you want to uncomment the following
+# line.
+#rc_need="slapd"
diff --git a/net-proxy/c-icap/files/c-icap.init.3 b/net-proxy/c-icap/files/c-icap.init.3
new file mode 100644
index 000000000000..f5c57680602b
--- /dev/null
+++ b/net-proxy/c-icap/files/c-icap.init.3
@@ -0,0 +1,27 @@
+#!/sbin/runscript
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/c-icap/files/c-icap.init.3,v 1.1 2012/12/28 12:42:46 flameeyes Exp $
+
+: ${configfile:=/etc/c-icap/c-icap.conf}
+
+get_config() {
+    local value=$(awk '$1 == "'$1'" { print $2 }' ${configfile})
+    echo ${value:-$2}
+}
+
+command="/usr/libexec/c-icap"
+command_arguments="${EXTRA_OPTS} -f ${configfile}"
+pidfile=$(get_config PidFile /var/run/c-icap/c-icap.pid)
+
+depend() {
+	need localmount
+	config ${configfile}
+	[ "$(get_config Logger file_logger)" = "sys_logger" ] && use logger
+}
+
+start_pre() {
+	local cmdsocket=$(get_config CommandsSocket /var/run/c-icap/c-icap.ctl)
+
+	checkpath -d "$(dirname "${cmdsocket}")" "$(dirname "${pidfile}")"
+}
diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index 702c56d019d5..9d3429aa16fd 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -1,4 +1,4 @@
 DIST haproxy-1.4.21.tar.gz 827392 SHA256 6e28575f0492def31c331faf9ead08225dd62153334880688f8a7c477c8c31a4 SHA512 68dc0604a102b3848516511f8dcd6cf6f52e7de5e64437ab2b2f735b62ce35a476894a9accbec7e27682579a1d5ebc2896b12d67faa3e94e8786fbc2b37a111e WHIRLPOOL a67921ba843f1b2978b2b7adb3914d62858d60cec6ab776e253223ea8478e2609e888dd6e3d9ec11d362f6a65109da6027c2223989f9eb2821ee262b42024ba0
 DIST haproxy-1.4.22.tar.gz 831791 SHA256 ba221b3eaa4d71233230b156c3000f5c2bd4dace94d9266235517fe42f917fc6 SHA512 a436aeacbda4dcc3de09250187e22589c1c71dda7d77f5b2cf33bfdaaa443fc5b2d9ab6d57085296fde7581ea8cc1d04408569e70879f96687bc3151120a9afa WHIRLPOOL dbef99d77c122c889d95756f227f873c01b3052c3a4c9be57a311321bf36aaa39913a930bcdd2272a3baa3a1dec16e6afc87f52e15df57dd2888446e5a725b55
 DIST haproxy-1.5-dev15.tar.gz 1095962 SHA256 417d746c6ff179b290410b8640b699a5f2b98cdb916ace4656d7d1ea79880047 SHA512 bde924a53c40b3a9624e94ca53da3c22963e7015441331868fe689559416470bf2d397e3af87e7f0bc8e34cbd5eec5d36f777fe6a6ec2ae020aee9f2b0fe33a8 WHIRLPOOL 0ece061ccb8483b3e09e4e00d68dee2e0fade282021e710c67ceab77671c8f53524e2b170bf3d74b3364a49d255b6f81c7d07c20a3f034871ba3d3ad42321455
-DIST haproxy-1.5-dev16.tar.gz 1102843 SHA256 41370ab485ac17d9ed088dd4f56e49f1991d39b74014b3e304543446aee5370c SHA512 524b1485dae7d5256fdef4ddd25ea1c84526c61dc2f45aeb228fcd7aed6e39f80fd4e9dc2edd9d6428ae2b804d3c6633f80167ab1e9d4d2df1a4ad0d3dfac845 WHIRLPOOL 1e20de00270aa6d892307a9e84098065e1bab86e80b4b2b526f643a032f1c19bb4ef5b45c282374890bdbd364412d137ea1d92c8baa49b27269f3b9af66a97be
+DIST haproxy-1.5-dev17.tar.gz 1104398 SHA256 d0371b2eb78dff419e2bf642ffab533c3f13e7216bdb92ba08f65a5e4652e7db SHA512 6aba040fc4ce88df880d791b88f6f9a6258838fee8609c9b08c4b3c47034a6809441822420f89e532f887b541333330e3ae79b7a44e256715b0f842956bd319e WHIRLPOOL cb6badb35c57fa60d53b4c8cdbfbe9b7ccbd87216b16c9dc0ef80e4ce18fd6b26bcf442e9de6848fddb1f37b577f30525740b2b62d91807d084361754dac8810
diff --git a/net-proxy/haproxy/files/haproxy-1.5_beta16-stats.patch b/net-proxy/haproxy/files/haproxy-1.5_beta16-stats.patch
deleted file mode 100644
index dfe7b6e9da30..000000000000
--- a/net-proxy/haproxy/files/haproxy-1.5_beta16-stats.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/proto_http.c b/src/proto_http.c
-index c715828..535c159 100644
---- a/src/proto_http.c
-+++ b/src/proto_http.c
-@@ -3117,7 +3117,7 @@ http_check_access_rule(struct proxy *px, struct list *rules, struct session *s,
- 			}
- 		}
- 	}
--	return rule;
-+	return NULL;
- }
- 
- /* This stream analyser runs all HTTP request processing which is common to
diff --git a/net-proxy/haproxy/haproxy-1.4.21.ebuild b/net-proxy/haproxy/haproxy-1.4.21.ebuild
index 6af8f780e668..9388ae8059a7 100644
--- a/net-proxy/haproxy/haproxy-1.4.21.ebuild
+++ b/net-proxy/haproxy/haproxy-1.4.21.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/haproxy-1.4.21.ebuild,v 1.4 2012/06/08 18:06:38 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/haproxy-1.4.21.ebuild,v 1.5 2012/12/29 03:03:45 idl0r Exp $
 
 EAPI="4"
 
-inherit eutils versionator toolchain-funcs flag-o-matic
+inherit user versionator toolchain-funcs flag-o-matic
 
 DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments"
 HOMEPAGE="http://haproxy.1wt.eu"
diff --git a/net-proxy/haproxy/haproxy-1.4.22.ebuild b/net-proxy/haproxy/haproxy-1.4.22.ebuild
index 0580e1e79064..ba8682f01858 100644
--- a/net-proxy/haproxy/haproxy-1.4.22.ebuild
+++ b/net-proxy/haproxy/haproxy-1.4.22.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/haproxy-1.4.22.ebuild,v 1.4 2012/10/29 20:09:46 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/haproxy-1.4.22.ebuild,v 1.5 2012/12/29 03:03:45 idl0r Exp $
 
 EAPI="4"
 
-inherit eutils versionator toolchain-funcs flag-o-matic
+inherit user versionator toolchain-funcs flag-o-matic
 
 DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments"
 HOMEPAGE="http://haproxy.1wt.eu"
diff --git a/net-proxy/haproxy/haproxy-1.5_beta15.ebuild b/net-proxy/haproxy/haproxy-1.5_beta15.ebuild
index ddd29e4514d0..20fe9443f2c0 100644
--- a/net-proxy/haproxy/haproxy-1.5_beta15.ebuild
+++ b/net-proxy/haproxy/haproxy-1.5_beta15.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/haproxy-1.5_beta15.ebuild,v 1.1 2012/12/22 17:06:21 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/haproxy-1.5_beta15.ebuild,v 1.2 2012/12/29 03:03:45 idl0r Exp $
 
 EAPI="4"
 
-inherit eutils versionator toolchain-funcs flag-o-matic
+inherit user versionator toolchain-funcs flag-o-matic
 
 MY_P="${PN}-${PV/_beta/-dev}"
 
diff --git a/net-proxy/haproxy/haproxy-1.5_beta16.ebuild b/net-proxy/haproxy/haproxy-1.5_beta17.ebuild
similarity index 91%
rename from net-proxy/haproxy/haproxy-1.5_beta16.ebuild
rename to net-proxy/haproxy/haproxy-1.5_beta17.ebuild
index be9f6677f799..e729bdf56b5b 100644
--- a/net-proxy/haproxy/haproxy-1.5_beta16.ebuild
+++ b/net-proxy/haproxy/haproxy-1.5_beta17.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/haproxy-1.5_beta16.ebuild,v 1.1 2012/12/26 00:57:51 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/haproxy-1.5_beta17.ebuild,v 1.2 2012/12/29 03:03:45 idl0r Exp $
 
 EAPI="4"
 
-inherit eutils versionator toolchain-funcs flag-o-matic
+inherit user versionator toolchain-funcs flag-o-matic
 
 MY_P="${PN}-${PV/_beta/-dev}"
 
@@ -24,13 +24,9 @@ RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${MY_P}"
 
-#pkg_setup() {
-#	enewgroup haproxy
-#	enewuser haproxy -1 -1 -1 haproxy
-##}
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-stats.patch"
+pkg_setup() {
+	enewgroup haproxy
+	enewuser haproxy -1 -1 -1 haproxy
 }
 
 src_compile() {
diff --git a/net-proxy/squid/squid-3.1.22.ebuild b/net-proxy/squid/squid-3.1.22.ebuild
index c0637d389589..4ee3aaf62d17 100644
--- a/net-proxy/squid/squid-3.1.22.ebuild
+++ b/net-proxy/squid/squid-3.1.22.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.1.22.ebuild,v 1.8 2012/12/25 22:24:24 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.1.22.ebuild,v 1.9 2012/12/28 15:07:49 ago Exp $
 
 EAPI=4
 inherit eutils pam toolchain-funcs autotools linux-info user
@@ -11,7 +11,7 @@ SRC_URI="http://www.squid-cache.org/Versions/v3/3.1/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="caps ipv6 pam ldap samba sasl kerberos nis radius ssl snmp selinux logrotate test \
 	ecap icap-client \
 	mysql postgres sqlite \
diff --git a/net-proxy/ufdbguard/Manifest b/net-proxy/ufdbguard/Manifest
index 9dcc95942d28..45c80c87e20d 100644
--- a/net-proxy/ufdbguard/Manifest
+++ b/net-proxy/ufdbguard/Manifest
@@ -1,8 +1,4 @@
 DIST ufdbGuard-1.24.tar.gz 747635 SHA256 6e5df4ef7f5d13d1ad2a0902449c9909cc013242f3783925800df5011bd3446c
-DIST ufdbGuard-1.27.tar.gz 780380 SHA256 b70c531e670d1ee817048ee1c25ab5ad844b39b54013eb262a61d1473a41353c
-DIST ufdbGuard-1.28.tar.gz 785145 SHA256 511fdb699410ba6b374ca1b80f0c434b254d5e4d0f7069c64d72279ecd3626f4 SHA512 88ac4868997b24110d6b0d0b6e9e7b717f2c3754b359b241df868f81b8e082eb8d3e170c8d98d427bfd9b17de4489f4df875a185b4550f7ad55cedf093faa8fc WHIRLPOOL 11b9f54610964da34e9cd1cd1d82e3006bf69e037a942d13acbb5f61645b457ad324b294b2d9b768088276ebd14c44a0fb4b9692a02417873d08405002d54937
 DIST ufdbGuard-1.29.tar.gz 948006 SHA256 f97a683fba5e1867b9bde16d0ec118651b93ae419037d3fad0144c95add8bed6 SHA512 06e286508eba8081aecaa31021f18385f163f87edae90a4b399e0f3ca0d06165f5ac11baa5b615bdaaf9bbc03c107c69103f05761904fc06a0715c8f44abdc58 WHIRLPOOL 84d43ba2b5108acb9fc4ac0013d27c7f47dbb9ad6b7b6277853278b32a9040e0865e897b8bf5a3963216d3303506f90fe0844d9f5b49614154087eb0339f300d
 DIST ufdbguard-1.24-manual.pdf 491034 SHA256 7185161d912202510ec1767fc0239f48c2a98f948afb3a207ea55c341e03e459
-DIST ufdbguard-1.27-manual.pdf 501140 SHA256 9d5cba88b4be71528a60daf6576c662dd69b01d344bc9fd721f70db6ad32d288
-DIST ufdbguard-1.28-manual.pdf 502347 SHA256 7b7853fe8cc389ffa6b23678f1bd0b6b63f0c1f188e6eefef23c6e9ca1948bbe
 DIST ufdbguard-1.29-manual.pdf 513184 SHA256 00b75668ca82037c9be6eab3a83755189890b2a3bb239409db765195f26c2f8b SHA512 9b321202a60428e7962087b19b7e0b72241fdb99d5068e68dceadf3087b85d56e11c80e3a410b101aae35f9f5f179ee0e13053024c29ff0868c39ed645edcbb2 WHIRLPOOL cd1573102abe6b4d359520930491b6a2fbef0601bcdccaaf78adf79bbf570c48bbfa1f0bb5e5e0b9ab9360cc9ca41643e2cbed2140414603bdca7bca32bbecf9
diff --git a/net-proxy/ufdbguard/files/ufdb.initd.2 b/net-proxy/ufdbguard/files/ufdb.initd.2
index ec7312aedd42..ff0d15d107b7 100644
--- a/net-proxy/ufdbguard/files/ufdb.initd.2
+++ b/net-proxy/ufdbguard/files/ufdb.initd.2
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/ufdbguard/files/ufdb.initd.2,v 1.2 2012/01/12 13:22:22 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/ufdbguard/files/ufdb.initd.2,v 1.3 2012/12/28 11:59:30 flameeyes Exp $
 
 # reconfig is what the upstream documentation suggests, so let's
 # provide it for compatibility.
@@ -18,7 +18,7 @@ start_stop_daemon_args="--user ${UFDB_USER} --wait 1500"
 name="ufdbGuard Daemon"
 
 depend() {
-	need net
+	need localmount
 	before squid
 	use logger
 }
diff --git a/net-proxy/ufdbguard/ufdbguard-1.27-r1.ebuild b/net-proxy/ufdbguard/ufdbguard-1.27-r1.ebuild
deleted file mode 100644
index 377363fb615c..000000000000
--- a/net-proxy/ufdbguard/ufdbguard-1.27-r1.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/ufdbguard/ufdbguard-1.27-r1.ebuild,v 1.1 2012/01/12 13:22:22 flameeyes Exp $
-
-EAPI="4"
-
-inherit eutils flag-o-matic
-
-MY_P="ufdbGuard-${PV}"
-
-DESCRIPTION="ufdbGuard is a redirector for the Squid internet proxy."
-HOMEPAGE="http://www.urlfilterdb.com/en/products/ufdbguard.html"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz
-	doc? ( mirror://sourceforge/${PN}/ReferenceManual_v${PV/\./_}.pdf -> ${P}-manual.pdf )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+httpd doc"
-
-RDEPEND="dev-libs/openssl
-	app-arch/bzip2
-	net-misc/wget"
-
-DEPEND="${RDEPEND}
-	sys-devel/bison
-	sys-devel/flex"
-
-RDEPEND="${RDEPEND}
-	sys-apps/openrc"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	# create the squid user exactly as done by net-proxy/squid-3.1.9
-	enewgroup squid 31
-	enewuser squid 31 -1 /var/cache/squid squid
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.23-parallel-make.patch
-	epatch "${FILESDIR}"/${PN}-1.24-gentoo.patch
-
-	egrep -r -e '/var/tmp/ufdb(guard|http)d.pid' "${S}" -lZ | xargs -0 \
-		sed -i -e 's:/var/tmp/ufdb\(guard\|http\)d.pid:/var/run/ufdbguard/ufdb\1d.pid:' \
-		|| die
-
-	# directory where ufdbhttpd is to be found
-	sed -i -e 's:DEFAULT_BINDIR.*:DEFAULT_BINDIR "/usr/libexec/ufdbguard":' \
-		src/ufdb.h.in || die
-}
-
-src_configure() {
-	# better safe than sorry, the code has a number of possible
-	# breakage, and at least one certain breakage.
-	append-flags -fno-strict-aliasing
-
-	econf \
-		--with-ufdb-user=squid \
-		--with-ufdb-config=/etc \
-		--with-ufdb-logdir=/var/log/ufdbguard \
-		--with-ufdb-dbhome=/usr/share/ufdbguard/blacklists \
-		--with-ufdb-images_dir=/usr/share/ufdbguard/images
-}
-
-src_install() {
-	dodoc CHANGELOG INSTALL README src/sampleufdbGuard.conf
-	doman doc/*.1
-
-	dobin src/ufdbAnalyse src/ufdbGenTable src/ufdbGrab \
-		src/ufdbConvertDB
-	dosbin src/ufdbUpdate
-
-	exeinto /usr/libexec/ufdbguard
-	doexe src/mtserver/ufdbguardd src/mtserver/ufdbgclient
-
-	if use httpd; then
-		exeinto /usr/libexec/ufdbguard
-		doexe src/ufdbhttpd
-	fi
-
-	keepdir /usr/share/ufdbguard/blacklists
-
-	insinto /etc
-	doins src/ufdbGuard.conf
-
-	insinto /usr/share/ufdbguard/images
-	doins src/images/*
-
-	newconfd "${FILESDIR}"/ufdb.confd ufdb
-	newinitd "${FILESDIR}"/ufdb.initd.2 ufdb
-
-	exeinto /etc/cron.daily
-	newexe "${FILESDIR}"/ufdbUpdate.cron ufdbUpdate
-
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		newins "${DISTDIR}"/${P}-manual.pdf ReferenceManual.pdf
-	fi
-}
-
-pkg_postinst() {
-	elog "The default location for the blacklist database has been"
-	elog "moved to /usr/share/ufdbguard/blacklists."
-	elog ""
-	elog "The configuration file is no longer configurable in the"
-	elog "service file, and now resides at /etc/ufdbGuard.conf ."
-	elog ""
-	elog "The service script has been renamed from ufdbguad to simply"
-	elog "/etc/init.d/ufdb, to follow the official documentation, and"
-	elog "it gained a reload option with a reconfig alias."
-	elog ""
-	elog "You can configure the username and password parameters for"
-	elog "ufdbUpdate, to fetch the blacklist database provided by"
-	elog "URLfilterDB, directly in /etc/conf.d/ufdb without touching"
-	elog "the script itself."
-	elog ""
-	elog "To enable ufdbguard in squid, you should add this to your"
-	elog "squid.conf:"
-	elog ""
-	elog "    url_rewrite_program /usr/libexec/ufdbguard/ufdbgclient -l /var/log/ufdbguard"
-	elog "    url_rewrite_children 64"
-	elog ""
-	if ! use httpd; then
-		elog "You chose to not install the lightweight http daemon that"
-		elog "comes with ufdbguard."
-	else
-		elog "The ufdb service will start both the ufdbguardd daemon and"
-		elog "the ufdbhttpd http daemon to provide a local redirect CGI."
-		elog "If you don't want this to happen, disable the httpd USE flag."
-	fi
-	if use doc; then
-		elog ""
-		elog "The reference manual has been installed as"
-		elog "    /usr/share/doc/${PF}/ReferenceManual.pdf"
-	fi
-}
diff --git a/net-proxy/ufdbguard/ufdbguard-1.28.ebuild b/net-proxy/ufdbguard/ufdbguard-1.28.ebuild
deleted file mode 100644
index dac8bd891479..000000000000
--- a/net-proxy/ufdbguard/ufdbguard-1.28.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/ufdbguard/ufdbguard-1.28.ebuild,v 1.1 2012/01/19 20:51:42 flameeyes Exp $
-
-EAPI="4"
-
-inherit eutils flag-o-matic
-
-MY_P="ufdbGuard-${PV}"
-
-DESCRIPTION="ufdbGuard is a redirector for the Squid internet proxy."
-HOMEPAGE="http://www.urlfilterdb.com/en/products/ufdbguard.html"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz
-	doc? ( mirror://sourceforge/${PN}/ReferenceManual_v${PV/\./_}.pdf -> ${P}-manual.pdf )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+httpd doc"
-
-RDEPEND="dev-libs/openssl
-	app-arch/bzip2
-	net-misc/wget"
-
-DEPEND="${RDEPEND}
-	sys-devel/bison
-	sys-devel/flex"
-
-RDEPEND="${RDEPEND}
-	sys-apps/openrc"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	# create the squid user exactly as done by net-proxy/squid-3.1.9
-	enewgroup squid 31
-	enewuser squid 31 -1 /var/cache/squid squid
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.23-parallel-make.patch
-	epatch "${FILESDIR}"/${PN}-1.24-gentoo.patch
-
-	egrep -r -e '/var/tmp/ufdb(guard|http)d.pid' "${S}" -lZ | xargs -0 \
-		sed -i -e 's:/var/tmp/ufdb\(guard\|http\)d.pid:/var/run/ufdbguard/ufdb\1d.pid:' \
-		|| die
-
-	# directory where ufdbhttpd is to be found
-	sed -i -e 's:DEFAULT_BINDIR.*:DEFAULT_BINDIR "/usr/libexec/ufdbguard":' \
-		src/ufdb.h.in || die
-}
-
-src_configure() {
-	# better safe than sorry, the code has a number of possible
-	# breakage, and at least one certain breakage.
-	append-flags -fno-strict-aliasing
-
-	econf \
-		--with-ufdb-user=squid \
-		--with-ufdb-config=/etc \
-		--with-ufdb-logdir=/var/log/ufdbguard \
-		--with-ufdb-dbhome=/usr/share/ufdbguard/blacklists \
-		--with-ufdb-images_dir=/usr/share/ufdbguard/images
-}
-
-src_install() {
-	dodoc CHANGELOG INSTALL README src/sampleufdbGuard.conf
-	doman doc/*.1
-
-	dobin src/ufdbAnalyse src/ufdbGenTable src/ufdbGrab \
-		src/ufdbConvertDB
-	dosbin src/ufdbUpdate
-
-	exeinto /usr/libexec/ufdbguard
-	doexe src/mtserver/ufdbguardd src/mtserver/ufdbgclient
-
-	if use httpd; then
-		exeinto /usr/libexec/ufdbguard
-		doexe src/ufdbhttpd
-	fi
-
-	keepdir /usr/share/ufdbguard/blacklists
-
-	insinto /etc
-	doins src/ufdbGuard.conf
-
-	insinto /usr/share/ufdbguard/images
-	doins src/images/*
-
-	newconfd "${FILESDIR}"/ufdb.confd ufdb
-	newinitd "${FILESDIR}"/ufdb.initd.2 ufdb
-
-	exeinto /etc/cron.daily
-	newexe "${FILESDIR}"/ufdbUpdate.cron ufdbUpdate
-
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		newins "${DISTDIR}"/${P}-manual.pdf ReferenceManual.pdf
-	fi
-}
-
-pkg_postinst() {
-	elog "The default location for the blacklist database has been"
-	elog "moved to /usr/share/ufdbguard/blacklists."
-	elog ""
-	elog "The configuration file is no longer configurable in the"
-	elog "service file, and now resides at /etc/ufdbGuard.conf ."
-	elog ""
-	elog "The service script has been renamed from ufdbguad to simply"
-	elog "/etc/init.d/ufdb, to follow the official documentation, and"
-	elog "it gained a reload option with a reconfig alias."
-	elog ""
-	elog "You can configure the username and password parameters for"
-	elog "ufdbUpdate, to fetch the blacklist database provided by"
-	elog "URLfilterDB, directly in /etc/conf.d/ufdb without touching"
-	elog "the script itself."
-	elog ""
-	elog "To enable ufdbguard in squid, you should add this to your"
-	elog "squid.conf:"
-	elog ""
-	elog "    url_rewrite_program /usr/libexec/ufdbguard/ufdbgclient -l /var/log/ufdbguard"
-	elog "    url_rewrite_children 64"
-	elog ""
-	if ! use httpd; then
-		elog "You chose to not install the lightweight http daemon that"
-		elog "comes with ufdbguard."
-	else
-		elog "The ufdb service will start both the ufdbguardd daemon and"
-		elog "the ufdbhttpd http daemon to provide a local redirect CGI."
-		elog "If you don't want this to happen, disable the httpd USE flag."
-	fi
-	if use doc; then
-		elog ""
-		elog "The reference manual has been installed as"
-		elog "    /usr/share/doc/${PF}/ReferenceManual.pdf"
-	fi
-}
diff --git a/profiles/license_groups b/profiles/license_groups
index e3e26fcc1405..7121d62c44bb 100644
--- a/profiles/license_groups
+++ b/profiles/license_groups
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/license_groups,v 1.158 2012/12/22 13:39:58 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/license_groups,v 1.159 2012/12/28 18:02:14 ulm Exp $
 
 # Please report bugs or other requests at bugs.gentoo.org and assign to
 # licenses@gentoo.org
@@ -25,7 +25,7 @@ OSI-APPROVED AFL-3.0 AGPL-3 Apache-1.1 Apache-2.0 APL-1.0 APSL-2 Artistic Artist
 # Licenses in this list should NOT appear directly or indirectly in @FSF-APPROVED or @OSI-APPROVED
 # TODO: maybe add a category for BSD-alike MISC-FREE licenses for easy seperation?
 # BSD-4 alikes: dom4j FastCGI icu jaxen JDOM saxpath
-MISC-FREE Allegro ANTLR as-is bea.ri.jsr173 BEER-WARE boehm-gc BSD-1 BSD-with-attribution bufexplorer.vim BZIP2 CDDL-Schily CeCILL-C CMake CPL-0.5 CRACKLIB cryptopp czyborra docbook dom4j eGenixPublic-1.1 ElementTree Emacs ErlPL-1.1 FastCGI feh FLEX FLTK freemarker FVWM gnuplot gsm HTML-Tidy htmlc iASL IBPP-1.1 icu IDPL IJG imagemagick Info-ZIP inner-net ipadic Ispell JasPer2.0 jaxen JDOM JNIC JOVE libmng libpng libtiff LLGPL-2.1 LPPL-1.3 LPPL-1.3b lsof matplotlib md2k7-asyouwish mplus-fonts NCSA-HDF noweb openafs-krb5-a OpenSoftware otter PCRE perforce PHP-2.02 Princeton psutils pysqlite rc regexp-UofT RSA saxpath Scintilla Sendmail skype-4.0.0.7-third-party_attributions.txt SMAIL SNIA SSLeay Subversion SVFL tcltk tcp_wrappers_license TeX TeX-other-free UbuntuFontLicense-1.0 vlgothic w3m wxWinLL-3 Xdebug xtrs YaTeX zpaq ZSH
+MISC-FREE Allegro ANTLR as-is bea.ri.jsr173 BEER-WARE boehm-gc BSD-1 BSD-with-attribution bufexplorer.vim BZIP2 CDDL-Schily CeCILL-C CMake CPL-0.5 CRACKLIB cryptopp czyborra docbook dom4j eGenixPublic-1.1 ElementTree Emacs ErlPL-1.1 FastCGI feh FLEX FLTK freemarker FVWM gnuplot gsm HTML-Tidy htmlc iASL IBPP-1.1 icu IDPL IJG imagemagick Info-ZIP inner-net ipadic Ispell JasPer2.0 jaxen JDOM JNIC JOVE libmng libpng libtiff LLGPL-2.1 LPPL-1.3 LPPL-1.3b lsof matplotlib md2k7-asyouwish MIT-with-advertising mplus-fonts NCSA-HDF noweb openafs-krb5-a OpenSoftware otter PCRE perforce PHP-2.02 Princeton psutils pysqlite rc regexp-UofT RSA saxpath Scintilla Sendmail skype-4.0.0.7-third-party_attributions.txt SMAIL SNIA SSLeay Subversion SVFL tcltk tcp_wrappers_license TeX TeX-other-free UbuntuFontLicense-1.0 vlgothic w3m wxWinLL-3 Xdebug xtrs YaTeX zpaq ZSH
 # The following are NOT valid in @MISC-FREE:
 # arj - usage restrictions
 # freedist - Doesn't grant the right to do modifications.
diff --git a/sci-misc/gcam/gcam-2010.07.27-r1.ebuild b/sci-misc/gcam/gcam-2010.07.27-r1.ebuild
index 189da6e019da..521b05faa1d1 100644
--- a/sci-misc/gcam/gcam-2010.07.27-r1.ebuild
+++ b/sci-misc/gcam/gcam-2010.07.27-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-misc/gcam/gcam-2010.07.27-r1.ebuild,v 1.1 2012/11/19 15:51:40 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/gcam/gcam-2010.07.27-r1.ebuild,v 1.3 2012/12/28 11:28:51 ago Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="http://gcam.js.cx/files/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/sci-misc/gcam/gcam-2010.07.27.ebuild b/sci-misc/gcam/gcam-2010.07.27.ebuild
deleted file mode 100644
index ee30e8f62646..000000000000
--- a/sci-misc/gcam/gcam-2010.07.27.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-misc/gcam/gcam-2010.07.27.ebuild,v 1.4 2012/01/08 19:17:32 dilfridge Exp $
-
-EAPI="1"
-
-inherit base
-
-DESCRIPTION="GNU Computer Aided Manufacturing"
-HOMEPAGE="http://gcam.js.cx"
-SRC_URI="http://gcam.js.cx/files/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=media-libs/libpng-1.5
-	x11-libs/gtk+:2
-	x11-libs/gtkglext
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-libpng15.patch"
-)
diff --git a/sys-apps/haveged/Manifest b/sys-apps/haveged/Manifest
index f2f76854fcee..b7f161f58979 100644
--- a/sys-apps/haveged/Manifest
+++ b/sys-apps/haveged/Manifest
@@ -1,2 +1 @@
-DIST haveged-1.4.tar.gz 227301 SHA256 d4be23e678194631e3d13b0ced92b3bf2f4c5d7d881ad975e3c206ad79728397 SHA512 69d7f3eaa19e06851e7fd3ba189a73d24a3a73401b46bd46ce9a0ce8d3e3f7214ec40942d58eae96347f83083e22894418b8037a69364e56788f95111787d279 WHIRLPOOL b9a61f27b33929b895e1a3c14c92349a6d9e504b0cfe43a6351297a1c7083e3ff543cbe15f6c74854822b53bf8e1fc6e650e2b053b2540894849436ef4203678
 DIST haveged-1.5.tar.gz 243348 SHA256 f7d5a7e995befd4723811b331854fa53fe558546ba0c1dcb4675698e8db3702f SHA512 57952a79d4535267de15c42511991e2b06021db3b1ea90a45b30c5bd5ac65f6b9b6d66373d981280a3e7c0aff24dd6feae5640394e77f08a893dba5f31d86c91 WHIRLPOOL ef4c5acf8c787e18a436fe34ef2479658f325852e5717ad1a06bf19ecbe485e646a2bb132617417de26982d1d388b90293d3c8c31c0e7a0b0db570be80c5e5a4
diff --git a/sys-apps/haveged/files/haveged-init.d.2 b/sys-apps/haveged/files/haveged-init.d.2
index 136094cefe37..d52a4d1496f2 100644
--- a/sys-apps/haveged/files/haveged-init.d.2
+++ b/sys-apps/haveged/files/haveged-init.d.2
@@ -1,13 +1,15 @@
 #!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/haveged/files/haveged-init.d.2,v 1.1 2011/10/17 17:20:53 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/haveged/files/haveged-init.d.2,v 1.2 2012/12/28 12:54:40 flameeyes Exp $
 
 command="/usr/sbin/${SVCNAME}"
 command_args="-r 0 ${HAVEGED_OPTS}"
 pidfile=/var/run/${SVCNAME}.pid
 
 depend() {
+	need localmount
+	use logger
 	provide entropy
 }
 
diff --git a/sys-apps/haveged/haveged-1.4.ebuild b/sys-apps/haveged/haveged-1.4.ebuild
deleted file mode 100644
index f2ab6a91bbe9..000000000000
--- a/sys-apps/haveged/haveged-1.4.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/haveged/haveged-1.4.ebuild,v 1.4 2012/08/14 09:07:16 johu Exp $
-
-EAPI=4
-DESCRIPTION="A simple entropy daemon using the HAVEGE algorithm"
-HOMEPAGE="http://www.issihosts.com/haveged/"
-SRC_URI="http://www.issihosts.com/haveged/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="sys-devel/gcc"
-RDEPEND="sys-apps/openrc"
-
-S="${WORKDIR}/${P/3a/3}"
-
-src_configure() {
-	econf --bindir=/usr/sbin --enable-nistest
-}
-
-src_test() {
-	emake check
-}
-
-src_install() {
-	default
-	# This is a RedHat init script
-	rm -rf "${D}"/etc/init.d/haveged
-	# Install gentoo ones instead
-	newinitd "${FILESDIR}"/haveged-init.d.2 haveged
-	newconfd "${FILESDIR}"/haveged-conf.d haveged
-}
diff --git a/sys-apps/lm_sensors/lm_sensors-3.3.3-r1.ebuild b/sys-apps/lm_sensors/lm_sensors-3.3.3-r1.ebuild
index 7037f0825549..3068165b6f16 100644
--- a/sys-apps/lm_sensors/lm_sensors-3.3.3-r1.ebuild
+++ b/sys-apps/lm_sensors/lm_sensors-3.3.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/lm_sensors-3.3.3-r1.ebuild,v 1.1 2012/12/28 00:00:03 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/lm_sensors-3.3.3-r1.ebuild,v 1.2 2012/12/28 11:37:34 flameeyes Exp $
 
 EAPI=5
 
@@ -59,11 +59,11 @@ src_install() {
 		install
 
 	newinitd "${FILESDIR}"/${PN}-3-init.d ${PN}
-	newinitd "${FILESDIR}"/fancontrol-init.d fancontrol
+	newinitd "${FILESDIR}"/fancontrol-init.d-2 fancontrol
 
 	if use sensord; then
 		newconfd "${FILESDIR}"/sensord-conf.d sensord
-		newinitd "${FILESDIR}"/sensord-3-init.d sensord
+		newinitd "${FILESDIR}"/sensord-4-init.d sensord
 	fi
 
 	dodoc CHANGES CONTRIBUTORS INSTALL README \
diff --git a/sys-apps/openrc/openrc-0.11.8.ebuild b/sys-apps/openrc/openrc-0.11.8.ebuild
index 714e48b42322..d1ed965729f5 100644
--- a/sys-apps/openrc/openrc-0.11.8.ebuild
+++ b/sys-apps/openrc/openrc-0.11.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.11.8.ebuild,v 1.4 2012/12/17 17:22:55 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.11.8.ebuild,v 1.5 2012/12/28 17:29:02 jer Exp $
 
 EAPI=4
 
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-2
 else
 	SRC_URI="http://dev.gentoo.org/~williamh/dist/${P}.tar.bz2"
-	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"
 fi
 
 LICENSE="BSD-2"
diff --git a/sys-apps/pcsc-lite/Manifest b/sys-apps/pcsc-lite/Manifest
index 67741c0c396d..5f626c9db363 100644
--- a/sys-apps/pcsc-lite/Manifest
+++ b/sys-apps/pcsc-lite/Manifest
@@ -1,4 +1,3 @@
-DIST pcsc-lite-1.6.6.tar.bz2 480232 SHA256 7a94c27ae687619435b29ad63e0561aca20413333187b4301c75d1a1547ceea8 SHA512 b3b13a4d11cdccc2483bdc81acb8d7e2a38b2a7b35b90d2ff2562ec8205d0d493720fe28432c51f2917ed02a1771c63bbeee6aed54a8d6fee7e299d90aa7f43b WHIRLPOOL abf8805a1cf213b087a619d73f67a327dac6dafedb2136035f307b2577e7bd13b213e76e1ce881932199bda7495dd8ca2eec6730c7ae8047e2705184fcad8e14
 DIST pcsc-lite-1.8.2.tar.bz2 548706 SHA256 5525c7fff09e855ca75203256a1c5acc518dae8740867d41e10b75c55d94a364 SHA512 093666b8e44c24ef259cc5cf1f46ffebed7f0eedda43f7a4e58112695912b87148b5d1ae8fbd398bd0a623b943bb6f75253e5c6fdccf64f38b750c78a10f3064 WHIRLPOOL efc629635af17701a5db5e7184bf448e29b8b33a713083d2c48f3c9d96820709f756dbd1ef61b05bdd2fbb8b19e7e7254e1f00a61ff8d42c4280e9e51516789b
 DIST pcsc-lite-1.8.6.tar.bz2 554106 SHA256 1e44049168d1ce55fd56c175f61206955254df0f385455f2a20ec7e8a0e6a77a SHA512 8a4f2f6f3627125d0d70131de03240faacb58bb402af471bebd3c366dac0207f352af80b12c59aff3acaa7f30217ebe444ea6e1874aa0f35aae204bafe236a68 WHIRLPOOL ff3a2a63cbf1e59eaec5096554b1e12f191a0ed1b7c4d3b815dcdf7eccbaa373a5c594eae5510933e132c01d9fed78d3aec340ce336e22678ce67f7356407903
 DIST pcsc-lite-1.8.7.tar.bz2 552310 SHA256 9ef73a893d2e34e02af2ffc313f3b88bf3000c3f608dcd3ae84c1c1a0445ef7b SHA512 b9f654481932934e230a7d97a6bac8cb9ede68ffc7e01948df27404e6f44a2e0ea0b6171a3ace2185267f4e898b7d414f6a5aeb0acdbce9472ae148ac9e71186 WHIRLPOOL 3d0174800916a5bfd59ba14b66f1bee49952fff3c8e00f4ea31ceca10e00eb1ad10fa964a7150e18c1b8ceebd7d8f01f6c36cee9d4e67a3ba433d608bafe36bf
diff --git a/sys-apps/pcsc-lite/files/pcscd-init.3 b/sys-apps/pcsc-lite/files/pcscd-init.3
deleted file mode 100644
index 7d872ccef416..000000000000
--- a/sys-apps/pcsc-lite/files/pcscd-init.3
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcsc-lite/files/pcscd-init.3,v 1.1 2010/12/04 02:08:39 flameeyes Exp $
-
-depend() {
-	need localmount
-}
-
-start() {
-	if ! [ -d /var/run/pcscd ]; then
-		mkdir -p /var/run/pcscd
-	fi
-
-	chgrp pcscd /var/run/pcscd
-	chmod 0775 /var/run/pcscd
-
-	ebegin "Starting pcscd"
-	start-stop-daemon --start \
-        --exec /usr/sbin/pcscd \
-        --pidfile /var/run/pcscd/pcscd.pid \
-		--chuid nobody:pcscd \
-		-- ${EXTRA_OPTS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping pcscd"
-	start-stop-daemon --stop \
-        --exec /usr/sbin/pcscd \
-        --pidfile /var/run/pcscd/pcscd.pid
-	eend $?
-}
diff --git a/sys-apps/pcsc-lite/files/pcscd-init.5 b/sys-apps/pcsc-lite/files/pcscd-init.5
index ce4cbee21c66..94b5f431d129 100644
--- a/sys-apps/pcsc-lite/files/pcscd-init.5
+++ b/sys-apps/pcsc-lite/files/pcscd-init.5
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcsc-lite/files/pcscd-init.5,v 1.1 2011/10/21 23:00:47 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcsc-lite/files/pcscd-init.5,v 1.2 2012/12/28 11:53:28 flameeyes Exp $
 
 name="PC/SC Daemon"
 
@@ -14,8 +14,8 @@ start_stop_daemon_args="--user pcscd:pcscd"
 
 depend() {
 	need localmount
-
 	after udev openct
+	use logger
 }
 
 start_pre() {
diff --git a/sys-apps/pcsc-lite/pcsc-lite-1.6.6-r2.ebuild b/sys-apps/pcsc-lite/pcsc-lite-1.6.6-r2.ebuild
deleted file mode 100644
index e9fd817e171b..000000000000
--- a/sys-apps/pcsc-lite/pcsc-lite-1.6.6-r2.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcsc-lite/pcsc-lite-1.6.6-r2.ebuild,v 1.5 2012/11/28 22:50:01 ssuominen Exp $
-
-EAPI=4
-
-inherit multilib eutils user udev
-
-DESCRIPTION="PC/SC Architecture smartcard middleware library"
-HOMEPAGE="http://pcsclite.alioth.debian.org/"
-
-STUPID_NUM="3479"
-MY_P="${PN}-${PV/_/-}"
-SRC_URI="http://alioth.debian.org/download.php/${STUPID_NUM}/${MY_P}.tar.bz2"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD ISC"
-SLOT="0"
-KEYWORDS="amd64 arm hppa ia64 m68k ppc ppc64 s390 sh sparc x86 ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="usb kernel_linux"
-
-RDEPEND="usb? ( virtual/libusb:1 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${RDEPEND}
-	!<app-crypt/ccid-1.4.1-r1
-	kernel_linux? ( virtual/udev )"
-
-pkg_setup() {
-	enewgroup pcscd
-}
-
-src_configure() {
-	econf \
-		--disable-maintainer-mode \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--enable-usbdropdir="${EPREFIX}/usr/$(get_libdir)/readers/usb" \
-		$(use_enable usb libusb) \
-		--disable-libhal
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS DRIVERS HELP README SECURITY ChangeLog
-
-	newinitd "${FILESDIR}"/pcscd-init.3 pcscd
-
-	if use kernel_linux; then
-		insinto "$(udev_get_udevdir)"/rules.d
-		doins "${FILESDIR}"/99-pcscd-hotplug.rules
-	fi
-}
-
-pkg_postinst() {
-	elog "Starting from version 1.6.5, pcsc-lite will start as user nobody in"
-	elog "the pcscd group, to avoid running as root."
-	elog ""
-	elog "This also means you need the newest drivers available so that the"
-	elog "devices get the proper owner."
-	elog ""
-	elog "Furthermore, a conf.d file is no longer installed by default, as"
-	elog "the default configuration does not require one. If you need to"
-	elog "pass further options to pcscd, create a file and set the"
-	elog "EXTRA_OPTS variable."
-	elog ""
-	if use kernel_linux; then
-		elog "HAL support has been dropped by the ebuild; if you want hotplug"
-		elog "support, that's provided already by UDEV rules; you only need to"
-		elog "tell the init system to hotplug it, by setting this variable in"
-		elog "/etc/rc.conf:"
-		elog ""
-		elog "    rc_hotplug=\"pcscd\""
-	fi
-}
diff --git a/sys-cluster/vzctl/files/vzctl-4.1.1-VZREBOOTDIR.patch b/sys-cluster/vzctl/files/vzctl-4.1.1-VZREBOOTDIR.patch
new file mode 100644
index 000000000000..c868918b84ae
--- /dev/null
+++ b/sys-cluster/vzctl/files/vzctl-4.1.1-VZREBOOTDIR.patch
@@ -0,0 +1,32 @@
+https://bugs.gentoo.org/show_bug.cgi?id=449110
+
+From 9e84e33023a31bc65479784113aad10c69ba0e36 Mon Sep 17 00:00:00 2001
+From: Kir Kolyshkin <kir@openvz.org>
+Date: Fri, 28 Dec 2012 13:31:07 -0800
+Subject: [PATCH] etc/init.d/vz-gentoo: fix missing VZREBOOTDIR
+
+That was pretty lame from my side. Fix for commit af5bf43.
+
+http://bugzilla.openvz.org/2467
+
+Reported-by: Andrei Vinogradov <spamslepnoga@inbox.ru>
+Signed-off-by: Kir Kolyshkin <kir@openvz.org>
+---
+ etc/init.d/vz-gentoo.in |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/etc/init.d/vz-gentoo.in b/etc/init.d/vz-gentoo.in
+index 05ef4e7..2dd2186 100755
+--- a/etc/init.d/vz-gentoo.in
++++ b/etc/init.d/vz-gentoo.in
+@@ -17,6 +17,7 @@ check_config() {
+ 	: ${VZVEINFO:=/proc/vz/veinfo}
+ 	: ${VESTAT:=/proc/vz/vestat}
+ 	: ${VPSCONFDIR:=@VPSCONFDIR@}
++	: ${VZREBOOTDIR:=@VZREBOOTDIR@}
+ 	: ${VZDEV:=venet0}
+ 	: ${VZCONF:=@PKGCONFDIR@/vz.conf}
+ 	: ${VE_STOP_MODE:=suspend}
+-- 
+1.7.1
+
diff --git a/sys-cluster/vzctl/vzctl-4.1.1.ebuild b/sys-cluster/vzctl/vzctl-4.1.1-r1.ebuild
similarity index 94%
rename from sys-cluster/vzctl/vzctl-4.1.1.ebuild
rename to sys-cluster/vzctl/vzctl-4.1.1-r1.ebuild
index 048fcd1148c4..3f4c4e3a857b 100644
--- a/sys-cluster/vzctl/vzctl-4.1.1.ebuild
+++ b/sys-cluster/vzctl/vzctl-4.1.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/vzctl-4.1.1.ebuild,v 1.2 2012/12/11 18:17:36 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/vzctl-4.1.1-r1.ebuild,v 1.1 2012/12/29 02:26:45 floppym Exp $
 
 EAPI="5"
 
@@ -33,6 +33,7 @@ src_prepare() {
 
 	sed -i -e "s:/lib/udev:$(udev_get_udevdir):" src/lib/dev.c || die 'sed on src/lib/dev.c failed'
 
+	local PATCHES=( "${FILESDIR}/${P}-VZREBOOTDIR.patch" )
 	base_src_prepare
 }
 
diff --git a/sys-devel/autoconf/autoconf-2.69.ebuild b/sys-devel/autoconf/autoconf-2.69.ebuild
index 0cd2e30c2399..131b36d1ca60 100644
--- a/sys-devel/autoconf/autoconf-2.69.ebuild
+++ b/sys-devel/autoconf/autoconf-2.69.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/autoconf-2.69.ebuild,v 1.9 2012/12/26 10:51:30 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/autoconf-2.69.ebuild,v 1.10 2012/12/28 17:26:10 jer Exp $
 
 EAPI="3"
 
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
 		ftp://alpha.gnu.org/pub/gnu/${PN}/${P}.tar.xz"
-	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"
 fi
 
 DESCRIPTION="Used to create autoconfiguration files"
diff --git a/sys-fs/multipath-tools/multipath-tools-0.4.9-r5.ebuild b/sys-fs/multipath-tools/multipath-tools-0.4.9-r5.ebuild
index 27edd59fc5a9..06647b7301f4 100644
--- a/sys-fs/multipath-tools/multipath-tools-0.4.9-r5.ebuild
+++ b/sys-fs/multipath-tools/multipath-tools-0.4.9-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/multipath-tools/multipath-tools-0.4.9-r5.ebuild,v 1.6 2012/12/26 19:43:59 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/multipath-tools/multipath-tools-0.4.9-r5.ebuild,v 1.7 2012/12/28 11:25:13 ago Exp $
 
 EAPI=4
 inherit base eutils toolchain-funcs udev
@@ -11,7 +11,7 @@ SRC_URI="http://christophe.varoqui.free.fr/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ppc64 x86"
+KEYWORDS="amd64 ~arm ppc ppc64 x86"
 IUSE=""
 
 RDEPEND="|| (
diff --git a/sys-kernel/hardened-sources/Manifest b/sys-kernel/hardened-sources/Manifest
index 94b35aba0dd7..0428fb18c012 100644
--- a/sys-kernel/hardened-sources/Manifest
+++ b/sys-kernel/hardened-sources/Manifest
@@ -19,6 +19,7 @@ DIST genpatches-3.4-6.extras.tar.bz2 17508 SHA256 be8e087b3a0508e88bd36d2d4bec07
 DIST genpatches-3.5-5.base.tar.bz2 122034 SHA256 50828709004b240ce3d3dcfedc4d88a4a53e20b9e3b172dc2973316a39c1c55f SHA512 28d9f1c603440db249ef3231f95f142886e0fdae3fc2ce9366aa7c6633ad13b6818659727f378fc167fbeaaaff1faa88fcf5edc625c799ad9f118002ac8381f8 WHIRLPOOL 31accc31067f7d61921c59b951eced42fa31f3c73cdfbbd98dbd6921a4fa2624d709fabe4dcaaa3c480e3e7d99803569840050a0685aef87488840ca8b4e747f
 DIST genpatches-3.5-5.extras.tar.bz2 17507 SHA256 1b2294687e842e6450184ce2800ba3df8006ca47d75f95437a1e1d2976162727 SHA512 2eefd45f853e9bab3f89701e470309471b5b2c9ed651dba03776a47d11e26c00170d32aaac547889ae7cee435278bb5ffa4ddc1dc769e6440d454008f62ce23d WHIRLPOOL 43dfd1c6a046e3dc07db72e8d7f062689366112ccf080a17b84bc7adda3e5257d7be551e0a34b6c79c9016b5b04bad5bdf8c52589dcc362dc675f72ca7681135
 DIST genpatches-3.7-1.base.tar.bz2 5157 SHA256 f52abbd98168691ca69de973a62803d738499d9278ee46295d5d57c5097f0700 SHA512 8e12fb6aa2204b428a2fde920d36f8b0bc7832ffc1e9faeea10a3c5fc644b64dd44bb944aae7741616a635fb8d6951a6337b5926207fe332b69ee3de7f7fa595 WHIRLPOOL 7be5daed9b82f5e0e72b333ceaf62c5d8b5dc6072cce2e722c603fd6b2c8836b77f12a29c2f94aeaca896f92c8fa5fc1930eea3a9062b2453977703b00b3e3fe
+DIST genpatches-3.7-3.base.tar.bz2 14787 SHA256 a4ce4247ebcbba337f7efa25acf3e42a19f8d165068c6c13d3cae63bc5fe603e SHA512 89b0b5dbd050ec07f5bbbb999e44113d1e1a1898ca4c8ba5f88e1645d1b88169d7a2a534d08e8eed342f685693142794d27b09dfe4bc067c64332c38ce4d6b9f WHIRLPOOL f213a1793c0d3883659ebab53ff9aa5ecc7dbb842b1a89330b3b637f4bb3a356c3f9be9ca712fe1ab5bde06d27118f62c33434275c9aa6bf0871e39a06c20fcd
 DIST hardened-patches-2.6.32-118.extras.tar.bz2 753437 SHA256 11ad917cf892f7253524db9a8100ed36e9c385180ed530d972d5b3113d0c7ba1 SHA512 ec696b23c5b1217d72b64c1b612534d1a75682b05a4ba38223bc7383b34e3a4266a2e8181eebf7c9a7b1375e966f81d92241628e802307abd639b6494267aff7 WHIRLPOOL 0d274ddb697fe733cbe94ccaadf1fdaa63217ac834712a4ab1933903cf487b8b222928241632b2ffaa39ca03e386dd1d7891eb0954823e3e1b625433e0ea5aa9
 DIST hardened-patches-2.6.32-133.extras.tar.bz2 776996 SHA256 e5b663a640c3c1122eddd37f3c7a39579ddbe001e08621fe4399fdaabde97248 SHA512 8d8339f3b14b0088286ec87e49a78d8b608264b22b9c501bb5dd452c742d948b8f736378d5f16c62423f4f8278ec6b08c03d209f3d3fd03b3d46d8d36f2f665d WHIRLPOOL f05e3ac31018a58f2595b9696a6b89829e9df15443ecfd9ed383e80ac05386930e819b059916482267c1757decf9dd0a3c8c9f7296f283db348f169a86602fc0
 DIST hardened-patches-2.6.32-147.extras.tar.bz2 895220 SHA256 5d902c8f3f883116067c48aa9ee362705777fe02808e94812c11bb431a62ec59 SHA512 e9365b7da0bec02aead8239e804a5124970bd0bdf6bfb61618897149072c0e00c7dbf20143fd0ee881a9968383e2ab342282ef99d8cab6ee52c61694c5a2fb44 WHIRLPOOL 618c3f6457083061a4208487573dc89c645a740ff1ee2e957d76549bdef12be8d79d58257afd9d4b54cba7e5140495880c7110cf48c5e6871e21f612c2aeea29
@@ -29,6 +30,7 @@ DIST hardened-patches-3.2.35-1.extras.tar.bz2 996229 SHA256 c37f1c5e7ebae714362d
 DIST hardened-patches-3.4.5-1.extras.tar.bz2 548697 SHA256 f77fdd4450cfaa051058383d4c7bce9ae7cf40cc39948a265870c8806fcdc2ef SHA512 b5b516200e0f78f6695f70ae7f7918bbd813647439f2e1df0dc0545439724c18bd5f31379d99b09372cdc91d612ab0cfef3cdeade229425a936a3e2873a56c1f WHIRLPOOL 3bc4be49dbaf31bfc592098b3cbb6c43b7d027f97c0089bf6fa1b4b914cbea4189ab6b63bf38f8dbc1647f011dedc1aa901d1b0679da875a741ca12df9ba4433
 DIST hardened-patches-3.5.4-2.extras.tar.bz2 578566 SHA256 505c3848b3ff0f2622f28e26158fcfefa793570efd7ffb07a6070fb627e84682 SHA512 3362f3ef67a8e2759ab4ae8d7065d694873b668c4d369436ff7f2262d4b8123f165bcc65f56ce3a0cca7be4f56b49e589064afa24f8cab3932d09c28f266536b WHIRLPOOL e074e418e3cade3b05bec185ff0a558ecef2903269d92ba2033745cdcde56a540a2ed3638ac5ac75cbee600d722844c53d78a1acaa1c06af4e318e65ce2c77ea
 DIST hardened-patches-3.7.0-1.extras.tar.bz2 593322 SHA256 af919f14f6066cc723305ccfbbfb4f36b04c7a4943bb960c9910054363fd4577 SHA512 5b77a970b739366b82c738a0f62b9fd66b9a13d5b4bfbf42a150ac4629bcebb0212c3961724a71542a4ffff330929ffbd9f2f61cf4912d65984d8e96d5ffe36d WHIRLPOOL 409371d84afe1c9a775cee4a248d60847b9958fc9d5b612f992df25444139199ba90ea4f60ce5ab7458f073535950a2266109830425de2805e0c69b28211f047
+DIST hardened-patches-3.7.1-1.extras.tar.bz2 593222 SHA256 393a22b27ba97f93d1a0fb8cf017034175a4d9dafcc459565758a88f7eba9017 SHA512 db7afe787d021d8a939e1fce4927065ce8e72e785c61c96c1c47f146f06b6265ecd4be70eb0a1198fe89b0ed9679ed20d0fb83e2314fcd9797ea41c604166c45 WHIRLPOOL d4685d25f46ad256285fbbed7ec29f53446c3e7e03a402ef5dc682c590ff173ebe032d389b38a47ef808e1937d498670890eef07824a86fd05c4ab87ad158ba1
 DIST linux-2.6.32.tar.bz2 64424138 SHA256 5099786d80b8407d98a619df00209c2353517f22d804fdd9533b362adcb4504e SHA512 739c67875dcb1a80412a034e7d3dddfb6aea4d7a77f12b572fb5afbb827e6ab5a682df7501c0982966e85948ddf7251b8dc5eeb064b2d264025160d8a903bc82 WHIRLPOOL 762dfd7f4c062fdcda00b7fc45ead0f8cb4e321027769a12d92640012f5768c2033da95f24491adfcd6eb453c2658978d4f170e73e4f8a5ccd263efcbe00429d
 DIST linux-3.2.tar.bz2 78147838 SHA256 c881fc2b53cf0da7ca4538aa44623a7de043a41f76fd5d0f51a31f6ed699d463 SHA512 1f57b98e8da34b10f37ce94e0f13a994c111d483b104c27a8f58a4a55013a73a9f1ffcebb597be63ce0dfadb92201e93b0e072ba49bac0033026aceb0840c812 WHIRLPOOL 3dc893bde09f064e4614183964a4b9feaab938ca7a739f46f825818a577884eae815f195b52a4c55c571345de59d7ba09631fb68dac481a0837b24868ce60e3d
 DIST linux-3.4.tar.bz2 80173484 SHA256 a797a15d0b6228381507c14ecf4eec4a6cc5c77cfd521ba3b3e1325e85b5b16d SHA512 597002fa82b70b5052f9e05c1d8547bc5f89d8e1aecfd1765f4033f6d2c5c02d51b6372dbeef12c2eb070ae318a04c39925050cb37a39399961c8b263479fca1 WHIRLPOOL 57e6dd7094db2bc41175d7bb551e8237ea96eacf3710a734e8413915c54304e84ca11455e41c7752882ce81048459555d44d1798bf0775b79c3d74b13aa3a9f2
diff --git a/sys-kernel/hardened-sources/hardened-sources-3.7.1.ebuild b/sys-kernel/hardened-sources/hardened-sources-3.7.1.ebuild
new file mode 100644
index 000000000000..1b6bcc94bd03
--- /dev/null
+++ b/sys-kernel/hardened-sources/hardened-sources-3.7.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/hardened-sources-3.7.1.ebuild,v 1.1 2012/12/28 19:37:42 blueness Exp $
+
+EAPI="4"
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base"
+K_GENPATCHES_VER="3"
+K_DEBLOB_AVAILABLE="1"
+
+inherit kernel-2
+detect_version
+
+HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-1"
+HGPV_URI="http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-${HGPV}.extras.tar.bz2"
+SRC_URI="${KERNEL_URI} ${HGPV_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+UNIPATCH_LIST="${DISTDIR}/hardened-patches-${HGPV}.extras.tar.bz2"
+UNIPATCH_EXCLUDE="4200_fbcondecor-0.9.6.patch"
+
+DESCRIPTION="Hardened kernel sources (kernel series ${KV_MAJOR}.${KV_MINOR})"
+HOMEPAGE="http://www.gentoo.org/proj/en/hardened/"
+IUSE="deblob"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND=">=sys-devel/gcc-4.5"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+
+	local GRADM_COMPAT="sys-apps/gradm-2.9.1*"
+
+	ewarn
+	ewarn "Hardened Gentoo provides three different predefined grsecurity level:"
+	ewarn "[server], [workstation], and [virtualization].  Those who intend to"
+	ewarn "use one of these predefined grsecurity levels should read the help"
+	ewarn "associated with the level.  Because some options require >=gcc-4.5,"
+	ewarn "users with more, than one version of gcc installed should use gcc-config"
+	ewarn "to select a compatible version."
+	ewarn
+	ewarn "Users of grsecurity's RBAC system must ensure they are using"
+	ewarn "${GRADM_COMPAT}, which is compatible with ${PF}."
+	ewarn "It is strongly recommended that the following command is issued"
+	ewarn "prior to booting a ${PF} kernel for the first time:"
+	ewarn
+	ewarn "emerge -na =${GRADM_COMPAT}"
+	ewarn
+}
diff --git a/sys-libs/freeipmi/files/bmc-watchdog.initd.4 b/sys-libs/freeipmi/files/bmc-watchdog.initd.4
index 713f23484064..22e726ecfe66 100644
--- a/sys-libs/freeipmi/files/bmc-watchdog.initd.4
+++ b/sys-libs/freeipmi/files/bmc-watchdog.initd.4
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/freeipmi/files/bmc-watchdog.initd.4,v 1.1 2012/07/31 01:41:36 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/freeipmi/files/bmc-watchdog.initd.4,v 1.2 2012/12/28 12:51:04 flameeyes Exp $
 
 extra_commands="condrestart"
 description_condrestart="Restart the service only if started already"
@@ -11,7 +11,8 @@ command_args="${OPTIONS}"
 pidfile=/var/run/$SVCNAME.pid
 
 depend() {
-    need logger
+	need localmount
+	use logger
 }
 
 condrestart() {
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 9233985db699..70756fe3d5b8 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -18,7 +18,7 @@ DIST glibc-2.15-patches-13.tar.bz2 154658 SHA256 59c11d8b70bc406f6bc7dd87509f1c5
 DIST glibc-2.15-patches-21.tar.bz2 110297 SHA256 5553c0a37c5c0a3abb303850fa9d2ad309e2f47c3f42806c2f1dd32a48affbfe SHA512 5255ef053a2c30f9cae583133094f41604385b9d6e653a0d6aab1d13d69e6c8cbf16fde712607ab0bac738944a0410ddc050dc231ad4ea7d3584271937b0b059 WHIRLPOOL d70249c6c3c3c0a4d02c3ebbf0309bd6b3da3962231c153c77be38d217e2f57e0eba88614e34f0f219f485ba8f8474586d0059cfc505e44f312396e6a753d441
 DIST glibc-2.15-patches-23.tar.bz2 118999 SHA256 11c38082635822eb7b12d538e3b9c38ee71f6a86be6cebb59f5f2c575be93830 SHA512 ff3792a0029ea24990fe2419579472bd02119ed6a2dab28e85089d232029be5f1c18c643bcb9d577dce78a7c682bb5eee1ed3644f086b5cf19230bcf37ce8a4b WHIRLPOOL 110ddb5989bf1b66a487c9ebae03a3e62ac22b7a28b4c70d142e1c56160bdd50b9f5fa6f4dc4a28cfb28d94281c582fcfc1f60df8ae2ef4e8a946b3b06d2b1b1
 DIST glibc-2.15.tar.xz 10280176 SHA256 321ec482abdc27b03244f7b345ee22dc431bc55daf9c000a4e7b040fbdbecb50 SHA512 fc8bc407cd9edfd79bd286d28c84e0b8224e1f57c1d318e73da098a9693257d78970178fd59f487f0321a079fcb772e8e78473fab52f091b2addb0a48fe8dcf7 WHIRLPOOL 061fc0c9915bd821dc31c2fea8e4f9a75b6c7ec0c935ea713d8c087408a8bf3c600179273438f3d9748fe40b946866b2f160e6da6fee4da51e549a30d0f0ebbc
-DIST glibc-2.16.0-patches-8.tar.bz2 88635 SHA256 3dc60b033be747320e06d2cbe938beccfe5a781636d2285642066e42757475fa SHA512 c0d772492bd491633a6c84735f8efb4d0f3a3cc54a3eebe38cc7c75179fc69f9355ebe2b12746ece4db688980388a8df26c4bf9f814e4a598a1c5de1ce31670d WHIRLPOOL 3dae9f63fece0046becdf7044b6a2b39857363eb96fc31d6d239b664b0f03ea2d4903dabd6a2b6f671e9ff98fb65be67ddea29c8e69e56f4eea6dc3694433f86
+DIST glibc-2.16.0-patches-9.tar.bz2 89943 SHA256 fdcd07b31755a5c79e5174c70ffc306f4dc7235d7d9fff4be0d0fb11d24bb036 SHA512 7abd19d414a12ff84b123ab1493004283749856b7710f0d021c9e490243d29482ec0c5765df0008828cd3e3a7316406d39180680802848d99435099898f04a10 WHIRLPOOL 8fc3cc295197f871511b6939fce00a91c4c07d68270169eb39cbe5cd360af406bdb109b7cced3638ed95313010fd2935d898685d55229a9a51ddda2cc570bbfd
 DIST glibc-2.16.0.tar.xz 9990512 SHA256 1edc36aa2a6cb7127971fce8e02eecffe9c7956297ad3ef10dd4c09f486d5924 SHA512 be9acc11b77ab3c01d5766fe626a6a51bc3192ac98f9554fbb5c37120cfc6f636c0b7a80beddc180f13b32ad06051d24c1999fa2e64eeb724d55a9498f0f634e WHIRLPOOL 9bfd4358a4488080e12e08deca5fca59c1555853d1c1978b7d1bb3b480eb8fb125dccab38c55644248ae5e18b0167aec85f8a7850bab9e11f980aae6f171eac3
 DIST glibc-2.17-patches-1.tar.bz2 72925 SHA256 c8997b0c2b9b0a4c54614ead03681a6607b66ff9a35077b139dae66af92bbd7e SHA512 99b11717fa309f7b215c8a7c4e397910585ad4627c4605da031742de600d7f16eef17ff1fd81b5bca03ae450c131bdeb3a38e6c8a367ef836c4cd66fb34591b9 WHIRLPOOL 8a0e20f74cad80c2f97b155cb98649cbe898d09e455b55f569eea5c29159f3cf6cdc2d97854231bfba7bf43f1a4fd09131a24c5525164583e838dde293850fe9
 DIST glibc-2.17.tar.xz 10981956 SHA256 6914e337401e0e0ade23694e1b2c52a5f09e4eda3270c67e7c3ba93a89b5b23e SHA512 384e54037daaa344a26ce58242acc3f9a249d0765088d18a540a305745afa33ae6dec4024adae958eacd7100be9c713d117260ace8340f6d8c8396dbde4868d2 WHIRLPOOL 9b98c1c298aeff607aaa554341c300c15491b7314f127524fc5c048c67c5059daaf706e6cf206bb69213d5307e37bed87137ab46f504d8072bb778310081fc23
diff --git a/sys-libs/glibc/files/2.17/glibc-2.17-hardened-pie.patch b/sys-libs/glibc/files/2.17/glibc-2.17-hardened-pie.patch
new file mode 100644
index 000000000000..da4fb82539cf
--- /dev/null
+++ b/sys-libs/glibc/files/2.17/glibc-2.17-hardened-pie.patch
@@ -0,0 +1,42 @@
+2012-11-11  Magnus Granberg  <zorry@gentoo.org>
+
+	#442712
+	* Makeconfig (+link): Set to +link-pie.
+	(+link-static-before-libc): Change $(static-start-installed-name) to
+	S$(static-start-installed-name).
+	(+prector): Set to +prectorS.
+	(+postctor): Set to +postctorS.
+
+--- libc/Makeconfig
++++ libc/Makeconfig
+@@ -447,11 +447,12 @@
+ 	     $(common-objpfx)libc% $(+postinit),$^) \
+ 	     $(link-extra-libs) $(link-libc) $(+postctorS) $(+postinit)
+ endif
+++link = $(+link-pie)
+ # Command for statically linking programs with the C library.
+ ifndef +link-static
+ +link-static-before-libc = $(CC) -nostdlib -nostartfiles -static -o $@ \
+ 	      $(sysdep-LDFLAGS) $(LDFLAGS) $(LDFLAGS-$(@F))  \
+-	      $(addprefix $(csu-objpfx),$(static-start-installed-name)) \
++	      $(addprefix $(csu-objpfx),S$(static-start-installed-name)) \
+ 	      $(+preinit) $(+prectorT) \
+ 	      $(filter-out $(addprefix $(csu-objpfx),start.o \
+ 						     $(start-installed-name))\
+@@ -549,11 +550,10 @@
+ ifeq ($(elf),yes)
+ +preinit = $(addprefix $(csu-objpfx),crti.o)
+ +postinit = $(addprefix $(csu-objpfx),crtn.o)
+-+prector = `$(CC) $(sysdep-LDFLAGS) --print-file-name=crtbegin.o`
+-+postctor = `$(CC) $(sysdep-LDFLAGS) --print-file-name=crtend.o`
+-# Variants of the two previous definitions for linking PIE programs.
+ +prectorS = `$(CC) $(sysdep-LDFLAGS) --print-file-name=crtbeginS.o`
+ +postctorS = `$(CC) $(sysdep-LDFLAGS) --print-file-name=crtendS.o`
+++prector = $(+prectorS)
+++postctor = $(+postctorS)
+ # Variants of the two previous definitions for statically linking programs.
+ +prectorT = `$(CC) $(sysdep-LDFLAGS) --print-file-name=crtbeginT.o`
+ +postctorT = `$(CC) $(sysdep-LDFLAGS) --print-file-name=crtend.o`
+ +interp = $(addprefix $(elf-objpfx),interp.os)
+ endif
+ csu-objpfx = $(common-objpfx)csu/
diff --git a/sys-libs/glibc/files/eblits/common.eblit b/sys-libs/glibc/files/eblits/common.eblit
index 5228efb4d653..d74720d60adc 100644
--- a/sys-libs/glibc/files/eblits/common.eblit
+++ b/sys-libs/glibc/files/eblits/common.eblit
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/common.eblit,v 1.28 2012/08/10 19:44:47 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/common.eblit,v 1.29 2012/12/28 19:00:51 vapier Exp $
 
 alt_prefix() {
 	is_crosscompile && echo /usr/${CTARGET}
@@ -289,3 +289,11 @@ setup_env() {
 just_headers() {
 	is_crosscompile && use crosscompile_opts_headers-only
 }
+
+glibc_banner() {
+	local b="Gentoo ${PVR}"
+	[[ -n ${SNAP_VER} ]] && b+=" snapshot ${SNAP_VER}"
+	[[ -n ${BRANCH_UPDATE} ]] && b+=" branch ${BRANCH_UPDATE}"
+	[[ -n ${PATCH_VER} ]] && ! use vanilla && b+=" p${PATCH_VER}"
+	echo "${b}"
+}
diff --git a/sys-libs/glibc/files/eblits/src_compile.eblit b/sys-libs/glibc/files/eblits/src_compile.eblit
index 8f89edca9c41..4aea5175ca6c 100644
--- a/sys-libs/glibc/files/eblits/src_compile.eblit
+++ b/sys-libs/glibc/files/eblits/src_compile.eblit
@@ -1,9 +1,9 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_compile.eblit,v 1.30 2012/12/25 20:08:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_compile.eblit,v 1.31 2012/12/28 19:00:51 vapier Exp $
 
 glibc_do_configure() {
-	local myconf
+	local myconf=()
 
 	einfo "Configuring GLIBC for $1"
 
@@ -19,32 +19,32 @@ glibc_do_configure() {
 	[[ -d ports ]] && ADDONS="${ADDONS},ports"
 	popd > /dev/null
 
-	myconf="${myconf} $(use_enable hardened stackguard-randomization)"
+	myconf+=( $(use_enable hardened stackguard-randomization) )
 	if has_version '<sys-libs/glibc-2.13' ; then
-		myconf="${myconf} --enable-old-ssp-compat"
+		myconf+=( --enable-old-ssp-compat )
 	fi
 
-	[[ ${CTARGET//_/-} == *-softfloat-* ]] && myconf="${myconf} --without-fp"
+	[[ ${CTARGET//_/-} == *-softfloat-* ]] && myconf+=( --without-fp )
 
 	if [[ $1 == "linuxthreads" ]] ; then
 		if want_tls ; then
-			myconf="${myconf} --with-tls"
+			myconf+=( --with-tls )
 
 			if ! want__thread || use glibc-compat20 || [[ ${LT_KER_VER} == 2.[02].* ]] ; then
-				myconf="${myconf} --without-__thread"
+				myconf+=( --without-__thread )
 			else
-				myconf="${myconf} --with-__thread"
+				myconf+=( --with-__thread )
 			fi
 		else
-			myconf="${myconf} --without-tls --without-__thread"
+			myconf+=( --without-tls --without-__thread )
 		fi
 
-		myconf="${myconf} --disable-sanity-checks"
-		myconf="${myconf} --enable-add-ons=linuxthreads${ADDONS}"
-		myconf="${myconf} --enable-kernel=${LT_KER_VER}"
+		myconf+=( --disable-sanity-checks )
+		myconf+=( --enable-add-ons="linuxthreads${ADDONS}" )
+		myconf+=( --enable-kernel=${LT_KER_VER} )
 	elif [[ $1 == "nptl" ]] ; then
-		myconf="${myconf} --enable-add-ons=nptl${ADDONS}"
-		myconf="${myconf} --enable-kernel=${NPTL_KERN_VER}"
+		myconf+=( --enable-add-ons="nptl${ADDONS}" )
+		myconf+=( --enable-kernel=${NPTL_KERN_VER} )
 	else
 		die "invalid pthread option"
 	fi
@@ -56,18 +56,18 @@ glibc_do_configure() {
 	if ! is_crosscompile && use selinux ; then
 		if use multilib || has_multilib_profile ; then
 			if is_final_abi ; then
-				myconf="${myconf} --with-selinux"
+				myconf+=( --with-selinux )
 			else
-				myconf="${myconf} --without-selinux"
+				myconf+=( --without-selinux )
 			fi
 		else
-			myconf="${myconf} --with-selinux"
+			myconf+=( --with-selinux )
 		fi
 	else
-		myconf="${myconf} --without-selinux"
+		myconf+=( --without-selinux )
 	fi
 
-	myconf="${myconf}
+	myconf+=(
 		--without-cvs
 		--enable-bind-now
 		--build=${CBUILD_OPT:-${CBUILD}}
@@ -80,10 +80,13 @@ glibc_do_configure() {
 		--mandir=/usr/share/man
 		--infodir=/usr/share/info
 		--libexecdir=/usr/$(get_libdir)/misc/glibc
+		--with-bugurl=http://bugs.gentoo.org/
+		--with-pkgversion="$(glibc_banner)"
 		$(use_multiarch || echo --disable-multi-arch)
 		--enable-obsolete-rpc
 		$(in_iuse systemtap && use_enable systemtap)
-		${EXTRA_ECONF}"
+		${EXTRA_ECONF}
+	)
 
 	# There is no configure option for this and we need to export it
 	# since the glibc build will re-run configure on itself
@@ -97,8 +100,9 @@ glibc_do_configure() {
 	local GBUILDDIR=${WORKDIR}/build-${ABI}-${CTARGET}-$1
 	mkdir -p "${GBUILDDIR}"
 	cd "${GBUILDDIR}"
-	echo "${S}"/configure ${myconf}
-	"${S}"/configure ${myconf} || die "failed to configure glibc"
+	set -- "${S}"/configure "${myconf[@]}"
+	echo "$@"
+	"$@" || die "failed to configure glibc"
 
 	# ia64 static cross-compilers are a pita in so much that they
 	# can't produce static ELFs (as the libgcc.a is broken).  so
@@ -169,9 +173,11 @@ toolchain-glibc_headers_compile() {
 		libc_cv_z_relro=yes
 
 	# Pick out the correct location for build headers
-	local ports="" myconf="--disable-sanity-checks --enable-hacker-mode"
+	local ports="" myconf=()
 	[[ -d ${S}/ports ]] && ports=",ports"
-	myconf="${myconf}
+	myconf+=(
+		--disable-sanity-checks
+		--enable-hacker-mode
 		--enable-add-ons=nptl${ports}
 		--without-cvs
 		--enable-bind-now
@@ -179,17 +185,18 @@ toolchain-glibc_headers_compile() {
 		--host=${CTARGET_OPT:-${CTARGET}}
 		--with-headers=$(alt_build_headers)
 		--prefix=/usr
-		${EXTRA_ECONF}"
+		${EXTRA_ECONF}
+	)
 
 	# Nothing is compiled here which would affect the headers for the target.
 	# so forcing CC/CFLAGS is sane.  unless you dont have `gcc`.  then i
 	# dont care :p.
-	echo "${S}"/configure ${myconf}
+	set -- "${S}"/configure "${myconf[@]}"
 	CC=gcc \
 	CFLAGS="-O1 -pipe" \
 	CPPFLAGS="-U_FORTIFY_SOURCE" \
 	LDFLAGS="" \
-	"${S}"/configure ${myconf} || die "failed to configure glibc"
+	"$@" || die "failed to configure glibc"
 }
 
 eblit-glibc-src_compile() {
diff --git a/sys-libs/glibc/files/eblits/src_unpack.eblit b/sys-libs/glibc/files/eblits/src_unpack.eblit
index 5f04ef605e9c..8caf0bc4538d 100644
--- a/sys-libs/glibc/files/eblits/src_unpack.eblit
+++ b/sys-libs/glibc/files/eblits/src_unpack.eblit
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_unpack.eblit,v 1.19 2012/11/11 07:24:55 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_unpack.eblit,v 1.20 2012/12/28 19:00:51 vapier Exp $
 
 int_to_KV() {
 	local version=$1 major minor micro
@@ -134,9 +134,10 @@ toolchain-glibc_src_unpack() {
 
 	# tag, glibc is it
 	cd "${S}"
-	[[ -e csu/Banner ]] && die "need new banner location"
-	[[ -n ${SNAP_VER} ]] && echo "Gentoo snapshot ${SNAP_VER}" >> csu/Banner
-	[[ -n ${BRANCH_UPDATE} ]] && echo "Gentoo branch ${BRANCH_UPDATE}" >> csu/Banner
+	if ! version_is_at_least 2.17 ; then
+		[[ -e csu/Banner ]] && die "need new banner location"
+		glibc_banner > csu/Banner
+	fi
 	if [[ -n ${PATCH_VER} ]] && ! use vanilla ; then
 		cd "${S}"
 		EPATCH_MULTI_MSG="Applying Gentoo Glibc Patchset ${RELEASE_VER}-${PATCH_VER} ..." \
@@ -144,7 +145,6 @@ toolchain-glibc_src_unpack() {
 		EPATCH_SUFFIX="patch" \
 		ARCH=$(tc-arch) \
 		epatch "${WORKDIR}"/patches
-		echo "Gentoo patchset ${PATCH_VER}" >> csu/Banner
 	fi
 
 	if just_headers ; then
diff --git a/sys-libs/glibc/glibc-2.16.0.ebuild b/sys-libs/glibc/glibc-2.16.0.ebuild
index 7f2748ee5693..9f3749c518b8 100644
--- a/sys-libs/glibc/glibc-2.16.0.ebuild
+++ b/sys-libs/glibc/glibc-2.16.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.16.0.ebuild,v 1.16 2012/11/18 09:32:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.16.0.ebuild,v 1.17 2012/12/28 19:20:37 vapier Exp $
 
 inherit eutils versionator toolchain-funcs flag-o-matic gnuconfig multilib unpacker multiprocessing
 
@@ -33,7 +33,7 @@ esac
 MANPAGE_VER=""                                 # pregenerated manpages
 INFOPAGE_VER=""                                # pregenerated infopages
 LIBIDN_VER=""                                  # it's integrated into the main tarball now
-PATCH_VER="8"                                  # Gentoo patchset
+PATCH_VER="9"                                  # Gentoo patchset
 PORTS_VER=${RELEASE_VER}                       # version of glibc ports addon
 NPTL_KERN_VER=${NPTL_KERN_VER:-"2.6.16"}       # min kernel version nptl requires
 
diff --git a/sys-libs/glibc/glibc-2.17.ebuild b/sys-libs/glibc/glibc-2.17.ebuild
index b3504014415c..85aed10d9395 100644
--- a/sys-libs/glibc/glibc-2.17.ebuild
+++ b/sys-libs/glibc/glibc-2.17.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.17.ebuild,v 1.1 2012/12/25 21:48:13 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.17.ebuild,v 1.2 2012/12/28 19:25:42 vapier Exp $
 
 inherit eutils versionator toolchain-funcs flag-o-matic gnuconfig multilib unpacker multiprocessing
 
@@ -155,7 +155,7 @@ eblit-src_unpack-post() {
 	if use hardened ; then
 		cd "${S}"
 		einfo "Patching to get working PIE binaries on PIE (hardened) platforms"
-		gcc-specs-pie && epatch "${FILESDIR}"/2.16/glibc-2.16-hardened-pie.patch
+		gcc-specs-pie && epatch "${FILESDIR}"/2.17/glibc-2.17-hardened-pie.patch
 		epatch "${FILESDIR}"/2.10/glibc-2.10-hardened-configure-picdefault.patch
 		epatch "${FILESDIR}"/2.10/glibc-2.10-hardened-inittls-nosysenter.patch
 
diff --git a/sys-libs/libhx/Manifest b/sys-libs/libhx/Manifest
index a1fd3fd39fc6..49218e8766d6 100644
--- a/sys-libs/libhx/Manifest
+++ b/sys-libs/libhx/Manifest
@@ -1,2 +1,2 @@
-DIST libHX-3.12.1.tar.xz 821460 SHA256 15476e7a8ea6fb30da16fe0516a7e6ab94f3f5d367f773579e2fa47be6f7a73c
+DIST libHX-3.12.1.tar.xz 821460 SHA256 15476e7a8ea6fb30da16fe0516a7e6ab94f3f5d367f773579e2fa47be6f7a73c SHA512 8a92181c6fe43a4f20fb99b7051eb0f11efe6c6af886874f840dee5e01e4038b441a83fc411bfc1f7def637f25cdf3f7d090fbc22af564542bad483f7a9d76e7 WHIRLPOOL 8f3ede6679f59ae8c0d2965c1d593c5c72b60bb73279fe8cd54ea987d2530db9b21a816eca20728c04a5ab8b7e483443174852c3f134e54815a98f2e42fcdd41
 DIST libHX-3.14.tar.xz 860044 SHA256 19d9dfbf997add2458fa4b4db85989b3658688c8147e7533805ea417ec4aa1a9 SHA512 6c4d3d9f4d745a3949a3330afc4b4ac5b7f0d58ff5b2ab162d953b5a191fe3ae02ffb3eb1f9ce83f0de52f90e8995c2d604765a498e9536ca84d156ce25feb3c WHIRLPOOL 2b7add51433fedfb829dc9960d6ba781b523c26e10bbc1a3c30a1547510e9645dbfb44909a000d8dfdb57652cfe997c5629ca67b71ee519cf10e205e9594f085
diff --git a/sys-libs/libhx/libhx-3.14.ebuild b/sys-libs/libhx/libhx-3.14.ebuild
index 96147fd69445..47b3a82aae2d 100644
--- a/sys-libs/libhx/libhx-3.14.ebuild
+++ b/sys-libs/libhx/libhx-3.14.ebuild
@@ -1,9 +1,11 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libhx/libhx-3.14.ebuild,v 1.1 2012/11/30 09:59:18 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libhx/libhx-3.14.ebuild,v 1.2 2012/12/29 04:13:06 mattst88 Exp $
 
 EAPI=5
 
+inherit eutils
+
 DESCRIPTION="Platform independent library providing basic system functions."
 HOMEPAGE="http://libhx.sourceforge.net"
 SRC_URI="mirror://sourceforge/${PN}/libHX-${PV}.tar.xz"
diff --git a/sys-libs/mtdev/mtdev-1.1.3.ebuild b/sys-libs/mtdev/mtdev-1.1.3.ebuild
index 7a9b78ad8e61..15435502d70c 100644
--- a/sys-libs/mtdev/mtdev-1.1.3.ebuild
+++ b/sys-libs/mtdev/mtdev-1.1.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/mtdev/mtdev-1.1.3.ebuild,v 1.6 2012/12/17 20:03:29 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/mtdev/mtdev-1.1.3.ebuild,v 1.8 2012/12/28 17:33:14 ago Exp $
 
 EAPI=4
 
@@ -10,7 +10,7 @@ SRC_URI="http://bitmath.org/code/mtdev/${P}.tar.bz2"
 
 LICENSE="MIT"
 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-kernel/linux-headers-2.6.31"
diff --git a/virtual/glu/glu-9.0.ebuild b/virtual/glu/glu-9.0.ebuild
index abb6ca7fbad3..6dce34b419b1 100644
--- a/virtual/glu/glu-9.0.ebuild
+++ b/virtual/glu/glu-9.0.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/glu/glu-9.0.ebuild,v 1.6 2012/12/17 20:04:36 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/glu/glu-9.0.ebuild,v 1.8 2012/12/28 17:33:33 ago Exp $
 
 DESCRIPTION="Virtual for OpenGL utility library"
 HOMEPAGE=""
 SRC_URI=""
 LICENSE=""
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 RDEPEND="|| ( media-libs/glu <media-libs/mesa-9 media-libs/opengl-apple )"
 DEPEND=""
diff --git a/www-apps/collectd-web/Manifest b/www-apps/collectd-web/Manifest
index 855dc2915d77..19e4bf36430a 100644
--- a/www-apps/collectd-web/Manifest
+++ b/www-apps/collectd-web/Manifest
@@ -1 +1 @@
-DIST collectd-web-0.4.0.tar.gz 771364 RMD160 400897e87677ba57aada340fce32707fb6754633 SHA1 07c89e2bbc913fdd2686af9560a282c6ce6bd18a SHA256 08cda1ae2efe971087a7f312c9686dc8104bcb58c426925dca1a4e1be24551bd
+DIST collectd-web-0.4.0.tar.gz 771364 SHA256 08cda1ae2efe971087a7f312c9686dc8104bcb58c426925dca1a4e1be24551bd
diff --git a/www-apps/collectd-web/collectd-web-0.4.0.ebuild b/www-apps/collectd-web/collectd-web-0.4.0.ebuild
index 9419d54959a6..a1b9c9982351 100644
--- a/www-apps/collectd-web/collectd-web-0.4.0.ebuild
+++ b/www-apps/collectd-web/collectd-web-0.4.0.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/collectd-web/collectd-web-0.4.0.ebuild,v 1.1 2011/06/02 13:33:00 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/collectd-web/collectd-web-0.4.0.ebuild,v 1.2 2012/12/28 09:35:59 qnikst Exp $
 
 EAPI=3
 
 inherit webapp
 
 DESCRIPTION="Collectd-web is a web-based front-end for RRD data collected by collectd"
-HOMEPAGE="http://kenny.belitzky.com/projects/collectd-web"
+HOMEPAGE="http://collectdweb.appspot.com/"
 SRC_URI="https://github.com/httpdss/${PN}/tarball/${PV} -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/www-client/opera-next/opera-next-12.12_pre1707.ebuild b/www-client/opera-next/opera-next-12.12_pre1707.ebuild
index 70c9bc8e215a..3cba87456028 100644
--- a/www-client/opera-next/opera-next-12.12_pre1707.ebuild
+++ b/www-client/opera-next/opera-next-12.12_pre1707.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera-next/opera-next-12.12_pre1707.ebuild,v 1.1 2012/12/20 13:59:56 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera-next/opera-next-12.12_pre1707.ebuild,v 1.2 2012/12/28 16:03:18 jer Exp $
 
 EAPI=4
 inherit eutils fdo-mime gnome2-utils multilib pax-utils versionator
@@ -97,16 +97,16 @@ RDEPEND="
 	kde? ( ${KDERDEPEND} )
 	gstreamer? ( ${GSTRDEPEND} )
 "
+
+OPREFIX="/usr/$(get_libdir)"
+QA_PREBUILT="*"
+
 src_unpack() {
 	unpack ${A}
 	mv -v ${PN}* "${S}" || die
 }
 
 src_prepare() {
-	export OPREFIX="/usr/$(get_libdir)"
-	export QA_PREBUILT="${OPREFIX}/${PN}/.*"
-	export QA_PRESTRIPPED="${OPREFIX}/${PN}/.*"
-
 	local LNGDIR="share/${PN}/locale"
 
 	# Count linguas
diff --git a/www-client/opera/opera-12.12_p1707.ebuild b/www-client/opera/opera-12.12_p1707.ebuild
index e3b1b8616f77..dbd115d53cea 100644
--- a/www-client/opera/opera-12.12_p1707.ebuild
+++ b/www-client/opera/opera-12.12_p1707.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-12.12_p1707.ebuild,v 1.3 2012/12/19 14:29:53 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-12.12_p1707.ebuild,v 1.4 2012/12/28 16:03:33 jer Exp $
 
 EAPI=4
 inherit eutils fdo-mime gnome2-utils multilib pax-utils versionator
@@ -97,16 +97,16 @@ RDEPEND="
 	kde? ( ${KDERDEPEND} )
 	gstreamer? ( ${GSTRDEPEND} )
 "
+
+OPREFIX="/usr/$(get_libdir)"
+QA_PREBUILT="*"
+
 src_unpack() {
 	unpack ${A}
 	mv -v ${PN}* "${S}" || die
 }
 
 src_prepare() {
-	export OPREFIX="/usr/$(get_libdir)"
-	export QA_PREBUILT="${OPREFIX}/${PN}/.*"
-	export QA_PRESTRIPPED="${OPREFIX}/${PN}/.*"
-
 	local LNGDIR="share/${PN}/locale"
 
 	# Count linguas
diff --git a/www-misc/bookmarksync/bookmarksync-0.3.4-r1.ebuild b/www-misc/bookmarksync/bookmarksync-0.3.4-r1.ebuild
deleted file mode 100644
index 916b5288be93..000000000000
--- a/www-misc/bookmarksync/bookmarksync-0.3.4-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-misc/bookmarksync/bookmarksync-0.3.4-r1.ebuild,v 1.4 2009/09/23 21:08:04 patrick Exp $
-
-DESCRIPTION="bookmarksync synchronizes various browser bookmark files"
-HOMEPAGE="http://sourceforge.net/projects/booksync/"
-SRC_URI="mirror://sourceforge/booksync/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="ppc x86"
-SLOT="0"
-
-IUSE="perl"
-RESTRICT="mirror"
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	perl? ( dev-lang/perl )"
-
-src_install () {
-	dobin bookmarksync
-	if use perl ; then
-		dobin tools/bookmarksync.pl
-		dodoc README.tools
-	fi
-	dodoc README TODO DEVELOPERS
-}
-
-pkg_postinst () {
-	use perl && ewarn "You will need to modify bookmarksync.pl before use"
-}
diff --git a/www-misc/bookmarksync/bookmarksync-0.3.4-r2.ebuild b/www-misc/bookmarksync/bookmarksync-0.3.4-r2.ebuild
index d590b994fc7a..83c700ee5b1e 100644
--- a/www-misc/bookmarksync/bookmarksync-0.3.4-r2.ebuild
+++ b/www-misc/bookmarksync/bookmarksync-0.3.4-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-misc/bookmarksync/bookmarksync-0.3.4-r2.ebuild,v 1.3 2012/12/27 17:13:55 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-misc/bookmarksync/bookmarksync-0.3.4-r2.ebuild,v 1.4 2012/12/28 11:22:11 ago Exp $
 
 EAPI="2"
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://sourceforge.net/projects/booksync/"
 SRC_URI="mirror://sourceforge/booksync/${P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc x86"
+KEYWORDS="~amd64 ppc x86"
 SLOT="0"
 
 IUSE="perl"
diff --git a/x11-apps/xbacklight/xbacklight-1.2.0.ebuild b/x11-apps/xbacklight/xbacklight-1.2.0.ebuild
index 73964555a40c..221b5ae98058 100644
--- a/x11-apps/xbacklight/xbacklight-1.2.0.ebuild
+++ b/x11-apps/xbacklight/xbacklight-1.2.0.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xbacklight/xbacklight-1.2.0.ebuild,v 1.7 2012/12/17 20:05:47 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xbacklight/xbacklight-1.2.0.ebuild,v 1.9 2012/12/28 17:33:53 ago Exp $
 
 EAPI=3
 
 inherit xorg-2
 
 DESCRIPTION="Sets backlight level using the RandR 1.2 BACKLIGHT output property"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND="x11-libs/libxcb
diff --git a/x11-base/xorg-drivers/xorg-drivers-1.13.ebuild b/x11-base/xorg-drivers/xorg-drivers-1.13.ebuild
index d75c8a795fc9..c8885ccb10c3 100644
--- a/x11-base/xorg-drivers/xorg-drivers-1.13.ebuild
+++ b/x11-base/xorg-drivers/xorg-drivers-1.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-drivers/xorg-drivers-1.13.ebuild,v 1.8 2012/12/17 20:19:32 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-drivers/xorg-drivers-1.13.ebuild,v 1.10 2012/12/28 17:34:47 ago Exp $
 
 EAPI=4
 
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE="metapackage"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 
 IUSE_INPUT_DEVICES="
 	input_devices_acecad
diff --git a/x11-base/xorg-server/xorg-server-1.13.1.ebuild b/x11-base/xorg-server/xorg-server-1.13.1.ebuild
index 44c663eee21c..7073698cadae 100644
--- a/x11-base/xorg-server/xorg-server-1.13.1.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.13.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.13.1.ebuild,v 1.2 2012/12/25 16:27:06 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.13.1.ebuild,v 1.4 2012/12/28 17:35:39 ago Exp $
 
 EAPI=4
 
@@ -9,7 +9,7 @@ inherit xorg-2 multilib versionator flag-o-matic
 EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver"
 
 DESCRIPTION="X.Org X servers"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 
 IUSE_SERVERS="dmx kdrive xnest xorg xvfb"
 IUSE="${IUSE_SERVERS} ipv6 minimal nptl selinux +suid tslib +udev"
diff --git a/x11-drivers/ati-drivers/ati-drivers-12.6_beta_pre897.ebuild b/x11-drivers/ati-drivers/ati-drivers-12.6_beta_pre897.ebuild
index 9de10d3b4010..26a6e230826e 100644
--- a/x11-drivers/ati-drivers/ati-drivers-12.6_beta_pre897.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-12.6_beta_pre897.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-12.6_beta_pre897.ebuild,v 1.9 2012/12/25 16:41:58 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-12.6_beta_pre897.ebuild,v 1.10 2012/12/29 00:07:31 chithanh Exp $
 
 EAPI=4
 
@@ -21,7 +21,7 @@ fi
 IUSE="debug +modules multilib qt4 static-libs"
 
 LICENSE="AMD GPL-2 QPL-1.0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 SLOT="1"
 
 RESTRICT="bindist"
@@ -47,8 +47,8 @@ RDEPEND="
 			x11-libs/libXcursor
 			x11-libs/libXfixes
 			x11-libs/libXxf86vm
-			x11-libs/qt-core
-			x11-libs/qt-gui
+			x11-libs/qt-core:4
+			x11-libs/qt-gui:4
 	)
 "
 
@@ -327,6 +327,10 @@ src_prepare() {
 	#fixes bug #420751
 	epatch "${FILESDIR}"/ati-drivers-do_mmap.patch
 
+	# compile fix for linux-3.7
+	# https://bugs.gentoo.org/show_bug.cgi?id=438516
+	epatch "${FILESDIR}/ati-drivers-vm-reserverd.patch"
+
 	# Use ACPI_DEVICE_HANDLE wrapper to make driver build on linux-3.8
 	# see https://bugs.gentoo.org/show_bug.cgi?id=448216 
 	epatch "${FILESDIR}/ati-drivers-kernel-3.8-acpihandle.patch"
@@ -581,11 +585,20 @@ src_install-libs() {
 		dosym ${soname} /usr/$(get_libdir)/$(scanelf -qF "#f%S" ${so})
 	done
 
+	# See https://bugs.gentoo.org/show_bug.cgi?id=443466
+	dodir /etc/revdep-rebuild/
+	echo "SEARCH_DIRS_MASK=\"/opt/bin/clinfo\"" > "${ED}/etc/revdep-rebuild/62-ati-drivers"
+
 	#remove static libs if not wanted
 	use static-libs || rm -rf "${D}"/usr/$(get_libdir)/libfglrx_dm.a
 }
 
 pkg_postinst() {
+	if has_version ">=x11-base/xorg-server-1.11.99"; then
+		ewarn "Problems have been reported with this driver and xorg-server-1.12."
+		ewarn "Stay with xorg-server-1.11 if you experience hangs (bug #436252)."
+	fi
+
 	elog "To switch to AMD OpenGL, run \"eselect opengl set ati\""
 	elog "To change your xorg.conf you can use the bundled \"aticonfig\""
 	elog
diff --git a/x11-drivers/xf86-input-elographics/xf86-input-elographics-1.4.1.ebuild b/x11-drivers/xf86-input-elographics/xf86-input-elographics-1.4.1.ebuild
index 7e903538369b..59095b323330 100644
--- a/x11-drivers/xf86-input-elographics/xf86-input-elographics-1.4.1.ebuild
+++ b/x11-drivers/xf86-input-elographics/xf86-input-elographics-1.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-elographics/xf86-input-elographics-1.4.1.ebuild,v 1.6 2012/12/17 20:08:34 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-elographics/xf86-input-elographics-1.4.1.ebuild,v 1.8 2012/12/28 17:36:01 ago Exp $
 
 EAPI="4"
 
@@ -8,7 +8,7 @@ XORG_STATIC="no"
 inherit xorg-2
 
 DESCRIPTION="Elographics input driver"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm ~hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=""
diff --git a/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.7.3.ebuild b/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.7.3.ebuild
index 783870a97c85..914e3cdfb161 100644
--- a/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.7.3.ebuild
+++ b/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.7.3.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.7.3.ebuild,v 1.6 2012/12/17 20:09:46 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.7.3.ebuild,v 1.8 2012/12/28 17:36:23 ago Exp $
 
 EAPI=4
 inherit xorg-2
 
 DESCRIPTION="Generic Linux input driver"
-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=""
 
 RDEPEND=">=x11-base/xorg-server-1.10[udev]
diff --git a/x11-drivers/xf86-input-keyboard/xf86-input-keyboard-1.6.2.ebuild b/x11-drivers/xf86-input-keyboard/xf86-input-keyboard-1.6.2.ebuild
index fe214d8249fd..465b661c459b 100644
--- a/x11-drivers/xf86-input-keyboard/xf86-input-keyboard-1.6.2.ebuild
+++ b/x11-drivers/xf86-input-keyboard/xf86-input-keyboard-1.6.2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-keyboard/xf86-input-keyboard-1.6.2.ebuild,v 1.6 2012/12/17 20:10:57 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-keyboard/xf86-input-keyboard-1.6.2.ebuild,v 1.8 2012/12/28 17:36:45 ago Exp $
 
 EAPI=4
 inherit xorg-2
 
 DESCRIPTION="Keyboard input driver"
 
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=x11-base/xorg-server-1.6.3"
diff --git a/x11-drivers/xf86-input-mouse/xf86-input-mouse-1.8.1.ebuild b/x11-drivers/xf86-input-mouse/xf86-input-mouse-1.8.1.ebuild
index 8ca9a3f04c5f..6addf456f6e1 100644
--- a/x11-drivers/xf86-input-mouse/xf86-input-mouse-1.8.1.ebuild
+++ b/x11-drivers/xf86-input-mouse/xf86-input-mouse-1.8.1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-mouse/xf86-input-mouse-1.8.1.ebuild,v 1.7 2012/12/17 20:12:10 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-mouse/xf86-input-mouse-1.8.1.ebuild,v 1.9 2012/12/28 17:37:07 ago Exp $
 
 EAPI=4
 inherit xorg-2
 
 DESCRIPTION="X.Org driver for mouse input devices"
 
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=x11-base/xorg-server-1.7"
diff --git a/x11-drivers/xf86-video-apm/Manifest b/x11-drivers/xf86-video-apm/Manifest
index a3cc1792bf35..3dedbc54f4b6 100644
--- a/x11-drivers/xf86-video-apm/Manifest
+++ b/x11-drivers/xf86-video-apm/Manifest
@@ -1,3 +1,3 @@
 DIST xf86-video-apm-1.2.3.tar.bz2 295470 SHA256 4046ea18dbd76a9df5f68695025c2c411c20564af9198974506a041ebd4a30da
-DIST xf86-video-apm-1.2.4.tar.bz2 325979 SHA256 ae65982961fe884728497db9b805123d486d2aade2ba8e7bba9a3ee9dccf4302
+DIST xf86-video-apm-1.2.4.tar.bz2 325979 SHA256 ae65982961fe884728497db9b805123d486d2aade2ba8e7bba9a3ee9dccf4302 SHA512 4b98614d8f2889d5330b50cb211f8b1f03ac9be30d531b7c14b117fa144b8a279b2f892370e19380a898711d95a6bfc11a116955c1caed65981798e3199211f1 WHIRLPOOL 07f2d1b17e8e63f6e34c4d8d335951552380649339df6d3fb87cb6b46bde3170312fce0498baccec5f2fea5b635693731c83f983186c3e3967a548176ff743e7
 DIST xf86-video-apm-1.2.5.tar.bz2 325277 SHA256 953b04320117b14c5b7efb37de45cef45592409f639c2aa87b7e2d77dc8d3d0f SHA512 652307d5e21fcd0df890b941821f409cc0c9846133cf7e522799710d28ebf0d8ff2d8ead3235d8207169f416a6561bc14b4fedb1baaddb1bddf03007372af622 WHIRLPOOL 04f34982d8483eaf8a9b8fa8d92593635f6a1abe78ba904cf3ad88a605c03fd0283bc42c6f42c1c8e6c0d70298a0c98b3cde3fc16bda70e32c3fc2cde979223a
diff --git a/x11-drivers/xf86-video-apm/xf86-video-apm-1.2.5.ebuild b/x11-drivers/xf86-video-apm/xf86-video-apm-1.2.5.ebuild
index 7774f06c8cae..2f654c535316 100644
--- a/x11-drivers/xf86-video-apm/xf86-video-apm-1.2.5.ebuild
+++ b/x11-drivers/xf86-video-apm/xf86-video-apm-1.2.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-apm/xf86-video-apm-1.2.5.ebuild,v 1.3 2012/11/18 12:12:19 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-apm/xf86-video-apm-1.2.5.ebuild,v 1.4 2012/12/28 11:08:01 ago Exp $
 
 EAPI=4
 
@@ -8,7 +8,7 @@ inherit xorg-2
 
 DESCRIPTION="Alliance ProMotion video driver"
 
-KEYWORDS="amd64 ~ia64 x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="amd64 ia64 x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=x11-base/xorg-server-1.0.99"
diff --git a/x11-drivers/xf86-video-ark/Manifest b/x11-drivers/xf86-video-ark/Manifest
index 964b4e6b807e..7b7833daea53 100644
--- a/x11-drivers/xf86-video-ark/Manifest
+++ b/x11-drivers/xf86-video-ark/Manifest
@@ -1,3 +1,3 @@
 DIST xf86-video-ark-0.7.3.tar.bz2 238946 SHA256 39149a565c64ae013962022c45e561a0e92c5ab413688f3b5055cad694f28f98
-DIST xf86-video-ark-0.7.4.tar.bz2 273338 SHA256 bd4cdba48a974acaca289d20b8268a4d3084e2b2c9d1c83adb03ba1dcb609fa4
+DIST xf86-video-ark-0.7.4.tar.bz2 273338 SHA256 bd4cdba48a974acaca289d20b8268a4d3084e2b2c9d1c83adb03ba1dcb609fa4 SHA512 ee9e5f9139df5bc6f6a731d3d5b8059a705fdd7f565a40f3cf9026c8f1f8d90b7998987941a8751e8c403321bf8d3098861bb8becbd25354706a2bd0e0bf537a WHIRLPOOL 2c61e748ce8cefc2156a2fb6e1b6cb58a23670234437d503282e3d2d30a4421181dd562dcf0302404f04487eeee2847d414db571e454cfa52cd6761505679b2d
 DIST xf86-video-ark-0.7.5.tar.bz2 290423 SHA256 c690e046f34a393aac1c8d9616b4790e93cda60a460b00b9597d322175dbe51e SHA512 67c2b4e2109bf9d84a007c9679d35e7c0a4e4ddcdb7be9fa5070ce7e2f666e018d8421ddd4890cf3abb4eb37e060a10666c62a9efbb5369eb7cd8647ee18a644 WHIRLPOOL f1d2f76eb10dd475f8bbd562300cff9f89874f3676eff12e54d86ee9d0ec291e6e9763f2d98b753684c328e92a138dee1bfcda6423ac33dbb4003d7edb1336cd
diff --git a/x11-drivers/xf86-video-ark/xf86-video-ark-0.7.5.ebuild b/x11-drivers/xf86-video-ark/xf86-video-ark-0.7.5.ebuild
index 93df8ec13629..acfd418bb9e3 100644
--- a/x11-drivers/xf86-video-ark/xf86-video-ark-0.7.5.ebuild
+++ b/x11-drivers/xf86-video-ark/xf86-video-ark-0.7.5.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ark/xf86-video-ark-0.7.5.ebuild,v 1.3 2012/11/18 12:12:36 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ark/xf86-video-ark-0.7.5.ebuild,v 1.4 2012/12/28 11:08:43 ago Exp $
 
 EAPI=4
 
 inherit xorg-2
 
 DESCRIPTION="X.Org driver for ark cards"
-KEYWORDS="amd64 ~ia64 x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="amd64 ia64 x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=x11-base/xorg-server-1.0.99"
diff --git a/x11-drivers/xf86-video-ati/xf86-video-ati-7.0.0.ebuild b/x11-drivers/xf86-video-ati/xf86-video-ati-7.0.0.ebuild
index 01a35b64dbff..627e484d51d5 100644
--- a/x11-drivers/xf86-video-ati/xf86-video-ati-7.0.0.ebuild
+++ b/x11-drivers/xf86-video-ati/xf86-video-ati-7.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ati/xf86-video-ati-7.0.0.ebuild,v 1.7 2012/12/08 17:08:55 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ati/xf86-video-ati-7.0.0.ebuild,v 1.9 2012/12/28 17:37:35 ago Exp $
 
 EAPI=4
 
@@ -9,7 +9,7 @@ inherit xorg-2
 
 DESCRIPTION="ATI video driver"
 
-KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ia64 ppc ppc64 sparc x86"
 IUSE="glamor udev"
 
 RDEPEND=">=x11-libs/libdrm-2.4.36[video_cards_radeon]
diff --git a/x11-drivers/xf86-video-chips/xf86-video-chips-1.2.5.ebuild b/x11-drivers/xf86-video-chips/xf86-video-chips-1.2.5.ebuild
index 88b7854fd845..b165312160dd 100644
--- a/x11-drivers/xf86-video-chips/xf86-video-chips-1.2.5.ebuild
+++ b/x11-drivers/xf86-video-chips/xf86-video-chips-1.2.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-chips/xf86-video-chips-1.2.5.ebuild,v 1.5 2012/11/28 21:36:34 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-chips/xf86-video-chips-1.2.5.ebuild,v 1.6 2012/12/28 11:10:46 ago Exp $
 
 EAPI=4
 
@@ -8,5 +8,5 @@ inherit xorg-2
 
 DESCRIPTION="Chips and Technologies video driver"
 
-KEYWORDS="amd64 ~ia64 ppc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="amd64 ia64 ppc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
diff --git a/x11-drivers/xf86-video-cirrus/xf86-video-cirrus-1.5.1.ebuild b/x11-drivers/xf86-video-cirrus/xf86-video-cirrus-1.5.1.ebuild
index 09348ba4d5c6..9876ac345b85 100644
--- a/x11-drivers/xf86-video-cirrus/xf86-video-cirrus-1.5.1.ebuild
+++ b/x11-drivers/xf86-video-cirrus/xf86-video-cirrus-1.5.1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-cirrus/xf86-video-cirrus-1.5.1.ebuild,v 1.4 2012/11/28 21:36:59 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-cirrus/xf86-video-cirrus-1.5.1.ebuild,v 1.5 2012/12/28 11:11:38 ago Exp $
 
 EAPI=4
 inherit xorg-2
 
 DESCRIPTION="Cirrus Logic video driver"
-KEYWORDS="~alpha amd64 ~ia64 ppc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ia64 ppc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=x11-base/xorg-server-1.0.99"
diff --git a/x11-drivers/xf86-video-dummy/xf86-video-dummy-0.3.6.ebuild b/x11-drivers/xf86-video-dummy/xf86-video-dummy-0.3.6.ebuild
index f98cc8768a3e..1c178fe07996 100644
--- a/x11-drivers/xf86-video-dummy/xf86-video-dummy-0.3.6.ebuild
+++ b/x11-drivers/xf86-video-dummy/xf86-video-dummy-0.3.6.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-dummy/xf86-video-dummy-0.3.6.ebuild,v 1.8 2012/12/17 20:14:19 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-dummy/xf86-video-dummy-0.3.6.ebuild,v 1.10 2012/12/28 17:37:57 ago Exp $
 
 EAPI=4
 inherit xorg-2
 
 DESCRIPTION="X.Org driver for dummy cards"
 
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="dga"
 
 RDEPEND=">=x11-base/xorg-server-1.0.99"
diff --git a/x11-drivers/xf86-video-fbdev/xf86-video-fbdev-0.4.3.ebuild b/x11-drivers/xf86-video-fbdev/xf86-video-fbdev-0.4.3.ebuild
index f6327b3dc150..e46322444f84 100644
--- a/x11-drivers/xf86-video-fbdev/xf86-video-fbdev-0.4.3.ebuild
+++ b/x11-drivers/xf86-video-fbdev/xf86-video-fbdev-0.4.3.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-fbdev/xf86-video-fbdev-0.4.3.ebuild,v 1.6 2012/12/17 20:15:29 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-fbdev/xf86-video-fbdev-0.4.3.ebuild,v 1.8 2012/12/28 17:38:17 ago Exp $
 
 EAPI=3
 inherit xorg-2
 
 DESCRIPTION="video driver for framebuffer device"
 
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND="x11-base/xorg-server"
diff --git a/x11-drivers/xf86-video-glint/Manifest b/x11-drivers/xf86-video-glint/Manifest
index 4ad96145b01c..79aca6f28a31 100644
--- a/x11-drivers/xf86-video-glint/Manifest
+++ b/x11-drivers/xf86-video-glint/Manifest
@@ -1,4 +1,4 @@
 DIST xf86-video-glint-1.2.5.tar.bz2 394136 SHA256 5675f2732ab7b099a568ef4e5c7bb0d0e1bb4b0eb4d19133dc1b2225fd9c814b SHA512 b4d3cead954f71482c18afcf2c1f7c02801dc955ae7503cb3bd1055319b97b0261657f5f5298757884871f5d563c2e020ae62de6bbbbce59e359f79379c4ced1 WHIRLPOOL 5c1ea7ac76ef0aaecd80437153a9032784fa3c74d6838120860de903fc213432326fddef84588c527330eb0266cd4e2bac49dd76c62dd4208693f3ee448b1443
 DIST xf86-video-glint-1.2.6.tar.bz2 393872 SHA256 d43350ed3c149576db1dbcacf5e9a30a3268a3f49742724c9151b6f1e4bd21a7 SHA512 a32c70134c0b9edc90f8df6f1de696919063e7c7f0bfae18ecfee2d8852ff7c70a88b39649ca5d3f67a2551a81d1076d19eb11b86431c76dc34f4126f21ad9a4 WHIRLPOOL cbea3d2fa8052ff149b4346c7f56b8ec2b6292f3a731d2328c89369088214327f2cbb20d7e3b7b48d1a5592c2de930b08c825e644a8b80db846d4951a11e6305
-DIST xf86-video-glint-1.2.7.tar.bz2 397381 SHA256 9aa9689436fc78a71145d4caeaf63b0e80f9abd54e9b4a3066f62ee5b334c359
+DIST xf86-video-glint-1.2.7.tar.bz2 397381 SHA256 9aa9689436fc78a71145d4caeaf63b0e80f9abd54e9b4a3066f62ee5b334c359 SHA512 e005998ce9a33de9b0ebf009d7600fff576b6dc79933b99f2e105028b8266af8b8bd414688b5f467295226a26311c599a4f4ab12b0b821f43a1d72566ce569c2 WHIRLPOOL ccf30dab0923e397849538a91c03068529cafe9b9c1e4736abb5a9d4b661359175e83784871926481fab0f7b9344eb3309775eef76e2b715d3b2654de74de5b0
 DIST xf86-video-glint-1.2.8.tar.bz2 395371 SHA256 657f883bb3a4e4278399eba73840862c3642706ae8b0a4798ec97a31b3524221 SHA512 ea8c566877a8ef6d7c08bec317da62f41ffa080ca76f06587a2bbb2a976966ca4138fae60ede757cf470222912c915f4361aa90513901c370eae335818f33468 WHIRLPOOL 28a6605a555fd317c9d18e0eef936051b305a37a5ad782a3ad550c9b324d15834c7742fcd7e34e76f383303a1c333044df43e9b3ef7f8451a462882bd23a405c
diff --git a/x11-drivers/xf86-video-glint/xf86-video-glint-1.2.8.ebuild b/x11-drivers/xf86-video-glint/xf86-video-glint-1.2.8.ebuild
index 3e70ff7c17ff..92bf9a2f3650 100644
--- a/x11-drivers/xf86-video-glint/xf86-video-glint-1.2.8.ebuild
+++ b/x11-drivers/xf86-video-glint/xf86-video-glint-1.2.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-glint/xf86-video-glint-1.2.8.ebuild,v 1.4 2012/11/28 21:38:07 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-glint/xf86-video-glint-1.2.8.ebuild,v 1.6 2012/12/28 17:38:37 ago Exp $
 
 EAPI=4
 
@@ -8,7 +8,7 @@ inherit xorg-2
 
 DESCRIPTION="GLINT/Permedia video driver"
 
-KEYWORDS="~alpha amd64 ~ia64 ppc ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ia64 ppc sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=x11-base/xorg-server-1.0.99"
diff --git a/x11-drivers/xf86-video-i128/xf86-video-i128-1.3.6.ebuild b/x11-drivers/xf86-video-i128/xf86-video-i128-1.3.6.ebuild
index cce6a3a09aa2..2bd2f1b367a7 100644
--- a/x11-drivers/xf86-video-i128/xf86-video-i128-1.3.6.ebuild
+++ b/x11-drivers/xf86-video-i128/xf86-video-i128-1.3.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-i128/xf86-video-i128-1.3.6.ebuild,v 1.3 2012/11/18 12:15:26 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-i128/xf86-video-i128-1.3.6.ebuild,v 1.4 2012/12/28 11:15:10 ago Exp $
 
 EAPI=4
 
@@ -8,7 +8,7 @@ inherit xorg-2
 
 DESCRIPTION="Number 9 I128 video driver"
 
-KEYWORDS="amd64 ~ia64 x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="amd64 ia64 x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=x11-base/xorg-server-1.0.99"
diff --git a/x11-drivers/xf86-video-i740/xf86-video-i740-1.3.4.ebuild b/x11-drivers/xf86-video-i740/xf86-video-i740-1.3.4.ebuild
index df4431482c65..39da226d7fba 100644
--- a/x11-drivers/xf86-video-i740/xf86-video-i740-1.3.4.ebuild
+++ b/x11-drivers/xf86-video-i740/xf86-video-i740-1.3.4.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-i740/xf86-video-i740-1.3.4.ebuild,v 1.3 2012/11/18 12:15:41 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-i740/xf86-video-i740-1.3.4.ebuild,v 1.4 2012/12/28 11:15:52 ago Exp $
 
 EAPI=4
 inherit xorg-2
 
 DESCRIPTION="Intel i740 video driver"
 
-KEYWORDS="amd64 ~ia64 x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="amd64 ia64 x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=x11-base/xorg-server-1.0.99"
diff --git a/x11-drivers/xf86-video-mach64/xf86-video-mach64-6.9.4.ebuild b/x11-drivers/xf86-video-mach64/xf86-video-mach64-6.9.4.ebuild
index 4f364d665665..fa2e635c55da 100644
--- a/x11-drivers/xf86-video-mach64/xf86-video-mach64-6.9.4.ebuild
+++ b/x11-drivers/xf86-video-mach64/xf86-video-mach64-6.9.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-mach64/xf86-video-mach64-6.9.4.ebuild,v 1.1 2012/12/20 21:43:03 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-mach64/xf86-video-mach64-6.9.4.ebuild,v 1.3 2012/12/28 17:39:00 ago Exp $
 
 EAPI=4
 
@@ -9,7 +9,7 @@ inherit xorg-2
 
 DESCRIPTION="ATI Mach64 video driver"
 
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ia64 ~ppc ~ppc64 sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=x11-base/xorg-server-1.10
diff --git a/x11-drivers/xf86-video-mga/xf86-video-mga-1.6.2.ebuild b/x11-drivers/xf86-video-mga/xf86-video-mga-1.6.2.ebuild
index 895419a58fb7..ffe129e72171 100644
--- a/x11-drivers/xf86-video-mga/xf86-video-mga-1.6.2.ebuild
+++ b/x11-drivers/xf86-video-mga/xf86-video-mga-1.6.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-mga/xf86-video-mga-1.6.2.ebuild,v 1.6 2012/12/08 17:10:38 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-mga/xf86-video-mga-1.6.2.ebuild,v 1.8 2012/12/28 17:39:22 ago Exp $
 
 EAPI=4
 XORG_DRI=dri
@@ -9,7 +9,7 @@ inherit xorg-2
 DESCRIPTION="Matrox video driver"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="dri"
 
 RDEPEND="<x11-base/xorg-server-1.13.99"
diff --git a/x11-drivers/xf86-video-modesetting/xf86-video-modesetting-0.5.0.ebuild b/x11-drivers/xf86-video-modesetting/xf86-video-modesetting-0.5.0.ebuild
index 6928fbcb3544..671d92d27633 100644
--- a/x11-drivers/xf86-video-modesetting/xf86-video-modesetting-0.5.0.ebuild
+++ b/x11-drivers/xf86-video-modesetting/xf86-video-modesetting-0.5.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-modesetting/xf86-video-modesetting-0.5.0.ebuild,v 1.6 2012/12/17 20:16:41 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-modesetting/xf86-video-modesetting-0.5.0.ebuild,v 1.8 2012/12/28 17:39:44 ago Exp $
 
 EAPI=4
 
@@ -8,5 +8,5 @@ inherit xorg-2
 
 DESCRIPTION="Unaccelerated generic driver for kernel modesetting"
 
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
diff --git a/x11-drivers/xf86-video-neomagic/xf86-video-neomagic-1.2.7.ebuild b/x11-drivers/xf86-video-neomagic/xf86-video-neomagic-1.2.7.ebuild
index c939a1999f61..68b2b2300e79 100644
--- a/x11-drivers/xf86-video-neomagic/xf86-video-neomagic-1.2.7.ebuild
+++ b/x11-drivers/xf86-video-neomagic/xf86-video-neomagic-1.2.7.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-neomagic/xf86-video-neomagic-1.2.7.ebuild,v 1.4 2012/11/18 12:17:27 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-neomagic/xf86-video-neomagic-1.2.7.ebuild,v 1.5 2012/12/28 11:19:36 ago Exp $
 
 EAPI=4
 inherit xorg-2
 
 DESCRIPTION="Neomagic video driver"
-KEYWORDS="amd64 ~ia64 x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="amd64 ia64 x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND="<x11-base/xorg-server-1.12.99"
diff --git a/x11-drivers/xf86-video-nv/xf86-video-nv-2.1.20.ebuild b/x11-drivers/xf86-video-nv/xf86-video-nv-2.1.20.ebuild
index 25062040d1e8..73598bdab157 100644
--- a/x11-drivers/xf86-video-nv/xf86-video-nv-2.1.20.ebuild
+++ b/x11-drivers/xf86-video-nv/xf86-video-nv-2.1.20.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-nv/xf86-video-nv-2.1.20.ebuild,v 1.6 2012/12/08 17:11:46 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-nv/xf86-video-nv-2.1.20.ebuild,v 1.7 2012/12/28 11:20:29 ago Exp $
 
 EAPI=4
 inherit xorg-2
 
 DESCRIPTION="Nvidia 2D only video driver"
 
-KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND="x11-base/xorg-server
diff --git a/x11-drivers/xf86-video-r128/xf86-video-r128-6.9.1.ebuild b/x11-drivers/xf86-video-r128/xf86-video-r128-6.9.1.ebuild
index bf1d88613281..fa13a6443781 100644
--- a/x11-drivers/xf86-video-r128/xf86-video-r128-6.9.1.ebuild
+++ b/x11-drivers/xf86-video-r128/xf86-video-r128-6.9.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-r128/xf86-video-r128-6.9.1.ebuild,v 1.5 2012/12/08 17:12:11 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-r128/xf86-video-r128-6.9.1.ebuild,v 1.7 2012/12/28 17:40:05 ago Exp $
 
 EAPI=4
 XORG_DRI=dri
@@ -8,7 +8,7 @@ inherit xorg-2
 
 DESCRIPTION="ATI Rage128 video driver"
 
-KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="dri"
 
 RDEPEND=">=x11-base/xorg-server-1.2"
diff --git a/x11-drivers/xf86-video-rendition/xf86-video-rendition-4.2.5.ebuild b/x11-drivers/xf86-video-rendition/xf86-video-rendition-4.2.5.ebuild
index c7d0f8e18282..bca39482c013 100644
--- a/x11-drivers/xf86-video-rendition/xf86-video-rendition-4.2.5.ebuild
+++ b/x11-drivers/xf86-video-rendition/xf86-video-rendition-4.2.5.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-rendition/xf86-video-rendition-4.2.5.ebuild,v 1.4 2012/11/18 12:19:22 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-rendition/xf86-video-rendition-4.2.5.ebuild,v 1.5 2012/12/28 11:22:13 ago Exp $
 
 EAPI=4
 inherit xorg-2
 
 DESCRIPTION="Rendition video driver"
-KEYWORDS="~alpha amd64 ~ia64 x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ia64 x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=x11-base/xorg-server-1.0.99"
diff --git a/x11-drivers/xf86-video-s3/xf86-video-s3-0.6.5.ebuild b/x11-drivers/xf86-video-s3/xf86-video-s3-0.6.5.ebuild
index b50bdad45278..dafbd6f11c9a 100644
--- a/x11-drivers/xf86-video-s3/xf86-video-s3-0.6.5.ebuild
+++ b/x11-drivers/xf86-video-s3/xf86-video-s3-0.6.5.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-s3/xf86-video-s3-0.6.5.ebuild,v 1.4 2012/11/28 21:40:47 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-s3/xf86-video-s3-0.6.5.ebuild,v 1.5 2012/12/28 11:23:03 ago Exp $
 
 EAPI=4
 inherit xorg-2
 
 DESCRIPTION="X.Org driver for s3 cards"
 
-KEYWORDS="~alpha amd64 ~ia64 ppc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ia64 ppc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=x11-base/xorg-server-1.0.99"
diff --git a/x11-drivers/xf86-video-s3virge/xf86-video-s3virge-1.10.6.ebuild b/x11-drivers/xf86-video-s3virge/xf86-video-s3virge-1.10.6.ebuild
index 8debcd091879..09a0c3e125a0 100644
--- a/x11-drivers/xf86-video-s3virge/xf86-video-s3virge-1.10.6.ebuild
+++ b/x11-drivers/xf86-video-s3virge/xf86-video-s3virge-1.10.6.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-s3virge/xf86-video-s3virge-1.10.6.ebuild,v 1.4 2012/11/28 21:41:09 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-s3virge/xf86-video-s3virge-1.10.6.ebuild,v 1.5 2012/12/28 11:23:54 ago Exp $
 
 EAPI=4
 inherit xorg-2
 
 DESCRIPTION="S3 ViRGE video driver"
 
-KEYWORDS="~alpha amd64 ~ia64 ppc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ia64 ppc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=x11-base/xorg-server-1.0.99"
diff --git a/x11-drivers/xf86-video-savage/Manifest b/x11-drivers/xf86-video-savage/Manifest
index 452f7b839925..b9ad0608550f 100644
--- a/x11-drivers/xf86-video-savage/Manifest
+++ b/x11-drivers/xf86-video-savage/Manifest
@@ -1,4 +1,4 @@
 DIST xf86-video-savage-2.3.3.tar.bz2 371252 SHA256 d3854d375dbf7d83bf90e30d72837ce60d808119c6fa4bb98088e68e7cc7e7b2 SHA512 451de714f46bf945cc099c12e30109f4c17954109d538506e7d31de4e0e838ac9f94e6aff219b58c20ed7790c6bbf8c8e44d2d4b75ce2c6dce8085860da799ee WHIRLPOOL 77f8ae013453cf8710b6edb1973c72d995a9f4a3bea02d31c75e2f488d2f3e0717cfbb1a4605c5d7131ae43252fb66bbee0b74ceae0594bdcc5dc45bc107cc04
-DIST xf86-video-savage-2.3.4.tar.bz2 392823 SHA256 3a666a66339686ad4dd85b0665cc300e8a7fc6d38b49a9e8e8d48f393627be49
+DIST xf86-video-savage-2.3.4.tar.bz2 392823 SHA256 3a666a66339686ad4dd85b0665cc300e8a7fc6d38b49a9e8e8d48f393627be49 SHA512 dcd2809ff587f5d9408452bee4bcdf53c9e1405722348141862a6e4693db50a0a7f431013eecc0809676e0e04ddbcd801613fdd7f16df07aafda98ed98113409 WHIRLPOOL 98e6e6d72bbbf31bd69095fbd90bab835dcfe4af89991295b2836463b169791e52eb1ee48c9d734f202483e3ea6643513d634190c7af6040866f32827d65c823
 DIST xf86-video-savage-2.3.5.tar.bz2 399364 SHA256 4b5b52aad9413a9d8717ff0aa3290d110dd5cdb5c93eebda4a5fff1c5ccf63e4 SHA512 370109859b66e093638771dc7eec9d8b0b5dc26a4e05933db496f01e058e252a9642f570d192e1baa47802637a44e799a275ac845e7731135a703f5e9b580c39 WHIRLPOOL b4d382ca0ae978f2226a1ee435ca7f2973b76fa287d671b29ae46492baac87a36205b2ba1f93e75960326292465686c982ce492ca096a74738b2576d50b4c71c
 DIST xf86-video-savage-2.3.6.tar.bz2 403495 SHA256 48813ed8f4a08858e8c2466fd2dc810ea31f86842025fa39ec949d44f9ad63d6 SHA512 397a056e9b65dad9b2b47f08b6b58cc32b7dc7a65b57d3c5a93b5afe0a4fc414b587fd5d262db7e16214a3d8c60cd04aecfdf3041b80673d463b925af7bb4420 WHIRLPOOL 6e7bd26bf4bb67b82c21e690edb91327a40a6edcaa4faa8d4f79302636ec0836c8f1d663ec527890cf5e7120aee803d4baa4c79b087cfd6d2eb3d48a67c08b62
diff --git a/x11-drivers/xf86-video-savage/xf86-video-savage-2.3.6.ebuild b/x11-drivers/xf86-video-savage/xf86-video-savage-2.3.6.ebuild
index eb3ccc604cb9..c18453531457 100644
--- a/x11-drivers/xf86-video-savage/xf86-video-savage-2.3.6.ebuild
+++ b/x11-drivers/xf86-video-savage/xf86-video-savage-2.3.6.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-savage/xf86-video-savage-2.3.6.ebuild,v 1.5 2012/11/28 21:41:32 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-savage/xf86-video-savage-2.3.6.ebuild,v 1.7 2012/12/28 17:40:25 ago Exp $
 
 EAPI=4
 XORG_DRI=dri
 inherit xorg-2
 
 DESCRIPTION="S3 Savage video driver"
-KEYWORDS="~alpha amd64 ~ia64 ppc ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ia64 ppc sparc x86 ~amd64-fbsd ~x86-fbsd"
 
 IUSE="dri"
 RDEPEND=">=x11-base/xorg-server-1.0.99"
diff --git a/x11-drivers/xf86-video-sis/xf86-video-sis-0.10.7.ebuild b/x11-drivers/xf86-video-sis/xf86-video-sis-0.10.7.ebuild
index 218b59658228..bca46b7fdd33 100644
--- a/x11-drivers/xf86-video-sis/xf86-video-sis-0.10.7.ebuild
+++ b/x11-drivers/xf86-video-sis/xf86-video-sis-0.10.7.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-sis/xf86-video-sis-0.10.7.ebuild,v 1.4 2012/11/28 21:41:55 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-sis/xf86-video-sis-0.10.7.ebuild,v 1.5 2012/12/28 11:25:39 ago Exp $
 
 EAPI=4
 XORG_DRI=dri
 inherit xorg-2
 
 DESCRIPTION="SiS and XGI video driver"
-KEYWORDS="amd64 ~ia64 ppc x86 ~x86-fbsd"
+KEYWORDS="amd64 ia64 ppc x86 ~x86-fbsd"
 IUSE="dri"
 
 DEPEND=">=x11-proto/xf86dgaproto-2.1"
diff --git a/x11-drivers/xf86-video-sisusb/xf86-video-sisusb-0.9.6.ebuild b/x11-drivers/xf86-video-sisusb/xf86-video-sisusb-0.9.6.ebuild
index 6fdff29dbc60..e93e1c45a8f1 100644
--- a/x11-drivers/xf86-video-sisusb/xf86-video-sisusb-0.9.6.ebuild
+++ b/x11-drivers/xf86-video-sisusb/xf86-video-sisusb-0.9.6.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-sisusb/xf86-video-sisusb-0.9.6.ebuild,v 1.6 2012/12/17 20:18:15 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-sisusb/xf86-video-sisusb-0.9.6.ebuild,v 1.8 2012/12/28 17:40:46 ago Exp $
 
 EAPI=4
 
 inherit xorg-2
 
 DESCRIPTION="SiS USB video driver"
-KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 ~sh ~sparc x86"
+KEYWORDS="~alpha amd64 arm ia64 ppc ppc64 ~sh sparc x86"
 IUSE=""
 
 RDEPEND=">=x11-base/xorg-server-1.6"
diff --git a/x11-drivers/xf86-video-tdfx/Manifest b/x11-drivers/xf86-video-tdfx/Manifest
index d156b18ada19..d20c3a6e2c6c 100644
--- a/x11-drivers/xf86-video-tdfx/Manifest
+++ b/x11-drivers/xf86-video-tdfx/Manifest
@@ -1,3 +1,3 @@
 DIST xf86-video-tdfx-1.4.3.tar.bz2 290172 SHA256 3ad935ca0aa306d10d1e6125a6bd485a3948c184dcfda01670961dc4740ebf33 SHA512 de40482421c7d0b404ec81c6dda8627cbffefedf2c1615403e503aa8a330f77063a37316201f9688f042760f6c29bfd53ee0383fccef09fd7770df23e7194f49 WHIRLPOOL f9a93064b5b36cc66c0ee69b82c946c4cb1b39845d8e10d69fe51c241bb995af8e7d618358bf2c6210c4b628551b500bb7980723ca94a65a0dc65270d669b32b
-DIST xf86-video-tdfx-1.4.4.tar.bz2 338767 SHA256 e0b931dea0fb1ebfaa628a3dc07bf6945b377d3f7bbfd3a43ca4c80c46d48f88
+DIST xf86-video-tdfx-1.4.4.tar.bz2 338767 SHA256 e0b931dea0fb1ebfaa628a3dc07bf6945b377d3f7bbfd3a43ca4c80c46d48f88 SHA512 81a2da966263798062e88022b8cf9dc38a6ee7b35dbe23c4e6958eef1c6b99f677e112604329285729bc01ac6caddd48164662446e6a0caf2e39a4550dcfe067 WHIRLPOOL 8ef0d1092bc4124450e0f0a1af202afc52b3b66011af59953db587a37de395e414e336e7ad23af77bbfacaf6ed0ba5f0cdec26c78ff61b3f1c07c126831a1cd0
 DIST xf86-video-tdfx-1.4.5.tar.bz2 339623 SHA256 70d5fbadfb60fc25e4f90f2a1aad258f64fa3953efbc1059103a8d845870d859 SHA512 721f487fe2f08c51fe4622bbbbdbf5c2b8f078f811e18d03e707fd2ab121a8e0a95165934e1567f4280e2613e94fdf5dd35c6c6ddd1ff935a07cfbb485670555 WHIRLPOOL 58f1e98299041994cac12acf5cdd1e0241cad107645d1275d2f8e8c08838fc229684ac22689313cb43f8eafb622e9f98b6cb599e3f9451e8fac89411ffef9e7f
diff --git a/x11-drivers/xf86-video-tdfx/xf86-video-tdfx-1.4.5.ebuild b/x11-drivers/xf86-video-tdfx/xf86-video-tdfx-1.4.5.ebuild
index 8d2f43cc51d5..f7964ec164f3 100644
--- a/x11-drivers/xf86-video-tdfx/xf86-video-tdfx-1.4.5.ebuild
+++ b/x11-drivers/xf86-video-tdfx/xf86-video-tdfx-1.4.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-tdfx/xf86-video-tdfx-1.4.5.ebuild,v 1.4 2012/11/28 21:42:41 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-tdfx/xf86-video-tdfx-1.4.5.ebuild,v 1.6 2012/12/28 17:41:05 ago Exp $
 
 EAPI=4
 XORG_DRI=dri
@@ -8,7 +8,7 @@ XORG_DRI=dri
 inherit xorg-2
 
 DESCRIPTION="3Dfx video driver"
-KEYWORDS="~alpha amd64 ~ia64 ppc ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ia64 ppc sparc x86 ~x86-fbsd"
 IUSE="dri"
 
 RDEPEND=">=x11-base/xorg-server-1.0.99"
diff --git a/x11-drivers/xf86-video-tga/xf86-video-tga-1.2.2.ebuild b/x11-drivers/xf86-video-tga/xf86-video-tga-1.2.2.ebuild
index 790c8aa9a6c8..c5bf0299c010 100644
--- a/x11-drivers/xf86-video-tga/xf86-video-tga-1.2.2.ebuild
+++ b/x11-drivers/xf86-video-tga/xf86-video-tga-1.2.2.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-tga/xf86-video-tga-1.2.2.ebuild,v 1.3 2012/11/18 12:21:46 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-tga/xf86-video-tga-1.2.2.ebuild,v 1.4 2012/12/28 11:28:12 ago Exp $
 
 EAPI=4
 inherit xorg-2
 
 DESCRIPTION="X.Org driver for tga cards"
-KEYWORDS="~alpha amd64 ~ia64 x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ia64 x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=x11-base/xorg-server-1.0.99"
diff --git a/x11-drivers/xf86-video-trident/xf86-video-trident-1.3.6-r1.ebuild b/x11-drivers/xf86-video-trident/xf86-video-trident-1.3.6-r1.ebuild
index 2f130bc5def4..8beed83248df 100644
--- a/x11-drivers/xf86-video-trident/xf86-video-trident-1.3.6-r1.ebuild
+++ b/x11-drivers/xf86-video-trident/xf86-video-trident-1.3.6-r1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-trident/xf86-video-trident-1.3.6-r1.ebuild,v 1.1 2012/12/25 16:09:45 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-trident/xf86-video-trident-1.3.6-r1.ebuild,v 1.2 2012/12/28 11:29:01 ago Exp $
 
 EAPI=4
 inherit xorg-2
 
 DESCRIPTION="Trident video driver"
-KEYWORDS="~amd64 ~ia64 ~ppc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~amd64 ia64 ~ppc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=x11-base/xorg-server-1.0.99"
diff --git a/x11-drivers/xf86-video-tseng/xf86-video-tseng-1.2.5.ebuild b/x11-drivers/xf86-video-tseng/xf86-video-tseng-1.2.5.ebuild
index 65be8f43be28..e1e0c22e627f 100644
--- a/x11-drivers/xf86-video-tseng/xf86-video-tseng-1.2.5.ebuild
+++ b/x11-drivers/xf86-video-tseng/xf86-video-tseng-1.2.5.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-tseng/xf86-video-tseng-1.2.5.ebuild,v 1.4 2012/11/18 12:22:17 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-tseng/xf86-video-tseng-1.2.5.ebuild,v 1.5 2012/12/28 11:29:41 ago Exp $
 
 EAPI=4
 inherit xorg-2
 
 DESCRIPTION="Tseng Labs video driver"
-KEYWORDS="amd64 ~ia64 x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="amd64 ia64 x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=x11-base/xorg-server-1.0.99"
diff --git a/x11-drivers/xf86-video-vesa/xf86-video-vesa-2.3.2.ebuild b/x11-drivers/xf86-video-vesa/xf86-video-vesa-2.3.2.ebuild
index 386a05835142..49e572f09f60 100644
--- a/x11-drivers/xf86-video-vesa/xf86-video-vesa-2.3.2.ebuild
+++ b/x11-drivers/xf86-video-vesa/xf86-video-vesa-2.3.2.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-vesa/xf86-video-vesa-2.3.2.ebuild,v 1.4 2012/11/18 12:22:32 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-vesa/xf86-video-vesa-2.3.2.ebuild,v 1.5 2012/12/28 11:30:26 ago Exp $
 
 EAPI=4
 inherit xorg-2
 
 DESCRIPTION="Generic VESA video driver"
-KEYWORDS="-* ~alpha amd64 ~ia64 x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="-* ~alpha amd64 ia64 x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=x11-base/xorg-server-1.0.99
diff --git a/x11-drivers/xf86-video-voodoo/xf86-video-voodoo-1.2.5.ebuild b/x11-drivers/xf86-video-voodoo/xf86-video-voodoo-1.2.5.ebuild
index ef829c495b76..dab01e8da420 100644
--- a/x11-drivers/xf86-video-voodoo/xf86-video-voodoo-1.2.5.ebuild
+++ b/x11-drivers/xf86-video-voodoo/xf86-video-voodoo-1.2.5.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-voodoo/xf86-video-voodoo-1.2.5.ebuild,v 1.4 2012/11/28 21:43:24 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-voodoo/xf86-video-voodoo-1.2.5.ebuild,v 1.6 2012/12/28 17:41:23 ago Exp $
 
 EAPI=4
 inherit xorg-2
 
 DESCRIPTION="Voodoo video driver"
-KEYWORDS="~alpha amd64 ~ia64 ppc ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ia64 ppc sparc x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=x11-base/xorg-server-1.0.99"
diff --git a/x11-libs/cairo/cairo-1.10.2-r3.ebuild b/x11-libs/cairo/cairo-1.10.2-r3.ebuild
index da12aa015fab..ebdab73b11cb 100644
--- a/x11-libs/cairo/cairo-1.10.2-r3.ebuild
+++ b/x11-libs/cairo/cairo-1.10.2-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.10.2-r3.ebuild,v 1.7 2012/12/17 20:24:43 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.10.2-r3.ebuild,v 1.9 2012/12/28 17:41:51 ago Exp $
 
 EAPI=3
 
@@ -15,7 +15,7 @@ HOMEPAGE="http://cairographics.org/"
 
 LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
 SLOT="0"
-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 ~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-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="X aqua debug directfb doc drm gallium +glib opengl openvg qt4 static-libs +svg xcb"
 
 # Test causes a circular depend on gtk+... since gtk+ needs cairo but test needs gtk+ so we need to block it
diff --git a/x11-libs/glamor/glamor-0.5.ebuild b/x11-libs/glamor/glamor-0.5.ebuild
index b62c29dd6bec..ee57029d5eff 100644
--- a/x11-libs/glamor/glamor-0.5.ebuild
+++ b/x11-libs/glamor/glamor-0.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/glamor/glamor-0.5.ebuild,v 1.6 2012/12/08 17:13:27 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/glamor/glamor-0.5.ebuild,v 1.8 2012/12/28 17:42:10 ago Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ inherit xorg-2
 DESCRIPTION="OpenGL based 2D rendering acceleration library"
 SRC_URI="mirror://gentoo/${P}.tar.gz"
 
-KEYWORDS="amd64 ~ia64 ppc ppc64 x86"
+KEYWORDS="amd64 ia64 ppc ppc64 sparc x86"
 IUSE="gles"
 
 RDEPEND=">=x11-base/xorg-server-1.10
diff --git a/x11-libs/libXaw/libXaw-1.0.11-r1.ebuild b/x11-libs/libXaw/libXaw-1.0.11-r1.ebuild
index 897ccfee5ce2..90fa7658c374 100644
--- a/x11-libs/libXaw/libXaw-1.0.11-r1.ebuild
+++ b/x11-libs/libXaw/libXaw-1.0.11-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXaw/libXaw-1.0.11-r1.ebuild,v 1.7 2012/12/17 20:25:58 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXaw/libXaw-1.0.11-r1.ebuild,v 1.9 2012/12/28 17:42:32 ago Exp $
 
 EAPI=4
 
@@ -9,7 +9,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Xaw library"
 
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~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 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="deprecated"
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-libs/libXfont/libXfont-1.4.5-r1.ebuild b/x11-libs/libXfont/libXfont-1.4.5-r1.ebuild
index ea4c6125f618..3ffca7ae8321 100644
--- a/x11-libs/libXfont/libXfont-1.4.5-r1.ebuild
+++ b/x11-libs/libXfont/libXfont-1.4.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXfont/libXfont-1.4.5-r1.ebuild,v 1.6 2012/12/17 20:27:11 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXfont/libXfont-1.4.5-r1.ebuild,v 1.8 2012/12/28 17:42:54 ago Exp $
 
 EAPI=4
 
@@ -9,7 +9,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Xfont library"
 
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 ipv6 truetype"
 
 RDEPEND="x11-libs/xtrans
diff --git a/x11-libs/libXrandr/libXrandr-1.4.0.ebuild b/x11-libs/libXrandr/libXrandr-1.4.0.ebuild
index b82c56f0ad33..d07dfc225460 100644
--- a/x11-libs/libXrandr/libXrandr-1.4.0.ebuild
+++ b/x11-libs/libXrandr/libXrandr-1.4.0.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXrandr/libXrandr-1.4.0.ebuild,v 1.6 2012/12/17 20:28:22 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXrandr/libXrandr-1.4.0.ebuild,v 1.8 2012/12/28 17:43:15 ago Exp $
 
 EAPI=4
 inherit xorg-2
 
 DESCRIPTION="X.Org Xrandr library"
 
-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 ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+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 ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-libs/libdrm/libdrm-2.4.40.ebuild b/x11-libs/libdrm/libdrm-2.4.40.ebuild
index 92dadd89f436..cd8d178c19d8 100644
--- a/x11-libs/libdrm/libdrm-2.4.40.ebuild
+++ b/x11-libs/libdrm/libdrm-2.4.40.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdrm/libdrm-2.4.40.ebuild,v 1.7 2012/12/17 20:00:54 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdrm/libdrm-2.4.40.ebuild,v 1.9 2012/12/28 17:43:41 ago Exp $
 
 EAPI=4
 inherit xorg-2
@@ -15,7 +15,7 @@ else
 	SRC_URI="http://dri.freedesktop.org/${PN}/${P}.tar.bz2"
 fi
 
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 VIDEO_CARDS="exynos intel nouveau omap radeon vmware"
 for card in ${VIDEO_CARDS}; do
 	IUSE_VIDEO_CARDS+=" video_cards_${card}"
diff --git a/x11-libs/libxcb/libxcb-1.9.ebuild b/x11-libs/libxcb/libxcb-1.9.ebuild
index 62d415e7744b..934b7f81322b 100644
--- a/x11-libs/libxcb/libxcb-1.9.ebuild
+++ b/x11-libs/libxcb/libxcb-1.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxcb/libxcb-1.9.ebuild,v 1.6 2012/12/17 20:29:40 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxcb/libxcb-1.9.ebuild,v 1.8 2012/12/28 17:44:04 ago Exp $
 
 EAPI=4
 
@@ -13,7 +13,7 @@ EGIT_REPO_URI="git://anongit.freedesktop.org/git/xcb/libxcb"
 [[ ${PV} != 9999* ]] && \
 	SRC_URI="http://xcb.freedesktop.org/dist/${P}.tar.bz2"
 
-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 ~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-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="selinux"
 
 RDEPEND="dev-libs/libpthread-stubs
diff --git a/x11-libs/pango/pango-1.32.5.ebuild b/x11-libs/pango/pango-1.32.5.ebuild
index 66ccaa0e3481..11456d868814 100644
--- a/x11-libs/pango/pango-1.32.5.ebuild
+++ b/x11-libs/pango/pango-1.32.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.32.5.ebuild,v 1.3 2012/12/24 04:07:33 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.32.5.ebuild,v 1.4 2012/12/28 13:47:01 grobian Exp $
 
 EAPI="5"
 GCONF_DEBUG="yes"
@@ -52,7 +52,7 @@ src_prepare() {
 src_install() {
 	gnome2_src_install
 
-	local PANGO_CONFDIR="${EROOT}/etc/pango/${CHOST}"
+	local PANGO_CONFDIR="/etc/pango/${CHOST}"
 	dodir "${PANGO_CONFDIR}"
 	keepdir "${PANGO_CONFDIR}"
 }
diff --git a/x11-libs/pixman/pixman-0.28.0.ebuild b/x11-libs/pixman/pixman-0.28.0.ebuild
index b6c94f8f1260..8c60e4a1b7a7 100644
--- a/x11-libs/pixman/pixman-0.28.0.ebuild
+++ b/x11-libs/pixman/pixman-0.28.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/pixman/pixman-0.28.0.ebuild,v 1.6 2012/12/17 20:30:57 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pixman/pixman-0.28.0.ebuild,v 1.8 2012/12/28 17:44:28 ago Exp $
 
 EAPI=4
 inherit xorg-2 toolchain-funcs versionator
@@ -8,7 +8,7 @@ inherit xorg-2 toolchain-funcs versionator
 EGIT_REPO_URI="git://anongit.freedesktop.org/git/pixman"
 DESCRIPTION="Low-level pixel manipulation routines"
 
-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 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+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 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="altivec iwmmxt mmx neon sse2"
 
 src_configure() {
diff --git a/x11-misc/e16keyedit/Manifest b/x11-misc/e16keyedit/Manifest
index b4525bba04da..6b68a9c51f2a 100644
--- a/x11-misc/e16keyedit/Manifest
+++ b/x11-misc/e16keyedit/Manifest
@@ -1,3 +1,3 @@
-DIST e16keyedit-0.4.tar.gz 80061 RMD160 5b31d2be371ac1822113249572f13757d2f89916 SHA1 fc23eae97a5b7b7e361683bf725f4c9a290a3f8d SHA256 04a68fbd6f6675c3cc3565319f2f137781291055e9bd266793bb9c6dd7a4fb24
-DIST e16keyedit-0.6.tar.gz 86141 RMD160 037677e390eba8947af8326d066c27c840974bb6 SHA1 bb10ef05494d68309814defd148c1a1139a6f6a5 SHA256 50d9c8bdd066ea5b45fea2e3ec6a2d137d9a09276fdba3300da9861241f45757
-DIST e16keyedit-0.7.tar.gz 88323 RMD160 03fcb313f050ad7846c9479400929675c3aefbce SHA1 a824f90a72845db8411b6bb8a012e8be6a57317d SHA256 8f9aa35ca5355f7a5bee04f4cced0922ed0f690be2d10f5a8e39680e391c09a2
+DIST e16keyedit-0.4.tar.gz 80061 SHA256 04a68fbd6f6675c3cc3565319f2f137781291055e9bd266793bb9c6dd7a4fb24
+DIST e16keyedit-0.6.tar.gz 86141 SHA256 50d9c8bdd066ea5b45fea2e3ec6a2d137d9a09276fdba3300da9861241f45757
+DIST e16keyedit-0.7.tar.gz 88323 SHA256 8f9aa35ca5355f7a5bee04f4cced0922ed0f690be2d10f5a8e39680e391c09a2
diff --git a/x11-misc/e16keyedit/e16keyedit-0.4.ebuild b/x11-misc/e16keyedit/e16keyedit-0.4.ebuild
index 3710c09d6771..4e207242f3fe 100644
--- a/x11-misc/e16keyedit/e16keyedit-0.4.ebuild
+++ b/x11-misc/e16keyedit/e16keyedit-0.4.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/e16keyedit/e16keyedit-0.4.ebuild,v 1.4 2012/05/05 04:53:48 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/e16keyedit/e16keyedit-0.4.ebuild,v 1.5 2012/12/28 18:05:50 ulm Exp $
 
 DESCRIPTION="Key binding editor for enlightenment 16"
 HOMEPAGE="http://www.enlightenment.org/"
 SRC_URI="mirror://sourceforge/enlightenment/e16utils/${P}.tar.gz"
 
-LICENSE="as-is"
+LICENSE="MIT-with-advertising"
 SLOT="0"
 KEYWORDS="amd64 ppc sparc x86"
 IUSE=""
diff --git a/x11-misc/e16keyedit/e16keyedit-0.6.ebuild b/x11-misc/e16keyedit/e16keyedit-0.6.ebuild
index 8161603383c9..479f904171ce 100644
--- a/x11-misc/e16keyedit/e16keyedit-0.6.ebuild
+++ b/x11-misc/e16keyedit/e16keyedit-0.6.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/e16keyedit/e16keyedit-0.6.ebuild,v 1.6 2012/05/05 04:53:48 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/e16keyedit/e16keyedit-0.6.ebuild,v 1.7 2012/12/28 18:05:50 ulm Exp $
 
 DESCRIPTION="Key binding editor for enlightenment 16"
 HOMEPAGE="http://www.enlightenment.org/"
 SRC_URI="mirror://sourceforge/enlightenment/${P}.tar.gz"
 
-LICENSE="as-is"
+LICENSE="MIT-with-advertising"
 SLOT="0"
 KEYWORDS="amd64 ppc sparc x86"
 IUSE=""
diff --git a/x11-misc/e16keyedit/e16keyedit-0.7.ebuild b/x11-misc/e16keyedit/e16keyedit-0.7.ebuild
index 29fdae2f1769..4254d45fa81d 100644
--- a/x11-misc/e16keyedit/e16keyedit-0.7.ebuild
+++ b/x11-misc/e16keyedit/e16keyedit-0.7.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/e16keyedit/e16keyedit-0.7.ebuild,v 1.2 2012/05/05 04:53:48 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/e16keyedit/e16keyedit-0.7.ebuild,v 1.3 2012/12/28 18:05:50 ulm Exp $
 
 DESCRIPTION="Key binding editor for enlightenment 16"
 HOMEPAGE="http://www.enlightenment.org/"
 SRC_URI="mirror://sourceforge/enlightenment/${P}.tar.gz"
 
-LICENSE="as-is"
+LICENSE="MIT-with-advertising"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE=""
diff --git a/x11-misc/e16menuedit2/Manifest b/x11-misc/e16menuedit2/Manifest
index 69a2946fba9e..30451695ba44 100644
--- a/x11-misc/e16menuedit2/Manifest
+++ b/x11-misc/e16menuedit2/Manifest
@@ -1 +1 @@
-DIST e16menuedit2-0.0.3.tar.gz 370740 RMD160 008059b51bc5b90c61200c3fe12d2e2034af6aaa SHA1 7bfd9878f9230671e22f327ee7b3965ac4192944 SHA256 9a290f13f25b3fbce6d446cbc136933d981926b1da59c84cfac7f3690606b5a5
+DIST e16menuedit2-0.0.3.tar.gz 370740 SHA256 9a290f13f25b3fbce6d446cbc136933d981926b1da59c84cfac7f3690606b5a5
diff --git a/x11-misc/e16menuedit2/e16menuedit2-0.0.3.ebuild b/x11-misc/e16menuedit2/e16menuedit2-0.0.3.ebuild
index 33babc162f3c..8021287e2bc1 100644
--- a/x11-misc/e16menuedit2/e16menuedit2-0.0.3.ebuild
+++ b/x11-misc/e16menuedit2/e16menuedit2-0.0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/e16menuedit2/e16menuedit2-0.0.3.ebuild,v 1.10 2012/05/05 04:53:52 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/e16menuedit2/e16menuedit2-0.0.3.ebuild,v 1.11 2012/12/28 18:07:01 ulm Exp $
 
 inherit gnome2 eutils
 
@@ -8,7 +8,7 @@ DESCRIPTION="Menu editor for enlightenment DR16 written in GTK2"
 HOMEPAGE="http://www.enlightenment.org/"
 SRC_URI="mirror://sourceforge/enlightenment/${P}.tar.gz"
 
-LICENSE="as-is"
+LICENSE="MIT-with-advertising"
 SLOT="0"
 KEYWORDS="amd64 arm ~ppc sh sparc x86"
 IUSE=""
diff --git a/x11-misc/xfe/xfe-1.33.ebuild b/x11-misc/xfe/xfe-1.33.ebuild
index eb00fdb6aeba..c8e1395aff4e 100644
--- a/x11-misc/xfe/xfe-1.33.ebuild
+++ b/x11-misc/xfe/xfe-1.33.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xfe/xfe-1.33.ebuild,v 1.4 2012/12/26 01:46:38 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xfe/xfe-1.33.ebuild,v 1.5 2012/12/28 11:09:50 ago Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ppc ppc64 ~sparc x86"
 IUSE="debug nls startup-notification"
 
 XFELINGUAS="
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.7.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.7.ebuild
index 2aa9c567185f..a56fe4d17f7a 100644
--- a/x11-misc/xkeyboard-config/xkeyboard-config-2.7.ebuild
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkeyboard-config/xkeyboard-config-2.7.ebuild,v 1.6 2012/12/17 20:32:16 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkeyboard-config/xkeyboard-config-2.7.ebuild,v 1.8 2012/12/28 17:44:52 ago Exp $
 
 EAPI=4
 
@@ -13,7 +13,7 @@ DESCRIPTION="X keyboard configuration database"
 HOMEPAGE="http://www.freedesktop.org/wiki/Software/XKeyboardConfig"
 [[ ${PV} == *9999* ]] || SRC_URI="${XORG_BASE_INDIVIDUAL_URI}/data/${PN}/${P}.tar.bz2"
 
-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 ~x86-macos ~sparc-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 ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 LICENSE="MIT"
diff --git a/x11-proto/dri2proto/dri2proto-2.8.ebuild b/x11-proto/dri2proto/dri2proto-2.8.ebuild
index 89771232a014..dab6ee9c5284 100644
--- a/x11-proto/dri2proto/dri2proto-2.8.ebuild
+++ b/x11-proto/dri2proto/dri2proto-2.8.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-proto/dri2proto/dri2proto-2.8.ebuild,v 1.6 2012/12/17 20:33:24 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-proto/dri2proto/dri2proto-2.8.ebuild,v 1.8 2012/12/28 17:45:13 ago Exp $
 
 EAPI=4
 inherit xorg-2
 
 DESCRIPTION="X.Org DRI2 protocol headers"
 
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=""
diff --git a/x11-proto/randrproto/randrproto-1.4.0.ebuild b/x11-proto/randrproto/randrproto-1.4.0.ebuild
index f616c9f20361..1716e2f79abe 100644
--- a/x11-proto/randrproto/randrproto-1.4.0.ebuild
+++ b/x11-proto/randrproto/randrproto-1.4.0.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-proto/randrproto/randrproto-1.4.0.ebuild,v 1.6 2012/12/17 20:34:32 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-proto/randrproto/randrproto-1.4.0.ebuild,v 1.8 2012/12/28 17:45:33 ago Exp $
 
 EAPI=4
 inherit xorg-2
 
 DESCRIPTION="X.Org Randr protocol headers"
 
-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 ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+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 ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND=""
diff --git a/x11-proto/xcb-proto/xcb-proto-1.8.ebuild b/x11-proto/xcb-proto/xcb-proto-1.8.ebuild
index 7ffa2f36b293..dfeffd9fe4ee 100644
--- a/x11-proto/xcb-proto/xcb-proto-1.8.ebuild
+++ b/x11-proto/xcb-proto/xcb-proto-1.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-proto/xcb-proto/xcb-proto-1.8.ebuild,v 1.6 2012/12/17 20:35:46 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-proto/xcb-proto/xcb-proto-1.8.ebuild,v 1.8 2012/12/28 17:45:54 ago Exp $
 
 EAPI=4
 PYTHON_DEPEND="*"
@@ -13,7 +13,7 @@ EGIT_REPO_URI="git://anongit.freedesktop.org/git/xcb/proto"
 [[ ${PV} != 9999* ]] && \
 	SRC_URI="http://xcb.freedesktop.org/dist/${P}.tar.bz2"
 
-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 ~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-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=""
diff --git a/x11-terms/xterm/xterm-285.ebuild b/x11-terms/xterm/xterm-285.ebuild
index 6bb2504a484c..b5eb25362c53 100644
--- a/x11-terms/xterm/xterm-285.ebuild
+++ b/x11-terms/xterm/xterm-285.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/xterm/xterm-285.ebuild,v 1.6 2012/12/17 20:37:02 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/xterm/xterm-285.ebuild,v 1.8 2012/12/28 17:46:19 ago Exp $
 
 EAPI=4
 inherit eutils multilib
@@ -11,7 +11,7 @@ SRC_URI="ftp://invisible-island.net/${PN}/${P}.tgz"
 
 LICENSE="MIT"
 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="toolbar truetype unicode Xaw3d"
 
 COMMON_DEPEND="kernel_linux? ( sys-libs/libutempter )
diff --git a/x11-themes/gdm-themes/Manifest b/x11-themes/gdm-themes/Manifest
index 9b4a8620e8f2..fb97d663d493 100644
--- a/x11-themes/gdm-themes/Manifest
+++ b/x11-themes/gdm-themes/Manifest
@@ -1,55 +1,55 @@
-DIST GDM-AproachOne.tar.gz 253452 SHA256 0b378e858fa8639ee3f28e9f029dc3fced0520763ebfff5fc172978cb69c9777
-DIST GDM-BackcountrySkiing.tar.gz 310183 SHA256 67970274d47a506c96500b35294f2481144ddf609b88524b05549d3852f953b6
-DIST GDM-BalloonsBlueGDM.tar.gz 440281 SHA256 395f9e8c78da9b5e55b5d8001f8867ba083253da5f97be94c6341d7dcf22defa
-DIST GDM-BaltixNorthsidewithUserfaceList.tar.gz 24294 SHA256 06c9a0b4d68db6b211a00931bf1b024354616f5843671469172d509b8f44ed72
-DIST GDM-BlueSwirl.tar.bz2 458550 SHA256 aeaa5412711ddd47795bbaf6bae66caa3bd6761ef8b41355304773212fabe18d
-DIST GDM-CelticWXGA.tar.gz 378663 SHA256 3a43073d97012588cc014045cc3f79e7c9f2fdc31c0c105ffbaec4b02d5d78c9
-DIST GDM-CleanGnome.tar.gz 349451 SHA256 835f84c6befcc8274b3913366dc08880076260301cd06e0ce8a79236047aa694
-DIST GDM-CleanLinux.tar.gz 334228 SHA256 0dcc39d0903d6435c39cc4496a92583b1823449408b8f58b3456cf8442826d35
-DIST GDM-CleanX.tar.gz 346205 SHA256 23645aee7761ba4e0742010816f8dc866e3d0b20ec462ed11b321992e8502e89
-DIST GDM-Curve.tar.gz 411060 SHA256 0635ec34cada39621fd806a74fd41262e8d8a53af5497a6150ff07db44620e83
-DIST GDM-DarkCleanLinux.tar.gz 83608 SHA256 322ef38d0db07e13415f729ae593b60aa0f8e35d9411fe87a6a57a0774bfad58
-DIST GDM-DroplineFun.tar.bz2 157929 SHA256 c983db4a9c7be8ad3d206c43ad57e1456e3c910df3e6d56e4b6e05489e7cdaa5
-DIST GDM-Earth.tar.gz 1780227 SHA256 07acb70de4f8bc306c96407aa3cab84eafcff39031b186bfdae16f349eca7652
-DIST GDM-EarthLights.tar.gz 136114 SHA256 289f042ca43a54576338f52c5a2d8d8a196bb3f308203d0836ef5e32ae8f330f
-DIST GDM-EaseOfBlue.tar.bz2 80759 SHA256 912baf0dc5c1a963bbb2577e23e4012bc241248197d3c887d7632004e8e005e5
-DIST GDM-FernandoAlonso.tar.gz 1317571 SHA256 913b6abcf2cb5820753aa6ae537132279559e8b1ac33eab2adbbe1f4d3de01ae
-DIST GDM-FlyAway.tar.gz 272439 SHA256 d755520f989845a3934c116379c87e8fe45e94f37dba9330521dd45e84b4a762
-DIST GDM-GDMLamp.tar.gz 420556 SHA256 00d8dc7f68245c7cba64bdee9c1b39d6ff3e454d666a27e9d7f266517e9cd10e
-DIST GDM-GNOMECorvette.tar.gz 267104 SHA256 884a66449312b89ecc472ffadf98737f1fb08977fbbd84fdb30d5b072ba1346d
-DIST GDM-GNOMEPlanetByEmailandthingsCom.tar.gz 104369 SHA256 338deea00a0677100a4cd991e092917c163bf566907d9845f4d36a1e2f264d92
-DIST GDM-GNULinuxBuddhistGDMColourENG.tar.gz 1581457 SHA256 683c3c04d7496fbfef6b37d91066c21b86d9036392864b448273c44d6891eda3
-DIST GDM-GdmMadTux.tar.gz 607983 SHA256 bb87c22eb39d6b7301b25b43189fdcada4f3a2b78c7fbd3032c6537e0a74e837
-DIST GDM-GdmMadTux2.tar.gz 2417459 SHA256 422754e7f5a90c4fdac8ddaf9637e25717e37396a038f0a166ba5d71df352cb9
-DIST GDM-GinzaGDMTheme.tar.gz 1876655 SHA256 61402008004e3db12f62765876eb805d29e2ddde28436b815d7bc095d6014432
-DIST GDM-GnomeBlack.tar.gz 38205 SHA256 1b84253623ae9e2f01cd5af38fd3069eef2d8a895acd0777f4a89ad1e786d441
-DIST GDM-GnomeIsland.tar.gz 245020 SHA256 d3d497aeb11677bfadad99ea3264881fbefd8ee97f94bedd11b53dad3870dfae
-DIST GDM-GnomeMoment.tar.gz 1134423 SHA256 b1a1490959096e8772ab70702e9b7f2e629732487c857366fc88f76a76a3fb3c
-DIST GDM-GnomeZen.tar.gz 92222 SHA256 daab3e20bcb229569c81e48073ca5ae60ea26ce2a7dc3ce67c1cfc1b940c7fe0
-DIST GDM-GreenForest.tar.gz 169533 SHA256 4b73695131024bc014fe56daca308eed8c73ab1388895b4b6f3e0fb037eac05e
-DIST GDM-Greenlines.tar.gz 193885 SHA256 910c0fec5688c1a3ea61a81a73653ef97dc4de6d80dbc02bbaccbfb493d8d577
-DIST GDM-Insectz.tar.gz 2544324 SHA256 b8efed071377200b73554fc596001224e43aaa4375fb114fa4e9f91ae627f602
-DIST GDM-LandingClearance.tar.gz 1055924 SHA256 35ef84f90295a54d803c38c38e28aa3de1cf27b6757b88e1ad2fddbced082d6c
-DIST GDM-LightCoffee.tar.gz 1773727 SHA256 f8a3680eed4aae2ba0703529f6b0ce5110e659f6f001ec412ca71384b289a2ac
-DIST GDM-LoginScanFusion.tar.gz 2085738 SHA256 fcf585cfa1e232228b010e2de4fa92be3a282575627e21833d000f266d8aaf0a
-DIST GDM-LoznicaSerbia.tar.gz 296640 SHA256 dc0ce1c53067b40dbabae4522347c7dc12af08aa1e4ac45c44b21e5124383715
-DIST GDM-ManzanaTux.tar.gz 470204 SHA256 6a148ebba714858527781e9075f510cbebbf5691cd3a2462f7df78f033bdcbe3
-DIST GDM-Northside.tar.gz 16875 SHA256 39848ceb95bab520a9921ea4a0923e647b9267cf0ed48d18ad6ebc7519edf7eb
-DIST GDM-PiratesOfGnome.tar.gz 28062 SHA256 0cb6aa059a7e36ffadd86f8939180235912b14ab4e007c46480cfec96aabed02
-DIST GDM-Sakura.tar.gz 81629 SHA256 ffee24b3e9da17e5e4f864ee1b53eca16655152d001b8416b55e1c53ca8839b0
-DIST GDM-SharpGDM.tar.gz 253671 SHA256 c6a701ee3490b1d27066d99f66bf29e8f8b59b9727300b48f1194253071b1d61
-DIST GDM-SimpleBlue.tar.gz 31594 SHA256 57a89f51c1c2e3570a453b003c85850b221fb342886c5de6f1ca5fecc03987e5
-DIST GDM-SimpleElegance.tar.gz 469284 SHA256 80d1267b20a9aa583f00e0927be86e7517beb77ba2fb81bbfe4e6dfe57d4e484
-DIST GDM-SoftFlowerGdm.tar.gz 741877 SHA256 499d890b8d6b5382afd77565c0e2621e12601510bf723094abbb3006e4e53f86
-DIST GDM-SoftFlowerWidescreen1280x800.tar.gz 645280 SHA256 084ca918a40dbc12bee554eeb5ef6a1bd89c0da5f8e8b8fd06e7f05f880a608a
-DIST GDM-SpanishNight.tar.gz 185102 SHA256 f5c301033a05e1a5ef7ffafbaadc7647a7c14a093f485aa59c6a5b61acef9cea
-DIST GDM-SunPuttingInAlmeriaSpain.tar.gz 1100587 SHA256 3ed1966a6f788d1015c495448d182a3aafae8725c82286b12600dfd062c2a3cc
-DIST GDM-SunergosGDM.tar.gz 243141 SHA256 d3b3e20147c516bec06e0b92146423335b8a1d316965bda2c76c55034cd6b6c4
-DIST GDM-SunergosSimple.tar.gz 142227 SHA256 de567a064f23d6b5c4abf9d6e73572844485e8f19638fb2a4120f437e38a27d8
-DIST GDM-Tango.tar.gz 106001 SHA256 25c73030563783fbda20f16d26e873fe0a15218d048d9c69a10d87378a158323
-DIST GDM-VarietyBrushed.tar.gz 184087 SHA256 6c307eeaabceb7c55765769c67125afa9027b8367b20cb86f101ecf57f212321
-DIST GDM-WhiteFootOnGreen.tar.gz 30163 SHA256 b6fc4a4680a588813a04ab13bb915f326105fcdcb8cc8ddbf1dac700c3e7c187
-DIST GDM-Wolf.tar.gz 411864 SHA256 e7461bd333512696b01542f9e10eec4924582bd2b265f1f59e73697063259d4a
-DIST GDM-YZF600R.tar.gz 871289 SHA256 66ae484475effa63c3360f0a9331be91eddb8dd7611c96c2cc91e6c8e3a35c63
-DIST GDM-ZX6R.tar.bz2 141153 SHA256 94f628362f94fefe9a6255d08212e0f42dc2a9138ab2eedf68297dd29a318371
-DIST GDM-ZenLogin.tar.gz 853286 SHA256 ac8bda4af35430462de2e1f6a6515aa012e2f2fe5477147d2ba97459be57aa3a
+DIST GDM-AproachOne.tar.gz 253452 SHA256 0b378e858fa8639ee3f28e9f029dc3fced0520763ebfff5fc172978cb69c9777 SHA512 0e30c0ea1830d5ec8123831a4110eb54c01cf201a3af67122bf3940cd2a9a66945a8b20447738028f3185501466b92eef0fc1bf64183464e6e561f56839f3721 WHIRLPOOL eb84f5a298cc6fd7fc47799a7914b6a3c01d6c8f29333712ae15b0e8f5ada9da643e812b4e248e0c04023924eadf9b347df5baecd35c6955269ea07a111bcf95
+DIST GDM-BackcountrySkiing.tar.gz 310183 SHA256 67970274d47a506c96500b35294f2481144ddf609b88524b05549d3852f953b6 SHA512 c5b5cf0ea0c06b307ef665b3588aaca7e3f9e3190858de2b521b7a0edbee09d99ed262b24e15d22b12f41274a6045674384ea70e906bc5dfbab386de42ae232f WHIRLPOOL db0360346cc219f9446d733e56161dd62ab1e1e1c6bd95b6a67c795c73684c13a8199fb941363393288b9b6aa4f4499aa3f152c1f768fbff79772888c528a053
+DIST GDM-BalloonsBlueGDM.tar.gz 440281 SHA256 395f9e8c78da9b5e55b5d8001f8867ba083253da5f97be94c6341d7dcf22defa SHA512 70bd5030435f71b5c341d1f4bc0da61966d9074d28387ef7879a9008375bdd718e09bfb38ed3a71b7aec40ac73a036bae2557e1f0227eaa8eb0174b1dca89726 WHIRLPOOL 689603e6274e781882c9bf9bc2b479df6ff414885f13095983fb13c53caf0fdf28388b072f0aaa55222b166925d5584a225bb7a7b5f6eff9cf185098724d0f27
+DIST GDM-BaltixNorthsidewithUserfaceList.tar.gz 24294 SHA256 06c9a0b4d68db6b211a00931bf1b024354616f5843671469172d509b8f44ed72 SHA512 efaa4606666c733792ca5dc34a405166ce196feeac9fb0c7b8b76993feeb5e19b5d92c8e2f01934d816b7345046b01203eb3d0f70495a1029aa130a388570b36 WHIRLPOOL 5b56e0b790ffe18ac480f8fcea460a4d859f4319e7fe14d189e1337cda62948bf4586feba561b96567728df86d1796533ec804e8f0dbffb8cd2ebf4f1c4cd8c0
+DIST GDM-BlueSwirl.tar.bz2 458550 SHA256 aeaa5412711ddd47795bbaf6bae66caa3bd6761ef8b41355304773212fabe18d SHA512 e08ef484b17370a104a69b5cebf272ba6be2b8c3a703d6995b0c8b7dd522e2a2eb84bf524304ad820cea64a383cd79c20fb0a567a9b3e8a1c33264211bc9986a WHIRLPOOL bbfcd6d6ba29e15dc90c241164644196ebb1d2feeee1252cad85f21722dc0e3202f58dcc83677590a7f64dd5a2408191d93dab05a02b12c4759287bed84dcd87
+DIST GDM-CelticWXGA.tar.gz 378663 SHA256 3a43073d97012588cc014045cc3f79e7c9f2fdc31c0c105ffbaec4b02d5d78c9 SHA512 5f0c080680687c8c8ab48b7f405ec7880fc1c343df8e8ea2557aa856305eb65e66cdc43012c229c962745edb576b07a56410a593dc79a1cf776f483b7f61c947 WHIRLPOOL 652f56a91c2c41dc98849228dc5d86bacd4d337962ad0461735a6f94254cf3a201c0fdac0386e23f1aaaeec6d1a843dd0cdb451b77ba27c883ac550bc42552a3
+DIST GDM-CleanGnome.tar.gz 349451 SHA256 835f84c6befcc8274b3913366dc08880076260301cd06e0ce8a79236047aa694 SHA512 ea87e00b11c34aa9d87da3e679712fff8f8df731fc6e8cdec38763f0f3bc68867fa5546136358a50916ab2b575bf72cb4464e4a867c7e436aa2391a180168f0b WHIRLPOOL 29b987ba0c20ec0a67c9e035167e4a68ff9990c09a11fca72676199510c93e7b499633229e7429bea9794e5d5d799e67e4d84d47bdc32c03a38ad5fddaf86ed0
+DIST GDM-CleanLinux.tar.gz 334228 SHA256 0dcc39d0903d6435c39cc4496a92583b1823449408b8f58b3456cf8442826d35 SHA512 6e2375fbe565dcc8bf436f6334af253ea0e6a28e4473548e5e02191f0f6f30fcc9bcbd87d261150f6b7b121969436afcb6a7a8ca50949f6098ab52d533fb161b WHIRLPOOL ab5d3d58237d7a4649473daa7314af1602eecb32cbc00e7cc3ceabb5984f8c52163d3b8bfc16ad3f347e38c5ceddbb227bacbf2e728b38b63d28d08726be2979
+DIST GDM-CleanX.tar.gz 346205 SHA256 23645aee7761ba4e0742010816f8dc866e3d0b20ec462ed11b321992e8502e89 SHA512 77daa40c0793c056c70dc4f73f699cfb910647e6612cf4d33788b073a3811f275e084b4b4d4c661486d8b9b0ae035e5748f50670c393aae6a1f7c20dbf7967b1 WHIRLPOOL 1d82ff30f03f4867a3570e8fc6dbb13ec5b53103c6c406d138114ea668cf71c86651251598db03b6c23c3f8c0a9c2ddba20950e907b5caee4ac467fb1523442d
+DIST GDM-Curve.tar.gz 411060 SHA256 0635ec34cada39621fd806a74fd41262e8d8a53af5497a6150ff07db44620e83 SHA512 6ac8074f4e301c1f884370b5f90ac18ae174c806c6625587eff4d71de7d6c3f5e8462eb9f892cdb09b5024b89ddf7932ef5af79351946dd0d53b371001090ef6 WHIRLPOOL 511897337d437e7d3cf9c6971b35323d76a8fa1ce8c28104144c712e4c9c4c41a543940abdc7daa5837b56a1fd1cac5925d207d40d712279efbac9e88ca1fb80
+DIST GDM-DarkCleanLinux.tar.gz 83608 SHA256 322ef38d0db07e13415f729ae593b60aa0f8e35d9411fe87a6a57a0774bfad58 SHA512 34358ab5225e05b5d59eac3e747a7d2e7d1246daa42fde8d21f555c03295997ba9b57506ee3c38850d66b0c13870b43d66134366003e0db03be89591265eb405 WHIRLPOOL 1b8f90e19d0dbbe952aa1c18b459e2a70ae31d02af05df787c05efec34b48d7479bbf7af92a1178776717e135060707d4b411262d54b16f36955823d05743cec
+DIST GDM-DroplineFun.tar.bz2 157929 SHA256 c983db4a9c7be8ad3d206c43ad57e1456e3c910df3e6d56e4b6e05489e7cdaa5 SHA512 1ad39943624653dc60aacd03eff9f3edffb28b94bafcf3f6a4863960ec48daf4a31347e2d6e32828578653228c7180a0250bb2edd6a06e2e95f8f30a5f5b9072 WHIRLPOOL 6003caf7d148d1f646d94c4b9b24c132b8e3366a37401613aff04fbcdf4ed1b87897ee1778cc401749415d7fb6499493e7d23e396665465ccb47de67b6fbde7a
+DIST GDM-Earth.tar.gz 1780227 SHA256 07acb70de4f8bc306c96407aa3cab84eafcff39031b186bfdae16f349eca7652 SHA512 ad67ffd9c95539becb74136098ee9ea2fd7af6676d774a25a8cdb563697fc5b81d9819d02e7995c11e9ffdcb8b99a6781104e99e08ddb84553fc99cd30640152 WHIRLPOOL 9d093ee9820750d643619286c278b8410c75e34a5ee33897932da3da36f471dd803382e2414a44fd0fa76e0cd03ffe110124c59790911a21e9bfe12c0717e598
+DIST GDM-EarthLights.tar.gz 136114 SHA256 289f042ca43a54576338f52c5a2d8d8a196bb3f308203d0836ef5e32ae8f330f SHA512 060ce3ddfa7172c7c808595b9a010297fb42d3091147f4041b85a0cbcb11555e7adf54cc0eb8c0a187c948b8282003105561f86d517d7ae1191a2755e6de5f8e WHIRLPOOL d558d071fdf901b60b20ab213c2dbfc929d14a9297597c72aca152fda341fb488b3c32c712f5c52cf5008a4321786146e3cd4cfd0c147864582417d049e4a5fe
+DIST GDM-EaseOfBlue.tar.bz2 80759 SHA256 912baf0dc5c1a963bbb2577e23e4012bc241248197d3c887d7632004e8e005e5 SHA512 7ee481f940ce3dd49fa5168db01c32f2fdfd85be49d47602ab147f276764fb831f4b7aa28bb0aeac8e2a1f28dcdd2aa7c6870e74df0689cb7bc228f29f0b5143 WHIRLPOOL aa7b41667cd3ee295e90e557e3dda8bd56e48222597fd608ad0a76aac1c5a2af4345230f9d4808eb6feaa2b027829e08b1128454a5036c5ef86373b2aa2e3091
+DIST GDM-FernandoAlonso.tar.gz 1317571 SHA256 913b6abcf2cb5820753aa6ae537132279559e8b1ac33eab2adbbe1f4d3de01ae SHA512 175bae9cccd15ce46deb59f327f1ecc63d3e97ece3330f92d20510b33f522d142a99c4a31e3b0bb31c22f535d0e0be15f5b2cd072147516e3d89f3b587a5e83f WHIRLPOOL b96d2b15ca1de14c974dbf598776032693aee2e6ab13741cb1ded85bf51ec9916d924d96c0665002c5a7bbcbf850497e7c6185d94944bce9f868d3ce43195733
+DIST GDM-FlyAway.tar.gz 272439 SHA256 d755520f989845a3934c116379c87e8fe45e94f37dba9330521dd45e84b4a762 SHA512 ffce06a06d722938459bde160bf13f7c779c75b79d1eeec4f4f3f32e7a2c1a0b47a590823c3ddaf0d6317b088f21764dcb01284fcc7ffd87cd80ea15f7aa703e WHIRLPOOL 30fdc63cafcc7360f675ca091a94c3e1fa9d417c46ac8962ce3e3e3b76b644c4450407af3b9bcd38d1e3ea760e6e7cf0867671f3c971231c79a8e427729a234e
+DIST GDM-GDMLamp.tar.gz 420556 SHA256 00d8dc7f68245c7cba64bdee9c1b39d6ff3e454d666a27e9d7f266517e9cd10e SHA512 57f9f6a9e07242ee75e302e16fea2b317ecee4d0d2aa17694d58974fa915fa1d7b11c8e0e21945eea6fd8673e0b51adbd394feb614bd535ef11c2810da650090 WHIRLPOOL f50cfa008812a42d56df2eec0d1b20333593c852a8de27b88262d2008a726e533a17904a4bacd77053a95268bf19c66eb466cc115849a11129e03d6163723f2d
+DIST GDM-GNOMECorvette.tar.gz 267104 SHA256 884a66449312b89ecc472ffadf98737f1fb08977fbbd84fdb30d5b072ba1346d SHA512 915e6217bf5861b511baa797c56925a06345db12da81341969f6c7fa50fc6460370e6701508bcd98c2a2032bf4fe03d617e25a840ca15619eb215e148bf763df WHIRLPOOL e2ed17a28f1bfc22c832121670762dd701a3ea714941408b7c30bb1a6ccccb5c13a07aba4689adf67cdd5fa769083e93e1eba30e2a2a6398828e1d6b9ac02de9
+DIST GDM-GNOMEPlanetByEmailandthingsCom.tar.gz 104369 SHA256 338deea00a0677100a4cd991e092917c163bf566907d9845f4d36a1e2f264d92 SHA512 63e844727f190103b46bceeefa0a8babee97f61f1447d10e89a4c1ce71caf824f75e9ef2269f34afbc71eaaf045ba5cfec800c34d287260e999960a218867c1a WHIRLPOOL fbb6e2af34372e8d9017ea25f2162773c9e53bed18831e017bfb07a207afb83f4742fc35ad012c4af735228e7126245f228eb6d1cf76898a6b47874e67e16e1b
+DIST GDM-GNULinuxBuddhistGDMColourENG.tar.gz 1581457 SHA256 683c3c04d7496fbfef6b37d91066c21b86d9036392864b448273c44d6891eda3 SHA512 d69eaa4cd6a5daea3cd11fc23cc0d3ca40dcbcaba3ac9519acdb6df9f8ab54934271a8c20de5c3f7684f7f9adedae4e918a4f3fad36da1b0fe5abbda2e286f59 WHIRLPOOL 0c0d90b7a54c8585ab882b825ac32dab23dea02a988fc3ee16595bf56d1d73a37b89703ff232f6167143fdcedc0d7b3285a4c7cd3ed288fa133a471c4d8c7e27
+DIST GDM-GdmMadTux.tar.gz 607983 SHA256 bb87c22eb39d6b7301b25b43189fdcada4f3a2b78c7fbd3032c6537e0a74e837 SHA512 2d3ba50e89fda7fba6185bb2f3c9e771a084af9937eedd1335b382907ba11ce8430ec89e3509d5f72ea4f8f0d475897543e9963503ecde74f98820183ac16388 WHIRLPOOL 463f811d70a315b44c5000d4b79ae2ae8601b80420ea73df3cac541abfe88affefb8a751f1014039955a83f560db8daeaa3871dd9dac48312d8687e4fc729c8f
+DIST GDM-GdmMadTux2.tar.gz 2417459 SHA256 422754e7f5a90c4fdac8ddaf9637e25717e37396a038f0a166ba5d71df352cb9 SHA512 abffae594ff11e07ea1e35bc4ac47e96ff864fb3f161afa115d5b927d1848a4cb5625427c825e16c75a5f752fa28605ed6bc4e1989cfc2572e9365987321a141 WHIRLPOOL 879deb577990640ad975e08415351e66261ca30576d7fb187c9c009ae18e5a3488801967ddc6b623d62194bc86623ce52cc3d9c51452920624258df0a213e140
+DIST GDM-GinzaGDMTheme.tar.gz 1876655 SHA256 61402008004e3db12f62765876eb805d29e2ddde28436b815d7bc095d6014432 SHA512 7705d102be40a2dcec6c415e8e9dd02c0252a3da15b3bec91b784fe4e7629c913aecb08c2f21fbd6f01a6c854f6163b662f0a1503c1b24d01690a48bf2c166dd WHIRLPOOL 7e5efc22c550ea0a4a218a845b280f0aa16890279767aec4e80d8fdf9d926493ac8d6e83c75b813228771468a487027c926d02d10ab09f1506233e403c6d967a
+DIST GDM-GnomeBlack.tar.gz 38205 SHA256 1b84253623ae9e2f01cd5af38fd3069eef2d8a895acd0777f4a89ad1e786d441 SHA512 0676fef9612ee271ea059764e071ff1c993ce61f214e2c73c87dc53e37ec74abe494da947571de89e98304725db55a83fe05be5fc1a8553a2795f9df0411cb32 WHIRLPOOL 052b0b326e03efc0517ab19e6e1ff4ab05666adfead643560c4156fe0eb9c9d60997786ad11cac0d628b3ca9a7f3d4fa053ff8b8574329eca152ae18a497c0c9
+DIST GDM-GnomeIsland.tar.gz 245020 SHA256 d3d497aeb11677bfadad99ea3264881fbefd8ee97f94bedd11b53dad3870dfae SHA512 121348d25ca78d19bece3338d55c75847951a250508d4bcf6667e40de9ad7adfbbf9e8fda33ddf34cccb2a92f169b481a41fd032a3aeab67f1ec40932abf54cd WHIRLPOOL 217242ccd192705dffac4d6e7d5bf91f5733580798865298affed7db0660f5417e902e821f7c638c66a5929aa8a7b295f64161b80ec8057d93c482b2fa5e8d16
+DIST GDM-GnomeMoment.tar.gz 1134423 SHA256 b1a1490959096e8772ab70702e9b7f2e629732487c857366fc88f76a76a3fb3c SHA512 98c099d6d23bde87cfba93fdeba6c412154bc32f42c37d5e262c6ff106a7794db13b1df97f7a252c398b0c9ba12e3759d0d6a830146bfa0d0bdd90c68635ed74 WHIRLPOOL 61e6fe737fb5d2e3a7770984f8a71264985cff70ccd27509acc671e07698b3d19717a8fbb448135e6349eeac5873280dfd964522d0cdc9080be78d1477d061d3
+DIST GDM-GnomeZen.tar.gz 92222 SHA256 daab3e20bcb229569c81e48073ca5ae60ea26ce2a7dc3ce67c1cfc1b940c7fe0 SHA512 42e686e5ecf434e9421a2b51ce960787261ddc07412d05833a010d0152976c487d487622c8d129e47edcc8a4f5f502c587ce72bacf2e100b03e6e1b273a16a27 WHIRLPOOL e7c1d10fa048c3f5738547bddfb2e797ed13453b5348b9c57c78702a622d291949012c3f421a8b52a29d029c431ccd72f92152889fa0475ac1d006473743ddf6
+DIST GDM-GreenForest.tar.gz 169533 SHA256 4b73695131024bc014fe56daca308eed8c73ab1388895b4b6f3e0fb037eac05e SHA512 bef92dc7b65956d2b03732189567cbb58f804831d6eb2dbb93c676af4f439046e38fa03dde51364f0c5396916728be30e25cefab80aad26d64bbaf7378814ff2 WHIRLPOOL a781e9e55dadd9cba3ea49012ae1f9213ca5201738d70b38dfcb3995c1242baeeb42d9900a7a0ad098e3ea915b51f6120f997799e03afdadf29af6d12f491f46
+DIST GDM-Greenlines.tar.gz 193885 SHA256 910c0fec5688c1a3ea61a81a73653ef97dc4de6d80dbc02bbaccbfb493d8d577 SHA512 b9468126b94701007b260d14db18235ac4c077a4b909592b193be05bfabf545735034ae13431b05af673e11e7fe72307ca8556b40ccc7b5205bb665f0ab15673 WHIRLPOOL e36166a1051474efbf8af43c666b21d6ac3f37532ae9be159a9b08f253e01e3678a06db3aa852bf5cd1aaf8293c97f129089cfe936cdb6d7613a91357c542aa1
+DIST GDM-Insectz.tar.gz 2544324 SHA256 b8efed071377200b73554fc596001224e43aaa4375fb114fa4e9f91ae627f602 SHA512 417521fadad44357b118901c44cdc26c32bf28a652e0b895d61ba8097a280773da726da0de9e4b1c49e86928fd8d594e01671e95c8fc029a475f46a854c7354b WHIRLPOOL 376571bed24417586f98bdbcbe5f3d2901b3dbd4d8dbe1a226b0f58c465bdc44a84f28027fdf239facc5736bc2e7da5a6cf951f5f8c15f7d9437bba1793e69bf
+DIST GDM-LandingClearance.tar.gz 1055924 SHA256 35ef84f90295a54d803c38c38e28aa3de1cf27b6757b88e1ad2fddbced082d6c SHA512 60831ba2e9018062f056f8d04e9a71627547314c870af25b93fb3fe9ed821cee41dfe413ca13c4290a1fb0bd3b645404549ee755aae67ea436ca784be99862de WHIRLPOOL 633f20a79c0f2f54514c09509f13452fa1bd1deaed46d5c99b4ae168427ceed7f7bbe834f13ce010d07adbc94698ff44242d84be45d2d2663bdaf497e669406f
+DIST GDM-LightCoffee.tar.gz 1773727 SHA256 f8a3680eed4aae2ba0703529f6b0ce5110e659f6f001ec412ca71384b289a2ac SHA512 e1ec0730b23ef6a1f987b5ced12de70762346d2fa77a47e929b115d7688629b69f779e1e0c78c085ecaa12660567003a797d361d093f9a276cd23504f8b5c69d WHIRLPOOL d93a83581450409dab2617169789550423da3f38767a9ac3504a847a3b3fd383e98a2fbf8709a33ff3453b2ffb209d95f3fd617fb02f014b5c67a8758a02b635
+DIST GDM-LoginScanFusion.tar.gz 2085738 SHA256 fcf585cfa1e232228b010e2de4fa92be3a282575627e21833d000f266d8aaf0a SHA512 7f8c2858ace84315b50ee6875912f3a5fe785587bb9ec09f374500c30d169a316b8a3236ad5901ed08c6df5e611dfcf5832fd4a3be8794ad01f429b9e17ac3e5 WHIRLPOOL 5c078301751cf75d22850530373ee834bf0f4cf9ac5620e94cf264d4bd0e632d81d7f760a5c429f812086235721c50256351da4762189d8a71466af78019a5b6
+DIST GDM-LoznicaSerbia.tar.gz 296640 SHA256 dc0ce1c53067b40dbabae4522347c7dc12af08aa1e4ac45c44b21e5124383715 SHA512 f33b6351d934404a1d0c1764c13997b13b9a1acff7ebd795c1891fc5420037c3f175cc4565434eeafd2e72f69300a43932a4c341f383368f8b7c2712b24b7322 WHIRLPOOL ff5c49987b9c2980bbf1e6b231eabdf4887c2b2256a637c6538ab1cf91078ada2f3384032156987a8eb4144c8e71fb3e5daca552d03a1ad8703d056b2e6a1116
+DIST GDM-ManzanaTux.tar.gz 470204 SHA256 6a148ebba714858527781e9075f510cbebbf5691cd3a2462f7df78f033bdcbe3 SHA512 3da9bfad70cc6e64d7be47584751d97657aa1a56a4633480c79ec891c87250150aad74deeb4c28523fb4e9b800767576451434176b071a1bc44e88d61a02c0ab WHIRLPOOL e3195424f06c506286a3dea4db906ba2d26c0528c232d143b9eed834b12d9d3131ffc61a6db8c5cb1d9bda9035a331eb7cee818f099a12484be3d2bf11f342f8
+DIST GDM-Northside.tar.gz 16875 SHA256 39848ceb95bab520a9921ea4a0923e647b9267cf0ed48d18ad6ebc7519edf7eb SHA512 ed5fd495c56b626451706be490498ddcc4ed92e7cc562281d61d0ebff48a408c51aa66bf288c5841c0ed319ae5f1b22a8e7fd905d0c2fc069e3c86240dd2719e WHIRLPOOL b32ccc6db8854e6438b59be39ed918cd4324deb94b25782b08af430c578fbcc29bf1eb91d8998b6d2d10d65ccb34e27cf65cdaeaa1d688beded8c8e99f2faf0f
+DIST GDM-PiratesOfGnome.tar.gz 28062 SHA256 0cb6aa059a7e36ffadd86f8939180235912b14ab4e007c46480cfec96aabed02 SHA512 f4131e5f82b8dfe108b0c51e3bc963515fba2b7842e4a76920353d83fb81bf6ac3d37878d432a2eaf4c3b26f4e8fcabcd8dbe2a3994e7dc35614a2f5387752c8 WHIRLPOOL 63c30c93f36ded96e2949fc4674b04db75ebd8bb652742e08c5ee10643b38328d1e5783df56e4b41f521c20fff070533a4a18e77fa3e370e52c89bb4969707bf
+DIST GDM-Sakura.tar.gz 81629 SHA256 ffee24b3e9da17e5e4f864ee1b53eca16655152d001b8416b55e1c53ca8839b0 SHA512 c28a8dfb554c6141818b0f43a959b95a7ce0ef6cf727b5e958cd74c0fcb3d1d8f6616519095e87f1ed86d4ff9e200fe1a5d9c9986dc9817f1d462c770a38aa2f WHIRLPOOL 4a6357aecd8382623ac2a12c82f015a173223bd1bfdb65843d766a4820b63e63949273230cc5254e61ca48a3f9439b6d9cb7c812ff879402ea49731cd02ab0a9
+DIST GDM-SharpGDM.tar.gz 253671 SHA256 c6a701ee3490b1d27066d99f66bf29e8f8b59b9727300b48f1194253071b1d61 SHA512 1c821ab0a6ca155b36818007cec1ac5aed58b0135a9436afa4d625acbe7ca2352761b40b91ff882c46478a685c8eb63e02226efddf43d986f075eaf670529fc3 WHIRLPOOL 4e9f24b0a90bcf84616acbd5414397219fd16a3c1fb35ca12d31546be11447ef287c61059517841d6b53f66352e0bfe0f72bbcb70dfa5d1f219580d9d86555eb
+DIST GDM-SimpleBlue.tar.gz 31594 SHA256 57a89f51c1c2e3570a453b003c85850b221fb342886c5de6f1ca5fecc03987e5 SHA512 f8476a878c325a0b21f6956107cfd469fa3e8c60d650aa5f679ae0c7195d0fd44fb1ae68c19000cdeed4df903b933c801bdb2cd6d7f03f774b933b7c2763bf27 WHIRLPOOL e332346dee2ffcfbe09d94ba193c92fce8609185290644effbaa23234df76dba1468a90f524c18e82e1e2bc1dcba02cc8aff990a419ca866459cd191bf1887f0
+DIST GDM-SimpleElegance.tar.gz 469284 SHA256 80d1267b20a9aa583f00e0927be86e7517beb77ba2fb81bbfe4e6dfe57d4e484 SHA512 4a3b2511420a35ad07ec7c865acd1ccde88a7c568ecc9c3782ae1d73e19699a27bd6349a88eeb79262501dbb5e8ceb6ffad3ba8bea60f0da1c5aaec76c4abc3c WHIRLPOOL 4d8c1ef5e84ec07a81f931569099eaccad515be037568548e060e7e8b36bb3150936600194fe9208b7df95e20caee872fbf9019ef380d21c5569cd82e9faf3bd
+DIST GDM-SoftFlowerGdm.tar.gz 741877 SHA256 499d890b8d6b5382afd77565c0e2621e12601510bf723094abbb3006e4e53f86 SHA512 b2740b683248fd3602baa94a8081e9578ecfe1e41c5d57ec90c3bed98fd6f50f2ff2f22db6bb6ff0deb9b7da33de244301f2caa557412783312dcd7cbde52210 WHIRLPOOL 9b9a91b65123e99c51be037501ce227ce671f051b1323019253290508127ae37db176a8db0255f07964d8bface160530ea969c0b8174aa7e029ee90de5b2e7b3
+DIST GDM-SoftFlowerWidescreen1280x800.tar.gz 645280 SHA256 084ca918a40dbc12bee554eeb5ef6a1bd89c0da5f8e8b8fd06e7f05f880a608a SHA512 d76ebae994d65c3f62ee32d7aeb66065501e491f4509571e211610376bee0bca47ed5193c066ec3e23b660fed91b30d122024069a225f28f1affeedf7cf2c6b5 WHIRLPOOL 96d4cf29a2388a8f4afb0eb18e8879b2260c93502abf356b907b257ce24a879daae4f8f247299b0a20c5d799e8368c179909c1210effa1ea84dc4d107620ffbb
+DIST GDM-SpanishNight.tar.gz 185102 SHA256 f5c301033a05e1a5ef7ffafbaadc7647a7c14a093f485aa59c6a5b61acef9cea SHA512 2cfc5634f30cee506a0b9a253666568bf5ad936c4014e215405515911267ab314c615c1f98169fe8897e9e75e6ecfed4ecd22d9496f3496751bc2d1280268727 WHIRLPOOL 4c47a3ae4192e306e9b23dbc29caa101e6fc5b96ae33885902ce9b9bb62d1f1387a52b421ba5ad42310fbffbf55bb85eeebb6e8da9fa9d48c52e91c39ad52223
+DIST GDM-SunPuttingInAlmeriaSpain.tar.gz 1100587 SHA256 3ed1966a6f788d1015c495448d182a3aafae8725c82286b12600dfd062c2a3cc SHA512 355b9d3be9b51bad493822b98f3b51487e9046e7e428e68ffaa6dc2f1a72fb1cc2684c7696fd4647cd84d49e5fc2d71114b20e81772d12a4eeccacff97e28f6e WHIRLPOOL e3c0698a69d1f44738fd711bd8fc6f59f3ac70cb17f1a3e70210a658448bfafa14dc9ba8c160ab2a06c52b4f333dc581c104094522ce734ae0ec9731601c0e0d
+DIST GDM-SunergosGDM.tar.gz 243141 SHA256 d3b3e20147c516bec06e0b92146423335b8a1d316965bda2c76c55034cd6b6c4 SHA512 56a6ef5376e92d69e4dc17b3a262e2013b2f0a2fc43697124425fd7e3da4640a3079022cdc6f7cf9c736f7d4188286f3f28ead06eade9d288def6e72a5939a87 WHIRLPOOL cd0c030ac41d0725bdbd2bbe3651d43b2e7f806a0c5d14d75f7e67d6172db3bce10e0a699d4a2f59721e081e62473f6c2ac0b2fdfeba03b8d9d2f8a85311cf96
+DIST GDM-SunergosSimple.tar.gz 142227 SHA256 de567a064f23d6b5c4abf9d6e73572844485e8f19638fb2a4120f437e38a27d8 SHA512 c3122ae5d8f30e401cde3fdfb4af9869c249dd6f07f0b0bcb06bd9c22b638f70c95bbc946d9c54a1cb5b5a5b62a35d3305714c36a1e238916efba488f46b1549 WHIRLPOOL a28101812edbb37b0da20f845ec7c4c8c0ff239f8bd7ba50f1a415565ccd765b6b29ec0277e263e8292e001ee3c4a9faeba31c0b58ddc582b728aaacba0c9658
+DIST GDM-Tango.tar.gz 106001 SHA256 25c73030563783fbda20f16d26e873fe0a15218d048d9c69a10d87378a158323 SHA512 fe808acdc10ef024f570f5176dfd8cf5d6dd0fa6bf2b3daa9c3019c5672a1fa8867a5acc57b926387ac1767d3718be10ef7f7329dbdf6b1b10425e33239d64aa WHIRLPOOL d238d2e803bb4867ca9692029a54fed753ee98e06e2805e8447ed845757bd238a92f0d1e4132ff49f195714519bf7939b697b86b36b86e3340651cbe90c5757c
+DIST GDM-VarietyBrushed.tar.gz 184087 SHA256 6c307eeaabceb7c55765769c67125afa9027b8367b20cb86f101ecf57f212321 SHA512 9d9a6b275cc677552926f5848cbb0b1f28a78d6eeab98f4e228619bf5656724ce30bf56d0c406822b7ca0c750fb37cf8869e6498d0827037f605d3230e9d9ec1 WHIRLPOOL a12191e43e2c654e40f53ea7c85aed8f7e37e4aabcb99a6c2886df875488b420461c46d3662d993b0fae74d081391eceebbd4838ec317608973bcf90c08bd453
+DIST GDM-WhiteFootOnGreen.tar.gz 30163 SHA256 b6fc4a4680a588813a04ab13bb915f326105fcdcb8cc8ddbf1dac700c3e7c187 SHA512 a4c810214cae747609294c6bbce8957ef19f20f0b6a8f5e792fb9889489095226193bcf9ba66b3b4990803b25f3f7bc88be839b27f5f7ff436bd9a1b7cbe5a7e WHIRLPOOL a273d12c61c80f0ec9bb8ab46c8e2c3a0d9dfc232c5460de9915ab81ec0d5806719d71eed0ece8c97b3d48206531e4a1bfbcbca24020e7f8c2f386ec0294c568
+DIST GDM-Wolf.tar.gz 411864 SHA256 e7461bd333512696b01542f9e10eec4924582bd2b265f1f59e73697063259d4a SHA512 381660d91760448e5349a2b65cf2c1fa15415ad5b5d1edd12e10c0596bd0077d7958e882cce71fe52cf24e56bdb5be86b438bf68ebe3dadf434a483c0de39b76 WHIRLPOOL 8b9a75d62c96a9993a7ce4a1e58dafdfa6d1b05298c1bea49663243db5f7f2ac399a9afa70097a6205c3ad7a31ea1573185be054230f13682dd6abc1caecf531
+DIST GDM-YZF600R.tar.gz 871289 SHA256 66ae484475effa63c3360f0a9331be91eddb8dd7611c96c2cc91e6c8e3a35c63 SHA512 19af12bd3d8eb05320a3f29be03d57db9393602fc9d1f83b926d8728c41fc47f1931024818b8c5cc09fbc7e0da4fff38f2636aa61d2dc22cc800dba297e42407 WHIRLPOOL 03e15be00409833c72490f2dac6f8a5aae7f975017297334b1d344ba82b2145030d1184bc6565336e9d016274c746a31e59330fb642015ee49f55fed6bf1d6cf
+DIST GDM-ZX6R.tar.bz2 141153 SHA256 94f628362f94fefe9a6255d08212e0f42dc2a9138ab2eedf68297dd29a318371 SHA512 c030ca7cc3b2929b906af427a1d5a6c2c087247df7ef60530f9cb0af00414f0929bd5d2fc99c0219f458ba42299cd2290f0c6a8b671b55ef751173e88cf15dd8 WHIRLPOOL f7a2362d5b19db0dc645511c8e4ad7f4d7d289597af6d69ce1c18e5b9bb9963c62ae1b9760a2ea33f5be011a6902f177209f69f3638ede883d7683d5198a4d64
+DIST GDM-ZenLogin.tar.gz 853286 SHA256 ac8bda4af35430462de2e1f6a6515aa012e2f2fe5477147d2ba97459be57aa3a SHA512 424f54040ca07f790504b1af860465221f140940e2d1ab97cdcd5f88a71ab4c525dfd21c90be42977c22a4e9fd42607e63d040e90a911fb39f0f65475710cd98 WHIRLPOOL f001b265241224fd0774c1f2a8f85339b90e40187643ae8787233bfe9c05d9575c3f221273a2301eed4ae63513f15ac8a2799d2f9d638c6d3a2e6d03c196023a
diff --git a/x11-themes/gdm-themes/gdm-themes-20070811-r1.ebuild b/x11-themes/gdm-themes/gdm-themes-20070811-r1.ebuild
index 3b67e116fd94..7085a89edc75 100644
--- a/x11-themes/gdm-themes/gdm-themes-20070811-r1.ebuild
+++ b/x11-themes/gdm-themes/gdm-themes-20070811-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/gdm-themes/gdm-themes-20070811-r1.ebuild,v 1.3 2011/12/21 08:55:59 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gdm-themes/gdm-themes-20070811-r1.ebuild,v 1.4 2012/12/28 11:24:25 ago Exp $
 
 inherit eutils
 
@@ -72,7 +72,7 @@ DEPEND="app-arch/unzip"
 SLOT="0"
 LICENSE="CCPL-Attribution-NonCommercial-NoDerivs-2.0 CCPL-Attribution-2.0 GPL-2
 LGPL-2.1 public-domain"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~ia64 ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 src_unpack() {