Sync with portage [Sat Dec 27 21:32:48 MSK 2014].

10 years ago · 4559afbfd4
parent 88e6ca96bc
commit 4559afbfd4
237 changed files with 3679 additions and 1300 deletions
--- a/app-admin/perl-cleaner/Manifest
+++ b/app-admin/perl-cleaner/Manifest
@ -1,3 +1,3 @@
 DIST perl-cleaner-2.16.tar.bz2 6069 SHA256 b54f7bd0dc8e60c08ac3de242cf157c21dbce1cfb8fc9c525b3d6cca88915ae3 SHA512 d2e03e473754b7730a6275cc743414fbb48a9fcb6a7a7dbef1fae73acb609b1b9f06eb33261505e1309fc79074303b7c29b6bd80b3bc79b40d27fc94d9b2cb09 WHIRLPOOL d240e0946a924a4d4984a2c7cc82e54de91e3c05ebf6a29fe154a557ff475da3503eb99a054f26ceda13ec61b87b8b2fe63c367c441b2b3cb6f7c34cf14f3165
-DIST perl-cleaner-2.17.tar.bz2 6549 SHA256 63c2058b2d5fd866fcbc84c3c47d3e0db53063fbc0ade296b34e9abe60a5bdf2 SHA512 de9737127a457651bb734a359fc288bf2c738eef011794f6c38b1122e6c9764ec735f229a3e687d4d5734ec72bc661e1f8c1f00dee4cba9e485644222794516f WHIRLPOOL 3d5d24cd4f872c259306e0af1fd377f66c7fc5535a25e0f2774641e4d75328e9e2adafbd40e8b646091dcb50db9bad4981041cf36fd7e8d614570d12ea43bf33
 DIST perl-cleaner-2.18.tar.bz2 6719 SHA256 43ee3b071f8f21410e8586500af90681363248695801c46ec37dfe3fbecc25d7 SHA512 d6216e4246a59a5d9c08bfec5763e4566736c1641f17ad45df84392169622b94edec242f3fc37b65ad767330fc0a64967c94fc520697da056f735909132e4ede WHIRLPOOL c77590201847002ce943caaa9c495eea9411586f541ed4607f229496f066cc63f40993e0a5aed89ed10b36b5d8e509943a9c89e953531c1854725eb260221243
+DIST perl-cleaner-2.19.tar.bz2 6558 SHA256 03c50ffcfa70081501584de3fc33f634d7a0404ff6adee50c85af6323dc476fa SHA512 404fb5742af929a41f5033dbba066ebcfa1e1bee3f5340d3f732e3eb5cae4dd6d427cca8b6e1ec23e6154c14c36a2e6154be17ec98022422cf44c50984e74973 WHIRLPOOL 64816a6f28299370bc9e5a0469062746d7c6b93ad83f98e3a7656bd5515fb82e16375fadaf1c76b01a901220b4844ef236f744026dcf8489dea859621aec6ea8
--- a/app-admin/perl-cleaner/perl-cleaner-2.19.ebuild
+++ b/app-admin/perl-cleaner/perl-cleaner-2.19.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/perl-cleaner/perl-cleaner-2.17.ebuild,v 1.3 2014/10/18 19:17:30 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/perl-cleaner/perl-cleaner-2.19.ebuild,v 1.1 2014/12/27 12:16:45 dilfridge Exp $

 EAPI=5

--- a/app-admin/sysstat/Manifest
+++ b/app-admin/sysstat/Manifest
@ -1,3 +1,2 @@
 DIST sysstat-11.0.2.tar.xz 291256 SHA256 acd87fdfbe7c796480f14fc26119d8f785d26827d74a0f5bced6c492a91f1b96 SHA512 4bb5f2ee14346d83c59bd4da36ae8fc6c13197eabb808b1b5db84b593f07d8b366b1f6329abed8d43e2a8497a89de0f89a398b741d4ca23b4a3a95973b5f0f54 WHIRLPOOL 98daee288e22f803f19bbe423eb999f527e8997f2ffd3fe1fe784363260365ee833dd33b755f44d6bfcc685f70b47cb8fd70fdd9a3fa679829c1e608bd65f8e2
-DIST sysstat-11.1.1.tar.xz 295372 SHA256 36e86672c415027d633f6f036b88cde1f87b0fbf1d7743b2177e489b67f4d90a SHA512 2cc196cf6994b05085a9c412021ecfedb8b90bf8aede1b5b1f45d7d363cc56a3180a217a40ee6b5824b30e610c52b2b3b86eb34e1d20b3e3ef26a0a7fedf8d9c WHIRLPOOL 2603993b8072e9c1d55b42f91aa15d7142436633b01a73ce220391b8f7588684b9a2c29f2543235dec49392690b8c1aa0f2ddf573d3d09b306b054f24e4661f6
 DIST sysstat-11.1.2.tar.xz 302400 SHA256 6f3f6a24a7f0ce67de6b5c0e71631e45966f9fe25f3e2b3dc71a31759af32e66 SHA512 b1c53e3061f1506ab001efd078a0f642e76d2ab6d3557922626ba04846594db9798ebe839434cfc47ed50b02510b90afb353c6c5065c101dca7d9049b1742a9c WHIRLPOOL 08603d2f34a0f6b9d31597370e7f4af746447307c5b0891c1a8d7876b68574d53ecfa579e342e455ae00d57e54277d65471c453a0781c342e68a5d3a31900a25
