Sync with portage [Tue Feb 17 09:23:53 MSK 2015].

9 years ago · 7128e415de
parent 2457553cfb
commit 7128e415de
1158 changed files with 5496 additions and 5580 deletions
--- a/app-admin/apache-tools/apache-tools-2.2.29.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.2.29.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/apache-tools/apache-tools-2.2.29.ebuild,v 1.5 2015/02/08 21:09:44 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/apache-tools/apache-tools-2.2.29.ebuild,v 1.6 2015/02/16 10:20:15 ago Exp $

 EAPI="4"
 inherit flag-o-matic eutils
@ -11,7 +11,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"

 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE="ssl"
 RESTRICT="test"

--- a/app-admin/cgmanager/Manifest
+++ b/app-admin/cgmanager/Manifest
@ -1,2 +1 @@
-DIST cgmanager-0.35.tar.gz 426200 SHA256 a2939edf1ff687573c6d0e95900abf83078af25bb91060d9d5daac5769afaa9b SHA512 a63ed3358b33dad57fd7c70aa0059c7400b78ad1b7642db536863a3ca4254ec252351986eefa2b7bbe5b0e7f78bedb51f32544803430f4fafa76222791e391a8 WHIRLPOOL 7ef39fe762c222fa912682f2231df14b57b54c285b683cb4f1f9ee4a65d651e450a5cf079862ab21ad2d3c97a6baa26fd05983304697c5fdfa2e16bf716d88d9
 DIST cgmanager-0.36.tar.gz 428374 SHA256 f4707f0130efb50ccd8a1900e7ae626c0631947528ce921a63b15ef848fb2a0d SHA512 3325c03e25b7bd7b8dcfb68bb3dedccf9367ce80c23ac8df3f1af6cdb9ee706eafc0f95fcea055cc1fe9b31acb5bb66c61b16b21dfa057e661fdace3ff207f43 WHIRLPOOL dcaad06e6281f89e672b843f9903473cb1ee5d1b938c72d1b806f7bc7a1014144dd9e6e304e9ce6e2b941a1b224177747dacc7affa122f9a17a14598969a4779
--- a/app-admin/cgmanager/cgmanager-0.36-r1.ebuild
+++ b/app-admin/cgmanager/cgmanager-0.36-r1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/cgmanager/cgmanager-0.35.ebuild,v 1.3 2015/02/09 22:14:31 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/cgmanager/cgmanager-0.36-r1.ebuild,v 1.1 2015/02/16 11:02:06 hwoarang Exp $

 EAPI="5"

--- a/app-admin/cgmanager/cgmanager-0.36.ebuild
+++ b/app-admin/cgmanager/cgmanager-0.36.ebuild
@ -1,41 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/cgmanager/cgmanager-0.36.ebuild,v 1.1 2015/02/14 19:37:55 hwoarang Exp $
-
-EAPI="5"
-
-DESCRIPTION="Control Group manager daemon"
-HOMEPAGE="https://linuxcontainers.org/cgmanager/introduction/"
-SRC_URI="https://linuxcontainers.org/downloads/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	sys-libs/libnih[dbus]
-	sys-apps/dbus"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	# systemd expects files in /sbin but we will have them in /usr/sbin
-	pushd config/init/systemd > /dev/null || die
-	sed -i -e "s@sbin@usr/&@" {${PN},cgproxy}.service || \
-		die "Failed to fix paths in systemd service files"
-	popd > /dev/null || die
-}
-
-src_configure() {
-	econf \
-		--with-distro=gentoo \
-		--with-init-script=systemd
-}
-
-src_install () {
-	default
-	# I see no reason to have the tests in the filesystem. Drop them
-	rm -r "${D}"/usr/share/${PN}/tests || die "Failed to remove ${PN} tests"
-	# FIXME: openRC init scripts are not well tested
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newinitd "${FILESDIR}"/cgproxy.initd cgproxy
-}
--- a/app-admin/cgmanager/files/cgmanager.initd
+++ b/app-admin/cgmanager/files/cgmanager.initd
@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/cgmanager/files/cgmanager.initd,v 1.1 2015/02/07 10:29:22 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/cgmanager/files/cgmanager.initd,v 1.2 2015/02/16 11:02:06 hwoarang Exp $

 DAEMON=/usr/sbin/cgmanager
 PIDFILE=/run/cgmanager.pid
