Sync with portage [Mon Jan 30 22:06:28 MSK 2012].

12 years ago · 2145baaea7
parent 401ad6003f
commit 2145baaea7
133 changed files with 2989 additions and 1206 deletions
--- a/app-accessibility/gnome-mousetrap/Manifest
+++ b/app-accessibility/gnome-mousetrap/Manifest
@ -1,2 +0,0 @@
-DIST gnome-mousetrap_0.3+svn17-3.diff.gz 8961 RMD160 8617b2e861e5f2d88e4f39c3d4e1c73792a1e9a7 SHA1 14bf4f2c951e87900829cbd9e2d6777e2ea5c7be SHA256 8de08062ccaf60e81d7d25035dc0181bbf4fdb0c153f4e89e5ef8df85b7fe520
-DIST gnome-mousetrap_0.3+svn17.orig.tar.gz 1442978 RMD160 5e3a612c12ba012159e0ab965af3e827b68b5baf SHA1 fc483908ce006d58710d3759d648910d4f0801cc SHA256 72cfdf17f738fa3049756a276bdcd274f54b59050fd7f40134658ffab3cc46ff
--- a/app-accessibility/gnome-mousetrap/gnome-mousetrap-0.3.ebuild
+++ b/app-accessibility/gnome-mousetrap/gnome-mousetrap-0.3.ebuild
@ -1,49 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/gnome-mousetrap/gnome-mousetrap-0.3.ebuild,v 1.5 2011/08/19 11:35:04 nirbheek Exp $
-
-EAPI="2"
-GCONF_DEBUG="no"
-
-inherit eutils gnome2
-
-MY_PV=${PV}+svn17
-MY_P=${PN}_${MY_PV}
-PATCHLEVEL=3
-
-DESCRIPTION="Standalone application that allows users with physical impairments to move a mouse cursor"
-HOMEPAGE="http://live.gnome.org/MouseTrap"
-SRC_URI="mirror://debian/pool/main/g/${PN}/${MY_P}.orig.tar.gz
-	mirror://debian/pool/main/g/${PN}/${MY_P}-${PATCHLEVEL}.diff.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc"
-
-RDEPEND="gnome-extra/at-spi:1
-	media-libs/opencv[python]
-	dev-python/libgnome-python
-	dev-python/python-xlib"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.35"
-
-S=${WORKDIR}/${PN}-${MY_PV}
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-dependency-tracking
-		$(use_enable doc pydoc)"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-	epatch "${WORKDIR}/${MY_P}-${PATCHLEVEL}.diff"
-
-	# Use a specific version of python is a bad thing
-	sed 's:/usr/bin/python2.5:/usr/bin/python:g' \
-		-i src/mouseTrap/mousetrap.in || die "sed failed"
-
-	# Fix intltool tests
-	echo "src/mouseTrap/scripts/profiles/dragProfile.py" >> po/POTFILES.skip
-}
--- a/app-accessibility/gnome-mousetrap/metadata.xml
+++ b/app-accessibility/gnome-mousetrap/metadata.xml
@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<herd>gnome-accessibility</herd>
-</pkgmetadata>
--- a/app-misc/beanstalkd/Manifest
+++ b/app-misc/beanstalkd/Manifest
@ -1,2 +1,3 @@
 DIST beanstalkd-1.3.tar.gz 116114 RMD160 a1fa4c6aae530beeecfbe49a4e09903a58e1cc38 SHA1 ce85375605459458e0a357d9ecaeb9baeb3b9c9a SHA256 3d3eb36bf2932e6f3c4e6851420e8e579b2c4ae19f0297d8fd384c7461b4d885
 DIST beanstalkd-1.4.6.tar.gz 140858 RMD160 f1641f15b32731f19a39721d8b37da940a145672 SHA1 1ee0d731e22aa45fb22e816f6e364913595f6e65 SHA256 a03aca5ccd87c2a1bb6cdaf38d3463c9f987090f4eb6cd9c7f6e03d3d54d3ac9