--- a/app-admin/sysstat/sysstat-11.1.1-r1.ebuild
+++ b/app-admin/sysstat/sysstat-11.1.1-r1.ebuild
@ -1,87 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sysstat/sysstat-11.1.1-r1.ebuild,v 1.2 2014/11/02 07:50:36 swift Exp $
-
-EAPI=5
-inherit eutils multilib systemd toolchain-funcs
-
-DESCRIPTION="System performance tools for Linux"
-HOMEPAGE="http://pagesperso-orange.fr/sebastien.godard/"
-SRC_URI="${HOMEPAGE}${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE="cron debug +doc isag nls lm_sensors selinux"
-
-CDEPEND="
-	cron? ( sys-process/cronbase )
-	isag? (
-		dev-lang/tk
-		dev-vcs/rcs
-		sci-visualization/gnuplot
-	)
-	nls? ( virtual/libintl )
-	lm_sensors? ( sys-apps/lm_sensors )
-"
-DEPEND="
-	${CDEPEND}
-	nls? ( sys-devel/gettext )
-"
-RDEPEND="
-	${CDEPEND}
-	selinux? ( sec-policy/selinux-sysstat )
-"
-
-src_prepare() {
-	if use nls; then
-		strip-linguas -i nls/
-		local lingua pofile
-		for pofile in nls/*.po; do
-			lingua=${pofile/nls\/}
-			lingua=${lingua/.po}
-			if ! has ${lingua} ${LINGUAS}; then
-				rm "nls/${lingua}.po" || die
-			fi
-		done
-	fi
-	epatch "${FILESDIR}"/${PN}-10.0.4-flags.patch
-}
-
-src_configure() {
-	tc-export AR
-	sa_lib_dir=/usr/$(get_libdir)/sa \
-		conf_dir=/etc \
-		rcdir=Gentoo-does-not-use-rc.d \
-		econf \
-			--enable-copy-only \
-			--with-systemdsystemunitdir=$(systemd_get_unitdir) \
-			$(use_enable cron install-cron) \
-			$(use_enable debug debuginfo) \
-			$(use_enable doc documentation ) \
-			$(use_enable isag install-isag) \
-			$(use_enable lm_sensors sensors) \
-			$(use_enable nls)
-}
-
-src_compile() {
-	emake LFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	keepdir /var/log/sa
-
-	use cron && dodir /etc/cron.d
-
-	emake \
-		DESTDIR="${D}" \
-		DOC_DIR=/usr/share/doc/${PF} \
-		install
-
-	dodoc contrib/sargraph/sargraph
-
-	newinitd "${FILESDIR}"/${PN}.init.d ${PN}
-	systemd_dounit ${PN}.service
-
-	use doc && rm -f "${D}"usr/share/doc/${PF}/COPYING
-}
--- a/app-arch/zpaq-extras/zpaq-extras-3.ebuild
+++ b/app-arch/zpaq-extras/zpaq-extras-3.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/zpaq-extras/zpaq-extras-3.ebuild,v 1.1 2014/06/17 15:22:36 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/zpaq-extras/zpaq-extras-3.ebuild,v 1.2 2014/12/27 14:53:44 bircoph Exp $

 EAPI=5
 inherit toolchain-funcs
@ -22,7 +22,7 @@ SRC_URI="http://mattmahoney.net/dc/bwt_j3.zip

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

 DEPEND="app-arch/unzip"
--- a/app-arch/zpipe/zpipe-2.01.ebuild
+++ b/app-arch/zpipe/zpipe-2.01.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/zpipe/zpipe-2.01.ebuild,v 1.1 2011/01/05 16:17:30 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/zpipe/zpipe-2.01.ebuild,v 1.2 2014/12/27 14:57:23 bircoph Exp $

 EAPI=3
 inherit toolchain-funcs
@ -12,7 +12,7 @@ SRC_URI="http://mattmahoney.net/dc/${MY_P}.zip"

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

 RDEPEND="app-arch/libzpaq"
--- a/app-cdr/cdcover/cdcover-0.7.4-r1.ebuild
+++ b/app-cdr/cdcover/cdcover-0.7.4-r1.ebuild
@ -0,0 +1,47 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdcover/cdcover-0.7.4-r1.ebuild,v 1.1 2014/12/26 21:42:13 mgorny Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE=tk
+
+inherit eutils python-single-r1
+
+DESCRIPTION="cdcover allows the creation of inlay-sheets for jewel cd-cases"
+HOMEPAGE="http://cdcover.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cddb"
+
+RDEPEND="${PYTHON_DEPS}
+	cddb? ( dev-python/cddb-py[${PYTHON_USEDEP}] )
+	media-sound/cd-discid"
+DEPEND=""
+
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-Makefile.patch
+	sed -i -e 's:ggv:gv:' dotcdcover.{example,m4} || die
+}
+
+src_compile() {
+	emake prefix="${D}"/usr target=/usr || die
+}
+
+src_install() {
+	emake prefix="${D}"/usr docdir="${D}"/usr/share/doc/${PF} install || die
+
+	python_fix_shebang "${D}"
+
+	make_desktop_entry ${PN} ${PN}
+
+	dodoc doc/cdcover.pdf
+}
--- a/app-cdr/gtkcdlabel/gtkcdlabel-1.14-r1.ebuild
+++ b/app-cdr/gtkcdlabel/gtkcdlabel-1.14-r1.ebuild
@ -0,0 +1,37 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/gtkcdlabel/gtkcdlabel-1.14-r1.ebuild,v 1.1 2014/12/26 21:52:59 mgorny Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-single-r1
+
+DESCRIPTION="a GUI frontend to cdlabelgen which is a program that can generate a variety of CD tray covers"
+HOMEPAGE="http://gtkcdlabel.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+DEPEND="${PYTHON_DEPS}
+	>=app-cdr/cdlabelgen-4
+	dev-python/pygtk[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+S=${WORKDIR}
+
+src_prepare() {
+	python_fix_shebang .
+}
+
+src_install() {
+	dobin usr/bin/${PN}.py || die "dobin failed"
+	insinto /usr/share
+	doins -r usr/share/{applications,${PN},pixmaps} || die "doins failed"
+	dodoc usr/share/doc/${PN}/{AUTHORS,README}
+}
--- a/app-cdr/recorder/recorder-1.4.5-r1.ebuild
+++ b/app-cdr/recorder/recorder-1.4.5-r1.ebuild
@ -0,0 +1,61 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/recorder/recorder-1.4.5-r1.ebuild,v 1.1 2014/12/26 22:01:58 mgorny Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit fdo-mime python-single-r1
+
+DESCRIPTION="A simple GTK+ disc burner"
+HOMEPAGE="http://code.google.com/p/recorder/"
+SRC_URI="http://recorder.googlecode.com/files/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="dvdr mp3 nls ogg vcd"
+
+LANGS="ar cs es fr it nl pl pt_BR ru sv"
+for l in ${LANGS}; do
+	IUSE="${IUSE} linguas_${l}"
+done
+
+DEPEND="nls? ( sys-devel/gettext )"
+RDEPEND="${DEPEND}
+	>=dev-python/pygtk-2[${PYTHON_USEDEP}]
+	sys-apps/coreutils
+	virtual/cdrtools
+	dvdr? ( app-cdr/dvd+rw-tools )
+	mp3? ( media-sound/mpg123 )
+	ogg? ( media-sound/vorbis-tools )
+	vcd? (
+		app-cdr/cdrdao
+		media-video/vcdimager
+	)"
+
+DOCS=( CHANGELOG TRANSLATORS )
+
+src_prepare() {
+	python_fix_shebang recorder
+
+	local MY_NLS=""
+	if use nls; then
+		for ling in ${LINGUAS}; do
+			if has $ling ${LANGS}; then
+				MY_NLS="${MY_NLS} ${ling}"
+			fi
+		done
+	fi
+
+	sed -i -e "s:ar cs es fr pt_BR ru it nl:${MY_NLS}:" Makefile || die
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}
--- a/app-cdr/sync2cd/sync2cd-1.3-r1.ebuild
+++ b/app-cdr/sync2cd/sync2cd-1.3-r1.ebuild
@ -0,0 +1,28 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/sync2cd/sync2cd-1.3-r1.ebuild,v 1.1 2014/12/26 22:06:35 mgorny Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="An incremental archiving tool to CD/DVD"
+HOMEPAGE="http://www.calins.ch/software/sync2cd.html"
+SRC_URI="http://www.calins.ch/download/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="cdr dvdr"
+
+RDEPEND="virtual/eject
+	cdr? ( virtual/cdrtools )
+	dvdr? ( app-cdr/dvd+rw-tools )"
+DEPEND=""
+
+python_test() {
+	cd tests || die
+	"${PYTHON}" run.py || die "Unit tests failed for ${EPYTHON}"
+}
--- a/app-crypt/openvpn-blacklist/openvpn-blacklist-0.4-r1.ebuild
+++ b/app-crypt/openvpn-blacklist/openvpn-blacklist-0.4-r1.ebuild
@ -0,0 +1,33 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/openvpn-blacklist/openvpn-blacklist-0.4-r1.ebuild,v 1.1 2014/12/26 22:13:31 mgorny Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+inherit python-single-r1
+
+DESCRIPTION="Detection of weak openvpn keys produced by certain debian versions between 2006 and 2008"
+HOMEPAGE="http://packages.debian.org/sid/openvpn-blacklist"
+SRC_URI="mirror://debian/pool/main/o/${PN}/${PN}_${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=${PYTHON_DEPS}
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+src_prepare() {
+	python_fix_shebang openvpn-vulnkey
+}
+
+src_install() {
+	dobin openvpn-vulnkey
+	doman openvpn-vulnkey.1
+	dodir /usr/share/openvpn-blacklist
+	cat "${S}/debian/blacklist.prefix" > "${D}/usr/share/openssl-blacklist/blacklist.RSA-2048"
+	cut "${S}/blacklist.RSA-2048" -d ' ' -f 2 | cut -b13- | sort \
+		>> "${D}/usr/share/openvpn-blacklist/blacklist.RSA-2048"
+}
--- a/app-crypt/ssh-multiadd/ssh-multiadd-1.3.2-r1.ebuild
+++ b/app-crypt/ssh-multiadd/ssh-multiadd-1.3.2-r1.ebuild
@ -0,0 +1,35 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/ssh-multiadd/ssh-multiadd-1.3.2-r1.ebuild,v 1.1 2014/12/26 22:19:59 mgorny Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-single-r1
+
+DESCRIPTION="Adds multiple ssh keys to the ssh authentication agent"
+HOMEPAGE="http://code.fluffytapeworm.com/projects"
+SRC_URI="http://code.fluffytapeworm.com/projects/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="X"
+
+DEPEND=""
+RDEPEND="X? ( >=net-misc/x11-ssh-askpass-1.2.2 )"
+
+src_prepare() {
+	python_fix_shebang .
+}
+
+src_compile(){
+	:
+}
+
+src_install() {
+	dobin ssh-multiadd
+	doman ssh-multiadd.1
+	dodoc Changelog README todo
+}
--- a/app-editors/bluefish/bluefish-2.2.3-r1.ebuild
+++ b/app-editors/bluefish/bluefish-2.2.3-r1.ebuild
@ -0,0 +1,89 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/bluefish/bluefish-2.2.3-r1.ebuild,v 1.1 2014/12/26 22:35:55 mgorny Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils fdo-mime python-single-r1
+
+MY_P=${P/_/-}
+
+DESCRIPTION="A GTK HTML editor for the experienced web designer or programmer"
+SRC_URI="http://www.bennewitz.com/bluefish/stable/source/${MY_P}.tar.bz2"
+HOMEPAGE="http://bluefish.openoffice.nl/"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+SLOT="0"
+IUSE="nls python spell"
+
+RDEPEND="
+	x11-libs/gtk+:3
+	gnome-extra/gucharmap:2.90
+	sys-libs/zlib
+	python? ( ${PYTHON_DEPS} )
+	spell? ( app-text/enchant )"
+DEPEND="${RDEPEND}
+	>=dev-libs/glib-2.16:2
+	dev-libs/libxml2:2
+	virtual/pkgconfig
+	x11-libs/pango
+	nls? (
+		sys-devel/gettext
+		dev-util/intltool
+	)"
+
+S=${WORKDIR}/${MY_P}
+
+# there actually is just some broken manpage checkup -> not bother
+RESTRICT="test"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+# Never eautoreconf this package as gettext breaks completely (no translations
+# even if it compiles afterwards)!
+
+src_configure() {
+	econf \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--disable-dependency-tracking \
+		--disable-update-databases \
+		--disable-xml-catalog-update \
+		$(use_enable nls) \
+		$(use_enable spell spell-check) \
+		$(use_enable python)
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -exec rm -f {} +
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+
+	einfo "Adding XML catalog entries..."
+	/usr/bin/xmlcatalog  --noout \
+		--add 'public' 'Bluefish/DTD/Bflang' 'bflang.dtd' \
+		--add 'system' 'http://bluefish.openoffice.nl/DTD/bflang.dtd' 'bflang.dtd' \
+		--add 'rewriteURI' 'http://bluefish.openoffice.nl/DTD' '/usr/share/xml/bluefish-unstable' \
+		/etc/xml/catalog \
+		|| ewarn "Failed to add XML catalog entries."
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+	einfo "Removing XML catalog entries..."
+	/usr/bin/xmlcatalog  --noout \
+		--del 'Bluefish/DTD/Bflang' \
+		--del 'http://bluefish.openoffice.nl/DTD/bflang.dtd' \
+		--del 'http://bluefish.openoffice.nl/DTD' \
+		/etc/xml/catalog \
+		|| ewarn "Failed to remove XML catalog entries."
+}
--- a/app-editors/editra/editra-0.7.20-r1.ebuild
+++ b/app-editors/editra/editra-0.7.20-r1.ebuild
@ -0,0 +1,54 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/editra/editra-0.7.20-r1.ebuild,v 1.1 2014/12/26 22:43:47 mgorny Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 eutils fdo-mime
+
+MY_PN=${PN/e/E}
+
+DESCRIPTION="Multi-platform text editor supporting over 50 programming languages"
+HOMEPAGE="http://editra.org http://pypi.python.org/pypi/Editra"
+SRC_URI="http://editra.org/uploads/src/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="wxWinLL-3.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="spell"
+
+DEPEND="
+	>=dev-python/wxpython-2.8.9.2:2.8[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-0.6[${PYTHON_USEDEP}]"
+# setuptools is RDEPEND because it's used by the runtime for installing plugins
+RDEPEND="${DEPEND}
+	spell? ( dev-python/pyenchant[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}"/${MY_PN}-${PV}
+
+python_compile() {
+	# http://code.google.com/p/editra/issues/detail?id=481
+	distutils-r1_python_compile --no-clean
+}
+
+python_install() {
+	distutils-r1_python_install --no-clean
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	doicon "${S}"/pixmaps/editra.png
+	make_desktop_entry editra Editra editra "Utility;TextEditor"
+	dodoc FAQ THANKS
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}
--- a/app-emulation/wine-doors/wine-doors-0.1.3-r1.ebuild
+++ b/app-emulation/wine-doors/wine-doors-0.1.3-r1.ebuild
@ -0,0 +1,40 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine-doors/wine-doors-0.1.3-r1.ebuild,v 1.1 2014/12/26 23:09:13 mgorny Exp $
+
+EAPI=5
+
+DISTUTILS_SINGLE_IMPL=1
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Wine-doors is a package manager for wine"
+HOMEPAGE="http://www.wine-doors.org"
+SRC_URI="http://www.wine-doors.org/releases/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/pycairo[${PYTHON_USEDEP}]
+	dev-python/pygtk[${PYTHON_USEDEP}]
+	dev-python/librsvg-python[${PYTHON_USEDEP}]
+	gnome-base/libglade
+	dev-libs/libxml2[python,${PYTHON_USEDEP}]
+	app-pda/orange
+	app-arch/cabextract
+	app-emulation/wine"
+RDEPEND="${DEPEND}
+	dev-python/gconf-python[${PYTHON_USEDEP}]"
+
+python_compile() { :; }
+
+python_install() {
+	local -x USER='root'
+	distutils-r1_python_install --temp="${D}"
+
+	keepdir /etc/wine-doors
+	python_optimize "${D}"usr/share/wine-doors/src
+}
--- a/app-i18n/ibus-hangul/ibus-hangul-1.4.2-r1.ebuild
+++ b/app-i18n/ibus-hangul/ibus-hangul-1.4.2-r1.ebuild
@ -0,0 +1,44 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-hangul/ibus-hangul-1.4.2-r1.ebuild,v 1.1 2014/12/27 10:40:45 mgorny Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-single-r1
+
+DESCRIPTION="The Hangul engine for IBus input platform"
+HOMEPAGE="http://code.google.com/p/ibus/"
+SRC_URI="http://ibus.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
+
+RDEPEND=">=app-i18n/ibus-1.4[python,${PYTHON_USEDEP}]
+	=dev-python/pygobject-2*[${PYTHON_USEDEP}]
+	=dev-python/pygtk-2*[${PYTHON_USEDEP}]
+	>=app-i18n/libhangul-0.1
+	nls? ( virtual/libintl )
+	${PYTHON_DEPS}"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? (
+		dev-util/intltool
+		>=sys-devel/gettext-0.17
+		)"
+
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+DOCS="AUTHORS ChangeLog NEWS README"
+
+src_prepare() {
+	sed -ie "s:python:${EPYTHON}:" \
+		setup/ibus-setup-hangul.in || die
+}
+
+src_configure() {
+	econf $(use_enable nls)
+}
--- a/app-i18n/ibus-pinyin/ibus-pinyin-1.5.0-r2.ebuild
+++ b/app-i18n/ibus-pinyin/ibus-pinyin-1.5.0-r2.ebuild
@ -0,0 +1,51 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-pinyin/ibus-pinyin-1.5.0-r2.ebuild,v 1.2 2014/12/27 10:51:34 mgorny Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite"
+
+inherit python-single-r1 eutils
+
+DESCRIPTION="Chinese PinYin IMEngine for IBus Framework"
+HOMEPAGE="http://code.google.com/p/ibus/"
+SRC_URI="http://ibus.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="boost lua nls"
+
+RDEPEND="${PYTHON_DEPS}
+	>=app-i18n/ibus-1.4[python,${PYTHON_USEDEP}]
+	dev-python/pygtk[${PYTHON_USEDEP}]
+	app-i18n/pyzy
+	boost? ( >=dev-libs/boost-1.39 )
+	lua? (
+		>=dev-lang/lua-5.1
+		<dev-lang/lua-5.2 )
+	nls? ( virtual/libintl )"
+
+DEPEND="${RDEPEND}
+	sys-apps/sed
+	virtual/pkgconfig
+	nls? ( >=sys-devel/gettext-0.16.1 )"
+
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+DOCS="AUTHORS ChangeLog NEWS README"
+
+src_prepare() {
+	sed -i -e "s/python/${EPYTHON}/" setup/ibus-setup-pinyin.in || die
+	epatch "${FILESDIR}"/${P}-content-type-method.patch
+}
+
+src_configure() {
+	econf \
+		$(use_enable boost) \
+		$(use_enable lua lua-extension) \
+		$(use_enable nls) \
+		--enable-english-input-mode
+}
--- a/app-i18n/ibus-skk/ibus-skk-1.4.1-r1.ebuild
+++ b/app-i18n/ibus-skk/ibus-skk-1.4.1-r1.ebuild
@ -0,0 +1,30 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-skk/ibus-skk-1.4.1-r1.ebuild,v 1.1 2014/12/27 10:56:52 mgorny Exp $
+
+EAPI=5
+
+DESCRIPTION="Japanese input method Anthy IMEngine for IBus Framework"
+HOMEPAGE="http://github.com/ueno/ibus-skk"
+SRC_URI="mirror://github/ueno/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
+
+RDEPEND=">=app-i18n/ibus-1.3
+	>=app-i18n/libskk-0.0.11
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	virtual/pkgconfig
+	nls? ( >=sys-devel/gettext-0.16.1 )"
+RDEPEND="${RDEPEND}
+	app-i18n/skk-jisyo"
+
+DOCS="ChangeLog NEWS README THANKS"
+
+src_configure() {
+	econf $(use_enable nls)
+}
--- a/app-i18n/ibus-sunpinyin/ibus-sunpinyin-2.0.4_pre20130108-r2.ebuild
+++ b/app-i18n/ibus-sunpinyin/ibus-sunpinyin-2.0.4_pre20130108-r2.ebuild
@ -0,0 +1,50 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-sunpinyin/ibus-sunpinyin-2.0.4_pre20130108-r2.ebuild,v 1.1 2014/12/27 11:09:05 mgorny Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+inherit python-single-r1 scons-utils toolchain-funcs
+
+DESCRIPTION="The SunPinYin IMEngine for IBus Framework"
+HOMEPAGE="https://sunpinyin.googlecode.com/"
+SRC_URI="http://dev.gentoo.org/~yngwin/distfiles/sunpinyin-${PV}.tar.xz"
+
+LICENSE="LGPL-2.1 CDDL"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+nls"
+
+RDEPEND="${PYTHON_DEPS}
+	app-i18n/ibus[python,${PYTHON_USEDEP}]
+	~app-i18n/sunpinyin-${PV}:=
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+src_unpack() {
+	default
+	mv "${WORKDIR}/sunpinyin-${PV}" "${S}" || die
+}
+
+src_prepare() {
+	sed -i -e "s/python/${EPYTHON}/" wrapper/ibus/setup/ibus-setup-sunpinyin.in || die
+}
+
+src_configure() {
+	tc-export CXX
+	myesconsargs=(
+		--prefix="${EPREFIX}"/usr
+		--libexecdir="${EPREFIX}"/usr/libexec
+	)
+}
+
+src_compile() {
+	escons -C wrapper/ibus
+}
+
+src_install() {
+	escons -C wrapper/ibus --install-sandbox="${ED}" install
+}
--- a/app-i18n/ibus-table/ibus-table-1.5.0-r1.ebuild
+++ b/app-i18n/ibus-table/ibus-table-1.5.0-r1.ebuild
@ -0,0 +1,42 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-table/ibus-table-1.5.0-r1.ebuild,v 1.1 2014/12/27 11:24:29 mgorny Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite"
+inherit eutils python-single-r1
+
+DESCRIPTION="The Table Engine for IBus Framework"
+HOMEPAGE="http://code.google.com/p/ibus/"
+SRC_URI="http://ibus.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
+
+RDEPEND="${PYTHON_DEPS}
+	>=app-i18n/ibus-1.2[python,${PYTHON_USEDEP}]
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+	nls? ( >=sys-devel/gettext-0.16.1 )
+	virtual/pkgconfig"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+src_prepare() {
+	python_fix_shebang .
+
+	sed -i -e "s/python/${EPYTHON}/" \
+		engine/ibus-table-createdb.in engine/ibus-engine-table.in || die
+}
+
+src_configure() {
+	econf $(use_enable nls)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	dodoc AUTHORS ChangeLog NEWS README
+}
--- a/app-i18n/ibus-tutcode/ibus-tutcode-1.0.2-r1.ebuild
+++ b/app-i18n/ibus-tutcode/ibus-tutcode-1.0.2-r1.ebuild
@ -0,0 +1,34 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-tutcode/ibus-tutcode-1.0.2-r1.ebuild,v 1.1 2014/12/27 11:31:15 mgorny Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+inherit python-single-r1
+
+DESCRIPTION="a Japanese TUT-Code input engine for IBus"
+HOMEPAGE="https://github.com/deton/ibus-tutcode/"
+SRC_URI="mirror://github/deton/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="test"
+
+CDEPEND="${PYTHON_DEPS}
+	>=sys-devel/gettext-0.16.1"
+DEPEND="${CDEPEND}
+	test? ( app-i18n/ibus )"
+RDEPEND="${CDEPEND}
+	app-i18n/ibus"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+src_prepare() {
+	sed -i -e "s/python/${EPYTHON}/" engine/ibus-engine-tutcode.in || die
+}
+
+src_install() {
+	default
+	dodoc ${PN}.json.example
+}
--- a/app-i18n/libtomoe-gtk/libtomoe-gtk-0.6.0-r3.ebuild
+++ b/app-i18n/libtomoe-gtk/libtomoe-gtk-0.6.0-r3.ebuild
@ -0,0 +1,76 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/libtomoe-gtk/libtomoe-gtk-0.6.0-r3.ebuild,v 1.1 2014/12/27 13:50:27 mgorny Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools eutils python-single-r1
+
+MY_P="tomoe-gtk-${PV}"
+DESCRIPTION="Tomoe GTK+ interface widget library"
+HOMEPAGE="http://tomoe.sourceforge.jp/"
+SRC_URI="mirror://sourceforge/tomoe/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc +gucharmap python static-libs"
+
+RDEPEND=">=app-i18n/tomoe-0.6.0
+	python? (
+		${PYTHON_DEPS}
+		>=app-i18n/tomoe-0.6.0[python,${PYTHON_USEDEP}]
+		dev-python/pygtk:2[${PYTHON_USEDEP}]
+		dev-python/pygobject:2[${PYTHON_USEDEP}]
+	)
+	gucharmap? ( gnome-extra/gucharmap:0 )"
+DEPEND="${RDEPEND}
+	dev-util/gtk-doc-am
+	virtual/pkgconfig
+	sys-devel/gettext
+	doc? ( >=dev-util/gtk-doc-1.4 )"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	if use python ; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	# Fix compilation with gucharmap-2.24, bug #243160
+	epatch "${FILESDIR}/${P}-gucharmap2.patch"
+	epatch "${FILESDIR}/${P}-underlinking.patch"
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+	#--with-python b0rked hard
+	unset PYTHON
+	use python || myconf="${myconf} --without-python"
+
+	econf \
+		$(use_enable doc gtk-doc) \
+		$(use_with gucharmap) \
+		$(use_enable static-libs static) \
+		${myconf} || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+
+	if use python ; then
+		find "${D}$(python_get_sitedir)" \( -name "*.la" -o -name "*.a" \) -type f -delete || die
+	fi
+	if ! use static-libs ; then
+		find "${ED}" -name "*.la" -type f -delete || die
+	fi
+
+	dodoc AUTHORS ChangeLog NEWS README || die
+}
--- a/app-i18n/pyzy/pyzy-0.1.0-r1.ebuild
+++ b/app-i18n/pyzy/pyzy-0.1.0-r1.ebuild
@ -0,0 +1,52 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/pyzy/pyzy-0.1.0-r1.ebuild,v 1.1 2014/12/27 10:31:39 mgorny Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+inherit eutils python-any-r1 autotools
+
+PY_DATABASE=${PN}-database-1.0.0
+DESCRIPTION="The Chinese PinYin and Bopomofo conversion library"
+HOMEPAGE="https://github.com/pyzy"
+SRC_URI="https://pyzy.googlecode.com/files/${P}.tar.gz
+	https://pyzy.googlecode.com/files/${PY_DATABASE}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="boost doc opencc test"
+
+RDEPEND="dev-libs/glib:2
+	dev-db/sqlite:3
+	sys-apps/util-linux
+	boost? ( dev-libs/boost )
+	opencc? ( app-i18n/opencc )"
+
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	doc? ( app-doc/doxygen )"
+
+# Currently it fails to build test code
+RESTRICT="test"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-dont-download-dictionary-file.patch
+	mv ../db ./data/db/open-phrase/ || die
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--enable-db-open-phrase \
+		--enable-db-android \
+		$(use_enable boost) \
+		$(use_enable opencc) \
+		$(use_enable test tests)
+}
+
+src_install() {
+	default
+	use doc && dohtml -r docs/html/*
+}
--- a/app-i18n/tomoe/tomoe-0.6.0-r2.ebuild
+++ b/app-i18n/tomoe/tomoe-0.6.0-r2.ebuild
@ -0,0 +1,93 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/tomoe/tomoe-0.6.0-r2.ebuild,v 1.2 2014/12/27 13:47:52 mgorny Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+inherit autotools eutils multilib python-single-r1
+
+DESCRIPTION="Japanese handwriting recognition engine"
+HOMEPAGE="http://tomoe.sourceforge.jp/"
+SRC_URI="mirror://sourceforge/tomoe/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc hyperestraier mysql ruby python static-libs subversion"
+
+RDEPEND=">=dev-libs/glib-2.4
+	ruby? ( dev-ruby/ruby-glib2 )
+	hyperestraier? ( app-text/hyperestraier )
+	subversion? (
+		>=dev-libs/apr-1
+		dev-vcs/subversion
+	)
+	mysql? ( dev-db/mysql )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/pygobject:2[${PYTHON_USEDEP}]
+		dev-python/pygtk:2[${PYTHON_USEDEP}]
+	)"
+#	test? ( app-dicts/uconv )
+
+DEPEND="${DEPEND}
+	dev-util/gtk-doc-am
+	dev-util/intltool
+	virtual/pkgconfig
+	doc? ( dev-util/gtk-doc )"
+
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+RESTRICT="test"
+
+pkg_setup() {
+	if use python ; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}/${P}-export-symbols.patch" \
+		"${FILESDIR}/${P}-ldflags.patch" \
+		"${FILESDIR}/${P}-glib232.patch"
+
+	if ! use hyperestraier ; then
+		sed -i -e "s/use_est=yes/use_est=no/" configure.ac || die
+	fi
+	if ! use mysql ; then
+		sed -i -e "s/use_mysql=yes/use_mysql=no/" configure.ac || die
+	fi
+	if ! use subversion ; then
+		sed -i -e "s/use_svn=yes/use_svn=no/" macros/svn.m4 || die
+	fi
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+
+	# --with-python b0rked hard
+	unset PYTHON
+	use python || myconf="${myconf} --without-python"
+
+	econf \
+		$(use_enable doc gtk-doc) \
+		$(use_with ruby) \
+		$(use_enable static-libs static) \
+		$(use_enable ruby dict-ruby) \
+		${myconf} || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+
+	find "${ED}/usr/$(get_libdir)/tomoe" \( -name '*.la' -o -name '*.a' \) -type f -delete || die
+	if ! use static-libs ; then
+		find "${ED}" -name '*.la' -type f -delete || die
+	fi
+
+	dodoc AUTHORS ChangeLog NEWS TODO || die
+}
--- a/app-laptop/batti/batti-0.3.8-r3.ebuild
+++ b/app-laptop/batti/batti-0.3.8-r3.ebuild
@ -0,0 +1,43 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/batti/batti-0.3.8-r3.ebuild,v 1.1 2014/12/27 12:37:28 mgorny Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 gnome2-utils eutils
+
+DESCRIPTION="A upower based battery monitor for the system tray, similar to batterymon"
+HOMEPAGE="http://code.google.com/p/batti-gtk/"
+SRC_URI="http://batti-gtk.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libnotify"
+
+RDEPEND="dev-python/pygtk[${PYTHON_USEDEP}]
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	|| ( sys-power/upower sys-power/upower-pm-utils )
+	x11-themes/gnome-icon-theme
+	libnotify? ( x11-libs/libnotify )"
+DEPEND=""
+
+DOCS=( AUTHORS ChangeLog )
+
+src_prepare() {
+	has_version ">=sys-power/upower-0.99" && epatch "${FILESDIR}/${P}-upower-0.99.patch"
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
--- a/app-misc/cwiid/cwiid-20110107-r2.ebuild
+++ b/app-misc/cwiid/cwiid-20110107-r2.ebuild
@ -0,0 +1,77 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/cwiid/cwiid-20110107-r2.ebuild,v 1.1 2014/12/27 14:01:42 mgorny Exp $
+
+EAPI=5
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="git://github.com/abstrakraft/cwiid.git"
+	SRC_URI=""
+	KEYWORDS=""
+	inherit git
+else
+	# git archive --prefix=cwiid-$(date +%Y%m%d)/ \
+	#	--format=tar HEAD | bzip2 > cwiid-$(date +%Y%m%d).tar.bz2
+	SRC_URI="http://dev.gentoo.org/~lxnay/cwiid/cwiid-${PV}.tar.bz2"
+	KEYWORDS="~x86 ~amd64"
+fi
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils linux-mod autotools python-single-r1
+
+DESCRIPTION="Library, input driver, and utilities for the Nintendo Wiimote"
+HOMEPAGE="http://abstrakraft.org/cwiid"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="python"
+
+DEPEND="virtual/awk
+	sys-apps/sed
+	sys-devel/bison
+	>=sys-devel/flex-2.5.35
+	virtual/pkgconfig
+	python? ( ${PYTHON_DEPS} )"
+
+RDEPEND="net-wireless/bluez
+	x11-libs/gtk+:2
+	python? ( ${PYTHON_DEPS} )"
+
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+pkg_setup() {
+	CONFIG_CHECK="~BT_L2CAP ~INPUT_UINPUT"
+	linux-mod_pkg_setup
+	use python && python-single-r1_pkg_setup
+}
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]]; then
+		git_src_unpack
+	else
+		unpack ${A}
+	fi
+}
+
+src_prepare() {
+	# Fix broken build system
+	sed -i "s:--disable-ldconfig:--without-ldconfig:g" "${S}"/configure.ac || die
+	sed -i "s:enable_ldconfig:with_ldconfig:g" "${S}"/configure.ac || die
+	epatch "${FILESDIR}"/${P}-underlinking.patch
+	eautoreconf
+}
+src_configure() {
+	econf $(use_with python) --without-ldconfig || die "configure failed"
+}
+
+src_compile() {
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc AUTHORS ChangeLog NEWS README
+	insinto /lib/udev/rules.d
+	doins "${FILESDIR}/60-${PN}.rules"
+}
--- a/app-misc/gnomecatalog/gnomecatalog-0.3.4.2-r1.ebuild
+++ b/app-misc/gnomecatalog/gnomecatalog-0.3.4.2-r1.ebuild
@ -0,0 +1,54 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gnomecatalog/gnomecatalog-0.3.4.2-r1.ebuild,v 1.1 2014/12/26 23:57:01 eva Exp $
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite,xml"
+
+inherit distutils-r1 eutils fdo-mime gnome2-utils
+
+DESCRIPTION="Cataloging software for CDs and DVDs"
+HOMEPAGE="http://gnomecatalog.sf.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-python/gconf-python:2[${PYTHON_USEDEP}]
+	dev-python/gnome-vfs-python:2[${PYTHON_USEDEP}]
+	dev-python/kaa-metadata[${PYTHON_USEDEP}]
+	dev-python/libgnome-python:2[${PYTHON_USEDEP}]
+	dev-python/pygobject:2[${PYTHON_USEDEP}]
+	>=dev-python/pygtk-2.4:2[${PYTHON_USEDEP}]
+	dev-python/pyvorbis[${PYTHON_USEDEP}]
+	>=gnome-base/libglade-2:2.0
+	>=x11-libs/gtk+-2.4:2
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	# Fix importing from a single folder in /media
+	epatch "${FILESDIR}"/${P}-dbus.patch
+
+	# Use sqlite3 instead of pysqlite2, bug #452126.
+	sed -i -e 's:from pysqlite2 import dbapi2:import sqlite3:' \
+		gnomecatalog/storage.py || die
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	fdo-mime_mime_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_mime_database_update
+	gnome2_icon_cache_update
+}
--- a/app-misc/hachoir-subfile/hachoir-subfile-0.5.3-r1.ebuild
+++ b/app-misc/hachoir-subfile/hachoir-subfile-0.5.3-r1.ebuild
@ -0,0 +1,30 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/hachoir-subfile/hachoir-subfile-0.5.3-r1.ebuild,v 1.1 2014/12/27 14:37:43 mgorny Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Find subfile in any binary stream"
+HOMEPAGE="http://bitbucket.org/haypo/hachoir/wiki/hachoir-subfile http://pypi.python.org/pypi/hachoir-subfile"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND=">=dev-python/hachoir-core-1.1[${PYTHON_USEDEP}]
+	>=dev-python/hachoir-parser-1.1[${PYTHON_USEDEP}]
+	>=dev-python/hachoir-regex-1.0.1[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_configure_all() {
+	mydistutilsargs=(
+		--setuptools
+	)
+}
--- a/app-misc/hachoir-urwid/hachoir-urwid-1.1-r1.ebuild
+++ b/app-misc/hachoir-urwid/hachoir-urwid-1.1-r1.ebuild
@ -0,0 +1,31 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/hachoir-urwid/hachoir-urwid-1.1-r1.ebuild,v 1.1 2014/12/27 14:40:56 mgorny Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="ncurses"
+
+inherit distutils-r1
+
+DESCRIPTION="Binary file explorer using Hachoir and urwid libraries"
+HOMEPAGE="http://bitbucket.org/haypo/hachoir/wiki/hachoir-urwid http://pypi.python.org/pypi/hachoir-urwid"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-python/hachoir-core-1.2[${PYTHON_USEDEP}]
+	>=dev-python/hachoir-parser-1.0[${PYTHON_USEDEP}]
+	>=dev-python/urwid-0.9.4[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_configure_all() {
+	mydistutilsargs=(
+		--setuptools
+	)
+}
--- a/app-misc/ktoblzcheck/ktoblzcheck-1.45.ebuild
+++ b/app-misc/ktoblzcheck/ktoblzcheck-1.45.ebuild
@ -1,10 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/ktoblzcheck/ktoblzcheck-1.45.ebuild,v 1.1 2014/03/22 17:39:47 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/ktoblzcheck/ktoblzcheck-1.45.ebuild,v 1.2 2014/12/27 15:50:20 mgorny Exp $

-EAPI=4
-PYTHON_DEPEND="python? 2:2.6"
-inherit python
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+inherit python-single-r1

 DESCRIPTION="Library to check account numbers and bank codes of German banks"
 HOMEPAGE="http://ktoblzcheck.sourceforge.net/"
@ -19,21 +19,16 @@ RDEPEND="app-text/recode
 	virtual/awk
 	sys-apps/grep
 	sys-apps/sed
-	|| ( net-misc/wget www-client/lynx )"
+	|| ( net-misc/wget www-client/lynx )
+	python? ( ${PYTHON_DEPS} )"
 DEPEND="${RDEPEND}
 	>=sys-devel/libtool-2.2.6b"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}

 DOCS="AUTHORS ChangeLog NEWS README"

 pkg_setup() {
-	if use python; then
-		python_set_active_version 2
-		python_pkg_setup
-	fi
-}
-
-src_prepare() {
-	>py-compile
+	use python && python-single-r1_pkg_setup
 }

 src_configure() {
@ -44,11 +39,3 @@ src_install() {
 	default
 	find "${ED}" -name '*.la' -exec rm -f {} +
 }
-
-pkg_postinst() {
-	use python && python_mod_optimize ktoblzcheck.py
-}
-
-pkg_postrm() {
-	use python && python_mod_cleanup ktoblzcheck.py
-}
--- a/app-misc/lfm/lfm-2.3-r1.ebuild
+++ b/app-misc/lfm/lfm-2.3-r1.ebuild
@ -0,0 +1,22 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lfm/lfm-2.3-r1.ebuild,v 1.1 2014/12/27 15:56:14 mgorny Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="ncurses"
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="Last File Manager is a powerful file manager for the console"
+HOMEPAGE="http://code.google.com/p/lfm/"
+SRC_URI="http://lfm.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-no-doc.patch
+}
--- a/app-misc/mtail/mtail-1.1.1-r3.ebuild
+++ b/app-misc/mtail/mtail-1.1.1-r3.ebuild
@ -0,0 +1,31 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/mtail/mtail-1.1.1-r3.ebuild,v 1.1 2014/12/27 16:03:09 mgorny Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+inherit eutils python-single-r1
+
+DESCRIPTION="Tail workalike, that performs output colourising"
+HOMEPAGE="http://matt.immute.net/src/mtail/"
+SRC_URI="http://matt.immute.net/src/mtail/mtail-${PV}.tgz
+	http://matt.immute.net/src/mtail/mtailrc-syslog.sample"
+
+LICENSE="HPND"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~mips ~ppc ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE=""
+
+RDEPEND=${PYTHON_DEPS}
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-remove-blanks.patch
+	python_fix_shebang .
+}
+
+src_install() {
+	dobin mtail || die
+	dodoc CHANGES mtailrc.sample README "${DISTDIR}"/mtailrc-syslog.sample || die
+}
--- a/app-misc/pysmssend/pysmssend-1.48-r1.ebuild
+++ b/app-misc/pysmssend/pysmssend-1.48-r1.ebuild
@ -0,0 +1,49 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/pysmssend/pysmssend-1.48-r1.ebuild,v 1.1 2014/12/27 16:26:49 mgorny Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="Python Application for sending sms over multiple ISPs"
+HOMEPAGE="http://pysmssend.silverarrow.org/"
+SRC_URI="http://pysmssend.silverarrow.org/files/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="qt4"
+
+DEPEND=">dev-python/mechanize-0.1.7b[${PYTHON_USEDEP}]
+	qt4? ( dev-python/PyQt4[X,${PYTHON_USEDEP}] )"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}
+
+python_install() {
+	distutils-r1_python_install
+
+	python_doscript pysmssendcmd
+	if use qt4; then
+		python_doscript pysmssend
+	else
+		ln -s pysmssendcmd "${D}$(python_get_scriptdir)"/pysmssend || die
+	fi
+}
+
+src_install() {
+	distutils-r1_src_install
+	if use qt4; then
+		insinto /usr/share/${PN}/Icons
+		doins   Icons/*
+		doicon  Icons/pysmssend.png
+		make_desktop_entry pysmssend pySMSsend pysmssend \
+			"Applications;Network"
+	else
+		dosym   pysmssendcmd /usr/bin/pysmssend
+	fi
+	dodoc README AUTHORS TODO
+}
--- a/app-misc/pystopwatch/pystopwatch-2012.12.24.1-r1.ebuild
+++ b/app-misc/pystopwatch/pystopwatch-2012.12.24.1-r1.ebuild
@ -0,0 +1,32 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/pystopwatch/pystopwatch-2012.12.24.1-r1.ebuild,v 1.1 2014/12/27 16:34:30 mgorny Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-single-r1
+
+DESCRIPTION="clock and two countdown functions that can minimize to the tray"
+HOMEPAGE="http://xyne.archlinux.ca/projects/pystopwatch"
+SRC_URI="http://xyne.archlinux.ca/projects/${PN}/src/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-python/pygtk:2[${PYTHON_USEDEP}]
+	${PYTHON_DEPS}"
+DEPEND=""
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+src_prepare() {
+	unpack ./man/${PN}.1.gz
+}
+
+src_install() {
+	python_doscript ${PN}
+	doman ${PN}.1
+}
--- a/app-misc/specto/specto-0.4.1-r1.ebuild
+++ b/app-misc/specto/specto-0.4.1-r1.ebuild
@ -0,0 +1,40 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/specto/specto-0.4.1-r1.ebuild,v 1.1 2014/12/27 16:51:04 mgorny Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="watch configurable events and trigger notifications"
+HOMEPAGE="http://specto.sourceforge.net/"
+SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="linguas_cs linguas_de linguas_es linguas_fr linguas_it
+	linguas_pt_BR linguas_ro linguas_sv linguas_tr"
+
+RDEPEND="dev-python/gconf-python[${PYTHON_USEDEP}]
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-python/libgnome-python[${PYTHON_USEDEP}]
+	dev-python/notify-python[${PYTHON_USEDEP}]
+	>=dev-python/pygtk-2.10[${PYTHON_USEDEP}]"
+DEPEND=""
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-icon-theme.patch
+
+	sed -e "s:share/doc/specto:share/doc/${PF}:" \
+		-i setup.py spectlib/util.py || die
+
+	if [ -n "${LINGUAS}" ] ; then
+		sed -e "/^i18n_languages = /s: = .*: = \"${LINGUAS}\":" \
+			-i setup.py || die
+	fi
+
+	distutils-r1_src_prepare
+}
--- a/app-office/libreoffice/files/libreoffice-4.3.4.1-boost-1.56.0.patch
+++ b/app-office/libreoffice/files/libreoffice-4.3.4.1-boost-1.56.0.patch
@ -0,0 +1,187 @@
+Backport of 45dfbdca6a9afba1a6aef21623ec025ded635a4d from LO master 
+by Mark Wright, gienah@gentoo.org
+
+
+--- libreoffice-4.3.1.2-orig/canvas/source/cairo/cairo_spritecanvashelper.cxx	2014-08-26 14:07:49.000000000 +1000
+++ libreoffice-4.3.1.2/canvas/source/cairo/cairo_spritecanvashelper.cxx	2014-09-20 15:09:49.269841950 +1000
+@@ -402,11 +402,12 @@
+         ::basegfx::computeSetDifference( aUncoveredAreas,
+                                          rUpdateArea.maTotalBounds,
+                                          ::basegfx::B2DRange( rDestRect ) );
+        SurfaceSharedPtr surface(mpOwningSpriteCanvas->getBufferSurface());
+         ::std::for_each( aUncoveredAreas.begin(),
+                          aUncoveredAreas.end(),
+                          ::boost::bind( &repaintBackground,
+                                         boost::cref(pCompositingCairo),
+-                                        boost::cref(mpOwningSpriteCanvas->getBufferSurface()),
+                                        boost::cref(surface),
+                                         _1 ) );
+ 
+         cairo_rectangle( pWindowCairo.get(), 0, 0, rSize.getX(), rSize.getY() );
+--- libreoffice-4.3.1.2-orig/canvas/source/vcl/spritecanvashelper.cxx	2014-08-26 14:07:49.000000000 +1000
+++ libreoffice-4.3.1.2/canvas/source/vcl/spritecanvashelper.cxx	2014-09-20 15:09:49.270404983 +1000
+@@ -573,12 +573,12 @@
+ 
+         // repaint all affected sprites on top of background into
+         // VDev.
+        ::basegfx::B2DPoint outPos( ::vcl::unotools::b2DPointFromPoint(aOutputPosition) );
+         ::std::for_each( rSortedUpdateSprites.begin(),
+                          rSortedUpdateSprites.end(),
+                          ::boost::bind( &spriteRedrawStub2,
+                                         ::boost::ref( maVDev.get() ),
+-                                        ::boost::cref(
+-                                            ::vcl::unotools::b2DPointFromPoint(aOutputPosition)),
+                                        ::boost::cref( outPos ),
+                                         _1 ) );
+ 
+         // flush to screen
+--- libreoffice-4.3.1.2-orig/dbaccess/source/ui/tabledesign/TableController.cxx	2014-08-26 14:07:49.000000000 +1000
+++ libreoffice-4.3.1.2/dbaccess/source/ui/tabledesign/TableController.cxx	2014-09-20 15:12:36.829360633 +1000
+@@ -1392,7 +1392,8 @@
+                     setEditable( xMeta.is() && !xMeta->isReadOnly() && (isAlterAllowed() || isDropAllowed() || isAddAllowed()) );
+                     if(!isEditable())
+                     {
+-                        ::std::for_each(m_vRowList.begin(),m_vRowList.end(),boost::bind( &OTableRow::SetReadOnly, _1, boost::cref( sal_True )));
+                        sal_Bool t( sal_True );
+                        ::std::for_each(m_vRowList.begin(),m_vRowList.end(),boost::bind( &OTableRow::SetReadOnly, _1, boost::cref( t )));
+                     }
+                     m_bNew = false;
+                     // be notified when the table is in disposing
+--- libreoffice-4.3.1.2-orig/oox/source/drawingml/table/tablecell.cxx	2014-08-26 14:07:49.000000000 +1000
+++ libreoffice-4.3.1.2/oox/source/drawingml/table/tablecell.cxx	2014-09-20 15:09:49.272005355 +1000
+@@ -117,9 +117,9 @@
+     if (rTableStylePart.getTextColor().isUsed())
+         aTextCharProps.maCharColor = rTableStylePart.getTextColor();
+     if( rTableStylePart.getTextBoldStyle().is_initialized() )
+-        aTextCharProps.moBold = rTableStylePart.getTextBoldStyle();
+        aTextCharProps.moBold = *rTableStylePart.getTextBoldStyle();
+     if( rTableStylePart.getTextItalicStyle().is_initialized() )
+-        aTextCharProps.moItalic = rTableStylePart.getTextItalicStyle();
+        aTextCharProps.moItalic = *rTableStylePart.getTextItalicStyle();
+ }
+ 
+ void applyTableCellProperties( const Reference < ::com::sun::star::table::XCell >& rxCell, const TableCell& rTableCell )
+--- libreoffice-4.3.1.2-orig/reportdesign/source/core/api/ReportDefinition.cxx	2014-08-26 14:07:49.000000000 +1000
+++ libreoffice-4.3.1.2/reportdesign/source/core/api/ReportDefinition.cxx	2014-09-20 15:09:49.273376564 +1000
+@@ -1612,8 +1612,9 @@
+         m_pImpl->m_pObjectContainer->SwitchPersistence(m_pImpl->m_xStorage);
+     }
+     // notify our container listeners
+    OWeakObject *weakObjectThis = static_cast<OWeakObject*>(this);
+     m_pImpl->m_aStorageChangeListeners.forEach<document::XStorageChangeListener>(
+-            ::boost::bind(&document::XStorageChangeListener::notifyStorageChange,_1,boost::cref(static_cast<OWeakObject*>(this)),boost::cref(_xStorage)));
+            ::boost::bind(&document::XStorageChangeListener::notifyStorageChange,_1,boost::cref(weakObjectThis),boost::cref(_xStorage)));
+ }
+ 
+ uno::Reference< embed::XStorage > SAL_CALL OReportDefinition::getDocumentStorage(  ) throw (io::IOException, uno::Exception, uno::RuntimeException, std::exception)
+--- libreoffice-4.3.1.2-orig/slideshow/source/engine/activities/activitybase.hxx	2014-08-26 14:07:49.000000000 +1000
+++ libreoffice-4.3.1.2/slideshow/source/engine/activities/activitybase.hxx	2014-09-20 15:09:49.273965661 +1000
+@@ -111,7 +111,7 @@
+     ShapeAttributeLayerSharedPtr getShapeAttributeLayer() const
+         { return mpAttributeLayer; }
+ 
+-    bool isRepeatCountValid() const { return maRepeats; }
+    bool isRepeatCountValid() const { return bool(maRepeats); }
+     double getRepeatCount() const { return *maRepeats; }
+     bool isAutoReverse() const { return mbAutoReverse; }
+ 
+--- libreoffice-4.3.1.2-orig/slideshow/source/engine/rehearsetimingsactivity.cxx	2014-08-26 14:07:49.000000000 +1000
+++ libreoffice-4.3.1.2/slideshow/source/engine/rehearsetimingsactivity.cxx	2014-09-20 15:09:49.274529920 +1000
+@@ -400,11 +400,12 @@
+     {
+         // new sprite pos, transformation might have changed:
+         maSpriteRectangle = calcSpriteRectangle( maViews.front().first );
+        ::basegfx::B2DPoint rectMin( maSpriteRectangle.getMinimum() );
+ 
+         // reposition sprites
+         for_each_sprite( boost::bind( &cppcanvas::Sprite::move,
+                                       _1,
+-                                      boost::cref(maSpriteRectangle.getMinimum())) );
+                                      boost::cref( rectMin )) );
+ 
+         // sprites changed, need screen update
+         mrScreenUpdater.notifyUpdate();
+--- libreoffice-4.3.1.2-orig/slideshow/source/engine/shapes/appletshape.cxx	2014-08-26 14:07:49.000000000 +1000
+++ libreoffice-4.3.1.2/slideshow/source/engine/shapes/appletshape.cxx	2014-09-20 15:09:49.275052955 +1000
+@@ -148,12 +148,13 @@
+         void AppletShape::implViewsChanged()
+         {
+             // resize all ViewShapes
+            ::basegfx::B2DRectangle bounds( AppletShape::getBounds() );
+             ::std::for_each( maViewAppletShapes.begin(),
+                              maViewAppletShapes.end(),
+                              ::boost::bind(
+                                  &ViewAppletShape::resize,
+                                  _1,
+-                                 ::boost::cref( AppletShape::getBounds())) );
+                                 ::boost::cref( bounds )) );
+         }
+ 
+ 
+@@ -252,11 +253,12 @@
+ 
+         bool AppletShape::implStartIntrinsicAnimation()
+         {
+            ::basegfx::B2DRectangle bounds( getBounds() );
+             ::std::for_each( maViewAppletShapes.begin(),
+                              maViewAppletShapes.end(),
+                              ::boost::bind( &ViewAppletShape::startApplet,
+                                             _1,
+-                                            ::boost::cref( getBounds() )));
+                                            ::boost::cref( bounds )));
+             mbIsPlaying = true;
+ 
+             return true;
+--- libreoffice-4.3.1.2-orig/slideshow/source/engine/shapes/drawshape.cxx	2014-08-26 14:07:49.000000000 +1000
+++ libreoffice-4.3.1.2/slideshow/source/engine/shapes/drawshape.cxx	2014-09-20 15:09:49.275701062 +1000
+@@ -168,6 +168,7 @@
+             }
+ 
+             // redraw all view shapes, by calling their update() method
+            ViewShape::RenderArgs renderArgs( getViewRenderArgs() );
+             if( ::std::count_if( maViewShapes.begin(),
+                                  maViewShapes.end(),
+                                  ::boost::bind<bool>(
+@@ -178,8 +179,7 @@
+                                                                              // the extra mem_fn. WTF.
+                                      _1,
+                                      ::boost::cref( mpCurrMtf ),
+-                                     ::boost::cref(
+-                                         getViewRenderArgs() ),
+                                     ::boost::cref( renderArgs ),
+                                      nUpdateFlags,
+                                      isVisible() ) )
+                 != static_cast<ViewShapeVector::difference_type>(maViewShapes.size()) )
+--- libreoffice-4.3.1.2-orig/slideshow/source/engine/shapes/mediashape.cxx	2014-08-26 14:07:49.000000000 +1000
+++ libreoffice-4.3.1.2/slideshow/source/engine/shapes/mediashape.cxx	2014-09-20 15:09:49.276133048 +1000
+@@ -125,12 +125,13 @@
+         void MediaShape::implViewsChanged()
+         {
+             // resize all ViewShapes
+            ::basegfx::B2DRectangle bounds( getBounds() );
+             ::std::for_each( maViewMediaShapes.begin(),
+                              maViewMediaShapes.end(),
+                              ::boost::bind(
+                                  &ViewMediaShape::resize,
+                                  _1,
+-                                 ::boost::cref( getBounds())) );
+                                 ::boost::cref( bounds )) );
+         }
+ 
+ 
+--- libreoffice-4.3.1.2-orig/slideshow/source/engine/unoviewcontainer.cxx	2014-08-26 14:07:49.000000000 +1000
+++ libreoffice-4.3.1.2/slideshow/source/engine/unoviewcontainer.cxx	2014-09-20 15:09:49.276489737 +1000
+@@ -45,11 +45,12 @@
+             const UnoViewVector::iterator aEnd( maViews.end() );
+ 
+             // already added?
+            uno::Reference<presentation::XSlideShowView> xView (rView->getUnoView());
+             if( ::std::find_if( maViews.begin(),
+                                 aEnd,
+                                 ::boost::bind(
+                                     ::std::equal_to< uno::Reference< presentation::XSlideShowView > >(),
+-                                    ::boost::cref( rView->getUnoView() ),
+                                    ::boost::cref( xView ),
+                                     ::boost::bind(
+                                         &UnoView::getUnoView,
+                                         _1 ) ) ) != aEnd )
--- a/app-office/libreoffice/libreoffice-4.3.4.1.ebuild
+++ b/app-office/libreoffice/libreoffice-4.3.4.1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.3.4.1.ebuild,v 1.3 2014/11/18 10:02:05 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.3.4.1.ebuild,v 1.4 2014/12/26 22:59:02 dilfridge Exp $

 EAPI=5

@ -246,6 +246,7 @@ PATCHES=(

 	# from master branch
 	"${FILESDIR}/${PN}-4.3.1.2-implement--with-system-coinmp.patch"
+	"${FILESDIR}/${PN}-4.3.4.1-boost-1.56.0.patch"                  # bug 522178
 )

 REQUIRED_USE="
--- a/app-office/libreoffice/libreoffice-4.3.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-4.3.9999.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.3.9999.ebuild,v 1.6 2014/11/18 10:02:05 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.3.9999.ebuild,v 1.7 2014/12/26 22:59:02 dilfridge Exp $

 EAPI=5

@ -246,6 +246,7 @@ PATCHES=(

 	# from master branch
 	"${FILESDIR}/${PN}-4.3.1.2-implement--with-system-coinmp.patch"
+	"${FILESDIR}/${PN}-4.3.4.1-boost-1.56.0.patch"                  # bug 522178
 )

 REQUIRED_USE="
--- a/app-portage/gpyutils/files/implementations.txt
+++ b/app-portage/gpyutils/files/implementations.txt
@ -11,7 +11,7 @@ python2_6	2.6	dead	2.6
 python2_7	2.7	current	2.7
 python3_0	3.0	dead	3.0
 python3_1	3.1	dead	3.1
-python3_2	3.2	old	3.2
+python3_2	3.2	dead	3.2
 python3_3	3.3	current	3.3
 python3_4		supported	3.4
 python3_5		future	3.5
@ -21,7 +21,7 @@ pypy1_9	2.7-pypy-1.9	dead	p1.9
 pypy2_0	2.7-pypy-2.0	dead	p2.0

 pypy		supported	pypy
-pypy3		future	pypy3
+pypy3		supported	pypy3

 jython2_5	2.5-jython	dead	j2.5
 jython2_7	2.7-jython	experimental	j2.7
--- a/app-text/evince/evince-3.14.1.ebuild
+++ b/app-text/evince/evince-3.14.1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/evince/evince-3.14.1.ebuild,v 1.1 2014/12/21 12:16:18 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/evince/evince-3.14.1.ebuild,v 1.2 2014/12/27 16:19:23 eva Exp $

 EAPI="5"
 GCONF_DEBUG="yes"
@ -55,12 +55,15 @@ RDEPEND="${COMMON_DEPEND}
 "
 DEPEND="${COMMON_DEPEND}
 	app-text/docbook-xml-dtd:4.3
+	app-text/yelp-tools
 	dev-util/gdbus-codegen
-	sys-devel/gettext
 	>=dev-util/gtk-doc-am-1.13
 	>=dev-util/intltool-0.35
+	sys-devel/gettext
 	virtual/pkgconfig
 "
+# eautoreconf needs:
+#  app-text/yelp-tools

 # Needs dogtail and pyspi from http://fedorahosted.org/dogtail/
 # Releases: http://people.redhat.com/zcerza/dogtail/releases/
--- a/app-text/libabw/Manifest
+++ b/app-text/libabw/Manifest
@ -1,2 +1,3 @@
 DIST libabw-0.0.2.tar.xz 307432 SHA256 d5cec855722e3c9caf451db2557aa8c81b279a562e67593477c58b02e948b594 SHA512 3c656fb7d3e2b4388ea33fbc380ffd01d03abefffa6089f21708b78da75cce71f95a067f05b389823ca3857b2ec14aae9371978062571aa74bf854c6948fcd82 WHIRLPOOL fb112e1a94b8983518ac3911215ea6f31091d922dfe4c3b80efbba747a71b100aa37aeb75753085d5cab15bb6b15541d401c0b55d29c85f716c972b1f3ff49fd
 DIST libabw-0.1.0.tar.xz 282268 SHA256 ee99b280b7af226a48fd9afd395cc10bef2d8e4f844151277e90793706dfc0c1 SHA512 209965359e1446862039c88c4199815583bbc4f63f3f0549f4261d3cb54ab0fb483480068d68a9bf9fe65fe6e3f9b0e05efe4cf8b9163efeadba129a70f93fd2 WHIRLPOOL 801eda0667c80b09f60e47c68fe759c3d245dd82d17b8d8dafe359c9bc96639dce44f18ab88dac92b338ca459dd8b69859aa795286c4fac4aab7a290213dfb22
+DIST libabw-0.1.1.tar.xz 287628 SHA256 cfc698c2dd4ab592138a941ae26e2e18c3dac69bc196b5167df7f5eb88fc217e SHA512 853dd86ecc79e8590d3163e05e145ad66240ae3cf12d206d021775a94bfb33d70aa5acdcdd193ac747baeae1ba0eed18099ea6f4515be23bdd70b431e96c4b1a WHIRLPOOL 4672c825279b20b1df92d52950eba6344d4ca99711f050069e35503b995f05fafe597706f6587d08409af3f59a64717da365e2e6101ce23665819f25ce4da9f7
--- a/app-text/libabw/files/libabw-0.1.1-dereference-before-null-check.patch
+++ b/app-text/libabw/files/libabw-0.1.1-dereference-before-null-check.patch
@ -0,0 +1,27 @@
+From: David Tardon <dtardon@redhat.com>
+Date: Sat, 20 Dec 2014 17:35:36 +0000 (+0100)
+Subject: coverity#1259904 dereference before null check
+X-Git-Url: https://gerrit.libreoffice.org/gitweb?p=libabw.git;a=commitdiff_plain;h=a65eb81c5e9d9da0548eb9066f9dde77a7328cc3
+
+coverity#1259904 dereference before null check
+
+Change-Id: If53074b31a821b0764acc9e9f1b0f9d7894e2e5e
+---
+
+diff --git a/src/lib/ABWParser.cpp b/src/lib/ABWParser.cpp
+index cf914bf..426ab54 100644
+--- a/src/lib/ABWParser.cpp
+++ b/src/lib/ABWParser.cpp
+@@ -338,9 +338,11 @@ void libabw::ABWParser::readAbiword(xmlTextReaderPtr reader)
+ void libabw::ABWParser::readM(xmlTextReaderPtr reader)
+ {
+   xmlChar *const key = xmlTextReaderGetAttribute(reader, BAD_CAST("key"));
+-  m_state->m_currentMetadataKey = reinterpret_cast<const char *>(key);
+   if (key)
+  {
+    m_state->m_currentMetadataKey = reinterpret_cast<const char *>(key);
+     xmlFree(key);
+  }
+ }
+ 
+ void libabw::ABWParser::readHistory(xmlTextReaderPtr reader)
--- a/app-text/libabw/files/libabw-0.1.1-do-not-let-AbiDocument_parse-throw.patch
+++ b/app-text/libabw/files/libabw-0.1.1-do-not-let-AbiDocument_parse-throw.patch
@ -0,0 +1,35 @@
+From: David Tardon <dtardon@redhat.com>
+Date: Sat, 20 Dec 2014 17:40:45 +0000 (+0100)
+Subject: coverity#1259905 do not let AbiDocument::parse throw
+X-Git-Url: https://gerrit.libreoffice.org/gitweb?p=libabw.git;a=commitdiff_plain;h=2f372e8adf8e6b1f8cf70f08adddcf66be54d94a
+
+coverity#1259905 do not let AbiDocument::parse throw
+
+This also fixes coverity#1259906 and coverity#1259907 .
+
+Change-Id: I55d892517ac93ca43478d51d8e4a20c704ff6790
+---
+
+diff --git a/src/lib/AbiDocument.cpp b/src/lib/AbiDocument.cpp
+index b8ab661..23ff750 100644
+--- a/src/lib/AbiDocument.cpp
+++ b/src/lib/AbiDocument.cpp
+@@ -110,7 +110,7 @@ is not protected
+ \return A value that indicates whether the conversion was successful and in case it
+ was not, it indicates the reason of the error
+ */
+-ABWAPI bool libabw::AbiDocument::parse(librevenge::RVNGInputStream *input, librevenge::RVNGTextInterface *textInterface)
+ABWAPI bool libabw::AbiDocument::parse(librevenge::RVNGInputStream *input, librevenge::RVNGTextInterface *textInterface) try
+ {
+   ABW_DEBUG_MSG(("AbiDocument::parse\n"));
+   if (!input)
+@@ -122,4 +122,9 @@ ABWAPI bool libabw::AbiDocument::parse(librevenge::RVNGInputStream *input, libre
+     return true;
+   return false;
+ }
+catch (...)
+{
+  return false;
+}
+
+ /* vim:set shiftwidth=2 softtabstop=2 expandtab: */
--- a/app-text/libabw/libabw-0.1.1.ebuild
+++ b/app-text/libabw/libabw-0.1.1.ebuild
@ -0,0 +1,47 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/libabw/libabw-0.1.1.ebuild,v 1.1 2014/12/27 15:12:21 dilfridge Exp $
+
+EAPI=5
+
+inherit base eutils
+
+DESCRIPTION="Library parsing abiword documents"
+HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/${PN}"
+SRC_URI="http://dev-www.libreoffice.org/src/${PN}/${P}.tar.xz"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="doc static-libs"
+
+RDEPEND="
+	dev-libs/librevenge
+	dev-libs/libxml2
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}
+	>=dev-libs/boost-1.46
+	sys-devel/libtool
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+
+PATCHES=(
+	# from git master
+	"${FILESDIR}/${PN}-0.1.1-dereference-before-null-check.patch"
+	"${FILESDIR}/${PN}-0.1.1-do-not-let-AbiDocument_parse-throw.patch"
+)
+
+src_configure() {
+	econf \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--disable-werror \
+		$(use_enable static-libs static) \
+		$(use_with doc docs)
+}
+
+src_install() {
+	default
+	prune_libtool_files --all
+}
--- a/app-text/libodfgen/Manifest
+++ b/app-text/libodfgen/Manifest
@ -1,2 +1,3 @@
 DIST libodfgen-0.0.4.tar.xz 296224 SHA256 8f7a46f05417afbe957d0c3f88e375631b8651ea99bb2c231595408bc4224099 SHA512 5d637139c30ce24e11f4ae102b3374c95afb66e6300ef6f45dd4c2957b36bc3c56da53d49b2b6c8ba9bbadc118dffeab11421b85a9ba47e1ccf101bc1cd75e1d WHIRLPOOL 3382383a1a6edbdc183fe649812ee0285294845fdc5c47a8329cadf2fe0374f20189a9e6db0fc166d096c85400466ed56dcc1709e6728fe6b0e1e5b4c3f8c468
 DIST libodfgen-0.1.1.tar.xz 325872 SHA256 9521e2c9aa13d84799ce476e97a6549eb9de4acd190cad357d87a540452d63dc SHA512 3c219c60f9a6be22667e8f34aa6bd48f4fd260bc3df6bcd9d2a5e66465d696415c67cd95da06d1acc18c26d1af663a8ac4fec782607d48b34a9b70ad45726454 WHIRLPOOL f11eeccf32373d700ca9025f9a445cb342a83f707509445eda5181b821ca3951d4f3e332e7867fe7eaec3c7404d432e88226566f399b1a51867901f3d9fd9779
+DIST libodfgen-0.1.2.tar.xz 335148 SHA256 edae50c2251a505179c618b306aebf517a4ed548032f18ace1b384a340a2c015 SHA512 bf17291e5642f0b90bde5b986ff2d7c385bc1d79ee14f2ccf6e6a409ef29cf51d9b8c9d293511c838f894e152f80e2e3fec0058ddf42735ff0c740e3afd8de11 WHIRLPOOL c54c979306bb5ad3eda0be37395d3d97f949a7205082e9d7ab53d3742af21fdb79fe11faa673a1da0c279dc8a4b5c3a7504da8f751c63518217e9a00ceb30e5b
--- a/app-text/libodfgen/libodfgen-0.1.2.ebuild
+++ b/app-text/libodfgen/libodfgen-0.1.2.ebuild
@ -0,0 +1,41 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/libodfgen/libodfgen-0.1.2.ebuild,v 1.1 2014/12/27 15:54:33 dilfridge Exp $
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="Library to generate ODF documents from libwpd and libwpg"
+HOMEPAGE="http://libwpd.sf.net"
+SRC_URI="mirror://sourceforge/libwpd/${P}.tar.xz"
+
+# git://git.code.sf.net/p/libwpd/libodfgen
+
+LICENSE="|| ( LGPL-2.1 MPL-2.0 )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc"
+
+RDEPEND="
+	dev-libs/librevenge
+"
+DEPEND="${RDEPEND}
+	>=dev-libs/boost-1.46
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+
+src_configure() {
+	econf \
+		--disable-static \
+		--disable-werror \
+		--with-sharedptr=boost \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		$(use_with doc docs)
+}
+
+src_install() {
+	default
+	prune_libtool_files --all
+}
--- a/dev-cpp/libcmis/Manifest
+++ b/dev-cpp/libcmis/Manifest
@ -1,3 +1,4 @@
 DIST libcmis-0.2.3.tar.gz 432064 SHA256 a4ace7c0280e5ee8d4941b33449ee10edf1515437483d55ae387cc4de2c2bea0 SHA512 f69ff4cb6a76d3622e235b0e07c55a762c96634255cedb105565ac40daf5bb2f0fb679bae90708719824a08a921dd34b7cf4fc90d0fb8019e36b5dea3230abb0 WHIRLPOOL 86fe8e16da3148f5a73f5c8be4d5fe3bb71ef2f74e888f0727d6836df24f6013289d5c1b0433ca3d06686419b1c0fad5e0fd0bcda78d714f68d2d2f78c01e83f
 DIST libcmis-0.3.1.tar.gz 524392 SHA256 f12e0fe8f5c3aef6faadd736bcf1a2c81ad91640dd98ceabf600f17a8fe5ef1a SHA512 532c30ea17fdc2c60bd5af3b6f17f132e74691e334014250dd32265f8ab2236cc6d6950ce1417a7e6e0a14f6a038a5032a2edb793882bf262ca18890353962b8 WHIRLPOOL 7c70fc994fa4d7934356d60a6cebfdcd8b724afbe78962f15ac6e62a72c7e682e79f43f1ca71d779f80fd708b842751363c09b5cfed8a1fb354ce5b966d47b8e
 DIST libcmis-0.4.1.tar.gz 637615 SHA256 7d52dcf2b5832d3663b18fbf40f0bdefb1e1a40cfb3cf01903301b0bf629395f SHA512 9898b05c345dcc62ffc4f995616f7fe9da34e6f395a4ccadc5cc005586726401593ad1d7df451c6a2756eb216b47bb2d709ac8a4df48546260bb70c762c0bc18 WHIRLPOOL c861930566fc9ff5adecfed4efbae31eb08598abc835b6113afea766f4d356d6ee82b7d523d4080ef728046455c3faf17c45b1592f6b5460a4fc1e6d96dbf27a
+DIST libcmis-0.5.0.tar.gz 738119 SHA256 a87e02913dee3ee659db5abf6d7dafcfcd85dd4b24bf4389d8d4afe8c8dcf9b6 SHA512 abfdf5654ef8763c9744587ba831acea93cc0ba7deaa8d807eed2e9077be848db0334430f7c2d6eecefeb90f520abbe81364a86790c0aa4363724816aec4793b WHIRLPOOL 03041a0eb4af8fb515082731c4737f7c153756073464785994c431f54b27130b8407459efb5bcb4a26689a0baa1f5014e48cfa334948fb7d90fe646d5f8f0a02
--- a/dev-cpp/libcmis/libcmis-0.5.0.ebuild
+++ b/dev-cpp/libcmis/libcmis-0.5.0.ebuild
@ -0,0 +1,71 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libcmis/libcmis-0.5.0.ebuild,v 1.1 2014/12/27 16:26:20 dilfridge Exp $
+
+EAPI=5
+
+EGIT_REPO_URI="git://git.code.sf.net/p/libcmis/code"
+[[ ${PV} == 9999 ]] && SCM_ECLASS="git-r3"
+inherit eutils alternatives autotools ${SCM_ECLASS}
+unset SCM_ECLASS
+
+DESCRIPTION="C++ client library for the CMIS interface"
+HOMEPAGE="https://sourceforge.net/projects/libcmis/"
+[[ ${PV} == 9999 ]] || SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="|| ( GPL-2 LGPL-2 MPL-1.1 )"
+SLOT="0.5"
+
+# Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
+[[ ${PV} == 9999 ]] || \
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="" 
+# ^ since this is only needed for live libreoffice
+
+IUSE="static-libs man test"
+
+RDEPEND="
+	!dev-cpp/libcmis:0
+	dev-libs/boost:=
+	dev-libs/libxml2
+	net-misc/curl
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	man? (
+		app-text/docbook2X
+		dev-libs/libxslt
+	)
+	test? (
+		dev-util/cppcheck
+		dev-util/cppunit
+	)
+"
+
+src_prepare() {
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
+src_configure() {
+	econf \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		--program-suffix=-${SLOT} \
+		--disable-werror \
+		$(use_with man) \
+		$(use_enable static-libs static) \
+		$(use_enable test tests) \
+		--enable-client
+}
+
+src_install() {
+	default
+	prune_libtool_files --all
+}
+
+pkg_postinst() {
+	alternatives_auto_makesym /usr/bin/cmis-client "/usr/bin/cmis-client-[0-9].[0-9]"
+}
+
+pkg_postrm() {
+	alternatives_auto_makesym /usr/bin/cmis-client "/usr/bin/cmis-client-[0-9].[0-9]"
+}
--- a/dev-cpp/libcmis/libcmis-9999.ebuild
+++ b/dev-cpp/libcmis/libcmis-9999.ebuild
@ -1,11 +1,11 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libcmis/libcmis-9999.ebuild,v 1.12 2013/08/09 08:51:25 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libcmis/libcmis-9999.ebuild,v 1.13 2014/12/27 16:26:20 dilfridge Exp $

 EAPI=5

-EGIT_REPO_URI="git://gitorious.org/libcmis/libcmis.git"
-[[ ${PV} == 9999 ]] && SCM_ECLASS="git-2"
+EGIT_REPO_URI="git://git.code.sf.net/p/libcmis/code"
+[[ ${PV} == 9999 ]] && SCM_ECLASS="git-r3"
 inherit eutils alternatives autotools ${SCM_ECLASS}
 unset SCM_ECLASS

@ -14,7 +14,7 @@ HOMEPAGE="https://sourceforge.net/projects/libcmis/"
 [[ ${PV} == 9999 ]] || SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"

 LICENSE="|| ( GPL-2 LGPL-2 MPL-1.1 )"
-SLOT="0.4"
+SLOT="0.5"

 # Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
 [[ ${PV} == 9999 ]] || \
@ -34,7 +34,10 @@ DEPEND="${RDEPEND}
 		app-text/docbook2X
 		dev-libs/libxslt
 	)
-	test? ( dev-util/cppunit )
+	test? (
+		dev-util/cppcheck
+		dev-util/cppunit
+	)
 "

 src_prepare() {
@ -49,7 +52,6 @@ src_configure() {
 		$(use_with man) \
 		$(use_enable static-libs static) \
 		$(use_enable test tests) \
-		--disable-long-tests \
 		--enable-client
 }

--- a/dev-haskell/silently/silently-1.2.4.1-r1.ebuild
+++ b/dev-haskell/silently/silently-1.2.4.1-r1.ebuild
@ -0,0 +1,26 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/silently/silently-1.2.4.1-r1.ebuild,v 1.1 2014/12/27 11:08:45 slyfox Exp $
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.4.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Prevent or capture writing to stdout and other handles"
+HOMEPAGE="https://github.com/trystan/silently"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+	test? ( dev-haskell/nanospec )
+"
--- a/dev-haskell/uuid/Manifest
+++ b/dev-haskell/uuid/Manifest
@ -1,5 +1,2 @@
-DIST uuid-1.2.13.tar.gz 13570 SHA256 1af05fce9c2e3b2c6074f38e3dedf43abea9cf788270fab2df75a98d63383979 SHA512 7640ae3e52865808d47869395da8f2ff83be3d5786abad3fd24984c1ca0e5afd94b8a6de904a88e3033e95d5ad1133a18259d8a6bd44b66f783f1e4c241a7164 WHIRLPOOL c2214e81445080434ebb35d12bca02e88d60697ae5257bbf44cc8be9816a3b3cae65f6c584aa07fd7f1f77d8b681a1096aa26baa9e08f4f0eb8716b3f5eab2da
-DIST uuid-1.2.14.tar.gz 13648 SHA256 9edbb65374c2af2f8eab57915cd48fe91fd15299891fefb88141dab4e0f7228f SHA512 a400d3b52cb3c364a1a925ee776457047839ef8256eed22bc48710b0377fbfc6fb66ddea08624449b7566a5eb1623ed6bc9048836f8259f150cdb6a94682d4c0 WHIRLPOOL b1738235799ce359f484e20604517d28347ed0ebd46ebbbd85fa4b668374ca89878c9c04b4fc39f1d5b95c64127745d18d9de45b945e1737f0aa4a4c2e0270ec
-DIST uuid-1.3.3.tar.gz 17303 SHA256 15204a7399ce8d06743c9e20a554f0dbad36e70d848fcd34e70b5f9bebd54e8b SHA512 de60f5d4b150be8c13e26f6dbe8e35c25cad799f3b3bfdfdf80e6dcacc241eec845cae211da8e0b1e0be37245cb97ca65e3a3ed2482a1112eb66a3b7edb0c45c WHIRLPOOL 83521660b382590543d648e071863cad586c41b664cf273ce8c58cf3d2c6325fc5ed052e798a8415def3ad212b88f5278c1dbc188c49751573d79d499f1fee74
-DIST uuid-1.3.5.tar.gz 17349 SHA256 098bb14920900eefcbd20bacb12da2ef04136cdbb81026888a6536855d5274dd SHA512 bbefcc66e26a143c48b6f85ba7abe74653ef0bb05a034851ee44d1f31f8ef0d7418a8462f68892a9573b79793603b4461ce494b36f8122b02d57fb8a11ae9524 WHIRLPOOL caae951dde1c96d226fba009adf26739ab583ef2065698c73162809313d4709ef3d3fbdd936a79530c4274888b22febe936613dd7862b9dd77ec93b989a28ddc
 DIST uuid-1.3.7.tar.gz 17364 SHA256 41a816103a34474114fcd6ff0cb2e8a4c369fe5d4039fba6439fd5b653742d06 SHA512 49ddb991fa67347385ba30c2907f12238db8ba630dcb93d5fcd4b3ef132892c601d6cf9303c053a7a3416a9a834d8b4cb4462248760697d7050e03d8aee59ba9 WHIRLPOOL 9a705e99cd05ebbdcccd4ba011d3e3daafc5930a007d89cd7e78759e6f82d2e4229bec986d78ae13f504d28fe4a44bde0b8377a90e515ea4e31403d7990731f5
+DIST uuid-1.3.8.tar.gz 17791 SHA256 668541762d32cc69d5d8bd72535a81553154c8aafda61cc4c1d0d32ece31f81c SHA512 3ef0f97c629fceed453fb7b779f6177ce2b7f1890a666b29d71d1621d479863640e70e228b7ad568384234089aeed98053f481e487107d2f52d938ce776cdda0 WHIRLPOOL 5ea1f02890fa945eed553f1a675e4a0091885e2a4731454dace47d946b422cfa9b1f0ca829ba326ee0beb80e4167ba8b0855e1cf3eb2f1c70eb88769d27706c1
--- a/dev-haskell/uuid/uuid-1.2.13.ebuild
+++ b/dev-haskell/uuid/uuid-1.2.13.ebuild
@ -1,40 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/uuid/uuid-1.2.13.ebuild,v 1.1 2013/08/26 13:55:15 qnikst Exp $
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="For creating, comparing, parsing and printing Universally Unique Identifiers"
-HOMEPAGE="http://projects.haskell.org/uuid/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/binary-0.4:=[profile?]
-		<dev-haskell/binary-0.8:=[profile?]
-		>=dev-haskell/cryptohash-0.7:=[profile?]
-		<dev-haskell/cryptohash-0.10:=[profile?]
-		>=dev-haskell/maccatcher-1.0:=[profile?]
-		<dev-haskell/maccatcher-2.2:=[profile?]
-		>=dev-haskell/random-1.0.1:=[profile?]
-		<dev-haskell/random-1.1:=[profile?]
-		>=dev-lang/ghc-6.12.1:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.8
-		test? ( >=dev-haskell/criterion-0.4
-			<dev-haskell/criterion-0.9
-			>=dev-haskell/deepseq-1.1
-			<dev-haskell/deepseq-1.4
-			=dev-haskell/hunit-1.2*
-			dev-haskell/mersenne-random-pure64
-			>=dev-haskell/quickcheck-2.4
-			<dev-haskell/quickcheck-2.7
-		)"
--- a/dev-haskell/uuid/uuid-1.2.14.ebuild
+++ b/dev-haskell/uuid/uuid-1.2.14.ebuild
@ -1,37 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/uuid/uuid-1.2.14.ebuild,v 1.1 2013/09/13 11:22:54 gienah Exp $
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="For creating, comparing, parsing and printing Universally Unique Identifiers"
-HOMEPAGE="http://projects.haskell.org/uuid/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/binary-0.4:=[profile?] <dev-haskell/binary-0.8:=[profile?]
-	>=dev-haskell/cryptohash-0.7:=[profile?] <dev-haskell/cryptohash-0.11:=[profile?]
-	>=dev-haskell/maccatcher-1.0:=[profile?] <dev-haskell/maccatcher-2.2:=[profile?]
-	>=dev-haskell/random-1.0.1:=[profile?] <dev-haskell/random-1.1:=[profile?]
-	>=dev-lang/ghc-6.12.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8.0.2
-	test? ( >=dev-haskell/criterion-0.4 <dev-haskell/criterion-0.9
-		>=dev-haskell/deepseq-1.1 <dev-haskell/deepseq-1.4
-		>=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.3
-		dev-haskell/mersenne-random-pure64
-		>=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.7
-		>=dev-haskell/test-framework-0.8 <dev-haskell/test-framework-0.9
-		>=dev-haskell/test-framework-hunit-0.3 <dev-haskell/test-framework-hunit-0.4
-		>=dev-haskell/test-framework-quickcheck2-0.3 <dev-haskell/test-framework-quickcheck2-0.4 )
-"
--- a/dev-haskell/uuid/uuid-1.3.3-r1.ebuild
+++ b/dev-haskell/uuid/uuid-1.3.3-r1.ebuild
@ -1,36 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/uuid/uuid-1.3.3-r1.ebuild,v 1.1 2013/12/11 06:37:27 gienah Exp $
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="For creating, comparing, parsing and printing Universally Unique Identifiers"
-HOMEPAGE="http://projects.haskell.org/uuid/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/binary-0.4:=[profile?] <dev-haskell/binary-0.8:=[profile?]
-	>=dev-haskell/cryptohash-0.7:=[profile?] <dev-haskell/cryptohash-0.12:=[profile?]
-	>=dev-haskell/network-info-0.2:=[profile?] <dev-haskell/network-info-0.3:=[profile?]
-	>=dev-haskell/random-1.0.1:=[profile?] <dev-haskell/random-1.1:=[profile?]
-	>=dev-lang/ghc-6.12.1:=
-	|| ( ( >=dev-haskell/hashable-1.1.1.0:=[profile?] <dev-haskell/hashable-1.2.0:=[profile?] )
-		( >=dev-haskell/hashable-1.2.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?] ) )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8.0.2
-	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.3
-		>=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.7
-		>=dev-haskell/test-framework-0.8 <dev-haskell/test-framework-0.9
-		>=dev-haskell/test-framework-hunit-0.3 <dev-haskell/test-framework-hunit-0.4
-		>=dev-haskell/test-framework-quickcheck2-0.3 <dev-haskell/test-framework-quickcheck2-0.4 )
-"
--- a/dev-haskell/uuid/uuid-1.3.3-r2.ebuild
+++ b/dev-haskell/uuid/uuid-1.3.3-r2.ebuild
@ -1,41 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/uuid/uuid-1.3.3-r2.ebuild,v 1.1 2014/07/02 14:17:19 gienah Exp $
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="For creating, comparing, parsing and printing Universally Unique Identifiers"
-HOMEPAGE="http://projects.haskell.org/uuid/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/binary-0.4:=[profile?] <dev-haskell/binary-0.8:=[profile?]
-	>=dev-haskell/cryptohash-0.7:=[profile?] <dev-haskell/cryptohash-0.12:=[profile?]
-	>=dev-haskell/network-info-0.2:=[profile?] <dev-haskell/network-info-0.3:=[profile?]
-	>=dev-haskell/random-1.0.1:=[profile?] <dev-haskell/random-1.1:=[profile?]
-	>=dev-lang/ghc-6.12.1:=
-	|| ( ( >=dev-haskell/hashable-1.1.1.0:=[profile?] <dev-haskell/hashable-1.2.0:=[profile?] )
-		( >=dev-haskell/hashable-1.2.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?] ) )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8.0.2
-	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.3
-		>=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.8
-		>=dev-haskell/test-framework-0.8 <dev-haskell/test-framework-0.9
-		>=dev-haskell/test-framework-hunit-0.3 <dev-haskell/test-framework-hunit-0.4
-		>=dev-haskell/test-framework-quickcheck2-0.3 <dev-haskell/test-framework-quickcheck2-0.4 )
-"
-
-src_prepare() {
-	cabal_chdeps \
-		'QuickCheck >=2.4 && < 2.7' 'QuickCheck >=2.4 && < 2.8'
-}
--- a/dev-haskell/uuid/uuid-1.3.8.ebuild
+++ b/dev-haskell/uuid/uuid-1.3.8.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/uuid/uuid-1.3.5.ebuild,v 1.1 2014/12/14 06:45:13 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/uuid/uuid-1.3.8.ebuild,v 1.1 2014/12/27 11:04:53 slyfox Exp $

 EAPI=5

