Sync with portage [Sat Dec 14 19:18:13 MSK 2013].

11 years ago · 5724cfdc6a
parent da85ea2847
commit 5724cfdc6a
524 changed files with 10297 additions and 4888 deletions
--- a/app-admin/augeas/augeas-0.10.0-r2.ebuild
+++ b/app-admin/augeas/augeas-0.10.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/augeas/augeas-0.10.0-r2.ebuild,v 1.4 2013/12/11 14:32:43 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/augeas/augeas-0.10.0-r2.ebuild,v 1.6 2013/12/13 09:24:30 ago Exp $

 EAPI=5

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

 SLOT="0"
 LICENSE="LGPL-2.1"
-KEYWORDS="~alpha amd64 hppa ~ia64 ~ppc ~sparc x86"
+KEYWORDS="alpha amd64 hppa ~ia64 ppc ~sparc x86"
 IUSE="static-libs test"

 RDEPEND="
--- a/app-admin/gtkdiskfree/Manifest
+++ b/app-admin/gtkdiskfree/Manifest
@ -1,2 +1 @@
-DIST gtkdiskfree-1.9.3.tar.gz 255448 SHA256 88ddccc51a060590476db7ed29137e474b70cca94ad28220d3122ab4b143d120 SHA512 a199732e9fd8dcb879d3fc7bd13e5b59cfbf1ed850f4596d1dbe4699ee7fb4a951f5f1c407ca524b155362e25c3b25287c22cd3f7532be7a028369d25d49b4f7 WHIRLPOOL 0dea870f8700590dc1421bc0760ad07742059354189ea35e4ad369a6961110566ad9110837a79faa467f00108777307723d5a6f31b719c81b1050eef8b7b59ed
 DIST gtkdiskfree-2.0.1.tar.gz 354661 SHA256 eb4369db5ff98df487b43fd59f998f3524a87896686cd2e9c5adccea3bfe7e94 SHA512 ec202cc79dc80fb66fdf028b6a89610344bb76d7cbe09563f5f47ae072bed791e395d9d1389954046c25e882587d3685b14db4e871e26244045beabb8b579de8 WHIRLPOOL bd4aaeaea45703e62478a28a7b4b349fafdf0846d53f106837c332385efefde1ecb9a6637cc045b2949cc0dddf33aa416da7d1635a75972cb4af5aed348aa2d3
--- a/app-admin/gtkdiskfree/files/1.9.3-makefile-DESTDIR.patch
+++ b/app-admin/gtkdiskfree/files/1.9.3-makefile-DESTDIR.patch
@ -1,17 +0,0 @@
--- po/Makefile.in.in
-+++ po/Makefile.in.in
-@@ -113,5 +113,5 @@
- 	if test -r "$(MKINSTALLDIRS)"; then \
-	  $(MKINSTALLDIRS) $(datadir); \
-+	  $(MKINSTALLDIRS) $(DESTDIR)$(datadir); \
- 	else \
-	  $(SHELL) $(top_srcdir)/mkinstalldirs $(datadir); \
-+	  $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir); \
- 	fi
-@@ -121,4 +121,4 @@
- 	  case "$$cat" in \
-	    *.gmo) destdir=$(gnulocaledir);; \
-	    *)     destdir=$(localedir);; \
-+	    *.gmo) destdir=$(DESTDIR)$(gnulocaledir);; \
-+	    *)     destdir=$(DESTDIR)$(localedir);; \
- 	  esac; \
--- a/app-admin/gtkdiskfree/files/gtkdiskfree-1.9.3-make-382.patch
+++ b/app-admin/gtkdiskfree/files/gtkdiskfree-1.9.3-make-382.patch
@ -1,23 +0,0 @@
-http://bugs.gentoo.org/333499
-
--- intl/Makefile.in
-+++ intl/Makefile.in
-@@ -202,12 +202,12 @@
- # The dependency for intlh.inst is different in gettext and all other
- # packages.  Because we cannot you GNU make features we have to solve
- # the problem while rewriting Makefile.in.
-@GT_YES@intlh.inst: intlh.inst.in ../config.status
-@GT_YES@	cd .. \
-@GT_YES@	&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= \
-@GT_YES@	  $(SHELL) ./config.status
-@GT_NO@.PHONY: intlh.inst
-@GT_NO@intlh.inst:
-+intlh.inst: intlh.inst.in ../config.status
-+	cd .. \
-+	&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= \
-+	  $(SHELL) ./config.status
-+.PHONY: intlh.inst
-+intlh.inst:
- 
- # Tell versions [3.59,3.63) of GNU make not to export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
--- a/app-admin/gtkdiskfree/files/gtkdiskfree-1.9.3-tempfile.patch
+++ b/app-admin/gtkdiskfree/files/gtkdiskfree-1.9.3-tempfile.patch
@ -1,58 +0,0 @@
-Fix insecure tempfile usage
-
-Patch by Tavis Ormandy
-
-http://bugs.gentoo.org/104565
-
--- src/mount.c
-+++ src/mount.c
-@@ -31,41 +31,21 @@
- void
- open_cmd_tube (const gchar *cmd, const gchar *mount_point)
- {
-	gint status;
-	gchar error[MAXLINE], *line;
-	FILE *sh, *tmp;
-+	gchar error[MAXLINE], *line, *status;
-+	FILE *sh;
- 	
- 	setbuf(stdout, error);
-	line = g_strconcat(cmd, " ", mount_point, " &> ", TUBE_NAME, NULL);
-+	line = g_strconcat(cmd, " ", mount_point, " 2>&1", NULL);
- 	sh = popen(line, "r");
- 	g_free(line);
- 	
-	status = pclose(sh);
-	
-	if (status == 0) {
-		remove(TUBE_NAME);
-		gui_list_main_update(GTK_TREE_VIEW(list_treeview));
-		
-		return;
-	} else {
-		if ((tmp = fopen(TUBE_NAME, "r")) == NULL) {
-			gui_list_main_update(GTK_TREE_VIEW(list_treeview)); 
-			
-			return;
-		}
-		if (fgets(error, MAXLINE-1, tmp) == NULL) {
-			fclose(tmp);
-			remove(TUBE_NAME);
-			gui_list_main_update(GTK_TREE_VIEW(list_treeview));
-			
-			return;
-		}
-		fclose(tmp);
-		remove(TUBE_NAME);
-+	status = fgets(error, MAXLINE-1, sh);
-+
-+	if (status && (pclose(sh) != 0))
- 		error_window(error);
-	}
-+
- 	gui_list_main_update(GTK_TREE_VIEW(list_treeview));
-	
-+
- 	return;
- }
- 
--- a/app-admin/gtkdiskfree/gtkdiskfree-1.9.3-r1.ebuild
+++ b/app-admin/gtkdiskfree/gtkdiskfree-1.9.3-r1.ebuild
@ -1,39 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gtkdiskfree/gtkdiskfree-1.9.3-r1.ebuild,v 1.16 2012/05/03 18:02:22 jdhore Exp $
-
-EAPI=4
-inherit eutils
-
-DESCRIPTION="Graphical tool to show free disk space"
-HOMEPAGE="http://gentoo.org/"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ia64 ppc ppc64 sparc x86"
-IUSE="nls"
-
-RDEPEND="x11-libs/gtk+:2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-tempfile.patch \
-		"${FILESDIR}"/${PV}-makefile-DESTDIR.patch \
-		"${FILESDIR}"/${P}-make-382.patch
-
-	echo 'Categories=GTK;System;Filesystem;' >> gtkdiskfree.desktop
-}
-
-src_configure() {
-	econf $(use_enable nls)
-}
-
-src_install() {
-	default
-	doicon gtkdiskfree.png
-	domenu gtkdiskfree.desktop
-}
--- a/app-admin/gtkdiskfree/gtkdiskfree-2.0.1-r1.ebuild
+++ b/app-admin/gtkdiskfree/gtkdiskfree-2.0.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-admin/gtkdiskfree/gtkdiskfree-2.0.1-r1.ebuild,v 1.1 2013/08/19 16:39:32 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gtkdiskfree/gtkdiskfree-2.0.1-r1.ebuild,v 1.2 2013/12/13 17:29:50 pinkbyte Exp $

 EAPI=5

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

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

 RDEPEND="x11-libs/gtk+:3"
