From 6c67c38ca30a70530b3aad4421b18b5229b73909 Mon Sep 17 00:00:00 2001
From: root <root@sandbox.local.calculate.ru>
Date: Wed, 25 Jan 2012 13:16:08 +0400
Subject: [PATCH] Sync with portage [Wed Jan 25 13:16:08 MSK 2012].

---
 .../ca-certificates-20111025.ebuild           |   4 +-
 .../ddccontrol/ddccontrol-0.4.2-r1.ebuild     |  73 +++++++
 .../files/ddccontrol-0.4.2-automake.patch     |  60 ++++++
 .../files/ddccontrol-0.4.2-no-ddcpci.patch    |  14 ++
 app-misc/ddccontrol/metadata.xml              |  10 +-
 dev-games/cegui/Manifest                      |   2 +
 dev-games/cegui/cegui-0.7.6.ebuild            | 106 +++++++++
 dev-ruby/builder/builder-3.0.0-r1.ebuild      |  33 +++
 .../builder/files/builder-3.0.0-tests.patch   |  55 +++++
 dev-ruby/fast_xs/fast_xs-0.8.0.ebuild         |   6 +-
 .../files/fast_xs-0.8.0+ruby-1.9.patch        |  23 ++
 dev-ruby/hpricot/Manifest                     |   1 +
 .../hpricot/files/hpricot-0.8.2-jruby.patch   | 203 ------------------
 .../hpricot/files/hpricot-0.8.6-fast_xs.patch |  24 +++
 dev-ruby/hpricot/hpricot-0.8.6.ebuild         |  75 +++++++
 .../files/10-user-dirs-update-gnome-r1        |  10 +
 .../gnome-session/files/15-xdg-data-gnome-r1  |   9 +
 ...gnome-session-3.2.1-kernel-boot-line.patch | 107 +++++++++
 .../gnome-session-3.2.1-r1.ebuild             | 108 ++++++++++
 .../cache/app-misc/ca-certificates-20111025   |   2 +-
 metadata/cache/app-misc/ddccontrol-0.4.2-r1   |  22 ++
 metadata/cache/dev-games/cegui-0.7.6          |  22 ++
 metadata/cache/dev-ruby/builder-3.0.0-r1      |  22 ++
 metadata/cache/dev-ruby/fast_xs-0.8.0         |   8 +-
 metadata/cache/dev-ruby/hpricot-0.8.6         |  22 ++
 .../cache/gnome-base/gnome-session-3.2.1-r1   |  22 ++
 metadata/cache/sci-chemistry/votca-csg-1.2.2  |   2 +-
 .../cache/sci-chemistry/votca-csgapps-1.2.2   |   2 +-
 metadata/cache/sys-apps/vgabios-0.6c          |  22 ++
 metadata/cache/sys-apps/vgabios-0.7a          |  22 ++
 metadata/cache/sys-devel/gdb-7.4              |  22 ++
 .../cache/sys-kernel/gentoo-sources-2.6.39-r3 |  22 --
 .../cache/sys-kernel/gentoo-sources-2.6.39-r4 |  22 --
 .../cache/sys-kernel/gentoo-sources-3.0.13    |  22 --
 .../cache/sys-kernel/gentoo-sources-3.0.14    |  22 --
 .../cache/sys-kernel/gentoo-sources-3.0.15    |  22 --
 .../cache/sys-kernel/gentoo-sources-3.0.17    |  22 --
 .../cache/sys-kernel/gentoo-sources-3.0.17-r2 |   2 +-
 .../cache/sys-kernel/gentoo-sources-3.0.6     |  22 --
 .../cache/sys-kernel/gentoo-sources-3.1.10-r1 |   2 +-
 .../cache/sys-kernel/gentoo-sources-3.1.6     |  22 --
 .../cache/sys-kernel/gentoo-sources-3.1.7     |  22 --
 .../cache/sys-kernel/gentoo-sources-3.1.9     |  22 --
 .../cache/sys-kernel/gentoo-sources-3.2.0     |  22 --
 .../cache/sys-kernel/gentoo-sources-3.2.0-r1  |  22 --
 .../cache/sys-kernel/gentoo-sources-3.2.1     |  22 --
 ... => google-chrome-18.0.1017.2_alpha118867} |   4 +-
 metadata/dtd/timestamp.chk                    |   2 +-
 metadata/glsa/timestamp.chk                   |   2 +-
 metadata/news/timestamp.chk                   |   2 +-
 metadata/timestamp                            |   2 +-
 metadata/timestamp.chk                        |   2 +-
 metadata/timestamp.x                          |   2 +-
 profiles/use.local.desc                       |   1 +
 .../votca-csg/votca-csg-1.2.2.ebuild          |   8 +-
 .../votca-csgapps/votca-csgapps-1.2.2.ebuild  |   4 +-
 sys-apps/vgabios/Manifest                     |   4 +
 sys-apps/vgabios/metadata.xml                 |  10 +
 sys-apps/vgabios/vgabios-0.6c.ebuild          |  66 ++++++
 sys-apps/vgabios/vgabios-0.7a.ebuild          |  66 ++++++
 sys-devel/gdb/Manifest                        |   2 +
 sys-devel/gdb/gdb-7.4.ebuild                  | 183 ++++++++++++++++
 sys-kernel/gentoo-sources/Manifest            |  29 ---
 .../gentoo-sources-2.6.39-r3.ebuild           |  29 ---
 .../gentoo-sources-2.6.39-r4.ebuild           |  29 ---
 .../gentoo-sources-3.0.13.ebuild              |  29 ---
 .../gentoo-sources-3.0.14.ebuild              |  29 ---
 .../gentoo-sources-3.0.15.ebuild              |  29 ---
 .../gentoo-sources-3.0.17-r2.ebuild           |   4 +-
 .../gentoo-sources-3.0.17.ebuild              |  29 ---
 .../gentoo-sources-3.0.6.ebuild               |  29 ---
 .../gentoo-sources-3.1.10-r1.ebuild           |   4 +-
 .../gentoo-sources-3.1.6.ebuild               |  29 ---
 .../gentoo-sources-3.1.7.ebuild               |  29 ---
 .../gentoo-sources-3.1.9.ebuild               |  29 ---
 .../gentoo-sources-3.2.0-r1.ebuild            |  29 ---
 .../gentoo-sources-3.2.0.ebuild               |  29 ---
 .../gentoo-sources-3.2.1.ebuild               |  29 ---
 www-client/google-chrome/Manifest             |   4 +-
 ...gle-chrome-18.0.1017.2_alpha118867.ebuild} |  21 +-
 80 files changed, 1258 insertions(+), 944 deletions(-)
 create mode 100644 app-misc/ddccontrol/ddccontrol-0.4.2-r1.ebuild
 create mode 100644 app-misc/ddccontrol/files/ddccontrol-0.4.2-automake.patch
 create mode 100644 app-misc/ddccontrol/files/ddccontrol-0.4.2-no-ddcpci.patch
 create mode 100644 dev-games/cegui/cegui-0.7.6.ebuild
 create mode 100644 dev-ruby/builder/builder-3.0.0-r1.ebuild
 create mode 100644 dev-ruby/builder/files/builder-3.0.0-tests.patch
 create mode 100644 dev-ruby/fast_xs/files/fast_xs-0.8.0+ruby-1.9.patch
 delete mode 100644 dev-ruby/hpricot/files/hpricot-0.8.2-jruby.patch
 create mode 100644 dev-ruby/hpricot/files/hpricot-0.8.6-fast_xs.patch
 create mode 100644 dev-ruby/hpricot/hpricot-0.8.6.ebuild
 create mode 100755 gnome-base/gnome-session/files/10-user-dirs-update-gnome-r1
 create mode 100644 gnome-base/gnome-session/files/15-xdg-data-gnome-r1
 create mode 100644 gnome-base/gnome-session/files/gnome-session-3.2.1-kernel-boot-line.patch
 create mode 100644 gnome-base/gnome-session/gnome-session-3.2.1-r1.ebuild
 create mode 100644 metadata/cache/app-misc/ddccontrol-0.4.2-r1
 create mode 100644 metadata/cache/dev-games/cegui-0.7.6
 create mode 100644 metadata/cache/dev-ruby/builder-3.0.0-r1
 create mode 100644 metadata/cache/dev-ruby/hpricot-0.8.6
 create mode 100644 metadata/cache/gnome-base/gnome-session-3.2.1-r1
 create mode 100644 metadata/cache/sys-apps/vgabios-0.6c
 create mode 100644 metadata/cache/sys-apps/vgabios-0.7a
 create mode 100644 metadata/cache/sys-devel/gdb-7.4
 delete mode 100644 metadata/cache/sys-kernel/gentoo-sources-2.6.39-r3
 delete mode 100644 metadata/cache/sys-kernel/gentoo-sources-2.6.39-r4
 delete mode 100644 metadata/cache/sys-kernel/gentoo-sources-3.0.13
 delete mode 100644 metadata/cache/sys-kernel/gentoo-sources-3.0.14
 delete mode 100644 metadata/cache/sys-kernel/gentoo-sources-3.0.15
 delete mode 100644 metadata/cache/sys-kernel/gentoo-sources-3.0.17
 delete mode 100644 metadata/cache/sys-kernel/gentoo-sources-3.0.6
 delete mode 100644 metadata/cache/sys-kernel/gentoo-sources-3.1.6
 delete mode 100644 metadata/cache/sys-kernel/gentoo-sources-3.1.7
 delete mode 100644 metadata/cache/sys-kernel/gentoo-sources-3.1.9
 delete mode 100644 metadata/cache/sys-kernel/gentoo-sources-3.2.0
 delete mode 100644 metadata/cache/sys-kernel/gentoo-sources-3.2.0-r1
 delete mode 100644 metadata/cache/sys-kernel/gentoo-sources-3.2.1
 rename metadata/cache/www-client/{google-chrome-18.0.1010.0_alpha117846 => google-chrome-18.0.1017.2_alpha118867} (62%)
 create mode 100644 sys-apps/vgabios/Manifest
 create mode 100644 sys-apps/vgabios/metadata.xml
 create mode 100644 sys-apps/vgabios/vgabios-0.6c.ebuild
 create mode 100644 sys-apps/vgabios/vgabios-0.7a.ebuild
 create mode 100644 sys-devel/gdb/gdb-7.4.ebuild
 delete mode 100644 sys-kernel/gentoo-sources/gentoo-sources-2.6.39-r3.ebuild
 delete mode 100644 sys-kernel/gentoo-sources/gentoo-sources-2.6.39-r4.ebuild
 delete mode 100644 sys-kernel/gentoo-sources/gentoo-sources-3.0.13.ebuild
 delete mode 100644 sys-kernel/gentoo-sources/gentoo-sources-3.0.14.ebuild
 delete mode 100644 sys-kernel/gentoo-sources/gentoo-sources-3.0.15.ebuild
 delete mode 100644 sys-kernel/gentoo-sources/gentoo-sources-3.0.17.ebuild
 delete mode 100644 sys-kernel/gentoo-sources/gentoo-sources-3.0.6.ebuild
 delete mode 100644 sys-kernel/gentoo-sources/gentoo-sources-3.1.6.ebuild
 delete mode 100644 sys-kernel/gentoo-sources/gentoo-sources-3.1.7.ebuild
 delete mode 100644 sys-kernel/gentoo-sources/gentoo-sources-3.1.9.ebuild
 delete mode 100644 sys-kernel/gentoo-sources/gentoo-sources-3.2.0-r1.ebuild
 delete mode 100644 sys-kernel/gentoo-sources/gentoo-sources-3.2.0.ebuild
 delete mode 100644 sys-kernel/gentoo-sources/gentoo-sources-3.2.1.ebuild
 rename www-client/google-chrome/{google-chrome-18.0.1010.0_alpha117846.ebuild => google-chrome-18.0.1017.2_alpha118867.ebuild} (97%)

diff --git a/app-misc/ca-certificates/ca-certificates-20111025.ebuild b/app-misc/ca-certificates/ca-certificates-20111025.ebuild
index e7141f31ef04..a7ab7a38ce72 100644
--- a/app-misc/ca-certificates/ca-certificates-20111025.ebuild
+++ b/app-misc/ca-certificates/ca-certificates-20111025.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/ca-certificates/ca-certificates-20111025.ebuild,v 1.8 2012/01/04 18:28:43 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/ca-certificates/ca-certificates-20111025.ebuild,v 1.9 2012/01/25 05:17:54 vapier Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${PV}${NMU_PR:++nmu}${NMU_PR}_a
 
 LICENSE="MPL-1.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ~ppc64 s390 sh sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 # platforms like AIX don't have a good ar
diff --git a/app-misc/ddccontrol/ddccontrol-0.4.2-r1.ebuild b/app-misc/ddccontrol/ddccontrol-0.4.2-r1.ebuild
new file mode 100644
index 000000000000..f696e98a89b7
--- /dev/null
+++ b/app-misc/ddccontrol/ddccontrol-0.4.2-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/ddccontrol/ddccontrol-0.4.2-r1.ebuild,v 1.1 2012/01/25 02:17:34 vapier Exp $
+
+EAPI="4"
+
+inherit eutils autotools
+
+DESCRIPTION="DDCControl allows control of monitor parameters via DDC"
+HOMEPAGE="http://ddccontrol.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="+ddcpci doc gnome gtk nls static-libs"
+
+RDEPEND="dev-libs/libxml2:2
+	gtk? ( >=x11-libs/gtk+-2.4:2 )
+	gnome? ( >=gnome-base/gnome-panel-2.10 )
+	sys-apps/pciutils
+	nls? ( sys-devel/gettext )
+	>=app-misc/ddccontrol-db-20060730"
+DEPEND="${RDEPEND}
+	dev-perl/XML-Parser
+	dev-util/intltool
+	doc? ( >=app-text/docbook-xsl-stylesheets-1.65.1
+		   >=dev-libs/libxslt-1.1.6
+	       app-text/htmltidy )
+	sys-kernel/linux-headers"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-pciutils-libz.patch
+	epatch "${FILESDIR}"/${P}-automake.patch
+	epatch "${FILESDIR}"/${P}-no-ddcpci.patch
+	sed -i '/^htmldir/d' doc/Makefile.am || die
+
+	# ppc/ppc64 do not have inb/outb/ioperm
+	# they also do not have (sys|asm)/io.h
+	if ! use amd64 && ! use x86 ; then
+		local card
+		for card in sis intel810 ; do
+			sed -r -i \
+				-e "/${card}.Po/d" \
+				-e "s~${card}[^[:space:]]*~ ~g" \
+				src/ddcpci/Makefile.{am,in}
+		done
+		sed -i \
+			-e '/sis_/d' \
+			-e '/i810_/d' \
+			src/ddcpci/main.c
+	fi
+
+	## Save for a rainy day or future patching
+	eautoreconf
+	intltoolize --force || die "intltoolize failed"
+}
+
+src_configure() {
+	econf \
+		--htmldir='$(datarootdir)'/doc/${PF}/html \
+		$(use_enable ddcpci) \
+		$(use_enable doc) \
+		$(use_enable gnome gnome-applet) \
+		$(use_enable gtk gnome) \
+		$(use_enable nls) \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	use static-libs || find "${ED}" -name '*.la' -delete
+}
diff --git a/app-misc/ddccontrol/files/ddccontrol-0.4.2-automake.patch b/app-misc/ddccontrol/files/ddccontrol-0.4.2-automake.patch
new file mode 100644
index 000000000000..005efc51c636
--- /dev/null
+++ b/app-misc/ddccontrol/files/ddccontrol-0.4.2-automake.patch
@@ -0,0 +1,60 @@
+taken from upstream git
+
+From 1c5eaf9ca5cb03d4124d54b4178d4a2a47a724d7 Mon Sep 17 00:00:00 2001
+From: Stanislav Brabec <sbrabec@suse.cz>
+Date: Sun, 10 Oct 2010 18:29:16 +0200
+Subject: [PATCH] Applied ddccontrol-libexecdir.patch
+
+---
+ .../GNOME_ddcc-applet.server.in.in                 |    2 +-
+ src/gnome-ddcc-applet/Makefile.am                  |   12 +++++++-----
+ 2 files changed, 8 insertions(+), 6 deletions(-)
+
+diff --git a/src/gnome-ddcc-applet/GNOME_ddcc-applet.server.in.in b/src/gnome-ddcc-applet/GNOME_ddcc-applet.server.in.in
+index f3a28ba..89a6615 100644
+--- a/src/gnome-ddcc-applet/GNOME_ddcc-applet.server.in.in
++++ b/src/gnome-ddcc-applet/GNOME_ddcc-applet.server.in.in
+@@ -2,7 +2,7 @@
+ 
+ <oaf_server iid="OAFIID:GNOME_ddcc-applet_Factory"
+             type="exe"
+-            location="@PKGLIBDIR@/ddcc-applet">
++            location="@appletdir@/ddcc-applet">
+ 
+         <oaf_attribute name="repo_ids" type="stringv">
+                 <item value="IDL:Bonobo/GenericFactory:1.0"/>
+diff --git a/src/gnome-ddcc-applet/Makefile.am b/src/gnome-ddcc-applet/Makefile.am
+index d16fbd0..6218efa 100644
+--- a/src/gnome-ddcc-applet/Makefile.am
++++ b/src/gnome-ddcc-applet/Makefile.am
+@@ -6,9 +6,10 @@ DDCC_LDADD = ../lib/libddccontrol.la
+ 
+ EXTRA_DIST = GNOME_ddcc-applet.server.in.in GNOME_ddcc-applet.xml
+ 
+-pkglib_PROGRAMS = ddcc-applet
+-ddcc_applet_SOURCES = ddcc-applet.c ddcc-applet.h
++applet_PROGRAMS = ddcc-applet
++appletdir = $(libexecdir)
+ 
++ddcc_applet_SOURCES = ddcc-applet.c ddcc-applet.h
+ ddcc_applet_LDADD = $(GNOME_LDFLAGS) $(DDCC_LDADD)
+ AM_CFLAGS = $(GNOME_CFLAGS) '-DPKGDATADIR="$(pkgdatadir)"'
+ 
+@@ -18,10 +19,11 @@ serverdir       = $(libdir)/bonobo/servers
+ server_in_files = GNOME_ddcc-applet.server.in
+ server_DATA     = $(server_in_files:.server.in=.server)
+ 
+-$(server_in_files): $(server_in_files:.server.in=.server.in.in)
+-	sed -e "s|\@PKGLIBDIR\@|$(pkglibdir)|" $< > $@
++$(server_in_files): $(server_in_files:.server.in=.server.in.in) Makefile
++	$(AM_V_GEN)sed \
++	    -e "s|\@appletdir\@|$(appletdir)|" \
++	    $< > $@
+ 
+ CLEANFILES = $(server_in_files) $(server_DATA)
+ 
+ @INTLTOOL_SERVER_RULE@
+-
+-- 
+1.7.4.1
+
diff --git a/app-misc/ddccontrol/files/ddccontrol-0.4.2-no-ddcpci.patch b/app-misc/ddccontrol/files/ddccontrol-0.4.2-no-ddcpci.patch
new file mode 100644
index 000000000000..5ecb90f12a82
--- /dev/null
+++ b/app-misc/ddccontrol/files/ddccontrol-0.4.2-no-ddcpci.patch
@@ -0,0 +1,14 @@
+fix building when ddcpci is disabled.  just a hack while we sort
+out the real fix upstream.
+
+--- a/src/gddccontrol/main.c
++++ b/src/gddccontrol/main.c
+@@ -24,7 +24,7 @@
+ #include <stdio.h>
+ #include <unistd.h>
+ 
+-#include "ddcpci-ipc.h"
++#define IDLE_TIMEOUT 60
+ 
+ #include "notebook.h"
+ 
diff --git a/app-misc/ddccontrol/metadata.xml b/app-misc/ddccontrol/metadata.xml
index 2b6ad1725fe6..ba22cd1648e4 100644
--- a/app-misc/ddccontrol/metadata.xml
+++ b/app-misc/ddccontrol/metadata.xml
@@ -4,11 +4,7 @@
 <maintainer>
   <email>robbat2@gentoo.org</email>
 </maintainer>