@ -10,7 +10,7 @@ CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal

 DESCRIPTION="For creating, comparing, parsing and printing Universally Unique Identifiers"
-HOMEPAGE="http://projects.haskell.org/uuid/"
+HOMEPAGE="https://github.com/aslatter/uuid"
 SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"

 LICENSE="BSD"
--- a/dev-lang/ghc/Manifest
+++ b/dev-lang/ghc/Manifest
@ -55,6 +55,7 @@ DIST ghc-bin-7.6.3-r1-sparc.tbz2 121641337 SHA256 0fb31b9584c1c6caafb44a51158bfd
 DIST ghc-bin-7.6.3-x86.tbz2 93718672 SHA256 a55024f66a048437fcd6ef0f33cdb994a43628998a2f0fe4d094cc9ba83d1615 SHA512 624f2a3238dee15853018d45632d1363e42d34099a77e5e9ce5c8da976cb4c33578144f7c39dbf25ee68c17d8d42910db2347186849eeeda6bc20053ce2be990 WHIRLPOOL bc646fc19906b59416358fb7558b6e2c3f7ad069c2fcf443be36b621894cfcecb0844acf5b5f9c383e034dfff3e24d312a7da0d7a629836134ec5dc1ecd6f139
 DIST ghc-bin-7.8.3-amd64.tbz2 100786052 SHA256 af49f547336a4f9f13cd625155d5a6a998e52ae7da8bbbddc856f88b00b6aff4 SHA512 b1826095b67fa2028678057f70909bff4e082b82f3b70f1aedbc91073efad54334fa1864bc8248c9249eec6edab3671dc38ac1650be86f1245e2fecf92528952 WHIRLPOOL 5b44fff77a0d79c6f7c5c8ca792eb6b36987d1de58d5ebc0a9b05da9c19a2c312eca6b9d40e7e63437742b7f9c28c925feb3bea7f9803dda95fac7acaa7a3132
 DIST ghc-bin-7.8.3-x86.tbz2 102583755 SHA256 c67f0d2471e594b4fdfc5b219bb6b61e57e6ba75132aa3f63d171550af8cbe3c SHA512 badabbba2f46b5ab3a2601e53997ce6533162afeec7dc36eeb877a62680a9f599aeb05dd3682f45d3e273d71d28b8bd01eee37dcad3c7354e8f83b7be4e58536 WHIRLPOOL 7b99b6bbeb4ad6d203f270d8446285825ad0857a8ab058d8c126155b49e8819e0efc2f6c42b5ff775dc0ece5488e97fcc7ae2459fe87fdceef43d63a75443430