+DIST beanstalkd-1.5.tar.gz 61494 RMD160 a48ec645b90e003efdc2685ded65654502b12480 SHA1 95c694366b0b21230563b1e983690d572f79ce6e SHA256 ad39ccca490f58dc48df8609e2b6acfddcd200890c62f3d4b0d1ac4de713467e
--- a/app-misc/beanstalkd/beanstalkd-1.5.ebuild
+++ b/app-misc/beanstalkd/beanstalkd-1.5.ebuild
@ -0,0 +1,43 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: #
+
+EAPI="3"
+
+inherit eutils
+
+DESCRIPTION="A fast, distributed, in-memory workqueue service"
+HOMEPAGE="http://xph.us/software/beanstalkd/"
+SRC_URI="mirror://github/kr/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~amd64-linux ~mips ~sparc-fbsd ~x64-macos ~x86 ~x86-fbsd ~x86-macos"
+
+RDEPEND=""
+DEPEND="test? ( dev-lang/python )"
+
+IUSE="test"
+
+pkg_setup() {
+	enewuser beanstalk -1 -1 /var/lib/beanstalkd daemon
+}
+
+src_compile() {
+	emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" || die "compile failed"
+}
+
+src_install() {
+	dobin beanstalkd || die
+
+	DATADIR=/var/lib/${PN}
+	dodir ${DATADIR} || die
+	fowners beanstalk:daemon ${DATADIR}
+
+	doman doc/"${PN}".1
+
+	dodoc README NEWS.md doc/*.txt || die
+
+	newconfd "${FILESDIR}/conf-1.4.2" beanstalkd
+	newinitd "${FILESDIR}/init-1.4.6" beanstalkd
+}
--- a/app-text/evince/evince-2.32.0-r4.ebuild
+++ b/app-text/evince/evince-2.32.0-r4.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/app-text/evince/evince-2.32.0-r4.ebuild,v 1.2 2011/12/17 16:29:29 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/evince/evince-2.32.0-r4.ebuild,v 1.3 2012/01/30 11:33:40 pacho Exp $

 EAPI="4"
 GCONF_DEBUG="yes"
@ -16,7 +16,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris"

-IUSE="dbus debug djvu doc dvi gnome gnome-keyring +introspection nautilus t1lib tiff"
+IUSE="dbus debug djvu dvi gnome gnome-keyring +introspection nautilus t1lib tiff"

 # Since 2.26.2, can handle poppler without cairo support. Make it optional ?
 # not mature enough
@ -48,8 +48,7 @@ DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.9
 	sys-devel/gettext
 	>=dev-util/intltool-0.35
-	>=dev-util/gtk-doc-am-1.13
-	doc? ( >=dev-util/gtk-doc-1.13 )"
+	>=dev-util/gtk-doc-am-1.13"

 ELTCONF="--portage"

--- a/dev-db/slony1/Manifest
+++ b/dev-db/slony1/Manifest
@ -3,3 +3,5 @@ DIST slony1-1.2.22.tar.bz2 935026 RMD160 9f62bb9a6d45422a53b14d07ddf5d3cde1be86b
 DIST slony1-2.0.6.tar.bz2 979208 RMD160 39ceec9fc823903e6e2c6080558ab5e00a476697 SHA1 6e3c8d9bb8ae138c089782836f9b303cadc82b97 SHA256 7630ce45c3ff64d032de0a519a0992fadee8887ce0a728c13a2fbe23371f324f
 DIST slony1-2.0.7-docs.tar.bz2 231708 RMD160 19cf13b5ac36e54c8564d8a141c3966551ed476c SHA1 d8209b7dc748933b4d68e9e820a6e9ec6678f2bd SHA256 ed0d728b06d896ec6e738d42ba6cbf298297bc54993437e419dcb83ec7e325d9
 DIST slony1-2.0.7.tar.bz2 1001021 RMD160 d5af118f1181bd303ff0d02ee3fffa1cb1168f82 SHA1 4f9fb4a78c2492498e40db2a6e15159681576474 SHA256 5a25769192941cb307af7c9d1960e882a622b4dc54d860b99932fc39d843fb47
+DIST slony1-2.1.0-docs.tar.bz2 257650 RMD160 cccbdfbd742ea89a557ec522a6eb306feb13c697 SHA1 e3407b0e9212b0588dbe8d60bfc3152a9ad5466b SHA256 76382892e59b35c1b9a0a24da13ab8869c68e514b5818b9209796958ca631586
+DIST slony1-2.1.0.tar.bz2 1442289 RMD160 2a7acf8cf48f7d2e3c5a84423ff512471d58b238 SHA1 a4c488c1a41aef080fb0c8ed9cbf8264fe34c20d SHA256 74526828ef1913c438536c7e943e2214d45d8976d1325c50f4e9d1db67a57b5d
--- a/dev-db/slony1/slony1-2.1.0.ebuild
+++ b/dev-db/slony1/slony1-2.1.0.ebuild
@ -0,0 +1,72 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/slony1/slony1-2.1.0.ebuild,v 1.1 2012/01/30 11:45:07 titanofold Exp $
+
+EAPI="4"
+
+inherit eutils versionator
+
+IUSE="doc perl"
+
+DESCRIPTION="A replication system for the PostgreSQL Database Management System"
+HOMEPAGE="http://slony.info/"
+
+# ${P}-docs.tar.bz2 contains man pages as well as additional documentation
+MAJ_PV=$(get_version_component_range 1-2)
+SRC_URI="http://main.slony.info/downloads/${MAJ_PV}/source/${P}.tar.bz2
+		 http://main.slony.info/downloads/${MAJ_PV}/source/${P}-docs.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+DEPEND="|| (
+			dev-db/postgresql-server:9.1
+			dev-db/postgresql-server:9.0
+			dev-db/postgresql-server:8.4
+			dev-db/postgresql-server:8.3
+		)
+		dev-db/postgresql-base[threads]
+		perl? ( dev-perl/DBD-Pg )
+"
+
+pkg_setup() {
+	local PGSLOT="$(postgresql-config show)"
+	if [[ ${PGSLOT//.} < 83 ]] ; then
+		eerror "You must build ${CATEGORY}/${PN} against PostgreSQL 8.3 or higher."
+		eerror "Set an appropriate slot with postgresql-config."
+		die "postgresql-config not set to 8.3 or higher."
+	fi
+
+#	if [[ ${PGSLOT//.} > 90 ]] ; then
+#		ewarn "You are building ${CATEGORY}/${PN} against a version of PostgreSQL greater than 9.0."
+#		ewarn "This is neither supported here nor upstream."
+#		ewarn "Any bugs you encounter should be reported upstream."
+#	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/ldflags.patch"
+}
+
+src_configure() {
+	local myconf
+	use perl && myconf='--with-perltools'
+	econf ${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	dodoc HISTORY-1.1 INSTALL README SAMPLE TODO UPGRADING doc/howto/*.txt
+
+	doman "${S}"/doc/adminguide/man{1,7}/*
+
+	if use doc ; then
+		cd "${S}"/doc
+		dohtml -r *
+	fi
+
+	newinitd "${FILESDIR}"/slony1.init slony1
+	newconfd "${FILESDIR}"/slony1.conf slony1
+}
--- a/dev-java/commons-daemon/commons-daemon-1.0.8.ebuild
+++ b/dev-java/commons-daemon/commons-daemon-1.0.8.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-daemon/commons-daemon-1.0.8.ebuild,v 1.1 2012/01/28 19:46:10 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-daemon/commons-daemon-1.0.8.ebuild,v 1.2 2012/01/30 13:02:39 sera Exp $

 EAPI="4"

@ -52,5 +52,5 @@ src_install() {
 	dodoc README RELEASE-NOTES.txt *.html src/native/unix/CHANGES.txt
 	use doc && java-pkg_dohtml -r dist/docs/*
 	use examples && java-pkg_doexamples src/samples
-	use source && java-pkg_dosrc src/java/* src/native/unix/native
+	use source && java-pkg_dosrc src/main/java/*
 }
--- a/dev-php/pecl-timezonedb/Manifest
+++ b/dev-php/pecl-timezonedb/Manifest
@ -1,6 +1,2 @@
-DIST timezonedb-2010.15.tgz 197165 RMD160 e3b41816e38a5eccaf69704910ed4395ca6af225 SHA1 4c8d81f2b753df0ca5284a07f2ee2c748cea52d0 SHA256 1e9a7202441ea88c6a5c334a244a9c67a7df06b813ccbd6d14a7fb7532b2eca9
-DIST timezonedb-2011.10.tgz 193595 RMD160 8b34a3c85c6eaad0769c1ca1eeab5643c6353f1f SHA1 4bd91beb3f438c30ea61bf05288e7beb64d3e86b SHA256 e25b56252c7511767cd614c891119c68464d238c616da06d492348f054c7cef7
 DIST timezonedb-2011.13.tgz 193514 RMD160 4285e204af269faaa5487590a53eb974efc55c48 SHA1 ab860f532437555738875acab56088b84f278589 SHA256 899823cbd84ed98b254beed04afb84843a1c80e0dccba213556596ad8951acc5
-DIST timezonedb-2011.3.tgz 199393 RMD160 552388e924f42c7207d274e582efbf7d1650db85 SHA1 24d29dee1805de62fe59495ccf1365d453a47835 SHA256 42900e6dbb436f37b9a640dd674b4acc9dafadc5d19c6cb367c1e0362277cac9
-DIST timezonedb-2011.4.tgz 199403 RMD160 cd63aceed98871d900444e2bfb95768d4f2709c0 SHA1 1508d57a9f5a74d1df4d8460f051f1ece45d34f1 SHA256 e5b577b7c133efcd5c4539102abf36a09b14662c293e4de69eb97211a92a8f24
-DIST timezonedb-2011.7.tgz 198734 RMD160 428a6133304c79f07feee1271789d520a66881b2 SHA1 dc4557a31c392f692b33bf9ea9dd5391adcf8a25 SHA256 f46bf82601ccf001a885fd89fcf1622fef19dddbe9beba6e12cfec02ca4d0f8b
+DIST timezonedb-2011.14.tgz 193528 RMD160 9c04d4ee798f39e2530cfda6c5c71469d2eacf1e SHA1 34a77a97d48db8f32d9e413c52a4f2f3f6a6dfb3 SHA256 fec12b7f0754968257ca1ca0f934833f926b5c002de729bd753a8d41f46eae9f
--- a/dev-php/pecl-timezonedb/pecl-timezonedb-2010.15-r1.ebuild
+++ b/dev-php/pecl-timezonedb/pecl-timezonedb-2010.15-r1.ebuild
@ -1,17 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/pecl-timezonedb/pecl-timezonedb-2010.15-r1.ebuild,v 1.1 2011/10/28 13:58:55 olemarkus Exp $
-
-EAPI=3
-
-PHP_EXT_NAME="timezonedb"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-
-inherit php-ext-pecl-r2
-
-DESCRIPTION="Timezone Database to be used with PHP's date and time functions"
-LICENSE="PHP-3"
-SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE=""
--- a/dev-php/pecl-timezonedb/pecl-timezonedb-2011.14.ebuild
+++ b/dev-php/pecl-timezonedb/pecl-timezonedb-2011.14.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/dev-php/pecl-timezonedb/pecl-timezonedb-2011.10.ebuild,v 1.1 2011/10/28 13:58:55 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/pecl-timezonedb/pecl-timezonedb-2011.14.ebuild,v 1.1 2012/01/30 12:00:10 olemarkus Exp $

-EAPI=3
+EAPI=4

 PHP_EXT_NAME="timezonedb"
 PHP_EXT_INI="yes"
--- a/dev-php/pecl-timezonedb/pecl-timezonedb-2011.3.ebuild
+++ b/dev-php/pecl-timezonedb/pecl-timezonedb-2011.3.ebuild
@ -1,17 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/pecl-timezonedb/pecl-timezonedb-2011.3.ebuild,v 1.1 2011/10/28 13:58:55 olemarkus Exp $
-
-EAPI=3
-
-PHP_EXT_NAME="timezonedb"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-
-inherit php-ext-pecl-r2
-
-DESCRIPTION="Timezone Database to be used with PHP's date and time functions"
-LICENSE="PHP-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE=""
--- a/dev-php/pecl-timezonedb/pecl-timezonedb-2011.4.ebuild
+++ b/dev-php/pecl-timezonedb/pecl-timezonedb-2011.4.ebuild
@ -1,17 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/pecl-timezonedb/pecl-timezonedb-2011.4.ebuild,v 1.1 2011/10/28 13:58:55 olemarkus Exp $
-
-EAPI=3
-
-PHP_EXT_NAME="timezonedb"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-
-inherit php-ext-pecl-r2
-
-DESCRIPTION="Timezone Database to be used with PHP's date and time functions"
-LICENSE="PHP-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE=""
--- a/dev-php/pecl-timezonedb/pecl-timezonedb-2011.7.ebuild
+++ b/dev-php/pecl-timezonedb/pecl-timezonedb-2011.7.ebuild
@ -1,17 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/pecl-timezonedb/pecl-timezonedb-2011.7.ebuild,v 1.1 2011/10/28 13:58:55 olemarkus Exp $
-
-EAPI=3
-
-PHP_EXT_NAME="timezonedb"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-
-inherit php-ext-pecl-r2
-
-DESCRIPTION="Timezone Database to be used with PHP's date and time functions"
-LICENSE="PHP-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE=""
--- a/dev-python/pymongo/Manifest
+++ b/dev-python/pymongo/Manifest
@ -1,2 +1,3 @@
 DIST pymongo-2.0.1.tar.gz 171745 RMD160 b6c1b6bdcd8165e6d8e124c2fbcd316b392e49e2 SHA1 864b839f71e28f3f37b6b375c8c13c7a4cca1ee1 SHA256 608b0a1ab378a6f0a74035f6a0e05c00903d47139784b00c56fe47665bfd685c
+DIST pymongo-2.1.1.tar.gz 199974 RMD160 e114d9e95d3e2512e054552571eb66b93229e1e0 SHA1 f6d479ce863cf202aaa687d9f7739ffb47b4f421 SHA256 7dd891ce2088a2d21f172102be530cc3083571a0f1eecfa0aff612da8076c37b
 DIST pymongo-2.1.tar.gz 197271 RMD160 a9bcbb4de71cbfa8b9674873f2662f5f55974288 SHA1 5900ac2708a5c18107ed510b90f965b3475d678e SHA256 49dbefef8d37fc0b09c0383b71ac9eab23c05170ea95f51a86bd8ffd20dd5bee
--- a/dev-python/pymongo/pymongo-2.1.1.ebuild
+++ b/dev-python/pymongo/pymongo-2.1.1.ebuild
@ -0,0 +1,60 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pymongo/pymongo-2.1.1.ebuild,v 1.1 2012/01/30 13:22:01 ultrabug Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
+PYTHON_TESTS_FAILURES_TOLERANT_ABIS="*-jython"
+DISTUTILS_SRC_TEST="nosetests"
+
+inherit distutils
+
+DESCRIPTION="Python driver for MongoDB"
+HOMEPAGE="http://github.com/mongodb/mongo-python-driver http://pypi.python.org/pypi/pymongo"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc mod_wsgi"
+
+RDEPEND="dev-db/mongodb"
+DEPEND="${RDEPEND}
+	dev-python/setuptools
+	doc? ( dev-python/sphinx )"
+
+PYTHON_MODNAME="bson gridfs pymongo"
+
+src_compile() {
+	distutils_src_compile
+
+	if use doc; then
+		einfo "Generation of documentation"
+		mkdir html
+		sphinx-build doc html || die "Generation of documentation failed"
+	fi
+}
+
+distutils_src_test_pre_hook() {
+	mkdir -p "${T}/tests-${PYTHON_ABI}/mongo.db"
+	mongod --dbpath "${T}/tests-${PYTHON_ABI}/mongo.db" --fork --logpath "${T}/tests-${PYTHON_ABI}/mongo.log"
+}
+
+src_test() {
+	distutils_src_test
+	killall -u "$(id -nu)" mongod
+}
+
+src_install() {
+	# Maintainer note:
+	# In order to work with mod_wsgi, we need to disable the C extension.
+	# See [1] for more information.
+	# [1] http://api.mongodb.org/python/current/faq.html#does-pymongo-work-with-mod-wsgi
+	distutils_src_install $(use mod_wsgi && echo --no_ext)
+
+	if use doc; then
+		dohtml -r html/* || die "Error installing docs"
+	fi
+}
--- a/eclass/autotools-utils.eclass
+++ b/eclass/autotools-utils.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/autotools-utils.eclass,v 1.45 2012/01/21 20:44:28 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v 1.46 2012/01/30 13:11:27 jlec Exp $

 # @ECLASS: autotools-utils.eclass
 # @MAINTAINER:
@ -306,7 +306,7 @@ autotools-utils_autoreconf() {

 	# gettext
 	if [[ $(autotools_check_macro AM_GLIB_GNU_GETTEXT) ]]; then
-		echo 'no' | autotools_run_tool glib-gettextize --copy
+		echo 'no' | autotools_run_tool glib-gettextize --copy --force
 	elif [[ $(autotools_check_macro AM_GNU_GETTEXT) ]]; then
 		eautopoint --force
 	fi
--- a/games-puzzle/drod-bin/drod-bin-1.6.6.ebuild
+++ b/games-puzzle/drod-bin/drod-bin-1.6.6.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/drod-bin/drod-bin-1.6.6.ebuild,v 1.7 2011/07/27 17:51:26 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/drod-bin/drod-bin-1.6.6.ebuild,v 1.8 2012/01/30 14:55:18 tupone Exp $

 inherit eutils games

@ -14,7 +14,9 @@ KEYWORDS="-* ~amd64 x86"
 IUSE=""
 RESTRICT="strip"

-RDEPEND=""
+DEPEND=""
+RDEPEND="x11-libs/libX11
+	amd64? ( app-emulation/emul-linux-x86-xlibs )"

 S=${WORKDIR}

--- a/kde-base/ksecrets/ksecrets-4.8.0.ebuild
+++ b/kde-base/ksecrets/ksecrets-4.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/kde-base/ksecrets/ksecrets-4.8.0.ebuild,v 1.1 2012/01/25 18:17:08 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksecrets/ksecrets-4.8.0.ebuild,v 1.2 2012/01/30 11:51:12 johu Exp $

 EAPI=4

@ -11,11 +11,13 @@ DESCRIPTION="KDE secrets service"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"

-DEPEND="
+RDEPEND="
 	app-crypt/qca:2
 	net-libs/libssh2
 "
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+	$(add_kdebase_dep libkworkspace)
+"

 PATCHES=(
 	"${FILESDIR}/${PN}-9999-fix-build.patch"
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@ -1,3 +1,4 @@
 DIST ImageMagick-6.7.1-0.tar.xz 7754528 RMD160 cc0e60a2c4c05723128200066f44939f7b1edd43 SHA1 6570b9f994ae58e047d3a3ad84b1bfdf2e749159 SHA256 1b26dff61f46cdbb13fe57acdba9583dc9c47e303826bddea9276a0d3a666b47
 DIST ImageMagick-6.7.4-10.tar.xz 7548912 RMD160 443acda654a1c50cea4c94073506ccd270b6be1a SHA1 4aa576cbbe65866e68c974cf585867e3f0940e41 SHA256 4ae0e62777983e6464ff96108cfe9c893e667d526b1b177796c2e2883c3feb15
 DIST ImageMagick-6.7.4-8.tar.xz 7551180 RMD160 2bb25014e3c35f05af5796b9e2e0558582dfb1ac SHA1 71028edada3ac1f9e3f7b34082809cf7daf270b6 SHA256 796dd615cf372bd08b74cc96b0c0036a57c63f5cccbe6233073ccd2fc109dfd4
+DIST ImageMagick-6.7.5-0.tar.xz 7559196 RMD160 f39c8be18983b0d89b9d4c3a0ed51d85503d7ea2 SHA1 c4a8df2b067a33ea2ef3bf4c609cd463d139f5bf SHA256 19c9fd0269b0cd764bfb66de1557e464e2f0b3587902c9961a6701e3139e6cbe
--- a/media-gfx/imagemagick/imagemagick-6.7.5.0.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.7.5.0.ebuild
@ -0,0 +1,141 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.7.5.0.ebuild,v 1.1 2012/01/30 12:50:47 ssuominen Exp $
+
+EAPI=4
+inherit multilib toolchain-funcs versionator
+
+MY_P=ImageMagick-$(replace_version_separator 3 '-')
+
+DESCRIPTION="A collection of tools and libraries for many image formats"
+HOMEPAGE="http://www.imagemagick.org/"
+SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
+
+LICENSE="imagemagick"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="autotrace bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz gs hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png q32 q64 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
+
+RDEPEND=">=sys-devel/libtool-2.2.6b
+	autotrace? ( >=media-gfx/autotrace-0.31.1 )
+	bzip2? ( app-arch/bzip2 )
+	corefonts? ( media-fonts/corefonts )
+	djvu? ( app-text/djvu )
+	fftw? ( sci-libs/fftw:3.0 )
+	fontconfig? ( media-libs/fontconfig )
+	fpx? ( >=media-libs/libfpx-1.3.0-r1 )
+	graphviz? ( >=media-gfx/graphviz-2.6 )
+	gs? ( app-text/ghostscript-gpl )
+	jbig? ( media-libs/jbigkit )
+	jpeg? ( virtual/jpeg )
+	jpeg2k? ( media-libs/jasper )
+	lcms? ( media-libs/lcms:2 )
+	lqr? ( >=media-libs/liblqr-0.1.0 )
+	opencl? ( virtual/opencl )
+	openexr? ( media-libs/openexr )
+	pango? ( x11-libs/pango )
+	perl? ( >=dev-lang/perl-5.8.6-r6 )
+	png? ( media-libs/libpng:0 )
+	raw? ( media-gfx/ufraw )
+	svg? ( >=gnome-base/librsvg-2.9.0 )
+	tiff? ( media-libs/tiff:0 )
+	truetype? ( media-libs/freetype:2 )
+	webp? ( media-libs/libwebp )
+	wmf? ( >=media-libs/libwmf-0.2.8 )
+	X? (
+		x11-libs/libXext
+		x11-libs/libXt
+		x11-libs/libICE
+		x11-libs/libSM
+	)
+	xml? ( >=dev-libs/libxml2-2.4.10 )
+	lzma? ( app-arch/xz-utils )
+	zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}
+	!media-gfx/graphicsmagick[imagemagick]
+	app-arch/xz-utils
+	dev-util/pkgconfig
+	>=sys-apps/sed-4
+	X? ( x11-proto/xextproto )"
+
+REQUIRED_USE="corefonts? ( truetype )
+	test? ( corefonts )"
+
+S=${WORKDIR}/${MY_P}
+
+RESTRICT="perl? ( userpriv )"
+
+DOCS="AUTHORS.txt ChangeLog NEWS.txt README.txt"
+
+src_configure() {
+	local depth=16
+	use q8 && depth=8
+	use q32 && depth=32
+	use q64 && depth=64
+
+	local openmp=disable
+	if use openmp && tc-has-openmp; then
+		openmp=enable
+	fi
+
+	econf \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		$(use_enable static-libs static) \
+		$(use_enable hdri) \
+		$(use_enable opencl) \
+		--with-threads \
+		--without-included-ltdl \
+		--with-ltdl-include="${EPREFIX}/usr/include" \
+		--with-ltdl-lib="${EPREFIX}/usr/$(get_libdir)" \
+		--with-modules \
+		--with-quantum-depth=${depth} \
+		$(use_with cxx magick-plus-plus) \
+		$(use_with perl) \
+		--with-perl-options='INSTALLDIRS=vendor' \
+		--with-gs-font-dir="${EPREFIX}/usr/share/fonts/default/ghostscript" \
+		$(use_with bzip2 bzlib) \
+		$(use_with X x) \
+		$(use_with zlib) \
+		$(use_with autotrace) \
+		$(use_with gs dps) \
+		$(use_with djvu) \
+		--with-dejavu-font-dir="${EPREFIX}/usr/share/fonts/dejavu" \
+		$(use_with fftw) \
+		$(use_with fpx) \
+		$(use_with fontconfig) \
+		$(use_with truetype freetype) \
+		$(use_with gs gslib) \
+		$(use_with graphviz gvc) \
+		$(use_with jbig) \
+		$(use_with jpeg) \
+		$(use_with jpeg2k jp2) \
+		--without-lcms \
+		$(use_with lcms lcms2) \
+		$(use_with lqr) \
+		$(use_with lzma) \
+		$(use_with openexr) \
+		$(use_with pango) \
+		$(use_with png) \
+		$(use_with svg rsvg) \
+		$(use_with tiff) \
+		$(use_with webp) \
+		$(use_with corefonts windows-font-dir /usr/share/fonts/corefonts) \
+		$(use_with wmf) \
+		$(use_with xml) \
+		--${openmp}-openmp
+}
+
+src_test() {
+	has_version media-gfx/imagemagick || emake -j1 check
+}
+
+src_install() {
+	default
+
+	if use perl; then
+		find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
+		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
+	fi
+
+	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
+}
--- a/media-plugins/gst-plugins-meta/gst-plugins-meta-0.10-r2.ebuild
+++ b/media-plugins/gst-plugins-meta/gst-plugins-meta-0.10-r2.ebuild
@ -1,48 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-meta/gst-plugins-meta-0.10-r2.ebuild,v 1.12 2009/11/16 20:29:13 tester Exp $
-
-DESCRIPTION="Meta ebuild to pull in gst plugins for apps"
-HOMEPAGE="http://www.gentoo.org"
-
-LICENSE="GPL-2"
-SLOT="0.10"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="a52 alsa dvb dvd esd ffmpeg flac mad mpeg mythtv ogg oss theora vorbis X xv"
-
-RDEPEND="=media-libs/gstreamer-0.10*
-	=media-libs/gst-plugins-base-0.10*
-	=media-libs/gst-plugins-good-0.10*
-	a52? ( >=media-plugins/gst-plugins-a52dec-0.10 )
-	alsa? ( >=media-plugins/gst-plugins-alsa-0.10 )
-	dvb? (
-		media-plugins/gst-plugins-dvb
-		>=media-libs/gst-plugins-bad-0.10.6 )
-	dvd? (
-		>=media-libs/gst-plugins-ugly-0.10
-		>=media-plugins/gst-plugins-a52dec-0.10
-		>=media-plugins/gst-plugins-dvdread-0.10
-		>=media-plugins/gst-plugins-mpeg2dec-0.10 )
-	esd? ( >=media-plugins/gst-plugins-esd-0.10 )
-	ffmpeg? ( >=media-plugins/gst-plugins-ffmpeg-0.10 )
-	flac? ( >=media-plugins/gst-plugins-flac-0.10 )
-	mad? ( >=media-plugins/gst-plugins-mad-0.10 )
-	mpeg? ( >=media-plugins/gst-plugins-mpeg2dec-0.10 )
-	mythtv? ( media-plugins/gst-plugins-mythtv )
-	ogg? ( >=media-plugins/gst-plugins-ogg-0.10 )
-	oss? ( >=media-plugins/gst-plugins-oss-0.10 )
-	theora? (
-		>=media-plugins/gst-plugins-ogg-0.10
-		>=media-plugins/gst-plugins-theora-0.10 )
-	vorbis? (
-		>=media-plugins/gst-plugins-ogg-0.10
-		>=media-plugins/gst-plugins-vorbis-0.10 )
-	X? ( >=media-plugins/gst-plugins-x-0.10 )
-	xv? ( >=media-plugins/gst-plugins-xvideo-0.10 )"
-
-# Usage note:
-# The idea is that apps depend on this for optional gstreamer plugins.  Then,
-# when USE flags change, no app gets rebuilt, and all apps that can make use of
-# the new plugin automatically do.
-
-# When adding deps here, make sure the keywords on the gst-plugin are valid.
--- a/media-plugins/gst-plugins-meta/gst-plugins-meta-0.10-r7.ebuild
+++ b/media-plugins/gst-plugins-meta/gst-plugins-meta-0.10-r7.ebuild
@ -1,14 +1,14 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-meta/gst-plugins-meta-0.10-r5.ebuild,v 1.12 2011/10/30 15:36:36 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-meta/gst-plugins-meta-0.10-r7.ebuild,v 1.1 2012/01/30 10:46:18 pacho Exp $

 DESCRIPTION="Meta ebuild to pull in gst plugins for apps"
 HOMEPAGE="http://www.gentoo.org"

 LICENSE="GPL-2"
 SLOT="0.10"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="aac a52 alsa dv dvb dvd esd ffmpeg flac lame mp3 mpeg musepack mythtv ogg oss pulseaudio taglib theora v4l vorbis wavpack X xv"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="aac a52 alsa dts dv dvb dvd esd ffmpeg flac http lame libvisual mms mp3 mpeg musepack mythtv ogg oss pulseaudio taglib theora v4l vcd vorbis vpx wavpack X xv"

 RDEPEND="=media-libs/gstreamer-0.10*
 	=media-libs/gst-plugins-base-0.10*
@ -16,6 +16,7 @@ RDEPEND="=media-libs/gstreamer-0.10*
 	a52? ( >=media-plugins/gst-plugins-a52dec-0.10 )
 	aac? ( >=media-plugins/gst-plugins-faad-0.10 )
 	alsa? ( >=media-plugins/gst-plugins-alsa-0.10 )
+	dts? ( >=media-plugins/gst-plugins-dts-0.10 )
 	dv? ( >=media-plugins/gst-plugins-dv-0.10 )
 	dvb? (
 		media-plugins/gst-plugins-dvb
@ -29,7 +30,10 @@ RDEPEND="=media-libs/gstreamer-0.10*
 	esd? ( >=media-plugins/gst-plugins-esd-0.10 )
 	ffmpeg? ( >=media-plugins/gst-plugins-ffmpeg-0.10 )
 	flac? ( >=media-plugins/gst-plugins-flac-0.10 )
+	http? ( >=media-plugins/gst-plugins-soup-0.10 )
 	lame? ( >=media-plugins/gst-plugins-lame-0.10 )
+	libvisual? ( >=media-plugins/gst-plugins-libvisual-0.10 )
+	mms? ( >=media-plugins/gst-plugins-libmms-0.10 )
 	mp3? ( >=media-libs/gst-plugins-ugly-0.10
 		>=media-plugins/gst-plugins-mad-0.10 )
 	mpeg? ( >=media-plugins/gst-plugins-mpeg2dec-0.10 )
@ -43,9 +47,12 @@ RDEPEND="=media-libs/gstreamer-0.10*
 		>=media-plugins/gst-plugins-theora-0.10 )
 	taglib? ( media-plugins/gst-plugins-taglib )
 	v4l? ( >=media-plugins/gst-plugins-v4l2-0.10 )
+	vcd? (	>=media-plugins/gst-plugins-mplex-0.10
+		>=media-plugins/gst-plugins-mpeg2dec-0.10 )
 	vorbis? (
 		>=media-plugins/gst-plugins-ogg-0.10
 		>=media-plugins/gst-plugins-vorbis-0.10 )
+	vpx? ( >=media-plugins/gst-plugins-vp8-0.10 )
 	wavpack? ( >=media-plugins/gst-plugins-wavpack-0.10 )
 	X? ( >=media-plugins/gst-plugins-x-0.10 )
 	xv? ( >=media-plugins/gst-plugins-xvideo-0.10 )"
--- a/media-plugins/gst-plugins-meta/metadata.xml
+++ b/media-plugins/gst-plugins-meta/metadata.xml
@ -14,6 +14,9 @@ plugins.  This will allow USE flags to be changed without re-compiling apps,
 since gstreamer plugins are all run-time dependencies.
 </longdescription>
 <use>
+	<flag name='http'>Enable http streaming via <pkg>net-libs/libsoup</pkg></flag>
+	<flag name='libvisual'>Enable visualization effects via 
+		<pkg>media-libs/libvisual</pkg></flag>
 	<flag name='mythtv'>Support for retrieval from <pkg>media-tv/mythtv</pkg>
 		backend</flag>
 	<flag name='vpx'>Enables vp8 codec support using libvpx, required to
--- a/media-sound/rhythmbox/rhythmbox-0.12.8-r1.ebuild
+++ b/media-sound/rhythmbox/rhythmbox-0.12.8-r1.ebuild
@ -1,8 +1,11 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-0.12.8-r1.ebuild,v 1.18 2012/01/05 06:38:12 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-0.12.8-r1.ebuild,v 1.19 2012/01/30 12:04:13 pacho Exp $

-EAPI="3"
+EAPI="4"
+GNOME_TARBALL_SUFFIX="bz2"
+GCONF_DEBUG="no"
+PYTHON_DEPEND="python? 2"

 inherit eutils gnome2 python multilib virtualx

@ -44,7 +47,6 @@ COMMON_DEPEND=">=dev-libs/glib-2.18:2
 	musicbrainz? ( media-libs/musicbrainz:3
 			media-libs/musicbrainz:1 )
 	python? (
-		>=dev-lang/python-2.4.2
 		|| (
 			>=dev-lang/python-2.5
 			dev-python/celementtree )
@ -137,6 +139,11 @@ pkg_setup() {
 		--disable-vala"

 	export GST_INSPECT=/bin/true
+
+	if use python; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
 }

 src_prepare() {
@ -152,6 +159,8 @@ src_prepare() {

 	# Fix building with recent glibc, bug #333373
 	epatch "${FILESDIR}/${P}-namespace-conflict.patch"
+
+	use python && python_convert_shebangs -r 2 .
 }

 src_compile() {
--- a/metadata/cache/app-accessibility/gnome-mousetrap-0.3
+++ b/metadata/cache/app-accessibility/gnome-mousetrap-0.3
@ -1,22 +0,0 @@
-gnome-extra/at-spi:1 media-libs/opencv[python] dev-python/libgnome-python dev-python/python-xlib >=dev-util/intltool-0.35 >=sys-apps/sed-4
-gnome-extra/at-spi:1 media-libs/opencv[python] dev-python/libgnome-python dev-python/python-xlib
-0
-mirror://debian/pool/main/g/gnome-mousetrap/gnome-mousetrap_0.3+svn17.orig.tar.gz mirror://debian/pool/main/g/gnome-mousetrap/gnome-mousetrap_0.3+svn17-3.diff.gz
-
-http://live.gnome.org/MouseTrap
-GPL-2
-Standalone application that allows users with physical impairments to move a mouse cursor
-amd64 x86
-eutils fdo-mime gnome.org gnome2 gnome2-utils libtool multilib portability toolchain-funcs user versionator
-doc
-
-
-
-2
-
-compile configure install postinst postrm preinst prepare setup unpack
-
-
-
-
-
--- a/metadata/cache/app-misc/beanstalkd-1.5
+++ b/metadata/cache/app-misc/beanstalkd-1.5
@ -0,0 +1,22 @@
+test? ( dev-lang/python )
+
+0
+mirror://github/kr/beanstalkd/beanstalkd-1.5.tar.gz
+
+http://xph.us/software/beanstalkd/
+MIT
+A fast, distributed, in-memory workqueue service
+~amd64 ~amd64-linux ~mips ~sparc-fbsd ~x64-macos ~x86 ~x86-fbsd ~x86-macos
+eutils multilib portability toolchain-funcs user
+test
+
+
+
+3
+
+compile install setup
+
+
+
+
+
--- a/metadata/cache/app-text/evince-2.32.0-r4
+++ b/metadata/cache/app-text/evince-2.32.0-r4
@ -1,4 +1,4 @@
->=app-text/libspectre-0.2.0 >=dev-libs/glib-2.25.11:2 >=dev-libs/libxml2-2.5:2 >=x11-libs/gtk+-2.21.5:2[introspection?] >=x11-libs/libSM-1 || ( >=x11-themes/gnome-icon-theme-2.17.1 >=x11-themes/hicolor-icon-theme-0.10 ) >=x11-libs/cairo-1.9.10 >=app-text/poppler-0.14[cairo] djvu? ( >=app-text/djvu-3.5.17 ) dvi? ( virtual/tex-base t1lib? ( >=media-libs/t1lib-5.0.0 ) ) gnome? ( >=gnome-base/gconf-2:2[introspection?] ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.22.0 ) introspection? ( >=dev-libs/gobject-introspection-0.6 ) nautilus? ( >=gnome-base/nautilus-2.10[introspection?] ) tiff? ( >=media-libs/tiff-3.6:0 ) app-text/scrollkeeper >=app-text/gnome-doc-utils-0.3.2 ~app-text/docbook-xml-dtd-4.1.2 >=dev-util/pkgconfig-0.9 sys-devel/gettext >=dev-util/intltool-0.35 >=dev-util/gtk-doc-am-1.13 doc? ( >=dev-util/gtk-doc-1.13 ) >=sys-apps/sed-4 || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool
+>=app-text/libspectre-0.2.0 >=dev-libs/glib-2.25.11:2 >=dev-libs/libxml2-2.5:2 >=x11-libs/gtk+-2.21.5:2[introspection?] >=x11-libs/libSM-1 || ( >=x11-themes/gnome-icon-theme-2.17.1 >=x11-themes/hicolor-icon-theme-0.10 ) >=x11-libs/cairo-1.9.10 >=app-text/poppler-0.14[cairo] djvu? ( >=app-text/djvu-3.5.17 ) dvi? ( virtual/tex-base t1lib? ( >=media-libs/t1lib-5.0.0 ) ) gnome? ( >=gnome-base/gconf-2:2[introspection?] ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.22.0 ) introspection? ( >=dev-libs/gobject-introspection-0.6 ) nautilus? ( >=gnome-base/nautilus-2.10[introspection?] ) tiff? ( >=media-libs/tiff-3.6:0 ) app-text/scrollkeeper >=app-text/gnome-doc-utils-0.3.2 ~app-text/docbook-xml-dtd-4.1.2 >=dev-util/pkgconfig-0.9 sys-devel/gettext >=dev-util/intltool-0.35 >=dev-util/gtk-doc-am-1.13 >=sys-apps/sed-4 || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool
 >=app-text/libspectre-0.2.0 >=dev-libs/glib-2.25.11:2 >=dev-libs/libxml2-2.5:2 >=x11-libs/gtk+-2.21.5:2[introspection?] >=x11-libs/libSM-1 || ( >=x11-themes/gnome-icon-theme-2.17.1 >=x11-themes/hicolor-icon-theme-0.10 ) >=x11-libs/cairo-1.9.10 >=app-text/poppler-0.14[cairo] djvu? ( >=app-text/djvu-3.5.17 ) dvi? ( virtual/tex-base t1lib? ( >=media-libs/t1lib-5.0.0 ) ) gnome? ( >=gnome-base/gconf-2:2[introspection?] ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.22.0 ) introspection? ( >=dev-libs/gobject-introspection-0.6 ) nautilus? ( >=gnome-base/nautilus-2.10[introspection?] ) tiff? ( >=media-libs/tiff-3.6:0 )
 0
 mirror://gnome/sources/evince/2.32/evince-2.32.0.tar.bz2
@ -8,7 +8,7 @@ GPL-2
 Simple document viewer for GNOME
 ~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris
 autotools eutils fdo-mime gnome.org gnome2 gnome2-utils libtool multilib portability toolchain-funcs user versionator
-dbus debug djvu doc dvi gnome gnome-keyring +introspection nautilus t1lib tiff debug
+dbus debug djvu dvi gnome gnome-keyring +introspection nautilus t1lib tiff debug



--- a/metadata/cache/dev-db/slony1-2.1.0
+++ b/metadata/cache/dev-db/slony1-2.1.0
@ -0,0 +1,22 @@
+|| ( dev-db/postgresql-server:9.1 dev-db/postgresql-server:9.0 dev-db/postgresql-server:8.4 dev-db/postgresql-server:8.3 ) dev-db/postgresql-base[threads] perl? ( dev-perl/DBD-Pg )
+
+0
+http://main.slony.info/downloads/2.1/source/slony1-2.1.0.tar.bz2 http://main.slony.info/downloads/2.1/source/slony1-2.1.0-docs.tar.bz2
+
+http://slony.info/
+BSD
+A replication system for the PostgreSQL Database Management System
+~amd64 ~ppc ~x86
+eutils multilib portability toolchain-funcs user versionator
+doc perl
+
+
+
+4
+
+configure install prepare setup
+
+
+
+
+
--- a/metadata/cache/dev-php/pecl-timezonedb-2010.15-r1
+++ b/metadata/cache/dev-php/pecl-timezonedb-2010.15-r1
@ -1,22 +0,0 @@
-|| ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
-|| ( =dev-php/pecl-timezonedb-2010.15-r1[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
-0
-http://pecl.php.net/get/timezonedb-2010.15.tgz
-
-http://pecl.php.net/timezonedb
-PHP-3
-Timezone Database to be used with PHP's date and time functions
-alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-autotools eutils flag-o-matic libtool multilib php-ext-pecl-r2 php-ext-source-r2 portability toolchain-funcs user
-php_targets_php5-3
-
-
-
-3
-
-compile configure install prepare test unpack
-
-
-
-
-
--- a/metadata/cache/dev-php/pecl-timezonedb-2011.14
+++ b/metadata/cache/dev-php/pecl-timezonedb-2011.14
@ -1,7 +1,7 @@
 || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
-|| ( =dev-php/pecl-timezonedb-2011.10[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
+|| ( =dev-php/pecl-timezonedb-2011.14[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
 0
-http://pecl.php.net/get/timezonedb-2011.10.tgz
+http://pecl.php.net/get/timezonedb-2011.14.tgz

 http://pecl.php.net/timezonedb
 PHP-3
@ -12,7 +12,7 @@ php_targets_php5-3



-3
+4

 compile configure install prepare test unpack

--- a/metadata/cache/dev-php/pecl-timezonedb-2011.3
+++ b/metadata/cache/dev-php/pecl-timezonedb-2011.3
@ -1,22 +0,0 @@
-|| ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
-|| ( =dev-php/pecl-timezonedb-2011.3[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
-0
-http://pecl.php.net/get/timezonedb-2011.3.tgz
-
-http://pecl.php.net/timezonedb
-PHP-3
-Timezone Database to be used with PHP's date and time functions
-~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-autotools eutils flag-o-matic libtool multilib php-ext-pecl-r2 php-ext-source-r2 portability toolchain-funcs user
-php_targets_php5-3
-
-
-
-3
-
-compile configure install prepare test unpack
-
-
-
-
-
--- a/metadata/cache/dev-php/pecl-timezonedb-2011.4
+++ b/metadata/cache/dev-php/pecl-timezonedb-2011.4
@ -1,22 +0,0 @@
-|| ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
-|| ( =dev-php/pecl-timezonedb-2011.4[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
-0
-http://pecl.php.net/get/timezonedb-2011.4.tgz
-
-http://pecl.php.net/timezonedb
-PHP-3
-Timezone Database to be used with PHP's date and time functions
-~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-autotools eutils flag-o-matic libtool multilib php-ext-pecl-r2 php-ext-source-r2 portability toolchain-funcs user
-php_targets_php5-3
-
-
-
-3
-
-compile configure install prepare test unpack
-
-
-
-
-
--- a/metadata/cache/dev-php/pecl-timezonedb-2011.7
+++ b/metadata/cache/dev-php/pecl-timezonedb-2011.7
@ -1,22 +0,0 @@
-|| ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
-|| ( =dev-php/pecl-timezonedb-2011.7[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
-0
-http://pecl.php.net/get/timezonedb-2011.7.tgz
-
-http://pecl.php.net/timezonedb
-PHP-3
-Timezone Database to be used with PHP's date and time functions
-~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-autotools eutils flag-o-matic libtool multilib php-ext-pecl-r2 php-ext-source-r2 portability toolchain-funcs user
-php_targets_php5-3
-
-
-
-3
-
-compile configure install prepare test unpack
-
-
-
-
-
--- a/metadata/cache/dev-python/pymongo-2.1.1
+++ b/metadata/cache/dev-python/pymongo-2.1.1
@ -0,0 +1,22 @@
+dev-db/mongodb dev-python/setuptools doc? ( dev-python/sphinx ) >=app-admin/eselect-python-20091230 =dev-lang/python-2* test? ( dev-python/nose )
+dev-db/mongodb >=app-admin/eselect-python-20091230 =dev-lang/python-2*
+0
+mirror://pypi/p/pymongo/pymongo-2.1.1.tar.gz
+
+http://github.com/mongodb/mongo-python-driver http://pypi.python.org/pypi/pymongo
+Apache-2.0
+Python driver for MongoDB
+~amd64 ~x86
+distutils multilib python toolchain-funcs
+doc mod_wsgi test
+
+
+
+3
+
+compile install postinst postrm prepare test
+
+
+
+
+
--- a/metadata/cache/games-puzzle/drod-bin-1.6.6
+++ b/metadata/cache/games-puzzle/drod-bin-1.6.6
@ -1,5 +1,5 @@

-
+x11-libs/libX11 amd64? ( app-emulation/emul-linux-x86-xlibs )
 0
 mirror://sourceforge/drod/CDROD-1.6.6-setup.sh.bin
 strip
--- a/metadata/cache/kde-base/ksecrets-4.8.0
+++ b/metadata/cache/kde-base/ksecrets-4.8.0
@ -1,4 +1,4 @@
-app-crypt/qca:2 net-libs/libssh2 >=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.4:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility,kde] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.0:4[aqua=]
+app-crypt/qca:2 net-libs/libssh2 >=kde-base/libkworkspace-4.8.0:4[aqua=] >=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.4:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility,kde] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.0:4[aqua=]
 app-crypt/qca:2 net-libs/libssh2 >=kde-base/oxygen-icons-4.8.0:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility,kde] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.8.0:4[aqua=]
 4
 mirror://kde/stable/4.8.0/src/ksecrets-4.8.0.tar.bz2
--- a/metadata/cache/media-gfx/imagemagick-6.7.5.0
+++ b/metadata/cache/media-gfx/imagemagick-6.7.5.0
@ -0,0 +1,22 @@
+>=sys-devel/libtool-2.2.6b autotrace? ( >=media-gfx/autotrace-0.31.1 ) bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( >=media-gfx/graphviz-2.6 ) gs? ( app-text/ghostscript-gpl ) jbig? ( media-libs/jbigkit ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/jasper ) lcms? ( media-libs/lcms:2 ) lqr? ( >=media-libs/liblqr-0.1.0 ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.6-r6 ) png? ( media-libs/libpng:0 ) raw? ( media-gfx/ufraw ) svg? ( >=gnome-base/librsvg-2.9.0 ) tiff? ( media-libs/tiff:0 ) truetype? ( media-libs/freetype:2 ) webp? ( media-libs/libwebp ) wmf? ( >=media-libs/libwmf-0.2.8 ) X? ( x11-libs/libXext x11-libs/libXt x11-libs/libICE x11-libs/libSM ) xml? ( >=dev-libs/libxml2-2.4.10 ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib ) !media-gfx/graphicsmagick[imagemagick] app-arch/xz-utils dev-util/pkgconfig >=sys-apps/sed-4 X? ( x11-proto/xextproto )
+>=sys-devel/libtool-2.2.6b autotrace? ( >=media-gfx/autotrace-0.31.1 ) bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( >=media-gfx/graphviz-2.6 ) gs? ( app-text/ghostscript-gpl ) jbig? ( media-libs/jbigkit ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/jasper ) lcms? ( media-libs/lcms:2 ) lqr? ( >=media-libs/liblqr-0.1.0 ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.6-r6 ) png? ( media-libs/libpng:0 ) raw? ( media-gfx/ufraw ) svg? ( >=gnome-base/librsvg-2.9.0 ) tiff? ( media-libs/tiff:0 ) truetype? ( media-libs/freetype:2 ) webp? ( media-libs/libwebp ) wmf? ( >=media-libs/libwmf-0.2.8 ) X? ( x11-libs/libXext x11-libs/libXt x11-libs/libICE x11-libs/libSM ) xml? ( >=dev-libs/libxml2-2.4.10 ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib )
+0
+mirror://imagemagick/ImageMagick-6.7.5-0.tar.xz
+perl? ( userpriv )
+http://www.imagemagick.org/
+imagemagick
+A collection of tools and libraries for many image formats
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+eutils multilib portability toolchain-funcs user versionator
+autotrace bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz gs hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png q32 q64 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib
+corefonts? ( truetype ) test? ( corefonts )
+
+
+4
+
+configure install test
+
+
+
+
+
--- a/metadata/cache/media-plugins/gst-plugins-meta-0.10-r2
+++ b/metadata/cache/media-plugins/gst-plugins-meta-0.10-r2
@ -1,22 +0,0 @@
-
-=media-libs/gstreamer-0.10* =media-libs/gst-plugins-base-0.10* =media-libs/gst-plugins-good-0.10* a52? ( >=media-plugins/gst-plugins-a52dec-0.10 ) alsa? ( >=media-plugins/gst-plugins-alsa-0.10 ) dvb? ( media-plugins/gst-plugins-dvb >=media-libs/gst-plugins-bad-0.10.6 ) dvd? ( >=media-libs/gst-plugins-ugly-0.10 >=media-plugins/gst-plugins-a52dec-0.10 >=media-plugins/gst-plugins-dvdread-0.10 >=media-plugins/gst-plugins-mpeg2dec-0.10 ) esd? ( >=media-plugins/gst-plugins-esd-0.10 ) ffmpeg? ( >=media-plugins/gst-plugins-ffmpeg-0.10 ) flac? ( >=media-plugins/gst-plugins-flac-0.10 ) mad? ( >=media-plugins/gst-plugins-mad-0.10 ) mpeg? ( >=media-plugins/gst-plugins-mpeg2dec-0.10 ) mythtv? ( media-plugins/gst-plugins-mythtv ) ogg? ( >=media-plugins/gst-plugins-ogg-0.10 ) oss? ( >=media-plugins/gst-plugins-oss-0.10 ) theora? ( >=media-plugins/gst-plugins-ogg-0.10 >=media-plugins/gst-plugins-theora-0.10 ) vorbis? ( >=media-plugins/gst-plugins-ogg-0.10 >=media-plugins/gst-plugins-vorbis-0.10 ) X? ( >=media-plugins/gst-plugins-x-0.10 ) xv? ( >=media-plugins/gst-plugins-xvideo-0.10 )
-0.10
-
-
-http://www.gentoo.org
-GPL-2
-Meta ebuild to pull in gst plugins for apps
-alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd
-
-a52 alsa dvb dvd esd ffmpeg flac mad mpeg mythtv ogg oss theora vorbis X xv
-
-
-
-
-
-
-
-
-
-
-
--- a/metadata/cache/media-plugins/gst-plugins-meta-0.10-r5
+++ b/metadata/cache/media-plugins/gst-plugins-meta-0.10-r5
@ -1,22 +0,0 @@
-
-=media-libs/gstreamer-0.10* =media-libs/gst-plugins-base-0.10* =media-libs/gst-plugins-good-0.10* a52? ( >=media-plugins/gst-plugins-a52dec-0.10 ) aac? ( >=media-plugins/gst-plugins-faad-0.10 ) alsa? ( >=media-plugins/gst-plugins-alsa-0.10 ) dv? ( >=media-plugins/gst-plugins-dv-0.10 ) dvb? ( media-plugins/gst-plugins-dvb >=media-libs/gst-plugins-bad-0.10.6 ) dvd? ( >=media-libs/gst-plugins-ugly-0.10 >=media-plugins/gst-plugins-a52dec-0.10 >=media-plugins/gst-plugins-dvdread-0.10 >=media-plugins/gst-plugins-mpeg2dec-0.10 >=media-plugins/gst-plugins-resindvd-0.10.14 ) esd? ( >=media-plugins/gst-plugins-esd-0.10 ) ffmpeg? ( >=media-plugins/gst-plugins-ffmpeg-0.10 ) flac? ( >=media-plugins/gst-plugins-flac-0.10 ) lame? ( >=media-plugins/gst-plugins-lame-0.10 ) mp3? ( >=media-libs/gst-plugins-ugly-0.10 >=media-plugins/gst-plugins-mad-0.10 ) mpeg? ( >=media-plugins/gst-plugins-mpeg2dec-0.10 ) musepack? ( >=media-plugins/gst-plugins-musepack-0.10 ) mythtv? ( media-plugins/gst-plugins-mythtv ) ogg? ( >=media-plugins/gst-plugins-ogg-0.10 ) oss? ( >=media-plugins/gst-plugins-oss-0.10 ) pulseaudio? ( >=media-plugins/gst-plugins-pulse-0.10 ) theora? ( >=media-plugins/gst-plugins-ogg-0.10 >=media-plugins/gst-plugins-theora-0.10 ) taglib? ( media-plugins/gst-plugins-taglib ) v4l? ( >=media-plugins/gst-plugins-v4l2-0.10 ) vorbis? ( >=media-plugins/gst-plugins-ogg-0.10 >=media-plugins/gst-plugins-vorbis-0.10 ) wavpack? ( >=media-plugins/gst-plugins-wavpack-0.10 ) X? ( >=media-plugins/gst-plugins-x-0.10 ) xv? ( >=media-plugins/gst-plugins-xvideo-0.10 )
-0.10
-
-
-http://www.gentoo.org
-GPL-2
-Meta ebuild to pull in gst plugins for apps
-alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris
-
-aac a52 alsa dv dvb dvd esd ffmpeg flac lame mp3 mpeg musepack mythtv ogg oss pulseaudio taglib theora v4l vorbis wavpack X xv
-
-
-
-
-
-
-
-
-
-
-
--- a/metadata/cache/media-plugins/gst-plugins-meta-0.10-r7
+++ b/metadata/cache/media-plugins/gst-plugins-meta-0.10-r7
@ -0,0 +1,22 @@
+
+=media-libs/gstreamer-0.10* =media-libs/gst-plugins-base-0.10* =media-libs/gst-plugins-good-0.10* a52? ( >=media-plugins/gst-plugins-a52dec-0.10 ) aac? ( >=media-plugins/gst-plugins-faad-0.10 ) alsa? ( >=media-plugins/gst-plugins-alsa-0.10 ) dts? ( >=media-plugins/gst-plugins-dts-0.10 ) dv? ( >=media-plugins/gst-plugins-dv-0.10 ) dvb? ( media-plugins/gst-plugins-dvb >=media-libs/gst-plugins-bad-0.10.6 ) dvd? ( >=media-libs/gst-plugins-ugly-0.10 >=media-plugins/gst-plugins-a52dec-0.10 >=media-plugins/gst-plugins-dvdread-0.10 >=media-plugins/gst-plugins-mpeg2dec-0.10 >=media-plugins/gst-plugins-resindvd-0.10.14 ) esd? ( >=media-plugins/gst-plugins-esd-0.10 ) ffmpeg? ( >=media-plugins/gst-plugins-ffmpeg-0.10 ) flac? ( >=media-plugins/gst-plugins-flac-0.10 ) http? ( >=media-plugins/gst-plugins-soup-0.10 ) lame? ( >=media-plugins/gst-plugins-lame-0.10 ) libvisual? ( >=media-plugins/gst-plugins-libvisual-0.10 ) mms? ( >=media-plugins/gst-plugins-libmms-0.10 ) mp3? ( >=media-libs/gst-plugins-ugly-0.10 >=media-plugins/gst-plugins-mad-0.10 ) mpeg? ( >=media-plugins/gst-plugins-mpeg2dec-0.10 ) musepack? ( >=media-plugins/gst-plugins-musepack-0.10 ) mythtv? ( media-plugins/gst-plugins-mythtv ) ogg? ( >=media-plugins/gst-plugins-ogg-0.10 ) oss? ( >=media-plugins/gst-plugins-oss-0.10 ) pulseaudio? ( >=media-plugins/gst-plugins-pulse-0.10 ) theora? ( >=media-plugins/gst-plugins-ogg-0.10 >=media-plugins/gst-plugins-theora-0.10 ) taglib? ( media-plugins/gst-plugins-taglib ) v4l? ( >=media-plugins/gst-plugins-v4l2-0.10 ) vcd? ( >=media-plugins/gst-plugins-mplex-0.10 >=media-plugins/gst-plugins-mpeg2dec-0.10 ) vorbis? ( >=media-plugins/gst-plugins-ogg-0.10 >=media-plugins/gst-plugins-vorbis-0.10 ) vpx? ( >=media-plugins/gst-plugins-vp8-0.10 ) wavpack? ( >=media-plugins/gst-plugins-wavpack-0.10 ) X? ( >=media-plugins/gst-plugins-x-0.10 ) xv? ( >=media-plugins/gst-plugins-xvideo-0.10 )
+0.10
+
+
+http://www.gentoo.org
+GPL-2
+Meta ebuild to pull in gst plugins for apps
+~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris
+
+aac a52 alsa dts dv dvb dvd esd ffmpeg flac http lame libvisual mms mp3 mpeg musepack mythtv ogg oss pulseaudio taglib theora v4l vcd vorbis vpx wavpack X xv
+
+
+
+
+
+-
+
+
+
+
+
--- a/metadata/cache/media-sound/rhythmbox-0.12.8-r1
+++ b/metadata/cache/media-sound/rhythmbox-0.12.8-r1
@ -1,5 +1,5 @@
->=dev-libs/glib-2.18:2 dev-libs/libxml2:2 >=x11-libs/gtk+-2.18:2 >=dev-libs/dbus-glib-0.71 >=dev-libs/totem-pl-parser-2.26 >=gnome-base/gconf-2:2 >=gnome-extra/gnome-media-2.14 <gnome-extra/gnome-media-2.90 >=net-libs/libsoup-2.26:2.4 >=net-libs/libsoup-gnome-2.26:2.4 >=media-libs/gst-plugins-base-0.10.20:0.10 || ( >=media-libs/gst-plugins-base-0.10.24:0.10 >=media-libs/gst-plugins-bad-0.10.6 ) cdr? ( >=app-cdr/brasero-0.9.1 ) daap? ( >=net-dns/avahi-0.6 ) gnome-keyring? ( >=gnome-base/gnome-keyring-0.4.9 ) udev? ( ipod? ( >=media-libs/libgpod-0.6 ) mtp? ( >=media-libs/libmtp-0.3 ) || ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-145[extras] ) ) libnotify? ( >=x11-libs/libnotify-0.4.1 ) lirc? ( app-misc/lirc ) musicbrainz? ( media-libs/musicbrainz:3 media-libs/musicbrainz:1 ) python? ( >=dev-lang/python-2.4.2 || ( >=dev-lang/python-2.5 dev-python/celementtree ) >=dev-python/pygtk-2.8:2 >=dev-python/pygobject-2.15.4:2 >=dev-python/gconf-python-2.22 >=dev-python/libgnome-python-2.22 >=dev-python/gnome-keyring-python-2.22 >=dev-python/gst-python-0.10.8 webkit? ( dev-python/mako dev-python/pywebkitgtk ) upnp? ( media-video/coherence ) ) dev-util/pkgconfig >=dev-util/intltool-0.40 app-text/scrollkeeper >=app-text/gnome-doc-utils-0.9.1 doc? ( >=dev-util/gtk-doc-1.4 ) test? ( dev-libs/check ) >=sys-apps/sed-4 >=app-admin/eselect-python-20091230 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
->=dev-libs/glib-2.18:2 dev-libs/libxml2:2 >=x11-libs/gtk+-2.18:2 >=dev-libs/dbus-glib-0.71 >=dev-libs/totem-pl-parser-2.26 >=gnome-base/gconf-2:2 >=gnome-extra/gnome-media-2.14 <gnome-extra/gnome-media-2.90 >=net-libs/libsoup-2.26:2.4 >=net-libs/libsoup-gnome-2.26:2.4 >=media-libs/gst-plugins-base-0.10.20:0.10 || ( >=media-libs/gst-plugins-base-0.10.24:0.10 >=media-libs/gst-plugins-bad-0.10.6 ) cdr? ( >=app-cdr/brasero-0.9.1 ) daap? ( >=net-dns/avahi-0.6 ) gnome-keyring? ( >=gnome-base/gnome-keyring-0.4.9 ) udev? ( ipod? ( >=media-libs/libgpod-0.6 ) mtp? ( >=media-libs/libmtp-0.3 ) || ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-145[extras] ) ) libnotify? ( >=x11-libs/libnotify-0.4.1 ) lirc? ( app-misc/lirc ) musicbrainz? ( media-libs/musicbrainz:3 media-libs/musicbrainz:1 ) python? ( >=dev-lang/python-2.4.2 || ( >=dev-lang/python-2.5 dev-python/celementtree ) >=dev-python/pygtk-2.8:2 >=dev-python/pygobject-2.15.4:2 >=dev-python/gconf-python-2.22 >=dev-python/libgnome-python-2.22 >=dev-python/gnome-keyring-python-2.22 >=dev-python/gst-python-0.10.8 webkit? ( dev-python/mako dev-python/pywebkitgtk ) upnp? ( media-video/coherence ) ) >=media-plugins/gst-plugins-soup-0.10:0.10 >=media-plugins/gst-plugins-libmms-0.10:0.10 || ( >=media-plugins/gst-plugins-cdparanoia-0.10:0.10 >=media-plugins/gst-plugins-cdio-0.10:0.10 ) >=media-plugins/gst-plugins-meta-0.10-r2:0.10 >=media-plugins/gst-plugins-taglib-0.10.6:0.10 nsplugin? ( net-libs/xulrunner ) >=app-admin/eselect-python-20091230
+>=dev-libs/glib-2.18:2 dev-libs/libxml2:2 >=x11-libs/gtk+-2.18:2 >=dev-libs/dbus-glib-0.71 >=dev-libs/totem-pl-parser-2.26 >=gnome-base/gconf-2:2 >=gnome-extra/gnome-media-2.14 <gnome-extra/gnome-media-2.90 >=net-libs/libsoup-2.26:2.4 >=net-libs/libsoup-gnome-2.26:2.4 >=media-libs/gst-plugins-base-0.10.20:0.10 || ( >=media-libs/gst-plugins-base-0.10.24:0.10 >=media-libs/gst-plugins-bad-0.10.6 ) cdr? ( >=app-cdr/brasero-0.9.1 ) daap? ( >=net-dns/avahi-0.6 ) gnome-keyring? ( >=gnome-base/gnome-keyring-0.4.9 ) udev? ( ipod? ( >=media-libs/libgpod-0.6 ) mtp? ( >=media-libs/libmtp-0.3 ) || ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-145[extras] ) ) libnotify? ( >=x11-libs/libnotify-0.4.1 ) lirc? ( app-misc/lirc ) musicbrainz? ( media-libs/musicbrainz:3 media-libs/musicbrainz:1 ) python? ( || ( >=dev-lang/python-2.5 dev-python/celementtree ) >=dev-python/pygtk-2.8:2 >=dev-python/pygobject-2.15.4:2 >=dev-python/gconf-python-2.22 >=dev-python/libgnome-python-2.22 >=dev-python/gnome-keyring-python-2.22 >=dev-python/gst-python-0.10.8 webkit? ( dev-python/mako dev-python/pywebkitgtk ) upnp? ( media-video/coherence ) ) dev-util/pkgconfig >=dev-util/intltool-0.40 app-text/scrollkeeper >=app-text/gnome-doc-utils-0.9.1 doc? ( >=dev-util/gtk-doc-1.4 ) test? ( dev-libs/check ) >=sys-apps/sed-4 >=app-admin/eselect-python-20091230 python? ( =dev-lang/python-2* ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+>=dev-libs/glib-2.18:2 dev-libs/libxml2:2 >=x11-libs/gtk+-2.18:2 >=dev-libs/dbus-glib-0.71 >=dev-libs/totem-pl-parser-2.26 >=gnome-base/gconf-2:2 >=gnome-extra/gnome-media-2.14 <gnome-extra/gnome-media-2.90 >=net-libs/libsoup-2.26:2.4 >=net-libs/libsoup-gnome-2.26:2.4 >=media-libs/gst-plugins-base-0.10.20:0.10 || ( >=media-libs/gst-plugins-base-0.10.24:0.10 >=media-libs/gst-plugins-bad-0.10.6 ) cdr? ( >=app-cdr/brasero-0.9.1 ) daap? ( >=net-dns/avahi-0.6 ) gnome-keyring? ( >=gnome-base/gnome-keyring-0.4.9 ) udev? ( ipod? ( >=media-libs/libgpod-0.6 ) mtp? ( >=media-libs/libmtp-0.3 ) || ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-145[extras] ) ) libnotify? ( >=x11-libs/libnotify-0.4.1 ) lirc? ( app-misc/lirc ) musicbrainz? ( media-libs/musicbrainz:3 media-libs/musicbrainz:1 ) python? ( || ( >=dev-lang/python-2.5 dev-python/celementtree ) >=dev-python/pygtk-2.8:2 >=dev-python/pygobject-2.15.4:2 >=dev-python/gconf-python-2.22 >=dev-python/libgnome-python-2.22 >=dev-python/gnome-keyring-python-2.22 >=dev-python/gst-python-0.10.8 webkit? ( dev-python/mako dev-python/pywebkitgtk ) upnp? ( media-video/coherence ) ) >=media-plugins/gst-plugins-soup-0.10:0.10 >=media-plugins/gst-plugins-libmms-0.10:0.10 || ( >=media-plugins/gst-plugins-cdparanoia-0.10:0.10 >=media-plugins/gst-plugins-cdio-0.10:0.10 ) >=media-plugins/gst-plugins-meta-0.10-r2:0.10 >=media-plugins/gst-plugins-taglib-0.10.6:0.10 nsplugin? ( net-libs/xulrunner ) >=app-admin/eselect-python-20091230 python? ( =dev-lang/python-2* )
 0
 mirror://gnome/sources/rhythmbox/0.12/rhythmbox-0.12.8.tar.bz2

@ -8,11 +8,11 @@ GPL-2
 Music management and playback software for GNOME
 amd64 ppc ~ppc64 sparc x86
 eutils fdo-mime gnome.org gnome2 gnome2-utils libtool multilib portability python toolchain-funcs user versionator virtualx
-cdr daap doc gnome-keyring ipod libnotify lirc musicbrainz mtp nsplugin python test udev upnp webkit debug test
+cdr daap doc gnome-keyring ipod libnotify lirc musicbrainz mtp nsplugin python test udev upnp webkit test



-3
+4

 compile configure install postinst postrm preinst prepare setup test unpack

--- a/metadata/cache/net-fs/samba-3.5.12
+++ b/metadata/cache/net-fs/samba-3.5.12
@ -0,0 +1,22 @@
+dev-libs/popt !net-fs/samba-client !net-fs/samba-libs !net-fs/samba-server !net-fs/cifs-utils sys-libs/talloc sys-libs/tdb virtual/libiconv ads? ( virtual/krb5 sys-fs/e2fsprogs client? ( sys-apps/keyutils ) ) avahi? ( net-dns/avahi[dbus] ) caps? ( sys-libs/libcap ) client? ( !net-fs/mount-cifs dev-libs/iniparser ) cluster? ( >=dev-db/ctdb-1.0.114_p1 ) cups? ( net-print/cups ) fam? ( virtual/fam ) ldap? ( net-nds/openldap ) pam? ( virtual/pam winbind? ( dev-libs/iniparser ) ) readline? ( >=sys-libs/readline-5.2 ) syslog? ( virtual/logger )
+dev-libs/popt !net-fs/samba-client !net-fs/samba-libs !net-fs/samba-server !net-fs/cifs-utils sys-libs/talloc sys-libs/tdb virtual/libiconv ads? ( virtual/krb5 sys-fs/e2fsprogs client? ( sys-apps/keyutils ) ) avahi? ( net-dns/avahi[dbus] ) caps? ( sys-libs/libcap ) client? ( !net-fs/mount-cifs dev-libs/iniparser ) cluster? ( >=dev-db/ctdb-1.0.114_p1 ) cups? ( net-print/cups ) fam? ( virtual/fam ) ldap? ( net-nds/openldap ) pam? ( virtual/pam winbind? ( dev-libs/iniparser ) ) readline? ( >=sys-libs/readline-5.2 ) syslog? ( virtual/logger )
+0
+mirror://samba/samba-3.5.12.tar.gz http://dev.gentoo.org/~dagger/files/smb_traffic_analyzer_v2.diff.bz2
+test
+http://www.samba.org/
+GPL-3
+Library bits of the samba network filesystem
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
+eutils flag-o-matic multilib pam portability toolchain-funcs user versionator
+acl addns ads +aio avahi caps +client cluster cups debug doc examples fam ldap ldb +netapi pam quota +readline +server +smbclient smbsharemodes smbtav2 swat syslog winbind
+ads? ( ldap ) swat? ( server )
+
+
+4
+
+compile configure install postinst prepare setup
+
+
+
+
+
--- a/metadata/cache/net-fs/samba-3.6.0
+++ b/metadata/cache/net-fs/samba-3.6.0
@ -1,22 +0,0 @@
-dev-libs/popt !net-fs/samba-client !net-fs/samba-libs !net-fs/samba-server >=sys-libs/talloc-2.0.5 >=sys-libs/tdb-1.2.9 virtual/libiconv ads? ( virtual/krb5 sys-fs/e2fsprogs client? ( sys-apps/keyutils net-fs/cifs-utils[ads] ) ) avahi? ( net-dns/avahi[dbus] ) caps? ( sys-libs/libcap ) client? ( !net-fs/mount-cifs dev-libs/iniparser net-fs/cifs-utils ) cluster? ( >=dev-db/ctdb-1.0.114_p1 ) cups? ( net-print/cups ) debug? ( dev-libs/dmalloc ) fam? ( virtual/fam ) ldap? ( net-nds/openldap ) ldb? ( sys-libs/ldb ) pam? ( virtual/pam winbind? ( dev-libs/iniparser ) ) readline? ( >=sys-libs/readline-5.2 ) syslog? ( virtual/logger )
-dev-libs/popt !net-fs/samba-client !net-fs/samba-libs !net-fs/samba-server >=sys-libs/talloc-2.0.5 >=sys-libs/tdb-1.2.9 virtual/libiconv ads? ( virtual/krb5 sys-fs/e2fsprogs client? ( sys-apps/keyutils net-fs/cifs-utils[ads] ) ) avahi? ( net-dns/avahi[dbus] ) caps? ( sys-libs/libcap ) client? ( !net-fs/mount-cifs dev-libs/iniparser net-fs/cifs-utils ) cluster? ( >=dev-db/ctdb-1.0.114_p1 ) cups? ( net-print/cups ) debug? ( dev-libs/dmalloc ) fam? ( virtual/fam ) ldap? ( net-nds/openldap ) ldb? ( sys-libs/ldb ) pam? ( virtual/pam winbind? ( dev-libs/iniparser ) ) readline? ( >=sys-libs/readline-5.2 ) syslog? ( virtual/logger )
-0
-mirror://samba/samba-3.6.0.tar.gz
-test
-http://www.samba.org/
-GPL-3
-Library bits of the samba network filesystem
-~amd64 ~x86
-eutils flag-o-matic multilib pam portability toolchain-funcs user versionator
-acl addns ads +aio avahi caps +client cluster cups debug doc examples fam ldap ldb +netapi pam quota +readline +server +smbclient smbsharemodes swat syslog winbind
-ads? ( ldap ) swat? ( server )
-
-
-4
-
-compile configure install postinst prepare setup
-
-
-
-
-
--- a/metadata/cache/net-fs/samba-3.6.3
+++ b/metadata/cache/net-fs/samba-3.6.3
@ -1,7 +1,7 @@
 dev-libs/popt !net-fs/samba-client !net-fs/samba-libs !net-fs/samba-server >=sys-libs/talloc-2.0.5 >=sys-libs/tdb-1.2.9 virtual/libiconv ads? ( virtual/krb5 sys-fs/e2fsprogs client? ( sys-apps/keyutils kernel_linux? ( net-fs/cifs-utils[ads] ) ) ) avahi? ( net-dns/avahi[dbus] ) caps? ( sys-libs/libcap ) client? ( !net-fs/mount-cifs dev-libs/iniparser kernel_linux? ( net-fs/cifs-utils ) ) cluster? ( >=dev-db/ctdb-1.0.114_p1 ) cups? ( net-print/cups ) debug? ( dev-libs/dmalloc ) fam? ( virtual/fam ) ldap? ( net-nds/openldap ) ldb? ( sys-libs/ldb ) pam? ( virtual/pam winbind? ( dev-libs/iniparser ) ) readline? ( >=sys-libs/readline-5.2 ) syslog? ( virtual/logger )
 dev-libs/popt !net-fs/samba-client !net-fs/samba-libs !net-fs/samba-server >=sys-libs/talloc-2.0.5 >=sys-libs/tdb-1.2.9 virtual/libiconv ads? ( virtual/krb5 sys-fs/e2fsprogs client? ( sys-apps/keyutils kernel_linux? ( net-fs/cifs-utils[ads] ) ) ) avahi? ( net-dns/avahi[dbus] ) caps? ( sys-libs/libcap ) client? ( !net-fs/mount-cifs dev-libs/iniparser kernel_linux? ( net-fs/cifs-utils ) ) cluster? ( >=dev-db/ctdb-1.0.114_p1 ) cups? ( net-print/cups ) debug? ( dev-libs/dmalloc ) fam? ( virtual/fam ) ldap? ( net-nds/openldap ) ldb? ( sys-libs/ldb ) pam? ( virtual/pam winbind? ( dev-libs/iniparser ) ) readline? ( >=sys-libs/readline-5.2 ) syslog? ( virtual/logger )
 0
-mirror://samba/samba-3.6.1.tar.gz
+mirror://samba/samba-3.6.3.tar.gz
 test
 http://www.samba.org/
 GPL-3
--- a/metadata/cache/net-misc/wicd-1.7.1_beta2-r3
+++ b/metadata/cache/net-misc/wicd-1.7.1_beta2-r3
@ -1,22 +0,0 @@
->=app-admin/eselect-python-20091230 =dev-lang/python-2* =dev-lang/python-2*[ncurses?,xml]
-dev-python/dbus-python X? ( gtk? ( dev-python/pygtk || ( 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-0.9.9.1 <dev-python/urwid-1.0.0 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://downloads.wicd.net/src/testing/1.7.x/wicd-1.7.1b2.tar.bz2
-
-http://wicd.sourceforge.net/
-GPL-2
-A lightweight wired and wireless network manager for Linux
-amd64 ppc ppc64 x86
-distutils eutils multilib portability python toolchain-funcs user
-X +gtk ioctl libnotify ncurses nls +pm-utils
-
-
-
-3
-
-compile configure install postinst postrm prepare setup
-
-
-
-
-
--- a/metadata/cache/net-misc/wicd-1.7.1_beta2-r6
+++ b/metadata/cache/net-misc/wicd-1.7.1_beta2-r6
@ -1,22 +0,0 @@
->=app-admin/eselect-python-20091230 =dev-lang/python-2* =dev-lang/python-2*[ncurses?,xml]
-dev-python/dbus-python X? ( gtk? ( dev-python/pygtk || ( 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-0.9.9.1 <dev-python/urwid-1.0.0 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://downloads.wicd.net/src/testing/1.7.x/wicd-1.7.1b2.tar.bz2
-
-http://wicd.sourceforge.net/
-GPL-2
-A lightweight wired and wireless network manager for Linux
-~amd64 ~ppc ~ppc64 ~x86
-distutils eutils multilib portability python toolchain-funcs user
-X +gtk ioctl libnotify ncurses nls +pm-utils
-
-
-
-3
-
-compile configure install postinst postrm prepare setup
-
-
-
-
-
--- a/metadata/cache/net-misc/wicd-1.7.1_beta2-r7
+++ b/metadata/cache/net-misc/wicd-1.7.1_beta2-r7
@ -1,22 +0,0 @@
->=app-admin/eselect-python-20091230 =dev-lang/python-2* =dev-lang/python-2*[ncurses?,xml]
-dev-python/dbus-python X? ( gtk? ( dev-python/pygtk || ( 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-1.60_p201111202031570500 >=sys-apps/net-tools-1.60_p201111202031570500[old-output] 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-1.0.0 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://downloads.wicd.net/src/testing/1.7.x/wicd-1.7.1b2.tar.bz2
-
-http://wicd.sourceforge.net/
-GPL-2
-A lightweight wired and wireless network manager for Linux
-~amd64 ~ppc ~ppc64 ~x86
-distutils eutils multilib portability python toolchain-funcs user
-X +gtk ioctl libnotify ncurses nls +pm-utils
-
-
-
-3
-
-compile configure install postinst postrm prepare setup
-
-
-
-
-
--- a/metadata/cache/net-misc/wicd-1.7.1_pre20111210
+++ b/metadata/cache/net-misc/wicd-1.7.1_pre20111210
@ -1,22 +0,0 @@
->=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-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://dev.gentoo.org/~tomka/files/wicd-1.7.1_pre20111210.tar.gz
-
-http://wicd.sourceforge.net/
-GPL-2
-A lightweight wired and wireless network manager for Linux
-~amd64 ~ppc ~ppc64 ~x86
-distutils eutils multilib portability python systemd toolchain-funcs user
-X +gtk ioctl libnotify ncurses nls +pm-utils
-
-
-
-3
-
-compile configure install postinst postrm prepare setup
-
-
-
-
-
--- a/metadata/cache/net-print/splix-2.0.0_p20111206
+++ b/metadata/cache/net-print/splix-2.0.0_p20111206
@ -0,0 +1,22 @@
+>=app-text/ghostscript-gpl-9.02 >=net-print/cups-1.4.0 jbig? ( media-libs/jbigkit )
+>=app-text/ghostscript-gpl-9.02 >=net-print/cups-1.4.0 jbig? ( media-libs/jbigkit )
+0
+http://dev.gentoo.org/~voyageur/distfiles/splix-2.0.0_p20111206.tar.bz2 http://splix.ap2c.org/samsung_cms.tar.bz2
+
+http://splix.sourceforge.net/
+GPL-2
+A set of CUPS printer drivers for SPL (Samsung Printer Language) printers
+~amd64 ~x86
+eutils multilib portability toolchain-funcs user
+jbig
+
+
+
+4
+
+compile install postinst prepare
+
+
+
+
+
--- a/metadata/cache/sys-auth/polkit-0.104-r1
+++ b/metadata/cache/sys-auth/polkit-0.104-r1
@ -0,0 +1,22 @@
+>=dev-libs/glib-2.30 dev-libs/expat introspection? ( >=dev-libs/gobject-introspection-0.6.2 ) pam? ( virtual/pam ) systemd? ( sys-apps/systemd ) app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xsl-stylesheets dev-libs/libxslt dev-util/intltool dev-util/pkgconfig doc? ( >=dev-util/gtk-doc-1.13 )
+>=dev-libs/glib-2.30 dev-libs/expat introspection? ( >=dev-libs/gobject-introspection-0.6.2 ) pam? ( virtual/pam ) systemd? ( sys-apps/systemd )
+0
+http://hal.freedesktop.org/releases/polkit-0.104.tar.gz
+
+http://hal.freedesktop.org/docs/polkit/
+GPL-2
+Policy framework for controlling privileges for system-wide services
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd
+eutils flag-o-matic multilib pam portability toolchain-funcs user
+debug doc examples gtk +introspection kde nls pam systemd
+
+!systemd? ( >=sys-auth/consolekit-0.4.5[policykit] ) pam? ( sys-auth/pambase[consolekit] ) gtk? ( || ( >=gnome-extra/polkit-gnome-0.104 lxde-base/lxpolkit ) ) kde? ( sys-auth/polkit-kde-agent )
+
+4
+
+configure install postinst prepare
+
+
+
+
+
--- a/metadata/cache/sys-cluster/util-vserver-0.30.216_pre3004
+++ b/metadata/cache/sys-cluster/util-vserver-0.30.216_pre3004
@ -1,7 +1,7 @@
 >=dev-libs/dietlibc-0.30-r2 dev-libs/beecrypt net-firewall/iptables net-misc/vconfig sys-apps/iproute2 || ( >=sys-apps/coreutils-6.10-r1 sys-apps/mktemp )
 dev-libs/beecrypt net-firewall/iptables net-misc/vconfig sys-apps/iproute2 || ( >=sys-apps/coreutils-6.10-r1 sys-apps/mktemp ) bash-completion? ( app-admin/eselect )
 0
-http://people.linux-vserver.org/~dhozac/t/uv-testing/util-vserver-0.30.216-pre2935.tar.bz2
+http://people.linux-vserver.org/~dhozac/t/uv-testing/util-vserver-0.30.216-pre3004.tar.bz2

 http://www.nongnu.org/util-vserver/
 GPL-2
@ -12,9 +12,9 @@ bash-completion

 bash-completion? ( app-shells/bash-completion )

+4

-
-compile install postinst preinst setup
+compile configure install postinst preinst setup test



--- a/metadata/cache/sys-kernel/vserver-sources-2.3.2.6
+++ b/metadata/cache/sys-kernel/vserver-sources-2.3.2.6
@ -1,7 +1,7 @@
 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
-2.3.2.5
-mirror://kernel/linux/kernel/v3.x/patch-3.2.1.bz2 mirror://kernel/linux/kernel/v3.x/linux-3.2.tar.bz2 http://vserver.13thfloor.at/Experimental/patch-3.2.1-vs2.3.2.5.diff
+2.3.2.6
+mirror://kernel/linux/kernel/v3.x/patch-3.2.2.bz2 mirror://kernel/linux/kernel/v3.x/linux-3.2.tar.bz2 http://vserver.13thfloor.at/Experimental/patch-3.2.2-vs2.3.2.6.diff
 binchecks strip
 http://www.gentoo.org/proj/en/vps/
 GPL-2 freedist
--- a/metadata/cache/sys-power/acpi-1.6
+++ b/metadata/cache/sys-power/acpi-1.6
@ -0,0 +1,22 @@
+
+
+0
+mirror://sourceforge/acpiclient/acpi-1.6.tar.gz
+
+http://sourceforge.net/projects/acpiclient/
+GPL-2
+Attempts to replicate the functionality of the 'old' apm command on ACPI systems.
+~amd64 ~x86
+
+
+
+
+
+4
+
+-
+
+
+
+
+
--- a/metadata/cache/sys-power/acpitool-0.5.1-r1
+++ b/metadata/cache/sys-power/acpitool-0.5.1-r1
@ -0,0 +1,22 @@
+
+
+0
+mirror://gentoo/acpitool-0.5.1.tar.bz2
+
+http://packages.debian.org/sid/acpitool
+GPL-2
+A small command line application, intended to be a replacement for the apm tool
+~amd64 ~x86
+eutils multilib portability toolchain-funcs user
+
+
+
+
+4
+
+prepare
+
+
+
+
+
--- a/metadata/cache/www-plugins/lightspark-0.5.2.1
+++ b/metadata/cache/www-plugins/lightspark-0.5.2.1
@ -1,22 +0,0 @@
->=dev-cpp/libxmlpp-2.33.1:2.6 >=dev-libs/boost-1.42 dev-libs/libpcre[cxx] media-fonts/liberation-fonts virtual/ffmpeg media-libs/fontconfig media-libs/ftgl >=media-libs/glew-1.5.3 media-libs/libsdl pulseaudio? ( media-sound/pulseaudio ) rtmp? ( media-video/rtmpdump ) net-misc/curl >=sys-devel/gcc-4.4 || ( =sys-devel/llvm-2.8* >=sys-devel/llvm-2.10 ) virtual/opengl nsplugin? ( x11-libs/gtk+:2 x11-libs/gtkglext ) x11-libs/libX11 dev-lang/nasm dev-util/pkgconfig >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
->=dev-cpp/libxmlpp-2.33.1:2.6 >=dev-libs/boost-1.42 dev-libs/libpcre[cxx] media-fonts/liberation-fonts virtual/ffmpeg media-libs/fontconfig media-libs/ftgl >=media-libs/glew-1.5.3 media-libs/libsdl pulseaudio? ( media-sound/pulseaudio ) rtmp? ( media-video/rtmpdump ) net-misc/curl >=sys-devel/gcc-4.4 || ( =sys-devel/llvm-2.8* >=sys-devel/llvm-2.10 ) virtual/opengl nsplugin? ( x11-libs/gtk+:2 x11-libs/gtkglext ) x11-libs/libX11
-0
-http://launchpad.net/lightspark/trunk/lightspark-0.5.2.1/+download/lightspark-0.5.2.1.tar.gz
-
-http://lightspark.sourceforge.net/
-LGPL-3
-High performance flash player
-~amd64 ~x86
-base cmake-utils eutils flag-o-matic multilib nsplugins portability toolchain-funcs user versionator
-nsplugin profile pulseaudio rtmp sdl
-
-
-
-4
-
-compile configure install postinst prepare test unpack
-
-
-
-
-
--- a/metadata/cache/www-plugins/lightspark-0.5.4
+++ b/metadata/cache/www-plugins/lightspark-0.5.4
@ -1,7 +1,7 @@
->=dev-cpp/libxmlpp-2.33.1:2.6 >=dev-libs/boost-1.42 dev-libs/libpcre[cxx] media-fonts/liberation-fonts virtual/ffmpeg media-libs/fontconfig media-libs/ftgl >=media-libs/glew-1.5.3 media-libs/libsdl pulseaudio? ( media-sound/pulseaudio ) rtmp? ( media-video/rtmpdump ) net-misc/curl >=sys-devel/gcc-4.4 >=sys-devel/llvm-2.8-r2 virtual/opengl nsplugin? ( dev-libs/nspr net-libs/xulrunner x11-libs/gtk+:2 x11-libs/gtkglext ) x11-libs/libX11 dev-lang/nasm dev-util/pkgconfig >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
->=dev-cpp/libxmlpp-2.33.1:2.6 >=dev-libs/boost-1.42 dev-libs/libpcre[cxx] media-fonts/liberation-fonts virtual/ffmpeg media-libs/fontconfig media-libs/ftgl >=media-libs/glew-1.5.3 media-libs/libsdl pulseaudio? ( media-sound/pulseaudio ) rtmp? ( media-video/rtmpdump ) net-misc/curl >=sys-devel/gcc-4.4 >=sys-devel/llvm-2.8-r2 virtual/opengl nsplugin? ( dev-libs/nspr net-libs/xulrunner x11-libs/gtk+:2 x11-libs/gtkglext ) x11-libs/libX11
+>=dev-cpp/libxmlpp-2.33.1:2.6 >=dev-libs/boost-1.42 dev-libs/libpcre[cxx] media-fonts/liberation-fonts virtual/ffmpeg media-libs/fontconfig media-libs/ftgl >=media-libs/glew-1.5.3 media-libs/libsdl pulseaudio? ( media-sound/pulseaudio ) rtmp? ( media-video/rtmpdump ) net-misc/curl >=sys-devel/gcc-4.4 || ( >=sys-devel/llvm-3 =sys-devel/llvm-2.8* ) virtual/opengl nsplugin? ( dev-libs/nspr net-libs/xulrunner x11-libs/gtk+:2 x11-libs/gtkglext ) x11-libs/libX11 dev-lang/nasm dev-util/pkgconfig >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+>=dev-cpp/libxmlpp-2.33.1:2.6 >=dev-libs/boost-1.42 dev-libs/libpcre[cxx] media-fonts/liberation-fonts virtual/ffmpeg media-libs/fontconfig media-libs/ftgl >=media-libs/glew-1.5.3 media-libs/libsdl pulseaudio? ( media-sound/pulseaudio ) rtmp? ( media-video/rtmpdump ) net-misc/curl >=sys-devel/gcc-4.4 || ( >=sys-devel/llvm-3 =sys-devel/llvm-2.8* ) virtual/opengl nsplugin? ( dev-libs/nspr net-libs/xulrunner x11-libs/gtk+:2 x11-libs/gtkglext ) x11-libs/libX11
 0
-http://launchpad.net/lightspark/trunk/lightspark-0.5.0/+download/lightspark-0.5.0.tar.gz
+http://launchpad.net/lightspark/trunk/lightspark-0.5.4/+download/lightspark-0.5.4.tar.gz

 http://lightspark.sourceforge.net/
 LGPL-3
--- a/metadata/cache/x11-base/xorg-server-1.11.2-r1
+++ b/metadata/cache/x11-base/xorg-server-1.11.2-r1
@ -1,5 +1,5 @@
->=app-admin/eselect-opengl-1.0.8 dev-libs/openssl media-libs/freetype >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libpciaccess-0.10.3 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont-1.4.2 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/pixman-0.21.8 >=x11-libs/xtrans-1.2.2 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-1.4 dmx? ( x11-libs/libXt >=x11-libs/libdmx-1.0.99.1 >=x11-libs/libX11-1.1.5 >=x11-libs/libXaw-1.0.4 >=x11-libs/libXext-1.0.99.4 >=x11-libs/libXfixes-5.0 >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXmu-1.0.3 x11-libs/libXrender >=x11-libs/libXres-1.0.3 >=x11-libs/libXtst-1.0.99.2 ) kdrive? ( >=x11-libs/libXext-1.0.5 x11-libs/libXv ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-7.8_rc[nptl=] ) tslib? ( >=x11-libs/tslib-1.0 ) udev? ( >=sys-fs/udev-150 ) >=x11-apps/xinit-1.3 sys-devel/flex >=x11-proto/bigreqsproto-1.1.0 >=x11-proto/compositeproto-0.4 >=x11-proto/damageproto-1.1 >=x11-proto/fixesproto-5.0 >=x11-proto/fontsproto-2.0.2 >=x11-proto/glproto-1.4.14 >=x11-proto/inputproto-1.9.99.902 >=x11-proto/kbproto-1.0.3 >=x11-proto/randrproto-1.2.99.3 >=x11-proto/recordproto-1.13.99.1 >=x11-proto/renderproto-0.11 >=x11-proto/resourceproto-1.0.2 >=x11-proto/scrnsaverproto-1.1 >=x11-proto/trapproto-3.4.3 >=x11-proto/videoproto-2.2.2 >=x11-proto/xcmiscproto-1.2.0 >=x11-proto/xextproto-7.1.99 >=x11-proto/xf86dgaproto-2.0.99.1 >=x11-proto/xf86rushproto-1.1.2 >=x11-proto/xf86vidmodeproto-2.2.99.1 >=x11-proto/xineramaproto-1.1.3 >=x11-proto/xproto-7.0.22 dmx? ( >=x11-proto/dmxproto-2.2.99.1 doc? ( || ( www-client/links www-client/lynx www-client/w3m ) ) ) !minimal? ( >=x11-proto/xf86driproto-2.1.0 >=x11-proto/dri2proto-2.6 >=x11-libs/libdrm-2.4.20 ) x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.15.0 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.15.0 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.15.0 >=media-fonts/font-util-1.2.0 ) >=dev-util/pkgconfig-0.23 doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
->=app-admin/eselect-opengl-1.0.8 dev-libs/openssl media-libs/freetype >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libpciaccess-0.10.3 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont-1.4.2 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/pixman-0.21.8 >=x11-libs/xtrans-1.2.2 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-1.4 dmx? ( x11-libs/libXt >=x11-libs/libdmx-1.0.99.1 >=x11-libs/libX11-1.1.5 >=x11-libs/libXaw-1.0.4 >=x11-libs/libXext-1.0.99.4 >=x11-libs/libXfixes-5.0 >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXmu-1.0.3 x11-libs/libXrender >=x11-libs/libXres-1.0.3 >=x11-libs/libXtst-1.0.99.2 ) kdrive? ( >=x11-libs/libXext-1.0.5 x11-libs/libXv ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-7.8_rc[nptl=] ) tslib? ( >=x11-libs/tslib-1.0 ) udev? ( >=sys-fs/udev-150 ) >=x11-apps/xinit-1.3
+>=app-admin/eselect-opengl-1.0.8 dev-libs/openssl media-libs/freetype >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libpciaccess-0.10.3 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont-1.4.2 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/pixman-0.21.8 >=x11-libs/xtrans-1.2.2 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 dmx? ( x11-libs/libXt >=x11-libs/libdmx-1.0.99.1 >=x11-libs/libX11-1.1.5 >=x11-libs/libXaw-1.0.4 >=x11-libs/libXext-1.0.99.4 >=x11-libs/libXfixes-5.0 >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXmu-1.0.3 x11-libs/libXrender >=x11-libs/libXres-1.0.3 >=x11-libs/libXtst-1.0.99.2 ) kdrive? ( >=x11-libs/libXext-1.0.5 x11-libs/libXv ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-7.8_rc[nptl=] ) tslib? ( >=x11-libs/tslib-1.0 ) udev? ( >=sys-fs/udev-150 ) >=x11-apps/xinit-1.3 sys-devel/flex >=x11-proto/bigreqsproto-1.1.0 >=x11-proto/compositeproto-0.4 >=x11-proto/damageproto-1.1 >=x11-proto/fixesproto-5.0 >=x11-proto/fontsproto-2.0.2 >=x11-proto/glproto-1.4.14 >=x11-proto/inputproto-1.9.99.902 >=x11-proto/kbproto-1.0.3 >=x11-proto/randrproto-1.2.99.3 >=x11-proto/recordproto-1.13.99.1 >=x11-proto/renderproto-0.11 >=x11-proto/resourceproto-1.0.2 >=x11-proto/scrnsaverproto-1.1 >=x11-proto/trapproto-3.4.3 >=x11-proto/videoproto-2.2.2 >=x11-proto/xcmiscproto-1.2.0 >=x11-proto/xextproto-7.1.99 >=x11-proto/xf86dgaproto-2.0.99.1 >=x11-proto/xf86rushproto-1.1.2 >=x11-proto/xf86vidmodeproto-2.2.99.1 >=x11-proto/xineramaproto-1.1.3 >=x11-proto/xproto-7.0.22 dmx? ( >=x11-proto/dmxproto-2.2.99.1 doc? ( || ( www-client/links www-client/lynx www-client/w3m ) ) ) !minimal? ( >=x11-proto/xf86driproto-2.1.0 >=x11-proto/dri2proto-2.6 >=x11-libs/libdrm-2.4.20 ) x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.15.0 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.15.0 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.15.0 >=media-fonts/font-util-1.2.0 ) >=dev-util/pkgconfig-0.23 doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
+>=app-admin/eselect-opengl-1.0.8 dev-libs/openssl media-libs/freetype >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libpciaccess-0.10.3 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont-1.4.2 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/pixman-0.21.8 >=x11-libs/xtrans-1.2.2 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 dmx? ( x11-libs/libXt >=x11-libs/libdmx-1.0.99.1 >=x11-libs/libX11-1.1.5 >=x11-libs/libXaw-1.0.4 >=x11-libs/libXext-1.0.99.4 >=x11-libs/libXfixes-5.0 >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXmu-1.0.3 x11-libs/libXrender >=x11-libs/libXres-1.0.3 >=x11-libs/libXtst-1.0.99.2 ) kdrive? ( >=x11-libs/libXext-1.0.5 x11-libs/libXv ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-7.8_rc[nptl=] ) tslib? ( >=x11-libs/tslib-1.0 ) udev? ( >=sys-fs/udev-150 ) >=x11-apps/xinit-1.3
 0
 http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.11.2.tar.bz2

--- a/metadata/cache/x11-base/xorg-server-1.11.2-r2
+++ b/metadata/cache/x11-base/xorg-server-1.11.2-r2
@ -1,5 +1,5 @@
->=app-admin/eselect-opengl-1.0.8 dev-libs/openssl media-libs/freetype >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libpciaccess-0.10.3 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont-1.4.2 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/pixman-0.21.8 >=x11-libs/xtrans-1.2.2 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-1.4 dmx? ( x11-libs/libXt >=x11-libs/libdmx-1.0.99.1 >=x11-libs/libX11-1.1.5 >=x11-libs/libXaw-1.0.4 >=x11-libs/libXext-1.0.99.4 >=x11-libs/libXfixes-5.0 >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXmu-1.0.3 x11-libs/libXrender >=x11-libs/libXres-1.0.3 >=x11-libs/libXtst-1.0.99.2 ) kdrive? ( >=x11-libs/libXext-1.0.5 x11-libs/libXv ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-7.8_rc[nptl=] ) tslib? ( >=x11-libs/tslib-1.0 ) udev? ( >=sys-fs/udev-150 ) >=x11-apps/xinit-1.3 sys-devel/flex >=x11-proto/bigreqsproto-1.1.0 >=x11-proto/compositeproto-0.4 >=x11-proto/damageproto-1.1 >=x11-proto/fixesproto-5.0 >=x11-proto/fontsproto-2.0.2 >=x11-proto/glproto-1.4.14 >=x11-proto/inputproto-1.9.99.902 >=x11-proto/kbproto-1.0.3 >=x11-proto/randrproto-1.2.99.3 >=x11-proto/recordproto-1.13.99.1 >=x11-proto/renderproto-0.11 >=x11-proto/resourceproto-1.0.2 >=x11-proto/scrnsaverproto-1.1 >=x11-proto/trapproto-3.4.3 >=x11-proto/videoproto-2.2.2 >=x11-proto/xcmiscproto-1.2.0 >=x11-proto/xextproto-7.1.99 >=x11-proto/xf86dgaproto-2.0.99.1 >=x11-proto/xf86rushproto-1.1.2 >=x11-proto/xf86vidmodeproto-2.2.99.1 >=x11-proto/xineramaproto-1.1.3 >=x11-proto/xproto-7.0.22 dmx? ( >=x11-proto/dmxproto-2.2.99.1 doc? ( || ( www-client/links www-client/lynx www-client/w3m ) ) ) !minimal? ( >=x11-proto/xf86driproto-2.1.0 >=x11-proto/dri2proto-2.6 >=x11-libs/libdrm-2.4.20 ) x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.15.0 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.15.0 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.15.0 >=media-fonts/font-util-1.2.0 ) >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.15.0 >=media-fonts/font-util-1.2.0 >=dev-util/pkgconfig-0.23 doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
->=app-admin/eselect-opengl-1.0.8 dev-libs/openssl media-libs/freetype >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libpciaccess-0.10.3 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont-1.4.2 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/pixman-0.21.8 >=x11-libs/xtrans-1.2.2 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-1.4 dmx? ( x11-libs/libXt >=x11-libs/libdmx-1.0.99.1 >=x11-libs/libX11-1.1.5 >=x11-libs/libXaw-1.0.4 >=x11-libs/libXext-1.0.99.4 >=x11-libs/libXfixes-5.0 >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXmu-1.0.3 x11-libs/libXrender >=x11-libs/libXres-1.0.3 >=x11-libs/libXtst-1.0.99.2 ) kdrive? ( >=x11-libs/libXext-1.0.5 x11-libs/libXv ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-7.8_rc[nptl=] ) tslib? ( >=x11-libs/tslib-1.0 ) udev? ( >=sys-fs/udev-150 ) >=x11-apps/xinit-1.3
+>=app-admin/eselect-opengl-1.0.8 dev-libs/openssl media-libs/freetype >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libpciaccess-0.10.3 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont-1.4.2 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/pixman-0.21.8 >=x11-libs/xtrans-1.2.2 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 dmx? ( x11-libs/libXt >=x11-libs/libdmx-1.0.99.1 >=x11-libs/libX11-1.1.5 >=x11-libs/libXaw-1.0.4 >=x11-libs/libXext-1.0.99.4 >=x11-libs/libXfixes-5.0 >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXmu-1.0.3 x11-libs/libXrender >=x11-libs/libXres-1.0.3 >=x11-libs/libXtst-1.0.99.2 ) kdrive? ( >=x11-libs/libXext-1.0.5 x11-libs/libXv ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-7.8_rc[nptl=] ) tslib? ( >=x11-libs/tslib-1.0 ) udev? ( >=sys-fs/udev-150 ) >=x11-apps/xinit-1.3 sys-devel/flex >=x11-proto/bigreqsproto-1.1.0 >=x11-proto/compositeproto-0.4 >=x11-proto/damageproto-1.1 >=x11-proto/fixesproto-5.0 >=x11-proto/fontsproto-2.0.2 >=x11-proto/glproto-1.4.14 >=x11-proto/inputproto-1.9.99.902 >=x11-proto/kbproto-1.0.3 >=x11-proto/randrproto-1.2.99.3 >=x11-proto/recordproto-1.13.99.1 >=x11-proto/renderproto-0.11 >=x11-proto/resourceproto-1.0.2 >=x11-proto/scrnsaverproto-1.1 >=x11-proto/trapproto-3.4.3 >=x11-proto/videoproto-2.2.2 >=x11-proto/xcmiscproto-1.2.0 >=x11-proto/xextproto-7.1.99 >=x11-proto/xf86dgaproto-2.0.99.1 >=x11-proto/xf86rushproto-1.1.2 >=x11-proto/xf86vidmodeproto-2.2.99.1 >=x11-proto/xineramaproto-1.1.3 >=x11-proto/xproto-7.0.22 dmx? ( >=x11-proto/dmxproto-2.2.99.1 doc? ( || ( www-client/links www-client/lynx www-client/w3m ) ) ) !minimal? ( >=x11-proto/xf86driproto-2.1.0 >=x11-proto/dri2proto-2.6 >=x11-libs/libdrm-2.4.20 ) x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.15.0 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.15.0 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.15.0 >=media-fonts/font-util-1.2.0 ) >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.15.0 >=media-fonts/font-util-1.2.0 >=dev-util/pkgconfig-0.23 doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
+>=app-admin/eselect-opengl-1.0.8 dev-libs/openssl media-libs/freetype >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libpciaccess-0.10.3 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont-1.4.2 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/pixman-0.21.8 >=x11-libs/xtrans-1.2.2 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 dmx? ( x11-libs/libXt >=x11-libs/libdmx-1.0.99.1 >=x11-libs/libX11-1.1.5 >=x11-libs/libXaw-1.0.4 >=x11-libs/libXext-1.0.99.4 >=x11-libs/libXfixes-5.0 >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXmu-1.0.3 x11-libs/libXrender >=x11-libs/libXres-1.0.3 >=x11-libs/libXtst-1.0.99.2 ) kdrive? ( >=x11-libs/libXext-1.0.5 x11-libs/libXv ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-7.8_rc[nptl=] ) tslib? ( >=x11-libs/tslib-1.0 ) udev? ( >=sys-fs/udev-150 ) >=x11-apps/xinit-1.3
 0
 http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.11.2.tar.bz2

--- a/metadata/cache/x11-base/xorg-server-1.11.3
+++ b/metadata/cache/x11-base/xorg-server-1.11.3
@ -1,5 +1,5 @@
->=app-admin/eselect-opengl-1.0.8 dev-libs/openssl media-libs/freetype >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libpciaccess-0.10.3 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont-1.4.2 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/pixman-0.21.8 >=x11-libs/xtrans-1.2.2 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-1.4 dmx? ( x11-libs/libXt >=x11-libs/libdmx-1.0.99.1 >=x11-libs/libX11-1.1.5 >=x11-libs/libXaw-1.0.4 >=x11-libs/libXext-1.0.99.4 >=x11-libs/libXfixes-5.0 >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXmu-1.0.3 x11-libs/libXrender >=x11-libs/libXres-1.0.3 >=x11-libs/libXtst-1.0.99.2 ) kdrive? ( >=x11-libs/libXext-1.0.5 x11-libs/libXv ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-7.8_rc[nptl=] ) tslib? ( >=x11-libs/tslib-1.0 ) udev? ( >=sys-fs/udev-150 ) >=x11-apps/xinit-1.3 sys-devel/flex >=x11-proto/bigreqsproto-1.1.0 >=x11-proto/compositeproto-0.4 >=x11-proto/damageproto-1.1 >=x11-proto/fixesproto-5.0 >=x11-proto/fontsproto-2.0.2 >=x11-proto/glproto-1.4.14 >=x11-proto/inputproto-1.9.99.902 >=x11-proto/kbproto-1.0.3 >=x11-proto/randrproto-1.2.99.3 >=x11-proto/recordproto-1.13.99.1 >=x11-proto/renderproto-0.11 >=x11-proto/resourceproto-1.0.2 >=x11-proto/scrnsaverproto-1.1 >=x11-proto/trapproto-3.4.3 >=x11-proto/videoproto-2.2.2 >=x11-proto/xcmiscproto-1.2.0 >=x11-proto/xextproto-7.1.99 >=x11-proto/xf86dgaproto-2.0.99.1 >=x11-proto/xf86rushproto-1.1.2 >=x11-proto/xf86vidmodeproto-2.2.99.1 >=x11-proto/xineramaproto-1.1.3 >=x11-proto/xproto-7.0.22 dmx? ( >=x11-proto/dmxproto-2.2.99.1 doc? ( || ( www-client/links www-client/lynx www-client/w3m ) ) ) !minimal? ( >=x11-proto/xf86driproto-2.1.0 >=x11-proto/dri2proto-2.6 >=x11-libs/libdrm-2.4.20 ) x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.15.0 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.15.0 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.15.0 >=media-fonts/font-util-1.2.0 ) >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.15.0 >=media-fonts/font-util-1.2.0 >=dev-util/pkgconfig-0.23 doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
->=app-admin/eselect-opengl-1.0.8 dev-libs/openssl media-libs/freetype >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libpciaccess-0.10.3 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont-1.4.2 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/pixman-0.21.8 >=x11-libs/xtrans-1.2.2 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-1.4 dmx? ( x11-libs/libXt >=x11-libs/libdmx-1.0.99.1 >=x11-libs/libX11-1.1.5 >=x11-libs/libXaw-1.0.4 >=x11-libs/libXext-1.0.99.4 >=x11-libs/libXfixes-5.0 >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXmu-1.0.3 x11-libs/libXrender >=x11-libs/libXres-1.0.3 >=x11-libs/libXtst-1.0.99.2 ) kdrive? ( >=x11-libs/libXext-1.0.5 x11-libs/libXv ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-7.8_rc[nptl=] ) tslib? ( >=x11-libs/tslib-1.0 ) udev? ( >=sys-fs/udev-150 ) >=x11-apps/xinit-1.3
+>=app-admin/eselect-opengl-1.0.8 dev-libs/openssl media-libs/freetype >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libpciaccess-0.10.3 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont-1.4.2 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/pixman-0.21.8 >=x11-libs/xtrans-1.2.2 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 dmx? ( x11-libs/libXt >=x11-libs/libdmx-1.0.99.1 >=x11-libs/libX11-1.1.5 >=x11-libs/libXaw-1.0.4 >=x11-libs/libXext-1.0.99.4 >=x11-libs/libXfixes-5.0 >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXmu-1.0.3 x11-libs/libXrender >=x11-libs/libXres-1.0.3 >=x11-libs/libXtst-1.0.99.2 ) kdrive? ( >=x11-libs/libXext-1.0.5 x11-libs/libXv ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-7.8_rc[nptl=] ) tslib? ( >=x11-libs/tslib-1.0 ) udev? ( >=sys-fs/udev-150 ) >=x11-apps/xinit-1.3 sys-devel/flex >=x11-proto/bigreqsproto-1.1.0 >=x11-proto/compositeproto-0.4 >=x11-proto/damageproto-1.1 >=x11-proto/fixesproto-5.0 >=x11-proto/fontsproto-2.0.2 >=x11-proto/glproto-1.4.14 >=x11-proto/inputproto-1.9.99.902 >=x11-proto/kbproto-1.0.3 >=x11-proto/randrproto-1.2.99.3 >=x11-proto/recordproto-1.13.99.1 >=x11-proto/renderproto-0.11 >=x11-proto/resourceproto-1.0.2 >=x11-proto/scrnsaverproto-1.1 >=x11-proto/trapproto-3.4.3 >=x11-proto/videoproto-2.2.2 >=x11-proto/xcmiscproto-1.2.0 >=x11-proto/xextproto-7.1.99 >=x11-proto/xf86dgaproto-2.0.99.1 >=x11-proto/xf86rushproto-1.1.2 >=x11-proto/xf86vidmodeproto-2.2.99.1 >=x11-proto/xineramaproto-1.1.3 >=x11-proto/xproto-7.0.22 dmx? ( >=x11-proto/dmxproto-2.2.99.1 doc? ( || ( www-client/links www-client/lynx www-client/w3m ) ) ) !minimal? ( >=x11-proto/xf86driproto-2.1.0 >=x11-proto/dri2proto-2.6 >=x11-libs/libdrm-2.4.20 ) x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.15.0 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.15.0 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.15.0 >=media-fonts/font-util-1.2.0 ) >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.15.0 >=media-fonts/font-util-1.2.0 >=dev-util/pkgconfig-0.23 doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
+>=app-admin/eselect-opengl-1.0.8 dev-libs/openssl media-libs/freetype >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libpciaccess-0.10.3 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont-1.4.2 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/pixman-0.21.8 >=x11-libs/xtrans-1.2.2 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 dmx? ( x11-libs/libXt >=x11-libs/libdmx-1.0.99.1 >=x11-libs/libX11-1.1.5 >=x11-libs/libXaw-1.0.4 >=x11-libs/libXext-1.0.99.4 >=x11-libs/libXfixes-5.0 >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXmu-1.0.3 x11-libs/libXrender >=x11-libs/libXres-1.0.3 >=x11-libs/libXtst-1.0.99.2 ) kdrive? ( >=x11-libs/libXext-1.0.5 x11-libs/libXv ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-7.8_rc[nptl=] ) tslib? ( >=x11-libs/tslib-1.0 ) udev? ( >=sys-fs/udev-150 ) >=x11-apps/xinit-1.3
 0
 http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.11.3.tar.bz2

--- a/metadata/cache/x11-base/xorg-server-1.11.4
+++ b/metadata/cache/x11-base/xorg-server-1.11.4
@ -0,0 +1,22 @@
+>=app-admin/eselect-opengl-1.0.8 dev-libs/openssl media-libs/freetype >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libpciaccess-0.10.3 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont-1.4.2 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/pixman-0.21.8 >=x11-libs/xtrans-1.2.2 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 dmx? ( x11-libs/libXt >=x11-libs/libdmx-1.0.99.1 >=x11-libs/libX11-1.1.5 >=x11-libs/libXaw-1.0.4 >=x11-libs/libXext-1.0.99.4 >=x11-libs/libXfixes-5.0 >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXmu-1.0.3 x11-libs/libXrender >=x11-libs/libXres-1.0.3 >=x11-libs/libXtst-1.0.99.2 ) kdrive? ( >=x11-libs/libXext-1.0.5 x11-libs/libXv ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-7.8_rc[nptl=] ) tslib? ( >=x11-libs/tslib-1.0 ) udev? ( >=sys-fs/udev-150 ) >=x11-apps/xinit-1.3 sys-devel/flex >=x11-proto/bigreqsproto-1.1.0 >=x11-proto/compositeproto-0.4 >=x11-proto/damageproto-1.1 >=x11-proto/fixesproto-5.0 >=x11-proto/fontsproto-2.0.2 >=x11-proto/glproto-1.4.14 >=x11-proto/inputproto-1.9.99.902 >=x11-proto/kbproto-1.0.3 >=x11-proto/randrproto-1.2.99.3 >=x11-proto/recordproto-1.13.99.1 >=x11-proto/renderproto-0.11 >=x11-proto/resourceproto-1.0.2 >=x11-proto/scrnsaverproto-1.1 >=x11-proto/trapproto-3.4.3 >=x11-proto/videoproto-2.2.2 >=x11-proto/xcmiscproto-1.2.0 >=x11-proto/xextproto-7.1.99 >=x11-proto/xf86dgaproto-2.0.99.1 >=x11-proto/xf86rushproto-1.1.2 >=x11-proto/xf86vidmodeproto-2.2.99.1 >=x11-proto/xineramaproto-1.1.3 >=x11-proto/xproto-7.0.22 dmx? ( >=x11-proto/dmxproto-2.2.99.1 doc? ( || ( www-client/links www-client/lynx www-client/w3m ) ) ) !minimal? ( >=x11-proto/xf86driproto-2.1.0 >=x11-proto/dri2proto-2.6 >=x11-libs/libdrm-2.4.20 ) x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.15.0 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.15.0 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.15.0 >=media-fonts/font-util-1.2.0 ) >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.15.0 >=media-fonts/font-util-1.2.0 >=dev-util/pkgconfig-0.23 doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
+>=app-admin/eselect-opengl-1.0.8 dev-libs/openssl media-libs/freetype >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libpciaccess-0.10.3 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont-1.4.2 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/pixman-0.21.8 >=x11-libs/xtrans-1.2.2 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 dmx? ( x11-libs/libXt >=x11-libs/libdmx-1.0.99.1 >=x11-libs/libX11-1.1.5 >=x11-libs/libXaw-1.0.4 >=x11-libs/libXext-1.0.99.4 >=x11-libs/libXfixes-5.0 >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXmu-1.0.3 x11-libs/libXrender >=x11-libs/libXres-1.0.3 >=x11-libs/libXtst-1.0.99.2 ) kdrive? ( >=x11-libs/libXext-1.0.5 x11-libs/libXv ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-7.8_rc[nptl=] ) tslib? ( >=x11-libs/tslib-1.0 ) udev? ( >=sys-fs/udev-150 ) >=x11-apps/xinit-1.3
+0
+http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.11.4.tar.bz2
+
+http://xorg.freedesktop.org/
+MIT
+X.Org X servers
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd
+autotools autotools-utils eutils flag-o-matic libtool multilib portability toolchain-funcs user versionator xorg-2
+dmx kdrive xnest xorg xvfb ipv6 minimal nptl tslib +udev static-libs doc
+!minimal? ( || ( dmx kdrive xnest xorg xvfb ) )
+xorg? ( >=x11-base/xorg-drivers-1.11 )
+
+4
+
+compile configure install postinst postrm prepare pretend setup test unpack
+
+
+
+
+
--- a/metadata/cache/x11-base/xorg-server-1.11.99.901
+++ b/metadata/cache/x11-base/xorg-server-1.11.99.901
@ -1,22 +0,0 @@
->=app-admin/eselect-opengl-1.0.8 dev-libs/openssl media-libs/freetype >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libpciaccess-0.12.901 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont-1.4.2 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/pixman-0.21.8 >=x11-libs/xtrans-1.2.2 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-1.4 dmx? ( x11-libs/libXt >=x11-libs/libdmx-1.0.99.1 >=x11-libs/libX11-1.1.5 >=x11-libs/libXaw-1.0.4 >=x11-libs/libXext-1.0.99.4 >=x11-libs/libXfixes-5.0 >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXmu-1.0.3 x11-libs/libXrender >=x11-libs/libXres-1.0.3 >=x11-libs/libXtst-1.0.99.2 ) kdrive? ( >=x11-libs/libXext-1.0.5 x11-libs/libXv ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-7.8_rc[nptl=] ) tslib? ( >=x11-libs/tslib-1.0 ) udev? ( >=sys-fs/udev-150 ) >=x11-apps/xinit-1.3 sys-devel/flex >=x11-proto/bigreqsproto-1.1.0 >=x11-proto/compositeproto-0.4 >=x11-proto/damageproto-1.1 >=x11-proto/fixesproto-5.0 >=x11-proto/fontsproto-2.0.2 >=x11-proto/glproto-1.4.14 >=x11-proto/inputproto-2.1.99.3 >=x11-proto/kbproto-1.0.3 >=x11-proto/randrproto-1.2.99.3 >=x11-proto/recordproto-1.13.99.1 >=x11-proto/renderproto-0.11 >=x11-proto/resourceproto-1.0.2 >=x11-proto/scrnsaverproto-1.1 >=x11-proto/trapproto-3.4.3 >=x11-proto/videoproto-2.2.2 >=x11-proto/xcmiscproto-1.2.0 >=x11-proto/xextproto-7.1.99 >=x11-proto/xf86dgaproto-2.0.99.1 >=x11-proto/xf86rushproto-1.1.2 >=x11-proto/xf86vidmodeproto-2.2.99.1 >=x11-proto/xineramaproto-1.1.3 >=x11-proto/xproto-7.0.22 dmx? ( >=x11-proto/dmxproto-2.2.99.1 doc? ( || ( www-client/links www-client/lynx www-client/w3m ) ) ) !minimal? ( >=x11-proto/xf86driproto-2.1.0 >=x11-proto/dri2proto-2.6 >=x11-libs/libdrm-2.4.20 ) x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.15.0 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.15.0 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.15.0 >=media-fonts/font-util-1.2.0 ) >=dev-util/pkgconfig-0.23 doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
->=app-admin/eselect-opengl-1.0.8 dev-libs/openssl media-libs/freetype >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libpciaccess-0.12.901 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont-1.4.2 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/pixman-0.21.8 >=x11-libs/xtrans-1.2.2 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-1.4 dmx? ( x11-libs/libXt >=x11-libs/libdmx-1.0.99.1 >=x11-libs/libX11-1.1.5 >=x11-libs/libXaw-1.0.4 >=x11-libs/libXext-1.0.99.4 >=x11-libs/libXfixes-5.0 >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXmu-1.0.3 x11-libs/libXrender >=x11-libs/libXres-1.0.3 >=x11-libs/libXtst-1.0.99.2 ) kdrive? ( >=x11-libs/libXext-1.0.5 x11-libs/libXv ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-7.8_rc[nptl=] ) tslib? ( >=x11-libs/tslib-1.0 ) udev? ( >=sys-fs/udev-150 ) >=x11-apps/xinit-1.3
-0
-http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.11.99.901.tar.bz2
-
-http://xorg.freedesktop.org/
-MIT
-X.Org X servers
-~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd
-autotools autotools-utils eutils flag-o-matic libtool multilib portability toolchain-funcs user versionator xorg-2
-dmx kdrive xnest xorg xvfb ipv6 minimal nptl tslib +udev static-libs doc
-!minimal? ( || ( dmx kdrive xnest xorg xvfb ) )
-xorg? ( >=x11-base/xorg-drivers-1.11 )
-
-4
-
-compile configure install postinst postrm prepare pretend setup test unpack
-
-
-
-
-
--- a/metadata/cache/x11-base/xorg-server-1.11.99.902
+++ b/metadata/cache/x11-base/xorg-server-1.11.99.902
@ -0,0 +1,22 @@
+>=app-admin/eselect-opengl-1.0.8 dev-libs/openssl media-libs/freetype >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libpciaccess-0.12.901 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont-1.4.2 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/pixman-0.21.8 >=x11-libs/xtrans-1.2.2 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 dmx? ( x11-libs/libXt >=x11-libs/libdmx-1.0.99.1 >=x11-libs/libX11-1.1.5 >=x11-libs/libXaw-1.0.4 >=x11-libs/libXext-1.0.99.4 >=x11-libs/libXfixes-5.0 >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXmu-1.0.3 x11-libs/libXrender >=x11-libs/libXres-1.0.3 >=x11-libs/libXtst-1.0.99.2 ) kdrive? ( >=x11-libs/libXext-1.0.5 x11-libs/libXv ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-7.8_rc[nptl=] ) tslib? ( >=x11-libs/tslib-1.0 ) udev? ( >=sys-fs/udev-150 ) >=x11-apps/xinit-1.3 sys-devel/flex >=x11-proto/bigreqsproto-1.1.0 >=x11-proto/compositeproto-0.4 >=x11-proto/damageproto-1.1 >=x11-proto/fixesproto-5.0 >=x11-proto/fontsproto-2.0.2 >=x11-proto/glproto-1.4.14 >=x11-proto/inputproto-2.1.99.3 >=x11-proto/kbproto-1.0.3 >=x11-proto/randrproto-1.2.99.3 >=x11-proto/recordproto-1.13.99.1 >=x11-proto/renderproto-0.11 >=x11-proto/resourceproto-1.0.2 >=x11-proto/scrnsaverproto-1.1 >=x11-proto/trapproto-3.4.3 >=x11-proto/videoproto-2.2.2 >=x11-proto/xcmiscproto-1.2.0 >=x11-proto/xextproto-7.1.99 >=x11-proto/xf86dgaproto-2.0.99.1 >=x11-proto/xf86rushproto-1.1.2 >=x11-proto/xf86vidmodeproto-2.2.99.1 >=x11-proto/xineramaproto-1.1.3 >=x11-proto/xproto-7.0.22 dmx? ( >=x11-proto/dmxproto-2.2.99.1 doc? ( || ( www-client/links www-client/lynx www-client/w3m ) ) ) !minimal? ( >=x11-proto/xf86driproto-2.1.0 >=x11-proto/dri2proto-2.6 >=x11-libs/libdrm-2.4.20 ) x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.15.0 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.15.0 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.15.0 >=media-fonts/font-util-1.2.0 ) >=dev-util/pkgconfig-0.23 doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
+>=app-admin/eselect-opengl-1.0.8 dev-libs/openssl media-libs/freetype >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libpciaccess-0.12.901 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont-1.4.2 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/pixman-0.21.8 >=x11-libs/xtrans-1.2.2 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 dmx? ( x11-libs/libXt >=x11-libs/libdmx-1.0.99.1 >=x11-libs/libX11-1.1.5 >=x11-libs/libXaw-1.0.4 >=x11-libs/libXext-1.0.99.4 >=x11-libs/libXfixes-5.0 >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXmu-1.0.3 x11-libs/libXrender >=x11-libs/libXres-1.0.3 >=x11-libs/libXtst-1.0.99.2 ) kdrive? ( >=x11-libs/libXext-1.0.5 x11-libs/libXv ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-7.8_rc[nptl=] ) tslib? ( >=x11-libs/tslib-1.0 ) udev? ( >=sys-fs/udev-150 ) >=x11-apps/xinit-1.3
+0
+http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.11.99.902.tar.bz2
+
+http://xorg.freedesktop.org/
+MIT
+X.Org X servers
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd
+autotools autotools-utils eutils flag-o-matic libtool multilib portability toolchain-funcs user versionator xorg-2
+dmx kdrive xnest xorg xvfb ipv6 minimal nptl tslib +udev static-libs doc
+!minimal? ( || ( dmx kdrive xnest xorg xvfb ) )
+xorg? ( >=x11-base/xorg-drivers-1.11 )
+
+4
+
+compile configure install postinst postrm prepare pretend setup test unpack
+
+
+
+
+
--- a/metadata/cache/x11-drivers/ati-drivers-12.1
+++ b/metadata/cache/x11-drivers/ati-drivers-12.1
@ -0,0 +1,22 @@
+<=x11-base/xorg-server-1.11.49 >=app-admin/eselect-opengl-1.0.7 sys-power/acpid x11-apps/xauth x11-libs/libX11 x11-libs/libXext x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender multilib? ( app-emulation/emul-linux-x86-opengl app-emulation/emul-linux-x86-xlibs ) qt4? ( x11-libs/libICE x11-libs/libSM x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXxf86vm x11-libs/qt-core x11-libs/qt-gui ) opencl? ( !>=x11-drivers/nvidia-drivers-195 ) x11-proto/inputproto x11-proto/xf86miscproto x11-proto/xf86vidmodeproto x11-proto/xineramaproto x11-libs/libXtst sys-apps/findutils app-misc/pax-utils kernel_linux? ( sys-apps/module-init-tools ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
+<=x11-base/xorg-server-1.11.49 >=app-admin/eselect-opengl-1.0.7 sys-power/acpid x11-apps/xauth x11-libs/libX11 x11-libs/libXext x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender multilib? ( app-emulation/emul-linux-x86-opengl app-emulation/emul-linux-x86-xlibs ) qt4? ( x11-libs/libICE x11-libs/libSM x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXxf86vm x11-libs/qt-core x11-libs/qt-gui ) opencl? ( !>=x11-drivers/nvidia-drivers-195 ) kernel_linux? ( sys-apps/module-init-tools )
+1
+http://www2.ati.com/drivers/linux//amd-driver-installer-12-1-x86.x86_64.run
+
+http://www.amd.com
+AMD GPL-2 QPL-1.0 as-is
+Ati precompiled drivers for radeon r600 (HD Series) and newer chipsets
+~amd64 ~x86
+eutils linux-info linux-mod multilib portability toolchain-funcs user versionator
+debug +modules multilib opencl pax_kernel qt4 kernel_linux
+
+
+
+4
+
+compile install postinst postrm preinst prepare prerm pretend setup test unpack
+
+
+
+
+
--- a/metadata/cache/x11-libs/pango-1.29.4
+++ b/metadata/cache/x11-libs/pango-1.29.4
@ -9,7 +9,7 @@ Internationalized text layout and rendering library
 ~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 autotools eutils fdo-mime gnome.org gnome2 gnome2-utils libtool multilib portability toolchain-funcs user versionator
 X doc +introspection test debug
-
+doc? ( X )


 4
--- a/metadata/cache/x11-libs/qt-openvg-4.8.0-r1
+++ b/metadata/cache/x11-libs/qt-openvg-4.8.0-r1
@ -0,0 +1,22 @@
+~x11-libs/qt-core-4.8.0[aqua=,c++0x=,debug=,qpa=,qt3support=] ~x11-libs/qt-gui-4.8.0[aqua=,c++0x=,debug=,egl,qpa=,qt3support=] media-libs/mesa[openvg] dev-util/pkgconfig
+~x11-libs/qt-core-4.8.0[aqua=,c++0x=,debug=,qpa=,qt3support=] ~x11-libs/qt-gui-4.8.0[aqua=,c++0x=,debug=,egl,qpa=,qt3support=] media-libs/mesa[openvg] !<x11-libs/qt-assistant-4.8.0 !>x11-libs/qt-assistant-4.8.0-r9999 !<x11-libs/qt-core-4.8.0 !>x11-libs/qt-core-4.8.0-r9999 !<x11-libs/qt-dbus-4.8.0 !>x11-libs/qt-dbus-4.8.0-r9999 !<x11-libs/qt-declarative-4.8.0 !>x11-libs/qt-declarative-4.8.0-r9999 !<x11-libs/qt-demo-4.8.0 !>x11-libs/qt-demo-4.8.0-r9999 !<x11-libs/qt-gui-4.8.0 !>x11-libs/qt-gui-4.8.0-r9999 !<x11-libs/qt-multimedia-4.8.0 !>x11-libs/qt-multimedia-4.8.0-r9999 !<x11-libs/qt-opengl-4.8.0 !>x11-libs/qt-opengl-4.8.0-r9999 !<x11-libs/qt-phonon-4.8.0 !>x11-libs/qt-phonon-4.8.0-r9999 !<x11-libs/qt-qt3support-4.8.0 !>x11-libs/qt-qt3support-4.8.0-r9999 !<x11-libs/qt-script-4.8.0 !>x11-libs/qt-script-4.8.0-r9999 !<x11-libs/qt-sql-4.8.0 !>x11-libs/qt-sql-4.8.0-r9999 !<x11-libs/qt-svg-4.8.0 !>x11-libs/qt-svg-4.8.0-r9999 !<x11-libs/qt-test-4.8.0 !>x11-libs/qt-test-4.8.0-r9999 !<x11-libs/qt-webkit-4.8.0 !>x11-libs/qt-webkit-4.8.0-r9999 !<x11-libs/qt-xmlpatterns-4.8.0 !>x11-libs/qt-xmlpatterns-4.8.0-r9999
+4
+http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-4.8.0.tar.gz
+
+http://qt.nokia.com/ http://qt-project.org/
+|| ( LGPL-2.1 GPL-3 )
+The OpenVG module for the Qt toolkit
+~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+base eutils flag-o-matic multilib portability qt4-build toolchain-funcs user versionator
+qt3support aqua debug pch +exceptions c++0x qpa
+
+
+
+3
+
+compile configure install postinst postrm prepare setup test unpack
+
+
+
+
+
--- a/metadata/cache/x11-misc/qtnotifydaemon-1.0.14
+++ b/metadata/cache/x11-misc/qtnotifydaemon-1.0.14
@ -1,5 +1,5 @@
-x11-libs/libX11 x11-libs/qt-dbus:4 x11-libs/qt-gui:4 !x11-misc/notification-daemon !x11-misc/notify-osd
-x11-libs/libX11 x11-libs/qt-dbus:4 x11-libs/qt-gui:4 !x11-misc/notification-daemon !x11-misc/notify-osd
+x11-libs/libX11 x11-libs/qt-dbus:4 x11-libs/qt-gui:4 x11-libs/qt-qt3support:4 !x11-misc/notification-daemon !x11-misc/notify-osd
+x11-libs/libX11 x11-libs/qt-dbus:4 x11-libs/qt-gui:4 x11-libs/qt-qt3support:4 !x11-misc/notification-daemon !x11-misc/notify-osd
 0
 mirror://sourceforge/qtnotifydaemon/qtnotifydaemon_1.0.14.orig.tar.gz

--- a/metadata/cache/x11-misc/touchfreeze-0.2.5-r1
+++ b/metadata/cache/x11-misc/touchfreeze-0.2.5-r1
@ -0,0 +1,22 @@
+x11-libs/libX11 x11-libs/qt-core:4 x11-libs/qt-gui:4
+x11-libs/libX11 x11-libs/qt-core:4 x11-libs/qt-gui:4 x11-drivers/xf86-input-synaptics
+0
+http://www.fit.vutbr.cz/~kombrink/personal/touchfreeze/touchfreeze-0.2.5.tar.gz
+
+http://kde-apps.org/content/show.php/TouchFreeze?content=61442
+GPL-3
+X11 touch pad driver configuration utility
+~amd64 ~x86
+base eutils multilib portability qt4-r2 toolchain-funcs user
+debug
+
+
+
+4
+
+compile configure install prepare unpack
+
+
+
+
+
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@ -1 +1 @@
-Mon, 30 Jan 2012 09:06:47 +0000
+Mon, 30 Jan 2012 15:06:50 +0000
--- a/metadata/glsa/glsa-201201-18.xml
+++ b/metadata/glsa/glsa-201201-18.xml
@ -0,0 +1,68 @@
+<?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="201201-18">
+  <title>bip: Multiple vulnerabilities</title>
+  <synopsis>Multiple vulnerabilities in bip might allow remote unauthenticated
+    attackers to cause a Denial of Service or possibly execute arbitrary code.
+  </synopsis>
+  <product type="ebuild">bip</product>
+  <announced>January 30, 2012</announced>
+  <revised>January 30, 2012: 1</revised>
+  <bug>336321</bug>
+  <bug>400599</bug>
+  <access>remote</access>
+  <affected>
+    <package name="net-irc/bip" auto="yes" arch="*">
+      <unaffected range="ge">0.8.8-r1</unaffected>
+      <vulnerable range="lt">0.8.8-r1</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>bip is a multi-user IRC proxy with SSL support.</p>
+  </background>
+  <description>
+    <p>Multiple vulnerabilities have been discovered in bip:</p>
+    
+    <ul>
+      <li>Uli Schlachter reported that bip does not properly handle invalid
+        data during authentication, resulting in a daemon crash
+        (CVE-2010-3071).
+      </li>
+      <li>Julien Tinnes reported that bip does not check the number of open
+        file descriptors against FD_SETSIZE, resulting in a stack buffer
+        overflow (CVE-2012-0806).
+      </li>
+    </ul>
+  </description>
+  <impact type="high">
+    <p>A remote attacker could exploit these vulnerabilities to execute
+      arbitrary code with the privileges of the user running the bip daemon, or
+      cause a Denial of Service condition.
+    </p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>All bip users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=net-irc/bip-0.8.8-r1"
+    </code>
+    
+    <p>NOTE: The CVE-2010-3071 flaw was already corrected in an earlier version
+      of bip and is included in this advisory for completeness.
+    </p>
+  </resolution>
+  <references>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2010-3071">CVE-2010-3071</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2012-0806">CVE-2012-0806</uri>
+  </references>
+  <metadata timestamp="Fri, 07 Oct 2011 23:37:17 +0000" tag="requester">
+    underling
+  </metadata>
+  <metadata timestamp="Mon, 30 Jan 2012 12:28:13 +0000" tag="submitter">a3li</metadata>
+</glsa>
--- a/metadata/glsa/glsa-201201-19.xml
+++ b/metadata/glsa/glsa-201201-19.xml
@ -0,0 +1,110 @@
+<?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="201201-19">
+  <title>Adobe Reader: Multiple vulnerabilities</title>
+  <synopsis>Multiple vulnerabilities in Adobe Reader might allow remote
+    attackers to execute arbitrary code or conduct various other attacks.
+  </synopsis>
+  <product type="ebuild">acroread</product>
+  <announced>January 30, 2012</announced>
+  <revised>January 30, 2012: 1</revised>
+  <bug>354211</bug>
+  <bug>382969</bug>
+  <bug>393481</bug>
+  <access>remote</access>
+  <affected>
+    <package name="app-text/acroread" auto="yes" arch="*">
+      <unaffected range="ge">9.4.7</unaffected>
+      <vulnerable range="lt">9.4.7</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>Adobe Reader is a closed-source PDF reader.</p>
+  </background>
+  <description>
+    <p>Multiple vulnerabilities have been discovered in Adobe Reader. Please
+      review the CVE identifiers referenced below for details.
+    </p>
+  </description>
+  <impact type="normal">
+    <p>A remote attacker could entice a user to open a specially crafted PDF
+      file using Adobe Reader, possibly resulting in the remote execution of
+      arbitrary code, a Denial of Service, or other impact.
+    </p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>All Adobe Reader users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=app-text/acroread-9.4.7"
+    </code>
+    
+  </resolution>
+  <references>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2010-4091">CVE-2010-4091</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2011-0562">CVE-2011-0562</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2011-0563">CVE-2011-0563</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2011-0565">CVE-2011-0565</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2011-0566">CVE-2011-0566</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2011-0567">CVE-2011-0567</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2011-0570">CVE-2011-0570</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2011-0585">CVE-2011-0585</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2011-0586">CVE-2011-0586</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2011-0587">CVE-2011-0587</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2011-0588">CVE-2011-0588</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2011-0589">CVE-2011-0589</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2011-0590">CVE-2011-0590</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2011-0591">CVE-2011-0591</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2011-0592">CVE-2011-0592</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2011-0593">CVE-2011-0593</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2011-0594">CVE-2011-0594</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2011-0595">CVE-2011-0595</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2011-0596">CVE-2011-0596</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2011-0598">CVE-2011-0598</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2011-0599">CVE-2011-0599</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2011-0600">CVE-2011-0600</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2011-0602">CVE-2011-0602</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2011-0603">CVE-2011-0603</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2011-0604">CVE-2011-0604</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2011-0605">CVE-2011-0605</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2011-0606">CVE-2011-0606</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2011-2130">CVE-2011-2130</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2011-2134">CVE-2011-2134</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2011-2135">CVE-2011-2135</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2011-2136">CVE-2011-2136</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2011-2137">CVE-2011-2137</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2011-2138">CVE-2011-2138</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2011-2139">CVE-2011-2139</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2011-2140">CVE-2011-2140</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2011-2414">CVE-2011-2414</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2011-2415">CVE-2011-2415</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2011-2416">CVE-2011-2416</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2011-2417">CVE-2011-2417</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2011-2424">CVE-2011-2424</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2011-2425">CVE-2011-2425</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2011-2431">CVE-2011-2431</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2011-2432">CVE-2011-2432</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2011-2433">CVE-2011-2433</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2011-2434">CVE-2011-2434</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2011-2435">CVE-2011-2435</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2011-2436">CVE-2011-2436</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2011-2437">CVE-2011-2437</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2011-2438">CVE-2011-2438</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2011-2439">CVE-2011-2439</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2011-2440">CVE-2011-2440</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2011-2441">CVE-2011-2441</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2011-2442">CVE-2011-2442</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2011-2462">CVE-2011-2462</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2011-4369">CVE-2011-4369</uri>
+  </references>
+  <metadata timestamp="Fri, 07 Oct 2011 23:37:13 +0000" tag="requester">
+    underling
+  </metadata>
+  <metadata timestamp="Mon, 30 Jan 2012 12:29:20 +0000" tag="submitter">a3li</metadata>
+</glsa>
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@ -1 +1 @@
-Mon, 30 Jan 2012 09:06:47 +0000
+Mon, 30 Jan 2012 15:06:51 +0000
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@ -1 +1 @@
-Mon, 30 Jan 2012 09:06:49 +0000
+Mon, 30 Jan 2012 15:06:52 +0000
--- a/metadata/timestamp
+++ b/metadata/timestamp
@ -1 +1 @@
-Mon Jan 30 09:06:47 UTC 2012
+Mon Jan 30 15:06:50 UTC 2012
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@ -1 +1 @@
-Mon, 30 Jan 2012 09:30:01 +0000
+Mon, 30 Jan 2012 15:30:01 +0000
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@ -1 +1 @@
-1327914301 Mon Jan 30 09:05:01 2012 UTC
+1327935901 Mon Jan 30 15:05:01 2012 UTC
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@ -1,6 +1,6 @@
 DIST samba-3.5.11.tar.gz 30752782 RMD160 b3ee1e044e9df417b0dcaf954a6a137db742cba3 SHA1 0801871ab6a11f7d8eb8bf32ff0b87896d263441 SHA256 fba5b7bced99a0651148d74f40031ac3ca3fc7869e2998bc85bf6fb3ddb16597
-DIST samba-3.6.0.tar.gz 28990069 RMD160 8e17800466443bd6529c2312eeec8acfab1d7f63 SHA1 c87e2481d755f3a7f22bae44ef2f22ca64b9d173 SHA256 e1c14569e4785758838e77852bc1e958c15405146cface568c25c5726802f53f
-DIST samba-3.6.1.tar.gz 28984820 RMD160 6ed44e66b22cef00168831fa7ed13571fd5e45ed SHA1 fed82fd92958f3209edb3c71321d4b48abee9c4b SHA256 c5b0f2ab02fe2c641b1ce52a141c28f1b3fbc093ada8a62eeca70c25e15bd564
+DIST samba-3.5.12.tar.gz 30352099 RMD160 0ef04e8cefc910e4687aadae08ff05b3a11826fc SHA1 cce0a391b4468a716dda2315a56271a785990c54 SHA256 d69d3fc0003df9c7d416714f66784a629c4264ffcd98fba7cbd073f7c857addf
+DIST samba-3.6.3.tar.gz 28993737 RMD160 fd04fd5897f0f34f257c504de911e1ab34ff3e25 SHA1 430a1e13fe20c17e2808035c863eb5e77685c89b SHA256 67e2409f2d5e4d5cb947c95f583498105038857b84cc73c08dacd4e2cbc66074
 DIST samba-4.0.0alpha11.tar.gz 13917363 RMD160 3ec5597de6a2c80eaa426712101777fa92786b5c SHA1 8ed2befbbd45f6501d9e6036bcdfb332431a7b4f SHA256 ec9f4a9153b9e2c233420642ee98a8b944322e8b39a9b6912430fb24e88b81b9
 DIST samba-4.0.0alpha17.tar.gz 20749528 RMD160 d7fda13f4d1b18c871c916487966e97f65034e06 SHA1 7c5877c6559cb4ac8fe9047d245c40448e9ad3cb SHA256 6c3a238d2ae1a98177f87465b263e34d9fb7198bf86c21a69b5276c3fea6cf09
 DIST smb_traffic_analyzer_v2.diff.bz2 12226 RMD160 82f6d443d289253a184e5f5dda17d865cb79b2b5 SHA1 1dd5100447cb827aacb8bb18bf88b7b10955a38c SHA256 1bae7eafbe8ac2382313d5ab9d43d73ba64b63a714f0f588516952d476fb868d
--- a/net-fs/samba/samba-3.5.12.ebuild
+++ b/net-fs/samba/samba-3.5.12.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-fs/samba/samba-3.6.0.ebuild,v 1.2 2011/09/30 14:51:47 vostorga Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.5.12.ebuild,v 1.1 2012/01/30 13:21:54 patrick Exp $

 EAPI=4

@ -11,35 +11,33 @@ MY_P="${PN}-${MY_PV}"

 DESCRIPTION="Library bits of the samba network filesystem"
 HOMEPAGE="http://www.samba.org/"
-SRC_URI="mirror://samba/${MY_P}.tar.gz"
+SRC_URI="mirror://samba/${P}.tar.gz
+	http://dev.gentoo.org/~dagger/files/smb_traffic_analyzer_v2.diff.bz2"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="acl addns ads +aio avahi caps +client cluster cups debug doc examples fam
-	ldap ldb +netapi pam quota +readline +server +smbclient smbsharemodes
+	ldap ldb +netapi pam quota +readline +server +smbclient smbsharemodes smbtav2
 	swat syslog winbind"

 DEPEND="dev-libs/popt
 	!net-fs/samba-client
 	!net-fs/samba-libs
 	!net-fs/samba-server
-	>=sys-libs/talloc-2.0.5
-	>=sys-libs/tdb-1.2.9
+	!net-fs/cifs-utils
+	sys-libs/talloc
+	sys-libs/tdb
 	virtual/libiconv
 	ads? ( virtual/krb5 sys-fs/e2fsprogs
-		client? ( sys-apps/keyutils
-			net-fs/cifs-utils[ads] ) )
+		client? ( sys-apps/keyutils ) )
 	avahi? ( net-dns/avahi[dbus] )
 	caps? ( sys-libs/libcap )
 	client? ( !net-fs/mount-cifs
-		dev-libs/iniparser
-		net-fs/cifs-utils )
+		dev-libs/iniparser )
 	cluster? ( >=dev-db/ctdb-1.0.114_p1 )
 	cups? ( net-print/cups )
-	debug? ( dev-libs/dmalloc )
 	fam? ( virtual/fam )
 	ldap? ( net-nds/openldap )
-	ldb? ( sys-libs/ldb )
 	pam? ( virtual/pam
 		winbind? ( dev-libs/iniparser )
 	)
@ -75,8 +73,9 @@ pkg_setup() {
 	if use server ; then
 		SBINPROGS="${SBINPROGS} bin/smbd bin/nmbd"
 		BINPROGS="${BINPROGS} bin/testparm bin/smbstatus bin/smbcontrol bin/pdbedit
-			bin/profiles bin/sharesec bin/eventlogadm bin/smbta-util"
+			bin/profiles bin/sharesec bin/eventlogadm"

+		use smbtav2 && BINPROGS="${BINPROGS} bin/smbta-util"
 		use swat && SBINPROGS="${SBINPROGS} bin/swat"
 		use winbind && SBINPROGS="${SBINPROGS} bin/winbindd"
 		use ads && use winbind && KRBPLUGIN="${KRBPLUGIN} bin/winbind_krb5_locator"
@ -87,10 +86,11 @@ pkg_setup() {
 			bin/nmblookup bin/smbpasswd bin/rpcclient bin/smbcacls bin/smbcquotas
 			bin/ntlm_auth"

+		use ads && SBINPROGS="${SBINPROGS} bin/cifs.upcall"
 	fi

 	use cups && BINPROGS="${BINPROGS} bin/smbspool"
-#	use ldb && BINPROGS="${BINPROGS} bin/ldbedit bin/ldbsearch bin/ldbadd bin/ldbdel bin/ldbmodify bin/ldbrename";
+	use ldb && BINPROGS="${BINPROGS} bin/ldbedit bin/ldbsearch bin/ldbadd bin/ldbdel bin/ldbmodify bin/ldbrename";

 	if use winbind ; then
 		BINPROGS="${BINPROGS} bin/wbinfo"
@ -117,7 +117,11 @@ src_prepare() {
 	sed -i \
 		-e 's|LDSHFLAGS="|LDSHFLAGS="\\${LDFLAGS} |g' \
 		configure || die "sed failed"
-	cd "${WORKDIR}/${MY_P}" && epatch "${CONFDIR}"/smb.conf.default.patch
+
+	epatch "${CONFDIR}"/${PN}-3.5.6-kerberos-dummy.patch
+	use smbtav2 && cd "${WORKDIR}/${P}" && epatch "${WORKDIR}"/smb_traffic_analyzer_v2.diff
+	cd "${WORKDIR}/${MY_P}" && epatch "${CONFDIR}"/${PN}-3.5.8-uclib-build.patch
+	epatch "${CONFDIR}"/smb.conf.default.patch
 }

 src_configure() {
@ -129,6 +133,19 @@ src_configure() {
 	# Upstream refuses to make this configurable
 	use caps && export ac_cv_header_sys_capability_h=yes || export ac_cv_header_sys_capability_h=no

+	# use_with doesn't accept 2 USE-flags
+	if use client && use ads ; then
+		myconf+=" --with-cifsupcall"
+	else
+		myconf+=" --without-cifsupcall"
+	fi
+
+	if use client && use kernel_linux ; then
+		myconf+=" --with-cifsmount --with-cifsumount"
+	else
+		myconf+=" --without-cifsmount --without-cifsumount"
+	fi
+
 	# Notes:
 	# - automount is only needed in conjunction with NIS and we don't have that
 	# anymore => LDAP?
@ -142,7 +159,6 @@ src_configure() {
 		--enable-socket-wrapper \
 		--enable-nss-wrapper \
 		$(use_enable swat) \
-		$(use_enable debug dmalloc) \
 		$(use_enable cups) \
 		--disable-iprint \
 		$(use_enable fam) \
@ -236,6 +252,10 @@ src_compile() {
 		emake ${KRBPLUGIN}${PLUGINEXT}
 	fi

+	if use client && use kernel_linux; then
+		einfo "make {,u}mount.cifs"
+		emake bin/{,u}mount.cifs
+	fi
 }

 src_install() {
@ -356,7 +376,14 @@ src_install() {
 			script/installswat.sh "${D}" "${ROOT}/usr/share/doc/${PF}/swat" "${S}"
 		fi

-		dodoc ../MAINTAINERS.txt ../README* ../Roadmap ../WHATSNEW.txt ../docs/THANKS
+		dodoc ../MAINTAINERS ../README* ../Roadmap ../WHATSNEW.txt ../docs/THANKS
+	fi
+
+	# install client files ({u,}mount.cifs into /)
+	if use client && use kernel_linux ; then
+		into /
+		dosbin bin/{u,}mount.cifs
+		doman ../docs/manpages/{u,}mount.cifs.8
 	fi

 	# install the spooler to cups
@ -408,17 +435,16 @@ src_install() {
 }

 pkg_postinst() {
-	elog "Samba 3.6 has adopted a number of improved security defaults that"
-	elog "will impact on existing users of Samba."
-	elog "			client ntlmv2 auth = yes"
-	elog "			client use spnego principal = no"
-	elog "			send spnego principal = no"
+	elog "The default value of 'wide links' has been changed to 'no' in samba 3.5"
+	elog "to avoid an insecure default configuration"
+	elog "('wide links = yes' and 'unix extensions = yes'). For more details,"
+	elog "please see http://www.samba.org/samba/news/symlink_attack.html ."
 	elog ""
-	elog "SMB2 protocol support in 3.6.0 is fully functional and can be "
-	elog "enabled by setting 'max protocol = smb2'. SMB2 is a new "
+	elog "An EXPERIMENTAL implementation of the SMB2 protocol has been added."
+	elog "SMB2 can be enabled by setting 'max protocol = smb2'. SMB2 is a new "
 	elog "implementation of the SMB protocol used by Windows Vista and higher"
 	elog ""
 	elog "For further information make sure to read the release notes at"
 	elog "http://samba.org/samba/history/${P}.html and "
-	elog "http://samba.org/samba/history/${PN}-3.6.0.html"
+	elog "http://samba.org/samba/history/${PN}-3.5.0.html"
 }
--- a/net-fs/samba/samba-3.6.3.ebuild
+++ b/net-fs/samba/samba-3.6.3.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-fs/samba/samba-3.6.1.ebuild,v 1.2 2011/11/03 14:29:31 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.6.3.ebuild,v 1.1 2012/01/30 12:14:55 patrick Exp $

 EAPI=4

--- a/net-im/qutecom/files/qutecom-2.2-no-deprecated-avcodec-decode-video.patch
+++ b/net-im/qutecom/files/qutecom-2.2-no-deprecated-avcodec-decode-video.patch
@ -0,0 +1,18 @@
+diff -ur a/wifo/phapi/phcodec-avcodec-wrapper.c b/wifo/phapi/phcodec-avcodec-wrapper.c
+--- a/wifo/phapi/phcodec-avcodec-wrapper.c	2011-02-10 11:03:43.000000000 +0100
+++ b/wifo/phapi/phcodec-avcodec-wrapper.c	2012-01-30 14:05:15.000000000 +0100
+@@ -63,8 +63,12 @@
+ 	int dec_len, got_picture = 0;
+ 	ph_avcodec_decoder_ctx_t * decoder_t = (ph_avcodec_decoder_ctx_t *) ctx;
+ 
+-	dec_len = avcodec_decode_video(decoder_t->context,
+-		dst, &got_picture, (uint8_t *)src, srcsize);
+	AVPacket pkt;
+	av_init_packet(&pkt);
+	pkt.data = (uint8_t*) src;
+	pkt.size = srcsize;
+	dec_len = avcodec_decode_video2(decoder_t->context,
+		dst, &got_picture, &pkt);
+ 
+ 	if (got_picture)
+ 	{
--- a/net-im/qutecom/qutecom-2.2_p20110210.ebuild
+++ b/net-im/qutecom/qutecom-2.2_p20110210.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-im/qutecom/qutecom-2.2_p20110210.ebuild,v 1.7 2011/10/03 08:08:29 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/qutecom/qutecom-2.2_p20110210.ebuild,v 1.8 2012/01/30 13:41:34 chithanh Exp $

 EAPI="3"

@ -56,6 +56,7 @@ src_prepare() {
 		libs/pixertool/src/v4l/v4l-pixertool.c \
 		libs/webcam/include/webcam/V4LWebcamDriver.h \
 		libs/webcam/src/v4l/V4LWebcamDriver.cpp || die
+	epatch "${FILESDIR}"/${PN}-2.2-no-deprecated-avcodec-decode-video.patch
 }

 src_configure() {
--- a/net-misc/wicd/files/fix-ad-hoc-networking.patch
+++ b/net-misc/wicd/files/fix-ad-hoc-networking.patch
@ -1,11 +0,0 @@
--- wicd-1.7.0/wicd/wnettools.py	2010-01-15 12:49:11.000000000 +0800
-+++ wicd-1.7.0.patched/wicd/wnettools.py	2010-12-12 03:50:31.000000000 +0800
-@@ -59,7 +59,7 @@ wpa2_pattern = re.compile('(WPA2)', _re_
- 
- #iwconfig-only regular expressions.
- ip_pattern = re.compile(r'inet [Aa]d?dr[^.]*:([^.]*\.[^.]*\.[^.]*\.[0-9]*)', re.S)
-bssid_pattern = re.compile('.*Access Point: (([0-9A-Z]{2}:){5}[0-9A-Z]{2})', _re_mode)
-+bssid_pattern = re.compile('.*[(Access Point)|(Cell)]: (([0-9A-Z]{2}:){5}[0-9A-Z]{2})', _re_mode)
- bitrate_pattern = re.compile('.*Bit Rate[=:](.*?/s)', _re_mode)
- opmode_pattern = re.compile('.*Mode:(.*?) ', _re_mode)
- authmethods_pattern = re.compile('.*Authentication capabilities :\n(.*?)Current', _re_mode)
--- a/net-misc/wicd/files/wicd-1.7.1_beta2-urwid-1.0.patch
+++ b/net-misc/wicd/files/wicd-1.7.1_beta2-urwid-1.0.patch
@ -1,20 +0,0 @@
--- /usr/share/wicd/curses/wicd-curses.py.old	2011-10-01 14:54:47.478406517 +0400
-+++ /usr/share/wicd/curses/wicd-curses.py	2011-10-01 14:49:50.781273004 +0400
-@@ -241,7 +241,7 @@
-         # Don't stop because someone let go of the mouse on the frame
-         mouse_release = False
-         for k in keys:
-            if urwid.is_mouse_event(k) and k[0] == "mouse release":
-+            if urwid.util.is_mouse_event(k) and k[0] == "mouse release":
-                 mouse_release = True
-                 break
-         if mouse_release :
-@@ -882,7 +882,7 @@
-                                                 data[4], False)
-             
-         for k in keys:
-            if urwid.is_mouse_event(k):
-+            if urwid.util.is_mouse_event(k):
-                 event, button, col, row = k
-                 self.frame.mouse_event( self.size,
-                         event, button, col, row,
--- a/net-misc/wicd/wicd-1.7.1_beta2-r3.ebuild
+++ b/net-misc/wicd/wicd-1.7.1_beta2-r3.ebuild
@ -1,106 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/wicd/wicd-1.7.1_beta2-r3.ebuild,v 1.7 2011/10/27 21:04:41 tomka Exp $
-
-EAPI=3
-
-PYTHON_DEPEND="2"
-PYTHON_USE_WITH="ncurses? xml"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES="1"
-
-inherit eutils distutils
-
-MY_P=${P/_beta/b}
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="A lightweight wired and wireless network manager for Linux"
-HOMEPAGE="http://wicd.sourceforge.net/"
-SRC_URI="http://downloads.wicd.net/src/testing/1.7.x/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="X +gtk ioctl libnotify 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-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-0.9.9.1
-		<dev-python/urwid-1.0.0
-		dev-python/pygobject:2
-	)
-	pm-utils? ( >=sys-power/pm-utils-1.1.1 )
-	"
-DOCS="CHANGES NEWS AUTHORS README"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-init.patch
-	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
-}
-
-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/conf.d/rc"
-	elog "(For example, RC_PLUG_SERVICES=\"!net.eth0 !net.wlan0\")"
-	# 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
-}
--- a/net-misc/wicd/wicd-1.7.1_beta2-r6.ebuild
+++ b/net-misc/wicd/wicd-1.7.1_beta2-r6.ebuild
@ -1,116 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/wicd/wicd-1.7.1_beta2-r6.ebuild,v 1.4 2011/10/27 21:04:41 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
-
-MY_P=${P/_beta/b}
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="A lightweight wired and wireless network manager for Linux"
-HOMEPAGE="http://wicd.sourceforge.net/"
-SRC_URI="http://downloads.wicd.net/src/testing/1.7.x/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="X +gtk ioctl libnotify 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-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-0.9.9.1
-		<dev-python/urwid-1.0.0
-		dev-python/pygobject:2
-	)
-	pm-utils? ( >=sys-power/pm-utils-1.1.1 )
-	"
-DOCS="CHANGES NEWS AUTHORS README"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-init.patch
-	epatch "${FILESDIR}"/${PN}-init-sve-start.patch
-	# Fix ad-hoc networking (bug 351337)
-	epatch "${FILESDIR}"/fix-ad-hoc-networking.patch
-	# Add a template for hex psk's and wpa (Bug 306423)
-	epatch "${FILESDIR}"/add-wpa-psk-hex-template.patch
-	# get rid of opts variable to fix bug 381885
-	sed -i "/opts/d" "in/init=gentoo=wicd.in"
-	# 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
-}
-
-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
-}
--- a/net-misc/wicd/wicd-1.7.1_beta2-r7.ebuild
+++ b/net-misc/wicd/wicd-1.7.1_beta2-r7.ebuild
@ -1,118 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/wicd/wicd-1.7.1_beta2-r7.ebuild,v 1.4 2011/11/22 19:32:58 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
-
-MY_P=${P/_beta/b}
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="A lightweight wired and wireless network manager for Linux"
-HOMEPAGE="http://wicd.sourceforge.net/"
-SRC_URI="http://downloads.wicd.net/src/testing/1.7.x/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="X +gtk ioctl libnotify 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-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-1.60_p201111202031570500
-		>=sys-apps/net-tools-1.60_p201111202031570500[old-output]
-		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-1.0.0
-		dev-python/pygobject:2
-	)
-	pm-utils? ( >=sys-power/pm-utils-1.1.1 )
-	"
-DOCS="CHANGES NEWS AUTHORS README"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-init.patch
-	# Fix urwid calls
-	epatch "${FILESDIR}/${P}"-urwid-1.0.patch
-	epatch "${FILESDIR}"/${PN}-init-sve-start.patch
-	# Fix ad-hoc networking (bug 351337)
-	epatch "${FILESDIR}"/fix-ad-hoc-networking.patch
-	# Add a template for hex psk's and wpa (Bug 306423)
-	epatch "${FILESDIR}"/add-wpa-psk-hex-template.patch
-	# get rid of opts variable to fix bug 381885
-	sed -i "/opts/d" "in/init=gentoo=wicd.in"
-	# 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
-}
-
-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
-}
--- a/net-misc/wicd/wicd-1.7.1_pre20111210.ebuild
+++ b/net-misc/wicd/wicd-1.7.1_pre20111210.ebuild
@ -1,119 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/wicd/wicd-1.7.1_pre20111210.ebuild,v 1.4 2011/12/30 09:42:08 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
-
-MY_PV="${PN}-1.7.1"
-S="${WORKDIR}/${MY_PV}"
-
-DESCRIPTION="A lightweight wired and wireless network manager for Linux"
-HOMEPAGE="http://wicd.sourceforge.net/"
-SRC_URI="http://dev.gentoo.org/~tomka/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="X +gtk ioctl libnotify 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-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}"/${P}-wpa-psk-hex-template.patch
-	# get rid of opts variable to fix bug 381885
-	sed -i "/opts/d" "in/init=gentoo=wicd.in"
-	# 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"
-}
-
-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
-	ewarn "If you upgrade from earlier versions, then be sure to check"
-	ewarn "your connection settings.  New versions parse old settings"
-	ewarn "differently, so your DHCP hostname and passphrase could appear"
-	ewarn "enclosed in ['square brackets in quotes']. In this case just"
-	ewarn "remove the offending brackets and quotes."
-}
--- a/net-print/splix/Manifest
+++ b/net-print/splix/Manifest
@ -1,2 +1,3 @@
 DIST samsung_cms.tar.bz2 2893884 RMD160 fdc92bfe0c2fd0a6d538b9c1e88071aab012ffd3 SHA1 b854cdc4647043e7aae1a4affa5a1813a4d04613 SHA256 b45daf773caba7ab6b66abba667c56be2d78ad60ac3648d4a9a916cd2275a684
 DIST splix-2.0.0_p20110219.tar.bz2 119512 RMD160 1b333bd0bc53c0ba95aa585c50a69912b76cff9f SHA1 8cf92443dff418b6e2f6cd97c654a24c3e81eb8b SHA256 c01f887bdcfd34b34101819b4aa92ac826b82649424f1fe293a611cad421d723
+DIST splix-2.0.0_p20111206.tar.bz2 122216 RMD160 6f9b66e52e385c75a6688a879dfef64d42dd13bd SHA1 a6b2db2948a16b9ab896cacd86ba0d3006c929b2 SHA256 3d4805e8dfb04305ac420dc297aebf36622e876ada40a08e997ec17f79755a3f
--- a/net-print/splix/splix-2.0.0_p20111206.ebuild
+++ b/net-print/splix/splix-2.0.0_p20111206.ebuild
@ -0,0 +1,62 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-print/splix/splix-2.0.0_p20111206.ebuild,v 1.1 2012/01/30 11:52:00 voyageur Exp $
+
+EAPI=4
+inherit eutils toolchain-funcs
+
+DESCRIPTION="A set of CUPS printer drivers for SPL (Samsung Printer Language) printers"
+HOMEPAGE="http://splix.sourceforge.net/"
+SRC_URI="http://dev.gentoo.org/~voyageur/distfiles/${P}.tar.bz2
+	http://splix.ap2c.org/samsung_cms.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+jbig"
+
+DEPEND=">=app-text/ghostscript-gpl-9.02
+	>=net-print/cups-1.4.0
+	jbig? ( media-libs/jbigkit )"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	# Honor LDFLAGS
+	sed -e "/[a-z]_LDFLAGS/s/:=.*/:= $\{LDFLAGS\}/" -i module.mk \
+		|| die "module.mk sed failed"
+	# Correct link comand, do not strip on install
+	sed -e "s/g++/$\{LINKER\}/" -e "/install/s/-s //" -i rules.mk \
+		|| die "rules.mk sed failed"
+}
+
+src_compile() {
+	local options="MODE=optimized"
+	use jbig || options="${options} DISABLE_JBIG=1"
+	emake ${options} PSTORASTER=gstoraster CXX="$(tc-getCXX)" \
+		OPTIM_CFLAGS="${CFLAGS}" OPTIM_CXXFLAGS="${CXXFLAGS}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	gzip "${D}"/$(cups-config --datadir)/model/*/*.ppd || die "ppd gzip failed"
+
+	#insinto $(cups-config --datadir)/model/samsung
+	#doins -r "${WORKDIR}"/cms
+	emake DESTDIR="${D}" CMSDIR="${WORKDIR}"/cms installcms
+}
+
+pkg_postinst() {
+	ewarn "You *MUST* make sure that the PPD files that CUPS is using"
+	ewarn "for actually installed printers are updated if you upgraded"
+	ewarn "from a previous version of splix!"
+	ewarn "Otherwise you will be unable to print (your printer might"
+	ewarn "spit out blank pages etc.)."
+	ewarn "To do that, simply delete the corresponding PPD file in"
+	ewarn "/etc/cups/ppd/, click on 'Modify Printer' belonging to the"
+	ewarn "corresponding printer in the CUPS webinterface (usually"
+	ewarn "reachable via http://localhost:631/) and choose the correct"
+	ewarn "printer make and model, for example:"
+	ewarn "'Samsung' -> 'Samsung ML-1610, 1.0 (en)'"
+}
--- a/profiles/arch/alpha/package.use.mask
+++ b/profiles/arch/alpha/package.use.mask
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/alpha/package.use.mask,v 1.75 2012/01/20 13:11:02 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/alpha/package.use.mask,v 1.76 2012/01/30 10:44:04 pacho Exp $


 # Raúl Porcel <armin76@gentoo.org> (26 Dec 2011)
