Sync with portage [Wed Feb 13 09:16:35 MSK 2013].

12 years ago · 2a1550d8ef
parent 3daf454636
commit 2a1550d8ef
391 changed files with 4465 additions and 1590 deletions
--- a/app-admin/conky/conky-1.9.0-r2.ebuild
+++ b/app-admin/conky/conky-1.9.0-r2.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.9.0-r2.ebuild,v 1.5 2013/02/10 17:17:31 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.9.0-r2.ebuild,v 1.7 2013/02/12 20:21:44 ago Exp $

 EAPI=5

@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"

 LICENSE="GPL-3 BSD LGPL-2.1 MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
 IUSE="apcupsd audacious curl debug eve hddtemp imlib iostats lua lua-cairo lua-imlib math moc mpd nano-syntax ncurses nvidia +portmon rss thinkpad truetype vim-syntax weather-metar weather-xoap wifi X xmms2"

 DEPEND_COMMON="
--- a/app-admin/rsyslog/files/rsyslog-7.2.5-json-c-pkgconfig.patch
+++ b/app-admin/rsyslog/files/rsyslog-7.2.5-json-c-pkgconfig.patch
@ -0,0 +1,156 @@
+From edf9b718d3007bdb519b3d64cb1f8145bba8e15e Mon Sep 17 00:00:00 2001
+From: Justin Lecher <jlec@gentoo.org>
+Date: Tue, 12 Feb 2013 11:55:17 +0100
+Subject: [PATCH] Use pkg-config to detect json-c
+
+There was a typo in the configure.ac which prevented correct usage of pkg-config
+to detect json-c.
+This patch corrects this typo and removes all paths from json.h in source files.
+
+Signed-off-by: Justin Lecher <jlec@gentoo.org>
+---
+ action.c                          | 2 +-
+ configure.ac                      | 2 +-
+ plugins/imkmsg/kmsg.c             | 2 +-
+ plugins/mmjsonparse/mmjsonparse.c | 2 +-
+ plugins/mmnormalize/mmnormalize.c | 2 +-
+ plugins/ommongodb/ommongodb.c     | 2 +-
+ runtime/msg.c                     | 2 +-
+ runtime/msg.h                     | 2 +-
+ template.c                        | 2 +-
+ template.h                        | 2 +-
+ 10 files changed, 10 insertions(+), 10 deletions(-)
+
+diff --git a/action.c b/action.c
+index 07f3a6f..d5cf983 100644
+--- a/action.c
+++ b/action.c
+@@ -98,7 +98,7 @@
+ #include <strings.h>
+ #include <time.h>
+ #include <errno.h>
+-#include <json/json.h>
+#include <json.h>
+ 
+ #include "dirty.h"
+ #include "template.h"
+diff --git a/configure.ac b/configure.ac
+index e9fce3f..cad0d57 100644
+--- a/configure.ac
+++ b/configure.ac
+@@ -758,7 +758,7 @@ if test "x$enable_rsyslogrt" = "xyes"; then
+   RSRT_LIBS1="\$(top_builddir)/runtime/librsyslog.la"
+ fi
+ AM_CONDITIONAL(ENABLE_RSYSLOGRT, test x$enable_rsyslogrt = xyes)
+-RSRT_CFLAGS="\$(RSRT_CFLAGS1) \$(LIBESTR_CFLAGS) \$(JSON_C_FLAGS)"
+RSRT_CFLAGS="\$(RSRT_CFLAGS1) \$(LIBESTR_CFLAGS) \$(JSON_C_CFLAGS)"
+ RSRT_LIBS="\$(RSRT_LIBS1) \$(LIBESTR_LIBS) \$(JSON_C_LIBS)"
+ AC_SUBST(RSRT_CFLAGS1)
+ AC_SUBST(RSRT_LIBS1)
+diff --git a/plugins/imkmsg/kmsg.c b/plugins/imkmsg/kmsg.c
+index b771d68..1c3ae4d 100644
+--- a/plugins/imkmsg/kmsg.c
+++ b/plugins/imkmsg/kmsg.c
+@@ -35,7 +35,7 @@
+ #ifdef  OS_LINUX
+ #include <sys/klog.h>
+ #endif
+-#include <json/json.h>
+#include <json.h>
+ 
+ #include "rsyslog.h"
+ #include "srUtils.h"
+diff --git a/plugins/mmjsonparse/mmjsonparse.c b/plugins/mmjsonparse/mmjsonparse.c
+index c47aceb..56db557 100644
+--- a/plugins/mmjsonparse/mmjsonparse.c
+++ b/plugins/mmjsonparse/mmjsonparse.c
+@@ -36,7 +36,7 @@
+ #include <unistd.h>
+ #include <ctype.h>
+ #include <libestr.h>
+-#include <json/json.h>
+#include <json.h>
+ #include "conf.h"
+ #include "syslogd-types.h"
+ #include "template.h"
+diff --git a/plugins/mmnormalize/mmnormalize.c b/plugins/mmnormalize/mmnormalize.c
+index fd2004a..45dde98 100644
+--- a/plugins/mmnormalize/mmnormalize.c
+++ b/plugins/mmnormalize/mmnormalize.c
+@@ -40,7 +40,7 @@
+ #include <unistd.h>
+ #include <libestr.h>
+ #include <libee/libee.h>
+-#include <json/json.h>
+#include <json.h>
+ #include <liblognorm.h>
+ #include "conf.h"
+ #include "syslogd-types.h"
+diff --git a/plugins/ommongodb/ommongodb.c b/plugins/ommongodb/ommongodb.c
+index dd99741..64d501d 100644
+--- a/plugins/ommongodb/ommongodb.c
+++ b/plugins/ommongodb/ommongodb.c
+@@ -33,7 +33,7 @@
+ #include <stdint.h>
+ #include <time.h>
+ #include <mongo.h>
+-#include <json/json.h>
+#include <json.h>
+ /* For struct json_object_iter, should not be necessary in future versions */
+ #include <json/json_object_private.h>
+ 
+diff --git a/runtime/msg.c b/runtime/msg.c
+index 68577ad..664abb9 100644
+--- a/runtime/msg.c
+++ b/runtime/msg.c
+@@ -41,7 +41,7 @@
+ #endif
+ #include <netdb.h>
+ #include <libestr.h>
+-#include <json/json.h>
+#include <json.h>
+ /* For struct json_object_iter, should not be necessary in future versions */
+ #include <json/json_object_private.h>
+ #if HAVE_MALLOC_H
+diff --git a/runtime/msg.h b/runtime/msg.h
+index 564441b..caa825f 100644
+--- a/runtime/msg.h
+++ b/runtime/msg.h
+@@ -30,7 +30,7 @@
+ 
+ #include <pthread.h>
+ #include <libestr.h>
+-#include <json/json.h>
+#include <json.h>
+ #include "obj.h"
+ #include "syslogd-types.h"
+ #include "template.h"
+diff --git a/template.c b/template.c
+index 1ccb375..974aba3 100644
+--- a/template.c
+++ b/template.c
+@@ -34,7 +34,7 @@
+ #include <string.h>
+ #include <ctype.h>
+ #include <assert.h>
+-#include <json/json.h>
+#include <json.h>
+ #include "stringbuf.h"
+ #include "syslogd-types.h"
+ #include "template.h"
+diff --git a/template.h b/template.h
+index 018e2f5..c87e7a8 100644
+--- a/template.h
+++ b/template.h
+@@ -30,7 +30,7 @@
+ #ifndef	TEMPLATE_H_INCLUDED
+ #define	TEMPLATE_H_INCLUDED 1
+ 
+-#include <json/json.h>
+#include <json.h>
+ #include <libestr.h>
+ #include "regexp.h"
+ #include "stringbuf.h"
+-- 
+1.8.1.2
+
--- a/app-admin/rsyslog/metadata.xml
+++ b/app-admin/rsyslog/metadata.xml
@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>ultrabug@gentoo.org</email>
-  <name>Alexys Jacob</name>
-  <description>Primary Maintainer</description>
-</maintainer>
-<use>
-	<flag name='extras'>Add support for the UDP spoofing module (omudpspoof) using <pkg>net-libs/libnet</pkg></flag>
-	<flag name='relp'>Add support for the Reliable Event Logging Protocol using <pkg>dev-libs/librelp</pkg></flag>
-	<flag name='zeromq'>Add support for the ZeroMQ input and output plugins using <pkg>net-libs/zeromq</pkg></flag>
-</use>
+  <maintainer>
+    <email>ultrabug@gentoo.org</email>
+    <name>Alexys Jacob</name>
+    <description>Primary Maintainer</description>
+  </maintainer>
+  <use>
+    <flag name="extras">Add support for the UDP spoofing module (omudpspoof) using <pkg>net-libs/libnet</pkg></flag>
+    <flag name="relp">Add support for the Reliable Event Logging Protocol using <pkg>dev-libs/librelp</pkg></flag>
+    <flag name="zeromq">Add support for the ZeroMQ input and output plugins using <pkg>net-libs/zeromq</pkg></flag>
+  </use>
 </pkgmetadata>
--- a/app-admin/rsyslog/rsyslog-7.2.5.ebuild
+++ b/app-admin/rsyslog/rsyslog-7.2.5.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-7.2.5.ebuild,v 1.1 2013/01/21 13:13:22 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-7.2.5.ebuild,v 1.2 2013/02/12 12:06:16 jlec Exp $

 EAPI=4
 AUTOTOOLS_AUTORECONF=yes
@ -47,13 +47,16 @@ AUTOTOOLS_IN_SOURCE_BUILD=1

 DOCS=(AUTHORS ChangeLog doc/rsyslog-example.conf)

+PATCHES=(
+	"${FILESDIR}"/${P}-json-c-pkgconfig.patch
+
+	# Fix runtime UUID/JSON libs linking
+	"${FILESDIR}"/6-stable/${PN}-6.6.0-fix-runtime.patch	)
+
 src_prepare() {
 	# Don't force '-g' CFLAG
 	sed -e 's/CFLAGS="\(.*\) -g"/CFLAGS="\1"/g' -i configure.ac || die

-	# Fix runtime UUID/JSON libs linking
-	epatch "${FILESDIR}/6-stable/${PN}-6.6.0-fix-runtime.patch"
-
 	autotools-utils_src_prepare
 }

--- a/app-admin/usbview/usbview-2.0.ebuild
+++ b/app-admin/usbview/usbview-2.0.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/usbview/usbview-2.0.ebuild,v 1.7 2013/02/10 17:23:33 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/usbview/usbview-2.0.ebuild,v 1.10 2013/02/12 22:01:54 jer Exp $

 EAPI=4
 inherit eutils linux-info
@ -11,7 +11,7 @@ SRC_URI="http://www.kroah.com/linux-usb/${P}.tar.gz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
 IUSE=""

 RDEPEND="x11-libs/gtk+:3"
--- a/app-editors/mp/mp-5.2.2.ebuild
+++ b/app-editors/mp/mp-5.2.2.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/mp/mp-5.2.2.ebuild,v 1.8 2013/02/10 17:20:00 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/mp/mp-5.2.2.ebuild,v 1.9 2013/02/12 20:25:58 ago Exp $

 EAPI=4

@ -12,7 +12,7 @@ SRC_URI="http://www.triptico.com/download/${P}.tar.gz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ia64 ppc ppc64 ~sparc x86 ~x86-interix ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-interix ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE="gtk iconv kde ncurses nls pcre qt4"

 MP_LINGUAS="de es it nl ru sv"
--- a/app-editors/qxmledit/qxmledit-0.8.3.1.ebuild
+++ b/app-editors/qxmledit/qxmledit-0.8.3.1.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/qxmledit/qxmledit-0.8.3.1.ebuild,v 1.1 2012/10/29 10:36:45 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/qxmledit/qxmledit-0.8.3.1.ebuild,v 1.3 2013/02/12 14:20:29 ago Exp $

 EAPI=4

@ -14,7 +14,7 @@ SRC_URI="http://${PN}.googlecode.com/files/${MY_P}.tgz"

 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"

 DEPEND=">=x11-libs/qt-core-4.7:4
--- a/app-emacs/ddskk/ddskk-14.2.ebuild
+++ b/app-emacs/ddskk/ddskk-14.2.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/ddskk/ddskk-14.2.ebuild,v 1.1 2011/05/14 23:14:07 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/ddskk/ddskk-14.2.ebuild,v 1.2 2013/02/12 07:56:05 naota Exp $

 EAPI=3

@ -15,7 +15,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""

-DEPEND=">=app-emacs/apel-10.7"
+DEPEND="|| ( ( =virtual/emacs-21 >=app-emacs/apel-10.7 )
+			 >=virtual/emacs-22 )"
 RDEPEND="${DEPEND}
 	|| ( app-i18n/skk-jisyo virtual/skkserv )"

--- a/app-emacs/ddskk/ddskk-14.3.ebuild
+++ b/app-emacs/ddskk/ddskk-14.3.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/ddskk/ddskk-14.3.ebuild,v 1.4 2012/03/08 09:01:20 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/ddskk/ddskk-14.3.ebuild,v 1.5 2013/02/12 07:56:05 naota Exp $

 EAPI=3

@ -15,7 +15,8 @@ SLOT="0"
 KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""

-DEPEND=">=app-emacs/apel-10.7"
+DEPEND="|| ( ( =virtual/emacs-21 >=app-emacs/apel-10.7 )
+			 >=virtual/emacs-22 )"
 RDEPEND="${DEPEND}
 	|| ( app-i18n/skk-jisyo virtual/skkserv )"

--- a/app-emacs/ddskk/ddskk-14.4.ebuild
+++ b/app-emacs/ddskk/ddskk-14.4.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/ddskk/ddskk-14.4.ebuild,v 1.1 2013/01/15 07:54:21 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/ddskk/ddskk-14.4.ebuild,v 1.2 2013/02/12 07:56:05 naota Exp $

 EAPI=3

@ -15,7 +15,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""

-DEPEND=">=app-emacs/apel-10.7"
+DEPEND="|| ( ( =virtual/emacs-21 >=app-emacs/apel-10.7 )
+			 >=virtual/emacs-22 )"
 RDEPEND="${DEPEND}
 	|| ( app-i18n/skk-jisyo virtual/skkserv )"

--- a/app-emacs/ocaml-mode/ocaml-mode-3.12.1-r1.ebuild
+++ b/app-emacs/ocaml-mode/ocaml-mode-3.12.1-r1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/ocaml-mode/ocaml-mode-3.12.1-r1.ebuild,v 1.5 2013/02/11 11:15:51 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/ocaml-mode/ocaml-mode-3.12.1-r1.ebuild,v 1.10 2013/02/12 20:22:53 ago Exp $

 EAPI=5

@ -13,7 +13,7 @@ SRC_URI="http://caml.inria.fr/distrib/${MY_P%.*}/${MY_P}.tar.bz2"

 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"

 S="${WORKDIR}/${MY_P}/emacs"
 SITEFILE="50${PN}-gentoo-${PV}.el"
--- a/app-emulation/xen-tools/xen-tools-4.2.1-r2.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.2.1-r2.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.2.1-r2.ebuild,v 1.4 2013/02/11 15:26:37 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.2.1-r2.ebuild,v 1.5 2013/02/12 06:34:04 idella4 Exp $

 EAPI=5

