Sync with portage [Wed Dec 10 12:10:48 MSK 2014].

10 years ago · 95740b9129
parent fec17ee652
commit 95740b9129
1482 changed files with 6737 additions and 5396 deletions
--- a/app-admin/bastille/bastille-3.0.9-r1.ebuild
+++ b/app-admin/bastille/bastille-3.0.9-r1.ebuild
@ -0,0 +1,70 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/bastille/bastille-3.0.9-r1.ebuild,v 1.1 2014/12/09 22:30:09 dilfridge Exp $
+
+EAPI=5
+
+PERL_EXPORT_PHASE_FUNCTIONS=no
+inherit eutils perl-module
+
+PATCHVER=0.2
+MY_PN=${PN/b/B}
+MY_P=${MY_PN}-${PV}
+S=${WORKDIR}/${MY_PN}
+DESCRIPTION="Bastille-Linux is a security hardening tool"
+HOMEPAGE="http://bastille-linux.org/"
+SRC_URI="mirror://sourceforge/${PN}-linux/${MY_P}.tar.bz2
+	mirror://gentoo/${P}-gentoo-${PATCHVER}.patch.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64"
+IUSE="X"
+
+RDEPEND="
+	net-firewall/iptables
+	app-admin/logrotate
+	dev-perl/Curses
+	net-firewall/psad
+	X? ( dev-perl/perl-tk )
+	virtual/logger
+"
+
+src_prepare() {
+	epatch "${WORKDIR}"/${P}-gentoo-${PATCHVER}.patch
+
+	# make sure the Perl modules go into vendor dir
+	epatch "${FILESDIR}/${P}-perl.patch"
+	perl_set_version
+
+	cd "${S}"
+	chmod a+x Install.sh bastille-ipchains bastille-netfilter
+}
+
+src_install() {
+	perl_set_version
+	export VENDOR_LIB
+
+	cd "${S}"
+	DESTDIR="${D}" ./Install.sh
+
+	# Example configs
+	cd "${S}"
+	insinto /usr/share/Bastille
+	doins *.config
+
+	newinitd ${PN}-firewall.gentoo-init ${PN}-firewall
+
+	# Documentation
+	cd "${S}"
+	dodoc *.txt BUGS Change* README*
+	cd "${S}"/docs
+	doman *.1m
+}
+
+pkg_postinst() {
+	elog "Please be aware that when using the Server Lax, Server Moderate, or"
+	elog "Server Paranoia configurations, you may need to use InteractiveBastille"
+	elog "to set any advanced network information, such as masquerading and"
+	elog "internal interfaces, if you plan to use them."
+}
--- a/app-admin/bastille/files/bastille-3.0.9-perl.patch
+++ b/app-admin/bastille/files/bastille-3.0.9-perl.patch
@ -0,0 +1,25 @@
+diff -ruN Bastille-gentoo-2/Install.sh Bastille/Install.sh
+--- Bastille-gentoo-2/Install.sh	2014-12-09 23:05:55.674808824 +0100
+++ Bastille/Install.sh	2014-12-09 23:17:25.907847419 +0100
+@@ -3,7 +3,7 @@
+ umask 077
+ 
+ mkdir -p ${DESTDIR}/usr/sbin
+-mkdir -p ${DESTDIR}/usr/lib/perl5/site_perl/Curses
+mkdir -p ${DESTDIR}/${VENDOR_LIB}/Curses
+ mkdir -p ${DESTDIR}/usr/lib/Bastille
+ mkdir -p ${DESTDIR}/usr/share/Bastille
+ mkdir -p ${DESTDIR}/usr/share/Bastille/OSMap
+@@ -13,9 +13,9 @@
+  
+ cp AutomatedBastille ${DESTDIR}/usr/sbin/
+ cp BastilleBackEnd ${DESTDIR}/usr/sbin
+-cp Bastille_Curses.pm ${DESTDIR}/usr/lib/perl5/site_perl
+-cp Bastille_Tk.pm ${DESTDIR}/usr/lib/perl5/site_perl
+-cp Curses/Widgets.pm ${DESTDIR}/usr/lib/perl5/site_perl/Curses
+cp Bastille_Curses.pm ${DESTDIR}/${VENDOR_LIB}
+cp Bastille_Tk.pm ${DESTDIR}/${VENDOR_LIB}
+cp Curses/Widgets.pm ${DESTDIR}/${VENDOR_LIB}/Curses
+ cp InteractiveBastille ${DESTDIR}/usr/sbin
+ # Questions.txt has been replaced by Modules.txt and Questions/
+ #cp Questions.txt ${DESTDIR}/usr/share/Bastille
--- a/app-admin/eselect-opengl/eselect-opengl-1.2.7.ebuild
+++ b/app-admin/eselect-opengl/eselect-opengl-1.2.7.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/eselect-opengl/eselect-opengl-1.2.7.ebuild,v 1.15 2014/12/08 21:26:23 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-opengl/eselect-opengl-1.2.7.ebuild,v 1.16 2014/12/10 03:32:04 patrick Exp $

 EAPI=4

@ -32,7 +32,7 @@ RDEPEND=">=app-admin/eselect-1.2.4
 		 !=media-libs/mesa-10.3.4-r1
 		 !>=media-libs/mesa-10.3.5-r1
 		 !>=x11-proto/glproto-1.4.17-r1
-		 !>=x11-base/xorg-server-1.16.2-r1"
+		 !=x11-base/xorg-server-1.16.2-r1"

 pkg_postinst() {
 	local impl="$(eselect opengl show)"
--- a/app-admin/mate-system-tools/Manifest
+++ b/app-admin/mate-system-tools/Manifest
@ -1,2 +1,3 @@
 DIST mate-system-tools-1.6.0.tar.xz 4330780 SHA256 3e545ae4462332cd4e4b1c0b2f0e41a7fbacbb86be3e95254155e92ed249a14a SHA512 8da16d5f92d5bae9dae4cdeb8b3aebc76a795167f02e4b3c82c1da94278b5915a029edf9cea56079342eefe9353e25dd11f487da3befe5d802066134691efae0 WHIRLPOOL c761749aa91f2b55e5dbcf9ce3cc52eeb7ca94af7146336dfc266457932acaf29defe95a841f7a4c6bf7dd8814882b07be2bf9d14232c1018e3fe26a7d6b3b09
 DIST mate-system-tools-1.8.0.tar.xz 4338404 SHA256 7cfeec1d0a5c237fa8b67121bf1bfcc26665c54ce040d30d75c542799840dbfd SHA512 deec649a1ea4c37b3bdbf93fe4cdf331685e2c76e0fbf67303ac678bfec733a1fcac01bd578cb93a67df939bc1452a4cc4154b1505edcd6e87a1dbcc328c6c8d WHIRLPOOL 9d0660a2ea2f6ff6aa456af74db21da471e14c4e1215ba49aeb4c0ffa29752a9079ace2e22430ff7058d79a84997e264150d6b797496cc87be24720302f5629e
+DIST mate-system-tools-1.8.1.tar.xz 4348304 SHA256 c5f1faee761deb679f7a37607cc7166ea81b7d16a7fbc05951b32f119bcb944e SHA512 a2cda52ebab386ebbf6c01288741f59914c8fe8a672a1220b0a8cc44afb51058e8545f385f4d5dab650bc36c3c18ad9519580ce255b4c607131c2c5dd3ce15ce WHIRLPOOL ba486ffcc9dd25aa10858e3b09a046eadbe99a11d4e98c872dd14b91002e9e62a17d88744707ef8fac80b44e27d6402b4532d77d30f6ce0f905335d0e9eee7d2
--- a/app-admin/mate-system-tools/mate-system-tools-1.8.1.ebuild
+++ b/app-admin/mate-system-tools/mate-system-tools-1.8.1.ebuild
@ -0,0 +1,66 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/mate-system-tools/mate-system-tools-1.8.1.ebuild,v 1.1 2014/12/09 22:29:11 tamiko Exp $
+
+EAPI="5"
+
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2 versionator
+
+MATE_BRANCH="$(get_version_component_range 1-2)"
+
+SRC_URI="http://pub.mate-desktop.org/releases/${MATE_BRANCH}/${P}.tar.xz"
+DESCRIPTION="Tools aimed to make easy the administration of UNIX systems"
+HOMEPAGE="http://mate-desktop.org"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="caja nfs policykit samba"
+
+RDEPEND="app-text/rarian:0
+	>=app-admin/system-tools-backends-2.10.1:0
+	dev-libs/atk:0
+	dev-libs/dbus-glib:0
+	>=dev-libs/glib-2.25.3:2
+	>=dev-libs/liboobs-1.1:0
+	>=sys-apps/dbus-0.32:0
+	net-wireless/wireless-tools:0
+	sys-libs/cracklib:0
+	x11-libs/gdk-pixbuf:2
+	x11-libs/pango:0
+	>=x11-libs/gtk+-2.19.7:2
+	virtual/libintl:0
+	caja? ( || ( >=mate-base/caja-1.8:0 >=mate-base/mate-file-manager-1.6:0 ) )
+	nfs? ( net-fs/nfs-utils:0 )
+	policykit? (
+		mate-extra/mate-polkit:0
+		>=sys-auth/polkit-0.92:0
+	)
+	samba? ( >=net-fs/samba-3:0 )"
+
+DEPEND="${RDEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	>=app-text/scrollkeeper-dtd-1:1.0
+	app-text/yelp-tools:0
+	sys-devel/gettext:*
+	virtual/pkgconfig:*
+	>=dev-util/intltool-0.35.0:*"
+
+src_configure() {
+	local myconf
+	if ! use nfs && ! use samba; then
+		myconf="--disable-shares"
+	fi
+
+	gnome2_src_configure \
+		${myconf} \
+		--disable-static \
+		$(use_enable policykit polkit-gtk-mate) \
+		$(use_enable caja)
+}
+
+DOCS="AUTHORS BUGS ChangeLog HACKING NEWS README TODO"
--- a/app-arch/engrampa/Manifest
+++ b/app-arch/engrampa/Manifest
@ -1 +1,2 @@
 DIST engrampa-1.8.0.tar.xz 1357360 SHA256 d802acee43e24b8513e661a91dd7943ebdc55270ed0ceee0a8e29f981f0f6230 SHA512 3be9ba254cefe82e16eb533d5738dacb29e770e30b7a8cc1e62af0476b9b28d90bb86937f559d40eda79116172035c730d8f50053936857587c198461a401eea WHIRLPOOL c625de1156e582f58beed4b04087528e08f1d93de804b022bfc69ed04b12e3c53df92a51534693434d7b3237890d7ee8334a5cd830040b0374aa5f70710ab921
+DIST engrampa-1.8.1.tar.xz 1367088 SHA256 f8c541de364352005b2f4a100140197a2190269d3dbffe032e284a98478f1be7 SHA512 0733ef93d34356d6c9cdda7ac91c97ef10fe47df0962375e0270b25873c2271ade4ee9b82f7d6c4c3fd1de5dbe51e9ca1b30acf208b3a7f80a19a4899299b00b WHIRLPOOL 63fde3e27240b175dff12d7a3e15123413033faa7f49a0dcb6fa75eb8b51ab63246879ebacd4295f95b8f9964b48fcba85264378ea3659e5864b43e591133318
--- a/app-arch/engrampa/engrampa-1.8.1.ebuild
+++ b/app-arch/engrampa/engrampa-1.8.1.ebuild
@ -0,0 +1,84 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/engrampa/engrampa-1.8.1.ebuild,v 1.1 2014/12/09 22:35:42 tamiko Exp $
+
+EAPI="5"
+
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2 versionator
+
+MATE_BRANCH="$(get_version_component_range 1-2)"
+
+SRC_URI="http://pub.mate-desktop.org/releases/${MATE_BRANCH}/${P}.tar.xz"
+DESCRIPTION="Engrampa archive manager for MATE"
+HOMEPAGE="http://mate-desktop.org"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="caja"
+
+# GLib-GIO-ERROR **: Settings schema 'org.mate.caja.preferences' is not installed
+#
+# ... thus we depend on Caja regardless of the Caja USE flag. Patches welcome.
+RDEPEND=">=x11-libs/gtk+-2.21.4:2
+	>=dev-libs/glib-2.25.5:2
+	>=dev-libs/json-glib-0.14:0
+	x11-libs/gdk-pixbuf:2
+	x11-libs/pango:0
+	virtual/libintl:0
+	|| ( >=mate-base/caja-1.8:0 >=mate-base/mate-file-manager-1.6:0 )
+	!!app-arch/mate-file-archiver"
+
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.35:*
+	dev-util/itstool:0
+	>=mate-base/mate-common-1.6:0
+	sys-devel/gettext:*
+	virtual/pkgconfig:*"
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# Drop DEPRECATED flags as configure option doesn't do it, bug #385453
+	sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED:$(NULL):g' \
+		copy-n-paste/Makefile.am copy-n-paste/Makefile.in || die
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-run-in-place \
+		--disable-packagekit \
+		--disable-deprecations \
+		--with-gtk=2.0 \
+		$(use_enable caja caja-actions)
+}
+
+DOCS="AUTHORS HACKING MAINTAINERS NEWS README TODO"
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	elog ""
+	elog "${PN} is a frontend for several archiving utilities. If you want a"
+	elog "particular achive format supported install the relevant package."
+	elog
+	elog "For example:"
+	elog "  7-zip   : emerge app-arch/p7zip"
+	elog "  ace     : emerge app-arch/unace"
+	elog "  arj     : emerge app-arch/arj"
+	elog "  cpio    : emerge app-arch/cpio"
+	elog "  deb     : emerge app-arch/dpkg"
+	elog "  iso     : emerge app-cdr/cdrtools"
+	elog "  jar,zip : emerge app-arch/zip  or  emerge app-arch/unzip"
+	elog "  lha     : emerge app-arch/lha"
+	elog "  lzma    : emerge app-arch/xz-utils"
+	elog "  lzop    : emerge app-arch/lzop"
+	elog "  rar     : emerge app-arch/unrar"
+	elog "  rpm     : emerge app-arch/rpm"
+	elog "  unstuff : emerge app-arch/stuffit"
+	elog "  zoo     : emerge app-arch/zoo"
+}
--- a/app-editors/pluma/pluma-1.8.1.ebuild
+++ b/app-editors/pluma/pluma-1.8.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-editors/pluma/pluma-1.8.1.ebuild,v 1.4 2014/07/02 09:45:30 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/pluma/pluma-1.8.1.ebuild,v 1.5 2014/12/09 22:42:36 tamiko Exp $

 EAPI="5"

@ -33,6 +33,7 @@ RDEPEND="app-text/rarian:0
 	dev-libs/atk:0
 	>=dev-libs/glib-2.32:2
 	>=dev-libs/libxml2-2.5:2
+	>=mate-base/mate-desktop-1.8:0
 	x11-libs/cairo:0
 	x11-libs/gdk-pixbuf:2
 	>=x11-libs/gtk+-2.19:2
--- a/app-emulation/virtinst/Manifest
+++ b/app-emulation/virtinst/Manifest
@ -1 +0,0 @@
-DIST virtinst-0.600.4.tar.gz 8180759 SHA256 6e377a7512eaaecd96f8a91998f2db2feaa6d722c132103f44d1b6447c54b49c SHA512 59a0ab1cc9080ce55b857853602311e8573b7339ceb540bffecd19ae1e41a30248058897fbc257fd264c8592bac23e09730927a68d351181e68e919270018536 WHIRLPOOL ed0d6651bf136c4046f5538ec5d58448043cc8398e4d6d0da47dbbf90533f4de5f28718d8c60cf8b79c2098a37bc61ae879f609d97e30ceb47026103a85fc63f
--- a/app-emulation/virtinst/metadata.xml
+++ b/app-emulation/virtinst/metadata.xml
@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<herd>virtualization</herd>
-</pkgmetadata>
--- a/app-emulation/virtinst/virtinst-0.600.4.ebuild
+++ b/app-emulation/virtinst/virtinst-0.600.4.ebuild
@ -1,48 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtinst/virtinst-0.600.4.ebuild,v 1.3 2013/07/04 12:24:52 ago Exp $
-
-#BACKPORTS=2
-
-EAPI=3
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="http://git.fedorahosted.org/git/python-virtinst.git"
-	GIT_ECLASS="git-2"
-fi
-
-PYTHON_DEPEND="2"
-RESTRICT_PYTHON_ABIS="3.*"
-SUPPORT_PYTHON_ABIS="1"
-
-inherit distutils eutils ${GIT_ECLASS}
-
-if [[ ${PV} = *9999* ]]; then
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="http://virt-manager.et.redhat.com/download/sources/${PN}/${P}.tar.gz
-		${BACKPORTS:+mirror://gentoo/${P}-bp-${BACKPORTS}.tar.bz2
-		http://dev.gentoo.org/~cardoe/distfiles/${P}-bp-${BACKPORTS}.tar.bz2}"
-	KEYWORDS="amd64 x86"
-fi
-
-DESCRIPTION="Python modules for starting virtualized guest installations"
-HOMEPAGE="http://virt-manager.et.redhat.com/"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-RDEPEND=">=app-emulation/libvirt-0.7.0[python]
-	dev-python/urlgrabber
-	dev-libs/libxml2[python]"
-DEPEND="${RDEPEND}"
-
-PYTHON_MODNAME="virtconv virtinst"
-
-src_prepare() {
-	[[ -n ${BACKPORTS} ]] && \
-		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
-		epatch
-
-	distutils_src_prepare
-}
--- a/app-forensics/afl/Manifest
+++ b/app-forensics/afl/Manifest
@ -1,3 +1,4 @@
 DIST afl-0.50b.tgz 667701 SHA256 97443946fc24dc3d07e93fde8b9b1e44990102c175549806e7524285107f9bdc SHA512 93deedca30bc6a602cdb134dc54ffde3891c28970ff6224a9925bed461db531f18352be1bae61a6d349e0078611ab8049b6696962de697acc9b3e80e0482f865 WHIRLPOOL 83563bb22f2b2f60fe0620db781cd8558f444f2cb329ad3f61244a5117a3eb4f684dc9ee8325c74878eeec299a6b77a2482b9601f381a85ff01abbf4526178ce
 DIST afl-0.57b.tgz 675448 SHA256 6e5196c8a6a2bade8ee9673e793df743ae52e514401e82c322c3a9e287b99ca2 SHA512 305e1be2ef8ba71351fc5d54b57d24167adb6068cd12df66b797329f2a61fc83d7d1523c1684468a0a5ce0d782475b8ae15034566028fc7eb49467684bbf8f6b WHIRLPOOL 9026ed0af9cab521b63d1ce6e440c87c194b9573403cb61f3493a01ebbed7f17e1ec3658c168b2db72d05b233de73b59e78326a61deb1c06b6daec5d8f3b65d4
 DIST afl-0.74b.tgz 686856 SHA256 4b6f179ba6fa434631a94a08a12b6797c09313efacf08650c8787313f0d6d623 SHA512 e7021a1e9e23396fd440b6b16ef7a858391f7fd702c9701fd17a4e7024179c82ebae3505a1ed81dc631fb61fd600c96050f37f66a4d5a91e583b65cb7cd4845e WHIRLPOOL 7b8e433340c5081c53d42fb87bdeacd0a65857978377aec1f138b9a1738fe42f8d05e7582a6deb8b371e2192e335347a4526b166dcbb30a9df69224dd5924f6f
+DIST afl-0.89b.tgz 696971 SHA256 495b265b4a7e45b793cfe1854599a92d2b30a9e6a27b97a40a05986fa372fd3b SHA512 87209247f30e97ff6182a0904c66378032c8339d00dfcb8ef23f115bf45ea8af359e8eaeb6d4f49663fb6bfb1275d16479b05b36c0d2ecf35c7ae8f33af70b54 WHIRLPOOL 6ff50d7fa31832d36d57600ebb7fd9a7e384b9a2b3e54f034f152274c57730d54562e4cbdbd8e8fdc779fe7aea40592d122293f138fdda762696941f144c62ed
--- a/app-forensics/afl/afl-0.89b.ebuild
+++ b/app-forensics/afl/afl-0.89b.ebuild
@ -0,0 +1,29 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/afl/afl-0.89b.ebuild,v 1.1 2014/12/10 00:36:21 hanno Exp $
+
+EAPI=5
+inherit multilib toolchain-funcs
+
+DESCRIPTION="american fuzzy lop - compile-time instrumentation fuzzer"
+HOMEPAGE="http://lcamtuf.coredump.cx/afl/"
+SRC_URI="http://lcamtuf.coredump.cx/afl/releases//${P}.tgz"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+DEPEND="sys-devel/gcc"
+RDEPEND="${DEPEND}"
+
+src_compile() {
+	emake CC="$(tc-getCC)" \
+		HELPER_PATH="/usr/$(get_libdir)/afl"
+}
+
+src_install() {
+	emake DESTDIR="${D}" \
+		PREFIX="/usr" \
+		HELPER_PATH="/usr/$(get_libdir)/afl" \
+		DOC_PATH="/usr/share/doc/${PF}" \
+		install
+}
--- a/app-office/akonadi-server/Manifest
+++ b/app-office/akonadi-server/Manifest
@ -1,3 +1 @@
-DIST akonadi-1.12.1.tar.bz2 251899 SHA256 a073228fda8bdbcf836af32d4b4c44dcbe58a3eac6da4e5a286b42ace9d83145 SHA512 128af06874ec32be4205d8bfcae5ac044d1fade6b2c612cdfe801be20f179f2b70e8a6d48ef0427e4b419b6c1efa8eed3b9d741765750f36fb89e909da8040a2 WHIRLPOOL c83fa6395982b5d06d8f877c833e2b1fe0bd4d3906f4a3f8aa86b78b946019bbea6b5d507026e3675001e82925d144afc1ed51ebfec0ec6e40a6db0571464326
 DIST akonadi-1.13.0.tar.bz2 294198 SHA256 8c7f690002ea22c139f3a64394aef2e816e00ca47fd971af7d54a66087356dd2 SHA512 4bf2026c3807b5493c9f63d0c2bff2e6db00fbe97a4e2c2f707aaa3bf4a848b70dd9657d8fa1743690e8eeefd967de4895c1329c6bb817a1d023fe398285222f WHIRLPOOL edc18247dd864af48395f4e3187f6a52cdaf4737959b317e3decb10caf138b97258a661eeb11a2ad11f2365fdd053a7c6fe63097ba71c24a12417ee71de54afb
-DIST akonadi-server-1.11.0.tar.bz2 235101 SHA256 0cb257509d53927241b71d85c42efb0b5776efc37fc8dc732e75f6813b8a264d SHA512 366f0e4a86038af5eb6603653e599076c66e84f59db57f4c56a89ec265be7e335f3f5d14444030a6f398e2361969ad85bc73357359da7ab8c307ec3c5d80ea40 WHIRLPOOL b050f5e1d5220ec512ab6e57cd083b652f03ef1e391fb336a51888aede7b0faf2f2ab58db6f6e67ee3fd7ceea8efcb54d5c3b1a6c224adf3deb41cb10b3c91d2
--- a/app-office/akonadi-server/akonadi-server-1.11.0.ebuild
+++ b/app-office/akonadi-server/akonadi-server-1.11.0.ebuild
@ -1,126 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/akonadi-server/akonadi-server-1.11.0.ebuild,v 1.7 2014/11/03 11:14:37 titanofold Exp $
-
-EAPI=5
-
-if [[ $PV = *9999* ]]; then
-	scm_eclass=git-2
-	EGIT_REPO_URI="git://anongit.kde.org/akonadi"
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="mirror://kde/stable/${PN/-server/}/src/${PN/-server/}-${PV}.tar.bz2 -> ${P}.tar.bz2"
-	KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-	S="${WORKDIR}/${P/-server/}"
-fi
-
-inherit cmake-utils ${scm_eclass}
-
-DESCRIPTION="The server part of Akonadi"
-HOMEPAGE="http://pim.kde.org/akonadi"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="+mysql postgres +qt4 qt5 sqlite test"
-
-REQUIRED_USE="^^ ( qt4 qt5 ) || ( sqlite mysql postgres )"
-
-CDEPEND="
-	dev-libs/boost:=
-	>=dev-libs/soprano-2.6.51
-	x11-misc/shared-mime-info
-	qt4? (
-		>=dev-qt/qtcore-4.8.5:4
-		>=dev-qt/qtdbus-4.8.5:4
-		>=dev-qt/qtgui-4.8.5:4
-		>=dev-qt/qtsql-4.8.5:4[mysql?,postgres?]
-		>=dev-qt/qttest-4.8.5:4
-	)
-	qt5? (
-		>=dev-libs/soprano-2.6.51[-qt4,qt5]
-		dev-qt/qtcore:5
-		dev-qt/qtdbus:5
-		dev-qt/qtgui:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtsql:5[mysql?,postgres?]
-		dev-qt/qttest:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtxml:5
-	)
-	sqlite? ( dev-db/sqlite:3 )
-"
-DEPEND="${CDEPEND}
-	dev-libs/libxslt
-	>=dev-util/automoc-0.9.88
-	test? ( sys-apps/dbus )
-"
-RDEPEND="${CDEPEND}
-	postgres? ( virtual/postgresql[server] )
-"
-
-pkg_setup() {
-	# Set default storage backend in order: MySQL, SQLite PostgreSQL
-	# reverse driver check to keep the order
-	if use postgres; then
-		DRIVER="QPSQL"
-		AVAILABLE+=" ${DRIVER}"
-	fi
-
-	if use sqlite; then
-		DRIVER="QSQLITE3"
-		AVAILABLE+=" ${DRIVER}"
-	fi
-
-	if use mysql; then
-		DRIVER="QMYSQL"
-		AVAILABLE+=" ${DRIVER}"
-	fi
-
-	# Notify about MySQL is recommend by upstream
-	if use sqlite || has_version "<${CATEGORY}/${P}[sqlite]"; then
-		ewarn
-		ewarn "We strongly recommend you change your Akonadi database backend to MySQL in your"
-		ewarn "user configuration. This is the backend recommended by KDE upstream."
-		ewarn "In particular, kde-base/kmail-4.10 does not work properly with the sqlite"
-		ewarn "backend anymore."
-		ewarn "You can select the backend in your ~/.config/akonadi/akonadiserverrc."
-		ewarn "Available drivers are:${AVAILABLE}"
-		ewarn
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DAKONADI_USE_STRIGI_SEARCH=OFF
-		-DINSTALL_QSQLITE_IN_QT_PREFIX=ON
-		$(cmake-utils_use test AKONADI_BUILD_TESTS)
-		$(cmake-utils_use sqlite AKONADI_BUILD_QSQLITE)
-		$(cmake-utils_use qt5 QT5_BUILD)
-	)
-
-	cmake-utils_src_configure
-}
-
-src_test() {
-	export $(dbus-launch)
-	cmake-utils_src_test
-}
-
-src_install() {
-	# Who knows, maybe it accidentally fixes our permission issues
-	cat <<-EOF > "${T}"/akonadiserverrc
-[%General]
-Driver=${DRIVER}
-EOF
-	insinto /usr/share/config/akonadi
-	doins "${T}"/akonadiserverrc
-
-	cmake-utils_src_install
-}
-
-pkg_postinst() {
-	elog "${DRIVER} has been set as your default akonadi storage backend."
-	elog "You can override it in your ~/.config/akonadi/akonadiserverrc."
-	elog "Available drivers are: ${AVAILABLE}"
-}
--- a/app-office/akonadi-server/akonadi-server-1.12.1-r1.ebuild
+++ b/app-office/akonadi-server/akonadi-server-1.12.1-r1.ebuild
@ -1,128 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/akonadi-server/akonadi-server-1.12.1-r1.ebuild,v 1.6 2014/11/03 11:14:37 titanofold Exp $
-
-EAPI=5
-
-if [[ $PV = *9999* ]]; then
-	scm_eclass=git-r3
-	EGIT_REPO_URI=( "git://anongit.kde.org/akonadi" )
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="mirror://kde/stable/${PN/-server/}/src/${P/-server/}.tar.bz2"
-	KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-	S="${WORKDIR}/${P/-server/}"
-fi
-
-inherit cmake-utils ${scm_eclass}
-
-DESCRIPTION="The server part of Akonadi"
-HOMEPAGE="http://pim.kde.org/akonadi"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="+mysql postgres +qt4 qt5 soprano sqlite test"
-
-REQUIRED_USE="^^ ( qt4 qt5 ) || ( sqlite mysql postgres )"
-
-CDEPEND="
-	dev-libs/boost:=
-	x11-misc/shared-mime-info
-	qt4? (
-		>=dev-qt/qtcore-4.8.5:4
-		>=dev-qt/qtdbus-4.8.5:4
-		>=dev-qt/qtgui-4.8.5:4
-		>=dev-qt/qtsql-4.8.5:4[mysql?,postgres?]
-		>=dev-qt/qttest-4.8.5:4
-	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtdbus:5
-		dev-qt/qtgui:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtsql:5[mysql?,postgres?]
-		dev-qt/qttest:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtxml:5
-		soprano? ( dev-libs/soprano[-qt4,qt5] )
-	)
-	soprano? ( dev-libs/soprano )
-	sqlite? ( dev-db/sqlite:3 )
-"
-DEPEND="${CDEPEND}
-	dev-libs/libxslt
-	>=dev-util/automoc-0.9.88
-	test? ( sys-apps/dbus )
-"
-RDEPEND="${CDEPEND}
-	postgres? ( virtual/postgresql[server] )
-"
-
-PATCHES=( "${FILESDIR}/${P}-db-initialize.patch" )
-
-pkg_setup() {
-	# Set default storage backend in order: MySQL, SQLite PostgreSQL
-	# reverse driver check to keep the order
-	if use postgres; then
-		DRIVER="QPSQL"
-		AVAILABLE+=" ${DRIVER}"
-	fi
-
-	if use sqlite; then
-		DRIVER="QSQLITE3"
-		AVAILABLE+=" ${DRIVER}"
-	fi
-
-	if use mysql; then
-		DRIVER="QMYSQL"
-		AVAILABLE+=" ${DRIVER}"
-	fi
-
-	# Notify about MySQL is recommend by upstream
-	if use sqlite || has_version "<${CATEGORY}/${P}[sqlite]"; then
-		ewarn
-		ewarn "We strongly recommend you change your Akonadi database backend to MySQL in your"
-		ewarn "user configuration. This is the backend recommended by KDE upstream."
-		ewarn "In particular, kde-base/kmail-4.10 does not work properly with the sqlite"
-		ewarn "backend anymore."
-		ewarn "You can select the backend in your ~/.config/akonadi/akonadiserverrc."
-		ewarn "Available drivers are:${AVAILABLE}"
-		ewarn
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DINSTALL_QSQLITE_IN_QT_PREFIX=ON
-		$(cmake-utils_use test AKONADI_BUILD_TESTS)
-		$(cmake-utils_use_with soprano)
-		$(cmake-utils_use sqlite AKONADI_BUILD_QSQLITE)
-		$(cmake-utils_use qt5 QT5_BUILD)
-	)
-
-	cmake-utils_src_configure
-}
-
-src_test() {
-	export $(dbus-launch)
-	cmake-utils_src_test
-}
-
-src_install() {
-	# Who knows, maybe it accidentally fixes our permission issues
-	cat <<-EOF > "${T}"/akonadiserverrc
-[%General]
-Driver=${DRIVER}
-EOF
-	insinto /usr/share/config/akonadi
-	doins "${T}"/akonadiserverrc
-
-	cmake-utils_src_install
-}
-
-pkg_postinst() {
-	elog "${DRIVER} has been set as your default akonadi storage backend."
-	elog "You can override it in your ~/.config/akonadi/akonadiserverrc."
-	elog "Available drivers are: ${AVAILABLE}"
-}
--- a/app-office/akonadi-server/akonadi-server-1.13.0.ebuild
+++ b/app-office/akonadi-server/akonadi-server-1.13.0.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/akonadi-server/akonadi-server-1.13.0.ebuild,v 1.7 2014/11/24 15:28:30 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/akonadi-server/akonadi-server-1.13.0.ebuild,v 1.8 2014/12/09 17:18:39 kensington Exp $

 EAPI=5