+DIST ghc-bin-7.8.4-alpha.tbz2 210691009 SHA256 23c9e5ef97b444fa87d3b9509a7b2b7b68c526ca4139739dd60c08fb1279d48a SHA512 f08230de82f0c4112da9d0b48227ca74d5d0b4a84046d746b023557b7aeeb9678f5ac037fe89a863178df4b9036e5c5c63182d14dfbb42c772011de883e3966f WHIRLPOOL d624b4d5eac8aa68f389b81e68d7fa2ea960c9b9c5fabb27ddf4da5140c18fd0ee9080725fb645e2c532bb0a01ade32da2cf6aac08707f9d89a94ea9752b8e72
 DIST ghc-bin-7.8.4-amd64.tbz2 100573133 SHA256 bd9d144c08caa0ff345ada8d7eed7592531b8f8b9ef2f94d0b9a42fd747440aa SHA512 e4416d6dae3c644f74bafb3aecf1a123f985427aba32d0e0c43143a137d64a9220fc5947cd9bde8a3bc44555ae71184fc06a3f7df7976aadd065ad5681b90954 WHIRLPOOL ab0bd6219d68e08cb473cf2f3f15538d65940f28e84f026361032c3a6bc09f7820faf67629e915f27c2afda7de41fa9c6010a1b5cd487df0936d968c7e58a3a4
 DIST ghc-bin-7.8.4-ppc.tbz2 112803496 SHA256 a47e0fb17137878af1e7b5a166046bee20d456d49da6ba8cde990173f4b3be8d SHA512 9581f55a088e53edcc969960e45c9ad7227d71198ce2d241a4a066a138450a879287e55e7d2210e86143670539711387e36c7f60660c4422dc1b4122278fe4a0 WHIRLPOOL 4904414cbfafdb48f0539b071fe80568da74beb174948ee426da5c22acf1d0c35ade89d2e160ddd109d2fbc0a508459a8e249f3b732b88735070b9522b417108
 DIST ghc-bin-7.8.4-ppc64.tbz2 129284515 SHA256 1e8a350af39d1db1e58a74c9bc4a4c57765eceb33e5b32751fb31340b9ff02ff SHA512 53974e15c26cf6b62d8f838607abd209ec57cf0f45fcc48b90ad62736f5e4e7ff263dcd326ae03d8d5557a22eb9730e5eb8ae4eda55e52dd3d973bc73c84935e WHIRLPOOL adaaa92323d319f6576423ac41678f7d263f36e0e30d89fc14ee89104b006772c26d7b408be7f85225d1bddaf5f15ebdcbb7136f5c8bf7bda4bb0938eefbe6c2