@ -55,7 +55,7 @@ app-cdr/brasero dvd vcd

 # Pacho Ramos <pacho@gentoo.org> (30 Jun 2011)
 # Needed plugins are not keyworded on this arch
-media-plugins/gst-plugins-meta dts vcd
+media-plugins/gst-plugins-meta dts libvisual vcd

 # Pacho Ramos <pacho@gentoo.org> (02 Apr 2011)
 # quvi support is needed to play youtube files now
--- a/profiles/arch/amd64/no-multilib/package.mask
+++ b/profiles/arch/amd64/no-multilib/package.mask
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/no-multilib/package.mask,v 1.109 2012/01/27 17:56:30 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/no-multilib/package.mask,v 1.110 2012/01/30 14:47:33 tupone Exp $

 # AMD64 Team <amd64@gentoo.org>
 # Mask packages that rely on amd64 multilib
@ -120,6 +120,7 @@ games-fps/unreal-tournament
 games-fps/ut2003
 games-fps/ut2003-demo
 games-fps/ut2004-demo
+games-puzzle/drod-bin
 games-puzzle/hoh-bin
 games-roguelike/adom
 games-rpg/eschalon-book-1-demo
--- a/profiles/arch/arm/package.use.mask
+++ b/profiles/arch/arm/package.use.mask
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/arm/package.use.mask,v 1.69 2012/01/09 04:36:34 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/arm/package.use.mask,v 1.70 2012/01/30 10:44:04 pacho Exp $

 # Alexandre Rostovtsev <tetromono@gentoo.org> (09 Jan 2012)
 # jsc JIT compilation is supported only on amd64/arm/x86 and their prefixes, so