@ -64,8 +64,8 @@ RESTRICT="test"
 pkg_pretend() {
 	if [[ ${MERGE_TYPE} != binary ]]; then
 		[[ $(gcc-major-version) -lt 4 ]] || \
-			( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 7 ]] ) \
-			&& die "Sorry, but gcc-4.7 and earlier won't work (see bug #520102)."
+			( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]] ) \
+			&& die "Sorry, but gcc-4.6 and earlier won't work (see bug #520102)."
 	fi
 }

--- a/app-office/akonadi-server/files/akonadi-server-1.12.1-db-initialize.patch
+++ b/app-office/akonadi-server/files/akonadi-server-1.12.1-db-initialize.patch
@ -1,41 +0,0 @@
-commit 4ca8b846baaad48ebbd723f6411f9571a3b0f5ad
-Author: Dan Vrátil <dvratil@redhat.com>
-Date:   Tue Apr 22 11:28:07 2014 +0200
-
-    Remove the invalid GID part from PartTable before starting PartTable migration
-    
-    More people than we expected have invalid 'GID' part in their PartTable,
-    which breaks migration to schema 25, because it expects all part types
-    to have a valid name.
-    
-    To work around this fact, we DELETE all parts with name 'GID' from PartTable
-    before starting the actual migration. This will not fix the migration for
-    people with other invalid parts, but I haven't heard of any such. To make
-    this completely bullet-proof, we would need to iterate through all entries,
-    which would be massively slower than current INSERT INTO ... SELECT FROM approach.
-    
-    Distributions, this is a good choice for backporting into 1.12.1 ;-)
-    
-    BUG: 331867
-    FIXED-IN: 1.12.2
-
-diff --git a/server/src/storage/dbupdater.cpp b/server/src/storage/dbupdater.cpp
-index ccaf584..d6368b5 100644
--- a/server/src/storage/dbupdater.cpp
-+++ b/server/src/storage/dbupdater.cpp
-@@ -261,6 +261,15 @@ bool DbUpdater::complexUpdate_25()
-     }
-   }
- 
-+  {
-+    // It appears that more users than expected have the invalid "GID" part in their
-+    // PartTable, which breaks the migration below (see BKO#331867), so we apply this
-+    // wanna-be fix to remove the invalid part before we start the actual migration.
-+    QueryBuilder qb( QLatin1String( "PartTable" ), QueryBuilder::Delete );
-+    qb.addValueCondition( QLatin1String( "PartTable.name" ), Query::Equals, QLatin1String( "GID" ) );
-+    qb.exec();
-+  }
-+
-   akDebug() << "Creating a PartTable_new";
-   {
-     TableDescription description;
--- a/app-text/atril/Manifest
+++ b/app-text/atril/Manifest
@ -1 +1,2 @@
 DIST atril-1.8.0.tar.xz 1572068 SHA256 99f4f1e100a4eec696feabbb56d653addd8dbe851c9748d2e929e158524c2dad SHA512 054c1391ea3de196a240b1d0b6eb7402a1472475979ff9603396df7f47b32ed681855aff37c379c7e02e814209e6511c8e3fcc8c13c12b795ff6fd7a0ecdca56 WHIRLPOOL 40e3700485c5c018e5369e410fc24bc18ede6b0be6624777c2df59fff0389cec4ca4331514c70b7547782cc4afde3d75f706b232a260fff21dd758805153f335
+DIST atril-1.8.1.tar.xz 1577776 SHA256 036b6bdf9f9caa7468c0cfb680360420cf8477007a0a04dc3b5c50b163c0333f SHA512 1a4a36135a39d216f1cfe5fb91c9d3c16d11da92fbb6b08c314ee09877c7232022a6653649a109ee7a7838a219015f5caab68b2a210399db96f87e4bae520518 WHIRLPOOL 7134a87e8cb3f490677f95f1b05716a4f14e2f8db2bd72d72e9462b061042d9247aca1340b606654aedded43277539c229999198734c4c614842c1aeb2f94fce
--- a/app-text/atril/atril-1.8.1.ebuild
+++ b/app-text/atril/atril-1.8.1.ebuild
@ -0,0 +1,101 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/atril/atril-1.8.1.ebuild,v 1.1 2014/12/09 22:48:41 tamiko Exp $
+
+EAPI="5"
+
+ELTCONF="--portage"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+
+inherit autotools gnome2 versionator
+
+MATE_BRANCH="$(get_version_component_range 1-2)"
+
+SRC_URI="http://pub.mate-desktop.org/releases/${MATE_BRANCH}/${P}.tar.xz"
+DESCRIPTION="Atril document viewer for MATE"
+HOMEPAGE="http://mate-desktop.org"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="caja dbus debug djvu dvi +introspection gnome-keyring +ps t1lib tiff xps"
+
+RDEPEND=">=app-text/poppler-0.14:0=[cairo]
+	app-text/rarian:0
+	dev-libs/atk:0
+	>=dev-libs/glib-2.32:2
+	>=dev-libs/libxml2-2.5:2
+	>=mate-base/mate-desktop-1.6:0
+	sys-libs/zlib:0
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-2.21.5:2[introspection?]
+	x11-libs/libICE:0
+	>=x11-libs/libSM-1:0
+	x11-libs/libX11:0
+	>=x11-libs/cairo-1.9.10:0
+	x11-libs/pango:0
+	>=x11-themes/mate-icon-theme-1.6:0
+	caja? ( || (
+		>=mate-base/caja-1.8:0[introspection?]
+		>=mate-base/mate-file-manager-1.6:0[introspection?]
+	) )
+	djvu? ( >=app-text/djvu-3.5.17:0 )
+	dvi? (
+		virtual/tex-base:0
+		t1lib? ( >=media-libs/t1lib-5:5 )
+	)
+	gnome-keyring? ( >=app-crypt/libsecret-0.5:0 )
+	introspection? ( >=dev-libs/gobject-introspection-0.6:0 )
+	ps? ( >=app-text/libspectre-0.2:0 )
+	tiff? ( >=media-libs/tiff-3.6:0 )
+	xps? ( >=app-text/libgxps-0.0.1:0 )
+	!!app-text/mate-document-viewer"
+
+DEPEND="${RDEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/yelp-tools:0
+	>=app-text/scrollkeeper-dtd-1:1.0
+	>=dev-util/intltool-0.35:*
+	virtual/pkgconfig:*
+	sys-devel/gettext:*"
+
+# Tests use dogtail which is not available on Gentoo.
+RESTRICT="test"
+
+src_prepare() {
+	# Fix .desktop categories, upstream bug #666346.
+	sed -e "s:GTK\;Graphics\;VectorGraphics\;Viewer\;:GTK\;Office\;Viewer\;Graphics\;VectorGraphics;:g" -i data/atril.desktop.in.in || die
+
+	# Always autoreconf due to lib path conflict.
+	eautoreconf
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Passing --disable-help would drop offline help, that would be inconsistent
+	# with helps of the most of GNOME apps that doesn't require network for that.
+	gnome2_src_configure \
+		--disable-tests \
+		--enable-comics \
+		--enable-pdf \
+		--enable-pixbuf \
+		--enable-thumbnailer \
+		--with-smclient=xsmp \
+		--with-platform=mate \
+		--with-gtk=2.0 \
+		$(use_enable dbus) \
+		$(use_enable djvu) \
+		$(use_enable dvi) \
+		$(use_with gnome-keyring keyring) \
+		$(use_enable introspection) \
+		$(use_enable caja) \
+		$(use_enable ps) \
+		$(use_enable t1lib) \
+		$(use_enable tiff) \
+		$(use_enable xps)
+}
+
+DOCS="AUTHORS NEWS README TODO"
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@ -5,5 +5,6 @@ DIST calibre-1.29.0.tar.xz 33022868 SHA256 b9cc2081528b72d7082e15efbc75b4edccf3e
 DIST calibre-1.43.0.tar.xz 35549180 SHA256 3c4ef17591e033e39ba804d18442f63c3ebc1683da776833d47d8aa2900f724d SHA512 ca3282e77da985bd6117c640f8665e92d664d8749897facb0c419f7427b850fb381e0b10b5c481f8b01434c3fe6faf7dc47c9f99d3bd9a485b3e15be9f045d81 WHIRLPOOL f6039261f9c986c7293b39d03d7aaafb6dabbbf3a9e586dc35b267950cebe9a1f5a5e09b179fdb55e921725a7e8a15ef1eb328d28cf169dde4cb9de972e57b5a
 DIST calibre-1.47.0.tar.xz 36581960 SHA256 efeb71a5bb4742a9c0a99038fdd97baa55c35e8ba5312e19e422c004bbf5b8c2 SHA512 c6131422891bed0615644336ad1dfc52803ff28d7d33994bea4a34f70655d12ab6b638432156665132805a900324742c41f8d5b7963f24eee4b68359fc433ece WHIRLPOOL dac2b04e195206d7956d7bdb5f45b37cd1e7a873db542d26bd0802d886fb9111aba1e603a795d03a2bf3b55d8cdb92671e11dfdc9fdcdc0707e280a380548f0b
 DIST calibre-1.48.0.tar.xz 35126680 SHA256 e704090f6611c5e374252c3f1b58e077ccd3170a3ea39893e5bf687287abf472 SHA512 0b70f16b10e6c9bbc24955baf74e8fc8e116aaaa1d75d018f5135f657606286de3bfffbebf3b367b2be52708deb05a162de919bba930dcbff59c4ec15c13b28d WHIRLPOOL 1a07a8c916119e92bdf41276db1aef572b704271808bcd6c3a0a4e823c8a76bd2f4267765dee2f378430beec401288b25b35dee6859980adf5b7a9ebe885eff9
+DIST calibre-2.12.0.tar.xz 35743900 SHA256 8e32f55086ce2f64855fae33df1799758b6b5cfbd9c8052af2ee59e30c56e3e2 SHA512 76c131d1b8c919abf96414f7b782040c75123b06ee9f097c1cd00c19b0b23148b7e4f0c44a95fbb76cb5d2b1219f9af175d5552a3b3344d5633c062567407bfe WHIRLPOOL 57a7422756f4b9cc00f0a35df2581e38af45fcafbca4a3e53280fb649d2f02f37164a80dbb545035462c3931716441740f7361aee4263b6fb120b724eb3d05a5
 DIST calibre-2.7.0.tar.xz 35548068 SHA256 4100ffc390a4c852a267c959b94d0c6d9606fb2a70f03b120826b99e59bb1e49 SHA512 9fbc9bf6a2bb72e17656b8f09690d6078dd8aa455c6c70b68b421ec24631f80e48928ba1820bd69f18caa29ef0b76d0f34b7910bd8e747003ebab930ea8654dd WHIRLPOOL d913898d024d6e36a04ffc7ddeafa1df6e6db793458a675db7f2880e6202891cd6c897fd3f51fd58f5031a0eb276bcc16f27ce13d90819b73e435279e1b5aa9d
 DIST calibre-2.9.0.tar.xz 35753312 SHA256 bc517af040066cadf44c62a15b45b4aadacdeeb1ef0dae2a42fa9a71a082db3c SHA512 5d402af6591befa304d35b911cb10fa44eadb744b1fc308043d0689278f31fa6dce150be40aec9f07c12d43ab5cde1b5ec657b8d94ab9f2b9eeb465a33ca0dfa WHIRLPOOL b72179ff97f4e4a9cf3b3aecfb3b9697c6b0076d4628e8957381ecc9e36640db2c51ef788c1f7c90f9d569adbc5adf05505b92ec2ff254fe9a4469ae00ebe1a2
--- a/app-text/calibre/calibre-2.12.0.ebuild
+++ b/app-text/calibre/calibre-2.12.0.ebuild
@ -0,0 +1,233 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-2.12.0.ebuild,v 1.1 2014/12/09 16:24:29 axs Exp $
+
+EAPI=5
+
+inherit eutils fdo-mime bash-completion-r1 multilib toolchain-funcs
+
+DESCRIPTION="Ebook management application"
+HOMEPAGE="http://calibre-ebook.com/"
+[[ ${PV} == ${PV%.*}.${PV#*.} ]] && MY_PV=${PV}.0 || MY_PV=${PV}
+SRC_URI="http://sourceforge.net/projects/calibre/files/${MY_PV}/${PN}-${MY_PV}.tar.xz"
+
+LICENSE="
+	GPL-3+
+	GPL-3
+	GPL-2+
+	GPL-2
+	GPL-1+
+	LGPL-3+
+	LGPL-2.1+
+	LGPL-2.1
+	BSD
+	MIT
+	Old-MIT
+	Apache-2.0
+	public-domain
+	|| ( Artistic GPL-1+ )
+	CC-BY-3.0
+	OFL-1.1
+	PSF-2
+	unRAR
+"
+
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="+udisks"
+
+# Note, dropped dep on 	>=app-text/poppler-0.20.2:=[qt4,xpdf-headers(+)] as #1, its qt5 now, and
+# 2, because repoman blew up when it was there, and my installed copy doesnt seem to link to it.
+
+COMMON_DEPEND="
+	>=app-text/podofo-0.8.2:=
+	>=dev-lang/python-2.7.1:2.7[sqlite,ssl]
+	>=dev-libs/chmlib-0.40:=
+	>=dev-libs/icu-4.4:=
+	dev-libs/glib:2
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	>=media-gfx/imagemagick-6.5.9[jpeg,png]
+	media-libs/fontconfig
+	>=media-libs/freetype-2:=
+	>=media-libs/libmtp-1.1.5:=
+	sys-libs/zlib
+	udisks? ( virtual/libudev )
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXrender
+	>=dev-python/apsw-3.7.17[python_targets_python2_7(-)]
+	>=dev-python/beautifulsoup-3.0.5:python-2[python_targets_python2_7(-)]
+	dev-python/netifaces[python_targets_python2_7(-)]
+	>=dev-python/dnspython-1.6.0[python_targets_python2_7(-)]
+	>=dev-python/cssselect-0.7.1[python_targets_python2_7(-)]
+	>=dev-python/cssutils-0.9.9[python_targets_python2_7(-)]
+	>=dev-python/dbus-python-0.82.2[python_targets_python2_7(-)]
+	>=dev-python/lxml-3.2.1[python_targets_python2_7(-)]
+	>=dev-python/mechanize-0.1.11[python_targets_python2_7(-)]
+	>=dev-python/python-dateutil-1.4.1[python_targets_python2_7(-)]
+	>=dev-python/PyQt5-5.2.0[gui,svg,webkit,widgets,network,printsupport,python_targets_python2_7(-)]
+	media-fonts/liberation-fonts
+	>=media-libs/libwmf-0.2.8
+	virtual/libusb:1=
+	virtual/python-imaging[python_targets_python2_7(-)]
+	>=x11-misc/xdg-utils-1.0.2-r2"
+
+RDEPEND="${COMMON_DEPEND}
+	udisks? ( || ( sys-fs/udisks:2 sys-fs/udisks:0 ) )"
+
+DEPEND="${COMMON_DEPEND}
+	>=dev-python/setuptools-0.6_rc5
+	>=virtual/podofo-build-0.8.2"
+
+src_prepare() {
+	# Fix outdated version constant.
+	#sed -e "s#\\(^numeric_version =\\).*#\\1 (${PV//./, })#" \
+	#	-i src/calibre/constants.py || \
+	#	die "sed failed to patch constants.py"
+
+	# Avoid sandbox violation in /usr/share/gnome/apps when linux.py
+	# calls xdg-* (bug #258938).
+	sed -e "s|'xdg-desktop-menu', 'install'|\\0, '--mode', 'user'|" \
+		-e "s|check_call(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
+		-e "s|\\(CurrentDir(tdir)\\), \\\\\$|\\1:|" \
+		-e "s|PreserveMIMEDefaults():||" \
+		-e "s|xdg-icon-resource install|\\0 --mode user|" \
+		-e "s|cc(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
+		-e "s|'xdg-mime', 'install'|\\0, '--mode', 'user'|" \
+		-i src/calibre/linux.py || die "sed failed to patch linux.py"
+
+	# Disable unnecessary privilege dropping for bug #287067.
+	sed -e "s:if os.geteuid() == 0:if False and os.geteuid() == 0:" \
+		-i setup/install.py || die "sed failed to patch install.py"
+
+	sed -e "/^            self\\.check_call(qmc + \\[.*\\.pro'\\])$/a\
+\\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ self.check_call(['sed', \
+'-e', 's|^CFLAGS .*|\\\\\\\\0 ${CFLAGS}|', \
+'-e', 's|^CXXFLAGS .*|\\\\\\\\0 ${CXXFLAGS}|', \
+'-e', 's|^LFLAGS .*|\\\\\\\\0 ${LDFLAGS}|', \
+'-i', 'Makefile'])" \
+		-i setup/extensions.py || die "sed failed to patch extensions.py"
+
+	# use system beautifulsoup, instead of bundled
+	rm -f "${S}"/src/calibre/ebooks/BeautifulSoup.py \
+		|| die "could not remove bundled beautifulsoup"
+	find "${S}" -type f -name \*.py -exec \
+		sed -e 's/calibre.ebooks.BeautifulSoup/BeautifulSoup/' -i {} + \
+		|| die "could not sed bundled beautifulsoup out of the source tree"
+
+	# avoid failure of xdg tools to recognize vendor prefix
+	sed -e "s|xdg-icon-resource install|xdg-icon-resource install --novendor|" \
+		-e "s|'xdg-mime', 'install'|'xdg-mime', 'install', '--novendor'|" \
+		-e "s|'xdg-desktop-menu', 'install'|'xdg-desktop-menu', 'install', '--novendor'|" \
+		-i "${S}"/src/calibre/linux.py || die 'sed failed'
+
+	# no_updates: do not annoy user with "new version is availible all the time
+	# disable_plugins: walking sec-hole, wait for upstream to use GHNS interface
+	epatch \
+		"${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch" \
+		"${FILESDIR}/${PN}-disable_plugins.patch"
+}
+
+src_install() {
+	# Bypass kbuildsycoca and update-mime-database in order to
+	# avoid sandbox violations if xdg-mime tries to call them.
+	cat - > "${T}/kbuildsycoca" <<-EOF
+	#!${BASH}
+	echo $0 : $@
+	exit 0
+	EOF
+
+	cp "${T}"/{kbuildsycoca,update-mime-database}
+	chmod +x "${T}"/{kbuildsycoca,update-mime-database}
+
+	export QMAKE="/usr/lib/qt5/bin/qmake"
+
+	# Unset DISPLAY in order to prevent xdg-mime from triggering a sandbox
+	# violation with kbuildsycoca as in bug #287067, comment #13.
+	export -n DISPLAY
+
+	# Bug #352625 - Some LANGUAGE values can trigger the following ValueError:
+	#   File "/usr/lib/python2.6/locale.py", line 486, in getdefaultlocale
+	#    return _parse_localename(localename)
+	#  File "/usr/lib/python2.6/locale.py", line 418, in _parse_localename
+	#    raise ValueError, 'unknown locale: %s' % localename
+	#ValueError: unknown locale: 46
+	export -n LANGUAGE
+
+	# Bug #295672 - Avoid sandbox violation in ~/.config by forcing
+	# variables to point to our fake temporary $HOME.
+	export HOME="${T}/fake_homedir"
+	export XDG_CONFIG_HOME="${HOME}/.config"
+	export XDG_DATA_HOME="${HOME}/.local/share"
+	export CALIBRE_CONFIG_DIRECTORY="${XDG_CONFIG_HOME}/calibre"
+	mkdir -p "${XDG_DATA_HOME}" "${CALIBRE_CONFIG_DIRECTORY}"
+
+	tc-export CC CXX
+	# Bug #334243 - respect LDFLAGS when building extensions
+	export OVERRIDE_CFLAGS="$CFLAGS" OVERRIDE_LDFLAGS="$LDFLAGS"
+	local libdir=$(get_libdir)
+	[[ -n $libdir ]] || die "get_libdir returned an empty string"
+
+	# Bug #472690 - Avoid sandbox violation for /dev/dri/card0.
+	local x
+	for x in /dev/dri/card[0-9] ; do
+		[[ -e ${x} ]] && addpredict ${x}
+	done
+
+	dodir "/usr/$(get_libdir)/python2.7/site-packages" # for init_calibre.py
+	PATH=${T}:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
+	"${EPREFIX}"/usr/bin/python2.7 setup.py install \
+		--root="${D}" \
+		--prefix="${EPREFIX}/usr" \
+		--libdir="${EPREFIX}/usr/${libdir}" \
+		--staging-root="${ED}usr" \
+		--staging-libdir="${ED}usr/${libdir}" || die
+
+	grep -rlZ "${ED}" "${ED}" | xargs -0 sed -e "s:${D}:/:g" -i ||
+		die "failed to fix harcoded \$D in paths"
+
+	# The menu entries end up here due to '--mode user' being added to
+	# xdg-* options in src_prepare.
+	dodir /usr/share/mime/packages
+	chmod -fR a+rX,u+w,g-w,o-w "${HOME}"/.local
+	mv "${HOME}"/.local/share/mime/packages/* "${ED}"usr/share/mime/packages/ ||
+		die "failed to register mime types"
+	dodir /usr/share/icons
+	mv "${HOME}"/.local/share/icons/* "${ED}"usr/share/icons/ ||
+		die "failed to install icon files"
+
+	domenu "${HOME}"/.local/share/applications/*.desktop ||
+		die "failed to install .desktop menu files"
+
+	find "${ED}"usr/share -type d -empty -delete
+
+	cd "${ED}"/usr/share/calibre/fonts/liberation || die
+	local x
+	for x in * ; do
+		[[ -f ${EROOT}usr/share/fonts/liberation-fonts/${x} ]] || continue
+		ln -sf "../../../fonts/liberation-fonts/${x}" "${x}" || die
+	done
+
+	einfo "Converting python shebangs"
+	while read -r -d $'\0' ; do
+		local shebang=$(head -n1 "$REPLY")
+		if [[ ${shebang} == "#!"*python* ]] ; then
+			sed -i -e "1s:.*:#!${EPREFIX}/usr/bin/python2.7:" "$REPLY" || \
+				die "sed failed"
+		fi
+	done < <(find "${ED}" -type f -print0)
+
+	einfo "Compiling python modules"
+	"${EPREFIX}"/usr/bin/python2.7 -m compileall -q -f \
+		-d "${EPREFIX}"/usr/lib/calibre "${ED}"usr/lib/calibre || die
+
+	newinitd "${FILESDIR}"/calibre-server.init calibre-server
+	newconfd "${FILESDIR}"/calibre-server.conf calibre-server
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
--- a/dev-db/unixODBC/unixODBC-2.3.2-r2.ebuild
+++ b/dev-db/unixODBC/unixODBC-2.3.2-r2.ebuild
@ -0,0 +1,53 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/unixODBC/unixODBC-2.3.2-r2.ebuild,v 1.1 2014/12/09 16:04:24 mgorny Exp $
+
+EAPI=5
+inherit libtool autotools-multilib eutils
+
+DESCRIPTION="A complete ODBC driver manager"
+HOMEPAGE="http://www.unixodbc.org/"
+SRC_URI="http://ftp.unixodbc.org/pub/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+minimal odbcmanual static-libs unicode"
+
+RDEPEND="|| (
+		dev-libs/libltdl:0[${MULTILIB_USEDEP}]
+		>=sys-devel/libtool-2.4.2-r1[${MULTILIB_USEDEP}]
+	)
+	>=sys-libs/readline-6.2_p5-r1[${MULTILIB_USEDEP}]
+	>=sys-libs/ncurses-5.9-r3[${MULTILIB_USEDEP}]
+	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
+	abi_x86_32? ( !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] )"
+DEPEND="${RDEPEND}
+	sys-devel/flex"
+
+DOCS="AUTHORS ChangeLog NEWS README"
+MULTILIB_CHOST_TOOLS=( /usr/bin/odbc_config )
+MULTILIB_WRAPPED_HEADERS=( /usr/include/unixodbc_conf.h )
+
+src_configure() {
+	# --enable-driver-conf is --enable-driverc as per configure.in
+	myeconfargs=(
+		--sysconfdir="${EPREFIX}"/etc/${PN}
+		--enable-iconv
+		$(use_enable static-libs static)
+		$(use_enable !minimal drivers)
+		$(use_enable !minimal driverc)
+		$(use_with unicode iconv-char-enc UTF8)
+		$(use_with unicode iconv-ucode-enc UTF16LE)
+	)
+	autotools-multilib_src_configure
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	use prefix && dodoc README*
+	use odbcmanual && dohtml -a css,gif,html,sql,vsd -r doc/*
+
+	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
+}
--- a/dev-libs/libxml2/Manifest
+++ b/dev-libs/libxml2/Manifest
@ -1,4 +1,3 @@
-DIST libxml2-2.9.1.tar.gz 5172503 SHA256 fd3c64cb66f2c4ea27e934d275904d92cec494a8e8405613780cbc8a71680fdb SHA512 7b10de749485bc2eb2108063e97d89e70d6fbb78b1bf195ab5528c8c64e79483d55223a49d95934f4e00b00e906c18bdd34344703ffe158dcf08096905a44c1b WHIRLPOOL 5d2874527b637e666ca6afe710991aecb60c490de38edbe09a703c8e80c776d3f121544cc383146c336d46c573f3a3c9a2491c6c9cd5f22c5474d66dcb8ecf9b
 DIST libxml2-2.9.2.tar.gz 5444991 SHA256 5178c30b151d044aefb1b08bf54c3003a0ac55c59c866763997529d60770d5bc SHA512 a4e3b20e2efceed39c20379b32b746d4a1cf65c0cf7719d26c9bf7483c1f04a4e5a442ae2f36dc4ae8a4d011b67cfb58d9f6d0be034fa3e897a49059c9289565 WHIRLPOOL d7a77cb6ad49533cf62f6a759668e297a60dd7f70c9e13b29f682c64dfb25ae46eb9db552500130f40e3f969897bda996001d18236a4630e3713f6dd5acbe686
 DIST xmlts20080827.tar.gz 638940 SHA256 96151685cec997e1f9f3387e3626d61e6284d4d6e66e0e440c209286c03e9cc7 SHA512 7325d0977c4427fc4944b291ccf896a665f654cc24399e5565c12a849c2bc3aef4fa3ee42a09ac115abcb6570c51a8fbd052c38d64d164279ecdecad5a4e884d WHIRLPOOL 50835380c3ea208df0bf9ce032ed2df69c4c6cb5a53ffdd39a08fb4f1d166f311b2ef2fe0d9911ae1ebff92aeb42f6ea55e727dfe0b7a3b95e6c7240315b3eda
 DIST xsts-2002-01-16.tar.gz 6894439 SHA256 55e5c08db29946a91ea8e70e8f2418d3fd30d8b6777941dfba7f54726ffd9914 SHA512 43300af6d39c1e2221b0ed7318fe14c7464eeb6eb030ed1e22eb29b4ab17f014e2a4c8887c3a46ae5d243e3072da27f00f4e285498ae6f1288177d38d1108288 WHIRLPOOL 84dd51959460a4f8aa582d57ad39229c546ca7fe155012c57c368b59f5d31400d8b940a343a7320058330ca611303139cacdffed514783f96406ac5366026b11
--- a/dev-libs/libxml2/files/libxml2-2.9.0-manual-python.patch
+++ b/dev-libs/libxml2/files/libxml2-2.9.0-manual-python.patch
@ -1,45 +0,0 @@
-From 2a74d41325c9e8043a2beec8b957ddf66f57cfd5 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Tue, 18 Dec 2012 02:09:14 -0500
-Subject: [PATCH] build/test/install python bindings manually
-
-To support building for multiple python ABIs, we want to skip checks for
-python in configure, and build/test/install python bindings manually.
---
- configure.in | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/configure.in b/configure.in
-index 3d5f48b..b467c51 100644
--- a/configure.in
-+++ b/configure.in
-@@ -748,7 +748,7 @@ PYTHON_INCLUDES=
- PYTHON_SITE_PACKAGES=
- PYTHON_TESTS=
- pythondir=
-if test "$with_python" != "no" ; then
-+if false ; then
-     if test -x "$with_python/bin/python"
-     then
-         echo Found python in $with_python/bin/python
-@@ -823,7 +823,7 @@ if test "$with_python" != "no" ; then
- else
-     PYTHON=
- fi
-AM_CONDITIONAL(WITH_PYTHON, test "$PYTHON_INCLUDES" != "")
-+AM_CONDITIONAL(WITH_PYTHON, test "$with_python" != "no")
- if test "$PYTHON_INCLUDES" != ""
- then
-     PYTHON_SUBDIR=python
-@@ -1429,7 +1429,7 @@ else
-     echo "Enabled Schemas/Relax-NG support"
-     WITH_SCHEMAS=1
-     TEST_SCHEMAS="Schemastests Relaxtests"
-    if test "$PYTHON_INCLUDES" != "" ; then
-+    if test "$with_python" != "no" ; then
-         PYTHON_TESTS="$PYTHON_TESTS RelaxNGPythonTests SchemasPythonTests"
-     fi
-     with_regexps=yes
-- 
-1.8.0.2
-
--- a/dev-libs/libxml2/files/libxml2-2.9.0-thread-alloc.patch
+++ b/dev-libs/libxml2/files/libxml2-2.9.0-thread-alloc.patch
@ -1,65 +0,0 @@
-From 0ad948ede2b5060a144c72e4e27c38d24a272ef4 Mon Sep 17 00:00:00 2001
-From: Tim Starling <tstarling@wikimedia.org>
-Date: Mon, 29 Oct 2012 13:41:55 +1100
-Subject: [PATCH] Define LIBXML_THREAD_ALLOC_ENABLED via xmlversion.h
-
-Otherwise, direct calls to xmlFree() etc. from the application will
-use a different set of allocation functions to what was used to allocate
-the memory internally.
---
- configure.in                   | 4 +++-
- include/libxml/xmlversion.h.in | 9 +++++++++
- 2 files changed, 12 insertions(+), 1 deletion(-)
-
-diff --git a/configure.in b/configure.in
-index 6da057c..245c033 100644
--- a/configure.in
-+++ b/configure.in
-@@ -954,6 +954,7 @@ WITH_THREADS=0
- THREAD_CFLAGS=""
- TEST_THREADS=""
- THREADS_W32=""
-+WITH_THREAD_ALLOC=0
- 
- if test "$with_threads" = "no" ; then
-     echo Disabling multithreaded support
-@@ -1017,7 +1018,7 @@ else
-     fi
- fi
- if test "$with_thread_alloc" = "yes" -a "$WITH_THREADS" = "1" ; then
-    THREAD_CFLAGS="$THREAD_CFLAGS -DLIBXML_THREAD_ALLOC_ENABLED"
-+    WITH_THREAD_ALLOC=1
- fi
- 
- AC_SUBST(THREAD_LIBS)
-@@ -1025,6 +1026,7 @@ AC_SUBST(BASE_THREAD_LIBS)
- AC_SUBST(WITH_THREADS)
- AC_SUBST(THREAD_CFLAGS)
- AC_SUBST(TEST_THREADS)
-+AC_SUBST(WITH_THREAD_ALLOC)
- AM_CONDITIONAL([THREADS_W32],[test -n "$THREADS_W32"])
- 
- dnl
-diff --git a/include/libxml/xmlversion.h.in b/include/libxml/xmlversion.h.in
-index c98e7ca..00a836f 100644
--- a/include/libxml/xmlversion.h.in
-+++ b/include/libxml/xmlversion.h.in
-@@ -98,6 +98,15 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version);
- #endif
- 
- /**
-+ * LIBXML_THREAD_ALLOC_ENABLED:
-+ *
-+ * Whether the allocation hooks are per-thread
-+ */
-+#if @WITH_THREAD_ALLOC@
-+#define LIBXML_THREAD_ALLOC_ENABLED
-+#endif
-+
-+/**
-  * LIBXML_TREE_ENABLED:
-  *
-  * Whether the DOM like tree manipulation API support is configured in
-- 
-1.8.0
-
--- a/dev-libs/libxml2/files/libxml2-2.9.1-compression-detection.patch
+++ b/dev-libs/libxml2/files/libxml2-2.9.1-compression-detection.patch
@ -1,126 +0,0 @@
-From 63588f476f2dc89d4c6ef70a474d7230fbf4d45e Mon Sep 17 00:00:00 2001
-From: Daniel Veillard <veillard@redhat.com>
-Date: Fri, 10 May 2013 14:01:46 +0800
-Subject: [PATCH] Fix a regression in xmlGetDocCompressMode()
-
-The switch to xzlib had for consequence that the compression
-level of the input was not gathered anymore in ctxt->input->buf,
-then the parser compression flags was left to -1 and propagated
-to the resulting document.
-Fix the I/O layer to get compression detection in xzlib,
-then carry it in the input buffer and the resulting document
-
-  This should fix
-    https://lsbbugs.linuxfoundation.org/show_bug.cgi?id=3456
---
- parser.c |  4 ++++
- xmlIO.c  | 17 +++++++++++++++++
- xzlib.c  | 25 +++++++++++++++++++++++++
- xzlib.h  |  1 +
- 4 files changed, 47 insertions(+)
-
-diff --git a/parser.c b/parser.c
-index 1d478c3..4a442bb 100644
--- a/parser.c
-+++ b/parser.c
-@@ -10681,6 +10681,10 @@ xmlParseDocument(xmlParserCtxtPtr ctxt) {
-         ctxt->sax->startDocument(ctxt->userData);
-     if (ctxt->instate == XML_PARSER_EOF)
- 	return(-1);
-+    if ((ctxt->myDoc != NULL) && (ctxt->input != NULL) &&
-+        (ctxt->input->buf != NULL) && (ctxt->input->buf->compressed >= 0)) {
-+	ctxt->myDoc->compression = ctxt->input->buf->compressed;
-+    }
- 
-     /*
-      * The Misc part of the Prolog
-diff --git a/xmlIO.c b/xmlIO.c
-index 847cb7e..fc4e111 100644
--- a/xmlIO.c
-+++ b/xmlIO.c
-@@ -2669,6 +2669,12 @@ __xmlParserInputBufferCreateFilename(const char *URI, xmlCharEncoding enc) {
- #endif
- 	}
- #endif
-+#ifdef HAVE_LZMA_H
-+	if ((xmlInputCallbackTable[i].opencallback == xmlXzfileOpen) &&
-+		(strcmp(URI, "-") != 0)) {
-+            ret->compressed = __libxml2_xzcompressed(context);
-+	}
-+#endif
-     }
-     else
-       xmlInputCallbackTable[i].closecallback (context);
-@@ -3325,6 +3331,17 @@ xmlParserInputBufferGrow(xmlParserInputBufferPtr in, int len) {
-     if (res < 0) {
- 	return(-1);
-     }
-+
-+    /*
-+     * try to establish compressed status of input if not done already
-+     */
-+    if (in->compressed == -1) {
-+#ifdef HAVE_LZMA_H
-+	if (in->readcallback == xmlXzfileRead)
-+            in->compressed = __libxml2_xzcompressed(in->context);
-+#endif
-+    }
-+
-     len = res;
-     if (in->encoder != NULL) {
-         unsigned int use;
-diff --git a/xzlib.c b/xzlib.c
-index 928bd17..150e803 100644
--- a/xzlib.c
-+++ b/xzlib.c
-@@ -182,12 +182,37 @@ xz_open(const char *path, int fd, const char *mode ATTRIBUTE_UNUSED)
-     return (xzFile) state;
- }
- 
-+static int
-+xz_compressed(xzFile f) {
-+    xz_statep state;
-+
-+    if (f == NULL)
-+        return(-1);
-+    state = (xz_statep) f;
-+    if (state->init <= 0)
-+        return(-1);
-+
-+    switch (state->how) {
-+        case COPY:
-+	    return(0);
-+	case GZIP:
-+	case LZMA:
-+	    return(1);
-+    }
-+    return(-1);
-+}
-+
- xzFile
- __libxml2_xzopen(const char *path, const char *mode)
- {
-     return xz_open(path, -1, mode);
- }
- 
-+int
-+__libxml2_xzcompressed(xzFile f) {
-+    return xz_compressed(f);
-+}
-+
- xzFile
- __libxml2_xzdopen(int fd, const char *mode)
- {
-diff --git a/xzlib.h b/xzlib.h
-index 43c75e1..29ba55e 100644
--- a/xzlib.h
-+++ b/xzlib.h
-@@ -15,4 +15,5 @@ xzFile __libxml2_xzopen(const char *path, const char *mode);
- xzFile __libxml2_xzdopen(int fd, const char *mode);
- int __libxml2_xzread(xzFile file, void *buf, unsigned len);
- int __libxml2_xzclose(xzFile file);
-+int __libxml2_xzcompressed(xzFile f);
- #endif /* LIBXML2_XZLIB_H */
-- 
-1.8.3.2
-
--- a/dev-libs/libxml2/files/libxml2-2.9.1-external-param-entities.patch
+++ b/dev-libs/libxml2/files/libxml2-2.9.1-external-param-entities.patch
@ -1,39 +0,0 @@
-From 9cd1c3cfbd32655d60572c0a413e017260c854df Mon Sep 17 00:00:00 2001
-From: Daniel Veillard <veillard@redhat.com>
-Date: Tue, 22 Apr 2014 15:30:56 +0800
-Subject: [PATCH] Do not fetch external parameter entities
-
-Unless explicitely asked for when validating or replacing entities
-with their value. Problem pointed out by Daniel Berrange <berrange@redhat.com>
---
- parser.c | 14 ++++++++++++++
- 1 file changed, 14 insertions(+)
-
-diff --git a/parser.c b/parser.c
-index 9347ac9..c0dea05 100644
--- a/parser.c
-+++ b/parser.c
-@@ -2598,6 +2598,20 @@ xmlParserHandlePEReference(xmlParserCtxtPtr ctxt) {
- 		    xmlCharEncoding enc;
- 
- 		    /*
-+		     * Note: external parsed entities will not be loaded, it is
-+		     * not required for a non-validating parser, unless the
-+		     * option of validating, or substituting entities were
-+		     * given. Doing so is far more secure as the parser will
-+		     * only process data coming from the document entity by
-+		     * default.
-+		     */
-+                    if ((entity->etype == XML_EXTERNAL_PARAMETER_ENTITY) &&
-+		        ((ctxt->options & XML_PARSE_NOENT) == 0) &&
-+			((ctxt->options & XML_PARSE_DTDVALID) == 0) &&
-+			(ctxt->validate == 0))
-+			return;
-+
-+		    /*
- 		     * handle the extra spaces added before and after
- 		     * c.f. http://www.w3.org/TR/REC-xml#as-PE
- 		     * this is done independently.
-- 
-1.9.2
-
--- a/dev-libs/libxml2/files/libxml2-2.9.1-icu-pkgconfig.patch
+++ b/dev-libs/libxml2/files/libxml2-2.9.1-icu-pkgconfig.patch
@ -1,26 +0,0 @@
-diff --git a/configure.in b/configure.in
-index 7374564..13c8d4e 100644
--- a/configure.in
-+++ b/configure.in
-@@ -1444,19 +1444,11 @@ XML_LIBTOOLLIBS="libxml2.la"
- AC_SUBST(WITH_ICONV)
- 
- WITH_ICU=0
-ICU_LIBS=""
- if test "$with_icu" != "yes" ; then
-     echo Disabling ICU support
- else
-    ICU_CONFIG=icu-config
-    if ${ICU_CONFIG} --cflags >/dev/null 2>&1
-    then
-        ICU_LIBS=`${ICU_CONFIG} --ldflags`
-        WITH_ICU=1
-        echo Enabling ICU support
-    else
-        AC_MSG_ERROR([libicu config program icu-config not found])
-    fi
-+    PKG_CHECK_MODULES(ICU, icu-i18n)
-+    WITH_ICU=1
- fi
- AC_SUBST(WITH_ICU)
- AC_SUBST(ICU_LIBS)
--- a/dev-libs/libxml2/files/libxml2-2.9.1-missing-break.patch
+++ b/dev-libs/libxml2/files/libxml2-2.9.1-missing-break.patch
@ -1,25 +0,0 @@
-From 10ec19ab0a49936ca8ca0d6962d24d3f889960a5 Mon Sep 17 00:00:00 2001
-From: dcb <dcb314@hotmail.com>
-Date: Thu, 2 May 2013 16:11:46 +0800
-Subject: [PATCH] Fix missing break on last() function for attributes
-
-pointed out by cppcheck
---
- python/libxml.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/python/libxml.c b/python/libxml.c
-index 03cfb9f..3338b83 100644
--- a/python/libxml.c
-+++ b/python/libxml.c
-@@ -2683,6 +2683,7 @@ libxml_last(ATTRIBUTE_UNUSED PyObject * self, PyObject * args)
-                 xmlAttrPtr attr = (xmlAttrPtr) cur;
- 
-                 res = attr->last;
-+		break;
-             }
-         default:
-             res = NULL;
-- 
-1.8.3.2
-
--- a/dev-libs/libxml2/files/libxml2-2.9.1-non-ascii-cr-lf.patch
+++ b/dev-libs/libxml2/files/libxml2-2.9.1-non-ascii-cr-lf.patch
@ -1,168 +0,0 @@
-From dcc19503193c71596278a252064a8ce66331b3cd Mon Sep 17 00:00:00 2001
-From: Daniel Veillard <veillard@redhat.com>
-Date: Wed, 22 May 2013 22:56:45 +0200
-Subject: [PATCH] Fix a parsing bug on non-ascii element and CR/LF usage
-
-https://bugzilla.gnome.org/show_bug.cgi?id=698550
-
-Somehow the behaviour of the internal parser routine changed
-slightly when encountering CR/LF, which led to a bug when
-parsing document with non-ascii Names
---
- parser.c                   |  6 +++++-
- result/japancrlf.xml       |  4 ++++
- result/japancrlf.xml.rde   |  7 +++++++
- result/japancrlf.xml.rdr   |  7 +++++++
- result/japancrlf.xml.sax   | 11 +++++++++++
- result/japancrlf.xml.sax2  | 11 +++++++++++
- result/noent/japancrlf.xml |  4 ++++
- test/japancrlf.xml         |  6 ++++++
- 8 files changed, 55 insertions(+), 1 deletion(-)
- create mode 100644 result/japancrlf.xml
- create mode 100644 result/japancrlf.xml.rde
- create mode 100644 result/japancrlf.xml.rdr
- create mode 100644 result/japancrlf.xml.sax
- create mode 100644 result/japancrlf.xml.sax2
- create mode 100644 result/noent/japancrlf.xml
- create mode 100644 test/japancrlf.xml
-
-diff --git a/parser.c b/parser.c
-index 4a442bb..4739add 100644
--- a/parser.c
-+++ b/parser.c
-@@ -3404,6 +3404,7 @@ xmlParseNCNameComplex(xmlParserCtxtPtr ctxt) {
-     int len = 0, l;
-     int c;
-     int count = 0;
-+    const xmlChar *end; /* needed because CUR_CHAR() can move cur on \r\n */
- 
- #ifdef DEBUG
-     nbParseNCNameComplex++;
-@@ -3413,6 +3414,7 @@ xmlParseNCNameComplex(xmlParserCtxtPtr ctxt) {
-      * Handler for more complex cases
-      */
-     GROW;
-+    end = ctxt->input->cur;
-     c = CUR_CHAR(l);
-     if ((c == ' ') || (c == '>') || (c == '/') || /* accelerators */
- 	(!xmlIsNameStartChar(ctxt, c) || (c == ':'))) {
-@@ -3434,12 +3436,14 @@ xmlParseNCNameComplex(xmlParserCtxtPtr ctxt) {
- 	}
- 	len += l;
- 	NEXTL(l);
-+	end = ctxt->input->cur;
- 	c = CUR_CHAR(l);
- 	if (c == 0) {
- 	    count = 0;
- 	    GROW;
-             if (ctxt->instate == XML_PARSER_EOF)
-                 return(NULL);
-+	    end = ctxt->input->cur;
- 	    c = CUR_CHAR(l);
- 	}
-     }
-@@ -3448,7 +3452,7 @@ xmlParseNCNameComplex(xmlParserCtxtPtr ctxt) {
-         xmlFatalErr(ctxt, XML_ERR_NAME_TOO_LONG, "NCName");
-         return(NULL);
-     }
-    return(xmlDictLookup(ctxt->dict, ctxt->input->cur - len, len));
-+    return(xmlDictLookup(ctxt->dict, end - len, len));
- }
- 
- /**
-diff --git a/result/japancrlf.xml b/result/japancrlf.xml
-new file mode 100644
-index 0000000..60b307c
--- /dev/null
-+++ b/result/japancrlf.xml
-@@ -0,0 +1,4 @@
-+<?xml version="1.0"?>
-+<入力メッセージ xmlns="http://schemas.cordys.com/webapps/1.0/bpm/c8c8b82a-0ac0-3d19-01e2-bda74af9b826">
-+	<c8c:Ele xmlns:c8c="http://schemas.cordys.com/webapps/1.0/bpm/c8c8b82a-0ac0-3d19-01e2-bda74af9b826"/>
-+</入力メッセージ>
-diff --git a/result/japancrlf.xml.rde b/result/japancrlf.xml.rde
-new file mode 100644
-index 0000000..0bc5af7
--- /dev/null
-+++ b/result/japancrlf.xml.rde
-@@ -0,0 +1,7 @@
-+0 1 入力メッセージ 0 0
-+1 14 #text 0 1 
-+	
-+1 1 c8c:Ele 1 0
-+1 14 #text 0 1 
-+
-+0 15 入力メッセージ 0 0
-diff --git a/result/japancrlf.xml.rdr b/result/japancrlf.xml.rdr
-new file mode 100644
-index 0000000..0bc5af7
--- /dev/null
-+++ b/result/japancrlf.xml.rdr
-@@ -0,0 +1,7 @@
-+0 1 入力メッセージ 0 0
-+1 14 #text 0 1 
-+	
-+1 1 c8c:Ele 1 0
-+1 14 #text 0 1 
-+
-+0 15 入力メッセージ 0 0
-diff --git a/result/japancrlf.xml.sax b/result/japancrlf.xml.sax
-new file mode 100644
-index 0000000..c3bbdc6
--- /dev/null
-+++ b/result/japancrlf.xml.sax
-@@ -0,0 +1,11 @@
-+SAX.setDocumentLocator()
-+SAX.startDocument()
-+SAX.startElement(入力メッセージ, xmlns='http://schemas.cordys.com/webapps/1.0/bpm/c8c8b82a-0ac0-3d19-01e2-bda74af9b826')
-+SAX.characters(
-+	, 2)
-+SAX.startElement(c8c:Ele, xmlns:c8c='http://schemas.cordys.com/webapps/1.0/bpm/c8c8b82a-0ac0-3d19-01e2-bda74af9b826')
-+SAX.endElement(c8c:Ele)
-+SAX.characters(
-+, 1)
-+SAX.endElement(入力メッセージ)
-+SAX.endDocument()
-diff --git a/result/japancrlf.xml.sax2 b/result/japancrlf.xml.sax2
-new file mode 100644
-index 0000000..878eae4
--- /dev/null
-+++ b/result/japancrlf.xml.sax2
-@@ -0,0 +1,11 @@
-+SAX.setDocumentLocator()
-+SAX.startDocument()
-+SAX.startElementNs(入力メッセージ, NULL, 'http://schemas.cordys.com/webapps/1.0/bpm/c8c8b82a-0ac0-3d19-01e2-bda74af9b826', 1, xmlns='http://schemas.cordys.com/webapps/1.0/bpm/c8c8b82a-0ac0-3d19-01e2-bda74af9b826', 0, 0)
-+SAX.characters(
-+	, 2)
-+SAX.startElementNs(Ele, c8c, 'http://schemas.cordys.com/webapps/1.0/bpm/c8c8b82a-0ac0-3d19-01e2-bda74af9b826', 1, xmlns:c8c='http://schemas.cordys.com/webapps/1.0/bpm/c8c8b82a-0ac0-3d19-01e2-bda74af9b826', 0, 0)
-+SAX.endElementNs(Ele, c8c, 'http://schemas.cordys.com/webapps/1.0/bpm/c8c8b82a-0ac0-3d19-01e2-bda74af9b826')
-+SAX.characters(
-+, 1)
-+SAX.endElementNs(入力メッセージ, NULL, 'http://schemas.cordys.com/webapps/1.0/bpm/c8c8b82a-0ac0-3d19-01e2-bda74af9b826')
-+SAX.endDocument()
-diff --git a/result/noent/japancrlf.xml b/result/noent/japancrlf.xml
-new file mode 100644
-index 0000000..60b307c
--- /dev/null
-+++ b/result/noent/japancrlf.xml
-@@ -0,0 +1,4 @@
-+<?xml version="1.0"?>
-+<入力メッセージ xmlns="http://schemas.cordys.com/webapps/1.0/bpm/c8c8b82a-0ac0-3d19-01e2-bda74af9b826">
-+	<c8c:Ele xmlns:c8c="http://schemas.cordys.com/webapps/1.0/bpm/c8c8b82a-0ac0-3d19-01e2-bda74af9b826"/>
-+</入力メッセージ>
-diff --git a/test/japancrlf.xml b/test/japancrlf.xml
-new file mode 100644
-index 0000000..480cb2d
--- /dev/null
-+++ b/test/japancrlf.xml
-@@ -0,0 +1,6 @@
-+<入力メッセージ
-+	xmlns="http://schemas.cordys.com/webapps/1.0/bpm/c8c8b82a-0ac0-3d19-01e2-bda74af9b826">
-+	<c8c:Ele
-+		xmlns:c8c="http://schemas.cordys.com/webapps/1.0/bpm/c8c8b82a-0ac0-3d19-01e2-bda74af9b826"
-+	/>
-+</入力メッセージ>
-\ No newline at end of file
-- 
-1.8.3.2
-
--- a/dev-libs/libxml2/files/libxml2-2.9.1-python-2.6.patch
+++ b/dev-libs/libxml2/files/libxml2-2.9.1-python-2.6.patch
@ -1,32 +0,0 @@
-From 722923bc9b788f028e4221c77138fc66735a3113 Mon Sep 17 00:00:00 2001
-From: Petr Sumbera <petr.sumbera@oracle.com>
-Date: Fri, 3 May 2013 22:25:38 +0800
-Subject: [PATCH] Fix for compilation with python 2.6.8
-
-Remap PyCapsule to PyCObject based on the macro being available
-instead of using the python version
---
- python/libxml_wrap.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/python/libxml_wrap.h b/python/libxml_wrap.h
-index a9b9739..53a0618 100644
--- a/python/libxml_wrap.h
-+++ b/python/libxml_wrap.h
-@@ -34,11 +34,11 @@
- #define PyBytes_AsString PyString_AsString
- #define PyBytes_AS_STRING PyString_AS_STRING
- #define PyBytes_GET_SIZE PyString_GET_SIZE
-
-+#endif
-+#ifndef PyCapsule_New
- #define PyCapsule_New PyCObject_FromVoidPtrAndDesc
- #define PyCapsule_CheckExact PyCObject_Check
- #define PyCapsule_GetPointer(o, n) PyCObject_GetDesc((o))
-
- #endif
- #endif
- 
-- 
-1.8.3.2
-
--- a/dev-libs/libxml2/files/libxml2-2.9.1-python3.patch
+++ b/dev-libs/libxml2/files/libxml2-2.9.1-python3.patch
@ -1,50 +0,0 @@
-From 927faac6113b625a9a3423eef8f144fc7d9a8547 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Wed, 10 Jul 2013 23:00:54 -0400
-Subject: [PATCH] python: fix drv_libxml2.py for python3 compatibility
-
-https://bugzilla.gnome.org/show_bug.cgi?id=703979
---
- python/drv_libxml2.py | 16 ++++++++++++----
- 1 file changed, 12 insertions(+), 4 deletions(-)
-
-diff --git a/python/drv_libxml2.py b/python/drv_libxml2.py
-index e43fb1d..c9075e6 100644
--- a/python/drv_libxml2.py
-+++ b/python/drv_libxml2.py
-@@ -34,12 +34,20 @@ TODO
- 
- """
- 
-__author__  = u"Stéphane Bidoul <sbi@skynet.be>"
-+__author__  = "Stéphane Bidoul <sbi@skynet.be>"
- __version__ = "0.3"
- 
-+import sys
- import codecs
-from types import StringType, UnicodeType
-StringTypes = (StringType,UnicodeType)
-+
-+if sys.version < "3":
-+    __author__  = codecs.unicode_escape_decode(__author__)[0]
-+
-+    from types import StringType, UnicodeType
-+    StringTypes = (StringType,UnicodeType)
-+
-+else:
-+    StringTypes = (str)
- 
- from xml.sax._exceptions import *
- from xml.sax import xmlreader, saxutils
-@@ -65,7 +73,7 @@ def _d(s):
- 
- try:
-     import libxml2
-except ImportError, e:
-+except ImportError as e:
-     raise SAXReaderNotAvailable("libxml2 not available: " \
-                                 "import error was: %s" % e)
- 
-- 
-1.8.3.2
-
--- a/dev-libs/libxml2/files/libxml2-2.9.1-python3a.patch
+++ b/dev-libs/libxml2/files/libxml2-2.9.1-python3a.patch
@ -1,55 +0,0 @@
-From 6dd7775f3506741093890d99f09c242e0b34b55f Mon Sep 17 00:00:00 2001
-From: Arfrever Frehtes Taifersar Arahesis <Arfrever.FTA@gmail..com>
-Date: Fri, 12 Jul 2013 11:18:11 +0800
-Subject: [PATCH] Another round of fixes for older versions of Python
-
---
- python/drv_libxml2.py | 14 ++++++--------
- 1 file changed, 6 insertions(+), 8 deletions(-)
-
-diff --git a/python/drv_libxml2.py b/python/drv_libxml2.py
-index c9075e6..c2ec3e2 100644
--- a/python/drv_libxml2.py
-+++ b/python/drv_libxml2.py
-@@ -40,14 +40,12 @@ __version__ = "0.3"
- import sys
- import codecs
- 
-if sys.version < "3":
-+if sys.version_info[0] < 3:
-     __author__  = codecs.unicode_escape_decode(__author__)[0]
- 
-    from types import StringType, UnicodeType
-    StringTypes = (StringType,UnicodeType)
-
-+    StringTypes = (str, unicode)
- else:
-    StringTypes = (str)
-+    StringTypes = str
- 
- from xml.sax._exceptions import *
- from xml.sax import xmlreader, saxutils
-@@ -73,9 +71,9 @@ def _d(s):
- 
- try:
-     import libxml2
-except ImportError as e:
-+except ImportError:
-     raise SAXReaderNotAvailable("libxml2 not available: " \
-                                "import error was: %s" % e)
-+                                "import error was: %s" % sys.exc_info()[1])
- 
- class Locator(xmlreader.Locator):
-     """SAX Locator adapter for libxml2.xmlTextReaderLocator"""
-@@ -142,7 +140,7 @@ class LibXml2Reader(xmlreader.XMLReader):
-         self.__parsing = 1
-         try:
-             # prepare source and create reader
-            if type(source) in StringTypes:
-+            if isinstance(source, StringTypes):
-                 reader = libxml2.newTextReaderFilename(source)
-             else:
-                 source = saxutils.prepare_input_source(source)
-- 
-1.8.3.2
-
--- a/dev-libs/libxml2/files/libxml2-2.9.1-xmllint-postvalid.patch
+++ b/dev-libs/libxml2/files/libxml2-2.9.1-xmllint-postvalid.patch
@ -1,32 +0,0 @@
-From 7c3c663e4f844aaecbb0cfc29567fe2ee9506fc4 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Fri, 16 May 2014 22:46:00 -0400
-Subject: [PATCH] xmllint: a posteriori validation needs to load exernal
- entities
-
-For https://bugzilla.gnome.org/show_bug.cgi?id=730290
---
- xmllint.c | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/xmllint.c b/xmllint.c
-index 9d46ac5..b142b3b 100644
--- a/xmllint.c
-+++ b/xmllint.c
-@@ -3530,7 +3530,12 @@ main(int argc, char **argv) {
- 	xmlLoadExtDtdDefaultValue |= XML_COMPLETE_ATTRS;
-     if (noent != 0) xmlSubstituteEntitiesDefault(1);
- #ifdef LIBXML_VALID_ENABLED
-    if (valid != 0) xmlDoValidityCheckingDefaultValue = 1;
-+    /* If we will validate only a posteriori, ensure that entities get loaded,
-+     * but suppress validation messages during initial parsing */
-+    if (postvalid != 0 && valid == 0)
-+	options |= XML_PARSE_DTDVALID | XML_PARSE_NOERROR | XML_PARSE_NOWARNING;
-+    else if (valid != 0)
-+	xmlDoValidityCheckingDefaultValue = 1;
- #endif /* LIBXML_VALID_ENABLED */
-     if ((htmlout) && (!nowrap)) {
- 	xmlGenericError(xmlGenericErrorContext,
-- 
-1.9.3
-
--- a/dev-libs/libxml2/libxml2-2.9.1-r4.ebuild
+++ b/dev-libs/libxml2/libxml2-2.9.1-r4.ebuild
@ -1,213 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/libxml2-2.9.1-r4.ebuild,v 1.12 2014/06/24 19:59:48 vapier Exp $
-
-EAPI="5"
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} )
-PYTHON_REQ_USE="xml"
-
-inherit libtool flag-o-matic eutils python-r1 autotools prefix multilib-minimal
-
-DESCRIPTION="Version 2 of the library to manipulate XML files"
-HOMEPAGE="http://www.xmlsoft.org/"
-
-LICENSE="MIT"
-SLOT="2"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="debug examples icu ipv6 lzma python readline static-libs test"
-
-XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite"
-XSTS_NAME_1="xmlschema2002-01-16"
-XSTS_NAME_2="xmlschema2004-01-14"
-XSTS_TARBALL_1="xsts-2002-01-16.tar.gz"
-XSTS_TARBALL_2="xsts-2004-01-14.tar.gz"
-XMLCONF_TARBALL="xmlts20080827.tar.gz"
-
-SRC_URI="ftp://xmlsoft.org/${PN}/${PN}-${PV/_rc/-rc}.tar.gz
-	test? (
-		${XSTS_HOME}/${XSTS_NAME_1}/${XSTS_TARBALL_1}
-		${XSTS_HOME}/${XSTS_NAME_2}/${XSTS_TARBALL_2}
-		http://www.w3.org/XML/Test/${XMLCONF_TARBALL} )"
-
-COMMON_DEPEND=">=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]
-	icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
-	lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[${MULTILIB_USEDEP}] )
-	python? ( ${PYTHON_DEPS} )
-	readline? ( sys-libs/readline:= )
-"
-RDEPEND="${COMMON_DEPEND}
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20131008-r6
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-util/gtk-doc-am
-	virtual/pkgconfig
-	hppa? ( >=sys-devel/binutils-2.15.92.0.2 )
-"
-
-S="${WORKDIR}/${PN}-${PV%_rc*}"
-
-src_unpack() {
-	# ${A} isn't used to avoid unpacking of test tarballs into $WORKDIR,
-	# as they are needed as tarballs in ${S}/xstc instead and not unpacked
-	unpack ${P/_rc/-rc}.tar.gz
-	cd "${S}"
-
-	if use test; then
-		cp "${DISTDIR}/${XSTS_TARBALL_1}" \
-			"${DISTDIR}/${XSTS_TARBALL_2}" \
-			"${S}"/xstc/ \
-			|| die "Failed to install test tarballs"
-		unpack ${XMLCONF_TARBALL}
-	fi
-}
-
-src_prepare() {
-	DOCS=( AUTHORS ChangeLog NEWS README* TODO* )
-
-	# Patches needed for prefix support
-	epatch "${FILESDIR}"/${PN}-2.7.1-catalog_path.patch
-	epatch "${FILESDIR}"/${PN}-2.8.0_rc1-winnt.patch
-
-	eprefixify catalog.c xmlcatalog.c runtest.c xmllint.c
-
-#	epunt_cxx # if we don't eautoreconf
-
-	# Important patches from 2.9.2
-	epatch "${FILESDIR}/${P}-missing-break.patch" \
-		"${FILESDIR}/${P}-python-2.6.patch" \
-		"${FILESDIR}/${P}-compression-detection.patch" \
-		"${FILESDIR}/${P}-non-ascii-cr-lf.patch" \
-		"${FILESDIR}/${PN}-2.9.1-python3.patch" \
-		"${FILESDIR}/${PN}-2.9.1-python3a.patch"
-
-	# Security fixes from 2.9.2
-	epatch "${FILESDIR}/${P}-external-param-entities.patch"
-
-	# https://bugzilla.gnome.org/show_bug.cgi?id=730290
-	epatch "${FILESDIR}/${PN}-2.9.1-xmllint-postvalid.patch"
-
-	# Please do not remove, as else we get references to PORTAGE_TMPDIR
-	# in /usr/lib/python?.?/site-packages/libxml2mod.la among things.
-	# We now need to run eautoreconf at the end to prevent maintainer mode.
-#	elibtoolize
-
-	# Use pkgconfig to find icu to properly support multilib
-	epatch "${FILESDIR}/${PN}-2.9.1-icu-pkgconfig.patch"
-
-	eautoreconf
-}
-
-multilib_src_configure() {
-	# filter seemingly problematic CFLAGS (#26320)
-	filter-flags -fprefetch-loop-arrays -funroll-loops
-
-	# USE zlib support breaks gnome2
-	# (libgnomeprint for instance fails to compile with
-	# fresh install, and existing) - <azarah@gentoo.org> (22 Dec 2002).
-
-	# The meaning of the 'debug' USE flag does not apply to the --with-debug
-	# switch (enabling the libxml2 debug module). See bug #100898.
-
-	# --with-mem-debug causes unusual segmentation faults (bug #105120).
-
-	libxml2_configure() {
-		ECONF_SOURCE="${S}" econf \
-			--with-html-subdir=${PF}/html \
-			--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-			$(use_with debug run-debug) \
-			$(use_with icu) \
-			$(use_with lzma) \
-			$(use_enable ipv6) \
-			$(use_enable static-libs static) \
-			$(multilib_native_use_with readline) \
-			$(multilib_native_use_with readline history) \
-			"$@"
-	}
-
-	libxml2_py_configure() {
-		mkdir -p "${BUILD_DIR}" || die # ensure python build dirs exist
-		run_in_build_dir libxml2_configure "--with-python=${PYTHON}" # odd build system
-	}
-
-	libxml2_configure --without-python # build python bindings separately
-
-	if multilib_is_native_abi && use python; then
-		python_parallel_foreach_impl libxml2_py_configure
-	fi
-}
-
-multilib_src_compile() {
-	default
-	if multilib_is_native_abi && use python; then
-		local native_builddir=${BUILD_DIR}
-		python_foreach_impl libxml2_py_emake top_builddir="${native_builddir}" all
-	fi
-}
-
-multilib_src_test() {
-	default
-	multilib_is_native_abi && use python && python_foreach_impl libxml2_py_emake test
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" \
-		EXAMPLES_DIR="${EPREFIX}"/usr/share/doc/${PF}/examples install
-
-	if multilib_is_native_abi && use python; then
-		python_foreach_impl libxml2_py_emake DESTDIR="${D}" install
-		python_foreach_impl python_optimize
-	fi
-}
-
-multilib_src_install_all() {
-	# on windows, xmllint is installed by interix libxml2 in parent prefix.
-	# this is the version to use. the native winnt version does not support
-	# symlinks, which makes repoman fail if the portage tree is linked in
-	# from another location (which is my default). -- mduft
-	if [[ ${CHOST} == *-winnt* ]]; then
-		rm -rf "${ED}"/usr/bin/xmllint
-		rm -rf "${ED}"/usr/bin/xmlcatalog
-	fi
-
-	rm -rf "${ED}"/usr/share/doc/${P}
-	einstalldocs
-
-	if ! use python; then
-		rm -rf "${ED}"/usr/share/doc/${PF}/python
-		rm -rf "${ED}"/usr/share/doc/${PN}-python-${PV}
-	fi
-
-	if ! use examples; then
-		rm -rf "${ED}/usr/share/doc/${PF}/examples"
-		rm -rf "${ED}/usr/share/doc/${PF}/python/examples"
-	fi
-
-	prune_libtool_files --modules
-}
-
-pkg_postinst() {
-	# We don't want to do the xmlcatalog during stage1, as xmlcatalog will not
-	# be in / and stage1 builds to ROOT=/tmp/stage1root. This fixes bug #208887.
-	if [[ "${ROOT}" != "/" ]]; then
-		elog "Skipping XML catalog creation for stage building (bug #208887)."
-	else
-		# need an XML catalog, so no-one writes to a non-existent one
-		CATALOG="${EROOT}etc/xml/catalog"
-
-		# we dont want to clobber an existing catalog though,
-		# only ensure that one is there
-		# <obz@gentoo.org>
-		if [[ ! -e ${CATALOG} ]]; then
-			[[ -d "${EROOT}etc/xml" ]] || mkdir -p "${EROOT}etc/xml"
-			"${EPREFIX}"/usr/bin/xmlcatalog --create > "${CATALOG}"
-			einfo "Created XML catalog in ${CATALOG}"
-		fi
-	fi
-}
-
-libxml2_py_emake() {
-	pushd "${BUILD_DIR}/python" > /dev/null || die
-	emake "$@"
-	popd > /dev/null
-}
--- a/dev-libs/libxml2/libxml2-2.9.1-r5.ebuild
+++ b/dev-libs/libxml2/libxml2-2.9.1-r5.ebuild
@ -1,217 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/libxml2-2.9.1-r5.ebuild,v 1.1 2014/09/03 09:51:22 mgorny Exp $
-
-EAPI="5"
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} )
-PYTHON_REQ_USE="xml"
-
-inherit libtool flag-o-matic eutils python-r1 autotools prefix multilib-minimal
-
-DESCRIPTION="Version 2 of the library to manipulate XML files"
-HOMEPAGE="http://www.xmlsoft.org/"
-
-LICENSE="MIT"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="debug examples icu ipv6 lzma python readline static-libs test"
-
-XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite"
-XSTS_NAME_1="xmlschema2002-01-16"
-XSTS_NAME_2="xmlschema2004-01-14"
-XSTS_TARBALL_1="xsts-2002-01-16.tar.gz"
-XSTS_TARBALL_2="xsts-2004-01-14.tar.gz"
-XMLCONF_TARBALL="xmlts20080827.tar.gz"
-
-SRC_URI="ftp://xmlsoft.org/${PN}/${PN}-${PV/_rc/-rc}.tar.gz
-	test? (
-		${XSTS_HOME}/${XSTS_NAME_1}/${XSTS_TARBALL_1}
-		${XSTS_HOME}/${XSTS_NAME_2}/${XSTS_TARBALL_2}
-		http://www.w3.org/XML/Test/${XMLCONF_TARBALL} )"
-
-COMMON_DEPEND=">=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]
-	icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
-	lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[${MULTILIB_USEDEP}] )
-	python? ( ${PYTHON_DEPS} )
-	readline? ( sys-libs/readline:= )
-"
-RDEPEND="${COMMON_DEPEND}
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20131008-r6
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-util/gtk-doc-am
-	virtual/pkgconfig
-	hppa? ( >=sys-devel/binutils-2.15.92.0.2 )
-"
-
-S="${WORKDIR}/${PN}-${PV%_rc*}"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/xml2-config
-)
-
-src_unpack() {
-	# ${A} isn't used to avoid unpacking of test tarballs into $WORKDIR,
-	# as they are needed as tarballs in ${S}/xstc instead and not unpacked
-	unpack ${P/_rc/-rc}.tar.gz
-	cd "${S}"
-
-	if use test; then
-		cp "${DISTDIR}/${XSTS_TARBALL_1}" \
-			"${DISTDIR}/${XSTS_TARBALL_2}" \
-			"${S}"/xstc/ \
-			|| die "Failed to install test tarballs"
-		unpack ${XMLCONF_TARBALL}
-	fi
-}
-
-src_prepare() {
-	DOCS=( AUTHORS ChangeLog NEWS README* TODO* )
-
-	# Patches needed for prefix support
-	epatch "${FILESDIR}"/${PN}-2.7.1-catalog_path.patch
-	epatch "${FILESDIR}"/${PN}-2.8.0_rc1-winnt.patch
-
-	eprefixify catalog.c xmlcatalog.c runtest.c xmllint.c
-
-#	epunt_cxx # if we don't eautoreconf
-
-	# Important patches from 2.9.2
-	epatch "${FILESDIR}/${P}-missing-break.patch" \
-		"${FILESDIR}/${P}-python-2.6.patch" \
-		"${FILESDIR}/${P}-compression-detection.patch" \
-		"${FILESDIR}/${P}-non-ascii-cr-lf.patch" \
-		"${FILESDIR}/${PN}-2.9.1-python3.patch" \
-		"${FILESDIR}/${PN}-2.9.1-python3a.patch"
-
-	# Security fixes from 2.9.2
-	epatch "${FILESDIR}/${P}-external-param-entities.patch"
-
-	# https://bugzilla.gnome.org/show_bug.cgi?id=730290
-	epatch "${FILESDIR}/${PN}-2.9.1-xmllint-postvalid.patch"
-
-	# Please do not remove, as else we get references to PORTAGE_TMPDIR
-	# in /usr/lib/python?.?/site-packages/libxml2mod.la among things.
-	# We now need to run eautoreconf at the end to prevent maintainer mode.
-#	elibtoolize
-
-	# Use pkgconfig to find icu to properly support multilib
-	epatch "${FILESDIR}/${PN}-2.9.1-icu-pkgconfig.patch"
-
-	eautoreconf
-}
-
-multilib_src_configure() {
-	# filter seemingly problematic CFLAGS (#26320)
-	filter-flags -fprefetch-loop-arrays -funroll-loops
-
-	# USE zlib support breaks gnome2
-	# (libgnomeprint for instance fails to compile with
-	# fresh install, and existing) - <azarah@gentoo.org> (22 Dec 2002).
-
-	# The meaning of the 'debug' USE flag does not apply to the --with-debug
-	# switch (enabling the libxml2 debug module). See bug #100898.
-
-	# --with-mem-debug causes unusual segmentation faults (bug #105120).
-
-	libxml2_configure() {
-		ECONF_SOURCE="${S}" econf \
-			--with-html-subdir=${PF}/html \
-			--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-			$(use_with debug run-debug) \
-			$(use_with icu) \
-			$(use_with lzma) \
-			$(use_enable ipv6) \
-			$(use_enable static-libs static) \
-			$(multilib_native_use_with readline) \
-			$(multilib_native_use_with readline history) \
-			"$@"
-	}
-
-	libxml2_py_configure() {
-		mkdir -p "${BUILD_DIR}" || die # ensure python build dirs exist
-		run_in_build_dir libxml2_configure "--with-python=${PYTHON}" # odd build system
-	}
-
-	libxml2_configure --without-python # build python bindings separately
-
-	if multilib_is_native_abi && use python; then
-		python_parallel_foreach_impl libxml2_py_configure
-	fi
-}
-
-multilib_src_compile() {
-	default
-	if multilib_is_native_abi && use python; then
-		local native_builddir=${BUILD_DIR}
-		python_foreach_impl libxml2_py_emake top_builddir="${native_builddir}" all
-	fi
-}
-
-multilib_src_test() {
-	default
-	multilib_is_native_abi && use python && python_foreach_impl libxml2_py_emake test
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" \
-		EXAMPLES_DIR="${EPREFIX}"/usr/share/doc/${PF}/examples install
-
-	if multilib_is_native_abi && use python; then
-		python_foreach_impl libxml2_py_emake DESTDIR="${D}" install
-		python_foreach_impl python_optimize
-	fi
-}
-
-multilib_src_install_all() {
-	# on windows, xmllint is installed by interix libxml2 in parent prefix.
-	# this is the version to use. the native winnt version does not support
-	# symlinks, which makes repoman fail if the portage tree is linked in
-	# from another location (which is my default). -- mduft
-	if [[ ${CHOST} == *-winnt* ]]; then
-		rm -rf "${ED}"/usr/bin/xmllint
-		rm -rf "${ED}"/usr/bin/xmlcatalog
-	fi
-
-	rm -rf "${ED}"/usr/share/doc/${P}
-	einstalldocs
-
-	if ! use python; then
-		rm -rf "${ED}"/usr/share/doc/${PF}/python
-		rm -rf "${ED}"/usr/share/doc/${PN}-python-${PV}
-	fi
-
-	if ! use examples; then
-		rm -rf "${ED}/usr/share/doc/${PF}/examples"
-		rm -rf "${ED}/usr/share/doc/${PF}/python/examples"
-	fi
-
-	prune_libtool_files --modules
-}
-
-pkg_postinst() {
-	# We don't want to do the xmlcatalog during stage1, as xmlcatalog will not
-	# be in / and stage1 builds to ROOT=/tmp/stage1root. This fixes bug #208887.
-	if [[ "${ROOT}" != "/" ]]; then
-		elog "Skipping XML catalog creation for stage building (bug #208887)."
-	else
-		# need an XML catalog, so no-one writes to a non-existent one
-		CATALOG="${EROOT}etc/xml/catalog"
-
-		# we dont want to clobber an existing catalog though,
-		# only ensure that one is there
-		# <obz@gentoo.org>
-		if [[ ! -e ${CATALOG} ]]; then
-			[[ -d "${EROOT}etc/xml" ]] || mkdir -p "${EROOT}etc/xml"
-			"${EPREFIX}"/usr/bin/xmlcatalog --create > "${CATALOG}"
-			einfo "Created XML catalog in ${CATALOG}"
-		fi
-	fi
-}
-
-libxml2_py_emake() {
-	pushd "${BUILD_DIR}/python" > /dev/null || die
-	emake "$@"
-	popd > /dev/null
-}
--- a/dev-perl/App-cpanminus/App-cpanminus-1.702.0.ebuild
+++ b/dev-perl/App-cpanminus/App-cpanminus-1.702.0.ebuild
@ -0,0 +1,25 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/App-cpanminus/App-cpanminus-1.702.0.ebuild,v 1.1 2014/12/09 21:28:31 dilfridge Exp $
+
+EAPI=5
+MODULE_AUTHOR=MIYAGAWA
+MODULE_VERSION=1.7020
+inherit perl-module
+
+DESCRIPTION='get, unpack, build and install modules from CPAN'
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	>=virtual/perl-ExtUtils-Install-1.460.0
+	>=virtual/perl-ExtUtils-MakeMaker-6.580.0
+	>=virtual/perl-Module-Build-0.38.0
+"
+DEPEND="${RDEPEND}
+	>=virtual/perl-ExtUtils-MakeMaker-6.300.0
+	test? ( virtual/perl-Test-Simple )
+"
+
+SRC_TEST="do parallel"
--- a/dev-perl/App-cpanminus/Manifest
+++ b/dev-perl/App-cpanminus/Manifest
@ -0,0 +1 @@
+DIST App-cpanminus-1.7020.tar.gz 311997 SHA256 3b40a3ec5f8ef66be78fd5129ec2c332e8e02458c9b4a60be988a7f7d698242d SHA512 05a49ce21eb324ecdb71017e3adaa8b14740837e44418dc67ac043ea01837f13390ebeb349f1d7bd36fb0f236fb978ae4d8236e4813340a41a047ffb367abf47 WHIRLPOOL f81dfd7bfc9172e7bbf8afe920ed788546f677cf84ff87a9e245fbaf62f0d73c94fb5a48c2cd2cd7bf86fa6068c3302637e15d716e705e548c17e8adc1ceca7e
--- a/dev-perl/App-cpanminus/metadata.xml
+++ b/dev-perl/App-cpanminus/metadata.xml
@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+    <herd>perl</herd>
+    <upstream>
+        <remote-id type="cpan">App-cpanminus</remote-id>
+        <remote-id type="cpan-module">App::cpanminus</remote-id>
+    </upstream>
+</pkgmetadata>
--- a/dev-perl/App-perlbrew/App-perlbrew-0.720.0.ebuild
+++ b/dev-perl/App-perlbrew/App-perlbrew-0.720.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-perl/App-perlbrew/App-perlbrew-0.720.0.ebuild,v 1.1 2014/12/09 21:21:52 dilfridge Exp $
+
+EAPI=5
+MODULE_AUTHOR=GUGOD
+MODULE_VERSION=0.72
+inherit perl-module
+
+DESCRIPTION='Manage perl installations in your $HOME'
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	>=dev-perl/CPAN-Perl-Releases-1.940.0
+	>=dev-perl/Capture-Tiny-0.250.0
+	>=dev-perl/Devel-PatchPerl-1.280.0
+	>=virtual/perl-Pod-Parser-1.620.0
+	>=dev-perl/local-lib-2.0.14
+"
+DEPEND="${RDEPEND}
+	>=virtual/perl-ExtUtils-MakeMaker-6.590.0
+	>=virtual/perl-File-Temp-0.230.400
+	>=dev-perl/IO-All-0.510.0
+	>=dev-perl/Path-Class-0.330.0
+	test? (
+		>=dev-perl/Test-Exception-0.320.0
+		>=virtual/perl-Test-Simple-1.1.2
+		>=dev-perl/Test-NoWarnings-1.40.0
+		>=dev-perl/Test-Output-1.30.0
+		>=dev-perl/Test-Spec-0.470.0
+	)
+"
+
+SRC_TEST="do parallel"
--- a/dev-perl/App-perlbrew/Manifest
+++ b/dev-perl/App-perlbrew/Manifest
@ -0,0 +1 @@
+DIST App-perlbrew-0.72.tar.gz 82509 SHA256 0fa6879f21750b15f96635cac4d70b2a06b515e88040d402379e8a64c8f3984c SHA512 e6e91e9300e02e2031386b4023b4974adbd8df22f18799618e2d3308df1af56ff9453dee7a4c1c38c530a5ca87b018b26f8b28d7cac1f41071e2d196d84b0892 WHIRLPOOL 54eb84df5362daa00484ec8b665cd24e130c98475c1c68dae3092050ae8da043e0d946669278fd68932710839f31d62484e519ee3171f1bf1b9d8dfae8f56051
--- a/dev-perl/App-perlbrew/metadata.xml
+++ b/dev-perl/App-perlbrew/metadata.xml
@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+    <herd>perl</herd>
+    <upstream>
+        <remote-id type="cpan">App-perlbrew</remote-id>
+        <remote-id type="cpan-module">App::perlbrew</remote-id>
+    </upstream>
+</pkgmetadata>
--- a/dev-perl/Config-JSON/Config-JSON-1.510.0.ebuild
+++ b/dev-perl/Config-JSON/Config-JSON-1.510.0.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-perl/Config-JSON/Config-JSON-1.510.0.ebuild,v 1.1 2014/12/09 22:57:38 dilfridge Exp $
+
+EAPI=5
+MODULE_AUTHOR="RIZEN"
+MODULE_VERSION="1.5100"
+inherit perl-module
+
+DESCRIPTION="A JSON based config file system"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	>=dev-perl/Any-Moose-0.130.0
+	>=virtual/perl-File-Temp-0.180.0
+	>=dev-perl/JSON-2.160.0
+	>=virtual/perl-Scalar-List-Utils-1.190.0
+
+"
+DEPEND="${RDEPEND}
+	>=virtual/perl-ExtUtils-MakeMaker-6.56
+	test? (
+		>=virtual/perl-Test-Simple-0.700.0
+		>=dev-perl/Test-Deep-0.95.0
+	)
+"
+
+SRC_TEST="do"
--- a/dev-perl/Config-JSON/Manifest
+++ b/dev-perl/Config-JSON/Manifest
@ -0,0 +1 @@
+DIST Config-JSON-1.5100.tar.gz 18190 SHA256 20deb04a4555fc440566aca58ab88a84cda01bed59ada85fa459aaf1c9370432 SHA512 09de924b251e14e98602dd1db74e09e975b0a6c4d0ddfb9a5ed3d32198f206ad51b79061e6f05122507baab45123379bfb589add17d7f2e0fab16ac71a2ce0f8 WHIRLPOOL 02cad6f48a3df504de08de9a1302537693717ae6edae3761aa34291dc9543913e1604f3e7d41285a7c001f3b0868825e8f90bb4e3e870a8c0c658d5c0ea353b2
--- a/dev-perl/Config-JSON/metadata.xml
+++ b/dev-perl/Config-JSON/metadata.xml
@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+        <herd>perl</herd>
+        <upstream>
+                <remote-id type="cpan">Config-JSON</remote-id>
+                <remote-id type="cpan-module">Config::JSON</remote-id>
+        </upstream>
+</pkgmetadata>
--- a/dev-perl/Inline-Python/Inline-Python-0.460.0.ebuild
+++ b/dev-perl/Inline-Python/Inline-Python-0.460.0.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/dev-perl/Inline-Python/Inline-Python-0.460.0.ebuild,v 1.1 2014/12/09 23:26:00 dilfridge Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+MODULE_AUTHOR=NINE
+MODULE_VERSION=0.46
+inherit python-single-r1 perl-module
+
+DESCRIPTION="Easy implementation of Python extensions"
+
+SLOT="0"
+KEYWORDS=""
+IUSE="test"
+
+RDEPEND="
+	virtual/perl-Data-Dumper
+	virtual/perl-Digest-MD5
+	>=dev-perl/Inline-0.46
+	${PYTHON_DEPS}
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? ( virtual/perl-Test-Simple )
+"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+SRC_TEST="do"
--- a/dev-perl/Inline-Python/Manifest
+++ b/dev-perl/Inline-Python/Manifest
@ -1 +1,2 @@
 DIST Inline-Python-0.43.tar.gz 51033 SHA256 17acf40ad04ef0b8fa19c914861ab6fa4b26df0087ef1ad1db17d2bf0f09c7c3 SHA512 7425686bcc983a76bc75d86dd24002e393365b0dd9c47c8cc3e2f64d9ed8dd25452fb91aa40fa50d940e280ef390a51905571bbb943d3a813613304defe84712 WHIRLPOOL 849e50824fc60dfc83dd7e9db69359d635edfa562372581e53e7707ec13c00684a9c491de327f8f49f3b866c18099d08ef54b205fef4465d6856823f76be007c
+DIST Inline-Python-0.46.tar.gz 55436 SHA256 f6332ddd2e8069a2c20f7f6528bc4f44643611ef4cff66d90e5b48dfdca5db0d SHA512 d7c26faf386ac74dddc0298d5d572117a9b0b9a604bf23d253e154f5cea7a3911b426cff9bae9cca2730ec1948a40a919bdef26c048035d2367f3e463581a68c WHIRLPOOL 4ad4dcccc889c6ff1a9352cc238c3d03866fe2bec498b5f63932fc7ceb20d02e315b6f6918aa2bec71059782ac476107e19192c84bef9b07463e518e28562266
--- a/dev-perl/Path-Class/Manifest
+++ b/dev-perl/Path-Class/Manifest
@ -1,2 +1,2 @@
-DIST Path-Class-0.31.tar.gz 32052 SHA256 b4555dabd473cf966e03317f68e632dd052ab31cf27f2eeb4847d3800fe9f63e SHA512 202aedda810b42b64026f8867f9ee1df4c0b4bf50975f1c72e630219a0916a74fe65caace19676020299feba414796d4229164bea6b9970c8867274688ccd05d WHIRLPOOL 526e9a0ca573c039bdea5be782298f0cb18f8af0d32376799ccdc5b32ab45989a14b3c96f1c714ec9340f0106d462fa86133b878077a85a11bfeb6ba13e5c970
 DIST Path-Class-0.32.tar.gz 32205 SHA256 320ba296e134170eaabb42ff3929f82419bedd4de98bf44babfaccef17d3ecb8 SHA512 e943f4ef8069718dbd41025f2eae2bb827e903e98eb7f9d906f70373d88e8dfeb4aeef80c49773afdfba026dc39e673cb2323cc439d3def2007c86e1fbefcc05 WHIRLPOOL 62eee04fb048df34c92e398880e6d3a47f84529fc30b1f0725da78bcc82b10d59026d1515b2ccd3ee86756af4ddb255d5dff71deb66cff69b09cbdf3530d16bb
+DIST Path-Class-0.35.tar.gz 34086 SHA256 9226b305196127d02529303dbd6c37802baafe736f0245cb089241ed25922aee SHA512 cfbd27bf4756bade7a9abd081eda79058c0225d4a803a34a2bfe2a6c2eef954908b33843f352c562599edc420ca7a0063e9f7fd9fdd1d608ecea230e585287e2 WHIRLPOOL 9db31ac3df38998edc1d58ac59ae46457e5286cb9da715be7e8f30701297ed2bad7cabd5c28a081f4af06b37ca4b0bfe81d376ab4262356f4f6e38a40da8dc5b
--- a/dev-perl/Path-Class/Path-Class-0.310.0.ebuild
+++ b/dev-perl/Path-Class/Path-Class-0.310.0.ebuild
@ -1,28 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Path-Class/Path-Class-0.310.0.ebuild,v 1.5 2013/05/16 15:49:14 ago Exp $
-
-EAPI=5
-
-MODULE_AUTHOR=KWILLIAMS
-MODULE_VERSION=0.31
-inherit perl-module
-
-DESCRIPTION="Cross-platform path specification manipulation"
-
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE="test"
-
-RDEPEND="
-	>=virtual/perl-File-Spec-0.870.0
-	virtual/perl-Scalar-List-Utils
-"
-DEPEND="${RDEPEND}
-	virtual/perl-Module-Build
-	test? (
-		virtual/perl-Test-Simple
-	)
-"
-
-SRC_TEST="do"
--- a/dev-perl/Path-Class/Path-Class-0.350.0.ebuild
+++ b/dev-perl/Path-Class/Path-Class-0.350.0.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/dev-perl/Path-Class/Path-Class-0.350.0.ebuild,v 1.1 2014/12/09 21:09:46 dilfridge Exp $
+
+EAPI=5
+
+MODULE_AUTHOR=KWILLIAMS
+MODULE_VERSION=0.35
+inherit perl-module
+
+DESCRIPTION="Cross-platform path specification manipulation"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE="test"
+
+RDEPEND="
+	virtual/perl-Carp
+	virtual/perl-Exporter
+	>=virtual/perl-File-Spec-3.260.0
+	virtual/perl-File-Temp
+	virtual/perl-IO
+	virtual/perl-Perl-OSType
+	virtual/perl-Scalar-List-Utils
+"
+DEPEND="${RDEPEND}
+	>=virtual/perl-Module-Build-0.360.100
+	>=virtual/perl-ExtUtils-MakeMaker-6.300.0
+	test? (
+		virtual/perl-Test-Simple
+	)
+"
+
+SRC_TEST="do"
--- a/dev-perl/Test-Output/Manifest
+++ b/dev-perl/Test-Output/Manifest
@ -1,2 +1,2 @@
-DIST Test-Output-0.16.tar.gz 11273 SHA256 da7350d6aa81f005c9cdfe1b7914d7567006df3d4cdecd1dc9ce35dc84bf11e0 SHA512 59e381aca8296461fc08feee70adf8825eb2ece83899baebde1716c379be2192709b093dbb168840c76b7039f8dae4dacfbc8d35787c21be602f30d309186aa1 WHIRLPOOL f6ec1753aa1929b03087f46f8e4f83da01a0f6bb2a07b4ba897032a1965a4a5e6b1c4825cf49576c2edcc5cb2d0e8c799888d68c5bb4fc46bb4ef8ee12c132f3
 DIST Test-Output-1.01.tar.gz 12277 SHA256 8d3529e2983b66bbef4fa3bbc3954971b9e6fc23b518443ac3c6bba8cd86e241 SHA512 50085c468d676e770a1a98221f40e332048501f0b7da32fab42e0e0824e630ab8fe45ddfe6b29bd3c560e420e34b5191774f79ee9e1fac59e79771aff56cf1ce WHIRLPOOL 492b5e46bfb373f1ea27005d047bda34181b93a0897bfe023f170fe2d2b1f49792d9f97ac558a3becec39cfcf765b9630ddbf1ca36dcb7767b2dd733a85d15e9
+DIST Test-Output-1.03.tar.gz 12346 SHA256 3110af65c6fc59b9fa46b08a47508c5e85f6edc6355f0879e28b11f9ad0c2989 SHA512 b7f793564c906f40444f249272dde55db1357923da72b6638634aece779d9cc5e8f4d7de0326fabb33e7c11eccf089069532f8f61529526467b579e1bacb4ee1 WHIRLPOOL 5fcbe799b28bd451141e44823548115242b02ad3555ae215b5427baefeeacfa7173c91fe0d9b6ff97ac2bbbaeef67d2a3147a8888b7175be5a3da99f80ffeed8
--- a/dev-perl/Test-Output/Test-Output-0.16.ebuild
+++ b/dev-perl/Test-Output/Test-Output-0.16.ebuild
@ -1,24 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Test-Output/Test-Output-0.16.ebuild,v 1.5 2013/07/08 09:41:09 vincent Exp $
-
-EAPI=5
-
-MODULE_AUTHOR=BDFOY
-inherit perl-module
-
-DESCRIPTION="Utilities to test STDOUT and STDERR messages"
-
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="test"
-
-RDEPEND="
-	dev-perl/Sub-Exporter
-	virtual/perl-Test-Simple"
-DEPEND="${RDEPEND}
-	test? ( >=dev-perl/Test-Tester-0.107
-		dev-perl/Test-Pod
-		dev-perl/Test-Pod-Coverage )"
-
-SRC_TEST=do
--- a/dev-perl/Test-Output/Test-Output-1.30.0.ebuild
+++ b/dev-perl/Test-Output/Test-Output-1.30.0.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/dev-perl/Test-Output/Test-Output-1.30.0.ebuild,v 1.1 2014/12/09 21:14:17 dilfridge Exp $
+
+EAPI=5
+
+MODULE_AUTHOR=BDFOY
+MODULE_VERSION=1.03
+inherit perl-module
+
+DESCRIPTION="Utilities to test STDOUT and STDERR messages"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="test"
+
+RDEPEND="
+	>=dev-perl/Capture-Tiny-0.170.0
+	>=virtual/perl-File-Temp-0.170.0
+	dev-perl/Sub-Exporter
+	virtual/perl-Test-Simple
+"
+DEPEND="${RDEPEND}
+	test? (
+		virtual/perl-Test-Simple
+		>=dev-perl/Test-Tester-0.107
+	)
+"
+
+SRC_TEST=do
--- a/dev-perl/Test-Spec/Manifest
+++ b/dev-perl/Test-Spec/Manifest
@ -0,0 +1 @@
+DIST Test-Spec-0.47.tar.gz 33344 SHA256 e425c0b9efa3c7e21496d31a607d072a63e31988c3d298a8c1fd7d145cc0681e SHA512 11e19765023ce504128f347c13eabf72c05fc803b061c430cc8507a7e270672282753e3874a35e02f1b09331c6befe0b110ca4eb1fdc99f5700505bcf2907ec0 WHIRLPOOL 43c3a03a630ad7799bc9af3ce6313ce5389904592b76472912d249c75b743a92f9505e3e9454c1a988f1af09c423c607a6a60f4b0ec6cad8d4ec52bb0a75f001
--- a/dev-perl/Test-Spec/Test-Spec-0.470.0.ebuild
+++ b/dev-perl/Test-Spec/Test-Spec-0.470.0.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/dev-perl/Test-Spec/Test-Spec-0.470.0.ebuild,v 1.1 2014/12/09 21:20:21 dilfridge Exp $
+
+EAPI=5
+MODULE_AUTHOR=PHILIP
+MODULE_VERSION=0.47
+inherit perl-module
+
+DESCRIPTION='Write tests in a declarative specification style'
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	virtual/perl-Carp
+	virtual/perl-Exporter
+	virtual/perl-Scalar-List-Utils
+	>=dev-perl/Package-Stash-0.230.0
+	virtual/perl-Test-Harness
+	>=dev-perl/Test-Deep-0.103.0
+	virtual/perl-Test-Simple
+	dev-perl/Test-Trap
+	dev-perl/Tie-IxHash
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+"
+
+SRC_TEST="do"
--- a/dev-perl/Test-Spec/metadata.xml
+++ b/dev-perl/Test-Spec/metadata.xml
@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+        <herd>perl</herd>
+        <upstream>
+                <remote-id type="cpan">Test-Spec</remote-id>
+                <remote-id type="cpan-module">Test::Spec</remote-id>
+                <remote-id type="cpan-module">Test::Spec::Context</remote-id>
+                <remote-id type="cpan-module">Test::Spec::ExportProxy</remote-id>
+                <remote-id type="cpan-module">Test::Spec::Mocks</remote-id>
+                <remote-id type="cpan-module">Test::Spec::Mocks::Expectation</remote-id>
+                <remote-id type="cpan-module">Test::Spec::Mocks::MockObject</remote-id>
+                <remote-id type="cpan-module">Test::Spec::Mocks::Stub</remote-id>
+                <remote-id type="cpan-module">Test::Spec::SharedHash</remote-id>
+        </upstream>
+</pkgmetadata>
--- a/dev-perl/local-lib/Manifest
+++ b/dev-perl/local-lib/Manifest
@ -0,0 +1,2 @@
+DIST local-lib-1.008026.tar.gz 67540 SHA256 4c8ce3b5bdf2ff1868153e84bc0ce0c503adec145a6de3664f031b9f54fd04c2 SHA512 8923abcf78794da4a1ce71005e43e179f7009b08c3b05e0a76c3a6c6d61961ed066f83f52548a07c55d0a7b58965f57ab3b3a16afdf820fe014476ef4b743396 WHIRLPOOL 3151fc70212df4a167924e20587513a4683ee5c92b56424964f82f14cb7563a49dce60d907a990442b5c89c7a4b5c0987810e4d3cf518171e998820a4eec2aee
+DIST local-lib-2.000014.tar.gz 51593 SHA256 ae63356ab780c5a3aa46287b48daea748a3dd021d9b52dff8bf480b43787fa2b SHA512 3a7bb68af992215eb6787082fea7c09d5468aabe5c6478d028ce99ae878f6efdd8982804ba2c396af1fc0a5b46a4fa7f0e4831d9c32f1abd41ef631976c5efe8 WHIRLPOOL 990e3ca60a88544a0394fbb994832aff9c50988dde0372d8d7e437a72c28d30bf27438acfb8423aa57965bf58140e7a3284d6151a80cbd51bffc4ed201b6e6c1
--- a/dev-perl/local-lib/files/1.008026/0001_No_CPAN.patch
+++ b/dev-perl/local-lib/files/1.008026/0001_No_CPAN.patch
@ -0,0 +1,42 @@
+--- Makefile.PL	2013-11-05 18:07:13.000000000 +0000
+++ Makefile.PL	2013-12-23 15:21:32.582135695 +0000
+@@ -37,6 +37,10 @@
+ DEATH
+ 
+ my $cwd;
+
+{ # GENTOO
+  last;
+
+ BEGIN {
+   $cwd = Cwd::cwd();
+   # watch out for fancy dashes. these can wind up in our @ARGV if the user is
+@@ -176,6 +180,8 @@
+   }
+ }
+ 
+} # END GENTOO
+
+ use inc::Module::Install;
+ 
+ name 'local-lib';
+@@ -185,6 +191,9 @@
+ requires 'ExtUtils::Install' => '1.43'; # version INSTALL_BASE was added
+ requires 'Module::Build' => '0.36'; # PERL_MB_OPT
+ 
+{ # GENTOO
+  last;
+
+ # don't bother fixing CPAN.pm if bootstrapped from cpanminus
+ unless ($ENV{PERL5_CPANM_IS_RUNNING}) {
+     my $required_CPAN = '1.82';
+@@ -251,6 +260,9 @@
+   auto_install;
+ }
+ chdir($cwd);
+
+} # END GENTOO
+
+ resources(
+   # r/w: p5sagit@git.shadowcat.co.uk:local-lib.git
+   repository => 'git://git.shadowcat.co.uk/p5sagit/local-lib.git',
--- a/dev-perl/local-lib/local-lib-1.8.26.ebuild
+++ b/dev-perl/local-lib/local-lib-1.8.26.ebuild
@ -0,0 +1,29 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/local-lib/local-lib-1.8.26.ebuild,v 1.1 2014/12/09 20:53:08 dilfridge Exp $
+
+EAPI=5
+MODULE_AUTHOR=HAARG
+MODULE_VERSION=1.008026
+inherit perl-module
+
+DESCRIPTION='create and use a local lib/ for perl modules with PERL5LIB'
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+PATCHES=(
+	"${FILESDIR}/${MODULE_VERSION}/0001_No_CPAN.patch"
+)
+
+RDEPEND="
+	>=virtual/perl-CPAN-1.820.0
+	>=virtual/perl-ExtUtils-Install-1.430.0
+	>=virtual/perl-ExtUtils-MakeMaker-6.740.0
+	>=virtual/perl-Module-Build-0.360.0
+"
+DEPEND="${RDEPEND}
+	>=virtual/perl-ExtUtils-MakeMaker-6.590.0
+"
+
+SRC_TEST="do parallel"
--- a/dev-perl/local-lib/local-lib-2.0.14.ebuild
+++ b/dev-perl/local-lib/local-lib-2.0.14.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-perl/local-lib/local-lib-2.0.14.ebuild,v 1.1 2014/12/09 21:05:05 dilfridge Exp $
+
+EAPI=5
+MODULE_AUTHOR=HAARG
+MODULE_VERSION=2.000014
+inherit perl-module
+
+DESCRIPTION='create and use a local lib/ for perl modules with PERL5LIB'
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	>=virtual/perl-CPAN-1.820.0
+	>=virtual/perl-ExtUtils-Install-1.430.0
+	>=virtual/perl-ExtUtils-MakeMaker-6.740.0
+	>=virtual/perl-Module-Build-0.360.0
+"
+DEPEND="${RDEPEND}
+	>=virtual/perl-ExtUtils-MakeMaker-6.590.0
+	test? ( virtual/perl-Test-Simple )
+"
+
+SRC_TEST="do parallel"
--- a/dev-perl/local-lib/metadata.xml
+++ b/dev-perl/local-lib/metadata.xml
@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+    <herd>perl</herd>
+    <upstream>
+        <remote-id type="cpan">local-lib</remote-id>
+        <remote-id type="cpan-module">lib::core::only</remote-id>
+        <remote-id type="cpan-module">local::lib</remote-id>
+    </upstream>
+</pkgmetadata>
--- a/dev-python/httpretty/httpretty-0.8.0.ebuild
+++ b/dev-python/httpretty/httpretty-0.8.0.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-python/httpretty/httpretty-0.8.0.ebuild,v 1.2 2014/02/25 12:22:02 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/httpretty/httpretty-0.8.0.ebuild,v 1.3 2014/12/10 03:43:10 patrick Exp $

 EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 )
+PYTHON_COMPAT=( python2_7 python3_{3,4} )

 inherit distutils-r1

@ -25,7 +25,8 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 		dev-python/sure[${PYTHON_USEDEP}]
 		dev-python/httplib2[${PYTHON_USEDEP}]
 		>=dev-python/requests-1.1[${PYTHON_USEDEP}]
-		>=www-servers/tornado-2.2[${PYTHON_USEDEP}] )"
+		>=www-servers/tornado-2.2[${PYTHON_USEDEP}]
+		dev-python/ipdb )"

 python_prepare_all() {
 	distutils-r1_python_prepare_all
--- a/dev-python/mako/mako-0.7.3-r2.ebuild
+++ b/dev-python/mako/mako-0.7.3-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-python/mako/mako-0.7.3-r2.ebuild,v 1.11 2014/09/30 09:52:08 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mako/mako-0.7.3-r2.ebuild,v 1.12 2014/12/10 06:45:16 patrick Exp $

 EAPI=5

@ -32,7 +32,7 @@ PATCHES=(
 )

 DOC_CONTENTS="
-${PN} can be enchanced with caching by dev-python/beaker"
+${PN} can be enhanced with caching by dev-python/beaker"

 python_test() {
 	cp -r -l test "${BUILD_DIR}"/ || die
--- a/dev-python/mako/mako-1.0.0.ebuild
+++ b/dev-python/mako/mako-1.0.0.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/mako/mako-1.0.0.ebuild,v 1.3 2014/11/20 06:54:12 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mako/mako-1.0.0.ebuild,v 1.4 2014/12/10 06:45:16 patrick Exp $

 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} )
@ -28,7 +28,7 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/${MY_P}"

 DOC_CONTENTS="
-${PN} can be enchanced with caching by dev-python/beaker"
+${PN} can be enhanced with caching by dev-python/beaker"

 python_test() {
 	cp -r -l test "${BUILD_DIR}"/ || die
--- a/dev-python/pylibmc/Manifest
+++ b/dev-python/pylibmc/Manifest
@ -1,2 +1,3 @@
 DIST pylibmc-1.2.3.tar.gz 47355 SHA256 0157c72ce8b6aeefe52c77be5e1d059481b58127e0f9d2d6c216f6b1c68da6dc SHA512 9eaf0c5879e52d786b14b5939fa846082c095059439dfa23cac73b74a00cde14bd3497492bf6f5b3d1a6bad79b216fb869d2d10064c8182a67baf82c58622cea WHIRLPOOL eafa066f3a14e54575e6d7300fdd5376cd3fa2317fc632a53269417b397319f70002afbe99ece401af7f75e0888ab44ffbb1ddbe0ec94d8d2b42e9fb0f78810c
 DIST pylibmc-1.3.0.tar.gz 49949 SHA256 a6945a4c77f96d5b744118805247fb24c09f1d353aebbce6dd510a6042689b45 SHA512 f8c729b9042ba130fa9aabb00643e94c4372a0477e9f4a90207b6b5389b14d280a81d33bd50c9aa59981d2cf4242c6eff651ead308e087e665711915fbb2b4c0 WHIRLPOOL 0647f6ebbcc28be62f619fb0b0aefeadf045acda880d713a8a7e1ccd6e451a94e5e6cf827fe73a88c2fe457b916995bf2b61c9d267557613ec66521c5d308d24
+DIST pylibmc-1.4.1.tar.gz 53360 SHA256 a00e75f5c76e573e95ac5b29cb8a816728930f29332c49c74dbfd326d598088f SHA512 9bc054139983afaa83921d89021cf5d97313751b5b68da8bf38be5015f7f02c4ecd9d6a551be141d6994e51f6a636a4cd678c59552ea94989038637413959ea8 WHIRLPOOL 46314b3fcfcf36a8ee699b05baaebbdd1952cd8517fc9150d1f6be391c577b91afde4ad1a83d2e3371263b0bd5c303a5ae4fd4d1531423c83685d8ab11a14a8c
--- a/dev-python/pylibmc/pylibmc-1.4.1.ebuild
+++ b/dev-python/pylibmc/pylibmc-1.4.1.ebuild
@ -0,0 +1,39 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pylibmc/pylibmc-1.4.1.ebuild,v 1.1 2014/12/10 04:06:29 patrick Exp $
+
+EAPI="5"
+PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Libmemcached wrapper written as a Python extension"
+HOMEPAGE="http://sendapatch.se/projects/pylibmc/ http://pypi.python.org/pypi/pylibmc"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND=">=dev-libs/libmemcached-0.32"
+DEPEND="${RDEPEND}
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+	sed -e "/with-info=1/d" -i setup.cfg
+	distutils-r1_python_prepare_all
+}
+
+src_test() {
+	DISTUTILS_NO_PARALLEL_BUILD=1 distutils-r1_src_test
+}
+
+python_test() {
+	local PIDDIR="${T}/${EPYTHON}-pylibmc"
+	mkdir "${PIDDIR}" || die
+	chmod 0777 "${PIDDIR}" || die
+	memcached -d -p 11219 -u nobody -l localhost -P "${PIDDIR}/m.pid" || die
+	MEMCACHED_PORT=11219 nosetests || die
+	kill `cat "${PIDDIR}/m.pid"`
+}
--- a/dev-python/pyramid/Manifest
+++ b/dev-python/pyramid/Manifest
@ -1,3 +1,4 @@
 DIST pyramid-1.4.3.tar.gz 2426125 SHA256 8484ceb740ae5e21bda40fa9f9a8fd3be2cdd323eb64ff7e21c0bf3b6388c5b7 SHA512 c892b261e6f866e369cf1327a084436554dd13989fbf96828c1db166cf3abe1a49c3be0c242cd59a6b97bc11291a6ec6864290c031cfa43f694b7f9577461aa5 WHIRLPOOL d6fd2e7af36ce7cb241f349590b9a8df82e7be4da72575397b2b5f33e38171a23a9741de87dad7bc2dd9acfb2510a67dae397b67534e8285909b989bf0c5d6cf
 DIST pyramid-1.5.1.tar.gz 2401767 SHA256 2fe0b4012f10444682acc0df3b9cb85c7cfff2508ba5cbe6db83f5f14b510d86 SHA512 70b04111020d0f02ef21c52c44d7b6a5e78d198daee0068921df048bcae8b07567aee05d57f1a9e7329ef418116a0f7682aee30c6f785a4d1ec847e2519e7cc5 WHIRLPOOL 16e17ccba24f6a76c4ef0f2e361580e832c6450f453f88229bf1204cd123719e08e8565bb46d8b0bef5b395af2dfa87cb7ac7a9dc0dc9a0cc2d019490716e151
+DIST pyramid-1.5.2.tar.gz 2422156 SHA256 12057e63c9c99f88bc71af12f00a5e2c934221122baf582c7365361cba45bdcc SHA512 531d68fb480cf1420e069025537968abebc17bed98bf25e9993b8c744a12c5031df4b9b09e6f775bb1176f305f2e2c8ddb176ff43d1b34a10f2181df74fac8b8 WHIRLPOOL 785706946338dee67c7472c8d0b97fea86b8695d2efe7da93c483acf6476e5501269732a24b1cec50e1b9bf723edab44e437785cfd833bd3263c0207bc4f3ad9
 DIST pyramid-1.5.tar.gz 2413504 SHA256 db3216f61d9dbb5358fcb3f9eb2d772948c5b2bc608eb2f643159b4abd993621 SHA512 158617587cacd1c660e97d65a92739a4b04c795f1bc08db6afea574a603fcbca7aa69f0389000ed1e69a067a9007a63996c273843a4e5b7e6135d9d46a283cd9 WHIRLPOOL 46c284cbbf3e94af1ff8c26651ea773558a1791436387a6f515ae4b82013f7764159ffa2d9f24d3502536993bd4caa54b79328f85afd90bfb5c507f15f086de7
--- a/dev-python/pyramid/pyramid-1.5.2.ebuild
+++ b/dev-python/pyramid/pyramid-1.5.2.ebuild
@ -0,0 +1,46 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyramid/pyramid-1.5.2.ebuild,v 1.1 2014/12/10 06:46:43 patrick Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} )
+
+inherit distutils-r1
+
+RESTRICT="test" # Can't package dependencies
+
+DESCRIPTION="A small open source Python web framework"
+HOMEPAGE="http://www.pylonsproject.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="repoze"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+#IUSE="test"
+# tests would pull in net-zope/zope-deprecation with its deps - not a good idea
+
+RDEPEND="
+	dev-python/chameleon[${PYTHON_USEDEP}]
+	dev-python/mako[${PYTHON_USEDEP}]
+	dev-python/webob[${PYTHON_USEDEP}]
+	dev-python/repoze-lru[${PYTHON_USEDEP}]
+	dev-python/mako[${PYTHON_USEDEP}]
+	net-zope/zope-interface[${PYTHON_USEDEP}]
+	dev-python/translationstring[${PYTHON_USEDEP}]
+	dev-python/pastedeploy[${PYTHON_USEDEP}]
+	dev-python/venusian[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	"
+	#test? ( dev-python/webtest[${PYTHON_USEDEP}]
+	#	dev-python/nose[${PYTHON_USEDEP}]
+	#	dev-python/coverage[${PYTHON_USEDEP}]
+	#	dev-python/virtualenv[${PYTHON_USEDEP}]
+	#	)
+	#"
+
+python_test() {
+	nosetests || die "Tests fail with ${EPYTHON}"
+}
--- a/dev-python/sure/sure-1.2.5-r1.ebuild
+++ b/dev-python/sure/sure-1.2.5-r1.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-python/sure/sure-1.2.5-r1.ebuild,v 1.1 2014/10/15 02:12:02 alunduil Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sure/sure-1.2.5-r1.ebuild,v 1.2 2014/12/10 03:08:52 patrick Exp $

 EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 pypy )