--- a/dev-lang/ghc/ghc-7.8.4.ebuild
+++ b/dev-lang/ghc/ghc-7.8.4.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-7.8.4.ebuild,v 1.2 2014/12/26 09:42:23 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-7.8.4.ebuild,v 1.3 2014/12/26 23:35:44 slyfox Exp $

 EAPI=5

@ -25,7 +25,7 @@ HOMEPAGE="http://www.haskell.org/ghc/"
 arch_binaries=""

 # sorted!
-#arch_binaries="$arch_binaries alpha? ( http://code.haskell.org/~slyfox/ghc-alpha/ghc-bin-${PV}-alpha.tbz2 )"
+arch_binaries="$arch_binaries alpha? ( http://code.haskell.org/~slyfox/ghc-alpha/ghc-bin-${PV}-alpha.tbz2 )"
 #arch_binaries="$arch_binaries arm? ( http://code.haskell.org/~slyfox/ghc-arm/ghc-bin-${PV}-arm.tbz2 )"
 arch_binaries="$arch_binaries amd64? ( http://code.haskell.org/~slyfox/ghc-amd64/ghc-bin-${PV}-amd64.tbz2 )"
 #arch_binaries="$arch_binaries ia64?  ( http://code.haskell.org/~slyfox/ghc-ia64/ghc-bin-${PV}-ia64-fixed-fiw.tbz2 )"