-<maintainer>
-	<email>nicolas@boichat.ch</email>
-	<description>
-		Upstream developer. Please CC on all bugs involving ddccontrol
-		and ddccontrol-db.
-	</description>
-</maintainer>
+<use>
+ <flag name='ddcpci'>enable direct PCI memory access (the setuid ddcpci util)</flag>
+</use>
 </pkgmetadata>
diff --git a/dev-games/cegui/Manifest b/dev-games/cegui/Manifest
index 5c36f0f491d9..ef104d8b3774 100644
--- a/dev-games/cegui/Manifest
+++ b/dev-games/cegui/Manifest
@@ -1,4 +1,6 @@
 DIST CEGUI-0.6.2-DOCS.tar.gz 18396638 RMD160 f3b010ce170973c126be27495636de4e808d3e65 SHA1 33e1ebfa0ab4e7fe2a91c0bb0affb6dccb49a94c SHA256 f1ea46bd583c486a6c588118573ebde55b06e90b190083e95525820e950ce2c8
 DIST CEGUI-0.6.2b.tar.gz 2628081 RMD160 890a8af12eb1ed4b7de0765c1f1a521ad5b1d213 SHA1 ac373b0779ab4b6289cf1e6aa2e6717d8a348747 SHA256 eb77741cd9fcc927a876e8116b98691212e973d2264e2071406423f6ca3e305f
 DIST CEGUI-0.7.5.tar.gz 9058788 RMD160 9602bcfbfe8b81c4fce415e0be341ea974040acc SHA1 75fe8d11c7c91ed3b08e8a2e81ff946699e51cf7 SHA256 21049e31a03fcd4807729c7271756e6d2de834247ece603bb5b5087fae624cb2
+DIST CEGUI-0.7.6.tar.gz 9146821 RMD160 9360829ade5d1f37b419155d6e892358332c83ca SHA1 1124fcc5f632311a77992f67d6b086eb43938f4b SHA256 b1b969332f8325ad4b6af7d4607417162d6c06100f4c6569248aed6afcafa3c6
 DIST CEGUI-DOCS-0.7.5.tar.gz 11001948 RMD160 17455c07b56594bcd150a1e4f9c31ff5bdcda81d SHA1 4aa8e14ba5f5f577ecda4be17bb8b493ae5c37ba SHA256 2ee19e5bfa4c3a9c3ebc1f399df7276f5688cc2decfc8e175c9db12e464c5c4f