+PYTHON_COMPAT=( python2_7 python3_{3,4} pypy )

 inherit distutils-r1 vcs-snapshot

@ -19,7 +19,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="test"

 CDEPEND="
-	~dev-python/nose-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/nose-1.3.0[${PYTHON_USEDEP}]
 	~dev-python/rednose-0.4.1[${PYTHON_USEDEP}]
 "
 DEPEND="
--- a/dev-ruby/bourne/Manifest
+++ b/dev-ruby/bourne/Manifest
@ -1 +1,2 @@
 DIST bourne-1.5.0.gem 15872 SHA256 b96492d4805ca581173bc9e97b7a31f3986d749f94d42abc7bfef20d6ab7a8a1 SHA512 269731d6caea8865ebc12af390b65a4446c42fdfe7ed5308097bb612237a6917e8823ffd916eed67e7a6bcd21417cdfcb4c02325ab44bbaa204635047a7a3f0f WHIRLPOOL 1eef98d4c7c7080791ccaca0b81e8245584761136c9014687045ed81d223e91841a9b7aec448e7aa1ffa3e69b8e8d288b91e93be8b24b73b592066786f0cdba2
+DIST bourne-1.6.0.gem 15872 SHA256 c889471ee13e7aeda661d84a6bb86aa5665b8b69610e949ffde32f419a3a25a5 SHA512 85bdc52b7e86bc86882ac3d815088da1ea882f828613079075a90b3a40cc41ac87bc503b36ee4ee5812374eb1cd83602832b15f2aaf0e01ea54244cc14bf71ac WHIRLPOOL 99c25d0bce9af4e16b1993383066e241ba73efd0ee11b4623318c741ae5323cb09881b68813a1f9a7e48a1958049ba1f97dc37e4c9973f72e732c1085f7af324
--- a/dev-ruby/bourne/bourne-1.6.0.ebuild
+++ b/dev-ruby/bourne/bourne-1.6.0.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/dev-ruby/bourne/bourne-1.6.0.ebuild,v 1.1 2014/12/09 15:34:07 mrueg Exp $
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_TASK_TEST="MOCHA_OPTIONS=use_test_unit_gem test:units test:acceptance"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Extends mocha to allow detailed tracking and querying of stub and mock invocations"
+HOMEPAGE="http://github.com/thoughtbot/bourne"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/mocha-1.1:1.0"
+
+ruby_add_bdepend "test? ( dev-ruby/test-unit:2 )"
+
+all_ruby_prepare() {
+	sed -i -e '/git ls-files/d' "${RUBY_FAKEGEM_GEMSPEC}" || die
+	sed -i -e '/bundler/d' Rakefile || die
+}
--- a/dev-ruby/bunny/Manifest
+++ b/dev-ruby/bunny/Manifest
@ -1,7 +1,6 @@
-DIST bunny-1.2.1.gem 174080 SHA256 29ad6c80b1eb9094580369e37c517fbcd31aa5dc6d5ad95b3ccdaf1f49332c8e SHA512 c30da8a67207c81d8363d724aae39d2798a72a90b3f11fb4ac31abf9be88ebf1c43ce895552b2af74aece91713a1a53a9e0fdd736ddbdea7ab525211c6130bdb WHIRLPOOL abd17b36597088e8acc053c450fd87016f745407514ff2c63c7e3d831f5b1b6ce811f7b326fc7bccece2d669d88741b0b8eaa5c2e0f33a4dcfb2226050fc4640
-DIST bunny-1.2.2.gem 174080 SHA256 11e5522ccab1fa6942987da68bd52d19c522846f53f7c7fd8e6c0ecd16bd639a SHA512 7a71be87e90f5d1be448f908af1eabcf89e56b7ae94ebe26c9209e3c5ff7f457c93b483a18aa92b1f1592946977d362e3e307615c325e1ba95353a5eb855cc4f WHIRLPOOL 5f58dea99bcd4734771fa4caaa23a184e8c63894d0806b5e0dafd93befd87ae5f10436ceae913bf9af36e90ae63a5400f1106d627bef575ed42f45c702ddc9c1
 DIST bunny-1.3.1.gem 175104 SHA256 542e1c928d2d0d1fa3f5eecca624e91ea97edbc9c5579535a30e014dfb1ca4a4 SHA512 7eff120914db6e85abcea9b13b9c03ff7a9c46913d2f6f1cadfb5538a8c222bf294426345de4e6290d5b11e4f30be6e8b3f5f07a7f7a5f16dfda4fc89a35118f WHIRLPOOL afaa944155a7f99d3611cd47a53884081afcc892e69cfe68dfc9050c82411e652197709b9d82b816f349e76ff32040fa0088e8a8097a31fce807e2134497fa09
 DIST bunny-1.4.0.gem 175616 SHA256 7f66ac3e05ccc8769e29edb0de2ef1e774cdd954be0309f687496f408740cd22 SHA512 74f4f6660f3e34ca9cc20709432074e900791d3cfe4d9f769237b82ca1f55d294d63fce8b6d0abe594e4b4fb7b1f9534046c885ea50b9a34104ef655bd550e2e WHIRLPOOL b3f6324f0e7de23ac6837fd694be721f7418fb01e40754d8a37665507a3bc8ef754dba6509985059b471901474aad9bdff8b75476db3f073c02b12ec375bc2a2
 DIST bunny-1.4.1.gem 175616 SHA256 31ffea0583dbe2df270a9947125310ae0d1c738fc33313d6127fdc903190e063 SHA512 f6a77c6badfcf62649718c24b94e05a9b06e28f70d21301ce2cbe9e9d0e21efb48cde82725c9f0d65d761fad84e932ab05876569c2412cf458bc70b0987d32a0 WHIRLPOOL 8a86aa72b9b46b662915ae8a727f7d967e2017c3bcba6d24631313643eb6f369fb98db0f5d1070c9489fbf964c8d12528f84b7d29a13259c39dc10d4ddea344b
 DIST bunny-1.5.0.gem 178688 SHA256 9bc88dd4760ab29fabd304b47aec8abc4a28c59509d9ca791d120da7a41a6c9a SHA512 1271c268df9f8e75750ad6bea5f8a6ab51348acc5806c102c00d96d7094e723bb968b733df8a6ab212b4871bf1d1d59f87f7239ff90a242ef648bb118d24a7e6 WHIRLPOOL ca29470ee951e4814457909a80c641f07b2f5903e4b6974340dbc770308a0e799978928fe5690d6f0b7e285576c3551fe3a6613191b4e81f3c8a508b14906980
 DIST bunny-1.5.1.gem 178688 SHA256 0668e58dd5a020cb6614515276964b7d2563ca643a98d126429128b33d54f65e SHA512 82add6e87343d6c7df1dfc4cb5d91d413626e2b608b9a5a22397039aede3017fb400117c959a0274a4eb1bd737b724d7bbd98e901133f68428fc5cbed20df810 WHIRLPOOL e1d3bbc2df08dec252f07c981e5eb39b5f31f5358f0f3cf42aa40c393c0494086862acf7094e854a552cc295c77afbc7066a153a9400ced6087487d355fcc8fc