@ -40,7 +40,7 @@ arch_binaries="$arch_binaries x86? ( http://code.haskell.org/~slyfox/ghc-x86/ghc
 # 0 - yet
 yet_binary() {
 	case "${ARCH}" in
-		#alpha) return 0 ;;
+		alpha) return 0 ;;
 		#arm)
 		#	ewarn "ARM binary is built on armv5tel-eabi toolchain. Use with caution."
 		#	return 0
@ -65,7 +65,7 @@ S="${WORKDIR}"/${GHC_P}
 [[ -n $arch_binaries ]] && SRC_URI+=" !ghcbootstrap? ( $arch_binaries )"
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc ghcbootstrap ghcmakebinary +gmp"
 IUSE+=" binary"
 IUSE+=" elibc_glibc" # system stuff
--- a/dev-libs/beecrypt/beecrypt-4.2.1-r2.ebuild
+++ b/dev-libs/beecrypt/beecrypt-4.2.1-r2.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/beecrypt/beecrypt-4.2.1-r2.ebuild,v 1.1 2014/12/26 18:57:12 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/beecrypt/beecrypt-4.2.1-r2.ebuild,v 1.2 2014/12/26 20:45:10 mgorny Exp $

 EAPI=5

@ -77,7 +77,7 @@ src_test() {

 src_install() {
 	default
-	rm -f "${D%/}$(python_get_sitedir)"/_bc.*a
+	use python && rm -f "${D%/}$(python_get_sitedir)"/_bc.*a

 	use static-libs || find "${ED}" -name '*.la' -delete

--- a/dev-libs/liblinear/liblinear-196-r1.ebuild
+++ b/dev-libs/liblinear/liblinear-196-r1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/liblinear/liblinear-196-r1.ebuild,v 1.2 2014/12/02 15:08:14 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/liblinear/liblinear-196-r1.ebuild,v 1.3 2014/12/27 11:10:42 jer Exp $

 EAPI=5
 inherit multilib toolchain-funcs
@ -11,7 +11,7 @@ SRC_URI="https://github.com/cjlin1/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"

 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"

 src_prepare() {
 	sed -i \
--- a/dev-libs/librevenge/Manifest
+++ b/dev-libs/librevenge/Manifest
@ -1 +1,2 @@
 DIST librevenge-0.0.1.tar.xz 390796 SHA256 0cb22773dd1b268f71b291fba0e27127853e8e55ac6ec0fcf5370487d7eeee7d SHA512 65cc0e089a24e291700cca4a3f4d390d4646a1d6d847c060c068d53b525b7c69f0d870d2cafaf4d2f52cc102608e5a26c8883a455d031841e03cfbd32051e422 WHIRLPOOL d0645652b4f7834e5f14ccc24ba567d1fcf036183185c5b00e64615fce303ac5f9137b729ebf62615390ad8a482205b545158b4cdb9ffdedc8b429d57ded5a78
+DIST librevenge-0.0.2.tar.xz 396628 SHA256 f6f280c4345546aad16aeafd5cf2e4a4ac31a81606171755465bba0d96efcf0f SHA512 28e53aefdfe8585ef148781e53379a986b5becb459a27dffe8546341e7ada6a3323bc27ab3170227a532e796869b634ad0443324af72b16835a4287a64994637 WHIRLPOOL 648006d5024370e31e8b1bc2db4a7182572aa1ff5c4473754c02cbd33f30c51361fd4b6e6cd450aa40d08372eddd136c140cc7cac53e29188593b146fb55f121
--- a/dev-libs/librevenge/librevenge-0.0.2.ebuild
+++ b/dev-libs/librevenge/librevenge-0.0.2.ebuild
@ -0,0 +1,49 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/librevenge/librevenge-0.0.2.ebuild,v 1.1 2014/12/27 16:11:14 dilfridge Exp $
+
+EAPI="5"
+
+inherit eutils multilib-minimal
+
+DESCRIPTION="A helper library for REVerse ENGineered formats filters"
+HOMEPAGE="http://sf.net/p/libwpd/librevenge"
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://git.code.sf.net/p/libwpd/librevenge"
+	inherit git-r3 autotools
+	KEYWORDS=""
+else
+	SRC_URI="http://sf.net/projects/libwpd/files/${PN}/${P}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~x86 ~x86-fbsd"
+fi
+
+LICENSE="|| ( MPL-2.0 LGPL-2.1 )"
+SLOT="0"
+IUSE="doc test"
+
+RDEPEND="
+	dev-libs/boost:=
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )
+	test? ( dev-util/cppunit[${MULTILIB_USEDEP}] )
+"
+
+src_prepare() {
+	[[ ${PV} = 9999 ]] && eautoreconf
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} \
+	econf \
+		--disable-static \
+		--disable-werror \
+		$(use_with doc docs) \
+		$(use_enable test tests) \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}"
+}
+
+multilib_src_install_all() {
+	prune_libtool_files --all
+}
--- a/dev-libs/librevenge/librevenge-9999.ebuild
+++ b/dev-libs/librevenge/librevenge-9999.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/librevenge/librevenge-9999.ebuild,v 1.3 2014/08/17 07:33:59 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/librevenge/librevenge-9999.ebuild,v 1.4 2014/12/27 16:11:14 dilfridge Exp $

 EAPI="5"

@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]] ; then
 	KEYWORDS=""
 else
 	SRC_URI="http://sf.net/projects/libwpd/files/${PN}/${P}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~x86 ~x86-fbsd"
 fi

 LICENSE="|| ( MPL-2.0 LGPL-2.1 )"
--- a/dev-python/hachoir-regex/hachoir-regex-1.0.5-r1.ebuild
+++ b/dev-python/hachoir-regex/hachoir-regex-1.0.5-r1.ebuild
@ -0,0 +1,31 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/hachoir-regex/hachoir-regex-1.0.5-r1.ebuild,v 1.1 2014/12/27 14:18:02 mgorny Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Manipulation of regular expressions (regex)"
+HOMEPAGE="http://bitbucket.org/haypo/hachoir/wiki/hachoir-regex http://pypi.python.org/pypi/hachoir-regex"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
+
+python_configure_all() {
+	mydistutilsargs=(
+		--setuptools
+	)
+}
+
+python_test() {
+	"${PYTHON}" test_doc.py || die "Tests fail with ${EPYTHON}"
+}
--- a/dev-python/sip/Manifest
+++ b/dev-python/sip/Manifest
@ -1,3 +1,3 @@
 DIST sip-4.15.3.tar.gz 773818 SHA256 46f245252866dbdb7fb5aca194bda991cc84ba8090d5e864765ee7e511a053d4 SHA512 495522aa2a553099c02ab4f7ce7485d24267e5093398f5f20e7102542153084486b6e654564ee716634a257301dd094a08754cdc40282cd2e4496e52619bc138 WHIRLPOOL 3192e9f15420409905faaa155939829b24da8bd5e1467ca908857ba293416e114d31f4374bb54659f285ed693cd51074c249221e0063b4d916326e7724e8e9f0
 DIST sip-4.16.2.tar.gz 793663 SHA256 a55a2324a46ab42e42ae57c52ef06583b17d25c987973fe2e7ff2e8a649294ce SHA512 07ced0188bd4dc897ddacbce226b33ac9d236455a95018e900fd5f652439c905ddd56688f8bb29f704fcf201a8e668d5cc89ba887065826653087cf0a9f6dbfb WHIRLPOOL 47c741f1b787ba147e7a299e3c93a7537f14f1b192726e39f3679d0b0e0a991df603509c5674f262311259d9ad2e1e845746d215d5ef70eb7b827c1557eb8b82
-DIST sip-4.16.4.tar.gz 794997 SHA256 ceda443fc5e129e67a067e2cd7b73ff037f8b10b50e407baa2b1d9f2199d57f5 SHA512 0c17222f9c54feca87c4d4a237a06a2b792a16990d80de511a90a762eed683f22326492bc437b1942ebd2db80816668a094b199fa5cfbcc6e70717842bba4e14 WHIRLPOOL 3a1685671721494721784e19355472345251271bd728ca51a03990ff99b262728aa14057aac4eb3390c546940726794b5797be2ce31c15eba0e0caa965a90fa6
+DIST sip-4.16.5.tar.gz 859672 SHA256 a00ba34c30bedc0f61916eb10bd12867b4754910a766647e3e58f88bd00f1e87 SHA512 730578deb289ee94dab4d333e331de8ef68319758e4351e37605a43932c1e4db28de727a76f7a9e9ef610b7287f4eea155765a16dbdb61ac220c371d739a6f99 WHIRLPOOL 009b6a3d93d2b934998ae74209cf9667fd7f9db39b400328f6f577d3b910fd9e568d038402bf837bdfb2c0f4c5258f79da0636146521c846cd565989671369f5
--- a/dev-python/sip/sip-4.16.5.ebuild
+++ b/dev-python/sip/sip-4.16.5.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/sip-4.16.4.ebuild,v 1.1 2014/10/31 01:51:39 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/sip-4.16.5.ebuild,v 1.1 2014/12/26 22:28:12 pesa Exp $

 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
@ -64,15 +64,13 @@ src_prepare() {
 		eerror
 		die "sub-slot sanity check failed"
 	fi
-
-	# TODO: switch to out-of-source build when upstream fixes it
-	python_copy_sources
 }

 src_configure() {
 	configuration() {
 		local myconf=(
-			"${PYTHON}" configure.py
+			"${PYTHON}"
+			"${S}"/configure.py
 			--destdir="$(python_get_sitedir)"
 			--incdir="$(python_get_includedir)"
 			$(use debug && echo --debug)
@ -91,7 +89,7 @@ src_configure() {
 			STRIP=
 		)
 		echo "${myconf[@]}"
-		"${myconf[@]}"
+		"${myconf[@]}" || die
 	}
 	python_foreach_impl run_in_build_dir configuration
 }
@ -107,6 +105,6 @@ src_install() {
 	}
 	python_foreach_impl run_in_build_dir installation

-	dodoc NEWS
+	dodoc ChangeLog NEWS
 	use doc && dodoc -r doc/html
 }
--- a/dev-python/urllib3/Manifest
+++ b/dev-python/urllib3/Manifest
@ -1,3 +1,2 @@
-DIST urllib3-1.8.3.tar.gz 85466 SHA256 4b162cffb6c7dde47b47ecee741f8a00953512541241e61d0f8292107a865426 SHA512 f60b9a20ba4d6c4cc11cb2bfca7278fee24cd8a4c528207dd95694ca44052878ecb147a85f335ed54854116fb1d9d7830da41e90032627a4c3d9f55c87fde553 WHIRLPOOL c4deebebdd8f25efc049d635e5705415d3ce47bf3da557816c43732fe607e0f7fe941806e3b81257376d22fdcd01d935938ef7ae46c3d56d84222e3d2e8035bc
+DIST urllib3-1.10.tar.gz 128200 SHA256 25b4a7fbbd9112e0190f31f8877aa0523caeab8630872ad1bbddaba01cdd6599 SHA512 32f9162f82a676146fae6bba462d21eb81635d8660ca4676b5e8dd3d18b68525a265695c646f06c099a78c24d9b108f0610d3e17f20578d473771bebd42cc52d WHIRLPOOL a8a84b79fd0edeecdd19eaef0ee809d1c5d842ff6bcf089df9a1111744a2f42bec1a366b76b6e7334a51cad83d42b166f133a4156bbbfb7be24518353ee71081
 DIST urllib3-1.9.1.tar.gz 171086 SHA256 d858379ef5988d4534bb8909432d697422100aaff272299d661339836b6dae9b SHA512 c972e4dc9dabf6378da75e0abce5e53bec29624f2dc0faff3c8ce762474d490da6aec7d2e374c57d0d18e640311845750eb257fc7829ac9d25a3d9c957c59c6f WHIRLPOOL 666b82e712939b3ff5dfe109ba0498c16dbea7f2c0f0c2e1c317cf7e6f03711ce4a9468bb72327abe7821aa75c0257d30dbce5c196ba59215df3dba4084c7360
-DIST urllib3-1.9.tar.gz 91865 SHA256 4e400b2e2f53652dd0d8062ca5ecc425b6af6e96989b8d31f5dd875186aa247b SHA512 7a0be91d448c7983f92fb7255a9fed20c406de85748274f056c7e54f0d87930891d7825ffc0c885e828a75bb53cccd2dbdbe40a04dab81a36001aad776dab9e0 WHIRLPOOL 3ac0085e941047ada63258c7e7306980d0537cfe46fcf94870ed0f71b417b7116e1d9d9dc62ce689eecb6a93fd59d69b5de25e13db3ced8348d062e6837750bc
--- a/dev-python/urllib3/urllib3-1.10.ebuild
+++ b/dev-python/urllib3/urllib3-1.10.ebuild
@ -0,0 +1,68 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/urllib3/urllib3-1.10.ebuild,v 1.1 2014/12/27 03:17:59 idella4 Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="HTTP library with thread-safe connection pooling, file post, and more"
+HOMEPAGE="https://github.com/shazow/urllib3"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+IUSE="doc test"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep \
+		'dev-python/backports-ssl-match-hostname[${PYTHON_USEDEP}]' python2_7 pypy)"
+DEPEND="test? (
+		${RDEPEND}
+		~www-servers/tornado-3.1.1[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy)
+		dev-python/nose[${PYTHON_USEDEP}]
+	)"
+
+python_prepare_all() {
+	# Replace bundled copy of dev-python/six
+	cat > urllib3/packages/six.py <<-EOF
+		from __future__ import absolute_import
+		from six import *
+	EOF
+
+	sed -i 's:cover-min-percentage = 100::' setup.cfg || die
+	# Fix tests
+	sed -i 's/urllib3.packages.six/six/' test/test_retry.py || die
+
+	# Reset source of objects.inv
+	if use doc; then
+		local PYTHON_DOC_ATOM=$(best_version --host-root dev-python/python-docs:2.7)
+		local PYTHON_DOC_VERSION="${PYTHON_DOC_ATOM#dev-python/python-docs-}"
+		local PYTHON_DOC="/usr/share/doc/python-docs-${PYTHON_DOC_VERSION}/html"
+		local PYTHON_DOC_INVENTORY="${PYTHON_DOC}/objects.inv"
+		sed -i "s|'python': ('http://docs.python.org/2.7', None|'${PYTHON_DOC}': ('${PYTHON_DOC_INVENTORY}'|" docs/conf.py || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	# https://github.com/shazow/urllib3/issues/527
+	# test_https_connection_read_timeout is found to hang and
+	# test_verified is found to fail  under py2.7 and pypy.
+	# upstream by their own admission describe the tests as flakey
+	nosetests -v || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+
+	distutils-r1_python_install_all
+}
--- a/dev-python/urllib3/urllib3-1.8.3.ebuild
+++ b/dev-python/urllib3/urllib3-1.8.3.ebuild
@ -1,45 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/urllib3/urllib3-1.8.3.ebuild,v 1.2 2014/10/15 23:14:04 blueness Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="HTTP library with thread-safe connection pooling, file post, and more"
-HOMEPAGE="https://github.com/shazow/urllib3"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE="test"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep \
-		'dev-python/backports-ssl-match-hostname[${PYTHON_USEDEP}]' \
-		'python2*' pypy)"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		>=www-servers/tornado-2.4.1[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)"
-
-python_prepare_all() {
-	# Replace bundled copy of dev-python/six
-	cat > urllib3/packages/six.py <<-EOF
-		from __future__ import absolute_import
-		from six import *
-	EOF
-
-	sed -i "s/'dummyserver',//" setup.py || die
-	sed -i 's:cover-min-percentage = 100::' setup.cfg || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests -v || die "Tests fail with ${EPYTHON}"
-}
--- a/dev-python/urllib3/urllib3-1.9.ebuild
+++ b/dev-python/urllib3/urllib3-1.9.ebuild
@ -1,48 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/urllib3/urllib3-1.9.ebuild,v 1.3 2014/10/15 23:14:04 blueness Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="HTTP library with thread-safe connection pooling, file post, and more"
-HOMEPAGE="https://github.com/shazow/urllib3"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE="test"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep \
-		'dev-python/backports-ssl-match-hostname[${PYTHON_USEDEP}]' \
-		'python2*' pypy)"
-DEPEND="test? (
-		${RDEPEND}
-		>=www-servers/tornado-2.4.1[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-	)"
-
-python_prepare_all() {
-	# Replace bundled copy of dev-python/six
-	cat > urllib3/packages/six.py <<-EOF
-		from __future__ import absolute_import
-		from six import *
-	EOF
-
-	sed -i 's:cover-min-percentage = 100::' setup.cfg || die
-	# Fix tests
-	sed -i 's/urllib3.packages.six/six/' test/test_retry.py || die
-	sed -i '/clear_warnings/d' test/test_util.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests -v || die "Tests fail with ${EPYTHON}"
-}
--- a/dev-python/waitress/Manifest
+++ b/dev-python/waitress/Manifest
@ -1,8 +1,2 @@
 DIST pylons_sphinx_theme.tar.gz 607608 SHA256 d892c80fbee8845b79cb41845a89cf2f268893689a68157bc10bd0224948bb9c SHA512 fdafd77e52ff6941de5102bad521ed2a9e28cff6be385cab660a7604be12fa1d86db73fc93f84f72551458cc60b42d3354f27648b1d747b15b25d6f809df8a4d WHIRLPOOL bcf8329b35b90d65eae86a8fc910d074790f912cfe7d4bdd9065970f5c24344e57e585d8dd0b28f101b4ddd4ed0b65caa3bdf7c93fb933ddc6916e63514fa69f