@ -128,7 +128,7 @@ dev-libs/boost mpi

 # missing keywords
 media-sound/sox ladspa
-media-plugins/gst-plugins-meta aac dts dv lame taglib vcd wavpack
+media-plugins/gst-plugins-meta aac dts dv lame libvisual taglib vcd wavpack

 # projectm not keyworded, bug #314969
 media-video/vlc projectm
--- a/profiles/arch/ia64/package.use.mask
+++ b/profiles/arch/ia64/package.use.mask
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/ia64/package.use.mask,v 1.68 2012/01/20 13:11:02 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/ia64/package.use.mask,v 1.69 2012/01/30 10:44:04 pacho Exp $

 # Ralph Sennhauser <sera@gentoo.org> (31 Dec 2011)
 # Needs dev-java/fop which is not available for ia64 due to missing JVM #345433
@ -113,4 +113,4 @@ dev-java/icu4j test
 dev-lisp/clisp hyperspec pari svm

 # missing keywords
-media-plugins/gst-plugins-meta dts dv lame mms taglib vcd wavpack
+media-plugins/gst-plugins-meta dts dv lame libvisual mms taglib vcd wavpack
--- a/profiles/arch/sparc/package.use.mask
+++ b/profiles/arch/sparc/package.use.mask
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/sparc/package.use.mask,v 1.91 2012/01/20 13:11:02 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/sparc/package.use.mask,v 1.92 2012/01/30 10:44:04 pacho Exp $

 # Alexey Shvetsov <alexxy@gentoo.org> (17 Dec 2011)
 # Mask use numa for openmpi