+DIST bunny-1.6.3.gem 180224 SHA256 3eb1339993db6ea5b8655be374c0427924c13bdc9cafee8141e513d334e0a52d SHA512 ceeca544cd05c78adb3bd3164ca84851b65270ecd069e923979b432abc92160642f334df088364ae9960b2c3523260a0ffcd06dd20b51bd798178231efa74a95 WHIRLPOOL 7a9a20240e15c3b480aa870c6270f08ba0d95d12d4ea68e71c444e5abe4933a9dfadbe3babf71c1e35c78a04be09a0d8c01159781b749db3be79189ddede9e13
--- a/dev-ruby/bunny/bunny-1.2.1.ebuild
+++ b/dev-ruby/bunny/bunny-1.2.1.ebuild
@ -1,32 +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/bunny/bunny-1.2.1.ebuild,v 1.1 2014/05/16 18:36:04 graaff Exp $
-
-EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21"
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-# Tests require a live AMQP server.
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_EXTRADOC="ChangeLog.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Another synchronous Ruby AMQP client"
-HOMEPAGE="http://github.com/celldee/bunny"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/amq-protocol-1.9.2"
-
-all_ruby_install() {
-	all_fakegem_install
-
-	insinto /usr/share/doc/${PF}
-	doins -r examples || die
-}
--- a/dev-ruby/bunny/bunny-1.6.3.ebuild
+++ b/dev-ruby/bunny/bunny-1.6.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/bunny/bunny-1.2.2.ebuild,v 1.1 2014/05/29 05:08:59 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/bunny/bunny-1.6.3.ebuild,v 1.1 2014/12/10 06:32:04 graaff Exp $

 EAPI=5
 USE_RUBY="ruby19 ruby20 ruby21"