-DIST waitress-0.8.2.tar.gz 100184 SHA256 9b69a80762a899c9cb8d7e04fa3acd2e93e99ba197cae7d3d7de70fdf45a337b SHA512 b276a0164425d783d0fe64da0c8c8dc1b199294fcc4db2150e620a68c4f219aede1908a366a88e513f9290c8b9d60b5f3cd853e15e329a1ce4e6a35f7a69598a WHIRLPOOL c22542f7d1c10b977bad1873a2d2daa69841fe2ec9d3777620a063ba117479038c50b1d3f10638d27a0815376a27dac9a98b78b472f43684751cf1941f36ff25
-DIST waitress-0.8.3.tar.gz 101245 SHA256 b650c2753555fbc77e2ef2c22310c6e9c3e5584f7dd97ed82a39c30e9244b114 SHA512 57af35c7da07c01acfac2a0a8e82411f91231b1da6e1f7185a3c84418bf0a0a5859380ed2f1dc57dd327034cdfb9a855f3aed4421893064d9554a7a4860ddd79 WHIRLPOOL 4d55b628c9948633a888dd37bb29afbefe900d6ccd848e6ba73f9094483dce22b63df1082c70aa747702b807b379456aba82d76c3b3b64152039e20845f17eee
-DIST waitress-0.8.5.tar.gz 112208 SHA256 302efc3e8b0f7e43da58fdbb67f13c088d09dc378e55ad19078cfbf02ef44228 SHA512 6cf30d909c9d6fb24343dd3929bd37e5481215b08a13c4262c1c1e720ac1ff32466736dbe17ba877b766d5cb57c86db1ffa96f8157ed00be3157f4e075d97af8 WHIRLPOOL 1d61e5229e997ed44604adcdb80300df5ae32c153deda9210cc7e88f3eaa3192dc9474d3936a413bb9fd048a36c7199965f541d811ac0c74f5daa997e841172c
-DIST waitress-0.8.6.tar.gz 114583 SHA256 31ef2e854f5e374a086d727a0ebe9d405ddcaea7ac3e2958dfd8afd7e1952c7d SHA512 07ac7beef342d64a21576e8b05d4fb02286c482607001d23984bd703017763d90c24bff93aa7595d2347afe1286690b7a342bf0abb7e65714437db1aec5de352 WHIRLPOOL 1ba511a44f8dfa530682e8d8e4f3bdd0bb895e9ce901369bbb324225b5cb9b028c2c58f415b40251fedd5e32fa41d49cfe2ea678df3fa5e3449a8c16e6a123a2
-DIST waitress-0.8.7.tar.gz 115461 SHA256 e161e27faa12837739294dd8c837541aa66a5b2764eed753f0bf851d8ac81a74 SHA512 19a8acc6dad7188c9a30fa71cc22e4ae3b08e6acfc88779aeaa18b6b20993fffa84149e8bec38dcdd4f9e33557f42725055ee11b5e44708be4997153130ebb73 WHIRLPOOL a506ea80104d00478c70e9b0c36b0c5ade4cea4914ca9348c885ca49578398792de627bff05605216edcdd2c13fc17bf28da02abef537769dcfe178864741615
-DIST waitress-0.8.8.tar.gz 119311 SHA256 ba8dd1fd5992eb4b1192923bb606e9be8b9b66e9c006cc0a570f93bccf358a5c SHA512 a056af3122e4f1b858604b919ef99a2660156dfbe5a7f833076dbaf07a2f577bc0443eda22464e330ba869537b4eb344db749c32a6aaba7b0583785c015a65a5 WHIRLPOOL 0d21cdf908cb920e9bd4037a44ab8b3589a6ae4772d269c1cbb6dec00b159ea6e1aa29f93ad33ec4ae347205e64a1f1edcb198c4bf893c56a7660d494196c96f
 DIST waitress-0.8.9.tar.gz 121048 SHA256 826527dc9d334ed4ed76cdae672fdcbbccf614186657db71679ab58df869458a SHA512 e9459b8806389fcdbd6f7cfc4fc908c2076f1fcc306315c5375c872c1a0c43c2537347322f7becf1ad36aec0050dca7b2f713f35318fe3a371e544cc880b7d8c WHIRLPOOL f3ce347d3fa04944ebcf7b6b3734bed0ff1fb1fc1dd9479a10cc4cc77111ae250e2c652dd195b15a86c1c7b740d751d0ca539791f3b97c942737ca0be033a59a
--- a/dev-python/waitress/waitress-0.8.2.ebuild
+++ b/dev-python/waitress/waitress-0.8.2.ebuild
@ -1,31 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/waitress/waitress-0.8.2.ebuild,v 1.1 2013/03/20 04:02:11 patrick Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
-
-# doc creation is fatally broken
-
-# somehow this seems to not work at all :\
-RESTRICT="test"
-
-inherit distutils-r1
-
-DESCRIPTION="A pure-Python WSGI server"
-HOMEPAGE="http://docs.pylonsproject.org/projects/waitress/en/latest/ https://pypi.python.org/pypi/waitress/ https://github.com/Pylons/waitress"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-python_test() {
-	nosetests || die "Tests fail with ${EPYTHON}"
-}
--- a/dev-python/waitress/waitress-0.8.3.ebuild
+++ b/dev-python/waitress/waitress-0.8.3.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-python/waitress/waitress-0.8.3.ebuild,v 1.1 2013/05/08 03:20:23 patrick Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
-
-# doc creation is fatally broken
-
-# somehow this seems to not work at all :\
-RESTRICT="test"
-
-inherit distutils-r1
-
-DESCRIPTION="A pure-Python WSGI server"
-HOMEPAGE="http://docs.pylonsproject.org/projects/waitress/en/latest/ https://pypi.python.org/pypi/waitress/ https://github.com/Pylons/waitress"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	test? ( dev-python/nose )"
-
-python_test() {
-	nosetests || die "Tests fail with ${EPYTHON}"
-}
--- a/dev-python/waitress/waitress-0.8.5.ebuild
+++ b/dev-python/waitress/waitress-0.8.5.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-python/waitress/waitress-0.8.5.ebuild,v 1.1 2013/06/03 05:43:12 patrick Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
-
-# doc creation is fatally broken
-
-# somehow this seems to not work at all :\
-RESTRICT="test"
-
-inherit distutils-r1
-
-DESCRIPTION="A pure-Python WSGI server"
-HOMEPAGE="http://docs.pylonsproject.org/projects/waitress/en/latest/ https://pypi.python.org/pypi/waitress/ https://github.com/Pylons/waitress"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	test? ( dev-python/nose )"
-
-python_test() {
-	nosetests || die "Tests fail with ${EPYTHON}"
-}
--- a/dev-python/waitress/waitress-0.8.6.ebuild
+++ b/dev-python/waitress/waitress-0.8.6.ebuild
@ -1,29 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/waitress/waitress-0.8.6.ebuild,v 1.1 2013/08/26 01:58:34 patrick Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
-
-# doc creation is fatally broken
-
-inherit distutils-r1
-
-DESCRIPTION="A pure-Python WSGI server"
-HOMEPAGE="http://docs.pylonsproject.org/projects/waitress/en/latest/ https://pypi.python.org/pypi/waitress/ https://github.com/Pylons/waitress"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	test? ( dev-python/nose )"
-
-python_test() {
-	nosetests || die "Tests fail with ${EPYTHON}"
-}
--- a/dev-python/waitress/waitress-0.8.7.ebuild
+++ b/dev-python/waitress/waitress-0.8.7.ebuild
@ -1,29 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/waitress/waitress-0.8.7.ebuild,v 1.1 2013/09/12 06:59:15 patrick Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
-
-# doc creation is fatally broken
-
-inherit distutils-r1
-
-DESCRIPTION="A pure-Python WSGI server"
-HOMEPAGE="http://docs.pylonsproject.org/projects/waitress/en/latest/ https://pypi.python.org/pypi/waitress/ https://github.com/Pylons/waitress"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	test? ( dev-python/nose )"
-
-python_test() {
-	nosetests || die "Tests fail with ${EPYTHON}"
-}
--- a/dev-python/waitress/waitress-0.8.8.ebuild
+++ b/dev-python/waitress/waitress-0.8.8.ebuild
@ -1,29 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/waitress/waitress-0.8.8.ebuild,v 1.2 2014/04/02 21:18:50 radhermit Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} )
-
-# doc creation is fatally broken
-
-inherit distutils-r1
-
-DESCRIPTION="A pure-Python WSGI server"
-HOMEPAGE="http://docs.pylonsproject.org/projects/waitress/en/latest/ https://pypi.python.org/pypi/waitress/ https://github.com/Pylons/waitress"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	test? ( dev-python/nose )"
-
-python_test() {
-	nosetests || die "Tests fail with ${EPYTHON}"
-}
--- a/dev-python/weberror/weberror-0.10.3.ebuild
+++ b/dev-python/weberror/weberror-0.10.3.ebuild
@ -1,34 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/weberror/weberror-0.10.3.ebuild,v 1.1 2010/11/15 14:32:44 arfrever Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-DISTUTILS_SRC_TEST="nosetests"
-
-inherit distutils
-
-MY_PN="WebError"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Web Error handling and exception catching"
-HOMEPAGE="http://pypi.python.org/pypi/WebError"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="|| ( dev-lang/python:2.7 dev-lang/python:2.6 dev-python/simplejson )
-	>=dev-python/paste-1.7.1
-	dev-python/pygments
-	dev-python/setuptools
-	dev-python/tempita
-	dev-python/webob"
-DEPEND="${RDEPEND}
-	test? ( dev-python/webtest )"
-
-S="${WORKDIR}/${MY_P}"
--- a/dev-python/webtest/Manifest
+++ b/dev-python/webtest/Manifest
@ -1,4 +1,3 @@
 DIST WebTest-1.4.3.zip 80008 SHA256 0439d951afdf6c58d19e0a83e30855d0bb7e35ab177d9261add71fc5a724b6ab SHA512 87436f182edc3178481f4ec3d073399784e353d6480790470891a18d3605c2bb5a1f4effe0ffa0ce241f1256e99f1a4e3e5fcd2896acb8931aeb60a88fa2bfa2 WHIRLPOOL e509a71a213b9085473536afb51142c4cd9fe99b52870139498fe5b68e8326e8b23df9af3502f0d3ebffbe0076165564d38ef143d9b229bb94b23bb857ca6fe9
-DIST WebTest-2.0.15.zip 86465 SHA256 c320adc2cd862ea71ca9e2012e6157eb12f5f8d1632d1541f2eabf984aaa3ecc SHA512 01edb49d5d4226a83caf96d32219a442ff9cc009bd2690f67e488aa559534a2bf0eac1e26948d306e67648323e1e4bca244f8f657c29ed447606e444ec3f054d WHIRLPOOL 62913ff4904e955b157ee88a6e550ebb58edb1328f311926c693fbcfedcf6c677d5ebe1160ad6c9570d26c0cf6c5aa21aa8e288c5a4429b623edf30323da0902
 DIST WebTest-2.0.16.zip 88232 SHA256 24ad0c9ee377f16df4d0bd626a64a75eec901852ac788bdb70e0261bff0026eb SHA512 da09abba8ed52c8d673acf547f47df6919b534b33b746944610fc78bd3695f36e3718f89e68f8aec7852b6cf98da0f0b5500dfe9427fd7926e5304ad216eafbb WHIRLPOOL 68d392000c8767ef9b5d4cc657bd6e99ec75eb4cb20cacdabdcca87942894b290f957854fb7dfb7c9eb8312877575c4e4d258e78c05f985e972b02ee04ec2643
 DIST WebTest-2.0.17.zip 88435 SHA256 36457f708a57e4295a2c05aaf47b620b66e25429dd9170c59d0718ff7934a0b7 SHA512 5a1e26108af1cb5fc5db10bf10a48c98815ccacb84c692ecedfc6ef02427bedaa3bdfc466a89faa51c82474da2bd393aae5f17821c516966999c5d2e5f12628d WHIRLPOOL 2c7c504fd6087cc116f28de8113f456901535d6d098845bc1b3551264ee9ea5c7bc9fad4699015eecb974a0423edf60e0715d93025ed3d05da91a6235dc6e1fb
--- a/dev-python/webtest/webtest-2.0.15.ebuild
+++ b/dev-python/webtest/webtest-2.0.15.ebuild
@ -1,72 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/webtest/webtest-2.0.15.ebuild,v 1.8 2014/12/20 07:46:32 idella4 Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit distutils-r1
-
-MY_PN="WebTest"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Helper to test WSGI applications"
-HOMEPAGE="http://pythonpaste.org/webtest/ http://pypi.python.org/pypi/WebTest"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.zip"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
-IUSE="doc test"
-
-#nose<1.3.0
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	>=dev-python/waitress-0.8.5[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.2[${PYTHON_USEDEP}]
-	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pyquery[${PYTHON_USEDEP}]
-		dev-python/pastedeploy[${PYTHON_USEDEP}]
-		dev-python/wsgiproxy2[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python{2_7,3_2} )
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-# Makes testing easier; otherwise we get errors from pkg_resources.
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_prepare_all() {
-	# Prevent un-needed d'loading during doc build
-	sed -s 's:intersphinx_mapping:_&:' -i docs/conf.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		sphinx-build docs html || die
-	fi
-}
-
-src_test() {
-	DISTUTILS_NO_PARALLEL_BUILD=1 distutils-r1_src_test
-}
-
-python_test() {
-	# Tests raise ImportErrors with our default PYTHONPATH.
-	local -x PYTHONPATH=
-	nosetests || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( html/. )
-	distutils-r1_python_install_all
-}
--- a/dev-python/webtest/webtest-2.0.17.ebuild
+++ b/dev-python/webtest/webtest-2.0.17.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/webtest/webtest-2.0.17.ebuild,v 1.1 2014/12/24 08:08:02 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/webtest/webtest-2.0.17.ebuild,v 1.2 2014/12/27 04:16:42 idella4 Exp $

 EAPI=5

@ -20,7 +20,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
 IUSE="doc test"

-#nose<1.3.0
+# nose<1.3.0 appears a leftover never updated in requires.txt. tests pass fine with latest
 RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]
 	>=dev-python/waitress-0.8.5[${PYTHON_USEDEP}]
@ -56,10 +56,6 @@ python_compile_all() {
 	fi
 }

-src_test() {
-	DISTUTILS_NO_PARALLEL_BUILD=1 distutils-r1_src_test
-}
-
 python_test() {
 	# Tests raise ImportErrors with our default PYTHONPATH.
 	local -x PYTHONPATH=
--- a/dev-ruby/activerecord-deprecated_finders/activerecord-deprecated_finders-1.0.3.ebuild
+++ b/dev-ruby/activerecord-deprecated_finders/activerecord-deprecated_finders-1.0.3.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activerecord-deprecated_finders/activerecord-deprecated_finders-1.0.3.ebuild,v 1.5 2014/08/16 16:18:54 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activerecord-deprecated_finders/activerecord-deprecated_finders-1.0.3.ebuild,v 1.7 2014/12/27 17:30:27 graaff Exp $

 EAPI=4
 USE_RUBY="ruby19 ruby20 ruby21"
@ -20,12 +20,15 @@ SLOT="$(get_version_component_range 1-2)"
 LICENSE="MIT"

 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE="mysql postgres sqlite3"
+IUSE=""

-# This should also include dev-ruby/activerecord:4.0, but that has a
-# dependency on this gem so we would get a circular dependency. Could
-# probably be worked around with ruby_add_pdepend, which we don't have
-# yet.
-ruby_add_bdepend "
+ruby_add_bdepend "test? (
+	dev-ruby/bundler
+	dev-ruby/activerecord:4.0
 	>=dev-ruby/minitest-3
-	>=dev-ruby/sqlite3-1.3"
+	>=dev-ruby/sqlite3-1.3 )"
+
+all_ruby_prepare() {
+	# The code is only compatible with Rails 4.0.
+	sed -i -e 's/< 5/< 4.1/' Gemfile || die
+}
--- a/dev-ruby/minitest/Manifest
+++ b/dev-ruby/minitest/Manifest
@ -1,3 +1,4 @@
 DIST minitest-4.7.5.gem 57856 SHA256 3e0ac720a6d0787b4c822514739319493e187400e993fba96397bd64d58ae60e SHA512 7ea0a52d37f4631fb8b11d4389da2123e4207093f7b34c497fced8729c9086faaa35e997debdb53b694e05eb52b16e843960f0b54515c32207f87161a76c3851 WHIRLPOOL 49bbc557d62053b58208e6aef13dba085f393dbecd731b2915a0b885393ba2b4f1a612b46a018442d2f4fcfda9dfbe3025ae72d2946106a589623748fa4b382d
 DIST minitest-5.3.3.gem 67072 SHA256 b17c560235e6ab96ed243d7a821e4370af1316ad7a845188d22c56d7d71302d4 SHA512 e1ea2cea5b61231b3074aea1dfb15b104a4e8a6b361d274194b6876401c29f839be618eb7c0448a42bc51ce57f0c2fcd84a72d1b0e0ba034ec5ffe6fbf2ae509 WHIRLPOOL 66c72352b2cdeeeec494be4b2b0aac49153bce9d37c0dbcc9bb0eec4f4759d3f61fd12bbbda0a2a7f26bb75741033a4208da02f1f1a892ff3819bb597218d45f
 DIST minitest-5.4.3.gem 68608 SHA256 a41b54b1c6e64b102fe78bf265045896845c38177a10bdb32d04caf4e06542f3 SHA512 2a2df1502e449732d39da377c262d8c481e5b6399b39781c5d55fb0c3065f3dc4cdd326794a16731b2dbc970c40b4dc1399929913fcc2dd1f8ffb1f78df81a9f WHIRLPOOL c58bcc6ed3ead20ac4c6a8782a77686b2df13954b3a3a849730f40f150c21ba6052bcd2d78e9ce5f8f593c37a69f3502cceb0398bd58dcc87c99639bba854335
+DIST minitest-5.5.0.gem 68608 SHA256 0277c07738303b7184410a561cafb0252c66cb28f3784ea17e5640876811f8cf SHA512 fca7b6a01694a6bae3ce91a5c1eaae2bed9edf9c7bcfd0e923511005b333085c0dcbc0754369f8dd329814441275d51b70934782c16b46e55807d11f6a745831 WHIRLPOOL 5915b38151f109b4a9ab384e3540f5ff96fb4bee009393126569a0b8d04f3f9031d95ac3fbaba9cf82fbc52ea8f10e165b150c52366bcac6734575cefc9f8d6c
--- a/dev-ruby/minitest/minitest-5.5.0.ebuild
+++ b/dev-ruby/minitest/minitest-5.5.0.ebuild
@ -0,0 +1,37 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/minitest/minitest-5.5.0.ebuild,v 1.1 2014/12/27 14:46:26 mrueg Exp $
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="History.txt Manifest.txt README.txt"
+
+inherit ruby-fakegem
+
+DESCRIPTION="minitest/unit is a small and fast replacement for ruby's huge and slow test/unit"
+HOMEPAGE="https://github.com/seattlerb/minitest"
+
+LICENSE="MIT"
+SLOT="5"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc test"
+
+each_ruby_prepare() {
+	case ${RUBY} in
+		*rbx)
+			# Avoid a single failing test for rbx while we are testing
+			# and bootstrapping it.
+			sed -i -e '/test_mock_args_does_not_raise/,/^  end/ s:^:#:' test/minitest/test_minitest_mock.rb || die
+			;;
+		*)
+			;;
+	esac
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:test:. -e "Dir['**/test_*.rb'].each{|f| require f}" || die "Tests failed"
+}
--- a/dev-ruby/netrc/Manifest
+++ b/dev-ruby/netrc/Manifest
@ -1,3 +1 @@
-DIST netrc-0.7.7.gem 8192 SHA256 2dabbbc95573f80ff610b136412ad5a1e13fe26cdf4fd7467fbc750d47dac4f8 SHA512 052dd0833efa181780c6453d072e0f817807dae57e82ce309ea9cc6fef01a2ece91db5d1e08e4a7aefcd7d8c2e5443d030ce66f52e27c630abc90108e3b90bfa WHIRLPOOL 021992a3dea072448de28a94333e472864ae62892e279248ff9bd468c2a1a8709fd9d9fcf3f7d23409978016d59682804cd1f2e832f721fe8625724caafec432
-DIST netrc-0.8.0.gem 10240 SHA256 6bb6b2011b1f069600cc10f9a968f6dcb3cac9c23e741c3b1978a6d0765b92c8 SHA512 97536912cc53885da1825a5a9cf5454522b58fd5b39c1c4b92f4cb7fd625e5f93406691cb5e34776b3e82f72cdda2a673695cbad6317bd48973426dc61ee6000 WHIRLPOOL 7c23c2d88427948db41798310eb8ab9a4da12e6ffcf87eee9a6644b6e8c36df21c7de4c1c6446c67d9abd5d5146aa5d3d7df252ee84d275029c54be1cf9bce27
 DIST netrc-0.9.0.gem 10240 SHA256 9c8726e3c166cb2f99421639feac44525ce0646c4b01ffb4b41962a63763721c SHA512 da90ef05f47aa956fddd4679f02a5a0c9397f37055efc2c7a738abfad51164a5c9301df7dbe27dbb28e0caaa291dfe5ad414cd2a1598d5803742c58adaca99fd WHIRLPOOL 42726b8ae33a0e53da476f390dec92563ded93e2d5e350467d63b6d88b125b25db2363d398834b8f615e9c110342b175ecdedbde67176ae93005119664de508b