@ -62,7 +62,7 @@ media-video/totem youtube

 # Pacho Ramos <pacho@gentoo.org> (27 Jan 2011)
 # missing keywords on needed plugins
-media-plugins/gst-plugins-meta dts dv vcd wavpack
+media-plugins/gst-plugins-meta dts dv libvisual vcd wavpack

 # Michael Weber <xmw@gentoo.org> (03 Jan 2011)
 # dev-libs/libev is not keyworded
--- a/profiles/features/64bit-native/package.mask
+++ b/profiles/features/64bit-native/package.mask
@ -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/profiles/features/64bit-native/package.mask,v 1.78 2012/01/27 17:57:55 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/features/64bit-native/package.mask,v 1.79 2012/01/30 14:52:09 tupone Exp $

 # AMD64 Team <amd64@gentoo.org>
 # Mask packages that rely on amd64 multilib
@ -118,6 +118,7 @@ games-fps/unreal-tournament
 games-fps/ut2003
 games-fps/ut2003-demo
 games-fps/ut2004-demo
+games-puzzle/drod-bin
 games-puzzle/hoh-bin
 games-roguelike/adom
 games-rpg/eschalon-book-1-demo
--- a/profiles/package.mask
+++ b/profiles/package.mask
@ -1,5 +1,5 @@
 ####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.13445 2012/01/30 01:44:09 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.13447 2012/01/30 12:40:33 johu Exp $
 #
 # When you add an entry to the top of this file, add your name, the date, and
 # an explanation of why something is getting masked. Please be extremely