--- a/dev-ruby/d3_rails/Manifest
+++ b/dev-ruby/d3_rails/Manifest
@ -1,3 +1,2 @@
-DIST d3_rails-3.4.10.gem 129536 SHA256 b225943ca8ad3190db22d58701a81cfc8fddffd2ba5a48b0f813f7f692591489 SHA512 ea55f1a8f8d37e4ee455f271422ca6aead47bc59266c7b64760c1275b53f994cf28fdc334e02b74503f8c573c148f2844c9c096b51c1d3d3a83c90cc8abd44fd WHIRLPOOL 8665565bbb16dd1c40bda5ecda3423185516c6f41736dee7211c4fefbff21a51a4a1a965d30ba393a993b63568e675851bce6dd440db84eb4fcd42997c4287f0
-DIST d3_rails-3.4.11.gem 129536 SHA256 dcfc96c33b4fd31092950e3db750389f37945dcb90923dc31db13cb8e34121fa SHA512 002d993a7c5f6bcff89f7d67e461b3b0f48220a8d1682e4f555d485e5a411b98e0c900cbe85dd270eb3a98a382698be33e8ec123884871940d3acfa60f8a07fa WHIRLPOOL cfbb66f49e5b4a83f6bf561426799307ba4b6b66ace9b63f0c9e14ad3c1b3ff7b33902b356d51a9efb478b8632d94a5ab451d2a7c1ec507ce52d467cb2c2ae33
 DIST d3_rails-3.4.12.gem 129536 SHA256 e5df4233773d073f7acb42eefc0d71eea60020b5434fb3ab7644de8c03441ba3 SHA512 648312b858093e1c8233ea9e57652558f81397ad4b163701028a62e43536fcbf9eef3bd30ce67d63287b90c40b40ed56a7eb4cb12f641da706e188ee18c5b11e WHIRLPOOL 4fd3a0e93ab41f7d257c18bf55b92c251f2ad84c8e718a6a00e9c34410a223838df8745a7fc13b2aea1d54d6e749161ad4a7305979e87d8d1a9bb26d980dbf07