@ -195,7 +195,10 @@ src_prepare() {
 	#Sec patch, currently valid
 	epatch "${FILESDIR}"/xen-4-CVE-2012-6075-XSA-41.patch

-	use hvm && cp -r "${FILESDIR}"/stubs-32.h xen/tools/include && einfo "stubs-32.h added" || die
+	if use hvm; then
+		cp -r "${FILESDIR}"/stubs-32.h xen/tools/include || die "copy of header file failed"
+		einfo "stubs-32.h added"
+	fi
 }

 src_compile() {
--- a/app-i18n/mecab-skkserv/files/mecab-skkserv-0.03-dicrc.patch
+++ b/app-i18n/mecab-skkserv/files/mecab-skkserv-0.03-dicrc.patch
@ -0,0 +1,9 @@
+diff --git a/dicrc b/dicrc
+index cb6a53e..7f06086 100644
+--- a/dicrc
+++ b/dicrc
+@@ -2,3 +2,4 @@ bos-feature = BOS/EOS
+ node-format-ime = %H
+ unk-format-ime = %M
+ eos-format-ime  = \n
+cost-factor = 700
--- a/app-i18n/mecab-skkserv/mecab-skkserv-0.03.ebuild
+++ b/app-i18n/mecab-skkserv/mecab-skkserv-0.03.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/mecab-skkserv/mecab-skkserv-0.03.ebuild,v 1.4 2012/08/28 07:32:45 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/mecab-skkserv/mecab-skkserv-0.03.ebuild,v 1.5 2013/02/12 11:07:37 naota Exp $

 EAPI=4

@ -22,7 +22,10 @@ RDEPEND="${DEPEND}

 DOCS=( README NEWS AUTHORS )
 HTML_DOCS=( index.html )
-PATCHES=( "${FILESDIR}"/${P}-cflags.patch )
+PATCHES=( 
+	"${FILESDIR}"/${P}-cflags.patch
+	"${FILESDIR}"/${P}-dicrc.patch
+	)
 AUTOTOOLS_AUTORECONF=1
 AUTOTOOLS_IN_SOURCE_BUILD=1

--- a/app-i18n/skk-jisyo/skk-jisyo-200705.ebuild
+++ b/app-i18n/skk-jisyo/skk-jisyo-200705.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/skk-jisyo/skk-jisyo-200705.ebuild,v 1.14 2011/02/13 19:13:25 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/skk-jisyo/skk-jisyo-200705.ebuild,v 1.15 2013/02/12 09:36:14 naota Exp $

 DESCRIPTION="Jisyo (dictionary) files for the SKK Japanese-input software"
 HOMEPAGE="http://openlab.ring.gr.jp/skk/dic.html"
@ -32,9 +32,9 @@ src_compile() {

 	for f in SKK-JISYO.* zipcode/SKK-JISYO.* ; do
 		mv ${f} ${f}.annotated
-		awk -f "${FILESDIR}"/unannotation.awk ${f}.annotated > $(basename ${f}) || die
+		gawk -f "${FILESDIR}"/unannotation.awk ${f}.annotated > $(basename ${f}) || die
 		if use cdb ; then
-			awk '
+			gawk '
 				/^[^;]/ {
 					s = substr($0, index($0, " ") + 1)
 					print "+" length($1) "," length(s) ":" $1 "->" s
--- a/app-i18n/skk-jisyo/skk-jisyo-200812.ebuild
+++ b/app-i18n/skk-jisyo/skk-jisyo-200812.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/skk-jisyo/skk-jisyo-200812.ebuild,v 1.7 2011/02/13 19:13:25 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/skk-jisyo/skk-jisyo-200812.ebuild,v 1.8 2013/02/12 09:36:14 naota Exp $

 DESCRIPTION="Jisyo (dictionary) files for the SKK Japanese-input software"
 HOMEPAGE="http://openlab.ring.gr.jp/skk/dic.html"
@ -32,9 +32,9 @@ src_compile() {

 	for f in SKK-JISYO.* zipcode/SKK-JISYO.* ; do
 		mv ${f} ${f}.annotated
-		awk -f "${FILESDIR}"/unannotation.awk ${f}.annotated > $(basename ${f}) || die
+		gawk -f "${FILESDIR}"/unannotation.awk ${f}.annotated > $(basename ${f}) || die
 		if use cdb ; then
-			awk '
+			gawk '
 				/^[^;]/ {
 					s = substr($0, index($0, " ") + 1)
 					print "+" length($1) "," length(s) ":" $1 "->" s
--- a/app-i18n/skk-jisyo/skk-jisyo-201101.ebuild
+++ b/app-i18n/skk-jisyo/skk-jisyo-201101.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/skk-jisyo/skk-jisyo-201101.ebuild,v 1.6 2011/03/23 17:51:18 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/skk-jisyo/skk-jisyo-201101.ebuild,v 1.7 2013/02/12 09:36:15 naota Exp $

 EAPI="3"

@ -32,9 +32,9 @@ src_compile() {

 	for f in SKK-JISYO.* zipcode/SKK-JISYO.* ; do
 		mv ${f} ${f}.annotated
-		awk -f "${FILESDIR}"/unannotation.awk ${f}.annotated > $(basename ${f}) || die
+		gawk -f "${FILESDIR}"/unannotation.awk ${f}.annotated > $(basename ${f}) || die
 		if use cdb ; then
-			awk '
+			gawk '
 				/^[^;]/ {
 					s = substr($0, index($0, " ") + 1)
 					print "+" length($1) "," length(s) ":" $1 "->" s
--- a/app-i18n/skk-jisyo/skk-jisyo-9999.ebuild
+++ b/app-i18n/skk-jisyo/skk-jisyo-9999.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/skk-jisyo/skk-jisyo-9999.ebuild,v 1.4 2011/02/13 19:13:25 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/skk-jisyo/skk-jisyo-9999.ebuild,v 1.5 2013/02/12 09:36:15 naota Exp $

 ECVS_SERVER="openlab.jp:/circus/cvsroot"
 ECVS_USER="guest"
@ -42,9 +42,9 @@ src_compile() {

 	for f in SKK-JISYO.* zipcode/SKK-JISYO.* ; do
 		mv ${f} ${f}.annotated
-		awk -f "${FILESDIR}"/unannotation.awk ${f}.annotated > $(basename ${f}) || die
+		gawk -f "${FILESDIR}"/unannotation.awk ${f}.annotated > $(basename ${f}) || die
 		if use cdb ; then
-			awk '
+			gawk '
 				/^[^;]/ {
 					s = substr($0, index($0, " ") + 1)
 					print "+" length($1) "," length(s) ":" $1 "->" s
--- a/app-i18n/skkfep/skkfep-0.86c.ebuild
+++ b/app-i18n/skkfep/skkfep-0.86c.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/skkfep/skkfep-0.86c.ebuild,v 1.8 2011/02/14 20:46:29 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/skkfep/skkfep-0.86c.ebuild,v 1.9 2013/02/12 08:43:53 naota Exp $

 inherit eutils

@ -18,7 +18,7 @@ KEYWORDS="ppc x86"
 IUSE=""

 DEPEND=">=sys-apps/sed-4
-	sys-apps/gawk
+	virtual/awk
 	sys-libs/ncurses"
 RDEPEND="virtual/skkserv"

--- a/app-i18n/skkfep/skkfep-0.87-r1.ebuild
+++ b/app-i18n/skkfep/skkfep-0.87-r1.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/skkfep/skkfep-0.87-r1.ebuild,v 1.6 2012/03/25 14:32:59 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/skkfep/skkfep-0.87-r1.ebuild,v 1.7 2013/02/12 08:43:53 naota Exp $

 EAPI=4
 inherit eutils toolchain-funcs
@ -17,7 +17,7 @@ IUSE=""
 RDEPEND=">=sys-libs/ncurses-5.7-r7"
 DEPEND="${RDEPEND}
 	>=sys-apps/sed-4
-	sys-apps/gawk"
+	virtual/awk"
 RDEPEND="${RDEPEND}
 	app-i18n/skk-jisyo"

--- a/app-i18n/skkfep/skkfep-0.87.ebuild
+++ b/app-i18n/skkfep/skkfep-0.87.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/skkfep/skkfep-0.87.ebuild,v 1.4 2011/02/14 20:46:29 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/skkfep/skkfep-0.87.ebuild,v 1.5 2013/02/12 08:43:53 naota Exp $

 inherit eutils

@ -17,7 +17,7 @@ KEYWORDS="~ppc ~x86"
 IUSE=""

 DEPEND=">=sys-apps/sed-4
-	sys-apps/gawk
+	virtual/awk
 	sys-libs/ncurses"
 RDEPEND="virtual/skkserv"

--- a/app-laptop/thinkfan/Manifest
+++ b/app-laptop/thinkfan/Manifest
@ -1,2 +1,2 @@
-DIST thinkfan-0.8.0.tar.gz 38396 SHA256 aa4062bdb1114224c372afc3796ffd5b0ae40d4442fc17e15af8876d0e7885ed SHA512 0d014b74a0fa43e02ecc139e5f1a49febaa6ca101cb095d96ac7cb994de4979eab96608ee9decdaa55959884e4976518b5e17267afd2944781c121fca49f902f WHIRLPOOL dc367d788861744d08788db9aeff3a0742b222d16eaffb7f7630bda8509bad6c2f1034ba72081afefd9e2a30b231a185f2de9658a7edfd3b038d0af4e829f506
 DIST thinkfan-0.8.1.tar.gz 38417 SHA256 ba630fdcdefa238b2c87f050f6fcbd5a4828527497d52d410761a26c8ca25311 SHA512 6e5c7df599ca6f1c99cf61bfafb752f5886a7eeff9166a43006ea8d86f82ff8c4d5eb6ddc2e62dc5d01235038b4606fbbfc849f81b971388ccbe6417ee9f3208 WHIRLPOOL 975eee0b64db52bbd5552a540aff035abe36bd8a602ec6f966ec30a9ffd1bc9ef30481b91f37c6c3f771a2ba0b38850d7d4dc40387c475deffa7850288d122b4
+DIST thinkfan-0.9_beta2.tar.gz 41554 SHA256 0db4a0e56c02b991be13741f622a8e475a8361112ff9a38a0430ccc22f104a39 SHA512 3cf1b33de625a663b32482943f99dba88cc09106c1b96701ba6a36a5ea1abb3cfd8b32c3822af93d1cf19ab25c61370abca5bd0b313a9fb055dd191086c1df01 WHIRLPOOL 1a8e71fb0906fb11c5922f09e6136f48cbcb7128525fafeeb7f3474f01a00eeb046f69b2d5788428828a395dbc11ae084e9655259a1a74f6aafe04ca8417d4ad
--- a/app-laptop/thinkfan/files/thinkfan-0.7.3-makefile.patch
+++ b/app-laptop/thinkfan/files/thinkfan-0.7.3-makefile.patch
@ -1,28 +0,0 @@
--- thinkfan-0.7.3/Makefile
-+++ thinkfan-0.7.3/Makefile
-@@ -1,20 +1,12 @@
- .DEFAULT_GOAL := thinkfan
- 
-thinkfan:	system.o parser.o config.o thinkfan.o message.o
-			gcc $(CFLAGS) -Wall -o thinkfan system.o config.o parser.o \
-			thinkfan.o message.o
-
-message.o:	message.c globaldefs.h
-			gcc $(CFLAGS) -Wall -c message.c
-+CC ?= gcc
- 
-system.o:	system.c system.h message.h globaldefs.h parser.h
-			gcc $(CFLAGS) -Wall -c system.c
-
-config.o:	config.c config.h message.h globaldefs.h system.h parser.h
-			gcc $(CFLAGS) -Wall -c config.c
-+thinkfan:	system.o parser.o config.o thinkfan.o message.o
-+		$(CC) $(LDFLAGS) -Wall -o $@ $^
- 
-thinkfan.o:	thinkfan.c thinkfan.h message.h globaldefs.h config.h
-			gcc $(CFLAGS) -Wall -c thinkfan.c
-+%.o:	%.c
-+		$(CC) $(CFLAGS) -Wall -c -o $@ $<
- 
- clean:
- 		rm -rf *.o thinkfan
--- a/app-laptop/thinkfan/files/thinkfan-0.7.3-openrc.patch
+++ b/app-laptop/thinkfan/files/thinkfan-0.7.3-openrc.patch
@ -1,11 +0,0 @@
--- thinkfan-0.7.3/rcscripts/thinkfan.gentoo
-+++ thinkfan-0.7.3/rcscripts/thinkfan.gentoo
-@@ -3,7 +3,7 @@
- # Distributed under the terms of the GNU General Public License v2
- # $Header: /var/cvsroot/gentoo-x86/app-laptop/thinkfan/files/thinkfan-0.7.3-openrc.patch,v 1.1 2012/02/13 02:27:51 xmw Exp $
- 
-opts="reload"
-+extra_started_commands="reload"
- 
- depend() {
- 	after modules
--- a/app-laptop/thinkfan/metadata.xml
+++ b/app-laptop/thinkfan/metadata.xml
@ -5,5 +5,8 @@
 <email>xmw@gentoo.org</email>
 <name>Michael Weber</name>
 </maintainer>
+<use>
+	<flag name="atasmart">include libatasmart support to get disc temperature</flag>
+</use>
 </pkgmetadata>

--- a/app-laptop/thinkfan/thinkfan-0.8.0.ebuild
+++ b/app-laptop/thinkfan/thinkfan-0.8.0.ebuild
@ -1,38 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/thinkfan/thinkfan-0.8.0.ebuild,v 1.3 2012/06/20 06:42:06 jdhore Exp $
-
-EAPI=4
-
-inherit toolchain-funcs
-
-DESCRIPTION="simple fan control program for thinkpads"
-HOMEPAGE="http://thinkfan.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-src_prepare() {
-	tc-export CC
-}
-
-src_install() {
-	dosbin ${PN}
-
-	newinitd rcscripts/thinkfan.gentoo ${PN}
-
-	doman ${PN}.1
-	dodoc ChangeLog NEWS README \
-		examples/${PN}.conf.{complex,sysfs,thinkpad}
-}
-
-pkg_postinst() {
-	elog "Please read the documentation and copy an"
-	elog "appropriate file to /etc/thinkfan.conf."
-}
--- a/app-laptop/thinkfan/thinkfan-0.8.1.ebuild
+++ b/app-laptop/thinkfan/thinkfan-0.8.1.ebuild
@ -1,38 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/thinkfan/thinkfan-0.8.1.ebuild,v 1.1 2012/10/06 09:46:11 xmw Exp $
-
-EAPI=4
-
-inherit toolchain-funcs
-
-DESCRIPTION="simple fan control program for thinkpads"
-HOMEPAGE="http://thinkfan.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-src_prepare() {
-	tc-export CC
-}
-
-src_install() {
-	dosbin ${PN}
-
-	newinitd rcscripts/thinkfan.gentoo ${PN}
-
-	doman ${PN}.1
-	dodoc ChangeLog NEWS README \
-		examples/${PN}.conf.{complex,sysfs,thinkpad}
-}
-
-pkg_postinst() {
-	elog "Please read the documentation and copy an"
-	elog "appropriate file to /etc/thinkfan.conf."
-}
--- a/app-laptop/thinkfan/thinkfan-0.9_beta2.ebuild
+++ b/app-laptop/thinkfan/thinkfan-0.9_beta2.ebuild
@ -0,0 +1,50 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/thinkfan/thinkfan-0.9_beta2.ebuild,v 1.1 2013/02/12 19:52:39 xmw Exp $
+
+EAPI=4
+
+inherit cmake-utils systemd
+
+DESCRIPTION="simple fan control program for thinkpads"
+HOMEPAGE="http://thinkfan.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="atasmart systemd"
+
+DEPEND="dev-libs/libatasmart"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.8.1-openrc.patch
+	sed -e '/^set(CMAKE_C_FLAGS/d' \
+		-i CMakeLists.txt || die
+}
+
+src_configure() {
+	mycmakeargs+=(
+		"-DCMAKE_BUILD_TYPE:STRING=Debug"
+		"$(cmake-utils_use_use atasmart ATASMART)"
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	dosbin "${BUILD_DIR}"/${PN}
+
+	newinitd rcscripts/${PN}.gentoo ${PN}
+	systemd_dounit rcscripts/${PN}.service
+
+	doman ${PN}.1
+	dodoc ChangeLog NEWS README \
+		examples/${PN}.conf.{complex,simple}
+}
+
+pkg_postinst() {
+	elog "Please read the documentation and copy an"
+	elog "appropriate file to /etc/thinkfan.conf."
+}
--- a/app-misc/spacenavd/spacenavd-0.5-r4.ebuild
+++ b/app-misc/spacenavd/spacenavd-0.5-r4.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/spacenavd/spacenavd-0.5-r4.ebuild,v 1.5 2013/02/10 20:48:24 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/spacenavd/spacenavd-0.5-r4.ebuild,v 1.6 2013/02/12 16:51:06 ago Exp $

 EAPI="4"

@ -12,7 +12,7 @@ HOMEPAGE="http://spacenav.sourceforge.net/"
 SRC_URI="mirror://sourceforge/project/${MY_PN}/${MY_PN}%20daemon/${PN}%20${PV}/${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
+KEYWORDS="amd64 ppc64 x86"
 IUSE="X"

 RDEPEND="X? ( x11-apps/xdpyinfo )"
--- a/app-portage/g-cpan/g-cpan-0.16.4-r1.ebuild
+++ b/app-portage/g-cpan/g-cpan-0.16.4-r1.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/g-cpan/g-cpan-0.16.4-r1.ebuild,v 1.1 2012/06/17 12:49:58 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/g-cpan/g-cpan-0.16.4-r1.ebuild,v 1.7 2013/02/12 20:19:47 ago Exp $

 EAPI=4

@ -13,7 +13,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz

 LICENSE="|| ( Artistic GPL-2 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="alpha ~amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc ~x86"
 IUSE=""

 DEPEND="dev-lang/perl
--- a/app-portage/porthole/porthole-0.6.1-r1.ebuild
+++ b/app-portage/porthole/porthole-0.6.1-r1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/porthole/porthole-0.6.1-r1.ebuild,v 1.10 2013/01/11 19:21:12 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/porthole/porthole-0.6.1-r1.ebuild,v 1.11 2013/02/12 19:32:43 ago Exp $

 EAPI="2"
 PYTHON_DEPEND="2"
@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/porthole/${P}.tar.bz2"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc ~sparc x86 ~x86-fbsd"
+KEYWORDS="amd64 arm ppc ~sparc x86 ~x86-fbsd"
 IUSE="nls"
 LANGS="de pl ru vi it fr tr"
 for X in $LANGS; do IUSE="${IUSE} linguas_${X}"; done
--- a/app-portage/splat/splat-0.08-r1.ebuild
+++ b/app-portage/splat/splat-0.08-r1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/splat/splat-0.08-r1.ebuild,v 1.6 2013/02/10 17:17:54 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/splat/splat-0.08-r1.ebuild,v 1.7 2013/02/13 00:08:48 ago Exp $

 EAPI=5

@ -12,7 +12,7 @@ SRC_URI="http://www.l8nite.net/projects/splat/downloads/${P}.tar.bz2"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ~mips ppc ppc64 ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 hppa ~mips ppc ppc64 ~sparc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""

 DEPEND="dev-lang/perl"
--- a/app-shells/rrs/rrs-1.70-r1.ebuild
+++ b/app-shells/rrs/rrs-1.70-r1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/rrs/rrs-1.70-r1.ebuild,v 1.4 2013/02/10 20:47:21 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/rrs/rrs-1.70-r1.ebuild,v 1.5 2013/02/12 16:58:57 ago Exp $

 EAPI=4

@ -12,7 +12,7 @@ SRC_URI="http://www.cycom.se/uploads/36/19/${P}.tar.gz"

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

 DEPEND="ssl? ( dev-libs/openssl )"
--- a/app-text/gnome-doc-utils/gnome-doc-utils-0.20.10.ebuild
+++ b/app-text/gnome-doc-utils/gnome-doc-utils-0.20.10.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/gnome-doc-utils/gnome-doc-utils-0.20.10.ebuild,v 1.10 2012/07/15 16:33:30 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/gnome-doc-utils/gnome-doc-utils-0.20.10.ebuild,v 1.11 2013/02/12 07:16:21 tetromino Exp $

 EAPI="4"
 GCONF_DEBUG="no"
@ -22,12 +22,12 @@ RDEPEND=">=dev-libs/libxml2-2.6.12[python]
 	 >=dev-libs/libxslt-1.1.8
 "
 DEPEND="${RDEPEND}
-	>=sys-apps/gawk-3
-	sys-devel/gettext
 	>=dev-util/intltool-0.35
-	virtual/pkgconfig
 	app-text/docbook-xml-dtd:4.4
-	app-text/scrollkeeper-dtd"
+	app-text/scrollkeeper-dtd
+	sys-devel/gettext
+	virtual/awk
+	virtual/pkgconfig"
 # dev-libs/glib needed for eautofoo, bug #255114.

 # If there is a need to reintroduce eautomake or eautoreconf, make sure
--- a/app-text/gnome-doc-utils/gnome-doc-utils-0.20.6.ebuild
+++ b/app-text/gnome-doc-utils/gnome-doc-utils-0.20.6.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/gnome-doc-utils/gnome-doc-utils-0.20.6.ebuild,v 1.10 2012/05/04 03:33:11 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/gnome-doc-utils/gnome-doc-utils-0.20.6.ebuild,v 1.11 2013/02/12 07:16:21 tetromino Exp $

 EAPI="3"
 GCONF_DEBUG="no"
@ -22,11 +22,12 @@ RDEPEND=">=dev-libs/libxml2-2.6.12[python]
 	 >=dev-libs/libxslt-1.1.8
 "
 DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=dev-util/intltool-0.35
-	virtual/pkgconfig
 	~app-text/docbook-xml-dtd-4.4
-	app-text/scrollkeeper-dtd"
+	app-text/scrollkeeper-dtd
+	>=dev-util/intltool-0.35
+	sys-devel/gettext
+	virtual/awk
+	virtual/pkgconfig"
 # dev-libs/glib needed for eautofoo, bug #255114.

 # FIXME: Highly broken with parallel make, see bug #286889
--- a/app-text/gnome-doc-utils/gnome-doc-utils-0.20.9.ebuild
+++ b/app-text/gnome-doc-utils/gnome-doc-utils-0.20.9.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/gnome-doc-utils/gnome-doc-utils-0.20.9.ebuild,v 1.2 2012/05/04 03:33:11 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/gnome-doc-utils/gnome-doc-utils-0.20.9.ebuild,v 1.3 2013/02/12 07:16:21 tetromino Exp $

 EAPI="4"
 GCONF_DEBUG="no"
@ -22,12 +22,12 @@ RDEPEND=">=dev-libs/libxml2-2.6.12[python]
 	 >=dev-libs/libxslt-1.1.8
 "
 DEPEND="${RDEPEND}
-	>=sys-apps/gawk-3
-	sys-devel/gettext
-	>=dev-util/intltool-0.35
-	virtual/pkgconfig
 	app-text/docbook-xml-dtd:4.4
-	app-text/scrollkeeper-dtd"
+	app-text/scrollkeeper-dtd
+	>=dev-util/intltool-0.35
+	sys-devel/gettext
+	virtual/awk
+	virtual/pkgconfig"
 # dev-libs/glib needed for eautofoo, bug #255114.

 # If there is a need to reintroduce eautomake or eautoreconf, make sure
--- a/app-text/lcdf-typetools/lcdf-typetools-2.97.ebuild
+++ b/app-text/lcdf-typetools/lcdf-typetools-2.97.ebuild
@ -1,13 +1,13 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/lcdf-typetools/lcdf-typetools-2.97.ebuild,v 1.2 2013/02/11 11:28:03 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/lcdf-typetools/lcdf-typetools-2.97.ebuild,v 1.9 2013/02/12 20:24:01 ago Exp $

 EAPI=2

 DESCRIPTION="Font utilities for eg manipulating OTF"
 SRC_URI="http://www.lcdf.org/type/${P}.tar.gz"
 HOMEPAGE="http://www.lcdf.org/type/#typetools"
-KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 LICENSE="GPL-2"
 IUSE="+kpathsea"
--- a/app-text/migemo/migemo-0.40-r5.ebuild
+++ b/app-text/migemo/migemo-0.40-r5.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/migemo/migemo-0.40-r5.ebuild,v 1.3 2013/02/11 00:55:09 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/migemo/migemo-0.40-r5.ebuild,v 1.4 2013/02/12 16:20:31 jer Exp $

 EAPI=4
 # ruby19, jruby: dev-ruby/ruby-romkan not work
@ -14,7 +14,7 @@ SRC_URI="http://0xcc.net/migemo/stable/${P}.tar.gz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="emacs"

 ruby_add_bdepend "dev-ruby/ruby-romkan dev-ruby/bsearch"
--- a/app-vim/bufexplorer/Manifest
+++ b/app-vim/bufexplorer/Manifest
@ -0,0 +1,2 @@
+DIST bufexplorer-7.2.8.zip 18603 SHA256 d53e41dec50bca90a9a4aca2ed2d3ab4f9eee5ced9a0984ea6fe697455ca2c2d SHA512 915c58e9f23cf0447e8df294455f0c5f0e07c9b9ad78c91f2012fa50148b2a00c2d761ce868e39d8a4ee019f9fdc80cf75f34b5ad8e9df9809d74e3cd4055568 WHIRLPOOL c1042fe059cd1ac15031b5c89cd4da6b13e694e9b197d4733af1a7dcc930ab2fb99a851c3447d26502bbb39b5c50b3c523d4ae0241404960d1d5fa5f9e72fe0d
+DIST bufexplorer-7.3.5.zip 20128 SHA256 1952057fb1a65c69efdd69b01bab0eef7dc1c1605f0dc764b7801069ae5c6397 SHA512 db67eb5c9e48250326fc589fc09568668bae5b6c46fec8b4e3c860f463e6d2e430df9105379cd8d8925bf789b9ce084d7a0320110538e75eebadc70ff4aac8fe WHIRLPOOL 10661bf87be97db22d65695d1668ba67cbd5879b8b7a8cdc1073591952eb7081a0283aa94a4a4b99244900f8d077c1ea35a8683668d51b9f8c3f9cf420ac2430
--- a/app-vim/bufferexplorer/bufferexplorer-7.2.8.ebuild
+++ b/app-vim/bufferexplorer/bufferexplorer-7.2.8.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-vim/bufferexplorer/bufferexplorer-7.2.8.ebuild,v 1.2 2012/12/22 08:14:53 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-vim/bufexplorer/bufexplorer-7.2.8.ebuild,v 1.1 2013/02/12 11:08:01 radhermit Exp $

 EAPI="2"

--- a/app-vim/bufferexplorer/bufferexplorer-7.2.7.ebuild
+++ b/app-vim/bufferexplorer/bufferexplorer-7.2.7.ebuild
@ -1,22 +1,19 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-vim/bufferexplorer/bufferexplorer-7.2.7.ebuild,v 1.3 2012/12/22 08:14:53 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-vim/bufexplorer/bufexplorer-7.3.5.ebuild,v 1.1 2013/02/12 11:12:53 radhermit Exp $

-EAPI="2"
+EAPI=5

-VIM_PLUGIN_VIM_VERSION="7.0"
 inherit vim-plugin

 DESCRIPTION="vim plugin: easily browse vim buffers"
 HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=42"
-SRC_URI="http://www.vim.org/scripts/download_script.php?src_id=12904 -> ${P}.zip"
+SRC_URI="http://www.vim.org/scripts/download_script.php?src_id=19481 -> ${P}.zip"
 LICENSE="bufexplorer.vim"
 KEYWORDS="~amd64 ~x86"
-IUSE=""

-S="${WORKDIR}"
+S=${WORKDIR}

-VIM_PLUGIN_HELPFILES="bufexplorer"
+VIM_PLUGIN_HELPFILES="${PN}"

 DEPEND="app-arch/unzip"
-RDEPEND=""
--- a/app-vim/bufferexplorer/metadata.xml
+++ b/app-vim/bufferexplorer/metadata.xml
--- a/app-vim/bufferexplorer/Manifest
+++ b/app-vim/bufferexplorer/Manifest
@ -1,2 +0,0 @@
-DIST bufferexplorer-7.2.7.zip 18042 SHA256 e35240bc0b2beb262a50b8936c8bc069565b23a1d111879260be94bf48a0025c SHA512 dfe65e611169950cfe3b8cd1dbfe139faab39c63128c9e5a7766d46bdda19e5537c91bb37cdbdd60f126b32d1dcb7570da927e236455ac36952ba45a62fb0918 WHIRLPOOL 9ce5f988b122a3e523221c4d85aa2efca65d7e5726b49071ce8eb1dcfd46f2dd916d9bee4c2a6c9489be8491490c56a79beb1dd373d0e484bc554cb0415de1c2
-DIST bufferexplorer-7.2.8.zip 18603 SHA256 d53e41dec50bca90a9a4aca2ed2d3ab4f9eee5ced9a0984ea6fe697455ca2c2d SHA512 915c58e9f23cf0447e8df294455f0c5f0e07c9b9ad78c91f2012fa50148b2a00c2d761ce868e39d8a4ee019f9fdc80cf75f34b5ad8e9df9809d74e3cd4055568 WHIRLPOOL c1042fe059cd1ac15031b5c89cd4da6b13e694e9b197d4733af1a7dcc930ab2fb99a851c3447d26502bbb39b5c50b3c523d4ae0241404960d1d5fa5f9e72fe0d
--- a/app-vim/sleuth/Manifest
+++ b/app-vim/sleuth/Manifest
@ -1 +1,2 @@
 DIST sleuth-1.0.tar.bz2 1839 SHA256 8b5dd0c7254766a4a873abf0b8c8998eb9f57c2526164672426a3ba1f547ea40 SHA512 19fb158a28bfa02e7364208f11911d0afcda77f4a35a410202b0342130e48b99b52db56aa687b2484ba0ac9595970ae040c349e7a0fd350f07c40b6b58d43a13 WHIRLPOOL 9d7df8812ba68af3f735e45e7af64d260b34a05d4c43e31ed7bad7ad037bf9e9682a9547330b1a1bc599e727f86b26c165ce442143ea33ec7ef40008d3b1ee60
+DIST sleuth-1.1.tar.bz2 1972 SHA256 4ada9eef22debb07a5e01575f06a992faa8f0a6456e1dc66a2aa44be8d433788 SHA512 76a2bbb651452cb7a2336cebed5f7e8ff79e995bc7ba11d36089f7e58f607df031306bf38fd161e7af728aa6699b37fa8c2c322b8a8cfa7889dfaa3e96d400c9 WHIRLPOOL 58bee1be4f549277215ab84b8f41c03d1e840c2c0fb8fb3213a188b96c8605881efab0f3bd5618d9336390cf19e9310341c0d83639cab1a35da795fead6307a9
--- a/app-vim/sleuth/sleuth-1.1.ebuild
+++ b/app-vim/sleuth/sleuth-1.1.ebuild
@ -0,0 +1,14 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-vim/sleuth/sleuth-1.1.ebuild,v 1.1 2013/02/12 10:54:52 radhermit Exp $
+
+EAPI="5"
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: heuristically set buffer options"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=4375 https://github.com/tpope/vim-sleuth"
+LICENSE="vim"
+KEYWORDS="~amd64 ~x86"
+
+VIM_PLUGIN_HELPFILES="${PN}"
--- a/app-vim/splice/Manifest
+++ b/app-vim/splice/Manifest
@ -0,0 +1 @@
+DIST splice-1.0.1.tar.bz2 12369 SHA256 30e7d947defb29971d8c750670bbdae6625e2238d4f892e6b5590609d6a6a81a SHA512 65826a9054163f59d8dc0a558e3b748f27015bb6075e8d158214e6824c922599552a69c7d09364599285d6effdfc42fa6dd98e858a8bfa47ebc21a4d18394ede WHIRLPOOL a8e4405f5169857c07b81f0a778757aebd198f4c0e73f4cf239a451dfae64911d5fb164121413799a750646df609fcb864a08393510d012a84383261f6c006ab
--- a/app-vim/threesome/metadata.xml
+++ b/app-vim/threesome/metadata.xml
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>vim</herd>
+<herd>vim</herd>
 </pkgmetadata>
--- a/app-vim/splice/splice-1.0.1.ebuild
+++ b/app-vim/splice/splice-1.0.1.ebuild
@ -0,0 +1,26 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-vim/splice/splice-1.0.1.ebuild,v 1.1 2013/02/12 10:19:42 radhermit Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit vim-plugin python-single-r1
+
+DESCRIPTION="vim plugin: resolve conflicts during three-way merges"
+HOMEPAGE="http://sjl.bitbucket.org/splice.vim/ http://vim.sourceforge.net/scripts/script.php?script_id=4026"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="|| ( app-editors/vim[python] app-editors/gvim[python] )"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+src_prepare() {
+	rm LICENSE.markdown || die
+}
+
+src_install() {
+	vim-plugin_src_install
+	python_optimize "${ED}"/usr/share/vim/vimfiles/autoload/splicelib
+}
--- a/app-vim/threesome/Manifest
+++ b/app-vim/threesome/Manifest
@ -1 +0,0 @@
-DIST threesome-0.2.0.tar.gz 13333 SHA256 0733d40b3ad027ebc81822f8204bb048c5cd76b098c04f2ec2837eb48b50efbe SHA512 56e1683f372472354cabc1f3d36ccf3d9bd217d80e9ac5cbc1d2e1326387e12faffdfb9604429f0929582252482203bab713032ce2a34d4de70da428eb0940ba WHIRLPOOL 82a4118db6453e6a300ffde34320ca00b0220b140fe150d4a37924c4a38a191e2c514230911cee0900af608cbe87d3946cdba3f477f54099a59eb7ea581bb277
--- a/app-vim/threesome/threesome-0.2.0.ebuild
+++ b/app-vim/threesome/threesome-0.2.0.ebuild
@ -1,30 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-vim/threesome/threesome-0.2.0.ebuild,v 1.1 2011/09/19 06:45:50 radhermit Exp $
-
-EAPI="4"
-VIM_PLUGIN_VIM_VERSION="7.3"
-
-inherit vim-plugin
-
-MY_PN="Threesome"
-DESCRIPTION="vim plugin: resolve conflicts during three-way merges"
-HOMEPAGE="http://sjl.bitbucket.org/threesome.vim/"
-SRC_URI="https://github.com/vim-scripts/${MY_PN}/tarball/${PV} -> ${P}.tar.gz"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="|| ( app-editors/vim[python] app-editors/gvim[python] )
-	>=dev-lang/python-2.5"
-
-VIM_PLUGIN_HELPFILES="${PN}.txt"
-
-src_unpack() {
-	unpack ${A}
-	mv *-${MY_PN}-* "${S}"
-}
-
-src_prepare() {
-	rm README* LICENSE || die
-}
--- a/dev-cpp/gtest/gtest-1.6.0-r1.ebuild
+++ b/dev-cpp/gtest/gtest-1.6.0-r1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtest/gtest-1.6.0-r1.ebuild,v 1.7 2013/02/11 11:29:16 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtest/gtest-1.6.0-r1.ebuild,v 1.10 2013/02/12 20:25:35 ago Exp $

 EAPI="4"
 PYTHON_DEPEND="2"
@ -13,7 +13,7 @@ SRC_URI="http://googletest.googlecode.com/files/${P}.zip"

 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos"
 IUSE="examples static-libs"

 DEPEND="app-arch/unzip"
--- a/dev-cpp/tbb/Manifest
+++ b/dev-cpp/tbb/Manifest
@ -1,2 +1,3 @@
 DIST tbb40_297oss_src.tgz 2097295 SHA256 2d1d10564e536c0ecf50d2db984f9fd9c615909bab13531936f0ca2c0e7cc2c2 SHA512 d41365eb13fdaab78fbdbc20d7d39681e3b6effc3e162c887dc2298307c1b7ad510133c1df50a458d6fd30f8b90f6af7be990180fd25695c2428d096097b9af5 WHIRLPOOL 05b471a23ea2f8c1f4f04bfe48abcf3156b06e5a2b405ae10f6767f10cc80268875802c1c4a140eaafdb17c44c102d6aff69c8296e650c6dbc42ea3487576e30
 DIST tbb41_20121003oss_src.tgz 2250789 SHA256 5383727b9582a54cf4c4adbf22186b70e8eba276fcd3be81d746a937c5b47afc SHA512 fada6e32a09be2a151746caf3a15729c9ec6043b17e2f0aeb1bd903542310cdc6fe9ad85017ff5b2cfb16ae955c81c8b39ad8cf97f871bfcbd19d4948ef1d821 WHIRLPOOL 6c2a094e1dc6efed7189903bf8a6bbb8688ab1b15134c9f3c09fd5ed6a72315140505f5df410c89b65cd160a896222d71e01b3bfcbcd933281fb18a69eaf33f1
+DIST tbb41_20130116oss_src.tgz 2461689 SHA256 4ae2c10899e3b6ef2f686013ec5901fc658444ca90178efaca6014b0665c34b6 SHA512 a537411cf9ae66caaa97af33fbc1e56b6598be7b14526c42fd24cedebac06b1979b39c89b080ff9ff353a1ce82b1d10c4863add79fb15578dd3b1598aea1200f WHIRLPOOL 279eb059a4877cd11d7c01bd8483885c12fbb389c51d0944cfe96270051705b8b42b6d6273533bfb668c231a557fe0cc127b091f2ba88237349137a8015e5654
--- a/dev-cpp/tbb/tbb-4.1.20130116.ebuild
+++ b/dev-cpp/tbb/tbb-4.1.20130116.ebuild
@ -0,0 +1,111 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/tbb/tbb-4.1.20130116.ebuild,v 1.1 2013/02/13 00:02:51 bicatali Exp $
+
+EAPI=5
+inherit eutils flag-o-matic multilib versionator toolchain-funcs
+
+PV1="$(get_version_component_range 1)"
+PV2="$(get_version_component_range 2)"
+PV3="$(get_version_component_range 3)"
+MYP="${PN}${PV1}${PV2}_${PV3}oss"
+
+DESCRIPTION="High level abstract threading library"
+HOMEPAGE="http://www.threadingbuildingblocks.org/"
+SRC_URI="http://threadingbuildingblocks.org/sites/default/files/software_releases/source/${MYP}_src.tgz"
+LICENSE="GPL-2-with-exceptions"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug doc examples"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+S="${WORKDIR}/${MYP}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-4.0.297-underlinking.patch
+	# use fully qualified gcc compilers. do not force march/mcpu
+	# not tested with icc
+	# order in sed expressions is important
+	sed -i \
+		-e "s/g++/$(tc-getCXX)/g" \
+		-e "s/gcc/$(tc-getCC)/g" \
+		-e 's/-m\(arch\|cpu\)=*[[:space:]]//g' \
+		-e 's/-\(m\|-\)\(64\|32\)//g' \
+		-e 's/-O2/$(CXXFLAGS)/g' \
+		-e "/^ASM/s/as/$(tc-getAS)/g" \
+		build/*.gcc.inc || die
+
+	find include -name \*.html -delete || die
+
+	# pc files are for debian and fedora compatibility
+	# some deps use them
+	cat <<-EOF > ${PN}.pc.template
+		prefix=${EPREFIX}/usr
+		libdir=\${prefix}/$(get_libdir)
+		includedir=\${prefix}/include
+		Name: ${PN}
+		Description: ${DESCRIPTION}
+		Version: ${PV}
+		URL: ${HOMEPAGE}
+		Cflags: -I\${includedir}
+	EOF
+	cp ${PN}.pc.template ${PN}.pc
+	cat <<-EOF >> ${PN}.pc
+		Libs: -L\${libdir} -ltbb
+		Libs.private: -lm -lrt
+	EOF
+	cp ${PN}.pc.template ${PN}malloc.pc
+	cat <<-EOF >> ${PN}malloc.pc
+		Libs: -L\${libdir} -ltbbmalloc
+		Libs.private: -lm -lrt
+	EOF
+	cp ${PN}.pc.template ${PN}malloc_proxy.pc
+	cat <<-EOF >> ${PN}malloc_proxy.pc
+		Libs: -L\${libdir} -ltbbmalloc_proxy
+		Libs.private: -lrt
+		Requires: tbbmalloc
+	EOF
+	use debug || sed -i -e '/_debug/d' Makefile
+}
+
+src_compile() {
+	if [[ $(tc-getCXX) == *g++ ]]; then
+		comp="gcc"
+	elif [[ $(tc-getCXX) == *ic*c ]]; then
+		comp="icc"
+	else
+		die "compiler $(tc-getCXX) not supported by build system"
+	fi
+	emake compiler=${comp} tbb tbbmalloc
+}
+
+src_test() {
+	append-cxxflags -fabi-version=4
+	# avoid oversubscribing with -j1
+	emake -j1 compiler=${comp} test
+}
+
+src_install(){
+	local l
+	for l in $(find build -name lib\*.so.\*); do
+		dolib.so ${l}
+		local bl=$(basename ${l})
+		dosym ${bl} /usr/$(get_libdir)/${bl%.*}
+	done
+	doheader -r include/*
+
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins *.pc
+
+	dodoc README CHANGES doc/Release_Notes.txt
+	use doc && dohtml -r doc/html/*
+
+	if use examples ; then
+		insinto /usr/share/doc/${PF}/examples/build
+		doins build/*.inc
+		insinto /usr/share/doc/${PF}/examples
+		doins -r examples
+	fi
+}
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@ -1,6 +1,10 @@
 DIST mariadb-5.1.66.tar.gz 25017546 SHA256 c11d8e4f6bfcdea8833470a33738e0561da97dd3c63575de2b959008509ae372 SHA512 603e8f571e2446f7596776769633dcf5496f4fdea100c43222efcc74b9c8ed292a0c2944c43f7c216fd2676b59ee18bdbb5d6f38f27627551252ff25d722dce6 WHIRLPOOL 9043e5a0215773f8f7cb8b5265101f019caeb5f73bc5cc3ea2b37a67500fc149395201611cd87c3e131b562a9ad9cdd5672bc6c545cd8e71da983a4a7b6ef737
+DIST mariadb-5.1.67.tar.gz 25022999 SHA256 33471e9275c9b03919cabc38eb39f807d645adabf6a1a18f2e41ed73f47677c8 SHA512 de4a531027860c4226ec5e023b6f8573c2eb723bacaeb14279b9609ed033dcb58fc090aef3d9babcd4a4d0817ddf6ef75589c78f63075072d31ad0b7f7c17d7d WHIRLPOOL 22696d27c3a510396c4b86db5f5a4b39bbcde89285a8460b175ef7c40b3b7541fc8f205c0b96da7f94504a7fd14bfe02efb45204efda524a2426cd25e08162ff
 DIST mariadb-5.2.13.tar.gz 25459987 SHA256 96887416e097f1d4a7dde70ad404e6b7d26d3d13b5d1a8451e1ea62cdd9b0ca8 SHA512 696bb5f59f25fa31fc35399c99f6f13e37a178b1e9b0155e3cf053b1232a950035132d075b0594ff611f6b59635d49d0800820c2bbd02932d16917e174717f8a WHIRLPOOL 6755eb6a841350eb69668a1679b1cb7ec3d6ac58bb793b07d07353cc1962a82c111920dc7bc8b08056a85beb7f8d371045fdeb31751a44981f7b910d52e3da74
+DIST mariadb-5.2.14.tar.gz 25469828 SHA256 8ab3db0535ce8728b03a34799da2334c18cff467e01d122293f23aad20613fe5 SHA512 b0aded450355861bf01604ac5bd0012d0d06a699bc83017cdb6b8749ed161aca9fedb733301aab991c521b21f3c8b2fea4867a2fd038379475e720782c02e869 WHIRLPOOL 8c2dd7ee0c1df5696d6b9f5c4387b7f755258a710ac088559f0f9779b27d18e30f32de0d4212015a15b6a83de2abbdd5c4ec811fa87fe2aec547809dc0970607
 DIST mariadb-5.3.11.tar.gz 26865690 SHA256 07a766b007c2f2c50680ccde121801208222877bb9311ffc9abf85e2f5e09f3a SHA512 8f501c6c4c3c886ff65c079ebba8e4870ebf8e6b451f35014b6d7cd4f74bf5c23360c271b5ef759b10a491914136213d759b859b1df9ba06d9863d684aa8d8e9 WHIRLPOOL 4b74bc8e4606a5c14e437a57398091d717bd866e179e26ced8054f3b5c6e88548f8e15e9a822f39ff5e81c6d6f90d7d69c5a42549bf81c2eb57f5b0d448ca2c0
+DIST mariadb-5.3.12.tar.gz 26880808 SHA256 83a4598117cadde2bd7eac4c1398edbc86cc3aa8d3824bbee864d4b568a3a30c SHA512 d53ea48745dad5693fd6a1fd5cf502852f12f8236b8a1fb7f81ad647301d2fd08d4f2944c74de580d0a4136d6c8b49f257124fa1b234ba8f2338f2047435ef94 WHIRLPOOL b9caf1b241262b3b25728769116a94b480ae404ed3d49c8afd6eb4ad6071552e436e4b9483e7f5d0113bc3127eaf04ceaa80d455486e7a92d00820b6b298c460
 DIST mariadb-5.5.28a.tar.gz 27844298 SHA256 66c908592763c641f2a1e9fd83f080458a0d3375cda9aaf7700a37877b1e9968 SHA512 49fbbffb68f77e370cb288f7e406389101dd85433f2bbf25f9932d5e22ad6647b5a5f7fa397fa2f2efb5b7f2d860f395224d3188b70ed474373b820b1e708df7 WHIRLPOOL 3575a808b5bd0cf3778fcc81c78a4999abdb0cf82a577ebc4cda77df8db8c54120108d086c598ed40ae9eeb8660874cc8f33f6de2380a2a6fcb5ea70d0a1c727
+DIST mariadb-5.5.29.tar.gz 27935253 SHA256 b0e25b5451dbf8e8c8bf243bbd0aeb264db0da2caceafc7e2c9fad77b8d4be74 SHA512 ef3e386a634d1239067d91f6a17941807e62c36cd7f25e80ef43918d30ec0baa3d339ead85df5fc7958a3841d511c716bb873f039afdca49a50a409957b51d83 WHIRLPOOL 6b650c2ae23c6f9211792a2a9f3ddd0636306b7463308ecdc938ea003ee148956eda3fb1a2390ca72f3db1ea5eaabeafd4f26b23aa267766c61a77cf2b82b827
 DIST mysql-extras-20121101-2319Z.tar.bz2 1898358 SHA256 ea5da082d3384bde67e005ebc39b78e7caadea80745333fb5a9cf47a4c4e4c5d SHA512 6a49abb1beee012d87ab63071a568ee6d9d8e4ff7a76401b91f5bdc127860d1c504a3877cbadb81536b07afe5ff419c77c793b0fc14ba484f56765d1ca526614 WHIRLPOOL 4bda75a0a9063830b3140bbc3cb12b60fa21289eee2fa476fb286da6318fdf0445a9c6193bd2063aefcd3f4ecc1f8045b30635f0e32014098d0f3dbee86e01fc
 DIST mysql-extras-20130120-0100Z.tar.bz2 1899297 SHA256 56db6daa26070cb10b220cb06e7b4d4a84214932a5a04500ed0e76b938c01776 SHA512 9fc9b21e547ec0e1ae37b288a1ade28b11c03a89129302226c36018cf69842fda95665799ded84f04cccffaf54555acde40bf2ae6e2ea39ec63b3876382af1ba WHIRLPOOL 25f31d91d6004e7472ef6f2ff0d02b9dde9915f56fc84da600145ac09d1d56751c2ef85c897d3b7bacd29b1010b304445517452254a1e9208bc7bfa9c2e9bf2e
--- a/dev-db/mariadb/mariadb-5.1.67.ebuild
+++ b/dev-db/mariadb/mariadb-5.1.67.ebuild
@ -0,0 +1,171 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-5.1.67.ebuild,v 1.1 2013/02/13 00:47:45 robbat2 Exp $
+
+EAPI="4"
+MY_EXTRAS_VER="20121101-2319Z"
+
+# Build system
+BUILD="autotools"
+
+inherit toolchain-funcs mysql-v2
+# only to make repoman happy. it is really set in the eclass
+IUSE="$IUSE"
+
+# REMEMBER: also update eclass/mysql*.eclass before committing!
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+
+# When MY_EXTRAS is bumped, the index should be revised to exclude these.
+EPATCH_EXCLUDE=''
+
+DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
+RDEPEND="${RDEPEND}"
+
+# Please do not add a naive src_unpack to this ebuild
+# If you want to add a single patch, copy the ebuild to an overlay
+# and create your own mysql-extras tarball, looking at 000_index.txt
+src_prepare() {
+	sed -i \
+		-e '/^noinst_PROGRAMS/s/basic-t//g' \
+		"${S}"/unittest/mytap/t/Makefile.am
+	mysql-v2_src_prepare
+}
+
+# Official test instructions:
+# USE='berkdb -cluster embedded extraengine perl ssl community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mariadb-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+	# Bug #213475 - MySQL _will_ object strenously if your machine is named
+	# localhost. Also causes weird failures.
+	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
+
+	emake check || die "make check failed"
+	if ! use "minimal" ; then
+		if [[ $UID -eq 0 ]]; then
+			die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
+		fi
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+		cd "${S}"
+		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+		local retstatus_unit
+		local retstatus_ns
+		local retstatus_ps
+		local t
+		addpredict /this-dir-does-not-exist/t9.MYI
+
+		# Ensure that parallel runs don't die
+		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
+
+		# The entire 5.0 series has pre-generated SSL certificates, they have
+		# mostly expired now. ${S}/mysql-tests/std-data/*.pem
+		# The certs really SHOULD be generated for the tests, so that they are
+		# not expiring like this. We cannot do so ourselves as the tests look
+		# closely as the cert path data, and we do not have the CA key to regen
+		# ourselves. Alternatively, upstream should generate them with at least
+		# 50-year validity.
+		#
+		# Known expiry points:
+		# 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
+		# 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
+		# 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
+		#
+		# mysql-test/std_data/untrusted-cacert.pem is MEANT to be
+		# expired/invalid.
+		case ${PV} in
+			5.1.*|5.4.*|5.5.*)
+				for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
+					ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
+					mysql-v2_disable_test \
+						"$t" \
+						"These OpenSSL tests break due to expired certificates"
+				done
+			;;
+		esac
+
+		# These are also failing in MySQL 5.1 for now, and are believed to be
+		# false positives:
+		#
+		# main.mysql_comment, main.mysql_upgrade, main.information_schema,
+		# funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers:
+		# fails due to USE=-latin1 / utf8 default
+		#
+		# main.mysql_client_test:
+		# segfaults at random under Portage only, suspect resource limits.
+		#
+		# main.not_partition:
+		# Failure reason unknown at this time, must resolve before package.mask
+		# removal FIXME
+		case ${PV} in
+			5.1.*|5.2.*|5.4.*|5.5.*)
+			for t in main.mysql_client_test main.mysql_comments \
+				main.mysql_upgrade  \
+				main.information_schema \
+				main.not_partition funcs_1.is_columns_mysql \
+				funcs_1.is_tables_mysql funcs_1.is_triggers; do
+				mysql-v2_disable_test  "$t" "False positives in Gentoo"
+			done
+			;;
+		esac
+
+		# New failures in 5.1.50/5.1.51, reported by jmbsvicetto.
+		# These tests are picking up a 'connect-timeout' config from somewhere,
+		# which is not valid, and since it does not have 'loose-' in front of
+		# it, it's causing a failure
+		case ${PV} in
+			5.1.5*|5.4.*|5.5.*|6*)
+			for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do
+				mysql-v2_disable_test  "$t" \
+					"False positives in Gentoo: connect-timeout"
+			done
+			;;
+		esac
+
+		use profiling && use community \
+		|| mysql-v2_disable_test main.profiling \
+			"Profiling test needs profiling support"
+
+		if [ "${PN}" == "mariadb" ]; then
+			for t in \
+				parts.part_supported_sql_func_ndb \
+				parts.partition_auto_increment_ndb ; do
+					mysql-v2_disable_test $t "ndb not supported in mariadb"
+			done
+		fi
+
+		# create directories because mysqladmin might make out of order
+		mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
+
+		# We run the test protocols seperately
+		emake test-unit
+		retstatus_unit=$?
+		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
+
+		emake test-ns force="--force --vardir=${S}/mysql-test/var-ns"
+		retstatus_ns=$?
+		[[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		emake test-ps force="--force --vardir=${S}/mysql-test/var-ps"
+		retstatus_ps=$?
+		[[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		# TODO:
+		# When upstream enables the pr and nr testsuites, we need those as well.
+
+		# Cleanup is important for these testcases.
+		pkill -9 -f "${S}/ndb" 2>/dev/null
+		pkill -9 -f "${S}/sql" 2>/dev/null
+		failures=""
+		[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
+		[[ $retstatus_ns -eq 0 ]] || failures="${failures} test-ns"
+		[[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+		[[ -z "$failures" ]] || die "Test failures: $failures"
+		einfo "Tests successfully completed"
+	else
+		einfo "Skipping server tests due to minimal build."
+	fi
+}
--- a/dev-db/mariadb/mariadb-5.2.14.ebuild
+++ b/dev-db/mariadb/mariadb-5.2.14.ebuild
@ -0,0 +1,171 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-5.2.14.ebuild,v 1.1 2013/02/13 00:47:45 robbat2 Exp $
+
+EAPI="4"
+MY_EXTRAS_VER="20121101-2319Z"
+
+# Build system
+BUILD="autotools"
+
+inherit toolchain-funcs mysql-v2
+# only to make repoman happy. it is really set in the eclass
+IUSE="$IUSE"
+
+# REMEMBER: also update eclass/mysql*.eclass before committing!
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+
+# When MY_EXTRAS is bumped, the index should be revised to exclude these.
+EPATCH_EXCLUDE=''
+
+DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
+RDEPEND="${RDEPEND}"
+
+# Please do not add a naive src_unpack to this ebuild
+# If you want to add a single patch, copy the ebuild to an overlay
+# and create your own mysql-extras tarball, looking at 000_index.txt
+src_prepare() {
+	sed -i \
+		-e '/^noinst_PROGRAMS/s/basic-t//g' \
+		"${S}"/unittest/mytap/t/Makefile.am
+	mysql-v2_src_prepare
+}
+
+# Official test instructions:
+# USE='berkdb -cluster embedded extraengine perl ssl community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mariadb-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+	# Bug #213475 - MySQL _will_ object strenously if your machine is named
+	# localhost. Also causes weird failures.
+	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
+
+	emake check || die "make check failed"
+	if ! use "minimal" ; then
+		if [[ $UID -eq 0 ]]; then
+			die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
+		fi
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+		cd "${S}"
+		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+		local retstatus_unit
+		local retstatus_ns
+		local retstatus_ps
+		local t
+		addpredict /this-dir-does-not-exist/t9.MYI
+
+		# Ensure that parallel runs don't die
+		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
+
+		# The entire 5.0 series has pre-generated SSL certificates, they have
+		# mostly expired now. ${S}/mysql-tests/std-data/*.pem
+		# The certs really SHOULD be generated for the tests, so that they are
+		# not expiring like this. We cannot do so ourselves as the tests look
+		# closely as the cert path data, and we do not have the CA key to regen
+		# ourselves. Alternatively, upstream should generate them with at least
+		# 50-year validity.
+		#
+		# Known expiry points:
+		# 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
+		# 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
+		# 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
+		#
+		# mysql-test/std_data/untrusted-cacert.pem is MEANT to be
+		# expired/invalid.
+		case ${PV} in
+			5.1.*|5.4.*|5.5.*)
+				for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
+					ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
+					mysql-v2_disable_test \
+						"$t" \
+						"These OpenSSL tests break due to expired certificates"
+				done
+			;;
+		esac
+
+		# These are also failing in MySQL 5.1 for now, and are believed to be
+		# false positives:
+		#
+		# main.mysql_comment, main.mysql_upgrade, main.information_schema,
+		# funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers:
+		# fails due to USE=-latin1 / utf8 default
+		#
+		# main.mysql_client_test:
+		# segfaults at random under Portage only, suspect resource limits.
+		#
+		# main.not_partition:
+		# Failure reason unknown at this time, must resolve before package.mask
+		# removal FIXME
+		case ${PV} in
+			5.1.*|5.2.*|5.4.*|5.5.*)
+			for t in main.mysql_client_test main.mysql_comments \
+				main.mysql_upgrade  \
+				main.information_schema \
+				main.not_partition funcs_1.is_columns_mysql \
+				funcs_1.is_tables_mysql funcs_1.is_triggers; do
+				mysql-v2_disable_test  "$t" "False positives in Gentoo"
+			done
+			;;
+		esac
+
+		# New failures in 5.1.50/5.1.51, reported by jmbsvicetto.
+		# These tests are picking up a 'connect-timeout' config from somewhere,
+		# which is not valid, and since it does not have 'loose-' in front of
+		# it, it's causing a failure
+		case ${PV} in
+			5.1.5*|5.4.*|5.5.*|6*)
+			for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do
+				mysql-v2_disable_test  "$t" \
+					"False positives in Gentoo: connect-timeout"
+			done
+			;;
+		esac
+
+		use profiling && use community \
+		|| mysql-v2_disable_test main.profiling \
+			"Profiling test needs profiling support"
+
+		if [ "${PN}" == "mariadb" ]; then
+			for t in \
+				parts.part_supported_sql_func_ndb \
+				parts.partition_auto_increment_ndb ; do
+					mysql-v2_disable_test $t "ndb not supported in mariadb"
+			done
+		fi
+
+		# create directories because mysqladmin might make out of order
+		mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
+
+		# We run the test protocols seperately
+		emake test-unit
+		retstatus_unit=$?
+		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
+
+		emake test-ns force="--force --vardir=${S}/mysql-test/var-ns"
+		retstatus_ns=$?
+		[[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		emake test-ps force="--force --vardir=${S}/mysql-test/var-ps"
+		retstatus_ps=$?
+		[[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		# TODO:
+		# When upstream enables the pr and nr testsuites, we need those as well.
+
+		# Cleanup is important for these testcases.
+		pkill -9 -f "${S}/ndb" 2>/dev/null
+		pkill -9 -f "${S}/sql" 2>/dev/null
+		failures=""
+		[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
+		[[ $retstatus_ns -eq 0 ]] || failures="${failures} test-ns"
+		[[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+		[[ -z "$failures" ]] || die "Test failures: $failures"
+		einfo "Tests successfully completed"
+	else
+		einfo "Skipping server tests due to minimal build."
+	fi
+}
--- a/dev-db/mariadb/mariadb-5.3.12.ebuild
+++ b/dev-db/mariadb/mariadb-5.3.12.ebuild
@ -0,0 +1,171 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-5.3.12.ebuild,v 1.1 2013/02/13 00:47:45 robbat2 Exp $
+
+EAPI="4"
+MY_EXTRAS_VER="20121101-2319Z"
+
+# Build system
+BUILD="autotools"
+
+inherit toolchain-funcs mysql-v2
+# only to make repoman happy. it is really set in the eclass
+IUSE="$IUSE"
+
+# REMEMBER: also update eclass/mysql*.eclass before committing!
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+
+# When MY_EXTRAS is bumped, the index should be revised to exclude these.
+EPATCH_EXCLUDE=''
+
+DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
+RDEPEND="${RDEPEND}"
+
+# Please do not add a naive src_unpack to this ebuild
+# If you want to add a single patch, copy the ebuild to an overlay
+# and create your own mysql-extras tarball, looking at 000_index.txt
+src_prepare() {
+	sed -i \
+		-e '/^noinst_PROGRAMS/s/basic-t//g' \
+		"${S}"/unittest/mytap/t/Makefile.am
+	mysql-v2_src_prepare
+}
+
+# Official test instructions:
+# USE='berkdb -cluster embedded extraengine perl ssl community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mariadb-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+	# Bug #213475 - MySQL _will_ object strenously if your machine is named
+	# localhost. Also causes weird failures.
+	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
+
+	emake check || die "make check failed"
+	if ! use "minimal" ; then
+		if [[ $UID -eq 0 ]]; then
+			die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
+		fi
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+		cd "${S}"
+		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+		local retstatus_unit
+		local retstatus_ns
+		local retstatus_ps
+		local t
+		addpredict /this-dir-does-not-exist/t9.MYI
+
+		# Ensure that parallel runs don't die
+		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
+
+		# The entire 5.0 series has pre-generated SSL certificates, they have
+		# mostly expired now. ${S}/mysql-tests/std-data/*.pem
+		# The certs really SHOULD be generated for the tests, so that they are
+		# not expiring like this. We cannot do so ourselves as the tests look
+		# closely as the cert path data, and we do not have the CA key to regen
+		# ourselves. Alternatively, upstream should generate them with at least
+		# 50-year validity.
+		#
+		# Known expiry points:
+		# 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
+		# 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
+		# 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
+		#
+		# mysql-test/std_data/untrusted-cacert.pem is MEANT to be
+		# expired/invalid.
+		case ${PV} in
+			5.1.*|5.4.*|5.5.*)
+				for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
+					ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
+					mysql-v2_disable_test \
+						"$t" \
+						"These OpenSSL tests break due to expired certificates"
+				done
+			;;
+		esac
+
+		# These are also failing in MySQL 5.1 for now, and are believed to be
+		# false positives:
+		#
+		# main.mysql_comment, main.mysql_upgrade, main.information_schema,
+		# funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers:
+		# fails due to USE=-latin1 / utf8 default
+		#
+		# main.mysql_client_test:
+		# segfaults at random under Portage only, suspect resource limits.
+		#
+		# main.not_partition:
+		# Failure reason unknown at this time, must resolve before package.mask
+		# removal FIXME
+		case ${PV} in
+			5.1.*|5.2.*|5.4.*|5.5.*)
+			for t in main.mysql_client_test main.mysql_comments \
+				main.mysql_upgrade  \
+				main.information_schema \
+				main.not_partition funcs_1.is_columns_mysql \
+				funcs_1.is_tables_mysql funcs_1.is_triggers; do
+				mysql-v2_disable_test  "$t" "False positives in Gentoo"
+			done
+			;;
+		esac
+
+		# New failures in 5.1.50/5.1.51, reported by jmbsvicetto.
+		# These tests are picking up a 'connect-timeout' config from somewhere,
+		# which is not valid, and since it does not have 'loose-' in front of
+		# it, it's causing a failure
+		case ${PV} in
+			5.1.5*|5.4.*|5.5.*|6*)
+			for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do
+				mysql-v2_disable_test  "$t" \
+					"False positives in Gentoo: connect-timeout"
+			done
+			;;
+		esac
+
+		use profiling && use community \
+		|| mysql-v2_disable_test main.profiling \
+			"Profiling test needs profiling support"
+
+		if [ "${PN}" == "mariadb" ]; then
+			for t in \
+				parts.part_supported_sql_func_ndb \
+				parts.partition_auto_increment_ndb ; do
+					mysql-v2_disable_test $t "ndb not supported in mariadb"
+			done
+		fi
+
+		# create directories because mysqladmin might make out of order
+		mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
+
+		# We run the test protocols seperately
+		emake test-unit
+		retstatus_unit=$?
+		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
+
+		emake test-ns force="--force --vardir=${S}/mysql-test/var-ns"
+		retstatus_ns=$?
+		[[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		emake test-ps force="--force --vardir=${S}/mysql-test/var-ps"
+		retstatus_ps=$?
+		[[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		# TODO:
+		# When upstream enables the pr and nr testsuites, we need those as well.
+
+		# Cleanup is important for these testcases.
+		pkill -9 -f "${S}/ndb" 2>/dev/null
+		pkill -9 -f "${S}/sql" 2>/dev/null
+		failures=""
+		[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
+		[[ $retstatus_ns -eq 0 ]] || failures="${failures} test-ns"
+		[[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+		[[ -z "$failures" ]] || die "Test failures: $failures"
+		einfo "Tests successfully completed"
+	else
+		einfo "Skipping server tests due to minimal build."
+	fi
+}
--- a/dev-db/mariadb/mariadb-5.5.29.ebuild
+++ b/dev-db/mariadb/mariadb-5.5.29.ebuild
@ -0,0 +1,134 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-5.5.29.ebuild,v 1.1 2013/02/13 00:47:45 robbat2 Exp $
+
+EAPI="4"
+MY_EXTRAS_VER="20130120-0100Z"
+
+# Build system
+BUILD="cmake"
+
+inherit toolchain-funcs mysql-v2
+# only to make repoman happy. it is really set in the eclass
+IUSE="$IUSE"
+
+# REMEMBER: also update eclass/mysql*.eclass before committing!
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+
+# When MY_EXTRAS is bumped, the index should be revised to exclude these.
+EPATCH_EXCLUDE=''
+
+DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
+RDEPEND="${RDEPEND}"
+
+# Please do not add a naive src_unpack to this ebuild
+# If you want to add a single patch, copy the ebuild to an overlay
+# and create your own mysql-extras tarball, looking at 000_index.txt
+src_prepare() {
+	sed -i \
+		-e '/^noinst_PROGRAMS/s/basic-t//g' \
+		"${S}"/unittest/mytap/t/Makefile.am
+	mysql-v2_src_prepare
+}
+
+# Official test instructions:
+# USE='berkdb -cluster embedded extraengine perl ssl community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mariadb-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+
+	local TESTDIR="${CMAKE_BUILD_DIR}/mysql-test"
+	local retstatus_unit
+	local retstatus_tests
+
+	# Bug #213475 - MySQL _will_ object strenously if your machine is named
+	# localhost. Also causes weird failures.
+	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
+
+	if ! use "minimal" ; then
+
+		if [[ $UID -eq 0 ]]; then
+			die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
+		fi
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+		addpredict /this-dir-does-not-exist/t9.MYI
+
+		# Run CTest (test-units)
+		cmake-utils_src_test
+		retstatus_unit=$?
+		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
+
+		# Ensure that parallel runs don't die
+		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
+
+		# create directories because mysqladmin might right out of order
+		mkdir -p "${S}"/mysql-test/var-tests{,/log}
+
+		# These are failing in MySQL 5.5 for now and are believed to be
+		# false positives:
+		#
+		# main.information_schema, binlog.binlog_statement_insert_delayed,
+		# main.mysqld--help, funcs_1.is_triggers, funcs_1.is_tables_mysql,
+		# funcs_1.is_columns_mysql
+		# fails due to USE=-latin1 / utf8 default
+		#
+		# main.mysql_client_test, main.mysql_client_test_nonblock:
+		# segfaults at random under Portage only, suspect resource limits.
+		#
+		# sys_vars.plugin_dir_basic
+		# fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
+		# instead of MYSQL_LIBDIR/plugin
+		#
+		# main.flush_read_lock_kill
+		# fails because of unknown system variable 'DEBUG_SYNC'
+		#
+		# main.openssl_1
+		# error message changing
+		# -mysqltest: Could not open connection 'default': 2026 SSL connection
+		#  error: ASN: bad other signature confirmation
+		# +mysqltest: Could not open connection 'default': 2026 SSL connection
+		#  error: error:00000001:lib(0):func(0):reason(1)
+		#
+		# plugins.unix_socket
+		# fails because portage strips out the USER enviornment variable
+		#
+
+		for t in main.mysql_client_test main.mysql_client_test_nonblock \
+			binlog.binlog_statement_insert_delayed main.information_schema \
+			main.mysqld--help main.flush_read_lock_kill \
+			sys_vars.plugin_dir_basic main.openssl_1 plugins.unix_socket \
+			funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do
+				mysql-v2_disable_test  "$t" "False positives in Gentoo"
+		done
+
+		# Run mysql tests
+		pushd "${TESTDIR}"
+
+		# run mysql-test tests
+		perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests"
+		retstatus_tests=$?
+		[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		popd
+
+		# Cleanup is important for these testcases.
+		pkill -9 -f "${S}/ndb" 2>/dev/null
+		pkill -9 -f "${S}/sql" 2>/dev/null
+
+		failures=""
+		[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
+		[[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		[[ -z "$failures" ]] || die "Test failures: $failures"
+		einfo "Tests successfully completed"
+
+	else
+
+		einfo "Skipping server tests due to minimal build."
+	fi
+}
--- a/dev-db/postgresql-server/postgresql-server-8.3.23-r1.ebuild
+++ b/dev-db/postgresql-server/postgresql-server-8.3.23-r1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/postgresql-server-8.3.23.ebuild,v 1.11 2013/02/11 18:21:05 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/postgresql-server-8.3.23-r1.ebuild,v 1.1 2013/02/12 18:22:24 titanofold Exp $

 EAPI="5"

@ -71,7 +71,7 @@ src_prepare() {
 	eprefixify src/include/pg_config_manual.h

 	if use pam ; then
-		sed -e "s/\(#define PGSQL_PAME_SERVICE \"postgresql\)/\1-${SLOT}/" \
+		sed -e "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
 			-i src/backend/libpq/auth.c \
 			|| die 'PGSQL_PAM_SERVICE rename failed.'
 	fi
--- a/dev-db/postgresql-server/postgresql-server-8.4.16-r1.ebuild
+++ b/dev-db/postgresql-server/postgresql-server-8.4.16-r1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/postgresql-server-8.4.16.ebuild,v 1.11 2013/02/11 18:21:05 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/postgresql-server-8.4.16-r1.ebuild,v 1.1 2013/02/12 18:22:24 titanofold Exp $

 EAPI="5"

@ -72,7 +72,7 @@ src_prepare() {
 	eprefixify src/include/pg_config_manual.h

 	if use pam ; then
-		sed -e "s/\(#define PGSQL_PAME_SERVICE \"postgresql\)/\1-${SLOT}/" \
+		sed -e "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
 			-i src/backend/libpq/auth.c \
 			|| die 'PGSQL_PAM_SERVICE rename failed.'
 	fi
--- a/dev-db/postgresql-server/postgresql-server-9.0.12-r1.ebuild
+++ b/dev-db/postgresql-server/postgresql-server-9.0.12-r1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/postgresql-server-9.0.12.ebuild,v 1.11 2013/02/11 18:21:05 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/postgresql-server-9.0.12-r1.ebuild,v 1.1 2013/02/12 18:22:24 titanofold Exp $

 EAPI="5"

@ -69,7 +69,7 @@ src_prepare() {
 	eprefixify src/include/pg_config_manual.h

 	if use pam ; then
-		sed -e "s/\(#define PGSQL_PAME_SERVICE \"postgresql\)/\1-${SLOT}/" \
+		sed -e "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
 			-i src/backend/libpq/auth.c \
 			|| die 'PGSQL_PAM_SERVICE rename failed.'
 	fi
--- a/dev-db/postgresql-server/postgresql-server-9.1.8-r1.ebuild
+++ b/dev-db/postgresql-server/postgresql-server-9.1.8-r1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/postgresql-server-9.1.8.ebuild,v 1.11 2013/02/11 18:21:05 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/postgresql-server-9.1.8-r1.ebuild,v 1.1 2013/02/12 18:22:24 titanofold Exp $

 EAPI="5"

@ -66,7 +66,7 @@ src_prepare() {
 	eprefixify src/include/pg_config_manual.h

 	if use pam ; then
-		sed -e "s/\(#define PGSQL_PAME_SERVICE \"postgresql\)/\1-${SLOT}/" \
+		sed -e "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
 			-i src/backend/libpq/auth.c \
 			|| die 'PGSQL_PAM_SERVICE rename failed.'
 	fi
--- a/dev-db/postgresql-server/postgresql-server-9.2.3-r1.ebuild
+++ b/dev-db/postgresql-server/postgresql-server-9.2.3-r1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/postgresql-server-9.2.3.ebuild,v 1.11 2013/02/11 18:21:05 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/postgresql-server-9.2.3-r1.ebuild,v 1.1 2013/02/12 18:22:24 titanofold Exp $

 EAPI="5"

@ -75,7 +75,7 @@ src_prepare() {
 	eprefixify src/include/pg_config_manual.h

 	if use pam ; then
-		sed -e "s/\(#define PGSQL_PAME_SERVICE \"postgresql\)/\1-${SLOT}/" \
+		sed -e "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
 			-i src/backend/libpq/auth.c \
 			|| die 'PGSQL_PAM_SERVICE rename failed.'
 	fi
--- a/dev-db/postgresql-server/postgresql-server-9999.ebuild
+++ b/dev-db/postgresql-server/postgresql-server-9999.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/postgresql-server-9999.ebuild,v 1.6 2013/02/08 18:50:45 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/postgresql-server-9999.ebuild,v 1.7 2013/02/12 18:22:24 titanofold Exp $

 EAPI="5"

@ -85,7 +85,7 @@ src_prepare() {
 	eprefixify src/include/pg_config_manual.h

 	if use pam ; then
-		sed -e "s/\(#define PGSQL_PAME_SERVICE \"postgresql\)/\1-${SLOT}/" \
+		sed -e "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
 			-i src/backend/libpq/auth.c \
 			|| die 'PGSQL_PAM_SERVICE rename failed.'
 	fi
--- a/dev-lang/swig/swig-2.0.9.ebuild
+++ b/dev-lang/swig/swig-2.0.9.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/swig/swig-2.0.9.ebuild,v 1.1 2012/12/17 23:06:47 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/swig/swig-2.0.9.ebuild,v 1.9 2013/02/12 20:19:22 ago Exp $

 EAPI=4

@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"

 LICENSE="GPL-3+ BSD BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="ccache doc pcre"
 RESTRICT="test"

--- a/dev-lang/tcl/tcl-8.5.13-r1.ebuild
+++ b/dev-lang/tcl/tcl-8.5.13-r1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/tcl-8.5.13-r1.ebuild,v 1.6 2013/02/11 11:27:37 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/tcl-8.5.13-r1.ebuild,v 1.9 2013/02/12 20:24:25 ago Exp $

 EAPI=4

@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/tcl/${MY_P}-src.tar.gz"

 LICENSE="tcltk"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris"
 IUSE="debug threads"

 SPARENT="${WORKDIR}/${MY_P}"
--- a/dev-lang/tk/tk-8.5.13-r1.ebuild
+++ b/dev-lang/tk/tk-8.5.13-r1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.5.13-r1.ebuild,v 1.1 2013/01/09 16:36:07 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.5.13-r1.ebuild,v 1.8 2013/02/12 20:24:52 ago Exp $

 EAPI=4

@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/tcl/${MY_P}-src.tar.gz"

 LICENSE="tcltk"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug threads truetype aqua xscreensaver"

 RDEPEND="
--- a/dev-libs/boehm-gc/boehm-gc-7.2d.ebuild
+++ b/dev-libs/boehm-gc/boehm-gc-7.2d.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/boehm-gc/boehm-gc-7.2d.ebuild,v 1.8 2013/02/10 17:22:34 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/boehm-gc/boehm-gc-7.2d.ebuild,v 1.9 2013/02/12 20:18:33 ago Exp $

 EAPI=4

@ -16,7 +16,7 @@ SRC_URI="http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/${MY_P}.tar.gz"

 LICENSE="boehm-gc"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="cxx static-libs threads"

 RDEPEND=">=dev-libs/libatomic_ops-7.2"
--- a/dev-libs/libksba/libksba-1.3.0.ebuild
+++ b/dev-libs/libksba/libksba-1.3.0.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libksba/libksba-1.3.0.ebuild,v 1.3 2013/02/10 20:48:15 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libksba/libksba-1.3.0.ebuild,v 1.9 2013/02/12 20:21:00 ago Exp $

 EAPI="4"

@ -12,7 +12,7 @@ SRC_URI="mirror://gnupg/libksba/${P}.tar.bz2"

 LICENSE="LGPL-3+ GPL-2+ GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"

 RDEPEND=">=dev-libs/libgpg-error-1.8"
--- a/dev-libs/liblognorm/liblognorm-0.3.5.ebuild
+++ b/dev-libs/liblognorm/liblognorm-0.3.5.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/liblognorm/liblognorm-0.3.5.ebuild,v 1.1 2012/10/24 14:11:44 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/liblognorm/liblognorm-0.3.5.ebuild,v 1.2 2013/02/12 11:56:41 pinkbyte Exp $

 EAPI=4

@ -12,7 +12,7 @@ SRC_URI="http://www.liblognorm.com/files/download/${P}.tar.gz"

 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm ~hppa ~x86 ~amd64-linux"
 IUSE="debug static-libs"

 DEPEND="
--- a/dev-libs/xapian-bindings/xapian-bindings-1.2.12-r1.ebuild
+++ b/dev-libs/xapian-bindings/xapian-bindings-1.2.12-r1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/xapian-bindings/xapian-bindings-1.2.12-r1.ebuild,v 1.6 2013/02/10 17:18:55 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xapian-bindings/xapian-bindings-1.2.12-r1.ebuild,v 1.8 2013/02/12 16:56:59 ago Exp $

 EAPI="4"

@ -21,7 +21,7 @@ SRC_URI="http://oligarchy.co.uk/xapian/${PV}/${P}.tar.gz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~ia64 ~mips ppc ppc64 ~sparc ~x86"
 IUSE="java lua mono perl php python ruby tcl"
 REQUIRED_USE="|| ( java lua mono perl php python ruby tcl )"

--- a/dev-ml/camlzip/camlzip-1.05.ebuild
+++ b/dev-ml/camlzip/camlzip-1.05.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/camlzip/camlzip-1.05.ebuild,v 1.2 2013/02/11 02:59:39 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/camlzip/camlzip-1.05.ebuild,v 1.5 2013/02/12 16:57:17 ago Exp $

 EAPI="5"

@ -14,7 +14,7 @@ SRC_URI="http://forge.ocamlcore.org/frs/download.php/1037/${P}.tar.gz"

 SLOT="1/${PV}"
 LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc x86 ~x86-fbsd"

 RDEPEND=">=dev-lang/ocaml-3.10.2:=[ocamlopt?]
 		>=sys-libs/zlib-1.1.3"
--- a/dev-ml/findlib/findlib-1.3.3-r1.ebuild
+++ b/dev-ml/findlib/findlib-1.3.3-r1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/findlib/findlib-1.3.3-r1.ebuild,v 1.4 2013/02/11 21:30:07 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/findlib/findlib-1.3.3-r1.ebuild,v 1.9 2013/02/12 20:22:08 ago Exp $

 EAPI=5

@ -16,7 +16,7 @@ IUSE="doc +ocamlopt tk"
 LICENSE="MIT"

 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"

 DEPEND=">=dev-lang/ocaml-3.10:=[ocamlopt?,tk?]"
 RDEPEND="${DEPEND}"
--- a/dev-ml/pomap/pomap-3.0.1.ebuild
+++ b/dev-ml/pomap/pomap-3.0.1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/pomap/pomap-3.0.1.ebuild,v 1.4 2013/02/11 21:31:20 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/pomap/pomap-3.0.1.ebuild,v 1.5 2013/02/12 16:58:40 ago Exp $

 EAPI=5

@ -16,7 +16,7 @@ LICENSE="LGPL-2.1-with-linking-exception"
 DEPEND=""
 RDEPEND="${DEPEND}"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="examples"

 DOCS=( "AUTHORS.txt" "CHANGES.txt" "README.md" )
--- a/dev-ml/res/res-4.0.2.ebuild
+++ b/dev-ml/res/res-4.0.2.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/res/res-4.0.2.ebuild,v 1.4 2013/02/11 21:30:17 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/res/res-4.0.2.ebuild,v 1.5 2013/02/12 16:59:15 ago Exp $

 EAPI=5

@ -16,7 +16,7 @@ LICENSE="LGPL-2.1-with-linking-exception"
 DEPEND=""
 RDEPEND="${DEPEND}"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="examples"

 DOCS=( "AUTHORS.txt" "CHANGES.txt" "README.md" )
--- a/dev-python/eventlet/eventlet-0.12.1-r1.ebuild
+++ b/dev-python/eventlet/eventlet-0.12.1-r1.ebuild
@ -0,0 +1,48 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/eventlet/eventlet-0.12.1-r1.ebuild,v 1.1 2013/02/12 12:22:20 mgorny Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Highly concurrent networking library"
+HOMEPAGE="http://pypi.python.org/pypi/eventlet"
+SRC_URI="mirror://pypi/e/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples test"
+
+RDEPEND="dev-python/greenlet"
+DEPEND="doc? ( dev-python/sphinx )
+	test? ( ${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}] )"
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+src_test() {
+	# Tests bind to static addresses, bug #456920
+	local DISTUTILS_NO_PARALLEL_BUILD=1
+
+	distutils-r1_src_test
+}
+
+python_test() {
+	nosetests || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/_build/html/. )
+	distutils-r1_python_install_all
+
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
--- a/dev-python/flup/flup-1.0.2-r1.ebuild
+++ b/dev-python/flup/flup-1.0.2-r1.ebuild
@ -0,0 +1,21 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/flup/flup-1.0.2-r1.ebuild,v 1.1 2013/02/12 12:59:51 mgorny Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy{1_9,2_0} )
+
+inherit distutils-r1
+
+DESCRIPTION="Random assortment of WSGI servers"
+HOMEPAGE="http://trac.saddi.com/flup http://pypi.python.org/pypi/flup"
+SRC_URI="http://www.saddi.com/software/${PN}/dist/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
+IUSE=""
+
+RDEPEND=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
--- a/dev-python/greenlet/greenlet-0.4.0-r1.ebuild
+++ b/dev-python/greenlet/greenlet-0.4.0-r1.ebuild
@ -1,9 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/greenlet/greenlet-0.4.0-r1.ebuild,v 1.1 2013/02/04 23:19:48 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/greenlet/greenlet-0.4.0-r1.ebuild,v 1.2 2013/02/12 11:49:58 mgorny Exp $

 EAPI=5

+# Note: greenlet is built-in in pypy
 PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} )

 inherit distutils-r1 flag-o-matic
@ -22,10 +23,6 @@ DEPEND="app-arch/unzip
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
 RDEPEND=""

-# Build system symlinks the built libraries back into sourcedir.
-# https://github.com/python-greenlet/greenlet/issues/26
-DISTUTILS_IN_SOURCE_BUILD=1
-
 python_compile() {
 	if [[ ${EPYTHON} == python2* ]]; then
 		local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS}
@ -41,7 +38,7 @@ python_compile_all() {
 }

 python_test() {
-	esetup.py test
+	"${PYTHON}" run-tests.py -n || die "Tests fail with ${EPYTHON}"
 }

 python_install_all() {
--- a/dev-python/lxml/Manifest
+++ b/dev-python/lxml/Manifest
@ -2,3 +2,4 @@ DIST lxml-2.3.4.tgz 3150931 SHA256 ba7fe2974dc276dd1b83e1c407d66c7ad3ee64338f753
 DIST lxml-2.3.5.tgz 3171841 SHA256 7ec68de58814014543b3b6f21f36e3695359be715ad06348a14c7820dfa0e092 SHA512 9785c6a16c32e7c6fd95b41dd1ad6d0027bfed67e029bd64d5bac27a25c843a3af1ed5391086d9479c42fae4f86204265c0c0ac9af62b32f1639e6e355921d78 WHIRLPOOL c69a843aea29f9fa6f557a7f7a8ec1d7ccde40b8a007736e503e584731778f05d779675aef5f67809b49f4f90279f5ffe6043f39f2841649e4573338c02c42d6
 DIST lxml-2.3.6.tgz 3169787 SHA256 9f84932bb2b66219c18681f6e03a59c8fff8e7a03b653b296383d4e040c8cf0b SHA512 87db552f115ab8815e3bb7d78cbc6ccc944cc02957c2829c974432c8419a73f884be5b27d35f85db4e5e1a0bf2e9c3f5d3bc064da0509ddea05cf4ca7b559cd1 WHIRLPOOL 822dfbcd65146d00c255056e92343df05cde1e8035d5fb135f76be43165c001d34e89a1564bae56f771176a3cc808c19eee697eab02bc869d1062f921efef8cd
 DIST lxml-3.0.1.tgz 3205224 SHA256 50367b086d18b1cadc8d6ddf2525495d9d216b81e9a700f6aa7ea2f7e9dfaa78 SHA512 a020568db5741670ff90f00110ad766e3a7df16d6be99d19c82208bebe80374c18f870ad4081f398d148511bdad307818decc7f6592454b12d5adcec17460ba6 WHIRLPOOL 574d8a1fa3582ef8ef1e7582b843d2d8486a5867e16a035498d71eaa2bf73b467bec0050361138571bca24f5448e24ece32addf2b77908bceafebb24f3ff57ef
+DIST lxml-3.1.0.tar.gz 3269719 SHA256 8ce453b10e47b5d7a623b75ca0eb6c39fee80d9d72b7992c597eb44c31c9445e SHA512 a109f4257e7433df01afe541d492a03944bb3360a9e920eb0772248697e1139d56c20c333b7c3a9c35f46f0b4079d57a36e61546e63e19a814c52fe82245404a WHIRLPOOL d00a56deec809301a9b3621324b18030aeb64ad38999ee5857fb0c923ca93288c1c5316e0ef319f4094395b71b97aabc80cfcd601a4f861ec3ca8adefb0c1bb3
--- a/dev-python/lxml/lxml-3.1.0.ebuild
+++ b/dev-python/lxml/lxml-3.1.0.ebuild
@ -0,0 +1,59 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/lxml/lxml-3.1.0.ebuild,v 1.1 2013/02/13 03:30:56 radhermit Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} )
+
+inherit distutils-r1
+
+DESCRIPTION="A Pythonic binding for the libxml2 and libxslt libraries"
+HOMEPAGE="http://lxml.de/ http://pypi.python.org/pypi/lxml/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD ElementTree GPL-2 PSF-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc examples +threads"
+
+# Note: lib{xml2,xslt} are used as C libraries, not Python modules.
+RDEPEND=">=dev-libs/libxml2-2.7.2
+	>=dev-libs/libxslt-1.1.15
+	dev-python/beautifulsoup[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+# lxml tarball contains files pregenerated by Cython.
+
+python_prepare_all() {
+	# avoid replacing PYTHONPATH in tests.
+	sed -i -e '/sys\.path/d' test.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	cp -r -l src/lxml/tests "${BUILD_DIR}"/lib/lxml/ || die
+	cp -r -l src/lxml/html/tests "${BUILD_DIR}"/lib/lxml/html/ || die
+	ln -s "${S}"/doc "${BUILD_DIR}"/ || die
+
+	local test
+	for test in test.py selftest.py selftest2.py; do
+		einfo "Running ${test}"
+		"${PYTHON}" ${test} || die "Test ${test} fails with ${EPYTHON}"
+	done
+}
+
+python_install_all() {
+	if use doc; then
+		local DOCS=( *.txt doc/*.txt )
+		local HTML_DOCS=( doc/html/. )
+	fi
+
+	distutils-r1_python_install_all
+
+	if use examples; then
+		docinto examples
+		dodoc -r samples/*
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
--- a/dev-python/oauthlib/Manifest
+++ b/dev-python/oauthlib/Manifest
@ -2,3 +2,4 @@ DIST oauthlib-0.1.3.tar.gz 24684 SHA256 6066c9c0ab07953f98870bc97d29f6defd066b6c
 DIST oauthlib-0.3.0.tar.gz 43581 SHA256 8c62a18370b87fda3299bad4d4af2949e1bcb2d65519887ffcdcbcd00dfa9bf0 SHA512 7f69cc80cbaa9161e7b562bef475ea912373a0a1c2a84ee7d19d724db6e0f9d0f38cc9cf95672efcbf9e9200f7b4650a75ab8205fe004e6cdebf65fbddef7771 WHIRLPOOL 37e6e892fc451ad28ae650a6da89109c17495ca7a2453b4fddc99fd5773fb19d1f16f0889f181e7de17032156a5fe3c56751c50b8bc380287b330c0278ede7c9
 DIST oauthlib-0.3.4.tar.gz 54799 SHA256 7f3a2bc708c9667aa9e5071bde10bcaa1c07218b4f0c777383a98478ef47bdd3 SHA512 8cefd8120df5e1bc97de057c9771882d56afc0cfe2bf0025452c8f25a43723935b34edd108c5de3a54acb141577ee57e294d4621ef83a0bbf981788b7f89eaca WHIRLPOOL 92abbf92e68ca1f9b593d062f61bd18f9c16ac1796b1eee3257bf3620e607191e984d4760195a9671dc8fe3924df4acdbc1673456e84c4731a91ac14f67add53
 DIST oauthlib-0.3.6.tar.gz 62998 SHA256 0724d48d8a6d0f749ce67004a547335c042adf988d9748b0c8d792151cbceffc SHA512 f8ee1c56a800f6ccf2c987c33c4a08e083cddd24d43953d2e952e22fcaeae3128b5ee438ec572dba6561ef24cd71bfcc616c8a8452a56faffdbdcfcc1cbf4d62 WHIRLPOOL 3be38f2ee74b9c1cd2f2dc25c0bba11cf4ae64065eb2853c94ffa7a5237d11fe53e36244cd03264a16764f7ad414e00be6f2d1aa167e0a861d4590d37cfb6898
+DIST oauthlib-0.3.7.tar.gz 63788 SHA256 12b8fb9fa02a531c412bdc0fcb3a214e3da8c4075f19d6ca2c6d1a3636d2a000 SHA512 a912646d5e7bdad89945e85776b50b79179c0b1e7f86a26066a2e3575d9d50fd6f74b70f711d0d4e2ac75a1b88fcb8046cf7503bfc2fc153bfcbdc5492977131 WHIRLPOOL 5cbc118963cc6a6e0d36b345537f9068f56e69151a85281cd733195f508af91dbb841612788e47a2e4526e9aaa1123fb9060c344a356d7a81473584ea33065ed
--- a/dev-python/oauthlib/oauthlib-0.3.7.ebuild
+++ b/dev-python/oauthlib/oauthlib-0.3.7.ebuild
@ -0,0 +1,32 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/oauthlib/oauthlib-0.3.7.ebuild,v 1.1 2013/02/12 09:53:36 radhermit Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} )
+
+inherit distutils-r1
+
+DESCRIPTION="A generic, spec-compliant, thorough implementation of the OAuth request-signing logic"
+HOMEPAGE="https://github.com/idan/oauthlib http://pypi.python.org/pypi/oauthlib"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="test"
+
+# >=pycrypto-2.6-r1 for python3 support
+# unittest2 for python2 compat
+RDEPEND=">=dev-python/pycrypto-2.6-r1"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		virtual/python-unittest2[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	nosetests || die
+}
--- a/dev-python/passlib/metadata.xml
+++ b/dev-python/passlib/metadata.xml
@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+  <herd>python</herd>
  <maintainer>
    <email>prometheanfire@gentoo.org</email>
    <name>Matthew Thode</name>
--- a/dev-python/passlib/passlib-1.6.1.ebuild
+++ b/dev-python/passlib/passlib-1.6.1.ebuild
@ -1,33 +1,30 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/passlib/passlib-1.6.1.ebuild,v 1.2 2013/01/01 06:22:20 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/passlib/passlib-1.6.1.ebuild,v 1.3 2013/02/12 13:17:14 mgorny Exp $

 EAPI=5
-PYTHON_COMPAT=( python2_5 python2_6 python2_7 )
+PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy{1_9,2_0} )

 inherit distutils-r1

-DESCRIPTION="comprehensive password hashing framework supporting over 20
-schemes"
+DESCRIPTION="Password hashing framework supporting over 20 schemes"
 HOMEPAGE="http://code.google.com/p/passlib/"
 SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
+
 LICENSE="BSD-2"
 KEYWORDS="~amd64 ~x86"
 SLOT="0"
 IUSE="test doc"
+
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose )"
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
 RDEPEND=""

 python_test() {
-	"${PYTHON}" setup.py nosetests || die
+	nosetests -w "${BUILD_DIR}"/lib || die "Tests fail with ${EPYTHON}"
 }

-python_install() {
-	distutils-r1_python_install
-	if use doc; then
-		dodoc "${S}"/docs/*.rst
-		dodoc "${S}"/docs/requirements.txt
-		dodoc "${S}"/docs/lib/*.rst
-	fi
+python_install_all() {
+	distutils-r1_python_install_all
+	use doc && dodoc docs/{*.rst,requirements.txt,lib/*.rst}
 }
--- a/dev-python/paste/paste-1.7.5.1-r1.ebuild
+++ b/dev-python/paste/paste-1.7.5.1-r1.ebuild
@ -0,0 +1,61 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/paste/paste-1.7.5.1-r1.ebuild,v 1.1 2013/02/12 23:37:32 mgorny Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+
+inherit distutils-r1
+
+MY_PN="Paste"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Tools for using a Web Server Gateway Interface stack"
+HOMEPAGE="http://pythonpaste.org http://pypi.python.org/pypi/Paste"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-interix ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris"
+IUSE="doc flup openid"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	flup? ( dev-python/flup[${PYTHON_USEDEP}] )
+	openid? ( dev-python/python-openid[${PYTHON_USEDEP}] )"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${MY_P}"
+
+python_prepare_all() {
+	# Disable failing tests.
+	rm -f tests/test_cgiapp.py
+	sed \
+		-e "s/test_find_file/_&/" \
+		-e "s/test_deep/_&/" \
+		-e "s/test_static_parser/_&/" \
+		-i tests/test_urlparser.py || die "sed failed"
+
+	# Remove a test that runs against the paste website.
+	rm -f tests/test_proxy.py
+
+	local PATCHES=(
+		"${FILESDIR}/${P}-fix-tests-for-pypy.patch"
+	)
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	"${PYTHON}" setup.py build_sphinx || die
+}
+
+python_test() {
+	nosetests || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( build/sphinx/html/. )
+	distutils-r1_python_install_all
+}
--- a/dev-python/pastedeploy/pastedeploy-1.5.0-r1.ebuild
+++ b/dev-python/pastedeploy/pastedeploy-1.5.0-r1.ebuild
@ -0,0 +1,33 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pastedeploy/pastedeploy-1.5.0-r1.ebuild,v 1.1 2013/02/12 23:48:25 mgorny Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+
+inherit distutils-r1
+
+MY_PN="PasteDeploy"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Load, configure, and compose WSGI applications and servers"
+HOMEPAGE="http://pythonpaste.org/deploy/ http://pypi.python.org/pypi/PasteDeploy"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="doc"
+
+RDEPEND="dev-python/paste[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	use doc && dodoc docs/*.txt
+}
--- a/dev-python/pybloomfiltermmap/pybloomfiltermmap-0.3.11-r1.ebuild
+++ b/dev-python/pybloomfiltermmap/pybloomfiltermmap-0.3.11-r1.ebuild
@ -0,0 +1,18 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pybloomfiltermmap/pybloomfiltermmap-0.3.11-r1.ebuild,v 1.1 2013/02/12 12:40:18 pinkbyte Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_{6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="A Bloom filter (bloomfilter) for Python built on mmap"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+HOMEPAGE="http://pypi.python.org/pypi/pybloomfiltermmap"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
--- a/dev-python/pybloomfiltermmap/pybloomfiltermmap-0.3.11.ebuild
+++ b/dev-python/pybloomfiltermmap/pybloomfiltermmap-0.3.11.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pybloomfiltermmap/pybloomfiltermmap-0.3.11.ebuild,v 1.1 2012/12/02 11:35:00 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pybloomfiltermmap/pybloomfiltermmap-0.3.11.ebuild,v 1.2 2013/02/12 12:31:33 pinkbyte Exp $

 EAPI=4

@ -16,5 +16,5 @@ HOMEPAGE="http://pypi.python.org/pypi/pybloomfiltermmap"

 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
--- a/dev-python/pypax/pypax-0.8.1.ebuild
+++ b/dev-python/pypax/pypax-0.8.1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pypax/pypax-0.8.1.ebuild,v 1.3 2013/01/13 15:44:57 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pypax/pypax-0.8.1.ebuild,v 1.10 2013/02/12 20:23:18 ago Exp $

 EAPI="5"

@ -17,7 +17,7 @@ S="${WORKDIR}/elfix-${PV}/scripts"

 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 sparc x86"
 IUSE="+ptpax +xtpax"

 REQUIRED_USE="|| ( ptpax xtpax )"
--- a/dev-python/python-openid/python-openid-2.2.5-r1.ebuild
+++ b/dev-python/python-openid/python-openid-2.2.5-r1.ebuild
@ -0,0 +1,54 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-openid/python-openid-2.2.5-r1.ebuild,v 1.1 2013/02/12 13:15:19 mgorny Exp $
+
+EAPI=5
+
+PYTHON_REQ_USE='sqlite?'
+PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+
+inherit distutils-r1
+
+DESCRIPTION="OpenID support for servers and consumers."
+HOMEPAGE="http://www.openidenabled.com/openid/libraries/python/ http://pypi.python.org/pypi/python-openid"
+# Downloaded from http://github.com/openid/python-openid/downloads
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="examples mysql postgres sqlite"
+
+RDEPEND="mysql? ( >=dev-python/mysql-python-1.2.2[${PYTHON_USEDEP}] )
+	postgres? ( dev-python/psycopg[${PYTHON_USEDEP}] )"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/openid-python-openid-b666238"
+
+python_prepare_all() {
+	local PATCHES=(
+		# Patch to fix confusion with localhost/127.0.0.1
+		"${FILESDIR}/${PN}-2.0.0-gentoo-test_fetchers.diff"
+	)
+
+	# Disable broken tests from from examples/djopenid.
+	# Remove test that requires running db server.
+	sed -e "s/django_failures =.*/django_failures = 0/" \
+		-e '/storetest/d' \
+		-i admin/runtests || die "sed admin/runtests failed"
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	"${PYTHON}" admin/runtests || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
--- a/dev-ruby/aws-sdk/Manifest
+++ b/dev-ruby/aws-sdk/Manifest
@ -1,2 +1 @@
-DIST aws-sdk-for-ruby-1.7.1.tar.gz 1347303 SHA256 471ee21a0eb9555ac871f7331200c4cbba51990399b86904c9875261e52dfddd SHA512 d0ef40cc2b48f00e62d900ac853beb8d247bc467e38ce640b942eba796d74e0aba96ec8199cc9474b3217f550a32334ce725d20bef07dfaeef2cf385290c2906 WHIRLPOOL 4e1d863f49a48b4a47bac0173c1ec0515b173dc1c92b4a9b9d9cdc73a0f53006888c3bfb67c4a251ee734c8d664d24d98eef746c04393cebf964ba976881d691
-DIST aws-sdk-ruby-1.8.1.1.tar.gz 1424338 SHA256 4d8a9926f95f07b6c4a3d20c54276ee704191ea8971ccc19a524088c65077e5d SHA512 3afbf407d2ccbc587c627ea19dda4f7efe59ebf5d6a00326a566b3866f341cca498ed05a3e648d2b87b3f176501bbc03277295539971758a6dbe2924197f596a WHIRLPOOL c9aedfd6ea51d766bb346ff664e20e68cb51380951d32b613d0e4b71ded139130eb6db2544b9f4f7727a822e9a8891d04492558b2063c6711803f67693c3a29c
+DIST aws-sdk-ruby-1.8.1.3.tar.gz 1426985 SHA256 f2f2d1a208aa4a02cc6e930ae472f81daaa56dab40c70cba8a664381332e0b26 SHA512 8044f12f88919fc3b63e8ea0bd594687b7fe16a566728ffdf27b1318475224798b7a862beeede79a1ad53ba3a6928e68da1022774731fba4b10e6562c4ae04ee WHIRLPOOL 25e42b26044facda2415ffc28b07212edf86159ed15e6d8537ce2e2de7aa54d0836763ac465fd390b8d1084a73429d986e35cec8f8c45474150e6f660065a00f
--- a/dev-ruby/aws-sdk/aws-sdk-1.7.1.ebuild
+++ b/dev-ruby/aws-sdk/aws-sdk-1.7.1.ebuild
@ -1,48 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/aws-sdk/aws-sdk-1.7.1.ebuild,v 1.2 2013/01/30 15:21:48 flameeyes Exp $
-
-EAPI=4
-
-USE_RUBY="ruby18 ruby19"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="README.rdoc"
-
-RUBY_FAKEGEM_EXTRAINSTALL="ca-bundle.crt"
-
-GITHUB_USER="amazonwebservices"
-GITHUB_PROJECT="${PN}-for-ruby"
-RUBY_S="${GITHUB_USER}-${GITHUB_PROJECT}-*"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Official SDK for Amazon Web Services"
-HOMEPAGE="http://aws.amazon.com/sdkforruby"
-SRC_URI="https://github.com/${GITHUB_USER}/${GITHUB_PROJECT}/tarball/${PV} -> ${GITHUB_PROJECT}-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend "virtual/ruby-ssl
-	>=dev-ruby/httparty-0.7
-	>=dev-ruby/json-1.4
-	>=dev-ruby/nokogiri-1.4.4
-	>=dev-ruby/uuidtools-2.1"
-
-all_ruby_prepare() {
-	sed -i -e 's:~>:>=:' "${RUBY_FAKEGEM_GEMSPEC}" || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	insinto /usr/share/doc/${PF}
-	doins -r recipebook samples
-}
--- a/dev-ruby/aws-sdk/aws-sdk-1.8.1.3.ebuild
+++ b/dev-ruby/aws-sdk/aws-sdk-1.8.1.3.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/aws-sdk/aws-sdk-1.8.1.1.ebuild,v 1.1 2013/01/30 15:21:48 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/aws-sdk/aws-sdk-1.8.1.3.ebuild,v 1.1 2013/02/12 19:25:28 flameeyes Exp $

 EAPI=5

--- a/dev-ruby/extlib/Manifest
+++ b/dev-ruby/extlib/Manifest
@ -1 +1,2 @@
 DIST extlib-0.9.15.gem 65536 SHA256 0ca6cd11107cdb97d8777c4e2bd4ef8d3b6f4b80dbe08af320c5f5ad5156d623 SHA512 8d4f8116bdc25d6e080784bda0574dbdb739bc06779acb622263fe37f8fa4e32da3395cd9458af434342ab212fc06ab2ee67feb4f337d3baf8d25936a57ee8d0 WHIRLPOOL 14d2028a38ec750a6ad7a8aa33cb20ccfd197d6d3964c4e82416e40603e2dcef21539f9bd5305bac48883c7ccd95f4e8532f40d9edc1cdf145d12220058f71fd
+DIST extlib-0.9.16.gem 65024 SHA256 308bb9f4813831baf2746df7e20b1f9500d3749531abc0dc1e3fa1b0de1e7cb1 SHA512 bbad68e431f740d2fca434c26d36e8c0471fc740faf4d342e7a565d0bf68b29abe5ca9d1a1246a3b5120fccead6c9e91dfff10032800317341d993d4b25995e9 WHIRLPOOL 3f72bae90fefef4062f4a99b63df01b540c593fa2d652abe26813624a4d816358bf2d9d7d7de1661e3048a2d5fb066a80045e649f34ba7c3933c3be4eded7e39
--- a/dev-ruby/extlib/extlib-0.9.16.ebuild
+++ b/dev-ruby/extlib/extlib-0.9.16.ebuild
@ -0,0 +1,34 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/extlib/extlib-0.9.16.ebuild,v 1.1 2013/02/12 07:25:51 graaff Exp $
+
+EAPI=5
+USE_RUBY="ruby18 ruby19 ree18 jruby"
+
+RUBY_FAKEGEM_TASK_DOC="-f tasks/yard.rake yard"
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="README.rdoc"
+RUBY_FAKEGEM_RECIPE_TEST="rspec"
+
+RUBY_FAKEGEM_GEMSPEC=${PN}.gemspec
+
+inherit ruby-fakegem
+
+DESCRIPTION="Support library for DataMapper and Merb"
+HOMEPAGE="http://extlib.rubyforge.org"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE=""
+
+ruby_add_bdepend "
+	doc? ( dev-ruby/yard )
+	test? ( >=dev-ruby/json-1.4.0 )"
+
+all_ruby_prepare() {
+	sed -i -e '/spec/d' spec/spec_helper.rb || die
+
+	# We always use json.
+	sed -i -e 's/json_pure/json/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
--- a/dev-ruby/mime-types/Manifest
+++ b/dev-ruby/mime-types/Manifest
@ -1,2 +1,3 @@
 DIST mime-types-1.19.gem 38912 SHA256 4658ed1c3945625e2b1464061ef5d1163d2fb101a14fa9bc04d1ec347fa684ac SHA512 3f952e44a90d75b38b827aa0b0dd784bde6c99e713712d45178dadc493a7b7188541309e85688a69bb47e04ebded60f79b6043d91cb9ddd5ff8c2445f221219e WHIRLPOOL c7c77c24824ab4ef9bc9e47053967f63bf53352efde0c7711a12bc9e5f57ce065f87b1b86a19fb778506daf7df0062e6a5d7979c5ea892f7dc938b24a4fd3264
 DIST mime-types-1.20.1.gem 55296 SHA256 60d1af10f6592f02b2ac12af3596c61b1577712400627f3b989f5b22f256878e SHA512 38226ad89b5f973d64f48fa7644dcaec5c7238c4978fc3b7f4938b4ef40c32d253f28f125ade42498e163e1e2940e425d764e2a9c931811ceef3b3c7d76e15d7 WHIRLPOOL 5c5c79f0d434e5c8406f49d4d1d8cc9023e01430a9bb7d20b2771a4e30e5ac9b5f838bcc2b7a2a461f8b32cccb450e0d27d464a9b8b13154d6fc2b1ee79281f0
+DIST mime-types-1.21.gem 55808 SHA256 3c86d4e828026ab6bb70a7620e68beb16b3e82606bbb25a1b560e229d428bde2 SHA512 edc46cbc96b1f5c6a5e380d18652d98f269766edba2b8cdbe7a8cd7d25080fadca29b442ba41f5a0c3d215da0cb5199e9b41ded0fe66471422e2b93e7a0c1c61 WHIRLPOOL 9670dd06306cfe3c14f585bd6951f249fbb663dee9084901b87fcb748408a2f7adf04e338c95658d38aa0aa5e80cf5290fb7dff318972b83952706a89a6182d4
--- a/dev-ruby/mime-types/mime-types-1.21.ebuild
+++ b/dev-ruby/mime-types/mime-types-1.21.ebuild
@ -0,0 +1,24 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mime-types/mime-types-1.21.ebuild,v 1.1 2013/02/12 11:33:37 graaff Exp $
+
+EAPI=5
+
+USE_RUBY="ruby18 ruby19 jruby ree18"
+
+RUBY_FAKEGEM_TASK_DOC="docs"
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Provides a mailcap-like MIME Content-Type lookup for Ruby."
+HOMEPAGE="http://rubyforge.org/projects/mime-types"
+
+LICENSE="Ruby Artistic GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~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 "doc? ( dev-ruby/hoe dev-ruby/rubyforge )
+	test? ( dev-ruby/hoe dev-ruby/rubyforge dev-ruby/minitest )"
--- a/dev-tex/cjk-latex/cjk-latex-4.8.3.ebuild
+++ b/dev-tex/cjk-latex/cjk-latex-4.8.3.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tex/cjk-latex/cjk-latex-4.8.3.ebuild,v 1.1 2012/10/10 13:14:53 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tex/cjk-latex/cjk-latex-4.8.3.ebuild,v 1.9 2013/02/12 20:18:57 ago Exp $

 EAPI=4

@ -17,7 +17,7 @@ SRC_URI="ftp://ftp.ffii.org/pub/cjk/${MY_P}.tar.gz

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="doc emacs"

 DEPEND="virtual/latex-base
--- a/dev-util/boost-build/Manifest
+++ b/dev-util/boost-build/Manifest
@ -1,3 +1,3 @@
 DIST boost_1_49_0.tar.bz2 48499961 SHA256 dd748a7f5507a7e7af74f452e1c52a64e651ed1f7263fce438a06641d2180d3c SHA512 9f6198270659df112a57731afe31cbf1012d103ba36ed82f6c3f1bdc0185ddb89dcc42c5dfb9ee3f95973d52999aad6c7509dc61125420d45146e39ebf20219d WHIRLPOOL c049b4212307b0208d0b37ac870a7cfb8562d2b685ce505e1971af7bc68ae9746b06ea80ddc52599ed4cbd6dc3305b5f8051cd771387412aaa1d2f8e939a48ba
 DIST boost_1_52_0.tar.bz2 54421709 SHA256 222b6afd7723f396f5682c20130314a10196d3999feab5ba920d2a6bf53bac92 SHA512 fc512d3bfa6a39a60fee548775c97239271cf757587b8df7ed739c800844a819a359dca172be0e69ad7752753753139bf11f0813d650066d58386662fe32842d WHIRLPOOL 73bbab4a1d2a652200f4b5e669440a2afcebcea96a1139ecc75213067ca32d5cadb0f060bb0ec2e29e9e31272fb7ec9d2cb960801032ee6c5dcb86564766411d
-DIST boost_1_53_0_beta1.tar.bz2 55879466 SHA256 a86669b92af08bc05a96857f893d8f7e4bdaecf3c58bfe13b8a57b30b4470685 SHA512 9acc6d96610516f4198bf922ed6a14d6948315aee0ec7b32b04e2c59620a582a1d0cdf83b8ad4c8298a33d686fd8a1f2dd1dd5012750981774824d119e082579 WHIRLPOOL ef654834d5cfefdeb5358cd70dafaf07391820c929e0285b9e78596a27eb0fbd0cd9eeb59f1a8322650f70a25c2a66ad985ff5a9225d47162a13ca486a9cc596
+DIST boost_1_53_0.tar.bz2 55765258 SHA256 f88a041b01882b0c9c5c05b39603ec8383fb881f772f6f9e6e6fd0e0cddb9196 SHA512 8cd7806653cb6ea4a1c6862796ef698de5ae0bdbda96954fedbe090c59e3e6cb8f8d385df35183e9063ac4e2c2fccf10744516c47a994cde5f1d1cba1b07e522 WHIRLPOOL e8c5ed6b34dd5f68dc7e102a9e22b302616a65077d3f4af370ece6352b02a866e04294a4fc76bbd5555b6a4131f590e6455e6a74b5f12c4ffc2dd15af0bc8746
--- a/dev-util/boost-build/boost-build-1.53.0_beta1.ebuild
+++ b/dev-util/boost-build/boost-build-1.53.0_beta1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/boost-build/boost-build-1.53.0_beta1.ebuild,v 1.1 2013/01/25 23:03:15 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/boost-build/boost-build-1.53.0.ebuild,v 1.1 2013/02/12 15:39:04 flameeyes Exp $

 EAPI="5"
 PYTHON_DEPEND="python? 2"
--- a/Show More
+++ b/Show More
				`@ -0,0 +1 @@`
				`DIST splice-1.0.1.tar.bz2 12369 SHA256 30e7d947defb29971d8c750670bbdae6625e2238d4f892e6b5590609d6a6a81a SHA512 65826a9054163f59d8dc0a558e3b748f27015bb6075e8d158214e6824c922599552a69c7d09364599285d6effdfc42fa6dd98e858a8bfa47ebc21a4d18394ede WHIRLPOOL a8e4405f5169857c07b81f0a778757aebd198f4c0e73f4cf239a451dfae64911d5fb164121413799a750646df609fcb864a08393510d012a84383261f6c006ab`
				`@ -1 +0,0 @@`
				`DIST threesome-0.2.0.tar.gz 13333 SHA256 0733d40b3ad027ebc81822f8204bb048c5cd76b098c04f2ec2837eb48b50efbe SHA512 56e1683f372472354cabc1f3d36ccf3d9bd217d80e9ac5cbc1d2e1326387e12faffdfb9604429f0929582252482203bab713032ce2a34d4de70da428eb0940ba WHIRLPOOL 82a4118db6453e6a300ffde34320ca00b0220b140fe150d4a37924c4a38a191e2c514230911cee0900af608cbe87d3946cdba3f477f54099a59eb7ea581bb277`