--- a/dev-ruby/netrc/netrc-0.7.7.ebuild
+++ b/dev-ruby/netrc/netrc-0.7.7.ebuild
@ -1,28 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/netrc/netrc-0.7.7.ebuild,v 1.1 2014/06/09 18:08:29 graaff Exp $
-
-EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21"
-
-RUBY_FAKEGEM_EXTRADOC="changelog.txt Readme.md"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="This library reads and writes .netrc files"
-HOMEPAGE="https://github.com/geemus/netrc"
-LICENSE="MIT"
-
-KEYWORDS="~amd64"
-SLOT="0"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -e '/test_encrypted_roundtrip/a skip "depends on external gpg test keys"' -i test/test_netrc.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} -S testrb test/test_*.rb || die
-}
--- a/dev-ruby/netrc/netrc-0.8.0.ebuild
+++ b/dev-ruby/netrc/netrc-0.8.0.ebuild
@ -1,28 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/netrc/netrc-0.8.0.ebuild,v 1.1 2014/10/21 05:35:48 graaff Exp $
-
-EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21"
-
-RUBY_FAKEGEM_EXTRADOC="changelog.txt Readme.md"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="This library reads and writes .netrc files"
-HOMEPAGE="https://github.com/geemus/netrc"
-LICENSE="MIT"
-
-KEYWORDS="~amd64"
-SLOT="0"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -e '/test_encrypted_roundtrip/a skip "depends on external gpg test keys"' -i test/test_netrc.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} -S testrb test/test_*.rb || die
-}
--- a/dev-ruby/parser/Manifest
+++ b/dev-ruby/parser/Manifest
@ -1,2 +1 @@
-DIST parser-2.2.0.pre.7.gem 367104 SHA256 780d886d16674ff492171122f2292bbae72b0dd06d6819c4540f100ef133568c SHA512 67b81720df3d49fadf5c11d3f335c53ba63bb4ef6ec687310473a09d4ec795cacabad444cd1c4a4c4461128975b9ce50bb5589e696a65a8b41c87a014a9fc37c WHIRLPOOL 5f2fae8a368d270e9f31ed5cd7b153c6c38b8700a2a8a9bc98361caa5a3d159f8a5d74eab2738e21a94c7117ff3abc98cea734859aaa85156dc3c769690f8453
-DIST parser-2.2.0.pre.8.gem 367104 SHA256 d430c9f0d958f027aacbc597a7782b861d53267f132eca3d57c05ab3968fea91 SHA512 ecc5898b43a028df5e08c2bf7e518f41df890342a67e349b682033fea270d8222a7d365cc57c31d647aec3070041f0eecc4d54040bcf983b1e67aa66ca7d559f WHIRLPOOL 4456c20014cecba34f1c635abe385fcdee4d5b1ac72dcac113bcecb308e9b817ae7daae9cd366da5aec253caa12e7cdc249dea8ec4ad305cdfa6e960a1e02808
+DIST parser-2.2.0.gem 367616 SHA256 288d88608ed359048a5d91b81d2ea55c8dbe5c40f26827ae939f9f9b6416c627 SHA512 a399166b72aec8869578ac8bfda89f0569dec8dad493ef45194c095b2b37a6c09d60ed63651dbb65cf869a016ee2b343cc0773c6834d9f55989af7e0b3b5e3bc WHIRLPOOL 45b1914ab5a2c32c4f98a581dc4265acdcf87e53f40443b0061b1033f8ffc7837807e612b6c7a126a2f068efa8ceb8f82caf0f07f1161a9e09972ed0ad8fcb07
--- a/dev-ruby/parser/parser-2.2.0_pre8.ebuild
+++ b/dev-ruby/parser/parser-2.2.0_pre8.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/parser/parser-2.2.0_pre8.ebuild,v 1.1 2014/11/20 22:20:04 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/parser/parser-2.2.0.ebuild,v 1.1 2014/12/27 14:30:02 mrueg Exp $

 EAPI=5
 USE_RUBY="ruby19 ruby20 ruby21"
--- a/dev-ruby/parser/parser-2.2.0_pre7.ebuild
+++ b/dev-ruby/parser/parser-2.2.0_pre7.ebuild
@ -1,34 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/parser/parser-2.2.0_pre7.ebuild,v 1.1 2014/11/04 16:01:22 mrueg Exp $
-
-EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21"
-
-RUBY_FAKEGEM_RECIPE_DOC="yard"
-RUBY_FAKEGEM_TASK_TEST="test"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_VERSION="${PV/_pre/.pre.}"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A production-ready Ruby parser written in pure Ruby"
-HOMEPAGE="https://github.com/whitequark/parser"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_bdepend "test? (
-	dev-ruby/minitest:5
-	dev-ruby/racc
-	dev-ruby/cliver )"
-ruby_add_rdepend "dev-ruby/ast
-	dev-ruby/slop:3"
-
-all_ruby_prepare() {
-	sed -i -e "/[Bb]undler/d" Rakefile || die
-	sed -i -e "/simplecov/,+35d" test/helper.rb || die
-}
--- a/dev-ruby/rb-gsl/Manifest
+++ b/dev-ruby/rb-gsl/Manifest
@ -1,4 +1,3 @@
 DIST rb-gsl-1.15.3.1.gem 611840 SHA256 56bda6faba85ba1e1142acee114e676d8e0778f951784c2d1c4a4bdb36ae4ecc SHA512 7c57923ac4858f95cb47f12778cbc6eca3149a8af58c81f535d7c5d24302d78fe359ea2eba5999a41a8ba48378abd7fb69587f62310eb9bdaf4e6ec76b7e00f6 WHIRLPOOL e976c2df65136f64b128e3466735377905d964863c0443949098902d09c083b165d805c4da481308c141c36dbeccd11260fa78319c7329f2981182534619adb0
-DIST rb-gsl-1.16.0.1.gem 589824 SHA256 5a171bf1fc84fab3c723f9682961f37c12d83c26f5975173079bf5cf75688683 SHA512 47caf27546e3054be9cef14bd062752c8d1d52b4118f5faa1f98cec688601cdd75eaca4fb43d4711547e61eef8ca5397d32b7320631fa1c9cb0a1225dcaead20 WHIRLPOOL d01638a9fb0900c31dd15c9a0f78978c927484c17b03b50989e11c8794974ec7ced61b908745b5c5bd0140bdf64c5b61974530fc492262bcac8c444b34a4c760
-DIST rb-gsl-1.16.0.2.gem 589312 SHA256 53e6db6f357284b6238c6293dac4f3b3c724055bc8c72549e8a6a3d277293f44 SHA512 a0b31ba681060aac56d8be5f667fcebf5dfe4b4cd010b5a12e83b3be5209cdbe3fb515a1ce43928920b7d28804d5ca0061c3160d31fdf4e03f5b06aa064a5ed8 WHIRLPOOL ec5d5579630c265a4fde6591225a73f4b917b207d1a6dd01836925ff57a499a68f954e52e061c06e0a7e9d1aecc8a9414baea8f22199d867d07cc4fe57a8c7f6
 DIST rb-gsl-1.16.0.3.gem 587776 SHA256 fb88cab2be18c422fa9cdabc3e43952d3ae9af72fc4be5109b76c1b6ae2c7f45 SHA512 e1640d616069c90d9e3929dd2d8649a463bb720d318ff6d5aaf263d3be216387f1eb5137aca58a40b5cfd7a5c5796e3c68d94f298ef10a309dfe923507dfe8c3 WHIRLPOOL 3bae2beaaf91ac09e2b0f8e5e1d14accc5ef393ab85f3885c889e99c99ffe035f24515f1ba45a68de2974415c0d5c46dc3f930988dc8323215f94cd60c29a58e
+DIST rb-gsl-1.16.0.4.gem 588288 SHA256 bc6573cc36410d2ec88672d4b12e2c908684796b276a8743c19345bbb44bef94 SHA512 93d9064b3a268b81c4cd2bdc9c6a22871ec31daa327a254cbc3c7b715eb9fa20da3b3ebc370413675045cf9fbf9ae843e7aa4b6c53469b4f46ecbab27c560deb WHIRLPOOL 44cea9a3571005aeef993b81d56350f76006c05b8887ec3cb6e49b33b101e6a566c39d637ba36d4084af0bb32a406dcce782a6091aebe24098dfa9564718d367
--- a/dev-ruby/rb-gsl/rb-gsl-1.16.0.1.ebuild
+++ b/dev-ruby/rb-gsl/rb-gsl-1.16.0.1.ebuild
@ -1,42 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rb-gsl/rb-gsl-1.16.0.1.ebuild,v 1.1 2014/05/03 23:28:01 mrueg Exp $
-
-EAPI=5
-USE_RUBY="ruby19 ruby20"
-
-inherit ruby-fakegem multilib
-
-RUBY_FAKEGEM_TASK_TEST="test:libs"
-DESCRIPTION="Ruby interface to GNU Scientific Library"
-HOMEPAGE="http://rb-gsl.rubyforge.org/ https://github.com/david-macmahon/rb-gsl"
-#SRC_URI="https://github.com/david-macmahon/${PN}/archive/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc"
-
-DEPEND+=" sci-libs/gsl"
-RDEPEND+=" sci-libs/gsl"
-
-RUBY_S="${PN}-${P}"
-
-ruby_add_rdepend "dev-ruby/narray"
-
-each_ruby_prepare() {
-	sed -i -e '/$CPPFLAGS =/a \$LDFLAGS = " -L#{narray_config} -l:narray.so "+$LDFLAGS' -e 's/src/lib/' ext/gsl/extconf.rb || die
-}
-
-each_ruby_configure() {
-	${RUBY} -Cext/gsl extconf.rb || die
-}
-
-each_ruby_compile() {
-	emake -Cext/gsl V=1
-	cp ext/gsl/*$(get_modname) lib/gsl || die
-}
-
-each_ruby_test() {
-	${RUBY} -S testrb -Ilib -Itest test/*.rb test/*/*.rb || die
-}
--- a/dev-ruby/rb-gsl/rb-gsl-1.16.0.4.ebuild
+++ b/dev-ruby/rb-gsl/rb-gsl-1.16.0.4.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rb-gsl/rb-gsl-1.16.0.2.ebuild,v 1.1 2014/07/13 07:11:25 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rb-gsl/rb-gsl-1.16.0.4.ebuild,v 1.1 2014/12/27 15:34:28 mrueg Exp $

 EAPI=5
 USE_RUBY="ruby19 ruby20 ruby21"
--- a/dev-ruby/rouge/Manifest
+++ b/dev-ruby/rouge/Manifest
@ -1 +1,2 @@
 DIST rouge-1.7.4.tar.gz 386287 SHA256 b6e3e20b8324a3fa1adf07e6f64a94a3941af3e3b39ba5c6b142cb50d4648134 SHA512 b35c2ba0b8d1bb6e0460b6404ef923495aa7bc04de865e7cb9e7885059274d3c0b4a8583da9402012f85c96db0e7aa1262a8f8709cead959a673ea7b8bb364d4 WHIRLPOOL e1b22da4a1e8becf01347263ae70900a7907bf340230bcc23bacf44474a647774adf1475504b52cdd826acddd94ca0cecea4d26626ea1e0fbb528a5f480a28db
+DIST rouge-1.7.7.tar.gz 393288 SHA256 cf1c59c205b010f71ee7e5e39942451a48254109d15feebece5ab6c83c707438 SHA512 664348630fa1289228ab60ac43830c5a0010c537ed3066584b1ac21c32a82adf39e26f5c70b988dcd42f9ff0d30b2d0a2073f88f242ba0ff52750755c67c8e49 WHIRLPOOL a9e833cce4db266042033b748191bcbc2c0d569160825419e440e454833d80a59eaa7998281734799d797257bbf08009a6c1ff859152449a9cd93c3d6758c527
--- a/dev-ruby/rouge/rouge-1.7.7.ebuild
+++ b/dev-ruby/rouge/rouge-1.7.7.ebuild
@ -0,0 +1,28 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rouge/rouge-1.7.7.ebuild,v 1.1 2014/12/27 14:47:51 mrueg Exp $
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21"
+
+RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md"
+RUBY_FAKEGEM_TASK_TEST="spec"
+RUBY_FAKEGEM_RECIPE_DOC="yard"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Yet-another-markdown-parser but fast, pure Ruby, using a strict syntax definition"
+HOMEPAGE="http://github.com/jneen/rouge"
+SRC_URI="https://github.com/jneen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+ruby_add_bdepend "doc? ( dev-ruby/redcarpet )"
+ruby_add_rdepend "dev-ruby/redcarpet"
+
+RESTRICT="test"
+# Depends on dev-ruby/wrong, which is not packaged yet.
--- a/dev-ruby/rspec-core/rspec-core-2.14.8-r2.ebuild
+++ b/dev-ruby/rspec-core/rspec-core-2.14.8-r2.ebuild
@ -1,9 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec-core/rspec-core-2.14.8-r2.ebuild,v 1.1 2014/12/07 07:32:24 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec-core/rspec-core-2.14.8-r2.ebuild,v 1.2 2014/12/27 09:46:12 graaff Exp $

 EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21"
+USE_RUBY="ruby19 ruby20"

 RUBY_FAKEGEM_TASK_TEST="none"
 RUBY_FAKEGEM_TASK_DOC="none"
--- a/dev-ruby/rspec-core/rspec-core-2.14.8-r3.ebuild
+++ b/dev-ruby/rspec-core/rspec-core-2.14.8-r3.ebuild
@ -1,9 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec-core/rspec-core-2.14.8-r1.ebuild,v 1.4 2014/08/13 18:38:21 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec-core/rspec-core-2.14.8-r3.ebuild,v 1.1 2014/12/27 09:46:12 graaff Exp $

 EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 jruby"
+USE_RUBY="ruby19 ruby20 ruby21"

 RUBY_FAKEGEM_TASK_TEST="none"
 RUBY_FAKEGEM_TASK_DOC="none"
@ -45,10 +45,6 @@ all_ruby_prepare() {
 	# Avoid dependency on cucumber since we can't run the features anyway.
 	sed -i -e '/[Cc]ucumber/ s:^:#:' Rakefile || die

-	# Remove jruby-specific comparison documents since for us the normal
-	# version passes.
-	cp spec/rspec/core/formatters/text_mate_formatted-1.8.7.html spec/rspec/core/formatters/text_mate_formatted-1.8.7-jruby.html|| die
-
 	# Cover all released versions of ruby 2.1.x. This should be reported
 	# upstream since ruby 2.1.x uses semantic versioning and the file
 	# should not have the full version number.
@ -80,3 +76,9 @@ all_ruby_compile() {
 each_ruby_test() {
 	PATH="${S}/bin:${PATH}" RUBYLIB="${S}/lib" ${RUBY} -Ilib bin/rspec spec || die "Tests failed."
 }
+
+all_ruby_install() {
+	all_fakegem_install
+
+	ruby_fakegem_binwrapper rspec /usr/bin/rspec-2 'gem "rspec", "~>2.0"'
+}
--- a/dev-ruby/ruby-gdk3/ruby-gdk3-2.2.3.ebuild
+++ b/dev-ruby/ruby-gdk3/ruby-gdk3-2.2.3.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-gdk3/ruby-gdk3-2.2.3.ebuild,v 1.1 2014/12/07 05:36:39 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-gdk3/ruby-gdk3-2.2.3.ebuild,v 1.2 2014/12/27 07:30:28 graaff Exp $

 EAPI=5
 USE_RUBY="ruby19 ruby20 ruby21"
@ -17,6 +17,7 @@ RDEPEND="${RDEPEND} x11-libs/gtk+:3"
 ruby_add_bdepend ">=dev-ruby/ruby-glib2-${PV}"
 ruby_add_rdepend ">=dev-ruby/ruby-gdkpixbuf2-${PV}
 	>=dev-ruby/ruby-atk-${PV}
+	>=dev-ruby/ruby-cairo-gobject-${PV}
 	>=dev-ruby/ruby-pango-${PV}"

 each_ruby_configure() {
--- a/dev-util/jenkins-bin/Manifest
+++ b/dev-util/jenkins-bin/Manifest
@ -1,3 +1,3 @@
 DIST jenkins-bin-1.580.2.war 68035763 SHA256 e41321fdcc4803ff6b1d0b8c68a247527791949338beabbc2eb13586ef7b6fab SHA512 c9371b80ff21986d485e63b0d9f957c18ee4babbe625fa0f4fb9fcd3dfb70d04c86302da37c4670ead1c115deffac88107df43af2541b16ac78a032994ecbbc6 WHIRLPOOL 240833e2aaa84e2f87114a2ef2a0fc858471f0096bfd096010b62ab1177088b8432d76388040b4ebe5c958a40557f951f223cc598ae8b3cf1754a9960577b7f1
-DIST jenkins-bin-1.593.war 68221947 SHA256 23ccf261db7a06e6db86f9d7b662c64887ff768cc82c7fb8dd95218eecf630f4 SHA512 0fc53f46cacc8532a8cdbabe5befa2a31954eefa0d4cf3b10f1d77bf61ac55ef9c18cdc6e758d3c00a910e1da75a2198293ac02d13f16ad27e162d3a83228aa4 WHIRLPOOL dcb7b47362387a459b12c5ab045b9955169aab490b529b5f70c7d03a1c6ee134d84ffb9df0b4c082133f4be4ba9340cf1d1a9e4f6b281ec103e2e9fe368f9cf1
 DIST jenkins-bin-1.594.war 68222524 SHA256 c12effabd7bcccdfd1d32ccaab275a62f79f977c59f59448ca716f850eb5f1fa SHA512 0dbee114d9e61bfaa52cbe8f10bc5de279386837409cbeac10fcafd436c4fc56e8122a965c59169721967ed626e3b5347afa64bfb98ea1e306bf3a6b1d16bb33 WHIRLPOOL a7abd22d6418518fe493f316541f68a8efa8cedb277d0608ae080d25566175d21d4dd66d8ffc411da0c8eb09550f8caf8c7bb9bf73c95d31aee13c6930f06c12
+DIST jenkins-bin-1.595.war 68215690 SHA256 2424e6316ec45d524d132203438e8d767a5e9bed747b2c583047ff944f2e2935 SHA512 0511d064a9b38910f9a65a5a04622d78cd4dda594b239521035f30aad907c9c5ca26ed00cc3643d0a73f6120f372fa577a53f73957869bfe5d56032c817528af WHIRLPOOL e7cb7b20135752633c4747ee7af79ffd168d7724ade6d9aec660caceb899393d978fc08c9bb10572656ea00887443f7d441b6b5f2f80d715e19b7465c5f8ba1c
--- a/dev-util/jenkins-bin/jenkins-bin-1.595.ebuild
+++ b/dev-util/jenkins-bin/jenkins-bin-1.595.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/jenkins-bin/jenkins-bin-1.593.ebuild,v 1.1 2014/12/09 11:44:52 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/jenkins-bin/jenkins-bin-1.595.ebuild,v 1.1 2014/12/27 15:38:02 mrueg Exp $

 EAPI=5

--- a/Show More
+++ b/Show More