Sync with portage [Wed May 2 17:16:24 MSK 2012].

2012-05-02 17:16:24 +04:00 · 2012-05-02 17:16:24 +04:00 · 49bbce6d85
commit 49bbce6d85
parent 7daf3e21a5
192 changed files with 2515 additions and 1472 deletions
--- a/app-editors/gummi/gummi-0.6.3.ebuild
+++ b/app-editors/gummi/gummi-0.6.3.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gummi/gummi-0.6.3.ebuild,v 1.2 2012/04/30 09:53:46 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gummi/gummi-0.6.3.ebuild,v 1.3 2012/05/02 08:40:26 jdhore Exp $

 EAPI=4
 inherit base eutils
@ -11,7 +11,7 @@ SRC_URI="http://dev.midnightcoding.org/attachments/download/263/${P}.tar.gz"

 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""

 LANGS="ar ca cs da de el es fr it nl pl pt pt_BR ro ru sv zh_CN zh_TW"
--- a/app-misc/hivex/files/1.3.3/0004-ruby_runpath_fix-1.3.3.patch
+++ b/app-misc/hivex/files/1.3.3/0004-ruby_runpath_fix-1.3.3.patch
@ -0,0 +1,11 @@
+--- ruby/Rakefile.in.orig	2012-04-16 20:16:14.989449899 +0200
+++ ruby/Rakefile.in	2012-04-16 20:17:08.006443779 +0200
+@@ -38,7 +38,7 @@
+ # Build locally
+ 
+ file MAKEFILE => EXT_CONF do |t|
+-     unless sh "top_srcdir=$(pwd)/@top_srcdir@; top_builddir=$(pwd)/@top_builddir@; export ARCHFLAGS=\"-arch $(uname -m)\"; cd #{File::dirname(EXT_CONF)}; ruby #{File::basename(EXT_CONF)} --with-_hivex-include=$top_srcdir/lib --with-_hivex-lib=$top_builddir/lib/.libs"
+     unless sh "top_srcdir=@top_srcdir@; top_builddir=@top_builddir@; export ARCHFLAGS=\"-arch $(uname -m)\"; mkdir -p @builddir@/ext/hivex; cd #{File::dirname(EXT_CONF)}; ruby #{File::basename(EXT_CONF)} --with-_hivex-include=../../$top_srcdir/lib --with-_hivex-lib=../../$top_builddir/lib/.libs --with-ldflags=\"$LDFLAGS\""
+          $stderr.puts "Failed to run extconf"
+          break
+      end
--- a/app-misc/hivex/files/1.3.5/0004-ruby_runpath_fix-1.3.5.patch
+++ b/app-misc/hivex/files/1.3.5/0004-ruby_runpath_fix-1.3.5.patch
@ -0,0 +1,11 @@
+--- ruby/Rakefile.in	2012-03-13 19:46:43.000000000 +0400
+++ ruby/Rakefile.in	2012-04-15 19:02:42.337118192 +0400
+@@ -38,7 +38,7 @@
+ # Build locally
+ 
+ file MAKEFILE => EXT_CONF do |t|
+-     unless sh "top_srcdir=$(pwd)/@top_srcdir@; top_builddir=$(pwd)/@top_builddir@; export ARCHFLAGS=\"-arch $(uname -m)\"; mkdir -p @builddir@/ext/hivex; cd @builddir@/ext/hivex; @RUBY@ #{EXT_CONF} --with-_hivex-include=$top_srcdir/lib --with-_hivex-lib=$top_builddir/lib/.libs"
+     unless sh "top_srcdir=@top_srcdir@; top_builddir=@top_builddir@; export ARCHFLAGS=\"-arch $(uname -m)\"; mkdir -p @builddir@/ext/hivex; cd @builddir@/ext/hivex; @RUBY@ #{EXT_CONF} --with-_hivex-include=../../$top_srcdir/lib --with-_hivex-lib=../../$top_builddir/lib/.libs --with-ldflags=\"$LDFLAGS\""
+          $stderr.puts "Failed to run extconf"
+          break
+      end
--- a/app-misc/hivex/files/autoconf_fix-1.3.1.patch
+++ b/app-misc/hivex/files/autoconf_fix-1.3.1.patch
@ -1,104 +0,0 @@
--- configure.ac.orig	2011-08-15 22:29:28.309745342 +0300
-+++ configure.ac	2011-08-15 22:34:54.324549151 +0300
-@@ -170,11 +170,18 @@
- AC_SUBST([LIBXML2_CFLAGS])
- AC_SUBST([LIBXML2_LIBS])
- 
-+
-+dnl ////////////////////////////////////////////////////////////////////////////
- dnl Check for OCaml (optional, for OCaml bindings).
-+
-+AC_ARG_ENABLE([ocaml],
-+       AS_HELP_STRING([--with-ocaml],[build Ocaml binding]))
-+
-+
- AC_PROG_OCAML
- AC_PROG_FINDLIB
- AM_CONDITIONAL([HAVE_OCAML],
-    [test "x$OCAMLC" != "xno" && test "x$OCAMLFIND" != "xno"])
-+    [test "x$OCAMLC" != "xno" -a "x$OCAMLFIND" != "xno" -a "x$enable_ocaml" = "xyes"])
- AM_CONDITIONAL([HAVE_OCAMLOPT],
-     [test "x$OCAMLOPT" != "xno" && test "x$OCAMLFIND" != "xno"])
- 
-@@ -207,6 +214,8 @@
-     rm -f conftest conftest.* conftest_ml.*
- fi
- 
-+dnl ///////////////////////////////////////////////////////////////////////////////////////
-+
- dnl Check for Perl (optional, for Perl bindings).
- dnl XXX This isn't quite right, we should check for Perl devel library.
- AC_CHECK_PROG([PERL],[perl],[perl],[no])
-@@ -214,21 +223,35 @@
- dnl Check for Perl modules that must be present to compile and
- dnl test the Perl bindings.
- missing_perl_modules=no
-for pm in Test::More ExtUtils::MakeMaker IO::Stringy; do
-    AC_MSG_CHECKING([for $pm])
-    if ! perl -M$pm -e1 >/dev/null 2>&1; then
-        AC_MSG_RESULT([no])
-        missing_perl_modules=yes
-    else
-        AC_MSG_RESULT([yes])
-    fi
-done
-if test "x$missing_perl_modules" = "xyes"; then
-    AC_MSG_WARN([some Perl modules required to compile or test the Perl bindings are missing])
-fi
-+
-+AC_ARG_ENABLE([perl],
-+       AS_HELP_STRING([--with-perl],[build Perl binding]))
-+
-+
-+PERL=
-+AS_IF([test "x$enable_perl" != "xno" ],[
-+       AC_CHECK_PROG([PERL],[perl],[yes],[no])
-+
-+    for pm in Test::More ExtUtils::MakeMaker IO::Stringy; do
-+        AC_MSG_CHECKING([for $pm])
-+        if ! perl -M$pm -e1 >/dev/null 2>&1; then
-+            AC_MSG_RESULT([no])
-+            missing_perl_modules=yes
-+        else
-+            AC_MSG_RESULT([yes])
-+        fi
-+    done
-+
-+    AS_IF([test "x$missing_perl_modules" = "xyes"],
-+        [AC_MSG_FAILURE([some Perl modules required to compile or test the Perl bindings are missing])],
-+        )
-+])
-+
- 
- AM_CONDITIONAL([HAVE_PERL],
-    [test "x$PERL" != "xno" && test "x$missing_perl_modules" != "xyes"])
-+    [test "x$PERL" != "xno" -a "x$missing_perl_modules" != "xyes" -a "x$enable_perl" = "xyes"])
-+
-+dnl //////////////////////////////////////////////////////////////////////////////////////////////////
- 
- dnl Check for Python (optional, for Python bindings).
- AC_CHECK_PROG([PYTHON],[python],[python],[no])
-@@ -266,15 +289,21 @@
- AC_SUBST(PYTHON_INCLUDEDIR)
- AC_SUBST(PYTHON_SITE_PACKAGES)
- 
-+AC_ARG_ENABLE([python],
-+       AS_HELP_STRING([--with-python],[build Python binding]))
-+
- AM_CONDITIONAL([HAVE_PYTHON],
-    [test "x$PYTHON_INCLUDEDIR" != "x" && test "x$PYTHON_SITE_PACKAGES" != "x"])
-+    [test "x$PYTHON_INCLUDEDIR" != "x" -a  "x$PYTHON_SITE_PACKAGES" != "x" -a "x$enable_python" = "xyes"])
- 
- dnl Check for Ruby and rake (optional, for Ruby bindings).
- AC_CHECK_LIB([ruby],[ruby_init],[HAVE_LIBRUBY=1],[HAVE_LIBRUBY=0])
- AC_CHECK_PROG([RAKE],[rake],[rake],[no])
- 
-+AC_ARG_ENABLE([ruby],
-+       AS_HELP_STRING([--with-ruby],[build Ruby binding]))
-+
- AM_CONDITIONAL([HAVE_RUBY],
-    [test "x$RAKE" != "xno" && test -n "$HAVE_LIBRUBY"])
-+    [test "x$RAKE" != "xno" && test -n "$HAVE_LIBRUBY" -a "x$enable_ruby" = "xyes"])
- 
- dnl dnl Check for Java.
- dnl AC_ARG_WITH(java_home,
--- a/app-misc/hivex/files/ruby_runpath_fix-1.3.2.patch
+++ b/app-misc/hivex/files/ruby_runpath_fix-1.3.2.patch
@ -0,0 +1,11 @@
+--- ruby/Rakefile.in.orig	2012-04-16 20:16:14.989449899 +0200
+++ ruby/Rakefile.in	2012-04-16 20:17:08.006443779 +0200
+@@ -38,7 +38,7 @@
+ # Build locally
+ 
+ file MAKEFILE => EXT_CONF do |t|
+-     unless sh "top_srcdir=$(pwd)/@top_srcdir@; top_builddir=$(pwd)/@top_builddir@; export ARCHFLAGS=\"-arch $(uname -m)\"; cd #{File::dirname(EXT_CONF)}; ruby #{File::basename(EXT_CONF)} --with-_hivex-include=$top_srcdir/lib --with-_hivex-lib=$top_builddir/lib/.libs"
+     unless sh "top_srcdir=@top_srcdir@; top_builddir=@top_builddir@; export ARCHFLAGS=\"-arch $(uname -m)\"; mkdir -p @builddir@/ext/hivex; cd #{File::dirname(EXT_CONF)}; ruby #{File::basename(EXT_CONF)} --with-_hivex-include=../../$top_srcdir/lib --with-_hivex-lib=../../$top_builddir/lib/.libs --with-ldflags=\"$LDFLAGS\""
+          $stderr.puts "Failed to run extconf"
+          break
+      end
--- a/app-misc/hivex/hivex-1.3.2-r2.ebuild
+++ b/app-misc/hivex/hivex-1.3.2-r2.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/hivex/hivex-1.3.2-r1.ebuild,v 1.2 2012/03/25 10:37:40 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/hivex/hivex-1.3.2-r2.ebuild,v 1.1 2012/05/02 12:24:25 maksbotan Exp $

 EAPI=4

@ -38,7 +38,8 @@ DEPEND="${RDEPEND}
 	ruby? ( dev-ruby/rake )
 	"
 PATCHES=("${FILESDIR}"/autoconf_fix-${PV}.patch
-"${FILESDIR}"/python-test-fix-${PV}.patch)
+"${FILESDIR}"/python-test-fix-${PV}.patch
+"${FILESDIR}"/ruby_runpath_fix-${PV}.patch)
 DOCS=(README)

 pkg_setup() {
--- a/app-misc/hivex/hivex-1.3.2.ebuild
+++ b/app-misc/hivex/hivex-1.3.2.ebuild
@ -1,81 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/hivex/hivex-1.3.2.ebuild,v 1.5 2011/11/10 12:53:10 maksbotan Exp $
-
-EAPI=4
-
-WANT_AUTOMAKE="1.11"
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-PYTHON_DEPEND="python? 2:2.6"
-inherit base autotools-utils perl-app python
-
-DESCRIPTION="Library for reading and writing Windows Registry 'hive' binary files"
-HOMEPAGE="http://libguestfs.org"
-SRC_URI="http://libguestfs.org/download/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ocaml readline perl python test static-libs ruby"
-
-RDEPEND="virtual/libiconv
-	virtual/libintl
-	dev-libs/libxml2:2
-	ocaml? ( dev-lang/ocaml[ocamlopt]
-			 dev-ml/findlib[ocamlopt]
-			 )
-	readline? ( sys-libs/readline )
-	perl? ( dev-perl/IO-stringy )
-	"
-
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	perl? (
-	 	test? ( dev-perl/Pod-Coverage
-				dev-perl/Test-Pod-Coverage ) )
-	ruby? ( dev-ruby/rake )
-	"
-PATCHES=("${FILESDIR}"/autoconf_fix-${PV}.patch
-"${FILESDIR}"/python-test-fix-${PV}.patch)
-DOCS=(README)
-
-pkg_setup() {
-	if use python; then
-		python_set_active_version 2
-		python_pkg_setup
-		python_need_rebuild
-	fi
-}
-
-src_prepare() {
-	autotools-utils_src_prepare
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_with readline)
-		$(use_enable ocaml)
-		$(use_enable perl)
-		--enable-nls
-		$(use_enable python)
-		$(use_enable ruby)
-		--disable-rpath )
-
-		autotools-utils_src_configure
-}
-
-src_test() {
-	emake check
-}
-
-src_install() {
-	strip-linguas -i po
-
-	autotools-utils_src_install "LINGUAS=""${LINGUAS}"""
-
-	if use perl; then
-		fixlocalpod
-	fi
-}
--- a/app-misc/hivex/hivex-1.3.3-r1.ebuild
+++ b/app-misc/hivex/hivex-1.3.3-r1.ebuild
@ -1,11 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/hivex/hivex-1.3.3.ebuild,v 1.1 2012/02/26 19:56:32 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/hivex/hivex-1.3.3-r1.ebuild,v 1.1 2012/05/02 12:24:25 maksbotan Exp $

 EAPI=4

 WANT_AUTOMAKE="1.11"
 AUTOTOOLS_IN_SOURCE_BUILD=1
+AUTOTOOLS_AUTORECONF=1

 PYTHON_DEPEND="python? 2:2.6"
 inherit base autotools-utils perl-app python
@ -36,7 +37,7 @@ DEPEND="${RDEPEND}
 				dev-perl/Test-Pod-Coverage ) )
 	ruby? ( dev-ruby/rake )
 	"
