diff --git a/app-arch/libpar2/libpar2-0.2-r3.ebuild b/app-arch/libpar2/libpar2-0.2-r3.ebuild
index a1cae37637a1..283ee9f15d84 100644
--- a/app-arch/libpar2/libpar2-0.2-r3.ebuild
+++ b/app-arch/libpar2/libpar2-0.2-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/libpar2/libpar2-0.2-r3.ebuild,v 1.4 2012/02/24 14:23:09 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/libpar2/libpar2-0.2-r3.ebuild,v 1.5 2012/02/27 17:36:41 ranger Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/parchive/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ppc x86"
+KEYWORDS="~alpha amd64 ppc x86"
 IUSE="static-libs"
 
 RDEPEND="dev-libs/libsigc++:2"
diff --git a/app-editors/emacs-vcs/Manifest b/app-editors/emacs-vcs/Manifest
index f4fef754a0af..668f93a7be19 100644
--- a/app-editors/emacs-vcs/Manifest
+++ b/app-editors/emacs-vcs/Manifest
@@ -1 +1,2 @@
 DIST emacs-24.0.93.tar.gz 51257120 RMD160 6a3b6ae0ecab96a53828856de6db0c016cc5d47f SHA1 0b98ecf3e9f44497bfaf4203c2afc81252c4bafe SHA256 4a100accb2f76231aed4dddb32d3725dec131280ad3bdf1b39b52ce337a210fe
+DIST emacs-24.0.94.tar.gz 51251891 RMD160 3593d6a003b556f3755ba6ea3f8a92ba1b5ba2af SHA1 d70fe6da2d2b943423fcf16badb0294566710eaa SHA256 238dacb608e74fce088cde61b82907ba6ae5d975e88f38a0b199dbdbdb28feb5
diff --git a/app-editors/emacs-vcs/emacs-vcs-24.0.94.ebuild b/app-editors/emacs-vcs/emacs-vcs-24.0.94.ebuild
new file mode 100644
index 000000000000..721a894df8a4
--- /dev/null
+++ b/app-editors/emacs-vcs/emacs-vcs-24.0.94.ebuild
@@ -0,0 +1,369 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.94.ebuild,v 1.1 2012/02/27 22:34:38 ulm Exp $
+
+EAPI=4
+
+inherit autotools elisp-common eutils flag-o-matic multilib
+
+if [[ ${PV##*.} = 9999 ]]; then
+	EBZR_PROJECT="emacs"
+	EBZR_BRANCH="trunk"
+	EBZR_REPO_URI="bzr://bzr.savannah.gnu.org/emacs/${EBZR_BRANCH}/"
+	# "Nosmart" is much faster for initial branching.
+	EBZR_INITIAL_URI="nosmart+${EBZR_REPO_URI}"
+	inherit bzr
+	SRC_URI=""
+else
+	SRC_URI="mirror://gentoo/emacs-${PV}.tar.gz
+		ftp://alpha.gnu.org/gnu/emacs/pretest/emacs-${PV}.tar.gz"
+	# FULL_VERSION keeps the full version number, which is needed in
+	# order to determine some path information correctly for copy/move
+	# operations later on
+	FULL_VERSION="${PV%%_*}"
+	S="${WORKDIR}/emacs-${FULL_VERSION}"
+fi
+
+DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
+HOMEPAGE="http://www.gnu.org/software/emacs/"
+
+LICENSE="GPL-3 FDL-1.3 BSD as-is MIT W3C unicode PSF-2"
+SLOT="24"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="alsa aqua athena dbus gconf gif gnutls gpm gsettings gtk gtk3 gzip-el hesiod imagemagick jpeg kerberos libxml2 m17n-lib motif png selinux sound source svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm"
+REQUIRED_USE="aqua? ( !X )"
+
+RDEPEND="sys-libs/ncurses
+	>=app-admin/eselect-emacs-1.2
+	net-libs/liblockfile
+	hesiod? ( net-dns/hesiod )
+	kerberos? ( virtual/krb5 )
+	alsa? ( media-libs/alsa-lib )
+	gpm? ( sys-libs/gpm )
+	dbus? ( sys-apps/dbus )
+	gnutls? ( net-libs/gnutls )
+	libxml2? ( >=dev-libs/libxml2-2.2.0 )
+	selinux? ( sys-libs/libselinux )
+	X? (
+		x11-libs/libXmu
+		x11-libs/libXt
+		x11-misc/xbitmaps
+		gconf? ( >=gnome-base/gconf-2.26.2 )
+		gsettings? ( >=dev-libs/glib-2.28.6 )
+		gif? ( media-libs/giflib )
+		jpeg? ( virtual/jpeg )
+		png? ( >=media-libs/libpng-1.4:0 )
+		svg? ( >=gnome-base/librsvg-2.0 )
+		tiff? ( media-libs/tiff )
+		xpm? ( x11-libs/libXpm )
+		imagemagick? ( >=media-gfx/imagemagick-6.6.2 )
+		xft? (
+			media-libs/fontconfig
+			media-libs/freetype
+			x11-libs/libXft
+			m17n-lib? (
+				>=dev-libs/libotf-0.9.4
+				>=dev-libs/m17n-lib-1.5.1
+			)
+		)
+		gtk? (
+			gtk3? ( x11-libs/gtk+:3 )
+			!gtk3? ( x11-libs/gtk+:2 )
+		)
+		!gtk? (
+			Xaw3d? ( x11-libs/libXaw3d )
+			!Xaw3d? (
+				athena? ( x11-libs/libXaw )
+				!athena? ( motif? ( >=x11-libs/openmotif-2.3:0 ) )
+			)
+		)
+	)"
+
+DEPEND="${RDEPEND}
+	alsa? ( dev-util/pkgconfig )
+	dbus? ( dev-util/pkgconfig )
+	gnutls? ( dev-util/pkgconfig )
+	libxml2? ( dev-util/pkgconfig )
+	X? ( dev-util/pkgconfig )
+	gzip-el? ( app-arch/gzip )"
+
+RDEPEND="${RDEPEND}
+	>=app-emacs/emacs-common-gentoo-1.3[X?]"
+
+EMACS_SUFFIX="emacs-${SLOT}"
+SITEFILE="20${PN}-${SLOT}-gentoo.el"
+
+src_prepare() {
+	if [[ ${PV##*.} = 9999 ]]; then
+		FULL_VERSION=$(sed -n 's/^AC_INIT(emacs,[ \t]*\([^ \t,)]*\).*/\1/p' \
+			configure.in)
+		[[ ${FULL_VERSION} ]] || die "Cannot determine current Emacs version"
+		einfo "Emacs branch: ${EBZR_BRANCH}"
+		einfo "Revision: ${EBZR_REVISION:-${EBZR_REVNO}}"
+		einfo "Emacs version number: ${FULL_VERSION}"
+		[[ ${FULL_VERSION} =~ ^${PV%.*}(\..*)?$ ]] \
+			|| die "Upstream version number changed to ${FULL_VERSION}"
+	fi
+
+	epatch "${FILESDIR}"/emacs-24.0.92-ns-appdirs.patch
+
+	if ! use alsa; then
+		# ALSA is detected even if not requested by its USE flag.
+		# Suppress it by supplying pkg-config with a wrong library name.
+		sed -i -e "/ALSA_MODULES=/s/alsa/DiSaBlEaLsA/" configure.in \
+			|| die "unable to sed configure.in"
+	fi
+	if ! use gzip-el; then
+		# Emacs' build system automatically detects the gzip binary and
+		# compresses el files. We don't want that so confuse it with a
+		# wrong binary name
+		sed -i -e "s/ gzip/ PrEvEnTcOmPrEsSiOn/" configure.in \
+			|| die "unable to sed configure.in"
+	fi
+
+	AT_M4DIR=m4 eautoreconf
+}
+
+src_configure() {
+	ALLOWED_FLAGS=""
+	strip-flags
+
+	if use sh; then
+		replace-flags -O[1-9] -O0		#262359
+	elif use ia64; then
+		replace-flags -O[2-9] -O1		#325373
+	else
+		replace-flags -O[3-9] -O2
+	fi
+
+	local myconf
+
+	if use alsa && ! use sound; then
+		einfo "Although sound USE flag is disabled you chose to have alsa,"
+		einfo "so sound is switched on anyway."
+		myconf="${myconf} --with-sound"
+	else
+		myconf="${myconf} $(use_with sound)"
+	fi
+
+	if use X; then
+		myconf="${myconf} --with-x --without-ns"
+		myconf="${myconf} $(use_with gconf)"
+		myconf="${myconf} $(use_with gsettings)"
+		myconf="${myconf} $(use_with toolkit-scroll-bars)"
+		myconf="${myconf} $(use_with wide-int)"
+		myconf="${myconf} $(use_with gif) $(use_with jpeg)"
+		myconf="${myconf} $(use_with png) $(use_with svg rsvg)"
+		myconf="${myconf} $(use_with tiff) $(use_with xpm)"
+		myconf="${myconf} $(use_with imagemagick)"
+
+		if use xft; then
+			myconf="${myconf} --with-xft"
+			myconf="${myconf} $(use_with m17n-lib libotf)"
+			myconf="${myconf} $(use_with m17n-lib m17n-flt)"
+		else
+			myconf="${myconf} --without-xft"
+			myconf="${myconf} --without-libotf --without-m17n-flt"
+			use m17n-lib && ewarn \
+				"USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
+		fi
+
+		if use gtk; then
+			einfo "Configuring to build with GIMP Toolkit (GTK+)"
+			myconf="${myconf} --with-x-toolkit=$(usev gtk3 || echo gtk)"
+			local f
+			for f in athena Xaw3d motif; do
+				use ${f} && ewarn "USE flag \"${f}\" ignored" \
+					"(superseded by \"gtk\")"
+			done
+		elif use athena || use Xaw3d; then
+			einfo "Configuring to build with Athena/Lucid toolkit"
+			myconf="${myconf} --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)"
+			use motif && ewarn "USE flag \"motif\" ignored" \
+				"(superseded by \"athena\" or \"Xaw3d\")"
+		elif use motif; then
+			einfo "Configuring to build with Motif toolkit"
+			myconf="${myconf} --with-x-toolkit=motif"
+		else
+			einfo "Configuring to build with no toolkit"
+			myconf="${myconf} --with-x-toolkit=no"
+		fi
+
+		! use gtk && use gtk3 \
+			&& ewarn "USE flag \"gtk3\" has no effect if \"gtk\" is not set."
+	elif use aqua; then
+		einfo "Configuring to build with Cocoa support"
+		myconf="${myconf} --with-ns --disable-ns-self-contained"
+		myconf="${myconf} --without-x"
+	else
+		myconf="${myconf} --without-x --without-ns"
+	fi
+
+	if [[ ${PV##*.} = 9999 ]]; then
+		# These variables are not needed for building. We add them to
+		# configure options because they are stored in the Emacs binary
+		# and available in variable "system-configuration-options".
+		myconf="${myconf} EBZR_BRANCH=${EBZR_BRANCH} EBZR_REVNO=${EBZR_REVNO}"
+	fi
+
+	# According to configure, this option is only used for GNU/Linux
+	# (x86_64 and s390). For Gentoo Prefix we have to explicitly spell
+	# out the location because $(get_libdir) does not necessarily return
+	# something that matches the host OS's libdir naming (e.g. RHEL).
+	local crtdir=$($(tc-getCC) -print-file-name=crt1.o)
+	crtdir=${crtdir%/*}
+
+	econf \
+		--program-suffix=-${EMACS_SUFFIX} \
+		--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
+		--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
+		--with-crt-dir="${crtdir}" \
+		--with-gameuser="${GAMES_USER_DED:-games}" \
+		--without-compress-info \
+		--disable-maintainer-mode \
+		$(use_with hesiod) \
+		$(use_with kerberos) $(use_with kerberos kerberos5) \
+		$(use_with gpm) \
+		$(use_with dbus) \
+		$(use_with gnutls) \
+		$(use_with libxml2 xml2) \
+		$(use_with selinux) \
+		${myconf}
+}
+
+src_compile() {
+	export SANDBOX_ON=0			# for the unbelievers, see Bug #131505
+	if [[ ${PV##*.} = 9999 ]]; then
+		emake CC="$(tc-getCC)" bootstrap
+		# cleanup, otherwise emacs will be dumped again in src_install
+		(cd src; emake versionclean)
+	fi
+	# set last component of emacs-version to (package revision + 1)
+	touch src/emacs-${FULL_VERSION}.${PR#r}
+	emake CC="$(tc-getCC)"
+}
+
+src_install () {
+	local i m
+
+	emake install DESTDIR="${D}"
+
+	rm "${ED}"/usr/bin/emacs-${FULL_VERSION}-${EMACS_SUFFIX} \
+		|| die "removing duplicate emacs executable failed"
+	mv "${ED}"/usr/bin/emacs-${EMACS_SUFFIX} "${ED}"/usr/bin/${EMACS_SUFFIX} \
+		|| die "moving Emacs executable failed"
+
+	# move man pages to the correct place
+	for m in "${ED}"/usr/share/man/man1/* ; do
+		mv "${m}" "${m%.1}-${EMACS_SUFFIX}.1" || die "mv man failed"
+	done
+
+	# move info dir to avoid collisions with the dir file generated by portage
+	mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} \
+		|| die "moving info dir failed"
+	touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
+	docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
+
+	# avoid collision between slots, see bug #169033 e.g.
+	rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
+	rm -rf "${ED}"/usr/share/{applications,icons}
+	rm "${ED}"/var/lib/games/emacs/{snake,tetris}-scores
+	keepdir /var/lib/games/emacs
+
+	# remove unused <version>/site-lisp dir
+	rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp
+
+	local c=";;"
+	if use source; then
+		insinto /usr/share/emacs/${FULL_VERSION}/src
+		# This is not meant to install all the source -- just the
+		# C source you might find via find-function
+		doins src/*.{c,h,m}
+		doins -r src/{m,s}
+		rm "${ED}"/usr/share/emacs/${FULL_VERSION}/src/{m,s}/README
+		c=""
+	fi
+
+	sed 's/^X//' >"${T}/${SITEFILE}" <<-EOF
+	X
+	;;; ${PN}-${SLOT} site-lisp configuration
+	X
+	(when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
+	X  ${c}(setq find-function-C-source-directory
+	X  ${c}      "${EPREFIX}/usr/share/emacs/${FULL_VERSION}/src")
+	X  (let ((path (getenv "INFOPATH"))
+	X	(dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}")
+	X	(re "\\\\\`${EPREFIX}/usr/share/info\\\\>"))
+	X    (and path
+	X	 ;; move Emacs Info dir before anything else in /usr/share/info
+	X	 (let* ((p (cons nil (split-string path ":" t))) (q p))
+	X	   (while (and (cdr q) (not (string-match re (cadr q))))
+	X	     (setq q (cdr q)))
+	X	   (setcdr q (cons dir (delete dir (cdr q))))
+	X	   (setq Info-directory-list (prune-directory-list (cdr p)))))))
+	EOF
+	elisp-site-file-install "${T}/${SITEFILE}" || die
+
+	dodoc README BUGS
+
+	if use aqua; then
+		dodir /Applications/Gentoo
+		rm -rf "${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app
+		mv nextstep/Emacs.app \
+			"${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app || die
+		elog "Emacs${EMACS_SUFFIX#emacs}.app is in ${EPREFIX}/Applications/Gentoo."
+		elog "You may want to copy or symlink it into /Applications by yourself."
+	fi
+}
+
+pkg_preinst() {
+	# move Info dir file to correct name
+	local infodir=/usr/share/info/${EMACS_SUFFIX} f
+	if [[ -f ${ED}${infodir}/dir.orig ]]; then
+		mv "${ED}"${infodir}/dir{.orig,} || die "moving info dir failed"
+	else
+		# this should not happen in EAPI 4
+		ewarn "Regenerating Info directory index in ${infodir} ..."
+		rm -f "${ED}"${infodir}/dir{,.*}
+		for f in "${ED}"${infodir}/*; do
+			if [[ ${f##*/} != *-[0-9]* && -e ${f} ]]; then
+				install-info --info-dir="${ED}"${infodir} "${f}" \
+					|| die "install-info failed"
+			fi
+		done
+	fi
+}
+
+pkg_postinst() {
+	local f
+	for f in "${EROOT}"/var/lib/games/emacs/{snake,tetris}-scores; do
+		[[ -e ${f} ]] || touch "${f}"
+	done
+	chown "${GAMES_USER_DED:-games}" "${EROOT}"/var/lib/games/emacs
+
+	elisp-site-regen
+	eselect emacs update ifunset
+
+	if use X; then
+		elog "You need to install some fonts for Emacs."
+		elog "Installing media-fonts/font-adobe-{75,100}dpi on the X server's"
+		elog "machine would satisfy basic Emacs requirements under X11."
+		elog "See also http://www.gentoo.org/proj/en/lisp/emacs/xft.xml"
+		elog "for how to enable anti-aliased fonts."
+		elog
+	fi
+
+	elog "You can set the version to be started by /usr/bin/emacs through"
+	elog "the Emacs eselect module, which also redirects man and info pages."
+	elog "Therefore, several Emacs versions can be installed at the same time."
+	elog "\"man emacs.eselect\" for details."
+	elog
+	elog "If you upgrade from a previous major version of Emacs, then it is"
+	elog "strongly recommended that you use app-admin/emacs-updater to rebuild"
+	elog "all byte-compiled elisp files of the installed Emacs packages."
+}
+
+pkg_postrm() {
+	elisp-site-regen
+	eselect emacs update ifunset
+}
diff --git a/app-emulation/wine/wine-1.2.1.ebuild b/app-emulation/wine/wine-1.2.1.ebuild
index 7209372d968c..066ce89281e4 100644
--- a/app-emulation/wine/wine-1.2.1.ebuild
+++ b/app-emulation/wine/wine-1.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.2.1.ebuild,v 1.14 2012/01/14 03:20:51 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.2.1.ebuild,v 1.15 2012/02/28 01:31:09 vapier Exp $
 
 EAPI="4"
 
@@ -94,6 +94,7 @@ DEPEND="${RDEPEND}
 	)
 	xinerama? ( x11-proto/xineramaproto )
 	!hardened? ( sys-devel/prelink )
+	dev-util/pkgconfig
 	virtual/yacc
 	sys-devel/flex"
 
diff --git a/app-emulation/wine/wine-1.2.2.ebuild b/app-emulation/wine/wine-1.2.2.ebuild
index dddd32e502ea..bc87f35fa819 100644
--- a/app-emulation/wine/wine-1.2.2.ebuild
+++ b/app-emulation/wine/wine-1.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.2.2.ebuild,v 1.13 2012/01/14 03:20:51 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.2.2.ebuild,v 1.14 2012/02/28 01:31:09 vapier Exp $
 
 EAPI="4"
 
@@ -95,6 +95,7 @@ DEPEND="${RDEPEND}
 	)
 	xinerama? ( x11-proto/xineramaproto )
 	!hardened? ( sys-devel/prelink )
+	dev-util/pkgconfig
 	virtual/yacc
 	sys-devel/flex"
 
diff --git a/app-emulation/wine/wine-1.2.3.ebuild b/app-emulation/wine/wine-1.2.3.ebuild
index d7c05ed09ffc..9d193170847a 100644
--- a/app-emulation/wine/wine-1.2.3.ebuild
+++ b/app-emulation/wine/wine-1.2.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/app-emulation/wine/wine-1.2.3.ebuild,v 1.12 2012/01/14 03:20:51 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.2.3.ebuild,v 1.13 2012/02/28 01:31:09 vapier Exp $
 
 EAPI="4"
 
@@ -95,6 +95,7 @@ DEPEND="${RDEPEND}
 	)
 	xinerama? ( x11-proto/xineramaproto )
 	!hardened? ( sys-devel/prelink )
+	dev-util/pkgconfig
 	virtual/yacc
 	sys-devel/flex"
 
diff --git a/app-emulation/wine/wine-1.2.ebuild b/app-emulation/wine/wine-1.2.ebuild
index 017b9ffecc1b..8bb4dc6894fa 100644
--- a/app-emulation/wine/wine-1.2.ebuild
+++ b/app-emulation/wine/wine-1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.2.ebuild,v 1.17 2012/01/14 03:20:51 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.2.ebuild,v 1.18 2012/02/28 01:31:09 vapier Exp $
 
 EAPI="4"
 
@@ -92,6 +92,7 @@ DEPEND="${RDEPEND}
 	)
 	xinerama? ( x11-proto/xineramaproto )
 	!hardened? ( sys-devel/prelink )
+	dev-util/pkgconfig
 	virtual/yacc
 	sys-devel/flex"
 
diff --git a/app-emulation/wine/wine-1.3.0.ebuild b/app-emulation/wine/wine-1.3.0.ebuild
index fa661dac4f24..5432e0f1decb 100644
--- a/app-emulation/wine/wine-1.3.0.ebuild
+++ b/app-emulation/wine/wine-1.3.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/app-emulation/wine/wine-1.3.0.ebuild,v 1.19 2012/01/14 03:20:51 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.0.ebuild,v 1.20 2012/02/28 01:31:09 vapier Exp $
 
 EAPI="4"
 
@@ -89,6 +89,7 @@ DEPEND="${RDEPEND}
 	)
 	xinerama? ( x11-proto/xineramaproto )
 	!hardened? ( sys-devel/prelink )
+	dev-util/pkgconfig
 	virtual/yacc
 	sys-devel/flex"
 
diff --git a/app-emulation/wine/wine-1.3.1.ebuild b/app-emulation/wine/wine-1.3.1.ebuild
index 1b5bab8583fd..44cb2a457d9b 100644
--- a/app-emulation/wine/wine-1.3.1.ebuild
+++ b/app-emulation/wine/wine-1.3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.1.ebuild,v 1.17 2012/01/14 03:20:51 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.1.ebuild,v 1.18 2012/02/28 01:31:09 vapier Exp $
 
 EAPI="4"
 
@@ -89,6 +89,7 @@ DEPEND="${RDEPEND}
 	)
 	xinerama? ( x11-proto/xineramaproto )
 	!hardened? ( sys-devel/prelink )
+	dev-util/pkgconfig
 	virtual/yacc
 	sys-devel/flex"
 
diff --git a/app-emulation/wine/wine-1.3.10.ebuild b/app-emulation/wine/wine-1.3.10.ebuild
index 653bd8ea5a7c..e30044e5d974 100644
--- a/app-emulation/wine/wine-1.3.10.ebuild
+++ b/app-emulation/wine/wine-1.3.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.10.ebuild,v 1.19 2012/01/14 03:20:51 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.10.ebuild,v 1.20 2012/02/28 01:31:09 vapier Exp $
 
 EAPI="4"
 
@@ -94,6 +94,7 @@ DEPEND="${RDEPEND}
 	)
 	xinerama? ( x11-proto/xineramaproto )
 	!hardened? ( sys-devel/prelink )
+	dev-util/pkgconfig
 	virtual/yacc
 	sys-devel/flex"
 
diff --git a/app-emulation/wine/wine-1.3.11.ebuild b/app-emulation/wine/wine-1.3.11.ebuild
index d6b50d6ff0e7..62bffa16e96b 100644
--- a/app-emulation/wine/wine-1.3.11.ebuild
+++ b/app-emulation/wine/wine-1.3.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.11.ebuild,v 1.18 2012/01/14 03:20:51 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.11.ebuild,v 1.19 2012/02/28 01:31:09 vapier Exp $
 
 EAPI="4"
 
@@ -95,6 +95,7 @@ DEPEND="${RDEPEND}
 	)
 	xinerama? ( x11-proto/xineramaproto )
 	!hardened? ( sys-devel/prelink )
+	dev-util/pkgconfig
 	virtual/yacc
 	sys-devel/flex"
 
diff --git a/app-emulation/wine/wine-1.3.12.ebuild b/app-emulation/wine/wine-1.3.12.ebuild
index 3d1c4a9a1c9a..fcdd75d262de 100644
--- a/app-emulation/wine/wine-1.3.12.ebuild
+++ b/app-emulation/wine/wine-1.3.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.12.ebuild,v 1.16 2012/01/14 03:20:51 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.12.ebuild,v 1.17 2012/02/28 01:31:09 vapier Exp $
 
 EAPI="4"
 
@@ -95,6 +95,7 @@ DEPEND="${RDEPEND}
 	)
 	xinerama? ( x11-proto/xineramaproto )
 	!hardened? ( sys-devel/prelink )
+	dev-util/pkgconfig
 	virtual/yacc
 	sys-devel/flex"
 
diff --git a/app-emulation/wine/wine-1.3.13.ebuild b/app-emulation/wine/wine-1.3.13.ebuild
index d27b4c6a52b1..1805043a0e20 100644
--- a/app-emulation/wine/wine-1.3.13.ebuild
+++ b/app-emulation/wine/wine-1.3.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.13.ebuild,v 1.16 2012/01/14 03:20:51 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.13.ebuild,v 1.17 2012/02/28 01:31:09 vapier Exp $
 
 EAPI="4"
 
@@ -95,6 +95,7 @@ DEPEND="${RDEPEND}
 	)
 	xinerama? ( x11-proto/xineramaproto )
 	!hardened? ( sys-devel/prelink )
+	dev-util/pkgconfig
 	virtual/yacc
 	sys-devel/flex"
 
diff --git a/app-emulation/wine/wine-1.3.14.ebuild b/app-emulation/wine/wine-1.3.14.ebuild
index e95007955dda..2208a43b2690 100644
--- a/app-emulation/wine/wine-1.3.14.ebuild
+++ b/app-emulation/wine/wine-1.3.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.14.ebuild,v 1.17 2012/01/14 03:20:51 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.14.ebuild,v 1.18 2012/02/28 01:31:09 vapier Exp $
 
 EAPI="4"
 
@@ -95,6 +95,7 @@ DEPEND="${RDEPEND}
 	)
 	xinerama? ( x11-proto/xineramaproto )
 	!hardened? ( sys-devel/prelink )
+	dev-util/pkgconfig
 	virtual/yacc
 	sys-devel/flex"
 
diff --git a/app-emulation/wine/wine-1.3.15.ebuild b/app-emulation/wine/wine-1.3.15.ebuild
index 6f7160f65e77..de0c708f6ff6 100644
--- a/app-emulation/wine/wine-1.3.15.ebuild
+++ b/app-emulation/wine/wine-1.3.15.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.15.ebuild,v 1.16 2012/01/14 03:20:51 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.15.ebuild,v 1.17 2012/02/28 01:31:09 vapier Exp $
 
 EAPI="4"
 
@@ -95,6 +95,7 @@ DEPEND="${RDEPEND}
 	)
 	xinerama? ( x11-proto/xineramaproto )
 	!hardened? ( sys-devel/prelink )
+	dev-util/pkgconfig
 	virtual/yacc
 	sys-devel/flex"
 
diff --git a/app-emulation/wine/wine-1.3.16.ebuild b/app-emulation/wine/wine-1.3.16.ebuild
index dba354d4ff26..ca37e0ec26f2 100644
--- a/app-emulation/wine/wine-1.3.16.ebuild
+++ b/app-emulation/wine/wine-1.3.16.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.16.ebuild,v 1.17 2012/01/14 03:20:51 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.16.ebuild,v 1.18 2012/02/28 01:31:09 vapier Exp $
 
 EAPI="4"
 
@@ -95,6 +95,7 @@ DEPEND="${RDEPEND}
 	)
 	xinerama? ( x11-proto/xineramaproto )
 	!hardened? ( sys-devel/prelink )
+	dev-util/pkgconfig
 	virtual/yacc
 	sys-devel/flex"
 
diff --git a/app-emulation/wine/wine-1.3.17.ebuild b/app-emulation/wine/wine-1.3.17.ebuild
index 1e03a31d026c..2707bb6027d6 100644
--- a/app-emulation/wine/wine-1.3.17.ebuild
+++ b/app-emulation/wine/wine-1.3.17.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.17.ebuild,v 1.17 2012/01/14 03:20:51 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.17.ebuild,v 1.18 2012/02/28 01:31:09 vapier Exp $
 
 EAPI="4"
 
@@ -95,6 +95,7 @@ DEPEND="${RDEPEND}
 	)
 	xinerama? ( x11-proto/xineramaproto )
 	!hardened? ( sys-devel/prelink )
+	dev-util/pkgconfig
 	virtual/yacc
 	sys-devel/flex"
 
diff --git a/app-emulation/wine/wine-1.3.18.ebuild b/app-emulation/wine/wine-1.3.18.ebuild
index 2367a3aba2c7..7f49c97600e3 100644
--- a/app-emulation/wine/wine-1.3.18.ebuild
+++ b/app-emulation/wine/wine-1.3.18.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.18.ebuild,v 1.17 2012/01/14 03:20:51 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.18.ebuild,v 1.18 2012/02/28 01:31:09 vapier Exp $
 
 EAPI="4"
 
@@ -95,6 +95,7 @@ DEPEND="${RDEPEND}
 	)
 	xinerama? ( x11-proto/xineramaproto )
 	!hardened? ( sys-devel/prelink )
+	dev-util/pkgconfig
 	virtual/yacc
 	sys-devel/flex"
 
diff --git a/app-emulation/wine/wine-1.3.19.ebuild b/app-emulation/wine/wine-1.3.19.ebuild
index afc33fa493a5..dbf86aacaf3d 100644
--- a/app-emulation/wine/wine-1.3.19.ebuild
+++ b/app-emulation/wine/wine-1.3.19.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.19.ebuild,v 1.16 2012/01/14 03:20:51 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.19.ebuild,v 1.17 2012/02/28 01:31:09 vapier Exp $
 
 EAPI="4"
 
@@ -95,6 +95,7 @@ DEPEND="${RDEPEND}
 	)
 	xinerama? ( x11-proto/xineramaproto )
 	!hardened? ( sys-devel/prelink )
+	dev-util/pkgconfig
 	virtual/yacc
 	sys-devel/flex"
 
diff --git a/app-emulation/wine/wine-1.3.2.ebuild b/app-emulation/wine/wine-1.3.2.ebuild
index 6e4c71b5b187..46f20ccc8478 100644
--- a/app-emulation/wine/wine-1.3.2.ebuild
+++ b/app-emulation/wine/wine-1.3.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.2.ebuild,v 1.19 2012/01/14 03:20:51 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.2.ebuild,v 1.20 2012/02/28 01:31:09 vapier Exp $
 
 EAPI="4"
 
@@ -92,6 +92,7 @@ DEPEND="${RDEPEND}
 	)
 	xinerama? ( x11-proto/xineramaproto )
 	!hardened? ( sys-devel/prelink )
+	dev-util/pkgconfig
 	virtual/yacc
 	sys-devel/flex"
 
diff --git a/app-emulation/wine/wine-1.3.20.ebuild b/app-emulation/wine/wine-1.3.20.ebuild
index 0a77d10eeef8..cb6a1f8cb620 100644
--- a/app-emulation/wine/wine-1.3.20.ebuild
+++ b/app-emulation/wine/wine-1.3.20.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.20.ebuild,v 1.15 2012/01/14 03:20:51 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.20.ebuild,v 1.16 2012/02/28 01:31:09 vapier Exp $
 
 EAPI="4"
 
@@ -95,6 +95,7 @@ DEPEND="${RDEPEND}
 	)
 	xinerama? ( x11-proto/xineramaproto )
 	!hardened? ( sys-devel/prelink )
+	dev-util/pkgconfig
 	virtual/yacc
 	sys-devel/flex"
 
diff --git a/app-emulation/wine/wine-1.3.21.ebuild b/app-emulation/wine/wine-1.3.21.ebuild
index f1b846cab6d8..4aca605565c8 100644
--- a/app-emulation/wine/wine-1.3.21.ebuild
+++ b/app-emulation/wine/wine-1.3.21.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.21.ebuild,v 1.15 2012/01/14 03:20:51 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.21.ebuild,v 1.16 2012/02/28 01:31:09 vapier Exp $
 
 EAPI="4"
 
@@ -95,6 +95,7 @@ DEPEND="${RDEPEND}
 	)
 	xinerama? ( x11-proto/xineramaproto )
 	!hardened? ( sys-devel/prelink )
+	dev-util/pkgconfig
 	virtual/yacc
 	sys-devel/flex"
 
diff --git a/app-emulation/wine/wine-1.3.22.ebuild b/app-emulation/wine/wine-1.3.22.ebuild
index 986438cecf5b..494e88db04f3 100644
--- a/app-emulation/wine/wine-1.3.22.ebuild
+++ b/app-emulation/wine/wine-1.3.22.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.22.ebuild,v 1.15 2012/01/14 03:20:51 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.22.ebuild,v 1.16 2012/02/28 01:31:09 vapier Exp $
 
 EAPI="4"
 
@@ -95,6 +95,7 @@ DEPEND="${RDEPEND}
 	)
 	xinerama? ( x11-proto/xineramaproto )
 	!hardened? ( sys-devel/prelink )
+	dev-util/pkgconfig
 	virtual/yacc
 	sys-devel/flex"
 
diff --git a/app-emulation/wine/wine-1.3.23.ebuild b/app-emulation/wine/wine-1.3.23.ebuild
index 142d035ea7e5..d9b7b0ee92bd 100644
--- a/app-emulation/wine/wine-1.3.23.ebuild
+++ b/app-emulation/wine/wine-1.3.23.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.23.ebuild,v 1.15 2012/01/14 03:20:51 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.23.ebuild,v 1.16 2012/02/28 01:31:09 vapier Exp $
 
 EAPI="4"
 
@@ -95,6 +95,7 @@ DEPEND="${RDEPEND}
 	)
 	xinerama? ( x11-proto/xineramaproto )
 	!hardened? ( sys-devel/prelink )
+	dev-util/pkgconfig
 	virtual/yacc
 	sys-devel/flex"
 
diff --git a/app-emulation/wine/wine-1.3.24.ebuild b/app-emulation/wine/wine-1.3.24.ebuild
index cfcf19090970..5145a62b5eb9 100644
--- a/app-emulation/wine/wine-1.3.24.ebuild
+++ b/app-emulation/wine/wine-1.3.24.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.24.ebuild,v 1.9 2012/01/14 03:20:51 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.24.ebuild,v 1.10 2012/02/28 01:31:09 vapier Exp $
 
 EAPI="4"
 
@@ -95,6 +95,7 @@ DEPEND="${RDEPEND}
 	)
 	xinerama? ( x11-proto/xineramaproto )
 	!hardened? ( sys-devel/prelink )
+	dev-util/pkgconfig
 	virtual/yacc
 	sys-devel/flex"
 
diff --git a/app-emulation/wine/wine-1.3.25.ebuild b/app-emulation/wine/wine-1.3.25.ebuild
index 4116bf0ee602..a44212862c28 100644
--- a/app-emulation/wine/wine-1.3.25.ebuild
+++ b/app-emulation/wine/wine-1.3.25.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.25.ebuild,v 1.10 2012/01/14 03:20:51 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.25.ebuild,v 1.11 2012/02/28 01:31:09 vapier Exp $
 
 EAPI="4"
 
@@ -93,6 +93,7 @@ DEPEND="${RDEPEND}
 	)
 	xinerama? ( x11-proto/xineramaproto )
 	!hardened? ( sys-devel/prelink )
+	dev-util/pkgconfig
 	virtual/yacc
 	sys-devel/flex"
 
diff --git a/app-emulation/wine/wine-1.3.26.ebuild b/app-emulation/wine/wine-1.3.26.ebuild
index 13908985289c..7d238355c619 100644
--- a/app-emulation/wine/wine-1.3.26.ebuild
+++ b/app-emulation/wine/wine-1.3.26.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.26.ebuild,v 1.10 2012/01/14 03:20:51 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.26.ebuild,v 1.11 2012/02/28 01:31:09 vapier Exp $
 
 EAPI="4"
 
@@ -93,6 +93,7 @@ DEPEND="${RDEPEND}
 	)
 	xinerama? ( x11-proto/xineramaproto )
 	!hardened? ( sys-devel/prelink )
+	dev-util/pkgconfig
 	virtual/yacc
 	sys-devel/flex"
 
diff --git a/app-emulation/wine/wine-1.3.27.ebuild b/app-emulation/wine/wine-1.3.27.ebuild
index 4cc41d2ee583..f02f173b26e6 100644
--- a/app-emulation/wine/wine-1.3.27.ebuild
+++ b/app-emulation/wine/wine-1.3.27.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.27.ebuild,v 1.6 2012/01/14 03:20:51 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.27.ebuild,v 1.7 2012/02/28 01:31:09 vapier Exp $
 
 EAPI="4"
 
@@ -93,6 +93,7 @@ DEPEND="${RDEPEND}
 	)
 	xinerama? ( x11-proto/xineramaproto )
 	!hardened? ( sys-devel/prelink )
+	dev-util/pkgconfig
 	virtual/yacc
 	sys-devel/flex"
 
diff --git a/app-emulation/wine/wine-1.3.28.ebuild b/app-emulation/wine/wine-1.3.28.ebuild
index 02c022df4545..98a1da4977e1 100644
--- a/app-emulation/wine/wine-1.3.28.ebuild
+++ b/app-emulation/wine/wine-1.3.28.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.28.ebuild,v 1.5 2012/01/14 03:20:51 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.28.ebuild,v 1.6 2012/02/28 01:31:09 vapier Exp $
 
 EAPI="4"
 
@@ -93,6 +93,7 @@ DEPEND="${RDEPEND}
 	)
 	xinerama? ( x11-proto/xineramaproto )
 	!hardened? ( sys-devel/prelink )
+	dev-util/pkgconfig
 	virtual/yacc
 	sys-devel/flex"
 
diff --git a/app-emulation/wine/wine-1.3.29.ebuild b/app-emulation/wine/wine-1.3.29.ebuild
index e99fd7392821..b479b8350ec2 100644
--- a/app-emulation/wine/wine-1.3.29.ebuild
+++ b/app-emulation/wine/wine-1.3.29.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.29.ebuild,v 1.4 2012/01/14 03:20:51 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.29.ebuild,v 1.5 2012/02/28 01:31:09 vapier Exp $
 
 EAPI="4"
 
@@ -93,6 +93,7 @@ DEPEND="${RDEPEND}
 	)
 	xinerama? ( x11-proto/xineramaproto )
 	!hardened? ( sys-devel/prelink )
+	dev-util/pkgconfig
 	virtual/yacc
 	sys-devel/flex"
 
diff --git a/app-emulation/wine/wine-1.3.3.ebuild b/app-emulation/wine/wine-1.3.3.ebuild
index 0e0338f876fd..a3af54a4f1b6 100644
--- a/app-emulation/wine/wine-1.3.3.ebuild
+++ b/app-emulation/wine/wine-1.3.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/app-emulation/wine/wine-1.3.3.ebuild,v 1.16 2012/01/14 03:20:51 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.3.ebuild,v 1.17 2012/02/28 01:31:09 vapier Exp $
 
 EAPI="4"
 
@@ -92,6 +92,7 @@ DEPEND="${RDEPEND}
 	)
 	xinerama? ( x11-proto/xineramaproto )
 	!hardened? ( sys-devel/prelink )
+	dev-util/pkgconfig
 	virtual/yacc
 	sys-devel/flex"
 
diff --git a/app-emulation/wine/wine-1.3.30.ebuild b/app-emulation/wine/wine-1.3.30.ebuild
index 4ac895dcf86f..b9f85f4547d4 100644
--- a/app-emulation/wine/wine-1.3.30.ebuild
+++ b/app-emulation/wine/wine-1.3.30.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.30.ebuild,v 1.4 2012/01/14 03:20:51 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.30.ebuild,v 1.5 2012/02/28 01:31:09 vapier Exp $
 
 EAPI="4"
 
@@ -93,6 +93,7 @@ DEPEND="${RDEPEND}
 	)
 	xinerama? ( x11-proto/xineramaproto )
 	!hardened? ( sys-devel/prelink )
+	dev-util/pkgconfig
 	virtual/yacc
 	sys-devel/flex"
 
diff --git a/app-emulation/wine/wine-1.3.31.ebuild b/app-emulation/wine/wine-1.3.31.ebuild
index 709c094acdaf..b9019c733743 100644
--- a/app-emulation/wine/wine-1.3.31.ebuild
+++ b/app-emulation/wine/wine-1.3.31.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.31.ebuild,v 1.4 2012/01/14 03:20:51 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.31.ebuild,v 1.5 2012/02/28 01:31:09 vapier Exp $
 
 EAPI="4"
 
@@ -93,6 +93,7 @@ DEPEND="${RDEPEND}
 	)
 	xinerama? ( x11-proto/xineramaproto )
 	!hardened? ( sys-devel/prelink )
+	dev-util/pkgconfig
 	virtual/yacc
 	sys-devel/flex"
 
diff --git a/app-emulation/wine/wine-1.3.32.ebuild b/app-emulation/wine/wine-1.3.32.ebuild
index 16b879d21ded..95f86e75533d 100644
--- a/app-emulation/wine/wine-1.3.32.ebuild
+++ b/app-emulation/wine/wine-1.3.32.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.32.ebuild,v 1.4 2012/01/14 03:20:51 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.32.ebuild,v 1.5 2012/02/28 01:31:09 vapier Exp $
 
 EAPI="4"
 
@@ -93,6 +93,7 @@ DEPEND="${RDEPEND}
 	)
 	xinerama? ( x11-proto/xineramaproto )
 	!hardened? ( sys-devel/prelink )
+	dev-util/pkgconfig
 	virtual/yacc
 	sys-devel/flex"
 
diff --git a/app-emulation/wine/wine-1.3.33.ebuild b/app-emulation/wine/wine-1.3.33.ebuild
index ca806ac8848b..f02d583b89c0 100644
--- a/app-emulation/wine/wine-1.3.33.ebuild
+++ b/app-emulation/wine/wine-1.3.33.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.33.ebuild,v 1.4 2012/01/14 03:20:51 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.33.ebuild,v 1.5 2012/02/28 01:31:09 vapier Exp $
 
 EAPI="4"
 
@@ -93,6 +93,7 @@ DEPEND="${RDEPEND}
 	)
 	xinerama? ( x11-proto/xineramaproto )
 	!hardened? ( sys-devel/prelink )
+	dev-util/pkgconfig
 	virtual/yacc
 	sys-devel/flex"
 
diff --git a/app-emulation/wine/wine-1.3.34.ebuild b/app-emulation/wine/wine-1.3.34.ebuild
index 4c3491467a09..18f07831aa24 100644
--- a/app-emulation/wine/wine-1.3.34.ebuild
+++ b/app-emulation/wine/wine-1.3.34.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.34.ebuild,v 1.4 2012/01/14 03:20:51 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.34.ebuild,v 1.5 2012/02/28 01:31:09 vapier Exp $
 
 EAPI="4"
 
@@ -93,6 +93,7 @@ DEPEND="${RDEPEND}
 	)
 	xinerama? ( x11-proto/xineramaproto )
 	!hardened? ( sys-devel/prelink )
+	dev-util/pkgconfig
 	virtual/yacc
 	sys-devel/flex"
 
diff --git a/app-emulation/wine/wine-1.3.35.ebuild b/app-emulation/wine/wine-1.3.35.ebuild
index 98e0cb518781..51f09fd145a1 100644
--- a/app-emulation/wine/wine-1.3.35.ebuild
+++ b/app-emulation/wine/wine-1.3.35.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.35.ebuild,v 1.3 2012/01/14 03:20:51 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.35.ebuild,v 1.4 2012/02/28 01:31:09 vapier Exp $
 
 EAPI="4"
 
@@ -93,6 +93,7 @@ DEPEND="${RDEPEND}
 	)
 	xinerama? ( x11-proto/xineramaproto )
 	!hardened? ( sys-devel/prelink )
+	dev-util/pkgconfig
 	virtual/yacc
 	sys-devel/flex"
 
diff --git a/app-emulation/wine/wine-1.3.36.ebuild b/app-emulation/wine/wine-1.3.36.ebuild
index e3a08ea5c5ae..30a79175ae8a 100644
--- a/app-emulation/wine/wine-1.3.36.ebuild
+++ b/app-emulation/wine/wine-1.3.36.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.36.ebuild,v 1.2 2012/01/14 03:20:51 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.36.ebuild,v 1.3 2012/02/28 01:31:09 vapier Exp $
 
 EAPI="4"
 
@@ -96,6 +96,7 @@ DEPEND="${RDEPEND}
 	)
 	xinerama? ( x11-proto/xineramaproto )
 	!hardened? ( sys-devel/prelink )
+	dev-util/pkgconfig
 	virtual/yacc
 	sys-devel/flex"
 
diff --git a/app-emulation/wine/wine-1.3.37.ebuild b/app-emulation/wine/wine-1.3.37.ebuild
index 0f7c73ebe890..b6ff61958f15 100644
--- a/app-emulation/wine/wine-1.3.37.ebuild
+++ b/app-emulation/wine/wine-1.3.37.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.37.ebuild,v 1.1 2012/01/14 03:30:58 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.37.ebuild,v 1.2 2012/02/28 01:31:09 vapier Exp $
 
 EAPI="4"
 
@@ -96,6 +96,7 @@ DEPEND="${RDEPEND}
 	)
 	xinerama? ( x11-proto/xineramaproto )
 	!hardened? ( sys-devel/prelink )
+	dev-util/pkgconfig
 	virtual/yacc
 	sys-devel/flex"
 
diff --git a/app-emulation/wine/wine-1.3.4.ebuild b/app-emulation/wine/wine-1.3.4.ebuild
index 6b9d7b64b170..52725b21f80d 100644
--- a/app-emulation/wine/wine-1.3.4.ebuild
+++ b/app-emulation/wine/wine-1.3.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.4.ebuild,v 1.15 2012/01/14 03:20:51 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.4.ebuild,v 1.16 2012/02/28 01:31:09 vapier Exp $
 
 EAPI="4"
 
@@ -92,6 +92,7 @@ DEPEND="${RDEPEND}
 	)
 	xinerama? ( x11-proto/xineramaproto )
 	!hardened? ( sys-devel/prelink )
+	dev-util/pkgconfig
 	virtual/yacc
 	sys-devel/flex"
 
diff --git a/app-emulation/wine/wine-1.3.5.ebuild b/app-emulation/wine/wine-1.3.5.ebuild
index 841bff1fcba9..bf78d8394dee 100644
--- a/app-emulation/wine/wine-1.3.5.ebuild
+++ b/app-emulation/wine/wine-1.3.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.5.ebuild,v 1.14 2012/01/14 03:20:51 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.5.ebuild,v 1.15 2012/02/28 01:31:09 vapier Exp $
 
 EAPI="4"
 
@@ -92,6 +92,7 @@ DEPEND="${RDEPEND}
 	)
 	xinerama? ( x11-proto/xineramaproto )
 	!hardened? ( sys-devel/prelink )
+	dev-util/pkgconfig
 	virtual/yacc
 	sys-devel/flex"
 
diff --git a/app-emulation/wine/wine-1.3.6.ebuild b/app-emulation/wine/wine-1.3.6.ebuild
index 452105aac1b9..b1e3e1a4a7f5 100644
--- a/app-emulation/wine/wine-1.3.6.ebuild
+++ b/app-emulation/wine/wine-1.3.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.6.ebuild,v 1.14 2012/01/14 03:20:51 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.6.ebuild,v 1.15 2012/02/28 01:31:09 vapier Exp $
 
 EAPI="4"
 
@@ -93,6 +93,7 @@ DEPEND="${RDEPEND}
 	)
 	xinerama? ( x11-proto/xineramaproto )
 	!hardened? ( sys-devel/prelink )
+	dev-util/pkgconfig
 	virtual/yacc
 	sys-devel/flex"
 
diff --git a/app-emulation/wine/wine-1.3.7.ebuild b/app-emulation/wine/wine-1.3.7.ebuild
index b8ce96ba995f..93538fa690a4 100644
--- a/app-emulation/wine/wine-1.3.7.ebuild
+++ b/app-emulation/wine/wine-1.3.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.7.ebuild,v 1.13 2012/01/14 03:20:51 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.7.ebuild,v 1.14 2012/02/28 01:31:09 vapier Exp $
 
 EAPI="4"
 
@@ -93,6 +93,7 @@ DEPEND="${RDEPEND}
 	)
 	xinerama? ( x11-proto/xineramaproto )
 	!hardened? ( sys-devel/prelink )
+	dev-util/pkgconfig
 	virtual/yacc
 	sys-devel/flex"
 
diff --git a/app-emulation/wine/wine-1.3.8.ebuild b/app-emulation/wine/wine-1.3.8.ebuild
index 96a23b5336c9..efbb8b8dcdb7 100644
--- a/app-emulation/wine/wine-1.3.8.ebuild
+++ b/app-emulation/wine/wine-1.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-emulation/wine/wine-1.3.8.ebuild,v 1.13 2012/01/14 03:20:51 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.8.ebuild,v 1.14 2012/02/28 01:31:09 vapier Exp $
 
 EAPI="4"
 
@@ -93,6 +93,7 @@ DEPEND="${RDEPEND}
 	)
 	xinerama? ( x11-proto/xineramaproto )
 	!hardened? ( sys-devel/prelink )
+	dev-util/pkgconfig
 	virtual/yacc
 	sys-devel/flex"
 
diff --git a/app-emulation/wine/wine-1.3.9.ebuild b/app-emulation/wine/wine-1.3.9.ebuild
index b0d2543d899f..bf7204a1c237 100644
--- a/app-emulation/wine/wine-1.3.9.ebuild
+++ b/app-emulation/wine/wine-1.3.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.9.ebuild,v 1.18 2012/01/14 03:20:51 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.9.ebuild,v 1.19 2012/02/28 01:31:09 vapier Exp $
 
 EAPI="4"
 
@@ -94,6 +94,7 @@ DEPEND="${RDEPEND}
 	)
 	xinerama? ( x11-proto/xineramaproto )
 	!hardened? ( sys-devel/prelink )
+	dev-util/pkgconfig
 	virtual/yacc
 	sys-devel/flex"
 
diff --git a/app-emulation/wine/wine-1.4_rc1.ebuild b/app-emulation/wine/wine-1.4_rc1.ebuild
index dcf85823b176..a0c5dcbb10b4 100644
--- a/app-emulation/wine/wine-1.4_rc1.ebuild
+++ b/app-emulation/wine/wine-1.4_rc1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.4_rc1.ebuild,v 1.2 2012/01/28 22:53:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.4_rc1.ebuild,v 1.3 2012/02/28 01:31:09 vapier Exp $
 
 EAPI="4"
 
@@ -96,6 +96,7 @@ DEPEND="${RDEPEND}
 	)
 	xinerama? ( x11-proto/xineramaproto )
 	!hardened? ( sys-devel/prelink )
+	dev-util/pkgconfig
 	virtual/yacc
 	sys-devel/flex"
 
diff --git a/app-emulation/wine/wine-1.4_rc2.ebuild b/app-emulation/wine/wine-1.4_rc2.ebuild
index d84c40dbbb9b..9c29e7f8a602 100644
--- a/app-emulation/wine/wine-1.4_rc2.ebuild
+++ b/app-emulation/wine/wine-1.4_rc2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.4_rc2.ebuild,v 1.2 2012/02/07 20:51:57 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.4_rc2.ebuild,v 1.3 2012/02/28 01:31:09 vapier Exp $
 
 EAPI="4"
 
@@ -97,6 +97,7 @@ DEPEND="${RDEPEND}
 	)
 	xinerama? ( x11-proto/xineramaproto )
 	!hardened? ( sys-devel/prelink )
+	dev-util/pkgconfig
 	virtual/yacc
 	sys-devel/flex"
 
diff --git a/app-emulation/wine/wine-1.4_rc3.ebuild b/app-emulation/wine/wine-1.4_rc3.ebuild
index c8b8ab0faa59..a88caa2fe4bf 100644
--- a/app-emulation/wine/wine-1.4_rc3.ebuild
+++ b/app-emulation/wine/wine-1.4_rc3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.4_rc3.ebuild,v 1.1 2012/02/15 16:46:38 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.4_rc3.ebuild,v 1.2 2012/02/28 01:31:09 vapier Exp $
 
 EAPI="4"
 
@@ -97,6 +97,7 @@ DEPEND="${RDEPEND}
 	)
 	xinerama? ( x11-proto/xineramaproto )
 	!hardened? ( sys-devel/prelink )
+	dev-util/pkgconfig
 	virtual/yacc
 	sys-devel/flex"
 
diff --git a/app-emulation/wine/wine-1.4_rc4.ebuild b/app-emulation/wine/wine-1.4_rc4.ebuild
index bd35325c696e..6d2d46e1e7cf 100644
--- a/app-emulation/wine/wine-1.4_rc4.ebuild
+++ b/app-emulation/wine/wine-1.4_rc4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.4_rc4.ebuild,v 1.1 2012/02/21 04:17:24 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.4_rc4.ebuild,v 1.2 2012/02/28 01:31:09 vapier Exp $
 
 EAPI="4"
 
@@ -99,6 +99,7 @@ DEPEND="${RDEPEND}
 	)
 	xinerama? ( x11-proto/xineramaproto )
 	!hardened? ( sys-devel/prelink )
+	dev-util/pkgconfig
 	virtual/yacc
 	sys-devel/flex"
 
diff --git a/app-emulation/wine/wine-1.4_rc5.ebuild b/app-emulation/wine/wine-1.4_rc5.ebuild
index 7026a72998d7..6136ceabaae7 100644
--- a/app-emulation/wine/wine-1.4_rc5.ebuild
+++ b/app-emulation/wine/wine-1.4_rc5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.4_rc5.ebuild,v 1.1 2012/02/27 05:44:04 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.4_rc5.ebuild,v 1.2 2012/02/28 01:31:09 vapier Exp $
 
 EAPI="4"
 
@@ -99,6 +99,7 @@ DEPEND="${RDEPEND}
 	)
 	xinerama? ( x11-proto/xineramaproto )
 	!hardened? ( sys-devel/prelink )
+	dev-util/pkgconfig
 	virtual/yacc
 	sys-devel/flex"
 
diff --git a/app-emulation/wine/wine-9999.ebuild b/app-emulation/wine/wine-9999.ebuild
index 971f9db921f5..58b50ccef9bd 100644
--- a/app-emulation/wine/wine-9999.ebuild
+++ b/app-emulation/wine/wine-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-9999.ebuild,v 1.103 2012/02/21 04:17:24 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-9999.ebuild,v 1.104 2012/02/28 01:31:09 vapier Exp $
 
 EAPI="4"
 
@@ -99,6 +99,7 @@ DEPEND="${RDEPEND}
 	)
 	xinerama? ( x11-proto/xineramaproto )
 	!hardened? ( sys-devel/prelink )
+	dev-util/pkgconfig
 	virtual/yacc
 	sys-devel/flex"
 
diff --git a/app-forensics/sleuthkit/Manifest b/app-forensics/sleuthkit/Manifest
index 1c74c89976a5..a1c755de2261 100644
--- a/app-forensics/sleuthkit/Manifest
+++ b/app-forensics/sleuthkit/Manifest
@@ -4,3 +4,4 @@ DIST sleuthkit-3.0.0.tar.gz 814597 RMD160 971213ab039ebe3c7020ab890e43d17a2f89bc
 DIST sleuthkit-3.1.0.tar.gz 842104 RMD160 543f7fae08a289bf11d2caa8c0d0c091cb909038 SHA1 60a597d394841360c2130a9060333ad7a6482e17 SHA256 f6f5b9d0206aa057e83a3dee3be6ebea59843c5ae44af39f415ccac28e1c4dc5
 DIST sleuthkit-3.2.1.tar.gz 2033920 RMD160 d20a6e46da9aef30117f93a24701a18c5d513626 SHA1 07966f3b95e00569d0df826fa713b8272b272bf6 SHA256 e0f257d2c6856dc1c1cd2a704c6cb8906ca688f0cdbb1d0665fd7a5a2f83ad37
 DIST sleuthkit-3.2.2.tar.gz 2035364 RMD160 377278239d61397c11bac3a01544edbba9efaec6 SHA1 459b622e0099f2d7c9e75d49fd44c23cda8ff887 SHA256 f2558b79c2ebc259a0e1eb6a3035b5f9aa8021a47cb0ade36d01beb57b99110a
+DIST sleuthkit-3.2.3.tar.gz 2039699 RMD160 ee9849ff34bd7d1ce90819f22f1e09a71e4d0e8c SHA1 85d100ffde54f051916a4ea9452563ff85fad4ac SHA256 ba5f63d7fd60d978de03777c72b1571004caa8dfe384f09757b6a8efa890ea62
diff --git a/app-forensics/sleuthkit/files/sleuthkit-3.2.3-system-sqlite.patch b/app-forensics/sleuthkit/files/sleuthkit-3.2.3-system-sqlite.patch
new file mode 100644
index 000000000000..95aa3f270e54
--- /dev/null
+++ b/app-forensics/sleuthkit/files/sleuthkit-3.2.3-system-sqlite.patch
@@ -0,0 +1,23 @@
+--- sleuthkit-3.2.3/tsk3/auto/auto_db.cpp
++++ sleuthkit-3.2.3/tsk3/auto/auto_db.cpp
+@@ -14,7 +14,7 @@
+  */
+ 
+ #include "tsk_auto_i.h"
+-#include "sqlite3.h"
++#include <sqlite3.h>
+ #include <string.h>
+ 
+ #define TSK_SCHEMA_VER 1
+--- sleuthkit-3.2.3/tsk3/auto/Makefile.am
++++ sleuthkit-3.2.3/tsk3/auto/Makefile.am
+@@ -3,7 +3,8 @@
+ 
+ noinst_LTLIBRARIES = libtskauto.la
+ # Note that the .h files are in the top-level Makefile
+-libtskauto_la_SOURCES = auto.cpp tsk_auto_i.h auto_db.cpp sqlite3.c sqlite3.h
++libtskauto_la_SOURCES = auto.cpp tsk_auto_i.h auto_db.cpp
++libtskauto_la_LIBADD = -lsqlite3
+ 
+ indent:
+ 	indent *.cpp *.h
diff --git a/app-forensics/sleuthkit/files/sleuthkit-3.2.3-tools-shared-libs.patch b/app-forensics/sleuthkit/files/sleuthkit-3.2.3-tools-shared-libs.patch
new file mode 100644
index 000000000000..749c67030046
--- /dev/null
+++ b/app-forensics/sleuthkit/files/sleuthkit-3.2.3-tools-shared-libs.patch
@@ -0,0 +1,55 @@
+--- sleuthkit-3.2.3/tools/autotools/Makefile.am
++++ sleuthkit-3.2.3/tools/autotools/Makefile.am
+@@ -1,6 +1,5 @@
+ AM_CPPFLAGS = -I../.. -I$(srcdir)/../.. -Wall
+ LDADD = ../../tsk3/libtsk3.la
+-LDFLAGS += -static
+ EXTRA_DIST = .indent.pro
+ 
+ bin_PROGRAMS = tsk_recover tsk_loaddb tsk_comparedir tsk_gettimes
+--- sleuthkit-3.2.3/tools/fstools/Makefile.am
++++ sleuthkit-3.2.3/tools/fstools/Makefile.am
+@@ -1,6 +1,5 @@
+ AM_CPPFLAGS = -I../.. -I$(srcdir)/../.. -Wall 
+ LDADD = ../../tsk3/libtsk3.la
+-LDFLAGS += -static
+ EXTRA_DIST = .indent.pro fscheck.cpp
+ 
+ bin_PROGRAMS = blkcalc blkcat blkls blkstat ffind fls fsstat icat ifind ils \
+--- sleuthkit-3.2.3/tools/hashtools/Makefile.am
++++ sleuthkit-3.2.3/tools/hashtools/Makefile.am
+@@ -1,6 +1,5 @@
+ AM_CPPFLAGS = -I../.. -I$(srcdir)/../.. -Wall 
+ LDADD = ../../tsk3/libtsk3.la
+-LDFLAGS += -static
+ EXTRA_DIST = .indent.pro md5.c sha1.c
+ 
+ bin_PROGRAMS = hfind
+--- sleuthkit-3.2.3/tools/imgtools/Makefile.am
++++ sleuthkit-3.2.3/tools/imgtools/Makefile.am
+@@ -1,6 +1,5 @@
+ AM_CPPFLAGS = -I../.. -I$(srcdir)/../.. -Wall
+ LDADD = ../../tsk3/libtsk3.la
+-LDFLAGS += -static
+ EXTRA_DIST = .indent.pro
+ 
+ bin_PROGRAMS = img_cat img_stat
+--- sleuthkit-3.2.3/tools/srchtools/Makefile.am
++++ sleuthkit-3.2.3/tools/srchtools/Makefile.am
+@@ -6,7 +6,6 @@
+ 
+ sigfind_SOURCES = sigfind.cpp 
+ sigfind_LDADD = ../../tsk3/libtsk3.la
+-sigfind_LDFLAGS = -static
+ 
+ indent:
+ 	indent *.c *.cpp
+--- sleuthkit-3.2.3/tools/vstools/Makefile.am
++++ sleuthkit-3.2.3/tools/vstools/Makefile.am
+@@ -1,6 +1,5 @@
+ AM_CPPFLAGS = -I../.. -I$(srcdir)/../.. -Wall 
+ LDADD = ../../tsk3/libtsk3.la
+-LDFLAGS += -static
+ EXTRA_DIST = .indent.pro
+ 
+ bin_PROGRAMS = mmls mmstat mmcat
diff --git a/app-forensics/sleuthkit/sleuthkit-3.2.3.ebuild b/app-forensics/sleuthkit/sleuthkit-3.2.3.ebuild
new file mode 100644
index 000000000000..cd8eea509953
--- /dev/null
+++ b/app-forensics/sleuthkit/sleuthkit-3.2.3.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/sleuthkit/sleuthkit-3.2.3.ebuild,v 1.2 2012/02/28 02:29:54 radhermit Exp $
+
+EAPI="4"
+AUTOTOOLS_AUTORECONF=1
+
+inherit eutils autotools-utils
+
+DESCRIPTION="A collection of file system and media management forensic analysis tools"
+HOMEPAGE="http://www.sleuthkit.org/sleuthkit/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2 IBM"
+SLOT=0
+KEYWORDS="~amd64 ~hppa ~ppc ~x86"
+IUSE="aff ewf static-libs"
+
+DEPEND="dev-db/sqlite:3
+	ewf? ( app-forensics/libewf[-ewf2] )
+	aff? ( app-forensics/afflib )"
+RDEPEND="${DEPEND}
+	dev-perl/DateManip"
+
+DOCS=( NEWS.txt README.txt )
+
+PATCHES=(
+	"${FILESDIR}"/${P}-system-sqlite.patch
+	"${FILESDIR}"/${P}-tools-shared-libs.patch
+)
+
+src_configure() {
+	local myeconfargs=(
+		$(use_with aff afflib)
+		$(use_with ewf libewf)
+	)
+	autotools-utils_src_configure
+}
diff --git a/app-misc/byobu/byobu-5.15.ebuild b/app-misc/byobu/byobu-5.15.ebuild
index 58b184e7eb41..ef8375dd3879 100644
--- a/app-misc/byobu/byobu-5.15.ebuild
+++ b/app-misc/byobu/byobu-5.15.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/byobu/byobu-5.15.ebuild,v 1.1 2012/02/26 05:31:02 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/byobu/byobu-5.15.ebuild,v 1.2 2012/02/27 22:24:40 radhermit Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2"
@@ -25,7 +25,7 @@ src_prepare() {
 
 	# Set default system backend to screen
 	if use screen ; then
-		sed -i -e "s/#\(BYOBU_BACKEND\).*/\1=screen/" etc/byobu/backend || die
+		sed -i -e 's/#\(BYOBU_BACKEND\).*/\1="screen"/' etc/byobu/backend || die
 	fi
 }
 
diff --git a/app-misc/g15daemon/g15daemon-1.9.5.3-r5.ebuild b/app-misc/g15daemon/g15daemon-1.9.5.3-r5.ebuild
index 8f68c89710b5..e18dec32145a 100644
--- a/app-misc/g15daemon/g15daemon-1.9.5.3-r5.ebuild
+++ b/app-misc/g15daemon/g15daemon-1.9.5.3-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/g15daemon/g15daemon-1.9.5.3-r5.ebuild,v 1.2 2012/02/19 15:18:32 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/g15daemon/g15daemon-1.9.5.3-r5.ebuild,v 1.3 2012/02/27 18:34:19 ranger Exp $
 
 EAPI=4
 GENTOO_DEPEND_ON_PERL="no"
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ppc ~ppc64 x86"
 IUSE="perl python static-libs"
 
 DEPEND="virtual/libusb:0
diff --git a/app-office/libreoffice-bin/libreoffice-bin-3.4.5.2-r1.ebuild b/app-office/libreoffice-bin/libreoffice-bin-3.4.5.2-r1.ebuild
index e6fa5dd764a5..8d8a90448b5b 100644
--- a/app-office/libreoffice-bin/libreoffice-bin-3.4.5.2-r1.ebuild
+++ b/app-office/libreoffice-bin/libreoffice-bin-3.4.5.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/libreoffice-bin-3.4.5.2-r1.ebuild,v 1.2 2012/02/24 21:38:41 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/libreoffice-bin-3.4.5.2-r1.ebuild,v 1.4 2012/02/27 21:43:48 scarabeus Exp $
 
 EAPI=4
 
@@ -48,7 +48,7 @@ SRC_URI="
 	x86? ( ${SRC_URI_X86} )
 "
 
-IUSE="gnome java kde"
+IUSE="+cups gnome java kde"
 LICENSE="LGPL-3"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
@@ -72,7 +72,6 @@ COMMON_DEPEND="
 	media-libs/freetype:2
 	>=media-libs/fontconfig-2.8.0
 	>=media-libs/libpng-1.5
-	net-print/cups
 	sci-mathematics/lpsolve
 	>=sys-libs/db-4.8
 	virtual/jpeg
@@ -104,6 +103,7 @@ RDEPEND="${COMMON_DEPEND}
 	!app-office/libreoffice
 	!app-office/openoffice-bin
 	!app-office/openoffice
+	cups? ( net-print/cups )
 	java? ( >=virtual/jre-1.6 )
 "
 
@@ -111,7 +111,8 @@ PDEPEND="
 	=app-office/libreoffice-l10n-$(get_version_component_range 1-3)*
 "
 
-DEPEND="${COMMON_DEPEND}"
+# after all it's a binary package
+DEPEND=""
 
 # only one flavor at a time
 REQUIRED_USE="kde? ( !gnome ) gnome? ( !kde )"
@@ -151,7 +152,6 @@ src_install() {
 
 	# prevent revdep-rebuild from attempting to rebuild all the time
 	insinto /etc/revdep-rebuild && doins "${T}/50-${PN}"
-
 }
 
 pkg_preinst() {
@@ -163,6 +163,9 @@ pkg_postinst() {
 	kde4-base_pkg_postinst
 
 	pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/libreoffice/program/soffice.bin
+
+	use cups || \
+		ewarn 'You will need net-print/cups in order to be able to print with libreoffice.'
 }
 
 pkg_postrm() {
diff --git a/app-office/libreoffice/libreoffice-3.4.3.2-r1.ebuild b/app-office/libreoffice/libreoffice-3.4.3.2-r1.ebuild
index e6db8c0e3257..ec74c1c9fcc9 100644
--- a/app-office/libreoffice/libreoffice-3.4.3.2-r1.ebuild
+++ b/app-office/libreoffice/libreoffice-3.4.3.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.3.2-r1.ebuild,v 1.19 2012/02/14 19:29:27 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.3.2-r1.ebuild,v 1.21 2012/02/27 21:56:30 dilfridge Exp $
 
 EAPI=3
 
diff --git a/app-office/libreoffice/libreoffice-3.4.5.2.ebuild b/app-office/libreoffice/libreoffice-3.4.5.2.ebuild
index 3eb69c0451a6..445a9f1474b9 100644
--- a/app-office/libreoffice/libreoffice-3.4.5.2.ebuild
+++ b/app-office/libreoffice/libreoffice-3.4.5.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.5.2.ebuild,v 1.5 2012/02/14 19:29:27 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.5.2.ebuild,v 1.7 2012/02/27 21:56:30 dilfridge Exp $
 
 EAPI=4
 
diff --git a/app-office/libreoffice/libreoffice-3.5.0.3.ebuild b/app-office/libreoffice/libreoffice-3.5.0.3.ebuild
index d84bfaa1baa6..df594832868b 100644
--- a/app-office/libreoffice/libreoffice-3.5.0.3.ebuild
+++ b/app-office/libreoffice/libreoffice-3.5.0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.5.0.3.ebuild,v 1.6 2012/02/24 13:17:17 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.5.0.3.ebuild,v 1.8 2012/02/27 21:29:20 dilfridge Exp $
 
 EAPI=4
 
@@ -69,7 +69,7 @@ unset ADDONS_URI
 unset EXT_URI
 unset ADDONS_SRC
 
-IUSE="binfilter +branding dbus debug eds gnome +graphite gstreamer +gtk gtk3
+IUSE="binfilter +branding +cups dbus debug eds gnome +graphite gstreamer +gtk gtk3
 jemalloc kde mysql +nsplugin odk opengl pdfimport postgres svg test +vba
 +webdav +xmlsec"
 LICENSE="LGPL-3"
@@ -95,7 +95,7 @@ COMMON_DEPEND="
 	dev-libs/expat
 	>=dev-libs/glib-2.28
 	>=dev-libs/hyphen-2.7.1
-	>=dev-libs/icu-4.8.1-r1
+	>=dev-libs/icu-4.8.1.1
 	>=dev-lang/perl-5.0
 	>=dev-libs/openssl-1.0.0d
 	>=dev-libs/redland-1.0.14[ssl]
@@ -103,7 +103,6 @@ COMMON_DEPEND="
 	media-libs/freetype:2
 	>=media-libs/libpng-1.4
 	media-libs/libvisio
-	net-print/cups
 	sci-mathematics/lpsolve
 	>=sys-libs/db-4.8
 	virtual/jpeg
@@ -145,6 +144,7 @@ RDEPEND="${COMMON_DEPEND}
 	!app-office/openoffice
 	media-fonts/libertine-ttf
 	media-fonts/liberation-fonts
+	cups? ( net-print/cups )
 	java? ( >=virtual/jre-1.6 )
 "
 
@@ -168,6 +168,7 @@ DEPEND="${COMMON_DEPEND}
 	media-libs/sampleicc
 	>=net-misc/curl-7.21.4
 	net-misc/npapi-sdk
+	net-print/cups
 	>=sys-apps/findutils-4.4.2
 	sys-devel/bison
 	sys-apps/coreutils
@@ -492,6 +493,10 @@ pkg_postinst() {
 	kde4-base_pkg_postinst
 
 	pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/libreoffice/program/soffice.bin
+
+	if ! use cups ; then 
+		ewarn 'You will need net-print/cups to be able to print with libreoffice.'
+	fi
 }
 
 pkg_postrm() {
diff --git a/app-office/libreoffice/libreoffice-3.5.9999.ebuild b/app-office/libreoffice/libreoffice-3.5.9999.ebuild
index a476fa7f5d7e..5be2bf4f8d4e 100644
--- a/app-office/libreoffice/libreoffice-3.5.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-3.5.9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.5.9999.ebuild,v 1.12 2012/02/24 13:17:17 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.5.9999.ebuild,v 1.14 2012/02/27 21:29:20 dilfridge Exp $
 
 EAPI=4
 
@@ -69,7 +69,7 @@ unset ADDONS_URI
 unset EXT_URI
 unset ADDONS_SRC
 
-IUSE="binfilter +branding dbus debug eds gnome +graphite gstreamer +gtk gtk3
+IUSE="binfilter +branding +cups dbus debug eds gnome +graphite gstreamer +gtk gtk3
 jemalloc kde mysql +nsplugin odk opengl pdfimport postgres svg test +vba
 +webdav +xmlsec"
 LICENSE="LGPL-3"
@@ -95,7 +95,7 @@ COMMON_DEPEND="
 	dev-libs/expat
 	>=dev-libs/glib-2.28
 	>=dev-libs/hyphen-2.7.1
-	>=dev-libs/icu-4.8.1-r1
+	>=dev-libs/icu-4.8.1.1
 	>=dev-lang/perl-5.0
 	>=dev-libs/openssl-1.0.0d
 	>=dev-libs/redland-1.0.14[ssl]
@@ -103,7 +103,6 @@ COMMON_DEPEND="
 	media-libs/freetype:2
 	>=media-libs/libpng-1.4
 	media-libs/libvisio
-	net-print/cups
 	sci-mathematics/lpsolve
 	>=sys-libs/db-4.8
 	virtual/jpeg
@@ -145,6 +144,7 @@ RDEPEND="${COMMON_DEPEND}
 	!app-office/openoffice
 	media-fonts/libertine-ttf
 	media-fonts/liberation-fonts
+	cups? ( net-print/cups )
 	java? ( >=virtual/jre-1.6 )
 "
 
@@ -168,6 +168,7 @@ DEPEND="${COMMON_DEPEND}
 	media-libs/sampleicc
 	>=net-misc/curl-7.21.4
 	net-misc/npapi-sdk
+	net-print/cups
 	>=sys-apps/findutils-4.4.2
 	sys-devel/bison
 	sys-apps/coreutils
@@ -493,6 +494,10 @@ pkg_postinst() {
 	kde4-base_pkg_postinst
 
 	pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/libreoffice/program/soffice.bin
+
+	if ! use cups ; then 
+		ewarn 'You will need net-print/cups to be able to print with libreoffice.'
+	fi
 }
 
 pkg_postrm() {
diff --git a/app-office/libreoffice/libreoffice-9999-r2.ebuild b/app-office/libreoffice/libreoffice-9999-r2.ebuild
index c06bd32b5fed..3a5deb64a43c 100644
--- a/app-office/libreoffice/libreoffice-9999-r2.ebuild
+++ b/app-office/libreoffice/libreoffice-9999-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.25 2012/02/24 13:17:17 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.28 2012/02/27 21:44:55 scarabeus Exp $
 
 EAPI=4
 
@@ -69,7 +69,7 @@ unset ADDONS_URI
 unset EXT_URI
 unset ADDONS_SRC
 
-IUSE="binfilter +branding dbus debug eds gnome +graphite gstreamer +gtk gtk3
+IUSE="binfilter +branding +cups dbus debug eds gnome +graphite gstreamer +gtk gtk3
 jemalloc kde mysql +nsplugin odk opengl pdfimport postgres svg test +vba
 +webdav +xmlsec"
 LICENSE="LGPL-3"
@@ -95,7 +95,7 @@ COMMON_DEPEND="
 	dev-libs/expat
 	>=dev-libs/glib-2.28
 	>=dev-libs/hyphen-2.7.1
-	>=dev-libs/icu-4.8.1-r1
+	>=dev-libs/icu-4.8.1.1
 	>=dev-lang/perl-5.0
 	>=dev-libs/openssl-1.0.0d
 	>=dev-libs/redland-1.0.14[ssl]
@@ -104,7 +104,6 @@ COMMON_DEPEND="
 	>=media-libs/libpng-1.4
 	media-libs/libcdr
 	media-libs/libvisio
-	net-print/cups
 	sci-mathematics/lpsolve
 	>=sys-libs/db-4.8
 	virtual/jpeg
@@ -149,6 +148,7 @@ RDEPEND="${COMMON_DEPEND}
 	!app-office/openoffice
 	media-fonts/libertine-ttf
 	media-fonts/liberation-fonts
+	cups? ( net-print/cups )
 	java? ( >=virtual/jre-1.6 )
 "
 
@@ -172,6 +172,7 @@ DEPEND="${COMMON_DEPEND}
 	media-libs/sampleicc
 	>=net-misc/curl-7.21.4
 	net-misc/npapi-sdk
+	net-print/cups
 	>=sys-apps/findutils-4.4.2
 	sys-devel/bison
 	sys-apps/coreutils
@@ -496,6 +497,9 @@ pkg_postinst() {
 	kde4-base_pkg_postinst
 
 	pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/libreoffice/program/soffice.bin
+
+	use cups || \
+		ewarn 'You will need net-print/cups to be able to print with libreoffice.'
 }
 
 pkg_postrm() {
diff --git a/app-vim/command-t/Manifest b/app-vim/command-t/Manifest
index 84c86a848c1d..103275b53067 100644
--- a/app-vim/command-t/Manifest
+++ b/app-vim/command-t/Manifest
@@ -1 +1,2 @@
 DIST command-t-1.2.1.tar.bz2 23434 RMD160 1c91ff8b10edabd5235b6387bce3e328a890f03f SHA1 a06fdee80ce823df8814a2c3082c940209f63dae SHA256 bd6759562d34e3be69a5fd03c43c67160148699d050c81e7d8fe8dd6270ce3ed
+DIST command-t-1.3.1.tar.bz2 24190 RMD160 de82efc654d4331ae002b5b5dac43bb42bec950a SHA1 8d49c9cecb22812101f701fc06a72d0af4eb5ec3 SHA256 920dd603fa940ee43277a9a36b3c7c69cadf17b19bb82a8faa34cc9b2cd33faa
diff --git a/app-vim/command-t/command-t-1.3.1.ebuild b/app-vim/command-t/command-t-1.3.1.ebuild
new file mode 100644
index 000000000000..68a850de0faf
--- /dev/null
+++ b/app-vim/command-t/command-t-1.3.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-vim/command-t/command-t-1.3.1.ebuild,v 1.2 2012/02/28 03:58:58 radhermit Exp $
+
+EAPI="4"
+USE_RUBY="ruby18 ruby19"
+
+inherit vim-plugin ruby-ng
+
+DESCRIPTION="vim plugin: fast file navigation for vim"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=3025
+	https://wincent.com/products/command-t"
+SRC_URI="http://dev.gentoo.org/~radhermit/distfiles/${P}.tar.bz2"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+RDEPEND="|| ( app-editors/vim[ruby] app-editors/gvim[ruby] )"
+
+each_ruby_configure() {
+	cd ruby/${PN}
+	${RUBY} extconf.rb || die "extconf.rb failed"
+}
+
+each_ruby_compile() {
+	cd ruby/${PN}
+	emake
+	rm *.o *.c *.h *.log extconf.rb depend Makefile || die
+}
+
+each_ruby_install() {
+	local sitelibdir=$(ruby_rbconfig_value "sitelibdir")
+	insinto ${sitelibdir}/${PN}
+	doins -r ruby/${PN}/*
+}
+
+all_ruby_install() {
+	rm -r ruby || die
+	vim-plugin_src_install
+}
diff --git a/dev-cpp/yaml-cpp/Manifest b/dev-cpp/yaml-cpp/Manifest
index 5c304855f5c3..f52b0d24de7e 100644
--- a/dev-cpp/yaml-cpp/Manifest
+++ b/dev-cpp/yaml-cpp/Manifest
@@ -1 +1 @@
-DIST yaml-cpp-0.2.7.tar.gz 75576 RMD160 b175b1301792b27a8bcca9a36928978f8451b207 SHA1 17d9c9b9466266ebea8514ae4c55963e744d65e1 SHA256 4d7890be03f9963d6af8f06aa3162cbea8e0116ffb283ae10839835cd3b8751b
+DIST yaml-cpp-0.3.0.tar.gz 82674 RMD160 0b777f95d858d9e840afa9f92eeffef77eca24b5 SHA1 28766efa95f1b0f697c4b4a1580a9972be7c9c41 SHA256 2cd038b5a1583b6745e949e196fba525f6d0d5fd340566585fde24fc7e117b82
diff --git a/dev-cpp/yaml-cpp/yaml-cpp-0.2.7.ebuild b/dev-cpp/yaml-cpp/yaml-cpp-0.3.0.ebuild
similarity index 75%
rename from dev-cpp/yaml-cpp/yaml-cpp-0.2.7.ebuild
rename to dev-cpp/yaml-cpp/yaml-cpp-0.3.0.ebuild
index 3b718439ea70..ad0e73fa4861 100644
--- a/dev-cpp/yaml-cpp/yaml-cpp-0.2.7.ebuild
+++ b/dev-cpp/yaml-cpp/yaml-cpp-0.3.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/yaml-cpp/yaml-cpp-0.2.7.ebuild,v 1.2 2011/09/16 10:55:24 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/yaml-cpp/yaml-cpp-0.3.0.ebuild,v 1.1 2012/02/27 16:38:28 scarabeus Exp $
 
 EAPI=4
 
@@ -18,6 +18,8 @@ IUSE=""
 DEPEND=""
 RDEPEND="${DEPEND}"
 
+S="${WORKDIR}/${PN}"
+
 src_prepare() {
 	sed -i \
 		-e 's:INCLUDE_INSTALL_ROOT_DIR:INCLUDE_INSTALL_DIR:g' \
diff --git a/dev-db/postgresql-base/Manifest b/dev-db/postgresql-base/Manifest
index 894d0b914352..69090612ddf2 100644
--- a/dev-db/postgresql-base/Manifest
+++ b/dev-db/postgresql-base/Manifest
@@ -2,12 +2,16 @@ DIST postgresql-8.2.22.tar.bz2 12777172 RMD160 27e31b4a423984080a87cb6dc86ca8773
 DIST postgresql-8.2.23.tar.bz2 12976249 RMD160 5a1d45cae1e7a9d9caa8e902608404b281bac7ff SHA1 f51ac2051c4b1c95f5f58bf75bbafc50d2bc359b SHA256 56c2ac7394e8ace9ef98a464d08530b91529fd56978f24b55139d20e3039f2d1
 DIST postgresql-8.3.16.tar.bz2 14348568 RMD160 2e2c677defbb0631529a4b76a3adee006c288617 SHA1 c8bda0f506c03d01054fac6dc2f1291cf7539c7e SHA256 000590e2bdd1a00c8f2d2fa30c1f244826a61ad038a53b63179e902f876a2744
 DIST postgresql-8.3.17.tar.bz2 14549222 RMD160 9ea925c26b185fb9066061ef4e1fca932bbbcbfb SHA1 f47bfb98629fed07e8f5ec61f2c3b84487fb0ad1 SHA256 fb15eeeaabcc753275abddf6e0fc8ad919dad5cb8a9863a6dc98348ed1f30877
+DIST postgresql-8.3.18.tar.bz2 14563583 RMD160 d276a468f59b4def821b686b5504a549bd0491c3 SHA1 0d832fc9c7dba5de1716921274ce0ca276418070 SHA256 5db4904a8959f09274e1e0ee7f21c354128d5dbb4e946b78391f6bc4723c3746
 DIST postgresql-8.4.10.tar.bz2 14481565 RMD160 ce5961033fc05b9e862cfef3c164d8faed19ce89 SHA1 31202e47fd2274b3a846d98c961cd7281d1798e8 SHA256 749f83e9d467b07dcd012fdf2b1615c577b410fd219b44a27bb7097bb1b07cfb
+DIST postgresql-8.4.11.tar.bz2 14502434 RMD160 85b4be0884ca11855eb0dbc1541403e7baf7c0aa SHA1 ce9581b9f03bd884417b988ec317ce2ed06bb15f SHA256 5bbc9ff1d16282b592600d7c6b9cb1a93049d4aa9a961e3c2c8d5fb13b189c8f
 DIST postgresql-8.4.9.tar.bz2 14275979 RMD160 469acc1d1358c48334896fb8fa84de1d287183d5 SHA1 7b6bbd72db0f63ea55890427ab6c7a40e7c7ff1b SHA256 1d58cb8d0cb8ae8f61042b2d5aa54135a2d2a0f324d06593870e1242b0e8c38a
 DIST postgresql-9.0.5.tar.bz2 14344752 RMD160 c5f4f37808f7e24d91a6c95d41fc89330624e26f SHA1 1c71be5b1a7d519eff33bb60768776f47b44acf3 SHA256 56d8ee809ceeabeae8461ae0a197943460cba5bf8fbe37324e4451cf2eb7d504
 DIST postgresql-9.0.6.tar.bz2 14777282 RMD160 e1794a28e495b861c2f82b325b4e28e71faa58ca SHA1 4a9a7d5579d3683ca1992b2ba116a4356094b3ca SHA256 317d99d2ff9e1de8da0cae107bc06c9fd455b1df0c0fb77b8fbb61fb08276056
+DIST postgresql-9.0.7.tar.bz2 14977437 RMD160 80a8c91233462515914aeb5c15cf63b7195da3ef SHA1 c0cf6de3cfa131b36107b3748ae44786ad638e12 SHA256 dabe26d71d8b595f9514da1363dc20c3f4b90b6908026dd06984cac448a6d833
 DIST postgresql-9.1.1.tar.bz2 14884071 RMD160 294c0e04bebcf07fa88fb5d5e5837c99f736edd3 SHA1 4df7b6f6b23acdac5ea198e3623796a2b62fc7a4 SHA256 c794016bcf3fc1f561bc86796c6c9d050e3d8d2d55356515126e048275ae56f2
 DIST postgresql-9.1.2.tar.bz2 15424814 RMD160 2f98f2ff4e6e2b048dce80335fb3c672753114a9 SHA1 7d57b96eb1c764ec234c72b70511a5f7e23fb2b0 SHA256 8d54ff514f5b2754e6e36b008c43d7bbf7daf541da608767cc5bdedb1de5db30
+DIST postgresql-9.1.3.tar.bz2 15582454 RMD160 84eb235c090083b78e6a2facf3d7bc534395db8b SHA1 1cf3044415df807c08bb8ad8e40e24e8d375cf34 SHA256 7a79800a624031c1d9bc9cdce73cb40050100ac50a82050cbf7bbbd16ac4d5d5
 DIST postgresql-patches-8.2-r1.tbz2 4859 RMD160 864f166e01219b1f8f9ca2732a1d6b9c6de0cf7f SHA1 27977244ef48cb1a232542657d76267faa7e9d3d SHA256 7b9f46ca16d7adf29cfd2a3f57f2b54bbf349b4dbbe679f4e31302376bda51cf
 DIST postgresql-patches-8.2-r2.tbz2 4850 RMD160 766861791d68b8307e2686b93dd5b09fb775fdb8 SHA1 41c8b8a36d7dd7aa556ca6e2d5a4bb579226e8f7 SHA256 014f68519d25de055dce373924caf681d517ab66c022c01adb9816545e4bab14
 DIST postgresql-patches-8.3-r1.tbz2 5491 RMD160 6a05ec9a9c0dd587cc86e7684a353cb5e3cd7fa3 SHA1 a60e5f813e77f8b1edc9483f62e067b04457fb1d SHA256 522d4563f2e5fa857751091d1344799d8e22846de20c4fb360a7451d746fd176
diff --git a/dev-db/postgresql-base/postgresql-base-8.3.18.ebuild b/dev-db/postgresql-base/postgresql-base-8.3.18.ebuild
new file mode 100644
index 000000000000..570c73c6c648
--- /dev/null
+++ b/dev-db/postgresql-base/postgresql-base-8.3.18.ebuild
@@ -0,0 +1,150 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-base/postgresql-base-8.3.18.ebuild,v 1.1 2012/02/28 01:55:55 titanofold Exp $
+
+EAPI="4"
+
+WANT_AUTOMAKE="none"
+
+inherit autotools eutils multilib prefix versionator
+
+SLOT="$(get_version_component_range 1-2)"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+
+DESCRIPTION="PostgreSQL libraries and clients"
+HOMEPAGE="http://www.postgresql.org/"
+SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2
+		 http://dev.gentoo.org/~titanofold/postgresql-patches-8.3-r2.tbz2"
+LICENSE="POSTGRESQL"
+
+S="${WORKDIR}/postgresql-${PV}"
+
+# No tests to be done for clients and libraries
+RESTRICT="test"
+
+LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN zh_TW"
+IUSE="doc kerberos ldap nls pam pg-intdatetime readline ssl threads zlib"
+
+for lingua in ${LINGUAS} ; do
+	IUSE+=" linguas_${lingua}"
+done
+
+wanted_languages() {
+	local enable_langs
+
+	for lingua in ${LINGUAS} ; do
+		use linguas_${lingua} && enable_langs+="${lingua} "
+	done
+
+	echo -n ${enable_langs}
+}
+
+RDEPEND=">=app-admin/eselect-postgresql-1.0.10
+		 virtual/libintl
+		 !!dev-db/libpq
+		 !!dev-db/postgresql
+		 !!dev-db/postgresql-client
+		 !!dev-db/postgresql-libs
+		 kerberos? ( virtual/krb5 )
+		 ldap? ( net-nds/openldap )
+		 pam? ( virtual/pam )
+		 readline? ( >=sys-libs/readline-4.1 )
+		 ssl? ( >=dev-libs/openssl-0.9.6-r1 )
+		 zlib? ( >=sys-libs/zlib-1.1.3 )"
+
+DEPEND="${RDEPEND}
+		!!<sys-apps/sandbox-2.0
+		>=sys-devel/bison-1.875
+		sys-devel/flex
+		nls? ( sys-devel/gettext )"
+
+PDEPEND="doc? ( ~dev-db/postgresql-docs-${PV} )"
+
+# Support /var/run or /run for the socket directory
+[[ ! -d /run ]] && RUNDIR=/var
+
+src_prepare() {
+	epatch "${WORKDIR}/autoconf.patch" "${WORKDIR}/base.patch" \
+		"${WORKDIR}/bool.patch" "${WORKDIR}/darwin.patch" \
+		"${WORKDIR}/relax_ssl_perms.patch" "${WORKDIR}/SuperH.patch" \
+
+	eprefixify src/include/pg_config_manual.h
+
+	# to avoid collision - it only should be installed by server
+	rm "${S}/src/backend/nls.mk"
+
+	# because psql/help.c includes the file
+	ln -s "${S}/src/include/libpq/pqsignal.h" "${S}/src/bin/psql/" || die
+
+	sed -e "s|@RUNDIR@|${RUNDIR}|g" \
+		-i src/include/pg_config_manual.h || \
+		die "RUNDIR sed failed"
+
+	eautoconf
+}
+
+src_configure() {
+	export LDFLAGS_SL="${LDFLAGS}"
+	local PO="${EPREFIX%/}"
+	econf --prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
+		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
+		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
+		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
+		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
+		--without-docdir \
+		--without-perl \
+		--without-python \
+		--without-tcl \
+		$(use_with kerberos krb5) \
+		$(use_with kerberos gssapi) \
+		$(use_with ldap) \
+		"$(use_enable nls nls "$(wanted_languages)")" \
+		$(use_with pam) \
+		$(use_enable pg-intdatetime integer-datetimes ) \
+		$(use_with readline) \
+		$(use_with ssl openssl) \
+		$(use_enable threads thread-safety) \
+		$(use_with zlib)
+}
+
+src_compile() {
+	emake
+
+	cd "${S}/contrib"
+	emake
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	insinto /usr/include/postgresql-${SLOT}/postmaster
+	doins "${S}"/src/include/postmaster/*.h
+	dodir /usr/share/postgresql-${SLOT}/man/man1
+
+	rm "${ED}"/usr/share/postgresql-${SLOT}/man/man1/{initdb,ipcclean,pg_{controldata,ctl,resetxlog},post{gres,master}}.1
+	docompress /usr/share/postgresql-${SLOT}/man/man{1,7}
+
+	dodoc README HISTORY doc/{README.*,TODO,bug.template}
+
+	cd "${S}/contrib"
+	emake DESTDIR="${D}" install
+	cd "${S}"
+
+	dodir /etc/eselect/postgresql/slots/${SLOT}
+
+	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" \
+		> "${ED}/etc/eselect/postgresql/slots/${SLOT}/base"
+
+	keepdir /etc/postgresql-${SLOT}
+}
+
+pkg_postinst() {
+	postgresql-config update
+
+	elog "If you need a global psqlrc-file, you can place it in:"
+	elog "    ${EROOT%/}/etc/postgresql-${SLOT}/"
+}
+
+pkg_postrm() {
+	postgresql-config update
+}
diff --git a/dev-db/postgresql-base/postgresql-base-8.4.11.ebuild b/dev-db/postgresql-base/postgresql-base-8.4.11.ebuild
new file mode 100644
index 000000000000..8015e637c657
--- /dev/null
+++ b/dev-db/postgresql-base/postgresql-base-8.4.11.ebuild
@@ -0,0 +1,150 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-base/postgresql-base-8.4.11.ebuild,v 1.1 2012/02/28 01:55:55 titanofold Exp $
+
+EAPI="4"
+
+WANT_AUTOMAKE="none"
+
+inherit autotools eutils multilib prefix versionator
+
+SLOT="$(get_version_component_range 1-2)"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+
+DESCRIPTION="PostgreSQL libraries and clients"
+HOMEPAGE="http://www.postgresql.org/"
+SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2
+		 http://dev.gentoo.org/~titanofold/postgresql-patches-8.4-r2.tbz2"
+LICENSE="POSTGRESQL"
+
+S="${WORKDIR}/postgresql-${PV}"
+
+# No tests to be done for clients and libraries
+RESTRICT="test"
+
+LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN zh_TW"
+IUSE="doc kerberos ldap nls pam pg_legacytimestamp readline ssl threads zlib"
+
+for lingua in ${LINGUAS} ; do
+	IUSE+=" linguas_${lingua}"
+done
+
+wanted_languages() {
+	local enable_langs
+
+	for lingua in ${LINGUAS} ; do
+		use linguas_${lingua} && enable_langs+="${lingua} "
+	done
+
+	echo -n ${enable_langs}
+}
+
+RDEPEND=">=app-admin/eselect-postgresql-1.0.7
+		 virtual/libintl
+		 !!dev-db/libpq
+		 !!dev-db/postgresql
+		 !!dev-db/postgresql-client
+		 !!dev-db/postgresql-libs
+		 kerberos? ( virtual/krb5 )
+		 ldap? ( net-nds/openldap )
+		 pam? ( virtual/pam )
+		 readline? ( >=sys-libs/readline-4.1 )
+		 ssl? ( >=dev-libs/openssl-0.9.6-r1 )
+		 zlib? ( >=sys-libs/zlib-1.1.3 )"
+
+DEPEND="${RDEPEND}
+		!!<sys-apps/sandbox-2.0
+		>=sys-devel/bison-1.875
+		sys-devel/flex
+		nls? ( sys-devel/gettext )"
+
+PDEPEND="doc? ( ~dev-db/postgresql-docs-${PV} )"
+
+# Support /var/run or /run for the socket directory
+[[ ! -d /run ]] && RUNDIR=/var
+
+src_prepare() {
+	epatch "${WORKDIR}/autoconf.patch" "${WORKDIR}/base.patch" \
+		"${WORKDIR}/bool.patch" "${WORKDIR}/darwin.patch" \
+		"${WORKDIR}/SuperH.patch"
+
+	eprefixify src/include/pg_config_manual.h
+
+	# to avoid collision - it only should be installed by server
+	rm "${S}/src/backend/nls.mk"
+
+	# because psql/help.c includes the file
+	ln -s "${S}/src/include/libpq/pqsignal.h" "${S}/src/bin/psql/" || die
+
+	sed -e "s|@RUNDIR@|${RUNDIR}|g" \
+		-i src/include/pg_config_manual.h || \
+		die "RUNDIR sed failed"
+
+	eautoconf
+}
+
+src_configure() {
+	export LDFLAGS_SL="${LDFLAGS}"
+	local PO="${EPREFIX%/}"
+	econf --prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
+		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
+		--docdir="${PO}/usr/share/doc/postgresql-${SLOT}" \
+		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
+		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
+		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
+		--without-tcl \
+		--without-perl \
+		--without-python \
+		$(use_with kerberos krb5) \
+		$(use_with kerberos gssapi) \
+		$(use_with ldap) \
+		"$(use_enable nls nls "$(wanted_languages)")" \
+		$(use_with pam) \
+		$(use_enable !pg_legacytimestamp integer-datetimes ) \
+		$(use_with readline) \
+		$(use_with ssl openssl) \
+		$(use_enable threads thread-safety) \
+		$(use_with zlib)
+}
+
+src_compile() {
+	emake
+
+	cd "${S}/contrib"
+	emake
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	insinto /usr/include/postgresql-${SLOT}/postmaster
+	doins "${S}"/src/include/postmaster/*.h
+
+	rm -r "${ED}/usr/share/doc/postgresql-${SLOT}/html"
+	rm "${ED}"/usr/share/postgresql-${SLOT}/man/man1/{initdb,pg_{controldata,ctl,resetxlog},post{gres,master}}.1
+	docompress /usr/share/postgresql-${SLOT}/man/man{1,7}
+
+	dodoc README HISTORY doc/{README.*,TODO,bug.template}
+
+	cd "${S}/contrib"
+	emake DESTDIR="${D}" install
+	cd "${S}"
+
+	dodir /etc/eselect/postgresql/slots/${SLOT}
+
+	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" \
+		> "${ED}/etc/eselect/postgresql/slots/${SLOT}/base"
+
+	keepdir /etc/postgresql-${SLOT}
+}
+
+pkg_postinst() {
+	postgresql-config update
+
+	elog "If you need a global psqlrc-file, you can place it in:"
+	elog "    ${EROOT%/}/etc/postgresql-${SLOT}/"
+}
+
+pkg_postrm() {
+	postgresql-config update
+}
diff --git a/dev-db/postgresql-base/postgresql-base-9.0.7.ebuild b/dev-db/postgresql-base/postgresql-base-9.0.7.ebuild
new file mode 100644
index 000000000000..efb3e61f2060
--- /dev/null
+++ b/dev-db/postgresql-base/postgresql-base-9.0.7.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-base/postgresql-base-9.0.7.ebuild,v 1.1 2012/02/28 01:55:55 titanofold Exp $
+
+EAPI="4"
+
+WANT_AUTOMAKE="none"
+
+inherit autotools eutils flag-o-matic multilib prefix versionator
+
+SLOT="$(get_version_component_range 1-2)"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+
+DESCRIPTION="PostgreSQL libraries and clients"
+HOMEPAGE="http://www.postgresql.org/"
+SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2
+		 http://dev.gentoo.org/~titanofold/postgresql-patches-9.0-r3.tbz2"
+LICENSE="POSTGRESQL"
+
+S="${WORKDIR}/postgresql-${PV}"
+
+# No tests to be done for clients and libraries
+RESTRICT="test"
+
+LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN zh_TW"
+IUSE="doc kerberos ldap nls pam pg_legacytimestamp readline ssl threads zlib"
+
+for lingua in ${LINGUAS} ; do
+	IUSE+=" linguas_${lingua}"
+done
+
+wanted_languages() {
+	local enable_langs
+
+	for lingua in ${LINGUAS} ; do
+		use linguas_${lingua} && enable_langs+="${lingua} "
+	done
+
+	echo -n ${enable_langs}
+}
+
+RDEPEND=">=app-admin/eselect-postgresql-1.0.7
+		 virtual/libintl
+		 !!dev-db/libpq
+		 !!dev-db/postgresql
+		 !!dev-db/postgresql-client
+		 !!dev-db/postgresql-libs
+		 kerberos? ( virtual/krb5 )
+		 ldap? ( net-nds/openldap )
+		 pam? ( virtual/pam )
+		 readline? ( sys-libs/readline )
+		 ssl? ( >=dev-libs/openssl-0.9.6-r1 )
+		 zlib? ( sys-libs/zlib )"
+
+DEPEND="${RDEPEND}
+		sys-devel/bison
+		sys-devel/flex
+		!!<sys-apps/sandbox-2.0
+		nls? ( sys-devel/gettext )"
+
+PDEPEND="doc? ( ~dev-db/postgresql-docs-${PV} )"
+
+# Support /var/run or /run for the socket directory
+[[ ! -d /run ]] && RUNDIR=/var
+
+src_prepare() {
+	epatch "${WORKDIR}/autoconf.patch" "${WORKDIR}/base.patch" \
+		"${WORKDIR}/bool.patch"
+
+	eprefixify src/include/pg_config_manual.h
+
+	# to avoid collision - it only should be installed by server
+	rm "${S}/src/backend/nls.mk"
+
+	# because psql/help.c includes the file
+	ln -s "${S}/src/include/libpq/pqsignal.h" "${S}/src/bin/psql/" || die
+
+	sed -e "s|@RUNDIR@|${RUNDIR}|g" \
+		-i src/include/pg_config_manual.h || \
+		die "RUNDIR sed failed"
+
+	eautoconf
+}
+
+src_configure() {
+	case ${CHOST} in
+		*-darwin*|*-solaris*)
+			use nls && append-libs intl
+		;;
+	esac
+	export LDFLAGS_SL="${LDFLAGS}"
+	export LDFLAGS_EX="${LDFLAGS}"
+	local PO="${EPREFIX%/}"
+	econf --prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
+		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
+		--docdir="${PO}/usr/share/doc/postgresql-${SLOT}" \
+		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
+		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
+		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
+		--without-tcl \
+		--without-perl \
+		--without-python \
+		$(use_with kerberos krb5) \
+		$(use_with kerberos gssapi) \
+		$(use_with ldap) \
+		"$(use_enable nls nls "$(wanted_languages)")" \
+		$(use_with pam) \
+		$(use_enable !pg_legacytimestamp integer-datetimes) \
+		$(use_with readline) \
+		$(use_with ssl openssl) \
+		$(use_enable threads thread-safety) \
+		$(use_with zlib)
+}
+
+src_compile() {
+	emake
+
+	cd "${S}/contrib"
+	emake
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	insinto /usr/include/postgresql-${SLOT}/postmaster
+	doins "${S}"/src/include/postmaster/*.h
+
+	dodir /usr/share/postgresql-${SLOT}/man/
+	cp -r "${S}"/doc/src/sgml/man{1,7} "${ED}"/usr/share/postgresql-${SLOT}/man/ || die
+	rm "${ED}/usr/share/postgresql-${SLOT}/man/man1"/{initdb,pg_controldata,pg_ctl,pg_resetxlog,postgres,postmaster}.1
+	docompress /usr/share/postgresql-${SLOT}/man/man{1,7}
+
+	dodoc README HISTORY doc/{README.*,TODO,bug.template}
+
+	cd "${S}/contrib"
+	emake DESTDIR="${D}" install
+	cd "${S}"
+
+	dodir /etc/eselect/postgresql/slots/${SLOT}
+
+	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" \
+		> "${ED}/etc/eselect/postgresql/slots/${SLOT}/base"
+
+	keepdir /etc/postgresql-${SLOT}
+}
+
+pkg_postinst() {
+	postgresql-config update
+
+	elog "If you need a global psqlrc-file, you can place it in:"
+	elog "    ${EROOT%/}/etc/postgresql-${SLOT}/"
+}
+
+pkg_postrm() {
+	postgresql-config update
+}
diff --git a/dev-db/postgresql-base/postgresql-base-9.1.3.ebuild b/dev-db/postgresql-base/postgresql-base-9.1.3.ebuild
new file mode 100644
index 000000000000..172b6792fc58
--- /dev/null
+++ b/dev-db/postgresql-base/postgresql-base-9.1.3.ebuild
@@ -0,0 +1,160 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-base/postgresql-base-9.1.3.ebuild,v 1.1 2012/02/28 01:55:55 titanofold Exp $
+
+EAPI="4"
+
+WANT_AUTOMAKE="none"
+
+inherit autotools eutils flag-o-matic multilib prefix versionator
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+
+SLOT="$(get_version_component_range 1-2)"
+S="${WORKDIR}/postgresql-${PV}"
+
+DESCRIPTION="PostgreSQL libraries and clients"
+HOMEPAGE="http://www.postgresql.org/"
+SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2
+		 http://dev.gentoo.org/~titanofold/postgresql-patches-9.1-r1.tbz2"
+LICENSE="POSTGRESQL"
+
+# No tests to be done for clients and libraries
+RESTRICT="test"
+
+LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN zh_TW"
+IUSE="doc kerberos ldap nls pam pg_legacytimestamp readline ssl threads zlib"
+
+for lingua in ${LINGUAS} ; do
+	IUSE+=" linguas_${lingua}"
+done
+
+wanted_languages() {
+	local enable_langs
+
+	for lingua in ${LINGUAS} ; do
+		use linguas_${lingua} && enable_langs+="${lingua} "
+	done
+
+	echo -n ${enable_langs}
+}
+
+RDEPEND="!!dev-db/libpq
+		 !!dev-db/postgresql
+		 !!dev-db/postgresql-client
+		 !!dev-db/postgresql-libs
+		 >=app-admin/eselect-postgresql-1.0.10
+		 virtual/libintl
+		 kerberos? ( virtual/krb5 )
+		 ldap? ( net-nds/openldap )
+		 pam? ( virtual/pam )
+		 readline? ( sys-libs/readline )
+		 ssl? ( >=dev-libs/openssl-0.9.6-r1 )
+		 zlib? ( sys-libs/zlib )
+"
+
+DEPEND="${RDEPEND}
+		!!<sys-apps/sandbox-2.0
+		sys-devel/bison
+		sys-devel/flex
+		nls? ( sys-devel/gettext )
+"
+
+PDEPEND="doc? ( ~dev-db/postgresql-docs-${PV} )"
+
+# Support /var/run or /run for the socket directory
+[[ ! -d /run ]] && RUNDIR=/var
+
+src_prepare() {
+	epatch "${WORKDIR}/autoconf.patch" \
+		"${WORKDIR}/base.patch" \
+		"${WORKDIR}/bool.patch"
+
+	eprefixify src/include/pg_config_manual.h
+
+	# to avoid collision - it only should be installed by server
+	rm "${S}/src/backend/nls.mk"
+
+	# because psql/help.c includes the file
+	ln -s "${S}/src/include/libpq/pqsignal.h" "${S}/src/bin/psql/" || die
+
+	sed -e "s|@RUNDIR@|${RUNDIR}|g" \
+		-i src/include/pg_config_manual.h || \
+		die "RUNDIR sed failed"
+
+	eautoconf
+}
+
+src_configure() {
+	case ${CHOST} in
+		*-darwin*|*-solaris*)
+			use nls && append-libs intl
+			;;
+	esac
+
+	export LDFLAGS_SL="${LDFLAGS}"
+	export LDFLAGS_EX="${LDFLAGS}"
+
+	local PO="${EPREFIX%/}"
+
+	econf \
+		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
+		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
+		--docdir="${PO}/usr/share/doc/postgresql-${SLOT}" \
+		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
+		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
+		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
+		--without-tcl \
+		--without-perl \
+		--without-python \
+		$(use_with readline) \
+		$(use_with kerberos krb5) \
+		$(use_with kerberos gssapi) \
+		"$(use_enable nls nls "$(wanted_languages)")" \
+		$(use_with pam) \
+		$(use_enable !pg_legacytimestamp integer-datetimes) \
+		$(use_with ssl openssl) \
+		$(use_enable threads thread-safety) \
+		$(use_with zlib) \
+		$(use_with ldap)
+}
+
+src_compile() {
+	emake -j1
+
+	cd "${S}/contrib"
+	emake
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	insinto /usr/include/postgresql-${SLOT}/postmaster
+	doins "${S}"/src/include/postmaster/*.h
+
+	dodir /usr/share/postgresql-${SLOT}/man/
+	cp -r "${S}"/doc/src/sgml/man{1,7} "${ED}"/usr/share/postgresql-${SLOT}/man/ || die
+	rm "${ED}/usr/share/postgresql-${SLOT}/man/man1"/{initdb,pg_{controldata,ctl,resetxlog},post{gres,master}}.1
+	docompress /usr/share/postgresql-${SLOT}/man/man{1,7}
+	dodoc README HISTORY doc/{TODO,bug.template}
+
+	cd "${S}/contrib"
+	emake DESTDIR="${D}" install
+	cd "${S}"
+
+	dodir /etc/eselect/postgresql/slots/${SLOT}
+	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" > \
+		"${ED}/etc/eselect/postgresql/slots/${SLOT}/base"
+
+	keepdir /etc/postgresql-${SLOT}
+}
+
+pkg_postinst() {
+	postgresql-config update
+
+	elog "If you need a global psqlrc-file, you can place it in:"
+	elog "    ${EROOT%/}/etc/postgresql-${SLOT}/"
+}
+
+pkg_postrm() {
+	postgresql-config update
+}
diff --git a/dev-db/postgresql-docs/Manifest b/dev-db/postgresql-docs/Manifest
index a9a9dc72af08..c32cc9eab257 100644
--- a/dev-db/postgresql-docs/Manifest
+++ b/dev-db/postgresql-docs/Manifest
@@ -2,9 +2,13 @@ DIST postgresql-8.2.22.tar.bz2 12777172 RMD160 27e31b4a423984080a87cb6dc86ca8773
 DIST postgresql-8.2.23.tar.bz2 12976249 RMD160 5a1d45cae1e7a9d9caa8e902608404b281bac7ff SHA1 f51ac2051c4b1c95f5f58bf75bbafc50d2bc359b SHA256 56c2ac7394e8ace9ef98a464d08530b91529fd56978f24b55139d20e3039f2d1
 DIST postgresql-8.3.16.tar.bz2 14348568 RMD160 2e2c677defbb0631529a4b76a3adee006c288617 SHA1 c8bda0f506c03d01054fac6dc2f1291cf7539c7e SHA256 000590e2bdd1a00c8f2d2fa30c1f244826a61ad038a53b63179e902f876a2744
 DIST postgresql-8.3.17.tar.bz2 14549222 RMD160 9ea925c26b185fb9066061ef4e1fca932bbbcbfb SHA1 f47bfb98629fed07e8f5ec61f2c3b84487fb0ad1 SHA256 fb15eeeaabcc753275abddf6e0fc8ad919dad5cb8a9863a6dc98348ed1f30877
+DIST postgresql-8.3.18.tar.bz2 14563583 RMD160 d276a468f59b4def821b686b5504a549bd0491c3 SHA1 0d832fc9c7dba5de1716921274ce0ca276418070 SHA256 5db4904a8959f09274e1e0ee7f21c354128d5dbb4e946b78391f6bc4723c3746
 DIST postgresql-8.4.10.tar.bz2 14481565 RMD160 ce5961033fc05b9e862cfef3c164d8faed19ce89 SHA1 31202e47fd2274b3a846d98c961cd7281d1798e8 SHA256 749f83e9d467b07dcd012fdf2b1615c577b410fd219b44a27bb7097bb1b07cfb
+DIST postgresql-8.4.11.tar.bz2 14502434 RMD160 85b4be0884ca11855eb0dbc1541403e7baf7c0aa SHA1 ce9581b9f03bd884417b988ec317ce2ed06bb15f SHA256 5bbc9ff1d16282b592600d7c6b9cb1a93049d4aa9a961e3c2c8d5fb13b189c8f
 DIST postgresql-8.4.9.tar.bz2 14275979 RMD160 469acc1d1358c48334896fb8fa84de1d287183d5 SHA1 7b6bbd72db0f63ea55890427ab6c7a40e7c7ff1b SHA256 1d58cb8d0cb8ae8f61042b2d5aa54135a2d2a0f324d06593870e1242b0e8c38a
 DIST postgresql-9.0.5.tar.bz2 14344752 RMD160 c5f4f37808f7e24d91a6c95d41fc89330624e26f SHA1 1c71be5b1a7d519eff33bb60768776f47b44acf3 SHA256 56d8ee809ceeabeae8461ae0a197943460cba5bf8fbe37324e4451cf2eb7d504
 DIST postgresql-9.0.6.tar.bz2 14777282 RMD160 e1794a28e495b861c2f82b325b4e28e71faa58ca SHA1 4a9a7d5579d3683ca1992b2ba116a4356094b3ca SHA256 317d99d2ff9e1de8da0cae107bc06c9fd455b1df0c0fb77b8fbb61fb08276056
+DIST postgresql-9.0.7.tar.bz2 14977437 RMD160 80a8c91233462515914aeb5c15cf63b7195da3ef SHA1 c0cf6de3cfa131b36107b3748ae44786ad638e12 SHA256 dabe26d71d8b595f9514da1363dc20c3f4b90b6908026dd06984cac448a6d833
 DIST postgresql-9.1.1.tar.bz2 14884071 RMD160 294c0e04bebcf07fa88fb5d5e5837c99f736edd3 SHA1 4df7b6f6b23acdac5ea198e3623796a2b62fc7a4 SHA256 c794016bcf3fc1f561bc86796c6c9d050e3d8d2d55356515126e048275ae56f2
 DIST postgresql-9.1.2.tar.bz2 15424814 RMD160 2f98f2ff4e6e2b048dce80335fb3c672753114a9 SHA1 7d57b96eb1c764ec234c72b70511a5f7e23fb2b0 SHA256 8d54ff514f5b2754e6e36b008c43d7bbf7daf541da608767cc5bdedb1de5db30
+DIST postgresql-9.1.3.tar.bz2 15582454 RMD160 84eb235c090083b78e6a2facf3d7bc534395db8b SHA1 1cf3044415df807c08bb8ad8e40e24e8d375cf34 SHA256 7a79800a624031c1d9bc9cdce73cb40050100ac50a82050cbf7bbbd16ac4d5d5
diff --git a/dev-db/postgresql-docs/postgresql-docs-8.3.18.ebuild b/dev-db/postgresql-docs/postgresql-docs-8.3.18.ebuild
new file mode 100644
index 000000000000..5b78f1823c7f
--- /dev/null
+++ b/dev-db/postgresql-docs/postgresql-docs-8.3.18.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-docs/postgresql-docs-8.3.18.ebuild,v 1.1 2012/02/28 01:48:31 titanofold Exp $
+
+EAPI="4"
+
+inherit versionator
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+
+# Nothing to test here per 232157
+RESTRICT="test"
+
+DESCRIPTION="PostgreSQL documentation"
+HOMEPAGE="http://www.postgresql.org/"
+SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2"
+LICENSE="POSTGRESQL"
+
+S=${WORKDIR}/postgresql-${PV}
+SLOT="$(get_version_component_range 1-2)"
+
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+src_unpack() {
+	tar xjf "${DISTDIR}/${A}" -C "${WORKDIR}" "${A%.tar.bz2}/doc"
+}
+
+src_install() {
+	cd "${S}/doc"
+
+	dodir /usr/share/doc/${PF}/html
+	tar -zxf "postgres.tar.gz" -C "${ED}/usr/share/doc/${PF}/html"
+	fowners root:0 -R /usr/share/doc/${PF}/html
+
+	docinto FAQ_html
+	dodoc src/FAQ/*
+
+	docinto sgml
+	dodoc src/sgml/*.{sgml,dsl}
+	docinto sgml/ref
+	dodoc src/sgml/ref/*.sgml
+
+	docinto TODO.detail
+	dodoc TODO.detail/*
+
+	dodir /etc/eselect/postgresql/slots/${SLOT}
+	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" > \
+		"${ED}/etc/eselect/postgresql/slots/${SLOT}/docs"
+}
diff --git a/dev-db/postgresql-docs/postgresql-docs-8.4.11.ebuild b/dev-db/postgresql-docs/postgresql-docs-8.4.11.ebuild
new file mode 100644
index 000000000000..a118bc4a27d9
--- /dev/null
+++ b/dev-db/postgresql-docs/postgresql-docs-8.4.11.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-docs/postgresql-docs-8.4.11.ebuild,v 1.1 2012/02/28 01:48:31 titanofold Exp $
+
+EAPI="4"
+
+inherit versionator
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+
+# Nothing to test here per 232157
+RESTRICT="test"
+
+DESCRIPTION="PostgreSQL documentation"
+HOMEPAGE="http://www.postgresql.org/"
+SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2"
+LICENSE="POSTGRESQL"
+
+S=${WORKDIR}/postgresql-${PV}
+SLOT="$(get_version_component_range 1-2)"
+
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+src_unpack() {
+	tar xjf "${DISTDIR}/${A}" -C "${WORKDIR}" "${A%.tar.bz2}/doc"
+}
+
+src_install() {
+	cd "${S}/doc"
+
+	dodir /usr/share/doc/${PF}/html
+	tar -zxf "postgres.tar.gz" -C "${ED}/usr/share/doc/${PF}/html"
+	fowners root:0 -R /usr/share/doc/${PF}/html
+
+	docinto sgml
+	dodoc src/sgml/*.{sgml,dsl}
+	docinto sgml/ref
+	dodoc src/sgml/ref/*.sgml
+
+	docinto
+	dodoc TODO
+
+	dodir /etc/eselect/postgresql/slots/${SLOT}
+	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" > \
+		"${ED}/etc/eselect/postgresql/slots/${SLOT}/docs"
+}
diff --git a/dev-db/postgresql-docs/postgresql-docs-9.0.7.ebuild b/dev-db/postgresql-docs/postgresql-docs-9.0.7.ebuild
new file mode 100644
index 000000000000..357ed9c79f06
--- /dev/null
+++ b/dev-db/postgresql-docs/postgresql-docs-9.0.7.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-docs/postgresql-docs-9.0.7.ebuild,v 1.1 2012/02/28 01:48:31 titanofold Exp $
+
+EAPI="4"
+
+inherit versionator
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+
+RESTRICT="test"
+
+DESCRIPTION="PostgreSQL documentation"
+HOMEPAGE="http://www.postgresql.org/"
+SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2"
+LICENSE="POSTGRESQL"
+
+S=${WORKDIR}/postgresql-${PV}
+SLOT="$(get_version_component_range 1-2)"
+
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+src_unpack() {
+	tar xjf "${DISTDIR}/${A}" -C "${WORKDIR}" "${A%.tar.bz2}/doc"
+}
+
+src_install() {
+	dodir /usr/share/doc/${PF}/html
+
+	cd "${S}/doc"
+
+	docinto sgml
+	dodoc src/sgml/*.{sgml,dsl}
+	docinto sgml/ref
+	dodoc src/sgml/ref/*.sgml
+
+	docinto html
+	dodoc src/sgml/html/*.html
+	dodoc src/sgml/html/stylesheet.css
+
+	docinto
+	dodoc TODO
+
+	dodir /etc/eselect/postgresql/slots/${SLOT}
+	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" > \
+		"${ED}/etc/eselect/postgresql/slots/${SLOT}/docs"
+}
diff --git a/dev-db/postgresql-docs/postgresql-docs-9.1.3.ebuild b/dev-db/postgresql-docs/postgresql-docs-9.1.3.ebuild
new file mode 100644
index 000000000000..2e3c9bc5e760
--- /dev/null
+++ b/dev-db/postgresql-docs/postgresql-docs-9.1.3.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-docs/postgresql-docs-9.1.3.ebuild,v 1.1 2012/02/28 01:48:31 titanofold Exp $
+
+EAPI="4"
+
+inherit versionator
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+
+SLOT="$(get_version_component_range 1-2)"
+S="${WORKDIR}/postgresql-${PV}"
+
+DESCRIPTION="PostgreSQL documentation"
+HOMEPAGE="http://www.postgresql.org/"
+SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2"
+LICENSE="POSTGRESQL"
+
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+src_unpack() {
+	tar xjf "${DISTDIR}/${A}" -C "${WORKDIR}" "${A%.tar.bz2}/doc"
+}
+
+src_install() {
+	dodir /usr/share/doc/${PF}/html
+
+	cd "${S}/doc"
+
+	docinto sgml
+	dodoc src/sgml/*.{sgml,dsl}
+
+	docinto sgml/ref
+	dodoc src/sgml/ref/*.sgml
+
+	docinto html
+	dodoc src/sgml/html/*.html
+	dodoc src/sgml/html/stylesheet.css
+
+	docinto
+	dodoc TODO
+
+	dodir /etc/eselect/postgresql/slots/${SLOT}
+	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" > \
+		"${ED}/etc/eselect/postgresql/slots/${SLOT}/docs"
+}
diff --git a/dev-db/postgresql-server/Manifest b/dev-db/postgresql-server/Manifest
index 658e4ba75483..8adf66fdb2a1 100644
--- a/dev-db/postgresql-server/Manifest
+++ b/dev-db/postgresql-server/Manifest
@@ -2,12 +2,16 @@ DIST postgresql-8.2.22.tar.bz2 12777172 RMD160 27e31b4a423984080a87cb6dc86ca8773
 DIST postgresql-8.2.23.tar.bz2 12976249 RMD160 5a1d45cae1e7a9d9caa8e902608404b281bac7ff SHA1 f51ac2051c4b1c95f5f58bf75bbafc50d2bc359b SHA256 56c2ac7394e8ace9ef98a464d08530b91529fd56978f24b55139d20e3039f2d1
 DIST postgresql-8.3.16.tar.bz2 14348568 RMD160 2e2c677defbb0631529a4b76a3adee006c288617 SHA1 c8bda0f506c03d01054fac6dc2f1291cf7539c7e SHA256 000590e2bdd1a00c8f2d2fa30c1f244826a61ad038a53b63179e902f876a2744
 DIST postgresql-8.3.17.tar.bz2 14549222 RMD160 9ea925c26b185fb9066061ef4e1fca932bbbcbfb SHA1 f47bfb98629fed07e8f5ec61f2c3b84487fb0ad1 SHA256 fb15eeeaabcc753275abddf6e0fc8ad919dad5cb8a9863a6dc98348ed1f30877
+DIST postgresql-8.3.18.tar.bz2 14563583 RMD160 d276a468f59b4def821b686b5504a549bd0491c3 SHA1 0d832fc9c7dba5de1716921274ce0ca276418070 SHA256 5db4904a8959f09274e1e0ee7f21c354128d5dbb4e946b78391f6bc4723c3746
 DIST postgresql-8.4.10.tar.bz2 14481565 RMD160 ce5961033fc05b9e862cfef3c164d8faed19ce89 SHA1 31202e47fd2274b3a846d98c961cd7281d1798e8 SHA256 749f83e9d467b07dcd012fdf2b1615c577b410fd219b44a27bb7097bb1b07cfb
+DIST postgresql-8.4.11.tar.bz2 14502434 RMD160 85b4be0884ca11855eb0dbc1541403e7baf7c0aa SHA1 ce9581b9f03bd884417b988ec317ce2ed06bb15f SHA256 5bbc9ff1d16282b592600d7c6b9cb1a93049d4aa9a961e3c2c8d5fb13b189c8f
 DIST postgresql-8.4.9.tar.bz2 14275979 RMD160 469acc1d1358c48334896fb8fa84de1d287183d5 SHA1 7b6bbd72db0f63ea55890427ab6c7a40e7c7ff1b SHA256 1d58cb8d0cb8ae8f61042b2d5aa54135a2d2a0f324d06593870e1242b0e8c38a
 DIST postgresql-9.0.5.tar.bz2 14344752 RMD160 c5f4f37808f7e24d91a6c95d41fc89330624e26f SHA1 1c71be5b1a7d519eff33bb60768776f47b44acf3 SHA256 56d8ee809ceeabeae8461ae0a197943460cba5bf8fbe37324e4451cf2eb7d504
 DIST postgresql-9.0.6.tar.bz2 14777282 RMD160 e1794a28e495b861c2f82b325b4e28e71faa58ca SHA1 4a9a7d5579d3683ca1992b2ba116a4356094b3ca SHA256 317d99d2ff9e1de8da0cae107bc06c9fd455b1df0c0fb77b8fbb61fb08276056
+DIST postgresql-9.0.7.tar.bz2 14977437 RMD160 80a8c91233462515914aeb5c15cf63b7195da3ef SHA1 c0cf6de3cfa131b36107b3748ae44786ad638e12 SHA256 dabe26d71d8b595f9514da1363dc20c3f4b90b6908026dd06984cac448a6d833
 DIST postgresql-9.1.1.tar.bz2 14884071 RMD160 294c0e04bebcf07fa88fb5d5e5837c99f736edd3 SHA1 4df7b6f6b23acdac5ea198e3623796a2b62fc7a4 SHA256 c794016bcf3fc1f561bc86796c6c9d050e3d8d2d55356515126e048275ae56f2
 DIST postgresql-9.1.2.tar.bz2 15424814 RMD160 2f98f2ff4e6e2b048dce80335fb3c672753114a9 SHA1 7d57b96eb1c764ec234c72b70511a5f7e23fb2b0 SHA256 8d54ff514f5b2754e6e36b008c43d7bbf7daf541da608767cc5bdedb1de5db30
+DIST postgresql-9.1.3.tar.bz2 15582454 RMD160 84eb235c090083b78e6a2facf3d7bc534395db8b SHA1 1cf3044415df807c08bb8ad8e40e24e8d375cf34 SHA256 7a79800a624031c1d9bc9cdce73cb40050100ac50a82050cbf7bbbd16ac4d5d5
 DIST postgresql-initscript-1.0.1.tbz2 2635 RMD160 989b89364ff367569c5129dec70c369496a69af1 SHA1 24cfbab756bf2c08e783ecae31c26ca45984de87 SHA256 a85276c431047e0123c988b296869cfa8afbbb6a4721d74fff4b419f608f0293
 DIST postgresql-initscript-1.2.tbz2 2776 RMD160 137a737c928a73886192c822fe31be18e9ee0b85 SHA1 9140008e07c0c71e0fdbc8c2f6d40ab729d094a3 SHA256 19600139714738552e4b6880f6349df27b275814c62954103f20984b607e357f
 DIST postgresql-initscript-2.0.tbz2 2584 RMD160 437c331ba5d4b9ce85725d9d180aa4edd9f47bf1 SHA1 9a99f91c2955bb3cd4414d9165868307d0450364 SHA256 67e75f134b8c55843e3b3a26c69460eca3f180052a6f4f13603c64fcb40b4fd5
diff --git a/dev-db/postgresql-server/postgresql-server-8.3.18.ebuild b/dev-db/postgresql-server/postgresql-server-8.3.18.ebuild
new file mode 100644
index 000000000000..5fed5db63af2
--- /dev/null
+++ b/dev-db/postgresql-server/postgresql-server-8.3.18.ebuild
@@ -0,0 +1,339 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/postgresql-server-8.3.18.ebuild,v 1.1 2012/02/28 02:04:06 titanofold Exp $
+
+EAPI="4"
+
+WANT_AUTOMAKE="none"
+inherit autotools eutils multilib pam prefix versionator
+
+SLOT="$(get_version_component_range 1-2)"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+
+DESCRIPTION="PostgreSQL server"
+HOMEPAGE="http://www.postgresql.org/"
+SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2
+		 http://dev.gentoo.org/~titanofold/postgresql-patches-8.3-r2.tbz2
+		 http://dev.gentoo.org/~titanofold/postgresql-initscript-2.1.tbz2"
+LICENSE="POSTGRESQL"
+
+S="${WORKDIR}/postgresql-${PV}"
+
+LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN zh_TW"
+IUSE="doc kernel_linux nls pam perl python selinux tcl uuid xml"
+
+for lingua in ${LINGUAS} ; do
+	IUSE+=" linguas_${lingua}"
+done
+
+wanted_languages() {
+	local enable_langs
+
+	for lingua in ${LINGUAS} ; do
+		use linguas_${lingua} && enable_langs+="${lingua} "
+	done
+
+	echo -n ${enable_langs}
+}
+
+RDEPEND="~dev-db/postgresql-base-${PV}:${SLOT}[pam?,nls=]
+		 perl? ( >=dev-lang/perl-5.8 )
+		 selinux? ( sec-policy/selinux-postgresql )
+		 tcl? ( >=dev-lang/tcl-8 )
+		 uuid? ( dev-libs/ossp-uuid )
+		 xml? ( dev-libs/libxml2 dev-libs/libxslt )"
+
+DEPEND="${RDEPEND}
+		sys-devel/flex
+		xml? ( dev-util/pkgconfig )"
+
+PDEPEND="doc? ( ~dev-db/postgresql-docs-${PV} )"
+
+# Support /var/run or /run for the socket directory
+[[ ! -d /run ]] && RUNDIR=/var
+
+pkg_setup() {
+	enewgroup postgres 70
+	enewuser postgres 70 /bin/bash /var/lib/postgresql postgres
+}
+
+src_prepare() {
+	epatch "${WORKDIR}/autoconf.patch" \
+		"${WORKDIR}/bool.patch" \
+		"${WORKDIR}/darwin.patch" \
+		"${WORKDIR}/pg_ctl-exit-status.patch" \
+		"${WORKDIR}/server.patch" \
+		"${WORKDIR}/SuperH.patch"
+
+	eprefixify src/include/pg_config_manual.h
+
+	if use test ; then
+		epatch "${WORKDIR}/regress.patch"
+		sed -e "s|@SOCKETDIR@|${T}|g" -i src/test/regress/pg_regress{,_main}.c
+		sed -e "s|/no/such/location|${S}/src/test/regress/tmp_check/no/such/location|g" \
+			-i src/test/regress/{input,output}/tablespace.source
+	else
+		echo "all install:" > "${S}/src/test/regress/GNUmakefile"
+	fi
+
+	sed -e "s|@RUNDIR@|${RUNDIR}|g" \
+		-i src/include/pg_config_manual.h "${WORKDIR}/postgresql.init" || \
+		die "RUNDIR sed failed"
+	sed -e "s|@SLOT@|${SLOT}|g" \
+		-i "${WORKDIR}/postgresql.init" "${WORKDIR}/postgresql.confd" || \
+		die "SLOT sed failed"
+
+	eautoconf
+}
+
+src_configure() {
+	# eval is needed to get along with pg_config quotation of space-rich entities.
+	eval econf "$(${EPREFIX%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/pg_config --configure)" \
+		--with-includes="${EPREFIX%/}/usr/include/postgresql-${SLOT}/" \
+		--with-system-tzdata="${EPREFIX%/}/usr/share/zoneinfo" \
+		$(use_with perl) \
+		$(use_with python) \
+		$(use_with tcl) \
+		$(use_with xml libxml) \
+		$(use_with xml libxslt) \
+		$(use_with uuid ossp-uuid) \
+		"$(has_version ~dev-db/postgresql-base-${PV}[nls] && use_enable nls nls "$(wanted_languages)")"
+}
+
+src_compile() {
+	local bd
+	for bd in . contrib $(use xml && echo contrib/xml2); do
+		PATH="${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
+			emake -C $bd -j1 \
+				PGXS=$(${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/pg_config --pgxs) \
+				PGXS_IN_SERVER=1 PGXS_WITH_SERVER="${S}/src/backend/postgres" \
+				NO_PGXS=0 USE_PGXS=1 docdir=${EROOT%/}/usr/share/doc/${PF}
+	done
+}
+
+src_install() {
+	if use perl ; then
+		mv -f "${S}/src/pl/plperl/GNUmakefile" "${S}/src/pl/plperl/GNUmakefile_orig"
+		sed -e "s:\$(DESTDIR)\$(plperl_installdir):\$(plperl_installdir):" \
+			"${S}/src/pl/plperl/GNUmakefile_orig" \
+			> "${S}/src/pl/plperl/GNUmakefile"
+	fi
+
+	local bd
+	for bd in . contrib $(use xml && echo contrib/xml2) ; do
+		PATH="${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
+			emake install -C $bd -j1 DESTDIR="${D}" \
+				PGXS_IN_SERVER=1 PGXS_WITH_SERVER="${S}/src/backend/postgres" \
+				PGXS=$(${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/pg_config --pgxs) \
+				NO_PGXS=0 USE_PGXS=1 docdir=${EROOT%/}/usr/share/doc/${PF}
+	done
+
+	rm -r "${ED}/usr/share/postgresql-${SLOT}/man/man7/" \
+		"${ED}/usr/share/doc/${PF}/html"
+	rm "${ED}"/usr/share/postgresql-${SLOT}/man/man1/{clusterdb,create{db,lang,user},drop{db,lang,user},ecpg,pg_{config,dump,dumpall,restore},psql,reindexdb,vacuumdb}.1
+	docompress /usr/share/postgresql-${SLOT}/man/man1
+
+	dodoc README HISTORY doc/{README.*,TODO,bug.template}
+
+	dodir /etc/eselect/postgresql/slots/${SLOT}
+	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" \
+		> "${ED}/etc/eselect/postgresql/slots/${SLOT}/server"
+
+	newconfd "${WORKDIR}/postgresql.confd" postgresql-${SLOT}
+	newinitd "${WORKDIR}/postgresql.init" postgresql-${SLOT}
+
+	use pam && pamd_mimic system-auth postgresql auth account session
+
+	if use prefix ; then
+		keepdir ${RUNDIR}/run/postgresql
+		fperms 0770 ${RUNDIR}/run/postgresql
+	fi
+}
+
+pkg_postinst() {
+	postgresql-config update
+
+	elog "Gentoo specific documentation:"
+	elog "http://www.gentoo.org/doc/en/postgres-howto.xml"
+	elog
+	elog "Official documentation:"
+	elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
+	elog
+	elog "The default location of the Unix-domain socket is:"
+	elog "    ${EROOT%/}${RUNDIR}/run/postgresql/"
+	elog
+	elog "If you have users and/or services that you would like to utilize the"
+	elog "socket, you must add them to the 'postgres' system group:"
+	elog "    usermod -a -G postgres <user>"
+	elog
+	elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
+	elog "so that it contains your preferred locale in:"
+	elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	elog
+	elog "Then, execute the following command to setup the initial database"
+	elog "environment:"
+	elog "    emerge --config =${CATEGORY}/${PF}"
+}
+
+pkg_postrm() {
+	postgresql-config update
+}
+
+pkg_config() {
+	[[ -f ${EROOT%/}/etc/conf.d/postgresql-${SLOT} ]] && source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	[[ -z ${PGDATA} ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
+	[[ -z ${DATA_DIR} ]] && DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
+
+	# environment.bz2 may not contain the same locale as the current system
+	# locale. Unset and source from the current system locale.
+	if [[ -f ${EROOT%/}/etc/env.d/02locale ]] ; then
+		unset LANG
+		unset LC_CTYPE
+		unset LC_NUMERIC
+		unset LC_TIME
+		unset LC_COLLATE
+		unset LC_MONETARY
+		unset LC_MESSAGES
+		unset LC_ALL
+		source ${EROOT%/}/etc/env.d/02locale
+		[[ -n ${LANG} ]] && export LANG
+		[[ -n ${LC_CTYPE} ]] && export LC_CTYPE
+		[[ -n ${LC_NUMERIC} ]] && export LC_NUMERIC
+		[[ -n ${LC_TIME} ]] && export LC_TIME
+		[[ -n ${LC_COLLATE} ]] && export LC_COLLATE
+		[[ -n ${LC_MONETARY} ]] && export LC_MONETARY
+		[[ -n ${LC_MESSAGES} ]] && export LC_MESSAGES
+		[[ -n ${LC_ALL} ]] && export LC_ALL
+	fi
+
+	einfo "You can modify the paths and options passed to initdb by editing:"
+	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	einfo
+	einfo "Information on options that can be passed to initdb are found at:"
+	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
+	einfo "    http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
+	einfo
+	einfo "PG_INITDB_OPTS is currently set to:"
+	if [[ -z ${PG_INITDB_OPTS} ]] ; then
+		einfo "    (none)"
+	else
+		einfo "    ${PG_INITDB_OPTS}"
+	fi
+	einfo
+	einfo "Configuration files will be installed to:"
+	einfo "    ${PGDATA}"
+	einfo
+	einfo "The database cluster will be created in:"
+	einfo "    ${DATA_DIR}"
+	einfo
+	while [[ $correct != "true" ]] ; do
+		einfo "Are you ready to continue? (y/n)"
+		read answer
+		if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
+			correct="true"
+		elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
+			die "Aborting initialization."
+		else
+			echo "Answer not recognized."
+		fi
+	done
+
+	if [[ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ]] ; then
+		eerror "The given directory, '${DATA_DIR}', is not empty."
+		eerror "Modify DATA_DIR to point to an empty directory."
+		die "${DATA_DIR} is not empty."
+	fi
+
+	[[ -z ${PG_MAX_CONNECTIONS} ]] && PG_MAX_CONNECTIONS=128
+	einfo "Checking system parameters..."
+
+	if ! use kernel_linux ; then
+		einfo "Skipped."
+		einfo "Tests not supported on this OS (yet)."
+	else
+		if [[ -z ${SKIP_SYSTEM_TESTS} ]] ; then
+			ebegin "Checking whether your system supports at least ${PG_MAX_CONNECTIONS} connections"
+
+			local SEMMSL=$(sysctl -n kernel.sem | cut -f1)
+			local SEMMNS=$(sysctl -n kernel.sem | cut -f2)
+			local SEMMNI=$(sysctl -n kernel.sem | cut -f4)
+			local SHMMAX=$(sysctl -n kernel.shmmax)
+
+			local SEMMSL_MIN=17
+			local SEMMNS_MIN=$(( ( ${PG_MAX_CONNECTIONS}/16 ) * 17 ))
+			local SEMMNI_MIN=$(( ( ${PG_MAX_CONNECTIONS}+15 ) / 16 ))
+			local SHMMAX_MIN=$(( 500000 + ( 30600 * ${PG_MAX_CONNECTIONS} ) ))
+
+			for p in SEMMSL SEMMNS SEMMNI SHMMAX ; do
+				if [[ $(eval echo \$$p) -lt $(eval echo \$${p}_MIN) ]] ; then
+					eerror "The value for ${p} $(eval echo \$$p) is below the recommended value $(eval echo \$${p}_MIN)"
+					eerror "You have now several options:"
+					eerror "  - Change the mentioned system parameter"
+					eerror "  - Lower the number of max connections by setting PG_MAX_CONNECTIONS to a"
+					eerror "    value lower than ${PG_MAX_CONNECTIONS}"
+					eerror "  - Set SKIP_SYSTEM_TESTS in case you want to ignore this test completely"
+					eerror "More information can be found here:"
+					eerror "    http://www.postgresql.org/docs/${SLOT}/static/kernel-resources.html"
+					die "System test failed."
+				fi
+			done
+			eend
+		else
+			ewarn "SKIP_SYSTEM_TESTS is set, so skipping."
+		fi
+	fi
+
+	if [[ ${EUID} == 0 ]] ; then
+		einfo "Creating the data directory ..."
+		mkdir -p "${DATA_DIR}"
+		chown -Rf postgres:postgres "${DATA_DIR}"
+		chmod 0700 "${DATA_DIR}"
+	fi
+
+	einfo "Initializing the database ..."
+	if [[ ${EUID} == 0 ]] ; then
+		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+	else
+		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+	fi
+	mv "${DATA_DIR%/}"/*.conf "${PGDATA}"
+
+	einfo "The autovacuum function, which was in contrib, has been moved to the main"
+	einfo "PostgreSQL functions starting with 8.1. You can enable it in the clusters"
+	einfo "postgresql.conf."
+	einfo
+	if use prefix ; then
+		einfo "The location of the configuration files have moved to:"
+		einfo "    ${PGDATA}"
+		einfo
+		einfo "To start the server:"
+		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
+		einfo
+		einfo "To stop:"
+		einfo "    pg_ctl stop -D ${DATA_DIR}"
+		einfo
+		einfo "Or move the configuration files back:"
+		einfo "    mv ${PGDATA}*.conf ${DATA_DIR}"
+	else
+		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+		einfo "instead of 'pg_ctl'."
+	fi
+}
+
+src_test() {
+	einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
+
+	if [[ ${UID} != 0 ]] ; then
+		PATH="${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/:${PATH}" \
+			emake check \
+			PGXS=$(${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/pg_config --pgxs) \
+			NO_PGXS=0 USE_PGXS=1 SLOT=${SLOT}
+
+		einfo "If you think other tests besides the regression tests are necessary, please"
+		einfo "submit a bug including a patch for this ebuild to enable them."
+	else
+		ewarn "Tests cannot be run as root. Skipping."
+		ewarn "HINT: FEATURES=\"userpriv\""
+	fi
+}
diff --git a/dev-db/postgresql-server/postgresql-server-8.4.11.ebuild b/dev-db/postgresql-server/postgresql-server-8.4.11.ebuild
new file mode 100644
index 000000000000..3e9339095354
--- /dev/null
+++ b/dev-db/postgresql-server/postgresql-server-8.4.11.ebuild
@@ -0,0 +1,348 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/postgresql-server-8.4.11.ebuild,v 1.1 2012/02/28 02:04:06 titanofold Exp $
+
+EAPI="4"
+PYTHON_DEPEND="python? 2"
+
+WANT_AUTOMAKE="none"
+inherit autotools eutils multilib pam prefix python versionator
+
+SLOT="$(get_version_component_range 1-2)"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+
+DESCRIPTION="PostgreSQL server"
+HOMEPAGE="http://www.postgresql.org/"
+SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2
+		 http://dev.gentoo.org/~titanofold/postgresql-patches-8.4-r2.tbz2
+		 http://dev.gentoo.org/~titanofold/postgresql-initscript-2.1.tbz2"
+LICENSE="POSTGRESQL"
+
+S="${WORKDIR}/postgresql-${PV}"
+
+LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN zh_TW"
+IUSE="doc kernel_linux nls pam perl -pg_legacytimestamp python selinux tcl uuid xml"
+
+for lingua in ${LINGUAS} ; do
+	IUSE+=" linguas_${lingua}"
+done
+
+wanted_languages() {
+	local enable_langs
+
+	for lingua in ${LINGUAS} ; do
+		use linguas_${lingua} && enable_langs+="${lingua} "
+	done
+
+	echo -n ${enable_langs}
+}
+
+RDEPEND="~dev-db/postgresql-base-${PV}:${SLOT}[pam?,pg_legacytimestamp=,nls=]
+		 perl? ( >=dev-lang/perl-5.8 )
+		 selinux? ( sec-policy/selinux-postgresql )
+		 tcl? ( >=dev-lang/tcl-8 )
+		 uuid? ( dev-libs/ossp-uuid )
+		 xml? ( dev-libs/libxml2 dev-libs/libxslt )"
+
+DEPEND="${RDEPEND}
+		sys-devel/flex
+		xml? ( dev-util/pkgconfig )"
+
+PDEPEND="doc? ( ~dev-db/postgresql-docs-${PV} )"
+
+# Support /var/run or /run for the socket directory
+[[ ! -d /run ]] && RUNDIR=/var
+
+pkg_setup() {
+	enewgroup postgres 70
+	enewuser postgres 70 /bin/bash /var/lib/postgresql postgres
+
+	use python && python_set_active_version 2
+}
+
+src_prepare() {
+	epatch "${WORKDIR}/autoconf.patch" \
+		"${WORKDIR}/bool.patch" \
+		"${WORKDIR}/darwin.patch" \
+		"${WORKDIR}/ldflags.patch" \
+		"${WORKDIR}/pg_ctl-exit-status.patch" \
+		"${WORKDIR}/server.patch" \
+		"${WORKDIR}/SuperH.patch"
+
+	eprefixify src/include/pg_config_manual.h
+
+	if use test ; then
+		epatch "${WORKDIR}/regress.patch"
+		sed -e "s|@SOCKETDIR@|${T}|g" -i src/test/regress/pg_regress{,_main}.c
+		sed -e "s|/no/such/location|${S}/src/test/regress/tmp_check/no/such/location|g" \
+			-i src/test/regress/{input,output}/tablespace.source
+	else
+		echo "all install:" > "${S}/src/test/regress/GNUmakefile"
+	fi
+
+	sed -e "s|@RUNDIR@|${RUNDIR}|g" \
+		-i src/include/pg_config_manual.h "${WORKDIR}/postgresql.init" || \
+		die "RUNDIR sed failed"
+	sed -e "s|@SLOT@|${SLOT}|g" \
+		-i "${WORKDIR}/postgresql.init" "${WORKDIR}/postgresql.confd" || \
+		die "SLOT sed failed"
+
+	eautoconf
+}
+
+src_configure() {
+	# eval is needed to get along with pg_config quotation of space-rich entities.
+	eval econf "$(${EPREFIX%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/pg_config --configure)" \
+		--with-includes="${EPREFIX%/}/usr/include/postgresql-${SLOT}/" \
+		--with-libraries="${EPREFIX%/}/usr/$(get_libdir)/postgresql-${SLOT}/$(get_libdir)" \
+		--with-system-tzdata="${EPREFIX%/}/usr/share/zoneinfo" \
+		$(use_with perl) \
+		$(use_with python) \
+		$(use_with tcl) \
+		$(use_with xml libxml) \
+		$(use_with xml libxslt) \
+		$(use_with uuid ossp-uuid) \
+		"$(has_version ~dev-db/postgresql-base-${PV}[nls] && use_enable nls nls "$(wanted_languages)")"
+}
+
+src_compile() {
+	local bd
+	for bd in . contrib $(use xml && echo contrib/xml2) ; do
+		PATH="${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
+			emake -C $bd -j1 || die "emake in $bd failed"
+	done
+}
+
+src_install() {
+	if use perl ; then
+		mv -f "${S}/src/pl/plperl/GNUmakefile" \
+			"${S}/src/pl/plperl/GNUmakefile_orig"
+		sed -e "s:\$(DESTDIR)\$(plperl_installdir):\$(plperl_installdir):" \
+			"${S}/src/pl/plperl/GNUmakefile_orig" \
+			> "${S}/src/pl/plperl/GNUmakefile"
+	fi
+
+	local bd
+	for bd in . contrib $(use xml && echo contrib/xml2) ; do
+		PATH="${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
+			emake install -C $bd -j1 DESTDIR="${D}" \
+			|| die "emake install in $bd failed"
+	done
+
+	rm -r "${ED}/usr/share/postgresql-${SLOT}/man/man7/" \
+		"${ED}/usr/share/doc/postgresql-${SLOT}/html"
+	rm "${ED}"/usr/share/postgresql-${SLOT}/man/man1/{clusterdb,create{db,lang,user},drop{db,lang,user},ecpg,pg_{config,dump,dumpall,restore},psql,reindexdb,vacuumdb}.1
+
+	dodoc README HISTORY doc/{README.*,TODO,bug.template}
+
+	dodir /etc/eselect/postgresql/slots/${SLOT}
+	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" \
+		> "${ED}/etc/eselect/postgresql/slots/${SLOT}/server"
+
+	newconfd "${WORKDIR}"/postgresql.confd postgresql-${SLOT} \
+		|| die "Inserting conf.d file failed"
+
+	newinitd "${WORKDIR}"/postgresql.init postgresql-${SLOT} \
+		|| die "Inserting init.d file failed"
+
+	use pam && pamd_mimic system-auth postgresql auth account session
+
+	if use prefix ; then
+		keepdir ${RUNDIR}/run/postgresql
+		fperms 0770 ${RUNDIR}/run/postgresql
+	fi
+}
+
+pkg_postinst() {
+	postgresql-config update
+
+	elog "The time stamp format is 64 bit integers now. If you upgrade from older"
+	elog "databases, this may force you to either do a dump and reload of enable"
+	elog "pg_legacytimestamp until you find time to do so. If the database can't start"
+	elog "please try enabling pg_legacytimestamp and rebuild."
+	elog
+	elog "Gentoo specific documentation:"
+	elog "http://www.gentoo.org/doc/en/postgres-howto.xml"
+	elog
+	elog "Official documentation:"
+	elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
+	elog
+	elog "The default location of the Unix-domain socket is:"
+	elog "    ${EROOT%/}${RUNDIR}/run/postgresql/"
+	elog
+	elog "If you have users and/or services that you would like to utilize the"
+	elog "socket, you must add them to the 'postgres' system group:"
+	elog "    usermod -a -G postgres <user>"
+	elog
+	elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
+	elog "so that it contains your preferred locale in:"
+	elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	elog
+	elog "Then, execute the following command to setup the initial database"
+	elog "environment:"
+	elog "    emerge --config =${CATEGORY}/${PF}"
+}
+
+pkg_postrm() {
+	postgresql-config update
+}
+
+pkg_config() {
+	[[ -f ${EROOT%/}/etc/conf.d/postgresql-${SLOT} ]] && source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	[[ -z ${PGDATA} ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
+	[[ -z ${DATA_DIR} ]] && DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
+
+	# environment.bz2 may not contain the same locale as the current system
+	# locale. Unset and source from the current system locale.
+	if [[ -f ${EROOT%/}/etc/env.d/02locale ]] ; then
+		unset LANG
+		unset LC_CTYPE
+		unset LC_NUMERIC
+		unset LC_TIME
+		unset LC_COLLATE
+		unset LC_MONETARY
+		unset LC_MESSAGES
+		unset LC_ALL
+		source "${EROOT%/}/etc/env.d/02locale"
+		[[ -n ${LANG} ]] && export LANG
+		[[ -n ${LC_CTYPE} ]] && export LC_CTYPE
+		[[ -n ${LC_NUMERIC} ]] && export LC_NUMERIC
+		[[ -n ${LC_TIME} ]] && export LC_TIME
+		[[ -n ${LC_COLLATE} ]] && export LC_COLLATE
+		[[ -n ${LC_MONETARY} ]] && export LC_MONETARY
+		[[ -n ${LC_MESSAGES} ]] && export LC_MESSAGES
+		[[ -n ${LC_ALL} ]] && export LC_ALL
+	fi
+
+	einfo "You can modify the paths and options passed to initdb by editing:"
+	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	einfo
+	einfo "Information on options that can be passed to initdb are found at:"
+	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
+	einfo "    http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
+	einfo
+	einfo "PG_INITDB_OPTS is currently set to:"
+	if [[ -z ${PG_INITDB_OPTS} ]] ; then
+		einfo "    (none)"
+	else
+		einfo "    ${PG_INITDB_OPTS}"
+	fi
+	einfo
+	einfo "Configuration files will be installed to:"
+	einfo "    ${PGDATA}"
+	einfo
+	einfo "The database cluster will be created in:"
+	einfo "    ${DATA_DIR}"
+	einfo
+	while [[ $correct != "true" ]] ; do
+		einfo "Are you ready to continue? (y/n)"
+		read answer
+		if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
+			correct="true"
+		elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
+			die "Aborting initialization."
+		else
+			echo "Answer not recognized"
+		fi
+	done
+
+	if [[ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ]] ; then
+		eerror "The given directory, '${DATA_DIR}', is not empty."
+		eerror "Modify DATA_DIR to point to an empty directory."
+		die "${DATA_DIR} is not empty."
+	fi
+
+	[[ -z ${PG_MAX_CONNECTIONS} ]] && PG_MAX_CONNECTIONS=128
+	einfo "Checking system parameters..."
+
+	if ! use kernel_linux ; then
+		einfo "Skipped."
+		einfo "  Tests not supported on this OS (yet)"
+	else
+		if [[ -z ${SKIP_SYSTEM_TESTS} ]] ; then
+			einfo "Checking whether your system supports at least ${PG_MAX_CONNECTIONS} connections..."
+
+			local SEMMSL=$(sysctl -n kernel.sem | cut -f1)
+			local SEMMNS=$(sysctl -n kernel.sem | cut -f2)
+			local SEMMNI=$(sysctl -n kernel.sem | cut -f4)
+			local SHMMAX=$(sysctl -n kernel.shmmax)
+
+			local SEMMSL_MIN=17
+			local SEMMNS_MIN=$(( ( ${PG_MAX_CONNECTIONS}/16 ) * 17 ))
+			local SEMMNI_MIN=$(( ( ${PG_MAX_CONNECTIONS}+15 ) / 16 ))
+			local SHMMAX_MIN=$(( 500000 + ( 30600 * ${PG_MAX_CONNECTIONS} ) ))
+
+			for p in SEMMSL SEMMNS SEMMNI SHMMAX ; do
+				if [[ $(eval echo \$$p) -lt $(eval echo \$${p}_MIN) ]] ; then
+					eerror "The value for ${p} $(eval echo \$$p) is below the recommended value $(eval echo \$${p}_MIN)"
+					eerror "You have now several options:"
+					eerror "  - Change the mentioned system parameter"
+					eerror "  - Lower the number of max.connections by setting PG_MAX_CONNECTIONS to a"
+					eerror "    value lower than ${PG_MAX_CONNECTIONS}"
+					eerror "  - Set SKIP_SYSTEM_TESTS in case you want to ignore this test completely"
+					eerror "More information can be found here:"
+					eerror "    http://www.postgresql.org/docs/${SLOT}/static/kernel-resources.html"
+					die "System test failed."
+				fi
+			done
+			einfo "Passed."
+		else
+			ewarn "SKIP_SYSTEM_TESTS set, so skipping."
+		fi
+	fi
+
+	if [[ ${EUID} == 0 ]] ; then
+		einfo "Creating the data directory ..."
+		mkdir -p "${DATA_DIR}"
+		chown -Rf postgres:postgres "${DATA_DIR}"
+		chmod 0700 "${DATA_DIR}"
+	fi
+
+	einfo "Initializing the database ..."
+	if [[ ${EUID} == 0 ]] ; then
+		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+	else
+		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+	fi
+	mv "${DATA_DIR%/}"/*.conf "${PGDATA}"
+
+	einfo "The autovacuum function, which was in contrib, has been moved to the main"
+	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled by"
+	einfo "default. You can disable it in the cluster's:"
+	einfo "    ${PGDATA%/}/postgresql.conf"
+	einfo
+	einfo "The PostgreSQL server, by default, will log events to:"
+	einfo "    ${DATA_DIR%/}/postmaster.log"
+	einfo
+	if use prefix ; then
+		einfo "The location of the configuration files have moved to:"
+		einfo "    ${PGDATA}"
+		einfo
+		einfo "To start the server:"
+		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
+		einfo
+		einfo "To stop:"
+		einfo "    pg_ctl stop -D ${DATA_DIR}"
+		einfo
+		einfo "Or move the configuration files back:"
+		einfo "    mv ${PGDATA}*.conf ${DATA_DIR}"
+	else
+		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+		einfo "instead of 'pg_ctl'."
+	fi
+}
+
+src_test() {
+	einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
+
+	if [[ ${UID} != 0 ]] ; then
+		emake check || die "Make check failed. See above for details."
+
+		einfo "If you think other tests besides the regression tests are necessary, please"
+		einfo "submit a bug including a patch for this ebuild to enable them."
+	else
+		ewarn "Tests cannot be run as root. Skipping."
+		ewarn "HINT: FEATURES=\"userpriv\""
+	fi
+}
diff --git a/dev-db/postgresql-server/postgresql-server-9.0.7.ebuild b/dev-db/postgresql-server/postgresql-server-9.0.7.ebuild
new file mode 100644
index 000000000000..72585fdf75e2
--- /dev/null
+++ b/dev-db/postgresql-server/postgresql-server-9.0.7.ebuild
@@ -0,0 +1,342 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/postgresql-server-9.0.7.ebuild,v 1.1 2012/02/28 02:04:06 titanofold Exp $
+
+EAPI="4"
+PYTHON_DEPEND="python? 2"
+
+WANT_AUTOMAKE="none"
+inherit autotools eutils multilib pam prefix python versionator
+
+SLOT="$(get_version_component_range 1-2)"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x86-solaris"
+
+DESCRIPTION="PostgreSQL server"
+HOMEPAGE="http://www.postgresql.org/"
+SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2
+		 http://dev.gentoo.org/~titanofold/postgresql-patches-9.0-r3.tbz2
+		 http://dev.gentoo.org/~titanofold/postgresql-initscript-2.1.tbz2"
+LICENSE="POSTGRESQL"
+
+S="${WORKDIR}/postgresql-${PV}"
+
+LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN zh_TW"
+IUSE="doc kernel_linux nls pam perl -pg_legacytimestamp python selinux tcl uuid xml"
+
+for lingua in ${LINGUAS}; do
+	IUSE+=" linguas_${lingua}"
+done
+
+wanted_languages() {
+	local enable_langs
+
+	for lingua in ${LINGUAS} ; do
+		use linguas_${lingua} && enable_langs+="${lingua} "
+	done
+
+	echo -n ${enable_langs}
+}
+
+RDEPEND="~dev-db/postgresql-base-${PV}:${SLOT}[pam?,pg_legacytimestamp=,nls=]
+		 perl? ( >=dev-lang/perl-5.8 )
+		 selinux? ( sec-policy/selinux-postgresql )
+		 tcl? ( >=dev-lang/tcl-8 )
+		 uuid? ( dev-libs/ossp-uuid )
+		 xml? ( dev-libs/libxml2 dev-libs/libxslt )"
+
+DEPEND="${RDEPEND}
+		sys-devel/flex
+		xml? ( dev-util/pkgconfig )"
+
+PDEPEND="doc? ( ~dev-db/postgresql-docs-${PV} )"
+
+# Support /var/run or /run for the socket directory
+[[ ! -d /run ]] && RUNDIR=/var
+
+pkg_setup() {
+	enewgroup postgres 70
+	enewuser postgres 70 /bin/bash /var/lib/postgresql postgres
+
+	use python && python_set_active_version 2
+}
+
+src_prepare() {
+	epatch "${WORKDIR}/autoconf.patch" \
+		"${WORKDIR}/bool.patch" \
+		"${WORKDIR}/pg_ctl-exit-status.patch" \
+		"${WORKDIR}/server.patch"
+
+	eprefixify src/include/pg_config_manual.h
+
+	if use test ; then
+		epatch "${WORKDIR}/regress.patch"
+		sed -e "s|@SOCKETDIR@|${T}|g" -i src/test/regress/pg_regress{,_main}.c
+		sed -e "s|/no/such/location|${S}/src/test/regress/tmp_check/no/such/location|g" \
+			-i src/test/regress/{input,output}/tablespace.source
+	else
+		echo "all install:" > "${S}/src/test/regress/GNUmakefile"
+	fi
+
+	sed -e "s|@RUNDIR@|${RUNDIR}|g" \
+		-i src/include/pg_config_manual.h "${WORKDIR}/postgresql.init" || \
+		die "RUNDIR sed failed"
+	sed -e "s|@SLOT@|${SLOT}|g" \
+		-i "${WORKDIR}/postgresql.init" "${WORKDIR}/postgresql.confd" || \
+		die "SLOT sed failed"
+
+	eautoconf
+}
+
+src_configure() {
+	# eval is needed to get along with pg_config quotation of space-rich entities.
+	eval econf "$(${EPREFIX%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/pg_config --configure)" \
+		--with-includes="${EPREFIX%/}/usr/include/postgresql-${SLOT}/" \
+		--with-libraries="${EPREFIX%/}/usr/$(get_libdir)/postgresql-${SLOT}/$(get_libdir)" \
+		--with-system-tzdata="${EPREFIX%/}/usr/share/zoneinfo" \
+		$(use_with perl) \
+		$(use_with python) \
+		$(use_with tcl) \
+		$(use_with xml libxml) \
+		$(use_with xml libxslt) \
+		$(use_with uuid ossp-uuid) \
+		"$(use_enable nls nls "$(wanted_languages)")"
+}
+
+src_compile() {
+	local bd
+	for bd in . contrib $(use xml && echo contrib/xml2); do
+		PATH="${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
+			emake -C $bd -j1 || die "emake in $bd failed"
+	done
+}
+
+src_install() {
+	if use perl ; then
+		mv -f "${S}/src/pl/plperl/GNUmakefile" "${S}/src/pl/plperl/GNUmakefile_orig"
+		sed -e "s:\$(DESTDIR)\$(plperl_installdir):\$(plperl_installdir):" \
+			"${S}/src/pl/plperl/GNUmakefile_orig" > "${S}/src/pl/plperl/GNUmakefile"
+	fi
+
+	local bd
+	for bd in . contrib $(use xml && echo contrib/xml2) ; do
+		PATH="${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
+			emake install -C $bd -j1 DESTDIR="${D}" || die "emake install in $bd failed"
+	done
+
+	dodir /usr/share/postgresql-${SLOT}/man/man1/
+	cp "${S}"/doc/src/sgml/man1/{initdb,pg_controldata,pg_ctl,pg_resetxlog,post{gres,master}}.1 \
+		"${ED}"/usr/share/postgresql-${SLOT}/man/man1/ || die
+
+	dodoc README HISTORY doc/{README.*,TODO,bug.template}
+
+	dodir /etc/eselect/postgresql/slots/${SLOT}
+	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" \
+		> "${ED}/etc/eselect/postgresql/slots/${SLOT}/server"
+
+	newconfd "${WORKDIR}/postgresql.confd" postgresql-${SLOT} \
+		|| die "Inserting conf.d file failed"
+
+	newinitd "${WORKDIR}/postgresql.init" postgresql-${SLOT} \
+		|| die "Inserting init.d file failed"
+
+	use pam && pamd_mimic system-auth postgresql auth account session
+
+	if use prefix ; then
+		keepdir ${RUNDIR}/run/postgresql
+		fperms 0770 ${RUNDIR}/run/postgresql
+	fi
+}
+
+pkg_postinst() {
+	postgresql-config update
+
+	elog "Gentoo specific documentation:"
+	elog "http://www.gentoo.org/doc/en/postgres-howto.xml"
+	elog
+	elog "Official documentation:"
+	elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
+	elog
+	elog "The default location of the Unix-domain socket is:"
+	elog "    ${EROOT%/}${RUNDIR}/run/postgresql/"
+	elog
+	elog "If you have users and/or services that you would like to utilize the"
+	elog "socket, you must add them to the 'postgres' system group:"
+	elog "    usermod -a -G postgres <user>"
+	elog
+	elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
+	elog "so that it contains your preferred locale in:"
+	elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	elog
+	elog "Then, execute the following command to setup the initial database"
+	elog "environment:"
+	elog "    emerge --config =${CATEGORY}/${PF}"
+}
+
+pkg_postrm() {
+	postgresql-config update
+}
+
+pkg_config() {
+	[[ -f ${EROOT%/}/etc/conf.d/postgresql-${SLOT} ]] && source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	[[ -z ${PGDATA} ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
+	[[ -z ${DATA_DIR} ]] && DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
+
+	# environment.bz2 may not contain the same locale as the current system
+	# locale. Unset and source from the current system locale.
+	if [[ -f ${EROOT%/}/etc/env.d/02locale ]] ; then
+		unset LANG
+		unset LC_CTYPE
+		unset LC_NUMERIC
+		unset LC_TIME
+		unset LC_COLLATE
+		unset LC_MONETARY
+		unset LC_MESSAGES
+		unset LC_ALL
+		source "${EROOT%/}/etc/env.d/02locale"
+		[[ -n ${LANG} ]] && export LANG
+		[[ -n ${LC_CTYPE} ]] && export LC_CTYPE
+		[[ -n ${LC_NUMERIC} ]] && export LC_NUMERIC
+		[[ -n ${LC_TIME} ]] && export LC_TIME
+		[[ -n ${LC_COLLATE} ]] && export LC_COLLATE
+		[[ -n ${LC_MONETARY} ]] && export LC_MONETARY
+		[[ -n ${LC_MESSAGES} ]] && export LC_MESSAGES
+		[[ -n ${LC_ALL} ]] && export LC_ALL
+	fi
+
+	einfo "You can modify the paths and options passed to initdb by editing:"
+	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	einfo
+	einfo "Information on options that can be passed to initdb are found at:"
+	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
+	einfo "    http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
+	einfo
+	einfo "PG_INITDB_OPTS is currently set to:"
+	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
+		einfo "    (none)"
+	else
+		einfo "    ${PG_INITDB_OPTS}"
+	fi
+	einfo
+	einfo "Configuration files will be installed to:"
+	einfo "    ${PGDATA}"
+	einfo
+	einfo "The database cluster will be created in:"
+	einfo "    ${DATA_DIR}"
+	einfo
+	while [[ $correct != "true" ]] ; do
+		einfo "Are you ready to continue? (y/n)"
+		read answer
+		if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
+			correct="true"
+		elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
+			die "Aborting initialization."
+		else
+			echo "Answer not recognized"
+		fi
+	done
+
+	if [[ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ]] ; then
+		eerror "The given directory, '${DATA_DIR}', is not empty."
+		eerror "Modify DATA_DIR to point to an empty directory."
+		die "${DATA_DIR} is not empty."
+	fi
+
+	[[ -z ${PG_MAX_CONNECTIONS} ]] && PG_MAX_CONNECTIONS=128
+	einfo "Checking system parameters..."
+
+	if ! use kernel_linux ; then
+		einfo "Skipped."
+		einfo "  Tests not supported on this OS (yet)"
+	else
+		if [[ -z ${SKIP_SYSTEM_TESTS} ]] ; then
+			einfo "Checking whether your system supports at least ${PG_MAX_CONNECTIONS} connections..."
+
+			local SEMMSL=$(sysctl -n kernel.sem | cut -f1)
+			local SEMMNS=$(sysctl -n kernel.sem | cut -f2)
+			local SEMMNI=$(sysctl -n kernel.sem | cut -f4)
+			local SHMMAX=$(sysctl -n kernel.shmmax)
+
+			local SEMMSL_MIN=17
+			local SEMMNS_MIN=$(( ( ${PG_MAX_CONNECTIONS}/16 ) * 17 ))
+			local SEMMNI_MIN=$(( ( ${PG_MAX_CONNECTIONS}+15 ) / 16 ))
+			local SHMMAX_MIN=$(( 500000 + ( 30600 * ${PG_MAX_CONNECTIONS} ) ))
+
+			for p in SEMMSL SEMMNS SEMMNI SHMMAX ; do
+				if [[ $(eval echo \$$p) -lt $(eval echo \$${p}_MIN) ]] ; then
+					eerror "The value for ${p} $(eval echo \$$p) is below the recommended value $(eval echo \$${p}_MIN)"
+					eerror "You have now several options:"
+					eerror "    - Change the mentioned system parameter"
+					eerror "    - Lower the number of max connections by setting PG_MAX_CONNECTIONS to a"
+					eerror "      value lower than ${PG_MAX_CONNECTIONS}"
+					eerror "    - Set SKIP_SYSTEM_TESTS in case you want to ignore this test completely"
+					eerror "More information can be found here:"
+					eerror "    http://www.postgresql.org/docs/${SLOT}/static/kernel-resources.html"
+					die "System test failed."
+				fi
+			done
+			einfo "Passed."
+		else
+			ewarn "SKIP_SYSTEM_TESTS set, so skipping."
+		fi
+	fi
+
+	if [[ ${EUID} == 0 ]] ; then
+		einfo "Creating the data directory ..."
+		mkdir -p "${DATA_DIR}"
+		chown -Rf postgres:postgres "${DATA_DIR}"
+		chmod 0700 "${DATA_DIR}"
+	fi
+
+	einfo "Initializing the database ..."
+
+	if [[ ${EUID} == 0 ]] ; then
+		su postgres \
+			-c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D '${DATA_DIR}' -L '${EROOT%/}/usr/share/postgresql-${SLOT}/' ${PG_INITDB_OPTS}"
+	else
+		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb \
+			-U postgres -D "${DATA_DIR}" \
+			-L "${EROOT%/}/usr/share/postgresql-${SLOT}/" ${PG_INITDB_OPTS}
+	fi
+
+	mv "${DATA_DIR%/}"/*.conf "${PGDATA}"
+
+	einfo "The autovacuum function, which was in contrib, has been moved to the main"
+	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
+	einfo "by default. You can disable it in the cluster's:"
+	einfo "    ${PGDATA%/}/postgresql.conf"
+	einfo
+	einfo "The PostgreSQL server, by default, will log events to:"
+	einfo "    ${DATA_DIR%/}/postmaster.log"
+	einfo
+	if use prefix ; then
+		einfo "The location of the configuration files have moved to:"
+		einfo "    ${PGDATA}"
+		einfo
+		einfo "To start the server:"
+		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
+		einfo
+		einfo "To stop:"
+		einfo "    pg_ctl stop -D ${DATA_DIR}"
+		einfo
+		einfo "Or move the configuration files back:"
+		einfo "    mv ${PGDATA}*.conf ${DATA_DIR}"
+	else
+		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+		einfo "instead of 'pg_ctl'."
+	fi
+}
+
+src_test() {
+	einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
+
+	if [[ ${UID} != 0 ]] ; then
+		emake check || die "Make check failed. See above for details."
+
+		einfo "If you think other tests besides the regression tests are necessary, please"
+		einfo "submit a bug including a patch for this ebuild to enable them."
+	else
+		ewarn "Tests cannot be run as root. Skipping."
+		ewarn "HINT: FEATURES=\"userpriv\""
+	fi
+}
diff --git a/dev-db/postgresql-server/postgresql-server-9.1.3.ebuild b/dev-db/postgresql-server/postgresql-server-9.1.3.ebuild
new file mode 100644
index 000000000000..7bf97ce61e02
--- /dev/null
+++ b/dev-db/postgresql-server/postgresql-server-9.1.3.ebuild
@@ -0,0 +1,348 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/postgresql-server-9.1.3.ebuild,v 1.1 2012/02/28 02:04:06 titanofold Exp $
+
+EAPI="4"
+PYTHON_DEPEND="python? 2"
+
+WANT_AUTOMAKE="none"
+inherit autotools eutils flag-o-matic multilib pam prefix python versionator
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x86-solaris"
+
+SLOT="$(get_version_component_range 1-2)"
+S="${WORKDIR}/postgresql-${PV}"
+
+DESCRIPTION="PostgreSQL server"
+HOMEPAGE="http://www.postgresql.org/"
+SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2
+		 http://dev.gentoo.org/~titanofold/postgresql-patches-9.1-r1.tbz2
+		 http://dev.gentoo.org/~titanofold/postgresql-initscript-2.1.tbz2"
+LICENSE="POSTGRESQL"
+
+LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN zh_TW"
+IUSE="doc kernel_linux nls pam perl -pg_legacytimestamp python selinux tcl uuid xml"
+
+for lingua in ${LINGUAS}; do
+	IUSE+=" linguas_${lingua}"
+done
+
+wanted_languages() {
+	local enable_langs
+
+	for lingua in ${LINGUAS} ; do
+		use linguas_${lingua} && enable_langs+="${lingua} "
+	done
+
+	echo -n ${enable_langs}
+}
+
+RDEPEND="~dev-db/postgresql-base-${PV}:${SLOT}[pam?,pg_legacytimestamp=,nls=]
+	perl? ( >=dev-lang/perl-5.8 )
+	selinux? ( sec-policy/selinux-postgresql )
+	tcl? ( >=dev-lang/tcl-8 )
+	uuid? ( dev-libs/ossp-uuid )
+	xml? ( dev-libs/libxml2 dev-libs/libxslt )"
+DEPEND="${RDEPEND}
+	sys-devel/flex
+	xml? ( dev-util/pkgconfig )"
+PDEPEND="doc? ( ~dev-db/postgresql-docs-${PV} )"
+
+# Support /var/run or /run for the socket directory
+[[ ! -d /run ]] && RUNDIR=/var
+
+pkg_setup() {
+	enewgroup postgres 70
+	enewuser postgres 70 /bin/bash /var/lib/postgresql postgres
+
+	use python && python_set_active_version 2
+}
+
+src_prepare() {
+	epatch "${WORKDIR}/autoconf.patch" \
+		"${WORKDIR}/bool.patch" \
+		"${WORKDIR}/pg_ctl-exit-status.patch" \
+		"${WORKDIR}/server.patch"
+
+	eprefixify src/include/pg_config_manual.h
+
+	if use test ; then
+		epatch "${WORKDIR}/regress.patch"
+		sed -e "s|@SOCKETDIR@|${T}|g" -i src/test/regress/pg_regress{,_main}.c
+		sed -e "s|/no/such/location|${S}/src/test/regress/tmp_check/no/such/location|g" \
+			-i src/test/regress/{input,output}/tablespace.source
+	else
+		echo "all install:" > "${S}/src/test/regress/GNUmakefile"
+	fi
+
+	sed -e "s|@RUNDIR@|${RUNDIR}|g" \
+		-i src/include/pg_config_manual.h "${WORKDIR}/postgresql.init" || \
+		die "RUNDIR sed failed"
+	sed -e "s|@SLOT@|${SLOT}|g" \
+		-i "${WORKDIR}/postgresql.init" "${WORKDIR}/postgresql.confd" || \
+		die "SLOT sed failed"
+
+	eautoconf
+}
+
+src_configure() {
+	case ${CHOST} in
+		*-darwin*|*-solaris*)
+			use nls && append-libs intl
+			;;
+	esac
+
+	local PO="${EPREFIX%/}"
+
+	# eval is needed to get along with pg_config quotation of space-rich entities.
+	eval econf "$(${PO}/usr/$(get_libdir)/postgresql-${SLOT}/bin/pg_config --configure)" \
+		$(use_with perl) \
+		$(use_with python) \
+		$(use_with tcl) \
+		$(use_with xml libxml) \
+		$(use_with xml libxslt) \
+		$(use_with uuid ossp-uuid) \
+		--with-system-tzdata="${PO}/usr/share/zoneinfo" \
+		--with-includes="${PO}/usr/include/postgresql-${SLOT}/" \
+		--with-libraries="${PO}/usr/$(get_libdir)/postgresql-${SLOT}/$(get_libdir)" \
+		"$(use_enable nls nls "$(wanted_languages)")"
+}
+
+src_compile() {
+	local bd
+	for bd in . contrib $(use xml && echo contrib/xml2); do
+		PATH="${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
+			emake -C $bd || die "emake in $bd failed"
+	done
+}
+
+src_install() {
+	if use perl ; then
+		mv -f "${S}/src/pl/plperl/GNUmakefile" "${S}/src/pl/plperl/GNUmakefile_orig"
+		sed -e "s:\$(DESTDIR)\$(plperl_installdir):\$(plperl_installdir):" \
+			"${S}/src/pl/plperl/GNUmakefile_orig" > "${S}/src/pl/plperl/GNUmakefile"
+	fi
+
+	local bd
+	for bd in . contrib $(use xml && echo contrib/xml2) ; do
+		PATH="${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
+			emake install -C $bd DESTDIR="${D}" || die "emake install in $bd failed"
+	done
+
+	dodoc README HISTORY doc/{TODO,bug.template}
+
+	dodir /etc/eselect/postgresql/slots/${SLOT}
+	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" > \
+		"${ED}/etc/eselect/postgresql/slots/${SLOT}/server"
+
+	newconfd "${WORKDIR}/postgresql.confd" postgresql-${SLOT} || \
+		die "Inserting conf failed"
+	newinitd "${WORKDIR}/postgresql.init" postgresql-${SLOT} || \
+		die "Inserting conf failed"
+
+	use pam && pamd_mimic system-auth postgresql auth account session
+
+	if use prefix ; then
+		keepdir ${RUNDIR}/run/postgresql
+		fperms 0770 ${RUNDIR}/run/postgresql
+	fi
+}
+
+pkg_postinst() {
+	postgresql-config update
+
+	elog "Gentoo specific documentation:"
+	elog "http://www.gentoo.org/doc/en/postgres-howto.xml"
+	elog
+	elog "Official documentation:"
+	elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
+	elog
+	elog "The default location of the Unix-domain socket is:"
+	elog "    ${EROOT%/}${RUNDIR}/run/postgresql/"
+	elog
+	elog "If you have users and/or services that you would like to utilize the"
+	elog "socket, you must add them to the 'postgres' system group:"
+	elog "    usermod -a -G postgres <user>"
+	elog
+	elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
+	elog "so that it contains your preferred locale in:"
+	elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	elog
+	elog "Then, execute the following command to setup the initial database"
+	elog "environment:"
+	elog "    emerge --config =${CATEGORY}/${PF}"
+}
+
+pkg_prerm() {
+	if [[ -z ${REPLACED_BY_VERSION} ]] ; then
+		ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
+		ewarn "\thttp://www.gentoo.org/doc/en/postgres-howto.xml#doc_chap5"
+
+		ebegin "Resuming removal 10 seconds. Control-C to cancel"
+		sleep 10
+		eend 0
+	fi
+}
+
+pkg_postrm() {
+	postgresql-config update
+}
+
+pkg_config() {
+	[[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] && source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
+	[[ -z "${DATA_DIR}" ]] && DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
+
+	# environment.bz2 may not contain the same locale as the current system
+	# locale. Unset and source from the current system locale.
+	if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
+		unset LANG
+		unset LC_CTYPE
+		unset LC_NUMERIC
+		unset LC_TIME
+		unset LC_COLLATE
+		unset LC_MONETARY
+		unset LC_MESSAGES
+		unset LC_ALL
+		source "${EROOT%/}/etc/env.d/02locale"
+		[ -n "${LANG}" ] && export LANG
+		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
+		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
+		[ -n "${LC_TIME}" ] && export LC_TIME
+		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
+		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
+		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
+		[ -n "${LC_ALL}" ] && export LC_ALL
+	fi
+
+	einfo "You can modify the paths and options passed to initdb by editing:"
+	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	einfo
+	einfo "Information on options that can be passed to initdb are found at:"
+	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
+	einfo "    http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
+	einfo
+	einfo "PG_INITDB_OPTS is currently set to:"
+	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
+		einfo "    (none)"
+	else
+		einfo "    ${PG_INITDB_OPTS}"
+	fi
+	einfo
+	einfo "Configuration files will be installed to:"
+	einfo "    ${PGDATA}"
+	einfo
+	einfo "The database cluster will be created in:"
+	einfo "    ${DATA_DIR}"
+	einfo
+	while [ "$correct" != "true" ] ; do
+		einfo "Are you ready to continue? (y/n)"
+		read answer
+		if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
+			correct="true"
+		elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
+			die "Aborting initialization."
+		else
+			echo "Answer not recognized"
+		fi
+	done
+
+	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
+		eerror "The given directory, '${DATA_DIR}', is not empty."
+		eerror "Modify DATA_DIR to point to an empty directory."
+		die "${DATA_DIR} is not empty."
+	fi
+
+	[ -z "${PG_MAX_CONNECTIONS}" ] && PG_MAX_CONNECTIONS="128"
+	einfo "Checking system parameters..."
+
+	if ! use kernel_linux ; then
+		einfo "Skipped."
+		einfo "  Tests not supported on this OS (yet)"
+	else
+		if [ -z ${SKIP_SYSTEM_TESTS} ] ; then
+			einfo "Checking whether your system supports at least ${PG_MAX_CONNECTIONS} connections..."
+
+			local SEMMSL=$(sysctl -n kernel.sem | cut -f1)
+			local SEMMNS=$(sysctl -n kernel.sem | cut -f2)
+			local SEMMNI=$(sysctl -n kernel.sem | cut -f4)
+			local SHMMAX=$(sysctl -n kernel.shmmax)
+
+			local SEMMSL_MIN=17
+			local SEMMNS_MIN=$(( ( ${PG_MAX_CONNECTIONS}/16 ) * 17 ))
+			local SEMMNI_MIN=$(( ( ${PG_MAX_CONNECTIONS}+15 ) / 16 ))
+			local SHMMAX_MIN=$(( 500000 + ( 30600 * ${PG_MAX_CONNECTIONS} ) ))
+
+			for p in SEMMSL SEMMNS SEMMNI SHMMAX ; do
+				if [ $(eval echo \$$p) -lt $(eval echo \$${p}_MIN) ] ; then
+					eerror "The value for ${p} $(eval echo \$$p) is below the recommended value $(eval echo \$${p}_MIN)"
+					eerror "You have now several options:"
+					eerror "    - Change the mentioned system parameter"
+					eerror "    - Lower the number of max.connections by setting PG_MAX_CONNECTIONS to a"
+					eerror "      value lower than ${PG_MAX_CONNECTIONS}"
+					eerror "    - Set SKIP_SYSTEM_TESTS in case you want to ignore this test completely"
+					eerror "More information can be found here:"
+					eerror "    http://www.postgresql.org/docs/${SLOT}/static/kernel-resources.html"
+					die "System test failed."
+				fi
+			done
+			einfo "Passed."
+		else
+			ewarn "SKIP_SYSTEM_TESTS set, so skipping."
+		fi
+	fi
+
+	einfo "Creating the data directory ..."
+	if [[ ${EUID} == 0 ]] ; then
+		mkdir -p "${DATA_DIR}"
+		chown -Rf postgres:postgres "${DATA_DIR}"
+		chmod 0700 "${DATA_DIR}"
+	fi
+
+	einfo "Initializing the database ..."
+
+	if [[ ${EUID} == 0 ]] ; then
+		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+	else
+		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+	fi
+
+	mv "${DATA_DIR%/}"/*.conf "${PGDATA}"
+
+	einfo "The autovacuum function, which was in contrib, has been moved to the main"
+	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
+	einfo "by default. You can disable it in the cluster's:"
+	einfo "    ${PGDATA%/}/postgresql.conf"
+	einfo
+	einfo "The PostgreSQL server, by default, will log events to:"
+	einfo "    ${DATA_DIR%/}/postmaster.log"
+	einfo
+	if use prefix ; then
+		einfo "The location of the configuration files have moved to:"
+		einfo "    ${PGDATA}"
+		einfo "To start the server:"
+		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
+		einfo "To stop:"
+		einfo "    pg_ctl stop -D ${DATA_DIR}"
+		einfo
+		einfo "Or move the configuration files back:"
+		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
+	else
+		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+		einfo "instead of 'pg_ctl'."
+	fi
+}
+
+src_test() {
+	einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
+
+	if [ ${UID} -ne 0 ] ; then
+		emake -j1 check  || die "Make check failed. See above for details."
+
+		einfo "If you think other tests besides the regression tests are necessary, please"
+		einfo "submit a bug including a patch for this ebuild to enable them."
+	else
+		ewarn "Tests cannot be run as root. Skipping."
+		ewarn "HINT: FEATURES=\"userpriv\""
+	fi
+}
diff --git a/dev-games/mercator/files/mercator-0.3.0-gentoo.patch b/dev-games/mercator/files/mercator-0.3.0-gentoo.patch
new file mode 100644
index 000000000000..2693fa8e4fdc
--- /dev/null
+++ b/dev-games/mercator/files/mercator-0.3.0-gentoo.patch
@@ -0,0 +1,11 @@
+--- Mercator/TerrainMod.cpp.old	2012-02-26 21:30:39.000000000 +0100
++++ Mercator/TerrainMod.cpp	2012-02-26 21:29:58.000000000 +0100
+@@ -40,6 +40,8 @@
+     s.removeMod(this);
+ }
+ 
++template class ShapeTerrainMod<WFMath::Polygon >;
++
+ template class LevelTerrainMod<WFMath::Ball >;
+ template class LevelTerrainMod<WFMath::Polygon >;
+ template class LevelTerrainMod<WFMath::RotBox >;
diff --git a/dev-games/mercator/mercator-0.3.0.ebuild b/dev-games/mercator/mercator-0.3.0.ebuild
index 3546ce5021d5..fba1fa358c9a 100644
--- a/dev-games/mercator/mercator-0.3.0.ebuild
+++ b/dev-games/mercator/mercator-0.3.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/mercator/mercator-0.3.0.ebuild,v 1.5 2012/02/24 15:25:35 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/mercator/mercator-0.3.0.ebuild,v 1.6 2012/02/27 21:12:27 tupone Exp $
 
 EAPI=2
 inherit base
@@ -20,6 +20,7 @@ DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
 DOCS=( AUTHORS ChangeLog NEWS README TODO )
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
 
 src_compile() {
 	base_src_compile
diff --git a/dev-lang/php/files/eblits/src_configure-v53.eblit b/dev-lang/php/files/eblits/src_configure-v53.eblit
index 00b7275318d9..027758dbd57c 100644
--- a/dev-lang/php/files/eblits/src_configure-v53.eblit
+++ b/dev-lang/php/files/eblits/src_configure-v53.eblit
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_configure-v53.eblit,v 1.2 2011/12/23 17:16:42 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_configure-v53.eblit,v 1.3 2012/02/27 22:04:47 mabi Exp $
 
 eblit-php-src_configure() {
     addpredict /usr/share/snmp/mibs/.index
@@ -163,12 +163,8 @@ eblit-php-src_configure() {
 
 	# Oracle support
 	if use oci8-instant-client ; then
-		OCI8IC_PKG="$(best_version dev-db/oracle-instantclient-basic | \
-			sed -e 's|dev-db/oracle-instantclient-basic-||g' | \
-			sed -e 's|-r.*||g')"
-    
 	    my_conf+="
-		$(use_with oci8-instant-client oci8 "instantclient,/usr/lib/oracle/${OCI8IC_PKG}/client/lib")"
+		$(use_with oci8-instant-client oci8)
 	fi
 
 	# PDO support
@@ -188,7 +184,7 @@ eblit-php-src_configure() {
 		$(use_with odbc pdo-odbc unixODBC,/usr)"
 		if use oci8-instant-client ; then
 	        my_conf+="
-			$(use_with oci8-instant-client pdo-oci "instantclient,/usr,${OCI8IC_PKG}" )"
+			$(use_with oci8-instant-client pdo-oci)"
 		fi
 	fi
 
diff --git a/dev-lang/php/files/eblits/src_configure-v54.eblit b/dev-lang/php/files/eblits/src_configure-v54.eblit
index 9e6b2950018e..09ebc14959b1 100644
--- a/dev-lang/php/files/eblits/src_configure-v54.eblit
+++ b/dev-lang/php/files/eblits/src_configure-v54.eblit
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_configure-v54.eblit,v 1.1 2011/12/18 09:00:26 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_configure-v54.eblit,v 1.2 2012/02/27 22:04:47 mabi Exp $
 
 eblit-php-src_configure() {
     addpredict /usr/share/snmp/mibs/.index
@@ -161,12 +161,8 @@ eblit-php-src_configure() {
 
 	# Oracle support
 	if use oci8-instant-client ; then
-		OCI8IC_PKG="$(best_version dev-db/oracle-instantclient-basic | \
-			sed -e 's|dev-db/oracle-instantclient-basic-||g' | \
-			sed -e 's|-r.*||g')"
-    
 	    my_conf+="
-		$(use_with oci8-instant-client oci8 "instantclient,/usr/lib/oracle/${OCI8IC_PKG}/client/lib")"
+		$(use_with oci8-instant-client oci8)
 	fi
 
 	# PDO support
@@ -186,7 +182,7 @@ eblit-php-src_configure() {
 		$(use_with odbc pdo-odbc unixODBC,/usr)"
 		if use oci8-instant-client ; then
 	        my_conf+="
-			$(use_with oci8-instant-client pdo-oci "instantclient,/usr,${OCI8IC_PKG}" )"
+			$(use_with oci8-instant-client pdo-oci)"
 		fi
 	fi
 
diff --git a/dev-libs/icu/Manifest b/dev-libs/icu/Manifest
index f76a2cf9105f..c1cae8de33e1 100644
--- a/dev-libs/icu/Manifest
+++ b/dev-libs/icu/Manifest
@@ -1,7 +1,5 @@
 DIST icu4c-4_6-docs.zip 4884171 RMD160 ac5bc160bdb0f183ab0c5aa31324fa197b1a43f5 SHA1 c56518ffededdebea15525e1e25499e3e58aaec3 SHA256 863f88a12d63e1cfa449ff4010404610e2c7be4f22f98ac412d15c9e66d8a6d8
 DIST icu4c-4_6-src.tgz 15543712 RMD160 1cb84839384af5cba75bda6358c8bdaa82adaa9c SHA1 efc68a73a424d5822565feaf4468336f77294e8e SHA256 b5a1ada8127d8b79187f887903e34a87dbecea2659a139993bf81ad7309ddffc
-DIST icu4c-4_8-docs.zip 10750270 RMD160 74149a52b21cdea7b4779bb1585888c82ac4b708 SHA1 c10d4dc711438763631564ace8200e3cef66f190 SHA256 dff1e6d5e674985e89b30a336d1d142cc5cf8e6c70acf398db50223cb837f0e4
-DIST icu4c-4_8-src.tgz 18620856 RMD160 77674ce09823f80810b7f5a0898881b5a62d938c SHA1 f458b41800cc21bbb92ceb119380ad3249252fd6 SHA256 45e17667b5c6886b49b43e98b8a3f6684e77e5dceda8e939af6f5c8bebd7a939
 DIST icu4c-4_8_1-docs.zip 5364512 RMD160 bc1794f99be91b7646f13ac06a96b912a1b388f5 SHA1 51f796df86f2e69c0ef1e398727a1fcb5fcbb7a3 SHA256 efcedde8bfaaf6aa33816a4124980058187868a6eedd4fe68d2d15f19977b3bd
 DIST icu4c-4_8_1-src.tgz 18677882 RMD160 2196dffbc2d074cf56f5dcbb4e2b802c950cfcf0 SHA1 f0252b2b7ad1ef861ac39b177b7a6fcb6c94eb45 SHA256 19a4cd6e94187a03bca7514d694c5a5a666567e2884ce008ca9f14fa400af88f
 DIST icu4c-4_8_1_1-docs.zip 4078464 RMD160 ee07a9042714ff306de6e086a1510c9f884551ed SHA1 2b1cec2d684919c89b61a37aa845ecf68197beeb SHA256 03bd6dd2f3a2482af471840462512af4217984688e6ff2a2686a97c3a1980c2a
diff --git a/dev-libs/icu/files/icu-4.8.1-fix_ltr.patch b/dev-libs/icu/files/icu-4.8.1-fix_ltr.patch
new file mode 100644
index 000000000000..9bcd217ff3c9
--- /dev/null
+++ b/dev-libs/icu/files/icu-4.8.1-fix_ltr.patch
@@ -0,0 +1,56 @@
+--- release-4-8-1/source/layout/LESwaps.h	2011-10-07 06:52:16.240688181 +0300
++++ release-4-8/source/layout/LESwaps.h	2011-10-07 05:56:26.915499700 +0300
+@@ -45,8 +45,8 @@
+ public:
+ 
+     /**
+-     * Reads a big-endian 16-bit word and returns a native-endian value.
+-     * No-op on a big-endian platform, byte-swaps on a little-endian platform.
++     * This method does the byte swap required on little endian platforms
++     * to correctly access a (16-bit) word.
+      *
+      * @param value - the word to be byte swapped
+      *
+@@ -56,19 +56,12 @@
+      */
+     static le_uint16 swapWord(le_uint16 value)
+     {
+-#if (defined(U_IS_BIG_ENDIAN) && U_IS_BIG_ENDIAN) || (defined(BYTE_ORDER) && defined(BIG_ENDIAN)) || defined(__BIG_ENDIAN__)
+-        // Fastpath when we know that the platform is big-endian.
+-        return value;
+-#else
+-        // Reads a big-endian value on any platform.
+-        const le_uint8 *p = reinterpret_cast<const le_uint8 *>(&value);
+-        return (le_uint16)((p[0] << 8) | p[1]);
+-#endif
++        return (le_uint16)((value << 8) | (value >> 8));
+     };
+ 
+     /**
+-     * Reads a big-endian 32-bit word and returns a native-endian value.
+-     * No-op on a big-endian platform, byte-swaps on a little-endian platform.
++     * This method does the byte swapping required on little endian platforms
++     * to correctly access a (32-bit) long.
+      *
+      * @param value - the long to be byte swapped
+      *
+@@ -78,14 +71,11 @@
+      */
+     static le_uint32 swapLong(le_uint32 value)
+     {
+-#if (defined(U_IS_BIG_ENDIAN) && U_IS_BIG_ENDIAN) || (defined(BYTE_ORDER) && defined(BIG_ENDIAN)) || defined(__BIG_ENDIAN__)
+-        // Fastpath when we know that the platform is big-endian.
+-        return value;
+-#else
+-        // Reads a big-endian value on any platform.
+-        const le_uint8 *p = reinterpret_cast<const le_uint8 *>(&value);
+-        return (le_uint32)((p[0] << 24) | (p[1] << 16) | (p[2] << 8) | p[3]);
+-#endif
++        return (le_uint32)(
++            (value << 24) |
++            ((value << 8) & 0xff0000) |
++            ((value >> 8) & 0xff00) |
++            (value >> 24));
+     };
+ 
+ private:
diff --git a/dev-libs/icu/files/icu-4.8.1.1-fix_ltr.patch b/dev-libs/icu/files/icu-4.8.1.1-fix_ltr.patch
new file mode 100644
index 000000000000..9ec2df111e9f
--- /dev/null
+++ b/dev-libs/icu/files/icu-4.8.1.1-fix_ltr.patch
@@ -0,0 +1,61 @@
+diff -urN icu.old/source/layout/LESwaps.h icu/source/layout/LESwaps.h
+--- icu.old/source/layout/LESwaps.h	2012-02-27 19:04:13.090199788 +0100
++++ icu/source/layout/LESwaps.h	2012-02-27 19:07:02.046202727 +0100
+@@ -45,8 +45,8 @@
+ public:
+ 
+     /**
+-     * Reads a big-endian 16-bit word and returns a native-endian value.
+-     * No-op on a big-endian platform, byte-swaps on a little-endian platform.
++     * This method does the byte swap required on little endian platforms
++     * to correctly access a (16-bit) word.
+      *
+      * @param value - the word to be byte swapped
+      *
+@@ -56,21 +56,12 @@
+      */
+     static le_uint16 swapWord(le_uint16 value)
+     {
+-#if (defined(U_IS_BIG_ENDIAN) && U_IS_BIG_ENDIAN) || \
+-    (defined(BYTE_ORDER) && defined(BIG_ENDIAN) && (BYTE_ORDER == BIG_ENDIAN)) || \
+-    defined(__BIG_ENDIAN__)
+-        // Fastpath when we know that the platform is big-endian.
+-        return value;
+-#else
+-        // Reads a big-endian value on any platform.
+-        const le_uint8 *p = reinterpret_cast<const le_uint8 *>(&value);
+-        return (le_uint16)((p[0] << 8) | p[1]);
+-#endif
++        return (le_uint16)((value << 8) | (value >> 8));
+     };
+ 
+     /**
+-     * Reads a big-endian 32-bit word and returns a native-endian value.
+-     * No-op on a big-endian platform, byte-swaps on a little-endian platform.
++     * This method does the byte swapping required on little endian platforms
++     * to correctly access a (32-bit) long.
+      *
+      * @param value - the long to be byte swapped
+      *
+@@ -80,16 +71,11 @@
+      */
+     static le_uint32 swapLong(le_uint32 value)
+     {
+-#if (defined(U_IS_BIG_ENDIAN) && U_IS_BIG_ENDIAN) || \
+-    (defined(BYTE_ORDER) && defined(BIG_ENDIAN) && (BYTE_ORDER == BIG_ENDIAN)) || \
+-    defined(__BIG_ENDIAN__)
+-        // Fastpath when we know that the platform is big-endian.
+-        return value;
+-#else
+-        // Reads a big-endian value on any platform.
+-        const le_uint8 *p = reinterpret_cast<const le_uint8 *>(&value);
+-        return (le_uint32)((p[0] << 24) | (p[1] << 16) | (p[2] << 8) | p[3]);
+-#endif
++        return (le_uint32)(
++            (value << 24) |
++            ((value << 8) & 0xff0000) |
++            ((value >> 8) & 0xff00) |
++            (value >> 24));
+     };
+ 
+ private:
diff --git a/dev-libs/icu/icu-4.8.1-r1.ebuild b/dev-libs/icu/icu-4.8.1-r3.ebuild
similarity index 84%
rename from dev-libs/icu/icu-4.8.1-r1.ebuild
rename to dev-libs/icu/icu-4.8.1-r3.ebuild
index 80100dee61be..39a9213b7b5e 100644
--- a/dev-libs/icu/icu-4.8.1-r1.ebuild
+++ b/dev-libs/icu/icu-4.8.1-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/icu/icu-4.8.1-r1.ebuild,v 1.2 2011/12/18 17:17:13 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/icu/icu-4.8.1-r3.ebuild,v 1.1 2012/02/27 16:19:35 scarabeus Exp $
 
 EAPI="3"
 
@@ -26,7 +26,7 @@ SRC_URI="${BASE_URI}/${SRC_ARCHIVE}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="debug doc examples static-libs"
 
 DEPEND="doc? ( app-arch/unzip )"
@@ -54,7 +54,10 @@ src_prepare() {
 		sed -i -e "/^${variable} =.*/s:@${variable}@::" config/Makefile.inc.in || die "sed failed"
 	done
 
-	epatch "${FILESDIR}/icu-4.8.1-fix_binformat_fonts.patch"
+	epatch \
+		"${FILESDIR}/icu-4.8.1-fix_binformat_fonts.patch" \
+		"${FILESDIR}/icu-4.8.1-fix_nan.patch" \
+		"${FILESDIR}/icu-4.8.1-fix_ltr.patch"
 }
 
 src_configure() {
diff --git a/dev-libs/icu/icu-4.8.1.1.ebuild b/dev-libs/icu/icu-4.8.1.1-r1.ebuild
similarity index 87%
rename from dev-libs/icu/icu-4.8.1.1.ebuild
rename to dev-libs/icu/icu-4.8.1.1-r1.ebuild
index bf62b2ff5bf3..7b07aff6cab6 100644
--- a/dev-libs/icu/icu-4.8.1.1.ebuild
+++ b/dev-libs/icu/icu-4.8.1.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/icu/icu-4.8.1.1.ebuild,v 1.1 2011/10/30 12:02:54 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/icu/icu-4.8.1.1-r1.ebuild,v 1.2 2012/02/27 18:09:25 scarabeus Exp $
 
 EAPI="4"
 
@@ -54,8 +54,10 @@ src_prepare() {
 		sed -i -e "/^${variable} =.*/s:@${variable}@::" config/Makefile.inc.in || die "sed failed"
 	done
 
-	epatch "${FILESDIR}/${PN}-4.8.1-fix_binformat_fonts.patch"
-	epatch "${FILESDIR}/${PN}-4.8.1-fix_nan.patch"
+	epatch \
+		"${FILESDIR}/icu-4.8.1-fix_binformat_fonts.patch" \
+		"${FILESDIR}/icu-4.8.1-fix_nan.patch" \
+		"${FILESDIR}/icu-4.8.1.1-fix_ltr.patch"
 }
 
 src_configure() {
diff --git a/dev-libs/icu/icu-4.8.ebuild b/dev-libs/icu/icu-4.8.ebuild
deleted file mode 100644
index 2fd3474d2715..000000000000
--- a/dev-libs/icu/icu-4.8.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/icu/icu-4.8.ebuild,v 1.6 2011/08/20 16:00:49 jer Exp $
-
-EAPI="3"
-
-inherit versionator
-
-MAJOR_VERSION="$(get_version_component_range 1)"
-MINOR_VERSION="$(get_version_component_range 2)"
-if [[ "${PV}" =~ ^[[:digit:]]+\.[[:digit:]]+(_rc[[:digit:]]*)?$ ]]; then
-	MICRO_VERSION="0"
-else
-	MICRO_VERSION="$(get_version_component_range 3)"
-fi
-
-DESCRIPTION="International Components for Unicode"
-HOMEPAGE="http://www.icu-project.org/"
-
-BASE_URI="http://download.icu-project.org/files/icu4c/${PV/_/}"
-SRC_ARCHIVE="icu4c-${PV//./_}-src.tgz"
-DOCS_ARCHIVE="icu4c-${PV//./_}-docs.zip"
-
-SRC_URI="${BASE_URI}/${SRC_ARCHIVE}
-	doc? ( ${BASE_URI}/${DOCS_ARCHIVE} )"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="debug doc examples static-libs"
-
-DEPEND="doc? ( app-arch/unzip )"
-RDEPEND=""
-
-S="${WORKDIR}/${PN}/source"
-
-QA_DT_NEEDED="/usr/lib.*/libicudata\.so\.${MAJOR_VERSION}${MINOR_VERSION}\.${MICRO_VERSION}"
-
-src_unpack() {
-	unpack "${SRC_ARCHIVE}"
-	if use doc; then
-		mkdir docs
-		pushd docs > /dev/null
-		unpack "${DOCS_ARCHIVE}"
-		popd > /dev/null
-	fi
-}
-
-src_prepare() {
-	# Do not hardcode flags into icu-config.
-	# https://ssl.icu-project.org/trac/ticket/6102
-	local variable
-	for variable in CFLAGS CPPFLAGS CXXFLAGS FFLAGS LDFLAGS; do
-		sed -i -e "/^${variable} =.*/s:@${variable}@::" config/Makefile.inc.in || die "sed failed"
-	done
-}
-
-src_configure() {
-	econf \
-		$(use_enable debug) \
-		$(use_enable examples samples) \
-		$(use_enable static-libs static)
-}
-
-src_test() {
-	# INTLTEST_OPTS: intltest options
-	#   -e: Exhaustive testing
-	#   -l: Reporting of memory leaks
-	#   -v: Increased verbosity
-	# IOTEST_OPTS: iotest options
-	#   -e: Exhaustive testing
-	#   -v: Increased verbosity
-	# CINTLTST_OPTS: cintltst options
-	#   -e: Exhaustive testing
-	#   -v: Increased verbosity
-	emake -j1 check || die "emake check failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dohtml ../readme.html
-	dodoc ../unicode-license.txt
-	if use doc; then
-		insinto /usr/share/doc/${PF}/html/api
-		doins -r "${WORKDIR}/docs/"* || die "doins failed"
-	fi
-}
diff --git a/dev-perl/Math-GMP/Math-GMP-2.60.0.ebuild b/dev-perl/Math-GMP/Math-GMP-2.60.0.ebuild
index 55f72cc55d29..75a1f4c169a4 100644
--- a/dev-perl/Math-GMP/Math-GMP-2.60.0.ebuild
+++ b/dev-perl/Math-GMP/Math-GMP-2.60.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Math-GMP/Math-GMP-2.60.0.ebuild,v 1.4 2012/02/27 03:52:13 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Math-GMP/Math-GMP-2.60.0.ebuild,v 1.5 2012/02/27 16:02:05 ranger Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ DESCRIPTION="High speed arbitrary size integer math"
 
 SLOT="0"
 LICENSE="LGPL-2"
-KEYWORDS="alpha amd64 hppa ~ia64 ~mips ~ppc ~sparc ~x86"
+KEYWORDS="alpha amd64 hppa ~ia64 ~mips ppc ~sparc ~x86"
 IUSE=""
 
 RDEPEND="dev-libs/gmp"
diff --git a/dev-perl/Net-DBus/Net-DBus-1.0.0.ebuild b/dev-perl/Net-DBus/Net-DBus-1.0.0.ebuild
index 81345c5a987e..3cb11a2aa14a 100644
--- a/dev-perl/Net-DBus/Net-DBus-1.0.0.ebuild
+++ b/dev-perl/Net-DBus/Net-DBus-1.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Net-DBus/Net-DBus-1.0.0.ebuild,v 1.3 2012/02/25 18:00:03 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Net-DBus/Net-DBus-1.0.0.ebuild,v 1.4 2012/02/27 16:03:38 ranger Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Perl extension for the DBus message system"
 
 SLOT="0"
-KEYWORDS="alpha amd64 ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="alpha amd64 ~ia64 ppc ~sparc ~x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Net-XMPP/Net-XMPP-1.20.0.ebuild b/dev-perl/Net-XMPP/Net-XMPP-1.20.0.ebuild
index 8160e0db3ca3..47c73fe572f8 100644
--- a/dev-perl/Net-XMPP/Net-XMPP-1.20.0.ebuild
+++ b/dev-perl/Net-XMPP/Net-XMPP-1.20.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Net-XMPP/Net-XMPP-1.20.0.ebuild,v 1.4 2012/02/27 03:52:54 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Net-XMPP/Net-XMPP-1.20.0.ebuild,v 1.5 2012/02/27 16:07:14 ranger Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ DESCRIPTION="XMPP Perl Library"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 hppa ~ia64 ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 RDEPEND=">=dev-perl/XML-Stream-1.22
diff --git a/dev-perl/Number-Compare/Number-Compare-0.30.0.ebuild b/dev-perl/Number-Compare/Number-Compare-0.30.0.ebuild
index c1aa47224ea1..f2e9bbc4fdfd 100644
--- a/dev-perl/Number-Compare/Number-Compare-0.30.0.ebuild
+++ b/dev-perl/Number-Compare/Number-Compare-0.30.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Number-Compare/Number-Compare-0.30.0.ebuild,v 1.4 2012/02/27 03:55:07 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Number-Compare/Number-Compare-0.30.0.ebuild,v 1.5 2012/02/27 16:08:54 ranger Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Numeric comparisons"
 
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 hppa ~ia64 ~mips ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE=""
 
 SRC_TEST=do
diff --git a/dev-perl/Package-Stash-XS/Package-Stash-XS-0.250.0.ebuild b/dev-perl/Package-Stash-XS/Package-Stash-XS-0.250.0.ebuild
index 23dd3c89a594..e0ab2aa68bb9 100644
--- a/dev-perl/Package-Stash-XS/Package-Stash-XS-0.250.0.ebuild
+++ b/dev-perl/Package-Stash-XS/Package-Stash-XS-0.250.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Package-Stash-XS/Package-Stash-XS-0.250.0.ebuild,v 1.8 2012/02/24 10:30:08 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Package-Stash-XS/Package-Stash-XS-0.250.0.ebuild,v 1.9 2012/02/27 16:10:25 ranger Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Faster and more correct implementation of the Package::Stash API"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~x86 ~x86-fbsd ~x86-freebsd ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ppc ~x86 ~x86-fbsd ~x86-freebsd ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-perl/PadWalker/PadWalker-1.920.0.ebuild b/dev-perl/PadWalker/PadWalker-1.920.0.ebuild
index 77d0d4585c63..823e506e38ac 100644
--- a/dev-perl/PadWalker/PadWalker-1.920.0.ebuild
+++ b/dev-perl/PadWalker/PadWalker-1.920.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/PadWalker/PadWalker-1.920.0.ebuild,v 1.2 2012/02/24 10:30:35 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/PadWalker/PadWalker-1.920.0.ebuild,v 1.3 2012/02/27 16:15:51 ranger Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="play with other peoples' lexical variables"
 
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 
 SRC_TEST="do"
diff --git a/dev-perl/Pango/Pango-1.222.0.ebuild b/dev-perl/Pango/Pango-1.222.0.ebuild
index de5001dc33e7..b2cc84f8634b 100644
--- a/dev-perl/Pango/Pango-1.222.0.ebuild
+++ b/dev-perl/Pango/Pango-1.222.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Pango/Pango-1.222.0.ebuild,v 1.4 2012/02/27 03:55:40 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Pango/Pango-1.222.0.ebuild,v 1.5 2012/02/27 16:20:29 ranger Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ DESCRIPTION="Layout and render international text"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm hppa ~ia64 ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=dev-perl/glib-perl-1.220
diff --git a/dev-perl/Pod-Tests/Pod-Tests-1.190.0.ebuild b/dev-perl/Pod-Tests/Pod-Tests-1.190.0.ebuild
index e8c16f44eb77..0450dc95c7dd 100644
--- a/dev-perl/Pod-Tests/Pod-Tests-1.190.0.ebuild
+++ b/dev-perl/Pod-Tests/Pod-Tests-1.190.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Pod-Tests/Pod-Tests-1.190.0.ebuild,v 1.4 2012/02/25 18:02:14 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Pod-Tests/Pod-Tests-1.190.0.ebuild,v 1.5 2012/02/27 16:23:47 ranger Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Extracts embedded tests and code examples from POD"
 
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 hppa ~ia64 ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 
 RDEPEND="virtual/perl-File-Spec"
diff --git a/dev-perl/Proc-Simple/Proc-Simple-1.300.0.ebuild b/dev-perl/Proc-Simple/Proc-Simple-1.300.0.ebuild
index bb5c5bbe3598..f97c71da6f70 100644
--- a/dev-perl/Proc-Simple/Proc-Simple-1.300.0.ebuild
+++ b/dev-perl/Proc-Simple/Proc-Simple-1.300.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Proc-Simple/Proc-Simple-1.300.0.ebuild,v 1.2 2012/02/24 10:32:31 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Proc-Simple/Proc-Simple-1.300.0.ebuild,v 1.3 2012/02/27 16:24:52 ranger Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Perl Proc-Simple -  Launch and control background processes"
 
 SLOT="0"
-KEYWORDS="amd64 ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ia64 ppc ~sparc ~x86"
 IUSE=""
 
 SRC_TEST="do"
diff --git a/dev-perl/RPC-XML/RPC-XML-0.760.0.ebuild b/dev-perl/RPC-XML/RPC-XML-0.760.0.ebuild
index 97ff7d0d322d..1098c189c6b3 100644
--- a/dev-perl/RPC-XML/RPC-XML-0.760.0.ebuild
+++ b/dev-perl/RPC-XML/RPC-XML-0.760.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/RPC-XML/RPC-XML-0.760.0.ebuild,v 1.3 2012/02/25 18:02:37 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/RPC-XML/RPC-XML-0.760.0.ebuild,v 1.4 2012/02/27 16:26:42 ranger Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ DESCRIPTION="An implementation of XML-RPC"
 
 SLOT="0"
 LICENSE="|| ( Artistic-2 LGPL-2.1 )"
-KEYWORDS="alpha amd64 ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ~ia64 ppc ~sparc ~x86 ~x86-fbsd"
 IUSE=""
 
 SRC_TEST="do"
diff --git a/dev-perl/SOAP-Lite/SOAP-Lite-0.714.0.ebuild b/dev-perl/SOAP-Lite/SOAP-Lite-0.714.0.ebuild
index f60be6885090..5581c28ea749 100644
--- a/dev-perl/SOAP-Lite/SOAP-Lite-0.714.0.ebuild
+++ b/dev-perl/SOAP-Lite/SOAP-Lite-0.714.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/SOAP-Lite/SOAP-Lite-0.714.0.ebuild,v 1.4 2012/02/25 18:02:59 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/SOAP-Lite/SOAP-Lite-0.714.0.ebuild,v 1.5 2012/02/27 16:36:27 ranger Exp $
 
 EAPI=4
 
@@ -13,7 +13,7 @@ DESCRIPTION="Simple and lightweight interface to the SOAP protocol (sic) both on
 IUSE="jabber ssl"
 SLOT="0"
 LICENSE="|| ( Artistic GPL-2 )"
-KEYWORDS="alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~ia64 ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 myconf="${myconf} --noprompt"
 
diff --git a/dev-perl/String-ShellQuote/String-ShellQuote-1.40.0.ebuild b/dev-perl/String-ShellQuote/String-ShellQuote-1.40.0.ebuild
index fbf184013bbe..1296f08623a6 100644
--- a/dev-perl/String-ShellQuote/String-ShellQuote-1.40.0.ebuild
+++ b/dev-perl/String-ShellQuote/String-ShellQuote-1.40.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/String-ShellQuote/String-ShellQuote-1.40.0.ebuild,v 1.4 2012/02/25 18:03:42 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/String-ShellQuote/String-ShellQuote-1.40.0.ebuild,v 1.5 2012/02/27 16:39:52 ranger Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Quote strings for passing through the shell"
 
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 hppa ~ia64 ~mips ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 SRC_TEST=do
diff --git a/dev-perl/Sub-Name/Sub-Name-0.50.0.ebuild b/dev-perl/Sub-Name/Sub-Name-0.50.0.ebuild
index e19a831bc0f0..85f6d73a8888 100644
--- a/dev-perl/Sub-Name/Sub-Name-0.50.0.ebuild
+++ b/dev-perl/Sub-Name/Sub-Name-0.50.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Sub-Name/Sub-Name-0.50.0.ebuild,v 1.3 2012/02/24 10:35:47 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Sub-Name/Sub-Name-0.50.0.ebuild,v 1.4 2012/02/27 16:44:50 ranger Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="(Re)name a sub"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE=""
 
 SRC_TEST=do
diff --git a/dev-perl/Sub-Uplevel/Sub-Uplevel-0.220.0.ebuild b/dev-perl/Sub-Uplevel/Sub-Uplevel-0.220.0.ebuild
index c0f3f4d53184..635c797101c2 100644
--- a/dev-perl/Sub-Uplevel/Sub-Uplevel-0.220.0.ebuild
+++ b/dev-perl/Sub-Uplevel/Sub-Uplevel-0.220.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Sub-Uplevel/Sub-Uplevel-0.220.0.ebuild,v 1.4 2012/02/25 18:04:04 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Sub-Uplevel/Sub-Uplevel-0.220.0.ebuild,v 1.5 2012/02/27 16:53:03 ranger Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Apparently run a function in a higher stack frame"
 
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-perl/Template-DBI/Template-DBI-2.650.0.ebuild b/dev-perl/Template-DBI/Template-DBI-2.650.0.ebuild
index 9512ef8e5b7c..546c2ac86926 100644
--- a/dev-perl/Template-DBI/Template-DBI-2.650.0.ebuild
+++ b/dev-perl/Template-DBI/Template-DBI-2.650.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Template-DBI/Template-DBI-2.650.0.ebuild,v 1.3 2012/02/25 18:04:26 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Template-DBI/Template-DBI-2.650.0.ebuild,v 1.4 2012/02/27 17:30:04 ranger Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="DBI plugin for the Template Toolkit"
 
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~ia64 ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-solaris"
 IUSE="test"
 
 RDEPEND=">=dev-perl/DBI-1.612
diff --git a/dev-perl/Test-Deep/Test-Deep-0.108.0.ebuild b/dev-perl/Test-Deep/Test-Deep-0.108.0.ebuild
index 04fc6e89e32b..4f6f56d9d4d2 100644
--- a/dev-perl/Test-Deep/Test-Deep-0.108.0.ebuild
+++ b/dev-perl/Test-Deep/Test-Deep-0.108.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Test-Deep/Test-Deep-0.108.0.ebuild,v 1.4 2012/02/25 18:29:35 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Test-Deep/Test-Deep-0.108.0.ebuild,v 1.5 2012/02/27 17:33:24 ranger Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Test::Deep - Extremely flexible deep comparison"
 
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="test"
 
 DEPEND="
diff --git a/dev-perl/Test-Exception/Test-Exception-0.310.0.ebuild b/dev-perl/Test-Exception/Test-Exception-0.310.0.ebuild
index 234cd109775b..a53e02994e18 100644
--- a/dev-perl/Test-Exception/Test-Exception-0.310.0.ebuild
+++ b/dev-perl/Test-Exception/Test-Exception-0.310.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Test-Exception/Test-Exception-0.310.0.ebuild,v 1.3 2012/02/24 16:51:42 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Test-Exception/Test-Exception-0.310.0.ebuild,v 1.4 2012/02/27 17:35:26 ranger Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="test functions for exception based code"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=virtual/perl-Test-Simple-0.64
diff --git a/dev-perl/Test-LongString/Test-LongString-0.150.0.ebuild b/dev-perl/Test-LongString/Test-LongString-0.150.0.ebuild
index d72382e382aa..624831f9310c 100644
--- a/dev-perl/Test-LongString/Test-LongString-0.150.0.ebuild
+++ b/dev-perl/Test-LongString/Test-LongString-0.150.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Test-LongString/Test-LongString-0.150.0.ebuild,v 1.2 2012/02/24 10:38:44 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Test-LongString/Test-LongString-0.150.0.ebuild,v 1.3 2012/02/27 17:37:58 ranger Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="A library to test long strings."
 
 SLOT="0"
-KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ~ia64 ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-perl/Test-Manifest/Test-Manifest-1.230.0.ebuild b/dev-perl/Test-Manifest/Test-Manifest-1.230.0.ebuild
index d69927047ccc..3e268cc7bc06 100644
--- a/dev-perl/Test-Manifest/Test-Manifest-1.230.0.ebuild
+++ b/dev-perl/Test-Manifest/Test-Manifest-1.230.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Test-Manifest/Test-Manifest-1.230.0.ebuild,v 1.2 2012/02/24 10:39:14 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Test-Manifest/Test-Manifest-1.230.0.ebuild,v 1.3 2012/02/27 17:39:29 ranger Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Interact with a t/test_manifest file"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-perl/Test-Requires/Test-Requires-0.60.0.ebuild b/dev-perl/Test-Requires/Test-Requires-0.60.0.ebuild
index de34ed25bdd5..c49f2a56e0cc 100644
--- a/dev-perl/Test-Requires/Test-Requires-0.60.0.ebuild
+++ b/dev-perl/Test-Requires/Test-Requires-0.60.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Test-Requires/Test-Requires-0.60.0.ebuild,v 1.6 2012/02/24 10:39:40 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Test-Requires/Test-Requires-0.60.0.ebuild,v 1.7 2012/02/27 17:42:30 ranger Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Checks to see if the module can be loaded"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ppc ~x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=virtual/perl-Test-Simple-0.61"
diff --git a/dev-perl/Text-CSV_XS/Text-CSV_XS-0.860.0.ebuild b/dev-perl/Text-CSV_XS/Text-CSV_XS-0.860.0.ebuild
index e80e2af78b0d..599ef4f04592 100644
--- a/dev-perl/Text-CSV_XS/Text-CSV_XS-0.860.0.ebuild
+++ b/dev-perl/Text-CSV_XS/Text-CSV_XS-0.860.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Text-CSV_XS/Text-CSV_XS-0.860.0.ebuild,v 1.3 2012/02/24 15:02:51 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Text-CSV_XS/Text-CSV_XS-0.860.0.ebuild,v 1.4 2012/02/27 17:53:56 ranger Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ inherit perl-module
 DESCRIPTION="Comma-separated values manipulation routines"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~ia64 ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-perl/Text-Glob/Text-Glob-0.90.0.ebuild b/dev-perl/Text-Glob/Text-Glob-0.90.0.ebuild
index 705675541620..bccf0d362256 100644
--- a/dev-perl/Text-Glob/Text-Glob-0.90.0.ebuild
+++ b/dev-perl/Text-Glob/Text-Glob-0.90.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Text-Glob/Text-Glob-0.90.0.ebuild,v 1.3 2012/02/24 16:50:44 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Text-Glob/Text-Glob-0.90.0.ebuild,v 1.4 2012/02/27 18:02:25 ranger Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Match globbing patterns against text"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 hppa ~ia64 ~mips ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-perl/Tie-IxHash/Tie-IxHash-1.220.0.ebuild b/dev-perl/Tie-IxHash/Tie-IxHash-1.220.0.ebuild
index e6af4cb4ad4c..0c6551e6ae5a 100644
--- a/dev-perl/Tie-IxHash/Tie-IxHash-1.220.0.ebuild
+++ b/dev-perl/Tie-IxHash/Tie-IxHash-1.220.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Tie-IxHash/Tie-IxHash-1.220.0.ebuild,v 1.3 2012/02/24 16:50:16 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Tie-IxHash/Tie-IxHash-1.220.0.ebuild,v 1.4 2012/02/27 18:13:24 ranger Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Ordered associative arrays for Perl"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 DEPEND="virtual/perl-Module-Build"
diff --git a/dev-perl/Tree-DAG_Node/Tree-DAG_Node-1.60.0.ebuild b/dev-perl/Tree-DAG_Node/Tree-DAG_Node-1.60.0.ebuild
index c7e3ab2fc584..a494ee08fb03 100644
--- a/dev-perl/Tree-DAG_Node/Tree-DAG_Node-1.60.0.ebuild
+++ b/dev-perl/Tree-DAG_Node/Tree-DAG_Node-1.60.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Tree-DAG_Node/Tree-DAG_Node-1.60.0.ebuild,v 1.6 2012/02/24 10:41:31 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Tree-DAG_Node/Tree-DAG_Node-1.60.0.ebuild,v 1.7 2012/02/27 18:45:54 ranger Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="(Super)class for representing nodes in a tree"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 SRC_TEST="do"
diff --git a/dev-perl/URI/URI-1.590.0.ebuild b/dev-perl/URI/URI-1.590.0.ebuild
index cbf02d4bad32..a2a3a8a78b10 100644
--- a/dev-perl/URI/URI-1.590.0.ebuild
+++ b/dev-perl/URI/URI-1.590.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/URI/URI-1.590.0.ebuild,v 1.3 2012/02/24 16:49:43 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/URI/URI-1.590.0.ebuild,v 1.4 2012/02/27 18:49:33 ranger Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="A URI Perl Module"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="virtual/perl-MIME-Base64"
diff --git a/dev-perl/Unicode-Map/Unicode-Map-0.112.0.ebuild b/dev-perl/Unicode-Map/Unicode-Map-0.112.0.ebuild
index ddc614ae9ecc..23d806b67d7a 100644
--- a/dev-perl/Unicode-Map/Unicode-Map-0.112.0.ebuild
+++ b/dev-perl/Unicode-Map/Unicode-Map-0.112.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Unicode-Map/Unicode-Map-0.112.0.ebuild,v 1.3 2012/02/24 16:49:10 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Unicode-Map/Unicode-Map-0.112.0.ebuild,v 1.4 2012/02/27 18:54:46 ranger Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Map charsets from and to utf16 code"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 SRC_TEST="do"
diff --git a/dev-perl/Unix-Syslog/Unix-Syslog-1.100.0.ebuild b/dev-perl/Unix-Syslog/Unix-Syslog-1.100.0.ebuild
index cdc3ac7b9d07..591b648d0e4e 100644
--- a/dev-perl/Unix-Syslog/Unix-Syslog-1.100.0.ebuild
+++ b/dev-perl/Unix-Syslog/Unix-Syslog-1.100.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Unix-Syslog/Unix-Syslog-1.100.0.ebuild,v 1.3 2012/02/24 16:48:32 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Unix-Syslog/Unix-Syslog-1.100.0.ebuild,v 1.4 2012/02/27 19:49:19 ranger Exp $
 
 EAPI=4
 
@@ -12,5 +12,5 @@ DESCRIPTION="A Perl module which provides access to the system logger"
 
 SLOT="0"
 LICENSE="Artistic-2"
-KEYWORDS="~alpha amd64 hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 hppa ~ia64 ppc ~ppc64 ~sparc ~x86"
 IUSE=""
diff --git a/dev-perl/WWW-Curl/WWW-Curl-4.150.0.ebuild b/dev-perl/WWW-Curl/WWW-Curl-4.150.0.ebuild
index 50474889ef3f..e2739fa2c5b2 100644
--- a/dev-perl/WWW-Curl/WWW-Curl-4.150.0.ebuild
+++ b/dev-perl/WWW-Curl/WWW-Curl-4.150.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/WWW-Curl/WWW-Curl-4.150.0.ebuild,v 1.2 2012/02/24 10:44:48 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/WWW-Curl/WWW-Curl-4.150.0.ebuild,v 1.3 2012/02/27 18:56:19 ranger Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ DESCRIPTION="Perl extension interface for libcurl"
 
 LICENSE="|| ( MPL-1.0 MPL-1.1 MIT )"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND="net-misc/curl"
diff --git a/dev-perl/XML-DT/XML-DT-0.560.0.ebuild b/dev-perl/XML-DT/XML-DT-0.560.0.ebuild
index 2f076d58e90e..6f8ef50d0797 100644
--- a/dev-perl/XML-DT/XML-DT-0.560.0.ebuild
+++ b/dev-perl/XML-DT/XML-DT-0.560.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/XML-DT/XML-DT-0.560.0.ebuild,v 1.3 2012/02/24 16:47:12 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/XML-DT/XML-DT-0.560.0.ebuild,v 1.4 2012/02/27 21:30:51 ranger Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ inherit perl-module
 DESCRIPTION="A perl XML down translate module"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="~alpha amd64 hppa ~ia64 ppc ~sparc ~x86"
 IUSE="test"
 
 RDEPEND=">=dev-perl/libwww-perl-1.35
diff --git a/dev-perl/XML-Generator/XML-Generator-1.40.0.ebuild b/dev-perl/XML-Generator/XML-Generator-1.40.0.ebuild
index fae4d4cd25c1..7ffd29bd50e2 100644
--- a/dev-perl/XML-Generator/XML-Generator-1.40.0.ebuild
+++ b/dev-perl/XML-Generator/XML-Generator-1.40.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/XML-Generator/XML-Generator-1.40.0.ebuild,v 1.3 2012/02/24 16:46:47 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/XML-Generator/XML-Generator-1.40.0.ebuild,v 1.4 2012/02/27 21:58:28 ranger Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Perl XML::Generator - A module to help in generating XML documents"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE=""
 
 DEPEND="dev-libs/expat"
diff --git a/dev-perl/XML-Twig/XML-Twig-3.390.0.ebuild b/dev-perl/XML-Twig/XML-Twig-3.390.0.ebuild
index 389b0cb1279c..4995dbcb0199 100644
--- a/dev-perl/XML-Twig/XML-Twig-3.390.0.ebuild
+++ b/dev-perl/XML-Twig/XML-Twig-3.390.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/XML-Twig/XML-Twig-3.390.0.ebuild,v 1.3 2012/02/24 15:11:08 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/XML-Twig/XML-Twig-3.390.0.ebuild,v 1.4 2012/02/27 21:59:29 ranger Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Process huge XML documents in tree mode"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="nls"
 
 # Twig ONLY works with expat 1.95.5
diff --git a/dev-perl/YAML-Tiny/YAML-Tiny-1.500.0.ebuild b/dev-perl/YAML-Tiny/YAML-Tiny-1.500.0.ebuild
index 2fc90160a0d7..f7362ddcf0fa 100644
--- a/dev-perl/YAML-Tiny/YAML-Tiny-1.500.0.ebuild
+++ b/dev-perl/YAML-Tiny/YAML-Tiny-1.500.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/YAML-Tiny/YAML-Tiny-1.500.0.ebuild,v 1.6 2012/02/25 17:40:52 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/YAML-Tiny/YAML-Tiny-1.500.0.ebuild,v 1.7 2012/02/27 17:55:27 ranger Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Read/Write YAML files with as little code as possible"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 SRC_TEST=do
diff --git a/dev-perl/crypt-cbc/crypt-cbc-2.300.0.ebuild b/dev-perl/crypt-cbc/crypt-cbc-2.300.0.ebuild
index 9f37900afcaf..a6c418c3a82e 100644
--- a/dev-perl/crypt-cbc/crypt-cbc-2.300.0.ebuild
+++ b/dev-perl/crypt-cbc/crypt-cbc-2.300.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/crypt-cbc/crypt-cbc-2.300.0.ebuild,v 1.4 2012/02/24 16:45:19 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/crypt-cbc/crypt-cbc-2.300.0.ebuild,v 1.5 2012/02/27 22:00:30 ranger Exp $
 
 EAPI=4
 
@@ -13,7 +13,7 @@ DESCRIPTION="Encrypt Data with Cipher Block Chaining Mode"
 
 LICENSE="Artistic"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 hppa ~ia64 ~mips ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="test"
 
 RDEPEND="virtual/perl-Digest-MD5"
diff --git a/dev-perl/extutils-depends/extutils-depends-0.304.0.ebuild b/dev-perl/extutils-depends/extutils-depends-0.304.0.ebuild
index 34911225158d..0a447935072a 100644
--- a/dev-perl/extutils-depends/extutils-depends-0.304.0.ebuild
+++ b/dev-perl/extutils-depends/extutils-depends-0.304.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/extutils-depends/extutils-depends-0.304.0.ebuild,v 1.3 2012/02/24 16:43:52 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/extutils-depends/extutils-depends-0.304.0.ebuild,v 1.4 2012/02/27 22:01:29 ranger Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ inherit perl-module
 DESCRIPTION="Easily build XS extensions that depend on XS extensions"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE=""
 
 SRC_TEST="do parallel"
diff --git a/dev-perl/extutils-pkgconfig/extutils-pkgconfig-1.120.0.ebuild b/dev-perl/extutils-pkgconfig/extutils-pkgconfig-1.120.0.ebuild
index 4534d7892453..a2384f930abd 100644
--- a/dev-perl/extutils-pkgconfig/extutils-pkgconfig-1.120.0.ebuild
+++ b/dev-perl/extutils-pkgconfig/extutils-pkgconfig-1.120.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/extutils-pkgconfig/extutils-pkgconfig-1.120.0.ebuild,v 1.3 2012/02/24 15:38:32 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/extutils-pkgconfig/extutils-pkgconfig-1.120.0.ebuild,v 1.4 2012/02/27 22:02:58 ranger Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ inherit perl-module
 DESCRIPTION="Simplistic perl interface to pkg-config"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE=""
 
 DEPEND="dev-util/pkgconfig"
diff --git a/dev-perl/gnome2-vfs-perl/gnome2-vfs-perl-1.81.0.ebuild b/dev-perl/gnome2-vfs-perl/gnome2-vfs-perl-1.81.0.ebuild
index e1cf07fbe2ab..c2b5e286d9ad 100644
--- a/dev-perl/gnome2-vfs-perl/gnome2-vfs-perl-1.81.0.ebuild
+++ b/dev-perl/gnome2-vfs-perl/gnome2-vfs-perl-1.81.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/gnome2-vfs-perl/gnome2-vfs-perl-1.81.0.ebuild,v 1.2 2012/02/24 10:49:52 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/gnome2-vfs-perl/gnome2-vfs-perl-1.81.0.ebuild,v 1.3 2012/02/27 22:04:05 ranger Exp $
 
 EAPI=4
 
@@ -13,7 +13,7 @@ DESCRIPTION="Perl interface to the 2.x series of the Gnome Virtual File System l
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~ia64 ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=gnome-base/gnome-vfs-2
diff --git a/dev-perl/gnome2-wnck/gnome2-wnck-0.160.0.ebuild b/dev-perl/gnome2-wnck/gnome2-wnck-0.160.0.ebuild
index fb9b7f969a3d..25f07e4eca12 100644
--- a/dev-perl/gnome2-wnck/gnome2-wnck-0.160.0.ebuild
+++ b/dev-perl/gnome2-wnck/gnome2-wnck-0.160.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/gnome2-wnck/gnome2-wnck-0.160.0.ebuild,v 1.2 2012/02/24 10:50:22 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/gnome2-wnck/gnome2-wnck-0.160.0.ebuild,v 1.3 2012/02/27 22:05:27 ranger Exp $
 
 EAPI=4
 
@@ -15,7 +15,7 @@ HOMEPAGE="http://gtk2-perl.sourceforge.net/ ${HOMEPAGE}"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ia64 ppc ~sparc ~x86"
 IUSE=""
 
 RDEPEND=">=dev-perl/glib-perl-1.180.0
diff --git a/dev-perl/gtk2-ex-formfactory/gtk2-ex-formfactory-0.670.0.ebuild b/dev-perl/gtk2-ex-formfactory/gtk2-ex-formfactory-0.670.0.ebuild
index 5e0f86d728ca..f0ab0351d970 100644
--- a/dev-perl/gtk2-ex-formfactory/gtk2-ex-formfactory-0.670.0.ebuild
+++ b/dev-perl/gtk2-ex-formfactory/gtk2-ex-formfactory-0.670.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/gtk2-ex-formfactory/gtk2-ex-formfactory-0.670.0.ebuild,v 1.2 2012/02/24 10:50:50 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/gtk2-ex-formfactory/gtk2-ex-formfactory-0.670.0.ebuild,v 1.3 2012/02/27 22:06:34 ranger Exp $
 
 EAPI=4
 
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.exit1.org/Gtk2-Ex-FormFactory/ ${HOMEPAGE}"
 
 LICENSE="|| ( LGPL-2.1 LGPL-3 )" #LGPL-2.1+
 SLOT="0"
-KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~ia64 ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 RDEPEND="dev-perl/gtk2-perl"
diff --git a/dev-perl/gtk2-fu/gtk2-fu-0.110.0.ebuild b/dev-perl/gtk2-fu/gtk2-fu-0.110.0.ebuild
index 0d04355c949b..394c072c3fd3 100644
--- a/dev-perl/gtk2-fu/gtk2-fu-0.110.0.ebuild
+++ b/dev-perl/gtk2-fu/gtk2-fu-0.110.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/gtk2-fu/gtk2-fu-0.110.0.ebuild,v 1.3 2012/02/24 15:37:00 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/gtk2-fu/gtk2-fu-0.110.0.ebuild,v 1.4 2012/02/27 22:07:54 ranger Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ inherit perl-module
 DESCRIPTION="gtk2-fu is a layer on top of perl gtk2, that brings power, simplicity and speed of development"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 hppa ~ia64 ppc ~ppc64 ~sparc ~x86"
 IUSE="test"
 
 RDEPEND="dev-perl/gtk2-perl"
diff --git a/dev-perl/gtk2-gladexml/gtk2-gladexml-1.7.0.ebuild b/dev-perl/gtk2-gladexml/gtk2-gladexml-1.7.0.ebuild
index 8107e3f52805..43417769b2b6 100644
--- a/dev-perl/gtk2-gladexml/gtk2-gladexml-1.7.0.ebuild
+++ b/dev-perl/gtk2-gladexml/gtk2-gladexml-1.7.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/gtk2-gladexml/gtk2-gladexml-1.7.0.ebuild,v 1.2 2012/02/24 10:51:54 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/gtk2-gladexml/gtk2-gladexml-1.7.0.ebuild,v 1.3 2012/02/27 22:08:55 ranger Exp $
 
 EAPI=4
 
@@ -14,7 +14,7 @@ HOMEPAGE="http://gtk2-perl.sf.net/ ${HOMEPAGE}"
 
 SLOT="0"
 LICENSE="LGPL-2"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ia64 ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 RDEPEND="x11-libs/gtk+:2
diff --git a/dev-perl/inline-files/inline-files-0.680.0.ebuild b/dev-perl/inline-files/inline-files-0.680.0.ebuild
index ef33acf75599..3568e39a7188 100644
--- a/dev-perl/inline-files/inline-files-0.680.0.ebuild
+++ b/dev-perl/inline-files/inline-files-0.680.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/inline-files/inline-files-0.680.0.ebuild,v 1.2 2012/02/24 10:52:21 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/inline-files/inline-files-0.680.0.ebuild,v 1.3 2012/02/27 22:11:12 ranger Exp $
 
 EAPI=4
 
@@ -13,7 +13,7 @@ inherit perl-module
 DESCRIPTION="Multiple virtual files in a single file"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ia64 ppc ~sparc ~x86"
 IUSE=""
 
 SRC_TEST=do
diff --git a/dev-perl/module-info/module-info-0.320.0.ebuild b/dev-perl/module-info/module-info-0.320.0.ebuild
index e6e3a55d481e..369a3943a6d8 100644
--- a/dev-perl/module-info/module-info-0.320.0.ebuild
+++ b/dev-perl/module-info/module-info-0.320.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/module-info/module-info-0.320.0.ebuild,v 1.3 2012/02/24 15:35:06 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/module-info/module-info-0.320.0.ebuild,v 1.4 2012/02/27 22:12:27 ranger Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ inherit perl-module
 DESCRIPTION="Information about Perl modules"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 hppa ~ia64 ~mips ppc ~ppc64 ~sparc ~x86"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-perl/namespace-autoclean/namespace-autoclean-0.130.0.ebuild b/dev-perl/namespace-autoclean/namespace-autoclean-0.130.0.ebuild
index 4a944cc99c13..4785f09644bc 100644
--- a/dev-perl/namespace-autoclean/namespace-autoclean-0.130.0.ebuild
+++ b/dev-perl/namespace-autoclean/namespace-autoclean-0.130.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/namespace-autoclean/namespace-autoclean-0.130.0.ebuild,v 1.3 2012/02/24 10:53:44 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/namespace-autoclean/namespace-autoclean-0.130.0.ebuild,v 1.4 2012/02/27 22:13:33 ranger Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Keep imports out of your namespace"
 
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86 ~x64-macos"
+KEYWORDS="amd64 ppc ~x86 ~x64-macos"
 IUSE="test"
 
 RDEPEND=">=dev-perl/namespace-clean-0.200
diff --git a/dev-python/autopep8/autopep8-9999.ebuild b/dev-python/autopep8/autopep8-9999.ebuild
new file mode 100644
index 000000000000..8bf60a003249
--- /dev/null
+++ b/dev-python/autopep8/autopep8-9999.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/autopep8/autopep8-9999.ebuild,v 1.1 2012/02/27 18:26:15 xarthisius Exp $
+
+EAPI=4
+
+PYTHON_DEPEND="*"
+SUPPORT_PYTHON_ABIS="1"
+
+if [ "${PV%9999}" != "${PV}" ] ; then
+	SCM=git-2
+	EGIT_REPO_URI="git://github.com/hhatto/${PN}.git"
+fi
+
+inherit distutils ${SCM}
+
+DESCRIPTION="Automatically formats Python code to conform to the PEP 8 style guide"
+HOMEPAGE="https://github.com/hhatto/autopep8 http://pypi.python.org/pypi/autopep8"
+if [ "${PV%9999}" != "${PV}" ] ; then
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+RDEPEND="dev-python/pep8"
+DEPEND="${RDEPEND}
+	dev-python/setuptools"
+
+PYTHON_MODNAME="${PN}.py"
+
+src_test() {
+	testing() {
+		PYTHONPATH="build-${PYTHON_ABI}/lib" "$(PYTHON)" test/test_${PN}.py
+	}
+	python_execute_function testing
+}
diff --git a/dev-python/matplotlib/matplotlib-1.1.0.ebuild b/dev-python/matplotlib/matplotlib-1.1.0.ebuild
index 8daf6263363e..da059f645d4a 100644
--- a/dev-python/matplotlib/matplotlib-1.1.0.ebuild
+++ b/dev-python/matplotlib/matplotlib-1.1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/matplotlib-1.1.0.ebuild,v 1.10 2012/02/27 03:10:14 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/matplotlib-1.1.0.ebuild,v 1.12 2012/02/27 23:18:11 bicatali Exp $
 
 EAPI="3"
 
@@ -21,7 +21,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
 
 IUSE="cairo doc excel examples fltk gtk latex qt4 tk wxwidgets"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ppc ~ppc64 x86 ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 # Main license: matplotlib
 # Some modules: BSD
 # matplotlib/backends/qt4_editor: MIT
@@ -138,7 +138,7 @@ src_prepare() {
 		EOF
 		cat <<-EOF >> matplotlibrc.template
 			examples.download : False
-			examples.directory : ${EPREFIX}/usr/share/${PF}/examples
+			examples.directory : ${EPREFIX}/usr/share/doc/${PF}/examples
 		EOF
 	fi
 }
diff --git a/dev-python/py/py-1.4.5.ebuild b/dev-python/py/py-1.4.5.ebuild
index f5c783eee574..736289d1454e 100644
--- a/dev-python/py/py-1.4.5.ebuild
+++ b/dev-python/py/py-1.4.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/py/py-1.4.5.ebuild,v 1.4 2012/02/24 15:12:44 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/py/py-1.4.5.ebuild,v 1.5 2012/02/27 16:13:44 ranger Exp $
 
 EAPI="3"
 SUPPORT_PYTHON_ABIS="1"
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 
 DEPEND="app-arch/unzip
diff --git a/dev-python/pysvn/pysvn-1.7.5.ebuild b/dev-python/pysvn/pysvn-1.7.5.ebuild
index 61080925a3e6..29c22dc2e6d0 100644
--- a/dev-python/pysvn/pysvn-1.7.5.ebuild
+++ b/dev-python/pysvn/pysvn-1.7.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pysvn/pysvn-1.7.5.ebuild,v 1.3 2011/04/18 18:27:39 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pysvn/pysvn-1.7.5.ebuild,v 1.4 2012/02/27 23:12:46 sping Exp $
 
 EAPI="3"
 PYTHON_DEPEND="*"
@@ -19,7 +19,7 @@ KEYWORDS="amd64 ~arm ~ppc x86 ~x86-freebsd ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE="doc examples"
 
 RDEPEND=">=dev-python/pycxx-6.2.0
-	dev-vcs/subversion"
+	<dev-vcs/subversion-1.7"  # (bug #395533)
 DEPEND="${RDEPEND}
 	dev-python/setuptools"
 
diff --git a/dev-python/qscintilla-python/metadata.xml b/dev-python/qscintilla-python/metadata.xml
index a789e7bbe9ee..df82e7055865 100644
--- a/dev-python/qscintilla-python/metadata.xml
+++ b/dev-python/qscintilla-python/metadata.xml
@@ -1,6 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>python</herd>
-<herd>qt</herd>
+	<herd>python</herd>
+	<herd>qt</herd>
+	<upstream>
+		<maintainer status="active">
+			<email>phil@riverbankcomputing.com</email>
+			<name>Phil Thompson</name>
+		</maintainer>
+		<bugs-to>mailto:qscintilla@riverbankcomputing.com</bugs-to>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/cri/Manifest b/dev-ruby/cri/Manifest
new file mode 100644
index 000000000000..02c0672f27de
--- /dev/null
+++ b/dev-ruby/cri/Manifest
@@ -0,0 +1 @@
+DIST cri-2.2.0.gem 17920 RMD160 9359297851d9b58326d3cb0027732d657576073d SHA1 d1f5d8ae01e44b39fe95ebe320f638d64b190ca8 SHA256 c858e638f5b65db5a936deb1f29666dd03a5be33401ddf152532d6d5f958f05b
diff --git a/dev-ruby/cri/cri-2.2.0.ebuild b/dev-ruby/cri/cri-2.2.0.ebuild
new file mode 100644
index 000000000000..d80a838b00ad
--- /dev/null
+++ b/dev-ruby/cri/cri-2.2.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/cri/cri-2.2.0.ebuild,v 1.1 2012/02/28 01:26:49 a3li Exp $
+
+EAPI="2"
+USE_RUBY="ruby18 ree18 jruby"
+
+RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
+
+RUBY_FAKEGEM_TASK_DOC="doc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Cri is a library for building easy-to-use commandline tools."
+HOMEPAGE="http://rubygems.org/gems/cri"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE=""
+
+ruby_add_bdepend "doc? ( dev-ruby/yard )"
+ruby_add_bdepend "test? ( virtual/ruby-test-unit )"
diff --git a/dev-ruby/cri/metadata.xml b/dev-ruby/cri/metadata.xml
new file mode 100644
index 000000000000..852136183369
--- /dev/null
+++ b/dev-ruby/cri/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>ruby</herd>
+</pkgmetadata>
diff --git a/dev-ruby/kramdown/Manifest b/dev-ruby/kramdown/Manifest
index 15a2452d3d5a..7c35fc8f74bf 100644
--- a/dev-ruby/kramdown/Manifest
+++ b/dev-ruby/kramdown/Manifest
@@ -1,2 +1,3 @@
 DIST kramdown-0.13.3.gem 203776 RMD160 7cb174db44a69b803e0655c25a74e202fb3d598e SHA1 c491abf3ac9ec1bf62f4c1655ff747b684cd42b6 SHA256 3f0eff6b17a585200f4680f71d9cd000e41bc8a318b24370564b2017791cf0c2
 DIST kramdown-0.13.4.gem 206336 RMD160 d7f984af732710503581c8b9a1d2759194347d28 SHA1 514eda95f88d485fa81c1ca7e8d34feed96e065c SHA256 a3fde6aded0a8f1d8a6bd72cadd09ab74ac6f99739efc6d78d5b9701f99656d5
+DIST kramdown-0.13.5.gem 267776 RMD160 9b69c319f7202d59bcd69f7c6c80856432b078b0 SHA1 96f31fc52ab9b929034b8e16f107dd4387382ca5 SHA256 c63619a2c203ba9f94eac36255c38a275a7cabc6146088cc644c880eaa626e36
diff --git a/dev-ruby/kramdown/kramdown-0.13.5.ebuild b/dev-ruby/kramdown/kramdown-0.13.5.ebuild
new file mode 100644
index 000000000000..77d1b0990f4d
--- /dev/null
+++ b/dev-ruby/kramdown/kramdown-0.13.5.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/kramdown/kramdown-0.13.5.ebuild,v 1.1 2012/02/27 23:44:15 flameeyes Exp $
+
+EAPI=4
+USE_RUBY="ruby18 ruby19 ree18 jruby"
+
+RAKE_FAKEGEM_DOCDIR="htmldoc/rdoc"
+RUBY_FAKEGEM_EXTRADOC="README ChangeLog"
+
+inherit ruby-fakegem
+
+DESCRIPTION="yet-another-markdown-parser but fast, pure Ruby, using a strict syntax definition."
+HOMEPAGE="http://kramdown.rubyforge.org/"
+
+LICENSE="GPL-3"
+
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_bdepend "doc? ( dev-ruby/rdoc )
+	test? ( >=dev-ruby/coderay-1.0.0 )"
+
+all_ruby_compile() {
+	if use doc; then
+		rdoc-2 -o htmldoc/rdoc --main README --title kramdown lib README || die "Unable to generate documentation"
+	fi
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	doman man/man1/kramdown.1
+}
diff --git a/dev-ruby/nagios_analyzer/Manifest b/dev-ruby/nagios_analyzer/Manifest
new file mode 100644
index 000000000000..c297a71ae825
--- /dev/null
+++ b/dev-ruby/nagios_analyzer/Manifest
@@ -0,0 +1 @@
+DIST nagios_analyzer-0.0.3.gem 9216 RMD160 348a11d77af6865483c929520a012cad000b43c1 SHA1 2cb9c3ea2689e8b631919a6475d7bd6a75f1f0ca SHA256 682b816fa540c68e2e97e7e36904e4a6158490401ce96c143d13c3121e108fbb
diff --git a/dev-ruby/nagios_analyzer/metadata.xml b/dev-ruby/nagios_analyzer/metadata.xml
new file mode 100644
index 000000000000..0040b1162894
--- /dev/null
+++ b/dev-ruby/nagios_analyzer/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>ruby</herd>
+</pkgmetadata>
diff --git a/dev-ruby/nagios_analyzer/nagios_analyzer-0.0.3.ebuild b/dev-ruby/nagios_analyzer/nagios_analyzer-0.0.3.ebuild
new file mode 100644
index 000000000000..ca78c0a3b29b
--- /dev/null
+++ b/dev-ruby/nagios_analyzer/nagios_analyzer-0.0.3.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/nagios_analyzer/nagios_analyzer-0.0.3.ebuild,v 1.1 2012/02/27 18:26:34 a3li Exp $
+
+EAPI=2
+USE_RUBY="ruby18"
+
+RUBY_FAKEGEM_EXTRADOC="README.textile"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A simple parser for Nagios status files"
+HOMEPAGE="https://github.com/jbbarth/nagios_analyzer"
+LICENSE="as-is"
+
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE=""
+
+RDEPEND="${RDEPEND}"
+DEPEND="${DEPEND}"
+
+ruby_add_bdepend "test? ( dev-ruby/rspec )"
+
+each_ruby_test() {
+	rspec ./spec/section_spec.rb ./spec/status_spec.rb
+}
diff --git a/dev-ruby/radius/Manifest b/dev-ruby/radius/Manifest
index 6d2f2cf324de..2401dfd0e786 100644
--- a/dev-ruby/radius/Manifest
+++ b/dev-ruby/radius/Manifest
@@ -1,2 +1,3 @@
 DIST radius-0.6.1.gem 26112 RMD160 b82eee895ef2e9521dc8fbdb106d7b14f0ddb483 SHA1 8ab160d9ef1a1a5a94e6396bbebd32e447ab47ae SHA256 ecefaa849d1485e4dcd59b7a72486e71949dd08dc9f61dcc8fbe45be6be3ddb4
 DIST radius-0.7.1.gem 103424 RMD160 47ccabd090618752884009b3f8dbbf71a877f0e2 SHA1 10b42c43c9fabcb02c166ed36b8c81993de9118f SHA256 3bee8df46eeb870e6cad91b0a15f6bb47dbbff118367449bae553cd3789c3d1e
+DIST radius-0.7.3.gem 103424 RMD160 703b8eecc68b831fe3401a53199a4109c67fa125 SHA1 0e686006e44d361bfa47c64af67ae93eccd16063 SHA256 ca640ebedd63766ddf834e64bff0add6bc00dcd3e72a14c3fb2ba3c444d6d284
diff --git a/dev-ruby/radius/radius-0.7.3.ebuild b/dev-ruby/radius/radius-0.7.3.ebuild
new file mode 100644
index 000000000000..bf5909dafd5a
--- /dev/null
+++ b/dev-ruby/radius/radius-0.7.3.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/radius/radius-0.7.3.ebuild,v 1.1 2012/02/27 23:47:45 flameeyes Exp $
+
+EAPI=4
+USE_RUBY="ruby18 ruby19 ree18 jruby"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG QUICKSTART.rdoc README.rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Powerful tag-based template system."
+HOMEPAGE="http://radius.rubyforge.org/"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/kramdown )"
diff --git a/dev-ruby/sass/Manifest b/dev-ruby/sass/Manifest
index ff5a803993c7..35fd777c0bca 100644
--- a/dev-ruby/sass/Manifest
+++ b/dev-ruby/sass/Manifest
@@ -1,4 +1,5 @@
 DIST sass-3.1.10.gem 215040 RMD160 bd8339343111606baadc3ec12308a17479a1ad40 SHA1 61589753991b2f4ce35021d0f50d4138abd9eb26 SHA256 518d55e88f2a0daea180ad640c5c8acd7b8b980c1bbfa3900e09f4eda2d2ef98
 DIST sass-3.1.12.gem 216576 RMD160 e36ad5f7e5f5ff5320eba4b0d6cacfe6849a2e22 SHA1 ec8729f3c1822b7bf67a26635db8396b35090523 SHA256 be59b0789b922e66b4bdf8155c383aac233d4419a60d3f94ee2089515854c282
+DIST sass-3.1.15.gem 221696 RMD160 bbc1fc139b929431bc6497f3b3ebd69b665a8f1e SHA1 f8e2f28a8a2d7db1569d2155d2227f4078df56e1 SHA256 fabb23de8bad1c87bf795638379556974e7aeb706c94488a467c004e50c555d3
 DIST sass-3.1.4.gem 515072 RMD160 7c5c446515a3c5f5c8a6b685e0e7017ab59dd4f7 SHA1 90f95fee655c7aa5958f481d50c86f939dc106c4 SHA256 b095d1ff189012a12bff87daecc0092bf5175b620fd6d5669a99bbfd2efb6bbf
 DIST sass-3.1.5.gem 209920 RMD160 e44c902e563f2bf810b8e3f6dd415583204fc4cf SHA1 4f72cc4becbea898339a2262a34bff559d0f1764 SHA256 9cd33a1a28c3e957d9d907f337921143c9bca57d2c1f6d66290f6616096a1542
diff --git a/dev-ruby/sass/sass-3.1.15.ebuild b/dev-ruby/sass/sass-3.1.15.ebuild
new file mode 100644
index 000000000000..9226485e2f98
--- /dev/null
+++ b/dev-ruby/sass/sass-3.1.15.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/sass/sass-3.1.15.ebuild,v 1.1 2012/02/28 00:21:31 flameeyes Exp $
+
+EAPI=2
+
+USE_RUBY="ruby18 ruby19 ree18 jruby"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_EXTRAINSTALL="rails init.rb VERSION VERSION_NAME"
+
+inherit ruby-fakegem
+
+DESCRIPTION="An extension of CSS3, adding nested rules, variables, mixins, selector inheritance, and more."
+HOMEPAGE="http://sass-lang.com/"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+SLOT="0"
+IUSE=""
+
+ruby_add_bdepend "doc? ( >=dev-ruby/yard-0.5.3 >=dev-ruby/maruku-0.5.9 )"
+
+ruby_add_rdepend "dev-ruby/fssm !!<dev-ruby/haml-3.1"
+
+# tests could use `less` if we had it
+
+#all_ruby_prepare() {
+#	# Avoid tests depending on ordering of hashes.
+#	sed -i -e '/test_mixin_include_with_keyword_args/,/ end/ s:^:#:' test/sass/conversion_test.rb || die
+#}
diff --git a/dev-ruby/syslogger/Manifest b/dev-ruby/syslogger/Manifest
index fcb756de6e14..ccd07a74b52d 100644
--- a/dev-ruby/syslogger/Manifest
+++ b/dev-ruby/syslogger/Manifest
@@ -1 +1,2 @@
 DIST syslogger-1.2.5.gem 7168 RMD160 b59b7cc65490b102cb53677953a6d21fc5d781c6 SHA1 15a20d5ec6d9822e51b915aff7948b48160d2a79 SHA256 28f1efc353fbc09c8867303dfd04871dcece0045251c7421dc26ec6b3570b8dd
+DIST syslogger-1.2.6.gem 7680 RMD160 8f1ae9b5cc37fe54b6461d35c8ca39fe1bd128d8 SHA1 541deca186f436a228887503347a933fd18bca12 SHA256 3a054ef5c1412f5f57c0466f2dbd076edfa68db1e5a5787fe166cf6a05e26b0b
diff --git a/dev-ruby/syslogger/syslogger-1.2.5.ebuild b/dev-ruby/syslogger/syslogger-1.2.5.ebuild
index f9117579ff48..9ace500e7fce 100644
--- a/dev-ruby/syslogger/syslogger-1.2.5.ebuild
+++ b/dev-ruby/syslogger/syslogger-1.2.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/syslogger/syslogger-1.2.5.ebuild,v 1.1 2012/01/22 18:45:01 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/syslogger/syslogger-1.2.5.ebuild,v 1.2 2012/02/27 20:45:24 flameeyes Exp $
 
 EAPI=4
 USE_RUBY="ruby18 ree18 ruby19"
@@ -21,7 +21,7 @@ DESCRIPTION="Drop-in replacement for the standard Logger, that logs to the syslo
 HOMEPAGE="https://github.com/crohr/syslogger"
 
 LICENSE="MIT"
-SLOT="3"
+SLOT="0"
 KEYWORDS="~amd64"
 IUSE=""
 
diff --git a/dev-ruby/syslogger/syslogger-1.2.6.ebuild b/dev-ruby/syslogger/syslogger-1.2.6.ebuild
new file mode 100644
index 000000000000..bea0dfdc9532
--- /dev/null
+++ b/dev-ruby/syslogger/syslogger-1.2.6.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/syslogger/syslogger-1.2.6.ebuild,v 1.1 2012/02/27 20:45:24 flameeyes Exp $
+
+EAPI=4
+USE_RUBY="ruby18 ree18 ruby19 jruby"
+
+RUBY_FAKEGEM_TASK_TEST="spec"
+
+RUBY_FAKEGEM_TASK_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.rdoc"
+
+# if ever needed
+#GITHUB_USER="crohr"
+#GITHUB_PROJECT="${PN}"
+#RUBY_S="${GITHUB_USER}-${GITHUB_PROJECT}-*"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Drop-in replacement for the standard Logger, that logs to the syslog"
+HOMEPAGE="https://github.com/crohr/syslogger"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_bdepend "
+	test? ( dev-ruby/rspec:2 )
+	doc? ( >=dev-ruby/rdoc-2.4.2 )"
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index 4a465b1a894a..d957a1ce15d3 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -10,6 +10,7 @@ DIST git-1.7.8.1.tar.gz 3539908 RMD160 b9b6c52fa38712679867e140c6b5d1bfcbc05831
 DIST git-1.7.8.2.tar.gz 3543890 RMD160 9d2cd1f2c1009122a2c8d41f7d4696fa83d3f198 SHA1 7187c1af96db0c181b801957d6e152ec7cd60ab6 SHA256 2247f214fce3be72da3020947ce3fbfb7f6f9950a145897554e043cd63f9a3e3
 DIST git-1.7.8.3.tar.gz 3543164 RMD160 2c88b4cf4f915363dfdc1bddda925f4a62b4e454 SHA1 e5eb8c289b69d69fd08c81b587a06eb5dd2b5c1c SHA256 77f52b7104a107e0fbe1ce85b3f35c97f029fab92cd35a3909015ca169af505d
 DIST git-1.7.8.4.tar.gz 3544195 RMD160 ee203b3d6252c2df150ef7904c6b95672dea4aff SHA1 add7b05f26216181d1b148dde298432132552b0f SHA256 71a5a98d386061fe606b5be1ac390dc725d418d12edfa20796ff7671247c67e3
+DIST git-1.7.8.5.tar.gz 3544390 RMD160 900f57e121f0aa0a312128983c030d21400aec7a SHA1 bb3d715437a4751f7de0c89156bf97dae7c6049a SHA256 b235fd332525c22eeb6f4f5e0b44b21f1ff1c35a7c76e6729a7a560b2fbed622
 DIST git-1.7.8.tar.gz 3538330 RMD160 efde5f593ea804a998c4aeebc27ccbc0674596e4 SHA1 7453e737e008f7319a5eca24a9ef3c5fb1f13398 SHA256 ede41a79c83e0d8673ed16c64d5c105e404d953591f9611e44c3964130da0713
 DIST git-1.7.9.1.tar.gz 3608449 RMD160 acff1b02a507220e51a86b63d38a5ae4ec01f70f SHA1 bd85327627f96c4e98071a4d1d32c30f210aa54a SHA256 b689a0ddbc99f9a69aef7c81c569289a28ba0787cd27e5e188112e1c3f0e8152
 DIST git-1.7.9.2.tar.gz 3611846 RMD160 af5a35d1630c2ea2472665f461953baaf3a42dfc SHA1 7aff1048480a8637de94e8d82744d312c0b5e060 SHA256 bd7725fb80f305bf27666e3d26a9b7b79596e2248f2ae2d27e06bc15a501ac75
@@ -27,6 +28,7 @@ DIST git-htmldocs-1.7.8.1.tar.gz 1695296 RMD160 9f0a4d43e327da14592ecca6816301f1
 DIST git-htmldocs-1.7.8.2.tar.gz 1697858 RMD160 d9f5c0b4c01e682f241ebc59d1abf7cd79fe6dd0 SHA1 9047175e5c46aa3260c42e6b4459cf4ee5a7bb8a SHA256 c402b231b8d8b8ecae267a6e3b0224c473c0f0c3fd0e22915d07854276d8c800
 DIST git-htmldocs-1.7.8.3.tar.gz 1698145 RMD160 3c77c0ae24b3bd035c1057648736d6ba008c57ab SHA1 8a65d2425c1b6f646d130cf5846e92e9e0e93736 SHA256 d6dad326af1aaae36d349f6a722a6c53e6a936f4e6a470d96320857319db6af9
 DIST git-htmldocs-1.7.8.4.tar.gz 1699142 RMD160 beccc1e17f6d930c79f2f35aeac4e8dc0c318e1e SHA1 ac2b89d8d4418c7633ee2344e89eb7dfcb81522a SHA256 a86d8d939cb031d8ebbbaa17399c32474a13e0e4a6705406ad5771620b351acd
+DIST git-htmldocs-1.7.8.5.tar.gz 1699204 RMD160 6313e769957f94a5b120656ed1b6419709a8aa8a SHA1 71cf25158ae3499e33327fa9469279771429f9f7 SHA256 64eb6ebac332cd23eb9f0ae1aec26c7f03da9e73b32dbb32bb84ec8c6efd19a7
 DIST git-htmldocs-1.7.8.tar.gz 1694941 RMD160 07344d8dd95f2d72667cf16a4f340aa5cc4c8950 SHA1 2734079e22a0a6e3e78779582be9138ffc7de6f7 SHA256 45b3e3016bd5dbd933bafd5e8091acb0431ff3a63b7fd829e9d9832dde096862
 DIST git-htmldocs-1.7.9.1.tar.gz 1743893 RMD160 ba3b1b5eeeeb00ca0050c670ad3bddea5c19ffcb SHA1 de5ad73499cfdb08e261bc481c84a75f11b7ff0f SHA256 df21e008501ca0825d153d1746cf0f7742a87b15a98c6881d4fb9611897226df
 DIST git-htmldocs-1.7.9.2.tar.gz 1745003 RMD160 296cd29ff0a3f464760c8c30efa1123f17174222 SHA1 3cf13b03b2f64d0458212232cc18983231f8251e SHA256 da9c90e9e175448cf7940acbd287bc927294b3fd8ddf8d9a1e10266eff872b3b
@@ -44,6 +46,7 @@ DIST git-manpages-1.7.8.1.tar.gz 496876 RMD160 d3e601038e8fc85b32798148ecc8c8239
 DIST git-manpages-1.7.8.2.tar.gz 497249 RMD160 94477d2e301c684ca271334ee66699071421c896 SHA1 cc394a0a9689297fddad40c1ccbded0ba9d708da SHA256 87b95eb0e6d93c71dcf850100a1ebdb2e06b86a03603a695f7ffb947f4da94a9
 DIST git-manpages-1.7.8.3.tar.gz 497446 RMD160 87aad1c9975a006683ab6b1128df39ae19b30d2c SHA1 a6e2b7cff8181ee52a1cc00ebba7b349850d6680 SHA256 5c0c402d41c577b9cd9a31e30abd029d3e79d6c3164d4a527d3103ee2a0dfb5a
 DIST git-manpages-1.7.8.4.tar.gz 497621 RMD160 0ab22cbe1820b29d991a63cfb087aacb42b8223e SHA1 4372c423a0d2f7df33b5b39727a81f0a7b40669d SHA256 b4930a17de7b18d40d81c3830913e5c4c2a91134e3a331ad49757d496ee53b76
+DIST git-manpages-1.7.8.5.tar.gz 497426 RMD160 b4d902d69d0b983fa9ed6c014eb3a7a02ac263df SHA1 ce327331973b6e100b6a69ab8f9c526690260e92 SHA256 1a890f2cd2a875d2716ebc83413c08750ce15194297f3aabd66014f4f8f511d2
 DIST git-manpages-1.7.8.tar.gz 496974 RMD160 ee09c9a1c80fe46ca3a6787ea30eadeddee2a9a0 SHA1 93315f7f51d7f27d3e421c9b0d64afa27f3d16df SHA256 f67d593f5aecd01ec42683cff515172c67f79109161629621e9df58e39ef5354
 DIST git-manpages-1.7.9.1.tar.gz 508057 RMD160 2ed606396ece433ff3206bb4013867882e2cf51f SHA1 8c6ee031b39da5c5e53f927952838796e0959ce9 SHA256 f31d91061e96b5f882ceed2160d44937b2679931e7e217a66bfe3a23df46adae
 DIST git-manpages-1.7.9.2.tar.gz 508005 RMD160 229aee67eb986f81d8e2d511df18dfd8adc0ae41 SHA1 d6992d899fb70e40983f94a2f96ad24b8ee93557 SHA256 c653a3678bb5668c280a0d5ba584fdfb0e4272acbbd00901dc2363ea3f58eede
diff --git a/dev-vcs/git/git-1.7.8.5.ebuild b/dev-vcs/git/git-1.7.8.5.ebuild
new file mode 100644
index 000000000000..7cdf9e34cf54
--- /dev/null
+++ b/dev-vcs/git/git-1.7.8.5.ebuild
@@ -0,0 +1,527 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.8.5.ebuild,v 1.1 2012/02/28 02:08:40 robbat2 Exp $
+
+EAPI=4
+
+GENTOO_DEPEND_ON_PERL=no
+
+# bug #329479: git-remote-testgit is not multiple-version aware
+PYTHON_DEPEND="python? 2"
+[[ ${PV} == *9999 ]] && SCM="git-2"
+EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
+
+inherit toolchain-funcs eutils elisp-common perl-module bash-completion-r1 python ${SCM}
+
+MY_PV="${PV/_rc/.rc}"
+MY_P="${PN}-${MY_PV}"
+
+DOC_VER=${MY_PV}
+
+DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team"
+HOMEPAGE="http://www.git-scm.com/"
+if [[ ${PV} != *9999 ]]; then
+	SRC_URI_SUFFIX="gz"
+	SRC_URI_GOOG="http://git-core.googlecode.com/files"
+	SRC_URI_KORG="mirror://kernel/software/scm/git"
+	SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX}
+			${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
+			${SRC_URI_GOOG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+			${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+			doc? (
+			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+			${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+			)"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+else
+	SRC_URI=""
+	KEYWORDS=""
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+blksha1 +curl cgi doc emacs gtk iconv +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion"
+
+# Common to both DEPEND and RDEPEND
+CDEPEND="
+	!blksha1? ( dev-libs/openssl )
+	sys-libs/zlib
+	perl?   ( dev-lang/perl[-build] dev-libs/libpcre )
+	tk?     ( dev-lang/tk )
+	curl?   (
+		net-misc/curl
+		webdav? ( dev-libs/expat )
+	)
+	emacs?  ( virtual/emacs )"
+
+RDEPEND="${CDEPEND}
+	perl? ( dev-perl/Error
+			dev-perl/Net-SMTP-SSL
+			dev-perl/Authen-SASL
+			cgi? ( virtual/perl-CGI )
+			cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
+			subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
+			)
+	python? ( gtk?
+	(
+		>=dev-python/pygtk-2.8
+		dev-python/pygtksourceview:2
+	) )"
+
+# This is how info docs are created with Git:
+#   .txt/asciidoc --(asciidoc)---------> .xml/docbook
+#   .xml/docbook  --(docbook2texi.pl)--> .texi
+#   .texi         --(makeinfo)---------> .info
+DEPEND="${CDEPEND}
+	app-arch/cpio
+	doc?    (
+		app-text/asciidoc
+		app-text/docbook2X
+		sys-apps/texinfo
+	)"
+
+# Live ebuild builds man pages and HTML docs, additionally
+if [[ ${PV} == *9999 ]]; then
+	DEPEND="${DEPEND}
+		app-text/asciidoc
+		app-text/xmlto"
+fi
+
+SITEFILE=50${PN}-gentoo.el
+S="${WORKDIR}/${MY_P}"
+
+REQUIRED_USE="
+	cgi? ( perl )
+	cvs? ( perl )
+	subversion? ( perl )
+	webdav? ( curl )
+"
+
+pkg_setup() {
+	if use subversion && has_version dev-vcs/subversion && built_with_use --missing false dev-vcs/subversion dso ; then
+		ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
+		ewarn "with USE=dso, there may be weird crashes in git-svn. You"
+		ewarn "have been warned."
+	fi
+	if use python ; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
+}
+
+# This is needed because for some obscure reasons future calls to make don't
+# pick up these exports if we export them in src_unpack()
+exportmakeopts() {
+	local myopts
+
+	if use blksha1 ; then
+		myopts="${myopts} BLK_SHA1=YesPlease"
+	elif use ppcsha1 ; then
+		myopts="${myopts} PPC_SHA1=YesPlease"
+	fi
+
+	if use curl ; then
+		use webdav || myopts="${myopts} NO_EXPAT=YesPlease"
+	else
+		myopts="${myopts} NO_CURL=YesPlease"
+	fi
+
+	# broken assumptions, because of broken build system ...
+	myopts="${myopts} NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease"
+	myopts="${myopts} INSTALL=install TAR=tar"
+	myopts="${myopts} SHELL_PATH=${EPREFIX}/bin/sh"
+	myopts="${myopts} SANE_TOOL_PATH="
+	myopts="${myopts} OLD_ICONV="
+	myopts="${myopts} NO_EXTERNAL_GREP="
+
+	# can't define this to null, since the entire makefile depends on it
+	sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile
+
+	use iconv \
+		|| einfo "Forcing iconv for ${PVR} due to bugs #321895, #322205."
+	#	|| myopts="${myopts} NO_ICONV=YesPlease"
+	# because, above, we need to do this unconditionally (no "&& use iconv")
+	use !elibc_glibc && myopts="${myopts} NEEDS_LIBICONV=YesPlease"
+
+	use tk \
+		|| myopts="${myopts} NO_TCLTK=YesPlease"
+	use perl \
+		&& myopts="${myopts} INSTALLDIRS=vendor USE_LIBPCRE=yes" \
+		|| myopts="${myopts} NO_PERL=YesPlease"
+	use python \
+		|| myopts="${myopts} NO_PYTHON=YesPlease"
+	use subversion \
+		|| myopts="${myopts} NO_SVN_TESTS=YesPlease"
+	use threads \
+		&& myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease"
+	use cvs \
+		|| myopts="${myopts} NO_CVS=YesPlease"
+# Disabled until ~m68k-mint can be keyworded again
+#	if [[ ${CHOST} == *-mint* ]] ; then
+#		myopts="${myopts} NO_MMAP=YesPlease"
+#		myopts="${myopts} NO_IPV6=YesPlease"
+#		myopts="${myopts} NO_STRLCPY=YesPlease"
+#		myopts="${myopts} NO_MEMMEM=YesPlease"
+#		myopts="${myopts} NO_MKDTEMP=YesPlease"
+#		myopts="${myopts} NO_MKSTEMPS=YesPlease"
+#	fi
+	if [[ ${CHOST} == ia64-*-hpux* ]]; then
+		myopts="${myopts} NO_NSEC=YesPlease"
+	fi
+	if [[ ${CHOST} == *-*-aix* ]]; then
+		myopts="${myopts} NO_FNMATCH_CASEFOLD=YesPlease"
+	fi
+
+	has_version '>=app-text/asciidoc-8.0' \
+		&& myopts="${myopts} ASCIIDOC8=YesPlease"
+	myopts="${myopts} ASCIIDOC_NO_ROFF=YesPlease"
+
+	# Bug 290465:
+	# builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
+	[[ "${CHOST}" == *-uclibc* ]] && \
+		myopts="${myopts} NO_NSEC=YesPlease"
+
+	export MY_MAKEOPTS="${myopts}"
+}
+
+src_unpack() {
+	if [[ ${PV} != *9999 ]]; then
+		unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
+		cd "${S}"
+		unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+		use doc && \
+			cd "${S}"/Documentation && \
+			unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+		cd "${S}"
+	else
+		git-2_src_unpack
+		cd "${S}"
+		#cp "${FILESDIR}"/GIT-VERSION-GEN .
+	fi
+
+}
+
+src_prepare() {
+	# Noperl is being merged to upstream as of 2009/04/05
+	#epatch "${FILESDIR}"/20090305-git-1.6.2-noperl.patch
+
+	# GetOpt-Long v2.38 is strict
+	# Merged in 1.6.3 final 2009/05/07
+	#epatch "${FILESDIR}"/20090505-git-1.6.2.5-getopt-fixes.patch
+
+	# JS install fixup
+	# Merged in 1.7.5.x
+	#epatch "${FILESDIR}"/git-1.7.2-always-install-js.patch
+
+	# USE=-iconv causes segfaults, fixed post 1.7.1
+	# Gentoo bug #321895
+	#epatch "${FILESDIR}"/git-1.7.1-noiconv-segfault-fix.patch
+
+	# Fix false positives with t3404 due to SHELL=/bin/false for the portage
+	# user.
+	# Merged upstream
+	#epatch "${FILESDIR}"/git-1.7.3.4-avoid-shell-issues.patch
+
+	# bug #350075: t9001: fix missing prereq on some tests
+	# Merged upstream
+	#epatch "${FILESDIR}"/git-1.7.3.4-fix-perl-test-prereq.patch
+
+	# bug #350330 - automagic CVS when we don't want it is bad.
+	epatch "${FILESDIR}"/git-1.7.3.5-optional-cvs.patch
+
+	sed -i \
+		-e 's:^\(CFLAGS =\).*$:\1 $(OPTCFLAGS) -Wall:' \
+		-e 's:^\(LDFLAGS =\).*$:\1 $(OPTLDFLAGS):' \
+		-e 's:^\(CC = \).*$:\1$(OPTCC):' \
+		-e 's:^\(AR = \).*$:\1$(OPTAR):' \
+		-e "s:\(PYTHON_PATH = \)\(.*\)$:\1${EPREFIX}\2:" \
+		-e "s:\(PERL_PATH = \)\(.*\)$:\1${EPREFIX}\2:" \
+		Makefile || die "sed failed"
+
+	# Never install the private copy of Error.pm (bug #296310)
+	sed -i \
+		-e '/private-Error.pm/s,^,#,' \
+		perl/Makefile.PL
+
+	# Fix docbook2texi command
+	sed -i 's/DOCBOOK2X_TEXI=docbook2x-texi/DOCBOOK2X_TEXI=docbook2texi.pl/' \
+		Documentation/Makefile || die "sed failed"
+
+	# bug #318289
+	# Merged upstream
+	#epatch "${FILESDIR}"/git-1.7.3.2-interix.patch
+
+	# merged upstream
+	#epatch "${FILESDIR}"/git-1.7.5-interix.patch
+
+	# merged upstream
+	#epatch "${FILESDIR}"/git-1.7.6-interix.patch
+}
+
+git_emake() {
+	# bug #326625: PERL_PATH, PERL_MM_OPT
+	# bug #320647: PYTHON_PATH
+	PYTHON_PATH=""
+	use python && PYTHON_PATH="$(PYTHON -a)"
+	emake ${MY_MAKEOPTS} \
+		DESTDIR="${D}" \
+		OPTCFLAGS="${CFLAGS}" \
+		OPTLDFLAGS="${LDFLAGS}" \
+		OPTCC="$(tc-getCC)" \
+		OPTAR="$(tc-getAR)" \
+		prefix="${EPREFIX}"/usr \
+		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
+		sysconfdir="${EPREFIX}"/etc \
+		PYTHON_PATH="${PYTHON_PATH}" \
+		PERL_MM_OPT="" \
+		GIT_TEST_OPTS="--no-color" \
+		"$@"
+	# This is the fix for bug #326625, but it also causes breakage, see bug
+	# #352693.
+	# PERL_PATH="${EPREFIX}/usr/bin/env perl" \
+}
+
+src_configure() {
+	exportmakeopts
+}
+
+src_compile() {
+	git_emake || die "emake failed"
+
+	if use emacs ; then
+		elisp-compile contrib/emacs/git{,-blame}.el \
+			|| die "emacs modules failed"
+	fi
+
+	if use perl && use cgi ; then
+		git_emake \
+			gitweb/gitweb.cgi \
+			|| die "emake gitweb/gitweb.cgi failed"
+	fi
+
+	cd "${S}"/Documentation
+	if [[ ${PV} == *9999 ]] ; then
+		git_emake man \
+			|| die "emake man failed"
+		if use doc ; then
+			git_emake info html \
+				|| die "emake info html failed"
+		fi
+	else
+		if use doc ; then
+			git_emake info \
+				|| die "emake info html failed"
+		fi
+	fi
+}
+
+src_install() {
+	git_emake \
+		install || \
+		die "make install failed"
+
+	# Depending on the tarball and manual rebuild of the documentation, the
+	# manpages may exist in either OR both of these directories.
+	find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
+	find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
+
+	dodoc README Documentation/{SubmittingPatches,CodingGuidelines}
+	use doc && dodir /usr/share/doc/${PF}/html
+	for d in / /howto/ /technical/ ; do
+		docinto ${d}
+		dodoc Documentation${d}*.txt
+		use doc && dohtml -p ${d} Documentation${d}*.html
+	done
+	docinto /
+	# Upstream does not ship this pre-built :-(
+	use doc && doinfo Documentation/{git,gitman}.info
+
+	newbashcomp contrib/completion/git-completion.bash ${PN}
+
+	if use emacs ; then
+		elisp-install ${PN} contrib/emacs/git.{el,elc} || die
+		elisp-install ${PN} contrib/emacs/git-blame.{el,elc} || die
+		#elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc} || die
+		# don't add automatically to the load-path, so the sitefile
+		# can do a conditional loading
+		touch "${ED}${SITELISP}/${PN}/compat/.nosearch"
+		elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die
+	fi
+
+	if use python && use gtk ; then
+		dobin "${S}"/contrib/gitview/gitview
+		python_convert_shebangs ${PYTHON_ABI} "${ED}"/usr/bin/gitview
+		dodoc "${S}"/contrib/gitview/gitview.txt
+	fi
+
+	dobin contrib/fast-import/git-p4
+	dodoc contrib/fast-import/git-p4.txt
+	newbin contrib/fast-import/import-tars.perl import-tars
+	newbin contrib/git-resurrect.sh git-resurrect
+
+	dodir /usr/share/${PN}/contrib
+	# The following are excluded:
+	# completion - installed above
+	# emacs - installed above
+	# examples - these are stuff that is not used in Git anymore actually
+	# gitview - installed above
+	# p4import - excluded because fast-import has a better one
+	# patches - stuff the Git guys made to go upstream to other places
+	# svnimport - use git-svn
+	# thunderbird-patch-inline - fixes thunderbird
+	for i in \
+		blameview buildsystems ciabot continuous convert-objects fast-import \
+		hg-to-git hooks remotes2config.sh remotes2config.sh rerere-train.sh \
+		stats svn-fe vim workdir \
+		; do
+		cp -rf \
+			"${S}"/contrib/${i} \
+			"${ED}"/usr/share/${PN}/contrib \
+			|| die "Failed contrib ${i}"
+	done
+
+	if use perl && use cgi ; then
+		# We used to install in /usr/share/${PN}/gitweb
+		# but upstream installs in /usr/share/gitweb
+		# so we will install a symlink and use their location for compat with other
+		# distros
+		dosym /usr/share/gitweb /usr/share/${PN}/gitweb
+
+		# INSTALL discusses configuration issues, not just installation
+		docinto /
+		newdoc  "${S}"/gitweb/INSTALL INSTALL.gitweb
+		newdoc  "${S}"/gitweb/README README.gitweb
+
+		find "${ED}"/usr/lib64/perl5/ \
+			-name .packlist \
+			-exec rm \{\} \;
+	else
+		rm -rf "${ED}"/usr/share/gitweb
+	fi
+
+	if ! use subversion ; then
+		rm -f "${ED}"/usr/libexec/git-core/git-svn \
+			"${ED}"/usr/share/man/man1/git-svn.1*
+	fi
+
+	if use xinetd ; then
+		insinto /etc/xinetd.d
+		newins "${FILESDIR}"/git-daemon.xinetd git-daemon
+	fi
+
+	newinitd "${FILESDIR}"/git-daemon.initd git-daemon
+	newconfd "${FILESDIR}"/git-daemon.confd git-daemon
+
+	fixlocalpod
+}
+
+src_test() {
+	local disabled=""
+	local tests_cvs="t9200-git-cvsexportcommit.sh \
+					t9400-git-cvsserver-server.sh \
+					t9401-git-cvsserver-crlf.sh \
+					t9600-cvsimport.sh \
+					t9601-cvsimport-vendor-branch.sh \
+					t9602-cvsimport-branches-tags.sh \
+					t9603-cvsimport-patchsets.sh"
+	local tests_perl="t5502-quickfetch.sh \
+					t5512-ls-remote.sh \
+					t5520-pull.sh"
+	# Bug #225601 - t0004 is not suitable for root perm
+	# Bug #219839 - t1004 is not suitable for root perm
+	# t0001-init.sh - check for init notices EPERM*  fails
+	local tests_nonroot="t0001-init.sh \
+		t0004-unwritable.sh \
+		t0070-fundamental.sh \
+		t1004-read-tree-m-u-wf.sh \
+		t3700-add.sh \
+		t7300-clean.sh"
+
+	# Unzip is used only for the testcase code, not by any normal parts of Git.
+	if ! has_version app-arch/unzip ; then
+		einfo "Disabling tar-tree tests"
+		disabled="${disabled} t5000-tar-tree.sh"
+	fi
+
+	cvs=0
+	use cvs && let cvs=$cvs+1
+	if [[ ${EUID} -eq 0 ]]; then
+		if [[ $cvs -eq 1 ]]; then
+			ewarn "Skipping CVS tests because CVS does not work as root!"
+			ewarn "You should retest with FEATURES=userpriv!"
+			disabled="${disabled} ${tests_cvs}"
+		fi
+		einfo "Skipping other tests that require being non-root"
+		disabled="${disabled} ${tests_nonroot}"
+	else
+		[[ $cvs -gt 0 ]] && \
+			has_version dev-vcs/cvs && \
+			let cvs=$cvs+1
+		[[ $cvs -gt 1 ]] && \
+			built_with_use dev-vcs/cvs server && \
+			let cvs=$cvs+1
+		if [[ $cvs -lt 3 ]]; then
+			einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
+			disabled="${disabled} ${tests_cvs}"
+		fi
+	fi
+
+	if ! use perl ; then
+		einfo "Disabling tests that need Perl"
+		disabled="${disabled} ${tests_perl}"
+	fi
+
+	# Reset all previously disabled tests
+	cd "${S}/t"
+	for i in *.sh.DISABLED ; do
+		[[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
+	done
+	einfo "Disabled tests:"
+	for i in ${disabled} ; do
+		[[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i"
+	done
+
+	# Avoid the test system removing the results because we want them ourselves
+	sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \
+		-i "${S}"/t/Makefile
+
+	# Clean old results first
+	cd "${S}/t"
+	git_emake clean
+
+	# Now run the tests
+	cd "${S}"
+	einfo "Start test run"
+	git_emake test
+	rc=$?
+
+	# Display nice results
+	cd "${S}/t"
+	git_emake aggregate-results
+
+	# And exit
+	[ $rc -eq 0 ] || die "tests failed. Please file a bug."
+}
+
+showpkgdeps() {
+	local pkg=$1
+	shift
+	elog "  $(printf "%-17s:" ${pkg}) ${@}"
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+	use python && python_mod_optimize git_remote_helpers
+		einfo "Please read /usr/share/bash-completion/git for Git bash completion"
+	elog "These additional scripts need some dependencies:"
+	echo
+	showpkgdeps git-quiltimport "dev-util/quilt"
+	showpkgdeps git-instaweb \
+		"|| ( www-servers/lighttpd www-servers/apache )"
+	echo
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+	use python && python_mod_cleanup git_remote_helpers
+}
diff --git a/eclass/mozconfig-3.eclass b/eclass/mozconfig-3.eclass
index 721d2c1267f9..8e953cd39a33 100644
--- a/eclass/mozconfig-3.eclass
+++ b/eclass/mozconfig-3.eclass
@@ -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/eclass/mozconfig-3.eclass,v 1.27 2012/02/06 13:13:44 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mozconfig-3.eclass,v 1.28 2012/02/28 03:49:41 anarchy Exp $
 #
 # mozconfig.eclass: the new mozilla.eclass
 
@@ -36,6 +36,9 @@ mozconfig_config() {
 
 	if has bindist ${IUSE}; then
 		mozconfig_use_enable !bindist official-branding
+		if [[ ${PN} == firefox ]] ; then
+			mozconfig_annotate '' --with-branding=browser/branding/aurora
+		fi
 	fi
 
 	mozconfig_use_enable alsa ogg
diff --git a/games-server/cyphesis/cyphesis-0.5.26.ebuild b/games-server/cyphesis/cyphesis-0.5.26.ebuild
index 886b755c50b4..8610720abb15 100644
--- a/games-server/cyphesis/cyphesis-0.5.26.ebuild
+++ b/games-server/cyphesis/cyphesis-0.5.26.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-server/cyphesis/cyphesis-0.5.26.ebuild,v 1.1 2012/01/28 21:15:47 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-server/cyphesis/cyphesis-0.5.26.ebuild,v 1.2 2012/02/27 21:15:18 tupone Exp $
 
 EAPI=2
 PYTHON_DEPEND=2
@@ -15,7 +15,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND=">=media-libs/skstream-0.3.6
+RDEPEND=">=media-libs/skstream-0.3.8
 	>=dev-games/wfmath-0.3.11
 	>=dev-games/mercator-0.3.0
 	dev-libs/libgcrypt
diff --git a/kde-misc/networkmanagement/Manifest b/kde-misc/networkmanagement/Manifest
index 015d7a2250b4..5d9364e1dceb 100644
--- a/kde-misc/networkmanagement/Manifest
+++ b/kde-misc/networkmanagement/Manifest
@@ -1,3 +1,2 @@
 DIST knetworkmanager-4.4.0_p20110714.tar.xz 510128 RMD160 95f98b66f8101881d6cd5ebf4ec19d47b67306e8 SHA1 0d42041280cc293f623871155a93086a278963c5 SHA256 921db31423c825d87d931771a8ef3f6c77a47b552dbd9cce084e42a5369f595d
-DIST networkmanagement-0.8.98.tar.bz2 1405946 RMD160 6fed8cd6aeb09c7c7fce9983b81a7dd245186f3f SHA1 f46274c4cca722f37eef7418144c0c04bfe21e24 SHA256 5d8d294bfdcd83016c34ea5af07968ce4bed2a280e08264f31a47b834d02682d
-DIST networkmanagement-0.8.99.tar.bz2 1442748 RMD160 4d4e6239baa06d21c8ac4d531dfb24d8d8e56e25 SHA1 18d625a25b90f9591a5cfdabcf77269eb3ba33e0 SHA256 19c0b59a8505100f08d58302ae2ffeb3e408aade103b70132a618c49147cfc7b
+DIST networkmanagement-0.9.0.tar.bz2 1450716 RMD160 d1edd056d97a973ae0544e9f7a3b65bf09a77935 SHA1 6863905534c2c58534992fad197dd794105b8e19 SHA256 ed5aaff8ed7d52f2541eca27f5bf15792cd97f8e7f8014c0fe9ab8e73f2cab2f
diff --git a/kde-misc/networkmanagement/networkmanagement-0.8.98.ebuild b/kde-misc/networkmanagement/networkmanagement-0.8.98.ebuild
deleted file mode 100644
index 1fb0cc94e369..000000000000
--- a/kde-misc/networkmanagement/networkmanagement-0.8.98.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/kde-misc/networkmanagement/networkmanagement-0.8.98.ebuild,v 1.1 2011/12/22 20:35:51 johu Exp $
-
-EAPI=4
-
-KDE_MINIMAL="4.6"
-KDE_LINGUAS="ar bs ca ca@valencia cs da de el en_GB eo es et fi fr ga gl hr hu
-is it ja km ko lt lv mai ms nb nds nl nn pa pl pt pt_BR ro ru sk sl sq sv th tr
-ug uk wa zh_CN zh_TW"
-
-KDE_SCM="git"
-EGIT_REPONAME="${PN}"
-inherit kde4-base
-
-DESCRIPTION="KDE frontend for NetworkManager"
-HOMEPAGE="http://kde.org/"
-[[ ${PV} = 9999* ]] || SRC_URI="mirror://kde/unstable/${PN}/${PV}/src/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2"
-KEYWORDS="~amd64 ~x86"
-SLOT="4"
-IUSE="consolekit debug"
-
-DEPEND="
-	$(add_kdebase_dep solid)
-	net-misc/mobile-broadband-provider-info
-	>=net-misc/networkmanager-0.9.0
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	kde4-base_src_prepare
-
-	if ! use consolekit; then
-		# Fix dbus policy
-		sed -i \
-			-e 's/at_console=".*"/group="plugdev"/' \
-			"${S}/NetworkManager-kde4.conf" \
-			|| die "Fixing dbus policy failed"
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DDBUS_SYSTEM_POLICY_DIR=/etc/dbus-1/system.d
-	)
-
-	kde4-base_src_configure
-}
diff --git a/kde-misc/networkmanagement/networkmanagement-0.8.99.ebuild b/kde-misc/networkmanagement/networkmanagement-0.9.0.ebuild
similarity index 92%
rename from kde-misc/networkmanagement/networkmanagement-0.8.99.ebuild
rename to kde-misc/networkmanagement/networkmanagement-0.9.0.ebuild
index 6e44e1f55c01..1b7cf3f9fab0 100644
--- a/kde-misc/networkmanagement/networkmanagement-0.8.99.ebuild
+++ b/kde-misc/networkmanagement/networkmanagement-0.9.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/networkmanagement/networkmanagement-0.8.99.ebuild,v 1.2 2012/02/16 22:22:13 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/networkmanagement/networkmanagement-0.9.0.ebuild,v 1.1 2012/02/27 18:42:38 johu Exp $
 
 EAPI=4
 
diff --git a/mail-filter/bmf/bmf-0.9.4-r2.ebuild b/mail-filter/bmf/bmf-0.9.4-r2.ebuild
index a01b0cb11f07..6f7ca733c622 100644
--- a/mail-filter/bmf/bmf-0.9.4-r2.ebuild
+++ b/mail-filter/bmf/bmf-0.9.4-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/bmf/bmf-0.9.4-r2.ebuild,v 1.1 2012/02/24 11:05:04 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/bmf/bmf-0.9.4-r2.ebuild,v 1.2 2012/02/27 19:05:27 eras Exp $
 
 EAPI=4
 inherit toolchain-funcs eutils
@@ -35,7 +35,7 @@ src_configure() {
 	# this is not an autotools script
 	./configure \
 		$(use_with mysql) \
-		$(use_with berkdb libdb)
+		$(use_with berkdb libdb) || die
 }
 
 src_compile() {
diff --git a/mail-filter/imapfilter/Manifest b/mail-filter/imapfilter/Manifest
index e571b053f201..5f905a29a37f 100644
--- a/mail-filter/imapfilter/Manifest
+++ b/mail-filter/imapfilter/Manifest
@@ -1,3 +1,4 @@
 DIST imapfilter-2.2.2.tar.bz2 45670 RMD160 c80dfa41af55fd7968f0c018825af4c6ba385397 SHA1 f201d166f5a483a2d8117bf2cbd0678b94e4753d SHA256 b3d56edc443d46ac711c44f286bfd3649483f686155faaa016dfa1f5a576c1f9
 DIST imapfilter-2.4.2.tar.gz 55284 RMD160 fbe36f3b9fa5065b250ba838967cba350882144c SHA1 9e7031ad8d7d83c268140f73caf92add0e2363c4 SHA256 470a712b52f9937e71c0269d48bc7773b3d7a532c5693881a9eec56da8742e44
+DIST imapfilter-2.5.1.tar.gz 52351 RMD160 b8b674d4e8b120f386dc2acc5bbeffcb3c6a0fad SHA1 518b8c6187ef4f992fb4ad68c9f4b71bacf5c4cf SHA256 f78d541ec2d65aee99d69d27b5ae9a72716e194caabee24bf13a0d994e81f47b
 DIST imapfilter-2.5.tar.gz 51896 RMD160 5bdbbc4a77e06134af4a3d9be7a32597019a4e65 SHA1 8c8b87aaa46abe3a35a89c591a899a94a44de82d SHA256 38a5dd5860f1e1d3f5e1fe67c0f1f232b8078a070f38499549d7b2859d10daf7
diff --git a/mail-filter/imapfilter/imapfilter-2.5.1.ebuild b/mail-filter/imapfilter/imapfilter-2.5.1.ebuild
new file mode 100644
index 000000000000..cae5d394d227
--- /dev/null
+++ b/mail-filter/imapfilter/imapfilter-2.5.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/imapfilter/imapfilter-2.5.1.ebuild,v 1.1 2012/02/28 02:27:15 radhermit Exp $
+
+EAPI=4
+
+inherit toolchain-funcs
+
+DESCRIPTION="An IMAP mail filtering utility"
+HOMEPAGE="http://imapfilter.hellug.gr"
+SRC_URI="https://github.com/downloads/lefcha/imapfilter/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="dev-libs/openssl
+	dev-libs/libpcre
+	>=dev-lang/lua-5.1"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	sed -i -e "/^PREFIX/s:/local::" \
+		-e "/^MANDIR/s:man:share/man:" \
+		-e "/^CFLAGS/s:CFLAGS =:CFLAGS +=:" \
+		-e "/^CFLAGS/s/-O//" \
+		src/Makefile || die
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS NEWS README samples/*
+	doman doc/imapfilter.1 doc/imapfilter_config.5
+}
diff --git a/mail-mta/exim/files/exim.rc7 b/mail-mta/exim/files/exim.rc7
index 52349a618869..399de1d021d1 100644
--- a/mail-mta/exim/files/exim.rc7
+++ b/mail-mta/exim/files/exim.rc7
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/files/exim.rc7,v 1.3 2011/12/04 10:03:10 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/files/exim.rc7,v 1.4 2012/02/28 04:03:55 idl0r Exp $
 
 extra_started_commands="reload"
 
@@ -13,13 +13,13 @@ depend() {
 
 start() {
 	ebegin "Starting ${SVCNAME}"
-	start-stop-daemon --start --quiet --exec /usr/sbin/exim --pidfile /var/run/${SVCNAME}.pid -- -C /etc/exim/${SVCNAME}.conf ${EXIM_OPTS:--bd -q15m}
+	start-stop-daemon --start --exec /usr/sbin/exim --pidfile /var/run/${SVCNAME}.pid -- -C /etc/exim/${SVCNAME}.conf ${EXIM_OPTS:--bd -q15m}
 	eend $?
 }
 
 stop() {
 	ebegin "Stopping ${SVCNAME}"
-	start-stop-daemon --stop --quiet --pidfile /var/run/${SVCNAME}.pid --name exim
+	start-stop-daemon --stop --pidfile /var/run/${SVCNAME}.pid --name exim
 	eend $?
 }
 
diff --git a/mail-mta/nullmailer/nullmailer-1.05.ebuild b/mail-mta/nullmailer/nullmailer-1.05.ebuild
index 76520fc99bc0..e00a29d028a6 100644
--- a/mail-mta/nullmailer/nullmailer-1.05.ebuild
+++ b/mail-mta/nullmailer/nullmailer-1.05.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/nullmailer/nullmailer-1.05.ebuild,v 1.2 2012/02/24 11:00:28 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/nullmailer/nullmailer-1.05.ebuild,v 1.3 2012/02/27 21:57:27 ranger Exp $
 
 inherit eutils flag-o-matic autotools
 
@@ -18,7 +18,7 @@ HOMEPAGE="http://untroubled.org/nullmailer/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc ~x86"
 
 IUSE=""
 
diff --git a/media-libs/gd/gd-2.0.35-r3.ebuild b/media-libs/gd/gd-2.0.35-r3.ebuild
index fa2f41b59b66..6a6ecadf99ed 100644
--- a/media-libs/gd/gd-2.0.35-r3.ebuild
+++ b/media-libs/gd/gd-2.0.35-r3.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-libs/gd/gd-2.0.35-r3.ebuild,v 1.12 2011/12/15 17:08:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gd/gd-2.0.35-r3.ebuild,v 1.13 2012/02/27 20:17:14 vapier Exp $
 
 EAPI="2"
 
@@ -21,7 +21,8 @@ RDEPEND="fontconfig? ( media-libs/fontconfig )
 	truetype? ( >=media-libs/freetype-2.1.5 )
 	xpm? ( x11-libs/libXpm x11-libs/libXt )
 	zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-libpng14.patch #305101
diff --git a/media-libs/libcdr/libcdr-9999.ebuild b/media-libs/libcdr/libcdr-9999.ebuild
index 23711df14a2d..ab4f00358555 100644
--- a/media-libs/libcdr/libcdr-9999.ebuild
+++ b/media-libs/libcdr/libcdr-9999.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-libs/libcdr/libcdr-9999.ebuild,v 1.1 2011/12/11 12:32:20 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libcdr/libcdr-9999.ebuild,v 1.3 2012/02/27 21:42:16 scarabeus Exp $
 
 EAPI=4
 
@@ -19,9 +19,12 @@ SLOT="0"
 IUSE="doc static-libs"
 
 RDEPEND="
+	app-text/libwpd:0.9
+	app-text/libwpg:0.2
+	media-libs/lcms:2
 	sys-libs/zlib
 "
-DEPEND="${DEPEND}
+DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	sys-devel/libtool
 	doc? ( app-doc/doxygen )
diff --git a/metadata/cache/app-arch/libpar2-0.2-r3 b/metadata/cache/app-arch/libpar2-0.2-r3
index 9f70c4310566..581d7a1e0e43 100644
--- a/metadata/cache/app-arch/libpar2-0.2-r3
+++ b/metadata/cache/app-arch/libpar2-0.2-r3
@@ -6,7 +6,7 @@ mirror://sourceforge/parchive/libpar2-0.2.tar.gz
 http://parchive.sourceforge.net/
 GPL-2
 A library for par2, extracted from par2cmdline
-~alpha amd64 ~ppc x86
+~alpha amd64 ppc x86
 autotools autotools-utils eutils libtool multilib portability toolchain-funcs user
 static-libs
 
diff --git a/metadata/cache/app-editors/emacs-vcs-24.0.94 b/metadata/cache/app-editors/emacs-vcs-24.0.94
new file mode 100644
index 000000000000..ad5cedfa903d
--- /dev/null
+++ b/metadata/cache/app-editors/emacs-vcs-24.0.94
@@ -0,0 +1,22 @@
+sys-libs/ncurses >=app-admin/eselect-emacs-1.2 net-libs/liblockfile hesiod? ( net-dns/hesiod ) kerberos? ( virtual/krb5 ) alsa? ( media-libs/alsa-lib ) gpm? ( sys-libs/gpm ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) selinux? ( sys-libs/libselinux ) X? ( x11-libs/libXmu x11-libs/libXt x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib ) jpeg? ( virtual/jpeg ) png? ( >=media-libs/libpng-1.4:0 ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2 ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ) !gtk? ( Xaw3d? ( x11-libs/libXaw3d ) !Xaw3d? ( athena? ( x11-libs/libXaw ) !athena? ( motif? ( >=x11-libs/openmotif-2.3:0 ) ) ) ) ) alsa? ( dev-util/pkgconfig ) dbus? ( dev-util/pkgconfig ) gnutls? ( dev-util/pkgconfig ) libxml2? ( dev-util/pkgconfig ) X? ( dev-util/pkgconfig ) gzip-el? ( app-arch/gzip ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sys-libs/ncurses >=app-admin/eselect-emacs-1.2 net-libs/liblockfile hesiod? ( net-dns/hesiod ) kerberos? ( virtual/krb5 ) alsa? ( media-libs/alsa-lib ) gpm? ( sys-libs/gpm ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) selinux? ( sys-libs/libselinux ) X? ( x11-libs/libXmu x11-libs/libXt x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib ) jpeg? ( virtual/jpeg ) png? ( >=media-libs/libpng-1.4:0 ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2 ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ) !gtk? ( Xaw3d? ( x11-libs/libXaw3d ) !Xaw3d? ( athena? ( x11-libs/libXaw ) !athena? ( motif? ( >=x11-libs/openmotif-2.3:0 ) ) ) ) ) >=app-emacs/emacs-common-gentoo-1.3[X?]
+24
+mirror://gentoo/emacs-24.0.94.tar.gz ftp://alpha.gnu.org/gnu/emacs/pretest/emacs-24.0.94.tar.gz
+
+http://www.gnu.org/software/emacs/
+GPL-3 FDL-1.3 BSD as-is MIT W3C unicode PSF-2
+The extensible, customizable, self-documenting real-time display editor
+~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+autotools elisp-common eutils flag-o-matic libtool multilib portability toolchain-funcs user
+alsa aqua athena dbus gconf gif gnutls gpm gsettings gtk gtk3 gzip-el hesiod imagemagick jpeg kerberos libxml2 m17n-lib motif png selinux sound source svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm
+aqua? ( !X )
+
+
+4
+
+compile configure install postinst postrm preinst prepare
+
+
+
+
+
diff --git a/metadata/cache/app-emulation/wine-1.2 b/metadata/cache/app-emulation/wine-1.2
index 02c7dbbefade..7034864ef6cd 100644
--- a/metadata/cache/app-emulation/wine-1.2
+++ b/metadata/cache/app-emulation/wine-1.2
@@ -1,4 +1,4 @@
-truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) jack? ( media-sound/jack-audio-connection-kit ) openal? ( media-libs/openal ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) nas? ( media-libs/nas ) cups? ( net-print/cups ) opengl? ( virtual/opengl ) pulseaudio? ( media-sound/pulseaudio ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1[pulseaudio?] ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite ) pulseaudio? ( || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) !hardened? ( sys-devel/prelink ) virtual/yacc sys-devel/flex
+truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) jack? ( media-sound/jack-audio-connection-kit ) openal? ( media-libs/openal ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) nas? ( media-libs/nas ) cups? ( net-print/cups ) opengl? ( virtual/opengl ) pulseaudio? ( media-sound/pulseaudio ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1[pulseaudio?] ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite ) pulseaudio? ( || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.68 sys-devel/libtool ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) !hardened? ( sys-devel/prelink ) dev-util/pkgconfig virtual/yacc sys-devel/flex
 truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) jack? ( media-sound/jack-audio-connection-kit ) openal? ( media-libs/openal ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) nas? ( media-libs/nas ) cups? ( net-print/cups ) opengl? ( virtual/opengl ) pulseaudio? ( media-sound/pulseaudio ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1[pulseaudio?] ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite )
 0
 mirror://sourceforge/wine/wine-1.2.tar.bz2 gecko? ( mirror://sourceforge/wine/wine_gecko-1.0.0-x86.cab ) pulseaudio? ( http://art.ified.ca/downloads/winepulse/winepulse-0.36.patch http://art.ified.ca/downloads/winepulse/winepulse-0.35-configure.ac.patch http://art.ified.ca/downloads/winepulse/winepulse-0.38-winecfg.patch )
diff --git a/metadata/cache/app-emulation/wine-1.2.1 b/metadata/cache/app-emulation/wine-1.2.1
index 089b8b496b51..81008bbb6f03 100644
--- a/metadata/cache/app-emulation/wine-1.2.1
+++ b/metadata/cache/app-emulation/wine-1.2.1
@@ -1,4 +1,4 @@
-truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) jack? ( media-sound/jack-audio-connection-kit ) openal? ( media-libs/openal ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) nas? ( media-libs/nas ) cups? ( net-print/cups ) opengl? ( virtual/opengl ) pulseaudio? ( media-sound/pulseaudio ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1[pulseaudio?] ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1[pulseaudio?] ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite ) pulseaudio? ( || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) !hardened? ( sys-devel/prelink ) virtual/yacc sys-devel/flex
+truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) jack? ( media-sound/jack-audio-connection-kit ) openal? ( media-libs/openal ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) nas? ( media-libs/nas ) cups? ( net-print/cups ) opengl? ( virtual/opengl ) pulseaudio? ( media-sound/pulseaudio ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1[pulseaudio?] ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1[pulseaudio?] ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite ) pulseaudio? ( || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.68 sys-devel/libtool ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) !hardened? ( sys-devel/prelink ) dev-util/pkgconfig virtual/yacc sys-devel/flex
 truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) jack? ( media-sound/jack-audio-connection-kit ) openal? ( media-libs/openal ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) nas? ( media-libs/nas ) cups? ( net-print/cups ) opengl? ( virtual/opengl ) pulseaudio? ( media-sound/pulseaudio ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1[pulseaudio?] ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1[pulseaudio?] ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite )
 0
 mirror://sourceforge/wine/wine-1.2.1.tar.bz2 gecko? ( mirror://sourceforge/wine/wine_gecko-1.0.0-x86.cab )
diff --git a/metadata/cache/app-emulation/wine-1.2.2 b/metadata/cache/app-emulation/wine-1.2.2
index 52e102dac551..50b39ebcd5ea 100644
--- a/metadata/cache/app-emulation/wine-1.2.2
+++ b/metadata/cache/app-emulation/wine-1.2.2
@@ -1,4 +1,4 @@
-truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) jack? ( media-sound/jack-audio-connection-kit ) openal? ( media-libs/openal ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) nas? ( media-libs/nas ) cups? ( net-print/cups ) opengl? ( virtual/opengl ) pulseaudio? ( media-sound/pulseaudio ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1[pulseaudio?] ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1[pulseaudio?] ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite ) pulseaudio? ( || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) !hardened? ( sys-devel/prelink ) virtual/yacc sys-devel/flex
+truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) jack? ( media-sound/jack-audio-connection-kit ) openal? ( media-libs/openal ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) nas? ( media-libs/nas ) cups? ( net-print/cups ) opengl? ( virtual/opengl ) pulseaudio? ( media-sound/pulseaudio ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1[pulseaudio?] ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1[pulseaudio?] ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite ) pulseaudio? ( || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.68 sys-devel/libtool ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) !hardened? ( sys-devel/prelink ) dev-util/pkgconfig virtual/yacc sys-devel/flex
 truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) jack? ( media-sound/jack-audio-connection-kit ) openal? ( media-libs/openal ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) nas? ( media-libs/nas ) cups? ( net-print/cups ) opengl? ( virtual/opengl ) pulseaudio? ( media-sound/pulseaudio ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1[pulseaudio?] ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1[pulseaudio?] ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite )
 0
 mirror://sourceforge/wine/wine-1.2.2.tar.bz2 gecko? ( mirror://sourceforge/wine/wine_gecko-1.0.0-x86.cab ) pulseaudio? ( http://art.ified.ca/downloads/winepulse/winepulse-0.36.patch http://art.ified.ca/downloads/winepulse/winepulse-0.35-configure.ac.patch http://art.ified.ca/downloads/winepulse/winepulse-0.38-winecfg.patch )
diff --git a/metadata/cache/app-emulation/wine-1.2.3 b/metadata/cache/app-emulation/wine-1.2.3
index ce29fdf39990..6e6124b2cebc 100644
--- a/metadata/cache/app-emulation/wine-1.2.3
+++ b/metadata/cache/app-emulation/wine-1.2.3
@@ -1,4 +1,4 @@
-truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) jack? ( media-sound/jack-audio-connection-kit ) openal? ( media-libs/openal ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) nas? ( media-libs/nas ) cups? ( net-print/cups ) opengl? ( virtual/opengl ) pulseaudio? ( media-sound/pulseaudio ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1[pulseaudio?] ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1[pulseaudio?] ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite ) pulseaudio? ( || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) !hardened? ( sys-devel/prelink ) virtual/yacc sys-devel/flex
+truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) jack? ( media-sound/jack-audio-connection-kit ) openal? ( media-libs/openal ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) nas? ( media-libs/nas ) cups? ( net-print/cups ) opengl? ( virtual/opengl ) pulseaudio? ( media-sound/pulseaudio ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1[pulseaudio?] ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1[pulseaudio?] ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite ) pulseaudio? ( || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.68 sys-devel/libtool ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) !hardened? ( sys-devel/prelink ) dev-util/pkgconfig virtual/yacc sys-devel/flex
 truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) jack? ( media-sound/jack-audio-connection-kit ) openal? ( media-libs/openal ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) nas? ( media-libs/nas ) cups? ( net-print/cups ) opengl? ( virtual/opengl ) pulseaudio? ( media-sound/pulseaudio ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1[pulseaudio?] ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1[pulseaudio?] ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite )
 0
 mirror://sourceforge/wine/wine-1.2.3.tar.bz2 gecko? ( mirror://sourceforge/wine/wine_gecko-1.0.0-x86.cab ) pulseaudio? ( http://art.ified.ca/downloads/winepulse/winepulse-0.36.patch http://art.ified.ca/downloads/winepulse/winepulse-0.35-configure.ac.patch http://art.ified.ca/downloads/winepulse/winepulse-0.38-winecfg.patch )
diff --git a/metadata/cache/app-emulation/wine-1.3.0 b/metadata/cache/app-emulation/wine-1.3.0
index 59f869344dcf..8c4b7cf4bae4 100644
--- a/metadata/cache/app-emulation/wine-1.3.0
+++ b/metadata/cache/app-emulation/wine-1.3.0
@@ -1,4 +1,4 @@
-truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) jack? ( media-sound/jack-audio-connection-kit ) openal? ( media-libs/openal ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) nas? ( media-libs/nas ) cups? ( net-print/cups ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) !hardened? ( sys-devel/prelink ) virtual/yacc sys-devel/flex
+truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) jack? ( media-sound/jack-audio-connection-kit ) openal? ( media-libs/openal ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) nas? ( media-libs/nas ) cups? ( net-print/cups ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) !hardened? ( sys-devel/prelink ) dev-util/pkgconfig virtual/yacc sys-devel/flex
 truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) jack? ( media-sound/jack-audio-connection-kit ) openal? ( media-libs/openal ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) nas? ( media-libs/nas ) cups? ( net-print/cups ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite )
 0
 mirror://sourceforge/wine/wine-1.3.0.tar.bz2 gecko? ( mirror://sourceforge/wine/wine_gecko-1.0.0-x86.cab )
diff --git a/metadata/cache/app-emulation/wine-1.3.1 b/metadata/cache/app-emulation/wine-1.3.1
index 54ce2fe2c246..bf2de46a5c48 100644
--- a/metadata/cache/app-emulation/wine-1.3.1
+++ b/metadata/cache/app-emulation/wine-1.3.1
@@ -1,4 +1,4 @@
-truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) jack? ( media-sound/jack-audio-connection-kit ) openal? ( media-libs/openal ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) nas? ( media-libs/nas ) cups? ( net-print/cups ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) !hardened? ( sys-devel/prelink ) virtual/yacc sys-devel/flex
+truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) jack? ( media-sound/jack-audio-connection-kit ) openal? ( media-libs/openal ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) nas? ( media-libs/nas ) cups? ( net-print/cups ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) !hardened? ( sys-devel/prelink ) dev-util/pkgconfig virtual/yacc sys-devel/flex
 truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) jack? ( media-sound/jack-audio-connection-kit ) openal? ( media-libs/openal ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) nas? ( media-libs/nas ) cups? ( net-print/cups ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite )
 0
 mirror://sourceforge/wine/wine-1.3.1.tar.bz2 gecko? ( mirror://sourceforge/wine/wine_gecko-1.0.0-x86.cab )
diff --git a/metadata/cache/app-emulation/wine-1.3.10 b/metadata/cache/app-emulation/wine-1.3.10
index b186bb163b43..de88d29dcf06 100644
--- a/metadata/cache/app-emulation/wine-1.3.10
+++ b/metadata/cache/app-emulation/wine-1.3.10
@@ -1,4 +1,4 @@
-truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) jack? ( media-sound/jack-audio-connection-kit ) openal? ( media-libs/openal ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) nas? ( media-libs/nas ) cups? ( net-print/cups ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) !hardened? ( sys-devel/prelink ) virtual/yacc sys-devel/flex
+truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) jack? ( media-sound/jack-audio-connection-kit ) openal? ( media-libs/openal ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) nas? ( media-libs/nas ) cups? ( net-print/cups ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) !hardened? ( sys-devel/prelink ) dev-util/pkgconfig virtual/yacc sys-devel/flex
 truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) jack? ( media-sound/jack-audio-connection-kit ) openal? ( media-libs/openal ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) nas? ( media-libs/nas ) cups? ( net-print/cups ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite )
 0
 mirror://sourceforge/wine/wine-1.3.10.tar.bz2 gecko? ( mirror://sourceforge/wine/wine_gecko-1.1.0-x86.cab win64? ( mirror://sourceforge/wine/wine_gecko-1.1.0-x86_64.cab ) )
diff --git a/metadata/cache/app-emulation/wine-1.3.11 b/metadata/cache/app-emulation/wine-1.3.11
index ac8d07087a78..c8efc4582679 100644
--- a/metadata/cache/app-emulation/wine-1.3.11
+++ b/metadata/cache/app-emulation/wine-1.3.11
@@ -1,4 +1,4 @@
-truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) jack? ( media-sound/jack-audio-connection-kit ) openal? ( media-libs/openal ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) nas? ( media-libs/nas ) cups? ( net-print/cups ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) !hardened? ( sys-devel/prelink ) virtual/yacc sys-devel/flex
+truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) jack? ( media-sound/jack-audio-connection-kit ) openal? ( media-libs/openal ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) nas? ( media-libs/nas ) cups? ( net-print/cups ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) !hardened? ( sys-devel/prelink ) dev-util/pkgconfig virtual/yacc sys-devel/flex
 truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) jack? ( media-sound/jack-audio-connection-kit ) openal? ( media-libs/openal ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) nas? ( media-libs/nas ) cups? ( net-print/cups ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite )
 0
 mirror://sourceforge/wine/wine-1.3.11.tar.bz2 gecko? ( mirror://sourceforge/wine/wine_gecko-1.1.0-x86.cab win64? ( mirror://sourceforge/wine/wine_gecko-1.1.0-x86_64.cab ) )
diff --git a/metadata/cache/app-emulation/wine-1.3.12 b/metadata/cache/app-emulation/wine-1.3.12
index a2a5daeff2c9..5effaa57fa93 100644
--- a/metadata/cache/app-emulation/wine-1.3.12
+++ b/metadata/cache/app-emulation/wine-1.3.12
@@ -1,4 +1,4 @@
-truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) jack? ( media-sound/jack-audio-connection-kit ) openal? ( media-libs/openal ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) nas? ( media-libs/nas ) cups? ( net-print/cups ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) !hardened? ( sys-devel/prelink ) virtual/yacc sys-devel/flex
+truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) jack? ( media-sound/jack-audio-connection-kit ) openal? ( media-libs/openal ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) nas? ( media-libs/nas ) cups? ( net-print/cups ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) !hardened? ( sys-devel/prelink ) dev-util/pkgconfig virtual/yacc sys-devel/flex
 truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) jack? ( media-sound/jack-audio-connection-kit ) openal? ( media-libs/openal ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) nas? ( media-libs/nas ) cups? ( net-print/cups ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite )
 0
 mirror://sourceforge/wine/wine-1.3.12.tar.bz2 gecko? ( mirror://sourceforge/wine/wine_gecko-1.1.0-x86.cab win64? ( mirror://sourceforge/wine/wine_gecko-1.1.0-x86_64.cab ) )
diff --git a/metadata/cache/app-emulation/wine-1.3.13 b/metadata/cache/app-emulation/wine-1.3.13
index 1cf9934a5207..b380dadaf4e3 100644
--- a/metadata/cache/app-emulation/wine-1.3.13
+++ b/metadata/cache/app-emulation/wine-1.3.13
@@ -1,4 +1,4 @@
-truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) jack? ( media-sound/jack-audio-connection-kit ) openal? ( media-libs/openal ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) nas? ( media-libs/nas ) cups? ( net-print/cups ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) !hardened? ( sys-devel/prelink ) virtual/yacc sys-devel/flex
+truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) jack? ( media-sound/jack-audio-connection-kit ) openal? ( media-libs/openal ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) nas? ( media-libs/nas ) cups? ( net-print/cups ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) !hardened? ( sys-devel/prelink ) dev-util/pkgconfig virtual/yacc sys-devel/flex
 truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) jack? ( media-sound/jack-audio-connection-kit ) openal? ( media-libs/openal ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) nas? ( media-libs/nas ) cups? ( net-print/cups ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite )
 0
 mirror://sourceforge/wine/wine-1.3.13.tar.bz2 gecko? ( mirror://sourceforge/wine/wine_gecko-1.1.0-x86.cab win64? ( mirror://sourceforge/wine/wine_gecko-1.1.0-x86_64.cab ) )
diff --git a/metadata/cache/app-emulation/wine-1.3.14 b/metadata/cache/app-emulation/wine-1.3.14
index e353e4337464..4e6c485d63ed 100644
--- a/metadata/cache/app-emulation/wine-1.3.14
+++ b/metadata/cache/app-emulation/wine-1.3.14
@@ -1,4 +1,4 @@
-truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) jack? ( media-sound/jack-audio-connection-kit ) openal? ( media-libs/openal ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) nas? ( media-libs/nas ) cups? ( net-print/cups ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) !hardened? ( sys-devel/prelink ) virtual/yacc sys-devel/flex
+truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) jack? ( media-sound/jack-audio-connection-kit ) openal? ( media-libs/openal ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) nas? ( media-libs/nas ) cups? ( net-print/cups ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) !hardened? ( sys-devel/prelink ) dev-util/pkgconfig virtual/yacc sys-devel/flex
 truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) jack? ( media-sound/jack-audio-connection-kit ) openal? ( media-libs/openal ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) nas? ( media-libs/nas ) cups? ( net-print/cups ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite )
 0
 mirror://sourceforge/wine/wine-1.3.14.tar.bz2 gecko? ( mirror://sourceforge/wine/wine_gecko-1.1.0-x86.cab win64? ( mirror://sourceforge/wine/wine_gecko-1.1.0-x86_64.cab ) )
diff --git a/metadata/cache/app-emulation/wine-1.3.15 b/metadata/cache/app-emulation/wine-1.3.15
index b489c873cceb..f7825f26fcdd 100644
--- a/metadata/cache/app-emulation/wine-1.3.15
+++ b/metadata/cache/app-emulation/wine-1.3.15
@@ -1,4 +1,4 @@
-truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) jack? ( media-sound/jack-audio-connection-kit ) openal? ( media-libs/openal ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) nas? ( media-libs/nas ) cups? ( net-print/cups ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) !hardened? ( sys-devel/prelink ) virtual/yacc sys-devel/flex
+truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) jack? ( media-sound/jack-audio-connection-kit ) openal? ( media-libs/openal ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) nas? ( media-libs/nas ) cups? ( net-print/cups ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) !hardened? ( sys-devel/prelink ) dev-util/pkgconfig virtual/yacc sys-devel/flex
 truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) jack? ( media-sound/jack-audio-connection-kit ) openal? ( media-libs/openal ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) nas? ( media-libs/nas ) cups? ( net-print/cups ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite )
 0
 mirror://sourceforge/wine/wine-1.3.15.tar.bz2 gecko? ( mirror://sourceforge/wine/wine_gecko-1.1.0-x86.cab win64? ( mirror://sourceforge/wine/wine_gecko-1.1.0-x86_64.cab ) )
diff --git a/metadata/cache/app-emulation/wine-1.3.16 b/metadata/cache/app-emulation/wine-1.3.16
index 85868210a061..8e926a938802 100644
--- a/metadata/cache/app-emulation/wine-1.3.16
+++ b/metadata/cache/app-emulation/wine-1.3.16
@@ -1,4 +1,4 @@
-truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) jack? ( media-sound/jack-audio-connection-kit ) openal? ( media-libs/openal ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) nas? ( media-libs/nas ) cups? ( net-print/cups ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) !hardened? ( sys-devel/prelink ) virtual/yacc sys-devel/flex
+truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) jack? ( media-sound/jack-audio-connection-kit ) openal? ( media-libs/openal ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) nas? ( media-libs/nas ) cups? ( net-print/cups ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) !hardened? ( sys-devel/prelink ) dev-util/pkgconfig virtual/yacc sys-devel/flex
 truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) jack? ( media-sound/jack-audio-connection-kit ) openal? ( media-libs/openal ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) nas? ( media-libs/nas ) cups? ( net-print/cups ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite )
 0
 mirror://sourceforge/wine/wine-1.3.16.tar.bz2 gecko? ( mirror://sourceforge/wine/wine_gecko-1.2.0-x86.msi win64? ( mirror://sourceforge/wine/wine_gecko-1.2.0-x86_64.msi ) )
diff --git a/metadata/cache/app-emulation/wine-1.3.17 b/metadata/cache/app-emulation/wine-1.3.17
index 23cd18b80cef..932274d20989 100644
--- a/metadata/cache/app-emulation/wine-1.3.17
+++ b/metadata/cache/app-emulation/wine-1.3.17
@@ -1,4 +1,4 @@
-truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) jack? ( media-sound/jack-audio-connection-kit ) openal? ( media-libs/openal ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) nas? ( media-libs/nas ) cups? ( net-print/cups ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) !hardened? ( sys-devel/prelink ) virtual/yacc sys-devel/flex
+truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) jack? ( media-sound/jack-audio-connection-kit ) openal? ( media-libs/openal ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) nas? ( media-libs/nas ) cups? ( net-print/cups ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) !hardened? ( sys-devel/prelink ) dev-util/pkgconfig virtual/yacc sys-devel/flex
 truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) jack? ( media-sound/jack-audio-connection-kit ) openal? ( media-libs/openal ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) nas? ( media-libs/nas ) cups? ( net-print/cups ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite )
 0
 mirror://sourceforge/wine/wine-1.3.17.tar.bz2 gecko? ( mirror://sourceforge/wine/wine_gecko-1.2.0-x86.msi win64? ( mirror://sourceforge/wine/wine_gecko-1.2.0-x86_64.msi ) )
diff --git a/metadata/cache/app-emulation/wine-1.3.18 b/metadata/cache/app-emulation/wine-1.3.18
index 410e6db5c925..4b57cbc464f1 100644
--- a/metadata/cache/app-emulation/wine-1.3.18
+++ b/metadata/cache/app-emulation/wine-1.3.18
@@ -1,4 +1,4 @@
-truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) jack? ( media-sound/jack-audio-connection-kit ) openal? ( media-libs/openal ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) nas? ( media-libs/nas ) cups? ( net-print/cups ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) !hardened? ( sys-devel/prelink ) virtual/yacc sys-devel/flex
+truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) jack? ( media-sound/jack-audio-connection-kit ) openal? ( media-libs/openal ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) nas? ( media-libs/nas ) cups? ( net-print/cups ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) !hardened? ( sys-devel/prelink ) dev-util/pkgconfig virtual/yacc sys-devel/flex
 truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) jack? ( media-sound/jack-audio-connection-kit ) openal? ( media-libs/openal ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) nas? ( media-libs/nas ) cups? ( net-print/cups ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite )
 0
 mirror://sourceforge/wine/wine-1.3.18.tar.bz2 gecko? ( mirror://sourceforge/wine/wine_gecko-1.2.0-x86.msi win64? ( mirror://sourceforge/wine/wine_gecko-1.2.0-x86_64.msi ) )
diff --git a/metadata/cache/app-emulation/wine-1.3.19 b/metadata/cache/app-emulation/wine-1.3.19
index 76688e923baa..73ca87baceb2 100644
--- a/metadata/cache/app-emulation/wine-1.3.19
+++ b/metadata/cache/app-emulation/wine-1.3.19
@@ -1,4 +1,4 @@
-truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) jack? ( media-sound/jack-audio-connection-kit ) openal? ( media-libs/openal ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) nas? ( media-libs/nas ) cups? ( net-print/cups ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) !hardened? ( sys-devel/prelink ) virtual/yacc sys-devel/flex
+truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) jack? ( media-sound/jack-audio-connection-kit ) openal? ( media-libs/openal ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) nas? ( media-libs/nas ) cups? ( net-print/cups ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) !hardened? ( sys-devel/prelink ) dev-util/pkgconfig virtual/yacc sys-devel/flex
 truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) jack? ( media-sound/jack-audio-connection-kit ) openal? ( media-libs/openal ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) nas? ( media-libs/nas ) cups? ( net-print/cups ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite )
 0
 mirror://sourceforge/wine/wine-1.3.19.tar.bz2 gecko? ( mirror://sourceforge/wine/wine_gecko-1.2.0-x86.msi win64? ( mirror://sourceforge/wine/wine_gecko-1.2.0-x86_64.msi ) )
diff --git a/metadata/cache/app-emulation/wine-1.3.2 b/metadata/cache/app-emulation/wine-1.3.2
index 8c37de818a62..2a39645edcf6 100644
--- a/metadata/cache/app-emulation/wine-1.3.2
+++ b/metadata/cache/app-emulation/wine-1.3.2
@@ -1,4 +1,4 @@
-truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) jack? ( media-sound/jack-audio-connection-kit ) openal? ( media-libs/openal ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) nas? ( media-libs/nas ) cups? ( net-print/cups ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) !hardened? ( sys-devel/prelink ) virtual/yacc sys-devel/flex
+truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) jack? ( media-sound/jack-audio-connection-kit ) openal? ( media-libs/openal ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) nas? ( media-libs/nas ) cups? ( net-print/cups ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) !hardened? ( sys-devel/prelink ) dev-util/pkgconfig virtual/yacc sys-devel/flex
 truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) jack? ( media-sound/jack-audio-connection-kit ) openal? ( media-libs/openal ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) nas? ( media-libs/nas ) cups? ( net-print/cups ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite )
 0
 mirror://sourceforge/wine/wine-1.3.2.tar.bz2 gecko? ( mirror://sourceforge/wine/wine_gecko-1.1.0-x86.cab win64? ( mirror://sourceforge/wine/wine_gecko-1.1.0-x86_64.cab ) )
diff --git a/metadata/cache/app-emulation/wine-1.3.20 b/metadata/cache/app-emulation/wine-1.3.20
index ecc905d47332..c47eaaf5e802 100644
--- a/metadata/cache/app-emulation/wine-1.3.20
+++ b/metadata/cache/app-emulation/wine-1.3.20
@@ -1,4 +1,4 @@
-truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) jack? ( media-sound/jack-audio-connection-kit ) openal? ( media-libs/openal ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) nas? ( media-libs/nas ) cups? ( net-print/cups ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) !hardened? ( sys-devel/prelink ) virtual/yacc sys-devel/flex
+truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) jack? ( media-sound/jack-audio-connection-kit ) openal? ( media-libs/openal ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) nas? ( media-libs/nas ) cups? ( net-print/cups ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) !hardened? ( sys-devel/prelink ) dev-util/pkgconfig virtual/yacc sys-devel/flex
 truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) jack? ( media-sound/jack-audio-connection-kit ) openal? ( media-libs/openal ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) nas? ( media-libs/nas ) cups? ( net-print/cups ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite )
 0
 mirror://sourceforge/wine/wine-1.3.20.tar.bz2 gecko? ( mirror://sourceforge/wine/wine_gecko-1.2.0-x86.msi win64? ( mirror://sourceforge/wine/wine_gecko-1.2.0-x86_64.msi ) )
diff --git a/metadata/cache/app-emulation/wine-1.3.21 b/metadata/cache/app-emulation/wine-1.3.21
index e175af7dd5a8..9461e10f39ca 100644
--- a/metadata/cache/app-emulation/wine-1.3.21
+++ b/metadata/cache/app-emulation/wine-1.3.21
@@ -1,4 +1,4 @@
-truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) jack? ( media-sound/jack-audio-connection-kit ) openal? ( media-libs/openal ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) nas? ( media-libs/nas ) cups? ( net-print/cups ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) !hardened? ( sys-devel/prelink ) virtual/yacc sys-devel/flex
+truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) jack? ( media-sound/jack-audio-connection-kit ) openal? ( media-libs/openal ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) nas? ( media-libs/nas ) cups? ( net-print/cups ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) !hardened? ( sys-devel/prelink ) dev-util/pkgconfig virtual/yacc sys-devel/flex
 truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) jack? ( media-sound/jack-audio-connection-kit ) openal? ( media-libs/openal ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) nas? ( media-libs/nas ) cups? ( net-print/cups ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite )
 0
 mirror://sourceforge/wine/wine-1.3.21.tar.bz2 gecko? ( mirror://sourceforge/wine/wine_gecko-1.2.0-x86.msi win64? ( mirror://sourceforge/wine/wine_gecko-1.2.0-x86_64.msi ) )
diff --git a/metadata/cache/app-emulation/wine-1.3.22 b/metadata/cache/app-emulation/wine-1.3.22
index b80e08231a33..8d38c4fa5f8b 100644
--- a/metadata/cache/app-emulation/wine-1.3.22
+++ b/metadata/cache/app-emulation/wine-1.3.22
@@ -1,4 +1,4 @@
-truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) jack? ( media-sound/jack-audio-connection-kit ) openal? ( media-libs/openal ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) nas? ( media-libs/nas ) cups? ( net-print/cups ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) !hardened? ( sys-devel/prelink ) virtual/yacc sys-devel/flex
+truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) jack? ( media-sound/jack-audio-connection-kit ) openal? ( media-libs/openal ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) nas? ( media-libs/nas ) cups? ( net-print/cups ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) !hardened? ( sys-devel/prelink ) dev-util/pkgconfig virtual/yacc sys-devel/flex
 truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) jack? ( media-sound/jack-audio-connection-kit ) openal? ( media-libs/openal ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) nas? ( media-libs/nas ) cups? ( net-print/cups ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite )
 0
 mirror://sourceforge/wine/wine-1.3.22.tar.bz2 gecko? ( mirror://sourceforge/wine/wine_gecko-1.2.0-x86.msi win64? ( mirror://sourceforge/wine/wine_gecko-1.2.0-x86_64.msi ) )
diff --git a/metadata/cache/app-emulation/wine-1.3.23 b/metadata/cache/app-emulation/wine-1.3.23
index 5bea8726afad..9c98b5787731 100644
--- a/metadata/cache/app-emulation/wine-1.3.23
+++ b/metadata/cache/app-emulation/wine-1.3.23
@@ -1,4 +1,4 @@
-truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) jack? ( media-sound/jack-audio-connection-kit ) openal? ( media-libs/openal ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) nas? ( media-libs/nas ) cups? ( net-print/cups ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) !hardened? ( sys-devel/prelink ) virtual/yacc sys-devel/flex
+truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) jack? ( media-sound/jack-audio-connection-kit ) openal? ( media-libs/openal ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) nas? ( media-libs/nas ) cups? ( net-print/cups ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) !hardened? ( sys-devel/prelink ) dev-util/pkgconfig virtual/yacc sys-devel/flex
 truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) jack? ( media-sound/jack-audio-connection-kit ) openal? ( media-libs/openal ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) nas? ( media-libs/nas ) cups? ( net-print/cups ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite )
 0
 mirror://sourceforge/wine/wine-1.3.23.tar.bz2 gecko? ( mirror://sourceforge/wine/wine_gecko-1.2.0-x86.msi win64? ( mirror://sourceforge/wine/wine_gecko-1.2.0-x86_64.msi ) )
diff --git a/metadata/cache/app-emulation/wine-1.3.24 b/metadata/cache/app-emulation/wine-1.3.24
index 4a040add693a..b4cd2e076bcd 100644
--- a/metadata/cache/app-emulation/wine-1.3.24
+++ b/metadata/cache/app-emulation/wine-1.3.24
@@ -1,4 +1,4 @@
-truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) jack? ( media-sound/jack-audio-connection-kit ) openal? ( media-libs/openal ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) nas? ( media-libs/nas ) cups? ( net-print/cups ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) !hardened? ( sys-devel/prelink ) virtual/yacc sys-devel/flex
+truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) jack? ( media-sound/jack-audio-connection-kit ) openal? ( media-libs/openal ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) nas? ( media-libs/nas ) cups? ( net-print/cups ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) !hardened? ( sys-devel/prelink ) dev-util/pkgconfig virtual/yacc sys-devel/flex
 truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) jack? ( media-sound/jack-audio-connection-kit ) openal? ( media-libs/openal ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) nas? ( media-libs/nas ) cups? ( net-print/cups ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite )
 0
 mirror://sourceforge/wine/wine-1.3.24.tar.bz2 gecko? ( mirror://sourceforge/wine/wine_gecko-1.2.0-x86.msi win64? ( mirror://sourceforge/wine/wine_gecko-1.2.0-x86_64.msi ) )
diff --git a/metadata/cache/app-emulation/wine-1.3.25 b/metadata/cache/app-emulation/wine-1.3.25
index f1d771dc25e0..aa93ad061e52 100644
--- a/metadata/cache/app-emulation/wine-1.3.25
+++ b/metadata/cache/app-emulation/wine-1.3.25
@@ -1,4 +1,4 @@
-truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) openal? ( media-libs/openal ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) !hardened? ( sys-devel/prelink ) virtual/yacc sys-devel/flex
+truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) openal? ( media-libs/openal ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) !hardened? ( sys-devel/prelink ) dev-util/pkgconfig virtual/yacc sys-devel/flex
 truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) openal? ( media-libs/openal ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite )
 0
 mirror://sourceforge/wine/wine-1.3.25.tar.bz2 gecko? ( mirror://sourceforge/wine/wine_gecko-1.2.0-x86.msi win64? ( mirror://sourceforge/wine/wine_gecko-1.2.0-x86_64.msi ) )
diff --git a/metadata/cache/app-emulation/wine-1.3.26 b/metadata/cache/app-emulation/wine-1.3.26
index 2b4a87cf7f0a..71981ef38e53 100644
--- a/metadata/cache/app-emulation/wine-1.3.26
+++ b/metadata/cache/app-emulation/wine-1.3.26
@@ -1,4 +1,4 @@
-truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) openal? ( media-libs/openal ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) !hardened? ( sys-devel/prelink ) virtual/yacc sys-devel/flex
+truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) openal? ( media-libs/openal ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) !hardened? ( sys-devel/prelink ) dev-util/pkgconfig virtual/yacc sys-devel/flex
 truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) openal? ( media-libs/openal ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite )
 0
 mirror://sourceforge/wine/wine-1.3.26.tar.bz2 gecko? ( mirror://sourceforge/wine/wine_gecko-1.2.0-x86.msi win64? ( mirror://sourceforge/wine/wine_gecko-1.2.0-x86_64.msi ) )
diff --git a/metadata/cache/app-emulation/wine-1.3.27 b/metadata/cache/app-emulation/wine-1.3.27
index 917bd0a14643..ea7121f7d54c 100644
--- a/metadata/cache/app-emulation/wine-1.3.27
+++ b/metadata/cache/app-emulation/wine-1.3.27
@@ -1,4 +1,4 @@
-truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) openal? ( media-libs/openal ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) !hardened? ( sys-devel/prelink ) virtual/yacc sys-devel/flex
+truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) openal? ( media-libs/openal ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) !hardened? ( sys-devel/prelink ) dev-util/pkgconfig virtual/yacc sys-devel/flex
 truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) openal? ( media-libs/openal ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite )
 0
 mirror://sourceforge/wine/wine-1.3.27.tar.bz2 gecko? ( mirror://sourceforge/wine/wine_gecko-1.3-x86.msi win64? ( mirror://sourceforge/wine/wine_gecko-1.3-x86_64.msi ) )
diff --git a/metadata/cache/app-emulation/wine-1.3.28 b/metadata/cache/app-emulation/wine-1.3.28
index 3bfbd02ee236..572b75a01abf 100644
--- a/metadata/cache/app-emulation/wine-1.3.28
+++ b/metadata/cache/app-emulation/wine-1.3.28
@@ -1,4 +1,4 @@
-truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) openal? ( media-libs/openal ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) !hardened? ( sys-devel/prelink ) virtual/yacc sys-devel/flex
+truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) openal? ( media-libs/openal ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) !hardened? ( sys-devel/prelink ) dev-util/pkgconfig virtual/yacc sys-devel/flex
 truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) openal? ( media-libs/openal ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite )
 0
 mirror://sourceforge/wine/wine-1.3.28.tar.bz2 gecko? ( mirror://sourceforge/wine/wine_gecko-1.3-x86.msi win64? ( mirror://sourceforge/wine/wine_gecko-1.3-x86_64.msi ) )
diff --git a/metadata/cache/app-emulation/wine-1.3.29 b/metadata/cache/app-emulation/wine-1.3.29
index 2415d865db5f..a5548043a85b 100644
--- a/metadata/cache/app-emulation/wine-1.3.29
+++ b/metadata/cache/app-emulation/wine-1.3.29
@@ -1,4 +1,4 @@
-truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) openal? ( media-libs/openal ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) !hardened? ( sys-devel/prelink ) virtual/yacc sys-devel/flex
+truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) openal? ( media-libs/openal ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) !hardened? ( sys-devel/prelink ) dev-util/pkgconfig virtual/yacc sys-devel/flex
 truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) openal? ( media-libs/openal ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite )
 0
 mirror://sourceforge/wine/wine-1.3.29.tar.bz2 gecko? ( mirror://sourceforge/wine/wine_gecko-1.3-x86.msi win64? ( mirror://sourceforge/wine/wine_gecko-1.3-x86_64.msi ) )
diff --git a/metadata/cache/app-emulation/wine-1.3.3 b/metadata/cache/app-emulation/wine-1.3.3
index 32b34e9bb620..ef284f914382 100644
--- a/metadata/cache/app-emulation/wine-1.3.3
+++ b/metadata/cache/app-emulation/wine-1.3.3
@@ -1,4 +1,4 @@
-truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) jack? ( media-sound/jack-audio-connection-kit ) openal? ( media-libs/openal ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) nas? ( media-libs/nas ) cups? ( net-print/cups ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) !hardened? ( sys-devel/prelink ) virtual/yacc sys-devel/flex
+truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) jack? ( media-sound/jack-audio-connection-kit ) openal? ( media-libs/openal ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) nas? ( media-libs/nas ) cups? ( net-print/cups ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) !hardened? ( sys-devel/prelink ) dev-util/pkgconfig virtual/yacc sys-devel/flex
 truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) jack? ( media-sound/jack-audio-connection-kit ) openal? ( media-libs/openal ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) nas? ( media-libs/nas ) cups? ( net-print/cups ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite )
 0
 mirror://sourceforge/wine/wine-1.3.3.tar.bz2 gecko? ( mirror://sourceforge/wine/wine_gecko-1.1.0-x86.cab win64? ( mirror://sourceforge/wine/wine_gecko-1.1.0-x86_64.cab ) )
diff --git a/metadata/cache/app-emulation/wine-1.3.30 b/metadata/cache/app-emulation/wine-1.3.30
index f4006f336123..b95f91918774 100644
--- a/metadata/cache/app-emulation/wine-1.3.30
+++ b/metadata/cache/app-emulation/wine-1.3.30
@@ -1,4 +1,4 @@
-truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) openal? ( media-libs/openal ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) !hardened? ( sys-devel/prelink ) virtual/yacc sys-devel/flex
+truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) openal? ( media-libs/openal ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) !hardened? ( sys-devel/prelink ) dev-util/pkgconfig virtual/yacc sys-devel/flex
 truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) openal? ( media-libs/openal ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite )
 0
 mirror://sourceforge/wine/wine-1.3.30.tar.bz2 gecko? ( mirror://sourceforge/wine/wine_gecko-1.3-x86.msi win64? ( mirror://sourceforge/wine/wine_gecko-1.3-x86_64.msi ) )
diff --git a/metadata/cache/app-emulation/wine-1.3.31 b/metadata/cache/app-emulation/wine-1.3.31
index 4ac86afc693a..5e731fbf3329 100644
--- a/metadata/cache/app-emulation/wine-1.3.31
+++ b/metadata/cache/app-emulation/wine-1.3.31
@@ -1,4 +1,4 @@
-truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) openal? ( media-libs/openal ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) !hardened? ( sys-devel/prelink ) virtual/yacc sys-devel/flex
+truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) openal? ( media-libs/openal ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) !hardened? ( sys-devel/prelink ) dev-util/pkgconfig virtual/yacc sys-devel/flex
 truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) openal? ( media-libs/openal ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite )
 0
 mirror://sourceforge/wine/wine-1.3.31.tar.bz2 gecko? ( mirror://sourceforge/wine/wine_gecko-1.3-x86.msi win64? ( mirror://sourceforge/wine/wine_gecko-1.3-x86_64.msi ) )
diff --git a/metadata/cache/app-emulation/wine-1.3.32 b/metadata/cache/app-emulation/wine-1.3.32
index f6a85261e945..bd64c2dea048 100644
--- a/metadata/cache/app-emulation/wine-1.3.32
+++ b/metadata/cache/app-emulation/wine-1.3.32
@@ -1,4 +1,4 @@
-truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) openal? ( media-libs/openal ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) !hardened? ( sys-devel/prelink ) virtual/yacc sys-devel/flex
+truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) openal? ( media-libs/openal ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) !hardened? ( sys-devel/prelink ) dev-util/pkgconfig virtual/yacc sys-devel/flex
 truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) openal? ( media-libs/openal ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite )
 0
 mirror://sourceforge/wine/wine-1.3.32.tar.bz2 gecko? ( mirror://sourceforge/wine/wine_gecko-1.3-x86.msi win64? ( mirror://sourceforge/wine/wine_gecko-1.3-x86_64.msi ) )
diff --git a/metadata/cache/app-emulation/wine-1.3.33 b/metadata/cache/app-emulation/wine-1.3.33
index 635f9e1617e5..e50c55bb3715 100644
--- a/metadata/cache/app-emulation/wine-1.3.33
+++ b/metadata/cache/app-emulation/wine-1.3.33
@@ -1,4 +1,4 @@
-truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) openal? ( media-libs/openal ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) !hardened? ( sys-devel/prelink ) virtual/yacc sys-devel/flex
+truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) openal? ( media-libs/openal ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) !hardened? ( sys-devel/prelink ) dev-util/pkgconfig virtual/yacc sys-devel/flex
 truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) openal? ( media-libs/openal ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite )
 0
 mirror://sourceforge/wine/wine-1.3.33.tar.bz2 gecko? ( mirror://sourceforge/wine/wine_gecko-1.4-x86.msi win64? ( mirror://sourceforge/wine/wine_gecko-1.4-x86_64.msi ) )
diff --git a/metadata/cache/app-emulation/wine-1.3.34 b/metadata/cache/app-emulation/wine-1.3.34
index ca60e2b4ece7..9e31732bc886 100644
--- a/metadata/cache/app-emulation/wine-1.3.34
+++ b/metadata/cache/app-emulation/wine-1.3.34
@@ -1,4 +1,4 @@
-truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) openal? ( media-libs/openal ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) !hardened? ( sys-devel/prelink ) virtual/yacc sys-devel/flex
+truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) openal? ( media-libs/openal ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) !hardened? ( sys-devel/prelink ) dev-util/pkgconfig virtual/yacc sys-devel/flex
 truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) openal? ( media-libs/openal ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite )
 0
 mirror://sourceforge/wine/wine-1.3.34.tar.bz2 gecko? ( mirror://sourceforge/wine/wine_gecko-1.4-x86.msi win64? ( mirror://sourceforge/wine/wine_gecko-1.4-x86_64.msi ) )
diff --git a/metadata/cache/app-emulation/wine-1.3.35 b/metadata/cache/app-emulation/wine-1.3.35
index ce401237832f..3024fbf907b1 100644
--- a/metadata/cache/app-emulation/wine-1.3.35
+++ b/metadata/cache/app-emulation/wine-1.3.35
@@ -1,4 +1,4 @@
-truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) openal? ( media-libs/openal ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) !hardened? ( sys-devel/prelink ) virtual/yacc sys-devel/flex
+truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) openal? ( media-libs/openal ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) !hardened? ( sys-devel/prelink ) dev-util/pkgconfig virtual/yacc sys-devel/flex
 truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) openal? ( media-libs/openal ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite )
 0
 mirror://sourceforge/wine/wine-1.3.35.tar.bz2 gecko? ( mirror://sourceforge/wine/wine_gecko-1.4-x86.msi win64? ( mirror://sourceforge/wine/wine_gecko-1.4-x86_64.msi ) )
diff --git a/metadata/cache/app-emulation/wine-1.3.36 b/metadata/cache/app-emulation/wine-1.3.36
index 0017d05ea0bf..940459c6dee2 100644
--- a/metadata/cache/app-emulation/wine-1.3.36
+++ b/metadata/cache/app-emulation/wine-1.3.36
@@ -1,4 +1,4 @@
-truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) openal? ( media-libs/openal ) udisks? ( sys-apps/dbus sys-fs/udisks ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) !hardened? ( sys-devel/prelink ) virtual/yacc sys-devel/flex
+truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) openal? ( media-libs/openal ) udisks? ( sys-apps/dbus sys-fs/udisks ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) !hardened? ( sys-devel/prelink ) dev-util/pkgconfig virtual/yacc sys-devel/flex
 truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) openal? ( media-libs/openal ) udisks? ( sys-apps/dbus sys-fs/udisks ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite )
 0
 mirror://sourceforge/wine/wine-1.3.36.tar.bz2 gecko? ( mirror://sourceforge/wine/wine_gecko-1.4-x86.msi win64? ( mirror://sourceforge/wine/wine_gecko-1.4-x86_64.msi ) )
diff --git a/metadata/cache/app-emulation/wine-1.3.37 b/metadata/cache/app-emulation/wine-1.3.37
index 8a0901be32d9..86ce2d1bc8d8 100644
--- a/metadata/cache/app-emulation/wine-1.3.37
+++ b/metadata/cache/app-emulation/wine-1.3.37
@@ -1,4 +1,4 @@
-truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) openal? ( media-libs/openal ) udisks? ( sys-apps/dbus sys-fs/udisks ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) !hardened? ( sys-devel/prelink ) virtual/yacc sys-devel/flex
+truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) openal? ( media-libs/openal ) udisks? ( sys-apps/dbus sys-fs/udisks ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) !hardened? ( sys-devel/prelink ) dev-util/pkgconfig virtual/yacc sys-devel/flex
 truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) openal? ( media-libs/openal ) udisks? ( sys-apps/dbus sys-fs/udisks ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite )
 0
 mirror://sourceforge/wine/wine-1.3.37.tar.bz2 gecko? ( mirror://sourceforge/wine/wine_gecko-1.4-x86.msi win64? ( mirror://sourceforge/wine/wine_gecko-1.4-x86_64.msi ) )
diff --git a/metadata/cache/app-emulation/wine-1.3.4 b/metadata/cache/app-emulation/wine-1.3.4
index d4153ea6a7ce..dbf2e887ed74 100644
--- a/metadata/cache/app-emulation/wine-1.3.4
+++ b/metadata/cache/app-emulation/wine-1.3.4
@@ -1,4 +1,4 @@
-truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) jack? ( media-sound/jack-audio-connection-kit ) openal? ( media-libs/openal ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) nas? ( media-libs/nas ) cups? ( net-print/cups ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) !hardened? ( sys-devel/prelink ) virtual/yacc sys-devel/flex
+truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) jack? ( media-sound/jack-audio-connection-kit ) openal? ( media-libs/openal ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) nas? ( media-libs/nas ) cups? ( net-print/cups ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) !hardened? ( sys-devel/prelink ) dev-util/pkgconfig virtual/yacc sys-devel/flex
 truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) jack? ( media-sound/jack-audio-connection-kit ) openal? ( media-libs/openal ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) nas? ( media-libs/nas ) cups? ( net-print/cups ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite )
 0
 mirror://sourceforge/wine/wine-1.3.4.tar.bz2 gecko? ( mirror://sourceforge/wine/wine_gecko-1.1.0-x86.cab win64? ( mirror://sourceforge/wine/wine_gecko-1.1.0-x86_64.cab ) )
diff --git a/metadata/cache/app-emulation/wine-1.3.5 b/metadata/cache/app-emulation/wine-1.3.5
index f7fa5ff618f6..540fbf4a97fb 100644
--- a/metadata/cache/app-emulation/wine-1.3.5
+++ b/metadata/cache/app-emulation/wine-1.3.5
@@ -1,4 +1,4 @@
-truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) jack? ( media-sound/jack-audio-connection-kit ) openal? ( media-libs/openal ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) nas? ( media-libs/nas ) cups? ( net-print/cups ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) !hardened? ( sys-devel/prelink ) virtual/yacc sys-devel/flex
+truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) jack? ( media-sound/jack-audio-connection-kit ) openal? ( media-libs/openal ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) nas? ( media-libs/nas ) cups? ( net-print/cups ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) !hardened? ( sys-devel/prelink ) dev-util/pkgconfig virtual/yacc sys-devel/flex
 truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) jack? ( media-sound/jack-audio-connection-kit ) openal? ( media-libs/openal ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) nas? ( media-libs/nas ) cups? ( net-print/cups ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite )
 0
 mirror://sourceforge/wine/wine-1.3.5.tar.bz2 gecko? ( mirror://sourceforge/wine/wine_gecko-1.1.0-x86.cab win64? ( mirror://sourceforge/wine/wine_gecko-1.1.0-x86_64.cab ) )
diff --git a/metadata/cache/app-emulation/wine-1.3.6 b/metadata/cache/app-emulation/wine-1.3.6
index 6f3175774337..66c3a504d0ba 100644
--- a/metadata/cache/app-emulation/wine-1.3.6
+++ b/metadata/cache/app-emulation/wine-1.3.6
@@ -1,4 +1,4 @@
-truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) jack? ( media-sound/jack-audio-connection-kit ) openal? ( media-libs/openal ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) nas? ( media-libs/nas ) cups? ( net-print/cups ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) !hardened? ( sys-devel/prelink ) virtual/yacc sys-devel/flex
+truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) jack? ( media-sound/jack-audio-connection-kit ) openal? ( media-libs/openal ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) nas? ( media-libs/nas ) cups? ( net-print/cups ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) !hardened? ( sys-devel/prelink ) dev-util/pkgconfig virtual/yacc sys-devel/flex
 truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) jack? ( media-sound/jack-audio-connection-kit ) openal? ( media-libs/openal ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) nas? ( media-libs/nas ) cups? ( net-print/cups ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite )
 0
 mirror://sourceforge/wine/wine-1.3.6.tar.bz2 gecko? ( mirror://sourceforge/wine/wine_gecko-1.1.0-x86.cab win64? ( mirror://sourceforge/wine/wine_gecko-1.1.0-x86_64.cab ) )
diff --git a/metadata/cache/app-emulation/wine-1.3.7 b/metadata/cache/app-emulation/wine-1.3.7
index b059ee16d4a4..dbdf5980cf40 100644
--- a/metadata/cache/app-emulation/wine-1.3.7
+++ b/metadata/cache/app-emulation/wine-1.3.7
@@ -1,4 +1,4 @@
-truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) jack? ( media-sound/jack-audio-connection-kit ) openal? ( media-libs/openal ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) nas? ( media-libs/nas ) cups? ( net-print/cups ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) !hardened? ( sys-devel/prelink ) virtual/yacc sys-devel/flex
+truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) jack? ( media-sound/jack-audio-connection-kit ) openal? ( media-libs/openal ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) nas? ( media-libs/nas ) cups? ( net-print/cups ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) !hardened? ( sys-devel/prelink ) dev-util/pkgconfig virtual/yacc sys-devel/flex
 truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) jack? ( media-sound/jack-audio-connection-kit ) openal? ( media-libs/openal ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) nas? ( media-libs/nas ) cups? ( net-print/cups ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite )
 0
 mirror://sourceforge/wine/wine-1.3.7.tar.bz2 gecko? ( mirror://sourceforge/wine/wine_gecko-1.1.0-x86.cab win64? ( mirror://sourceforge/wine/wine_gecko-1.1.0-x86_64.cab ) )
diff --git a/metadata/cache/app-emulation/wine-1.3.8 b/metadata/cache/app-emulation/wine-1.3.8
index 44655267f537..bd403daad568 100644
--- a/metadata/cache/app-emulation/wine-1.3.8
+++ b/metadata/cache/app-emulation/wine-1.3.8
@@ -1,4 +1,4 @@
-truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) jack? ( media-sound/jack-audio-connection-kit ) openal? ( media-libs/openal ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) nas? ( media-libs/nas ) cups? ( net-print/cups ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) !hardened? ( sys-devel/prelink ) virtual/yacc sys-devel/flex
+truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) jack? ( media-sound/jack-audio-connection-kit ) openal? ( media-libs/openal ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) nas? ( media-libs/nas ) cups? ( net-print/cups ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) !hardened? ( sys-devel/prelink ) dev-util/pkgconfig virtual/yacc sys-devel/flex
 truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) jack? ( media-sound/jack-audio-connection-kit ) openal? ( media-libs/openal ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) nas? ( media-libs/nas ) cups? ( net-print/cups ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite )
 0
 mirror://sourceforge/wine/wine-1.3.8.tar.bz2 gecko? ( mirror://sourceforge/wine/wine_gecko-1.1.0-x86.cab win64? ( mirror://sourceforge/wine/wine_gecko-1.1.0-x86_64.cab ) )
diff --git a/metadata/cache/app-emulation/wine-1.3.9 b/metadata/cache/app-emulation/wine-1.3.9
index 3eb271215021..5136064bb70a 100644
--- a/metadata/cache/app-emulation/wine-1.3.9
+++ b/metadata/cache/app-emulation/wine-1.3.9
@@ -1,4 +1,4 @@
-truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) jack? ( media-sound/jack-audio-connection-kit ) openal? ( media-libs/openal ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) nas? ( media-libs/nas ) cups? ( net-print/cups ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) !hardened? ( sys-devel/prelink ) virtual/yacc sys-devel/flex
+truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) jack? ( media-sound/jack-audio-connection-kit ) openal? ( media-libs/openal ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) nas? ( media-libs/nas ) cups? ( net-print/cups ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) !hardened? ( sys-devel/prelink ) dev-util/pkgconfig virtual/yacc sys-devel/flex
 truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) jack? ( media-sound/jack-audio-connection-kit ) openal? ( media-libs/openal ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) nas? ( media-libs/nas ) cups? ( net-print/cups ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite )
 0
 mirror://sourceforge/wine/wine-1.3.9.tar.bz2 gecko? ( mirror://sourceforge/wine/wine_gecko-1.1.0-x86.cab win64? ( mirror://sourceforge/wine/wine_gecko-1.1.0-x86_64.cab ) )
diff --git a/metadata/cache/app-emulation/wine-1.4_rc1 b/metadata/cache/app-emulation/wine-1.4_rc1
index bba9b69e9377..6ed9dce193c4 100644
--- a/metadata/cache/app-emulation/wine-1.4_rc1
+++ b/metadata/cache/app-emulation/wine-1.4_rc1
@@ -1,4 +1,4 @@
-truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) openal? ( media-libs/openal ) udisks? ( sys-apps/dbus sys-fs/udisks ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) !hardened? ( sys-devel/prelink ) virtual/yacc sys-devel/flex
+truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) openal? ( media-libs/openal ) udisks? ( sys-apps/dbus sys-fs/udisks ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) !hardened? ( sys-devel/prelink ) dev-util/pkgconfig virtual/yacc sys-devel/flex
 truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) openal? ( media-libs/openal ) udisks? ( sys-apps/dbus sys-fs/udisks ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite )
 0
 mirror://sourceforge/wine/wine-1.4-rc1.tar.bz2 gecko? ( mirror://sourceforge/wine/wine_gecko-1.4-x86.msi win64? ( mirror://sourceforge/wine/wine_gecko-1.4-x86_64.msi ) )
diff --git a/metadata/cache/app-emulation/wine-1.4_rc2 b/metadata/cache/app-emulation/wine-1.4_rc2
index 1d54fc7a263c..935db7ee7e59 100644
--- a/metadata/cache/app-emulation/wine-1.4_rc2
+++ b/metadata/cache/app-emulation/wine-1.4_rc2
@@ -1,4 +1,4 @@
-truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) openal? ( media-libs/openal ) udisks? ( sys-apps/dbus sys-fs/udisks ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) samba? ( >=net-fs/samba-3.0.25 ) selinux? ( sec-policy/selinux-wine ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) !hardened? ( sys-devel/prelink ) virtual/yacc sys-devel/flex || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool
+truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) openal? ( media-libs/openal ) udisks? ( sys-apps/dbus sys-fs/udisks ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) samba? ( >=net-fs/samba-3.0.25 ) selinux? ( sec-policy/selinux-wine ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) !hardened? ( sys-devel/prelink ) dev-util/pkgconfig virtual/yacc sys-devel/flex || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) openal? ( media-libs/openal ) udisks? ( sys-apps/dbus sys-fs/udisks ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) samba? ( >=net-fs/samba-3.0.25 ) selinux? ( sec-policy/selinux-wine ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite )
 0
 mirror://sourceforge/wine/wine-1.4-rc2.tar.bz2 gecko? ( mirror://sourceforge/wine/wine_gecko-1.4-x86.msi win64? ( mirror://sourceforge/wine/wine_gecko-1.4-x86_64.msi ) )
diff --git a/metadata/cache/app-emulation/wine-1.4_rc3 b/metadata/cache/app-emulation/wine-1.4_rc3
index 162ad0f56a4d..7b8a568fe21d 100644
--- a/metadata/cache/app-emulation/wine-1.4_rc3
+++ b/metadata/cache/app-emulation/wine-1.4_rc3
@@ -1,4 +1,4 @@
-truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) openal? ( media-libs/openal ) udisks? ( sys-apps/dbus sys-fs/udisks ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) samba? ( >=net-fs/samba-3.0.25 ) selinux? ( sec-policy/selinux-wine ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) !hardened? ( sys-devel/prelink ) virtual/yacc sys-devel/flex || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) openal? ( media-libs/openal ) udisks? ( sys-apps/dbus sys-fs/udisks ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) samba? ( >=net-fs/samba-3.0.25 ) selinux? ( sec-policy/selinux-wine ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) !hardened? ( sys-devel/prelink ) dev-util/pkgconfig virtual/yacc sys-devel/flex || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) openal? ( media-libs/openal ) udisks? ( sys-apps/dbus sys-fs/udisks ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) samba? ( >=net-fs/samba-3.0.25 ) selinux? ( sec-policy/selinux-wine ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite )
 0
 mirror://sourceforge/wine/wine-1.4-rc3.tar.bz2 gecko? ( mirror://sourceforge/wine/wine_gecko-1.4-x86.msi win64? ( mirror://sourceforge/wine/wine_gecko-1.4-x86_64.msi ) )
diff --git a/metadata/cache/app-emulation/wine-1.4_rc4 b/metadata/cache/app-emulation/wine-1.4_rc4
index 28f301786fd2..5c9918ee2654 100644
--- a/metadata/cache/app-emulation/wine-1.4_rc4
+++ b/metadata/cache/app-emulation/wine-1.4_rc4
@@ -1,4 +1,4 @@
-truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) openal? ( media-libs/openal ) udisks? ( sys-apps/dbus sys-fs/udisks ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC ) samba? ( >=net-fs/samba-3.0.25 ) selinux? ( sec-policy/selinux-wine ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) odbc? ( app-emulation/emul-linux-x86-db ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) odbc? ( app-emulation/emul-linux-x86-db ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) !hardened? ( sys-devel/prelink ) virtual/yacc sys-devel/flex || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) openal? ( media-libs/openal ) udisks? ( sys-apps/dbus sys-fs/udisks ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC ) samba? ( >=net-fs/samba-3.0.25 ) selinux? ( sec-policy/selinux-wine ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) odbc? ( app-emulation/emul-linux-x86-db ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) odbc? ( app-emulation/emul-linux-x86-db ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) !hardened? ( sys-devel/prelink ) dev-util/pkgconfig virtual/yacc sys-devel/flex || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) openal? ( media-libs/openal ) udisks? ( sys-apps/dbus sys-fs/udisks ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC ) samba? ( >=net-fs/samba-3.0.25 ) selinux? ( sec-policy/selinux-wine ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) odbc? ( app-emulation/emul-linux-x86-db ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) odbc? ( app-emulation/emul-linux-x86-db ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite )
 0
 mirror://sourceforge/wine/wine-1.4-rc4.tar.bz2 gecko? ( mirror://sourceforge/wine/wine_gecko-1.4-x86.msi win64? ( mirror://sourceforge/wine/wine_gecko-1.4-x86_64.msi ) )
diff --git a/metadata/cache/app-emulation/wine-1.4_rc5 b/metadata/cache/app-emulation/wine-1.4_rc5
index df08e6ee47b3..8f1100fc1a3a 100644
--- a/metadata/cache/app-emulation/wine-1.4_rc5
+++ b/metadata/cache/app-emulation/wine-1.4_rc5
@@ -1,4 +1,4 @@
-truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) openal? ( media-libs/openal ) udisks? ( sys-apps/dbus sys-fs/udisks ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC ) samba? ( >=net-fs/samba-3.0.25 ) selinux? ( sec-policy/selinux-wine ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) odbc? ( app-emulation/emul-linux-x86-db ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) odbc? ( app-emulation/emul-linux-x86-db ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) !hardened? ( sys-devel/prelink ) virtual/yacc sys-devel/flex || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) openal? ( media-libs/openal ) udisks? ( sys-apps/dbus sys-fs/udisks ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC ) samba? ( >=net-fs/samba-3.0.25 ) selinux? ( sec-policy/selinux-wine ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) odbc? ( app-emulation/emul-linux-x86-db ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) odbc? ( app-emulation/emul-linux-x86-db ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) !hardened? ( sys-devel/prelink ) dev-util/pkgconfig virtual/yacc sys-devel/flex || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) openal? ( media-libs/openal ) udisks? ( sys-apps/dbus sys-fs/udisks ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC ) samba? ( >=net-fs/samba-3.0.25 ) selinux? ( sec-policy/selinux-wine ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) odbc? ( app-emulation/emul-linux-x86-db ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) odbc? ( app-emulation/emul-linux-x86-db ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite )
 0
 mirror://sourceforge/wine/wine-1.4-rc5.tar.bz2 gecko? ( mirror://sourceforge/wine/wine_gecko-1.4-x86.msi win64? ( mirror://sourceforge/wine/wine_gecko-1.4-x86_64.msi ) )
diff --git a/metadata/cache/app-emulation/wine-9999 b/metadata/cache/app-emulation/wine-9999
index ae946aa3ebb3..e974420398dc 100644
--- a/metadata/cache/app-emulation/wine-9999
+++ b/metadata/cache/app-emulation/wine-9999
@@ -1,4 +1,4 @@
-truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) openal? ( media-libs/openal ) udisks? ( sys-apps/dbus sys-fs/udisks ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC ) samba? ( >=net-fs/samba-3.0.25 ) selinux? ( sec-policy/selinux-wine ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) odbc? ( app-emulation/emul-linux-x86-db ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) odbc? ( app-emulation/emul-linux-x86-db ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) !hardened? ( sys-devel/prelink ) virtual/yacc sys-devel/flex || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
+truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) openal? ( media-libs/openal ) udisks? ( sys-apps/dbus sys-fs/udisks ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC ) samba? ( >=net-fs/samba-3.0.25 ) selinux? ( sec-policy/selinux-wine ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) odbc? ( app-emulation/emul-linux-x86-db ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) odbc? ( app-emulation/emul-linux-x86-db ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) !hardened? ( sys-devel/prelink ) dev-util/pkgconfig virtual/yacc sys-devel/flex || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
 truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) openal? ( media-libs/openal ) udisks? ( sys-apps/dbus sys-fs/udisks ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC ) samba? ( >=net-fs/samba-3.0.25 ) selinux? ( sec-policy/selinux-wine ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) odbc? ( app-emulation/emul-linux-x86-db ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) odbc? ( app-emulation/emul-linux-x86-db ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite )
 0
 gecko? ( mirror://sourceforge/wine/wine_gecko-1.4-x86.msi win64? ( mirror://sourceforge/wine/wine_gecko-1.4-x86_64.msi ) )
diff --git a/metadata/cache/app-forensics/sleuthkit-3.2.3 b/metadata/cache/app-forensics/sleuthkit-3.2.3
new file mode 100644
index 000000000000..b05d8616e380
--- /dev/null
+++ b/metadata/cache/app-forensics/sleuthkit-3.2.3
@@ -0,0 +1,22 @@
+dev-db/sqlite:3 ewf? ( app-forensics/libewf[-ewf2] ) aff? ( app-forensics/afflib ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-db/sqlite:3 ewf? ( app-forensics/libewf[-ewf2] ) aff? ( app-forensics/afflib ) dev-perl/DateManip
+0
+mirror://sourceforge/sleuthkit/sleuthkit-3.2.3.tar.gz
+
+http://www.sleuthkit.org/sleuthkit/
+GPL-2 IBM
+A collection of file system and media management forensic analysis tools
+~amd64 ~hppa ~ppc ~x86
+autotools autotools-utils eutils libtool multilib portability toolchain-funcs user
+aff ewf static-libs
+
+
+
+4
+
+compile configure install prepare test
+
+
+
+
+
diff --git a/metadata/cache/app-misc/g15daemon-1.9.5.3-r5 b/metadata/cache/app-misc/g15daemon-1.9.5.3-r5
index 1a1bd56480e0..ff7ca7e86b61 100644
--- a/metadata/cache/app-misc/g15daemon-1.9.5.3-r5
+++ b/metadata/cache/app-misc/g15daemon-1.9.5.3-r5
@@ -6,7 +6,7 @@ mirror://sourceforge/g15daemon/g15daemon-1.9.5.3.tar.gz
 http://g15daemon.sourceforge.net/
 GPL-2
 G15daemon takes control of the G15 keyboard, through the linux kernel uinput device driver
-amd64 ~ppc ~ppc64 x86
+amd64 ppc ~ppc64 x86
 base eutils linux-info multilib perl-module portability python toolchain-funcs user versionator
 perl python static-libs
 
diff --git a/metadata/cache/app-office/libreoffice-3.5.0.3 b/metadata/cache/app-office/libreoffice-3.5.0.3
index 677d2669c501..ac1df46ce88d 100644
--- a/metadata/cache/app-office/libreoffice-3.5.0.3
+++ b/metadata/cache/app-office/libreoffice-3.5.0.3
@@ -1,5 +1,5 @@
-app-arch/zip app-arch/unzip >=app-text/hunspell-1.3.2-r3 app-text/mythes >=app-text/libexttextcat-3.2 app-text/libwpd:0.9[tools] app-text/libwpg:0.2 >=app-text/libwps-0.2.2 dev-cpp/libcmis dev-db/unixODBC dev-libs/expat >=dev-libs/glib-2.28 >=dev-libs/hyphen-2.7.1 >=dev-libs/icu-4.8.1-r1 >=dev-lang/perl-5.0 >=dev-libs/openssl-1.0.0d >=dev-libs/redland-1.0.14[ssl] >=media-libs/fontconfig-2.8.0 media-libs/freetype:2 >=media-libs/libpng-1.4 media-libs/libvisio net-print/cups sci-mathematics/lpsolve >=sys-libs/db-4.8 virtual/jpeg >=x11-libs/cairo-1.10.0[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender dbus? ( >=dev-libs/dbus-glib-0.92 ) eds? ( gnome-extra/evolution-data-server ) gnome? ( gnome-base/gconf:2 gnome-base/orbit ) gtk? ( >=x11-libs/gtk+-2.24:2 ) gtk3? ( >=x11-libs/gtk+-3.2:3 ) graphite? ( media-gfx/graphite2 ) gstreamer? ( >=media-libs/gstreamer-0.10 >=media-libs/gst-plugins-base-0.10 ) java? ( >=dev-java/bsh-2.0_beta4 dev-java/lucene:2.9 dev-java/lucene-analyzers:2.3 ) jemalloc? ( dev-libs/jemalloc ) mysql? ( >=dev-db/mysql-connector-c++-1.1.0 ) opengl? ( virtual/opengl ) pdfimport? ( >=app-text/poppler-0.16[xpdf-headers,cxx] ) postgres? ( >=dev-db/postgresql-base-8.4.0 ) svg? ( gnome-base/librsvg ) webdav? ( net-libs/neon ) xmlsec? ( >=dev-libs/nspr-4.8.8 >=dev-libs/nss-3.12.9 ) >=dev-libs/boost-1.46 >=dev-libs/libxml2-2.7.8 dev-libs/libxslt dev-perl/Archive-Zip dev-util/cppunit >=dev-util/gperf-3 dev-util/intltool dev-util/mdds >=dev-util/pkgconfig-0.26 media-libs/sampleicc >=net-misc/curl-7.21.4 net-misc/npapi-sdk >=sys-apps/findutils-4.4.2 sys-devel/bison sys-apps/coreutils sys-devel/flex sys-devel/gettext >=sys-devel/make-3.82 sys-libs/zlib x11-libs/libXtst x11-proto/randrproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto java? ( =virtual/jdk-1.6* >=dev-java/ant-core-1.7 test? ( dev-java/junit:4 ) ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 ) >=sys-apps/sed-4 kde? ( dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) ) kde? ( dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=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[kde?] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] ) >=app-admin/eselect-python-20091230 =dev-lang/python-2* =dev-lang/python-2*[threads,xml]
-app-arch/zip app-arch/unzip >=app-text/hunspell-1.3.2-r3 app-text/mythes >=app-text/libexttextcat-3.2 app-text/libwpd:0.9[tools] app-text/libwpg:0.2 >=app-text/libwps-0.2.2 dev-cpp/libcmis dev-db/unixODBC dev-libs/expat >=dev-libs/glib-2.28 >=dev-libs/hyphen-2.7.1 >=dev-libs/icu-4.8.1-r1 >=dev-lang/perl-5.0 >=dev-libs/openssl-1.0.0d >=dev-libs/redland-1.0.14[ssl] >=media-libs/fontconfig-2.8.0 media-libs/freetype:2 >=media-libs/libpng-1.4 media-libs/libvisio net-print/cups sci-mathematics/lpsolve >=sys-libs/db-4.8 virtual/jpeg >=x11-libs/cairo-1.10.0[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender dbus? ( >=dev-libs/dbus-glib-0.92 ) eds? ( gnome-extra/evolution-data-server ) gnome? ( gnome-base/gconf:2 gnome-base/orbit ) gtk? ( >=x11-libs/gtk+-2.24:2 ) gtk3? ( >=x11-libs/gtk+-3.2:3 ) graphite? ( media-gfx/graphite2 ) gstreamer? ( >=media-libs/gstreamer-0.10 >=media-libs/gst-plugins-base-0.10 ) java? ( >=dev-java/bsh-2.0_beta4 dev-java/lucene:2.9 dev-java/lucene-analyzers:2.3 ) jemalloc? ( dev-libs/jemalloc ) mysql? ( >=dev-db/mysql-connector-c++-1.1.0 ) opengl? ( virtual/opengl ) pdfimport? ( >=app-text/poppler-0.16[xpdf-headers,cxx] ) postgres? ( >=dev-db/postgresql-base-8.4.0 ) svg? ( gnome-base/librsvg ) webdav? ( net-libs/neon ) xmlsec? ( >=dev-libs/nspr-4.8.8 >=dev-libs/nss-3.12.9 ) !app-office/libreoffice-bin !app-office/openoffice-bin !app-office/openoffice media-fonts/libertine-ttf media-fonts/liberation-fonts java? ( >=virtual/jre-1.6 ) java? ( >=dev-java/java-config-2.1.9-r1 ) kde? ( >=kde-base/oxygen-icons-4.4:4[aqua=] ) kde? ( dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=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[kde?] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] ) >=app-admin/eselect-python-20091230 =dev-lang/python-2* =dev-lang/python-2*[threads,xml]
+app-arch/zip app-arch/unzip >=app-text/hunspell-1.3.2-r3 app-text/mythes >=app-text/libexttextcat-3.2 app-text/libwpd:0.9[tools] app-text/libwpg:0.2 >=app-text/libwps-0.2.2 dev-cpp/libcmis dev-db/unixODBC dev-libs/expat >=dev-libs/glib-2.28 >=dev-libs/hyphen-2.7.1 >=dev-libs/icu-4.8.1.1 >=dev-lang/perl-5.0 >=dev-libs/openssl-1.0.0d >=dev-libs/redland-1.0.14[ssl] >=media-libs/fontconfig-2.8.0 media-libs/freetype:2 >=media-libs/libpng-1.4 media-libs/libvisio sci-mathematics/lpsolve >=sys-libs/db-4.8 virtual/jpeg >=x11-libs/cairo-1.10.0[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender dbus? ( >=dev-libs/dbus-glib-0.92 ) eds? ( gnome-extra/evolution-data-server ) gnome? ( gnome-base/gconf:2 gnome-base/orbit ) gtk? ( >=x11-libs/gtk+-2.24:2 ) gtk3? ( >=x11-libs/gtk+-3.2:3 ) graphite? ( media-gfx/graphite2 ) gstreamer? ( >=media-libs/gstreamer-0.10 >=media-libs/gst-plugins-base-0.10 ) java? ( >=dev-java/bsh-2.0_beta4 dev-java/lucene:2.9 dev-java/lucene-analyzers:2.3 ) jemalloc? ( dev-libs/jemalloc ) mysql? ( >=dev-db/mysql-connector-c++-1.1.0 ) opengl? ( virtual/opengl ) pdfimport? ( >=app-text/poppler-0.16[xpdf-headers,cxx] ) postgres? ( >=dev-db/postgresql-base-8.4.0 ) svg? ( gnome-base/librsvg ) webdav? ( net-libs/neon ) xmlsec? ( >=dev-libs/nspr-4.8.8 >=dev-libs/nss-3.12.9 ) >=dev-libs/boost-1.46 >=dev-libs/libxml2-2.7.8 dev-libs/libxslt dev-perl/Archive-Zip dev-util/cppunit >=dev-util/gperf-3 dev-util/intltool dev-util/mdds >=dev-util/pkgconfig-0.26 media-libs/sampleicc >=net-misc/curl-7.21.4 net-misc/npapi-sdk net-print/cups >=sys-apps/findutils-4.4.2 sys-devel/bison sys-apps/coreutils sys-devel/flex sys-devel/gettext >=sys-devel/make-3.82 sys-libs/zlib x11-libs/libXtst x11-proto/randrproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto java? ( =virtual/jdk-1.6* >=dev-java/ant-core-1.7 test? ( dev-java/junit:4 ) ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 ) >=sys-apps/sed-4 kde? ( dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) ) kde? ( dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=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[kde?] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] ) >=app-admin/eselect-python-20091230 =dev-lang/python-2* =dev-lang/python-2*[threads,xml]
+app-arch/zip app-arch/unzip >=app-text/hunspell-1.3.2-r3 app-text/mythes >=app-text/libexttextcat-3.2 app-text/libwpd:0.9[tools] app-text/libwpg:0.2 >=app-text/libwps-0.2.2 dev-cpp/libcmis dev-db/unixODBC dev-libs/expat >=dev-libs/glib-2.28 >=dev-libs/hyphen-2.7.1 >=dev-libs/icu-4.8.1.1 >=dev-lang/perl-5.0 >=dev-libs/openssl-1.0.0d >=dev-libs/redland-1.0.14[ssl] >=media-libs/fontconfig-2.8.0 media-libs/freetype:2 >=media-libs/libpng-1.4 media-libs/libvisio sci-mathematics/lpsolve >=sys-libs/db-4.8 virtual/jpeg >=x11-libs/cairo-1.10.0[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender dbus? ( >=dev-libs/dbus-glib-0.92 ) eds? ( gnome-extra/evolution-data-server ) gnome? ( gnome-base/gconf:2 gnome-base/orbit ) gtk? ( >=x11-libs/gtk+-2.24:2 ) gtk3? ( >=x11-libs/gtk+-3.2:3 ) graphite? ( media-gfx/graphite2 ) gstreamer? ( >=media-libs/gstreamer-0.10 >=media-libs/gst-plugins-base-0.10 ) java? ( >=dev-java/bsh-2.0_beta4 dev-java/lucene:2.9 dev-java/lucene-analyzers:2.3 ) jemalloc? ( dev-libs/jemalloc ) mysql? ( >=dev-db/mysql-connector-c++-1.1.0 ) opengl? ( virtual/opengl ) pdfimport? ( >=app-text/poppler-0.16[xpdf-headers,cxx] ) postgres? ( >=dev-db/postgresql-base-8.4.0 ) svg? ( gnome-base/librsvg ) webdav? ( net-libs/neon ) xmlsec? ( >=dev-libs/nspr-4.8.8 >=dev-libs/nss-3.12.9 ) !app-office/libreoffice-bin !app-office/openoffice-bin !app-office/openoffice media-fonts/libertine-ttf media-fonts/liberation-fonts cups? ( net-print/cups ) java? ( >=virtual/jre-1.6 ) java? ( >=dev-java/java-config-2.1.9-r1 ) kde? ( >=kde-base/oxygen-icons-4.4:4[aqua=] ) kde? ( dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=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[kde?] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] ) >=app-admin/eselect-python-20091230 =dev-lang/python-2* =dev-lang/python-2*[threads,xml]
 0
 branding? ( http://dev.gentooexperimental.org/~scarabeus/libreoffice-branding-gentoo-0.3.tar.xz ) http://dev-builds.libreoffice.org/pre-releases/src/libreoffice-core-3.5.0.3.tar.xz binfilter? ( http://dev-builds.libreoffice.org/pre-releases/src/libreoffice-binfilter-3.5.0.3.tar.xz ) http://download.documentfoundation.org/libreoffice/src/libreoffice-core-3.5.0.3.tar.xz binfilter? ( http://download.documentfoundation.org/libreoffice/src/libreoffice-binfilter-3.5.0.3.tar.xz ) http://download.documentfoundation.org/libreoffice/old/src/libreoffice-core-3.5.0.3.tar.xz binfilter? ( http://download.documentfoundation.org/libreoffice/old/src/libreoffice-binfilter-3.5.0.3.tar.xz ) http://dev-www.libreoffice.org/src//ea91f2fb4212a21d708aced277e6e85a-vigra1.4.0.tar.gz xmlsec? ( http://dev-www.libreoffice.org/src//1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz ) java? ( http://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) java? ( http://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) java? ( http://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) java? ( http://dev-www.libreoffice.org/src//ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
 
@@ -8,7 +8,7 @@ LGPL-3
 LibreOffice, a full office productivity suite.
 ~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
 autotools base bash-completion-r1 check-reqs eutils fdo-mime flag-o-matic gnome2-utils java-pkg-opt-2 java-utils-2 kde4-base kde4-functions libtool multilib nsplugins pax-utils portability prefix python toolchain-funcs user versionator virtualx
-binfilter +branding dbus debug eds gnome +graphite gstreamer +gtk gtk3 jemalloc kde mysql +nsplugin odk opengl pdfimport postgres svg test +vba +webdav +xmlsec elibc_FreeBSD java aqua kde
+binfilter +branding +cups dbus debug eds gnome +graphite gstreamer +gtk gtk3 jemalloc kde mysql +nsplugin odk opengl pdfimport postgres svg test +vba +webdav +xmlsec elibc_FreeBSD java aqua kde
 nsplugin? ( gtk ) gnome? ( gtk ) eds? ( gnome )
 >=app-office/libreoffice-l10n-3.5.0
 
diff --git a/metadata/cache/app-office/libreoffice-3.5.9999 b/metadata/cache/app-office/libreoffice-3.5.9999
index 02566cbd9ffd..2f5a20b325d3 100644
--- a/metadata/cache/app-office/libreoffice-3.5.9999
+++ b/metadata/cache/app-office/libreoffice-3.5.9999
@@ -1,5 +1,5 @@
-app-arch/zip app-arch/unzip >=app-text/hunspell-1.3.2-r3 app-text/mythes >=app-text/libexttextcat-3.2 app-text/libwpd:0.9[tools] app-text/libwpg:0.2 >=app-text/libwps-0.2.2 dev-cpp/libcmis dev-db/unixODBC dev-libs/expat >=dev-libs/glib-2.28 >=dev-libs/hyphen-2.7.1 >=dev-libs/icu-4.8.1-r1 >=dev-lang/perl-5.0 >=dev-libs/openssl-1.0.0d >=dev-libs/redland-1.0.14[ssl] >=media-libs/fontconfig-2.8.0 media-libs/freetype:2 >=media-libs/libpng-1.4 media-libs/libvisio net-print/cups sci-mathematics/lpsolve >=sys-libs/db-4.8 virtual/jpeg >=x11-libs/cairo-1.10.0[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender dbus? ( >=dev-libs/dbus-glib-0.92 ) eds? ( gnome-extra/evolution-data-server ) gnome? ( gnome-base/gconf:2 gnome-base/orbit ) gtk? ( >=x11-libs/gtk+-2.24:2 ) gtk3? ( >=x11-libs/gtk+-3.2:3 ) graphite? ( media-gfx/graphite2 ) gstreamer? ( >=media-libs/gstreamer-0.10 >=media-libs/gst-plugins-base-0.10 ) java? ( >=dev-java/bsh-2.0_beta4 dev-java/lucene:2.9 dev-java/lucene-analyzers:2.3 ) jemalloc? ( dev-libs/jemalloc ) mysql? ( >=dev-db/mysql-connector-c++-1.1.0 ) opengl? ( virtual/opengl ) pdfimport? ( >=app-text/poppler-0.16[xpdf-headers,cxx] ) postgres? ( >=dev-db/postgresql-base-8.4.0 ) svg? ( gnome-base/librsvg ) webdav? ( net-libs/neon ) xmlsec? ( >=dev-libs/nspr-4.8.8 >=dev-libs/nss-3.12.9 ) >=dev-libs/boost-1.46 >=dev-libs/libxml2-2.7.8 dev-libs/libxslt dev-perl/Archive-Zip dev-util/cppunit >=dev-util/gperf-3 dev-util/intltool dev-util/mdds >=dev-util/pkgconfig-0.26 media-libs/sampleicc >=net-misc/curl-7.21.4 net-misc/npapi-sdk >=sys-apps/findutils-4.4.2 sys-devel/bison sys-apps/coreutils sys-devel/flex sys-devel/gettext >=sys-devel/make-3.82 sys-libs/zlib x11-libs/libXtst x11-proto/randrproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto java? ( =virtual/jdk-1.6* >=dev-java/ant-core-1.7 test? ( dev-java/junit:4 ) ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 ) >=sys-apps/sed-4 dev-vcs/git kde? ( dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) ) kde? ( dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=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[kde?] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] ) >=app-admin/eselect-python-20091230 =dev-lang/python-2* =dev-lang/python-2*[threads,xml] dev-vcs/git
-app-arch/zip app-arch/unzip >=app-text/hunspell-1.3.2-r3 app-text/mythes >=app-text/libexttextcat-3.2 app-text/libwpd:0.9[tools] app-text/libwpg:0.2 >=app-text/libwps-0.2.2 dev-cpp/libcmis dev-db/unixODBC dev-libs/expat >=dev-libs/glib-2.28 >=dev-libs/hyphen-2.7.1 >=dev-libs/icu-4.8.1-r1 >=dev-lang/perl-5.0 >=dev-libs/openssl-1.0.0d >=dev-libs/redland-1.0.14[ssl] >=media-libs/fontconfig-2.8.0 media-libs/freetype:2 >=media-libs/libpng-1.4 media-libs/libvisio net-print/cups sci-mathematics/lpsolve >=sys-libs/db-4.8 virtual/jpeg >=x11-libs/cairo-1.10.0[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender dbus? ( >=dev-libs/dbus-glib-0.92 ) eds? ( gnome-extra/evolution-data-server ) gnome? ( gnome-base/gconf:2 gnome-base/orbit ) gtk? ( >=x11-libs/gtk+-2.24:2 ) gtk3? ( >=x11-libs/gtk+-3.2:3 ) graphite? ( media-gfx/graphite2 ) gstreamer? ( >=media-libs/gstreamer-0.10 >=media-libs/gst-plugins-base-0.10 ) java? ( >=dev-java/bsh-2.0_beta4 dev-java/lucene:2.9 dev-java/lucene-analyzers:2.3 ) jemalloc? ( dev-libs/jemalloc ) mysql? ( >=dev-db/mysql-connector-c++-1.1.0 ) opengl? ( virtual/opengl ) pdfimport? ( >=app-text/poppler-0.16[xpdf-headers,cxx] ) postgres? ( >=dev-db/postgresql-base-8.4.0 ) svg? ( gnome-base/librsvg ) webdav? ( net-libs/neon ) xmlsec? ( >=dev-libs/nspr-4.8.8 >=dev-libs/nss-3.12.9 ) !app-office/libreoffice-bin !app-office/openoffice-bin !app-office/openoffice media-fonts/libertine-ttf media-fonts/liberation-fonts java? ( >=virtual/jre-1.6 ) java? ( >=dev-java/java-config-2.1.9-r1 ) kde? ( >=kde-base/oxygen-icons-4.4:4[aqua=] ) kde? ( dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=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[kde?] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] ) >=app-admin/eselect-python-20091230 =dev-lang/python-2* =dev-lang/python-2*[threads,xml]
+app-arch/zip app-arch/unzip >=app-text/hunspell-1.3.2-r3 app-text/mythes >=app-text/libexttextcat-3.2 app-text/libwpd:0.9[tools] app-text/libwpg:0.2 >=app-text/libwps-0.2.2 dev-cpp/libcmis dev-db/unixODBC dev-libs/expat >=dev-libs/glib-2.28 >=dev-libs/hyphen-2.7.1 >=dev-libs/icu-4.8.1.1 >=dev-lang/perl-5.0 >=dev-libs/openssl-1.0.0d >=dev-libs/redland-1.0.14[ssl] >=media-libs/fontconfig-2.8.0 media-libs/freetype:2 >=media-libs/libpng-1.4 media-libs/libvisio sci-mathematics/lpsolve >=sys-libs/db-4.8 virtual/jpeg >=x11-libs/cairo-1.10.0[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender dbus? ( >=dev-libs/dbus-glib-0.92 ) eds? ( gnome-extra/evolution-data-server ) gnome? ( gnome-base/gconf:2 gnome-base/orbit ) gtk? ( >=x11-libs/gtk+-2.24:2 ) gtk3? ( >=x11-libs/gtk+-3.2:3 ) graphite? ( media-gfx/graphite2 ) gstreamer? ( >=media-libs/gstreamer-0.10 >=media-libs/gst-plugins-base-0.10 ) java? ( >=dev-java/bsh-2.0_beta4 dev-java/lucene:2.9 dev-java/lucene-analyzers:2.3 ) jemalloc? ( dev-libs/jemalloc ) mysql? ( >=dev-db/mysql-connector-c++-1.1.0 ) opengl? ( virtual/opengl ) pdfimport? ( >=app-text/poppler-0.16[xpdf-headers,cxx] ) postgres? ( >=dev-db/postgresql-base-8.4.0 ) svg? ( gnome-base/librsvg ) webdav? ( net-libs/neon ) xmlsec? ( >=dev-libs/nspr-4.8.8 >=dev-libs/nss-3.12.9 ) >=dev-libs/boost-1.46 >=dev-libs/libxml2-2.7.8 dev-libs/libxslt dev-perl/Archive-Zip dev-util/cppunit >=dev-util/gperf-3 dev-util/intltool dev-util/mdds >=dev-util/pkgconfig-0.26 media-libs/sampleicc >=net-misc/curl-7.21.4 net-misc/npapi-sdk net-print/cups >=sys-apps/findutils-4.4.2 sys-devel/bison sys-apps/coreutils sys-devel/flex sys-devel/gettext >=sys-devel/make-3.82 sys-libs/zlib x11-libs/libXtst x11-proto/randrproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto java? ( =virtual/jdk-1.6* >=dev-java/ant-core-1.7 test? ( dev-java/junit:4 ) ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 ) >=sys-apps/sed-4 dev-vcs/git kde? ( dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) ) kde? ( dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=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[kde?] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] ) >=app-admin/eselect-python-20091230 =dev-lang/python-2* =dev-lang/python-2*[threads,xml] dev-vcs/git
+app-arch/zip app-arch/unzip >=app-text/hunspell-1.3.2-r3 app-text/mythes >=app-text/libexttextcat-3.2 app-text/libwpd:0.9[tools] app-text/libwpg:0.2 >=app-text/libwps-0.2.2 dev-cpp/libcmis dev-db/unixODBC dev-libs/expat >=dev-libs/glib-2.28 >=dev-libs/hyphen-2.7.1 >=dev-libs/icu-4.8.1.1 >=dev-lang/perl-5.0 >=dev-libs/openssl-1.0.0d >=dev-libs/redland-1.0.14[ssl] >=media-libs/fontconfig-2.8.0 media-libs/freetype:2 >=media-libs/libpng-1.4 media-libs/libvisio sci-mathematics/lpsolve >=sys-libs/db-4.8 virtual/jpeg >=x11-libs/cairo-1.10.0[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender dbus? ( >=dev-libs/dbus-glib-0.92 ) eds? ( gnome-extra/evolution-data-server ) gnome? ( gnome-base/gconf:2 gnome-base/orbit ) gtk? ( >=x11-libs/gtk+-2.24:2 ) gtk3? ( >=x11-libs/gtk+-3.2:3 ) graphite? ( media-gfx/graphite2 ) gstreamer? ( >=media-libs/gstreamer-0.10 >=media-libs/gst-plugins-base-0.10 ) java? ( >=dev-java/bsh-2.0_beta4 dev-java/lucene:2.9 dev-java/lucene-analyzers:2.3 ) jemalloc? ( dev-libs/jemalloc ) mysql? ( >=dev-db/mysql-connector-c++-1.1.0 ) opengl? ( virtual/opengl ) pdfimport? ( >=app-text/poppler-0.16[xpdf-headers,cxx] ) postgres? ( >=dev-db/postgresql-base-8.4.0 ) svg? ( gnome-base/librsvg ) webdav? ( net-libs/neon ) xmlsec? ( >=dev-libs/nspr-4.8.8 >=dev-libs/nss-3.12.9 ) !app-office/libreoffice-bin !app-office/openoffice-bin !app-office/openoffice media-fonts/libertine-ttf media-fonts/liberation-fonts cups? ( net-print/cups ) java? ( >=virtual/jre-1.6 ) java? ( >=dev-java/java-config-2.1.9-r1 ) kde? ( >=kde-base/oxygen-icons-4.4:4[aqua=] ) kde? ( dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=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[kde?] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] ) >=app-admin/eselect-python-20091230 =dev-lang/python-2* =dev-lang/python-2*[threads,xml]
 0
 branding? ( http://dev.gentooexperimental.org/~scarabeus/libreoffice-branding-gentoo-0.3.tar.xz ) http://dev-www.libreoffice.org/src//ea91f2fb4212a21d708aced277e6e85a-vigra1.4.0.tar.gz xmlsec? ( http://dev-www.libreoffice.org/src//1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz ) java? ( http://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) java? ( http://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) java? ( http://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) java? ( http://dev-www.libreoffice.org/src//ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
 
@@ -8,7 +8,7 @@ LGPL-3
 LibreOffice, a full office productivity suite.
 
 autotools base bash-completion-r1 check-reqs eutils fdo-mime flag-o-matic git-2 gnome2-utils java-pkg-opt-2 java-utils-2 kde4-base kde4-functions libtool multilib nsplugins pax-utils portability prefix python toolchain-funcs user versionator virtualx
-binfilter +branding dbus debug eds gnome +graphite gstreamer +gtk gtk3 jemalloc kde mysql +nsplugin odk opengl pdfimport postgres svg test +vba +webdav +xmlsec elibc_FreeBSD java aqua kde
+binfilter +branding +cups dbus debug eds gnome +graphite gstreamer +gtk gtk3 jemalloc kde mysql +nsplugin odk opengl pdfimport postgres svg test +vba +webdav +xmlsec elibc_FreeBSD java aqua kde
 nsplugin? ( gtk ) gnome? ( gtk ) eds? ( gnome )
 >=app-office/libreoffice-l10n-3.5.0
 
diff --git a/metadata/cache/app-office/libreoffice-9999-r2 b/metadata/cache/app-office/libreoffice-9999-r2
index ed9f7853b033..7852ff17d956 100644
--- a/metadata/cache/app-office/libreoffice-9999-r2
+++ b/metadata/cache/app-office/libreoffice-9999-r2
@@ -1,5 +1,5 @@
-app-arch/zip app-arch/unzip >=app-text/hunspell-1.3.2-r3 app-text/mythes >=app-text/libexttextcat-3.2 app-text/libwpd:0.9[tools] app-text/libwpg:0.2 >=app-text/libwps-0.2.2 dev-cpp/libcmis dev-db/unixODBC dev-libs/expat >=dev-libs/glib-2.28 >=dev-libs/hyphen-2.7.1 >=dev-libs/icu-4.8.1-r1 >=dev-lang/perl-5.0 >=dev-libs/openssl-1.0.0d >=dev-libs/redland-1.0.14[ssl] >=media-libs/fontconfig-2.8.0 media-libs/freetype:2 >=media-libs/libpng-1.4 media-libs/libcdr media-libs/libvisio net-print/cups sci-mathematics/lpsolve >=sys-libs/db-4.8 virtual/jpeg >=x11-libs/cairo-1.10.0[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender dbus? ( >=dev-libs/dbus-glib-0.92 ) eds? ( gnome-extra/evolution-data-server ) gnome? ( gnome-base/gconf:2 gnome-base/orbit ) gtk? ( x11-libs/gdk-pixbuf[X] >=x11-libs/gtk+-2.24:2 ) gtk3? ( >=x11-libs/gtk+-3.2:3 ) graphite? ( media-gfx/graphite2 ) gstreamer? ( >=media-libs/gstreamer-0.10 >=media-libs/gst-plugins-base-0.10 ) java? ( >=dev-java/bsh-2.0_beta4 dev-java/lucene:2.9 dev-java/lucene-analyzers:2.3 ) jemalloc? ( dev-libs/jemalloc ) mysql? ( >=dev-db/mysql-connector-c++-1.1.0 ) opengl? ( virtual/opengl ) pdfimport? ( >=app-text/poppler-0.16[xpdf-headers,cxx] ) postgres? ( >=dev-db/postgresql-base-8.4.0 ) svg? ( gnome-base/librsvg ) webdav? ( net-libs/neon ) xmlsec? ( >=dev-libs/nspr-4.8.8 >=dev-libs/nss-3.12.9 ) >=dev-libs/boost-1.46 >=dev-libs/libxml2-2.7.8 dev-libs/libxslt dev-perl/Archive-Zip dev-util/cppunit >=dev-util/gperf-3 dev-util/intltool dev-util/mdds >=dev-util/pkgconfig-0.26 media-libs/sampleicc >=net-misc/curl-7.21.4 net-misc/npapi-sdk >=sys-apps/findutils-4.4.2 sys-devel/bison sys-apps/coreutils sys-devel/flex sys-devel/gettext >=sys-devel/make-3.82 sys-libs/zlib x11-libs/libXtst x11-proto/randrproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto java? ( =virtual/jdk-1.6* >=dev-java/ant-core-1.7 test? ( dev-java/junit:4 ) ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 ) >=sys-apps/sed-4 dev-vcs/git kde? ( dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) ) kde? ( dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=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[kde?] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] ) >=app-admin/eselect-python-20091230 =dev-lang/python-2* =dev-lang/python-2*[threads,xml] dev-vcs/git
-app-arch/zip app-arch/unzip >=app-text/hunspell-1.3.2-r3 app-text/mythes >=app-text/libexttextcat-3.2 app-text/libwpd:0.9[tools] app-text/libwpg:0.2 >=app-text/libwps-0.2.2 dev-cpp/libcmis dev-db/unixODBC dev-libs/expat >=dev-libs/glib-2.28 >=dev-libs/hyphen-2.7.1 >=dev-libs/icu-4.8.1-r1 >=dev-lang/perl-5.0 >=dev-libs/openssl-1.0.0d >=dev-libs/redland-1.0.14[ssl] >=media-libs/fontconfig-2.8.0 media-libs/freetype:2 >=media-libs/libpng-1.4 media-libs/libcdr media-libs/libvisio net-print/cups sci-mathematics/lpsolve >=sys-libs/db-4.8 virtual/jpeg >=x11-libs/cairo-1.10.0[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender dbus? ( >=dev-libs/dbus-glib-0.92 ) eds? ( gnome-extra/evolution-data-server ) gnome? ( gnome-base/gconf:2 gnome-base/orbit ) gtk? ( x11-libs/gdk-pixbuf[X] >=x11-libs/gtk+-2.24:2 ) gtk3? ( >=x11-libs/gtk+-3.2:3 ) graphite? ( media-gfx/graphite2 ) gstreamer? ( >=media-libs/gstreamer-0.10 >=media-libs/gst-plugins-base-0.10 ) java? ( >=dev-java/bsh-2.0_beta4 dev-java/lucene:2.9 dev-java/lucene-analyzers:2.3 ) jemalloc? ( dev-libs/jemalloc ) mysql? ( >=dev-db/mysql-connector-c++-1.1.0 ) opengl? ( virtual/opengl ) pdfimport? ( >=app-text/poppler-0.16[xpdf-headers,cxx] ) postgres? ( >=dev-db/postgresql-base-8.4.0 ) svg? ( gnome-base/librsvg ) webdav? ( net-libs/neon ) xmlsec? ( >=dev-libs/nspr-4.8.8 >=dev-libs/nss-3.12.9 ) !app-office/libreoffice-bin !app-office/openoffice-bin !app-office/openoffice media-fonts/libertine-ttf media-fonts/liberation-fonts java? ( >=virtual/jre-1.6 ) java? ( >=dev-java/java-config-2.1.9-r1 ) kde? ( >=kde-base/oxygen-icons-4.4:4[aqua=] ) kde? ( dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=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[kde?] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] ) >=app-admin/eselect-python-20091230 =dev-lang/python-2* =dev-lang/python-2*[threads,xml]
+app-arch/zip app-arch/unzip >=app-text/hunspell-1.3.2-r3 app-text/mythes >=app-text/libexttextcat-3.2 app-text/libwpd:0.9[tools] app-text/libwpg:0.2 >=app-text/libwps-0.2.2 dev-cpp/libcmis dev-db/unixODBC dev-libs/expat >=dev-libs/glib-2.28 >=dev-libs/hyphen-2.7.1 >=dev-libs/icu-4.8.1.1 >=dev-lang/perl-5.0 >=dev-libs/openssl-1.0.0d >=dev-libs/redland-1.0.14[ssl] >=media-libs/fontconfig-2.8.0 media-libs/freetype:2 >=media-libs/libpng-1.4 media-libs/libcdr media-libs/libvisio sci-mathematics/lpsolve >=sys-libs/db-4.8 virtual/jpeg >=x11-libs/cairo-1.10.0[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender dbus? ( >=dev-libs/dbus-glib-0.92 ) eds? ( gnome-extra/evolution-data-server ) gnome? ( gnome-base/gconf:2 gnome-base/orbit ) gtk? ( x11-libs/gdk-pixbuf[X] >=x11-libs/gtk+-2.24:2 ) gtk3? ( >=x11-libs/gtk+-3.2:3 ) graphite? ( media-gfx/graphite2 ) gstreamer? ( >=media-libs/gstreamer-0.10 >=media-libs/gst-plugins-base-0.10 ) java? ( >=dev-java/bsh-2.0_beta4 dev-java/lucene:2.9 dev-java/lucene-analyzers:2.3 ) jemalloc? ( dev-libs/jemalloc ) mysql? ( >=dev-db/mysql-connector-c++-1.1.0 ) opengl? ( virtual/opengl ) pdfimport? ( >=app-text/poppler-0.16[xpdf-headers,cxx] ) postgres? ( >=dev-db/postgresql-base-8.4.0 ) svg? ( gnome-base/librsvg ) webdav? ( net-libs/neon ) xmlsec? ( >=dev-libs/nspr-4.8.8 >=dev-libs/nss-3.12.9 ) >=dev-libs/boost-1.46 >=dev-libs/libxml2-2.7.8 dev-libs/libxslt dev-perl/Archive-Zip dev-util/cppunit >=dev-util/gperf-3 dev-util/intltool dev-util/mdds >=dev-util/pkgconfig-0.26 media-libs/sampleicc >=net-misc/curl-7.21.4 net-misc/npapi-sdk net-print/cups >=sys-apps/findutils-4.4.2 sys-devel/bison sys-apps/coreutils sys-devel/flex sys-devel/gettext >=sys-devel/make-3.82 sys-libs/zlib x11-libs/libXtst x11-proto/randrproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto java? ( =virtual/jdk-1.6* >=dev-java/ant-core-1.7 test? ( dev-java/junit:4 ) ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 ) >=sys-apps/sed-4 dev-vcs/git kde? ( dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) ) kde? ( dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=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[kde?] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] ) >=app-admin/eselect-python-20091230 =dev-lang/python-2* =dev-lang/python-2*[threads,xml] dev-vcs/git
+app-arch/zip app-arch/unzip >=app-text/hunspell-1.3.2-r3 app-text/mythes >=app-text/libexttextcat-3.2 app-text/libwpd:0.9[tools] app-text/libwpg:0.2 >=app-text/libwps-0.2.2 dev-cpp/libcmis dev-db/unixODBC dev-libs/expat >=dev-libs/glib-2.28 >=dev-libs/hyphen-2.7.1 >=dev-libs/icu-4.8.1.1 >=dev-lang/perl-5.0 >=dev-libs/openssl-1.0.0d >=dev-libs/redland-1.0.14[ssl] >=media-libs/fontconfig-2.8.0 media-libs/freetype:2 >=media-libs/libpng-1.4 media-libs/libcdr media-libs/libvisio sci-mathematics/lpsolve >=sys-libs/db-4.8 virtual/jpeg >=x11-libs/cairo-1.10.0[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender dbus? ( >=dev-libs/dbus-glib-0.92 ) eds? ( gnome-extra/evolution-data-server ) gnome? ( gnome-base/gconf:2 gnome-base/orbit ) gtk? ( x11-libs/gdk-pixbuf[X] >=x11-libs/gtk+-2.24:2 ) gtk3? ( >=x11-libs/gtk+-3.2:3 ) graphite? ( media-gfx/graphite2 ) gstreamer? ( >=media-libs/gstreamer-0.10 >=media-libs/gst-plugins-base-0.10 ) java? ( >=dev-java/bsh-2.0_beta4 dev-java/lucene:2.9 dev-java/lucene-analyzers:2.3 ) jemalloc? ( dev-libs/jemalloc ) mysql? ( >=dev-db/mysql-connector-c++-1.1.0 ) opengl? ( virtual/opengl ) pdfimport? ( >=app-text/poppler-0.16[xpdf-headers,cxx] ) postgres? ( >=dev-db/postgresql-base-8.4.0 ) svg? ( gnome-base/librsvg ) webdav? ( net-libs/neon ) xmlsec? ( >=dev-libs/nspr-4.8.8 >=dev-libs/nss-3.12.9 ) !app-office/libreoffice-bin !app-office/openoffice-bin !app-office/openoffice media-fonts/libertine-ttf media-fonts/liberation-fonts cups? ( net-print/cups ) java? ( >=virtual/jre-1.6 ) java? ( >=dev-java/java-config-2.1.9-r1 ) kde? ( >=kde-base/oxygen-icons-4.4:4[aqua=] ) kde? ( dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=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[kde?] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] ) >=app-admin/eselect-python-20091230 =dev-lang/python-2* =dev-lang/python-2*[threads,xml]
 0
 branding? ( http://dev.gentooexperimental.org/~scarabeus/libreoffice-branding-gentoo-0.3.tar.xz ) http://dev-www.libreoffice.org/src//ea91f2fb4212a21d708aced277e6e85a-vigra1.4.0.tar.gz xmlsec? ( http://dev-www.libreoffice.org/src//1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz ) java? ( http://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) java? ( http://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) java? ( http://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) java? ( http://dev-www.libreoffice.org/src//ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
 
@@ -8,7 +8,7 @@ LGPL-3
 LibreOffice, a full office productivity suite.
 
 autotools base bash-completion-r1 check-reqs eutils fdo-mime flag-o-matic git-2 gnome2-utils java-pkg-opt-2 java-utils-2 kde4-base kde4-functions libtool multilib nsplugins pax-utils portability prefix python toolchain-funcs user versionator virtualx
-binfilter +branding dbus debug eds gnome +graphite gstreamer +gtk gtk3 jemalloc kde mysql +nsplugin odk opengl pdfimport postgres svg test +vba +webdav +xmlsec elibc_FreeBSD java aqua kde
+binfilter +branding +cups dbus debug eds gnome +graphite gstreamer +gtk gtk3 jemalloc kde mysql +nsplugin odk opengl pdfimport postgres svg test +vba +webdav +xmlsec elibc_FreeBSD java aqua kde
 nsplugin? ( gtk ) gnome? ( gtk ) eds? ( gnome )
 >=app-office/libreoffice-l10n-3.5
 
diff --git a/metadata/cache/app-office/libreoffice-bin-3.4.5.2-r1 b/metadata/cache/app-office/libreoffice-bin-3.4.5.2-r1
index ad1b97cc8a17..409c83043ad5 100644
--- a/metadata/cache/app-office/libreoffice-bin-3.4.5.2-r1
+++ b/metadata/cache/app-office/libreoffice-bin-3.4.5.2-r1
@@ -1,5 +1,5 @@
-app-arch/zip app-arch/unzip >=app-text/hunspell-1.3.2-r3 app-text/mythes app-text/libwpd:0.9[tools] app-text/libwpg:0.2 >=app-text/libwps-0.2.2 dev-db/unixODBC dev-libs/expat >=dev-libs/glib-2.28 >=dev-libs/hyphen-2.7.1 >=dev-libs/icu-4.8.1-r1 >=dev-lang/perl-5.0 >=dev-libs/openssl-1.0.0e >=dev-libs/redland-1.0.14[ssl] media-libs/freetype:2 >=media-libs/fontconfig-2.8.0 >=media-libs/libpng-1.5 net-print/cups sci-mathematics/lpsolve >=sys-libs/db-4.8 virtual/jpeg >=x11-libs/cairo-1.10.0[X] x11-libs/libXaw x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender >=dev-libs/dbus-glib-0.92 gnome? ( gnome-base/gconf:2 gnome-extra/evolution-data-server ) >=x11-libs/gtk+-2.24:2 media-gfx/graphite2 >=media-libs/gstreamer-0.10 >=media-libs/gst-plugins-base-0.10 java? ( >=dev-java/bsh-2.0_beta4 dev-java/lucene:2.9 dev-java/lucene-analyzers:2.3 dev-java/saxon:0 ) virtual/opengl net-libs/neon >=sys-apps/sed-4 kde? ( dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) ) kde? ( dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=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[kde?] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] ) java? ( >=dev-java/java-config-2.1.9-r1 )
-app-arch/zip app-arch/unzip >=app-text/hunspell-1.3.2-r3 app-text/mythes app-text/libwpd:0.9[tools] app-text/libwpg:0.2 >=app-text/libwps-0.2.2 dev-db/unixODBC dev-libs/expat >=dev-libs/glib-2.28 >=dev-libs/hyphen-2.7.1 >=dev-libs/icu-4.8.1-r1 >=dev-lang/perl-5.0 >=dev-libs/openssl-1.0.0e >=dev-libs/redland-1.0.14[ssl] media-libs/freetype:2 >=media-libs/fontconfig-2.8.0 >=media-libs/libpng-1.5 net-print/cups sci-mathematics/lpsolve >=sys-libs/db-4.8 virtual/jpeg >=x11-libs/cairo-1.10.0[X] x11-libs/libXaw x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender >=dev-libs/dbus-glib-0.92 gnome? ( gnome-base/gconf:2 gnome-extra/evolution-data-server ) >=x11-libs/gtk+-2.24:2 media-gfx/graphite2 >=media-libs/gstreamer-0.10 >=media-libs/gst-plugins-base-0.10 java? ( >=dev-java/bsh-2.0_beta4 dev-java/lucene:2.9 dev-java/lucene-analyzers:2.3 dev-java/saxon:0 ) virtual/opengl net-libs/neon !app-office/libreoffice !app-office/openoffice-bin !app-office/openoffice java? ( >=virtual/jre-1.6 ) kde? ( >=kde-base/oxygen-icons-4.4:4[aqua=] ) kde? ( dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=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[kde?] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] ) java? ( >=dev-java/java-config-2.1.9-r1 )
+>=sys-apps/sed-4 kde? ( dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) ) kde? ( dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=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[kde?] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] ) java? ( >=dev-java/java-config-2.1.9-r1 )
+app-arch/zip app-arch/unzip >=app-text/hunspell-1.3.2-r3 app-text/mythes app-text/libwpd:0.9[tools] app-text/libwpg:0.2 >=app-text/libwps-0.2.2 dev-db/unixODBC dev-libs/expat >=dev-libs/glib-2.28 >=dev-libs/hyphen-2.7.1 >=dev-libs/icu-4.8.1-r1 >=dev-lang/perl-5.0 >=dev-libs/openssl-1.0.0e >=dev-libs/redland-1.0.14[ssl] media-libs/freetype:2 >=media-libs/fontconfig-2.8.0 >=media-libs/libpng-1.5 sci-mathematics/lpsolve >=sys-libs/db-4.8 virtual/jpeg >=x11-libs/cairo-1.10.0[X] x11-libs/libXaw x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender >=dev-libs/dbus-glib-0.92 gnome? ( gnome-base/gconf:2 gnome-extra/evolution-data-server ) >=x11-libs/gtk+-2.24:2 media-gfx/graphite2 >=media-libs/gstreamer-0.10 >=media-libs/gst-plugins-base-0.10 java? ( >=dev-java/bsh-2.0_beta4 dev-java/lucene:2.9 dev-java/lucene-analyzers:2.3 dev-java/saxon:0 ) virtual/opengl net-libs/neon !app-office/libreoffice !app-office/openoffice-bin !app-office/openoffice cups? ( net-print/cups ) java? ( >=virtual/jre-1.6 ) kde? ( >=kde-base/oxygen-icons-4.4:4[aqua=] ) kde? ( dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=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[kde?] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] ) java? ( >=dev-java/java-config-2.1.9-r1 )
 0
 amd64? ( kde? ( !java? ( mirror://gentoo/amd64-bin-libreoffice-kde-3.4.5.2-r1.tbz2 ) java? ( mirror://gentoo/amd64-bin-libreoffice-kde-java-3.4.5.2-r1.tbz2 ) ) gnome? ( !java? ( mirror://gentoo/amd64-bin-libreoffice-gnome-3.4.5.2-r1.tbz2 ) java? ( mirror://gentoo/amd64-bin-libreoffice-gnome-java-3.4.5.2-r1.tbz2 ) ) !kde? ( !gnome? ( !java? ( mirror://gentoo/amd64-bin-libreoffice-base-3.4.5.2-r1.tbz2 ) java? ( mirror://gentoo/amd64-bin-libreoffice-base-java-3.4.5.2-r1.tbz2 ) ) ) ) x86? ( kde? ( !java? ( mirror://gentoo/x86-bin-libreoffice-kde-3.4.5.2-r1.tbz2 ) java? ( mirror://gentoo/x86-bin-libreoffice-kde-java-3.4.5.2-r1.tbz2 ) ) gnome? ( !java? ( mirror://gentoo/x86-bin-libreoffice-gnome-3.4.5.2-r1.tbz2 ) java? ( mirror://gentoo/x86-bin-libreoffice-gnome-java-3.4.5.2-r1.tbz2 ) ) !kde? ( !gnome? ( !java? ( mirror://gentoo/x86-bin-libreoffice-base-3.4.5.2-r1.tbz2 ) java? ( mirror://gentoo/x86-bin-libreoffice-base-java-3.4.5.2-r1.tbz2 ) ) ) )
 test strip
@@ -8,7 +8,7 @@ LGPL-3
 LibreOffice, a full office productivity suite. Binary package.
 -* ~amd64 ~x86
 base eutils fdo-mime gnome2-utils java-pkg-opt-2 java-utils-2 kde4-base kde4-functions multilib pax-utils portability prefix toolchain-funcs user versionator virtualx
-gnome java kde aqua kde elibc_FreeBSD java
++cups gnome java kde aqua kde elibc_FreeBSD java
 kde? ( !gnome ) gnome? ( !kde )
 =app-office/libreoffice-l10n-3.4.5*
 
diff --git a/metadata/cache/app-vim/command-t-1.3.1 b/metadata/cache/app-vim/command-t-1.3.1
new file mode 100644
index 000000000000..38adda977209
--- /dev/null
+++ b/metadata/cache/app-vim/command-t-1.3.1
@@ -0,0 +1,22 @@
+|| ( >=app-editors/vim-7.0 >=app-editors/gvim-7.0 ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 )
+|| ( app-editors/vim[ruby] app-editors/gvim[ruby] ) || ( >=app-editors/vim-7.0 >=app-editors/gvim-7.0 ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 )
+0
+http://dev.gentoo.org/~radhermit/distfiles/command-t-1.3.1.tar.bz2
+
+http://www.vim.org/scripts/script.php?script_id=3025 https://wincent.com/products/command-t
+MIT
+vim plugin: fast file navigation for vim
+~amd64 ~x86
+eutils java-utils-2 multilib portability ruby-ng toolchain-funcs user versionator vim-doc vim-plugin
+elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19
+|| ( ruby_targets_ruby18 ruby_targets_ruby19 )
+
+
+4
+
+compile configure install postinst postrm prepare setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-cpp/yaml-cpp-0.2.7 b/metadata/cache/dev-cpp/yaml-cpp-0.3.0
similarity index 83%
rename from metadata/cache/dev-cpp/yaml-cpp-0.2.7
rename to metadata/cache/dev-cpp/yaml-cpp-0.3.0
index a1aa24015af5..90c2e825ba47 100644
--- a/metadata/cache/dev-cpp/yaml-cpp-0.2.7
+++ b/metadata/cache/dev-cpp/yaml-cpp-0.3.0
@@ -1,7 +1,7 @@
 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
 
 0
-http://yaml-cpp.googlecode.com/files/yaml-cpp-0.2.7.tar.gz
+http://yaml-cpp.googlecode.com/files/yaml-cpp-0.3.0.tar.gz
 
 http://code.google.com/p/yaml-cpp/
 MIT
diff --git a/metadata/cache/dev-db/postgresql-base-8.3.18 b/metadata/cache/dev-db/postgresql-base-8.3.18
new file mode 100644
index 000000000000..2f1e3de18300
--- /dev/null
+++ b/metadata/cache/dev-db/postgresql-base-8.3.18
@@ -0,0 +1,22 @@
+>=app-admin/eselect-postgresql-1.0.10 virtual/libintl !!dev-db/libpq !!dev-db/postgresql !!dev-db/postgresql-client !!dev-db/postgresql-libs kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( virtual/pam ) readline? ( >=sys-libs/readline-4.1 ) ssl? ( >=dev-libs/openssl-0.9.6-r1 ) zlib? ( >=sys-libs/zlib-1.1.3 ) !!<sys-apps/sandbox-2.0 >=sys-devel/bison-1.875 sys-devel/flex nls? ( sys-devel/gettext ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=app-admin/eselect-postgresql-1.0.10 virtual/libintl !!dev-db/libpq !!dev-db/postgresql !!dev-db/postgresql-client !!dev-db/postgresql-libs kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( virtual/pam ) readline? ( >=sys-libs/readline-4.1 ) ssl? ( >=dev-libs/openssl-0.9.6-r1 ) zlib? ( >=sys-libs/zlib-1.1.3 )
+8.3
+mirror://postgresql/source/v8.3.18/postgresql-8.3.18.tar.bz2 http://dev.gentoo.org/~titanofold/postgresql-patches-8.3-r2.tbz2
+test
+http://www.postgresql.org/
+POSTGRESQL
+PostgreSQL libraries and clients
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd
+autotools eutils libtool multilib portability prefix toolchain-funcs user versionator
+doc kerberos ldap nls pam pg-intdatetime readline ssl threads zlib linguas_af linguas_cs linguas_de linguas_en linguas_es linguas_fa linguas_fr linguas_hr linguas_hu linguas_it linguas_ko linguas_nb linguas_pl linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sl linguas_sv linguas_tr linguas_zh_CN linguas_zh_TW
+
+doc? ( ~dev-db/postgresql-docs-8.3.18 )
+
+4
+
+compile configure install postinst postrm prepare
+
+
+
+
+
diff --git a/metadata/cache/dev-db/postgresql-base-8.4.11 b/metadata/cache/dev-db/postgresql-base-8.4.11
new file mode 100644
index 000000000000..394d99b0f688
--- /dev/null
+++ b/metadata/cache/dev-db/postgresql-base-8.4.11
@@ -0,0 +1,22 @@
+>=app-admin/eselect-postgresql-1.0.7 virtual/libintl !!dev-db/libpq !!dev-db/postgresql !!dev-db/postgresql-client !!dev-db/postgresql-libs kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( virtual/pam ) readline? ( >=sys-libs/readline-4.1 ) ssl? ( >=dev-libs/openssl-0.9.6-r1 ) zlib? ( >=sys-libs/zlib-1.1.3 ) !!<sys-apps/sandbox-2.0 >=sys-devel/bison-1.875 sys-devel/flex nls? ( sys-devel/gettext ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=app-admin/eselect-postgresql-1.0.7 virtual/libintl !!dev-db/libpq !!dev-db/postgresql !!dev-db/postgresql-client !!dev-db/postgresql-libs kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( virtual/pam ) readline? ( >=sys-libs/readline-4.1 ) ssl? ( >=dev-libs/openssl-0.9.6-r1 ) zlib? ( >=sys-libs/zlib-1.1.3 )
+8.4
+mirror://postgresql/source/v8.4.11/postgresql-8.4.11.tar.bz2 http://dev.gentoo.org/~titanofold/postgresql-patches-8.4-r2.tbz2
+test
+http://www.postgresql.org/
+POSTGRESQL
+PostgreSQL libraries and clients
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd
+autotools eutils libtool multilib portability prefix toolchain-funcs user versionator
+doc kerberos ldap nls pam pg_legacytimestamp readline ssl threads zlib linguas_af linguas_cs linguas_de linguas_en linguas_es linguas_fa linguas_fr linguas_hr linguas_hu linguas_it linguas_ko linguas_nb linguas_pl linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sl linguas_sv linguas_tr linguas_zh_CN linguas_zh_TW
+
+doc? ( ~dev-db/postgresql-docs-8.4.11 )
+
+4
+
+compile configure install postinst postrm prepare
+
+
+
+
+
diff --git a/metadata/cache/dev-db/postgresql-base-9.0.7 b/metadata/cache/dev-db/postgresql-base-9.0.7
new file mode 100644
index 000000000000..2729f2636174
--- /dev/null
+++ b/metadata/cache/dev-db/postgresql-base-9.0.7
@@ -0,0 +1,22 @@
+>=app-admin/eselect-postgresql-1.0.7 virtual/libintl !!dev-db/libpq !!dev-db/postgresql !!dev-db/postgresql-client !!dev-db/postgresql-libs kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( virtual/pam ) readline? ( sys-libs/readline ) ssl? ( >=dev-libs/openssl-0.9.6-r1 ) zlib? ( sys-libs/zlib ) sys-devel/bison sys-devel/flex !!<sys-apps/sandbox-2.0 nls? ( sys-devel/gettext ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=app-admin/eselect-postgresql-1.0.7 virtual/libintl !!dev-db/libpq !!dev-db/postgresql !!dev-db/postgresql-client !!dev-db/postgresql-libs kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( virtual/pam ) readline? ( sys-libs/readline ) ssl? ( >=dev-libs/openssl-0.9.6-r1 ) zlib? ( sys-libs/zlib )
+9.0
+mirror://postgresql/source/v9.0.7/postgresql-9.0.7.tar.bz2 http://dev.gentoo.org/~titanofold/postgresql-patches-9.0-r3.tbz2
+test
+http://www.postgresql.org/
+POSTGRESQL
+PostgreSQL libraries and clients
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
+autotools eutils flag-o-matic libtool multilib portability prefix toolchain-funcs user versionator
+doc kerberos ldap nls pam pg_legacytimestamp readline ssl threads zlib linguas_af linguas_cs linguas_de linguas_en linguas_es linguas_fa linguas_fr linguas_hr linguas_hu linguas_it linguas_ko linguas_nb linguas_pl linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sl linguas_sv linguas_tr linguas_zh_CN linguas_zh_TW
+
+doc? ( ~dev-db/postgresql-docs-9.0.7 )
+
+4
+
+compile configure install postinst postrm prepare
+
+
+
+
+
diff --git a/metadata/cache/dev-db/postgresql-base-9.1.3 b/metadata/cache/dev-db/postgresql-base-9.1.3
new file mode 100644
index 000000000000..421511e44285
--- /dev/null
+++ b/metadata/cache/dev-db/postgresql-base-9.1.3
@@ -0,0 +1,22 @@
+!!dev-db/libpq !!dev-db/postgresql !!dev-db/postgresql-client !!dev-db/postgresql-libs >=app-admin/eselect-postgresql-1.0.10 virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( virtual/pam ) readline? ( sys-libs/readline ) ssl? ( >=dev-libs/openssl-0.9.6-r1 ) zlib? ( sys-libs/zlib ) !!<sys-apps/sandbox-2.0 sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+!!dev-db/libpq !!dev-db/postgresql !!dev-db/postgresql-client !!dev-db/postgresql-libs >=app-admin/eselect-postgresql-1.0.10 virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( virtual/pam ) readline? ( sys-libs/readline ) ssl? ( >=dev-libs/openssl-0.9.6-r1 ) zlib? ( sys-libs/zlib )
+9.1
+mirror://postgresql/source/v9.1.3/postgresql-9.1.3.tar.bz2 http://dev.gentoo.org/~titanofold/postgresql-patches-9.1-r1.tbz2
+test
+http://www.postgresql.org/
+POSTGRESQL
+PostgreSQL libraries and clients
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
+autotools eutils flag-o-matic libtool multilib portability prefix toolchain-funcs user versionator
+doc kerberos ldap nls pam pg_legacytimestamp readline ssl threads zlib linguas_af linguas_cs linguas_de linguas_en linguas_es linguas_fa linguas_fr linguas_hr linguas_hu linguas_it linguas_ko linguas_nb linguas_pl linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sl linguas_sv linguas_tr linguas_zh_CN linguas_zh_TW
+
+doc? ( ~dev-db/postgresql-docs-9.1.3 )
+
+4
+
+compile configure install postinst postrm prepare
+
+
+
+
+
diff --git a/metadata/cache/dev-db/postgresql-docs-8.3.18 b/metadata/cache/dev-db/postgresql-docs-8.3.18
new file mode 100644
index 000000000000..1fa28012f666
--- /dev/null
+++ b/metadata/cache/dev-db/postgresql-docs-8.3.18
@@ -0,0 +1,22 @@
+
+
+8.3
+mirror://postgresql/source/v8.3.18/postgresql-8.3.18.tar.bz2
+test
+http://www.postgresql.org/
+POSTGRESQL
+PostgreSQL documentation
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd
+eutils multilib portability toolchain-funcs user versionator
+
+
+
+
+4
+
+install unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-db/postgresql-docs-8.4.11 b/metadata/cache/dev-db/postgresql-docs-8.4.11
new file mode 100644
index 000000000000..5244a126dab1
--- /dev/null
+++ b/metadata/cache/dev-db/postgresql-docs-8.4.11
@@ -0,0 +1,22 @@
+
+
+8.4
+mirror://postgresql/source/v8.4.11/postgresql-8.4.11.tar.bz2
+test
+http://www.postgresql.org/
+POSTGRESQL
+PostgreSQL documentation
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd
+eutils multilib portability toolchain-funcs user versionator
+
+
+
+
+4
+
+install unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-db/postgresql-docs-9.0.7 b/metadata/cache/dev-db/postgresql-docs-9.0.7
new file mode 100644
index 000000000000..6e8321c2b976
--- /dev/null
+++ b/metadata/cache/dev-db/postgresql-docs-9.0.7
@@ -0,0 +1,22 @@
+
+
+9.0
+mirror://postgresql/source/v9.0.7/postgresql-9.0.7.tar.bz2
+test
+http://www.postgresql.org/
+POSTGRESQL
+PostgreSQL documentation
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
+eutils multilib portability toolchain-funcs user versionator
+
+
+
+
+4
+
+install unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-db/postgresql-docs-9.1.3 b/metadata/cache/dev-db/postgresql-docs-9.1.3
new file mode 100644
index 000000000000..b4450cbcd9e6
--- /dev/null
+++ b/metadata/cache/dev-db/postgresql-docs-9.1.3
@@ -0,0 +1,22 @@
+
+
+9.1
+mirror://postgresql/source/v9.1.3/postgresql-9.1.3.tar.bz2
+
+http://www.postgresql.org/
+POSTGRESQL
+PostgreSQL documentation
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
+eutils multilib portability toolchain-funcs user versionator
+
+
+
+
+4
+
+install unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-db/postgresql-server-8.3.18 b/metadata/cache/dev-db/postgresql-server-8.3.18
new file mode 100644
index 000000000000..7a1f881ff152
--- /dev/null
+++ b/metadata/cache/dev-db/postgresql-server-8.3.18
@@ -0,0 +1,22 @@
+~dev-db/postgresql-base-8.3.18:8.3[pam?,nls=] perl? ( >=dev-lang/perl-5.8 ) selinux? ( sec-policy/selinux-postgresql ) tcl? ( >=dev-lang/tcl-8 ) uuid? ( dev-libs/ossp-uuid ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) sys-devel/flex xml? ( dev-util/pkgconfig ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+~dev-db/postgresql-base-8.3.18:8.3[pam?,nls=] perl? ( >=dev-lang/perl-5.8 ) selinux? ( sec-policy/selinux-postgresql ) tcl? ( >=dev-lang/tcl-8 ) uuid? ( dev-libs/ossp-uuid ) xml? ( dev-libs/libxml2 dev-libs/libxslt )
+8.3
+mirror://postgresql/source/v8.3.18/postgresql-8.3.18.tar.bz2 http://dev.gentoo.org/~titanofold/postgresql-patches-8.3-r2.tbz2 http://dev.gentoo.org/~titanofold/postgresql-initscript-2.1.tbz2
+
+http://www.postgresql.org/
+POSTGRESQL
+PostgreSQL server
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
+autotools eutils flag-o-matic libtool multilib pam portability prefix toolchain-funcs user versionator
+doc kernel_linux nls pam perl python selinux tcl uuid xml linguas_af linguas_cs linguas_de linguas_en linguas_es linguas_fa linguas_fr linguas_hr linguas_hu linguas_it linguas_ko linguas_nb linguas_pl linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sl linguas_sv linguas_tr linguas_zh_CN linguas_zh_TW
+
+doc? ( ~dev-db/postgresql-docs-8.3.18 )
+
+4
+
+compile config configure install postinst postrm prepare setup test
+
+
+
+
+
diff --git a/metadata/cache/dev-db/postgresql-server-8.4.11 b/metadata/cache/dev-db/postgresql-server-8.4.11
new file mode 100644
index 000000000000..de91ab70c69a
--- /dev/null
+++ b/metadata/cache/dev-db/postgresql-server-8.4.11
@@ -0,0 +1,22 @@
+~dev-db/postgresql-base-8.4.11:8.4[pam?,pg_legacytimestamp=,nls=] perl? ( >=dev-lang/perl-5.8 ) selinux? ( sec-policy/selinux-postgresql ) tcl? ( >=dev-lang/tcl-8 ) uuid? ( dev-libs/ossp-uuid ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) sys-devel/flex xml? ( dev-util/pkgconfig ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=app-admin/eselect-python-20091230 python? ( =dev-lang/python-2* )
+~dev-db/postgresql-base-8.4.11:8.4[pam?,pg_legacytimestamp=,nls=] perl? ( >=dev-lang/perl-5.8 ) selinux? ( sec-policy/selinux-postgresql ) tcl? ( >=dev-lang/tcl-8 ) uuid? ( dev-libs/ossp-uuid ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) >=app-admin/eselect-python-20091230 python? ( =dev-lang/python-2* )
+8.4
+mirror://postgresql/source/v8.4.11/postgresql-8.4.11.tar.bz2 http://dev.gentoo.org/~titanofold/postgresql-patches-8.4-r2.tbz2 http://dev.gentoo.org/~titanofold/postgresql-initscript-2.1.tbz2
+
+http://www.postgresql.org/
+POSTGRESQL
+PostgreSQL server
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
+autotools eutils flag-o-matic libtool multilib pam portability prefix python toolchain-funcs user versionator
+doc kernel_linux nls pam perl -pg_legacytimestamp python selinux tcl uuid xml linguas_af linguas_cs linguas_de linguas_en linguas_es linguas_fa linguas_fr linguas_hr linguas_hu linguas_it linguas_ko linguas_nb linguas_pl linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sl linguas_sv linguas_tr linguas_zh_CN linguas_zh_TW
+
+doc? ( ~dev-db/postgresql-docs-8.4.11 )
+
+4
+
+compile config configure install postinst postrm prepare setup test
+
+
+
+
+
diff --git a/metadata/cache/dev-db/postgresql-server-9.0.7 b/metadata/cache/dev-db/postgresql-server-9.0.7
new file mode 100644
index 000000000000..43a1747951c8
--- /dev/null
+++ b/metadata/cache/dev-db/postgresql-server-9.0.7
@@ -0,0 +1,22 @@
+~dev-db/postgresql-base-9.0.7:9.0[pam?,pg_legacytimestamp=,nls=] perl? ( >=dev-lang/perl-5.8 ) selinux? ( sec-policy/selinux-postgresql ) tcl? ( >=dev-lang/tcl-8 ) uuid? ( dev-libs/ossp-uuid ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) sys-devel/flex xml? ( dev-util/pkgconfig ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=app-admin/eselect-python-20091230 python? ( =dev-lang/python-2* )
+~dev-db/postgresql-base-9.0.7:9.0[pam?,pg_legacytimestamp=,nls=] perl? ( >=dev-lang/perl-5.8 ) selinux? ( sec-policy/selinux-postgresql ) tcl? ( >=dev-lang/tcl-8 ) uuid? ( dev-libs/ossp-uuid ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) >=app-admin/eselect-python-20091230 python? ( =dev-lang/python-2* )
+9.0
+mirror://postgresql/source/v9.0.7/postgresql-9.0.7.tar.bz2 http://dev.gentoo.org/~titanofold/postgresql-patches-9.0-r3.tbz2 http://dev.gentoo.org/~titanofold/postgresql-initscript-2.1.tbz2
+
+http://www.postgresql.org/
+POSTGRESQL
+PostgreSQL server
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x86-solaris
+autotools eutils flag-o-matic libtool multilib pam portability prefix python toolchain-funcs user versionator
+doc kernel_linux nls pam perl -pg_legacytimestamp python selinux tcl uuid xml linguas_af linguas_cs linguas_de linguas_en linguas_es linguas_fa linguas_fr linguas_hr linguas_hu linguas_it linguas_ko linguas_nb linguas_pl linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sl linguas_sv linguas_tr linguas_zh_CN linguas_zh_TW
+
+doc? ( ~dev-db/postgresql-docs-9.0.7 )
+
+4
+
+compile config configure install postinst postrm prepare setup test
+
+
+
+
+
diff --git a/metadata/cache/dev-db/postgresql-server-9.1.3 b/metadata/cache/dev-db/postgresql-server-9.1.3
new file mode 100644
index 000000000000..364c056536aa
--- /dev/null
+++ b/metadata/cache/dev-db/postgresql-server-9.1.3
@@ -0,0 +1,22 @@
+~dev-db/postgresql-base-9.1.3:9.1[pam?,pg_legacytimestamp=,nls=] perl? ( >=dev-lang/perl-5.8 ) selinux? ( sec-policy/selinux-postgresql ) tcl? ( >=dev-lang/tcl-8 ) uuid? ( dev-libs/ossp-uuid ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) sys-devel/flex xml? ( dev-util/pkgconfig ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=app-admin/eselect-python-20091230 python? ( =dev-lang/python-2* )
+~dev-db/postgresql-base-9.1.3:9.1[pam?,pg_legacytimestamp=,nls=] perl? ( >=dev-lang/perl-5.8 ) selinux? ( sec-policy/selinux-postgresql ) tcl? ( >=dev-lang/tcl-8 ) uuid? ( dev-libs/ossp-uuid ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) >=app-admin/eselect-python-20091230 python? ( =dev-lang/python-2* )
+9.1
+mirror://postgresql/source/v9.1.3/postgresql-9.1.3.tar.bz2 http://dev.gentoo.org/~titanofold/postgresql-patches-9.1-r1.tbz2 http://dev.gentoo.org/~titanofold/postgresql-initscript-2.1.tbz2
+
+http://www.postgresql.org/
+POSTGRESQL
+PostgreSQL server
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x86-solaris
+autotools eutils flag-o-matic libtool multilib pam portability prefix python toolchain-funcs user versionator
+doc kernel_linux nls pam perl -pg_legacytimestamp python selinux tcl uuid xml linguas_af linguas_cs linguas_de linguas_en linguas_es linguas_fa linguas_fr linguas_hr linguas_hu linguas_it linguas_ko linguas_nb linguas_pl linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sl linguas_sv linguas_tr linguas_zh_CN linguas_zh_TW
+
+doc? ( ~dev-db/postgresql-docs-9.1.3 )
+
+4
+
+compile config configure install postinst postrm prepare prerm setup test
+
+
+
+
+
diff --git a/metadata/cache/dev-libs/icu-4.8 b/metadata/cache/dev-libs/icu-4.8
deleted file mode 100644
index 16b4af785843..000000000000
--- a/metadata/cache/dev-libs/icu-4.8
+++ /dev/null
@@ -1,22 +0,0 @@
-doc? ( app-arch/unzip )
-
-0
-http://download.icu-project.org/files/icu4c/4.8/icu4c-4_8-src.tgz doc? ( http://download.icu-project.org/files/icu4c/4.8/icu4c-4_8-docs.zip )
-
-http://www.icu-project.org/
-BSD
-International Components for Unicode
-alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd
-eutils multilib portability toolchain-funcs user versionator
-debug doc examples static-libs
-
-
-
-3
-
-configure install prepare test unpack
-
-
-
-
-
diff --git a/metadata/cache/dev-libs/icu-4.8.1-r1 b/metadata/cache/dev-libs/icu-4.8.1-r3
similarity index 82%
rename from metadata/cache/dev-libs/icu-4.8.1-r1
rename to metadata/cache/dev-libs/icu-4.8.1-r3
index c1a8d767a2c8..b529037491b6 100644
--- a/metadata/cache/dev-libs/icu-4.8.1-r1
+++ b/metadata/cache/dev-libs/icu-4.8.1-r3
@@ -6,7 +6,7 @@ http://download.icu-project.org/files/icu4c/4.8.1/icu4c-4_8_1-src.tgz doc? ( htt
 http://www.icu-project.org/
 BSD
 International Components for Unicode
-~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
 eutils multilib portability toolchain-funcs user versionator
 debug doc examples static-libs
 
diff --git a/metadata/cache/dev-libs/icu-4.8.1.1 b/metadata/cache/dev-libs/icu-4.8.1.1-r1
similarity index 100%
rename from metadata/cache/dev-libs/icu-4.8.1.1
rename to metadata/cache/dev-libs/icu-4.8.1.1-r1
diff --git a/metadata/cache/dev-perl/Math-GMP-2.60.0 b/metadata/cache/dev-perl/Math-GMP-2.60.0
index a0069c35c072..29edcbc29a92 100644
--- a/metadata/cache/dev-perl/Math-GMP-2.60.0
+++ b/metadata/cache/dev-perl/Math-GMP-2.60.0
@@ -6,7 +6,7 @@ mirror://cpan/authors/id/T/TU/TURNSTEP/Math-GMP-2.06.tar.gz
 http://search.cpan.org/dist/Math-GMP/
 LGPL-2
 High speed arbitrary size integer math
-alpha amd64 hppa ~ia64 ~mips ~ppc ~sparc ~x86
+alpha amd64 hppa ~ia64 ~mips ppc ~sparc ~x86
 base eutils multilib perl-module portability toolchain-funcs user
 
 
diff --git a/metadata/cache/dev-perl/Net-DBus-1.0.0 b/metadata/cache/dev-perl/Net-DBus-1.0.0
index f0437c426bd2..3bf219d8ea30 100644
--- a/metadata/cache/dev-perl/Net-DBus-1.0.0
+++ b/metadata/cache/dev-perl/Net-DBus-1.0.0
@@ -6,7 +6,7 @@ mirror://cpan/authors/id/D/DA/DANBERR/Net-DBus-1.0.0.tar.gz
 http://search.cpan.org/dist/Net-DBus/
 || ( Artistic GPL-1 GPL-2 GPL-3 )
 Perl extension for the DBus message system
-alpha amd64 ~ia64 ~ppc ~sparc ~x86
+alpha amd64 ~ia64 ppc ~sparc ~x86
 base eutils multilib perl-module portability toolchain-funcs user
 test
 
diff --git a/metadata/cache/dev-perl/Net-XMPP-1.20.0 b/metadata/cache/dev-perl/Net-XMPP-1.20.0
index 1c60e6d3996e..1454f3690b5f 100644
--- a/metadata/cache/dev-perl/Net-XMPP-1.20.0
+++ b/metadata/cache/dev-perl/Net-XMPP-1.20.0
@@ -6,7 +6,7 @@ mirror://cpan/authors/id/H/HA/HACKER/Net-XMPP-1.02.tar.gz
 http://search.cpan.org/dist/Net-XMPP/
 LGPL-2
 XMPP Perl Library
-alpha amd64 hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+alpha amd64 hppa ~ia64 ppc ~ppc64 ~sparc ~x86
 base eutils multilib perl-module portability toolchain-funcs user
 
 
diff --git a/metadata/cache/dev-perl/Number-Compare-0.30.0 b/metadata/cache/dev-perl/Number-Compare-0.30.0
index bfbc11843696..4e9c2a0166c5 100644
--- a/metadata/cache/dev-perl/Number-Compare-0.30.0
+++ b/metadata/cache/dev-perl/Number-Compare-0.30.0
@@ -6,7 +6,7 @@ mirror://cpan/authors/id/R/RC/RCLAMP/Number-Compare-0.03.tar.gz
 http://search.cpan.org/dist/Number-Compare/
 || ( Artistic GPL-1 GPL-2 GPL-3 )
 Numeric comparisons
-alpha amd64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+alpha amd64 hppa ~ia64 ~mips ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 base eutils multilib perl-module portability toolchain-funcs user
 
 
diff --git a/metadata/cache/dev-perl/Package-Stash-XS-0.250.0 b/metadata/cache/dev-perl/Package-Stash-XS-0.250.0
index 2359540dc04f..2c835af971fa 100644
--- a/metadata/cache/dev-perl/Package-Stash-XS-0.250.0
+++ b/metadata/cache/dev-perl/Package-Stash-XS-0.250.0
@@ -6,7 +6,7 @@ mirror://cpan/authors/id/D/DO/DOY/Package-Stash-XS-0.25.tar.gz
 http://search.cpan.org/dist/Package-Stash-XS/
 || ( Artistic GPL-1 GPL-2 GPL-3 )
 Faster and more correct implementation of the Package::Stash API
-~alpha amd64 ~arm ~hppa ~x86 ~x86-fbsd ~x86-freebsd ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+~alpha amd64 ~arm ~hppa ppc ~x86 ~x86-fbsd ~x86-freebsd ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
 base eutils multilib perl-module portability toolchain-funcs user
 test
 
diff --git a/metadata/cache/dev-perl/PadWalker-1.920.0 b/metadata/cache/dev-perl/PadWalker-1.920.0
index 399d22d86189..8b512591f954 100644
--- a/metadata/cache/dev-perl/PadWalker-1.920.0
+++ b/metadata/cache/dev-perl/PadWalker-1.920.0
@@ -6,7 +6,7 @@ mirror://cpan/authors/id/R/RO/ROBIN/PadWalker-1.92.tar.gz
 http://search.cpan.org/dist/PadWalker/
 || ( Artistic GPL-1 GPL-2 GPL-3 )
 play with other peoples' lexical variables
-amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+amd64 ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 base eutils multilib perl-module portability toolchain-funcs user
 
 
diff --git a/metadata/cache/dev-perl/Pango-1.222.0 b/metadata/cache/dev-perl/Pango-1.222.0
index b084164a6647..27996bf434d2 100644
--- a/metadata/cache/dev-perl/Pango-1.222.0
+++ b/metadata/cache/dev-perl/Pango-1.222.0
@@ -6,7 +6,7 @@ mirror://cpan/authors/id/T/TS/TSCH/Pango-1.222.tar.gz
 http://search.cpan.org/dist/Pango/
 LGPL-2.1
 Layout and render international text
-alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+alpha amd64 ~arm hppa ~ia64 ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
 base eutils multilib perl-module portability toolchain-funcs user
 
 
diff --git a/metadata/cache/dev-perl/Pod-Tests-1.190.0 b/metadata/cache/dev-perl/Pod-Tests-1.190.0
index 6d4e30d66eaa..6ffe946a281f 100644
--- a/metadata/cache/dev-perl/Pod-Tests-1.190.0
+++ b/metadata/cache/dev-perl/Pod-Tests-1.190.0
@@ -6,7 +6,7 @@ mirror://cpan/authors/id/A/AD/ADAMK/Pod-Tests-1.19.tar.gz
 http://search.cpan.org/dist/Pod-Tests/
 || ( Artistic GPL-1 GPL-2 GPL-3 )
 Extracts embedded tests and code examples from POD
-alpha amd64 hppa ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+alpha amd64 hppa ~ia64 ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 base eutils multilib perl-module portability toolchain-funcs user
 
 
diff --git a/metadata/cache/dev-perl/Proc-Simple-1.300.0 b/metadata/cache/dev-perl/Proc-Simple-1.300.0
index bfd095b71593..47d048ff6b10 100644
--- a/metadata/cache/dev-perl/Proc-Simple-1.300.0
+++ b/metadata/cache/dev-perl/Proc-Simple-1.300.0
@@ -6,7 +6,7 @@ mirror://cpan/authors/id/M/MS/MSCHILLI/Proc-Simple-1.30.tar.gz
 http://search.cpan.org/dist/Proc-Simple/
 || ( Artistic GPL-1 GPL-2 GPL-3 )
 Perl Proc-Simple - Launch and control background processes
-amd64 ~ia64 ~ppc ~sparc ~x86
+amd64 ~ia64 ppc ~sparc ~x86
 base eutils multilib perl-module portability toolchain-funcs user
 
 
diff --git a/metadata/cache/dev-perl/RPC-XML-0.760.0 b/metadata/cache/dev-perl/RPC-XML-0.760.0
index 505cf7855c66..464bc869db3c 100644
--- a/metadata/cache/dev-perl/RPC-XML-0.760.0
+++ b/metadata/cache/dev-perl/RPC-XML-0.760.0
@@ -6,7 +6,7 @@ mirror://cpan/authors/id/R/RJ/RJRAY/RPC-XML-0.76.tar.gz
 http://search.cpan.org/dist/RPC-XML/
 || ( Artistic-2 LGPL-2.1 )
 An implementation of XML-RPC
-alpha amd64 ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd
+alpha amd64 ~ia64 ppc ~sparc ~x86 ~x86-fbsd
 base eutils multilib perl-module portability toolchain-funcs user
 
 
diff --git a/metadata/cache/dev-perl/SOAP-Lite-0.714.0 b/metadata/cache/dev-perl/SOAP-Lite-0.714.0
index fe479ce75b82..1009e9bf67b1 100644
--- a/metadata/cache/dev-perl/SOAP-Lite-0.714.0
+++ b/metadata/cache/dev-perl/SOAP-Lite-0.714.0
@@ -6,7 +6,7 @@ mirror://cpan/authors/id/M/MK/MKUTTER/SOAP-Lite-0.714.tar.gz
 http://search.cpan.org/dist/SOAP-Lite/
 || ( Artistic GPL-2 )
 Simple and lightweight interface to the SOAP protocol (sic) both on client and server side
-alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+alpha amd64 ~ia64 ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
 base eutils multilib perl-module portability toolchain-funcs user
 jabber ssl
 
diff --git a/metadata/cache/dev-perl/String-ShellQuote-1.40.0 b/metadata/cache/dev-perl/String-ShellQuote-1.40.0
index 1eab83262831..9d8258c674b4 100644
--- a/metadata/cache/dev-perl/String-ShellQuote-1.40.0
+++ b/metadata/cache/dev-perl/String-ShellQuote-1.40.0
@@ -6,7 +6,7 @@ mirror://cpan/authors/id/R/RO/ROSCH/String-ShellQuote-1.04.tar.gz
 http://search.cpan.org/dist/String-ShellQuote/
 || ( Artistic GPL-1 GPL-2 GPL-3 )
 Quote strings for passing through the shell
-alpha amd64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+alpha amd64 hppa ~ia64 ~mips ppc ~ppc64 ~sparc ~x86
 base eutils multilib perl-module portability toolchain-funcs user
 
 
diff --git a/metadata/cache/dev-perl/Sub-Name-0.50.0 b/metadata/cache/dev-perl/Sub-Name-0.50.0
index 133c1e8f9604..9237ec6b69d1 100644
--- a/metadata/cache/dev-perl/Sub-Name-0.50.0
+++ b/metadata/cache/dev-perl/Sub-Name-0.50.0
@@ -6,7 +6,7 @@ mirror://cpan/authors/id/F/FL/FLORA/Sub-Name-0.05.tar.gz
 http://search.cpan.org/dist/Sub-Name/
 || ( Artistic GPL-1 GPL-2 GPL-3 )
 (Re)name a sub
-~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
+~alpha amd64 ~hppa ~ia64 ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
 base eutils multilib perl-module portability toolchain-funcs user
 
 
diff --git a/metadata/cache/dev-perl/Sub-Uplevel-0.220.0 b/metadata/cache/dev-perl/Sub-Uplevel-0.220.0
index 44894d9aaaa1..495a3f1db61c 100644
--- a/metadata/cache/dev-perl/Sub-Uplevel-0.220.0
+++ b/metadata/cache/dev-perl/Sub-Uplevel-0.220.0
@@ -6,7 +6,7 @@ mirror://cpan/authors/id/D/DA/DAGOLDEN/Sub-Uplevel-0.22.tar.gz
 http://search.cpan.org/dist/Sub-Uplevel/
 || ( Artistic GPL-1 GPL-2 GPL-3 )
 Apparently run a function in a higher stack frame
-alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris
+alpha amd64 ~arm hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib perl-module portability toolchain-funcs user
 
 
diff --git a/metadata/cache/dev-perl/Template-DBI-2.650.0 b/metadata/cache/dev-perl/Template-DBI-2.650.0
index 0475ec2d5c5e..f8e5857ee1e2 100644
--- a/metadata/cache/dev-perl/Template-DBI-2.650.0
+++ b/metadata/cache/dev-perl/Template-DBI-2.650.0
@@ -6,7 +6,7 @@ mirror://cpan/authors/id/R/RE/REHSACK/Template-DBI-2.65.tar.gz
 http://search.cpan.org/dist/Template-DBI/
 || ( Artistic GPL-1 GPL-2 GPL-3 )
 DBI plugin for the Template Toolkit
-alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-solaris
+alpha amd64 ~arm ~ia64 ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-solaris
 base eutils multilib perl-module portability toolchain-funcs user
 test
 
diff --git a/metadata/cache/dev-perl/Test-Deep-0.108.0 b/metadata/cache/dev-perl/Test-Deep-0.108.0
index 1629f83f4dcc..353751aaa1bb 100644
--- a/metadata/cache/dev-perl/Test-Deep-0.108.0
+++ b/metadata/cache/dev-perl/Test-Deep-0.108.0
@@ -6,7 +6,7 @@ mirror://cpan/authors/id/R/RJ/RJBS/Test-Deep-0.108.tar.gz
 http://search.cpan.org/dist/Test-Deep/
 || ( Artistic GPL-1 GPL-2 GPL-3 )
 Test::Deep - Extremely flexible deep comparison
-alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+alpha amd64 ~arm hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 base eutils multilib perl-module portability toolchain-funcs user
 test
 
diff --git a/metadata/cache/dev-perl/Test-Exception-0.310.0 b/metadata/cache/dev-perl/Test-Exception-0.310.0
index e784d4749602..a0f48b7cd1b3 100644
--- a/metadata/cache/dev-perl/Test-Exception-0.310.0
+++ b/metadata/cache/dev-perl/Test-Exception-0.310.0
@@ -6,7 +6,7 @@ mirror://cpan/authors/id/A/AD/ADIE/Test-Exception-0.31.tar.gz
 http://search.cpan.org/dist/Test-Exception/
 || ( Artistic GPL-1 GPL-2 GPL-3 )
 test functions for exception based code
-~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib perl-module portability toolchain-funcs user
 
 
diff --git a/metadata/cache/dev-perl/Test-LongString-0.150.0 b/metadata/cache/dev-perl/Test-LongString-0.150.0
index 5335020d2920..bd5fe4db334b 100644
--- a/metadata/cache/dev-perl/Test-LongString-0.150.0
+++ b/metadata/cache/dev-perl/Test-LongString-0.150.0
@@ -6,7 +6,7 @@ mirror://cpan/authors/id/R/RG/RGARCIA/Test-LongString-0.15.tar.gz
 http://search.cpan.org/dist/Test-LongString/
 || ( Artistic GPL-1 GPL-2 GPL-3 )
 A library to test long strings.
-amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+amd64 ~ia64 ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 base eutils multilib perl-module portability toolchain-funcs user
 test
 
diff --git a/metadata/cache/dev-perl/Test-Manifest-1.230.0 b/metadata/cache/dev-perl/Test-Manifest-1.230.0
index 791f991f623e..4835936ce0f8 100644
--- a/metadata/cache/dev-perl/Test-Manifest-1.230.0
+++ b/metadata/cache/dev-perl/Test-Manifest-1.230.0
@@ -6,7 +6,7 @@ mirror://cpan/authors/id/B/BD/BDFOY/Test-Manifest-1.23.tar.gz
 http://search.cpan.org/dist/Test-Manifest/
 || ( Artistic GPL-1 GPL-2 GPL-3 )
 Interact with a t/test_manifest file
-~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+~alpha amd64 ~arm ~ia64 ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 base eutils multilib perl-module portability toolchain-funcs user
 test
 
diff --git a/metadata/cache/dev-perl/Test-Requires-0.60.0 b/metadata/cache/dev-perl/Test-Requires-0.60.0
index ccc902cc229c..9a4a666571c5 100644
--- a/metadata/cache/dev-perl/Test-Requires-0.60.0
+++ b/metadata/cache/dev-perl/Test-Requires-0.60.0
@@ -6,7 +6,7 @@ mirror://cpan/authors/id/T/TO/TOKUHIROM/Test-Requires-0.06.tar.gz
 http://search.cpan.org/dist/Test-Requires/
 || ( Artistic GPL-1 GPL-2 GPL-3 )
 Checks to see if the module can be loaded
-~alpha amd64 ~arm ~hppa ~ppc ~x86 ~x86-fbsd
+~alpha amd64 ~arm ~hppa ppc ~x86 ~x86-fbsd
 base eutils multilib perl-module portability toolchain-funcs user
 
 
diff --git a/metadata/cache/dev-perl/Text-CSV_XS-0.860.0 b/metadata/cache/dev-perl/Text-CSV_XS-0.860.0
index dfd449d92a7b..d1c83cf02239 100644
--- a/metadata/cache/dev-perl/Text-CSV_XS-0.860.0
+++ b/metadata/cache/dev-perl/Text-CSV_XS-0.860.0
@@ -6,7 +6,7 @@ mirror://cpan/authors/id/H/HM/HMBRAND/Text-CSV_XS-0.86.tgz
 http://search.cpan.org/dist/Text-CSV_XS/
 || ( Artistic GPL-1 GPL-2 GPL-3 )
 Comma-separated values manipulation routines
-~alpha amd64 ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 ~ia64 ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib perl-module portability toolchain-funcs user
 test
 
diff --git a/metadata/cache/dev-perl/Text-Glob-0.90.0 b/metadata/cache/dev-perl/Text-Glob-0.90.0
index 8b17a351d067..cc3ffa11c517 100644
--- a/metadata/cache/dev-perl/Text-Glob-0.90.0
+++ b/metadata/cache/dev-perl/Text-Glob-0.90.0
@@ -6,7 +6,7 @@ mirror://cpan/authors/id/R/RC/RCLAMP/Text-Glob-0.09.tar.gz
 http://search.cpan.org/dist/Text-Glob/
 || ( Artistic GPL-1 GPL-2 GPL-3 )
 Match globbing patterns against text
-~alpha amd64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris
+~alpha amd64 hppa ~ia64 ~mips ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris
 base eutils multilib perl-module portability toolchain-funcs user
 
 
diff --git a/metadata/cache/dev-perl/Tie-IxHash-1.220.0 b/metadata/cache/dev-perl/Tie-IxHash-1.220.0
index ca5b8968af23..e3a6346d0255 100644
--- a/metadata/cache/dev-perl/Tie-IxHash-1.220.0
+++ b/metadata/cache/dev-perl/Tie-IxHash-1.220.0
@@ -6,7 +6,7 @@ mirror://cpan/authors/id/C/CH/CHORNY/Tie-IxHash-1.22.tar.gz
 http://search.cpan.org/dist/Tie-IxHash/
 || ( Artistic GPL-1 GPL-2 GPL-3 )
 Ordered associative arrays for Perl
-~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 base eutils multilib perl-module portability toolchain-funcs user
 
 
diff --git a/metadata/cache/dev-perl/Tree-DAG_Node-1.60.0 b/metadata/cache/dev-perl/Tree-DAG_Node-1.60.0
index 06c6993bbdb2..f1a2a9ef041c 100644
--- a/metadata/cache/dev-perl/Tree-DAG_Node-1.60.0
+++ b/metadata/cache/dev-perl/Tree-DAG_Node-1.60.0
@@ -6,7 +6,7 @@ mirror://cpan/authors/id/C/CO/COGENT/Tree-DAG_Node-1.06.tar.gz
 http://search.cpan.org/dist/Tree-DAG_Node/
 || ( Artistic GPL-1 GPL-2 GPL-3 )
 (Super)class for representing nodes in a tree
-~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 base eutils multilib perl-module portability toolchain-funcs user
 
 
diff --git a/metadata/cache/dev-perl/URI-1.590.0 b/metadata/cache/dev-perl/URI-1.590.0
index 657750a97976..127ba0ffde37 100644
--- a/metadata/cache/dev-perl/URI-1.590.0
+++ b/metadata/cache/dev-perl/URI-1.590.0
@@ -6,7 +6,7 @@ mirror://cpan/authors/id/G/GA/GAAS/URI-1.59.tar.gz
 http://search.cpan.org/dist/URI/
 || ( Artistic GPL-1 GPL-2 GPL-3 )
 A URI Perl Module
-~alpha amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 base eutils multilib perl-module portability toolchain-funcs user
 
 
diff --git a/metadata/cache/dev-perl/Unicode-Map-0.112.0 b/metadata/cache/dev-perl/Unicode-Map-0.112.0
index 4dfe8974772b..85cb0a223ce3 100644
--- a/metadata/cache/dev-perl/Unicode-Map-0.112.0
+++ b/metadata/cache/dev-perl/Unicode-Map-0.112.0
@@ -6,7 +6,7 @@ mirror://cpan/authors/id/M/MS/MSCHWARTZ/Unicode-Map-0.112.tar.gz
 http://search.cpan.org/dist/Unicode-Map/
 || ( Artistic GPL-1 GPL-2 GPL-3 )
 Map charsets from and to utf16 code
-~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 base eutils multilib perl-module portability toolchain-funcs user
 
 
diff --git a/metadata/cache/dev-perl/Unix-Syslog-1.100.0 b/metadata/cache/dev-perl/Unix-Syslog-1.100.0
index fd7fc297c389..ae72c6dd7007 100644
--- a/metadata/cache/dev-perl/Unix-Syslog-1.100.0
+++ b/metadata/cache/dev-perl/Unix-Syslog-1.100.0
@@ -6,7 +6,7 @@ mirror://cpan/authors/id/M/MH/MHARNISCH/Unix-Syslog-1.1.tar.gz
 http://search.cpan.org/dist/Unix-Syslog/
 Artistic-2
 A Perl module which provides access to the system logger
-~alpha amd64 hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+~alpha amd64 hppa ~ia64 ppc ~ppc64 ~sparc ~x86
 base eutils multilib perl-module portability toolchain-funcs user
 
 
diff --git a/metadata/cache/dev-perl/WWW-Curl-4.150.0 b/metadata/cache/dev-perl/WWW-Curl-4.150.0
index 0261f89dc2fc..0577c478d783 100644
--- a/metadata/cache/dev-perl/WWW-Curl-4.150.0
+++ b/metadata/cache/dev-perl/WWW-Curl-4.150.0
@@ -6,7 +6,7 @@ mirror://cpan/authors/id/S/SZ/SZBALINT/WWW-Curl-4.15.tar.gz
 http://search.cpan.org/dist/WWW-Curl/
 || ( MPL-1.0 MPL-1.1 MIT )
 Perl extension interface for libcurl
-amd64 ~ppc ~ppc64 ~x86
+amd64 ppc ~ppc64 ~x86
 base eutils multilib perl-module portability toolchain-funcs user
 
 
diff --git a/metadata/cache/dev-perl/XML-DT-0.560.0 b/metadata/cache/dev-perl/XML-DT-0.560.0
index 0c76c51c76f3..f63c91e7ce31 100644
--- a/metadata/cache/dev-perl/XML-DT-0.560.0
+++ b/metadata/cache/dev-perl/XML-DT-0.560.0
@@ -6,7 +6,7 @@ mirror://cpan/authors/id/A/AM/AMBS/XML/XML-DT-0.56.tar.gz
 http://search.cpan.org/dist/XML-DT/
 || ( Artistic GPL-1 GPL-2 GPL-3 )
 A perl XML down translate module
-~alpha amd64 hppa ~ia64 ~ppc ~sparc ~x86
+~alpha amd64 hppa ~ia64 ppc ~sparc ~x86
 base eutils multilib perl-module portability toolchain-funcs user
 test
 
diff --git a/metadata/cache/dev-perl/XML-Generator-1.40.0 b/metadata/cache/dev-perl/XML-Generator-1.40.0
index 7271127d176d..438c4852665e 100644
--- a/metadata/cache/dev-perl/XML-Generator-1.40.0
+++ b/metadata/cache/dev-perl/XML-Generator-1.40.0
@@ -6,7 +6,7 @@ mirror://cpan/authors/id/B/BH/BHOLZMAN/XML-Generator-1.04.tar.gz
 http://search.cpan.org/dist/XML-Generator/
 || ( Artistic GPL-1 GPL-2 GPL-3 )
 Perl XML::Generator - A module to help in generating XML documents
-~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+~alpha amd64 ~arm hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 base eutils multilib perl-module portability toolchain-funcs user
 
 
diff --git a/metadata/cache/dev-perl/XML-Twig-3.390.0 b/metadata/cache/dev-perl/XML-Twig-3.390.0
index ecf16de86687..2774feb709e2 100644
--- a/metadata/cache/dev-perl/XML-Twig-3.390.0
+++ b/metadata/cache/dev-perl/XML-Twig-3.390.0
@@ -6,7 +6,7 @@ mirror://cpan/authors/id/M/MI/MIROD/XML-Twig-3.39.tar.gz
 http://search.cpan.org/dist/XML-Twig/
 || ( Artistic GPL-1 GPL-2 GPL-3 )
 Process huge XML documents in tree mode
-~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos
+~alpha amd64 ~hppa ~ia64 ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos
 base eutils multilib perl-module portability toolchain-funcs user
 nls
 
diff --git a/metadata/cache/dev-perl/YAML-Tiny-1.500.0 b/metadata/cache/dev-perl/YAML-Tiny-1.500.0
index 04604d6fe016..706331006c5e 100644
--- a/metadata/cache/dev-perl/YAML-Tiny-1.500.0
+++ b/metadata/cache/dev-perl/YAML-Tiny-1.500.0
@@ -6,7 +6,7 @@ mirror://cpan/authors/id/A/AD/ADAMK/YAML-Tiny-1.50.tar.gz
 http://search.cpan.org/dist/YAML-Tiny/
 || ( Artistic GPL-1 GPL-2 GPL-3 )
 Read/Write YAML files with as little code as possible
-alpha amd64 arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 base eutils multilib perl-module portability toolchain-funcs user
 
 
diff --git a/metadata/cache/dev-perl/crypt-cbc-2.300.0 b/metadata/cache/dev-perl/crypt-cbc-2.300.0
index cfd7fde056ed..f61e19b310ae 100644
--- a/metadata/cache/dev-perl/crypt-cbc-2.300.0
+++ b/metadata/cache/dev-perl/crypt-cbc-2.300.0
@@ -6,7 +6,7 @@ mirror://cpan/authors/id/L/LD/LDS/Crypt-CBC-2.30.tar.gz
 http://search.cpan.org/dist/Crypt-CBC/
 Artistic
 Encrypt Data with Cipher Block Chaining Mode
-~alpha amd64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+~alpha amd64 hppa ~ia64 ~mips ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 base eutils multilib perl-module portability toolchain-funcs user
 test
 
diff --git a/metadata/cache/dev-perl/extutils-depends-0.304.0 b/metadata/cache/dev-perl/extutils-depends-0.304.0
index 41fd417916b7..8eb23d04b8a3 100644
--- a/metadata/cache/dev-perl/extutils-depends-0.304.0
+++ b/metadata/cache/dev-perl/extutils-depends-0.304.0
@@ -6,7 +6,7 @@ mirror://cpan/authors/id/F/FL/FLORA/ExtUtils-Depends-0.304.tar.gz
 http://search.cpan.org/dist/ExtUtils-Depends/
 || ( Artistic GPL-1 GPL-2 GPL-3 )
 Easily build XS extensions that depend on XS extensions
-~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
 base eutils multilib perl-module portability toolchain-funcs user
 
 
diff --git a/metadata/cache/dev-perl/extutils-pkgconfig-1.120.0 b/metadata/cache/dev-perl/extutils-pkgconfig-1.120.0
index 7fa5f15721bd..9aa32cbf8e2f 100644
--- a/metadata/cache/dev-perl/extutils-pkgconfig-1.120.0
+++ b/metadata/cache/dev-perl/extutils-pkgconfig-1.120.0
@@ -6,7 +6,7 @@ mirror://cpan/authors/id/T/TS/TSCH/ExtUtils-PkgConfig-1.12.tar.gz
 http://search.cpan.org/dist/ExtUtils-PkgConfig/
 || ( Artistic GPL-1 GPL-2 GPL-3 )
 Simplistic perl interface to pkg-config
-~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
 base eutils multilib perl-module portability toolchain-funcs user
 
 
diff --git a/metadata/cache/dev-perl/gnome2-vfs-perl-1.81.0 b/metadata/cache/dev-perl/gnome2-vfs-perl-1.81.0
index 67674cdc2f2f..bfd920b6f1b5 100644
--- a/metadata/cache/dev-perl/gnome2-vfs-perl-1.81.0
+++ b/metadata/cache/dev-perl/gnome2-vfs-perl-1.81.0
@@ -6,7 +6,7 @@ mirror://cpan/authors/id/T/TS/TSCH/Gnome2-VFS-1.081.tar.gz
 http://search.cpan.org/dist/Gnome2-VFS/
 LGPL-2.1
 Perl interface to the 2.x series of the Gnome Virtual File System libraries.
-~alpha amd64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+~alpha amd64 ~ia64 ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
 base eutils multilib perl-module portability toolchain-funcs user
 
 
diff --git a/metadata/cache/dev-perl/gnome2-wnck-0.160.0 b/metadata/cache/dev-perl/gnome2-wnck-0.160.0
index 47d388a0dd84..8ebb34c77919 100644
--- a/metadata/cache/dev-perl/gnome2-wnck-0.160.0
+++ b/metadata/cache/dev-perl/gnome2-wnck-0.160.0
@@ -6,7 +6,7 @@ mirror://cpan/authors/id/T/TS/TSCH/Gnome2-Wnck-0.16.tar.gz
 http://gtk2-perl.sourceforge.net/ http://search.cpan.org/dist/Gnome2-Wnck/
 LGPL-2.1
 Perl interface to the Window Navigator Construction Kit
-amd64 ~ia64 ~ppc ~sparc ~x86
+amd64 ~ia64 ppc ~sparc ~x86
 base eutils multilib perl-module portability toolchain-funcs user
 
 
diff --git a/metadata/cache/dev-perl/gtk2-ex-formfactory-0.670.0 b/metadata/cache/dev-perl/gtk2-ex-formfactory-0.670.0
index 87934f58af56..ae33f0b94379 100644
--- a/metadata/cache/dev-perl/gtk2-ex-formfactory-0.670.0
+++ b/metadata/cache/dev-perl/gtk2-ex-formfactory-0.670.0
@@ -6,7 +6,7 @@ mirror://cpan/authors/id/J/JR/JRED/Gtk2-Ex-FormFactory-0.67.tar.gz
 http://www.exit1.org/Gtk2-Ex-FormFactory/ http://search.cpan.org/dist/Gtk2-Ex-FormFactory/
 || ( LGPL-2.1 LGPL-3 )
 Gtk2 FormFactory
-amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+amd64 ~ia64 ppc ~ppc64 ~sparc ~x86
 base eutils multilib perl-module portability toolchain-funcs user
 
 
diff --git a/metadata/cache/dev-perl/gtk2-fu-0.110.0 b/metadata/cache/dev-perl/gtk2-fu-0.110.0
index 3907c25ba7ee..1f052c136356 100644
--- a/metadata/cache/dev-perl/gtk2-fu-0.110.0
+++ b/metadata/cache/dev-perl/gtk2-fu-0.110.0
@@ -6,7 +6,7 @@ mirror://cpan/authors/id/D/DA/DAMS/Gtk2Fu-0.11.tar.gz
 http://search.cpan.org/dist/Gtk2Fu/
 || ( Artistic GPL-1 GPL-2 GPL-3 )
 gtk2-fu is a layer on top of perl gtk2, that brings power, simplicity and speed of development
-~alpha amd64 hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+~alpha amd64 hppa ~ia64 ppc ~ppc64 ~sparc ~x86
 base eutils multilib perl-module portability toolchain-funcs user
 test
 
diff --git a/metadata/cache/dev-perl/gtk2-gladexml-1.7.0 b/metadata/cache/dev-perl/gtk2-gladexml-1.7.0
index 2d14dd2a6bc0..87654d239160 100644
--- a/metadata/cache/dev-perl/gtk2-gladexml-1.7.0
+++ b/metadata/cache/dev-perl/gtk2-gladexml-1.7.0
@@ -6,7 +6,7 @@ mirror://cpan/authors/id/T/TS/TSCH/Gtk2-GladeXML-1.007.tar.gz
 http://gtk2-perl.sf.net/ http://search.cpan.org/dist/Gtk2-GladeXML/
 LGPL-2
 Create user interfaces directly from Glade XML files.
-~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+~alpha amd64 ~ia64 ppc ~ppc64 ~sparc ~x86
 base eutils multilib perl-module portability toolchain-funcs user
 
 
diff --git a/metadata/cache/dev-perl/inline-files-0.680.0 b/metadata/cache/dev-perl/inline-files-0.680.0
index 0c85eb0a57f7..e03c462ef8ad 100644
--- a/metadata/cache/dev-perl/inline-files-0.680.0
+++ b/metadata/cache/dev-perl/inline-files-0.680.0
@@ -6,7 +6,7 @@ mirror://cpan/authors/id/A/AM/AMBS/Inline/Inline-Files-0.68.tar.gz
 http://search.cpan.org/dist/Inline-Files/
 || ( Artistic GPL-1 GPL-2 GPL-3 )
 Multiple virtual files in a single file
-~alpha amd64 ~ia64 ~ppc ~sparc ~x86
+~alpha amd64 ~ia64 ppc ~sparc ~x86
 base eutils multilib perl-module portability toolchain-funcs user
 
 
diff --git a/metadata/cache/dev-perl/module-info-0.320.0 b/metadata/cache/dev-perl/module-info-0.320.0
index 5da39993b30d..01fa8cae679f 100644
--- a/metadata/cache/dev-perl/module-info-0.320.0
+++ b/metadata/cache/dev-perl/module-info-0.320.0
@@ -6,7 +6,7 @@ mirror://cpan/authors/id/M/MB/MBARBON/Module-Info-0.32.tar.gz
 http://search.cpan.org/dist/Module-Info/
 || ( Artistic GPL-1 GPL-2 GPL-3 )
 Information about Perl modules
-~alpha amd64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+~alpha amd64 hppa ~ia64 ~mips ppc ~ppc64 ~sparc ~x86
 base eutils multilib perl-module portability toolchain-funcs user
 test
 
diff --git a/metadata/cache/dev-perl/namespace-autoclean-0.130.0 b/metadata/cache/dev-perl/namespace-autoclean-0.130.0
index b3b72486ad67..63c909eba414 100644
--- a/metadata/cache/dev-perl/namespace-autoclean-0.130.0
+++ b/metadata/cache/dev-perl/namespace-autoclean-0.130.0
@@ -6,7 +6,7 @@ mirror://cpan/authors/id/B/BO/BOBTFISH/namespace-autoclean-0.13.tar.gz
 http://search.cpan.org/dist/namespace-autoclean/
 || ( Artistic GPL-1 GPL-2 GPL-3 )
 Keep imports out of your namespace
-amd64 ~ppc ~x86 ~x64-macos
+amd64 ppc ~x86 ~x64-macos
 base eutils multilib perl-module portability toolchain-funcs user
 test
 
diff --git a/metadata/cache/dev-python/autopep8-9999 b/metadata/cache/dev-python/autopep8-9999
new file mode 100644
index 000000000000..e6be44dc639f
--- /dev/null
+++ b/metadata/cache/dev-python/autopep8-9999
@@ -0,0 +1,22 @@
+dev-python/pep8 dev-python/setuptools >=app-admin/eselect-python-20091230 dev-lang/python dev-vcs/git
+dev-python/pep8 >=app-admin/eselect-python-20091230 dev-lang/python
+0
+
+
+https://github.com/hhatto/autopep8 http://pypi.python.org/pypi/autopep8
+MIT
+Automatically formats Python code to conform to the PEP 8 style guide
+
+distutils git-2 multilib python toolchain-funcs
+
+
+
+
+4
+
+compile install postinst postrm prepare setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-python/matplotlib-1.1.0 b/metadata/cache/dev-python/matplotlib-1.1.0
index c5f08428e1b4..3dfbcc5fbb49 100644
--- a/metadata/cache/dev-python/matplotlib-1.1.0
+++ b/metadata/cache/dev-python/matplotlib-1.1.0
@@ -6,7 +6,7 @@ mirror://sourceforge/matplotlib/matplotlib-1.1.0.tar.gz doc? ( mirror://sourcefo
 http://matplotlib.sourceforge.net/ http://pypi.python.org/pypi/matplotlib
 BitstreamVera BSD matplotlib MIT OFL-1.1
 Pure python plotting library with matlab like syntax
-amd64 ~ppc ~ppc64 x86 ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+amd64 ppc ~ppc64 x86 ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 distutils multilib python toolchain-funcs
 cairo doc excel examples fltk gtk latex qt4 tk wxwidgets
 
diff --git a/metadata/cache/dev-python/py-1.4.5 b/metadata/cache/dev-python/py-1.4.5
index 633eebda3dc8..130993e774c2 100644
--- a/metadata/cache/dev-python/py-1.4.5
+++ b/metadata/cache/dev-python/py-1.4.5
@@ -6,7 +6,7 @@ mirror://pypi/p/py/py-1.4.5.zip
 http://pylib.org/ http://pypi.python.org/pypi/py
 MIT
 library with cross-python path, ini-parsing, io, code, log facilities
-~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos
+~alpha amd64 ~arm hppa ~ia64 ~mips ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos
 distutils multilib python toolchain-funcs
 test
 
diff --git a/metadata/cache/dev-python/pysvn-1.7.5 b/metadata/cache/dev-python/pysvn-1.7.5
index 3193778695bf..54840dd6a212 100644
--- a/metadata/cache/dev-python/pysvn-1.7.5
+++ b/metadata/cache/dev-python/pysvn-1.7.5
@@ -1,5 +1,5 @@
->=dev-python/pycxx-6.2.0 dev-vcs/subversion dev-python/setuptools >=app-admin/eselect-python-20091230 dev-lang/python
->=dev-python/pycxx-6.2.0 dev-vcs/subversion >=app-admin/eselect-python-20091230 dev-lang/python
+>=dev-python/pycxx-6.2.0 <dev-vcs/subversion-1.7 dev-python/setuptools >=app-admin/eselect-python-20091230 dev-lang/python
+>=dev-python/pycxx-6.2.0 <dev-vcs/subversion-1.7 >=app-admin/eselect-python-20091230 dev-lang/python
 0
 http://pysvn.barrys-emacs.org/source_kits/pysvn-1.7.5.tar.gz
 
diff --git a/metadata/cache/dev-ruby/cri-2.2.0 b/metadata/cache/dev-ruby/cri-2.2.0
new file mode 100644
index 000000000000..200d7bd59bd1
--- /dev/null
+++ b/metadata/cache/dev-ruby/cri-2.2.0
@@ -0,0 +1,22 @@
+ruby_targets_ruby18? ( doc? ( dev-ruby/yard[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( doc? ( dev-ruby/yard[ruby_targets_ree18] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/yard[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( test? ( virtual/ruby-test-unit[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( virtual/ruby-test-unit[ruby_targets_ree18] ) ) ruby_targets_jruby? ( test? ( virtual/ruby-test-unit[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( doc? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( doc? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
+0
+mirror://rubygems/cri-2.2.0.gem
+
+http://rubygems.org/gems/cri
+MIT
+Cri is a library for building easy-to-use commandline tools.
+~amd64 ~x86
+eutils java-utils-2 multilib portability ruby-fakegem ruby-ng toolchain-funcs user versionator
+elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 ruby_targets_jruby doc test test
+
+
+
+2
+
+compile configure install prepare setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-ruby/kramdown-0.13.5 b/metadata/cache/dev-ruby/kramdown-0.13.5
new file mode 100644
index 000000000000..34f78279d17d
--- /dev/null
+++ b/metadata/cache/dev-ruby/kramdown-0.13.5
@@ -0,0 +1,22 @@
+ruby_targets_ruby18? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby18] ) test? ( >=dev-ruby/coderay-1.0.0[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby19] ) test? ( >=dev-ruby/coderay-1.0.0[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( doc? ( dev-ruby/rdoc[ruby_targets_ree18] ) test? ( >=dev-ruby/coderay-1.0.0[ruby_targets_ree18] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/rdoc[ruby_targets_jruby] ) test? ( >=dev-ruby/coderay-1.0.0[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( doc? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( doc? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
+0
+mirror://rubygems/kramdown-0.13.5.gem
+
+http://kramdown.rubyforge.org/
+GPL-3
+yet-another-markdown-parser but fast, pure Ruby, using a strict syntax definition.
+~amd64
+eutils java-utils-2 multilib portability ruby-fakegem ruby-ng toolchain-funcs user versionator
+elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 ruby_targets_jruby doc test test
+|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 ruby_targets_jruby )
+
+
+4
+
+compile configure install prepare setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-ruby/nagios_analyzer-0.0.3 b/metadata/cache/dev-ruby/nagios_analyzer-0.0.3
new file mode 100644
index 000000000000..27821ea04ac4
--- /dev/null
+++ b/metadata/cache/dev-ruby/nagios_analyzer-0.0.3
@@ -0,0 +1,22 @@
+ruby_targets_ruby18? ( test? ( dev-ruby/rspec[ruby_targets_ruby18] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby18? ( doc? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) )
+ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] )
+0
+mirror://rubygems/nagios_analyzer-0.0.3.gem
+
+https://github.com/jbbarth/nagios_analyzer
+as-is
+A simple parser for Nagios status files
+~amd64 ~x86
+eutils java-utils-2 multilib portability ruby-fakegem ruby-ng toolchain-funcs user versionator
+elibc_FreeBSD ruby_targets_ruby18 doc test test
+
+
+
+2
+
+compile configure install prepare setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-ruby/radius-0.7.3 b/metadata/cache/dev-ruby/radius-0.7.3
new file mode 100644
index 000000000000..0d18abe35d4d
--- /dev/null
+++ b/metadata/cache/dev-ruby/radius-0.7.3
@@ -0,0 +1,22 @@
+ruby_targets_ruby18? ( test? ( dev-ruby/kramdown[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/kramdown[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( test? ( dev-ruby/kramdown[ruby_targets_ree18] ) ) ruby_targets_jruby? ( test? ( dev-ruby/kramdown[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( doc? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( doc? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
+0
+mirror://rubygems/radius-0.7.3.gem
+
+http://radius.rubyforge.org/
+MIT
+Powerful tag-based template system.
+~amd64
+eutils java-utils-2 multilib portability ruby-fakegem ruby-ng toolchain-funcs user versionator
+elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 ruby_targets_jruby doc test test
+|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 ruby_targets_jruby )
+
+
+4
+
+compile configure install prepare setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-ruby/sass-3.1.15 b/metadata/cache/dev-ruby/sass-3.1.15
new file mode 100644
index 000000000000..c98d827861a8
--- /dev/null
+++ b/metadata/cache/dev-ruby/sass-3.1.15
@@ -0,0 +1,22 @@
+ruby_targets_ruby18? ( doc? ( >=dev-ruby/yard-0.5.3[ruby_targets_ruby18] >=dev-ruby/maruku-0.5.9[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( doc? ( >=dev-ruby/yard-0.5.3[ruby_targets_ruby19] >=dev-ruby/maruku-0.5.9[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( doc? ( >=dev-ruby/yard-0.5.3[ruby_targets_ree18] >=dev-ruby/maruku-0.5.9[ruby_targets_ree18] ) ) ruby_targets_jruby? ( doc? ( >=dev-ruby/yard-0.5.3[ruby_targets_jruby] >=dev-ruby/maruku-0.5.9[ruby_targets_jruby] ) ) test? ( ruby_targets_ruby18? ( dev-ruby/fssm[ruby_targets_ruby18] !!<dev-ruby/haml-3.1[ruby_targets_ruby18] ) ruby_targets_ruby19? ( dev-ruby/fssm[ruby_targets_ruby19] !!<dev-ruby/haml-3.1[ruby_targets_ruby19] ) ruby_targets_ree18? ( dev-ruby/fssm[ruby_targets_ree18] !!<dev-ruby/haml-3.1[ruby_targets_ree18] ) ruby_targets_jruby? ( dev-ruby/fssm[ruby_targets_jruby] !!<dev-ruby/haml-3.1[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+ruby_targets_ruby18? ( dev-ruby/fssm[ruby_targets_ruby18] !!<dev-ruby/haml-3.1[ruby_targets_ruby18] ) ruby_targets_ruby19? ( dev-ruby/fssm[ruby_targets_ruby19] !!<dev-ruby/haml-3.1[ruby_targets_ruby19] ) ruby_targets_ree18? ( dev-ruby/fssm[ruby_targets_ree18] !!<dev-ruby/haml-3.1[ruby_targets_ree18] ) ruby_targets_jruby? ( dev-ruby/fssm[ruby_targets_jruby] !!<dev-ruby/haml-3.1[ruby_targets_jruby] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
+0
+mirror://rubygems/sass-3.1.15.gem
+
+http://sass-lang.com/
+MIT
+An extension of CSS3, adding nested rules, variables, mixins, selector inheritance, and more.
+~amd64 ~ppc ~ppc64 ~x86
+eutils java-utils-2 multilib portability ruby-fakegem ruby-ng toolchain-funcs user versionator
+test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 ruby_targets_jruby doc test test
+
+
+
+2
+
+compile configure install prepare setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-ruby/syslogger-1.2.5 b/metadata/cache/dev-ruby/syslogger-1.2.5
index b5cf698842ef..300d54d9b114 100644
--- a/metadata/cache/dev-ruby/syslogger-1.2.5
+++ b/metadata/cache/dev-ruby/syslogger-1.2.5
@@ -1,6 +1,6 @@
 ruby_targets_ruby18? ( test? ( =dev-ruby/rspec-1.3*[ruby_targets_ruby18] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( =dev-ruby/rspec-1.3*[ruby_targets_ree18] ) doc? ( dev-ruby/rdoc[ruby_targets_ree18] ) ) ruby_targets_ruby19? ( test? ( =dev-ruby/rspec-1.3*[ruby_targets_ruby19] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( doc? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( doc? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
 ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
-3
+0
 mirror://rubygems/syslogger-1.2.5.gem
 
 https://github.com/crohr/syslogger
diff --git a/metadata/cache/dev-ruby/syslogger-1.2.6 b/metadata/cache/dev-ruby/syslogger-1.2.6
new file mode 100644
index 000000000000..9415acb4eab6
--- /dev/null
+++ b/metadata/cache/dev-ruby/syslogger-1.2.6
@@ -0,0 +1,22 @@
+ruby_targets_ruby18? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby18] ) doc? ( >=dev-ruby/rdoc-2.4.2[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rspec:2[ruby_targets_ree18] ) doc? ( >=dev-ruby/rdoc-2.4.2[ruby_targets_ree18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] ) doc? ( >=dev-ruby/rdoc-2.4.2[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rspec:2[ruby_targets_jruby] ) doc? ( >=dev-ruby/rdoc-2.4.2[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( doc? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( doc? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
+0
+mirror://rubygems/syslogger-1.2.6.gem
+
+https://github.com/crohr/syslogger
+MIT
+Drop-in replacement for the standard Logger, that logs to the syslog
+~amd64
+eutils java-utils-2 multilib portability ruby-fakegem ruby-ng toolchain-funcs user versionator
+elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 ruby_targets_ruby19 ruby_targets_jruby doc test test
+|| ( ruby_targets_ruby18 ruby_targets_ree18 ruby_targets_ruby19 ruby_targets_jruby )
+
+
+4
+
+compile configure install prepare setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-vcs/git-1.7.8.5 b/metadata/cache/dev-vcs/git-1.7.8.5
new file mode 100644
index 000000000000..7c57720ebe27
--- /dev/null
+++ b/metadata/cache/dev-vcs/git-1.7.8.5
@@ -0,0 +1,22 @@
+!blksha1? ( dev-libs/openssl ) sys-libs/zlib perl? ( dev-lang/perl[-build] dev-libs/libpcre ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) app-arch/cpio doc? ( app-text/asciidoc app-text/docbook2X sys-apps/texinfo ) >=app-admin/eselect-python-20091230 python? ( =dev-lang/python-2* )
+!blksha1? ( dev-libs/openssl ) sys-libs/zlib perl? ( dev-lang/perl[-build] dev-libs/libpcre ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( virtual/perl-CGI ) cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( gtk? ( >=dev-python/pygtk-2.8 dev-python/pygtksourceview:2 ) ) >=app-admin/eselect-python-20091230 python? ( =dev-lang/python-2* )
+0
+http://git-core.googlecode.com/files/git-1.7.8.5.tar.gz mirror://kernel/software/scm/git/git-1.7.8.5.tar.gz http://git-core.googlecode.com/files/git-manpages-1.7.8.5.tar.gz mirror://kernel/software/scm/git/git-manpages-1.7.8.5.tar.gz doc? ( mirror://kernel/software/scm/git/git-htmldocs-1.7.8.5.tar.gz http://git-core.googlecode.com/files/git-htmldocs-1.7.8.5.tar.gz )
+
+http://www.git-scm.com/
+GPL-2
+GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+base bash-completion-r1 elisp-common eutils multilib perl-module portability python toolchain-funcs user
++blksha1 +curl cgi doc emacs gtk iconv +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion
+cgi? ( perl ) cvs? ( perl ) subversion? ( perl ) webdav? ( curl )
+
+
+4
+
+compile configure install postinst postrm prepare setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/games-server/cyphesis-0.5.26 b/metadata/cache/games-server/cyphesis-0.5.26
index ea16ad33a8e2..0af74a36bd2b 100644
--- a/metadata/cache/games-server/cyphesis-0.5.26
+++ b/metadata/cache/games-server/cyphesis-0.5.26
@@ -1,5 +1,5 @@
->=media-libs/skstream-0.3.6 >=dev-games/wfmath-0.3.11 >=dev-games/mercator-0.3.0 dev-libs/libgcrypt dev-libs/libsigc++:2 sys-libs/ncurses sys-libs/readline =media-libs/atlas-c++-0.6* >=media-libs/varconf-0.6.4 dev-db/postgresql-base dev-libs/libxml2 dev-util/pkgconfig || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=app-admin/eselect-python-20091230 =dev-lang/python-2*
->=media-libs/skstream-0.3.6 >=dev-games/wfmath-0.3.11 >=dev-games/mercator-0.3.0 dev-libs/libgcrypt dev-libs/libsigc++:2 sys-libs/ncurses sys-libs/readline =media-libs/atlas-c++-0.6* >=media-libs/varconf-0.6.4 dev-db/postgresql-base >=app-admin/eselect-python-20091230 =dev-lang/python-2*
+>=media-libs/skstream-0.3.8 >=dev-games/wfmath-0.3.11 >=dev-games/mercator-0.3.0 dev-libs/libgcrypt dev-libs/libsigc++:2 sys-libs/ncurses sys-libs/readline =media-libs/atlas-c++-0.6* >=media-libs/varconf-0.6.4 dev-db/postgresql-base dev-libs/libxml2 dev-util/pkgconfig || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=app-admin/eselect-python-20091230 =dev-lang/python-2*
+>=media-libs/skstream-0.3.8 >=dev-games/wfmath-0.3.11 >=dev-games/mercator-0.3.0 dev-libs/libgcrypt dev-libs/libsigc++:2 sys-libs/ncurses sys-libs/readline =media-libs/atlas-c++-0.6* >=media-libs/varconf-0.6.4 dev-db/postgresql-base >=app-admin/eselect-python-20091230 =dev-lang/python-2*
 0
 mirror://sourceforge/worldforge/cyphesis-0.5.26.tar.bz2
 
diff --git a/metadata/cache/kde-misc/networkmanagement-0.8.98 b/metadata/cache/kde-misc/networkmanagement-0.8.98
deleted file mode 100644
index 1ddb7b0ffbb7..000000000000
--- a/metadata/cache/kde-misc/networkmanagement-0.8.98
+++ /dev/null
@@ -1,22 +0,0 @@
->=kde-base/solid-4.6:4[aqua=] net-misc/mobile-broadband-provider-info >=net-misc/networkmanager-0.9.0 >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/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-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=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[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.6:4[aqua=]
->=kde-base/solid-4.6:4[aqua=] net-misc/mobile-broadband-provider-info >=net-misc/networkmanager-0.9.0 >=kde-base/oxygen-icons-4.6:4[aqua=] linguas_ar? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_ar(+)] ) linguas_bs? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_bs(+)] ) linguas_ca? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_ca(+)] ) linguas_ca@valencia? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_ca@valencia(+)] ) linguas_cs? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_cs(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_de(+)] ) linguas_el? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_el(+)] ) linguas_en_GB? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_en_GB(+)] ) linguas_eo? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_eo(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_et(+)] ) linguas_fi? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_fi(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_fr(+)] ) linguas_ga? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_ga(+)] ) linguas_gl? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_gl(+)] ) linguas_hr? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_hr(+)] ) linguas_hu? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_hu(+)] ) linguas_is? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_is(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_it(+)] ) linguas_ja? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_ja(+)] ) linguas_km? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_km(+)] ) linguas_ko? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_ko(+)] ) linguas_lt? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_lt(+)] ) linguas_lv? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_lv(+)] ) linguas_mai? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_mai(+)] ) linguas_ms? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_ms(+)] ) linguas_nb? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_nb(+)] ) linguas_nds? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_nds(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_nl(+)] ) linguas_nn? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_nn(+)] ) linguas_pa? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_pa(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_pt_BR(+)] ) linguas_ro? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_ro(+)] ) linguas_ru? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_ru(+)] ) linguas_sk? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_sk(+)] ) linguas_sl? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_sl(+)] ) linguas_sq? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_sq(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_sv(+)] ) linguas_th? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_th(+)] ) linguas_tr? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_tr(+)] ) linguas_ug? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_ug(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_uk(+)] ) linguas_wa? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_wa(+)] ) linguas_zh_CN? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_zh_CN(+)] ) linguas_zh_TW? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_zh_TW(+)] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=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[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.6:4[aqua=]
-4
-mirror://kde/unstable/networkmanagement/0.8.98/src/networkmanagement-0.8.98.tar.bz2
-
-http://kde.org/
-GPL-2 LGPL-2
-KDE frontend for NetworkManager
-~amd64 ~x86
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib portability toolchain-funcs user versionator virtualx
-consolekit debug linguas_ar linguas_bs linguas_ca linguas_ca@valencia linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_fi linguas_fr linguas_ga linguas_gl linguas_hr linguas_hu linguas_is linguas_it linguas_ja linguas_km linguas_ko linguas_lt linguas_lv linguas_mai linguas_ms linguas_nb linguas_nds linguas_nl linguas_nn linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sl linguas_sq linguas_sv linguas_th linguas_tr linguas_ug linguas_uk linguas_wa linguas_zh_CN linguas_zh_TW aqua
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-misc/networkmanagement-0.8.99 b/metadata/cache/kde-misc/networkmanagement-0.9.0
similarity index 98%
rename from metadata/cache/kde-misc/networkmanagement-0.8.99
rename to metadata/cache/kde-misc/networkmanagement-0.9.0
index 3b65735c5114..6fafc2793305 100644
--- a/metadata/cache/kde-misc/networkmanagement-0.8.99
+++ b/metadata/cache/kde-misc/networkmanagement-0.9.0
@@ -1,7 +1,7 @@
 >=kde-base/solid-4.6:4[aqua=] net-misc/mobile-broadband-provider-info >=net-misc/networkmanager-0.9.0 >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/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-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=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[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.6:4[aqua=]
 >=kde-base/solid-4.6:4[aqua=] net-misc/mobile-broadband-provider-info >=net-misc/networkmanager-0.9.0 >=kde-base/oxygen-icons-4.6:4[aqua=] linguas_ar? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_ar(+)] ) linguas_bs? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_bs(+)] ) linguas_ca? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_ca(+)] ) linguas_ca@valencia? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_ca@valencia(+)] ) linguas_cs? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_cs(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_de(+)] ) linguas_el? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_el(+)] ) linguas_en_GB? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_en_GB(+)] ) linguas_eo? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_eo(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_et(+)] ) linguas_fi? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_fi(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_fr(+)] ) linguas_ga? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_ga(+)] ) linguas_gl? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_gl(+)] ) linguas_hr? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_hr(+)] ) linguas_hu? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_hu(+)] ) linguas_is? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_is(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_it(+)] ) linguas_ja? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_ja(+)] ) linguas_km? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_km(+)] ) linguas_ko? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_ko(+)] ) linguas_lt? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_lt(+)] ) linguas_lv? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_lv(+)] ) linguas_mai? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_mai(+)] ) linguas_ms? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_ms(+)] ) linguas_nb? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_nb(+)] ) linguas_nds? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_nds(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_nl(+)] ) linguas_nn? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_nn(+)] ) linguas_pa? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_pa(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_pt_BR(+)] ) linguas_ro? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_ro(+)] ) linguas_ru? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_ru(+)] ) linguas_sk? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_sk(+)] ) linguas_sl? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_sl(+)] ) linguas_sq? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_sq(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_sv(+)] ) linguas_th? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_th(+)] ) linguas_tr? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_tr(+)] ) linguas_ug? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_ug(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_uk(+)] ) linguas_wa? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_wa(+)] ) linguas_zh_CN? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_zh_CN(+)] ) linguas_zh_TW? ( >=kde-base/kde-l10n-4.6:4[aqua=,linguas_zh_TW(+)] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=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[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.6:4[aqua=]
 4
-mirror://kde/unstable/networkmanagement/0.8.99/src/networkmanagement-0.8.99.tar.bz2
+mirror://kde/unstable/networkmanagement/0.9.0/src/networkmanagement-0.9.0.tar.bz2
 
 http://kde.org/
 GPL-2 LGPL-2
diff --git a/metadata/cache/mail-filter/imapfilter-2.5.1 b/metadata/cache/mail-filter/imapfilter-2.5.1
new file mode 100644
index 000000000000..f8a149475a49
--- /dev/null
+++ b/metadata/cache/mail-filter/imapfilter-2.5.1
@@ -0,0 +1,22 @@
+dev-libs/openssl dev-libs/libpcre >=dev-lang/lua-5.1
+dev-libs/openssl dev-libs/libpcre >=dev-lang/lua-5.1
+0
+https://github.com/downloads/lefcha/imapfilter/imapfilter-2.5.1.tar.gz
+
+http://imapfilter.hellug.gr
+MIT
+An IMAP mail filtering utility
+~amd64 ~ppc ~x86
+multilib toolchain-funcs
+
+
+
+
+4
+
+compile install prepare
+
+
+
+
+
diff --git a/metadata/cache/mail-mta/nullmailer-1.05 b/metadata/cache/mail-mta/nullmailer-1.05
index d6648b7ef50e..22bbfa98bf6c 100644
--- a/metadata/cache/mail-mta/nullmailer-1.05
+++ b/metadata/cache/mail-mta/nullmailer-1.05
@@ -6,7 +6,7 @@ http://untroubled.org/nullmailer/archive/nullmailer-1.05.tar.gz mirror://debian/
 http://untroubled.org/nullmailer/
 GPL-2
 Simple relay-only local mail transport agent
-amd64 ~ppc ~x86
+amd64 ppc ~x86
 autotools eutils flag-o-matic libtool multilib portability toolchain-funcs user
 
 
diff --git a/metadata/cache/media-libs/gd-2.0.35-r3 b/metadata/cache/media-libs/gd-2.0.35-r3
index 495ac280985b..7a52b089ffef 100644
--- a/metadata/cache/media-libs/gd-2.0.35-r3
+++ b/metadata/cache/media-libs/gd-2.0.35-r3
@@ -1,4 +1,4 @@
-fontconfig? ( media-libs/fontconfig ) jpeg? ( virtual/jpeg ) png? ( >=media-libs/libpng-1.2:0 ) truetype? ( >=media-libs/freetype-2.1.5 ) xpm? ( x11-libs/libXpm x11-libs/libXt ) zlib? ( sys-libs/zlib ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool
+fontconfig? ( media-libs/fontconfig ) jpeg? ( virtual/jpeg ) png? ( >=media-libs/libpng-1.2:0 ) truetype? ( >=media-libs/freetype-2.1.5 ) xpm? ( x11-libs/libXpm x11-libs/libXt ) zlib? ( sys-libs/zlib ) dev-util/pkgconfig || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 fontconfig? ( media-libs/fontconfig ) jpeg? ( virtual/jpeg ) png? ( >=media-libs/libpng-1.2:0 ) truetype? ( >=media-libs/freetype-2.1.5 ) xpm? ( x11-libs/libXpm x11-libs/libXt ) zlib? ( sys-libs/zlib )
 2
 http://libgd.org/releases/gd-2.0.35.tar.bz2
diff --git a/metadata/cache/media-libs/libcdr-9999 b/metadata/cache/media-libs/libcdr-9999
index 8fec59c254b9..0cba4d4a460c 100644
--- a/metadata/cache/media-libs/libcdr-9999
+++ b/metadata/cache/media-libs/libcdr-9999
@@ -1,5 +1,5 @@
-dev-util/pkgconfig sys-devel/libtool doc? ( app-doc/doxygen ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool dev-vcs/git
-sys-libs/zlib
+app-text/libwpd:0.9 app-text/libwpg:0.2 media-libs/lcms:2 sys-libs/zlib dev-util/pkgconfig sys-devel/libtool doc? ( app-doc/doxygen ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
+app-text/libwpd:0.9 app-text/libwpg:0.2 media-libs/lcms:2 sys-libs/zlib
 0
 
 
diff --git a/metadata/cache/net-firewall/shorewall-4.4.15.1 b/metadata/cache/net-firewall/shorewall-4.4.15.1
deleted file mode 100644
index 9cf96473c682..000000000000
--- a/metadata/cache/net-firewall/shorewall-4.4.15.1
+++ /dev/null
@@ -1,22 +0,0 @@
->=net-firewall/iptables-1.2.4 sys-apps/iproute2[-minimal] dev-lang/perl !net-firewall/shorewall-common !net-firewall/shorewall-shell !net-firewall/shorewall-perl
->=net-firewall/iptables-1.2.4 sys-apps/iproute2[-minimal] dev-lang/perl !net-firewall/shorewall-common !net-firewall/shorewall-shell !net-firewall/shorewall-perl
-0
-http://www1.shorewall.net/pub/shorewall/4.4/shorewall-4.4.15/shorewall-4.4.15.1.tar.bz2 doc? ( http://www1.shorewall.net/pub/shorewall/4.4/shorewall-4.4.15/shorewall-docs-html-4.4.15.1.tar.bz2 )
-
-http://www.shorewall.net/
-GPL-2
-Shoreline Firewall is an iptables-based firewall for Linux.
-alpha amd64 hppa ppc ppc64 sparc x86
-eutils multilib portability toolchain-funcs user versionator
-doc
-
-
-
-2
-
-compile install postinst
-
-
-
-
-
diff --git a/metadata/cache/net-firewall/shorewall-4.4.22.1 b/metadata/cache/net-firewall/shorewall-4.4.22.1
deleted file mode 100644
index bc73b58dd63d..000000000000
--- a/metadata/cache/net-firewall/shorewall-4.4.22.1
+++ /dev/null
@@ -1,22 +0,0 @@
->=net-firewall/iptables-1.2.4 sys-apps/iproute2[-minimal] dev-lang/perl !net-firewall/shorewall-common !net-firewall/shorewall-shell !net-firewall/shorewall-perl
->=net-firewall/iptables-1.2.4 sys-apps/iproute2[-minimal] dev-lang/perl !net-firewall/shorewall-common !net-firewall/shorewall-shell !net-firewall/shorewall-perl
-0
-http://www1.shorewall.net/pub/shorewall/4.4/shorewall-4.4.22/shorewall-4.4.22.1.tar.bz2 doc? ( http://www1.shorewall.net/pub/shorewall/4.4/shorewall-4.4.22/shorewall-docs-html-4.4.22.1.tar.bz2 )
-
-http://www.shorewall.net/
-GPL-2
-Shoreline Firewall is an iptables-based firewall for Linux.
-~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
-eutils multilib portability toolchain-funcs user versionator
-doc
-
-
-
-4
-
-compile install postinst
-
-
-
-
-
diff --git a/metadata/cache/net-firewall/shorewall-4.4.22.3 b/metadata/cache/net-firewall/shorewall-4.4.22.3
deleted file mode 100644
index 23fd8f0d259b..000000000000
--- a/metadata/cache/net-firewall/shorewall-4.4.22.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=net-firewall/iptables-1.2.4 sys-apps/iproute2[-minimal] dev-lang/perl !net-firewall/shorewall-common !net-firewall/shorewall-shell !net-firewall/shorewall-perl
->=net-firewall/iptables-1.2.4 sys-apps/iproute2[-minimal] dev-lang/perl !net-firewall/shorewall-common !net-firewall/shorewall-shell !net-firewall/shorewall-perl
-0
-http://www1.shorewall.net/pub/shorewall/4.4/shorewall-4.4.22/shorewall-4.4.22.3.tar.bz2 doc? ( http://www1.shorewall.net/pub/shorewall/4.4/shorewall-4.4.22/shorewall-docs-html-4.4.22.3.tar.bz2 )
-
-http://www.shorewall.net/
-GPL-2
-Shoreline Firewall is an iptables-based firewall for Linux.
-~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
-eutils multilib portability toolchain-funcs user versionator
-doc
-
-
-
-4
-
-compile install postinst
-
-
-
-
-
diff --git a/metadata/cache/net-firewall/shorewall-4.4.24.1 b/metadata/cache/net-firewall/shorewall-4.4.24.1
deleted file mode 100644
index 9375edf86392..000000000000
--- a/metadata/cache/net-firewall/shorewall-4.4.24.1
+++ /dev/null
@@ -1,22 +0,0 @@
->=net-firewall/iptables-1.2.4 sys-apps/iproute2[-minimal] dev-lang/perl !net-firewall/shorewall-common !net-firewall/shorewall-shell !net-firewall/shorewall-perl
->=net-firewall/iptables-1.2.4 sys-apps/iproute2[-minimal] dev-lang/perl !net-firewall/shorewall-common !net-firewall/shorewall-shell !net-firewall/shorewall-perl
-0
-http://www1.shorewall.net/pub/shorewall/4.4/shorewall-4.4.24/shorewall-4.4.24.1.tar.bz2 doc? ( http://www1.shorewall.net/pub/shorewall/4.4/shorewall-4.4.24/shorewall-docs-html-4.4.24.1.tar.bz2 )
-
-http://www.shorewall.net/
-GPL-2
-Shoreline Firewall is an iptables-based firewall for Linux.
-~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
-eutils multilib portability toolchain-funcs user versionator
-doc
-
-
-
-4
-
-compile install postinst
-
-
-
-
-
diff --git a/metadata/cache/net-firewall/shorewall-4.4.27-r1 b/metadata/cache/net-firewall/shorewall-4.4.27-r1
new file mode 100644
index 000000000000..9982cdfe4f8b
--- /dev/null
+++ b/metadata/cache/net-firewall/shorewall-4.4.27-r1
@@ -0,0 +1,22 @@
+>=net-firewall/iptables-1.2.4 sys-apps/iproute2[-minimal] dev-lang/perl !net-firewall/shorewall-core
+>=net-firewall/iptables-1.2.4 sys-apps/iproute2[-minimal] dev-lang/perl !net-firewall/shorewall-core
+0
+http://www1.shorewall.net/pub/shorewall/4.4/shorewall-4.4.27/shorewall-4.4.27.tar.bz2 doc? ( http://www1.shorewall.net/pub/shorewall/4.4/shorewall-4.4.27/shorewall-docs-html-4.4.27.tar.bz2 )
+
+http://www.shorewall.net/
+GPL-2
+Shoreline Firewall is an iptables-based firewall for Linux.
+~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+eutils multilib portability toolchain-funcs user versionator
+doc
+
+
+
+4
+
+compile install postinst
+
+
+
+
+
diff --git a/metadata/cache/net-firewall/shorewall-core-4.5.0.1-r1 b/metadata/cache/net-firewall/shorewall-core-4.5.0.1-r1
new file mode 100644
index 000000000000..51a1796b1faf
--- /dev/null
+++ b/metadata/cache/net-firewall/shorewall-core-4.5.0.1-r1
@@ -0,0 +1,22 @@
+>=net-firewall/iptables-1.2.4 sys-apps/iproute2[-minimal] dev-lang/perl virtual/perl-Digest-SHA
+>=net-firewall/iptables-1.2.4 sys-apps/iproute2[-minimal] dev-lang/perl virtual/perl-Digest-SHA
+0
+http://www1.shorewall.net/pub/shorewall/4.5/shorewall-4.5.0/shorewall-core-4.5.0.1.tar.bz2
+
+http://www.shorewall.net/
+GPL-2
+Core libraries of shorewall / shorewall(6)-lite
+~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+eutils multilib portability toolchain-funcs user versionator
+
+
+
+
+4
+
+install
+
+
+
+
+
diff --git a/metadata/cache/net-firewall/shorewall-lite-4.4.22.1 b/metadata/cache/net-firewall/shorewall-lite-4.4.22.1
deleted file mode 100644
index 01f6f9bf9da5..000000000000
--- a/metadata/cache/net-firewall/shorewall-lite-4.4.22.1
+++ /dev/null
@@ -1,22 +0,0 @@
-net-firewall/iptables sys-apps/iproute2
-net-firewall/iptables sys-apps/iproute2
-0
-http://www1.shorewall.net/pub/shorewall/4.4/shorewall-4.4.22/shorewall-lite-4.4.22.1.tar.bz2 doc? ( http://www1.shorewall.net/pub/shorewall/4.4/shorewall-4.4.22/shorewall-docs-html-4.4.22.1.tar.bz2 )
-
-http://www.shorewall.net/
-GPL-2
-An iptables-based firewall whose config is handled by a normal Shorewall.
-~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
-eutils multilib portability toolchain-funcs user versionator
-doc
-
-
-
-4
-
-compile install prepare
-
-
-
-
-
diff --git a/metadata/cache/net-firewall/shorewall-lite-4.4.22.3 b/metadata/cache/net-firewall/shorewall-lite-4.4.22.3
deleted file mode 100644
index f5c8505d2b77..000000000000
--- a/metadata/cache/net-firewall/shorewall-lite-4.4.22.3
+++ /dev/null
@@ -1,22 +0,0 @@
-
-net-firewall/iptables sys-apps/iproute2
-0
-http://www1.shorewall.net/pub/shorewall/4.4/shorewall-4.4.22/shorewall-lite-4.4.22.3.tar.bz2 doc? ( http://www1.shorewall.net/pub/shorewall/4.4/shorewall-4.4.22/shorewall-docs-html-4.4.22.3.tar.bz2 )
-
-http://www.shorewall.net/
-GPL-2
-An iptables-based firewall whose config is handled by a normal Shorewall.
-~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
-eutils multilib portability toolchain-funcs user versionator
-doc
-
-
-
-4
-
-compile install prepare
-
-
-
-
-
diff --git a/metadata/cache/net-firewall/shorewall-lite-4.4.24.1 b/metadata/cache/net-firewall/shorewall-lite-4.4.24.1
deleted file mode 100644
index 1596fb254ea8..000000000000
--- a/metadata/cache/net-firewall/shorewall-lite-4.4.24.1
+++ /dev/null
@@ -1,22 +0,0 @@
-
-net-firewall/iptables sys-apps/iproute2
-0
-http://www1.shorewall.net/pub/shorewall/4.4/shorewall-4.4.24/shorewall-lite-4.4.24.1.tar.bz2 doc? ( http://www1.shorewall.net/pub/shorewall/4.4/shorewall-4.4.24/shorewall-docs-html-4.4.24.1.tar.bz2 )
-
-http://www.shorewall.net/
-GPL-2
-An iptables-based firewall whose config is handled by a normal Shorewall.
-~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
-eutils multilib portability toolchain-funcs user versionator
-doc
-
-
-
-4
-
-compile install prepare
-
-
-
-
-
diff --git a/metadata/cache/net-firewall/shorewall-lite-4.4.27-r1 b/metadata/cache/net-firewall/shorewall-lite-4.4.27-r1
new file mode 100644
index 000000000000..a99fbf886541
--- /dev/null
+++ b/metadata/cache/net-firewall/shorewall-lite-4.4.27-r1
@@ -0,0 +1,22 @@
+
+net-firewall/iptables sys-apps/iproute2 !net-firewall/shorewall-core
+0
+http://www1.shorewall.net/pub/shorewall/4.4/shorewall-4.4.27/shorewall-lite-4.4.27.tar.bz2 doc? ( http://www1.shorewall.net/pub/shorewall/4.4/shorewall-4.4.27/shorewall-docs-html-4.4.27.tar.bz2 )
+
+http://www.shorewall.net/
+GPL-2
+An iptables-based firewall whose config is handled by a normal Shorewall.
+~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+eutils multilib portability toolchain-funcs user versionator
+doc
+
+
+
+4
+
+compile install prepare
+
+
+
+
+
diff --git a/metadata/cache/net-firewall/shorewall6-4.4.22.1 b/metadata/cache/net-firewall/shorewall6-4.4.22.1
deleted file mode 100644
index 9d41b563ec6f..000000000000
--- a/metadata/cache/net-firewall/shorewall6-4.4.22.1
+++ /dev/null
@@ -1,22 +0,0 @@
->=net-firewall/iptables-1.4.0 sys-apps/iproute2 >=net-firewall/shorewall-4.4.22 dev-perl/Socket6
->=net-firewall/iptables-1.4.0 sys-apps/iproute2 >=net-firewall/shorewall-4.4.22 dev-perl/Socket6
-0
-http://www1.shorewall.net/pub/shorewall/4.4/shorewall-4.4.22/shorewall6-4.4.22.1.tar.bz2 doc? ( http://www1.shorewall.net/pub/shorewall6/4.4/shorewall-4.4.22/shorewall-docs-html-4.4.22.1.tar.bz2 )
-
-http://www.shorewall.net/
-GPL-2
-Shoreline Firewall with IPv6 support.
-~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
-eutils linux-info multilib portability toolchain-funcs user versionator
-doc
-
-
-
-4
-
-compile install pretend setup
-
-
-
-
-
diff --git a/metadata/cache/net-firewall/shorewall6-4.4.22.3 b/metadata/cache/net-firewall/shorewall6-4.4.22.3
deleted file mode 100644
index 097aa582195d..000000000000
--- a/metadata/cache/net-firewall/shorewall6-4.4.22.3
+++ /dev/null
@@ -1,22 +0,0 @@
-
->=net-firewall/iptables-1.4.0 sys-apps/iproute2 >=net-firewall/shorewall-4.4.22 dev-perl/Socket6
-0
-http://www1.shorewall.net/pub/shorewall/4.4/shorewall-4.4.22/shorewall6-4.4.22.3.tar.bz2 doc? ( http://www1.shorewall.net/pub/shorewall6/4.4/shorewall-4.4.22/shorewall-docs-html-4.4.22.3.tar.bz2 )
-
-http://www.shorewall.net/
-GPL-2
-Shoreline Firewall with IPv6 support.
-~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
-eutils linux-info multilib portability toolchain-funcs user versionator
-doc
-
-
-
-4
-
-compile install pretend setup
-
-
-
-
-
diff --git a/metadata/cache/net-firewall/shorewall6-4.4.24.1 b/metadata/cache/net-firewall/shorewall6-4.4.24.1
deleted file mode 100644
index c9e592c44088..000000000000
--- a/metadata/cache/net-firewall/shorewall6-4.4.24.1
+++ /dev/null
@@ -1,22 +0,0 @@
-
->=net-firewall/iptables-1.4.0 sys-apps/iproute2 >=net-firewall/shorewall-4.4.24 dev-perl/Socket6
-0
-http://www1.shorewall.net/pub/shorewall/4.4/shorewall-4.4.24/shorewall6-4.4.24.1.tar.bz2 doc? ( http://www1.shorewall.net/pub/shorewall6/4.4/shorewall-4.4.24/shorewall-docs-html-4.4.24.1.tar.bz2 )
-
-http://www.shorewall.net/
-GPL-2
-Shoreline Firewall with IPv6 support.
-~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
-eutils linux-info multilib portability toolchain-funcs user versionator
-doc
-
-
-
-4
-
-compile install pretend setup
-
-
-
-
-
diff --git a/metadata/cache/net-firewall/shorewall6-lite-4.4.22.1 b/metadata/cache/net-firewall/shorewall6-lite-4.4.22.1
deleted file mode 100644
index 03c11ed3cdd0..000000000000
--- a/metadata/cache/net-firewall/shorewall6-lite-4.4.22.1
+++ /dev/null
@@ -1,22 +0,0 @@
->=net-firewall/iptables-1.4.0 sys-apps/iproute2
->=net-firewall/iptables-1.4.0 sys-apps/iproute2
-0
-http://www1.shorewall.net/pub/shorewall/4.4/shorewall-4.4.22/shorewall6-lite-4.4.22.1.tar.bz2 doc? ( http://www1.shorewall.net/pub/shorewall/4.4/shorewall-4.4.22/shorewall-docs-html-4.4.22.1.tar.bz2 )
-
-http://www.shorewall.net/
-GPL-2
-An iptables-based firewall whose config is handled by a normal Shorewall6.
-~alpha ~amd64 ~hppa ~sparc ~x86
-eutils linux-info multilib portability toolchain-funcs user versionator
-doc
-
-
-
-4
-
-compile install pretend setup
-
-
-
-
-
diff --git a/metadata/cache/net-firewall/shorewall6-lite-4.4.22.3 b/metadata/cache/net-firewall/shorewall6-lite-4.4.22.3
deleted file mode 100644
index 7e2ad6fc3bcf..000000000000
--- a/metadata/cache/net-firewall/shorewall6-lite-4.4.22.3
+++ /dev/null
@@ -1,22 +0,0 @@
-
->=net-firewall/iptables-1.4.0 sys-apps/iproute2
-0
-http://www1.shorewall.net/pub/shorewall/4.4/shorewall-4.4.22/shorewall6-lite-4.4.22.3.tar.bz2 doc? ( http://www1.shorewall.net/pub/shorewall/4.4/shorewall-4.4.22/shorewall-docs-html-4.4.22.3.tar.bz2 )
-
-http://www.shorewall.net/
-GPL-2
-An iptables-based firewall whose config is handled by a normal Shorewall6.
-~alpha ~amd64 ~hppa ~sparc ~x86
-eutils linux-info multilib portability toolchain-funcs user versionator
-doc
-
-
-
-4
-
-compile install pretend setup
-
-
-
-
-
diff --git a/metadata/cache/net-firewall/shorewall6-lite-4.4.24.1 b/metadata/cache/net-firewall/shorewall6-lite-4.4.24.1
deleted file mode 100644
index 4928f52eb36e..000000000000
--- a/metadata/cache/net-firewall/shorewall6-lite-4.4.24.1
+++ /dev/null
@@ -1,22 +0,0 @@
-
->=net-firewall/iptables-1.4.0 sys-apps/iproute2
-0
-http://www1.shorewall.net/pub/shorewall/4.4/shorewall-4.4.24/shorewall6-lite-4.4.24.1.tar.bz2 doc? ( http://www1.shorewall.net/pub/shorewall/4.4/shorewall-4.4.24/shorewall-docs-html-4.4.24.1.tar.bz2 )
-
-http://www.shorewall.net/
-GPL-2
-An iptables-based firewall whose config is handled by a normal Shorewall6.
-~alpha ~amd64 ~hppa ~sparc ~x86
-eutils linux-info multilib portability toolchain-funcs user versionator
-doc
-
-
-
-4
-
-compile install pretend setup
-
-
-
-
-
diff --git a/metadata/cache/net-firewall/shorewall6-lite-4.4.27-r1 b/metadata/cache/net-firewall/shorewall6-lite-4.4.27-r1
new file mode 100644
index 000000000000..544a44597790
--- /dev/null
+++ b/metadata/cache/net-firewall/shorewall6-lite-4.4.27-r1
@@ -0,0 +1,22 @@
+
+>=net-firewall/iptables-1.4.0 sys-apps/iproute2 !net-firewall/shorewall-core
+0
+http://www1.shorewall.net/pub/shorewall/4.4/shorewall-4.4.27/shorewall6-lite-4.4.27.tar.bz2 doc? ( http://www1.shorewall.net/pub/shorewall/4.4/shorewall-4.4.27/shorewall-docs-html-4.4.27.tar.bz2 )
+
+http://www.shorewall.net/
+GPL-2
+An iptables-based firewall whose config is handled by a normal Shorewall6.
+~alpha ~amd64 ~hppa ~sparc ~x86
+eutils linux-info multilib portability toolchain-funcs user versionator
+doc
+
+
+
+4
+
+compile install pretend setup
+
+
+
+
+
diff --git a/metadata/cache/net-irc/weechat-0.3.6 b/metadata/cache/net-irc/weechat-0.3.7
similarity index 83%
rename from metadata/cache/net-irc/weechat-0.3.6
rename to metadata/cache/net-irc/weechat-0.3.7
index 3b18361920cb..27f5cabef719 100644
--- a/metadata/cache/net-irc/weechat-0.3.6
+++ b/metadata/cache/net-irc/weechat-0.3.7
@@ -1,7 +1,7 @@
-sys-libs/ncurses charset? ( virtual/libiconv ) lua? ( dev-lang/lua[deprecated] ) perl? ( dev-lang/perl ) ruby? ( ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ) ssl? ( net-libs/gnutls ) spell? ( app-text/aspell ) tcl? ( >=dev-lang/tcl-8.4.15 ) nls? ( >=sys-devel/gettext-0.15 ) >=app-admin/eselect-python-20091230 python? ( =dev-lang/python-2* ) >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
-sys-libs/ncurses charset? ( virtual/libiconv ) lua? ( dev-lang/lua[deprecated] ) perl? ( dev-lang/perl ) ruby? ( ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ) ssl? ( net-libs/gnutls ) spell? ( app-text/aspell ) tcl? ( >=dev-lang/tcl-8.4.15 ) >=app-admin/eselect-python-20091230 python? ( =dev-lang/python-2* )
+sys-libs/ncurses charset? ( virtual/libiconv ) lua? ( dev-lang/lua[deprecated] ) perl? ( dev-lang/perl ) ruby? ( ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ) ssl? ( net-libs/gnutls ) spell? ( app-text/aspell ) tcl? ( >=dev-lang/tcl-8.4.15 ) nls? ( >=sys-devel/gettext-0.15 ) >=app-admin/eselect-python-20091230 python? ( dev-lang/python ) >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+sys-libs/ncurses charset? ( virtual/libiconv ) lua? ( dev-lang/lua[deprecated] ) perl? ( dev-lang/perl ) ruby? ( ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ) ssl? ( net-libs/gnutls ) spell? ( app-text/aspell ) tcl? ( >=dev-lang/tcl-8.4.15 ) >=app-admin/eselect-python-20091230 python? ( dev-lang/python )
 0
-http://weechat.org/files/src/weechat-0.3.6.tar.bz2
+http://weechat.org/files/src/weechat-0.3.7.tar.bz2
 
 http://weechat.org/
 GPL-3
diff --git a/metadata/cache/net-irc/weechat-9999 b/metadata/cache/net-irc/weechat-9999
index e25208a76811..e8eedf523c77 100644
--- a/metadata/cache/net-irc/weechat-9999
+++ b/metadata/cache/net-irc/weechat-9999
@@ -1,5 +1,5 @@
-sys-libs/ncurses charset? ( virtual/libiconv ) lua? ( dev-lang/lua[deprecated] ) perl? ( dev-lang/perl ) ruby? ( ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ) ssl? ( net-libs/gnutls ) spell? ( app-text/aspell ) tcl? ( >=dev-lang/tcl-8.4.15 ) nls? ( >=sys-devel/gettext-0.15 ) >=app-admin/eselect-python-20091230 python? ( =dev-lang/python-2* ) >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-vcs/git
-sys-libs/ncurses charset? ( virtual/libiconv ) lua? ( dev-lang/lua[deprecated] ) perl? ( dev-lang/perl ) ruby? ( ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ) ssl? ( net-libs/gnutls ) spell? ( app-text/aspell ) tcl? ( >=dev-lang/tcl-8.4.15 ) >=app-admin/eselect-python-20091230 python? ( =dev-lang/python-2* )
+sys-libs/ncurses charset? ( virtual/libiconv ) lua? ( dev-lang/lua[deprecated] ) perl? ( dev-lang/perl ) ruby? ( ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ) ssl? ( net-libs/gnutls ) spell? ( app-text/aspell ) tcl? ( >=dev-lang/tcl-8.4.15 ) nls? ( >=sys-devel/gettext-0.15 ) >=app-admin/eselect-python-20091230 python? ( dev-lang/python ) >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-vcs/git
+sys-libs/ncurses charset? ( virtual/libiconv ) lua? ( dev-lang/lua[deprecated] ) perl? ( dev-lang/perl ) ruby? ( ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ) ssl? ( net-libs/gnutls ) spell? ( app-text/aspell ) tcl? ( >=dev-lang/tcl-8.4.15 ) >=app-admin/eselect-python-20091230 python? ( dev-lang/python )
 0
 
 
diff --git a/metadata/cache/net-misc/wicd-1.7.1-r2 b/metadata/cache/net-misc/wicd-1.7.1-r2
new file mode 100644
index 000000000000..f4a87f818682
--- /dev/null
+++ b/metadata/cache/net-misc/wicd-1.7.1-r2
@@ -0,0 +1,22 @@
+>=app-admin/eselect-python-20091230 =dev-lang/python-2* =dev-lang/python-2*[ncurses?,xml] !<sys-apps/systemd-29-r4 !=sys-apps/systemd-37-r1
+dev-python/dbus-python X? ( gtk? ( dev-python/pygtk || ( x11-misc/ktsuss x11-libs/gksu kde-base/kdesu ) ) ) || ( net-misc/dhcpcd net-misc/dhcp net-misc/pump ) net-wireless/wireless-tools net-wireless/wpa_supplicant || ( sys-apps/net-tools sys-apps/ethtool ) !gtk? ( dev-python/pygobject:2 ) ioctl? ( dev-python/python-iwscan dev-python/python-wpactrl ) libnotify? ( dev-python/notify-python ) ncurses? ( dev-python/urwid dev-python/pygobject:2 ) pm-utils? ( >=sys-power/pm-utils-1.1.1 ) >=app-admin/eselect-python-20091230 =dev-lang/python-2* =dev-lang/python-2*[ncurses?,xml]
+0
+http://launchpad.net/wicd/1.7/1.7.1/+download/wicd-1.7.1.tar.gz mac4lin? ( http://dev.gentoo.org/~anarchy/dist/wicd-mac4lin-icons.tar.xz ) ambiance? ( http://freetimesblog.altervista.org/blog/wp-content/uploads/downloads/2010/05/Icone-Wicd-Lucid.tar.gz )
+
+http://wicd.sourceforge.net/
+GPL-2
+A lightweight wired and wireless network manager for Linux
+~amd64 ~x86
+distutils eutils multilib portability python systemd toolchain-funcs user
+X ambiance +gtk ioctl libnotify mac4lin ncurses nls +pm-utils
+
+
+
+3
+
+compile configure install postinst postrm prepare setup
+
+
+
+
+
diff --git a/metadata/cache/net-proxy/haproxy-1.3.25 b/metadata/cache/net-proxy/haproxy-1.3.25
deleted file mode 100644
index eabac915e88b..000000000000
--- a/metadata/cache/net-proxy/haproxy-1.3.25
+++ /dev/null
@@ -1,22 +0,0 @@
-pcre? ( dev-libs/libpcre )
-pcre? ( dev-libs/libpcre )
-0
-http://haproxy.1wt.eu/download/1.3/src/haproxy-1.3.25.tar.gz
-
-http://haproxy.1wt.eu
-GPL-2 LGPL-2.1
-A TCP/HTTP reverse proxy for high availability environments
-amd64 ppc x86
-eutils flag-o-matic multilib portability toolchain-funcs user versionator
-examples pcre vim-syntax
-
-
-
-
-
-compile install postinst setup
-
-
-
-
-
diff --git a/metadata/cache/net-proxy/haproxy-1.3.26-r1 b/metadata/cache/net-proxy/haproxy-1.3.26-r1
deleted file mode 100644
index 0a4c2797172a..000000000000
--- a/metadata/cache/net-proxy/haproxy-1.3.26-r1
+++ /dev/null
@@ -1,22 +0,0 @@
-pcre? ( dev-libs/libpcre )
-pcre? ( dev-libs/libpcre )
-0
-http://haproxy.1wt.eu/download/1.3/src/haproxy-1.3.26.tar.gz
-
-http://haproxy.1wt.eu
-GPL-2 LGPL-2.1
-A TCP/HTTP reverse proxy for high availability environments
-~amd64 ~ppc ~x86
-eutils flag-o-matic multilib portability toolchain-funcs user versionator
-examples pcre vim-syntax
-
-
-
-
-
-compile install postinst setup
-
-
-
-
-
diff --git a/metadata/cache/net-proxy/haproxy-1.3.26 b/metadata/cache/net-proxy/haproxy-1.4.19
similarity index 83%
rename from metadata/cache/net-proxy/haproxy-1.3.26
rename to metadata/cache/net-proxy/haproxy-1.4.19
index 0a4c2797172a..a697b9ab949e 100644
--- a/metadata/cache/net-proxy/haproxy-1.3.26
+++ b/metadata/cache/net-proxy/haproxy-1.4.19
@@ -1,7 +1,7 @@
 pcre? ( dev-libs/libpcre )
 pcre? ( dev-libs/libpcre )
 0
-http://haproxy.1wt.eu/download/1.3/src/haproxy-1.3.26.tar.gz
+http://haproxy.1wt.eu/download/1.4/src/haproxy-1.4.19.tar.gz
 
 http://haproxy.1wt.eu
 GPL-2 LGPL-2.1
@@ -12,7 +12,7 @@ examples pcre vim-syntax
 
 
 
-
+4
 
 compile install postinst setup
 
diff --git a/metadata/cache/sci-biology/biopython-1.59 b/metadata/cache/sci-biology/biopython-1.59
new file mode 100644
index 000000000000..29c9b5c2a306
--- /dev/null
+++ b/metadata/cache/sci-biology/biopython-1.59
@@ -0,0 +1,22 @@
+dev-python/numpy dev-python/reportlab mysql? ( dev-python/mysql-python ) postgres? ( dev-python/psycopg ) sys-devel/flex >=app-admin/eselect-python-20091230 =dev-lang/python-2*
+dev-python/numpy dev-python/reportlab mysql? ( dev-python/mysql-python ) postgres? ( dev-python/psycopg ) >=app-admin/eselect-python-20091230 =dev-lang/python-2*
+0
+http://www.biopython.org/DIST/biopython-1.59.tar.gz
+
+http://www.biopython.org/ http://pypi.python.org/pypi/biopython/
+as-is
+Python modules for computational molecular biology
+~amd64 ~ppc ~x86
+distutils eutils multilib portability python toolchain-funcs user
+mysql postgres
+
+
+
+3
+
+compile install postinst postrm prepare test
+
+
+
+
+
diff --git a/metadata/cache/sci-chemistry/burrow-owl-1.5.1 b/metadata/cache/sci-chemistry/burrow-owl-1.5.1
new file mode 100644
index 000000000000..8f050d178fc0
--- /dev/null
+++ b/metadata/cache/sci-chemistry/burrow-owl-1.5.1
@@ -0,0 +1,22 @@
+dev-libs/g-wrap dev-libs/glib:2 dev-scheme/guile[networking,regex] dev-scheme/guile-cairo dev-scheme/guile-gnome-platform sci-libs/starparse x11-libs/gtk+:2 dev-util/indent dev-util/pkgconfig doc? ( app-doc/doxygen )
+dev-libs/g-wrap dev-libs/glib:2 dev-scheme/guile[networking,regex] dev-scheme/guile-cairo dev-scheme/guile-gnome-platform sci-libs/starparse x11-libs/gtk+:2
+0
+mirror://sourceforge/burrow-owl/burrow-owl-1.5.1.tar.gz examples? ( mirror://sourceforge/burrow-owl/burrow-demos.tar )
+
+http://burrow-owl.sourceforge.net/
+GPL-2
+Visualize multidimensional nuclear magnetic resonance (NMR) spectra
+~amd64 ~x86
+autotools autotools-utils eutils libtool multilib portability toolchain-funcs user
+doc examples static-libs
+
+
+
+4
+
+compile configure install prepare test
+
+
+
+
+
diff --git a/metadata/cache/sci-chemistry/pymol-1.5.0.2 b/metadata/cache/sci-chemistry/pymol-1.5.0.2
new file mode 100644
index 000000000000..c33104bb22e6
--- /dev/null
+++ b/metadata/cache/sci-chemistry/pymol-1.5.0.2
@@ -0,0 +1,22 @@
+dev-python/numpy dev-python/pmw media-libs/freetype:2 media-libs/glew media-libs/libpng media-video/mpeg-tools sys-libs/zlib media-libs/freeglut apbs? ( dev-libs/maloc sci-chemistry/apbs sci-chemistry/pdb2pqr sci-chemistry/pymol-apbs-plugin ) web? ( !dev-python/webpy ) >=app-admin/eselect-python-20091230 =dev-lang/python-2.7* =dev-lang/python-2.7*[tk]
+dev-python/numpy dev-python/pmw media-libs/freetype:2 media-libs/glew media-libs/libpng media-video/mpeg-tools sys-libs/zlib media-libs/freeglut apbs? ( dev-libs/maloc sci-chemistry/apbs sci-chemistry/pdb2pqr sci-chemistry/pymol-apbs-plugin ) web? ( !dev-python/webpy ) >=app-admin/eselect-python-20091230 =dev-lang/python-2.7* =dev-lang/python-2.7*[tk]
+0
+http://dev.gentoo.org/~jlec/distfiles/pymol-1.5.0.2.tar.xz http://dev.gentoo.org/~jlec/distfiles/pymol.xpm.tar
+
+http://pymol.sourceforge.net/
+PSF-2.2
+A Python-extensible molecular graphics system
+~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
+distutils eutils fdo-mime multilib portability prefix python toolchain-funcs user versionator
+apbs numpy vmd web
+
+
+
+4
+
+compile configure install postinst postrm prepare setup
+
+
+
+
+
diff --git a/metadata/cache/sci-libs/grib_api-1.9.9 b/metadata/cache/sci-libs/grib_api-1.9.9-r1
similarity index 96%
rename from metadata/cache/sci-libs/grib_api-1.9.9
rename to metadata/cache/sci-libs/grib_api-1.9.9-r1
index bcc37fe68380..30e19bd6d957 100644
--- a/metadata/cache/sci-libs/grib_api-1.9.9
+++ b/metadata/cache/sci-libs/grib_api-1.9.9-r1
@@ -1,4 +1,4 @@
-jpeg2k? ( || ( media-libs/jasper media-libs/openjpeg ) ) netcdf? ( sci-libs/netcdf ) png? ( media-libs/libpng ) python? ( dev-python/numpy ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool
+jpeg2k? ( || ( media-libs/jasper media-libs/openjpeg ) ) netcdf? ( sci-libs/netcdf ) png? ( media-libs/libpng ) python? ( dev-python/numpy ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 jpeg2k? ( || ( media-libs/jasper media-libs/openjpeg ) ) netcdf? ( sci-libs/netcdf ) png? ( media-libs/libpng ) python? ( dev-python/numpy )
 0
 http://www.ecmwf.int/products/data/software/download/software_files/grib_api-1.9.9.tar.gz
@@ -12,7 +12,7 @@ doc examples fortran jpeg2k netcdf openmp png perl python static-libs
 
 
 
-3
+4
 
 configure install prepare
 
diff --git a/metadata/cache/sci-libs/mathgl-1.11.1.1 b/metadata/cache/sci-libs/mathgl-1.11.1.1
index 5714c8381ece..a2987d643362 100644
--- a/metadata/cache/sci-libs/mathgl-1.11.1.1
+++ b/metadata/cache/sci-libs/mathgl-1.11.1.1
@@ -1,4 +1,4 @@
-media-libs/libpng virtual/opengl python? ( dev-python/numpy ) glut? ( media-libs/freeglut ) fltk? ( x11-libs/fltk:1 ) gif? ( media-libs/giflib ) jpeg? ( virtual/jpeg ) hdf5? ( >=sci-libs/hdf5-1.8 ) gsl? ( sci-libs/gsl ) octave? ( >=sci-mathematics/octave-3.4.0 ) qt4? ( x11-libs/qt-gui:4 ) wxwidgets? ( x11-libs/wxGTK:2.8 ) >=sys-devel/libtool-2.2.4 doc? ( app-text/texi2html virtual/texi2dvi ) python? ( dev-lang/swig ) octave? ( dev-lang/swig ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=app-admin/eselect-python-20091230 =dev-lang/python-2*
+media-libs/libpng virtual/opengl python? ( dev-python/numpy ) glut? ( media-libs/freeglut ) fltk? ( x11-libs/fltk:1 ) gif? ( media-libs/giflib ) jpeg? ( virtual/jpeg ) hdf5? ( >=sci-libs/hdf5-1.8 ) gsl? ( sci-libs/gsl ) octave? ( >=sci-mathematics/octave-3.4.0 ) qt4? ( x11-libs/qt-gui:4 ) wxwidgets? ( x11-libs/wxGTK:2.8 ) >=sys-devel/libtool-2.2.4 doc? ( app-text/texi2html virtual/texi2dvi ) python? ( dev-lang/swig ) octave? ( dev-lang/swig ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=app-admin/eselect-python-20091230 =dev-lang/python-2*
 media-libs/libpng virtual/opengl python? ( dev-python/numpy ) glut? ( media-libs/freeglut ) fltk? ( x11-libs/fltk:1 ) gif? ( media-libs/giflib ) jpeg? ( virtual/jpeg ) hdf5? ( >=sci-libs/hdf5-1.8 ) gsl? ( sci-libs/gsl ) octave? ( >=sci-mathematics/octave-3.4.0 ) qt4? ( x11-libs/qt-gui:4 ) wxwidgets? ( x11-libs/wxGTK:2.8 ) >=app-admin/eselect-python-20091230 =dev-lang/python-2*
 0
 mirror://sourceforge/mathgl/mathgl-1.11.1.1.tar.gz mirror://sourceforge/mathgl/STIX_font.tgz
diff --git a/metadata/cache/sci-libs/mathgl-1.11.2 b/metadata/cache/sci-libs/mathgl-1.11.2
index cf8b9ba3cf6f..768172ccd3ec 100644
--- a/metadata/cache/sci-libs/mathgl-1.11.2
+++ b/metadata/cache/sci-libs/mathgl-1.11.2
@@ -1,4 +1,4 @@
-media-libs/libpng sys-libs/zlib virtual/opengl python? ( dev-python/numpy ) glut? ( media-libs/freeglut ) fltk? ( x11-libs/fltk:1 ) gif? ( media-libs/giflib ) jpeg? ( virtual/jpeg ) hdf5? ( >=sci-libs/hdf5-1.8 ) gsl? ( sci-libs/gsl ) octave? ( >=sci-mathematics/octave-3.4.0 ) qt4? ( x11-libs/qt-gui:4 ) wxwidgets? ( x11-libs/wxGTK:2.8 ) >=sys-devel/libtool-2.2.4 doc? ( app-text/texi2html virtual/texi2dvi ) python? ( dev-lang/swig ) octave? ( dev-lang/swig ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=app-admin/eselect-python-20091230 =dev-lang/python-2*
+media-libs/libpng sys-libs/zlib virtual/opengl python? ( dev-python/numpy ) glut? ( media-libs/freeglut ) fltk? ( x11-libs/fltk:1 ) gif? ( media-libs/giflib ) jpeg? ( virtual/jpeg ) hdf5? ( >=sci-libs/hdf5-1.8 ) gsl? ( sci-libs/gsl ) octave? ( >=sci-mathematics/octave-3.4.0 ) qt4? ( x11-libs/qt-gui:4 ) wxwidgets? ( x11-libs/wxGTK:2.8 ) >=sys-devel/libtool-2.2.4 doc? ( app-text/texi2html virtual/texi2dvi ) python? ( dev-lang/swig ) octave? ( dev-lang/swig ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=app-admin/eselect-python-20091230 =dev-lang/python-2*
 media-libs/libpng sys-libs/zlib virtual/opengl python? ( dev-python/numpy ) glut? ( media-libs/freeglut ) fltk? ( x11-libs/fltk:1 ) gif? ( media-libs/giflib ) jpeg? ( virtual/jpeg ) hdf5? ( >=sci-libs/hdf5-1.8 ) gsl? ( sci-libs/gsl ) octave? ( >=sci-mathematics/octave-3.4.0 ) qt4? ( x11-libs/qt-gui:4 ) wxwidgets? ( x11-libs/wxGTK:2.8 ) >=app-admin/eselect-python-20091230 =dev-lang/python-2*
 0
 mirror://sourceforge/mathgl/mathgl-1.11.2.tar.gz mirror://sourceforge/mathgl/STIX_font.tgz
diff --git a/metadata/cache/sci-mathematics/glpk-4.45 b/metadata/cache/sci-mathematics/glpk-4.45
index cefa105bfbf6..65294c4ba0f4 100644
--- a/metadata/cache/sci-mathematics/glpk-4.45
+++ b/metadata/cache/sci-mathematics/glpk-4.45
@@ -6,7 +6,7 @@ mirror://gnu/glpk/glpk-4.45.tar.gz
 http://www.gnu.org/software/glpk/
 GPL-3
 GNU Linear Programming Kit
-alpha amd64 hppa ~ppc ~ppc64 sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux
+alpha amd64 hppa ppc ~ppc64 sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux
 eutils flag-o-matic multilib portability toolchain-funcs user
 doc examples gmp odbc mysql static-libs
 
diff --git a/metadata/cache/sci-mathematics/octave-3.6.1 b/metadata/cache/sci-mathematics/octave-3.6.1
new file mode 100644
index 000000000000..57b8042170b8
--- /dev/null
+++ b/metadata/cache/sci-mathematics/octave-3.6.1
@@ -0,0 +1,22 @@
+dev-libs/libpcre app-text/ghostscript-gpl sys-libs/ncurses virtual/lapack curl? ( net-misc/curl ) fftw? ( sci-libs/fftw:3.0 ) glpk? ( sci-mathematics/glpk ) gnuplot? ( sci-visualization/gnuplot ) imagemagick? ( || ( media-gfx/graphicsmagick[cxx] media-gfx/imagemagick[cxx] ) ) opengl? ( media-libs/freetype:2 media-libs/fontconfig >=x11-libs/fltk-1.3:1[opengl] ) qhull? ( media-libs/qhull ) qrupdate? ( sci-libs/qrupdate ) readline? ( sys-libs/readline ) sparse? ( sci-libs/arpack sci-libs/camd sci-libs/ccolamd sci-libs/cholmod sci-libs/colamd sci-libs/cxsparse sci-libs/umfpack ) X? ( x11-libs/libX11 ) zlib? ( sys-libs/zlib ) doc? ( virtual/latex-base dev-texlive/texlive-genericrecommended sys-apps/texinfo ) dev-util/gperf dev-util/pkgconfig || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/libpcre app-text/ghostscript-gpl sys-libs/ncurses virtual/lapack curl? ( net-misc/curl ) fftw? ( sci-libs/fftw:3.0 ) glpk? ( sci-mathematics/glpk ) gnuplot? ( sci-visualization/gnuplot ) imagemagick? ( || ( media-gfx/graphicsmagick[cxx] media-gfx/imagemagick[cxx] ) ) opengl? ( media-libs/freetype:2 media-libs/fontconfig >=x11-libs/fltk-1.3:1[opengl] ) qhull? ( media-libs/qhull ) qrupdate? ( sci-libs/qrupdate ) readline? ( sys-libs/readline ) sparse? ( sci-libs/arpack sci-libs/camd sci-libs/ccolamd sci-libs/cholmod sci-libs/colamd sci-libs/cxsparse sci-libs/umfpack ) X? ( x11-libs/libX11 ) zlib? ( sys-libs/zlib )
+0
+ftp://ftp.gnu.org/pub/gnu/octave/octave-3.6.1.tar.bz2
+
+http://www.octave.org/
+GPL-3
+High-level interactive language for numerical computations
+~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+autotools autotools-utils eutils libtool multilib portability toolchain-funcs user
+curl doc fftw +glpk gnuplot +imagemagick opengl +qhull +qrupdate readline +sparse static-libs X zlib
+
+
+
+4
+
+compile configure install prepare test
+
+
+
+
+
diff --git a/metadata/cache/sys-cluster/keepalived-1.2.2-r3 b/metadata/cache/sys-cluster/keepalived-1.2.2-r3
new file mode 100644
index 000000000000..9617e52b4030
--- /dev/null
+++ b/metadata/cache/sys-cluster/keepalived-1.2.2-r3
@@ -0,0 +1,22 @@
+dev-libs/popt sys-apps/iproute2 dev-libs/libnl:1.1 dev-libs/openssl >=sys-kernel/linux-headers-2.6.30 || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/popt sys-apps/iproute2 dev-libs/libnl:1.1 dev-libs/openssl
+0
+http://www.keepalived.org/software/keepalived-1.2.2.tar.gz mirror://debian/pool/main/k/keepalived/keepalived_1.2.2-3.diff.gz
+
+http://www.keepalived.org/
+GPL-2
+A strong & robust keepalive facility to the Linux Virtual Server project
+~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
+autotools base eutils libtool multilib portability toolchain-funcs user
+debug
+
+
+
+4
+
+compile configure install prepare unpack
+
+
+
+
+
diff --git a/metadata/cache/sys-devel/crossdev-20120227 b/metadata/cache/sys-devel/crossdev-20120227
new file mode 100644
index 000000000000..a3479533d5f9
--- /dev/null
+++ b/metadata/cache/sys-devel/crossdev-20120227
@@ -0,0 +1,22 @@
+app-arch/xz-utils
+>=sys-apps/portage-2.1 app-shells/bash !sys-devel/crossdev-wrappers
+0
+mirror://gentoo/crossdev-20120227.tar.xz http://dev.gentoo.org/~vapier/dist/crossdev-20120227.tar.xz
+
+http://www.gentoo.org/
+GPL-2
+Gentoo Cross-toolchain generator
+~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
+
+
+
+
+
+4
+
+install
+
+
+
+
+
diff --git a/metadata/cache/sys-devel/crossdev-99999999 b/metadata/cache/sys-devel/crossdev-99999999
index 273373c3f47f..710a2867a3ee 100644
--- a/metadata/cache/sys-devel/crossdev-99999999
+++ b/metadata/cache/sys-devel/crossdev-99999999
@@ -12,7 +12,7 @@ git-2
 
 
 
-3
+4
 
 install unpack
 
diff --git a/metadata/cache/sys-kernel/vanilla-sources-3.2.8 b/metadata/cache/sys-kernel/vanilla-sources-3.2.8
new file mode 100644
index 000000000000..be62b48e0bb7
--- /dev/null
+++ b/metadata/cache/sys-kernel/vanilla-sources-3.2.8
@@ -0,0 +1,22 @@
+!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+3.2.8
+mirror://kernel/linux/kernel/v3.x/patch-3.2.8.bz2 mirror://kernel/linux/kernel/v3.x/linux-3.2.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-3.2 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-check -> deblob-check-3.2 )
+binchecks strip
+http://www.kernel.org
+GPL-2 !deblob? ( freedist )
+Full sources for the Linux kernel
+~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+eutils kernel-2 multilib portability toolchain-funcs user versionator
+deblob symlink build deblob
+
+!build? ( virtual/dev-manager )
+
+2
+
+compile install postinst postrm preinst setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/sys-kernel/vserver-sources-2.3.2.7 b/metadata/cache/sys-kernel/vserver-sources-2.3.2.7
new file mode 100644
index 000000000000..145e5570d3fb
--- /dev/null
+++ b/metadata/cache/sys-kernel/vserver-sources-2.3.2.7
@@ -0,0 +1,22 @@
+!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+2.3.2.7
+mirror://kernel/linux/kernel/v3.x/patch-3.2.7.bz2 mirror://kernel/linux/kernel/v3.x/linux-3.2.tar.bz2 http://vserver.13thfloor.at/Experimental/patch-3.2.7-vs2.3.2.7.diff
+binchecks strip
+http://www.gentoo.org/proj/en/vps/
+GPL-2 freedist
+Full sources including Linux-VServer patchsets for the 3.2 kernel tree.
+~amd64 ~hppa ~x86
+eutils kernel-2 multilib portability toolchain-funcs user versionator
+symlink build
+
+!build? ( virtual/dev-manager )
+
+
+
+compile install postinst postrm preinst setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/sys-libs/libfaketime-0.9 b/metadata/cache/sys-libs/libfaketime-0.9-r1
similarity index 100%
rename from metadata/cache/sys-libs/libfaketime-0.9
rename to metadata/cache/sys-libs/libfaketime-0.9-r1
diff --git a/metadata/cache/www-apache/passenger-3.0.11-r1 b/metadata/cache/www-apache/passenger-3.0.11-r1
new file mode 100644
index 000000000000..36b5f1144d49
--- /dev/null
+++ b/metadata/cache/www-apache/passenger-3.0.11-r1
@@ -0,0 +1,22 @@
+test? ( ruby_targets_ruby18? ( >=dev-ruby/daemon_controller-0.2.5[ruby_targets_ruby18] >=dev-ruby/rack-1.0.0[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >=dev-ruby/daemon_controller-0.2.5[ruby_targets_ruby19] >=dev-ruby/rack-1.0.0[ruby_targets_ruby19] ) ) test? ( ruby_targets_ruby18? ( >=dev-ruby/fastthread-1.0.1[ruby_targets_ruby18] ) ) >=dev-libs/libev-3.90 net-misc/curl[ssl] doc? ( >=app-text/asciidoc-8.6.5[highlight] ) =www-servers/apache-2.2* ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 )
+ruby_targets_ruby18? ( >=dev-ruby/daemon_controller-0.2.5[ruby_targets_ruby18] >=dev-ruby/rack-1.0.0[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >=dev-ruby/daemon_controller-0.2.5[ruby_targets_ruby19] >=dev-ruby/rack-1.0.0[ruby_targets_ruby19] ) ruby_targets_ruby18? ( >=dev-ruby/fastthread-1.0.1[ruby_targets_ruby18] ) >=dev-libs/libev-3.90 net-misc/curl[ssl] =www-servers/apache-2.2* ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 )
+0
+mirror://rubyforge/passenger/passenger-3.0.11.tar.gz
+
+http://modrails.com/
+GPL-2
+Passenger (a.k.a. mod_rails) makes deployment of Ruby on Rails applications a breeze
+~amd64 ~x86
+apache-module depend.apache eutils flag-o-matic java-utils-2 multilib portability ruby-ng toolchain-funcs user versionator
+debug doc test test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19
+ruby_targets_ruby18? ( !ruby_targets_ruby19 ) ruby_targets_ruby19? ( !ruby_targets_ruby18 ) || ( ruby_targets_ruby18 ruby_targets_ruby19 )
+
+
+4
+
+compile configure install postinst prepare setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/www-apps/nanoc-3.3.1 b/metadata/cache/www-apps/nanoc-3.3.1
new file mode 100644
index 000000000000..5b88b18b1436
--- /dev/null
+++ b/metadata/cache/www-apps/nanoc-3.3.1
@@ -0,0 +1,22 @@
+test? ( ruby_targets_ruby18? ( !minimal? ( >=dev-ruby/cri-2[ruby_targets_ruby18] dev-ruby/mime-types[ruby_targets_ruby18] dev-ruby/rack[ruby_targets_ruby18] ) ) ) ruby_targets_ruby18? ( test? ( dev-ruby/mocha[ruby_targets_ruby18] dev-ruby/minitest[ruby_targets_ruby18] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby18? ( doc? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) )
+ruby_targets_ruby18? ( !minimal? ( >=dev-ruby/cri-2[ruby_targets_ruby18] dev-ruby/mime-types[ruby_targets_ruby18] dev-ruby/rack[ruby_targets_ruby18] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] )
+0
+mirror://rubygems/nanoc-3.3.1.gem
+
+http://nanoc.stoneship.org/
+MIT
+nanoc is a simple but very flexible static site generator written in Ruby.
+~amd64 ~x86
+eutils java-utils-2 multilib portability ruby-fakegem ruby-ng toolchain-funcs user versionator
+minimal test elibc_FreeBSD ruby_targets_ruby18 doc test test
+
+
+
+2
+
+compile configure install prepare setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/www-client/firefox-10.0.1-r1 b/metadata/cache/www-client/firefox-10.0.1-r1
new file mode 100644
index 000000000000..a990b89812db
--- /dev/null
+++ b/metadata/cache/www-client/firefox-10.0.1-r1
@@ -0,0 +1,22 @@
+>=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.13.1 >=dev-libs/nspr-4.8.8 >=dev-libs/glib-2.26:2 >=media-libs/mesa-7.10 media-libs/libpng[apng] virtual/libffi system-sqlite? ( >=dev-db/sqlite-3.7.7.1[fts3,secure-delete,threadsafe,unlock-notify,debug=] ) webm? ( >=media-libs/libvpx-0.9.7 media-libs/alsa-lib ) crashreporter? ( net-misc/curl ) selinux? ( sec-policy/selinux-mozilla ) dev-util/pkgconfig pgo? ( =dev-lang/python-2*[sqlite] >=sys-devel/gcc-4.5 ) webm? ( x86? ( >=dev-lang/yasm-1.1 ) amd64? ( >=dev-lang/yasm-1.1 ) ) >=sys-apps/sed-4 >=app-admin/eselect-python-20091230 x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 dev-util/pkgconfig =dev-lang/python-2*[threads] app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools ) || ( =sys-devel/automake-1.11* ) =sys-devel/autoconf-2.1* sys-devel/libtool pgo? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) app-arch/unzip
+>=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.13.1 >=dev-libs/nspr-4.8.8 >=dev-libs/glib-2.26:2 >=media-libs/mesa-7.10 media-libs/libpng[apng] virtual/libffi system-sqlite? ( >=dev-db/sqlite-3.7.7.1[fts3,secure-delete,threadsafe,unlock-notify,debug=] ) webm? ( >=media-libs/libvpx-0.9.7 media-libs/alsa-lib ) crashreporter? ( net-misc/curl ) selinux? ( sec-policy/selinux-mozilla ) >=app-admin/eselect-python-20091230 x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools )
+0
+linguas_af? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/af.xpi -> firefox-10.0.1-af.xpi ) linguas_ak? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/ak.xpi -> firefox-10.0.1-ak.xpi ) linguas_ar? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/ar.xpi -> firefox-10.0.1-ar.xpi ) linguas_as? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/as.xpi -> firefox-10.0.1-as.xpi ) linguas_ast? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/ast.xpi -> firefox-10.0.1-ast.xpi ) linguas_be? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/be.xpi -> firefox-10.0.1-be.xpi ) linguas_bg? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/bg.xpi -> firefox-10.0.1-bg.xpi ) linguas_bn_BD? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/bn-BD.xpi -> firefox-10.0.1-bn-BD.xpi ) linguas_bn_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/bn-IN.xpi -> firefox-10.0.1-bn-IN.xpi ) linguas_br? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/br.xpi -> firefox-10.0.1-br.xpi ) linguas_bs? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/bs.xpi -> firefox-10.0.1-bs.xpi ) linguas_ca? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/ca.xpi -> firefox-10.0.1-ca.xpi ) linguas_cs? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/cs.xpi -> firefox-10.0.1-cs.xpi ) linguas_csb? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/csb.xpi -> firefox-10.0.1-csb.xpi ) linguas_cy? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/cy.xpi -> firefox-10.0.1-cy.xpi ) linguas_da? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/da.xpi -> firefox-10.0.1-da.xpi ) linguas_de? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/de.xpi -> firefox-10.0.1-de.xpi ) linguas_el? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/el.xpi -> firefox-10.0.1-el.xpi ) linguas_en_GB? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/en-GB.xpi -> firefox-10.0.1-en-GB.xpi ) linguas_en_ZA? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/en-ZA.xpi -> firefox-10.0.1-en-ZA.xpi ) linguas_eo? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/eo.xpi -> firefox-10.0.1-eo.xpi ) linguas_es_AR? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/es-AR.xpi -> firefox-10.0.1-es-AR.xpi ) linguas_es_CL? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/es-CL.xpi -> firefox-10.0.1-es-CL.xpi ) linguas_es_ES? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/es-ES.xpi -> firefox-10.0.1-es-ES.xpi ) linguas_es_MX? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/es-MX.xpi -> firefox-10.0.1-es-MX.xpi ) linguas_et? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/et.xpi -> firefox-10.0.1-et.xpi ) linguas_eu? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/eu.xpi -> firefox-10.0.1-eu.xpi ) linguas_fa? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/fa.xpi -> firefox-10.0.1-fa.xpi ) linguas_fi? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/fi.xpi -> firefox-10.0.1-fi.xpi ) linguas_fr? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/fr.xpi -> firefox-10.0.1-fr.xpi ) linguas_fy_NL? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/fy-NL.xpi -> firefox-10.0.1-fy-NL.xpi ) linguas_ga_IE? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/ga-IE.xpi -> firefox-10.0.1-ga-IE.xpi ) linguas_gd? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/gd.xpi -> firefox-10.0.1-gd.xpi ) linguas_gl? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/gl.xpi -> firefox-10.0.1-gl.xpi ) linguas_gu_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/gu-IN.xpi -> firefox-10.0.1-gu-IN.xpi ) linguas_he? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/he.xpi -> firefox-10.0.1-he.xpi ) linguas_hi_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/hi-IN.xpi -> firefox-10.0.1-hi-IN.xpi ) linguas_hr? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/hr.xpi -> firefox-10.0.1-hr.xpi ) linguas_hu? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/hu.xpi -> firefox-10.0.1-hu.xpi ) linguas_hy_AM? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/hy-AM.xpi -> firefox-10.0.1-hy-AM.xpi ) linguas_id? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/id.xpi -> firefox-10.0.1-id.xpi ) linguas_is? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/is.xpi -> firefox-10.0.1-is.xpi ) linguas_it? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/it.xpi -> firefox-10.0.1-it.xpi ) linguas_ja? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/ja.xpi -> firefox-10.0.1-ja.xpi ) linguas_kk? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/kk.xpi -> firefox-10.0.1-kk.xpi ) linguas_kn? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/kn.xpi -> firefox-10.0.1-kn.xpi ) linguas_ko? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/ko.xpi -> firefox-10.0.1-ko.xpi ) linguas_ku? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/ku.xpi -> firefox-10.0.1-ku.xpi ) linguas_lg? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/lg.xpi -> firefox-10.0.1-lg.xpi ) linguas_lt? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/lt.xpi -> firefox-10.0.1-lt.xpi ) linguas_lv? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/lv.xpi -> firefox-10.0.1-lv.xpi ) linguas_mai? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/mai.xpi -> firefox-10.0.1-mai.xpi ) linguas_mk? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/mk.xpi -> firefox-10.0.1-mk.xpi ) linguas_ml? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/ml.xpi -> firefox-10.0.1-ml.xpi ) linguas_mr? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/mr.xpi -> firefox-10.0.1-mr.xpi ) linguas_nb_NO? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/nb-NO.xpi -> firefox-10.0.1-nb-NO.xpi ) linguas_nl? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/nl.xpi -> firefox-10.0.1-nl.xpi ) linguas_nn_NO? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/nn-NO.xpi -> firefox-10.0.1-nn-NO.xpi ) linguas_nso? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/nso.xpi -> firefox-10.0.1-nso.xpi ) linguas_or? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/or.xpi -> firefox-10.0.1-or.xpi ) linguas_pa_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/pa-IN.xpi -> firefox-10.0.1-pa-IN.xpi ) linguas_pl? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/pl.xpi -> firefox-10.0.1-pl.xpi ) linguas_pt_BR? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/pt-BR.xpi -> firefox-10.0.1-pt-BR.xpi ) linguas_pt_PT? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/pt-PT.xpi -> firefox-10.0.1-pt-PT.xpi ) linguas_rm? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/rm.xpi -> firefox-10.0.1-rm.xpi ) linguas_ro? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/ro.xpi -> firefox-10.0.1-ro.xpi ) linguas_ru? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/ru.xpi -> firefox-10.0.1-ru.xpi ) linguas_si? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/si.xpi -> firefox-10.0.1-si.xpi ) linguas_sk? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/sk.xpi -> firefox-10.0.1-sk.xpi ) linguas_sl? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/sl.xpi -> firefox-10.0.1-sl.xpi ) linguas_son? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/son.xpi -> firefox-10.0.1-son.xpi ) linguas_sq? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/sq.xpi -> firefox-10.0.1-sq.xpi ) linguas_sr? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/sr.xpi -> firefox-10.0.1-sr.xpi ) linguas_sv_SE? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/sv-SE.xpi -> firefox-10.0.1-sv-SE.xpi ) linguas_ta? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/ta.xpi -> firefox-10.0.1-ta.xpi ) linguas_ta_LK? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/ta-LK.xpi -> firefox-10.0.1-ta-LK.xpi ) linguas_te? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/te.xpi -> firefox-10.0.1-te.xpi ) linguas_th? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/th.xpi -> firefox-10.0.1-th.xpi ) linguas_tr? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/tr.xpi -> firefox-10.0.1-tr.xpi ) linguas_uk? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/uk.xpi -> firefox-10.0.1-uk.xpi ) linguas_vi? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/vi.xpi -> firefox-10.0.1-vi.xpi ) linguas_zh_CN? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/zh-CN.xpi -> firefox-10.0.1-zh-CN.xpi ) linguas_zh_TW? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/zh-TW.xpi -> firefox-10.0.1-zh-TW.xpi ) linguas_zu? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/zu.xpi -> firefox-10.0.1-zu.xpi ) http://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-10.0-patches-0.5.tar.xz ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/source/firefox-10.0.1.source.tar.bz2
+
+http://www.mozilla.com/firefox
+|| ( MPL-1.1 GPL-2 LGPL-2.1 )
+Firefox Web Browser
+~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+autotools check-reqs eutils fdo-mime flag-o-matic gnome2-utils libtool mozconfig-3 mozcoreconf-2 mozextension mozlinguas multilib nsplugins pax-utils portability python toolchain-funcs user virtualx
+bindist +crashreporter +ipc +minimal pgo selinux system-sqlite +webm custom-cflags custom-optimization +alsa +dbus debug libnotify startup-notification system-sqlite wifi pgo linguas_af linguas_ak linguas_ar linguas_as linguas_ast linguas_be linguas_bg linguas_bn_BD linguas_bn_IN linguas_br linguas_bs linguas_ca linguas_cs linguas_csb linguas_cy linguas_da linguas_de linguas_el linguas_en_GB linguas_en_ZA linguas_eo linguas_es_AR linguas_es_CL linguas_es_ES linguas_es_MX linguas_et linguas_eu linguas_fa linguas_fi linguas_fr linguas_fy_NL linguas_ga_IE linguas_gd linguas_gl linguas_gu_IN linguas_he linguas_hi_IN linguas_hr linguas_hu linguas_hy_AM linguas_id linguas_is linguas_it linguas_ja linguas_kk linguas_kn linguas_ko linguas_ku linguas_lg linguas_lt linguas_lv linguas_mai linguas_mk linguas_ml linguas_mr linguas_nb_NO linguas_nl linguas_nn_NO linguas_nso linguas_or linguas_pa_IN linguas_pl linguas_pt_BR linguas_pt_PT linguas_rm linguas_ro linguas_ru linguas_si linguas_sk linguas_sl linguas_son linguas_sq linguas_sr linguas_sv_SE linguas_ta linguas_ta_LK linguas_te linguas_th linguas_tr linguas_uk linguas_vi linguas_zh_CN linguas_zh_TW linguas_zu
+
+
+
+3
+
+compile configure install postinst postrm preinst prepare setup unpack
+
+
+
+
+
diff --git a/metadata/cache/x11-misc/lightdm-gtk-greeter-1.1.4-r1 b/metadata/cache/x11-misc/lightdm-gtk-greeter-1.1.4-r1
index 49a2f0e46670..3cc2def3a138 100644
--- a/metadata/cache/x11-misc/lightdm-gtk-greeter-1.1.4-r1
+++ b/metadata/cache/x11-misc/lightdm-gtk-greeter-1.1.4-r1
@@ -1,5 +1,5 @@
-x11-libs/gtk+:3
-!!<x11-misc/lightdm-1.1.1 x11-libs/gtk+:3 x11-themes/gnome-themes-standard x11-themes/gnome-icon-theme
+x11-libs/gtk+:3 >=x11-misc/lightdm-1.1.3
+!!<x11-misc/lightdm-1.1.1 x11-libs/gtk+:3 >=x11-misc/lightdm-1.1.3 x11-themes/gnome-themes-standard x11-themes/gnome-icon-theme
 0
 http://launchpad.net/lightdm-gtk-greeter/trunk/1.1.4/+download/lightdm-gtk-greeter-1.1.4.tar.gz branding? ( http://dev.gentoo.org/~hwoarang/distfiles/lightdm-gentoo-patch.tar.gz )
 
diff --git a/metadata/cache/x11-terms/sakura-3.0.0 b/metadata/cache/x11-terms/sakura-3.0.0
new file mode 100644
index 000000000000..9a4f37447c0d
--- /dev/null
+++ b/metadata/cache/x11-terms/sakura-3.0.0
@@ -0,0 +1,22 @@
+>=dev-libs/glib-2.20:2 x11-libs/gtk+:3 >=x11-libs/vte-0.28:2.90 >=dev-lang/perl-5.10.1 dev-util/pkgconfig >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+>=dev-libs/glib-2.20:2 x11-libs/gtk+:3 >=x11-libs/vte-0.28:2.90
+0
+http://launchpad.net/sakura/trunk/3.0.0/+download/sakura-3.0.0.tar.bz2
+
+http://www.pleyades.net/david/projects/sakura/
+GPL-2
+sakura is a terminal emulator based on GTK and VTE
+~amd64 ~x86
+base cmake-utils eutils flag-o-matic multilib portability toolchain-funcs user
+linguas_ca linguas_cs linguas_de linguas_es linguas_fr linguas_hr linguas_hu linguas_it linguas_ja linguas_ko linguas_pl linguas_pt_BR linguas_ru linguas_zh_CN
+
+
+
+4
+
+compile configure install prepare test unpack
+
+
+
+
+
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index d46d49bfe72e..751ace762a54 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Mon, 27 Feb 2012 16:06:47 +0000
+Tue, 28 Feb 2012 04:36:46 +0000
diff --git a/metadata/glsa/glsa-201202-07.xml b/metadata/glsa/glsa-201202-07.xml
new file mode 100644
index 000000000000..11f3b5b8fe1d
--- /dev/null
+++ b/metadata/glsa/glsa-201202-07.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet type="text/xsl" href="/xsl/glsa.xsl"?>
+<?xml-stylesheet type="text/xsl" href="/xsl/guide.xsl"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="201202-07">
+  <title>libvirt: Multiple vulnerabilities</title>
+  <synopsis>Multiple vulnerabilities were found in libvirt, the worst of which
+    might allow guest OS users to read arbitrary files on the host OS.
+  </synopsis>
+  <product type="ebuild">libvirt</product>
+  <announced>February 27, 2012</announced>
+  <revised>February 27, 2012: 1</revised>
+  <bug>358877</bug>
+  <bug>372963</bug>
+  <bug>373991</bug>
+  <bug>386287</bug>
+  <access>local, remote</access>
+  <affected>
+    <package name="app-emulation/libvirt" auto="yes" arch="*">
+      <unaffected range="ge">0.9.3-r1</unaffected>
+      <vulnerable range="lt">0.9.3-r1</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>libvirt is a C toolkit to manipulate virtual machines.</p>
+  </background>
+  <description>
+    <p>Multiple vulnerabilities have been discovered in libvirt. Please review
+      the CVE identifiers referenced below for details.
+    </p>
+  </description>
+  <impact type="normal">
+    <p>These vulnerabilites allow a remote attacker to cause a Denial of
+      Service condition on the host server or libvirt daemon, or  might allow
+      guest OS users to read arbitrary files on the host OS.
+    </p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>All libvirt users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=app-emulation/libvirt-0.9.3-r1"
+    </code>
+    
+  </resolution>
+  <references>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2011-1146">CVE-2011-1146</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2011-1486">CVE-2011-1486</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2011-2178">CVE-2011-2178</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2011-2511">CVE-2011-2511</uri>
+  </references>
+  <metadata timestamp="Fri, 07 Oct 2011 23:37:16 +0000" tag="requester">craig</metadata>
+  <metadata timestamp="Mon, 27 Feb 2012 22:20:05 +0000" tag="submitter">craig</metadata>
+</glsa>
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index b72286665a87..751ace762a54 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Mon, 27 Feb 2012 16:06:48 +0000
+Tue, 28 Feb 2012 04:36:46 +0000
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index cc5090445564..dc8cddb8190b 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Mon, 27 Feb 2012 16:06:49 +0000
+Tue, 28 Feb 2012 04:36:48 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index c6de1c0446ce..792b4be632d6 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Mon Feb 27 16:06:47 UTC 2012
+Tue Feb 28 04:36:46 UTC 2012
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 9edb381c922f..b88177efbbde 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Mon, 27 Feb 2012 16:30:01 +0000
+Tue, 28 Feb 2012 05:00:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 341a3223e3fa..dae956ad5836 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1330358701 Mon Feb 27 16:05:01 2012 UTC
+1330403701 Tue Feb 28 04:35:01 2012 UTC
diff --git a/net-firewall/shorewall-core/shorewall-core-4.5.0.1-r1.ebuild b/net-firewall/shorewall-core/shorewall-core-4.5.0.1-r1.ebuild
new file mode 100644
index 000000000000..13bb9ecdffff
--- /dev/null
+++ b/net-firewall/shorewall-core/shorewall-core-4.5.0.1-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall-core/shorewall-core-4.5.0.1-r1.ebuild,v 1.1 2012/02/27 17:05:22 constanze Exp $
+
+EAPI="4"
+
+inherit eutils versionator
+
+# Select version (stable, RC, Beta):
+MY_PV_TREE=$(get_version_component_range 1-2)   # for devel versions use "development/$(get_version_component_range 1-2)"
+MY_PV_BASE=$(get_version_component_range 1-3)
+
+MY_P="shorewall-${MY_PV_BASE}"
+
+DESCRIPTION="Core libraries of shorewall / shorewall(6)-lite"
+HOMEPAGE="http://www.shorewall.net/"
+SRC_URI="http://www1.shorewall.net/pub/shorewall/${MY_PV_TREE}/${MY_P}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+DEPEND=">=net-firewall/iptables-1.2.4
+	sys-apps/iproute2[-minimal]
+	dev-lang/perl
+	virtual/perl-Digest-SHA"
+RDEPEND="${DEPEND}"
+
+DOCS=( changelog.txt releasenotes.txt )
+
+src_install() {
+	DESTDIR="${D}" ./install.sh || die "install.sh failed"
+	default
+}
diff --git a/net-firewall/shorewall-lite/Manifest b/net-firewall/shorewall-lite/Manifest
index a28e144dd5f6..11a6476a03c9 100644
--- a/net-firewall/shorewall-lite/Manifest
+++ b/net-firewall/shorewall-lite/Manifest
@@ -1,14 +1,8 @@
 DIST shorewall-docs-html-4.4.15.1.tar.bz2 3403387 RMD160 236bf52dbef3e4cc6409f47b2069176e51198c4f SHA1 9e9af70fab6ef68a722573100830d1427c4f92b7 SHA256 b3a7a118af0ed1e150e44753218ced32ab76e44d758a917ce871ed55adf1f4ab
-DIST shorewall-docs-html-4.4.22.1.tar.bz2 3534237 RMD160 780baf596042ec00440b90618e60849524774315 SHA1 55c1bb02d8ef56dfc112bf81cf5e3fa9b73a4611 SHA256 9b0b8c142938818b187925dd4152d632f5d56145967bf68ba38b53bd09262623
-DIST shorewall-docs-html-4.4.22.3.tar.bz2 3533926 RMD160 c4d3ccdd6b496261c11aad6b9a7010c7728544c2 SHA1 7c1287c0e44547e0ca04cefa7c6640974c4924d1 SHA256 befa3764e80b18d8a9b55a40e87b7036cf7b2a54dbbd2f00b20d811e5bfabea8
 DIST shorewall-docs-html-4.4.23.2.tar.bz2 3638929 RMD160 0ee913e2c40211046dae826381c1cb7aaf64bd61 SHA1 ff11756bd1a95a3280ef6443b5912ae8109c9a3d SHA256 8ee6d1250e777c8fcf4afaad4b2a9dc595f07ae0212dc2a0770e3f30dc1fb325
-DIST shorewall-docs-html-4.4.24.1.tar.bz2 3753318 RMD160 e57306c2b741c3672999dbaff7866b2ad281ecec SHA1 8fecb40d52172a41e0170c30b982cf9d24edce5a SHA256 04eb210dbc450c539dee7ce6a61910e29fef40c61d4162488dbdab91995bd6a9
 DIST shorewall-docs-html-4.4.27.tar.bz2 3791852 RMD160 f6598e87e9f5fd049b6aef4e3db1536f36e24986 SHA1 9de4052c61cfb8fa30643fb388c725dc68d32fe9 SHA256 5d1a0d2df3170057cf6309498126621e9a3dda392e5486f8278ef42b1969199f
 DIST shorewall-docs-html-4.5.0.1.tar.bz2 3793840 RMD160 8b1d7e104b18a71de284defa75c283b535cc1598 SHA1 61ee00d7a48e484faaa5163bf0f4fce2d01dd012 SHA256 d06918f4a655bd7d8076b22b0587c6e8fe8f018113111b9863c8f8224f64fa95
 DIST shorewall-lite-4.4.15.1.tar.bz2 73060 RMD160 f1ed17fd06d3778d6498265fa3bced98a40b1476 SHA1 9f908c34f2c1fe349849acc653f7c058854bd569 SHA256 bdcb7ebd8d2a624e07bd687526bbba57783ec48ba9a71dce4c7f6863009733cc
-DIST shorewall-lite-4.4.22.1.tar.bz2 92368 RMD160 0073de64fa9b832489984916950f5ef1c887d61f SHA1 e230c1ec71c7038088e509909919fa619d6ae102 SHA256 d562ed1d77c5a053d63e4a565725ad84a7ef5bdb126c20703a2a18cfdb74ef4b
-DIST shorewall-lite-4.4.22.3.tar.bz2 93021 RMD160 3c54d2050862dee0d893a6faafa28809158a80bb SHA1 eaec35da5324476623f4bd4e13f3b6dcbdceb748 SHA256 5c65b9da68f944034d9c0b3b986f3c585b7aa42f36ea096b9de6bcf296eae9b5
 DIST shorewall-lite-4.4.23.2.tar.bz2 95382 RMD160 6e7e1d3229f4b2414fc5f6aa50d08dbb83341ff8 SHA1 f6e7a8f3e3e63c6d0da783b42322d21385b3e376 SHA256 7bf2647c0001b1f01c5661cafa4a4045289988506858234f640ef2d85ae2e50e
-DIST shorewall-lite-4.4.24.1.tar.bz2 96251 RMD160 bcc5d85a61c9f84b8ee0492f924ac7b31677f833 SHA1 09de9e750ccbe3656b18509b48537e44404b3931 SHA256 ef07193e2bf3d9da43244131646f1486bcaac9cbe33136e7653f9512ecf4eec6
 DIST shorewall-lite-4.4.27.tar.bz2 103967 RMD160 822bb4c8c2fc129b3a608f776fe747aa325bff9c SHA1 a5e7e9a191713b067317dd0af5fe71ab0fde4ed5 SHA256 18b522fd28e02d2d597613d7490d6eae292b5f3b7ab660a387d186316682af14
 DIST shorewall-lite-4.5.0.1.tar.bz2 31015 RMD160 66475249b69708b0215f910d1245cfcf1ef28c9e SHA1 f6a8fd62fddebae49dcf914767a3e1f5f538e3a9 SHA256 35ffa431e1750a851529ea1fa501cb10ef3c6b167505e4a765659cd4dad33d0e
diff --git a/net-firewall/shorewall-lite/shorewall-lite-4.4.22.1.ebuild b/net-firewall/shorewall-lite/shorewall-lite-4.4.22.1.ebuild
deleted file mode 100644
index c073cc2119bb..000000000000
--- a/net-firewall/shorewall-lite/shorewall-lite-4.4.22.1.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/net-firewall/shorewall-lite/shorewall-lite-4.4.22.1.ebuild,v 1.1 2011/08/06 15:46:48 constanze Exp $
-
-EAPI="4"
-
-inherit versionator
-
-# Select version (stable, RC, Beta):
-MY_PV_TREE=$(get_version_component_range 1-2)   # for devel versions use "development/$(get_version_component_range 1-2)"
-MY_PV_BASE=$(get_version_component_range 1-3)
-
-MY_PN="${PN/-lite/}"
-MY_P="${MY_PN}-${MY_PV_BASE}"
-MY_P_DOCS="${MY_PN}-docs-html-${PV}"
-
-DESCRIPTION="An iptables-based firewall whose config is handled by a normal Shorewall."
-HOMEPAGE="http://www.shorewall.net/"
-SRC_URI="http://www1.shorewall.net/pub/${MY_PN}/${MY_PV_TREE}/${MY_P}/${P}.tar.bz2
-	doc? ( http://www1.shorewall.net/pub/${MY_PN}/${MY_PV_TREE}/${MY_P}/${MY_P_DOCS}.tar.bz2 )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc"
-
-DEPEND="net-firewall/iptables
-	sys-apps/iproute2"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	    epatch "${FILESDIR}/shorewall-lite-4.4.20.3_installer-path.patch"
-		epatch_user
-}
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	keepdir /var/lib/shorewall-lite
-
-	cd "${WORKDIR}/${P}"
-	PREFIX="${D}" ./install.sh || die "install.sh failed"
-	newinitd "${FILESDIR}/shorewall-lite" shorewall-lite
-
-	dodoc changelog.txt releasenotes.txt
-	if use doc; then
-		cd "${WORKDIR}/${MY_P_DOCS}"
-		dohtml -r *
-	fi
-}
diff --git a/net-firewall/shorewall-lite/shorewall-lite-4.4.22.3.ebuild b/net-firewall/shorewall-lite/shorewall-lite-4.4.22.3.ebuild
deleted file mode 100644
index e18e835bf9cf..000000000000
--- a/net-firewall/shorewall-lite/shorewall-lite-4.4.22.3.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/net-firewall/shorewall-lite/shorewall-lite-4.4.22.3.ebuild,v 1.1 2011/08/20 23:10:58 jer Exp $
-
-EAPI="4"
-
-inherit versionator
-
-# Select version (stable, RC, Beta):
-MY_PV_TREE=$(get_version_component_range 1-2)   # for devel versions use "development/$(get_version_component_range 1-2)"
-MY_PV_BASE=$(get_version_component_range 1-3)
-
-MY_PN="${PN/-lite/}"
-MY_P="${MY_PN}-${MY_PV_BASE}"
-MY_P_DOCS="${MY_PN}-docs-html-${PV}"
-
-DESCRIPTION="An iptables-based firewall whose config is handled by a normal Shorewall."
-HOMEPAGE="http://www.shorewall.net/"
-SRC_URI="http://www1.shorewall.net/pub/${MY_PN}/${MY_PV_TREE}/${MY_P}/${P}.tar.bz2
-	doc? ( http://www1.shorewall.net/pub/${MY_PN}/${MY_PV_TREE}/${MY_P}/${MY_P_DOCS}.tar.bz2 )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc"
-
-RDEPEND="net-firewall/iptables
-	sys-apps/iproute2"
-
-src_prepare() {
-	    epatch "${FILESDIR}/shorewall-lite-4.4.20.3_installer-path.patch"
-		epatch_user
-}
-
-src_compile() {
-	# The default make command does not work as expected
-	:
-}
-
-src_install() {
-	keepdir /var/lib/shorewall-lite
-
-	cd "${WORKDIR}/${P}"
-	PREFIX="${D}" ./install.sh || die "install.sh failed"
-	newinitd "${FILESDIR}/shorewall-lite" shorewall-lite
-
-	dodoc changelog.txt releasenotes.txt
-	if use doc; then
-		cd "${WORKDIR}/${MY_P_DOCS}"
-		dohtml -r *
-	fi
-}
diff --git a/net-firewall/shorewall-lite/shorewall-lite-4.4.24.1.ebuild b/net-firewall/shorewall-lite/shorewall-lite-4.4.27-r1.ebuild
similarity index 89%
rename from net-firewall/shorewall-lite/shorewall-lite-4.4.24.1.ebuild
rename to net-firewall/shorewall-lite/shorewall-lite-4.4.27-r1.ebuild
index 49ef034feef6..5a694d0f16c9 100644
--- a/net-firewall/shorewall-lite/shorewall-lite-4.4.24.1.ebuild
+++ b/net-firewall/shorewall-lite/shorewall-lite-4.4.27-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall-lite/shorewall-lite-4.4.24.1.ebuild,v 1.1 2011/10/23 09:22:30 constanze Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall-lite/shorewall-lite-4.4.27-r1.ebuild,v 1.1 2012/02/27 17:46:33 constanze Exp $
 
 EAPI="4"
 
@@ -25,7 +25,8 @@ KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE="doc"
 
 RDEPEND="net-firewall/iptables
-	sys-apps/iproute2"
+	sys-apps/iproute2
+	!net-firewall/shorewall-core"
 
 src_prepare() {
 	    epatch "${FILESDIR}/shorewall-lite-4.4.20.3_installer-path.patch"
diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index e3b6a43f4017..25c1d9e93e9a 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -1,14 +1,8 @@
 DIST shorewall-4.4.15.1.tar.bz2 278607 RMD160 621b25c675bd13897c830780fd85c2b5044df1be SHA1 13eb36754d3ff259836a4f2daaf73513427e6ed4 SHA256 a89eb18435615e9a3d898308e6831ba46c9094318c9744d4ccdf34a4cb5f49e7
-DIST shorewall-4.4.22.1.tar.bz2 392029 RMD160 2316b50dc9ecb1be035fdf378b960dd56e44660f SHA1 ee4a884d46d89bdf406afa8d39a3781bb2a0e9f8 SHA256 85bd50df4c1fcd8b5535038b5bbf031b367bee18f442d24e7eae3a82a4b7ae2b
-DIST shorewall-4.4.22.3.tar.bz2 393495 RMD160 59801cfe18e497d1390cdd1f8e97ce06d785122e SHA1 4983c1e14875cca4d53d7dbaf56f70c5fd146bf8 SHA256 c7abe4a85b67d75a55bd1bc01817ea31652633f46cbf578431987e93a9124192
 DIST shorewall-4.4.23.2.tar.bz2 401753 RMD160 705a08da09123d04a8564d1965000e0e399f5824 SHA1 4bb23306104706fddffe141e649f69177c78e3eb SHA256 0b8f77e4477e811718e73492e6264901953d8f70462af634c3c129597b588ff3
-DIST shorewall-4.4.24.1.tar.bz2 407974 RMD160 afb247936464d0d4a16454307a9801b4007ac5f2 SHA1 1501b16256eeb60edf09d03682f4002868bb6f22 SHA256 b170822939734a5dd04d4d02ab7707f04c312d5059de43d15206285aa85be605
 DIST shorewall-4.4.27.tar.bz2 442941 RMD160 37c67696930573e9f5d7976fe8fcd40ef3570fa8 SHA1 37e1beba68849a7878c02f209e7a5c4a5b4a5864 SHA256 434d910fcdfbdbb216d92cbc353f013a5aa5a24bb35ff921a4955e24d5c40254
 DIST shorewall-4.5.0.1.tar.bz2 375807 RMD160 b3acdfd90a3aa3ce1081e553e95ba136ac611dc2 SHA1 bd6e0441c02599303ca7c9d11181348d090ec749 SHA256 074f34d64a6074a9dfa593194bf7ae8502218836b3c4c5b9fa6a99001694547b
 DIST shorewall-docs-html-4.4.15.1.tar.bz2 3403387 RMD160 236bf52dbef3e4cc6409f47b2069176e51198c4f SHA1 9e9af70fab6ef68a722573100830d1427c4f92b7 SHA256 b3a7a118af0ed1e150e44753218ced32ab76e44d758a917ce871ed55adf1f4ab
-DIST shorewall-docs-html-4.4.22.1.tar.bz2 3534237 RMD160 780baf596042ec00440b90618e60849524774315 SHA1 55c1bb02d8ef56dfc112bf81cf5e3fa9b73a4611 SHA256 9b0b8c142938818b187925dd4152d632f5d56145967bf68ba38b53bd09262623
-DIST shorewall-docs-html-4.4.22.3.tar.bz2 3533926 RMD160 c4d3ccdd6b496261c11aad6b9a7010c7728544c2 SHA1 7c1287c0e44547e0ca04cefa7c6640974c4924d1 SHA256 befa3764e80b18d8a9b55a40e87b7036cf7b2a54dbbd2f00b20d811e5bfabea8
 DIST shorewall-docs-html-4.4.23.2.tar.bz2 3638929 RMD160 0ee913e2c40211046dae826381c1cb7aaf64bd61 SHA1 ff11756bd1a95a3280ef6443b5912ae8109c9a3d SHA256 8ee6d1250e777c8fcf4afaad4b2a9dc595f07ae0212dc2a0770e3f30dc1fb325
-DIST shorewall-docs-html-4.4.24.1.tar.bz2 3753318 RMD160 e57306c2b741c3672999dbaff7866b2ad281ecec SHA1 8fecb40d52172a41e0170c30b982cf9d24edce5a SHA256 04eb210dbc450c539dee7ce6a61910e29fef40c61d4162488dbdab91995bd6a9
 DIST shorewall-docs-html-4.4.27.tar.bz2 3791852 RMD160 f6598e87e9f5fd049b6aef4e3db1536f36e24986 SHA1 9de4052c61cfb8fa30643fb388c725dc68d32fe9 SHA256 5d1a0d2df3170057cf6309498126621e9a3dda392e5486f8278ef42b1969199f
 DIST shorewall-docs-html-4.5.0.1.tar.bz2 3793840 RMD160 8b1d7e104b18a71de284defa75c283b535cc1598 SHA1 61ee00d7a48e484faaa5163bf0f4fce2d01dd012 SHA256 d06918f4a655bd7d8076b22b0587c6e8fe8f018113111b9863c8f8224f64fa95
diff --git a/net-firewall/shorewall/shorewall-4.4.15.1.ebuild b/net-firewall/shorewall/shorewall-4.4.15.1.ebuild
deleted file mode 100644
index ecf26ce051e8..000000000000
--- a/net-firewall/shorewall/shorewall-4.4.15.1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/shorewall-4.4.15.1.ebuild,v 1.7 2011/03/21 17:04:34 xarthisius Exp $
-
-EAPI="2"
-
-inherit eutils versionator
-
-# Select version (stable, RC, Beta):
-MY_PV_TREE=$(get_version_component_range 1-2)   # for devel versions use "development/$(get_version_component_range 1-2)"
-MY_P_BETA=""                                    # stable or experimental (eg. "-RC1" or "-Beta4")
-MY_PV_BASE=$(get_version_component_range 1-3)
-
-MY_P="${PN}-${MY_PV_BASE}${MY_P_BETA}"
-MY_P_DOCS="${P/${PN}/${PN}-docs-html}"
-
-DESCRIPTION="Shoreline Firewall is an iptables-based firewall for Linux."
-HOMEPAGE="http://www.shorewall.net/"
-SRC_URI="http://www1.shorewall.net/pub/${PN}/${MY_PV_TREE}/${MY_P}/${P}${MY_P_BETA}.tar.bz2
-	doc? ( http://www1.shorewall.net/pub/${PN}/${MY_PV_TREE}/${MY_P}/${MY_P_DOCS}.tar.bz2 )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
-IUSE="doc"
-
-DEPEND=">=net-firewall/iptables-1.2.4
-	sys-apps/iproute2[-minimal]
-	dev-lang/perl
-	!net-firewall/shorewall-common
-	!net-firewall/shorewall-shell
-	!net-firewall/shorewall-perl"
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	einfo "Nothing to compile."
-}
-
-src_install() {
-	keepdir /var/lib/shorewall
-
-	cd "${WORKDIR}/${P}${MY_P_BETA}"
-	PREFIX="${D}" ./install.sh || die "install.sh failed"
-	newinitd "${FILESDIR}"/shorewall.initd shorewall || die "doinitd failed"
-
-	dodoc changelog.txt releasenotes.txt || die
-
-	if use doc; then
-		cd "${WORKDIR}/${MY_P_DOCS}"
-		# install documentation
-		dohtml -r *
-		## dosym Documentation_Index.html "/usr/share/doc/${PF}/html/index.htm"
-		# install samples
-		cp -pR "${S}${MY_P_BETA}/Samples" "${D}/usr/share/doc/${PF}"
-	fi
-}
-
-pkg_postinst() {
-	elog
-	if use doc ; then
-		elog "Documentation is available at /usr/share/doc/${PF}/html."
-		elog "Please read the Release Notes in /usr/share/doc/${PF}."
-		elog "Samples are available at /usr/share/doc/${PF}/Samples."
-	else
-		elog "Documentation is available at http://www.shorewall.net"
-	fi
-	elog "There are man pages for shorewall(8) and for each configuration file."
-	elog
-	elog "Bridging configuration has changed with kernel 2.6.20+."
-	elog "Check the documentation."
-	elog
-	elog "Do not blindly start shorewall, edit the files in /etc/shorewall first."
-	elog
-	elog "Be aware that version ${MY_PV_TREE} differs substantially from previous releases."
-	elog "Information on upgrading is available at:"
-	elog "http://www.shorewall.net/upgrade_issues.htm"
-	elog
-	elog "There is a 'shorewall compile' command to generate scripts to run"
-	elog "on systems with Shorewall Lite installed."
-	elog "Please refer to http://www.shorewall.net/CompiledPrograms.html"
-	elog "It is advised to copy the /usr/share/shorewall/configfiles dir to your"
-	elog "own 'export directories'. However, whenever you upgrade Shorewall you"
-	elog "should check for changes in configfiles and manually update your exports."
-	elog "Alternatively, if you only have one Shorewall-Lite system in your network"
-	elog "then you can use the configfiles dir but set CONFIG_PROTECT appropriately"
-	elog "in /etc/make.conf (man make.conf)."
-	elog
-	elog "Known problems:"
-	elog "http://shorewall.net/pub/${PN}/${MY_PV_TREE}/${MY_P}/known_problems.txt"
-	elog
-	elog "Whether upgrading or installing you should run shorewall check,"
-	elog "correct any errors found and run shorewall restart|start."
-	elog
-	elog "${PN} now uses Perl only. The shell compiler is obsolete."
-	elog "shorewall-common, shorewall-shell and shorewall-perl have been removed."
-}
diff --git a/net-firewall/shorewall/shorewall-4.4.22.1.ebuild b/net-firewall/shorewall/shorewall-4.4.22.1.ebuild
deleted file mode 100644
index 7b7cb9935bdd..000000000000
--- a/net-firewall/shorewall/shorewall-4.4.22.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/shorewall-4.4.22.1.ebuild,v 1.1 2011/08/06 15:46:03 constanze Exp $
-
-EAPI="4"
-
-inherit eutils versionator
-
-# Select version (stable, RC, Beta):
-MY_PV_TREE=$(get_version_component_range 1-2)   # for devel versions use "development/$(get_version_component_range 1-2)"
-MY_PV_BASE=$(get_version_component_range 1-3)
-
-MY_P="${PN}-${MY_PV_BASE}"
-MY_P_DOCS="${P/${PN}/${PN}-docs-html}"
-
-DESCRIPTION="Shoreline Firewall is an iptables-based firewall for Linux."
-HOMEPAGE="http://www.shorewall.net/"
-SRC_URI="http://www1.shorewall.net/pub/${PN}/${MY_PV_TREE}/${MY_P}/${P}.tar.bz2
-	doc? ( http://www1.shorewall.net/pub/${PN}/${MY_PV_TREE}/${MY_P}/${MY_P_DOCS}.tar.bz2 )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc"
-
-DEPEND=">=net-firewall/iptables-1.2.4
-	sys-apps/iproute2[-minimal]
-	dev-lang/perl
-	!net-firewall/shorewall-common
-	!net-firewall/shorewall-shell
-	!net-firewall/shorewall-perl"
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	keepdir /var/lib/shorewall
-
-	cd "${WORKDIR}/${P}"
-	PREFIX="${D}" ./install.sh || die "install.sh failed"
-	newinitd "${FILESDIR}"/shorewall.initd shorewall
-
-	dodoc changelog.txt releasenotes.txt
-	if use doc; then
-		dodoc -r Samples
-		cd "${WORKDIR}/${MY_P_DOCS}"
-		dohtml -r *
-	fi
-	dodir /var/lock/subsys
-}
-
-pkg_postinst() {
-	elog "It is advised to copy the /usr/share/shorewall/configfiles dir to your"
-	elog "own 'export directories'. However, whenever you upgrade Shorewall you"
-	elog "should check for changes in configfiles and manually update your exports."
-	elog "Alternatively, if you only have one Shorewall-Lite system in your network"
-	elog "then you can use the configfiles dir but set CONFIG_PROTECT appropriately"
-	elog "in /etc/make.conf (man make.conf)."
-}
diff --git a/net-firewall/shorewall/shorewall-4.4.24.1.ebuild b/net-firewall/shorewall/shorewall-4.4.24.1.ebuild
deleted file mode 100644
index a9639375643a..000000000000
--- a/net-firewall/shorewall/shorewall-4.4.24.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/shorewall-4.4.24.1.ebuild,v 1.1 2011/10/23 09:06:00 constanze Exp $
-
-EAPI="4"
-
-inherit eutils versionator
-
-# Select version (stable, RC, Beta):
-MY_PV_TREE=$(get_version_component_range 1-2)   # for devel versions use "development/$(get_version_component_range 1-2)"
-MY_PV_BASE=$(get_version_component_range 1-3)
-
-MY_P="${PN}-${MY_PV_BASE}"
-MY_P_DOCS="${P/${PN}/${PN}-docs-html}"
-
-DESCRIPTION="Shoreline Firewall is an iptables-based firewall for Linux."
-HOMEPAGE="http://www.shorewall.net/"
-SRC_URI="http://www1.shorewall.net/pub/${PN}/${MY_PV_TREE}/${MY_P}/${P}.tar.bz2
-	doc? ( http://www1.shorewall.net/pub/${PN}/${MY_PV_TREE}/${MY_P}/${MY_P_DOCS}.tar.bz2 )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc"
-
-DEPEND=">=net-firewall/iptables-1.2.4
-	sys-apps/iproute2[-minimal]
-	dev-lang/perl
-	!net-firewall/shorewall-common
-	!net-firewall/shorewall-shell
-	!net-firewall/shorewall-perl"
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	keepdir /var/lib/shorewall
-
-	cd "${WORKDIR}/${P}"
-	PREFIX="${D}" ./install.sh || die "install.sh failed"
-	newinitd "${FILESDIR}"/shorewall.initd shorewall
-
-	dodoc changelog.txt releasenotes.txt
-	if use doc; then
-		dodoc -r Samples
-		cd "${WORKDIR}/${MY_P_DOCS}"
-		dohtml -r *
-	fi
-	dodir /var/lock/subsys
-}
-
-pkg_postinst() {
-	elog "It is advised to copy the /usr/share/shorewall/configfiles dir to your"
-	elog "own 'export directories'. However, whenever you upgrade Shorewall you"
-	elog "should check for changes in configfiles and manually update your exports."
-	elog "Alternatively, if you only have one Shorewall-Lite system in your network"
-	elog "then you can use the configfiles dir but set CONFIG_PROTECT appropriately"
-	elog "in /etc/make.conf (man make.conf)."
-}
diff --git a/net-firewall/shorewall/shorewall-4.4.22.3.ebuild b/net-firewall/shorewall/shorewall-4.4.27-r1.ebuild
similarity index 90%
rename from net-firewall/shorewall/shorewall-4.4.22.3.ebuild
rename to net-firewall/shorewall/shorewall-4.4.27-r1.ebuild
index fba1695d046b..e5fef8fe7e52 100644
--- a/net-firewall/shorewall/shorewall-4.4.22.3.ebuild
+++ b/net-firewall/shorewall/shorewall-4.4.27-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/shorewall-4.4.22.3.ebuild,v 1.1 2011/08/20 20:10:25 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/shorewall-4.4.27-r1.ebuild,v 1.1 2012/02/27 17:45:34 constanze Exp $
 
 EAPI="4"
 
@@ -26,9 +26,7 @@ IUSE="doc"
 DEPEND=">=net-firewall/iptables-1.2.4
 	sys-apps/iproute2[-minimal]
 	dev-lang/perl
-	!net-firewall/shorewall-common
-	!net-firewall/shorewall-shell
-	!net-firewall/shorewall-perl"
+	!net-firewall/shorewall-core"
 RDEPEND="${DEPEND}"
 
 src_compile() {
diff --git a/net-firewall/shorewall6-lite/Manifest b/net-firewall/shorewall6-lite/Manifest
index efba2aea5078..2e67523a0f9c 100644
--- a/net-firewall/shorewall6-lite/Manifest
+++ b/net-firewall/shorewall6-lite/Manifest
@@ -1,14 +1,8 @@
 DIST shorewall-docs-html-4.4.15.1.tar.bz2 3403387 RMD160 236bf52dbef3e4cc6409f47b2069176e51198c4f SHA1 9e9af70fab6ef68a722573100830d1427c4f92b7 SHA256 b3a7a118af0ed1e150e44753218ced32ab76e44d758a917ce871ed55adf1f4ab
-DIST shorewall-docs-html-4.4.22.1.tar.bz2 3534237 RMD160 780baf596042ec00440b90618e60849524774315 SHA1 55c1bb02d8ef56dfc112bf81cf5e3fa9b73a4611 SHA256 9b0b8c142938818b187925dd4152d632f5d56145967bf68ba38b53bd09262623
-DIST shorewall-docs-html-4.4.22.3.tar.bz2 3533926 RMD160 c4d3ccdd6b496261c11aad6b9a7010c7728544c2 SHA1 7c1287c0e44547e0ca04cefa7c6640974c4924d1 SHA256 befa3764e80b18d8a9b55a40e87b7036cf7b2a54dbbd2f00b20d811e5bfabea8
 DIST shorewall-docs-html-4.4.23.2.tar.bz2 3638929 RMD160 0ee913e2c40211046dae826381c1cb7aaf64bd61 SHA1 ff11756bd1a95a3280ef6443b5912ae8109c9a3d SHA256 8ee6d1250e777c8fcf4afaad4b2a9dc595f07ae0212dc2a0770e3f30dc1fb325
-DIST shorewall-docs-html-4.4.24.1.tar.bz2 3753318 RMD160 e57306c2b741c3672999dbaff7866b2ad281ecec SHA1 8fecb40d52172a41e0170c30b982cf9d24edce5a SHA256 04eb210dbc450c539dee7ce6a61910e29fef40c61d4162488dbdab91995bd6a9
 DIST shorewall-docs-html-4.4.27.tar.bz2 3791852 RMD160 f6598e87e9f5fd049b6aef4e3db1536f36e24986 SHA1 9de4052c61cfb8fa30643fb388c725dc68d32fe9 SHA256 5d1a0d2df3170057cf6309498126621e9a3dda392e5486f8278ef42b1969199f
 DIST shorewall-docs-html-4.5.0.1.tar.bz2 3793840 RMD160 8b1d7e104b18a71de284defa75c283b535cc1598 SHA1 61ee00d7a48e484faaa5163bf0f4fce2d01dd012 SHA256 d06918f4a655bd7d8076b22b0587c6e8fe8f018113111b9863c8f8224f64fa95
 DIST shorewall6-lite-4.4.15.1.tar.bz2 68916 RMD160 56441e7cbe5b0f5d3e739e71dc2971e0e1aaf66a SHA1 57c5d5a7229a9c461110e2ed198ba4c646e9528b SHA256 c6abe9b9a7113a4976bf31cdd07d6e54661507c3b3c15d667f07c0a036c61652
-DIST shorewall6-lite-4.4.22.1.tar.bz2 88675 RMD160 167992ea228f6d144f18fb6feb9b4204d28b6a23 SHA1 ba8d8de8f504efc68da25ee7ddca189f46ff3e7e SHA256 750ef9929c8b0bb1d822ba41315b7081e9789e009634d2d38b80dc2709f365b4
-DIST shorewall6-lite-4.4.22.3.tar.bz2 89181 RMD160 8be0e890fec4febd9ab25d781b0fb19977907f4e SHA1 771a1685736c628f529f392577b4ab9c2ce4c6f4 SHA256 4ebbf98cf7db6f18c97bf1e12b7b8a725f66baaf325aaa57bd8384349ad237da
 DIST shorewall6-lite-4.4.23.2.tar.bz2 91907 RMD160 4ce504ad36d4b879b78ab9cb8867d88ab1cf8a2e SHA1 f57c6e54e51faea803a6f7c38d7b77ae5ae0aaa3 SHA256 35fdfd2df47a347e5f79c798f3ce30e3dcdc8bfaabc1c3fee98189c0aa2d4e45
-DIST shorewall6-lite-4.4.24.1.tar.bz2 92554 RMD160 732c9dc71376ff1cec770a704e977017aa9632db SHA1 3bb256d8aa241baf356ee9086b47841047aeb602 SHA256 09558d041efe4362919cc1b122e5376191c0bbce0a58bb3d822e65ab851c2f58
 DIST shorewall6-lite-4.4.27.tar.bz2 102479 RMD160 442e06f4aa47b451973f381121bb44293540a8cf SHA1 c331c2dc8b47dbd7010933d18a8d6f1b61ef2e99 SHA256 4587ba52661ad14f82147aebecfc580f107244dcfe1bd3d0df449a60b8253d11
 DIST shorewall6-lite-4.5.0.1.tar.bz2 30429 RMD160 d4ff7a034843babb38e49be56bb7495a0c3b4cae SHA1 52254b61fc83507343395fadf6729e351a1bc4c8 SHA256 3d72da82a2d130dd4e5fccb5af57490991f2df9bb748200b8654677db8335b11
diff --git a/net-firewall/shorewall6-lite/shorewall6-lite-4.4.22.1.ebuild b/net-firewall/shorewall6-lite/shorewall6-lite-4.4.22.1.ebuild
deleted file mode 100644
index 612b680d79fb..000000000000
--- a/net-firewall/shorewall6-lite/shorewall6-lite-4.4.22.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall6-lite/shorewall6-lite-4.4.22.1.ebuild,v 1.1 2011/08/06 15:48:01 constanze Exp $
-
-EAPI="4"
-
-inherit versionator linux-info
-
-# Select version (stable, RC, Beta):
-MY_PV_TREE=$(get_version_component_range 1-2)   # for devel versions use "development/$(get_version_component_range 1-2)"
-MY_PV_BASE=$(get_version_component_range 1-3)
-
-MY_PN="${PN/6-lite/}"
-MY_P="${MY_PN}-${MY_PV_BASE}"
-MY_P_DOCS="${MY_PN}-docs-html-${PV}"
-
-DESCRIPTION="An iptables-based firewall whose config is handled by a normal Shorewall6."
-HOMEPAGE="http://www.shorewall.net/"
-SRC_URI="http://www1.shorewall.net/pub/${MY_PN}/${MY_PV_TREE}/${MY_P}/${P}.tar.bz2
-	doc? ( http://www1.shorewall.net/pub/${MY_PN}/${MY_PV_TREE}/${MY_P}/${MY_P_DOCS}.tar.bz2 )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~sparc ~x86"
-IUSE="doc"
-
-DEPEND=">=net-firewall/iptables-1.4.0
-	sys-apps/iproute2"
-RDEPEND="${DEPEND}"
-
-pkg_pretend() {
-	if kernel_is lt 2 6 25 ; then
-		die "${PN} requires at least kernel 2.6.25."
-	fi
-}
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	keepdir /var/lib/${PN}
-
-	cd "${WORKDIR}/${P}"
-	PREFIX="${D}" ./install.sh || die "install.sh failed"
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-
-	dodoc changelog.txt releasenotes.txt
-	if use doc; then
-		cd "${WORKDIR}/${MY_P_DOCS}"
-		dohtml -r *
-	fi
-}
diff --git a/net-firewall/shorewall6-lite/shorewall6-lite-4.4.24.1.ebuild b/net-firewall/shorewall6-lite/shorewall6-lite-4.4.24.1.ebuild
deleted file mode 100644
index 88931e16c57c..000000000000
--- a/net-firewall/shorewall6-lite/shorewall6-lite-4.4.24.1.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/net-firewall/shorewall6-lite/shorewall6-lite-4.4.24.1.ebuild,v 1.1 2011/10/23 09:24:27 constanze Exp $
-
-EAPI="4"
-
-inherit versionator linux-info
-
-# Select version (stable, RC, Beta):
-MY_PV_TREE=$(get_version_component_range 1-2)   # for devel versions use "development/$(get_version_component_range 1-2)"
-MY_PV_BASE=$(get_version_component_range 1-3)
-
-MY_PN="${PN/6-lite/}"
-MY_P="${MY_PN}-${MY_PV_BASE}"
-MY_P_DOCS="${MY_PN}-docs-html-${PV}"
-
-DESCRIPTION="An iptables-based firewall whose config is handled by a normal Shorewall6."
-HOMEPAGE="http://www.shorewall.net/"
-SRC_URI="http://www1.shorewall.net/pub/${MY_PN}/${MY_PV_TREE}/${MY_P}/${P}.tar.bz2
-	doc? ( http://www1.shorewall.net/pub/${MY_PN}/${MY_PV_TREE}/${MY_P}/${MY_P_DOCS}.tar.bz2 )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~sparc ~x86"
-IUSE="doc"
-
-RDEPEND=">=net-firewall/iptables-1.4.0
-	sys-apps/iproute2"
-
-pkg_pretend() {
-	if kernel_is lt 2 6 25 ; then
-		die "${PN} requires at least kernel 2.6.25."
-	fi
-}
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	keepdir /var/lib/${PN}
-
-	cd "${WORKDIR}/${P}"
-	PREFIX="${D}" ./install.sh || die "install.sh failed"
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-
-	dodoc changelog.txt releasenotes.txt
-	if use doc; then
-		cd "${WORKDIR}/${MY_P_DOCS}"
-		dohtml -r *
-	fi
-}
diff --git a/net-firewall/shorewall6-lite/shorewall6-lite-4.4.22.3.ebuild b/net-firewall/shorewall6-lite/shorewall6-lite-4.4.27-r1.ebuild
similarity index 88%
rename from net-firewall/shorewall6-lite/shorewall6-lite-4.4.22.3.ebuild
rename to net-firewall/shorewall6-lite/shorewall6-lite-4.4.27-r1.ebuild
index 694652bf8904..6f3091d0882b 100644
--- a/net-firewall/shorewall6-lite/shorewall6-lite-4.4.22.3.ebuild
+++ b/net-firewall/shorewall6-lite/shorewall6-lite-4.4.27-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall6-lite/shorewall6-lite-4.4.22.3.ebuild,v 1.1 2011/08/20 23:16:24 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall6-lite/shorewall6-lite-4.4.27-r1.ebuild,v 1.1 2012/02/27 17:48:16 constanze Exp $
 
 EAPI="4"
 
@@ -25,7 +25,8 @@ KEYWORDS="~alpha ~amd64 ~hppa ~sparc ~x86"
 IUSE="doc"
 
 RDEPEND=">=net-firewall/iptables-1.4.0
-	sys-apps/iproute2"
+	sys-apps/iproute2
+	!net-firewall/shorewall-core"
 
 pkg_pretend() {
 	if kernel_is lt 2 6 25 ; then
diff --git a/net-firewall/shorewall6/Manifest b/net-firewall/shorewall6/Manifest
index 7acb5d914663..265610c45e40 100644
--- a/net-firewall/shorewall6/Manifest
+++ b/net-firewall/shorewall6/Manifest
@@ -1,13 +1,7 @@
-DIST shorewall-docs-html-4.4.22.1.tar.bz2 3534237 RMD160 780baf596042ec00440b90618e60849524774315 SHA1 55c1bb02d8ef56dfc112bf81cf5e3fa9b73a4611 SHA256 9b0b8c142938818b187925dd4152d632f5d56145967bf68ba38b53bd09262623
-DIST shorewall-docs-html-4.4.22.3.tar.bz2 3533926 RMD160 c4d3ccdd6b496261c11aad6b9a7010c7728544c2 SHA1 7c1287c0e44547e0ca04cefa7c6640974c4924d1 SHA256 befa3764e80b18d8a9b55a40e87b7036cf7b2a54dbbd2f00b20d811e5bfabea8
 DIST shorewall-docs-html-4.4.23.2.tar.bz2 3638929 RMD160 0ee913e2c40211046dae826381c1cb7aaf64bd61 SHA1 ff11756bd1a95a3280ef6443b5912ae8109c9a3d SHA256 8ee6d1250e777c8fcf4afaad4b2a9dc595f07ae0212dc2a0770e3f30dc1fb325
-DIST shorewall-docs-html-4.4.24.1.tar.bz2 3753318 RMD160 e57306c2b741c3672999dbaff7866b2ad281ecec SHA1 8fecb40d52172a41e0170c30b982cf9d24edce5a SHA256 04eb210dbc450c539dee7ce6a61910e29fef40c61d4162488dbdab91995bd6a9
 DIST shorewall-docs-html-4.4.27.tar.bz2 3791852 RMD160 f6598e87e9f5fd049b6aef4e3db1536f36e24986 SHA1 9de4052c61cfb8fa30643fb388c725dc68d32fe9 SHA256 5d1a0d2df3170057cf6309498126621e9a3dda392e5486f8278ef42b1969199f
 DIST shorewall-docs-html-4.5.0.1.tar.bz2 3793840 RMD160 8b1d7e104b18a71de284defa75c283b535cc1598 SHA1 61ee00d7a48e484faaa5163bf0f4fce2d01dd012 SHA256 d06918f4a655bd7d8076b22b0587c6e8fe8f018113111b9863c8f8224f64fa95
 DIST shorewall6-4.4.15.1.tar.bz2 127226 RMD160 e9b7d0d57142a6c2a3347508d7d5134c4cedba0a SHA1 d66cc2b17760679b98ea0cabea03c5c10aefc268 SHA256 51e395ac819fcef7c5746bfb0b190c54faea49111d9c0e349574965a97aaedaf
-DIST shorewall6-4.4.22.1.tar.bz2 212349 RMD160 9807badb5e4dd8be2a28e31481022785bfcbcbad SHA1 4752dcc806c35458b9fba2b575f75d5e5ff03cf2 SHA256 615fca069047e8c2ff199307107b62ccd8e7301c642d79cb53add42b6b97fbe2
-DIST shorewall6-4.4.22.3.tar.bz2 213781 RMD160 4e08c9203a6977a4e2f617551856dcfa06da9d56 SHA1 ea215e3d06f66385bdba5c20cddfcb91af58d61d SHA256 33f63a16e4223c8ed8189067a4aa8412aefa5abf743c00fd37ce86cb871c5ff3
 DIST shorewall6-4.4.23.2.tar.bz2 217934 RMD160 e00079d1bb60d3c07cc2d77bccd419ceac8bb3e5 SHA1 9fb146302c522a332579835604a59c442bf4a62f SHA256 ecf8339cafbc8e2b98c647e95b6876191147a54e22d51f55356fc7fa6aa4089c
-DIST shorewall6-4.4.24.1.tar.bz2 223204 RMD160 e3e3a5fb786a320932beaf203f2176832728cbec SHA1 a8f83a93f09d487ea2d51c933aa4cc5f2355ac37 SHA256 360332c2e02d0999c00a2fd249f86ed373ad8066e7f3ce030e1e1071111793de
 DIST shorewall6-4.4.27.tar.bz2 220350 RMD160 d2ecf29e488c6094ae8d796cd24585a83af235f7 SHA1 757ae13f2a1aa1b82e272c9fe7f2e9689a1b06a3 SHA256 c918600e35846570fe9108fc3a05e5842c52de88cb57cac9baf6683bc85789d7
 DIST shorewall6-4.5.0.1.tar.bz2 165779 RMD160 294e3b94bec816a589409dd6458eb68fd0adb9f4 SHA1 9c632e6ea286e4ff5bea8f0676be8c24316a517d SHA256 414312e262360e0cbc28e728c19a31163a120c921bdbeca5046f83a09392ebc4
diff --git a/net-firewall/shorewall6/shorewall6-4.4.22.1.ebuild b/net-firewall/shorewall6/shorewall6-4.4.22.1.ebuild
deleted file mode 100644
index a325c3384904..000000000000
--- a/net-firewall/shorewall6/shorewall6-4.4.22.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall6/shorewall6-4.4.22.1.ebuild,v 1.1 2011/08/06 15:47:29 constanze Exp $
-
-EAPI="4"
-
-inherit versionator linux-info
-
-# Select version (stable, RC, Beta, upstream patched):
-MY_PV_TREE=$(get_version_component_range 1-2)	# for devel versions use "development/$(get_version_component_range 1-2)"
-MY_PV_BASE=$(get_version_component_range 1-3)	# which shorewall-common to use
-
-MY_PN="${PN/6/}"
-MY_P="${MY_PN}-${MY_PV_BASE}"
-MY_P_DOCS="${MY_PN}-docs-html-${PV}"
-
-DESCRIPTION="Shoreline Firewall with IPv6 support."
-HOMEPAGE="http://www.shorewall.net/"
-SRC_URI="http://www1.shorewall.net/pub/${MY_PN}/${MY_PV_TREE}/${MY_P}/${P}.tar.bz2
-	doc? ( http://www1.shorewall.net/pub/${PN}/${MY_PV_TREE}/${MY_P}/${MY_P_DOCS}.tar.bz2 )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-
-IUSE="doc"
-
-DEPEND=">=net-firewall/iptables-1.4.0
-	sys-apps/iproute2
-	>=net-firewall/shorewall-${MY_PV_BASE}
-	dev-perl/Socket6"
-RDEPEND="${DEPEND}"
-
-pkg_pretend() {
-	if kernel_is lt 2 6 25 ; then
-		die "${PN} requires at least kernel 2.6.25."
-	fi
-}
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	keepdir /var/lib/${PN}
-
-	cd "${WORKDIR}/${P}"
-	PREFIX="${D}" ./install.sh || die "install.sh failed"
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-
-	dodoc changelog.txt releasenotes.txt
-	if use doc; then
-		dodoc -r  Samples6
-		cd "${WORKDIR}/${MY_P_DOCS}"
-		dohtml -r *
-	fi
-	dodir /var/lock/subsys
-}
diff --git a/net-firewall/shorewall6/shorewall6-4.4.22.3.ebuild b/net-firewall/shorewall6/shorewall6-4.4.22.3.ebuild
deleted file mode 100644
index 3bca7a023b16..000000000000
--- a/net-firewall/shorewall6/shorewall6-4.4.22.3.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall6/shorewall6-4.4.22.3.ebuild,v 1.1 2011/08/20 23:16:14 jer Exp $
-
-EAPI="4"
-
-inherit versionator linux-info
-
-# Select version (stable, RC, Beta, upstream patched):
-MY_PV_TREE=$(get_version_component_range 1-2)	# for devel versions use "development/$(get_version_component_range 1-2)"
-MY_PV_BASE=$(get_version_component_range 1-3)	# which shorewall-common to use
-
-MY_PN="${PN/6/}"
-MY_P="${MY_PN}-${MY_PV_BASE}"
-MY_P_DOCS="${MY_PN}-docs-html-${PV}"
-
-DESCRIPTION="Shoreline Firewall with IPv6 support."
-HOMEPAGE="http://www.shorewall.net/"
-SRC_URI="http://www1.shorewall.net/pub/${MY_PN}/${MY_PV_TREE}/${MY_P}/${P}.tar.bz2
-	doc? ( http://www1.shorewall.net/pub/${PN}/${MY_PV_TREE}/${MY_P}/${MY_P_DOCS}.tar.bz2 )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-
-IUSE="doc"
-
-RDEPEND=">=net-firewall/iptables-1.4.0
-	sys-apps/iproute2
-	>=net-firewall/shorewall-${MY_PV_BASE}
-	dev-perl/Socket6"
-
-pkg_pretend() {
-	if kernel_is lt 2 6 25 ; then
-		die "${PN} requires at least kernel 2.6.25."
-	fi
-}
-
-src_compile() {
-	# The default make command does not work as expected
-	:
-}
-
-src_install() {
-	keepdir /var/lib/${PN}
-
-	cd "${WORKDIR}/${P}"
-	PREFIX="${D}" ./install.sh || die "install.sh failed"
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-
-	dodoc changelog.txt releasenotes.txt
-	if use doc; then
-		dodoc -r  Samples6
-		cd "${WORKDIR}/${MY_P_DOCS}"
-		dohtml -r *
-	fi
-	keepdir /var/lock/subsys
-}
diff --git a/net-firewall/shorewall6/shorewall6-4.4.24.1.ebuild b/net-firewall/shorewall6/shorewall6-4.4.24.1.ebuild
deleted file mode 100644
index 533eaff92a84..000000000000
--- a/net-firewall/shorewall6/shorewall6-4.4.24.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall6/shorewall6-4.4.24.1.ebuild,v 1.1 2011/10/23 09:23:43 constanze Exp $
-
-EAPI="4"
-
-inherit versionator linux-info
-
-# Select version (stable, RC, Beta, upstream patched):
-MY_PV_TREE=$(get_version_component_range 1-2)	# for devel versions use "development/$(get_version_component_range 1-2)"
-MY_PV_BASE=$(get_version_component_range 1-3)	# which shorewall-common to use
-
-MY_PN="${PN/6/}"
-MY_P="${MY_PN}-${MY_PV_BASE}"
-MY_P_DOCS="${MY_PN}-docs-html-${PV}"
-
-DESCRIPTION="Shoreline Firewall with IPv6 support."
-HOMEPAGE="http://www.shorewall.net/"
-SRC_URI="http://www1.shorewall.net/pub/${MY_PN}/${MY_PV_TREE}/${MY_P}/${P}.tar.bz2
-	doc? ( http://www1.shorewall.net/pub/${PN}/${MY_PV_TREE}/${MY_P}/${MY_P_DOCS}.tar.bz2 )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-
-IUSE="doc"
-
-RDEPEND=">=net-firewall/iptables-1.4.0
-	sys-apps/iproute2
-	>=net-firewall/shorewall-${MY_PV_BASE}
-	dev-perl/Socket6"
-
-pkg_pretend() {
-	if kernel_is lt 2 6 25 ; then
-		die "${PN} requires at least kernel 2.6.25."
-	fi
-}
-
-src_compile() {
-	# The default make command does not work as expected
-	:
-}
-
-src_install() {
-	keepdir /var/lib/${PN}
-
-	cd "${WORKDIR}/${P}"
-	PREFIX="${D}" ./install.sh || die "install.sh failed"
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-
-	dodoc changelog.txt releasenotes.txt
-	if use doc; then
-		dodoc -r  Samples6
-		cd "${WORKDIR}/${MY_P_DOCS}"
-		dohtml -r *
-	fi
-	keepdir /var/lock/subsys
-}
diff --git a/net-irc/weechat/Manifest b/net-irc/weechat/Manifest
index b1754e06f7fc..a2b6257fa2c2 100644
--- a/net-irc/weechat/Manifest
+++ b/net-irc/weechat/Manifest
@@ -1,2 +1,2 @@
 DIST weechat-0.3.5.tar.bz2 2053043 RMD160 4a590f22a97618cf101314df4ca3e2ecb2a1a5e4 SHA1 d963b408ec69b69a73e081414ece981804060975 SHA256 c8f86ed75bd57a498702aba7f9c96a99fc1581c6a034bf9a7761d8d578b4e154
-DIST weechat-0.3.6.tar.bz2 2179857 RMD160 d8040d65c0eb2ddccf5cd37a1bcaf32033f77356 SHA1 529f8ec1756ababfe25cf16241fa7250508b6cc8 SHA256 6c367e36fb76de318410f0bc5f2043056155ffe1372c121c1f90520b4645a27e
+DIST weechat-0.3.7.tar.bz2 2444611 RMD160 9f830136eccf6d4c61bbd09ceb7b9b5aab22e947 SHA1 897b79e18bbe947e4b78857ff1d428d17441d412 SHA256 8ef5e3daf49e75669e36093c1df852e65b51d512073c6e6b935a7fa90f6b7bca
diff --git a/net-irc/weechat/weechat-0.3.6.ebuild b/net-irc/weechat/weechat-0.3.7.ebuild
similarity index 89%
rename from net-irc/weechat/weechat-0.3.6.ebuild
rename to net-irc/weechat/weechat-0.3.7.ebuild
index 309fe4625733..937e2d038cb8 100644
--- a/net-irc/weechat/weechat-0.3.6.ebuild
+++ b/net-irc/weechat/weechat-0.3.7.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/weechat/weechat-0.3.6.ebuild,v 1.2 2011/12/31 18:12:20 binki Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/weechat/weechat-0.3.7.ebuild,v 1.1 2012/02/27 16:33:03 scarabeus Exp $
 
 EAPI=3
 
 USE_RUBY="ruby18 ruby19"
 RUBY_OPTIONAL="yes"
 
-PYTHON_DEPEND="python? 2"
+PYTHON_DEPEND="python? *"
 
 EGIT_REPO_URI="git://git.sv.gnu.org/weechat.git"
 [[ ${PV} == "9999" ]] && GIT_ECLASS="git-2"
@@ -52,9 +52,7 @@ DOCS="AUTHORS ChangeLog NEWS README"
 #REQUIRED_USE=" || ( ncurses gtk )"
 
 pkg_setup() {
-	python_set_active_version 2
 	python_pkg_setup
-
 	ruby-ng_pkg_setup
 }
 
@@ -99,6 +97,6 @@ pkg_postinst() {
 	if use scripts && use python; then
 		elog "You may use the following script from upstream to manage your scripts."
 		elog "It helps with downloading and updating other scripts:"
-		elog "  http://www.weechat.org/scripts/source/stable/weeget.py/"
+		elog "    http://www.weechat.org/scripts/source/stable/weeget.py/"
 	fi
 }
diff --git a/net-irc/weechat/weechat-9999.ebuild b/net-irc/weechat/weechat-9999.ebuild
index 5b9641f05888..6752eab90343 100644
--- a/net-irc/weechat/weechat-9999.ebuild
+++ b/net-irc/weechat/weechat-9999.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/weechat/weechat-9999.ebuild,v 1.12 2011/12/31 18:12:20 binki Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/weechat/weechat-9999.ebuild,v 1.13 2012/02/27 16:33:03 scarabeus Exp $
 
 EAPI=3
 
 USE_RUBY="ruby18 ruby19"
 RUBY_OPTIONAL="yes"
 
-PYTHON_DEPEND="python? 2"
+PYTHON_DEPEND="python? *"
 
 EGIT_REPO_URI="git://git.sv.gnu.org/weechat.git"
 [[ ${PV} == "9999" ]] && GIT_ECLASS="git-2"
@@ -52,9 +52,7 @@ DOCS="AUTHORS ChangeLog NEWS README"
 #REQUIRED_USE=" || ( ncurses gtk )"
 
 pkg_setup() {
-	python_set_active_version 2
 	python_pkg_setup
-
 	ruby-ng_pkg_setup
 }
 
diff --git a/net-misc/wicd/files/wicd-1.7.1-provide-net.patch b/net-misc/wicd/files/wicd-1.7.1-provide-net.patch
new file mode 100644
index 000000000000..f325bcbaa89d
--- /dev/null
+++ b/net-misc/wicd/files/wicd-1.7.1-provide-net.patch
@@ -0,0 +1,11 @@
+diff -U 3 -dHrN wicd-1.7.1.orig/in/init=gentoo=wicd.in wicd-1.7.1/in/init=gentoo=wicd.in
+--- wicd-1.7.1.orig/in/init=gentoo=wicd.in	2012-02-27 21:49:36.422873826 +0100
++++ wicd-1.7.1/in/init=gentoo=wicd.in	2012-02-27 21:50:26.957127714 +0100
+@@ -10,6 +10,7 @@
+ depend() {
+ 	need dbus
+ 	after hald
++	provide net
+ }
+ 
+ start() {
diff --git a/net-misc/wicd/wicd-1.7.1-r2.ebuild b/net-misc/wicd/wicd-1.7.1-r2.ebuild
new file mode 100644
index 000000000000..b40eee49085d
--- /dev/null
+++ b/net-misc/wicd/wicd-1.7.1-r2.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/wicd/wicd-1.7.1-r2.ebuild,v 1.1 2012/02/27 21:04:11 tomka Exp $
+
+EAPI=3
+
+PYTHON_DEPEND="2"
+PYTHON_USE_WITH="ncurses? xml"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.* *-jython"
+DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES="1"
+
+inherit eutils distutils systemd
+
+DESCRIPTION="A lightweight wired and wireless network manager for Linux"
+HOMEPAGE="http://wicd.sourceforge.net/"
+SRC_URI="http://launchpad.net/wicd/1.7/${PV}/+download/${P}.tar.gz
+	mac4lin? ( http://dev.gentoo.org/~anarchy/dist/wicd-mac4lin-icons.tar.xz )
+	ambiance? ( http://freetimesblog.altervista.org/blog/wp-content/uploads/downloads/2010/05/Icone-Wicd-Lucid.tar.gz )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="X ambiance +gtk ioctl libnotify mac4lin ncurses nls +pm-utils"
+
+DEPEND=""
+# Maybe virtual/dhcp would work, but there are enough problems with
+# net-misc/dhcp that I want net-misc/dhcpcd to be guarenteed to be considered
+# first if none are installed.
+RDEPEND="
+	dev-python/dbus-python
+	X? ( gtk? ( dev-python/pygtk
+		|| (
+			x11-misc/ktsuss
+			x11-libs/gksu
+			kde-base/kdesu
+			)
+		)
+	)
+	|| (
+		net-misc/dhcpcd
+		net-misc/dhcp
+		net-misc/pump
+	)
+	net-wireless/wireless-tools
+	net-wireless/wpa_supplicant
+	|| (
+		sys-apps/net-tools
+		sys-apps/ethtool
+	)
+	!gtk? ( dev-python/pygobject:2 )
+	ioctl? ( dev-python/python-iwscan dev-python/python-wpactrl )
+	libnotify? ( dev-python/notify-python )
+	ncurses? (
+		dev-python/urwid
+		dev-python/pygobject:2
+	)
+	pm-utils? ( >=sys-power/pm-utils-1.1.1 )
+	"
+DOCS="CHANGES NEWS AUTHORS README"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.7.1_beta2-init.patch
+	epatch "${FILESDIR}"/${PN}-init-sve-start.patch
+	# Add a template for hex psk's and wpa (Bug 306423)
+	epatch "${FILESDIR}"/${PN}-1.7.1_pre20111210-wpa-psk-hex-template.patch
+	# get rid of opts variable to fix bug 381885
+	sed -i "/opts/d" "in/init=gentoo=wicd.in" || die
+	# Make init script provide net per bug 405775
+	epatch "${FILESDIR}"/${PN}-1.7.1-provide-net.patch
+	# Need to ensure that generated scripts use Python 2 at run time.
+	sed -e "s:self.python = '/usr/bin/python':self.python = '/usr/bin/python2':" \
+	  -i setup.py || die "sed failed"
+	python_copy_sources
+}
+
+src_configure() {
+	local myconf
+	use gtk || myconf="${myconf} --no-install-gtk"
+	use libnotify || myconf="${myconf} --no-use-notifications"
+	use ncurses || myconf="${myconf} --no-install-ncurses"
+	use pm-utils || myconf="${myconf} --no-install-pmutils"
+	configuration() {
+		$(PYTHON) ./setup.py configure --no-install-docs --resume=/usr/share/wicd/scripts/ --suspend=/usr/share/wicd/scripts/ --verbose ${myconf}
+	}
+	python_execute_function -s configuration
+}
+
+src_install() {
+	distutils_src_install
+	keepdir /var/lib/wicd/configurations \
+		|| die "keepdir failed, critical for this app"
+	keepdir /etc/wicd/scripts/{postconnect,disconnect,preconnect} \
+		|| die "keepdir failed, critical for this app"
+	keepdir /var/log/wicd \
+		|| die "keepdir failed, critical for this app"
+	use nls || rm -rf "${D}"/usr/share/locale
+	systemd_dounit "${S}/other/wicd.service"
+
+	if use mac4lin; then
+		rm -rf "${D}"/usr/share/pixmaps/wicd || die "Failed to remove old icons"
+		mv "${WORKDIR}"/wicd "${D}"/usr/share/pixmaps/
+	fi
+	if use ambiance; then
+		# Overwrite tray icons with ambiance icon
+		rm "${WORKDIR}/Icone Wicd Lucid"/signal*
+		cp "${WORKDIR}/Icone Wicd Lucid"/*.png "${D}"/usr/share/pixmaps/wicd/
+	fi
+}
+
+pkg_postinst() {
+	distutils_pkg_postinst
+
+	elog "You may need to restart the dbus service after upgrading wicd."
+	echo
+	elog "To start wicd at boot, add /etc/init.d/wicd to a runlevel and:"
+	elog "- Remove all net.* initscripts (except for net.lo) from all runlevels"
+	elog "- Add these scripts to the RC_PLUG_SERVICES line in /etc/rc.conf"
+	elog "(For example, rc_hotplug=\"!net.eth* !net.wlan*\")"
+	# Maintainer's note: the consolekit use flag short circuits a dbus rule and
+	# allows the connection. Else, you need to be in the group.
+	if ! has_version sys-auth/pambase[consolekit]; then
+			ewarn "Wicd-1.6 and newer requires your user to be in the 'users' group. If"
+			ewarn "you are not in that group, then modify /etc/dbus-1/system.d/wicd.conf"
+	fi
+}
diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index c23dc4ecfefc..805f24a72752 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -1,4 +1,3 @@
-DIST haproxy-1.3.25.tar.gz 662198 RMD160 54fac52224e5e1a32d19c4e8b5da92e1ee6ed6ff SHA1 08fcc1f881514cb8ded801890743af29b93d5d30 SHA256 50dbe7b515c32a643b7caaac32ec3152ba536e589242e4d50ff42618a85f5a78
-DIST haproxy-1.3.26.tar.gz 668337 RMD160 f11286cef16eb3c9e29d09da3293316957226843 SHA1 4a93bcf6bcd48969fa44ac8081ce7a8baf518e17 SHA256 ab97d7f524b8c816c2b42b99d63691c819a32fe593c22242dad3108c7f85f274
 DIST haproxy-1.4.15.tar.gz 812293 RMD160 1a5e3e5c4ea71e4d439ffc4b221e31ae90d04f88 SHA1 8c42bc8c7d3714061b6fb74b0e3565d1e672556f SHA256 4baebfe0a5a9220f77d9175b2e711dc8985bbb696d11c38033cc0e94e3cca93a
 DIST haproxy-1.4.18.tar.gz 820427 RMD160 16729f0519a47123d88e849ae95d600c590c8583 SHA1 191dbcb5880c711580693bd081ca5fdd8dde3012 SHA256 ec2b6222a34d11f97cf7cf5cc696080dac34e94deb8e6cf3822b27442e0793fa
+DIST haproxy-1.4.19.tar.gz 824610 RMD160 b98799e6e83b0834432e010c9c9149820725bd23 SHA1 f40de2fee9f4c6ad35a1ee358499f860f042ad86 SHA256 dbee7d9afa6ca4aae884e4ab6aaf2a951c4f4f3cb91c2aca73b3317c7cebea25
diff --git a/net-proxy/haproxy/haproxy-1.3.25.ebuild b/net-proxy/haproxy/haproxy-1.3.25.ebuild
deleted file mode 100644
index bd1a86e53a15..000000000000
--- a/net-proxy/haproxy/haproxy-1.3.25.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/haproxy-1.3.25.ebuild,v 1.6 2011/09/21 13:44:51 idl0r Exp $
-
-inherit eutils versionator toolchain-funcs flag-o-matic
-
-DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments"
-HOMEPAGE="http://haproxy.1wt.eu"
-SRC_URI="http://haproxy.1wt.eu/download/$(get_version_component_range 1-2)/src/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="examples pcre vim-syntax"
-
-DEPEND="pcre? ( dev-libs/libpcre )"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	enewgroup haproxy
-	enewuser haproxy -1 -1 -1 haproxy
-}
-
-src_compile() {
-	local args="TARGET=linux26"
-
-	use pcre && args="${args} USE_PCRE=1"
-
-	use kernel_linux && args="${args} USE_LINUX_SPLICE=1"
-	use kernel_linux && args="${args} USE_LINUX_TPROXY=1"
-
-	# For now, until the strict-aliasing breakage will be fixed
-	append-cflags -fno-strict-aliasing
-
-	emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args} || die
-}
-
-src_install() {
-	dobin haproxy || die
-	newinitd "${FILESDIR}/haproxy.initd" haproxy || die
-
-	# Don't install useless files
-	rm examples/build.cfg doc/*gpl.txt
-
-	dodoc CHANGELOG ROADMAP TODO doc/{configuration,haproxy-en}.txt
-	doman doc/haproxy.1
-
-	if use examples;
-	then
-		docinto examples
-		dodoc examples/*.cfg || die
-	fi
-
-	if use vim-syntax;
-	then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins examples/haproxy.vim || die
-	fi
-}
-
-pkg_postinst() {
-	if [[ ! -f "${ROOT}/etc/haproxy.cfg" ]] ; then
-		ewarn "You need to create /etc/haproxy.cfg before you start the haproxy service."
-		ewarn "It's best practice to not run haproxy as root, user and group haproxy was therefore created."
-		ewarn "Make use of them with the \"user\" and \"group\" directives."
-
-		if [[ -d "${ROOT}/usr/share/doc/${PF}" ]]; then
-			einfo "Please consult the installed documentation for learning the configuration file's syntax."
-			einfo "The documentation and sample configuration files are installed here:"
-			einfo "   ${ROOT}usr/share/doc/${PF}"
-		fi
-	fi
-}
diff --git a/net-proxy/haproxy/haproxy-1.3.26.ebuild b/net-proxy/haproxy/haproxy-1.3.26.ebuild
deleted file mode 100644
index f9a8a7a215e1..000000000000
--- a/net-proxy/haproxy/haproxy-1.3.26.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/haproxy-1.3.26.ebuild,v 1.2 2011/09/21 13:44:51 idl0r Exp $
-
-inherit eutils versionator toolchain-funcs flag-o-matic
-
-DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments"
-HOMEPAGE="http://haproxy.1wt.eu"
-SRC_URI="http://haproxy.1wt.eu/download/$(get_version_component_range 1-2)/src/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="examples pcre vim-syntax"
-
-DEPEND="pcre? ( dev-libs/libpcre )"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	enewgroup haproxy
-	enewuser haproxy -1 -1 -1 haproxy
-}
-
-src_compile() {
-	local args="TARGET=linux26"
-
-	use pcre && args="${args} USE_PCRE=1"
-
-	use kernel_linux && args="${args} USE_LINUX_SPLICE=1"
-	use kernel_linux && args="${args} USE_LINUX_TPROXY=1"
-
-	# For now, until the strict-aliasing breakage will be fixed
-	append-cflags -fno-strict-aliasing
-
-	emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args} || die
-}
-
-src_install() {
-	dobin haproxy || die
-	newinitd "${FILESDIR}/haproxy.initd" haproxy || die
-
-	# Don't install useless files
-	rm examples/build.cfg doc/*gpl.txt
-
-	dodoc CHANGELOG ROADMAP TODO doc/{configuration,haproxy-en}.txt
-	doman doc/haproxy.1
-
-	if use examples;
-	then
-		docinto examples
-		dodoc examples/*.cfg || die
-	fi
-
-	if use vim-syntax;
-	then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins examples/haproxy.vim || die
-	fi
-}
-
-pkg_postinst() {
-	if [[ ! -f "${ROOT}/etc/haproxy.cfg" ]] ; then
-		ewarn "You need to create /etc/haproxy.cfg before you start the haproxy service."
-		ewarn "It's best practice to not run haproxy as root, user and group haproxy was therefore created."
-		ewarn "Make use of them with the \"user\" and \"group\" directives."
-
-		if [[ -d "${ROOT}/usr/share/doc/${PF}" ]]; then
-			einfo "Please consult the installed documentation for learning the configuration file's syntax."
-			einfo "The documentation and sample configuration files are installed here:"
-			einfo "   ${ROOT}usr/share/doc/${PF}"
-		fi
-	fi
-}
diff --git a/net-proxy/haproxy/haproxy-1.3.26-r1.ebuild b/net-proxy/haproxy/haproxy-1.4.19.ebuild
similarity index 92%
rename from net-proxy/haproxy/haproxy-1.3.26-r1.ebuild
rename to net-proxy/haproxy/haproxy-1.4.19.ebuild
index cd6d6a604def..0f438c869285 100644
--- a/net-proxy/haproxy/haproxy-1.3.26-r1.ebuild
+++ b/net-proxy/haproxy/haproxy-1.4.19.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/haproxy-1.3.26-r1.ebuild,v 1.1 2011/09/28 15:23:02 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/haproxy-1.4.19.ebuild,v 1.1 2012/02/27 22:40:14 idl0r Exp $
+
+EAPI="4"
 
 inherit eutils versionator toolchain-funcs flag-o-matic
 
@@ -37,6 +39,7 @@ src_compile() {
 
 src_install() {
 	dobin haproxy || die
+
 	newinitd "${FILESDIR}/haproxy.initd-r1" haproxy || die
 
 	# Don't install useless files
diff --git a/profiles/package.mask b/profiles/package.mask
index d70a3488bcc4..e941ce1a2c5d 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
 ####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.13526 2012/02/27 11:53:01 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.13527 2012/02/28 00:42:50 titanofold 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,13 @@
 
 #--- END OF EXAMPLES ---
 
+# Aaron W. Swenson <titanofold@gentoo.org> (27 Feb 2012)
+# End of life. Upgrade to 8.3 or later. Multiple vulnerabilities. (Bug 406037)
+# Removal on 27 April 2012.
+<dev-db/postgresql-docs-8.3.0
+<dev-db/postgresql-base-8.3.0
+<dev-db/postgresql-server-8.3.0
+
 # Sébastien Fabbro <bicatali@gentoo.org> (26 Feb 2012)
 # Needs development version x11-libs/wxGTK
 >=sci-visualization/fityk-1.1
diff --git a/profiles/updates/1Q-2012 b/profiles/updates/1Q-2012
index 061353689bb1..3927292de2e0 100644
--- a/profiles/updates/1Q-2012
+++ b/profiles/updates/1Q-2012
@@ -8,3 +8,4 @@ slotmove =dev-libs/libmowgli-2.0.0_alpha1 0 2
 move media-tv/linuxtv-dvb-headers virtual/linuxtv-dvb-headers
 move app-shells/prll sys-process/prll
 move net-wireless/wispy-tools net-wireless/spectools
+slotmove dev-ruby/syslogger 3 0
diff --git a/sci-astronomy/kapteyn/kapteyn-2.1.ebuild b/sci-astronomy/kapteyn/kapteyn-2.1.ebuild
index b59947ea888f..ba2194219941 100644
--- a/sci-astronomy/kapteyn/kapteyn-2.1.ebuild
+++ b/sci-astronomy/kapteyn/kapteyn-2.1.ebuild
@@ -1,11 +1,12 @@
-# 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/sci-astronomy/kapteyn/kapteyn-2.1.ebuild,v 1.1 2011/02/17 06:45:58 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/kapteyn/kapteyn-2.1.ebuild,v 1.2 2012/02/28 00:44:06 patrick Exp $
 
 EAPI="3"
 
 PYTHON_DEPEND="2"
 SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-*"
 
 inherit distutils
 
@@ -22,8 +23,6 @@ DEPEND=">=sci-astronomy/wcslib-4.7
 	dev-python/numpy"
 RDEPEND="${DEPEND}"
 
-RESTRICT_PYTHON_ABIS="3.*"
-
 src_install() {
 	distutils_src_install
 	dodoc doc/${PN}.pdf || die
diff --git a/sci-biology/biopython/Manifest b/sci-biology/biopython/Manifest
index 8222abf95b63..86e9e7c37807 100644
--- a/sci-biology/biopython/Manifest
+++ b/sci-biology/biopython/Manifest
@@ -1,2 +1,3 @@
 DIST biopython-1.57.tar.gz 6945024 RMD160 ae061442a97decbd9951af8f85913bbc3747ffee SHA1 dbbd23c9f555e0c69d61db96f8aa368617ecacef SHA256 07c16a86127770c8d5b653a6e82fee0999159f7284a3a01c98cf66ed2f0ec4a0
 DIST biopython-1.58.tar.gz 8035063 RMD160 3e05426017e98cdc45cacfb08b1b5d7c3d4b10ff SHA1 3db0819d0046cfcd1c9aaf39aa7db40b9aa2645e SHA256 f9183facf01d3b0b489401f43a0cae8249c3dd1f7452d939f137980f5e683e73
+DIST biopython-1.59.tar.gz 8577492 RMD160 2d08fe70d131cd2a90019465a4f5f680b4c92da3 SHA1 dc8e9d76b208a2c2fcc8d4e10c7bbf0cc56dbbfd SHA256 588abf55de3d8e4deac611a0f810a9c5d9ce7e5868d3064f79efe6cabd18cacb
diff --git a/sci-biology/biopython/biopython-1.59.ebuild b/sci-biology/biopython/biopython-1.59.ebuild
new file mode 100644
index 000000000000..1a4a7397c2ff
--- /dev/null
+++ b/sci-biology/biopython/biopython-1.59.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/biopython/biopython-1.59.ebuild,v 1.1 2012/02/27 16:06:59 weaver Exp $
+
+EAPI=3
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.* *-jython"
+
+inherit distutils eutils
+
+DESCRIPTION="Python modules for computational molecular biology"
+HOMEPAGE="http://www.biopython.org/ http://pypi.python.org/pypi/biopython/"
+SRC_URI="http://www.biopython.org/DIST/${P}.tar.gz"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="mysql postgres"
+
+RDEPEND="
+	dev-python/numpy
+	dev-python/reportlab
+	mysql? ( dev-python/mysql-python )
+	postgres? ( dev-python/psycopg )"
+DEPEND="${RDEPEND}
+	sys-devel/flex"
+
+PYTHON_CFLAGS=("2.* + -fno-strict-aliasing")
+
+DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES="1"
+DOCS="CONTRIB DEPRECATED NEWS README"
+PYTHON_MODNAME="Bio BioSQL"
+
+src_prepare() {
+	distutils_src_prepare
+	epatch "${FILESDIR}/${PN}-1.51-flex.patch"
+}
+
+src_test() {
+	testing() {
+		cd Tests
+		PYTHONPATH="$(ls -d ../build/lib.*)" "$(PYTHON)" run_tests.py
+	}
+	python_execute_function --nonfatal -s testing
+}
+
+src_install() {
+	distutils_src_install
+
+	insinto /usr/share/doc/${PF}
+	doins -r Doc/* || die "Installation of documentation failed"
+	insinto /usr/share/${PN}
+	cp -r --preserve=mode Scripts Tests "${ED}usr/share/${PN}" || die "Installation of shared files failed"
+}
diff --git a/sci-chemistry/burrow-owl/Manifest b/sci-chemistry/burrow-owl/Manifest
index fe8a88e5051a..8cac8de36a0d 100644
--- a/sci-chemistry/burrow-owl/Manifest
+++ b/sci-chemistry/burrow-owl/Manifest
@@ -1,3 +1,4 @@
 DIST burrow-demos.tar 80896000 RMD160 7666dfa982b87a9e8701f75259c5c0e4e2a23fb2 SHA1 8c9611907d325b58e79f85f248757d7cf469113c SHA256 f93e957889adab0521c6e3234f117cf984b7bb18ba6641a3edbdd30202db4b96
 DIST burrow-owl-1.4.tar.gz 1299459 RMD160 1fa546846392fbd441b486ee3e94b08f83b78d25 SHA1 bd13c2d28e6ffce7a04e331bc7b2353c50e1bbef SHA256 09544842d2092f9a817d5eb8621d407fddc4a6612c1ef350d7a1cd34feb23778
+DIST burrow-owl-1.5.1.tar.gz 1408249 RMD160 91d352520fe101268cc33329b32d245b588fb6b5 SHA1 8eafdc11310cc2e5f4d81aea2cf44f6f2dc82271 SHA256 76a4ab0746b1b945e0177d441f7ced8042063d4ff2c9171343ea20ddc19a9bbb
 DIST burrow-owl-1.5.tar.gz 1408097 RMD160 03032be8a195838856c94b72c0a510a338b30014 SHA1 b376aad782bddb28b95c607927fb187aa57f2369 SHA256 43437cd7e33e6c1bcf07b28cb2bda67438cdd62e78cebd53910a800c6ebab698
diff --git a/sci-chemistry/burrow-owl/burrow-owl-1.5.1.ebuild b/sci-chemistry/burrow-owl/burrow-owl-1.5.1.ebuild
new file mode 100644
index 000000000000..9021afe8e3f8
--- /dev/null
+++ b/sci-chemistry/burrow-owl/burrow-owl-1.5.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/burrow-owl/burrow-owl-1.5.1.ebuild,v 1.1 2012/02/27 22:50:44 jlec Exp $
+
+EAPI=4
+
+inherit autotools-utils
+
+DESCRIPTION="Visualize multidimensional nuclear magnetic resonance (NMR) spectra"
+HOMEPAGE="http://burrow-owl.sourceforge.net/"
+SRC_URI="
+	mirror://sourceforge/${PN}/${P}.tar.gz
+	examples? ( mirror://sourceforge/${PN}/burrow-demos.tar )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples static-libs"
+
+RDEPEND="
+	dev-libs/g-wrap
+	dev-libs/glib:2
+	dev-scheme/guile[networking,regex]
+	dev-scheme/guile-cairo
+	dev-scheme/guile-gnome-platform
+	sci-libs/starparse
+	x11-libs/gtk+:2"
+DEPEND="${RDEPEND}
+	dev-util/indent
+	dev-util/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+
+src_configure() {
+	local myeconfargs=(
+		$(use_with doc doxygen doxygen)
+	)
+	autotools-utils_src_configure
+}
+
+src_test () {
+	autotools-utils_src_compile -C test-suite check
+}
+
+src_install() {
+	use doc && HTML_DOCS=("${AUTOTOOLS_BUILD_DIR}/doc/api/html/")
+	autotools-utils_src_install
+
+	use examples && \
+		insinto /usr/share/${PN} && \
+		doins -r "${WORKDIR}"/burrow-demos/*
+}
diff --git a/sci-chemistry/pymol/Manifest b/sci-chemistry/pymol/Manifest
index 7e42e3ef4b5d..8ef91a1dfdb8 100644
--- a/sci-chemistry/pymol/Manifest
+++ b/sci-chemistry/pymol/Manifest
@@ -1,4 +1,5 @@
 DIST pymol-1.3.1_pre3925-r1.tar.gz 8185909 RMD160 fcd6bdcedda369af7d51c41fc708c69a878b1aa1 SHA1 990b1acd0d5c84f7b93dc1c9a550f95b74c67e4b SHA256 74d3a3dd1972e2f47458e80c3d157871c361ad81119c76d1edd40b5e491cb50e
 DIST pymol-1.4.1.tar.xz 6831544 RMD160 6478b14215d0c502bff3bdec0cae3c903a9004e0 SHA1 d4da217ebf2c059f4712f564b55daa81a839b259 SHA256 af020e3103360defa3749ed31c16938a00032d4c2bf40f8455c746919aeaffd6
+DIST pymol-1.5.0.2.tar.xz 7389704 RMD160 5164221a8f14f8855a4113d6e16ab6ef2a2fc8b1 SHA1 85c5851b95760cb91fa6352e5eabbdeba299e722 SHA256 22761608a0f7f815b7399830050ec759b2ada8edfe1700e2f299047d0e9254fc
 DIST pymol-v1.5.0.1.tar.bz2 9695855 RMD160 1e5fd51299f2bbe0249a9a07117c068af49ec095 SHA1 b59ff50437d34f21ca8ffd007a600de4df684073 SHA256 16c0cfbacbbd967b23654dd3708ef6ba877ab2a6c0985ff806a17186427de49c
 DIST pymol.xpm.tar 10240 RMD160 86b01bbe6aa8bf0251a982718d343c61c781c6e3 SHA1 af1ae2c9e2479efcd600c7ba01313b5dd7ef5b87 SHA256 813c450b5acc399387ddc33cc2d747c02afb515e1c3f216be7f7284a09e64819
diff --git a/sci-chemistry/pymol/pymol-1.5.0.1.ebuild b/sci-chemistry/pymol/pymol-1.5.0.1.ebuild
index 050bfca4b455..c0511e130639 100644
--- a/sci-chemistry/pymol/pymol-1.5.0.1.ebuild
+++ b/sci-chemistry/pymol/pymol-1.5.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pymol/pymol-1.5.0.1.ebuild,v 1.3 2012/02/26 06:10:49 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pymol/pymol-1.5.0.1.ebuild,v 1.4 2012/02/27 22:53:03 jlec Exp $
 
 EAPI=4
 
@@ -104,7 +104,7 @@ src_install() {
 	dodoc DEVELOPERS README
 
 	doicon "${WORKDIR}"/${PN}.xpm
-	make_desktop_entry pymol PyMol ${PN}.xpm "Graphics;Science;Chemistry"
+	make_desktop_entry pymol PyMol ${PN} "Graphics;Science;Chemistry"
 }
 
 pkg_postinst() {
diff --git a/sci-chemistry/pymol/pymol-1.5.0.2.ebuild b/sci-chemistry/pymol/pymol-1.5.0.2.ebuild
new file mode 100644
index 000000000000..40ff66f76107
--- /dev/null
+++ b/sci-chemistry/pymol/pymol-1.5.0.2.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pymol/pymol-1.5.0.2.ebuild,v 1.1 2012/02/27 22:53:03 jlec Exp $
+
+EAPI=4
+
+PYTHON_DEPEND="2:2.7"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="2.4 2.5 2.6 3.* *-jython 2.7-pypy-*"
+PYTHON_USE_WITH="tk"
+PYTHON_MODNAME="${PN} chempy pmg_tk pmg_wx"
+
+inherit distutils eutils fdo-mime prefix versionator
+
+DESCRIPTION="A Python-extensible molecular graphics system"
+HOMEPAGE="http://pymol.sourceforge.net/"
+SRC_URI="
+	http://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz
+	http://dev.gentoo.org/~jlec/distfiles/${PN}.xpm.tar"
+
+LICENSE="PSF-2.2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="apbs numpy vmd web"
+
+DEPEND="
+	dev-python/numpy
+	dev-python/pmw
+	media-libs/freetype:2
+	media-libs/glew
+	media-libs/libpng
+	media-video/mpeg-tools
+	sys-libs/zlib
+	media-libs/freeglut
+	apbs? (
+		dev-libs/maloc
+		sci-chemistry/apbs
+		sci-chemistry/pdb2pqr
+		sci-chemistry/pymol-apbs-plugin
+	)
+	web? ( !dev-python/webpy )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-1.5.0.1-setup.py.patch \
+		"${FILESDIR}"/${PN}-1.5.0.1-data-path.patch \
+		"${FILESDIR}"/${PN}-1.5.0.1-flags.patch
+
+	use web || epatch "${FILESDIR}"/${PN}-1.5.0.1-web.patch
+
+	epatch "${FILESDIR}"/${PN}-1.5.0.1-prefix.patch && \
+		eprefixify setup.py
+
+	use vmd && epatch "${FILESDIR}"/${PN}-1.5.0.1-vmd.patch
+
+	if use numpy; then
+		sed \
+			-e '/PYMOL_NUMPY/s:^#::g' \
+			-i setup.py || die
+	fi
+
+	rm ./modules/pmg_tk/startup/apbs_tools.py || die
+
+	echo "site_packages = \'$(python_get_sitedir -f)\'" > setup3.py || die
+
+	# python 3.* fix
+	# sed '452,465d' -i setup.py
+	distutils_src_prepare
+}
+
+src_configure() {
+	:
+}
+
+src_install() {
+	distutils_src_install
+
+	# These environment variables should not go in the wrapper script, or else
+	# it will be impossible to use the PyMOL libraries from Python.
+	cat >> "${T}"/20pymol <<- EOF
+		PYMOL_PATH="${EPREFIX}/$(python_get_sitedir -f)/${PN}"
+		PYMOL_DATA="${EPREFIX}/usr/share/pymol/data"
+		PYMOL_SCRIPTS="${EPREFIX}/usr/share/pymol/scripts"
+	EOF
+
+	doenvd "${T}"/20pymol
+
+	cat >> "${T}"/pymol <<- EOF
+	#!/bin/sh
+	$(PYTHON -f) -O \${PYMOL_PATH}/__init__.py -q \$*
+	EOF
+
+	dobin "${T}"/pymol
+
+	insinto /usr/share/pymol
+	doins -r test data scripts
+
+	insinto /usr/share/pymol/examples
+	doins -r examples
+
+	dodoc DEVELOPERS README
+
+	doicon "${WORKDIR}"/${PN}.xpm
+	make_desktop_entry pymol PyMol ${PN} "Graphics;Science;Chemistry"
+}
+
+pkg_postinst() {
+	elog "\t USE=shaders was removed,"
+	elog "please use pymol config settings"
+	elog "\t set use_shaders, 1"
+	distutils_pkg_postinst
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
diff --git a/sci-libs/grib_api/files/grib_api-1.9.9-autotools.patch b/sci-libs/grib_api/files/grib_api-1.9.9-autotools.patch
index 75ed88c1356f..0ef76d02e903 100644
--- a/sci-libs/grib_api/files/grib_api-1.9.9-autotools.patch
+++ b/sci-libs/grib_api/files/grib_api-1.9.9-autotools.patch
@@ -1,6 +1,6 @@
 diff -Nur grib_api-1.9.9.orig/configure.ac grib_api-1.9.9/configure.ac
---- grib_api-1.9.9.orig/configure.ac	2010-10-19 13:19:26.000000000 +0100
-+++ grib_api-1.9.9/configure.ac	2011-03-08 17:20:10.000000000 +0000
+--- grib_api-1.9.9.orig/configure.ac	2012-02-27 17:41:54.000000000 +0000
++++ grib_api-1.9.9/configure.ac	2012-02-27 18:08:55.000000000 +0000
 @@ -24,21 +24,9 @@
  AC_CONFIG_HEADER([src/config.h])
  AM_INIT_AUTOMAKE($PACKAGE_NAME,[${PACKAGE_VERSION}],[http://www.ecmwf.int])
@@ -138,6 +138,15 @@ diff -Nur grib_api-1.9.9.orig/configure.ac grib_api-1.9.9/configure.ac
  then
    FORTRAN_MOD=fortran
    AC_SUBST(FORTRAN_MOD)
+@@ -221,7 +221,7 @@
+ then
+ 	IFS_SAMPLES_DIR=$ifs_samples
+ else
+-	IFS_SAMPLES_DIR=${prefix}/ifs_samples
++	IFS_SAMPLES_DIR=${datadir}/$PACKAGE_NAME/ifs_samples
+ fi
+ AC_SUBST([IFS_SAMPLES_DIR])
+ 
 @@ -262,8 +262,8 @@
  AC_ARG_ENABLE([timer],
    [AC_HELP_STRING([--enable-timer],
@@ -160,7 +169,16 @@ diff -Nur grib_api-1.9.9.orig/configure.ac grib_api-1.9.9/configure.ac
  then
    AC_DEFINE(OMP_PACKING,1,1->OpenMP packing 0->single thread packing)
  else
-@@ -312,7 +312,7 @@
+@@ -291,8 +291,6 @@
+ if test $netcdf_dir != 'none'
+ then
+ 	with_netcdf=1
+-	CFLAGS="$CFLAGS -I${netcdf_dir}/include"
+-    LDFLAGS="$LDFLAGS -L${netcdf_dir}/lib"
+     AC_CHECK_LIB(netcdf,nc_open,netcdf_ok=1,netcdf_ok=0)
+ 	if test $netcdf_ok -eq 0
+ 	then
+@@ -312,7 +310,7 @@
  AC_ARG_ENABLE([jpeg],
    [AC_HELP_STRING([--disable-jpeg],
                    [disable jpeg 2000 for grib 2 decoding/encoding])],
@@ -169,16 +187,35 @@ diff -Nur grib_api-1.9.9.orig/configure.ac grib_api-1.9.9/configure.ac
  
  AC_ARG_WITH([jasper],
          [AC_HELP_STRING([--with-jasper=JASPER],
-@@ -342,7 +342,7 @@
-   LDFLAGS="$LDFLAGS -L${openjpeg_dir}/lib"
- fi
- 
+@@ -322,12 +320,6 @@
+ JASPER_DIR=$jasper_dir
+ AC_SUBST(JASPER_DIR)
+ 
+-if test $jasper_dir != 'system'
+-then
+-  CFLAGS="$CFLAGS -I${jasper_dir}/include"
+-  LDFLAGS="$LDFLAGS -L${jasper_dir}/lib"
+-fi
+-
+ AC_ARG_WITH([openjpeg],
+         [AC_HELP_STRING([--with-openjpeg=OPENJPEG],
+ 	    [use specified openjpeg installation directory])],
+@@ -336,13 +328,7 @@
+ OPENJPEG_DIR=$openjpeg_dir
+ AC_SUBST(OPENJPEG_DIR)
+ 
+-if test $openjpeg_dir != 'system'
+-then
+-  CFLAGS="$CFLAGS -I${openjpeg_dir}/include"
+-  LDFLAGS="$LDFLAGS -L${openjpeg_dir}/lib"
+-fi
+-
 -if test $without_jpeg -ne 1
 +if test x"$with_jpeg" = x"yes"
  then
      AC_DEFINE(HAVE_JPEG,1,JPEG enabled)
      AC_CHECK_LIB(jasper,jas_stream_memopen,jasper_ok=1,jasper_ok=0)
-@@ -429,9 +429,9 @@
+@@ -429,9 +415,9 @@
  AC_ARG_ENABLE([install-system-perl],
          [AC_HELP_STRING([--enable-install-system-perl],
  		                [perl modules will install in the standard perl installation ])],
@@ -190,7 +227,7 @@ diff -Nur grib_api-1.9.9.orig/configure.ac grib_api-1.9.9/configure.ac
  then
      PERL_INSTALL_OPTIONS=""
  fi
-@@ -461,7 +461,7 @@
+@@ -461,7 +447,7 @@
  builddir=`pwd`
  
  dnl Options to pass when configuring Perl grib_api
@@ -200,8 +237,8 @@ diff -Nur grib_api-1.9.9.orig/configure.ac grib_api-1.9.9/configure.ac
  AC_ARG_WITH([perl-options],
    [AC_HELP_STRING([--with-perl-options=[OPTIONS]], [options to pass on command-line when
 diff -Nur grib_api-1.9.9.orig/definitions/installDefinitions.sh grib_api-1.9.9/definitions/installDefinitions.sh
---- grib_api-1.9.9.orig/definitions/installDefinitions.sh	2010-05-10 16:25:15.000000000 +0100
-+++ grib_api-1.9.9/definitions/installDefinitions.sh	2011-03-08 17:20:10.000000000 +0000
+--- grib_api-1.9.9.orig/definitions/installDefinitions.sh	2012-02-27 17:41:54.000000000 +0000
++++ grib_api-1.9.9/definitions/installDefinitions.sh	2012-02-27 17:42:14.000000000 +0000
 @@ -44,7 +44,7 @@
  echo checking definition files compatibility...
  for file in `find . -name '*.def' -print`
@@ -212,8 +249,8 @@ diff -Nur grib_api-1.9.9.orig/definitions/installDefinitions.sh grib_api-1.9.9/d
  if [ $? != 0 ]
  then
 diff -Nur grib_api-1.9.9.orig/examples/C/Makefile.am grib_api-1.9.9/examples/C/Makefile.am
---- grib_api-1.9.9.orig/examples/C/Makefile.am	2010-09-15 16:12:55.000000000 +0100
-+++ grib_api-1.9.9/examples/C/Makefile.am	2011-03-08 17:20:10.000000000 +0000
+--- grib_api-1.9.9.orig/examples/C/Makefile.am	2012-02-27 17:41:54.000000000 +0000
++++ grib_api-1.9.9/examples/C/Makefile.am	2012-02-27 17:42:14.000000000 +0000
 @@ -30,7 +30,7 @@
  
  INCLUDES =  -I$(top_builddir)/src
@@ -224,8 +261,8 @@ diff -Nur grib_api-1.9.9.orig/examples/C/Makefile.am grib_api-1.9.9/examples/C/M
  
  EXTRA_DIST =$(TESTS) include.sh
 diff -Nur grib_api-1.9.9.orig/examples/F90/Makefile.am grib_api-1.9.9/examples/F90/Makefile.am
---- grib_api-1.9.9.orig/examples/F90/Makefile.am	2010-04-01 10:21:30.000000000 +0100
-+++ grib_api-1.9.9/examples/F90/Makefile.am	2011-03-08 17:20:10.000000000 +0000
+--- grib_api-1.9.9.orig/examples/F90/Makefile.am	2012-02-27 17:41:54.000000000 +0000
++++ grib_api-1.9.9/examples/F90/Makefile.am	2012-02-27 17:42:14.000000000 +0000
 @@ -37,7 +37,7 @@
  
  AM_FCFLAGS = $(F90_MODULE_FLAG)$(top_builddir)/fortran
@@ -236,8 +273,8 @@ diff -Nur grib_api-1.9.9.orig/examples/F90/Makefile.am grib_api-1.9.9/examples/F
  
  EXTRA_DIST =$(TESTS) include.sh
 diff -Nur grib_api-1.9.9.orig/examples/python/include.sh grib_api-1.9.9/examples/python/include.sh
---- grib_api-1.9.9.orig/examples/python/include.sh	2011-02-17 11:24:13.000000000 +0000
-+++ grib_api-1.9.9/examples/python/include.sh	2011-03-08 17:20:10.000000000 +0000
+--- grib_api-1.9.9.orig/examples/python/include.sh	2012-02-27 17:41:54.000000000 +0000
++++ grib_api-1.9.9/examples/python/include.sh	2012-02-27 17:42:14.000000000 +0000
 @@ -14,6 +14,8 @@
  
  PYTHONPATH=$cpath/python:$PYTHONPATH
@@ -248,8 +285,8 @@ diff -Nur grib_api-1.9.9.orig/examples/python/include.sh grib_api-1.9.9/examples
  set -u
  
 diff -Nur grib_api-1.9.9.orig/examples/python/Makefile.am grib_api-1.9.9/examples/python/Makefile.am
---- grib_api-1.9.9.orig/examples/python/Makefile.am	2011-02-17 11:24:13.000000000 +0000
-+++ grib_api-1.9.9/examples/python/Makefile.am	2011-03-08 17:20:10.000000000 +0000
+--- grib_api-1.9.9.orig/examples/python/Makefile.am	2012-02-27 17:41:54.000000000 +0000
++++ grib_api-1.9.9/examples/python/Makefile.am	2012-02-27 17:42:14.000000000 +0000
 @@ -10,7 +10,7 @@
  iterator_SOURCES = iterator.c
  count_messages_SOURCES = count_messages.c
@@ -260,8 +297,8 @@ diff -Nur grib_api-1.9.9.orig/examples/python/Makefile.am grib_api-1.9.9/example
  
  EXTRA_DIST = $(TESTS) include.sh clone.py count_messages.py get.py index.py iterator.py keys_iterator.py multi_write.py nearest.py print_data.py samples.py set.py set_missing.py binary_message.py set_pv.py
 diff -Nur grib_api-1.9.9.orig/fortran/Makefile.am grib_api-1.9.9/fortran/Makefile.am
---- grib_api-1.9.9.orig/fortran/Makefile.am	2009-11-24 11:51:52.000000000 +0000
-+++ grib_api-1.9.9/fortran/Makefile.am	2011-03-08 17:20:10.000000000 +0000
+--- grib_api-1.9.9.orig/fortran/Makefile.am	2012-02-27 17:41:54.000000000 +0000
++++ grib_api-1.9.9/fortran/Makefile.am	2012-02-27 17:42:14.000000000 +0000
 @@ -2,14 +2,14 @@
  
  AM_CFLAGS =  @WARN_PEDANTIC@
@@ -292,8 +329,8 @@ diff -Nur grib_api-1.9.9.orig/fortran/Makefile.am grib_api-1.9.9/fortran/Makefil
  #noinst_HEADERS = 
  
 diff -Nur grib_api-1.9.9.orig/perl/GRIB-API/Makefile.PL.in grib_api-1.9.9/perl/GRIB-API/Makefile.PL.in
---- grib_api-1.9.9.orig/perl/GRIB-API/Makefile.PL.in	2009-11-24 11:51:53.000000000 +0000
-+++ grib_api-1.9.9/perl/GRIB-API/Makefile.PL.in	2011-03-08 17:20:10.000000000 +0000
+--- grib_api-1.9.9.orig/perl/GRIB-API/Makefile.PL.in	2012-02-27 17:41:54.000000000 +0000
++++ grib_api-1.9.9/perl/GRIB-API/Makefile.PL.in	2012-02-27 17:42:14.000000000 +0000
 @@ -19,5 +19,5 @@
      INC               => '-I@GRIB_API_INC@', # e.g., '-I. -I/usr/include/other'
  	# Un-comment this if you add C files to link with later:
@@ -302,8 +339,8 @@ diff -Nur grib_api-1.9.9.orig/perl/GRIB-API/Makefile.PL.in grib_api-1.9.9/perl/G
 +	depend           => { "API.o" => "../../src/libgrib_api.la" }
  );
 diff -Nur grib_api-1.9.9.orig/perl/Makefile.am grib_api-1.9.9/perl/Makefile.am
---- grib_api-1.9.9.orig/perl/Makefile.am	2010-03-19 11:25:53.000000000 +0000
-+++ grib_api-1.9.9/perl/Makefile.am	2011-03-08 17:20:10.000000000 +0000
+--- grib_api-1.9.9.orig/perl/Makefile.am	2012-02-27 17:41:54.000000000 +0000
++++ grib_api-1.9.9/perl/Makefile.am	2012-02-27 17:42:14.000000000 +0000
 @@ -16,10 +16,10 @@
  $(PERLMAKEFILE): $(PERLMAKEMAKER)
  	cd $(API_DIR) && @PERL@ Makefile.PL @PERL_INSTALL_OPTIONS@ @PERL_MAKE_OPTIONS@ @PERL_LD_OPTIONS@ 
@@ -317,9 +354,21 @@ diff -Nur grib_api-1.9.9.orig/perl/Makefile.am grib_api-1.9.9/perl/Makefile.am
  	cd $(top_builddir)/src  && $(MAKE)
  
  install-exec-perl: $(PERLMAKEFILE)
+diff -Nur grib_api-1.9.9.orig/python/Makefile.am grib_api-1.9.9/python/Makefile.am
+--- grib_api-1.9.9.orig/python/Makefile.am	2012-02-27 17:41:54.000000000 +0000
++++ grib_api-1.9.9/python/Makefile.am	2012-02-27 17:56:09.000000000 +0000
+@@ -23,7 +23,7 @@
+ 			swig_wrap_numpy.py
+ 
+ # What I want installed
+-pdir = $(libdir)/python$(PYTHON_VERSION)/site-packages/grib_api
++pdir = $(libdir)/python$(PYTHON_VERSION)/site-packages
+ p_DATA = \
+ 	_gribapi_swig.so \
+ 	gribapi.py \
 diff -Nur grib_api-1.9.9.orig/python/setup.py.in grib_api-1.9.9/python/setup.py.in
---- grib_api-1.9.9.orig/python/setup.py.in	2010-10-08 16:00:49.000000000 +0100
-+++ grib_api-1.9.9/python/setup.py.in	2011-03-08 17:20:10.000000000 +0000
+--- grib_api-1.9.9.orig/python/setup.py.in	2012-02-27 17:41:54.000000000 +0000
++++ grib_api-1.9.9/python/setup.py.in	2012-02-27 17:42:14.000000000 +0000
 @@ -17,7 +17,8 @@
  build_dir = '@BUILD_DIR@'
  add_attribute(
@@ -331,8 +380,8 @@ diff -Nur grib_api-1.9.9.orig/python/setup.py.in grib_api-1.9.9/python/setup.py.
  
  with_jasper = '@LIB_JASPER@'
 diff -Nur grib_api-1.9.9.orig/src/extrules.am grib_api-1.9.9/src/extrules.am
---- grib_api-1.9.9.orig/src/extrules.am	2010-10-05 11:21:12.000000000 +0100
-+++ grib_api-1.9.9/src/extrules.am	2011-03-08 17:20:10.000000000 +0000
+--- grib_api-1.9.9.orig/src/extrules.am	2012-02-27 17:41:54.000000000 +0000
++++ grib_api-1.9.9/src/extrules.am	2012-02-27 17:42:14.000000000 +0000
 @@ -9,7 +9,7 @@
  	cmp ../python/grib_errors.h grib_errors.h.new || (p4 edit ../python/grib_errors.h ; cp grib_errors.h.new ../python/grib_errors.h)
  
@@ -343,8 +392,8 @@ diff -Nur grib_api-1.9.9.orig/src/extrules.am grib_api-1.9.9/src/extrules.am
  
  templates:
 diff -Nur grib_api-1.9.9.orig/src/Makefile.am grib_api-1.9.9/src/Makefile.am
---- grib_api-1.9.9.orig/src/Makefile.am	2011-02-04 14:38:58.000000000 +0000
-+++ grib_api-1.9.9/src/Makefile.am	2011-03-08 17:20:10.000000000 +0000
+--- grib_api-1.9.9.orig/src/Makefile.am	2012-02-27 17:41:54.000000000 +0000
++++ grib_api-1.9.9/src/Makefile.am	2012-02-27 17:42:14.000000000 +0000
 @@ -7,10 +7,10 @@
  #  -DYYDEBUG
  
@@ -358,7 +407,7 @@ diff -Nur grib_api-1.9.9.orig/src/Makefile.am grib_api-1.9.9/src/Makefile.am
  	action.c \
           action_class_alias.c \
           action_class_gen.c \
-@@ -142,7 +142,6 @@
+@@ -143,7 +143,6 @@
             grib_accessor_class_spectral_truncation.c \
             grib_accessor_class_time.c \
             grib_accessor_class_transient.c \
@@ -366,7 +415,7 @@ diff -Nur grib_api-1.9.9.orig/src/Makefile.am grib_api-1.9.9/src/Makefile.am
             grib_accessor_class_values.c \
  		   grib_accessor_class_simple_packing_error.c \
             grib_accessor_class_data_simple_packing.c \
-@@ -285,10 +284,10 @@
+@@ -286,10 +285,10 @@
  
  libgrib_api_extra_prototypes = grib_bits_any_endian.c grib_bits_any_endian_simple.c
  
@@ -380,7 +429,7 @@ diff -Nur grib_api-1.9.9.orig/src/Makefile.am grib_api-1.9.9/src/Makefile.am
  
  
  # set the include path
-@@ -296,7 +295,7 @@
+@@ -297,7 +296,7 @@
  
  ## Make sure these will be cleaned even when they're not built by
  ## default.
@@ -390,8 +439,8 @@ diff -Nur grib_api-1.9.9.orig/src/Makefile.am grib_api-1.9.9/src/Makefile.am
  
  noinst_HEADERS = grib_api_internal.h \
 diff -Nur grib_api-1.9.9.orig/tests/definitions.sh grib_api-1.9.9/tests/definitions.sh
---- grib_api-1.9.9.orig/tests/definitions.sh	2010-06-17 15:00:13.000000000 +0100
-+++ grib_api-1.9.9/tests/definitions.sh	2011-03-08 17:20:10.000000000 +0000
+--- grib_api-1.9.9.orig/tests/definitions.sh	2012-02-27 17:41:54.000000000 +0000
++++ grib_api-1.9.9/tests/definitions.sh	2012-02-27 17:42:14.000000000 +0000
 @@ -15,6 +15,6 @@
  
  for file in `find $GRIB_DEFINITION_PATH -name '*.def' -print`
@@ -401,8 +450,8 @@ diff -Nur grib_api-1.9.9.orig/tests/definitions.sh grib_api-1.9.9/tests/definiti
  done
  
 diff -Nur grib_api-1.9.9.orig/tests/Makefile.am grib_api-1.9.9/tests/Makefile.am
---- grib_api-1.9.9.orig/tests/Makefile.am	2010-12-02 14:54:51.000000000 +0000
-+++ grib_api-1.9.9/tests/Makefile.am	2011-03-08 17:20:10.000000000 +0000
+--- grib_api-1.9.9.orig/tests/Makefile.am	2012-02-27 17:41:54.000000000 +0000
++++ grib_api-1.9.9/tests/Makefile.am	2012-02-27 17:42:14.000000000 +0000
 @@ -31,7 +31,7 @@
  	 gribex_perf_SOURCES = gribex_perf.c
  	 gribex_perf_SOURCES = gauss_sub.c
@@ -413,8 +462,8 @@ diff -Nur grib_api-1.9.9.orig/tests/Makefile.am grib_api-1.9.9/tests/Makefile.am
       INCLUDES   = -I$(top_builddir)/src
  
 diff -Nur grib_api-1.9.9.orig/tigge/Makefile.am grib_api-1.9.9/tigge/Makefile.am
---- grib_api-1.9.9.orig/tigge/Makefile.am	2010-02-17 16:53:55.000000000 +0000
-+++ grib_api-1.9.9/tigge/Makefile.am	2011-03-08 17:20:10.000000000 +0000
+--- grib_api-1.9.9.orig/tigge/Makefile.am	2012-02-27 17:41:54.000000000 +0000
++++ grib_api-1.9.9/tigge/Makefile.am	2012-02-27 17:42:14.000000000 +0000
 @@ -12,5 +12,5 @@
  
  INCLUDES =  -I$(top_builddir)/src
@@ -423,8 +472,8 @@ diff -Nur grib_api-1.9.9.orig/tigge/Makefile.am grib_api-1.9.9/tigge/Makefile.am
 +LDADD = $(top_builddir)/src/libgrib_api.la
  DEPENDENCIES = $(LDADD)
 diff -Nur grib_api-1.9.9.orig/tools/Makefile.am grib_api-1.9.9/tools/Makefile.am
---- grib_api-1.9.9.orig/tools/Makefile.am	2011-01-31 16:33:49.000000000 +0000
-+++ grib_api-1.9.9/tools/Makefile.am	2011-03-08 17:22:25.000000000 +0000
+--- grib_api-1.9.9.orig/tools/Makefile.am	2012-02-27 17:41:54.000000000 +0000
++++ grib_api-1.9.9/tools/Makefile.am	2012-02-27 17:42:14.000000000 +0000
 @@ -3,9 +3,9 @@
  
  AM_YFLAGS = -d
diff --git a/sci-libs/grib_api/grib_api-1.9.9.ebuild b/sci-libs/grib_api/grib_api-1.9.9-r1.ebuild
similarity index 84%
rename from sci-libs/grib_api/grib_api-1.9.9.ebuild
rename to sci-libs/grib_api/grib_api-1.9.9-r1.ebuild
index fe5c89f6dc52..c821d963d15d 100644
--- a/sci-libs/grib_api/grib_api-1.9.9.ebuild
+++ b/sci-libs/grib_api/grib_api-1.9.9-r1.ebuild
@@ -1,8 +1,8 @@
-# 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/sci-libs/grib_api/grib_api-1.9.9.ebuild,v 1.3 2011/12/21 07:55:03 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/grib_api/grib_api-1.9.9-r1.ebuild,v 1.1 2012/02/27 18:18:19 bicatali Exp $
 
-EAPI=3
+EAPI=4
 inherit eutils autotools
 
 #MYP=${P}_libtool
@@ -29,9 +29,6 @@ src_prepare() {
 	epatch \
 		"${FILESDIR}"/${P}-ieeefloat.patch \
 		"${FILESDIR}"/${P}-autotools.patch
-	sed \
-		-e '/LDFLAGS=/d' \
-		-i configure.ac || die
 	eautoreconf
 }
 
@@ -62,14 +59,11 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install  || die "emake install failed"
-	dodoc AUTHORS ChangeLog README
-	if use doc; then
-		dohtml html/* || die
-	fi
+	default
+	use doc && dohtml html/*
 	if use examples; then
 		insinto /usr/share/doc/${PF}/examples
 		emake clean
-		doins -r * || die
+		doins -r *
 	fi
 }
diff --git a/sci-libs/mathgl/mathgl-1.11.1.1.ebuild b/sci-libs/mathgl/mathgl-1.11.1.1.ebuild
index 7909077ba2db..2e30815f8734 100644
--- a/sci-libs/mathgl/mathgl-1.11.1.1.ebuild
+++ b/sci-libs/mathgl/mathgl-1.11.1.1.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/mathgl/mathgl-1.11.1.1.ebuild,v 1.1 2011/03/29 15:42:35 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/mathgl/mathgl-1.11.1.1.ebuild,v 1.2 2012/02/28 00:56:32 patrick Exp $
 
 EAPI=3
 
 WX_GTK_VER=2.8
 PYTHON_DEPEND="2"
 SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
+RESTRICT_PYTHON_ABIS="3.* 2.7-pypy-* *-jython"
 
 inherit autotools wxwidgets python versionator toolchain-funcs
 
diff --git a/sci-libs/mathgl/mathgl-1.11.2.ebuild b/sci-libs/mathgl/mathgl-1.11.2.ebuild
index a6208f615719..790c191efc87 100644
--- a/sci-libs/mathgl/mathgl-1.11.2.ebuild
+++ b/sci-libs/mathgl/mathgl-1.11.2.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/mathgl/mathgl-1.11.2.ebuild,v 1.2 2011/08/09 08:49:44 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/mathgl/mathgl-1.11.2.ebuild,v 1.3 2012/02/28 00:56:32 patrick Exp $
 
 EAPI=3
 
 WX_GTK_VER=2.8
 PYTHON_DEPEND="2"
 SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
+RESTRICT_PYTHON_ABIS="3.* 2.7-pypy-* *-jython"
 
 inherit autotools eutils wxwidgets python versionator toolchain-funcs
 
diff --git a/sci-libs/vtk/vtk-5.8.0.ebuild b/sci-libs/vtk/vtk-5.8.0.ebuild
index e579b90acf01..497d744541d9 100644
--- a/sci-libs/vtk/vtk-5.8.0.ebuild
+++ b/sci-libs/vtk/vtk-5.8.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/sci-libs/vtk/vtk-5.8.0.ebuild,v 1.6 2012/02/13 14:12:34 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.8.0.ebuild,v 1.7 2012/02/27 22:58:06 jlec Exp $
 
 EAPI=3
 
@@ -176,6 +176,8 @@ src_configure() {
 
 	if use python; then
 		mycmakeargs+=(
+			-DPYTHON_INCLUDE_DIR="${EPREFIX}"$(python_get_includedir)
+			-DPYTHON_LIBRARY="${EPREFIX}$(python_get_library)"
 			-DVTK_WRAP_PYTHON=ON
 			-DVTK_WRAP_PYTHON_SIP=ON
 			-DSIP_PYQT_DIR="${EPREFIX}/usr/share/sip"
diff --git a/sci-mathematics/glpk/glpk-4.45.ebuild b/sci-mathematics/glpk/glpk-4.45.ebuild
index f20e0f64dc0a..ae00c0d012c7 100644
--- a/sci-mathematics/glpk/glpk-4.45.ebuild
+++ b/sci-mathematics/glpk/glpk-4.45.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/glpk/glpk-4.45.ebuild,v 1.7 2012/02/05 14:27:15 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/glpk/glpk-4.45.ebuild,v 1.8 2012/02/27 17:40:54 ranger Exp $
 
 EAPI=2
 inherit flag-o-matic
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 SLOT="0"
 IUSE="doc examples gmp odbc mysql static-libs"
-KEYWORDS="alpha amd64 hppa ~ppc ~ppc64 sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 hppa ppc ~ppc64 sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux"
 
 RDEPEND="sys-libs/zlib
 	odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) )
diff --git a/sci-mathematics/octave/Manifest b/sci-mathematics/octave/Manifest
index 99fcfef3b70d..595ebce7f477 100644
--- a/sci-mathematics/octave/Manifest
+++ b/sci-mathematics/octave/Manifest
@@ -1,3 +1,4 @@
 DIST octave-3.2.4.tar.bz2 12080959 RMD160 6dcdea7ef2431b8427da5e6b9d2113e0e5736f43 SHA1 7de078564027108f3436f3ba7bf5993a6b411a67 SHA256 48471d05c7ed9c0a5a4d5fa4ae8a857447ac3da1197f86cfe79b9d8f4fdfd147
 DIST octave-3.4.3.tar.bz2 15085117 RMD160 d6f43fca9097b40f163c140db853d8ac1383ab39 SHA1 fe622c28a38f8730c59e46211bc7b18e7f51a679 SHA256 94d119cc93a38465e9c00dd36b9cc063abbda7ae8cb39407cf88a2bddc9dc148
 DIST octave-3.6.0.tar.bz2 15290924 RMD160 4b19537670b7421942eb350320b4d3e6fda8fd1d SHA1 62116e090d257a601e9d605f969dd87b7de1ffce SHA256 e597737c7fe1a03d4c0ccbf27bbd821ec17aa2367d83e931abcbfdb6d62d92d7
+DIST octave-3.6.1.tar.bz2 15387369 RMD160 e57ff05ee14cce60de781233c1b4e6febef89416 SHA1 46fdc0b3d7db1b0266975a7443e26769c939a9c7 SHA256 f8073ee7570d8ff78864868027ef1e08409a78e0798d8800fac67e7e714eadf6
diff --git a/sci-mathematics/octave/octave-3.6.1.ebuild b/sci-mathematics/octave/octave-3.6.1.ebuild
new file mode 100644
index 000000000000..e5f6c86157ec
--- /dev/null
+++ b/sci-mathematics/octave/octave-3.6.1.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-3.6.1.ebuild,v 1.1 2012/02/27 18:27:27 bicatali Exp $
+
+EAPI=4
+
+AUTOTOOLS_AUTORECONF=yes
+inherit autotools-utils toolchain-funcs
+
+DESCRIPTION="High-level interactive language for numerical computations"
+LICENSE="GPL-3"
+HOMEPAGE="http://www.octave.org/"
+SRC_URI="ftp://ftp.gnu.org/pub/gnu/${PN}/${P}.tar.bz2"
+
+SLOT="0"
+IUSE="curl doc fftw +glpk gnuplot +imagemagick opengl +qhull +qrupdate
+	readline +sparse static-libs X zlib"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="dev-libs/libpcre
+	app-text/ghostscript-gpl
+	sys-libs/ncurses
+	virtual/lapack
+	curl? ( net-misc/curl )
+	fftw? ( sci-libs/fftw:3.0 )
+	glpk? ( sci-mathematics/glpk )
+	gnuplot? ( sci-visualization/gnuplot )
+	imagemagick? ( || (
+			media-gfx/graphicsmagick[cxx]
+			media-gfx/imagemagick[cxx] ) )
+	opengl? (
+		media-libs/freetype:2
+		media-libs/fontconfig
+		>=x11-libs/fltk-1.3:1[opengl] )
+	qhull? ( media-libs/qhull )
+	qrupdate? ( sci-libs/qrupdate )
+	readline? ( sys-libs/readline )
+	sparse? (
+		sci-libs/arpack
+		sci-libs/camd
+		sci-libs/ccolamd
+		sci-libs/cholmod
+		sci-libs/colamd
+		sci-libs/cxsparse
+		sci-libs/umfpack )
+	X? ( x11-libs/libX11 )
+	zlib? ( sys-libs/zlib )"
+
+DEPEND="${RDEPEND}
+	doc? (
+		virtual/latex-base
+		dev-texlive/texlive-genericrecommended
+		sys-apps/texinfo )
+	dev-util/gperf
+	dev-util/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${PN}-3.4.3-{pkgbuilddir,help,texi}.patch )
+
+src_configure() {
+	# occasional fail on install, force regeneration  see bug #401189
+	rm -f doc/interpreter/contributors.texi || die
+
+	# hdf5 disabled because not really useful (bug #299876)
+	local myconf="--without-magick"
+	if use imagemagick; then
+		if has_version media-gfx/graphicsmagick[cxx]; then
+			myconf="--with-magick=GraphicsMagick"
+		else
+			myconf="--with-magick=ImageMagick"
+		fi
+	fi
+
+	myeconfargs+=(
+		--localstatedir="${EPREFIX}/var/state/octave"
+		--without-hdf5
+		--with-blas="$(pkg-config --libs blas)"
+		--with-lapack="$(pkg-config --libs lapack)"
+		$(use_enable doc docs)
+		$(use_enable readline)
+		$(use_with curl)
+		$(use_with fftw fftw3)
+		$(use_with fftw fftw3f)
+		$(use_with glpk)
+		$(use_with opengl)
+		$(use_with qhull)
+		$(use_with qrupdate)
+		$(use_with sparse arpack)
+		$(use_with sparse umfpack)
+		$(use_with sparse colamd)
+		$(use_with sparse ccolamd)
+		$(use_with sparse cholmod)
+		$(use_with sparse cxsparse)
+		$(use_with X x)
+		$(use_with zlib z)
+		${myconf}
+	)
+	autotools-utils_src_configure
+}
+
+src_install() {
+	autotools-utils_src_install
+	use doc && dodoc $(find doc -name \*.pdf)
+	[[ -e test/fntests.log ]] && dodoc test/fntests.log
+	echo "LDPATH=${EPREFIX}/usr/$(get_libdir)/${P}" > 99octave
+	doenvd 99octave
+}
diff --git a/sys-cluster/keepalived/Manifest b/sys-cluster/keepalived/Manifest
index 702fac52f96e..cbc09b88f195 100644
--- a/sys-cluster/keepalived/Manifest
+++ b/sys-cluster/keepalived/Manifest
@@ -1 +1,2 @@
 DIST keepalived-1.2.2.tar.gz 249557 RMD160 a24f2fd97007c331daf9f2c2b1608eb727780552 SHA1 52a6d46823d29791d10f8869face64b6c6df5616 SHA256 4c05dbd149af120506b4f3a66b4016e30d9ad112e4c26a602e28c366705de8c0
+DIST keepalived_1.2.2-3.diff.gz 9856 RMD160 243c86f00f22dacffe0d2c46c413ee5f59f7f298 SHA1 9c1885da7d8b85a12a3768dece422e5d1e5b61b4 SHA256 104213b98e80c5de7c04ff0a409b88c6aad30f727516f26871fa77dcbdc74aa6
diff --git a/sys-cluster/keepalived/files/conf-keepalived b/sys-cluster/keepalived/files/conf-keepalived
new file mode 100644
index 000000000000..f1261e3753c9
--- /dev/null
+++ b/sys-cluster/keepalived/files/conf-keepalived
@@ -0,0 +1,7 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/keepalived/files/conf-keepalived,v 1.1 2012/02/28 02:31:56 robbat2 Exp $
+
+# Keepalived options
+# Increase logging:
+#opts="-D"
diff --git a/sys-cluster/keepalived/files/init-keepalived b/sys-cluster/keepalived/files/init-keepalived
index c7b34c3a260f..a3f9db9ffee8 100644
--- a/sys-cluster/keepalived/files/init-keepalived
+++ b/sys-cluster/keepalived/files/init-keepalived
@@ -1,16 +1,20 @@
 #!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/keepalived/files/init-keepalived,v 1.4 2007/04/30 06:45:49 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/keepalived/files/init-keepalived,v 1.5 2012/02/28 02:31:56 robbat2 Exp $
 
 depend() {
 	use logger
-	need net
+	# The interfaces do not actually need to exist to start, it handles them gracefully.
+	use net 
 }
 
+extra_commands="checkconfig"
+
 PIDFILE=/var/run/keepalived.pid
 
 checkconfig() {
+	# keepalived has a config check command, but it does not work while the daemon is running!
 	if [ ! -e /etc/keepalived/keepalived.conf ] ; then
 		eerror "You need an /etc/keepalived/keepalived.conf file to run keepalived"
 		return 1
@@ -20,7 +24,8 @@ checkconfig() {
 start() {
 	checkconfig || return 1
 	ebegin "Starting Keepalived"
-	start-stop-daemon --start --quiet --pidfile $PIDFILE --exec /usr/sbin/keepalived
+	start-stop-daemon --start --quiet --pidfile $PIDFILE \
+		--exec /usr/sbin/keepalived -- $opts
 	eend $?
 }
 
diff --git a/sys-cluster/keepalived/keepalived-1.2.2-r3.ebuild b/sys-cluster/keepalived/keepalived-1.2.2-r3.ebuild
new file mode 100644
index 000000000000..f9e581a70555
--- /dev/null
+++ b/sys-cluster/keepalived/keepalived-1.2.2-r3.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/keepalived/keepalived-1.2.2-r3.ebuild,v 1.1 2012/02/28 02:31:56 robbat2 Exp $
+
+EAPI=4
+
+inherit autotools base
+
+DESCRIPTION="A strong & robust keepalive facility to the Linux Virtual Server project"
+HOMEPAGE="http://www.keepalived.org/"
+DEBIAN_PATCH=3
+DEBIAN_A="${P/-/_}-${DEBIAN_PATCH}.diff.gz"
+SRC_URI="http://www.keepalived.org/software/${P}.tar.gz
+		mirror://debian/pool/main/${PN:0:1}/${PN}/${DEBIAN_A}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="debug"
+
+RDEPEND="dev-libs/popt
+	sys-apps/iproute2
+	dev-libs/libnl:1.1
+	dev-libs/openssl"
+DEPEND="${RDEPEND}
+	>=sys-kernel/linux-headers-2.6.30"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.1.20-do-not-need-kernel-sources.patch "${FILESDIR}"/${PN}-1.2.2-bind-afunspec.patch )
+
+DOCS=( README CONTRIBUTORS INSTALL VERSION ChangeLog AUTHOR TODO doc/keepalived.conf.SYNOPSIS )
+
+src_prepare() {
+	base_src_prepare
+	EPATCH_OPTS="-p1" epatch "${DISTDIR}"/"${DEBIAN_A}"
+	epatch "${S}"/debian/patches/*patch
+	eautoreconf
+}
+
+src_configure() {
+	STRIP=/bin/true \
+	econf \
+		--enable-vrrp \
+		$(use_enable debug)
+}
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}"/init-keepalived keepalived
+	newconfd "${FILESDIR}"/conf-keepalived keepalived
+
+	docinto genhash
+	dodoc genhash/README genhash/AUTHOR genhash/ChangeLog genhash/VERSION || die
+	# This was badly named by upstream, it's more HOWTO than anything else.
+	newdoc INSTALL INSTALL+HOWTO
+
+	# Security risk to bundle SSL certs
+	rm -f "${ED}"/etc/keepalived/samples/*.pem
+	# Clean up sysvinit files
+	rm -rf "${ED}"/etc/sysconfig "${ED}"/etc/rc.d/
+}
diff --git a/sys-devel/crossdev/Manifest b/sys-devel/crossdev/Manifest
index 5c6d2fa3a16b..700ba295deeb 100644
--- a/sys-devel/crossdev/Manifest
+++ b/sys-devel/crossdev/Manifest
@@ -8,3 +8,4 @@ DIST crossdev-20111018.tar.xz 19408 RMD160 114991da5ddbb25f1fb677914ec3b73007f95
 DIST crossdev-20111118.tar.xz 19268 RMD160 bf0fc0356d4f9839e93beb4249e4d6da2306ebe5 SHA1 9b9145bcdd77823328793d0f62a06072943edcd8 SHA256 75701ba4398213919bfaf806abba5f913dc7a6fbfc4a40cf8d24f3de29221c41
 DIST crossdev-20111221.tar.xz 19360 RMD160 0ad87011d92cf4fc85e471c8f9526d4ed0242e3d SHA1 4d3c319c656e2019ad842a1a3b15bce464278153 SHA256 0f683fdd9898c080f807841850983e0cafe5d2fb97d508397e02f6826b7ec1c4
 DIST crossdev-20120214.tar.xz 19796 RMD160 114c1ef1c6b7c35cca5885ae9775a4c1518333a4 SHA1 2f4e35ec09b21e5948b7d4b2a2ed2cd3a13438d9 SHA256 9e1b4bbfcd97f8cc1c0d0c3d4b6f9671728c78db787a7f4cb649a494e93cb82a
+DIST crossdev-20120227.tar.xz 20244 RMD160 4bc3fc31d967ee075f2dec33293fce45dabccac0 SHA1 99eeb3955f675f86f0a88e9245fff514394e043e SHA256 86bf155d47934e9548ad7c8dbd843830baef936d09c31523718355220947903a
diff --git a/sys-devel/crossdev/crossdev-20120227.ebuild b/sys-devel/crossdev/crossdev-20120227.ebuild
new file mode 100644
index 000000000000..5e848536f3b1
--- /dev/null
+++ b/sys-devel/crossdev/crossdev-20120227.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/crossdev/crossdev-20120227.ebuild,v 1.1 2012/02/28 00:19:36 vapier Exp $
+
+EAPI="4"
+
+if [[ ${PV} == "99999999" ]] ; then
+	EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/crossdev.git"
+	inherit git-2
+	SRC_URI=""
+	#KEYWORDS=""
+else
+	SRC_URI="mirror://gentoo/${P}.tar.xz
+		http://dev.gentoo.org/~vapier/dist/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+fi
+
+DESCRIPTION="Gentoo Cross-toolchain generator"
+HOMEPAGE="http://www.gentoo.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+RDEPEND=">=sys-apps/portage-2.1
+	app-shells/bash
+	!sys-devel/crossdev-wrappers"
+DEPEND="app-arch/xz-utils"
+
+src_install() {
+	default
+	if [[ "${PV}" == "99999999" ]] ; then
+		sed -i "s:@CDEVPV@:${EGIT_VERSION}:" "${ED}"/usr/bin/crossdev || die
+	fi
+}
diff --git a/sys-devel/crossdev/crossdev-99999999.ebuild b/sys-devel/crossdev/crossdev-99999999.ebuild
index 373cdcb035b0..ebdff8052a69 100644
--- a/sys-devel/crossdev/crossdev-99999999.ebuild
+++ b/sys-devel/crossdev/crossdev-99999999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/crossdev/crossdev-99999999.ebuild,v 1.5 2011/07/14 04:13:36 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/crossdev/crossdev-99999999.ebuild,v 1.6 2012/02/28 00:19:36 vapier Exp $
 
-EAPI="3"
+EAPI="4"
 
 if [[ ${PV} == "99999999" ]] ; then
 	EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/crossdev.git"
@@ -28,8 +28,8 @@ RDEPEND=">=sys-apps/portage-2.1
 DEPEND="app-arch/xz-utils"
 
 src_install() {
-	emake install DESTDIR="${D}" || die
+	default
 	if [[ "${PV}" == "99999999" ]] ; then
-		dosed "s:@CDEVPV@:${EGIT_VERSION}:" /usr/bin/crossdev || die
+		sed -i "s:@CDEVPV@:${EGIT_VERSION}:" "${ED}"/usr/bin/crossdev || die
 	fi
 }
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.42.1.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.42.1.ebuild
index d451d7b49962..80ce6ae70b1b 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.42.1.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.42.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.42.1.ebuild,v 1.1 2012/02/24 17:20:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.42.1.ebuild,v 1.2 2012/02/27 20:54:27 vapier Exp $
 
 case ${PV} in
 *_pre*) UP_PV="${PV%_pre*}-WIP-${PV#*_pre}" ;;
@@ -141,7 +141,7 @@ src_install() {
 	# /usr/lib/, and install linker scripts to /usr/lib/.
 	gen_usr_ldscript -a e2p ext2fs
 	# configure doesn't have an option to disable static libs :/
-	find "${D}" -name '*.a' -delete
+	use static-libs || find "${D}" -name '*.a' -delete
 
 	if use elibc_FreeBSD ; then
 		# Install helpers for us
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.42.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.42.ebuild
index 9b1e717f9d4d..c8f8af9fd509 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.42.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.42.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/e2fsprogs/e2fsprogs-1.42.ebuild,v 1.5 2012/02/22 18:40:56 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.42.ebuild,v 1.6 2012/02/27 20:54:27 vapier Exp $
 
 case ${PV} in
 *_pre*) UP_PV="${PV%_pre*}-WIP-${PV#*_pre}" ;;
@@ -137,7 +137,7 @@ src_install() {
 	# /usr/lib/, and install linker scripts to /usr/lib/.
 	gen_usr_ldscript -a e2p ext2fs
 	# configure doesn't have an option to disable static libs :/
-	find "${D}" -name '*.a' -delete
+	use static-libs || find "${D}" -name '*.a' -delete
 
 	if use elibc_FreeBSD ; then
 		# Install helpers for us
diff --git a/sys-kernel/vanilla-sources/Manifest b/sys-kernel/vanilla-sources/Manifest
index 81ff8e4c32ee..c76fb09e252c 100644
--- a/sys-kernel/vanilla-sources/Manifest
+++ b/sys-kernel/vanilla-sources/Manifest
@@ -29,3 +29,4 @@ DIST patch-3.1.9.bz2 199363 RMD160 6b1bdc6fe84060ea23bce1f03738e9dab2b5c94f SHA1
 DIST patch-3.2.2.bz2 71806 RMD160 4feba9b6b97681d660fddd0bbc9a98b032ff0d05 SHA1 9e503b4f6d00fa65a3da472373f5c0f2072b6a64 SHA256 07f4e78a4e5107ecf55e44030ddd3b177c18fc6cc9458657e9763946c9c94c0c
 DIST patch-3.2.6.bz2 123275 RMD160 3b75747323b608f0ec79b99f880c3ca30b96c24f SHA1 5ed014b62c0ebd8d9c3d20953ea5da2b88aeea4a SHA256 d23ccc8e1ab77daeb760cbcf266125e9b25f6253ee21fd051a3b2a83655d17ea
 DIST patch-3.2.7.bz2 130132 RMD160 572a184f928d2f58f5bfa13062d7c3d14707f845 SHA1 59d629be5c7acf2de644fe6a89468d6d67203420 SHA256 779c548f4418f0baa782252d15a54fadf3c88d79fc547ee5801d31798020e701
+DIST patch-3.2.8.bz2 134785 RMD160 340fc7897e2f2b57bc282322ef7c95c9ac598ee0 SHA1 83dbb2a93e827614008ff0074c95e1d5cdcdaa6b SHA256 1853d2bd4222e554fb4c2c5d818b953be9e3c658636b58a0a5b3860d23312cda
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-3.2.8.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-3.2.8.ebuild
new file mode 100644
index 000000000000..70e817b501eb
--- /dev/null
+++ b/sys-kernel/vanilla-sources/vanilla-sources-3.2.8.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/vanilla-sources/vanilla-sources-3.2.8.ebuild,v 1.1 2012/02/27 23:22:50 mpagano Exp $
+
+EAPI="2"
+K_NOUSENAME="yes"
+K_NOSETEXTRAVERSION="yes"
+K_SECURITY_UNSUPPORTED="1"
+K_DEBLOB_AVAILABLE="1"
+ETYPE="sources"
+inherit kernel-2
+detect_version
+
+DESCRIPTION="Full sources for the Linux kernel"
+HOMEPAGE="http://www.kernel.org"
+SRC_URI="${KERNEL_URI}"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="deblob"
diff --git a/sys-kernel/vserver-sources/Manifest b/sys-kernel/vserver-sources/Manifest
index 27493056484c..837c2991c7e0 100644
--- a/sys-kernel/vserver-sources/Manifest
+++ b/sys-kernel/vserver-sources/Manifest
@@ -9,4 +9,6 @@ DIST patch-3.0.7-vs2.3.1.diff 819175 RMD160 0cddcc049df6e2bdac669c8d1d0fdf9b3908
 DIST patch-3.0.7.bz2 192449 RMD160 4b67408a77db81cc6c0637d7b5218f6f5fc74953 SHA1 2034432d7c42a088da90cb644e087bf5ca3bec41 SHA256 5f2999c6c6e1d59a6b33e9ef561f43ba4f21790ca72d930d89e2eabcc69f6fd6
 DIST patch-3.2.2-vs2.3.2.6.diff 747157 RMD160 1b7dcc3328bc199fa5064ce7c418d984939fcd80 SHA1 88e6e9fa69cf6d591e77c29e6eb2cde2f5f6990c SHA256 457cce73be53a6614173934956796cee391dc5a0a7a0f4d6eb3c3b0c62736056
 DIST patch-3.2.2.bz2 71806 RMD160 4feba9b6b97681d660fddd0bbc9a98b032ff0d05 SHA1 9e503b4f6d00fa65a3da472373f5c0f2072b6a64 SHA256 07f4e78a4e5107ecf55e44030ddd3b177c18fc6cc9458657e9763946c9c94c0c
+DIST patch-3.2.7-vs2.3.2.7.diff 747681 RMD160 bca831e63e9a14f163618f1d29813be8399cba66 SHA1 27a76db20db7f21798990b5aa125f0174a283569 SHA256 0032a9a83c0cf1037b21e6539508d70a10e85292592c73f4fc849958856a526c
+DIST patch-3.2.7.bz2 130132 RMD160 572a184f928d2f58f5bfa13062d7c3d14707f845 SHA1 59d629be5c7acf2de644fe6a89468d6d67203420 SHA256 779c548f4418f0baa782252d15a54fadf3c88d79fc547ee5801d31798020e701
 DIST vserver-patches-2.6.35_2.3.0.36.32.tar.bz2 139594 RMD160 e9715b7c34806f224d1bbeee804516ff7b4e01d5 SHA1 dd984c4039384936724a61e10b3450da6b5fbf9c SHA256 4cc1ba13d6bb1491d48e53590a8abb2c0e3f2eb8f560ab74800c6cde9bf74b12
diff --git a/sys-kernel/vserver-sources/vserver-sources-2.3.2.7.ebuild b/sys-kernel/vserver-sources/vserver-sources-2.3.2.7.ebuild
new file mode 100644
index 000000000000..07e4f5d33790
--- /dev/null
+++ b/sys-kernel/vserver-sources/vserver-sources-2.3.2.7.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/vserver-sources/vserver-sources-2.3.2.7.ebuild,v 1.1 2012/02/28 04:05:04 patrick Exp $
+
+ETYPE="sources"
+CKV="3.2.7"
+
+K_USEPV=1
+K_NOSETEXTRAVERSION=1
+
+inherit kernel-2
+detect_version
+
+KEYWORDS="~amd64 ~hppa ~x86"
+IUSE=""
+
+DESCRIPTION="Full sources including Linux-VServer patchsets for the ${KV_MAJOR}.${KV_MINOR} kernel tree."
+HOMEPAGE="http://www.gentoo.org/proj/en/vps/"
+SRC_URI="${KERNEL_URI} ${ARCH_URI}
+	http://vserver.13thfloor.at/Experimental/patch-${CKV}-vs${PV}.diff"
+
+UNIPATCH_LIST="${DISTDIR}/patch-${CKV}-vs${PV}.diff"
+UNIPATCH_STRICTORDER=1
diff --git a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.1.ebuild b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.1.ebuild
index f1c9385738e0..4755a2c6ad54 100644
--- a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.1.ebuild
+++ b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.1.ebuild,v 1.1 2012/02/24 17:19:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.1.ebuild,v 1.2 2012/02/27 20:53:19 vapier Exp $
 
 case ${PV} in
 *_pre*) UP_PV="${PV%_pre*}-WIP-${PV#*_pre}" ;;
@@ -58,5 +58,5 @@ src_install() {
 	emake STRIP=: DESTDIR="${D}" install || die
 	gen_usr_ldscript -a com_err ss
 	# configure doesn't have an option to disable static libs :/
-	find "${D}" -name '*.a' -delete
+	use static-libs || find "${D}" -name '*.a' -delete
 }
diff --git a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.ebuild b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.ebuild
index 5c7082f8ac3a..8295d2b38f71 100644
--- a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.ebuild
+++ b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.ebuild,v 1.5 2012/02/22 18:40:56 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.ebuild,v 1.6 2012/02/27 20:53:19 vapier Exp $
 
 case ${PV} in
 *_pre*) UP_PV="${PV%_pre*}-WIP-${PV#*_pre}" ;;
@@ -58,5 +58,5 @@ src_install() {
 	emake STRIP=: DESTDIR="${D}" install || die
 	gen_usr_ldscript -a com_err ss
 	# configure doesn't have an option to disable static libs :/
-	find "${D}" -name '*.a' -delete
+	use static-libs || find "${D}" -name '*.a' -delete
 }
diff --git a/sys-libs/libfaketime/files/libfaketime-0.9-as-needed.patch b/sys-libs/libfaketime/files/libfaketime-0.9-as-needed.patch
new file mode 100644
index 000000000000..f90242c7e444
--- /dev/null
+++ b/sys-libs/libfaketime/files/libfaketime-0.9-as-needed.patch
@@ -0,0 +1,11 @@
+--- libfaketime-0.9/src/Makefile.orig
++++ libfaketime-0.9/src/Makefile
+@@ -69,7 +69,7 @@
+ 	${CC} -o $@ -c ${CFLAGS} ${EXTRA_FLAGS} $<
+ 
+ lib%.so.${SONAME}: %.o
+-	${CC} -o $@ -Wl,-soname,$@ ${LDFLAGS} $<
++	${CC} -o $@ -Wl,-soname,$@ $< ${LDFLAGS}
+ 
+ clean: 
+ 	@rm -f ${OBJ} ${LIBS}
diff --git a/sys-libs/libfaketime/libfaketime-0.9.ebuild b/sys-libs/libfaketime/libfaketime-0.9-r1.ebuild
similarity index 89%
rename from sys-libs/libfaketime/libfaketime-0.9.ebuild
rename to sys-libs/libfaketime/libfaketime-0.9-r1.ebuild
index e0fafb4380b0..27152ecb861d 100644
--- a/sys-libs/libfaketime/libfaketime-0.9.ebuild
+++ b/sys-libs/libfaketime/libfaketime-0.9-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-libs/libfaketime/libfaketime-0.9.ebuild,v 1.1 2012/01/15 09:06:19 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libfaketime/libfaketime-0.9-r1.ebuild,v 1.1 2012/02/27 23:54:08 radhermit Exp $
 
 EAPI=4
 
@@ -19,6 +19,7 @@ S=${WORKDIR}
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-make.patch
+	epatch "${FILESDIR}"/${P}-as-needed.patch
 }
 
 src_compile() {
diff --git a/www-apache/passenger/passenger-3.0.11-r1.ebuild b/www-apache/passenger/passenger-3.0.11-r1.ebuild
new file mode 100644
index 000000000000..4e755967d605
--- /dev/null
+++ b/www-apache/passenger/passenger-3.0.11-r1.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apache/passenger/passenger-3.0.11-r1.ebuild,v 1.1 2012/02/27 20:36:03 flameeyes Exp $
+
+EAPI=4
+USE_RUBY="ruby18 ruby19"
+
+inherit apache-module flag-o-matic ruby-ng toolchain-funcs
+
+DESCRIPTION="Passenger (a.k.a. mod_rails) makes deployment of Ruby on Rails applications a breeze"
+HOMEPAGE="http://modrails.com/"
+SRC_URI="mirror://rubyforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc"
+
+ruby_add_rdepend "
+	>=dev-ruby/daemon_controller-0.2.5
+	>=dev-ruby/rack-1.0.0"
+
+USE_RUBY="ruby18" ruby_add_rdepend ">=dev-ruby/fastthread-1.0.1"
+
+CDEPEND=">=dev-libs/libev-3.90 net-misc/curl[ssl]"
+
+RDEPEND="${RDEPEND} ${CDEPEND}"
+DEPEND="${DEPEND} ${CDEPEND}
+	doc? ( >=app-text/asciidoc-8.6.5[highlight] )"
+
+APACHE2_MOD_CONF="30_mod_${PN}-2.0.1 30_mod_${PN}"
+APACHE2_MOD_DEFINE="PASSENGER"
+
+REQUIRED_USE+="ruby_targets_ruby18? ( !ruby_targets_ruby19 )
+	ruby_targets_ruby19? ( !ruby_targets_ruby18 )"
+
+need_apache2_2
+
+pkg_setup() {
+	use debug && append-flags -DPASSENGER_DEBUG
+}
+
+all_ruby_prepare() {
+	epatch "${FILESDIR}"/${PN}-3.0.8-gentoo.patch
+	epatch "${FILESDIR}"/${PN}-3.0.0-ldflags.patch
+
+	# Change these with sed instead of a patch so that we can easily use
+	# the toolchain-funcs methods.
+	sed -i -e "s/gcc/$(tc-getCC)/" -e "s/g++/$(tc-getCXX)/" build/config.rb || die
+
+	# Use sed here so that we can dynamically set the documentation directory.
+	sed -i -e "s:/usr/share/doc/phusion-passenger:/usr/share/doc/${P}:" \
+		-e "s:/usr/lib/apache2/modules/mod_passenger.so:${APACHE_MODULESDIR}/mod_passenger.so:" \
+		-e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" \
+		lib/phusion_passenger.rb || die
+	sed -i -e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" ext/common/ResourceLocator.h || die
+
+	# Don't install a tool that won't work in our setup.
+	sed -i -e '/passenger-install-apache2-module/d' lib/phusion_passenger/packaging.rb || die
+	rm -f bin/passenger-install-apache2-module || die "Unable to remove unneeded install script."
+
+	# Make sure we use the system-provided version.
+	rm -rf ext/libev || die "Unable to remove vendored libev."
+}
+
+each_ruby_compile() {
+	append-flags -fno-strict-aliasing
+
+	APXS2="${APXS}" \
+	HTTPD="${APACHE_BIN}" \
+	USE_VENDORED_LIBEV="no" LIBEV_LIBS="-lev" \
+	rake apache2 native_support || die "rake failed"
+
+	if use doc; then
+		rake doc || die "rake doc failed"
+	fi
+}
+
+each_ruby_install() {
+	DISTDIR="${D}" \
+	APXS2="${APXS}" \
+	HTTPD="${APACHE_BIN}" \
+	USE_VENDORED_LIBEV="no" LIBEV_LIBS="-lev" \
+	rake fakeroot || die "rake failed"
+
+	# TODO: this will create a mess when multiple RUBY_TARGETS have been
+	# selected.
+	APACHE2_MOD_FILE="${S}/ext/apache2/mod_${PN}.so"
+	apache-module_src_install
+}
diff --git a/www-apps/nanoc/Manifest b/www-apps/nanoc/Manifest
new file mode 100644
index 000000000000..8863cdd2fd4c
--- /dev/null
+++ b/www-apps/nanoc/Manifest
@@ -0,0 +1 @@
+DIST nanoc-3.3.1.gem 147456 RMD160 092cceafc58324a9f2781244f1eb3089e57aae75 SHA1 7bfaa901d90afa40cb01c62c2cd235ca4d5d4cae SHA256 ec800777627de77c8f43d012781a5fa8069af83319075361f021333eda3a44d6
diff --git a/www-apps/nanoc/metadata.xml b/www-apps/nanoc/metadata.xml
new file mode 100644
index 000000000000..852136183369
--- /dev/null
+++ b/www-apps/nanoc/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>ruby</herd>
+</pkgmetadata>
diff --git a/www-apps/nanoc/nanoc-3.3.1.ebuild b/www-apps/nanoc/nanoc-3.3.1.ebuild
new file mode 100644
index 000000000000..9bf99c5226d8
--- /dev/null
+++ b/www-apps/nanoc/nanoc-3.3.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/nanoc/nanoc-3.3.1.ebuild,v 1.1 2012/02/28 01:29:25 a3li Exp $
+
+EAPI="2"
+USE_RUBY="ruby18"
+
+RUBY_FAKEGEM_EXTRADOC="ChangeLog NEWS.md README.md"
+
+RUBY_FAKEGEM_TASK_DOC="doc"
+RUBY_FAKEGEM_TASK_TEST="test"
+
+inherit ruby-fakegem
+
+DESCRIPTION="nanoc is a simple but very flexible static site generator written in Ruby."
+HOMEPAGE="http://nanoc.stoneship.org/"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="${IUSE} minimal"
+
+ruby_add_rdepend "!minimal? (
+	>=dev-ruby/cri-2
+	dev-ruby/mime-types
+	dev-ruby/rack
+)"
+
+ruby_add_bdepend "test? (
+	dev-ruby/mocha
+	dev-ruby/minitest
+)"
+
+all_ruby_prepare() {
+	use doc || (rm tasks/doc.rake || die)
+	use test || (rm tasks/test.rake || die)
+}
diff --git a/www-client/firefox/firefox-10.0.1-r1.ebuild b/www-client/firefox/firefox-10.0.1-r1.ebuild
new file mode 100644
index 000000000000..a610106c4bf1
--- /dev/null
+++ b/www-client/firefox/firefox-10.0.1-r1.ebuild
@@ -0,0 +1,335 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/firefox-10.0.1-r1.ebuild,v 1.1 2012/02/28 03:55:15 anarchy Exp $
+
+EAPI="3"
+VIRTUALX_REQUIRED="pgo"
+WANT_AUTOCONF="2.1"
+
+# This list can be updated with scripts/get_langs.sh from the mozilla overlay
+MOZ_LANGS=(af ak ar as ast be bg bn-BD bn-IN br bs ca cs csb cy da de el en
+en-GB en-US en-ZA eo es-AR es-CL es-ES es-MX et eu fa fi fr fy-NL ga-IE gd gl
+gu-IN he hi-IN hr hu hy-AM id is it ja kk kn ko ku lg lt lv mai mk ml mr nb-NO
+nl nn-NO nso or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq sr sv-SE ta ta-LK
+te th tr uk vi zh-CN zh-TW zu)
+
+# Convert the ebuild version to the upstream mozilla version, used by mozlinguas
+MOZ_PV="${PV/_alpha/a}" # Handle alpha for SRC_URI
+MOZ_PV="${MOZ_PV/_beta/b}" # Handle beta for SRC_URI
+MOZ_PV="${MOZ_PV/_rc/rc}" # Handle rc for SRC_URI
+
+# Changeset for alpha snapshot
+CHANGESET="e56ecd8b3a68"
+# Patch version
+PATCH="${PN}-10.0-patches-0.5"
+# Upstream ftp release URI that's used by mozlinguas.eclass
+# We don't use the http mirror because it deletes old tarballs.
+MOZ_FTP_URI="ftp://ftp.mozilla.org/pub/${PN}/releases/"
+
+inherit check-reqs flag-o-matic toolchain-funcs eutils gnome2-utils mozconfig-3 multilib pax-utils fdo-mime autotools python virtualx nsplugins mozlinguas
+
+DESCRIPTION="Firefox Web Browser"
+HOMEPAGE="http://www.mozilla.com/firefox"
+
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+SLOT="0"
+LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
+IUSE="bindist +crashreporter +ipc +minimal pgo selinux system-sqlite +webm"
+
+# More URIs appended below...
+SRC_URI="${SRC_URI}
+	http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.xz"
+
+ASM_DEPEND=">=dev-lang/yasm-1.1"
+
+# Mesa 7.10 needed for WebGL + bugfixes
+RDEPEND="
+	>=sys-devel/binutils-2.16.1
+	>=dev-libs/nss-3.13.1
+	>=dev-libs/nspr-4.8.8
+	>=dev-libs/glib-2.26:2
+	>=media-libs/mesa-7.10
+	media-libs/libpng[apng]
+	virtual/libffi
+	system-sqlite? ( >=dev-db/sqlite-3.7.7.1[fts3,secure-delete,threadsafe,unlock-notify,debug=] )
+	webm? ( >=media-libs/libvpx-0.9.7
+		media-libs/alsa-lib )
+	crashreporter? ( net-misc/curl )
+	selinux? ( sec-policy/selinux-mozilla )"
+# We don't use PYTHON_DEPEND/PYTHON_USE_WITH for some silly reason
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	pgo? (
+		=dev-lang/python-2*[sqlite]
+		>=sys-devel/gcc-4.5 )
+	webm? ( x86? ( ${ASM_DEPEND} )
+		amd64? ( ${ASM_DEPEND} ) )"
+
+# No source releases for alpha|beta
+if [[ ${PV} =~ alpha ]]; then
+	SRC_URI="${SRC_URI}
+		http://dev.gentoo.org/~anarchy/mozilla/firefox/firefox-${MOZ_PV}_${CHANGESET}.source.tar.bz2"
+	S="${WORKDIR}/mozilla-central"
+elif [[ ${PV} =~ beta ]]; then
+	SRC_URI="${SRC_URI}
+		${MOZ_FTP_URI}/${MOZ_PV}/source/firefox-${MOZ_PV}.source.tar.bz2"
+	S="${WORKDIR}/mozilla-beta"
+else
+	SRC_URI="${SRC_URI}
+		${MOZ_FTP_URI}/${MOZ_PV}/source/firefox-${MOZ_PV}.source.tar.bz2"
+	S="${WORKDIR}/mozilla-release"
+fi
+
+QA_PRESTRIPPED="usr/$(get_libdir)/${PN}/firefox"
+
+pkg_setup() {
+	moz_pkgsetup
+
+	# Avoid PGO profiling problems due to enviroment leakage
+	# These should *always* be cleaned up anyway
+	unset DBUS_SESSION_BUS_ADDRESS \
+		DISPLAY \
+		ORBIT_SOCKETDIR \
+		SESSION_MANAGER \
+		XDG_SESSION_COOKIE \
+		XAUTHORITY
+
+	if ! use bindist; then
+		einfo
+		elog "You are enabling official branding. You may not redistribute this build"
+		elog "to any users on your network or the internet. Doing so puts yourself into"
+		elog "a legal problem with Mozilla Foundation"
+		elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag"
+	fi
+
+	if use pgo; then
+		einfo
+		ewarn "You will do a double build for profile guided optimization."
+		ewarn "This will result in your build taking at least twice as long as before."
+	fi
+
+	# Ensure we have enough disk space to compile
+	if use pgo || use debug || use test ; then
+		CHECKREQS_DISK_BUILD="8G"
+	else
+		CHECKREQS_DISK_BUILD="4G"
+	fi
+	check-reqs_pkg_setup
+}
+
+src_unpack() {
+	unpack ${A}
+
+	# Unpack language packs
+	mozlinguas_src_unpack
+}
+
+src_prepare() {
+	# Apply our patches
+	EPATCH_SUFFIX="patch" \
+	EPATCH_FORCE="yes" \
+	epatch "${WORKDIR}/firefox"
+
+	# Allow user to apply any additional patches without modifing ebuild
+	epatch_user
+
+	# Enable gnomebreakpad
+	if use debug ; then
+		sed -i -e "s:GNOME_DISABLE_CRASH_DIALOG=1:GNOME_DISABLE_CRASH_DIALOG=0:g" \
+			"${S}"/build/unix/run-mozilla.sh || die "sed failed!"
+	fi
+
+	# Disable gnomevfs extension
+	sed -i -e "s:gnomevfs::" "${S}/"browser/confvars.sh \
+		-e "s:gnomevfs::" "${S}/"xulrunner/confvars.sh \
+		|| die "Failed to remove gnomevfs extension"
+
+	# Ensure that are plugins dir is enabled as default
+	sed -i -e "s:/usr/lib/mozilla/plugins:/usr/$(get_libdir)/nsbrowser/plugins:" \
+		"${S}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path!"
+
+	# Fix sandbox violations during make clean, bug 372817
+	sed -e "s:\(/no-such-file\):${T}\1:g" \
+		-i "${S}"/config/rules.mk \
+		-i "${S}"/js/src/config/rules.mk \
+		-i "${S}"/nsprpub/configure{.in,} \
+		|| die
+
+	#Fix compilation with curl-7.21.7 bug 376027
+	sed -e '/#include <curl\/types.h>/d'  \
+		-i "${S}"/toolkit/crashreporter/google-breakpad/src/common/linux/http_upload.cc \
+		-i "${S}"/toolkit/crashreporter/google-breakpad/src/common/linux/libcurl_wrapper.cc \
+		-i "${S}"/config/system-headers \
+		-i "${S}"/js/src/config/system-headers || die "Sed failed"
+
+	eautoreconf
+}
+
+src_configure() {
+	MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+	MEXTENSIONS="default"
+
+	####################################
+	#
+	# mozconfig, CFLAGS and CXXFLAGS setup
+	#
+	####################################
+
+	mozconfig_init
+	mozconfig_config
+
+	# It doesn't compile on alpha without this LDFLAGS
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	mozconfig_annotate '' --prefix="${EPREFIX}"/usr
+	mozconfig_annotate '' --libdir="${EPREFIX}"/usr/$(get_libdir)
+	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
+	mozconfig_annotate '' --disable-gconf
+	mozconfig_annotate '' --disable-mailnews
+	mozconfig_annotate '' --enable-canvas
+	mozconfig_annotate '' --enable-safe-browsing
+	mozconfig_annotate '' --with-system-png
+	mozconfig_annotate '' --enable-system-ffi
+
+	# Other ff-specific settings
+	mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
+	mozconfig_annotate '' --target="${CTARGET:-${CHOST}}"
+
+	# Allow for a proper pgo build
+	if use pgo; then
+		echo "mk_add_options PROFILE_GEN_SCRIPT='\$(PYTHON) \$(OBJDIR)/_profile/pgo/profileserver.py'" >> "${S}"/.mozconfig
+	fi
+
+	# Finalize and report settings
+	mozconfig_final
+
+	if [[ $(gcc-major-version) -lt 4 ]]; then
+		append-cxxflags -fno-stack-protector
+	elif [[ $(gcc-major-version) -gt 4 || $(gcc-minor-version) -gt 3 ]]; then
+		if use amd64 || use x86; then
+			append-flags -mno-avx
+		fi
+	fi
+}
+
+src_compile() {
+	if use pgo; then
+		addpredict /root
+		addpredict /etc/gconf
+		# Reset and cleanup environment variables used by GNOME/XDG
+		gnome2_environment_reset
+
+		# Firefox tries to use dri stuff when it's run, see bug 380283
+		shopt -s nullglob
+		cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
+		if test -n "${cards}"; then
+			# FOSS drivers are fine
+			addpredict "${cards}"
+		else
+			cards=$(echo -n /dev/ati/card* /dev/nvidiactl* | sed 's/ /:/g')
+			if test -n "${cards}"; then
+				# Binary drivers seem to cause access violations anyway, so
+				# let's use indirect rendering so that the device files aren't
+				# touched at all. See bug 394715.
+				export LIBGL_ALWAYS_INDIRECT=1
+			fi
+		fi
+		shopt -u nullglob
+
+		CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
+		MOZ_MAKE_FLAGS="${MAKEOPTS}" \
+		Xemake -f client.mk profiledbuild || die "Xemake failed"
+	else
+		CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
+		MOZ_MAKE_FLAGS="${MAKEOPTS}" \
+		emake -f client.mk || die "emake failed"
+	fi
+
+}
+
+src_install() {
+	MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+
+	# MOZ_BUILD_ROOT, and hence OBJ_DIR change depending on arch, compiler, pgo, etc.
+	local obj_dir="$(echo */config.log)"
+	obj_dir="${obj_dir%/*}"
+	cd "${S}/${obj_dir}"
+
+	# Pax mark xpcshell for hardened support, only used for startupcache creation.
+	pax-mark m "${S}/${obj_dir}"/dist/bin/xpcshell
+
+	# Add our default prefs for firefox + xulrunner
+	cp "${FILESDIR}"/gentoo-default-prefs.js-1 \
+		"${S}/${obj_dir}/dist/bin/defaults/pref/all-gentoo.js" || die
+
+	MOZ_MAKE_FLAGS="${MAKEOPTS}" \
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	# Install language packs
+	mozlinguas_src_install
+
+	local size sizes icon_path icon name
+	if use bindist; then
+		sizes="16 32 48"
+		icon_path="${S}/browser/branding/aurora"
+		# Firefox's new rapid release cycle means no more codenames
+		# Let's just stick with this one...
+		icon="aurora"
+		name="Aurora"
+	else
+		sizes="16 22 24 32 256"
+		icon_path="${S}/browser/branding/official"
+		icon="${PN}"
+		name="Mozilla Firefox"
+	fi
+
+	# Install icons and .desktop for menu entry
+	for size in ${sizes}; do
+		insinto "/usr/share/icons/hicolor/${size}x${size}/apps"
+		newins "${icon_path}/default${size}.png" "${icon}.png" || die
+	done
+	# The 128x128 icon has a different name
+	insinto "/usr/share/icons/hicolor/128x128/apps"
+	newins "${icon_path}/mozicon128.png" "${icon}.png" || die
+	# Install a 48x48 icon into /usr/share/pixmaps for legacy DEs
+	newicon "${icon_path}/content/icon48.png" "${icon}.png" || die
+	newmenu "${FILESDIR}/icon/${PN}.desktop" "${PN}.desktop" || die
+	sed -i -e "s:@NAME@:${name}:" -e "s:@ICON@:${icon}:" \
+		"${ED}/usr/share/applications/${PN}.desktop" || die
+
+	# Add StartupNotify=true bug 237317
+	if use startup-notification ; then
+		echo "StartupNotify=true" >> "${ED}/usr/share/applications/${PN}.desktop"
+	fi
+
+	# Required in order to use plugins and even run firefox on hardened.
+	pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/{firefox,firefox-bin,plugin-container}
+
+	# Plugins dir
+	share_plugins_dir
+
+	if use minimal; then
+		rm -rf "${ED}"/usr/include "${ED}${MOZILLA_FIVE_HOME}"/{idl,include,lib,sdk} || \
+			die "Failed to remove sdk and headers"
+	fi
+
+	# very ugly hack to make firefox not sigbus on sparc
+	# FIXME: is this still needed??
+	use sparc && { sed -e 's/Firefox/FirefoxGentoo/g' \
+					 -i "${ED}/${MOZILLA_FIVE_HOME}/application.ini" || \
+					 die "sparc sed failed"; }
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	# Update mimedb for the new .desktop file
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-1.1.4-r1.ebuild b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-1.1.4-r1.ebuild
index bce6dd16e40f..763350cc5400 100644
--- a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-1.1.4-r1.ebuild
+++ b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-1.1.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-1.1.4-r1.ebuild,v 1.1 2012/02/23 23:45:00 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-1.1.4-r1.ebuild,v 1.2 2012/02/27 20:00:10 hwoarang Exp $
 
 EAPI=4
 
@@ -14,9 +14,11 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="branding"
 
-DEPEND="x11-libs/gtk+:3"
+DEPEND="x11-libs/gtk+:3
+	>=x11-misc/lightdm-1.1.3"
 RDEPEND="!!<x11-misc/lightdm-1.1.1
 	x11-libs/gtk+:3
+	>=x11-misc/lightdm-1.1.3
 	x11-themes/gnome-themes-standard
 	x11-themes/gnome-icon-theme"
 
diff --git a/x11-terms/sakura/Manifest b/x11-terms/sakura/Manifest
index 51f2b7172b9e..b16e40b6f86b 100644
--- a/x11-terms/sakura/Manifest
+++ b/x11-terms/sakura/Manifest
@@ -1 +1,2 @@
 DIST sakura-2.4.2.tar.bz2 42082 RMD160 487c148b9ebd0da74908e4241004acc2e8db40f1 SHA1 24b98c42c057da39f57c281a4726901952774641 SHA256 c5e6242ca4afba3ad43731939f7d2a728bd40056a93de50f34e5bf76a696fad6
+DIST sakura-3.0.0.tar.bz2 43639 RMD160 fcf19786c912269f7ee6ae2c8dd435da19b3e37d SHA1 2ac4024b40074fb048e9b75cd7ea351b1829c5ee SHA256 c7f1f0b2c2bc00f41a5556c3a9d892d0a499baf3a64149aa5ffa3e57a5d5a8cb
diff --git a/x11-terms/sakura/files/sakura-3.0.0-cflags.patch b/x11-terms/sakura/files/sakura-3.0.0-cflags.patch
new file mode 100644
index 000000000000..bc272b4f6ebb
--- /dev/null
+++ b/x11-terms/sakura/files/sakura-3.0.0-cflags.patch
@@ -0,0 +1,15 @@
+--- sakura-3.0.0/CMakeLists.txt
++++ sakura-3.0.0/CMakeLists.txt
+@@ -35,12 +35,6 @@
+ ADD_DEFINITIONS (-DDATADIR=\\\"${CMAKE_INSTALL_PREFIX}/share\\\")
+ ADD_DEFINITIONS (-DBUILDTYPE=\\\"${CMAKE_BUILD_TYPE}\\\")
+ 
+-IF (${CMAKE_BUILD_TYPE} MATCHES "Debug")
+-	SET (CMAKE_C_FLAGS "-Wall ")
+-ELSE (${CMAKE_BUILD_TYPE} NOT MATCHES "Debug")
+-	SET (CMAKE_C_FLAGS "-O2 -Wno-deprecated-declarations ")
+-ENDIF (${CMAKE_BUILD_TYPE} MATCHES "Debug")
+-
+ INCLUDE_DIRECTORIES (. ${GTK_INCLUDE_DIRS} ${VTE_INCLUDE_DIRS})
+ LINK_DIRECTORIES (${GTK_LIBRARY_DIRS} ${VTE_LIBRARY_DIRS})
+ LINK_LIBRARIES (${GTK_LIBRARIES} ${VTE_LIBRARIES})
diff --git a/x11-terms/sakura/sakura-3.0.0.ebuild b/x11-terms/sakura/sakura-3.0.0.ebuild
new file mode 100644
index 000000000000..0e80f0b8df1d
--- /dev/null
+++ b/x11-terms/sakura/sakura-3.0.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/sakura/sakura-3.0.0.ebuild,v 1.1 2012/02/28 02:42:04 radhermit Exp $
+
+EAPI=4
+inherit cmake-utils
+
+DESCRIPTION="sakura is a terminal emulator based on GTK and VTE"
+HOMEPAGE="http://www.pleyades.net/david/projects/sakura/"
+SRC_URI="http://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+LANGS=" ca cs de es fr hr hu it ja ko pl pt_BR ru zh_CN"
+IUSE="${LANGS// / linguas_}"
+
+RDEPEND="
+	>=dev-libs/glib-2.20:2
+	x11-libs/gtk+:3
+	>=x11-libs/vte-0.28:2.90
+"
+DEPEND="${RDEPEND}
+	>=dev-lang/perl-5.10.1
+	dev-util/pkgconfig
+"
+
+PATCHES=( "${FILESDIR}"/${P}-cflags.patch )
+
+DOCS=( AUTHORS INSTALL )
+
+src_prepare() {
+	sed -i -e "/FILES INSTALL/d" CMakeLists.txt || die
+
+	for lang in ${LANGS}; do
+		if ! use linguas_${lang}; then
+			rm -f po/${lang}.po || die
+		fi
+	done
+
+	base_src_prepare
+}