diff --git a/app-emacs/ecb/ecb-2.40-r1.ebuild b/app-emacs/ecb/ecb-2.40-r1.ebuild
index 5dc2da688f8f..f8db72ad3951 100644
--- a/app-emacs/ecb/ecb-2.40-r1.ebuild
+++ b/app-emacs/ecb/ecb-2.40-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/ecb/ecb-2.40-r1.ebuild,v 1.4 2010/05/23 18:24:13 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/ecb/ecb-2.40-r1.ebuild,v 1.5 2012/05/01 14:41:51 ulm Exp $
 
 EAPI=3
 
@@ -23,6 +23,7 @@ SITEFILE="70${PN}-gentoo.el"
 
 src_prepare() {
 	epatch "${FILESDIR}/${PN}-2.32-gentoo.patch"
+	epatch "${FILESDIR}/${P}-cedet-version.patch"
 	sed -i -e "s:@PF@:${PF}:" ecb-help.el || die "sed failed"
 }
 
diff --git a/app-emacs/ecb/files/ecb-2.40-cedet-version.patch b/app-emacs/ecb/files/ecb-2.40-cedet-version.patch
new file mode 100644
index 000000000000..733384959065
--- /dev/null
+++ b/app-emacs/ecb/files/ecb-2.40-cedet-version.patch
@@ -0,0 +1,11 @@
+--- ecb-2.40-orig/ecb-upgrade.el
++++ ecb-2.40/ecb-upgrade.el
+@@ -1143,7 +1143,7 @@
+ 
+ ;; TODO: Klaus Berndl <klaus.berndl@sdm.de>: maybe we should set this to pre6
+ (defconst ecb-required-cedet-version-min '(1 0 2 6))
+-(defconst ecb-required-cedet-version-max '(1 0 4 9))
++(defconst ecb-required-cedet-version-max '(1 1 4 0))
+ 
+ (defvar ecb-all-requirements-available nil)
+ 
diff --git a/app-emulation/libvirt-glib/libvirt-glib-0.0.8.ebuild b/app-emulation/libvirt-glib/libvirt-glib-0.0.8.ebuild
index e0c0ae571a42..98d3c3df5a4c 100644
--- a/app-emulation/libvirt-glib/libvirt-glib-0.0.8.ebuild
+++ b/app-emulation/libvirt-glib/libvirt-glib-0.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/app-emulation/libvirt-glib/libvirt-glib-0.0.8.ebuild,v 1.1 2012/04/30 20:24:54 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt-glib/libvirt-glib-0.0.8.ebuild,v 1.2 2012/05/01 06:08:28 mr_bones_ Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -43,4 +43,3 @@ pkg_setup() {
 src_compile() {
 	emake -j1
 }
-
diff --git a/dev-embedded/bitbake/Manifest b/dev-embedded/bitbake/Manifest
index d48b08b5b244..79a9ad17020f 100644
--- a/dev-embedded/bitbake/Manifest
+++ b/dev-embedded/bitbake/Manifest
@@ -1,3 +1,4 @@
 DIST bitbake-1.10.2.tar.gz 162966 RMD160 bafe8a0fe62d56b56f99572e3df0696024349e0d SHA1 9a6e0f4b3ba388f6d8bb86139a886b1a3a95b065 SHA256 06607bb805e8d6cfd53290633fe2a2f10d9aa1bb2e057db4185a6685dc62c5e4
 DIST bitbake-1.14.0.tar.bz2 251198 RMD160 f26d63d6b4c5c912c15b06f8ab7ec13c87685720 SHA1 b9a584810aeddcaeb7c77168ef70f97115fad4f5 SHA256 7ae8c0d5ff305f73aebb200edbca6a953d766b5948f30c2a2b87bdfd6f89a38e
 DIST bitbake-1.15.1.tar.bz2 263571 RMD160 e3349ef0b4129017266aae91bbefe29e9d24976a SHA1 2f72341ef370c989d0ed72a1df3779eca804ae6b SHA256 9a967d0626fe03bc97daf83c143ee488c8e7214364de88eb41904b59f20fc3b7
+DIST bitbake-1.15.2.tar.bz2 362087 RMD160 f13ba451aa9952ce359557deb92d5b63b63f5029 SHA1 0b7f5cae4adad321b39782df8c0fce1e27a95079 SHA256 0e2fa8d6f86c72ce76ebf13c8386be5fba380487a6429a072b0e9abed6bf778e
diff --git a/dev-embedded/bitbake/bitbake-1.15.2.ebuild b/dev-embedded/bitbake/bitbake-1.15.2.ebuild
new file mode 100644
index 000000000000..95705373f715
--- /dev/null
+++ b/dev-embedded/bitbake/bitbake-1.15.2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/bitbake/bitbake-1.15.2.ebuild,v 1.1 2012/05/01 16:16:30 radhermit Exp $
+
+EAPI="4"
+PYTHON_DEPEND="2:2.5"
+
+inherit distutils
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://git.openembedded.org/bitbake.git"
+	inherit git-2
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="http://cgit.openembedded.org/cgit.cgi/${PN}/snapshot/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~ppc ~x86"
+fi
+
+DESCRIPTION="package management tool for OpenEmbedded"
+HOMEPAGE="http://developer.berlios.de/projects/bitbake/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="doc"
+
+RDEPEND="
+	|| (
+		dev-lang/python:2.7[sqlite]
+		dev-lang/python:2.6[sqlite]
+		dev-lang/python:2.5[sqlite]
+		>=dev-python/pysqlite-2.3.2
+	)
+	dev-python/ply
+	dev-python/progressbar"
+DEPEND="${RDEPEND}
+	doc? ( dev-libs/libxslt )"
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	if ! use doc ; then
+		sed -i -e 's:doctype = "html":doctype = "none":' \
+			-e 's:("share/doc/bitbake-%s/manual.*))::' setup.py || die
+		echo "none:" >> doc/manual/Makefile || die
+	else
+	    sed -i -e "s:\(share/doc/bitbake-%s.* %\) __version__:\1 \"${PV}\":" setup.py || die
+	fi
+}
diff --git a/dev-lang/v8/v8-3.8.9.19.ebuild b/dev-lang/v8/v8-3.8.9.19.ebuild
index d661f9b501a0..3e39e98c98bd 100644
--- a/dev-lang/v8/v8-3.8.9.19.ebuild
+++ b/dev-lang/v8/v8-3.8.9.19.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.19.ebuild,v 1.1 2012/05/01 03:31:26 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/v8/v8-3.8.9.19.ebuild,v 1.2 2012/05/01 09:35:12 ago 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_setup() {
diff --git a/dev-libs/libnl/Manifest b/dev-libs/libnl/Manifest
index 44e24f3ab3cc..7ddb67ca55cd 100644
--- a/dev-libs/libnl/Manifest
+++ b/dev-libs/libnl/Manifest
@@ -1,2 +1,3 @@
 DIST libnl-1.1.tar.gz 288932 RMD160 ebfc660302f31e5a94f03683f1ba85a3e057cf30 SHA1 54c7d02f93b09b43338e5cbf42f1373e83566577 SHA256 35cea4cfb6cd8af0cafa0f34fff81def5a1f193b8b8384299b4b21883e22edc3
 DIST libnl-3.2.7.tar.gz 1124758 RMD160 0919933eacf6d40e619362710cd696b305cb25e6 SHA1 a7bfc9c1d7ba798338327171f6ab8ad4b1c62e14 SHA256 1141f3229ebf65f6cee43a898d4832b8c17cb942e23adeccb365e75708a2b08e
+DIST libnl-3.2.8.tar.gz 1136866 RMD160 458b3534db028ba6714c635e084f7c3c58f7ce05 SHA1 8a896bc5952abb2ea1c4c5400ce00fff0056c097 SHA256 e8c6b8601cc1f9599a015eac7e5fa90cea64415068c8a9afdb907e0c029c29ef
diff --git a/dev-libs/libnl/libnl-3.2.8.ebuild b/dev-libs/libnl/libnl-3.2.8.ebuild
new file mode 100644
index 000000000000..dc9fab1eed0a
--- /dev/null
+++ b/dev-libs/libnl/libnl-3.2.8.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libnl/libnl-3.2.8.ebuild,v 1.1 2012/05/01 16:10:45 jer Exp $
+
+EAPI=4
+inherit eutils multilib
+
+DESCRIPTION="A library for applications dealing with netlink socket"
+HOMEPAGE="http://www.infradead.org/~tgr/libnl/"
+SRC_URI="http://www.infradead.org/~tgr/libnl/files/${P}.tar.gz"
+LICENSE="LGPL-2.1"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux"
+IUSE="static-libs utils"
+
+DEPEND="
+	sys-devel/flex
+	virtual/yacc
+"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-1.1-vlan-header.patch
+}
+
+src_configure() {
+	econf $(use_enable static-libs static) $(use_enable utils cli)
+}
+
+src_install() {
+	default
+
+	if ! use static-libs; then
+		rm -f "${D}"/usr/lib*/lib*.la
+	fi
+
+	dodoc ChangeLog
+}
diff --git a/dev-python/cvxopt/cvxopt-1.1.4-r1.ebuild b/dev-python/cvxopt/cvxopt-1.1.4-r1.ebuild
index ccad77e63089..46c031e13026 100644
--- a/dev-python/cvxopt/cvxopt-1.1.4-r1.ebuild
+++ b/dev-python/cvxopt/cvxopt-1.1.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/cvxopt/cvxopt-1.1.4-r1.ebuild,v 1.2 2012/02/23 09:00:56 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cvxopt/cvxopt-1.1.4-r1.ebuild,v 1.3 2012/05/01 10:34:56 xarthisius Exp $
 
 EAPI=4
 
@@ -36,6 +36,7 @@ S="${WORKDIR}/${P}/src"
 src_prepare(){
 	epatch "${FILESDIR}"/${PN}-setup.patch
 	rm -rf src/C/SuiteSparse*/
+	rm -rf ../doc/build # 413905
 
 	pkg_lib() {
 		local pylib=\'$(pkg-config --libs-only-l ${1} | sed \
diff --git a/dev-python/cvxopt/cvxopt-1.1.5.ebuild b/dev-python/cvxopt/cvxopt-1.1.5.ebuild
index 70dec66484a7..3fc4fcde8bca 100644
--- a/dev-python/cvxopt/cvxopt-1.1.5.ebuild
+++ b/dev-python/cvxopt/cvxopt-1.1.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/cvxopt/cvxopt-1.1.5.ebuild,v 1.1 2012/04/19 20:56:11 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cvxopt/cvxopt-1.1.5.ebuild,v 1.2 2012/05/01 10:34:56 xarthisius Exp $
 
 EAPI=4
 
@@ -36,6 +36,7 @@ S="${WORKDIR}/${P}/src"
 src_prepare(){
 	epatch "${FILESDIR}"/${P}-setup.patch
 	rm -rf src/C/SuiteSparse*/
+	rm -rf ../doc/build # 413905
 
 	pkg_lib() {
 		local pylib=\'$(pkg-config --libs-only-l ${1} | sed \
diff --git a/dev-python/jinja/Manifest b/dev-python/jinja/Manifest
index 9b573ec68d61..89aeb6d1dff3 100644
--- a/dev-python/jinja/Manifest
+++ b/dev-python/jinja/Manifest
@@ -1,2 +1 @@
-DIST Jinja2-2.5.5.tar.gz 438586 RMD160 dd11840c285e05ff53d6b18f5d92c093fa6b23ca SHA1 a983513cdc4c371007323cc2288f9add32e76f65 SHA256 22f9675e42dc640c4469d4f7d210baecb5e695823af954c813d51c930235675d
 DIST Jinja2-2.6.tar.gz 389741 RMD160 77829eabfc71dd6cf7eece1fe5d0b96b21de3b18 SHA1 f122aeb324b2009bbcee341d0f001a047ac4bbe5 SHA256 a85e185375db75c109f99ecde3d55415f035e7068a82252cf4f16c667ac38f49
diff --git a/dev-python/jinja/jinja-2.5.5.ebuild b/dev-python/jinja/jinja-2.5.5.ebuild
deleted file mode 100644
index 2d0f0fa1f8e8..000000000000
--- a/dev-python/jinja/jinja-2.5.5.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/jinja/jinja-2.5.5.ebuild,v 1.12 2012/02/21 04:11:11 patrick Exp $
-
-EAPI="3"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.7-pypy-*"
-DISTUTILS_SRC_TEST="setup.py"
-
-inherit distutils
-
-MY_PN="Jinja2"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A small but fast and easy to use stand-alone template engine written in pure python."
-HOMEPAGE="http://jinja.pocoo.org/ http://pypi.python.org/pypi/Jinja2"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
-IUSE="doc examples i18n vim-syntax"
-
-RDEPEND="dev-python/markupsafe
-	dev-python/setuptools
-	i18n? ( >=dev-python/Babel-0.9.3 )"
-DEPEND="${RDEPEND}
-	doc? ( >=dev-python/sphinx-0.6 )"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS="CHANGES"
-PYTHON_MODNAME="jinja2"
-
-set_global_options() {
-	if [[ "$(python_get_implementation)" != "Jython" ]]; then
-		DISTUTILS_GLOBAL_OPTIONS=("--with-debugsupport")
-	else
-		DISTUTILS_GLOBAL_OPTIONS=()
-	fi
-}
-
-distutils_src_compile_pre_hook() {
-	set_global_options
-}
-
-src_compile(){
-	distutils_src_compile
-
-	if use doc; then
-		einfo "Generation of documentation"
-		cd docs
-		PYTHONPATH=".." emake html || die "Building of documentation failed"
-	fi
-}
-
-distutils_src_test_pre_hook() {
-	set_global_options
-}
-
-distutils_src_install_pre_hook() {
-	set_global_options
-}
-
-src_install(){
-	distutils_src_install
-	python_clean_installation_image
-
-	if use doc; then
-		dohtml -r docs/_build/html/* || die "Installation of documentation failed"
-	fi
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples || die "Installation of examples failed"
-	fi
-
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins ext/Vim/* || die "Installation of Vim syntax files failed"
-	fi
-}
diff --git a/dev-python/jinja/jinja-2.6.ebuild b/dev-python/jinja/jinja-2.6.ebuild
index 93da37ea6f84..73d8c00b664b 100644
--- a/dev-python/jinja/jinja-2.6.ebuild
+++ b/dev-python/jinja/jinja-2.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/jinja/jinja-2.6.ebuild,v 1.12 2012/03/10 17:48:40 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/jinja/jinja-2.6.ebuild,v 1.13 2012/05/01 08:35:11 xarthisius Exp $
 
 EAPI=4
 
@@ -9,8 +9,8 @@ DISTUTILS_SRC_TEST="setup.py"
 
 inherit distutils
 
-MY_PN="Jinja2"
-MY_P="${MY_PN}-${PV}"
+MY_PN=Jinja2
+MY_P=${MY_PN}-${PV}
 
 DESCRIPTION="A small but fast and easy to use stand-alone template engine written in pure python."
 HOMEPAGE="http://jinja.pocoo.org/ http://pypi.python.org/pypi/Jinja2"
@@ -27,7 +27,7 @@ RDEPEND="dev-python/markupsafe
 DEPEND="${RDEPEND}
 	doc? ( >=dev-python/sphinx-0.6 )"
 
-S="${WORKDIR}/${MY_P}"
+S=${WORKDIR}/${MY_P}
 
 DOCS="CHANGES"
 PYTHON_MODNAME="jinja2"
@@ -40,7 +40,11 @@ src_compile(){
 	if use doc; then
 		einfo "Generation of documentation"
 		pushd docs > /dev/null
-		PYTHONPATH=".." emake html
+		if [[ "$(python_get_version -f -l --major)" == "3" ]]; then
+			# https://github.com/mitsuhiko/jinja2/issues/115
+			2to3-$(PYTHON -f --ABI) -nw --no-diffs jinjaext.py || die
+		fi
+		PYTHONPATH="$(ls -d ../build-$(PYTHON -f --ABI)/lib*)" emake html
 		popd > /dev/null
 	fi
 }
diff --git a/dev-python/sphinx/sphinx-1.1.3-r2.ebuild b/dev-python/sphinx/sphinx-1.1.3-r2.ebuild
index 31b100595567..2692f2b6cd0e 100644
--- a/dev-python/sphinx/sphinx-1.1.3-r2.ebuild
+++ b/dev-python/sphinx/sphinx-1.1.3-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sphinx/sphinx-1.1.3-r2.ebuild,v 1.2 2012/04/03 15:26:24 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sphinx/sphinx-1.1.3-r2.ebuild,v 1.3 2012/05/01 12:00:37 xarthisius Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2"
@@ -26,7 +26,10 @@ DEPEND=">=dev-python/docutils-0.7
 	>=dev-python/jinja-2.3
 	>=dev-python/pygments-1.2
 	dev-python/setuptools
-	latex? ( dev-texlive/texlive-latexextra )"
+	latex? (
+		dev-texlive/texlive-latexextra
+		app-text/dvipng
+	)"
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/dev-util/valgrind/files/valgrind-3.7.0-non-exec-darwin.patch b/dev-util/valgrind/files/valgrind-3.7.0-non-exec-darwin.patch
new file mode 100644
index 000000000000..19e7cac0704c
--- /dev/null
+++ b/dev-util/valgrind/files/valgrind-3.7.0-non-exec-darwin.patch
@@ -0,0 +1,31 @@
+--- files/valgrind-3.7.0-non-exec-stack.patch.orig	2011-11-11 02:40:06.000000000 +0100
++++ files/valgrind-3.7.0-non-exec-stack.patch	2012-03-23 20:11:36.000000000 +0100
+@@ -40,7 +40,7 @@
+  	m_syswrap/syswrap-main.c \
+  	m_syswrap/syswrap-generic.c \
+  	m_syswrap/syswrap-linux.c \
+-@@ -361,6 +343,24 @@
++@@ -361,6 +343,29 @@
+  	m_ume/main.c \
+  	m_ume/script.c
+  
+@@ -56,11 +56,16 @@
+ +
+ +if VGCONF_OS_IS_DARWIN
+ +COREGRIND_SOURCES_COMMON += \
+-+	m_start-@VGCONF_ARCH_PRI@-darwin.S \
+-+	m_start-@VGCONF_ARCH_SEC@-darwin.S \
+-+	m_mach/mach_traps-@VGCONF_ARCH_PRI@-darwin.S \
+++	m_dispatch/dispatch-@VGCONF_ARCH_PRI@-darwin.S \
+++	m_syswrap/syscall-@VGCONF_ARCH_PRI@-darwin.S \
+++	m_mach/mach_traps-@VGCONF_ARCH_PRI@-darwin.S
+++if VGCONF_HAVE_PLATFORM_SEC
+++COREGRIND_SOURCES_COMMON += \
+++	m_dispatch/dispatch-@VGCONF_ARCH_SEC@-darwin.S \
+++	m_syswrap/syscall-@VGCONF_ARCH_SEC@-darwin.S \
+ +	m_mach/mach_traps-@VGCONF_ARCH_SEC@-darwin.S
+ +endif
+++endif
+ +
+  libcoregrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_a_SOURCES = \
+      $(COREGRIND_SOURCES_COMMON)
diff --git a/dev-util/valgrind/valgrind-3.7.0-r4.ebuild b/dev-util/valgrind/valgrind-3.7.0-r4.ebuild
new file mode 100644
index 000000000000..2a5d0792ac75
--- /dev/null
+++ b/dev-util/valgrind/valgrind-3.7.0-r4.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/valgrind-3.7.0-r4.ebuild,v 1.1 2012/05/01 13:03:29 blueness Exp $
+
+EAPI="4"
+inherit autotools eutils flag-o-matic toolchain-funcs multilib pax-utils
+
+DESCRIPTION="An open-source memory debugger for GNU/Linux"
+HOMEPAGE="http://www.valgrind.org"
+SRC_URI="http://www.valgrind.org/downloads/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x64-macos"
+IUSE="mpi"
+
+DEPEND="mpi? ( virtual/mpi )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	# Correct hard coded doc location
+	sed -i -e "s:doc/valgrind:doc/${PF}:" docs/Makefile.am || die
+
+	# Don't force multiarch stuff on OSX, bug #306467
+	sed -i -e 's:-arch \(i386\|x86_64\)::g' Makefile.all.am || die
+
+	# Respect CFLAGS, LDFLAGS
+	epatch "${FILESDIR}"/${PN}-3.7.0-respect-flags.patch
+
+	# Changing Makefile.all.am to disable SSP
+	epatch "${FILESDIR}"/${PN}-3.7.0-fno-stack-protector.patch
+
+	# Yet more local labels, this time for ppc32 & ppc64
+	epatch "${FILESDIR}"/${PN}-3.6.0-local-labels.patch
+
+	# Don't build in empty assembly files for other platforms or we'll get a QA
+	# warning about executable stacks.
+	epatch "${FILESDIR}"/${PN}-3.7.0-non-exec-stack.patch
+
+	# Fix the regex to get gcc's version
+	epatch "${FILESDIR}"/${PN}-3.7.0-fix-gcc-regex.patch
+
+	# Fix stricter use of dir variables, bug #397429
+	epatch "${FILESDIR}"/${PN}-3.7.0-automake-1.11.2.patch
+
+	# Fix for glibc 2.15, bug #398921
+	epatch "${FILESDIR}"/${PN}-3.7.0-glibc-2.15.patch
+
+	# Regenerate autotools files
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+
+	# -fomit-frame-pointer	"Assembler messages: Error: junk `8' after expression"
+	#                       while compiling insn_sse.c in none/tests/x86
+	# -fpie                 valgrind seemingly hangs when built with pie on
+	#                       amd64 (bug #102157)
+	# -fstack-protector     more undefined references to __guard and __stack_smash_handler
+	#                       because valgrind doesn't link to glibc (bug #114347)
+	# -m64 -mx32			for multilib-portage, bug #398825
+	# -ggdb3                segmentation fault on startup
+	filter-flags -fomit-frame-pointer
+	filter-flags -fpie
+	filter-flags -fstack-protector
+	filter-flags -m64 -mx32
+	replace-flags -ggdb3 -ggdb2
+
+	if use amd64 || use ppc64; then
+		! has_multilib_profile && myconf="${myconf} --enable-only64bit"
+	fi
+
+	# Force bitness on darwin, bug #306467
+	use x86-macos && myconf="${myconf} --enable-only32bit"
+	use x64-macos && myconf="${myconf} --enable-only64bit"
+
+	# Don't use mpicc unless the user asked for it (bug #258832)
+	if ! use mpi; then
+		myconf="${myconf} --without-mpicc"
+	fi
+
+	econf ${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${ED}" install
+	dodoc AUTHORS FAQ.txt NEWS README*
+
+	pax-mark m "${ED}"/usr/$(get_libdir)/valgrind/*-*-linux
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# fix install_names on shared libraries, can't turn them into bundles,
+		# as dyld won't load them any more then, bug #306467
+		local l
+		for l in "${ED}"/usr/lib/valgrind/*.so ; do
+			install_name_tool -id "${EPREFIX}"/usr/lib/valgrind/${l##*/} "${l}"
+		done
+	fi
+}
+
+pkg_postinst() {
+	ewarn "Valgrind will not work if glibc does not have debug symbols."
+	ewarn "To fix this you can add splitdebug to FEATURES in make.conf"
+	ewarn "and remerge glibc.  See:"
+	ewarn "https://bugs.gentoo.org/show_bug.cgi?id=214065"
+	ewarn "https://bugs.gentoo.org/show_bug.cgi?id=274771"
+	ewarn "https://bugs.gentoo.org/show_bug.cgi?id=388703"
+}
diff --git a/dev-util/visualvm/visualvm-1.3.3-r2.ebuild b/dev-util/visualvm/visualvm-1.3.3-r2.ebuild
new file mode 100644
index 000000000000..5b3542c3c696
--- /dev/null
+++ b/dev-util/visualvm/visualvm-1.3.3-r2.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/visualvm/visualvm-1.3.3-r2.ebuild,v 1.1 2012/05/01 09:01:07 sera Exp $
+
+EAPI="4"
+
+inherit eutils autotools
+
+VISUALVM_PKG="visualvm_harness-1.3"
+VISUALVM_TARBALL="visualvm_133-src.tar.gz"
+NETBEANS_PROFILER_TARBALL="netbeans-profiler-visualvm_release701.tar.gz"
+
+DESCRIPTION="Integrates commandline JDK tools and profiling capabilites."
+HOMEPAGE="http://icedtea.classpath.org"
+SRC_URI="
+	http://icedtea.classpath.org/download/visualvm/${VISUALVM_PKG}.tar.gz
+	http://icedtea.classpath.org/download/visualvm/${VISUALVM_TARBALL}
+	http://icedtea.classpath.org/download/visualvm/${NETBEANS_PROFILER_TARBALL}"
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="6"
+KEYWORDS="~amd64"
+IUSE=""
+
+COMMON_DEP="
+	dev-java/icedtea:${SLOT}
+	dev-java/netbeans-harness:7.1
+	dev-java/netbeans-platform:7.1"
+RDEPEND="${COMMON_DEP}"
+DEPEND="${COMMON_DEP}
+	dev-java/ant-core
+	dev-java/ant-nodeps"
+
+S="${WORKDIR}/${VISUALVM_PKG}"
+
+src_unpack() {
+	unpack ${VISUALVM_PKG}.tar.gz
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/netbeans-platform-version.patch
+	eautoreconf
+
+	unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
+
+	export ANT_RESPECT_JAVA_HOME=TRUE
+	export ANT_TASKS=ant-nodeps
+}
+
+src_configure() {
+	local vmhome
+	vmhome=$(get_vmhome) || die
+
+	econf NB_PLATFORM=platform \
+		--bindir="${vmhome}"/bin \
+		--libdir="${vmhome}"/lib \
+		--sysconfdir="${vmhome}"/lib/visualvm/etc \
+		--with-netbeans-profiler-zip="${DISTDIR}"/${NETBEANS_PROFILER_TARBALL} \
+		--with-visualvm-zip="${DISTDIR}"/${VISUALVM_TARBALL} \
+		--with-visualvm-version=${PV} \
+		--with-netbeans-home="${EPREFIX}"/usr/share/netbeans-nb-7.1 \
+		--with-jdk-home="${vmhome}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	# Don't install default .desktop, file collision.
+	local vmhome
+	vmhome=$(get_vmhome) || die
+	rm -r "${ED}"/usr/share || die
+	make_desktop_entry "${vmhome}/bin/jvisualvm" "OpenJDK ${SLOT} VisualVM" "java" "Development;Java;"
+}
+
+get_vmhome() {
+	local vmhandle=icedtea-${SLOT}
+	has_version "<=dev-java/icedtea-6.1.10.4:6" && vmhandle=icedtea6
+
+	local vmhome
+	vmhome="$(GENTOO_VM=${vmhandle} java-config -O)" || return 1
+
+	echo "${vmhome}"
+}
diff --git a/dev-util/visualvm/visualvm-1.3.3-r9.ebuild b/dev-util/visualvm/visualvm-1.3.3-r9.ebuild
new file mode 100644
index 000000000000..0e71dbd5444f
--- /dev/null
+++ b/dev-util/visualvm/visualvm-1.3.3-r9.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/visualvm/visualvm-1.3.3-r9.ebuild,v 1.1 2012/05/01 09:01:07 sera Exp $
+
+EAPI="4"
+
+inherit eutils autotools
+
+VISUALVM_PKG="visualvm_harness-1.3"
+VISUALVM_TARBALL="visualvm_133-src.tar.gz"
+NETBEANS_PROFILER_TARBALL="netbeans-profiler-visualvm_release701.tar.gz"
+
+DESCRIPTION="Integrates commandline JDK tools and profiling capabilites."
+HOMEPAGE="http://icedtea.classpath.org"
+SRC_URI="
+	http://icedtea.classpath.org/download/visualvm/${VISUALVM_PKG}.tar.gz
+	http://icedtea.classpath.org/download/visualvm/${VISUALVM_TARBALL}
+	http://icedtea.classpath.org/download/visualvm/${NETBEANS_PROFILER_TARBALL}"
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="7"
+KEYWORDS="~amd64"
+IUSE=""
+
+COMMON_DEP="
+	dev-java/icedtea:${SLOT}
+	dev-java/netbeans-harness:7.1
+	dev-java/netbeans-platform:7.1"
+RDEPEND="${COMMON_DEP}"
+DEPEND="${COMMON_DEP}
+	dev-java/ant-core
+	dev-java/ant-nodeps"
+
+S="${WORKDIR}/${VISUALVM_PKG}"
+
+src_unpack() {
+	unpack ${VISUALVM_PKG}.tar.gz
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/netbeans-platform-version.patch
+	eautoreconf
+
+	unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
+
+	export ANT_RESPECT_JAVA_HOME=TRUE
+	export ANT_TASKS=ant-nodeps
+}
+
+src_configure() {
+	local vmhome
+	vmhome=$(get_vmhome) || die
+
+	econf NB_PLATFORM=platform \
+		--bindir="${vmhome}"/bin \
+		--libdir="${vmhome}"/lib \
+		--sysconfdir="${vmhome}"/lib/visualvm/etc \
+		--with-netbeans-profiler-zip="${DISTDIR}"/${NETBEANS_PROFILER_TARBALL} \
+		--with-visualvm-zip="${DISTDIR}"/${VISUALVM_TARBALL} \
+		--with-visualvm-version=${PV} \
+		--with-netbeans-home="${EPREFIX}"/usr/share/netbeans-nb-7.1 \
+		--with-jdk-home="${vmhome}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	# Don't install default .desktop, file collision.
+	local vmhome
+	vmhome=$(get_vmhome) || die
+	rm -r "${ED}"/usr/share || die
+	make_desktop_entry "${vmhome}/bin/jvisualvm" "OpenJDK ${SLOT} VisualVM" "java" "Development;Java;"
+}
+
+get_vmhome() {
+	local vmhandle=icedtea-${SLOT}
+	has_version "<=dev-java/icedtea-6.1.10.4:6" && vmhandle=icedtea6
+
+	local vmhome
+	vmhome="$(GENTOO_VM=${vmhandle} java-config -O)" || return 1
+
+	echo "${vmhome}"
+}
diff --git a/games-strategy/ufo-ai/Manifest b/games-strategy/ufo-ai/Manifest
index a039a980e659..522bae737419 100644
--- a/games-strategy/ufo-ai/Manifest
+++ b/games-strategy/ufo-ai/Manifest
@@ -1,3 +1,5 @@
 DIST 1maps.pk3 242016 RMD160 45709c9a28493bc37488c0f960d9b73ceb7f3534 SHA1 b18baa412a1c372dd8b78b525a09d886a61b11c3 SHA256 8cdb8c231c0ba98900d97012b62c5cef72ab5710fe3f087e534496a66f7b0e4e
 DIST ufoai-2.3.1-data.tar 533196800 RMD160 30ba39315718bccd13ffc56e49719a04b3bbd806 SHA1 a322c3bb92b29a0265567e84b1d3287078cfae91 SHA256 79b302351d22ea55e1d5c2fceed757a518908673c12ac3e7972f541f68c2a9ad
 DIST ufoai-2.3.1-source.tar.bz2 9847575 RMD160 77a1499962ec69c138ccb03f54187f87e0429a68 SHA1 f339e9399eae6ef4661ad8b9d4f68205904810d3 SHA256 6f9fbe69c91843b48fc29efa3a3584aa2659b78be1a6a00d5868c5d77fec69d1
+DIST ufoai-2.4-data.tar 937062400 RMD160 a7cba9b2cf89d20cbacf0680b4927520245af0af SHA1 2998c979ee597a1473c3277f8db14821e907999f SHA256 6bb322fc0362781d07439799de32c677884cef7c96fcf17dd87c62cc108030b7
+DIST ufoai-2.4-source.tar.bz2 16875353 RMD160 93c9405a291db48a7767b41c37be29e028111963 SHA1 153ba796131f00fe98f96e56888376afee039aa5 SHA256 254a61b770f141374d57e5c2589048be9298d0a920e914c6e72c2b98255bb94f
diff --git a/games-strategy/ufo-ai/files/ufo-ai-2.4-locale.patch b/games-strategy/ufo-ai/files/ufo-ai-2.4-locale.patch
new file mode 100644
index 000000000000..632e0d4fdc0d
--- /dev/null
+++ b/games-strategy/ufo-ai/files/ufo-ai-2.4-locale.patch
@@ -0,0 +1,15 @@
+diff -urN ufoai-2.4-source.old//src/client/cl_main.c ufoai-2.4-source/src/client/cl_main.c
+--- ufoai-2.4-source.old//src/client/cl_main.c	2012-05-01 10:59:51.720868619 +0200
++++ ufoai-2.4-source/src/client/cl_main.c	2012-05-01 11:00:57.235869759 +0200
+@@ -1180,7 +1180,11 @@
+ 	if (fs_i18ndir->string[0] != '\0')
+ 		Q_strncpyz(languagePath, fs_i18ndir->string, sizeof(languagePath));
+ 	else
++#ifdef LOCALEDIR
++		Q_strncpyz(languagePath, LOCALEDIR, sizeof(languagePath));
++#else
+ 		Com_sprintf(languagePath, sizeof(languagePath), "%s/"BASEDIRNAME"/i18n/", FS_GetCwd());
++#endif
+ 	Com_DPrintf(DEBUG_CLIENT, "...using mo files from %s\n", languagePath);
+ 	bindtextdomain(TEXT_DOMAIN, languagePath);
+ 	bind_textdomain_codeset(TEXT_DOMAIN, "UTF-8");
diff --git a/games-strategy/ufo-ai/ufo-ai-2.4.ebuild b/games-strategy/ufo-ai/ufo-ai-2.4.ebuild
new file mode 100644
index 000000000000..559a390cacbc
--- /dev/null
+++ b/games-strategy/ufo-ai/ufo-ai-2.4.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/ufo-ai/ufo-ai-2.4.ebuild,v 1.1 2012/05/01 09:10:28 scarabeus Exp $
+
+EAPI=3
+
+inherit eutils flag-o-matic games
+
+MY_P=${P/o-a/oa}
+
+DESCRIPTION="UFO: Alien Invasion - X-COM inspired strategy game"
+HOMEPAGE="http://ufoai.sourceforge.net/"
+SRC_URI="mirror://sourceforge/ufoai/${MY_P}-source.tar.bz2
+	mirror://sourceforge/ufoai/${MY_P}-data.tar
+	http://mattn.ninex.info/1maps.pk3"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug dedicated editor"
+
+# Dependencies and more instructions can be found here:
+# http://ufoai.ninex.info/wiki/index.php/Compile_for_Linux
+RDEPEND="!dedicated? (
+		virtual/opengl
+		virtual/glu
+		media-libs/libsdl
+		media-libs/sdl-image[jpeg,png]
+		media-libs/sdl-ttf
+		media-libs/sdl-mixer
+		virtual/jpeg
+		media-libs/libpng:0
+		media-libs/libogg
+		media-libs/libvorbis
+		x11-proto/xf86vidmodeproto
+	)
+	net-misc/curl
+	sys-devel/gettext
+	sys-libs/zlib
+	editor? (
+		dev-libs/libxml2
+		virtual/jpeg
+		media-libs/openal
+		x11-libs/gtkglext
+		x11-libs/gtksourceview:2.0
+	)"
+
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}-source
+
+src_prepare() {
+	has_version '>=sys-libs/zlib-1.2.5.1-r1' && sed -i \
+		-e '1i#define OF(x) x' src/common/ioapi.h
+
+	epatch "${FILESDIR}"/${P}-locale.patch
+
+	cp "${DISTDIR}"/1maps.pk3 "${WORKDIR}"/base/ || die
+	mv "${WORKDIR}"/base/ "${S}"/ || die
+}
+
+src_configure() {
+	local myconf
+	# they are special and provide hand batched configure file
+	myconf="
+		--disable-dependency-tracking
+		$(use_enable !debug release)
+		$(use_enable editor ufo2map)
+		$(use_enable editor uforadiant)
+		--enable-ufoded
+		--bindir="${GAMES_BINDIR}"
+		--libdir="$(games_get_libdir)"
+		--datadir="${GAMES_DATADIR}/${PN/-}"
+		--localedir="${EPREFIX}/usr/share/locale/"
+		--prefix="${GAMES_PREFIX}"
+	"
+	echo "./configure ${myconf}"
+	./configure ${myconf} || die
+}
+
+src_compile() {
+	emake || die
+	emake lang || die
+
+	if use editor; then
+		emake uforadiant || die
+	fi
+}
+
+src_install() {
+	newicon src/ports/linux/ufo.png ${PN}.png || die
+	dobin ufoded || die
+	make_desktop_entry ufoded "UFO: Alien Invasion Server" ${PN}
+	if ! use dedicated; then
+		dobin ufo || die
+		make_desktop_entry ufo "UFO: Alien Invasion" ${PN}
+	fi
+
+	if use editor; then
+		dobin ufo2map ufomodel || die
+	fi
+
+	# install data
+	insinto "${GAMES_DATADIR}"/${PN/-}
+	doins -r base || die
+	rm -rf "${ED}/${GAMES_DATADIR}/${PN/-}/base/game.so"
+	dogameslib base/game.so
+
+	# move translations where they belong
+	dodir "${GAMES_DATADIR_BASE}/locale" || die
+	mv "${ED}/${GAMES_DATADIR}/${PN/-}/base/i18n/"* \
+		"${ED}/${GAMES_DATADIR_BASE}/locale/" || die
+	rm -rf "${ED}/${GAMES_DATADIR}/${PN/-}/base/i18n/" || die
+
+	prepgamesdirs
+}
diff --git a/licenses/yEd-1.1 b/licenses/yEd-1.1
deleted file mode 100644
index a6cce1ebd4fa..000000000000
--- a/licenses/yEd-1.1
+++ /dev/null
@@ -1,66 +0,0 @@
-yEd Software License Agreement
-Version 1.1
-
-This is a legal agreement ("this Agreement") between yWorks GmbH ("yWorks") and the licensee ("the Licensee"). yWorks licenses the yEd Software ("the Software") only if all the following terms are accepted by the Licensee. The Software includes the yEd byte code executable and any files and documents associated with it.
-
-By installing the Software, the Licensee is indicating that he/she has read and understands this Agreement and agrees to be bound by its terms and conditions. If this Agreement is unacceptable to the Licensee, the Licensee must destroy any copies of the Software in the Licensee's possession immediately.
-
-1. LICENSE CONDITIONS
-
-The Licensee is granted a non-exclusive and non-transferable right to install one copy of the Software and use it as an application. The Software may not be used as part of an automated process. The Licensee may not reverse engineer, disassemble, decompile, or unjar the Software, or otherwise attempt to derive the source code of the Software.
-
-The Licensee acknowledges that Software furnished hereunder is under test and may be defective. No claims whatsoever can be made on yWorks based on any expectation about the Software.
-
-2. TERM, TERMINATION AND SURVIVAL
-
-The Licensee may terminate this Agreement at any time by destroying all copies of the Software in possession.
-
-If the Licensee fails to comply with any term of this Agreement, this Agreement is terminated and the Licensee has no further right to use the Software.
-
-On termination, the Licensee shall have no claim on or arising from the Software. The Software and any copies shall be destroyed.
-
-3. NO WARRANTY
-
-The Software is licensed to the Licensee on an "AS IS" basis. The Licensee is solely responsible for determining the suitability of the Software and accepts full responsibility and risks associated with the use of the Software.
-
-4. MAINTENANCE AND SUPPORT
-
-yWorks is not required to provide maintenance or support to the Licensee.
-
-5. LIMITATION OF LIABILITY
-
-In no event will yWorks be liable for any damages, including but not limited to any loss of revenue, profit, or data, however caused, directly or indirectly, by the Software or by this Agreement.
-
-6. DISTRIBUTION
-
-No distribution is to be made of the Software by the Licensee. The Licensee may make one copy of the Software for backup purpose only.
-
-7. AVAILABILITY
-
-The Software is not available to those not permitted by law to have access to the Software.
-
-8. INSERTION OF MARKER
-
-The Software may insert some markers into any output files to identify that the files are generated by the Software. yWorks bears no responsibility for any damages arising.
-
-9. MISCELLANEOUS
-
-This agreement is made and shall be construed in accordance with the laws of Germany.
-
-THIRD-PARTY SOFTWARE AND LICENSES
-
-This Software makes use of the Batik SVG Toolkit, Apache XMLBeans, and Apache POI. The Apache Software License (http://xml.apache.org/batik) applies to them.
-
-This Software makes use of the JIDE Docking Framework and JIDE Action Framework licensed from JIDE Software (http://www.jidesoft.com).
-
-This Software uses icons licensed from Incors GmbH (http://www.incors.com).
-
-This Software includes a Swing LnF created by JGoodies and the dom4j library. The BSD License (http://www.opensource.org/licenses/bsd-license.html) applies to them.
-
-This Software makes use of the FreeHEP VectorGraphics library (http://java.freehep.org). The GNU LESSER GENERAL PUBLIC LICENSE, Version 2.1 (http://java.freehep.org/vectorgraphics/license.html) applies to it.
-
-This Software makes use of the JavaHelp System (https://javahelp.dev.java.net/). The GNU General Public License - Version 2 (https://javahelp.dev.java.net/license.txt) with the class path exception applies to it.
-
-This Software makes use of the svg-viewer rendering engine (http://code.google.com/p/svg-viewer/). The MIT License (http://www.opensource.org/licenses/mit-license.php) applies to it.
-
-The installer for this Software may contain a Java Runtime Environment (JRE) (http://java.com). The SUN MICROSYSTEMS, INC. BINARY CODE LICENSE AGREEMENT with SUPPLEMENTAL LICENSE TERMS (http://java.com/en/download/license.jsp) applies to it. 
diff --git a/media-gfx/pinta/Manifest b/media-gfx/pinta/Manifest
new file mode 100644
index 000000000000..12dd5b7bc275
--- /dev/null
+++ b/media-gfx/pinta/Manifest
@@ -0,0 +1 @@
+DIST pinta-1.3.tar.gz 1131567 RMD160 d94d07474601275e0a02a9da40264dc760e534d6 SHA1 2a686c4b438956af3c87b8401ce1684072508101 SHA256 514103d11c6fe8de5f09c45de77d5c8c5403d13198fd7716930abb08e9d0b5a2
diff --git a/media-gfx/pinta/metadata.xml b/media-gfx/pinta/metadata.xml
new file mode 100644
index 000000000000..244288f0d629
--- /dev/null
+++ b/media-gfx/pinta/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>hasufell@gentoo.org</email>
+		<name>Julian Ospald</name>
+	</maintainer>
+	<upstream>
+		<maintainer status="active">
+			<email>cameronwhite91@gmail.com</email>
+		</maintainer>
+		<changelog>https://github.com/PintaProject/Pinta/commits/1.3</changelog>
+		<doc lang="en">http://pinta-project.com/HowTo.ashx</doc>
+		<bugs-to>https://bugs.launchpad.net/pinta/+filebug</bugs-to>
+	</upstream>
+	<longdescription lang="en">
+		Pinta is a free, open source drawing/editing program modeled after 
+		Paint.NET. Its goal is to provide users with a simple yet powerful
+		way to draw and manipulate images on Linux, Mac, and Windows.
+	</longdescription>
+</pkgmetadata>
diff --git a/media-gfx/pinta/pinta-1.3.ebuild b/media-gfx/pinta/pinta-1.3.ebuild
new file mode 100644
index 000000000000..b95b680e5b58
--- /dev/null
+++ b/media-gfx/pinta/pinta-1.3.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/pinta/pinta-1.3.ebuild,v 1.1 2012/05/01 14:44:57 hasufell Exp $
+
+EAPI=4
+
+inherit fdo-mime multilib mono
+
+DESCRIPTION="Simple Painting for Gtk"
+HOMEPAGE="http://pinta-project.com"
+SRC_URI="mirror://github/PintaProject/Pinta/${P}.tar.gz"
+
+LICENSE="MIT CCPL-Attribution-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="jpeg tiff"
+
+COMMON_DEPEND="dev-dotnet/atk-sharp:2
+	dev-dotnet/gdk-sharp:2
+	dev-dotnet/glib-sharp:2
+	dev-dotnet/gtk-sharp:2
+	dev-dotnet/mono-addins[gtk]
+	dev-dotnet/pango-sharp:2
+	dev-lang/mono"
+RDEPEND="${COMMON_DEPEND}
+	x11-libs/cairo[X]
+	x11-libs/gdk-pixbuf[X,jpeg=,tiff=]
+	x11-themes/gnome-icon-theme"
+DEPEND="${COMMON_DEPEND}
+	dev-util/intltool
+	dev-util/pkgconfig
+	sys-devel/gettext"
+
+src_prepare() {
+	sed \
+		-e "s/lib/$(get_libdir)/" \
+		-i pinta.in || die
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
diff --git a/media-gfx/rawtherapee/Manifest b/media-gfx/rawtherapee/Manifest
index 1682bbe89791..cb73e564d23d 100644
--- a/media-gfx/rawtherapee/Manifest
+++ b/media-gfx/rawtherapee/Manifest
@@ -1,3 +1,2 @@
-DIST rawtherapee-4.0.4.tar.xz 25302652 RMD160 75fbc1d002f08f070a2a4e12eabb6b649973be42 SHA1 8cc540291a387010f62888414c131924420684c7 SHA256 498be81967d115197c1b9882624828723b29a6bae2d2d428bf7d9c6fdb21b361
-DIST rawtherapee-4.0.5.tar.xz 38119752 RMD160 ccaad4a257ccf912cd32da70e46b10536b102c74 SHA1 0823e03bb64dc3fe9783afd5e52fa51ff9dc86ba SHA256 cf22a1693e80d9f893849114908a28fb1ea295d628ff48da769fc8a26e06cf6f
 DIST rawtherapee-4.0.6.tar.xz 35391836 RMD160 10a3d9d6abbc29d0298cca7c85cfd8e3f2501a6c SHA1 e2ef0315c4b2516bb6ec442af816b94aec1723f4 SHA256 cdafe77ce4fbef28820f28c20c78bbbd837a14bb7115c8db0c8b1621505b3d36
+DIST rawtherapee-4.0.8.tar.xz 40766264 RMD160 7da0fe7ef6ae09098164933cc2635936799bbf9c SHA1 dd357ae323ef41e8f5c3a606f6d48049e0eed3a2 SHA256 b0cbeac634d927b6afc0527434b24304b9d1ab2a681915933a872cf1a27f39cd
diff --git a/media-gfx/rawtherapee/files/rawtherapee-4.0.8-nohg.patch b/media-gfx/rawtherapee/files/rawtherapee-4.0.8-nohg.patch
new file mode 100644
index 000000000000..95e2d3c94046
--- /dev/null
+++ b/media-gfx/rawtherapee/files/rawtherapee-4.0.8-nohg.patch
@@ -0,0 +1,62 @@
+--- rawtherapee-4.0.8/CMakeLists.txt
++++ rawtherapee-4.0.8/CMakeLists.txt
+@@ -255,36 +255,8 @@
+     find_file(HG_CMD hg PATHS "/opt/local/bin" "/usr/local/bin" "/usr/bin")
+     find_file(HG_CMD hg)
+ 
+-  else (WIN32)
+- 
+-    add_custom_target (AboutFile ALL
+-      COMMAND ${CMAKE_COMMAND}
+-              -DSRC_DIR:STRING=${CMAKE_CURRENT_SOURCE_DIR}
+-              -DCACHE_NAME_SUFFIX:STRING=${CACHE_NAME_SUFFIX}
+-              -DSYSTEM:STRING=Linux
+-              -DPROC_LABEL:STRING=\"${PROC_LABEL}\"
+-              -DPROC_BIT_DEPTH:STRING=\"${PROC_BIT_DEPTH}\"
+-              -DBUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
+-              -DGTKMM_VERSION:STRING=${GTKMM_VERSION}
+-              -DCXX_FLAGS:STRING=${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_${UPPER_CMAKE_BUILD_TYPE}}
+-              -DLFLAGS:STRING=${CMAKE_EXE_LINKER_FLAGS} ${CMAKE_EXE_LINKER_FLAGS_${UPPER_CMAKE_BUILD_TYPE}}
+-              -DOPTION_OMP:STRING=${OPTION_OMP}
+-              -DWITH_MYFILE_MMAP:STRING=${WITH_MYFILE_MMAP}
+-              -P ${CMAKE_CURRENT_SOURCE_DIR}/About-Linux.cmake
+-      COMMENT "Creating the about file"
+-    )
+-    find_file(HG_CMD hg)
+-
+   endif (WIN32)
+  
+-  add_dependencies(AboutFile Debug Release MinSizeRel RelWithDebInfo)
+-
+-  if (HG_CMD STREQUAL HG_CMD-NOTFOUND)
+-    message(FATAL_ERROR "hg command not found!")
+-  else (HG_CMD STREQUAL HG_CMD-NOTFOUND)
+-    message(STATUS "hg command found: ${HG_CMD}")
+-  endif (HG_CMD STREQUAL HG_CMD-NOTFOUND)
+-
+ endif (AUTOMATED_BUILD_SYSTEM)
+ 
+ 
+@@ -344,8 +316,7 @@
+ endif(USE_CLANG)
+ 
+ install (FILES AUTHORS.txt DESTINATION ${CREDITSDIR})
+ install (FILES LICENSE.txt DESTINATION ${LICENCEDIR})
+-install (FILES AboutThisBuild.txt DESTINATION ${CREDITSDIR})
+ install (FILES RELEASE_NOTES.txt DESTINATION ${CREDITSDIR} OPTIONAL)
+ 
+ add_subdirectory (rtexif)
+--- rawtherapee-4.0.8/rtgui/version.h
++++ rawtherapee-4.0.8/rtgui/version.h
+@@ -0,0 +1,11 @@
++// This file is automatically generated by the Makefile - DO NOT EDIT!
++// You can (should) also tell mercurial to ignore it.
++
++#ifndef _VERSION_
++#define _VERSION_
++
++#define VERSION "4.0.8"
++#define TAGDISTANCE 0
++#define CACHEFOLDERNAME "RawTherapee"
++
++#endif
diff --git a/media-gfx/rawtherapee/rawtherapee-4.0.5.ebuild b/media-gfx/rawtherapee/rawtherapee-4.0.5.ebuild
deleted file mode 100644
index bcfdd2cd963e..000000000000
--- a/media-gfx/rawtherapee/rawtherapee-4.0.5.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/rawtherapee/rawtherapee-4.0.5.ebuild,v 1.1 2011/11/11 22:08:02 radhermit Exp $
-
-EAPI="4"
-
-inherit cmake-utils toolchain-funcs
-
-DESCRIPTION="Digital photo editing tool focused on RAW image file manipulation and conversion"
-HOMEPAGE="http://www.rawtherapee.com/"
-SRC_URI="http://dev.gentoo.org/~radhermit/distfiles/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="bzip2 doc openmp"
-
-RDEPEND="bzip2? ( app-arch/bzip2 )
-	>=dev-cpp/gtkmm-2.12:2.4
-	>=dev-cpp/glibmm-2.16:2
-	dev-libs/libsigc++:2
-	media-libs/tiff
-	media-libs/libpng
-	media-libs/libiptcdata
-	media-libs/lcms:2
-	sys-libs/zlib
-	virtual/jpeg"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	dev-util/pkgconfig"
-
-PATCHES=( "${FILESDIR}"/${PN}-4.0.4-nohg.patch )
-
-pkg_setup() {
-	if use openmp ; then
-		tc-has-openmp || die "Please switch to an openmp compatible compiler"
-	fi
-
-	mycmakeargs=(
-		$(cmake-utils_use openmp OPTION_OMP)
-		$(cmake-utils_use_with bzip2 BZIP)
-		-DCREDITSDIR=/usr/share/doc/${PF}
-	)
-}
-
-src_install() {
-	cmake-utils_src_install
-	use doc && dodoc doc/built/pdf/en/RawTherapeeManual_4.0.pdf
-}
diff --git a/media-gfx/rawtherapee/rawtherapee-4.0.4.ebuild b/media-gfx/rawtherapee/rawtherapee-4.0.8.ebuild
similarity index 65%
rename from media-gfx/rawtherapee/rawtherapee-4.0.4.ebuild
rename to media-gfx/rawtherapee/rawtherapee-4.0.8.ebuild
index 865c8ab1d278..fc55b7364b39 100644
--- a/media-gfx/rawtherapee/rawtherapee-4.0.4.ebuild
+++ b/media-gfx/rawtherapee/rawtherapee-4.0.8.ebuild
@@ -1,14 +1,14 @@
-# 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/media-gfx/rawtherapee/rawtherapee-4.0.4.ebuild,v 1.2 2011/10/28 20:26:31 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/rawtherapee/rawtherapee-4.0.8.ebuild,v 1.1 2012/05/01 14:11:35 radhermit Exp $
 
 EAPI="4"
 
 inherit cmake-utils toolchain-funcs
 
-DESCRIPTION="Digital photo editing tool focused on RAW image file manipulation and conversion"
+DESCRIPTION="A powerful cross-platform raw image processing program"
 HOMEPAGE="http://www.rawtherapee.com/"
-SRC_URI="http://dev.gentoo.org/~radhermit/distfiles/${P}.tar.xz"
+SRC_URI="http://rawtherapee.googlecode.com/files/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -35,14 +35,21 @@ pkg_setup() {
 	if use openmp ; then
 		tc-has-openmp || die "Please switch to an openmp compatible compiler"
 	fi
+}
 
-	mycmakeargs=(
+src_configure() {
+	local mycmakeargs=(
 		$(cmake-utils_use openmp OPTION_OMP)
 		$(cmake-utils_use_with bzip2 BZIP)
+		-DDOCDIR=/usr/share/doc/${PF}
+		-DCREDITSDIR=/usr/share/${PN}
+		-DLICENCEDIR=/usr/share/${PN}
 	)
+
+	cmake-utils_src_configure
 }
 
 src_install() {
 	cmake-utils_src_install
-	use doc && dodoc doc/built/pdf/en/RawTherapeeManual_4.0.pdf
+	use doc && dodoc doc/built/pdf/en/RawTherapeeManual_${PV}.pdf
 }
diff --git a/media-libs/audiofile/Manifest b/media-libs/audiofile/Manifest
index a8cc2d3de7d0..c48aeaf83938 100644
--- a/media-libs/audiofile/Manifest
+++ b/media-libs/audiofile/Manifest
@@ -1,3 +1,4 @@
 DIST audiofile-0.3.1.tar.gz 722557 RMD160 26126ae4e095bc9d37b5184853fa545283684d03 SHA1 39de137a691a7c12ea5dc468566eb7a146880ac3 SHA256 6353dba997d480161e96a92dae3c58fb94666e35ef4ef00e8cc65950c1ae054a
 DIST audiofile-0.3.2.tar.xz 469944 RMD160 1a2deaab3ed8b9f2b3abf287a23e611b62db2347 SHA1 7195201a7ec524e6e5ee7cf4b823753e8ffcf502 SHA256 fac1706a8f87ad89206cdb76f886715d7bcff68d4492b50c347783656432b2a0
 DIST audiofile-0.3.3.tar.xz 469996 RMD160 3cad1dbe90a1f7df176c0e815e265ab2057a9f7f SHA1 597a7a559af92054603a181818095d7faf857a17 SHA256 f5229c6d5a0dc1126e0afae04f03cbda6d3d5bc985588ee88ad66561bf4cadc5
+DIST audiofile-0.3.4.tar.xz 484628 RMD160 bdf6eb1c203946ef27d3bd24443f0b14bcc38f5d SHA1 a325ced51f39592c74049b11ddab07d88aedd2fc SHA256 4cd79d8e7b4197dcb75f44f172e9823ba01716d26075a7387d9eba6deccb06bc
diff --git a/media-libs/audiofile/audiofile-0.3.4.ebuild b/media-libs/audiofile/audiofile-0.3.4.ebuild
new file mode 100644
index 000000000000..459ec1dc9839
--- /dev/null
+++ b/media-libs/audiofile/audiofile-0.3.4.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/audiofile/audiofile-0.3.4.ebuild,v 1.1 2012/05/01 13:18:58 radhermit Exp $
+
+EAPI="4"
+
+inherit autotools eutils gnome.org
+
+DESCRIPTION="An elegant API for accessing audio files"
+HOMEPAGE="http://www.68k.org/~michael/audiofile/"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="static-libs"
+
+DOCS=( ACKNOWLEDGEMENTS AUTHORS ChangeLog NEWS NOTES README TODO )
+
+src_prepare() {
+	# Don't build examples
+	sed -i -e "/^SRC_SUBDIRS/s: examples::" Makefile.am || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable static-libs static) \
+		--disable-werror \
+		--enable-largefile
+}
+
+src_test() {
+	emake -C test check
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete
+}
diff --git a/media-libs/tunepimp/Manifest b/media-libs/tunepimp/Manifest
deleted file mode 100644
index d205d54d9d28..000000000000
--- a/media-libs/tunepimp/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST libtunepimp-0.5.3.tar.gz 1097005 RMD160 6bc312591b98a5b74824fc3103137cbf60d4b012 SHA1 1b904cd97ce009588fe57336f40e79b6edf9947e SHA256 341744a0be386387632fc4bb906b97d2b3346137beb2c776a41dedaeeb0f2468
diff --git a/media-libs/tunepimp/files/tunepimp-0.5.3-build-fix.patch b/media-libs/tunepimp/files/tunepimp-0.5.3-build-fix.patch
deleted file mode 100644
index b6ca2f6194bd..000000000000
--- a/media-libs/tunepimp/files/tunepimp-0.5.3-build-fix.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-diff -Naur libtunepimp-0.5.3/lib/plugins.cpp libtunepimp-0.5.3.new/lib/plugins.cpp
---- libtunepimp-0.5.3/lib/plugins.cpp	2006-11-18 11:52:33.000000000 +0100
-+++ libtunepimp-0.5.3.new/lib/plugins.cpp	2008-06-13 22:10:44.320195645 +0200
-@@ -33,6 +33,8 @@
- #include <dirent.h>
- #include "../libltdl/ltdl.h"
- #include "plugins.h"
-+#include <cstdlib>
-+#include <cstdio>
- 
- #include <map>
- using namespace std;
-@@ -103,12 +105,12 @@
-        strcat(init_func, "InitPlugin");
- 
-        /* Opened plugin ok, now locate our entry function */
--       init_function = (Plugin *(*)(void))lt_dlsym((lt_dlhandle_struct *)info.handle, init_func);
-+       init_function = (Plugin *(*)(void))lt_dlsym((lt_dlhandle)info.handle, init_func);
-        if (init_function == NULL)
-        {
-            if (printDebugInfo)
-                fprintf(stderr, "Cannot find entry point in %s (%s).\n", file, lt_dlerror());
--           lt_dlclose((lt_dlhandle_struct *)info.handle);
-+           lt_dlclose((lt_dlhandle)info.handle);
-            continue;
-        }
- 
-@@ -116,7 +118,7 @@
-        info.methods = (*init_function)();
-        if (info.methods == NULL)
-        {
--           lt_dlclose((lt_dlhandle_struct *)info.handle);
-+           lt_dlclose((lt_dlhandle)info.handle);
-            if (printDebugInfo)
-                fprintf(stderr, "Cannot retrieve supported methods from %s.\n", file);
-            continue;
-@@ -150,7 +152,7 @@
-                   fprintf(stderr, "  [Plugin %s has already been loaded. "
-                        "Skipping.]\n", info.file);
-                info.methods->shutdown();
--               lt_dlclose((lt_dlhandle_struct *)info.handle);
-+               lt_dlclose((lt_dlhandle)info.handle);
-                break;
-            }
-        }
-@@ -173,7 +175,7 @@
-        if ((*i).handle)
-        {
-            (*i).methods->shutdown();
--           lt_dlclose((lt_dlhandle_struct *)(*i).handle);
-+           lt_dlclose((lt_dlhandle)(*i).handle);
-            (*i).handle = NULL;
-        }
-    }
diff --git a/media-libs/tunepimp/files/tunepimp-0.5.3-curl-headers.patch b/media-libs/tunepimp/files/tunepimp-0.5.3-curl-headers.patch
deleted file mode 100644
index 15e059bfaeaf..000000000000
--- a/media-libs/tunepimp/files/tunepimp-0.5.3-curl-headers.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/lib/protocol.cpp b/lib/protocol.cpp
-index 3436f80..5adb2e5 100644
---- a/lib/protocol.cpp
-+++ b/lib/protocol.cpp
-@@ -13,7 +13,6 @@
- #include <map>
- #include <expat.h>
- #include <curl/curl.h>
--#include <curl/types.h>
- #include <curl/easy.h>
- using namespace std;
- 
diff --git a/media-libs/tunepimp/files/tunepimp-0.5.3-gcc43.patch b/media-libs/tunepimp/files/tunepimp-0.5.3-gcc43.patch
deleted file mode 100644
index e6d2a83e856a..000000000000
--- a/media-libs/tunepimp/files/tunepimp-0.5.3-gcc43.patch
+++ /dev/null
@@ -1,145 +0,0 @@
-diff -up lib/metadata.cpp.gcc43 lib/metadata.cpp
---- lib/metadata.cpp.gcc43 2006-11-18 04:52:33.000000000 -0600
-+++ lib/metadata.cpp 2008-02-21 20:39:10.000000000 -0600
-@@ -26,6 +26,7 @@
- ----------------------------------------------------------------------------*/
- #include <math.h>
- #include <stdio.h>
-+#include <stdlib.h>
- #include "metadata.h"
- #include "../config.h"
- using namespace std;
-diff -up lib/protocol.cpp.gcc43 lib/protocol.cpp
---- lib/protocol.cpp.gcc43 2006-11-28 14:25:04.000000000 -0600
-+++ lib/protocol.cpp 2008-02-21 20:39:10.000000000 -0600
-@@ -8,6 +8,7 @@
- -------------------------------------------------------------------*/
- #include <stdio.h>
- #include <stdlib.h>
-+#include <string.h>
- #include <string>
- #include <map>
- #include <expat.h>
-diff -up lib/utf8/utf8util.cpp.gcc43 lib/utf8/utf8util.cpp
---- lib/utf8/utf8util.cpp.gcc43 2006-11-18 04:52:26.000000000 -0600
-+++ lib/utf8/utf8util.cpp 2008-02-21 20:39:10.000000000 -0600
-@@ -26,6 +26,7 @@
- ----------------------------------------------------------------------------*/
- 
- #include <stdio.h>
-+#include <stdlib.h>
- #include "utf8util.h"
- #include "utf8.h"
- #ifdef WIN32
-diff -up lib/tunepimp.cpp.gcc43 lib/tunepimp.cpp
---- lib/tunepimp.cpp.gcc43 2006-11-18 04:52:33.000000000 -0600
-+++ lib/tunepimp.cpp 2008-02-21 20:39:10.000000000 -0600
-@@ -30,7 +30,9 @@
- #endif
- #endif
- 
-+#include <string.h>
- #include <stdio.h>
-+#include <stdlib.h>
- #include <map>
- using namespace std;
- 
-diff -up lib/c_wrapper.cpp.gcc43 lib/c_wrapper.cpp
---- lib/c_wrapper.cpp.gcc43 2006-11-18 04:52:33.000000000 -0600
-+++ lib/c_wrapper.cpp 2008-02-21 20:39:10.000000000 -0600
-@@ -24,6 +24,7 @@
-    $Id: tunepimp-0.5.3-gcc43.patch,v 1.1 2008/04/07 05:49:36 philantrop Exp $
- 
- ----------------------------------------------------------------------------*/
-+#include <stdlib.h>
- #include "tunepimp.h"
- #include "mutex.h"
- #include "tp_c.h"
-diff -up lib/readmeta.cpp.gcc43 lib/readmeta.cpp
---- lib/readmeta.cpp.gcc43 2006-11-18 04:52:33.000000000 -0600
-+++ lib/readmeta.cpp 2008-02-21 20:39:10.000000000 -0600
-@@ -31,6 +31,7 @@
- #endif
- 
- #include <stdio.h>
-+#include <stdlib.h>
- #ifndef WIN32
- #include <unistd.h>
- #endif
-diff -up lib/fileio.cpp.gcc43 lib/fileio.cpp
---- lib/fileio.cpp.gcc43 2006-11-18 04:52:33.000000000 -0600
-+++ lib/fileio.cpp 2008-02-21 20:39:10.000000000 -0600
-@@ -27,6 +27,8 @@
- 
- #include <assert.h>
- #include <errno.h>
-+#include <stdlib.h>
-+#include <string.h>
- #include <string>
- #ifndef WIN32
- #include <unistd.h>
-diff -up plugins/mp4/mp4.cpp.gcc43 plugins/mp4/mp4.cpp
---- plugins/mp4/mp4.cpp.gcc43 2006-11-18 04:51:08.000000000 -0600
-+++ plugins/mp4/mp4.cpp 2008-02-21 20:39:10.000000000 -0600
-@@ -27,6 +27,7 @@
- 
- #include <string.h>
- #include <stdio.h>
-+#include <stdlib.h>
- #include <mp4.h>
- #include "metadata.h"
- #include "plugin.h"
-diff -up plugins/mp3/id3_meta.cpp.gcc43 plugins/mp3/id3_meta.cpp
---- plugins/mp3/id3_meta.cpp.gcc43 2006-11-18 04:51:07.000000000 -0600
-+++ plugins/mp3/id3_meta.cpp 2008-02-21 20:41:35.000000000 -0600
-@@ -26,6 +26,7 @@
- ----------------------------------------------------------------------------*/
- 
- #include <stdio.h>
-+#include <stdlib.h>
- #include <time.h>
- #include <ctype.h>
- #include <musicbrainz/mb_c.h>
-diff -up plugins/mp3/id3_2_3_meta.cpp.gcc43 plugins/mp3/id3_2_3_meta.cpp
---- plugins/mp3/id3_2_3_meta.cpp.gcc43 2006-11-18 04:51:07.000000000 -0600
-+++ plugins/mp3/id3_2_3_meta.cpp 2008-02-21 20:41:59.000000000 -0600
-@@ -26,6 +26,7 @@
- ----------------------------------------------------------------------------*/
- 
- #include <stdio.h>
-+#include <stdlib.h>
- #include <assert.h>
- #include <ctype.h>
- #include <musicbrainz/mb_c.h>
-diff -up plugins/wma/wma.cpp.gcc43 plugins/wma/wma.cpp
---- plugins/wma/wma.cpp.gcc43 2006-11-18 04:51:28.000000000 -0600
-+++ plugins/wma/wma.cpp 2008-02-21 20:39:10.000000000 -0600
-@@ -27,6 +27,7 @@
- 
- #include <string.h>
- #include <stdio.h>
-+#include <stdlib.h>
- #include <wmafile.h>
- #include "metadata.h"
- #include "plugin.h"
-diff -up plugins/wma/wmafile.cpp.gcc43 plugins/wma/wmafile.cpp
---- plugins/wma/wmafile.cpp.gcc43 2006-11-18 04:51:28.000000000 -0600
-+++ plugins/wma/wmafile.cpp 2008-02-21 20:39:10.000000000 -0600
-@@ -19,6 +19,7 @@
-  *   USA                                                                   *
-  ***************************************************************************/
- 
-+#include <string.h>
- #include <tstring.h>
- #include <wmafile.h>
- #include <wmatag.h>
-diff -up include/tunepimp-0.5/metadata.h.gcc43 include/tunepimp-0.5/metadata.h
---- include/tunepimp-0.5/metadata.h.gcc43 2006-11-18 04:52:08.000000000 -0600
-+++ include/tunepimp-0.5/metadata.h 2008-02-21 20:39:10.000000000 -0600
-@@ -27,6 +27,7 @@
- #ifndef __METADATA_H__
- #define __METADATA_H__
- 
-+#include <string.h>
- #include <string>
- #include <cstdio> 
\ No newline at end of file
diff --git a/media-libs/tunepimp/files/tunepimp-0.5.3-gcc44.patch b/media-libs/tunepimp/files/tunepimp-0.5.3-gcc44.patch
deleted file mode 100644
index 2c5e4f9dbf2d..000000000000
--- a/media-libs/tunepimp/files/tunepimp-0.5.3-gcc44.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -ruN libtunepimp-0.5.3.orig/lib/fileio.cpp libtunepimp-0.5.3/lib/fileio.cpp
---- libtunepimp-0.5.3.orig/lib/fileio.cpp	2009-05-28 11:49:43.000000000 -0700
-+++ libtunepimp-0.5.3/lib/fileio.cpp	2009-05-28 11:59:05.000000000 -0700
-@@ -124,7 +124,8 @@
- 
- void tmktempname(const char *path, char *newPath, int newPathLen)
- {
--    char *ptr, *temp;
-+    const char *ptr;
-+    char *temp;
- 
-     temp = (char *)malloc(strlen(path) + 32);
-     ptr = strrchr(path, dirSepChar);
diff --git a/media-libs/tunepimp/files/tunepimp-0.5.3-libtool.patch b/media-libs/tunepimp/files/tunepimp-0.5.3-libtool.patch
deleted file mode 100644
index d49785bc7ce2..000000000000
--- a/media-libs/tunepimp/files/tunepimp-0.5.3-libtool.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -Naur libtunepimp-0.5.3/configure.in libtunepimp-0.5.3.new/configure.in
---- libtunepimp-0.5.3/configure.in	2006-11-28 21:28:38.000000000 +0100
-+++ libtunepimp-0.5.3.new/configure.in	2008-06-13 21:56:12.832195847 +0200
-@@ -33,7 +33,7 @@
- dnl Checks for programs.
- AC_PREREQ(2.52)
- AC_PROG_CC
--AC_LIBLTDL_CONVENIENCE
-+AC_WITH_LTDL
- AC_SUBST(INCLTDL)
- AC_SUBST(LIBLTDL)
- AC_LIBTOOL_DLOPEN
-@@ -52,6 +52,14 @@
-   prefix="/usr/local" 
- fi
- 
-+infodir='${prefix}/info' 
-+mandir='${prefix}/man'
-+
-+if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
-+if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
-+if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
-+if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
-+
- AC_ARG_ENABLE([lgpl],
-               [  --enable--lgpl          Use LGPL license (no mp3 support)], 
-               [use_lgpl=yes], 
-@@ -283,7 +291,6 @@
- AC_DEFINE_UNQUOTED(PREFIX, "${prefix}", "PREFIX") 
- AS_AC_EXPAND(LIBDIR, $libdir)
- AC_DEFINE_UNQUOTED(PLUGIN_DIR, "$LIBDIR/tunepimp/plugins", "PLUGIN_DIR") 
--AC_CONFIG_SUBDIRS(libltdl)
- AC_OUTPUT(
-     Makefile
-     lib/Makefile
diff --git a/media-libs/tunepimp/files/tunepimp-0.5.3-new_libmp4v2.patch b/media-libs/tunepimp/files/tunepimp-0.5.3-new_libmp4v2.patch
deleted file mode 100644
index ec3ec72612e3..000000000000
--- a/media-libs/tunepimp/files/tunepimp-0.5.3-new_libmp4v2.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -ur libtunepimp-0.5.3.orig/plugins/mp4/mp4.cpp libtunepimp-0.5.3/plugins/mp4/mp4.cpp
---- libtunepimp-0.5.3.orig/plugins/mp4/mp4.cpp	2009-07-10 15:50:20.000000000 +0300
-+++ libtunepimp-0.5.3/plugins/mp4/mp4.cpp	2009-07-10 15:51:18.000000000 +0300
-@@ -28,7 +28,7 @@
- #include <string.h>
- #include <stdio.h>
- #include <stdlib.h>
--#include <mp4.h>
-+#include <mp4v2/mp4v2.h>
- #include "metadata.h"
- #include "plugin.h"
- #ifndef WIN32
-@@ -232,7 +232,7 @@
-   
-   strcpy(mdata->fileFormat, fileName + strlen(fileName) - 3); 
-   
--  if (!MP4Close(mp4file))
-+  MP4Close(mp4file);
-     return 0;
-   
-   return 1;
-@@ -316,7 +316,7 @@
-   sprintf(temp, "%d", mdata->nonAlbum);  
-   MP4SetMetadataFreeForm(mp4file, "MusicBrainz Non-Album", (u_int8_t *)temp, strlen(temp) + 1);
-   
--  if (!MP4Close(mp4file))
-+  MP4Close(mp4file);
-     return 0;
- 
- #ifndef WIN32
diff --git a/media-libs/tunepimp/metadata.xml b/media-libs/tunepimp/metadata.xml
deleted file mode 100644
index 8d1e86a9cefb..000000000000
--- a/media-libs/tunepimp/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>kde</herd>
-</pkgmetadata>
diff --git a/media-libs/tunepimp/tunepimp-0.5.3-r3.ebuild b/media-libs/tunepimp/tunepimp-0.5.3-r3.ebuild
deleted file mode 100644
index 52d3a64f87f1..000000000000
--- a/media-libs/tunepimp/tunepimp-0.5.3-r3.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/tunepimp/tunepimp-0.5.3-r3.ebuild,v 1.3 2011/07/25 10:25:40 angelos Exp $
-
-EAPI="3"
-PYTHON_DEPEND="python? 2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython"
-
-inherit autotools distutils eutils multilib
-
-MY_P=lib${P}
-
-DESCRIPTION="TunePimp is a library to create MusicBrainz enabled tagging applications."
-HOMEPAGE="http://www.musicbrainz.org/products/tunepimp"
-SRC_URI="http://ftp.musicbrainz.org/pub/musicbrainz/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="python"
-
-RDEPEND="sys-libs/zlib
-	dev-libs/expat
-	net-misc/curl
-	media-libs/flac
-	media-libs/libmad
-	>=media-libs/musicbrainz-2.1:1
-	>=media-libs/libmp4v2-1.9
-	media-libs/libofa
-	media-libs/libvorbis
-	sys-libs/readline"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	!media-sound/trm"
-
-# parallel build is broken - https://bugs.gentoo.org/204174
-MAKEOPTS="${MAKEOPTS} -j1"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	if use python; then
-		python_pkg_setup
-	fi
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-gcc43.patch \
-		"${FILESDIR}"/${P}-libtool.patch \
-		"${FILESDIR}"/${P}-build-fix.patch \
-		"${FILESDIR}"/${P}-gcc44.patch \
-		"${FILESDIR}"/${P}-new_libmp4v2.patch \
-		"${FILESDIR}"/${P}-curl-headers.patch
-
-	sed -i -e "s: tta::" configure.in || die "sed failed"
-
-	# Don't hardcode ".so", use get_modname instead
-	sed -e "s|.so \$(top_srcdir)|$(get_modname) \$(top_srcdir)|g" \
-		-i plugins/*/Makefile.*
-
-	eautoreconf
-}
-
-src_configure() {
-	default
-}
-
-src_compile() {
-	default
-
-	if use python; then
-		pushd python > /dev/null
-		distutils_src_compile
-		popd > /dev/null
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog README TODO
-
-	if use python; then
-		pushd python > /dev/null
-		distutils_src_install
-		insinto /usr/share/doc/${PF}/examples
-		doins examples/* || die "doins failed"
-		popd > /dev/null
-	fi
-
-	find "${D}" -name '*.la' -delete
-}
-
-pkg_postinst() {
-	if use python; then
-		distutils_pkg_postinst
-	fi
-}
-
-pkg_postrm() {
-	if use python; then
-		distutils_pkg_postrm
-	fi
-}
diff --git a/media-plugins/vdr-text2skin/Manifest b/media-plugins/vdr-text2skin/Manifest
index 64b5f98a0afa..b4ff841c98c7 100644
--- a/media-plugins/vdr-text2skin/Manifest
+++ b/media-plugins/vdr-text2skin/Manifest
@@ -1,4 +1 @@
-DIST vdr-text2skin-1.2.tgz 77391 RMD160 0b1ff0a751fadec8ffbf09e401a2f70217645bc2 SHA1 16699f9e34e6b4cc8c2ce59cd99fe8d349bd5453 SHA256 e2fd762d77bcd3592fa604dbbd71ce3c1d1b8998d9e4513c1bfe318ebbf3d030
-DIST vdr-text2skin-1.3.1.tgz 91191 RMD160 c04f3bea7a2487f2a8b6cf9822d9305231d15d9b SHA1 0dc94c9c7c077fac8ca3b95cc566b9b0e2a65ffa SHA256 176669d979d9b6c12de33d718f14e4bc66efe18160971a9d5c212aa0c6a06cc4
 DIST vdr-text2skin-1.3.2.tgz 94476 RMD160 78228e2ae0c511f970101d07f2a1771291fa1214 SHA1 6c32469ee4db13473aeed893d88f2dbdbc1dc16c SHA256 32d3e17cdf3a3b796b4ed7eae1ca8d2c6d56dcc901f4ed71daaf95dd6d2d6331
-DIST vdr-text2skin-1.3.tgz 88819 RMD160 949f58e7d7c85af355cad92113327fb66de9f203 SHA1 0c36fe1e79067d3b9264a3f367ea9a1b575aa7b4 SHA256 99f5552012477199a1d5624df9a8d0ad9576882f3a8364928a8a1f63fcca63f3
diff --git a/media-plugins/vdr-text2skin/files/vdr-text2skin-1.3.2-Makefile.patch b/media-plugins/vdr-text2skin/files/vdr-text2skin-1.3.2-Makefile.patch
index e01c2c788331..cce51d79febc 100644
--- a/media-plugins/vdr-text2skin/files/vdr-text2skin-1.3.2-Makefile.patch
+++ b/media-plugins/vdr-text2skin/files/vdr-text2skin-1.3.2-Makefile.patch
@@ -6,7 +6,7 @@ index daa54d7..1163a8d 100644
  # External image lib to use: imagemagick, graphicsmagick, imlib2 or none
  IMAGELIB = imagemagick
  
-+WANT_I18N=1
++#
  
  # DO NOT EDIT BELOW THIS LINE UNLESS YOU KNOW WHAT YOU'RE DOING
  # -------------------------------------------------------------
@@ -48,7 +48,7 @@ index daa54d7..1163a8d 100644
  
  ### Internationalization (I18N):
 -
-+ifdef WANT_I18N
++#
  PODIR     = po
  LOCALEDIR = $(VDRDIR)/locale
  I18Npo    = $(notdir $(wildcard $(PODIR)/*.po))
@@ -56,7 +56,7 @@ index daa54d7..1163a8d 100644
  $(LOCALEDIR)/%/LC_MESSAGES/vdr-$(PLUGIN).mo: $(PODIR)/%.po
  	@mkdir -p $(dir $@)
  	msgfmt -c -o $@ $<
-+endif
++#
  
  .PHONY: i18n
  i18n: $(I18Npo:%.po=$(LOCALEDIR)/%/LC_MESSAGES/vdr-$(PLUGIN).mo)
diff --git a/media-plugins/vdr-text2skin/vdr-text2skin-1.2.ebuild b/media-plugins/vdr-text2skin/vdr-text2skin-1.2.ebuild
deleted file mode 100644
index 855518bac839..000000000000
--- a/media-plugins/vdr-text2skin/vdr-text2skin-1.2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-text2skin/vdr-text2skin-1.2.ebuild,v 1.2 2012/01/15 19:31:24 idl0r Exp $
-
-EAPI="1"
-
-inherit vdr-plugin versionator
-
-DESCRIPTION="VDR text2skin PlugIn"
-HOMEPAGE="http://projects.vdr-developer.org/projects/show/plg-text2skin"
-SRC_URI="mirror://vdr-developerorg/112/${P}.tgz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86"
-#IUSE="truetype direct_blit"
-IUSE="+truetype"
-
-COMMON_DEPEND=">=media-video/vdr-1.3.18
-	media-gfx/imagemagick
-	!media-plugins/vdr-text2skin-cvs
-	truetype? ( media-libs/freetype )"
-
-DEPEND="${COMMON_DEPEND}
-	dev-util/pkgconfig"
-
-RDEPEND="${COMMON_DEPEND}"
-
-SKINDIR=/usr/share/vdr/${VDRPLUGIN}
-ETC_SKIN_DIR=/etc/vdr/plugins/${VDRPLUGIN}
-
-src_unpack() {
-	vdr-plugin_src_unpack unpack
-
-	cd "${S}"
-
-	sed -i common.c -e 's#cPlugin::ConfigDirectory(PLUGIN_NAME_I18N)#"/usr/share/vdr/"PLUGIN_NAME_I18N#'
-
-	use truetype || sed -i Makefile -e 's/^HAVE_FREETYPE/#HAVE_FREETYPE/'
-
-	vdr-plugin_src_unpack all_but_unpack
-}
-
-src_install() {
-	vdr-plugin_src_install
-
-	keepdir "${SKINDIR}"
-
-	exeinto "${SKINDIR}/contrib"
-	doexe "${S}"/contrib/skin_to_*.pl
-	doexe "${S}"/contrib/transform.pl
-
-	dodoc "${S}"/Docs/*.txt
-}
diff --git a/media-plugins/vdr-text2skin/vdr-text2skin-1.3.1.ebuild b/media-plugins/vdr-text2skin/vdr-text2skin-1.3.1.ebuild
deleted file mode 100644
index e8bd8878b14b..000000000000
--- a/media-plugins/vdr-text2skin/vdr-text2skin-1.3.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-text2skin/vdr-text2skin-1.3.1.ebuild,v 1.3 2012/01/15 19:31:24 idl0r Exp $
-
-EAPI="2"
-
-inherit vdr-plugin versionator
-
-UPLOAD_NR=344 # changes with every version / new file :-(
-
-DESCRIPTION="VDR text2skin PlugIn"
-HOMEPAGE="http://projects.vdr-developer.org/projects/show/plg-text2skin"
-SRC_URI="mirror://vdr-developerorg/${UPLOAD_NR}/${P}.tgz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64"
-#IUSE="truetype direct_blit"
-IUSE="+truetype"
-
-COMMON_DEPEND=">=media-video/vdr-1.6.0
-	media-gfx/imagemagick
-	truetype? ( media-libs/freetype )"
-
-DEPEND="${COMMON_DEPEND}
-	dev-util/pkgconfig"
-
-RDEPEND="${COMMON_DEPEND}"
-
-SKINDIR=/usr/share/vdr/${VDRPLUGIN}
-ETC_SKIN_DIR=/etc/vdr/plugins/${VDRPLUGIN}
-
-src_prepare() {
-	sed -i common.c -e 's#cPlugin::ConfigDirectory(PLUGIN_NAME_I18N)#"/usr/share/vdr/"PLUGIN_NAME_I18N#'
-
-	sed -i bitmap.c -e "s:8U:(size_t)8U:"
-
-	use truetype || sed -i Makefile -e 's/^HAVE_FREETYPE/#HAVE_FREETYPE/'
-
-	if ! has_version ">=media-video/vdr-1.7.13"; then
-		sed -i "s:-include \$(VDRDIR)/Make.global:#-include \$(VDRDIR)/Make.global:" Makefile
-	fi
-
-	vdr-plugin_src_prepare
-}
-
-src_install() {
-	vdr-plugin_src_install
-
-	keepdir "${SKINDIR}"
-
-	exeinto "${SKINDIR}/contrib"
-	doexe "${S}"/contrib/skin_to_*.pl
-	doexe "${S}"/contrib/transform.pl
-
-	dodoc "${S}"/Docs/*.txt
-}
diff --git a/media-plugins/vdr-text2skin/vdr-text2skin-1.3.2.ebuild b/media-plugins/vdr-text2skin/vdr-text2skin-1.3.2.ebuild
index aad7efaa3d8e..fa634c81024c 100644
--- a/media-plugins/vdr-text2skin/vdr-text2skin-1.3.2.ebuild
+++ b/media-plugins/vdr-text2skin/vdr-text2skin-1.3.2.ebuild
@@ -1,21 +1,21 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-text2skin/vdr-text2skin-1.3.2.ebuild,v 1.3 2012/04/07 19:08:48 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-text2skin/vdr-text2skin-1.3.2.ebuild,v 1.4 2012/05/01 15:54:07 hd_brummy Exp $
 
 EAPI="4"
 
-inherit vdr-plugin eutils
+inherit vdr-plugin-2
 
-UPLOAD_NR=783 # changes with every version / new file :-(
+VERSION="783" # changes with every version / new file :-(
 
 DESCRIPTION="VDR text2skin PlugIn"
 HOMEPAGE="http://projects.vdr-developer.org/projects/show/plg-text2skin"
-SRC_URI="mirror://vdr-developerorg/${UPLOAD_NR}/${P}.tgz"
+SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tgz"
 
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~x86 ~amd64"
-IUSE="contrib doc +imagemagick imlib nls"
+IUSE="contrib doc +imagemagick imlib"
 
 REQUIRED_USE="imagemagick? ( !imlib )
 	imlib? ( !imagemagick )"
@@ -26,7 +26,7 @@ RDEPEND=">=media-video/vdr-1.6.0
 DEPEND="${RDEPEND}
 	imagemagick? ( dev-util/pkgconfig )
 	imlib? ( dev-util/pkgconfig )
-	nls? ( sys-devel/gettext )"
+	sys-devel/gettext"
 
 src_prepare() {
 	local imagelib=
@@ -53,11 +53,7 @@ src_prepare() {
 	fi
 	sed -i -e "s:\(IMAGELIB[[:space:]]*=\) .*:\1 ${imagelib}:" Makefile || die
 
-	if ! use nls; then
-		sed -i -e 's:^WANT_I18N=.*:WANT_I18N=:' Makefile || die
-	fi
-
-	vdr-plugin_src_prepare
+	vdr-plugin-2_src_prepare
 
 	if has_version ">=media-video/vdr-1.7.27"; then
 		epatch "${FILESDIR}/vdr-1.7.27.diff"
@@ -65,7 +61,7 @@ src_prepare() {
 }
 
 src_install() {
-	vdr-plugin_src_install
+	vdr-plugin-2_src_install
 
 	keepdir "/usr/share/vdr/${VDRPLUGIN}"
 
diff --git a/media-plugins/vdr-text2skin/vdr-text2skin-1.3.ebuild b/media-plugins/vdr-text2skin/vdr-text2skin-1.3.ebuild
deleted file mode 100644
index e87be2ec2861..000000000000
--- a/media-plugins/vdr-text2skin/vdr-text2skin-1.3.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-text2skin/vdr-text2skin-1.3.ebuild,v 1.3 2012/01/15 19:31:24 idl0r Exp $
-
-EAPI="2"
-
-inherit vdr-plugin versionator
-
-UPLOAD_NR=127 # changes with every version / new file :-(
-
-DESCRIPTION="VDR text2skin PlugIn"
-HOMEPAGE="http://projects.vdr-developer.org/projects/show/plg-text2skin"
-SRC_URI="mirror://vdr-developerorg/${UPLOAD_NR}/${P}.tgz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64"
-#IUSE="truetype direct_blit"
-IUSE="+truetype"
-
-COMMON_DEPEND=">=media-video/vdr-1.6.0
-	media-gfx/imagemagick
-	!media-plugins/vdr-text2skin-cvs
-	truetype? ( media-libs/freetype )"
-
-DEPEND="${COMMON_DEPEND}
-	dev-util/pkgconfig"
-
-RDEPEND="${COMMON_DEPEND}"
-
-SKINDIR=/usr/share/vdr/${VDRPLUGIN}
-ETC_SKIN_DIR=/etc/vdr/plugins/${VDRPLUGIN}
-
-src_prepare() {
-	sed -i common.c -e 's#cPlugin::ConfigDirectory(PLUGIN_NAME_I18N)#"/usr/share/vdr/"PLUGIN_NAME_I18N#'
-
-	use truetype || sed -i Makefile -e 's/^HAVE_FREETYPE/#HAVE_FREETYPE/'
-
-	vdr-plugin_src_prepare
-}
-
-src_install() {
-	vdr-plugin_src_install
-
-	keepdir "${SKINDIR}"
-
-	exeinto "${SKINDIR}/contrib"
-	doexe "${S}"/contrib/skin_to_*.pl
-	doexe "${S}"/contrib/transform.pl
-
-	dodoc "${S}"/Docs/*.txt
-}
diff --git a/media-plugins/vdr-videosystem/vdr-videosystem-0.0.1.ebuild b/media-plugins/vdr-videosystem/vdr-videosystem-0.0.1.ebuild
index ab90c820ebe0..ce3ea0365703 100644
--- a/media-plugins/vdr-videosystem/vdr-videosystem-0.0.1.ebuild
+++ b/media-plugins/vdr-videosystem/vdr-videosystem-0.0.1.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-videosystem/vdr-videosystem-0.0.1.ebuild,v 1.5 2008/04/28 09:06:26 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-videosystem/vdr-videosystem-0.0.1.ebuild,v 1.6 2012/05/01 13:01:49 hd_brummy Exp $
 
-inherit vdr-plugin
+EAPI="4"
+
+inherit vdr-plugin-2
 
 DESCRIPTION="VDR plugin: Switch OSD resolution depending on signal-videosystem (PAL/NTSC)"
 HOMEPAGE="http://www.vdr-portal.de/board/thread.php?threadid=43516"
diff --git a/media-plugins/vdr-vodcatcher/Manifest b/media-plugins/vdr-vodcatcher/Manifest
index 59629eb4dd90..286cffa75dd9 100644
--- a/media-plugins/vdr-vodcatcher/Manifest
+++ b/media-plugins/vdr-vodcatcher/Manifest
@@ -1,3 +1 @@
-DIST vdr-vodcatcher-0.1.1.tar.gz 126352 RMD160 ca80423d1de60a034cf1bca8ab3aeca9468c2290 SHA1 a43391c89936c42fc471330d21163ba78de86114 SHA256 3f85b2bdd2aec116ee9bbf6e22af5dc5998221496bea443d7ef0e756e201678e
-DIST vdr-vodcatcher-0.2.1.tar.gz 127579 RMD160 1278d2f8be9c9085b89ca48774ce55581ff2f025 SHA1 ceedc4abb3d1da867cd4a8d6fa9a254ff9842cde SHA256 e0e3ee03bc577e22662df04f84f0dbdcaa75cc6d66d65aace15158feff01dff6
 DIST vdr-vodcatcher-0.2.2.tar.gz 126612 RMD160 848a6bd31df6b67073cc5ad1f3fc22b43fa428ba SHA1 ce3f16f25ab499da9f234b932e6746e68dfa42f0 SHA256 85f728a5eecc5845d3bb18c97ff96c65ec2cb5653dcf24fb8be604d8c02adf32
diff --git a/media-plugins/vdr-vodcatcher/files/vdr-vodcatcher-0.2.1-gcc44.patch b/media-plugins/vdr-vodcatcher/files/vdr-vodcatcher-0.2.1-gcc44.patch
deleted file mode 100644
index b8c7ef6865b6..000000000000
--- a/media-plugins/vdr-vodcatcher/files/vdr-vodcatcher-0.2.1-gcc44.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ur vodcatcher-0.2.1.orig/src/Rfc822DateTime.cc vodcatcher-0.2.1/src/Rfc822DateTime.cc
---- vodcatcher-0.2.1.orig/src/Rfc822DateTime.cc	2008-08-06 00:37:56.000000000 +0300
-+++ vodcatcher-0.2.1/src/Rfc822DateTime.cc	2009-08-11 12:26:49.000000000 +0300
-@@ -21,6 +21,7 @@
-  */
- 
- #include "Rfc822DateTime.h"
-+#include <stdio.h>
- #include <stdlib.h>
- 
- using namespace std;
diff --git a/media-plugins/vdr-vodcatcher/vdr-vodcatcher-0.1.1.ebuild b/media-plugins/vdr-vodcatcher/vdr-vodcatcher-0.1.1.ebuild
deleted file mode 100644
index 2ef5d204c6ec..000000000000
--- a/media-plugins/vdr-vodcatcher/vdr-vodcatcher-0.1.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-vodcatcher/vdr-vodcatcher-0.1.1.ebuild,v 1.1 2008/02/03 22:06:17 hd_brummy Exp $
-
-inherit vdr-plugin
-
-DESCRIPTION="VDR plugin: Downloads rss-feeds and passes video enclosures to the mplayer plugin"
-HOMEPAGE="http://www.e-tobi.net/blog/pages/vdr-vodcatcher"
-SRC_URI="http://www.e-tobi.net/blog/files/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="net-misc/curl
-		media-video/vdr
-		media-plugins/vdr-mplayer"
-
-src_unpack() {
-	vdr-plugin_src_unpack
-
-	sed -e "s:ConfigDirectory():ConfigDirectory( \"vodcatcher\" ):" -i src/VodcatcherPlugin.cc
-}
-
-src_install() {
-	vdr-plugin_src_install
-
-	insinto /etc/vdr/plugins/vodcatcher/
-	doins   examples/vodcatchersources.conf
-
-	diropts -gvdr -ovdr
-	keepdir /var/cache/vdr-plugin-vodcatcher
-}
-
-pkg_postinst() {
-	vdr-plugin_pkg_postinst
-
-	echo
-	elog "! IMPORTEND"
-	elog "In order to allow the MPlayer plug-in to play back the streams passed in by the"
-	elog "Vodcatcher, you must add the following entry to the mplayersources.conf file:"
-	echo
-	elog "/tmp;Vodcatcher;0"
-	echo
-}
diff --git a/media-plugins/vdr-vodcatcher/vdr-vodcatcher-0.2.1.ebuild b/media-plugins/vdr-vodcatcher/vdr-vodcatcher-0.2.1.ebuild
deleted file mode 100644
index 1c6b04aa77a4..000000000000
--- a/media-plugins/vdr-vodcatcher/vdr-vodcatcher-0.2.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-vodcatcher/vdr-vodcatcher-0.2.1.ebuild,v 1.2 2009/08/11 09:26:12 ssuominen Exp $
-
-inherit vdr-plugin
-
-DESCRIPTION="VDR plugin: Downloads rss-feeds and passes video enclosures to the mplayer plugin"
-HOMEPAGE="http://www.e-tobi.net/blog/pages/vdr-vodcatcher"
-SRC_URI="http://www.e-tobi.net/blog/files/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="net-misc/curl
-		media-video/vdr
-		|| ( media-plugins/vdr-mplayer media-plugins/vdr-xineliboutput )"
-
-PATCHES=( "${FILESDIR}/${P}-gcc44.patch" )
-
-src_unpack() {
-	vdr-plugin_src_unpack
-
-	sed -e "s:ConfigDirectory():ConfigDirectory( \"vodcatcher\" ):" -i src/VodcatcherPlugin.cc
-}
-
-src_install() {
-	vdr-plugin_src_install
-
-	insinto /etc/vdr/plugins/vodcatcher/
-	doins   examples/vodcatchersources.conf
-
-	diropts -gvdr -ovdr
-	keepdir /var/cache/vdr-plugin-vodcatcher
-}
-
-pkg_postinst() {
-	vdr-plugin_pkg_postinst
-
-	echo
-	elog "! IMPORTEND"
-	elog "In order to allow the MPlayer plug-in to play back the streams passed in by the"
-	elog "Vodcatcher, you must add the following entry to the mplayersources.conf file:"
-	echo
-	elog "/tmp;Vodcatcher;0"
-	echo
-}
diff --git a/media-plugins/vdr-vodcatcher/vdr-vodcatcher-0.2.2.ebuild b/media-plugins/vdr-vodcatcher/vdr-vodcatcher-0.2.2.ebuild
index 4e87a08e5845..5095910c0e63 100644
--- a/media-plugins/vdr-vodcatcher/vdr-vodcatcher-0.2.2.ebuild
+++ b/media-plugins/vdr-vodcatcher/vdr-vodcatcher-0.2.2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-vodcatcher/vdr-vodcatcher-0.2.2.ebuild,v 1.2 2012/04/24 10:20:27 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-vodcatcher/vdr-vodcatcher-0.2.2.ebuild,v 1.3 2012/05/01 12:30:14 hd_brummy Exp $
 
-EAPI="2"
+EAPI="4"
 
-inherit vdr-plugin
+inherit vdr-plugin-2
 
 DESCRIPTION="VDR plugin: Downloads rss-feeds and passes video enclosures to the mplayer plugin"
 HOMEPAGE="http://projects.vdr-developer.org/projects/plg-vodcatcher"
@@ -17,19 +17,20 @@ IUSE=""
 
 DEPEND="net-misc/curl
 		>=dev-libs/tinyxml-2.6.1
-		media-video/vdr
+		media-video/vdr"
+RDEPEND="${DEPEND}
 		|| ( media-plugins/vdr-mplayer media-plugins/vdr-xineliboutput )"
 
 PATCHES=( "${FILESDIR}/${P}_unbundle-tinyxml2.diff" )
 
 src_prepare() {
-	vdr-plugin_src_prepare
+	vdr-plugin-2_src_prepare
 
 	sed -e "s:ConfigDirectory():ConfigDirectory( \"vodcatcher\" ):" -i src/VodcatcherPlugin.cc
 }
 
 src_install() {
-	vdr-plugin_src_install
+	vdr-plugin-2_src_install
 
 	insinto /etc/vdr/plugins/vodcatcher/
 	doins   examples/vodcatchersources.conf
@@ -39,7 +40,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	vdr-plugin_pkg_postinst
+	vdr-plugin-2_pkg_postinst
 
 	echo
 	elog "! IMPORTEND"
diff --git a/media-plugins/vdr-vompserver/files/vdr-1.7.27.diff b/media-plugins/vdr-vompserver/files/vdr-1.7.27.diff
new file mode 100644
index 000000000000..f98b75c124f4
--- /dev/null
+++ b/media-plugins/vdr-vompserver/files/vdr-1.7.27.diff
@@ -0,0 +1,36 @@
+diff -Naur vompserver-0.3.1.orig/mvpreceiver.c vompserver-0.3.1/mvpreceiver.c
+--- vompserver-0.3.1.orig/mvpreceiver.c	2012-05-01 14:35:39.000000000 +0200
++++ vompserver-0.3.1/mvpreceiver.c	2012-05-01 14:49:08.000000000 +0200
+@@ -40,7 +40,7 @@
+ #elif VDRVERSNUM < 10500
+ : cReceiver(channel->Ca(), 0, channel->Vpid(), channel->Apids(), channel->Dpids(), mergeSpidsTpid(channel->Spids(),channel->Tpid()))
+ #else
+-: cReceiver(channel->GetChannelID(), 0, channel->Vpid(), channel->Apids(), channel->Dpids(), mergeSpidsTpid(channel->Spids(),channel->Tpid()))
++: cReceiver(channel, 0)
+ #endif
+ {
+   logger = Log::getInstance();
+diff -Naur vompserver-0.3.1.orig/vompclientrrproc.c vompserver-0.3.1/vompclientrrproc.c
+--- vompserver-0.3.1.orig/vompclientrrproc.c	2012-05-01 14:35:39.000000000 +0200
++++ vompserver-0.3.1/vompclientrrproc.c	2012-05-01 14:46:41.000000000 +0200
+@@ -615,7 +615,7 @@
+ 
+   for (cRecording *recording = Recordings.First(); recording; recording = Recordings.Next(recording))
+   {
+-    resp->addULONG(recording->start);
++    resp->addULONG(recording->Start());
+     resp->addString(recording->Name());
+     resp->addString(recording->FileName());
+   }
+@@ -1770,9 +1770,9 @@
+     {
+       for (const cMark *m = Marks.First(); m; m = Marks.Next(m))
+       {
+-        log->log("RRProc", Log::DEBUG, "found Mark %i", m->position);
++        log->log("RRProc", Log::DEBUG, "found Mark %i", m->Position());
+ 
+-        resp->addULONG(m->position);
++        resp->addULONG(m->Position());
+       }
+     }
+     else
diff --git a/media-plugins/vdr-vompserver/vdr-vompserver-0.3.1-r1.ebuild b/media-plugins/vdr-vompserver/vdr-vompserver-0.3.1-r1.ebuild
index ef8ba67a876d..f2cf10fe40a6 100644
--- a/media-plugins/vdr-vompserver/vdr-vompserver-0.3.1-r1.ebuild
+++ b/media-plugins/vdr-vompserver/vdr-vompserver-0.3.1-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-vompserver/vdr-vompserver-0.3.1-r1.ebuild,v 1.1 2012/03/31 10:18:22 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-vompserver/vdr-vompserver-0.3.1-r1.ebuild,v 1.2 2012/05/01 12:56:48 hd_brummy Exp $
 
 EAPI="4"
 
-inherit vdr-plugin
+inherit vdr-plugin-2
 
 DESCRIPTION="VDR Plugin: server part for MediaMVP device"
 HOMEPAGE="http://www.loggytronic.com/vomp.php"
@@ -21,14 +21,18 @@ RDEPEND="${DEPEND}"
 PATCHES=("${FILESDIR}/rrprocstart.patch")
 
 src_prepare() {
-	vdr-plugin_src_prepare
+	vdr-plugin-2_src_prepare
 
 	sed -i "s:vompserver:vomp:" vompserver.c
 	sed -i "s:char b:// char b:" mediafile.c
+
+	if has_version ">=media-video/vdr-1.7.27"; then
+		epatch "${FILESDIR}/vdr-1.7.27.diff"
+	fi
 }
 
 src_install() {
-	vdr-plugin_src_install
+	vdr-plugin-2_src_install
 
 	dodoc README
 
@@ -38,7 +42,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	vdr-plugin_pkg_postinst
+	vdr-plugin-2_pkg_postinst
 
 	echo
 	elog "Have a look to the VOMP sample files in /etc/vdr/plugins."
diff --git a/media-plugins/vdr-xvdr/vdr-xvdr-9999.ebuild b/media-plugins/vdr-xvdr/vdr-xvdr-9999.ebuild
index 939ceeda23ab..59a10137360a 100644
--- a/media-plugins/vdr-xvdr/vdr-xvdr-9999.ebuild
+++ b/media-plugins/vdr-xvdr/vdr-xvdr-9999.ebuild
@@ -1,10 +1,10 @@
-# 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/media-plugins/vdr-xvdr/vdr-xvdr-9999.ebuild,v 1.4 2011/09/18 11:36:07 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-xvdr/vdr-xvdr-9999.ebuild,v 1.5 2012/05/01 11:44:37 hd_brummy Exp $
 
-EAPI=2
+EAPI="4"
 
-inherit vdr-plugin git-2
+inherit vdr-plugin-2 git-2
 
 EGIT_REPO_URI="git://github.com/pipelka/vdr-plugin-xvdr.git"
 
@@ -22,14 +22,14 @@ RDEPEND="${DEPEND}"
 S=${WORKDIR}/${PN}-plugin
 
 src_prepare() {
-	vdr-plugin_src_prepare
+	vdr-plugin-2_src_prepare
 
 	fix_vdr_libsi_include recplayer.c
 	fix_vdr_libsi_include receiver.c
 }
 
 src_install() {
-	vdr-plugin_src_install
+	vdr-plugin-2_src_install
 
 	insinto /etc/vdr/plugins/xvdr
 	doins xvdr/allowed_hosts.conf
diff --git a/media-sound/moc/Manifest b/media-sound/moc/Manifest
index 752176396512..79e56093d72c 100644
--- a/media-sound/moc/Manifest
+++ b/media-sound/moc/Manifest
@@ -1 +1,2 @@
 DIST moc-2.5.0_alpha4_p20111211.tar.xz 231324 RMD160 03a31facdbcbf4d0e6cf5835e88680518d84d2c4 SHA1 d7a77282898a32e63a96de5787e6fd43dbc1aeec SHA256 1879590fc5054a4599b5932fa5b985ed6acfe88ca1a279dd6ed07607bb5be968
+DIST moc-2.5.0_alpha4_p20120501.tar.xz 250840 RMD160 0f4387ae44fe8b36895c59293056db81b360551d SHA1 2dba3227551699a6d08aef83158373e8a37ccc6a SHA256 3babca9c8f8889b7b814721de2bda1e2a4dc2d8d315f00a5d9f4e8b1192d8fc0
diff --git a/media-sound/moc/moc-2.5.0_alpha4_p20120501.ebuild b/media-sound/moc/moc-2.5.0_alpha4_p20120501.ebuild
new file mode 100644
index 000000000000..dbd632f89cdd
--- /dev/null
+++ b/media-sound/moc/moc-2.5.0_alpha4_p20120501.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/moc/moc-2.5.0_alpha4_p20120501.ebuild,v 1.3 2012/05/01 09:45:28 radhermit Exp $
+
+EAPI=4
+inherit autotools
+
+DESCRIPTION="Music On Console - ncurses interface for playing audio files"
+HOMEPAGE="http://moc.daper.net"
+SRC_URI="http://dev.gentoo.org/~radhermit/distfiles/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="aac alsa curl debug ffmpeg flac jack libsamplerate mad modplug musepack
+oss sid sndfile speex timidity +unicode vorbis wavpack"
+
+# libltdl from libtool is used at runtime
+RDEPEND=">=sys-devel/libtool-2.2.6b
+	>=sys-libs/db-4
+	sys-libs/ncurses[unicode?]
+	aac? ( media-libs/faad2 )
+	alsa? ( media-libs/alsa-lib )
+	curl? ( net-misc/curl )
+	ffmpeg? ( virtual/ffmpeg )
+	flac? ( media-libs/flac )
+	jack? ( media-sound/jack-audio-connection-kit )
+	libsamplerate? ( media-libs/libsamplerate )
+	mad? ( media-libs/libmad sys-libs/zlib media-libs/libid3tag )
+	modplug? ( media-libs/libmodplug )
+	musepack? ( media-sound/musepack-tools media-libs/taglib )
+	sid? ( >=media-libs/libsidplay-2 )
+	sndfile? ( media-libs/libsndfile )
+	speex? ( media-libs/speex )
+	timidity? ( media-libs/libtimidity media-sound/timidity++ )
+	vorbis? ( media-libs/libogg media-libs/libvorbis )
+	wavpack? ( media-sound/wavpack )"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	dev-util/pkgconfig"
+
+src_prepare() {
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		--docdir="${EPREFIX}"/usr/share/doc/${PF}
+		$(use_enable debug)
+		$(use_with oss)
+		$(use_with alsa)
+		$(use_with jack)
+		$(use_with unicode ncursesw)
+		$(use_with libsamplerate samplerate)
+		$(use_with aac)
+		$(use_with ffmpeg)
+		$(use_with flac)
+		$(use_with modplug)
+		$(use_with mad mp3)
+		--without-rcc
+		$(use_with musepack)
+		$(use_with sid sidplay2)
+		$(use_with sndfile)
+		$(use_with speex)
+		$(use_with timidity)
+		$(use_with vorbis)
+		$(use_with wavpack)
+		$(use_with curl)
+		)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS NEWS TODO # The rest is installed by doc_DATA from "${S}"/Makefile.am
+	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
+}
diff --git a/metadata/cache/dev-embedded/bitbake-1.15.2 b/metadata/cache/dev-embedded/bitbake-1.15.2
new file mode 100644
index 000000000000..c626e02aab9e
--- /dev/null
+++ b/metadata/cache/dev-embedded/bitbake-1.15.2
@@ -0,0 +1,22 @@
+|| ( dev-lang/python:2.7[sqlite] dev-lang/python:2.6[sqlite] dev-lang/python:2.5[sqlite] >=dev-python/pysqlite-2.3.2 ) dev-python/ply dev-python/progressbar doc? ( dev-libs/libxslt ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
+|| ( dev-lang/python:2.7[sqlite] dev-lang/python:2.6[sqlite] dev-lang/python:2.5[sqlite] >=dev-python/pysqlite-2.3.2 ) dev-python/ply dev-python/progressbar || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
+0
+http://cgit.openembedded.org/cgit.cgi/bitbake/snapshot/bitbake-1.15.2.tar.bz2
+
+http://developer.berlios.de/projects/bitbake/
+GPL-2
+package management tool for OpenEmbedded
+~amd64 ~ppc ~x86
+distutils multilib python toolchain-funcs
+doc
+
+
+
+4
+
+compile install postinst postrm prepare setup
+
+
+
+
+
diff --git a/metadata/cache/dev-lang/v8-3.8.9.19 b/metadata/cache/dev-lang/v8-3.8.9.19
index 18ab70d8ffb5..edbeb7ad1d02 100644
--- a/metadata/cache/dev-lang/v8-3.8.9.19
+++ b/metadata/cache/dev-lang/v8-3.8.9.19
@@ -6,7 +6,7 @@ http://commondatastorage.googleapis.com/chromium-browser-official/v8-3.8.9.19.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-libs/libnl-3.2.8 b/metadata/cache/dev-libs/libnl-3.2.8
new file mode 100644
index 000000000000..f21af02d3443
--- /dev/null
+++ b/metadata/cache/dev-libs/libnl-3.2.8
@@ -0,0 +1,22 @@
+sys-devel/flex virtual/yacc
+
+3
+http://www.infradead.org/~tgr/libnl/files/libnl-3.2.8.tar.gz
+
+http://www.infradead.org/~tgr/libnl/
+LGPL-2.1
+A library for applications dealing with netlink socket
+~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux
+eutils multilib toolchain-funcs user
+static-libs utils
+
+
+
+4
+
+configure install prepare
+
+
+
+
+
diff --git a/metadata/cache/dev-python/jinja-2.5.5 b/metadata/cache/dev-python/jinja-2.5.5
deleted file mode 100644
index a9df90a35637..000000000000
--- a/metadata/cache/dev-python/jinja-2.5.5
+++ /dev/null
@@ -1,22 +0,0 @@
-dev-python/markupsafe dev-python/setuptools i18n? ( >=dev-python/Babel-0.9.3 ) doc? ( >=dev-python/sphinx-0.6 ) dev-lang/python
-dev-python/markupsafe dev-python/setuptools i18n? ( >=dev-python/Babel-0.9.3 ) dev-lang/python
-0
-mirror://pypi/J/Jinja2/Jinja2-2.5.5.tar.gz
-
-http://jinja.pocoo.org/ http://pypi.python.org/pypi/Jinja2
-BSD
-A small but fast and easy to use stand-alone template engine written in pure python.
-alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris
-distutils multilib python toolchain-funcs
-doc examples i18n vim-syntax
-
-
-
-3
-
-compile install postinst postrm prepare test
-
-
-
-
-
diff --git a/metadata/cache/dev-python/sphinx-1.1.3-r2 b/metadata/cache/dev-python/sphinx-1.1.3-r2
index d44394e42a5e..d439f945c9c8 100644
--- a/metadata/cache/dev-python/sphinx-1.1.3-r2
+++ b/metadata/cache/dev-python/sphinx-1.1.3-r2
@@ -1,5 +1,5 @@
->=dev-python/docutils-0.7 >=dev-python/jinja-2.3 >=dev-python/pygments-1.2 dev-python/setuptools latex? ( dev-texlive/texlive-latexextra ) =dev-lang/python-2* test? ( dev-python/nose )
->=dev-python/docutils-0.7 >=dev-python/jinja-2.3 >=dev-python/pygments-1.2 dev-python/setuptools latex? ( dev-texlive/texlive-latexextra ) =dev-lang/python-2*
+>=dev-python/docutils-0.7 >=dev-python/jinja-2.3 >=dev-python/pygments-1.2 dev-python/setuptools latex? ( dev-texlive/texlive-latexextra app-text/dvipng ) =dev-lang/python-2* test? ( dev-python/nose )
+>=dev-python/docutils-0.7 >=dev-python/jinja-2.3 >=dev-python/pygments-1.2 dev-python/setuptools latex? ( dev-texlive/texlive-latexextra app-text/dvipng ) =dev-lang/python-2*
 0
 mirror://pypi/S/Sphinx/Sphinx-1.1.3.tar.gz
 
diff --git a/metadata/cache/dev-util/valgrind-3.7.0-r4 b/metadata/cache/dev-util/valgrind-3.7.0-r4
new file mode 100644
index 000000000000..5ee75a35a694
--- /dev/null
+++ b/metadata/cache/dev-util/valgrind-3.7.0-r4
@@ -0,0 +1,22 @@
+mpi? ( virtual/mpi ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+mpi? ( virtual/mpi )
+0
+http://www.valgrind.org/downloads/valgrind-3.7.0.tar.bz2
+
+http://www.valgrind.org
+GPL-2
+An open-source memory debugger for GNU/Linux
+-* ~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x64-macos
+autotools eutils flag-o-matic libtool multilib pax-utils toolchain-funcs user
+mpi
+
+
+
+4
+
+configure install postinst prepare
+
+
+
+
+
diff --git a/metadata/cache/dev-util/visualvm-1.3.3-r2 b/metadata/cache/dev-util/visualvm-1.3.3-r2
new file mode 100644
index 000000000000..3c065258ed21
--- /dev/null
+++ b/metadata/cache/dev-util/visualvm-1.3.3-r2
@@ -0,0 +1,22 @@
+dev-java/icedtea:6 dev-java/netbeans-harness:7.1 dev-java/netbeans-platform:7.1 dev-java/ant-core dev-java/ant-nodeps || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-java/icedtea:6 dev-java/netbeans-harness:7.1 dev-java/netbeans-platform:7.1
+6
+http://icedtea.classpath.org/download/visualvm/visualvm_harness-1.3.tar.gz http://icedtea.classpath.org/download/visualvm/visualvm_133-src.tar.gz http://icedtea.classpath.org/download/visualvm/netbeans-profiler-visualvm_release701.tar.gz
+
+http://icedtea.classpath.org
+GPL-2-with-linking-exception
+Integrates commandline JDK tools and profiling capabilites.
+~amd64
+autotools eutils libtool multilib toolchain-funcs user
+
+
+
+
+4
+
+configure install prepare unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-util/visualvm-1.3.3-r9 b/metadata/cache/dev-util/visualvm-1.3.3-r9
new file mode 100644
index 000000000000..f9d57e3c3279
--- /dev/null
+++ b/metadata/cache/dev-util/visualvm-1.3.3-r9
@@ -0,0 +1,22 @@
+dev-java/icedtea:7 dev-java/netbeans-harness:7.1 dev-java/netbeans-platform:7.1 dev-java/ant-core dev-java/ant-nodeps || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-java/icedtea:7 dev-java/netbeans-harness:7.1 dev-java/netbeans-platform:7.1
+7
+http://icedtea.classpath.org/download/visualvm/visualvm_harness-1.3.tar.gz http://icedtea.classpath.org/download/visualvm/visualvm_133-src.tar.gz http://icedtea.classpath.org/download/visualvm/netbeans-profiler-visualvm_release701.tar.gz
+
+http://icedtea.classpath.org
+GPL-2-with-linking-exception
+Integrates commandline JDK tools and profiling capabilites.
+~amd64
+autotools eutils libtool multilib toolchain-funcs user
+
+
+
+
+4
+
+configure install prepare unpack
+
+
+
+
+
diff --git a/metadata/cache/games-strategy/ufo-ai-2.4 b/metadata/cache/games-strategy/ufo-ai-2.4
new file mode 100644
index 000000000000..c52ced3b6b65
--- /dev/null
+++ b/metadata/cache/games-strategy/ufo-ai-2.4
@@ -0,0 +1,22 @@
+!dedicated? ( virtual/opengl virtual/glu media-libs/libsdl media-libs/sdl-image[jpeg,png] media-libs/sdl-ttf media-libs/sdl-mixer virtual/jpeg media-libs/libpng:0 media-libs/libogg media-libs/libvorbis x11-proto/xf86vidmodeproto ) net-misc/curl sys-devel/gettext sys-libs/zlib editor? ( dev-libs/libxml2 virtual/jpeg media-libs/openal x11-libs/gtkglext x11-libs/gtksourceview:2.0 )
+!dedicated? ( virtual/opengl virtual/glu media-libs/libsdl media-libs/sdl-image[jpeg,png] media-libs/sdl-ttf media-libs/sdl-mixer virtual/jpeg media-libs/libpng:0 media-libs/libogg media-libs/libvorbis x11-proto/xf86vidmodeproto ) net-misc/curl sys-devel/gettext sys-libs/zlib editor? ( dev-libs/libxml2 virtual/jpeg media-libs/openal x11-libs/gtkglext x11-libs/gtksourceview:2.0 )
+0
+mirror://sourceforge/ufoai/ufoai-2.4-source.tar.bz2 mirror://sourceforge/ufoai/ufoai-2.4-data.tar http://mattn.ninex.info/1maps.pk3
+
+http://ufoai.sourceforge.net/
+GPL-2
+UFO: Alien Invasion - X-COM inspired strategy game
+~amd64 ~ppc ~x86
+base eutils flag-o-matic games multilib toolchain-funcs user
+debug dedicated editor
+
+
+
+3
+
+compile configure install postinst preinst prepare setup unpack
+
+
+
+
+
diff --git a/metadata/cache/media-gfx/pinta-1.3 b/metadata/cache/media-gfx/pinta-1.3
new file mode 100644
index 000000000000..89cf4542697a
--- /dev/null
+++ b/metadata/cache/media-gfx/pinta-1.3
@@ -0,0 +1,22 @@
+dev-dotnet/atk-sharp:2 dev-dotnet/gdk-sharp:2 dev-dotnet/glib-sharp:2 dev-dotnet/gtk-sharp:2 dev-dotnet/mono-addins[gtk] dev-dotnet/pango-sharp:2 dev-lang/mono dev-util/intltool dev-util/pkgconfig sys-devel/gettext
+dev-dotnet/atk-sharp:2 dev-dotnet/gdk-sharp:2 dev-dotnet/glib-sharp:2 dev-dotnet/gtk-sharp:2 dev-dotnet/mono-addins[gtk] dev-dotnet/pango-sharp:2 dev-lang/mono x11-libs/cairo[X] x11-libs/gdk-pixbuf[X,jpeg=,tiff=] x11-themes/gnome-icon-theme
+0
+mirror://github/PintaProject/Pinta/pinta-1.3.tar.gz
+
+http://pinta-project.com
+MIT CCPL-Attribution-3.0
+Simple Painting for Gtk
+~amd64 ~x86
+fdo-mime mono multilib toolchain-funcs
+jpeg tiff
+
+
+
+4
+
+postinst postrm prepare
+
+
+
+
+
diff --git a/metadata/cache/media-gfx/rawtherapee-4.0.4 b/metadata/cache/media-gfx/rawtherapee-4.0.4
deleted file mode 100644
index d9080c0a87b4..000000000000
--- a/metadata/cache/media-gfx/rawtherapee-4.0.4
+++ /dev/null
@@ -1,22 +0,0 @@
-bzip2? ( app-arch/bzip2 ) >=dev-cpp/gtkmm-2.12:2.4 >=dev-cpp/glibmm-2.16:2 dev-libs/libsigc++:2 media-libs/tiff media-libs/libpng media-libs/libiptcdata media-libs/lcms:2 sys-libs/zlib virtual/jpeg app-arch/xz-utils dev-util/pkgconfig >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
-bzip2? ( app-arch/bzip2 ) >=dev-cpp/gtkmm-2.12:2.4 >=dev-cpp/glibmm-2.16:2 dev-libs/libsigc++:2 media-libs/tiff media-libs/libpng media-libs/libiptcdata media-libs/lcms:2 sys-libs/zlib virtual/jpeg
-0
-http://dev.gentoo.org/~radhermit/distfiles/rawtherapee-4.0.4.tar.xz
-
-http://www.rawtherapee.com/
-GPL-3
-Digital photo editing tool focused on RAW image file manipulation and conversion
-~amd64 ~x86
-base cmake-utils eutils flag-o-matic multilib toolchain-funcs user
-bzip2 doc openmp
-
-
-
-4
-
-compile configure install prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/media-gfx/rawtherapee-4.0.5 b/metadata/cache/media-gfx/rawtherapee-4.0.8
similarity index 82%
rename from metadata/cache/media-gfx/rawtherapee-4.0.5
rename to metadata/cache/media-gfx/rawtherapee-4.0.8
index 191ff217bfa0..7843aad1169a 100644
--- a/metadata/cache/media-gfx/rawtherapee-4.0.5
+++ b/metadata/cache/media-gfx/rawtherapee-4.0.8
@@ -1,11 +1,11 @@
 bzip2? ( app-arch/bzip2 ) >=dev-cpp/gtkmm-2.12:2.4 >=dev-cpp/glibmm-2.16:2 dev-libs/libsigc++:2 media-libs/tiff media-libs/libpng media-libs/libiptcdata media-libs/lcms:2 sys-libs/zlib virtual/jpeg app-arch/xz-utils dev-util/pkgconfig >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
 bzip2? ( app-arch/bzip2 ) >=dev-cpp/gtkmm-2.12:2.4 >=dev-cpp/glibmm-2.16:2 dev-libs/libsigc++:2 media-libs/tiff media-libs/libpng media-libs/libiptcdata media-libs/lcms:2 sys-libs/zlib virtual/jpeg
 0
-http://dev.gentoo.org/~radhermit/distfiles/rawtherapee-4.0.5.tar.xz
+http://rawtherapee.googlecode.com/files/rawtherapee-4.0.8.tar.xz
 
 http://www.rawtherapee.com/
 GPL-3
-Digital photo editing tool focused on RAW image file manipulation and conversion
+A powerful cross-platform raw image processing program
 ~amd64 ~x86
 base cmake-utils eutils flag-o-matic multilib toolchain-funcs user
 bzip2 doc openmp
diff --git a/metadata/cache/media-libs/audiofile-0.3.4 b/metadata/cache/media-libs/audiofile-0.3.4
new file mode 100644
index 000000000000..bc576dfc70f7
--- /dev/null
+++ b/metadata/cache/media-libs/audiofile-0.3.4
@@ -0,0 +1,22 @@
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils
+
+0
+mirror://gnome/sources/audiofile/0.3/audiofile-0.3.4.tar.xz
+
+http://www.68k.org/~michael/audiofile/
+GPL-2 LGPL-2
+An elegant API for accessing audio files
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+autotools eutils gnome.org libtool multilib toolchain-funcs user versionator
+static-libs
+
+
+
+4
+
+configure install prepare test
+
+
+
+
+
diff --git a/metadata/cache/media-libs/tunepimp-0.5.3-r3 b/metadata/cache/media-libs/tunepimp-0.5.3-r3
deleted file mode 100644
index 6c03cef2a92f..000000000000
--- a/metadata/cache/media-libs/tunepimp-0.5.3-r3
+++ /dev/null
@@ -1,22 +0,0 @@
-sys-libs/zlib dev-libs/expat net-misc/curl media-libs/flac media-libs/libmad >=media-libs/musicbrainz-2.1:1 >=media-libs/libmp4v2-1.9 media-libs/libofa media-libs/libvorbis sys-libs/readline dev-util/pkgconfig !media-sound/trm || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
-sys-libs/zlib dev-libs/expat net-misc/curl media-libs/flac media-libs/libmad >=media-libs/musicbrainz-2.1:1 >=media-libs/libmp4v2-1.9 media-libs/libofa media-libs/libvorbis sys-libs/readline python? ( =dev-lang/python-2* )
-0
-http://ftp.musicbrainz.org/pub/musicbrainz/libtunepimp-0.5.3.tar.gz
-
-http://www.musicbrainz.org/products/tunepimp
-GPL-2
-TunePimp is a library to create MusicBrainz enabled tagging applications.
-amd64 hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
-autotools distutils eutils libtool multilib python toolchain-funcs user
-python
-
-
-
-3
-
-compile configure install postinst postrm prepare setup
-
-
-
-
-
diff --git a/metadata/cache/media-plugins/vdr-text2skin-1.2 b/metadata/cache/media-plugins/vdr-text2skin-1.2
deleted file mode 100644
index 40f6f4b50ce7..000000000000
--- a/metadata/cache/media-plugins/vdr-text2skin-1.2
+++ /dev/null
@@ -1,22 +0,0 @@
->=media-video/vdr-1.3.18 media-gfx/imagemagick !media-plugins/vdr-text2skin-cvs truetype? ( media-libs/freetype ) dev-util/pkgconfig >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
->=media-video/vdr-1.3.18 media-gfx/imagemagick !media-plugins/vdr-text2skin-cvs truetype? ( media-libs/freetype ) >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
-0
-mirror://vdr-developerorg/112/vdr-text2skin-1.2.tgz
-
-http://projects.vdr-developer.org/projects/show/plg-text2skin
-GPL-2
-VDR text2skin PlugIn
-~x86
-base eutils flag-o-matic multilib toolchain-funcs user vdr-plugin versionator
-+truetype
-
-
-
-1
-
-compile config install postinst postrm setup unpack
-
-
-
-
-
diff --git a/metadata/cache/media-plugins/vdr-text2skin-1.3 b/metadata/cache/media-plugins/vdr-text2skin-1.3
deleted file mode 100644
index 5ea6bd7c2076..000000000000
--- a/metadata/cache/media-plugins/vdr-text2skin-1.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=media-video/vdr-1.6.0 media-gfx/imagemagick !media-plugins/vdr-text2skin-cvs truetype? ( media-libs/freetype ) dev-util/pkgconfig >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
->=media-video/vdr-1.6.0 media-gfx/imagemagick !media-plugins/vdr-text2skin-cvs truetype? ( media-libs/freetype ) >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
-0
-mirror://vdr-developerorg/127/vdr-text2skin-1.3.tgz
-
-http://projects.vdr-developer.org/projects/show/plg-text2skin
-GPL-2
-VDR text2skin PlugIn
-~x86 ~amd64
-base eutils flag-o-matic multilib toolchain-funcs user vdr-plugin versionator
-+truetype
-
-
-
-2
-
-compile config configure install postinst postrm prepare setup unpack
-
-
-
-
-
diff --git a/metadata/cache/media-plugins/vdr-text2skin-1.3.1 b/metadata/cache/media-plugins/vdr-text2skin-1.3.1
deleted file mode 100644
index c171324bf314..000000000000
--- a/metadata/cache/media-plugins/vdr-text2skin-1.3.1
+++ /dev/null
@@ -1,22 +0,0 @@
->=media-video/vdr-1.6.0 media-gfx/imagemagick truetype? ( media-libs/freetype ) dev-util/pkgconfig >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
->=media-video/vdr-1.6.0 media-gfx/imagemagick truetype? ( media-libs/freetype ) >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
-0
-mirror://vdr-developerorg/344/vdr-text2skin-1.3.1.tgz
-
-http://projects.vdr-developer.org/projects/show/plg-text2skin
-GPL-2
-VDR text2skin PlugIn
-~x86 ~amd64
-base eutils flag-o-matic multilib toolchain-funcs user vdr-plugin versionator
-+truetype
-
-
-
-2
-
-compile config configure install postinst postrm prepare setup unpack
-
-
-
-
-
diff --git a/metadata/cache/media-plugins/vdr-text2skin-1.3.2 b/metadata/cache/media-plugins/vdr-text2skin-1.3.2
index deaa7d49a04d..0f039c6e0bbe 100644
--- a/metadata/cache/media-plugins/vdr-text2skin-1.3.2
+++ b/metadata/cache/media-plugins/vdr-text2skin-1.3.2
@@ -1,4 +1,4 @@
->=media-video/vdr-1.6.0 imagemagick? ( || ( media-gfx/imagemagick[cxx] media-gfx/graphicsmagick[cxx] ) ) imlib? ( media-libs/imlib2 >=media-video/vdr-1.6.0[-graphtft] ) imagemagick? ( dev-util/pkgconfig ) imlib? ( dev-util/pkgconfig ) nls? ( sys-devel/gettext ) >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+>=media-video/vdr-1.6.0 imagemagick? ( || ( media-gfx/imagemagick[cxx] media-gfx/graphicsmagick[cxx] ) ) imlib? ( media-libs/imlib2 >=media-video/vdr-1.6.0[-graphtft] ) imagemagick? ( dev-util/pkgconfig ) imlib? ( dev-util/pkgconfig ) sys-devel/gettext >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
 >=media-video/vdr-1.6.0 imagemagick? ( || ( media-gfx/imagemagick[cxx] media-gfx/graphicsmagick[cxx] ) ) imlib? ( media-libs/imlib2 >=media-video/vdr-1.6.0[-graphtft] ) >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 0
 mirror://vdr-developerorg/783/vdr-text2skin-1.3.2.tgz
@@ -7,8 +7,8 @@ http://projects.vdr-developer.org/projects/show/plg-text2skin
 GPL-2
 VDR text2skin PlugIn
 ~x86 ~amd64
-base eutils flag-o-matic multilib toolchain-funcs user vdr-plugin
-contrib doc +imagemagick imlib nls
+base eutils flag-o-matic multilib toolchain-funcs user vdr-plugin-2
+contrib doc +imagemagick imlib
 imagemagick? ( !imlib ) imlib? ( !imagemagick )
 
 
diff --git a/metadata/cache/media-plugins/vdr-videosystem-0.0.1 b/metadata/cache/media-plugins/vdr-videosystem-0.0.1
index c5edd3cf2864..7cdd47600fbc 100644
--- a/metadata/cache/media-plugins/vdr-videosystem-0.0.1
+++ b/metadata/cache/media-plugins/vdr-videosystem-0.0.1
@@ -1,5 +1,5 @@
 >=media-video/vdr-1.3.18 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
->=media-video/vdr-1.3.18 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
+>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 0
 mirror://gentoo/vdr-videosystem-0.0.1.tgz
 
@@ -7,14 +7,14 @@ http://www.vdr-portal.de/board/thread.php?threadid=43516
 GPL-2
 VDR plugin: Switch OSD resolution depending on signal-videosystem (PAL/NTSC)
 x86
-base eutils flag-o-matic multilib toolchain-funcs user vdr-plugin
+base eutils flag-o-matic multilib toolchain-funcs user vdr-plugin-2
 
 
 
 
+4
 
-
-compile config install postinst postrm setup unpack
+compile config configure install postinst postrm prepare setup unpack
 
 
 
diff --git a/metadata/cache/media-plugins/vdr-vodcatcher-0.1.1 b/metadata/cache/media-plugins/vdr-vodcatcher-0.1.1
deleted file mode 100644
index 05d99563bf56..000000000000
--- a/metadata/cache/media-plugins/vdr-vodcatcher-0.1.1
+++ /dev/null
@@ -1,22 +0,0 @@
-net-misc/curl media-video/vdr media-plugins/vdr-mplayer >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
-net-misc/curl media-video/vdr media-plugins/vdr-mplayer >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
-0
-http://www.e-tobi.net/blog/files/vdr-vodcatcher-0.1.1.tar.gz
-
-http://www.e-tobi.net/blog/pages/vdr-vodcatcher
-GPL-2
-VDR plugin: Downloads rss-feeds and passes video enclosures to the mplayer plugin
-~amd64 ~x86
-base eutils flag-o-matic multilib toolchain-funcs user vdr-plugin
-
-
-
-
-
-
-compile config install postinst postrm setup unpack
-
-
-
-
-
diff --git a/metadata/cache/media-plugins/vdr-vodcatcher-0.2.1 b/metadata/cache/media-plugins/vdr-vodcatcher-0.2.1
deleted file mode 100644
index ae474d1245d5..000000000000
--- a/metadata/cache/media-plugins/vdr-vodcatcher-0.2.1
+++ /dev/null
@@ -1,22 +0,0 @@
-net-misc/curl media-video/vdr || ( media-plugins/vdr-mplayer media-plugins/vdr-xineliboutput ) >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
-net-misc/curl media-video/vdr || ( media-plugins/vdr-mplayer media-plugins/vdr-xineliboutput ) >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
-0
-http://www.e-tobi.net/blog/files/vdr-vodcatcher-0.2.1.tar.gz
-
-http://www.e-tobi.net/blog/pages/vdr-vodcatcher
-GPL-2
-VDR plugin: Downloads rss-feeds and passes video enclosures to the mplayer plugin
-~amd64 ~x86
-base eutils flag-o-matic multilib toolchain-funcs user vdr-plugin
-
-
-
-
-
-
-compile config install postinst postrm setup unpack
-
-
-
-
-
diff --git a/metadata/cache/media-plugins/vdr-vodcatcher-0.2.2 b/metadata/cache/media-plugins/vdr-vodcatcher-0.2.2
index 0908e68ab94d..862bf91dc976 100644
--- a/metadata/cache/media-plugins/vdr-vodcatcher-0.2.2
+++ b/metadata/cache/media-plugins/vdr-vodcatcher-0.2.2
@@ -1,4 +1,4 @@
-net-misc/curl >=dev-libs/tinyxml-2.6.1 media-video/vdr || ( media-plugins/vdr-mplayer media-plugins/vdr-xineliboutput ) >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+net-misc/curl >=dev-libs/tinyxml-2.6.1 media-video/vdr >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
 net-misc/curl >=dev-libs/tinyxml-2.6.1 media-video/vdr || ( media-plugins/vdr-mplayer media-plugins/vdr-xineliboutput ) >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 0
 mirror://vdr-developerorg/154/vdr-vodcatcher-0.2.2.tar.gz
@@ -7,12 +7,12 @@ http://projects.vdr-developer.org/projects/plg-vodcatcher
 GPL-2
 VDR plugin: Downloads rss-feeds and passes video enclosures to the mplayer plugin
 ~amd64 ~x86
-base eutils flag-o-matic multilib toolchain-funcs user vdr-plugin
+base eutils flag-o-matic multilib toolchain-funcs user vdr-plugin-2
 
 
 
 
-2
+4
 
 compile config configure install postinst postrm prepare setup unpack
 
diff --git a/metadata/cache/media-plugins/vdr-vompserver-0.3.1-r1 b/metadata/cache/media-plugins/vdr-vompserver-0.3.1-r1
index aba390c30e12..62f139a81c66 100644
--- a/metadata/cache/media-plugins/vdr-vompserver-0.3.1-r1
+++ b/metadata/cache/media-plugins/vdr-vompserver-0.3.1-r1
@@ -7,7 +7,7 @@ http://www.loggytronic.com/vomp.php
 GPL-2
 VDR Plugin: server part for MediaMVP device
 ~amd64 ~x86
-base eutils flag-o-matic multilib toolchain-funcs user vdr-plugin
+base eutils flag-o-matic multilib toolchain-funcs user vdr-plugin-2
 
 
 
diff --git a/metadata/cache/media-plugins/vdr-xvdr-9999 b/metadata/cache/media-plugins/vdr-xvdr-9999
index 211cfa4b4393..a4e704082ca1 100644
--- a/metadata/cache/media-plugins/vdr-xvdr-9999
+++ b/metadata/cache/media-plugins/vdr-xvdr-9999
@@ -7,12 +7,12 @@ https://github.com/pipelka/vdr-plugin-xvdr
 GPL-2
 VDR plugin: XVDR Streamserver Plugin
 
-base eutils flag-o-matic git-2 multilib toolchain-funcs user vdr-plugin
+base eutils flag-o-matic git-2 multilib toolchain-funcs user vdr-plugin-2
 
 
 
 
-2
+4
 
 compile config configure install postinst postrm prepare setup unpack
 
diff --git a/metadata/cache/media-sound/moc-2.5.0_alpha4_p20120501 b/metadata/cache/media-sound/moc-2.5.0_alpha4_p20120501
new file mode 100644
index 000000000000..63b36b0a7d9c
--- /dev/null
+++ b/metadata/cache/media-sound/moc-2.5.0_alpha4_p20120501
@@ -0,0 +1,22 @@
+>=sys-devel/libtool-2.2.6b >=sys-libs/db-4 sys-libs/ncurses[unicode?] aac? ( media-libs/faad2 ) alsa? ( media-libs/alsa-lib ) curl? ( net-misc/curl ) ffmpeg? ( virtual/ffmpeg ) flac? ( media-libs/flac ) jack? ( media-sound/jack-audio-connection-kit ) libsamplerate? ( media-libs/libsamplerate ) mad? ( media-libs/libmad sys-libs/zlib media-libs/libid3tag ) modplug? ( media-libs/libmodplug ) musepack? ( media-sound/musepack-tools media-libs/taglib ) sid? ( >=media-libs/libsidplay-2 ) sndfile? ( media-libs/libsndfile ) speex? ( media-libs/speex ) timidity? ( media-libs/libtimidity media-sound/timidity++ ) vorbis? ( media-libs/libogg media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) app-arch/xz-utils dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=sys-devel/libtool-2.2.6b >=sys-libs/db-4 sys-libs/ncurses[unicode?] aac? ( media-libs/faad2 ) alsa? ( media-libs/alsa-lib ) curl? ( net-misc/curl ) ffmpeg? ( virtual/ffmpeg ) flac? ( media-libs/flac ) jack? ( media-sound/jack-audio-connection-kit ) libsamplerate? ( media-libs/libsamplerate ) mad? ( media-libs/libmad sys-libs/zlib media-libs/libid3tag ) modplug? ( media-libs/libmodplug ) musepack? ( media-sound/musepack-tools media-libs/taglib ) sid? ( >=media-libs/libsidplay-2 ) sndfile? ( media-libs/libsndfile ) speex? ( media-libs/speex ) timidity? ( media-libs/libtimidity media-sound/timidity++ ) vorbis? ( media-libs/libogg media-libs/libvorbis ) wavpack? ( media-sound/wavpack )
+0
+http://dev.gentoo.org/~radhermit/distfiles/moc-2.5.0_alpha4_p20120501.tar.xz
+
+http://moc.daper.net
+GPL-2
+Music On Console - ncurses interface for playing audio files
+~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+autotools eutils libtool multilib toolchain-funcs user
+aac alsa curl debug ffmpeg flac jack libsamplerate mad modplug musepack oss sid sndfile speex timidity +unicode vorbis wavpack
+
+
+
+4
+
+configure install prepare
+
+
+
+
+
diff --git a/metadata/cache/net-misc/curl-7.25.0-r1 b/metadata/cache/net-misc/curl-7.25.0-r1
index 9c1cc88d0208..18137519a36b 100644
--- a/metadata/cache/net-misc/curl-7.25.0-r1
+++ b/metadata/cache/net-misc/curl-7.25.0-r1
@@ -1,5 +1,5 @@
-ldap? ( net-nds/openldap ) ssl? ( curl_ssl_axtls? ( net-libs/axTLS app-misc/ca-certificates ) curl_ssl_gnutls? ( || ( ( <=net-libs/gnutls-2.10.5 dev-libs/libgcrypt[static-libs?] app-misc/ca-certificates ) ( net-libs/gnutls[-nettle,static-libs?] dev-libs/libgcrypt[static-libs?] app-misc/ca-certificates ) ( net-libs/gnutls[nettle,static-libs?] dev-libs/nettle app-misc/ca-certificates ) ) ) curl_ssl_openssl? ( dev-libs/openssl[static-libs?] ) curl_ssl_nss? ( dev-libs/nss app-misc/ca-certificates ) curl_ssl_polarssl? ( net-libs/polarssl app-misc/ca-certificates ) ) idn? ( net-dns/libidn[static-libs?] ) ares? ( net-dns/c-ares ) kerberos? ( virtual/krb5 ) ssh? ( net-libs/libssh2[static-libs?] ) sys-libs/zlib sys-apps/ed dev-util/pkgconfig test? ( sys-apps/diffutils dev-lang/perl ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
-ldap? ( net-nds/openldap ) ssl? ( curl_ssl_axtls? ( net-libs/axTLS app-misc/ca-certificates ) curl_ssl_gnutls? ( || ( ( <=net-libs/gnutls-2.10.5 dev-libs/libgcrypt[static-libs?] app-misc/ca-certificates ) ( net-libs/gnutls[-nettle,static-libs?] dev-libs/libgcrypt[static-libs?] app-misc/ca-certificates ) ( net-libs/gnutls[nettle,static-libs?] dev-libs/nettle app-misc/ca-certificates ) ) ) curl_ssl_openssl? ( dev-libs/openssl[static-libs?] ) curl_ssl_nss? ( dev-libs/nss app-misc/ca-certificates ) curl_ssl_polarssl? ( net-libs/polarssl app-misc/ca-certificates ) ) idn? ( net-dns/libidn[static-libs?] ) ares? ( net-dns/c-ares ) kerberos? ( virtual/krb5 ) ssh? ( net-libs/libssh2[static-libs?] ) sys-libs/zlib
+ldap? ( net-nds/openldap ) ssl? ( curl_ssl_axtls? ( net-libs/axTLS app-misc/ca-certificates ) curl_ssl_gnutls? ( || ( ( >=net-libs/gnutls-3[static-libs?] dev-libs/nettle ) ( =net-libs/gnutls-2.12*[nettle,static-libs?] dev-libs/nettle ) ( =net-libs/gnutls-2.12*[-nettle,static-libs?] dev-libs/libgcrypt[static-libs?] ) ( <net-libs/gnutls-2.12 dev-libs/libgcrypt[static-libs?] ) ) app-misc/ca-certificates ) curl_ssl_openssl? ( dev-libs/openssl[static-libs?] ) curl_ssl_nss? ( dev-libs/nss app-misc/ca-certificates ) curl_ssl_polarssl? ( net-libs/polarssl app-misc/ca-certificates ) ) idn? ( net-dns/libidn[static-libs?] ) ares? ( net-dns/c-ares ) kerberos? ( virtual/krb5 ) ssh? ( net-libs/libssh2[static-libs?] ) sys-libs/zlib sys-apps/ed dev-util/pkgconfig test? ( sys-apps/diffutils dev-lang/perl ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+ldap? ( net-nds/openldap ) ssl? ( curl_ssl_axtls? ( net-libs/axTLS app-misc/ca-certificates ) curl_ssl_gnutls? ( || ( ( >=net-libs/gnutls-3[static-libs?] dev-libs/nettle ) ( =net-libs/gnutls-2.12*[nettle,static-libs?] dev-libs/nettle ) ( =net-libs/gnutls-2.12*[-nettle,static-libs?] dev-libs/libgcrypt[static-libs?] ) ( <net-libs/gnutls-2.12 dev-libs/libgcrypt[static-libs?] ) ) app-misc/ca-certificates ) curl_ssl_openssl? ( dev-libs/openssl[static-libs?] ) curl_ssl_nss? ( dev-libs/nss app-misc/ca-certificates ) curl_ssl_polarssl? ( net-libs/polarssl app-misc/ca-certificates ) ) idn? ( net-dns/libidn[static-libs?] ) ares? ( net-dns/c-ares ) kerberos? ( virtual/krb5 ) ssh? ( net-libs/libssh2[static-libs?] ) sys-libs/zlib
 0
 http://curl.haxx.se/download/curl-7.25.0.tar.bz2
 
diff --git a/metadata/cache/net-misc/strongswan-4.6.2 b/metadata/cache/net-misc/strongswan-4.6.3
similarity index 95%
rename from metadata/cache/net-misc/strongswan-4.6.2
rename to metadata/cache/net-misc/strongswan-4.6.3
index c09904a7ac05..b297acb1fea0 100644
--- a/metadata/cache/net-misc/strongswan-4.6.2
+++ b/metadata/cache/net-misc/strongswan-4.6.3
@@ -1,7 +1,7 @@
 !net-misc/openswan >=dev-libs/gmp-4.1.5 gcrypt? ( dev-libs/libgcrypt ) caps? ( sys-libs/libcap ) curl? ( net-misc/curl ) ldap? ( net-nds/openldap ) smartcard? ( dev-libs/opensc ) openssl? ( >=dev-libs/openssl-0.9.8[-bindist] ) mysql? ( virtual/mysql ) sqlite? ( >=dev-db/sqlite-3.3.1 ) virtual/linux-sources sys-kernel/linux-headers
 !net-misc/openswan >=dev-libs/gmp-4.1.5 gcrypt? ( dev-libs/libgcrypt ) caps? ( sys-libs/libcap ) curl? ( net-misc/curl ) ldap? ( net-nds/openldap ) smartcard? ( dev-libs/opensc ) openssl? ( >=dev-libs/openssl-0.9.8[-bindist] ) mysql? ( virtual/mysql ) sqlite? ( >=dev-db/sqlite-3.3.1 ) virtual/logger sys-apps/iproute2
 0
-http://download.strongswan.org/strongswan-4.6.2.tar.bz2
+http://download.strongswan.org/strongswan-4.6.3.tar.bz2
 
 http://www.strongswan.org/
 GPL-2 RSA-MD5 RSA-PKCS11 DES
diff --git a/metadata/cache/net-misc/tor-0.2.3.13_alpha b/metadata/cache/net-misc/tor-0.2.3.13_alpha
deleted file mode 100644
index 04952aa44fe9..000000000000
--- a/metadata/cache/net-misc/tor-0.2.3.13_alpha
+++ /dev/null
@@ -1,22 +0,0 @@
-dev-libs/openssl >=dev-libs/libevent-2.0.14 nat-pmp? ( net-libs/libnatpmp ) upnp? ( net-libs/miniupnpc ) selinux? ( sec-policy/selinux-tor ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
-dev-libs/openssl >=dev-libs/libevent-2.0.14 nat-pmp? ( net-libs/libnatpmp ) upnp? ( net-libs/miniupnpc ) selinux? ( sec-policy/selinux-tor )
-0
-http://www.torproject.org/dist/tor-0.2.3.13-alpha.tar.gz
-
-http://www.torproject.org/
-BSD
-Anonymizing overlay network for TCP
-~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
-autotools eutils flag-o-matic libtool multilib toolchain-funcs user versionator
-+bufferevents nat-pmp tor-hardening transparent-proxy threads upnp selinux
-
-
-
-4
-
-configure install postinst prepare setup
-
-
-
-
-
diff --git a/metadata/cache/net-misc/tor-0.2.3.15_alpha b/metadata/cache/net-misc/tor-0.2.3.15_alpha
new file mode 100644
index 000000000000..fb36add45cf9
--- /dev/null
+++ b/metadata/cache/net-misc/tor-0.2.3.15_alpha
@@ -0,0 +1,22 @@
+dev-libs/openssl sys-libs/zlib >=dev-libs/libevent-2.0.14 nat-pmp? ( net-libs/libnatpmp ) upnp? ( net-libs/miniupnpc ) selinux? ( sec-policy/selinux-tor )
+dev-libs/openssl sys-libs/zlib >=dev-libs/libevent-2.0.14 nat-pmp? ( net-libs/libnatpmp ) upnp? ( net-libs/miniupnpc ) selinux? ( sec-policy/selinux-tor )
+0
+http://www.torproject.org/dist/tor-0.2.3.15-alpha.tar.gz
+
+http://www.torproject.org/
+BSD
+Anonymizing overlay network for TCP
+~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+eutils flag-o-matic multilib toolchain-funcs user versionator
++bufferevents nat-pmp tor-hardening transparent-proxy threads upnp selinux web
+
+
+
+4
+
+configure install postinst prepare setup
+
+
+
+
+
diff --git a/metadata/cache/net-misc/whois-5.0.10 b/metadata/cache/net-misc/whois-5.0.10
deleted file mode 100644
index 47a81b1b3b14..000000000000
--- a/metadata/cache/net-misc/whois-5.0.10
+++ /dev/null
@@ -1,22 +0,0 @@
-idn? ( net-dns/libidn ) >=dev-lang/perl-5
-idn? ( net-dns/libidn )
-0
-mirror://debian/pool/main/w/whois/whois_5.0.10.tar.gz
-test
-http://www.linux.it/~md/software/
-GPL-2
-improved Whois Client
-~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux
-eutils multilib toolchain-funcs user
-iconv idn nls
-
-
-
-3
-
-compile configure install prepare
-
-
-
-
-
diff --git a/metadata/cache/net-misc/whois-5.0.12 b/metadata/cache/net-misc/whois-5.0.12
deleted file mode 100644
index 1da102656847..000000000000
--- a/metadata/cache/net-misc/whois-5.0.12
+++ /dev/null
@@ -1,22 +0,0 @@
-idn? ( net-dns/libidn ) >=dev-lang/perl-5
-idn? ( net-dns/libidn )
-0
-mirror://debian/pool/main/w/whois/whois_5.0.12.tar.gz
-test
-http://www.linux.it/~md/software/
-GPL-2
-improved Whois Client
-~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux
-eutils multilib toolchain-funcs user
-iconv idn nls
-
-
-
-3
-
-compile configure install prepare
-
-
-
-
-
diff --git a/metadata/cache/net-misc/whois-5.0.13 b/metadata/cache/net-misc/whois-5.0.13
deleted file mode 100644
index 3c2b7179c4b9..000000000000
--- a/metadata/cache/net-misc/whois-5.0.13
+++ /dev/null
@@ -1,22 +0,0 @@
-idn? ( net-dns/libidn ) >=dev-lang/perl-5
-idn? ( net-dns/libidn )
-0
-mirror://debian/pool/main/w/whois/whois_5.0.13.tar.gz
-test
-http://www.linux.it/~md/software/
-GPL-2
-improved Whois Client
-~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux
-eutils multilib toolchain-funcs user
-iconv idn nls
-
-
-
-3
-
-compile configure install prepare
-
-
-
-
-
diff --git a/metadata/cache/net-misc/whois-5.0.14 b/metadata/cache/net-misc/whois-5.0.16
similarity index 72%
rename from metadata/cache/net-misc/whois-5.0.14
rename to metadata/cache/net-misc/whois-5.0.16
index adcfe070fc6d..5267fbb0f585 100644
--- a/metadata/cache/net-misc/whois-5.0.14
+++ b/metadata/cache/net-misc/whois-5.0.16
@@ -1,7 +1,7 @@
-idn? ( net-dns/libidn ) >=dev-lang/perl-5
+idn? ( net-dns/libidn ) app-arch/xz-utils >=dev-lang/perl-5
 idn? ( net-dns/libidn )
 0
-mirror://debian/pool/main/w/whois/whois_5.0.14.tar.gz
+mirror://debian/pool/main/w/whois/whois_5.0.16.tar.xz
 test
 http://www.linux.it/~md/software/
 GPL-2
diff --git a/metadata/cache/net-misc/whois-5.0.5 b/metadata/cache/net-misc/whois-5.0.5
deleted file mode 100644
index 341e2a08625f..000000000000
--- a/metadata/cache/net-misc/whois-5.0.5
+++ /dev/null
@@ -1,22 +0,0 @@
-net-dns/libidn >=dev-lang/perl-5
-net-dns/libidn
-0
-mirror://debian/pool/main/w/whois/whois_5.0.5.tar.gz
-test
-http://www.linux.it/~md/software/
-GPL-2
-improved Whois Client
-alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd
-eutils multilib toolchain-funcs user
-nls
-
-
-
-
-
-compile install unpack
-
-
-
-
-
diff --git a/metadata/cache/net-misc/whois-5.0.8 b/metadata/cache/net-misc/whois-5.0.8
deleted file mode 100644
index dc74f97778ae..000000000000
--- a/metadata/cache/net-misc/whois-5.0.8
+++ /dev/null
@@ -1,22 +0,0 @@
-idn? ( net-dns/libidn ) >=dev-lang/perl-5
-idn? ( net-dns/libidn )
-0
-mirror://debian/pool/main/w/whois/whois_5.0.8.tar.gz
-test
-http://www.linux.it/~md/software/
-GPL-2
-improved Whois Client
-alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-eutils multilib toolchain-funcs user
-iconv idn nls
-
-
-
-3
-
-compile configure install prepare
-
-
-
-
-
diff --git a/metadata/cache/sci-visualization/kst-2.0.4 b/metadata/cache/sci-visualization/kst-2.0.4
new file mode 100644
index 000000000000..bb000a75a313
--- /dev/null
+++ b/metadata/cache/sci-visualization/kst-2.0.4
@@ -0,0 +1,22 @@
+sci-libs/cfitsio sci-libs/getdata sci-libs/gsl sci-libs/netcdf[cxx] x11-libs/qt-core:4 x11-libs/qt-gui:4 x11-libs/qt-opengl:4 x11-libs/qt-svg:4 test? ( x11-libs/qt-test:4 ) >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+sci-libs/cfitsio sci-libs/getdata sci-libs/gsl sci-libs/netcdf[cxx] x11-libs/qt-core:4 x11-libs/qt-gui:4 x11-libs/qt-opengl:4 x11-libs/qt-svg:4
+0
+mirror://sourceforge/kst/kst-2.0.4.tar.gz
+test
+http://kst.kde.org/
+GPL-2 LGPL-2 FDL-1.2
+Fast real-time large-dataset viewing and plotting tool for KDE4
+~amd64 ~x86
+base cmake-utils eutils flag-o-matic multilib toolchain-funcs user
+debug test
+
+
+
+4
+
+compile configure install prepare test unpack
+
+
+
+
+
diff --git a/metadata/cache/sec-policy/selinux-apache-2.20120215-r1 b/metadata/cache/sec-policy/selinux-apache-2.20120215-r1
index 9eebdeb95848..1dec258a41ad 100644
--- a/metadata/cache/sec-policy/selinux-apache-2.20120215-r1
+++ b/metadata/cache/sec-policy/selinux-apache-2.20120215-r1
@@ -1,7 +1,7 @@
-kerberos? ( sec-policy/selinux-kerberos ) >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120215 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-kerberos? ( sec-policy/selinux-kerberos ) >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120215
+kerberos? ( sec-policy/selinux-kerberos ) >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120215-r8 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+kerberos? ( sec-policy/selinux-kerberos ) >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120215-r8
 0
-http://oss.tresys.com/files/refpolicy/refpolicy-2.20120215.tar.bz2
+http://oss.tresys.com/files/refpolicy/refpolicy-2.20120215.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120215-r8.tar.bz2
 
 http://www.gentoo.org/proj/en/hardened/selinux/
 GPL-2
diff --git a/metadata/cache/sys-devel/ct-ng-1.13.3 b/metadata/cache/sys-devel/ct-ng-1.13.3
deleted file mode 100644
index 12f861f0aef7..000000000000
--- a/metadata/cache/sys-devel/ct-ng-1.13.3
+++ /dev/null
@@ -1,22 +0,0 @@
-
-net-misc/curl dev-vcs/cvs dev-vcs/subversion
-0
-http://ymorin.is-a-geek.org/download/crosstool-ng/crosstool-ng-1.13.3.tar.bz2
-
-http://ymorin.is-a-geek.org/projects/crosstool
-GPL-2
-crosstool-ng is a tool to build cross-compiling toolchains
-~amd64 ~x86
-bash-completion-r1
-bash-completion
-
-
-
-4
-
-install
-
-
-
-
-
diff --git a/metadata/cache/sys-devel/ct-ng-1.14.0 b/metadata/cache/sys-devel/ct-ng-1.15.0
similarity index 96%
rename from metadata/cache/sys-devel/ct-ng-1.14.0
rename to metadata/cache/sys-devel/ct-ng-1.15.0
index 2c8605c2e631..440933e76b49 100644
--- a/metadata/cache/sys-devel/ct-ng-1.14.0
+++ b/metadata/cache/sys-devel/ct-ng-1.15.0
@@ -1,7 +1,7 @@
 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 net-misc/curl dev-util/gperf dev-vcs/cvs dev-vcs/subversion
 0
-http://ymorin.is-a-geek.org/download/crosstool-ng/crosstool-ng-1.14.0.tar.bz2
+http://ymorin.is-a-geek.org/download/crosstool-ng/crosstool-ng-1.15.0.tar.bz2
 
 http://ymorin.is-a-geek.org/projects/crosstool
 GPL-2
diff --git a/metadata/cache/www-apps/wordpress-3.3.1 b/metadata/cache/www-apps/wordpress-3.3.1
deleted file mode 100644
index 4dee163e725d..000000000000
--- a/metadata/cache/www-apps/wordpress-3.3.1
+++ /dev/null
@@ -1,22 +0,0 @@
-|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
-virtual/httpd-php || ( dev-lang/php[mysql] dev-lang/php[mysqli] ) || ( <dev-lang/php-5.3[pcre] >=dev-lang/php-5.3 ) >=app-admin/webapp-config-1.50.15
-3.3.1
-http://wordpress.org/wordpress-3.3.1.tar.gz
-
-http://wordpress.org/
-GPL-2
-Wordpress php and mysql based CMS system
-~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
-webapp
-vhosts
-
-
-
-4
-
-install postinst prerm setup
-
-
-
-
-
diff --git a/metadata/cache/www-client/chromium-18.0.1025.168 b/metadata/cache/www-client/chromium-18.0.1025.168
index 330d4b6b2ab5..615611f410af 100644
--- a/metadata/cache/www-client/chromium-18.0.1025.168
+++ b/metadata/cache/www-client/chromium-18.0.1025.168
@@ -6,7 +6,7 @@ http://commondatastorage.googleapis.com/chromium-browser-official/chromium-18.0.
 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/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 64f5920d33ba..c29a77997bca 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Tue, 01 May 2012 06:36:58 +0000
+Tue, 01 May 2012 16:36:58 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 64f5920d33ba..c29a77997bca 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Tue, 01 May 2012 06:36:58 +0000
+Tue, 01 May 2012 16:36:58 +0000
diff --git a/metadata/md5-cache/app-emacs/ecb-2.40-r1 b/metadata/md5-cache/app-emacs/ecb-2.40-r1
index a7ba596cdea5..9923499f3ab5 100644
--- a/metadata/md5-cache/app-emacs/ecb-2.40-r1
+++ b/metadata/md5-cache/app-emacs/ecb-2.40-r1
@@ -10,4 +10,4 @@ RDEPEND=>=app-emacs/cedet-1.0_pre6 java? ( app-emacs/jde ) >=virtual/emacs-21
 SLOT=0
 SRC_URI=mirror://sourceforge/ecb/ecb-2.40.tar.gz
 _eclasses_=elisp	6e2733d3f6b8238de88467c371e1da8a	elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	74d9118e657da5b1db0c36f5dea88e57	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=962fe74882c3c8610eeac31c9ec575d5
+_md5_=f3f62d84ad20b398f64b05af6ce6767d
diff --git a/metadata/md5-cache/dev-embedded/bitbake-1.15.2 b/metadata/md5-cache/dev-embedded/bitbake-1.15.2
new file mode 100644
index 000000000000..a284d1fe639e
--- /dev/null
+++ b/metadata/md5-cache/dev-embedded/bitbake-1.15.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm prepare setup
+DEPEND=|| ( dev-lang/python:2.7[sqlite] dev-lang/python:2.6[sqlite] dev-lang/python:2.5[sqlite] >=dev-python/pysqlite-2.3.2 ) dev-python/ply dev-python/progressbar doc? ( dev-libs/libxslt ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
+DESCRIPTION=package management tool for OpenEmbedded
+EAPI=4
+HOMEPAGE=http://developer.berlios.de/projects/bitbake/
+IUSE=doc
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=|| ( dev-lang/python:2.7[sqlite] dev-lang/python:2.6[sqlite] dev-lang/python:2.5[sqlite] >=dev-python/pysqlite-2.3.2 ) dev-python/ply dev-python/progressbar || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
+SLOT=0
+SRC_URI=http://cgit.openembedded.org/cgit.cgi/bitbake/snapshot/bitbake-1.15.2.tar.bz2
+_eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68
+_md5_=ab8f52efa3c9ddee3e62ab5636c870a3
diff --git a/metadata/md5-cache/dev-lang/v8-3.8.9.19 b/metadata/md5-cache/dev-lang/v8-3.8.9.19
index 5146a38e64cf..d1c9a6570eab 100644
--- a/metadata/md5-cache/dev-lang/v8-3.8.9.19
+++ b/metadata/md5-cache/dev-lang/v8-3.8.9.19
@@ -3,10 +3,10 @@ DEPEND=|| ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
 DESCRIPTION=Google's open source JavaScript engine
 EAPI=4
 HOMEPAGE=http://code.google.com/p/v8
-KEYWORDS=~amd64 ~x86 ~x64-macos ~x86-macos
+KEYWORDS=amd64 ~x86 ~x64-macos ~x86-macos
 LICENSE=BSD
 RDEPEND=|| ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
 SLOT=0
 SRC_URI=http://commondatastorage.googleapis.com/chromium-browser-official/v8-3.8.9.19.tar.bz2
 _eclasses_=eutils	74d9118e657da5b1db0c36f5dea88e57	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	pax-utils	0ace932c4045349c7fc1af0fe7091acf	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=c201453d0fb09d9ee46e4c4c93166d42
+_md5_=ea18a346374639fcbccc2a384ed8cf50
diff --git a/metadata/md5-cache/dev-libs/libnl-3.2.8 b/metadata/md5-cache/dev-libs/libnl-3.2.8
new file mode 100644
index 000000000000..88d56d429e61
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libnl-3.2.8
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=sys-devel/flex virtual/yacc
+DESCRIPTION=A library for applications dealing with netlink socket
+EAPI=4
+HOMEPAGE=http://www.infradead.org/~tgr/libnl/
+IUSE=static-libs utils
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux
+LICENSE=LGPL-2.1
+SLOT=3
+SRC_URI=http://www.infradead.org/~tgr/libnl/files/libnl-3.2.8.tar.gz
+_eclasses_=eutils	74d9118e657da5b1db0c36f5dea88e57	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
+_md5_=6f616ad39b47e8f64a31aec910284076
diff --git a/metadata/md5-cache/dev-python/cvxopt-1.1.4-r1 b/metadata/md5-cache/dev-python/cvxopt-1.1.4-r1
index b1e3ec95a155..cf3f2df5ea9a 100644
--- a/metadata/md5-cache/dev-python/cvxopt-1.1.4-r1
+++ b/metadata/md5-cache/dev-python/cvxopt-1.1.4-r1
@@ -10,4 +10,4 @@ RDEPEND=virtual/blas virtual/cblas virtual/lapack sci-libs/cholmod sci-libs/umfp
 SLOT=0
 SRC_URI=http://abel.ee.ucla.edu/cvxopt/cvxopt-1.1.4.tar.gz
 _eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	74d9118e657da5b1db0c36f5dea88e57	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=738b9badddfdcb9574aecc19a9273ffc
+_md5_=70cc4c859e346eb1a280dead1ba58cad
diff --git a/metadata/md5-cache/dev-python/cvxopt-1.1.5 b/metadata/md5-cache/dev-python/cvxopt-1.1.5
index ba53d7a05a17..ba7fc4dca396 100644
--- a/metadata/md5-cache/dev-python/cvxopt-1.1.5
+++ b/metadata/md5-cache/dev-python/cvxopt-1.1.5
@@ -10,4 +10,4 @@ RDEPEND=virtual/blas virtual/cblas virtual/lapack sci-libs/cholmod sci-libs/umfp
 SLOT=0
 SRC_URI=http://abel.ee.ucla.edu/cvxopt/cvxopt-1.1.5.tar.gz
 _eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	74d9118e657da5b1db0c36f5dea88e57	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=6a4d80fceaaaf694c6dba9112564929e
+_md5_=76560184a4a4b84277953c4dd033a960
diff --git a/metadata/md5-cache/dev-python/jinja-2.5.5 b/metadata/md5-cache/dev-python/jinja-2.5.5
deleted file mode 100644
index f0aceccd8b64..000000000000
--- a/metadata/md5-cache/dev-python/jinja-2.5.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare test
-DEPEND=dev-python/markupsafe dev-python/setuptools i18n? ( >=dev-python/Babel-0.9.3 ) doc? ( >=dev-python/sphinx-0.6 ) dev-lang/python
-DESCRIPTION=A small but fast and easy to use stand-alone template engine written in pure python.
-EAPI=3
-HOMEPAGE=http://jinja.pocoo.org/ http://pypi.python.org/pypi/Jinja2
-IUSE=doc examples i18n vim-syntax
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris
-LICENSE=BSD
-RDEPEND=dev-python/markupsafe dev-python/setuptools i18n? ( >=dev-python/Babel-0.9.3 ) dev-lang/python
-SLOT=0
-SRC_URI=mirror://pypi/J/Jinja2/Jinja2-2.5.5.tar.gz
-_eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68
-_md5_=12f13f371eb8ca88ea401a55b996f2b1
diff --git a/metadata/md5-cache/dev-python/jinja-2.6 b/metadata/md5-cache/dev-python/jinja-2.6
index 8f0607799c33..c8ba85abe7a4 100644
--- a/metadata/md5-cache/dev-python/jinja-2.6
+++ b/metadata/md5-cache/dev-python/jinja-2.6
@@ -10,4 +10,4 @@ RDEPEND=dev-python/markupsafe dev-python/setuptools i18n? ( >=dev-python/Babel-0
 SLOT=0
 SRC_URI=mirror://pypi/J/Jinja2/Jinja2-2.6.tar.gz
 _eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68
-_md5_=b7bf7d88cd70b661ba916880aa39af8b
+_md5_=b5fe9edabd66b2a19b1a8f66fd0ff9e0
diff --git a/metadata/md5-cache/dev-python/sphinx-1.1.3-r2 b/metadata/md5-cache/dev-python/sphinx-1.1.3-r2
index 00247b7da3ac..6a0aaeed4f88 100644
--- a/metadata/md5-cache/dev-python/sphinx-1.1.3-r2
+++ b/metadata/md5-cache/dev-python/sphinx-1.1.3-r2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile install postinst postrm prepare setup test
-DEPEND=>=dev-python/docutils-0.7 >=dev-python/jinja-2.3 >=dev-python/pygments-1.2 dev-python/setuptools latex? ( dev-texlive/texlive-latexextra ) =dev-lang/python-2* test? ( dev-python/nose )
+DEPEND=>=dev-python/docutils-0.7 >=dev-python/jinja-2.3 >=dev-python/pygments-1.2 dev-python/setuptools latex? ( dev-texlive/texlive-latexextra app-text/dvipng ) =dev-lang/python-2* test? ( dev-python/nose )
 DESCRIPTION=Python documentation generator
 EAPI=4
 HOMEPAGE=http://sphinx.pocoo.org/ http://pypi.python.org/pypi/Sphinx
 IUSE=doc latex test
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=BSD
-RDEPEND=>=dev-python/docutils-0.7 >=dev-python/jinja-2.3 >=dev-python/pygments-1.2 dev-python/setuptools latex? ( dev-texlive/texlive-latexextra ) =dev-lang/python-2*
+RDEPEND=>=dev-python/docutils-0.7 >=dev-python/jinja-2.3 >=dev-python/pygments-1.2 dev-python/setuptools latex? ( dev-texlive/texlive-latexextra app-text/dvipng ) =dev-lang/python-2*
 SLOT=0
 SRC_URI=mirror://pypi/S/Sphinx/Sphinx-1.1.3.tar.gz
 _eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68
-_md5_=f1e10b71ef5f3694bafff503e0c6a3bd
+_md5_=6d86c18ff329148419c38b7089bea799
diff --git a/metadata/md5-cache/dev-util/valgrind-3.7.0-r4 b/metadata/md5-cache/dev-util/valgrind-3.7.0-r4
new file mode 100644
index 000000000000..70866b2b7844
--- /dev/null
+++ b/metadata/md5-cache/dev-util/valgrind-3.7.0-r4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=mpi? ( virtual/mpi ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DESCRIPTION=An open-source memory debugger for GNU/Linux
+EAPI=4
+HOMEPAGE=http://www.valgrind.org
+IUSE=mpi
+KEYWORDS=-* ~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x64-macos
+LICENSE=GPL-2
+RDEPEND=mpi? ( virtual/mpi )
+SLOT=0
+SRC_URI=http://www.valgrind.org/downloads/valgrind-3.7.0.tar.bz2
+_eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	eutils	74d9118e657da5b1db0c36f5dea88e57	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	libtool	5f623f5a211fb1b2d84d88ee49959a54	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
+_md5_=a42125eeb8b8d101c81ba77a498d3c4c
diff --git a/metadata/md5-cache/dev-util/visualvm-1.3.3-r2 b/metadata/md5-cache/dev-util/visualvm-1.3.3-r2
new file mode 100644
index 000000000000..887aafd05b4c
--- /dev/null
+++ b/metadata/md5-cache/dev-util/visualvm-1.3.3-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install prepare unpack
+DEPEND=dev-java/icedtea:6 dev-java/netbeans-harness:7.1 dev-java/netbeans-platform:7.1 dev-java/ant-core dev-java/ant-nodeps || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DESCRIPTION=Integrates commandline JDK tools and profiling capabilites.
+EAPI=4
+HOMEPAGE=http://icedtea.classpath.org
+KEYWORDS=~amd64
+LICENSE=GPL-2-with-linking-exception
+RDEPEND=dev-java/icedtea:6 dev-java/netbeans-harness:7.1 dev-java/netbeans-platform:7.1
+SLOT=6
+SRC_URI=http://icedtea.classpath.org/download/visualvm/visualvm_harness-1.3.tar.gz http://icedtea.classpath.org/download/visualvm/visualvm_133-src.tar.gz http://icedtea.classpath.org/download/visualvm/netbeans-profiler-visualvm_release701.tar.gz
+_eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	eutils	74d9118e657da5b1db0c36f5dea88e57	libtool	5f623f5a211fb1b2d84d88ee49959a54	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
+_md5_=1d865c4e7580c90473b945f556127244
diff --git a/metadata/md5-cache/dev-util/visualvm-1.3.3-r9 b/metadata/md5-cache/dev-util/visualvm-1.3.3-r9
new file mode 100644
index 000000000000..6992201f5dc5
--- /dev/null
+++ b/metadata/md5-cache/dev-util/visualvm-1.3.3-r9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install prepare unpack
+DEPEND=dev-java/icedtea:7 dev-java/netbeans-harness:7.1 dev-java/netbeans-platform:7.1 dev-java/ant-core dev-java/ant-nodeps || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DESCRIPTION=Integrates commandline JDK tools and profiling capabilites.
+EAPI=4
+HOMEPAGE=http://icedtea.classpath.org
+KEYWORDS=~amd64
+LICENSE=GPL-2-with-linking-exception
+RDEPEND=dev-java/icedtea:7 dev-java/netbeans-harness:7.1 dev-java/netbeans-platform:7.1
+SLOT=7
+SRC_URI=http://icedtea.classpath.org/download/visualvm/visualvm_harness-1.3.tar.gz http://icedtea.classpath.org/download/visualvm/visualvm_133-src.tar.gz http://icedtea.classpath.org/download/visualvm/netbeans-profiler-visualvm_release701.tar.gz
+_eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	eutils	74d9118e657da5b1db0c36f5dea88e57	libtool	5f623f5a211fb1b2d84d88ee49959a54	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
+_md5_=6f686c22726ecbcf4a95756427d1260f
diff --git a/metadata/md5-cache/games-strategy/ufo-ai-2.4 b/metadata/md5-cache/games-strategy/ufo-ai-2.4
new file mode 100644
index 000000000000..ed353922d1b9
--- /dev/null
+++ b/metadata/md5-cache/games-strategy/ufo-ai-2.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=!dedicated? ( virtual/opengl virtual/glu media-libs/libsdl media-libs/sdl-image[jpeg,png] media-libs/sdl-ttf media-libs/sdl-mixer virtual/jpeg media-libs/libpng:0 media-libs/libogg media-libs/libvorbis x11-proto/xf86vidmodeproto ) net-misc/curl sys-devel/gettext sys-libs/zlib editor? ( dev-libs/libxml2 virtual/jpeg media-libs/openal x11-libs/gtkglext x11-libs/gtksourceview:2.0 )
+DESCRIPTION=UFO: Alien Invasion - X-COM inspired strategy game
+EAPI=3
+HOMEPAGE=http://ufoai.sourceforge.net/
+IUSE=debug dedicated editor
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=!dedicated? ( virtual/opengl virtual/glu media-libs/libsdl media-libs/sdl-image[jpeg,png] media-libs/sdl-ttf media-libs/sdl-mixer virtual/jpeg media-libs/libpng:0 media-libs/libogg media-libs/libvorbis x11-proto/xf86vidmodeproto ) net-misc/curl sys-devel/gettext sys-libs/zlib editor? ( dev-libs/libxml2 virtual/jpeg media-libs/openal x11-libs/gtkglext x11-libs/gtksourceview:2.0 )
+SLOT=0
+SRC_URI=mirror://sourceforge/ufoai/ufoai-2.4-source.tar.bz2 mirror://sourceforge/ufoai/ufoai-2.4-data.tar http://mattn.ninex.info/1maps.pk3
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	74d9118e657da5b1db0c36f5dea88e57	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	games	f75cdbfdf1760e514ca65e2f6c6a7c72	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
+_md5_=6d303c8a108e96dc35f2fff823221409
diff --git a/metadata/md5-cache/media-gfx/pinta-1.3 b/metadata/md5-cache/media-gfx/pinta-1.3
new file mode 100644
index 000000000000..edc7a238896c
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/pinta-1.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=postinst postrm prepare
+DEPEND=dev-dotnet/atk-sharp:2 dev-dotnet/gdk-sharp:2 dev-dotnet/glib-sharp:2 dev-dotnet/gtk-sharp:2 dev-dotnet/mono-addins[gtk] dev-dotnet/pango-sharp:2 dev-lang/mono dev-util/intltool dev-util/pkgconfig sys-devel/gettext
+DESCRIPTION=Simple Painting for Gtk
+EAPI=4
+HOMEPAGE=http://pinta-project.com
+IUSE=jpeg tiff
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT CCPL-Attribution-3.0
+RDEPEND=dev-dotnet/atk-sharp:2 dev-dotnet/gdk-sharp:2 dev-dotnet/glib-sharp:2 dev-dotnet/gtk-sharp:2 dev-dotnet/mono-addins[gtk] dev-dotnet/pango-sharp:2 dev-lang/mono x11-libs/cairo[X] x11-libs/gdk-pixbuf[X,jpeg=,tiff=] x11-themes/gnome-icon-theme
+SLOT=0
+SRC_URI=mirror://github/PintaProject/Pinta/pinta-1.3.tar.gz
+_eclasses_=fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68
+_md5_=4030062dbe5c348a92cd26a81cd27319
diff --git a/metadata/md5-cache/media-gfx/rawtherapee-4.0.5 b/metadata/md5-cache/media-gfx/rawtherapee-4.0.5
deleted file mode 100644
index 77107ab765e6..000000000000
--- a/metadata/md5-cache/media-gfx/rawtherapee-4.0.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=bzip2? ( app-arch/bzip2 ) >=dev-cpp/gtkmm-2.12:2.4 >=dev-cpp/glibmm-2.16:2 dev-libs/libsigc++:2 media-libs/tiff media-libs/libpng media-libs/libiptcdata media-libs/lcms:2 sys-libs/zlib virtual/jpeg app-arch/xz-utils dev-util/pkgconfig >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
-DESCRIPTION=Digital photo editing tool focused on RAW image file manipulation and conversion
-EAPI=4
-HOMEPAGE=http://www.rawtherapee.com/
-IUSE=bzip2 doc openmp
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=bzip2? ( app-arch/bzip2 ) >=dev-cpp/gtkmm-2.12:2.4 >=dev-cpp/glibmm-2.16:2 dev-libs/libsigc++:2 media-libs/tiff media-libs/libpng media-libs/libiptcdata media-libs/lcms:2 sys-libs/zlib virtual/jpeg
-SLOT=0
-SRC_URI=http://dev.gentoo.org/~radhermit/distfiles/rawtherapee-4.0.5.tar.xz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	6fa4dbd700f0f19059c36e545955c41e	eutils	74d9118e657da5b1db0c36f5dea88e57	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=45887c2b84311c76a88a01ed465e0662
diff --git a/metadata/md5-cache/media-gfx/rawtherapee-4.0.4 b/metadata/md5-cache/media-gfx/rawtherapee-4.0.8
similarity index 82%
rename from metadata/md5-cache/media-gfx/rawtherapee-4.0.4
rename to metadata/md5-cache/media-gfx/rawtherapee-4.0.8
index 449a242b7959..187d666393a9 100644
--- a/metadata/md5-cache/media-gfx/rawtherapee-4.0.4
+++ b/metadata/md5-cache/media-gfx/rawtherapee-4.0.8
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=bzip2? ( app-arch/bzip2 ) >=dev-cpp/gtkmm-2.12:2.4 >=dev-cpp/glibmm-2.16:2 dev-libs/libsigc++:2 media-libs/tiff media-libs/libpng media-libs/libiptcdata media-libs/lcms:2 sys-libs/zlib virtual/jpeg app-arch/xz-utils dev-util/pkgconfig >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
-DESCRIPTION=Digital photo editing tool focused on RAW image file manipulation and conversion
+DESCRIPTION=A powerful cross-platform raw image processing program
 EAPI=4
 HOMEPAGE=http://www.rawtherapee.com/
 IUSE=bzip2 doc openmp
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=bzip2? ( app-arch/bzip2 ) >=dev-cpp/gtkmm-2.12:2.4 >=dev-cpp/glibmm-2.16:2 dev-libs/libsigc++:2 media-libs/tiff media-libs/libpng media-libs/libiptcdata media-libs/lcms:2 sys-libs/zlib virtual/jpeg
 SLOT=0
-SRC_URI=http://dev.gentoo.org/~radhermit/distfiles/rawtherapee-4.0.4.tar.xz
+SRC_URI=http://rawtherapee.googlecode.com/files/rawtherapee-4.0.8.tar.xz
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	6fa4dbd700f0f19059c36e545955c41e	eutils	74d9118e657da5b1db0c36f5dea88e57	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=7de7954e32ed0691720893130ca388fa
+_md5_=8c942f6b72c227dacaa28c3d3d56292f
diff --git a/metadata/md5-cache/media-libs/audiofile-0.3.4 b/metadata/md5-cache/media-libs/audiofile-0.3.4
new file mode 100644
index 000000000000..c45f699946d6
--- /dev/null
+++ b/metadata/md5-cache/media-libs/audiofile-0.3.4
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install prepare test
+DEPEND=|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils
+DESCRIPTION=An elegant API for accessing audio files
+EAPI=4
+HOMEPAGE=http://www.68k.org/~michael/audiofile/
+IUSE=static-libs
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+LICENSE=GPL-2 LGPL-2
+SLOT=0
+SRC_URI=mirror://gnome/sources/audiofile/0.3/audiofile-0.3.4.tar.xz
+_eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	eutils	74d9118e657da5b1db0c36f5dea88e57	gnome.org	8fef8f967214f56e08fa92d61163d891	libtool	5f623f5a211fb1b2d84d88ee49959a54	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=5cdc787cc01611d29fdf810960b0b902
diff --git a/metadata/md5-cache/media-libs/tunepimp-0.5.3-r3 b/metadata/md5-cache/media-libs/tunepimp-0.5.3-r3
deleted file mode 100644
index 9858a4d1ee1d..000000000000
--- a/metadata/md5-cache/media-libs/tunepimp-0.5.3-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup
-DEPEND=sys-libs/zlib dev-libs/expat net-misc/curl media-libs/flac media-libs/libmad >=media-libs/musicbrainz-2.1:1 >=media-libs/libmp4v2-1.9 media-libs/libofa media-libs/libvorbis sys-libs/readline dev-util/pkgconfig !media-sound/trm || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
-DESCRIPTION=TunePimp is a library to create MusicBrainz enabled tagging applications.
-EAPI=3
-HOMEPAGE=http://www.musicbrainz.org/products/tunepimp
-IUSE=python
-KEYWORDS=amd64 hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=sys-libs/zlib dev-libs/expat net-misc/curl media-libs/flac media-libs/libmad >=media-libs/musicbrainz-2.1:1 >=media-libs/libmp4v2-1.9 media-libs/libofa media-libs/libvorbis sys-libs/readline python? ( =dev-lang/python-2* )
-SLOT=0
-SRC_URI=http://ftp.musicbrainz.org/pub/musicbrainz/libtunepimp-0.5.3.tar.gz
-_eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	74d9118e657da5b1db0c36f5dea88e57	libtool	5f623f5a211fb1b2d84d88ee49959a54	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=b2ff3c49691eea02db0a15fe284a72a3
diff --git a/metadata/md5-cache/media-plugins/vdr-text2skin-1.2 b/metadata/md5-cache/media-plugins/vdr-text2skin-1.2
deleted file mode 100644
index a9926a3bebf6..000000000000
--- a/metadata/md5-cache/media-plugins/vdr-text2skin-1.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile config install postinst postrm setup unpack
-DEPEND=>=media-video/vdr-1.3.18 media-gfx/imagemagick !media-plugins/vdr-text2skin-cvs truetype? ( media-libs/freetype ) dev-util/pkgconfig >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
-DESCRIPTION=VDR text2skin PlugIn
-EAPI=1
-HOMEPAGE=http://projects.vdr-developer.org/projects/show/plg-text2skin
-IUSE=+truetype
-KEYWORDS=~x86
-LICENSE=GPL-2
-RDEPEND=>=media-video/vdr-1.3.18 media-gfx/imagemagick !media-plugins/vdr-text2skin-cvs truetype? ( media-libs/freetype ) >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
-SLOT=0
-SRC_URI=mirror://vdr-developerorg/112/vdr-text2skin-1.2.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	74d9118e657da5b1db0c36f5dea88e57	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=d881af35db387574cb2351ca62a613e9
diff --git a/metadata/md5-cache/media-plugins/vdr-text2skin-1.3 b/metadata/md5-cache/media-plugins/vdr-text2skin-1.3
deleted file mode 100644
index 77df5bbcf765..000000000000
--- a/metadata/md5-cache/media-plugins/vdr-text2skin-1.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile config configure install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-1.6.0 media-gfx/imagemagick !media-plugins/vdr-text2skin-cvs truetype? ( media-libs/freetype ) dev-util/pkgconfig >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
-DESCRIPTION=VDR text2skin PlugIn
-EAPI=2
-HOMEPAGE=http://projects.vdr-developer.org/projects/show/plg-text2skin
-IUSE=+truetype
-KEYWORDS=~x86 ~amd64
-LICENSE=GPL-2
-RDEPEND=>=media-video/vdr-1.6.0 media-gfx/imagemagick !media-plugins/vdr-text2skin-cvs truetype? ( media-libs/freetype ) >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
-SLOT=0
-SRC_URI=mirror://vdr-developerorg/127/vdr-text2skin-1.3.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	74d9118e657da5b1db0c36f5dea88e57	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=f6c7f1510864eac41dad05c955343e32
diff --git a/metadata/md5-cache/media-plugins/vdr-text2skin-1.3.1 b/metadata/md5-cache/media-plugins/vdr-text2skin-1.3.1
deleted file mode 100644
index 2a98f1997330..000000000000
--- a/metadata/md5-cache/media-plugins/vdr-text2skin-1.3.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile config configure install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-1.6.0 media-gfx/imagemagick truetype? ( media-libs/freetype ) dev-util/pkgconfig >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
-DESCRIPTION=VDR text2skin PlugIn
-EAPI=2
-HOMEPAGE=http://projects.vdr-developer.org/projects/show/plg-text2skin
-IUSE=+truetype
-KEYWORDS=~x86 ~amd64
-LICENSE=GPL-2
-RDEPEND=>=media-video/vdr-1.6.0 media-gfx/imagemagick truetype? ( media-libs/freetype ) >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
-SLOT=0
-SRC_URI=mirror://vdr-developerorg/344/vdr-text2skin-1.3.1.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	74d9118e657da5b1db0c36f5dea88e57	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=f839122073c22d55fa3d7fc12bb0c0ea
diff --git a/metadata/md5-cache/media-plugins/vdr-text2skin-1.3.2 b/metadata/md5-cache/media-plugins/vdr-text2skin-1.3.2
index 8acfdd11adaa..31812092b6b1 100644
--- a/metadata/md5-cache/media-plugins/vdr-text2skin-1.3.2
+++ b/metadata/md5-cache/media-plugins/vdr-text2skin-1.3.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile config configure install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-1.6.0 imagemagick? ( || ( media-gfx/imagemagick[cxx] media-gfx/graphicsmagick[cxx] ) ) imlib? ( media-libs/imlib2 >=media-video/vdr-1.6.0[-graphtft] ) imagemagick? ( dev-util/pkgconfig ) imlib? ( dev-util/pkgconfig ) nls? ( sys-devel/gettext ) >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=>=media-video/vdr-1.6.0 imagemagick? ( || ( media-gfx/imagemagick[cxx] media-gfx/graphicsmagick[cxx] ) ) imlib? ( media-libs/imlib2 >=media-video/vdr-1.6.0[-graphtft] ) imagemagick? ( dev-util/pkgconfig ) imlib? ( dev-util/pkgconfig ) sys-devel/gettext >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
 DESCRIPTION=VDR text2skin PlugIn
 EAPI=4
 HOMEPAGE=http://projects.vdr-developer.org/projects/show/plg-text2skin
-IUSE=contrib doc +imagemagick imlib nls
+IUSE=contrib doc +imagemagick imlib
 KEYWORDS=~x86 ~amd64
 LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.6.0 imagemagick? ( || ( media-gfx/imagemagick[cxx] media-gfx/graphicsmagick[cxx] ) ) imlib? ( media-libs/imlib2 >=media-video/vdr-1.6.0[-graphtft] ) >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 REQUIRED_USE=imagemagick? ( !imlib ) imlib? ( !imagemagick )
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/783/vdr-text2skin-1.3.2.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	74d9118e657da5b1db0c36f5dea88e57	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
-_md5_=d2f72f4e459658b395bbd642665981af
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	74d9118e657da5b1db0c36f5dea88e57	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	vdr-plugin-2	156998c68b4638643c167ad620f1f78a
+_md5_=4369459c2edd3a1f10189da4eedd7431
diff --git a/metadata/md5-cache/media-plugins/vdr-videosystem-0.0.1 b/metadata/md5-cache/media-plugins/vdr-videosystem-0.0.1
index 3b683d74a635..8722bcbb9123 100644
--- a/metadata/md5-cache/media-plugins/vdr-videosystem-0.0.1
+++ b/metadata/md5-cache/media-plugins/vdr-videosystem-0.0.1
@@ -1,11 +1,12 @@
-DEFINED_PHASES=compile config install postinst postrm setup unpack
+DEFINED_PHASES=compile config configure install postinst postrm prepare setup unpack
 DEPEND=>=media-video/vdr-1.3.18 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
 DESCRIPTION=VDR plugin: Switch OSD resolution depending on signal-videosystem (PAL/NTSC)
+EAPI=4
 HOMEPAGE=http://www.vdr-portal.de/board/thread.php?threadid=43516
 KEYWORDS=x86
 LICENSE=GPL-2
-RDEPEND=>=media-video/vdr-1.3.18 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
+RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://gentoo/vdr-videosystem-0.0.1.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	74d9118e657da5b1db0c36f5dea88e57	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
-_md5_=3d871d88de5833f54000ed17742d9839
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	74d9118e657da5b1db0c36f5dea88e57	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	vdr-plugin-2	156998c68b4638643c167ad620f1f78a
+_md5_=bea40bec540b83471dfe5776661e6775
diff --git a/metadata/md5-cache/media-plugins/vdr-vodcatcher-0.1.1 b/metadata/md5-cache/media-plugins/vdr-vodcatcher-0.1.1
deleted file mode 100644
index 8ed2d71d5955..000000000000
--- a/metadata/md5-cache/media-plugins/vdr-vodcatcher-0.1.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile config install postinst postrm setup unpack
-DEPEND=net-misc/curl media-video/vdr media-plugins/vdr-mplayer >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
-DESCRIPTION=VDR plugin: Downloads rss-feeds and passes video enclosures to the mplayer plugin
-HOMEPAGE=http://www.e-tobi.net/blog/pages/vdr-vodcatcher
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=net-misc/curl media-video/vdr media-plugins/vdr-mplayer >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
-SLOT=0
-SRC_URI=http://www.e-tobi.net/blog/files/vdr-vodcatcher-0.1.1.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	74d9118e657da5b1db0c36f5dea88e57	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
-_md5_=b2a0f52b5a070b670e609b02f647d1fa
diff --git a/metadata/md5-cache/media-plugins/vdr-vodcatcher-0.2.1 b/metadata/md5-cache/media-plugins/vdr-vodcatcher-0.2.1
deleted file mode 100644
index a9e1012d7dd2..000000000000
--- a/metadata/md5-cache/media-plugins/vdr-vodcatcher-0.2.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile config install postinst postrm setup unpack
-DEPEND=net-misc/curl media-video/vdr || ( media-plugins/vdr-mplayer media-plugins/vdr-xineliboutput ) >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
-DESCRIPTION=VDR plugin: Downloads rss-feeds and passes video enclosures to the mplayer plugin
-HOMEPAGE=http://www.e-tobi.net/blog/pages/vdr-vodcatcher
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=net-misc/curl media-video/vdr || ( media-plugins/vdr-mplayer media-plugins/vdr-xineliboutput ) >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
-SLOT=0
-SRC_URI=http://www.e-tobi.net/blog/files/vdr-vodcatcher-0.2.1.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	74d9118e657da5b1db0c36f5dea88e57	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
-_md5_=b33e60930aba24bac3b3a11acc945b7d
diff --git a/metadata/md5-cache/media-plugins/vdr-vodcatcher-0.2.2 b/metadata/md5-cache/media-plugins/vdr-vodcatcher-0.2.2
index 48cfe2b77876..a75a646b4dc5 100644
--- a/metadata/md5-cache/media-plugins/vdr-vodcatcher-0.2.2
+++ b/metadata/md5-cache/media-plugins/vdr-vodcatcher-0.2.2
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile config configure install postinst postrm prepare setup unpack
-DEPEND=net-misc/curl >=dev-libs/tinyxml-2.6.1 media-video/vdr || ( media-plugins/vdr-mplayer media-plugins/vdr-xineliboutput ) >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DEPEND=net-misc/curl >=dev-libs/tinyxml-2.6.1 media-video/vdr >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
 DESCRIPTION=VDR plugin: Downloads rss-feeds and passes video enclosures to the mplayer plugin
-EAPI=2
+EAPI=4
 HOMEPAGE=http://projects.vdr-developer.org/projects/plg-vodcatcher
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=net-misc/curl >=dev-libs/tinyxml-2.6.1 media-video/vdr || ( media-plugins/vdr-mplayer media-plugins/vdr-xineliboutput ) >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/154/vdr-vodcatcher-0.2.2.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	74d9118e657da5b1db0c36f5dea88e57	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
-_md5_=476c59220447178439a758563f018177
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	74d9118e657da5b1db0c36f5dea88e57	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	vdr-plugin-2	156998c68b4638643c167ad620f1f78a
+_md5_=cd8e1c53fec36d8f0ab37b8ce1958ff1
diff --git a/metadata/md5-cache/media-plugins/vdr-vompserver-0.3.1-r1 b/metadata/md5-cache/media-plugins/vdr-vompserver-0.3.1-r1
index fa597a4fdf99..82041a825786 100644
--- a/metadata/md5-cache/media-plugins/vdr-vompserver-0.3.1-r1
+++ b/metadata/md5-cache/media-plugins/vdr-vompserver-0.3.1-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.2.6 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://www.loggytronic.com/dl/vdr-vompserver-0.3.1.tgz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	74d9118e657da5b1db0c36f5dea88e57	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
-_md5_=fdcecda4c398965afe0ec7cfc3b22a6d
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	74d9118e657da5b1db0c36f5dea88e57	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	vdr-plugin-2	156998c68b4638643c167ad620f1f78a
+_md5_=ef8a3aa7d4419d774b43ee3c934e9f2b
diff --git a/metadata/md5-cache/media-plugins/vdr-xvdr-9999 b/metadata/md5-cache/media-plugins/vdr-xvdr-9999
index b07e132d975b..15c6469b1c50 100644
--- a/metadata/md5-cache/media-plugins/vdr-xvdr-9999
+++ b/metadata/md5-cache/media-plugins/vdr-xvdr-9999
@@ -1,10 +1,10 @@
 DEFINED_PHASES=compile config configure install postinst postrm prepare setup unpack
 DEPEND=>=media-video/vdr-1.6 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers dev-vcs/git
 DESCRIPTION=VDR plugin: XVDR Streamserver Plugin
-EAPI=2
+EAPI=4
 HOMEPAGE=https://github.com/pipelka/vdr-plugin-xvdr
 LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.6 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	74d9118e657da5b1db0c36f5dea88e57	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	git-2	15733ab6a6feb34af9837b41623c2bad	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	vdr-plugin	7a1042c245522fb5ac48b6e9f961f27a
-_md5_=d73a86ac83d118c57dbce0bf3f90ed40
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	74d9118e657da5b1db0c36f5dea88e57	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	git-2	15733ab6a6feb34af9837b41623c2bad	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	vdr-plugin-2	156998c68b4638643c167ad620f1f78a
+_md5_=2f1e5e183cea23f08e96c389bc081732
diff --git a/metadata/md5-cache/media-sound/moc-2.5.0_alpha4_p20120501 b/metadata/md5-cache/media-sound/moc-2.5.0_alpha4_p20120501
new file mode 100644
index 000000000000..c575a37e6b3c
--- /dev/null
+++ b/metadata/md5-cache/media-sound/moc-2.5.0_alpha4_p20120501
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=>=sys-devel/libtool-2.2.6b >=sys-libs/db-4 sys-libs/ncurses[unicode?] aac? ( media-libs/faad2 ) alsa? ( media-libs/alsa-lib ) curl? ( net-misc/curl ) ffmpeg? ( virtual/ffmpeg ) flac? ( media-libs/flac ) jack? ( media-sound/jack-audio-connection-kit ) libsamplerate? ( media-libs/libsamplerate ) mad? ( media-libs/libmad sys-libs/zlib media-libs/libid3tag ) modplug? ( media-libs/libmodplug ) musepack? ( media-sound/musepack-tools media-libs/taglib ) sid? ( >=media-libs/libsidplay-2 ) sndfile? ( media-libs/libsndfile ) speex? ( media-libs/speex ) timidity? ( media-libs/libtimidity media-sound/timidity++ ) vorbis? ( media-libs/libogg media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) app-arch/xz-utils dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DESCRIPTION=Music On Console - ncurses interface for playing audio files
+EAPI=4
+HOMEPAGE=http://moc.daper.net
+IUSE=aac alsa curl debug ffmpeg flac jack libsamplerate mad modplug musepack oss sid sndfile speex timidity +unicode vorbis wavpack
+KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-devel/libtool-2.2.6b >=sys-libs/db-4 sys-libs/ncurses[unicode?] aac? ( media-libs/faad2 ) alsa? ( media-libs/alsa-lib ) curl? ( net-misc/curl ) ffmpeg? ( virtual/ffmpeg ) flac? ( media-libs/flac ) jack? ( media-sound/jack-audio-connection-kit ) libsamplerate? ( media-libs/libsamplerate ) mad? ( media-libs/libmad sys-libs/zlib media-libs/libid3tag ) modplug? ( media-libs/libmodplug ) musepack? ( media-sound/musepack-tools media-libs/taglib ) sid? ( >=media-libs/libsidplay-2 ) sndfile? ( media-libs/libsndfile ) speex? ( media-libs/speex ) timidity? ( media-libs/libtimidity media-sound/timidity++ ) vorbis? ( media-libs/libogg media-libs/libvorbis ) wavpack? ( media-sound/wavpack )
+SLOT=0
+SRC_URI=http://dev.gentoo.org/~radhermit/distfiles/moc-2.5.0_alpha4_p20120501.tar.xz
+_eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	eutils	74d9118e657da5b1db0c36f5dea88e57	libtool	5f623f5a211fb1b2d84d88ee49959a54	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
+_md5_=73041449b99dd9845bf836f308799a54
diff --git a/metadata/md5-cache/net-misc/curl-7.25.0-r1 b/metadata/md5-cache/net-misc/curl-7.25.0-r1
index e42d5af0d329..bff2b243b829 100644
--- a/metadata/md5-cache/net-misc/curl-7.25.0-r1
+++ b/metadata/md5-cache/net-misc/curl-7.25.0-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=ldap? ( net-nds/openldap ) ssl? ( curl_ssl_axtls? ( net-libs/axTLS app-misc/ca-certificates ) curl_ssl_gnutls? ( || ( ( <=net-libs/gnutls-2.10.5 dev-libs/libgcrypt[static-libs?] app-misc/ca-certificates ) ( net-libs/gnutls[-nettle,static-libs?] dev-libs/libgcrypt[static-libs?] app-misc/ca-certificates ) ( net-libs/gnutls[nettle,static-libs?] dev-libs/nettle app-misc/ca-certificates ) ) ) curl_ssl_openssl? ( dev-libs/openssl[static-libs?] ) curl_ssl_nss? ( dev-libs/nss app-misc/ca-certificates ) curl_ssl_polarssl? ( net-libs/polarssl app-misc/ca-certificates ) ) idn? ( net-dns/libidn[static-libs?] ) ares? ( net-dns/c-ares ) kerberos? ( virtual/krb5 ) ssh? ( net-libs/libssh2[static-libs?] ) sys-libs/zlib sys-apps/ed dev-util/pkgconfig test? ( sys-apps/diffutils dev-lang/perl ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=ldap? ( net-nds/openldap ) ssl? ( curl_ssl_axtls? ( net-libs/axTLS app-misc/ca-certificates ) curl_ssl_gnutls? ( || ( ( >=net-libs/gnutls-3[static-libs?] dev-libs/nettle ) ( =net-libs/gnutls-2.12*[nettle,static-libs?] dev-libs/nettle ) ( =net-libs/gnutls-2.12*[-nettle,static-libs?] dev-libs/libgcrypt[static-libs?] ) ( <net-libs/gnutls-2.12 dev-libs/libgcrypt[static-libs?] ) ) app-misc/ca-certificates ) curl_ssl_openssl? ( dev-libs/openssl[static-libs?] ) curl_ssl_nss? ( dev-libs/nss app-misc/ca-certificates ) curl_ssl_polarssl? ( net-libs/polarssl app-misc/ca-certificates ) ) idn? ( net-dns/libidn[static-libs?] ) ares? ( net-dns/c-ares ) kerberos? ( virtual/krb5 ) ssh? ( net-libs/libssh2[static-libs?] ) sys-libs/zlib sys-apps/ed dev-util/pkgconfig test? ( sys-apps/diffutils dev-lang/perl ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A Client that groks URLs
 EAPI=4
 HOMEPAGE=http://curl.haxx.se/
 IUSE=ares idn ipv6 kerberos ldap ssh ssl static-libs test threads curl_ssl_axtls curl_ssl_cyassl curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl curl_ssl_polarssl
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ldap? ( net-nds/openldap ) ssl? ( curl_ssl_axtls? ( net-libs/axTLS app-misc/ca-certificates ) curl_ssl_gnutls? ( || ( ( <=net-libs/gnutls-2.10.5 dev-libs/libgcrypt[static-libs?] app-misc/ca-certificates ) ( net-libs/gnutls[-nettle,static-libs?] dev-libs/libgcrypt[static-libs?] app-misc/ca-certificates ) ( net-libs/gnutls[nettle,static-libs?] dev-libs/nettle app-misc/ca-certificates ) ) ) curl_ssl_openssl? ( dev-libs/openssl[static-libs?] ) curl_ssl_nss? ( dev-libs/nss app-misc/ca-certificates ) curl_ssl_polarssl? ( net-libs/polarssl app-misc/ca-certificates ) ) idn? ( net-dns/libidn[static-libs?] ) ares? ( net-dns/c-ares ) kerberos? ( virtual/krb5 ) ssh? ( net-libs/libssh2[static-libs?] ) sys-libs/zlib
+RDEPEND=ldap? ( net-nds/openldap ) ssl? ( curl_ssl_axtls? ( net-libs/axTLS app-misc/ca-certificates ) curl_ssl_gnutls? ( || ( ( >=net-libs/gnutls-3[static-libs?] dev-libs/nettle ) ( =net-libs/gnutls-2.12*[nettle,static-libs?] dev-libs/nettle ) ( =net-libs/gnutls-2.12*[-nettle,static-libs?] dev-libs/libgcrypt[static-libs?] ) ( <net-libs/gnutls-2.12 dev-libs/libgcrypt[static-libs?] ) ) app-misc/ca-certificates ) curl_ssl_openssl? ( dev-libs/openssl[static-libs?] ) curl_ssl_nss? ( dev-libs/nss app-misc/ca-certificates ) curl_ssl_polarssl? ( net-libs/polarssl app-misc/ca-certificates ) ) idn? ( net-dns/libidn[static-libs?] ) ares? ( net-dns/c-ares ) kerberos? ( virtual/krb5 ) ssh? ( net-libs/libssh2[static-libs?] ) sys-libs/zlib
 REQUIRED_USE=threads? ( !ares ) ssl? ( ^^ ( curl_ssl_axtls curl_ssl_cyassl curl_ssl_gnutls curl_ssl_openssl curl_ssl_nss curl_ssl_polarssl ) )
 SLOT=0
 SRC_URI=http://curl.haxx.se/download/curl-7.25.0.tar.bz2
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	eutils	74d9118e657da5b1db0c36f5dea88e57	libtool	5f623f5a211fb1b2d84d88ee49959a54	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=be744aad3763a7d89dd76d7115dcfd05
+_md5_=77fd74f678e15f4d3685c72a005bebd8
diff --git a/metadata/md5-cache/net-misc/mosh-1.2 b/metadata/md5-cache/net-misc/mosh-1.2
index c225191afd5c..182f87f44360 100644
--- a/metadata/md5-cache/net-misc/mosh-1.2
+++ b/metadata/md5-cache/net-misc/mosh-1.2
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( client server ) examples? ( client )
 SLOT=0
 SRC_URI=https://github.com/downloads/keithw/mosh/mosh-1.2.tar.gz
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	eutils	74d9118e657da5b1db0c36f5dea88e57	libtool	5f623f5a211fb1b2d84d88ee49959a54	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=d71bf94880d4a92d4a5636b327564908
+_md5_=58610cab7bab12801ba4b5c590ca0182
diff --git a/metadata/md5-cache/net-misc/strongswan-4.6.2 b/metadata/md5-cache/net-misc/strongswan-4.6.3
similarity index 92%
rename from metadata/md5-cache/net-misc/strongswan-4.6.2
rename to metadata/md5-cache/net-misc/strongswan-4.6.3
index cdfc35535979..d4d19709f6f8 100644
--- a/metadata/md5-cache/net-misc/strongswan-4.6.2
+++ b/metadata/md5-cache/net-misc/strongswan-4.6.3
@@ -8,6 +8,6 @@ KEYWORDS=~arm ~amd64 ~ppc ~sparc ~x86
 LICENSE=GPL-2 RSA-MD5 RSA-PKCS11 DES
 RDEPEND=!net-misc/openswan >=dev-libs/gmp-4.1.5 gcrypt? ( dev-libs/libgcrypt ) caps? ( sys-libs/libcap ) curl? ( net-misc/curl ) ldap? ( net-nds/openldap ) smartcard? ( dev-libs/opensc ) openssl? ( >=dev-libs/openssl-0.9.8[-bindist] ) mysql? ( virtual/mysql ) sqlite? ( >=dev-db/sqlite-3.3.1 ) virtual/logger sys-apps/iproute2
 SLOT=0
-SRC_URI=http://download.strongswan.org/strongswan-4.6.2.tar.bz2
+SRC_URI=http://download.strongswan.org/strongswan-4.6.3.tar.bz2
 _eclasses_=eutils	74d9118e657da5b1db0c36f5dea88e57	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=25806d9be0c83de17d843c4d3150f388
+_md5_=b879750ca8d680de96ebf5fdb5f264e4
diff --git a/metadata/md5-cache/net-misc/tor-0.2.3.13_alpha b/metadata/md5-cache/net-misc/tor-0.2.3.13_alpha
deleted file mode 100644
index b6448685cdfe..000000000000
--- a/metadata/md5-cache/net-misc/tor-0.2.3.13_alpha
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=dev-libs/openssl >=dev-libs/libevent-2.0.14 nat-pmp? ( net-libs/libnatpmp ) upnp? ( net-libs/miniupnpc ) selinux? ( sec-policy/selinux-tor ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
-DESCRIPTION=Anonymizing overlay network for TCP
-EAPI=4
-HOMEPAGE=http://www.torproject.org/
-IUSE=+bufferevents nat-pmp tor-hardening transparent-proxy threads upnp selinux
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
-LICENSE=BSD
-RDEPEND=dev-libs/openssl >=dev-libs/libevent-2.0.14 nat-pmp? ( net-libs/libnatpmp ) upnp? ( net-libs/miniupnpc ) selinux? ( sec-policy/selinux-tor )
-SLOT=0
-SRC_URI=http://www.torproject.org/dist/tor-0.2.3.13-alpha.tar.gz
-_eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	eutils	74d9118e657da5b1db0c36f5dea88e57	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	libtool	5f623f5a211fb1b2d84d88ee49959a54	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=ebbf293634ad3314181f1592b07dcc62
diff --git a/metadata/md5-cache/net-misc/tor-0.2.3.15_alpha b/metadata/md5-cache/net-misc/tor-0.2.3.15_alpha
new file mode 100644
index 000000000000..978deaf61f1a
--- /dev/null
+++ b/metadata/md5-cache/net-misc/tor-0.2.3.15_alpha
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst prepare setup
+DEPEND=dev-libs/openssl sys-libs/zlib >=dev-libs/libevent-2.0.14 nat-pmp? ( net-libs/libnatpmp ) upnp? ( net-libs/miniupnpc ) selinux? ( sec-policy/selinux-tor )
+DESCRIPTION=Anonymizing overlay network for TCP
+EAPI=4
+HOMEPAGE=http://www.torproject.org/
+IUSE=+bufferevents nat-pmp tor-hardening transparent-proxy threads upnp selinux web
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+LICENSE=BSD
+RDEPEND=dev-libs/openssl sys-libs/zlib >=dev-libs/libevent-2.0.14 nat-pmp? ( net-libs/libnatpmp ) upnp? ( net-libs/miniupnpc ) selinux? ( sec-policy/selinux-tor )
+SLOT=0
+SRC_URI=http://www.torproject.org/dist/tor-0.2.3.15-alpha.tar.gz
+_eclasses_=eutils	74d9118e657da5b1db0c36f5dea88e57	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=2478d03e5d42b1ed446c93728340b169
diff --git a/metadata/md5-cache/net-misc/whois-5.0.10 b/metadata/md5-cache/net-misc/whois-5.0.10
deleted file mode 100644
index 8a3ccf077fe0..000000000000
--- a/metadata/md5-cache/net-misc/whois-5.0.10
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=idn? ( net-dns/libidn ) >=dev-lang/perl-5
-DESCRIPTION=improved Whois Client
-EAPI=3
-HOMEPAGE=http://www.linux.it/~md/software/
-IUSE=iconv idn nls
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=idn? ( net-dns/libidn )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://debian/pool/main/w/whois/whois_5.0.10.tar.gz
-_eclasses_=eutils	74d9118e657da5b1db0c36f5dea88e57	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=61f1986c394826a8996f9e9b4c8065ea
diff --git a/metadata/md5-cache/net-misc/whois-5.0.12 b/metadata/md5-cache/net-misc/whois-5.0.12
deleted file mode 100644
index 1b23bd7df17c..000000000000
--- a/metadata/md5-cache/net-misc/whois-5.0.12
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=idn? ( net-dns/libidn ) >=dev-lang/perl-5
-DESCRIPTION=improved Whois Client
-EAPI=3
-HOMEPAGE=http://www.linux.it/~md/software/
-IUSE=iconv idn nls
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=idn? ( net-dns/libidn )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://debian/pool/main/w/whois/whois_5.0.12.tar.gz
-_eclasses_=eutils	74d9118e657da5b1db0c36f5dea88e57	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=f033ca012b70b95fee5e3e2997c939c5
diff --git a/metadata/md5-cache/net-misc/whois-5.0.13 b/metadata/md5-cache/net-misc/whois-5.0.13
deleted file mode 100644
index ab32c9b686c3..000000000000
--- a/metadata/md5-cache/net-misc/whois-5.0.13
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=idn? ( net-dns/libidn ) >=dev-lang/perl-5
-DESCRIPTION=improved Whois Client
-EAPI=3
-HOMEPAGE=http://www.linux.it/~md/software/
-IUSE=iconv idn nls
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=idn? ( net-dns/libidn )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://debian/pool/main/w/whois/whois_5.0.13.tar.gz
-_eclasses_=eutils	74d9118e657da5b1db0c36f5dea88e57	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=5e8efd578d93f5f502a3d100d26e4e30
diff --git a/metadata/md5-cache/net-misc/whois-5.0.14 b/metadata/md5-cache/net-misc/whois-5.0.16
similarity index 75%
rename from metadata/md5-cache/net-misc/whois-5.0.14
rename to metadata/md5-cache/net-misc/whois-5.0.16
index 2c5e3e96adde..ec9b8b223b34 100644
--- a/metadata/md5-cache/net-misc/whois-5.0.14
+++ b/metadata/md5-cache/net-misc/whois-5.0.16
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=idn? ( net-dns/libidn ) >=dev-lang/perl-5
+DEPEND=idn? ( net-dns/libidn ) app-arch/xz-utils >=dev-lang/perl-5
 DESCRIPTION=improved Whois Client
 EAPI=4
 HOMEPAGE=http://www.linux.it/~md/software/
@@ -9,6 +9,6 @@ LICENSE=GPL-2
 RDEPEND=idn? ( net-dns/libidn )
 RESTRICT=test
 SLOT=0
-SRC_URI=mirror://debian/pool/main/w/whois/whois_5.0.14.tar.gz
+SRC_URI=mirror://debian/pool/main/w/whois/whois_5.0.16.tar.xz
 _eclasses_=eutils	74d9118e657da5b1db0c36f5dea88e57	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=6973f78ce8b5e89ee0c2d317911fa827
+_md5_=af2b924d1c4e28a6e82fea661d37274a
diff --git a/metadata/md5-cache/net-misc/whois-5.0.5 b/metadata/md5-cache/net-misc/whois-5.0.5
deleted file mode 100644
index 2f0ab0b829cf..000000000000
--- a/metadata/md5-cache/net-misc/whois-5.0.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=net-dns/libidn >=dev-lang/perl-5
-DESCRIPTION=improved Whois Client
-HOMEPAGE=http://www.linux.it/~md/software/
-IUSE=nls
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=net-dns/libidn
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://debian/pool/main/w/whois/whois_5.0.5.tar.gz
-_eclasses_=eutils	74d9118e657da5b1db0c36f5dea88e57	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=d1c2ccd56d2c01bf548689f7483bbb9a
diff --git a/metadata/md5-cache/net-misc/whois-5.0.8 b/metadata/md5-cache/net-misc/whois-5.0.8
deleted file mode 100644
index be6e904adab0..000000000000
--- a/metadata/md5-cache/net-misc/whois-5.0.8
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=idn? ( net-dns/libidn ) >=dev-lang/perl-5
-DESCRIPTION=improved Whois Client
-EAPI=3
-HOMEPAGE=http://www.linux.it/~md/software/
-IUSE=iconv idn nls
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=GPL-2
-RDEPEND=idn? ( net-dns/libidn )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://debian/pool/main/w/whois/whois_5.0.8.tar.gz
-_eclasses_=eutils	74d9118e657da5b1db0c36f5dea88e57	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=b227b2fafc0bf2cdb3e3538a2f051991
diff --git a/metadata/md5-cache/sci-visualization/kst-2.0.4 b/metadata/md5-cache/sci-visualization/kst-2.0.4
new file mode 100644
index 000000000000..e5a21bc83349
--- /dev/null
+++ b/metadata/md5-cache/sci-visualization/kst-2.0.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=sci-libs/cfitsio sci-libs/getdata sci-libs/gsl sci-libs/netcdf[cxx] x11-libs/qt-core:4 x11-libs/qt-gui:4 x11-libs/qt-opengl:4 x11-libs/qt-svg:4 test? ( x11-libs/qt-test:4 ) >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+DESCRIPTION=Fast real-time large-dataset viewing and plotting tool for KDE4
+EAPI=4
+HOMEPAGE=http://kst.kde.org/
+IUSE=debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 LGPL-2 FDL-1.2
+RDEPEND=sci-libs/cfitsio sci-libs/getdata sci-libs/gsl sci-libs/netcdf[cxx] x11-libs/qt-core:4 x11-libs/qt-gui:4 x11-libs/qt-opengl:4 x11-libs/qt-svg:4
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://sourceforge/kst/kst-2.0.4.tar.gz
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	6fa4dbd700f0f19059c36e545955c41e	eutils	74d9118e657da5b1db0c36f5dea88e57	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
+_md5_=5974a6d048328ebe392a17699a50aa9e
diff --git a/metadata/md5-cache/sec-policy/selinux-apache-2.20120215-r1 b/metadata/md5-cache/sec-policy/selinux-apache-2.20120215-r1
index e6d3ab09c41f..9dceb6f31cbf 100644
--- a/metadata/md5-cache/sec-policy/selinux-apache-2.20120215-r1
+++ b/metadata/md5-cache/sec-policy/selinux-apache-2.20120215-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile install postinst prepare unpack
-DEPEND=kerberos? ( sec-policy/selinux-kerberos ) >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120215 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DEPEND=kerberos? ( sec-policy/selinux-kerberos ) >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120215-r8 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
 DESCRIPTION=SELinux policy for Apache HTTPD
 EAPI=4
 HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 IUSE=kerberos
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=kerberos? ( sec-policy/selinux-kerberos ) >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120215
+RDEPEND=kerberos? ( sec-policy/selinux-kerberos ) >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120215-r8
 SLOT=0
-SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120215.tar.bz2
+SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120215.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120215-r8.tar.bz2
 _eclasses_=eutils	74d9118e657da5b1db0c36f5dea88e57	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	selinux-policy-2	2dff271bf83600217a03cb384a6fed44	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=498d27f9fcf729303cc6e7a47bcd645d
+_md5_=9891dc8bbebdc3ac948839262a8fc7dc
diff --git a/metadata/md5-cache/sys-devel/ct-ng-1.13.3 b/metadata/md5-cache/sys-devel/ct-ng-1.13.3
deleted file mode 100644
index b2792091c742..000000000000
--- a/metadata/md5-cache/sys-devel/ct-ng-1.13.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=crosstool-ng is a tool to build cross-compiling toolchains
-EAPI=4
-HOMEPAGE=http://ymorin.is-a-geek.org/projects/crosstool
-IUSE=bash-completion
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=net-misc/curl dev-vcs/cvs dev-vcs/subversion
-SLOT=0
-SRC_URI=http://ymorin.is-a-geek.org/download/crosstool-ng/crosstool-ng-1.13.3.tar.bz2
-_eclasses_=bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2
-_md5_=7c6b0978c5a4ea0c0fa04f0260dee7f5
diff --git a/metadata/md5-cache/sys-devel/ct-ng-1.14.0 b/metadata/md5-cache/sys-devel/ct-ng-1.15.0
similarity index 92%
rename from metadata/md5-cache/sys-devel/ct-ng-1.14.0
rename to metadata/md5-cache/sys-devel/ct-ng-1.15.0
index f61d5e37f701..f493b16486b1 100644
--- a/metadata/md5-cache/sys-devel/ct-ng-1.14.0
+++ b/metadata/md5-cache/sys-devel/ct-ng-1.15.0
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=net-misc/curl dev-util/gperf dev-vcs/cvs dev-vcs/subversion
 SLOT=0
-SRC_URI=http://ymorin.is-a-geek.org/download/crosstool-ng/crosstool-ng-1.14.0.tar.bz2
+SRC_URI=http://ymorin.is-a-geek.org/download/crosstool-ng/crosstool-ng-1.15.0.tar.bz2
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	eutils	74d9118e657da5b1db0c36f5dea88e57	libtool	5f623f5a211fb1b2d84d88ee49959a54	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=197abfcb76e41175a155191eb73c1c7f
+_md5_=c9feadd9a6f63701f1554f406ed1a289
diff --git a/metadata/md5-cache/www-apps/wordpress-3.3.1 b/metadata/md5-cache/www-apps/wordpress-3.3.1
deleted file mode 100644
index 951df3f1395c..000000000000
--- a/metadata/md5-cache/www-apps/wordpress-3.3.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst prerm setup
-DEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
-DESCRIPTION=Wordpress php and mysql based CMS system
-EAPI=4
-HOMEPAGE=http://wordpress.org/
-IUSE=vhosts
-KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=virtual/httpd-php || ( dev-lang/php[mysql] dev-lang/php[mysqli] ) || ( <dev-lang/php-5.3[pcre] >=dev-lang/php-5.3 ) >=app-admin/webapp-config-1.50.15
-SLOT=3.3.1
-SRC_URI=http://wordpress.org/wordpress-3.3.1.tar.gz
-_eclasses_=webapp	30d951d5c98c4f31c7999ab4ba4806d1
-_md5_=a65ff855f1e7cdb059d59b44739aa22b
diff --git a/metadata/md5-cache/www-client/chromium-18.0.1025.168 b/metadata/md5-cache/www-client/chromium-18.0.1025.168
index 0bd6f40206b3..fd69ce9d59ca 100644
--- a/metadata/md5-cache/www-client/chromium-18.0.1025.168
+++ b/metadata/md5-cache/www-client/chromium-18.0.1025.168
@@ -4,10 +4,10 @@ DESCRIPTION=Open-source version of Google Chrome web browser
 EAPI=4
 HOMEPAGE=http://chromium.org/
 IUSE=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
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=BSD
 RDEPEND=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/icu-49 >=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* )
 SLOT=0
 SRC_URI=http://commondatastorage.googleapis.com/chromium-browser-official/chromium-18.0.1025.168.tar.bz2
 _eclasses_=chromium	7fa8b89b813dd73fc3fbb50a89b05383	eutils	74d9118e657da5b1db0c36f5dea88e57	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	gnome2-utils	9d3cc9ffeb792a88ed8580de1a099b44	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	pax-utils	0ace932c4045349c7fc1af0fe7091acf	portability	536c5e70c5fb252ed3b769e04aa3f05b	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
-_md5_=c13eaff9a6056ac25a8d7999efd6ae45
+_md5_=80b56fecd12d30c0b6903f40293cf11d
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index cb5e18ea492b..84ee934ac9c8 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Tue, 01 May 2012 06:37:00 +0000
+Tue, 01 May 2012 16:37:00 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 5e8b0899b89f..9b488973d4b2 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Tue May  1 06:36:58 UTC 2012
+Tue May  1 16:36:58 UTC 2012
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 9943c8431d6b..ac2d029a3a77 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Tue, 01 May 2012 07:00:01 +0000
+Tue, 01 May 2012 17:00:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 85a0c66a0aad..abe9790e280a 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1335854101 Tue May  1 06:35:01 2012 UTC
+1335890101 Tue May  1 16:35:01 2012 UTC
diff --git a/net-misc/curl/curl-7.25.0-r1.ebuild b/net-misc/curl/curl-7.25.0-r1.ebuild
index 1634ddea8444..95776dcf065c 100644
--- a/net-misc/curl/curl-7.25.0-r1.ebuild
+++ b/net-misc/curl/curl-7.25.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.25.0-r1.ebuild,v 1.2 2012/04/26 15:20:52 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.25.0-r1.ebuild,v 1.3 2012/05/01 13:43:16 blueness Exp $
 
 EAPI="4"
 
@@ -21,10 +21,12 @@ RDEPEND="ldap? ( net-nds/openldap )
 		curl_ssl_axtls? ( net-libs/axTLS app-misc/ca-certificates )
 		curl_ssl_gnutls? (
 			|| (
-				( <=net-libs/gnutls-2.10.5 dev-libs/libgcrypt[static-libs?] app-misc/ca-certificates )
-				( net-libs/gnutls[-nettle,static-libs?] dev-libs/libgcrypt[static-libs?] app-misc/ca-certificates )
-				( net-libs/gnutls[nettle,static-libs?] dev-libs/nettle app-misc/ca-certificates )
+				( >=net-libs/gnutls-3[static-libs?] dev-libs/nettle )
+				( =net-libs/gnutls-2.12*[nettle,static-libs?] dev-libs/nettle )
+				( =net-libs/gnutls-2.12*[-nettle,static-libs?] dev-libs/libgcrypt[static-libs?] )
+				( <net-libs/gnutls-2.12 dev-libs/libgcrypt[static-libs?] )
 			)
+			app-misc/ca-certificates
 		)
 		curl_ssl_openssl? ( dev-libs/openssl[static-libs?] )
 		curl_ssl_nss? ( dev-libs/nss app-misc/ca-certificates )
@@ -103,7 +105,7 @@ src_configure() {
 		fi
 		if use curl_ssl_gnutls; then
 			einfo "SSL provided by gnutls"
-			if has_version net-libs/gnutls[nettle] ; then
+			if has_version ">=net-libs/gnutls-3" || has_version "=net-libs/gnutls-2.12*[nettle]"; then
 				einfo "gnutls compiled with dev-libs/nettle"
 				myconf+=( --with-gnutls --with-nettle )
 			else
diff --git a/net-misc/mosh/files/mosh-1.2-shared-skalibs-fix-configure.patch b/net-misc/mosh/files/mosh-1.2-shared-skalibs-fix-configure.patch
new file mode 100644
index 000000000000..498967f94fae
--- /dev/null
+++ b/net-misc/mosh/files/mosh-1.2-shared-skalibs-fix-configure.patch
@@ -0,0 +1,10 @@
+--- mosh-1.2/configure
++++ mosh-1.2/configure
+@@ -6147,6 +6147,7 @@
+   ;
+   return 0;
+ }
++char const * PROG = "mosh-test";
+ _ACEOF
+ if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_lib_stddjb_main=yes
diff --git a/net-misc/mosh/files/mosh-1.2-shared-skalibs.patch b/net-misc/mosh/files/mosh-1.2-shared-skalibs.patch
new file mode 100644
index 000000000000..c22a77410e38
--- /dev/null
+++ b/net-misc/mosh/files/mosh-1.2-shared-skalibs.patch
@@ -0,0 +1,61 @@
+--- mosh-1.2/configure.ac
++++ mosh-1.2/configure.ac
+@@ -163,7 +163,7 @@
+   [with_skalibs=$withval
+    AS_IF([test x"$withval" != xyes],
+      [SKALIBS_CPPFLAGS="-I$withval/include"
+-      SKALIBS_LDFLAGS="-L$withval/lib"])],
++      SKALIBS_LDFLAGS="-L$withval/lib -lrt"])],
+   [with_skalibs=no])
+ AC_ARG_WITH([skalibs-include],
+   [AS_HELP_STRING([--with-skalibs-include=DIR],
+@@ -172,7 +172,7 @@
+ AC_ARG_WITH([skalibs-libdir],
+   [AS_HELP_STRING([--with-skalibs-libdir=DIR],
+      [specify exact library dir for skalibs libraries])],
+-  [SKALIBS_LDFLAGS="-L$withval"])
++  [SKALIBS_LDFLAGS="-L$withval -lrt"])
+ 
+ STDDJB_CPPFLAGS=""
+ STDDJB_LDFLAGS=""
+@@ -360,9 +360,6 @@
+ 
+ AC_CONFIG_FILES([
+   Makefile
+-  third/Makefile
+-  third/libstddjb/Makefile
+-  third/poll/Makefile
+   src/Makefile
+   src/crypto/Makefile
+   src/frontend/Makefile
+--- mosh-1.2/src/frontend/mosh-server.cc
++++ mosh-1.2/src/frontend/mosh-server.cc
+@@ -750,3 +750,5 @@
+   struct stat buf;
+   return (0 == lstat( ".hushlogin", &buf ));
+ }
++
++char const * PROG = "mosh-server" ;
+--- mosh-1.2/src/frontend/mosh-client.cc
++++ mosh-1.2/src/frontend/mosh-client.cc
+@@ -140,3 +140,5 @@
+ 
+   return 0;
+ }
++
++char const * PROG = "mosh-client" ;
+--- mosh-1.2/src/examples/termemu.cc
++++ mosh-1.2/src/examples/termemu.cc
+@@ -324,3 +324,5 @@
+ 
+   swrite( STDOUT_FILENO, Terminal::Emulator::close().c_str() );
+ }
++
++char const * PROG = "termemu" ;
+--- mosh-1.2/Makefile.am
++++ mosh-1.2/Makefile.am
+@@ -1,3 +1,3 @@
+ ACLOCAL_AMFLAGS = -I m4
+-SUBDIRS = third src scripts man
++SUBDIRS = src scripts man
+ EXTRA_DIST = autogen.sh ocb-license.html README.md
diff --git a/net-misc/mosh/mosh-1.2.ebuild b/net-misc/mosh/mosh-1.2.ebuild
index aa2546edf353..6d28d83f0669 100644
--- a/net-misc/mosh/mosh-1.2.ebuild
+++ b/net-misc/mosh/mosh-1.2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/mosh/mosh-1.2.ebuild,v 1.1 2012/04/26 07:58:50 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mosh/mosh-1.2.ebuild,v 1.2 2012/05/01 09:04:26 xmw Exp $
 
 EAPI=4
 
-inherit autotools toolchain-funcs
+inherit autotools eutils toolchain-funcs
 
 DESCRIPTION="Mobile shell that supports roaming and intelligent local echo"
 HOMEPAGE="http://mosh.mit.edu"
@@ -30,17 +30,16 @@ DEPEND="${RDEPEND}
 src_prepare() {
 	einfo remove bundled skalibs
 	rm -r third || die
-	sed -e '/third/d' -i configure.ac
-	sed -e '/^SUBDIRS/s: third : :' -i Makefile.am
-
+	epatch "${FILESDIR}"/${P}-shared-skalibs.patch
 	eautoreconf
+	epatch "${FILESDIR}"/${P}-shared-skalibs-fix-configure.patch
 }
 
 src_configure() {
 	econf \
-		--with-skalibs=/ \
-		--with-skalibs-include=/usr/include/skalibs \
-		--with-skalibs-libdir=/usr/$(get_libdir)/skalibs \
+		--with-skalibs="${EPREFIX}"/ \
+		--with-skalibs-include="${EPREFIX}"/usr/include/skalibs \
+		--with-skalibs-libdir="${EPREFIX}"/usr/$(get_libdir)/skalibs \
 		$(use_enable client) \
 		$(use_enable server) \
 		$(use_enable examples) \
diff --git a/net-misc/strongswan/Manifest b/net-misc/strongswan/Manifest
index 59820b84d3a0..74a74b31ae03 100644
--- a/net-misc/strongswan/Manifest
+++ b/net-misc/strongswan/Manifest
@@ -1 +1 @@
-DIST strongswan-4.6.2.tar.bz2 3499818 RMD160 8e67b9b125ca3755c25fdd031428448e8e526c06 SHA1 83b1d471961409234c2ffdfcced0cb293bbe9a8e SHA256 a5ecb3fc60a94ded9197532c7ebf42e8e321223311e4a4834ea15219aa1625e4
+DIST strongswan-4.6.3.tar.bz2 3555738 RMD160 0a62d9c8bd01b5e540152a4b722e9d267e661a46 SHA1 af582d2432db67f3ec5449c8b2549728293fe9e5 SHA256 a2443f9b22b64932cf7600723aee4f2fce51ba56e0216ae5f31dbb3470903d24
diff --git a/net-misc/strongswan/strongswan-4.6.2.ebuild b/net-misc/strongswan/strongswan-4.6.3.ebuild
similarity index 99%
rename from net-misc/strongswan/strongswan-4.6.2.ebuild
rename to net-misc/strongswan/strongswan-4.6.3.ebuild
index 7e0224a78879..289c789d5f64 100644
--- a/net-misc/strongswan/strongswan-4.6.2.ebuild
+++ b/net-misc/strongswan/strongswan-4.6.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/strongswan/strongswan-4.6.2.ebuild,v 1.1 2012/02/21 12:45:25 gurligebis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/strongswan/strongswan-4.6.3.ebuild,v 1.1 2012/05/01 14:05:18 gurligebis Exp $
 
 EAPI=2
 inherit eutils linux-info
diff --git a/net-misc/tor/Manifest b/net-misc/tor/Manifest
index 62b9a8b32b59..d42b00eb87dd 100644
--- a/net-misc/tor/Manifest
+++ b/net-misc/tor/Manifest
@@ -1,4 +1,4 @@
 DIST tor-0.2.1.32.tar.gz 2592736 RMD160 1aebc22936e1ec13d18bf4ff19a51c6c1ffd4ec1 SHA1 7f1cbd590672eb16f39567ab47bd7f12d7e61422 SHA256 fafdcf330acd84fb5d09845d73d36f2180cd5ea2170c1fefd30c5d2aa98d288d
 DIST tor-0.2.2.35.tar.gz 2787536 RMD160 9986f0892d410de9f3d496a5db6de29288295e92 SHA1 98408e08c0c616c4c7669d018a66c55fc660cad3 SHA256 f141a41fffd31494a0f96ebbb6b999eab33ce62d5c31f81222a0acd034adbf3a
-DIST tor-0.2.3.13-alpha.tar.gz 3088897 RMD160 2f1a5a1e39502d10d6cf59187073278e02be9f4c SHA1 a40d00ae707e7eba5d20b3981ff1210e1e77e5e1 SHA256 2c4bf190ebc78861ffd89b154b2b370825fc5aa8694b59a87fd7f2f47a1345ec
 DIST tor-0.2.3.14-alpha.tar.gz 3112341 RMD160 9276ea7b2f83ae2ac053a29160a00bfbc5648dd6 SHA1 4c9fff466d6a1042a1950bc0d5ee91688d3f862e SHA256 6dfc447c95af68a48a19e46ae343d07e2d6140e37082f50751892615ec611ca0
+DIST tor-0.2.3.15-alpha.tar.gz 3114021 RMD160 f0dd7e4b1a72e09015989845618f595c29341f17 SHA1 f046afad0445b6c262bf4cf6cf0f285eaca0daab SHA256 09709e82f24edd6c0a039382b230315d3f905106879b853953ae89d59b7f857a
diff --git a/net-misc/tor/tor-0.2.3.13_alpha.ebuild b/net-misc/tor/tor-0.2.3.15_alpha.ebuild
similarity index 86%
rename from net-misc/tor/tor-0.2.3.13_alpha.ebuild
rename to net-misc/tor/tor-0.2.3.15_alpha.ebuild
index b6dc259fd9eb..d939fa25cae0 100644
--- a/net-misc/tor/tor-0.2.3.13_alpha.ebuild
+++ b/net-misc/tor/tor-0.2.3.15_alpha.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.2.3.13_alpha.ebuild,v 1.1 2012/03/27 15:15:05 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.2.3.15_alpha.ebuild,v 1.1 2012/05/01 12:11:31 blueness Exp $
 
 EAPI="4"
 
-inherit eutils flag-o-matic versionator autotools
+inherit eutils flag-o-matic versionator
 
 MY_PV="$(replace_version_separator 4 -)"
 MY_PF="${PN}-${MY_PV}"
@@ -16,9 +16,10 @@ S="${WORKDIR}/${MY_PF}"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="+bufferevents nat-pmp tor-hardening transparent-proxy threads upnp selinux"
+IUSE="+bufferevents nat-pmp tor-hardening transparent-proxy threads upnp selinux web"
 
 DEPEND="dev-libs/openssl
+	sys-libs/zlib
 	>=dev-libs/libevent-2.0.14
 	nat-pmp? ( net-libs/libnatpmp )
 	upnp? ( net-libs/miniupnpc )
@@ -31,9 +32,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/torrc.sample.patch
-	epatch "${FILESDIR}"/${P}-fix-miniupnpc-1.6.patch
-	eautoreconf
+	epatch "${FILESDIR}"/${PN}-0.2.3.14_alpha-torrc.sample.patch
 }
 
 src_configure() {
@@ -50,7 +49,8 @@ src_configure() {
 		$(use_enable tor-hardening linker-hardening) \
 		$(use_enable transparent-proxy transparent) \
 		$(use_enable threads) \
-		$(use_enable upnp)
+		$(use_enable upnp) \
+		$(use_enable web tor2web-mode)
 }
 
 src_install() {
diff --git a/net-misc/whois/Manifest b/net-misc/whois/Manifest
index 7e0e543a0c00..03d66c4fe08d 100644
--- a/net-misc/whois/Manifest
+++ b/net-misc/whois/Manifest
@@ -1,8 +1,3 @@
-DIST whois_5.0.10.tar.gz 81226 RMD160 fe555db6a5cb0e2ad8160f869d321ab731340623 SHA1 dd13a264db221fc5d75f6fede49a873f2819aa3b SHA256 7a0080d76da2384ff40611b14a41be3e10f59c6fcd5783225c33a4401e895c03
 DIST whois_5.0.11.tar.gz 81195 RMD160 c1b4fecf6759aafe54b0b05ff32a0fc9503ea0de SHA1 435770400fbccd0066af62a85e2028420e43ca4b SHA256 7f257a3104b14b7fe17f31a7b873e50c590df10e46cbab9942f9ad0a4a49c7ce
-DIST whois_5.0.12.tar.gz 82399 RMD160 5de8de298f70649120ffa48833f3517f3eea5304 SHA1 53bcb49db075f5bb0f4b9c1e47fdde933b6ffa1c SHA256 2b504440e8ea6336c364900d2c1574145f241da8c2ca9a6ac13149cf3c80c627
-DIST whois_5.0.13.tar.gz 82767 RMD160 244fb055e7adefa60d921bdcf747f2747fc919e6 SHA1 6e1450d6aeff96461c5466e848e55e246fc1183d SHA256 d8e6d3e051f7e07005a5dcd053ae64912fdf94b430ed9d592e9693ab49706ea3
-DIST whois_5.0.14.tar.gz 82419 RMD160 4981105ccfdb4ed58a14fd9707b52d365a28b555 SHA1 30b54a4a934a5d1ca3a933f4d810307a2e8bc6e5 SHA256 6722cb45107d74e5a24fd7b3d44f85f7c9fa2ad2a51a23646c3f12a20f26a187
 DIST whois_5.0.15.tar.xz 69696 RMD160 2e7c68507c9df574935952e3b1e1af243419ac77 SHA1 31c9c6cc066982c761c61d830c655cbda9943740 SHA256 e50aaef420a7233929cbaa862e78a7c5e363e661746490adc4b71f2fe44a19d9
-DIST whois_5.0.5.tar.gz 79360 RMD160 0e1184483e08b23e0110aa15fa8737b84d6cbdf6 SHA1 d460081c1a0006f8b42cc40a707cf6b48e5dbf55 SHA256 53fedf5dfbe49990324bc8afd6013d43702b6c7d45cdd2adb4201c526996ed96
-DIST whois_5.0.8.tar.gz 81003 RMD160 d2f13d40ef40459ec900e7c6073b6b0d2163d93b SHA1 b8328d1a05f2910f535f49fd16c567ca5073762d SHA256 7fa0f67dbdbbc8e81ccdf9877105e8e1d7d4539e52f8be1ed457c7eb61600241
+DIST whois_5.0.16.tar.xz 69812 RMD160 c0d3fc28bf61757e858bd048cf58a15f752bde0c SHA1 49c32937c9c080f5f2a81d46d0f3868fade54e3f SHA256 b628be5bd5e7527b7695a2e28508d61989d8b1e57407d3215ff7145e2070d604
diff --git a/net-misc/whois/whois-5.0.10.ebuild b/net-misc/whois/whois-5.0.10.ebuild
deleted file mode 100644
index 851e547aa066..000000000000
--- a/net-misc/whois/whois-5.0.10.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/whois/whois-5.0.10.ebuild,v 1.1 2011/02/05 08:36:27 vapier Exp $
-
-EAPI=3
-inherit eutils toolchain-funcs
-
-MY_P=${P/-/_}
-DESCRIPTION="improved Whois Client"
-HOMEPAGE="http://www.linux.it/~md/software/"
-SRC_URI="mirror://debian/pool/main/w/whois/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
-IUSE="iconv idn nls"
-RESTRICT="test" #59327
-
-RDEPEND="idn? ( net-dns/libidn )"
-DEPEND="${RDEPEND}
-	>=dev-lang/perl-5"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-4.7.2-config-file.patch
-
-	if use nls ; then
-		sed -i -e 's:#\(.*pos\):\1:' Makefile
-	else
-		sed -i -e '/ENABLE_NLS/s:define:undef:' config.h
-	fi
-}
-
-src_configure() { :;} # expected no-op
-
-src_compile() {
-	unset HAVE_ICONV HAVE_LIBIDN
-	use iconv && export HAVE_ICONV=1
-	use idn && export HAVE_LIBIDN=1
-	tc-export CC
-	emake CFLAGS="${CFLAGS} ${CPPFLAGS}" || die
-}
-
-src_install() {
-	emake BASEDIR="${ED}" prefix=/usr install || die
-	insinto /etc
-	doins whois.conf
-	dodoc README debian/changelog
-
-	if [[ ${USERLAND} != "GNU" ]]; then
-		mv "${ED}"/usr/share/man/man1/{whois,mdwhois}.1
-		mv "${ED}"/usr/bin/{whois,mdwhois}
-	fi
-}
diff --git a/net-misc/whois/whois-5.0.12.ebuild b/net-misc/whois/whois-5.0.12.ebuild
deleted file mode 100644
index a3dfa8dcb0ed..000000000000
--- a/net-misc/whois/whois-5.0.12.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/whois/whois-5.0.12.ebuild,v 1.1 2011/10/18 21:16:12 vapier Exp $
-
-EAPI=3
-inherit eutils toolchain-funcs
-
-MY_P=${P/-/_}
-DESCRIPTION="improved Whois Client"
-HOMEPAGE="http://www.linux.it/~md/software/"
-SRC_URI="mirror://debian/pool/main/w/whois/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
-IUSE="iconv idn nls"
-RESTRICT="test" #59327
-
-RDEPEND="idn? ( net-dns/libidn )"
-DEPEND="${RDEPEND}
-	>=dev-lang/perl-5"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-4.7.2-config-file.patch
-
-	if use nls ; then
-		sed -i -e 's:#\(.*pos\):\1:' Makefile
-	else
-		sed -i -e '/ENABLE_NLS/s:define:undef:' config.h
-	fi
-}
-
-src_configure() { :;} # expected no-op
-
-src_compile() {
-	unset HAVE_ICONV HAVE_LIBIDN
-	use iconv && export HAVE_ICONV=1
-	use idn && export HAVE_LIBIDN=1
-	tc-export CC
-	emake CFLAGS="${CFLAGS} ${CPPFLAGS}" || die
-}
-
-src_install() {
-	emake BASEDIR="${ED}" prefix=/usr install || die
-	insinto /etc
-	doins whois.conf
-	dodoc README debian/changelog
-
-	if [[ ${USERLAND} != "GNU" ]]; then
-		mv "${ED}"/usr/share/man/man1/{whois,mdwhois}.1
-		mv "${ED}"/usr/bin/{whois,mdwhois}
-	fi
-}
diff --git a/net-misc/whois/whois-5.0.13.ebuild b/net-misc/whois/whois-5.0.13.ebuild
deleted file mode 100644
index 8f5b2d7e13e9..000000000000
--- a/net-misc/whois/whois-5.0.13.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/whois/whois-5.0.13.ebuild,v 1.1 2011/12/05 09:36:47 radhermit Exp $
-
-EAPI=3
-inherit eutils toolchain-funcs
-
-MY_P=${P/-/_}
-DESCRIPTION="improved Whois Client"
-HOMEPAGE="http://www.linux.it/~md/software/"
-SRC_URI="mirror://debian/pool/main/w/whois/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
-IUSE="iconv idn nls"
-RESTRICT="test" #59327
-
-RDEPEND="idn? ( net-dns/libidn )"
-DEPEND="${RDEPEND}
-	>=dev-lang/perl-5"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-4.7.2-config-file.patch
-
-	if use nls ; then
-		sed -i -e 's:#\(.*pos\):\1:' Makefile
-	else
-		sed -i -e '/ENABLE_NLS/s:define:undef:' config.h
-	fi
-}
-
-src_configure() { :;} # expected no-op
-
-src_compile() {
-	unset HAVE_ICONV HAVE_LIBIDN
-	use iconv && export HAVE_ICONV=1
-	use idn && export HAVE_LIBIDN=1
-	tc-export CC
-	emake CFLAGS="${CFLAGS} ${CPPFLAGS}" || die
-}
-
-src_install() {
-	emake BASEDIR="${ED}" prefix=/usr install || die
-	insinto /etc
-	doins whois.conf
-	dodoc README debian/changelog
-
-	if [[ ${USERLAND} != "GNU" ]]; then
-		mv "${ED}"/usr/share/man/man1/{whois,mdwhois}.1
-		mv "${ED}"/usr/bin/{whois,mdwhois}
-	fi
-}
diff --git a/net-misc/whois/whois-5.0.14.ebuild b/net-misc/whois/whois-5.0.16.ebuild
similarity index 83%
rename from net-misc/whois/whois-5.0.14.ebuild
rename to net-misc/whois/whois-5.0.16.ebuild
index 701d51e07004..88fbcc178350 100644
--- a/net-misc/whois/whois-5.0.14.ebuild
+++ b/net-misc/whois/whois-5.0.16.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/net-misc/whois/whois-5.0.14.ebuild,v 1.1 2011/12/26 21:59:45 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/whois/whois-5.0.16.ebuild,v 1.1 2012/05/01 14:19:26 radhermit Exp $
 
 EAPI=4
 inherit eutils toolchain-funcs
@@ -8,7 +8,7 @@ inherit eutils toolchain-funcs
 MY_P=${P/-/_}
 DESCRIPTION="improved Whois Client"
 HOMEPAGE="http://www.linux.it/~md/software/"
-SRC_URI="mirror://debian/pool/main/w/whois/${MY_P}.tar.gz"
+SRC_URI="mirror://debian/pool/main/w/whois/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -18,6 +18,7 @@ RESTRICT="test" #59327
 
 RDEPEND="idn? ( net-dns/libidn )"
 DEPEND="${RDEPEND}
+	app-arch/xz-utils
 	>=dev-lang/perl-5"
 
 src_prepare() {
diff --git a/net-misc/whois/whois-5.0.5.ebuild b/net-misc/whois/whois-5.0.5.ebuild
deleted file mode 100644
index a52edac9c6ab..000000000000
--- a/net-misc/whois/whois-5.0.5.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/whois/whois-5.0.5.ebuild,v 1.9 2010/09/25 15:13:27 jer Exp $
-
-inherit eutils toolchain-funcs
-
-MY_P=${P/-/_}
-DESCRIPTION="improved Whois Client"
-HOMEPAGE="http://www.linux.it/~md/software/"
-SRC_URI="mirror://debian/pool/main/w/whois/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="nls"
-RESTRICT="test" #59327
-
-RDEPEND="net-dns/libidn"
-DEPEND="${RDEPEND}
-	>=dev-lang/perl-5"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-4.7.2-config-file.patch
-
-	if use nls ; then
-		sed -i -e 's:#\(.*pos\):\1:' Makefile
-	else
-		sed -i -e '/ENABLE_NLS/s:define:undef:' config.h
-	fi
-}
-
-src_compile() {
-	tc-export CC
-	emake CFLAGS="${CFLAGS} ${CPPFLAGS}" HAVE_LIBIDN=1 || die
-}
-
-src_install() {
-	emake BASEDIR="${D}" prefix=/usr install || die
-	insinto /etc
-	doins whois.conf
-	dodoc README debian/changelog
-
-	if [[ ${USERLAND} != "GNU" ]]; then
-		mv "${D}"/usr/share/man/man1/{whois,mdwhois}.1
-		mv "${D}"/usr/bin/{whois,mdwhois}
-	fi
-}
diff --git a/net-misc/whois/whois-5.0.8.ebuild b/net-misc/whois/whois-5.0.8.ebuild
deleted file mode 100644
index 9be05f7bff55..000000000000
--- a/net-misc/whois/whois-5.0.8.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/whois/whois-5.0.8.ebuild,v 1.9 2011/12/15 20:28:35 grobian Exp $
-
-EAPI=3
-inherit eutils toolchain-funcs
-
-MY_P=${P/-/_}
-DESCRIPTION="improved Whois Client"
-HOMEPAGE="http://www.linux.it/~md/software/"
-SRC_URI="mirror://debian/pool/main/w/whois/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="iconv idn nls"
-RESTRICT="test" #59327
-
-RDEPEND="idn? ( net-dns/libidn )"
-DEPEND="${RDEPEND}
-	>=dev-lang/perl-5"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-4.7.2-config-file.patch
-
-	if use nls ; then
-		sed -i -e 's:#\(.*pos\):\1:' Makefile
-	else
-		sed -i -e '/ENABLE_NLS/s:define:undef:' config.h
-	fi
-
-	echo "int main() {}" | $(tc-getCC) ${CFLAGS} ${LDFLAGS} -xc -o /dev/null - -lcrypt >& /dev/null \
-		|| sed -i -e 's/-lcrypt//' Makefile
-}
-
-src_configure() { :;} # expected no-op
-
-src_compile() {
-	unset HAVE_ICONV HAVE_LIBIDN
-	use iconv && export HAVE_ICONV=1
-	use idn && export HAVE_LIBIDN=1
-	tc-export CC
-	emake CFLAGS="${CFLAGS} ${CPPFLAGS}" || die
-}
-
-src_install() {
-	emake BASEDIR="${D}" prefix="${EPREFIX}"/usr install || die
-	insinto /etc
-	doins whois.conf
-	dodoc README debian/changelog
-
-	if [[ ${USERLAND} != "GNU" ]]; then
-		mv "${ED}"/usr/share/man/man1/{whois,mdwhois}.1
-		mv "${ED}"/usr/bin/{whois,mdwhois}
-	fi
-}
diff --git a/net-misc/youtube-viewer/metadata.xml b/net-misc/youtube-viewer/metadata.xml
index ffed44ace2ae..f19bb3a6d185 100644
--- a/net-misc/youtube-viewer/metadata.xml
+++ b/net-misc/youtube-viewer/metadata.xml
@@ -2,14 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
-		<email>julian.ospald@googlemail.com</email>
+		<email>hasufell@gentoo.org</email>
 		<name>Julian Ospald</name>
-		<description>Maintainer. Assign bugs to him</description>
-	</maintainer>
-	<maintainer>
-		<email>floppym@gentoo.org</email>
-		<name>Mike Gilbert</name>
-		<description>Proxy maintainer. CC him on bugs</description>
 	</maintainer>
 	<upstream>
 		<maintainer status="active">
@@ -22,4 +16,4 @@
 		Youtube Videos with MPlayer. It has been written in Perl and plays videos
 		from Youtube at the best quality available without using a flash player. 
 	</longdescription>
-</pkgmetadata>
\ No newline at end of file
+</pkgmetadata>

diff --git a/profiles/package.mask b/profiles/package.mask
index 1d990143a607..0c70bb37a869 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
 ####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.13712 2012/04/30 20:39:38 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.13713 2012/05/01 10:09:44 johu 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
@@ -170,12 +170,6 @@ kde-base/ksecrets
 # Alpha versions of dev-libs/libevent are considered unstable
 >dev-libs/libevent-2.1
 
-# Samuli Suominen <ssuominen@gentoo.org> (03 Apr 2012)
-# - Still using the obsolete MusicBrainz RDF based database.
-# - Incompatible with latest libmp4v2 API.
-# Removal in 30 days wrt bug 409257.
-media-libs/tunepimp
-
 # Mike Gilbert <floppym@gentoo.org> (01 Apr 2012)
 # The python-3 slot is obsolete for this package.
 =dev-python/python-dateutil-2.0
diff --git a/sci-visualization/kst/Manifest b/sci-visualization/kst/Manifest
index 62d8dc60cafc..9d0afd03f461 100644
--- a/sci-visualization/kst/Manifest
+++ b/sci-visualization/kst/Manifest
@@ -1 +1,2 @@
 DIST kst-2.0.0.tar.gz 10270708 RMD160 b8b74bf8e22a80cd9133fd28224f77ec8b60decb SHA1 76742eb3fd81f68148449fa84abc8dc3139be720 SHA256 6f3e639b87cc21c3ddc8891aa91ee713c6b750cd9fafc945fb97acc1a8fe0c7c
+DIST kst-2.0.4.tar.gz 10836992 RMD160 cbe28bd4f9e78cda59f32cdc5e4739effcec7134 SHA1 91a817565f3858f40b5498d88e6e65d40d7bfb00 SHA256 026774411ce919de6831139c378f632b2493bc31c39f901f5f4da712eb538da3
diff --git a/sci-visualization/kst/files/kst-2.0.4-cfitsio-includes.patch b/sci-visualization/kst/files/kst-2.0.4-cfitsio-includes.patch
new file mode 100644
index 000000000000..e9dfccf6683e
--- /dev/null
+++ b/sci-visualization/kst/files/kst-2.0.4-cfitsio-includes.patch
@@ -0,0 +1,39 @@
+diff --git a/src/datasources/healpix/healpix_tools.h b/src/datasources/healpix/healpix_tools.h
+index 28ad906..420fc7f 100644
+--- a/src/datasources/healpix/healpix_tools.h
++++ b/src/datasources/healpix/healpix_tools.h
+@@ -19,7 +19,7 @@
+ #define HEALPIX_TOOLS_H
+ 
+ #include <math.h>
+-#include <libcfitsio0/fitsio.h>
++#include <fitsio.h>
+ #include <datasource.h>
+ 
+ #  ifdef HEALPIX_PI
+diff --git a/src/datasources/lfiio/lfiio.h b/src/datasources/lfiio/lfiio.h
+index bb6493c..8ed748c 100644
+--- a/src/datasources/lfiio/lfiio.h
++++ b/src/datasources/lfiio/lfiio.h
+@@ -18,7 +18,7 @@
+ 
+ #include <datasource.h>
+ #include <dataplugin.h>
+-#include <libcfitsio0/fitsio.h>
++#include <fitsio.h>
+ 
+ class LFIIOSource : public Kst::DataSource {
+   Q_OBJECT
+diff --git a/src/datasources/planckIDEF/planckIDEF.h b/src/datasources/planckIDEF/planckIDEF.h
+index 7fb226f..6e6d82f 100644
+--- a/src/datasources/planckIDEF/planckIDEF.h
++++ b/src/datasources/planckIDEF/planckIDEF.h
+@@ -16,7 +16,7 @@
+ 
+ #include <datasource.h>
+ #include <dataplugin.h>
+-#include <libcfitsio0/fitsio.h>
++#include <fitsio.h>
+ 
+ typedef struct {
+   QString file;
diff --git a/sci-visualization/kst/kst-2.0.4.ebuild b/sci-visualization/kst/kst-2.0.4.ebuild
new file mode 100644
index 000000000000..3d906ea8577c
--- /dev/null
+++ b/sci-visualization/kst/kst-2.0.4.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/kst/kst-2.0.4.ebuild,v 1.1 2012/05/01 14:14:33 pesa Exp $
+
+EAPI=4
+
+CMAKE_USE_DIR=${S}/cmake
+
+inherit cmake-utils multilib
+
+DESCRIPTION="Fast real-time large-dataset viewing and plotting tool for KDE4"
+HOMEPAGE="http://kst.kde.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2 FDL-1.2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug test"
+RESTRICT="test"
+
+RDEPEND="
+	sci-libs/cfitsio
+	sci-libs/getdata
+	sci-libs/gsl
+	sci-libs/netcdf[cxx]
+	x11-libs/qt-core:4
+	x11-libs/qt-gui:4
+	x11-libs/qt-opengl:4
+	x11-libs/qt-svg:4
+"
+DEPEND="${RDEPEND}
+	test? ( x11-libs/qt-test:4 )
+"
+
+DOCS=( AUTHORS ChangeLog )
+PATCHES=( "${FILESDIR}/${P}-cfitsio-includes.patch" )
+
+src_prepare() {
+	base_src_prepare
+
+	# fix desktop file
+	sed -i -e 's/^Categories=/&Education;/' \
+		-e '/^Encoding=/d' \
+		src/kst/kst2.desktop || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-Dkst_install_libdir=$(get_libdir)
+		-Dkst_pch=OFF
+		-Dkst_release=$(use debug && echo OFF || echo ON)
+		-Dkst_rpath=OFF
+		-Dkst_svnversion=OFF
+		$(cmake-utils_use test kst_test)
+	)
+	cmake-utils_src_configure
+}
diff --git a/sci-visualization/kst/metadata.xml b/sci-visualization/kst/metadata.xml
index 37b9640e6ce9..dc439f7e84f5 100644
--- a/sci-visualization/kst/metadata.xml
+++ b/sci-visualization/kst/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>qt</herd>
-	<longdescription lang="en">
-	</longdescription>
+<herd>qt</herd>
 </pkgmetadata>
-
diff --git a/sec-policy/selinux-apache/Manifest b/sec-policy/selinux-apache/Manifest
index 8066548ae048..8aa0df0e3567 100644
--- a/sec-policy/selinux-apache/Manifest
+++ b/sec-policy/selinux-apache/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20110726-r11.tar.bz2 31218 RMD160 c4a89cb27734d0621bd41943e1ffe2fc20a14f51 SHA1 41aa5916edfb7ff8fbb114da81716a88c68f4904 SHA256 a57e5b4ec46ac12a852c79519d1bf197582ad02bffa1b758bc6a4684dfc35064
 DIST patchbundle-selinux-base-policy-2.20120215-r1.tar.bz2 25134 RMD160 335f40e4529284f0e5057d1ac10d067a40251903 SHA1 e80de3d6d406d9a950d7f336b338fe30d20dcc26 SHA256 708f6f4a284453ae6ed73f78b6e27b88d0bed09f541292f619e67a4ab6510aa7
+DIST patchbundle-selinux-base-policy-2.20120215-r8.tar.bz2 29993 RMD160 6d6a03ff3d24951529f32442dd713b1f4982aa7b SHA1 1a2fec3e59f4f440598c52cf28c2eee45ce46d92 SHA256 0d2b6b35007f833d49701f4ea4a71b91d056ee4b86c990aa000aea1c431a8d60
 DIST refpolicy-2.20110726.tar.bz2 588033 RMD160 9803effffe1dbb28d52bee03432e052f4fdc8d3f SHA1 cc27b06c3f541d8f2c57c52804ab6893afcd9db2 SHA256 8159b7535aa0f805510e4e3504b1317d7083b227f0ef3df51c6f002ed70ecedb
 DIST refpolicy-2.20120215.tar.bz2 589917 RMD160 333960d5fdd5f9a23a024d1782950a06ada4f2d1 SHA1 1fe2dd03ea27e0e6fbde6e11309895efd43916e6 SHA256 6df77faf62f73bd1f6e3bfca3fa2f77cdfd2cada94a7dcc4816ed9bbcf3545dc
diff --git a/sec-policy/selinux-apache/selinux-apache-2.20120215-r1.ebuild b/sec-policy/selinux-apache/selinux-apache-2.20120215-r1.ebuild
index 072c391d06e2..eb93c73f8aad 100644
--- a/sec-policy/selinux-apache/selinux-apache-2.20120215-r1.ebuild
+++ b/sec-policy/selinux-apache/selinux-apache-2.20120215-r1.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-apache/selinux-apache-2.20120215-r1.ebuild,v 1.1 2012/04/26 18:38:44 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-apache/selinux-apache-2.20120215-r1.ebuild,v 1.2 2012/05/01 11:21:47 swift Exp $
 EAPI="4"
 
-inherit selinux-policy-2
-
 IUSE="kerberos"
 MODS="apache"
 BASEPOL="2.20120215-r8"
 
+inherit selinux-policy-2
+
 DESCRIPTION="SELinux policy for Apache HTTPD"
 DEPEND="${DEPEND}
 	kerberos? ( sec-policy/selinux-kerberos )"
diff --git a/sys-devel/ct-ng/Manifest b/sys-devel/ct-ng/Manifest
index 5d847d193f9f..be736a08390b 100644
--- a/sys-devel/ct-ng/Manifest
+++ b/sys-devel/ct-ng/Manifest
@@ -1,5 +1,4 @@
 DIST crosstool-ng-1.12.4.tar.bz2 1876133 RMD160 e83804a194f5d8baf128cf34cf59a2da615b63d8 SHA1 e96a65869658c621254b8b75e3fbc53af218177e SHA256 93e90fce93d09d99032f5b04a01f1f503a068ebfa7ba94dca37b2fc598032f98
-DIST crosstool-ng-1.13.3.tar.bz2 1875869 RMD160 a7a40069f2fd6087d8147418d15636bb367e2634 SHA1 f369761a5ed28767595ea4e646eb35065604c100 SHA256 3594dab7b0fd10d467e776ee64173dd4cb591f4b87d407efae863a3616f933ca
 DIST crosstool-ng-1.13.4.tar.bz2 1875711 RMD160 8af57bbb266d21c0647d16724e9a126cc4a32a5d SHA1 c2325a8a5c15d558f9eacc38c601e459bf24cab6 SHA256 90ab9a1349376df19d9c4b46e89daf442f7fb34bb4e561b9606c145f635f0c0e
-DIST crosstool-ng-1.14.0.tar.bz2 1864326 RMD160 c2dfb00e22e0ff7c9f6567c28b640dd7c2391a55 SHA1 6eb797f2fe7ec0cb46b1006d826efeba3ec07d0d SHA256 0de4aa259907241e75051f35cbf385d14570fc1a25c297769df0496c43f802f1
 DIST crosstool-ng-1.14.1.tar.bz2 1960675 RMD160 3282d370247a31df641a221df365b57cd10bd947 SHA1 a60c9aa666e7638b4a4efb99b3516d10e664e9e0 SHA256 946f61fe8c8c51df497f0643a8cb9aec84e5cfec63b1131fc5699fede015006e
+DIST crosstool-ng-1.15.0.tar.bz2 1976228 RMD160 6d8a6184b2e0b36d4aff40651279a48a96b66a9a SHA1 3d8b93b5d1f878c8ff38d2b60ad7b68b91db9162 SHA256 05998af5581362d4bd328ba28fb677bac5d6350b9a534e78136423252185e3e7
diff --git a/sys-devel/ct-ng/ct-ng-1.13.3.ebuild b/sys-devel/ct-ng/ct-ng-1.13.3.ebuild
deleted file mode 100644
index 369ce40a61ec..000000000000
--- a/sys-devel/ct-ng/ct-ng-1.13.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/ct-ng/ct-ng-1.13.3.ebuild,v 1.1 2012/01/24 15:09:25 blueness Exp $
-
-EAPI="4"
-
-inherit bash-completion-r1
-
-DESCRIPTION="crosstool-ng is a tool to build cross-compiling toolchains"
-HOMEPAGE="http://ymorin.is-a-geek.org/projects/crosstool"
-MY_P=${P/ct/crosstool}
-S=${WORKDIR}/${MY_P}
-SRC_URI="http://ymorin.is-a-geek.org/download/crosstool-ng/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="bash-completion"
-
-RDEPEND="net-misc/curl
-	dev-vcs/cvs
-	dev-vcs/subversion"
-
-src_install() {
-	emake DESTDIR="${D%/}" install || die "install failed"
-	dobashcomp ${PN}.comp
-	dodoc README TODO
-}
diff --git a/sys-devel/ct-ng/ct-ng-1.14.0.ebuild b/sys-devel/ct-ng/ct-ng-1.15.0.ebuild
similarity index 88%
rename from sys-devel/ct-ng/ct-ng-1.14.0.ebuild
rename to sys-devel/ct-ng/ct-ng-1.15.0.ebuild
index e9449593fcee..196d6deabfd7 100644
--- a/sys-devel/ct-ng/ct-ng-1.14.0.ebuild
+++ b/sys-devel/ct-ng/ct-ng-1.15.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/ct-ng/ct-ng-1.14.0.ebuild,v 1.2 2012/02/04 00:35:32 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/ct-ng/ct-ng-1.15.0.ebuild,v 1.1 2012/05/01 12:26:19 blueness Exp $
 
 EAPI="4"
 
diff --git a/www-apps/wordpress/Manifest b/www-apps/wordpress/Manifest
index c91f4df7d117..a041363fd0f8 100644
--- a/www-apps/wordpress/Manifest
+++ b/www-apps/wordpress/Manifest
@@ -1,2 +1 @@
-DIST wordpress-3.3.1.tar.gz 3879784 RMD160 956a99348b965c2bc0fa4083e5295425958e90a4 SHA1 c250cf66da88c49c927161172af2264caac6d2d5 SHA256 e884db6e551c155f022533b6653867b048088cd3cbcbfe546b404696dd960dc2
 DIST wordpress-3.3.2.tar.gz 3883667 RMD160 1fce1f9402308f9e4689778656a2e7e8fab45211 SHA1 f4c0ee4d14d3364d158755072a944cd8cf685475 SHA256 3da62214ef274066ed7912a6f062000e173e267297e34b7b011f029366cc1b2f
diff --git a/www-apps/wordpress/wordpress-3.3.1.ebuild b/www-apps/wordpress/wordpress-3.3.1.ebuild
deleted file mode 100644
index f0710aaea35b..000000000000
--- a/www-apps/wordpress/wordpress-3.3.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/wordpress/wordpress-3.3.1.ebuild,v 1.2 2012/02/05 06:00:52 radhermit Exp $
-
-EAPI="4"
-
-inherit webapp
-
-DESCRIPTION="Wordpress php and mysql based CMS system"
-HOMEPAGE="http://wordpress.org/"
-SRC_URI="http://wordpress.org/${P/_rc/-RC}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND="virtual/httpd-php
-	|| ( dev-lang/php[mysql] dev-lang/php[mysqli] )
-	|| ( <dev-lang/php-5.3[pcre] >=dev-lang/php-5.3 )"
-
-S=${WORKDIR}/${PN}
-
-need_httpd_cgi
-
-src_install() {
-	webapp_src_preinst
-
-	dohtml readme.html
-	rm -f readme.html license.txt
-
-	[ -f wp-config.php ] || cp wp-config-sample.php wp-config.php
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-
-	webapp_serverowned "${MY_HTDOCSDIR}"/index.php
-	webapp_serverowned "${MY_HTDOCSDIR}"/wp-admin/menu.php
-	webapp_serverowned "${MY_HTDOCSDIR}"
-
-	webapp_configfile  "${MY_HTDOCSDIR}"/wp-config.php
-
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
-	webapp_postupgrade_txt en "${FILESDIR}"/postupgrade-en.txt
-
-	webapp_src_install
-}
diff --git a/www-client/chromium/chromium-18.0.1025.168.ebuild b/www-client/chromium/chromium-18.0.1025.168.ebuild
index 9bc6b9adbf51..771ed6da4b5f 100644
--- a/www-client/chromium/chromium-18.0.1025.168.ebuild
+++ b/www-client/chromium/chromium-18.0.1025.168.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.168.ebuild,v 1.1 2012/05/01 02:17:13 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-18.0.1025.168.ebuild,v 1.2 2012/05/01 09:37:03 ago 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