-PATCHES=("${FILESDIR}"/"${PV}")
+PATCHES=("${FILESDIR}"/"${PV}"/*.patch)
 DOCS=(README)

 pkg_setup() {
@ -48,8 +49,7 @@ pkg_setup() {
 }

 src_prepare() {
-	EPATCH_SUFFIX=patch  EPATCH_FORCE=yes base_src_prepare
-	eautoreconf
+	autotools-utils_src_prepare
 }

 src_configure() {
--- a/app-misc/hivex/hivex-1.3.5-r1.ebuild
+++ b/app-misc/hivex/hivex-1.3.5-r1.ebuild
@ -1,11 +1,13 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/hivex/hivex-1.3.5.ebuild,v 1.1 2012/03/25 10:37:40 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/hivex/hivex-1.3.5-r1.ebuild,v 1.1 2012/05/02 12:24:25 maksbotan Exp $

 EAPI=4

 WANT_AUTOMAKE="1.11"
 AUTOTOOLS_IN_SOURCE_BUILD=1
+AUTOTOOLS_AUTORECONF=1
+
 USE_RUBY="ruby18"
 RUBY_OPTIONAL=yes
 PYTHON_DEPEND="python? 2:2.6"
@ -38,7 +40,7 @@ DEPEND="${RDEPEND}
 				dev-perl/Test-Pod-Coverage ) )
 	ruby? ( dev-ruby/rake )
 	"
-PATCHES=("${FILESDIR}"/"${PV}")
+PATCHES=("${FILESDIR}"/"${PV}"/*.patch)
 DOCS=(README)

 pkg_setup() {
@ -50,8 +52,7 @@ pkg_setup() {
 }

 src_prepare() {
-	EPATCH_SUFFIX=patch  EPATCH_FORCE=yes base_src_prepare
-	eautoreconf
+	autotools-utils_src_prepare
 }

 src_configure() {
--- a/dev-cpp/gtksourceviewmm/files/gtksourceviewmm-2.10.2-glib-2.31.patch
+++ b/dev-cpp/gtksourceviewmm/files/gtksourceviewmm-2.10.2-glib-2.31.patch
@ -0,0 +1,45 @@
+Fix build with glib 2.31
+
+Patch by Dominique Leuenberger <dimstar@opensuse.org>
+
+https://bugzilla.gnome.org/show_bug.cgi?id=666651
+
+Index: gtksourceviewmm-2.10.2/gtksourceview/gtksourceviewmm/sourceiter.cc
+===================================================================
+--- a/gtksourceviewmm-2.10.2/gtksourceview/gtksourceviewmm/sourceiter.cc
+++ b/gtksourceviewmm-2.10.2/gtksourceview/gtksourceviewmm/sourceiter.cc
+@@ -28,7 +28,7 @@
+  */
+ 
+ #include "sourceiter.h"
+-#include <glib/gmessages.h>
+#include <glib.h>
+ #include <gtksourceview/gtksourceview-typebuiltins.h>
+ namespace gtksourceview
+ {
+Index: gtksourceviewmm-2.10.2/gtksourceview/src/sourceiter.ccg
+===================================================================
+--- a/gtksourceviewmm-2.10.2/gtksourceview/src/sourceiter.ccg
+++ b/gtksourceviewmm-2.10.2/gtksourceview/src/sourceiter.ccg
+@@ -21,7 +21,7 @@
+  */
+ 
+ #include "sourceiter.h"
+-#include <glib/gmessages.h>
+#include <glib.h>
+ #include <gtksourceview/gtksourceview-typebuiltins.h>
+ namespace gtksourceview
+ {
+Index: gtksourceviewmm-2.10.2/tests/search/main.cc
+===================================================================
+--- a/gtksourceviewmm-2.10.2/tests/search/main.cc
+++ b/gtksourceviewmm-2.10.2/tests/search/main.cc
+@@ -6,7 +6,7 @@
+ #include <cstring>
+ #include <gtkmm.h>
+ #include <gtksourceviewmm.h>
+-#include <glib/gmessages.h>
+#include <glib.h>
+ 
+ using namespace std ;
+ using namespace Gtk;
--- a/dev-cpp/gtksourceviewmm/gtksourceviewmm-2.10.2.ebuild
+++ b/dev-cpp/gtksourceviewmm/gtksourceviewmm-2.10.2.ebuild
@ -1,12 +1,12 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtksourceviewmm/gtksourceviewmm-2.10.2.ebuild,v 1.6 2011/10/21 14:07:07 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtksourceviewmm/gtksourceviewmm-2.10.2.ebuild,v 1.7 2012/05/02 07:17:04 tetromino Exp $

 EAPI="4"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"

-inherit gnome2
+inherit eutils gnome2

 DESCRIPTION="C++ bindings for gtksourceview"
 HOMEPAGE="http://projects.gnome.org/gtksourceviewmm/"
@ -33,6 +33,9 @@ pkg_setup() {
 }

 src_prepare() {
+	# bug #414127, https://bugzilla.gnome.org/show_bug.cgi?id=666651
+	epatch "${FILESDIR}/${P}-glib-2.31.patch"
+
 	gnome2_src_prepare

 	# Remove docs from SUBDIRS so that docs are not installed, as
--- a/dev-db/redis/Manifest
+++ b/dev-db/redis/Manifest
@ -1,5 +1,6 @@
 DIST redis-2.2.12.tar.gz 455240 RMD160 8bf1275fd1d2ad1536ce7081bdf3522d5e92a8d3 SHA1 66d44756e0f3371d9e37b521f5cc17e12e1efba3 SHA256 9e2a4133b920fc4eed731c9cd3a9d0b60e701179ea98b2944ab434e7b1d0db03
 DIST redis-2.4.10.tar.gz 621824 RMD160 1dc59ff4390b5459ce80d803cbadc3128d239d73 SHA1 fceecc25a332db77cb94d16a3d9a337156600556 SHA256 4d34482198cec272afd45d0390d4e1f32ee847094834133613a925012810ed21
+DIST redis-2.4.13.tar.gz 625464 RMD160 f1c87719627114efcfc64aeb842d1d925f2fd52f SHA1 212128b1c7cc0021beb3dae38b7fe957d6743f3b SHA256 b6e057b6b5cd5946f8b46b2427401400686ed4f6c4af446eb1f0ec170d3f87be
 DIST redis-2.4.4.tar.gz 607718 RMD160 5b9e1e48216c11b3eca76ad0eafee3d7a0df0c68 SHA1 bc1e383c0216fe5bd5dc47eab39b43bbb9d5f8a5 SHA256 8cb779758315b89969adb588c813bf980e32a760d4204209d90d605dcbc5f708
 DIST redis-2.4.7.tar.gz 611577 RMD160 586ffa4161d2697fd1249ed699f9f025d5e7e1a9 SHA1 cd0835f1076ad36797ed6543af187ac28a29953f SHA256 f91956377b7ff23cc23e0c8758e0b873032f36545c61d88436ebb741bf4dd5e1
 DIST redis-2.4.8.tar.gz 618164 RMD160 235d607326e57cb296178112c8073db8b473a3e6 SHA1 d050838530e2b77dc1724efd29e5367a4c5c1e18 SHA256 8166ca6ddea4bdb311510590a1ef94e3e32eed2fae44875a5b44fe72bda556f3
--- a/dev-db/redis/redis-2.4.13.ebuild
+++ b/dev-db/redis/redis-2.4.13.ebuild
@ -0,0 +1,108 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/redis/redis-2.4.13.ebuild,v 1.1 2012/05/02 12:09:02 djc Exp $
+
+EAPI="4"
+
+inherit autotools eutils flag-o-matic
+
+DESCRIPTION="A persistent caching system, key-value and data structures database."
+HOMEPAGE="http://redis.io/"
+SRC_URI="http://redis.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86 ~x86-macos ~x86-solaris"
+IUSE="+jemalloc tcmalloc test"
+SLOT="0"
+
+RDEPEND=""
+DEPEND=">=sys-devel/autoconf-2.63
+	tcmalloc? ( dev-util/google-perftools )
+	jemalloc? ( dev-libs/jemalloc )
+	test? ( dev-lang/tcl )
+	${RDEPEND}"
+REQUIRED_USE="tcmalloc? ( !jemalloc )
+	jemalloc? ( !tcmalloc )"
+
+S="${WORKDIR}/${PN}-${PV/_/-}"
+
+REDIS_PIDDIR=/var/run/redis/
+REDIS_PIDFILE=${REDIS_PIDDIR}/redis.pid
+REDIS_DATAPATH=/var/lib/redis
+REDIS_LOGPATH=/var/log/redis
+REDIS_LOGFILE=${REDIS_LOGPATH}/redis.log
+
+pkg_setup() {
+	enewgroup redis 75
+	enewuser redis 75 -1 ${REDIS_DATAPATH} redis
+	if use tcmalloc ; then
+		export EXTRA_EMAKE="${EXTRA_EMAKE} USE_TCMALLOC=yes"
+	elif use jemalloc ; then
+		export EXTRA_EMAKE="${EXTRA_EMAKE} JEMALLOC_SHARED=yes"
+	else
+		export EXTRA_EMAKE="${EXTRA_EMAKE} FORCE_LIBC_MALLOC=yes"
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/redis-2.4.3-shared.patch"
+	epatch "${FILESDIR}/redis-2.4.4-tcmalloc.patch"
+	if use jemalloc ; then
+		sed -i -e "s/je_/j/" src/zmalloc.c
+	fi
+	# now we will rewrite present Makefiles
+	local makefiles=""
+	for MKF in $(find -name 'Makefile' | cut -b 3-); do
+		mv "${MKF}" "${MKF}.in"
+		sed -i	-e 's:$(CC):@CC@:g' \
+			-e 's:$(CFLAGS):@AM_CFLAGS@:g' \
+			-e 's: $(DEBUG)::g' \
+			-e 's:$(OBJARCH)::g' \
+			-e 's:ARCH:TARCH:g' \
+			-e '/^CCOPT=/s:$: $(LDFLAGS):g' \
+			"${MKF}.in" \
+		|| die "Sed failed for ${MKF}"
+		makefiles+=" ${MKF}"
+	done
+	# autodetection of compiler and settings; generates the modified Makefiles
+	cp "${FILESDIR}"/configure.ac-2.2 configure.ac
+	sed -i	-e "s:AC_CONFIG_FILES(\[Makefile\]):AC_CONFIG_FILES([${makefiles}]):g" \
+		configure.ac || die "Sed failed for configure.ac"
+	eautoconf
+}
+
+src_install() {
+	# configuration file rewrites
+	insinto /etc/
+	sed -r \
+		-e "/^pidfile\>/s,/var.*,${REDIS_PIDFILE}," \
+		-e '/^daemonize\>/s,no,yes,' \
+		-e '/^# bind/s,^# ,,' \
+		-e '/^# maxmemory\>/s,^# ,,' \
+		-e '/^maxmemory\>/s,<bytes>,67108864,' \
+		-e "/^dbfilename\>/s,dump.rdb,${REDIS_DATAPATH}/dump.rdb," \
+		-e "/^dir\>/s, .*, ${REDIS_DATAPATH}/," \
+		-e '/^loglevel\>/s:debug:notice:' \
+		-e "/^logfile\>/s:stdout:${REDIS_LOGFILE}:" \
+		<redis.conf \
+		>redis.conf.gentoo
+	newins redis.conf.gentoo redis.conf
+	use prefix || fowners redis:redis /etc/redis.conf
+	fperms 0644 /etc/redis.conf
+
+	newconfd "${FILESDIR}/redis.confd" redis
+	newinitd "${FILESDIR}/redis.initd" redis
+
+	nonfatal dodoc 00-RELEASENOTES BUGS CONTRIBUTING README TODO
+
+	dobin src/redis-cli
+	dosbin src/redis-benchmark src/redis-server src/redis-check-aof src/redis-check-dump
+	fperms 0750 /usr/sbin/redis-benchmark
+
+	if use prefix; then
+	        diropts -m0750
+	else
+	        diropts -m0750 -o redis -g redis
+	fi
+	keepdir ${REDIS_DATAPATH} ${REDIS_LOGPATH}
+}
--- a/dev-lang/nasm/nasm-2.10.ebuild
+++ b/dev-lang/nasm/nasm-2.10.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/nasm/nasm-2.10.ebuild,v 1.2 2012/04/26 20:34:45 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/nasm/nasm-2.10.ebuild,v 1.3 2012/05/02 07:59:37 jdhore Exp $

 EAPI=2
 inherit flag-o-matic
@ -11,7 +11,7 @@ SRC_URI="http://www.nasm.us/pub/nasm/releasebuilds/${PV/_}/${P/_}.tar.bz2"

 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="-* ~amd64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="doc"

 DEPEND="dev-lang/perl
--- a/dev-lang/v8/v8-3.8.9.19.ebuild
+++ b/dev-lang/v8/v8-3.8.9.19.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/v8/v8-3.8.9.19.ebuild,v 1.2 2012/05/01 09:35:12 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/v8/v8-3.8.9.19.ebuild,v 1.3 2012/05/02 08:03:53 ago Exp $

 EAPI="4"

@ -14,7 +14,7 @@ SRC_URI="http://commondatastorage.googleapis.com/chromium-browser-official/${P}.
 LICENSE="BSD"

 SLOT="0"
-KEYWORDS="amd64 ~x86 ~x64-macos ~x86-macos"
+KEYWORDS="amd64 x86 ~x64-macos ~x86-macos"
 IUSE=""

 pkg_setup() {
--- a/dev-libs/maloc/maloc-1.5.ebuild
+++ b/dev-libs/maloc/maloc-1.5.ebuild
@ -1,10 +1,12 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/maloc/maloc-1.5.ebuild,v 1.2 2011/04/16 06:56:06 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/maloc/maloc-1.5.ebuild,v 1.3 2012/05/02 10:38:42 jlec Exp $

-EAPI="3"
+EAPI=4

-inherit autotools eutils
+AUTOTOOLS_AUTORECONF=yes
+
+inherit autotools-utils

 DESCRIPTION="Minimal Abstraction Layer for Object-oriented C/C++ programs"
 HOMEPAGE="http://www.fetk.org/codes/maloc/index.html"
@ -25,32 +27,28 @@ DEPEND="${RDEPEND}

 S="${WORKDIR}/${PN}"

-src_prepare() {
-	epatch \
-		"${FILESDIR}"/1.4-mpi.patch \
-		"${FILESDIR}"/1.4-asneeded.patch \
+PATCHES=(
+	"${FILESDIR}"/1.4-mpi.patch
+	"${FILESDIR}"/1.4-asneeded.patch
 	"${FILESDIR}"/1.4-doc.patch
-	eautoreconf
-}
+	)

 src_configure() {
-	local myconf
+	local myeconfargs
 	use mpi && export CC="mpicc"
-	use doc || myconf="${myconf} --with-doxygen= --with-dot="
+	use doc || myeconfargs+=( --with-doxygen= --with-dot= )

-	econf \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		$(use_enable mpi) \
-		$(use_enable static-libs static) \
-		--disable-triplet \
-		--enable-shared \
-		${myconf}
+	myeconfargs+=(
+		--docdir="${EPREFIX}"/usr/share/doc/${PF}
+		$(use_enable mpi)
+		--disable-triplet
+		)
+	autotools-utils_src_configure
 }

 src_install() {
-	# install libs and headers
-	emake DESTDIR="${D}" install || die "make install failed"
+	autotools-utils_src_install

 	# install doc
-	dohtml doc/index.html || die "failed to install html docs"
+	dohtml doc/index.html
 }
--- a/dev-php/xcache/Manifest
+++ b/dev-php/xcache/Manifest
@ -1,2 +1,3 @@
 DIST xcache-1.3.1.tar.bz2 89480 RMD160 e9c11a9721835e917169667e29ad625b43d77d73 SHA1 faf09d655ca30a4b974f0bcfd91e2c545193deca SHA256 e311215551d2f0e55bcab063e36041008969976ae96d314b313abba32d34129b
 DIST xcache-1.3.2.tar.bz2 95322 RMD160 47451b6fd9df56dd09ea6b8ee30903e011f1ef24 SHA1 06fc7430e1d0ccd99f0b8a784b66fc2e5f11b667 SHA256 65cb064eadce848e54f18fe7172165651d3d60c5f65a9fe446b6b8fddcabda1c
+DIST xcache-2.0.0.tar.bz2 108614 RMD160 85c9b41af9a83d6beecd87849ca2fb539572b3f0 SHA1 8a41d0a7ec92dea96677514a5e74bf15e76c7466 SHA256 ca26b0772d8b88223f281f5099a3b7d9f4b6597a87ae857301271c1fd5a3f64a
--- a/dev-php/xcache/xcache-2.0.0.ebuild
+++ b/dev-php/xcache/xcache-2.0.0.ebuild
@ -0,0 +1,82 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php/xcache/xcache-2.0.0.ebuild,v 1.1 2012/05/02 10:09:26 olemarkus Exp $
+
+PHP_EXT_NAME="xcache"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="yes"
+PHPSAPILIST="apache2 cgi fpm"
+
+USE_PHP="php5-3 php5-4"
+EAPI="4"
+inherit php-ext-source-r2 confutils
+
+DESCRIPTION="A fast and stable PHP opcode cacher"
+HOMEPAGE="http://xcache.lighttpd.net/"
+SRC_URI="http://xcache.lighttpd.net/pub/Releases/${PV}/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# make test would just run php's test and as such need the full php source
+RESTRICT="test"
+
+DEPEND="virtual/httpd-php
+!dev-php/eaccelerator !dev-php/pecl-apc"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+
+	my_conf="--enable-xcache=shared   \
+			--enable-xcache-constant  \
+			--enable-xcache-optimizer \
+			--enable-xcache-coverager \
+			--enable-xcache-assembler \
+			--enable-xcache-encoder   \
+			--enable-xcache-decoder"
+
+	php-ext-source-r2_src_configure
+}
+
+src_install() {
+	php-ext-source-r2_src_install
+	dodoc AUTHORS ChangeLog NEWS README THANKS
+
+	php-ext-source-r2_addtoinifiles "xcache.admin.enable_auth" '"On"'
+	php-ext-source-r2_addtoinifiles "xcache.admin.user" '"admin"'
+	php-ext-source-r2_addtoinifiles "xcache.admin.pass" '""'
+
+	php-ext-source-r2_addtoinifiles "xcache.cacher" '"On"'
+	php-ext-source-r2_addtoinifiles "xcache.size" '"64M"'
+	php-ext-source-r2_addtoinifiles "xcache.count" '"2"'
+	php-ext-source-r2_addtoinifiles "xcache.slots" '"8k"'
+	php-ext-source-r2_addtoinifiles "xcache.ttl" '"0"'
+	php-ext-source-r2_addtoinifiles "xcache.gc_interval" '"0"'
+	php-ext-source-r2_addtoinifiles "xcache.var_size" '"8M"'
+	php-ext-source-r2_addtoinifiles "xcache.var_count" '"1"'
+	php-ext-source-r2_addtoinifiles "xcache.var_slots" '"8K"'
+	php-ext-source-r2_addtoinifiles "xcache.var_ttl" '"0"'
+	php-ext-source-r2_addtoinifiles "xcache.var_maxttl" '"0"'
+	php-ext-source-r2_addtoinifiles "xcache.var_gc_interval" '"600"'
+	php-ext-source-r2_addtoinifiles "xcache.readonly_protection" '"Off"'
+	php-ext-source-r2_addtoinifiles "xcache.mmap_path" '"/dev/zero"'
+
+	php-ext-source-r2_addtoinifiles "xcache.coverager" '"Off"'
+	php-ext-source-r2_addtoinifiles "xcache.coveragedump_directory" '""'
+
+	php-ext-source-r2_addtoinifiles "xcache.optimizer" '"Off"'
+
+	insinto "${PHP_EXT_SHARED_DIR}"
+	doins Decompiler.class.php
+	insinto "${PHP_EXT_SHARED_DIR}/admin"
+	doins admin/*
+	insinto "${PHP_EXT_SHARED_DIR}/coverager"
+	doins coverager/*
+}
+
+pkg_postinst() {
+	elog "Decompiler.class.php, the admin/ and the coverager/ directory shipped with this"
+	elog "release were installed into ${ROOT}usr/share/php5/xcache/."
+}
--- a/dev-php/xdebug-client/Manifest
+++ b/dev-php/xdebug-client/Manifest
@ -4,3 +4,4 @@ DIST xdebug-2.1.2.tgz 304229 RMD160 afc6b371308c5b923d2e246873b8f6f45155bc0e SHA
 DIST xdebug-2.1.3.tgz 307557 RMD160 537212e17b0b8e454944529d12249d28f8dca3f8 SHA1 34cca933ee2dab8dd87514950ea7a551a6984a54 SHA256 1b256ccf7bbac346c8cc13490ced5dd527206f201fa51be556b4d51cdabbad33
 DIST xdebug-2.1.4.tgz 308742 RMD160 3d634e3848844b68089b936520ce742e0c007e61 SHA1 0417424971ca62793b2c84e193126430e784b8b4 SHA256 9e56728593e4070311b0b19ab3418a34563406d9d40b7cb3eb1ce72d670360be
 DIST xdebug-2.2.0RC1.tgz 244336 RMD160 e1582a4c8d5368416d49add73b7759e1dccc4426 SHA1 9aa0f2a97385947c4f8958bc380cc421a0f251c5 SHA256 0faa40dcdde4cb987a1252a31fbe160a4d6349cccb7aba72d85932628905ba0d
+DIST xdebug-2.2.0RC2.tgz 244638 RMD160 dadcb0998ca1d048bc0ec58f9257c0b14a6ff896 SHA1 3462fbd66298866709796dda85ca8d8c2a171f23 SHA256 b389f9a846f31599589d263166e161ad9d214e50a7cdb7aac28ffc85cdf43dec
--- a/dev-php/xdebug-client/xdebug-client-2.2.0_rc2.ebuild
+++ b/dev-php/xdebug-client/xdebug-client-2.2.0_rc2.ebuild
@ -0,0 +1,34 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php/xdebug-client/xdebug-client-2.2.0_rc2.ebuild,v 1.1 2012/05/02 10:03:34 olemarkus Exp $
+
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+MY_PV="${PV/_/}"
+MY_PV="${MY_PV/rc/RC}"
+
+DESCRIPTION="Xdebug client for the Common Debugger Protocol (DBGP)."
+HOMEPAGE="http://www.xdebug.org/"
+SRC_URI="http://pecl.php.net/get/xdebug-${MY_PV}.tgz"
+LICENSE="Xdebug"
+SLOT="0"
+IUSE="libedit"
+
+S="${WORKDIR}/xdebug-${MY_PV}/debugclient"
+
+DEPEND="libedit? ( dev-libs/libedit )"
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	chmod +x "${S}"/configure
+}
+
+src_compile() {
+	econf $(use_with libedit) --disable-dependency-tracking
+	emake || die "Build of debug client failed!"
+}
+
+src_install() {
+	newbin debugclient xdebug
+}
--- a/dev-php/xdebug/Manifest
+++ b/dev-php/xdebug/Manifest
@ -4,3 +4,4 @@ DIST xdebug-2.1.2.tgz 304229 RMD160 afc6b371308c5b923d2e246873b8f6f45155bc0e SHA
 DIST xdebug-2.1.3.tgz 307557 RMD160 537212e17b0b8e454944529d12249d28f8dca3f8 SHA1 34cca933ee2dab8dd87514950ea7a551a6984a54 SHA256 1b256ccf7bbac346c8cc13490ced5dd527206f201fa51be556b4d51cdabbad33
 DIST xdebug-2.1.4.tgz 308742 RMD160 3d634e3848844b68089b936520ce742e0c007e61 SHA1 0417424971ca62793b2c84e193126430e784b8b4 SHA256 9e56728593e4070311b0b19ab3418a34563406d9d40b7cb3eb1ce72d670360be
 DIST xdebug-2.2.0RC1.tgz 244336 RMD160 e1582a4c8d5368416d49add73b7759e1dccc4426 SHA1 9aa0f2a97385947c4f8958bc380cc421a0f251c5 SHA256 0faa40dcdde4cb987a1252a31fbe160a4d6349cccb7aba72d85932628905ba0d
+DIST xdebug-2.2.0RC2.tgz 244638 RMD160 dadcb0998ca1d048bc0ec58f9257c0b14a6ff896 SHA1 3462fbd66298866709796dda85ca8d8c2a171f23 SHA256 b389f9a846f31599589d263166e161ad9d214e50a7cdb7aac28ffc85cdf43dec
--- a/dev-php/xdebug/xdebug-2.2.0_rc2.ebuild
+++ b/dev-php/xdebug/xdebug-2.2.0_rc2.ebuild
@ -0,0 +1,89 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php/xdebug/xdebug-2.2.0_rc2.ebuild,v 1.1 2012/05/02 10:02:51 olemarkus Exp $
+
+EAPI="4"
+PHP_EXT_NAME="xdebug"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="yes"
+
+USE_PHP="php5-3 php5-4"
+
+MY_PV="${PV/_/}"
+MY_PV="${MY_PV/rc/RC}"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+inherit php-ext-source-r2
+
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+DESCRIPTION="A PHP debugging and profiling extension"
+HOMEPAGE="http://www.xdebug.org/"
+SRC_URI="http://pecl.php.net/get/${PN}-${MY_PV}.tgz"
+LICENSE="Xdebug"
+SLOT="0"
+IUSE=""
+
+DEPEND="!dev-php/ZendOptimizer"
+RDEPEND="${DEPEND}
+		~dev-php/xdebug-client-${PV}"
+
+src_install() {
+	dodoc NEWS README CREDITS
+	php-ext-source-r2_src_install
+
+	php-ext-source-r2_addtoinifiles "xdebug.auto_trace" '"0"'
+	php-ext-source-r2_addtoinifiles "xdebug.trace_output_dir" '"/tmp"'
+	php-ext-source-r2_addtoinifiles "xdebug.trace_output_name" '"trace.%c"'
+	php-ext-source-r2_addtoinifiles "xdebug.trace_format" '"0"'
+	php-ext-source-r2_addtoinifiles "xdebug.trace_options" '"0"'
+	php-ext-source-r2_addtoinifiles "xdebug.collect_includes" '"1"'
+	php-ext-source-r2_addtoinifiles "xdebug.collect_params" '"0"'
+	php-ext-source-r2_addtoinifiles "xdebug.collect_return" '"0"'
+	php-ext-source-r2_addtoinifiles "xdebug.collect_vars" '"0"'
+	php-ext-source-r2_addtoinifiles "xdebug.default_enable" '"1"'
+	php-ext-source-r2_addtoinifiles "xdebug.extended_info" '"1"'
+	php-ext-source-r2_addtoinifiles "xdebug.manual_url" '"http://www.php.net"'
+	php-ext-source-r2_addtoinifiles "xdebug.max_nesting_level" '"100"'
+	php-ext-source-r2_addtoinifiles "xdebug.show_exception_trace" '"0"'
+	php-ext-source-r2_addtoinifiles "xdebug.show_local_vars" '"0"'
+	php-ext-source-r2_addtoinifiles "xdebug.show_mem_delta" '"0"'
+	php-ext-source-r2_addtoinifiles "xdebug.dump.COOKIE" '"NULL"'
+	php-ext-source-r2_addtoinifiles "xdebug.dump.ENV" '"NULL"'
+	php-ext-source-r2_addtoinifiles "xdebug.dump.FILES" '"NULL"'
+	php-ext-source-r2_addtoinifiles "xdebug.dump.GET" '"NULL"'
+	php-ext-source-r2_addtoinifiles "xdebug.dump.POST" '"NULL"'
+	php-ext-source-r2_addtoinifiles "xdebug.dump.REQUEST" '"NULL"'
+	php-ext-source-r2_addtoinifiles "xdebug.dump.SERVER" '"NULL"'
+	php-ext-source-r2_addtoinifiles "xdebug.dump.SESSION" '"NULL"'
+	php-ext-source-r2_addtoinifiles "xdebug.dump_globals" '"1"'
+	php-ext-source-r2_addtoinifiles "xdebug.dump_once" '"1"'
+	php-ext-source-r2_addtoinifiles "xdebug.dump_undefined" '"0"'
+	php-ext-source-r2_addtoinifiles "xdebug.profiler_enable" '"0"'
+	php-ext-source-r2_addtoinifiles "xdebug.profiler_output_dir" '"/tmp"'
+	php-ext-source-r2_addtoinifiles "xdebug.profiler_output_name" '"cachegrind.out.%p"'
+	php-ext-source-r2_addtoinifiles "xdebug.profiler_enable_trigger" '"0"'
+	php-ext-source-r2_addtoinifiles "xdebug.profiler_append" '"0"'
+	php-ext-source-r2_addtoinifiles "xdebug.profiler_aggregate" '"0"'
+	php-ext-source-r2_addtoinifiles "xdebug.remote_enable" '"0"'
+	php-ext-source-r2_addtoinifiles "xdebug.remote_handler" '"dbgp"'
+	php-ext-source-r2_addtoinifiles "xdebug.remote_host" '"localhost"'
+	php-ext-source-r2_addtoinifiles "xdebug.remote_mode" '"req"'
+	php-ext-source-r2_addtoinifiles "xdebug.remote_port" '"9000"'
+	php-ext-source-r2_addtoinifiles "xdebug.remote_autostart" '"0"'
+	php-ext-source-r2_addtoinifiles "xdebug.remote_log" '""'
+	php-ext-source-r2_addtoinifiles "xdebug.idekey" '""'
+	php-ext-source-r2_addtoinifiles "xdebug.var_display_max_data" '"512"'
+	php-ext-source-r2_addtoinifiles "xdebug.var_display_max_depth" '"2"'
+	php-ext-source-r2_addtoinifiles "xdebug.var_display_max_children" '"128"'
+
+}
+
+pkg_postinst() {
+	ewarn "We have set xdebug.default_enable to 0 (off), as xdebug can be"
+	ewarn "installed as a dependency, and not all users will want xdebug to be"
+	ewarn "enabled by default. If you want to enable it, you should edit the"
+	ewarn "ini file and set xdebug.default_enable to 1. Alternatively you can"
+	ewarn "call xdebug_enable() in your code."
+}
--- a/dev-tcltk/tablelist/Manifest
+++ b/dev-tcltk/tablelist/Manifest
@ -1 +1,2 @@
 DIST tablelist5.5.tar.gz 407487 RMD160 5ec533035c58c59863a5ac0bbe5beaf5fbe803ff SHA1 54562132ee36da58a8ab9d6d8fdd647c2f344aad SHA256 bbd0e4e11cb5caba767d5a6c6c38afffb3a56d65383a7230778b72901574059e
+DIST tablelist5.6.tar.gz 417270 RMD160 80c67a58231ebe832b9e0022e2dd1ca1021433df SHA1 eb4a2478e60af1b5dec843d170816a3336135297 SHA256 ec780123752d01d561144e449ac1f2c2aca0e6bfda0df9a19902d96f2f090c34
--- a/dev-tcltk/tablelist/tablelist-5.6.ebuild
+++ b/dev-tcltk/tablelist/tablelist-5.6.ebuild
@ -0,0 +1,31 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tablelist/tablelist-5.6.ebuild,v 1.1 2012/05/02 12:04:45 jlec Exp $
+
+EAPI=4
+
+inherit multilib
+
+MY_P="${PN}${PV}"
+
+DESCRIPTION="Multi-Column Listbox Package"
+HOMEPAGE="http://www.nemethi.de/tablelist/index.html"
+SRC_URI="http://www.nemethi.de/tablelist/${MY_P}.tar.gz"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples doc"
+
+RDEPEND="dev-lang/tcl"
+DEPEND=""
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+	insinto /usr/$(get_libdir)/${MY_P}
+	doins -r ${PN}* pkgIndex.tcl scripts
+	use doc && dohtml doc/*
+	use examples && insinto /usr/share/${PN} && doins -r demos
+	dodoc README.txt
+}
--- a/dev-vcs/mercurial/Manifest
+++ b/dev-vcs/mercurial/Manifest
@ -1,7 +1,4 @@
-DIST mercurial-1.7.tar.gz 2468587 RMD160 1103d8033309a69ed76a29d40823f45877dee5b9 SHA1 54f5f58365c79dd897e0e490043a5b52aa50aae1 SHA256 19125eb6497c3aeb90a7ad9d5ed7ac2499935c1df796611b017646512f38ba5a
-DIST mercurial-2.0.1.tar.gz 3128233 RMD160 1c2e84fb5ac1eef3dbdd64f16e76e99fdf34fc98 SHA1 7983f564c06aef598fcfd7f8c1c33f4669362760 SHA256 6b9e6870e21e7161bb2e44c09e078e622ad7dd46bf5a122d3155319919dc1b38
-DIST mercurial-2.0.2.tar.gz 3134016 RMD160 5d5da2c17994da77340de6527108fb4a38c216eb SHA1 aedcb4e41c5b49188d9d34d12c343b2ec099c61b SHA256 ca8b8fb93f2e3e8c3cdf2f81d87e92592f5f20c5bfcaaeb6a75550d4a69572c9
 DIST mercurial-2.0.tar.gz 3090977 RMD160 f0c5f143eabff4a6c06d512cecd718bf594d06b1 SHA1 5ede1b3f54d3be2af0657901e7013dde7c19b7c5 SHA256 affab78a4d5074c71f97c07fe211de958263444eb8d86b3ad6fb6d648eb6c594
 DIST mercurial-2.1.1.tar.gz 3313261 RMD160 e17a995a069d1a7a46537a49189520df953acb6f SHA1 d6cc4b649b6705113732e62756788542897ba008 SHA256 0f8ec2b29f1121c6cb73c17509281eb1391ddbfad757b1f720d7e06de0a25dfd
 DIST mercurial-2.1.2.tar.gz 3343349 RMD160 4ac9a91e7debbe556f1c314cc3b6fc87b6cbf2f0 SHA1 6fa2f2510757e3e62efa9d8953f8b703b84075b2 SHA256 914d4889e195687209e070c0c33cf3ae7b78d6c6c92fa7d6ccc718aa96959886
-DIST mercurial-2.1.tar.gz 3308300 RMD160 4d89616c7a2dff4d8c05cf9d8ee8b13bda1c9e23 SHA1 f649a0b33e0cafb3e5867a2e970f41eb887d3fab SHA256 cb37f90807e99dd4508cac70c098aa433b26adb7a3ab064c0b1626dc9a094383
+DIST mercurial-2.2.tar.gz 3414331 RMD160 8dd7b78da6ebdab1882a749c5ad3198ef765eff2 SHA1 8d2dc0b72d0e2aef70770a9eca32154f456e8afa SHA256 18985f38d2bf9fce8173cc2c1824b39df655b826b7886cff8db0b430e0c6ba12
--- a/dev-vcs/mercurial/mercurial-1.7.ebuild
+++ b/dev-vcs/mercurial/mercurial-1.7.ebuild
@ -1,132 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/mercurial-1.7.ebuild,v 1.11 2012/02/21 03:31:01 patrick Exp $
-
-EAPI=3
-PYTHON_DEPEND="2"
-PYTHON_USE_WITH="threads"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-*"
-
-inherit bash-completion elisp-common eutils distutils
-
-DESCRIPTION="Scalable distributed SCM"
-HOMEPAGE="http://mercurial.selenic.com/"
-SRC_URI="http://mercurial.selenic.com/release/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="bugzilla emacs gpg test tk zsh-completion"
-
-RDEPEND="bugzilla? ( dev-python/mysql-python )
-	gpg? ( app-crypt/gnupg )
-	tk? ( dev-lang/tk )
-	zsh-completion? ( app-shells/zsh )"
-DEPEND="emacs? ( virtual/emacs )
-	test? ( app-arch/unzip
-		dev-python/pygments )"
-
-PYTHON_CFLAGS=(
-	"2.* + -fno-strict-aliasing"
-	"* - -ftracer -ftree-vectorize"
-)
-
-PYTHON_MODNAME="${PN} hgext"
-SITEFILE="70${PN}-gentoo.el"
-
-src_compile() {
-	distutils_src_compile
-
-	if use emacs; then
-		cd "${S}"/contrib
-		elisp-compile mercurial.el || die "elisp-compile failed!"
-	fi
-
-	rm -rf contrib/{win32,macosx}
-}
-
-src_install() {
-	distutils_src_install
-
-	dobashcompletion contrib/bash_completion ${PN}
-
-	if use zsh-completion ; then
-		insinto /usr/share/zsh/site-functions
-		newins contrib/zsh_completion _hg
-	fi
-
-	rm -f doc/*.?.txt
-	dodoc CONTRIBUTORS PKG-INFO README doc/*.txt
-	cp hgweb*.cgi "${ED}"/usr/share/doc/${PF}/
-
-	dobin hgeditor
-	dobin contrib/hgk
-	dobin contrib/hg-ssh
-
-	rm -f contrib/hgk contrib/hg-ssh
-
-	rm -f contrib/bash_completion
-	cp -r contrib "${ED}"/usr/share/doc/${PF}/
-	doman doc/*.?
-
-	cat > "${T}/80mercurial" <<-EOF
-HG="${EPREFIX}/usr/bin/hg"
-EOF
-	doenvd "${T}/80mercurial"
-
-	if use emacs; then
-		elisp-install ${PN} contrib/mercurial.el* || die "elisp-install failed!"
-		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
-	fi
-}
-
-src_test() {
-	cd "${S}/tests/"
-	rm -rf *svn*				# Subversion tests fail with 1.5
-	rm -f test-archive			# Fails due to verbose tar output changes
-	rm -f test-convert-baz*		# GNU Arch baz
-	rm -f test-convert-cvs*		# CVS
-	rm -f test-convert-darcs*	# Darcs
-	rm -f test-convert-git*		# git
-	rm -f test-convert-mtn*		# monotone
-	rm -f test-convert-tla*		# GNU Arch tla
-	rm -f test-doctest*			# doctest always fails with python 2.5.x
-	if [[ ${EUID} -eq 0 ]]; then
-		einfo "Removing tests which require user privileges to succeed"
-		rm -f test-command-template	# Test is broken when run as root
-		rm -f test-convert			# Test is broken when run as root
-		rm -f test-lock-badness		# Test is broken when run as root
-		rm -f test-permissions		# Test is broken when run as root
-		rm -f test-pull-permission	# Test is broken when run as root
-		rm -f test-clone-failure
-		rm -f test-journal-exists
-		rm -f test-repair-strip
-	fi
-
-	testing() {
-		local testdir="${T}/tests-${PYTHON_ABI}"
-		rm -rf "${testdir}"
-		"$(PYTHON)" run-tests.py --tmpdir="${testdir}"
-	}
-	python_execute_function testing
-}
-
-pkg_postinst() {
-	distutils_pkg_postinst
-	use emacs && elisp-site-regen
-	bash-completion_pkg_postinst
-
-	elog "If you want to convert repositories from other tools using convert"
-	elog "extension please install correct tool:"
-	elog "  dev-vcs/cvs"
-	elog "  dev-vcs/darcs"
-	elog "  dev-vcs/git"
-	elog "  dev-vcs/monotone"
-	elog "  dev-vcs/subversion"
-}
-
-pkg_postrm() {
-	distutils_pkg_postrm
-	use emacs && elisp-site-regen
-}
--- a/dev-vcs/mercurial/mercurial-2.0.1.ebuild
+++ b/dev-vcs/mercurial/mercurial-2.0.1.ebuild
@ -1,139 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/mercurial-2.0.1.ebuild,v 1.3 2012/02/21 03:31:01 patrick Exp $
-
-EAPI=3
-PYTHON_DEPEND="2"
-PYTHON_USE_WITH="threads"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-*"
-
-inherit bash-completion-r1 elisp-common eutils distutils
-
-DESCRIPTION="Scalable distributed SCM"
-HOMEPAGE="http://mercurial.selenic.com/"
-SRC_URI="http://mercurial.selenic.com/release/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="bugzilla emacs gpg test tk zsh-completion"
-
-RDEPEND="bugzilla? ( dev-python/mysql-python )
-	gpg? ( app-crypt/gnupg )
-	tk? ( dev-lang/tk )
-	zsh-completion? ( app-shells/zsh )"
-DEPEND="emacs? ( virtual/emacs )
-	test? ( app-arch/unzip
-		dev-python/pygments )"
-
-PYTHON_CFLAGS=(
-	"2.* + -fno-strict-aliasing"
-	"* - -ftracer -ftree-vectorize"
-)
-
-PYTHON_MODNAME="${PN} hgext"
-SITEFILE="70${PN}-gentoo.el"
-
-src_prepare() {
-	distutils_src_prepare
-
-	# fix up logic that won't work in Gentoo Prefix (also won't outside in
-	# certain cases), bug #362891
-	sed -i -e 's:xcodebuild:nocodebuild:' setup.py || die
-}
-
-src_compile() {
-	distutils_src_compile
-
-	if use emacs; then
-		cd "${S}"/contrib || die
-		elisp-compile mercurial.el || die "elisp-compile failed!"
-	fi
-
-	rm -rf contrib/{win32,macosx} || die
-}
-
-src_install() {
-	distutils_src_install
-
-	newbashcomp contrib/bash_completion ${PN} || die
-
-	if use zsh-completion ; then
-		insinto /usr/share/zsh/site-functions
-		newins contrib/zsh_completion _hg || die
-	fi
-
-	rm -f doc/*.?.txt || die
-	dodoc CONTRIBUTORS PKG-INFO README doc/*.txt || die
-	cp hgweb*.cgi "${ED}"/usr/share/doc/${PF}/ || die
-
-	dobin hgeditor || die
-	dobin contrib/hgk || die
-	dobin contrib/hg-ssh || die
-
-	rm -f contrib/hgk contrib/hg-ssh || die
-
-	rm -f contrib/bash_completion || die
-	cp -r contrib "${ED}"/usr/share/doc/${PF}/ || die
-	doman doc/*.? || die
-
-	cat > "${T}/80mercurial" <<-EOF
-HG="${EPREFIX}/usr/bin/hg"
-EOF
-	doenvd "${T}/80mercurial" || die
-
-	if use emacs; then
-		elisp-install ${PN} contrib/mercurial.el* || die "elisp-install failed!"
-		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
-	fi
-}
-
-src_test() {
-	cd "${S}/tests/" || die
-	rm -rf *svn* || die			# Subversion tests fail with 1.5
-	rm -f test-archive || die		# Fails due to verbose tar output changes
-	rm -f test-convert-baz* || die		# GNU Arch baz
-	rm -f test-convert-cvs*	|| die		# CVS
-	rm -f test-convert-darcs* || die	# Darcs
-	rm -f test-convert-git* || die		# git
-	rm -f test-convert-mtn*	|| die		# monotone
-	rm -f test-convert-tla*	|| die		# GNU Arch tla
-	rm -f test-doctest* || die		# doctest always fails with python 2.5.x
-	if [[ ${EUID} -eq 0 ]]; then
-		einfo "Removing tests which require user privileges to succeed"
-		rm -f test-command-template || die	# Test is broken when run as root
-		rm -f test-convert || die		# Test is broken when run as root
-		rm -f test-lock-badness	|| die		# Test is broken when run as root
-		rm -f test-permissions	|| die		# Test is broken when run as root
-		rm -f test-pull-permission || die	# Test is broken when run as root
-		rm -f test-clone-failure || die
-		rm -f test-journal-exists || die
-		rm -f test-repair-strip || die
-	fi
-
-	testing() {
-		local testdir="${T}/tests-${PYTHON_ABI}"
-		rm -rf "${testdir}" || die
-		"$(PYTHON)" run-tests.py --tmpdir="${testdir}"
-	}
-	python_execute_function testing
-}
-
-pkg_postinst() {
-	distutils_pkg_postinst
-	use emacs && elisp-site-regen
-
-	elog "If you want to convert repositories from other tools using convert"
-	elog "extension please install correct tool:"
-	elog "  dev-vcs/cvs"
-	elog "  dev-vcs/darcs"
-	elog "  dev-vcs/git"
-	elog "  dev-vcs/monotone"
-	elog "  dev-vcs/subversion"
-}
-
-pkg_postrm() {
-	distutils_pkg_postrm
-	use emacs && elisp-site-regen
-}
--- a/dev-vcs/mercurial/mercurial-2.0.2.ebuild
+++ b/dev-vcs/mercurial/mercurial-2.0.2.ebuild
@ -1,139 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/mercurial-2.0.2.ebuild,v 1.2 2012/02/21 03:31:01 patrick Exp $
-
-EAPI=3
-PYTHON_DEPEND="2"
-PYTHON_USE_WITH="threads"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-*"
-
-inherit bash-completion-r1 elisp-common eutils distutils
-
-DESCRIPTION="Scalable distributed SCM"
-HOMEPAGE="http://mercurial.selenic.com/"
-SRC_URI="http://mercurial.selenic.com/release/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="bugzilla emacs gpg test tk zsh-completion"
-
-RDEPEND="bugzilla? ( dev-python/mysql-python )
-	gpg? ( app-crypt/gnupg )
-	tk? ( dev-lang/tk )
-	zsh-completion? ( app-shells/zsh )"
-DEPEND="emacs? ( virtual/emacs )
-	test? ( app-arch/unzip
-		dev-python/pygments )"
-
-PYTHON_CFLAGS=(
-	"2.* + -fno-strict-aliasing"
-	"* - -ftracer -ftree-vectorize"
-)
-
-PYTHON_MODNAME="${PN} hgext"
-SITEFILE="70${PN}-gentoo.el"
-
-src_prepare() {
-	distutils_src_prepare
-
-	# fix up logic that won't work in Gentoo Prefix (also won't outside in
-	# certain cases), bug #362891
-	sed -i -e 's:xcodebuild:nocodebuild:' setup.py || die
-}
-
-src_compile() {
-	distutils_src_compile
-
-	if use emacs; then
-		cd "${S}"/contrib || die
-		elisp-compile mercurial.el || die "elisp-compile failed!"
-	fi
-
-	rm -rf contrib/{win32,macosx} || die
-}
-
-src_install() {
-	distutils_src_install
-
-	newbashcomp contrib/bash_completion ${PN} || die
-
-	if use zsh-completion ; then
-		insinto /usr/share/zsh/site-functions
-		newins contrib/zsh_completion _hg || die
-	fi
-
-	rm -f doc/*.?.txt || die
-	dodoc CONTRIBUTORS PKG-INFO README doc/*.txt || die
-	cp hgweb*.cgi "${ED}"/usr/share/doc/${PF}/ || die
-
-	dobin hgeditor || die
-	dobin contrib/hgk || die
-	dobin contrib/hg-ssh || die
-
-	rm -f contrib/hgk contrib/hg-ssh || die
-
-	rm -f contrib/bash_completion || die
-	cp -r contrib "${ED}"/usr/share/doc/${PF}/ || die
-	doman doc/*.? || die
-
-	cat > "${T}/80mercurial" <<-EOF
-HG="${EPREFIX}/usr/bin/hg"
-EOF
-	doenvd "${T}/80mercurial" || die
-
-	if use emacs; then
-		elisp-install ${PN} contrib/mercurial.el* || die "elisp-install failed!"
-		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
-	fi
-}
-
-src_test() {
-	cd "${S}/tests/" || die
-	rm -rf *svn* || die			# Subversion tests fail with 1.5
-	rm -f test-archive || die		# Fails due to verbose tar output changes
-	rm -f test-convert-baz* || die		# GNU Arch baz
-	rm -f test-convert-cvs*	|| die		# CVS
-	rm -f test-convert-darcs* || die	# Darcs
-	rm -f test-convert-git* || die		# git
-	rm -f test-convert-mtn*	|| die		# monotone
-	rm -f test-convert-tla*	|| die		# GNU Arch tla
-	rm -f test-doctest* || die		# doctest always fails with python 2.5.x
-	if [[ ${EUID} -eq 0 ]]; then
-		einfo "Removing tests which require user privileges to succeed"
-		rm -f test-command-template || die	# Test is broken when run as root
-		rm -f test-convert || die		# Test is broken when run as root
-		rm -f test-lock-badness	|| die		# Test is broken when run as root
-		rm -f test-permissions	|| die		# Test is broken when run as root
-		rm -f test-pull-permission || die	# Test is broken when run as root
-		rm -f test-clone-failure || die
-		rm -f test-journal-exists || die
-		rm -f test-repair-strip || die
-	fi
-
-	testing() {
-		local testdir="${T}/tests-${PYTHON_ABI}"
-		rm -rf "${testdir}" || die
-		"$(PYTHON)" run-tests.py --tmpdir="${testdir}"
-	}
-	python_execute_function testing
-}
-
-pkg_postinst() {
-	distutils_pkg_postinst
-	use emacs && elisp-site-regen
-
-	elog "If you want to convert repositories from other tools using convert"
-	elog "extension please install correct tool:"
-	elog "  dev-vcs/cvs"
-	elog "  dev-vcs/darcs"
-	elog "  dev-vcs/git"
-	elog "  dev-vcs/monotone"
-	elog "  dev-vcs/subversion"
-}
-
-pkg_postrm() {
-	distutils_pkg_postrm
-	use emacs && elisp-site-regen
-}
--- a/dev-vcs/mercurial/mercurial-2.2.ebuild
+++ b/dev-vcs/mercurial/mercurial-2.2.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/mercurial-2.1.ebuild,v 1.2 2012/02/21 03:31:01 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/mercurial-2.2.ebuild,v 1.1 2012/05/02 08:35:56 djc Exp $

 EAPI=3
 PYTHON_DEPEND="2"
--- a/mail-client/thunderbird-bin/thunderbird-bin-10.0.4.ebuild
+++ b/mail-client/thunderbird-bin/thunderbird-bin-10.0.4.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird-bin/thunderbird-bin-10.0.4.ebuild,v 1.2 2012/04/30 12:28:01 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird-bin/thunderbird-bin-10.0.4.ebuild,v 1.3 2012/05/02 06:11:41 nativemad Exp $

 EAPI="4"
 MOZ_ESR="1"
@ -35,7 +35,7 @@ SRC_URI="${SRC_URI}
 HOMEPAGE="http://www.mozilla.com/thunderbird"
 RESTRICT="strip mirror binchecks"

-KEYWORDS="-* amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 SLOT="0"
 LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
 IUSE="+crashreporter"
--- a/mail-client/thunderbird/thunderbird-10.0.4.ebuild
+++ b/mail-client/thunderbird/thunderbird-10.0.4.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/thunderbird-10.0.4.ebuild,v 1.2 2012/04/30 12:26:26 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/thunderbird-10.0.4.ebuild,v 1.3 2012/05/02 06:10:44 nativemad Exp $

 EAPI="3"
 WANT_AUTOCONF="2.1"
@ -30,7 +30,7 @@ inherit flag-o-matic toolchain-funcs mozconfig-3 makeedit multilib autotools pax
 DESCRIPTION="Thunderbird Mail Client"
 HOMEPAGE="http://www.mozilla.com/en-US/thunderbird/"

-KEYWORDS="~alpha amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 SLOT="0"
 LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
 IUSE="bindist gconf +crashreporter +crypt +ipc +lightning +minimal mozdom +webm"
--- a/media-gfx/feh/feh-2.5.ebuild
+++ b/media-gfx/feh/feh-2.5.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/feh/feh-2.5.ebuild,v 1.2 2012/05/01 18:33:25 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/feh/feh-2.5.ebuild,v 1.4 2012/05/02 07:37:00 xmw Exp $

 EAPI=4
 inherit eutils toolchain-funcs
@ -11,7 +11,7 @@ SRC_URI="http://feh.finalrewind.org/${P}.tar.bz2"

 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ppc ~ppc64 x86"
 IUSE="debug curl exif test xinerama"

 COMMON_DEPEND=">=media-libs/giblib-1.2.4
--- a/media-libs/rubberband/Manifest
+++ b/media-libs/rubberband/Manifest
@ -1,3 +1 @@
-DIST rubberband-1.3.tar.bz2 94302 RMD160 29730bbb7e96440169eae6404873405d3da9fafa SHA1 a1a2fb45959953b0c58e91ca4340b869356ebff3 SHA256 2866afc5868508769ae6f0058506c4cd35634a6a5edefb53afe93ef5258c2b3c
-DIST rubberband-1.6.0.tar.bz2 113512 RMD160 1e87405ee854e0ff6a54074e4c36bb32b632e684 SHA1 01fc3a4c76049c8208f860b2d02906f3f3658c69 SHA256 5bd339e3a64c7ba428f99d8890cee1de5c7165d963d085edb2e7ad357a39c896
 DIST rubberband-1.7.0.tar.bz2 129328 RMD160 9c902c9f042f3036625b9980cf8624c3573a3c08 SHA1 a9283197c5ff7396fa70b574a9420b2d1423cc50 SHA256 8037fe0e435a756f74b524b47943a8db0a4915c8437a8a4f88cb681ed577f682
--- a/media-libs/rubberband/files/rubberband-1.3-gcc44.patch
+++ b/media-libs/rubberband/files/rubberband-1.3-gcc44.patch
@ -1,11 +0,0 @@
-diff -ur rubberband-1.3.orig/src/vamp/RubberBandVampPlugin.cpp rubberband-1.3/src/vamp/RubberBandVampPlugin.cpp
--- rubberband-1.3.orig/src/vamp/RubberBandVampPlugin.cpp	2009-03-01 23:55:47.000000000 +0200
-+++ rubberband-1.3/src/vamp/RubberBandVampPlugin.cpp	2009-06-06 01:05:25.000000000 +0300
-@@ -17,6 +17,7 @@
- #include "StretchCalculator.h"
- #include "sysutils.h"
- 
-+#include <cstdio>
- #include <cmath>
- 
- using std::string;
--- a/media-libs/rubberband/files/rubberband-1.4-gcc44.patch
+++ b/media-libs/rubberband/files/rubberband-1.4-gcc44.patch
@ -1,12 +0,0 @@
-Index: rubberband-1.4/src/system/sysutils.h
-===================================================================
--- rubberband-1.4.orig/src/system/sysutils.h
-+++ rubberband-1.4/src/system/sysutils.h
-@@ -81,6 +81,7 @@ inline float princargf(float a) { return
- 
- #include <sys/mman.h>
- #include <dlfcn.h>
-+#include <stdio.h> // perror
- 
- #define MLOCK(a,b)   ::mlock((char *)(a),(b))
- #define MUNLOCK(a,b) (::munlock((char *)(a),(b)) ? (::perror("munlock failed"), 0) : 0)
--- a/media-libs/rubberband/files/rubberband-1.4-install.patch
+++ b/media-libs/rubberband/files/rubberband-1.4-install.patch
@ -1,18 +0,0 @@
-Index: rubberband-1.4/Makefile.in
-===================================================================
--- rubberband-1.4.orig/Makefile.in
-+++ rubberband-1.4/Makefile.in
-@@ -150,10 +150,10 @@ install:	all
- 	test -n "$(DYNAMIC_FULL_VERSION)" && ln -s $(DYNAMIC_LIBNAME)$(DYNAMIC_FULL_VERSION) $(DESTDIR)$(INSTALL_LIBDIR)/$(DYNAMIC_LIBNAME)$(DYNAMIC_ABI_VERSION)
- 	test -n "$(DYNAMIC_FULL_VERSION)" && ln -s $(DYNAMIC_LIBNAME)$(DYNAMIC_FULL_VERSION) $(DESTDIR)$(INSTALL_LIBDIR)/$(DYNAMIC_LIBNAME)
- 	cp $(VAMP_TARGET) $(DESTDIR)$(INSTALL_VAMPDIR)
-	cp src/vamp/vamp-rubberband.cat $(DESTDIR)$(INSTALL_VAMPDIR)
-+	cp vamp/vamp-rubberband.cat $(DESTDIR)$(INSTALL_VAMPDIR)
- 	cp $(LADSPA_TARGET) $(DESTDIR)$(INSTALL_LADSPADIR)
-	cp src/ladspa/ladspa-rubberband.cat $(DESTDIR)$(INSTALL_LADSPADIR)
-	cp src/ladspa/ladspa-rubberband.rdf $(DESTDIR)$(INSTALL_LRDFDIR)
-+	cp ladspa/ladspa-rubberband.cat $(DESTDIR)$(INSTALL_LADSPADIR)
-+	cp ladspa/ladspa-rubberband.rdf $(DESTDIR)$(INSTALL_LRDFDIR)
- 	sed "s,%PREFIX%,@prefix@," rubberband.pc.in \
- 	  > $(DESTDIR)$(INSTALL_PKGDIR)/rubberband.pc
- 
--- a/media-libs/rubberband/files/rubberband-1.6.0-gcc-4.6.patch
+++ b/media-libs/rubberband/files/rubberband-1.6.0-gcc-4.6.patch
@ -1,10 +0,0 @@
--- rubberband-1.6.0.orig/rubberband/RubberBandStretcher.h
-+++ rubberband-1.6.0/rubberband/RubberBandStretcher.h
-@@ -21,6 +21,7 @@
- 
- #include <vector>
- #include <map>
-+#include <cstddef>
- 
- /**
-  * @mainpage RubberBand
--- a/media-libs/rubberband/rubberband-1.3.ebuild
+++ b/media-libs/rubberband/rubberband-1.3.ebuild
@ -1,39 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/rubberband/rubberband-1.3.ebuild,v 1.3 2009/06/11 21:06:42 maekke Exp $
-
-EAPI=2
-inherit eutils multilib
-
-DESCRIPTION="An audio time-stretching and pitch-shifting library and utility program"
-HOMEPAGE="http://www.breakfastquay.com/rubberband/"
-SRC_URI="http://www.breakfastquay.com/rubberband/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND="media-libs/vamp-plugin-sdk
-	media-libs/libsamplerate
-	media-libs/libsndfile
-	media-libs/ladspa-sdk
-	=sci-libs/fftw-3*"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gcc44.patch
-}
-
-src_install() {
-	emake INSTALL_BINDIR="${D}/usr/bin" \
-		INSTALL_INCDIR="${D}/usr/include/rubberband" \
-		INSTALL_LIBDIR="${D}/usr/$(get_libdir)" \
-		INSTALL_VAMPDIR="${D}/usr/$(get_libdir)/vamp" \
-		INSTALL_LADSPADIR="${D}/usr/$(get_libdir)/ladspa" \
-		INSTALL_LRDFDIR="${D}/usr/share/ladspa/rdf" \
-		INSTALL_PKGDIR="${D}/usr/$(get_libdir)/pkgconfig" \
-		install || die "emake install failed"
-	dodoc README
-}
--- a/media-libs/rubberband/rubberband-1.6.0.ebuild
+++ b/media-libs/rubberband/rubberband-1.6.0.ebuild
@ -1,40 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/rubberband/rubberband-1.6.0.ebuild,v 1.2 2011/04/26 06:52:08 radhermit Exp $
-
-EAPI=4
-inherit multilib eutils
-
-DESCRIPTION="An audio time-stretching and pitch-shifting library and utility program"
-HOMEPAGE="http://www.breakfastquay.com/rubberband/"
-SRC_URI="http://code.breakfastquay.com/attachments/download/16/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND="media-libs/vamp-plugin-sdk
-	media-libs/libsamplerate
-	media-libs/libsndfile
-	media-libs/ladspa-sdk
-	sci-libs/fftw:3.0"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gcc-4.6.patch
-}
-
-src_install() {
-	emake INSTALL_BINDIR="${D}/usr/bin" \
-		INSTALL_INCDIR="${D}/usr/include/rubberband" \
-		INSTALL_LIBDIR="${D}/usr/$(get_libdir)" \
-		INSTALL_VAMPDIR="${D}/usr/$(get_libdir)/vamp" \
-		INSTALL_LADSPADIR="${D}/usr/$(get_libdir)/ladspa" \
-		INSTALL_LRDFDIR="${D}/usr/share/ladspa/rdf" \
-		INSTALL_PKGDIR="${D}/usr/$(get_libdir)/pkgconfig" \
-		install
-
-	dodoc CHANGELOG README.txt
-}
--- a/media-libs/sg/sg-1.5.ebuild
+++ b/media-libs/sg/sg-1.5.ebuild
@ -1,10 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/sg/sg-1.5.ebuild,v 1.3 2012/02/13 20:33:25 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/sg/sg-1.5.ebuild,v 1.4 2012/05/02 10:33:43 jlec Exp $

-EAPI="3"
+EAPI=4

-inherit autotools eutils multilib
+AUTOTOOLS_AUTORECONF=true
+
+inherit autotools-utils multilib

 DESCRIPTION="Socket Graphics tool for displaying polygons"
 HOMEPAGE="http://fetk.org/codes/sg/index.html"
@ -13,7 +15,7 @@ SRC_URI="http://www.fetk.org/codes/download/${P}.tar.gz"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 LICENSE="GPL-2"
-IUSE="doc opengl"
+IUSE="doc opengl static-libs"

 RDEPEND="
 	dev-libs/maloc
@ -33,18 +35,20 @@ DEPEND="

 S="${WORKDIR}"/${PN}

-src_prepare() {
-	rm src/{gl,glu,glw} -rf
-	epatch \
-		"${FILESDIR}"/1.4-opengl.patch \
+PATCHES=(
+	"${FILESDIR}"/1.4-opengl.patch
 	"${FILESDIR}"/1.4-doc.patch
-	eautoreconf
+	)
+
+src_prepare() {
+	rm src/{gl,glu,glw} -rf || die
+	autotools-utils_src_prepare
 }

 src_configure() {
 	local sg_include
 	local sg_lib
-	local myconf
+	local myeconfargs

 	sg_include="${EPREFIX}"/usr/include
 	sg_lib="${EPREFIX}"/usr/$(get_libdir)
@ -59,17 +63,13 @@ src_configure() {
 	export FETK_GL_INCLUDE="${sg_include}"/GL
 	export FETK_MOTIF_INCLUDE="${sg_include}"

-	use doc || myconf="${myconf} --with-doxygen= --with-dot="
+	use doc || myeconfargs+=( --with-doxygen= --with-dot= )

-	use opengl && myconf="${myconf} --enable-glforce --enable-gluforce --enable-glwforce"
+	use opengl && myeconfargs+=( --enable-glforce --enable-gluforce --enable-glwforce )

-	econf \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		--disable-triplet \
-		--enable-shared \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
+	myeconfargs+=(
+		--docdir="${EPREFIX}"/usr/share/doc/${PF}
+		--disable-triplet
+	)
+	autotools-utils_src_configure
 }
--- a/metadata/cache/app-editors/gummi-0.6.3
+++ b/metadata/cache/app-editors/gummi-0.6.3
@ -6,7 +6,7 @@ http://dev.midnightcoding.org/attachments/download/263/gummi-0.6.3.tar.gz
 http://gummi.midnightcoding.org
 MIT
 Simple LaTeX editor for GTK+
-amd64 ~x86
+amd64 x86
 base eutils multilib toolchain-funcs user
 linguas_ar linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_es linguas_fr linguas_it linguas_nl linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sv linguas_zh_CN linguas_zh_TW

--- a/metadata/cache/app-misc/hivex-1.3.2
+++ b/metadata/cache/app-misc/hivex-1.3.2
@ -1,22 +0,0 @@
-virtual/libiconv virtual/libintl dev-libs/libxml2:2 ocaml? ( dev-lang/ocaml[ocamlopt] dev-ml/findlib[ocamlopt] ) readline? ( sys-libs/readline ) perl? ( dev-perl/IO-stringy ) dev-lang/perl perl? ( test? ( dev-perl/Pod-Coverage dev-perl/Test-Pod-Coverage ) ) ruby? ( dev-ruby/rake ) dev-lang/perl[-build] python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) )
-virtual/libiconv virtual/libintl dev-libs/libxml2:2 ocaml? ( dev-lang/ocaml[ocamlopt] dev-ml/findlib[ocamlopt] ) readline? ( sys-libs/readline ) perl? ( dev-perl/IO-stringy ) dev-lang/perl[-build] python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) )
-0
-http://libguestfs.org/download/hivex/hivex-1.3.2.tar.gz
-
-http://libguestfs.org
-LGPL-2.1
-Library for reading and writing Windows Registry 'hive' binary files
-~amd64 ~x86
-autotools autotools-utils base eutils libtool multilib perl-app perl-module python toolchain-funcs user
-ocaml readline perl python test static-libs ruby
-
-
-
-4
-
-compile configure install prepare setup test unpack
-
-
-
-
-
--- a/metadata/cache/app-misc/hivex-1.3.2-r2
+++ b/metadata/cache/app-misc/hivex-1.3.2-r2
--- a/metadata/cache/app-misc/hivex-1.3.3-r1
+++ b/metadata/cache/app-misc/hivex-1.3.3-r1
@ -1,4 +1,4 @@
-virtual/libiconv virtual/libintl dev-libs/libxml2:2 ocaml? ( dev-lang/ocaml[ocamlopt] dev-ml/findlib[ocamlopt] ) readline? ( sys-libs/readline ) perl? ( dev-perl/IO-stringy ) dev-lang/perl perl? ( test? ( dev-perl/Pod-Coverage dev-perl/Test-Pod-Coverage ) ) ruby? ( dev-ruby/rake ) dev-lang/perl[-build] python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) )
+virtual/libiconv virtual/libintl dev-libs/libxml2:2 ocaml? ( dev-lang/ocaml[ocamlopt] dev-ml/findlib[ocamlopt] ) readline? ( sys-libs/readline ) perl? ( dev-perl/IO-stringy ) dev-lang/perl perl? ( test? ( dev-perl/Pod-Coverage dev-perl/Test-Pod-Coverage ) ) ruby? ( dev-ruby/rake ) =sys-devel/automake-1.11* >=sys-devel/autoconf-2.68 sys-devel/libtool dev-lang/perl[-build] python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) )
 virtual/libiconv virtual/libintl dev-libs/libxml2:2 ocaml? ( dev-lang/ocaml[ocamlopt] dev-ml/findlib[ocamlopt] ) readline? ( sys-libs/readline ) perl? ( dev-perl/IO-stringy ) dev-lang/perl[-build] python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) )
 0
 http://libguestfs.org/download/hivex/hivex-1.3.3.tar.gz
--- a/metadata/cache/app-misc/hivex-1.3.5-r1
+++ b/metadata/cache/app-misc/hivex-1.3.5-r1
@ -1,4 +1,4 @@
-virtual/libiconv virtual/libintl dev-libs/libxml2:2 ocaml? ( dev-lang/ocaml[ocamlopt] dev-ml/findlib[ocamlopt] ) readline? ( sys-libs/readline ) perl? ( dev-perl/IO-stringy ) dev-lang/perl perl? ( test? ( dev-perl/Pod-Coverage dev-perl/Test-Pod-Coverage ) ) ruby? ( dev-ruby/rake ) dev-lang/perl[-build] python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) )
+virtual/libiconv virtual/libintl dev-libs/libxml2:2 ocaml? ( dev-lang/ocaml[ocamlopt] dev-ml/findlib[ocamlopt] ) readline? ( sys-libs/readline ) perl? ( dev-perl/IO-stringy ) dev-lang/perl perl? ( test? ( dev-perl/Pod-Coverage dev-perl/Test-Pod-Coverage ) ) ruby? ( dev-ruby/rake ) =sys-devel/automake-1.11* >=sys-devel/autoconf-2.68 sys-devel/libtool dev-lang/perl[-build] python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) )
 virtual/libiconv virtual/libintl dev-libs/libxml2:2 ocaml? ( dev-lang/ocaml[ocamlopt] dev-ml/findlib[ocamlopt] ) readline? ( sys-libs/readline ) perl? ( dev-perl/IO-stringy ) dev-lang/perl[-build] python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) )
 0
 http://libguestfs.org/download/hivex/hivex-1.3.5.tar.gz
--- a/metadata/cache/dev-db/redis-2.4.13
+++ b/metadata/cache/dev-db/redis-2.4.13
@ -0,0 +1,22 @@
+>=sys-devel/autoconf-2.63 tcmalloc? ( dev-util/google-perftools ) jemalloc? ( dev-libs/jemalloc ) test? ( dev-lang/tcl ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+
+0
+http://redis.googlecode.com/files/redis-2.4.13.tar.gz
+
+http://redis.io/
+BSD
+A persistent caching system, key-value and data structures database.
+~amd64 ~x86 ~x86-macos ~x86-solaris
+autotools eutils flag-o-matic libtool multilib toolchain-funcs user
+jemalloc tcmalloc test
+tcmalloc? ( !jemalloc ) jemalloc? ( !tcmalloc )
+
+
+4
+
+install prepare setup
+
+
+
+
+
--- a/metadata/cache/dev-lang/nasm-2.10
+++ b/metadata/cache/dev-lang/nasm-2.10
@ -6,7 +6,7 @@ http://www.nasm.us/pub/nasm/releasebuilds/2.10/nasm-2.10.tar.bz2
 http://nasm.sourceforge.net/
 BSD-2
 groovy little assembler
-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos
+-* ~amd64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos
 eutils flag-o-matic multilib toolchain-funcs user
 doc

--- a/metadata/cache/dev-lang/v8-3.8.9.19
+++ b/metadata/cache/dev-lang/v8-3.8.9.19
@ -6,7 +6,7 @@ http://commondatastorage.googleapis.com/chromium-browser-official/v8-3.8.9.19.ta
 http://code.google.com/p/v8
 BSD
 Google's open source JavaScript engine
-amd64 ~x86 ~x64-macos ~x86-macos
+amd64 x86 ~x64-macos ~x86-macos
 eutils multilib pax-utils python toolchain-funcs user versionator


--- a/metadata/cache/dev-libs/maloc-1.5
+++ b/metadata/cache/dev-libs/maloc-1.5
@ -7,14 +7,14 @@ http://www.fetk.org/codes/maloc/index.html
 GPL-2
 Minimal Abstraction Layer for Object-oriented C/C++ programs
 ~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
-autotools eutils libtool multilib toolchain-funcs user
+autotools autotools-utils eutils libtool multilib toolchain-funcs user
 doc mpi static-libs



-3
+4

-configure install prepare
+compile configure install prepare test



--- a/metadata/cache/dev-php/xcache-2.0.0
+++ b/metadata/cache/dev-php/xcache-2.0.0
@ -0,0 +1,22 @@
+virtual/httpd-php !dev-php/eaccelerator !dev-php/pecl-apc || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
+virtual/httpd-php !dev-php/eaccelerator !dev-php/pecl-apc || ( =dev-php/xcache-2.0.0[php_targets_php5-3] =dev-php/xcache-2.0.0[php_targets_php5-4] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
+0
+http://xcache.lighttpd.net/pub/Releases/2.0.0/xcache-2.0.0.tar.bz2
+test
+http://xcache.lighttpd.net/
+BSD
+A fast and stable PHP opcode cacher
+~amd64 ~x86
+autotools confutils eutils flag-o-matic libtool multilib php-ext-source-r2 toolchain-funcs user
+php_targets_php5-3 php_targets_php5-4
+
+
+
+4
+
+compile configure install postinst prepare unpack
+
+
+
+
+
--- a/metadata/cache/dev-php/xdebug-2.2.0_rc2
+++ b/metadata/cache/dev-php/xdebug-2.2.0_rc2
@ -0,0 +1,22 @@
+!dev-php/ZendOptimizer || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
+!dev-php/ZendOptimizer ~dev-php/xdebug-client-2.2.0_rc2 || ( =dev-php/xdebug-2.2.0_rc2[php_targets_php5-3] =dev-php/xdebug-2.2.0_rc2[php_targets_php5-4] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
+0
+http://pecl.php.net/get/xdebug-2.2.0RC2.tgz
+
+http://www.xdebug.org/
+Xdebug
+A PHP debugging and profiling extension
+~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+autotools eutils flag-o-matic libtool multilib php-ext-source-r2 toolchain-funcs user
+php_targets_php5-3 php_targets_php5-4
+
+
+
+4
+
+compile configure install postinst prepare unpack
+
+
+
+
+
--- a/metadata/cache/dev-php/xdebug-client-2.2.0_rc2
+++ b/metadata/cache/dev-php/xdebug-client-2.2.0_rc2
@ -0,0 +1,22 @@
+libedit? ( dev-libs/libedit )
+libedit? ( dev-libs/libedit )
+0
+http://pecl.php.net/get/xdebug-2.2.0RC2.tgz
+
+http://www.xdebug.org/
+Xdebug
+Xdebug client for the Common Debugger Protocol (DBGP).
+~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+
+libedit
+
+
+
+
+
+compile install unpack
+
+
+
+
+
--- a/metadata/cache/dev-tcltk/tablelist-5.6
+++ b/metadata/cache/dev-tcltk/tablelist-5.6
@ -0,0 +1,22 @@
+
+dev-lang/tcl
+0
+http://www.nemethi.de/tablelist/tablelist5.6.tar.gz
+
+http://www.nemethi.de/tablelist/index.html
+as-is
+Multi-Column Listbox Package
+~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
+multilib toolchain-funcs
+examples doc
+
+
+
+4
+
+install
+
+
+
+
+
--- a/metadata/cache/dev-vcs/mercurial-1.7
+++ b/metadata/cache/dev-vcs/mercurial-1.7
@ -1,22 +0,0 @@
-emacs? ( virtual/emacs ) test? ( app-arch/unzip dev-python/pygments ) =dev-lang/python-2* =dev-lang/python-2*[threads]
-bugzilla? ( dev-python/mysql-python ) gpg? ( app-crypt/gnupg ) tk? ( dev-lang/tk ) zsh-completion? ( app-shells/zsh ) bash-completion? ( app-admin/eselect ) =dev-lang/python-2* =dev-lang/python-2*[threads]
-0
-http://mercurial.selenic.com/release/mercurial-1.7.tar.gz
-
-http://mercurial.selenic.com/
-GPL-2
-Scalable distributed SCM
-alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-bash-completion distutils elisp-common eutils multilib python toolchain-funcs user
-bugzilla emacs gpg test tk zsh-completion bash-completion
-
-bash-completion? ( app-shells/bash-completion )
-
-3
-
-compile install postinst postrm prepare setup test
-
-
-
-
-
--- a/metadata/cache/dev-vcs/mercurial-2.0.1
+++ b/metadata/cache/dev-vcs/mercurial-2.0.1
@ -1,22 +0,0 @@
-emacs? ( virtual/emacs ) test? ( app-arch/unzip dev-python/pygments ) =dev-lang/python-2* =dev-lang/python-2*[threads]
-bugzilla? ( dev-python/mysql-python ) gpg? ( app-crypt/gnupg ) tk? ( dev-lang/tk ) zsh-completion? ( app-shells/zsh ) =dev-lang/python-2* =dev-lang/python-2*[threads]
-0
-http://mercurial.selenic.com/release/mercurial-2.0.1.tar.gz
-
-http://mercurial.selenic.com/
-GPL-2
-Scalable distributed SCM
-~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-bash-completion-r1 distutils elisp-common eutils multilib python toolchain-funcs user
-bugzilla emacs gpg test tk zsh-completion
-
-
-
-3
-
-compile install postinst postrm prepare setup test
-
-
-
-
-
--- a/metadata/cache/dev-vcs/mercurial-2.0.2
+++ b/metadata/cache/dev-vcs/mercurial-2.0.2
@ -1,22 +0,0 @@
-emacs? ( virtual/emacs ) test? ( app-arch/unzip dev-python/pygments ) =dev-lang/python-2* =dev-lang/python-2*[threads]
-bugzilla? ( dev-python/mysql-python ) gpg? ( app-crypt/gnupg ) tk? ( dev-lang/tk ) zsh-completion? ( app-shells/zsh ) =dev-lang/python-2* =dev-lang/python-2*[threads]
-0
-http://mercurial.selenic.com/release/mercurial-2.0.2.tar.gz
-
-http://mercurial.selenic.com/
-GPL-2
-Scalable distributed SCM
-~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-bash-completion-r1 distutils elisp-common eutils multilib python toolchain-funcs user
-bugzilla emacs gpg test tk zsh-completion
-
-
-
-3
-
-compile install postinst postrm prepare setup test
-
-
-
-
-
--- a/metadata/cache/dev-vcs/mercurial-2.2
+++ b/metadata/cache/dev-vcs/mercurial-2.2
@ -1,7 +1,7 @@
 emacs? ( virtual/emacs ) test? ( app-arch/unzip dev-python/pygments ) =dev-lang/python-2* =dev-lang/python-2*[threads]
 bugzilla? ( dev-python/mysql-python ) gpg? ( app-crypt/gnupg ) tk? ( dev-lang/tk ) zsh-completion? ( app-shells/zsh ) =dev-lang/python-2* =dev-lang/python-2*[threads]
 0
-http://mercurial.selenic.com/release/mercurial-2.1.tar.gz
+http://mercurial.selenic.com/release/mercurial-2.2.tar.gz

 http://mercurial.selenic.com/
 GPL-2
--- a/metadata/cache/mail-client/thunderbird-10.0.4
+++ b/metadata/cache/mail-client/thunderbird-10.0.4
@ -6,7 +6,7 @@ linguas_ar? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.4esr/linux-i6
 http://www.mozilla.com/en-US/thunderbird/
 || ( MPL-1.1 GPL-2 LGPL-2.1 )
 Thunderbird Mail Client
-~alpha amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+~alpha amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
 autotools check-reqs eutils flag-o-matic libtool makeedit mozconfig-3 mozcoreconf-2 mozextension mozlinguas multilib nsplugins pax-utils python toolchain-funcs user
 bindist gconf +crashreporter +crypt +ipc +lightning +minimal mozdom +webm custom-cflags custom-optimization +alsa +dbus debug libnotify startup-notification system-sqlite wifi linguas_ar linguas_ast linguas_be linguas_bg linguas_bn_BD linguas_br linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_es_AR linguas_es_ES linguas_et linguas_eu linguas_fi linguas_fr linguas_fy_NL linguas_ga_IE linguas_gd linguas_gl linguas_he linguas_hu linguas_id linguas_is linguas_it linguas_ja linguas_ko linguas_lt linguas_nb_NO linguas_nl linguas_nn_NO linguas_pa_IN linguas_pl linguas_pt_BR linguas_pt_PT linguas_rm linguas_ro linguas_ru linguas_si linguas_sk linguas_sl linguas_sq linguas_sr linguas_sv_SE linguas_ta_LK linguas_tr linguas_uk linguas_vi linguas_zh_CN linguas_zh_TW

--- a/metadata/cache/mail-client/thunderbird-bin-10.0.4
+++ b/metadata/cache/mail-client/thunderbird-bin-10.0.4
@ -6,7 +6,7 @@ strip mirror binchecks
 http://www.mozilla.com/thunderbird
 || ( MPL-1.1 GPL-2 LGPL-2.1 )
 Thunderbird Mail Client
-* amd64 ~x86
+-* amd64 x86
 eutils fdo-mime gnome2-utils mozextension mozlinguas multilib nsplugins pax-utils toolchain-funcs user
 +crashreporter linguas_ar linguas_ast linguas_be linguas_bg linguas_bn_BD linguas_br linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_es_AR linguas_es_ES linguas_et linguas_eu linguas_fi linguas_fr linguas_fy_NL linguas_ga_IE linguas_gd linguas_gl linguas_he linguas_hu linguas_id linguas_is linguas_it linguas_ja linguas_ko linguas_lt linguas_nb_NO linguas_nl linguas_nn_NO linguas_pa_IN linguas_pl linguas_pt_BR linguas_pt_PT linguas_rm linguas_ro linguas_ru linguas_si linguas_sk linguas_sl linguas_sq linguas_sr linguas_sv_SE linguas_ta_LK linguas_tr linguas_uk linguas_vi linguas_zh_CN linguas_zh_TW

--- a/metadata/cache/media-gfx/feh-2.5
+++ b/metadata/cache/media-gfx/feh-2.5
@ -6,7 +6,7 @@ http://feh.finalrewind.org/feh-2.5.tar.bz2
 http://feh.finalrewind.org/
 as-is
 A fast, lightweight imageviewer using imlib2
-amd64 ~arm ~ppc ~ppc64 ~x86
+amd64 ~arm ppc ~ppc64 x86
 eutils multilib toolchain-funcs user
 debug curl exif test xinerama

--- a/metadata/cache/media-libs/rubberband-1.3
+++ b/metadata/cache/media-libs/rubberband-1.3
@ -1,22 +0,0 @@
-media-libs/vamp-plugin-sdk media-libs/libsamplerate media-libs/libsndfile media-libs/ladspa-sdk =sci-libs/fftw-3* dev-util/pkgconfig
-media-libs/vamp-plugin-sdk media-libs/libsamplerate media-libs/libsndfile media-libs/ladspa-sdk =sci-libs/fftw-3*
-0
-http://www.breakfastquay.com/rubberband/files/rubberband-1.3.tar.bz2
-
-http://www.breakfastquay.com/rubberband/
-GPL-2
-An audio time-stretching and pitch-shifting library and utility program
-amd64 ~ppc ~x86
-eutils multilib toolchain-funcs user
-
-
-
-
-2
-
-install prepare
-
-
-
-
-
--- a/metadata/cache/media-libs/rubberband-1.6.0
+++ b/metadata/cache/media-libs/rubberband-1.6.0
@ -1,22 +0,0 @@
-media-libs/vamp-plugin-sdk media-libs/libsamplerate media-libs/libsndfile media-libs/ladspa-sdk sci-libs/fftw:3.0 dev-util/pkgconfig
-media-libs/vamp-plugin-sdk media-libs/libsamplerate media-libs/libsndfile media-libs/ladspa-sdk sci-libs/fftw:3.0
-0
-http://code.breakfastquay.com/attachments/download/16/rubberband-1.6.0.tar.bz2
-
-http://www.breakfastquay.com/rubberband/
-GPL-2
-An audio time-stretching and pitch-shifting library and utility program
-~amd64 ~ppc ~x86
-eutils multilib toolchain-funcs user
-
-
-
-
-4
-
-install prepare
-
-
-
-
-
--- a/metadata/cache/media-libs/sg-1.5
+++ b/metadata/cache/media-libs/sg-1.5
@ -7,14 +7,14 @@ http://fetk.org/codes/sg/index.html
 GPL-2
 Socket Graphics tool for displaying polygons
 ~amd64 ~x86 ~amd64-linux ~x86-linux
-autotools eutils libtool multilib toolchain-funcs user
-doc opengl
+autotools autotools-utils eutils libtool multilib toolchain-funcs user
+doc opengl static-libs



-3
+4

-configure install prepare
+compile configure install prepare test



--- a/metadata/cache/net-analyzer/tcpflow-1.2.3
+++ b/metadata/cache/net-analyzer/tcpflow-1.2.3
@ -1,5 +1,5 @@
-net-libs/libpcap test? ( sys-apps/coreutils )
-net-libs/libpcap
+net-libs/libpcap sys-libs/zlib test? ( sys-apps/coreutils )
+net-libs/libpcap sys-libs/zlib
 0
 http://afflib.org/downloads/tcpflow-1.2.3.tar.gz

--- a/metadata/cache/net-analyzer/tcpflow-1.2.6
+++ b/metadata/cache/net-analyzer/tcpflow-1.2.6
@ -1,5 +1,5 @@
-net-libs/libpcap test? ( sys-apps/coreutils )
-net-libs/libpcap
+net-libs/libpcap sys-libs/zlib test? ( sys-apps/coreutils )
+net-libs/libpcap sys-libs/zlib
 0
 mirror://github/simsong/tcpflow/tcpflow-1.2.6.tar.gz

--- a/metadata/cache/net-ftp/lftp-4.3.6
+++ b/metadata/cache/net-ftp/lftp-4.3.6
@ -6,7 +6,7 @@ http://ftp.yars.free.net/pub/source/lftp/lftp-4.3.6.tar.xz
 http://lftp.yar.ru/
 GPL-3
 A sophisticated ftp/sftp/http/https/torrent client and file transfer program
-~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~sparc-fbsd ~x86-fbsd
+~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~sparc-fbsd ~x86-fbsd
 autotools eutils libtool multilib toolchain-funcs user
 linguas_cs linguas_de linguas_es linguas_fr linguas_it linguas_ja linguas_ko linguas_pl linguas_pt_BR linguas_ru linguas_zh_CN linguas_zh_HK linguas_zh_TW gnutls nls socks5 +ssl

--- a/metadata/cache/net-ftp/tftp-hpa-5.2
+++ b/metadata/cache/net-ftp/tftp-hpa-5.2
@ -6,7 +6,7 @@ mirror://kernel/software/network/tftp/tftp-hpa/tftp-hpa-5.2.tar.xz
 http://www.kernel.org/pub/software/network/tftp/
 BSD
 port of the OpenBSD TFTP server
-~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~ppc-macos
 multilib toolchain-funcs
 ipv6 readline selinux tcpd

--- a/metadata/cache/net-im/telepathy-logger-0.4.0
+++ b/metadata/cache/net-im/telepathy-logger-0.4.0
@ -1,5 +1,5 @@
->=dev-libs/glib-2.25.11:2 >=sys-apps/dbus-1.1 >=dev-libs/dbus-glib-0.82 >=net-libs/telepathy-glib-0.15.6[introspection?] dev-libs/libxml2 dev-libs/libxslt dev-db/sqlite:3 introspection? ( >=dev-libs/gobject-introspection-0.9.6 ) >=dev-util/intltool-0.35 doc? ( >=dev-util/gtk-doc-1.10 ) >=sys-apps/sed-4 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
->=dev-libs/glib-2.25.11:2 >=sys-apps/dbus-1.1 >=dev-libs/dbus-glib-0.82 >=net-libs/telepathy-glib-0.15.6[introspection?] dev-libs/libxml2 dev-libs/libxslt dev-db/sqlite:3 introspection? ( >=dev-libs/gobject-introspection-0.9.6 ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
+>=dev-libs/glib-2.25.11:2 >=sys-apps/dbus-1.1 >=dev-libs/dbus-glib-0.82 >=net-libs/telepathy-glib-0.18.0[introspection?] dev-libs/libxml2 dev-libs/libxslt dev-db/sqlite:3 introspection? ( >=dev-libs/gobject-introspection-0.9.6 ) >=dev-util/intltool-0.35 doc? ( >=dev-util/gtk-doc-1.10 ) >=sys-apps/sed-4 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+>=dev-libs/glib-2.25.11:2 >=sys-apps/dbus-1.1 >=dev-libs/dbus-glib-0.82 >=net-libs/telepathy-glib-0.18.0[introspection?] dev-libs/libxml2 dev-libs/libxslt dev-db/sqlite:3 introspection? ( >=dev-libs/gobject-introspection-0.9.6 ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
 0
 http://telepathy.freedesktop.org/releases/telepathy-logger/telepathy-logger-0.4.0.tar.bz2

--- a/metadata/cache/net-libs/webkit-gtk-1.8.1-r200
+++ b/metadata/cache/net-libs/webkit-gtk-1.8.1-r200
@ -0,0 +1,22 @@
+dev-libs/libxml2:2 dev-libs/libxslt virtual/jpeg >=media-libs/libpng-1.4:0 >=x11-libs/cairo-1.10 >=dev-libs/glib-2.31.8:2 >=x11-libs/gtk+-2.13:2[aqua=,introspection?] >=dev-libs/icu-3.8.1-r1 >=net-libs/libsoup-2.37.92:2.4[introspection?] dev-db/sqlite:3 >=x11-libs/pango-1.21 x11-libs/libXrender geoloc? ( app-misc/geoclue ) gstreamer? ( media-libs/gstreamer:0.10 >=media-libs/gst-plugins-base-0.10.30:0.10 ) introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) spell? ( >=app-text/enchant-0.22 ) webgl? ( virtual/opengl ) dev-lang/perl =dev-lang/python-2* sys-devel/bison >=sys-devel/flex-2.5.33 sys-devel/gettext dev-util/gperf dev-util/pkgconfig dev-util/gtk-doc-am introspection? ( jit? ( sys-apps/paxctl ) ) test? ( x11-themes/hicolor-icon-theme jit? ( sys-apps/paxctl ) ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+dev-libs/libxml2:2 dev-libs/libxslt virtual/jpeg >=media-libs/libpng-1.4:0 >=x11-libs/cairo-1.10 >=dev-libs/glib-2.31.8:2 >=x11-libs/gtk+-2.13:2[aqua=,introspection?] >=dev-libs/icu-3.8.1-r1 >=net-libs/libsoup-2.37.92:2.4[introspection?] dev-db/sqlite:3 >=x11-libs/pango-1.21 x11-libs/libXrender geoloc? ( app-misc/geoclue ) gstreamer? ( media-libs/gstreamer:0.10 >=media-libs/gst-plugins-base-0.10.30:0.10 ) introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) spell? ( >=app-text/enchant-0.22 ) webgl? ( virtual/opengl )
+2
+http://www.webkitgtk.org/releases/webkit-1.8.1.tar.xz
+
+http://www.webkitgtk.org/
+LGPL-2 LGPL-2.1 BSD
+Open source web browser engine
+~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos
+autotools eutils flag-o-matic gnome2-utils libtool multilib pax-utils python toolchain-funcs user virtualx
+aqua coverage debug +geoloc +gstreamer +introspection +jit spell +webgl test
+introspection? ( gstreamer )
+
+
+4
+
+compile configure install prepare setup test
+
+
+
+
+
--- a/metadata/cache/net-libs/webkit-gtk-1.8.1-r300
+++ b/metadata/cache/net-libs/webkit-gtk-1.8.1-r300
@ -0,0 +1,22 @@
+dev-libs/libxml2:2 dev-libs/libxslt virtual/jpeg >=media-libs/libpng-1.4:0 >=x11-libs/cairo-1.10 >=dev-libs/glib-2.31.8:2 >=x11-libs/gtk+-3.0:3[aqua=,introspection?] >=dev-libs/icu-3.8.1-r1 >=net-libs/libsoup-2.37.92:2.4[introspection?] dev-db/sqlite:3 >=x11-libs/pango-1.21 x11-libs/libXrender geoloc? ( app-misc/geoclue ) gstreamer? ( media-libs/gstreamer:0.10 >=media-libs/gst-plugins-base-0.10.30:0.10 ) introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) spell? ( >=app-text/enchant-0.22 ) webgl? ( virtual/opengl ) webkit2? ( >=x11-libs/gtk+-2.13:2 ) dev-lang/perl =dev-lang/python-2* sys-devel/bison >=sys-devel/flex-2.5.33 sys-devel/gettext dev-util/gperf dev-util/pkgconfig dev-util/gtk-doc-am doc? ( >=dev-util/gtk-doc-1.10 ) introspection? ( jit? ( sys-apps/paxctl ) ) test? ( x11-themes/hicolor-icon-theme jit? ( sys-apps/paxctl ) ) webkit2? ( app-accessibility/at-spi2-core ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+dev-libs/libxml2:2 dev-libs/libxslt virtual/jpeg >=media-libs/libpng-1.4:0 >=x11-libs/cairo-1.10 >=dev-libs/glib-2.31.8:2 >=x11-libs/gtk+-3.0:3[aqua=,introspection?] >=dev-libs/icu-3.8.1-r1 >=net-libs/libsoup-2.37.92:2.4[introspection?] dev-db/sqlite:3 >=x11-libs/pango-1.21 x11-libs/libXrender geoloc? ( app-misc/geoclue ) gstreamer? ( media-libs/gstreamer:0.10 >=media-libs/gst-plugins-base-0.10.30:0.10 ) introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) spell? ( >=app-text/enchant-0.22 ) webgl? ( virtual/opengl ) webkit2? ( >=x11-libs/gtk+-2.13:2 )
+3
+http://www.webkitgtk.org/releases/webkit-1.8.1.tar.xz
+
+http://www.webkitgtk.org/
+LGPL-2 LGPL-2.1 BSD
+Open source web browser engine
+~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos
+autotools eutils flag-o-matic gnome2-utils libtool multilib pax-utils python toolchain-funcs user virtualx
+aqua coverage debug doc +geoloc +gstreamer +introspection +jit spell +webgl webkit2 test
+introspection? ( gstreamer )
+
+
+4
+
+compile configure install prepare setup test
+
+
+
+
+
--- a/metadata/cache/net-misc/networkmanager-0.9.4.0-r2
+++ b/metadata/cache/net-misc/networkmanager-0.9.4.0-r2
@ -8,7 +8,7 @@ GPL-2
 Network configuration and management in an easy way. Desktop environment independent.
 ~amd64 ~arm ~ppc ~ppc64 ~x86
 autotools eutils gnome.org libtool linux-info multilib systemd toolchain-funcs user versionator
-avahi bluetooth connection-sharing dhclient +dhcpcd doc gnutls +introspection kernel_linux +nss modemmanager +ppp resolvconf systemd wext wimax
+avahi bluetooth connection-sharing dhclient +dhcpcd doc gnutls +introspection kernel_linux +nss modemmanager +ppp resolvconf systemd +wext wimax
 modemmanager? ( ppp ) ^^ ( nss gnutls ) ^^ ( dhclient dhcpcd )


--- a/metadata/cache/net-misc/whois-5.0.15
+++ b/metadata/cache/net-misc/whois-5.0.15
@ -6,7 +6,7 @@ test
 http://www.linux.it/~md/software/
 GPL-2
 improved Whois Client
-~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux
+~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux
 eutils multilib toolchain-funcs user
 iconv idn nls

--- a/metadata/cache/net-p2p/bitflu-1.43
+++ b/metadata/cache/net-p2p/bitflu-1.43
@ -0,0 +1,22 @@
+dev-perl/Danga-Socket dev-perl/Sys-Syscall
+dev-perl/Danga-Socket dev-perl/Sys-Syscall
+0
+http://bitflu.workaround.ch/bitflu/bitflu-1.43.tgz
+
+http://bitflu.workaround.ch
+Artistic-2
+Bitflu is a BitTorrent client, written in Perl and is designed to run as a daemon
+~amd64 ~x86
+eutils multilib toolchain-funcs user
+
+
+
+
+4
+
+compile install postinst setup
+
+
+
+
+
--- a/metadata/cache/sys-apps/systemd-44-r1
+++ b/metadata/cache/sys-apps/systemd-44-r1
--- a/metadata/cache/sys-boot/yaboot-1.3.17-r1
+++ b/metadata/cache/sys-boot/yaboot-1.3.17-r1
@ -0,0 +1,22 @@
+sys-apps/powerpc-utils sys-fs/e2fsprogs[static-libs]
+!ibm? ( sys-fs/hfsutils sys-fs/hfsplusutils sys-fs/mac-fdisk )
+0
+http://yaboot.ozlabs.org/releases/yaboot-1.3.17.tar.gz
+
+http://yaboot.ozlabs.org
+GPL-2
+PPC Bootloader
+-* ~ppc -ppc64
+eutils multilib toolchain-funcs user
+ibm
+
+
+
+2
+
+compile install prepare unpack
+
+
+
+
+
--- a/metadata/cache/sys-kernel/hardened-sources-2.6.32-r102
+++ b/metadata/cache/sys-kernel/hardened-sources-2.6.32-r102
@ -0,0 +1,22 @@
+!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+2.6.32-r102
+mirror://kernel/linux/kernel/v2.6/linux-2.6.32.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.32.N/deblob-2.6.32 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.32.N/deblob-check -> deblob-check-2.6.32 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-2.6.32-104.extras.tar.bz2 mirror://gentoo/genpatches-2.6.32-48.base.tar.bz2 mirror://gentoo/genpatches-2.6.32-48.extras.tar.bz2
+binchecks strip
+http://www.gentoo.org/proj/en/hardened/
+GPL-2 !deblob? ( freedist )
+Hardened kernel sources (kernel series 2.6)
+~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+eutils kernel-2 multilib toolchain-funcs user versionator
+deblob symlink build deblob
+
+!build? ( virtual/dev-manager )
+
+4
+
+compile install postinst postrm preinst setup test unpack
+
+
+
+
+
--- a/metadata/cache/sys-kernel/hardened-sources-3.2.16-r1
+++ b/metadata/cache/sys-kernel/hardened-sources-3.2.16-r1
@ -0,0 +1,22 @@
+!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+3.2.16-r1
+mirror://kernel/linux/kernel/v3.x/linux-3.2.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-3.2 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-check -> deblob-check-3.2 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-3.2.16-2.extras.tar.bz2 mirror://gentoo/genpatches-3.2-14.base.tar.bz2 mirror://gentoo/genpatches-3.2-14.extras.tar.bz2
+binchecks strip
+http://www.gentoo.org/proj/en/hardened/
+GPL-2 !deblob? ( freedist )
+Hardened kernel sources (kernel series 3.2)
+~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+eutils kernel-2 multilib toolchain-funcs user versionator
+deblob symlink build deblob
+
+!build? ( virtual/dev-manager )
+
+4
+
+compile install postinst postrm preinst setup test unpack
+
+
+
+
+
--- a/metadata/cache/sys-kernel/hardened-sources-3.3.4
+++ b/metadata/cache/sys-kernel/hardened-sources-3.3.4
@ -0,0 +1,22 @@
+!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+3.3.4
+mirror://kernel/linux/kernel/v3.x/linux-3.3.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.3.N/deblob-3.3 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.3.N/deblob-check -> deblob-check-3.3 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-3.3.4-1.extras.tar.bz2 mirror://gentoo/genpatches-3.3-5.base.tar.bz2 mirror://gentoo/genpatches-3.3-5.extras.tar.bz2
+binchecks strip
+http://www.gentoo.org/proj/en/hardened/
+GPL-2 !deblob? ( freedist )
+Hardened kernel sources (kernel series 3.3)
+~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+eutils kernel-2 multilib toolchain-funcs user versionator
+deblob symlink build deblob
+
+!build? ( virtual/dev-manager )
+
+4
+
+compile install postinst postrm preinst setup test unpack
+
+
+
+
+
--- a/metadata/cache/www-client/chromium-18.0.1025.168
+++ b/metadata/cache/www-client/chromium-18.0.1025.168
@ -6,7 +6,7 @@ http://commondatastorage.googleapis.com/chromium-browser-official/chromium-18.0.
 http://chromium.org/
 BSD
 Open-source version of Google Chrome web browser
-amd64 ~x86
+amd64 x86
 chromium eutils fdo-mime flag-o-matic gnome2-utils linux-info multilib pax-utils portability python toolchain-funcs user versionator virtualx
 bindist cups gnome gnome-keyring kerberos pulseaudio custom-cflags +linguas_am +linguas_ar +linguas_bg +linguas_bn +linguas_ca +linguas_cs +linguas_da +linguas_de +linguas_el +linguas_en_GB +linguas_es +linguas_es_LA +linguas_et +linguas_fa +linguas_fi +linguas_fil +linguas_fr +linguas_gu +linguas_he +linguas_hi +linguas_hr +linguas_hu +linguas_id +linguas_it +linguas_ja +linguas_kn +linguas_ko +linguas_lt +linguas_lv +linguas_ml +linguas_mr +linguas_ms +linguas_nb +linguas_nl +linguas_pl +linguas_pt_BR +linguas_pt_PT +linguas_ro +linguas_ru +linguas_sk +linguas_sl +linguas_sr +linguas_sv +linguas_sw +linguas_ta +linguas_te +linguas_th +linguas_tr +linguas_uk +linguas_vi +linguas_zh_CN +linguas_zh_TW test

--- a/metadata/cache/www-client/firefox-10.0.4
+++ b/metadata/cache/www-client/firefox-10.0.4
@ -6,7 +6,7 @@ linguas_af? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.4esr/linux-i686/x
 http://www.mozilla.com/firefox
 || ( MPL-1.1 GPL-2 LGPL-2.1 )
 Firefox Web Browser
-~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 autotools check-reqs eutils fdo-mime flag-o-matic gnome2-utils libtool mozconfig-3 mozcoreconf-2 mozextension mozlinguas multilib nsplugins pax-utils python toolchain-funcs user virtualx
 bindist +crashreporter +ipc +minimal pgo selinux system-sqlite +webm custom-cflags custom-optimization +alsa +dbus debug libnotify startup-notification system-sqlite wifi pgo linguas_af linguas_ak linguas_ar linguas_as linguas_ast linguas_be linguas_bg linguas_bn_BD linguas_bn_IN linguas_br linguas_bs linguas_ca linguas_cs linguas_csb linguas_cy linguas_da linguas_de linguas_el linguas_en_GB linguas_en_ZA linguas_eo linguas_es_AR linguas_es_CL linguas_es_ES linguas_es_MX linguas_et linguas_eu linguas_fa linguas_fi linguas_fr linguas_fy_NL linguas_ga_IE linguas_gd linguas_gl linguas_gu_IN linguas_he linguas_hi_IN linguas_hr linguas_hu linguas_hy_AM linguas_id linguas_is linguas_it linguas_ja linguas_kk linguas_kn linguas_ko linguas_ku linguas_lg linguas_lt linguas_lv linguas_mai linguas_mk linguas_ml linguas_mr linguas_nb_NO linguas_nl linguas_nn_NO linguas_nso linguas_or linguas_pa_IN linguas_pl linguas_pt_BR linguas_pt_PT linguas_rm linguas_ro linguas_ru linguas_si linguas_sk linguas_sl linguas_son linguas_sq linguas_sr linguas_sv_SE linguas_ta linguas_ta_LK linguas_te linguas_th linguas_tr linguas_uk linguas_vi linguas_zh_CN linguas_zh_TW linguas_zu

--- a/metadata/cache/www-client/firefox-bin-10.0.4
+++ b/metadata/cache/www-client/firefox-bin-10.0.4
@ -6,7 +6,7 @@ strip mirror binchecks
 http://www.mozilla.com/firefox
 || ( MPL-1.1 GPL-2 LGPL-2.1 )
 Firefox Web Browser
-* amd64 ~x86
+-* amd64 x86
 eutils fdo-mime gnome2-utils mozextension mozlinguas multilib nsplugins pax-utils toolchain-funcs user
 startup-notification linguas_af linguas_ak linguas_ar linguas_as linguas_ast linguas_be linguas_bg linguas_bn_BD linguas_bn_IN linguas_br linguas_bs linguas_ca linguas_cs linguas_csb linguas_cy linguas_da linguas_de linguas_el linguas_en_GB linguas_en_ZA linguas_eo linguas_es_AR linguas_es_CL linguas_es_ES linguas_es_MX linguas_et linguas_eu linguas_fa linguas_fi linguas_fr linguas_fy_NL linguas_ga_IE linguas_gd linguas_gl linguas_gu_IN linguas_he linguas_hi_IN linguas_hr linguas_hu linguas_hy_AM linguas_id linguas_is linguas_it linguas_ja linguas_kk linguas_kn linguas_ko linguas_ku linguas_lg linguas_lt linguas_lv linguas_mai linguas_mk linguas_ml linguas_mr linguas_nb_NO linguas_nl linguas_nn_NO linguas_nso linguas_or linguas_pa_IN linguas_pl linguas_pt_BR linguas_pt_PT linguas_rm linguas_ro linguas_ru linguas_si linguas_sk linguas_sl linguas_son linguas_sq linguas_sr linguas_sv_SE linguas_ta linguas_ta_LK linguas_te linguas_th linguas_tr linguas_uk linguas_vi linguas_zh_CN linguas_zh_TW linguas_zu

--- a/metadata/cache/www-client/lynx-2.8.8_pre12
+++ b/metadata/cache/www-client/lynx-2.8.8_pre12
@ -6,7 +6,7 @@ http://lynx.isc.org/current/lynx2.8.8dev.12.tar.bz2
 http://lynx.isc.org/
 GPL-2
 An excellent console-based web browser with ssl support
-~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 eutils multilib toolchain-funcs user versionator
 bzip2 cjk gnutls idn ipv6 nls ssl unicode

--- a/metadata/cache/www-client/rekonq-0.9.2
+++ b/metadata/cache/www-client/rekonq-0.9.2
@ -0,0 +1,22 @@
+>=x11-libs/qt-dbus-4.8:4 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=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 ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.8:4[qt3support,ssl] >=x11-libs/qt-gui-4.8:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.8:4[accessibility] >=x11-libs/qt-script-4.8:4 >=x11-libs/qt-sql-4.8:4[qt3support] >=x11-libs/qt-svg-4.8:4 >=x11-libs/qt-test-4.8:4 >=x11-libs/qt-webkit-4.8:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7:4[aqua=]
+>=x11-libs/qt-dbus-4.8:4 >=kde-base/oxygen-icons-4.7:4[aqua=] linguas_bg? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_bg(+)] ) linguas_bs? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_bs(+)] ) linguas_ca? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_ca(+)] ) linguas_ca@valencia? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_ca@valencia(+)] ) linguas_cs? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_cs(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_de(+)] ) linguas_el? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_el(+)] ) linguas_en_GB? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_en_GB(+)] ) linguas_eo? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_eo(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_et(+)] ) linguas_eu? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_eu(+)] ) linguas_fa? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_fa(+)] ) linguas_fi? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_fi(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_fr(+)] ) linguas_ga? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_ga(+)] ) linguas_gl? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_gl(+)] ) linguas_hu? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_hu(+)] ) linguas_is? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_is(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_it(+)] ) linguas_ja? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_ja(+)] ) linguas_ko? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_ko(+)] ) linguas_lt? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_lt(+)] ) linguas_nb? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_nb(+)] ) linguas_nds? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_nds(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_nl(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_pt_BR(+)] ) linguas_ro? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_ro(+)] ) linguas_ru? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_ru(+)] ) linguas_sk? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_sk(+)] ) linguas_sl? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_sl(+)] ) linguas_sr? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_sr(+)] ) linguas_sr@ijekavian? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_sr@ijekavian(+)] ) linguas_sr@ijekavianlatin? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_sr@ijekavianlatin(+)] ) linguas_sr@latin? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_sr@latin(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_sv(+)] ) linguas_th? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_th(+)] ) linguas_tr? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_tr(+)] ) linguas_ug? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_ug(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_uk(+)] ) linguas_zh_CN? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_zh_CN(+)] ) linguas_zh_TW? ( >=kde-base/kde-l10n-4.7:4[aqua=,linguas_zh_TW(+)] ) handbook? ( >=kde-base/kdelibs-4.7:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.8:4[qt3support,ssl] >=x11-libs/qt-gui-4.8:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.8:4[accessibility] >=x11-libs/qt-script-4.8:4 >=x11-libs/qt-sql-4.8:4[qt3support] >=x11-libs/qt-svg-4.8:4 >=x11-libs/qt-test-4.8:4 >=x11-libs/qt-webkit-4.8:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7:4[aqua=]
+4
+mirror://sourceforge/rekonq/rekonq-0.9.2.tar.bz2
+test
+http://rekonq.kde.org/
+GPL-3
+A browser based on qt-webkit
+~amd64 ~x86
+base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib toolchain-funcs user versionator virtualx
+debug linguas_bg linguas_bs linguas_ca linguas_ca@valencia linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_eu linguas_fa linguas_fi linguas_fr linguas_ga linguas_gl linguas_hu linguas_is linguas_it linguas_ja linguas_ko linguas_lt linguas_nb linguas_nds linguas_nl linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sl linguas_sr linguas_sr@ijekavian linguas_sr@ijekavianlatin linguas_sr@latin linguas_sv linguas_th linguas_tr linguas_ug linguas_uk linguas_zh_CN linguas_zh_TW test +handbook aqua
+
+
+
+4
+
+compile configure install postinst postrm preinst prepare setup test unpack
+
+
+
+
+
--- a/metadata/cache/www-client/seamonkey-2.9
+++ b/metadata/cache/www-client/seamonkey-2.9
@ -6,7 +6,7 @@ linguas_be? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.9/langpack/seamonke
 http://www.seamonkey-project.org
 || ( MPL-1.1 GPL-2 LGPL-2.1 )
 Seamonkey Web Browser
-~alpha amd64 ~arm ~ppc ~ppc64 ~x86
+~alpha amd64 ~arm ~ppc ~ppc64 x86
 autotools eutils fdo-mime flag-o-matic libtool mozconfig-3 mozcoreconf-2 mozextension mozlinguas multilib nsplugins pax-utils python toolchain-funcs user
 +alsa +chatzilla +crypt +ipc +roaming system-sqlite +webm custom-cflags custom-optimization +alsa +dbus debug libnotify startup-notification system-sqlite wifi linguas_be linguas_ca linguas_cs linguas_de linguas_en_GB linguas_es_AR linguas_es_ES linguas_fi linguas_fr linguas_gl linguas_hu linguas_it linguas_ja linguas_lt linguas_nb_NO linguas_nl linguas_pl linguas_pt_PT linguas_ru linguas_sk linguas_sv_SE linguas_tr linguas_zh_CN

--- a/metadata/cache/www-client/seamonkey-bin-2.9
+++ b/metadata/cache/www-client/seamonkey-bin-2.9
@ -6,7 +6,7 @@ strip mirror binchecks
 http://www.seamonkey-project.org/
 || ( MPL-1.1 GPL-2 LGPL-2.1 )
 Mozilla Application Suite - web browser, email, HTML editor, IRC
-* amd64 ~x86
+-* amd64 x86
 eutils fdo-mime gnome2-utils mozextension mozlinguas multilib nsplugins pax-utils toolchain-funcs user
 startup-notification linguas_be linguas_ca linguas_cs linguas_de linguas_en_GB linguas_es_AR linguas_es_ES linguas_fi linguas_fr linguas_gl linguas_hu linguas_it linguas_ja linguas_lt linguas_nb_NO linguas_nl linguas_pl linguas_pt_PT linguas_ru linguas_sk linguas_sv_SE linguas_tr linguas_uk linguas_zh_CN linguas_zh_TW

--- a/metadata/cache/x11-drivers/xf86-input-virtualbox-4.0.12
+++ b/metadata/cache/x11-drivers/xf86-input-virtualbox-4.0.12
@ -1,22 +0,0 @@
-x11-base/xorg-server || ( x11-drivers/xf86-input-mouse x11-drivers/xf86-input-evdev ) =dev-util/kbuild-0.1.5* >=dev-lang/yasm-0.6.2 sys-devel/dev86 sys-power/iasl x11-proto/inputproto x11-proto/randrproto x11-proto/xproto
-x11-base/xorg-server || ( x11-drivers/xf86-input-mouse x11-drivers/xf86-input-evdev )
-0
-http://download.virtualbox.org/virtualbox/4.0.12/VirtualBox-4.0.12.tar.bz2
-
-http://www.virtualbox.org/
-GPL-2
-VirtualBox input driver
-amd64 x86
-eutils linux-info multilib toolchain-funcs user versionator
-
-
-
-
-2
-
-compile configure install postinst prepare setup
-
-
-
-
-
--- a/metadata/cache/x11-drivers/xf86-input-virtualbox-4.1.2
+++ b/metadata/cache/x11-drivers/xf86-input-virtualbox-4.1.2
@ -1,22 +0,0 @@
-x11-base/xorg-server || ( x11-drivers/xf86-input-mouse x11-drivers/xf86-input-evdev ) >=dev-util/kbuild-0.1.999 >=dev-lang/yasm-0.6.2 sys-devel/dev86 sys-power/iasl x11-proto/inputproto x11-proto/randrproto x11-proto/xproto
-x11-base/xorg-server || ( x11-drivers/xf86-input-mouse x11-drivers/xf86-input-evdev )
-0
-http://download.virtualbox.org/virtualbox/4.1.2/VirtualBox-4.1.2.tar.bz2
-
-http://www.virtualbox.org/
-GPL-2
-VirtualBox input driver
-~amd64 ~x86
-eutils linux-info multilib toolchain-funcs user versionator
-
-
-
-
-2
-
-compile configure install postinst prepare setup
-
-
-
-
-
--- a/metadata/cache/x11-libs/gtk+-3.4.1-r1
+++ b/metadata/cache/x11-libs/gtk+-3.4.1-r1
@ -0,0 +1,22 @@
+X? ( x11-libs/libXrender x11-libs/libX11 >=x11-libs/libXi-1.3 x11-libs/libXt x11-libs/libXext >=x11-libs/libXrandr-1.3 x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXcomposite x11-libs/libXdamage xinerama? ( x11-libs/libXinerama ) ) wayland? ( dev-libs/wayland media-libs/mesa[egl,wayland] x11-libs/cairo[opengl] x11-libs/libxkbcommon ) >=dev-libs/glib-2.32 >=x11-libs/pango-1.30[introspection?] >=dev-libs/atk-2.2[introspection?] >=x11-libs/cairo-1.10.0[aqua?,glib,svg,X?] >=x11-libs/gdk-pixbuf-2.26:2[introspection?,X?] >=x11-libs/gtk+-2.24:2 media-libs/fontconfig x11-misc/shared-mime-info colord? ( >=x11-misc/colord-0.1.9 ) cups? ( >=net-print/cups-1.2 ) introspection? ( >=dev-libs/gobject-introspection-1.32 ) >=dev-util/pkgconfig-0.9 X? ( x11-proto/xextproto x11-proto/xproto x11-proto/inputproto x11-proto/damageproto xinerama? ( x11-proto/xineramaproto ) ) >=dev-util/gtk-doc-am-1.11 doc? ( >=dev-util/gtk-doc-1.11 ~app-text/docbook-xml-dtd-4.1.2 ) test? ( media-fonts/font-misc-misc media-fonts/font-cursor-misc ) app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+X? ( x11-libs/libXrender x11-libs/libX11 >=x11-libs/libXi-1.3 x11-libs/libXt x11-libs/libXext >=x11-libs/libXrandr-1.3 x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXcomposite x11-libs/libXdamage xinerama? ( x11-libs/libXinerama ) ) wayland? ( dev-libs/wayland media-libs/mesa[egl,wayland] x11-libs/cairo[opengl] x11-libs/libxkbcommon ) >=dev-libs/glib-2.32 >=x11-libs/pango-1.30[introspection?] >=dev-libs/atk-2.2[introspection?] >=x11-libs/cairo-1.10.0[aqua?,glib,svg,X?] >=x11-libs/gdk-pixbuf-2.26:2[introspection?,X?] >=x11-libs/gtk+-2.24:2 media-libs/fontconfig x11-misc/shared-mime-info colord? ( >=x11-misc/colord-0.1.9 ) cups? ( >=net-print/cups-1.2 ) introspection? ( >=dev-libs/gobject-introspection-1.32 ) !<gnome-base/gail-1000 !<x11-libs/vte-0.31.0:2.90 packagekit? ( app-admin/packagekit-base ) X? ( !<x11-base/xorg-server-1.11.4 )
+3
+mirror://gnome/sources/gtk+/3.4/gtk+-3.4.1.tar.xz
+
+http://www.gtk.org/
+LGPL-2
+Gimp ToolKit +
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+eutils flag-o-matic gnome.org gnome2-utils libtool multilib toolchain-funcs user versionator virtualx
+aqua colord cups debug doc examples +introspection packagekit test vim-syntax wayland X xinerama test
+|| ( aqua wayland X ) xinerama? ( X )
+vim-syntax? ( app-vim/gtk-syntax )
+
+4
+
+configure install postinst postrm preinst prepare test
+
+
+
+
+
--- a/metadata/cache/x11-misc/fpm2-0.79
+++ b/metadata/cache/x11-misc/fpm2-0.79
@ -6,7 +6,7 @@ http://als.regnet.cz/fpm2/download/fpm2-0.79.tar.bz2
 http://als.regnet.cz/fpm2/
 GPL-2
 A GUI password manager utility with password generator
-amd64 ~x86
+amd64 x86



--- a/metadata/cache/x11-misc/trayer-1.0
+++ b/metadata/cache/x11-misc/trayer-1.0
@ -3,7 +3,7 @@ x11-libs/gtk+:2
 0
 http://download.gna.org/fvwm-crystal/trayer/trayer-1.0.tar.gz

-http://fvwm-crystal.org
+http://home.gna.org/fvwm-crystal/
 GPL-2
 Lightweight GTK+ based systray for UNIX desktop
 amd64 ppc ppc64 sparc x86
--- a/metadata/cache/x11-misc/trayer-1.0-r1
+++ b/metadata/cache/x11-misc/trayer-1.0-r1
@ -3,10 +3,10 @@ dev-libs/glib:2 x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libX11
 0
 http://download.gna.org/fvwm-crystal/trayer/trayer-1.0.tar.gz

-http://fvwm-crystal.org
+http://home.gna.org/fvwm-crystal/
 GPL-2
 Lightweight GTK+ based systray for UNIX desktop
-~amd64 ~ppc ~ppc64 ~sparc ~x86
+~amd64 ~ppc ~ppc64 ~sparc x86
 multilib toolchain-funcs


--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@ -1 +1 @@
-Wed, 02 May 2012 06:06:58 +0000
+Wed, 02 May 2012 12:36:59 +0000
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@ -1 +1 @@
-Wed, 02 May 2012 06:06:58 +0000
+Wed, 02 May 2012 12:36:59 +0000
--- a/metadata/md5-cache/app-editors/gummi-0.6.3
+++ b/metadata/md5-cache/app-editors/gummi-0.6.3
@ -4,10 +4,10 @@ DESCRIPTION=Simple LaTeX editor for GTK+
 EAPI=4
 HOMEPAGE=http://gummi.midnightcoding.org
 IUSE=linguas_ar linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_es linguas_fr linguas_it linguas_nl linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sv linguas_zh_CN linguas_zh_TW
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=app-text/gtkspell:2 >=dev-libs/glib-2.28.6 dev-texlive/texlive-latex dev-texlive/texlive-latexextra >=x11-libs/gtk+-2.24:2 x11-libs/gtksourceview:2.0
 SLOT=0
 SRC_URI=http://dev.midnightcoding.org/attachments/download/263/gummi-0.6.3.tar.gz
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	74d9118e657da5b1db0c36f5dea88e57	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=7ca36be2a7bd07e4935c5a63cdaa5429
+_md5_=2769e9e828fc6cfb144482cf1d25b5c9
--- a/metadata/md5-cache/app-misc/hivex-1.3.2
+++ b/metadata/md5-cache/app-misc/hivex-1.3.2
@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=virtual/libiconv virtual/libintl dev-libs/libxml2:2 ocaml? ( dev-lang/ocaml[ocamlopt] dev-ml/findlib[ocamlopt] ) readline? ( sys-libs/readline ) perl? ( dev-perl/IO-stringy ) dev-lang/perl perl? ( test? ( dev-perl/Pod-Coverage dev-perl/Test-Pod-Coverage ) ) ruby? ( dev-ruby/rake ) dev-lang/perl[-build] python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) )
-DESCRIPTION=Library for reading and writing Windows Registry 'hive' binary files
-EAPI=4
-HOMEPAGE=http://libguestfs.org
-IUSE=ocaml readline perl python test static-libs ruby
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=virtual/libiconv virtual/libintl dev-libs/libxml2:2 ocaml? ( dev-lang/ocaml[ocamlopt] dev-ml/findlib[ocamlopt] ) readline? ( sys-libs/readline ) perl? ( dev-perl/IO-stringy ) dev-lang/perl[-build] python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) )
-SLOT=0
-SRC_URI=http://libguestfs.org/download/hivex/hivex-1.3.2.tar.gz
-_eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	748973db029ba52a1991320e1034bad9	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	74d9118e657da5b1db0c36f5dea88e57	libtool	5f623f5a211fb1b2d84d88ee49959a54	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	perl-app	20b0a51a72b6d2c8ac53ccab1605737f	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=9c583252856bcffa1e8e3e869b123ce2
--- a/metadata/md5-cache/app-misc/hivex-1.3.2-r2
+++ b/metadata/md5-cache/app-misc/hivex-1.3.2-r2
@ -10,4 +10,4 @@ RDEPEND=virtual/libiconv virtual/libintl dev-libs/libxml2:2 ocaml? ( dev-lang/oc
 SLOT=0
 SRC_URI=http://libguestfs.org/download/hivex/hivex-1.3.2.tar.gz
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	748973db029ba52a1991320e1034bad9	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	74d9118e657da5b1db0c36f5dea88e57	libtool	5f623f5a211fb1b2d84d88ee49959a54	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	perl-app	20b0a51a72b6d2c8ac53ccab1605737f	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=ec7377ba1ceb144a6b30457cdcb8ee28
+_md5_=6cc5539820c97d040bd2adc2c9fd7b8e
--- a/metadata/md5-cache/app-misc/hivex-1.3.3-r1
+++ b/metadata/md5-cache/app-misc/hivex-1.3.3-r1
@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=virtual/libiconv virtual/libintl dev-libs/libxml2:2 ocaml? ( dev-lang/ocaml[ocamlopt] dev-ml/findlib[ocamlopt] ) readline? ( sys-libs/readline ) perl? ( dev-perl/IO-stringy ) dev-lang/perl perl? ( test? ( dev-perl/Pod-Coverage dev-perl/Test-Pod-Coverage ) ) ruby? ( dev-ruby/rake ) dev-lang/perl[-build] python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) )
+DEPEND=virtual/libiconv virtual/libintl dev-libs/libxml2:2 ocaml? ( dev-lang/ocaml[ocamlopt] dev-ml/findlib[ocamlopt] ) readline? ( sys-libs/readline ) perl? ( dev-perl/IO-stringy ) dev-lang/perl perl? ( test? ( dev-perl/Pod-Coverage dev-perl/Test-Pod-Coverage ) ) ruby? ( dev-ruby/rake ) =sys-devel/automake-1.11* >=sys-devel/autoconf-2.68 sys-devel/libtool dev-lang/perl[-build] python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) )
 DESCRIPTION=Library for reading and writing Windows Registry 'hive' binary files
 EAPI=4
 HOMEPAGE=http://libguestfs.org
@ -10,4 +10,4 @@ RDEPEND=virtual/libiconv virtual/libintl dev-libs/libxml2:2 ocaml? ( dev-lang/oc
 SLOT=0
 SRC_URI=http://libguestfs.org/download/hivex/hivex-1.3.3.tar.gz
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	748973db029ba52a1991320e1034bad9	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	74d9118e657da5b1db0c36f5dea88e57	libtool	5f623f5a211fb1b2d84d88ee49959a54	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	perl-app	20b0a51a72b6d2c8ac53ccab1605737f	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=332d353fd8a0d228cc11e05d8e165f1e
+_md5_=9a253cb12b88fbdd3769a659b216aa01
--- a/metadata/md5-cache/app-misc/hivex-1.3.5-r1
+++ b/metadata/md5-cache/app-misc/hivex-1.3.5-r1
@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=virtual/libiconv virtual/libintl dev-libs/libxml2:2 ocaml? ( dev-lang/ocaml[ocamlopt] dev-ml/findlib[ocamlopt] ) readline? ( sys-libs/readline ) perl? ( dev-perl/IO-stringy ) dev-lang/perl perl? ( test? ( dev-perl/Pod-Coverage dev-perl/Test-Pod-Coverage ) ) ruby? ( dev-ruby/rake ) dev-lang/perl[-build] python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) )
+DEPEND=virtual/libiconv virtual/libintl dev-libs/libxml2:2 ocaml? ( dev-lang/ocaml[ocamlopt] dev-ml/findlib[ocamlopt] ) readline? ( sys-libs/readline ) perl? ( dev-perl/IO-stringy ) dev-lang/perl perl? ( test? ( dev-perl/Pod-Coverage dev-perl/Test-Pod-Coverage ) ) ruby? ( dev-ruby/rake ) =sys-devel/automake-1.11* >=sys-devel/autoconf-2.68 sys-devel/libtool dev-lang/perl[-build] python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) )
 DESCRIPTION=Library for reading and writing Windows Registry 'hive' binary files
 EAPI=4
 HOMEPAGE=http://libguestfs.org
@ -10,4 +10,4 @@ RDEPEND=virtual/libiconv virtual/libintl dev-libs/libxml2:2 ocaml? ( dev-lang/oc
 SLOT=0
 SRC_URI=http://libguestfs.org/download/hivex/hivex-1.3.5.tar.gz
 _eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	748973db029ba52a1991320e1034bad9	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	74d9118e657da5b1db0c36f5dea88e57	libtool	5f623f5a211fb1b2d84d88ee49959a54	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	perl-app	20b0a51a72b6d2c8ac53ccab1605737f	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=bb9c6a5eb8bee66d7654c67806cb27e9
+_md5_=a354c36fe1efd551edc059e43f6b04d7
--- a/metadata/md5-cache/dev-cpp/gtksourceviewmm-2.10.2
+++ b/metadata/md5-cache/dev-cpp/gtksourceviewmm-2.10.2
@ -10,4 +10,4 @@ RDEPEND=>=dev-cpp/gtkmm-2.12:2.4 dev-cpp/atkmm >=x11-libs/gtksourceview-2.10.0:2
 SLOT=2.0
 SRC_URI=mirror://gnome/sources/gtksourceviewmm/2.10/gtksourceviewmm-2.10.2.tar.xz
 _eclasses_=eutils	74d9118e657da5b1db0c36f5dea88e57	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	490ce89f5d905297c7a34898fa498bd0	gnome2-utils	9d3cc9ffeb792a88ed8580de1a099b44	libtool	5f623f5a211fb1b2d84d88ee49959a54	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=91fa5b7d5a0125b5214160d58a9f18eb
+_md5_=642cbc03e78c061ab0addd9b4ad4e0bc
--- a/metadata/md5-cache/dev-db/redis-2.4.13
+++ b/metadata/md5-cache/dev-db/redis-2.4.13
@ -0,0 +1,13 @@
+DEFINED_PHASES=install prepare setup
+DEPEND=>=sys-devel/autoconf-2.63 tcmalloc? ( dev-util/google-perftools ) jemalloc? ( dev-libs/jemalloc ) test? ( dev-lang/tcl ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DESCRIPTION=A persistent caching system, key-value and data structures database.
+EAPI=4
+HOMEPAGE=http://redis.io/
+IUSE=+jemalloc tcmalloc test
+KEYWORDS=~amd64 ~x86 ~x86-macos ~x86-solaris
+LICENSE=BSD
+REQUIRED_USE=tcmalloc? ( !jemalloc ) jemalloc? ( !tcmalloc )
+SLOT=0
+SRC_URI=http://redis.googlecode.com/files/redis-2.4.13.tar.gz
+_eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	eutils	74d9118e657da5b1db0c36f5dea88e57	flag-o-matic	66cb710a2aa184a5687fe1289d7973ab	libtool	5f623f5a211fb1b2d84d88ee49959a54	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	32a09e82e2f592bf88ad2fd08525166e
+_md5_=abfe52b15b3a6e3854a9e4190c2c0c96
--- a/Show more
+++ b/Show more