+DIST d3_rails-3.5.0.gem 133120 SHA256 90629e5147dbf822bbb670a3825254a8cbce64e16f465a3215850b53bb59385a SHA512 b0e657279390ed16526ed35ab339398793c47b1893010738df9288ab4554b14809e2e0442a462982adc730c26796a1695f691da1fb39259eae44873c588aba05 WHIRLPOOL a2d75db5fba5f13e7b42453e77412bcd2267744e3a32d2004d9592cd0edfda262a990f8730eb5c8a6d89f1cf0865d21f432a16d134df09494204ecf90b849a2f
--- a/dev-ruby/d3_rails/d3_rails-3.4.10.ebuild
+++ b/dev-ruby/d3_rails/d3_rails-3.4.10.ebuild
@ -1,23 +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/d3_rails/d3_rails-3.4.10.ebuild,v 1.1 2014/07/23 00:22:01 mrueg Exp $
-
-EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-RUBY_FAKEGEM_EXTRAINSTALL="app"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby on Rails integration for the Javascript Data Visualization Framework, D3"
-HOMEPAGE="https://github.com/logical42/d3_rails"
-
-LICENSE="MIT BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/railties-3.1"
--- a/dev-ruby/d3_rails/d3_rails-3.4.11.ebuild
+++ b/dev-ruby/d3_rails/d3_rails-3.4.11.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/d3_rails/d3_rails-3.4.11.ebuild,v 1.1 2014/09/24 00:54:11 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/d3_rails/d3_rails-3.5.0.ebuild,v 1.1 2014/12/09 15:36:04 mrueg Exp $

 EAPI=5
 USE_RUBY="ruby19 ruby20 ruby21"