@ -15,7 +15,7 @@ depend() {
 start() {
 	ebegin "Starting cgmanager server"

-	start-stop-daemon --start --exec --pidfile ${PIDFILE} ${DAEMON} \
+	start-stop-daemon --start --pidfile ${PIDFILE} --exec ${DAEMON} \
 		-- --daemon -m name=systemd ${OPTIONS}

 	eend $?
--- a/app-admin/cgmanager/files/cgproxy.initd
+++ b/app-admin/cgmanager/files/cgproxy.initd
@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/cgmanager/files/cgproxy.initd,v 1.1 2015/02/07 10:29:22 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/cgmanager/files/cgproxy.initd,v 1.2 2015/02/16 11:02:06 hwoarang Exp $

 DAEMON=/usr/sbin/cgproxy
 PIDFILE=/run/cgproxy.pid
@ -24,7 +24,7 @@ start() {
 		return 1 
 	fi

-	start-stop-daemon --start --exec --pidfile ${PIDFILE} ${DAEMON} \
+	start-stop-daemon --start --pidfile ${PIDFILE} --exec ${DAEMON} \
 		-- --daemon ${OPTIONS}

 	eend $?
--- a/app-admin/mcollective/Manifest
+++ b/app-admin/mcollective/Manifest
@ -1 +1,2 @@
 DIST mcollective-2.5.3.tar.gz 903498 SHA256 6ba69d9d58ca59628e997b6bb602c5884cabd0ea201e859e0863c303f1d64fda SHA512 f5bdccf86699caadb3757778aa33a1635cf18a7bc9e2752431f98b7bd6db8281b49887aeac185b5ae21d3fc37dbcfc49aaf160622cb50562a4a8ba68d6e38732 WHIRLPOOL fd0b82a85656f37c6502f7216c570aad9b18280783bd23449beede471a0f6fe1880f79a61d8ca4b11558963053b434c156b6c4c59157743205c959fcf3c6a4c5
+DIST mcollective-2.8.0.tar.gz 718292 SHA256 47084f9285707f2e457850adcf90811f3d39d4f4baa950d822b20b45633db259 SHA512 edc3da334dbd3afd18fcedc675c6498edce1c799d9b472f70ebfe1b972e013cba5217ec492ea4128b15d886edaf283246ba70915180f9a10a67f7c0957fd1c8e WHIRLPOOL 0c6461a43c4533334dee420e7a0debfa8aa2e0079b83407c1313a28689b5ecbd891c94740553947bdce4023786eb0e95e497da73108e283619f358d67dac7c0c
--- a/app-admin/mcollective/mcollective-2.8.0.ebuild
+++ b/app-admin/mcollective/mcollective-2.8.0.ebuild
@ -0,0 +1,59 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/mcollective/mcollective-2.8.0.ebuild,v 1.1 2015/02/16 19:41:45 prometheanfire Exp $
+
+EAPI="5"
+
+USE_RUBY="ruby19 ruby20"
+
+inherit ruby-ng
+
+DESCRIPTION="Framework to build server orchestration or parallel job execution
+systems"
+HOMEPAGE="http://marionette-collective.org/"
+SRC_URI="http://puppetlabs.com/downloads/mcollective/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc +client"
+
+DEPEND=""
+RDEPEND="dev-ruby/stomp"
+
+src_compile() {
+	einfo "nothing to compile"
+}
+
+each_ruby_install() {
+	doruby -r lib/*
+	insinto /usr/share/mcollective
+	use client && dosbin bin/mco
+	dosbin bin/mcollectived
+	if use doc ; then
+		dohtml -r doc/*
+		insinto /usr/share/doc/${P}/ext
+		doins -r ext/*
+	fi
+	newinitd "${FILESDIR}"/mcollectived.initd mcollectived
+	insinto /etc/mcollective
+	cd etc
+	for cfg in *.dist ; do
+		newins "${cfg}" "${cfg%%.dist}"
+		sed -i -e "s:^libdir.*:libdir = /usr/share/mcollective/plugins:" \
+			"${D}"/etc/mcollective/${cfg%%.dist} || die "sed failed"
+	done
+	insinto /etc/mcollective/plugin.d
+}
+
+pkg_postinst() {
+	einfo "Mcollective requires a stomp server installed and functioning before"
+	einfo "you can use it. The recommended server to use is ActiveMQ [1] but"
+	einfo "any other stomp compatible server should work."
+	einfo
+	einfo "It is recommended you read the \'getting started\' guide [2] if this"
+	einfo "is a new installation"
+	einfo
+	einfo "[1] http://activemq.apache.org/"
+	einfo "[2] http://code.google.com/p/mcollective/wiki/GettingStarted"
+}
--- a/app-admin/sysstat/Manifest
+++ b/app-admin/sysstat/Manifest
@ -1,2 +1,3 @@
 DIST sysstat-11.0.2.tar.xz 291256 SHA256 acd87fdfbe7c796480f14fc26119d8f785d26827d74a0f5bced6c492a91f1b96 SHA512 4bb5f2ee14346d83c59bd4da36ae8fc6c13197eabb808b1b5db84b593f07d8b366b1f6329abed8d43e2a8497a89de0f89a398b741d4ca23b4a3a95973b5f0f54 WHIRLPOOL 98daee288e22f803f19bbe423eb999f527e8997f2ffd3fe1fe784363260365ee833dd33b755f44d6bfcc685f70b47cb8fd70fdd9a3fa679829c1e608bd65f8e2
-DIST sysstat-11.1.2.tar.xz 302400 SHA256 6f3f6a24a7f0ce67de6b5c0e71631e45966f9fe25f3e2b3dc71a31759af32e66 SHA512 b1c53e3061f1506ab001efd078a0f642e76d2ab6d3557922626ba04846594db9798ebe839434cfc47ed50b02510b90afb353c6c5065c101dca7d9049b1742a9c WHIRLPOOL 08603d2f34a0f6b9d31597370e7f4af746447307c5b0891c1a8d7876b68574d53ecfa579e342e455ae00d57e54277d65471c453a0781c342e68a5d3a31900a25
+DIST sysstat-11.0.3.tar.xz 291344 SHA256 b59ea4bf1a46a248cc04b575c09dd194a7871cf4c9a8d914cf9f32de8455087c SHA512 db0ad6d67742d45f4d03fd43c213a14a681c546681cdef47a6a4abd261603146b00a6cb4af8f0fc5e3400470d2ab2fd78f977b9ef838b7ee6c4a4dcb88fb4250 WHIRLPOOL 1d0cff47d6631fd64f17e13c978279e64adcb5d5d93143f692eef6964e8e142ed1ba73d69ee4f778e52386dfdf341fb51773a162af88de38a00d19e0a38902b9
+DIST sysstat-11.1.3.tar.xz 304368 SHA256 ddbd07dfac47bcf0a6c2ae503bd80ad84dbed80c939d3dd333eb8453c38c337b SHA512 96581e31ebd2065ca8f767ec2d9ba362cba707996adda0e0d1f81ff5f77a4709f37f91ae6c4d4e480e9ec8ac63b613c2a2e9249b87df5b4c589e4ce9cf4cc1f8 WHIRLPOOL b303bec7ee9183be09c73badf8fa6a8ea604419da7516a2cccefed2853dbfe7b6cacdcbad90c4aa18ebdb4b3032454f380813542497308dd01111b7ef97199b0
--- a/app-admin/sysstat/sysstat-11.0.3.ebuild
+++ b/app-admin/sysstat/sysstat-11.0.3.ebuild
@ -0,0 +1,87 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sysstat/sysstat-11.0.3.ebuild,v 1.1 2015/02/16 11:14:52 jer Exp $
+
+EAPI=5
+inherit eutils multilib systemd toolchain-funcs
+
+DESCRIPTION="System performance tools for Linux"
+HOMEPAGE="http://pagesperso-orange.fr/sebastien.godard/"
+SRC_URI="${HOMEPAGE}${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="cron debug +doc isag nls lm_sensors selinux"
+
+CDEPEND="
+	cron? ( sys-process/cronbase )
+	isag? (
+		dev-lang/tk
+		dev-vcs/rcs
+		sci-visualization/gnuplot
+	)
+	nls? ( virtual/libintl )
+	lm_sensors? ( sys-apps/lm_sensors )
+"
+DEPEND="
+	${CDEPEND}
+	nls? ( sys-devel/gettext )
+"
+RDEPEND="
+	${CDEPEND}
+	selinux? ( sec-policy/selinux-sysstat )
+"
+
+src_prepare() {
+	if use nls; then
+		strip-linguas -i nls/
+		local lingua pofile
+		for pofile in nls/*.po; do
+			lingua=${pofile/nls\/}
+			lingua=${lingua/.po}
+			if ! has ${lingua} ${LINGUAS}; then
+				rm "nls/${lingua}.po" || die
+			fi
+		done
+	fi
+	epatch "${FILESDIR}"/${PN}-10.0.4-flags.patch
+}
+
+src_configure() {
+	tc-export AR
+	sa_lib_dir=/usr/$(get_libdir)/sa \
+		conf_dir=/etc \
+		rcdir=Gentoo-does-not-use-rc.d \
+		econf \
+			--enable-copy-only \
+			--with-systemdsystemunitdir=$(systemd_get_unitdir) \
+			$(use_enable cron install-cron) \
+			$(use_enable debug debuginfo) \
+			$(use_enable doc documentation ) \
+			$(use_enable isag install-isag) \
+			$(use_enable lm_sensors sensors) \
+			$(use_enable nls)
+}
+
+src_compile() {
+	emake LFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	keepdir /var/log/sa
+
+	use cron && dodir /etc/cron.d
+
+	emake \
+		DESTDIR="${D}" \
+		DOC_DIR=/usr/share/doc/${PF} \
+		install
+
+	dodoc contrib/sargraph/sargraph
+
+	newinitd "${FILESDIR}"/${PN}.init.d ${PN}
+	systemd_dounit ${PN}.service
+
+	use doc && rm -f "${D}"usr/share/doc/${PF}/COPYING
+}
--- a/app-admin/sysstat/sysstat-11.1.3.ebuild
+++ b/app-admin/sysstat/sysstat-11.1.3.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sysstat/sysstat-11.1.2.ebuild,v 1.2 2014/11/02 07:50:36 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sysstat/sysstat-11.1.3.ebuild,v 1.1 2015/02/16 11:14:52 jer Exp $

 EAPI=5
 inherit eutils multilib systemd toolchain-funcs
--- a/app-cdr/k3b/files/k3b-2.0.3-libav-10.patch
+++ b/app-cdr/k3b/files/k3b-2.0.3-libav-10.patch
@ -0,0 +1,17 @@
+https://bugs.gentoo.org/509332
+
+--- a/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp.
+++ b/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
+@@ -423,9 +423,9 @@
+         // mp3 being one of them sadly. Most importantly: allow the libsndfile decoder to do
+         // its thing.
+         //
+-        if( file->type() == CODEC_ID_WMAV1 ||
+-            file->type() == CODEC_ID_WMAV2 ||
+-            file->type() == CODEC_ID_AAC )
+        if( file->type() == AV_CODEC_ID_WMAV1 ||
+            file->type() == AV_CODEC_ID_WMAV2 ||
+            file->type() == AV_CODEC_ID_AAC )
+ #endif
+             return file;
+     }
--- a/app-cdr/k3b/k3b-2.0.3-r1.ebuild
+++ b/app-cdr/k3b/k3b-2.0.3-r1.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-2.0.3-r1.ebuild,v 1.3 2014/12/12 21:16:26 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-2.0.3-r1.ebuild,v 1.4 2015/02/17 03:51:19 vapier Exp $

 EAPI=5

@ -61,7 +61,7 @@ RDEPEND="${CDEPEND}
 DOCS+=( ChangeLog )

 PATCHES=(
-	"${FILESDIR}/${PN}-2.0.2-ffmpeg2.patch"
+	"${FILESDIR}/${PN}-2.0.3-libav-10.patch" #509332
 )

 REQUIRED_USE="
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@ -1,4 +1,3 @@
 DIST gnupg-1.4.18.tar.bz2 3649557 SHA256 b7b5fdda78849955e0cdbc5a085f3a08f8b7fba126c622085debb62def5d6388 SHA512 f9619ede8e0d2844774e07fb42359444c5ab8e15565a87f419f76cc3d781940c564f35f429131686fdd7559c5c2edb49506b3c0a1feecbd95438743075be3e63 WHIRLPOOL 780876be0603fd0605b192721e2bbb770ad67d98acba8ef0fd769ab3241467696da5f49a189d89600d076691bf2cedb1294ffade5c44f6d24512d6a93a6f8981
-DIST gnupg-2.0.25.tar.bz2 4301689 SHA256 b3abe97df096cf53d6a422ac922f3c48e688bc892b7ccf669b92f0b7fc6c5823 SHA512 8b80c86ec53ed3b82d15a8e316baf175691e06e1bcac28d66c61fd37d07e26196a7ee7855e6eb958c301cee764866cc3cf00e5ec0aef23abddf7427bb3d23fb1 WHIRLPOOL 786f3db3af0c96249e128ce3a30dee7e9fbec38d75ed29138f0dfdcbe4f4377c39d4152844087cec0147921eed73c1a01382b542c6a27e86e8bd9265f67e65e2
 DIST gnupg-2.0.26.tar.bz2 4303384 SHA256 7758e30dc382ae7a7167ed41b7f936aa50af5ea2d6fccdef663b5b750b65b8e0 SHA512 5dd23baaac764fd48abd235ed52a85a2c7fd68b98fcde45c0f294ddb3b5629e8b1bd894585fbed4e6a6cb2bc4a5552c098c3cf1a849fffa469424fd0a4fee726 WHIRLPOOL 8d9b30337957f6bfeddea29116d862ef0c0ddd06d59bc2799db236b91b2c6767aad6f37f2166fc431c5d9454eb41f49f3e261bc38d0e89361f0c467f4591cd5a
 DIST gnupg-2.1.2.tar.bz2 4832996 SHA256 404f5a43d591dfe41f0ffb204b49a1533b67d77bc1fd68febd7e447575616792 SHA512 a12187d32a0d75e4e8ecabe87cd2a49de047dc0d5e601f73779303e0b2f3dad6c2874a665278319e50debd8acb724232be1f1122286ee82c82751063fef07ceb WHIRLPOOL 33f9e7306eb87b35a28489260b2c599164f8c8ac9d4e77d30145402df697a2705062dee02e6d1b904323df953c4b311e9d809216e8657145edd1cf8b1e63a37e
--- a/app-crypt/gnupg/gnupg-2.0.25.ebuild
+++ b/app-crypt/gnupg/gnupg-2.0.25.ebuild
@ -1,164 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.0.25.ebuild,v 1.12 2015/02/09 20:49:42 k_f Exp $
-
-EAPI="5"
-
-inherit eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="The GNU Privacy Guard, a GPL pgp replacement"
-HOMEPAGE="http://www.gnupg.org/"
-SRC_URI="mirror://gnupg/gnupg/${P}.tar.bz2"
-# SRC_URI="ftp://ftp.gnupg.org/gcrypt/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="adns bzip2 doc ldap nls mta readline static selinux smartcard usb"
-
-COMMON_DEPEND_LIBS="
-	>=dev-libs/libassuan-2
-	>=dev-libs/libgcrypt-1.4:0=
-	>=dev-libs/libgpg-error-1.11
-	>=dev-libs/libksba-1.0.7
-	>=dev-libs/pth-1.3.7
-	>=net-misc/curl-7.10
-	sys-libs/zlib
-	adns? ( >=net-libs/adns-1.4 )
-	bzip2? ( app-arch/bzip2 )
-	readline? ( sys-libs/readline )
-	smartcard? ( usb? ( virtual/libusb:0 ) )
-	ldap? ( net-nds/openldap )"
-COMMON_DEPEND_BINS="app-crypt/pinentry"
-
-# Existence of executables is checked during configuration.
-DEPEND="${COMMON_DEPEND_LIBS}
-	${COMMON_DEPEND_BINS}
-	static? (
-		>=dev-libs/libassuan-2[static-libs]
-		>=dev-libs/libgcrypt-1.4:0=[static-libs]
-		>=dev-libs/libgpg-error-1.11[static-libs]
-		>=dev-libs/libksba-1.0.7[static-libs]
-		>=dev-libs/pth-1.3.7[static-libs]
-		>=net-misc/curl-7.10[static-libs]
-		sys-libs/zlib[static-libs]
-		bzip2? ( app-arch/bzip2[static-libs] )
-	)
-	nls? ( sys-devel/gettext )
-	doc? ( sys-apps/texinfo )"
-
-RDEPEND="!static? ( ${COMMON_DEPEND_LIBS} )
-	${COMMON_DEPEND_BINS}
-	mta? ( virtual/mta )
-	!<=app-crypt/gnupg-2.0.1
-	selinux? ( sec-policy/selinux-gpg )
-	nls? ( virtual/libintl )"
-
-REQUIRED_USE="smartcard? ( !static )"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-2.0.17-gpgsm-gencert.patch"
-	epatch_user
-}
-
-src_configure() {
-	local myconf=()
-
-	# 'USE=static' support was requested:
-	# gnupg1: bug #29299
-	# gnupg2: bug #159623
-	use static && append-ldflags -static
-
-	if use smartcard; then
-		myconf+=(
-			--enable-scdaemon
-			$(use_enable usb ccid-driver)
-		)
-	else
-		myconf+=( --disable-scdaemon )
-	fi
-
-	if use elibc_SunOS || use elibc_AIX; then
-		myconf+=( --disable-symcryptrun )
-	else
-		myconf+=( --enable-symcryptrun )
-	fi
-
-	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--enable-gpg \
-		--enable-gpgsm \
-		--enable-agent \
-		"${myconf[@]}" \
-		$(use_with adns) \
-		$(use_enable bzip2) \
-		$(use_enable nls) \
-		$(use_enable mta mailto) \
-		$(use_enable ldap) \
-		$(use_with readline) \
-		CC_FOR_BUILD="$(tc-getBUILD_CC)"
-}
-
-src_compile() {
-	default
-
-	if use doc; then
-		cd doc
-		emake html
-	fi
-}
-
-src_install() {
-	default
-
-	# bug#192151
-	dobin tools/gpgsplit tools/gpg-zip
-
-	emake DESTDIR="${D}" -f doc/Makefile uninstall-nobase_dist_docDATA
-	rm "${ED}"/usr/share/gnupg/help* || die
-
-	dodoc ChangeLog NEWS README THANKS TODO VERSION doc/FAQ doc/DETAILS \
-		doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER doc/help*
-
-	dosym gpg2 /usr/bin/gpg
-	dosym gpgv2 /usr/bin/gpgv
-	dosym gpg2keys_hkp /usr/libexec/gpgkeys_hkp
-	dosym gpg2keys_finger /usr/libexec/gpgkeys_finger
-	dosym gpg2keys_curl /usr/libexec/gpgkeys_curl
-	if use ldap; then
-		dosym gpg2keys_ldap /usr/libexec/gpgkeys_ldap
-	fi
-	echo ".so man1/gpg2.1" > "${ED}"/usr/share/man/man1/gpg.1
-	echo ".so man1/gpgv2.1" > "${ED}"/usr/share/man/man1/gpgv.1
-
-	dodir /etc/env.d
-	echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg
-
-	if use doc; then
-		dohtml doc/gnupg.html/* doc/*.png
-	fi
-}
-
-pkg_postinst() {
-	elog "If you wish to view images emerge:"
-	elog "media-gfx/xloadimage, media-gfx/xli or any other viewer"
-	elog "Remember to use photo-viewer option in configuration file to activate"
-	elog "the right viewer."
-	elog
-
-	if use smartcard; then
-		elog "To use your OpenPGP smartcard (or token) with GnuPG you need one of"
-		use usb && elog " - a CCID-compatible reader, used directly through libusb;"
-		elog " - sys-apps/pcsc-lite and a compatible reader device;"
-		elog " - dev-libs/openct and a compatible reader device;"
-		elog " - a reader device and drivers exporting either PC/SC or CT-API interfaces."
-		elog ""
-		elog "General hint: you probably want to try installing sys-apps/pcsc-lite and"
-		elog "app-crypt/ccid first."
-	fi
-
-	ewarn "Please remember to restart gpg-agent if a different version"
-	ewarn "of the agent is currently used. If you are unsure of the gpg"
-	ewarn "agent you are using please run 'killall gpg-agent',"
-	ewarn "and to start a fresh daemon just run 'gpg-agent --daemon'."
-}
--- a/app-crypt/gnupg/gnupg-2.0.26-r2.ebuild
+++ b/app-crypt/gnupg/gnupg-2.0.26-r2.ebuild
@ -1,164 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.0.26-r2.ebuild,v 1.3 2015/02/09 20:49:42 k_f Exp $
-
-EAPI="5"
-
-inherit eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="The GNU Privacy Guard, a GPL pgp replacement"
-HOMEPAGE="http://www.gnupg.org/"
-SRC_URI="mirror://gnupg/gnupg/${P}.tar.bz2"
-# SRC_URI="ftp://ftp.gnupg.org/gcrypt/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="bzip2 doc ldap nls mta readline static selinux smartcard tools usb"
-
-COMMON_DEPEND_LIBS="
-	>=dev-libs/libassuan-2
-	>=dev-libs/libgcrypt-1.4:0=
-	>=dev-libs/libgpg-error-1.11
-	>=dev-libs/libksba-1.0.7
-	>=dev-libs/pth-1.3.7
-	>=net-misc/curl-7.10
-	sys-libs/zlib
-	bzip2? ( app-arch/bzip2 )
-	readline? ( sys-libs/readline )
-	smartcard? ( usb? ( virtual/libusb:0 ) )
-	ldap? ( net-nds/openldap )"
-COMMON_DEPEND_BINS="app-crypt/pinentry"
-
-# Existence of executables is checked during configuration.
-DEPEND="${COMMON_DEPEND_LIBS}
-	${COMMON_DEPEND_BINS}
-	static? (
-		>=dev-libs/libassuan-2[static-libs]
-		>=dev-libs/libgcrypt-1.4:0=[static-libs]
-		>=dev-libs/libgpg-error-1.11[static-libs]
-		>=dev-libs/libksba-1.0.7[static-libs]
-		>=dev-libs/pth-1.3.7[static-libs]
-		>=net-misc/curl-7.10[static-libs]
-		sys-libs/zlib[static-libs]
-		bzip2? ( app-arch/bzip2[static-libs] )
-	)
-	nls? ( sys-devel/gettext )
-	doc? ( sys-apps/texinfo )"
-
-RDEPEND="!static? ( ${COMMON_DEPEND_LIBS} )
-	${COMMON_DEPEND_BINS}
-	mta? ( virtual/mta )
-	!<=app-crypt/gnupg-2.0.1
-	selinux? ( sec-policy/selinux-gpg )
-	nls? ( virtual/libintl )"
-
-REQUIRED_USE="smartcard? ( !static )"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-2.0.17-gpgsm-gencert.patch"
-	epatch "${FILESDIR}/${P}-Need-to-init-the-trustdb-for-import.patch"
-	epatch_user
-}
-
-src_configure() {
-	local myconf=()
-
-	# 'USE=static' support was requested:
-	# gnupg1: bug #29299
-	# gnupg2: bug #159623
-	use static && append-ldflags -static
-
-	if use smartcard; then
-		myconf+=(
-			--enable-scdaemon
-			$(use_enable usb ccid-driver)
-		)
-	else
-		myconf+=( --disable-scdaemon )
-	fi
-
-	if use elibc_SunOS || use elibc_AIX; then
-		myconf+=( --disable-symcryptrun )
-	else
-		myconf+=( --enable-symcryptrun )
-	fi
-
-	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--enable-gpg \
-		--enable-gpgsm \
-		--enable-agent \
-		--without-adns \
-		"${myconf[@]}" \
-		$(use_enable bzip2) \
-		$(use_enable nls) \
-		$(use_enable mta mailto) \
-		$(use_enable ldap) \
-		$(use_with readline) \
-		CC_FOR_BUILD="$(tc-getBUILD_CC)"
-}
-
-src_compile() {
-	default
-
-	if use doc; then
-		cd doc
-		emake html
-	fi
-}
-
-src_install() {
-	default
-
-	use tools && dobin tools/{convert-from-106,gpg-check-pattern} \
-		tools/{gpg-zip,gpgconf,gpgsplit,lspgpot,mail-signed-keys,make-dns-cert}
-
-	emake DESTDIR="${D}" -f doc/Makefile uninstall-nobase_dist_docDATA
-	rm "${ED}"/usr/share/gnupg/help* || die
-
-	dodoc ChangeLog NEWS README THANKS TODO VERSION doc/FAQ doc/DETAILS \
-		doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER doc/help*
-
-	dosym gpg2 /usr/bin/gpg
-	dosym gpgv2 /usr/bin/gpgv
-	dosym gpg2keys_hkp /usr/libexec/gpgkeys_hkp
-	dosym gpg2keys_finger /usr/libexec/gpgkeys_finger
-	dosym gpg2keys_curl /usr/libexec/gpgkeys_curl
-	if use ldap; then
-		dosym gpg2keys_ldap /usr/libexec/gpgkeys_ldap
-	fi
-	echo ".so man1/gpg2.1" > "${ED}"/usr/share/man/man1/gpg.1
-	echo ".so man1/gpgv2.1" > "${ED}"/usr/share/man/man1/gpgv.1
-
-	dodir /etc/env.d
-	echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg
-
-	if use doc; then
-		dohtml doc/gnupg.html/* doc/*.png
-	fi
-}
-
-pkg_postinst() {
-	elog "If you wish to view images emerge:"
-	elog "media-gfx/xloadimage, media-gfx/xli or any other viewer"
-	elog "Remember to use photo-viewer option in configuration file to activate"
-	elog "the right viewer."
-	elog
-
-	if use smartcard; then
-		elog "To use your OpenPGP smartcard (or token) with GnuPG you need one of"
-		use usb && elog " - a CCID-compatible reader, used directly through libusb;"
-		elog " - sys-apps/pcsc-lite and a compatible reader device;"
-		elog " - dev-libs/openct and a compatible reader device;"
-		elog " - a reader device and drivers exporting either PC/SC or CT-API interfaces."
-		elog ""
-		elog "General hint: you probably want to try installing sys-apps/pcsc-lite and"
-		elog "app-crypt/ccid first."
-	fi
-
-	ewarn "Please remember to restart gpg-agent if a different version"
-	ewarn "of the agent is currently used. If you are unsure of the gpg"
-	ewarn "agent you are using please run 'killall gpg-agent',"
-	ewarn "and to start a fresh daemon just run 'gpg-agent --daemon'."
-}
--- a/app-crypt/gnupg/gnupg-2.0.26-r3.ebuild
+++ b/app-crypt/gnupg/gnupg-2.0.26-r3.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.0.26-r3.ebuild,v 1.10 2015/02/09 20:49:42 k_f Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.0.26-r3.ebuild,v 1.11 2015/02/16 10:21:23 ago Exp $

 EAPI="5"

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

 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 doc ldap nls mta readline static selinux smartcard tools usb"

 COMMON_DEPEND_LIBS="
--- a/app-crypt/gnupg/gnupg-2.0.26.ebuild
+++ b/app-crypt/gnupg/gnupg-2.0.26.ebuild
@ -1,165 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.0.26.ebuild,v 1.10 2014/10/29 09:26:39 ago Exp $
-
-EAPI="5"
-
-inherit eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="The GNU Privacy Guard, a GPL pgp replacement"
-HOMEPAGE="http://www.gnupg.org/"
-SRC_URI="mirror://gnupg/gnupg/${P}.tar.bz2"
-# SRC_URI="ftp://ftp.gnupg.org/gcrypt/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="adns bzip2 doc ldap nls mta readline static selinux smartcard usb"
-
-COMMON_DEPEND_LIBS="
-	>=dev-libs/libassuan-2
-	>=dev-libs/libgcrypt-1.4:0=
-	>=dev-libs/libgpg-error-1.11
-	>=dev-libs/libksba-1.0.7
-	>=dev-libs/pth-1.3.7
-	>=net-misc/curl-7.10
-	sys-libs/zlib
-	adns? ( >=net-libs/adns-1.4 )
-	bzip2? ( app-arch/bzip2 )
-	readline? ( sys-libs/readline )
-	smartcard? ( usb? ( virtual/libusb:0 ) )
-	ldap? ( net-nds/openldap )"
-COMMON_DEPEND_BINS="|| ( app-crypt/pinentry app-crypt/pinentry-qt )"
-
-# Existence of executables is checked during configuration.
-DEPEND="${COMMON_DEPEND_LIBS}
-	${COMMON_DEPEND_BINS}
-	static? (
-		>=dev-libs/libassuan-2[static-libs]
-		>=dev-libs/libgcrypt-1.4:0=[static-libs]
-		>=dev-libs/libgpg-error-1.11[static-libs]
-		>=dev-libs/libksba-1.0.7[static-libs]
-		>=dev-libs/pth-1.3.7[static-libs]
-		>=net-misc/curl-7.10[static-libs]
-		sys-libs/zlib[static-libs]
-		bzip2? ( app-arch/bzip2[static-libs] )
-	)
-	nls? ( sys-devel/gettext )
-	doc? ( sys-apps/texinfo )"
-
-RDEPEND="!static? ( ${COMMON_DEPEND_LIBS} )
-	${COMMON_DEPEND_BINS}
-	mta? ( virtual/mta )
-	!<=app-crypt/gnupg-2.0.1
-	selinux? ( sec-policy/selinux-gpg )
-	nls? ( virtual/libintl )"
-
-REQUIRED_USE="smartcard? ( !static )"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-2.0.17-gpgsm-gencert.patch"
-	epatch "${FILESDIR}/${P}-Need-to-init-the-trustdb-for-import.patch"
-	epatch_user
-}
-
-src_configure() {
-	local myconf=()
-
-	# 'USE=static' support was requested:
-	# gnupg1: bug #29299
-	# gnupg2: bug #159623
-	use static && append-ldflags -static
-
-	if use smartcard; then
-		myconf+=(
-			--enable-scdaemon
-			$(use_enable usb ccid-driver)
-		)
-	else
-		myconf+=( --disable-scdaemon )
-	fi
-
-	if use elibc_SunOS || use elibc_AIX; then
-		myconf+=( --disable-symcryptrun )
-	else
-		myconf+=( --enable-symcryptrun )
-	fi
-
-	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--enable-gpg \
-		--enable-gpgsm \
-		--enable-agent \
-		"${myconf[@]}" \
-		$(use_with adns) \
-		$(use_enable bzip2) \
-		$(use_enable nls) \
-		$(use_enable mta mailto) \
-		$(use_enable ldap) \
-		$(use_with readline) \
-		CC_FOR_BUILD="$(tc-getBUILD_CC)"
-}
-
-src_compile() {
-	default
-
-	if use doc; then
-		cd doc
-		emake html
-	fi
-}
-
-src_install() {
-	default
-
-	# bug#192151
-	dobin tools/gpgsplit tools/gpg-zip
-
-	emake DESTDIR="${D}" -f doc/Makefile uninstall-nobase_dist_docDATA
-	rm "${ED}"/usr/share/gnupg/help* || die
-
-	dodoc ChangeLog NEWS README THANKS TODO VERSION doc/FAQ doc/DETAILS \
-		doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER doc/help*
-
-	dosym gpg2 /usr/bin/gpg
-	dosym gpgv2 /usr/bin/gpgv
-	dosym gpg2keys_hkp /usr/libexec/gpgkeys_hkp
-	dosym gpg2keys_finger /usr/libexec/gpgkeys_finger
-	dosym gpg2keys_curl /usr/libexec/gpgkeys_curl
-	if use ldap; then
-		dosym gpg2keys_ldap /usr/libexec/gpgkeys_ldap
-	fi
-	echo ".so man1/gpg2.1" > "${ED}"/usr/share/man/man1/gpg.1
-	echo ".so man1/gpgv2.1" > "${ED}"/usr/share/man/man1/gpgv.1
-
-	dodir /etc/env.d
-	echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg
-
-	if use doc; then
-		dohtml doc/gnupg.html/* doc/*.png
-	fi
-}
-
-pkg_postinst() {
-	elog "If you wish to view images emerge:"
-	elog "media-gfx/xloadimage, media-gfx/xli or any other viewer"
-	elog "Remember to use photo-viewer option in configuration file to activate"
-	elog "the right viewer."
-	elog
-
-	if use smartcard; then
-		elog "To use your OpenPGP smartcard (or token) with GnuPG you need one of"
-		use usb && elog " - a CCID-compatible reader, used directly through libusb;"
-		elog " - sys-apps/pcsc-lite and a compatible reader device;"
-		elog " - dev-libs/openct and a compatible reader device;"
-		elog " - a reader device and drivers exporting either PC/SC or CT-API interfaces."
-		elog ""
-		elog "General hint: you probably want to try installing sys-apps/pcsc-lite and"
-		elog "app-crypt/ccid first."
-	fi
-
-	ewarn "Please remember to restart gpg-agent if a different version"
-	ewarn "of the agent is currently used. If you are unsure of the gpg"
-	ewarn "agent you are using please run 'killall gpg-agent',"
-	ewarn "and to start a fresh daemon just run 'gpg-agent --daemon'."
-}
--- a/app-crypt/mit-krb5/mit-krb5-1.13-r1.ebuild
+++ b/app-crypt/mit-krb5/mit-krb5-1.13-r1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/mit-krb5-1.13-r1.ebuild,v 1.5 2015/02/08 21:12:25 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/mit-krb5-1.13-r1.ebuild,v 1.6 2015/02/16 10:19:43 ago Exp $

 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7} )
@ -14,7 +14,7 @@ SRC_URI="http://web.mit.edu/kerberos/dist/krb5/${P_DIR}/${MY_P}-signed.tar"

 LICENSE="openafs-krb5-a BSD MIT OPENLDAP BSD-2 HPND BSD-4 ISC RSA CC-BY-SA-3.0 || ( BSD-2 GPL-2+ )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86"
 IUSE="doc +keyutils openldap +pkinit selinux +threads test xinetd"

 CDEPEND="!!app-crypt/heimdal
--- a/app-editors/scite/Manifest
+++ b/app-editors/scite/Manifest
@ -1,2 +1,3 @@
 DIST scite350.tgz 2265217 SHA256 bf7260a7538a642ad008db067ddf5f1752c3326059a5a7ae4885f08431f1d0b5 SHA512 96ce19112707f6150751ab09e6c2fbb9822573d025c0f49062c6b95d1ab4b218123500fc4a1a8a175729afd9444a9ebf36892007ad4cd7a3bd55239e50a21b70 WHIRLPOOL a3d41e16e27ca69bec4b13656ab3f74358e8e77a1359c9fd104af4547359e8c29af9820290833b679931d115a09342473113af584a2af57258a757e2622aff32
 DIST scite352.tgz 2277393 SHA256 d1b9a12f1b8ea80f28564a1695146a59b4a03099c8ca8693e3a9ce02bb0a2836 SHA512 01bf36dbb4d02f3693a759f778110b913dfbb733d0a5d006c5de78cb627c3511e821b62fa0a410174c09917a09d41d9a94535a14b7a4c77801eafaace15a586d WHIRLPOOL ee39f57944ef60182a3ac8a409cfd4829cfdee85a7b9b91b2722bd3d9d8b2a6f480cd8db1281826f4a9543575ae99dfc66cfe905592a2acae9ad7728d5862695
+DIST scite353.tgz 2293082 SHA256 d667c4f6cacc6d906e1992048c23eac4cb83c9ced7ec3df320d7e3913f167f10 SHA512 d00e29beb83e7289c2e807373565f4a9540e284a5e537e734c40dc6d7e2c4042a2c12b2c720747cb65ffdf579f804a47b929541d207a9713af7c4f89f1c5672a WHIRLPOOL cdb395ed93d9a893540c32579130ec9cf5ae514b846e9d88b51797e507c2f5d77d45c4ced919eb208520757f97b75fb2e2a9d8b2110cbcc98ddf82f1f1265277
--- a/app-editors/scite/scite-3.5.3.ebuild
+++ b/app-editors/scite/scite-3.5.3.ebuild
@ -0,0 +1,85 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/scite-3.5.3.ebuild,v 1.1 2015/02/16 09:13:42 dlan Exp $
+
+EAPI="5"
+
+inherit toolchain-funcs eutils
+
+MY_PV=${PV//./}
+DESCRIPTION="A very powerful editor for programmers"
+HOMEPAGE="http://www.scintilla.org/SciTE.html"
+SRC_URI="mirror://sourceforge/scintilla/${PN}${MY_PV}.tgz"
+
+LICENSE="HPND lua? ( MIT )"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux"
+IUSE="lua"
+
+RDEPEND="dev-libs/glib
+	x11-libs/cairo
+	x11-libs/gtk+:2
+	x11-libs/gdk-pixbuf
+	x11-libs/pango
+	lua? ( >=dev-lang/lua-5 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	>=sys-apps/sed-4"
+
+S="${WORKDIR}/${PN}/gtk"
+
+src_prepare() {
+	cd "${WORKDIR}/scintilla/gtk"
+	sed -i makefile \
+		-e "s#^CXXFLAGS=#CXXFLAGS=${CXXFLAGS} #" \
+		-e "s#^\(CXXFLAGS=.*\)-Os#\1#" \
+		-e "s#^CC =\(.*\)#CC = $(tc-getCXX)#" \
+		-e "s#^CCOMP =\(.*\)#CCOMP = $(tc-getCC)#" \
+		-e "s#-Os##" \
+		|| die "error patching makefile"
+
+	cd "${WORKDIR}/scite/gtk"
+	sed -i makefile \
+		-e "s#-rdynamic#-rdynamic ${LDFLAGS}#" \
+		|| die "error patching makefile"
+
+	cd "${S}"
+	sed -i makefile \
+		-e 's#usr/local#usr#g' \
+		-e 's#/gnome/apps/Applications#/applications#' \
+		-e "s#^CXXFLAGS=#CXXFLAGS=${CXXFLAGS} #" \
+		-e "s#^\(CXXFLAGS=.*\)-Os#\1#" \
+		-e "s#^CC =\(.*\)#CC = $(tc-getCXX)#" \
+		-e "s#^CCOMP =\(.*\)#CCOMP = $(tc-getCC)#" \
+		-e 's#${D}##' \
+		-e 's#-g root#-g 0#' \
+		-e "s#-Os##" \
+		|| die "error patching makefile"
+}
+
+src_compile() {
+	emake -C ../../scintilla/gtk AR="$(tc-getAR)"
+	if use lua; then
+		emake
+	else
+		emake NO_LUA=1
+	fi
+}
+
+src_install() {
+	dodir /usr/bin
+	dodir /usr/share/{pixmaps,applications}
+
+	emake prefix="${ED}/usr" install || die
+
+	# we have to keep this because otherwise it'll break upgrading
+	mv "${ED}/usr/bin/SciTE" "${ED}/usr/bin/scite" || die
+	dosym /usr/bin/scite /usr/bin/SciTE
+
+	# replace .desktop file with our own working version
+	rm -f "${ED}/usr/share/applications/SciTE.desktop" || die
+	domenu "${FILESDIR}/scite.desktop"
+
+	doman ../doc/scite.1
+	dodoc ../README
+}
--- a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20140508-r15.ebuild
+++ b/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20140508-r15.ebuild
@ -0,0 +1,117 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20140508-r15.ebuild,v 1.1 2015/02/16 23:59:37 tetromino Exp $
+
+EAPI=5
+inherit emul-linux-x86
+
+LICENSE="Artistic GPL-1 GPL-2 GPL-3 BSD BSD-2 BZIP2 AFL-2.1 LGPL-2.1 BSD-4 MIT
+	public-domain LGPL-3 LGPL-2 GPL-2-with-exceptions MPL-1.1 OPENLDAP
+	Sleepycat UoI-NCSA ZLIB openafs-krb5-a HPND ISC RSA IJG libmng libtiff
+	openssl tcp_wrappers_license"
+
+KEYWORDS="-* ~amd64"
+IUSE="abi_x86_32 +kerberos +ldap +pam"
+
+DEPEND=""
+RDEPEND="!<app-emulation/emul-linux-x86-medialibs-10.2
+	!abi_x86_32? (
+		!>=app-arch/xz-utils-5.0.5-r1[abi_x86_32(-)]
+	)
+	abi_x86_32? (
+		>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)]
+		>=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)]
+		>=media-libs/libpng-1.6.10:0[abi_x86_32(-)]
+		>=dev-libs/udis86-1.7-r2[abi_x86_32(-)]
+		>=virtual/libffi-3.0.13-r1[abi_x86_32(-)]
+		>=sys-devel/llvm-3.3-r3[abi_x86_32(-)]
+		>=media-libs/libpng-1.2.51:1.2[abi_x86_32(-)]
+		>=virtual/jpeg-62:62[abi_x86_32(-)]
+		>=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)]
+		>=sys-libs/libavc1394-0.5.4-r1[abi_x86_32(-)]
+		>=dev-libs/expat-2.1.0-r3[abi_x86_32(-)]
+		>=virtual/libusb-0-r1:0[abi_x86_32(-)]
+		>=virtual/libusb-1-r1:1[abi_x86_32(-)]
+		>=virtual/libudev-208[abi_x86_32(-)]
+		>=media-libs/tiff-4.0.3-r6:0[abi_x86_32(-)]
+		>=sys-apps/attr-2.4.47-r1[abi_x86_32(-)]
+		>=dev-libs/glib-2.34.3:2[abi_x86_32(-)]
+		>=media-libs/lcms-1.19-r2:0[abi_x86_32(-)]
+		>=media-libs/lcms-2.5-r1:2[abi_x86_32(-)]
+		>=app-text/libpaper-1.1.24-r2[abi_x86_32(-)]
+		>=media-libs/tiff-3.9.7-r1:3[abi_x86_32(-)]
+		|| (
+			>=dev-libs/elfutils-0.155-r1[abi_x86_32(-)]
+			>=dev-libs/libelf-0.8.13-r2[abi_x86_32(-)]
+		)
+		>=sys-libs/e2fsprogs-libs-1.42.9[abi_x86_32(-)]
+		>=sys-libs/ncurses-5.9-r3[abi_x86_32(-)]
+		>=sys-libs/gpm-1.20.7-r2[abi_x86_32(-)]
+		>=dev-libs/gmp-5.1.3-r1[abi_x86_32(-)]
+		>=dev-libs/libpcre-8.33-r1[abi_x86_32(-)]
+		>=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)]
+		>=sys-apps/tcp-wrappers-7.6.22-r1[abi_x86_32(-)]
+		>=sys-libs/gdbm-1.10-r1[abi_x86_32(-)]
+		>=dev-libs/json-c-0.11-r1[abi_x86_32(-)]
+		>=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)]
+		>=dev-libs/dbus-glib-0.100.2-r1[abi_x86_32(-)]
+		>=sys-libs/readline-6.2_p5-r1:0[abi_x86_32(-)]
+		>=sys-devel/gettext-0.18.3.2[abi_x86_32(-)]
+		>=dev-libs/libgpg-error-1.12-r1[abi_x86_32(-)]
+		>=dev-db/sqlite-3.8.3:3[abi_x86_32(-)]
+		>=dev-libs/nettle-2.7.1-r1[abi_x86_32(-)]
+		>=dev-libs/libtasn1-3.4-r1[abi_x86_32(-)]
+		>=dev-libs/libgcrypt-1.5.3-r100:11[abi_x86_32(-)]
+		>=dev-libs/libgcrypt-1.6.1-r1:0[abi_x86_32(-)]
+		>=dev-libs/lzo-2.06-r1[abi_x86_32(-)]
+		>=dev-libs/libxslt-1.1.28-r2[abi_x86_32(-)]
+		>=sys-apps/file-5.18-r1[abi_x86_32(-)]
+		>=app-arch/xz-utils-5.0.5-r1[abi_x86_32(-)]
+		>=media-libs/giflib-4.2.3-r1[abi_x86_32(-)]
+		>=sys-libs/slang-2.2.4-r1[abi_x86_32(-)]
+		>=sys-apps/acl-2.2.52-r1[abi_x86_32(-)]
+		>=sys-apps/util-linux-2.24.1-r3[abi_x86_32(-)]
+		|| (
+			>=dev-libs/libltdl-2.4.3:0[abi_x86_32(-)]
+			>=sys-devel/libtool-2.4.2-r1[abi_x86_32(-)]
+		)
+		>=virtual/acl-0-r2[abi_x86_32(-)]
+		>=dev-libs/openssl-1.0.1h-r2:0[abi_x86_32(-)]
+		>=dev-libs/openssl-0.9.8z_p1-r2:0.9.8[abi_x86_32(-)]
+		>=net-libs/gnutls-3.3.4[abi_x86_32(-)]
+		>=net-print/cups-1.7.1-r2[abi_x86_32(-)]
+		>=sys-libs/talloc-2.1.0-r1[abi_x86_32(-)]
+		>=sys-apps/keyutils-1.5.9-r1[abi_x86_32(-)]
+		kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)] )
+		>=sys-libs/db-4.8.30-r1:4.8[abi_x86_32(-)]
+		ldap? ( >=net-nds/openldap-2.4.38-r2[abi_x86_32(-)] )
+		>=net-dns/libidn-1.28-r1[abi_x86_32(-)]
+		>=dev-libs/libnl-3.2.24-r1[abi_x86_32(-)]
+		>=media-libs/libart_lgpl-2.3.21-r2[abi_x86_32(-)]
+		>=sys-libs/cracklib-2.9.1-r1[abi_x86_32(-)]
+		>=net-libs/libtirpc-0.2.4-r2[abi_x86_32(-)]
+		pam? ( >=virtual/pam-0-r1[abi_x86_32(-)] )
+		>=net-libs/libsoup-2.46.0-r1[abi_x86_32(-)]
+		>=net-libs/neon-0.30.0-r1[abi_x86_32(-)]
+		>=dev-libs/nspr-4.10.6-r1[abi_x86_32(-)]
+		>=dev-libs/nss-3.16-r1[abi_x86_32(-)]
+		>=net-misc/curl-7.37.0-r1[abi_x86_32(-)]
+		>=sys-apps/pciutils-3.3.0-r2[abi_x86_32(-)]
+	)
+	>=sys-libs/glibc-2.16" # bug 340613
+
+PYTHON_UPDATER_IGNORE="1"
+
+src_prepare() {
+	export ALLOWED="(${S}/lib32/security/pam_filter/upperLOWER|${S}/etc/env.d|${S}/lib32/security/pam_ldap.so)"
+	emul-linux-x86_src_prepare
+	rm -rf "${S}/etc/env.d/binutils/" \
+			"${S}/usr/i686-pc-linux-gnu/lib" \
+			"${S}/usr/lib32/engines/" \
+			"${S}/usr/lib32/openldap/" || die
+
+	ln -s ../share/terminfo "${S}/usr/lib32/terminfo" || die
+
+	# Remove migrated stuff.
+	use abi_x86_32 && rm -f $(sed "${FILESDIR}/remove-native-${PVR}" -e '/^#/d')
+}
--- a/app-emulation/emul-linux-x86-baselibs/files/remove-native-20140508-r15
+++ b/app-emulation/emul-linux-x86-baselibs/files/remove-native-20140508-r15
@ -0,0 +1,544 @@
+lib32/libz.so.1
+lib32/libz.so.1.2.8
+usr/lib32/libz.so
+usr/lib32/pkgconfig/zlib.pc
+usr/lib32/libminizip.so
+usr/lib32/libminizip.so.1
+usr/lib32/libminizip.so.1.0.0
+usr/lib32/pkgconfig/minizip.pc
+lib32/libbz2.so.1
+lib32/libbz2.so.1.0
+lib32/libbz2.so.1.0.6
+usr/lib32/libbz2.so
+usr/lib32/libpng.so
+usr/lib32/libpng16.so
+usr/lib32/libpng16.so.16
+usr/lib32/libpng16.so.16.10.0
+usr/lib32/pkgconfig/libpng.pc
+usr/lib32/pkgconfig/libpng16.pc
+usr/lib32/libudis86.so
+usr/lib32/libudis86.so.0
+usr/lib32/libudis86.so.0.0.0
+usr/lib32/libffi-3.0.13/include/ffi.h
+usr/lib32/libffi-3.0.13/include/ffitarget.h
+usr/lib32/libffi.so
+usr/lib32/libffi.so.6
+usr/lib32/libffi.so.6.0.1
+usr/lib32/pkgconfig/libffi.pc
+usr/lib32/LLVMHello.so
+usr/lib32/libLLVM-3.3.so
+usr/lib32/libLTO.so
+usr/lib32/libprofile_rt.so
+usr/lib32/libpng12.so.0
+usr/lib32/libraw1394.so
+usr/lib32/libraw1394.so.11
+usr/lib32/libraw1394.so.11.1.0
+usr/lib32/pkgconfig/libraw1394.pc
+usr/lib32/libavc1394.so
+usr/lib32/libavc1394.so.0
+usr/lib32/libavc1394.so.0.3.0
+usr/lib32/pkgconfig/libavc1394.pc
+usr/lib32/librom1394.so
+usr/lib32/librom1394.so.0
+usr/lib32/librom1394.so.0.3.0
+usr/lib32/libjpeg.so
+usr/lib32/libturbojpeg.so
+usr/lib32/libturbojpeg.so.0
+usr/lib32/libturbojpeg.so.0.0.0
+usr/lib32/libjpeg.so.62
+usr/lib32/libexpat.so
+usr/lib32/libexpat.so.1
+usr/lib32/libexpat.so.1.6.0
+usr/lib32/libexpatu.so
+usr/lib32/libexpatu.so.1
+usr/lib32/libexpatu.so.1.6.0
+usr/lib32/libexpatw.so
+usr/lib32/libexpatw.so.1
+usr/lib32/libexpatw.so.1.6.0
+usr/lib32/pkgconfig/expat.pc
+usr/lib32/pkgconfig/expatu.pc
+usr/lib32/pkgconfig/expatw.pc
+lib32/libusb-0.1.so.4
+lib32/libusb-0.1.so.4.4.4
+usr/lib32/libusb-1.0.so
+lib32/libusb-1.0.so.0
+lib32/libusb-1.0.so.0.1.0
+usr/lib32/libusb.so
+usr/lib32/pkgconfig/libusb-1.0.pc
+usr/lib32/pkgconfig/libusb.pc
+lib32/libudev.so.1
+lib32/libudev.so.1.4.0
+usr/lib32/libudev.so
+usr/lib32/pkgconfig/libudev.pc
+usr/lib32/libjpeg.so.62.1.0
+usr/lib32/libtiff.so
+usr/lib32/libtiff.so.5
+usr/lib32/libtiff.so.5.2.0
+usr/lib32/libtiffxx.so
+usr/lib32/libtiffxx.so.5
+usr/lib32/libtiffxx.so.5.2.0
+usr/lib32/pkgconfig/libtiff-4.pc
+lib32/libattr.so.1
+lib32/libattr.so.1.1.0
+usr/lib32/libattr.so
+usr/lib32/glib-2.0/include/glibconfig.h
+usr/lib32/libglib-2.0.so
+usr/lib32/libglib-2.0.so.0
+usr/lib32/libglib-2.0.so.0.3800.2
+usr/lib32/pkgconfig/glib-2.0.pc
+usr/lib32/libgmodule-2.0.so
+usr/lib32/libgmodule-2.0.so.0
+usr/lib32/libgmodule-2.0.so.0.3800.2
+usr/lib32/pkgconfig/gmodule-2.0.pc
+usr/lib32/libgio-2.0.so
+usr/lib32/libgio-2.0.so.0
+usr/lib32/libgio-2.0.so.0.3800.2
+usr/lib32/pkgconfig/gio-2.0.pc
+usr/lib32/libgobject-2.0.so
+usr/lib32/libgobject-2.0.so.0
+usr/lib32/libgobject-2.0.so.0.3800.2
+usr/lib32/pkgconfig/gobject-2.0.pc
+usr/lib32/libgthread-2.0.so
+usr/lib32/libgthread-2.0.so.0
+usr/lib32/libgthread-2.0.so.0.3800.2
+usr/lib32/pkgconfig/gthread-2.0.pc
+usr/lib32/pkgconfig/gio-unix-2.0.pc
+usr/lib32/pkgconfig/gmodule-export-2.0.pc
+usr/lib32/pkgconfig/gmodule-no-export-2.0.pc
+usr/lib32/liblcms.so
+usr/lib32/liblcms.so.1
+usr/lib32/liblcms.so.1.0.19
+usr/lib32/pkgconfig/lcms.pc
+usr/lib32/liblcms2.so
+usr/lib32/liblcms2.so.2
+usr/lib32/liblcms2.so.2.0.5
+usr/lib32/pkgconfig/lcms2.pc
+usr/lib32/libpaper.so
+usr/lib32/libpaper.so.1
+usr/lib32/libpaper.so.1.1.2
+usr/lib32/libtiff.so.3
+usr/lib32/libtiff.so.4
+usr/lib32/libtiffxx.so.3
+usr/lib32/libtiffxx.so.4
+usr/lib32/elfutils/libebl_aarch64-0.158.so
+usr/lib32/elfutils/libebl_aarch64.so
+usr/lib32/elfutils/libebl_alpha-0.158.so
+usr/lib32/elfutils/libebl_alpha.so
+usr/lib32/elfutils/libebl_arm-0.158.so
+usr/lib32/elfutils/libebl_arm.so
+usr/lib32/elfutils/libebl_i386-0.158.so
+usr/lib32/elfutils/libebl_i386.so
+usr/lib32/elfutils/libebl_ia64-0.158.so
+usr/lib32/elfutils/libebl_ia64.so
+usr/lib32/elfutils/libebl_ppc-0.158.so
+usr/lib32/elfutils/libebl_ppc.so
+usr/lib32/elfutils/libebl_ppc64-0.158.so
+usr/lib32/elfutils/libebl_ppc64.so
+usr/lib32/elfutils/libebl_s390-0.158.so
+usr/lib32/elfutils/libebl_s390.so
+usr/lib32/elfutils/libebl_sh-0.158.so
+usr/lib32/elfutils/libebl_sh.so
+usr/lib32/elfutils/libebl_sparc-0.158.so
+usr/lib32/elfutils/libebl_sparc.so
+usr/lib32/elfutils/libebl_tilegx-0.158.so
+usr/lib32/elfutils/libebl_tilegx.so
+usr/lib32/elfutils/libebl_x86_64-0.158.so
+usr/lib32/elfutils/libebl_x86_64.so
+usr/lib32/libelf-0.158.so
+usr/lib32/libelf.so
+usr/lib32/libelf.so.1
+usr/lib32/libasm-0.158.so
+usr/lib32/libasm.so
+usr/lib32/libasm.so.1
+usr/lib32/libdw-0.158.so
+usr/lib32/libdw.so
+usr/lib32/libdw.so.1
+lib32/libss.so.2
+lib32/libss.so.2.0
+usr/lib32/libss.so
+usr/lib32/pkgconfig/ss.pc
+lib32/libcom_err.so.2
+lib32/libcom_err.so.2.1
+usr/lib32/libcom_err.so
+usr/lib32/pkgconfig/com_err.pc
+usr/lib32/libcurses.so
+usr/lib32/libform.so
+usr/lib32/libform.so.5
+usr/lib32/libform.so.5.9
+usr/lib32/libformw.so
+usr/lib32/libformw.so.5
+usr/lib32/libformw.so.5.9
+usr/lib32/libmenu.so
+usr/lib32/libmenu.so.5
+usr/lib32/libmenu.so.5.9
+usr/lib32/libmenuw.so
+usr/lib32/libmenuw.so.5
+usr/lib32/libmenuw.so.5.9
+lib32/libncurses.so.5
+lib32/libncurses.so.5.9
+lib32/libncursesw.so.5
+lib32/libncursesw.so.5.9
+usr/lib32/libncurses.so
+usr/lib32/libncursesw.so
+usr/lib32/libpanel.so
+usr/lib32/libpanel.so.5
+usr/lib32/libpanel.so.5.9
+usr/lib32/libpanelw.so
+usr/lib32/libpanelw.so.5
+usr/lib32/libpanelw.so.5.9
+usr/lib32/pkgconfig/form.pc
+usr/lib32/pkgconfig/formw.pc
+usr/lib32/pkgconfig/ncurses++.pc
+usr/lib32/pkgconfig/ncurses++w.pc
+usr/lib32/pkgconfig/menuw.pc
+usr/lib32/pkgconfig/menu.pc
+usr/lib32/pkgconfig/ncurses.pc
+usr/lib32/pkgconfig/ncursesw.pc
+usr/lib32/pkgconfig/panel.pc
+usr/lib32/pkgconfig/panelw.pc
+usr/lib32/terminfo
+lib32/libgpm.so.1
+lib32/libgpm.so.1.20.0
+usr/lib32/libgpm.so
+usr/lib32/libgmp.so
+usr/lib32/libgmp.so.10
+usr/lib32/libgmp.so.10.1.3
+usr/lib32/libgmpxx.so
+usr/lib32/libgmpxx.so.4
+usr/lib32/libgmpxx.so.4.3.3
+lib32/libpcre.so.1
+lib32/libpcre.so.1.2.1
+usr/lib32/libpcre.so
+usr/lib32/libpcrecpp.so
+usr/lib32/libpcrecpp.so.0
+usr/lib32/libpcrecpp.so.0.0.0
+usr/lib32/libpcreposix.so
+usr/lib32/libpcreposix.so.0
+usr/lib32/libpcreposix.so.0.0.2
+usr/lib32/pkgconfig/libpcre.pc
+usr/lib32/pkgconfig/libpcrecpp.pc
+usr/lib32/pkgconfig/libpcreposix.pc
+usr/lib32/dbus-1.0/include/dbus/dbus-arch-deps.h
+usr/lib32/libdbus-1.so
+usr/lib32/libdbus-1.so.3
+usr/lib32/libdbus-1.so.3.7.6
+usr/lib32/pkgconfig/dbus-1.pc
+lib32/libwrap.so.0
+lib32/libwrap.so.0.7.6
+usr/lib32/libwrap.so
+usr/lib32/libgdbm.so
+usr/lib32/libgdbm_compat.so
+usr/lib32/libjson-c.so
+usr/lib32/libjson-c.so.2
+usr/lib32/libjson-c.so.2.0.1
+usr/lib32/pkgconfig/json-c.pc
+usr/lib32/libxml2.so
+usr/lib32/libxml2.so.2
+usr/lib32/libxml2.so.2.9.1
+usr/lib32/pkgconfig/libxml-2.0.pc
+usr/lib32/libdbus-glib-1.so
+usr/lib32/libdbus-glib-1.so.2
+usr/lib32/libdbus-glib-1.so.2.2.2
+usr/lib32/pkgconfig/dbus-glib-1.pc
+lib32/libreadline.so.6
+lib32/libreadline.so.6.2
+usr/lib32/libreadline.so
+lib32/libhistory.so.6
+lib32/libhistory.so.6.2
+usr/lib32/libhistory.so
+usr/lib32/libmng.so
+usr/lib32/libasprintf.so
+usr/lib32/libasprintf.so.0
+usr/lib32/libasprintf.so.0.0.0
+usr/lib32/libgpg-error.so
+usr/lib32/libgpg-error.so.0
+usr/lib32/libgpg-error.so.0.10.0
+usr/lib32/libsqlite3.so
+usr/lib32/libsqlite3.so.0
+usr/lib32/libsqlite3.so.0.8.6
+usr/lib32/pkgconfig/sqlite3.pc
+usr/lib32/libnettle.so
+usr/lib32/libnettle.so.4
+usr/lib32/libnettle.so.4.7
+usr/lib32/pkgconfig/nettle.pc
+usr/lib32/libhogweed.so
+usr/lib32/libhogweed.so.2
+usr/lib32/libhogweed.so.2.5
+usr/lib32/pkgconfig/hogweed.pc
+usr/lib32/libtasn1.so
+# Uncomment when gnutls is converted to multilib; bug #493166
+# usr/lib32/libtasn1.so.3
+# usr/lib32/libtasn1.so.3.2.0
+usr/lib32/pkgconfig/libtasn1.pc
+usr/lib32/libgcrypt.so
+usr/lib32/libgcrypt.so.11
+usr/lib32/libgcrypt.so.11.8.2
+usr/lib32/liblzo2.so
+usr/lib32/liblzo2.so.2
+usr/lib32/liblzo2.so.2.0.0
+usr/lib32/libxslt.so
+usr/lib32/libxslt.so.1
+usr/lib32/libxslt.so.1.1.28
+usr/lib32/libexslt.so
+usr/lib32/libexslt.so.0
+usr/lib32/libexslt.so.0.8.17
+usr/lib32/pkgconfig/libxslt.pc
+usr/lib32/pkgconfig/libexslt.pc
+usr/lib32/libmagic.so
+usr/lib32/libmagic.so.1
+usr/lib32/libmagic.so.1.0.0
+lib32/liblzma.so.5
+lib32/liblzma.so.5.0.5
+usr/lib32/liblzma.so
+usr/lib32/pkgconfig/liblzma.pc
+usr/lib32/libgif.so
+usr/lib32/libgif.so.4
+usr/lib32/libgif.so.4.1.6
+usr/lib32/libslang.so
+usr/lib32/libslang.so.2
+usr/lib32/libslang.so.2.2.4
+usr/lib32/pkgconfig/slang.pc
+usr/lib32/slang/v2/modules/csv-module.so
+usr/lib32/slang/v2/modules/fcntl-module.so
+usr/lib32/slang/v2/modules/fork-module.so
+usr/lib32/slang/v2/modules/iconv-module.so
+usr/lib32/slang/v2/modules/pcre-module.so
+usr/lib32/slang/v2/modules/png-module.so
+usr/lib32/slang/v2/modules/rand-module.so
+usr/lib32/slang/v2/modules/select-module.so
+usr/lib32/slang/v2/modules/slsmg-module.so
+usr/lib32/slang/v2/modules/socket-module.so
+usr/lib32/slang/v2/modules/sysconf-module.so
+usr/lib32/slang/v2/modules/termios-module.so
+usr/lib32/slang/v2/modules/varray-module.so
+usr/lib32/slang/v2/modules/zlib-module.so
+lib32/libacl.so.1
+lib32/libacl.so.1.1.0
+lib32/libblkid.so.1
+lib32/libblkid.so.1.1.0
+lib32/libmount.so.1
+lib32/libmount.so.1.1.0
+lib32/libuuid.so.1
+lib32/libuuid.so.1.3.0
+usr/lib32/libacl.so
+usr/lib32/libblkid.so
+usr/lib32/libltdl.so
+usr/lib32/libltdl.so.7
+usr/lib32/libltdl.so.7.3.0
+usr/lib32/libmount.so
+usr/lib32/libuuid.so
+usr/lib32/pkgconfig/blkid.pc
+usr/lib32/pkgconfig/mount.pc
+usr/lib32/pkgconfig/uuid.pc
+usr/lib32/libcrypto.so
+usr/lib32/libcrypto.so.1.0.0
+usr/lib32/libssl.so
+usr/lib32/libssl.so.1.0.0
+usr/lib32/pkgconfig/libcrypto.pc
+usr/lib32/pkgconfig/libssl.pc
+usr/lib32/pkgconfig/openssl.pc
+usr/lib32/libgnutls-extra.so
+usr/lib32/libgnutls-extra.so.26
+usr/lib32/libgnutls-extra.so.26.22.6
+usr/lib32/libgnutls-openssl.so
+usr/lib32/libgnutls-openssl.so.27
+usr/lib32/libgnutls-openssl.so.27.0.0
+usr/lib32/libgnutls.so
+usr/lib32/libgnutls.so.26
+usr/lib32/libgnutls.so.26.22.6
+usr/lib32/libgnutlsxx.so
+usr/lib32/libgnutlsxx.so.27
+usr/lib32/libgnutlsxx.so.27.0.0
+usr/lib32/pkgconfig/gnutls-extra.pc
+usr/lib32/pkgconfig/gnutls.pc
+usr/lib32/libcups.so
+usr/lib32/libcups.so.2
+usr/lib32/libcupscgi.so
+usr/lib32/libcupscgi.so.1
+usr/lib32/libcupsimage.so
+usr/lib32/libcupsimage.so.2
+usr/lib32/libcupsmime.so
+usr/lib32/libcupsmime.so.1
+usr/lib32/libcupsppdc.so
+usr/lib32/libcupsppdc.so.1
+usr/lib32/libtalloc.so
+usr/lib32/libtalloc.so.2
+usr/lib32/libtalloc.so.2.1.0
+usr/lib32/pkgconfig/talloc.pc
+lib32/libkeyutils.so.1
+lib32/libkeyutils.so.1.4
+usr/lib32/libkeyutils.so
+usr/lib32/krb5/plugins/kdb/db2.so
+usr/lib32/krb5/plugins/preauth/pkinit.so
+usr/lib32/libgssapi_krb5.so
+usr/lib32/libgssapi_krb5.so.2
+usr/lib32/libgssapi_krb5.so.2.2
+usr/lib32/libgssrpc.so
+usr/lib32/libgssrpc.so.4
+usr/lib32/libgssrpc.so.4.1
+usr/lib32/libk5crypto.so
+usr/lib32/libk5crypto.so.3
+usr/lib32/libk5crypto.so.3.1
+usr/lib32/libkadm5clnt.so
+usr/lib32/libkadm5clnt_mit.so
+usr/lib32/libkadm5clnt_mit.so.8
+usr/lib32/libkadm5clnt_mit.so.8.0
+usr/lib32/libkadm5srv.so
+usr/lib32/libkadm5srv_mit.so
+usr/lib32/libkadm5srv_mit.so.8
+usr/lib32/libkadm5srv_mit.so.8.0
+usr/lib32/libkdb5.so
+usr/lib32/libkdb5.so.7
+usr/lib32/libkdb5.so.7.0
+usr/lib32/libkrb5.so
+usr/lib32/libkrb5.so.3
+usr/lib32/libkrb5.so.3.3
+usr/lib32/libkrb5support.so
+usr/lib32/libkrb5support.so.0
+usr/lib32/libkrb5support.so.0.1
+usr/lib32/libdb-4.8.so
+usr/lib32/libdb.so
+usr/lib32/libdb_cxx-4.8.so
+usr/lib32/libdb_cxx.so
+usr/lib32/libdb_stl-4.8.so
+usr/lib32/libdb_stl.so
+usr/lib32/liblber-2.4.so.2
+usr/lib32/liblber-2.4.so.2.9.1
+usr/lib32/liblber.so
+usr/lib32/libldap-2.4.so.2
+usr/lib32/libldap-2.4.so.2.9.1
+usr/lib32/libldap.so
+usr/lib32/libldap_r-2.4.so.2
+usr/lib32/libldap_r-2.4.so.2.9.1
+usr/lib32/libldap_r.so
+usr/lib32/libcrypto.so.0.9.8
+usr/lib32/libssl.so.0.9.8
+usr/lib32/libidn.so
+usr/lib32/libidn.so.11
+usr/lib32/libidn.so.11.6.11
+usr/lib32/pkgconfig/libidn.pc
+usr/lib32/libnl-3.so
+usr/lib32/libnl-3.so.200
+usr/lib32/libnl-3.so.200.18.0
+usr/lib32/libnl-genl-3.so
+usr/lib32/libnl-genl-3.so.200
+usr/lib32/libnl-genl-3.so.200.18.0
+usr/lib32/libnl-idiag-3.so
+usr/lib32/libnl-idiag-3.so.200
+usr/lib32/libnl-idiag-3.so.200.18.0
+usr/lib32/libnl-nf-3.so
+usr/lib32/libnl-nf-3.so.200
+usr/lib32/libnl-nf-3.so.200.18.0
+usr/lib32/libnl-route-3.so
+usr/lib32/libnl-route-3.so.200
+usr/lib32/libnl-route-3.so.200.18.0
+usr/lib32/pkgconfig/libnl-3.0.pc
+usr/lib32/pkgconfig/libnl-genl-3.0.pc
+usr/lib32/pkgconfig/libnl-nf-3.0.pc
+usr/lib32/pkgconfig/libnl-route-3.0.pc
+usr/lib32/libart_lgpl_2.so
+usr/lib32/libart_lgpl_2.so.2
+usr/lib32/libart_lgpl_2.so.2.3.21
+usr/lib32/pkgconfig/libart-2.0.pc
+lib32/libcrack.so.2
+lib32/libcrack.so.2.9.0
+usr/lib32/libcrack.so
+lib32/libtirpc.so.1
+lib32/libtirpc.so.1.0.10
+usr/lib32/libtirpc.so
+usr/lib32/pkgconfig/libtirpc.pc
+lib32/libpam_misc.so
+lib32/libpam_misc.so.0.82.0
+lib32/libpam.so.0
+lib32/libpamc.so
+lib32/libpamc.so.0
+lib32/libpamc.so.0.82.1
+lib32/libpam.so.0.83.1
+lib32/libpam.so
+lib32/libpam_misc.so.0
+lib32/security/pam_access.so
+lib32/security/pam_cracklib.so
+lib32/security/pam_debug.so
+lib32/security/pam_deny.so
+lib32/security/pam_echo.so
+lib32/security/pam_env.so
+lib32/security/pam_exec.so
+lib32/security/pam_faildelay.so
+lib32/security/pam_filter.so
+lib32/security/pam_filter/upperLOWER
+lib32/security/pam_ftp.so
+lib32/security/pam_group.so
+lib32/security/pam_issue.so
+lib32/security/pam_keyinit.so
+lib32/security/pam_lastlog.so
+lib32/security/pam_limits.so
+lib32/security/pam_listfile.so
+lib32/security/pam_localuser.so
+lib32/security/pam_loginuid.so
+lib32/security/pam_mail.so
+lib32/security/pam_mkhomedir.so
+lib32/security/pam_motd.so
+lib32/security/pam_namespace.so
+lib32/security/pam_nologin.so
+lib32/security/pam_permit.so
+lib32/security/pam_pwhistory.so
+lib32/security/pam_rhosts.so
+lib32/security/pam_rootok.so
+lib32/security/pam_securetty.so
+lib32/security/pam_shells.so
+lib32/security/pam_stress.so
+lib32/security/pam_succeed_if.so
+lib32/security/pam_tally.so
+lib32/security/pam_tally2.so
+lib32/security/pam_time.so
+lib32/security/pam_timestamp.so
+lib32/security/pam_umask.so
+lib32/security/pam_unix.so
+lib32/security/pam_userdb.so
+lib32/security/pam_warn.so
+lib32/security/pam_wheel.so
+lib32/security/pam_xauth.so
+usr/lib32/libpam.so
+usr/lib32/libpam_misc.so
+usr/lib32/libpamc.so
+lib32/libnss_ldap.so.2
+lib32/libnss_ldap-2.17.so
+usr/lib32/libnss_ldap.so.2
+lib32/security/pam_ldap.so
+usr/lib32/libnss_mdns.so.2
+usr/lib32/libnss_mdns4.so.2
+usr/lib32/libnss_mdns4_minimal.so.2
+usr/lib32/libnss_mdns6.so.2
+usr/lib32/libnss_mdns6_minimal.so.2
+usr/lib32/libnss_mdns_minimal.so.2
+usr/lib32/libsoup-2.4.so
+usr/lib32/libsoup-2.4.so.1
+usr/lib32/libsoup-2.4.so.1.7.0
+usr/lib32/pkgconfig/libsoup-2.4.pc
+usr/lib32/libneon.so
+usr/lib32/libneon.so.27
+usr/lib32/libneon.so.27.3.0
+usr/lib32/pkgconfig/neon.pc
+usr/lib32/libfreebl3.so
+usr/lib32/libnss3.so
+usr/lib32/libnssckbi.so
+usr/lib32/libnssdbm3.so
+usr/lib32/libnsspem.so
+usr/lib32/libnsssysinit.so
+usr/lib32/libnssutil3.so
+usr/lib32/libsmime3.so
+usr/lib32/libsoftokn3.so
+usr/lib32/libssl3.so
+usr/lib32/pkgconfig/nss.pc
+usr/lib32/libnspr4.so
+usr/lib32/libplc4.so
+usr/lib32/libplds4.so
+usr/lib32/pkgconfig/nspr.pc
+usr/lib32/libcurl.so
+usr/lib32/libcurl.so.4
+usr/lib32/libcurl.so.4.3.0
+usr/lib32/pkgconfig/libcurl.pc
+usr/lib32/libpci.so
+usr/lib32/libpci.so.3
+usr/lib32/libpci.so.3.2.0
+usr/lib32/pkgconfig/libpci.pc
--- a/app-text/dos2unix/Manifest
+++ b/app-text/dos2unix/Manifest
@ -1,5 +1,4 @@
-DIST dos2unix-6.0.3.tar.gz 77227 SHA256 f5268c5b28a1983537210c72b3fd43f4aad17a8dacb6727b615b56dca2ef9a04 SHA512 00cce5d7fe7c1fcb81b973a1119aa956a0dd648b775a0cc1692270acec7e9b4caefb1c179e5bdf2834cad60622ffdf2a93ff4db5634f39f0545d63e394a03af2 WHIRLPOOL 925082691597946dce07f2b3bfbcae7bd0d944a4868d3d489cf7025fd5a055965fc76c269a62b025eaedb61741a5cc3c70612de547e47030034ea94d79bf9940
 DIST dos2unix-6.0.5.tar.gz 326460 SHA256 fd3320aeaf6a163e70c462137959cf3e5af2bb22b0674f931f8744b0215d858f SHA512 8e882fb100357dd38ebe253f059517ca03dfe5579c14a704b6aeed862346edab37af84de4bc5cddd3f87fbb50c8e9930e338b5a9cd345b77708d23bc70154af3 WHIRLPOOL 321648b099e876488ee8aaffef807e8cded6a7168fe80180ba0198bb7249f45b23352138df85e0ca08ced3d55bdcc90470b7aa190f704f21a043224215550d52
 DIST dos2unix-6.0.6.tar.gz 339149 SHA256 8abbd4e9a630ef649f5ff359df10786c50b302c1b6515cf99bd787adea23d276 SHA512 6affdcdc34b1f0c8b1bab46ed63af73a62abf80d64b44e951e354d05b420dbdf32a918a1bca5b427120927e1ec3fe5553cf9b7bf000de30d955ff760b6b66e45 WHIRLPOOL dbdf70a0c7dc4b5714184f333c49e438dda22f20cfc8a65ad9dcc662ccc8c01c928097a10e7932d98f398deb408d6168286b86dc550f77c6540806e3e0302d65
-DIST dos2unix-7.0.tar.gz 364616 SHA256 551afe005a86e58664b4f41327408e73afafe92400488dd0aab1dad6deb4e72b SHA512 a6aae752433d079393c244b24889f7ffed9e25e2cc6bb8aefe1bca281578826764d871373327708ca4ecbb0fc0242a7e57c6162df49d7ce619dcb6b573035271 WHIRLPOOL d50a6da9e5bab7aaad07bfde5ba1b3c3d39e4c73609b66d0fc361607635fab9fabf6412fc00c995adb1f36d5bbd01cfce4514fcba842fcd0dd0e6a37d6e7853b
 DIST dos2unix-7.1.tar.gz 382427 SHA256 46f93e792f7dfde06e9d8f347099eb4c4db2167b728fafcafb5ca6b5503740c5 SHA512 fe4feaff6c2cc851d596c9a440d0863c89353b434e85a7ffaa2538da56f44488476c2674f372ba256d215421af2290c98ab78da019b4f6a0150d1d15d041a54e WHIRLPOOL a5faaa5cc9fbb6e1b010af98e12ea51f08f57eb907082a783f561c8c4cf426117c953394c11e282f8eec7c51fd149e4f441e8abeb9f990d2d0029a17e5d334a7
+DIST dos2unix-7.2.tar.gz 408754 SHA256 8a63576767b26af46401dfdeaf09c1e4de03735fe80c362244514e1eaf13d9b5 SHA512 2cc3a8612a39b580572f76778bf892e4df8c13f74720fdc0fd89689208a2c50a67c06d3e14f31e6de4efe447da840419aa282487c0aafb23fbc04bfabf1d2f3d WHIRLPOOL 1acd6410110002924980632de591f3d75a3067fe928edb02806d8b1b3aed924c1e3c4980e42260710ab7aa7e077977474032d90f64ad2c3f5066425019bd0ede
--- a/app-text/dos2unix/dos2unix-6.0.3.ebuild
+++ b/app-text/dos2unix/dos2unix-6.0.3.ebuild
@ -1,60 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/dos2unix/dos2unix-6.0.3.ebuild,v 1.13 2013/03/15 15:13:01 jer Exp $
-
-EAPI=4
-
-inherit toolchain-funcs
-
-DESCRIPTION="Convert DOS or MAC text files to UNIX format or vice versa"
-HOMEPAGE="http://www.xs4all.nl/~waterlan/dos2unix.html http://sourceforge.net/projects/dos2unix/"
-SRC_URI="
-	http://www.xs4all.nl/~waterlan/${PN}/${P}.tar.gz
-	mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
-IUSE="debug nls"
-
-RDEPEND="
-	!app-text/hd2u
-	!app-text/unix2dos
-	virtual/libintl"
-DEPEND="
-	${RDEPEND}
-	nls? ( sys-devel/gettext )
-	dev-lang/perl"
-
-src_prepare() {
-	sed \
-		-e '/^LDFLAGS/s|=|+=|' \
-		-e '/^CC/s|=|?=|' \
-		-e '/CFLAGS_OS \+=/d' \
-		-e '/LDFLAGS_EXTRA \+=/d' \
-		-e "/^CFLAGS/s|-O2|${CFLAGS}|" \
-		-i Makefile || die
-
-	if use debug ; then
-		sed -e "/^DEBUG/s:0:1:" \
-			-e "/EXTRA_CFLAGS +=/s:-g::" \
-			-i Makefile || die
-	fi
-
-	tc-export CC
-}
-
-lintl() {
-	# same logic as from virtual/libintl
-	use !elibc_glibc && use !elibc_uclibc && echo "-lintl"
-}
-
-src_compile() {
-	emake prefix="${EPREFIX}/usr" \
-		$(use nls && echo "LDFLAGS_EXTRA=$(lintl)" || echo "ENABLE_NLS=")
-}
-
-src_install() {
-	emake DESTDIR="${D}" prefix="${EPREFIX}/usr" \
-		$(use nls || echo "ENABLE_NLS=") install
-}
--- a/app-text/dos2unix/dos2unix-7.2.ebuild
+++ b/app-text/dos2unix/dos2unix-7.2.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/dos2unix/dos2unix-7.0.ebuild,v 1.1 2014/09/11 05:20:14 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/dos2unix/dos2unix-7.2.ebuild,v 1.1 2015/02/16 21:05:23 polynomial-c Exp $

 EAPI=5

@ -28,6 +28,8 @@ DEPEND="
 	dev-lang/perl"

 src_prepare() {
+	epatch "${FILESDIR}"/${P}-gb18030-test.patch
+
 	sed \
 		-e '/^LDFLAGS/s|=|+=|' \
 		-e '/CFLAGS_OS \+=/d' \
--- a/app-text/dos2unix/files/dos2unix-5.2-makefile.patch
+++ b/app-text/dos2unix/files/dos2unix-5.2-makefile.patch
@ -1,21 +0,0 @@
--- dos2unix-5.2/Makefile
-+++ dos2unix-5.2/Makefile
-@@ -77,7 +77,7 @@
- 	MOFILES			= $(DOS2UNIX_MOFILES) $(UNIX2DOS_MOFILES)
- endif
- 
-DOCFILES	= $(PACKAGE).txt $(PACKAGE).ps $(PACKAGE).pdf $(PACKAGE).htm
-+DOCFILES	= $(PACKAGE).txt $(PACKAGE).ps $(PACKAGE).htm
- INSTALL_OBJS_DOC = README.txt NEWS.txt ChangeLog.txt COPYING.txt TODO.txt BUGS.txt $(DOCFILES)
- 
- #PODFILES	= man/man1/dos2unix.pod $(wildcard man/*/man1/dos2unix.pod)
-@@ -246,9 +246,6 @@
- %.ps : man/man1/%.1
- 	groff -man $< -T ps > $@
- 
-%.pdf: %.ps
-	ps2pdf $< $@
-
- %.htm : man/man1/%.pod
- 	pod2html --title="$(PACKAGE) $(DOS2UNIX_VERSION) - DOS/MAC to UNIX and vice versa text file format converter" $< > $@
- 
--- a/app-text/dos2unix/files/dos2unix-5.3.1-fix_debug_build.patch
+++ b/app-text/dos2unix/files/dos2unix-5.3.1-fix_debug_build.patch
@ -1,46 +0,0 @@
--- dos2unix-5.3.1/dos2unix.c
-+++ dos2unix-5.3.1/dos2unix.c
-@@ -60,8 +60,6 @@
-  */
- 
- 
-#define VER_AUTHOR   "Erwin Waterlander"
-
- /* #define DEBUG 1 */
- 
- #include "common.h"
--- dos2unix-5.3.1/Makefile
-+++ dos2unix-5.3.1/Makefile
-@@ -194,9 +194,14 @@
- 
- EXTRA_CFLAGS	= -DVER_REVISION=\"$(DOS2UNIX_VERSION)\" \
- 		  -DVER_DATE=\"$(DOS2UNIX_DATE)\" \
-+		  -DVER_AUTHOR=\"$(DOS2UNIX_AUTHOR)\" \
- 		  -DDEBUG=$(DEBUG) \
- 		  $(CFLAGS_OS)
- 
-+ifeq ($(DEBUG), 1)
-+	EXTRA_CFLAGS += -g
-+endif
-+
- ifdef STATIC
- 	EXTRA_CFLAGS += -static
- endif
--- dos2unix-5.3.1/unix2dos.c
-+++ dos2unix-5.3.1/unix2dos.c
-@@ -50,8 +50,6 @@
-  */
- 
- 
-#define VER_AUTHOR   "Erwin Waterlander"
-
- /* #define DEBUG 1 */
- 
- #include "common.h"
--- dos2unix-5.3.1/version.mk
-+++ dos2unix-5.3.1/version.mk
-@@ -1,3 +1,4 @@
- DOS2UNIX_VERSION = 5.3.1
- DOS2UNIX_VERSION_SHORT = 531
- DOS2UNIX_DATE = 2011-08-09
-+DOS2UNIX_AUTHOR = 'Erwin Waterlander'
--- a/app-text/dos2unix/files/dos2unix-6.0.4-pod-encoding.patch
+++ b/app-text/dos2unix/files/dos2unix-6.0.4-pod-encoding.patch
@ -1,28 +0,0 @@
-diff -c -r dos2unix-6.0.4.orig/man/es/man1/dos2unix.pod dos2unix-6.0.4/man/es/man1/dos2unix.pod
-*** dos2unix-6.0.4.orig/man/es/man1/dos2unix.pod	2013-07-27 20:08:12.000000000 +0200
--- dos2unix-6.0.4/man/es/man1/dos2unix.pod	2014-01-02 14:19:52.944130621 +0100
-***************
-*** 50,55 ****
--- 50,57 ----
-  
-  =pod
-  
-+ =encoding latin1
-+ 
-  =head1 NOMBRE
-  
-  dos2unix - Convertidor de archivos de texto de formato DOS/Mac a Unix y viceversa
-diff -c -r dos2unix-6.0.4.orig/man/nl/man1/dos2unix.pod dos2unix-6.0.4/man/nl/man1/dos2unix.pod
-*** dos2unix-6.0.4.orig/man/nl/man1/dos2unix.pod	2013-07-27 20:08:12.000000000 +0200
--- dos2unix-6.0.4/man/nl/man1/dos2unix.pod	2014-01-02 14:19:36.510059975 +0100
-***************
-*** 46,51 ****
--- 46,53 ----
-  */
-  =pod
-  
-+ =encoding latin1
-+ 
-  =head1 NAAM
-  
-  dos2unix - DOS/Mac naar Unix en vice versa tekstbestand formaat omzetter
--- a/app-text/dos2unix/files/dos2unix-7.2-gb18030-test.patch
+++ b/app-text/dos2unix/files/dos2unix-7.2-gb18030-test.patch
@ -0,0 +1,18 @@
+diff -r -N -u dos2unix-7.2.orig/test/Makefile dos2unix-7.2/test/Makefile
+--- dos2unix-7.2.orig/test/Makefile	2014-12-26 23:53:46.000000000 +0100
+++ dos2unix-7.2/test/Makefile	2015-02-16 13:05:52.829468088 +0100
+@@ -2,12 +2,10 @@
+ 
+ d2u_os=$(shell uname -s)
+ 
+-# GB18030 test is not working on Cygwin and MSYS. They do not support zh_CN.GB18030 locale.
+-ifeq ($(findstring CYGWIN,$(d2u_os)),)
+-ifeq ($(findstring MSYS,$(d2u_os)),)
+# Checking WIN32 version in MSYS shell.
+ifeq ($(findstring MINGW,$(d2u_os)),MINGW)
+ TESTS += gb18030.t
+ endif
+-endif
+ 
+ # Windows version does not support symlinks like the Unix version.
+ ifneq ($(findstring MINGW,$(d2u_os)),MINGW)
--- a/app-text/pandoc/pandoc-1.12.1.ebuild
+++ b/app-text/pandoc/pandoc-1.12.1.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/pandoc/pandoc-1.12.1.ebuild,v 1.1 2013/11/14 10:03:19 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/pandoc/pandoc-1.12.1.ebuild,v 1.2 2015/02/16 14:41:41 pacho Exp $

 EAPI=5

@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"

 LICENSE="GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="embed_data_files +http-conduit"

 RDEPEND=">=dev-haskell/aeson-0.6:=[profile?] <dev-haskell/aeson-0.7:=[profile?]
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@ -1,7 +1,4 @@
 DIST mariadb-10.0.15.tar.gz 55531927 SHA256 9154cb68504d469b1bac636b85e30b2b2da2586092476d6ad2f9d6bc462909d8 SHA512 7e7f08d52054ce6ec9f8f3e13369a7faf762f8ddd41129be935a340f51cdb3639687ad877838a8157558106cafd11102d863368610bba4f58b6d2aca415cbb92 WHIRLPOOL 9d4eb91ac9f45e34286d64a4dfcae9a1ba293eb0283c848abe1f25c93692cfb773e9cd18b52ce6bf7c02c08f93a41d047e1bf6366015a55036de68ae4d1e7499
 DIST mariadb-10.0.16.tar.gz 55656968 SHA256 44134a5f3e174e3e8443c1d07916af57f3ffadd4c8846338d41850fedfefcde4 SHA512 8da873ff604d8cb247057a626b26e4086690bb97ef1243bf3dde81b1de4f39c80aded5e045920f8176554dc162c5adb7501fe9403c3ed44992be13fe4c63a2b3 WHIRLPOOL 916af6fbd50dba19d9fe74fdf206d6417d676852e59332a0c0e2da44d7cf7be58770adaa9e707e4177729a10d6145c57235df4af0bb8fc4dc72fb442f853e2cf
-DIST mariadb-5.5.40.tar.gz 44745240 SHA256 cbde17f4a31483143490def6fcce33310ebae49eafe92dc4ada0e7227202415a SHA512 178b77d95bcd72bd8ec7840e77a6c7156379d676ff65eeb9a9f58897c4476f2dcd8f390ddaf12471d836f0224d7dec3aebeaa6fd1589ffae071f1eba4ed60eac WHIRLPOOL 1c6462b73c9ed8a5c7a16d327e066c92280a61ccfe28e5b28ea274fa711df4ae5cc06d7dbab3fa1b225c255ddaa4bbb4dfe71906a6e5ac72de5d550581935213
 DIST mariadb-5.5.41.tar.gz 45526003 SHA256 a16dc62e4bcabecd5c483f2f8b657483a8c51934e7be5ad4ab21b8baea1f5332 SHA512 727ce6994966a42602ea8f735f34b1b3c342d08b9dae2667e465805bff36e68bf69b582ec0b844b25fb7024f9b25a39280160c2935f639491a1c3654d3166953 WHIRLPOOL 229b17e8acf34f7820548d5fcf43cf0af5f52977a7254a799eb2b28b0a239c0b2f2d3177751f9fdde112c6d336f4580aa93a0be663b15967ccf94a3ee7f4151c
-DIST mysql-extras-20141017-1419Z.tar.bz2 1494065 SHA256 b872d1d8b55d56dfd581b7ae416ed7d1f36c8f3cf28e817a3ff21b87d6627918 SHA512 b489f6c3bfc3a48156c8d1278e90e3077604a15a37335a84ebdd6f156a5c088fe0a2725a14431bd5dc07f8007fd80f0ec732c37b3d584373a2a12ba3ea9f999e WHIRLPOOL 35408618fe0d3f812564b0e78f813faa024fd7ff57bef50ef5511cced47047e15d038ea14aaf46cba6252932561f0200b49dd1dbe552b5d30eb1ab648a51a493
-DIST mysql-extras-20141125-1930Z.tar.bz2 1494197 SHA256 a150a5680bb505a4187c16bc5a5f3ac09c3a83f71bd66b6cbd6111b8f0d25f8f SHA512 9e3e0cc99a54f936282ab5f5857e4a6308509f8686595f4a248542f43ca661732e26fd4703365c09a276d079c374e7f63bcd0ee6332d2c1b86e80298ac82b296 WHIRLPOOL 90eff797b33c859a0d2ad5fef8c9756ae86130fe21a6414ab95de45a135068d1d327e5e302431e3b78b26629ce66312955da25a9b8250e8b2596ef2ff5d270ad
 DIST mysql-extras-20141215-0144Z.tar.bz2 1494767 SHA256 4757043858110654d52b0e6dccab064987ab5db8ae4ae99863cf86df0b90f947 SHA512 7a9b733d09f44b1faff19a496a3e820e444b339838665e6f37c4fddc8f2ad67e805082d598c4edc06fda9364f9906e4cf95520552f72d6b6df34413f38e7a2ed WHIRLPOOL 99ea6890a5faf097b941707538b68f62390e1a49ee662a87c27435a317a9a3f37f00802e72f86b52993b3d1674b57645db0f7e73379ab88fbc1d0ef791cf4326
--- a/dev-db/mariadb/mariadb-10.0.15-r1.ebuild
+++ b/dev-db/mariadb/mariadb-10.0.15-r1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-10.0.15-r1.ebuild,v 1.8 2015/01/25 10:19:12 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-10.0.15-r1.ebuild,v 1.10 2015/02/16 10:27:45 ago Exp $

 EAPI="5"
 MY_EXTRAS_VER="20141215-0144Z"
@ -10,7 +10,7 @@ inherit toolchain-funcs mysql-multilib
 IUSE="$IUSE"

 # REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"

 # When MY_EXTRAS is bumped, the index should be revised to exclude these.
 EPATCH_EXCLUDE=''
--- a/dev-db/mariadb/mariadb-10.0.15.ebuild
+++ b/dev-db/mariadb/mariadb-10.0.15.ebuild
@ -1,115 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-10.0.15.ebuild,v 1.1 2014/11/26 01:18:31 grknight Exp $
-
-EAPI="5"
-MY_EXTRAS_VER="20141125-1930Z"
-
-inherit toolchain-funcs mysql-multilib
-# only to make repoman happy. it is really set in the eclass
-IUSE="$IUSE"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-
-# When MY_EXTRAS is bumped, the index should be revised to exclude these.
-EPATCH_EXCLUDE=''
-
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
-RDEPEND="${RDEPEND}"
-
-# Official test instructions:
-# USE='-cluster embedded extraengine perl ssl static-libs community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mariadb-X.X.XX.ebuild \
-# digest clean package
-multilib_src_test() {
-
-	if ! multilib_is_native_abi ; then
-		einfo "Server tests not available on non-native abi".
-		return 0;
-	fi
-
-	local TESTDIR="${BUILD_DIR}/mysql-test"
-	local retstatus_unit
-	local retstatus_tests
-
-	# Bug #213475 - MySQL _will_ object strenously if your machine is named
-	# localhost. Also causes weird failures.
-	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
-
-	if ! use "minimal" ; then
-
-		if [[ $UID -eq 0 ]]; then
-			die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
-		fi
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-		addpredict /this-dir-does-not-exist/t9.MYI
-
-		# Run CTest (test-units)
-		cmake-utils_src_test
-		retstatus_unit=$?
-		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
-
-		# Ensure that parallel runs don't die
-		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-		# Enable parallel testing, auto will try to detect number of cores
-		# You may set this by hand.
-		# The default maximum is 8 unless MTR_MAX_PARALLEL is increased
-		export MTR_PARALLEL="${MTR_PARALLEL:-auto}"
-
-		# create directories because mysqladmin might right out of order
-		mkdir -p "${T}"/var-tests{,/log}
-
-		# These are failing in MariaDB 10.0 for now and are believed to be
-		# false positives:
-		#
-		# main.information_schema, binlog.binlog_statement_insert_delayed,
-		# main.mysqld--help, funcs_1.is_triggers, funcs_1.is_tables_mysql,
-		# funcs_1.is_columns_mysql
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test, main.mysql_client_test_nonblock
-		# main.mysql_client_test_comp:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-
-		for t in main.mysql_client_test main.mysql_client_test_nonblock \
-			main.mysql_client_test_comp \
-			binlog.binlog_statement_insert_delayed main.information_schema \
-			main.mysqld--help \
-			funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do
-				mysql-multilib_disable_test  "$t" "False positives in Gentoo"
-		done
-
-		# Run mysql tests
-		pushd "${TESTDIR}"
-
-		# run mysql-test tests
-		perl mysql-test-run.pl --force --vardir="${T}/var-tests"
-
-		retstatus_tests=$?
-		[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		popd
-
-		# Cleanup is important for these testcases.
-		pkill -9 -f "${S}/ndb" 2>/dev/null
-		pkill -9 -f "${S}/sql" 2>/dev/null
-
-		failures=""
-		[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
-		[[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		[[ -z "$failures" ]] || die "Test failures: $failures"
-		einfo "Tests successfully completed"
-
-	else
-
-		einfo "Skipping server tests due to minimal build."
-	fi
-}
--- a/dev-db/mariadb/mariadb-10.0.16.ebuild
+++ b/dev-db/mariadb/mariadb-10.0.16.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-10.0.16.ebuild,v 1.5 2015/02/11 16:32:49 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-10.0.16.ebuild,v 1.8 2015/02/16 10:27:50 ago Exp $

 EAPI="5"
 MY_EXTRAS_VER="20141215-0144Z"
@ -10,7 +10,7 @@ inherit toolchain-funcs mysql-multilib
 IUSE="$IUSE"

 # REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"

 # When MY_EXTRAS is bumped, the index should be revised to exclude these.
 EPATCH_EXCLUDE=''
--- a/dev-db/mariadb/mariadb-5.5.40-r1.ebuild
+++ b/dev-db/mariadb/mariadb-5.5.40-r1.ebuild
@ -1,118 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-5.5.40-r1.ebuild,v 1.4 2014/10/22 19:20:12 maekke Exp $
-
-EAPI="5"
-MY_EXTRAS_VER="20141017-1419Z"
-
-# Build system
-BUILD="cmake"
-
-inherit toolchain-funcs mysql-v2
-# only to make repoman happy. it is really set in the eclass
-IUSE="$IUSE"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-
-# When MY_EXTRAS is bumped, the index should be revised to exclude these.
-EPATCH_EXCLUDE=''
-
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
-RDEPEND="${RDEPEND}"
-
-# Please do not add a naive src_unpack to this ebuild
-# If you want to add a single patch, copy the ebuild to an overlay
-# and create your own mysql-extras tarball, looking at 000_index.txt
-
-# Official test instructions:
-# USE='-cluster embedded extraengine perl ssl static-libs community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mariadb-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-
-	local TESTDIR="${CMAKE_BUILD_DIR}/mysql-test"
-	local retstatus_unit
-	local retstatus_tests
-
-	# Bug #213475 - MySQL _will_ object strenously if your machine is named
-	# localhost. Also causes weird failures.
-	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
-
-	if ! use "minimal" ; then
-
-		if [[ $UID -eq 0 ]]; then
-			die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
-		fi
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-		addpredict /this-dir-does-not-exist/t9.MYI
-
-		# Run CTest (test-units)
-		cmake-utils_src_test
-		retstatus_unit=$?
-		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
-
-		# Ensure that parallel runs don't die
-		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-		# Enable parallel testing, auto will try to detect number of cores
-		# You may set this by hand.
-		# The default maximum is 8 unless MTR_MAX_PARALLEL is increased
-		export MTR_PARALLEL="${MTR_PARALLEL:-auto}"
-
-		# create directories because mysqladmin might right out of order
-		mkdir -p "${T}"/var-tests{,/log}
-
-		# create symlink for the tests to find mysql_tzinfo_to_sql
-		ln -s "${CMAKE_BUILD_DIR}/sql/mysql_tzinfo_to_sql" "${S}/sql/"
-
-		# These are failing in MariaDB 5.5 for now and are believed to be
-		# false positives:
-		#
-		# main.information_schema, binlog.binlog_statement_insert_delayed,
-		# main.mysqld--help, funcs_1.is_triggers, funcs_1.is_tables_mysql,
-		# funcs_1.is_columns_mysql
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test, main.mysql_client_test_nonblock:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-
-		for t in main.mysql_client_test main.mysql_client_test_nonblock \
-			binlog.binlog_statement_insert_delayed main.information_schema \
-			main.mysqld--help \
-			funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do
-				mysql-v2_disable_test  "$t" "False positives in Gentoo"
-		done
-
-		# Run mysql tests
-		pushd "${TESTDIR}"
-
-		# run mysql-test tests
-		perl mysql-test-run.pl --force --vardir="${T}/var-tests" \
-			--testcase-timeout=30
-		retstatus_tests=$?
-		[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		popd
-
-		# Cleanup is important for these testcases.
-		pkill -9 -f "${S}/ndb" 2>/dev/null
-		pkill -9 -f "${S}/sql" 2>/dev/null
-
-		failures=""
-		[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
-		[[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		[[ -z "$failures" ]] || die "Test failures: $failures"
-		einfo "Tests successfully completed"
-
-	else
-
-		einfo "Skipping server tests due to minimal build."
-	fi
-}
--- a/dev-db/mysql-cluster/files/my.cnf-5.6
+++ b/dev-db/mysql-cluster/files/my.cnf-5.6
@ -0,0 +1,141 @@
+# @GENTOO_PORTAGE_EPREFIX@/etc/mysql/my.cnf: The global mysql configuration file.
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-cluster/files/my.cnf-5.6,v 1.1 2015/02/16 17:33:31 grknight Exp $
+
+# The following options will be passed to all MySQL clients
+[client]
+#password					= your_password
+port						= 3306
+socket						= @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.sock
+
+[mysql]
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
+default-character-set=utf8
+
+[mysqladmin]
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
+default-character-set=utf8
+
+[mysqlcheck]
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
+default-character-set=utf8
+
+[mysqldump]
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
+default-character-set=utf8
+
+[mysqlimport]
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
+default-character-set=utf8
+
+[mysqlshow]
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
+default-character-set=utf8
+
+[myisamchk]
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
+
+[myisampack]
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
+
+# use [safe_mysqld] with mysql-3
+[mysqld_safe]
+err-log						= @GENTOO_PORTAGE_EPREFIX@/var/log/mysql/mysql.err
+
+# add a section [mysqld-4.1] or [mysqld-5.0] for specific configurations
+[mysqld]
+character-set-server		= utf8
+user 						= mysql
+port 						= 3306
+socket 						= @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.sock
+pid-file 					= @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.pid
+log-error 					= @GENTOO_PORTAGE_EPREFIX@/var/log/mysql/mysqld.err
+basedir 					= @GENTOO_PORTAGE_EPREFIX@/usr
+datadir 					= @DATADIR@
+skip-external-locking
+key_buffer_size				= 16M
+max_allowed_packet 			= 4M
+table_open_cache 			= 400
+sort_buffer_size 			= 512K
+net_buffer_length 			= 16K
+read_buffer_size 			= 256K
+read_rnd_buffer_size 		= 512K
+myisam_sort_buffer_size 	= 8M
+lc_messages_dir			= @GENTOO_PORTAGE_EPREFIX@/usr/share/mysql
+#Set this to your desired error message language
+lc_messages			= en_US
+
+# security:
+# using "localhost" in connects uses sockets by default
+# skip-networking
+bind-address				= 127.0.0.1
+
+log-bin
+server-id 					= 1
+
+# point the following paths to different dedicated disks
+tmpdir 						= @GENTOO_PORTAGE_EPREFIX@/tmp/
+#log-update 				= @GENTOO_PORTAGE_EPREFIX@/path-to-dedicated-directory/hostname
+
+# you need the debug USE flag enabled to use the following directives,
+# if needed, uncomment them, start the server and issue
+# #tail -f @GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.sql @GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.trace
+# this will show you *exactly* what's happening in your server ;)
+
+#log						= @GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.sql
+#gdb
+#debug						= d:t:i:o,/tmp/mysqld.trace
+#one-thread
+
+# the rest of the innodb config follows:
+# don't eat too much memory, we're trying to be safe on 64Mb boxes
+# you might want to bump this up a bit on boxes with more RAM
+innodb_buffer_pool_size = 128M
+#
+# i'd like to use @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/innodb, but that is seen as a database :-(
+# and upstream wants things to be under @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/, so that's the route
+# we have to take for the moment
+#innodb_data_home_dir		= @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/
+#innodb_log_arch_dir		= @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/
+#innodb_log_group_home_dir	= @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/
+# you may wish to change this size to be more suitable for your system
+# the max is there to avoid run-away growth on your machine
+innodb_data_file_path = ibdata1:10M:autoextend:max:128M
+# we keep this at around 25% of of innodb_buffer_pool_size
+# sensible values range from 1MB to (1/innodb_log_files_in_group*innodb_buffer_pool_size)
+innodb_log_file_size = 48M
+# this is the default, increase it if you have very large transactions going on
+innodb_log_buffer_size = 8M
+# this is the default and won't hurt you
+# you shouldn't need to tweak it
+innodb_log_files_in_group=2
+# see the innodb config docs, the other options are not always safe
+innodb_flush_log_at_trx_commit = 1
+innodb_lock_wait_timeout = 50
+innodb_file_per_table
+
+# Uncomment this to get FEDERATED engine support
+#plugin-load=federated=ha_federated.so
+loose-federated
+
+[mysqldump]
+quick
+max_allowed_packet 			= 16M
+
+[mysql]
+# uncomment the next directive if you are not familiar with SQL
+#safe-updates
+
+[isamchk]
+key_buffer_size				= 20M
+sort_buffer_size 			= 20M
+read_buffer 				= 2M
+write_buffer 				= 2M
+
+[myisamchk]
+key_buffer_size				= 20M
+sort_buffer_size 			= 20M
+read_buffer_size			= 2M
+write_buffer_size			= 2M
+
+[mysqlhotcopy]
+interactive-timeout
--- a/dev-db/mysql-init-scripts/files/mysql-5.1.53-conf.d
+++ b/dev-db/mysql-init-scripts/files/mysql-5.1.53-conf.d
@ -1,79 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-init-scripts/files/mysql-5.1.53-conf.d,v 1.2 2011/01/15 17:54:31 robbat2 Exp $
-
-# If you want a non-stock location for the config file, uncomment or update
-# either of these as needed. If you do use it, you must make sure that none of
-# your socket, pidfile, datadir, logfiles, binary logs, relay logs or InnoDB
-# files collide with each other.
-MY_CNF="/etc/mysql/my.cnf"
-#MY_CNF="${MY_CNF:-/etc/${SVCNAME}/my.cnf}"
-#MY_CNF="${MY_CNF:-/etc/mysql/my-${SVCNAME/mysql.}.cnf}"
-
-# Place any additional arguments here that you might need
-# Common/useful options:
-# --skip-slave-start=1 - For bringing up replication initially
-# --server-id=NNN - Server ID for replication
-# --skip-networking - lock it down to UNIX sockets only
-MY_ARGS=""
-
-# This setting (in seconds) should be high enough to allow InnoDB to do a full
-# checkpoint recovery. 900 is the default used in the upstream RPM startup
-# scripts. 30 seconds should be sufficent if you just have a tiny <1GiB
-# database. After the core startup is done, we wait this long for the UNIX
-# socket to appear.
-STARTUP_TIMEOUT="900"
-
-# This is how long, in milliseconds, we wait for pidfile to be created, early
-# in the startup.
-STARTUP_EARLY_TIMEOUT="1000"
-
-# How long (in seconds) should we wait for shutdown?
-STOP_TIMEOUT=120
-
-# integer [-20 .. 19 ] default 0
-# change the priority of the server -20 (high) to 19 (low)
-# see nice(1) for description
-#NICE=0
-
-# See start-stop-daemon(8) for possible settings
-#IONICE=2
-
-# If defined, --verbose gets passed to S-S-D
-#DEBUG=1
-
-# Depending on your usage of MySQL, you may also wish to start it after some
-# other services are up. Uncomment the lines below as needed. If these aren't
-# enough for you, we encourage you to file a bug, and help us understand how
-# you are using MySQL.
-
-# Do your MySQL ACLs refer to hostnames not in your /etc/hosts?
-# If so, you need DNS before you can accept connections.
-# Avoid dependency circular loops if you use MySQL to power a local DNS server.
-#rc_use="dns"
-#rc_after="dns"
-
-# Does your MySQL bind to an IP on an interface other than net.lo?
-# Alternatively you might wish to specify the exact interface here.
-#rc_use="net"
-#rc_after="net"
-
-# Do you store your MySQL files on a SAN or other network filesystem, that is
-# provided by the netmount init script?
-#rc_need="netmount"
-
-# Or from NFS? P.S. This is not a good idea in most cases, but does have some
-# valid usage cases, so we provide the option.
-#rc_need="nfsmount"
-
-# Should any one of the instances satisfy the requirement for MySQL coming up?
-# By default, we say no.
-[ "${SVCNAME}" != mysql ] && rc_provide="!mysql"
-# But uncomment this next instead if you think it should.
-#rc_provide="mysql"
-
-# The conditional above has a false-positive "failure" return value as a
-# side-effect, and since it's the last statement, without the next line, this
-# script returns failure.
-return 0
-# vim: ft=gentoo-conf-d et ts=4 sw=4:
--- a/dev-db/mysql-init-scripts/files/mysql-5.1.67-init.d
+++ b/dev-db/mysql-init-scripts/files/mysql-5.1.67-init.d
@ -1,125 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-init-scripts/files/mysql-5.1.67-init.d,v 1.2 2014/09/23 01:23:27 grknight Exp $
-
-depend() {
-	use net.lo
-	# localmount needed for $basedir
-	need localmount
-}
-
-get_config() {
-	my_print_defaults --config-file="$1" mysqld |
-	sed -n -e "s/^--$2=//p"
-}
-
-mysql_svcname() {
-	local ebextra=
-	case "${SVCNAME}" in
-		mysql*) ;;
-		*) ebextra=" (mysql)" ;;
-	esac
-	echo "${SVCNAME}${ebextra}"
-}
-
-start() {
-	# Check for old conf.d variables that mean migration was not yet done.
-	set | egrep -sq '^(mysql_slot_|MYSQL_BLOG_PID_FILE|STOPTIMEOUT)'
-	rc=$?
-	# Yes, MYSQL_INIT_I_KNOW_WHAT_I_AM_DOING is a hidden variable.
-	# It does have a use in testing, as it is possible to build a config file
-	# that works with both the old and new init scripts simulateously.
-	if [ "${rc}" = 0 -a -z "${MYSQL_INIT_I_KNOW_WHAT_I_AM_DOING}" ]; then
-		eerror "You have not updated your conf.d for the new mysql-init-scripts-2 revamp."
-		eerror "Not proceeding because it may be dangerous."
-		return 1
-	fi
-
-	# Now we can startup
-	ebegin "Starting $(mysql_svcname)"
-
-	MY_CNF="${MY_CNF:-/etc/${SVCNAME}/my.cnf}"
-
-	if [ ! -r "${MY_CNF}" ] ; then
-		eerror "Cannot read the configuration file \`${MY_CNF}'"
-		return 1
-	fi
-
-	# tail -n1 is critical as these we only want the last instance of the option
-	local basedir=$(get_config "${MY_CNF}" basedir | tail -n1)
-	local datadir=$(get_config "${MY_CNF}" datadir | tail -n1)
-	local pidfile=$(get_config "${MY_CNF}" pid-file | tail -n1)
-	local socket=$(get_config "${MY_CNF}" socket | tail -n1)
-
-	if [ ! -d "${datadir}" ] ; then
-		eerror "MySQL datadir \`${datadir}' is empty or invalid"
-		eerror "Please check your config file \`${MY_CNF}'"
-		return 1
-	fi
-
-	if [ ! -d "${datadir}"/mysql ] ; then
-		# find which package is installed to report an error
-		local EROOT=$(portageq envvar EROOT)
-		local DBPKG_P=$(portageq match ${EROOT} $(portageq expand_virtual ${EROOT} virtual/mysql))
-		if [ -z ${DBPKG_P} ] ; then
-			eerror "You don't appear to have a server package installed yet."
-		else
-			eerror "You don't appear to have the mysql database installed yet."
-			eerror "Please run \`emerge --config =${DBPKG_P}\` to have this done..."
-		fi
-		return 1
-	fi
-
-	local piddir="${pidfile%/*}"
-	checkpath -d --owner mysql:mysql --mode 0755 "$piddir"
-	rc=$?
-	if [ $rc -ne 0 ]; then
-		eerror "Directory $piddir for pidfile does not exist and cannot be created"
-		return 1
-	fi
-
-	local startup_timeout=${STARTUP_TIMEOUT:-900}
-	local startup_early_timeout=${STARTUP_EARLY_TIMEOUT:-1000}
-	local tmpnice="${NICE:+"--nicelevel "}${NICE}"
-	local tmpionice="${IONICE:+"--ionice "}${IONICE}"
-	start-stop-daemon \
-		${DEBUG:+"--verbose"} \
-		--start \
-		--exec "${basedir}"/sbin/mysqld \
-		--pidfile "${pidfile}" \
-		--background \
-		--wait ${startup_early_timeout} \
-		${tmpnice} \
-		${tmpionice} \
-		-- --defaults-file="${MY_CNF}" ${MY_ARGS}
-	local ret=$?
-	if [ ${ret} -ne 0 ] ; then
-		eend ${ret}
-		return ${ret}
-	fi
-
-	ewaitfile ${startup_timeout} "${socket}"
-	eend $? || return 1
-
-	save_options pidfile "${pidfile}"
-	save_options basedir "${basedir}"
-}
-
-stop() {
-	ebegin "Stopping $(mysql_svcname)"
-
-	local pidfile="$(get_options pidfile)"
-	local basedir="$(get_options basedir)"
-	local stop_timeout=${STOP_TIMEOUT:-120}
-
-	start-stop-daemon \
-		${DEBUG:+"--verbose"} \
-		--stop \
-		--exec "${basedir}"/sbin/mysqld \
-		--pidfile "${pidfile}" \
-		--retry ${stop_timeout}
-	eend $?
-}
-# vim: filetype=gentoo-init-d sw=2 ts=2 sts=2 noet:
-
--- a/dev-db/mysql-init-scripts/mysql-init-scripts-2.0_pre1-r6.ebuild
+++ b/dev-db/mysql-init-scripts/mysql-init-scripts-2.0_pre1-r6.ebuild
@ -1,64 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-init-scripts/mysql-init-scripts-2.0_pre1-r6.ebuild,v 1.10 2014/08/10 20:01:21 slyfox Exp $
-
-inherit systemd
-
-DESCRIPTION="Gentoo MySQL init scripts"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-IUSE=""
-
-DEPEND=""
-# This _will_ break with MySQL 5.0, 4.x, 3.x
-# It also NEEDS openrc for the save_options/get_options builtins.
-RDEPEND="!<dev-db/mysql-5.1"
-
-src_install() {
-	newconfd "${FILESDIR}/mysql-5.1.53-conf.d" "mysql"
-	newinitd "${FILESDIR}/mysql-5.1.67-init.d" "mysql"
-
-	# systemd unit installation
-	exeinto /usr/libexec
-	doexe "${FILESDIR}"/mysqld-wait-ready
-	systemd_dounit "${FILESDIR}/mysqld.service"
-	systemd_newunit "${FILESDIR}/mysqld_at.service" "mysqld@.service"
-	systemd_dotmpfilesd "${FILESDIR}/mysql.conf"
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/logrotate.mysql" "mysql"
-}
-
-pkg_postinst() {
-	grep -sq mysql_slot "${ROOT}"/etc/conf.d/mysql
-	old_conf_present=$?
-	grep -sq get_slot_config "${ROOT}"/etc/init.d/mysql
-	old_init_present=$?
-
-	egrep -sq 'MY_CNF|MY_ARGS|(STARTUP|STOP)_TIMEOUT' "${ROOT}"/etc/conf.d/mysql
-	new_conf_present=$?
-	egrep -sq 'MY_ARGS|STOP_TIMEOUT' "${ROOT}"/etc/init.d/mysql
-	new_init_present=$?
-
-	einfo "Please note that if you are using multiple internal 'slots' in the"
-	einfo "old conf.d file, you should use multiple init files now."
-	echo old $old_conf_present $old_init_present
-	echo new $new_conf_present $new_init_present
-
-	# new scripts present
-	if [ $new_conf_present -eq 0 -a $new_init_present -eq 0 -a \
-		 $old_conf_present -eq 1 -a $old_init_present -eq 1 ]; then
-		:
-	elif [ $old_conf_present -eq 0 -a $old_init_present -eq 0 -a \
-		 $new_conf_present -eq 1 -a $new_init_present -eq 1 ]; then
-		ewarn "Old /etc/init.d/mysql and /etc/conf.d/mysql still present!"
-		ewarn "Update both of those files to the new versions!"
-	else
-		eerror "DANGER, mixed update of /etc/init.d/mysql and /etc/conf.d/mysql"
-		eerror "detected! You must update BOTH to the new versions"
-	fi
-}
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@ -1,7 +1,5 @@
-DIST mysql-5.5.40.tar.gz 21727672 SHA256 4d3721761a31c28866e8ee0fde47558a3e9047aaef3b89135ae8d45eebb74960 SHA512 9adc3c0ace48a84ee87fb7e1f36b2f3d3e5cd95d50ca3012828c7fb33b723cfbfdf85760a30ea38c719a90cc449613747e974768b7f0b070dc346e05a5c418b3 WHIRLPOOL e8a5e8c6e4b816d935fd5368a9f38eaea23b1269c39e6ceed54c13bfaa85586ea81d1c4386f4f3d520cdb3d16b023afa3dab763629e388bc0759389e0eddec43
 DIST mysql-5.5.42.tar.gz 21795431 SHA256 887b12676be4893fa833e4a585c6c8b0c0f18dee30ba7d22cfe860cd85bfc74a SHA512 d02ea8d5a3f0309c2bd17241c9feca81ef35acc2595bfcb134fe436cd6a3d9ddbac5daa71ac75d953518ec2dc5791f953663648f52727bb37cb378d6663f2e0a WHIRLPOOL 43accca23246c353d0ce4e8d0807c4f4f80ba00e2a1d08a97fec5e59abed1278c34c2cda010894af9f98e866aee2a33614c8bf4fe4b840d45ff1d88993a1ff9e
 DIST mysql-5.6.22.tar.gz 33115516 SHA256 c4d2dfabb20a8e26e8437dff41f366520001eb031ffd77fbfcde70d0073fc9f6 SHA512 11b4a1b34ff4bb63d7cdbc1134947772b2c30715b1e3d3fba2ed9c5102f0bde14a708561b2d463014eca64f5fb415a54a0e1656d48f118b403e66d83b98f5b82 WHIRLPOOL a85db903ce1bc542ac87d832d2d0d84cd4c8a75f5feae435d0a9c5ce26f792b7d30c0113764315e8df0e74a899ee2c02233e3b193b42a98daf46ed52b5ccc9cd
 DIST mysql-5.6.23.tar.gz 33115859 SHA256 3bd21af06a9304e372daba41fa5612bb54ac1bc05a4349b3160d0cda972ac098 SHA512 ac648550934ac6ddcb0cbc93731c2d913288dff53ada665f161d14c46e16f2a8ad8d09106a2718e8412f859ea9cf038d04e4c6f5fbea6e4424f9373ddccf4da3 WHIRLPOOL ae315cc7a60408cc050a7941b3c16cf169554b5a67fe4ce23a9b183cb551168f2ec3817e28cf0aa24b619ddc1b638bd926cfcf9c2e0755b2acbf1b82548b2581
-DIST mysql-extras-20140801-1950Z.tar.bz2 1494288 SHA256 a656486a7383d656ed33e279f41bb4384feba082cad3af48376ce9e1f395fe0b SHA512 b2c29c3d7c1ddacfa170125c9df0aaf65eac9f6112244b1deea97a46a3a2f2bd3eb069808e7b2ee3261d609b32046363830ba4ebcc7e74f449189a91145a6f9c WHIRLPOOL 41befc03a7382516849ecaecc1d02be7d00c47be489b97ce68c320c3aa8979c8f941525efe230d97ad2d1a85936a1e4d6c93d96a3f45930991a938e5f0fdab87
 DIST mysql-extras-20141203-2105Z.tar.bz2 1494317 SHA256 cec9fe6873563840e9520ec9f02d06e1262748847be45a9aeaaa841f7ed4b4dc SHA512 958b410d7905d7911a69288ba9a9ebb1d80ff38281506e18400652b15895eb3926d9679fd245a54f4f7cdb688ed9940f21b1b4634239dbc1a1db19ac3918921a WHIRLPOOL baf70684826f393723bd3877813d9415c15b847ffd71757535a12106bff4fcf343cca37e166d45be06eca0425d249dc600bc752ab5e27e02ead3897952ceb169
 DIST mysql-extras-20150127-1351Z.tar.bz2 1494648 SHA256 74497659f1fb3b0cb620e38a911cf2e59a084149dd175199eb7cf4be18b4c328 SHA512 886e42697b3b0a90d8542bafaf3a7ccedf075f9f0065fec995bf58f645edff3a5d62f29be1cfa2e01d002d6382ee02279832cea8c21db6a774c2567c75ab6a35 WHIRLPOOL 9ddb5ccd914a6a6a19741ff93df78534d2273cf918f24af427c018b7c4f424a90d9f57f167633c48e2fa4102a4fae0873fd6dec7529839f229af855cbddf82d4
--- a/dev-db/mysql/mysql-5.5.40.ebuild
+++ b/dev-db/mysql/mysql-5.5.40.ebuild
@ -1,121 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.40.ebuild,v 1.13 2014/10/23 19:29:00 maekke Exp $
-
-EAPI="5"
-
-MY_EXTRAS_VER="20140801-1950Z"
-MY_PV="${PV//_alpha_pre/-m}"
-MY_PV="${MY_PV//_/-}"
-
-# Build type
-BUILD="cmake"
-
-inherit toolchain-funcs mysql-v2
-# only to make repoman happy. it is really set in the eclass
-IUSE="$IUSE"
-
-# Define the mysql-extras source
-EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/mysql-extras.git"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-
-# When MY_EXTRAS is bumped, the index should be revised to exclude these.
-EPATCH_EXCLUDE=''
-
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
-RDEPEND="${RDEPEND}"
-
-# Please do not add a naive src_unpack to this ebuild
-# If you want to add a single patch, copy the ebuild to an overlay
-# and create your own mysql-extras tarball, looking at 000_index.txt
-
-# Official test instructions:
-# USE='-cluster embedded extraengine perl ssl static-libs community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mysql-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-
-	local TESTDIR="${CMAKE_BUILD_DIR}/mysql-test"
-	local retstatus_unit
-	local retstatus_tests
-
-	# Bug #213475 - MySQL _will_ object strenously if your machine is named
-	# localhost. Also causes weird failures.
-	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
-
-	if ! use "minimal" ; then
-
-		if [[ $UID -eq 0 ]]; then
-			die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
-		fi
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-		addpredict /this-dir-does-not-exist/t9.MYI
-
-		# Run CTest (test-units)
-		cmake-utils_src_test
-		retstatus_unit=$?
-		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
-
-		# Ensure that parallel runs don't die
-		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-		# Enable parallel testing, auto will try to detect number of cores
-		# You may set this by hand.
-		# The default maximum is 8 unless MTR_MAX_PARALLEL is increased
-		export MTR_PARALLEL="${MTR_PARALLEL:-auto}"
-
-		# create directories because mysqladmin might right out of order
-		mkdir -p "${T}"/var-tests{,/log}
-
-		# create symlink for the tests to find mysql_tzinfo_to_sql
-		ln -s "${CMAKE_BUILD_DIR}/sql/mysql_tzinfo_to_sql" "${S}/sql/"
-
-		# These are failing in MySQL 5.5 for now and are believed to be
-		# false positives:
-		#
-		# main.information_schema, binlog.binlog_statement_insert_delayed,
-		# main.mysqld--help-notwin
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test:
-		# segfaults at random under Portage only, suspect resource limits.
-
-		for t in main.mysql_client_test \
-			binlog.binlog_statement_insert_delayed main.information_schema \
-			main.mysqld--help-notwin ; do
-				mysql-v2_disable_test  "$t" "False positives in Gentoo"
-		done
-
-		# Run mysql tests
-		pushd "${TESTDIR}"
-
-		# run mysql-test tests
-		perl mysql-test-run.pl --force --vardir="${T}/var-tests" \
-			--testcase-timeout=30
-		retstatus_tests=$?
-		[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		popd
-
-		# Cleanup is important for these testcases.
-		pkill -9 -f "${S}/ndb" 2>/dev/null
-		pkill -9 -f "${S}/sql" 2>/dev/null
-
-		failures=""
-		[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
-		[[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		[[ -z "$failures" ]] || die "Test failures: $failures"
-		einfo "Tests successfully completed"
-
-	else
-
-		einfo "Skipping server tests due to minimal build."
-	fi
-}
--- a/dev-db/mysql/mysql-5.6.22.ebuild
+++ b/dev-db/mysql/mysql-5.6.22.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.6.22.ebuild,v 1.9 2015/01/25 10:19:08 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.6.22.ebuild,v 1.11 2015/02/16 10:27:41 ago Exp $

 EAPI="5"

@ -13,7 +13,7 @@ inherit toolchain-funcs mysql-multilib
 IUSE="$IUSE"

 # REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"

 # When MY_EXTRAS is bumped, the index should be revised to exclude these.
 EPATCH_EXCLUDE=''
--- a/dev-db/phpmyadmin/phpmyadmin-4.1.14.8.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-4.1.14.8.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-4.1.14.8.ebuild,v 1.5 2015/01/31 10:31:23 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-4.1.14.8.ebuild,v 1.6 2015/02/16 10:19:34 ago Exp $

 EAPI="5"

@ -14,7 +14,7 @@ HOMEPAGE="http://www.phpmyadmin.net/"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"

 LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 hppa ~ia64 ppc ~ppc64 ~sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 hppa ~ia64 ppc ~ppc64 sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="setup"

 RDEPEND="
--- a/dev-db/phpmyadmin/phpmyadmin-4.2.13.1.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-4.2.13.1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-4.2.13.1.ebuild,v 1.5 2015/01/31 10:31:23 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-4.2.13.1.ebuild,v 1.6 2015/02/16 10:19:34 ago Exp $

 EAPI="5"

@ -14,7 +14,7 @@ HOMEPAGE="http://www.phpmyadmin.net/"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"

 LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 hppa ~ia64 ppc ~ppc64 ~sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 hppa ~ia64 ppc ~ppc64 sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="setup"

 RDEPEND="
--- a/dev-db/postgresql/postgresql-9.0.19.ebuild
+++ b/dev-db/postgresql/postgresql-9.0.19.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-9.0.19.ebuild,v 1.4 2015/02/06 19:26:20 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-9.0.19.ebuild,v 1.5 2015/02/16 10:19:59 ago Exp $

 EAPI="5"

@ -13,7 +13,7 @@ PYTHON_COMPAT=( python{2_{6,7},3_{2,3,4}} )
 inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
 		systemd user versionator

-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"

 SLOT="$(get_version_component_range 1-2)"

--- a/dev-db/postgresql/postgresql-9.1.15.ebuild
+++ b/dev-db/postgresql/postgresql-9.1.15.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-9.1.15.ebuild,v 1.4 2015/02/06 19:26:20 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-9.1.15.ebuild,v 1.5 2015/02/16 10:19:59 ago Exp $

 EAPI="5"

@ -13,7 +13,7 @@ PYTHON_COMPAT=( python{2_{6,7},3_{2,3,4}} )
 inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
 		systemd user versionator

-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"

 SLOT="$(get_version_component_range 1-2)"

--- a/dev-db/postgresql/postgresql-9.2.10.ebuild
+++ b/dev-db/postgresql/postgresql-9.2.10.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-9.2.10.ebuild,v 1.4 2015/02/06 19:26:20 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-9.2.10.ebuild,v 1.5 2015/02/16 10:19:59 ago Exp $

 EAPI="5"

@ -9,7 +9,7 @@ PYTHON_COMPAT=( python{2_{6,7},3_{2,3,4}} )
 inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
 		systemd user versionator

-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"

 SLOT="$(get_version_component_range 1-2)"

--- a/dev-db/postgresql/postgresql-9.3.6.ebuild
+++ b/dev-db/postgresql/postgresql-9.3.6.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-9.3.6.ebuild,v 1.4 2015/02/06 19:26:20 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-9.3.6.ebuild,v 1.5 2015/02/16 10:19:59 ago Exp $

 EAPI="5"

@ -9,7 +9,7 @@ PYTHON_COMPAT=( python{2_{6,7},3_{2,3,4}} )
 inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
 		systemd user versionator

-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"

 SLOT="$(get_version_component_range 1-2)"

--- a/dev-db/postgresql/postgresql-9.4.1.ebuild
+++ b/dev-db/postgresql/postgresql-9.4.1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-9.4.1.ebuild,v 1.4 2015/02/06 19:26:20 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-9.4.1.ebuild,v 1.5 2015/02/16 10:19:59 ago Exp $

 EAPI="5"

@ -9,7 +9,7 @@ PYTHON_COMPAT=( python{2_{6,7},3_{2,3,4}} )
 inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
 		systemd user versionator

-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"

 SLOT="$(get_version_component_range 1-2)"

--- a/dev-lang/elixir/Manifest
+++ b/dev-lang/elixir/Manifest
@ -6,3 +6,4 @@ DIST elixir-0.15.1.tar.gz 1017067 SHA256 8e608abf90a6e9a25ef5fb7e45dfd04e2cb7e1f
 DIST elixir-1.0.0.tar.gz 1032066 SHA256 527774b05bcaacb0347299b42035b606107e88665fcdd415b0b62704ad7928b2 SHA512 96978fc0df8bd59d22801f376a31d3d5802f5c16e76299a5c7fcfe50c733596b02b9092a92a16edb571fac1bda63a1dbaf38daf586675079d2d21e0f595a5d5d WHIRLPOOL 80ce9826b4288d050e3539643bfe54965ca3162123fa1d1326bf98de72baf3eb87ecfd81ee6b9937845af50d52029a35514bcb48c4700494ac0392f6427f354e
 DIST elixir-1.0.1.tar.gz 1033936 SHA256 87ecbe8aa8eecfed5033a80b0f1ad2fe95ef835fa909fde65fbc622a5aa3431b SHA512 88743b578bdd0f70356d6adfa0793ebe13a77b0022692b7329be9f192dd61ebf14e802b331e79e40460dd7b6937bf5fe12cb82bb5672db14f320385cadf5ba72 WHIRLPOOL a80ff718431163714a68ccf807c2b5db3f40bbd1307d28d03d7c661e72204a697e89b76491c0b288edcba1a598fcbf5442f14dee432e4aa1d88f6f43268511c7
 DIST elixir-1.0.2.tar.gz 1033260 SHA256 6156ee396e85045358d11a6839e157e8fa9573b7414bddbd2c91843ed2b4b962 SHA512 3768bdfeab7478df5e8e7208f5f6e5fad584d3beef78784a322e346851a39c0da5657cb0f88632246377d0795ac735bd80e7a68ca879c08b9e21283a807b4511 WHIRLPOOL 6b766c6cff9f95e95b218ff830ae1d0655e52197c817f9f0b484e7a4f94c37da931ffe48e6caa5430a00fc4807ac0a870bf175b2e20a0c016748de606d106369
+DIST elixir-1.0.3.tar.gz 1039041 SHA256 ec6c4eaffcb771d91bdea9fb274600c624fd16b1891d194b3fcb2b521f52cc75 SHA512 d48636c355181a633dfc5d256f9a1718d74137686080c965d2d568e3d9b0f5cc1352f2ed4d12e50bd89c4cfc9cd59e7a1112ae22979012845df0556124151d1e WHIRLPOOL e76b92272598aba72e9b067eef20492b692f9d4aeeff796a35dc9ea2ee27eed40a5eea369bb92c3a58e23001cf5ea627eb72bf7b7b8b13827f8601479f104135
--- a/dev-lang/elixir/elixir-1.0.3.ebuild
+++ b/dev-lang/elixir/elixir-1.0.3.ebuild
@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/elixir/elixir-1.0.3.ebuild,v 1.1 2015/02/16 17:42:20 hasufell Exp $
+
+EAPI=5
+
+inherit multilib
+
+DESCRIPTION="Elixir programming language"
+HOMEPAGE="http://elixir-lang.org"
+SRC_URI="https://github.com/elixir-lang/elixir/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 ErlPL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=">=dev-lang/erlang-17"
+RDEPEND="${DEPEND}"
+
+src_compile() {
+	emake Q=""
+}
+
+src_install() {
+	emake DESTDIR="${D}" LIBDIR="$(get_libdir)" PREFIX="/usr" install
+	dodoc README.md CHANGELOG.md CONTRIBUTING.md
+}
--- a/dev-lang/luajit/Manifest
+++ b/dev-lang/luajit/Manifest
@ -1,8 +1,3 @@
 DIST LuaJIT-1.1.6.tar.gz 364447 SHA256 c3dee987635540f64ebe834aa6c8ef17e0c0b8248324ee20953f50c98be2dd8a SHA512 5b08d0409bed23b3efd05d50007819c0023323fb0f921256fd33902b434221ebaa5ff4568813863ba3220271f7fd54720479ab8161b09d26ef5873030431592a WHIRLPOOL 6fa2504ccbeeb07434bf251b609df4a2834924da97c8efd5b5ca23a1d7215ca469b22fdd0aa166612606bc791a55b3ce150c6c1f2c3fae3598b0d1f4a75b2955
-DIST LuaJIT-2.0.0-beta10.tar.gz 890830 SHA256 750e9317ca2c61fa17e739abc582c55c1fe69749ba65442dfd7f04ce20cf9ff6 SHA512 f3d4449b8b197247db9b5ec93a28a2db7a50f7b368afe0db40252f7db6504c51ce1c16e893eb7edcd91332a017419d06efcc2941c72c211af61d9e6bc3978ac5 WHIRLPOOL f3cad09cb86294a1dc70c4647eed51c26be8124ad0e913c070f59b1ff14cc16b7203c36c91311b165d683473e06c3148d1cfdaf21031dfb81cc41053777bd5d0
-DIST LuaJIT-2.0.0-beta7.tar.gz 674740 SHA256 ab28c05d7d306c6a678fe3f0549dcecd4373ed4ee7cb9d85444a958e584087d8 SHA512 f91913db947df03b3dafc6e785b66673ab585c704cd8fa7b268c88ba4862c40493a667ef4fe408abda8979900258e7782f5ee367890c9498ad2b14740c274f79 WHIRLPOOL 5690507558cec98b8f6e98647babf8e0fbcbf2d9da92a062580c3a934914bbc7d0d6cdcf75bb233bcfbde1a843aadc3578e70573108fa39182488b55963b93a2
-DIST LuaJIT-2.0.0-beta8.tar.gz 720393 SHA256 408aaa6606dc91a37fd58f2b75d47a20f831b1d57d33d1af18721327d745653f SHA512 0eb219020a7f81d06a45fa8de3bf84a07996937608f28af5f27ac31e2a184f264560d8966c5c903d2a5399178f15bf7a58d3090fa3d22d4626eba65d46281371 WHIRLPOOL 3ea6b075ce75867d12809a14cb239ec3e964625e0b2102a0d643f85bf0530f236a26ebcf142fc15d486449b048757e48bf2aa5ca34e71b1e474ff56579cfb17e
-DIST LuaJIT-2.0.0.tar.gz 837408 SHA256 deaed645c4a093c5fb250c30c9933c9131ee05c94b13262d58f6e0b60b338c15 SHA512 7aee798e68d0a5b2f1aaaf61b558e0734d48f2501a255d8e3c7208c1319586fdec1ebc4f80238ab1f58dfd3c9d0042b806a567ccce5b769ab4d6345f70844b36 WHIRLPOOL a981dff1dc34ada5fce97dba62e5eba39be2ddc54d2b9ee2575593665ceff1682950c017fb08e22fb7e6bebfa9b5f9429fe0a084f89c424240cf1a6059453cb5
 DIST LuaJIT-2.0.2.tar.gz 843031 SHA256 c05202974a5890e777b181908ac237625b499aece026654d7cc33607e3f46c38 SHA512 c1afea13ec61a59f37d1f61fc50bcac47208d9d4f0a80689b74e901ad2b34294b6c89a0b4eef54b43f3d2db411660da61b191b0bbfba4ba2f97743a9ee4484e3 WHIRLPOOL cb6e8ee6c5ac2293ca5d5452cda34769d3229e2d4681c0ce3c164659c2d2d781f8474e243747b197c10b3abc116e4145df6f5293317f1db871865f38ecd2b6cd
 DIST LuaJIT-2.0.3.tar.gz 844927 SHA256 55be6cb2d101ed38acca32c5b1f99ae345904b365b642203194c585d27bebd79 SHA512 7b3e3de22ac3602299b5918b60801e45a3278e547a15c16fdae7359538d4ada27ba664935d5f97c7409f330c2f8efeaae9ea03415f5e9d5a9d81e022cd5d36e0 WHIRLPOOL 1ba759b85048cfd57ebc02cfce477e9ddb327e7d27acd78f93fb2debfbf010a96e7b127324ebf6b81b1f35132f5a0a3a56ffca64fe0e66cba80c28b1cb49b433
-DIST beta8_hotfix1.patch 4876 SHA256 142716faaa0dbb97938aa50179fc2ee4d3e45aab80951adfd7f96dc1fd1d7c43 SHA512 36aa6569366cf76e2335cc10894da92c434cff611649ec04459b5392dc571bdab60b7dc42677da51106128b991308b51669af1b266d99ec9f7491ff17960784f WHIRLPOOL 050666b596ab7dde27ecba52342f36ddcee3a21d85e069c58356441b4a611a2628fd7d81c52ac741717a5454c2058d5cc90d889f925757294c1e05a022faa1c2
--- a/dev-lang/luajit/files/LuaJIT-2.0.0-beta10-gentoo.patch
+++ b/dev-lang/luajit/files/LuaJIT-2.0.0-beta10-gentoo.patch
@ -1,171 +0,0 @@
-diff -ru LuaJIT-2.0.0-beta10.orig/etc/luajit.pc LuaJIT-2.0.0-beta10/etc/luajit.pc
--- LuaJIT-2.0.0-beta10.orig/etc/luajit.pc	2012-05-12 22:55:18.768282860 -0300
-+++ LuaJIT-2.0.0-beta10/etc/luajit.pc	2012-05-12 22:55:48.412282447 -0300
-@@ -3,13 +3,13 @@
- minver=0
- relver=0
- version=${majver}.${minver}.${relver}-beta10
-abiver=5.1
-+abiver=jit-5.1
- 
-prefix=/usr/local
-+prefix=/usr
- exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-+libdir=${exec_prefix}/@LIBDIR@
- libname=luajit-${abiver}
-includedir=${prefix}/include/luajit-${majver}.${minver}
-+includedir=${prefix}/include/luajit-@SHORTVER@
- 
- INSTALL_LMOD=${prefix}/share/lua/${abiver}
- INSTALL_CMOD=${prefix}/lib/lua/${abiver}
-diff -ru LuaJIT-2.0.0-beta10.orig/Makefile LuaJIT-2.0.0-beta10/Makefile
--- LuaJIT-2.0.0-beta10.orig/Makefile	2012-05-12 22:55:18.764282863 -0300
-+++ LuaJIT-2.0.0-beta10/Makefile	2012-05-12 22:58:17.928279877 -0300
-@@ -18,37 +18,38 @@
- RELVER=  0
- PREREL=  -beta10
- VERSION= $(MAJVER).$(MINVER).$(RELVER)$(PREREL)
-ABIVER=  5.1
-NODOTABIVER=  51
-+SHORTVER= $(MAJVER).$(MINVER)
-+ABIVER=  jit-$(SHORTVER)
-+NODOTSHORTVER=  $(MAJVER)$(MINVER)
- 
- ##############################################################################
- #
- # Change the installation path as needed. This automatically adjusts
- # the paths in src/luaconf.h, too. Note: PREFIX must be an absolute path!
- #
-export PREFIX= /usr/local
-+export PREFIX= /usr
- ##############################################################################
- 
- DPREFIX= $(DESTDIR)$(PREFIX)
- INSTALL_BIN=   $(DPREFIX)/bin
-INSTALL_LIB=   $(DPREFIX)/lib
-+INSTALL_LIB=   $(DPREFIX)/$(LIBDIR)
- INSTALL_SHARE= $(DPREFIX)/share
-INSTALL_INC=   $(DPREFIX)/include/luajit-$(MAJVER).$(MINVER)
-+INSTALL_INC=   $(DPREFIX)/include/luajit-$(SHORTVER)
- 
-INSTALL_JITLIB= $(INSTALL_SHARE)/luajit-$(VERSION)/jit
-+INSTALL_JITLIB= $(INSTALL_SHARE)/luajit-$(SHORTVER)/jit
- INSTALL_LMOD= $(INSTALL_SHARE)/lua/$(ABIVER)
- INSTALL_CMOD= $(INSTALL_LIB)/lua/$(ABIVER)
- INSTALL_MAN= $(INSTALL_SHARE)/man/man1
- INSTALL_PKGCONFIG= $(INSTALL_LIB)/pkgconfig
- 
-INSTALL_TNAME= luajit-$(VERSION)
-+INSTALL_TNAME= luajit-$(SHORTVER)
- INSTALL_TSYMNAME= luajit
-INSTALL_ANAME= libluajit-$(ABIVER).a
-INSTALL_SONAME= libluajit-$(ABIVER).so.$(MAJVER).$(MINVER).$(RELVER)
-INSTALL_SOSHORT= libluajit-$(ABIVER).so
-INSTALL_DYLIBNAME= libluajit-$(NODOTABIVER).$(MAJVER).$(MINVER).$(RELVER).dylib
-INSTALL_DYLIBSHORT1= libluajit-$(NODOTABIVER).dylib
-INSTALL_DYLIBSHORT2= libluajit-$(NODOTABIVER).$(MAJVER).dylib
-+INSTALL_ANAME= libluajit-$(SHORTVER).a
-+INSTALL_SONAME= libluajit-$(SHORTVER).so.$(RELVER)
-+INSTALL_SOSHORT= libluajit-$(SHORTVER).so
-+INSTALL_DYLIBNAME= libluajit-$(NODOTSHORTVER).$(MAJVER).$(MINVER).$(RELVER).dylib
-+INSTALL_DYLIBSHORT1= libluajit-$(NODOTSHORTVER).dylib
-+INSTALL_DYLIBSHORT2= libluajit-$(NODOTSHORTVER).$(MAJVER).dylib
- INSTALL_PCNAME= luajit.pc
- 
- INSTALL_STATIC= $(INSTALL_LIB)/$(INSTALL_ANAME)
-@@ -57,7 +58,7 @@
- INSTALL_SHORT2= $(INSTALL_LIB)/$(INSTALL_SOSHORT)
- INSTALL_T= $(INSTALL_BIN)/$(INSTALL_TNAME)
- INSTALL_TSYM= $(INSTALL_BIN)/$(INSTALL_TSYMNAME)
-INSTALL_PC= $(INSTALL_PKGCONFIG)/$(INSTALL_PCNAME)
-+INSTALL_PC= $(INSTALL_PKGCONFIG)/luajit-$(SHORTVER).pc
- 
- INSTALL_DIRS= $(INSTALL_BIN) $(INSTALL_LIB) $(INSTALL_INC) $(INSTALL_MAN) \
-   $(INSTALL_PKGCONFIG) $(INSTALL_JITLIB) $(INSTALL_LMOD) $(INSTALL_CMOD)
-@@ -68,7 +69,7 @@
- INSTALL_X= install -m 0755
- INSTALL_F= install -m 0644
- LDCONFIG= ldconfig -n
-SED_PC= sed -e "s|^prefix=.*|prefix=$(PREFIX)|"
-+SED_PC= sed -e "s|@SHORTVER@|$(SHORTVER)|" -e "s|@LIBDIR@|$(LIBDIR)|"
- 
- FILE_T= luajit
- FILE_A= libluajit.a
-@@ -108,7 +109,7 @@
- 	  $(LDCONFIG) $(INSTALL_LIB) && \
- 	  $(SYMLINK) $(INSTALL_SONAME) $(INSTALL_SHORT1) && \
- 	  $(SYMLINK) $(INSTALL_SONAME) $(INSTALL_SHORT2) || :
-	cd etc && $(INSTALL_F) $(FILE_MAN) $(INSTALL_MAN)
-+	cd etc && $(INSTALL_F) $(FILE_MAN) $(INSTALL_MAN)/luajit-$(SHORTVER).1
- 	cd etc && $(SED_PC) $(FILE_PC) > $(FILE_PC).tmp && \
- 	  $(INSTALL_F) $(FILE_PC).tmp $(INSTALL_PC) && \
- 	  $(RM) $(FILE_PC).tmp
-diff -ru LuaJIT-2.0.0-beta10.orig/src/luaconf.h LuaJIT-2.0.0-beta10/src/luaconf.h
--- LuaJIT-2.0.0-beta10.orig/src/luaconf.h	2012-05-12 22:55:18.776282852 -0300
-+++ LuaJIT-2.0.0-beta10/src/luaconf.h	2012-05-12 23:00:29.024277594 -0300
-@@ -22,16 +22,16 @@
- #define LUA_CPATH_DEFAULT \
-   ".\\?.dll;" LUA_CDIR"?.dll;" LUA_CDIR"loadall.dll"
- #else
-#define LUA_ROOT	"/usr/local/"
-#define LUA_LDIR	LUA_ROOT "share/lua/5.1/"
-#define LUA_CDIR	LUA_ROOT "lib/lua/5.1/"
-+#define LUA_ROOT	"/usr/"
-+#define LUA_LDIR	LUA_ROOT "share/lua/jit-2.0/"
-+#define LUA_CDIR	LUA_ROOT "lib/lua/jit-2.0/"
- #ifdef LUA_XROOT
-#define LUA_JDIR	LUA_XROOT "share/luajit-2.0.0-beta10/"
-+#define LUA_JDIR	LUA_XROOT "share/luajit-2.0/"
- #define LUA_XPATH \
-  ";" LUA_XROOT "share/lua/5.1/?.lua;" LUA_XROOT "share/lua/5.1/?/init.lua"
-#define LUA_XCPATH	LUA_XROOT "lib/lua/5.1/?.so;"
-+  ";" LUA_XROOT "share/lua/5.1/?.lua;" LUA_XROOT "share/lua/jit-2.0/?/init.lua"
-+#define LUA_XCPATH	LUA_XROOT "lib/lua/jit-2.0/?.so;"
- #else
-#define LUA_JDIR	LUA_ROOT "share/luajit-2.0.0-beta10/"
-+#define LUA_JDIR	LUA_ROOT "share/luajit-2.0/"
- #define LUA_XPATH
- #define LUA_XCPATH
- #endif
-diff -ru LuaJIT-2.0.0-beta10.orig/src/Makefile LuaJIT-2.0.0-beta10/src/Makefile
--- LuaJIT-2.0.0-beta10.orig/src/Makefile	2012-05-12 22:55:18.772282855 -0300
-+++ LuaJIT-2.0.0-beta10/src/Makefile	2012-05-12 23:01:37.340276596 -0300
-@@ -13,8 +13,8 @@
- MAJVER=  2
- MINVER=  0
- RELVER=  0
-ABIVER=  5.1
-NODOTABIVER= 51
-+SHORTVER= $(MAJVER).$(MINVER)
-+NODOTSHORTVER=  $(MAJVER)$(MINVER)
- 
- ##############################################################################
- #############################  COMPILER OPTIONS  #############################
-@@ -204,10 +204,9 @@
- TARGET_AR= $(CROSS)ar rcus
- TARGET_STRIP= $(CROSS)strip
- 
-TARGET_SONAME= libluajit-$(ABIVER).so.$(MAJVER)
-TARGET_DYLIBNAME= libluajit-$(NODOTABIVER).$(MAJVER).dylib
-TARGET_DYLIBPATH= $(or $(PREFIX),/usr/local)/lib/$(TARGET_DYLIBNAME)
-TARGET_DLLNAME= lua$(NODOTABIVER).dll
-+TARGET_SONAME= libluajit-$(SHORTVER).so.$(RELVER)
-+TARGET_DYLIBNAME= libluajit-$(NODOTSHORTVER).$(MAJVER).$(MINVER).$(RELVER).dylib
-+TARGET_DLLNAME= lua$(NODOTSHORTVER).dll
- TARGET_XSHLDFLAGS= -shared -fPIC -Wl,-soname,$(TARGET_SONAME)
- TARGET_DYNXLDOPTS=
- 
-@@ -476,10 +475,8 @@
- endif
- endif
- 
-Q= @
-E= @echo
-#Q=
-#E= @:
-+Q=
-+E= @:
- 
- ##############################################################################
- # Make targets.
--- a/dev-lang/luajit/files/LuaJIT-2.0.0-beta8-gentoo.patch
+++ b/dev-lang/luajit/files/LuaJIT-2.0.0-beta8-gentoo.patch
@ -1,174 +0,0 @@
-Index: LuaJIT-2.0.0-beta8/etc/luajit.pc
-===================================================================
--- LuaJIT-2.0.0-beta8.orig/etc/luajit.pc
-+++ LuaJIT-2.0.0-beta8/etc/luajit.pc
-@@ -3,13 +3,13 @@ majver=2
- minver=0
- relver=0
- version=${majver}.${minver}.${relver}-beta8
-abiver=5.1
-+abiver=jit-5.1
- 
-prefix=/usr/local
-+prefix=/usr
- exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-+libdir=${exec_prefix}/@LIBDIR@
- libname=luajit-${abiver}
-includedir=${prefix}/include/luajit-${majver}.${minver}
-+includedir=${prefix}/include/luajit-@SHORTVER@
- 
- INSTALL_LMOD=${prefix}/share/lua/${abiver}
- INSTALL_CMOD=${prefix}/lib/lua/${abiver}
-Index: LuaJIT-2.0.0-beta8/Makefile
-===================================================================
--- LuaJIT-2.0.0-beta8.orig/Makefile
-+++ LuaJIT-2.0.0-beta8/Makefile
-@@ -18,37 +18,38 @@ MINVER=  0
- RELVER=  0
- PREREL=  -beta8
- VERSION= $(MAJVER).$(MINVER).$(RELVER)$(PREREL)
-ABIVER=  5.1
-NODOTABIVER=  51
-+SHORTVER= $(MAJVER).$(MINVER)
-+ABIVER=  jit-$(SHORTVER)
-+NODOTSHORTVER=  $(MAJVER)$(MINVER)
- 
- ##############################################################################
- #
- # Change the installation path as needed. This automatically adjusts
- # the paths in src/luaconf.h, too. Note: PREFIX must be an absolute path!
- #
-export PREFIX= /usr/local
-+export PREFIX= /usr
- ##############################################################################
- 
- DPREFIX= $(DESTDIR)$(PREFIX)
- INSTALL_BIN=   $(DPREFIX)/bin
-INSTALL_LIB=   $(DPREFIX)/lib
-+INSTALL_LIB=   $(DPREFIX)/$(LIBDIR)
- INSTALL_SHARE= $(DPREFIX)/share
-INSTALL_INC=   $(DPREFIX)/include/luajit-$(MAJVER).$(MINVER)
-+INSTALL_INC=   $(DPREFIX)/include/luajit-$(SHORTVER)
- 
-INSTALL_JITLIB= $(INSTALL_SHARE)/luajit-$(VERSION)/jit
-+INSTALL_JITLIB= $(INSTALL_SHARE)/luajit-$(SHORTVER)/jit
- INSTALL_LMOD= $(INSTALL_SHARE)/lua/$(ABIVER)
- INSTALL_CMOD= $(INSTALL_LIB)/lua/$(ABIVER)
- INSTALL_MAN= $(INSTALL_SHARE)/man/man1
- INSTALL_PKGCONFIG= $(INSTALL_LIB)/pkgconfig
- 
-INSTALL_TNAME= luajit-$(VERSION)
-+INSTALL_TNAME= luajit-$(SHORTVER)
- INSTALL_TSYMNAME= luajit
-INSTALL_ANAME= libluajit-$(ABIVER).a
-INSTALL_SONAME= libluajit-$(ABIVER).so.$(MAJVER).$(MINVER).$(RELVER)
-INSTALL_SOSHORT= libluajit-$(ABIVER).so
-INSTALL_DYLIBNAME= libluajit-$(NODOTABIVER).$(MAJVER).$(MINVER).$(RELVER).dylib
-INSTALL_DYLIBSHORT1= libluajit-$(NODOTABIVER).dylib
-INSTALL_DYLIBSHORT2= libluajit-$(NODOTABIVER).$(MAJVER).dylib
-+INSTALL_ANAME= libluajit-$(SHORTVER).a
-+INSTALL_SONAME= libluajit-$(SHORTVER).so.$(RELVER)
-+INSTALL_SOSHORT= libluajit-$(SHORTVER).so
-+INSTALL_DYLIBNAME= libluajit-$(NODOTSHORTVER).$(MAJVER).$(MINVER).$(RELVER).dylib
-+INSTALL_DYLIBSHORT1= libluajit-$(NODOTSHORTVER).dylib
-+INSTALL_DYLIBSHORT2= libluajit-$(NODOTSHORTVER).$(MAJVER).dylib
- INSTALL_PCNAME= luajit.pc
- 
- INSTALL_STATIC= $(INSTALL_LIB)/$(INSTALL_ANAME)
-@@ -57,7 +58,7 @@ INSTALL_SHORT1= $(INSTALL_LIB)/$(INSTALL
- INSTALL_SHORT2= $(INSTALL_LIB)/$(INSTALL_SOSHORT)
- INSTALL_T= $(INSTALL_BIN)/$(INSTALL_TNAME)
- INSTALL_TSYM= $(INSTALL_BIN)/$(INSTALL_TSYMNAME)
-INSTALL_PC= $(INSTALL_PKGCONFIG)/$(INSTALL_PCNAME)
-+INSTALL_PC= $(INSTALL_PKGCONFIG)/luajit-$(SHORTVER).pc
- 
- INSTALL_DIRS= $(INSTALL_BIN) $(INSTALL_LIB) $(INSTALL_INC) $(INSTALL_MAN) \
-   $(INSTALL_PKGCONFIG) $(INSTALL_JITLIB) $(INSTALL_LMOD) $(INSTALL_CMOD)
-@@ -68,7 +69,7 @@ SYMLINK= ln -sf
- INSTALL_X= install -m 0755
- INSTALL_F= install -m 0644
- LDCONFIG= ldconfig -n
-SED_PC= sed -e "s|^prefix=.*|prefix=$(PREFIX)|"
-+SED_PC= sed -e "s|@SHORTVER@|$(SHORTVER)|" -e "s|@LIBDIR@|$(LIBDIR)|"
- 
- FILE_T= luajit
- FILE_A= libluajit.a
-@@ -107,7 +108,7 @@ install: $(INSTALL_DEP)
- 	  $(LDCONFIG) $(INSTALL_LIB) && \
- 	  $(SYMLINK) $(INSTALL_SONAME) $(INSTALL_SHORT1) && \
- 	  $(SYMLINK) $(INSTALL_SONAME) $(INSTALL_SHORT2) || :
-	cd etc && $(INSTALL_F) $(FILE_MAN) $(INSTALL_MAN)
-+	cd etc && $(INSTALL_F) $(FILE_MAN) $(INSTALL_MAN)/luajit-$(SHORTVER).1
- 	cd etc && $(SED_PC) $(FILE_PC) > $(FILE_PC).tmp && \
- 	  $(INSTALL_F) $(FILE_PC).tmp $(INSTALL_PC) && \
- 	  $(RM) $(FILE_PC).tmp
-Index: LuaJIT-2.0.0-beta8/src/luaconf.h
-===================================================================
--- LuaJIT-2.0.0-beta8.orig/src/luaconf.h
-+++ LuaJIT-2.0.0-beta8/src/luaconf.h
-@@ -22,16 +22,16 @@
- #define LUA_CPATH_DEFAULT \
-   ".\\?.dll;" LUA_CDIR"?.dll;" LUA_CDIR"loadall.dll"
- #else
-#define LUA_ROOT	"/usr/local/"
-#define LUA_LDIR	LUA_ROOT "share/lua/5.1/"
-#define LUA_CDIR	LUA_ROOT "lib/lua/5.1/"
-+#define LUA_ROOT	"/usr/"
-+#define LUA_LDIR	LUA_ROOT "share/lua/jit-2.0/"
-+#define LUA_CDIR	LUA_ROOT "lib/lua/jit-2.0/"
- #ifdef LUA_XROOT
-#define LUA_JDIR	LUA_XROOT "share/luajit-2.0.0-beta8/"
-+#define LUA_JDIR	LUA_XROOT "share/luajit-2.0/"
- #define LUA_XPATH \
-  ";" LUA_XROOT "share/lua/5.1/?.lua;" LUA_XROOT "share/lua/5.1/?/init.lua"
-#define LUA_XCPATH	LUA_XROOT "lib/lua/5.1/?.so;"
-+  ";" LUA_XROOT "share/lua/5.1/?.lua;" LUA_XROOT "share/lua/jit-2.0/?/init.lua"
-+#define LUA_XCPATH	LUA_XROOT "lib/lua/jit-2.0/?.so;"
- #else
-#define LUA_JDIR	LUA_ROOT "share/luajit-2.0.0-beta8/"
-+#define LUA_JDIR	LUA_ROOT "share/luajit-2.0/"
- #define LUA_XPATH
- #define LUA_XCPATH
- #endif
-Index: LuaJIT-2.0.0-beta8/src/Makefile
-===================================================================
--- LuaJIT-2.0.0-beta8.orig/src/Makefile
-+++ LuaJIT-2.0.0-beta8/src/Makefile
-@@ -13,8 +13,8 @@
- MAJVER=  2
- MINVER=  0
- RELVER=  0
-ABIVER=  5.1
-NODOTABIVER= 51
-+SHORTVER= $(MAJVER).$(MINVER)
-+NODOTSHORTVER=  $(MAJVER)$(MINVER)
- 
- ##############################################################################
- #############################  COMPILER OPTIONS  #############################
-@@ -197,9 +197,9 @@ TARGET_LD= $(CROSS)$(CC)
- TARGET_AR= $(CROSS)ar rcus
- TARGET_STRIP= $(CROSS)strip
- 
-TARGET_SONAME= libluajit-$(ABIVER).so.$(MAJVER)
-TARGET_DYLIBNAME= libluajit-$(NODOTABIVER).$(MAJVER).$(MINVER).$(RELVER).dylib
-TARGET_DLLNAME= lua$(NODOTABIVER).dll
-+TARGET_SONAME= libluajit-$(SHORTVER).so.$(RELVER)
-+TARGET_DYLIBNAME= libluajit-$(NODOTSHORTVER).$(MAJVER).$(MINVER).$(RELVER).dylib
-+TARGET_DLLNAME= lua$(NODOTSHORTVER).dll
- TARGET_XSHLDFLAGS= -shared -fPIC -Wl,-soname,$(TARGET_SONAME)
- TARGET_DYNXLDOPTS=
- 
-@@ -451,10 +451,8 @@ endif
- endif
- endif
- 
-Q= @
-E= @echo
-#Q=
-#E= @:
-+Q=
-+E= @:
- 
- ##############################################################################
- # Make targets.
--- a/dev-lang/luajit/files/LuaJIT-2.0.0-gentoo.patch
+++ b/dev-lang/luajit/files/LuaJIT-2.0.0-gentoo.patch
@ -1,170 +0,0 @@
--- etc/luajit.pc
-+++ etc/luajit.pc
-@@ -3,13 +3,13 @@
- minver=0
- relver=0
- version=${majver}.${minver}.${relver}
-abiver=5.1
-+abiver=jit-5.1
- 
-prefix=/usr/local
-+prefix=/usr
- exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-+libdir=${exec_prefix}/@LIBDIR@
- libname=luajit-${abiver}
-includedir=${prefix}/include/luajit-${majver}.${minver}
-+includedir=${prefix}/include/luajit-@SHORTVER@
- 
- INSTALL_LMOD=${prefix}/share/lua/${abiver}
- INSTALL_CMOD=${prefix}/lib/lua/${abiver}
--- Makefile
-+++ Makefile
-@@ -17,23 +17,25 @@
- MINVER=  0
- RELVER=  0
- VERSION= $(MAJVER).$(MINVER).$(RELVER)
-ABIVER=  5.1
-+SHORTVER= $(MAJVER).$(MINVER)
-+ABIVER=  jit-$(SHORTVER)
-+NODOTSHORTVER=  $(MAJVER)$(MINVER)
- 
- ##############################################################################
- #
- # Change the installation path as needed. This automatically adjusts
- # the paths in src/luaconf.h, too. Note: PREFIX must be an absolute path!
- #
-export PREFIX= /usr/local
-+export PREFIX= /usr
- ##############################################################################
- 
- DPREFIX= $(DESTDIR)$(PREFIX)
- INSTALL_BIN=   $(DPREFIX)/bin
-INSTALL_LIB=   $(DPREFIX)/lib
-+INSTALL_LIB=   $(DPREFIX)/$(LIBDIR)
- INSTALL_SHARE= $(DPREFIX)/share
-INSTALL_INC=   $(DPREFIX)/include/luajit-$(MAJVER).$(MINVER)
-+INSTALL_INC=   $(DPREFIX)/include/luajit-$(SHORTVER)
- 
-INSTALL_LJLIBD= $(INSTALL_SHARE)/luajit-$(VERSION)
-+INSTALL_LJLIBD= $(INSTALL_SHARE)/luajit-$(SHORTVER)
- INSTALL_JITLIB= $(INSTALL_LJLIBD)/jit
- INSTALL_LMODD= $(INSTALL_SHARE)/lua
- INSTALL_LMOD= $(INSTALL_LMODD)/$(ABIVER)
-@@ -42,14 +44,14 @@
- INSTALL_MAN= $(INSTALL_SHARE)/man/man1
- INSTALL_PKGCONFIG= $(INSTALL_LIB)/pkgconfig
- 
-INSTALL_TNAME= luajit-$(VERSION)
-+INSTALL_TNAME= luajit-$(SHORTVER)
- INSTALL_TSYMNAME= luajit
-INSTALL_ANAME= libluajit-$(ABIVER).a
-INSTALL_SONAME= libluajit-$(ABIVER).so.$(MAJVER).$(MINVER).$(RELVER)
-INSTALL_SOSHORT= libluajit-$(ABIVER).so
-INSTALL_DYLIBNAME= libluajit-$(ABIVER).$(MAJVER).$(MINVER).$(RELVER).dylib
-INSTALL_DYLIBSHORT1= libluajit-$(ABIVER).dylib
-INSTALL_DYLIBSHORT2= libluajit-$(ABIVER).$(MAJVER).dylib
-+INSTALL_ANAME= libluajit-$(SHORTVER).a
-+INSTALL_SONAME= libluajit-$(SHORTVER).so.$(RELVER)
-+INSTALL_SOSHORT= libluajit-$(SHORTVER).so
-+INSTALL_DYLIBNAME= libluajit-$(NODOTSHORTVER).$(MAJVER).$(MINVER).$(RELVER).dylib
-+INSTALL_DYLIBSHORT1= libluajit-$(NODOTSHORTVER).dylib
-+INSTALL_DYLIBSHORT2= libluajit-$(NODOTSHORTVER).$(MAJVER).dylib
- INSTALL_PCNAME= luajit.pc
- 
- INSTALL_STATIC= $(INSTALL_LIB)/$(INSTALL_ANAME)
-@@ -58,7 +60,7 @@
- INSTALL_SHORT2= $(INSTALL_LIB)/$(INSTALL_SOSHORT)
- INSTALL_T= $(INSTALL_BIN)/$(INSTALL_TNAME)
- INSTALL_TSYM= $(INSTALL_BIN)/$(INSTALL_TSYMNAME)
-INSTALL_PC= $(INSTALL_PKGCONFIG)/$(INSTALL_PCNAME)
-+INSTALL_PC= $(INSTALL_PKGCONFIG)/luajit-$(SHORTVER).pc
- 
- INSTALL_DIRS= $(INSTALL_BIN) $(INSTALL_LIB) $(INSTALL_INC) $(INSTALL_MAN) \
-   $(INSTALL_PKGCONFIG) $(INSTALL_JITLIB) $(INSTALL_LMOD) $(INSTALL_CMOD)
-@@ -73,7 +75,7 @@
- INSTALL_F= install -m 0644
- UNINSTALL= $(RM)
- LDCONFIG= ldconfig -n
-SED_PC= sed -e "s|^prefix=.*|prefix=$(PREFIX)|"
-+SED_PC= sed -e "s|@SHORTVER@|$(SHORTVER)|" -e "s|@LIBDIR@|$(LIBDIR)|"
- 
- FILE_T= luajit
- FILE_A= libluajit.a
-@@ -113,7 +115,7 @@
- 	  $(LDCONFIG) $(INSTALL_LIB) && \
- 	  $(SYMLINK) $(INSTALL_SONAME) $(INSTALL_SHORT1) && \
- 	  $(SYMLINK) $(INSTALL_SONAME) $(INSTALL_SHORT2) || :
-	cd etc && $(INSTALL_F) $(FILE_MAN) $(INSTALL_MAN)
-+	cd etc && $(INSTALL_F) $(FILE_MAN) $(INSTALL_MAN)/luajit-$(SHORTVER).1
- 	cd etc && $(SED_PC) $(FILE_PC) > $(FILE_PC).tmp && \
- 	  $(INSTALL_F) $(FILE_PC).tmp $(INSTALL_PC) && \
- 	  $(RM) $(FILE_PC).tmp
--- src/luaconf.h
-+++ src/luaconf.h
-@@ -26,16 +26,16 @@
- ** Note to distribution maintainers: do NOT patch the following line!
- ** Please read ../doc/install.html#distro and pass PREFIX=/usr instead.
- */
-#define LUA_ROOT	"/usr/local/"
-#define LUA_LDIR	LUA_ROOT "share/lua/5.1/"
-#define LUA_CDIR	LUA_ROOT "lib/lua/5.1/"
-+#define LUA_ROOT	"/usr/"
-+#define LUA_LDIR	LUA_ROOT "share/lua/jit-2.0/"
-+#define LUA_CDIR	LUA_ROOT "lib/lua/jit-2.0/"
- #ifdef LUA_XROOT
-#define LUA_JDIR	LUA_XROOT "share/luajit-2.0.0/"
-+#define LUA_JDIR	LUA_XROOT "share/luajit-2.0/"
- #define LUA_XPATH \
-  ";" LUA_XROOT "share/lua/5.1/?.lua;" LUA_XROOT "share/lua/5.1/?/init.lua"
-#define LUA_XCPATH	LUA_XROOT "lib/lua/5.1/?.so;"
-+  ";" LUA_XROOT "share/lua/5.1/?.lua;" LUA_XROOT "share/lua/jit-2.0/?/init.lua"
-+#define LUA_XCPATH	LUA_XROOT "lib/lua/jit-2.0/?.so;"
- #else
-#define LUA_JDIR	LUA_ROOT "share/luajit-2.0.0/"
-+#define LUA_JDIR	LUA_ROOT "share/luajit-2.0/"
- #define LUA_XPATH
- #define LUA_XCPATH
- #endif
--- src/Makefile
-+++ src/Makefile
-@@ -13,8 +13,9 @@
- MAJVER=  2
- MINVER=  0
- RELVER=  0
-ABIVER=  5.1
-NODOTABIVER= 51
-+SHORTVER= $(MAJVER).$(MINVER)
-+NODOTSHORTVER=  $(MAJVER)$(MINVER)
-+LIBDIR ?= lib
- 
- ##############################################################################
- #############################  COMPILER OPTIONS  #############################
-@@ -188,10 +189,10 @@
- TARGET_AR= $(CROSS)ar rcus
- TARGET_STRIP= $(CROSS)strip
- 
-TARGET_SONAME= libluajit-$(ABIVER).so.$(MAJVER)
-TARGET_DYLIBNAME= libluajit-$(ABIVER).$(MAJVER).dylib
-TARGET_DYLIBPATH= $(or $(PREFIX),/usr/local)/lib/$(TARGET_DYLIBNAME)
-TARGET_DLLNAME= lua$(NODOTABIVER).dll
-+TARGET_SONAME= libluajit-$(SHORTVER).so.$(RELVER)
-+TARGET_DYLIBNAME= libluajit-$(NODOTSHORTVER).$(MAJVER).$(MINVER).$(RELVER).dylib
-+TARGET_DYLIBPATH= $(or $(PREFIX),/usr/local)/$(LIBDIR)/$(TARGET_DYLIBNAME)
-+TARGET_DLLNAME= lua$(NODOTSHORTVER).dll
- TARGET_XSHLDFLAGS= -shared -fPIC -Wl,-soname,$(TARGET_SONAME)
- TARGET_DYNXLDOPTS=
- 
-@@ -549,10 +550,8 @@
- endif
- endif
- 
-Q= @
-E= @echo
-#Q=
-#E= @:
-+Q=
-+E= @:
- 
- ##############################################################################
- # Make targets.
--- a/dev-lang/luajit/luajit-2.0.0.ebuild
+++ b/dev-lang/luajit/luajit-2.0.0.ebuild
@ -1,69 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/luajit/luajit-2.0.0.ebuild,v 1.2 2013/03/05 21:54:23 bicatali Exp $
-
-EAPI=5
-
-inherit eutils multilib pax-utils versionator toolchain-funcs
-
-MY_P="LuaJIT-$(get_version_component_range 1-3)"
-if [[ $(get_version_component_range 4) != "" ]]; then
-	HOTFIX="$(get_version_component_range 3-4)"
-	HOTFIX="${HOTFIX/_p/_hotfix}.patch"
-fi
-
-DESCRIPTION="Just-In-Time Compiler for the Lua programming language"
-HOMEPAGE="http://luajit.org/"
-SRC_URI="http://luajit.org/download/${MY_P}.tar.gz
-	${HOTFIX:+http://luajit.org/download/${HOTFIX}}"
-
-LICENSE="MIT"
-# this should probably be pkgmoved to 2.0 for sake of consistency.
-SLOT="2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare(){
-	if [[ -n ${HOTFIX} ]]; then
-		epatch "${DISTDIR}/${HOTFIX}"
-	fi
-
-	epatch "${FILESDIR}"/${MY_P}-gentoo.patch
-	sed -i \
-		-e "s:/usr:${EPREFIX}/usr:g" \
-		etc/luajit.pc Makefile src/luaconf.h src/Makefile || die
-
-}
-
-src_compile() {
-	emake \
-		DESTDIR="${D}" \
-		HOST_CC="$(tc-getBUILD_CC)" \
-		STATIC_CC="$(tc-getCC)" \
-		DYNAMIC_CC="$(tc-getCC) -fPIC" \
-		TARGET_LD="$(tc-getCC)" \
-		TARGET_AR="$(tc-getAR) rcus" \
-		TARGET_STRIP="true" \
-		LDCONFIG="true" \
-		LIBDIR="$(get_libdir)"
-}
-
-src_install(){
-	emake install \
-		DESTDIR="${D}" \
-		HOST_CC="$(tc-getBUILD_CC)" \
-		STATIC_CC="$(tc-getCC)" \
-		DYNAMIC_CC="$(tc-getCC) -fPIC" \
-		TARGET_LD="$(tc-getCC)" \
-		TARGET_AR="$(tc-getAR) rcus" \
-		TARGET_STRIP="true" \
-		LDCONFIG="true" \
-		LIBDIR="$(get_libdir)"
-
-	pax-mark m "${ED}usr/bin/luajit-2.0"
-
-	cd "${S}"/doc
-	dohtml -r *
-}
--- a/dev-lang/luajit/luajit-2.0.0_beta10.ebuild
+++ b/dev-lang/luajit/luajit-2.0.0_beta10.ebuild
@ -1,65 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/luajit/luajit-2.0.0_beta10.ebuild,v 1.1 2012/05/13 20:37:14 rafaelmartins Exp $
-
-EAPI="4"
-
-inherit eutils multilib pax-utils versionator toolchain-funcs
-
-MY_P="LuaJIT-$(get_version_component_range 1-3)-$(get_version_component_range 4)"
-if [[ $(get_version_component_range 5) != "" ]]; then
-	HOTFIX="$(get_version_component_range 4-5)"
-	HOTFIX="${HOTFIX/_p/_hotfix}.patch"
-fi
-
-DESCRIPTION="Just-In-Time Compiler for the Lua programming language"
-HOMEPAGE="http://luajit.org/"
-SRC_URI="http://luajit.org/download/${MY_P}.tar.gz
-	${HOTFIX:+http://luajit.org/download/${HOTFIX}}"
-
-LICENSE="MIT"
-# this should probably be pkgmoved to 2.0 for sake of consistency.
-SLOT="2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare(){
-	if [[ -n ${HOTFIX} ]]; then
-		epatch "${DISTDIR}/${HOTFIX}"
-	fi
-
-	epatch "${FILESDIR}"/${MY_P}-gentoo.patch
-}
-
-src_compile() {
-	emake \
-		DESTDIR="${D}" \
-		HOST_CC="$(tc-getBUILD_CC)" \
-		STATIC_CC="$(tc-getCC)" \
-		DYNAMIC_CC="$(tc-getCC) -fPIC" \
-		TARGET_LD="$(tc-getCC)" \
-		TARGET_AR="$(tc-getAR) rcus" \
-		TARGET_STRIP="true" \
-		LDCONFIG="true" \
-		LIBDIR="$(get_libdir)"
-}
-
-src_install(){
-	emake install \
-		DESTDIR="${D}" \
-		HOST_CC="$(tc-getBUILD_CC)" \
-		STATIC_CC="$(tc-getCC)" \
-		DYNAMIC_CC="$(tc-getCC) -fPIC" \
-		TARGET_LD="$(tc-getCC)" \
-		TARGET_AR="$(tc-getAR) rcus" \
-		TARGET_STRIP="true" \
-		LDCONFIG="true" \
-		LIBDIR="$(get_libdir)"
-
-	pax-mark m "${D}usr/bin/luajit-2.0"
-
-	cd "${S}"/doc
-	dohtml -r *
-}
--- a/dev-lang/luajit/luajit-2.0.0_beta7.ebuild
+++ b/dev-lang/luajit/luajit-2.0.0_beta7.ebuild
@ -1,45 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/luajit/luajit-2.0.0_beta7.ebuild,v 1.2 2013/05/28 01:14:05 rafaelmartins Exp $
-
-EAPI="2"
-
-inherit eutils multilib pax-utils
-
-MY_P="LuaJIT-${PV/_/-}"
-
-DESCRIPTION="Just-In-Time Compiler for the Lua programming language"
-HOMEPAGE="http://luajit.org/"
-SRC_URI="http://luajit.org/download/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare(){
-	# fixing prefix and version
-	sed -i -e "s|/usr/local|/usr|" \
-		-e "s|/lib|/$(get_libdir)|" \
-		-e "s|VERSION=.*|VERSION= ${PV}|" \
-		Makefile || die "failed to fix prefix in Makefile"
-	sed -i -e 's|/usr/local|/usr|' \
-		-e "s|lib/|$(get_libdir)/|" \
-		src/luaconf.h || die "failed to fix prefix in luaconf.h"
-
-	# removing strip
-	sed -i -e '/$(Q)$(TARGET_STRIP)/d' src/Makefile \
-		|| die "failed to remove forced strip"
-}
-
-src_compile() {
-	emake Q=
-}
-
-src_install(){
-	emake DESTDIR="${D}" install
-	pax-mark m "${D}usr/bin/luajit-${PV}"
-	dosym "luajit-${PV}" "/usr/bin/luajit-${SLOT}"
-}
--- a/dev-lang/luajit/luajit-2.0.0_beta8_p1.ebuild
+++ b/dev-lang/luajit/luajit-2.0.0_beta8_p1.ebuild
@ -1,65 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/luajit/luajit-2.0.0_beta8_p1.ebuild,v 1.1 2011/10/30 21:21:57 flameeyes Exp $
-
-EAPI="4"
-
-inherit eutils multilib pax-utils versionator toolchain-funcs
-
-MY_P="LuaJIT-$(get_version_component_range 1-3)-$(get_version_component_range 4)"
-if [[ $(get_version_component_range 5) != "" ]]; then
-	HOTFIX="$(get_version_component_range 4-5)"
-	HOTFIX="${HOTFIX/_p/_hotfix}.patch"
-fi
-
-DESCRIPTION="Just-In-Time Compiler for the Lua programming language"
-HOMEPAGE="http://luajit.org/"
-SRC_URI="http://luajit.org/download/${MY_P}.tar.gz
-	${HOTFIX:+http://luajit.org/download/${HOTFIX}}"
-
-LICENSE="MIT"
-# this should probably be pkgmoved to 2.0 for sake of consistency.
-SLOT="2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare(){
-	if [[ -n ${HOTFIX} ]]; then
-		epatch "${DISTDIR}/${HOTFIX}"
-	fi
-
-	epatch "${FILESDIR}"/${MY_P}-gentoo.patch
-}
-
-src_compile() {
-	emake \
-		DESTDIR="${D}" \
-		HOST_CC="$(tc-getBUILD_CC)" \
-		STATIC_CC="$(tc-getCC)" \
-		DYNAMIC_CC="$(tc-getCC) -fPIC" \
-		TARGET_LD="$(tc-getCC)" \
-		TARGET_AR="$(tc-getAR) rcus" \
-		TARGET_STRIP="true" \
-		LDCONFIG="true" \
-		LIBDIR="$(get_libdir)"
-}
-
-src_install(){
-	emake install \
-		DESTDIR="${D}" \
-		HOST_CC="$(tc-getBUILD_CC)" \
-		STATIC_CC="$(tc-getCC)" \
-		DYNAMIC_CC="$(tc-getCC) -fPIC" \
-		TARGET_LD="$(tc-getCC)" \
-		TARGET_AR="$(tc-getAR) rcus" \
-		TARGET_STRIP="true" \
-		LDCONFIG="true" \
-		LIBDIR="$(get_libdir)"
-
-	pax-mark m "${D}usr/bin/luajit-2.0"
-
-	cd "${S}"/doc
-	dohtml -r *
-}
--- a/dev-lang/perl/perl-5.20.1-r4.ebuild
+++ b/dev-lang/perl/perl-5.20.1-r4.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.20.1-r4.ebuild,v 1.6 2015/02/15 10:48:01 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.20.1-r4.ebuild,v 1.7 2015/02/16 09:20:09 ago Exp $

 EAPI=5

@ -27,7 +27,7 @@ HOMEPAGE="http://www.perl.org/"

 LICENSE="|| ( Artistic GPL-1+ )"
 SLOT="0/${SHORT_PV}"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="berkdb debug doc gdbm ithreads"

 RDEPEND="
--- a/dev-lang/php/php-5.4.37.ebuild
+++ b/dev-lang/php/php-5.4.37.ebuild
@ -1,12 +1,12 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.4.37.ebuild,v 1.6 2015/02/01 21:02:40 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.4.37.ebuild,v 1.7 2015/02/16 10:20:27 ago Exp $

 EAPI=5

 inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool systemd

-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"

 function php_get_uri ()
 {
--- a/dev-lang/php/php-5.5.21.ebuild
+++ b/dev-lang/php/php-5.5.21.ebuild
@ -1,12 +1,12 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.5.21.ebuild,v 1.6 2015/02/01 21:02:40 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.5.21.ebuild,v 1.7 2015/02/16 10:20:27 ago Exp $

 EAPI=5

 inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool systemd

-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"

 function php_get_uri ()
 {
--- a/dev-libs/c-blosc/c-blosc-1.3.5.ebuild
+++ b/dev-libs/c-blosc/c-blosc-1.3.5.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/c-blosc/c-blosc-1.3.5.ebuild,v 1.2 2014/06/27 18:07:30 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/c-blosc/c-blosc-1.3.5.ebuild,v 1.3 2015/02/16 15:44:52 pacho Exp $

 EAPI=5

@ -13,7 +13,7 @@ SRC_URI="https://github.com/Blosc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT"

 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"

 IUSE="hdf5 +lz4 +snappy static-libs test zlib"

--- a/dev-libs/fcgi/fcgi-2.4.1_pre0910052249-r2.ebuild
+++ b/dev-libs/fcgi/fcgi-2.4.1_pre0910052249-r2.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/fcgi/fcgi-2.4.1_pre0910052249-r2.ebuild,v 1.4 2015/02/15 15:07:57 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/fcgi/fcgi-2.4.1_pre0910052249-r2.ebuild,v 1.5 2015/02/16 10:19:47 ago Exp $

 EAPI="4"

@ -12,7 +12,7 @@ SRC_URI="http://www.fastcgi.com/dist/fcgi-2.4.1-SNAP-0910052249.tar.gz"

 LICENSE="FastCGI"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="html"

 DEPEND=""
--- a/dev-libs/icu/icu-54.1-r1.ebuild
+++ b/dev-libs/icu/icu-54.1-r1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/icu/icu-54.1-r1.ebuild,v 1.3 2015/02/15 14:57:51 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/icu/icu-54.1-r1.ebuild,v 1.5 2015/02/16 10:20:20 ago Exp $

 EAPI=5

@ -14,7 +14,7 @@ LICENSE="BSD"

 SLOT="0/54a"

-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="debug doc examples static-libs"

 DEPEND="
--- a/dev-libs/libtommath/Manifest
+++ b/dev-libs/libtommath/Manifest
@ -1 +1 @@
-DIST ltm-0.42.0.tar.bz2 1968961 SHA256 7b5c258304c34ac5901cfddb9f809b9b3b8ac7d04f700cf006ac766a923eb217 SHA512 c5bb26a260477de4e9abee9f65735754efa69c39c89caa3a06dd8ad3eda9d27fff687a432e91e3410b2bcc6a9e3d59921b6cdf6ca7f1ca6c69ed199a002e5790 WHIRLPOOL dd9879213b64d64f70620f98edfd027565a9cdf68dea03e427b0c1055f58347aa2ce9ad6f29b854b6aa50631e68bef29adc882d9db28cc73cb033ea6f3cae98f
+DIST v0.42.0.tar.gz 1732144 SHA256 5246356ba18c1b6edf4a7bc836a3d223842b86914cdba6dd8c112bfc59e227c8 SHA512 d26e7737e5750530a7b96432502f0d458931e67af528872c46ad8dfc921b8f6ef4b3e05cb07d22bd13a8b24db65812928ae4c381250a4df95f6ca55efc3dae23 WHIRLPOOL beab5007a204042fd0a5b86ccc639ee37d82bb4afe2ceebcfe062deffaa259c8a699c81a52e804c2a79cb36914d805c81826a6e456523f729063240d1bfca9e6
--- a/dev-libs/libtommath/libtommath-0.42.0-r1.ebuild
+++ b/dev-libs/libtommath/libtommath-0.42.0-r1.ebuild
@ -1,14 +1,14 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libtommath/libtommath-0.42.0-r1.ebuild,v 1.19 2013/08/16 13:30:06 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libtommath/libtommath-0.42.0-r1.ebuild,v 1.20 2015/02/17 01:30:59 idella4 Exp $

 EAPI=4

 inherit autotools eutils multilib toolchain-funcs

 DESCRIPTION="highly optimized and portable routines for integer based number theoretic applications"
-HOMEPAGE="http://www.libtom.org/"
-SRC_URI="http://www.libtom.org/files/ltm-${PV}.tar.bz2"
+HOMEPAGE="https://github.com/libtom/libtommath"
+SRC_URI="https://github.com/libtom/libtommath/archive/v${PV}.tar.gz"

 LICENSE="WTFPL-2"
 SLOT="0"
--- a/dev-libs/libuv/Manifest
+++ b/dev-libs/libuv/Manifest
@ -4,3 +4,4 @@ DIST libuv-0.11.27.tar.gz 478508 SHA256 68ffa82ef2b894df5d6e530cc70735fa3633857b
 DIST libuv-0.11.29.tar.gz 486768 SHA256 fac45e72c2df30ddc9cbdf5002fc1363281d0e433831e3d43acb1036c2cabfc6 SHA512 91439c47b3af90a71c15ffcaf296b515c2723b2a4cd329b529b6d37a4d05d12bdf6ad6bca87079d17c9b79aab02634afddbcf53c70afcc1765dcaf49b9dd28b2 WHIRLPOOL d010c5f6e3c1a4262195b50087bc3408c6df726adbcd23abc27cf64ec1da6b159049a6d4f9d46c3cebaaa333b667cefe339d4fec6b1379a38940ee7f4376ec40
 DIST libuv-1.1.0.tar.gz 1010640 SHA256 e4ff513c18a6322898972b0b6ce986445bcd2c13710f4a46b10baf80b28599cf SHA512 2d801b8b12e6f9b179f62084d1c260b6443ae34523c12dbea8317ff34aa0a76f3df2ee38fb161aa6fd4092b6280a53c7ed599d04eb7ed0d250c1e60b4e584dea WHIRLPOOL 6d6b3eea2ddb54322d20125f1a0a61b8a00b1771ccb8bc0d7829229cabb3e363adc6f85b2d1ae2f506410a543c92404df9f545a57805ac278fab560d5a24de5e
 DIST libuv-1.2.1.tar.gz 1014032 SHA256 4c4fb49172d6dc59168a934bc128eb4a001e4a2091c2fe9a20d81c720f2caa30 SHA512 0cd21ce1ad006e2448b166dde1ccc863c27a0465d6ed449abe438ae7916172b9154ad028efc684b2819386f9a330eb36652607f1926d6a74cab0518739ca40cd WHIRLPOOL 1785583121c34116d492b54b51bbb46285d15f118410358d66b50d3a7478fe266548c3e28b17cffb5abff5e4c5828a6f36177f8ef5733f4a94625ef1a9096b08
+DIST libuv-1.4.0.tar.gz 1017114 SHA256 fbb26b0384cae834b987c58e4c703b84b3d0f88445989877b8b594294f42fbc9 SHA512 e12313b6b0bd52a25e1a31d33fc71d2307f43688e6ca16146962a1c8e139a0b9f21451c46bf5704489213b53f2c307a4e332ab6ee3e720625f3fe0fd48bf7d14 WHIRLPOOL dce2d9c2238a9dceb61cd82828356d5688d51389d127954ad224da08bd48b81965fcf58cfa98b9dbfc1fb6af7c212b073081eaa6ea01e1945ef358fdfb27c095
--- a/dev-libs/libuv/libuv-1.4.0.ebuild
+++ b/dev-libs/libuv/libuv-1.4.0.ebuild
@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libuv/libuv-1.4.0.ebuild,v 1.1 2015/02/16 17:47:07 hasufell Exp $
+
+EAPI=5
+
+inherit eutils autotools multilib-minimal
+
+DESCRIPTION="Cross-platform asychronous I/O"
+HOMEPAGE="https://github.com/libuv/libuv"
+SRC_URI="https://github.com/libuv/libuv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD BSD-2 ISC MIT"
+SLOT="0/1"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="static-libs"
+
+DEPEND="
+	sys-devel/libtool
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	echo "m4_define([UV_EXTRA_AUTOMAKE_FLAGS], [serial-tests])" \
+		> m4/libuv-extra-automake-flags.m4 || die
+
+	sed -i \
+		-e '/CC_CHECK_CFLAGS_APPEND(\[-g\])/d' \
+		configure.ac || die "fixing CFLAGS failed!"
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable static-libs static)
+}
+
+multilib_src_test() {
+	mkdir "${BUILD_DIR}"/test || die
+	cp -pPR "${S}"/test/fixtures "${BUILD_DIR}"/test/fixtures || die
+	default
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	prune_libtool_files
+}
--- a/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.3.13.ebuild
+++ b/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.3.13.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.3.13.ebuild,v 1.1 2015/01/14 20:12:53 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.3.13.ebuild,v 1.2 2015/02/16 21:48:02 grknight Exp $

 EAPI="5"

@ -14,10 +14,11 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE=""
 SRC_URI="http://pear.php.net/get/${MY_P}.tgz"
-DEPEND="dev-lang/php[pcre(+)]
+DEPEND="dev-lang/php:*[pcre(+)]
 		>=dev-php/PEAR-PEAR-1.8.1
 "
-RDEPEND="${DEPEND}"
+RDEPEND="dev-lang/php:*[bzip2,posix,zlib]
+	${DEPEND}"
 PDEPEND="dev-php/pear"
 HOMEPAGE="http://pear.php.net/package/Archive_Tar"

--- a/dev-php/pecl-drizzle/files/pecl-drizzle-0.4.2-php54.patch
+++ b/dev-php/pecl-drizzle/files/pecl-drizzle-0.4.2-php54.patch
@ -0,0 +1,73 @@
+diff -aurN drizzle-0.4.2.orig/php_drizzle.c drizzle-0.4.2/php_drizzle.c
+--- drizzle-0.4.2.orig/php_drizzle.c	1970-01-01 04:13:08.000000000 -0500
+++ drizzle-0.4.2/php_drizzle.c	2014-10-22 21:38:21.882838493 -0400
+@@ -1314,9 +1314,13 @@
+ 	}
+ 
+ 	zend_object_std_init(&(obj->std), class_type TSRMLS_CC);
+#if PHP_VERSION_ID < 50399
+ 	zend_hash_copy(obj->std.properties, &(class_type->default_properties),
+ 	              (copy_ctor_func_t)zval_add_ref, (void *)(&tmp),
+ 	               sizeof(zval *));
+#else
+	object_properties_init((zend_object*) &(obj->std), class_type);
+#endif
+ 
+ 	value.handle= zend_objects_store_put(obj,
+ 	                   (zend_objects_store_dtor_t)zend_objects_destroy_object,
+@@ -1582,9 +1586,13 @@
+ 	}
+ 
+ 	zend_object_std_init(&(obj->std), class_type TSRMLS_CC);
+#if PHP_VERSION_ID < 50399
+ 	zend_hash_copy(obj->std.properties, &(class_type->default_properties),
+ 	               (copy_ctor_func_t)zval_add_ref, (void *)(&tmp),
+ 	               sizeof(zval *));
+#else
+	object_properties_init((zend_object*) &(obj->std), class_type);
+#endif
+ 
+ 	obj->value.handle= zend_objects_store_put(obj,
+ 	                  (zend_objects_store_dtor_t)zend_objects_destroy_object,
+@@ -2505,9 +2513,13 @@
+ 	}
+ 
+ 	zend_object_std_init(&(obj->std), class_type TSRMLS_CC);
+#if PHP_VERSION_ID < 50399
+ 	zend_hash_copy(obj->std.properties, &(class_type->default_properties),
+ 	               (copy_ctor_func_t)zval_add_ref, (void *)(&tmp),
+ 	               sizeof(zval *));
+#else
+	object_properties_init((zend_object*) &(obj->std), class_type);
+#endif
+ 
+ 	obj->value.handle= zend_objects_store_put(obj,
+ 	               (zend_objects_store_dtor_t)zend_objects_destroy_object,
+@@ -3017,9 +3029,13 @@
+ 	}
+ 
+ 	zend_object_std_init(&(result->std), class_type TSRMLS_CC);
+#if PHP_VERSION_ID < 50399
+ 	zend_hash_copy(result->std.properties, &(class_type->default_properties),
+ 	               (copy_ctor_func_t)zval_add_ref, (void *)(&tmp),
+ 	               sizeof(zval *));
+#else
+	object_properties_init((zend_object*) &(result->std), class_type);
+#endif
+ 
+ 	value.handle= zend_objects_store_put(result,
+ 	              (zend_objects_store_dtor_t)zend_objects_destroy_object,
+@@ -3382,9 +3398,13 @@
+ 	}
+ 
+ 	zend_object_std_init(&(obj->std), class_type TSRMLS_CC);
+#if PHP_VERSION_ID < 50399
+ 	zend_hash_copy(obj->std.properties, &(class_type->default_properties),
+ 	               (copy_ctor_func_t)zval_add_ref, (void *)(&tmp),
+ 	               sizeof(zval *));
+#else
+	object_properties_init((zend_object*) &(obj->std), class_type);
+#endif
+ 
+ 	value.handle= zend_objects_store_put(obj,
+ 	             (zend_objects_store_dtor_t)zend_objects_destroy_object,
--- a/dev-php/pecl-drizzle/pecl-drizzle-0.4.2-r2.ebuild
+++ b/dev-php/pecl-drizzle/pecl-drizzle-0.4.2-r2.ebuild
@ -1,21 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/pecl-drizzle/pecl-drizzle-0.4.2-r2.ebuild,v 1.2 2012/08/23 15:59:13 olemarkus Exp $
-
-EAPI="4"
-
-PHP_EXT_NAME="drizzle"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-
-inherit php-ext-pecl-r2
-
-KEYWORDS="~amd64"
-
-DESCRIPTION="PHP extension using libdrizzle library to provide communcation with Drizzle and MySQL databases"
-LICENSE="PHP-3"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-db/drizzle"
-RDEPEND="${DEPEND}"
--- a/dev-php/pecl-drizzle/pecl-drizzle-0.4.2-r3.ebuild
+++ b/dev-php/pecl-drizzle/pecl-drizzle-0.4.2-r3.ebuild
@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php/pecl-drizzle/pecl-drizzle-0.4.2-r3.ebuild,v 1.1 2015/02/17 01:07:11 grknight Exp $
+
+EAPI="5"
+
+PHP_EXT_NAME="drizzle"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+
+USE_PHP="php5-6 php5-5 php5-4"
+
+inherit php-ext-pecl-r2 eutils
+
+KEYWORDS="~amd64"
+
+DESCRIPTION="PHP extension using libdrizzle library to provide communcation with Drizzle and MySQL databases"
+LICENSE="PHP-3"
+SLOT="0"
+IUSE=""
+
+DEPEND="dev-db/drizzle"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	local slot orig_s="${PHP_EXT_S}"
+	for slot in $(php_get_slots); do
+		php_init_slot_env ${slot}
+		epatch "${FILESDIR}/${P}-php54.patch"
+		#Fix tests
+		mkdir ext || die
+		mv drizzle_*.phpt ext || die
+	done
+	php-ext-source-r2_src_prepare
+}
--- a/dev-php/pecl-memcached/files/pecl-memcached-1.0.2-php54_zend.patch
+++ b/dev-php/pecl-memcached/files/pecl-memcached-1.0.2-php54_zend.patch
@ -0,0 +1,15 @@
+--- a/php_memcached.c	1970-01-01 04:13:08.000000000 -0500
+++ b/php_memcached.c	2015-02-16 20:46:34.849201777 -0500
+@@ -1862,8 +1862,11 @@
+ 
+     i_obj = ecalloc(1, sizeof(*i_obj));
+ 	zend_object_std_init( &i_obj->zo, ce TSRMLS_CC );
+#if PHP_VERSION_ID < 50399
+     zend_hash_copy(i_obj->zo.properties, &ce->default_properties, (copy_ctor_func_t) zval_add_ref, (void *) &tmp, sizeof(zval *));
+-
+#else
+    object_properties_init((zend_object*) &(i_obj->zo), ce);
+#endif
+ 	i_obj->compression = 1;
+ 
+     retval.handle = zend_objects_store_put(i_obj, (zend_objects_store_dtor_t)zend_objects_destroy_object, (zend_objects_free_object_storage_t)php_memc_free_storage, NULL TSRMLS_CC);
--- a/dev-php/pecl-memcached/pecl-memcached-1.0.2-r2.ebuild
+++ b/dev-php/pecl-memcached/pecl-memcached-1.0.2-r2.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/pecl-memcached/pecl-memcached-1.0.2-r1.ebuild,v 1.3 2013/03/05 09:42:16 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/pecl-memcached/pecl-memcached-1.0.2-r2.ebuild,v 1.1 2015/02/17 02:09:16 grknight Exp $

 EAPI="5"
 PHP_EXT_NAME="memcached"
@ -8,9 +8,11 @@ PHP_EXT_INI="yes"
 PHP_EXT_ZENDEXT="no"
 DOCS="README"

+USE_PHP="php5-5 php5-4"
+
 inherit php-ext-pecl-r2

-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"

 DESCRIPTION="PHP extension for interfacing with memcached via libmemcached library"
 LICENSE="PHP-3"
@ -18,9 +20,18 @@ SLOT="0"
 IUSE="+session"

 DEPEND=">=dev-libs/libmemcached-0.38 sys-libs/zlib
-		dev-lang/php[session?]"
+		dev-lang/php:*[session?]"
 RDEPEND="${DEPEND}"

+src_prepare() {
+	local slot orig_s="${PHP_EXT_S}"
+	for slot in $(php_get_slots); do
+		php_init_slot_env ${slot}
+		epatch "${FILESDIR}/${P}-php54_zend.patch"
+	done
+	php-ext-source-r2_src_prepare
+}
+
 src_configure() {
 	my_conf="--enable-memcached
 		--with-zlib-dir=/usr
--- a/dev-php/pecl-memcached/pecl-memcached-2.1.0-r1.ebuild
+++ b/dev-php/pecl-memcached/pecl-memcached-2.1.0-r1.ebuild
@ -1,34 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/pecl-memcached/pecl-memcached-2.1.0-r1.ebuild,v 1.1 2012/09/05 11:27:22 olemarkus Exp $
-
-EAPI="4"
-PHP_EXT_NAME="memcached"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-DOCS="README"
-
-USE_PHP="php5-3 php5-4"
-
-inherit php-ext-pecl-r2
-
-KEYWORDS="~amd64 ~x86"
-
-DESCRIPTION="PHP extension for interfacing with memcached via libmemcached library"
-LICENSE="PHP-3"
-SLOT="0"
-IUSE="+session igbinary"
-
-DEPEND=">=dev-libs/libmemcached-1.0 sys-libs/zlib
-		dev-lang/php[session?]
-		igbinary? ( dev-php/igbinary[php_targets_php5-4?,php_targets_php5-3?] )"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	my_conf="--enable-memcached
-		--with-zlib-dir=/usr
-		$(use_enable session memcached-session)
-		$(use_enable igbinary memcached-igbinary)"
-
-	php-ext-source-r2_src_configure
-}
--- a/dev-python/PyQt4/PyQt4-4.11.1.ebuild
+++ b/dev-python/PyQt4/PyQt4-4.11.1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.11.1.ebuild,v 1.11 2015/02/14 14:38:09 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.11.1.ebuild,v 1.12 2015/02/16 08:34:25 ago Exp $

 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
@ -20,7 +20,7 @@ fi

 LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~ia64 ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"

 IUSE="X dbus debug declarative designer doc examples help kde multimedia opengl phonon script scripttools sql svg webkit xmlpatterns"
 REQUIRED_USE="
--- a/dev-python/alabaster/alabaster-0.6.3.ebuild
+++ b/dev-python/alabaster/alabaster-0.6.3.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/alabaster/alabaster-0.6.3.ebuild,v 1.1 2015/01/25 08:27:22 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/alabaster/alabaster-0.6.3.ebuild,v 1.2 2015/02/16 13:58:46 pacho Exp $

 EAPI="5"
 PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
@ -12,7 +12,7 @@ HOMEPAGE="https://github.com/bitprophet/alabaster"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"

 LICENSE="BSD"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 SLOT="0"

 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
--- a/dev-python/basemap/basemap-1.0.7-r1.ebuild
+++ b/dev-python/basemap/basemap-1.0.7-r1.ebuild
@ -1,12 +1,12 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/basemap/basemap-1.0.7-r1.ebuild,v 1.1 2015/02/15 09:19:53 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/basemap/basemap-1.0.7-r1.ebuild,v 1.2 2015/02/16 14:49:29 idella4 Exp $

 EAPI=5

 PYTHON_COMPAT=( python2_7 )

-inherit distutils-r1
+inherit distutils-r1 flag-o-matic

 DESCRIPTION="matplotlib toolkit to plot map projections"
 HOMEPAGE="http://matplotlib.sourceforge.net/basemap/doc/html/ http://pypi.python.org/pypi/basemap"
@ -47,6 +47,7 @@ src_prepare() {
 		-e "/_datadir.*=.*join/s|\(.*datadir.*=\).*|\1'${EROOT}usr/share/${PN}'|g" \
 		"${S}"/lib/mpl_toolkits/basemap/*.py || die
 	distutils-r1_src_prepare
+	append-flags -fno-strict-aliasing
 }

 #src_test() {
--- a/dev-python/bottleneck/bottleneck-0.8.0.ebuild
+++ b/dev-python/bottleneck/bottleneck-0.8.0.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/bottleneck/bottleneck-0.8.0.ebuild,v 1.3 2014/12/01 12:08:51 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/bottleneck/bottleneck-0.8.0.ebuild,v 1.4 2015/02/16 15:00:10 pacho Exp $

 EAPI=5

@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/B/${MY_PN}/${MY_P}.tar.gz"

 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE=""

 RDEPEND="
--- a/dev-python/cython/cython-0.21.1.ebuild
+++ b/dev-python/cython/cython-0.21.1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/cython/cython-0.21.1.ebuild,v 1.4 2015/01/01 01:25:30 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cython/cython-0.21.1.ebuild,v 1.5 2015/02/16 09:50:21 pacho Exp $

 EAPI=5

@ -17,7 +17,7 @@ SRC_URI="http://www.cython.org/release/${MY_P}.tar.gz"

 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="doc test"

 RDEPEND=""
--- a/dev-python/fabric/fabric-1.10.0-r1.ebuild
+++ b/dev-python/fabric/fabric-1.10.0-r1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/fabric/fabric-1.10.0-r1.ebuild,v 1.2 2015/02/07 06:20:19 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/fabric/fabric-1.10.0-r1.ebuild,v 1.3 2015/02/16 14:01:36 pacho Exp $

 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc test"

 RDEPEND="
--- a/dev-python/fudge/fudge-0.9.6-r1.ebuild
+++ b/dev-python/fudge/fudge-0.9.6-r1.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/fudge/fudge-0.9.6-r1.ebuild,v 1.3 2014/03/31 20:53:37 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/fudge/fudge-0.9.6-r1.ebuild,v 1.4 2015/02/16 14:01:12 pacho Exp $

 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy pypy2_0 )
@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"

 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc test"

 RDEPEND=""
--- a/dev-python/hacking/Manifest
+++ b/dev-python/hacking/Manifest
@ -1,2 +1,3 @@
+DIST hacking-0.10.1.tar.gz 39768 SHA256 ab5dd17d927f0f980e759a33454e2471587e5650be48222f35f79996f472c016 SHA512 46529b33c4e6ac6e379d6c69d26650d31968c5e9c8313e525abc62966b1317aac9b99ef09b57ab30b8b43e63f3f55e6fe3175bd68f18433c9a29dfdadda1d945 WHIRLPOOL ac5360643b5f9133bbd7677472156b6a69d926288e24f7694641d06afaec33c7faf204bf78e56d5143b37d0fd5667700a55e9d3f00074567a2dd3c69cad3dfac
 DIST hacking-0.8.1.tar.gz 51800 SHA256 65390ea60215e4222d9ddbc1241a0f3e05644e4f55b305e69755ed8eab3decb5 SHA512 9055d57dd39bc1653cd7c8773ea4ca7f9b206e8495c137570c3456dab45373b51d6f25dcd4413b5f78b7c4740f5c89d21534ee982dee542c7674bd825c96b91a WHIRLPOOL d35e577c0790fe989a2141264afe67b4d1478bf2f08edcbea62515764e10938f364f5d57b3d8d66dba2125246c9eb1afc2a9b67ad4d91bb6d1346eb382a420ac
 DIST hacking-0.9.2.tar.gz 43956 SHA256 2a584e5bf185ee19517d4e72a852b729578aab3822ae345534e1f35338582ba4 SHA512 76aa59b4cdfb8036d6471e35cba43d502de3a72edc3883a05822063cbb92eaa072cef3144d21ee82ac763c3385c65bc9dec4b66fda5a5a2090191ba5b6388d41 WHIRLPOOL 718d790fdc0a405166f3ff194bcfa4d68cb311557eb092630716a14018aca7ac94e43f3305fd66195dbd15c35322c8a9bf25e9dd08ac5ff1964800c140ddf17f
--- a/dev-python/hacking/hacking-0.10.1.ebuild
+++ b/dev-python/hacking/hacking-0.10.1.ebuild
@ -0,0 +1,70 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/hacking/hacking-0.10.1.ebuild,v 1.1 2015/02/16 20:23:45 prometheanfire Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit distutils-r1
+
+DESCRIPTION="A client for the OpenStack Nova API"
+HOMEPAGE="https://github.com/openstack-dev/hacking"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
+	<dev-python/pbr-1.0[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
+		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
+		<dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
+		${RDEPEND}
+	)
+	doc? (
+		>=dev-python/sphinx-1.2.1[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/oslo-sphinx[${PYTHON_USEDEP}]' python2_7 )
+	)"
+RDEPEND="
+	~dev-python/pep8-1.5.7[${PYTHON_USEDEP}]
+	~dev-python/pyflakes-0.8.1[${PYTHON_USEDEP}]
+	~dev-python/flake8-2.2.5[${PYTHON_USEDEP}]
+	~dev-python/mccabe-0.2.1[${PYTHON_USEDEP}]
+	>=dev-python/six-1.7.0[${PYTHON_USEDEP}]"
+
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_prepare_all() {
+	# Prevent d'loading and correct ?typo to oslosphinx in conf.py
+	sed -e 's:intersphinx_mapping:#&:' \
+		-e 's:oslosphinx:oslo.sphinx:' \
+		-i doc/source/conf.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && sphinx-build -b html -c doc/source/ doc/source/ doc/source/html
+}
+
+python_test() {
+	testr init || die "testr init died"
+	testr run || die "testsuite failed under ${EPYTHON}"
+	flake8 "${PN}"/tests || die "flake8 drew error on a run over ${PN}/tests folder"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/source/html/. )
+	distutils-r1_python_install_all
+}
--- a/dev-python/html5lib/html5lib-0.999.ebuild
+++ b/dev-python/html5lib/html5lib-0.999.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/html5lib/html5lib-0.999.ebuild,v 1.6 2014/08/13 17:43:24 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/html5lib/html5lib-0.999.ebuild,v 1.7 2015/02/16 16:32:55 pacho Exp $

 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} pypy )
@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"

 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="test"

 RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
--- a/dev-python/jdcal/jdcal-1.0.ebuild
+++ b/dev-python/jdcal/jdcal-1.0.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/jdcal/jdcal-1.0.ebuild,v 1.4 2014/12/07 13:59:06 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/jdcal/jdcal-1.0.ebuild,v 1.5 2015/02/16 15:48:17 pacho Exp $

 EAPI="5"

@ -13,5 +13,5 @@ HOMEPAGE="http://github.com/phn/jdcal"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"

 LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
 SLOT="0"
--- a/dev-python/matplotlib/matplotlib-1.4.2.ebuild
+++ b/dev-python/matplotlib/matplotlib-1.4.2.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/matplotlib-1.4.2.ebuild,v 1.4 2015/01/25 21:14:35 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/matplotlib-1.4.2.ebuild,v 1.5 2015/02/16 13:46:58 pacho Exp $

 EAPI=5

@ -20,7 +20,7 @@ SLOT="0"
 # matplotlib/backends/qt4_editor: MIT
 # Fonts: BitstreamVera, OFL-1.1
 LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
-KEYWORDS="~amd64 arm ~ppc ~ppc64 ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 arm ppc ~ppc64 x86 ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="cairo doc excel examples fltk gtk gtk3 latex pyside qt4 test tk wxwidgets"

 # #456704 -- a lot of py2-only deps
--- a/dev-python/numpydoc/numpydoc-0.4-r1.ebuild
+++ b/dev-python/numpydoc/numpydoc-0.4-r1.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/numpydoc/numpydoc-0.4-r1.ebuild,v 1.6 2014/12/08 11:13:39 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numpydoc/numpydoc-0.4-r1.ebuild,v 1.7 2015/02/16 13:45:37 pacho Exp $

 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"

 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm ~ppc ppc64 x86 ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 arm ppc ppc64 x86 ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="test"

 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
--- a/dev-python/openpyxl/openpyxl-2.1.0.ebuild
+++ b/dev-python/openpyxl/openpyxl-2.1.0.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/openpyxl/openpyxl-2.1.0.ebuild,v 1.1 2014/12/07 10:06:30 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/openpyxl/openpyxl-2.1.0.ebuild,v 1.2 2015/02/16 15:48:41 pacho Exp $

 EAPI=5

@ -14,7 +14,7 @@ SRC_URI="https://bitbucket.org/ericgazoni/openpyxl-328/get/${PV}.tar.bz2 -> ${P}

 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"

 RDEPEND="dev-python/jdcal[${PYTHON_USEDEP}]"
--- a/dev-python/oslo-config/Manifest
+++ b/dev-python/oslo-config/Manifest
@ -1,3 +1,4 @@
 DIST oslo.config-1.3.0.tar.gz 49529 SHA256 1fa44f663f7109ccc3ddd393fbc5a7a077208e116f94e41ada7fbd977f27cbab SHA512 f596cf21e31b78bfe031d74db6720179d5092370dab87ad735605880ac2fd5d8f13b5aac06b4cdc0e1630343fbb90076151282e17916cbf1c020811a71f23583 WHIRLPOOL 5d108815e633d229895b4b8385e8b2d10ebbbeeb5eccd218a532dce93b4c77a651870aae2eae01fada9fd63fcfc09805f9bc5c8ee3794f20b369a4af31d60162
 DIST oslo.config-1.4.0.tar.gz 66544 SHA256 739e76e0a83ec585a3c0415140d9e6ba1b14c7f207e33643e8af7eb4346ffe07 SHA512 cbb9ebe2fd5daa6c78abe0a2169ed3e102f30d6118e53be34257356b218612d5905ecdada28527e8f8820385ef4a404b500ecbe95b01a9f00309271d0f869bc0 WHIRLPOOL fa756561a75c5aec8cc9d7784de2b5d8fc64ef3b86c979dd022d7ffed5f5ef02e261f8450d8818753b69710fb2096b136ef6a8571c2a9259193a27aa8c5343f4
 DIST oslo.config-1.6.0.tar.gz 90139 SHA256 a88cf1af696b4d9cae783a4c8c6898e6fb4abd176f9c9906ba388e7eac5eab17 SHA512 980ad40dd86695f9dd6aa9a491354b61a1b2852c24712493e20946a3b2c664348b07c9860674f7373b52e05b0dfe4c0de9cc1615b04c0a4d35a0ef7252058c3b WHIRLPOOL 78d2a49dda926172a5879095e056736108418445316c84d7f2b9a0e0c1baa871b900e6b9da414221cbcc3a0582d72126ec209e99719d9d2e21d6a2d34832b0ec
+DIST oslo.config-1.6.1.tar.gz 90868 SHA256 4709df3a8ba05e6a47300770f1c90ade77b3d095f28e8f75191df8745268bb20 SHA512 5fca40faa8f942fca3b6178258b7ffaa8642c855225eb045a19667546359ffc709ce68a12a680ad41a7e10281d70b0b54f50da5683297f9308bd8ab862f7906a WHIRLPOOL 7b97d20873a119b5de65e34f065091e964c68c24c1424a404da39d4f04c19590f8d4c1ae63663ebc32f9cb7d8bdc8aabedbdb3873779d2a8a10b77b6d9ab9662
--- a/dev-python/oslo-config/oslo-config-1.6.1.ebuild
+++ b/dev-python/oslo-config/oslo-config-1.6.1.ebuild
@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/oslo-config/oslo-config-1.6.1.ebuild,v 1.1 2015/02/16 19:05:45 prometheanfire Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
+
+inherit distutils-r1
+
+DESCRIPTION="Oslo Configuration API"
+HOMEPAGE="https://launchpad.net/oslo"
+SRC_URI="mirror://pypi/${PN:0:1}/oslo.config/oslo.config-${PV}.tar.gz"
+S="${WORKDIR}/oslo.config-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~amd64-linux ~x86 ~x86-linux"
+IUSE="test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/pbr-0.8.0[${PYTHON_USEDEP}]
+	<dev-python/pbr-1.0.0[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		>=dev-python/hacking-0.9.2[${PYTHON_USEDEP}]
+		<dev-python/hacking-0.10[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
+		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
+		!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-1.2.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+		>=dev-python/oslo-sphinx-2.2.0[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	>=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
+	>=dev-python/six-1.7.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.1.0[${PYTHON_USEDEP}]
+"
+
+python_test() {
+	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPTYHON}"
+
+	testr init || die "testr init failed under ${EPYTHON}"
+	testr run || die "testr run failed under ${EPYTHON}"
+}
--- a/dev-python/oslo-i18n/Manifest
+++ b/dev-python/oslo-i18n/Manifest
@ -1,2 +1,3 @@
 DIST oslo.i18n-1.0.0.tar.gz 31042 SHA256 008f86bc297ee05c63b1e2e4a85985802f086c81b16b0853e8e47df0592b23bc SHA512 907971cf4a85bfd2f935faf30dced837614eaa08397b7243a497c6fb50c1228c5cd5f562fb452ebc2a0ad929073724b1e44b38df9b5f424833ed958dcbfc96ab WHIRLPOOL b6ffb2bfce611bb5dd99bd62d24709dfa8626bc93edc7e51aa27e422f556851b31a3525e15fcb2481a72d6b225acc957ecf1ae64bdd38dcae8411173cc8b999d
 DIST oslo.i18n-1.3.1.tar.gz 35050 SHA256 8e1b9b3f87cea9e43a2414bb02d8c79b0a688c916afa1f1453f6a0a65ffd85f6 SHA512 987beef5e59b213988001fb53f1b2e41b122b830bd476c64a4481f7650db45d31d66c94d79da26e1fc346035393c00a63febb1254d3ab881ce3d2b00398c5ac8 WHIRLPOOL 7b590d93c478d855edfdfba8a31dac491913426100c8e216cfd4b82ff47b60f98b34a56ff69e2af49d0c16d3e2ac1813731527ab21bb4f9fe2f33dc5847d0835
+DIST oslo.i18n-1.4.0.tar.gz 36140 SHA256 a3d64e8d2b4235a457da2c6269d8c97e867a90ba7d938fe0ed3cfc792c8c87bb SHA512 df1491bb4d98b9295c08f4b7dc18cfff2758834ff5edb9aa3bdc064e587ab475e7e060dc5212c5db1e7e2f34cc4177e5c713a4ac6908a9750f50dc6316105682 WHIRLPOOL 8e77849c0a8f3c5a7e5b314f756673f31a3464f2a65c35e8ad506fd0ce10430b2fea0fae97eaccfef258b74a24db2f86b0843575d25f3d3a84a3b19ae0c5ff12
--- a/dev-python/oslo-i18n/oslo-i18n-1.4.0.ebuild
+++ b/dev-python/oslo-i18n/oslo-i18n-1.4.0.ebuild
@ -0,0 +1,59 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/oslo-i18n/oslo-i18n-1.4.0.ebuild,v 1.1 2015/02/16 19:07:42 prometheanfire Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
+
+inherit distutils-r1
+
+MY_PN=${PN/-/.}
+
+DESCRIPTION="oslo.i18n library"
+HOMEPAGE="http://launchpad.net/oslo"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
+	<dev-python/pbr-1.0[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/hacking-0.9.2[${PYTHON_USEDEP}]
+		<dev-python/hacking-0.10[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-1.2.0[${PYTHON_USEDEP}]
+	)
+	doc? (
+		>=dev-python/oslo-sphinx-2.2.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-1.1[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
+	>=dev-python/six-1.7.0[${PYTHON_USEDEP}]
+"
+
+python_compile_all() {
+	use doc && esetup.py build_sphinx
+}
+
+python_test() {
+	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPYTHON}"
+
+	testr init || die "testr init failed under ${EPYTHON}"
+	testr run || die "testr run failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+
+	distutils-r1_python_install_all
+}
--- a/dev-python/oslo-serialization/Manifest
+++ b/dev-python/oslo-serialization/Manifest
@ -1 +1,2 @@
 DIST oslo.serialization-1.0.0.tar.gz 16242 SHA256 f9748cfbce1cb2a48942f12cf64a558f607135cddd610dadef8a036aa879063c SHA512 5cde309368b61f7fbf4ea6ece4c7e26bb1c43f4eb96adee8aea89810d81d0b112a1d8443b658f6d25558c0e9071b55ba81ddbea608bc51459afb3704ac9bd78b WHIRLPOOL 2c7dc9223e23d8df3e5ac0c3962ca1d8f66c3bf1f67943274aefc03245f65d312ab33353ea3dc8b63a748a785524b1e5a846361965f2c381fcec90dff51becd4
+DIST oslo.serialization-1.3.0.tar.gz 22586 SHA256 6d5b0f8a0bdb59a7818e62c4c85c4f1ea81f634f2add368b553c93a5c4f28e93 SHA512 47db8850d8f3111e5dd0ef7d506cd629ba36d0996487dfe80256557f505d66accbc83131d6066e323eec85f1b9b22776c4a351372e50ab66e059c89a61f8ad16 WHIRLPOOL b4a9889a66c96da0f43f40cf7647da4ea848ec408192170eefe9f3d8cea435eacd5d5e55e2d4701b961b6819147faed82189f3e90cc3e33b1766b014bdc3aa5b
--- a/dev-python/oslo-serialization/oslo-serialization-1.3.0.ebuild
+++ b/dev-python/oslo-serialization/oslo-serialization-1.3.0.ebuild
@ -0,0 +1,79 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/oslo-serialization/oslo-serialization-1.3.0.ebuild,v 1.1 2015/02/16 20:24:13 prometheanfire Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_3 )
+
+inherit distutils-r1
+
+MY_PN=${PN/-/.}
+
+DESCRIPTION="oslo.serialization library"
+HOMEPAGE="https://launchpad.net/oslo"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+# Note: not in tree
+#test? ( <dev-python/hacking-0.8[${PYTHON_USEDEP}] )
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
+	<dev-python/pbr-1.0[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/hacking-0.10.0[${PYTHON_USEDEP}]
+		<dev-python/hacking-0.11.0[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
+		>=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-1.2.0[${PYTHON_USEDEP}]
+		>=dev-python/simplejson-2.2.0[${PYTHON_USEDEP}]
+		>=dev-python/oslo-i18n-1.3.0[${PYTHON_USEDEP}]
+	)
+	doc? (
+		>=dev-python/oslo-sphinx-2.2.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
+	>=dev-python/six-1.7.0[${PYTHON_USEDEP}]
+	>=dev-python/msgpack-0.4.0[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	use doc && esetup.py build_sphinx
+}
+
+# Note: Tests fail due to requiring installation.
+#
+# Installation appears to fail due ot the use of namespace packages but root
+# cause was never truly established.
+RESTRICT="test"
+
+python_test() {
+	distutils_install_for_testing
+
+	PYTHONPATH="${TEST_DIR}/lib:${PYTHONPATH}"
+
+	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPTYHON}"
+
+	testr init || die "testr init failed under ${EPYTHON}"
+	testr run || die "testr run failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+
+	distutils-r1_python_install_all
+}
--- a/dev-python/oslo-utils/Manifest
+++ b/dev-python/oslo-utils/Manifest
@ -1,3 +1,4 @@
 DIST oslo.utils-1.0.0.tar.gz 32719 SHA256 4d1fdb896eb7a690ddf2a04b47c347caefaf1117bb2be83723546fbaa5141864 SHA512 09c6b759f39eb90ec382f68f3cf70e600847bdc6c44802a82e279a10be75587fe5e67f5e5b136ab6ac338b69ff484a869dbf236e0e46fc72a90ca69619a53c9b WHIRLPOOL 470720887a248afc953c691ba8e659fb010b3b59708992a34387814487b3077f723879f603d931d1a14efd87fe95f868103ca7beaa8bb78c97a9510c28e8364c
 DIST oslo.utils-1.1.0.tar.gz 40359 SHA256 f12dfba246ff52e94ec005d5c5862c0300e6cd295ceb953b37b876571a544dc1 SHA512 6b6ffc086e88c0222e9931c78680f15f021b9e9bb211bcb9b4114cc62f47b5bf85846b58e7b792355c7bfe1c01dddcb78871f981fde719360c3889daa85a5ddc WHIRLPOOL f44c34acdecd1d4bd495c60e65d41cebdaa7ef1a39fc4a749a339161ec428e3d274462e34fa8729aa2e7bcdc1f0de66e8d3f87c022c6c91425f1778ca7bef145
 DIST oslo.utils-1.2.1.tar.gz 54946 SHA256 9cd8bcde345554582fd12c6daab81a7327a90c72861aa644e8b7b3fbfed5deba SHA512 f928afe21ef908cb6f20beb42502c4709827fdcc7e44f81fd5adeb4ac8faf07649c813824702e0a1972e8100ec894f441017dfc3a887f1b56afd4bfa24846803 WHIRLPOOL c91b4e2eb283b46df6341d7f52ca61ee20b286c84afd8ca8a287627a7d3be914b343c9fd1ea141e02f2c7179c96921ab38c6d094666ba3979dc639fa5fb2e4f7
+DIST oslo.utils-1.3.0.tar.gz 57677 SHA256 1586065ba1cb4e5dbd731fd612d52945af815b9e3e1404209d8c955b87909b84 SHA512 cd8855ab3fc7123b6410c52142a82fbce0813defe77ca6e7434bd2d4f678c8c477a045aa6abd9fde8915874e45f058094f017a6150f4e07917db44b545788f01 WHIRLPOOL 1cecace92c179f7db2c382d0e6cbf53cb7a2ec8f38d4108f87b78de7ae4204d044af8d3cd5e5a75facda0d71b3933f5339d0bc5f9ff2869696173862cdf309f6
--- a/dev-python/oslo-utils/oslo-utils-1.3.0.ebuild
+++ b/dev-python/oslo-utils/oslo-utils-1.3.0.ebuild
@ -0,0 +1,84 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/oslo-utils/oslo-utils-1.3.0.ebuild,v 1.2 2015/02/16 19:02:56 prometheanfire Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
+
+inherit distutils-r1
+
+MY_PN=${PN/-/.}
+
+DESCRIPTION="Oslo Utility library"
+HOMEPAGE="http://launchpad.net/oslo"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+CDEPEND="
+	>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
+	<dev-python/pbr-1.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		>=dev-python/hacking-0.9.1[${PYTHON_USEDEP}]
+		<dev-python/hacking-0.10[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
+		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
+		!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-1.2.0[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
+	)
+	doc? (
+		>=dev-python/oslo-sphinx-2.2.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
+	>=dev-python/six-1.7.0[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
+	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
+"
+
+python_compile_all() {
+	use doc && esetup.py build_sphinx
+}
+
+# Note: Tests fail due to requiring installation
+#
+# Installation appears to fail due to the use of namespace packages but root
+# cause was never truly established.
+#
+# Tests fail with:
+# ImportError: No module named 'oslo.utils
+
+RESTRICT="test"
+
+python_test() {
+	distutils_install_for_testing
+
+	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPTYHON}"
+
+	testr init || die "testr init failed under ${EPYTHON}"
+	testr run || die "testr run failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+
+	distutils-r1_python_install_all
+}
--- a/dev-python/processing/processing-0.52-r1.ebuild
+++ b/dev-python/processing/processing-0.52-r1.ebuild
@ -1,13 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/processing/processing-0.52.ebuild,v 1.7 2014/08/10 21:15:26 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/processing/processing-0.52-r1.ebuild,v 1.1 2015/02/16 15:02:56 idella4 Exp $

-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython"
+EAPI=5

-inherit distutils
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1 flag-o-matic

 KEYWORDS="~amd64 ~x86"

@ -20,7 +20,14 @@ SLOT="0"
 IUSE=""

 DEPEND="app-arch/unzip
-	dev-python/setuptools"
-RDEPEND=""
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${PYTHON_DEPS}"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}

-PYTHON_CFLAGS=("2.* + -fno-strict-aliasing")
+src_prepare() {
+	distutils-r1_src_prepare
+	append-flags -fno-strict-aliasing
+}
--- a/Show More
+++ b/Show More