diff --git a/app-cdr/k9copy/Manifest b/app-cdr/k9copy/Manifest
index 25a302a6a4d7..15401a92b704 100644
--- a/app-cdr/k9copy/Manifest
+++ b/app-cdr/k9copy/Manifest
@@ -1,2 +1 @@
-DIST k9copy-2.3.7-Source.tar.gz 1571305 RMD160 c3b57c77bdb32365f9f694101f1eaf59059d22d9 SHA1 8b0aa8f1e63e4a396746f88ca9c763808895b7d0 SHA256 516f4108a189a050f0aadf5b617d151b6b0e52c18823941f2b895073c104e74e
 DIST k9copy-2.3.8-Source.tar.gz 1589535 RMD160 1855649ca84140718fc26d97a79ee23e8eb90fa2 SHA1 15c9900c689d4d98d8ebae9fbe6e7f7de158cc32 SHA256 cf5e2d9faf7821561e478ed1fc9b63bbcc3448405d7b7866f68b018d16b42fdf
diff --git a/app-cdr/k9copy/files/k9copy-2.3.7-ffmpeg.patch b/app-cdr/k9copy/files/k9copy-2.3.7-ffmpeg.patch
deleted file mode 100644
index c92582a8dd55..000000000000
--- a/app-cdr/k9copy/files/k9copy-2.3.7-ffmpeg.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Fix build with ffmpeg/libav trunk after the big bump.
-
-Index: k9copy-2.3.7-Source/src/import/k9avidecode.cpp
-===================================================================
---- k9copy-2.3.7-Source.orig/src/import/k9avidecode.cpp
-+++ k9copy-2.3.7-Source/src/import/k9avidecode.cpp
-@@ -145,7 +145,7 @@ bool k9AviDecode::open(const QString & _
- // Find the first video stream
-     m_videoStream=-1;
-     for (i=0; i<m_FormatCtx->nb_streams; i++)
--        if (m_FormatCtx->streams[i]->codec->codec_type==CODEC_TYPE_VIDEO) {
-+        if (m_FormatCtx->streams[i]->codec->codec_type==AVMEDIA_TYPE_VIDEO) {
-             m_videoStream=i;
-             break;
-         }
diff --git a/app-cdr/k9copy/k9copy-2.3.7.ebuild b/app-cdr/k9copy/k9copy-2.3.7.ebuild
deleted file mode 100644
index 63a3fabf8f58..000000000000
--- a/app-cdr/k9copy/k9copy-2.3.7.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/k9copy/k9copy-2.3.7.ebuild,v 1.5 2011/12/07 07:43:26 phajdan.jr Exp $
-
-EAPI=3
-
-if [[ ${PV} != *9999* ]]; then
-	KDE_LINGUAS="ca cs da de el es_AR es fr it ja nl pl pt_BR ru sr@Latn sr tr zh_TW"
-
-	MY_P=${P}-Source
-
-	SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-	S=${WORKDIR}/${MY_P}
-else
-	ESVN_REPO_URI="https://k9copy.svn.sourceforge.net/svnroot/k9copy/kde4"
-	ESVN_PROJECT="k9copy"
-fi
-
-KDE_HANDBOOK="optional"
-
-inherit kde4-base
-
-DESCRIPTION="k9copy is a DVD backup utility which allows the copy of one or more titles from a DVD9 to a DVD5."
-HOMEPAGE="http://k9copy.sourceforge.net/"
-
-LICENSE="GPL-2"
-SLOT="4"
-KEYWORDS="amd64 x86"
-IUSE="debug"
-
-DEPEND="
-	media-libs/libdvdread
-	>=media-libs/libmpeg2-0.5.1
-	media-libs/xine-lib
-	virtual/ffmpeg
-"
-RDEPEND="${DEPEND}
-	media-video/dvdauthor
-	media-video/mplayer
-"
-
-DOCS=( README )
-
-PATCHES=( "${FILESDIR}/${P}-ffmpeg.patch" )
-
-pkg_postinst() {
-	kde4-base_pkg_postinst
-	has_version '>=app-cdr/k3b-1.50' || elog "If you want K3b burning support in ${P}, please install app-cdr/k3b separately."
-}
diff --git a/app-cdr/k9copy/k9copy-2.3.8.ebuild b/app-cdr/k9copy/k9copy-2.3.8.ebuild
index f8a550caa92c..e7f9d22df39f 100644
--- a/app-cdr/k9copy/k9copy-2.3.8.ebuild
+++ b/app-cdr/k9copy/k9copy-2.3.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-cdr/k9copy/k9copy-2.3.8.ebuild,v 1.3 2012/04/23 15:45:33 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k9copy/k9copy-2.3.8.ebuild,v 1.4 2012/05/16 07:52:27 scarabeus Exp $
 
 EAPI=4
 
@@ -20,7 +20,7 @@ HOMEPAGE="http://k9copy.sourceforge.net/"
 
 LICENSE="GPL-2"
 SLOT="4"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug mplayer"
 
 DEPEND="
diff --git a/app-text/hyperestraier/hyperestraier-1.4.10-r1.ebuild b/app-text/hyperestraier/hyperestraier-1.4.10-r1.ebuild
index 5e42a1819052..ae5af607b4ac 100644
--- a/app-text/hyperestraier/hyperestraier-1.4.10-r1.ebuild
+++ b/app-text/hyperestraier/hyperestraier-1.4.10-r1.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/hyperestraier/hyperestraier-1.4.10-r1.ebuild,v 1.5 2007/11/17 20:53:28 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/hyperestraier/hyperestraier-1.4.10-r1.ebuild,v 1.6 2012/05/16 09:07:45 naota Exp $
 
 inherit java-pkg-opt-2
 
 IUSE="debug java mecab ruby"
 
 DESCRIPTION="a full-text search system for communities"
-HOMEPAGE="http://hyperestraier.sf.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+HOMEPAGE="http://fallabs.com/hyperestraier/"
+SRC_URI="http://fallabs.com/hyperestraier/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 KEYWORDS="amd64 ppc sparc x86"
diff --git a/app-text/hyperestraier/hyperestraier-1.4.13.ebuild b/app-text/hyperestraier/hyperestraier-1.4.13.ebuild
index 8dd5321d969e..b0954ca22a61 100644
--- a/app-text/hyperestraier/hyperestraier-1.4.13.ebuild
+++ b/app-text/hyperestraier/hyperestraier-1.4.13.ebuild
@@ -1,14 +1,14 @@
-# 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-text/hyperestraier/hyperestraier-1.4.13.ebuild,v 1.10 2010/05/02 11:09:15 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/hyperestraier/hyperestraier-1.4.13.ebuild,v 1.11 2012/05/16 09:07:45 naota Exp $
 
 inherit java-pkg-opt-2
 
 IUSE="debug java mecab ruby"
 
 DESCRIPTION="a full-text search system for communities"
-HOMEPAGE="http://hyperestraier.sf.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+HOMEPAGE="http://fallabs.com/hyperestraier/"
+SRC_URI="http://fallabs.com/hyperestraier/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 KEYWORDS="alpha ~amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
diff --git a/app-text/xdvik/metadata.xml b/app-text/xdvik/metadata.xml
index 7cea18becba8..92ba90a0abfd 100644
--- a/app-text/xdvik/metadata.xml
+++ b/app-text/xdvik/metadata.xml
@@ -7,4 +7,7 @@
 		XDVIK is a dvi previewer on X with kpathsea support.  It also supports
 		multibyte character rendering via Xft2 (or VFlib2).
 	</longdescription>
+	<use>
+		<flag name="Xaw">Use Xaw toolkit.</flag>
+	</use>
 </pkgmetadata>
diff --git a/app-text/xdvik/xdvik-22.85-r1.ebuild b/app-text/xdvik/xdvik-22.85-r1.ebuild
new file mode 100644
index 000000000000..f4a13ab9e9f0
--- /dev/null
+++ b/app-text/xdvik/xdvik-22.85-r1.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/xdvik/xdvik-22.85-r1.ebuild,v 1.1 2012/05/16 08:49:22 naota Exp $
+
+EAPI=4
+inherit eutils flag-o-matic elisp-common toolchain-funcs
+
+DESCRIPTION="DVI previewer for X Window System"
+HOMEPAGE="http://xdvi.sourceforge.net/"
+SRC_URI="mirror://sourceforge/xdvi/${P}.tar.gz"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+SLOT="0"
+LICENSE="GPL-2"
+IUSE="motif neXt Xaw Xaw3d emacs"
+REQUIRED_USE="^^ ( motif neXt Xaw Xaw3d )"
+
+RDEPEND=">=media-libs/t1lib-5.0.2
+	x11-libs/libXmu
+	x11-libs/libXp
+	x11-libs/libXpm
+	motif? ( >=x11-libs/openmotif-2.3:0 )
+	neXt? ( x11-libs/neXtaw )
+	Xaw3d? ( x11-libs/libXaw3d )
+	Xaw? ( x11-libs/libXaw )
+	dev-libs/kpathsea"
+DEPEND="sys-devel/flex
+	virtual/yacc
+	${RDEPEND}"
+RDEPEND="${RDEPEND}
+	virtual/latex-base
+	!<app-text/texlive-2007"
+TEXMF_PATH=/usr/share/texmf
+S=${WORKDIR}/${P}/texk/xdvik
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-mksedscript.patch" \
+		"${FILESDIR}/${P}-mksedscript_gentoo.patch"
+	# Make sure system kpathsea headers are used
+	cd "${WORKDIR}/${P}/texk/kpathsea"
+	for i in *.h ; do echo "#include_next \"$i\"" > $i; done
+}
+
+src_configure() {
+	local toolkit
+
+	if use motif ; then
+		toolkit="motif"
+	elif use neXt ; then
+		toolkit="neXtaw"
+	elif use Xaw3d ; then
+		toolkit="xaw3d"
+	elif use Xaw ; then
+		toolkit="xaw"
+	else
+		die "Please specify one of motif, neXtaw, Xaw3d or Xaw to your USE flag."
+	fi
+
+	econf \
+		--with-system-t1lib \
+		--with-system-kpathsea \
+		--with-kpathsea-include="${EPREFIX}"/usr/include/kpathsea \
+		--with-xdvi-x-toolkit="${toolkit}"
+}
+
+src_compile() {
+	emake kpathsea_dir="${EPREFIX}/usr/include/kpathsea" texmf="${EPREFIX}${TEXMF_PATH}"
+	use emacs && elisp-compile xdvi-search.el
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	dodir /etc/texmf/xdvi /etc/X11/app-defaults
+	mv "${ED}${TEXMF_PATH}/xdvi/XDvi" "${ED}etc/X11/app-defaults" || die "failed to move config file"
+	dosym {/etc/X11/app-defaults,"${TEXMF_PATH}/xdvi"}/XDvi
+	for i in $(find "${ED}${TEXMF_PATH}/xdvi" -maxdepth 1 -type f) ; do
+		mv ${i} "${ED}etc/texmf/xdvi" || die "failed to move $i"
+		dosym {/etc/texmf,"${TEXMF_PATH}"}/xdvi/$(basename ${i})
+	done
+
+	dodoc BUGS FAQ README.*
+
+	use emacs && elisp-install tex-utils *.el *.elc
+
+	doicon "${FILESDIR}"/${PN}.xpm
+	make_desktop_entry xdvi "XDVI" xdvik "Graphics;Viewer"
+	echo "MimeType=application/x-dvi;" >> "${ED}"usr/share/applications/xdvi-"${PN}".desktop
+}
+
+pkg_postinst() {
+	if use emacs; then
+		elog "Add"
+		elog "	(add-to-list 'load-path \"${EPREFIX}${SITELISP}/tex-utils\")"
+		elog "	(require 'xdvi-search)"
+		elog "to your ~/.emacs file"
+	fi
+}
diff --git a/dev-libs/expat/expat-2.1.0-r2.ebuild b/dev-libs/expat/expat-2.1.0-r2.ebuild
new file mode 100644
index 000000000000..fdda9f534e67
--- /dev/null
+++ b/dev-libs/expat/expat-2.1.0-r2.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/expat/expat-2.1.0-r2.ebuild,v 1.1 2012/05/16 09:18:07 dev-zero Exp $
+
+EAPI=4
+inherit eutils libtool multilib toolchain-funcs
+
+DESCRIPTION="XML parsing libraries"
+HOMEPAGE="http://expat.sourceforge.net/"
+SRC_URI="mirror://sourceforge/expat/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+IUSE="elibc_FreeBSD examples static-libs unicode"
+
+src_prepare() {
+	elibtoolize
+	epunt_cxx
+
+	mkdir "${S}"-build{,u,w} || die
+}
+
+src_configure() {
+	local myconf="$(use_enable static-libs static)"
+
+	pushd "${S}"-build >/dev/null
+	ECONF_SOURCE="${S}" econf ${myconf}
+	popd >/dev/null
+
+	if use unicode; then
+		pushd "${S}"-buildu >/dev/null
+		CPPFLAGS="${CPPFLAGS} -DXML_UNICODE" ECONF_SOURCE="${S}" econf ${myconf}
+		popd >/dev/null
+
+		pushd "${S}"-buildw >/dev/null
+		CPPFLAGS="${CPPFLAGS} -DXML_UNICODE_WCHAR_T" ECONF_SOURCE="${S}" econf ${myconf}
+		popd >/dev/null
+	fi
+}
+
+src_compile() {
+	pushd "${S}"-build >/dev/null
+	emake
+	popd >/dev/null
+
+	if use unicode; then
+		pushd "${S}"-buildu >/dev/null
+		emake buildlib LIBRARY=libexpatu.la
+		popd >/dev/null
+
+		pushd "${S}"-buildw >/dev/null
+		emake buildlib LIBRARY=libexpatw.la
+		popd >/dev/null
+	fi
+}
+
+src_install() {
+	dodoc Changes README
+	dohtml doc/*
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins examples/*.c
+	fi
+
+	pushd "${S}"-build >/dev/null
+	emake install DESTDIR="${D}"
+	popd >/dev/null
+
+	if use unicode; then
+		pushd "${S}"-buildu >/dev/null
+		emake installlib DESTDIR="${D}" LIBRARY=libexpatu.la
+		popd >/dev/null
+
+		pushd "${S}"-buildw >/dev/null
+		emake installlib DESTDIR="${D}" LIBRARY=libexpatw.la
+		popd >/dev/null
+
+		pushd "${ED}"/usr/$(get_libdir)/pkgconfig >/dev/null
+		cp expat.pc expatu.pc
+		sed -i -e '/^Libs/s:-lexpat:&u:' expatu.pc || die
+		cp expat.pc expatw.pc
+		sed -i -e '/^Libs/s:-lexpat:&w:' expatw.pc || die
+		popd >/dev/null
+	fi
+
+	rm -f "${ED}"usr/lib*/libexpat{,u,w}.la
+
+	# libgeom in /lib and ifconfig in /sbin require libexpat on FreeBSD since
+	# we stripped the libbsdxml copy starting from freebsd-lib-8.2-r1
+	use elibc_FreeBSD && gen_usr_ldscript -a expat
+}
diff --git a/dev-tcltk/tix/tix-8.4.3.ebuild b/dev-tcltk/tix/tix-8.4.3.ebuild
index 9c3aa89608fa..a049b1cca238 100644
--- a/dev-tcltk/tix/tix-8.4.3.ebuild
+++ b/dev-tcltk/tix/tix-8.4.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tix/tix-8.4.3.ebuild,v 1.7 2012/04/25 15:25:51 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tix/tix-8.4.3.ebuild,v 1.8 2012/05/16 07:48:00 naota Exp $
 
 EAPI="2"
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/tix/${MY_P}-src.tar.gz"
 IUSE=""
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~hppa ~ppc sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 
 RESTRICT="test"
 
diff --git a/media-gfx/album/album-4.07.ebuild b/media-gfx/album/album-4.07.ebuild
index 0fe68d75690c..b66cad97b355 100644
--- a/media-gfx/album/album-4.07.ebuild
+++ b/media-gfx/album/album-4.07.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/media-gfx/album/album-4.07.ebuild,v 1.1 2011/04/03 21:36:24 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/album/album-4.07.ebuild,v 1.2 2012/05/16 08:13:21 scarabeus Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ SRC_URI="http://marginalhacks.com/bin/album.versions/${P}.tar.gz
 
 LICENSE="marginalhacks"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 x86"
 IUSE="doc ffmpeg plugins themes"
 
 DEPEND=""
diff --git a/media-libs/mlt/Manifest b/media-libs/mlt/Manifest
index 00e9f069b97f..8534cd4f8085 100644
--- a/media-libs/mlt/Manifest
+++ b/media-libs/mlt/Manifest
@@ -1,3 +1 @@
-DIST mlt-0.5.10.tar.gz 819471 RMD160 015053ddb98175adc905d2ccf29ae962f295a9bb SHA1 e0b3d8f77ad6d97d6495614e78dfbbb531e70f77 SHA256 106636540cdf44f670937b8df549ea2c988a27d05e14d4a8670f9b6af5a0d19e
-DIST mlt-0.7.6.tar.gz 1024353 RMD160 898256dfbbda158f51796a7d4468a6a54b9b246d SHA1 f23c8bddb9b1f406c3cfcd155e74f8d9d37b5120 SHA256 f8ea8590417ea2b5543a495f2edc30636d3931932deee7a4e0d8516e9c2b58ae
 DIST mlt-0.7.8.tar.gz 1106625 RMD160 8edaeba84ca91b002c85e8582b7b0fa8d0286a86 SHA1 2d55b16918284ffadd5eae6eed1c5f0a12669d32 SHA256 95833b2746e2d71dd42f6163e1a5d863c7d4772cc344a840f5555d0dc1946e43
diff --git a/media-libs/mlt/files/mlt-0.5.4-asneeded.patch b/media-libs/mlt/files/mlt-0.5.4-asneeded.patch
deleted file mode 100644
index 16fc73a75da8..000000000000
--- a/media-libs/mlt/files/mlt-0.5.4-asneeded.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-http://bugs.gentoo.org/320897
-
---- src/swig/ruby/build
-+++ src/swig/ruby/build
-@@ -7,5 +7,5 @@
- system( "ln -sf ../mlt.i" )
- system( "swig -c++ -ruby -I../../mlt++ -I../.. mlt.i" )
- $CFLAGS += " -I../.."
--$LDFLAGS += " -L../../mlt++ -lmlt++"
-+$LDFLAGS += " -L../../mlt++ -lmlt++ -L../../framework/ -lmlt -lstdc++"
- create_makefile('mlt')
diff --git a/media-libs/mlt/files/mlt-0.7.6-ffmpeg.patch b/media-libs/mlt/files/mlt-0.7.6-ffmpeg.patch
deleted file mode 100644
index 2fb45d52b723..000000000000
--- a/media-libs/mlt/files/mlt-0.7.6-ffmpeg.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Do not use ffmpeg internal symbols.
-
-Index: mlt-0.7.6/src/modules/avformat/filter_avdeinterlace.c
-===================================================================
---- mlt-0.7.6.orig/src/modules/avformat/filter_avdeinterlace.c
-+++ mlt-0.7.6/src/modules/avformat/filter_avdeinterlace.c
-@@ -26,7 +26,9 @@
- 
- // ffmpeg Header files
- #include <libavformat/avformat.h>
-+#include <libavcodec/avcodec.h>
- 
-+#if 0
- #ifdef USE_MMX
- #include "mmx.h"
- #else
-@@ -293,6 +295,7 @@ static int mlt_avpicture_deinterlace(AVP
- #endif
-     return 0;
- }
-+#endif
- 
- /** Do it :-).
- */
-@@ -318,7 +321,7 @@ static int filter_get_image( mlt_frame f
- 
- 		// Fill the picture
- 		avpicture_fill( output, *image, PIX_FMT_YUYV422, *width, *height );
--		mlt_avpicture_deinterlace( output, output, PIX_FMT_YUYV422, *width, *height );
-+		avpicture_deinterlace( output, output, PIX_FMT_YUYV422, *width, *height );
- 
- 		// Free the picture
- 		mlt_pool_release( output );
diff --git a/media-libs/mlt/mlt-0.5.10.ebuild b/media-libs/mlt/mlt-0.5.10.ebuild
deleted file mode 100644
index c942bbd363eb..000000000000
--- a/media-libs/mlt/mlt-0.5.10.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mlt/mlt-0.5.10.ebuild,v 1.5 2012/05/05 08:02:35 jdhore Exp $
-
-EAPI=3
-PYTHON_DEPEND="python? 2:2.6"
-inherit eutils toolchain-funcs multilib python
-
-DESCRIPTION="An open source multimedia framework, designed and developed for television broadcasting"
-HOMEPAGE="http://www.mltframework.org/"
-SRC_URI="mirror://sourceforge/mlt/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="compressed-lumas dv debug ffmpeg frei0r gtk jack kde libsamplerate melt
-mmx qt4 quicktime sdl sse sse2 vorbis xine xml lua python ruby vdpau" # java perl php tcl
-
-RDEPEND="ffmpeg? ( virtual/ffmpeg[vdpau?] )
-	dv? ( >=media-libs/libdv-0.104 )
-	xml? ( >=dev-libs/libxml2-2.5 )
-	vorbis? ( >=media-libs/libvorbis-1.1.2 )
-	sdl? ( >=media-libs/libsdl-1.2.10
-		 >=media-libs/sdl-image-1.2.4 )
-	libsamplerate? ( >=media-libs/libsamplerate-0.1.2 )
-	jack? ( media-sound/jack-audio-connection-kit
-		media-libs/ladspa-sdk
-		>=dev-libs/libxml2-2.5 )
-	frei0r? ( media-plugins/frei0r-plugins )
-	gtk? ( x11-libs/gtk+:2
-		x11-libs/pango )
-	quicktime? ( media-libs/libquicktime )
-	xine? ( >=media-libs/xine-lib-1.1.2_pre20060328-r7 )
-	qt4? ( x11-libs/qt-gui:4 )
-	!media-libs/mlt++
-	lua? ( >=dev-lang/lua-5.1.4-r4 )
-	ruby? ( dev-lang/ruby )"
-#	sox? ( media-sound/sox )
-#	java? ( >=virtual/jre-1.5 )
-#	perl? ( dev-lang/perl )
-#	php? ( dev-lang/php )
-#	tcl? ( dev-lang/tcl )
-
-SWIG_DEPEND=">=dev-lang/swig-1.3.38"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	compressed-lumas? ( || ( media-gfx/imagemagick
-			media-gfx/graphicsmagick[imagemagick] ) )
-	lua? ( ${SWIG_DEPEND} virtual/pkgconfig )
-	python? ( ${SWIG_DEPEND} )
-	ruby? ( ${SWIG_DEPEND} )"
-#	java? ( ${SWIG_DEPEND} >=virtual/jdk-1.5 )
-#	perl? ( ${SWIG_DEPEND} )
-#	php? ( ${SWIG_DEPEND} )
-#	tcl? ( ${SWIG_DEPEND} )
-
-pkg_setup() {
-	python_set_active_version 2
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.5.4-asneeded.patch
-	# respect CFLAGS LDFLAGS when building shared libraries. Bug #308873
-	for x in python lua; do
-		sed -i "/mlt.so/s: -lmlt++ :& ${CFLAGS} ${LDFLAGS} :" src/swig/$x/build
-	done
-	sed -i "/^LDFLAGS/s: += :& ${LDFLAGS} :" src/swig/ruby/build
-}
-
-src_configure() {
-	use vdpau || export MLT_NO_VDPAU=1
-
-	tc-export CC CXX
-
-	local myconf="--enable-gpl
-		--enable-motion-est
-		$(use_enable debug)
-		$(use_enable dv)
-		$(use_enable sse)
-		$(use_enable sse2)
-		$(use_enable gtk gtk2)
-		$(use_enable vorbis)
-		$(use_enable sdl)
-		$(use_enable jack jackrack)
-		$(use_enable ffmpeg avformat)
-		$(use_enable frei0r)
-		$(use_enable melt)
-		$(use_enable libsamplerate resample)
-		$(use_enable xml)
-		$(use_enable xine)
-		$(use_enable kde kdenlive)
-		$(use_enable qt4 qimage)
-		--disable-sox"
-		#$(use_enable sox)  FIXME
-
-	use ffmpeg && myconf="${myconf} --avformat-swscale"
-
-	(use quicktime && use dv) ||  myconf="${myconf} --disable-kino"
-
-	use compressed-lumas && myconf="${myconf} --luma-compress"
-
-	( use x86 || use amd64 ) && \
-		myconf="${myconf} $(use_enable mmx)" ||
-		myconf="${myconf} --disable-mmx"
-
-	use melt || sed -i -e "s;src/melt;;" Makefile
-
-	# TODO: add swig language bindings
-	# see also http://www.mltframework.org/twiki/bin/view/MLT/ExtremeMakeover
-
-	local swig_lang
-	# TODO: java perl php tcl
-	for i in lua python ruby ; do
-		use $i && swig_lang="${swig_lang} $i"
-	done
-	[ -z "${swig_lang}" ] && swig_lang="none"
-
-	econf ${myconf} --swig-languages="${swig_lang}"
-	sed -i -e s/^OPT/#OPT/ "${S}/config.mak"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS README docs/{TODO,*.txt}
-
-	dodir /usr/share/${PN}
-	insinto /usr/share/${PN}
-	doins -r demo
-
-	docinto swig
-
-	# Install SWIG bindings
-	if use lua; then
-		cd "${S}"/src/swig/lua
-		exeinto $(pkg-config --variable INSTALL_CMOD lua)
-		doexe mlt.so || die
-		dodoc play.lua
-	fi
-
-	if use python; then
-		cd "${S}"/src/swig/python
-		insinto $(python_get_sitedir)
-		doins mlt.py || die
-		exeinto $(python_get_sitedir)
-		doexe _mlt.so || die
-		dodoc play.py
-	fi
-
-	if use ruby; then
-		cd "${S}"/src/swig/ruby
-		exeinto $("${EPREFIX}"/usr/bin/ruby -r rbconfig -e 'print Config::CONFIG["sitearchdir"]')
-		doexe mlt.so || die
-		dodoc play.rb thumbs.rb
-	fi
-	# TODO: java perl php tcl
-}
-
-pkg_postinst() {
-	if use python; then
-		python_mod_optimize mlt.py
-	fi
-}
-
-pkg_postrm() {
-	if use python; then
-		python_mod_cleanup mlt.py
-	fi
-}
diff --git a/media-libs/mlt/mlt-0.7.6-r1.ebuild b/media-libs/mlt/mlt-0.7.6-r1.ebuild
deleted file mode 100644
index 0e082dde3b7e..000000000000
--- a/media-libs/mlt/mlt-0.7.6-r1.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mlt/mlt-0.7.6-r1.ebuild,v 1.5 2012/05/05 08:02:35 jdhore Exp $
-
-EAPI=4
-PYTHON_DEPEND="python? 2:2.6"
-inherit eutils toolchain-funcs multilib python
-
-DESCRIPTION="An open source multimedia framework, designed and developed for television broadcasting"
-HOMEPAGE="http://www.mltframework.org/"
-SRC_URI="mirror://sourceforge/mlt/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="compressed-lumas dv debug ffmpeg frei0r gtk jack kde libsamplerate melt
-mmx qt4 quicktime sdl sse sse2 swfdec vorbis xine xml lua python ruby vdpau" # java perl php tcl
-
-RDEPEND="ffmpeg? ( virtual/ffmpeg[vdpau?] )
-	dv? ( >=media-libs/libdv-0.104 )
-	xml? ( >=dev-libs/libxml2-2.5 )
-	vorbis? ( >=media-libs/libvorbis-1.1.2 )
-	sdl? ( >=media-libs/libsdl-1.2.10
-		 >=media-libs/sdl-image-1.2.4 )
-	libsamplerate? ( >=media-libs/libsamplerate-0.1.2 )
-	jack? ( media-sound/jack-audio-connection-kit
-		media-libs/ladspa-sdk
-		>=dev-libs/libxml2-2.5 )
-	frei0r? ( media-plugins/frei0r-plugins )
-	gtk? ( x11-libs/gtk+:2
-		media-libs/libexif
-		x11-libs/pango )
-	quicktime? ( media-libs/libquicktime )
-	swfdec? ( media-libs/swfdec )
-	xine? ( >=media-libs/xine-lib-1.1.2_pre20060328-r7 )
-	qt4? ( x11-libs/qt-gui:4 x11-libs/qt-svg:4 media-libs/libexif )
-	!media-libs/mlt++
-	lua? ( >=dev-lang/lua-5.1.4-r4 )
-	ruby? ( dev-lang/ruby )"
-#	sox? ( media-sound/sox )
-#	java? ( >=virtual/jre-1.5 )
-#	perl? ( dev-lang/perl )
-#	php? ( dev-lang/php )
-#	tcl? ( dev-lang/tcl )
-
-SWIG_DEPEND=">=dev-lang/swig-2.0"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	compressed-lumas? ( || ( media-gfx/imagemagick[png]
-			media-gfx/graphicsmagick[imagemagick,png] ) )
-	lua? ( ${SWIG_DEPEND} virtual/pkgconfig )
-	python? ( ${SWIG_DEPEND} )
-	ruby? ( ${SWIG_DEPEND} )"
-#	java? ( ${SWIG_DEPEND} >=virtual/jdk-1.5 )
-#	perl? ( ${SWIG_DEPEND} )
-#	php? ( ${SWIG_DEPEND} )
-#	tcl? ( ${SWIG_DEPEND} )
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.7.2-ruby-link.patch \
-		"${FILESDIR}"/${PN}-0.7.6-ffmpeg.patch
-	# respect CFLAGS LDFLAGS when building shared libraries. Bug #308873
-	for x in python lua; do
-		sed -i "/mlt.so/s: -lmlt++ :& ${CFLAGS} ${LDFLAGS} :" src/swig/$x/build || die
-	done
-	sed -i "/^LDFLAGS/s: += :& ${LDFLAGS} :" src/swig/ruby/build || die
-}
-
-src_configure() {
-	tc-export CC CXX
-
-	local myconf="--enable-gpl
-		--enable-motion-est
-		$(use_enable debug)
-		$(use_enable dv)
-		$(use_enable sse)
-		$(use_enable sse2)
-		$(use_enable swfdec)
-		$(use_enable gtk gtk2)
-		$(use_enable vorbis)
-		$(use_enable sdl)
-		$(use_enable jack jackrack)
-		$(use_enable ffmpeg avformat)
-		$(use_enable frei0r)
-		$(use_enable melt)
-		$(use_enable libsamplerate resample)
-		$(use vdpau && echo ' --avformat-vdpau')
-		$(use_enable xml)
-		$(use_enable xine)
-		$(use_enable kde kdenlive)
-		$(use_enable qt4 qimage)
-		--disable-sox"
-		#$(use_enable sox)  FIXME
-
-	use ffmpeg && myconf="${myconf} --avformat-swscale"
-
-	(use quicktime && use dv) ||  myconf="${myconf} --disable-kino"
-
-	use compressed-lumas && myconf="${myconf} --luma-compress"
-
-	( use x86 || use amd64 ) && \
-		myconf="${myconf} $(use_enable mmx)" ||
-		myconf="${myconf} --disable-mmx"
-
-	use melt || sed -i -e "s;src/melt;;" Makefile
-
-	# TODO: add swig language bindings
-	# see also http://www.mltframework.org/twiki/bin/view/MLT/ExtremeMakeover
-
-	local swig_lang
-	# TODO: java perl php tcl
-	for i in lua python ruby ; do
-		use $i && swig_lang="${swig_lang} $i"
-	done
-	[ -z "${swig_lang}" ] && swig_lang="none"
-
-	econf ${myconf} --swig-languages="${swig_lang}"
-	sed -i -e s/^OPT/#OPT/ "${S}/config.mak"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS README docs/*.txt
-
-	dodir /usr/share/${PN}
-	insinto /usr/share/${PN}
-	doins -r demo
-
-	docinto swig
-
-	# Install SWIG bindings
-	if use lua; then
-		cd "${S}"/src/swig/lua
-		exeinto $(pkg-config --variable INSTALL_CMOD lua)
-		doexe mlt.so || die
-		dodoc play.lua
-	fi
-
-	if use python; then
-		cd "${S}"/src/swig/python
-		insinto $(python_get_sitedir)
-		doins mlt.py || die
-		exeinto $(python_get_sitedir)
-		doexe _mlt.so || die
-		dodoc play.py
-	fi
-
-	if use ruby; then
-		cd "${S}"/src/swig/ruby
-		exeinto $("${EPREFIX}"/usr/bin/ruby -r rbconfig -e 'print Config::CONFIG["sitearchdir"]')
-		doexe mlt.so || die
-		dodoc play.rb thumbs.rb
-	fi
-	# TODO: java perl php tcl
-}
-
-pkg_postinst() {
-	if use python; then
-		python_mod_optimize mlt.py
-	fi
-}
-
-pkg_postrm() {
-	if use python; then
-		python_mod_cleanup mlt.py
-	fi
-}
diff --git a/media-libs/mlt/mlt-0.7.8.ebuild b/media-libs/mlt/mlt-0.7.8.ebuild
index cdfd7f560e44..04ad8841838e 100644
--- a/media-libs/mlt/mlt-0.7.8.ebuild
+++ b/media-libs/mlt/mlt-0.7.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/media-libs/mlt/mlt-0.7.8.ebuild,v 1.4 2012/05/05 08:02:35 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mlt/mlt-0.7.8.ebuild,v 1.5 2012/05/16 08:21:59 scarabeus Exp $
 
 EAPI=4
 PYTHON_DEPEND="python? 2:2.6"
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/mlt/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="compressed-lumas dv debug ffmpeg frei0r gtk jack kde libsamplerate melt
 mmx qt4 quicktime rtaudio sdl sse sse2 swfdec vorbis xine xml lua python ruby vdpau" # java perl php tcl
 IUSE="${IUSE} kernel_linux"
diff --git a/media-libs/wxsvg/Manifest b/media-libs/wxsvg/Manifest
index 1019516d438a..a9851c244a7e 100644
--- a/media-libs/wxsvg/Manifest
+++ b/media-libs/wxsvg/Manifest
@@ -1,3 +1,2 @@
-DIST wxsvg-1.0.8.tar.bz2 645612 RMD160 c5294077b9fe9dc197b075afffe84d4285cc236e SHA1 f2539b8c1875b8a599c75eb8babca78e36b19c5d SHA256 63baf16dd1427b26daeabbea7ccb32daf15a96a5777b3fbd36756f8bf6cb79fd
 DIST wxsvg-1.1.5.tar.bz2 654114 RMD160 46c28fa0224800c1d429f7f56e260da0743137e3 SHA1 8efa2380ad7a59aa7f8a925b882525c5c1a7f1c5 SHA256 477f7b8ab1c6399a35ee85dc4ac6eb18b9f74fd5d8971fb2799fa54f6474b2f5
 DIST wxsvg-1.1.6.tar.bz2 654692 RMD160 26218064e7a8ca9718fc7571f6b1380962edd43a SHA1 8ca606df4d5dd1cd476aa54d0f33408beea9d920 SHA256 714b8c9a5b5b0a1279f635d191c92b353a3c4635b636c7f0dee7bf6dac9fd1d1
diff --git a/media-libs/wxsvg/wxsvg-1.0.8.ebuild b/media-libs/wxsvg/wxsvg-1.0.8.ebuild
deleted file mode 100644
index 4f1a2ff33ee2..000000000000
--- a/media-libs/wxsvg/wxsvg-1.0.8.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/wxsvg/wxsvg-1.0.8.ebuild,v 1.6 2012/05/05 08:02:27 jdhore Exp $
-
-EAPI="3"
-WX_GTK_VER="2.8"
-AUTOTOOLS_IN_SOURCE_BUILD="1"
-
-inherit autotools-utils wxwidgets
-
-DESCRIPTION="C++ library to create, manipulate and render SVG files."
-HOMEPAGE="http://wxsvg.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="wxWinLL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="static-libs"
-
-RDEPEND="x11-libs/wxGTK:2.8[X]
-	>=dev-libs/expat-2.0.1-r3
-	>=dev-libs/glib-2.12:2
-	>=dev-libs/libxml2-2.6.26
-	>=media-libs/fontconfig-2.4
-	>=media-libs/freetype-2.2.0
-	>=media-libs/libart_lgpl-2.3.17
-	virtual/ffmpeg
-	>=x11-libs/pango-1.14.9"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS=(AUTHORS ChangeLog TODO)
diff --git a/media-sound/cmus/Manifest b/media-sound/cmus/Manifest
index efc689334199..e324460c1aad 100644
--- a/media-sound/cmus/Manifest
+++ b/media-sound/cmus/Manifest
@@ -1,2 +1 @@
-DIST cmus-v2.4.2.tar.bz2 204285 RMD160 3fbe7f9c5fb2f8cd21672769c7b551b099fd007f SHA1 12573e96e03435eca9b8a4aaeeb13a2da66f40a4 SHA256 1f54d94574f0f7f9beca34908b16141f8eb89070728305d8906b8dc19cca0c31
 DIST cmus-v2.4.3.tar.bz2 204508 RMD160 e41adbda28db529b245447f7bdf22cf8de118a62 SHA1 ba63a417b0df42fa9a4850dd8b922a95a426f7f5 SHA256 c8b853d6cc4de6cc628fe1cf48f5a841ab230d818bdbf39131b69d88844bcffe
diff --git a/media-sound/cmus/cmus-2.4.2.ebuild b/media-sound/cmus/cmus-2.4.2.ebuild
deleted file mode 100644
index a52f56167d6a..000000000000
--- a/media-sound/cmus/cmus-2.4.2.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/cmus/cmus-2.4.2.ebuild,v 1.5 2012/05/05 08:16:16 mgorny Exp $
-
-EAPI=4
-inherit eutils multilib
-
-MY_P=${PN}-v${PV}
-
-DESCRIPTION="A ncurses based music player with plugin support for many formats"
-HOMEPAGE="http://cmus.sourceforge.net/"
-SRC_URI="mirror://sourceforge/cmus/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~x86-fbsd"
-IUSE="aac alsa ao debug examples flac mad mikmod modplug mp4 musepack oss
-pidgin pulseaudio unicode vorbis wavpack wma zsh-completion"
-
-CDEPEND="sys-libs/ncurses[unicode?]
-	aac? ( media-libs/faad2 )
-	alsa? ( >=media-libs/alsa-lib-1.0.11 )
-	ao? (  media-libs/libao )
-	flac? ( media-libs/flac )
-	mad? ( >=media-libs/libmad-0.14 )
-	mikmod? ( media-libs/libmikmod:0 )
-	modplug? ( >=media-libs/libmodplug-0.7 )
-	mp4? ( >=media-libs/libmp4v2-1.9 )
-	musepack? ( >=media-sound/musepack-tools-444 )
-	pulseaudio? ( media-sound/pulseaudio )
-	vorbis? ( >=media-libs/libvorbis-1.0 )
-	wavpack? ( media-sound/wavpack )
-	wma? ( virtual/ffmpeg )"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	zsh-completion? ( app-shells/zsh )
-	pidgin? ( net-im/pidgin
-		dev-python/dbus-python )"
-
-S=${WORKDIR}/${MY_P}
-
-my_config() {
-	local value
-	use ${1} && value=a || value=n
-	myconf="${myconf} ${2}=${value}"
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-ffmpeg.patch
-}
-
-src_configure() {
-	local debuglevel=1 myconf="CONFIG_ARTS=n CONFIG_SUN=n"
-
-	use debug && debuglevel=2
-
-	my_config flac CONFIG_FLAC
-	my_config mad CONFIG_MAD
-	my_config modplug CONFIG_MODPLUG
-	my_config mikmod CONFIG_MIKMOD
-	my_config musepack CONFIG_MPC
-	my_config vorbis CONFIG_VORBIS
-	my_config wavpack CONFIG_WAVPACK
-	my_config mp4 CONFIG_MP4
-	my_config aac CONFIG_AAC
-	my_config wma CONFIG_FFMPEG
-	my_config pulseaudio CONFIG_PULSE
-	my_config alsa CONFIG_ALSA
-	my_config ao CONFIG_AO
-	my_config oss CONFIG_OSS
-
-	./configure prefix=/usr ${myconf} exampledir=/usr/share/doc/${PF}/examples \
-		libdir=/usr/$(get_libdir) DEBUG=${debuglevel} || die
-}
-
-src_install() {
-	default
-
-	use examples || rm -rf "${D}"/usr/share/doc/${PF}/examples
-
-	if use zsh-completion; then
-		insinto /usr/share/zsh/site-functions
-		doins contrib/_cmus
-	fi
-
-	if use pidgin; then
-		newbin contrib/cmus-updatepidgin.py cmus-updatepidgin
-	fi
-}
diff --git a/media-sound/cmus/cmus-2.4.3.ebuild b/media-sound/cmus/cmus-2.4.3.ebuild
index be333eeb34ca..8165a2499ad3 100644
--- a/media-sound/cmus/cmus-2.4.3.ebuild
+++ b/media-sound/cmus/cmus-2.4.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/media-sound/cmus/cmus-2.4.3.ebuild,v 1.3 2012/05/05 08:16:16 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cmus/cmus-2.4.3.ebuild,v 1.4 2012/05/16 08:30:50 scarabeus Exp $
 
 EAPI=4
 inherit eutils multilib
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/cmus/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ppc x86 ~x86-fbsd"
 IUSE="aac alsa ao debug examples flac mad mikmod modplug mp4 musepack oss
 pidgin pulseaudio unicode vorbis wavpack wma zsh-completion"
 
@@ -30,7 +30,7 @@ CDEPEND="sys-libs/ncurses[unicode?]
 	pulseaudio? ( media-sound/pulseaudio )
 	vorbis? ( >=media-libs/libvorbis-1.0 )
 	wavpack? ( media-sound/wavpack )
-	wma? ( virtual/ffmpeg )"
+	wma? ( >=virtual/ffmpeg-0.10.2-r1 )"
 DEPEND="${CDEPEND}
 	virtual/pkgconfig"
 RDEPEND="${CDEPEND}
diff --git a/media-sound/cmus/files/cmus-2.4.2-ffmpeg.patch b/media-sound/cmus/files/cmus-2.4.2-ffmpeg.patch
deleted file mode 100644
index eb6c97e6c1ec..000000000000
--- a/media-sound/cmus/files/cmus-2.4.2-ffmpeg.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- cmus-v2.4.2/ffmpeg.c.orig
-+++ cmus-v2.4.2/ffmpeg.c
-@@ -32,6 +32,9 @@
- #include <libavcodec/avcodec.h>
- #include <libavformat/avformat.h>
- #include <libavformat/avio.h>
-+#ifndef AVUTIL_MATHEMATICS_H
-+#include <libavutil/mathematics.h>
-+#endif
- #endif
- 
- #if (LIBAVFORMAT_VERSION_INT < ((52<<16)+(31<<8)+0))
diff --git a/media-sound/kradio/Manifest b/media-sound/kradio/Manifest
index 620a9e51942a..2f863b2f213c 100644
--- a/media-sound/kradio/Manifest
+++ b/media-sound/kradio/Manifest
@@ -1,3 +1 @@
-DIST kradio4-4.0.2.tar.bz2 1604179 RMD160 2273737c772f47ed4c6124f9b9e994883b5124ae SHA1 d5ceac0e9260fc2fd1f4a0a567811b06edb0d175 SHA256 8d18fd2bac52133c712c0aef1dfd67ce503e0135860c248bdbe99c4b7ed97870
-DIST kradio4-4.0.3.tar.bz2 1628522 RMD160 bcef454f45960359d504159cd7708d8562ee18f4 SHA1 bfd94f7075af442ef1d196c8ea1af07dba9edcaf SHA256 b97667b0ae0a67a32106ccc24cd158caaff9421350adbb62485a0f51c4239d4f
 DIST kradio4-4.0.4.tar.bz2 1629750 RMD160 02b8e37f8e9cd63d187c23e7ccfbe023da1bc942 SHA1 61182470cb41f91570286e782dac4782487144db SHA256 04a552cf376b68f7483296069cf90703f0c49899642986062e7e28f7336ea416
diff --git a/media-sound/kradio/files/kradio-4.0.2-libav.patch b/media-sound/kradio/files/kradio-4.0.2-libav.patch
deleted file mode 100644
index 87d486149144..000000000000
--- a/media-sound/kradio/files/kradio-4.0.2-libav.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-X-Git-Url: 
-http://kradio.git.sourceforge.net/git/gitweb.cgi?p=kradio%2Fkradio;a=blobdiff_plain;f=plugins%2Finternetradio%2Fdecoder_thread.cpp;h=c74d6e20578faf3b5dee877aa6de0c9269f49ad9;hp=4cd6cc0543200e9e274e38fa8badb63556a419c3;hb=4f4ec44f49d83b85702bb002455a57374245d825;hpb=c5dea0c01bf5cc16f49cf3d58b837b2fab02d988
-
-diff --git a/plugins/internetradio/decoder_thread.cpp b/plugins/internetradio/decoder_thread.cpp
-index 4cd6cc0..c74d6e2 100644
---- a/plugins/internetradio/decoder_thread.cpp
-+++ b/plugins/internetradio/decoder_thread.cpp
-@@ -373,7 +373,6 @@ void InternetRadioDecoder::openAVStream(const QString &stream, bool warningsNotE
- 
-     //av_log_set_level(255);
-     m_av_pFormatCtx = avformat_alloc_context();
--    memset(m_av_pFormatCtx, 0, sizeof(*m_av_pFormatCtx));
-     m_av_pFormatCtx->probesize = m_maxProbeSize;
-     m_av_pFormatCtx->max_analyze_duration = m_maxAnalyzeTime * AV_TIME_BASE;
- 
-@@ -475,7 +474,6 @@ void InternetRadioDecoder::openAVStream(const QString &stream, bool warningsNotE
-         m_av_pFormatCtx_opened = true;
-     }
-     else {
--
- //         IErrorLogClient::staticLogDebug("InternetRadioDecoder::openAVStream: av_open_input_file start");
-         if (av_open_input_file(&m_av_pFormatCtx, stream.toUtf8(), iformat, 0, &av_params) != 0) {
-             if (warningsNotErrors) {
-@@ -535,7 +533,11 @@ void InternetRadioDecoder::openAVStream(const QString &stream, bool warningsNotE
-     m_av_audioStream = -1;
-     for (unsigned int i = 0; i < m_av_pFormatCtx->nb_streams; i++) {
- //         if (m_av_pFormatCtx->streams[i]->codec->codec_type == CODEC_TYPE_AUDIO && m_av_audioStream < 0) {
-+#if LIBAVCODEC_VERSION_MAJOR < 53
-         if (m_av_pFormatCtx->streams[i]->codec->codec_type == CODEC_TYPE_AUDIO) { // take last stream
-+#else
-+        if (m_av_pFormatCtx->streams[i]->codec->codec_type == AVMEDIA_TYPE_AUDIO) { // take last stream
-+#endif
-             m_av_audioStream = i;
-             break;
-         }
diff --git a/media-sound/kradio/kradio-4.0.2.ebuild b/media-sound/kradio/kradio-4.0.2.ebuild
deleted file mode 100644
index d75d8f8c37e8..000000000000
--- a/media-sound/kradio/kradio-4.0.2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/kradio/kradio-4.0.2.ebuild,v 1.6 2011/12/01 21:55:03 dilfridge Exp $
-
-EAPI=4
-
-KDE_LINGUAS="cs de es is pl pt pt_BR ru uk"
-inherit kde4-base
-
-MY_P=${PN}4-${PV/_/-}
-
-DESCRIPTION="kradio is a radio tuner application for KDE"
-HOMEPAGE="http://kradio.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-SLOT="4"
-IUSE="alsa debug encode ffmpeg lirc +mp3 +vorbis v4l"
-
-DEPEND="
-	media-libs/libsndfile
-	alsa? ( media-libs/alsa-lib )
-	lirc? ( app-misc/lirc )
-	mp3? ( media-sound/lame )
-	vorbis? (
-		media-libs/libvorbis
-		media-libs/libogg
-	)
-	ffmpeg? (
-		>=media-libs/libmms-0.4
-		virtual/ffmpeg
-	)
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}-libav.patch" )
-
-S=${WORKDIR}/${MY_P}
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with alsa ALSA)
-		$(cmake-utils_use_with mp3 LAME)
-		$(cmake-utils_use_with vorbis OGG_VORBIS)
-		$(cmake-utils_use_with lirc LIRC)
-		$(cmake-utils_use_with ffmpeg FFMPEG)
-		$(cmake-utils_use_with v4l V4L2)
-		)
-
-	kde4-base_src_configure
-}
diff --git a/media-sound/kradio/kradio-4.0.3.ebuild b/media-sound/kradio/kradio-4.0.3.ebuild
deleted file mode 100644
index ab9cf4a5b746..000000000000
--- a/media-sound/kradio/kradio-4.0.3.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/kradio/kradio-4.0.3.ebuild,v 1.1 2012/02/15 11:53:09 johu Exp $
-
-EAPI=4
-
-KDE_LINGUAS="cs de es is it pl pt pt_BR ru tr uk"
-inherit kde4-base
-
-MY_P=${PN}4-${PV/_/-}
-
-DESCRIPTION="kradio is a radio tuner application for KDE"
-HOMEPAGE="http://kradio.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-SLOT="4"
-IUSE="alsa debug encode ffmpeg lirc +mp3 +vorbis v4l"
-
-DEPEND="
-	media-libs/libsndfile
-	alsa? ( media-libs/alsa-lib )
-	lirc? ( app-misc/lirc )
-	mp3? ( media-sound/lame )
-	vorbis? (
-		media-libs/libvorbis
-		media-libs/libogg
-	)
-	ffmpeg? (
-		>=media-libs/libmms-0.4
-		virtual/ffmpeg
-	)
-"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with alsa ALSA)
-		$(cmake-utils_use_with mp3 LAME)
-		$(cmake-utils_use_with vorbis OGG_VORBIS)
-		$(cmake-utils_use_with lirc LIRC)
-		$(cmake-utils_use_with ffmpeg FFMPEG)
-		$(cmake-utils_use_with v4l V4L2)
-		)
-
-	kde4-base_src_configure
-}
diff --git a/media-sound/squeezeslave/Manifest b/media-sound/squeezeslave/Manifest
index 0488c8dd0457..cd04d5cdcb58 100644
--- a/media-sound/squeezeslave/Manifest
+++ b/media-sound/squeezeslave/Manifest
@@ -1,2 +1 @@
-DIST squeezeslave-1.1_p309.tar.xz 115040 RMD160 2362e93999921cea6b1f3d304d17a5da5c4920fe SHA1 6c99e62ea761421d0f2c1542f97eaf8c93bd9d60 SHA256 8de690eb6080db3409bd6ffa641b8367679f3cac04710526cf4563f002999f67
 DIST squeezeslave-1.1_p312.tar.xz 116240 RMD160 e71a595c5df038fc441b375f6fd241315c1aff86 SHA1 763ddfac891de8fbec7b78a3ddb19f29eedd25ad SHA256 847db3efb5ab17c964ca8191c2d0ef3e1a399d2615fed12acfcf5de222c56020
diff --git a/media-sound/squeezeslave/squeezeslave-1.1_p309.ebuild b/media-sound/squeezeslave/squeezeslave-1.1_p309.ebuild
deleted file mode 100644
index 8b037736873c..000000000000
--- a/media-sound/squeezeslave/squeezeslave-1.1_p309.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/media-sound/squeezeslave/squeezeslave-1.1_p309.ebuild,v 1.2 2012/05/05 08:52:05 mgorny Exp $
-
-EAPI="4"
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="A lightweight streaming audio player for squeezeboxserver"
-HOMEPAGE="http://squeezeslave.googlecode.com"
-SRC_URI="http://dev.gentoo.org/~radhermit/distfiles/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="aac +alsa display wma zones"
-
-RDEPEND="media-libs/libmad
-	media-libs/flac
-	media-libs/libvorbis
-	media-libs/libogg
-	media-libs/portaudio[alsa?]
-	aac? ( virtual/ffmpeg )
-	wma? ( virtual/ffmpeg )
-	display? ( app-misc/lirc )"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig"
-
-src_prepare() {
-	for i in display aac wma zones ; do
-		! use $i && sed -i -e "/$i/Id" Makefile
-	done
-
-	epatch "${FILESDIR}"/${P}-ffmpeg.patch
-
-	tc-export CC AR RANLIB
-}
-
-src_install() {
-	dobin bin/${PN}
-	dodoc ChangeLog TODO
-
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-}
diff --git a/media-sound/xwax/Manifest b/media-sound/xwax/Manifest
index 9e630492b975..c80a88f6eb81 100644
--- a/media-sound/xwax/Manifest
+++ b/media-sound/xwax/Manifest
@@ -1,5 +1,2 @@
-DIST xwax-0.8.tar.gz 47660 RMD160 ce974475cc7b36d9362513f0951adff00c11569c SHA1 f72199faf79cea9025b69daf703a1b6e51140d76 SHA256 552ebbac9edfc6d85b269ca49170cf7f89b48702e683da6ab02f8878bfa8fd58
-DIST xwax-0.9.tar.gz 52835 RMD160 12e7c1d90c90ba2c0c8c4d2a14751aa33f571bcc SHA1 1c440a82471d4fb0049ba81f5823f038e1f664e4 SHA256 bc51bb5a19ec68ceaba7fb5f63c31481c8e8958d82d460ac45abbb4565dde106
 DIST xwax-1.0.tar.gz 54094 RMD160 cd8503395e85477955d7b632a6cca030c5b7879a SHA1 6836fa6028f63be366517a9caf44576ab60c2201 SHA256 8d5617bb11c964e9ec5b85ed9a3f004d4f0728ca0ae65b238443404c5bc0358d
-DIST xwax-1.1.tar.gz 57647 RMD160 b5a368fb5104ac24a9a8d633df138d587c83e874 SHA1 d092366df2be76fcc1689f20ed5388223ec3fa59 SHA256 150ee25efc8446a7788547f62e4d0b26dea7b9c18ed4c8461902db526616c750
 DIST xwax-1.2.tar.gz 64910 RMD160 ce47c26388199d88af089a1e094e6581ff5a980a SHA1 7a8a07cd1b64f5956adc37ed4fb3d0de146094b4 SHA256 2e35aafb2a08d29c611e19a54b3e45b5c7243cf53b2aec1634c87f01fb35e6a9
diff --git a/media-sound/xwax/xwax-0.8.ebuild b/media-sound/xwax/xwax-0.8.ebuild
deleted file mode 100644
index 809361157601..000000000000
--- a/media-sound/xwax/xwax-0.8.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/xwax/xwax-0.8.ebuild,v 1.5 2011/04/04 12:33:26 scarabeus Exp $
-
-EAPI=3
-inherit toolchain-funcs
-
-DESCRIPTION="Digital vinyl emulation software"
-HOMEPAGE="http://www.xwax.co.uk/"
-SRC_URI="http://www.xwax.co.uk/releases/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-# These make sure the user can decode the files he or she cares about by
-# setting appropriate runtime depends and (perhaps) configuring the import
-# script
-IUSE_XWAX_DECODERS="xwax_decoders_aac xwax_decoders_cd xwax_decoders_flac \
-	+xwax_decoders_mp3 xwax_decoders_ogg xwax_decoders_misc"
-IUSE="alsa jack ${IUSE_XWAX_DECODERS}"
-
-RDEPEND="media-libs/libsdl
-	media-libs/sdl-ttf
-	media-fonts/dejavu
-	alsa? ( media-libs/alsa-lib )
-	jack? ( media-sound/jack-audio-connection-kit )
-	xwax_decoders_aac? ( media-libs/faad2 )
-	xwax_decoders_cd? ( media-sound/cdparanoia )
-	xwax_decoders_flac? ( media-libs/flac )
-	xwax_decoders_mp3? ( || ( media-sound/mpg123 media-sound/mpg321 ) )
-	xwax_decoders_ogg? ( media-sound/vorbis-tools )
-	xwax_decoders_misc? ( virtual/ffmpeg )"
-DEPEND="${RDEPEND}"
-
-DOCS="README CHANGES"
-
-src_prepare() {
-	# Remove the forced optimization from 'CFLAGS' and 'LDFLAGS' in
-	# the Makefile
-	sed -i -e 's:\(^CFLAGS.*\)-O[0-9]\(.*\):\1\2:' \
-		-e 's:\(^LDFLAGS.*\)-O[0-9]\(.*\):\1\2:' \
-		Makefile || die "sed failed"
-}
-
-src_configure() {
-	tc-export CC
-	econf \
-		$(use_enable alsa) \
-		$(use_enable jack)
-}
-
-src_compile() {
-	# EXECDIR is the default directory in which xwax will look for
-	# the 'xwax-import' and 'xwax-scan' scripts
-	emake PREFIX="${EROOT}usr" EXECDIR="${EROOT}usr/bin"
-}
-
-src_install() {
-	# This is easier than setting all the environment variables
-	# needed, running the sed script required to get the man directory
-	# correct, and removing the GPL-2 after a 'make install' run
-	dobin xwax || die "failed to install xwax"
-	newbin import xwax-import || die "failed to install xwax-import"
-	newbin scan xwax-scan || die "failed to install xwax-scan"
-	doman xwax.1 || die "failed to install man page"
-
-	# Replace any decoder commands in the import script, if necessary
-	if use xwax_decoders_mp3; then
-		# mpg123 is upstream's default
-		if has_version media-sound/mpg123; then
-			TO="mpg123"
-			FROM="mpg321"
-		# Otherwise, use mpg321
-		else
-			TO="mpg321"
-			FROM="mpg123"
-		fi
-		debug-print "found ${TO}"
-		sed -i -e "s:${FROM}:${TO}:g" "${D}/usr/bin/xwax-import" || \
-			die "problem converting xwax-import to use ${TO}"
-	fi
-
-	dodoc ${DOCS} || die "failed to install docs"
-}
diff --git a/media-sound/xwax/xwax-0.9.ebuild b/media-sound/xwax/xwax-0.9.ebuild
deleted file mode 100644
index 3bf3d4fdb97e..000000000000
--- a/media-sound/xwax/xwax-0.9.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/xwax/xwax-0.9.ebuild,v 1.1 2011/05/07 17:50:00 nixphoeni Exp $
-
-EAPI=4
-inherit toolchain-funcs
-
-DESCRIPTION="Digital vinyl emulation software"
-HOMEPAGE="http://www.xwax.co.uk/"
-SRC_URI="http://www.xwax.co.uk/releases/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="alsa jack oss cdda mp3 +fallback"
-REQUIRED_USE="|| ( cdda mp3 fallback )
-	|| ( alsa jack oss )"
-
-RDEPEND="media-libs/libsdl
-	media-libs/sdl-ttf
-	media-fonts/dejavu
-	alsa? ( media-libs/alsa-lib )
-	jack? ( media-sound/jack-audio-connection-kit )
-	cdda? ( media-sound/cdparanoia )
-	mp3? ( || ( media-sound/mpg123 media-sound/mpg321 ) )
-	fallback? ( virtual/ffmpeg )"
-DEPEND="${RDEPEND}"
-
-DOCS="README CHANGES"
-
-pkg_setup() {
-	ewarn "Please note that XWAX_DECODERS is deprecated in favor of USE flags."
-	ewarn "Sorry for the inconvenience."
-}
-
-src_prepare() {
-	# Remove the forced optimization from 'CFLAGS' and 'LDFLAGS' in
-	# the Makefile
-	# Also replace VERSION so we don't have to depend on git...
-	sed -i -e 's:\(^CFLAGS.*\)-O[0-9]\(.*\):\1\2:' \
-		-e 's:\(^LDFLAGS.*\)-O[0-9]\(.*\):\1\2:' \
-		-e "s:\(^VERSION =\).*:\1 ${PV}:" \
-		Makefile || die "sed failed"
-
-	# Replace any decoder commands in the import script, if necessary
-	if [[ `use mp3` ]]; then
-		# mpg123 is upstream's default
-		if has_version media-sound/mpg123; then
-			TO="mpg123"
-			FROM="mpg321"
-		# Otherwise, use mpg321
-		else
-			TO="mpg321"
-			FROM="mpg123"
-		fi
-		debug-print "found ${TO}"
-		sed -i -e "s:${FROM}:${TO}:g" import || \
-			die "problem converting xwax-import to use ${TO}"
-	fi
-}
-
-src_configure() {
-	tc-export CC
-	econf \
-		--prefix "${EROOT}usr" \
-		$(use_enable alsa) \
-		$(use_enable jack) \
-		$(use_enable oss)
-}
-
-src_compile() {
-	# EXECDIR is the default directory in which xwax will look for
-	# the 'xwax-import' and 'xwax-scan' scripts
-	emake EXECDIR="${EROOT}usr/bin"
-}
-
-src_install() {
-	# This is easier than setting all the environment variables
-	# needed, running the sed script required to get the man directory
-	# correct, and removing the GPL-2 after a 'make install' run
-	dobin xwax || die "failed to install xwax"
-	newbin import xwax-import || die "failed to install xwax-import"
-	newbin scan xwax-scan || die "failed to install xwax-scan"
-	doman xwax.1 || die "failed to install man page"
-
-	dodoc ${DOCS} || die "failed to install docs"
-}
diff --git a/media-sound/xwax/xwax-1.1.ebuild b/media-sound/xwax/xwax-1.1.ebuild
deleted file mode 100644
index bdf8e23ad853..000000000000
--- a/media-sound/xwax/xwax-1.1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/xwax/xwax-1.1.ebuild,v 1.1 2012/01/30 01:14:47 nixphoeni Exp $
-
-EAPI=4
-inherit toolchain-funcs
-
-DESCRIPTION="Digital vinyl emulation software"
-HOMEPAGE="http://www.xwax.co.uk/"
-SRC_URI="http://www.xwax.co.uk/releases/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="alsa jack oss cdda mp3 +fallback"
-REQUIRED_USE="|| ( cdda mp3 fallback )
-	|| ( alsa jack oss )"
-
-RDEPEND="sys-libs/glibc
-	media-libs/libsdl
-	media-libs/sdl-ttf
-	media-fonts/dejavu
-	alsa? ( media-libs/alsa-lib )
-	jack? ( media-sound/jack-audio-connection-kit )
-	cdda? ( media-sound/cdparanoia )
-	mp3? ( || ( media-sound/mpg123 media-sound/mpg321 ) )
-	fallback? ( virtual/ffmpeg )"
-DEPEND="${RDEPEND}"
-
-DOCS="README CHANGES"
-
-src_prepare() {
-	# Remove the forced optimization from 'CFLAGS' and 'LDFLAGS' in
-	# the Makefile
-	# Also remove the dependency on the .version target so we don't need
-	# git just to build
-	sed -i -e 's/\(^\(LD\|C\)FLAGS.*\)-O[0-9]\(.*\)/\1\3/g' \
-		-e 's/^xwax\.o:.*\.version//' \
-		Makefile || die "sed failed"
-
-	# Replace any decoder commands in the import script, if necessary
-	if [[ `use mp3` ]]; then
-		# mpg123 is upstream's default
-		if has_version media-sound/mpg123; then
-			TO="mpg123"
-			FROM="mpg321"
-		# Otherwise, use mpg321
-		else
-			TO="mpg321"
-			FROM="mpg123"
-		fi
-		debug-print "found ${TO}"
-		sed -i -e "s:${FROM}:${TO}:g" import || \
-			die "problem converting xwax-import to use ${TO}"
-	fi
-}
-
-src_configure() {
-	tc-export CC
-	econf \
-		--prefix "${EROOT}usr" \
-		$(use_enable alsa) \
-		$(use_enable jack) \
-		$(use_enable oss)
-}
-
-src_compile() {
-	# EXECDIR is the default directory in which xwax will look for
-	# the 'xwax-import' and 'xwax-scan' scripts
-	emake EXECDIR="\$(BINDIR)" VERSION="${PV}"
-}
-
-src_install() {
-	# This is easier than setting all the environment variables
-	# needed, running the sed script required to get the man directory
-	# correct, and removing the GPL-2 after a 'make install' run
-	dobin xwax || die "failed to install xwax"
-	newbin import xwax-import || die "failed to install xwax-import"
-	newbin scan xwax-scan || die "failed to install xwax-scan"
-	doman xwax.1 || die "failed to install man page"
-
-	dodoc ${DOCS} || die "failed to install docs"
-}
diff --git a/media-video/cinelerra/Manifest b/media-video/cinelerra/Manifest
index 011e0e7c4eab..45f60f747fd3 100644
--- a/media-video/cinelerra/Manifest
+++ b/media-video/cinelerra/Manifest
@@ -1,2 +1 @@
-DIST cinelerra-20101104.tar.xz 22336148 RMD160 143f0f90ce7a815fa99c9e311d21a2d229d619c8 SHA1 9d68107e5d5c009a630d1027cd0f73ff87505206 SHA256 9e708667b05d200779c41f63f678f74a0ff927b4945254e3e9a290a741b818fc
 DIST cinelerra-20111223.tar.xz 22543128 RMD160 670c2c054b3e0bd573dfc47682357c02bba5dec8 SHA1 bdd7637e656ce8108df645cd2315f6c144f203e4 SHA256 f125a6d2b16acedb379351eff1e91f8571f18993f13187959bc3cf8f8217053b
diff --git a/media-video/cinelerra/cinelerra-20101104.ebuild b/media-video/cinelerra/cinelerra-20101104.ebuild
deleted file mode 100644
index ce8a76cedc22..000000000000
--- a/media-video/cinelerra/cinelerra-20101104.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/cinelerra/cinelerra-20101104.ebuild,v 1.7 2012/05/05 08:58:56 jdhore Exp $
-
-EAPI=3
-inherit autotools eutils multilib flag-o-matic
-
-DESCRIPTION="Professional Video Editor (Unofficial GIT-snapshot)"
-HOMEPAGE="http://www.cinelerra.org/"
-SRC_URI="mirror://gentoo/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="3dnow alsa altivec css ieee1394 mmx opengl oss"
-
-RDEPEND=">=media-libs/libpng-1.4.0
-	>=media-libs/libdv-1.0.0
-	media-libs/faad2
-	media-libs/faac
-	media-libs/a52dec
-	media-libs/libsndfile
-	media-libs/tiff
-	virtual/ffmpeg
-	media-sound/lame
-	>=sci-libs/fftw-3.0.1
-	media-libs/x264
-	media-video/mjpegtools
-	>=media-libs/freetype-2.1.10
-	>=media-libs/openexr-1.2.2
-	>=media-libs/libvorbis-1.2.3
-	>=media-libs/libogg-1.1.4
-	>=media-libs/libtheora-1.1.1
-	x11-libs/libX11
-	x11-libs/libXv
-	x11-libs/libXxf86vm
-	x11-libs/libXext
-	x11-libs/libXvMC
-	x11-libs/libXft
-	virtual/jpeg
-	alsa? ( media-libs/alsa-lib )
-	ieee1394? ( media-libs/libiec61883
-		>=sys-libs/libraw1394-1.2.0
-		>=sys-libs/libavc1394-0.5.0 )
-	opengl? ( virtual/opengl )"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig
-	mmx? ( dev-lang/nasm )"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-v4l1_removal.patch" \
-		"${FILESDIR}/${PN}-ffmpeg.patch"
-	AT_M4DIR="m4" eautoreconf
-}
-
-src_configure() {
-	append-flags -D__STDC_CONSTANT_MACROS #321945
-
-	econf \
-		--disable-dependency-tracking \
-		$(use_enable oss) \
-		$(use_enable alsa) \
-		--disable-esd \
-		$(use_enable ieee1394 firewire) \
-		$(use_enable css) \
-		$(use_enable mmx) \
-		$(use_enable 3dnow) \
-		$(use_enable altivec) \
-		$(use_enable opengl) \
-		--with-plugindir=/usr/$(get_libdir)/cinelerra \
-		--with-buildinfo=cust/"Gentoo - ${PV}" \
-		--with-external-ffmpeg
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dohtml -a png,html,texi,sdw -r doc/*
-
-	rm -rf "${D}"/usr/include
-	mv -vf "${D}"/usr/bin/mpeg3cat{,.hv} || die
-	mv -vf "${D}"/usr/bin/mpeg3dump{,.hv} || die
-	mv -vf "${D}"/usr/bin/mpeg3toc{,.hv} || die
-	dosym /usr/bin/mpeg2enc /usr/$(get_libdir)/cinelerra/mpeg2enc.plugin
-
-	find "${D}" -name '*.la' -exec rm -f '{}' +
-}
diff --git a/media-video/cinelerra/files/cinelerra-v4l1_removal.patch b/media-video/cinelerra/files/cinelerra-v4l1_removal.patch
deleted file mode 100644
index 9df4004fe158..000000000000
--- a/media-video/cinelerra/files/cinelerra-v4l1_removal.patch
+++ /dev/null
@@ -1,125 +0,0 @@
-http://bugs.cinelerra.org/ticket/949
-https://bugs.gentoo.org/show_bug.cgi?id=361709
-
-diff -Nru cinelerra.orig//cinelerra/channelpicker.C cinelerra/cinelerra/channelpicker.C
---- cinelerra.orig//cinelerra/channelpicker.C	2010-11-24 18:18:03.000000000 -0500
-+++ cinelerra/cinelerra/channelpicker.C	2011-02-17 13:31:30.147880002 -0500
-@@ -39,7 +39,7 @@
- #include "recordgui.h"
- #include "recordmonitor.h"
- #include "theme.h"
--#include "vdevicebuz.h"
-+//#include "vdevicebuz.h"
- #include "vdeviceprefs.h"
- #include "videodevice.h"
- 
-@@ -280,7 +280,7 @@
- //	printf("PrefsChannelPicker::PrefsChannelPicker 1\n");
- 	this->mwindow = mwindow;
- 	this->prefs = prefs;
--	VDeviceBUZ::get_inputs(&input_sources);
-+//	VDeviceBUZ::get_inputs(&input_sources);
- }
- 
- PrefsChannelPicker::~PrefsChannelPicker()
-diff -Nru cinelerra.orig//cinelerra/Makefile.am cinelerra/cinelerra/Makefile.am
---- cinelerra.orig//cinelerra/Makefile.am	2010-11-24 18:18:03.000000000 -0500
-+++ cinelerra/cinelerra/Makefile.am	2011-02-17 13:31:30.147880002 -0500
-@@ -305,10 +305,8 @@
- 		    vattachmentpoint.C \
- 		    vautomation.C \
- 		    vdevicebase.C \
--		    vdevicebuz.C \
- 		    vdevicedvb.C \
- 		    vdeviceprefs.C \
--		    vdevicev4l.C \
- 		    vdevicev4l2.C \
- 		    vdevicev4l2jpeg.C \
- 		    vdevicex11.C \
-diff -Nru cinelerra.orig//cinelerra/reversemake cinelerra/cinelerra/reversemake
---- cinelerra.orig//cinelerra/reversemake	2010-11-24 18:18:03.000000000 -0500
-+++ cinelerra/cinelerra/reversemake	2011-02-17 13:31:30.151880002 -0500
-@@ -32,10 +32,8 @@
- make $OBJDIR/vedits.o
- make $OBJDIR/vedit.o
- make $OBJDIR/vdevicex11.o
--make $OBJDIR/vdevicev4l.o
- make $OBJDIR/vdeviceprefs.o
- make $OBJDIR/vdevicelml.o
--make $OBJDIR/vdevicebuz.o
- make $OBJDIR/vdevicebase.o
- make $OBJDIR/vdevice1394.o
- make $OBJDIR/vautomation.o
-diff -Nru cinelerra.orig//cinelerra/videodevice.C cinelerra/cinelerra/videodevice.C
---- cinelerra.orig//cinelerra/videodevice.C	2010-11-24 18:18:03.000000000 -0500
-+++ cinelerra/cinelerra/videodevice.C	2011-02-17 13:41:53.239880001 -0500
-@@ -39,9 +39,9 @@
- #ifdef HAVE_FIREWIRE
- #include "vdevice1394.h"
- #endif
--#include "vdevicebuz.h"
-+//#include "vdevicebuz.h"
- #include "vdevicedvb.h"
--#include "vdevicev4l.h"
-+//#include "vdevicev4l.h"
- #include "vdevicev4l2.h"
- #include "vdevicev4l2jpeg.h"
- #include "vdevicex11.h"
-@@ -203,7 +203,6 @@
- 			result = input_base->open_input();
- 			break;
- 
--
- #ifdef HAVE_VIDEO4LINUX2
- 		case VIDEO4LINUX2:
- 			new_device_base();
-@@ -250,8 +249,8 @@
- {
- 	switch(in_config->driver)
- 	{
--		case VIDEO4LINUX:
--			return input_base = new VDeviceV4L(this);
-+		//case VIDEO4LINUX:
-+		//	return input_base = new VDeviceV4L(this);
- 
- #ifdef HAVE_VIDEO4LINUX2
- 		case VIDEO4LINUX2:
-@@ -264,8 +263,8 @@
- 		case SCREENCAPTURE:
- 			return input_base = new VDeviceX11(this, 0);
- 
--		case CAPTURE_BUZ:
--			return input_base = new VDeviceBUZ(this);
-+		//case CAPTURE_BUZ:
-+		//	return input_base = new VDeviceBUZ(this);
- 
- #ifdef HAVE_FIREWIRE
- 		case CAPTURE_FIREWIRE:
-@@ -662,9 +661,9 @@
- //printf("VideoDevice::open_output 1 %d\n", out_config->driver);
- 	switch(out_config->driver)
- 	{
--		case PLAYBACK_BUZ:
--			output_base = new VDeviceBUZ(this);
--			break;
-+		//case PLAYBACK_BUZ:
-+		//	output_base = new VDeviceBUZ(this);
-+		//	break;
- 		case PLAYBACK_X11:
- 		case PLAYBACK_X11_XV:
- 		case PLAYBACK_X11_GL:
-diff -Nru cinelerra.orig//cinelerra/videodevice.h cinelerra/cinelerra/videodevice.h
---- cinelerra.orig//cinelerra/videodevice.h	2010-11-24 18:18:03.000000000 -0500
-+++ cinelerra/cinelerra/videodevice.h	2011-02-17 13:31:30.167880002 -0500
-@@ -40,9 +40,9 @@
- #include "thread.h"
- #include "picture.inc"
- #include "vdevicebase.inc"
--#include "vdevicebuz.inc"
-+//#include "vdevicebuz.inc"
- #include "vdevicelml.inc"
--#include "vdevicev4l.inc"
-+//#include "vdevicev4l.inc"
- #include "vdevicex11.inc"
- #include "videoconfig.inc"
- #include "videowindow.inc"
diff --git a/media-video/dvd-slideshow/Manifest b/media-video/dvd-slideshow/Manifest
index 627551df79a4..98b7379ec9f3 100644
--- a/media-video/dvd-slideshow/Manifest
+++ b/media-video/dvd-slideshow/Manifest
@@ -1,6 +1,3 @@
-DIST dvd-slideshow-0.8.2-2.tar.gz 155338 RMD160 c8af83eb474ed2fe228c37d02dfb0141cb49b48a SHA1 edc47a920a355f93d287ca183fa538bba832ed0e SHA256 00ad7d8cced0f72dc8febf80f1cf7d843f8c390aa412ca46ca22ed9521ae0005
-DIST dvd-slideshow-0.8.4-1.tar.gz 162550 RMD160 cbe6054c8b0d4800e6d3b087a30d5b2390c56a30 SHA1 ff10e9d0fe879616398124cef1d14b60b5c14719 SHA256 484f71614ab45205f6133829c431b9a631cb0251de9b97993a9361648d0607e7
-DIST dvd-slideshow-examples-0.8.0-1.tar.gz 1397782 RMD160 0243715ac1307332e1a4f041cc496af59d9a3544 SHA1 0b20b210b4c7e55a00318564cd530efbdc43e274 SHA256 9c732552cfca22fe5315a2197028621620474e9adfe7c265ddae56b46c4081fe
+DIST dvd-slideshow-0.8.4-2.tar.gz 162905 RMD160 c9de9d9a982f088dfe7fdf6acf1be8cd53e4a0c1 SHA1 d4d9494437fa454c525a58a0ea0a4e1488ecb768 SHA256 0587cbe4b39b415aec232ada3213b4352c3b9eecec82a64594f1deb8b14a809d
 DIST dvd-slideshow-examples-0.8.4-1.tar.gz 1565431 RMD160 798cf82ab9eea474775745b8c2f47b673128a7e4 SHA1 804ee998ec7fca60671fb060ef3f8bb966ae9c14 SHA256 2bb1c227136783c9eb7a43ee7fad4b8b0871e70a4269ed5b7604b13ff88ebed7
-DIST dvd-slideshow-themes-0.8.0-1.tar.gz 1224977 RMD160 1bceb0fc1618be16619c7cdd31b9befafddb1af6 SHA1 11d77e52aeb74c98dbd5027b75ac032a7ab7f9a4 SHA256 56c13c272eb6e850b98f4182acd3c5e90ba378a6ec7fc37e4c47af70b6e25cb5
 DIST dvd-slideshow-themes-0.8.4-1.tar.gz 1225865 RMD160 93ba40404c21a93b2a02512ee04b06d4cbff9bd7 SHA1 d1b98d129ece275a701795b8aa90ffe8e0b4e4f3 SHA256 3a929836c9a4afbb3b134718ea548d0f562f48c52d0026ff7bc1b99bebc4d5a1
diff --git a/media-video/dvd-slideshow/dvd-slideshow-0.8.2.2.ebuild b/media-video/dvd-slideshow/dvd-slideshow-0.8.2.2.ebuild
deleted file mode 100644
index f207d82c8f3b..000000000000
--- a/media-video/dvd-slideshow/dvd-slideshow-0.8.2.2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/dvd-slideshow/dvd-slideshow-0.8.2.2.ebuild,v 1.4 2011/04/21 19:49:10 radhermit Exp $
-
-EAPI=2
-
-inherit versionator
-
-MY_P=${PN}-$(replace_version_separator 3 '-')
-
-DESCRIPTION="DVD Slideshow - Turn your pictures into a dvd with menus!"
-HOMEPAGE="http://dvd-slideshow.sourceforge.net/wiki/Main_Page"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz
-		examples? ( mirror://sourceforge/${PN}/${PN}-examples-0.8.0-1.tar.gz )
-		themes? ( mirror://sourceforge/${PN}/${PN}-themes-0.8.0-1.tar.gz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="examples mp3 themes vorbis"
-
-RDEPEND="media-sound/sox
-	|| ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] )
-	media-video/mjpegtools
-	>media-video/dvdauthor-0.6.11
-	virtual/cdrtools
-	virtual/ffmpeg
-	app-cdr/dvd+rw-tools
-	mp3? ( media-sound/lame )
-	vorbis? ( media-libs/libvorbis )
-	sys-devel/bc
-	media-gfx/jhead"
-DEPEND=""
-
-S=${WORKDIR}/${MY_P}
-
-src_install() {
-	dobin dir2slideshow dvd-menu dvd-slideshow gallery1-to-slideshow \
-		jigl2slideshow || die "dobin failed."
-
-	dodoc doc/changelog.txt dvd-slideshowrc TODO.txt
-	dohtml doc/*.html
-	doman man/*.1
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r "${WORKDIR}"/dvd-slideshow-examples-0.8.0-1/*
-	fi
-
-	if use themes; then
-		rm "${WORKDIR}"/dvd-slideshow-themes-0.8.0-1/themes.readme.txt
-		insinto /usr/share/themes/${PF}
-		doins -r "${WORKDIR}"/dvd-slideshow-themes-0.8.0-1/*
-	fi
-}
diff --git a/media-video/dvd-slideshow/dvd-slideshow-0.8.4.1.ebuild b/media-video/dvd-slideshow/dvd-slideshow-0.8.4.2.ebuild
similarity index 91%
rename from media-video/dvd-slideshow/dvd-slideshow-0.8.4.1.ebuild
rename to media-video/dvd-slideshow/dvd-slideshow-0.8.4.2.ebuild
index a51e3f89e49f..4fbc98516210 100644
--- a/media-video/dvd-slideshow/dvd-slideshow-0.8.4.1.ebuild
+++ b/media-video/dvd-slideshow/dvd-slideshow-0.8.4.2.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/media-video/dvd-slideshow/dvd-slideshow-0.8.4.1.ebuild,v 1.1 2011/08/22 04:23:10 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/dvd-slideshow/dvd-slideshow-0.8.4.2.ebuild,v 1.1 2012/05/16 09:09:29 scarabeus Exp $
 
 EAPI=4
 
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="examples mp3 themes vorbis"
 
 RDEPEND="media-sound/sox
diff --git a/media-video/guvcview/Manifest b/media-video/guvcview/Manifest
index 57e6e0ad8c27..3602aba179a2 100644
--- a/media-video/guvcview/Manifest
+++ b/media-video/guvcview/Manifest
@@ -1,4 +1 @@
-DIST guvcview-src-1.4.2.tar.gz 687308 RMD160 62e9cec948934646f2603660d986cd44c66f3b1c SHA1 615a475ca9c35942c45e78a674e5b47a5da51b48 SHA256 c5acf5739cfda6e9499ba2dab38a70a3df03b3d04a79f510a42dd1add1c3ac92
-DIST guvcview-src-1.5.0.tar.gz 498336 RMD160 bbae3b1ed256c853255ccdd8057daba57af3c694 SHA1 8a0c99c2f33a868d026ca03601f5f477c778ec7a SHA256 03d60801794f9134a398c58c02e308d1dac010c61ed18fb72171a680a277a340
-DIST guvcview-src-1.5.1.tar.gz 491950 RMD160 bfd705010fa379339f9d838f8ea1a3181dbe5df0 SHA1 6c7ef291fa5cc823d8111b8c094df26dec179ef3 SHA256 e127830108262a4e466c5b9159f78f2481fffe37f02a4d31245fa1471d37ca0e
 DIST guvcview-src-1.5.3.tar.gz 508813 RMD160 c964900725a76761e640cd4eb16dc0c1ecc49552 SHA1 3eb4bf09587d4d1a93f73d7d64ad1a046aff3b21 SHA256 c484f22f415b9695c4f8a88d00fb64adc8b241664b6ddc5d06a789c99cb4c044
diff --git a/media-video/guvcview/files/guvcview-1.5.1-loops.patch b/media-video/guvcview/files/guvcview-1.5.1-loops.patch
deleted file mode 100644
index 7c32f761a1ae..000000000000
--- a/media-video/guvcview/files/guvcview-1.5.1-loops.patch
+++ /dev/null
@@ -1,61 +0,0 @@
---- guvcview-src-1.5.1.orig/src/v4l2_controls.c	2011-11-18 12:12:53.049556430 +0100
-+++ guvcview-src-1.5.1/src/v4l2_controls.c	2011-11-18 12:13:00.095556136 +0100
-@@ -993,10 +993,10 @@
-     int i = 0;
-     int done = 0;
-     
--    while(!done)
-+    for(; next != NULL; current = next, next = current->next)
-     {   
-         if(current->control.flags & V4L2_CTRL_FLAG_WRITE_ONLY)
--            goto next_control;
-+            continue;
-             
-         clist[count].id = current->control.id;
- #ifndef DISABLE_STRING_CONTROLS 
-@@ -1081,15 +1081,6 @@
-             
-             count = 0;
-             
--            if(next == NULL)
--                done = 1;
--        }
--        
--next_control:
--        if(!done)
--        {
--            current = next;
--            next = current->next;
-         }
-     }
-     
-@@ -1188,10 +1179,10 @@
-     int i = 0;
-     int done = 0;
-     
--    while(!done)
-+    for(; next != NULL; current = next, next = current->next)
-     {
-         if(current->control.flags & V4L2_CTRL_FLAG_READ_ONLY)
--            goto next_control;
-+            continue;
-             
-         clist[count].id = current->control.id;
-         switch (current->control.type)
-@@ -1269,16 +1260,6 @@
-             
-             
-             count = 0;
--            
--            if(next == NULL)
--                done = 1;
--        }
--
--next_control:
--        if(!done)
--        {
--            current = next;
--            next = current->next;   
-         }
-     }
-     
diff --git a/media-video/guvcview/guvcview-1.4.2.ebuild b/media-video/guvcview/guvcview-1.4.2.ebuild
deleted file mode 100644
index ad42d85fbc49..000000000000
--- a/media-video/guvcview/guvcview-1.4.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/guvcview/guvcview-1.4.2.ebuild,v 1.5 2012/05/05 08:58:54 jdhore Exp $
-
-EAPI=2
-MY_P=${PN}-src-${PV}
-
-DESCRIPTION="GTK+ UVC Viewer"
-HOMEPAGE="http://guvcview.berlios.de"
-SRC_URI="mirror://berlios/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="pulseaudio"
-
-RDEPEND=">=x11-libs/gtk+-2.14:2
-	>=dev-libs/glib-2.10:2
-	virtual/ffmpeg
-	>=media-libs/libsdl-1.2.10
-	>=media-libs/portaudio-19_pre
-	>=media-libs/libpng-1.4
-	media-libs/libv4l
-	pulseaudio? ( >=media-sound/pulseaudio-0.9.15 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	sys-devel/gettext"
-
-S=${WORKDIR}/${MY_P}
-
-src_configure() {
-	econf \
-		--disable-dependency-tracking \
-		--disable-debian-menu \
-		$(use_enable pulseaudio pulse)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog README
-	rm -rf "${D}"/usr/share/doc/${PN}
-}
diff --git a/media-video/guvcview/guvcview-1.5.0.ebuild b/media-video/guvcview/guvcview-1.5.0.ebuild
deleted file mode 100644
index 6f71c1d7860a..000000000000
--- a/media-video/guvcview/guvcview-1.5.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/guvcview/guvcview-1.5.0.ebuild,v 1.3 2012/05/05 08:58:54 jdhore Exp $
-
-EAPI=4
-
-inherit autotools
-
-MY_P=${PN}-src-${PV}
-DESCRIPTION="GTK+ UVC Viewer"
-HOMEPAGE="http://guvcview.sourceforge.net/"
-SRC_URI="mirror://berlios/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="pulseaudio"
-
-RDEPEND=">=dev-libs/glib-2.10:2
-	virtual/ffmpeg
-	>=media-libs/libsdl-1.2.10
-	>=media-libs/libpng-1.4
-	media-libs/libv4l
-	>=media-libs/portaudio-19_pre
-	sys-fs/udev
-	>=x11-libs/gtk+-2.14:2
-	pulseaudio? ( >=media-sound/pulseaudio-0.9.15 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	sys-devel/gettext"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	sed -i -e '/^guvcviewdocdir/,/^$/d' Makefile.am || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-debian-menu \
-		$(use_enable pulseaudio pulse)
-}
diff --git a/media-video/guvcview/guvcview-1.5.1.ebuild b/media-video/guvcview/guvcview-1.5.1.ebuild
deleted file mode 100644
index 36db74adc065..000000000000
--- a/media-video/guvcview/guvcview-1.5.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/guvcview/guvcview-1.5.1.ebuild,v 1.5 2012/05/05 08:58:54 jdhore Exp $
-
-EAPI=4
-
-inherit autotools eutils
-
-MY_P=${PN}-src-${PV}
-DESCRIPTION="GTK+ UVC Viewer"
-HOMEPAGE="http://guvcview.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="pulseaudio"
-
-RDEPEND=">=dev-libs/glib-2.10:2
-	virtual/ffmpeg
-	>=media-libs/libsdl-1.2.10
-	>=media-libs/libpng-1.4
-	media-libs/libv4l
-	>=media-libs/portaudio-19_pre
-	sys-fs/udev
-	x11-libs/gtk+:3
-	pulseaudio? ( >=media-sound/pulseaudio-0.9.15 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	sys-devel/gettext"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	sed -i -e '/^guvcviewdocdir/,/^$/d' Makefile.am || die
-	epatch "${FILESDIR}/${P}-loops.patch"
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-debian-menu \
-		$(use_enable pulseaudio pulse)
-}
diff --git a/media-video/guvcview/guvcview-1.5.3.ebuild b/media-video/guvcview/guvcview-1.5.3.ebuild
index bbd9aea12b7b..134fd98d849e 100644
--- a/media-video/guvcview/guvcview-1.5.3.ebuild
+++ b/media-video/guvcview/guvcview-1.5.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/media-video/guvcview/guvcview-1.5.3.ebuild,v 1.2 2012/05/05 08:58:54 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/guvcview/guvcview-1.5.3.ebuild,v 1.3 2012/05/16 09:23:50 scarabeus Exp $
 
 EAPI=4
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="pulseaudio"
 
 RDEPEND=">=dev-libs/glib-2.10:2
diff --git a/media-video/miro/Manifest b/media-video/miro/Manifest
index ec7bf0f0fc05..0ccf3ef66235 100644
--- a/media-video/miro/Manifest
+++ b/media-video/miro/Manifest
@@ -1,2 +1 @@
-DIST miro-4.0.1.tar.gz 12806477 RMD160 ec96cd33472668dd21f326404ecd07a6126de34b SHA1 c79577a68ac1dac55ccd80138a8040dc4df00c72 SHA256 bac2d579350517590a2f38d3be40da25bca3b331969b03046c1ba545984a6881
 DIST miro-4.0.6.tar.gz 13078726 RMD160 88a2798ab7f95c3ffef579b9277ab5a1432b56f5 SHA1 5c3d632d8cf30516b321f79b22d4468b61ff9e6c SHA256 f51261d4505f0e9b2e429476ccfc8ce787ade6bfddb13a3eb05dee74a111d7da
diff --git a/media-video/miro/files/4.0.1-ffmpeg.patch b/media-video/miro/files/4.0.1-ffmpeg.patch
deleted file mode 100644
index edf3784591ec..000000000000
--- a/media-video/miro/files/4.0.1-ffmpeg.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-diff -urN miro-4.0.old/linux/miro-segmenter.c miro-4.0/linux/miro-segmenter.c
---- miro-4.0.old/linux/miro-segmenter.c	2011-05-25 15:58:21.000000000 +0200
-+++ miro-4.0/linux/miro-segmenter.c	2011-05-25 16:09:41.000000000 +0200
-@@ -60,7 +60,7 @@
-     }
- 
-     switch (input_codec_context->codec_type) {
--        case CODEC_TYPE_AUDIO:
-+        case AVMEDIA_TYPE_AUDIO:
-             output_codec_context->channel_layout = input_codec_context->channel_layout;
-             output_codec_context->sample_rate = input_codec_context->sample_rate;
-             output_codec_context->channels = input_codec_context->channels;
-@@ -72,7 +72,7 @@
-                 output_codec_context->block_align = input_codec_context->block_align;
-             }
-             break;
--        case CODEC_TYPE_VIDEO:
-+        case AVMEDIA_TYPE_VIDEO:
-             output_codec_context->pix_fmt = input_codec_context->pix_fmt;
-             output_codec_context->width = input_codec_context->width;
-             output_codec_context->height = input_codec_context->height;
-@@ -154,7 +154,7 @@
-         exit(1);
-     }
- 
--    ofmt = guess_format("mpegts", NULL, NULL);
-+    ofmt = av_guess_format("mpegts", NULL, NULL);
-     if (!ofmt) {
-         fprintf(stderr, "Could not find MPEG-TS muxer\n");
-         exit(1);
-@@ -174,12 +174,12 @@
- 
-     for (i = 0; i < ic->nb_streams && (video_index < 0 || audio_index < 0); i++) {
-         switch (ic->streams[i]->codec->codec_type) {
--            case CODEC_TYPE_VIDEO:
-+            case AVMEDIA_TYPE_VIDEO:
-                 video_index = i;
-                 ic->streams[i]->discard = AVDISCARD_NONE;
-                 video_st = add_output_stream(oc, ic->streams[i]);
-                 break;
--            case CODEC_TYPE_AUDIO:
-+            case AVMEDIA_TYPE_AUDIO:
-                 audio_index = i;
-                 ic->streams[i]->discard = AVDISCARD_NONE;
-                 audio_st = add_output_stream(oc, ic->streams[i]);
-@@ -195,7 +195,7 @@
-         exit(1);
-     }
- 
--    dump_format(oc, 0, input, 1);
-+    av_dump_format(oc, 0, input, 1);
- 
-     if (video_st) {
-         codec = avcodec_find_decoder(video_st->codec->codec_id);
-@@ -208,7 +208,7 @@
-         }
-     }
- 
--    if (url_fopen(&oc->pb, output_filename, URL_WRONLY) < 0) {
-+    if (avio_open(&oc->pb, output_filename, URL_WRONLY) < 0) {
-         fprintf(stderr, "Could not open '%s'\n", output_filename);
-         exit(1);
-     }
-@@ -234,7 +234,7 @@
-             break;
-         }
- 
--        if (packet.stream_index == video_index && (packet.flags & PKT_FLAG_KEY)) {
-+        if (packet.stream_index == video_index && (packet.flags & AV_PKT_FLAG_KEY)) {
-             segment_time = (double)video_st->pts.val * video_st->time_base.num / video_st->time_base.den;
-         }
-         else if (video_index < 0) {
-@@ -245,10 +245,10 @@
-         }
- 
-         if (segment_time - prev_segment_time >= segment_duration) {
--            put_flush_packet(oc->pb);
--            url_fclose(oc->pb);
-+            avio_flush(oc->pb);
-+            avio_close(oc->pb);
- 
--            if (url_fopen(&oc->pb, output_filename, URL_WRONLY) < 0) {
-+            if (avio_open(&oc->pb, output_filename, URL_WRONLY) < 0) {
-                 fprintf(stderr, "Could not open '%s'\n", output_filename);
-                 break;
-             }
-@@ -278,7 +278,7 @@
-         av_freep(&oc->streams[i]);
-     }
- 
--    url_fclose(oc->pb);
-+    avio_close(oc->pb);
-     av_free(oc);
- 
-     return 0;
diff --git a/media-video/miro/files/miro-2.5.3-disable-xine-hack.patch b/media-video/miro/files/miro-2.5.3-disable-xine-hack.patch
deleted file mode 100644
index ab0502f325ce..000000000000
--- a/media-video/miro/files/miro-2.5.3-disable-xine-hack.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-# This patch comes from Debian
-# This seems to cause segfaults with newer libxine (?) releases, so disable it.
-# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=512719
-# http://bugzilla.pculture.org/show_bug.cgi?id=11263
-
---- platform/gtk-x11/plat/options.py.orig	2009-07-24 15:11:34.000000000 +0200
-+++ platform/gtk-x11/plat/options.py	2009-07-24 15:11:42.000000000 +0200
-@@ -51,7 +51,7 @@
-                        help="Which renderer to use.  (gstreamer, xine)" )
- 
- USE_XINE_XV_HACK = GTKPref(key="UseXineXVHack",
--                           default=True,
-+                           default=False,
-                            alias="xine-xvhack",
-                            help="Whether or not to use the Xine xv hack.  (true, false)" )
- 
diff --git a/media-video/miro/files/miro-2.5.3-dont-install-test-files.patch b/media-video/miro/files/miro-2.5.3-dont-install-test-files.patch
deleted file mode 100644
index 3c7a99f345b8..000000000000
--- a/media-video/miro/files/miro-2.5.3-dont-install-test-files.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- setup.py.old	2009-10-29 12:36:58.000000000 +0100
-+++ setup.py	2009-10-29 12:37:56.000000000 +0100
-@@ -175,7 +175,6 @@
- portable_xpcom_dir = os.path.join(portable_frontend_dir, 'widgets', 'gtk',
-         'xpcom')
- dl_daemon_dir = os.path.join(portable_dir, 'dl_daemon')
--test_dir = os.path.join(portable_dir, 'test')
- resource_dir = os.path.join(root_dir, 'resources')
- platform_dir = os.path.join(root_dir, 'platform', 'gtk-x11')
- platform_package_dir = os.path.join(platform_dir, 'plat')
-@@ -645,9 +644,7 @@
-         if os.path.basename(f) != 'app.config.template']
- data_files.append(('/usr/share/miro/resources/', files))
- # handle the sub directories.
--for dir in ('searchengines', 'images', 'testdata',
--        os.path.join('testdata', 'stripperdata'),
--        os.path.join('testdata', 'locale', 'fr', 'LC_MESSAGES')):
-+for dir in ('searchengines', 'images'):
-     source_dir = os.path.join(resource_dir, dir)
-     dest_dir = os.path.join('/usr/share/miro/resources/', dir)
-     data_files.append((dest_dir, listfiles(source_dir)))
-@@ -867,7 +864,6 @@
-     packages = [
-         'miro',
-         'miro.dl_daemon',
--        'miro.test',
-         'miro.dl_daemon.private',
-         'miro.frontends',
-         'miro.frontends.cli',
-@@ -881,7 +877,6 @@
-     ],
-     package_dir = {
-         'miro': portable_dir,
--        'miro.test': test_dir,
-         'miro.plat': platform_package_dir,
-     },
-     cmdclass = {
diff --git a/media-video/miro/files/miro-2.5.3-fix-debug.patch b/media-video/miro/files/miro-2.5.3-fix-debug.patch
deleted file mode 100644
index 460471b51fb3..000000000000
--- a/media-video/miro/files/miro-2.5.3-fix-debug.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-This patch comes from Debian
---- platform/gtk-x11/setup.py.orig	2009-02-28 17:29:13.000000000 +0100
-+++ platform/gtk-x11/setup.py	2009-02-28 17:29:26.000000000 +0100
-@@ -330,7 +330,7 @@
-         exit;
-     fi
- 
--    %(runtimelib)s$GDB -ex 'set breakpoint pending on' -ex 'run' --args $PYTHON ./miro.real --sync "$@"
-+    %(runtimelib)s$GDB -ex 'set breakpoint pending on' -ex 'run' --args $PYTHON /usr/bin/miro.real --sync "$@"
- else
-     %(runtimelib)smiro.real "$@"
- fi
diff --git a/media-video/miro/files/miro-2.5.3-remove-pkg-config-list-all.patch b/media-video/miro/files/miro-2.5.3-remove-pkg-config-list-all.patch
deleted file mode 100644
index 569c68af663e..000000000000
--- a/media-video/miro/files/miro-2.5.3-remove-pkg-config-list-all.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From b5acbb41f5c6b2c4ce3b4a6944459ea425d7f971 Mon Sep 17 00:00:00 2001
-From: Mounir Lamouri (volkmar) <mounir.lamouri@gmail.com>
-Date: Sat, 28 Nov 2009 14:39:19 +0100
-Subject: [PATCH] Remove use of 'pkg-config --list-all' to 'pkg-config --exists'.
- Fix bug 4613.
-
----
- platform/gtk-x11/setup.py |   23 +++++++++++++----------
- 1 files changed, 13 insertions(+), 10 deletions(-)
-
-diff --git a/platform/gtk-x11/setup.py b/platform/gtk-x11/setup.py
-index a731ff6..94dc72a 100755
---- a/platform/gtk-x11/setup.py
-+++ b/platform/gtk-x11/setup.py
-@@ -297,6 +297,14 @@ def parse_pkg_config(command, components, options_dict = None):
- 
-     return options_dict
- 
-+def package_exist(package_name):
-+  """
-+  Return True if the package is present in the system. False otherwise.
-+  The check is made with pkg-config.
-+  """
-+  # pkg-config returs 0 if the package is present
-+  return subprocess.call(['pkg-config', '--exists', package_name]) == 0
-+
- def compile_xine_extractor():
-     rv = os.system("gcc %s -o %s `pkg-config --libs --cflags gdk-pixbuf-2.0 glib-2.0 libxine`" %
-                    (os.path.join(platform_dir, "xine/xine_extractor.c"), os.path.join(platform_dir, "xine/xine_extractor")))
-@@ -346,11 +354,6 @@ fi
- 
- #### MozillaBrowser Extension ####
- def get_mozilla_stuff():
--    try:
--        packages = get_command_output("pkg-config --list-all")
--    except RuntimeError, error:
--        sys.exit("Package config error:\n%s" % (error,))
--
-     if XPCOM_LIB and GTKMOZEMBED_LIB and XULRUNNER_19 != None:
-         print "\nUsing XPCOM_LIB, GTKMOZEMBED_LIB and XULRUNNER_19 values...."
-         xulrunner19 = XULRUNNER_19
-@@ -360,24 +363,24 @@ def get_mozilla_stuff():
-     else:
-         print "\nTrying to figure out xpcom_lib, gtkmozembed_lib, and xulrunner_19 values...."
-         xulrunner19 = False
--        if re.search("^libxul", packages, re.MULTILINE):
-+        if package_exist('libxul'):
-             xulrunner19 = True
-             xpcom_lib = 'libxul'
-             gtkmozembed_lib = 'libxul'
- 
--        elif re.search("^xulrunner-xpcom", packages, re.MULTILINE):
-+        elif package_exist('xulrunner-xpcom'):
-             xpcom_lib = 'xulrunner-xpcom'
-             gtkmozembed_lib = 'xulrunner-gtkmozembed'
- 
--        elif re.search("^seamonkey-xpcom", packages, re.MULTILINE):
-+        elif package_exist('seamonkey-xpcom'):
-             xpcom_lib = 'seamonkey-xpcom'
-             gtkmozembed_lib = 'seamonkey-gtkmozembed'
- 
--        elif re.search("^mozilla-xpcom", packages, re.MULTILINE):
-+        elif package_exist('mozilla-xpcom'):
-             xpcom_lib = 'mozilla-xpcom'
-             gtkmozembed_lib = 'mozilla-gtkmozembed'
- 
--        elif re.search("^firefox-xpcom", packages, re.MULTILINE):
-+        elif package_exist('firefox-xpcom'):
-             xpcom_lib = 'firefox-xpcom'
-             gtkmozembed_lib = 'firefox-gtkmozembed'
- 
--- 
-1.6.3.3
-
diff --git a/media-video/miro/files/miro-2.5.3-remove-unittest-option.patch b/media-video/miro/files/miro-2.5.3-remove-unittest-option.patch
deleted file mode 100644
index 79e1e9c604a7..000000000000
--- a/media-video/miro/files/miro-2.5.3-remove-unittest-option.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- miro.real.old	2009-10-29 12:33:29.000000000 +0100
-+++ miro.real	2009-10-29 12:33:43.000000000 +0100
-@@ -81,9 +81,6 @@
- group.add_option('--debug',
-                   action="store_true",
-                   help='Starts Miro in a gdb session for better debugging.')
--group.add_option('--unittest',
--                  dest='unittest', action='store_true',
--                  help='Run unittests instead of launching the program.')
- parser.set_defaults(unittest=False)
- group.add_option('--profile',
-                   metavar='<FILE>',
diff --git a/media-video/miro/miro-4.0.1-r1.ebuild b/media-video/miro/miro-4.0.1-r1.ebuild
deleted file mode 100644
index 119c0a9a4bf6..000000000000
--- a/media-video/miro/miro-4.0.1-r1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/miro/miro-4.0.1-r1.ebuild,v 1.2 2012/01/29 02:22:11 floppym Exp $
-
-EAPI=3
-
-PYTHON_DEPEND="2:2.7"
-PYTHON_USE_WITH="sqlite"
-inherit eutils fdo-mime gnome2-utils distutils
-
-DESCRIPTION="Open source video player and podcast client"
-HOMEPAGE="http://www.getmiro.com/"
-SRC_URI="http://ftp.osuosl.org/pub/pculture.org/${PN}/src/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="libnotify aac musepack xvid"
-
-CDEPEND="
-	dev-libs/glib:2
-	>=dev-python/pyrex-0.9.6.4
-	dev-python/pygtk:2
-	dev-python/pygobject:2
-	>=virtual/ffmpeg-0.6.90"
-
-RDEPEND="${CDEPEND}
-	dev-python/dbus-python
-	dev-python/pycairo
-	dev-python/gconf-python
-	dev-python/gst-python:0.10
-	dev-python/pyrex
-	>=dev-python/pywebkitgtk-1.1.5
-	dev-python/pycurl
-	>=net-libs/rb_libtorrent-0.14.1[python]
-	media-libs/mutagen
-	media-plugins/gst-plugins-meta:0.10
-	media-plugins/gst-plugins-pango:0.10
-	aac? ( media-plugins/gst-plugins-faad:0.10 )
-	libnotify? ( dev-python/notify-python )
-	musepack? ( media-plugins/gst-plugins-musepack:0.10 )
-	xvid? ( media-plugins/gst-plugins-xvid:0.10 )"
-
-DEPEND="${CDEPEND}"
-
-S="${WORKDIR}/${P}/linux"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PV}-ffmpeg.patch"
-	distutils_src_prepare
-}
-
-src_install() {
-	# doing the mv now otherwise, distutils_src_install will install it
-	mv README README.gtk || die "mv failed"
-
-	distutils_src_install
-
-	# installing docs
-	dodoc README.gtk ../{CREDITS,README} || die "dodoc failed"
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	distutils_pkg_postinst
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-
-	ewarn
-	ewarn "If miro doesn't play some video or audio format, please"
-	ewarn "check your USE flags on media-plugins/gst-plugins-meta"
-	ewarn
-	elog "Miro for Linux doesn't support Adobe Flash, therefore you"
-	elog "you will not see any embedded video player on MiroGuide."
-	elog
-}
-
-pkg_postrm() {
-	distutils_pkg_postrm
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}
diff --git a/media-video/miro/miro-4.0.1.ebuild b/media-video/miro/miro-4.0.1.ebuild
deleted file mode 100644
index ce5d3182d877..000000000000
--- a/media-video/miro/miro-4.0.1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/miro/miro-4.0.1.ebuild,v 1.3 2012/01/29 02:22:11 floppym Exp $
-
-EAPI=3
-
-PYTHON_DEPEND="2:2.7"
-PYTHON_USE_WITH="sqlite"
-inherit eutils fdo-mime gnome2-utils distutils
-
-DESCRIPTION="Open source video player and podcast client"
-HOMEPAGE="http://www.getmiro.com/"
-SRC_URI="http://ftp.osuosl.org/pub/pculture.org/${PN}/src/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="libnotify aac musepack xvid"
-
-CDEPEND="
-	dev-libs/glib:2
-	>=dev-python/pyrex-0.9.6.4
-	dev-python/pygtk:2
-	dev-python/pygobject:2
-	>=virtual/ffmpeg-0.6.90"
-
-RDEPEND="${CDEPEND}
-	dev-python/dbus-python
-	dev-python/pycairo
-	dev-python/gconf-python
-	dev-python/gst-python:0.10
-	>=dev-python/pywebkitgtk-1.1.5
-	dev-python/pycurl
-	>=net-libs/rb_libtorrent-0.14.1[python]
-	media-libs/mutagen
-	media-plugins/gst-plugins-meta:0.10
-	media-plugins/gst-plugins-pango:0.10
-	aac? ( media-plugins/gst-plugins-faad:0.10 )
-	libnotify? ( dev-python/notify-python )
-	musepack? ( media-plugins/gst-plugins-musepack:0.10 )
-	xvid? ( media-plugins/gst-plugins-xvid:0.10 )"
-
-DEPEND="${CDEPEND}"
-
-S="${WORKDIR}/${P}/linux"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PV}-ffmpeg.patch"
-	distutils_src_prepare
-}
-
-src_install() {
-	# doing the mv now otherwise, distutils_src_install will install it
-	mv README README.gtk || die "mv failed"
-
-	distutils_src_install
-
-	# installing docs
-	dodoc README.gtk ../{CREDITS,README} || die "dodoc failed"
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	distutils_pkg_postinst
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-
-	ewarn
-	ewarn "If miro doesn't play some video or audio format, please"
-	ewarn "check your USE flags on media-plugins/gst-plugins-meta"
-	ewarn
-	elog "Miro for Linux doesn't support Adobe Flash, therefore you"
-	elog "you will not see any embedded video player on MiroGuide."
-	elog
-}
-
-pkg_postrm() {
-	distutils_pkg_postrm
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}
diff --git a/metadata/cache/app-cdr/k9copy-2.3.7 b/metadata/cache/app-cdr/k9copy-2.3.7
deleted file mode 100644
index b755a6a52eaa..000000000000
--- a/metadata/cache/app-cdr/k9copy-2.3.7
+++ /dev/null
@@ -1,22 +0,0 @@
-media-libs/libdvdread >=media-libs/libmpeg2-0.5.1 media-libs/xine-lib virtual/ffmpeg >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
-media-libs/libdvdread >=media-libs/libmpeg2-0.5.1 media-libs/xine-lib virtual/ffmpeg media-video/dvdauthor media-video/mplayer >=kde-base/oxygen-icons-4.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
-4
-mirror://sourceforge/k9copy/k9copy-2.3.7-Source.tar.gz
-
-http://k9copy.sourceforge.net/
-GPL-2
-k9copy is a DVD backup utility which allows the copy of one or more titles from a DVD9 to a DVD5.
-amd64 x86
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib toolchain-funcs user versionator virtualx
-debug linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_es_AR linguas_es linguas_fr linguas_it linguas_ja linguas_nl linguas_pl linguas_pt_BR linguas_ru linguas_sr@Latn linguas_sr linguas_tr linguas_zh_TW +handbook aqua
-
-
-
-3
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/app-cdr/k9copy-2.3.8 b/metadata/cache/app-cdr/k9copy-2.3.8
index a09f41f77dbb..9199a6b27dd0 100644
--- a/metadata/cache/app-cdr/k9copy-2.3.8
+++ b/metadata/cache/app-cdr/k9copy-2.3.8
@@ -6,7 +6,7 @@ mirror://sourceforge/k9copy/k9copy-2.3.8-Source.tar.gz
 http://k9copy.sourceforge.net/
 GPL-2
 k9copy is a DVD backup utility which allows the copy of one or more titles from a DVD9 to a DVD5.
-amd64 ~x86
+amd64 x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib toolchain-funcs user versionator virtualx
 debug mplayer linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_es linguas_es_AR linguas_fr linguas_it linguas_ja linguas_nl linguas_pl linguas_pt_BR linguas_ru linguas_sr linguas_sr@Latn linguas_tr linguas_uk linguas_zh_TW +handbook aqua
 
diff --git a/metadata/cache/app-text/hyperestraier-1.4.10-r1 b/metadata/cache/app-text/hyperestraier-1.4.10-r1
index ebabee4d756a..6c0835fc1b1a 100644
--- a/metadata/cache/app-text/hyperestraier-1.4.10-r1
+++ b/metadata/cache/app-text/hyperestraier-1.4.10-r1
@@ -1,9 +1,9 @@
 >=dev-db/qdbm-1.8.75 sys-libs/zlib java? ( >=virtual/jre-1.4 ) mecab? ( app-text/mecab ) ruby? ( dev-lang/ruby ) java? ( >=virtual/jdk-1.4 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 >=dev-db/qdbm-1.8.75 sys-libs/zlib java? ( >=virtual/jre-1.4 ) mecab? ( app-text/mecab ) ruby? ( dev-lang/ruby ) java? ( >=dev-java/java-config-2.1.9-r1 )
 0
-mirror://sourceforge/hyperestraier/hyperestraier-1.4.10.tar.gz
+http://fallabs.com/hyperestraier/hyperestraier-1.4.10.tar.gz
 
-http://hyperestraier.sf.net/
+http://fallabs.com/hyperestraier/
 LGPL-2.1
 a full-text search system for communities
 amd64 ppc sparc x86
diff --git a/metadata/cache/app-text/hyperestraier-1.4.13 b/metadata/cache/app-text/hyperestraier-1.4.13
index f6988382993b..8feb7362b047 100644
--- a/metadata/cache/app-text/hyperestraier-1.4.13
+++ b/metadata/cache/app-text/hyperestraier-1.4.13
@@ -1,9 +1,9 @@
 >=dev-db/qdbm-1.8.75 sys-libs/zlib java? ( >=virtual/jre-1.4 ) mecab? ( app-text/mecab ) ruby? ( dev-lang/ruby ) java? ( >=virtual/jdk-1.4 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 >=dev-db/qdbm-1.8.75 sys-libs/zlib java? ( >=virtual/jre-1.4 ) mecab? ( app-text/mecab ) ruby? ( dev-lang/ruby ) java? ( >=dev-java/java-config-2.1.9-r1 )
 0
-mirror://sourceforge/hyperestraier/hyperestraier-1.4.13.tar.gz
+http://fallabs.com/hyperestraier/hyperestraier-1.4.13.tar.gz
 
-http://hyperestraier.sf.net/
+http://fallabs.com/hyperestraier/
 LGPL-2.1
 a full-text search system for communities
 alpha ~amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd
diff --git a/metadata/cache/app-text/xdvik-22.85-r1 b/metadata/cache/app-text/xdvik-22.85-r1
new file mode 100644
index 000000000000..bf1642defc09
--- /dev/null
+++ b/metadata/cache/app-text/xdvik-22.85-r1
@@ -0,0 +1,22 @@
+sys-devel/flex virtual/yacc >=media-libs/t1lib-5.0.2 x11-libs/libXmu x11-libs/libXp x11-libs/libXpm motif? ( >=x11-libs/openmotif-2.3:0 ) neXt? ( x11-libs/neXtaw ) Xaw3d? ( x11-libs/libXaw3d ) Xaw? ( x11-libs/libXaw ) dev-libs/kpathsea
+>=media-libs/t1lib-5.0.2 x11-libs/libXmu x11-libs/libXp x11-libs/libXpm motif? ( >=x11-libs/openmotif-2.3:0 ) neXt? ( x11-libs/neXtaw ) Xaw3d? ( x11-libs/libXaw3d ) Xaw? ( x11-libs/libXaw ) dev-libs/kpathsea virtual/latex-base !<app-text/texlive-2007
+0
+mirror://sourceforge/xdvi/xdvik-22.85.tar.gz
+
+http://xdvi.sourceforge.net/
+GPL-2
+DVI previewer for X Window System
+~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+elisp-common eutils flag-o-matic multilib toolchain-funcs user
+motif neXt Xaw Xaw3d emacs
+^^ ( motif neXt Xaw Xaw3d )
+
+
+4
+
+compile configure install postinst prepare
+
+
+
+
+
diff --git a/metadata/cache/dev-libs/expat-2.1.0-r2 b/metadata/cache/dev-libs/expat-2.1.0-r2
new file mode 100644
index 000000000000..796401ae390c
--- /dev/null
+++ b/metadata/cache/dev-libs/expat-2.1.0-r2
@@ -0,0 +1,22 @@
+
+
+0
+mirror://sourceforge/expat/expat-2.1.0.tar.gz
+
+http://expat.sourceforge.net/
+MIT
+XML parsing libraries
+~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+eutils libtool multilib toolchain-funcs user
+elibc_FreeBSD examples static-libs unicode
+
+
+
+4
+
+compile configure install prepare
+
+
+
+
+
diff --git a/metadata/cache/dev-tcltk/tix-8.4.3 b/metadata/cache/dev-tcltk/tix-8.4.3
index 146e403129c2..30c8ffa00a2e 100644
--- a/metadata/cache/dev-tcltk/tix-8.4.3
+++ b/metadata/cache/dev-tcltk/tix-8.4.3
@@ -6,7 +6,7 @@ test
 http://tix.sourceforge.net/
 BSD
 A widget library for Tcl/Tk
-amd64 ~hppa ~ppc sparc x86 ~amd64-linux ~x86-linux
+amd64 ~hppa ~ppc sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
 eutils multilib toolchain-funcs user
 
 
diff --git a/metadata/cache/media-gfx/album-4.07 b/metadata/cache/media-gfx/album-4.07
index f5d45ad3fafe..9a290211c01f 100644
--- a/metadata/cache/media-gfx/album-4.07
+++ b/metadata/cache/media-gfx/album-4.07
@@ -6,7 +6,7 @@ http://marginalhacks.com/bin/album.versions/album-4.07.tar.gz http://marginalhac
 http://MarginalHacks.com/Hacks/album/
 marginalhacks
 HTML photo album generator
-~alpha ~amd64 ~ppc ~ppc64 ~x86
+~alpha amd64 ~ppc ~ppc64 x86
 
 doc ffmpeg plugins themes
 
diff --git a/metadata/cache/media-libs/mlt-0.5.10 b/metadata/cache/media-libs/mlt-0.5.10
deleted file mode 100644
index 29707d03ad66..000000000000
--- a/metadata/cache/media-libs/mlt-0.5.10
+++ /dev/null
@@ -1,22 +0,0 @@
-ffmpeg? ( virtual/ffmpeg[vdpau?] ) dv? ( >=media-libs/libdv-0.104 ) xml? ( >=dev-libs/libxml2-2.5 ) vorbis? ( >=media-libs/libvorbis-1.1.2 ) sdl? ( >=media-libs/libsdl-1.2.10 >=media-libs/sdl-image-1.2.4 ) libsamplerate? ( >=media-libs/libsamplerate-0.1.2 ) jack? ( media-sound/jack-audio-connection-kit media-libs/ladspa-sdk >=dev-libs/libxml2-2.5 ) frei0r? ( media-plugins/frei0r-plugins ) gtk? ( x11-libs/gtk+:2 x11-libs/pango ) quicktime? ( media-libs/libquicktime ) xine? ( >=media-libs/xine-lib-1.1.2_pre20060328-r7 ) qt4? ( x11-libs/qt-gui:4 ) !media-libs/mlt++ lua? ( >=dev-lang/lua-5.1.4-r4 ) ruby? ( dev-lang/ruby ) virtual/pkgconfig compressed-lumas? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) ) lua? ( >=dev-lang/swig-1.3.38 virtual/pkgconfig ) python? ( >=dev-lang/swig-1.3.38 ) ruby? ( >=dev-lang/swig-1.3.38 ) python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) )
-ffmpeg? ( virtual/ffmpeg[vdpau?] ) dv? ( >=media-libs/libdv-0.104 ) xml? ( >=dev-libs/libxml2-2.5 ) vorbis? ( >=media-libs/libvorbis-1.1.2 ) sdl? ( >=media-libs/libsdl-1.2.10 >=media-libs/sdl-image-1.2.4 ) libsamplerate? ( >=media-libs/libsamplerate-0.1.2 ) jack? ( media-sound/jack-audio-connection-kit media-libs/ladspa-sdk >=dev-libs/libxml2-2.5 ) frei0r? ( media-plugins/frei0r-plugins ) gtk? ( x11-libs/gtk+:2 x11-libs/pango ) quicktime? ( media-libs/libquicktime ) xine? ( >=media-libs/xine-lib-1.1.2_pre20060328-r7 ) qt4? ( x11-libs/qt-gui:4 ) !media-libs/mlt++ lua? ( >=dev-lang/lua-5.1.4-r4 ) ruby? ( dev-lang/ruby ) python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) )
-0
-mirror://sourceforge/mlt/mlt-0.5.10.tar.gz
-
-http://www.mltframework.org/
-GPL-2
-An open source multimedia framework, designed and developed for television broadcasting
-amd64 ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
-eutils multilib python toolchain-funcs user
-compressed-lumas dv debug ffmpeg frei0r gtk jack kde libsamplerate melt mmx qt4 quicktime sdl sse sse2 vorbis xine xml lua python ruby vdpau
-
-
-
-3
-
-configure install postinst postrm prepare setup
-
-
-
-
-
diff --git a/metadata/cache/media-libs/mlt-0.7.6-r1 b/metadata/cache/media-libs/mlt-0.7.6-r1
deleted file mode 100644
index c16bc8181288..000000000000
--- a/metadata/cache/media-libs/mlt-0.7.6-r1
+++ /dev/null
@@ -1,22 +0,0 @@
-ffmpeg? ( virtual/ffmpeg[vdpau?] ) dv? ( >=media-libs/libdv-0.104 ) xml? ( >=dev-libs/libxml2-2.5 ) vorbis? ( >=media-libs/libvorbis-1.1.2 ) sdl? ( >=media-libs/libsdl-1.2.10 >=media-libs/sdl-image-1.2.4 ) libsamplerate? ( >=media-libs/libsamplerate-0.1.2 ) jack? ( media-sound/jack-audio-connection-kit media-libs/ladspa-sdk >=dev-libs/libxml2-2.5 ) frei0r? ( media-plugins/frei0r-plugins ) gtk? ( x11-libs/gtk+:2 media-libs/libexif x11-libs/pango ) quicktime? ( media-libs/libquicktime ) swfdec? ( media-libs/swfdec ) xine? ( >=media-libs/xine-lib-1.1.2_pre20060328-r7 ) qt4? ( x11-libs/qt-gui:4 x11-libs/qt-svg:4 media-libs/libexif ) !media-libs/mlt++ lua? ( >=dev-lang/lua-5.1.4-r4 ) ruby? ( dev-lang/ruby ) virtual/pkgconfig compressed-lumas? ( || ( media-gfx/imagemagick[png] media-gfx/graphicsmagick[imagemagick,png] ) ) lua? ( >=dev-lang/swig-2.0 virtual/pkgconfig ) python? ( >=dev-lang/swig-2.0 ) ruby? ( >=dev-lang/swig-2.0 ) python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) )
-ffmpeg? ( virtual/ffmpeg[vdpau?] ) dv? ( >=media-libs/libdv-0.104 ) xml? ( >=dev-libs/libxml2-2.5 ) vorbis? ( >=media-libs/libvorbis-1.1.2 ) sdl? ( >=media-libs/libsdl-1.2.10 >=media-libs/sdl-image-1.2.4 ) libsamplerate? ( >=media-libs/libsamplerate-0.1.2 ) jack? ( media-sound/jack-audio-connection-kit media-libs/ladspa-sdk >=dev-libs/libxml2-2.5 ) frei0r? ( media-plugins/frei0r-plugins ) gtk? ( x11-libs/gtk+:2 media-libs/libexif x11-libs/pango ) quicktime? ( media-libs/libquicktime ) swfdec? ( media-libs/swfdec ) xine? ( >=media-libs/xine-lib-1.1.2_pre20060328-r7 ) qt4? ( x11-libs/qt-gui:4 x11-libs/qt-svg:4 media-libs/libexif ) !media-libs/mlt++ lua? ( >=dev-lang/lua-5.1.4-r4 ) ruby? ( dev-lang/ruby ) python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) )
-0
-mirror://sourceforge/mlt/mlt-0.7.6.tar.gz
-
-http://www.mltframework.org/
-GPL-2
-An open source multimedia framework, designed and developed for television broadcasting
-amd64 ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
-eutils multilib python toolchain-funcs user
-compressed-lumas dv debug ffmpeg frei0r gtk jack kde libsamplerate melt mmx qt4 quicktime sdl sse sse2 swfdec vorbis xine xml lua python ruby vdpau
-
-
-
-4
-
-configure install postinst postrm prepare setup
-
-
-
-
-
diff --git a/metadata/cache/media-libs/mlt-0.7.8 b/metadata/cache/media-libs/mlt-0.7.8
index 75e9999b387b..c87323d2ec59 100644
--- a/metadata/cache/media-libs/mlt-0.7.8
+++ b/metadata/cache/media-libs/mlt-0.7.8
@@ -6,7 +6,7 @@ mirror://sourceforge/mlt/mlt-0.7.8.tar.gz
 http://www.mltframework.org/
 GPL-2
 An open source multimedia framework, designed and developed for television broadcasting
-~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+amd64 ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
 eutils multilib python toolchain-funcs user
 compressed-lumas dv debug ffmpeg frei0r gtk jack kde libsamplerate melt mmx qt4 quicktime rtaudio sdl sse sse2 swfdec vorbis xine xml lua python ruby vdpau kernel_linux
 
diff --git a/metadata/cache/media-libs/wxsvg-1.0.8 b/metadata/cache/media-libs/wxsvg-1.0.8
deleted file mode 100644
index 2fa626abcb48..000000000000
--- a/metadata/cache/media-libs/wxsvg-1.0.8
+++ /dev/null
@@ -1,22 +0,0 @@
-x11-libs/wxGTK:2.8[X] >=dev-libs/expat-2.0.1-r3 >=dev-libs/glib-2.12:2 >=dev-libs/libxml2-2.6.26 >=media-libs/fontconfig-2.4 >=media-libs/freetype-2.2.0 >=media-libs/libart_lgpl-2.3.17 virtual/ffmpeg >=x11-libs/pango-1.14.9 virtual/pkgconfig
-x11-libs/wxGTK:2.8[X] >=dev-libs/expat-2.0.1-r3 >=dev-libs/glib-2.12:2 >=dev-libs/libxml2-2.6.26 >=media-libs/fontconfig-2.4 >=media-libs/freetype-2.2.0 >=media-libs/libart_lgpl-2.3.17 virtual/ffmpeg >=x11-libs/pango-1.14.9
-0
-mirror://sourceforge/wxsvg/wxsvg-1.0.8.tar.bz2
-
-http://wxsvg.sourceforge.net/
-wxWinLL-3
-C++ library to create, manipulate and render SVG files.
-amd64 x86
-autotools autotools-utils eutils libtool multilib toolchain-funcs user wxwidgets
-static-libs
-
-
-
-3
-
-compile configure install prepare test
-
-
-
-
-
diff --git a/metadata/cache/media-sound/cmus-2.4.2 b/metadata/cache/media-sound/cmus-2.4.2
deleted file mode 100644
index 13698a4e7285..000000000000
--- a/metadata/cache/media-sound/cmus-2.4.2
+++ /dev/null
@@ -1,22 +0,0 @@
-sys-libs/ncurses[unicode?] aac? ( media-libs/faad2 ) alsa? ( >=media-libs/alsa-lib-1.0.11 ) ao? ( media-libs/libao ) flac? ( media-libs/flac ) mad? ( >=media-libs/libmad-0.14 ) mikmod? ( media-libs/libmikmod:0 ) modplug? ( >=media-libs/libmodplug-0.7 ) mp4? ( >=media-libs/libmp4v2-1.9 ) musepack? ( >=media-sound/musepack-tools-444 ) pulseaudio? ( media-sound/pulseaudio ) vorbis? ( >=media-libs/libvorbis-1.0 ) wavpack? ( media-sound/wavpack ) wma? ( virtual/ffmpeg ) virtual/pkgconfig
-sys-libs/ncurses[unicode?] aac? ( media-libs/faad2 ) alsa? ( >=media-libs/alsa-lib-1.0.11 ) ao? ( media-libs/libao ) flac? ( media-libs/flac ) mad? ( >=media-libs/libmad-0.14 ) mikmod? ( media-libs/libmikmod:0 ) modplug? ( >=media-libs/libmodplug-0.7 ) mp4? ( >=media-libs/libmp4v2-1.9 ) musepack? ( >=media-sound/musepack-tools-444 ) pulseaudio? ( media-sound/pulseaudio ) vorbis? ( >=media-libs/libvorbis-1.0 ) wavpack? ( media-sound/wavpack ) wma? ( virtual/ffmpeg ) zsh-completion? ( app-shells/zsh ) pidgin? ( net-im/pidgin dev-python/dbus-python )
-0
-mirror://sourceforge/cmus/cmus-v2.4.2.tar.bz2
-
-http://cmus.sourceforge.net/
-GPL-2
-A ncurses based music player with plugin support for many formats
-amd64 ~ppc x86 ~x86-fbsd
-eutils multilib toolchain-funcs user
-aac alsa ao debug examples flac mad mikmod modplug mp4 musepack oss pidgin pulseaudio unicode vorbis wavpack wma zsh-completion
-
-
-
-4
-
-configure install prepare
-
-
-
-
-
diff --git a/metadata/cache/media-sound/cmus-2.4.3 b/metadata/cache/media-sound/cmus-2.4.3
index 81e8688b8dd5..d199d83337e0 100644
--- a/metadata/cache/media-sound/cmus-2.4.3
+++ b/metadata/cache/media-sound/cmus-2.4.3
@@ -1,12 +1,12 @@
-sys-libs/ncurses[unicode?] aac? ( media-libs/faad2 ) alsa? ( >=media-libs/alsa-lib-1.0.11 ) ao? ( media-libs/libao ) flac? ( media-libs/flac ) mad? ( >=media-libs/libmad-0.14 ) mikmod? ( media-libs/libmikmod:0 ) modplug? ( >=media-libs/libmodplug-0.7 ) mp4? ( >=media-libs/libmp4v2-1.9 ) musepack? ( >=media-sound/musepack-tools-444 ) pulseaudio? ( media-sound/pulseaudio ) vorbis? ( >=media-libs/libvorbis-1.0 ) wavpack? ( media-sound/wavpack ) wma? ( virtual/ffmpeg ) virtual/pkgconfig
-sys-libs/ncurses[unicode?] aac? ( media-libs/faad2 ) alsa? ( >=media-libs/alsa-lib-1.0.11 ) ao? ( media-libs/libao ) flac? ( media-libs/flac ) mad? ( >=media-libs/libmad-0.14 ) mikmod? ( media-libs/libmikmod:0 ) modplug? ( >=media-libs/libmodplug-0.7 ) mp4? ( >=media-libs/libmp4v2-1.9 ) musepack? ( >=media-sound/musepack-tools-444 ) pulseaudio? ( media-sound/pulseaudio ) vorbis? ( >=media-libs/libvorbis-1.0 ) wavpack? ( media-sound/wavpack ) wma? ( virtual/ffmpeg ) zsh-completion? ( app-shells/zsh ) pidgin? ( net-im/pidgin dev-python/dbus-python )
+sys-libs/ncurses[unicode?] aac? ( media-libs/faad2 ) alsa? ( >=media-libs/alsa-lib-1.0.11 ) ao? ( media-libs/libao ) flac? ( media-libs/flac ) mad? ( >=media-libs/libmad-0.14 ) mikmod? ( media-libs/libmikmod:0 ) modplug? ( >=media-libs/libmodplug-0.7 ) mp4? ( >=media-libs/libmp4v2-1.9 ) musepack? ( >=media-sound/musepack-tools-444 ) pulseaudio? ( media-sound/pulseaudio ) vorbis? ( >=media-libs/libvorbis-1.0 ) wavpack? ( media-sound/wavpack ) wma? ( >=virtual/ffmpeg-0.10.2-r1 ) virtual/pkgconfig
+sys-libs/ncurses[unicode?] aac? ( media-libs/faad2 ) alsa? ( >=media-libs/alsa-lib-1.0.11 ) ao? ( media-libs/libao ) flac? ( media-libs/flac ) mad? ( >=media-libs/libmad-0.14 ) mikmod? ( media-libs/libmikmod:0 ) modplug? ( >=media-libs/libmodplug-0.7 ) mp4? ( >=media-libs/libmp4v2-1.9 ) musepack? ( >=media-sound/musepack-tools-444 ) pulseaudio? ( media-sound/pulseaudio ) vorbis? ( >=media-libs/libvorbis-1.0 ) wavpack? ( media-sound/wavpack ) wma? ( >=virtual/ffmpeg-0.10.2-r1 ) zsh-completion? ( app-shells/zsh ) pidgin? ( net-im/pidgin dev-python/dbus-python )
 0
 mirror://sourceforge/cmus/cmus-v2.4.3.tar.bz2
 
 http://cmus.sourceforge.net/
 GPL-2
 A ncurses based music player with plugin support for many formats
-~amd64 ~ppc ~x86 ~x86-fbsd
+amd64 ~ppc x86 ~x86-fbsd
 eutils multilib toolchain-funcs user
 aac alsa ao debug examples flac mad mikmod modplug mp4 musepack oss pidgin pulseaudio unicode vorbis wavpack wma zsh-completion
 
diff --git a/metadata/cache/media-sound/kradio-4.0.2 b/metadata/cache/media-sound/kradio-4.0.2
deleted file mode 100644
index 74ce5bc0d450..000000000000
--- a/metadata/cache/media-sound/kradio-4.0.2
+++ /dev/null
@@ -1,22 +0,0 @@
-media-libs/libsndfile alsa? ( media-libs/alsa-lib ) lirc? ( app-misc/lirc ) mp3? ( media-sound/lame ) vorbis? ( media-libs/libvorbis media-libs/libogg ) ffmpeg? ( >=media-libs/libmms-0.4 virtual/ffmpeg ) >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
-media-libs/libsndfile alsa? ( media-libs/alsa-lib ) lirc? ( app-misc/lirc ) mp3? ( media-sound/lame ) vorbis? ( media-libs/libvorbis media-libs/libogg ) ffmpeg? ( >=media-libs/libmms-0.4 virtual/ffmpeg ) >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_cs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_is? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_is(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) linguas_ru? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ru(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_uk(+)] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
-4
-mirror://sourceforge/kradio/kradio4-4.0.2.tar.bz2
-
-http://kradio.sourceforge.net/
-GPL-2
-kradio is a radio tuner application for KDE
-~amd64 ~x86
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib toolchain-funcs user versionator virtualx
-alsa debug encode ffmpeg lirc +mp3 +vorbis v4l linguas_cs linguas_de linguas_es linguas_is linguas_pl linguas_pt linguas_pt_BR linguas_ru linguas_uk aqua
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/media-sound/kradio-4.0.3 b/metadata/cache/media-sound/kradio-4.0.3
deleted file mode 100644
index bd1ae69a9153..000000000000
--- a/metadata/cache/media-sound/kradio-4.0.3
+++ /dev/null
@@ -1,22 +0,0 @@
-media-libs/libsndfile alsa? ( media-libs/alsa-lib ) lirc? ( app-misc/lirc ) mp3? ( media-sound/lame ) vorbis? ( media-libs/libvorbis media-libs/libogg ) ffmpeg? ( >=media-libs/libmms-0.4 virtual/ffmpeg ) >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
-media-libs/libsndfile alsa? ( media-libs/alsa-lib ) lirc? ( app-misc/lirc ) mp3? ( media-sound/lame ) vorbis? ( media-libs/libvorbis media-libs/libogg ) ffmpeg? ( >=media-libs/libmms-0.4 virtual/ffmpeg ) >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_cs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_is? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_is(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_it(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) linguas_ru? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ru(+)] ) linguas_tr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_tr(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_uk(+)] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
-4
-mirror://sourceforge/kradio/kradio4-4.0.3.tar.bz2
-
-http://kradio.sourceforge.net/
-GPL-2
-kradio is a radio tuner application for KDE
-~amd64 ~x86
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib toolchain-funcs user versionator virtualx
-alsa debug encode ffmpeg lirc +mp3 +vorbis v4l linguas_cs linguas_de linguas_es linguas_is linguas_it linguas_pl linguas_pt linguas_pt_BR linguas_ru linguas_tr linguas_uk aqua
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/media-sound/squeezeslave-1.1_p309 b/metadata/cache/media-sound/squeezeslave-1.1_p309
deleted file mode 100644
index e5e8d11c6b59..000000000000
--- a/metadata/cache/media-sound/squeezeslave-1.1_p309
+++ /dev/null
@@ -1,22 +0,0 @@
-media-libs/libmad media-libs/flac media-libs/libvorbis media-libs/libogg media-libs/portaudio[alsa?] aac? ( virtual/ffmpeg ) wma? ( virtual/ffmpeg ) display? ( app-misc/lirc ) app-arch/xz-utils virtual/pkgconfig
-media-libs/libmad media-libs/flac media-libs/libvorbis media-libs/libogg media-libs/portaudio[alsa?] aac? ( virtual/ffmpeg ) wma? ( virtual/ffmpeg ) display? ( app-misc/lirc )
-0
-http://dev.gentoo.org/~radhermit/distfiles/squeezeslave-1.1_p309.tar.xz
-
-http://squeezeslave.googlecode.com
-GPL-2
-A lightweight streaming audio player for squeezeboxserver
-~amd64 ~x86
-eutils multilib toolchain-funcs user
-aac +alsa display wma zones
-
-
-
-4
-
-install prepare
-
-
-
-
-
diff --git a/metadata/cache/media-sound/xwax-0.8 b/metadata/cache/media-sound/xwax-0.8
deleted file mode 100644
index 4b382195eefc..000000000000
--- a/metadata/cache/media-sound/xwax-0.8
+++ /dev/null
@@ -1,22 +0,0 @@
-media-libs/libsdl media-libs/sdl-ttf media-fonts/dejavu alsa? ( media-libs/alsa-lib ) jack? ( media-sound/jack-audio-connection-kit ) xwax_decoders_aac? ( media-libs/faad2 ) xwax_decoders_cd? ( media-sound/cdparanoia ) xwax_decoders_flac? ( media-libs/flac ) xwax_decoders_mp3? ( || ( media-sound/mpg123 media-sound/mpg321 ) ) xwax_decoders_ogg? ( media-sound/vorbis-tools ) xwax_decoders_misc? ( virtual/ffmpeg )
-media-libs/libsdl media-libs/sdl-ttf media-fonts/dejavu alsa? ( media-libs/alsa-lib ) jack? ( media-sound/jack-audio-connection-kit ) xwax_decoders_aac? ( media-libs/faad2 ) xwax_decoders_cd? ( media-sound/cdparanoia ) xwax_decoders_flac? ( media-libs/flac ) xwax_decoders_mp3? ( || ( media-sound/mpg123 media-sound/mpg321 ) ) xwax_decoders_ogg? ( media-sound/vorbis-tools ) xwax_decoders_misc? ( virtual/ffmpeg )
-0
-http://www.xwax.co.uk/releases/xwax-0.8.tar.gz
-
-http://www.xwax.co.uk/
-GPL-2
-Digital vinyl emulation software
-amd64 ppc ppc64 x86
-multilib toolchain-funcs
-alsa jack xwax_decoders_aac xwax_decoders_cd xwax_decoders_flac +xwax_decoders_mp3 xwax_decoders_ogg xwax_decoders_misc
-
-
-
-3
-
-compile configure install prepare
-
-
-
-
-
diff --git a/metadata/cache/media-sound/xwax-0.9 b/metadata/cache/media-sound/xwax-0.9
deleted file mode 100644
index faeed7001c2e..000000000000
--- a/metadata/cache/media-sound/xwax-0.9
+++ /dev/null
@@ -1,22 +0,0 @@
-media-libs/libsdl media-libs/sdl-ttf media-fonts/dejavu alsa? ( media-libs/alsa-lib ) jack? ( media-sound/jack-audio-connection-kit ) cdda? ( media-sound/cdparanoia ) mp3? ( || ( media-sound/mpg123 media-sound/mpg321 ) ) fallback? ( virtual/ffmpeg )
-media-libs/libsdl media-libs/sdl-ttf media-fonts/dejavu alsa? ( media-libs/alsa-lib ) jack? ( media-sound/jack-audio-connection-kit ) cdda? ( media-sound/cdparanoia ) mp3? ( || ( media-sound/mpg123 media-sound/mpg321 ) ) fallback? ( virtual/ffmpeg )
-0
-http://www.xwax.co.uk/releases/xwax-0.9.tar.gz
-
-http://www.xwax.co.uk/
-GPL-2
-Digital vinyl emulation software
-~amd64 ~ppc ~ppc64 ~x86
-multilib toolchain-funcs
-alsa jack oss cdda mp3 +fallback
-|| ( cdda mp3 fallback ) || ( alsa jack oss )
-
-
-4
-
-compile configure install prepare setup
-
-
-
-
-
diff --git a/metadata/cache/media-sound/xwax-1.1 b/metadata/cache/media-sound/xwax-1.1
deleted file mode 100644
index d1b6e0c980a7..000000000000
--- a/metadata/cache/media-sound/xwax-1.1
+++ /dev/null
@@ -1,22 +0,0 @@
-sys-libs/glibc media-libs/libsdl media-libs/sdl-ttf media-fonts/dejavu alsa? ( media-libs/alsa-lib ) jack? ( media-sound/jack-audio-connection-kit ) cdda? ( media-sound/cdparanoia ) mp3? ( || ( media-sound/mpg123 media-sound/mpg321 ) ) fallback? ( virtual/ffmpeg )
-sys-libs/glibc media-libs/libsdl media-libs/sdl-ttf media-fonts/dejavu alsa? ( media-libs/alsa-lib ) jack? ( media-sound/jack-audio-connection-kit ) cdda? ( media-sound/cdparanoia ) mp3? ( || ( media-sound/mpg123 media-sound/mpg321 ) ) fallback? ( virtual/ffmpeg )
-0
-http://www.xwax.co.uk/releases/xwax-1.1.tar.gz
-
-http://www.xwax.co.uk/
-GPL-2
-Digital vinyl emulation software
-~amd64 ~ppc ~ppc64 ~x86
-multilib toolchain-funcs
-alsa jack oss cdda mp3 +fallback
-|| ( cdda mp3 fallback ) || ( alsa jack oss )
-
-
-4
-
-compile configure install prepare
-
-
-
-
-
diff --git a/metadata/cache/media-video/cinelerra-20101104 b/metadata/cache/media-video/cinelerra-20101104
deleted file mode 100644
index c8587737e37a..000000000000
--- a/metadata/cache/media-video/cinelerra-20101104
+++ /dev/null
@@ -1,22 +0,0 @@
->=media-libs/libpng-1.4.0 >=media-libs/libdv-1.0.0 media-libs/faad2 media-libs/faac media-libs/a52dec media-libs/libsndfile media-libs/tiff virtual/ffmpeg media-sound/lame >=sci-libs/fftw-3.0.1 media-libs/x264 media-video/mjpegtools >=media-libs/freetype-2.1.10 >=media-libs/openexr-1.2.2 >=media-libs/libvorbis-1.2.3 >=media-libs/libogg-1.1.4 >=media-libs/libtheora-1.1.1 x11-libs/libX11 x11-libs/libXv x11-libs/libXxf86vm x11-libs/libXext x11-libs/libXvMC x11-libs/libXft virtual/jpeg alsa? ( media-libs/alsa-lib ) ieee1394? ( media-libs/libiec61883 >=sys-libs/libraw1394-1.2.0 >=sys-libs/libavc1394-0.5.0 ) opengl? ( virtual/opengl ) app-arch/xz-utils virtual/pkgconfig mmx? ( dev-lang/nasm ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
->=media-libs/libpng-1.4.0 >=media-libs/libdv-1.0.0 media-libs/faad2 media-libs/faac media-libs/a52dec media-libs/libsndfile media-libs/tiff virtual/ffmpeg media-sound/lame >=sci-libs/fftw-3.0.1 media-libs/x264 media-video/mjpegtools >=media-libs/freetype-2.1.10 >=media-libs/openexr-1.2.2 >=media-libs/libvorbis-1.2.3 >=media-libs/libogg-1.1.4 >=media-libs/libtheora-1.1.1 x11-libs/libX11 x11-libs/libXv x11-libs/libXxf86vm x11-libs/libXext x11-libs/libXvMC x11-libs/libXft virtual/jpeg alsa? ( media-libs/alsa-lib ) ieee1394? ( media-libs/libiec61883 >=sys-libs/libraw1394-1.2.0 >=sys-libs/libavc1394-0.5.0 ) opengl? ( virtual/opengl )
-0
-mirror://gentoo/cinelerra-20101104.tar.xz
-
-http://www.cinelerra.org/
-GPL-2
-Professional Video Editor (Unofficial GIT-snapshot)
-amd64 ~ppc x86
-autotools eutils flag-o-matic libtool multilib toolchain-funcs user
-3dnow alsa altivec css ieee1394 mmx opengl oss
-
-
-
-3
-
-configure install prepare
-
-
-
-
-
diff --git a/metadata/cache/media-video/dvd-slideshow-0.8.2.2 b/metadata/cache/media-video/dvd-slideshow-0.8.2.2
deleted file mode 100644
index 277f4a2bbad7..000000000000
--- a/metadata/cache/media-video/dvd-slideshow-0.8.2.2
+++ /dev/null
@@ -1,22 +0,0 @@
-
-media-sound/sox || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) media-video/mjpegtools >media-video/dvdauthor-0.6.11 virtual/cdrtools virtual/ffmpeg app-cdr/dvd+rw-tools mp3? ( media-sound/lame ) vorbis? ( media-libs/libvorbis ) sys-devel/bc media-gfx/jhead
-0
-mirror://sourceforge/dvd-slideshow/dvd-slideshow-0.8.2-2.tar.gz examples? ( mirror://sourceforge/dvd-slideshow/dvd-slideshow-examples-0.8.0-1.tar.gz ) themes? ( mirror://sourceforge/dvd-slideshow/dvd-slideshow-themes-0.8.0-1.tar.gz )
-
-http://dvd-slideshow.sourceforge.net/wiki/Main_Page
-GPL-2
-DVD Slideshow - Turn your pictures into a dvd with menus!
-amd64 ppc x86
-eutils multilib toolchain-funcs user versionator
-examples mp3 themes vorbis
-
-
-
-2
-
-install
-
-
-
-
-
diff --git a/metadata/cache/media-video/dvd-slideshow-0.8.4.1 b/metadata/cache/media-video/dvd-slideshow-0.8.4.2
similarity index 89%
rename from metadata/cache/media-video/dvd-slideshow-0.8.4.1
rename to metadata/cache/media-video/dvd-slideshow-0.8.4.2
index 048b785025ed..86d9305bea35 100644
--- a/metadata/cache/media-video/dvd-slideshow-0.8.4.1
+++ b/metadata/cache/media-video/dvd-slideshow-0.8.4.2
@@ -1,12 +1,12 @@
 
 media-sound/sox || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) media-video/mjpegtools >media-video/dvdauthor-0.6.11 virtual/cdrtools virtual/ffmpeg app-cdr/dvd+rw-tools mp3? ( media-sound/lame ) vorbis? ( media-libs/libvorbis ) sys-devel/bc media-gfx/jhead
 0
-mirror://sourceforge/dvd-slideshow/dvd-slideshow-0.8.4-1.tar.gz examples? ( mirror://sourceforge/dvd-slideshow/dvd-slideshow-examples-0.8.4-1.tar.gz ) themes? ( mirror://sourceforge/dvd-slideshow/dvd-slideshow-themes-0.8.4-1.tar.gz )
+mirror://sourceforge/dvd-slideshow/dvd-slideshow-0.8.4-2.tar.gz examples? ( mirror://sourceforge/dvd-slideshow/dvd-slideshow-examples-0.8.4-1.tar.gz ) themes? ( mirror://sourceforge/dvd-slideshow/dvd-slideshow-themes-0.8.4-1.tar.gz )
 
 http://dvd-slideshow.sourceforge.net/wiki/Main_Page
 GPL-2
 DVD Slideshow - Turn your pictures into a dvd with menus!
-~amd64 ~ppc ~x86
+amd64 ppc x86
 eutils multilib toolchain-funcs user versionator
 examples mp3 themes vorbis
 
diff --git a/metadata/cache/media-video/guvcview-1.4.2 b/metadata/cache/media-video/guvcview-1.4.2
deleted file mode 100644
index 9d1e05f29808..000000000000
--- a/metadata/cache/media-video/guvcview-1.4.2
+++ /dev/null
@@ -1,22 +0,0 @@
->=x11-libs/gtk+-2.14:2 >=dev-libs/glib-2.10:2 virtual/ffmpeg >=media-libs/libsdl-1.2.10 >=media-libs/portaudio-19_pre >=media-libs/libpng-1.4 media-libs/libv4l pulseaudio? ( >=media-sound/pulseaudio-0.9.15 ) virtual/pkgconfig sys-devel/gettext
->=x11-libs/gtk+-2.14:2 >=dev-libs/glib-2.10:2 virtual/ffmpeg >=media-libs/libsdl-1.2.10 >=media-libs/portaudio-19_pre >=media-libs/libpng-1.4 media-libs/libv4l pulseaudio? ( >=media-sound/pulseaudio-0.9.15 )
-0
-mirror://berlios/guvcview/guvcview-src-1.4.2.tar.gz
-
-http://guvcview.berlios.de
-GPL-3
-GTK+ UVC Viewer
-amd64 x86
-
-pulseaudio
-
-
-
-2
-
-configure install
-
-
-
-
-
diff --git a/metadata/cache/media-video/guvcview-1.5.0 b/metadata/cache/media-video/guvcview-1.5.0
deleted file mode 100644
index b819af899a0e..000000000000
--- a/metadata/cache/media-video/guvcview-1.5.0
+++ /dev/null
@@ -1,22 +0,0 @@
->=dev-libs/glib-2.10:2 virtual/ffmpeg >=media-libs/libsdl-1.2.10 >=media-libs/libpng-1.4 media-libs/libv4l >=media-libs/portaudio-19_pre sys-fs/udev >=x11-libs/gtk+-2.14:2 pulseaudio? ( >=media-sound/pulseaudio-0.9.15 ) virtual/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
->=dev-libs/glib-2.10:2 virtual/ffmpeg >=media-libs/libsdl-1.2.10 >=media-libs/libpng-1.4 media-libs/libv4l >=media-libs/portaudio-19_pre sys-fs/udev >=x11-libs/gtk+-2.14:2 pulseaudio? ( >=media-sound/pulseaudio-0.9.15 )
-0
-mirror://berlios/guvcview/guvcview-src-1.5.0.tar.gz
-
-http://guvcview.sourceforge.net/
-GPL-3
-GTK+ UVC Viewer
-~amd64 ~x86
-autotools eutils libtool multilib toolchain-funcs user
-pulseaudio
-
-
-
-4
-
-configure prepare
-
-
-
-
-
diff --git a/metadata/cache/media-video/guvcview-1.5.1 b/metadata/cache/media-video/guvcview-1.5.1
deleted file mode 100644
index d24eeba10104..000000000000
--- a/metadata/cache/media-video/guvcview-1.5.1
+++ /dev/null
@@ -1,22 +0,0 @@
->=dev-libs/glib-2.10:2 virtual/ffmpeg >=media-libs/libsdl-1.2.10 >=media-libs/libpng-1.4 media-libs/libv4l >=media-libs/portaudio-19_pre sys-fs/udev x11-libs/gtk+:3 pulseaudio? ( >=media-sound/pulseaudio-0.9.15 ) virtual/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
->=dev-libs/glib-2.10:2 virtual/ffmpeg >=media-libs/libsdl-1.2.10 >=media-libs/libpng-1.4 media-libs/libv4l >=media-libs/portaudio-19_pre sys-fs/udev x11-libs/gtk+:3 pulseaudio? ( >=media-sound/pulseaudio-0.9.15 )
-0
-mirror://sourceforge/guvcview/guvcview-src-1.5.1.tar.gz
-
-http://guvcview.sourceforge.net/
-GPL-3
-GTK+ UVC Viewer
-amd64 x86
-autotools eutils libtool multilib toolchain-funcs user
-pulseaudio
-
-
-
-4
-
-configure prepare
-
-
-
-
-
diff --git a/metadata/cache/media-video/guvcview-1.5.3 b/metadata/cache/media-video/guvcview-1.5.3
index 2127c3c1ab04..c04199e50908 100644
--- a/metadata/cache/media-video/guvcview-1.5.3
+++ b/metadata/cache/media-video/guvcview-1.5.3
@@ -6,7 +6,7 @@ mirror://sourceforge/guvcview/guvcview-src-1.5.3.tar.gz
 http://guvcview.sourceforge.net/
 GPL-3
 GTK+ UVC Viewer
-~amd64 ~x86
+amd64 x86
 autotools eutils libtool multilib toolchain-funcs user
 pulseaudio
 
diff --git a/metadata/cache/media-video/miro-4.0.1 b/metadata/cache/media-video/miro-4.0.1
deleted file mode 100644
index 593a064d943b..000000000000
--- a/metadata/cache/media-video/miro-4.0.1
+++ /dev/null
@@ -1,22 +0,0 @@
-dev-libs/glib:2 >=dev-python/pyrex-0.9.6.4 dev-python/pygtk:2 dev-python/pygobject:2 >=virtual/ffmpeg-0.6.90 >=sys-apps/sed-4 =dev-lang/python-2.7* =dev-lang/python-2.7*[sqlite]
-dev-libs/glib:2 >=dev-python/pyrex-0.9.6.4 dev-python/pygtk:2 dev-python/pygobject:2 >=virtual/ffmpeg-0.6.90 dev-python/dbus-python dev-python/pycairo dev-python/gconf-python dev-python/gst-python:0.10 >=dev-python/pywebkitgtk-1.1.5 dev-python/pycurl >=net-libs/rb_libtorrent-0.14.1[python] media-libs/mutagen media-plugins/gst-plugins-meta:0.10 media-plugins/gst-plugins-pango:0.10 aac? ( media-plugins/gst-plugins-faad:0.10 ) libnotify? ( dev-python/notify-python ) musepack? ( media-plugins/gst-plugins-musepack:0.10 ) xvid? ( media-plugins/gst-plugins-xvid:0.10 ) =dev-lang/python-2.7* =dev-lang/python-2.7*[sqlite]
-0
-http://ftp.osuosl.org/pub/pculture.org/miro/src/miro-4.0.1.tar.gz
-
-http://www.getmiro.com/
-GPL-2
-Open source video player and podcast client
-~amd64 ~ppc ~x86
-distutils eutils fdo-mime gnome2-utils multilib python toolchain-funcs user
-libnotify aac musepack xvid
-
-
-
-3
-
-compile install postinst postrm preinst prepare setup
-
-
-
-
-
diff --git a/metadata/cache/media-video/miro-4.0.1-r1 b/metadata/cache/media-video/miro-4.0.1-r1
deleted file mode 100644
index a5237d3993c4..000000000000
--- a/metadata/cache/media-video/miro-4.0.1-r1
+++ /dev/null
@@ -1,22 +0,0 @@
-dev-libs/glib:2 >=dev-python/pyrex-0.9.6.4 dev-python/pygtk:2 dev-python/pygobject:2 >=virtual/ffmpeg-0.6.90 >=sys-apps/sed-4 =dev-lang/python-2.7* =dev-lang/python-2.7*[sqlite]
-dev-libs/glib:2 >=dev-python/pyrex-0.9.6.4 dev-python/pygtk:2 dev-python/pygobject:2 >=virtual/ffmpeg-0.6.90 dev-python/dbus-python dev-python/pycairo dev-python/gconf-python dev-python/gst-python:0.10 dev-python/pyrex >=dev-python/pywebkitgtk-1.1.5 dev-python/pycurl >=net-libs/rb_libtorrent-0.14.1[python] media-libs/mutagen media-plugins/gst-plugins-meta:0.10 media-plugins/gst-plugins-pango:0.10 aac? ( media-plugins/gst-plugins-faad:0.10 ) libnotify? ( dev-python/notify-python ) musepack? ( media-plugins/gst-plugins-musepack:0.10 ) xvid? ( media-plugins/gst-plugins-xvid:0.10 ) =dev-lang/python-2.7* =dev-lang/python-2.7*[sqlite]
-0
-http://ftp.osuosl.org/pub/pculture.org/miro/src/miro-4.0.1.tar.gz
-
-http://www.getmiro.com/
-GPL-2
-Open source video player and podcast client
-~amd64 ~ppc ~x86
-distutils eutils fdo-mime gnome2-utils multilib python toolchain-funcs user
-libnotify aac musepack xvid
-
-
-
-3
-
-compile install postinst postrm preinst prepare setup
-
-
-
-
-
diff --git a/metadata/cache/net-misc/dhcp-4.2.3_p2 b/metadata/cache/net-misc/dhcp-4.2.3_p2
new file mode 100644
index 000000000000..8c33342453bb
--- /dev/null
+++ b/metadata/cache/net-misc/dhcp-4.2.3_p2
@@ -0,0 +1,22 @@
+selinux? ( sec-policy/selinux-dhcp ) client? ( kernel_linux? ( sys-apps/net-tools ) ) ldap? ( net-nds/openldap ssl? ( dev-libs/openssl ) )
+selinux? ( sec-policy/selinux-dhcp ) client? ( kernel_linux? ( sys-apps/net-tools ) ) ldap? ( net-nds/openldap ssl? ( dev-libs/openssl ) ) vim-syntax? ( app-vim/dhcpd-syntax )
+0
+ftp://ftp.isc.org/isc/dhcp/dhcp-4.2.3-P2.tar.gz ftp://ftp.isc.org/isc/dhcp/4.2.3-P2/dhcp-4.2.3-P2.tar.gz
+
+http://www.isc.org/products/DHCP
+as-is BSD
+ISC Dynamic Host Configuration Protocol (DHCP) client/server
+~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+eutils multilib toolchain-funcs user
++client ipv6 kernel_linux ldap selinux +server ssl vim-syntax
+
+
+
+4
+
+compile configure install postinst preinst prepare unpack
+
+
+
+
+
diff --git a/metadata/cache/sys-apps/baselayout-2.1-r1 b/metadata/cache/sys-apps/baselayout-2.1-r1
new file mode 100644
index 000000000000..d27e1f385ab5
--- /dev/null
+++ b/metadata/cache/sys-apps/baselayout-2.1-r1
@@ -0,0 +1,22 @@
+
+
+0
+mirror://gentoo/baselayout-2.1.tar.bz2 http://dev.gentoo.org/~vapier/dist/baselayout-2.1.tar.bz2
+
+http://www.gentoo.org/
+GPL-2
+Filesystem baselayout and init scripts
+~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+eutils multilib toolchain-funcs user
+build kernel_linux
+
+sys-apps/openrc
+
+
+
+install postinst preinst setup
+
+
+
+
+
diff --git a/metadata/cache/sys-apps/biosdevname-0.3.11-r1 b/metadata/cache/sys-apps/biosdevname-0.3.11-r1
index 1bfc16566ed3..8689332e3fb3 100644
--- a/metadata/cache/sys-apps/biosdevname-0.3.11-r1
+++ b/metadata/cache/sys-apps/biosdevname-0.3.11-r1
@@ -6,7 +6,7 @@ http://linux.dell.com/biosdevname/biosdevname-0.3.11/biosdevname-0.3.11.tar.gz
 http://linux.dell.com/biosdevname/
 GPL-2
 Sets BIOS-given device names instead of kernel eth* names
-amd64 x86
+~amd64 ~x86
 
 
 
diff --git a/metadata/cache/sys-apps/biosdevname-0.4.0 b/metadata/cache/sys-apps/biosdevname-0.4.0
new file mode 100644
index 000000000000..56261df53f08
--- /dev/null
+++ b/metadata/cache/sys-apps/biosdevname-0.4.0
@@ -0,0 +1,22 @@
+sys-fs/udev sys-apps/pciutils
+sys-fs/udev
+0
+http://linux.dell.com/biosdevname/biosdevname-0.4.0/biosdevname-0.4.0.tar.gz
+
+http://linux.dell.com/biosdevname/
+GPL-2
+Sets BIOS-given device names instead of kernel eth* names
+~amd64 ~x86
+
+
+
+
+
+4
+
+postinst prepare
+
+
+
+
+
diff --git a/metadata/cache/virtual/init-0 b/metadata/cache/virtual/init-0
index a23a9d21aadd..16ae7af01e9e 100644
--- a/metadata/cache/virtual/init-0
+++ b/metadata/cache/virtual/init-0
@@ -1,5 +1,5 @@
 
-kernel_linux? ( || ( >=sys-apps/sysvinit-2.86-r6 sys-process/runit ) ) kernel_FreeBSD? ( sys-freebsd/freebsd-sbin )
+!prefix? ( kernel_linux? ( || ( >=sys-apps/sysvinit-2.86-r6 sys-process/runit ) ) kernel_FreeBSD? ( sys-freebsd/freebsd-sbin ) )
 0
 
 
diff --git a/metadata/cache/x11-misc/see-0.6 b/metadata/cache/x11-misc/seetxt-0.6
similarity index 100%
rename from metadata/cache/x11-misc/see-0.6
rename to metadata/cache/x11-misc/seetxt-0.6
diff --git a/metadata/cache/x11-misc/seetxt-0.72 b/metadata/cache/x11-misc/seetxt-0.72
new file mode 100644
index 000000000000..6d488f713a7c
--- /dev/null
+++ b/metadata/cache/x11-misc/seetxt-0.72
@@ -0,0 +1,22 @@
+x11-libs/gtk+:2 virtual/pkgconfig
+x11-libs/gtk+:2
+0
+http://seetxt.googlecode.com/files/seetxt-0.72.tar.bz2
+
+http://code.google.com/p/seetxt/ http://seetxt.sourceforge.net/
+GPL-3
+Clever, lightweight GUI text file and manual page viewer for X windows.
+~amd64
+
+
+
+
+
+4
+
+-
+
+
+
+
+
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index fa0606674ac1..5c3bf2dea309 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Wed, 16 May 2012 04:37:31 +0000
+Wed, 16 May 2012 09:37:26 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index a043e4bfd4f3..5c3bf2dea309 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Wed, 16 May 2012 04:37:32 +0000
+Wed, 16 May 2012 09:37:26 +0000
diff --git a/metadata/md5-cache/app-cdr/k9copy-2.3.7 b/metadata/md5-cache/app-cdr/k9copy-2.3.7
deleted file mode 100644
index 6bec8057dea1..000000000000
--- a/metadata/md5-cache/app-cdr/k9copy-2.3.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=media-libs/libdvdread >=media-libs/libmpeg2-0.5.1 media-libs/xine-lib virtual/ffmpeg >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
-DESCRIPTION=k9copy is a DVD backup utility which allows the copy of one or more titles from a DVD9 to a DVD5.
-EAPI=3
-HOMEPAGE=http://k9copy.sourceforge.net/
-IUSE=debug linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_es_AR linguas_es linguas_fr linguas_it linguas_ja linguas_nl linguas_pl linguas_pt_BR linguas_ru linguas_sr@Latn linguas_sr linguas_tr linguas_zh_TW +handbook aqua
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=media-libs/libdvdread >=media-libs/libmpeg2-0.5.1 media-libs/xine-lib virtual/ffmpeg media-video/dvdauthor media-video/mplayer >=kde-base/oxygen-icons-4.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
-SLOT=4
-SRC_URI=mirror://sourceforge/k9copy/k9copy-2.3.7-Source.tar.gz
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	gnome2-utils	dfd98be073cc8193fc79925566741ab0	kde4-base	a5866abff73618fd21d222141d24401d	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
-_md5_=ff900eda6a1b5dac4e6ea738c6ee405a
diff --git a/metadata/md5-cache/app-cdr/k9copy-2.3.8 b/metadata/md5-cache/app-cdr/k9copy-2.3.8
index b61e3d55beb9..d69e1d573e64 100644
--- a/metadata/md5-cache/app-cdr/k9copy-2.3.8
+++ b/metadata/md5-cache/app-cdr/k9copy-2.3.8
@@ -4,10 +4,10 @@ DESCRIPTION=k9copy is a DVD backup utility which allows the copy of one or more
 EAPI=4
 HOMEPAGE=http://k9copy.sourceforge.net/
 IUSE=debug mplayer linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_es linguas_es_AR linguas_fr linguas_it linguas_ja linguas_nl linguas_pl linguas_pt_BR linguas_ru linguas_sr linguas_sr@Latn linguas_tr linguas_uk linguas_zh_TW +handbook aqua
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=media-libs/libdvdread media-libs/libmpeg2 media-libs/xine-lib virtual/ffmpeg media-video/dvdauthor mplayer? ( media-video/mplayer ) >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_ca? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca(+)] ) linguas_cs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_el? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_el(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_es_AR? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es_AR(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fr(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_it(+)] ) linguas_ja? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ja(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nl(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pl(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) linguas_ru? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ru(+)] ) linguas_sr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr(+)] ) linguas_sr@Latn? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr@Latn(+)] ) linguas_tr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_tr(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_uk(+)] ) linguas_zh_TW? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_TW(+)] ) handbook? ( >=kde-base/kdelibs-4.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://sourceforge/k9copy/k9copy-2.3.8-Source.tar.gz
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	gnome2-utils	dfd98be073cc8193fc79925566741ab0	kde4-base	a5866abff73618fd21d222141d24401d	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
-_md5_=44a4cfc075380da05578d3e7eb242367
+_md5_=1585caabaf825a6226ca03100bf868ba
diff --git a/metadata/md5-cache/app-text/hyperestraier-1.4.10-r1 b/metadata/md5-cache/app-text/hyperestraier-1.4.10-r1
index 528ec8a33852..75f0055b2a52 100644
--- a/metadata/md5-cache/app-text/hyperestraier-1.4.10-r1
+++ b/metadata/md5-cache/app-text/hyperestraier-1.4.10-r1
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile install preinst setup test unpack
 DEPEND=>=dev-db/qdbm-1.8.75 sys-libs/zlib java? ( >=virtual/jre-1.4 ) mecab? ( app-text/mecab ) ruby? ( dev-lang/ruby ) java? ( >=virtual/jdk-1.4 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 DESCRIPTION=a full-text search system for communities
-HOMEPAGE=http://hyperestraier.sf.net/
+HOMEPAGE=http://fallabs.com/hyperestraier/
 IUSE=debug java mecab ruby elibc_FreeBSD java
 KEYWORDS=amd64 ppc sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-db/qdbm-1.8.75 sys-libs/zlib java? ( >=virtual/jre-1.4 ) mecab? ( app-text/mecab ) ruby? ( dev-lang/ruby ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
-SRC_URI=mirror://sourceforge/hyperestraier/hyperestraier-1.4.10.tar.gz
+SRC_URI=http://fallabs.com/hyperestraier/hyperestraier-1.4.10.tar.gz
 _eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=f27d26e3aafc87672d2f92dd3e8cbce5
+_md5_=21302a78cde6c59d3e4981bf0004eefd
diff --git a/metadata/md5-cache/app-text/hyperestraier-1.4.13 b/metadata/md5-cache/app-text/hyperestraier-1.4.13
index ff056cacea70..c17f73395970 100644
--- a/metadata/md5-cache/app-text/hyperestraier-1.4.13
+++ b/metadata/md5-cache/app-text/hyperestraier-1.4.13
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile install preinst setup test unpack
 DEPEND=>=dev-db/qdbm-1.8.75 sys-libs/zlib java? ( >=virtual/jre-1.4 ) mecab? ( app-text/mecab ) ruby? ( dev-lang/ruby ) java? ( >=virtual/jdk-1.4 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 DESCRIPTION=a full-text search system for communities
-HOMEPAGE=http://hyperestraier.sf.net/
+HOMEPAGE=http://fallabs.com/hyperestraier/
 IUSE=debug java mecab ruby elibc_FreeBSD java
 KEYWORDS=alpha ~amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-db/qdbm-1.8.75 sys-libs/zlib java? ( >=virtual/jre-1.4 ) mecab? ( app-text/mecab ) ruby? ( dev-lang/ruby ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
-SRC_URI=mirror://sourceforge/hyperestraier/hyperestraier-1.4.13.tar.gz
+SRC_URI=http://fallabs.com/hyperestraier/hyperestraier-1.4.13.tar.gz
 _eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=70b3f1540b67de3fd502658fd7d05907
+_md5_=c4fb13cd85234ec01a7efed9557a83d9
diff --git a/metadata/md5-cache/app-text/xdvik-22.85-r1 b/metadata/md5-cache/app-text/xdvik-22.85-r1
new file mode 100644
index 000000000000..a9d0e97d29f2
--- /dev/null
+++ b/metadata/md5-cache/app-text/xdvik-22.85-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare
+DEPEND=sys-devel/flex virtual/yacc >=media-libs/t1lib-5.0.2 x11-libs/libXmu x11-libs/libXp x11-libs/libXpm motif? ( >=x11-libs/openmotif-2.3:0 ) neXt? ( x11-libs/neXtaw ) Xaw3d? ( x11-libs/libXaw3d ) Xaw? ( x11-libs/libXaw ) dev-libs/kpathsea
+DESCRIPTION=DVI previewer for X Window System
+EAPI=4
+HOMEPAGE=http://xdvi.sourceforge.net/
+IUSE=motif neXt Xaw Xaw3d emacs
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=>=media-libs/t1lib-5.0.2 x11-libs/libXmu x11-libs/libXp x11-libs/libXpm motif? ( >=x11-libs/openmotif-2.3:0 ) neXt? ( x11-libs/neXtaw ) Xaw3d? ( x11-libs/libXaw3d ) Xaw? ( x11-libs/libXaw ) dev-libs/kpathsea virtual/latex-base !<app-text/texlive-2007
+REQUIRED_USE=^^ ( motif neXt Xaw Xaw3d )
+SLOT=0
+SRC_URI=mirror://sourceforge/xdvi/xdvik-22.85.tar.gz
+_eclasses_=elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
+_md5_=70fd882c6d60b5b91265f449d890a611
diff --git a/metadata/md5-cache/dev-libs/expat-2.1.0-r2 b/metadata/md5-cache/dev-libs/expat-2.1.0-r2
new file mode 100644
index 000000000000..a49c5a2cf344
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/expat-2.1.0-r2
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install prepare
+DESCRIPTION=XML parsing libraries
+EAPI=4
+HOMEPAGE=http://expat.sourceforge.net/
+IUSE=elibc_FreeBSD examples static-libs unicode
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+LICENSE=MIT
+SLOT=0
+SRC_URI=mirror://sourceforge/expat/expat-2.1.0.tar.gz
+_eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
+_md5_=0a1dd68717819c7b4d1e08af45f53a69
diff --git a/metadata/md5-cache/dev-tcltk/tix-8.4.3 b/metadata/md5-cache/dev-tcltk/tix-8.4.3
index 544b57d3b312..b8283bf9afac 100644
--- a/metadata/md5-cache/dev-tcltk/tix-8.4.3
+++ b/metadata/md5-cache/dev-tcltk/tix-8.4.3
@@ -3,11 +3,11 @@ DEPEND=dev-lang/tk sys-apps/sed x11-libs/libX11 x11-libs/libXau x11-libs/libXdmc
 DESCRIPTION=A widget library for Tcl/Tk
 EAPI=2
 HOMEPAGE=http://tix.sourceforge.net/
-KEYWORDS=amd64 ~hppa ~ppc sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~hppa ~ppc sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-lang/tk sys-apps/sed x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/tix/Tix8.4.3-src.tar.gz
 _eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=1b9ec4c674544a5980c571345cbde66c
+_md5_=4550c433e7cf8dd883757ffec46086cd
diff --git a/metadata/md5-cache/media-gfx/album-4.07 b/metadata/md5-cache/media-gfx/album-4.07
index ed787c6497a0..af74a88ac1f5 100644
--- a/metadata/md5-cache/media-gfx/album-4.07
+++ b/metadata/md5-cache/media-gfx/album-4.07
@@ -3,9 +3,9 @@ DESCRIPTION=HTML photo album generator
 EAPI=4
 HOMEPAGE=http://MarginalHacks.com/Hacks/album/
 IUSE=doc ffmpeg plugins themes
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=~alpha amd64 ~ppc ~ppc64 x86
 LICENSE=marginalhacks
 RDEPEND=dev-lang/perl media-gfx/imagemagick media-gfx/jhead ffmpeg? ( virtual/ffmpeg )
 SLOT=0
 SRC_URI=http://marginalhacks.com/bin/album.versions/album-4.07.tar.gz http://marginalhacks.com/bin/album.versions/data-4.05.tar.gz
-_md5_=fede673cb1f09f6deca8ae6d2b0996bb
+_md5_=5d2113100c7c3a4c40b475e8fc1e2d59
diff --git a/metadata/md5-cache/media-libs/mlt-0.5.10 b/metadata/md5-cache/media-libs/mlt-0.5.10
deleted file mode 100644
index c287d4fc7dcb..000000000000
--- a/metadata/md5-cache/media-libs/mlt-0.5.10
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm prepare setup
-DEPEND=ffmpeg? ( virtual/ffmpeg[vdpau?] ) dv? ( >=media-libs/libdv-0.104 ) xml? ( >=dev-libs/libxml2-2.5 ) vorbis? ( >=media-libs/libvorbis-1.1.2 ) sdl? ( >=media-libs/libsdl-1.2.10 >=media-libs/sdl-image-1.2.4 ) libsamplerate? ( >=media-libs/libsamplerate-0.1.2 ) jack? ( media-sound/jack-audio-connection-kit media-libs/ladspa-sdk >=dev-libs/libxml2-2.5 ) frei0r? ( media-plugins/frei0r-plugins ) gtk? ( x11-libs/gtk+:2 x11-libs/pango ) quicktime? ( media-libs/libquicktime ) xine? ( >=media-libs/xine-lib-1.1.2_pre20060328-r7 ) qt4? ( x11-libs/qt-gui:4 ) !media-libs/mlt++ lua? ( >=dev-lang/lua-5.1.4-r4 ) ruby? ( dev-lang/ruby ) virtual/pkgconfig compressed-lumas? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) ) lua? ( >=dev-lang/swig-1.3.38 virtual/pkgconfig ) python? ( >=dev-lang/swig-1.3.38 ) ruby? ( >=dev-lang/swig-1.3.38 ) python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) )
-DESCRIPTION=An open source multimedia framework, designed and developed for television broadcasting
-EAPI=3
-HOMEPAGE=http://www.mltframework.org/
-IUSE=compressed-lumas dv debug ffmpeg frei0r gtk jack kde libsamplerate melt mmx qt4 quicktime sdl sse sse2 vorbis xine xml lua python ruby vdpau
-KEYWORDS=amd64 ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=ffmpeg? ( virtual/ffmpeg[vdpau?] ) dv? ( >=media-libs/libdv-0.104 ) xml? ( >=dev-libs/libxml2-2.5 ) vorbis? ( >=media-libs/libvorbis-1.1.2 ) sdl? ( >=media-libs/libsdl-1.2.10 >=media-libs/sdl-image-1.2.4 ) libsamplerate? ( >=media-libs/libsamplerate-0.1.2 ) jack? ( media-sound/jack-audio-connection-kit media-libs/ladspa-sdk >=dev-libs/libxml2-2.5 ) frei0r? ( media-plugins/frei0r-plugins ) gtk? ( x11-libs/gtk+:2 x11-libs/pango ) quicktime? ( media-libs/libquicktime ) xine? ( >=media-libs/xine-lib-1.1.2_pre20060328-r7 ) qt4? ( x11-libs/qt-gui:4 ) !media-libs/mlt++ lua? ( >=dev-lang/lua-5.1.4-r4 ) ruby? ( dev-lang/ruby ) python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) )
-SLOT=0
-SRC_URI=mirror://sourceforge/mlt/mlt-0.5.10.tar.gz
-_eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=ffc1aad666eeabe8ac6c509ba4cb6c89
diff --git a/metadata/md5-cache/media-libs/mlt-0.7.6-r1 b/metadata/md5-cache/media-libs/mlt-0.7.6-r1
deleted file mode 100644
index 4e4b19081c00..000000000000
--- a/metadata/md5-cache/media-libs/mlt-0.7.6-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm prepare setup
-DEPEND=ffmpeg? ( virtual/ffmpeg[vdpau?] ) dv? ( >=media-libs/libdv-0.104 ) xml? ( >=dev-libs/libxml2-2.5 ) vorbis? ( >=media-libs/libvorbis-1.1.2 ) sdl? ( >=media-libs/libsdl-1.2.10 >=media-libs/sdl-image-1.2.4 ) libsamplerate? ( >=media-libs/libsamplerate-0.1.2 ) jack? ( media-sound/jack-audio-connection-kit media-libs/ladspa-sdk >=dev-libs/libxml2-2.5 ) frei0r? ( media-plugins/frei0r-plugins ) gtk? ( x11-libs/gtk+:2 media-libs/libexif x11-libs/pango ) quicktime? ( media-libs/libquicktime ) swfdec? ( media-libs/swfdec ) xine? ( >=media-libs/xine-lib-1.1.2_pre20060328-r7 ) qt4? ( x11-libs/qt-gui:4 x11-libs/qt-svg:4 media-libs/libexif ) !media-libs/mlt++ lua? ( >=dev-lang/lua-5.1.4-r4 ) ruby? ( dev-lang/ruby ) virtual/pkgconfig compressed-lumas? ( || ( media-gfx/imagemagick[png] media-gfx/graphicsmagick[imagemagick,png] ) ) lua? ( >=dev-lang/swig-2.0 virtual/pkgconfig ) python? ( >=dev-lang/swig-2.0 ) ruby? ( >=dev-lang/swig-2.0 ) python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) )
-DESCRIPTION=An open source multimedia framework, designed and developed for television broadcasting
-EAPI=4
-HOMEPAGE=http://www.mltframework.org/
-IUSE=compressed-lumas dv debug ffmpeg frei0r gtk jack kde libsamplerate melt mmx qt4 quicktime sdl sse sse2 swfdec vorbis xine xml lua python ruby vdpau
-KEYWORDS=amd64 ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=ffmpeg? ( virtual/ffmpeg[vdpau?] ) dv? ( >=media-libs/libdv-0.104 ) xml? ( >=dev-libs/libxml2-2.5 ) vorbis? ( >=media-libs/libvorbis-1.1.2 ) sdl? ( >=media-libs/libsdl-1.2.10 >=media-libs/sdl-image-1.2.4 ) libsamplerate? ( >=media-libs/libsamplerate-0.1.2 ) jack? ( media-sound/jack-audio-connection-kit media-libs/ladspa-sdk >=dev-libs/libxml2-2.5 ) frei0r? ( media-plugins/frei0r-plugins ) gtk? ( x11-libs/gtk+:2 media-libs/libexif x11-libs/pango ) quicktime? ( media-libs/libquicktime ) swfdec? ( media-libs/swfdec ) xine? ( >=media-libs/xine-lib-1.1.2_pre20060328-r7 ) qt4? ( x11-libs/qt-gui:4 x11-libs/qt-svg:4 media-libs/libexif ) !media-libs/mlt++ lua? ( >=dev-lang/lua-5.1.4-r4 ) ruby? ( dev-lang/ruby ) python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) )
-SLOT=0
-SRC_URI=mirror://sourceforge/mlt/mlt-0.7.6.tar.gz
-_eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=7edbbe27109d93032b99f6281593be37
diff --git a/metadata/md5-cache/media-libs/mlt-0.7.8 b/metadata/md5-cache/media-libs/mlt-0.7.8
index 491e6bfa8f47..b5ba14974f82 100644
--- a/metadata/md5-cache/media-libs/mlt-0.7.8
+++ b/metadata/md5-cache/media-libs/mlt-0.7.8
@@ -4,10 +4,10 @@ DESCRIPTION=An open source multimedia framework, designed and developed for tele
 EAPI=4
 HOMEPAGE=http://www.mltframework.org/
 IUSE=compressed-lumas dv debug ffmpeg frei0r gtk jack kde libsamplerate melt mmx qt4 quicktime rtaudio sdl sse sse2 swfdec vorbis xine xml lua python ruby vdpau kernel_linux
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=ffmpeg? ( virtual/ffmpeg[vdpau?] ) dv? ( >=media-libs/libdv-0.104 ) xml? ( >=dev-libs/libxml2-2.5 ) vorbis? ( >=media-libs/libvorbis-1.1.2 ) sdl? ( >=media-libs/libsdl-1.2.10 >=media-libs/sdl-image-1.2.4 ) libsamplerate? ( >=media-libs/libsamplerate-0.1.2 ) jack? ( media-sound/jack-audio-connection-kit media-libs/ladspa-sdk >=dev-libs/libxml2-2.5 ) frei0r? ( media-plugins/frei0r-plugins ) gtk? ( x11-libs/gtk+:2 media-libs/libexif x11-libs/pango ) quicktime? ( media-libs/libquicktime ) rtaudio? ( kernel_linux? ( media-libs/alsa-lib ) ) swfdec? ( media-libs/swfdec ) xine? ( >=media-libs/xine-lib-1.1.2_pre20060328-r7 ) qt4? ( x11-libs/qt-gui:4 x11-libs/qt-svg:4 media-libs/libexif ) !media-libs/mlt++ lua? ( >=dev-lang/lua-5.1.4-r4 ) ruby? ( dev-lang/ruby ) python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/mlt/mlt-0.7.8.tar.gz
 _eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=20f4bc7b45b4dddb1ebbfbb927192d70
+_md5_=91989630b076ea6a00150295302c427d
diff --git a/metadata/md5-cache/media-libs/wxsvg-1.0.8 b/metadata/md5-cache/media-libs/wxsvg-1.0.8
deleted file mode 100644
index 7e7bda149a2c..000000000000
--- a/metadata/md5-cache/media-libs/wxsvg-1.0.8
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=x11-libs/wxGTK:2.8[X] >=dev-libs/expat-2.0.1-r3 >=dev-libs/glib-2.12:2 >=dev-libs/libxml2-2.6.26 >=media-libs/fontconfig-2.4 >=media-libs/freetype-2.2.0 >=media-libs/libart_lgpl-2.3.17 virtual/ffmpeg >=x11-libs/pango-1.14.9 virtual/pkgconfig
-DESCRIPTION=C++ library to create, manipulate and render SVG files.
-EAPI=3
-HOMEPAGE=http://wxsvg.sourceforge.net/
-IUSE=static-libs
-KEYWORDS=amd64 x86
-LICENSE=wxWinLL-3
-RDEPEND=x11-libs/wxGTK:2.8[X] >=dev-libs/expat-2.0.1-r3 >=dev-libs/glib-2.12:2 >=dev-libs/libxml2-2.6.26 >=media-libs/fontconfig-2.4 >=media-libs/freetype-2.2.0 >=media-libs/libart_lgpl-2.3.17 virtual/ffmpeg >=x11-libs/pango-1.14.9
-SLOT=0
-SRC_URI=mirror://sourceforge/wxsvg/wxsvg-1.0.8.tar.bz2
-_eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	748973db029ba52a1991320e1034bad9	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	wxwidgets	fb1a306837717dfa2af841ecdf929565
-_md5_=93d22f224431d5224e6e2933199d6ee7
diff --git a/metadata/md5-cache/media-sound/cmus-2.4.2 b/metadata/md5-cache/media-sound/cmus-2.4.2
deleted file mode 100644
index 9692126b359c..000000000000
--- a/metadata/md5-cache/media-sound/cmus-2.4.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=sys-libs/ncurses[unicode?] aac? ( media-libs/faad2 ) alsa? ( >=media-libs/alsa-lib-1.0.11 ) ao? ( media-libs/libao ) flac? ( media-libs/flac ) mad? ( >=media-libs/libmad-0.14 ) mikmod? ( media-libs/libmikmod:0 ) modplug? ( >=media-libs/libmodplug-0.7 ) mp4? ( >=media-libs/libmp4v2-1.9 ) musepack? ( >=media-sound/musepack-tools-444 ) pulseaudio? ( media-sound/pulseaudio ) vorbis? ( >=media-libs/libvorbis-1.0 ) wavpack? ( media-sound/wavpack ) wma? ( virtual/ffmpeg ) virtual/pkgconfig
-DESCRIPTION=A ncurses based music player with plugin support for many formats
-EAPI=4
-HOMEPAGE=http://cmus.sourceforge.net/
-IUSE=aac alsa ao debug examples flac mad mikmod modplug mp4 musepack oss pidgin pulseaudio unicode vorbis wavpack wma zsh-completion
-KEYWORDS=amd64 ~ppc x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=sys-libs/ncurses[unicode?] aac? ( media-libs/faad2 ) alsa? ( >=media-libs/alsa-lib-1.0.11 ) ao? ( media-libs/libao ) flac? ( media-libs/flac ) mad? ( >=media-libs/libmad-0.14 ) mikmod? ( media-libs/libmikmod:0 ) modplug? ( >=media-libs/libmodplug-0.7 ) mp4? ( >=media-libs/libmp4v2-1.9 ) musepack? ( >=media-sound/musepack-tools-444 ) pulseaudio? ( media-sound/pulseaudio ) vorbis? ( >=media-libs/libvorbis-1.0 ) wavpack? ( media-sound/wavpack ) wma? ( virtual/ffmpeg ) zsh-completion? ( app-shells/zsh ) pidgin? ( net-im/pidgin dev-python/dbus-python )
-SLOT=0
-SRC_URI=mirror://sourceforge/cmus/cmus-v2.4.2.tar.bz2
-_eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=1c11eac93cc0c7a510aeb9fb94256f67
diff --git a/metadata/md5-cache/media-sound/cmus-2.4.3 b/metadata/md5-cache/media-sound/cmus-2.4.3
index f3ed9592a9c3..261195d6e3f5 100644
--- a/metadata/md5-cache/media-sound/cmus-2.4.3
+++ b/metadata/md5-cache/media-sound/cmus-2.4.3
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure install
-DEPEND=sys-libs/ncurses[unicode?] aac? ( media-libs/faad2 ) alsa? ( >=media-libs/alsa-lib-1.0.11 ) ao? ( media-libs/libao ) flac? ( media-libs/flac ) mad? ( >=media-libs/libmad-0.14 ) mikmod? ( media-libs/libmikmod:0 ) modplug? ( >=media-libs/libmodplug-0.7 ) mp4? ( >=media-libs/libmp4v2-1.9 ) musepack? ( >=media-sound/musepack-tools-444 ) pulseaudio? ( media-sound/pulseaudio ) vorbis? ( >=media-libs/libvorbis-1.0 ) wavpack? ( media-sound/wavpack ) wma? ( virtual/ffmpeg ) virtual/pkgconfig
+DEPEND=sys-libs/ncurses[unicode?] aac? ( media-libs/faad2 ) alsa? ( >=media-libs/alsa-lib-1.0.11 ) ao? ( media-libs/libao ) flac? ( media-libs/flac ) mad? ( >=media-libs/libmad-0.14 ) mikmod? ( media-libs/libmikmod:0 ) modplug? ( >=media-libs/libmodplug-0.7 ) mp4? ( >=media-libs/libmp4v2-1.9 ) musepack? ( >=media-sound/musepack-tools-444 ) pulseaudio? ( media-sound/pulseaudio ) vorbis? ( >=media-libs/libvorbis-1.0 ) wavpack? ( media-sound/wavpack ) wma? ( >=virtual/ffmpeg-0.10.2-r1 ) virtual/pkgconfig
 DESCRIPTION=A ncurses based music player with plugin support for many formats
 EAPI=4
 HOMEPAGE=http://cmus.sourceforge.net/
 IUSE=aac alsa ao debug examples flac mad mikmod modplug mp4 musepack oss pidgin pulseaudio unicode vorbis wavpack wma zsh-completion
-KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+KEYWORDS=amd64 ~ppc x86 ~x86-fbsd
 LICENSE=GPL-2
-RDEPEND=sys-libs/ncurses[unicode?] aac? ( media-libs/faad2 ) alsa? ( >=media-libs/alsa-lib-1.0.11 ) ao? ( media-libs/libao ) flac? ( media-libs/flac ) mad? ( >=media-libs/libmad-0.14 ) mikmod? ( media-libs/libmikmod:0 ) modplug? ( >=media-libs/libmodplug-0.7 ) mp4? ( >=media-libs/libmp4v2-1.9 ) musepack? ( >=media-sound/musepack-tools-444 ) pulseaudio? ( media-sound/pulseaudio ) vorbis? ( >=media-libs/libvorbis-1.0 ) wavpack? ( media-sound/wavpack ) wma? ( virtual/ffmpeg ) zsh-completion? ( app-shells/zsh ) pidgin? ( net-im/pidgin dev-python/dbus-python )
+RDEPEND=sys-libs/ncurses[unicode?] aac? ( media-libs/faad2 ) alsa? ( >=media-libs/alsa-lib-1.0.11 ) ao? ( media-libs/libao ) flac? ( media-libs/flac ) mad? ( >=media-libs/libmad-0.14 ) mikmod? ( media-libs/libmikmod:0 ) modplug? ( >=media-libs/libmodplug-0.7 ) mp4? ( >=media-libs/libmp4v2-1.9 ) musepack? ( >=media-sound/musepack-tools-444 ) pulseaudio? ( media-sound/pulseaudio ) vorbis? ( >=media-libs/libvorbis-1.0 ) wavpack? ( media-sound/wavpack ) wma? ( >=virtual/ffmpeg-0.10.2-r1 ) zsh-completion? ( app-shells/zsh ) pidgin? ( net-im/pidgin dev-python/dbus-python )
 SLOT=0
 SRC_URI=mirror://sourceforge/cmus/cmus-v2.4.3.tar.bz2
 _eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=730ae5a0b1cb47d618564b15a3eb8baf
+_md5_=534b842976f86207f5ff7933974db824
diff --git a/metadata/md5-cache/media-sound/kradio-4.0.2 b/metadata/md5-cache/media-sound/kradio-4.0.2
deleted file mode 100644
index 88ae6c5ad3b0..000000000000
--- a/metadata/md5-cache/media-sound/kradio-4.0.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=media-libs/libsndfile alsa? ( media-libs/alsa-lib ) lirc? ( app-misc/lirc ) mp3? ( media-sound/lame ) vorbis? ( media-libs/libvorbis media-libs/libogg ) ffmpeg? ( >=media-libs/libmms-0.4 virtual/ffmpeg ) >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
-DESCRIPTION=kradio is a radio tuner application for KDE
-EAPI=4
-HOMEPAGE=http://kradio.sourceforge.net/
-IUSE=alsa debug encode ffmpeg lirc +mp3 +vorbis v4l linguas_cs linguas_de linguas_es linguas_is linguas_pl linguas_pt linguas_pt_BR linguas_ru linguas_uk aqua
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=media-libs/libsndfile alsa? ( media-libs/alsa-lib ) lirc? ( app-misc/lirc ) mp3? ( media-sound/lame ) vorbis? ( media-libs/libvorbis media-libs/libogg ) ffmpeg? ( >=media-libs/libmms-0.4 virtual/ffmpeg ) >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_cs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_is? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_is(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) linguas_ru? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ru(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_uk(+)] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
-SLOT=4
-SRC_URI=mirror://sourceforge/kradio/kradio4-4.0.2.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	gnome2-utils	dfd98be073cc8193fc79925566741ab0	kde4-base	a5866abff73618fd21d222141d24401d	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
-_md5_=993c04909567351e0b568ae143ac8a5b
diff --git a/metadata/md5-cache/media-sound/kradio-4.0.3 b/metadata/md5-cache/media-sound/kradio-4.0.3
deleted file mode 100644
index b4c13055ea7a..000000000000
--- a/metadata/md5-cache/media-sound/kradio-4.0.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=media-libs/libsndfile alsa? ( media-libs/alsa-lib ) lirc? ( app-misc/lirc ) mp3? ( media-sound/lame ) vorbis? ( media-libs/libvorbis media-libs/libogg ) ffmpeg? ( >=media-libs/libmms-0.4 virtual/ffmpeg ) >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
-DESCRIPTION=kradio is a radio tuner application for KDE
-EAPI=4
-HOMEPAGE=http://kradio.sourceforge.net/
-IUSE=alsa debug encode ffmpeg lirc +mp3 +vorbis v4l linguas_cs linguas_de linguas_es linguas_is linguas_it linguas_pl linguas_pt linguas_pt_BR linguas_ru linguas_tr linguas_uk aqua
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=media-libs/libsndfile alsa? ( media-libs/alsa-lib ) lirc? ( app-misc/lirc ) mp3? ( media-sound/lame ) vorbis? ( media-libs/libvorbis media-libs/libogg ) ffmpeg? ( >=media-libs/libmms-0.4 virtual/ffmpeg ) >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_cs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_is? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_is(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_it(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) linguas_ru? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ru(+)] ) linguas_tr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_tr(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_uk(+)] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
-SLOT=4
-SRC_URI=mirror://sourceforge/kradio/kradio4-4.0.3.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	gnome2-utils	dfd98be073cc8193fc79925566741ab0	kde4-base	a5866abff73618fd21d222141d24401d	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
-_md5_=d826e124dc23d2430e17eff6841e7642
diff --git a/metadata/md5-cache/media-sound/squeezeslave-1.1_p309 b/metadata/md5-cache/media-sound/squeezeslave-1.1_p309
deleted file mode 100644
index 3911ab2e7f53..000000000000
--- a/metadata/md5-cache/media-sound/squeezeslave-1.1_p309
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=media-libs/libmad media-libs/flac media-libs/libvorbis media-libs/libogg media-libs/portaudio[alsa?] aac? ( virtual/ffmpeg ) wma? ( virtual/ffmpeg ) display? ( app-misc/lirc ) app-arch/xz-utils virtual/pkgconfig
-DESCRIPTION=A lightweight streaming audio player for squeezeboxserver
-EAPI=4
-HOMEPAGE=http://squeezeslave.googlecode.com
-IUSE=aac +alsa display wma zones
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=media-libs/libmad media-libs/flac media-libs/libvorbis media-libs/libogg media-libs/portaudio[alsa?] aac? ( virtual/ffmpeg ) wma? ( virtual/ffmpeg ) display? ( app-misc/lirc )
-SLOT=0
-SRC_URI=http://dev.gentoo.org/~radhermit/distfiles/squeezeslave-1.1_p309.tar.xz
-_eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=7839ac46e14129b5e250b879c9dc12e6
diff --git a/metadata/md5-cache/media-sound/xwax-0.8 b/metadata/md5-cache/media-sound/xwax-0.8
deleted file mode 100644
index c99bf17b9668..000000000000
--- a/metadata/md5-cache/media-sound/xwax-0.8
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=media-libs/libsdl media-libs/sdl-ttf media-fonts/dejavu alsa? ( media-libs/alsa-lib ) jack? ( media-sound/jack-audio-connection-kit ) xwax_decoders_aac? ( media-libs/faad2 ) xwax_decoders_cd? ( media-sound/cdparanoia ) xwax_decoders_flac? ( media-libs/flac ) xwax_decoders_mp3? ( || ( media-sound/mpg123 media-sound/mpg321 ) ) xwax_decoders_ogg? ( media-sound/vorbis-tools ) xwax_decoders_misc? ( virtual/ffmpeg )
-DESCRIPTION=Digital vinyl emulation software
-EAPI=3
-HOMEPAGE=http://www.xwax.co.uk/
-IUSE=alsa jack xwax_decoders_aac xwax_decoders_cd xwax_decoders_flac +xwax_decoders_mp3 xwax_decoders_ogg xwax_decoders_misc
-KEYWORDS=amd64 ppc ppc64 x86
-LICENSE=GPL-2
-RDEPEND=media-libs/libsdl media-libs/sdl-ttf media-fonts/dejavu alsa? ( media-libs/alsa-lib ) jack? ( media-sound/jack-audio-connection-kit ) xwax_decoders_aac? ( media-libs/faad2 ) xwax_decoders_cd? ( media-sound/cdparanoia ) xwax_decoders_flac? ( media-libs/flac ) xwax_decoders_mp3? ( || ( media-sound/mpg123 media-sound/mpg321 ) ) xwax_decoders_ogg? ( media-sound/vorbis-tools ) xwax_decoders_misc? ( virtual/ffmpeg )
-SLOT=0
-SRC_URI=http://www.xwax.co.uk/releases/xwax-0.8.tar.gz
-_eclasses_=multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3
-_md5_=d4b1628296236e2c87b40a352a56dca0
diff --git a/metadata/md5-cache/media-sound/xwax-0.9 b/metadata/md5-cache/media-sound/xwax-0.9
deleted file mode 100644
index 712f49bf6d30..000000000000
--- a/metadata/md5-cache/media-sound/xwax-0.9
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup
-DEPEND=media-libs/libsdl media-libs/sdl-ttf media-fonts/dejavu alsa? ( media-libs/alsa-lib ) jack? ( media-sound/jack-audio-connection-kit ) cdda? ( media-sound/cdparanoia ) mp3? ( || ( media-sound/mpg123 media-sound/mpg321 ) ) fallback? ( virtual/ffmpeg )
-DESCRIPTION=Digital vinyl emulation software
-EAPI=4
-HOMEPAGE=http://www.xwax.co.uk/
-IUSE=alsa jack oss cdda mp3 +fallback
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=media-libs/libsdl media-libs/sdl-ttf media-fonts/dejavu alsa? ( media-libs/alsa-lib ) jack? ( media-sound/jack-audio-connection-kit ) cdda? ( media-sound/cdparanoia ) mp3? ( || ( media-sound/mpg123 media-sound/mpg321 ) ) fallback? ( virtual/ffmpeg )
-REQUIRED_USE=|| ( cdda mp3 fallback ) || ( alsa jack oss )
-SLOT=0
-SRC_URI=http://www.xwax.co.uk/releases/xwax-0.9.tar.gz
-_eclasses_=multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3
-_md5_=d7026104086873d495a0299bced18e53
diff --git a/metadata/md5-cache/media-sound/xwax-1.1 b/metadata/md5-cache/media-sound/xwax-1.1
deleted file mode 100644
index 6bd8b4ef1c07..000000000000
--- a/metadata/md5-cache/media-sound/xwax-1.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=sys-libs/glibc media-libs/libsdl media-libs/sdl-ttf media-fonts/dejavu alsa? ( media-libs/alsa-lib ) jack? ( media-sound/jack-audio-connection-kit ) cdda? ( media-sound/cdparanoia ) mp3? ( || ( media-sound/mpg123 media-sound/mpg321 ) ) fallback? ( virtual/ffmpeg )
-DESCRIPTION=Digital vinyl emulation software
-EAPI=4
-HOMEPAGE=http://www.xwax.co.uk/
-IUSE=alsa jack oss cdda mp3 +fallback
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=sys-libs/glibc media-libs/libsdl media-libs/sdl-ttf media-fonts/dejavu alsa? ( media-libs/alsa-lib ) jack? ( media-sound/jack-audio-connection-kit ) cdda? ( media-sound/cdparanoia ) mp3? ( || ( media-sound/mpg123 media-sound/mpg321 ) ) fallback? ( virtual/ffmpeg )
-REQUIRED_USE=|| ( cdda mp3 fallback ) || ( alsa jack oss )
-SLOT=0
-SRC_URI=http://www.xwax.co.uk/releases/xwax-1.1.tar.gz
-_eclasses_=multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3
-_md5_=b6f033eb5dcbb719e48c5e6c030b3ee2
diff --git a/metadata/md5-cache/media-video/cinelerra-20101104 b/metadata/md5-cache/media-video/cinelerra-20101104
deleted file mode 100644
index 3993c6b504d3..000000000000
--- a/metadata/md5-cache/media-video/cinelerra-20101104
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=media-libs/libpng-1.4.0 >=media-libs/libdv-1.0.0 media-libs/faad2 media-libs/faac media-libs/a52dec media-libs/libsndfile media-libs/tiff virtual/ffmpeg media-sound/lame >=sci-libs/fftw-3.0.1 media-libs/x264 media-video/mjpegtools >=media-libs/freetype-2.1.10 >=media-libs/openexr-1.2.2 >=media-libs/libvorbis-1.2.3 >=media-libs/libogg-1.1.4 >=media-libs/libtheora-1.1.1 x11-libs/libX11 x11-libs/libXv x11-libs/libXxf86vm x11-libs/libXext x11-libs/libXvMC x11-libs/libXft virtual/jpeg alsa? ( media-libs/alsa-lib ) ieee1394? ( media-libs/libiec61883 >=sys-libs/libraw1394-1.2.0 >=sys-libs/libavc1394-0.5.0 ) opengl? ( virtual/opengl ) app-arch/xz-utils virtual/pkgconfig mmx? ( dev-lang/nasm ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
-DESCRIPTION=Professional Video Editor (Unofficial GIT-snapshot)
-EAPI=3
-HOMEPAGE=http://www.cinelerra.org/
-IUSE=3dnow alsa altivec css ieee1394 mmx opengl oss
-KEYWORDS=amd64 ~ppc x86
-LICENSE=GPL-2
-RDEPEND=>=media-libs/libpng-1.4.0 >=media-libs/libdv-1.0.0 media-libs/faad2 media-libs/faac media-libs/a52dec media-libs/libsndfile media-libs/tiff virtual/ffmpeg media-sound/lame >=sci-libs/fftw-3.0.1 media-libs/x264 media-video/mjpegtools >=media-libs/freetype-2.1.10 >=media-libs/openexr-1.2.2 >=media-libs/libvorbis-1.2.3 >=media-libs/libogg-1.1.4 >=media-libs/libtheora-1.1.1 x11-libs/libX11 x11-libs/libXv x11-libs/libXxf86vm x11-libs/libXext x11-libs/libXvMC x11-libs/libXft virtual/jpeg alsa? ( media-libs/alsa-lib ) ieee1394? ( media-libs/libiec61883 >=sys-libs/libraw1394-1.2.0 >=sys-libs/libavc1394-0.5.0 ) opengl? ( virtual/opengl )
-SLOT=0
-SRC_URI=mirror://gentoo/cinelerra-20101104.tar.xz
-_eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=f41ad7b71f8364c6ea9e507c3651c97b
diff --git a/metadata/md5-cache/media-video/dvd-slideshow-0.8.2.2 b/metadata/md5-cache/media-video/dvd-slideshow-0.8.2.2
deleted file mode 100644
index 2eaa0d5e8867..000000000000
--- a/metadata/md5-cache/media-video/dvd-slideshow-0.8.2.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=DVD Slideshow - Turn your pictures into a dvd with menus!
-EAPI=2
-HOMEPAGE=http://dvd-slideshow.sourceforge.net/wiki/Main_Page
-IUSE=examples mp3 themes vorbis
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=media-sound/sox || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) media-video/mjpegtools >media-video/dvdauthor-0.6.11 virtual/cdrtools virtual/ffmpeg app-cdr/dvd+rw-tools mp3? ( media-sound/lame ) vorbis? ( media-libs/libvorbis ) sys-devel/bc media-gfx/jhead
-SLOT=0
-SRC_URI=mirror://sourceforge/dvd-slideshow/dvd-slideshow-0.8.2-2.tar.gz examples? ( mirror://sourceforge/dvd-slideshow/dvd-slideshow-examples-0.8.0-1.tar.gz ) themes? ( mirror://sourceforge/dvd-slideshow/dvd-slideshow-themes-0.8.0-1.tar.gz )
-_eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=65740e3a9d7477d8b01f94ecb7c88408
diff --git a/metadata/md5-cache/media-video/dvd-slideshow-0.8.4.1 b/metadata/md5-cache/media-video/dvd-slideshow-0.8.4.2
similarity index 87%
rename from metadata/md5-cache/media-video/dvd-slideshow-0.8.4.1
rename to metadata/md5-cache/media-video/dvd-slideshow-0.8.4.2
index 86b30a19fbac..5de2dee2edb6 100644
--- a/metadata/md5-cache/media-video/dvd-slideshow-0.8.4.1
+++ b/metadata/md5-cache/media-video/dvd-slideshow-0.8.4.2
@@ -3,10 +3,10 @@ DESCRIPTION=DVD Slideshow - Turn your pictures into a dvd with menus!
 EAPI=4
 HOMEPAGE=http://dvd-slideshow.sourceforge.net/wiki/Main_Page
 IUSE=examples mp3 themes vorbis
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
 RDEPEND=media-sound/sox || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) media-video/mjpegtools >media-video/dvdauthor-0.6.11 virtual/cdrtools virtual/ffmpeg app-cdr/dvd+rw-tools mp3? ( media-sound/lame ) vorbis? ( media-libs/libvorbis ) sys-devel/bc media-gfx/jhead
 SLOT=0
-SRC_URI=mirror://sourceforge/dvd-slideshow/dvd-slideshow-0.8.4-1.tar.gz examples? ( mirror://sourceforge/dvd-slideshow/dvd-slideshow-examples-0.8.4-1.tar.gz ) themes? ( mirror://sourceforge/dvd-slideshow/dvd-slideshow-themes-0.8.4-1.tar.gz )
+SRC_URI=mirror://sourceforge/dvd-slideshow/dvd-slideshow-0.8.4-2.tar.gz examples? ( mirror://sourceforge/dvd-slideshow/dvd-slideshow-examples-0.8.4-1.tar.gz ) themes? ( mirror://sourceforge/dvd-slideshow/dvd-slideshow-themes-0.8.4-1.tar.gz )
 _eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=681701c339be2e1266c8dcd7447c9737
+_md5_=2442c39bda88c2c02aa32b1656466cb3
diff --git a/metadata/md5-cache/media-video/guvcview-1.4.2 b/metadata/md5-cache/media-video/guvcview-1.4.2
deleted file mode 100644
index 28423b3a9e26..000000000000
--- a/metadata/md5-cache/media-video/guvcview-1.4.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=>=x11-libs/gtk+-2.14:2 >=dev-libs/glib-2.10:2 virtual/ffmpeg >=media-libs/libsdl-1.2.10 >=media-libs/portaudio-19_pre >=media-libs/libpng-1.4 media-libs/libv4l pulseaudio? ( >=media-sound/pulseaudio-0.9.15 ) virtual/pkgconfig sys-devel/gettext
-DESCRIPTION=GTK+ UVC Viewer
-EAPI=2
-HOMEPAGE=http://guvcview.berlios.de
-IUSE=pulseaudio
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=>=x11-libs/gtk+-2.14:2 >=dev-libs/glib-2.10:2 virtual/ffmpeg >=media-libs/libsdl-1.2.10 >=media-libs/portaudio-19_pre >=media-libs/libpng-1.4 media-libs/libv4l pulseaudio? ( >=media-sound/pulseaudio-0.9.15 )
-SLOT=0
-SRC_URI=mirror://berlios/guvcview/guvcview-src-1.4.2.tar.gz
-_md5_=fb621af91a593b1cde02c080dbba04b1
diff --git a/metadata/md5-cache/media-video/guvcview-1.5.0 b/metadata/md5-cache/media-video/guvcview-1.5.0
deleted file mode 100644
index 6f798c0ace4a..000000000000
--- a/metadata/md5-cache/media-video/guvcview-1.5.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure prepare
-DEPEND=>=dev-libs/glib-2.10:2 virtual/ffmpeg >=media-libs/libsdl-1.2.10 >=media-libs/libpng-1.4 media-libs/libv4l >=media-libs/portaudio-19_pre sys-fs/udev >=x11-libs/gtk+-2.14:2 pulseaudio? ( >=media-sound/pulseaudio-0.9.15 ) virtual/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
-DESCRIPTION=GTK+ UVC Viewer
-EAPI=4
-HOMEPAGE=http://guvcview.sourceforge.net/
-IUSE=pulseaudio
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=>=dev-libs/glib-2.10:2 virtual/ffmpeg >=media-libs/libsdl-1.2.10 >=media-libs/libpng-1.4 media-libs/libv4l >=media-libs/portaudio-19_pre sys-fs/udev >=x11-libs/gtk+-2.14:2 pulseaudio? ( >=media-sound/pulseaudio-0.9.15 )
-SLOT=0
-SRC_URI=mirror://berlios/guvcview/guvcview-src-1.5.0.tar.gz
-_eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=12cb01f366a09842980e2710083391a4
diff --git a/metadata/md5-cache/media-video/guvcview-1.5.1 b/metadata/md5-cache/media-video/guvcview-1.5.1
deleted file mode 100644
index 511cb5635b1d..000000000000
--- a/metadata/md5-cache/media-video/guvcview-1.5.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure prepare
-DEPEND=>=dev-libs/glib-2.10:2 virtual/ffmpeg >=media-libs/libsdl-1.2.10 >=media-libs/libpng-1.4 media-libs/libv4l >=media-libs/portaudio-19_pre sys-fs/udev x11-libs/gtk+:3 pulseaudio? ( >=media-sound/pulseaudio-0.9.15 ) virtual/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
-DESCRIPTION=GTK+ UVC Viewer
-EAPI=4
-HOMEPAGE=http://guvcview.sourceforge.net/
-IUSE=pulseaudio
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=>=dev-libs/glib-2.10:2 virtual/ffmpeg >=media-libs/libsdl-1.2.10 >=media-libs/libpng-1.4 media-libs/libv4l >=media-libs/portaudio-19_pre sys-fs/udev x11-libs/gtk+:3 pulseaudio? ( >=media-sound/pulseaudio-0.9.15 )
-SLOT=0
-SRC_URI=mirror://sourceforge/guvcview/guvcview-src-1.5.1.tar.gz
-_eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=b671b8ee8f3cfeea4bdbedda2de2bbdf
diff --git a/metadata/md5-cache/media-video/guvcview-1.5.3 b/metadata/md5-cache/media-video/guvcview-1.5.3
index b08edcfd399f..9ea9c8dcedf0 100644
--- a/metadata/md5-cache/media-video/guvcview-1.5.3
+++ b/metadata/md5-cache/media-video/guvcview-1.5.3
@@ -4,10 +4,10 @@ DESCRIPTION=GTK+ UVC Viewer
 EAPI=4
 HOMEPAGE=http://guvcview.sourceforge.net/
 IUSE=pulseaudio
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=>=dev-libs/glib-2.10:2 virtual/ffmpeg >=media-libs/libsdl-1.2.10 >=media-libs/libpng-1.4 media-libs/libv4l >=media-libs/portaudio-19_pre sys-fs/udev x11-libs/gtk+:3 pulseaudio? ( >=media-sound/pulseaudio-0.9.15 )
 SLOT=0
 SRC_URI=mirror://sourceforge/guvcview/guvcview-src-1.5.3.tar.gz
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=b51dd9957047b1d423ba7ab82aba2cb6
+_md5_=f79eaf750cc314489e3166f93a3b7b87
diff --git a/metadata/md5-cache/media-video/miro-4.0.1 b/metadata/md5-cache/media-video/miro-4.0.1
deleted file mode 100644
index b294a0fc0531..000000000000
--- a/metadata/md5-cache/media-video/miro-4.0.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup
-DEPEND=dev-libs/glib:2 >=dev-python/pyrex-0.9.6.4 dev-python/pygtk:2 dev-python/pygobject:2 >=virtual/ffmpeg-0.6.90 >=sys-apps/sed-4 =dev-lang/python-2.7* =dev-lang/python-2.7*[sqlite]
-DESCRIPTION=Open source video player and podcast client
-EAPI=3
-HOMEPAGE=http://www.getmiro.com/
-IUSE=libnotify aac musepack xvid
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/glib:2 >=dev-python/pyrex-0.9.6.4 dev-python/pygtk:2 dev-python/pygobject:2 >=virtual/ffmpeg-0.6.90 dev-python/dbus-python dev-python/pycairo dev-python/gconf-python dev-python/gst-python:0.10 >=dev-python/pywebkitgtk-1.1.5 dev-python/pycurl >=net-libs/rb_libtorrent-0.14.1[python] media-libs/mutagen media-plugins/gst-plugins-meta:0.10 media-plugins/gst-plugins-pango:0.10 aac? ( media-plugins/gst-plugins-faad:0.10 ) libnotify? ( dev-python/notify-python ) musepack? ( media-plugins/gst-plugins-musepack:0.10 ) xvid? ( media-plugins/gst-plugins-xvid:0.10 ) =dev-lang/python-2.7* =dev-lang/python-2.7*[sqlite]
-SLOT=0
-SRC_URI=http://ftp.osuosl.org/pub/pculture.org/miro/src/miro-4.0.1.tar.gz
-_eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	dfd98be073cc8193fc79925566741ab0	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=da34d55e3d489baaf9fc2213752969d6
diff --git a/metadata/md5-cache/media-video/miro-4.0.1-r1 b/metadata/md5-cache/media-video/miro-4.0.1-r1
deleted file mode 100644
index 65171f73f449..000000000000
--- a/metadata/md5-cache/media-video/miro-4.0.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup
-DEPEND=dev-libs/glib:2 >=dev-python/pyrex-0.9.6.4 dev-python/pygtk:2 dev-python/pygobject:2 >=virtual/ffmpeg-0.6.90 >=sys-apps/sed-4 =dev-lang/python-2.7* =dev-lang/python-2.7*[sqlite]
-DESCRIPTION=Open source video player and podcast client
-EAPI=3
-HOMEPAGE=http://www.getmiro.com/
-IUSE=libnotify aac musepack xvid
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/glib:2 >=dev-python/pyrex-0.9.6.4 dev-python/pygtk:2 dev-python/pygobject:2 >=virtual/ffmpeg-0.6.90 dev-python/dbus-python dev-python/pycairo dev-python/gconf-python dev-python/gst-python:0.10 dev-python/pyrex >=dev-python/pywebkitgtk-1.1.5 dev-python/pycurl >=net-libs/rb_libtorrent-0.14.1[python] media-libs/mutagen media-plugins/gst-plugins-meta:0.10 media-plugins/gst-plugins-pango:0.10 aac? ( media-plugins/gst-plugins-faad:0.10 ) libnotify? ( dev-python/notify-python ) musepack? ( media-plugins/gst-plugins-musepack:0.10 ) xvid? ( media-plugins/gst-plugins-xvid:0.10 ) =dev-lang/python-2.7* =dev-lang/python-2.7*[sqlite]
-SLOT=0
-SRC_URI=http://ftp.osuosl.org/pub/pculture.org/miro/src/miro-4.0.1.tar.gz
-_eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	dfd98be073cc8193fc79925566741ab0	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=484b5e2814a117133d5efd694cff41a2
diff --git a/metadata/md5-cache/net-misc/dhcp-4.2.3_p2 b/metadata/md5-cache/net-misc/dhcp-4.2.3_p2
new file mode 100644
index 000000000000..f016f5a9a438
--- /dev/null
+++ b/metadata/md5-cache/net-misc/dhcp-4.2.3_p2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare unpack
+DEPEND=selinux? ( sec-policy/selinux-dhcp ) client? ( kernel_linux? ( sys-apps/net-tools ) ) ldap? ( net-nds/openldap ssl? ( dev-libs/openssl ) )
+DESCRIPTION=ISC Dynamic Host Configuration Protocol (DHCP) client/server
+EAPI=4
+HOMEPAGE=http://www.isc.org/products/DHCP
+IUSE=+client ipv6 kernel_linux ldap selinux +server ssl vim-syntax
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+LICENSE=as-is BSD
+RDEPEND=selinux? ( sec-policy/selinux-dhcp ) client? ( kernel_linux? ( sys-apps/net-tools ) ) ldap? ( net-nds/openldap ssl? ( dev-libs/openssl ) ) vim-syntax? ( app-vim/dhcpd-syntax )
+SLOT=0
+SRC_URI=ftp://ftp.isc.org/isc/dhcp/dhcp-4.2.3-P2.tar.gz ftp://ftp.isc.org/isc/dhcp/4.2.3-P2/dhcp-4.2.3-P2.tar.gz
+_eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
+_md5_=6c681b4ba55fc3835fc1d1a777209af9
diff --git a/metadata/md5-cache/sys-apps/baselayout-2.1-r1 b/metadata/md5-cache/sys-apps/baselayout-2.1-r1
new file mode 100644
index 000000000000..4010e92a9cd2
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/baselayout-2.1-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install postinst preinst setup
+DESCRIPTION=Filesystem baselayout and init scripts
+HOMEPAGE=http://www.gentoo.org/
+IUSE=build kernel_linux
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+LICENSE=GPL-2
+PDEPEND=sys-apps/openrc
+SLOT=0
+SRC_URI=mirror://gentoo/baselayout-2.1.tar.bz2 http://dev.gentoo.org/~vapier/dist/baselayout-2.1.tar.bz2
+_eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
+_md5_=f374e6ca919e8b0b26b44eba09d2d971
diff --git a/metadata/md5-cache/sys-apps/biosdevname-0.3.11-r1 b/metadata/md5-cache/sys-apps/biosdevname-0.3.11-r1
index 18581b4107d7..9046c18f565a 100644
--- a/metadata/md5-cache/sys-apps/biosdevname-0.3.11-r1
+++ b/metadata/md5-cache/sys-apps/biosdevname-0.3.11-r1
@@ -3,9 +3,9 @@ DEPEND=sys-fs/udev sys-apps/pciutils
 DESCRIPTION=Sets BIOS-given device names instead of kernel eth* names
 EAPI=4
 HOMEPAGE=http://linux.dell.com/biosdevname/
-KEYWORDS=amd64 x86
+KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=sys-fs/udev
 SLOT=0
 SRC_URI=http://linux.dell.com/biosdevname/biosdevname-0.3.11/biosdevname-0.3.11.tar.gz
-_md5_=9550e5b2af704ff98e0ef579ab271f4a
+_md5_=577fcbfdf4c7ae9ef3bfca2766ca6c72
diff --git a/metadata/md5-cache/sys-apps/biosdevname-0.4.0 b/metadata/md5-cache/sys-apps/biosdevname-0.4.0
new file mode 100644
index 000000000000..c16547081e56
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/biosdevname-0.4.0
@@ -0,0 +1,11 @@
+DEFINED_PHASES=postinst prepare
+DEPEND=sys-fs/udev sys-apps/pciutils
+DESCRIPTION=Sets BIOS-given device names instead of kernel eth* names
+EAPI=4
+HOMEPAGE=http://linux.dell.com/biosdevname/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=sys-fs/udev
+SLOT=0
+SRC_URI=http://linux.dell.com/biosdevname/biosdevname-0.4.0/biosdevname-0.4.0.tar.gz
+_md5_=d7ae397e9fa436e259d7a79ff1073534
diff --git a/metadata/md5-cache/sys-fs/udisks-1.97.0-r1 b/metadata/md5-cache/sys-fs/udisks-1.97.0-r1
index 6b42b50d98c4..908967e4a80f 100644
--- a/metadata/md5-cache/sys-fs/udisks-1.97.0-r1
+++ b/metadata/md5-cache/sys-fs/udisks-1.97.0-r1
@@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/glib-2.32 >=sys-auth/polkit-0.104-r1 >=dev-libs/libatasmart-0
 SLOT=2
 SRC_URI=http://udisks.freedesktop.org/releases/udisks-1.97.0.tar.bz2
 _eclasses_=bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	systemd	70a153740015c3457222dbdd8e07c1f7	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=dea9c29e81884604a11e17c15c49725c
+_md5_=8a6f6e8d3aa71881d605a9d8c472c3aa
diff --git a/metadata/md5-cache/virtual/init-0 b/metadata/md5-cache/virtual/init-0
index 06f0ae35ec77..645fb2dbb249 100644
--- a/metadata/md5-cache/virtual/init-0
+++ b/metadata/md5-cache/virtual/init-0
@@ -1,6 +1,6 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for various init implementations
 KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
-RDEPEND=kernel_linux? ( || ( >=sys-apps/sysvinit-2.86-r6 sys-process/runit ) ) kernel_FreeBSD? ( sys-freebsd/freebsd-sbin )
+RDEPEND=!prefix? ( kernel_linux? ( || ( >=sys-apps/sysvinit-2.86-r6 sys-process/runit ) ) kernel_FreeBSD? ( sys-freebsd/freebsd-sbin ) )
 SLOT=0
-_md5_=67c289a5226eb8fde174474672a73346
+_md5_=83a88ad429f6d83aadee369636ac803e
diff --git a/metadata/md5-cache/x11-misc/see-0.6 b/metadata/md5-cache/x11-misc/seetxt-0.6
similarity index 94%
rename from metadata/md5-cache/x11-misc/see-0.6
rename to metadata/md5-cache/x11-misc/seetxt-0.6
index 80ac84ad609b..19195069ef75 100644
--- a/metadata/md5-cache/x11-misc/see-0.6
+++ b/metadata/md5-cache/x11-misc/seetxt-0.6
@@ -9,4 +9,4 @@ RDEPEND=x11-libs/gtk+:2
 SLOT=0
 SRC_URI=http://seetxt.googlecode.com/files/see-0.6.tar.bz2
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=2dbe3c459d6766aa82b3b7d9175d7773
+_md5_=653c9bd64a4483aec5f17bd148c189fa
diff --git a/metadata/md5-cache/x11-misc/seetxt-0.72 b/metadata/md5-cache/x11-misc/seetxt-0.72
new file mode 100644
index 000000000000..e848a8d3b6aa
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/seetxt-0.72
@@ -0,0 +1,11 @@
+DEFINED_PHASES=-
+DEPEND=x11-libs/gtk+:2 virtual/pkgconfig
+DESCRIPTION=Clever, lightweight GUI text file and manual page viewer for X windows.
+EAPI=4
+HOMEPAGE=http://code.google.com/p/seetxt/ http://seetxt.sourceforge.net/
+KEYWORDS=~amd64
+LICENSE=GPL-3
+RDEPEND=x11-libs/gtk+:2
+SLOT=0
+SRC_URI=http://seetxt.googlecode.com/files/seetxt-0.72.tar.bz2
+_md5_=2005f687d4f13224cd80ec48a66b57eb
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 714d8100dcb1..1c0b8303aac0 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Wed, 16 May 2012 04:37:33 +0000
+Wed, 16 May 2012 09:37:28 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 57ff51ebc1b8..5b4fba592614 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Wed May 16 04:37:31 UTC 2012
+Wed May 16 09:37:26 UTC 2012
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index d34377397cbe..61515cdaff52 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Wed, 16 May 2012 05:00:01 +0000
+Wed, 16 May 2012 10:00:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index e9bc9f8423ae..7371b62ad5e7 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1337142901 Wed May 16 04:35:01 2012 UTC
+1337160901 Wed May 16 09:35:01 2012 UTC
diff --git a/net-misc/dhcp/Manifest b/net-misc/dhcp/Manifest
index 2b1d044a7b2c..b915c0bfd4ab 100644
--- a/net-misc/dhcp/Manifest
+++ b/net-misc/dhcp/Manifest
@@ -3,3 +3,4 @@ DIST dhcp-3.1.2p1.tar.gz 792355 RMD160 53434f8404c69e8e113cad030ec975cf13b467cc
 DIST dhcp-4.2.1-P1.tar.gz 8797289 RMD160 e3607828ea12eb718c0877430f9607d336d78c36 SHA1 7767019313b4128357054a1eb053c66799831dd6 SHA256 6cd5e06512c53ad43d71400f39071ce0bd07f074e416c727d5bc7e5949ec55ec
 DIST dhcp-4.2.2.tar.gz 8764108 RMD160 a7d0a66a6156cc2194a784b120587ffd5e8e200e SHA1 a2d5d5bf0fb2a98e9e3e18b243d0a07e12837f81 SHA256 846ee115bd3a789ef4d8d051e1078b920b152c5644179c1a28ed59aa1b5ee38c
 DIST dhcp-4.2.3-P1.tar.gz 9525670 RMD160 fc15dc0589d698c7d1f8c8df045f0b396b30c28e SHA1 cb4b658cf9d9674fad7ee11d06193569784c61a2 SHA256 4860625e07c290768d513b9a2260e655ae4bad4cc5c4c8f5eaaeb4f9cbfa96af
+DIST dhcp-4.2.3-P2.tar.gz 9527546 RMD160 445663a44b18acd2f02497b652c72656f9a0e328 SHA1 6ce113d8e6301343b66d4d71be59a3c34805378d SHA256 5cf7ae2cad9c4ca0103748b2476ec8ea78484e408f8fe597e4e0a4afb051b469
diff --git a/net-misc/dhcp/dhcp-4.2.3_p2.ebuild b/net-misc/dhcp/dhcp-4.2.3_p2.ebuild
new file mode 100644
index 000000000000..ec51f79d6e13
--- /dev/null
+++ b/net-misc/dhcp/dhcp-4.2.3_p2.ebuild
@@ -0,0 +1,237 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-4.2.3_p2.ebuild,v 1.1 2012/05/16 05:08:40 vapier Exp $
+
+EAPI="4"
+
+inherit eutils toolchain-funcs
+
+MY_PV="${PV//_alpha/a}"
+MY_PV="${MY_PV//_beta/b}"
+MY_PV="${MY_PV//_rc/rc}"
+MY_PV="${MY_PV//_p/-P}"
+MY_P="${PN}-${MY_PV}"
+DESCRIPTION="ISC Dynamic Host Configuration Protocol (DHCP) client/server"
+HOMEPAGE="http://www.isc.org/products/DHCP"
+SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz
+	ftp://ftp.isc.org/isc/dhcp/${MY_PV}/${MY_P}.tar.gz"
+
+LICENSE="as-is BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+IUSE="+client ipv6 kernel_linux ldap selinux +server ssl vim-syntax"
+
+DEPEND="selinux? ( sec-policy/selinux-dhcp )
+	client? ( kernel_linux? ( sys-apps/net-tools ) )
+	ldap? (
+		net-nds/openldap
+		ssl? ( dev-libs/openssl )
+	)"
+RDEPEND="${DEPEND}
+	vim-syntax? ( app-vim/dhcpd-syntax )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+	# handle local bind hell
+	cd "${S}"/bind
+	unpack ./bind.tar.gz
+}
+
+src_prepare() {
+	# Gentoo patches - these will probably never be accepted upstream
+	# Fix some permission issues
+	epatch "${FILESDIR}"/${PN}-3.0-fix-perms.patch
+	# Enable dhclient to equery NTP servers
+	epatch "${FILESDIR}"/${PN}-4.0-dhclient-ntp.patch
+	# resolvconf support in dhclient-script
+	epatch "${FILESDIR}"/${PN}-4.2.2-dhclient-resolvconf.patch
+	# Stop downing the interface on Linux as that breaks link daemons
+	# such as wpa_supplicant and netplug
+	epatch "${FILESDIR}"/${PN}-3.0.3-dhclient-no-down.patch
+	epatch "${FILESDIR}"/${PN}-4.2.0-errwarn-message.patch
+	# Enable dhclient to get extra configuration from stdin
+	epatch "${FILESDIR}"/${PN}-4.2.2-dhclient-stdin-conf.patch
+	epatch "${FILESDIR}"/${PN}-4.2.2-nogateway.patch #265531
+
+	# NetworkManager support patches
+	# If they fail to apply to future versions they will be dropped
+	# Add dbus support to dhclient
+	epatch "${FILESDIR}"/${PN}-3.0.3-dhclient-dbus.patch
+
+	# Brand the version with Gentoo
+	sed -i \
+		-e "/VERSION=/s:'$: Gentoo-${PR}':" \
+		configure || die
+
+	# Change the hook script locations of the scripts
+	sed -i \
+		-e 's,/etc/dhclient-exit-hooks,/etc/dhcp/dhclient-exit-hooks,g' \
+		-e 's,/etc/dhclient-enter-hooks,/etc/dhcp/dhclient-enter-hooks,g' \
+		client/scripts/* || die
+
+	# No need for the linux script to force bash #158540
+	sed -i -e 's,#!/bin/bash,#!/bin/sh,' client/scripts/linux || die
+
+	# Quiet the freebsd logger a little
+	sed -i -e '/LOGGER=/ s/-s -p user.notice //g' client/scripts/freebsd || die
+
+	# Remove these options from the sample config
+	sed -i \
+		-e "/\(script\|host-name\|domain-name\) / d" \
+		client/dhclient.conf || die
+
+	if use client && ! use server ; then
+		sed -i -r \
+			-e '/^SUBDIRS/s:\<(dhcpctl|relay|server)\>::g' \
+			Makefile.in || die
+	elif ! use client && use server ; then
+		sed -i -r \
+			-e '/^SUBDIRS/s:\<client\>::' \
+			Makefile.in || die
+	fi
+
+	# Only install different man pages if we don't have en
+	if [[ " ${LINGUAS} " != *" en "* ]]; then
+		# Install Japanese man pages
+		if [[ " ${LINGUAS} " == *" ja "* && -d doc/ja_JP.eucJP ]]; then
+			einfo "Installing Japanese documention"
+			cp doc/ja_JP.eucJP/dhclient* client
+			cp doc/ja_JP.eucJP/dhcp* common
+		fi
+	fi
+	# Now remove the non-english docs so there are no errors later
+	rm -rf doc/ja_JP.eucJP
+
+	# make the bind build work
+	binddir=${S}/bind
+	cd "${binddir}" || die
+	cat <<-EOF > bindvar.tmp
+	binddir=${binddir}
+	GMAKE=${MAKE:-gmake}
+	EOF
+	epatch "${FILESDIR}"/${PN}-4.2.2-bind-disable.patch
+	cd bind-*/
+	epatch "${FILESDIR}"/${PN}-4.2.2-bind-parallel-build.patch #380717
+	epatch "${FILESDIR}"/${PN}-4.2.2-bind-build-flags.patch
+}
+
+src_configure() {
+	# bind defaults to stupid `/usr/bin/ar`
+	tc-export AR BUILD_CC
+	export ac_cv_path_AR=${AR}
+
+	# this is tested for by the bind build system, and can cause trouble
+	# when cross-building; since dhcp itself doesn't make use of libcap,
+	# simply disable it.
+	export ac_cv_lib_cap_cap_set_proc=no
+
+	# Use FHS sane paths ... some of these have configure options,
+	# but not all, so just do it all here.
+	local e="/etc/dhcp" r="/var/run/dhcp" l="/var/lib/dhcp"
+	cat <<-EOF >> includes/site.h
+	#define _PATH_DHCPD_CONF     "${e}/dhcpd.conf"
+	#define _PATH_DHCLIENT_CONF  "${e}/dhclient.conf"
+	#define _PATH_DHCPD_DB       "${l}/dhcpd.leases"
+	#define _PATH_DHCPD6_DB      "${l}/dhcpd6.leases"
+	#define _PATH_DHCLIENT_DB    "${l}/dhclient.leases"
+	#define _PATH_DHCLIENT6_DB   "${l}/dhclient6.leases"
+	#define _PATH_DHCPD_PID      "${r}/dhcpd.pid"
+	#define _PATH_DHCPD6_PID     "${r}/dhcpd6.pid"
+	#define _PATH_DHCLIENT_PID   "${r}/dhcpclient.pid"
+	#define _PATH_DHCLIENT6_PID  "${r}/dhcpclient6.pid"
+	#define _PATH_DHCRELAY_PID   "${r}/dhcrelay.pid"
+	#define _PATH_DHCRELAY6_PID  "${r}/dhcrelay6.pid"
+	EOF
+
+	econf \
+		--enable-paranoia \
+		--enable-early-chroot \
+		--sysconfdir=${e} \
+		$(use_enable ipv6 dhcpv6) \
+		$(use_with ldap) \
+		$(use ldap && use_with ssl ldapcrypto || echo --without-ldapcrypto)
+
+	# configure local bind cruft.  symtable option requires
+	# perl and we don't want to require that #383837.
+	cd bind/bind-*/ || die
+	eval econf \
+		$(sed -n '/ [.].configure /{s:^[^-]*::;s:>.*::;p}' ../Makefile) \
+		--disable-symtable \
+		--without-make-clean
+}
+
+src_compile() {
+	# build local bind cruft first
+	emake -C bind/bind-*/lib/export install
+	# then build standard dhcp code
+	emake
+}
+
+src_install() {
+	emake install DESTDIR="${D}"
+
+	dodoc README RELNOTES doc/{api+protocol,IANA-arp-parameters}
+	dohtml doc/References.html
+
+	if [[ -e client/dhclient ]] ; then
+		# move the client to /
+		dodir /sbin
+		mv "${D}"/usr/sbin/dhclient "${D}"/sbin/ || die
+
+		exeinto /sbin
+		if use kernel_linux ; then
+			newexe "${S}"/client/scripts/linux dhclient-script
+		else
+			newexe "${S}"/client/scripts/freebsd dhclient-script
+		fi
+	fi
+
+	if [[ -e server/dhcpd ]] ; then
+		if use ldap ; then
+			insinto /etc/openldap/schema
+			doins contrib/ldap/dhcp.*
+			dosbin contrib/ldap/dhcpd-conf-to-ldap
+		fi
+
+		newinitd "${FILESDIR}"/dhcpd.init5 dhcpd
+		newconfd "${FILESDIR}"/dhcpd.conf2 dhcpd
+		newinitd "${FILESDIR}"/dhcrelay.init3 dhcrelay
+		newconfd "${FILESDIR}"/dhcrelay.conf dhcrelay
+		newinitd "${FILESDIR}"/dhcrelay.init3 dhcrelay6
+		newconfd "${FILESDIR}"/dhcrelay6.conf dhcrelay6
+	fi
+
+	# the default config files aren't terribly useful #384087
+	sed -i '/^[^#]/s:^:#:' "${D}"/etc/dhcp/*.conf || die
+}
+
+pkg_preinst() {
+	enewgroup dhcp
+	enewuser dhcp -1 -1 /var/lib/dhcp dhcp
+
+	# Keep the user files over the sample ones.  The
+	# hashing is to ignore the crappy defaults #384087.
+	local f h
+	for f in dhclient:da7c8496a96452190aecf9afceef4510 dhcpd:10979e7b71134bd7f04d2a60bd58f070 ; do
+		h=${f#*:}
+		f="/etc/dhcp/${f%:*}.conf"
+		if [ -e "${ROOT}"${f} ] ; then
+			case $(md5sum "${ROOT}"${f}) in
+				${h}*) ;;
+				*) cp -p "${ROOT}"${f} "${D}"${f};;
+			esac
+		fi
+	done
+}
+
+pkg_postinst() {
+	if [[ -e "${ROOT}"/etc/init.d/dhcp ]] ; then
+		ewarn
+		ewarn "WARNING: The dhcp init script has been renamed to dhcpd"
+		ewarn "/etc/init.d/dhcp and /etc/conf.d/dhcp need to be removed and"
+		ewarn "and dhcp should be removed from the default runlevel"
+		ewarn
+	fi
+}
diff --git a/net-misc/dhcp/files/dhcrelay.init3 b/net-misc/dhcp/files/dhcrelay.init3
new file mode 100755
index 000000000000..277a844708f2
--- /dev/null
+++ b/net-misc/dhcp/files/dhcrelay.init3
@@ -0,0 +1,29 @@
+#!/sbin/runscript
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/files/dhcrelay.init3,v 1.1 2012/05/16 05:08:40 vapier Exp $
+
+depend() {
+	need net
+	use logger
+}
+
+start() {
+	if [ -z "${DHCRELAY_SERVERS}" ]; then
+		eerror "No DHCRELAY_SERVERS specified in /etc/conf.d/${SVCNAME}"
+		return 1
+	fi
+
+	checkpath -d /var/run/dhcp
+
+	ebegin "Starting ${SVCNAME}"
+	start-stop-daemon --start --exec /usr/sbin/dhcrelay \
+		-- -q $(printf -- '-i %s ' ${IFACE}) ${DHCRELAY_OPTS} ${DHCRELAY_SERVERS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping ${SVCNAME}"
+	start-stop-daemon --stop --pidfile /var/run/dhcp/${SVCNAME}.pid
+	eend $?
+}
diff --git a/net-misc/dhcp/files/dhcrelay6.conf b/net-misc/dhcp/files/dhcrelay6.conf
new file mode 100644
index 000000000000..19353e8b57ed
--- /dev/null
+++ b/net-misc/dhcp/files/dhcrelay6.conf
@@ -0,0 +1,14 @@
+# /etc/conf.d/dhcrelay: config file for /etc/init.d/dhcrelay
+
+# Configure which interface or interfaces to for dhcrelay to listen on
+# and send to.
+# List all interfaces space separated. If this is not specified then
+# we use all interfaces.
+#IFACE=""
+
+# Insert any other options needed.  See dhcrelay(8) for details.
+# Make sure you specify the lower (-l)/upper (-u) interfaces.
+DHCRELAY_OPTS="-6 -l lower-iface -u upper-iface"
+
+# Space separated list of IPs to forward BOOTP/DHCP packets to.
+DHCRELAY_SERVERS=""
diff --git a/profiles/package.mask b/profiles/package.mask
index 87265f14617a..ad96e0cd243a 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
 ####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.13762 2012/05/16 01:23:21 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.13763 2012/05/16 08:38:45 ssuominen Exp $
 #
 # When you add an entry to the top of this file, add your name, the date, and
 # an explanation of why something is getting masked. Please be extremely
@@ -31,6 +31,18 @@
 
 #--- END OF EXAMPLES ---
 
+# Samuli Suominen <ssuominen@gentoo.org> (16 May 2012)
+# Internal copy of vulnerable dev-libs/expat wrt #250930,
+# CVE-2009-{3720,3560} and CVE-2012-{0876,1147,1148}.
+#
+# Fails to compile wrt bug #368089
+# Bad migration away from dev-python/pyxml wrt #367745
+#
+# Removal in 30 days.
+dev-python/4suite
+dev-python/amara
+dev-python/testoob
+
 # Markos Chandras <hwoarang@gentoo.org> (15 May 2012)
 # Masked for testing
 =net-misc/dibbler-0.8.2
diff --git a/profiles/updates/2Q-2012 b/profiles/updates/2Q-2012
index 32b32d06e610..323acfeaf66a 100644
--- a/profiles/updates/2Q-2012
+++ b/profiles/updates/2Q-2012
@@ -11,3 +11,4 @@ move app-office/languagetool app-officeext/languagetool
 move dev-vcs/cola dev-vcs/git-cola
 move app-portage/eclean-kernel app-admin/eclean-kernel
 move kde-misc/kcm-gtk-config kde-misc/kde-gtk-config
+move x11-misc/see x11-misc/seetxt
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 8cc2e78c61b9..d07bbc92a38b 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -930,6 +930,7 @@ app-text/wpd2odt:visio - Add support for visio format using media-libs/libvisio
 app-text/wpd2odt:wpg - Add support for wpg format using app-text/libwpg
 app-text/wpd2odt:wps - Add support for wps format using app-text/libwps
 app-text/wv:tools - Install optional utilities considered deprecated in favor of using AbiWord.
+app-text/xdvik:Xaw - Use Xaw toolkit.
 app-text/xiphos:webkit - Use net-libs/webkit-gtk instead of gnome-extra/gtkhtml
 app-text/yagf:cuneiform - Enable support for the app-text/cuneiform OCR engine.
 app-text/yagf:tesseract - Enable support for the app-text/tesseract OCR engine.
diff --git a/sys-apps/baselayout/baselayout-2.1-r1.ebuild b/sys-apps/baselayout/baselayout-2.1-r1.ebuild
new file mode 100644
index 000000000000..52e85c6d7303
--- /dev/null
+++ b/sys-apps/baselayout/baselayout-2.1-r1.ebuild
@@ -0,0 +1,234 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-2.1-r1.ebuild,v 1.3 2012/05/16 06:03:14 ssuominen Exp $
+
+inherit eutils multilib
+
+DESCRIPTION="Filesystem baselayout and init scripts"
+HOMEPAGE="http://www.gentoo.org/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2
+	http://dev.gentoo.org/~vapier/dist/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+IUSE="build kernel_linux"
+
+PDEPEND="sys-apps/openrc"
+
+pkg_setup() {
+	multilib_layout
+}
+
+# Create our multilib dirs - the Makefile has no knowledge of this
+multilib_warn() {
+	local syms=$1 dirs=$2 def_libdir=$3
+
+	[ -z "${syms}${dirs}" ] && return
+
+	ewarn "Your system profile has SYMLINK_LIB=${SYMLINK_LIB}, so that means"
+	if [ -z "${syms}" ] ; then
+		ewarn "you need to have these paths as symlinks to ${def_libdir}:"
+		ewarn "$1"
+	fi
+}
+multilib_layout() {
+	local libdir libdirs=$(get_all_libdirs) def_libdir=$(get_abi_LIBDIR $DEFAULT_ABI)
+	: ${libdirs:=lib}	# it isn't that we don't trust multilib.eclass...
+
+	[ -z "${def_libdir}" ] && die "your DEFAULT_ABI=$DEFAULT_ABI appears to be invalid"
+
+	# figure out which paths should be symlinks and which should be directories
+	local dirs syms exp d
+	for libdir in ${libdirs} ; do
+		exp=( {,usr/,usr/local/}${libdir} )
+		for d in "${exp[@]/#/${ROOT}}" ; do
+			# most things should be dirs
+			if [ "${SYMLINK_LIB}" = "yes" ] && [ "${libdir}" = "lib" ] ; then
+				[ ! -h "${d}" ] && [ -e "${d}" ] && dirs+=" ${d}"
+			else
+				[ -h "${d}" ] && syms+=" ${d}"
+			fi
+		done
+	done
+	if [ -n "${syms}${dirs}" ] ; then
+		ewarn "Your system profile has SYMLINK_LIB=${SYMLINK_LIB:-no}, so that means you need to"
+		ewarn "have these paths configured as follows:"
+		[ -n "${dirs}" ] && ewarn "symlinks to '${def_libdir}':${dirs}"
+		[ -n "${syms}" ] && ewarn "directories:${syms}"
+		ewarn "The ebuild will attempt to fix these, but only for trivial conversions."
+		ewarn "If things fail, you will need to manually create/move the directories."
+		echo
+	fi
+
+	# setup symlinks and dirs where we expect them to be; do not migrate
+	# data ... just fall over in that case.
+	local prefix
+	for prefix in "${ROOT}"{,usr/,usr/local/} ; do
+		if [ "${SYMLINK_LIB}" = yes ] ; then
+			# we need to make sure "lib" points to the native libdir
+			if [ -h "${prefix}lib" ] ; then
+				# it's already a symlink!  assume it's pointing to right place ...
+				continue
+			elif [ -d "${prefix}lib" ] ; then
+				# "lib" is a dir, so need to convert to a symlink
+				ewarn "Converting ${prefix}lib from a dir to a symlink"
+				rm -f "${prefix}lib"/.keep
+				if rmdir "${prefix}lib" 2>/dev/null ; then
+					ln -s ${def_libdir} "${prefix}lib" || die
+				else
+					die "non-empty dir found where we needed a symlink: ${prefix}lib"
+				fi
+			else
+				# nothing exists, so just set it up sanely
+				ewarn "Initializing ${prefix}lib as a symlink"
+				mkdir -p "${prefix}" || die
+				rm -f "${prefix}lib" || die
+				ln -s ${def_libdir} "${prefix}lib" || die
+			fi
+		else
+			# we need to make sure "lib" is a dir
+			if [ -h "${prefix}lib" ] ; then
+				# "lib" is a symlink, so need to convert to a dir
+				ewarn "Converting ${prefix}lib from a symlink to a dir"
+				rm -f "${prefix}lib" || die
+				if [ -d "${prefix}lib32" ] ; then
+					ewarn "Migrating ${prefix}lib32 to ${prefix}lib"
+					mv "${prefix}lib32" "${prefix}lib" || die
+				else
+					mkdir -p "${prefix}lib" || die
+				fi
+			elif [ -d "${prefix}lib" ] ; then
+				# make sure the old "lib" ABI location does not exist; we
+				# only symlinked the lib dir on systems where we moved it
+				# to "lib32" ...
+				case ${CHOST} in
+				i?86*|x86_64*|powerpc*|sparc*|s390*)
+					if [ -d "${prefix}lib32" ] ; then
+						rm -f "${prefix}lib32"/.keep
+						if ! rmdir "${prefix}lib32" 2>/dev/null ; then
+							ewarn "You need to merge ${prefix}lib32 into ${prefix}lib"
+							die "non-empty dir found where there should be none: ${prefix}lib32"
+						fi
+					fi
+					;;
+				esac
+			else
+				# nothing exists, so just set it up sanely
+				ewarn "Initializing ${prefix}lib as a dir"
+				mkdir -p "${prefix}" || die
+				rm -f "${prefix}lib" || die
+				ln -s ${def_libdir} "${prefix}lib" || die
+			fi
+		fi
+	done
+}
+
+pkg_preinst() {
+	# Bug #217848 - Since the remap_dns_vars() called by pkg_preinst() of
+	# the baselayout-1.x ebuild copies all the real configs from the user's
+	# /etc/conf.d into ${D}, it makes them all appear to be the default
+	# versions. In order to protect them from being unmerged after this
+	# upgrade, modify their timestamps.
+	touch "${ROOT}"/etc/conf.d/* 2>/dev/null
+
+	# This is written in src_install (so it's in CONTENTS), but punt all
+	# pending updates to avoid user having to do etc-update (and make the
+	# pkg_postinst logic simpler).
+	rm -f "${ROOT}"/etc/._cfg????_gentoo-release
+
+	# We need to install directories and maybe some dev nodes when building
+	# stages, but they cannot be in CONTENTS.
+	# Also, we cannot reference $S as binpkg will break so we do this.
+	multilib_layout
+	if use build ; then
+		emake -C "${D}/usr/share/${PN}" DESTDIR="${ROOT}" layout || die
+	fi
+	rm -f "${D}"/usr/share/${PN}/Makefile
+}
+
+src_install() {
+	emake \
+		OS=$(usex kernel_FreeBSD BSD Linux) \
+		DESTDIR="${D}" \
+		install || die
+	dodoc ChangeLog.svn
+
+	# need the makefile in pkg_preinst
+	insinto /usr/share/${PN}
+	doins Makefile || die
+
+	# handle multilib paths.  do it here because we want this behavior
+	# regardless of the C library that you're using.  we do explicitly
+	# list paths which the native ldconfig searches, but this isn't
+	# problematic as it doesn't change the resulting ld.so.cache or
+	# take longer to generate.  similarly, listing both the native
+	# path and the symlinked path doesn't change the resulting cache.
+	local libdir ldpaths
+	for libdir in $(get_all_libdirs) ; do
+		ldpaths+=":/${libdir}:/usr/${libdir}:/usr/local/${libdir}"
+	done
+	echo "LDPATH='${ldpaths#:}'" >> "${D}"/etc/env.d/00basic
+
+	# rc-scripts version for testing of features that *should* be present
+	echo "Gentoo Base System release ${PV}" > "${D}"/etc/gentoo-release
+}
+
+pkg_postinst() {
+	local x
+
+	# We installed some files to /usr/share/baselayout instead of /etc to stop
+	# (1) overwriting the user's settings
+	# (2) screwing things up when attempting to merge files
+	# (3) accidentally packaging up personal files with quickpkg
+	# If they don't exist then we install them
+	for x in master.passwd passwd shadow group fstab ; do
+		[ -e "${ROOT}etc/${x}" ] && continue
+		[ -e "${ROOT}usr/share/baselayout/${x}" ] || continue
+		cp -p "${ROOT}usr/share/baselayout/${x}" "${ROOT}"etc
+	done
+
+	# Force shadow permissions to not be world-readable #260993
+	for x in shadow ; do
+		[ -e "${ROOT}etc/${x}" ] && chmod o-rwx "${ROOT}etc/${x}"
+	done
+
+	# Take care of the etc-update for the user
+	if [ -e "${ROOT}"/etc/._cfg0000_gentoo-release ] ; then
+		mv "${ROOT}"/etc/._cfg0000_gentoo-release "${ROOT}"/etc/gentoo-release
+	fi
+
+	# whine about users that lack passwords #193541
+	if [[ -e ${ROOT}/etc/shadow ]] ; then
+		local bad_users=$(sed -n '/^[^:]*::/s|^\([^:]*\)::.*|\1|p' "${ROOT}"/etc/shadow)
+		if [[ -n ${bad_users} ]] ; then
+			echo
+			ewarn "The following users lack passwords!"
+			ewarn ${bad_users}
+		fi
+	fi
+
+	# baselayout leaves behind a lot of .keep files, so let's clean them up
+	find "${ROOT}"/lib*/rcscripts/ -name .keep -exec rm -f {} + 2>/dev/null
+	find "${ROOT}"/lib*/rcscripts/ -depth -type d -exec rmdir {} + 2>/dev/null
+
+	# whine about users with invalid shells #215698
+	if [[ -e ${ROOT}/etc/passwd ]] ; then
+		local bad_shells=$(awk -F: 'system("test -e " $7) { print $1 " - " $7}' /etc/passwd | sort)
+		if [[ -n ${bad_shells} ]] ; then
+			echo
+			ewarn "The following users have non-existent shells!"
+			ewarn "${bad_shells}"
+		fi
+	fi
+
+	# http://bugs.gentoo.org/361349
+	if use kernel_linux; then
+		mkdir -p "${ROOT}"/run
+
+		if ! grep -qs "^tmpfs.*/run " "${ROOT}"/proc/mounts ; then
+			echo
+			ewarn "You should reboot the system now to get /run mounted with tmpfs!"
+		fi
+	fi
+}
diff --git a/sys-apps/biosdevname/Manifest b/sys-apps/biosdevname/Manifest
index 7466872aaed2..059cd1d2c9ad 100644
--- a/sys-apps/biosdevname/Manifest
+++ b/sys-apps/biosdevname/Manifest
@@ -1 +1,2 @@
 DIST biosdevname-0.3.11.tar.gz 186408 RMD160 a81a33ecdf03e4cadc71679b11415b530f266b67 SHA1 1a2afa8281678ff7aad0a26e7cfbd8ffa9119228 SHA256 02c127f7fff76127cd6006e7cdd9da9335035bcb3e0a0fcf039fbb5c0f5d2dc0
+DIST biosdevname-0.4.0.tar.gz 187775 RMD160 74f0c00d7274577c5363d48bc023a794e674bee2 SHA1 8efb0966425729c2be805c7f9779661a9c90d19f SHA256 7d567ea8081bc83c6fe17fa32bf8e2b852636a733f5e4d9d583fedeb2f48e21b
diff --git a/sys-apps/biosdevname/biosdevname-0.3.11-r1.ebuild b/sys-apps/biosdevname/biosdevname-0.3.11-r1.ebuild
index 0470b2956581..b1adaa4c4f78 100644
--- a/sys-apps/biosdevname/biosdevname-0.3.11-r1.ebuild
+++ b/sys-apps/biosdevname/biosdevname-0.3.11-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/biosdevname/biosdevname-0.3.11-r1.ebuild,v 1.3 2012/03/24 17:15:36 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/biosdevname/biosdevname-0.3.11-r1.ebuild,v 1.4 2012/05/16 09:28:09 aidecoe Exp $
 
 EAPI=4
 
@@ -10,7 +10,7 @@ SRC_URI="http://linux.dell.com/biosdevname/${P}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 CDEPEND="sys-fs/udev"
diff --git a/sys-apps/biosdevname/biosdevname-0.4.0.ebuild b/sys-apps/biosdevname/biosdevname-0.4.0.ebuild
new file mode 100644
index 000000000000..40af6b8ce7e7
--- /dev/null
+++ b/sys-apps/biosdevname/biosdevname-0.4.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/biosdevname/biosdevname-0.4.0.ebuild,v 1.1 2012/05/16 09:28:09 aidecoe Exp $
+
+EAPI=4
+
+DESCRIPTION="Sets BIOS-given device names instead of kernel eth* names"
+HOMEPAGE="http://linux.dell.com/biosdevname/"
+SRC_URI="http://linux.dell.com/biosdevname/${P}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+CDEPEND="sys-fs/udev"
+DEPEND="${CDEPEND}
+	sys-apps/pciutils"
+RDEPEND="${CDEPEND}"
+
+src_prepare() {
+	default
+	sed -e 's|/sbin/biosdevname|/usr\0|g' -i "${S}"/biosdevname.rules.in
+}
+
+pkg_postinst() {
+	elog "To make it working you need to remove"
+	elog ""
+	elog "  /etc/udev/rules.d/70-persistent-net.rules"
+	elog ""
+	elog "and then reboot the machine. After reboot ethernet devices names will"
+	elog "change to the ones reported by BIOS. For more information you might"
+	elog "want to read following document:"
+	elog ""
+	elog "  http://fedoraproject.org/wiki/Features/ConsistentNetworkDeviceNaming"
+	elog ""
+	elog "To disable this feature, pass biosdevname=0 to kernel command line."
+	elog ""
+	elog "If you use Dracut, you might want to enable 'biosdevname' module"
+	elog "(in DRACUT_MODULES variable)."
+}
diff --git a/sys-fs/udisks/udisks-1.97.0-r1.ebuild b/sys-fs/udisks/udisks-1.97.0-r1.ebuild
index 9102437a7a6c..e864a7634c18 100644
--- a/sys-fs/udisks/udisks-1.97.0-r1.ebuild
+++ b/sys-fs/udisks/udisks-1.97.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/sys-fs/udisks/udisks-1.97.0-r1.ebuild,v 1.2 2012/05/15 12:57:42 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udisks/udisks-1.97.0-r1.ebuild,v 1.3 2012/05/16 06:16:56 ssuominen Exp $
 
 EAPI=4
 inherit eutils bash-completion-r1 linux-info systemd
@@ -90,4 +90,10 @@ src_install() {
 
 pkg_postinst() {
 	mkdir -p "${EROOT}"/run #415987
+
+	# See pkg_postinst() of >=sys-apps/baselayout-2.1-r1. Keep in sync?
+	if ! grep -qs "^tmpfs.*/run " "${EROOT}"/proc/mounts ; then
+		echo
+		ewarn "You should reboot the system now to get /run mounted with tmpfs!"
+	fi
 }
diff --git a/virtual/init/init-0.ebuild b/virtual/init/init-0.ebuild
index e030f4bf43bf..be50773920f1 100644
--- a/virtual/init/init-0.ebuild
+++ b/virtual/init/init-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/virtual/init/init-0.ebuild,v 1.15 2012/05/12 03:35:11 heroxbd Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/init/init-0.ebuild,v 1.16 2012/05/16 07:40:58 heroxbd Exp $
 
 DESCRIPTION="Virtual for various init implementations"
 HOMEPAGE=""
@@ -11,6 +11,8 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE=""
 
-RDEPEND="kernel_linux? ( || ( >=sys-apps/sysvinit-2.86-r6 sys-process/runit ) )
-	kernel_FreeBSD? ( sys-freebsd/freebsd-sbin )"
+RDEPEND="!prefix? (
+	kernel_linux? ( || ( >=sys-apps/sysvinit-2.86-r6 sys-process/runit ) )
+	kernel_FreeBSD? ( sys-freebsd/freebsd-sbin )
+	)"
 DEPEND=""
diff --git a/x11-misc/see/Manifest b/x11-misc/see/Manifest
deleted file mode 100644
index a1a8c8909b41..000000000000
--- a/x11-misc/see/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST see-0.6.tar.bz2 139769 RMD160 dafa6133324bf5b54374e5730c5f760dd7dd8ace SHA1 bc665fddf0c1cbfd432bf44b3f431f9acd44e65d SHA256 291e8973b3687bc0cf0bedf0a2b88f7301a9bef543f10e1f20260dfee288bdc9
diff --git a/x11-misc/seetxt/Manifest b/x11-misc/seetxt/Manifest
new file mode 100644
index 000000000000..b5817701ee69
--- /dev/null
+++ b/x11-misc/seetxt/Manifest
@@ -0,0 +1,2 @@
+DIST see-0.6.tar.bz2 139769 RMD160 dafa6133324bf5b54374e5730c5f760dd7dd8ace SHA1 bc665fddf0c1cbfd432bf44b3f431f9acd44e65d SHA256 291e8973b3687bc0cf0bedf0a2b88f7301a9bef543f10e1f20260dfee288bdc9
+DIST seetxt-0.72.tar.bz2 141695 RMD160 d6bd6ffc45c7477845efb12bbd524ad3e1ecca1f SHA1 95b1359a54977e19d09ce4449c5bf17db795ee6d SHA256 c38786057e3939f262235c68cf3b8a7d7ab1450ffe4508ec98ec10e16b396159
diff --git a/x11-misc/see/files/0.6-respect_destdir.patch b/x11-misc/seetxt/files/0.6-respect_destdir.patch
similarity index 100%
rename from x11-misc/see/files/0.6-respect_destdir.patch
rename to x11-misc/seetxt/files/0.6-respect_destdir.patch
diff --git a/x11-misc/see/metadata.xml b/x11-misc/seetxt/metadata.xml
similarity index 100%
rename from x11-misc/see/metadata.xml
rename to x11-misc/seetxt/metadata.xml
diff --git a/x11-misc/see/see-0.6.ebuild b/x11-misc/seetxt/seetxt-0.6.ebuild
similarity index 73%
rename from x11-misc/see/see-0.6.ebuild
rename to x11-misc/seetxt/seetxt-0.6.ebuild
index 403d841b6f2c..ced516a316ac 100644
--- a/x11-misc/see/see-0.6.ebuild
+++ b/x11-misc/seetxt/seetxt-0.6.ebuild
@@ -1,14 +1,16 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/see/see-0.6.ebuild,v 1.2 2012/05/05 04:53:47 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/seetxt/seetxt-0.6.ebuild,v 1.1 2012/05/16 06:34:17 dev-zero Exp $
 
 EAPI=3
 
 inherit autotools eutils
 
+MY_P="see-${PV}"
+
 DESCRIPTION="Clever, lightweight GUI text file and manual page viewer for X windows."
 HOMEPAGE="http://code.google.com/p/seetxt/"
-SRC_URI="http://seetxt.googlecode.com/files/${P}.tar.bz2"
+SRC_URI="http://seetxt.googlecode.com/files/${MY_P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -19,6 +21,8 @@ RDEPEND="x11-libs/gtk+:2"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
+S="${WORKDIR}/${MY_P}"
+
 src_prepare() {
 	epatch "${FILESDIR}/${PV}-respect_destdir.patch"
 	eautoreconf
diff --git a/x11-misc/seetxt/seetxt-0.72.ebuild b/x11-misc/seetxt/seetxt-0.72.ebuild
new file mode 100644
index 000000000000..45cc43edd442
--- /dev/null
+++ b/x11-misc/seetxt/seetxt-0.72.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/seetxt/seetxt-0.72.ebuild,v 1.1 2012/05/16 06:34:17 dev-zero Exp $
+
+EAPI=4
+
+DESCRIPTION="Clever, lightweight GUI text file and manual page viewer for X windows."
+HOMEPAGE="http://code.google.com/p/seetxt/ http://seetxt.sourceforge.net/"
+SRC_URI="http://seetxt.googlecode.com/files/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="x11-libs/gtk+:2"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"