--- a/dev-ruby/httpclient/Manifest
+++ b/dev-ruby/httpclient/Manifest
@ -1,5 +1,4 @@
 DIST httpclient-2.2.5.tgz 273306 SHA256 81a15e45c83416d5d77ebbe2eaa0b346bcd08eb092aa9a1e52be356662baefc2 SHA512 c0fdb174dd90a726332c5749ed89414a831ff32997d3ecfa7cbd2bc78eb5fc901dce0c6a3fc1f8762a3bcf17690f29dabbbd0933717f91f4e24445b1e50def51 WHIRLPOOL 52b5a2c02f2527c5587ce3b0ce715e3ec93d0a13c5ea8a12b28bd73180f4a07db9b720191dd2a53a9c8abb016d5fcbe7b7763429619d47cc375d562258834a79
 DIST httpclient-2.3.4.1.tgz 217837 SHA256 045f388bdc8a0b9549396253d927cbfc6538f8ea4fcd8af747d81559065670c1 SHA512 214640577aec8d6124966c4f4d86c101f92679fe8699d97964be27cff6771ce8f13f60378730c4247585a01b14f860eaeed536843c257b995137f92fc06e6912 WHIRLPOOL a4d90ea28daac86e81a68952e6343ff6016646266b548ed3f3699f3ca5e92e1776aa69f271a12478b682169eef11218913a041d6494be8e717f6c5ecf45a6dd3
-DIST httpclient-2.5.1.tgz 298376 SHA256 be3fd2f64aa98cbf856a36af193f17b5a1cc9854a0ab6ad47cd95c7458bbb658 SHA512 e9522a73f321358ba089fab9ee5e036bcb2f528579225b1aacaf95da7115b069e5c682183e81a14e4e2e57d0b6b49ebce70220bbeb6b33995c433234d455035f WHIRLPOOL c830ee1093a8cd589c8d2be61c4d3c89143657f80239598f7afd68d0c0ffa5afdce22f22b300f15d53036467088b486b6ac0b277f0e2bf7cac14ab81774215e9
-DIST httpclient-2.5.2.tgz 299259 SHA256 472d42990cf1f72191a61203fc31b670618291b5c2019c8c00d0779c7cdf3702 SHA512 51df1b96a07632f2b14d61f71764e117d8a19e833f728dc8185611f9e842715362473643651ee0ceeefbe44b9928c188a22cc3e0eee9c5702075fe68bc8457af WHIRLPOOL 889aa976facf173aac23c30be5e42384189318cdfaf97d81b5fd7eb70c617867791cf324b071ba2a66d57edf396dba3377e3be15b2ed2cbcedd02a78ea4ed753
 DIST httpclient-2.5.3.2.tgz 303735 SHA256 3605a897d393e90071dab35b153dbedd844fa92c4ef8d13e43115866b2bf3867 SHA512 17db0302b958f10b4a75167d8c03b77f195786b5b429b76fc883af992cc71703500b9a42e39b832ac3421b3b742160496bdeeccd160e48ad2c377d9d8666ba89 WHIRLPOOL 162badfe5619a9ed9d42f9d29c7d34f45eeb205bbc76715d66547b5bf8e5962ba41c535ed2b53075ce6c6abef76a58062a91e172195ec1ab56282c0a2cabbfb3
+DIST httpclient-2.5.3.3.tgz 300578 SHA256 852b50cd771c659e38e4c4a31ace0ac3a2ab1da732b11b01e899827b1f2b424e SHA512 929dd4dfa5719367c61845f522aeb94059dff678716a22fc78b59f7cdce3c2a5fc88a01b6e0efd0ada06f3224cf52e7475b3a4c06f25383ad3702e1514c09292 WHIRLPOOL d6091a0d910474657d5fea0f91703f575fa7ff43e10240afc9312ea0d663c288b0a7dc7518c59e9a095a0c9d81eb18c6bf586db305543ee9217f09addec9a99d
--- a/dev-ruby/httpclient/httpclient-2.5.1.ebuild
+++ b/dev-ruby/httpclient/httpclient-2.5.1.ebuild
@ -1,59 +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/httpclient/httpclient-2.5.1.ebuild,v 1.2 2014/11/02 18:51:29 mrueg Exp $
-
-EAPI=5
-
-USE_RUBY="ruby19 ruby20 ruby21"
-
-RUBY_FAKEGEM_TASK_TEST="-Ilib test"
-RUBY_FAKEGEM_TASK_DOC="doc"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="'httpclient' gives something like the functionality of libwww-perl (LWP) in Ruby"
-HOMEPAGE="https://github.com/nahi/httpclient"
-SRC_URI="https://github.com/nahi/httpclient/archive/v${PV}.tar.gz -> ${P}.tgz"
-
-LICENSE="Ruby"
-SLOT="0"
-
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="${RDEPEND}
-	!dev-ruby/http-access2"
-
-ruby_add_rdepend "virtual/ruby-ssl"
-
-ruby_add_bdepend "doc? ( dev-ruby/rdoc )"
-
-all_ruby_prepare() {
-	rm Gemfile || die
-	sed -i -e '/[bB]undler/s:^:#:' Rakefile || die
-
-	# Fix documentation task
-	sed -i -e 's/README.txt/README.md/' Rakefile || die
-
-	# Remove mandatory CI reports since we don't need this for testing.
-	sed -i -e '/reporter/s:^:#:' Rakefile || die
-
-	# Remove mandatory simplecov dependency
-	sed -i -e '/[Ss]imple[Cc]ov/ s:^:#:' test/helper.rb || die
-
-	# Comment out test requiring network access that makes assumptions
-	# about the environment, bug 395155
-	sed -i -e '/test_async_error/,/^  end/ s:^:#:' test/test_httpclient.rb || die
-
-	# Skip tests using rack-ntlm which is not packaged. Weirdly these
-	# only fail on jruby.
-	rm test/test_auth.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib -S testrb test/test_*.rb || die
-}
--- a/dev-ruby/httpclient/httpclient-2.5.3.3.ebuild
+++ b/dev-ruby/httpclient/httpclient-2.5.3.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/httpclient/httpclient-2.5.2.ebuild,v 1.1 2014/11/02 18:51:28 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/httpclient/httpclient-2.5.3.3.ebuild,v 1.1 2014/12/09 15:44:08 mrueg Exp $

 EAPI=5

--- a/dev-ruby/json/Manifest
+++ b/dev-ruby/json/Manifest
@ -1,3 +1,2 @@
-DIST json-1.7.7.gem 148480 SHA256 fd702ed46565b354d7508e88bb3c4855f7fdd771ab89435d7ecbbe98deb0b7ec SHA512 b73cc6427854b00fecc36fb6a3da89562b9ef352342d2766da7c22a9311620c12090d84704b9dda9ca35da5893676f1c1b2ced53ca06da27194230825f73b7e8 WHIRLPOOL 29c4a581c60a2311ac77eaec278bb123be18f4c6acac23d286e3116a8a84df3ae5089be0116827e579f5460b803cf3d8066cb8ff9c298a4b045e67c473c0d431
 DIST json-1.8.0.gem 148992 SHA256 87e49cccff3fb2091c53141a605956e8d9a252cda43128714f9fdb51d0ca1729 SHA512 7a8ae0d975e10be06d1026df6c9736e8e724814ea7ef8c92b512c60fd7b4ac18e46a9f44615f57407e58decebc4891e2e97b78a177f7e283cc540619264c4400 WHIRLPOOL 159cd8d1cf95d6f7ca5ed16ec294015f873453a1ec8f9eb3667442c0ca582487e5dfcd78d2106c72c5a3563e1ace5b69f2c256c05a35630f09c3499b95f12505
 DIST json-1.8.1.gem 148992 SHA256 961bfbbfa9fda1e857e9c791e964e6664e0d43bf687b19669dfbc7cdbc5e0200 SHA512 ad729c00a9f7b4940e077a151a1e74f054d9df5bff8bac996634b3df3eb42ad7c732035c4bbb40de92816c3989339b113c4fecebd36ee3f5c301b76169fe4fb7 WHIRLPOOL 01c7444598612055b73dd0cc3f803210b9936028523dd446f3a1808b3e87fa94825c4daf1267472945898def78ce7cf851d9325d2235aa7008d3bba470839e40
--- a/dev-ruby/json/json-1.7.7.ebuild
+++ b/dev-ruby/json/json-1.7.7.ebuild
@ -1,65 +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/json/json-1.7.7.ebuild,v 1.17 2014/08/05 16:00:36 mrueg Exp $
-
-EAPI=5
-USE_RUBY="ruby19 jruby"
-
-RUBY_FAKEGEM_TASK_DOC="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGES TODO README.rdoc README-json-jruby.markdown"
-RUBY_FAKEGEM_DOCDIR="doc"
-
-RUBY_FAKEGEM_GEMSPEC="json.gemspec"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="A JSON implementation as a Ruby extension"
-HOMEPAGE="http://json.rubyforge.org/"
-LICENSE="|| ( Ruby GPL-2 )"
-
-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"
-SLOT="0"
-IUSE=""
-
-RDEPEND="${RDEPEND}"
-DEPEND="${DEPEND}
-	dev-util/ragel"
-
-ruby_add_bdepend "dev-ruby/rake"
-
-all_ruby_prepare() {
-	# Avoid building the extension twice!
-	# And use rdoc instead of sdoc which we don't have packaged
-	# And don't call git to list files. We're using the pregenerated spec anyway.
-	sed -i \
-		-e 's| => :compile||' \
-		-e 's| => :clean||' \
-		-e 's|sdoc|rdoc|' \
-		-e 's|`git ls-files`|""|' \
-		Rakefile || die "rakefile fix failed"
-}
-
-each_ruby_compile() {
-	# Since 1.5.0 a Java extension is provided but it does not compile.
-	if [[ $(basename ${RUBY}) != "jruby" ]]; then
-		${RUBY} -S rake compile || die "extension compile failed"
-	fi
-}
-
-each_ruby_test() {
-	JSON=pure \
-	${RUBY} -Iext:lib -S testrb tests/test_*.rb || die "pure ruby tests failed"
-
-	if [[ $(basename ${RUBY}) != "jruby" ]]; then
-		JSON=ext \
-		${RUBY} -Iext:lib -S testrb tests/test_*.rb || die "ext ruby tests failed"
-	fi
-}
-
-each_ruby_install() {
-	each_fakegem_install
-	if [[ $(basename ${RUBY}) != "jruby" ]]; then
-		ruby_fakegem_newins ext/json/ext/generator$(get_modname) lib/json/ext/generator$(get_modname)
-		ruby_fakegem_newins ext/json/ext/parser$(get_modname) lib/json/ext/parser$(get_modname)
-	fi
-}
--- a/dev-ruby/packetfu/files/packetfu-1.1.10-ruby2x-encoding.patch
+++ b/dev-ruby/packetfu/files/packetfu-1.1.10-ruby2x-encoding.patch
@ -0,0 +1,49 @@
+From ba3ef1af81b494248db230b4f7fdcc155fe256d5 Mon Sep 17 00:00:00 2001
+From: Jonathan Claudius <jclaudius@trustwave.com>
+Date: Sat, 5 Apr 2014 22:15:00 -0400
+Subject: [PATCH] Fix encoding issues in specs for Ruby 2.x
+
+---
+ spec/structfu_spec.rb | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/spec/structfu_spec.rb b/spec/structfu_spec.rb
+index c48c856..84b7e22 100644
+--- a/spec/structfu_spec.rb
+++ b/spec/structfu_spec.rb
+@@ -78,7 +78,7 @@ class StructClass
+		@int.to_s.should == "\x02"
+		@int.read(254)
+		@int.to_i.should == 254
+-		@int.to_s.should == "\xfe"
+		@int.to_s.should == "\xfe".force_encoding("binary")
+	end
+ 
+ end
+@@ -98,7 +98,7 @@ class StructClass
+	end
+ 
+	it "should print a two character packed string" do
+-		@int.to_s.should == "\x00\x0b"
+		@int.to_s.should == "\x00\x0b".force_encoding("binary")
+	end
+ 
+	it "should have a value of 11" do
+@@ -113,7 +113,7 @@ class StructClass
+		@int.to_s.should == "\x00\x02"
+		@int.read(254)
+		@int.to_i.should == 254
+-		@int.to_s.should == "\x00\xfe"
+		@int.to_s.should == "\x00\xfe".force_encoding("binary")
+	end
+ 
+	it "should be able to set endianness" do
+@@ -198,7 +198,7 @@ class StructClass
+		@int.to_s.should == "\x00\x00\x00\x02"
+		@int.read(254)
+		@int.to_i.should == 254
+-		@int.to_s.should == "\x00\x00\x00\xfe"
+		@int.to_s.should == "\x00\x00\x00\xfe".force_encoding("binary")
+	end
+ 
+	it "should be able to set endianness" do
--- a/dev-ruby/packetfu/packetfu-1.1.10-r1.ebuild
+++ b/dev-ruby/packetfu/packetfu-1.1.10-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/dev-ruby/packetfu/packetfu-1.1.10-r1.ebuild,v 1.1 2014/12/09 15:56:43 mrueg Exp $
+
+EAPI=5
+
+USE_RUBY="ruby19 ruby20 ruby21"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec"
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+
+RUBY_FAKEGEM_EXTRADOC="README.rdoc"
+
+inherit multilib ruby-fakegem
+
+DESCRIPTION="A mid-level packet manipulation library"
+HOMEPAGE="https://rubygems.org/gems/packetfu"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+ruby_add_rdepend " >=dev-ruby/pcaprub-0.9.2"
+
+RUBY_PATCHES=( "${FILESDIR}"/${P}-ruby2x-encoding.patch )
+
+all_ruby_prepare() {
+	# Broken for version numbers with multiple digits...
+	sed -i -e '/reports a version number/,/end/ s:^:#:' spec/packetfu_spec.rb || die
+}
--- a/dev-ruby/uglifier/Manifest
+++ b/dev-ruby/uglifier/Manifest
@ -1 +1,2 @@
 DIST uglifier-2.5.3.gem 77824 SHA256 a9dd998baca1472bc1d6e053bfe5d94d8dbf7d3f306ba6bc73ee6ec5b24d9d66 SHA512 9712240de03a269d018a134f191af639a67773ef3cc9cfea4cc306e99172cd2fae17b153e40c0481967589d01bc87c5b92b85378afb889719553a28768536e43 WHIRLPOOL 9f7f075852be69883bac869e88dd9b8364f9310c1e61a6eb6ab8070cda4f2c7b89932cee5d1a32a12928169d0a286fbba15ff7fe8852e4391c5e822296a99c33
