diff --git a/app-admin/apache-tools/Manifest b/app-admin/apache-tools/Manifest
index 471afe5a4f34..69ac15a56f02 100644
--- a/app-admin/apache-tools/Manifest
+++ b/app-admin/apache-tools/Manifest
@@ -4,3 +4,4 @@ DIST httpd-2.2.16.tar.bz2 4775545 RMD160 2e6d7d1dae40905be7fdd793140f62cf5811209
 DIST httpd-2.2.17.tar.bz2 4951247 RMD160 4a2f16f2891094d4176565fadf0e8fcadf7dbaff SHA1 5c9b44620dee449a86ba1bcba1715033c2c26b08 SHA256 868af11e3ed8fa9aade15241ea4f51971b3ef71104292ca2625ef2065e61fb04
 DIST httpd-2.2.20.tar.bz2 5174611 RMD160 299d1a8a9f3a6eb925d63ce96fa8ea4a06ec1f17 SHA1 c8f00a505af6ed3f89f45b640217c388f5cd32b0 SHA256 1ee914855249b09d9cd2e20e98a0ab02f15c270fe277d4a5c9b62975479fc81e
 DIST httpd-2.2.21.tar.bz2 5324905 RMD160 6464a03d78ab858b1288ea9eef4cd5f73b60a9f1 SHA1 c02f9b05da9a7e316ff37d9053dc76a57ba51cb4 SHA256 18d5591fe48cfbac44fc20316036ffe17456df60bc3a2aaad238d56c6445577f
+DIST httpd-2.2.22.tar.bz2 5378934 RMD160 237a26a7759e7e1af175900d598e25fb082a4eb9 SHA1 766cd0843050a8dfb781e48b976f3ba6ebcf8696 SHA256 dcdc9f1dc722f84798caf69d69dca78daa5e09a4269060045aeca7e4f44cb231
diff --git a/app-admin/apache-tools/apache-tools-2.2.22.ebuild b/app-admin/apache-tools/apache-tools-2.2.22.ebuild
new file mode 100644
index 000000000000..abb7dca66cd3
--- /dev/null
+++ b/app-admin/apache-tools/apache-tools-2.2.22.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/apache-tools/apache-tools-2.2.22.ebuild,v 1.1 2012/03/28 15:02:38 patrick Exp $
+
+EAPI="4"
+inherit flag-o-matic eutils
+
+DESCRIPTION="Useful Apache tools - htdigest, htpasswd, ab, htdbm"
+HOMEPAGE="http://httpd.apache.org/"
+SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE="ssl"
+RESTRICT="test"
+
+RDEPEND="=dev-libs/apr-1*
+	=dev-libs/apr-util-1*
+	dev-libs/libpcre
+	ssl? ( dev-libs/openssl )
+	!<www-servers/apache-2.2.4"
+
+DEPEND="${RDEPEND}
+	sys-devel/libtool"
+
+S="${WORKDIR}/httpd-${PV}"
+
+src_prepare() {
+	# Apply these patches:
+	# (1)	apache-tools-2.2.20-Makefile.patch:
+	#		- fix up the `make install' for support/
+	#		- remove envvars from `make install'
+	epatch "${FILESDIR}"/${PN}-2.2.20-Makefile.patch
+}
+
+src_configure() {
+	local myconf=""
+
+	# Instead of filtering --as-needed (bug #128505), append --no-as-needed
+	append-ldflags $(no-as-needed)
+
+	use ssl && myconf+=" --with-ssl=/usr --enable-ssl"
+
+	# econf overwrites the stuff from config.layout, so we have to put them into
+	# our myconf line too
+	econf \
+		--sbindir=/usr/sbin \
+		--with-z=/usr \
+		--with-apr=/usr \
+		--with-apr-util=/usr \
+		--with-pcre=/usr \
+		${myconf}
+}
+
+src_compile() {
+	cd support || die
+	emake
+}
+
+src_install () {
+	cd support || die
+
+	make DESTDIR="${D}" install
+
+	# install manpages
+	doman "${S}"/docs/man/{dbmmanage,htdigest,htpasswd,htdbm,ab,logresolve}.1 \
+		"${S}"/docs/man/{htcacheclean,rotatelogs}.8
+
+	# Providing compatiblity symlinks for #177697 (which we'll stop to install
+	# at some point).
+	pushd "${D}"/usr/sbin/ >/dev/null
+	for i in *; do
+		dosym /usr/sbin/${i} /usr/sbin/${i}2
+	done
+	popd "${D}"/usr/sbin/ >/dev/null
+
+	# Provide a symlink for ab-ssl
+	if use ssl; then
+		dosym /usr/sbin/ab /usr/sbin/ab-ssl
+		dosym /usr/sbin/ab /usr/sbin/ab2-ssl
+	fi
+
+	# make htpasswd accessible for non-root users
+	dosym /usr/sbin/htpasswd /usr/bin/htpasswd
+	dosym /usr/sbin/htdigest /usr/bin/htdigest
+
+	dodoc "${S}"/CHANGES
+}
diff --git a/app-admin/apache-tools/metadata.xml b/app-admin/apache-tools/metadata.xml
index 4d46b240afd5..6e8d6afcb08e 100644
--- a/app-admin/apache-tools/metadata.xml
+++ b/app-admin/apache-tools/metadata.xml
@@ -8,6 +8,13 @@
 	<maintainer>
 		<email>pva@gentoo.org</email>
 	</maintainer>