+DIST CEGUI-DOCS-0.7.6.tar.gz 11809064 RMD160 d855ab9b05dffe7975d976453a59821cc09727d4 SHA1 bd1085b485c7a279679f6db1554d6624b03fefab SHA256 891285f68284b75211874c27bdea55dbc351233dead261ec0c6848eabfe16894
diff --git a/dev-games/cegui/cegui-0.7.6.ebuild b/dev-games/cegui/cegui-0.7.6.ebuild
new file mode 100644
index 000000000000..5e2ece524886
--- /dev/null
+++ b/dev-games/cegui/cegui-0.7.6.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-games/cegui/cegui-0.7.6.ebuild,v 1.1 2012/01/25 01:01:51 tristan Exp $
+
+EAPI=4
+
+MY_P=CEGUI-${PV}
+MY_D=CEGUI-DOCS-${PV}
+DESCRIPTION="Crazy Eddie's GUI System"
+HOMEPAGE="http://www.cegui.org.uk/"
+SRC_URI="mirror://sourceforge/crayzedsgui/${MY_P}.tar.gz
+	doc? ( mirror://sourceforge/crayzedsgui/${MY_D}.tar.gz )"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 -ppc ~x86"
+IUSE="bidi debug devil doc examples expat gtk irrlicht lua opengl pcre static-libs tinyxml truetype xerces-c xml zip"
+REQUIRED_USE="|| ( expat tinyxml xerces-c xml )" # bug 362223
+
+RDEPEND="bidi? ( dev-libs/fribidi )
+	devil? ( media-libs/devil )
+	expat? ( dev-libs/expat )
+	truetype? ( media-libs/freetype:2 )
+	irrlicht? ( dev-games/irrlicht )
+	lua? (
+		dev-lang/lua
+		dev-lua/toluapp
+	)
+	opengl? (
+		virtual/opengl
+		virtual/glu
+		media-libs/freeglut
+		media-libs/glew
+	)
+	pcre? ( dev-libs/libpcre )
+	tinyxml? ( dev-libs/tinyxml )
+	xerces-c? ( dev-libs/xerces-c )
+	xml? ( dev-libs/libxml2 )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	doc? ( app-doc/doxygen )"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	# build with newer zlib (bug #389863)
+	sed -i -e '74i#define OF(x) x' cegui/src/minizip/unzip.h || die
+	sed -i -e '125i#define OF(x) x' cegui/src/minizip/ioapi.h || die
+
+	if use examples ; then
+		cp -r Samples Samples.clean
+		rm -f $(find Samples.clean -name 'Makefile*')
+	fi
+}
+
+src_configure() {
+	# ogre-1.6.5 needs older cegui (bug #387103)
+	econf \
+		--disable-ogre-renderer \
+		$(use_enable bidi bidirectional-text) \
+		$(use_enable debug) \
+		$(use_enable devil) \
+		$(use_enable examples samples) \
+		$(use_enable expat) \
+		$(use_enable truetype freetype) \
+		$(use_enable irrlicht irrlicht-renderer) \
+		$(use_enable lua lua-module) \
+		$(use_enable lua toluacegui) \
+		--enable-external-toluapp \
+		$(use_enable opengl opengl-renderer) \
+		--enable-external-glew \
+		$(use_enable pcre) \
+		$(use_enable tinyxml) \
+		--enable-external-tinyxml \
+		$(use_enable xerces-c) \
+		$(use_enable xml libxml) \
+		$(use_enable zip minizip-resource-provider) \
+		--enable-null-renderer \
+		--enable-stb \
+		--enable-tga \
+		--disable-corona \
+		--disable-dependency-tracking \
+		--disable-freeimage \
+		--disable-rapidxml \
+		--disable-samples \
+		--disable-silly \
+		$(use_with gtk gtk2) \
+		$(use_enable static-libs static) \
+		--enable-shared
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+
+	# remove .la files
+	use static-libs || rm -f "${D}"/usr/*/*.la
+
+	if use doc ; then
+		emake html || die
+		dohtml -r doc/doxygen/html/* || die
+	fi
+	if use examples ; then
+		insinto /usr/share/doc/${PF}/Samples
+		doins -r Samples.clean/* || die
+	fi
+}
diff --git a/dev-ruby/builder/builder-3.0.0-r1.ebuild b/dev-ruby/builder/builder-3.0.0-r1.ebuild
new file mode 100644
index 000000000000..ae388f49b8e5
--- /dev/null
+++ b/dev-ruby/builder/builder-3.0.0-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/builder/builder-3.0.0-r1.ebuild,v 1.1 2012/01/25 02:19:47 flameeyes Exp $
+
+EAPI=2
+USE_RUBY="ruby18 ruby19 ree18 jruby"
+
+RUBY_FAKEGEM_TASK_TEST="test_all"
+
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="README CHANGES"
+
+inherit ruby-fakegem eutils
+
+DESCRIPTION="A builder to facilitate programatic generation of XML markup"
+HOMEPAGE="http://rubyforge.org/projects/builder/"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+ruby_add_bdepend "test? ( virtual/ruby-test-unit )"
+
+all_ruby_prepare() {
+	sed -i -e '/rdoc\.template .*jamis/d' Rakefile || die
+
+	# Remove file that should not be part of the distribution.
+	rm test/test_cssbuilder.rb || die
+
+	epatch "${FILESDIR}"/${P}+ruby-1.9.2.patch
+	epatch "${FILESDIR}"/${P}-tests.patch
+}
diff --git a/dev-ruby/builder/files/builder-3.0.0-tests.patch b/dev-ruby/builder/files/builder-3.0.0-tests.patch
new file mode 100644
index 000000000000..04eb16228db9
--- /dev/null
+++ b/dev-ruby/builder/files/builder-3.0.0-tests.patch
@@ -0,0 +1,55 @@
+diff --git a/lib/builder/xmlbase.rb b/lib/builder/xmlbase.rb
+index 1a1e5f9..06f8807 100644
+--- a/lib/builder/xmlbase.rb
++++ b/lib/builder/xmlbase.rb
+@@ -122,7 +122,9 @@ module Builder
+       def _escape(text)
+         result = XChar.encode(text)
+         begin
+-          result.encode(@encoding)
++          encoding = ::Encoding::find(@encoding)
++          raise Exception if encoding.dummy?
++          result.encode(encoding)
+         rescue
+           # if the encoding can't be supported, use numeric character references
+           result.
+@@ -132,7 +134,12 @@ module Builder
+       end
+     else
+       def _escape(text)
+-        text.to_xs((@encoding != 'utf-8' or $KCODE != 'UTF8'))
++        # original_xs is defined by activesupport when fast_xs is
++        # loaded; since fast_xs (as of version 0.8.0) does not accept
++        # the encode parameter, use the original function if present.
++        toxs_method = ::String.method_defined?(:original_xs) ? :original_xs : :to_xs
++
++        text.send(toxs_method, (@encoding != 'utf-8' or $KCODE != 'UTF8'))
+       end
+     end
+ 
+diff --git a/test/test_markupbuilder.rb b/test/test_markupbuilder.rb
+index 63864ad..2d9b853 100644
+--- a/test/test_markupbuilder.rb
++++ b/test/test_markupbuilder.rb
+@@ -446,13 +446,20 @@ class TestIndentedXmlMarkup < Test::Unit::TestCase
+       end
+     end
+ 
+-    def test_use_entities_if_kcode_is_utf_but_encoding_is_something_else
++    def test_use_entities_if_kcode_is_utf_but_encoding_is_dummy_encoding
+       xml = Builder::XmlMarkup.new
+       xml.instruct!(:xml, :encoding => 'UTF-16')
+       xml.p(encode("\xE2\x80\x99", 'UTF8'))
+       assert_match(%r(<p>&#8217;</p>), xml.target!) #
+     end
+ 
++    def test_use_entities_if_kcode_is_utf_but_encoding_is_unsupported_encoding
++      xml = Builder::XmlMarkup.new
++      xml.instruct!(:xml, :encoding => 'UCS-2')
++      xml.p(encode("\xE2\x80\x99", 'UTF8'))
++      assert_match(%r(<p>&#8217;</p>), xml.target!) #
++    end
++
+     def test_use_utf8_if_encoding_defaults_and_kcode_is_utf8
+       xml = Builder::XmlMarkup.new
+       xml.p(encode("\xE2\x80\x99",'UTF8'))
diff --git a/dev-ruby/fast_xs/fast_xs-0.8.0.ebuild b/dev-ruby/fast_xs/fast_xs-0.8.0.ebuild
index 6494f85656b5..110845c2cf27 100644
--- a/dev-ruby/fast_xs/fast_xs-0.8.0.ebuild
+++ b/dev-ruby/fast_xs/fast_xs-0.8.0.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/fast_xs/fast_xs-0.8.0.ebuild,v 1.1 2012/01/25 00:52:49 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/fast_xs/fast_xs-0.8.0.ebuild,v 1.2 2012/01/25 01:19:31 flameeyes Exp $
 
 EAPI=4
 
-USE_RUBY="ruby18 ree18"
+USE_RUBY="ruby18 ree18 ruby19"
 
 RUBY_FAKEGEM_TASK_DOC="docs"
 RUBY_FAKEGEM_DOCDIR="doc"
@@ -24,6 +24,8 @@ IUSE=""
 ruby_add_bdepend "doc? ( >=dev-ruby/hoe-2.3.2 )"
 ruby_add_bdepend "test? ( >=dev-ruby/hoe-2.3.2 virtual/ruby-test-unit )"
 
+RUBY_PATCHES=( "${P}+ruby-1.9.patch" )
+
 each_ruby_configure() {
 	${RUBY} -Cext/fast_xs extconf.rb || die "extconf.rb failed"
 	${RUBY} -Cext/fast_xs_extra extconf.rb || die "extconf.rb failed"
diff --git a/dev-ruby/fast_xs/files/fast_xs-0.8.0+ruby-1.9.patch b/dev-ruby/fast_xs/files/fast_xs-0.8.0+ruby-1.9.patch
new file mode 100644
index 000000000000..cdd72f2db3fb
--- /dev/null
+++ b/dev-ruby/fast_xs/files/fast_xs-0.8.0+ruby-1.9.patch
@@ -0,0 +1,23 @@
+Index: fast_xs-0.8.0/test/test_erb_util_module_overrides.rb
+===================================================================
+--- fast_xs-0.8.0.orig/test/test_erb_util_module_overrides.rb
++++ fast_xs-0.8.0/test/test_erb_util_module_overrides.rb
+@@ -35,11 +35,13 @@ class TestErbUtilModuleOverrides < Test:
+ 
+   def test_preserve_encoding
+     foo = "foo"
+-    foo.force_encoding Encoding::US_ASCII
+-    assert_equal Encoding::US_ASCII, url_encode(foo).encoding
+-    assert_equal Encoding::US_ASCII, html_escape(foo).encoding
+-    assert_equal Encoding::US_ASCII, u(foo).encoding
+-    assert_equal Encoding::US_ASCII, h(foo).encoding
++    ascii_encoding = (RUBY_VERSION =~ /1\.9/) ? Encoding::ASCII_8BIT : Encoding::US_ASCII
++
++    foo.force_encoding ascii_encoding
++    assert_equal ascii_encoding, url_encode(foo).encoding
++    assert_equal ascii_encoding, html_escape(foo).encoding
++    assert_equal ascii_encoding, u(foo).encoding
++    assert_equal ascii_encoding, h(foo).encoding
+ 
+     foo.force_encoding Encoding::BINARY
+     assert_equal Encoding::BINARY, url_encode(foo).encoding
diff --git a/dev-ruby/hpricot/Manifest b/dev-ruby/hpricot/Manifest
index 6e51895dd751..825bc8ad2c4a 100644
--- a/dev-ruby/hpricot/Manifest
+++ b/dev-ruby/hpricot/Manifest
@@ -1,2 +1,3 @@
 DIST hpricot-0.8.4.gem 278016 RMD160 88e96058a5b988e12ed28562bb0b183b8e7d2177 SHA1 029ef48af199aa5bf05c99b4173244ae4c9852c8 SHA256 234590794c68ccf809f5803baaec6bb02016d0860f93229d5bd6e05ca06cbf5a
 DIST hpricot-0.8.5.gem 293376 RMD160 9d8e8117e2036a22672eeed5e00a8a741885ae93 SHA1 b253b9aa5c86cec5978a4f33343656a8c0f8ceb9 SHA256 c51f9efdfa4f964a484e821bb13431f426676c2584a680d1fb874a3b6e5a46df
+DIST hpricot-0.8.6.gem 293888 RMD160 782464d9532ca5008f2e9a1732d9812230069330 SHA1 87ce2c17960a5e1d7ceaa16d0591ca6a28379ce0 SHA256 dfe8f4b3414ba8377d7626030f3aa605caadee9de87cffbeadf8a50359eac8ca
diff --git a/dev-ruby/hpricot/files/hpricot-0.8.2-jruby.patch b/dev-ruby/hpricot/files/hpricot-0.8.2-jruby.patch
deleted file mode 100644
index 4c47951ec239..000000000000
--- a/dev-ruby/hpricot/files/hpricot-0.8.2-jruby.patch
+++ /dev/null
@@ -1,203 +0,0 @@
-From 26708b9e80110c14a9d9fe7f974fc544f86b702a Mon Sep 17 00:00:00 2001
-From: Ola Bini <ola.bini@gmail.com>
-Date: Mon, 1 Feb 2010 16:46:02 +0100
-Subject: [PATCH] Fix bug #11 - sort out some bad casts on JRuby
-
----
- ext/hpricot_scan/HpricotScanService.java |   33 +++++++++++++++++++----------
- ext/hpricot_scan/hpricot_scan.java.rl    |   33 +++++++++++++++++++----------
- 2 files changed, 42 insertions(+), 24 deletions(-)
-
-diff --git a/ext/hpricot_scan/HpricotScanService.java b/ext/hpricot_scan/HpricotScanService.java
-index d921309..c5fe796 100644
---- a/ext/hpricot_scan/HpricotScanService.java
-+++ b/ext/hpricot_scan/HpricotScanService.java
-@@ -139,62 +139,62 @@ public class HpricotScanService implements BasicLibraryService {
- 
-     // H_ATTR(target)
-     public static IRubyObject hpricot_ele_set_target(IRubyObject self, IRubyObject x) {
--        ((RubyHash)H_ELE_GET(self, H_ELE_ATTR)).fastASet(self.getRuntime().newSymbol("target"), x);
-+        H_ELE_GET_asHash(self, H_ELE_ATTR).fastASet(self.getRuntime().newSymbol("target"), x);
-         return self;
-     }
- 
-     public static IRubyObject hpricot_ele_get_target(IRubyObject self) {
--        return ((RubyHash)H_ELE_GET(self, H_ELE_ATTR)).op_aref(self.getRuntime().getCurrentContext(), self.getRuntime().newSymbol("target"));
-+        return H_ELE_GET_asHash(self, H_ELE_ATTR).op_aref(self.getRuntime().getCurrentContext(), self.getRuntime().newSymbol("target"));
-     }
- 
-     // H_ATTR(encoding)
-     public static IRubyObject hpricot_ele_set_encoding(IRubyObject self, IRubyObject x) {
--        ((RubyHash)H_ELE_GET(self, H_ELE_ATTR)).fastASet(self.getRuntime().newSymbol("encoding"), x);
-+        ((RubyHash)H_ELE_GET_asHash(self, H_ELE_ATTR)).fastASet(self.getRuntime().newSymbol("encoding"), x);
-         return self;
-     }
- 
-     public static IRubyObject hpricot_ele_get_encoding(IRubyObject self) {
--        return ((RubyHash)H_ELE_GET(self, H_ELE_ATTR)).op_aref(self.getRuntime().getCurrentContext(), self.getRuntime().newSymbol("encoding"));
-+        return ((RubyHash)H_ELE_GET_asHash(self, H_ELE_ATTR)).op_aref(self.getRuntime().getCurrentContext(), self.getRuntime().newSymbol("encoding"));
-     }
- 
-     // H_ATTR(version)
-     public static IRubyObject hpricot_ele_set_version(IRubyObject self, IRubyObject x) {
--        ((RubyHash)H_ELE_GET(self, H_ELE_ATTR)).fastASet(self.getRuntime().newSymbol("version"), x);
-+        ((RubyHash)H_ELE_GET_asHash(self, H_ELE_ATTR)).fastASet(self.getRuntime().newSymbol("version"), x);
-         return self;
-     }
- 
-     public static IRubyObject hpricot_ele_get_version(IRubyObject self) {
--        return ((RubyHash)H_ELE_GET(self, H_ELE_ATTR)).op_aref(self.getRuntime().getCurrentContext(), self.getRuntime().newSymbol("version"));
-+        return ((RubyHash)H_ELE_GET_asHash(self, H_ELE_ATTR)).op_aref(self.getRuntime().getCurrentContext(), self.getRuntime().newSymbol("version"));
-     }
- 
-     // H_ATTR(standalone)
-     public static IRubyObject hpricot_ele_set_standalone(IRubyObject self, IRubyObject x) {
--        ((RubyHash)H_ELE_GET(self, H_ELE_ATTR)).fastASet(self.getRuntime().newSymbol("standalone"), x);
-+        ((RubyHash)H_ELE_GET_asHash(self, H_ELE_ATTR)).fastASet(self.getRuntime().newSymbol("standalone"), x);
-         return self;
-     }
- 
-     public static IRubyObject hpricot_ele_get_standalone(IRubyObject self) {
--        return ((RubyHash)H_ELE_GET(self, H_ELE_ATTR)).op_aref(self.getRuntime().getCurrentContext(), self.getRuntime().newSymbol("standalone"));
-+        return ((RubyHash)H_ELE_GET_asHash(self, H_ELE_ATTR)).op_aref(self.getRuntime().getCurrentContext(), self.getRuntime().newSymbol("standalone"));
-     }
- 
-     // H_ATTR(system_id)
-     public static IRubyObject hpricot_ele_set_system_id(IRubyObject self, IRubyObject x) {
--        ((RubyHash)H_ELE_GET(self, H_ELE_ATTR)).fastASet(self.getRuntime().newSymbol("system_id"), x);
-+        ((RubyHash)H_ELE_GET_asHash(self, H_ELE_ATTR)).fastASet(self.getRuntime().newSymbol("system_id"), x);
-         return self;
-     }
- 
-     public static IRubyObject hpricot_ele_get_system_id(IRubyObject self) {
--        return ((RubyHash)H_ELE_GET(self, H_ELE_ATTR)).op_aref(self.getRuntime().getCurrentContext(), self.getRuntime().newSymbol("system_id"));
-+        return ((RubyHash)H_ELE_GET_asHash(self, H_ELE_ATTR)).op_aref(self.getRuntime().getCurrentContext(), self.getRuntime().newSymbol("system_id"));
-     }
- 
-     // H_ATTR(public_id)
-     public static IRubyObject hpricot_ele_set_public_id(IRubyObject self, IRubyObject x) {
--        ((RubyHash)H_ELE_GET(self, H_ELE_ATTR)).fastASet(self.getRuntime().newSymbol("public_id"), x);
-+        ((RubyHash)H_ELE_GET_asHash(self, H_ELE_ATTR)).fastASet(self.getRuntime().newSymbol("public_id"), x);
-         return self;
-     }
- 
-     public static IRubyObject hpricot_ele_get_public_id(IRubyObject self) {
--        return ((RubyHash)H_ELE_GET(self, H_ELE_ATTR)).op_aref(self.getRuntime().getCurrentContext(), self.getRuntime().newSymbol("public_id"));
-+        return ((RubyHash)H_ELE_GET_asHash(self, H_ELE_ATTR)).op_aref(self.getRuntime().getCurrentContext(), self.getRuntime().newSymbol("public_id"));
-     }
- 
-     public static class Scanner {
-@@ -1903,6 +1903,15 @@ case 5:
-         return ((IRubyObject[])recv.dataGetStruct())[n];
-     }
- 
-+    public static RubyHash H_ELE_GET_asHash(IRubyObject recv, int n) {
-+        IRubyObject obj = ((IRubyObject[])recv.dataGetStruct())[n];
-+        if(obj.isNil()) {
-+            obj = RubyHash.newHash(recv.getRuntime());
-+            ((IRubyObject[])recv.dataGetStruct())[n] = obj;
-+        }
-+        return (RubyHash)obj;
-+    }
-+
-     public static IRubyObject H_ELE_SET(IRubyObject recv, int n, IRubyObject value) {
-         ((IRubyObject[])recv.dataGetStruct())[n] = value;
-         return value;
-diff --git a/ext/hpricot_scan/hpricot_scan.java.rl b/ext/hpricot_scan/hpricot_scan.java.rl
-index d1fb04b..1821761 100644
---- a/ext/hpricot_scan/hpricot_scan.java.rl
-+++ b/ext/hpricot_scan/hpricot_scan.java.rl
-@@ -137,62 +137,62 @@ public class HpricotScanService implements BasicLibraryService {
- 
-     // H_ATTR(target)
-     public static IRubyObject hpricot_ele_set_target(IRubyObject self, IRubyObject x) {
--        ((RubyHash)H_ELE_GET(self, H_ELE_ATTR)).fastASet(self.getRuntime().newSymbol("target"), x);
-+        H_ELE_GET_asHash(self, H_ELE_ATTR).fastASet(self.getRuntime().newSymbol("target"), x);
-         return self;
-     }
- 
-     public static IRubyObject hpricot_ele_get_target(IRubyObject self) {
--        return ((RubyHash)H_ELE_GET(self, H_ELE_ATTR)).op_aref(self.getRuntime().getCurrentContext(), self.getRuntime().newSymbol("target"));
-+        return H_ELE_GET_asHash(self, H_ELE_ATTR).op_aref(self.getRuntime().getCurrentContext(), self.getRuntime().newSymbol("target"));
-     }
- 
-     // H_ATTR(encoding)
-     public static IRubyObject hpricot_ele_set_encoding(IRubyObject self, IRubyObject x) {
--        ((RubyHash)H_ELE_GET(self, H_ELE_ATTR)).fastASet(self.getRuntime().newSymbol("encoding"), x);
-+        ((RubyHash)H_ELE_GET_asHash(self, H_ELE_ATTR)).fastASet(self.getRuntime().newSymbol("encoding"), x);
-         return self;
-     }
- 
-     public static IRubyObject hpricot_ele_get_encoding(IRubyObject self) {
--        return ((RubyHash)H_ELE_GET(self, H_ELE_ATTR)).op_aref(self.getRuntime().getCurrentContext(), self.getRuntime().newSymbol("encoding"));
-+        return ((RubyHash)H_ELE_GET_asHash(self, H_ELE_ATTR)).op_aref(self.getRuntime().getCurrentContext(), self.getRuntime().newSymbol("encoding"));
-     }
- 
-     // H_ATTR(version)
-     public static IRubyObject hpricot_ele_set_version(IRubyObject self, IRubyObject x) {
--        ((RubyHash)H_ELE_GET(self, H_ELE_ATTR)).fastASet(self.getRuntime().newSymbol("version"), x);
-+        ((RubyHash)H_ELE_GET_asHash(self, H_ELE_ATTR)).fastASet(self.getRuntime().newSymbol("version"), x);
-         return self;
-     }
- 
-     public static IRubyObject hpricot_ele_get_version(IRubyObject self) {
--        return ((RubyHash)H_ELE_GET(self, H_ELE_ATTR)).op_aref(self.getRuntime().getCurrentContext(), self.getRuntime().newSymbol("version"));
-+        return ((RubyHash)H_ELE_GET_asHash(self, H_ELE_ATTR)).op_aref(self.getRuntime().getCurrentContext(), self.getRuntime().newSymbol("version"));
-     }
- 
-     // H_ATTR(standalone)
-     public static IRubyObject hpricot_ele_set_standalone(IRubyObject self, IRubyObject x) {
--        ((RubyHash)H_ELE_GET(self, H_ELE_ATTR)).fastASet(self.getRuntime().newSymbol("standalone"), x);
-+        ((RubyHash)H_ELE_GET_asHash(self, H_ELE_ATTR)).fastASet(self.getRuntime().newSymbol("standalone"), x);
-         return self;
-     }
- 
-     public static IRubyObject hpricot_ele_get_standalone(IRubyObject self) {
--        return ((RubyHash)H_ELE_GET(self, H_ELE_ATTR)).op_aref(self.getRuntime().getCurrentContext(), self.getRuntime().newSymbol("standalone"));
-+        return ((RubyHash)H_ELE_GET_asHash(self, H_ELE_ATTR)).op_aref(self.getRuntime().getCurrentContext(), self.getRuntime().newSymbol("standalone"));
-     }
- 
-     // H_ATTR(system_id)
-     public static IRubyObject hpricot_ele_set_system_id(IRubyObject self, IRubyObject x) {
--        ((RubyHash)H_ELE_GET(self, H_ELE_ATTR)).fastASet(self.getRuntime().newSymbol("system_id"), x);
-+        ((RubyHash)H_ELE_GET_asHash(self, H_ELE_ATTR)).fastASet(self.getRuntime().newSymbol("system_id"), x);
-         return self;
-     }
- 
-     public static IRubyObject hpricot_ele_get_system_id(IRubyObject self) {
--        return ((RubyHash)H_ELE_GET(self, H_ELE_ATTR)).op_aref(self.getRuntime().getCurrentContext(), self.getRuntime().newSymbol("system_id"));
-+        return ((RubyHash)H_ELE_GET_asHash(self, H_ELE_ATTR)).op_aref(self.getRuntime().getCurrentContext(), self.getRuntime().newSymbol("system_id"));
-     }
- 
-     // H_ATTR(public_id)
-     public static IRubyObject hpricot_ele_set_public_id(IRubyObject self, IRubyObject x) {
--        ((RubyHash)H_ELE_GET(self, H_ELE_ATTR)).fastASet(self.getRuntime().newSymbol("public_id"), x);
-+        ((RubyHash)H_ELE_GET_asHash(self, H_ELE_ATTR)).fastASet(self.getRuntime().newSymbol("public_id"), x);
-         return self;
-     }
- 
-     public static IRubyObject hpricot_ele_get_public_id(IRubyObject self) {
--        return ((RubyHash)H_ELE_GET(self, H_ELE_ATTR)).op_aref(self.getRuntime().getCurrentContext(), self.getRuntime().newSymbol("public_id"));
-+        return ((RubyHash)H_ELE_GET_asHash(self, H_ELE_ATTR)).op_aref(self.getRuntime().getCurrentContext(), self.getRuntime().newSymbol("public_id"));
-     }
- 
-     public static class Scanner {
-@@ -965,6 +965,15 @@ public class HpricotScanService implements BasicLibraryService {
-         return ((IRubyObject[])recv.dataGetStruct())[n];
-     }
- 
-+    public static RubyHash H_ELE_GET_asHash(IRubyObject recv, int n) {
-+        IRubyObject obj = ((IRubyObject[])recv.dataGetStruct())[n];
-+        if(obj.isNil()) {
-+            obj = RubyHash.newHash(recv.getRuntime());
-+            ((IRubyObject[])recv.dataGetStruct())[n] = obj;
-+        }
-+        return (RubyHash)obj;
-+    }
-+
-     public static IRubyObject H_ELE_SET(IRubyObject recv, int n, IRubyObject value) {
-         ((IRubyObject[])recv.dataGetStruct())[n] = value;
-         return value;
--- 
-1.6.6.1
-
diff --git a/dev-ruby/hpricot/files/hpricot-0.8.6-fast_xs.patch b/dev-ruby/hpricot/files/hpricot-0.8.6-fast_xs.patch
new file mode 100644
index 000000000000..0b16b6c61b93
--- /dev/null
+++ b/dev-ruby/hpricot/files/hpricot-0.8.6-fast_xs.patch
@@ -0,0 +1,24 @@
+Index: hpricot-0.8.6/metadata
+===================================================================
+--- hpricot-0.8.6.orig/metadata
++++ hpricot-0.8.6/metadata
+@@ -16,7 +16,18 @@ bindir: bin
+ cert_chain: []
+ 
+ date: 2012-01-17 00:00:00 Z
+-dependencies: []
++dependencies:
++- !ruby/object:Gem::Dependency 
++  name: fast_xs
++  prerelease: false
++  requirement: &id003 !ruby/object:Gem::Requirement 
++    none: false
++    requirements: 
++    - - ">="
++      - !ruby/object:Gem::Version 
++        version: 0.7.3
++  type: :runtime
++  version_requirements: *id003
+ 
+ description: a swift, liberal HTML parser with a fantastic library
+ email: why@ruby-lang.org
diff --git a/dev-ruby/hpricot/hpricot-0.8.6.ebuild b/dev-ruby/hpricot/hpricot-0.8.6.ebuild
new file mode 100644
index 000000000000..5fdffc33c757
--- /dev/null
+++ b/dev-ruby/hpricot/hpricot-0.8.6.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/hpricot/hpricot-0.8.6.ebuild,v 1.1 2012/01/25 01:21:18 flameeyes Exp $
+
+EAPI=2
+
+USE_RUBY="ruby18 ree18 ruby19 jruby"
+
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.md"
+
+inherit ruby-fakegem eutils
+
+DESCRIPTION="A fast and liberal HTML parser for Ruby."
+HOMEPAGE="http://wiki.github.com/hpricot/hpricot"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE=""
+
+# Probably needs the same jdk as JRuby but I'm not sure how to express
+# that just yet.
+DEPEND="${DEPEND}
+	dev-util/ragel
+	ruby_targets_jruby? ( >=virtual/jdk-1.5 )"
+RDEPEND="${RDEPEND}"
+
+ruby_add_bdepend "dev-ruby/rake
+	dev-ruby/rake-compiler
+	test? ( virtual/ruby-test-unit )"
+
+# dev-ruby/fast_xs does not cover JRuby so still bundle it here for now
+RUBY_TARGETS="${RUBY_TARGETS/jruby/}" \
+	ruby_add_rdepend="dev-ruby/fast_xs"
+
+all_ruby_prepare() {
+	sed -i -e '/[Bb]undler/ s:^:#:' Rakefile || die
+
+	# Fix encoding assumption of environment for Ruby 1.9.
+	# https://github.com/hpricot/hpricot/issues/52
+	# sed -i -e '1 iEncoding.default_external=Encoding::UTF_8 if RUBY_VERSION =~ /1.9/' test/load_files.rb || die
+}
+
+each_ruby_prepare() {
+	# dev-ruby/fast_xs does not cover JRuby so still bundle it here for now
+	[[ ${RUBY} == */jruby ]] && continue
+
+	pushd .. &>/dev/null
+	epatch "${FILESDIR}"/${P}-fast_xs.patch
+	popd .. &>/dev/null
+}
+
+each_ruby_configure() {
+	# dev-ruby/fast_xs does not cover JRuby so still bundle it here for now
+	if [[ ${RUBY} == */jruby ]]; then
+		${RUBY} -Cext/fast_xs extconf.rb || die "fast_xs/extconf.rb failed"
+	fi
+
+	${RUBY} -Cext/hpricot_scan extconf.rb || die "hpricot_scan/extconf.rb failed"
+}
+
+each_ruby_compile() {
+	local modname=$(get_modname)
+
+	# dev-ruby/fast_xs does not cover JRuby so still bundle it here for now
+	if [[ ${RUBY} == */jruby ]]; then
+		modname=".jar"
+		emake -Cext/fast_xs || die "make fast_xs failed"
+		cp ext/fast_xs/fast_xs.jar lib/ || die
+	fi
+
+	emake -Cext/hpricot_scan CFLAGS="${CFLAGS} -fPIC" archflag="${LDFLAGS}" || die "make hpricot_scan failed"
+	cp ext/hpricot_scan/hpricot_scan${modname} lib/ || die
+}
diff --git a/gnome-base/gnome-session/files/10-user-dirs-update-gnome-r1 b/gnome-base/gnome-session/files/10-user-dirs-update-gnome-r1
new file mode 100755
index 000000000000..61fd08c51141
--- /dev/null
+++ b/gnome-base/gnome-session/files/10-user-dirs-update-gnome-r1
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+# Create various XDG directories, and write ~/.config/user-dirs.dirs, etc.
+# That file is read by glib to get XDG_PICTURES_DIR, etc
+
+if [ "$DESKTOP_SESSION" = "gnome" -o "$DESKTOP_SESSION" = "cinnamon" ]; then
+	if type xdg-user-dirs-update &>/dev/null; then
+		xdg-user-dirs-update
+	fi
+fi
diff --git a/gnome-base/gnome-session/files/15-xdg-data-gnome-r1 b/gnome-base/gnome-session/files/15-xdg-data-gnome-r1
new file mode 100644
index 000000000000..5eaa6985d9dc
--- /dev/null
+++ b/gnome-base/gnome-session/files/15-xdg-data-gnome-r1
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+if [ "$DESKTOP_SESSION" = "gnome" -o "$DESKTOP_SESSION" = "cinnamon" ]; then
+	if [ -z "$XDG_DATA_DIRS" ]; then
+		export XDG_DATA_DIRS=/usr/share/gnome:/usr/local/share/:/usr/share/
+	else
+		export XDG_DATA_DIRS=/usr/share/gnome:"$XDG_DATA_DIRS"
+	fi
+fi
diff --git a/gnome-base/gnome-session/files/gnome-session-3.2.1-kernel-boot-line.patch b/gnome-base/gnome-session/files/gnome-session-3.2.1-kernel-boot-line.patch
new file mode 100644
index 000000000000..fa5678b838d6
--- /dev/null
+++ b/gnome-base/gnome-session/files/gnome-session-3.2.1-kernel-boot-line.patch
@@ -0,0 +1,107 @@
+From a8ccac0ef5074229b562b90dc8dcf183c0440395 Mon Sep 17 00:00:00 2001
+From: Vincent Untz <vuntz@gnome.org>
+Date: Wed, 19 Oct 2011 13:14:50 +0200
+Subject: [PATCH] tools: Look at gnome.fallback argument in kernel boot line
+
+This is a quick way to let users easily force the fallback (or
+non-fallback mode) with gnome.fallback=0/1 on boot.
+---
+ tools/gnome-session-check-accelerated-helper.c |   64 ++++++++++++++++++++++++
+ 1 files changed, 64 insertions(+), 0 deletions(-)
+
+diff --git a/tools/gnome-session-check-accelerated-helper.c b/tools/gnome-session-check-accelerated-helper.c
+index 3f83f76..c1b49e2 100644
+--- a/tools/gnome-session-check-accelerated-helper.c
++++ b/tools/gnome-session-check-accelerated-helper.c
+@@ -70,7 +70,9 @@
+ /* for strcasestr */
+ #define _GNU_SOURCE
+ 
++#include <ctype.h>
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <string.h>
+ 
+ #include <X11/Xlib.h>
+@@ -87,6 +89,54 @@ _print_error (const char *str)
+ }
+ 
+ static int
++_parse_kcmdline (void)
++{
++        FILE *kcmdline;
++        char *line = NULL;
++        size_t line_len = 0;
++        int ret = -1;
++
++        kcmdline = fopen("/proc/cmdline", "r");
++        if (kcmdline == NULL)
++                return ret;
++
++        while (getline (&line, &line_len, kcmdline) != -1) {
++                const char *arg;
++                const char *str;
++                int key_len = strlen ("gnome.fallback=");
++
++                if (line == NULL)
++                        break;
++
++                /* don't break if we found the argument once: last mention wins */
++
++                str = line;
++                do {
++                        arg = strstr (str, "gnome.fallback=");
++                        str = arg + key_len;
++
++                        if (arg &&
++                                        (arg == line || isspace (arg[-1])) && /* gnome.fallback= is really the beginning of an argument */
++                                        (isdigit (arg[key_len]))) { /* the first character of the value of this argument is an integer */
++                                if ((arg[key_len+1] == '\0' || isspace (arg[key_len+1]))) /* the value of this argument is only one character long */
++                                        ret = arg[key_len] - '0';
++                                else /* invalid value */
++                                        ret = 0xDEAD;
++
++                        }
++                } while (arg != NULL);
++
++                free (line);
++                line = NULL;
++                line_len = 0;
++        }
++
++        fclose (kcmdline);
++
++        return ret;
++}
++
++static int
+ _has_composite (Display *display)
+ {
+         int dummy1, dummy2;
+@@ -257,9 +307,23 @@ _is_max_texture_size_big_enough (Display *display)
+ int
+ main (int argc, char **argv)
+ {
++        int      kcmdline_parsed;
+         Display *display = NULL;
+         int      ret = 1;
+ 
++        kcmdline_parsed = _parse_kcmdline ();
++        if (kcmdline_parsed >= 0) {
++                if (kcmdline_parsed == 0) {
++                        _print_error ("Non-fallback mode forced by kernel command line.");
++                        ret = 0;
++                        goto out;
++                } else if (kcmdline_parsed == 1) {
++                        _print_error ("Fallback mode forced by kernel command line.");
++                        goto out;
++                } else
++                        _print_error ("Invalid value for gnome.fallback passed in kernel command line.");
++        }
++
+         display = XOpenDisplay (NULL);
+         if (!display) {
+                 _print_error ("No X display.");
+-- 
+1.7.8.4
+
diff --git a/gnome-base/gnome-session/gnome-session-3.2.1-r1.ebuild b/gnome-base/gnome-session/gnome-session-3.2.1-r1.ebuild
new file mode 100644
index 000000000000..68c58facfa8f
--- /dev/null
+++ b/gnome-base/gnome-session/gnome-session-3.2.1-r1.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/gnome-base/gnome-session/gnome-session-3.2.1-r1.ebuild,v 1.1 2012/01/25 03:53:57 tetromino Exp $
+
+EAPI="4"
+GCONF_DEBUG="no"
+
+inherit eutils gnome2
+
+DESCRIPTION="Gnome session manager"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="GPL-2 LGPL-2 FDL-1.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="doc ipv6 elibc_FreeBSD"
+
+# x11-misc/xdg-user-dirs{,-gtk} are needed to create the various XDG_*_DIRs, and
+# create .config/user-dirs.dirs which is read by glib to get G_USER_DIRECTORY_*
+# xdg-user-dirs-update is run during login (see 10-user-dirs-update-gnome below).
+# gdk-pixbuf used in the inhibit dialog
+COMMON_DEPEND=">=dev-libs/glib-2.28.0:2
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-2.90.7:3
+	>=dev-libs/json-glib-0.10
+	>=dev-libs/dbus-glib-0.76
+	>=gnome-base/gconf-2:2
+	>=sys-power/upower-0.9.0
+	elibc_FreeBSD? ( dev-libs/libexecinfo )
+
+	virtual/opengl
+	x11-libs/libSM
+	x11-libs/libICE
+	x11-libs/libXau
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXext
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-misc/xdg-user-dirs
+	x11-misc/xdg-user-dirs-gtk
+	x11-apps/xdpyinfo"
+# Pure-runtime deps from the session files should *NOT* be added here
+# Otherwise, things like gdm pull in gnome-shell
+# gnome-themes-standard is needed for the failwhale dialog themeing
+# sys-apps/dbus[X] is needed for session management
+RDEPEND="${COMMON_DEPEND}
+	gnome-base/gnome-settings-daemon
+	>=gnome-base/gsettings-desktop-schemas-0.1.7
+	>=x11-themes/gnome-themes-standard-2.91.92
+	sys-apps/dbus[X]"
+DEPEND="${COMMON_DEPEND}
+	>=dev-lang/perl-5
+	>=sys-devel/gettext-0.10.40
+	>=dev-util/pkgconfig-0.17
+	>=dev-util/intltool-0.40.6
+	!<gnome-base/gdm-2.20.4
+	doc? (
+		app-text/xmlto
+		dev-libs/libxslt )"
+# gnome-common needed for eautoreconf
+# gnome-base/gdm does not provide gnome.desktop anymore
+
+pkg_setup() {
+	# TODO: convert libnotify to a configure option
+	G2CONF="${G2CONF}
+		--disable-deprecation-flags
+		--disable-schemas-compile
+		--docdir="${EPREFIX}/usr/share/doc/${PF}"
+		$(use_enable doc docbook-docs)
+		$(use_enable ipv6)"
+	DOCS="AUTHORS ChangeLog NEWS README"
+}
+
+src_prepare() {
+	# Patch from 3.3 to respect gnome.fallback=0/1 kernel boot line
+	epatch "${FILESDIR}/${P}-kernel-boot-line.patch"
+
+	gnome2_src_prepare
+}
+
+src_install() {
+	gnome2_src_install
+
+	dodir /etc/X11/Sessions
+	exeinto /etc/X11/Sessions
+	doexe "${FILESDIR}/Gnome"
+
+	dodir /usr/share/gnome/applications/
+	insinto /usr/share/gnome/applications/
+	doins "${FILESDIR}/defaults.list"
+
+	dodir /etc/X11/xinit/xinitrc.d/
+	exeinto /etc/X11/xinit/xinitrc.d/
+	newexe "${FILESDIR}/15-xdg-data-gnome-r1" 15-xdg-data-gnome
+
+	# This should be done here as discussed in bug #270852
+	newexe "${FILESDIR}/10-user-dirs-update-gnome-r1" 10-user-dirs-update-gnome
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	if ! has_version gnome-base/gdm && ! has_version kde-base/kdm; then
+		ewarn "If you use a custom .xinitrc for your X session,"
+		ewarn "make sure that the commands in the xinitrc.d scripts are run."
+	fi
+}
diff --git a/metadata/cache/app-misc/ca-certificates-20111025 b/metadata/cache/app-misc/ca-certificates-20111025
index c0858292aecb..062ba30ee100 100644
--- a/metadata/cache/app-misc/ca-certificates-20111025
+++ b/metadata/cache/app-misc/ca-certificates-20111025
@@ -6,7 +6,7 @@ mirror://debian/pool/main/c/ca-certificates/ca-certificates_20111025_all.deb
 http://packages.debian.org/sid/ca-certificates
 MPL-1.1
 Common CA Certificates PEM files
-alpha amd64 arm hppa ia64 m68k ~mips ppc ~ppc64 s390 sh sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 eutils multilib portability toolchain-funcs user
 
 
diff --git a/metadata/cache/app-misc/ddccontrol-0.4.2-r1 b/metadata/cache/app-misc/ddccontrol-0.4.2-r1
new file mode 100644
index 000000000000..135c8efab4bd
--- /dev/null
+++ b/metadata/cache/app-misc/ddccontrol-0.4.2-r1
@@ -0,0 +1,22 @@
+dev-libs/libxml2:2 gtk? ( >=x11-libs/gtk+-2.4:2 ) gnome? ( >=gnome-base/gnome-panel-2.10 ) sys-apps/pciutils nls? ( sys-devel/gettext ) >=app-misc/ddccontrol-db-20060730 dev-perl/XML-Parser dev-util/intltool doc? ( >=app-text/docbook-xsl-stylesheets-1.65.1 >=dev-libs/libxslt-1.1.6 app-text/htmltidy ) sys-kernel/linux-headers || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool
+dev-libs/libxml2:2 gtk? ( >=x11-libs/gtk+-2.4:2 ) gnome? ( >=gnome-base/gnome-panel-2.10 ) sys-apps/pciutils nls? ( sys-devel/gettext ) >=app-misc/ddccontrol-db-20060730
+0
+mirror://sourceforge/ddccontrol/ddccontrol-0.4.2.tar.bz2
+
+http://ddccontrol.sourceforge.net/
+GPL-2
+DDCControl allows control of monitor parameters via DDC
+~amd64 ~ppc ~x86
+autotools eutils libtool multilib portability toolchain-funcs user
++ddcpci doc gnome gtk nls static-libs
+
+
+
+4
+
+configure install prepare
+
+
+
+
+
diff --git a/metadata/cache/dev-games/cegui-0.7.6 b/metadata/cache/dev-games/cegui-0.7.6
new file mode 100644
index 000000000000..fef475b55e61
--- /dev/null
+++ b/metadata/cache/dev-games/cegui-0.7.6
@@ -0,0 +1,22 @@
+bidi? ( dev-libs/fribidi ) devil? ( media-libs/devil ) expat? ( dev-libs/expat ) truetype? ( media-libs/freetype:2 ) irrlicht? ( dev-games/irrlicht ) lua? ( dev-lang/lua dev-lua/toluapp ) opengl? ( virtual/opengl virtual/glu media-libs/freeglut media-libs/glew ) pcre? ( dev-libs/libpcre ) tinyxml? ( dev-libs/tinyxml ) xerces-c? ( dev-libs/xerces-c ) xml? ( dev-libs/libxml2 ) dev-util/pkgconfig doc? ( app-doc/doxygen )
+bidi? ( dev-libs/fribidi ) devil? ( media-libs/devil ) expat? ( dev-libs/expat ) truetype? ( media-libs/freetype:2 ) irrlicht? ( dev-games/irrlicht ) lua? ( dev-lang/lua dev-lua/toluapp ) opengl? ( virtual/opengl virtual/glu media-libs/freeglut media-libs/glew ) pcre? ( dev-libs/libpcre ) tinyxml? ( dev-libs/tinyxml ) xerces-c? ( dev-libs/xerces-c ) xml? ( dev-libs/libxml2 )
+0
+mirror://sourceforge/crayzedsgui/CEGUI-0.7.6.tar.gz doc? ( mirror://sourceforge/crayzedsgui/CEGUI-DOCS-0.7.6.tar.gz )
+
+http://www.cegui.org.uk/
+MIT
+Crazy Eddie's GUI System
+~amd64 -ppc ~x86
+
+bidi debug devil doc examples expat gtk irrlicht lua opengl pcre static-libs tinyxml truetype xerces-c xml zip
+|| ( expat tinyxml xerces-c xml )
+
+
+4
+
+configure install prepare
+
+
+
+
+
diff --git a/metadata/cache/dev-ruby/builder-3.0.0-r1 b/metadata/cache/dev-ruby/builder-3.0.0-r1
new file mode 100644
index 000000000000..396036ecff88
--- /dev/null
+++ b/metadata/cache/dev-ruby/builder-3.0.0-r1
@@ -0,0 +1,22 @@
+ruby_targets_ruby18? ( test? ( virtual/ruby-test-unit[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( virtual/ruby-test-unit[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( test? ( virtual/ruby-test-unit[ruby_targets_ree18] ) ) ruby_targets_jruby? ( test? ( virtual/ruby-test-unit[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( doc? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( doc? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
+3
+mirror://rubygems/builder-3.0.0.gem
+
+http://rubyforge.org/projects/builder/
+MIT
+A builder to facilitate programatic generation of XML markup
+~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+eutils java-utils-2 multilib portability ruby-fakegem ruby-ng toolchain-funcs user versionator
+elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 ruby_targets_jruby doc doc test test
+
+
+
+2
+
+compile configure install prepare setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-ruby/fast_xs-0.8.0 b/metadata/cache/dev-ruby/fast_xs-0.8.0
index c9019aacccbb..3cd3b25b60f7 100644
--- a/metadata/cache/dev-ruby/fast_xs-0.8.0
+++ b/metadata/cache/dev-ruby/fast_xs-0.8.0
@@ -1,5 +1,5 @@
-ruby_targets_ruby18? ( doc? ( >=dev-ruby/hoe-2.3.2[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( doc? ( >=dev-ruby/hoe-2.3.2[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( test? ( >=dev-ruby/hoe-2.3.2[ruby_targets_ruby18] virtual/ruby-test-unit[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( >=dev-ruby/hoe-2.3.2[ruby_targets_ree18] virtual/ruby-test-unit[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( doc? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( doc? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) )
-ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] )
+ruby_targets_ruby18? ( doc? ( >=dev-ruby/hoe-2.3.2[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( doc? ( >=dev-ruby/hoe-2.3.2[ruby_targets_ree18] ) ) ruby_targets_ruby19? ( doc? ( >=dev-ruby/hoe-2.3.2[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( test? ( >=dev-ruby/hoe-2.3.2[ruby_targets_ruby18] virtual/ruby-test-unit[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( >=dev-ruby/hoe-2.3.2[ruby_targets_ree18] virtual/ruby-test-unit[ruby_targets_ree18] ) ) ruby_targets_ruby19? ( test? ( >=dev-ruby/hoe-2.3.2[ruby_targets_ruby19] virtual/ruby-test-unit[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( doc? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( doc? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
+ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
 0
 mirror://rubygems/fast_xs-0.8.0.gem
 
@@ -8,8 +8,8 @@ MIT
 fast_xs text escaping library ruby bindings.
 ~amd64 ~x86
 eutils java-utils-2 multilib portability ruby-fakegem ruby-ng toolchain-funcs user versionator
-elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 doc doc test test
-|| ( ruby_targets_ruby18 ruby_targets_ree18 )
+elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 ruby_targets_ruby19 doc doc test test
+|| ( ruby_targets_ruby18 ruby_targets_ree18 ruby_targets_ruby19 )
 
 
 4
diff --git a/metadata/cache/dev-ruby/hpricot-0.8.6 b/metadata/cache/dev-ruby/hpricot-0.8.6
new file mode 100644
index 000000000000..05c8b5d2b958
--- /dev/null
+++ b/metadata/cache/dev-ruby/hpricot-0.8.6
@@ -0,0 +1,22 @@
+dev-util/ragel ruby_targets_jruby? ( >=virtual/jdk-1.5 ) ruby_targets_ruby18? ( dev-ruby/rake[ruby_targets_ruby18] dev-ruby/rake-compiler[ruby_targets_ruby18] test? ( virtual/ruby-test-unit[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( dev-ruby/rake[ruby_targets_ree18] dev-ruby/rake-compiler[ruby_targets_ree18] test? ( virtual/ruby-test-unit[ruby_targets_ree18] ) ) ruby_targets_ruby19? ( dev-ruby/rake[ruby_targets_ruby19] dev-ruby/rake-compiler[ruby_targets_ruby19] test? ( virtual/ruby-test-unit[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( dev-ruby/rake[ruby_targets_jruby] dev-ruby/rake-compiler[ruby_targets_jruby] test? ( virtual/ruby-test-unit[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( doc? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( doc? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
+0
+mirror://rubygems/hpricot-0.8.6.gem
+
+http://wiki.github.com/hpricot/hpricot
+MIT
+A fast and liberal HTML parser for Ruby.
+~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+eutils java-utils-2 multilib portability ruby-fakegem ruby-ng toolchain-funcs user versionator
+elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 ruby_targets_ruby19 ruby_targets_jruby doc doc test test
+
+
+
+2
+
+compile configure install prepare setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/gnome-base/gnome-session-3.2.1-r1 b/metadata/cache/gnome-base/gnome-session-3.2.1-r1
new file mode 100644
index 000000000000..1e600e74d59d
--- /dev/null
+++ b/metadata/cache/gnome-base/gnome-session-3.2.1-r1
@@ -0,0 +1,22 @@
+>=dev-libs/glib-2.28.0:2 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.90.7:3 >=dev-libs/json-glib-0.10 >=dev-libs/dbus-glib-0.76 >=gnome-base/gconf-2:2 >=sys-power/upower-0.9.0 elibc_FreeBSD? ( dev-libs/libexecinfo ) virtual/opengl x11-libs/libSM x11-libs/libICE x11-libs/libXau x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXext x11-libs/libXrender x11-libs/libXtst x11-misc/xdg-user-dirs x11-misc/xdg-user-dirs-gtk x11-apps/xdpyinfo >=dev-lang/perl-5 >=sys-devel/gettext-0.10.40 >=dev-util/pkgconfig-0.17 >=dev-util/intltool-0.40.6 !<gnome-base/gdm-2.20.4 doc? ( app-text/xmlto dev-libs/libxslt ) app-arch/xz-utils >=sys-apps/sed-4
+>=dev-libs/glib-2.28.0:2 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.90.7:3 >=dev-libs/json-glib-0.10 >=dev-libs/dbus-glib-0.76 >=gnome-base/gconf-2:2 >=sys-power/upower-0.9.0 elibc_FreeBSD? ( dev-libs/libexecinfo ) virtual/opengl x11-libs/libSM x11-libs/libICE x11-libs/libXau x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXext x11-libs/libXrender x11-libs/libXtst x11-misc/xdg-user-dirs x11-misc/xdg-user-dirs-gtk x11-apps/xdpyinfo gnome-base/gnome-settings-daemon >=gnome-base/gsettings-desktop-schemas-0.1.7 >=x11-themes/gnome-themes-standard-2.91.92 sys-apps/dbus[X]
+0
+mirror://gnome/sources/gnome-session/3.2/gnome-session-3.2.1.tar.xz
+
+http://www.gnome.org/
+GPL-2 LGPL-2 FDL-1.1
+Gnome session manager
+~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris
+eutils fdo-mime gnome.org gnome2 gnome2-utils libtool multilib portability toolchain-funcs user versionator
+doc ipv6 elibc_FreeBSD
+
+
+
+4
+
+compile configure install postinst postrm preinst prepare setup unpack
+
+
+
+
+
diff --git a/metadata/cache/sci-chemistry/votca-csg-1.2.2 b/metadata/cache/sci-chemistry/votca-csg-1.2.2
index bfdd7fb3edcc..0839354186d4 100644
--- a/metadata/cache/sci-chemistry/votca-csg-1.2.2
+++ b/metadata/cache/sci-chemistry/votca-csg-1.2.2
@@ -6,7 +6,7 @@ primaryuri
 http://www.votca.org
 Apache-2.0
 Votca coarse-graining engine
-amd64 ~x86 ~amd64-linux
+amd64 ~x86 ~amd64-linux ~x86-macos
 base bash-completion-r1 cmake-utils eutils flag-o-matic multilib portability toolchain-funcs user
 doc examples extras +gromacs +system-boost
 
diff --git a/metadata/cache/sci-chemistry/votca-csgapps-1.2.2 b/metadata/cache/sci-chemistry/votca-csgapps-1.2.2
index b8445b9189f1..924dedd347c3 100644
--- a/metadata/cache/sci-chemistry/votca-csgapps-1.2.2
+++ b/metadata/cache/sci-chemistry/votca-csgapps-1.2.2
@@ -6,7 +6,7 @@ primaryuri
 http://www.votca.org
 Apache-2.0
 Extra applications for votca-csg
-amd64 ~x86 ~amd64-linux
+amd64 ~x86 ~amd64-linux ~x86-macos
 base cmake-utils eutils flag-o-matic multilib portability toolchain-funcs user
 
 
diff --git a/metadata/cache/sys-apps/vgabios-0.6c b/metadata/cache/sys-apps/vgabios-0.6c
new file mode 100644
index 000000000000..73cf7a95f297
--- /dev/null
+++ b/metadata/cache/sys-apps/vgabios-0.6c
@@ -0,0 +1,22 @@
+sys-devel/dev86
+!app-emulation/qemu !<=app-emulation/qemu-kvm-1.0
+0
+http://savannah.gnu.org/download/vgabios/vgabios-0.6c.tgz http://dev.gentoo.org/~cardoe/distfiles/vgabios-0.6c-fixes-1.tar.bz2
+
+http://www.nongnu.org/vgabios/
+LGPL-2.1
+VGA BIOS implementation
+~amd64 ~x86
+eutils multilib portability toolchain-funcs user
+debug
+
+
+
+4
+
+compile install prepare
+
+
+
+
+
diff --git a/metadata/cache/sys-apps/vgabios-0.7a b/metadata/cache/sys-apps/vgabios-0.7a
new file mode 100644
index 000000000000..8aa1f6387952
--- /dev/null
+++ b/metadata/cache/sys-apps/vgabios-0.7a
@@ -0,0 +1,22 @@
+sys-devel/dev86
+!app-emulation/qemu !<=app-emulation/qemu-kvm-1.0
+0
+http://savannah.gnu.org/download/vgabios/vgabios-0.7a.tgz http://dev.gentoo.org/~cardoe/distfiles/vgabios-0.7a-fixes-1.tar.bz2
+
+http://www.nongnu.org/vgabios/
+LGPL-2.1
+VGA BIOS implementation
+~amd64 ~x86
+eutils multilib portability toolchain-funcs user
+debug
+
+
+
+4
+
+compile install prepare
+
+
+
+
+
diff --git a/metadata/cache/sys-devel/gdb-7.4 b/metadata/cache/sys-devel/gdb-7.4
new file mode 100644
index 000000000000..06fc2d59eabc
--- /dev/null
+++ b/metadata/cache/sys-devel/gdb-7.4
@@ -0,0 +1,22 @@
+!dev-util/gdbserver >=sys-libs/ncurses-5.2-r2 sys-libs/readline expat? ( dev-libs/expat ) python? ( =dev-lang/python-2* ) zlib? ( sys-libs/zlib ) app-arch/xz-utils virtual/yacc test? ( dev-util/dejagnu ) nls? ( sys-devel/gettext )
+!dev-util/gdbserver >=sys-libs/ncurses-5.2-r2 sys-libs/readline expat? ( dev-libs/expat ) python? ( =dev-lang/python-2* ) zlib? ( sys-libs/zlib )
+0
+http://ftp.gnu.org/gnu/gdb/gdb-7.4.tar.bz2 ftp://sources.redhat.com/pub/gdb/releases/gdb-7.4.tar.bz2 mirror://gentoo/gdb-7.4-patches-1.tar.xz
+
+http://sourceware.org/gdb/
+GPL-2 LGPL-2
+GNU debugger
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+eutils flag-o-matic multilib portability toolchain-funcs user
++client expat multitarget nls +python +server test vanilla zlib
+
+
+
+3
+
+configure install postinst prepare test
+
+
+
+
+
diff --git a/metadata/cache/sys-kernel/gentoo-sources-2.6.39-r3 b/metadata/cache/sys-kernel/gentoo-sources-2.6.39-r3
deleted file mode 100644
index 11d645b39125..000000000000
--- a/metadata/cache/sys-kernel/gentoo-sources-2.6.39-r3
+++ /dev/null
@@ -1,22 +0,0 @@
-!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
-2.6.39-r3
-mirror://kernel/linux/kernel/v2.6/linux-2.6.39.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.39.N/deblob-2.6.39 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.39.N/deblob-check -> deblob-check-2.6.39 ) mirror://gentoo/genpatches-2.6.39-5.base.tar.bz2 mirror://gentoo/genpatches-2.6.39-5.extras.tar.bz2
-binchecks strip
-http://dev.gentoo.org/~mpagano/genpatches
-GPL-2 !deblob? ( freedist )
-Full sources including the Gentoo patchset for the 2.6 kernel tree
-alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86
-eutils kernel-2 multilib portability toolchain-funcs user versionator
-deblob symlink build deblob
-
-!build? ( virtual/dev-manager )
-
-2
-
-compile install postinst postrm preinst setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/sys-kernel/gentoo-sources-2.6.39-r4 b/metadata/cache/sys-kernel/gentoo-sources-2.6.39-r4
deleted file mode 100644
index e6fbd823ca27..000000000000
--- a/metadata/cache/sys-kernel/gentoo-sources-2.6.39-r4
+++ /dev/null
@@ -1,22 +0,0 @@
-!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
-2.6.39-r4
-mirror://kernel/linux/kernel/v2.6/linux-2.6.39.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.39.N/deblob-2.6.39 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.39.N/deblob-check -> deblob-check-2.6.39 ) mirror://gentoo/genpatches-2.6.39-6.base.tar.bz2 mirror://gentoo/genpatches-2.6.39-6.extras.tar.bz2
-binchecks strip
-http://dev.gentoo.org/~mpagano/genpatches
-GPL-2 !deblob? ( freedist )
-Full sources including the Gentoo patchset for the 2.6 kernel tree
-~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86
-eutils kernel-2 multilib portability toolchain-funcs user versionator
-deblob symlink build deblob
-
-!build? ( virtual/dev-manager )
-
-2
-
-compile install postinst postrm preinst setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/sys-kernel/gentoo-sources-3.0.13 b/metadata/cache/sys-kernel/gentoo-sources-3.0.13
deleted file mode 100644
index f88215a3b18d..000000000000
--- a/metadata/cache/sys-kernel/gentoo-sources-3.0.13
+++ /dev/null
@@ -1,22 +0,0 @@
-!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
-3.0.13
-mirror://kernel/linux/kernel/v3.x/linux-3.0.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.0.N/deblob-3.0 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.0.N/deblob-check -> deblob-check-3.0 ) mirror://gentoo/genpatches-3.0-13.base.tar.bz2 mirror://gentoo/genpatches-3.0-13.extras.tar.bz2
-binchecks strip
-http://dev.gentoo.org/~mpagano/genpatches
-GPL-2 !deblob? ( freedist )
-Full sources including the Gentoo patchset for the 3.0 kernel tree
-~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-eutils kernel-2 multilib portability toolchain-funcs user versionator
-deblob symlink build deblob
-
-!build? ( virtual/dev-manager )
-
-2
-
-compile install postinst postrm preinst setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/sys-kernel/gentoo-sources-3.0.14 b/metadata/cache/sys-kernel/gentoo-sources-3.0.14
deleted file mode 100644
index f8a758414632..000000000000
--- a/metadata/cache/sys-kernel/gentoo-sources-3.0.14
+++ /dev/null
@@ -1,22 +0,0 @@
-!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
-3.0.14
-mirror://kernel/linux/kernel/v3.x/linux-3.0.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.0.N/deblob-3.0 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.0.N/deblob-check -> deblob-check-3.0 ) mirror://gentoo/genpatches-3.0-14.base.tar.bz2 mirror://gentoo/genpatches-3.0-14.extras.tar.bz2
-binchecks strip
-http://dev.gentoo.org/~mpagano/genpatches
-GPL-2 !deblob? ( freedist )
-Full sources including the Gentoo patchset for the 3.0 kernel tree
-~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-eutils kernel-2 multilib portability toolchain-funcs user versionator
-deblob symlink build deblob
-
-!build? ( virtual/dev-manager )
-
-2
-
-compile install postinst postrm preinst setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/sys-kernel/gentoo-sources-3.0.15 b/metadata/cache/sys-kernel/gentoo-sources-3.0.15
deleted file mode 100644
index 3260365685b3..000000000000
--- a/metadata/cache/sys-kernel/gentoo-sources-3.0.15
+++ /dev/null
@@ -1,22 +0,0 @@
-!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
-3.0.15
-mirror://kernel/linux/kernel/v3.x/linux-3.0.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.0.N/deblob-3.0 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.0.N/deblob-check -> deblob-check-3.0 ) mirror://gentoo/genpatches-3.0-15.base.tar.bz2 mirror://gentoo/genpatches-3.0-15.extras.tar.bz2
-binchecks strip
-http://dev.gentoo.org/~mpagano/genpatches
-GPL-2 !deblob? ( freedist )
-Full sources including the Gentoo patchset for the 3.0 kernel tree
-~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-eutils kernel-2 multilib portability toolchain-funcs user versionator
-deblob symlink build deblob
-
-!build? ( virtual/dev-manager )
-
-2
-
-compile install postinst postrm preinst setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/sys-kernel/gentoo-sources-3.0.17 b/metadata/cache/sys-kernel/gentoo-sources-3.0.17
deleted file mode 100644
index ec1519de7a1c..000000000000
--- a/metadata/cache/sys-kernel/gentoo-sources-3.0.17
+++ /dev/null
@@ -1,22 +0,0 @@
-!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
-3.0.17
-mirror://kernel/linux/kernel/v3.x/linux-3.0.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.0.N/deblob-3.0 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.0.N/deblob-check -> deblob-check-3.0 ) mirror://gentoo/genpatches-3.0-16.base.tar.bz2 mirror://gentoo/genpatches-3.0-16.extras.tar.bz2
-binchecks strip
-http://dev.gentoo.org/~mpagano/genpatches
-GPL-2 !deblob? ( freedist )
-Full sources including the Gentoo patchset for the 3.0 kernel tree
-~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-eutils kernel-2 multilib portability toolchain-funcs user versionator
-deblob symlink build deblob
-
-!build? ( virtual/dev-manager )
-
-2
-
-compile install postinst postrm preinst setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/sys-kernel/gentoo-sources-3.0.17-r2 b/metadata/cache/sys-kernel/gentoo-sources-3.0.17-r2
index 460ad8bad732..d4ed3d9dc023 100644
--- a/metadata/cache/sys-kernel/gentoo-sources-3.0.17-r2
+++ b/metadata/cache/sys-kernel/gentoo-sources-3.0.17-r2
@@ -6,7 +6,7 @@ binchecks strip
 http://dev.gentoo.org/~mpagano/genpatches
 GPL-2 !deblob? ( freedist )
 Full sources including the Gentoo patchset for the 3.0 kernel tree
-~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+alpha amd64 arm hppa ia64 ~ppc ~ppc64 s390 sh sparc x86
 eutils kernel-2 multilib portability toolchain-funcs user versionator
 deblob symlink build deblob
 
diff --git a/metadata/cache/sys-kernel/gentoo-sources-3.0.6 b/metadata/cache/sys-kernel/gentoo-sources-3.0.6
deleted file mode 100644
index 2452232d8306..000000000000
--- a/metadata/cache/sys-kernel/gentoo-sources-3.0.6
+++ /dev/null
@@ -1,22 +0,0 @@
-!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
-3.0.6
-mirror://kernel/linux/kernel/v3.x/linux-3.0.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.0.N/deblob-3.0 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.0.N/deblob-check -> deblob-check-3.0 ) mirror://gentoo/genpatches-3.0-8.base.tar.bz2 mirror://gentoo/genpatches-3.0-8.extras.tar.bz2
-binchecks strip
-http://dev.gentoo.org/~mpagano/genpatches
-GPL-2 !deblob? ( freedist )
-Full sources including the Gentoo patchset for the 3.0 kernel tree
-alpha amd64 arm hppa ia64 ~ppc ~ppc64 s390 sh sparc x86
-eutils kernel-2 multilib portability toolchain-funcs user versionator
-deblob symlink build deblob
-
-!build? ( virtual/dev-manager )
-
-2
-
-compile install postinst postrm preinst setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/sys-kernel/gentoo-sources-3.1.10-r1 b/metadata/cache/sys-kernel/gentoo-sources-3.1.10-r1
index 3226d7d7cab0..fa1dbb7a5a5a 100644
--- a/metadata/cache/sys-kernel/gentoo-sources-3.1.10-r1
+++ b/metadata/cache/sys-kernel/gentoo-sources-3.1.10-r1
@@ -6,7 +6,7 @@ binchecks strip
 http://dev.gentoo.org/~mpagano/genpatches
 GPL-2 !deblob? ( freedist )
 Full sources including the Gentoo patchset for the 3.1 kernel tree
-~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+alpha amd64 arm hppa ia64 ~ppc ~ppc64 s390 sh sparc x86
 eutils kernel-2 multilib portability toolchain-funcs user versionator
 deblob symlink build deblob
 
diff --git a/metadata/cache/sys-kernel/gentoo-sources-3.1.6 b/metadata/cache/sys-kernel/gentoo-sources-3.1.6
deleted file mode 100644
index d0d0c8ed6a7a..000000000000
--- a/metadata/cache/sys-kernel/gentoo-sources-3.1.6
+++ /dev/null
@@ -1,22 +0,0 @@
-!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
-3.1.6
-mirror://kernel/linux/kernel/v3.x/linux-3.1.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.1.N/deblob-3.1 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.1.N/deblob-check -> deblob-check-3.1 ) mirror://gentoo/genpatches-3.1-9.base.tar.bz2 mirror://gentoo/genpatches-3.1-9.extras.tar.bz2
-binchecks strip
-http://dev.gentoo.org/~mpagano/genpatches
-GPL-2 !deblob? ( freedist )
-Full sources including the Gentoo patchset for the 3.1 kernel tree
-alpha amd64 arm hppa ia64 ~ppc ~ppc64 s390 sh sparc x86
-eutils kernel-2 multilib portability toolchain-funcs user versionator
-deblob symlink build deblob
-
-!build? ( virtual/dev-manager )
-
-2
-
-compile install postinst postrm preinst setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/sys-kernel/gentoo-sources-3.1.7 b/metadata/cache/sys-kernel/gentoo-sources-3.1.7
deleted file mode 100644
index 31576f94758c..000000000000
--- a/metadata/cache/sys-kernel/gentoo-sources-3.1.7
+++ /dev/null
@@ -1,22 +0,0 @@
-!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
-3.1.7
-mirror://kernel/linux/kernel/v3.x/linux-3.1.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.1.N/deblob-3.1 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.1.N/deblob-check -> deblob-check-3.1 ) mirror://gentoo/genpatches-3.1-10.base.tar.bz2 mirror://gentoo/genpatches-3.1-10.extras.tar.bz2
-binchecks strip
-http://dev.gentoo.org/~mpagano/genpatches
-GPL-2 !deblob? ( freedist )
-Full sources including the Gentoo patchset for the 3.1 kernel tree
-~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-eutils kernel-2 multilib portability toolchain-funcs user versionator
-deblob symlink build deblob
-
-!build? ( virtual/dev-manager )
-
-2
-
-compile install postinst postrm preinst setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/sys-kernel/gentoo-sources-3.1.9 b/metadata/cache/sys-kernel/gentoo-sources-3.1.9
deleted file mode 100644
index 186556279ea4..000000000000
--- a/metadata/cache/sys-kernel/gentoo-sources-3.1.9
+++ /dev/null
@@ -1,22 +0,0 @@
-!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
-3.1.9
-mirror://kernel/linux/kernel/v3.x/linux-3.1.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.1.N/deblob-3.1 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.1.N/deblob-check -> deblob-check-3.1 ) mirror://gentoo/genpatches-3.1-11.base.tar.bz2 mirror://gentoo/genpatches-3.1-11.extras.tar.bz2
-binchecks strip
-http://dev.gentoo.org/~mpagano/genpatches
-GPL-2 !deblob? ( freedist )
-Full sources including the Gentoo patchset for the 3.1 kernel tree
-~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-eutils kernel-2 multilib portability toolchain-funcs user versionator
-deblob symlink build deblob
-
-!build? ( virtual/dev-manager )
-
-2
-
-compile install postinst postrm preinst setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/sys-kernel/gentoo-sources-3.2.0 b/metadata/cache/sys-kernel/gentoo-sources-3.2.0
deleted file mode 100644
index ed21d7ae1f68..000000000000
--- a/metadata/cache/sys-kernel/gentoo-sources-3.2.0
+++ /dev/null
@@ -1,22 +0,0 @@
-!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
-3.2.0
-mirror://kernel/linux/kernel/v3.x/linux-3.2.tar.bz2 mirror://gentoo/genpatches-3.2-1.base.tar.bz2 mirror://gentoo/genpatches-3.2-1.extras.tar.bz2
-binchecks strip
-http://dev.gentoo.org/~mpagano/genpatches
-GPL-2 freedist
-Full sources including the Gentoo patchset for the 3.2 kernel tree
-~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-eutils kernel-2 multilib portability toolchain-funcs user versionator
-deblob symlink build
-
-!build? ( virtual/dev-manager )
-
-3
-
-compile install postinst postrm preinst setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/sys-kernel/gentoo-sources-3.2.0-r1 b/metadata/cache/sys-kernel/gentoo-sources-3.2.0-r1
deleted file mode 100644
index c1ef94a58cad..000000000000
--- a/metadata/cache/sys-kernel/gentoo-sources-3.2.0-r1
+++ /dev/null
@@ -1,22 +0,0 @@
-!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
-3.2.0-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 ) mirror://gentoo/genpatches-3.2-2.base.tar.bz2 mirror://gentoo/genpatches-3.2-2.extras.tar.bz2
-binchecks strip
-http://dev.gentoo.org/~mpagano/genpatches
-GPL-2 !deblob? ( freedist )
-Full sources including the Gentoo patchset for the 3.2 kernel tree
-~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-eutils kernel-2 multilib portability toolchain-funcs user versionator
-deblob symlink build deblob
-
-!build? ( virtual/dev-manager )
-
-3
-
-compile install postinst postrm preinst setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/sys-kernel/gentoo-sources-3.2.1 b/metadata/cache/sys-kernel/gentoo-sources-3.2.1
deleted file mode 100644
index 1449a302a4b6..000000000000
--- a/metadata/cache/sys-kernel/gentoo-sources-3.2.1
+++ /dev/null
@@ -1,22 +0,0 @@
-!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
-3.2.1
-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 ) mirror://gentoo/genpatches-3.2-3.base.tar.bz2 mirror://gentoo/genpatches-3.2-3.extras.tar.bz2
-binchecks strip
-http://dev.gentoo.org/~mpagano/genpatches
-GPL-2 !deblob? ( freedist )
-Full sources including the Gentoo patchset for the 3.2 kernel tree
-~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-eutils kernel-2 multilib portability toolchain-funcs user versionator
-deblob symlink build deblob
-
-!build? ( virtual/dev-manager )
-
-3
-
-compile install postinst postrm preinst setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/www-client/google-chrome-18.0.1010.0_alpha117846 b/metadata/cache/www-client/google-chrome-18.0.1017.2_alpha118867
similarity index 62%
rename from metadata/cache/www-client/google-chrome-18.0.1010.0_alpha117846
rename to metadata/cache/www-client/google-chrome-18.0.1017.2_alpha118867
index ffb81790aa87..8dae78b5c694 100644
--- a/metadata/cache/www-client/google-chrome-18.0.1010.0_alpha117846
+++ b/metadata/cache/www-client/google-chrome-18.0.1017.2_alpha118867
@@ -1,7 +1,7 @@
 >=sys-apps/sed-4
-media-libs/alsa-lib app-arch/bzip2 x11-libs/cairo net-print/cups sys-apps/dbus dev-libs/expat media-libs/fontconfig media-libs/freetype app-misc/ca-certificates dev-libs/atk dev-libs/glib:2 dev-libs/libxslt dev-libs/libgcrypt dev-libs/nspr dev-libs/nss gnome-base/gconf:2 media-libs/libpng:1.2 || ( >=sys-devel/gcc-4.4.0[-nocxx] >=sys-devel/gcc-4.4.0[cxx] ) sys-fs/udev sys-libs/zlib x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libXScrnSaver x11-libs/libX11 x11-libs/libXrender x11-libs/libXext x11-libs/libXfixes x11-libs/pango x11-misc/xdg-utils !www-client/google-chrome:0 !www-client/google-chrome:beta !www-client/google-chrome:stable
+media-libs/alsa-lib app-arch/bzip2 x11-libs/cairo net-print/cups sys-apps/dbus dev-libs/expat media-libs/fontconfig media-libs/freetype app-misc/ca-certificates gnome-base/gconf:2 dev-libs/libgcrypt x11-libs/gdk-pixbuf x11-libs/gtk+:2 dev-libs/glib:2 dev-libs/nspr dev-libs/nss x11-libs/pango media-libs/libpng:1.2 || ( >=sys-devel/gcc-4.4.0[-nocxx] >=sys-devel/gcc-4.4.0[cxx] ) sys-fs/udev x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXScrnSaver sys-libs/zlib x11-misc/xdg-utils net-misc/curl !www-client/google-chrome:0 !www-client/google-chrome:beta !www-client/google-chrome:stable
 unstable
-amd64? ( http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_18.0.1010.0-r117846_amd64.deb ) x86? ( http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_18.0.1010.0-r117846_i386.deb )
+amd64? ( http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_18.0.1017.2-r118867_amd64.deb ) x86? ( http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_18.0.1017.2-r118867_i386.deb )
 mirror strip
 http://www.google.com/chrome
 google-chrome
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index b893917a7ae9..b4e5dfa90550 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Wed, 25 Jan 2012 01:06:47 +0000
+Wed, 25 Jan 2012 06:06:46 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index b893917a7ae9..b4e5dfa90550 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Wed, 25 Jan 2012 01:06:47 +0000
+Wed, 25 Jan 2012 06:06:46 +0000
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 8dd1a5eb6afc..18958393778e 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Wed, 25 Jan 2012 01:06:48 +0000
+Wed, 25 Jan 2012 06:06:48 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index df39e513664c..279531f9a3ec 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Wed Jan 25 01:06:46 UTC 2012
+Wed Jan 25 06:06:46 UTC 2012
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index d1e5a5844dad..e5f253ce9043 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Wed, 25 Jan 2012 01:30:01 +0000
+Wed, 25 Jan 2012 06:30:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 6177c91a8a9e..d4a03cbc341f 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1327453501 Wed Jan 25 01:05:01 2012 UTC
+1327471501 Wed Jan 25 06:05:01 2012 UTC
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index c79901e05eca..c4f9e6ecea26 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -573,6 +573,7 @@ app-misc/beagle:ole - Enables OLE (Object Linking and Editing) support via dev-d
 app-misc/beagle:pdf - Enables support for indexing of the PDF (Portable Document Format) file format using `pdfinfo` and `pdftotext` from app-text/poppler
 app-misc/beagle:thunderbird - Compiles and installs the extension for either mail-client/thunderbird or mail-client/thunderbird-bin. This extension helps Beagle index your mails.
 app-misc/beagle:xscreensaver - Allow Beagle to detect when the screensaver is switched on. This allows Beagle to use more resources and index faster when the computer is not in use.
+app-misc/ddccontrol:ddcpci - enable direct PCI memory access (the setuid ddcpci util)
 app-misc/digitemp:ds2490 - Build support for the ds2490 sensor
 app-misc/digitemp:ds9097 - Build support for the ds9097 sensor
 app-misc/digitemp:ds9097u - Build support for the ds9097u sensor
diff --git a/sci-chemistry/votca-csg/votca-csg-1.2.2.ebuild b/sci-chemistry/votca-csg/votca-csg-1.2.2.ebuild
index 80ccd275075f..e00346de1cc3 100644
--- a/sci-chemistry/votca-csg/votca-csg-1.2.2.ebuild
+++ b/sci-chemistry/votca-csg/votca-csg-1.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/votca-csg/votca-csg-1.2.2.ebuild,v 1.3 2012/01/17 13:52:07 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/votca-csg/votca-csg-1.2.2.ebuild,v 1.4 2012/01/25 02:24:32 ottxor Exp $
 
 EAPI=4
 
@@ -28,7 +28,7 @@ HOMEPAGE="http://www.votca.org"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-macos"
 
 RDEPEND="=sci-libs/votca-tools-${PV}[system-boost=]
 	gromacs? ( sci-chemistry/gromacs )
@@ -46,6 +46,10 @@ src_configure() {
 	use gromacs && has_version =sci-chemistry/gromacs-9999 && \
 		extra="-DWITH_GMX_DEVEL=ON"
 
+	#to create man pages, build tree binaries are executed (bug #398437)
+	[[ ${CHOST} = *-darwin* ]] && \
+		extra+=" -DCMAKE_BUILD_WITH_INSTALL_RPATH=OFF"
+
 	mycmakeargs=(
 		$(cmake-utils_use system-boost EXTERNAL_BOOST)
 		$(cmake-utils_use_with gromacs GMX)
diff --git a/sci-chemistry/votca-csgapps/votca-csgapps-1.2.2.ebuild b/sci-chemistry/votca-csgapps/votca-csgapps-1.2.2.ebuild
index 377aeb01fb61..35438f716e45 100644
--- a/sci-chemistry/votca-csgapps/votca-csgapps-1.2.2.ebuild
+++ b/sci-chemistry/votca-csgapps/votca-csgapps-1.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/votca-csgapps/votca-csgapps-1.2.2.ebuild,v 1.4 2012/01/17 13:52:51 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/votca-csgapps/votca-csgapps-1.2.2.ebuild,v 1.5 2012/01/25 02:27:21 ottxor Exp $
 
 EAPI=4
 
@@ -20,7 +20,7 @@ HOMEPAGE="http://www.votca.org"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-macos"
 IUSE=""
 
 RDEPEND="=sci-chemistry/${PN%apps}-${PV}"
diff --git a/sys-apps/vgabios/Manifest b/sys-apps/vgabios/Manifest
new file mode 100644
index 000000000000..7aca9f7f9986
--- /dev/null
+++ b/sys-apps/vgabios/Manifest
@@ -0,0 +1,4 @@
+DIST vgabios-0.6c-fixes-1.tar.bz2 3868 RMD160 5d62abb7ab361f96cad7d32b62c9749d1e1a3a20 SHA1 1ed4a5ee20b28b339a45b649e00200337d7e9b0d SHA256 eb5641ad69b60b9de20c28bb2b5a3640fdcc2fccb3c7f54b04066f4f656212ce
+DIST vgabios-0.6c.tgz 1470496 RMD160 e35422f9a004a85fa18f54c9514316cdd9d3a235 SHA1 3c44c8caeb7f00b878cdcd3e4ea3446c258a70ce SHA256 eff20b9cb333fc5efb1fc07430b108084977d95fee349615f7c078511e66aea1
+DIST vgabios-0.7a-fixes-1.tar.bz2 2602 RMD160 77a36700d6e482d949d639aa2fbbd423198d3067 SHA1 8041ca26a7c347ef8fc13c168dad8e3c639b8d60 SHA256 912bbe475a723760047c181ebec9cd5b1e99b3e528c43bbccb82b7c738656ae3
+DIST vgabios-0.7a.tgz 1506655 RMD160 d34f5007c3d9b0f9b08dc1788e83f0811e8c6287 SHA1 a9296e5b33e839e3492588275597c6e999dc6ae1 SHA256 9d24c33d4bfb7831e2069cf3644936a53ef3de21d467872b54ce2ea30881b865
diff --git a/sys-apps/vgabios/metadata.xml b/sys-apps/vgabios/metadata.xml
new file mode 100644
index 000000000000..c2e341220446
--- /dev/null
+++ b/sys-apps/vgabios/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>cardoe@gentoo.org</email>
+		<name>Doug Goldstein</name>
+	</maintainer>
+	<herd>qemu</herd>
+</pkgmetadata>
+
diff --git a/sys-apps/vgabios/vgabios-0.6c.ebuild b/sys-apps/vgabios/vgabios-0.6c.ebuild
new file mode 100644
index 000000000000..3ec41bb104f2
--- /dev/null
+++ b/sys-apps/vgabios/vgabios-0.6c.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/vgabios/vgabios-0.6c.ebuild,v 1.5 2012/01/25 03:31:49 cardoe Exp $
+
+# Can't really call them backports when they're fixes that upstream
+# won't carry
+FIXES=1
+
+EAPI=4
+
+inherit eutils
+
+DESCRIPTION="VGA BIOS implementation"
+HOMEPAGE="http://www.nongnu.org/vgabios/"
+SRC_URI="http://savannah.gnu.org/download/${PN}/${P}.tgz
+		http://dev.gentoo.org/~cardoe/distfiles/${P}-fixes-${FIXES}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+DEPEND="sys-devel/dev86"
+RDEPEND="!app-emulation/qemu
+		!<=app-emulation/qemu-kvm-1.0"
+
+src_prepare() {
+	EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
+		epatch
+}
+
+pkg_configure() {
+	:
+}
+
+src_compile() {
+	emake biossums
+	emake
+}
+
+src_install() {
+	insinto /usr/share/vgabios
+
+	# Stock VGABIOS
+	newins VGABIOS-lgpl-latest.bin vgabios.bin
+	use debug && newins VGABIOS-lgpl-latest.debug.bin vgabios.debug.bin
+
+	# Cirrus
+	newins VGABIOS-lgpl-latest.cirrus.bin vgabios.cirrus.bin
+	use debug && newins VGABIOS-lgpl-latest.cirrus.debug.bin \
+		vgabios.cirrus.debug.bin
+
+	# QXL
+	newins VGABIOS-lgpl-latest.qxl.bin vgabios.qxl.bin
+	use debug && newins VGABIOS-lgpl-latest.qxl.debug.bin vgabios.qxl.debug.bin
+
+	# Standard VGA
+	newins VGABIOS-lgpl-latest.stdvga.bin vgabios.stdvga.bin
+	use debug && newins VGABIOS-lgpl-latest.stdvga.debug.bin \
+		vgabios.stdvga.debug.bin
+
+	# VMWare
+	newins VGABIOS-lgpl-latest.vmware.bin vgabios.vmware.bin
+	use debug && newins VGABIOS-lgpl-latest.vmware.debug.bin \
+		vgabios.vmware.debug.bin
+}
diff --git a/sys-apps/vgabios/vgabios-0.7a.ebuild b/sys-apps/vgabios/vgabios-0.7a.ebuild
new file mode 100644
index 000000000000..96d14eb5444a
--- /dev/null
+++ b/sys-apps/vgabios/vgabios-0.7a.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/vgabios/vgabios-0.7a.ebuild,v 1.3 2012/01/25 03:31:49 cardoe Exp $
+
+# Can't really call them backports when they're fixes that upstream
+# won't carry
+FIXES=1
+
+EAPI=4
+
+inherit eutils
+
+DESCRIPTION="VGA BIOS implementation"
+HOMEPAGE="http://www.nongnu.org/vgabios/"
+SRC_URI="http://savannah.gnu.org/download/${PN}/${P}.tgz
+		http://dev.gentoo.org/~cardoe/distfiles/${P}-fixes-${FIXES}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+DEPEND="sys-devel/dev86"
+RDEPEND="!app-emulation/qemu
+		!<=app-emulation/qemu-kvm-1.0"
+
+src_prepare() {
+	EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
+		epatch
+}
+
+pkg_configure() {
+	:
+}
+
+src_compile() {
+	emake biossums
+	emake
+}
+
+src_install() {
+	insinto /usr/share/vgabios
+
+	# Stock VGABIOS
+	newins VGABIOS-lgpl-latest.bin vgabios.bin
+	use debug && newins VGABIOS-lgpl-latest.debug.bin vgabios.debug.bin
+
+	# Cirrus
+	newins VGABIOS-lgpl-latest.cirrus.bin vgabios.cirrus.bin
+	use debug && newins VGABIOS-lgpl-latest.cirrus.debug.bin \
+		vgabios.cirrus.debug.bin
+
+	# QXL
+	newins VGABIOS-lgpl-latest.qxl.bin vgabios.qxl.bin
+	use debug && newins VGABIOS-lgpl-latest.qxl.debug.bin vgabios.qxl.debug.bin
+
+	# Standard VGA
+	newins VGABIOS-lgpl-latest.stdvga.bin vgabios.stdvga.bin
+	use debug && newins VGABIOS-lgpl-latest.stdvga.debug.bin \
+		vgabios.stdvga.debug.bin
+
+	# VMWare
+	newins VGABIOS-lgpl-latest.vmware.bin vgabios.vmware.bin
+	use debug && newins VGABIOS-lgpl-latest.vmware.debug.bin \
+		vgabios.vmware.debug.bin
+}
diff --git a/sys-devel/gdb/Manifest b/sys-devel/gdb/Manifest
index 935983610eb4..0c8307a18c3c 100644
--- a/sys-devel/gdb/Manifest
+++ b/sys-devel/gdb/Manifest
@@ -16,3 +16,5 @@ DIST gdb-7.3-patches-1.tar.xz 8192 RMD160 43af2b58ecb0a72a1c3b1a7d8cda7e52befd08
 DIST gdb-7.3.1-patches-2.tar.xz 17344 RMD160 7a97172d74158e92dd297182d278173842f00afb SHA1 1cdd2d7490a5daad4ab0e1ee7d5221b9ce712a70 SHA256 8dc91c665025faaa716a47404a1645086c5a9db3ee6b38beb564607fa0ef6e69
 DIST gdb-7.3.1.tar.bz2 19500995 RMD160 6350a786b2f60dd46386454ebab0effc67ed169f SHA1 e57f2c7f93536ef54fab728eb733bf2c36550718 SHA256 6d7bff716fde98d03866a1b747c0929ee7dba49bca13e01d975e0b0fa9b33a28
 DIST gdb-7.3.tar.bz2 19091650 RMD160 3df9a15e2d276f4f7f30e5d2a7d86a8c63f30a34 SHA1 fefd90275d6decdca00c5c29c533e2ef3d439664 SHA256 f9edc83ed921660b77aa2b2fc168b81639aab0f49a94d4b38f2f01bf51d5d2ba
+DIST gdb-7.4-patches-1.tar.xz 8192 RMD160 c42d576b421905f0a56ed4d4e12779528bfe805d SHA1 469a510f062bc6e37976a5b0f43b697c2f457c01 SHA256 c4349847c80f314c603dd9465b90cda2b3565cac4f8024a4287f756eda9d138b
+DIST gdb-7.4.tar.bz2 20614020 RMD160 32d79650c93f64583ae1e49908ec238f78d49e73 SHA1 43a3ee582eae4d69c2babea4f8700b7bec8e37fa SHA256 de7e2db7f0475eca7f9ffa9251abaddd3d37e0eed0b3759f71abfd810a3fd20f
diff --git a/sys-devel/gdb/gdb-7.4.ebuild b/sys-devel/gdb/gdb-7.4.ebuild
new file mode 100644
index 000000000000..350ecaed4157
--- /dev/null
+++ b/sys-devel/gdb/gdb-7.4.ebuild
@@ -0,0 +1,183 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-7.4.ebuild,v 1.1 2012/01/25 04:34:34 vapier Exp $
+
+EAPI="3"
+
+inherit flag-o-matic eutils
+
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+	if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
+		export CTARGET=${CATEGORY/cross-}
+	fi
+fi
+is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
+
+RPM=
+MY_PV=${PV}
+case ${PV} in
+*.*.*.*.*.*)
+	# fedora version: gdb-6.8.50.20090302-8.fc11.src.rpm
+	inherit versionator rpm
+	gvcr() { get_version_component_range "$@"; }
+	MY_PV=$(gvcr 1-4)
+	RPM="${PN}-${MY_PV}-$(gvcr 5).fc$(gvcr 6).src.rpm"
+	SRC_URI="mirror://fedora/development/source/SRPMS/${RPM}"
+	;;
+*.*.50.*)
+	# weekly snapshots
+	SRC_URI="ftp://sources.redhat.com/pub/gdb/snapshots/current/gdb-weekly-${PV}.tar.bz2"
+	;;
+9999*)
+	# live git tree
+	EGIT_REPO_URI="git://sourceware.org/git/gdb.git"
+	inherit git-2
+	SRC_URI=""
+	;;
+*)
+	# Normal upstream release
+	SRC_URI="http://ftp.gnu.org/gnu/gdb/${P}.tar.bz2
+		ftp://sources.redhat.com/pub/gdb/releases/${P}.tar.bz2"
+	;;
+esac
+
+PATCH_VER="1"
+DESCRIPTION="GNU debugger"
+HOMEPAGE="http://sourceware.org/gdb/"
+SRC_URI="${SRC_URI} ${PATCH_VER:+mirror://gentoo/${P}-patches-${PATCH_VER}.tar.xz}"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+IUSE="+client expat multitarget nls +python +server test vanilla zlib"
+
+RDEPEND="!dev-util/gdbserver
+	>=sys-libs/ncurses-5.2-r2
+	sys-libs/readline
+	expat? ( dev-libs/expat )
+	python? ( =dev-lang/python-2* )
+	zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	virtual/yacc
+	test? ( dev-util/dejagnu )
+	nls? ( sys-devel/gettext )"
+
+S=${WORKDIR}/${PN}-${MY_PV}
+
+src_prepare() {
+	[[ -n ${RPM} ]] && rpm_spec_epatch "${WORKDIR}"/gdb.spec
+	use vanilla || [[ -n ${PATCH_VER} ]] && EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patch
+	strip-linguas -u bfd/po opcodes/po
+}
+
+gdb_branding() {
+	printf "Gentoo ${PV} "
+	if [[ -n ${PATCH_VER} ]] ; then
+		printf "p${PATCH_VER}"
+	else
+		printf "vanilla"
+	fi
+}
+
+src_configure() {
+	strip-unsupported-flags
+
+	local myconf=(
+		--with-pkgversion="$(gdb_branding)"
+		--with-bugurl='http://bugs.gentoo.org/'
+		--disable-werror
+		$(is_cross && echo --with-sysroot="${EPREFIX}"/usr/${CTARGET})
+	)
+
+	if use server && ! use client ; then
+		# just configure+build in the gdbserver subdir to speed things up
+		cd gdb/gdbserver
+		myconf+=( --program-transform-name='' )
+	else
+		# gdbserver only works for native targets (CHOST==CTARGET).
+		# it also doesn't support all targets, so rather than duplicate
+		# the target list (which changes between versions), use the
+		# "auto" value when things are turned on.
+		is_cross \
+			&& myconf+=( --disable-gdbserver ) \
+			|| myconf+=( $(use_enable server gdbserver auto) )
+	fi
+
+	if ! ( use server && ! use client ) ; then
+		# if we are configuring in the top level, then use all
+		# the additional global options
+		myconf+=(
+			--enable-64-bit-bfd
+			--disable-install-libbfd
+			--disable-install-libiberty
+			--with-system-readline
+			--with-separate-debug-dir="${EPREFIX}"/usr/lib/debug
+			$(use_with expat)
+			$(use_enable nls)
+			$(use multitarget && echo --enable-targets=all)
+			$(use_with python python "${EPREFIX}/usr/bin/python2")
+			$(use_with zlib)
+		)
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_test() {
+	emake check || ewarn "tests failed"
+}
+
+src_install() {
+	use server && ! use client && cd gdb/gdbserver
+	emake DESTDIR="${D}" install || die
+	use client && { find "${ED}"/usr -name libiberty.a -delete || die ; }
+	cd "${S}"
+
+	# Don't install docs when building a cross-gdb
+	if [[ ${CTARGET} != ${CHOST} ]] ; then
+		rm -r "${ED}"/usr/share
+		return 0
+	fi
+	# Install it by hand for now:
+	# http://sourceware.org/ml/gdb-patches/2011-12/msg00915.html
+	# Only install if it exists due to the twisted behavior (see
+	# notes in src_configure above).
+	[[ -e gdb/gdbserver/gdbreplay ]] && { dobin gdb/gdbserver/gdbreplay || die ; }
+
+	dodoc README
+	if use client ; then
+		docinto gdb
+		dodoc gdb/CONTRIBUTE gdb/README gdb/MAINTAINERS \
+			gdb/NEWS gdb/ChangeLog gdb/PROBLEMS
+	fi
+	docinto sim
+	dodoc sim/{ChangeLog,MAINTAINERS,README-HACKING}
+	if use server ; then
+		docinto gdbserver
+		dodoc gdb/gdbserver/{ChangeLog,README}
+	fi
+
+	if [[ -n ${PATCH_VER} ]] ; then
+		dodoc "${WORKDIR}"/extra/gdbinit.sample
+	fi
+
+	# Remove shared info pages
+	rm -f "${ED}"/usr/share/info/{annotate,bfd,configure,standards}.info*
+}
+
+pkg_postinst() {
+	# portage sucks and doesnt unmerge files in /etc
+	rm -vf "${EROOT}"/etc/skel/.gdbinit
+
+	if use prefix && [[ ${CHOST} == *-darwin* ]] ; then
+		ewarn "gdb is unable to get a mach task port when installed by Prefix"
+		ewarn "Portage, unprivileged.  To make gdb fully functional you'll"
+		ewarn "have to perform the following steps:"
+		ewarn "  % sudo chgrp procmod ${EPREFIX}/usr/bin/gdb"
+		ewarn "  % sudo chmod g+s ${EPREFIX}/usr/bin/gdb"
+	fi
+}
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index 768829047b42..4ad95194f6fc 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -1,10 +1,8 @@
 DIST deblob-2.6.32 84094 RMD160 394f46ec5b869638a7bc2e87beb118167c9bd6cb SHA1 1a2a1efb72126609d9e3b9be99ae5be2751efd06 SHA256 de625f0bd221c9c38d4453f1b709622f222d86a0ae9350d2b7b0e17795e6de6d
-DIST deblob-2.6.39 100964 RMD160 9de6522b23c9e5037d6fb9adc4db986f79541045 SHA1 5e101ef4498bad61ef84c1bd43314d1a7b181539 SHA256 f96be03d33dc8ebec8b0adae13700e2ff2e961a04f7c7a5065904b2d205c86d5
 DIST deblob-3.0 102531 RMD160 d3ea6f04cd4d6c7f652f4532e7558f931d3952d1 SHA1 3702cec9da20b8c1141e0fee2549fd475e203812 SHA256 4c9d98faabc226602891e6eb36634f1c228017bb90f0d3ceaa42d41d4b27df0f
 DIST deblob-3.1 103909 RMD160 723d36ef2574419417bbf30eda6a83aaa91922d7 SHA1 39d2c6e69f4e3b84e112b6e3e9389c983976fe4b SHA256 9dcf6f981cb3681f8afab0a4f814aebd6c2f46f8e635d2f35657d8344ef6b30e
 DIST deblob-3.2 107602 RMD160 56f1dfe4f0254c802b49ea5220c4f67e56649852 SHA1 83421184d88d02e24de2adbc5debfb03454a7f4b SHA256 5db88405af6d51a77d84354afc3b2bdf673b1a5dcff37bb8db4ccbd12d91db20
 DIST deblob-check-2.6.32 247608 RMD160 840bf8a229ea79810519eee6241edb85b78a6562 SHA1 d45a24eb16e5ac956c0fcddbc1ac4d67e326c7b8 SHA256 da1aecdf3ab7f1207b90642d303e52262ccc2ed9e49739b729512b88950d17f3
-DIST deblob-check-2.6.39 371034 RMD160 90efca9d266f69105b10497578434a363d8ff5f6 SHA1 91ecc522aa6c0ad6d99056edfe73224c68a1470e SHA256 2e45bdb11f2db32d5a7c1705288353ef69653e54070904645be2f170fef24806
 DIST deblob-check-3.0 377076 RMD160 8a4f53f0a34c46fc6a2aae5878225851d7bf13e1 SHA1 b1b356f55f63746bba284644db8585d15f3da06f SHA256 72ab3f74cbcde9d453f8a4e30fd6a6339812806fe6dab3b632c1c68b90b0b104
 DIST deblob-check-3.1 405438 RMD160 da7efe959bc7c0017214daa764fcb486ff4434f2 SHA1 397157d3f6bf225f8cc4f48b6c05bc56482c2934 SHA256 77d125ae5466049fb3f1fe39ddb9320b66239de782a348c66133de591049db43
 DIST deblob-check-3.2 423268 RMD160 8cb0c1b4a289db94543396c4445c4c7a35d2ba70 SHA1 01e50f824a577d15749f24643fdd136180342808 SHA256 9e67dd0885aa8ef356dbc15d487c8dea5a54f74c5b03a5d7946b65ee43f12638
@@ -16,40 +14,13 @@ DIST genpatches-2.6.32-47.base.tar.bz2 1032970 RMD160 233c4a263ad2fca1f4d280f579
 DIST genpatches-2.6.32-47.extras.tar.bz2 24939 RMD160 055706793fb532caeb3d364c5e1bd0ad46aff4b2 SHA1 2a966a4d5f9a718a0d43c25df563d0377154996f SHA256 ee714d14310fd5242ce2e28a8f8e5fda63ba18957960814876506f8754b9d2a0
 DIST genpatches-2.6.32-48.base.tar.bz2 1033142 RMD160 c42b6a5edbb9965391bbcf6ee40bb79c2080f497 SHA1 95e90447ecd875228121fa32e8cf89eaabde5fa6 SHA256 7438e7b7c0ef32e0c639cf89c4f53a3bc7917ca466b1fcf3931adb65ad05b583
 DIST genpatches-2.6.32-48.extras.tar.bz2 24939 RMD160 055706793fb532caeb3d364c5e1bd0ad46aff4b2 SHA1 2a966a4d5f9a718a0d43c25df563d0377154996f SHA256 ee714d14310fd5242ce2e28a8f8e5fda63ba18957960814876506f8754b9d2a0
-DIST genpatches-2.6.39-5.base.tar.bz2 109396 RMD160 4f7e0efad4744ce198b339634ff1879378c7a082 SHA1 518e5b99a4590ecb80c8518a408c0894e9f2376e SHA256 35b474a21ea78d1d89ad27cf2bc119ba7a43616bdc1eb6df8672287432c37532
-DIST genpatches-2.6.39-5.extras.tar.bz2 17192 RMD160 98260c85537596a9558daaa693e4e7f5e0ba0c17 SHA1 1b154be1890d87564b4f20e7b09a9d62a2f01061 SHA256 337069a8c019ef301830088343928560634e463857c6463332ecf6a5585f13e7
-DIST genpatches-2.6.39-6.base.tar.bz2 129313 RMD160 020469bd8d91d7159b2a44782e64eb4e23a307c6 SHA1 46a3e1569d6f58f5f34e5e54d0947896f842d222 SHA256 fe605a0bc8a1206db73803692179413a605c98415bc35bdb16496afffe241b22
-DIST genpatches-2.6.39-6.extras.tar.bz2 17176 RMD160 daae29a8c922c4cce338ee7ad2e7ea6b3fb7bed5 SHA1 382e3800895b1b56bc7d073808576a0060165bc2 SHA256 6d2bbf1bd936088e10aecaa2f7d1050de72a21a8e4a05a8269caeaec8e8b3f09
-DIST genpatches-3.0-13.base.tar.bz2 365024 RMD160 e0df32318b22e0a684d5fcd6ff2166dfc80b77f0 SHA1 f97a7d4ae144bc0d8ebd0c31856f41aa9122f29b SHA256 e2d65afaf25628b955a235b918846c1625a67ce01868a9e091c9439c9835fe6d
-DIST genpatches-3.0-13.extras.tar.bz2 17207 RMD160 0f04fef1fe76c9b9cbe7c497faae19b015caff72 SHA1 89935647c22c0a8b98dd568e97312ca64378a263 SHA256 ec88ca4408c668a2c4d2d25c3d4a8c67fad4bb08133db91bbb929c0053305fda
-DIST genpatches-3.0-14.base.tar.bz2 379202 RMD160 e5ab9095e56470eb9dd05d19e76ad546cf806c8c SHA1 f3a9c83b920dbf68555d622d71b037d37d0573f1 SHA256 efd4ef7e0956cdde6eb6ed0e9fbe3c861d61e37a31aade8eced30bdc6a01df95
-DIST genpatches-3.0-14.extras.tar.bz2 17207 RMD160 0f04fef1fe76c9b9cbe7c497faae19b015caff72 SHA1 89935647c22c0a8b98dd568e97312ca64378a263 SHA256 ec88ca4408c668a2c4d2d25c3d4a8c67fad4bb08133db91bbb929c0053305fda
-DIST genpatches-3.0-15.base.tar.bz2 379491 RMD160 68faf9df714a8606887f232bf30819f4c3e9bca7 SHA1 dd3cde41b678f1a0a6686881a78e9ab021a9e1fc SHA256 616b016b97bc079fff0a294e416b697b41b66ed85c2a68fd3066a5b4cfcdbfe5
-DIST genpatches-3.0-15.extras.tar.bz2 17207 RMD160 0f04fef1fe76c9b9cbe7c497faae19b015caff72 SHA1 89935647c22c0a8b98dd568e97312ca64378a263 SHA256 ec88ca4408c668a2c4d2d25c3d4a8c67fad4bb08133db91bbb929c0053305fda
-DIST genpatches-3.0-16.base.tar.bz2 417229 RMD160 427655927084f007cee2887d46fea61a4571887d SHA1 ebb21e11369a47cf2b12d3d4b09b53cedeae754e SHA256 b6431515743f695a78ccab7376a236b0b7c534ae1bb9c0e4b8125a83826236b5
-DIST genpatches-3.0-16.extras.tar.bz2 17193 RMD160 8eac4d558555912c08748a224b0bee04f9abd93f SHA1 542b36e0b8c712dfe06951f08e4c5fd83f3cf5fa SHA256 86c7a9d4ee419f21b63bfa23b52feb9c4b547a1b29498a752620336776aaff91
 DIST genpatches-3.0-18.base.tar.bz2 418620 RMD160 3a75def72f7c18b623237e2b03a64c5dc751f219 SHA1 640de4375675190626e0fb2e3a2e6cdb5d1b631d SHA256 f530f6caae05a06ae04817e4ce3e696154571f219446e20d404addc9208cce79
 DIST genpatches-3.0-18.extras.tar.bz2 17193 RMD160 8eac4d558555912c08748a224b0bee04f9abd93f SHA1 542b36e0b8c712dfe06951f08e4c5fd83f3cf5fa SHA256 86c7a9d4ee419f21b63bfa23b52feb9c4b547a1b29498a752620336776aaff91
-DIST genpatches-3.0-8.base.tar.bz2 216509 RMD160 4ca8618b482a013adea3b5a66222975288c3f589 SHA1 68caec5b7080ab7140ad09ec7caa3414f185e5f8 SHA256 857d6ccd8bf965ec82c944c229218fb71a37c0c13f26228dc69c4e556dbfa17d
-DIST genpatches-3.0-8.extras.tar.bz2 17207 RMD160 0f04fef1fe76c9b9cbe7c497faae19b015caff72 SHA1 89935647c22c0a8b98dd568e97312ca64378a263 SHA256 ec88ca4408c668a2c4d2d25c3d4a8c67fad4bb08133db91bbb929c0053305fda
-DIST genpatches-3.1-10.base.tar.bz2 180217 RMD160 2817a9d111441d2584e4e1b1b8e7d669e96acc63 SHA1 b77f380a2d0007876d83389cbabef213bbbf09fc SHA256 d5d0b9e2689a5326028e27ef75f93253762c20e157de73d3ad856d44b6295c76
-DIST genpatches-3.1-10.extras.tar.bz2 17200 RMD160 fa8aa6ba8bc1e554758017d371769536d025bdc1 SHA1 47240cdc21d69d2af05d0b2bd7dcbb1615508f86 SHA256 b108dbf3b5ddad1701cacd2f1c936a63b60d1a4cd86fd7f9311230e3bacac56b
-DIST genpatches-3.1-11.base.tar.bz2 219429 RMD160 8fb82781c8b2e91ae1a0a34c63bf0f9c43c66db2 SHA1 b2647d6f72d0d2299c2fb646c7a3182c02ae16a1 SHA256 d549e5da622e501522995bccfd083931b1b0b4e793b7ebffb1f187d9e3c26ba1
-DIST genpatches-3.1-11.extras.tar.bz2 17197 RMD160 a275874317e13fc9f372eb6cdb08b79d67df5201 SHA1 85ed96b1602df0f1f68bc8c88de905cf5d1b0a5e SHA256 aee5dcccb9abc251d31caa0d565b78800cbc8e111cfa02b433cf6ebbdf04d4ea
 DIST genpatches-3.1-14.base.tar.bz2 240075 RMD160 23f16ae73e228ae144ace05299fa41c2aec4f9a1 SHA1 8fd750c3958b9142c0ad64e5cab55c36d67f3e25 SHA256 fb83da313f48f4adb2955230921e9221696894db711d11a04b91939787a711e4
 DIST genpatches-3.1-14.extras.tar.bz2 17197 RMD160 a275874317e13fc9f372eb6cdb08b79d67df5201 SHA1 85ed96b1602df0f1f68bc8c88de905cf5d1b0a5e SHA256 aee5dcccb9abc251d31caa0d565b78800cbc8e111cfa02b433cf6ebbdf04d4ea
-DIST genpatches-3.1-9.base.tar.bz2 180138 RMD160 29628cb0a5388ceccf230165a2b221eb1e1c8aad SHA1 565d560c04b589e58bcced7449205937828a6321 SHA256 29dc732ad6969d1a56606d05ddcb5dc7db012416c5feda19178120be5a061909
-DIST genpatches-3.1-9.extras.tar.bz2 17200 RMD160 fa8aa6ba8bc1e554758017d371769536d025bdc1 SHA1 47240cdc21d69d2af05d0b2bd7dcbb1615508f86 SHA256 b108dbf3b5ddad1701cacd2f1c936a63b60d1a4cd86fd7f9311230e3bacac56b
-DIST genpatches-3.2-1.base.tar.bz2 775 RMD160 86769584ad58c35dc6f61853e7dd74c14ee2ceee SHA1 ddfb75cf71999ab2b68f8242c61f3c8898196a57 SHA256 7d996829a0b4da35eb619d247f6fb22cbd370e698cc1b68c2f0566cbe62941a1
-DIST genpatches-3.2-1.extras.tar.bz2 17198 RMD160 ba4f987b3f65c498f428c4d7bd40ff33dfa08c5a SHA1 e5216115c6e6543f159b235c2bc686245fe2598d SHA256 6633b79678aaca488942e42dac20c80480b6f9cf8c22e1ab300e34f9b07cd1db
-DIST genpatches-3.2-2.base.tar.bz2 9364 RMD160 50b7ef1e041c2b60cdfd1e15c929ddce090f652e SHA1 ae001acabb63ca7947f3775b7e42363c40ab8e33 SHA256 52caa010222548f4bf2ae14085032b86d3538a8b24996e49dfeaf622b6adea4f
-DIST genpatches-3.2-2.extras.tar.bz2 17198 RMD160 ba4f987b3f65c498f428c4d7bd40ff33dfa08c5a SHA1 e5216115c6e6543f159b235c2bc686245fe2598d SHA256 6633b79678aaca488942e42dac20c80480b6f9cf8c22e1ab300e34f9b07cd1db
-DIST genpatches-3.2-3.base.tar.bz2 26319 RMD160 07bbe98693cee3a3f1eb66febf4ca12afb74994b SHA1 3d7032aaf08f8a01a7c708fc502a53b80fd47048 SHA256 0b285138f79eeb604a5b9a46ae3a5d878c3df677a4b6b66666145f63fcc33ed7
-DIST genpatches-3.2-3.extras.tar.bz2 17208 RMD160 8324da51ce71afb0d375f34b0dd05209079bd7a3 SHA1 c2f4e029aebbc0ae82221aa2643de06a2d08cbd8 SHA256 7f60ab18e2965d024b7a36327577bcc771061f2cfac221ed475a6fd6b2ab89c7
 DIST genpatches-3.2-5.base.tar.bz2 28499 RMD160 bd19317c1d3e5c427a49a6f46a6e20639426d009 SHA1 0e00aa2856505296e904715cab48a5e68fab66c2 SHA256 a5795f0f1c5302423c89142af51835bbf238bc0f31ae236a676fea4ae3858f13
 DIST genpatches-3.2-5.extras.tar.bz2 17208 RMD160 8324da51ce71afb0d375f34b0dd05209079bd7a3 SHA1 c2f4e029aebbc0ae82221aa2643de06a2d08cbd8 SHA256 7f60ab18e2965d024b7a36327577bcc771061f2cfac221ed475a6fd6b2ab89c7
 DIST linux-2.6.32.tar.bz2 64424138 RMD160 b93742cbaf8174f2200d2dbef0d47a26c618039c SHA1 410b4fc818023bfef60064e973ff0ab46d3bfb19 SHA256 5099786d80b8407d98a619df00209c2353517f22d804fdd9533b362adcb4504e
-DIST linux-2.6.39.tar.bz2 76096559 RMD160 feddc516bc15e78f12f611ff184d38baa4eac4ee SHA1 68518112821e55f4ac1df64f2e0e809cedfcc5ef SHA256 584d17f2a3ee18a9501d7ff36907639e538cfdba4529978b8550c461d45c61f6
 DIST linux-3.0.tar.bz2 76753134 RMD160 e20c9564ec0c8128e28a4c038986d4d93bbe34bb SHA1 45b64bffc860f70ab7956da4493c488010714650 SHA256 64b0228b54ce39b0b2df086109a7b737cde58e3df4f779506ddcaccee90356a0
 DIST linux-3.1.tar.bz2 77190238 RMD160 f9a3ce57b9f20a1402ef340792d3c223140ce1d2 SHA1 ac792701561b1cd4279302b8bb8f474731762ad1 SHA256 2573d2378c754b0c602b57586e9311e5b38c5d1e6c137f02873833633a4b9359
 DIST linux-3.2.tar.bz2 78147838 RMD160 15eb022305dfc8b0e1d59e396911fa86eb9c3bdf SHA1 3460afa971049aa79b8f914e1bfd619eedd19f55 SHA256 c881fc2b53cf0da7ca4538aa44623a7de043a41f76fd5d0f51a31f6ed699d463
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-2.6.39-r3.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-2.6.39-r3.ebuild
deleted file mode 100644
index ac21368108b1..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-2.6.39-r3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.6.39-r3.ebuild,v 1.7 2011/10/03 18:34:33 josejx Exp $
-
-EAPI="2"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras"
-K_GENPATCHES_VER="5"
-K_DEBLOB_AVAILABLE="1"
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86"
-HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches"
-IUSE="deblob"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-2.6.39-r4.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-2.6.39-r4.ebuild
deleted file mode 100644
index fbe607a2cea1..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-2.6.39-r4.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.6.39-r4.ebuild,v 1.2 2011/08/11 17:19:46 mpagano Exp $
-
-EAPI="2"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras"
-K_GENPATCHES_VER="6"
-K_DEBLOB_AVAILABLE="1"
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
-HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches"
-IUSE="deblob"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-3.0.13.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-3.0.13.ebuild
deleted file mode 100644
index f2c31358b7b4..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-3.0.13.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-3.0.13.ebuild,v 1.1 2011/12/10 11:27:36 psomas Exp $
-
-EAPI="2"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras"
-K_GENPATCHES_VER="13"
-K_DEBLOB_AVAILABLE="1"
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches"
-IUSE="deblob"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-3.0.14.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-3.0.14.ebuild
deleted file mode 100644
index ecba69f6751d..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-3.0.14.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-3.0.14.ebuild,v 1.1 2011/12/28 16:00:55 psomas Exp $
-
-EAPI="2"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras"
-K_GENPATCHES_VER="14"
-K_DEBLOB_AVAILABLE="1"
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches"
-IUSE="deblob"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-3.0.15.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-3.0.15.ebuild
deleted file mode 100644
index 56a2729ac6d2..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-3.0.15.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-3.0.15.ebuild,v 1.1 2012/01/03 21:21:37 psomas Exp $
-
-EAPI="2"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras"
-K_GENPATCHES_VER="15"
-K_DEBLOB_AVAILABLE="1"
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches"
-IUSE="deblob"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-3.0.17-r2.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-3.0.17-r2.ebuild
index c85bf2fdfb61..b8b26a7022cc 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-3.0.17-r2.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-3.0.17-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/sys-kernel/gentoo-sources/gentoo-sources-3.0.17-r2.ebuild,v 1.1 2012/01/24 15:20:37 mpagano Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-3.0.17-r2.ebuild,v 1.2 2012/01/25 01:21:39 mpagano Exp $
 
 EAPI="2"
 ETYPE="sources"
@@ -11,7 +11,7 @@ inherit kernel-2
 detect_version
 detect_arch
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ~ppc ~ppc64 s390 sh sparc x86"
 HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches"
 IUSE="deblob"
 
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-3.0.17.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-3.0.17.ebuild
deleted file mode 100644
index 3d1f3c5a72e0..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-3.0.17.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-3.0.17.ebuild,v 1.1 2012/01/17 23:45:15 mpagano Exp $
-
-EAPI="2"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras"
-K_GENPATCHES_VER="16"
-K_DEBLOB_AVAILABLE="1"
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches"
-IUSE="deblob"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-3.0.6.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-3.0.6.ebuild
deleted file mode 100644
index d542c28821cd..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-3.0.6.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-3.0.6.ebuild,v 1.6 2011/11/19 21:17:32 vapier Exp $
-
-EAPI="2"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras"
-K_GENPATCHES_VER="8"
-K_DEBLOB_AVAILABLE="1"
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~ppc ~ppc64 s390 sh sparc x86"
-HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches"
-IUSE="deblob"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-3.1.10-r1.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-3.1.10-r1.ebuild
index f6f63f365721..5cda71131ebe 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-3.1.10-r1.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-3.1.10-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-3.1.10-r1.ebuild,v 1.1 2012/01/24 14:26:10 mpagano Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-3.1.10-r1.ebuild,v 1.2 2012/01/25 01:19:08 mpagano Exp $
 
 EAPI="2"
 ETYPE="sources"
@@ -11,7 +11,7 @@ inherit kernel-2
 detect_version
 detect_arch
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ~ppc ~ppc64 s390 sh sparc x86"
 HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches"
 IUSE="deblob"
 
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-3.1.6.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-3.1.6.ebuild
deleted file mode 100644
index 48c3ccbc3b42..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-3.1.6.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-3.1.6.ebuild,v 1.5 2012/01/15 18:15:09 armin76 Exp $
-
-EAPI="2"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras"
-K_GENPATCHES_VER="9"
-K_DEBLOB_AVAILABLE="1"
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~ppc ~ppc64 s390 sh sparc x86"
-HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches"
-IUSE="deblob"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-3.1.7.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-3.1.7.ebuild
deleted file mode 100644
index 61f15816029c..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-3.1.7.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-3.1.7.ebuild,v 1.1 2012/01/03 21:21:37 psomas Exp $
-
-EAPI="2"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras"
-K_GENPATCHES_VER="10"
-K_DEBLOB_AVAILABLE="1"
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches"
-IUSE="deblob"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-3.1.9.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-3.1.9.ebuild
deleted file mode 100644
index 8f6ff5263920..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-3.1.9.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-3.1.9.ebuild,v 1.1 2012/01/14 11:14:37 mpagano Exp $
-
-EAPI="2"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras"
-K_GENPATCHES_VER="11"
-K_DEBLOB_AVAILABLE="1"
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches"
-IUSE="deblob"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-3.2.0-r1.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-3.2.0-r1.ebuild
deleted file mode 100644
index e0c15515ebf6..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-3.2.0-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-3.2.0-r1.ebuild,v 1.2 2012/01/10 17:06:12 mpagano Exp $
-
-EAPI="3"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras"
-K_GENPATCHES_VER="2"
-K_DEBLOB_AVAILABLE="1"
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches"
-IUSE="deblob"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-3.2.0.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-3.2.0.ebuild
deleted file mode 100644
index b41256fb202c..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-3.2.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-3.2.0.ebuild,v 1.1 2012/01/05 01:39:51 mpagano Exp $
-
-EAPI="3"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras"
-K_GENPATCHES_VER="1"
-K_DEBLOB_AVAILABLE="0"
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches"
-IUSE="deblob"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-3.2.1.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-3.2.1.ebuild
deleted file mode 100644
index b42152d522ef..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-3.2.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-3.2.1.ebuild,v 1.1 2012/01/13 16:11:43 mpagano Exp $
-
-EAPI="3"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras"
-K_GENPATCHES_VER="3"
-K_DEBLOB_AVAILABLE="1"
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches"
-IUSE="deblob"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/www-client/google-chrome/Manifest b/www-client/google-chrome/Manifest
index a8f8fc8d3713..458619cbd061 100644
--- a/www-client/google-chrome/Manifest
+++ b/www-client/google-chrome/Manifest
@@ -2,5 +2,5 @@ DIST google-chrome-beta_17.0.963.38-r118053_amd64.deb 26576658 RMD160 8d3d5694ef
 DIST google-chrome-beta_17.0.963.38-r118053_i386.deb 30752756 RMD160 1ec5dd953503d0e65323276f0fc51bef649452fe SHA1 69b775aefec25e6d99d3ac6b2e66ebffa45926e4 SHA256 7635b34ca73fad62e25fd4b52a804f6e5178c5ed93f98a057e5610b63b0545de
 DIST google-chrome-stable_16.0.912.77-r118311_amd64.deb 25022310 RMD160 2c78b7cc8c02536f15c8e3c5fd3cd9b861ffb280 SHA1 d294d3a10ebf3ded614740044ecc545095eb399e SHA256 0abc30289dbc356bcdac90e4d84b2b016c4fef33fa70b9a65b72117d109ba23c
 DIST google-chrome-stable_16.0.912.77-r118311_i386.deb 29132038 RMD160 01de7a030b2cc5a22eb018fb70733b7858fd34e4 SHA1 a8df88507b5aa5743bfd2e44966577648832e634 SHA256 018b3efcd392d2fc8f893669336e4fa4955cdc818f6e49384b4eb765d1587338
-DIST google-chrome-unstable_18.0.1010.0-r117846_amd64.deb 26523804 RMD160 ff1dcd818d2ee93ca37ef7dbf109ba3460bbcab4 SHA1 91bd24b126785b63b2f4e0f7c7447260cc986788 SHA256 ce48be311123bc007cc95ec78bc2edb71fd6cc9ba7059ce4b541c54dc2572ede
-DIST google-chrome-unstable_18.0.1010.0-r117846_i386.deb 30645774 RMD160 04c61afbde747b77947c46ed4e3686a0c2fb2dbb SHA1 b925026ccbbd229e5afeff94ea74ffed4f0dd785 SHA256 c6f295c83f4a458fe959d2d5b49b0dac53bf1244406c69a5cc7c6db5c436f50b
+DIST google-chrome-unstable_18.0.1017.2-r118867_amd64.deb 26687420 RMD160 c2e57cbafa581aee75ada9f8b22df39e3bfcd03e SHA1 1b7a63668f613f1e4905171cec86803147c529ec SHA256 18b1ddcee82156c822d9b092ffe4df1e4dbcb8ffd35408832328ee5e6668c6c5
+DIST google-chrome-unstable_18.0.1017.2-r118867_i386.deb 30777492 RMD160 44a49eab9e7d4c9a93ce4beee635aa076889af8d SHA1 bebf4d73c8aaca92ad20599a65a0e8df018af319 SHA256 4ec1bfb7d05cdf0ef1cb8297a364be2756e0a3007f4bdd257d38b8141396f1cc
diff --git a/www-client/google-chrome/google-chrome-18.0.1010.0_alpha117846.ebuild b/www-client/google-chrome/google-chrome-18.0.1017.2_alpha118867.ebuild
similarity index 97%
rename from www-client/google-chrome/google-chrome-18.0.1010.0_alpha117846.ebuild
rename to www-client/google-chrome/google-chrome-18.0.1017.2_alpha118867.ebuild
index 44b92bd8d432..48fa7f2aed78 100644
--- a/www-client/google-chrome/google-chrome-18.0.1010.0_alpha117846.ebuild
+++ b/www-client/google-chrome/google-chrome-18.0.1017.2_alpha118867.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/google-chrome/google-chrome-18.0.1010.0_alpha117846.ebuild,v 1.1 2012/01/18 02:23:58 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/google-chrome/google-chrome-18.0.1017.2_alpha118867.ebuild,v 1.2 2012/01/25 05:01:38 floppym Exp $
 
 EAPI="4"
 
@@ -56,26 +56,25 @@ RDEPEND="
 	media-libs/fontconfig
 	media-libs/freetype
 	app-misc/ca-certificates
-	dev-libs/atk
-	dev-libs/glib:2
-	dev-libs/libxslt
+	gnome-base/gconf:2
 	dev-libs/libgcrypt
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:2
+	dev-libs/glib:2
 	dev-libs/nspr
 	dev-libs/nss
-	gnome-base/gconf:2
+	x11-libs/pango
 	media-libs/libpng:1.2
 	|| ( >=sys-devel/gcc-4.4.0[-nocxx] >=sys-devel/gcc-4.4.0[cxx] )
 	sys-fs/udev
-	sys-libs/zlib
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:2
-	x11-libs/libXScrnSaver
 	x11-libs/libX11
-	x11-libs/libXrender
 	x11-libs/libXext
 	x11-libs/libXfixes
-	x11-libs/pango
+	x11-libs/libXrender
+	x11-libs/libXScrnSaver
+	sys-libs/zlib
 	x11-misc/xdg-utils
+	net-misc/curl
 "
 
 # Add blockers for the other slots.