+DIST uglifier-2.6.0.gem 77824 SHA256 ab0bacdd4b088d784473f763113635e10c9116884ac0fc96a66c21eebe1930d2 SHA512 adaa2db5415c9a81e5b66542afb8e0896ee300ecdcf45e19c16d00ab0eec7616d5f18587f5df83be4c6b775d72f526695ddb1fd549948df3c4611c11d49151a2 WHIRLPOOL 3db521f996273ecc9697a1248fa89da27b42854446a1749311b8f11d0bab8c505beda03a789cf847fa96b0dd18dab3e9eac2a2067ac6d6c70fb58e446989829a
--- a/dev-ruby/uglifier/uglifier-2.6.0.ebuild
+++ b/dev-ruby/uglifier/uglifier-2.6.0.ebuild
@ -0,0 +1,27 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/uglifier/uglifier-2.6.0.ebuild,v 1.1 2014/12/09 15:30:22 mrueg Exp $
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby wrapper for UglifyJS JavaScript compressor"
+HOMEPAGE="https://github.com/lautis/uglifier"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+IUSE="test"
+
+ruby_add_rdepend ">=dev-ruby/execjs-0.3.0 >=dev-ruby/json-1.8.0"
+
+ruby_add_bdepend "test? ( dev-ruby/source_map )"
--- a/dev-util/android-studio/Manifest
+++ b/dev-util/android-studio/Manifest
@ -1,2 +1,3 @@
 DIST android-studio-ide-135.1538390-linux.zip 176358193 SHA256 fbecb9b7a10ec39804d31b39d716190227ee1b28f748c3df24a3bb42ec310906 SHA512 47d34fd9636d2e8a5555f6412f9b7dbd7ca226f2d7ea5367b501661b857e49ec4a67cc46b99b689f5fd81c097e30a5f26aaf39e3775636c682575f7da06d1742 WHIRLPOOL 1520550719aea68c4ddb59e8df375d7f45f1feb46414bebe810381a459b5779c35bd70cb4258d20702b2783912416f285719867a9bb269c23738bba193e9c9d5
 DIST android-studio-ide-135.1626825-linux.zip 243907214 SHA256 b00a578dd9e707b05a357695f232d25da76c303d0d77b0e6569ff3fa5066a8d2 SHA512 2d97abac477e415fc4dc74d3d3f717d43cf6d594b8ab0efc204665c515c92d4edd21c078e6896cfb7296d8dfe9c50cc82960fbdfd04dc53eb46153323177f1c4 WHIRLPOOL 277f99dc7feb6182dd25b5cab6b3c661731afc02f402282494b5c0ba2d899fd6e5ff3b8dba471ec19931e996b6a64dc27b2a89796f351c4052410e1996f9a6dd
+DIST android-studio-ide-135.1629389-linux.zip 243909934 SHA256 baf43c4096ddca340238e5a12fbb9faf89019eb74156534de2adf0a70d9793f9 SHA512 cf907c4674cb31267265f1c749c7db82a82c63543b31758d2b443f409ca1d7793b7edc1a0d359d86cb03365c3222e76b4fbeb54a8792e75767dc2d4f96de883e WHIRLPOOL 326e691fbc9c3fb9617a3a64861a74836c9b278f7a110077082e4b90934474076ec6fcd12e2fe545414610e73cf33b0b3d1b88b6f1587bee720f30c52e8bfb95
--- a/dev-util/android-studio/android-studio-1.0.0.135.1629389.ebuild
+++ b/dev-util/android-studio/android-studio-1.0.0.135.1629389.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/dev-util/android-studio/android-studio-1.0.0.135.1629389.ebuild,v 1.1 2014/12/09 17:51:17 perfinion Exp $
+
+EAPI=5
+inherit eutils versionator
+
+RESTRICT="strip"
+QA_PREBUILT="opt/${P}/bin/libbreakgen.so"
+STUDIO_V=$(get_version_component_range 1-3)
+BUILD_V=$(get_version_component_range 4-5)
+if [[ $(get_version_component_count) -gt 5 ]]; then
+	STUDIO_V="${STUDIO_V}-$(get_version_component_range 6-)"
+fi
+
+DESCRIPTION="A new Android development environment based on IntelliJ IDEA"
+HOMEPAGE="http://developer.android.com/sdk/installing/studio.html"
+SRC_URI="http://dl.google.com/dl/android/studio/ide-zips/${STUDIO_V}/${PN}-ide-${BUILD_V}-linux.zip"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="selinux"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="app-arch/zip"
+RDEPEND=">=virtual/jdk-1.7
+	selinux? ( sec-policy/selinux-android )"
+S=${WORKDIR}/${PN}
+
+src_install() {
+	local dir="/opt/${PN}"
+
+	insinto "${dir}"
+	doins -r *
+	fperms 755 "${dir}/bin/studio.sh" "${dir}/bin/fsnotifier" "${dir}/bin/fsnotifier64"
+
+	newicon "bin/idea.png" "${PN}.png"
+	make_wrapper ${PN} ${dir}/bin/studio.sh
+	make_desktop_entry ${PN} "Android Studio" ${PN} "Development;IDE"
+}
--- a/dev-util/watchr/watchr-0.7.ebuild
+++ b/dev-util/watchr/watchr-0.7.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-util/watchr/watchr-0.7.ebuild,v 1.2 2014/08/14 13:59:15 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/watchr/watchr-0.7.ebuild,v 1.3 2014/12/10 06:51:46 graaff Exp $

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

 RUBY_FAKEGEM_TASK_DOC=""

--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@ -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/eclass/kde4-base.eclass,v 1.144 2014/12/04 10:32:10 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.145 2014/12/09 18:38:57 mrueg Exp $

 # @ECLASS: kde4-base.eclass
 # @MAINTAINER:
@ -346,7 +346,7 @@ if [[ ${KDEBASE} != "kde-base" && -n ${KDE_LINGUAS} ]]; then
 		# this can't be done on one line because if user doesn't use any localisation
 		# then he is probably not interested in kde-l10n at all.
 		kderdepend+="
-			linguas_${_lingua}? ( $(add_kdebase_dep kde-l10n "linguas_${_lingua}(+)") )
+		linguas_${_lingua}? ( || ( kde-apps/kde-l10n[linguas_${_lingua}(+)] $(add_kdebase_dep kde-l10n "linguas_${_lingua}(+)") ) )
 		"
 	done
 	unset _lingua
--- a/games-strategy/scorched3d/Manifest
+++ b/games-strategy/scorched3d/Manifest
@ -1 +1,2 @@
 DIST Scorched3D-43.3d-src.tar.gz 93245939 SHA256 a5e7bdc3810517ab142cfcb43951ca55d03c81252d00bc323f0f204deb62ef1c SHA512 292cc1c8cabc981c5de9b0df5058be59f4264b803df7b1c34d79e5eee195dc6c3ba34a542bd909410fef64d9fa8f49b340f1e660669526753c19c3e3c71900a9 WHIRLPOOL 5ea176b756b4833e62d1e8a5835a53bcd1fec750e445589f64ee9c73cc48fb8e41a0666f3b85b8d4fb0e8226c95b966194a5512e07dd56c3f203e45b45ba79b8
+DIST Scorched3D-44-src.tar.gz 41689613 SHA256 1c8320bb2210030be71dd713c214fbd32f7dd663ea82031383e6b3636f8a8dba SHA512 27341d12ef9db5b64c1051a8abe45cef8a957e26c2cd8928f64c071589052d2857fc6f8104772bb67d5d348aef14122a117d9e00d61e4d9f963f3b5bbe5859ca WHIRLPOOL 6b7c744702b86df856d8879454e7c9616e31dc3a9f539bd97c53cba4bea0e59f44e3c703f847f3cd505ba0e90386887f7134f9500421b3d58ba12a9cc1fdbc0e
--- a/games-strategy/scorched3d/files/scorched3d-44-fixups.patch
+++ b/games-strategy/scorched3d/files/scorched3d-44-fixups.patch
@ -0,0 +1,25 @@
+--- scorched.orig/configure.ac
+++ scorched/configure.ac
+@@ -13,22 +13,6 @@
+ AC_PROG_INSTALL
+ AC_PROG_RANLIB
+ 
+-LDFLAGS="$LDFLAGS -L/usr/X11R6/lib -L/usr/X11R6"
+-CPPFLAGS="$CPPFLAGS -I/usr/X11R6/include -I/usr/X11R6"
+-
+-if test `uname` == Darwin; then
+-LDFLAGS="$LDFLAGS -lmx"
+-CPPFLAGS="$CPPFLAGS -DFFTW_USE_DOUBLE -D__DARWIN__ -D__MACOSX__"
+-else
+-LDFLAGS="$LDFLAGS -L/usr/local/lib"
+-CPPFLAGS="$CPPFLAGS -I/usr/local/include"
+-fi
+-
+-AC_CHECK_LIB(fridge, beer, echo "Hmm?!",[
+-	echo "Warning: No beer found in fridge!";
+-	echo "We highly suggest that you rectify this situation immediately."
+-])
+-
+ AC_ARG_ENABLE(serveronly, 
+ 	[  --enable-serveronly Enable server only compilation],
+ 		    , enable_serveronly=no,
--- a/games-strategy/scorched3d/files/scorched3d-44-freetype.patch
+++ b/games-strategy/scorched3d/files/scorched3d-44-freetype.patch
@ -0,0 +1,45 @@
+--- acinclude.m4.orig
+++ acinclude.m4
+@@ -437,7 +437,7 @@
+    if test "$FT2_CONFIG" = "no" ; then
+      no_ft=yes
+    else
+-     FT2_CFLAGS=`$FT2_CONFIG $ft_config_args --cflags`
+     FT2_CFLAGS="`$FT2_CONFIG $ft_config_args --cflags` `$FT2_CONFIG $ft_config_args --cflags | sed -e 's:freetype2:freetype2/freetype:'`"
+      FT2_LIBS=`$FT2_CONFIG $ft_config_args --libs`
+      ft_config_major_version=`$FT2_CONFIG $ft_config_args --version | \
+        sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+--- src.orig/client/GLEXT/GLFont2dFreeType.h
+++ src/client/GLEXT/GLFont2dFreeType.h
+@@ -23,10 +23,10 @@
+ 
+ #include <GLEXT/GLFont2dStorage.h>
+ #include <ft2build.h>
+-#include <freetype/freetype.h>
+-#include <freetype/ftglyph.h>
+-#include <freetype/ftoutln.h>
+-#include <freetype/fttrigon.h>
+#include <freetype.h>
+#include <ftglyph.h>
+#include <ftoutln.h>
+#include <fttrigon.h>
+ #include <string>
+ 
+ class GLFont2dFreeType
+--- src.orig/launcher/wxdialogs/TrueTypeFont.h
+++ src/launcher/wxdialogs/TrueTypeFont.h
+@@ -25,10 +25,10 @@
+ #include <wx/image.h>
+ #include <ft2build.h>
+ #include <string>
+-#include <freetype/freetype.h>
+-#include <freetype/ftglyph.h>
+-#include <freetype/ftoutln.h>
+-#include <freetype/fttrigon.h>
+#include <freetype.h>
+#include <ftglyph.h>
+#include <ftoutln.h>
+#include <fttrigon.h>
+ 
+ class TrueTypeFont
+ {
--- a/games-strategy/scorched3d/files/scorched3d-44-gcc43.patch
+++ b/games-strategy/scorched3d/files/scorched3d-44-gcc43.patch
@ -0,0 +1,22 @@
+--- scorched.old/src/common/common/main.h
+++ scorched/src/common/common/main.h
+@@ -40,7 +40,7 @@
+ void _no_storage()
+ {
+ 	printf("Failed to allocate memory!!");
+-	std::exit(1);
+	exit(1);
+ }
+ 
+ void run_main(int argc, char *argv[], OptionsParameters &params)
+--- scorched.old/src/common/porting/windows.h
+++ scorched/src/common/porting/windows.h
+@@ -20,7 +20,7 @@
+ typedef unsigned short  WORD;
+ typedef unsigned char   BYTE;
+ 
+-typedef int 	HWND;
+// typedef int 	HWND;
+ typedef void * 	HINSTANCE;
+ typedef int 	WPARAM;
+ typedef int 	LPARAM;
--- a/games-strategy/scorched3d/files/scorched3d-44-jpeg9.patch
+++ b/games-strategy/scorched3d/files/scorched3d-44-jpeg9.patch
@ -0,0 +1,20 @@
+--- src/common/image/ImageJpgFactory.cpp.old	2014-12-03 09:52:03.306552513 +0100
+++ src/common/image/ImageJpgFactory.cpp	2014-12-03 09:53:22.117786304 +0100
+@@ -79,7 +79,7 @@
+ 	src->next_input_byte = FakeEOI;
+ 	src->bytes_in_buffer = 2;
+ 
+-	return TRUE;
+	return (boolean)TRUE;
+ }
+ 
+ METHODDEF(void)
+@@ -166,7 +166,7 @@
+ 	src->bytes_in_buffer = buffer.getBufferUsed();
+ 	src->next_input_byte = (JOCTET *) buffer.getBuffer();
+ 
+-	jpeg_read_header(&cinfo, TRUE);
+	jpeg_read_header(&cinfo, (boolean)TRUE);
+ 	jpeg_start_decompress(&cinfo);
+ 
+ 	if ((cinfo.output_components == 3 && !readalpha) ||
--- a/games-strategy/scorched3d/files/scorched3d-44-odbc.patch
+++ b/games-strategy/scorched3d/files/scorched3d-44-odbc.patch
@ -0,0 +1,16 @@
+When x11-libs/wxGTK is built with the odbc use flag, scorched3d fails to build.
+bug #285384 - patch from Bob Johnson
+
+--- scorched/src/common/porting/windows.h
+++ fix_scorched/src/common/porting/windows.h
+@@ -11,8 +11,8 @@
+ 
+ typedef char * 		LPSTR;
+ typedef const char *	LPCTSTR;
+-typedef unsigned int 	DWORD;
+-typedef unsigned int *  LPDWORD;
+typedef unsigned long 	DWORD;
+typedef DWORD *         LPDWORD;
+ typedef unsigned char * LPBYTE;
+ typedef int 		INT;
+ typedef long         	LONG;
--- a/games-strategy/scorched3d/files/scorched3d-44-win32.patch
+++ b/games-strategy/scorched3d/files/scorched3d-44-win32.patch
@ -0,0 +1,18 @@
+--- scorched.old/src/common/porting/windows.h
+++ scorched/src/common/porting/windows.h
+@@ -9,6 +9,7 @@
+ #include <ctype.h>
+ #include <common/Defines.h>
+ 
+#ifdef _WIN32
+ typedef char * 		LPSTR;
+ typedef const char *	LPCTSTR;
+ typedef unsigned int 	DWORD;
+@@ -27,6 +28,7 @@
+ typedef int 	LRESULT;
+ typedef void *	HDC;
+ typedef void *  HGLRC;
+#endif  /* _WIN32 */
+ 
+ #define _strnicmp(a,b,c)	strncasecmp(a,b,c)
+ #define stricmp(a,b)		strcasecmp(a,b)
--- a/games-strategy/scorched3d/scorched3d-44.ebuild
+++ b/games-strategy/scorched3d/scorched3d-44.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/games-strategy/scorched3d/scorched3d-44.ebuild,v 1.1 2014/12/09 22:08:49 mr_bones_ Exp $
+
+EAPI=5
+WX_GTK_VER=2.8
+inherit autotools eutils wxwidgets games
+
+DESCRIPTION="Multi-player tank battle in 3D (OpenGL)"
+HOMEPAGE="http://www.scorched3d.co.uk/"
+SRC_URI="mirror://sourceforge/scorched3d/Scorched3D-${PV}-src.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="dedicated mysql"
+
+RDEPEND="media-libs/libsdl[video]
+	media-libs/sdl-net
+	media-libs/libpng:0
+	sys-libs/zlib
+	virtual/jpeg:0
+	dev-libs/expat
+	media-fonts/dejavu
+	!dedicated? (
+		virtual/opengl
+		virtual/glu
+		media-libs/libogg
+		media-libs/libvorbis
+		media-libs/openal
+		media-libs/freealut
+		x11-libs/wxGTK:2.8[X]
+		media-libs/freetype:2
+		sci-libs/fftw:3.0
+	)
+	mysql? ( virtual/mysql )"
+DEPEND="${RDEPEND}
+	!dedicated? ( virtual/pkgconfig )"
+
+S=${WORKDIR}/scorched
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-fixups.patch \
+		"${FILESDIR}"/${P}-gcc43.patch \
+		"${FILESDIR}"/${P}-odbc.patch \
+		"${FILESDIR}"/${P}-win32.patch \
+		"${FILESDIR}"/${P}-freetype.patch \
+		"${FILESDIR}"/${P}-jpeg9.patch 
+	eautoreconf
+}
+
+src_configure() {
+	egamesconf \
+		--with-fftw=/usr \
+		--with-ogg=/usr \
+		--with-vorbis=/usr \
+		--datadir="${GAMES_DATADIR}/${PN}" \
+		--with-docdir="/usr/share/doc/${PF}" \
+		--with-wx-config="${WX_CONFIG}" \
+		--without-pgsql \
+		$(use_with mysql) \
+		$(use_enable dedicated serveronly)
+}
+
+src_install() {
+	default
+	rm "${ED}${GAMES_DATADIR}"/${PN}/data/fonts/* || die
+	dosym /usr/share/fonts/dejavu/DejaVuSans.ttf "${GAMES_DATADIR}/${PN}/data/fonts/dejavusans.ttf"
+	dosym /usr/share/fonts/dejavu/DejaVuSansCondensed-Bold.ttf "${GAMES_DATADIR}/${PN}/data/fonts/dejavusconbd.ttf"
+	dosym /usr/share/fonts/dejavu/DejaVuSansMono-Bold.ttf "${GAMES_DATADIR}/${PN}/data/fonts/dejavusmobd.ttf"
+	if ! use dedicated ; then
+		newicon data/images/tank-old.bmp ${PN}.bmp || die
+		make_desktop_entry ${PN} "Scorched 3D" /usr/share/pixmaps/${PN}.bmp
+	fi
+	prepgamesdirs
+}
--- a/gnome-extra/evolution-data-server/Manifest
+++ b/gnome-extra/evolution-data-server/Manifest
@ -1,2 +1,3 @@
 DIST evolution-data-server-3.12.4.tar.xz 5450044 SHA256 5e424ec560e46e0b26d290d04ad5146d9b313a956abcf99ef46ac3d8633060c7 SHA512 24e3ff14c54845c22e038034ea537e5a1f9a57cd7d7aab8a5b16db3a40bf394282c47467b2b5829ab577e275eaabcd566b4a9ba1a18dd185f4dbe0818ff94cc8 WHIRLPOOL f8989993970adbcd10fd3511d4ad0ceeff6897509c4f048c3c993be6ef6de858fe1a20889eaeebda096b31b159a5b0dfd68cea191bfad88330c2662cf295ee41
 DIST evolution-data-server-3.12.8.tar.xz 5392696 SHA256 06fb4b9a1137b77a53e94eb69e4aeedd8f92d1bd1cfa0175f607660dd3b30818 SHA512 570b2c7b160a625517bc85de690f3fad03bef0fbb8bd2019e597f3a4071833478bae64c253a4fcb97c9025b8f1f97e927729caa484c207bb486d9891faccfcd6 WHIRLPOOL 15e9b3bae7b1e24c10e497a9b17571a26bc35e15b871d6a56ad5076a2795f2a86aa1b3d753f4dc1fe98b0c38155522a9bde983d3484c65e6a94b3d684840c259
+DIST evolution-data-server-3.12.9.tar.xz 5395276 SHA256 2f6cb7fe315cdc20938e08e2c724fe9364d9a72801a41b05f77367b6790aaee0 SHA512 3f342091fe2ee08cf5eaa556819bae1c667c97b102da274158e658ef32b089b9c8703a4c9b8c3e3453b04808ef481645a8e86ddff6af0f84424aaa372bd70dd2 WHIRLPOOL 9d2d21e09c46060d2fbc2427fb4689b6a3cc25eb9929f8a66eecc6c3a9c11f5b697b38c85d09ed29c9513c6b6fc97d0006971900429792b96395baad05fb7671
--- a/Show More
+++ b/Show More
				`@ -1 +0,0 @@`
				`DIST virtinst-0.600.4.tar.gz 8180759 SHA256 6e377a7512eaaecd96f8a91998f2db2feaa6d722c132103f44d1b6447c54b49c SHA512 59a0ab1cc9080ce55b857853602311e8573b7339ceb540bffecd19ae1e41a30248058897fbc257fd264c8592bac23e09730927a68d351181e68e919270018536 WHIRLPOOL ed0d6651bf136c4046f5538ec5d58448043cc8398e4d6d0da47dbbf90533f4de5f28718d8c60cf8b79c2098a37bc61ae879f609d97e30ceb47026103a85fc63f`
				`@ -0,0 +1 @@`
				`DIST App-cpanminus-1.7020.tar.gz 311997 SHA256 3b40a3ec5f8ef66be78fd5129ec2c332e8e02458c9b4a60be988a7f7d698242d SHA512 05a49ce21eb324ecdb71017e3adaa8b14740837e44418dc67ac043ea01837f13390ebeb349f1d7bd36fb0f236fb978ae4d8236e4813340a41a047ffb367abf47 WHIRLPOOL f81dfd7bfc9172e7bbf8afe920ed788546f677cf84ff87a9e245fbaf62f0d73c94fb5a48c2cd2cd7bf86fa6068c3302637e15d716e705e548c17e8adc1ceca7e`
				`@ -0,0 +1 @@`
				`DIST App-perlbrew-0.72.tar.gz 82509 SHA256 0fa6879f21750b15f96635cac4d70b2a06b515e88040d402379e8a64c8f3984c SHA512 e6e91e9300e02e2031386b4023b4974adbd8df22f18799618e2d3308df1af56ff9453dee7a4c1c38c530a5ca87b018b26f8b28d7cac1f41071e2d196d84b0892 WHIRLPOOL 54eb84df5362daa00484ec8b665cd24e130c98475c1c68dae3092050ae8da043e0d946669278fd68932710839f31d62484e519ee3171f1bf1b9d8dfae8f56051`
				`@ -0,0 +1 @@`
				`DIST Config-JSON-1.5100.tar.gz 18190 SHA256 20deb04a4555fc440566aca58ab88a84cda01bed59ada85fa459aaf1c9370432 SHA512 09de924b251e14e98602dd1db74e09e975b0a6c4d0ddfb9a5ed3d32198f206ad51b79061e6f05122507baab45123379bfb589add17d7f2e0fab16ac71a2ce0f8 WHIRLPOOL 02cad6f48a3df504de08de9a1302537693717ae6edae3761aa34291dc9543913e1604f3e7d41285a7c001f3b0868825e8f90bb4e3e870a8c0c658d5c0ea353b2`
				`@ -0,0 +1 @@`
				`DIST Test-Spec-0.47.tar.gz 33344 SHA256 e425c0b9efa3c7e21496d31a607d072a63e31988c3d298a8c1fd7d145cc0681e SHA512 11e19765023ce504128f347c13eabf72c05fc803b061c430cc8507a7e270672282753e3874a35e02f1b09331c6befe0b110ca4eb1fdc99f5700505bcf2907ec0 WHIRLPOOL 43c3a03a630ad7799bc9af3ce6313ce5389904592b76472912d249c75b743a92f9505e3e9454c1a988f1af09c423c607a6a60f4b0ec6cad8d4ec52bb0a75f001`