@ -170,11 +170,6 @@ dev-php/PEAR-PHP_Archive
 # The package is unmaintained upstream, removal in 30 days
 dev-php/PEAR-HTML_Select_Common

-# Johannes Huber <johu@gentoo.org> (17 Jan 2012)
-# Masking until release announcement is done.
-# Tarball already available.
-~media-libs/opengtl-0.9.16
-
 # Pawel Hajdan jr <phajdan.jr@gentoo.org> (17 Jan 2012)
 # Determined by the maintaining team to be no longer useful.
 # Removal in 30 days (02/16/2012).
@ -359,12 +354,6 @@ dev-ruby/ruby-chasen
 # current version of google-talkplugin never clear what you get
 =www-plugins/google-talkplugin-9999

-# Alexandre Rostovtsev <tetromino@gentoo.org> (13 Nov 2011)
-# Fails to build or run with >=opencv-2.3. Incompatible with pyatspi-2.2 (and
-# therefore with gnome-3.2). No upstream activity since early 2010.
-# Masked for removal in 30 days. Bug #389979
-app-accessibility/gnome-mousetrap
-
 # Alin Năstac <mrness@gentoo.org> (13 Nov 2011)
 # Dead project, masked for removal in 30 days
 net-mail/vmailmgr
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@ -2568,6 +2568,8 @@ media-plugins/grilo-plugins:youtube - Build support for YouTube content discover
 media-plugins/gst-plugins-a52dec:orc - Use dev-lang/orc for runtime detection of CPU MMX/MMXEXT/3dNow! capabilities to pass down to a52dec library.
 media-plugins/gst-plugins-dts:orc - Use dev-lang/orc for runtime optimisations
 media-plugins/gst-plugins-ffmpeg:orc - Use dev-lang/orc for runtime optimisations