+        <maintainer>
+                <email>patrick@gentoo.org</email>
+        </maintainer>
+        <maintainer>
+                <email>mail@ghelm.de</email>
+                <name>Gerrit Helm (proxymaint)</name>
+        </maintainer>
 	<longdescription lang="en">
 		app-admin/apache-tools contains tools that might be useful without
 		having apache itself installed (like htdigest/htpasswd, but also ab -
diff --git a/app-editors/gummi/Manifest b/app-editors/gummi/Manifest
index 43437ae8bd78..9dd3d01bc9ff 100644
--- a/app-editors/gummi/Manifest
+++ b/app-editors/gummi/Manifest
@@ -2,3 +2,4 @@ DIST gummi-0.5.8-2.tar.gz 394256 RMD160 b4ad4daeda6caf5f9600072606305da7ec0c4e2d
 DIST gummi-0.6.0.tar.gz 495854 RMD160 fda103df3b69044a964a1e9dcb8561fa02d88df3 SHA1 6e6e3e790715efda49859e5a75a8c54f773c5c76 SHA256 7a8b54394fe5f56e9e142672889363ba2e0f6b9f28de3dfcbe53930f83a19485
 DIST gummi-0.6.1.tar.gz 499416 RMD160 c839517a14b405d61e647db4e968071305fa2348 SHA1 9e03f704fa44e39b0cbd14afd1b73d79375cd3a4 SHA256 d682f880a6566983d949632e3176da7df9e67e2079723511b3065551f1525547
 DIST gummi-0.6.2.tar.gz 500433 RMD160 b9ae15dff22eafe3080587251830bfa33f654995 SHA1 6f549c72c37a646d94c021563c2cc56d344a6ec0 SHA256 1d886e6036a9a480662f9cf3ae8afa4d1129929c16cb78081755ad1d10be8277
+DIST gummi-0.6.3.tar.gz 512054 RMD160 fbba691fe5a51558891d67e12f4e6d8c980055bb SHA1 caad875ec8c629e2e2c03675250a1c72c6e7d2c7 SHA256 d44196e56ed61e125bba01e5949be0928cf09919fdb80e62e6a41999a478f0ed
diff --git a/app-editors/gummi/gummi-0.6.3.ebuild b/app-editors/gummi/gummi-0.6.3.ebuild
new file mode 100644
index 000000000000..0e7e0a62f852
--- /dev/null
+++ b/app-editors/gummi/gummi-0.6.3.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gummi/gummi-0.6.3.ebuild,v 1.1 2012/03/28 19:11:11 hwoarang Exp $
+
+EAPI=4
+inherit base eutils
+
+DESCRIPTION="Simple LaTeX editor for GTK+"
+HOMEPAGE="http://gummi.midnightcoding.org"
+SRC_URI="http://dev.midnightcoding.org/attachments/download/263/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+LANGS="ar ca cs da de el es fr it nl pl pt pt_BR ro ru sv zh_CN zh_TW"
+
+for X in ${LANGS} ; do
+	IUSE="${IUSE} linguas_${X}"
+done
+
+RDEPEND="app-text/gtkspell:2
+	>=dev-libs/glib-2.28.6
+	dev-texlive/texlive-latex
+	dev-texlive/texlive-latexextra
+	>=x11-libs/gtk+-2.24:2
+	x11-libs/gtksourceview:2.0"
+DEPEND="${RDEPEND}
+	app-text/poppler[cairo]
+	x11-libs/gtksourceview:2.0
+	x11-libs/pango"
+
+DOCS=( AUTHORS ChangeLog README )
+
+src_prepare() {
+	strip-linguas ${LANGS}
+}
+
+pkg_postinst() {
+	elog "Gummi >=0.4.8 supports spell-checking through gtkspell. Support for"
+	elog "additional languages can be added by installing myspell-** packages"
+	elog "for your language of choice."
+}
diff --git a/app-misc/gentoo/Manifest b/app-misc/gentoo/Manifest
index f0ecfd19493c..532030b0caf7 100644
--- a/app-misc/gentoo/Manifest
+++ b/app-misc/gentoo/Manifest
@@ -1 +1,2 @@
 DIST gentoo-0.19.12.tar.gz 1538940 RMD160 c63d8fae26b37dfca52686e0848ef27a1d9a9725 SHA1 fd98fa39c977175ca015c79659a7ef817ed26dfd SHA256 a19489210752c3e230c70a43d673a9b3479b06153909aefbe91469b08c5798e0
+DIST gentoo-0.19.13.tar.gz 1541738 RMD160 73cbedc7c34299fd87c16f7286ef46bdfc385417 SHA1 7f5a514bb446a7b14868254dad2e4f121fc8639e SHA256 6afafeacd54a18d97e217ad10df1b555274ac856f050e10888109d405ebdc092
diff --git a/app-misc/gentoo/gentoo-0.19.13.ebuild b/app-misc/gentoo/gentoo-0.19.13.ebuild
new file mode 100644
index 000000000000..1e7cb2dc4b77
--- /dev/null
+++ b/app-misc/gentoo/gentoo-0.19.13.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gentoo/gentoo-0.19.13.ebuild,v 1.1 2012/03/28 15:42:29 jer Exp $
+
+EAPI=4
+inherit autotools eutils
+
+DESCRIPTION="A modern GTK+ based filemanager for any WM"
+HOMEPAGE="http://www.obsession.se/gentoo/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="nls"
+
+RDEPEND=">=x11-libs/gtk+-2.24:2
+	>=dev-libs/glib-2
+	x11-libs/gdk-pixbuf
+	x11-libs/pango"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )"
+
+DOCS=(
+	AUTHORS BUGS CONFIG-CHANGES CREDITS NEWS README TODO docs/{FAQ,menus.txt}
+)
+
+src_prepare() {
+	sed -i \
+		-e 's^icons/gnome/16x16/mimetypes^gentoo/icons^' \
+		gentoorc.in || die
+	sed -i \
+		-e '/GTK_DISABLE_DEPRECATED/ d' \
+		-e '/^GENTOO_CFLAGS=/s|".*"|"${CFLAGS}"|g' \
+		configure.in || die #357343
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--sysconfdir=/etc/gentoo \
+		$(use_enable nls)
+}
+
+src_install() {
+	default
+
+	dohtml -r docs/{images,config,*.{html,css}}
+	newman docs/gentoo.1x gentoo.1
+	docinto scratch
+	dodoc docs/scratch/*
+
+	make_desktop_entry ${PN} Gentoo \
+		/usr/share/${PN}/icons/${PN}.png \
+		"System;FileTools;FileManager"
+}
diff --git a/app-office/libreoffice/libreoffice-3.4.5.2.ebuild b/app-office/libreoffice/libreoffice-3.4.5.2.ebuild
index 13a3e7bdd054..482b5f38229e 100644
--- a/app-office/libreoffice/libreoffice-3.4.5.2.ebuild
+++ b/app-office/libreoffice/libreoffice-3.4.5.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/app-office/libreoffice/libreoffice-3.4.5.2.ebuild,v 1.11 2012/03/22 15:07:05 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.5.2.ebuild,v 1.12 2012/03/28 15:23:59 scarabeus Exp $
 
 EAPI=4
 
@@ -195,6 +195,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-honor-strip.patch"
 	"${FILESDIR}/${PN}-java.patch"
 	"${FILESDIR}/${PN}-kde48.patch"
+	"${FILESDIR}/${PN}-kde-4.8.1-namespace.patch"
 )
 
 REQUIRED_USE="
diff --git a/app-shells/bash/bash-4.2_p20.ebuild b/app-shells/bash/bash-4.2_p20.ebuild
index 1d9d1948417a..069acc14e112 100644
--- a/app-shells/bash/bash-4.2_p20.ebuild
+++ b/app-shells/bash/bash-4.2_p20.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-shells/bash/bash-4.2_p20.ebuild,v 1.10 2012/03/25 16:31:53 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.2_p20.ebuild,v 1.12 2012/03/28 18:13:09 vapier Exp $
 
 EAPI="1"
 
@@ -34,7 +34,7 @@ SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
 IUSE="afs bashlogger examples mem-scramble +net nls plugins vanilla"
 
 DEPEND=">=sys-libs/ncurses-5.2-r2
@@ -105,6 +105,9 @@ src_compile() {
 	# in the PM (and the readline ebuild itself preserves the old
 	# libs during upgrades), linking against the system copy should
 	# be safe.
+	# Exact cached version here doesn't really matter as long as it
+	# is at least what's in the DEPEND up above.
+	export ac_cv_rl_version=6.2
 
 	# Force linking with system curses ... the bundled termcap lib
 	# sucks bad compared to ncurses.  For the most part, ncurses
@@ -113,7 +116,7 @@ src_compile() {
 
 	use plugins && append-ldflags -Wl,-rpath,/usr/$(get_libdir)/bash
 	econf \
-		--with-installed-readline \
+		--with-installed-readline=. \
 		--with-curses \
 		$(use_with afs) \
 		$(use_enable net net-redirections) \
diff --git a/app-shells/bash/bash-4.2_p24.ebuild b/app-shells/bash/bash-4.2_p24.ebuild
index aac54414b91f..a752a81d5ab2 100644
--- a/app-shells/bash/bash-4.2_p24.ebuild
+++ b/app-shells/bash/bash-4.2_p24.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-shells/bash/bash-4.2_p24.ebuild,v 1.3 2012/03/18 23:57:59 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.2_p24.ebuild,v 1.5 2012/03/28 18:14:48 vapier Exp $
 
 EAPI="1"
 
@@ -35,10 +35,10 @@ SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="afs bashlogger examples mem-scramble +net nls plugins vanilla"
+IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline vanilla"
 
 DEPEND=">=sys-libs/ncurses-5.2-r2
-	>=sys-libs/readline-6.2
+	readline? ( >=sys-libs/readline-6.2 )
 	nls? ( virtual/libintl )"
 RDEPEND="${DEPEND}
 	!<sys-apps/portage-2.1.7.16
@@ -105,6 +105,9 @@ src_compile() {
 	# in the PM (and the readline ebuild itself preserves the old
 	# libs during upgrades), linking against the system copy should
 	# be safe.
+	# Exact cached version here doesn't really matter as long as it
+	# is at least what's in the DEPEND up above.
+	export ac_cv_rl_version=6.2
 
 	# Force linking with system curses ... the bundled termcap lib
 	# sucks bad compared to ncurses.  For the most part, ncurses
@@ -113,13 +116,14 @@ src_compile() {
 
 	use plugins && append-ldflags -Wl,-rpath,/usr/$(get_libdir)/bash
 	econf \
-		--with-installed-readline \
+		--with-installed-readline=. \
 		--with-curses \
 		$(use_with afs) \
 		$(use_enable net net-redirections) \
 		--disable-profiling \
 		$(use_enable mem-scramble) \
 		$(use_with mem-scramble bash-malloc) \
+		$(use_enable readline) \
 		${myconf}
 	emake || die
 
diff --git a/dev-embedded/urjtag/metadata.xml b/dev-embedded/urjtag/metadata.xml
index e6baa74d944c..0a2550a0f9af 100644
--- a/dev-embedded/urjtag/metadata.xml
+++ b/dev-embedded/urjtag/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 <herd>dev-embedded</herd>
 <use>
-  <flag name='ftdi'>Enable support for USB FTDI chips
-    (<pkg>dev-embedded/libftdi</pkg>)</flag>
+ <flag name='ftd2xx'>Enable support for USB FTDI chips via <pkg>dev-embedded/libftd2xx</pkg></flag>
+ <flag name='ftdi'>Enable support for USB FTDI chips via <pkg>dev-embedded/libftdi</pkg></flag>
 </use>
 </pkgmetadata>
diff --git a/dev-embedded/urjtag/urjtag-9999.ebuild b/dev-embedded/urjtag/urjtag-9999.ebuild
index 195c14f49008..28aa0bd6b83c 100644
--- a/dev-embedded/urjtag/urjtag-9999.ebuild
+++ b/dev-embedded/urjtag/urjtag-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/dev-embedded/urjtag/urjtag-9999.ebuild,v 1.1 2012/03/12 03:17:35 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/urjtag/urjtag-9999.ebuild,v 1.2 2012/03/28 17:30:31 vapier Exp $
 
 # TODO: figure out htf to make python.eclass work
 
@@ -22,9 +22,10 @@ HOMEPAGE="http://urjtag.sourceforge.net/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="ftdi readline static-libs usb"
+IUSE="ftd2xx ftdi readline static-libs usb"
 
 DEPEND="ftdi? ( dev-embedded/libftdi )
+	ftd2xx? ( dev-embedded/libftd2xx )
 	readline? ( sys-libs/readline )
 	usb? ( virtual/libusb:1 )"
 RDEPEND="${DEPEND}
@@ -44,6 +45,7 @@ src_configure() {
 		--disable-python \
 		$(use_with readline) \
 		$(use_with ftdi libftdi) \
+		$(use_with ftd2xx) \
 		$(use_enable static-libs static) \
 		$(use_with usb libusb 1.0)
 }
diff --git a/dev-lang/v8/v8-3.8.9.16.ebuild b/dev-lang/v8/v8-3.8.9.16.ebuild
index 7c81d448a38d..aad36cc7a141 100644
--- a/dev-lang/v8/v8-3.8.9.16.ebuild
+++ b/dev-lang/v8/v8-3.8.9.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/dev-lang/v8/v8-3.8.9.16.ebuild,v 1.1 2012/03/26 23:50:17 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/v8/v8-3.8.9.16.ebuild,v 1.2 2012/03/28 19:02:52 phajdan.jr Exp $
 
 EAPI="4"
 
@@ -14,7 +14,7 @@ SRC_URI="http://commondatastorage.googleapis.com/chromium-browser-official/${P}.
 LICENSE="BSD"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 x86 ~x64-macos ~x86-macos"
 IUSE=""
 
 pkg_pretend() {
diff --git a/dev-perl/IO-Interface/IO-Interface-1.03.ebuild b/dev-perl/IO-Interface/IO-Interface-1.03.ebuild
index 8eb22d20a0eb..786fb7249a1d 100644
--- a/dev-perl/IO-Interface/IO-Interface-1.03.ebuild
+++ b/dev-perl/IO-Interface/IO-Interface-1.03.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/IO-Interface/IO-Interface-1.03.ebuild,v 1.7 2012/03/25 16:10:50 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/IO-Interface/IO-Interface-1.03.ebuild,v 1.8 2012/03/28 17:42:08 armin76 Exp $
 
 inherit perl-module
 
@@ -12,6 +12,6 @@ IUSE=""
 
 SLOT="0"
 LICENSE="|| ( Artistic GPL-2 )"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="alpha amd64 ppc x86"
 
 SRC_TEST="do"
diff --git a/dev-perl/IO-Interface/IO-Interface-1.60.0.ebuild b/dev-perl/IO-Interface/IO-Interface-1.60.0.ebuild
index c2d2743d221b..17cc677a3321 100644
--- a/dev-perl/IO-Interface/IO-Interface-1.60.0.ebuild
+++ b/dev-perl/IO-Interface/IO-Interface-1.60.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/IO-Interface/IO-Interface-1.60.0.ebuild,v 1.5 2012/03/25 16:10:50 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/IO-Interface/IO-Interface-1.60.0.ebuild,v 1.6 2012/03/28 17:42:08 armin76 Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Perl extension for access to network card configuration information"
 
 SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 x86"
+KEYWORDS="alpha amd64 ppc ~ppc64 x86"
 IUSE=""
 
 SRC_TEST="do"
diff --git a/dev-perl/Test-SubCalls/Test-SubCalls-1.90.0.ebuild b/dev-perl/Test-SubCalls/Test-SubCalls-1.90.0.ebuild
index a5564a9d8d85..f7281cbba566 100644
--- a/dev-perl/Test-SubCalls/Test-SubCalls-1.90.0.ebuild
+++ b/dev-perl/Test-SubCalls/Test-SubCalls-1.90.0.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/dev-perl/Test-SubCalls/Test-SubCalls-1.90.0.ebuild,v 1.2 2011/09/03 21:05:07 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Test-SubCalls/Test-SubCalls-1.90.0.ebuild,v 1.3 2012/03/28 17:33:00 armin76 Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Track the number of times subs are called"
 
 SLOT="0"
-KEYWORDS="amd64 ~ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
 IUSE=""
 
 DEPEND=">=dev-perl/Hook-LexWrap-0.20
diff --git a/dev-util/eric/Manifest b/dev-util/eric/Manifest
index 3cdbcaead72a..a086495f6ef1 100644
--- a/dev-util/eric/Manifest
+++ b/dev-util/eric/Manifest
@@ -1,58 +1,48 @@
 DIST eric4-4.4.14.tar.gz 6677208 RMD160 5ce31c30ce6d1a817c67f68abdae0d6ea97c8b92 SHA1 cd706e4eed52e62739980c9b0837f6fd0a0bdedb SHA256 7ff8548c419f3ed09100e84d4c94ffce74bae8eb5ce956bf43f3a79308e86822
-DIST eric4-4.4.19.tar.gz 7319253 RMD160 bba9667aa3c9e93113040d2c9466e209450be798 SHA1 a31eed62d07a1aa136d577fe87f50904bd6a096c SHA256 e2536babe6638c590561bbd957317e7a5bfe028b1fed259a3bac48ea35ab2aa7
 DIST eric4-4.5.0.tar.gz 7986864 RMD160 b3eff69618bbb5ab4f10bbfbca3c2f9599c47026 SHA1 4b9112ce55741de60929a7e6defc2b8d717af761 SHA256 213a415fe56e9e2e0dfa12c190b6c2ae26d4a949f8ef0062edcf58f97a4775d3
+DIST eric4-4.5.1.tar.gz 7987795 RMD160 d8892f1ed398981a5baaa2f84d13be50ebc4101f SHA1 0dc2e7eaab4ae4887ecbe9ce880c1e8d6206eaee SHA256 69407b1c9b729db50a6fff2953294eb45bfa6abd61a178452ce95d56a26bab25
 DIST eric4-i18n-cs-4.4.14.tar.gz 452074 RMD160 cada51a61ab0fe7bf6681da090f187b464a58663 SHA1 f5fce1cb325fdae3ab34ad5b75a37443db7cc1aa SHA256 1b1f74a2ffc173f177e19f8beadc8d11c954359ead15f36e16e2a429d61bf76b
-DIST eric4-i18n-cs-4.4.19.tar.gz 452072 RMD160 eaf0fb59882ddeced92f47702bb864abac2be0b5 SHA1 d88ae16f25dc047704d14bd782a14ed6daaf4f15 SHA256 433eb2c2d2002e5b1d5e7cf1295485362717a7d9050268a4f322ab3e2e52acfa
 DIST eric4-i18n-cs-4.5.0.tar.gz 456601 RMD160 13ec241835e50e0c6910ad16ab76c2093e5a7c90 SHA1 ddf207c622e0c9730601ccb1d596d37cdca39ab7 SHA256 e5755882e9d580ef90bb5020c6adad983a52861e8711c2c06fe572a43a3e77fb
+DIST eric4-i18n-cs-4.5.1.tar.gz 456684 RMD160 d29173d6149cd4c77ee31908f6fbb5180ad94f44 SHA1 bf55de76536675b4028264ecb1524318dc37d6f4 SHA256 d2804ce8016b74ee0305f9873cc01a9b4b08f71d141f8e7f9f4985c4c84ad5a5
 DIST eric4-i18n-de-4.4.14.tar.gz 452987 RMD160 2226f13a67d577dd92c254f4f78d195ce8841611 SHA1 bc4795378e73a33e46e7dee6d2e7fbbb6cef4205 SHA256 e66aa50305b12e82d8227d360b226bf25f406f5273fa54e02092608d0b44275b
-DIST eric4-i18n-de-4.4.19.tar.gz 452984 RMD160 bea4984e694fa6a54cfbcb4279e6b15e2cc28004 SHA1 3d80fb77016a1254f30e10f91dbf9adbca8afe0e SHA256 63078d14794767ffdfd6424f06acf3372e083eff6eef317f96ccc0858782405b
 DIST eric4-i18n-de-4.5.0.tar.gz 468372 RMD160 084dec0bdfa4ba950a10a22b643e5e4596145bf7 SHA1 e1daac3c9972c8d9c1b428232206c39bf10b9a77 SHA256 67e44e8435992731a9154a4aec8f641f84c4c067b14282e2f4fb7a44595d0764
-DIST eric4-i18n-en-4.4.19.tar.gz 122559 RMD160 2bd721e5efd8cc41208eba0552fd9da5047bbd63 SHA1 4e7edb36361afa57c0bd04c242881ed79e9097c1 SHA256 a8fa4baf3b9ca343a3f21ddd562a11d2c3cd6bd91bada356fa7f3cb3f114ed2f
+DIST eric4-i18n-de-4.5.1.tar.gz 468544 RMD160 49fa472dce484a00a1b1e3a73b3d3618d36d93c9 SHA1 5c900b1e6c12b8469431818a1684e0f31cb1e946 SHA256 345b783c127ea3df15b21e5eac3d4947741b4af2f3012934d19fad64394f25ce
 DIST eric4-i18n-en-4.5.0.tar.gz 126444 RMD160 88bbe0731cc39ba2d8cf3db030d8a1cad5a8cf6b SHA1 35a289b76b6fcd687161499becfe12881e8a0023 SHA256 345cbbc3212f6ebe5d37bb5d339b4a85ec45046d7beb8b1359e0a22807f9be44
+DIST eric4-i18n-en-4.5.1.tar.gz 126492 RMD160 a253050aed88dbd2846fecca8c9e1c6af08d765d SHA1 649a58901ee5abb3d3d760b967752a413ae4f910 SHA256 ba5aa54d683d2f187438b49126ea716d72f4fa5462bd79cb49b367e0ff107be4
 DIST eric4-i18n-es-4.4.14.tar.gz 456855 RMD160 ca4e35087137e10481264bda3bc75eab890d01f0 SHA1 9a2be60bbe1e731bc903edf9d7a51f3c8d78405c SHA256 602ba2005a9bafbe3cbcaedaec4c085a1cd14c6c1c71c1ac1db8f3e714356d82
-DIST eric4-i18n-es-4.4.19.tar.gz 456852 RMD160 e4bf7b140d9a753480fdc125720641c0bff3411e SHA1 4c3897ab65f5727a16eeb07acca8a51d3681ff61 SHA256 08899557d30f15d9f1da8cd09a5ce0415b242a955d7ec35845eb2d4e6340c410
 DIST eric4-i18n-es-4.5.0.tar.gz 472467 RMD160 0ed63ae05f48005a19e41fe81691278b9eb158dd SHA1 a4f242af359eca8b0019980bca847626aa82cabf SHA256 c8bd970ef804007976653ab1c5369969855bea755bfebd6ac1844bc2d093a246
+DIST eric4-i18n-es-4.5.1.tar.gz 472980 RMD160 963b15ba2786a42b9ef599bdfa3b9a73ac99a63e SHA1 8720cded5cd03d9bc54ea87e658f20a5e9c4d131 SHA256 fb4e8c7063643b28d8dfdbbf3215581ca6af77d683a3613a41ae69cb3efe21f5
 DIST eric4-i18n-fr-4.4.14.tar.gz 430151 RMD160 f372ca5c8341c2e6c743878f8ed93197234908fc SHA1 54ef2d555b6063fb092150799dd9b7a120b6bac4 SHA256 d9f58894b61b8720fe75762df7475cf023742a466499744b8bc32b6674c2690d
-DIST eric4-i18n-fr-4.4.19.tar.gz 457548 RMD160 be9974c02af5e0a3c3615762b38aeb0d8acc0a40 SHA1 0e816f54ce1b809f921bf0b05681b07998cdd784 SHA256 5a48957b513bf87f42e286b55083fdf095dac942a0eed71d48467b6ac499d510
 DIST eric4-i18n-fr-4.5.0.tar.gz 471361 RMD160 6c1ed4256341c594f2392cc2e8858079cf47815a SHA1 4e226ca1c627b3279890af249c52fff79ec45624 SHA256 32b21e91e02fc776eb0fc16e01263ae538471ad0b5ed1ef3154f2898377cd69a
+DIST eric4-i18n-fr-4.5.1.tar.gz 471451 RMD160 e8e7350050a86597ce277260159590be708bcd7a SHA1 2356691f465a67cc3b758dca29281876df0cc2b0 SHA256 db0751f7dcc06921132c73b1a1be83aa6a3200104b2567279c850ccd02a1c10f
 DIST eric4-i18n-it-4.4.14.tar.gz 445334 RMD160 aa9d13630338a8c3c96fd45647086f2ce2b4f49a SHA1 124c13ce61aeb198440916e9642324f75fb6900f SHA256 3fbd0e1b222d197da9bb909385eec99fdb10d7e07aad4b9e4be3bee7f3faf23b
-DIST eric4-i18n-it-4.4.19.tar.gz 445331 RMD160 b895839b9d83973d58e4e4bf3f7f985ed52f1710 SHA1 54c24dfeee0095fbe8d108f217103adf6bf0b6ec SHA256 0b597c2d2bd63603df6fa768a1dd0f62f5d29472aec74cdfaac3282c08a2a6ee
 DIST eric4-i18n-it-4.5.0.tar.gz 461086 RMD160 e9c13d3a820dbac0adbe4d136086e38ad6cfc100 SHA1 bab7302a7942d1c2be9396b2c7b427d16c7670aa SHA256 448a9a5142d6430a0725fa7ba680e22a43f86e001ac4923d82eb4995dd2f10ef
+DIST eric4-i18n-it-4.5.1.tar.gz 461170 RMD160 f5fadaea5a49d4d706cb09846c0e0cddd7fa8309 SHA1 fc7c30c86666c5fa17f1084d43e005e2a56837a1 SHA256 fc36457b63776f7034459edae053aad9994e453066d63b3f54ce3cc0108d886b
 DIST eric4-i18n-ru-4.4.14.tar.gz 472659 RMD160 04f967c6989cd0a217f95e8bd1bb6fa396abca5a SHA1 9cbd66472798918eeeb4eb1884b3947a9f6f88df SHA256 a4174b538cccf77ed130d8c1414860ac8658600d236adecac29e09fdc601151c
-DIST eric4-i18n-ru-4.4.19.tar.gz 472655 RMD160 e4dc996e9c1f645890c4ddf14f34bf03f5699d86 SHA1 cd53007b37c7db9e7046b52baae0eeffdc5ea690 SHA256 c488a66283dc7541e773abe57be540607fcbb87c81e0f05e319f7fad030a6c65
 DIST eric4-i18n-ru-4.5.0.tar.gz 478204 RMD160 2b83436aa88feeb0ce1799fc5b98c83234e176ae SHA1 962873750747e9148e9cec4164fc06b0984cd352 SHA256 c06937b19b563963cc6b3bdd99783146a4e9169bdd28c714434d181c9c7a0ab2
+DIST eric4-i18n-ru-4.5.1.tar.gz 478294 RMD160 d47fbc66bb9437dfe5f38fb24da7d818efb5db45 SHA1 772768964c67480cb1204d3baab790c88e402e6d SHA256 579215af7755b960b021e42308d53dc7c89a287d5e92b40bc612d229ae3a77fa
 DIST eric4-i18n-tr-4.4.14.tar.gz 357758 RMD160 8f83c5a928a5cbd9fa7c558c11c59e8082873260 SHA1 da6981987fe2b1380850a4d51ad271f8400734d7 SHA256 d125de55e8914bad5cd75885488c9e5d548e6066318e150b72e833e5d1a8b78f
-DIST eric4-i18n-tr-4.4.19.tar.gz 357755 RMD160 d6872a8fe526950846ac41cf98b66e6e9b64adec SHA1 9700f4836512f481154bfc21f6a5badff7809def SHA256 f4c53779f3ecaa3b70151005f5f10155df5ac9677732ec5f590329be4a6df53b
 DIST eric4-i18n-tr-4.5.0.tar.gz 355691 RMD160 5af83ff7518e40b8b6aca06de6f4ff6e9a4c17ba SHA1 b951044dd011b89b12323ab013484499dde09003 SHA256 3d1016833475af50f02a84031ff06727ed61c8627a89d7e167958d3fdc59eb3c
+DIST eric4-i18n-tr-4.5.1.tar.gz 355747 RMD160 95cfba57938359575ce32d82a2af8f215e14b866 SHA1 70af3c9dc3f087daa01b8e34aafc569da94f392f SHA256 eca585769316a4cfc4422a74f4aef32b7bc767db6618b012f44fbb016e5554db
 DIST eric4-i18n-zh_CN.GB2312-4.4.14.tar.gz 392204 RMD160 20f0222cd5e6f01c4ca43fc48a727fb46fd1ea35 SHA1 67d612b90ee98b57f01b77ab7bec2285e3ba93fb SHA256 82f1b955817b2026781f937caa5475871f3e9557e0e77c2903a4d36ce1e3c2e7
-DIST eric4-i18n-zh_CN.GB2312-4.4.19.tar.gz 392199 RMD160 3c4c2da84beb2cf9dbd28b45ad162c958f9de594 SHA1 d8b650cd53083038171f0180d473297481857a6d SHA256 63a393bad8edfcdfe08977184abc10121e83f630f42a41b11ce9a4b008c0e919
 DIST eric4-i18n-zh_CN.GB2312-4.5.0.tar.gz 388679 RMD160 abb2d6f1953dff64553f40c354c528c4afca2009 SHA1 0dd51e2e0901d0503629ea2d76241acc5adfa67d SHA256 bb3080582edf3512fe9a8eb177dc23e4f9b35e94dc351e83bcb95ad749f853d9
+DIST eric4-i18n-zh_CN.GB2312-4.5.1.tar.gz 388727 RMD160 a8f3883e11125eda741bb2bbb6621acbabaa3e38 SHA1 a71f4cd839f5aadb8fa3e90d6cb13bdc8ce5a879 SHA256 1e28227857ab543004ee1385642f15b102cf3c1d4fe046276abab8dcded3362e
 DIST eric5-5.1.2.tar.gz 7217433 RMD160 e02bae94f338d4e9181d2f3cd18c594f1c9962c6 SHA1 853f67dec620c53b732ec7ec19a87d87fc72dc7e SHA256 14b095affa96d100e67969d6c3626ee611caa7d4497279d8be91775e6ee4d44d
-DIST eric5-5.1.7.tar.gz 7871838 RMD160 e8d70e4255eb8eadc2b07cefe8a9df33a827088f SHA1 6d4c1a5ecc643caae9e1f06f022dbe6b8001f879 SHA256 e8c91327c180c71e636cd281409186b05aad734733a51f1077a14f11ce54cc53
 DIST eric5-5.2.0.tar.gz 8832214 RMD160 d5e76a258b18b59a84b75f207d926589afbb6784 SHA1 65d9ca655d455de113543d425882122e82c0a923 SHA256 18fea6c012dce4326629777e8e55d8d56dab0d16497d7ed4924b7e6075838982
 DIST eric5-i18n-cs-5.1.2.tar.gz 502070 RMD160 8f06931229b2e5cbf76abc0543fe70b9e21217f4 SHA1 58ece324be205c8bd6e666a80610f2bf0374a63c SHA256 073425bf1be885e4ec405efb1eda829c7bf86e5b983875da2a9e9d186d487c4d
-DIST eric5-i18n-cs-5.1.7.tar.gz 502697 RMD160 70bf4dcfd30919a5676f5df44c46a72ad7303ed0 SHA1 7837f7a4109257d0d0d891b31d9c48561c4b1cca SHA256 10c5e94253d819f9c6a39e9bedb6e0c1b605ca6fda8bc004eec775968bbeb94b
 DIST eric5-i18n-cs-5.2.0.tar.gz 530064 RMD160 428bae008a6fc657a080fe1331f25cb02ed480c6 SHA1 4e3ce610926a56b04cc7a4301f60b8157e0fb96c SHA256 44979acf362742af87bbf572f00b15eb031a3f8378b616cdb4b276e084843f66
 DIST eric5-i18n-de-5.1.2.tar.gz 531114 RMD160 1d9c37c4eea2022cedeb4622e0fb65cf40ee9d6f SHA1 e51395ddd7d8bb1b4a1282dab46b80a5fb9a0bd1 SHA256 5ea945c17c88eab0bbade1b3dbe7aa76213be26437151cfebd3275ca282622df
-DIST eric5-i18n-de-5.1.7.tar.gz 532337 RMD160 87778fda366179193721095b37ee90e58c1e9388 SHA1 76c0696282836ec47299a1ab44650d1b7ed5e48e SHA256 86f3e33950c19715c2d357f54ae2e7ff9e9a2bdc3139fb026fe7f005baf95c7f
 DIST eric5-i18n-de-5.2.0.tar.gz 600706 RMD160 ca5e372868e33a7c87e8a05fcd66f81a45077d71 SHA1 f5e7111bfe8e3ffbe69a1fbb56253eee145f4f6b SHA256 e877139f2440506a1884007e820b8592f37ae3136727258ae352af706083e19b
-DIST eric5-i18n-en-5.1.7.tar.gz 145230 RMD160 7ada1aad68d12dd630794a80889f9b8a6b79faba SHA1 6df78c1a7ceb2e29aec8bf82059dfa00b2cb6080 SHA256 5ba11a0e91057c1963d3b5bb55c2af8372e5e9c0041262e0b5db11497a151937
 DIST eric5-i18n-en-5.2.0.tar.gz 162856 RMD160 4a64794d2a9b87fb10b103f6c742505e4aae99dd SHA1 fa1e7d7ff0619b09f154b445ec99e3d7189f3fea SHA256 9ddd8db9d2495c1efd43d51e4919f667420594b200db6ed7f0c18f1afc26eefe
 DIST eric5-i18n-es-5.1.2.tar.gz 535570 RMD160 ec08584a1509852d739a2f661e0ee9e5c7bf5c8b SHA1 31ef56a8c3fa245fdedbcfe57628b8934090ea52 SHA256 12c46ddc72b6285924c21daeff62a4964fc9d1529ff760cebbe615822da0b832
-DIST eric5-i18n-es-5.1.7.tar.gz 536745 RMD160 08d38458d55d0592352fd68a83f33c9e7991a075 SHA1 1d4fa864b70e1d1e3f1be87f405cda32d911bcf9 SHA256 6f5b317326ec402f63a6e6bdcd10af67e2855b7c0f99dcdb2ce8ca562d838dc6
 DIST eric5-i18n-es-5.2.0.tar.gz 606047 RMD160 db43cb4642f7f0c06a5f1fcd2ee24613cfb6748c SHA1 a6116f5d404718979fa57713593dfc13dd6d151f SHA256 09f086f6f76ad3476c975fc082680ae04e626b56b450f9f5fd7c8f954bd33f1f
 DIST eric5-i18n-fr-5.1.2.tar.gz 423505 RMD160 7f2097b121e1d964cfb9a63fae5b59b6649433f8 SHA1 54b7e081745415c8bb2dadd2036a8923db00c706 SHA256 853fe42e119df2246d533e25ee9a73ffb48239b851b0c2c7b5ce88f0c788c346
-DIST eric5-i18n-fr-5.1.7.tar.gz 424237 RMD160 f6e566f70f09af5a8667e7f0c421dd143e0170b9 SHA1 4480423613f1b47512a682c5b2efaf7468876964 SHA256 991ac86b38331e7aabae138746646e091729c023c232490bff2ea3824c163056
 DIST eric5-i18n-fr-5.2.0.tar.gz 470679 RMD160 ff9ffae4dd6bdb8049b6727d3879f2532f6577b5 SHA1 bfc418ea36244aea27f9d85bae42eb3ae1878e0f SHA256 6c6e498db3245938e318c8ca9f02e85b9e096e9c7f6db9af277ff0ccf9c88a8e
 DIST eric5-i18n-it-5.1.2.tar.gz 523308 RMD160 b40ac0d64cfbf5d913388e4c7a5643e499c22440 SHA1 7efdf31dea4cd7f9617ba507b1ded2c95ad570c1 SHA256 0285b7c8515ee168885407ad10f1d45a352200ff0bca805bb8c49b8a3328aa06
-DIST eric5-i18n-it-5.1.7.tar.gz 524052 RMD160 da04153a64110a95bc2c4b8c46593ff2516f7c0a SHA1 9b4afedacec15e5db4580381651f9fd98af79e6b SHA256 8b4db00e694057530f0ac2706d45c2bc9aeb8fc61cb863609f998bc126060794
 DIST eric5-i18n-it-5.2.0.tar.gz 547717 RMD160 0f76d72c78382a39206a53628dcee17c28b33b2d SHA1 be5e360cebdcf67bc96510ed3d11f9f20d800f5c SHA256 421b503b9432f2da41a174cd44506ad3201abe19c5f6176c7a58a5f14242006c
 DIST eric5-i18n-ru-5.1.2.tar.gz 549398 RMD160 fb54c30e645fbf5451985a45b5984b55f659e86f SHA1 2687a6e17e91f6fabc79926d258fed31d1545841 SHA256 80fc756c905bbeaa837b70a96bf6487267f451b2edee8b172b4acea014cbd947
-DIST eric5-i18n-ru-5.1.7.tar.gz 550251 RMD160 d154b3e030dec22d1c8812606a39c99a81a3447a SHA1 27297fad381279b8fce2ac14cac95cc3841a2a1a SHA256 ff0f9ee7be67b90295805a684c15670db6b9483b576cd4be00913334e6cec0e5
 DIST eric5-i18n-ru-5.2.0.tar.gz 576765 RMD160 ca71a0534ecf087cdc8c33ccb6a47407ca79b90b SHA1 668d5fc1611611ed8f14960bcbbf1a0ab0004c31 SHA256 8b884c75f11882857987e17940e3ffbe5d524dc8288a8a33e74c4be3a1561d0d
 DIST eric5-i18n-tr-5.1.2.tar.gz 424715 RMD160 9133070f96cc34347a4410d02d06de5b933799ea SHA1 430b26dab77138a73a5ba6792604b256b6b64c85 SHA256 95615b371e709979a660398eae905f7736b31e309f03ac3ae15ba9e962a79f0a
-DIST eric5-i18n-tr-5.1.7.tar.gz 425501 RMD160 6957484b00a364ecfc6b159e782e5eb6da465d02 SHA1 135238163fd87e43bd772cb397bc5863b3bf11b9 SHA256 301f5f35eb231e475c4da24f8e1f7c3028074b829910198f92e85d0d3605b2eb
 DIST eric5-i18n-tr-5.2.0.tar.gz 450185 RMD160 1b014674cff7067be972212e84b7271b1c54ea6f SHA1 84bacb905d68bc6905668dd1d70c23eee8ea18d8 SHA256 8ee63dbb8e60aef5952070045f991afa046f00600a5e2c1b59ccb8527e78b40f
 DIST eric5-i18n-zh_CN.GB2312-5.1.2.tar.gz 388663 RMD160 58f55d52a36442c60ef09d1107241ba6bc0de381 SHA1 81cd1474a5c91b4a8d1a081bdba40ff5d90247ac SHA256 ccc071162d8675beeb5afca2548632421b1e61e54abced6c7750816db4e03df7
-DIST eric5-i18n-zh_CN.GB2312-5.1.7.tar.gz 389317 RMD160 6c39fad1678c90610416fefaa6fefa98f393f2d8 SHA1 43442df45a148457b808fa76ae62684b1abc46c5 SHA256 c3e381a72655005e4270e9768d49fd7748c8269e197088e4caced2dfa70ca327
 DIST eric5-i18n-zh_CN.GB2312-5.2.0.tar.gz 436144 RMD160 b349bf407f2bc7e10f661898b06ddd4b34ad4e72 SHA1 b78df48cbde03c528593b2d85a3632db8e412562 SHA256 9d161d2f6e181d6205e7377c87b17310ba6fbf2a5ea94825be336e3b9fef304c
diff --git a/dev-util/eric/eric-4.4.19.ebuild b/dev-util/eric/eric-4.5.1.ebuild
similarity index 80%
rename from dev-util/eric/eric-4.4.19.ebuild
rename to dev-util/eric/eric-4.5.1.ebuild
index a2616d3bf564..f4587f40a709 100644
--- a/dev-util/eric/eric-4.4.19.ebuild
+++ b/dev-util/eric/eric-4.5.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/eric-4.4.19.ebuild,v 1.2 2012/02/28 15:03:24 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/eric-4.5.1.ebuild,v 1.1 2012/03/28 16:55:15 pesa Exp $
 
-EAPI="3"
+EAPI="4"
 PYTHON_DEPEND="2:2.6"
 SUPPORT_PYTHON_ABIS="1"
 # 2.4 and 2.5 are restricted to avoid conditional dependency on dev-python/simplejson.
@@ -10,7 +10,8 @@ RESTRICT_PYTHON_ABIS="2.4 2.5 3.* *-jython 2.7-pypy-*"
 
 inherit eutils python
 
-MY_PN="${PN}${PV%%.*}"
+SLOT="4"
+MY_PN="${PN}${SLOT}"
 MY_PV="${PV/_pre/-snapshot-}"
 MY_P="${MY_PN}-${MY_PV}"
 
@@ -20,19 +21,23 @@ BASE_URI="mirror://sourceforge/eric-ide/${MY_PN}/stable/${PV}"
 SRC_URI="${BASE_URI}/${MY_P}.tar.gz"
 
 LICENSE="GPL-3"
-SLOT="4"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="kde spell"
 
-DEPEND=">=dev-python/sip-4.12.4
+DEPEND="
+	>=dev-python/sip-4.12.4
 	>=dev-python/PyQt4-4.6[assistant,svg,webkit,X]
-	>=dev-python/qscintilla-python-2.2
-	kde? ( kde-base/pykde4 )"
+	>=dev-python/qscintilla-python-2.3
+	kde? ( kde-base/pykde4 )
+"
 RDEPEND="${DEPEND}
 	>=dev-python/chardet-2.0.1
-	dev-python/coverage
-	>=dev-python/pygments-1.1"
-PDEPEND="spell? ( dev-python/pyenchant )"
+	>=dev-python/coverage-3.0.1
+	>=dev-python/pygments-1.3.1
+"
+PDEPEND="
+	spell? ( dev-python/pyenchant )
+"
 
 LANGS="cs de en es fr it ru tr zh_CN"
 for L in ${LANGS}; do
@@ -47,13 +52,15 @@ PYTHON_VERSIONED_EXECUTABLES=("/usr/bin/.*")
 
 src_prepare() {
 	epatch "${FILESDIR}/eric-4.4-no-interactive.patch"
-	epatch "${FILESDIR}/remove_coverage.patch"
 	use kde || epatch "${FILESDIR}/eric-4.4-no-pykde.patch"
 
 	# Delete internal copies of dev-python/chardet, dev-python/coverage,
 	# dev-python/pygments and dev-python/simplejson.
 	rm -fr eric/ThirdParty
 	rm -fr eric/DebugClients/Python{,3}/coverage
+	sed -i -e '\|/coverage/|d' eric/${MY_PN}.e4p || die
+	sed -i -e 's/from DebugClients\.Python3\?\.coverage /from coverage /' \
+		$(grep -lr 'from DebugClients\.Python3\?\.coverage' .) || die
 }
 
 src_install() {
@@ -68,7 +75,7 @@ src_install() {
 	python_execute_function installation
 	python_merge_intermediate_installation_images "${T}/images"
 
-	doicon eric/icons/default/eric.png || die "doicon failed"
+	doicon eric/icons/default/eric.png || die
 	make_desktop_entry "${MY_PN} --nosplash" ${MY_PN} eric "Development;IDE;Qt"
 }
 
diff --git a/dev-util/eric/eric-5.1.7.ebuild b/dev-util/eric/eric-5.1.7.ebuild
deleted file mode 100644
index c40dd688c6ab..000000000000
--- a/dev-util/eric/eric-5.1.7.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/eric-5.1.7.ebuild,v 1.2 2012/02/28 15:03:24 pesa Exp $
-
-EAPI="3"
-PYTHON_DEPEND="3:3.1"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.* *-jython 2.7-pypy-*"
-
-inherit eutils python
-
-MY_PN="${PN}${PV%%.*}"
-MY_PV="${PV/_pre/-snapshot-}"
-MY_P="${MY_PN}-${MY_PV}"
-
-DESCRIPTION="A full featured Python IDE using PyQt4 and QScintilla"
-HOMEPAGE="http://eric-ide.python-projects.org/"
-BASE_URI="mirror://sourceforge/eric-ide/${MY_PN}/stable/${PV}"
-SRC_URI="${BASE_URI}/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="5"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="spell"
-
-DEPEND=">=dev-python/sip-4.12.4
-	>=dev-python/PyQt4-4.7[assistant,svg,webkit,X]
-	>=dev-python/qscintilla-python-2.4"
-RDEPEND="${DEPEND}
-	>=dev-python/chardet-2.0.1
-	>=dev-python/coverage-3.2
-	>=dev-python/pygments-1.4"
-PDEPEND="spell? ( dev-python/pyenchant )"
-
-LANGS="cs de en es fr it ru tr zh_CN"
-for L in ${LANGS}; do
-	SRC_URI+=" linguas_${L}? ( ${BASE_URI}/${MY_PN}-i18n-${L/zh_CN/zh_CN.GB2312}-${MY_PV}.tar.gz )"
-	IUSE+=" linguas_${L}"
-done
-unset L
-
-S=${WORKDIR}/${MY_P}
-
-PYTHON_VERSIONED_EXECUTABLES=("/usr/bin/.*")
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-5.0.2-remove_coverage.patch"
-
-	# Avoid file collisions between different slots of Eric.
-	sed -e "s/^Icon=eric$/&${SLOT}/" -i eric/${MY_PN}.desktop || die "sed failed"
-	sed -e "s/\([^[:alnum:]]\)eric\.png\([^[:alnum:]]\)/\1eric5.png\2/" -i $(grep -lr eric.png .) || die "sed failed"
-	mv eric/icons/default/eric{,5}.png || die "mv failed"
-	mv eric/pixmaps/eric{,5}.png || die "mv failed"
-	rm -f eric/APIs/Python/zope-*.api
-	rm -f eric/APIs/Ruby/Ruby-*.api
-
-	# Delete internal copies of dev-python/chardet, dev-python/coverage and dev-python/pygments.
-	rm -fr eric/ThirdParty
-	rm -fr eric/DebugClients/Python{,3}/coverage
-}
-
-src_install() {
-	installation() {
-		"$(PYTHON)" install.py \
-			-z \
-			-b "${EPREFIX}/usr/bin" \
-			-i "${T}/images/${PYTHON_ABI}" \
-			-d "${EPREFIX}$(python_get_sitedir)" \
-			-c
-	}
-	python_execute_function installation
-	python_merge_intermediate_installation_images "${T}/images"
-
-	doicon eric/icons/default/${MY_PN}.png || die "doicon failed"
-}
-
-pkg_postinst() {
-	python_mod_optimize -x "/eric5/(DebugClients/Python|UtilitiesPython2)/" ${MY_PN}{,config.py,plugins}
-
-	elog
-	elog "If you want to use Eric with mod_python, have a look at"
-	elog "\"${EROOT}$(python_get_sitedir -b -f)/${MY_PN}/patch_modpython.py\"."
-	elog
-	elog "The following packages will give Eric extended functionality:"
-	elog "  dev-python/pylint"
-	elog "  dev-python/pysvn"
-	elog
-	elog "This version has a plugin interface with plugin-autofetch from"
-	elog "the application itself. You may want to check those as well."
-	elog
-}
-
-pkg_postrm() {
-	python_mod_cleanup ${MY_PN}{,config.py,plugins}
-}
diff --git a/games-puzzle/cutemaze/cutemaze-1.1.0.ebuild b/games-puzzle/cutemaze/cutemaze-1.1.0.ebuild
index 5408f2c6d046..c1e575ff6993 100644
--- a/games-puzzle/cutemaze/cutemaze-1.1.0.ebuild
+++ b/games-puzzle/cutemaze/cutemaze-1.1.0.ebuild
@@ -1,9 +1,9 @@
-# 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-puzzle/cutemaze/cutemaze-1.1.0.ebuild,v 1.2 2010/02/27 16:07:52 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/cutemaze/cutemaze-1.1.0.ebuild,v 1.3 2012/03/28 18:15:51 mr_bones_ Exp $
 
 EAPI=2
-inherit eutils qt4 games
+inherit eutils qt4-r2 games
 
 DESCRIPTION="A simple, top-down game in which mazes are randomly generated"
 HOMEPAGE="http://gottcode.org/cutemaze/"
@@ -14,11 +14,12 @@ SLOT="0"
 KEYWORDS="~amd64 x86"
 IUSE=""
 
-DEPEND="x11-libs/qt-gui:4
+DEPEND="x11-libs/qt-core:4
+	x11-libs/qt-gui:4
 	x11-libs/qt-svg:4"
 
 src_configure() {
-	eqmake4
+	qt4-r2_src_configure
 }
 
 src_install() {
diff --git a/games-puzzle/hexalate/hexalate-1.0.1.ebuild b/games-puzzle/hexalate/hexalate-1.0.1.ebuild
index e41243b06f06..7f998e598c57 100644
--- a/games-puzzle/hexalate/hexalate-1.0.1.ebuild
+++ b/games-puzzle/hexalate/hexalate-1.0.1.ebuild
@@ -1,9 +1,9 @@
-# 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-puzzle/hexalate/hexalate-1.0.1.ebuild,v 1.2 2010/02/27 15:35:11 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/hexalate/hexalate-1.0.1.ebuild,v 1.3 2012/03/28 17:17:27 mr_bones_ Exp $
 
 EAPI=2
-inherit eutils qt4 games
+inherit eutils qt4-r2 games
 
 DESCRIPTION="A color matching game"
 HOMEPAGE="http://gottcode.org/hexalate/"
@@ -14,10 +14,11 @@ SLOT="0"
 KEYWORDS="~amd64 x86"
 IUSE=""
 
-DEPEND="x11-libs/qt-gui:4"
+DEPEND="x11-libs/qt-core:4
+	x11-libs/qt-gui:4"
 
 src_configure() {
-	eqmake4
+	qt4-r2_src_configure
 }
 
 src_install() {
diff --git a/media-libs/webrtc-audio-processing/Manifest b/media-libs/webrtc-audio-processing/Manifest
new file mode 100644
index 000000000000..d8138adcf6aa
--- /dev/null
+++ b/media-libs/webrtc-audio-processing/Manifest
@@ -0,0 +1 @@
+DIST webrtc-audio-processing-0.1.tar.xz 392540 RMD160 86592fbd300f5e903b6982a29bd5bb30d49dd485 SHA1 cce81e0d7b69fef1e7ce0e3e85a2b740d3f04620 SHA256 ed4b52f9c2688b97628035a5565377d74704d7c04de4254a768df3342c7afedc
diff --git a/www-client/arora/metadata.xml b/media-libs/webrtc-audio-processing/metadata.xml
similarity index 77%
rename from www-client/arora/metadata.xml
rename to media-libs/webrtc-audio-processing/metadata.xml
index 8077cd324f2a..ab0bee0a7ab5 100644
--- a/www-client/arora/metadata.xml
+++ b/media-libs/webrtc-audio-processing/metadata.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>qt</herd>
   <maintainer>
-	<email>qt@gentoo.org</email>
+    <email>ford_prefect@gentoo.org</email>
   </maintainer>
 </pkgmetadata>
diff --git a/media-libs/webrtc-audio-processing/webrtc-audio-processing-0.1.ebuild b/media-libs/webrtc-audio-processing/webrtc-audio-processing-0.1.ebuild
new file mode 100644
index 000000000000..8653ae051180
--- /dev/null
+++ b/media-libs/webrtc-audio-processing/webrtc-audio-processing-0.1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/webrtc-audio-processing/webrtc-audio-processing-0.1.ebuild,v 1.1 2012/03/28 18:30:38 ford_prefect Exp $
+
+EAPI=4
+
+DESCRIPTION="AudioProcessing library from the webrtc.org code base"
+HOMEPAGE="http://www.freedesktop.org/software/pulseaudio/webrtc-audio-processing/"
+SRC_URI="http://freedesktop.org/software/pulseaudio/${PN}/${P}.tar.xz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
diff --git a/media-libs/x264/Manifest b/media-libs/x264/Manifest
index 25e0eefa2c46..80ef0a166544 100644
--- a/media-libs/x264/Manifest
+++ b/media-libs/x264/Manifest
@@ -6,3 +6,4 @@ DIST x264-snapshot-20110825-2245-stable.tar.bz2 516879 RMD160 4f1e00ddd170c75c6d
 DIST x264-snapshot-20111017-2245.tar.bz2 525683 RMD160 c8758e99017bdb7c70991e0ba35c4c79e3b34232 SHA1 8a007bbe5720f74ecbcf9f4fb71ad8cc6bd974d4 SHA256 b1b9450835ffece5079c9167d92c20486b97bb14fc33b34b1faf7443728d4c2e
 DIST x264-snapshot-20111218-2245-stable.tar.bz2 531234 RMD160 b60e78475239d7e187576e48c03c9e580379f43d SHA1 ccf6720a0b8d4078b1babee40c8b1bbde5ea7dce SHA256 8dc5edd9aa7fb0247605ec7db1bd48013849ec200d420d78ad7bce427d0db866
 DIST x264-snapshot-20111220-2245.tar.bz2 532402 RMD160 3e9dce921fa8d7a9dadacd6e9cc0d9a1ec884860 SHA1 8e1958383ba08d9dc4b3e6c0e209243111a10c39 SHA256 c360b0320cc72a77c5f2ececbd100bbbdd0461227f7c4bc06212e86f5aa0fb8a
+DIST x264-snapshot-20120327-2245.tar.bz2 551101 RMD160 c583500c6f4bbc711ba2ac4d103b53ca4a386438 SHA1 d600cf6e6561e71f5c5d2f4f92979d0338112f83 SHA256 065ffdbd7c9f9dcc7194bd6a4943b0d4b2e99b5dd68979fb3634644c725c2cbe
diff --git a/media-libs/x264/x264-0.0.20120327.ebuild b/media-libs/x264/x264-0.0.20120327.ebuild
new file mode 100644
index 000000000000..863434cb472c
--- /dev/null
+++ b/media-libs/x264/x264-0.0.20120327.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/x264/x264-0.0.20120327.ebuild,v 1.1 2012/03/28 18:43:18 lu_zero Exp $
+
+EAPI=4
+
+if [ "${PV#9999}" != "${PV}" ] ; then
+	V_ECLASS="git-2"
+else
+	V_ECLASS="versionator"
+fi
+
+inherit multilib toolchain-funcs flag-o-matic ${V_ECLASS}
+
+if [ "${PV#9999}" = "${PV}" ]; then
+	MY_P="x264-snapshot-$(get_version_component_range 3)-2245"
+fi
+DESCRIPTION="A free library for encoding X264/AVC streams"
+HOMEPAGE="http://www.videolan.org/developers/x264.html"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	EGIT_REPO_URI="git://git.videolan.org/x264.git"
+	SRC_URI=""
+else
+	SRC_URI="http://download.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~alpha ~amd64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux
+	~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+fi
+IUSE="10bit custom-cflags debug +interlaced pic static-libs +threads"
+
+RDEPEND=""
+DEPEND="amd64? ( >=dev-lang/yasm-1 )
+	x86? ( >=dev-lang/yasm-1 )
+	x86-fbsd? ( >=dev-lang/yasm-1 )"
+
+if [ "${PV#9999}" = "${PV}" ]; then
+	S="${WORKDIR}/${MY_P}"
+fi
+
+DOCS="AUTHORS doc/*.txt"
+
+src_configure() {
+	tc-export CC
+
+	local myconf=""
+	use 10bit && myconf+=" --bit-depth=10"
+	use debug && myconf+=" --enable-debug"
+	use interlaced || myconf+=" --disable-interlaced"
+	use static-libs && myconf+=" --enable-static"
+	use threads || myconf+=" --disable-thread"
+
+	# let upstream pick the optimization level by default
+	use custom-cflags || filter-flags -O?
+
+	if use x86 && use pic; then
+		myconf+=" --disable-asm"
+	fi
+
+	./configure \
+		--prefix="${EPREFIX}"/usr \
+		--libdir="${EPREFIX}"/usr/$(get_libdir) \
+		--disable-cli \
+		--disable-avs \
+		--disable-lavf \
+		--disable-swscale \
+		--disable-ffms \
+		--disable-gpac \
+		--enable-pic \
+		--enable-shared \
+		--host="${CHOST}" \
+		${myconf} || die
+
+	# this is a nasty workaround for bug #376925 as upstream doesn't like us
+	# fiddling with their CFLAGS
+	if use custom-cflags; then
+		local cflags
+		cflags="$(grep "^CFLAGS=" config.mak | sed 's/CFLAGS=//')"
+		cflags="${cflags//$(get-flag O)/}"
+		cflags="${cflags//-O? /$(get-flag O) }"
+		cflags="${cflags//-g /}"
+		sed -i "s:^CFLAGS=.*:CFLAGS=${cflags//:/\\:}:" config.mak
+	fi
+}
diff --git a/media-sound/karlyriceditor/Manifest b/media-sound/karlyriceditor/Manifest
index 6adcd10105f8..ec27712890ba 100644
--- a/media-sound/karlyriceditor/Manifest
+++ b/media-sound/karlyriceditor/Manifest
@@ -1 +1,2 @@
 DIST karlyriceditor-1.1.tar.gz 182683 RMD160 78a9488a8067d1e1a0d2fa1c0a7aa4f207011c0a SHA1 a94d9bb1bc972c62ce951dffc59b76132c5c6e01 SHA256 85f64d0a605f8d09439bd285f0188d3c3ee6cb42a7870e709b257a42eff897b9
+DIST karlyriceditor-1.3.tar.gz 215564 RMD160 b8657779a1e60023c43b5c76948d676a0d7381ec SHA1 dc50b876202c2d6e7965f5cf73bab578af9ed273 SHA256 f59bc9352e30a02228db65d47e190aa00e6f8e7f6ec18b093a30841548b90e57
diff --git a/media-sound/karlyriceditor/files/karlyriceditor-1.3-libav.patch b/media-sound/karlyriceditor/files/karlyriceditor-1.3-libav.patch
new file mode 100644
index 000000000000..d3f63d51b522
--- /dev/null
+++ b/media-sound/karlyriceditor/files/karlyriceditor-1.3-libav.patch
@@ -0,0 +1,10 @@
+--- src/ffmpeg_headers.h
++++ src/ffmpeg_headers.h
+@@ -32,6 +32,7 @@
+ 
+ #include "libavcodec/avcodec.h"
+ #include "libavformat/avformat.h"
++#include "libavutil/mathematics.h"
+ #include "libswscale/swscale.h"
+ 
+ };
diff --git a/media-sound/karlyriceditor/karlyriceditor-1.3.ebuild b/media-sound/karlyriceditor/karlyriceditor-1.3.ebuild
new file mode 100644
index 000000000000..4da661864c5d
--- /dev/null
+++ b/media-sound/karlyriceditor/karlyriceditor-1.3.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/karlyriceditor/karlyriceditor-1.3.ebuild,v 1.1 2012/03/28 17:52:49 johu Exp $
+
+EAPI=4
+inherit eutils qt4-r2
+
+DESCRIPTION="A program which lets you edit and synchronize lyrics with karaoke songs in varions formats"
+HOMEPAGE="http://www.karlyriceditor.com/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-libs/openssl
+	media-libs/libsdl
+	>=virtual/ffmpeg-0.9
+	x11-libs/qt-core:4
+	x11-libs/qt-gui:4"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-libav.patch" )
+
+src_install() {
+	dodoc Changelog
+	dobin bin/${PN}
+	doicon packages/${PN}.png
+	make_desktop_entry ${PN} 'Karaoke Lyrics Editor'
+}
diff --git a/media-sound/pulseaudio/Manifest b/media-sound/pulseaudio/Manifest
index 6645bd0884e6..d2031960bf53 100644
--- a/media-sound/pulseaudio/Manifest
+++ b/media-sound/pulseaudio/Manifest
@@ -1,3 +1,4 @@
 DIST pulseaudio-0.9.22.tar.gz 2076785 RMD160 31199c497f7b1cce2285a6369d43fc1f66cd41a4 SHA1 f5fc14d7a62ae9f9ee9745026e3f13f4c130140a SHA256 c6019324395117a258c048a6db5e9734551cc2c61dc35b46403ff00d64be55f0
 DIST pulseaudio-0.9.23.tar.gz 2095454 RMD160 1f5d19a40279327dcd04908e4f441c95a986313d SHA1 361f7d89606e8423aad19691bb27f6552e0b679e SHA256 af3e84c614cb632fd1f57105489fcd5f93f906da1ce5aa9019492212031fba4e
 DIST pulseaudio-1.1.tar.xz 1306168 RMD160 26faa0831a97ce02b1d9b256f5171ece797c721b SHA1 5ff451389951f79949a461b95168558cc4120e73 SHA256 6fe531136f6ebce2d35872a2d2c914278cdc5dcdd5eea516dc52c81f9001f5ee
+DIST pulseaudio-1.99.2.tar.xz 1328404 RMD160 eae5f3874cf5b021e332873d6e2fe0ac5c0529a2 SHA1 ba66e06ca13b82c338087a5b4d19226f698f9b8e SHA256 e5cb8daf035ce177cdb53a64cfeb71f9695c8ae92d7060dc67441e21e855e9c4
diff --git a/media-sound/pulseaudio/metadata.xml b/media-sound/pulseaudio/metadata.xml
index 7f6bf29c1a1c..f845af763254 100644
--- a/media-sound/pulseaudio/metadata.xml
+++ b/media-sound/pulseaudio/metadata.xml
@@ -56,5 +56,10 @@
       databases. Recommended for desktop usage. This flag causes the
       whole package to be licensed under GPL-2 or later.
     </flag>
+    <flag name="webrtc-aec">
+      Uses the webrtc.org AudioProcessing library for enhancing VoIP calls
+      greatly in applications that support it by performing acoustic echo
+      cancellation, analog gain control, noise suppression and other processing.
+    </flag>
   </use>
 </pkgmetadata>
diff --git a/media-sound/pulseaudio/pulseaudio-1.99.2.ebuild b/media-sound/pulseaudio/pulseaudio-1.99.2.ebuild
new file mode 100644
index 000000000000..cf843496e8d9
--- /dev/null
+++ b/media-sound/pulseaudio/pulseaudio-1.99.2.ebuild
@@ -0,0 +1,218 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-1.99.2.ebuild,v 1.1 2012/03/28 18:44:16 ford_prefect Exp $
+
+EAPI=4
+
+inherit eutils libtool flag-o-matic versionator
+
+DESCRIPTION="A networked sound server with an advanced plugin system"
+HOMEPAGE="http://www.pulseaudio.org/"
+
+SRC_URI="http://freedesktop.org/software/pulseaudio/releases/${P}.tar.xz"
+
+# libpulse-simple and libpulse link to libpulse-core; this is daemon's
+# library and can link to gdbm and other GPL-only libraries. In this
+# cases, we have a fully GPL-2 package. Leaving the rest of the
+# GPL-forcing USE flags for those who use them.
+LICENSE="!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="+alsa avahi +caps equalizer jack lirc oss tcpd +X dbus libsamplerate gnome bluetooth +asyncns +glib test doc +udev ipv6 system-wide realtime +orc ssl +gdbm +webrtc-aec"
+
+RDEPEND=">=media-libs/libsndfile-1.0.20
+	X? (
+		>=x11-libs/libX11-1.4.0
+		>=x11-libs/libxcb-1.6
+		>=x11-libs/xcb-util-0.3.1
+		x11-libs/libSM
+		x11-libs/libICE
+		x11-libs/libXtst
+	)
+	caps? ( sys-libs/libcap )
+	libsamplerate? ( >=media-libs/libsamplerate-0.1.1-r1 )
+	alsa? ( >=media-libs/alsa-lib-1.0.19 )
+	glib? ( >=dev-libs/glib-2.4.0 )
+	avahi? ( >=net-dns/avahi-0.6.12[dbus] )
+	jack? ( >=media-sound/jack-audio-connection-kit-0.117 )
+	tcpd? ( sys-apps/tcp-wrappers )
+	lirc? ( app-misc/lirc )
+	dbus? ( >=sys-apps/dbus-1.0.0 )
+	gnome? ( >=gnome-base/gconf-2.4.0 )
+	bluetooth? (
+		>=net-wireless/bluez-4
+		>=sys-apps/dbus-1.0.0
+	)
+	asyncns? ( net-libs/libasyncns )
+	udev? ( || ( >=sys-fs/udev-171[hwdb] >=sys-fs/udev-143[extras] ) )
+	realtime? ( sys-auth/rtkit )
+	equalizer? ( sci-libs/fftw:3.0 )
+	orc? ( >=dev-lang/orc-0.4.9 )
+	ssl? ( dev-libs/openssl )
+	>=media-libs/speex-1.2_rc1
+	gdbm? ( sys-libs/gdbm )
+	webrtc-aec? ( media-libs/webrtc-audio-processing )
+	dev-libs/json-c
+	>=sys-devel/libtool-2.2.4" # it's a valid RDEPEND, libltdl.so is used
+
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )
+	X? (
+		x11-proto/xproto
+		>=x11-libs/libXtst-1.0.99.2
+	)
+	dev-libs/libatomic_ops
+	dev-util/pkgconfig
+	system-wide? ( || ( dev-util/unifdef sys-freebsd/freebsd-ubin ) )
+	dev-util/intltool"
+# This is a PDEPEND to avoid a circular dep
+PDEPEND="media-plugins/alsa-plugins[pulseaudio]"
+
+# alsa-utils dep is for the alsasound init.d script (see bug #155707)
+# bluez dep is for the bluetooth init.d script
+RDEPEND="${RDEPEND}
+	X? ( gnome-extra/gnome-audio )
+	system-wide? (
+		sys-apps/openrc
+		alsa? ( media-sound/alsa-utils )
+		bluetooth? ( >=net-wireless/bluez-4 )
+	)"
+
+# See "*** BLUEZ support not found (requires D-Bus)" in configure.ac
+REQUIRED_USE="bluetooth? ( dbus )"
+
+pkg_setup() {
+	enewgroup audio 18 # Just make sure it exists
+	enewgroup pulse-access
+	enewgroup pulse
+	enewuser pulse -1 -1 /var/run/pulse pulse,audio
+}
+
+src_configure() {
+	# It's a binutils bug, once I can find time to fix that I'll add a
+	# proper dependency and fix this up. — flameeyes
+	append-ldflags $(no-as-needed)
+
+	if use gdbm; then
+		myconf+=" --with-database=gdbm"
+	#elif use tdb; then
+	#	myconf+=" --with-database=tdb"
+	else
+		myconf+=" --with-database=simple"
+	fi
+
+	econf \
+		--enable-largefile \
+		$(use_enable glib glib2) \
+		--disable-solaris \
+		$(use_enable asyncns) \
+		$(use_enable oss oss-output) \
+		$(use_enable alsa) \
+		$(use_enable lirc) \
+		$(use_enable tcpd tcpwrap) \
+		$(use_enable jack) \
+		$(use_enable lirc) \
+		$(use_enable avahi) \
+		--disable-hal \
+		$(use_enable dbus) \
+		$(use_enable gnome gconf) \
+		$(use_enable libsamplerate samplerate) \
+		$(use_enable bluetooth bluez) \
+		$(use_enable X x11) \
+		$(use_enable test default-build-tests) \
+		$(use_enable udev) \
+		$(use_enable ipv6) \
+		$(use_enable ssl openssl) \
+		$(use_with caps) \
+		$(use_with equalizer fftw) \
+		$(use_with webrtc-aec) \
+		--disable-adrian-aec \
+		--disable-esound \
+		--localstatedir="${EPREFIX}"/var \
+		--with-udev-rules-dir="${EPREFIX}/lib/udev/rules.d" \
+		${myconf}
+
+	if use doc; then
+		pushd doxygen
+		doxygen doxygen.conf
+		popd
+	fi
+}
+
+src_test() {
+	# We avoid running the toplevel check target because that will run
+	# po/'s tests too, and they are broken. Officially, it should work
+	# with intltool 0.41, but that doesn't look like a stable release.
+	emake -C src check
+}
+
+src_install() {
+	emake -j1 DESTDIR="${D}" install
+
+	# Drop the script entirely if X is disabled
+	use X || rm "${ED}"/usr/bin/start-pulseaudio-x11
+
+	if use system-wide; then
+		newconfd "${FILESDIR}/pulseaudio.conf.d" pulseaudio
+
+		use_define() {
+			local define=${2:-$(echo $1 | tr '[:lower:]' '[:upper:]')}
+
+			use "$1" && echo "-D$define" || echo "-U$define"
+		}
+
+		unifdef $(use_define avahi) \
+			$(use_define alsa) \
+			$(use_define bluetooth) \
+			$(use_define udev) \
+			"${FILESDIR}/pulseaudio.init.d-5" \
+			> "${T}/pulseaudio"
+
+		doinitd "${T}/pulseaudio"
+	fi
+
+	use avahi && sed -i -e '/module-zeroconf-publish/s:^#::' "${ED}/etc/pulse/default.pa"
+
+	dodoc README todo
+
+	if use doc; then
+		pushd doxygen/html
+		dohtml *
+		popd
+	fi
+
+	# Create the state directory
+	use prefix || diropts -o pulse -g pulse -m0755
+	keepdir /var/run/pulse
+
+	find "${D}" -name '*.la' -delete
+}
+
+pkg_postinst() {
+	if use system-wide; then
+		elog "PulseAudio in Gentoo can use a system-wide pulseaudio daemon."
+		elog "This support is enabled by starting the pulseaudio init.d ."
+		elog "To be able to access that you need to be in the group pulse-access."
+		elog "If you choose to use this feature, please make sure that you"
+		elog "really want to run PulseAudio this way:"
+		elog "   http://pulseaudio.org/wiki/WhatIsWrongWithSystemMode"
+		elog "For more information about system-wide support, please refer to:"
+		elog "	 http://pulseaudio.org/wiki/SystemWideInstance"
+		if use gnome ; then
+			elog
+			elog "By enabling gnome USE flag, you enabled gconf support. Please note"
+			elog "that you might need to remove the gnome USE flag or disable the"
+			elog "gconf module on /etc/pulse/system.pa to be able to use PulseAudio"
+			elog "with a system-wide instance."
+		fi
+	fi
+	if use bluetooth; then
+		elog
+		elog "The Bluetooth proximity module is not enabled in the default"
+		elog "configuration file. If you do enable it, you'll have to have"
+		elog "your Bluetooth controller enabled and inserted at bootup or"
+		elog "PulseAudio will refuse to start."
+	fi
+
+	eselect esd update --if-unset
+}
diff --git a/media-sound/pulseaudio/pulseaudio-9999.ebuild b/media-sound/pulseaudio/pulseaudio-9999.ebuild
index e7d86af80620..5b331207251a 100644
--- a/media-sound/pulseaudio/pulseaudio-9999.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-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/media-sound/pulseaudio/pulseaudio-9999.ebuild,v 1.20 2012/03/20 23:49:11 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-9999.ebuild,v 1.21 2012/03/28 18:44:16 ford_prefect Exp $
 
 EAPI=4
 
@@ -18,7 +18,7 @@ EGIT_REPO_URI="git://anongit.freedesktop.org/pulseaudio/pulseaudio.git"
 LICENSE="!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 )"
 SLOT="0"
 KEYWORDS=""
-IUSE="+alsa avahi +caps equalizer jack lirc oss tcpd +X dbus libsamplerate gnome bluetooth +asyncns +glib test doc +udev ipv6 system-wide realtime +orc ssl +gdbm"
+IUSE="+alsa avahi +caps equalizer jack lirc oss tcpd +X dbus libsamplerate gnome bluetooth +asyncns +glib test doc +udev ipv6 system-wide realtime +orc ssl +gdbm +webrtc-aec"
 
 RDEPEND=">=media-libs/libsndfile-1.0.20
 	X? (
@@ -51,6 +51,7 @@ RDEPEND=">=media-libs/libsndfile-1.0.20
 	ssl? ( dev-libs/openssl )
 	>=media-libs/speex-1.2_rc1
 	gdbm? ( sys-libs/gdbm )
+	webrtc-aec? ( media-libs/webrtc-audio-processing )
 	dev-libs/json-c
 	>=sys-devel/libtool-2.2.4" # it's a valid RDEPEND, libltdl.so is used
 
@@ -126,6 +127,8 @@ src_configure() {
 		$(use_enable ssl openssl) \
 		$(use_with caps) \
 		$(use_with equalizer fftw) \
+		$(use_with webrtc-aec) \
+		--disable-adrian-aec \
 		--disable-esound \
 		--localstatedir="${EPREFIX}"/var \
 		--with-udev-rules-dir="${EPREFIX}/lib/udev/rules.d" \
diff --git a/media-sound/qjackctl/Manifest b/media-sound/qjackctl/Manifest
index 4eae7a7a0bf3..75789518c7b6 100644
--- a/media-sound/qjackctl/Manifest
+++ b/media-sound/qjackctl/Manifest
@@ -1,3 +1 @@
-DIST qjackctl-0.3.2.tar.gz 264605 RMD160 0dc0638205371b49ad35883e235802da770169cf SHA1 690e77f10d934e648fbc975db81b1bccb20d7487 SHA256 6bf52fb16b0f4ec964a870444a0fee1e30345d1110955c4f3ff5dc0cd20526ae
-DIST qjackctl-0.3.7.tar.gz 418826 RMD160 64a4d6025aebd8a11212605139c0a654b7fbfb19 SHA1 187ed47a797d7083608aacf2f08353896646ed74 SHA256 48b0f1d57d8bb1ab1ae344bdcbf20266a00d1e3e01518fd168a4a11644f5d6bf
 DIST qjackctl-0.3.8.tar.gz 444244 RMD160 22038acba5cc7c2d070b9e2ec437afd1f1fbbf61 SHA1 41456a54010d6d4760414da581af58a06c8fe4e3 SHA256 870869836535476b7a2d77fa70c39f7d8facc4767c8fa1aac3c81d6ce7ba71e5
diff --git a/media-sound/qjackctl/qjackctl-0.3.2.ebuild b/media-sound/qjackctl/qjackctl-0.3.2.ebuild
deleted file mode 100644
index fcd5f1d6c136..000000000000
--- a/media-sound/qjackctl/qjackctl-0.3.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/qjackctl/qjackctl-0.3.2.ebuild,v 1.13 2011/08/12 18:51:07 xarthisius Exp $
-
-EAPI=1
-
-inherit eutils qt4
-
-DESCRIPTION="A Qt application to control the JACK Audio Connection Kit and ALSA sequencer connections."
-HOMEPAGE="http://qjackctl.sourceforge.net/"
-SRC_URI="mirror://sourceforge/qjackctl/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-
-IUSE="alsa debug"
-
-RDEPEND="alsa? ( media-libs/alsa-lib )
-	x11-libs/qt-core:4
-	x11-libs/qt-gui:4
-	>=media-sound/jack-audio-connection-kit-0.109.2"
-DEPEND="${RDEPEND}"
-
-src_compile() {
-	econf \
-		$(use_enable alsa alsa-seq) \
-		$(use_enable debug) \
-		|| die "econf failed"
-
-	# Emulate what the Makefile does, so that we can get the correct
-	# compiler used.
-	eqmake4 ${PN}.pro -o ${PN}.mak || die "eqmake4 failed"
-
-	emake -f ${PN}.mak || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	rm "${D}/usr/share/applications/qjackctl.desktop"
-
-	# Upstream desktop file is invalid, better stick with our for now.
-	make_desktop_entry "${PN}" "QjackCtl" "${PN}"
-
-	dodoc README ChangeLog TODO AUTHORS
-}
diff --git a/media-sound/qjackctl/qjackctl-0.3.7.ebuild b/media-sound/qjackctl/qjackctl-0.3.7.ebuild
deleted file mode 100644
index b0033e7840dd..000000000000
--- a/media-sound/qjackctl/qjackctl-0.3.7.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/qjackctl/qjackctl-0.3.7.ebuild,v 1.4 2011/08/12 18:51:07 xarthisius Exp $
-
-EAPI=2
-
-inherit qt4
-
-DESCRIPTION="A Qt application to control the JACK Audio Connection Kit and ALSA sequencer connections."
-HOMEPAGE="http://qjackctl.sourceforge.net/"
-SRC_URI="mirror://sourceforge/qjackctl/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-
-IUSE="alsa dbus debug portaudio"
-
-RDEPEND="alsa? ( media-libs/alsa-lib )
-	x11-libs/qt-core:4
-	x11-libs/qt-gui:4
-	dbus? ( x11-libs/qt-dbus )
-	portaudio? ( media-libs/portaudio )
-	>=media-sound/jack-audio-connection-kit-0.109.2"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	econf \
-		$(use_enable alsa alsa-seq) \
-		$(use_enable dbus) \
-		$(use_enable debug) \
-		$(use_enable portaudio)
-
-	# Emulate what the Makefile does, so that we can get the correct
-	# compiler used.
-	eqmake4 ${PN}.pro -o ${PN}.mak || die "eqmake4 failed"
-}
-
-src_compile() {
-	emake -f ${PN}.mak || die "emake failed"
-	lupdate ${PN}.pro || die "lupdate failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc README ChangeLog TODO AUTHORS TRANSLATORS
-}
diff --git a/media-video/x264-encoder/Manifest b/media-video/x264-encoder/Manifest
index af306228623d..a9895aa239a5 100644
--- a/media-video/x264-encoder/Manifest
+++ b/media-video/x264-encoder/Manifest
@@ -3,3 +3,4 @@ DIST x264-snapshot-20110825-2245-stable.tar.bz2 516879 RMD160 4f1e00ddd170c75c6d
 DIST x264-snapshot-20111017-2245.tar.bz2 525683 RMD160 c8758e99017bdb7c70991e0ba35c4c79e3b34232 SHA1 8a007bbe5720f74ecbcf9f4fb71ad8cc6bd974d4 SHA256 b1b9450835ffece5079c9167d92c20486b97bb14fc33b34b1faf7443728d4c2e
 DIST x264-snapshot-20111218-2245-stable.tar.bz2 531234 RMD160 b60e78475239d7e187576e48c03c9e580379f43d SHA1 ccf6720a0b8d4078b1babee40c8b1bbde5ea7dce SHA256 8dc5edd9aa7fb0247605ec7db1bd48013849ec200d420d78ad7bce427d0db866
 DIST x264-snapshot-20111220-2245.tar.bz2 532402 RMD160 3e9dce921fa8d7a9dadacd6e9cc0d9a1ec884860 SHA1 8e1958383ba08d9dc4b3e6c0e209243111a10c39 SHA256 c360b0320cc72a77c5f2ececbd100bbbdd0461227f7c4bc06212e86f5aa0fb8a
+DIST x264-snapshot-20120327-2245.tar.bz2 551101 RMD160 c583500c6f4bbc711ba2ac4d103b53ca4a386438 SHA1 d600cf6e6561e71f5c5d2f4f92979d0338112f83 SHA256 065ffdbd7c9f9dcc7194bd6a4943b0d4b2e99b5dd68979fb3634644c725c2cbe
diff --git a/media-video/x264-encoder/x264-encoder-0.0.20120327.ebuild b/media-video/x264-encoder/x264-encoder-0.0.20120327.ebuild
new file mode 100644
index 000000000000..c6a35a605a13
--- /dev/null
+++ b/media-video/x264-encoder/x264-encoder-0.0.20120327.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/x264-encoder/x264-encoder-0.0.20120327.ebuild,v 1.1 2012/03/28 18:52:53 lu_zero Exp $
+
+EAPI=4
+
+if [ "${PV#9999}" != "${PV}" ] ; then
+	V_ECLASS="git-2"
+else
+	V_ECLASS="versionator"
+fi
+
+inherit flag-o-matic multilib toolchain-funcs ${V_ECLASS}
+
+if [ "${PV#9999}" = "${PV}" ] ; then
+	MY_P="x264-snapshot-$(get_version_component_range 3)-2245"
+fi
+DESCRIPTION="A free commandline encoder for X264/AVC streams"
+HOMEPAGE="http://www.videolan.org/developers/x264.html"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	EGIT_REPO_URI="git://git.videolan.org/x264.git"
+	SRC_URI=""
+else
+	SRC_URI="http://download.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+fi
+IUSE="10bit custom-cflags debug ffmpeg ffmpegsource +interlaced mp4 +threads"
+
+REQUIRED_USE="ffmpegsource? ( ffmpeg )"
+
+RDEPEND="ffmpeg? ( virtual/ffmpeg )
+	ffmpegsource? ( media-libs/ffmpegsource )
+	mp4? ( >=media-video/gpac-0.4.1_pre20060122 )"
+
+DEPEND="${RDEPEND}
+	amd64? ( >=dev-lang/yasm-0.6.2 )
+	x86? ( >=dev-lang/yasm-0.6.2 )
+	x86-fbsd? ( >=dev-lang/yasm-0.6.2 )
+	dev-util/pkgconfig"
+
+if [ "${PV#9999}" = "${PV}" ] ; then
+	S=${WORKDIR}/${MY_P}
+fi
+
+src_configure() {
+	tc-export CC
+
+	local myconf=""
+	use 10bit && myconf+=" --bit-depth=10"
+	use debug && myconf+=" --enable-debug"
+	use ffmpeg || myconf+=" --disable-lavf --disable-swscale"
+	use ffmpegsource || myconf+=" --disable-ffms"
+	use interlaced || myconf+=" --disable-interlaced"
+	use mp4 || myconf+=" --disable-gpac"
+	use threads || myconf+=" --disable-thread"
+
+	# let upstream pick the optimization level by default
+	use custom-cflags || filter-flags -O?
+
+	./configure \
+		--prefix="${EPREFIX}"/usr \
+		--libdir="${EPREFIX}"/usr/$(get_libdir) \
+		--disable-avs \
+		--system-libx264 \
+		--host="${CHOST}" \
+		${myconf} || die
+
+	# this is a nasty workaround for bug #376925 for x264 that also applies
+	# here, needed because as upstream doesn't like us fiddling with their CFLAGS
+	if use custom-cflags; then
+		local cflags
+		cflags="$(grep "^CFLAGS=" config.mak | sed 's/CFLAGS=//')"
+		cflags="${cflags//$(get-flag O)/}"
+		cflags="${cflags//-O? /$(get-flag O) }"
+		cflags="${cflags//-g /}"
+		sed -i "s:^CFLAGS=.*:CFLAGS=${cflags//:/\\:}:" config.mak
+	fi
+}
diff --git a/metadata/cache/app-admin/apache-tools-2.2.22 b/metadata/cache/app-admin/apache-tools-2.2.22
new file mode 100644
index 000000000000..8e0cb6041a6a
--- /dev/null
+++ b/metadata/cache/app-admin/apache-tools-2.2.22
@@ -0,0 +1,22 @@
+=dev-libs/apr-1* =dev-libs/apr-util-1* dev-libs/libpcre ssl? ( dev-libs/openssl ) !<www-servers/apache-2.2.4 sys-devel/libtool
+=dev-libs/apr-1* =dev-libs/apr-util-1* dev-libs/libpcre ssl? ( dev-libs/openssl ) !<www-servers/apache-2.2.4
+0
+mirror://apache/httpd/httpd-2.2.22.tar.bz2
+test
+http://httpd.apache.org/
+Apache-2.0
+Useful Apache tools - htdigest, htpasswd, ab, htdbm
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd
+eutils flag-o-matic multilib toolchain-funcs user
+ssl
+
+
+
+4
+
+compile configure install prepare
+
+
+
+
+
diff --git a/metadata/cache/app-editors/gummi-0.6.3 b/metadata/cache/app-editors/gummi-0.6.3
new file mode 100644
index 000000000000..2a24b5c77b68
--- /dev/null
+++ b/metadata/cache/app-editors/gummi-0.6.3
@@ -0,0 +1,22 @@
+app-text/gtkspell:2 >=dev-libs/glib-2.28.6 dev-texlive/texlive-latex dev-texlive/texlive-latexextra >=x11-libs/gtk+-2.24:2 x11-libs/gtksourceview:2.0 app-text/poppler[cairo] x11-libs/gtksourceview:2.0 x11-libs/pango
+app-text/gtkspell:2 >=dev-libs/glib-2.28.6 dev-texlive/texlive-latex dev-texlive/texlive-latexextra >=x11-libs/gtk+-2.24:2 x11-libs/gtksourceview:2.0
+0
+http://dev.midnightcoding.org/attachments/download/263/gummi-0.6.3.tar.gz
+
+http://gummi.midnightcoding.org
+MIT
+Simple LaTeX editor for GTK+
+~amd64 ~x86
+base eutils multilib toolchain-funcs user
+linguas_ar linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_es linguas_fr linguas_it linguas_nl linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sv linguas_zh_CN linguas_zh_TW
+
+
+
+4
+
+compile configure install postinst prepare unpack
+
+
+
+
+
diff --git a/metadata/cache/app-misc/gentoo-0.19.13 b/metadata/cache/app-misc/gentoo-0.19.13
new file mode 100644
index 000000000000..e0a591053c67
--- /dev/null
+++ b/metadata/cache/app-misc/gentoo-0.19.13
@@ -0,0 +1,22 @@
+>=x11-libs/gtk+-2.24:2 >=dev-libs/glib-2 x11-libs/gdk-pixbuf x11-libs/pango nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=x11-libs/gtk+-2.24:2 >=dev-libs/glib-2 x11-libs/gdk-pixbuf x11-libs/pango
+0
+mirror://sourceforge/gentoo/gentoo-0.19.13.tar.gz
+
+http://www.obsession.se/gentoo/
+GPL-2
+A modern GTK+ based filemanager for any WM
+~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+autotools eutils libtool multilib toolchain-funcs user
+nls
+
+
+
+4
+
+configure install prepare
+
+
+
+
+
diff --git a/metadata/cache/app-shells/bash-4.2_p20 b/metadata/cache/app-shells/bash-4.2_p20
index 109f4fbfd9be..ef5996740a68 100644
--- a/metadata/cache/app-shells/bash-4.2_p20
+++ b/metadata/cache/app-shells/bash-4.2_p20
@@ -6,7 +6,7 @@ mirror://gnu/bash/bash-4.2.tar.gz ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/b
 http://tiswww.case.edu/php/chet/bash/bashtop.html
 GPL-3
 The standard GNU Bourne again shell
-~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd
+alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd
 eutils flag-o-matic multilib toolchain-funcs user
 afs bashlogger examples mem-scramble +net nls plugins vanilla
 
diff --git a/metadata/cache/app-shells/bash-4.2_p24 b/metadata/cache/app-shells/bash-4.2_p24
index 68ed4175eb50..179765a2317b 100644
--- a/metadata/cache/app-shells/bash-4.2_p24
+++ b/metadata/cache/app-shells/bash-4.2_p24
@@ -1,5 +1,5 @@
->=sys-libs/ncurses-5.2-r2 >=sys-libs/readline-6.2 nls? ( virtual/libintl ) virtual/yacc
->=sys-libs/ncurses-5.2-r2 >=sys-libs/readline-6.2 nls? ( virtual/libintl ) !<sys-apps/portage-2.1.7.16 !<sys-apps/paludis-0.26.0_alpha5
+>=sys-libs/ncurses-5.2-r2 readline? ( >=sys-libs/readline-6.2 ) nls? ( virtual/libintl ) virtual/yacc
+>=sys-libs/ncurses-5.2-r2 readline? ( >=sys-libs/readline-6.2 ) nls? ( virtual/libintl ) !<sys-apps/portage-2.1.7.16 !<sys-apps/paludis-0.26.0_alpha5
 0
 mirror://gnu/bash/bash-4.2.tar.gz ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-001 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-002 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-003 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-004 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-005 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-006 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-007 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-008 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-009 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-010 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-011 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-012 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-013 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-014 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-015 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-016 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-017 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-018 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-019 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-020 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-021 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-022 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-023 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-024 mirror://gnu/bash/bash-4.2-patches/bash42-001 mirror://gnu/bash/bash-4.2-patches/bash42-002 mirror://gnu/bash/bash-4.2-patches/bash42-003 mirror://gnu/bash/bash-4.2-patches/bash42-004 mirror://gnu/bash/bash-4.2-patches/bash42-005 mirror://gnu/bash/bash-4.2-patches/bash42-006 mirror://gnu/bash/bash-4.2-patches/bash42-007 mirror://gnu/bash/bash-4.2-patches/bash42-008 mirror://gnu/bash/bash-4.2-patches/bash42-009 mirror://gnu/bash/bash-4.2-patches/bash42-010 mirror://gnu/bash/bash-4.2-patches/bash42-011 mirror://gnu/bash/bash-4.2-patches/bash42-012 mirror://gnu/bash/bash-4.2-patches/bash42-013 mirror://gnu/bash/bash-4.2-patches/bash42-014 mirror://gnu/bash/bash-4.2-patches/bash42-015 mirror://gnu/bash/bash-4.2-patches/bash42-016 mirror://gnu/bash/bash-4.2-patches/bash42-017 mirror://gnu/bash/bash-4.2-patches/bash42-018 mirror://gnu/bash/bash-4.2-patches/bash42-019 mirror://gnu/bash/bash-4.2-patches/bash42-020 mirror://gnu/bash/bash-4.2-patches/bash42-021 mirror://gnu/bash/bash-4.2-patches/bash42-022 mirror://gnu/bash/bash-4.2-patches/bash42-023 mirror://gnu/bash/bash-4.2-patches/bash42-024
 
@@ -8,7 +8,7 @@ GPL-3
 The standard GNU Bourne again shell
 ~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd
 eutils flag-o-matic multilib toolchain-funcs user
-afs bashlogger examples mem-scramble +net nls plugins vanilla
+afs bashlogger examples mem-scramble +net nls plugins +readline vanilla
 
 
 
diff --git a/metadata/cache/dev-embedded/urjtag-9999 b/metadata/cache/dev-embedded/urjtag-9999
index a69eec3ea903..ae3dbd3caf1e 100644
--- a/metadata/cache/dev-embedded/urjtag-9999
+++ b/metadata/cache/dev-embedded/urjtag-9999
@@ -1,5 +1,5 @@
-ftdi? ( dev-embedded/libftdi ) readline? ( sys-libs/readline ) usb? ( virtual/libusb:1 ) dev-vcs/git || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
-ftdi? ( dev-embedded/libftdi ) readline? ( sys-libs/readline ) usb? ( virtual/libusb:1 ) !dev-embedded/jtag
+ftdi? ( dev-embedded/libftdi ) ftd2xx? ( dev-embedded/libftd2xx ) readline? ( sys-libs/readline ) usb? ( virtual/libusb:1 ) dev-vcs/git || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+ftdi? ( dev-embedded/libftdi ) ftd2xx? ( dev-embedded/libftd2xx ) readline? ( sys-libs/readline ) usb? ( virtual/libusb:1 ) !dev-embedded/jtag
 0
 
 
@@ -8,7 +8,7 @@ GPL-2
 tool for communicating over JTAG with flash chips, CPUs, and many more (fork of openwince jtag)
 
 autotools eutils git-2 libtool multilib toolchain-funcs user
-ftdi readline static-libs usb
+ftd2xx ftdi readline static-libs usb
 
 
 
diff --git a/metadata/cache/dev-lang/v8-3.8.9.16 b/metadata/cache/dev-lang/v8-3.8.9.16
index 2b8107fa3aeb..3a684d004750 100644
--- a/metadata/cache/dev-lang/v8-3.8.9.16
+++ b/metadata/cache/dev-lang/v8-3.8.9.16
@@ -6,7 +6,7 @@ http://commondatastorage.googleapis.com/chromium-browser-official/v8-3.8.9.16.ta
 http://code.google.com/p/v8
 BSD
 Google's open source JavaScript engine
-~amd64 ~x86 ~x64-macos ~x86-macos
+~amd64 x86 ~x64-macos ~x86-macos
 eutils multilib pax-utils python toolchain-funcs user versionator
 
 
diff --git a/metadata/cache/dev-perl/IO-Interface-1.03 b/metadata/cache/dev-perl/IO-Interface-1.03
index 2de211aac7ef..88467d7e508b 100644
--- a/metadata/cache/dev-perl/IO-Interface-1.03
+++ b/metadata/cache/dev-perl/IO-Interface-1.03
@@ -6,7 +6,7 @@ mirror://cpan/authors/id/L/LD/LDS/IO-Interface-1.03.tar.gz
 http://search.cpan.org/dist/IO-Interface-1.03/
 || ( Artistic GPL-2 )
 Perl extension for access to network card configuration information
-amd64 ppc x86
+alpha amd64 ppc x86
 base eutils multilib perl-module toolchain-funcs user
 
 
diff --git a/metadata/cache/dev-perl/IO-Interface-1.60.0 b/metadata/cache/dev-perl/IO-Interface-1.60.0
index 594ee48b1413..a8a045b504ae 100644
--- a/metadata/cache/dev-perl/IO-Interface-1.60.0
+++ b/metadata/cache/dev-perl/IO-Interface-1.60.0
@@ -6,7 +6,7 @@ mirror://cpan/authors/id/L/LD/LDS/IO-Interface-1.06.tar.gz
 http://search.cpan.org/dist/IO-Interface/
 || ( Artistic GPL-1 GPL-2 GPL-3 )
 Perl extension for access to network card configuration information
-amd64 ppc ~ppc64 x86
+alpha amd64 ppc ~ppc64 x86
 base eutils multilib perl-module toolchain-funcs user
 
 
diff --git a/metadata/cache/dev-perl/Test-SubCalls-1.90.0 b/metadata/cache/dev-perl/Test-SubCalls-1.90.0
index 4fcbb2ea5c73..033b0819e44d 100644
--- a/metadata/cache/dev-perl/Test-SubCalls-1.90.0
+++ b/metadata/cache/dev-perl/Test-SubCalls-1.90.0
@@ -6,7 +6,7 @@ mirror://cpan/authors/id/A/AD/ADAMK/Test-SubCalls-1.09.tar.gz
 http://search.cpan.org/dist/Test-SubCalls/
 || ( Artistic GPL-1 GPL-2 GPL-3 )
 Track the number of times subs are called
-amd64 ~ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
+amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
 base eutils multilib perl-module toolchain-funcs user
 
 
diff --git a/metadata/cache/dev-util/eric-4.4.19 b/metadata/cache/dev-util/eric-4.4.19
deleted file mode 100644
index 0527de9193c9..000000000000
--- a/metadata/cache/dev-util/eric-4.4.19
+++ /dev/null
@@ -1,22 +0,0 @@
->=dev-python/sip-4.12.4 >=dev-python/PyQt4-4.6[assistant,svg,webkit,X] >=dev-python/qscintilla-python-2.2 kde? ( kde-base/pykde4 ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
->=dev-python/sip-4.12.4 >=dev-python/PyQt4-4.6[assistant,svg,webkit,X] >=dev-python/qscintilla-python-2.2 kde? ( kde-base/pykde4 ) >=dev-python/chardet-2.0.1 dev-python/coverage >=dev-python/pygments-1.1 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
-4
-mirror://sourceforge/eric-ide/eric4/stable/4.4.19/eric4-4.4.19.tar.gz linguas_cs? ( mirror://sourceforge/eric-ide/eric4/stable/4.4.19/eric4-i18n-cs-4.4.19.tar.gz ) linguas_de? ( mirror://sourceforge/eric-ide/eric4/stable/4.4.19/eric4-i18n-de-4.4.19.tar.gz ) linguas_en? ( mirror://sourceforge/eric-ide/eric4/stable/4.4.19/eric4-i18n-en-4.4.19.tar.gz ) linguas_es? ( mirror://sourceforge/eric-ide/eric4/stable/4.4.19/eric4-i18n-es-4.4.19.tar.gz ) linguas_fr? ( mirror://sourceforge/eric-ide/eric4/stable/4.4.19/eric4-i18n-fr-4.4.19.tar.gz ) linguas_it? ( mirror://sourceforge/eric-ide/eric4/stable/4.4.19/eric4-i18n-it-4.4.19.tar.gz ) linguas_ru? ( mirror://sourceforge/eric-ide/eric4/stable/4.4.19/eric4-i18n-ru-4.4.19.tar.gz ) linguas_tr? ( mirror://sourceforge/eric-ide/eric4/stable/4.4.19/eric4-i18n-tr-4.4.19.tar.gz ) linguas_zh_CN? ( mirror://sourceforge/eric-ide/eric4/stable/4.4.19/eric4-i18n-zh_CN.GB2312-4.4.19.tar.gz )
-
-http://eric-ide.python-projects.org/
-GPL-3
-A full featured Python IDE using PyQt4 and QScintilla
-~amd64 ~ppc ~ppc64 ~x86
-eutils multilib python toolchain-funcs user
-kde spell linguas_cs linguas_de linguas_en linguas_es linguas_fr linguas_it linguas_ru linguas_tr linguas_zh_CN
-
-spell? ( dev-python/pyenchant )
-
-3
-
-install postinst postrm prepare
-
-
-
-
-
diff --git a/metadata/cache/dev-util/eric-4.5.1 b/metadata/cache/dev-util/eric-4.5.1
new file mode 100644
index 000000000000..4360fadcf981
--- /dev/null
+++ b/metadata/cache/dev-util/eric-4.5.1
@@ -0,0 +1,22 @@
+>=dev-python/sip-4.12.4 >=dev-python/PyQt4-4.6[assistant,svg,webkit,X] >=dev-python/qscintilla-python-2.3 kde? ( kde-base/pykde4 ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
+>=dev-python/sip-4.12.4 >=dev-python/PyQt4-4.6[assistant,svg,webkit,X] >=dev-python/qscintilla-python-2.3 kde? ( kde-base/pykde4 ) >=dev-python/chardet-2.0.1 >=dev-python/coverage-3.0.1 >=dev-python/pygments-1.3.1 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
+4
+mirror://sourceforge/eric-ide/eric4/stable/4.5.1/eric4-4.5.1.tar.gz linguas_cs? ( mirror://sourceforge/eric-ide/eric4/stable/4.5.1/eric4-i18n-cs-4.5.1.tar.gz ) linguas_de? ( mirror://sourceforge/eric-ide/eric4/stable/4.5.1/eric4-i18n-de-4.5.1.tar.gz ) linguas_en? ( mirror://sourceforge/eric-ide/eric4/stable/4.5.1/eric4-i18n-en-4.5.1.tar.gz ) linguas_es? ( mirror://sourceforge/eric-ide/eric4/stable/4.5.1/eric4-i18n-es-4.5.1.tar.gz ) linguas_fr? ( mirror://sourceforge/eric-ide/eric4/stable/4.5.1/eric4-i18n-fr-4.5.1.tar.gz ) linguas_it? ( mirror://sourceforge/eric-ide/eric4/stable/4.5.1/eric4-i18n-it-4.5.1.tar.gz ) linguas_ru? ( mirror://sourceforge/eric-ide/eric4/stable/4.5.1/eric4-i18n-ru-4.5.1.tar.gz ) linguas_tr? ( mirror://sourceforge/eric-ide/eric4/stable/4.5.1/eric4-i18n-tr-4.5.1.tar.gz ) linguas_zh_CN? ( mirror://sourceforge/eric-ide/eric4/stable/4.5.1/eric4-i18n-zh_CN.GB2312-4.5.1.tar.gz )
+
+http://eric-ide.python-projects.org/
+GPL-3
+A full featured Python IDE using PyQt4 and QScintilla
+~amd64 ~ppc ~ppc64 ~x86
+eutils multilib python toolchain-funcs user
+kde spell linguas_cs linguas_de linguas_en linguas_es linguas_fr linguas_it linguas_ru linguas_tr linguas_zh_CN
+
+spell? ( dev-python/pyenchant )
+
+4
+
+install postinst postrm prepare setup
+
+
+
+
+
diff --git a/metadata/cache/dev-util/eric-5.1.7 b/metadata/cache/dev-util/eric-5.1.7
deleted file mode 100644
index 88846b48bf9b..000000000000
--- a/metadata/cache/dev-util/eric-5.1.7
+++ /dev/null
@@ -1,22 +0,0 @@
->=dev-python/sip-4.12.4 >=dev-python/PyQt4-4.7[assistant,svg,webkit,X] >=dev-python/qscintilla-python-2.4 || ( =dev-lang/python-3.2* =dev-lang/python-3.1* )
->=dev-python/sip-4.12.4 >=dev-python/PyQt4-4.7[assistant,svg,webkit,X] >=dev-python/qscintilla-python-2.4 >=dev-python/chardet-2.0.1 >=dev-python/coverage-3.2 >=dev-python/pygments-1.4 || ( =dev-lang/python-3.2* =dev-lang/python-3.1* )
-5
-mirror://sourceforge/eric-ide/eric5/stable/5.1.7/eric5-5.1.7.tar.gz linguas_cs? ( mirror://sourceforge/eric-ide/eric5/stable/5.1.7/eric5-i18n-cs-5.1.7.tar.gz ) linguas_de? ( mirror://sourceforge/eric-ide/eric5/stable/5.1.7/eric5-i18n-de-5.1.7.tar.gz ) linguas_en? ( mirror://sourceforge/eric-ide/eric5/stable/5.1.7/eric5-i18n-en-5.1.7.tar.gz ) linguas_es? ( mirror://sourceforge/eric-ide/eric5/stable/5.1.7/eric5-i18n-es-5.1.7.tar.gz ) linguas_fr? ( mirror://sourceforge/eric-ide/eric5/stable/5.1.7/eric5-i18n-fr-5.1.7.tar.gz ) linguas_it? ( mirror://sourceforge/eric-ide/eric5/stable/5.1.7/eric5-i18n-it-5.1.7.tar.gz ) linguas_ru? ( mirror://sourceforge/eric-ide/eric5/stable/5.1.7/eric5-i18n-ru-5.1.7.tar.gz ) linguas_tr? ( mirror://sourceforge/eric-ide/eric5/stable/5.1.7/eric5-i18n-tr-5.1.7.tar.gz ) linguas_zh_CN? ( mirror://sourceforge/eric-ide/eric5/stable/5.1.7/eric5-i18n-zh_CN.GB2312-5.1.7.tar.gz )
-
-http://eric-ide.python-projects.org/
-GPL-3
-A full featured Python IDE using PyQt4 and QScintilla
-~amd64 ~ppc ~ppc64 ~x86
-eutils multilib python toolchain-funcs user
-spell linguas_cs linguas_de linguas_en linguas_es linguas_fr linguas_it linguas_ru linguas_tr linguas_zh_CN
-
-spell? ( dev-python/pyenchant )
-
-3
-
-install postinst postrm prepare
-
-
-
-
-
diff --git a/metadata/cache/games-puzzle/cutemaze-1.1.0 b/metadata/cache/games-puzzle/cutemaze-1.1.0
index b64ee4533273..954f8153c996 100644
--- a/metadata/cache/games-puzzle/cutemaze-1.1.0
+++ b/metadata/cache/games-puzzle/cutemaze-1.1.0
@@ -1,5 +1,5 @@
-x11-libs/qt-gui:4 x11-libs/qt-svg:4
-x11-libs/qt-gui:4 x11-libs/qt-svg:4
+x11-libs/qt-core:4 x11-libs/qt-gui:4 x11-libs/qt-svg:4
+x11-libs/qt-core:4 x11-libs/qt-gui:4 x11-libs/qt-svg:4
 0
 http://gottcode.org/cutemaze/cutemaze-1.1.0-src.tar.bz2
 
@@ -7,7 +7,7 @@ http://gottcode.org/cutemaze/
 GPL-3
 A simple, top-down game in which mazes are randomly generated
 ~amd64 x86
-base eutils games multilib qt4 toolchain-funcs user versionator
+base eutils games multilib qt4-r2 toolchain-funcs user
 
 
 
diff --git a/metadata/cache/games-puzzle/hexalate-1.0.1 b/metadata/cache/games-puzzle/hexalate-1.0.1
index b15548b8e9fa..5c453ef44a28 100644
--- a/metadata/cache/games-puzzle/hexalate-1.0.1
+++ b/metadata/cache/games-puzzle/hexalate-1.0.1
@@ -1,5 +1,5 @@
-x11-libs/qt-gui:4
-x11-libs/qt-gui:4
+x11-libs/qt-core:4 x11-libs/qt-gui:4
+x11-libs/qt-core:4 x11-libs/qt-gui:4
 0
 http://gottcode.org/hexalate/hexalate-1.0.1-src.tar.bz2
 
@@ -7,7 +7,7 @@ http://gottcode.org/hexalate/
 GPL-3
 A color matching game
 ~amd64 x86
-base eutils games multilib qt4 toolchain-funcs user versionator
+base eutils games multilib qt4-r2 toolchain-funcs user
 
 
 
diff --git a/metadata/cache/media-libs/webrtc-audio-processing-0.1 b/metadata/cache/media-libs/webrtc-audio-processing-0.1
new file mode 100644
index 000000000000..1ee4fdf7eea0
--- /dev/null
+++ b/metadata/cache/media-libs/webrtc-audio-processing-0.1
@@ -0,0 +1,22 @@
+
+
+0
+http://freedesktop.org/software/pulseaudio/webrtc-audio-processing/webrtc-audio-processing-0.1.tar.xz
+
+http://www.freedesktop.org/software/pulseaudio/webrtc-audio-processing/
+BSD
+AudioProcessing library from the webrtc.org code base
+~amd64 ~x86
+
+
+
+
+
+4
+
+-
+
+
+
+
+
diff --git a/metadata/cache/media-libs/x264-0.0.20120327 b/metadata/cache/media-libs/x264-0.0.20120327
new file mode 100644
index 000000000000..8bc43e9dedd2
--- /dev/null
+++ b/metadata/cache/media-libs/x264-0.0.20120327
@@ -0,0 +1,22 @@
+amd64? ( >=dev-lang/yasm-1 ) x86? ( >=dev-lang/yasm-1 ) x86-fbsd? ( >=dev-lang/yasm-1 )
+
+0
+http://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-20120327-2245.tar.bz2
+
+http://www.videolan.org/developers/x264.html
+GPL-2
+A free library for encoding X264/AVC streams
+~alpha ~amd64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+eutils flag-o-matic multilib toolchain-funcs user versionator
+10bit custom-cflags debug +interlaced pic static-libs +threads
+
+
+
+4
+
+configure
+
+
+
+
+
diff --git a/metadata/cache/media-sound/karlyriceditor-1.3 b/metadata/cache/media-sound/karlyriceditor-1.3
new file mode 100644
index 000000000000..1b7b3cfb7164
--- /dev/null
+++ b/metadata/cache/media-sound/karlyriceditor-1.3
@@ -0,0 +1,22 @@
+dev-libs/openssl media-libs/libsdl >=virtual/ffmpeg-0.9 x11-libs/qt-core:4 x11-libs/qt-gui:4
+dev-libs/openssl media-libs/libsdl >=virtual/ffmpeg-0.9 x11-libs/qt-core:4 x11-libs/qt-gui:4
+0
+mirror://sourceforge/karlyriceditor/karlyriceditor-1.3.tar.gz
+
+http://www.karlyriceditor.com/
+GPL-3
+A program which lets you edit and synchronize lyrics with karaoke songs in varions formats
+~amd64 ~x86
+base eutils multilib qt4-r2 toolchain-funcs user
+
+
+
+
+4
+
+compile configure install prepare unpack
+
+
+
+
+
diff --git a/metadata/cache/media-sound/pulseaudio-1.99.2 b/metadata/cache/media-sound/pulseaudio-1.99.2
new file mode 100644
index 000000000000..b9c7e2d8480f
--- /dev/null
+++ b/metadata/cache/media-sound/pulseaudio-1.99.2
@@ -0,0 +1,22 @@
+>=media-libs/libsndfile-1.0.20 X? ( >=x11-libs/libX11-1.4.0 >=x11-libs/libxcb-1.6 >=x11-libs/xcb-util-0.3.1 x11-libs/libSM x11-libs/libICE x11-libs/libXtst ) caps? ( sys-libs/libcap ) libsamplerate? ( >=media-libs/libsamplerate-0.1.1-r1 ) alsa? ( >=media-libs/alsa-lib-1.0.19 ) glib? ( >=dev-libs/glib-2.4.0 ) avahi? ( >=net-dns/avahi-0.6.12[dbus] ) jack? ( >=media-sound/jack-audio-connection-kit-0.117 ) tcpd? ( sys-apps/tcp-wrappers ) lirc? ( app-misc/lirc ) dbus? ( >=sys-apps/dbus-1.0.0 ) gnome? ( >=gnome-base/gconf-2.4.0 ) bluetooth? ( >=net-wireless/bluez-4 >=sys-apps/dbus-1.0.0 ) asyncns? ( net-libs/libasyncns ) udev? ( || ( >=sys-fs/udev-171[hwdb] >=sys-fs/udev-143[extras] ) ) realtime? ( sys-auth/rtkit ) equalizer? ( sci-libs/fftw:3.0 ) orc? ( >=dev-lang/orc-0.4.9 ) ssl? ( dev-libs/openssl ) >=media-libs/speex-1.2_rc1 gdbm? ( sys-libs/gdbm ) webrtc-aec? ( media-libs/webrtc-audio-processing ) dev-libs/json-c >=sys-devel/libtool-2.2.4 doc? ( app-doc/doxygen ) X? ( x11-proto/xproto >=x11-libs/libXtst-1.0.99.2 ) dev-libs/libatomic_ops dev-util/pkgconfig system-wide? ( || ( dev-util/unifdef sys-freebsd/freebsd-ubin ) ) dev-util/intltool
+>=media-libs/libsndfile-1.0.20 X? ( >=x11-libs/libX11-1.4.0 >=x11-libs/libxcb-1.6 >=x11-libs/xcb-util-0.3.1 x11-libs/libSM x11-libs/libICE x11-libs/libXtst ) caps? ( sys-libs/libcap ) libsamplerate? ( >=media-libs/libsamplerate-0.1.1-r1 ) alsa? ( >=media-libs/alsa-lib-1.0.19 ) glib? ( >=dev-libs/glib-2.4.0 ) avahi? ( >=net-dns/avahi-0.6.12[dbus] ) jack? ( >=media-sound/jack-audio-connection-kit-0.117 ) tcpd? ( sys-apps/tcp-wrappers ) lirc? ( app-misc/lirc ) dbus? ( >=sys-apps/dbus-1.0.0 ) gnome? ( >=gnome-base/gconf-2.4.0 ) bluetooth? ( >=net-wireless/bluez-4 >=sys-apps/dbus-1.0.0 ) asyncns? ( net-libs/libasyncns ) udev? ( || ( >=sys-fs/udev-171[hwdb] >=sys-fs/udev-143[extras] ) ) realtime? ( sys-auth/rtkit ) equalizer? ( sci-libs/fftw:3.0 ) orc? ( >=dev-lang/orc-0.4.9 ) ssl? ( dev-libs/openssl ) >=media-libs/speex-1.2_rc1 gdbm? ( sys-libs/gdbm ) webrtc-aec? ( media-libs/webrtc-audio-processing ) dev-libs/json-c >=sys-devel/libtool-2.2.4 X? ( gnome-extra/gnome-audio ) system-wide? ( sys-apps/openrc alsa? ( media-sound/alsa-utils ) bluetooth? ( >=net-wireless/bluez-4 ) )
+0
+http://freedesktop.org/software/pulseaudio/releases/pulseaudio-1.99.2.tar.xz
+
+http://www.pulseaudio.org/
+!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 )
+A networked sound server with an advanced plugin system
+~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
+eutils flag-o-matic libtool multilib toolchain-funcs user versionator
++alsa avahi +caps equalizer jack lirc oss tcpd +X dbus libsamplerate gnome bluetooth +asyncns +glib test doc +udev ipv6 system-wide realtime +orc ssl +gdbm +webrtc-aec
+bluetooth? ( dbus )
+media-plugins/alsa-plugins[pulseaudio]
+
+4
+
+configure install postinst setup test
+
+
+
+
+
diff --git a/metadata/cache/media-sound/pulseaudio-9999 b/metadata/cache/media-sound/pulseaudio-9999
index ccc9945134fb..3075f53ccf9a 100644
--- a/metadata/cache/media-sound/pulseaudio-9999
+++ b/metadata/cache/media-sound/pulseaudio-9999
@@ -1,5 +1,5 @@
->=media-libs/libsndfile-1.0.20 X? ( >=x11-libs/libX11-1.4.0 >=x11-libs/libxcb-1.6 >=x11-libs/xcb-util-0.3.1 x11-libs/libSM x11-libs/libICE x11-libs/libXtst ) caps? ( sys-libs/libcap ) libsamplerate? ( >=media-libs/libsamplerate-0.1.1-r1 ) alsa? ( >=media-libs/alsa-lib-1.0.19 ) glib? ( >=dev-libs/glib-2.4.0 ) avahi? ( >=net-dns/avahi-0.6.12[dbus] ) jack? ( >=media-sound/jack-audio-connection-kit-0.117 ) tcpd? ( sys-apps/tcp-wrappers ) lirc? ( app-misc/lirc ) dbus? ( >=sys-apps/dbus-1.0.0 ) gnome? ( >=gnome-base/gconf-2.4.0 ) bluetooth? ( >=net-wireless/bluez-4 >=sys-apps/dbus-1.0.0 ) asyncns? ( net-libs/libasyncns ) udev? ( || ( >=sys-fs/udev-171[hwdb] >=sys-fs/udev-143[extras] ) ) realtime? ( sys-auth/rtkit ) equalizer? ( sci-libs/fftw:3.0 ) orc? ( >=dev-lang/orc-0.4.9 ) ssl? ( dev-libs/openssl ) >=media-libs/speex-1.2_rc1 gdbm? ( sys-libs/gdbm ) dev-libs/json-c >=sys-devel/libtool-2.2.4 doc? ( app-doc/doxygen ) X? ( x11-proto/xproto >=x11-libs/libXtst-1.0.99.2 ) dev-libs/libatomic_ops dev-util/pkgconfig system-wide? ( || ( dev-util/unifdef sys-freebsd/freebsd-ubin ) ) dev-util/intltool || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
->=media-libs/libsndfile-1.0.20 X? ( >=x11-libs/libX11-1.4.0 >=x11-libs/libxcb-1.6 >=x11-libs/xcb-util-0.3.1 x11-libs/libSM x11-libs/libICE x11-libs/libXtst ) caps? ( sys-libs/libcap ) libsamplerate? ( >=media-libs/libsamplerate-0.1.1-r1 ) alsa? ( >=media-libs/alsa-lib-1.0.19 ) glib? ( >=dev-libs/glib-2.4.0 ) avahi? ( >=net-dns/avahi-0.6.12[dbus] ) jack? ( >=media-sound/jack-audio-connection-kit-0.117 ) tcpd? ( sys-apps/tcp-wrappers ) lirc? ( app-misc/lirc ) dbus? ( >=sys-apps/dbus-1.0.0 ) gnome? ( >=gnome-base/gconf-2.4.0 ) bluetooth? ( >=net-wireless/bluez-4 >=sys-apps/dbus-1.0.0 ) asyncns? ( net-libs/libasyncns ) udev? ( || ( >=sys-fs/udev-171[hwdb] >=sys-fs/udev-143[extras] ) ) realtime? ( sys-auth/rtkit ) equalizer? ( sci-libs/fftw:3.0 ) orc? ( >=dev-lang/orc-0.4.9 ) ssl? ( dev-libs/openssl ) >=media-libs/speex-1.2_rc1 gdbm? ( sys-libs/gdbm ) dev-libs/json-c >=sys-devel/libtool-2.2.4 X? ( gnome-extra/gnome-audio ) system-wide? ( sys-apps/openrc alsa? ( media-sound/alsa-utils ) bluetooth? ( >=net-wireless/bluez-4 ) )
+>=media-libs/libsndfile-1.0.20 X? ( >=x11-libs/libX11-1.4.0 >=x11-libs/libxcb-1.6 >=x11-libs/xcb-util-0.3.1 x11-libs/libSM x11-libs/libICE x11-libs/libXtst ) caps? ( sys-libs/libcap ) libsamplerate? ( >=media-libs/libsamplerate-0.1.1-r1 ) alsa? ( >=media-libs/alsa-lib-1.0.19 ) glib? ( >=dev-libs/glib-2.4.0 ) avahi? ( >=net-dns/avahi-0.6.12[dbus] ) jack? ( >=media-sound/jack-audio-connection-kit-0.117 ) tcpd? ( sys-apps/tcp-wrappers ) lirc? ( app-misc/lirc ) dbus? ( >=sys-apps/dbus-1.0.0 ) gnome? ( >=gnome-base/gconf-2.4.0 ) bluetooth? ( >=net-wireless/bluez-4 >=sys-apps/dbus-1.0.0 ) asyncns? ( net-libs/libasyncns ) udev? ( || ( >=sys-fs/udev-171[hwdb] >=sys-fs/udev-143[extras] ) ) realtime? ( sys-auth/rtkit ) equalizer? ( sci-libs/fftw:3.0 ) orc? ( >=dev-lang/orc-0.4.9 ) ssl? ( dev-libs/openssl ) >=media-libs/speex-1.2_rc1 gdbm? ( sys-libs/gdbm ) webrtc-aec? ( media-libs/webrtc-audio-processing ) dev-libs/json-c >=sys-devel/libtool-2.2.4 doc? ( app-doc/doxygen ) X? ( x11-proto/xproto >=x11-libs/libXtst-1.0.99.2 ) dev-libs/libatomic_ops dev-util/pkgconfig system-wide? ( || ( dev-util/unifdef sys-freebsd/freebsd-ubin ) ) dev-util/intltool || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
+>=media-libs/libsndfile-1.0.20 X? ( >=x11-libs/libX11-1.4.0 >=x11-libs/libxcb-1.6 >=x11-libs/xcb-util-0.3.1 x11-libs/libSM x11-libs/libICE x11-libs/libXtst ) caps? ( sys-libs/libcap ) libsamplerate? ( >=media-libs/libsamplerate-0.1.1-r1 ) alsa? ( >=media-libs/alsa-lib-1.0.19 ) glib? ( >=dev-libs/glib-2.4.0 ) avahi? ( >=net-dns/avahi-0.6.12[dbus] ) jack? ( >=media-sound/jack-audio-connection-kit-0.117 ) tcpd? ( sys-apps/tcp-wrappers ) lirc? ( app-misc/lirc ) dbus? ( >=sys-apps/dbus-1.0.0 ) gnome? ( >=gnome-base/gconf-2.4.0 ) bluetooth? ( >=net-wireless/bluez-4 >=sys-apps/dbus-1.0.0 ) asyncns? ( net-libs/libasyncns ) udev? ( || ( >=sys-fs/udev-171[hwdb] >=sys-fs/udev-143[extras] ) ) realtime? ( sys-auth/rtkit ) equalizer? ( sci-libs/fftw:3.0 ) orc? ( >=dev-lang/orc-0.4.9 ) ssl? ( dev-libs/openssl ) >=media-libs/speex-1.2_rc1 gdbm? ( sys-libs/gdbm ) webrtc-aec? ( media-libs/webrtc-audio-processing ) dev-libs/json-c >=sys-devel/libtool-2.2.4 X? ( gnome-extra/gnome-audio ) system-wide? ( sys-apps/openrc alsa? ( media-sound/alsa-utils ) bluetooth? ( >=net-wireless/bluez-4 ) )
 0
 
 
@@ -8,7 +8,7 @@ http://www.pulseaudio.org/
 A networked sound server with an advanced plugin system
 
 autotools eutils flag-o-matic git-2 libtool multilib toolchain-funcs user versionator
-+alsa avahi +caps equalizer jack lirc oss tcpd +X dbus libsamplerate gnome bluetooth +asyncns +glib test doc +udev ipv6 system-wide realtime +orc ssl +gdbm
++alsa avahi +caps equalizer jack lirc oss tcpd +X dbus libsamplerate gnome bluetooth +asyncns +glib test doc +udev ipv6 system-wide realtime +orc ssl +gdbm +webrtc-aec
 bluetooth? ( dbus )
 media-plugins/alsa-plugins[pulseaudio]
 
diff --git a/metadata/cache/media-sound/qjackctl-0.3.2 b/metadata/cache/media-sound/qjackctl-0.3.2
deleted file mode 100644
index 17fe3e05d979..000000000000
--- a/metadata/cache/media-sound/qjackctl-0.3.2
+++ /dev/null
@@ -1,22 +0,0 @@
-alsa? ( media-libs/alsa-lib ) x11-libs/qt-core:4 x11-libs/qt-gui:4 >=media-sound/jack-audio-connection-kit-0.109.2
-alsa? ( media-libs/alsa-lib ) x11-libs/qt-core:4 x11-libs/qt-gui:4 >=media-sound/jack-audio-connection-kit-0.109.2
-0
-mirror://sourceforge/qjackctl/qjackctl-0.3.2.tar.gz
-
-http://qjackctl.sourceforge.net/
-GPL-2
-A Qt application to control the JACK Audio Connection Kit and ALSA sequencer connections.
-amd64 ~x86
-base eutils multilib qt4 toolchain-funcs user versionator
-alsa debug
-
-
-
-1
-
-compile install setup unpack
-
-
-
-
-
diff --git a/metadata/cache/media-sound/qjackctl-0.3.7 b/metadata/cache/media-sound/qjackctl-0.3.7
deleted file mode 100644
index 78573f86946c..000000000000
--- a/metadata/cache/media-sound/qjackctl-0.3.7
+++ /dev/null
@@ -1,22 +0,0 @@
-alsa? ( media-libs/alsa-lib ) x11-libs/qt-core:4 x11-libs/qt-gui:4 dbus? ( x11-libs/qt-dbus ) portaudio? ( media-libs/portaudio ) >=media-sound/jack-audio-connection-kit-0.109.2
-alsa? ( media-libs/alsa-lib ) x11-libs/qt-core:4 x11-libs/qt-gui:4 dbus? ( x11-libs/qt-dbus ) portaudio? ( media-libs/portaudio ) >=media-sound/jack-audio-connection-kit-0.109.2
-0
-mirror://sourceforge/qjackctl/qjackctl-0.3.7.tar.gz
-
-http://qjackctl.sourceforge.net/
-GPL-2
-A Qt application to control the JACK Audio Connection Kit and ALSA sequencer connections.
-amd64 ~x86
-base eutils multilib qt4 toolchain-funcs user versionator
-alsa dbus debug portaudio
-
-
-
-2
-
-compile configure install prepare setup unpack
-
-
-
-
-
diff --git a/metadata/cache/media-video/x264-encoder-0.0.20120327 b/metadata/cache/media-video/x264-encoder-0.0.20120327
new file mode 100644
index 000000000000..45051541a525
--- /dev/null
+++ b/metadata/cache/media-video/x264-encoder-0.0.20120327
@@ -0,0 +1,22 @@
+ffmpeg? ( virtual/ffmpeg ) ffmpegsource? ( media-libs/ffmpegsource ) mp4? ( >=media-video/gpac-0.4.1_pre20060122 ) amd64? ( >=dev-lang/yasm-0.6.2 ) x86? ( >=dev-lang/yasm-0.6.2 ) x86-fbsd? ( >=dev-lang/yasm-0.6.2 ) dev-util/pkgconfig
+ffmpeg? ( virtual/ffmpeg ) ffmpegsource? ( media-libs/ffmpegsource ) mp4? ( >=media-video/gpac-0.4.1_pre20060122 )
+0
+http://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-20120327-2245.tar.bz2
+
+http://www.videolan.org/developers/x264.html
+GPL-2
+A free commandline encoder for X264/AVC streams
+~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+eutils flag-o-matic multilib toolchain-funcs user versionator
+10bit custom-cflags debug ffmpeg ffmpegsource +interlaced mp4 +threads
+ffmpegsource? ( ffmpeg )
+
+
+4
+
+configure
+
+
+
+
+
diff --git a/metadata/cache/net-analyzer/nfdump-1.6.6 b/metadata/cache/net-analyzer/nfdump-1.6.6
new file mode 100644
index 000000000000..6b711049268e
--- /dev/null
+++ b/metadata/cache/net-analyzer/nfdump-1.6.6
@@ -0,0 +1,22 @@
+ftconv? ( sys-libs/zlib net-analyzer/flow-tools ) nfprofile? ( net-analyzer/rrdtool ) sys-devel/flex || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+ftconv? ( sys-libs/zlib net-analyzer/flow-tools ) nfprofile? ( net-analyzer/rrdtool ) dev-lang/perl
+0
+mirror://sourceforge/nfdump/nfdump-1.6.6.tar.gz
+
+http://nfdump.sourceforge.net/
+BSD
+A set of tools to collect and process netflow data
+~amd64 ~x86
+autotools eutils libtool multilib toolchain-funcs user
+compat15 debug ftconv nfprofile sflow
+
+
+
+4
+
+configure prepare
+
+
+
+
+
diff --git a/metadata/cache/net-im/psi-0.14-r1 b/metadata/cache/net-im/psi-0.14-r1
deleted file mode 100644
index 72b34dea3163..000000000000
--- a/metadata/cache/net-im/psi-0.14-r1
+++ /dev/null
@@ -1,22 +0,0 @@
->=x11-libs/qt-gui-4.4:4[qt3support,dbus?] >=x11-libs/qt-qt3support-4.4:4 >=app-crypt/qca-2.0.2:2 spell? ( >=app-text/enchant-1.3.0 ) xscreensaver? ( x11-libs/libXScrnSaver ) extras? ( webkit? ( x11-libs/qt-webkit ) ) app-arch/unzip extras? ( sys-devel/qconf ) doc? ( app-doc/doxygen )
->=x11-libs/qt-gui-4.4:4[qt3support,dbus?] >=x11-libs/qt-qt3support-4.4:4 >=app-crypt/qca-2.0.2:2 spell? ( >=app-text/enchant-1.3.0 ) xscreensaver? ( x11-libs/libXScrnSaver ) extras? ( webkit? ( x11-libs/qt-webkit ) ) app-arch/unzip
-0
-mirror://sourceforge/psi/psi-0.14.tar.bz2 http://fs.scs-tsa.de/psi_l10n/psi-0.14_langpack_for_packagers_2009-12-02.zip extras? ( mirror://gentoo/psi-extra-patches-r1428.tar.bz2 mirror://gentoo/psi-extra-iconsets-r1428.tar.bz2 )
-test
-http://psi-im.org/
-GPL-2
-Qt4 Jabber client, with Licq-like interface
-amd64 ~arm hppa ppc ppc64 x86 ~x86-fbsd
-base eutils multilib qt4 toolchain-funcs user versionator
-crypt dbus debug doc extras jingle spell ssl xscreensaver webkit linguas_be linguas_cs linguas_de linguas_fr linguas_it linguas_ja linguas_pl linguas_pt_BR linguas_ru linguas_sl linguas_sv linguas_ur_PK linguas_zh_TW
-
-crypt? ( app-crypt/qca-gnupg:2 ) jingle? ( net-im/psimedia app-crypt/qca-ossl:2 ) ssl? ( app-crypt/qca-ossl:2 )
-
-2
-
-compile configure install prepare setup unpack
-
-
-
-
-
diff --git a/metadata/cache/net-im/psi-0.14-r2 b/metadata/cache/net-im/psi-0.14-r2
deleted file mode 100644
index 10fd8c8555a4..000000000000
--- a/metadata/cache/net-im/psi-0.14-r2
+++ /dev/null
@@ -1,22 +0,0 @@
->=x11-libs/qt-gui-4.4:4[qt3support,dbus?] >=x11-libs/qt-qt3support-4.4:4 >=app-crypt/qca-2.0.2:2 spell? ( >=app-text/enchant-1.3.0 ) xscreensaver? ( x11-libs/libXScrnSaver ) extras? ( webkit? ( x11-libs/qt-webkit ) ) app-arch/unzip extras? ( sys-devel/qconf ) doc? ( app-doc/doxygen )
->=x11-libs/qt-gui-4.4:4[qt3support,dbus?] >=x11-libs/qt-qt3support-4.4:4 >=app-crypt/qca-2.0.2:2 spell? ( >=app-text/enchant-1.3.0 ) xscreensaver? ( x11-libs/libXScrnSaver ) extras? ( webkit? ( x11-libs/qt-webkit ) ) app-arch/unzip
-0
-mirror://sourceforge/psi/psi-0.14.tar.bz2 http://fs.scs-tsa.de/psi_l10n/psi-0.14_langpack_for_packagers_2009-12-02.zip extras? ( mirror://gentoo/psi-extra-patches-r1428.tar.bz2 mirror://gentoo/psi-extra-iconsets-r1428.tar.bz2 )
-test
-http://psi-im.org/
-GPL-2
-Qt4 Jabber client, with Licq-like interface
-amd64 ~arm hppa ppc ~ppc64 x86 ~x86-fbsd
-base eutils multilib qt4 toolchain-funcs user versionator
-crypt dbus debug doc extras jingle spell ssl xscreensaver webkit linguas_be linguas_cs linguas_de linguas_fr linguas_it linguas_ja linguas_pl linguas_pt_BR linguas_ru linguas_sl linguas_sv linguas_ur_PK linguas_zh_TW
-
-crypt? ( app-crypt/qca-gnupg:2 ) jingle? ( net-im/psimedia app-crypt/qca-ossl:2 ) ssl? ( app-crypt/qca-ossl:2 )
-
-2
-
-compile configure install prepare setup unpack
-
-
-
-
-
diff --git a/metadata/cache/net-im/psimedia-1.0.3 b/metadata/cache/net-im/psimedia-1.0.3
deleted file mode 100644
index 3770cc631cc9..000000000000
--- a/metadata/cache/net-im/psimedia-1.0.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=dev-libs/glib-2.18 >=media-libs/gstreamer-0.10.22 >=media-libs/gst-plugins-base-0.10.22 media-libs/gst-plugins-good >=dev-libs/liboil-0.3 x11-libs/qt-core x11-libs/qt-gui >=media-libs/speex-1.2_rc1
->=dev-libs/glib-2.18 >=media-libs/gstreamer-0.10.22 >=media-libs/gst-plugins-base-0.10.22 media-libs/gst-plugins-good >=dev-libs/liboil-0.3 x11-libs/qt-core x11-libs/qt-gui >=media-libs/speex-1.2_rc1 media-plugins/gst-plugins-speex >=media-plugins/gst-plugins-vorbis-0.10.22 >=media-plugins/gst-plugins-theora-0.10.22 >=media-plugins/gst-plugins-alsa-0.10.22 >=media-plugins/gst-plugins-ogg-0.10.22 media-plugins/gst-plugins-v4l2 media-plugins/gst-plugins-jpeg !<net-im/psi-0.13_rc1
-0
-http://delta.affinix.com/download/psimedia/psimedia-1.0.3.tar.bz2
-
-http://delta.affinix.com/psimedia/
-GPL-2
-Psi plugin for voice/video calls
-amd64 ~arm hppa ppc ppc64 x86
-base eutils multilib qt4 toolchain-funcs user versionator
-demo
-
-
-
-2
-
-compile configure install prepare setup unpack
-
-
-
-
-
diff --git a/metadata/cache/net-im/psimedia-1.0.3-r1 b/metadata/cache/net-im/psimedia-1.0.3-r1
deleted file mode 100644
index e86a37dd70c4..000000000000
--- a/metadata/cache/net-im/psimedia-1.0.3-r1
+++ /dev/null
@@ -1,22 +0,0 @@
->=dev-libs/glib-2.18 >=media-libs/gstreamer-0.10.22 >=media-libs/gst-plugins-base-0.10.22 media-libs/gst-plugins-good >=dev-libs/liboil-0.3 >=x11-libs/qt-gui-4.4:4 >=media-libs/speex-1.2_rc1 dev-util/pkgconfig
->=dev-libs/glib-2.18 >=media-libs/gstreamer-0.10.22 >=media-libs/gst-plugins-base-0.10.22 media-libs/gst-plugins-good >=dev-libs/liboil-0.3 >=x11-libs/qt-gui-4.4:4 >=media-libs/speex-1.2_rc1 media-plugins/gst-plugins-speex >=media-plugins/gst-plugins-vorbis-0.10.22 >=media-plugins/gst-plugins-theora-0.10.22 >=media-plugins/gst-plugins-alsa-0.10.22 >=media-plugins/gst-plugins-ogg-0.10.22 media-plugins/gst-plugins-v4l2 media-plugins/gst-plugins-jpeg !<net-im/psi-0.13_rc1
-0
-http://delta.affinix.com/download/psimedia/psimedia-1.0.3.tar.bz2
-
-http://delta.affinix.com/psimedia/
-GPL-2
-Psi plugin for voice/video calls
-~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86
-base eutils multilib qt4-r2 toolchain-funcs user
-demo
-
-
-
-2
-
-compile configure install prepare unpack
-
-
-
-
-
diff --git a/metadata/cache/net-im/psimedia-1.0.3-r2 b/metadata/cache/net-im/psimedia-1.0.3-r2
deleted file mode 100644
index a955cf5b8393..000000000000
--- a/metadata/cache/net-im/psimedia-1.0.3-r2
+++ /dev/null
@@ -1,22 +0,0 @@
->=dev-libs/glib-2.18 >=media-libs/gstreamer-0.10.22 >=media-libs/gst-plugins-base-0.10.22 media-libs/gst-plugins-good >=dev-libs/liboil-0.3 >=x11-libs/qt-gui-4.4:4 >=media-libs/speex-1.2_rc1 dev-util/pkgconfig
->=dev-libs/glib-2.18 >=media-libs/gstreamer-0.10.22 >=media-libs/gst-plugins-base-0.10.22 media-libs/gst-plugins-good >=dev-libs/liboil-0.3 >=x11-libs/qt-gui-4.4:4 >=media-libs/speex-1.2_rc1 media-plugins/gst-plugins-speex >=media-plugins/gst-plugins-vorbis-0.10.22 >=media-plugins/gst-plugins-theora-0.10.22 >=media-plugins/gst-plugins-alsa-0.10.22 >=media-plugins/gst-plugins-ogg-0.10.22 media-plugins/gst-plugins-v4l2 media-plugins/gst-plugins-jpeg !<net-im/psi-0.13_rc1
-0
-http://delta.affinix.com/download/psimedia/psimedia-1.0.3.tar.bz2
-
-http://delta.affinix.com/psimedia/
-GPL-2
-Psi plugin for voice/video calls
-amd64 ~arm hppa ~ppc ~ppc64 ~x86
-base eutils multilib qt4-r2 toolchain-funcs user
-demo
-
-
-
-2
-
-compile configure install prepare unpack
-
-
-
-
-
diff --git a/metadata/cache/net-libs/gnutls-2.12.18 b/metadata/cache/net-libs/gnutls-2.12.18
index 0f12c668a762..5fb9ddbb1c39 100644
--- a/metadata/cache/net-libs/gnutls-2.12.18
+++ b/metadata/cache/net-libs/gnutls-2.12.18
@@ -1,4 +1,4 @@
->=dev-libs/libtasn1-0.3.4 guile? ( >=dev-scheme/guile-1.8[networking] ) nettle? ( >=dev-libs/nettle-2.1[gmp] ) !nettle? ( >=dev-libs/libgcrypt-1.4.0 ) nls? ( virtual/libintl ) pkcs11? ( app-crypt/p11-kit ) zlib? ( >=sys-libs/zlib-1.2.3.1 ) !bindist? ( lzo? ( >=dev-libs/lzo-2 ) ) sys-devel/libtool doc? ( dev-util/gtk-doc ) nls? ( sys-devel/gettext ) test? ( app-misc/datefudge ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/libtasn1-0.3.4 guile? ( >=dev-scheme/guile-1.8[networking] ) nettle? ( >=dev-libs/nettle-2.1[gmp] ) !nettle? ( >=dev-libs/libgcrypt-1.4.0 ) nls? ( virtual/libintl ) pkcs11? ( app-crypt/p11-kit ) zlib? ( >=sys-libs/zlib-1.2.3.1 ) !bindist? ( lzo? ( >=dev-libs/lzo-2 ) ) dev-util/pkgconfig sys-devel/libtool doc? ( dev-util/gtk-doc ) nls? ( sys-devel/gettext ) test? ( app-misc/datefudge ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/libtasn1-0.3.4 guile? ( >=dev-scheme/guile-1.8[networking] ) nettle? ( >=dev-libs/nettle-2.1[gmp] ) !nettle? ( >=dev-libs/libgcrypt-1.4.0 ) nls? ( virtual/libintl ) pkcs11? ( app-crypt/p11-kit ) zlib? ( >=sys-libs/zlib-1.2.3.1 ) !bindist? ( lzo? ( >=dev-libs/lzo-2 ) )
 0
 mirror://gnu/gnutls/gnutls-2.12.18.tar.bz2
diff --git a/metadata/cache/net-mail/automx-0.8_rc2 b/metadata/cache/net-mail/automx-0.8
similarity index 88%
rename from metadata/cache/net-mail/automx-0.8_rc2
rename to metadata/cache/net-mail/automx-0.8
index 33b32193cbd4..7da9a719ba81 100644
--- a/metadata/cache/net-mail/automx-0.8_rc2
+++ b/metadata/cache/net-mail/automx-0.8
@@ -1,7 +1,7 @@
 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
 dev-python/lxml || ( www-apache/mod_wsgi www-servers/uwsgi ) sql? ( dev-python/sqlalchemy ) tools? ( net-dns/bind-tools ) tools? ( net-misc/wget ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
 0
-http://www.automx.org/download/automx-0.8_rc2.tar.gz
+http://www.automx.org/download/automx-0.8.tar.gz
 
 http://www.automx.org
 GPL-3
diff --git a/metadata/cache/net-news/liferea-1.8.4 b/metadata/cache/net-news/liferea-1.8.4
new file mode 100644
index 000000000000..564e4c20897e
--- /dev/null
+++ b/metadata/cache/net-news/liferea-1.8.4
@@ -0,0 +1,22 @@
+>=x11-libs/gtk+-2.18.0:2 >=dev-libs/glib-2.24.0:2 >=x11-libs/pango-1.4.0 >=gnome-base/gconf-1.1.9:2 >=dev-libs/libxml2-2.6.27:2 >=dev-libs/libxslt-1.1.19 >=dev-db/sqlite-3.7.0:3 >=net-libs/libsoup-2.28.2:2.4 dev-libs/libunique:1 >=net-libs/webkit-gtk-1.2.2:2 dev-libs/json-glib ayatana? ( dev-libs/libindicate ) libnotify? ( >=x11-libs/libnotify-0.3.2 ) dev-util/intltool dev-util/pkgconfig app-arch/xz-utils >=sys-apps/sed-4
+>=x11-libs/gtk+-2.18.0:2 >=dev-libs/glib-2.24.0:2 >=x11-libs/pango-1.4.0 >=gnome-base/gconf-1.1.9:2 >=dev-libs/libxml2-2.6.27:2 >=dev-libs/libxslt-1.1.19 >=dev-db/sqlite-3.7.0:3 >=net-libs/libsoup-2.28.2:2.4 dev-libs/libunique:1 >=net-libs/webkit-gtk-1.2.2:2 dev-libs/json-glib ayatana? ( dev-libs/libindicate ) libnotify? ( >=x11-libs/libnotify-0.3.2 )
+0
+mirror://sourceforge/liferea/liferea-1.8.4.tar.gz
+
+http://liferea.sourceforge.net/
+GPL-2
+News Aggregator for RDF/RSS/CDF/Atom/Echo feeds
+~amd64 ~ppc ~ppc64 ~x86
+eutils fdo-mime gnome.org gnome2 gnome2-utils libtool multilib pax-utils toolchain-funcs user versionator
+ayatana libnotify
+
+
+
+4
+
+compile configure install postinst postrm preinst prepare setup unpack
+
+
+
+
+
diff --git a/metadata/cache/www-client/arora-0.10.2-r1 b/metadata/cache/www-client/arora-0.10.2-r1
deleted file mode 100644
index c109936aacb1..000000000000
--- a/metadata/cache/www-client/arora-0.10.2-r1
+++ /dev/null
@@ -1,22 +0,0 @@
-x11-libs/qt-gui:4 x11-libs/qt-sql:4 x11-libs/qt-webkit:4 x11-libs/qt-xmlpatterns:4 doc? ( app-doc/doxygen )
-x11-libs/qt-gui:4 x11-libs/qt-sql:4 x11-libs/qt-webkit:4 x11-libs/qt-xmlpatterns:4
-0
-http://arora.googlecode.com/files/arora-0.10.2.tar.gz
-
-http://arora.googlecode.com/
-|| ( GPL-3 GPL-2 )
-A cross-platform Qt4 WebKit browser
-amd64 ~arm ~ppc x86
-base eutils multilib qt4-r2 toolchain-funcs user
-debug doc linguas_ast linguas_ca linguas_es linguas_es_CR linguas_et_EE linguas_fr_CA linguas_gl linguas_ms linguas_nb_NO linguas_pt_BR linguas_pt_PT linguas_sr@latin linguas_sr_CS linguas_uk linguas_zh_CN linguas_zh_TW linguas_cs linguas_da linguas_de linguas_el linguas_fi linguas_fr linguas_he linguas_hu linguas_it linguas_ja linguas_nl linguas_pl linguas_ru linguas_sk linguas_tr
-
-
-
-2
-
-compile configure install prepare unpack
-
-
-
-
-
diff --git a/metadata/cache/www-client/arora-0.11.0 b/metadata/cache/www-client/arora-0.11.0
deleted file mode 100644
index 511625c7401f..000000000000
--- a/metadata/cache/www-client/arora-0.11.0
+++ /dev/null
@@ -1,22 +0,0 @@
-x11-libs/qt-gui:4 x11-libs/qt-sql:4 x11-libs/qt-webkit:4 x11-libs/qt-xmlpatterns:4 doc? ( app-doc/doxygen )
-x11-libs/qt-gui:4 x11-libs/qt-sql:4 x11-libs/qt-webkit:4 x11-libs/qt-xmlpatterns:4
-0
-http://arora.googlecode.com/files/arora-0.11.0.tar.gz
-
-http://arora.googlecode.com/
-|| ( GPL-3 GPL-2 )
-A cross-platform Qt4 WebKit browser
-~amd64 ~arm ~ppc ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
-base eutils multilib qt4-r2 toolchain-funcs user
-debug doc linguas_ast linguas_ca linguas_es linguas_es_CR linguas_et_EE linguas_fr_CA linguas_gl linguas_ms linguas_nb_NO linguas_nl linguas_pt_BR linguas_pt_PT linguas_sr@latin linguas_sr_CS linguas_uk linguas_zh_CN linguas_zh_TW linguas_cs linguas_da linguas_de linguas_el linguas_fi linguas_fr linguas_he linguas_hu linguas_it linguas_ja linguas_pl linguas_ru linguas_sk linguas_tr
-
-
-
-3
-
-compile configure install prepare unpack
-
-
-
-
-
diff --git a/metadata/cache/www-client/chromium-17.0.963.79 b/metadata/cache/www-client/chromium-17.0.963.79
deleted file mode 100644
index 95b0fe6493bf..000000000000
--- a/metadata/cache/www-client/chromium-17.0.963.79
+++ /dev/null
@@ -1,22 +0,0 @@
-app-arch/bzip2 cups? ( dev-libs/libgcrypt >=net-print/cups-1.3.11 ) >=dev-lang/v8-3.7.6 dev-libs/dbus-glib dev-libs/elfutils >=dev-libs/icu-4.4.1 >=dev-libs/libevent-1.4.13 dev-libs/libxml2[icu] dev-libs/libxslt >=dev-libs/nss-3.12.3 gnome? ( >=gnome-base/gconf-2.24.0 ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 ) >=media-libs/alsa-lib-1.0.19 media-libs/flac virtual/jpeg media-libs/libpng >=media-libs/libwebp-0.1.2 media-libs/speex pulseaudio? ( media-sound/pulseaudio ) sys-libs/zlib x11-libs/gtk+:2 x11-libs/libXinerama x11-libs/libXScrnSaver x11-libs/libXtst kerberos? ( virtual/krb5 ) >=dev-lang/nacl-toolchain-newlib-0_p7311 dev-lang/perl dev-lang/yasm dev-python/simplejson >=dev-util/gperf-3.0.3 >=dev-util/pkgconfig-0.23 >=sys-devel/bison-2.4.3 sys-devel/flex >=sys-devel/make-3.81-r2 test? ( dev-python/pyftpdlib ) >=sys-apps/sed-4 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-app-arch/bzip2 cups? ( dev-libs/libgcrypt >=net-print/cups-1.3.11 ) >=dev-lang/v8-3.7.6 dev-libs/dbus-glib dev-libs/elfutils >=dev-libs/icu-4.4.1 >=dev-libs/libevent-1.4.13 dev-libs/libxml2[icu] dev-libs/libxslt >=dev-libs/nss-3.12.3 gnome? ( >=gnome-base/gconf-2.24.0 ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 ) >=media-libs/alsa-lib-1.0.19 media-libs/flac virtual/jpeg media-libs/libpng >=media-libs/libwebp-0.1.2 media-libs/speex pulseaudio? ( media-sound/pulseaudio ) sys-libs/zlib x11-libs/gtk+:2 x11-libs/libXinerama x11-libs/libXScrnSaver x11-libs/libXtst kerberos? ( virtual/krb5 ) !=www-client/chromium-9999 x11-misc/xdg-utils virtual/ttf-fonts || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
-0
-http://commondatastorage.googleapis.com/chromium-browser-official/chromium-17.0.963.79.tar.bz2
-
-http://chromium.org/
-BSD
-Open-source version of Google Chrome web browser
-amd64 x86
-eutils fdo-mime flag-o-matic gnome2-utils linux-info multilib pax-utils portability python toolchain-funcs user versionator virtualx
-bindist cups custom-cflags gnome gnome-keyring kerberos pulseaudio linguas_am linguas_ar linguas_bg linguas_bn linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_es linguas_es_LA linguas_et linguas_fa linguas_fi linguas_fil linguas_fr linguas_gu linguas_he linguas_hi linguas_hr linguas_hu linguas_id linguas_it linguas_ja linguas_kn linguas_ko linguas_lt linguas_lv linguas_ml linguas_mr linguas_nb linguas_nl linguas_pl linguas_pt_BR linguas_pt_PT linguas_ro linguas_ru linguas_sk linguas_sl linguas_sr linguas_sv linguas_sw linguas_ta linguas_te linguas_th linguas_tr linguas_uk linguas_vi linguas_zh_CN linguas_zh_TW test
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test
-
-
-
-
-
diff --git a/metadata/cache/www-client/chromium-18.0.1025.113 b/metadata/cache/www-client/chromium-18.0.1025.142
similarity index 98%
rename from metadata/cache/www-client/chromium-18.0.1025.113
rename to metadata/cache/www-client/chromium-18.0.1025.142
index b515803007fd..e94f9bc079b5 100644
--- a/metadata/cache/www-client/chromium-18.0.1025.113
+++ b/metadata/cache/www-client/chromium-18.0.1025.142
@@ -1,12 +1,12 @@
 app-arch/bzip2 cups? ( dev-libs/libgcrypt >=net-print/cups-1.3.11 ) >=dev-lang/v8-3.8.9.4 dev-libs/dbus-glib dev-libs/elfutils >=dev-libs/icu-4.4.1 >=dev-libs/libevent-1.4.13 dev-libs/libxml2[icu] dev-libs/libxslt >=dev-libs/nss-3.12.3 gnome? ( >=gnome-base/gconf-2.24.0 ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 ) >=media-libs/alsa-lib-1.0.19 media-libs/flac virtual/jpeg media-libs/libpng >=media-libs/libwebp-0.1.3 media-libs/speex pulseaudio? ( media-sound/pulseaudio ) sys-fs/udev sys-libs/zlib x11-libs/gtk+:2 x11-libs/libXinerama x11-libs/libXScrnSaver x11-libs/libXtst kerberos? ( virtual/krb5 ) >=dev-lang/nacl-toolchain-newlib-0_p7311 dev-lang/perl dev-lang/yasm dev-python/simplejson >=dev-util/gperf-3.0.3 >=dev-util/pkgconfig-0.23 >=sys-devel/bison-2.4.3 sys-devel/flex >=sys-devel/make-3.81-r2 test? ( dev-python/pyftpdlib ) >=sys-apps/sed-4 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 app-arch/bzip2 cups? ( dev-libs/libgcrypt >=net-print/cups-1.3.11 ) >=dev-lang/v8-3.8.9.4 dev-libs/dbus-glib dev-libs/elfutils >=dev-libs/icu-4.4.1 >=dev-libs/libevent-1.4.13 dev-libs/libxml2[icu] dev-libs/libxslt >=dev-libs/nss-3.12.3 gnome? ( >=gnome-base/gconf-2.24.0 ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 ) >=media-libs/alsa-lib-1.0.19 media-libs/flac virtual/jpeg media-libs/libpng >=media-libs/libwebp-0.1.3 media-libs/speex pulseaudio? ( media-sound/pulseaudio ) sys-fs/udev sys-libs/zlib x11-libs/gtk+:2 x11-libs/libXinerama x11-libs/libXScrnSaver x11-libs/libXtst kerberos? ( virtual/krb5 ) !=www-client/chromium-9999 x11-misc/xdg-utils virtual/ttf-fonts || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
 0
-http://commondatastorage.googleapis.com/chromium-browser-official/chromium-18.0.1025.113.tar.bz2
+http://commondatastorage.googleapis.com/chromium-browser-official/chromium-18.0.1025.142.tar.bz2
 
 http://chromium.org/
 BSD
 Open-source version of Google Chrome web browser
-~amd64 ~x86
+~amd64 x86
 chromium eutils fdo-mime flag-o-matic gnome2-utils linux-info multilib pax-utils portability python toolchain-funcs user versionator virtualx
 bindist cups gnome gnome-keyring kerberos pulseaudio custom-cflags +linguas_am +linguas_ar +linguas_bg +linguas_bn +linguas_ca +linguas_cs +linguas_da +linguas_de +linguas_el +linguas_en_GB +linguas_es +linguas_es_LA +linguas_et +linguas_fa +linguas_fi +linguas_fil +linguas_fr +linguas_gu +linguas_he +linguas_hi +linguas_hr +linguas_hu +linguas_id +linguas_it +linguas_ja +linguas_kn +linguas_ko +linguas_lt +linguas_lv +linguas_ml +linguas_mr +linguas_ms +linguas_nb +linguas_nl +linguas_pl +linguas_pt_BR +linguas_pt_PT +linguas_ro +linguas_ru +linguas_sk +linguas_sl +linguas_sr +linguas_sv +linguas_sw +linguas_ta +linguas_te +linguas_th +linguas_tr +linguas_uk +linguas_vi +linguas_zh_CN +linguas_zh_TW test
 
diff --git a/metadata/cache/www-plugins/adobe-flash-11.2.202.223 b/metadata/cache/www-plugins/adobe-flash-11.2.202.223
new file mode 100644
index 000000000000..ab04b13f7ef2
--- /dev/null
+++ b/metadata/cache/www-plugins/adobe-flash-11.2.202.223
@@ -0,0 +1,22 @@
+amd64? ( multilib? ( !64bit? ( www-plugins/nspluginwrapper ) ) )
+x86? ( x11-libs/gtk+:2 media-libs/fontconfig dev-libs/nss net-misc/curl vdpau? ( x11-libs/libvdpau ) kde? ( kde-base/kcmshell ) >=sys-libs/glibc-2.4 ) amd64? ( multilib? ( 64bit? ( x11-libs/gtk+:2 media-libs/fontconfig dev-libs/nss net-misc/curl vdpau? ( x11-libs/libvdpau ) kde? ( kde-base/kcmshell ) >=sys-libs/glibc-2.4 ) 32bit? ( vdpau? ( >=app-emulation/emul-linux-x86-xlibs-20110129 ) >=app-emulation/emul-linux-x86-gtklibs-20100409-r1 app-emulation/emul-linux-x86-soundlibs ) ) !multilib? ( x11-libs/gtk+:2 media-libs/fontconfig dev-libs/nss net-misc/curl vdpau? ( x11-libs/libvdpau ) kde? ( kde-base/kcmshell ) >=sys-libs/glibc-2.4 ) ) || ( media-fonts/liberation-fonts media-fonts/corefonts ) amd64? ( multilib? ( !64bit? ( www-plugins/nspluginwrapper ) ) )
+0
+x86? ( http://fpdownload.macromedia.com/get/flashplayer/pdc/11.2.202.223/install_flash_player_11_linux.i386.tar.gz -> adobe-flash-11.2.202.223.i386.tar.gz ) amd64? ( multilib? ( 32bit? ( http://fpdownload.macromedia.com/get/flashplayer/pdc/11.2.202.223/install_flash_player_11_linux.i386.tar.gz -> adobe-flash-11.2.202.223.i386.tar.gz ) 64bit? ( http://fpdownload.macromedia.com/get/flashplayer/pdc/11.2.202.223/install_flash_player_11_linux.x86_64.tar.gz -> adobe-flash-11.2.202.223.x86_64.tar.gz ) ) !multilib? ( http://fpdownload.macromedia.com/get/flashplayer/pdc/11.2.202.223/install_flash_player_11_linux.x86_64.tar.gz -> adobe-flash-11.2.202.223.x86_64.tar.gz ) )
+strip mirror
+http://www.adobe.com/products/flashplayer.html
+AdobeFlash-10.3
+Adobe Flash Player
+-* ~amd64 ~x86
+eutils multilib nsplugins toolchain-funcs user versionator
+multilib -32bit +64bit vdpau kde
+
+
+
+4
+
+compile install postinst setup unpack
+
+
+
+
+
diff --git a/metadata/cache/www-plugins/adobe-flash-11.2.202.228 b/metadata/cache/www-plugins/adobe-flash-11.2.202.228
new file mode 100644
index 000000000000..821c835415f8
--- /dev/null
+++ b/metadata/cache/www-plugins/adobe-flash-11.2.202.228
@@ -0,0 +1,22 @@
+amd64? ( multilib? ( !64bit? ( www-plugins/nspluginwrapper ) ) )
+x86? ( x11-libs/gtk+:2 media-libs/fontconfig dev-libs/nss net-misc/curl vdpau? ( x11-libs/libvdpau ) kde? ( kde-base/kcmshell ) >=sys-libs/glibc-2.4 ) amd64? ( multilib? ( 64bit? ( x11-libs/gtk+:2 media-libs/fontconfig dev-libs/nss net-misc/curl vdpau? ( x11-libs/libvdpau ) kde? ( kde-base/kcmshell ) >=sys-libs/glibc-2.4 ) 32bit? ( vdpau? ( >=app-emulation/emul-linux-x86-xlibs-20110129 ) >=app-emulation/emul-linux-x86-gtklibs-20100409-r1 app-emulation/emul-linux-x86-soundlibs ) ) !multilib? ( x11-libs/gtk+:2 media-libs/fontconfig dev-libs/nss net-misc/curl vdpau? ( x11-libs/libvdpau ) kde? ( kde-base/kcmshell ) >=sys-libs/glibc-2.4 ) ) || ( media-fonts/liberation-fonts media-fonts/corefonts ) amd64? ( multilib? ( !64bit? ( www-plugins/nspluginwrapper ) ) )
+0
+x86? ( http://fpdownload.macromedia.com/get/flashplayer/pdc/11.2.202.228/install_flash_player_11_linux.i386.tar.gz -> adobe-flash-11.2.202.228.i386.tar.gz ) amd64? ( multilib? ( 32bit? ( http://fpdownload.macromedia.com/get/flashplayer/pdc/11.2.202.228/install_flash_player_11_linux.i386.tar.gz -> adobe-flash-11.2.202.228.i386.tar.gz ) 64bit? ( http://fpdownload.macromedia.com/get/flashplayer/pdc/11.2.202.228/install_flash_player_11_linux.x86_64.tar.gz -> adobe-flash-11.2.202.228.x86_64.tar.gz ) ) !multilib? ( http://fpdownload.macromedia.com/get/flashplayer/pdc/11.2.202.228/install_flash_player_11_linux.x86_64.tar.gz -> adobe-flash-11.2.202.228.x86_64.tar.gz ) )
+strip mirror
+http://www.adobe.com/products/flashplayer.html
+AdobeFlash-10.3
+Adobe Flash Player
+-* ~amd64 ~x86
+eutils multilib nsplugins toolchain-funcs user versionator
+multilib -32bit +64bit vdpau kde
+
+
+
+4
+
+compile install postinst setup unpack
+
+
+
+
+
diff --git a/metadata/cache/www-servers/apache-2.2.22 b/metadata/cache/www-servers/apache-2.2.22
new file mode 100644
index 000000000000..f49d9e2ab095
--- /dev/null
+++ b/metadata/cache/www-servers/apache-2.2.22
@@ -0,0 +1,22 @@
+>=dev-libs/openssl-0.9.8m apache2_modules_deflate? ( sys-libs/zlib ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool ssl? ( dev-libs/openssl ) dev-lang/perl =dev-libs/apr-1* =dev-libs/apr-util-1*[ldap?] dev-libs/libpcre ldap? ( =net-nds/openldap-2* ) selinux? ( sec-policy/selinux-apache ) ssl? ( >=dev-libs/openssl-0.9.8f ) !=www-servers/apache-1*
+>=dev-libs/apr-1.4.5 >=dev-libs/openssl-0.9.8m apache2_modules_mime? ( app-misc/mime-types ) dev-lang/perl =dev-libs/apr-1* =dev-libs/apr-util-1*[ldap?] dev-libs/libpcre ldap? ( =net-nds/openldap-2* ) selinux? ( sec-policy/selinux-apache ) ssl? ( >=dev-libs/openssl-0.9.8f ) !=www-servers/apache-1*
+2
+mirror://apache/httpd/httpd-2.2.22.tar.bz2 http://dev.gentoo.org/~jmbsvicetto/dist/apache/gentoo-apache-2.2.22-20120213.tar.bz2
+
+http://httpd.apache.org/
+Apache-2.0 Apache-1.1
+The Apache Web Server.
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd
+apache-2 autotools eutils flag-o-matic libtool multilib ssl-cert toolchain-funcs user
+ssl debug doc ldap selinux ssl static suexec threads apache2_modules_actions apache2_modules_alias apache2_modules_asis apache2_modules_auth_basic apache2_modules_auth_digest apache2_modules_authn_alias apache2_modules_authn_anon apache2_modules_authn_dbd apache2_modules_authn_dbm apache2_modules_authn_default apache2_modules_authn_file apache2_modules_authz_dbm apache2_modules_authz_default apache2_modules_authz_groupfile apache2_modules_authz_host apache2_modules_authz_owner apache2_modules_authz_user apache2_modules_autoindex apache2_modules_cache apache2_modules_cern_meta apache2_modules_charset_lite apache2_modules_cgi apache2_modules_cgid apache2_modules_dav apache2_modules_dav_fs apache2_modules_dav_lock apache2_modules_dbd apache2_modules_deflate apache2_modules_dir apache2_modules_disk_cache apache2_modules_dumpio apache2_modules_env apache2_modules_expires apache2_modules_ext_filter apache2_modules_file_cache apache2_modules_filter apache2_modules_headers apache2_modules_ident apache2_modules_imagemap apache2_modules_include apache2_modules_info apache2_modules_log_config apache2_modules_log_forensic apache2_modules_logio apache2_modules_mem_cache apache2_modules_mime apache2_modules_mime_magic apache2_modules_negotiation apache2_modules_proxy apache2_modules_proxy_ajp apache2_modules_proxy_balancer apache2_modules_proxy_connect apache2_modules_proxy_ftp apache2_modules_proxy_http apache2_modules_proxy_scgi apache2_modules_rewrite apache2_modules_reqtimeout apache2_modules_setenvif apache2_modules_speling apache2_modules_status apache2_modules_substitute apache2_modules_unique_id apache2_modules_userdir apache2_modules_usertrack apache2_modules_version apache2_modules_vhost_alias apache2_mpms_itk apache2_mpms_peruser apache2_mpms_prefork apache2_mpms_event apache2_mpms_worker
+
+~app-admin/apache-tools-2.2.22
+
+2
+
+configure install postinst prepare setup
+
+
+
+
+
diff --git a/metadata/cache/x11-misc/lightdm-1.1.9 b/metadata/cache/x11-misc/lightdm-1.1.9
new file mode 100644
index 000000000000..e45a93f7c82a
--- /dev/null
+++ b/metadata/cache/x11-misc/lightdm-1.1.9
@@ -0,0 +1,22 @@
+dev-libs/glib:2 virtual/pam x11-libs/libxklavier x11-libs/libX11 dev-libs/libxml2 introspection? ( dev-libs/gobject-introspection ) sys-apps/accountsservice dev-util/intltool dev-util/pkgconfig gnome-base/gnome-common sys-devel/gettext || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/glib:2 virtual/pam x11-libs/libxklavier x11-libs/libX11 dev-libs/libxml2 introspection? ( dev-libs/gobject-introspection ) sys-apps/accountsservice
+0
+http://launchpad.net/lightdm/1.2/1.1.9/+download/lightdm-1.1.9.tar.gz mirror://gentoo/introspection-20110205.m4.tar.bz2
+
+http://www.freedesktop.org/wiki/Software/LightDM
+GPL-3 LGPL-3
+A lightweight display manager
+~amd64 ~x86
+autotools eutils flag-o-matic libtool multilib pam toolchain-funcs user
++introspection
+
+x11-misc/lightdm-gtk-greeter
+
+4
+
+configure install postinst prepare
+
+
+
+
+
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 20a6a5932cb4..1471cbfbb266 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Wed, 28 Mar 2012 15:06:47 +0000
+Wed, 28 Mar 2012 19:36:47 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 20a6a5932cb4..1471cbfbb266 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Wed, 28 Mar 2012 15:06:47 +0000
+Wed, 28 Mar 2012 19:36:47 +0000
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 553e9747c7a0..908c70f1a31b 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Wed, 28 Mar 2012 15:06:49 +0000
+Wed, 28 Mar 2012 19:36:49 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index d0ecc5a0749c..bfd537c29730 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Wed Mar 28 15:06:47 UTC 2012
+Wed Mar 28 19:36:47 UTC 2012
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 6dd6a5b0f901..3655d7ccd8c0 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Wed, 28 Mar 2012 15:30:01 +0000
+Wed, 28 Mar 2012 20:00:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index fbbafb2587d9..2e092604a902 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1332947101 Wed Mar 28 15:05:01 2012 UTC
+1332963301 Wed Mar 28 19:35:01 2012 UTC
diff --git a/net-analyzer/nfdump/Manifest b/net-analyzer/nfdump/Manifest
index 4485fac53431..05ade00076df 100644
--- a/net-analyzer/nfdump/Manifest
+++ b/net-analyzer/nfdump/Manifest
@@ -1,2 +1,3 @@
 DIST nfdump-1.6.1.tar.gz 495643 RMD160 af26aef45e937b633c349cd6a551c34bf8cf8827 SHA1 d00cd84eb0f6ff23928c3c2c09665e5633f5114d SHA256 d0585d3963288b708f2be6081f673d9935acc8bb5f25255286786eedf31edafd
 DIST nfdump-1.6.5.tar.gz 786526 RMD160 3bb33720965dc9d680eb3e74de327f1b2bdb84b1 SHA1 1d93a78afc043e51c8b39e69e7642bbdba88b5d6 SHA256 3980bad06c73ceabf71c89200e689750a0bc571e8b69f17b76bfd44f8daa08fb
+DIST nfdump-1.6.6.tar.gz 651348 RMD160 63d5aec9e7f6d2ee151a88451e52ac86263996e4 SHA1 f7a30c69419222f1527684fb46f02ae757b3dac0 SHA256 32e74310c2ca1a622dcca5dd63d0bed40e13d851ba62fff249887682ed77e485
diff --git a/net-analyzer/nfdump/nfdump-1.6.6.ebuild b/net-analyzer/nfdump/nfdump-1.6.6.ebuild
new file mode 100644
index 000000000000..c822cfff2ee6
--- /dev/null
+++ b/net-analyzer/nfdump/nfdump-1.6.6.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nfdump/nfdump-1.6.6.ebuild,v 1.1 2012/03/28 15:21:56 jer Exp $
+
+EAPI=4
+inherit autotools eutils
+
+MY_P="${P/_/}"
+DESCRIPTION="A set of tools to collect and process netflow data"
+HOMEPAGE="http://nfdump.sourceforge.net/"
+SRC_URI="mirror://sourceforge/nfdump/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+# Fails to build readpcap:
+# https://sourceforge.net/tracker/?func=detail&aid=2996582&group_id=119350&atid=683752
+IUSE="compat15 debug ftconv nfprofile sflow"
+
+CDEPEND="
+	ftconv? ( sys-libs/zlib net-analyzer/flow-tools )
+	nfprofile? ( net-analyzer/rrdtool )"
+#	readpcap? ( net-libs/libpcap )"
+DEPEND="${CDEPEND}
+	sys-devel/flex"
+RDEPEND=${CDEPEND}"
+	dev-lang/perl"
+
+DOCS=( AUTHORS ChangeLog NEWS README )
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	if use ftconv; then
+		sed -e '/ftbuild.h/d' -i bin/ft2nfdump.c || die
+		sed \
+			-e 's:lib\(/ftlib.h\):include\1:' \
+			-e 's:libft.a:libft.so:' \
+			\-i configure.in || die
+	fi
+	sed -i bin/Makefile.am -e '/^AM_CFLAGS/d' || die
+	eautoreconf
+}
+
+src_configure() {
+	# --without-ftconf is not handled well #322201
+	econf \
+		$(use ftconv && echo "--enable-ftconv --with-ftpath=/usr") \
+		$(use nfprofile && echo "--enable-nfprofile") \
+		$(use_enable sflow) \
+		$(use_enable debug devel) \
+		$(use_enable compat15)
+		# $(use_enable readpcap) \
+}
diff --git a/net-im/psi/psi-0.14-r1.ebuild b/net-im/psi/psi-0.14-r1.ebuild
deleted file mode 100644
index fed4d9a2be10..000000000000
--- a/net-im/psi/psi-0.14-r1.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/psi/psi-0.14-r1.ebuild,v 1.15 2011/07/24 18:17:18 armin76 Exp $
-
-EAPI="2"
-
-inherit eutils qt4 multilib
-
-MY_P="${P/_rc/-rc}"
-
-DESCRIPTION="Qt4 Jabber client, with Licq-like interface"
-HOMEPAGE="http://psi-im.org/"
-# Langpack:
-# http://lists.affinix.com/pipermail/psi-devel-affinix.com/2009-August/008798.html
-# Later found his site: http://fs.scs-tsa.de/psi_l10n/
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2
-	http://fs.scs-tsa.de/psi_l10n/psi-0.14_langpack_for_packagers_2009-12-02.zip
-	extras? ( mirror://gentoo/${PN}-extra-patches-r1428.tar.bz2
-		mirror://gentoo/${PN}-extra-iconsets-r1428.tar.bz2 )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm hppa ppc ppc64 x86 ~x86-fbsd"
-IUSE="crypt dbus debug doc extras jingle spell ssl xscreensaver webkit"
-RESTRICT="test"
-
-LANGS="be cs de fr it ja pl pt_BR ru sl sv ur_PK zh_TW"
-for LNG in ${LANGS}; do
-	IUSE="${IUSE} linguas_${LNG}"
-	#SRC_URI="${SRC_URI} http://psi-im.org/download/lang/psi_${LNG/ur_PK/ur_pk}.qm"
-done
-
-RDEPEND=">=x11-libs/qt-gui-4.4:4[qt3support,dbus?]
-	>=x11-libs/qt-qt3support-4.4:4
-	>=app-crypt/qca-2.0.2:2
-	spell? ( >=app-text/enchant-1.3.0 )
-	xscreensaver? ( x11-libs/libXScrnSaver )
-	extras? ( webkit? ( x11-libs/qt-webkit ) )
-	app-arch/unzip"
-
-DEPEND="${RDEPEND}
-	extras? ( sys-devel/qconf )
-	doc? ( app-doc/doxygen )"
-
-PDEPEND="crypt? ( app-crypt/qca-gnupg:2 )
-	jingle? ( net-im/psimedia
-		app-crypt/qca-ossl:2 )
-	ssl? ( app-crypt/qca-ossl:2 )"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	if use extras; then
-		# some patches from psi+ project http://code.google.com/p/psi-dev
-		ewarn "You're about to build heavily patched version of Psi called Psi+."
-		ewarn "It has really nice features but still is under heavy development."
-		ewarn "Take a look at homepage for more info: http://code.google.com/p/psi-dev"
-		ewarn "If you wish to disable some patches just put"
-		ewarn "MY_EPATCH_EXCLUDE=\"list of patches\""
-		ewarn "into /etc/portage/env/${CATEGORY}/${PN} file."
-		ewarn
-		ewarn "Note: some patches depend on other. So if you disabled some patch"
-		ewarn "and other started to fail to apply, you'll have to disable patches"
-		ewarn "that fail too."
-		ebeep
-
-		EPATCH_EXCLUDE="${MY_EPATCH_EXCLUDE}
-			755-psiplus-fix-application-info-defines.diff
-			9999-psiplus-application-info.diff" \
-		EPATCH_SUFFIX="diff" EPATCH_FORCE="yes" epatch
-		sed -e 's/\(^#define PROG_CAPS_NODE	\).*/\1"http:\/\/psi-dev.googlecode.com\/caps";/' \
-			-e 's:\(^#define PROG_NAME "Psi\):\1+:' \
-				-i src/applicationinfo.cpp || die
-
-		qconf || die "Failed to create ./configure."
-	else
-		if use webkit; then
-			ewarn "Webkit support disabled as it is only available in Psi+"
-			ewarn "(USE='extras' enabled)."
-		fi
-	fi
-
-	rm -rf third-party/qca # We use system libraries.
-}
-
-src_configure() {
-	# unable to use econf because of non-standard configure script
-	# disable growl as it is a MacOS X extension only
-	local confcmd="./configure
-			--prefix=/usr
-			--qtdir=/usr
-			--disable-bundled-qca
-			--disable-growl
-			$(use dbus || echo '--disable-qdbus')
-			$(use debug && echo '--debug')
-			$(use spell || echo '--disable-aspell')
-			$(use spell || echo '--disable-enchant')
-			$(use xscreensaver || echo '--disable-xss')
-			$(use extras && { use webkit && echo '--enable-qtwebkit';} )"
-
-	echo ${confcmd}
-	${confcmd} || die "configure failed"
-	# Makefile is not always created...
-	[[ ! -f Makefile ]] && die "configure failed"
-}
-
-src_compile() {
-	eqmake4
-
-	emake || die "emake failed"
-
-	if use doc; then
-		cd doc
-		mkdir -p api # 259632
-		make api_public || die "make api_public failed"
-	fi
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install || die "emake install failed"
-	rm "${D}"/usr/share/psi/{COPYING,README}
-
-	# this way the docs will be installed in the standard gentoo dir
-	newdoc iconsets/roster/README README.roster || die
-	newdoc iconsets/system/README README.system || die
-	newdoc certs/README README.certs || die
-	dodoc README || die
-
-	if use doc; then
-		cd doc
-		dohtml -r api || die "dohtml failed"
-	fi
-
-	# install translations
-	cd "${WORKDIR}"
-	insinto /usr/share/${PN}/
-	local nolangs=true
-	for LNG in ${LANGS}; do
-		if use linguas_${LNG}; then
-			doins ${LNG}/${PN}_${LNG}.qm || die
-			newins ${LNG}/INFO INFO.${LNG} || die
-			nolangs=false
-		fi
-	done
-
-	# if linguas is empty install all translations
-	if ${nolangs}; then
-		for LNG in ${LANGS}; do
-			doins ${LNG}/${PN}_${LNG}.qm || die
-			newins ${LNG}/INFO INFO.${LNG} || die
-		done
-	fi
-
-	if use extras; then
-		cp -a "${WORKDIR}"/iconsets/* "${D}"/usr/share/${PN}/iconsets/ || die
-	fi
-}
diff --git a/net-im/psi/psi-0.14-r2.ebuild b/net-im/psi/psi-0.14-r2.ebuild
deleted file mode 100644
index 2e7b12ea9117..000000000000
--- a/net-im/psi/psi-0.14-r2.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/psi/psi-0.14-r2.ebuild,v 1.7 2011/10/04 07:11:35 pva Exp $
-
-EAPI="2"
-
-inherit eutils qt4 multilib
-
-MY_P="${P/_rc/-rc}"
-
-DESCRIPTION="Qt4 Jabber client, with Licq-like interface"
-HOMEPAGE="http://psi-im.org/"
-# Langpack:
-# http://lists.affinix.com/pipermail/psi-devel-affinix.com/2009-August/008798.html
-# Later found his site: http://fs.scs-tsa.de/psi_l10n/
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2
-	http://fs.scs-tsa.de/psi_l10n/psi-0.14_langpack_for_packagers_2009-12-02.zip
-	extras? ( mirror://gentoo/${PN}-extra-patches-r1428.tar.bz2
-		mirror://gentoo/${PN}-extra-iconsets-r1428.tar.bz2 )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm hppa ppc ~ppc64 x86 ~x86-fbsd"
-IUSE="crypt dbus debug doc extras jingle spell ssl xscreensaver webkit"
-RESTRICT="test"
-
-LANGS="be cs de fr it ja pl pt_BR ru sl sv ur_PK zh_TW"
-for LNG in ${LANGS}; do
-	IUSE="${IUSE} linguas_${LNG}"
-	#SRC_URI="${SRC_URI} http://psi-im.org/download/lang/psi_${LNG/ur_PK/ur_pk}.qm"
-done
-
-RDEPEND=">=x11-libs/qt-gui-4.4:4[qt3support,dbus?]
-	>=x11-libs/qt-qt3support-4.4:4
-	>=app-crypt/qca-2.0.2:2
-	spell? ( >=app-text/enchant-1.3.0 )
-	xscreensaver? ( x11-libs/libXScrnSaver )
-	extras? ( webkit? ( x11-libs/qt-webkit ) )
-	app-arch/unzip"
-
-DEPEND="${RDEPEND}
-	extras? ( sys-devel/qconf )
-	doc? ( app-doc/doxygen )"
-
-PDEPEND="crypt? ( app-crypt/qca-gnupg:2 )
-	jingle? ( net-im/psimedia
-		app-crypt/qca-ossl:2 )
-	ssl? ( app-crypt/qca-ossl:2 )"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}/psi-0.14-qt-compat.patch"
-	epatch "${FILESDIR}/psi-0.14-minizip-detection.patch"
-
-	if use extras; then
-		# some patches from psi+ project http://code.google.com/p/psi-dev
-		ewarn "You're about to build heavily patched version of Psi called Psi+."
-		ewarn "It has really nice features but still is under heavy development."
-		ewarn "Take a look at homepage for more info: http://code.google.com/p/psi-dev"
-		ewarn "If you wish to disable some patches just put"
-		ewarn "MY_EPATCH_EXCLUDE=\"list of patches\""
-		ewarn "into /etc/portage/env/${CATEGORY}/${PN} file."
-		ewarn
-		ewarn "Note: some patches depend on other. So if you disabled some patch"
-		ewarn "and other started to fail to apply, you'll have to disable patches"
-		ewarn "that fail too."
-		ebeep
-
-		EPATCH_EXCLUDE="${MY_EPATCH_EXCLUDE}
-			755-psiplus-fix-application-info-defines.diff
-			9999-psiplus-application-info.diff" \
-		EPATCH_SUFFIX="diff" EPATCH_FORCE="yes" epatch
-		sed -e 's/\(^#define PROG_CAPS_NODE	\).*/\1"http:\/\/psi-dev.googlecode.com\/caps";/' \
-			-e 's:\(^#define PROG_NAME "Psi\):\1+:' \
-				-i src/applicationinfo.cpp || die
-
-		qconf || die "Failed to create ./configure."
-	else
-		if use webkit; then
-			ewarn "Webkit support disabled as it is only available in Psi+"
-			ewarn "(USE='extras' enabled)."
-		fi
-	fi
-
-	rm -rf third-party/qca # We use system libraries.
-}
-
-src_configure() {
-	# unable to use econf because of non-standard configure script
-	# disable growl as it is a MacOS X extension only
-	local confcmd="./configure
-			--prefix=/usr
-			--qtdir=/usr
-			--disable-bundled-qca
-			--disable-growl
-			$(use dbus || echo '--disable-qdbus')
-			$(use debug && echo '--debug')
-			$(use spell || echo '--disable-aspell')
-			$(use spell || echo '--disable-enchant')
-			$(use xscreensaver || echo '--disable-xss')
-			$(use extras && { use webkit && echo '--enable-qtwebkit';} )"
-
-	echo ${confcmd}
-	${confcmd} || die "configure failed"
-	# Makefile is not always created...
-	[[ ! -f Makefile ]] && die "configure failed"
-}
-
-src_compile() {
-	eqmake4
-
-	emake || die "emake failed"
-
-	if use doc; then
-		cd doc
-		mkdir -p api # 259632
-		make api_public || die "make api_public failed"
-	fi
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install || die "emake install failed"
-	rm "${D}"/usr/share/psi/{COPYING,README}
-
-	# this way the docs will be installed in the standard gentoo dir
-	newdoc iconsets/roster/README README.roster || die
-	newdoc iconsets/system/README README.system || die
-	newdoc certs/README README.certs || die
-	dodoc README || die
-
-	if use doc; then
-		cd doc
-		dohtml -r api || die "dohtml failed"
-	fi
-
-	# install translations
-	cd "${WORKDIR}"
-	insinto /usr/share/${PN}/
-	local nolangs=true
-	for LNG in ${LANGS}; do
-		if use linguas_${LNG}; then
-			doins ${LNG}/${PN}_${LNG}.qm || die
-			newins ${LNG}/INFO INFO.${LNG} || die
-			nolangs=false
-		fi
-	done
-
-	# if linguas is empty install all translations
-	if ${nolangs}; then
-		for LNG in ${LANGS}; do
-			doins ${LNG}/${PN}_${LNG}.qm || die
-			newins ${LNG}/INFO INFO.${LNG} || die
-		done
-	fi
-
-	if use extras; then
-		cp -a "${WORKDIR}"/iconsets/* "${D}"/usr/share/${PN}/iconsets/ || die
-	fi
-}
diff --git a/net-im/psimedia/psimedia-1.0.3-r1.ebuild b/net-im/psimedia/psimedia-1.0.3-r1.ebuild
deleted file mode 100644
index 5379f9a07cc4..000000000000
--- a/net-im/psimedia/psimedia-1.0.3-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/psimedia/psimedia-1.0.3-r1.ebuild,v 1.3 2011/03/31 07:46:45 ssuominen Exp $
-
-EAPI="2"
-
-inherit eutils qt4-r2 multilib
-
-DESCRIPTION="Psi plugin for voice/video calls"
-HOMEPAGE="http://delta.affinix.com/psimedia/"
-SRC_URI="http://delta.affinix.com/download/psimedia/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
-IUSE="demo"
-
-COMMON_DEPEND=">=dev-libs/glib-2.18
-	>=media-libs/gstreamer-0.10.22
-	>=media-libs/gst-plugins-base-0.10.22
-	media-libs/gst-plugins-good
-	>=dev-libs/liboil-0.3
-	>=x11-libs/qt-gui-4.4:4
-	>=media-libs/speex-1.2_rc1
-"
-RDEPEND="${COMMON_DEPEND}
-	media-plugins/gst-plugins-speex
-	>=media-plugins/gst-plugins-vorbis-0.10.22
-	>=media-plugins/gst-plugins-theora-0.10.22
-	>=media-plugins/gst-plugins-alsa-0.10.22
-	>=media-plugins/gst-plugins-ogg-0.10.22
-	media-plugins/gst-plugins-v4l2
-	media-plugins/gst-plugins-jpeg
-	!<net-im/psi-0.13_rc1
-"
-DEPEND="${COMMON_DEPEND}
-	dev-util/pkgconfig
-"
-
-src_prepare() {
-	sed -e '/^TEMPLATE/a CONFIG += ordered' -i psimedia.pro || die
-	# Don't build demo if we don't need that.
-	use demo || { sed -e '/^SUBDIRS[[:space:]]*+=[[:space:]]*demo[[:space:]]*$/d;' -i psimedia.pro || die; }
-	# Remove support for V4L v1 because linux-headers-2.6.38 stopped shipping linux/videodev.h.
-	epatch "${FILESDIR}"/${P}-linux-headers-2.6.38.patch
-}
-
-src_configure() {
-	# qconf generaged configure script...
-	./configure || die
-
-	eqmake4
-}
-
-src_install() {
-	insinto /usr/$(get_libdir)/psi/plugins
-	doins gstprovider/libgstprovider.so || die
-
-	if use demo; then
-		exeinto /usr/$(get_libdir)/${PN}
-		newexe demo/demo ${PN} || die
-
-		# Create /usr/bin/psimedia
-		cat <<-EOF > "demo/${PN}"
-		#!/bin/bash
-
-		export PSI_MEDIA_PLUGIN=/usr/$(get_libdir)/psi/plugins/libgstprovider.so
-		/usr/$(get_libdir)/${PN}/${PN}
-		EOF
-
-		dobin demo/${PN} || die
-	fi
-}
diff --git a/net-im/psimedia/psimedia-1.0.3-r2.ebuild b/net-im/psimedia/psimedia-1.0.3-r2.ebuild
deleted file mode 100644
index 4ac49a6f51d5..000000000000
--- a/net-im/psimedia/psimedia-1.0.3-r2.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/psimedia/psimedia-1.0.3-r2.ebuild,v 1.3 2011/04/04 23:21:51 jer Exp $
-
-EAPI="2"
-
-inherit eutils qt4-r2 multilib
-
-DESCRIPTION="Psi plugin for voice/video calls"
-HOMEPAGE="http://delta.affinix.com/psimedia/"
-SRC_URI="http://delta.affinix.com/download/psimedia/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm hppa ~ppc ~ppc64 ~x86"
-IUSE="demo"
-
-COMMON_DEPEND=">=dev-libs/glib-2.18
-	>=media-libs/gstreamer-0.10.22
-	>=media-libs/gst-plugins-base-0.10.22
-	media-libs/gst-plugins-good
-	>=dev-libs/liboil-0.3
-	>=x11-libs/qt-gui-4.4:4
-	>=media-libs/speex-1.2_rc1
-"
-RDEPEND="${COMMON_DEPEND}
-	media-plugins/gst-plugins-speex
-	>=media-plugins/gst-plugins-vorbis-0.10.22
-	>=media-plugins/gst-plugins-theora-0.10.22
-	>=media-plugins/gst-plugins-alsa-0.10.22
-	>=media-plugins/gst-plugins-ogg-0.10.22
-	media-plugins/gst-plugins-v4l2
-	media-plugins/gst-plugins-jpeg
-	!<net-im/psi-0.13_rc1
-"
-DEPEND="${COMMON_DEPEND}
-	dev-util/pkgconfig
-"
-
-src_prepare() {
-	sed -e '/^TEMPLATE/a CONFIG += ordered' -i psimedia.pro || die
-	# Don't build demo if we don't need that.
-	use demo || { sed -e '/^SUBDIRS[[:space:]]*+=[[:space:]]*demo[[:space:]]*$/d;' -i psimedia.pro || die; }
-	# Remove support for V4L v1 because linux-headers-2.6.38 stopped shipping linux/videodev.h.
-	epatch "${FILESDIR}"/${P}-linux-headers-2.6.38.patch
-}
-
-src_configure() {
-	# qconf generated configure script...
-	./configure --no-separate-debug-info || die
-
-	eqmake4
-}
-
-src_install() {
-	insinto /usr/$(get_libdir)/psi/plugins
-	doins gstprovider/libgstprovider.so || die
-
-	if use demo; then
-		exeinto /usr/$(get_libdir)/${PN}
-		newexe demo/demo ${PN} || die
-
-		# Create /usr/bin/psimedia
-		cat <<-EOF > "demo/${PN}"
-		#!/bin/bash
-
-		export PSI_MEDIA_PLUGIN=/usr/$(get_libdir)/psi/plugins/libgstprovider.so
-		/usr/$(get_libdir)/${PN}/${PN}
-		EOF
-
-		dobin demo/${PN} || die
-	fi
-}
diff --git a/net-im/psimedia/psimedia-1.0.3.ebuild b/net-im/psimedia/psimedia-1.0.3.ebuild
deleted file mode 100644
index c5a357c5bb11..000000000000
--- a/net-im/psimedia/psimedia-1.0.3.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/psimedia/psimedia-1.0.3.ebuild,v 1.11 2011/03/31 07:46:45 ssuominen Exp $
-
-EAPI="2"
-
-inherit eutils qt4 multilib
-
-DESCRIPTION="Psi plugin for voice/video calls"
-HOMEPAGE="http://delta.affinix.com/psimedia/"
-SRC_URI="http://delta.affinix.com/download/psimedia/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm hppa ppc ppc64 x86"
-IUSE="demo"
-
-DEPEND=">=dev-libs/glib-2.18
-	>=media-libs/gstreamer-0.10.22
-	>=media-libs/gst-plugins-base-0.10.22
-	media-libs/gst-plugins-good
-	>=dev-libs/liboil-0.3
-	x11-libs/qt-core
-	x11-libs/qt-gui
-	>=media-libs/speex-1.2_rc1"
-
-RDEPEND="${DEPEND}
-	media-plugins/gst-plugins-speex
-	>=media-plugins/gst-plugins-vorbis-0.10.22
-	>=media-plugins/gst-plugins-theora-0.10.22
-	>=media-plugins/gst-plugins-alsa-0.10.22
-	>=media-plugins/gst-plugins-ogg-0.10.22
-	media-plugins/gst-plugins-v4l2
-	media-plugins/gst-plugins-jpeg
-	!<net-im/psi-0.13_rc1
-"
-
-src_prepare() {
-	sed -e '/^TEMPLATE/a CONFIG += ordered' -i psimedia.pro || die
-	# Don't build demo if we don't need that.
-	use demo || { sed -e '/^SUBDIRS[[:space:]]*+=[[:space:]]*demo[[:space:]]*$/d;' -i psimedia.pro || die; }
-}
-
-src_configure() {
-	# qconf generaged configure script...
-	./configure || die
-}
-
-src_install() {
-	insinto /usr/$(get_libdir)/psi/plugins
-	doins gstprovider/libgstprovider.so || die
-
-	if use demo; then
-		exeinto /usr/$(get_libdir)/${PN}
-		newexe demo/demo ${PN} || die
-
-		# Create /usr/bin/psimedia
-		cat <<-EOF > "demo/${PN}"
-		#!/bin/bash
-
-		export PSI_MEDIA_PLUGIN=/usr/$(get_libdir)/psi/plugins/libgstprovider.so
-		/usr/$(get_libdir)/${PN}/${PN}
-		EOF
-
-		dobin demo/${PN} || die
-	fi
-}
diff --git a/net-libs/gnutls/gnutls-2.12.18.ebuild b/net-libs/gnutls/gnutls-2.12.18.ebuild
index 2ed367549d93..eab18dee64d2 100644
--- a/net-libs/gnutls/gnutls-2.12.18.ebuild
+++ b/net-libs/gnutls/gnutls-2.12.18.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/gnutls/gnutls-2.12.18.ebuild,v 1.4 2012/03/28 09:58:13 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-2.12.18.ebuild,v 1.5 2012/03/28 17:38:48 flameeyes Exp $
 
 EAPI=4
 
@@ -38,6 +38,7 @@ RDEPEND=">=dev-libs/libtasn1-0.3.4
 	zlib? ( >=sys-libs/zlib-1.2.3.1 )
 	!bindist? ( lzo? ( >=dev-libs/lzo-2 ) )"
 DEPEND="${RDEPEND}
+	dev-util/pkgconfig
 	sys-devel/libtool
 	doc? ( dev-util/gtk-doc )
 	nls? ( sys-devel/gettext )
diff --git a/net-mail/automx/Manifest b/net-mail/automx/Manifest
index 58806dd8e81e..b670714b425a 100644
--- a/net-mail/automx/Manifest
+++ b/net-mail/automx/Manifest
@@ -1 +1 @@
-DIST automx-0.8_rc2.tar.gz 75154 RMD160 8944126eb5023edff426fcd0f4f854d572339157 SHA1 2ba6dc3674e3523cacc8c2238114d96511a144e2 SHA256 8c415ec96ff2460f06d91527a61cd6e418ad91bba5d551dd506b23240bfcc7fc
+DIST automx-0.8.tar.gz 75143 RMD160 bf59a1ee84e53b205c62130e2c0864965b0e310d SHA1 f65b0ad186fc7c70e576fd2824a202c9d61c4495 SHA256 7b90f75c3b9feef501d34de03e9f4dc9c3d94424f3a7f76f0e23e8769d2174ad
diff --git a/net-mail/automx/automx-0.8_rc2.ebuild b/net-mail/automx/automx-0.8.ebuild
similarity index 91%
rename from net-mail/automx/automx-0.8_rc2.ebuild
rename to net-mail/automx/automx-0.8.ebuild
index e234a05007cf..743c765e93ea 100644
--- a/net-mail/automx/automx-0.8_rc2.ebuild
+++ b/net-mail/automx/automx-0.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-mail/automx/automx-0.8_rc2.ebuild,v 1.1 2012/03/23 06:57:44 mschiff Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/automx/automx-0.8.ebuild,v 1.1 2012/03/28 19:15:04 mschiff Exp $
 
 EAPI=4
 PYTHON_DEPEND="2:2.6:2.7"
diff --git a/net-news/liferea/Manifest b/net-news/liferea/Manifest
index 4ab8e0b3646d..d1751f5996f3 100644
--- a/net-news/liferea/Manifest
+++ b/net-news/liferea/Manifest
@@ -4,3 +4,4 @@ DIST liferea-1.7.6.tar.gz 1833906 RMD160 30d6ec6033184dccbfdfd49bf4c482bd3835790
 DIST liferea-1.8-RC1.tar.gz 1834639 RMD160 3ce88d29665a4a9c5a71e491a743b4d4f19379ef SHA1 98df082c70767f0b10832475d0dbf519a6e0a353 SHA256 38fba07fe59fb7b8e55482e0a004eb0277b60f185886ed2079448a1d8770feaf
 DIST liferea-1.8.0.tar.gz 1870394 RMD160 d3322c1807bbfebd96387464bf938545aac9a9df SHA1 b731e70128130478207e9059fc9ec33ae7d95358 SHA256 0b5f4afa0cf5b9b93ce5e069747646b674ee414e6e0e637d975c09acf798ee37
 DIST liferea-1.8.3.tar.gz 1864315 RMD160 db416d5f9cf99d3b177a7b1130180dff59012167 SHA1 70ff90511260cc6616c0f5ec5b74ed9a498307a8 SHA256 b85b1b4d21e5c1a97457c2d7d91bb36273154dcb0037cf526aae637b9b2ce97e
+DIST liferea-1.8.4.tar.gz 1865230 RMD160 ec47e19e91edbbe8734437e8ae4f97570fb41412 SHA1 f887a3928116f56e1b68719c150d40bd1c3c6dff SHA256 568a565d12e73e125e3af116e3b23a2074f88b8b949cc81758eacab3a4d1b2d9
diff --git a/net-news/liferea/liferea-1.8.4.ebuild b/net-news/liferea/liferea-1.8.4.ebuild
new file mode 100644
index 000000000000..8c5f024a458c
--- /dev/null
+++ b/net-news/liferea/liferea-1.8.4.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-news/liferea/liferea-1.8.4.ebuild,v 1.1 2012/03/28 15:35:41 vostorga Exp $
+
+EAPI=4
+
+GCONF_DEBUG=no
+
+inherit eutils gnome2 pax-utils
+
+MY_P=${P/_/-}
+
+DESCRIPTION="News Aggregator for RDF/RSS/CDF/Atom/Echo feeds"
+HOMEPAGE="http://liferea.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="ayatana libnotify"
+
+RDEPEND=">=x11-libs/gtk+-2.18.0:2
+	>=dev-libs/glib-2.24.0:2
+	>=x11-libs/pango-1.4.0
+	>=gnome-base/gconf-1.1.9:2
+	>=dev-libs/libxml2-2.6.27:2
+	>=dev-libs/libxslt-1.1.19
+	>=dev-db/sqlite-3.7.0:3
+	>=net-libs/libsoup-2.28.2:2.4
+	dev-libs/libunique:1
+	>=net-libs/webkit-gtk-1.2.2:2
+	dev-libs/json-glib
+	ayatana? ( dev-libs/libindicate )
+	libnotify? ( >=x11-libs/libnotify-0.3.2 )"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	dev-util/pkgconfig"
+
+DOCS="AUTHORS ChangeLog README"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		--enable-sm
+		--disable-schemas-install
+		$(use_enable ayatana libindicate)
+		$(use_enable libnotify)"
+}
+
+src_prepare() {
+	gnome2_src_prepare
+}
+
+src_install() {
+	gnome2_src_install
+	# bug #338213
+	# Uses webkit's JIT. Needs mmap('rwx') to generate code in runtime.
+	# MPROTECT policy violation. Will sit here until webkit will
+	# get optional JIT.
+	pax-mark m "${D}"/usr/bin/liferea
+
+	einfo "If you want to enhance funcitonality of this package"
+	einfo "You should consider installing these packages:"
+	einfo "    dev-libs/dbus-glib"
+	einfo "    net-misc/networkmanager"
+}
diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask
index d690b8539d91..e17dbf94c030 100644
--- a/profiles/arch/amd64/package.use.mask
+++ b/profiles/arch/amd64/package.use.mask
@@ -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/arch/amd64/package.use.mask,v 1.120 2012/03/27 08:23:21 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/package.use.mask,v 1.121 2012/03/28 18:43:52 ford_prefect Exp $
 
 # When you add an entry to the top of this file, add your name, the date, and
 # an explanation of why something is getting masked. Please be extremely
@@ -18,6 +18,11 @@
 
 #--- END OF EXAMPLES ---
 
+# Arun Raghavan <ford_prefect@gentoo.org> (29 Mar 2012)
+# webrtc-audio-processing is only supported on x86/amd64. Possibly arm can be
+# added.
+media-sound/pulseaudio -webrtc-aec
+
 # Alexandre Rostovtsev <tetromino@gentoo.org> (27 Mar 2012)
 # Masked in base profile, supported on this arch
 net-misc/networkmanager -systemd
diff --git a/profiles/arch/x86/package.use.mask b/profiles/arch/x86/package.use.mask
index 9c3dd8de7835..fbc91229fd15 100644
--- a/profiles/arch/x86/package.use.mask
+++ b/profiles/arch/x86/package.use.mask
@@ -1,9 +1,14 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/x86/package.use.mask,v 1.80 2012/03/27 08:23:21 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/x86/package.use.mask,v 1.81 2012/03/28 18:43:26 ford_prefect Exp $
 
 # This file requires >=portage-2.1.1
 
+# Arun Raghavan <ford_prefect@gentoo.org> (29 Mar 2012)
+# webrtc-audio-processing is only supported on x86/amd64. Possibly arm can be
+# added.
+media-sound/pulseaudio -webrtc-aec
+
 # Alexandre Rostovtsev <tetromino@gentoo.org> (27 Mar 2012)
 # Masked in base profile, supported on this arch
 net-misc/networkmanager -systemd
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index c5dfac6b0125..f8c2cf00b043 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -1,10 +1,15 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/base/package.use.mask,v 1.328 2012/03/27 08:23:21 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/package.use.mask,v 1.330 2012/03/28 18:43:01 ford_prefect Exp $
 
 # This file requires >=portage-2.1.1
 # New entries go on top.
 
+# Arun Raghavan <ford_prefect@gentoo.org> (28 Mar 2012)
+# webrtc-audio-processing is only supported on x86/amd64. Possibly arm can be
+# added.
+media-sound/pulseaudio webrtc-aec
+
 # Alexandre Rostovtsev <tetromino@gentoo.org> (11 Feb 2012)
 # Requires >=sys-apps/systemd-31, which is masked and keyworded only for two
 # arches.
diff --git a/profiles/package.mask b/profiles/package.mask
index 68d1ed36e5c7..d666aea329aa 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
 ####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.13627 2012/03/28 00:53:22 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.13630 2012/03/28 17:26:09 a3li Exp $
 #
 # When you add an entry to the top of this file, add your name, the date, and
 # an explanation of why something is getting masked. Please be extremely
@@ -31,6 +31,93 @@
 
 #--- END OF EXAMPLES ---
 
+# Alex Legler <a3li@gentoo.org> (28 Mar 2012)
+# Leftover packages from a packaging attempt of Horde-4
+# These can be readded when someone picks the package up
+# Removal in 30 days
+dev-php/Horde_ActiveSync
+dev-php/Horde_Alarm
+dev-php/Horde_Argv
+dev-php/Horde_Auth
+dev-php/Horde_Autoloader
+dev-php/Horde_Browser
+dev-php/Horde_Cache
+dev-php/Horde_Cli
+dev-php/Horde_Compress
+dev-php/Horde_Constraint
+dev-php/Horde_Controller
+dev-php/Horde_Core
+dev-php/Horde_Crypt
+dev-php/Horde_Data
+dev-php/Horde_DataTree
+dev-php/Horde_Date
+dev-php/Horde_Date_Parser
+dev-php/Horde_Db
+dev-php/Horde_Exception
+dev-php/Horde_Feed
+dev-php/Horde_Form
+dev-php/Horde_Group
+dev-php/Horde_History
+dev-php/Horde_Http
+dev-php/Horde_Icalendar
+dev-php/Horde_Image
+dev-php/Horde_Imap_Client
+dev-php/Horde_Imsp
+dev-php/Horde_Injector
+dev-php/Horde_Itip
+dev-php/Horde_Kolab_Format
+dev-php/Horde_Kolab_Server
+dev-php/Horde_Kolab_Session
+dev-php/Horde_Kolab_Storage
+dev-php/Horde_Ldap
+dev-php/Horde_Lock
+dev-php/Horde_Log
+dev-php/Horde_LoginTasks
+dev-php/Horde_Mail
+dev-php/Horde_Memcache
+dev-php/Horde_Mime
+dev-php/Horde_Mime_Viewer
+dev-php/Horde_Nls
+dev-php/Horde_Notification
+dev-php/Horde_Oauth
+dev-php/Horde_Pdf
+dev-php/Horde_Perms
+dev-php/Horde_Prefs
+dev-php/Horde_Rdo
+dev-php/Horde_Role
+dev-php/Horde_Routes
+dev-php/Horde_Rpc
+dev-php/Horde_Scribe
+dev-php/Horde_Secret
+dev-php/Horde_Serialize
+dev-php/Horde_Service_Facebook
+dev-php/Horde_Service_Twitter
+dev-php/Horde_SessionHandler
+dev-php/Horde_Share
+dev-php/Horde_SpellChecker
+dev-php/Horde_Sql
+dev-php/Horde_Stream_Filter
+dev-php/Horde_Stream_Wrapper
+dev-php/Horde_Support
+dev-php/Horde_SyncMl
+dev-php/Horde_Template
+dev-php/Horde_Test
+dev-php/Horde_Text_Diff
+dev-php/Horde_Text_Filter
+dev-php/Horde_Text_Filter_Csstidy
+dev-php/Horde_Text_Flowed
+dev-php/Horde_Thrift
+dev-php/Horde_Token
+dev-php/Horde_Translation
+dev-php/Horde_Tree
+dev-php/Horde_Url
+dev-php/Horde_Util
+dev-php/Horde_Vfs
+dev-php/Horde_View
+dev-php/Horde_Xml_Element
+dev-php/Horde_Xml_Wbxml
+dev-php/Horde_Yaml
+
 # Mike Gilbert <floppym@gentoo.org> (25 Mar 2012)
 # Arfrever Frehtes Taifersar Arahesis <arfrever.fta@gmail.com> (25 Mar 2012)
 # Masked for testing.
@@ -395,11 +482,6 @@ net-p2p/gnunet-gtk
 # DEPENDs.
 >=net-misc/npapi-sdk-0.27.1
 
-# Theo Chatzimichos <tampakrap@gentoo.org> (21 Feb 2012)
-# Dead upstream, security bug 384227.
-# Removing in 30 days.
-www-client/arora
-
 # Ole Markus With <olemarkus@gentoo.org> (21 Feb 2012)
 # Dead upstream. Bug 396977. Removing in 30 days.
 dev-php/PEAR-Image_Color
@@ -462,13 +544,6 @@ media-video/ushare
 # Masking alpha release series.
 >=dev-libs/libmowgli-2.0.0_alpha1
 
-# Aaron W. Swenson <titanofold@gentoo.org> (28 Jan 2012)
-# Masked for last rites. Package is no longer maintained upstream and
-# is not fully compatible with recent versions of PostgreSQL. Removal
-# in 60 days.
-# Alternatives: dev-db/pgadmin3 or dev-db/phppgadmin
-dev-db/pgaccess
-
 # Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> (22 Jan 2012)
 # Mask compiz for last-rites unless someone steps up
 # to maintain it. Removal in 30 days.
@@ -788,6 +863,7 @@ app-pda/multisync-gui
 # Alex Legler <a3li@gentoo.org> (28 Nov 2010)
 # Not maintained, multiple security issues.
 # Use the split horde ebuilds instead.
+# Removal end of April 2012
 www-apps/horde-webmail
 www-apps/horde-groupware
 
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 00b387efec8a..df2a51545930 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -1013,7 +1013,8 @@ dev-embedded/openocd:versaloon - Enable building support for the Versallon-lInk
 dev-embedded/ponyprog:epiphany - Enable support for www-client/epiphany
 dev-embedded/qvfb:exceptions - Add support for exceptions - like catching them inside the event loop (recommended by Nokia)
 dev-embedded/sdcc:boehm-gc - Enable Hans Boehm's garbage collector (dev-libs/boehm-gc)
-dev-embedded/urjtag:ftdi - Enable support for USB FTDI chips (dev-embedded/libftdi)
+dev-embedded/urjtag:ftd2xx - Enable support for USB FTDI chips via dev-embedded/libftd2xx
+dev-embedded/urjtag:ftdi - Enable support for USB FTDI chips via dev-embedded/libftdi
 dev-games/cegui:devil - Enable image loading via DevIL
 dev-games/cegui:irrlicht - Enable the Irrlicht renderer
 dev-games/cegui:ogre - Enable the OGRE renderer
@@ -2822,6 +2823,7 @@ media-sound/pulseaudio:oss - Enable OSS sink/source (output/input). Deprecated,
 media-sound/pulseaudio:realtime - Makes PulseAudio use RealtimeKit (sys-auth/rtkit) to get real-time priority while running.
 media-sound/pulseaudio:ssl - Use dev-libs/openssl to provide support for RAOP (AirPort) streaming.
 media-sound/pulseaudio:system-wide - Allow preparation and installation of the system-wide init script for PulseAudio. Since this support is only supported for embedded situations, do not enable without reading the upstream instructions at http://pulseaudio.org/wiki/WhatIsWrongWithSystemMode .
+media-sound/pulseaudio:webrtc-aec - Uses the webrtc.org AudioProcessing library for enhancing VoIP calls greatly in applications that support it by performing acoustic echo cancellation, analog gain control, noise suppression and other processing.
 media-sound/qmmp:bs2b - Enable Bauer stereophonic-to-binaural headphone filter
 media-sound/qmmp:cover - Enable album cover support
 media-sound/qmmp:crossfade - Enable crossfade effect when switching tracks
diff --git a/sys-fs/lvm2/lvm2-2.02.95.ebuild b/sys-fs/lvm2/lvm2-2.02.95.ebuild
index d8bd6689ccbb..8c0a116e4e97 100644
--- a/sys-fs/lvm2/lvm2-2.02.95.ebuild
+++ b/sys-fs/lvm2/lvm2-2.02.95.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/lvm2/lvm2-2.02.95.ebuild,v 1.2 2012/03/27 03:20:56 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.95.ebuild,v 1.3 2012/03/28 17:17:52 mr_bones_ Exp $
 
 EAPI=3
 inherit eutils multilib toolchain-funcs autotools linux-info
@@ -90,7 +90,7 @@ src_prepare() {
 
 	# Merged upstream
 	#epatch "${FILESDIR}"/${PN}-2.02.73-asneeded.patch
-	
+
 	epatch "${FILESDIR}"/${PN}-2.02.88-respect-cc.patch
 
 	eautoreconf
diff --git a/www-client/arora/Manifest b/www-client/arora/Manifest
deleted file mode 100644
index dac9d49a1ad3..000000000000
--- a/www-client/arora/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST arora-0.10.2.tar.gz 1064208 RMD160 ef61ca56087288fdafed4f7bfbe1e7178f92deb2 SHA1 843d6d3e073588b5f6164985170a3525450f6615 SHA256 7b5bdbb01dccc27776c65f7aa7e4557c5ac23b07494d935523ffce7d7cece9da
-DIST arora-0.11.0.tar.gz 1072898 RMD160 c8b010d5e540c8ee3a0604c4d24c19c8b8653798 SHA1 480cfd7482cccbb7ece866fa10afe9acace29b31 SHA256 6f5fef191935ed740aaa61d5f081abb823997abc20a993cbcb74a4d8adcad3b9
diff --git a/www-client/arora/arora-0.10.2-r1.ebuild b/www-client/arora/arora-0.10.2-r1.ebuild
deleted file mode 100644
index f2447603f559..000000000000
--- a/www-client/arora/arora-0.10.2-r1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/arora/arora-0.10.2-r1.ebuild,v 1.8 2010/08/28 13:43:24 wired Exp $
-
-EAPI=2
-inherit eutils qt4-r2
-
-DESCRIPTION="A cross-platform Qt4 WebKit browser"
-HOMEPAGE="http://arora.googlecode.com/"
-SRC_URI="http://arora.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="|| ( GPL-3 GPL-2 )"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc x86"
-IUSE="debug doc"
-
-RDEPEND="x11-libs/qt-gui:4
-	x11-libs/qt-sql:4
-	x11-libs/qt-webkit:4
-	x11-libs/qt-xmlpatterns:4"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
-
-ARORA_LANGS="ast ca es es_CR et_EE fr_CA gl ms nb_NO pt_BR pt_PT sr@latin sr_CS uk
-zh_CN zh_TW"
-ARORA_NOLONGLANGS="cs_CZ da_DK de_DE el_GR fi_FI fr_FR he_IL hu_HU it_IT ja_JP
-nl_NL pl_PL ru_RU sk_SK tr_TR"
-
-for L in $ARORA_LANGS; do
-	IUSE="$IUSE linguas_$L"
-done
-for L in $ARORA_NOLONGLANGS; do
-	IUSE="$IUSE linguas_${L%_*}"
-done
-
-src_prepare() {
-	# fix compilation with qt 4.7, bug #335011
-	# patch: http://github.com/Arora/arora/commit/5ca8d4b93a284d2e96ba9c2413c4060814258a95
-	epatch "${FILESDIR}"/"${P}"_qt_4.7_build_fix.patch
-
-	# use Gentoo lingua designations
-	mv src/locale/sr_RS@latin.ts src/locale/sr@latin.ts
-	mv src/locale/sr_RS.ts src/locale/sr_CS.ts
-
-	# process linguas
-	local langs=
-	for lingua in $LINGUAS; do
-		if has $lingua $ARORA_LANGS; then
-			langs="$langs ${lingua}.ts"
-		else
-			for a in $ARORA_NOLONGLANGS; do
-				if [[ $lingua == ${a%_*} ]]; then
-					langs="$langs ${a}.ts"
-				fi
-			done
-		fi
-	done
-
-	# remove all translations, then add only the ones we want
-	sed -i '/ts/d' src/locale/locale.pri || die 'sed failed'
-	sed -i "/^TRANSLATIONS/s:\\\:${langs}:" src/locale/locale.pri \
-		|| die 'sed failed'
-
-	if ! use doc ; then
-		sed -i 's|QMAKE_EXTRA|#QMAKE_EXTRA|' arora.pro || die 'sed failed'
-	fi
-}
-
-src_configure() {
-	eqmake4 PREFIX=/usr
-}
-
-src_compile() {
-	emake || die "make failed"
-
-	# don't pre-strip
-	sed -i "/strip/d" src/Makefile || die 'sed failed'
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install || die 'make install failed'
-	dodoc AUTHORS ChangeLog README
-}
diff --git a/www-client/arora/arora-0.11.0.ebuild b/www-client/arora/arora-0.11.0.ebuild
deleted file mode 100644
index e86d25c29ec9..000000000000
--- a/www-client/arora/arora-0.11.0.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/arora/arora-0.11.0.ebuild,v 1.3 2011/11/20 12:21:48 pesa Exp $
-
-EAPI=3
-
-inherit eutils qt4-r2
-
-DESCRIPTION="A cross-platform Qt4 WebKit browser"
-HOMEPAGE="http://arora.googlecode.com/"
-SRC_URI="http://arora.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="|| ( GPL-3 GPL-2 )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE="debug doc"
-
-RDEPEND="x11-libs/qt-gui:4
-	x11-libs/qt-sql:4
-	x11-libs/qt-webkit:4
-	x11-libs/qt-xmlpatterns:4"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
-
-ARORA_LANGS="ast ca es es_CR et_EE fr_CA gl ms nb_NO nl pt_BR pt_PT sr@latin sr_CS uk
-zh_CN zh_TW"
-ARORA_NOLONGLANGS="cs_CZ da_DK de_DE el_GR fi_FI fr_FR he_IL hu_HU it_IT ja_JP
-pl_PL ru_RU sk_SK tr_TR"
-
-for L in ${ARORA_LANGS}; do
-	IUSE+=" linguas_${L}"
-done
-for L in ${ARORA_NOLONGLANGS}; do
-	IUSE+=" linguas_${L%_*}"
-done
-
-DOCS="AUTHORS ChangeLog README"
-
-src_prepare() {
-	# use Gentoo lingua designations
-	mv src/locale/sr_RS@latin.ts src/locale/sr@latin.ts
-	mv src/locale/sr_RS.ts src/locale/sr_CS.ts
-
-	# process linguas
-	local langs=
-	for lingua in ${LINGUAS}; do
-		if has ${lingua} ${ARORA_LANGS}; then
-			langs+=" ${lingua}.ts"
-		else
-			for a in ${ARORA_NOLONGLANGS}; do
-				if [[ ${lingua} == ${a%_*} ]]; then
-					langs+=" ${a}.ts"
-				fi
-			done
-		fi
-	done
-
-	# remove all translations, then add only the ones we want
-	sed -i '/ts/d' src/locale/locale.pri || die
-	sed -i "/^TRANSLATIONS/s:\\\:${langs}:" src/locale/locale.pri || die
-
-	if ! use doc ; then
-		sed -i 's|QMAKE_EXTRA|#QMAKE_EXTRA|' arora.pro || die
-	fi
-}
-
-src_configure() {
-	eqmake4 PREFIX="${EPREFIX}"/usr
-}
-
-src_compile() {
-	qt4-r2_src_compile
-
-	# don't pre-strip
-	sed -i "/strip/d" src/Makefile || die
-}
diff --git a/www-client/arora/files/arora-0.10.2_qt_4.7_build_fix.patch b/www-client/arora/files/arora-0.10.2_qt_4.7_build_fix.patch
deleted file mode 100644
index 120cdc9f2e0f..000000000000
--- a/www-client/arora/files/arora-0.10.2_qt_4.7_build_fix.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 5ca8d4b93a284d2e96ba9c2413c4060814258a95 Mon Sep 17 00:00:00 2001
-From: Benjamin Poulain <benjamin.poulain@nokia.com>
-Date: Fri, 7 May 2010 12:28:32 +0200
-Subject: [PATCH 02/16] QtWebKit 2.0 declare a meta type for QWebElement
-
-Fix the compilation of Arora with QtWebKit 2.0. QtWebKit 2 already
-declare the meta type, declaring it in Arora results in a clash of
-symbols.
----
- src/webview.cpp |    2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/src/webview.cpp b/src/webview.cpp
-index 30df9a6..43eeeb9 100644
---- a/src/webview.cpp
-+++ b/src/webview.cpp
-@@ -87,7 +87,9 @@
- #include <qwebframe.h>
- 
- #if QT_VERSION >= 0x040600 || defined(WEBKIT_TRUNK)
-+#if !defined(QTWEBKIT_VERSION) || QTWEBKIT_VERSION < 0x020000
- Q_DECLARE_METATYPE(QWebElement)
-+#endif
- #include <qinputdialog.h>
- #include <qlabel.h>
- #include <qmessagebox.h>
--- 
-1.7.2.2
-
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 3e0889f6532b..15a3e213289f 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -1,6 +1,5 @@
-DIST chromium-17.0.963.79.tar.bz2 165966945 RMD160 8b206cda5a8ce32933cbab7f96e17bc2efbab715 SHA1 571cdefb61ef9741f326323a3e71ce9345b809cf SHA256 060ced63d5047f74549556d5a8c5f39df05e08bc8e2c9d7b6d0f269bb4e4353e
 DIST chromium-17.0.963.83.tar.bz2 165957162 RMD160 181f0d50f08c01f84ac3f342ac4b7d842cdd609e SHA1 ff847fb7fd84f342fc92263fe352a66ce292ea2a SHA256 fa1f684c3605b70243e337a98c4bf6e227da268cb0b8e2ebd42b6fccb798d93f
-DIST chromium-18.0.1025.113.tar.bz2 174653724 RMD160 151c34c4b8907f8e36f42e09786ff31258fcb826 SHA1 a3286be035804f19b4abec0e6cb8a031c20722b6 SHA256 9f1717b52bf56c38986d6aeaee0033b04d16a7247e3be929d87a99b970748575
 DIST chromium-18.0.1025.140.tar.bz2 174639315 RMD160 467361faa5c7da23370ed8203afe631569146b23 SHA1 aa29e8a798f4ec101849cef31e88ba0c9ba4c968 SHA256 598fa6f111bac67fd56a15541bf0174d47e42738996d29a2aa9ea7976b6d2da5
+DIST chromium-18.0.1025.142.tar.bz2 174644858 RMD160 5eba71ba557982c859f7067a04f5ea7b89479cf6 SHA1 234bb170ff3f297ae23c70fa2d15455cbaba876f SHA256 911a4ee2e30ed617c4148c84dcddfd1affa4b2fc02dc5e95ac4a4afeeda24b1d
 DIST chromium-19.0.1068.1.tar.bz2 176779606 RMD160 bf714fd2d36fad40979c98e05a0df3e14c947d3e SHA1 1a814a3939143f52de03104726204c1bbc7155bc SHA256 aaabf38477c406201fb2d9fa72dbfdb46cc5aaf1591d9f61fd1235654dc23dea
 DIST chromium-19.0.1077.3.tar.bz2 184095346 RMD160 9956f1b34452994f69415e1d7aa2582371b9af13 SHA1 49e23c13aee202758d9e0e34b9308dc0cc19f329 SHA256 a741e44349340bdbeb60e6f7953e74041c5120fa8bc6cc3fa2f30054028e80e4
diff --git a/www-client/chromium/chromium-17.0.963.79.ebuild b/www-client/chromium/chromium-17.0.963.79.ebuild
deleted file mode 100644
index 865f89ffbf48..000000000000
--- a/www-client/chromium/chromium-17.0.963.79.ebuild
+++ /dev/null
@@ -1,560 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-17.0.963.79.ebuild,v 1.3 2012/03/11 13:23:38 rich0 Exp $
-
-EAPI="4"
-PYTHON_DEPEND="2:2.6"
-
-inherit eutils fdo-mime flag-o-matic gnome2-utils linux-info multilib \
-	pax-utils portability python toolchain-funcs versionator virtualx
-
-DESCRIPTION="Open-source version of Google Chrome web browser"
-HOMEPAGE="http://chromium.org/"
-SRC_URI="http://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="bindist cups custom-cflags gnome gnome-keyring kerberos pulseaudio"
-
-# en_US is ommitted on purpose from the list below. It must always be available.
-LANGS="am ar bg bn ca cs da de el en_GB es es_LA et fa fi fil fr gu he hi hr
-hu id it ja kn ko lt lv ml mr nb nl pl pt_BR pt_PT ro ru sk sl sr sv sw ta te th
-tr uk vi zh_CN zh_TW"
-for lang in ${LANGS}; do
-	IUSE+=" linguas_${lang}"
-done
-
-RDEPEND="app-arch/bzip2
-	cups? (
-		dev-libs/libgcrypt
-		>=net-print/cups-1.3.11
-	)
-	>=dev-lang/v8-3.7.6
-	dev-libs/dbus-glib
-	dev-libs/elfutils
-	>=dev-libs/icu-4.4.1
-	>=dev-libs/libevent-1.4.13
-	dev-libs/libxml2[icu]
-	dev-libs/libxslt
-	>=dev-libs/nss-3.12.3
-	gnome? ( >=gnome-base/gconf-2.24.0 )
-	gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 )
-	>=media-libs/alsa-lib-1.0.19
-	media-libs/flac
-	virtual/jpeg
-	media-libs/libpng
-	>=media-libs/libwebp-0.1.2
-	media-libs/speex
-	pulseaudio? ( media-sound/pulseaudio )
-	sys-libs/zlib
-	x11-libs/gtk+:2
-	x11-libs/libXinerama
-	x11-libs/libXScrnSaver
-	x11-libs/libXtst
-	kerberos? ( virtual/krb5 )"
-DEPEND="${RDEPEND}
-	>=dev-lang/nacl-toolchain-newlib-0_p7311
-	dev-lang/perl
-	dev-lang/yasm
-	dev-python/simplejson
-	>=dev-util/gperf-3.0.3
-	>=dev-util/pkgconfig-0.23
-	>=sys-devel/bison-2.4.3
-	sys-devel/flex
-	>=sys-devel/make-3.81-r2
-	test? ( dev-python/pyftpdlib )"
-RDEPEND+="
-	!=www-client/chromium-9999
-	x11-misc/xdg-utils
-	virtual/ttf-fonts"
-
-gyp_use() {
-	if [[ $# -lt 2 ]]; then
-		echo "!!! usage: gyp_use <USEFLAG> <GYPFLAG>" >&2
-		return 1
-	fi
-	if use "$1"; then echo "-D$2=1"; else echo "-D$2=0"; fi
-}
-
-egyp() {
-	set -- build/gyp_chromium --depth=. "${@}"
-	echo "${@}" >&2
-	"${@}"
-}
-
-# Chromium uses different names for some langs,
-# return Chromium name corresponding to a Gentoo lang.
-chromium_lang() {
-	if [[ "$1" == "es_LA" ]]; then
-		echo "es_419"
-	else
-		echo "$1"
-	fi
-}
-
-get_bundled_v8_version() {
-	"$(PYTHON -2)" "${FILESDIR}"/extract_v8_version.py v8/src/version.cc
-}
-
-get_installed_v8_version() {
-	best_version dev-lang/v8 | sed -e 's@dev-lang/v8-@@g'
-}
-
-if ! has chromium-pkg_die ${EBUILD_DEATH_HOOKS}; then
-	EBUILD_DEATH_HOOKS+=" chromium-pkg_die";
-fi
-
-chromium-pkg_die() {
-	if [[ "${EBUILD_PHASE}" != "compile" ]]; then
-		return
-	fi
-
-	# Prevent user problems like bug #348235.
-	eshopts_push -s extglob
-	if is-flagq '-g?(gdb)?([1-9])'; then
-		ewarn
-		ewarn "You have enabled debug info (i.e. -g or -ggdb in your CFLAGS/CXXFLAGS)."
-		ewarn "Please try removing -g{,gdb} before reporting a bug."
-		ewarn
-	fi
-	eshopts_pop
-
-	# ccache often causes bogus compile failures, especially when the cache gets
-	# corrupted.
-	if has ccache ${FEATURES}; then
-		ewarn
-		ewarn "You have enabled ccache. Please try disabling ccache"
-		ewarn "before reporting a bug."
-		ewarn
-	fi
-
-	# No ricer bugs.
-	if use custom-cflags; then
-		ewarn
-		ewarn "You have enabled the custom-cflags USE flag."
-		ewarn "Please disable it before reporting a bug."
-		ewarn
-	fi
-
-	# If the system doesn't have enough memory, the compilation is known to
-	# fail. Print info about memory to recognize this condition.
-	einfo
-	einfo "$(grep MemTotal /proc/meminfo)"
-	einfo "$(grep SwapTotal /proc/meminfo)"
-	einfo
-}
-
-pkg_setup() {
-	if [[ "${SLOT}" == "0" ]]; then
-		CHROMIUM_SUFFIX=""
-	else
-		CHROMIUM_SUFFIX="-${SLOT}"
-	fi
-	CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser${CHROMIUM_SUFFIX}"
-
-	# Make sure the build system will use the right tools, bug #340795.
-	tc-export AR CC CXX RANLIB
-
-	# Make sure the build system will use the right python, bug #344367.
-	python_set_active_version 2
-	python_pkg_setup
-
-	if [[ "${MERGE_TYPE}" == "source" || "${MERGE_TYPE}" == "binary" ]]; then
-		# Fail if the kernel doesn't support features needed for sandboxing,
-		# bug #363907.
-		ERROR_PID_NS="PID_NS is required for sandbox to work"
-		ERROR_NET_NS="NET_NS is required for sandbox to work"
-		CONFIG_CHECK="~PID_NS ~NET_NS"
-		check_extra_config
-	fi
-
-	if use bindist; then
-		elog "bindist enabled: H.264 video support will be disabled."
-	else
-		elog "bindist disabled: Resulting binaries may not be legal to re-distribute."
-	fi
-}
-
-src_prepare() {
-	ln -s /usr/$(get_libdir)/nacl-toolchain-newlib \
-		native_client/toolchain/linux_x86_newlib || die
-
-	# zlib-1.2.5.1-r1 renames the OF macro in zconf.h, bug 383371.
-	sed -i '1i#define OF(x) x' \
-		third_party/zlib/contrib/minizip/{ioapi,{,un}zip}.c \
-		chrome/common/zip*.cc || die
-
-	# Revert WebKit changeset responsible for Gentoo bug #393471.
-	epatch "${FILESDIR}/${PN}-revert-jpeg-swizzle-r0.patch"
-
-	# Backport upstream fix for Gentoo bug #389479.
-	epatch "${FILESDIR}/${PN}-dev-shm-r0.patch"
-
-	# Fix crashes on illegal instructions, bug #401537.
-	epatch "${FILESDIR}/${PN}-media-no-sse-r0.patch"
-
-	epatch_user
-
-	# Remove most bundled libraries. Some are still needed.
-	find third_party -type f \! -iname '*.gyp*' \
-		\! -path 'third_party/WebKit/*' \
-		\! -path 'third_party/angle/*' \
-		\! -path 'third_party/cacheinvalidation/*' \
-		\! -path 'third_party/cld/*' \
-		\! -path 'third_party/expat/*' \
-		\! -path 'third_party/ffmpeg/*' \
-		\! -path 'third_party/flac/flac.h' \
-		\! -path 'third_party/gpsd/*' \
-		\! -path 'third_party/harfbuzz/*' \
-		\! -path 'third_party/hunspell/*' \
-		\! -path 'third_party/iccjpeg/*' \
-		\! -path 'third_party/jsoncpp/*' \
-		\! -path 'third_party/khronos/*' \
-		\! -path 'third_party/launchpad_translations/*' \
-		\! -path 'third_party/leveldb/*' \
-		\! -path 'third_party/leveldatabase/*' \
-		\! -path 'third_party/libjingle/*' \
-		\! -path 'third_party/libphonenumber/*' \
-		\! -path 'third_party/libvpx/*' \
-		\! -path 'third_party/lss/*' \
-		\! -path 'third_party/mesa/*' \
-		\! -path 'third_party/modp_b64/*' \
-		\! -path 'third_party/mongoose/*' \
-		\! -path 'third_party/npapi/*' \
-		\! -path 'third_party/openmax/*' \
-		\! -path 'third_party/ots/*' \
-		\! -path 'third_party/protobuf/*' \
-		\! -path 'third_party/scons-2.0.1/*' \
-		\! -path 'third_party/sfntly/*' \
-		\! -path 'third_party/skia/*' \
-		\! -path 'third_party/smhasher/*' \
-		\! -path 'third_party/speex/speex.h' \
-		\! -path 'third_party/sqlite/*' \
-		\! -path 'third_party/tcmalloc/*' \
-		\! -path 'third_party/tlslite/*' \
-		\! -path 'third_party/undoview/*' \
-		\! -path 'third_party/v8-i18n/*' \
-		\! -path 'third_party/webdriver/*' \
-		\! -path 'third_party/webgl_conformance/*' \
-		\! -path 'third_party/webrtc/*' \
-		\! -path 'third_party/zlib/contrib/minizip/*' \
-		-delete || die
-
-	local v8_bundled="$(get_bundled_v8_version)"
-	local v8_installed="$(get_installed_v8_version)"
-	elog "V8 version: bundled - ${v8_bundled}; installed - ${v8_installed}"
-
-	# Remove bundled v8.
-	find v8 -type f \! -iname '*.gyp*' -delete || die
-
-	# The implementation files include v8 headers with full path,
-	# like #include "v8/include/v8.h". Make sure the system headers
-	# will be used.
-	# TODO: find a solution that can be upstreamed.
-	rmdir v8/include || die
-	ln -s /usr/include v8/include || die
-
-	# Make sure the build system will use the right python, bug #344367.
-	# Only convert directories that need it, to save time.
-	python_convert_shebangs -q -r 2 build tools
-}
-
-src_configure() {
-	local myconf=""
-
-	# Never tell the build system to "enable" SSE2, it has a few unexpected
-	# additions, bug #336871.
-	myconf+=" -Ddisable_sse2=1"
-
-	# Use system-provided libraries.
-	# TODO: use_system_ffmpeg
-	# TODO: use_system_hunspell (upstream changes needed).
-	# TODO: use_system_ssl (http://crbug.com/58087).
-	# TODO: use_system_sqlite (http://crbug.com/22208).
-	# TODO: use_system_vpx
-	myconf+="
-		-Duse_system_bzip2=1
-		-Duse_system_flac=1
-		-Duse_system_icu=1
-		-Duse_system_libevent=1
-		-Duse_system_libjpeg=1
-		-Duse_system_libpng=1
-		-Duse_system_libwebp=1
-		-Duse_system_libxml=1
-		-Duse_system_speex=1
-		-Duse_system_v8=1
-		-Duse_system_xdg_utils=1
-		-Duse_system_yasm=1
-		-Duse_system_zlib=1"
-
-	# Optional dependencies.
-	# TODO: linux_link_kerberos, bug #381289.
-	myconf+="
-		$(gyp_use cups use_cups)
-		$(gyp_use gnome use_gconf)
-		$(gyp_use gnome-keyring use_gnome_keyring)
-		$(gyp_use gnome-keyring linux_link_gnome_keyring)
-		$(gyp_use kerberos use_kerberos)
-		$(gyp_use pulseaudio use_pulseaudio)"
-
-	# Enable sandbox.
-	myconf+="
-		-Dlinux_sandbox_path=${CHROMIUM_HOME}/chrome_sandbox
-		-Dlinux_sandbox_chrome_path=${CHROMIUM_HOME}/chrome"
-
-	# if host-is-pax; then
-	#	# Prevent the build from failing (bug #301880). The performance
-	#	# difference is very small.
-	#	myconf+=" -Dv8_use_snapshot=0"
-	# fi
-
-	# Our system ffmpeg should support more codecs than the bundled one
-	# for Chromium.
-	# myconf+=" -Dproprietary_codecs=1"
-
-	if ! use bindist; then
-		# Enable H.624 support in bundled ffmpeg.
-		myconf+=" -Dproprietary_codecs=1 -Dffmpeg_branding=Chrome"
-	fi
-
-	local myarch="$(tc-arch)"
-	if [[ $myarch = amd64 ]] ; then
-		myconf+=" -Dtarget_arch=x64"
-	elif [[ $myarch = x86 ]] ; then
-		myconf+=" -Dtarget_arch=ia32"
-	elif [[ $myarch = arm ]] ; then
-		# TODO: check this again after
-		# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=39509 is fixed.
-		append-flags -fno-tree-sink
-
-		myconf+=" -Dtarget_arch=arm -Ddisable_nacl=1 -Dlinux_use_tcmalloc=0"
-	else
-		die "Failed to determine target arch, got '$myarch'."
-	fi
-
-	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
-	# Depending on GCC version the warnings are different and we don't want
-	# the build to fail because of that.
-	myconf+=" -Dwerror="
-
-	# Avoid CFLAGS problems, bug #352457, bug #390147.
-	if ! use custom-cflags; then
-		replace-flags "-Os" "-O2"
-		strip-flags
-	fi
-
-	egyp ${myconf} || die
-}
-
-src_compile() {
-	emake chrome chrome_sandbox chromedriver BUILDTYPE=Release V=1 || die
-	pax-mark m out/Release/chrome
-	if use test; then
-		emake {base,cacheinvalidation,crypto,googleurl,gpu,media,net,printing}_unittests BUILDTYPE=Release V=1 || die
-		pax-mark m out/Release/{base,cacheinvalidation,crypto,googleurl,gpu,media,net,printing}_unittests
-	fi
-}
-
-src_test() {
-	# For more info see bug #350349.
-	local mylocale='en_US.utf8'
-	if ! locale -a | grep -q "$mylocale"; then
-		eerror "${PN} requires ${mylocale} locale for tests"
-		eerror "Please read the following guides for more information:"
-		eerror "  http://www.gentoo.org/doc/en/guide-localization.xml"
-		eerror "  http://www.gentoo.org/doc/en/utf-8.xml"
-		die "locale ${mylocale} is not supported"
-	fi
-
-	# For more info see bug #370957.
-	if [[ $UID -eq 0 ]]; then
-		die "Tests must be run as non-root. Please use FEATURES=userpriv."
-	fi
-
-	# ICUStringConversionsTest: bug #350347.
-	# MessagePumpLibeventTest: bug #398501.
-	LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/base_unittests virtualmake \
-		'--gtest_filter=-ICUStringConversionsTest.*:MessagePumpLibeventTest.*'
-
-	LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/cacheinvalidation_unittests virtualmake
-	LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/crypto_unittests virtualmake
-	LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/googleurl_unittests virtualmake
-	LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/gpu_unittests virtualmake
-	LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/media_unittests virtualmake
-
-	# NetUtilTest: bug #361885.
-	# NetUtilTest.GenerateFileName: some locale-related mismatch.
-	# UDP: unstable, active development. We should revisit this later.
-	# CertDatabaseNSSTest.ImportCACertHierarchyTree: works in 18.x, broken here.
-	# CertDatabaseNSSTest.ImportServerCert_SelfSigned: bug #399269.
-	LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/net_unittests virtualmake \
-		'--gtest_filter=-NetUtilTest.IDNToUnicode*:NetUtilTest.FormatUrl*:NetUtilTest.GenerateFileName:*UDP*:CertDatabaseNSSTest.ImportCACertHierarchyTree:CertDatabaseNSSTest.ImportServerCert_SelfSigned:KeygenHandlerTest.*'
-
-	LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/printing_unittests virtualmake
-}
-
-src_install() {
-	exeinto "${CHROMIUM_HOME}"
-	doexe out/Release/chrome || die
-	doexe out/Release/chrome_sandbox || die
-	fperms 4755 "${CHROMIUM_HOME}/chrome_sandbox"
-
-	doexe out/Release/chromedriver || die
-
-	# Install Native Client files on platforms that support it.
-	insinto "${CHROMIUM_HOME}"
-	case "$(tc-arch)" in
-		amd64)
-			doexe out/Release/nacl_helper{,_bootstrap} || die
-			doins out/Release/nacl_irt_x86_64.nexe || die
-			doins out/Release/libppGoogleNaClPluginChrome.so || die
-		;;
-		x86)
-			doexe out/Release/nacl_helper{,_bootstrap} || die
-			doins out/Release/nacl_irt_x86_32.nexe || die
-			doins out/Release/libppGoogleNaClPluginChrome.so || die
-		;;
-	esac
-
-	newexe "${FILESDIR}"/chromium-launcher-r2.sh chromium-launcher.sh || die
-	if [[ "${CHROMIUM_SUFFIX}" != "" ]]; then
-		sed "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g" \
-			-i "${ED}"/"${CHROMIUM_HOME}"/chromium-launcher.sh || die
-		sed "s:chromium.desktop:chromium${CHROMIUM_SUFFIX}.desktop:g" \
-			-i "${ED}"/"${CHROMIUM_HOME}"/chromium-launcher.sh || die
-		sed "s:plugins:plugins --user-data-dir=\${HOME}/.config/chromium${CHROMIUM_SUFFIX}:" \
-			-i "${ED}"/"${CHROMIUM_HOME}"/chromium-launcher.sh || die
-	fi
-
-	# It is important that we name the target "chromium-browser",
-	# xdg-utils expect it; bug #355517.
-	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser${CHROMIUM_SUFFIX} || die
-	# keep the old symlink around for consistency
-	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium${CHROMIUM_SUFFIX} || die
-
-	# Allow users to override command-line options, bug #357629.
-	dodir /etc/chromium || die
-	insinto /etc/chromium
-	newins "${FILESDIR}/chromium.default" "default" || die
-
-	# Support LINGUAS, bug #332751.
-	local pak
-	for pak in out/Release/locales/*.pak; do
-		local pakbasename="$(basename ${pak})"
-		local pakname="${pakbasename%.pak}"
-		local langname="${pakname//-/_}"
-
-		# Do not issue warning for en_US locale. This is the fallback
-		# locale so it should always be installed.
-		if [[ "${langname}" == "en_US" ]]; then
-			continue
-		fi
-
-		local found=false
-		local lang
-		for lang in ${LANGS}; do
-			local crlang="$(chromium_lang ${lang})"
-			if [[ "${langname}" == "${crlang}" ]]; then
-				found=true
-				break
-			fi
-		done
-		if ! $found; then
-			ewarn "LINGUAS warning: no ${langname} in LANGS"
-		fi
-	done
-	local lang
-	for lang in ${LANGS}; do
-		local crlang="$(chromium_lang ${lang})"
-		local pakfile="out/Release/locales/${crlang//_/-}.pak"
-		if [ ! -f "${pakfile}" ]; then
-			ewarn "LINGUAS warning: no .pak file for ${lang} (${pakfile} not found)"
-		fi
-		if ! use linguas_${lang}; then
-			rm "${pakfile}" || die
-		fi
-	done
-
-	insinto "${CHROMIUM_HOME}"
-	doins out/Release/chrome.pak || die
-	doins out/Release/resources.pak || die
-
-	doins -r out/Release/locales || die
-	doins -r out/Release/resources || die
-
-	newman out/Release/chrome.1 chromium${CHROMIUM_SUFFIX}.1 || die
-	newman out/Release/chrome.1 chromium-browser${CHROMIUM_SUFFIX}.1 || die
-
-	# Chromium looks for these in its folder
-	# See media_posix.cc and base_paths_linux.cc
-	# dosym /usr/$(get_libdir)/libavcodec.so.52 "${CHROMIUM_HOME}" || die
-	# dosym /usr/$(get_libdir)/libavformat.so.52 "${CHROMIUM_HOME}" || die
-	# dosym /usr/$(get_libdir)/libavutil.so.50 "${CHROMIUM_HOME}" || die
-	doexe out/Release/libffmpegsumo.so || die
-
-	# Install icons and desktop entry.
-	for SIZE in 16 22 24 32 48 64 128 256 ; do
-		insinto /usr/share/icons/hicolor/${SIZE}x${SIZE}/apps
-		newins chrome/app/theme/chromium/product_logo_${SIZE}.png \
-			chromium-browser${CHROMIUM_SUFFIX}.png || die
-	done
-	local mime_types="text/html;text/xml;application/xhtml+xml;"
-	mime_types+="x-scheme-handler/http;x-scheme-handler/https;" # bug #360797
-	make_desktop_entry \
-		chromium-browser${CHROMIUM_SUFFIX} \
-		"Chromium${CHROMIUM_SUFFIX}" \
-		chromium-browser${CHROMIUM_SUFFIX} \
-		"Network;WebBrowser" \
-		"MimeType=${mime_types}\nStartupWMClass=chromium-browser"
-	sed -e "/^Exec/s/$/ %U/" -i "${ED}"/usr/share/applications/*.desktop || die
-
-	# Install GNOME default application entry (bug #303100).
-	if use gnome; then
-		dodir /usr/share/gnome-control-center/default-apps || die
-		insinto /usr/share/gnome-control-center/default-apps
-		newins "${FILESDIR}"/chromium-browser.xml chromium-browser${CHROMIUM_SUFFIX}.xml || die
-		if [[ "${CHROMIUM_SUFFIX}" != "" ]]; then
-			sed "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g" -i \
-				"${ED}"/usr/share/gnome-control-center/default-apps/chromium-browser${CHROMIUM_SUFFIX}.xml
-		fi
-	fi
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-
-	# For more info see bug #292201, bug #352263, bug #361859.
-	elog
-	elog "Depending on your desktop environment, you may need"
-	elog "to install additional packages to get icons on the Downloads page."
-	elog
-	elog "For KDE, the required package is kde-base/oxygen-icons."
-	elog
-	elog "For other desktop environments, try one of the following:"
-	elog " - x11-themes/gnome-icon-theme"
-	elog " - x11-themes/tango-icon-theme"
-
-	# For more info see bug #359153.
-	elog
-	elog "Some web pages may require additional fonts to display properly."
-	elog "Try installing some of the following packages if some characters"
-	elog "are not displayed properly:"
-	elog " - media-fonts/arphicfonts"
-	elog " - media-fonts/bitstream-cyberbit"
-	elog " - media-fonts/droid"
-	elog " - media-fonts/ipamonafont"
-	elog " - media-fonts/ja-ipafonts"
-	elog " - media-fonts/takao-fonts"
-	elog " - media-fonts/wqy-microhei"
-	elog " - media-fonts/wqy-zenhei"
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/www-client/chromium/chromium-18.0.1025.113.ebuild b/www-client/chromium/chromium-18.0.1025.142.ebuild
similarity index 99%
rename from www-client/chromium/chromium-18.0.1025.113.ebuild
rename to www-client/chromium/chromium-18.0.1025.142.ebuild
index 46d64c7999f9..6fc866205acb 100644
--- a/www-client/chromium/chromium-18.0.1025.113.ebuild
+++ b/www-client/chromium/chromium-18.0.1025.142.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/chromium/chromium-18.0.1025.113.ebuild,v 1.2 2012/03/23 19:59:52 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-18.0.1025.142.ebuild,v 1.2 2012/03/28 19:03:47 phajdan.jr Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2:2.6"
@@ -18,7 +18,7 @@ SRC_URI="http://commondatastorage.googleapis.com/chromium-browser-official/${P}.
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="bindist cups gnome gnome-keyring kerberos pulseaudio"
 
 RDEPEND="app-arch/bzip2
diff --git a/www-plugins/adobe-flash/Manifest b/www-plugins/adobe-flash/Manifest
index 3dfc23b67fd6..442d53cba8ed 100644
--- a/www-plugins/adobe-flash/Manifest
+++ b/www-plugins/adobe-flash/Manifest
@@ -6,4 +6,8 @@ DIST adobe-flash-11.1.102.62.i386.tar.gz 6747720 RMD160 1d9716d93cf4c09f9b54c589
 DIST adobe-flash-11.1.102.62.x86_64.tar.gz 7042811 RMD160 62f29d1ac5d470baf33aecb5a2cf4c80789bb7bb SHA1 a1cad9899e33dcaf45489287ee031adbf212ba6e SHA256 f0a7323237e42a3a27e91c71ea09e3d4281caaf4ad1e2beb05f2b1774bc4edf0
 DIST adobe-flash-11.1.102.63.i386.tar.gz 6746733 RMD160 19b10bbb6e507adfa0a43a10f112c4b544133c93 SHA1 2893aeb9b53e34a4e8a878a0158c39e5a6cb308d SHA256 dff9d475b3e8900e5c9a5d1d69ba766d0cdf9471217ef35c931ccefdf7b68246
 DIST adobe-flash-11.1.102.63.x86_64.tar.gz 7042923 RMD160 f8b134fb5a62a2c8ab997ff02fa61d6d41661e8f SHA1 e210a4bb31f1b9eba9f0898842660617715dd376 SHA256 8e78ecf8262f318d26934a6a731cefa97b9cbd40e2312c1ab2e5b8634e600190
+DIST adobe-flash-11.2.202.223.i386.tar.gz 6915928 RMD160 7301b943c9e53f263fdd0cace7c39d3dfc848484 SHA1 12c031fe912ba07cf241e36b049152e00a85b0df SHA256 3fe05c8340db2af581f91fcfc47c0b9daafaa3858503e0d577744fdcf6a00408
+DIST adobe-flash-11.2.202.223.x86_64.tar.gz 7224360 RMD160 04cd80592f555572da0f95357359dda7d137a899 SHA1 4b8d1676939a5864f8e608f681b7e93626262ea4 SHA256 0a9d7e14c411d493f79d3f580d50ac2fd150720cbaa35444097de41a5d339369
+DIST adobe-flash-11.2.202.228.i386.tar.gz 6917230 RMD160 60ee451496c048d71fd9bc488e002f8645aa3095 SHA1 7af39c4e16d399d4c2940bd029d3c497f064e343 SHA256 20a806eaf508aa8bf22d9803e94b9f942a548da87cd0a59712c7bcd1df0d44e6
+DIST adobe-flash-11.2.202.228.x86_64.tar.gz 7224876 RMD160 cbf525ea7c6580537719cf5c2d705edd9e0835bb SHA1 7e54bf4271b2696480eb999100e506e511306fd0 SHA256 92c9758d347d05c284dcafccbc8370d8ba9a52f039ce1dbe558be66560476681
 DIST flash-plugin-10.3.183.10-release.i386.rpm 5450351 RMD160 e84e71ba5fc88ac2c3557b7848c3bf2f988a890d SHA1 98f159698fa1a5a85b8d5210ad551da5ba5d9af7 SHA256 9969a0ebb53d42f195785aee2253d58cbd7960be861f3f981293f5ebcb4a0a70
diff --git a/www-plugins/adobe-flash/adobe-flash-11.2.202.223.ebuild b/www-plugins/adobe-flash/adobe-flash-11.2.202.223.ebuild
new file mode 100644
index 000000000000..28d3254a9a25
--- /dev/null
+++ b/www-plugins/adobe-flash/adobe-flash-11.2.202.223.ebuild
@@ -0,0 +1,236 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/adobe-flash-11.2.202.223.ebuild,v 1.1 2012/03/28 18:28:05 lack Exp $
+
+EAPI=4
+inherit nsplugins multilib toolchain-funcs versionator
+
+MY_32B_URI="http://fpdownload.macromedia.com/get/flashplayer/pdc/${PV}/install_flash_player_$(get_major_version)_linux.i386.tar.gz -> ${P}.i386.tar.gz"
+MY_64B_URI="http://fpdownload.macromedia.com/get/flashplayer/pdc/${PV}/install_flash_player_$(get_major_version)_linux.x86_64.tar.gz -> ${P}.x86_64.tar.gz"
+
+DESCRIPTION="Adobe Flash Player"
+SRC_URI="x86? ( ${MY_32B_URI} )
+amd64? (
+	multilib? (
+		32bit? ( ${MY_32B_URI} )
+		64bit? ( ${MY_64B_URI} )
+	)
+	!multilib? ( ${MY_64B_URI} )
+)"
+HOMEPAGE="http://www.adobe.com/products/flashplayer.html"
+IUSE="multilib -32bit +64bit vdpau kde"
+SLOT="0"
+
+KEYWORDS="-* ~amd64 ~x86"
+LICENSE="AdobeFlash-10.3"
+RESTRICT="strip mirror"
+
+S="${WORKDIR}"
+
+NATIVE_DEPS="x11-libs/gtk+:2
+	media-libs/fontconfig
+	dev-libs/nss
+	net-misc/curl
+	vdpau? ( x11-libs/libvdpau )
+	kde? ( kde-base/kcmshell )
+	>=sys-libs/glibc-2.4"
+
+EMUL_DEPS="vdpau? ( >=app-emulation/emul-linux-x86-xlibs-20110129 )
+	>=app-emulation/emul-linux-x86-gtklibs-20100409-r1
+	app-emulation/emul-linux-x86-soundlibs"
+
+DEPEND="amd64? ( multilib? ( !64bit? ( www-plugins/nspluginwrapper ) ) )"
+RDEPEND="x86? ( $NATIVE_DEPS )
+	amd64? (
+		multilib? (
+			64bit? ( $NATIVE_DEPS )
+			32bit? ( $EMUL_DEPS )
+		)
+		!multilib? ( $NATIVE_DEPS )
+	)
+	|| ( media-fonts/liberation-fonts media-fonts/corefonts )
+	${DEPEND}"
+
+# Where should this all go? (Bug #328639)
+INSTALL_BASE="opt/Adobe/flash-player"
+
+# Ignore QA warnings in these closed-source binaries, since we can't fix them:
+QA_PREBUILT="opt/*"
+
+pkg_setup() {
+	if use x86; then
+		export native_install=1
+	elif use amd64; then
+		# amd64 users may unselect the native 64bit binary, if they choose
+		# TODO: In future revisions, remove this ability now that 64-bit
+		# binaries are officially released and working.
+		if ! use multilib || use 64bit; then
+			export native_install=1
+		else
+			unset native_install
+		fi
+
+		if use multilib && use 32bit; then
+			export amd64_32bit=1
+		else
+			unset amd64_32bit
+		fi
+
+		if use multilib && ! use 32bit && ! use 64bit; then
+			eerror "You must select at least one architecture USE flag (32bit or 64bit)"
+			die "No library version selected [-32bit -64bit]"
+		fi
+
+		unset need_lahf_wrapper
+		if [[ $native_install ]]; then
+			# 64bit flash requires the 'lahf' instruction (bug #268336)
+			# Also, check if *any* of the processors are affected (bug #286159)
+			if grep '^flags' /proc/cpuinfo | grep -qv 'lahf_lm'; then
+				export need_lahf_wrapper=1
+			fi
+		fi
+	fi
+}
+
+src_unpack() {
+	if [[ $amd64_32bit ]]; then
+		# Since the 32-bit and 64-bit packages collide, put the 32-bit one
+		# elsewhere:
+		local my_32b_src=${MY_32B_URI##*>}
+		local my_64b_src=${MY_64B_URI##*>}
+		if [[ $native_install ]]; then
+			unpack $my_64b_src
+		fi
+		mkdir 32bit
+		pushd 32bit >/dev/null
+		unpack $my_32b_src
+		popd >/dev/null
+	else
+		default_src_unpack
+	fi
+}
+
+src_compile() {
+	if [[ $need_lahf_wrapper ]]; then
+		# This experimental wrapper, from Maks Verver via bug #268336 should
+		# emulate the missing lahf instruction affected platforms.
+		$(tc-getCC) -fPIC -shared -nostdlib -lc -oflashplugin-lahf-fix.so \
+			"${FILESDIR}/flashplugin-lahf-fix.c" \
+			|| die "Compile of flashplugin-lahf-fix.so failed"
+	fi
+}
+
+src_install() {
+	if [[ $native_install ]]; then
+		if use x86; then
+			local PKGLIB=lib
+		else
+			local PKGLIB=lib64
+		fi
+		local BASE=${INSTALL_BASE}
+
+		# The plugin itself
+		exeinto /${BASE}/flash-plugin
+		doexe libflashplayer.so
+		inst_plugin /${BASE}/flash-plugin/libflashplayer.so
+
+		# The optional KDE4 KCM plugin
+		if use kde; then
+			exeinto /${BASE}/kde4
+			doexe usr/${PKGLIB}/kde4/kcm_adobe_flash_player.so
+			dosym /${BASE}/kde4/kcm_adobe_flash_player.so \
+				/usr/$(get_libdir)/kde4/kcm_adobe_flash_player.so
+			insinto /usr/share/kde4/services
+			doins usr/share/kde4/services/kcm_adobe_flash_player.desktop
+		else
+			# No KDE applet, so allow the GTK utility to show up in KDE:
+			sed -i usr/share/applications/flash-player-properties.desktop \
+				-e "/^NotShowIn=KDE;/d" || die "sed of .desktop file failed"
+		fi
+
+		# The userland 'flash-player-properties' standalone app:
+		exeinto /${BASE}/bin
+		doexe usr/bin/flash-player-properties
+		dosym /${BASE}/bin/flash-player-properties \
+			usr/bin/flash-player-properties
+
+		# Icon and .desktop for 'flash-player-properties'
+		for icon in $(find usr/share/icons/ -name '*.png'); do
+			insinto /$(dirname $icon)
+			doins $icon
+		done
+		dosym ../icons/hicolor/48x48/apps/flash-player-properties.png \
+			  usr/share/pixmaps/flash-player-properties.png
+		insinto usr/share/applications
+		sed -i usr/share/applications/flash-player-properties.desktop \
+			-e "s:^Exec=:Exec=/${BASE}/bin/:" || die "sed of .desktop file failed"
+		doins usr/share/applications/flash-player-properties.desktop
+	fi
+
+	if [[ $need_lahf_wrapper ]]; then
+		# This experimental wrapper, from Maks Verver via bug #268336 should
+		# emulate the missing lahf instruction affected platforms.
+		exeinto /${INSTALL_BASE}
+		doexe flashplugin-lahf-fix.so
+		inst_plugin /${INSTALL_BASE}/flashplugin-lahf-fix.so
+	fi
+
+	if [[ $amd64_32bit ]]; then
+		# Only install the plugin, nothing else for 32-bit.
+		local oldabi="${ABI}"
+		ABI="x86"
+
+		# 32b plugin
+		pushd "${S}/32bit"
+			exeinto /${INSTALL_BASE}32
+			doexe libflashplayer.so
+			inst_plugin /${INSTALL_BASE}32/libflashplayer.so
+		popd
+
+		ABI="${oldabi}"
+	fi
+
+	# The magic config file!
+	insinto "/etc/adobe"
+	doins "${FILESDIR}/mms.cfg"
+}
+
+pkg_postinst() {
+	if use amd64; then
+		if [[ $need_lahf_wrapper ]]; then
+			ewarn "Your processor does not support the 'lahf' instruction which is used"
+			ewarn "by Adobe's 64-bit flash binary.  We have installed a wrapper which"
+			ewarn "should allow this plugin to run.  If you encounter problems, please"
+			ewarn "adjust your USE flags to install only the 32-bit version and reinstall:"
+			ewarn "  ${CATEGORY}/$PN[+32bit -64bit]"
+			elog
+		fi
+		if has_version 'www-plugins/nspluginwrapper'; then
+			if [[ $native_install ]]; then
+				# TODO: Perhaps parse the output of 'nspluginwrapper -l'
+				#       However, the 64b flash plugin makes
+				#       'nspluginwrapper -l' segfault.
+				local FLASH_WRAPPER="${ROOT}/usr/lib64/nsbrowser/plugins/npwrapper.libflashplayer.so"
+				if [[ -f ${FLASH_WRAPPER} ]]; then
+					einfo "Removing duplicate 32-bit plugin wrapper: Native 64-bit plugin installed"
+					nspluginwrapper -r "${FLASH_WRAPPER}"
+				fi
+			else
+				einfo "nspluginwrapper detected: Installing plugin wrapper"
+				local oldabi="${ABI}"
+				ABI="x86"
+				local FLASH_SOURCE="${ROOT}/${INSTALL_BASE}32/libflashplayer.so"
+				nspluginwrapper -i "${FLASH_SOURCE}"
+				ABI="${oldabi}"
+			fi
+		elif [[ ! $native_install ]]; then
+			elog "To use the 32-bit flash player in a native 64-bit browser,"
+			elog "you must install www-plugins/nspluginwrapper"
+		fi
+	fi
+
+	ewarn "Flash player is closed-source, with a long history of security"
+	ewarn "issues.  Please consider only running flash applets you know to"
+	ewarn "be safe.  The 'flashblock' extension may help for mozilla users:"
+	ewarn "  https://addons.mozilla.org/en-US/firefox/addon/433"
+}
diff --git a/www-plugins/adobe-flash/adobe-flash-11.2.202.228.ebuild b/www-plugins/adobe-flash/adobe-flash-11.2.202.228.ebuild
new file mode 100644
index 000000000000..6f4c40b16cf5
--- /dev/null
+++ b/www-plugins/adobe-flash/adobe-flash-11.2.202.228.ebuild
@@ -0,0 +1,236 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/adobe-flash-11.2.202.228.ebuild,v 1.1 2012/03/28 18:34:44 lack Exp $
+
+EAPI=4
+inherit nsplugins multilib toolchain-funcs versionator
+
+MY_32B_URI="http://fpdownload.macromedia.com/get/flashplayer/pdc/${PV}/install_flash_player_$(get_major_version)_linux.i386.tar.gz -> ${P}.i386.tar.gz"
+MY_64B_URI="http://fpdownload.macromedia.com/get/flashplayer/pdc/${PV}/install_flash_player_$(get_major_version)_linux.x86_64.tar.gz -> ${P}.x86_64.tar.gz"
+
+DESCRIPTION="Adobe Flash Player"
+SRC_URI="x86? ( ${MY_32B_URI} )
+amd64? (
+	multilib? (
+		32bit? ( ${MY_32B_URI} )
+		64bit? ( ${MY_64B_URI} )
+	)
+	!multilib? ( ${MY_64B_URI} )
+)"
+HOMEPAGE="http://www.adobe.com/products/flashplayer.html"
+IUSE="multilib -32bit +64bit vdpau kde"
+SLOT="0"
+
+KEYWORDS="-* ~amd64 ~x86"
+LICENSE="AdobeFlash-10.3"
+RESTRICT="strip mirror"
+
+S="${WORKDIR}"
+
+NATIVE_DEPS="x11-libs/gtk+:2
+	media-libs/fontconfig
+	dev-libs/nss
+	net-misc/curl
+	vdpau? ( x11-libs/libvdpau )
+	kde? ( kde-base/kcmshell )
+	>=sys-libs/glibc-2.4"
+
+EMUL_DEPS="vdpau? ( >=app-emulation/emul-linux-x86-xlibs-20110129 )
+	>=app-emulation/emul-linux-x86-gtklibs-20100409-r1
+	app-emulation/emul-linux-x86-soundlibs"
+
+DEPEND="amd64? ( multilib? ( !64bit? ( www-plugins/nspluginwrapper ) ) )"
+RDEPEND="x86? ( $NATIVE_DEPS )
+	amd64? (
+		multilib? (
+			64bit? ( $NATIVE_DEPS )
+			32bit? ( $EMUL_DEPS )
+		)
+		!multilib? ( $NATIVE_DEPS )
+	)
+	|| ( media-fonts/liberation-fonts media-fonts/corefonts )
+	${DEPEND}"
+
+# Where should this all go? (Bug #328639)
+INSTALL_BASE="opt/Adobe/flash-player"
+
+# Ignore QA warnings in these closed-source binaries, since we can't fix them:
+QA_PREBUILT="opt/*"
+
+pkg_setup() {
+	if use x86; then
+		export native_install=1
+	elif use amd64; then
+		# amd64 users may unselect the native 64bit binary, if they choose
+		# TODO: In future revisions, remove this ability now that 64-bit
+		# binaries are officially released and working.
+		if ! use multilib || use 64bit; then
+			export native_install=1
+		else
+			unset native_install
+		fi
+
+		if use multilib && use 32bit; then
+			export amd64_32bit=1
+		else
+			unset amd64_32bit
+		fi
+
+		if use multilib && ! use 32bit && ! use 64bit; then
+			eerror "You must select at least one architecture USE flag (32bit or 64bit)"
+			die "No library version selected [-32bit -64bit]"
+		fi
+
+		unset need_lahf_wrapper
+		if [[ $native_install ]]; then
+			# 64bit flash requires the 'lahf' instruction (bug #268336)
+			# Also, check if *any* of the processors are affected (bug #286159)
+			if grep '^flags' /proc/cpuinfo | grep -qv 'lahf_lm'; then
+				export need_lahf_wrapper=1
+			fi
+		fi
+	fi
+}
+
+src_unpack() {
+	if [[ $amd64_32bit ]]; then
+		# Since the 32-bit and 64-bit packages collide, put the 32-bit one
+		# elsewhere:
+		local my_32b_src=${MY_32B_URI##*>}
+		local my_64b_src=${MY_64B_URI##*>}
+		if [[ $native_install ]]; then
+			unpack $my_64b_src
+		fi
+		mkdir 32bit
+		pushd 32bit >/dev/null
+		unpack $my_32b_src
+		popd >/dev/null
+	else
+		default_src_unpack
+	fi
+}
+
+src_compile() {
+	if [[ $need_lahf_wrapper ]]; then
+		# This experimental wrapper, from Maks Verver via bug #268336 should
+		# emulate the missing lahf instruction affected platforms.
+		$(tc-getCC) -fPIC -shared -nostdlib -lc -oflashplugin-lahf-fix.so \
+			"${FILESDIR}/flashplugin-lahf-fix.c" \
+			|| die "Compile of flashplugin-lahf-fix.so failed"
+	fi
+}
+
+src_install() {
+	if [[ $native_install ]]; then
+		if use x86; then
+			local PKGLIB=lib
+		else
+			local PKGLIB=lib64
+		fi
+		local BASE=${INSTALL_BASE}
+
+		# The plugin itself
+		exeinto /${BASE}/flash-plugin
+		doexe libflashplayer.so
+		inst_plugin /${BASE}/flash-plugin/libflashplayer.so
+
+		# The optional KDE4 KCM plugin
+		if use kde; then
+			exeinto /${BASE}/kde4
+			doexe usr/${PKGLIB}/kde4/kcm_adobe_flash_player.so
+			dosym /${BASE}/kde4/kcm_adobe_flash_player.so \
+				/usr/$(get_libdir)/kde4/kcm_adobe_flash_player.so
+			insinto /usr/share/kde4/services
+			doins usr/share/kde4/services/kcm_adobe_flash_player.desktop
+		else
+			# No KDE applet, so allow the GTK utility to show up in KDE:
+			sed -i usr/share/applications/flash-player-properties.desktop \
+				-e "/^NotShowIn=KDE;/d" || die "sed of .desktop file failed"
+		fi
+
+		# The userland 'flash-player-properties' standalone app:
+		exeinto /${BASE}/bin
+		doexe usr/bin/flash-player-properties
+		dosym /${BASE}/bin/flash-player-properties \
+			usr/bin/flash-player-properties
+
+		# Icon and .desktop for 'flash-player-properties'
+		for icon in $(find usr/share/icons/ -name '*.png'); do
+			insinto /$(dirname $icon)
+			doins $icon
+		done
+		dosym ../icons/hicolor/48x48/apps/flash-player-properties.png \
+			  usr/share/pixmaps/flash-player-properties.png
+		insinto usr/share/applications
+		sed -i usr/share/applications/flash-player-properties.desktop \
+			-e "s:^Exec=:Exec=/${BASE}/bin/:" || die "sed of .desktop file failed"
+		doins usr/share/applications/flash-player-properties.desktop
+	fi
+
+	if [[ $need_lahf_wrapper ]]; then
+		# This experimental wrapper, from Maks Verver via bug #268336 should
+		# emulate the missing lahf instruction affected platforms.
+		exeinto /${INSTALL_BASE}
+		doexe flashplugin-lahf-fix.so
+		inst_plugin /${INSTALL_BASE}/flashplugin-lahf-fix.so
+	fi
+
+	if [[ $amd64_32bit ]]; then
+		# Only install the plugin, nothing else for 32-bit.
+		local oldabi="${ABI}"
+		ABI="x86"
+
+		# 32b plugin
+		pushd "${S}/32bit"
+			exeinto /${INSTALL_BASE}32
+			doexe libflashplayer.so
+			inst_plugin /${INSTALL_BASE}32/libflashplayer.so
+		popd
+
+		ABI="${oldabi}"
+	fi
+
+	# The magic config file!
+	insinto "/etc/adobe"
+	doins "${FILESDIR}/mms.cfg"
+}
+
+pkg_postinst() {
+	if use amd64; then
+		if [[ $need_lahf_wrapper ]]; then
+			ewarn "Your processor does not support the 'lahf' instruction which is used"
+			ewarn "by Adobe's 64-bit flash binary.  We have installed a wrapper which"
+			ewarn "should allow this plugin to run.  If you encounter problems, please"
+			ewarn "adjust your USE flags to install only the 32-bit version and reinstall:"
+			ewarn "  ${CATEGORY}/$PN[+32bit -64bit]"
+			elog
+		fi
+		if has_version 'www-plugins/nspluginwrapper'; then
+			if [[ $native_install ]]; then
+				# TODO: Perhaps parse the output of 'nspluginwrapper -l'
+				#       However, the 64b flash plugin makes
+				#       'nspluginwrapper -l' segfault.
+				local FLASH_WRAPPER="${ROOT}/usr/lib64/nsbrowser/plugins/npwrapper.libflashplayer.so"
+				if [[ -f ${FLASH_WRAPPER} ]]; then
+					einfo "Removing duplicate 32-bit plugin wrapper: Native 64-bit plugin installed"
+					nspluginwrapper -r "${FLASH_WRAPPER}"
+				fi
+			else
+				einfo "nspluginwrapper detected: Installing plugin wrapper"
+				local oldabi="${ABI}"
+				ABI="x86"
+				local FLASH_SOURCE="${ROOT}/${INSTALL_BASE}32/libflashplayer.so"
+				nspluginwrapper -i "${FLASH_SOURCE}"
+				ABI="${oldabi}"
+			fi
+		elif [[ ! $native_install ]]; then
+			elog "To use the 32-bit flash player in a native 64-bit browser,"
+			elog "you must install www-plugins/nspluginwrapper"
+		fi
+	fi
+
+	ewarn "Flash player is closed-source, with a long history of security"
+	ewarn "issues.  Please consider only running flash applets you know to"
+	ewarn "be safe.  The 'flashblock' extension may help for mozilla users:"
+	ewarn "  https://addons.mozilla.org/en-US/firefox/addon/433"
+}
diff --git a/www-servers/apache/Manifest b/www-servers/apache/Manifest
index a44e4952d65d..e150a30c82b6 100644
--- a/www-servers/apache/Manifest
+++ b/www-servers/apache/Manifest
@@ -1,3 +1,5 @@
 DIST gentoo-apache-2.2.21-r1-20111018.tar.bz2 64196 RMD160 fb3d4c1716ecf2763caef5f5d927d8276ebaca47 SHA1 347138d7738c6bbfc0eab1d520f101ac1bb0fa35 SHA256 8c78505a34184b526099db5edb36b6b4ab57b6d2a43eec537ca7984f94639ec7
 DIST gentoo-apache-2.2.21-r2-20120213.tar.bz2 64529 RMD160 85a3c8a3c260a03f35c6d36e347176c5e7bd536e SHA1 e9c99bdf5d6bb1a51b0a4ca383ee41eab9f54290 SHA256 dfd8d83483681473efbd2aad5c0b3f3e76a62f8cba600e8bb75b745ed397d901
+DIST gentoo-apache-2.2.22-20120213.tar.bz2 64507 RMD160 d4d5ac58156e10cdbbfaeb3e7a7569bda81f6f7e SHA1 0c0e80bfddc0fb4b9df3b736239392be9fbc40fb SHA256 737730dabf1e1ccfe9d409067dc3c4d37d16f7fa1e792f5bf39268d904ce1c31
 DIST httpd-2.2.21.tar.bz2 5324905 RMD160 6464a03d78ab858b1288ea9eef4cd5f73b60a9f1 SHA1 c02f9b05da9a7e316ff37d9053dc76a57ba51cb4 SHA256 18d5591fe48cfbac44fc20316036ffe17456df60bc3a2aaad238d56c6445577f
+DIST httpd-2.2.22.tar.bz2 5378934 RMD160 237a26a7759e7e1af175900d598e25fb082a4eb9 SHA1 766cd0843050a8dfb781e48b976f3ba6ebcf8696 SHA256 dcdc9f1dc722f84798caf69d69dca78daa5e09a4269060045aeca7e4f44cb231
diff --git a/www-servers/apache/apache-2.2.22.ebuild b/www-servers/apache/apache-2.2.22.ebuild
new file mode 100644
index 000000000000..9243da588dba
--- /dev/null
+++ b/www-servers/apache/apache-2.2.22.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.2.22.ebuild,v 1.2 2012/03/28 17:18:22 mr_bones_ Exp $
+
+EAPI="2"
+
+# latest gentoo apache files
+GENTOO_PATCHSTAMP="20120213"
+GENTOO_DEVELOPER="jmbsvicetto"
+
+# IUSE/USE_EXPAND magic
+IUSE_MPMS_FORK="itk peruser prefork"
+IUSE_MPMS_THREAD="event worker"
+
+IUSE_MODULES="actions alias asis auth_basic auth_digest authn_alias authn_anon
+authn_dbd authn_dbm authn_default authn_file authz_dbm authz_default
+authz_groupfile authz_host authz_owner authz_user autoindex cache cern_meta
+charset_lite cgi cgid dav dav_fs dav_lock dbd deflate dir disk_cache dumpio
+env expires ext_filter file_cache filter headers ident imagemap include info
+log_config log_forensic logio mem_cache mime mime_magic negotiation proxy
+proxy_ajp proxy_balancer proxy_connect proxy_ftp proxy_http proxy_scgi rewrite
+reqtimeout setenvif speling status substitute unique_id userdir usertrack
+version vhost_alias"
+# The following are also in the source as of this version, but are not available
+# for user selection:
+# bucketeer case_filter case_filter_in echo http isapi optional_fn_export
+# optional_fn_import optional_hook_export optional_hook_import
+
+# inter-module dependencies
+# TODO: this may still be incomplete
+MODULE_DEPENDS="
+	dav_fs:dav
+	dav_lock:dav
+	deflate:filter
+	disk_cache:cache
+	ext_filter:filter
+	file_cache:cache
+	log_forensic:log_config
+	logio:log_config
+	mem_cache:cache
+	mime_magic:mime
+	proxy_ajp:proxy
+	proxy_balancer:proxy
+	proxy_connect:proxy
+	proxy_ftp:proxy
+	proxy_http:proxy
+	proxy_scgi:proxy
+	substitute:filter
+"
+
+# module<->define mappings
+MODULE_DEFINES="
+	auth_digest:AUTH_DIGEST
+	authnz_ldap:AUTHNZ_LDAP
+	cache:CACHE
+	dav:DAV
+	dav_fs:DAV
+	dav_lock:DAV
+	disk_cache:CACHE
+	file_cache:CACHE
+	info:INFO
+	ldap:LDAP
+	mem_cache:CACHE
+	proxy:PROXY
+	proxy_ajp:PROXY
+	proxy_balancer:PROXY
+	proxy_connect:PROXY
+	proxy_ftp:PROXY
+	proxy_http:PROXY
+	ssl:SSL
+	status:STATUS
+	suexec:SUEXEC
+	userdir:USERDIR
+"
+
+# critical modules for the default config
+MODULE_CRITICAL="
+	authz_host
+	dir
+	mime
+"
+
+inherit apache-2
+
+DESCRIPTION="The Apache Web Server."
+HOMEPAGE="http://httpd.apache.org/"
+
+# some helper scripts are Apache-1.1, thus both are here
+LICENSE="Apache-2.0 Apache-1.1"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE=""
+
+DEPEND="${DEPEND}
+	>=dev-libs/openssl-0.9.8m
+	apache2_modules_deflate? ( sys-libs/zlib )"
+
+# dependency on >=dev-libs/apr-1.4.5 for bug #368651
+RDEPEND="${RDEPEND}
+	>=dev-libs/apr-1.4.5
+	>=dev-libs/openssl-0.9.8m
+	apache2_modules_mime? ( app-misc/mime-types )"
+
+# init script fixup - should be rolled into next tarball #389965
+src_prepare() {
+	apache-2_src_prepare
+	sed -i -e 's/! test -f/test -f/' "${GENTOO_PATCHDIR}"/init/apache2.initd || die "Failed to fix init script"
+}
diff --git a/www-servers/apache/metadata.xml b/www-servers/apache/metadata.xml
index ac80f7122a8d..5229f1f95fe5 100644
--- a/www-servers/apache/metadata.xml
+++ b/www-servers/apache/metadata.xml
@@ -8,6 +8,13 @@
 	<maintainer>
 		<email>pva@gentoo.org</email>
 	</maintainer>
+	<maintainer>
+		<email>patrick@gentoo.org</email>
+	</maintainer>
+	<maintainer>
+		<email>mail@ghelm.de</email>
+		<name>Gerrit Helm (proxymaint)</name>
+	</maintainer>
 	<longdescription>
 		The Apache HTTP Server Project is an effort to develop and maintain an
 		open-source HTTP server for modern operating systems. The goal of this
diff --git a/x11-misc/lightdm/Manifest b/x11-misc/lightdm/Manifest
index 0e442f4c1c06..cd58b8250fa2 100644
--- a/x11-misc/lightdm/Manifest
+++ b/x11-misc/lightdm/Manifest
@@ -4,4 +4,5 @@ DIST lightdm-1.1.3.tar.gz 633963 RMD160 d4f7f40d44edb24fa9e237d457f4744f23763a2d
 DIST lightdm-1.1.4.tar.gz 635109 RMD160 fd85508e660608373356dae25a0dcb8c233d30c3 SHA1 085b7d2e9d70c53c8d9124af388c5a3e09321b45 SHA256 10dae544a4d87b15f3a895790d1ae2253e4f48b66a4b1c8df7555d0f97a24d28
 DIST lightdm-1.1.7.tar.gz 637201 RMD160 12549f3b755c1990e908db58dd73b36076c5c687 SHA1 173b8a52cfd21607875a35d716fd2a4c40e6a4f1 SHA256 fdb0609a9eb16383cb6c8dd2bdd57bb110b2b4a3e96ce3183d0ba20c223a4f7d
 DIST lightdm-1.1.8.tar.gz 637844 RMD160 6e45fb08a7d0dcd2614d887e3e5be4c6cc230426 SHA1 8d23c6da7e06710ca6f5655fcdd7060beed3fb98 SHA256 3e30957c57c16cad0d2d130e41acd40e8d1e9a05d75b3fac9eb4e657c9b066eb
+DIST lightdm-1.1.9.tar.gz 640207 RMD160 cb2445a0425550c0c9a63951a2d8e69064b44ff6 SHA1 4effd36fc3c48cbb2b56c8b7143381314a8c97e0 SHA256 ffea35e550bb7d03b142b726c47ad16873b762928b5585146bfdbcbba6027a3b
 DIST lightdm-gentoo-patch.tar.gz 101983 RMD160 6463f6d96b635922ac0f060fbffe450caaec6a74 SHA1 63348e477bffa27c82839c74fe56d3bc4565a3b1 SHA256 2e56d0ef3926428cea7870fbade77b20bd05a7664ae301aacc56504e07cf39ba
diff --git a/x11-misc/lightdm/lightdm-1.1.9.ebuild b/x11-misc/lightdm/lightdm-1.1.9.ebuild
new file mode 100644
index 000000000000..c26154b55919
--- /dev/null
+++ b/x11-misc/lightdm/lightdm-1.1.9.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/lightdm/lightdm-1.1.9.ebuild,v 1.1 2012/03/28 18:50:10 hwoarang Exp $
+
+EAPI=4
+inherit autotools eutils pam
+
+DESCRIPTION="A lightweight display manager"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/LightDM"
+SRC_URI="http://launchpad.net/${PN}/1.2/${PV}/+download/${P}.tar.gz
+	mirror://gentoo/introspection-20110205.m4.tar.bz2"
+
+LICENSE="GPL-3 LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+introspection"
+
+RDEPEND="dev-libs/glib:2
+	virtual/pam
+	x11-libs/libxklavier
+	x11-libs/libX11
+	dev-libs/libxml2
+	introspection? ( dev-libs/gobject-introspection )
+	sys-apps/accountsservice"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	dev-util/pkgconfig
+	gnome-base/gnome-common
+	sys-devel/gettext"
+PDEPEND="x11-misc/lightdm-gtk-greeter"
+
+DOCS=( NEWS )
+
+src_prepare() {
+	sed -i -e "/minimum-uid/s:500:1000:" data/users.conf || die
+	sed -i -e "s:gtk+-3.0:gtk+-2.0:" configure.ac || die
+	epatch "${FILESDIR}"/session-wrapper-${PN}.patch
+	if has_version dev-libs/gobject-introspection; then
+		eautoreconf
+	else
+		AT_M4DIR=${WORKDIR} eautoreconf
+	fi
+}
+
+src_configure() {
+	# Maybe in the future, we can support some automatic session and user
+	# recognition. Until then, use default values
+	local default=gnome user=root greeter
+
+	# There is no qt greeter, so use gtk anyway
+	# use gtk && greeter=lightdm-gtk-greeter
+	greeter=lightdm-gtk-greeter
+
+	# Let user know how lightdm is configured
+	einfo "Gentoo configuration"
+	einfo "Default greeter: ${greeter}"
+	einfo "Default session: ${default}"
+	einfo "Greeter user: ${user}"
+
+	# do the actual configuration
+	econf --localstatedir=/var \
+		--disable-static \
+		$(use_enable introspection) \
+		--disable-liblightdm-qt \
+		--with-user-session=${user} \
+		--with-greeter-session=${greeter} \
+		--with-greeter-user=${user} \
+		--with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html
+}
+
+src_install() {
+	default
+
+	# Install missing files
+	insinto /etc/${PN}/
+	doins "${S}"/data/{${PN},users,keys}.conf
+	doins "${FILESDIR}"/Xsession
+	fperms +x /etc/${PN}/Xsession
+	# remove .la files
+	find "${ED}" -name "*.la" -exec rm -rf {} +
+	rm -Rf "${ED}"/etc/init || die
+
+	dopamd "${FILESDIR}"/${PN}
+	dopamd "${FILESDIR}"/${PN}-autologin
+}
+
+pkg_postinst() {
+	elog
+	elog "Even though the default /etc/${PN}/${PN}.conf will work for"
+	elog "most users, make sure you configure it to suit your needs"
+	elog "before using ${PN} for the first time."
+	elog "You can test the configuration file using the following"
+	elog "command: ${PN} --test-mode -c /etc/${PN}/${PN}.conf. This"
+	elog "requires xorg-server to be built with the 'kdrive' useflag."
+	elog
+}