--- a/app-admin/gtkdiskfree/gtkdiskfree-2.0.1.ebuild
+++ b/app-admin/gtkdiskfree/gtkdiskfree-2.0.1.ebuild
@ -1,37 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gtkdiskfree/gtkdiskfree-2.0.1.ebuild,v 1.6 2012/07/26 20:48:25 xmw Exp $
-
-EAPI=4
-
-inherit autotools
-
-DESCRIPTION="Graphical tool to show free disk space"
-HOMEPAGE="https://gitorious.org/gtkdiskfree"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="gtk3 nls"
-
-RDEPEND="gtk3? ( x11-libs/gtk+:3 )
-	!gtk3? ( x11-libs/gtk+:3 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-S=${WORKDIR}/${PN}-master
-
-src_prepare() {
-	sed -e '/^CFLAGS=/s:=" -Wall -O2 :+=" :' \
-		-i configure.in || die
-	eautoreconf
-}
-
-src_configure() {
-	local my_econf="--with-gtk2"
-	use gtk3 && my_econf="--without-gtk2"
-	econf $(use_enable nls) \
-		${my_econf}
-}
--- a/app-admin/gtkdiskfree/metadata.xml
+++ b/app-admin/gtkdiskfree/metadata.xml
@ -10,9 +10,6 @@
 	<email>xmw@gentoo.org</email>
 	<name>Michael Weber</name>
 </maintainer>
-<use>
-	<flag name="gtk3">Use GTK+3 instead of 2</flag>
-</use>
 <longdescription>
 gtkdiskfree is a gtk extension to the cli tool df, does the same and more
 </longdescription>
--- a/app-backup/bareos/bareos-12.4.5-r1.ebuild
+++ b/app-backup/bareos/bareos-12.4.5-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-backup/bareos/bareos-12.4.5-r1.ebuild,v 1.1 2013/11/12 09:19:10 mschiff Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bareos/bareos-12.4.5-r1.ebuild,v 1.2 2013/12/14 03:18:06 mschiff Exp $

 EAPI="5"

@ -12,6 +12,7 @@ inherit eutils multilib python-single-r1 qt4-r2 user
 DESCRIPTION="Featureful client/server network backup suite"
 HOMEPAGE="http://www.bareos.org/"
 SRC_URI="https://github.com/${PN}/${PN}/archive/Release/${PV}.tar.gz -> ${P}.tar.gz"
+RESTRICT="mirror"

 LICENSE="AGPL-3"
 SLOT="0"
--- a/app-backup/bareos/bareos-13.2.2.ebuild
+++ b/app-backup/bareos/bareos-13.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-backup/bareos/bareos-13.2.2.ebuild,v 1.1 2013/12/03 22:56:16 mschiff Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bareos/bareos-13.2.2.ebuild,v 1.2 2013/12/14 03:18:06 mschiff Exp $

 EAPI="5"

@ -12,6 +12,7 @@ inherit eutils multilib python-single-r1 qt4-r2 user
 DESCRIPTION="Featureful client/server network backup suite"
 HOMEPAGE="http://www.bareos.org/"
 SRC_URI="https://github.com/${PN}/${PN}/archive/Release/${PV}.tar.gz -> ${P}.tar.gz"
+RESTRICT="mirror"

 LICENSE="AGPL-3"
 SLOT="0"
--- a/app-editors/adie/Manifest
+++ b/app-editors/adie/Manifest
@ -1,3 +1,4 @@
 DIST fox-1.6.36.tar.gz 4344694 SHA256 cf8f4d09e104d6b3c425df3ce5b3bd54ed4c8095389f742f81370aba16169dff SHA512 2985404d6b2122159e9859d3490a154b75429bb1cf9d9920155f454012ef88fbd005548db0e68d55826d7b9d68ec745bccd14e27a8ff13bdbf5c8357f47ccdc0 WHIRLPOOL 74af19f2d041b785e88799b1fc8aad5c94efa30e53b9fecd0e8bfb6abff58c3930ef28e91d3199d79acacb100d2281ad7497bc1656556ef0d78daa109f90c860
 DIST fox-1.7.42.tar.gz 5062065 SHA256 5e7a69c64ecfc704c130ea890385256c568fadbb472f91d8256f576b6d87ecf4 SHA512 7ae7cbfd120dbb9edcb723e9ac34f5d04ea9e961936bd8fcbe84cb371913e877d87886c8c3a286a467357f40924321e7591e17778f6e5fa7e010a762627d694d WHIRLPOOL 3062d7ba7b02115d3d0a6cafac09c0569a2f398223dc10a60ba14e63ef788f101c9c8d5a3fb5cf8deb666d2fb29f35129995b1f2d229c597b05ce90735deea03
 DIST fox-1.7.43.tar.gz 5077930 SHA256 6d3c41c431d01179866b114f24cd749a9aef8ef8dab1dec4f657895107eb70ee SHA512 34a7fae1ad7072df4179a5e55c2e82420d2ffbcd3a8cf3de9b2020b30f3d15c22dcd471ec3ff120b73071a6de91956c0ce6ea62696eb80b880f784f2b642d970 WHIRLPOOL b5ebf3345dde5abe05a9175c01f9d3dc3ad690494ba800a1f57bfab3b145cc002e8cd88a6a1fb4ade42b615453fe2213dff564c0a11958e6f21ce84707338c1e
+DIST fox-1.7.44.tar.gz 5251615 SHA256 1fbead78847d2a2c6ae8a18a5317713f2ef36d4ebeddacf5d097b915e4728b4c SHA512 ba09a6a3bbf569beb1654070e93358a64ba8f81feac80927e4953fe8645722045ef6e95e64749c9f9783e56a482a9e6131fd16f4a5b386383643e2b0e3c56193 WHIRLPOOL 14e9ad3d04cdc712b8cf5cd0e52e4b6a208880159be476c97ca8a45c9f2280bebcef9b92dd17b130d1cb23743e465512c1d97ce3fe67999c589d51878e633bd7
--- a/app-editors/adie/adie-1.7.44.ebuild
+++ b/app-editors/adie/adie-1.7.44.ebuild
@ -0,0 +1,17 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/adie/adie-1.7.44.ebuild,v 1.1 2013/12/13 21:06:36 mabi Exp $
+
+EAPI="4"
+
+inherit fox
+
+DESCRIPTION="Text editor based on the FOX Toolkit"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+DEPEND="~x11-libs/fox-${PV}"
+RDEPEND="${DEPEND}"
--- a/app-editors/gvim/gvim-7.4.94.ebuild
+++ b/app-editors/gvim/gvim-7.4.94.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/gvim/gvim-7.4.94.ebuild,v 1.1 2013/11/19 10:28:43 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-7.4.94.ebuild,v 1.2 2013/12/14 07:35:59 jlec Exp $

 EAPI=5
 VIM_VERSION="7.4"
@ -283,8 +283,7 @@ src_test() {
 	ln -s "${S}"/src/gvim "${S}"/src/testvim

 	# Don't try to do the additional GUI test
-	emake -j1 VIMPROG=../testvim nongui \
-		|| die "At least one test failed"
+	emake -j1 VIMPROG=../testvim nongui
 }

 # Make convenience symlinks, hopefully without stepping on toes.  Some
@ -343,10 +342,8 @@ src_install() {
 	newins "${FILESDIR}"/gvimrc-r1 gvimrc
 	eprefixify "${ED}"/etc/vim/gvimrc

-	insinto /usr/share/applications
-	newins "${FILESDIR}"/gvim.desktop-r2 gvim.desktop
-	insinto /usr/share/pixmaps
-	doins "${FILESDIR}"/gvim.xpm
+	domenu "${FILESDIR}"/gvim.desktop-r2 gvim.desktop
+	doicon "${FILESDIR}"/gvim.xpm

 	# bash completion script, bug #79018.
 	newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
--- a/app-emulation/virt-manager/virt-manager-0.10.0-r2.ebuild
+++ b/app-emulation/virt-manager/virt-manager-0.10.0-r2.ebuild
@ -0,0 +1,88 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-manager/virt-manager-0.10.0-r2.ebuild,v 1.1 2013/12/14 02:04:48 cardoe Exp $
+
+EAPI=5
+
+BACKPORTS=1cd29748
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+DISTUTILS_SINGLE_IMPL=1
+
+inherit gnome2 distutils-r1
+
+DESCRIPTION="A graphical tool for administering virtual machines"
+HOMEPAGE="http://virt-manager.org"
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git-2
+	SRC_URI=""
+	KEYWORDS=""
+	EGIT_REPO_URI="git://git.fedorahosted.org/virt-manager.git"
+else
+	SRC_URI="http://virt-manager.org/download/sources/${PN}/${P}.tar.gz
+	${BACKPORTS+http://dev.gentoo.org/~cardoe/distfiles/${P}-${BACKPORTS}.tar.xz}"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="gnome-keyring gtk policykit sasl"
+
+RDEPEND="!app-emulation/virtinst
+	|| (
+		dev-python/libvirt-python[${PYTHON_USEDEP}]
+		>=app-emulation/libvirt-0.7.0[python(-),${PYTHON_USEDEP}]
+	)
+	>=app-emulation/libvirt-glib-0.0.9[introspection,python,${PYTHON_USEDEP}]
+	${PYTHON_DEPS}
+	dev-libs/libxml2[python,${PYTHON_USEDEP}]
+	dev-python/ipaddr[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	dev-python/urlgrabber[${PYTHON_USEDEP}]
+	gtk? (
+		x11-libs/gtk+:3[introspection]
+		gnome-base/dconf
+		>=net-libs/gtk-vnc-0.3.8[gtk3,introspection,python,${PYTHON_USEDEP}]
+		net-misc/spice-gtk[gtk3,introspection,python,sasl?,${PYTHON_USEDEP}]
+		x11-libs/vte:2.90[introspection]
+		gnome-keyring? ( dev-python/gnome-keyring-python )
+		policykit? ( sys-auth/polkit[introspection] )
+	)"
+DEPEND="${RDEPEND}
+	dev-lang/perl
+	dev-util/intltool"
+
+DOCS=( README NEWS )
+
+distutils-r1_python_compile() {
+	local defgraphics=
+
+	esetup.py configure \
+		--qemu-user=qemu \
+		--default-graphics=spice
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	python_fix_shebang \
+		"${ED}"/usr/share/virt-manager/virt-{clone,convert,image,install,manager}
+}
+
+pkg_preinst() {
+	if use gtk; then
+		gnome2_pkg_preinst
+
+		cd "${ED}"
+		export GNOME2_ECLASS_ICONS=$(find 'usr/share/virt-manager/icons' -maxdepth 1 -mindepth 1 -type d 2> /dev/null)
+	else
+		rm -rf "${ED}/usr/share/virt-manager/virtManager"
+		rm -f "${ED}/usr/share/virt-manager/virt-manager"
+		rm -rf "${ED}/usr/share/virt-manager/ui/"
+		rm -rf "${ED}/usr/share/virt-manager/icons/"
+		rm -rf "${ED}/usr/share/man/man1/virt-manager.1*"
+		rm -rf "${ED}/usr/share/icons/"
+		rm -rf "${ED}/usr/share/applications/virt-manager.desktop"
+		rm -rf "${ED}/usr/bin/virt-manager"
+	fi
+}
--- a/app-office/QtBitcoinTrader/Manifest
+++ b/app-office/QtBitcoinTrader/Manifest
@ -1 +1 @@
-DIST QtBitcoinTrader-1.07.05.tar.gz 175085 SHA256 fd9d7497ac2bada2086aae4a0a41ff45cc5d9a365da7150aad9ca40c44643922 SHA512 f49225d9c8aa84d0c56133db3c4c813ea5d50537187e26f00b1953906d7c439df9b5275b42cbea213a5086d4a40da8b10927bbded36b91320d53d93f9265806f WHIRLPOOL b0a6e8274b85e36322207d99f81010611d99714946e507e34e40540cd4d20850715a0c1a93cd83f3e68b3e3be05b7b20915cb863b75cee1b8292ad5fb73a36c7
+DIST QtBitcoinTrader-1.07.96.4.tar.gz 541157 SHA256 69c5323459447d22d8de91a351edf80f387ddb638a54f8ccdf7309d474f1e6a5 SHA512 5fd0632b44886d75f290a95456de86a8b9b00e3977d17d65686fcacc2ebe98eb9f4ee1e35468bfcf52b06838640ccaf2a47085c23270e28874184aad74f149ce WHIRLPOOL 857425590c6b4645aa24a56f801a199807d2495725f1a7772a59c8e7202683e68bcaef5096f859f3cbb77f04a3aaa029ea31e7a491d46ae8d471f4e2afc0801f
--- a/app-office/QtBitcoinTrader/QtBitcoinTrader-1.07.96.4.ebuild
+++ b/app-office/QtBitcoinTrader/QtBitcoinTrader-1.07.96.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-office/QtBitcoinTrader/QtBitcoinTrader-1.07.05.ebuild,v 1.1 2013/07/05 12:59:10 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/QtBitcoinTrader/QtBitcoinTrader-1.07.96.4.ebuild,v 1.1 2013/12/14 03:28:27 alexxy Exp $

 EAPI=5

@ -9,6 +9,7 @@ if [[ $PV = *9999* ]]; then
 	EGIT_REPO_URI="
 		git://github.com/JulyIGHOR/QtBitcoinTrader.git
 		https://github.com/JulyIGHOR/QtBitcoinTrader.git"
+	EGIT_BRANCH="testing"
 	SRC_URI=""
 	KEYWORDS=""
 else
@ -33,7 +34,7 @@ RDEPEND="${DEPEND}"

 src_configure() {
 	eqmake4 \
-		src/${PN}.pro \
+		src/${PN}_Desktop.pro \
 		PREFIX="${EPREFIX}/usr" \
 		DESKTOPDIR="${EPREFIX}/usr/share/applications" \
 		ICONDIR="${EPREFIX}/usr/share/pixmaps"
--- a/app-office/QtBitcoinTrader/QtBitcoinTrader-9999.ebuild
+++ b/app-office/QtBitcoinTrader/QtBitcoinTrader-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/app-office/QtBitcoinTrader/QtBitcoinTrader-9999.ebuild,v 1.3 2013/12/09 11:41:45 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/QtBitcoinTrader/QtBitcoinTrader-9999.ebuild,v 1.4 2013/12/14 03:28:27 alexxy Exp $

 EAPI=5

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

 src_configure() {
 	eqmake4 \
-		src/${PN}.pro \
+		src/${PN}_Desktop.pro \
 		PREFIX="${EPREFIX}/usr" \
 		DESKTOPDIR="${EPREFIX}/usr/share/applications" \
 		ICONDIR="${EPREFIX}/usr/share/pixmaps"
--- a/app-office/abiword/abiword-3.0.0-r1.ebuild
+++ b/app-office/abiword/abiword-3.0.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/app-office/abiword/abiword-3.0.0-r1.ebuild,v 1.5 2013/12/08 17:44:16 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/abiword-3.0.0-r1.ebuild,v 1.6 2013/12/13 19:05:24 pacho Exp $

 EAPI=5
 GCONF_DEBUG="yes"
@ -22,11 +22,11 @@ REQUIRED_USE="!plugins? ( !collab !grammar !latex !math !ots !readline !thesauru

 RDEPEND="
 	>=app-text/wv-1.2
-	dev-lang/perl
 	>=dev-libs/boost-1.40.0
 	>=dev-libs/fribidi-0.10.4
 	>=dev-libs/glib-2.16:2
 	>=dev-libs/libgcrypt-1.4.5
+	dev-libs/libxslt
 	>=gnome-base/librsvg-2.16:2
 	>=gnome-extra/libgsf-1.14.18
 	>=media-libs/libpng-1.2
@ -45,7 +45,6 @@ RDEPEND="
 			net-libs/libsoup:2.4
 			net-libs/gnutls )
 		grammar? ( >=dev-libs/link-grammar-4.2.1 )
-		latex? ( dev-libs/libxslt )
 		math? ( >=x11-libs/gtkmathview-0.7.5 )
 		ots? ( >=app-text/ots-0.5-r1 )
 		readline? ( sys-libs/readline )
@ -62,6 +61,7 @@ RDEPEND="
 	!<app-office/abiword-plugins-2.8
 "
 DEPEND="${RDEPEND}
+	dev-lang/perl
 	virtual/pkgconfig
 	collab? ( dev-cpp/asio )
 "
--- a/app-text/gsview/Manifest
+++ b/app-text/gsview/Manifest
@ -1 +0,0 @@
-DIST gsv49src.zip 1455372 SHA256 37829125d90957bb66e9b1bc71bff64f9da3553dc8fcf6078944269b3202b78d SHA512 2a276adefcc6fa64dd3edcf10624f60cffc4e185e6ff4f96a08e1d87fb3d6c097d8cd32d2c14301cb3fa575cf27ba261d8d587369091a292e34fe0bd58e70f57 WHIRLPOOL 62de55de31a6707628801ab30492523780f8995b5d2e836b1c6fb999b45f083e16eab03a2cf3aa586ea6c5b0243892a8a74be88c259ba75e948dd9d58113aab4
--- a/app-text/gsview/files/4.9-gentoo.patch
+++ b/app-text/gsview/files/4.9-gentoo.patch
@ -1,31 +0,0 @@
-diff --git a/srcunx/unx.mak b/srcunx/unx.mak
-index 3bd1769..ee86618 100644
--- a/srcunx/unx.mak
-+++ b/srcunx/unx.mak
-@@ -39,7 +39,7 @@ GSVIEW_DOCPATH=$(GSVIEW_BASE)/share/doc
- GSVIEW_ETCPATH=$(prefix)/etc
- 
- MAKE=make
-CC=gcc
-+CC ?= gcc
- OBJ=o
- INSTALL=install -m 644
- INSTALL_EXE=install -m 755
-@@ -77,7 +77,7 @@ PLINK=-lpthread -lrt
- 
- # Other possible options are -Wtraditional
- # Compiler flags for C and C++ files.
-CFLAGS=-O -Wall -Wstrict-prototypes -Wmissing-declarations -Wmissing-prototypes -fno-builtin -fno-common -Wcast-qual -Wwrite-strings $(CDEBUG) -DX11 -DUNIX -DNONAG $(RPM_OPT_FLAGS) `gtk-config --cflags` $(XINCLUDE) $(PFLAGS)
-+CFLAGS += $(CDEBUG) -DX11 -DUNIX -DNONAG $(RPM_OPT_FLAGS) `gtk-config --cflags` $(XINCLUDE) $(PFLAGS)
- 
- # Linker flags
- LFLAGS=$(LDEBUG) $(PLINK) `gtk-config --libs`
-@@ -155,7 +155,7 @@ all: $(BD)gsview$(EXE) html
- GSVIEW_DOCDIR=$(GSVIEW_DOCPATH)/gsview-$(GSVIEW_DOT_VERSION)
- 
- $(BD)gsview$(EXE): $(OBJS)
-	$(COMP) $(CFLAGS) $(FO)$(BD)gsview$(EXE) $(OBJS) $(LFLAGS)
-+	$(COMP) $(CFLAGS) $(LDFLAGS) $(FO)$(BD)gsview$(EXE) $(OBJS) $(LFLAGS)
- 
- install: all
- 	-mkdir -p $(GSVIEW_BASE)
--- a/app-text/gsview/files/gsview-4.9-libdl.patch
+++ b/app-text/gsview/files/gsview-4.9-libdl.patch
@ -1,12 +0,0 @@
-diff -ruN gsview-4.9.orig/srcunx/unx.mak gsview-4.9/srcunx/unx.mak
--- gsview-4.9.orig/srcunx/unx.mak	2004-11-27 16:51:26.000000000 +0100
-+++ gsview-4.9/srcunx/unx.mak	2012-01-31 00:36:50.000000000 +0100
-@@ -80,7 +80,7 @@
- CFLAGS=-O -Wall -Wstrict-prototypes -Wmissing-declarations -Wmissing-prototypes -fno-builtin -fno-common -Wcast-qual -Wwrite-strings $(CDEBUG) -DX11 -DUNIX -DNONAG $(RPM_OPT_FLAGS) `gtk-config --cflags` $(XINCLUDE) $(PFLAGS)
- 
- # Linker flags
-LFLAGS=$(LDEBUG) $(PLINK) `gtk-config --libs`
-+LFLAGS=$(LDEBUG) $(PLINK) `gtk-config --libs` -ldl
- 
- COMP=$(CC) $(CFLAGS) -I. -I$(SRCDIR) -I$(SRCUNXDIR) -I$(OBJDIR)
- CCAUX=$(CC) $(CFLAGS) -I$(SRCDIR)
--- a/app-text/gsview/files/gsview-help
+++ b/app-text/gsview/files/gsview-help
@ -1,23 +0,0 @@
-#!/bin/sh
-
-if [ -z "$1" ]
-then
-  echo "Usage: $0 URL [TAG]"
-  echo "  URL: The URL to open"
-  echo "  TAG: The anchor at that url"
-  exit 1
-fi
-
-if [ -z "$2" ]
-then
-  TAG=''
-else
-  TAG="#$2"
-fi 
-
-if mozilla -remote openFile\(file://$1$TAG\) ; then
-    exit 0
-else
-    mozilla file://$1$TAG
-fi 
-exit 0
--- a/app-text/gsview/gsview-4.9.ebuild
+++ b/app-text/gsview/gsview-4.9.ebuild
@ -1,63 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/gsview/gsview-4.9.ebuild,v 1.8 2012/02/16 18:24:09 phajdan.jr Exp $
-
-EAPI="3"
-
-inherit eutils toolchain-funcs
-
-MY_PV="${PV/.}"
-
-DESCRIPTION="gsView PostScript and PDF viewer"
-HOMEPAGE="http://www.cs.wisc.edu/~ghost/gsview/"
-SRC_URI="ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/ghostgum/gsv${MY_PV}src.zip"
-
-IUSE="doc"
-SLOT="0"
-LICENSE="Aladdin"
-KEYWORDS="amd64 hppa ppc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="x11-libs/gtk+:1
-	app-text/epstool
-	app-text/pstotext
-	app-text/ghostscript-gpl"
-DEPEND="app-arch/unzip
-	x11-libs/gtk+:1"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PV}-gentoo.patch
-	epatch "${FILESDIR}"/${P}-libdl.patch
-	tc-export CC
-}
-
-src_compile() {
-	ln -sf srcunx/unx.mak Makefile || die
-
-	## respect CFLAGS
-	sed -i -e "s:^CFLAGS=-O :CFLAGS=${CFLAGS} :g" Makefile || die
-	sed -i -e "s:GSVIEW_DOCPATH:\"${EPREFIX}/usr/share/doc/${PF}/html/\":" srcunx/gvx.c || die
-
-	## run Makefile
-	# bug #283165
-	emake -j1 || die "Error compiling files."
-}
-
-src_install() {
-	dobin bin/gsview || die
-
-	doman srcunx/gsview.1 || die
-
-	dodoc gsview.css cdorder.txt regorder.txt || die
-
-	if use doc
-	then
-		dobin "${FILESDIR}"/gsview-help || die
-		dohtml *.htm bin/*.htm || die
-	fi
-
-	insinto /etc/gsview
-	doins src/printer.ini || die
-
-	make_desktop_entry gsview Gsview "" "Office" ||
-		die "Couldn't make gsview desktop entry"
-}
--- a/app-text/qpdfview/files/qpdfview-0.4.7-fix-sqlite-build.patch
+++ b/app-text/qpdfview/files/qpdfview-0.4.7-fix-sqlite-build.patch
@ -0,0 +1,21 @@
+Upstream:
+http://bazaar.launchpad.net/~adamreichold/qpdfview/trunk/revision/1391
+Gentoo bugzilla:
+https://bugs.gentoo.org/show_bug.cgi?id=493514
+=== modified file 'sources/database.h'
+--- sources/database.h	2013-11-25 16:06:34 +0000
+++ sources/database.h	2013-12-07 12:28:03 +0000
+@@ -64,10 +64,10 @@
+     static Database* s_instance;
+     Database(QObject* parent = 0);
+ 
+-#ifdef WITH_SQL
+-
+     static QString instanceName();
+ 
+#ifdef WITH_SQL
+
+     void migrateTabs_v1_v2();
+     void migrateBookmarks_v1_v2();
+ 
+
--- a/app-text/qpdfview/qpdfview-0.4.7.ebuild
+++ b/app-text/qpdfview/qpdfview-0.4.7.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/qpdfview/qpdfview-0.4.7.ebuild,v 1.1 2013/12/07 07:18:33 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/qpdfview/qpdfview-0.4.7.ebuild,v 1.2 2013/12/14 11:03:53 hwoarang Exp $

 EAPI=5

@ -29,6 +29,7 @@ RDEPEND="dev-qt/qtcore:4[iconv]
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"

+PATCHES=("${FILESDIR}/${P}-fix-sqlite-build.patch")
 DOCS=( CHANGES CONTRIBUTORS README TODO )

 prepare_locale() {
--- a/dev-haskell/yesod-platform/Manifest
+++ b/dev-haskell/yesod-platform/Manifest
@ -1,2 +1,3 @@
 DIST yesod-platform-1.2.4.2.tar.gz 2620 SHA256 9c744420068d8470808b551cf1112910299df39d8864b67d6d9d8d88256fbfc2 SHA512 5efe3d1a42198504912d1dbf14b2612f2820ccb914eb3202853af85c0123c490cdd54b5ea53489dfb8ced09d4037afd9c55ca467d6ab32d4d517c3f98e61033b WHIRLPOOL ade230dde986cbc2db7841d1549fa6d7d16eaee82dc0a6d831c41c73e561afabc9523e5d9293ef30a57bb0a0cc4bf1714d1dcc5d084975b670fedc37b89d549c
+DIST yesod-platform-1.2.5.1.tar.gz 2682 SHA256 f7b01684c158fcc6dafe7e908af78fad111e5e07159d3a3485ed52fe3ea79ae9 SHA512 eadd51a3fff7ef9bc95bf3c45906a24b39a2e497350abcf8aab339e710a58c9a9933f45bdbabe22c1e81201e08b9fa7e14cb6e92ba66755150d3933733a82dfe WHIRLPOOL 9506eb5531dbbf278759bd6f29900f176df3071aea5fc0f05c22805ecc0477bbc4b7dac47156b933e94aa1542d94032fa99f5f54a0adb373515b699c77ce633f
 DIST yesod-platform-1.2.5.tar.gz 2684 SHA256 c3c539af8ca3eb15250ab76599933c519fbbfb7e3eefab6562f7570be3c8a1e1 SHA512 7c2ef36ddc5eed0a88c9d397c91dda8b3f3971f9d833c202eb30f7ca08b39d1c1ba461118e210270f4e9c2028da0def44bd27e8f8f5ee2ed8fee9c5582bd9cd3 WHIRLPOOL e458e213a3b25d651155055d7820eae058dc4dceb0d22c8670c64488966a00823bf2d48bf289c135a92970a2299e2f482a4a79aebbaef542a02a8ef0f2319dc1
--- a/dev-haskell/yesod-platform/yesod-platform-1.2.5.1.ebuild
+++ b/dev-haskell/yesod-platform/yesod-platform-1.2.5.1.ebuild
@ -0,0 +1,164 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/yesod-platform/yesod-platform-1.2.5.1.ebuild,v 1.1 2013/12/13 05:12:03 gienah Exp $
+
+EAPI=5
+
+# ebuild generated by hackport 0.3.5.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Meta package for Yesod"
+HOMEPAGE="http://www.yesodweb.com/"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/aeson-0.6.2.1:=[profile?]
+	>=dev-haskell/ansi-terminal-0.6:=[profile?]
+	>=dev-haskell/asn1-data-0.7.1:=[profile?]
+	>=dev-haskell/asn1-types-0.2.2:=[profile?]
+	>=dev-haskell/attoparsec-0.10.4.0:=[profile?]
+	>=dev-haskell/attoparsec-conduit-1.0.1.2:=[profile?]
+	>=dev-haskell/authenticate-1.3.2.6:=[profile?]
+	>=dev-haskell/base-unicode-symbols-0.2.2.4:=[profile?]
+	>=dev-haskell/base64-bytestring-1.0.0.1:=[profile?]
+	>=dev-haskell/blaze-builder-0.3.3.2:=[profile?]
+	>=dev-haskell/blaze-builder-conduit-1.0.0:=[profile?]
+	>=dev-haskell/blaze-html-0.6.1.2:=[profile?]
+	>=dev-haskell/blaze-markup-0.5.1.6:=[profile?]
+	>=dev-haskell/byteable-0.1.1:=[profile?]
+	>=dev-haskell/byteorder-1.0.4:=[profile?]
+	>=dev-haskell/case-insensitive-1.1.0.2:=[profile?]
+	>=dev-haskell/cereal-0.4.0.1:=[profile?]
+	>=dev-haskell/certificate-1.3.9:=[profile?]
+	>=dev-haskell/cipher-aes-0.2.6:=[profile?]
+	>=dev-haskell/cipher-rc4-0.1.4:=[profile?]
+	>=dev-haskell/clientsession-0.9.0.3:=[profile?]
+	>=dev-haskell/conduit-1.0.9.3:=[profile?]
+	>=dev-haskell/connection-0.1.3.1:=[profile?]
+	>=dev-haskell/control-monad-loop-0.1:=[profile?]
+	>=dev-haskell/cookie-0.4.0.1:=[profile?]
+	>=dev-haskell/cprng-aes-0.5.2:=[profile?]
+	>=dev-haskell/crypto-api-0.12.2.2:=[profile?]
+	>=dev-haskell/crypto-cipher-types-0.0.9:=[profile?]
+	>=dev-haskell/crypto-conduit-0.5.2.1:=[profile?]
+	>=dev-haskell/crypto-numbers-0.2.3:=[profile?]
+	>=dev-haskell/crypto-pubkey-0.2.3:=[profile?]
+	>=dev-haskell/crypto-pubkey-types-0.4.1:=[profile?]
+	>=dev-haskell/crypto-random-0.0.7:=[profile?]
+	>=dev-haskell/cryptohash-0.11.1:=[profile?]
+	>=dev-haskell/cryptohash-cryptoapi-0.1.0:=[profile?]
+	>=dev-haskell/css-text-0.1.1:=[profile?]
+	>=dev-haskell/data-default-0.5.3:=[profile?]
+	>=dev-haskell/data-default-class-0.0.1:=[profile?]
+	>=dev-haskell/data-default-instances-base-0.0.1:=[profile?]
+	>=dev-haskell/data-default-instances-containers-0.0.1:=[profile?]
+	>=dev-haskell/data-default-instances-dlist-0.0.1:=[profile?]
+	>=dev-haskell/data-default-instances-old-locale-0.0.1:=[profile?]
+	>=dev-haskell/dlist-0.6.0.1:=[profile?]
+	>=dev-haskell/email-validate-1.0.0:=[profile?]
+	>=dev-haskell/entropy-0.2.2.4:=[profile?]
+	>=dev-haskell/failure-0.2.0.1:=[profile?]
+	>=dev-haskell/fast-logger-2.0.0:=[profile?]
+	>=dev-haskell/file-embed-0.0.6:=[profile?]
+	>=dev-haskell/filesystem-conduit-1.0.0.1:=[profile?]
+	>=dev-haskell/hamlet-1.1.7.5:=[profile?]
+	>=dev-haskell/hjsmin-0.1.4.4:=[profile?]
+	>=dev-haskell/hspec-1.8.1.1:=[profile?]
+	>=dev-haskell/hspec-expectations-0.5.0.1:=[profile?]
+	>=dev-haskell/html-conduit-1.1.0.1:=[profile?]
+	>=dev-haskell/http-attoparsec-0.1.0:=[profile?]
+	>=dev-haskell/http-client-0.2.0.3:=[profile?]
+	>=dev-haskell/http-client-conduit-0.2.0.0:=[profile?]
+	>=dev-haskell/http-client-tls-0.2.0.0:=[profile?]
+	>=dev-haskell/http-conduit-2.0.0.2:=[profile?]
+	>=dev-haskell/http-date-0.0.4:=[profile?]
+	>=dev-haskell/http-types-0.8.3:=[profile?]
+	>=dev-haskell/language-javascript-0.5.8:=[profile?]
+	>=dev-haskell/lifted-base-0.2.1.1:=[profile?]
+	>=dev-haskell/mime-mail-0.4.2.1:=[profile?]
+	>=dev-haskell/mime-types-0.1.0.3:=[profile?]
+	>=dev-haskell/mmorph-1.0.0:=[profile?]
+	>=dev-haskell/monad-control-0.3.2.2:=[profile?]
+	>=dev-haskell/monad-logger-0.3.3.1:=[profile?]
+	>=dev-haskell/monad-loops-0.4.2:=[profile?]
+	>=dev-haskell/network-conduit-1.0.0:=[profile?]
+	>=dev-haskell/path-pieces-0.1.3.1:=[profile?]
+	>=dev-haskell/pem-0.2.1:=[profile?]
+	>=dev-haskell/persistent-1.2.3.0:=[profile?]
+	>=dev-haskell/persistent-template-1.2.0.6:=[profile?]
+	>=dev-haskell/pool-conduit-0.1.2:=[profile?]
+	>=dev-haskell/primitive-0.5.1.0:=[profile?]
+	>=dev-haskell/process-conduit-1.0.0.1:=[profile?]
+	>=dev-haskell/publicsuffixlist-0.1:=[profile?]
+	>=dev-haskell/puremd5-2.1.2.1:=[profile?]
+	>=dev-haskell/pwstore-fast-2.4.1:=[profile?]
+	>=dev-haskell/quickcheck-io-0.1.0:=[profile?]
+	>=dev-haskell/resource-pool-0.2.1.1:=[profile?]
+	>=dev-haskell/resourcet-0.4.9:=[profile?]
+	>=dev-haskell/safe-0.3.3:=[profile?]
+	>=dev-haskell/securemem-0.1.3:=[profile?]
+	>=dev-haskell/semigroups-0.12.1:=[profile?]
+	>=dev-haskell/setenv-0.1.1:=[profile?]
+	>=dev-haskell/sha-1.6.1:=[profile?]
+	>=dev-haskell/shakespeare-1.2.0.3:=[profile?]
+	>=dev-haskell/shakespeare-css-1.0.6.6:=[profile?]
+	>=dev-haskell/shakespeare-i18n-1.0.0.5:=[profile?]
+	>=dev-haskell/shakespeare-js-1.2.0.2:=[profile?]
+	>=dev-haskell/shakespeare-text-1.0.0.10:=[profile?]
+	>=dev-haskell/silently-1.2.4.1:=[profile?]
+	>=dev-haskell/simple-sendfile-0.2.13:=[profile?]
+	>=dev-haskell/skein-1.0.8:=[profile?]
+	>=dev-haskell/socks-0.5.4:=[profile?]
+	>=dev-haskell/stm-chans-3.0.0:=[profile?]
+	>=dev-haskell/stringsearch-0.3.6.5:=[profile?]
+	>=dev-haskell/system-fileio-0.3.11:=[profile?]
+	>=dev-haskell/system-filepath-0.4.8:=[profile?]
+	>=dev-haskell/tagged-0.7:=[profile?]
+	>=dev-haskell/tagsoup-0.13:=[profile?]
+	>=dev-haskell/tagstream-conduit-0.5.4.1:=[profile?]
+	>=dev-haskell/tls-1.1.5:=[profile?]
+	>=dev-haskell/tls-extra-0.6.6:=[profile?]
+	>=dev-haskell/transformers-base-0.4.1:=[profile?]
+	>=dev-haskell/unix-compat-0.4.1.1:=[profile?]
+	>=dev-haskell/unordered-containers-0.2.3.3:=[profile?]
+	>=dev-haskell/utf8-light-0.4.2:=[profile?]
+	>=dev-haskell/utf8-string-0.3.7:=[profile?]
+	>=dev-haskell/vector-0.10.9.1:=[profile?]
+	>=dev-haskell/void-0.6.1:=[profile?]
+	>=dev-haskell/wai-2.0.0:=[profile?]
+	>=dev-haskell/wai-app-static-2.0.0.1:=[profile?]
+	>=dev-haskell/wai-extra-2.0.0.1:=[profile?]
+	>=dev-haskell/wai-logger-2.0.1:=[profile?]
+	>=dev-haskell/wai-test-2.0.0.1:=[profile?]
+	>=dev-haskell/warp-2.0.1:=[profile?]
+	>=dev-haskell/word8-0.0.4:=[profile?]
+	>=dev-haskell/xml-conduit-1.1.0.9:=[profile?]
+	>=dev-haskell/xml-types-0.3.4:=[profile?]
+	>=dev-haskell/xss-sanitize-0.3.4:=[profile?]
+	>=dev-haskell/yaml-0.8.5.2:=[profile?]
+	>=dev-haskell/yesod-1.2.4:=[profile?]
+	>=dev-haskell/yesod-auth-1.2.4:=[profile?]
+	>=dev-haskell/yesod-core-1.2.6.1:=[profile?]
+	>=dev-haskell/yesod-form-1.3.4:=[profile?]
+	>=dev-haskell/yesod-persistent-1.2.2:=[profile?]
+	>=dev-haskell/yesod-routes-1.2.0.3:=[profile?]
+	>=dev-haskell/yesod-static-1.2.2:=[profile?]
+	>=dev-haskell/yesod-test-1.2.1:=[profile?]
+	>=dev-haskell/zlib-bindings-0.1.1.3:=[profile?]
+	>=dev-haskell/zlib-conduit-1.0.0:=[profile?]
+	>=dev-lang/ghc-6.10.4:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.6.0.3
+"
+
+src_prepare() {
+	cabal_chdeps \
+		' == ' ' >= '
+}
--- a/dev-haskell/yesod-routes/Manifest
+++ b/dev-haskell/yesod-routes/Manifest
@ -1,4 +1,5 @@
 DIST yesod-routes-1.1.2.tar.gz 17709 SHA256 5b96189ab0e4ae07fd3904a9b8a7d53b5ecec0bc5c94627d4725e930cf17db9f SHA512 236dc8d53bce88b77bb832d57844a5379d0f9a1f0077c69f1e9fa24756ce411cff06eef5d66ac5bf50aa44f2211ffcbaf387bf336215df2029a982e0afdf608a WHIRLPOOL 2d91d3a05e69ccf16af88756fdab61b2f81b753a00ae79df07d35174c8bf8858c165c1039e8b6b06a53351bb0235f693bbca8619ad3bdce2aaf783962df536e3
 DIST yesod-routes-1.2.0.1.tar.gz 20178 SHA256 1f4540b1751f6b4132b18297c8982c063e91d3dba12a6164805c83c6d878e75e SHA512 c8c477309b7f34dd533bb771d50da9d957a0a4b6dce92ef58c707edf0b98eea488f18d88ea4a9189d77266d38c078491fc34306a902fd8567f259a53015c6846 WHIRLPOOL 4b3f2654d54e75f85f366b27c9aaa6886f15ea537ba61544c4c39d6a42515095065537ce725f9eed70aa9f99d64d7f01872383c8eca427cae7e01d3c08491c78
 DIST yesod-routes-1.2.0.2.tar.gz 20172 SHA256 c702a8ecd6dacc3bcb9206d1faed94a8b90d9d641b046a900a80cc9cbe764e56 SHA512 f305363fb8c8147301040fa7ac14338f851dc0eadbe32dc4e17de9baaf0397d9eddab63a6b41821754dd25ea9000b453d88c466cf42036fce611e0b95a2ae03e WHIRLPOOL 06e897c77ae7b33aa4c60fc9352b5e7f682d059da341875d2953780715578eafb56d074719ec2243685047bfe6d79797639267168b94ff0928eb700c3cb82f7c
+DIST yesod-routes-1.2.0.3.tar.gz 20266 SHA256 c31360a1f2c3c8cf549c6649480a0b70657359e4d8600e5aaf3474bd1620465c SHA512 ef2b6f3fa6d9e9137b83f25d37d87f3a968200d103c0a098ce2732471e9c625f2d40c03f8df51bd3cd1f92d918c5502f3e32caadf7e55fb3c1bd1876a7941c59 WHIRLPOOL 174812db5052416f94fefc26b98baca5a5672b931bb880159aa84592f354598bdae6b45e83bc01af5c28b1a3d02fa74bf28ef6979340ee73ae2960320bdcfde6
 DIST yesod-routes-1.2.0.tar.gz 20175 SHA256 62c5aa9a212a467c5918e250247c2801efa1b56cfcaaf1f1e108d02ccd06ffb4 SHA512 b3d4c11d2dc3be87780818671fda818a049272087a2bfde7cd7ff19ce7061e9570f9f14fa469f8b63a5b00abeddd3116b6d0bac800e9813d9f7b3e736af49042 WHIRLPOOL 1706dd1e15a9124ebe089de02cc153b4b9b3194ad2b2ba6ada02ef46d67e6078406030d39c02686c3eb5e120582f8988e51aeef051a262a3017981f6721820b9
--- a/dev-haskell/yesod-routes/yesod-routes-1.2.0.3.ebuild
+++ b/dev-haskell/yesod-routes/yesod-routes-1.2.0.3.ebuild
@ -0,0 +1,30 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/yesod-routes/yesod-routes-1.2.0.3.ebuild,v 1.1 2013/12/13 05:10:54 gienah Exp $
+
+EAPI=5
+
+# ebuild generated by hackport 0.3.5.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Efficient routing for Yesod."
+HOMEPAGE="http://www.yesodweb.com/"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/path-pieces-0.1:=[profile?] <dev-haskell/path-pieces-0.2:=[profile?]
+	>=dev-haskell/text-0.5:=[profile?]
+	>=dev-haskell/vector-0.8:=[profile?] <dev-haskell/vector-0.11:=[profile?]
+	>=dev-lang/ghc-6.10.4:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+	test? ( >=dev-haskell/hspec-1.3
+		>=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.3 )
+"
--- a/dev-lang/R/R-3.0.1.ebuild
+++ b/dev-lang/R/R-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-lang/R/R-3.0.1.ebuild,v 1.7 2013/11/03 20:38:33 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-3.0.1.ebuild,v 1.8 2013/12/13 18:33:19 ago Exp $

 EAPI=5

@ -15,7 +15,7 @@ SRC_URI="

 LICENSE="|| ( GPL-2 GPL-3 ) LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 hppa ~ia64 ~ppc ~ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="bash-completion cairo doc icu java jpeg lapack minimal nls openmp perl png prefix profile readline static-libs tiff tk X"
 REQUIRED_USE="png? ( || ( cairo X ) ) jpeg? ( || ( cairo X ) ) tiff? ( || ( cairo X ) )"

--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@ -1,14 +1,17 @@
 DIST php-5.3.27.tar.bz2 11432791 SHA256 e12db21c623b82a2244c4dd9b06bb75af20868c1b748a105a6829a5acc36b287 SHA512 e6f7f7c3c41d6007494ca8e6aac74dab5accf29c7bd8c2a70b085336fc75aa1dc879dacb6f33c8d42bcfda8e5326fde26c9f13994d740f2492417c904194571e WHIRLPOOL 4d02fb37913538b262796c962aa58cc5e00fd2fad411b6dd872cd10f5e9cdd1c6fc2ee14ef4159ce37d1fe9b6ce977765eb2bd199a45dae3fe2c6591fa9b41fc
+DIST php-5.3.28.tar.bz2 11051714 SHA256 0cac960c651c4fbb3d21cf2f2b279a06e21948fb35a0d1439b97296cac1d8513 SHA512 84b58379ca12748ae2c9ba37de28c80e78bf8e5b96cf9715b1eafd297a3e155089e9560d6fee7b031be0139dcbe954a9c0717b583ff1fb1cd8a89308b5f6dfd3 WHIRLPOOL 6912417784ae11bc3a9134378b5db5d0ee96cdee11e78929162f61f2104870a1d67b559fc3ff3513200a37a1cae0e83e88f1ba0fb5c07f9fb11844e935101dbf
 DIST php-5.4.17.tar.bz2 11697434 SHA256 dc49935387a5d1f6ac798a3bb4902ca5020f3aa74117ea848b58d1bb61327eb4 SHA512 b35ab1d815bb56247c5f8842967859bfdf37ede5e4c5da4496e4f1540b2412ecb08028ed29a3cb5b79204cddc8c2f5f50a1a0dd1484ed449503945f2ec3f817a WHIRLPOOL 3fcb8094ef8e2123cb7a620df17d1e900b61765bb8127f93edcc5b124fc4233c02467e8d202bcec9a72b45347597a978b33b5323c3c5666da99987ebe2dc5994
 DIST php-5.4.18.tar.bz2 11691676 SHA256 1d9409be15d651593456904140503367146923c347db4f471cde599192ff91d9 SHA512 e0376ca64e51b10c47eda4666edc68079a247d2a0b2e7fc4177ad7b461e5fa851b230ea52868e912417166a2db17e5b8ca86027f583d6ece6800d26a9ab10458 WHIRLPOOL 7644af6dd2cc441f5ebf4180ae2c969729663b13524b9282ec89c01ef349ef250175ba4ab9c1411b7955ed3113ee483d76424c45e85de3b6c1bfc963c2ab3f4b
 DIST php-5.4.19.tar.bz2 11692563 SHA256 7a565360e64c5be5102ef948e7c732778a40850e709270e64be7a3a3207c029b SHA512 290f5e7d1e2d5a40b6154290d2203d4d14fcf8365ae3d85c206802e7f3d4ffd692b550ac525e9c5ca0bf26dd5d7a6224b16175817c7bd98cbdef79aac4975ad0 WHIRLPOOL cef167a3d45f85f6f722eaee5202cd58e11807df22e9f8836a0ed2ca0179bb44b76f41f946e02710d4381f1cab27ce6e573c6e8d1809e11b4b2e8b1da7d6f11d
 DIST php-5.4.20.tar.bz2 11700446 SHA256 cd0e42cf8b01b2fe23d5acbb30e04d64e8df21b0b4093e28aef36743646759e1 SHA512 952cbeaf60813104be2ee03aaa4a402b2a52f3ea3eb706532318afc6c4f7ce642ab92e30108167ca08124da5d26d8181ecd395bdff8d75fdaaf6e9293f06380f WHIRLPOOL a292c5ef4e4a693c89b252b735d37db41c971a6fa02b3b090ed82aafd6c4e59561010ac26e630eb75243a725c28d299da3b278b7dd57bf6c7045d749d5b1ae28
 DIST php-5.4.21.tar.bz2 11703043 SHA256 ea8f7cee1adcc6f3c850f17334563c4a229f8792c18ca215517253b0dec656ec SHA512 7fcc8d3d4369f447bc4ec041ed5b15620d4f99537b636ee9d9486e9d1ee072839e03a54e445494d6a74362c72247d56037ea62d7577e0cf1d48c91581e7ebeac WHIRLPOOL 574541bc5a3706bf3fa84acb3ae06d722e8eb770b5a401d0e5d5fae78260719003cc68ab0acc18a92c0c1922979dd147a4cd652809296018912061c58041ff41
 DIST php-5.4.22.tar.bz2 12246577 SHA256 3b8619b030e372f2b64e3a059d05a3ef3354e81f8a72923ba45475bf222f7cca SHA512 b54d7ec2863de980146632c5fa64cfe858e9bba00df6c65e3db86ca631bed252a460287d4883e5ce1d420434d3e1ef3f0d6306699009fdd252a9762d58e90648 WHIRLPOOL d538eaad50227ffcbad31acd407d5ff5a971cdecd0c707c1e9ba5282a172098fd5c44b2462ac9466e722c81ac7ed1010409d3d7caeb2fbc20ea80a32218a4801
+DIST php-5.4.23.tar.bz2 12251671 SHA256 ae7c070fa9b9e16413ef944d910b68f3ba79192eca4010b0af132b8631bd91cc SHA512 3c306ba40e3649ef79a88534e1a12aa83c01f9edbbe9822a741af03e18c9a4e8587351e0f1760cc539b3b599209d546233e40d4d816f6a49cf81ad2d738486b7 WHIRLPOOL c6a6fc4ecd1a1fca1d4c317b37f5a4461bca580e64a4a3cb48c6efe327972ceccb2d6ecb2d632f945875c3df12dca3d37d6e57bf857fbc3d0a34149df644ea6b
 DIST php-5.5.2.tar.bz2 12292281 SHA256 e72aaf1fa96eac0bff127bfc74c174d1de50cd3f66d7e0e1ee919674ab463bb7 SHA512 87b0f0dd07b4efdc0c7dc6069081f7f02344d29372cc38bf0b1d1d9c1b73f56f62ee0b80f98cef37e2e13d41b30be256f1a8bff9a4f0fd7eb855d74e1376f261 WHIRLPOOL b88c03ec49c9269804e1f5aa5b5f499669f409c3fd76868d315c93c0acf4dd24d928836dd46cb948ce61c6553cc599d4bd377715d8534a6c71395e6f59e5878a
 DIST php-5.5.3.tar.bz2 12030241 SHA256 93080dd06dff7c4e54254f4bd6910e7cc4049d6226e6ac4c9bc52c16ebd5939a SHA512 2e2785775dde5987aca24c9f211048d583d42b49b67ac634a3ff2dc862ce1b9756f76bdf5c446d971d44a3926be024316ebe272806c665726302dceeb5e8c8bf WHIRLPOOL 6da8a4a9a23bc92d114bfce26c16642edbd6543b70b9bf8076be99dd53f25b9c8beee093a88b9d1cc17140ec97bc73a8634e23af6d7a93ac22c18c1cb0a2cef5
 DIST php-5.5.4.tar.bz2 12047184 SHA256 49f87e8cf0bbec53a6e7f1c8ab132fcec37bb09990404c7c959f81dfb1637439 SHA512 69c4c6279c0a74da7d500ffc14f5dd60e13600b69957f0d8b8ec6e94ffb65510c0a970eaa574dfc1fa89d4e9179543313d47d1a67efa100be0b1570b653237ba WHIRLPOOL b185bc615f78aa736519e6d019bc4d4df600ffdb283f25b47a74d497cc556cc7e312f53eda596a74fec4c7f10f54e6b20d56e0ed189bb36835f471c2051633d4
 DIST php-5.5.5.tar.bz2 12547974 SHA256 a400b324ae288eb0c9285e550fe5fd7f92c0f4e126496c3b05f9041da6cc04de SHA512 2423971a65b1888565a44ddf996a521c1b627278423cf7760209ae8b1a4f1d4863ecad0c8b5570ffc6f9cf8cfd8c9969c17880b79c2a9f50d3f6230f1b3db975 WHIRLPOOL 438783a2e24f8a562300f31249796a0ea0933a94d541d23f40be9eb4307fc07296ccceada6963aedc18315d30e4360478d71a723ebfcb00180e06c2afb87a5e3
 DIST php-5.5.6.tar.bz2 12983030 SHA256 a9b7d291199d7e6b90ef1d78eb791d738944d66856e76bde9463ce2645b0e4a4 SHA512 969f21805874d08a3a09a0a08bd127f589d65fe6518edfd0cb3274d4da60539dda2b55b7d88cabdcda1cda214008cea482c8f65672dfa92c80021641a87ed3ad WHIRLPOOL b5167c41bb2b76e6f755def6a33cc128915cf1313bc2dc2f697dae570874a1fccd2fd139c96b217ec30db4dc191744e2234a302fd3c06c7351cadcd881892ec9
+DIST php-5.5.7.tar.bz2 12991330 SHA256 2cb9425ef514b984dd233097d82a66f4623b9bf48f2ef265bc7ba25d697d6008 SHA512 0300f0a8b30fd83e80e8ff5fbb3008203e67fc7f740d18c265c9350c60839067996f57b7fe4758d2903f2844dee98303d6c373d4801724a8c38c1150d6479282 WHIRLPOOL ef83e902fccd307eb4f11c85eb8cd33363b3f0e4a8ab1f97b3131123848ab942ad71e337a5e8308b7f6ac03834f37cbfa42b5ba3cd9e0cb0a90133dca8ce600b
 DIST php-patchset-5.3-r0.tar.bz2 7368 SHA256 1a67b34a681dea33ea38f0ffc32b70a78b4c5dc1c3603d1bba31bb130d803ef7 SHA512 765b0cf56a3e63ded4ad1d1ba67567881ad06bdc2814cc07004fa338f38fd69078819c7463d2c55e00805c8f33fa925b94228bf7bc3d223acc33c6cff540024c WHIRLPOOL 59e18b33e11d968fac2a4571173121bf8141bb2f1eab62192e15bc59e351d3ab973f04343b447681d8a2adddf0844edb8a481d027bfc14c7e1fd8222169094ec
 DIST php-patchset-5.4-r2.tar.bz2 5824 SHA256 4a47f4d31f50a244f85349486cdb3474cf315562e097ed4c116c2b9b5730ecef SHA512 3c2523458a627373da7acb93fb2cd621f50b19fe2ba1d30beb62eeaaa39045262b917cfd0b631046fec9c8027cfa99bd0426a079ab45eb172b21d25d6e085dde WHIRLPOOL fe4f015e2f0dc66cc23ef16fb5bb33117952593ae0770d4bcd37ecc1c431cbcc7874189d265696305c60b4e395e7ce902667e38203db46867304868271affdea
--- a/dev-lang/php/php-5.3.28.ebuild
+++ b/dev-lang/php/php-5.3.28.ebuild
@ -0,0 +1,808 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.3.28.ebuild,v 1.1 2013/12/13 18:15:26 olemarkus Exp $
+
+EAPI=5
+
+inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd"
+
+function php_get_uri ()
+{
+	case "${1}" in
+		"php-pre")
+			echo "http://downloads.php.net/johannes/${2}"
+		;;
+		"php")
+			echo "http://www.php.net/distributions/${2}"
+		;;
+		"olemarkus")
+			echo "http://dev.gentoo.org/~olemarkus/php/${2}"
+		;;
+		"gentoo")
+			echo "mirror://gentoo/${2}"
+		;;
+		*)
+			die "unhandled case in php_get_uri"
+		;;
+	esac
+}
+
+PHP_MV="$(get_major_version)"
+SLOT="$(get_version_component_range 1-2)"
+
+# alias, so we can handle different types of releases (finals, rcs, alphas,
+# betas, ...) w/o changing the whole ebuild
+PHP_PV="${PV/_rc/RC}"
+PHP_PV="${PHP_PV/_alpha/alpha}"
+PHP_PV="${PHP_PV/_beta/beta}"
+PHP_RELEASE="php"
+[[ ${PV} == ${PV/_alpha/} ]] || PHP_RELEASE="php-pre"
+[[ ${PV} == ${PV/_beta/} ]] || PHP_RELEASE="php-pre"
+[[ ${PV} == ${PV/_rc/} ]] || PHP_RELEASE="php-pre"
+PHP_P="${PN}-${PHP_PV}"
+
+PHP_PATCHSET_LOC="olemarkus"
+
+PHP_SRC_URI="$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")"
+
+PHP_PATCHSET="0"
+PHP_PATCHSET_URI="
+	$(php_get_uri "${PHP_PATCHSET_LOC}" "php-patchset-${SLOT}-r${PHP_PATCHSET}.tar.bz2")"
+
+PHP_FPM_INIT_VER="4"
+PHP_FPM_CONF_VER="1"
+
+SRC_URI="
+	${PHP_SRC_URI}
+	${PHP_PATCHSET_URI}"
+
+DESCRIPTION="The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs."
+HOMEPAGE="http://php.net/"
+LICENSE="PHP-3"
+
+S="${WORKDIR}/${PHP_P}"
+
+# We can build the following SAPIs in the given order
+SAPIS="embed cli cgi fpm apache2"
+
+# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
+IUSE="${IUSE}
+	${SAPIS/cli/+cli}
+	threads"
+
+IUSE="${IUSE} bcmath berkdb bzip2 calendar cdb cjk
+	crypt +ctype curl curlwrappers debug
+	enchant exif frontbase +fileinfo +filter firebird
+	flatfile ftp gd gdbm gmp +hash +iconv imap inifile
+	intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash
+	mssql mysql mysqlnd mysqli nls
+	oci8-instant-client odbc pcntl pdo +phar +posix postgres qdbm
+	readline recode selinux +session sharedmem
+	+simplexml snmp soap sockets spell sqlite2 sqlite ssl
+	sybase-ct sysvipc tidy +tokenizer truetype unicode wddx
+	+xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib"
+
+DEPEND="
+	>=app-admin/eselect-php-0.7.0[apache2?,fpm?]
+	>=dev-libs/libpcre-8.32[unicode]
+	apache2? ( www-servers/apache[threads=] )
+	berkdb? ( =sys-libs/db-4* )
+	bzip2? ( app-arch/bzip2 )
+	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
+	cjk? ( !gd? (
+		virtual/jpeg:0
+		media-libs/libpng:0=
+		sys-libs/zlib
+	) )
+	crypt? ( >=dev-libs/libmcrypt-2.4 )
+	curl? ( >=net-misc/curl-7.10.5 )
+	enchant? ( app-text/enchant )
+	exif? ( !gd? (
+		virtual/jpeg:0
+		media-libs/libpng:0=
+		sys-libs/zlib
+	) )
+	firebird? ( dev-db/firebird )
+	gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
+	gdbm? ( >=sys-libs/gdbm-1.8.0 )
+	gmp? ( >=dev-libs/gmp-4.1.2 )
+	iconv? ( virtual/libiconv )
+	imap? ( virtual/imap-c-client[ssl=] )
+	intl? ( dev-libs/icu:= )
+	iodbc? ( dev-db/libiodbc )
+	kerberos? ( virtual/krb5 )
+	ldap? ( >=net-nds/openldap-1.2.11 )
+	ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 )
+	libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) )
+	mssql? ( dev-db/freetds[mssql] )
+	!mysqlnd? (
+		mysql? ( virtual/mysql )
+		mysqli? ( >=virtual/mysql-4.1 )
+	)
+	nls? ( sys-devel/gettext )
+	oci8-instant-client? ( dev-db/oracle-instantclient-basic )
+	odbc? ( >=dev-db/unixODBC-1.8.13 )
+	postgres? ( dev-db/postgresql-base )
+	qdbm? ( dev-db/qdbm )
+	readline? ( sys-libs/readline )
+	recode? ( app-text/recode )
+	sharedmem? ( dev-libs/mm )
+	simplexml? ( >=dev-libs/libxml2-2.6.8 )
+	snmp? ( >=net-analyzer/net-snmp-5.2 )
+	soap? ( >=dev-libs/libxml2-2.6.8 )
+	spell? ( >=app-text/aspell-0.50 )
+	sqlite2? ( =dev-db/sqlite-2* )
+	sqlite? ( >=dev-db/sqlite-3.7.7.1 )
+	ssl? ( >=dev-libs/openssl-0.9.7 )
+	sybase-ct? ( dev-db/freetds )
+	tidy? ( app-text/htmltidy )
+	truetype? (
+		=media-libs/freetype-2*
+		>=media-libs/t1lib-5.0.0
+		!gd? (
+			virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
+	)
+	unicode? ( dev-libs/oniguruma )
+	wddx? ( >=dev-libs/libxml2-2.6.8 )
+	xml? ( >=dev-libs/libxml2-2.6.8 )
+	xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
+	xmlreader? ( >=dev-libs/libxml2-2.6.8 )
+	xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
+	xpm? (
+		x11-libs/libXpm
+		virtual/jpeg:0
+		media-libs/libpng:0= sys-libs/zlib
+	)
+	xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
+	zip? ( sys-libs/zlib )
+	zlib? ( sys-libs/zlib )
+	virtual/mta
+"
+
+php="=${CATEGORY}/${PF}"
+
+REQUIRED_USE="
+	truetype? ( gd )
+	cjk? ( gd )
+	exif? ( gd )
+
+	xpm? ( gd )
+	gd? ( zlib )
+	simplexml? ( xml )
+	soap? ( xml )
+	wddx? ( xml )
+	xmlrpc? ( || ( xml iconv ) )
+	xmlreader? ( xml )
+	xslt? ( xml )
+	ldap-sasl? ( ldap )
+	mhash? ( hash )
+	phar? ( hash )
+	mysqlnd? ( || (
+		mysql
+		mysqli
+		pdo
+	) )
+
+	qdbm? ( !gdbm )
+	readline? ( !libedit )
+	recode? ( !imap !mysql !mysqli )
+	sharedmem? ( !threads )
+
+	!cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )"
+
+RDEPEND="${DEPEND}"
+
+RDEPEND="${RDEPEND} fpm? ( selinux? ( sec-policy/selinux-phpfpm ) )"
+
+DEPEND="${DEPEND}
+	sys-devel/flex
+	>=sys-devel/m4-1.4.3
+	>=sys-devel/libtool-1.5.18"
+
+# Allow users to install production version if they want to
+
+case "${PHP_INI_VERSION}" in
+	production|development)
+		;;
+	*)
+		PHP_INI_VERSION="development"
+		;;
+esac
+
+PHP_INI_UPSTREAM="php.ini-${PHP_INI_VERSION}"
+PHP_INI_FILE="php.ini"
+
+want_apache
+
+pkg_setup() {
+	depend.apache_pkg_setup
+}
+
+php_install_ini() {
+	local phpsapi="${1}"
+
+	# work out where we are installing the ini file
+	php_set_ini_dir "${phpsapi}"
+
+	local phpinisrc="${PHP_INI_UPSTREAM}-${phpsapi}"
+	cp "${PHP_INI_UPSTREAM}" "${phpinisrc}"
+
+	# default to /tmp for save_path, bug #282768
+	sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}"
+
+	# Set the extension dir
+	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" -i "${phpinisrc}"
+
+	# Set the include path to point to where we want to find PEAR packages
+	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}"
+
+	if use_if_iuse opcache; then
+		elog "Adding opcache to ${phpinisrc}"
+		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> ${phpinisrc}
+	fi
+
+	dodir "${PHP_INI_DIR#${EPREFIX}}"
+	insinto "${PHP_INI_DIR#${EPREFIX}}"
+	newins "${phpinisrc}" "${PHP_INI_FILE}"
+
+	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
+	elog
+
+	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
+	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
+
+	# SAPI-specific handling
+
+	if [[ "${sapi}" == "fpm" ]] ; then
+		[[ -z ${PHP_FPM_CONF_VER} ]] && PHP_FPM_CONF_VER=0
+		einfo "Installing FPM CGI config file php-fpm.conf"
+		insinto "${PHP_INI_DIR#${EPREFIX}}"
+		newins "${FILESDIR}/php-fpm-r${PHP_FPM_CONF_VER}.conf" php-fpm.conf
+
+		# Remove bogus /etc/php-fpm.conf.default (bug 359906)
+		[[ -f "${ED}/etc/php-fpm.conf.default" ]] && rm "${ED}/etc/php-fpm.conf.default"
+	fi
+
+	# Install PHP ini files into /usr/share/php
+
+	dodoc php.ini-development
+	dodoc php.ini-production
+
+}
+
+php_set_ini_dir() {
+	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
+	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
+	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
+}
+
+src_prepare() {
+	# USE=sharedmem (session/mod_mm to be exact) tries to mmap() this path
+	# ([empty session.save_path]/session_mm_[sapi][gid].sem)
+	# there is no easy way to circumvent that, all php calls during
+	# install use -n, so no php.ini file will be used.
+	# As such, this is the easiest way to get around
+	addpredict /session_mm_cli250.sem
+	addpredict /session_mm_cli0.sem
+
+	# Change PHP branding
+	sed -re	"s|^(PHP_EXTRA_VERSION=\").*(\")|\1-pl${PR/r/}-gentoo\2|g" \
+		-i configure.in || die "Unable to change PHP branding"
+
+	# Apply generic PHP patches
+	EPATCH_SOURCE="${WORKDIR}/patches/generic" EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" \
+		EPATCH_MULTI_MSG="Applying generic patches and fixes from upstream..." epatch
+
+	#Fix bug 463498
+	epatch "${FILESDIR}/fix-libstdc++-underlinking.patch"
+
+	# Patch for pkg-config-0.28 (Bug 455040)
+	epatch "${FILESDIR}"/missing-openssl-include.patch
+
+	# Patch PHP to show Gentoo as the server platform
+	sed -e 's/PHP_UNAME=`uname -a | xargs`/PHP_UNAME=`uname -s -n -r -v | xargs`/g' \
+		-i configure.in || die "Failed to fix server platform name"
+
+	# Prevent PHP from activating the Apache config,
+	# as we will do that ourselves
+	sed -i \
+		-e "s,-i -a -n php${PHP_MV},-i -n php${PHP_MV},g" \
+		-e "s,-i -A -n php${PHP_MV},-i -n php${PHP_MV},g" \
+		configure sapi/apache2filter/config.m4 sapi/apache2handler/config.m4
+
+	# Patch PHP to support heimdal instead of mit-krb5
+	if has_version "app-crypt/heimdal" ; then
+		sed -e 's|gssapi_krb5|gssapi|g' -i acinclude.m4 \
+			|| die "Failed to fix heimdal libname"
+		sed -e 's|PHP_ADD_LIBRARY(k5crypto, 1, $1)||g' -i acinclude.m4 \
+			|| die "Failed to fix heimdal crypt library reference"
+	fi
+
+	#Add user patches #357637
+	epatch_user
+
+	#force rebuilding aclocal.m4
+	rm aclocal.m4
+
+	# work around divert() issues with newer autoconf, bug #281697
+	if has_version '>=sys-devel/autoconf-2.64' ; then
+		sed -i -r \
+			-e 's:^((m4_)?divert)[(]([0-9]*)[)]:\1(600\3):' \
+			$(grep -l divert $(find . -name '*.m4') configure.in) || die
+	fi
+	eautoreconf --force -W no-cross
+}
+
+src_configure() {
+	addpredict /usr/share/snmp/mibs/.index
+	addpredict /var/lib/net-snmp/mib_indexes
+
+	PHP_DESTDIR="/usr/$(get_libdir)/php${SLOT}"
+
+	# This is a global variable and should be in caps. It isn't because the
+	# phpconfutils eclass relies on exactly this name...
+	# for --with-libdir see bug #327025
+	my_conf="--prefix=${PHP_DESTDIR}
+		--mandir=${PHP_DESTDIR}/man
+		--infodir=${PHP_DESTDIR}/info
+		--libdir=${PHP_DESTDIR}/lib
+		--with-libdir=$(get_libdir)
+		--without-pear
+		$(use_enable threads maintainer-zts)"
+
+	#                             extension		  USE flag        shared
+	my_conf+="
+	$(use_enable bcmath bcmath )
+	$(use_with bzip2 bz2 )
+	$(use_enable calendar calendar )
+	$(use_enable ctype ctype )
+	$(use_with curl curl )
+	$(use_with curlwrappers curlwrappers )
+	$(use_enable xml dom )
+	$(use_with enchant enchant /usr)
+	$(use_enable exif exif )
+	$(use_enable fileinfo fileinfo )
+	$(use_enable filter filter )
+	$(use_enable ftp ftp )
+	$(use_with nls gettext )
+	$(use_with gmp gmp )
+	$(use_enable hash hash )
+	$(use_with mhash mhash )
+	$(use_with iconv iconv )
+	$(use_enable intl intl )
+	$(use_enable ipv6 ipv6 )
+	$(use_enable json json )
+	$(use_with kerberos kerberos /usr)
+	$(use_enable xml libxml )
+	$(use_enable unicode mbstring )
+	$(use_with crypt mcrypt )
+	$(use_with mssql mssql )
+	$(use_with unicode onig /usr)
+	$(use_with ssl openssl )
+	$(use_with ssl openssl-dir /usr)
+	$(use_enable pcntl pcntl )
+	$(use_enable phar phar )
+	$(use_enable pdo pdo )
+	$(use_with postgres pgsql )
+	$(use_enable posix posix )
+	$(use_with spell pspell )
+	$(use_with recode recode )
+	$(use_enable simplexml simplexml )
+	$(use_enable sharedmem shmop )
+	$(use_with snmp snmp )
+	$(use_enable soap soap )
+	$(use_enable sockets sockets )"
+	if version_is_at_least 5.3.16-r2; then
+		my_conf+=" $(use_with sqlite2 sqlite /usr) "
+		use sqlite2 && my_conf+=" $(use_enable unicode sqlite-utf8)"
+	else
+		my_conf+=" $(use_with sqlite sqlite /usr) "
+		use sqlite && my_conf+=" $(use_enable unicode sqlite-utf8)"
+	fi
+	my_conf+="
+	$(use_with sqlite sqlite3 /usr)
+	$(use_with sybase-ct sybase-ct /usr)
+	$(use_enable sysvipc sysvmsg )
+	$(use_enable sysvipc sysvsem )
+	$(use_enable sysvipc sysvshm )
+	$(use_with tidy tidy )
+	$(use_enable tokenizer tokenizer )
+	$(use_enable wddx wddx )
+	$(use_enable xml xml )
+	$(use_enable xmlreader xmlreader )
+	$(use_enable xmlwriter xmlwriter )
+	$(use_with xmlrpc xmlrpc )
+	$(use_with xslt xsl )
+	$(use_enable zip zip )
+	$(use_with zlib zlib )
+	$(use_enable debug debug )"
+
+	# DBA support
+	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
+		|| use qdbm ; then
+		my_conf="${my_conf} --enable-dba${shared}"
+	fi
+
+	# DBA drivers support
+	my_conf+="
+	$(use_with cdb cdb )
+	$(use_with berkdb db4 )
+	$(use_enable flatfile flatfile )
+	$(use_with gdbm gdbm )
+	$(use_enable inifile inifile )
+	$(use_with qdbm qdbm )"
+
+	# Support for the GD graphics library
+	my_conf+="
+	$(use_with truetype freetype-dir /usr)
+	$(use_with truetype t1lib /usr)
+	$(use_enable cjk gd-jis-conv )
+	$(use_with gd jpeg-dir /usr)
+	$(use_with gd png-dir /usr)
+	$(use_with xpm xpm-dir /usr)"
+	# enable gd last, so configure can pick up the previous settings
+	my_conf+="
+	$(use_with gd gd )"
+
+	# IMAP support
+	if use imap ; then
+		my_conf+="
+		$(use_with imap imap )
+		$(use_with ssl imap-ssl )"
+	fi
+
+	# Interbase/firebird support
+
+	if use firebird ; then
+		my_conf+="
+		$(use_with firebird interbase /usr)"
+	fi
+
+	# LDAP support
+	if use ldap ; then
+		my_conf+="
+		$(use_with ldap ldap )
+		$(use_with ldap-sasl ldap-sasl )"
+	fi
+
+	# MySQL support
+	if use mysql ; then
+		if use mysqlnd ; then
+			my_conf+="
+			$(use_with mysqlnd mysql mysqlnd)"
+		else
+			my_conf+="
+			$(use_with mysql mysql /usr)"
+		fi
+		my_conf+="
+		$(use_with mysql mysql-sock /var/run/mysqld/mysqld.sock)"
+	fi
+
+	# MySQLi support
+	if use mysqlnd ; then
+		my_conf+="
+		$(use_with mysqli mysqli mysqlnd)"
+	else
+		my_conf+="
+		$(use_with mysqli mysqli /usr/bin/mysql_config)"
+	fi
+
+	# ODBC support
+	if use odbc ; then
+		my_conf+="
+		$(use_with odbc unixODBC /usr)"
+	fi
+
+	if use iodbc ; then
+		my_conf+="
+		$(use_with iodbc iodbc /usr)"
+	fi
+
+	# Oracle support
+	if use oci8-instant-client ; then
+		my_conf+="
+		$(use_with oci8-instant-client oci8)"
+	fi
+
+	# PDO support
+	if use pdo ; then
+		my_conf+="
+		$(use_with mssql pdo-dblib )"
+		if use mysqlnd ; then
+			my_conf+="
+			$(use_with mysql pdo-mysql mysqlnd)"
+		else
+			my_conf+="
+			$(use_with mysql pdo-mysql /usr)"
+		fi
+		my_conf+="
+		$(use_with postgres pdo-pgsql )
+		$(use_with sqlite pdo-sqlite /usr)
+		$(use_with odbc pdo-odbc unixODBC,/usr)"
+		if use oci8-instant-client ; then
+			my_conf+="
+			$(use_with oci8-instant-client pdo-oci)"
+		fi
+	fi
+
+	# readline/libedit support
+	my_conf+="
+	$(use_with readline readline )
+	$(use_with libedit libedit )"
+
+	# Session support
+	if use session ; then
+		my_conf+="
+		$(use_with sharedmem mm )"
+	else
+		my_conf+="
+		$(use_enable session session )"
+	fi
+
+	# Use pic for shared modules such as apache2's mod_php
+	my_conf="${my_conf} --with-pic"
+
+	# we use the system copy of pcre
+	# --with-pcre-regex affects ext/pcre
+	# --with-pcre-dir affects ext/filter and ext/zip
+	my_conf="${my_conf} --with-pcre-regex=/usr --with-pcre-dir=/usr"
+
+	# Catch CFLAGS problems
+	# Fixes bug #14067.
+	# Changed order to run it in reverse for bug #32022 and #12021.
+	replace-cpu-flags "k6*" "i586"
+
+	# Support user-passed configuration parameters
+	my_conf="${my_conf} ${EXTRA_ECONF:-}"
+
+	# Support the Apache2 extras, they must be set globally for all
+	# SAPIs to work correctly, especially for external PHP extensions
+
+	mkdir -p "${WORKDIR}/sapis-build"
+	for one_sapi in $SAPIS ; do
+		use "${one_sapi}" || continue
+		php_set_ini_dir "${one_sapi}"
+
+		cp -r "${S}" "${WORKDIR}/sapis-build/${one_sapi}"
+		cd "${WORKDIR}/sapis-build/${one_sapi}"
+
+		sapi_conf="${my_conf} --with-config-file-path=${PHP_INI_DIR}
+			--with-config-file-scan-dir=${PHP_EXT_INI_DIR_ACTIVE}"
+
+		for sapi in $SAPIS ; do
+			case "$sapi" in
+				cli|cgi|embed|fpm)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf="${sapi_conf} --enable-${sapi}"
+					else
+						sapi_conf="${sapi_conf} --disable-${sapi}"
+					fi
+					;;
+
+				apache2)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf="${sapi_conf} --with-apxs2=/usr/sbin/apxs"
+					else
+						sapi_conf="${sapi_conf} --without-apxs2"
+					fi
+					;;
+			esac
+		done
+
+		econf ${sapi_conf}
+	done
+}
+
+src_compile() {
+	# snmp seems to run during src_compile, too (bug #324739)
+	addpredict /usr/share/snmp/mibs/.index
+	addpredict /var/lib/net-snmp/mib_indexes
+
+	for sapi in ${SAPIS} ; do
+		if use "${sapi}"; then
+			cd "${WORKDIR}/sapis-build/$sapi" || "Failed to change dir to ${WORKDIR}/sapis-build/$1"
+			emake || die "emake failed"
+		fi
+	done
+}
+
+src_install() {
+	# see bug #324739 for what happens when we don't have that
+	addpredict /usr/share/snmp/mibs/.index
+
+	# grab the first SAPI that got built and install common files from there
+	local first_sapi=""
+	for sapi in $SAPIS ; do
+		if use $sapi ; then
+			first_sapi=$sapi
+			break
+		fi
+	done
+
+	# Makefile forgets to create this before trying to write to it...
+	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
+
+	# Install php environment (without any sapis)
+	cd "${WORKDIR}/sapis-build/$first_sapi"
+	emake INSTALL_ROOT="${D}" \
+		install-build install-headers install-programs \
+		|| die "emake install failed"
+
+	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
+
+	# Create the directory where we'll put version-specific php scripts
+	keepdir /usr/share/php${PHP_MV}
+
+	local sapi="", file=""
+	local sapi_list=""
+
+	for sapi in ${SAPIS}; do
+		if use "${sapi}" ; then
+			einfo "Installing SAPI: ${sapi}"
+			cd "${WORKDIR}/sapis-build/${sapi}"
+
+			if [[ "${sapi}" == "apache2" ]] ; then
+				# We're specifically not using emake install-sapi as libtool
+				# may cause unnecessary relink failures (see bug #351266)
+				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
+				newins ".libs/libphp5$(get_libname)" "libphp${PHP_MV}$(get_libname)"
+				keepdir "/usr/$(get_libdir)/apache2/modules"
+			else
+				# needed each time, php_install_ini would reset it
+				local dest="${PHP_DESTDIR#${EPREFIX}}"
+				into "${dest}"
+				case "$sapi" in
+					cli)
+						source="sapi/cli/php"
+						;;
+					cgi)
+						source="sapi/cgi/php-cgi"
+						;;
+					fpm)
+						source="sapi/fpm/php-fpm"
+						;;
+					embed)
+						source="libs/libphp${PHP_MV}$(get_libname)"
+						;;
+					*)
+						die "unhandled sapi in src_install"
+						;;
+				esac
+
+				if [[ "${source}" == *"$(get_libname)" ]]; then
+					dolib.so "${source}" || die "Unable to install ${sapi} sapi"
+				else
+					dobin "${source}" || die "Unable to install ${sapi} sapi"
+					local name="$(basename ${source})"
+					dosym "${dest}/bin/${name}" "/usr/bin/${name}${SLOT}"
+				fi
+			fi
+
+			php_install_ini "${sapi}"
+
+			# construct correct SAPI string for php-config
+			# thanks to ferringb for the bash voodoo
+			if [[ "${sapi}" == "apache2" ]]; then
+				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
+			else
+				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
+			fi
+		fi
+	done
+
+	# Installing opcache module
+	if use_if_iuse opcache ; then
+		dolib.so "modules/opcache$(get_libname)" || die "Unable to install opcache module"
+	fi
+
+	# Install env.d files
+	newenvd "${FILESDIR}/20php5-envd" \
+		"20php${SLOT}"
+	sed -e "s|/lib/|/$(get_libdir)/|g" -i \
+		"${ED}/etc/env.d/20php${SLOT}"
+	sed -e "s|php5|php${SLOT}|g" -i \
+		"${ED}/etc/env.d/20php${SLOT}"
+
+	# set php-config variable correctly (bug #278439)
+	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
+		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config"
+}
+
+src_test() {
+	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+	PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
+	if [[ ! -x "${PHP_BIN}" ]] ; then
+		ewarn "Test phase requires USE=cli, skipping"
+		return
+	else
+		export TEST_PHP_EXECUTABLE="${PHP_BIN}"
+	fi
+
+	if [[ -x "${WORKDIR}/sapis/cgi/php-cgi" ]] ; then
+		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis/cgi/php-cgi"
+	fi
+
+	REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n  -d "session.save_path=${T}" \
+		"${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d "session.save_path=${T}"
+
+	for name in ${EXPECTED_TEST_FAILURES}; do
+		mv "${name}.out" "${name}.out.orig" 2>/dev/null
+	done
+
+	local failed="$(find -name '*.out')"
+	if [[ ${failed} != "" ]] ; then
+		ewarn "The following test cases failed unexpectedly:"
+		for name in ${failed}; do
+			ewarn "  ${name/.out/}"
+		done
+	else
+		einfo "No unexpected test failures, all fine"
+	fi
+
+	if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
+		local passed=""
+		for name in ${EXPECTED_TEST_FAILURES}; do
+			[[ -f "${name}.diff" ]] && continue
+			passed="${passed} ${name}"
+		done
+		if [[ ${passed} != "" ]] ; then
+			einfo "The following test cases passed unexpectedly:"
+			for name in ${passed}; do
+				ewarn "  ${passed}"
+			done
+		else
+			einfo "None of the known-to-fail tests passed, all fine"
+		fi
+	fi
+}
+
+pkg_postinst() {
+	# Output some general info to the user
+	if use apache2 ; then
+		APACHE2_MOD_DEFINE="PHP5"
+		APACHE2_MOD_CONF="70_mod_php5"
+		apache-module_pkg_postinst
+	fi
+
+	# Create the symlinks for php
+	for m in ${SAPIS}; do
+		[[ ${m} == 'embed' ]] && continue;
+		if use $m ; then
+			local ci=$(eselect php show $m)
+			if [[ -z $ci ]]; then
+				eselect php set $m php${SLOT}
+				einfo "Switched ${m} to use php:${SLOT}"
+				einfo
+			elif [[ $ci != "php${SLOT}" ]] ; then
+				elog "To switch $m to use php:${SLOT}, run"
+				elog "    eselect php set $m php${SLOT}"
+				elog
+			fi
+		fi
+	done
+
+	elog "Make sure that PHP_TARGETS in /etc/make.conf includes php${SLOT/./-} in order"
+	elog "to compile extensions for the ${SLOT} ABI"
+	elog
+	if ! use readline && use cli ; then
+		ewarn "Note that in order to use php interactivly, you need to enable"
+		ewarn "the readline USE flag or php -a will hang"
+	fi
+	elog
+	elog "This ebuild installed a version of php.ini based on php.ini-${PHP_INI_VERSION} version."
+	elog "You can chose which version of php.ini to install by default by setting PHP_INI_VERSION to either"
+	elog "'production' or 'development' in /etc/make.conf"
+	ewarn "Both versions of php.ini can be found in /usr/share/doc/${PF}"
+
+	elog
+	elog "For more details on how minor version slotting works (PHP_TARGETS) please read the upgrade guide:"
+	elog "http://www.gentoo.org/proj/en/php/php-upgrading.xml"
+	elog
+}
+
+pkg_prerm() {
+	eselect php cleanup
+}
--- a/dev-lang/php/php-5.4.23.ebuild
+++ b/dev-lang/php/php-5.4.23.ebuild
@ -0,0 +1,789 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.4.23.ebuild,v 1.1 2013/12/13 18:15:26 olemarkus Exp $
+
+EAPI=5
+
+inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+
+function php_get_uri ()
+{
+	case "${1}" in
+		"php-pre")
+			echo "http://downloads.php.net/stas/${2}"
+		;;
+		"php")
+			echo "http://www.php.net/distributions/${2}"
+		;;
+		"olemarkus")
+			echo "http://dev.gentoo.org/~olemarkus/php/${2}"
+		;;
+		"gentoo")
+			echo "mirror://gentoo/${2}"
+		;;
+		*)
+			die "unhandled case in php_get_uri"
+		;;
+	esac
+}
+
+PHP_MV="$(get_major_version)"
+SLOT="$(get_version_component_range 1-2)"
+
+# alias, so we can handle different types of releases (finals, rcs, alphas,
+# betas, ...) w/o changing the whole ebuild
+PHP_PV="${PV/_rc/RC}"
+PHP_PV="${PHP_PV/_alpha/alpha}"
+PHP_PV="${PHP_PV/_beta/beta}"
+PHP_RELEASE="php"
+[[ ${PV} == ${PV/_alpha/} ]] || PHP_RELEASE="php-pre"
+[[ ${PV} == ${PV/_beta/} ]] || PHP_RELEASE="php-pre"
+[[ ${PV} == ${PV/_rc/} ]] || PHP_RELEASE="php-pre"
+PHP_P="${PN}-${PHP_PV}"
+
+PHP_PATCHSET_LOC="olemarkus"
+
+PHP_SRC_URI="$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")"
+
+PHP_PATCHSET="2"
+PHP_PATCHSET_URI="
+	$(php_get_uri "${PHP_PATCHSET_LOC}" "php-patchset-${SLOT}-r${PHP_PATCHSET}.tar.bz2")"
+
+PHP_FPM_INIT_VER="4"
+PHP_FPM_CONF_VER="1"
+
+SRC_URI="
+	${PHP_SRC_URI}
+	${PHP_PATCHSET_URI}"
+
+DESCRIPTION="The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs."
+HOMEPAGE="http://php.net/"
+LICENSE="PHP-3"
+
+S="${WORKDIR}/${PHP_P}"
+
+# We can build the following SAPIs in the given order
+SAPIS="embed cli cgi fpm apache2"
+
+# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
+IUSE="${IUSE}
+	${SAPIS/cli/+cli}
+	threads"
+
+IUSE="${IUSE} bcmath berkdb bzip2 calendar cdb cjk
+	crypt +ctype curl curlwrappers debug
+	enchant exif frontbase +fileinfo +filter firebird
+	flatfile ftp gd gdbm gmp +hash +iconv imap inifile
+	intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash
+	mssql mysql mysqlnd mysqli nls
+	oci8-instant-client odbc pcntl pdo +phar +posix postgres qdbm
+	readline recode selinux +session sharedmem
+	+simplexml snmp soap sockets spell sqlite ssl
+	sybase-ct sysvipc tidy +tokenizer truetype unicode wddx
+	+xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib"
+
+DEPEND="
+	>=app-admin/eselect-php-0.7.0[apache2?,fpm?]
+	>=dev-libs/libpcre-8.32[unicode]
+	apache2? ( www-servers/apache[threads=] )
+	berkdb? ( =sys-libs/db-4* )
+	bzip2? ( app-arch/bzip2 )
+	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
+	cjk? ( !gd? (
+		virtual/jpeg:0
+		media-libs/libpng:0=
+		sys-libs/zlib
+	) )
+	crypt? ( >=dev-libs/libmcrypt-2.4 )
+	curl? ( >=net-misc/curl-7.10.5 )
+	enchant? ( app-text/enchant )
+	exif? ( !gd? (
+		virtual/jpeg:0
+		media-libs/libpng:0=
+		sys-libs/zlib
+	) )
+	firebird? ( dev-db/firebird )
+	gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
+	gdbm? ( >=sys-libs/gdbm-1.8.0 )
+	gmp? ( >=dev-libs/gmp-4.1.2 )
+	iconv? ( virtual/libiconv )
+	imap? ( virtual/imap-c-client[ssl=] )
+	intl? ( dev-libs/icu:= )
+	iodbc? ( dev-db/libiodbc )
+	kerberos? ( virtual/krb5 )
+	ldap? ( >=net-nds/openldap-1.2.11 )
+	ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 )
+	libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) )
+	mssql? ( dev-db/freetds[mssql] )
+	!mysqlnd? (
+		mysql? ( virtual/mysql )
+		mysqli? ( >=virtual/mysql-4.1 )
+	)
+	nls? ( sys-devel/gettext )
+	oci8-instant-client? ( dev-db/oracle-instantclient-basic )
+	odbc? ( >=dev-db/unixODBC-1.8.13 )
+	postgres? ( dev-db/postgresql-base )
+	qdbm? ( dev-db/qdbm )
+	readline? ( sys-libs/readline )
+	recode? ( app-text/recode )
+	sharedmem? ( dev-libs/mm )
+	simplexml? ( >=dev-libs/libxml2-2.6.8 )
+	snmp? ( >=net-analyzer/net-snmp-5.2 )
+	soap? ( >=dev-libs/libxml2-2.6.8 )
+	spell? ( >=app-text/aspell-0.50 )
+	sqlite? ( >=dev-db/sqlite-3.7.6.3 )
+	ssl? ( >=dev-libs/openssl-0.9.7 )
+	sybase-ct? ( dev-db/freetds )
+	tidy? ( app-text/htmltidy )
+	truetype? (
+		=media-libs/freetype-2*
+		>=media-libs/t1lib-5.0.0
+		!gd? (
+			virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
+	)
+	unicode? ( dev-libs/oniguruma )
+	wddx? ( >=dev-libs/libxml2-2.6.8 )
+	xml? ( >=dev-libs/libxml2-2.6.8 )
+	xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
+	xmlreader? ( >=dev-libs/libxml2-2.6.8 )
+	xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
+	xpm? (
+		x11-libs/libXpm
+		virtual/jpeg:0
+		media-libs/libpng:0= sys-libs/zlib
+	)
+	xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
+	zip? ( sys-libs/zlib )
+	zlib? ( sys-libs/zlib )
+	virtual/mta
+"
+
+php="=${CATEGORY}/${PF}"
+
+REQUIRED_USE="
+	truetype? ( gd )
+	cjk? ( gd )
+	exif? ( gd )
+
+	xpm? ( gd )
+	gd? ( zlib )
+	simplexml? ( xml )
+	soap? ( xml )
+	wddx? ( xml )
+	xmlrpc? ( || ( xml iconv ) )
+	xmlreader? ( xml )
+	xslt? ( xml )
+	ldap-sasl? ( ldap )
+	mhash? ( hash )
+	phar? ( hash )
+	mysqlnd? ( || (
+		mysql
+		mysqli
+		pdo
+	) )
+
+	qdbm? ( !gdbm )
+	readline? ( !libedit )
+	recode? ( !imap !mysql !mysqli )
+	sharedmem? ( !threads )
+
+	!cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )"
+
+RDEPEND="${DEPEND}"
+
+RDEPEND="${RDEPEND} fpm? ( selinux? ( sec-policy/selinux-phpfpm ) )"
+
+DEPEND="${DEPEND}
+	sys-devel/flex
+	>=sys-devel/m4-1.4.3
+	>=sys-devel/libtool-1.5.18"
+
+# Allow users to install production version if they want to
+
+case "${PHP_INI_VERSION}" in
+	production|development)
+		;;
+	*)
+		PHP_INI_VERSION="development"
+		;;
+esac
+
+PHP_INI_UPSTREAM="php.ini-${PHP_INI_VERSION}"
+PHP_INI_FILE="php.ini"
+
+want_apache
+
+pkg_setup() {
+	depend.apache_pkg_setup
+}
+
+php_install_ini() {
+	local phpsapi="${1}"
+
+	# work out where we are installing the ini file
+	php_set_ini_dir "${phpsapi}"
+
+	local phpinisrc="${PHP_INI_UPSTREAM}-${phpsapi}"
+	cp "${PHP_INI_UPSTREAM}" "${phpinisrc}"
+
+	# default to /tmp for save_path, bug #282768
+	sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}"
+
+	# Set the extension dir
+	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" -i "${phpinisrc}"
+
+	# Set the include path to point to where we want to find PEAR packages
+	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}"
+
+	if use_if_iuse opcache; then
+		elog "Adding opcache to ${phpinisrc}"
+		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> ${phpinisrc}
+	fi
+
+	dodir "${PHP_INI_DIR#${EPREFIX}}"
+	insinto "${PHP_INI_DIR#${EPREFIX}}"
+	newins "${phpinisrc}" "${PHP_INI_FILE}"
+
+	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
+	elog
+
+	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
+	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
+
+	# SAPI-specific handling
+
+	if [[ "${sapi}" == "fpm" ]] ; then
+		[[ -z ${PHP_FPM_CONF_VER} ]] && PHP_FPM_CONF_VER=0
+		einfo "Installing FPM CGI config file php-fpm.conf"
+		insinto "${PHP_INI_DIR#${EPREFIX}}"
+		newins "${FILESDIR}/php-fpm-r${PHP_FPM_CONF_VER}.conf" php-fpm.conf
+
+		# Remove bogus /etc/php-fpm.conf.default (bug 359906)
+		[[ -f "${ED}/etc/php-fpm.conf.default" ]] && rm "${ED}/etc/php-fpm.conf.default"
+	fi
+
+	# Install PHP ini files into /usr/share/php
+
+	dodoc php.ini-development
+	dodoc php.ini-production
+
+}
+
+php_set_ini_dir() {
+	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
+	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
+	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
+}
+
+src_prepare() {
+	# USE=sharedmem (session/mod_mm to be exact) tries to mmap() this path
+	# ([empty session.save_path]/session_mm_[sapi][gid].sem)
+	# there is no easy way to circumvent that, all php calls during
+	# install use -n, so no php.ini file will be used.
+	# As such, this is the easiest way to get around
+	addpredict /session_mm_cli250.sem
+	addpredict /session_mm_cli0.sem
+
+	# Change PHP branding
+	# Get the alpha/beta/rc version
+	sed -re	"s|^(PHP_EXTRA_VERSION=\").*(\")|\1-pl${PR/r/}-gentoo\2|g" \
+		-i configure.in || die "Unable to change PHP branding"
+
+	# Patch PHP to show Gentoo as the server platform
+	sed -e 's/PHP_UNAME=`uname -a | xargs`/PHP_UNAME=`uname -s -n -r -v | xargs`/g' \
+		-i configure.in || die "Failed to fix server platform name"
+
+	# Prevent PHP from activating the Apache config,
+	# as we will do that ourselves
+	sed -i \
+		-e "s,-i -a -n php${PHP_MV},-i -n php${PHP_MV},g" \
+		-e "s,-i -A -n php${PHP_MV},-i -n php${PHP_MV},g" \
+		configure sapi/apache2filter/config.m4 sapi/apache2handler/config.m4
+
+	# Patch PHP to support heimdal instead of mit-krb5
+	if has_version "app-crypt/heimdal" ; then
+		sed -e 's|gssapi_krb5|gssapi|g' -i acinclude.m4 \
+			|| die "Failed to fix heimdal libname"
+		sed -e 's|PHP_ADD_LIBRARY(k5crypto, 1, $1)||g' -i acinclude.m4 \
+			|| die "Failed to fix heimdal crypt library reference"
+	fi
+
+	#Add user patches #357637
+	epatch_user
+
+	#force rebuilding aclocal.m4
+	rm aclocal.m4
+	eautoreconf
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# http://bugs.php.net/bug.php?id=48795, bug #343481
+		sed -i -e '/BUILD_CGI="\\$(CC)/s/CC/CXX/' configure || die
+	fi
+}
+
+src_configure() {
+	addpredict /usr/share/snmp/mibs/.index
+	addpredict /var/lib/net-snmp/mib_indexes
+
+	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
+
+	# This is a global variable and should be in caps. It isn't because the
+	# phpconfutils eclass relies on exactly this name...
+	# for --with-libdir see bug #327025
+	my_conf="
+		--prefix="${PHP_DESTDIR}"
+		--mandir="${PHP_DESTDIR}"/man
+		--infodir="${PHP_DESTDIR}"/info
+		--libdir="${PHP_DESTDIR}"/lib
+		--with-libdir=$(get_libdir)
+		--without-pear
+		$(use_enable threads maintainer-zts)"
+
+	#                             extension		  USE flag        shared
+	my_conf+="
+	$(use_enable bcmath bcmath )
+	$(use_with bzip2 bz2 "${EPREFIX}"/usr)
+	$(use_enable calendar calendar )
+	$(use_enable ctype ctype )
+	$(use_with curl curl "${EPREFIX}"/usr)
+	$(use_with curlwrappers curlwrappers "${EPREFIX}"/usr)
+	$(use_enable xml dom )
+	$(use_with enchant enchant "${EPREFIX}"/usr)
+	$(use_enable exif exif )
+	$(use_enable fileinfo fileinfo )
+	$(use_enable filter filter )
+	$(use_enable ftp ftp )
+	$(use_with nls gettext "${EPREFIX}"/usr)
+	$(use_with gmp gmp "${EPREFIX}"/usr)
+	$(use_enable hash hash )
+	$(use_with mhash mhash "${EPREFIX}"/usr)
+	$(use_with iconv iconv $(use elibc_glibc || echo "${EPREFIX}"/usr))
+	$(use_enable intl intl )
+	$(use_enable ipv6 ipv6 )
+	$(use_enable json json )
+	$(use_with kerberos kerberos "${EPREFIX}"/usr)
+	$(use_enable xml libxml )
+	$(use_with xml libxml-dir "${EPREFIX}"/usr)
+	$(use_enable unicode mbstring )
+	$(use_with crypt mcrypt "${EPREFIX}"/usr)
+	$(use_with mssql mssql "${EPREFIX}"/usr)
+	$(use_with unicode onig "${EPREFIX}"/usr)
+	$(use_with ssl openssl "${EPREFIX}"/usr)
+	$(use_with ssl openssl-dir "${EPREFIX}"/usr)
+	$(use_enable pcntl pcntl )
+	$(use_enable phar phar )
+	$(use_enable pdo pdo )
+	$(use_with postgres pgsql "${EPREFIX}"/usr)
+	$(use_enable posix posix )
+	$(use_with spell pspell "${EPREFIX}"/usr)
+	$(use_with recode recode "${EPREFIX}"/usr)
+	$(use_enable simplexml simplexml )
+	$(use_enable sharedmem shmop )
+	$(use_with snmp snmp "${EPREFIX}"/usr)
+	$(use_enable soap soap )
+	$(use_enable sockets sockets )
+	$(use_with sqlite sqlite3 "${EPREFIX}"/usr)
+	$(use_with sybase-ct sybase-ct "${EPREFIX}"/usr)
+	$(use_enable sysvipc sysvmsg )
+	$(use_enable sysvipc sysvsem )
+	$(use_enable sysvipc sysvshm )
+	$(use_with tidy tidy "${EPREFIX}"/usr)
+	$(use_enable tokenizer tokenizer )
+	$(use_enable wddx wddx )
+	$(use_enable xml xml )
+	$(use_enable xmlreader xmlreader )
+	$(use_enable xmlwriter xmlwriter )
+	$(use_with xmlrpc xmlrpc)
+	$(use_with xslt xsl "${EPREFIX}"/usr)
+	$(use_enable zip zip )
+	$(use_with zlib zlib "${EPREFIX}"/usr)
+	$(use_enable debug debug )"
+
+	# DBA support
+	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
+		|| use qdbm ; then
+		my_conf="${my_conf} --enable-dba${shared}"
+	fi
+
+	# DBA drivers support
+	my_conf+="
+	$(use_with cdb cdb)
+	$(use_with berkdb db4 ${EPREFIX}/usr)
+	$(use_enable flatfile flatfile )
+	$(use_with gdbm gdbm ${EPREFIX}/usr)
+	$(use_enable inifile inifile )
+	$(use_with qdbm qdbm ${EPREFIX}/usr)"
+
+	# Support for the GD graphics library
+	my_conf+="
+	$(use_with truetype freetype-dir ${EPREFIX}/usr)
+	$(use_with truetype t1lib ${EPREFIX}/usr)
+	$(use_enable cjk gd-jis-conv )
+	$(use_with gd jpeg-dir ${EPREFIX}/usr)
+	$(use_with gd png-dir ${EPREFIX}/usr)
+	$(use_with xpm xpm-dir ${EPREFIX}/usr)"
+	# enable gd last, so configure can pick up the previous settings
+	my_conf+="
+	$(use_with gd gd)"
+
+	# IMAP support
+	if use imap ; then
+		my_conf+="
+		$(use_with imap imap ${EPREFIX}/usr)
+		$(use_with ssl imap-ssl ${EPREFIX}/usr)"
+	fi
+
+	# Interbase/firebird support
+
+	if use firebird ; then
+		my_conf+="
+		$(use_with firebird interbase ${EPREFIX}/usr)"
+	fi
+
+	# LDAP support
+	if use ldap ; then
+		my_conf+="
+		$(use_with ldap ldap ${EPREFIX}/usr)
+		$(use_with ldap-sasl ldap-sasl ${EPREFIX}/usr)"
+	fi
+
+	# MySQL support
+	if use mysql ; then
+		if use mysqlnd ; then
+			my_conf+="
+			$(use_with mysql mysql mysqlnd)"
+		else
+			my_conf+="
+			$(use_with mysql mysql ${EPREFIX}/usr)"
+		fi
+		my_conf+="
+		$(use_with mysql mysql-sock ${EPREFIX}/var/run/mysqld/mysqld.sock)"
+	fi
+
+	# MySQLi support
+	if use mysqlnd ; then
+		my_conf+="
+		$(use_with mysqli mysqli mysqlnd)"
+	else
+		my_conf+="
+		$(use_with mysqli mysqli ${EPREFIX}/usr/bin/mysql_config)"
+	fi
+
+	# ODBC support
+	if use odbc ; then
+		my_conf+="
+		$(use_with odbc unixODBC ${EPREFIX}/usr)"
+	fi
+
+	if use iodbc ; then
+		my_conf+="
+		$(use_with iodbc iodbc ${EPREFIX}/usr)"
+	fi
+
+	# Oracle support
+	if use oci8-instant-client ; then
+		my_conf+="
+		$(use_with oci8-instant-client oci8)"
+	fi
+
+	# PDO support
+	if use pdo ; then
+		my_conf+="
+		$(use_with mssql pdo-dblib )"
+		if use mysqlnd ; then
+			my_conf+="
+			$(use_with mysqlnd pdo-mysql mysqlnd)"
+		else
+			my_conf+="
+			$(use_with mysql pdo-mysql ${EPREFIX}/usr)"
+		fi
+		my_conf+="
+		$(use_with postgres pdo-pgsql )
+		$(use_with sqlite pdo-sqlite ${EPREFIX}/usr)
+		$(use_with odbc pdo-odbc unixODBC,${EPREFIX}/usr)"
+		if use oci8-instant-client ; then
+			my_conf+="
+			$(use_with oci8-instant-client pdo-oci)"
+		fi
+	fi
+
+	# readline/libedit support
+	my_conf+="
+	$(use_with readline readline ${EPREFIX}/usr)
+	$(use_with libedit libedit ${EPREFIX}/usr)"
+
+	# Session support
+	if use session ; then
+		my_conf+="
+		$(use_with sharedmem mm ${EPREFIX}/usr)"
+	else
+		my_conf+="
+		$(use_enable session session )"
+	fi
+
+	# Use pic for shared modules such as apache2's mod_php
+	my_conf="${my_conf} --with-pic"
+
+	# we use the system copy of pcre
+	# --with-pcre-regex affects ext/pcre
+	# --with-pcre-dir affects ext/filter and ext/zip
+	my_conf="${my_conf} --with-pcre-regex=${EPREFIX}/usr --with-pcre-dir=${EPREFIX}/usr"
+
+	# Catch CFLAGS problems
+	# Fixes bug #14067.
+	# Changed order to run it in reverse for bug #32022 and #12021.
+	replace-cpu-flags "k6*" "i586"
+
+	# Support user-passed configuration parameters
+	my_conf="${my_conf} ${EXTRA_ECONF:-}"
+
+	# Support the Apache2 extras, they must be set globally for all
+	# SAPIs to work correctly, especially for external PHP extensions
+
+	mkdir -p "${WORKDIR}/sapis-build"
+	for one_sapi in $SAPIS ; do
+		use "${one_sapi}" || continue
+		php_set_ini_dir "${one_sapi}"
+
+		cp -r "${S}" "${WORKDIR}/sapis-build/${one_sapi}"
+		cd "${WORKDIR}/sapis-build/${one_sapi}"
+
+		sapi_conf="${my_conf} --with-config-file-path=${PHP_INI_DIR}
+			--with-config-file-scan-dir=${PHP_EXT_INI_DIR_ACTIVE}"
+
+		for sapi in $SAPIS ; do
+			case "$sapi" in
+				cli|cgi|embed|fpm)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf="${sapi_conf} --enable-${sapi}"
+					else
+						sapi_conf="${sapi_conf} --disable-${sapi}"
+					fi
+					;;
+
+				apache2)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf="${sapi_conf} --with-apxs2=${EPREFIX}/usr/sbin/apxs"
+					else
+						sapi_conf="${sapi_conf} --without-apxs2"
+					fi
+					;;
+			esac
+		done
+
+		econf ${sapi_conf}
+	done
+}
+
+src_compile() {
+	# snmp seems to run during src_compile, too (bug #324739)
+	addpredict /usr/share/snmp/mibs/.index
+	addpredict /var/lib/net-snmp/mib_indexes
+
+	for sapi in ${SAPIS} ; do
+		if use "${sapi}"; then
+			cd "${WORKDIR}/sapis-build/$sapi" || "Failed to change dir to ${WORKDIR}/sapis-build/$1"
+			emake || die "emake failed"
+		fi
+	done
+}
+
+src_install() {
+	# see bug #324739 for what happens when we don't have that
+	addpredict /usr/share/snmp/mibs/.index
+
+	# grab the first SAPI that got built and install common files from there
+	local first_sapi=""
+	for sapi in $SAPIS ; do
+		if use $sapi ; then
+			first_sapi=$sapi
+			break
+		fi
+	done
+
+	# Makefile forgets to create this before trying to write to it...
+	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
+
+	# Install php environment (without any sapis)
+	cd "${WORKDIR}/sapis-build/$first_sapi"
+	emake INSTALL_ROOT="${D}" \
+		install-build install-headers install-programs \
+		|| die "emake install failed"
+
+	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
+
+	# Create the directory where we'll put version-specific php scripts
+	keepdir /usr/share/php${PHP_MV}
+
+	local sapi="", file=""
+	local sapi_list=""
+
+	for sapi in ${SAPIS}; do
+		if use "${sapi}" ; then
+			einfo "Installing SAPI: ${sapi}"
+			cd "${WORKDIR}/sapis-build/${sapi}"
+
+			if [[ "${sapi}" == "apache2" ]] ; then
+				# We're specifically not using emake install-sapi as libtool
+				# may cause unnecessary relink failures (see bug #351266)
+				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
+				newins ".libs/libphp5$(get_libname)" "libphp${PHP_MV}$(get_libname)"
+				keepdir "/usr/$(get_libdir)/apache2/modules"
+			else
+				# needed each time, php_install_ini would reset it
+				local dest="${PHP_DESTDIR#${EPREFIX}}"
+				into "${dest}"
+				case "$sapi" in
+					cli)
+						source="sapi/cli/php"
+						;;
+					cgi)
+						source="sapi/cgi/php-cgi"
+						;;
+					fpm)
+						source="sapi/fpm/php-fpm"
+						;;
+					embed)
+						source="libs/libphp${PHP_MV}$(get_libname)"
+						;;
+					*)
+						die "unhandled sapi in src_install"
+						;;
+				esac
+
+				if [[ "${source}" == *"$(get_libname)" ]]; then
+					dolib.so "${source}" || die "Unable to install ${sapi} sapi"
+				else
+					dobin "${source}" || die "Unable to install ${sapi} sapi"
+					local name="$(basename ${source})"
+					dosym "${dest}/bin/${name}" "/usr/bin/${name}${SLOT}"
+				fi
+			fi
+
+			php_install_ini "${sapi}"
+
+			# construct correct SAPI string for php-config
+			# thanks to ferringb for the bash voodoo
+			if [[ "${sapi}" == "apache2" ]]; then
+				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
+			else
+				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
+			fi
+		fi
+	done
+
+	# Installing opcache module
+	if use_if_iuse opcache ; then
+		dolib.so "modules/opcache$(get_libname)" || die "Unable to install opcache module"
+	fi
+
+	# Install env.d files
+	newenvd "${FILESDIR}/20php5-envd" \
+		"20php${SLOT}"
+	sed -e "s|/lib/|/$(get_libdir)/|g" -i \
+		"${ED}/etc/env.d/20php${SLOT}"
+	sed -e "s|php5|php${SLOT}|g" -i \
+		"${ED}/etc/env.d/20php${SLOT}"
+
+	# set php-config variable correctly (bug #278439)
+	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
+		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config"
+}
+
+src_test() {
+	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+	PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
+	if [[ ! -x "${PHP_BIN}" ]] ; then
+		ewarn "Test phase requires USE=cli, skipping"
+		return
+	else
+		export TEST_PHP_EXECUTABLE="${PHP_BIN}"
+	fi
+
+	if [[ -x "${WORKDIR}/sapis/cgi/php-cgi" ]] ; then
+		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis/cgi/php-cgi"
+	fi
+
+	REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n  -d "session.save_path=${T}" \
+		"${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d "session.save_path=${T}"
+
+	for name in ${EXPECTED_TEST_FAILURES}; do
+		mv "${name}.out" "${name}.out.orig" 2>/dev/null
+	done
+
+	local failed="$(find -name '*.out')"
+	if [[ ${failed} != "" ]] ; then
+		ewarn "The following test cases failed unexpectedly:"
+		for name in ${failed}; do
+			ewarn "  ${name/.out/}"
+		done
+	else
+		einfo "No unexpected test failures, all fine"
+	fi
+
+	if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
+		local passed=""
+		for name in ${EXPECTED_TEST_FAILURES}; do
+			[[ -f "${name}.diff" ]] && continue
+			passed="${passed} ${name}"
+		done
+		if [[ ${passed} != "" ]] ; then
+			einfo "The following test cases passed unexpectedly:"
+			for name in ${passed}; do
+				ewarn "  ${passed}"
+			done
+		else
+			einfo "None of the known-to-fail tests passed, all fine"
+		fi
+	fi
+}
+
+pkg_postinst() {
+	# Output some general info to the user
+	if use apache2 ; then
+		APACHE2_MOD_DEFINE="PHP5"
+		APACHE2_MOD_CONF="70_mod_php5"
+		apache-module_pkg_postinst
+	fi
+
+	# Create the symlinks for php
+	for m in ${SAPIS}; do
+		[[ ${m} == 'embed' ]] && continue;
+		if use $m ; then
+			local ci=$(eselect php show $m)
+			if [[ -z $ci ]]; then
+				eselect php set $m php${SLOT}
+				einfo "Switched ${m} to use php:${SLOT}"
+				einfo
+			elif [[ $ci != "php${SLOT}" ]] ; then
+				elog "To switch $m to use php:${SLOT}, run"
+				elog "    eselect php set $m php${SLOT}"
+				elog
+			fi
+		fi
+	done
+
+	elog "Make sure that PHP_TARGETS in ${EPREFIX}/etc/make.conf includes php${SLOT/./-} in order"
+	elog "to compile extensions for the ${SLOT} ABI"
+	elog
+	if ! use readline && use cli ; then
+		ewarn "Note that in order to use php interactivly, you need to enable"
+		ewarn "the readline USE flag or php -a will hang"
+	fi
+	elog
+	elog "This ebuild installed a version of php.ini based on php.ini-${PHP_INI_VERSION} version."
+	elog "You can chose which version of php.ini to install by default by setting PHP_INI_VERSION to either"
+	elog "'production' or 'development' in ${EPREFIX}/etc/make.conf"
+	elog "Both versions of php.ini can be found in ${EPREFIX}/usr/share/doc/${PF}"
+
+	elog
+	elog "For more details on how minor version slotting works (PHP_TARGETS) please read the upgrade guide:"
+	elog "http://www.gentoo.org/proj/en/php/php-upgrading.xml"
+	elog
+}
+
+pkg_prerm() {
+	eselect php cleanup
+}
--- a/dev-lang/php/php-5.5.7.ebuild
+++ b/dev-lang/php/php-5.5.7.ebuild
@ -0,0 +1,768 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.5.7.ebuild,v 1.1 2013/12/13 18:15:26 olemarkus Exp $
+
+EAPI=5
+
+inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+
+function php_get_uri ()
+{
+	case "${1}" in
+		"php-pre")
+			echo "http://downloads.php.net/dsp/${2}"
+		;;
+		"php")
+			echo "http://www.php.net/distributions/${2}"
+		;;
+		"olemarkus")
+			echo "http://dev.gentoo.org/~olemarkus/php/${2}"
+		;;
+		"gentoo")
+			echo "mirror://gentoo/${2}"
+		;;
+		*)
+			die "unhandled case in php_get_uri"
+		;;
+	esac
+}
+
+PHP_MV="$(get_major_version)"
+SLOT="$(get_version_component_range 1-2)"
+
+# alias, so we can handle different types of releases (finals, rcs, alphas,
+# betas, ...) w/o changing the whole ebuild
+PHP_PV="${PV/_rc/RC}"
+PHP_PV="${PHP_PV/_alpha/alpha}"
+PHP_PV="${PHP_PV/_beta/beta}"
+PHP_RELEASE="php"
+[[ ${PV} == ${PV/_alpha/} ]] || PHP_RELEASE="php-pre"
+[[ ${PV} == ${PV/_beta/} ]] || PHP_RELEASE="php-pre"
+[[ ${PV} == ${PV/_rc/} ]] || PHP_RELEASE="php-pre"
+PHP_P="${PN}-${PHP_PV}"
+
+PHP_SRC_URI="$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")"
+
+PHP_FPM_CONF_VER="1"
+
+SRC_URI="${PHP_SRC_URI}"
+
+DESCRIPTION="The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs."
+HOMEPAGE="http://php.net/"
+LICENSE="PHP-3"
+
+S="${WORKDIR}/${PHP_P}"
+
+# We can build the following SAPIs in the given order
+SAPIS="embed cli cgi fpm apache2"
+
+# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
+IUSE="${IUSE}
+	${SAPIS/cli/+cli}
+	threads"
+
+IUSE="${IUSE} bcmath berkdb bzip2 calendar cdb cjk
+	crypt +ctype curl debug
+	enchant exif frontbase +fileinfo +filter firebird
+	flatfile ftp gd gdbm gmp +hash +iconv imap inifile
+	intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash
+	mssql mysql libmysqlclient mysqli nls
+	oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
+	readline recode selinux +session sharedmem
+	+simplexml snmp soap sockets spell sqlite ssl
+	sybase-ct sysvipc tidy +tokenizer truetype unicode wddx
+	+xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib"
+
+DEPEND="
+	>=app-admin/eselect-php-0.7.0[apache2?,fpm?]
+	>=dev-libs/libpcre-8.32[unicode]
+	apache2? ( www-servers/apache[threads=] )
+	berkdb? ( =sys-libs/db-4* )
+	bzip2? ( app-arch/bzip2 )
+	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
+	cjk? ( !gd? (
+		virtual/jpeg:0
+		media-libs/libpng:0=
+		sys-libs/zlib
+	) )
+	crypt? ( >=dev-libs/libmcrypt-2.4 )
+	curl? ( >=net-misc/curl-7.10.5 )
+	enchant? ( app-text/enchant )
+	exif? ( !gd? (
+		virtual/jpeg:0
+		media-libs/libpng:0=
+		sys-libs/zlib
+	) )
+	firebird? ( dev-db/firebird )
+	gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
+	gdbm? ( >=sys-libs/gdbm-1.8.0 )
+	gmp? ( >=dev-libs/gmp-4.1.2 )
+	iconv? ( virtual/libiconv )
+	imap? ( virtual/imap-c-client[ssl=] )
+	intl? ( dev-libs/icu:= )
+	iodbc? ( dev-db/libiodbc )
+	kerberos? ( virtual/krb5 )
+	ldap? ( >=net-nds/openldap-1.2.11 )
+	ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 )
+	libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) )
+	mssql? ( dev-db/freetds[mssql] )
+	libmysqlclient? (
+		mysql? ( virtual/mysql )
+		mysqli? ( >=virtual/mysql-4.1 )
+	)
+	nls? ( sys-devel/gettext )
+	oci8-instant-client? ( dev-db/oracle-instantclient-basic )
+	odbc? ( >=dev-db/unixODBC-1.8.13 )
+	postgres? ( dev-db/postgresql-base )
+	qdbm? ( dev-db/qdbm )
+	readline? ( sys-libs/readline )
+	recode? ( app-text/recode )
+	sharedmem? ( dev-libs/mm )
+	simplexml? ( >=dev-libs/libxml2-2.6.8 )
+	snmp? ( >=net-analyzer/net-snmp-5.2 )
+	soap? ( >=dev-libs/libxml2-2.6.8 )
+	spell? ( >=app-text/aspell-0.50 )
+	sqlite? ( >=dev-db/sqlite-3.7.6.3 )
+	ssl? ( >=dev-libs/openssl-0.9.7 )
+	sybase-ct? ( dev-db/freetds )
+	tidy? ( app-text/htmltidy )
+	truetype? (
+		=media-libs/freetype-2*
+		>=media-libs/t1lib-5.0.0
+		!gd? (
+			virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
+	)
+	unicode? ( dev-libs/oniguruma )
+	wddx? ( >=dev-libs/libxml2-2.6.8 )
+	xml? ( >=dev-libs/libxml2-2.6.8 )
+	xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
+	xmlreader? ( >=dev-libs/libxml2-2.6.8 )
+	xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
+	xpm? (
+		x11-libs/libXpm
+		virtual/jpeg:0
+		media-libs/libpng:0= sys-libs/zlib
+	)
+	xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
+	zip? ( sys-libs/zlib )
+	zlib? ( sys-libs/zlib )
+	virtual/mta
+"
+
+php="=${CATEGORY}/${PF}"
+
+REQUIRED_USE="
+	truetype? ( gd )
+	cjk? ( gd )
+	exif? ( gd )
+
+	xpm? ( gd )
+	gd? ( zlib )
+	simplexml? ( xml )
+	soap? ( xml )
+	wddx? ( xml )
+	xmlrpc? ( || ( xml iconv ) )
+	xmlreader? ( xml )
+	xslt? ( xml )
+	ldap-sasl? ( ldap )
+	mhash? ( hash )
+	phar? ( hash )
+	libmysqlclient? ( || (
+		mysql
+		mysqli
+		pdo
+	) )
+
+	qdbm? ( !gdbm )
+	readline? ( !libedit )
+	recode? ( !imap !mysql !mysqli )
+	sharedmem? ( !threads )
+
+	!cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )"
+
+RDEPEND="${DEPEND}"
+
+RDEPEND="${RDEPEND} fpm? ( selinux? ( sec-policy/selinux-phpfpm ) )"
+
+DEPEND="${DEPEND}
+	sys-devel/flex
+	>=sys-devel/m4-1.4.3
+	>=sys-devel/libtool-1.5.18"
+
+# Allow users to install production version if they want to
+
+case "${PHP_INI_VERSION}" in
+	production|development)
+		;;
+	*)
+		PHP_INI_VERSION="development"
+		;;
+esac
+
+PHP_INI_UPSTREAM="php.ini-${PHP_INI_VERSION}"
+PHP_INI_FILE="php.ini"
+
+want_apache
+
+pkg_setup() {
+	depend.apache_pkg_setup
+}
+
+php_install_ini() {
+	local phpsapi="${1}"
+
+	# work out where we are installing the ini file
+	php_set_ini_dir "${phpsapi}"
+
+	local phpinisrc="${PHP_INI_UPSTREAM}-${phpsapi}"
+	cp "${PHP_INI_UPSTREAM}" "${phpinisrc}"
+
+	# default to /tmp for save_path, bug #282768
+	sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}"
+
+	# Set the extension dir
+	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" -i "${phpinisrc}"
+
+	# Set the include path to point to where we want to find PEAR packages
+	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}"
+
+	dodir "${PHP_INI_DIR#${EPREFIX}}"
+	insinto "${PHP_INI_DIR#${EPREFIX}}"
+	newins "${phpinisrc}" "${PHP_INI_FILE}"
+
+	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
+	elog
+
+	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
+	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
+
+	if use_if_iuse opcache; then
+		elog "Adding opcache to $PHP_EXT_INI_DIR"
+		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
+		dosym "${PHP_EXT_INI_DIR#${EPREFIX}}/opcache.ini" "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
+	fi
+
+	# SAPI-specific handling
+
+	if [[ "${sapi}" == "fpm" ]] ; then
+		[[ -z ${PHP_FPM_CONF_VER} ]] && PHP_FPM_CONF_VER=0
+		einfo "Installing FPM CGI config file php-fpm.conf"
+		insinto "${PHP_INI_DIR#${EPREFIX}}"
+		newins "${FILESDIR}/php-fpm-r${PHP_FPM_CONF_VER}.conf" php-fpm.conf
+
+		# Remove bogus /etc/php-fpm.conf.default (bug 359906)
+		[[ -f "${ED}/etc/php-fpm.conf.default" ]] && rm "${ED}/etc/php-fpm.conf.default"
+	fi
+
+	# Install PHP ini files into /usr/share/php
+
+	dodoc php.ini-development
+	dodoc php.ini-production
+
+}
+
+php_set_ini_dir() {
+	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
+	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
+	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
+}
+
+src_prepare() {
+	# USE=sharedmem (session/mod_mm to be exact) tries to mmap() this path
+	# ([empty session.save_path]/session_mm_[sapi][gid].sem)
+	# there is no easy way to circumvent that, all php calls during
+	# install use -n, so no php.ini file will be used.
+	# As such, this is the easiest way to get around
+	addpredict /session_mm_cli250.sem
+	addpredict /session_mm_cli0.sem
+
+	# Change PHP branding
+	# Get the alpha/beta/rc version
+	sed -re	"s|^(PHP_EXTRA_VERSION=\").*(\")|\1-pl${PR/r/}-gentoo\2|g" \
+		-i configure.in || die "Unable to change PHP branding"
+
+	# Patch PHP to show Gentoo as the server platform
+	sed -e 's/PHP_UNAME=`uname -a | xargs`/PHP_UNAME=`uname -s -n -r -v | xargs`/g' \
+		-i configure.in || die "Failed to fix server platform name"
+
+	# Prevent PHP from activating the Apache config,
+	# as we will do that ourselves
+	sed -i \
+		-e "s,-i -a -n php${PHP_MV},-i -n php${PHP_MV},g" \
+		-e "s,-i -A -n php${PHP_MV},-i -n php${PHP_MV},g" \
+		configure sapi/apache2filter/config.m4 sapi/apache2handler/config.m4
+
+	# Patch PHP to support heimdal instead of mit-krb5
+	if has_version "app-crypt/heimdal" ; then
+		sed -e 's|gssapi_krb5|gssapi|g' -i acinclude.m4 \
+			|| die "Failed to fix heimdal libname"
+		sed -e 's|PHP_ADD_LIBRARY(k5crypto, 1, $1)||g' -i acinclude.m4 \
+			|| die "Failed to fix heimdal crypt library reference"
+	fi
+
+	#Add user patches #357637
+	epatch_user
+
+	#force rebuilding aclocal.m4
+	rm aclocal.m4
+	eautoreconf
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# http://bugs.php.net/bug.php?id=48795, bug #343481
+		sed -i -e '/BUILD_CGI="\\$(CC)/s/CC/CXX/' configure || die
+	fi
+}
+
+src_configure() {
+	addpredict /usr/share/snmp/mibs/.index
+	addpredict /var/lib/net-snmp/mib_indexes
+
+	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
+
+	# This is a global variable and should be in caps. It isn't because the
+	# phpconfutils eclass relies on exactly this name...
+	# for --with-libdir see bug #327025
+	my_conf="
+		--prefix="${PHP_DESTDIR}"
+		--mandir="${PHP_DESTDIR}"/man
+		--infodir="${PHP_DESTDIR}"/info
+		--libdir="${PHP_DESTDIR}"/lib
+		--with-libdir=$(get_libdir)
+		--without-pear
+		$(use_enable threads maintainer-zts)"
+
+	#                             extension		  USE flag        shared
+	my_conf+="
+	$(use_enable bcmath bcmath )
+	$(use_with bzip2 bz2 "${EPREFIX}"/usr)
+	$(use_enable calendar calendar )
+	$(use_enable ctype ctype )
+	$(use_with curl curl "${EPREFIX}"/usr)
+	$(use_enable xml dom )
+	$(use_with enchant enchant "${EPREFIX}"/usr)
+	$(use_enable exif exif )
+	$(use_enable fileinfo fileinfo )
+	$(use_enable filter filter )
+	$(use_enable ftp ftp )
+	$(use_with nls gettext "${EPREFIX}"/usr)
+	$(use_with gmp gmp "${EPREFIX}"/usr)
+	$(use_enable hash hash )
+	$(use_with mhash mhash "${EPREFIX}"/usr)
+	$(use_with iconv iconv $(use elibc_glibc || echo "${EPREFIX}"/usr))
+	$(use_enable intl intl )
+	$(use_enable ipv6 ipv6 )
+	$(use_enable json json )
+	$(use_with kerberos kerberos "${EPREFIX}"/usr)
+	$(use_enable xml libxml )
+	$(use_with xml libxml-dir "${EPREFIX}"/usr)
+	$(use_enable unicode mbstring )
+	$(use_with crypt mcrypt "${EPREFIX}"/usr)
+	$(use_with mssql mssql "${EPREFIX}"/usr)
+	$(use_with unicode onig "${EPREFIX}"/usr)
+	$(use_with ssl openssl "${EPREFIX}"/usr)
+	$(use_with ssl openssl-dir "${EPREFIX}"/usr)
+	$(use_enable pcntl pcntl )
+	$(use_enable phar phar )
+	$(use_enable pdo pdo )
+	$(use_enable opcache opcache )
+	$(use_with postgres pgsql "${EPREFIX}"/usr)
+	$(use_enable posix posix )
+	$(use_with spell pspell "${EPREFIX}"/usr)
+	$(use_with recode recode "${EPREFIX}"/usr)
+	$(use_enable simplexml simplexml )
+	$(use_enable sharedmem shmop )
+	$(use_with snmp snmp "${EPREFIX}"/usr)
+	$(use_enable soap soap )
+	$(use_enable sockets sockets )
+	$(use_with sqlite sqlite3 "${EPREFIX}"/usr)
+	$(use_with sybase-ct sybase-ct "${EPREFIX}"/usr)
+	$(use_enable sysvipc sysvmsg )
+	$(use_enable sysvipc sysvsem )
+	$(use_enable sysvipc sysvshm )
+	$(use_with tidy tidy "${EPREFIX}"/usr)
+	$(use_enable tokenizer tokenizer )
+	$(use_enable wddx wddx )
+	$(use_enable xml xml )
+	$(use_enable xmlreader xmlreader )
+	$(use_enable xmlwriter xmlwriter )
+	$(use_with xmlrpc xmlrpc)
+	$(use_with xslt xsl "${EPREFIX}"/usr)
+	$(use_enable zip zip )
+	$(use_with zlib zlib "${EPREFIX}"/usr)
+	$(use_enable debug debug )"
+
+	# DBA support
+	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
+		|| use qdbm ; then
+		my_conf="${my_conf} --enable-dba${shared}"
+	fi
+
+	# DBA drivers support
+	my_conf+="
+	$(use_with cdb cdb)
+	$(use_with berkdb db4 ${EPREFIX}/usr)
+	$(use_enable flatfile flatfile )
+	$(use_with gdbm gdbm ${EPREFIX}/usr)
+	$(use_enable inifile inifile )
+	$(use_with qdbm qdbm ${EPREFIX}/usr)"
+
+	# Support for the GD graphics library
+	my_conf+="
+	$(use_with truetype freetype-dir ${EPREFIX}/usr)
+	$(use_with truetype t1lib ${EPREFIX}/usr)
+	$(use_enable cjk gd-jis-conv )
+	$(use_with gd jpeg-dir ${EPREFIX}/usr)
+	$(use_with gd png-dir ${EPREFIX}/usr)
+	$(use_with xpm xpm-dir ${EPREFIX}/usr)"
+	# enable gd last, so configure can pick up the previous settings
+	my_conf+="
+	$(use_with gd gd)"
+
+	# IMAP support
+	if use imap ; then
+		my_conf+="
+		$(use_with imap imap ${EPREFIX}/usr)
+		$(use_with ssl imap-ssl ${EPREFIX}/usr)"
+	fi
+
+	# Interbase/firebird support
+
+	if use firebird ; then
+		my_conf+="
+		$(use_with firebird interbase ${EPREFIX}/usr)"
+	fi
+
+	# LDAP support
+	if use ldap ; then
+		my_conf+="
+		$(use_with ldap ldap ${EPREFIX}/usr)
+		$(use_with ldap-sasl ldap-sasl ${EPREFIX}/usr)"
+	fi
+
+	# MySQL support
+	local mysqllib="mysqlnd"
+	local mysqlilib="mysqlnd"
+	use libmysqlclient && mysqllib="${EPREFIX}/usr"
+	use libmysqlclient && mysqlilib="${EPREFIX}/usr/bin/mysql_config"
+
+	my_conf+=" $(use_with mysql mysql $mysqllib)"
+	my_conf+=" $(use_with mysqli mysqli $mysqlilib)"
+
+	local mysqlsock=" $(use_with mysql mysql-sock ${EPREFIX}/var/run/mysqld/mysqld.sock)"
+	if use mysql ; then
+		my_conf+="${mysqlsock}"
+	elif use mysqli ; then
+		my_conf+="${mysqlsock}"
+	fi
+
+	# ODBC support
+	if use odbc ; then
+		my_conf+="
+		$(use_with odbc unixODBC ${EPREFIX}/usr)"
+	fi
+
+	if use iodbc ; then
+		my_conf+="
+		$(use_with iodbc iodbc ${EPREFIX}/usr)"
+	fi
+
+	# Oracle support
+	if use oci8-instant-client ; then
+		my_conf+="
+		$(use_with oci8-instant-client oci8)"
+	fi
+
+	# PDO support
+	if use pdo ; then
+		my_conf+="
+		$(use_with mssql pdo-dblib )
+		$(use_with mysql pdo-mysql ${mysqllib})
+		$(use_with postgres pdo-pgsql )
+		$(use_with sqlite pdo-sqlite ${EPREFIX}/usr)
+		$(use_with odbc pdo-odbc unixODBC,${EPREFIX}/usr)"
+		if use oci8-instant-client ; then
+			my_conf+="
+			$(use_with oci8-instant-client pdo-oci)"
+		fi
+	fi
+
+	# readline/libedit support
+	my_conf+="
+	$(use_with readline readline ${EPREFIX}/usr)
+	$(use_with libedit libedit ${EPREFIX}/usr)"
+
+	# Session support
+	if use session ; then
+		my_conf+="
+		$(use_with sharedmem mm ${EPREFIX}/usr)"
+	else
+		my_conf+="
+		$(use_enable session session )"
+	fi
+
+	# Use pic for shared modules such as apache2's mod_php
+	my_conf="${my_conf} --with-pic"
+
+	# we use the system copy of pcre
+	# --with-pcre-regex affects ext/pcre
+	# --with-pcre-dir affects ext/filter and ext/zip
+	my_conf="${my_conf} --with-pcre-regex=${EPREFIX}/usr --with-pcre-dir=${EPREFIX}/usr"
+
+	# Catch CFLAGS problems
+	# Fixes bug #14067.
+	# Changed order to run it in reverse for bug #32022 and #12021.
+	replace-cpu-flags "k6*" "i586"
+
+	# Support user-passed configuration parameters
+	my_conf="${my_conf} ${EXTRA_ECONF:-}"
+
+	# Support the Apache2 extras, they must be set globally for all
+	# SAPIs to work correctly, especially for external PHP extensions
+
+	mkdir -p "${WORKDIR}/sapis-build"
+	for one_sapi in $SAPIS ; do
+		use "${one_sapi}" || continue
+		php_set_ini_dir "${one_sapi}"
+
+		cp -r "${S}" "${WORKDIR}/sapis-build/${one_sapi}"
+		cd "${WORKDIR}/sapis-build/${one_sapi}"
+
+		sapi_conf="${my_conf} --with-config-file-path=${PHP_INI_DIR}
+			--with-config-file-scan-dir=${PHP_EXT_INI_DIR_ACTIVE}"
+
+		for sapi in $SAPIS ; do
+			case "$sapi" in
+				cli|cgi|embed|fpm)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf="${sapi_conf} --enable-${sapi}"
+					else
+						sapi_conf="${sapi_conf} --disable-${sapi}"
+					fi
+					;;
+
+				apache2)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf="${sapi_conf} --with-apxs2=${EPREFIX}/usr/sbin/apxs"
+					else
+						sapi_conf="${sapi_conf} --without-apxs2"
+					fi
+					;;
+			esac
+		done
+
+		econf ${sapi_conf}
+	done
+}
+
+src_compile() {
+	# snmp seems to run during src_compile, too (bug #324739)
+	addpredict /usr/share/snmp/mibs/.index
+	addpredict /var/lib/net-snmp/mib_indexes
+
+	for sapi in ${SAPIS} ; do
+		if use "${sapi}"; then
+			cd "${WORKDIR}/sapis-build/$sapi" || "Failed to change dir to ${WORKDIR}/sapis-build/$1"
+			emake || die "emake failed"
+		fi
+	done
+}
+
+src_install() {
+	# see bug #324739 for what happens when we don't have that
+	addpredict /usr/share/snmp/mibs/.index
+
+	# grab the first SAPI that got built and install common files from there
+	local first_sapi=""
+	for sapi in $SAPIS ; do
+		if use $sapi ; then
+			first_sapi=$sapi
+			break
+		fi
+	done
+
+	# Makefile forgets to create this before trying to write to it...
+	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
+
+	# Install php environment (without any sapis)
+	cd "${WORKDIR}/sapis-build/$first_sapi"
+	emake INSTALL_ROOT="${D}" \
+		install-build install-headers install-programs \
+		|| die "emake install failed"
+
+	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
+
+	# Create the directory where we'll put version-specific php scripts
+	keepdir /usr/share/php${PHP_MV}
+
+	local sapi="", file=""
+	local sapi_list=""
+
+	for sapi in ${SAPIS}; do
+		if use "${sapi}" ; then
+			einfo "Installing SAPI: ${sapi}"
+			cd "${WORKDIR}/sapis-build/${sapi}"
+
+			if [[ "${sapi}" == "apache2" ]] ; then
+				# We're specifically not using emake install-sapi as libtool
+				# may cause unnecessary relink failures (see bug #351266)
+				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
+				newins ".libs/libphp5$(get_libname)" "libphp${PHP_MV}$(get_libname)"
+				keepdir "/usr/$(get_libdir)/apache2/modules"
+			else
+				# needed each time, php_install_ini would reset it
+				local dest="${PHP_DESTDIR#${EPREFIX}}"
+				into "${dest}"
+				case "$sapi" in
+					cli)
+						source="sapi/cli/php"
+						;;
+					cgi)
+						source="sapi/cgi/php-cgi"
+						;;
+					fpm)
+						source="sapi/fpm/php-fpm"
+						;;
+					embed)
+						source="libs/libphp${PHP_MV}$(get_libname)"
+						;;
+					*)
+						die "unhandled sapi in src_install"
+						;;
+				esac
+
+				if [[ "${source}" == *"$(get_libname)" ]]; then
+					dolib.so "${source}" || die "Unable to install ${sapi} sapi"
+				else
+					dobin "${source}" || die "Unable to install ${sapi} sapi"
+					local name="$(basename ${source})"
+					dosym "${dest}/bin/${name}" "/usr/bin/${name}${SLOT}"
+				fi
+			fi
+
+			php_install_ini "${sapi}"
+
+			# construct correct SAPI string for php-config
+			# thanks to ferringb for the bash voodoo
+			if [[ "${sapi}" == "apache2" ]]; then
+				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
+			else
+				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
+			fi
+		fi
+	done
+
+	# Installing opcache module
+	if use_if_iuse opcache ; then
+		dolib.so "modules/opcache$(get_libname)" || die "Unable to install opcache module"
+	fi
+
+	# Install env.d files
+	newenvd "${FILESDIR}/20php5-envd" \
+		"20php${SLOT}"
+	sed -e "s|/lib/|/$(get_libdir)/|g" -i \
+		"${ED}/etc/env.d/20php${SLOT}"
+	sed -e "s|php5|php${SLOT}|g" -i \
+		"${ED}/etc/env.d/20php${SLOT}"
+
+	# set php-config variable correctly (bug #278439)
+	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
+		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config"
+}
+
+src_test() {
+	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+	PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
+	if [[ ! -x "${PHP_BIN}" ]] ; then
+		ewarn "Test phase requires USE=cli, skipping"
+		return
+	else
+		export TEST_PHP_EXECUTABLE="${PHP_BIN}"
+	fi
+
+	if [[ -x "${WORKDIR}/sapis/cgi/php-cgi" ]] ; then
+		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis/cgi/php-cgi"
+	fi
+
+	REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n  -d "session.save_path=${T}" \
+		"${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d "session.save_path=${T}"
+
+	for name in ${EXPECTED_TEST_FAILURES}; do
+		mv "${name}.out" "${name}.out.orig" 2>/dev/null
+	done
+
+	local failed="$(find -name '*.out')"
+	if [[ ${failed} != "" ]] ; then
+		ewarn "The following test cases failed unexpectedly:"
+		for name in ${failed}; do
+			ewarn "  ${name/.out/}"
+		done
+	else
+		einfo "No unexpected test failures, all fine"
+	fi
+
+	if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
+		local passed=""
+		for name in ${EXPECTED_TEST_FAILURES}; do
+			[[ -f "${name}.diff" ]] && continue
+			passed="${passed} ${name}"
+		done
+		if [[ ${passed} != "" ]] ; then
+			einfo "The following test cases passed unexpectedly:"
+			for name in ${passed}; do
+				ewarn "  ${passed}"
+			done
+		else
+			einfo "None of the known-to-fail tests passed, all fine"
+		fi
+	fi
+}
+
+pkg_postinst() {
+	# Output some general info to the user
+	if use apache2 ; then
+		APACHE2_MOD_DEFINE="PHP5"
+		APACHE2_MOD_CONF="70_mod_php5"
+		apache-module_pkg_postinst
+	fi
+
+	# Create the symlinks for php
+	for m in ${SAPIS}; do
+		[[ ${m} == 'embed' ]] && continue;
+		if use $m ; then
+			local ci=$(eselect php show $m)
+			if [[ -z $ci ]]; then
+				eselect php set $m php${SLOT}
+				einfo "Switched ${m} to use php:${SLOT}"
+				einfo
+			elif [[ $ci != "php${SLOT}" ]] ; then
+				elog "To switch $m to use php:${SLOT}, run"
+				elog "    eselect php set $m php${SLOT}"
+				elog
+			fi
+		fi
+	done
+
+	elog "Make sure that PHP_TARGETS in ${EPREFIX}/etc/make.conf includes php${SLOT/./-} in order"
+	elog "to compile extensions for the ${SLOT} ABI"
+	elog
+	if ! use readline && use cli ; then
+		ewarn "Note that in order to use php interactivly, you need to enable"
+		ewarn "the readline USE flag or php -a will hang"
+	fi
+	elog
+	elog "This ebuild installed a version of php.ini based on php.ini-${PHP_INI_VERSION} version."
+	elog "You can chose which version of php.ini to install by default by setting PHP_INI_VERSION to either"
+	elog "'production' or 'development' in ${EPREFIX}/etc/make.conf"
+	elog "Both versions of php.ini can be found in ${EPREFIX}/usr/share/doc/${PF}"
+
+	elog
+	elog "For more details on how minor version slotting works (PHP_TARGETS) please read the upgrade guide:"
+	elog "http://www.gentoo.org/proj/en/php/php-upgrading.xml"
+	elog
+}
+
+pkg_prerm() {
+	eselect php cleanup
+}
--- a/dev-lang/python/python-3.3.2-r2.ebuild
+++ b/dev-lang/python/python-3.3.2-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/dev-lang/python/python-3.3.2-r2.ebuild,v 1.11 2013/12/08 09:26:12 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.3.2-r2.ebuild,v 1.12 2013/12/13 06:09:38 mattst88 Exp $

 EAPI="3"
 WANT_AUTOMAKE="none"
@ -18,7 +18,7 @@ SRC_URI="http://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz

 LICENSE="PSF-2"
 SLOT="3.3"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE="build doc elibc_uclibc examples gdbm hardened ipv6 +ncurses +readline sqlite +ssl +threads tk wininst +xml"

 # Do not add a dependency on dev-lang/python to this ebuild.
--- a/dev-libs/librelp/librelp-1.1.5.ebuild
+++ b/dev-libs/librelp/librelp-1.1.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/dev-libs/librelp/librelp-1.1.5.ebuild,v 1.1 2013/08/16 08:33:44 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/librelp/librelp-1.1.5.ebuild,v 1.2 2013/12/13 10:24:16 ultrabug Exp $

 EAPI="5"

@ -13,7 +13,7 @@ KEYWORDS="~amd64 ~arm ~hppa ~sparc ~x86"
 IUSE="debug doc"

 DEPEND=""
-RDEPEND=""
+RDEPEND=">=net-libs/gnutls-2.12.23-r1"

 src_configure() {
 	econf \
--- a/dev-libs/librelp/librelp-1.2.0.ebuild
+++ b/dev-libs/librelp/librelp-1.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/dev-libs/librelp/librelp-1.2.0.ebuild,v 1.4 2013/11/19 15:14:32 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/librelp/librelp-1.2.0.ebuild,v 1.5 2013/12/13 10:24:16 ultrabug Exp $

 EAPI="5"

@ -13,7 +13,7 @@ KEYWORDS="amd64 ~arm hppa ~sparc x86"
 IUSE="debug doc"

 DEPEND=""
-RDEPEND=""
+RDEPEND=">=net-libs/gnutls-2.12.23-r1"

 src_configure() {
 	econf \
--- a/dev-libs/libsmtp/Manifest
+++ b/dev-libs/libsmtp/Manifest
@ -1 +0,0 @@
-DIST libsmtp-0.8.tar.gz 191362 SHA256 d3d3a62cec9ab771a21c4ae9227e11f44995c9f6685929dba574d2d43812a476 SHA512 42fa61c8144c751dc9b6ac6ff73c5a8fec83880ff3486dce9dbb6e22a486f621ea5cbdab5ebbe94f07f3c195723fe485c531ab14175ce881f34a8aed512a8b69 WHIRLPOOL 9226cb0fea7d1ff2e923838136e0c47693ae8fa9120019bfbb409218e1302aa40da166f6a1508fce3b723d4f117826552ad12756fed967b5558e67c69f0793f0
--- a/dev-libs/libsmtp/files/libsmtp-0.8-gentoo.diff
+++ b/dev-libs/libsmtp/files/libsmtp-0.8-gentoo.diff
@ -1,128 +0,0 @@
-diff -urN libsmtp-0.8.orig/examples/multipart.c libsmtp-0.8/examples/multipart.c
--- libsmtp-0.8.orig/examples/multipart.c	2004-12-22 08:22:05.415981248 -0500
-+++ libsmtp-0.8/examples/multipart.c	2004-12-22 08:33:32.158580504 -0500
-@@ -341,4 +341,5 @@
-   /* Free the allocated struct mem */
-   libsmtp_free (mailsession);
-   return 0;
-}
-\ No newline at end of file
-+}
-+
-diff -urN libsmtp-0.8.orig/examples/singlepart.c libsmtp-0.8/examples/singlepart.c
--- libsmtp-0.8.orig/examples/singlepart.c	2004-12-22 08:22:05.434978360 -0500
-+++ libsmtp-0.8/examples/singlepart.c	2004-12-22 08:33:32.159580352 -0500
-@@ -293,4 +293,5 @@
-   /* Free the allocated struct mem */
-   free (mailsession);
-   return 0;
-}
-\ No newline at end of file
-+}
-+
-diff -urN libsmtp-0.8.orig/examples/smtpmail.c libsmtp-0.8/examples/smtpmail.c
--- libsmtp-0.8.orig/examples/smtpmail.c	2004-12-22 08:22:05.511966656 -0500
-+++ libsmtp-0.8/examples/smtpmail.c	2004-12-22 08:33:32.160580200 -0500
-@@ -247,4 +247,5 @@
-   /* Free the allocated struct mem */
-   libsmtp_free (mailsession);
-   return 0;
-}
-\ No newline at end of file
-+}
-+
-diff -urN libsmtp-0.8.orig/include/libsmtp_mime.h libsmtp-0.8/include/libsmtp_mime.h
--- libsmtp-0.8.orig/include/libsmtp_mime.h	2004-12-22 08:22:05.592954344 -0500
-+++ libsmtp-0.8/include/libsmtp_mime.h	2004-12-22 08:33:22.892989088 -0500
-@@ -191,4 +191,5 @@
-   #define LIBSMTP_BADCHARSET	2055
-   
-   #define LIBSMTP_MAX_MIME_ERRNO	2055
-/* #endif LIBSMTP_USE_MIME */
-\ No newline at end of file
-+/* #endif LIBSMTP_USE_MIME */
-+
-diff -urN libsmtp-0.8.orig/mime/comm.c libsmtp-0.8/mime/comm.c
--- libsmtp-0.8.orig/mime/comm.c	2004-12-22 08:22:04.856066368 -0500
-+++ libsmtp-0.8/mime/comm.c	2004-12-22 08:33:05.151686176 -0500
-@@ -158,7 +158,7 @@
-     /* Text and message parts will have a charset setting */
-     if ((libsmtp_temp_part->Type==LIBSMTP_MIME_TEXT) ||
-         (libsmtp_temp_part->Type==LIBSMTP_MIME_MESSAGE))
-      if ((libsmtp_temp_string=libsmtp_int_lookup_mime_charset(libsmtp_temp_part)))
-+      if ((libsmtp_temp_string=(char *)libsmtp_int_lookup_mime_charset(libsmtp_temp_part)))
-       {
-         g_string_sprintf (libsmtp_temp_gstring, "; charset=\"%s\"", \
-            libsmtp_temp_string);
-diff -urN libsmtp-0.8.orig/mime/parts.c libsmtp-0.8/mime/parts.c
--- libsmtp-0.8.orig/mime/parts.c	2004-12-22 08:22:04.905058920 -0500
-+++ libsmtp-0.8/mime/parts.c	2004-12-22 08:33:05.213676752 -0500
-@@ -396,7 +396,7 @@
-           /* Text and message parts will have a charset setting */
-           if ((libsmtp_temp_part->Type==LIBSMTP_MIME_TEXT) ||
-               (libsmtp_temp_part->Type==LIBSMTP_MIME_MESSAGE))
-            if ((libsmtp_temp_string=libsmtp_int_lookup_mime_charset(libsmtp_temp_part)))
-+            if ((libsmtp_temp_string=(char *)libsmtp_int_lookup_mime_charset(libsmtp_temp_part)))
-             {
-               g_string_sprintf (libsmtp_temp_gstring, ";\r\n charset=\"%s\"", \
-                  libsmtp_temp_string);
-diff -urN libsmtp-0.8.orig/smtp/libsmtp_comm.c libsmtp-0.8/smtp/libsmtp_comm.c
--- libsmtp-0.8.orig/smtp/libsmtp_comm.c	2004-12-22 08:22:05.102028976 -0500
-+++ libsmtp-0.8/smtp/libsmtp_comm.c	2004-12-22 08:32:35.081257576 -0500
-@@ -82,13 +82,13 @@
-       g_string_assign (libsmtp_gstring_read, libsmtp_int_rec_buffer);
- 
-       /* Ok, take the first part of the response ... */
-      libsmtp_int_temp_buffer = strtok ((char *)libsmtp_int_rec_buffer, " ");
-+      libsmtp_int_temp_buffer = (char *)strtok ((char *)libsmtp_int_rec_buffer, " ");
-   
-       /* and extract the response code */
-       libsmtp_session->LastResponseCode = atoi(libsmtp_int_temp_buffer);
-   
-       /* Then fetch the rest of the string and save it */
-      libsmtp_int_temp_buffer = strtok (NULL, "\0");
-+      libsmtp_int_temp_buffer = (char *)strtok (NULL, "\0");
-       libsmtp_session->LastResponse = g_string_new (libsmtp_int_temp_buffer);
-       break;
-   }
-@@ -718,4 +718,5 @@
-   /* Wrong stage, dude ! */
-   libsmtp_session->ErrorCode = LIBSMTP_BADSTAGE;
-   return LIBSMTP_BADSTAGE;
-}
-\ No newline at end of file
-+}
-+
-diff -urN libsmtp-0.8.orig/smtp/libsmtp_connection.c libsmtp-0.8/smtp/libsmtp_connection.c
--- libsmtp-0.8.orig/smtp/libsmtp_connection.c	2004-12-22 08:22:05.188015904 -0500
-+++ libsmtp-0.8/smtp/libsmtp_connection.c	2004-12-22 08:32:35.082257424 -0500
-@@ -206,4 +206,5 @@
-   }
- 
-   return LIBSMTP_NOERR;
-}
-\ No newline at end of file
-+}
-+
-diff -urN libsmtp-0.8.orig/smtp/libsmtp_data.c libsmtp-0.8/smtp/libsmtp_data.c
--- libsmtp-0.8.orig/smtp/libsmtp_data.c	2004-12-22 08:22:05.078032624 -0500
-+++ libsmtp-0.8/smtp/libsmtp_data.c	2004-12-22 08:32:35.090256208 -0500
-@@ -168,4 +168,5 @@
-   }
-   
-   return LIBSMTP_NOERR;
-}
-\ No newline at end of file
-+}
-+
-diff -urN libsmtp-0.8.orig/smtp/libsmtp_error.c libsmtp-0.8/smtp/libsmtp_error.c
--- libsmtp-0.8.orig/smtp/libsmtp_error.c	2004-12-22 08:22:05.146022288 -0500
-+++ libsmtp-0.8/smtp/libsmtp_error.c	2004-12-22 08:32:35.090256208 -0500
-@@ -110,4 +110,5 @@
-     return LIBSMTP_UNDEFERR;
- 
-   return libsmtp_session->ErrorCode;
-}
-\ No newline at end of file
-+}
-+
--- a/dev-libs/libsmtp/libsmtp-0.8.ebuild
+++ b/dev-libs/libsmtp/libsmtp-0.8.ebuild
@ -1,38 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libsmtp/libsmtp-0.8.ebuild,v 1.6 2008/10/13 18:54:10 bangert Exp $
-
-inherit eutils
-
-DESCRIPTION="A small C library that allows direct SMTP connections conforming to RFC 822"
-HOMEPAGE="http://libsmtp.berlios.de/"
-SRC_URI="mirror://berlios/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 x86"
-IUSE="doc"
-
-DEPEND="=dev-libs/glib-1*"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-gentoo.diff
-}
-
-src_install() {
-	insinto /usr/include
-	doins include/*.h
-	dolib.a {smtp,mime}/*.a
-	dodoc AUTHORS CHANGES INSTALL README doc/API doc/BUGS doc/MIME doc/TODO \
-		|| die "dodoc failed"
-
-	if use doc ; then
-		cd "${S}"/examples
-		rm -fr CVS
-		make clean
-		docinto examples
-		dodoc *
-	fi
-}
--- a/dev-libs/libuv/Manifest
+++ b/dev-libs/libuv/Manifest
@ -1,5 +1,6 @@
 DIST libuv-0.11.10.tar.gz 336631 SHA256 517d5c5205c7efc9b91f9908234ba98d7ec9e00a02be728813f82fc90097e078 SHA512 2581ff245e8922068a9a126704c9de838596bda82139b97c074b871765971044be2e956e6e95476a00c3e68d1d8adc87d8160793ea1d7ab90f6c6dd279d2e103 WHIRLPOOL f25bebb8201dd0fe42e6dedb7f9beb84ff261d05afaca10266f2ddec273bb35030fa528ab0958ee12fe5c1543a4000c6a44bd3e245ccae490ec12881452df590
 DIST libuv-0.11.12.tar.gz 339612 SHA256 4467e3be3b33a3b32ceae12708b6c650197bb08671eb7857092d545d056d362e SHA512 14fd7f5a1cb434c96953e6f19ad8329a1df38e9c4900f378506507129dcd72ef3bab0ec7a26243b5358dad7290adcf1acc97ab55e8d2976a22c27f119f2d6266 WHIRLPOOL f5ac394245dd133c65447c62bde4612e30259fbb3037afbfe1fd51d0f136019f43acf3fe58631cb57bc335a20a2738ab51978c8b9aeccf756fb9a20f156f1f98
 DIST libuv-0.11.13.tar.gz 339839 SHA256 d8ae1af06ce94d55c4c7568dea39a1ebc4d89012da3af2a35f3a8b1410bccfec SHA512 bc7f554abd74964fea5a6edf469f6dd00b342265892336c748b81d0aa5eb286abc9b9ed15aefbedaaead06166448adadea701994895341f406080069ce7a2465 WHIRLPOOL f0f2a7292fb64f0cd357c63742d279f418b24b6bb5a2464a7f860a2c6fed74262b3b257bc50a6681c0377b76f6e774521088f255f2445810cfb5de050dd7d62d
+DIST libuv-0.11.16.tar.gz 368618 SHA256 92bdbc58ce3219bd5457d66e6bcde299779eb5f192d5265192386e9dbfc34e06 SHA512 1767ba1eee0d215ff10ac5d24189ea060069c03f26f229327813a78e492eb72daa1307fc2be71e2bbd76e10d895d24ed1dcbfeebd1025d690c90a69cd6babd2d WHIRLPOOL 6885adaedba92c1fbe7e50d52f63da4b100eab6524ab5e0689eace3895004f0597fe376b3cadc30184e5395dc8034d8fdef2faa9167cfe0dc907a4b6c612311e
 DIST libuv-0.11.6.tar.gz 327932 SHA256 84c2815ef1330d26fa9e4cec0f758c4bf2bddd0fc3d9b62614e5237f9ccdf848 SHA512 83c851dd0895f78232196f7936c0d3e8381a5ce2d98f7cc51e56bac625f54bf24e9011d6cec33089450fe6ebf0ca1f4eacdd614f6c214da596de5795b7ce8ba2 WHIRLPOOL e4d840fbcb1d61c235d6f7e6752bff1ef2e72b3f9f7ed1f15c3e69db95661230258ba4cc57c6a9818ad580411d25d62920c047d8d5e1a22cdb7ec7c059ebe200
 DIST libuv-0.11.8.tar.gz 332049 SHA256 973b80d6355632531b7578879e341505589c9ca7cbadea117014a07ce93934fd SHA512 34a4bab7ff07a1da9e0692110d26e039dc05f378cf45fc67bb47e864bea60ea5b5cceafa9a0bdee4359cdc2b820e658baaee95d3470f587f0441cb861efc7f6a WHIRLPOOL 66b73d8523edaa39301548dd838a1ecc13fbe8161cb6b2eed89c328989e41d203264392c08bdd6f033f783702eabf84391ca1a5351b82680541a029b4f3da434
--- a/dev-libs/libuv/libuv-0.11.16.ebuild
+++ b/dev-libs/libuv/libuv-0.11.16.ebuild
@ -0,0 +1,35 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libuv/libuv-0.11.16.ebuild,v 1.1 2013/12/14 12:15:29 hasufell Exp $
+
+EAPI=5
+
+inherit eutils autotools
+
+DESCRIPTION="A new platform layer for Node"
+HOMEPAGE="https://github.com/joyent/libuv"
+SRC_URI="https://github.com/joyent/libuv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD BSD-2 ISC MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs"
+
+DEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	echo "m4_define([UV_EXTRA_AUTOMAKE_FLAGS], [serial-tests])" \
+    	> m4/libuv-extra-automake-flags.m4 || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	prune_libtool_files
+}
--- a/dev-libs/nss/nss-3.15.3.1.ebuild
+++ b/dev-libs/nss/nss-3.15.3.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-libs/nss/nss-3.15.3.1.ebuild,v 1.1 2013/12/12 14:49:46 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.15.3.1.ebuild,v 1.2 2013/12/13 14:11:07 jer Exp $

 EAPI=5
 inherit eutils flag-o-matic multilib toolchain-funcs
@ -16,7 +16,7 @@ SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${RTM_NAME}

 LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~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 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="utils"

 DEPEND="virtual/pkgconfig
--- a/dev-python/boto/Manifest
+++ b/dev-python/boto/Manifest
@ -7,5 +7,6 @@ DIST boto-2.16.0.tar.gz 5700070 SHA256 345b9766e924995d70799af2beecd5bb5937e15c9
 DIST boto-2.17.0.tar.gz 5993878 SHA256 8ade8069e8fa273fd819da6604394bae194c3440842123ee8ca80e06976c2af5 SHA512 69310f860cd13980ac622bb91764d36a4a7699bc0884e9c6b5e93e31dda8ea1e35be8bca892467180bd8612a4553cfdb4cf6ca6e40feec383d8dc444f0bfecb0 WHIRLPOOL 230ef94e02c0153c797404927fe8baab57d91d1b663dc5aa176f2a4e17e795556e6d13964665282af204d97fb754beffde78f3d74f9176108ee6dba1cd96655f
 DIST boto-2.18.0.tar.gz 6001448 SHA256 5b68b2902020e43efcaca749ec74a13b7ad71b9c9d34c754863f44568e87fce5 SHA512 190b63f2eef0c88d136dbc27f504cf2e26d3edbd5bfb0e3ad9f3d982d62f6242ef9b62029bcbd69c438df8c567ae0e2f89f789414eb09a3be3127ba5acbd94dc WHIRLPOOL ca261505311a7ffcb7e169e7d585d7f97ac8362cdbf47d616c7ac58c5b790115afdcd29181607ecbc6398b03b775090372d9e164ab5d6beed53217a74aa8b299
 DIST boto-2.19.0.tar.gz 6003759 SHA256 8c461b6dac980a6ebc6794e0218c80aab084b2abdd734c0772a7bca514b17a27 SHA512 c0a5282baccec1e91a5507f5d5415c037ee2dc02d68d701e137fee5014cbf231067e30cfccdf892f0138b61f8e0ea0f8df9468862dd7b76a609f3840ae9fc965 WHIRLPOOL 35113fbbf126297e221502eebd6509092199a5678056648a976431dd7e297d50039b79ac6feddc4aea4e7b0adc467e070d0ec1f153199a822ff56fc2d8f3758b
+DIST boto-2.20.0.tar.gz 6022471 SHA256 339e3205d5ac99e63847a32d829535cf1be6afe7a61406f95e187fc29d3032a3 SHA512 08b3f3a0d3b8758531cc9fa1f864dff4850fa888752fe7b18c042dc3269d8bcef206b5f5229be02020e04ca5c1ba849bfc3311c3cedf1c0f6f1dcb90ab6cb521 WHIRLPOOL 8f1b55edb5aec6dde54752e2d7422d9993615226c1f923c26d54c5802f08daee137c9706b87d2dcc65f3d2245426ae5d6b2d947dbe9c582ce2508818deb2eda9
 DIST boto-2.3.0.tar.gz 488207 SHA256 c12969a9b51eb803e348f71850b3cd28edb43095235d46b86408f334fd4e3516 SHA512 a59edcea8c4f30268e21c8bd518c516771f926e4833e696f2dc812c42893c47df279c3705e3e050dddbfcb3df34c2fb0d86ae77b7952cf6802774623e7da9aaf WHIRLPOOL f66872fdd9243d5e4acadff7c6052dfae99ec005b89596e96ee68443b79ff2b4077a3145449a4e76a50a9d1f72916c481a71aa5ebe44ca2ebb04c9c0d8f972aa
 DIST boto-2.9.9.tar.gz 949433 SHA256 6ce016eed6605381d67f39bc62763ee3b862aed3d403ea70b16b9d63738c002a SHA512 d97e2839ee4543b891d2afb8d9e3d31dc915c6918975a89fef5511643c2de11c59ce6f3e1b9f9769afcd0910e0666adfa3e651db3c1b3d67f56d335f8133a05c WHIRLPOOL a9f9948be6a1bdf4266d58953bbff746b49301da5b9cb56b6cd1044150e500964a6b72e1b2e390f43eb0a3f0118987f154164e6c5ea821dc8a18bdc009a8c6d8
--- a/dev-python/boto/boto-2.20.0.ebuild
+++ b/dev-python/boto/boto-2.20.0.ebuild
@ -0,0 +1,25 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/boto/boto-2.20.0.ebuild,v 1.1 2013/12/13 06:19:14 radhermit Exp $
+
+EAPI="5"
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Amazon Web Services API"
+HOMEPAGE="https://github.com/boto/boto http://pypi.python.org/pypi/boto"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+# requires Amazon Web Services keys to pass some tests
+RESTRICT="test"
+
+python_test() {
+	esetup.py test
+}
--- a/dev-python/configparser/Manifest
+++ b/dev-python/configparser/Manifest
@ -1 +1,2 @@
 DIST configparser-3.2.0r3.tar.gz 32281 SHA256 37feec498c770201ac51112b203338c3342721232fced5f6295399e67f535648 SHA512 9d7a4b7df23f926f8a79ea0c144324a419f99d7c3a641f9d5bd06f056a54154c9e2b8132176993a6d9fe28f05f6332172f4e1e67b832fb1fbf626265fb669739 WHIRLPOOL d1aa697b4e10f17d08abebe05c499e038c885540f4c01235dbf2b4f2aaacfcfe142c22dce9f293a8d3ae5ff0c6298d4e7eca78369725d9ee8a9f74b65847d69b
+DIST configparser-3.3.0r2.tar.gz 32885 SHA256 6a2318590dfc4013fc5bf53c2bec14a8cb455a232295eb282a13f94786c4b0b2 SHA512 86c095bb64766e87ba59462a99d0287ec52073f27a1c9be7d37568516bc0cc4af6f362ca90a1b90f52aaa4342dc275d769c77f18d80c0efb114ba6fce37fff5f WHIRLPOOL 125ea0a2f1632c599e30d2e196f463139248b9fe1d0e24945b15f3497646b5e87dd0659c9ba78625d8fbaeac7ea5a7f8fd4124c0ad52e64ebbf4ec06533fe9b8
--- a/dev-python/configparser/configparser-3.3.0.2.ebuild
+++ b/dev-python/configparser/configparser-3.3.0.2.ebuild
@ -0,0 +1,19 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/configparser/configparser-3.3.0.2.ebuild,v 1.1 2013/12/14 10:36:32 radhermit Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 ) # 2_6 possible with extra deps
+inherit distutils-r1
+
+MY_PV=${PV%.*}r${PV##*.}
+DESCRIPTION="Backport of Python-3 built-in configparser"
+HOMEPAGE="http://pypi.python.org/pypi/configparser/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${PN}-${MY_PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+S=${WORKDIR}/${PN}-${MY_PV}
--- a/dev-python/coverage/Manifest
+++ b/dev-python/coverage/Manifest
@ -1,2 +1,3 @@
 DIST coverage-3.6.tar.gz 232067 SHA256 df3bf169d4727f3fad146ca715a49a1f72a8258689651ef9de908022e739700d SHA512 fb9f26ba20dced48d01929251a08b0b9da2bc5910ccc734910aed76634bd98b538983880e2e29c2c4604f6b97ed3a947871dfe8c9a43acc4556484e4c77ee68e WHIRLPOOL c6163901763dadd4cfba13953dd2535778b0da73a4f08f1400534135d49d54558736c46253146cbe03f9680d33f3cd2a33f8be7795ff17054bf0608393ac6eca
+DIST coverage-3.7.1.tar.gz 284735 SHA256 d1aea1c4aa61b8366d6a42dd3650622fbf9c634ed24eaf7f379c8b970e5ed44e SHA512 d198b06db938119fad8c13b9a7bbf018a5406c29327c943014e3b9b33ea85f0fbadaef6565fba26a461a3f1ee31f4cbfb42503420cc587c846ce499e80fd5133 WHIRLPOOL f07d239053bf357fe3dca7bec04d390db9b6610060fd848c9f15ea9de2f0a141d66e68cba5833a63bde860f4377c9029574e6ea7ed76ffe2fda332703e3100ab
 DIST coverage-3.7.tar.gz 283419 SHA256 c50ee4c391a083d87e2345b0094a7ec24a07b98b4e435f134d02a62ea3827fdb SHA512 62d20d8a3f5be93c8eae513b61330cd5876df94cb7269ff90bcc0d4b946dd426b7bad9bcb74e2b6334a5c14178c408667c7dfd00d5362ee499c203d4ac55d189 WHIRLPOOL 910e766d2eaa7918611325beacb4ab2dd220cccf2478b01e635b8339f4bdd11823b69a1c5a630d20342188db7e1aae0ab0d26e85743ce3f0e24c1ead5f49e64b
--- a/dev-python/coverage/coverage-3.7.1.ebuild
+++ b/dev-python/coverage/coverage-3.7.1.ebuild
@ -0,0 +1,29 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/coverage/coverage-3.7.1.ebuild,v 1.1 2013/12/13 06:24:30 radhermit Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
+inherit distutils-r1
+
+DESCRIPTION="Code coverage measurement for Python"
+HOMEPAGE="http://nedbatchelder.com/code/coverage/ http://pypi.python.org/pypi/coverage"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+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"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+python_compile() {
+	if [[ ${EPYTHON} == python2.[67] ]]; then
+		local CFLAGS="${CFLAGS} -fno-strict-aliasing"
+		export CFLAGS
+	fi
+
+	distutils-r1_python_compile
+}
--- a/dev-python/nosexcover/metadata.xml
+++ b/dev-python/nosexcover/metadata.xml
@ -2,4 +2,5 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
        <herd>python</herd>
+	<herd>openstack</herd>
 </pkgmetadata>
--- a/dev-python/nosexcover/nosexcover-1.0.8.ebuild
+++ b/dev-python/nosexcover/nosexcover-1.0.8.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/nosexcover/nosexcover-1.0.8.ebuild,v 1.2 2013/09/05 18:46:23 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/nosexcover/nosexcover-1.0.8.ebuild,v 1.3 2013/12/14 12:15:51 idella4 Exp $

 EAPI=5

@ -19,5 +19,5 @@ IUSE=""

 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]"
+		>=dev-python/coverage-3.4[${PYTHON_USEDEP}]"
 RDEPEND="${DEPEND}"
--- a/dev-python/pbr/pbr-0.5.23.ebuild
+++ b/dev-python/pbr/pbr-0.5.23.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/pbr/pbr-0.5.23.ebuild,v 1.2 2013/12/11 21:30:39 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pbr/pbr-0.5.23.ebuild,v 1.3 2013/12/13 21:37:57 prometheanfire Exp $

 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@ -20,12 +20,14 @@ IUSE="test"
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	test? ( >=dev-python/coverage-3.6[${PYTHON_USEDEP}]
 		>=dev-python/fixtures-0.3.12[${PYTHON_USEDEP}]
-		dev-python/flake8[${PYTHON_USEDEP}]
+		~dev-python/flake8-2.0[${PYTHON_USEDEP}]
 		dev-python/subunit[${PYTHON_USEDEP}]
 		dev-python/mimeparse[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
 		~dev-python/pyflakes-0.7.2[${PYTHON_USEDEP}]
 		~dev-python/pep8-1.4.5[${PYTHON_USEDEP}]
 		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.2[${PYTHON_USEDEP}]
 		>=dev-python/testrepository-0.0.17[${PYTHON_USEDEP}]
 		<dev-python/testresources-0.3[${PYTHON_USEDEP}]
 		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
--- a/dev-python/python-docs/python-docs-3.3.2.ebuild
+++ b/dev-python/python-docs/python-docs-3.3.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-python/python-docs/python-docs-3.3.2.ebuild,v 1.5 2013/12/08 09:31:36 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-docs/python-docs-3.3.2.ebuild,v 1.6 2013/12/13 06:09:20 mattst88 Exp $

 EAPI="3"

@ -10,7 +10,7 @@ SRC_URI="http://www.python.org/ftp/python/doc/${PV}/python-${PV}-docs-html.tar.b

 LICENSE="PSF-2"
 SLOT="3.3"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE=""

 DEPEND=""
--- a/dev-python/testtools/Manifest
+++ b/dev-python/testtools/Manifest
@ -1,3 +1,4 @@
 DIST testtools-0.9.15.tar.gz 152830 SHA256 49ef090f09e217c9f2688d4b2f9e246f00b9c1a867040a7ae8e4e9de7f707c02 SHA512 164ffdad57ad3f0dd3c64dc29b67a21ee5721316dd7c71027b018c51f3dfc49ed9fe3b1fb6a2c4fcb796209a783af07c8e7ca9847bfefb8e5f8729ffa6190eb5 WHIRLPOOL 60d7810db7d69054a33cd7d16861b7860ff8d308eb6bf88b9a3116b5dff9395e4a0b171a064745eafcfa9b9f9dbd745a9265e5d533de868ef8398c14778aee6f
 DIST testtools-0.9.24.tar.gz 162842 SHA256 a7072188727d4cefacd06bc6d87b845805300ba5d58a6fa92583abc04edbf355 SHA512 d03e822b0e0c1f75a14873f9e959774b23515f48c1ad0216e40022f2e43ecc6b61c355fd08b139e5293d3db52b2583d77600be3274dbfb0d8d0960632ed68c52 WHIRLPOOL 8461efec27a1f85282d6a1cfe024388fb084aa3d7339d9d51d3783ae3317715ce6674df1c3914546e569e84087376ab0436e2f265dcd0e458a8e818cc22aa5aa
 DIST testtools-0.9.32.tar.gz 172844 SHA256 3eb6b47693d913d8163a5dfb8b0b92cca1a6357dc00c181ed04de0305feb4e0a SHA512 7819ab0eeaa919dedbb8bffb3ea1a25e1b157361b6b0335508f81fc02523b00ad41f482418ad36e984cefeebead2abb6e8194048a9b410fcc19975978ed48fcc WHIRLPOOL 862d5dcf79d19b43511c47ba94ab8cdb5617a8c25a7c8781fa3ab44ed59cc4e0a17eb544e768722ccd46571dece73f1cef57a028a8b9fc3da9d796a13f22e194
+DIST testtools-0.9.33.tar.gz 192916 SHA256 5b62231fea71ccb2361d48286481b198ccb8768bf81f8aaec1c8d5fb98eaaca3 SHA512 bad0a1184ea7442cc0898e9ea6852633787ec4faf5fd9c6ba503ec90d36c51d51967730b0ea3ac39dc64b7507b1177b522cefa1d3a370aaaffe02a6a57fa38c9 WHIRLPOOL 4ffbd2acd5b8efde93f3ee7ae36f1530c51eaee31909010a41548782f56f7beacba57f07bc0ceff24fde6a76105c372020b95a4f05c2f530f81b5203e2225eb9
--- a/dev-python/testtools/metadata.xml
+++ b/dev-python/testtools/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>bazaar</herd>
-  <herd>python</herd>
+    <herd>bazaar</herd>
+    <herd>python</herd>
+    <herd>openstack</herd>
 </pkgmetadata>
--- a/dev-python/testtools/testtools-0.9.32.ebuild
+++ b/dev-python/testtools/testtools-0.9.32.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/testtools/testtools-0.9.32.ebuild,v 1.1 2013/09/17 18:21:08 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/testtools/testtools-0.9.32.ebuild,v 1.2 2013/12/13 05:59:39 idella4 Exp $

 EAPI=5

@ -25,17 +25,12 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 #		test? ( dev-python/mimeparse[${PYTHON_USEDEP}] ) "
 RDEPEND=""

-python_prepare() {
+python_prepare_all() {
 	sed -i '/\_build/d' "${S}/MANIFEST.in"
-	distutils-r1_python_prepare
-}
-
-python_compile() {
-	distutils-r1_python_compile
-
-#	if [[ ! -e "${BUILD_DIR}"/lib/testtools/_compat2x.py ]]; then
-#		die "_compat2x.py removed upstream; fix src_compile"
-#	fi
+	sed -e 's:test_test_module:_&:' \
+		-e 's:test_test_suite:_&:' \
+		-i testtools/tests/test_distutilscmd.py || die
+	distutils-r1_python_prepare_all
 }

 python_test() {
--- a/dev-python/testtools/testtools-0.9.33.ebuild
+++ b/dev-python/testtools/testtools-0.9.33.ebuild
@ -0,0 +1,45 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/testtools/testtools-0.9.33.ebuild,v 1.1 2013/12/13 05:59:39 idella4 Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
+
+inherit distutils-r1 versionator
+
+#SERIES="$(get_version_component_range 1-2)"
+SERIES="trunk"
+
+DESCRIPTION="Extensions to the Python unittest library"
+HOMEPAGE="https://launchpad.net/testtools http://pypi.python.org/pypi/testtools"
+SRC_URI="http://launchpad.net/${PN}/${SERIES}/${PV}/+download/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+#not keyworded
+#RDEPEND="dev-python/mimeparse[${PYTHON_USEDEP}] 
+#		dev-python/extras[${PYTHON_USEDEP}] )"
+# Listed under install_requires=[ in setup.py
+RDEPEND=""
+
+python_prepare_all() {
+	sed -i '/\_build/d' "${S}/MANIFEST.in"
+	sed -e 's:test_test_module:_&:' \
+		-e 's:test_test_suite:_&:' \
+		-i testtools/tests/test_distutilscmd.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# XXX: tests are non-fatal currently...
+	# https://bugs.launchpad.net/testtools/+bug/1132542, STILL
+	esetup.py test
+}
+
+# dev-python/subunit imports some objects from testtools.tests.helpers, so
+# tests need to be installed.
--- a/dev-ruby/adhearsion-loquacious/Manifest
+++ b/dev-ruby/adhearsion-loquacious/Manifest
@ -0,0 +1 @@
+DIST adhearsion-loquacious-1.9.3.gem 24576 SHA256 5a4d72667863212420a3c8e877944b375f2952a64ad83dc35df1d429f4edc4d5 SHA512 344c34bf336c24f24f409549b5db3362f228861d38aad3a49abe465df25a7c0e346ea95380f3c9f53cd89625e99afc151ea7337fe93eed1e9401ff4389cede59 WHIRLPOOL c8a626eadc25f7ea657910b00a4da432c0c2cc93146a399210673dccfbb36008864fe750c6c16c384ea18d803f8ea65acc47dea7a8d9a3bf57f1251911f7bd02
--- a/dev-ruby/adhearsion-loquacious/adhearsion-loquacious-1.9.3.ebuild
+++ b/dev-ruby/adhearsion-loquacious/adhearsion-loquacious-1.9.3.ebuild
@ -0,0 +1,28 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/adhearsion-loquacious/adhearsion-loquacious-1.9.3.ebuild,v 1.1 2013/12/13 09:02:40 mrueg Exp $
+
+EAPI=5
+USE_RUBY="ruby19 ruby20"
+
+RUBY_FAKEGEM_EXTRADOC="History.txt README.rdoc"
+RUBY_FAKEGEM_RECIPE_DOC="yard"
+RUBY_FAKEGEM_RECIPE_TEST="rspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Descriptive configuration files for Ruby written in Ruby"
+HOMEPAGE="https://rubygems.org/gems/adhearsion-loquacious"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -i -e "/guard/d"\
+		-e "/git ls-files/d"\
+		-e "s/, \[\"~> 2.7.0\"\]//"\
+		-e "/gntp/d"\
+		loquacious.gemspec || die
+}
--- a/dev-ruby/adhearsion-loquacious/metadata.xml
+++ b/dev-ruby/adhearsion-loquacious/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>printing</herd>
+<herd>ruby</herd>
 </pkgmetadata>
--- a/dev-ruby/buftok/Manifest
+++ b/dev-ruby/buftok/Manifest
@ -0,0 +1 @@
+DIST buftok-0.2.0.gem 8192 SHA256 bad760334631e15b8eea608468709d3265e087703b5af0532f6583e277f0fae7 SHA512 2be11c56b49254f16cadfd8abc7c414a16a54b32ec416402a4c87be72c2ce9c524aaa17ede9bb3535555191f2a7b1d7d863199db5b4af8874880bcd16d3c3b45 WHIRLPOOL f8c9af11d15c8831bab5b4f2f273588ddca81e257dedf74b8d09851ad400897d6f71fd22c5cbeadbf492dfe18c911b2ad2d42ff7dbfe6553dfc4fe60f087735e
--- a/dev-ruby/buftok/buftok-0.2.0.ebuild
+++ b/dev-ruby/buftok/buftok-0.2.0.ebuild
@ -0,0 +1,19 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/buftok/buftok-0.2.0.ebuild,v 1.1 2013/12/13 08:39:06 mrueg Exp $
+
+EAPI=5
+USE_RUBY="ruby19 ruby20"
+
+RUBY_FAKEGEM_EXTRADOC="CONTRIBUTING.md README.md"
+RUBY_FAKEGEM_TASK_DOC=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Statefully split input data by a specifiable token"
+HOMEPAGE="https://github.com/sferik/buftok"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
--- a/dev-ruby/buftok/metadata.xml
+++ b/dev-ruby/buftok/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>printing</herd>
+<herd>ruby</herd>
 </pkgmetadata>
--- a/dev-ruby/d3_rails/Manifest
+++ b/dev-ruby/d3_rails/Manifest
@ -0,0 +1 @@
+DIST d3_rails-3.3.11.gem 128512 SHA256 716fd70fcf138119dfa99b33ad3e0af35542f3f099a4bc6859b01f493d379a62 SHA512 c3311909fc59c09e091d2eb90b5b7d90d7fa15eb1830eff6d063e4c13f17c3194e998619e506892fa560040e1f92e9f012c755f76315ea3445d5c0bf8c2e7777 WHIRLPOOL 12ca0bc36871fc08e0581fe55e6df6739a2ad3e238d03808811c2a1b4b6ac465064098d3225ff0557932e42316909ae19679082d77873ea194c5319bdf772cd5
--- a/dev-ruby/d3_rails/d3_rails-3.3.11.ebuild
+++ b/dev-ruby/d3_rails/d3_rails-3.3.11.ebuild
@ -0,0 +1,23 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/d3_rails/d3_rails-3.3.11.ebuild,v 1.1 2013/12/13 11:24:16 mrueg Exp $
+
+EAPI=5
+USE_RUBY="ruby19"
+
+RUBY_FAKEGEM_RECIPE_TEST="none"
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_EXTRAINSTALL="app"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby on Rails integration for the Javascript Data Visualization Framework, D3"
+HOMEPAGE="https://github.com/logical42/d3_rails"
+
+LICENSE="MIT BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/railties-3.1"
--- a/mail-client/gbuffy/metadata.xml
+++ b/mail-client/gbuffy/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>net-mail</herd>
+<herd>ruby</herd>
 </pkgmetadata>
--- a/dev-ruby/diff-lcs/Manifest
+++ b/dev-ruby/diff-lcs/Manifest
@ -1,4 +1,2 @@
 DIST diff-lcs-1.1.3.gem 41472 SHA256 fb8291deabeaacf9adbdcaf988db176ae461f833770ff2947191ead4ead09897 SHA512 672c59f8d14d8612e9fc60b55c69bcbc5c817a11e84da13b9b06e43a41ac9a87ae0c1ea095897bcb65aa92efa60b3f02a4ef75010980c2553f05546ac50e4a51 WHIRLPOOL cbb0dc7a07f39670e8f2e03bff29611c0d421e8c6c632e95de9e7d737d30a45562e3d786d0b7dea97cec796ccd1700a3db13c4d7927c82ca546853d101e96370
-DIST diff-lcs-1.2.1.gem 46080 SHA256 925817b66ebd98a7f71c6e7ef9bbe79e64b96041ac48ce88e3382fa62f65db2f SHA512 913c73066f9d94b6b63557330d1671188517cd8e3ce52a805313f9bf16aeab394200b683c0c657cde06a687056310e684c60627bf1edb755d4b3de043404c9dd WHIRLPOOL 3fb930f68521d597d71774e7df8454e598a12f586162490b92512d30a2186d3da04972a5c5bbf05cca0836aace9f60c268b4f46ee2d2de4e039769e774a7b6f8
-DIST diff-lcs-1.2.4.gem 47104 SHA256 ad87b8b5892d3c275674d57e8398d83b2152419c08dd3f88453e0df3a473ab27 SHA512 45419ad81e48e04da6525389717fde280f1bc48ebec7438aefbd535fcb15586dbd7ae8bc3c1a9baf1639992c9fb5b362db5d9a02d79b9b0aa9115bc40366d3d1 WHIRLPOOL 7901a2a9e843222955952aacdf6e8b3fdf65b94f423b7133bc048fa94f82a1a41a3947e5aa728bb61cd6e3cf74217d1d95a8e2035a6013005c3b6253cef650d7
 DIST diff-lcs-1.2.5.gem 49152 SHA256 a1d3dde665292317a883d319066792e3f0e6a24cade4bc4cc47605d27664c9ed SHA512 ce15cb794a97f9af8585c46b7a2404e1ad6e24e4910b6aa6c5126ef5996d86700979a54a154bab1c0602f19021b287dc865db3eebdc901fb42056f1e2180d0fe WHIRLPOOL 10076561d9895a3cc3c880f21e34e17aacdfcb790dbad44eedf48644eef5e9e04e65d3e4e8c16353f8bbfaa4a1d848a827cd5c2e2d57b8b58eeea3441bce1d7d
--- a/dev-ruby/diff-lcs/diff-lcs-1.2.1.ebuild
+++ b/dev-ruby/diff-lcs/diff-lcs-1.2.1.ebuild
@ -1,32 +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/diff-lcs/diff-lcs-1.2.1.ebuild,v 1.2 2013/03/14 06:49:17 graaff Exp $
-
-EAPI=5
-USE_RUBY="ruby18 ree18 ruby19 jruby"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-
-RUBY_FAKEGEM_TASK_DOC="docs"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="README.rdoc History.rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Use the McIlroy-Hunt LCS algorithm to compute differences"
-HOMEPAGE="https://github.com/halostatue/diff-lcs"
-
-LICENSE="|| ( MIT Ruby GPL-2 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend "doc? ( >=dev-ruby/hoe-2.10 )"
-
-all_ruby_prepare() {
-	# Remove unneeded rspec require to avoid rspec with USE=doc.
-	sed -i -e "/require 'rspec'/d" Rakefile || die
-
-	# Remove plugins since we don't need them for USE=doc.
-	sed -i -e "/Hoe.plugin/ s:^:#:" Rakefile || die
-}
--- a/dev-ruby/diff-lcs/diff-lcs-1.2.4.ebuild
+++ b/dev-ruby/diff-lcs/diff-lcs-1.2.4.ebuild
@ -1,32 +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/diff-lcs/diff-lcs-1.2.4.ebuild,v 1.2 2013/10/06 09:46:18 graaff Exp $
-
-EAPI=5
-USE_RUBY="ruby18 ruby19 ruby20 jruby"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-
-RUBY_FAKEGEM_TASK_DOC="docs"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="README.rdoc History.rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Use the McIlroy-Hunt LCS algorithm to compute differences"
-HOMEPAGE="https://github.com/halostatue/diff-lcs"
-
-LICENSE="|| ( MIT Ruby GPL-2 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend "doc? ( >=dev-ruby/hoe-2.10 )"
-
-all_ruby_prepare() {
-	# Remove unneeded rspec require to avoid rspec with USE=doc.
-	sed -i -e "/require 'rspec'/d" Rakefile || die
-
-	# Remove plugins since we don't need them for USE=doc.
-	sed -i -e "/Hoe.plugin/ s:^:#:" Rakefile || die
-}
--- a/dev-ruby/equalizer/Manifest
+++ b/dev-ruby/equalizer/Manifest
@ -0,0 +1 @@
+DIST equalizer-0.0.8.gem 12800 SHA256 d66d02ece6935c217e3a81b2e33487825633fd203144e495b6e29f07278909da SHA512 1f7c97d8f48dbf83e37b4b053853f2a94be6f6e5cbe044af1db6c55ed9aa03fa27c9fbecf89380217a0cd248b55d4bc46e9b817ae447eebb5cf773c5396d6597 WHIRLPOOL 8d6928a5fc78bc582235ab234eaa8701d1a0493c225186718aec2087baa6722616a251a84c93dba9e6b0ebad15cb651b826984ad90304d55722a7d2dacc0350d
--- a/dev-ruby/equalizer/equalizer-0.0.8.ebuild
+++ b/dev-ruby/equalizer/equalizer-0.0.8.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/equalizer/equalizer-0.0.8.ebuild,v 1.1 2013/12/13 08:30:11 mrueg Exp $
+
+EAPI=5
+USE_RUBY="ruby19 ruby20"
+
+RUBY_FAKEGEM_EXTRADOC="CONTRIBUTING.md README.md TODO"
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_RECIPE_TEST="rspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Module to define equality, equivalence and inspection methods"
+HOMEPAGE="https://github.com/dkubb/equalizer"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -i -e "/devtools/d" spec/spec_helper.rb || die
+}
--- a/dev-ruby/equalizer/metadata.xml
+++ b/dev-ruby/equalizer/metadata.xml
@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>ruby</herd>
+</pkgmetadata>
--- a/dev-ruby/ffaker/Manifest
+++ b/dev-ruby/ffaker/Manifest
@ -0,0 +1 @@
+DIST ffaker-1.22.1.gem 175104 SHA256 18e03e1390c5bf0fc7ebf9a457fcce365b5e51e937b79c9e0c03e1191cc4f79f SHA512 0994be1d122132660ec4752914f76a8707cf67b36ee14b527dbcb4cb296c05389741b7d6e886500efd185e6f61745f0b37178208f63009994ee2926eb74c018f WHIRLPOOL c4810c0e7728aeac1594d5d69c09b4b7b65cdd335d1ee2c4ae95d27d95c3091c32c12592a3ab0ea52310ea6601cfe2d7b8cac91458c72b00e7fc26befc8d31ff
--- a/dev-ruby/ffaker/ffaker-1.22.1.ebuild
+++ b/dev-ruby/ffaker/ffaker-1.22.1.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-ruby/ffaker/ffaker-1.22.1.ebuild,v 1.1 2013/12/13 13:46:41 mrueg Exp $
+
+EAPI=5
+USE_RUBY="ruby19 ruby20"
+
+RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
+RUBY_FAKEGEM_RECIPE_DOC="yard"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Faster Faker, generates dummy data"
+HOMEPAGE="https://github.com/emmanueloga/ffaker"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+ruby_add_bdepend "test? ( dev-ruby/test-unit:2 )"
--- a/dev-ruby/ffaker/metadata.xml
+++ b/dev-ruby/ffaker/metadata.xml
@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>ruby</herd>
+</pkgmetadata>
--- a/dev-ruby/gemoji/Manifest
+++ b/dev-ruby/gemoji/Manifest
@ -0,0 +1 @@
+DIST gemoji-1.5.0.tar.gz 3950067 SHA256 b478cf51555a3c7fcc67a3a2dfa044d8f446144e89efd0031c6e6d70b43c48b5 SHA512 1b0d81fcb593b23f6f38a32fabcbc1e937d371278135f1d3ed86f15353411e0ee3df5603aa3a3317a6d1e7617d3349acaf5ed73ed858c560ac39068cbca9b778 WHIRLPOOL 641118c01c0b95dd7c3579c80a8fb71305f00db45627d2771b6978c19fd4bcfa5d5ab128c84617b1e63dee00db20117225a9a7e5a4ff4797d775a86f9a94c47c
--- a/dev-ruby/gemoji/gemoji-1.5.0.ebuild
+++ b/dev-ruby/gemoji/gemoji-1.5.0.ebuild
@ -0,0 +1,20 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/gemoji/gemoji-1.5.0.ebuild,v 1.1 2013/12/13 05:08:50 mrueg Exp $
+
+EAPI=5
+USE_RUBY="ruby19 ruby20"
+
+RUBY_FAKEGEM_EXTRADOC="MAINTAINING.md README.md"
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Emoji images and names."
+HOMEPAGE="https://github.com/github/gemoji"
+SRC_URI="https://github.com/github/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT all-rights-reserved"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
--- a/dev-ruby/gemoji/metadata.xml
+++ b/dev-ruby/gemoji/metadata.xml
@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>ruby</herd>
+</pkgmetadata>
--- a/dev-ruby/http-cookie/Manifest
+++ b/dev-ruby/http-cookie/Manifest
@ -0,0 +1 @@
+DIST http-cookie-1.0.2.gem 37888 SHA256 bcc1b18b5bc3e9302542c9c7f68f1ac0c3100a65dd2831786172e8676773e233 SHA512 447b7fcfd67f64edbd8420672add7ff04f28358ecd8ef59c3bf861b48378729d02bc1e4396259104651794e011ef0de72c892f28fd658474a1fc315b9b750178 WHIRLPOOL 43b67aa72b113dd736896907409512a1e50c543c38c7c5c36245b6873ec0d7fcd865bac687ff188ddfd259aed1acae2cf740e815a865b162e5a494b00de832da
--- a/dev-ruby/http-cookie/http-cookie-1.0.2.ebuild
+++ b/dev-ruby/http-cookie/http-cookie-1.0.2.ebuild
@ -0,0 +1,22 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/http-cookie/http-cookie-1.0.2.ebuild,v 1.1 2013/12/13 09:23:37 mrueg Exp $
+
+EAPI=5
+USE_RUBY="ruby19 ruby20"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A ruby library to handle HTTP cookies"
+HOMEPAGE="https://github.com/sparklemotion/http-cookie"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -i -e "/simplecov/d" Rakefile || die
+}
--- a/dev-ruby/http-cookie/metadata.xml
+++ b/dev-ruby/http-cookie/metadata.xml
@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>ruby</herd>
+</pkgmetadata>
--- a/dev-ruby/letter_opener/Manifest
+++ b/dev-ruby/letter_opener/Manifest
@ -0,0 +1 @@
+DIST letter_opener-1.2.0.tar.gz 8420 SHA256 dc7f3bb3a76e293ddef8c4c73b0e9d8e7ae8786fb4312918cd8c3debea5fb724 SHA512 003a04e194c9987669d780d01456564d4bd6fc34f8687185bfcd8191675d59e06d54691c8954b505bdd974cb24d875caa6b3c82b2e1d4f8e5fc475410f248885 WHIRLPOOL fd2a4035ad9156b4fba673d9360d75bec17eea240c0ffbd1e360fc99c819858d3e74385f15dffbafb65901556106e71dbf5ca0b00f8528dedcdac230c0e045cf
--- a/dev-ruby/letter_opener/letter_opener-1.2.0.ebuild
+++ b/dev-ruby/letter_opener/letter_opener-1.2.0.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/letter_opener/letter_opener-1.2.0.ebuild,v 1.1 2013/12/13 15:34:43 mrueg Exp $
+
+EAPI=5
+USE_RUBY="ruby19"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_RECIPE_TEST="rspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Preview mail in the browser instead of sending"
+HOMEPAGE="https://github.com/ryanb/letter_opener"
+SRC_URI="https://github.com/ryanb/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/mail:2.5 )"
+ruby_add_rdepend "dev-ruby/launchy"
--- a/dev-ruby/letter_opener/metadata.xml
+++ b/dev-ruby/letter_opener/metadata.xml
@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>ruby</herd>
+</pkgmetadata>
--- a/dev-ruby/little-plugger/files/little-plugger-1.1.3-ruby20-spec.patch
+++ b/dev-ruby/little-plugger/files/little-plugger-1.1.3-ruby20-spec.patch
@ -0,0 +1,11 @@
+--- a/spec/little-plugger_spec.rb	2013-12-03 19:30:13.104060898 +0000
+++ b/spec/little-plugger_spec.rb	2013-12-03 19:31:18.716236041 +0000
+@@ -18,7 +18,7 @@
+   it "generates a default plugin module" do
+     LittlePlugger.default_plugin_module('little_plugger').should be == LittlePlugger
+     lambda {LittlePlugger.default_plugin_module('little_plugger/plugins')}.
+-        should raise_error(NameError, 'uninitialized constant LittlePlugger::Plugins')
+		should raise_error(NameError, /uninitialized constant (LittlePlugger::)?Plugins/)
+     LittlePlugger.default_plugin_module('process/status').should be == Process::Status
+   end
+ end
--- a/dev-ruby/little-plugger/little-plugger-1.1.3-r1.ebuild
+++ b/dev-ruby/little-plugger/little-plugger-1.1.3-r1.ebuild
@ -0,0 +1,30 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/little-plugger/little-plugger-1.1.3-r1.ebuild,v 1.1 2013/12/14 13:51:01 graaff Exp $
+
+EAPI=5
+
+USE_RUBY="ruby18 ruby19 ruby20 jruby"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+
+RUBY_FAKEGEM_EXTRADOC="History.txt README.rdoc"
+
+inherit ruby-fakegem eutils
+
+DESCRIPTION="Module that provides Gem based plugin management"
+HOMEPAGE="http://github.com/TwP/${PN}"
+
+IUSE="test"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+all_ruby_prepare() {
+	# Remove default metadata because it confused jruby.
+	rm ../metadata || die
+
+	epatch "${FILESDIR}"/${P}-ruby20-spec.patch
+}
--- a/dev-ruby/mixlib-cli/Manifest
+++ b/dev-ruby/mixlib-cli/Manifest
@ -1 +1,2 @@
 DIST mixlib-cli-1.3.0.tgz 10879 SHA256 f510810893d80b4b1a5d7ae44a04ea122ef1fb3ae4e4d7c3830b80b671cf35a1 SHA512 b21ea432a3ad8e20149ebc941c914ebaa6e8dd496b045b04a30df89597d0d6d359da8bc3be58d5de711891d0a2b05acc327c2ac0246fdf4601b1b0c4edf668ba WHIRLPOOL 3c76db2aced7ce6658ddf251455c123f5e22ea3965f865ec5e89a65a2de453e20f7cc3fc4a81b54ad78b5ccbab88042b6a54cd0aa625ad1e4d7e43950c48898f
+DIST mixlib-cli-1.4.0.tgz 10927 SHA256 3eb53a121db486da18bf47cae6bd1cf25b957ef1fde1bc9e1ebadb3d2b6815c4 SHA512 7d32f32277ec67bef5f33524a3024b98be316bb8a16eb93c94bd2c9213f0640990dd898ecf2455a74bf04b7ab5fa9f8c22a558272a55ed938beaae274bf0deb3 WHIRLPOOL beddbdb78e558c12afec15158bee3dbec59cacf9f7ddf803aa0d912c514f4d6cde1cffae416cd873a93b9dbd20dc03d01f2db3b54f9e4191b6bf61df410b9222
--- a/dev-ruby/mixlib-cli/mixlib-cli-1.4.0.ebuild
+++ b/dev-ruby/mixlib-cli/mixlib-cli-1.4.0.ebuild
@ -0,0 +1,22 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mixlib-cli/mixlib-cli-1.4.0.ebuild,v 1.1 2013/12/13 09:12:39 mrueg Exp $
+
+EAPI=5
+USE_RUBY="ruby18 ruby19 ruby20 jruby"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_RECIPE_TEST="rspec"
+
+RUBY_FAKEGEM_EXTRADOC="README.rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Mixin for creating command line applications"
+HOMEPAGE="http://github.com/opscode/mixlib-cli"
+SRC_URI="https://github.com/opscode/${PN}/archive/v${PV}.tar.gz -> ${P}.tgz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+IUSE=""
--- a/dev-ruby/mixlib-shellout/Manifest
+++ b/dev-ruby/mixlib-shellout/Manifest
@ -1,2 +1,3 @@
 DIST mixlib-shellout-1.0.0.tgz 20408 SHA256 e1dd50021abbad4184e99a45652129dbfbb7d9eaae2dec71af37924ee507d3b1 SHA512 1a6df24eb646aaf0d980bd7af0f867f94f65212755d74f9561c9084441a447d69c71d0748c0cc93ebac62320532ab373dfa6506b76c00b3116d05402e57451af WHIRLPOOL 1c8edb31e10e8f0f6cee36a3414ff800f239d6b697b0c6b563c00ea7e749c7e68ba54d04fa9ccd4a250e70407758eccffca4f49c6cca5e3534142737377b993f
 DIST mixlib-shellout-1.1.0.tgz 25447 SHA256 10ccaa24f766110400157336338fe7204a9ed0e0a2ec8a203573c370b6912e7d SHA512 b22e1047f1236ff8ab46ee57cd713304b343810f483ca421ee622e08015cc7ec786cebb10a7c0a6d30866d6869e6727bd7d7c320b13ab9cc2b17fbf679c8ce91 WHIRLPOOL ffce277ad3fce65e7da7eb910f772cf65af58c1d4b4549e52cd1a6ebb6d7283a3a8adf30d452bbb329f0f523b6a3654328e80aa6aa810fd1c8ef41d15252310c
+DIST mixlib-shellout-1.3.0.tgz 28052 SHA256 0e4976d8d4e9e99649e18f4f941abbb092410dea9c646f818f83a06c1aa90d10 SHA512 a19cce6c9f76af81f404ede05e964bf68cc7edea5e1daae54ea3b72f70a1bad33cd2a1903d2d9736110d003207ab4c01736b4bc19ebdb9be1bd6abf466146319 WHIRLPOOL f6663d2abaa0d5237d62f8c5574a18b31f5e7ec4ff975bbc435c1205983ccd53245d736a1e461179a73e94df2ec6ab2f52c6ebd87b49f0d2384b505ecff5d2ed
--- a/dev-ruby/mixlib-shellout/mixlib-shellout-1.3.0.ebuild
+++ b/dev-ruby/mixlib-shellout/mixlib-shellout-1.3.0.ebuild
@ -0,0 +1,28 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mixlib-shellout/mixlib-shellout-1.3.0.ebuild,v 1.1 2013/12/13 09:08:01 mrueg Exp $
+
+EAPI=5
+USE_RUBY="ruby18 ruby19 ruby20"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_RECIPE_TEST="rspec"
+
+RUBY_FAKEGEM_EXTRA_DOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Run external commands on Unix or Windows"
+HOMEPAGE="http://github.com/opscode/mixlib-shellout"
+SRC_URI="https://github.com/opscode/${PN}/tarball/${PV} -> ${P}.tgz"
+RUBY_S="opscode-${PN}-*"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+each_ruby_prepare() {
+	# Make sure we actually use the right interpreter for testing
+	sed -i -e "/ruby_eval/ s:ruby :${RUBY} :" spec/mixlib/shellout_spec.rb || die
+}
--- a/dev-ruby/modernizr/Manifest
+++ b/dev-ruby/modernizr/Manifest
@ -0,0 +1 @@
+DIST modernizr-2.6.2.gem 43520 SHA256 f461355bb24a013275c8687bbeb02861ac404cd3a1db81a78166376422ac8f3c SHA512 de40343bc06ceae2518e0bfc513fdd54ceb9c4369e1ea37c75d06d70286c995691e568d9892f6709bbc33492eb1034d402bb903dd31847c4c8f21a88a22b8f00 WHIRLPOOL e27e585d878de09134214829cb13892c0925cc5ab0e8dee59250b9d37d2e4a87af5790d2570c87561f4f23322f8cb95718891132733f3a50c5bc727957d51ea0
--- a/dev-ruby/modernizr/metadata.xml
+++ b/dev-ruby/modernizr/metadata.xml
@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>ruby</herd>
+</pkgmetadata>
--- a/dev-ruby/modernizr/modernizr-2.6.2.ebuild
+++ b/dev-ruby/modernizr/modernizr-2.6.2.ebuild
@ -0,0 +1,20 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/modernizr/modernizr-2.6.2.ebuild,v 1.1 2013/12/13 12:31:46 mrueg Exp $
+
+EAPI=5
+USE_RUBY="ruby19 ruby20"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Neatly packaged Modernizr JS assets for use in Sprockets or the Rails 3 asset pipeline."
+HOMEPAGE="https://github.com/josh/ruby-modernizr"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
--- a/dev-ruby/seed-fu/Manifest
+++ b/dev-ruby/seed-fu/Manifest
@ -0,0 +1 @@
+DIST seed-fu-2.2.0.tar.gz 11863 SHA256 1826184dc0496084c8a0f0219944d2a28e8560f301cdff8fb556db6c0ec392e9 SHA512 beb5cddc6ce36c81abd044cf0a9009f6e6ffc45fe62325551a904871e0e65c40e926c5e27c9f5c576f735106b6257a726a87a164a118586a9dd7d245af92dfd1 WHIRLPOOL be07dafa7bad63b5b017efe239dadb02c755ad9ea5e77e421ad948d1447bd6cab9a97c1bb551e97c9591145436f9721d5a5c79f26e469293980626bf5f1cf344
--- a/dev-ruby/seed-fu/metadata.xml
+++ b/dev-ruby/seed-fu/metadata.xml
@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>ruby</herd>
+</pkgmetadata>
--- a/dev-ruby/seed-fu/seed-fu-2.2.0.ebuild
+++ b/dev-ruby/seed-fu/seed-fu-2.2.0.ebuild
@ -0,0 +1,31 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/seed-fu/seed-fu-2.2.0.ebuild,v 1.1 2013/12/13 11:15:08 mrueg Exp $
+
+EAPI=5
+USE_RUBY="ruby19"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec"
+RUBY_FAKEGEM_RECIPE_DOC="yard"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+RUBY_FAKEGEM_DOCDIR="doc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Advanced seed data handling for Rails, combining the best practices of several methods together"
+HOMEPAGE="https://github.com/mbleigh/seed-fu"
+SRC_URI="https://github.com/mbleigh/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+ruby_add_rdepend "
+	>=dev-ruby/activerecord-3.1
+	>=dev-ruby/activesupport-3.1"
+ruby_add_bdepend "test? ( dev-ruby/sqlite3 )"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/d' spec/spec_helper.rb || die "sed failed"
+}
--- a/dev-ruby/settingslogic/Manifest
+++ b/dev-ruby/settingslogic/Manifest
@ -0,0 +1 @@
+DIST settingslogic-2.0.9.gem 10752 SHA256 5925a91d0d48dfb59a6e48ae2bb9c9b801fe6fab25a8e8d302ce8699d92f2ae6 SHA512 e9229231815c8d80b7539724cda78c0cfd17bcf8423d0bc2643b3ce2a046e8014f3b398c5314b095aef480a0c7de16e0c93a6592fe8eabfea4ae94742f3dab57 WHIRLPOOL 8b3c2bf36d0719f00edd64578a2c8cff3a322e27708e618846df4ebf13e2e2738d57c4de01efed0099fed0f73ea761a21f473930a3a984426730718f4f1d3186
--- a/dev-ruby/settingslogic/metadata.xml
+++ b/dev-ruby/settingslogic/metadata.xml
@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>ruby</herd>
+</pkgmetadata>
--- a/dev-ruby/settingslogic/settingslogic-2.0.9.ebuild
+++ b/dev-ruby/settingslogic/settingslogic-2.0.9.ebuild
@ -0,0 +1,25 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/settingslogic/settingslogic-2.0.9.ebuild,v 1.1 2013/12/13 04:36:45 mrueg Exp $
+
+EAPI=5
+USE_RUBY="ruby18 ruby19 ruby20"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="README.rdoc"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A simple configuration / settings solution that uses an ERB enabled YAML file"
+HOMEPAGE="http://github.com/binarylogic/settingslogic"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~x86 ~x86-macos"
+SLOT="0"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -i -e '/check_dependencies/d' Rakefile || die
+}
--- a/Show More
+++ b/Show More
				`@ -1 +0,0 @@`
				`DIST gsv49src.zip 1455372 SHA256 37829125d90957bb66e9b1bc71bff64f9da3553dc8fcf6078944269b3202b78d SHA512 2a276adefcc6fa64dd3edcf10624f60cffc4e185e6ff4f96a08e1d87fb3d6c097d8cd32d2c14301cb3fa575cf27ba261d8d587369091a292e34fe0bd58e70f57 WHIRLPOOL 62de55de31a6707628801ab30492523780f8995b5d2e836b1c6fb999b45f083e16eab03a2cf3aa586ea6c5b0243892a8a74be88c259ba75e948dd9d58113aab4`
				`@ -1 +0,0 @@`
				`DIST libsmtp-0.8.tar.gz 191362 SHA256 d3d3a62cec9ab771a21c4ae9227e11f44995c9f6685929dba574d2d43812a476 SHA512 42fa61c8144c751dc9b6ac6ff73c5a8fec83880ff3486dce9dbb6e22a486f621ea5cbdab5ebbe94f07f3c195723fe485c531ab14175ce881f34a8aed512a8b69 WHIRLPOOL 9226cb0fea7d1ff2e923838136e0c47693ae8fa9120019bfbb409218e1302aa40da166f6a1508fce3b723d4f117826552ad12756fed967b5558e67c69f0793f0`
				`@ -0,0 +1 @@`
				`DIST adhearsion-loquacious-1.9.3.gem 24576 SHA256 5a4d72667863212420a3c8e877944b375f2952a64ad83dc35df1d429f4edc4d5 SHA512 344c34bf336c24f24f409549b5db3362f228861d38aad3a49abe465df25a7c0e346ea95380f3c9f53cd89625e99afc151ea7337fe93eed1e9401ff4389cede59 WHIRLPOOL c8a626eadc25f7ea657910b00a4da432c0c2cc93146a399210673dccfbb36008864fe750c6c16c384ea18d803f8ea65acc47dea7a8d9a3bf57f1251911f7bd02`
				`@ -0,0 +1 @@`
				`DIST buftok-0.2.0.gem 8192 SHA256 bad760334631e15b8eea608468709d3265e087703b5af0532f6583e277f0fae7 SHA512 2be11c56b49254f16cadfd8abc7c414a16a54b32ec416402a4c87be72c2ce9c524aaa17ede9bb3535555191f2a7b1d7d863199db5b4af8874880bcd16d3c3b45 WHIRLPOOL f8c9af11d15c8831bab5b4f2f273588ddca81e257dedf74b8d09851ad400897d6f71fd22c5cbeadbf492dfe18c911b2ad2d42ff7dbfe6553dfc4fe60f087735e`
				`@ -0,0 +1 @@`
				`DIST d3_rails-3.3.11.gem 128512 SHA256 716fd70fcf138119dfa99b33ad3e0af35542f3f099a4bc6859b01f493d379a62 SHA512 c3311909fc59c09e091d2eb90b5b7d90d7fa15eb1830eff6d063e4c13f17c3194e998619e506892fa560040e1f92e9f012c755f76315ea3445d5c0bf8c2e7777 WHIRLPOOL 12ca0bc36871fc08e0581fe55e6df6739a2ad3e238d03808811c2a1b4b6ac465064098d3225ff0557932e42316909ae19679082d77873ea194c5319bdf772cd5`
				`@ -0,0 +1 @@`
				`DIST equalizer-0.0.8.gem 12800 SHA256 d66d02ece6935c217e3a81b2e33487825633fd203144e495b6e29f07278909da SHA512 1f7c97d8f48dbf83e37b4b053853f2a94be6f6e5cbe044af1db6c55ed9aa03fa27c9fbecf89380217a0cd248b55d4bc46e9b817ae447eebb5cf773c5396d6597 WHIRLPOOL 8d6928a5fc78bc582235ab234eaa8701d1a0493c225186718aec2087baa6722616a251a84c93dba9e6b0ebad15cb651b826984ad90304d55722a7d2dacc0350d`
				`@ -0,0 +1 @@`
				`DIST ffaker-1.22.1.gem 175104 SHA256 18e03e1390c5bf0fc7ebf9a457fcce365b5e51e937b79c9e0c03e1191cc4f79f SHA512 0994be1d122132660ec4752914f76a8707cf67b36ee14b527dbcb4cb296c05389741b7d6e886500efd185e6f61745f0b37178208f63009994ee2926eb74c018f WHIRLPOOL c4810c0e7728aeac1594d5d69c09b4b7b65cdd335d1ee2c4ae95d27d95c3091c32c12592a3ab0ea52310ea6601cfe2d7b8cac91458c72b00e7fc26befc8d31ff`
				`@ -0,0 +1 @@`
				`DIST gemoji-1.5.0.tar.gz 3950067 SHA256 b478cf51555a3c7fcc67a3a2dfa044d8f446144e89efd0031c6e6d70b43c48b5 SHA512 1b0d81fcb593b23f6f38a32fabcbc1e937d371278135f1d3ed86f15353411e0ee3df5603aa3a3317a6d1e7617d3349acaf5ed73ed858c560ac39068cbca9b778 WHIRLPOOL 641118c01c0b95dd7c3579c80a8fb71305f00db45627d2771b6978c19fd4bcfa5d5ab128c84617b1e63dee00db20117225a9a7e5a4ff4797d775a86f9a94c47c`
				`@ -0,0 +1 @@`
				`DIST http-cookie-1.0.2.gem 37888 SHA256 bcc1b18b5bc3e9302542c9c7f68f1ac0c3100a65dd2831786172e8676773e233 SHA512 447b7fcfd67f64edbd8420672add7ff04f28358ecd8ef59c3bf861b48378729d02bc1e4396259104651794e011ef0de72c892f28fd658474a1fc315b9b750178 WHIRLPOOL 43b67aa72b113dd736896907409512a1e50c543c38c7c5c36245b6873ec0d7fcd865bac687ff188ddfd259aed1acae2cf740e815a865b162e5a494b00de832da`
				`@ -0,0 +1 @@`
				`DIST letter_opener-1.2.0.tar.gz 8420 SHA256 dc7f3bb3a76e293ddef8c4c73b0e9d8e7ae8786fb4312918cd8c3debea5fb724 SHA512 003a04e194c9987669d780d01456564d4bd6fc34f8687185bfcd8191675d59e06d54691c8954b505bdd974cb24d875caa6b3c82b2e1d4f8e5fc475410f248885 WHIRLPOOL fd2a4035ad9156b4fba673d9360d75bec17eea240c0ffbd1e360fc99c819858d3e74385f15dffbafb65901556106e71dbf5ca0b00f8528dedcdac230c0e045cf`