+media-plugins/gst-plugins-meta:http - Enable http streaming via net-libs/libsoup
+media-plugins/gst-plugins-meta:libvisual - Enable visualization effects via media-libs/libvisual
 media-plugins/gst-plugins-meta:mythtv - Support for retrieval from media-tv/mythtv backend
 media-plugins/gst-plugins-meta:vpx - Enables vp8 codec support using libvpx, required to play some HTML5 videos
 media-plugins/kipi-plugins:expoblending - Build the expoblending plugin, which requires media-gfx/hugin
@ -5306,6 +5308,10 @@ x11-libs/qt-opengl:egl - Use EGL instead of default GLX to manage OpenGL context
 x11-libs/qt-opengl:exceptions - Add support for exceptions - like catching them inside the event loop (recommended by Nokia)
 x11-libs/qt-opengl:qpa - Build a window system agnostic implementation of Qt
 x11-libs/qt-opengl:qt3support - Enable the Qt3Support libraries for Qt4
+x11-libs/qt-openvg:c++0x - Build Qt using the C++11 standard
+x11-libs/qt-openvg:exceptions - Build with support for exceptions
+x11-libs/qt-openvg:qpa - Build a window system agnostic implementation of Qt
+x11-libs/qt-openvg:qt3support - Enable the Qt3Support libraries for Qt4
 x11-libs/qt-phonon:c++0x - Build Qt using the C++11 standard
 x11-libs/qt-phonon:exceptions - Add support for exceptions - like catching them inside the event loop (recommended by Nokia)
 x11-libs/qt-phonon:qpa - Build a window system agnostic implementation of Qt
--- a/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-qt48.patch
+++ b/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-qt48.patch
@ -0,0 +1,29 @@
+ 3rdparty/qwtplot3d/include/qwt3d_openglhelper.h |    2 ++
+ qtiplot/src/plot3D/Cone3D.cpp                   |    1 +
+ 2 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/3rdparty/qwtplot3d/include/qwt3d_openglhelper.h b/3rdparty/qwtplot3d/include/qwt3d_openglhelper.h
+index 0ee80de..3d02e3f 100755
+--- a/3rdparty/qwtplot3d/include/qwt3d_openglhelper.h
+++ b/3rdparty/qwtplot3d/include/qwt3d_openglhelper.h
+@@ -8,6 +8,8 @@
+ #include <QtOpenGL/qgl.h>
+ #endif
+ 
+#include <GL/glu.h>
+
+ namespace Qwt3D
+ {
+ 
+diff --git a/qtiplot/src/plot3D/Cone3D.cpp b/qtiplot/src/plot3D/Cone3D.cpp
+index 16df12d..169d5c7 100755
+--- a/qtiplot/src/plot3D/Cone3D.cpp
+++ b/qtiplot/src/plot3D/Cone3D.cpp
+@@ -27,6 +27,7 @@
+  *                                                                         *
+  ***************************************************************************/
+ #include <math.h>
+#include <GL/glu.h>
+ #include "qwt3d_color.h"
+ #include "qwt3d_plot.h"
+ #include <qwt3d_curve.h>
--- a/sci-visualization/qtiplot/qtiplot-0.9.8.9-r1.ebuild
+++ b/sci-visualization/qtiplot/qtiplot-0.9.8.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/sci-visualization/qtiplot/qtiplot-0.9.8.9-r1.ebuild,v 1.1 2012/01/22 14:20:07 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/qtiplot-0.9.8.9-r1.ebuild,v 1.2 2012/01/30 12:12:04 jlec Exp $

 EAPI=3

@ -58,6 +58,7 @@ RDEPEND="${CDEPEND}
 PATCHES=(
 	"${DISTDIR}/${P}-origin.patch.bz2"
 	"${FILESDIR}/${P}-origin-2.patch"
+	"${FILESDIR}/${P}-qt48.patch"
 	"${FILESDIR}/${PN}-0.9.8.8-system-gl2ps.patch"
 	"${FILESDIR}/${PN}-0.9.7.10-dont-install-qwt.patch"
 	"${FILESDIR}/${PN}-0.9.8.6-gold.patch"
@ -95,7 +96,7 @@ src_prepare() {
 	QWT_LIBS = \$\$QTI_ROOT/3rdparty/qwt/lib/libqwt.a
 	QWT3D_INCLUDEPATH = \$\$QTI_ROOT/3rdparty/qwtplot3d/include
 	QWT3D_LIBS = \$\$QTI_ROOT/3rdparty/qwtplot3d/lib/libqwtplot3d.a
-	SYS_LIBS = -lgl2ps ${mylibs}
+	SYS_LIBS = -lgl2ps ${mylibs} -lGLU

 	PYTHON = python
 	LUPDATE = lupdate
--- a/Show More
+++ b/Show More