Sync with portage [Tue Feb 17 19:00:32 MSK 2015].

2015-02-17 19:00:32 +03:00 · 2015-02-17 19:00:32 +03:00 · cf09d4a27e
commit cf09d4a27e
parent 7128e415de
973 changed files with 3781 additions and 5609 deletions
--- a/app-crypt/pinentry/metadata.xml
+++ b/app-crypt/pinentry/metadata.xml
@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>crypto</herd>
+<use>
+	<flag name='clipboard'>Enable clipboard integration</flag>
+</use>
 </pkgmetadata>
--- a/app-crypt/pinentry/pinentry-0.9.0-r1.ebuild
+++ b/app-crypt/pinentry/pinentry-0.9.0-r1.ebuild
@ -0,0 +1,99 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/pinentry/pinentry-0.9.0-r1.ebuild,v 1.1 2015/02/17 09:58:36 alonbl Exp $
+
+EAPI=5
+
+inherit autotools multilib eutils flag-o-matic
+
+DESCRIPTION="Collection of simple PIN or passphrase entry dialogs which utilize the Assuan protocol"
+HOMEPAGE="http://gnupg.org/aegypten2/index.html"
+SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+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 ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="clipboard gtk ncurses qt4 caps static"
+
+RDEPEND="
+	app-admin/eselect-pinentry
+	caps? ( sys-libs/libcap )
+	gtk? ( x11-libs/gtk+:2 )
+	ncurses? ( sys-libs/ncurses )
+	qt4? ( >=dev-qt/qtgui-4.4.1:4 )
+	static? ( >=sys-libs/ncurses-5.7-r5[static-libs,-gpm] )
+"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	gtk? ( virtual/pkgconfig )
+	qt4? ( virtual/pkgconfig )
+	ppc-aix? ( dev-libs/gnulib )
+"
+REQUIRED_USE="
+	|| ( ncurses gtk qt4 )
+	gtk? ( !static )
+	qt4? ( !static )
+	static? ( ncurses )
+"
+
+DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
+
+src_prepare() {
+	if use qt4; then
+		local f
+		for f in qt4/*.moc; do
+			"${EPREFIX}"/usr/bin/moc ${f/.moc/.h} > ${f} || die
+		done
+	fi
+	epatch "${FILESDIR}/${PN}-0.8.2-ncurses.patch"
+	epatch "${FILESDIR}/${PN}-0.8.2-texi.patch"
+	eautoreconf
+}
+
+src_configure() {
+	use static && append-ldflags -static
+
+	if [[ ${CHOST} == *-aix* ]] ; then
+		append-flags -I"${EPREFIX}/usr/$(get_libdir)/gnulib/include"
+		append-ldflags -L"${EPREFIX}/usr/$(get_libdir)/gnulib/$(get_libdir)"
+		append-libs -lgnu
+	fi
+
+	# Issues finding qt on multilib systems
+	export QTLIB="${QTDIR}/$(get_libdir)"
+
+	econf \
+		--enable-pinentry-tty \
+		$(use_enable gtk pinentry-gtk2) \
+		$(use_enable ncurses pinentry-curses) \
+		$(use_enable ncurses fallback-curses) \
+		$(use_enable qt4 pinentry-qt4) \
+		$(use qt4 && use_enable clipboard pinentry-qt4-clipboard) \
+		$(use_with caps libcap)
+}
+
+src_compile() {
+	emake AR="$(tc-getAR)"
+}
+
+src_install() {
+	default
+	rm -f "${ED}"/usr/bin/pinentry || die
+}
+
+pkg_postinst() {
+	if ! has_version 'app-crypt/pinentry' || has_version '<app-crypt/pinentry-0.7.3'; then
+		elog "We no longer install pinentry-curses and pinentry-qt SUID root by default."
+		elog "Linux kernels >=2.6.9 support memory locking for unprivileged processes."
+		elog "The soft resource limit for memory locking specifies the limit an"
+		elog "unprivileged process may lock into memory. You can also use POSIX"
+		elog "capabilities to allow pinentry to lock memory. To do so activate the caps"
+		elog "USE flag and add the CAP_IPC_LOCK capability to the permitted set of"
+		elog "your users."
+	fi
+	eselect pinentry update ifunset
+}
+
+pkg_postrm() {
+	eselect pinentry update ifunset
+}
--- a/app-editors/emacs-vcs/Manifest
+++ b/app-editors/emacs-vcs/Manifest
@ -1,4 +1,3 @@
 DIST emacs-25.0.50_pre20141110.tar.xz 24564108 SHA256 ed5a3600a2434fa6c43fbbb711c9ad682f76bcaeba5632031a0053d1fa7c0020 SHA512 db2add52e31be1d696e3634c92f993db124eaa8f3a727d04603cf47ed4c581643594571177d812d6c86584dce357eec6c86a7c9df1b07b09cb6faac4c699daf2 WHIRLPOOL 91cdba50d7ad9f41859d3247b1b839d1a42cb8004e209b1afe8d86f3c27abdfd3f2b1cf767b480f2ea271871b79886c878a899918056c1abb100bfa0eab87668
-DIST emacs-25.0.50_pre20141130.tar.xz 24635536 SHA256 0d7627d217c7b90051af4a0cffe23fe12ddaf79f18a55651627bf5fdf4ce5d0e SHA512 57b8a57a8f46c9ef34b7f5575b6062fb3ac6b47cf913599ecd10187925acf15569cc3cdf35f5775510809886841d9f803ef423ac3c5c600058bfe10aa190d4bd WHIRLPOOL 3dd946dce4f23009a7021de65764f085e7ef1732fcbbd174e1530a0e2274ac32045987016335e11d6e9af2f4c911ce6848f06b8915b56650785a2a06003964c3
 DIST emacs-25.0.50_pre20141231.tar.xz 24688612 SHA256 15bc6b8e1923bb6c1e18e3a8d89652c6594d72fbd1e3c15898ab9df03d19ad77 SHA512 b544f3530c707927c8ef4614b0804505e6cb32d8d6cef45f7aff56f67d632906d447d381a374ef37c6c46660cba1bb53dc7adead308bd902951abcc475593c75 WHIRLPOOL 0f373c4ef413a88e91e41b707686413a93661121453f3a80bff1cba75a17271dd30cd8dc64037487d2dcb2e3f4681af3bc989668c931b006a1bb2742eb5a9d5b
 DIST emacs-25.0.50_pre20150131.tar.xz 24719944 SHA256 fa21415c14d724c6cbd92ea8b76bfbc157757baf1446492b5f72062ff0017076 SHA512 85629851ba93d25050e0590b8c00ea9417e2c6839d306276ec3f02ce4d6bba14fe407f32eb07dcc2d42c79fade0678e9e5c098cf1562831a0a715373629a9d40 WHIRLPOOL e58589ac54577800e971232e814212b2954c93c42d701c137283590833420680968f71b46c6e087c4b3d900f96fb1c99edc6420ffbd336740e9b079e01e9ef4a
--- a/app-editors/emacs-vcs/emacs-vcs-24.4.9999-r2.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-24.4.9999-r2.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-editors/emacs-vcs/emacs-vcs-24.4.9999-r2.ebuild,v 1.1 2014/11/12 08:45:37 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.4.9999-r2.ebuild,v 1.2 2015/02/17 08:23:32 ulm Exp $

 EAPI=5

@ -57,7 +57,7 @@ RDEPEND="sys-libs/ncurses
 		jpeg? ( virtual/jpeg:0= )
 		png? ( >=media-libs/libpng-1.4:0= )
 		svg? ( >=gnome-base/librsvg-2.0 )
-		tiff? ( media-libs/tiff )
+		tiff? ( media-libs/tiff:0 )
 		xpm? ( x11-libs/libXpm )
 		imagemagick? ( >=media-gfx/imagemagick-6.6.2 )
 		xft? (
--- a/app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20141110.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20141110.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-editors/emacs-vcs/emacs-vcs-25.0.50_pre20141110.ebuild,v 1.2 2014/11/13 12:55:24 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20141110.ebuild,v 1.3 2015/02/17 08:23:32 ulm Exp $

 EAPI=5

@ -61,7 +61,7 @@ RDEPEND="sys-libs/ncurses
 		jpeg? ( virtual/jpeg:0= )
 		png? ( >=media-libs/libpng-1.4:0= )
 		svg? ( >=gnome-base/librsvg-2.0 )
-		tiff? ( media-libs/tiff )
+		tiff? ( media-libs/tiff:0 )
 		xpm? ( x11-libs/libXpm )
 		imagemagick? ( >=media-gfx/imagemagick-6.6.2 )
 		xft? (
--- a/app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20141130.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20141130.ebuild
@ -1,363 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20141130.ebuild,v 1.1 2014/12/01 23:23:11 ulm Exp $
-
-EAPI=5
-
-inherit autotools elisp-common eutils flag-o-matic multilib readme.gentoo
-
-if [[ ${PV##*.} = 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="git://git.sv.gnu.org/emacs.git"
-	EGIT_BRANCH="master"
-	EGIT_CHECKOUT_DIR="${WORKDIR}/emacs"
-	S="${EGIT_CHECKOUT_DIR}"
-else
-	SRC_URI="http://dev.gentoo.org/~ulm/distfiles/emacs-${PV}.tar.xz
-		mirror://gnu-alpha/emacs/pretest/emacs-${PV}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-	# FULL_VERSION keeps the full version number, which is needed in
-	# order to determine some path information correctly for copy/move
-	# operations later on
-	FULL_VERSION="${PV%%_*}"
-	#S="${WORKDIR}/emacs-${FULL_VERSION}"
-	S="${WORKDIR}/emacs"
-fi
-
-DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
-HOMEPAGE="http://www.gnu.org/software/emacs/"
-
-LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
-SLOT="25"
-IUSE="acl alsa aqua athena dbus games gconf gfile gif gnutls gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm zlib"
-REQUIRED_USE="?? ( aqua X )"
-
-RDEPEND="sys-libs/ncurses
-	>=app-admin/eselect-emacs-1.16
-	>=app-emacs/emacs-common-gentoo-1.4-r1[games?,X?]
-	net-libs/liblockfile
-	acl? ( virtual/acl )
-	alsa? ( media-libs/alsa-lib )
-	dbus? ( sys-apps/dbus )
-	gfile? ( >=dev-libs/glib-2.28.6 )
-	gnutls? ( net-libs/gnutls )
-	gpm? ( sys-libs/gpm )
-	hesiod? ( net-dns/hesiod )
-	kerberos? ( virtual/krb5 )
-	libxml2? ( >=dev-libs/libxml2-2.2.0 )
-	selinux? ( sys-libs/libselinux )
-	zlib? ( sys-libs/zlib )
-	X? (
-		x11-libs/libXmu
-		x11-libs/libXt
-		x11-misc/xbitmaps
-		gconf? ( >=gnome-base/gconf-2.26.2 )
-		gsettings? ( >=dev-libs/glib-2.28.6 )
-		gif? ( media-libs/giflib )
-		jpeg? ( virtual/jpeg:0= )
-		png? ( >=media-libs/libpng-1.4:0= )
-		svg? ( >=gnome-base/librsvg-2.0 )
-		tiff? ( media-libs/tiff )
-		xpm? ( x11-libs/libXpm )
-		imagemagick? ( >=media-gfx/imagemagick-6.6.2 )
-		xft? (
-			media-libs/fontconfig
-			media-libs/freetype
-			x11-libs/libXft
-			m17n-lib? (
-				>=dev-libs/libotf-0.9.4
-				>=dev-libs/m17n-lib-1.5.1
-			)
-		)
-		gtk? (
-			gtk3? ( x11-libs/gtk+:3 )
-			!gtk3? ( x11-libs/gtk+:2 )
-		)
-		!gtk? (
-			motif? ( >=x11-libs/motif-2.3:0 )
-			!motif? (
-				Xaw3d? ( x11-libs/libXaw3d )
-				!Xaw3d? ( athena? ( x11-libs/libXaw ) )
-			)
-		)
-	)"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	gzip-el? ( app-arch/gzip )
-	pax_kernel? (
-		sys-apps/attr
-		sys-apps/paxctl
-	)"
-
-if [[ ${PV##*.} = 9999 ]]; then
-	DEPEND="${DEPEND}
-	sys-apps/texinfo"
-fi
-
-EMACS_SUFFIX="${PN/emacs/emacs-${SLOT}}"
-SITEFILE="20${PN}-${SLOT}-gentoo.el"
-
-src_prepare() {
-	if [[ ${PV##*.} = 9999 ]]; then
-		FULL_VERSION=$(sed -n 's/^AC_INIT([^,]*,[ \t]*\([^ \t,)]*\).*/\1/p' \
-			configure.ac)
-		[[ ${FULL_VERSION} ]] || die "Cannot determine current Emacs version"
-		einfo "Emacs branch: ${EGIT_BRANCH}"
-		einfo "Commit: ${EGIT_VERSION}"
-		einfo "Emacs version number: ${FULL_VERSION}"
-		[[ ${FULL_VERSION} =~ ^${PV%.*}(\..*)?$ ]] \
-			|| die "Upstream version number changed to ${FULL_VERSION}"
-	fi
-
-	epatch_user
-
-	# Fix filename reference in redirected man page
-	sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 \
-		|| die "unable to sed ctags.1"
-
-	AT_M4DIR=m4 eautoreconf
-}
-
-src_configure() {
-	strip-flags
-	filter-flags -pie					#526948
-
-	if use sh; then
-		replace-flags "-O[1-9]" -O0		#262359
-	elif use ia64; then
-		replace-flags "-O[2-9]" -O1		#325373
-	else
-		replace-flags "-O[3-9]" -O2
-	fi
-
-	local myconf
-
-	if use alsa; then
-		use sound || ewarn \
-			"USE flag \"alsa\" overrides \"-sound\"; enabling sound support."
-		myconf+=" --with-sound=alsa"
-	else
-		myconf+=" --with-sound=$(usex sound oss)"
-	fi
-
-	if use X; then
-		myconf+=" --with-x --without-ns"
-		myconf+=" $(use_with gconf)"
-		myconf+=" $(use_with gsettings)"
-		myconf+=" $(use_with toolkit-scroll-bars)"
-		myconf+=" $(use_with gif)"
-		myconf+=" $(use_with jpeg)"
-		myconf+=" $(use_with png)"
-		myconf+=" $(use_with svg rsvg)"
-		myconf+=" $(use_with tiff)"
-		myconf+=" $(use_with xpm)"
-		myconf+=" $(use_with imagemagick)"
-
-		if use xft; then
-			myconf+=" --with-xft"
-			myconf+=" $(use_with m17n-lib libotf)"
-			myconf+=" $(use_with m17n-lib m17n-flt)"
-		else
-			myconf+=" --without-xft"
-			myconf+=" --without-libotf --without-m17n-flt"
-			use m17n-lib && ewarn \
-				"USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
-		fi
-
-		local f
-		if use gtk; then
-			einfo "Configuring to build with GIMP Toolkit (GTK+)"
-			myconf+=" --with-x-toolkit=$(usex gtk3 gtk3 gtk2)"
-			for f in motif Xaw3d athena; do
-				use ${f} && ewarn \
-					"USE flag \"${f}\" has no effect if \"gtk\" is set."
-			done
-		elif use motif; then
-			einfo "Configuring to build with Motif toolkit"
-			myconf+=" --with-x-toolkit=motif"
-			for f in Xaw3d athena; do
-				use ${f} && ewarn \
-					"USE flag \"${f}\" has no effect if \"motif\" is set."
-			done
-		elif use athena || use Xaw3d; then
-			einfo "Configuring to build with Athena/Lucid toolkit"
-			myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)"
-		else
-			einfo "Configuring to build with no toolkit"
-			myconf+=" --with-x-toolkit=no"
-		fi
-	elif use aqua; then
-		einfo "Configuring to build with Nextstep (Cocoa) support"
-		myconf+=" --with-ns --disable-ns-self-contained"
-		myconf+=" --without-x"
-	else
-		myconf+=" --without-x --without-ns"
-	fi
-
-	# Save version information in the Emacs binary. It will be available
-	# in variable "system-configuration-options".
-	myconf+=" GENTOO_PACKAGE=${CATEGORY}/${PF}"
-	if [[ ${PV##*.} = 9999 ]]; then
-		myconf+=" EGIT_BRANCH=${EGIT_BRANCH} EGIT_VERSION=${EGIT_VERSION}"
-	fi
-
-	econf \
-		--program-suffix="-${EMACS_SUFFIX}" \
-		--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
-		--localstatedir="${EPREFIX}"/var \
-		--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
-		--with-gameuser="${GAMES_USER_DED:-games}" \
-		--without-compress-install \
-		--with-file-notification=$(usev gfile || usev inotify || echo no) \
-		$(use_enable acl) \
-		$(use_with dbus) \
-		$(use_with gnutls) \
-		$(use_with gpm) \
-		$(use_with hesiod) \
-		$(use_with kerberos) $(use_with kerberos kerberos5) \
-		$(use_with libxml2 xml2) \
-		$(use_with selinux) \
-		$(use_with wide-int) \
-		$(use_with zlib) \
-		${myconf}
-}
-
-src_compile() {
-	export SANDBOX_ON=0			# for the unbelievers, see Bug #131505
-	emake
-}
-
-src_install () {
-	emake DESTDIR="${D}" NO_BIN_LINK=t install
-
-	mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} \
-		|| die "moving emacs executable failed"
-	mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 \
-		|| die "moving emacs man page failed"
-
-	# move info dir to avoid collisions with the dir file generated by portage
-	mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} \
-		|| die "moving info dir failed"
-	touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
-	docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
-
-	# avoid collision between slots, see bug #169033 e.g.
-	rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
-	rm -rf "${ED}"/usr/share/{appdata,applications,icons}
-	rm -rf "${ED}"/var
-
-	# remove unused <version>/site-lisp dir
-	rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp
-
-	# remove COPYING file (except for etc/COPYING used by describe-copying)
-	rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING
-
-	if use gzip-el; then
-		# compress .el files when a corresponding .elc exists
-		find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \
-			-name "*.elc" -print | sed 's/\.elc$/.el/' | xargs gzip -9n
-		assert "gzip .el failed"
-	fi
-
-	local cdir
-	if use source; then
-		cdir="/usr/share/emacs/${FULL_VERSION}/src"
-		insinto "${cdir}"
-		# This is not meant to install all the source -- just the
-		# C source you might find via find-function
-		doins src/*.{c,h,m}
-	elif has installsources ${FEATURES}; then
-		cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src"
-	fi
-
-	sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF
-	X
-	;;; ${PN}-${SLOT} site-lisp configuration
-	X
-	(when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
-	Y  (setq find-function-C-source-directory
-	Y	"${EPREFIX}${cdir}")
-	X  (let ((path (getenv "INFOPATH"))
-	X	(dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}")
-	X	(re "\\\\\`${EPREFIX}/usr/share/info\\\\>"))
-	X    (and path
-	X	 ;; move Emacs Info dir before anything else in /usr/share/info
-	X	 (let* ((p (cons nil (split-string path ":" t))) (q p))
-	X	   (while (and (cdr q) (not (string-match re (cadr q))))
-	X	     (setq q (cdr q)))
-	X	   (setcdr q (cons dir (delete dir (cdr q))))
-	X	   (setq Info-directory-list (prune-directory-list (cdr p)))))))
-	EOF
-	elisp-site-file-install "${T}/${SITEFILE}" || die
-
-	dodoc README BUGS
-
-	if use aqua; then
-		dodir /Applications/Gentoo
-		rm -rf "${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app
-		mv nextstep/Emacs.app \
-			"${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app || die
-	fi
-
-	DOC_CONTENTS="You can set the version to be started by /usr/bin/emacs
-		through the Emacs eselect module, which also redirects man and info
-		pages. Therefore, several Emacs versions can be installed at the
-		same time. \"man emacs.eselect\" for details.
-		\\n\\nIf you upgrade from Emacs version 24.2 or earlier, then it is
-		strongly recommended that you use app-admin/emacs-updater to rebuild
-		all byte-compiled elisp files of the installed Emacs packages."
-	use X && DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
-		Installing media-fonts/font-adobe-{75,100}dpi on the X server's
-		machine would satisfy basic Emacs requirements under X11.
-		See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
-		for how to enable anti-aliased fonts."
-	use aqua && DOC_CONTENTS+="\\n\\nEmacs${EMACS_SUFFIX#emacs}.app is in
-		\"${EPREFIX}/Applications/Gentoo\". You may want to copy or symlink
-		it into /Applications by yourself."
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	# move Info dir file to correct name
-	local infodir=/usr/share/info/${EMACS_SUFFIX} f
-	if [[ -f ${ED}${infodir}/dir.orig ]]; then
-		mv "${ED}"${infodir}/dir{.orig,} || die "moving info dir failed"
-	elif [[ -d "${ED}"${infodir} ]]; then
-		# this should not happen in EAPI 4
-		ewarn "Regenerating Info directory index in ${infodir} ..."
-		rm -f "${ED}"${infodir}/dir{,.*}
-		for f in "${ED}"${infodir}/*; do
-			if [[ ${f##*/} != *-[0-9]* && -e ${f} ]]; then
-				install-info --info-dir="${ED}"${infodir} "${f}" \
-					|| die "install-info failed"
-			fi
-		done
-	fi
-}
-
-pkg_postinst() {
-	elisp-site-regen
-
-	local pvr
-	for pvr in ${REPLACING_VERSIONS}; do
-		[[ ${pvr%%[-_]*} = 24.[12] ]] && FORCE_PRINT_ELOG=1
-	done
-	readme.gentoo_print_elog
-
-	if use livecd; then
-		# force an update of the emacs symlink for the livecd/dvd,
-		# because some microemacs packages set it with USE=livecd
-		eselect emacs update
-	elif [[ $(readlink "${EROOT}"/usr/bin/emacs) = ${EMACS_SUFFIX} ]]; then
-		# refresh symlinks in case any installed files have changed
-		eselect emacs set ${EMACS_SUFFIX}
-	else
-		eselect emacs update ifunset
-	fi
-}
-
-pkg_postrm() {
-	elisp-site-regen
-	eselect emacs update ifunset
-}
--- a/app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20141231.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20141231.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-editors/emacs-vcs/emacs-vcs-25.0.50_pre20141231.ebuild,v 1.1 2015/01/03 12:17:36 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20141231.ebuild,v 1.2 2015/02/17 08:23:32 ulm Exp $

 EAPI=5

@ -57,7 +57,7 @@ RDEPEND="sys-libs/ncurses
 		jpeg? ( virtual/jpeg:0= )
 		png? ( >=media-libs/libpng-1.4:0= )
 		svg? ( >=gnome-base/librsvg-2.0 )
-		tiff? ( media-libs/tiff )
+		tiff? ( media-libs/tiff:0 )
 		xpm? ( x11-libs/libXpm )
 		imagemagick? ( >=media-gfx/imagemagick-6.6.2 )
 		xft? (
--- a/app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20150131.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20150131.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-editors/emacs-vcs/emacs-vcs-25.0.50_pre20150131.ebuild,v 1.1 2015/02/01 15:15:06 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20150131.ebuild,v 1.2 2015/02/17 08:23:32 ulm Exp $

 EAPI=5

@ -57,7 +57,7 @@ RDEPEND="sys-libs/ncurses
 		jpeg? ( virtual/jpeg:0= )
 		png? ( >=media-libs/libpng-1.4:0= )
 		svg? ( >=gnome-base/librsvg-2.0 )
-		tiff? ( media-libs/tiff )
+		tiff? ( media-libs/tiff:0 )
 		xpm? ( x11-libs/libXpm )
 		imagemagick? ( >=media-gfx/imagemagick-6.6.2 )
 		xft? (
--- a/app-editors/emacs-vcs/emacs-vcs-25.0.9999-r1.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-25.0.9999-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-editors/emacs-vcs/emacs-vcs-25.0.9999-r1.ebuild,v 1.3 2014/12/29 11:28:11 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-25.0.9999-r1.ebuild,v 1.4 2015/02/17 08:23:32 ulm Exp $

 EAPI=5

@ -57,7 +57,7 @@ RDEPEND="sys-libs/ncurses
 		jpeg? ( virtual/jpeg:0= )
 		png? ( >=media-libs/libpng-1.4:0= )
 		svg? ( >=gnome-base/librsvg-2.0 )
-		tiff? ( media-libs/tiff )
+		tiff? ( media-libs/tiff:0 )
 		xpm? ( x11-libs/libXpm )
 		imagemagick? ( >=media-gfx/imagemagick-6.6.2 )
 		xft? (
--- a/app-editors/emacs/emacs-23.4-r11.ebuild
+++ b/app-editors/emacs/emacs-23.4-r11.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-editors/emacs/emacs-23.4-r11.ebuild,v 1.14 2014/11/10 20:52:58 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.4-r11.ebuild,v 1.15 2015/02/17 08:19:30 ulm Exp $

 EAPI=5
 WANT_AUTOMAKE="none"
@ -36,7 +36,7 @@ RDEPEND="sys-libs/ncurses
 		jpeg? ( virtual/jpeg:0= )
 		png? ( >=media-libs/libpng-1.4:0= )
 		svg? ( >=gnome-base/librsvg-2.0 )
-		tiff? ( media-libs/tiff )
+		tiff? ( media-libs/tiff:0 )
 		xpm? ( x11-libs/libXpm )
 		xft? (
 			media-libs/fontconfig
--- a/app-editors/emacs/emacs-24.3-r6.ebuild
+++ b/app-editors/emacs/emacs-24.3-r6.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-editors/emacs/emacs-24.3-r6.ebuild,v 1.12 2014/11/10 19:15:00 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-24.3-r6.ebuild,v 1.13 2015/02/17 08:19:30 ulm Exp $

 EAPI=5

@ -39,7 +39,7 @@ RDEPEND="sys-libs/ncurses
 		jpeg? ( virtual/jpeg:0= )
 		png? ( >=media-libs/libpng-1.4:0= )
 		svg? ( >=gnome-base/librsvg-2.0 )
-		tiff? ( media-libs/tiff )
+		tiff? ( media-libs/tiff:0 )
 		xpm? ( x11-libs/libXpm )
 		imagemagick? ( >=media-gfx/imagemagick-6.6.2 )
 		xft? (
--- a/app-editors/emacs/emacs-24.4-r1.ebuild
+++ b/app-editors/emacs/emacs-24.4-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-editors/emacs/emacs-24.4-r1.ebuild,v 1.6 2015/01/02 17:02:55 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-24.4-r1.ebuild,v 1.7 2015/02/17 08:19:30 ulm Exp $

 EAPI=5

@ -42,7 +42,7 @@ RDEPEND="sys-libs/ncurses
 		jpeg? ( virtual/jpeg:0= )
 		png? ( >=media-libs/libpng-1.4:0= )
 		svg? ( >=gnome-base/librsvg-2.0 )
-		tiff? ( media-libs/tiff )
+		tiff? ( media-libs/tiff:0 )
 		xpm? ( x11-libs/libXpm )
 		imagemagick? ( >=media-gfx/imagemagick-6.6.2 )
 		xft? (
--- a/app-editors/emacs/emacs-24.4-r2.ebuild
+++ b/app-editors/emacs/emacs-24.4-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/app-editors/emacs/emacs-24.4-r2.ebuild,v 1.1 2015/01/23 20:38:44 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-24.4-r2.ebuild,v 1.2 2015/02/17 08:19:30 ulm Exp $

 EAPI=5

@ -42,7 +42,7 @@ RDEPEND="sys-libs/ncurses
 		jpeg? ( virtual/jpeg:0= )
 		png? ( >=media-libs/libpng-1.4:0= )
 		svg? ( >=gnome-base/librsvg-2.0 )
-		tiff? ( media-libs/tiff )
+		tiff? ( media-libs/tiff:0 )
 		xpm? ( x11-libs/libXpm )
 		imagemagick? ( >=media-gfx/imagemagick-6.6.2 )
 		xft? (
--- a/app-editors/scite/scite-3.5.2.ebuild
+++ b/app-editors/scite/scite-3.5.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-editors/scite/scite-3.5.2.ebuild,v 1.1 2014/12/08 11:55:02 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/scite-3.5.2.ebuild,v 1.2 2015/02/17 10:38:48 ago Exp $

 EAPI="5"

@ -13,7 +13,7 @@ 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"
+KEYWORDS="amd64 ppc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux"
 IUSE="lua"

 RDEPEND="dev-libs/glib
--- a/app-misc/getopt/getopt-1.1.6.ebuild
+++ b/app-misc/getopt/getopt-1.1.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/app-misc/getopt/getopt-1.1.6.ebuild,v 1.1 2015/02/16 05:47:15 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/getopt/getopt-1.1.6.ebuild,v 1.2 2015/02/17 14:49:52 haubi Exp $

 EAPI=4

@ -38,6 +38,7 @@ src_compile() {
 		has_version sys-libs/glibc || libintl="-lintl"
 	fi

+	[[ ${CHOST} == *-aix* ]] && libcgetopt=0
 	[[ ${CHOST} == *-irix* ]] && libcgetopt=0
 	[[ ${CHOST} == *-interix* ]] && libcgetopt=0

--- a/app-misc/recoll/Manifest
+++ b/app-misc/recoll/Manifest
@ -1,5 +1,2 @@
-DIST recoll-1.16.2.tar.gz 1422148 SHA256 f0f29dff2d82ef8541c51963870f31daf28472f3c8822c81c17c346769b77355 SHA512 c71458bd1a42ef118560e516f30787b8c9dbc8b2841e667b77e420b0866c8308f8509e46be9eaa731348438d4194d1954bf369ea68e23eca5a65ac516806c609 WHIRLPOOL 320afbd8598aae44827eff09dfa936090fe1c4bf34e5d10f4115a211267e8f7f09b4e530e8915c75252dee3bda3c4955979a19075e14da4d99f27ee1bf00df92
 DIST recoll-1.17.3.tar.gz 1757278 SHA256 7778f80546e6b10ca45bfb7f8bb0876ccf3987dd4e98c5003ff923bd8b5acb1c SHA512 b41d28255e6bfbfc8e0025d88c3d56ecfbd35814bfa359c41f3e5d3cc25debe6d66dc617aa4c012e1911aa8c373c48a1661f7fff926e2cce423562af82c2fb31 WHIRLPOOL 3ba9d58a0df401832b1a97f34f4caec1b79aa7de027b936b05195d447e374097bff9205714b1a97c287610c74c0ec2e7e726b144c2295859c293a013c3564644
-DIST recoll-1.18.1.tar.gz 2026276 SHA256 8ea01dc64002b594b7ca08cf40c5581963bd98617d8ab5554164a8af4a9fd933 SHA512 cf930c648339843b00b5d8bd2074e111f3b397b3ed8453a8fcb7bfcf295adb95e7d0b7d7dcc78819609e7eb5417e1c259d4b10c6ea80c4b45fd61906ab7a7236 WHIRLPOOL 36de30218ca82bc09506e24104e84cf8ca2bc7dbcd00495dc203c6e5d083f5eac6badb513a4892465ae5d2b9869cf4dec89c2f519b04df649599ea9c168b080f
-DIST recoll-1.18.2.tar.gz 1969421 SHA256 4729785354bd0d465c92e7d2a6fced688d8c08f1342a9bef2f040e7b10b1f510 SHA512 4f049632e94dc12dc8d1ef3f8ed7221f4ef715619f9afbed28177d83a8f189c94ff2d482e20f799edee1d11b9c1841ed25183825f40e921254d370449eddf67c WHIRLPOOL 783ae57339559d4bb5d6b2638ea743898ff60ba53e5ffa8ba67efa910f4537483fdbead57876dacc3e227ec235c84d86921ccee525f05c79ec3a776109b2e8c8
 DIST recoll-1.19.5.tar.gz 1997615 SHA256 c4d63a4cd1a598117a521a883a6078082b30fe63eef84a879da9b467fcb56a8d SHA512 45ae5dc6d4f6d6dbb3d7e634bd60a2835b767e5d2d8d188636ab4b1777d65a6918c09d5bc09e80e4849aea6e8b2c9c430b99a9e56b645531065e558f4161a5f3 WHIRLPOOL df099f39a681aa1956076018861d064445bcb9fc050c866133a830ebeddb33efcc9a06596ce18d17d80bcfdb663bb780434719092c6c571f42b6093a4c750be3
--- a/app-misc/recoll/recoll-1.16.2.ebuild
+++ b/app-misc/recoll/recoll-1.16.2.ebuild
@ -1,147 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/recoll/recoll-1.16.2.ebuild,v 1.7 2014/05/17 07:32:01 ulm Exp $
-
-EAPI="4"
-
-inherit toolchain-funcs qt4-r2 linux-info
-
-DESCRIPTION="A personal full text search package"
-HOMEPAGE="http://www.lesbonscomptes.com/recoll/"
-SRC_URI="http://www.lesbonscomptes.com/recoll/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-INDEX_HELPERS="chm djvu dvi exif postscript ics info lyx msdoc msppt msxls pdf rtf sound tex wordperfect xml"
-IUSE="+spell +inotify +qt4 +session camelcase xattr fam ${INDEX_HELPERS}"
-
-DEPEND="
-	virtual/libiconv
-	>=dev-libs/xapian-1.0.12
-	sys-libs/zlib
-	spell? ( app-text/aspell )
-	!inotify? ( fam? ( virtual/fam ) )
-	qt4? ( dev-qt/qtcore:4[qt3support] )
-	session? (
-		inotify? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE )
-		!inotify? ( fam? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) )
-	)
-"
-
-RDEPEND="
-	${DEPEND}
-	app-arch/unzip
-	sys-apps/sed
-	virtual/awk
-	pdf? ( app-text/poppler )
-	postscript? ( app-text/pstotext )
-	msdoc? ( app-text/antiword )
-	msxls? ( app-text/catdoc )
-	msppt? ( app-text/catdoc )
-	wordperfect? ( app-text/libwpd:0.9 )
-	rtf? ( app-text/unrtf )
-	tex? ( dev-tex/detex )
-	dvi? ( virtual/tex-base )
-	djvu? ( >=app-text/djvu-3.5.15 )
-	exif? ( media-libs/exiftool )
-	chm? ( dev-python/pychm )
-	ics? ( dev-python/icalendar )
-	lyx? ( app-office/lyx )
-	sound? ( media-libs/mutagen )
-	xml? ( dev-libs/libxslt )
-	info? ( sys-apps/texinfo )
-	"
-
-REQUIRED_USE="^^ ( fam inotify ) session? ( || ( fam inotify ) )"
-
-pkg_pretend() {
-	if use inotify; then
-		CONFIG_CHECK="~INOTIFY_USER"
-		check_extra_config
-	fi
-}
-
-pkg_setup() {
-	local i at_least_one_helper
-
-	at_least_one_helper=0
-	for i in $INDEX_HELPERS; do
-		if use $i; then
-			at_least_one_helper=1
-			break
-		fi
-	done
-	if [[ $at_least_one_helper -eq 0 ]]; then
-		ewarn
-		ewarn "You did not enable any of the optional file format flags."
-		ewarn "Recoll can read some file formats natively, but many of them"
-		ewarn "are optional since they require external helpers."
-		ewarn
-	fi
-}
-
-src_prepare() {
-	# remember configure.ac is b0rked. Fix it before using eautoreconf in the
-	# future
-	# eautoreconf
-
-	# do not strip binaries
-	sed -i -e "/STRIP/d" "${S}"/${PN}install.in \
-		|| die "Failed to fix the installation script"
-}
-
-src_configure() {
-	local qtconf
-
-	use qt4 && qtconf="QMAKEPATH=/usr/bin/qmake"
-
-	econf \
-		$(use_with spell aspell) \
-		$(use_enable xattr) \
-		$(use_with inotify) \
-		$(use_enable qt4 qtgui) \
-		$(use_enable camelcase) \
-		$(use_with fam) \
-		$(use_with inotify) \
-		$(use_enable session x11mon) \
-		${qtconf}
-}
-
-src_compile() {
-	# Do not let upstream people decide on our behalf
-	emake \
-		CC=$(tc-getCC) \
-		CXX=$(tc-getCXX) \
-		CFLAGS="${CFLAGS} ${LDFLAGS}" \
-		CXXFLAGS="${CXXFLAGS} ${LDFLAGS}"
-}
-
-src_install() {
-	# You probably wonder why I did not fix recollinstall in src_prepare.
-	# --prefix requires an absolute path but recollinstall requires prefix
-	# to be actually 'usr' because double // makes portage sad. And no, I am not
-	# gonna ask upstream to fix the build system
-	sed -i -e "/PREFIX/s:/usr:usr:" "${S}"/${PN}install || die
-	sed -i -e "/prefix/s:/usr:usr:" "${S}"/Makefile || die
-
-	emake DESTDIR="${D%/}" install
-	dodoc ChangeLog README
-	mv "${D}/usr/share/${PN}/doc" "${D}/usr/share/doc/${PF}/html"
-	dosym /usr/share/doc/${PF}/html /usr/share/${PN}/doc
-}
-
-pkg_postinst() {
-	elog
-	elog "Default configuration files located at"
-	elog "/usr/share/${PN}/examples. Either edit these files to match"
-	elog "your needs or copy them to ~/.recoll/ and edit these files"
-	elog "instead."
-	elog
-	if use xattr; then
-		elog "Use flag \"xattr\" enables support for fetching field values"
-		elog "from extended file attributes. You will also need to set up a"
-		elog "map from the attributes names to the Recoll field names"
-		elog "(see comment at the end of the fields configuration file."
-	fi
-}
--- a/app-misc/recoll/recoll-1.17.3-r1.ebuild
+++ b/app-misc/recoll/recoll-1.17.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-misc/recoll/recoll-1.17.3-r1.ebuild,v 1.6 2014/05/17 07:32:01 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/recoll/recoll-1.17.3-r1.ebuild,v 1.7 2015/02/17 10:40:40 kensington Exp $

 EAPI="4"

@ -115,7 +115,9 @@ src_configure() {
 		$(use_with inotify) \
 		$(use_enable session x11mon) \
 		${qtconf}
-	cd qtgui && eqmake4 ${PN}.pro && cd ..
+	if use qt4; then
+		cd qtgui && eqmake4 ${PN}.pro && cd ..
+	fi
 }

 src_compile() {
--- a/app-misc/recoll/recoll-1.17.3.ebuild
+++ b/app-misc/recoll/recoll-1.17.3.ebuild
@ -1,154 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/recoll/recoll-1.17.3.ebuild,v 1.6 2014/05/17 07:32:01 ulm Exp $
-
-EAPI="4"
-
-PYTHON_DEPEND="2"
-inherit toolchain-funcs qt4-r2 linux-info python
-
-DESCRIPTION="A personal full text search package"
-HOMEPAGE="http://www.lesbonscomptes.com/recoll/"
-SRC_URI="http://www.lesbonscomptes.com/recoll/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-INDEX_HELPERS="chm djvu dvi exif postscript ics info lyx msdoc msppt msxls pdf rtf sound tex wordperfect xml"
-IUSE="+spell +inotify +qt4 +session camelcase xattr fam ${INDEX_HELPERS}"
-
-DEPEND="
-	virtual/libiconv
-	>=dev-libs/xapian-1.0.12
-	sys-libs/zlib
-	spell? ( app-text/aspell )
-	!inotify? ( fam? ( virtual/fam ) )
-	qt4? (
-		dev-qt/qtcore:4[qt3support]
-		dev-qt/qtwebkit:4
-		)
-	session? (
-		inotify? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE )
-		!inotify? ( fam? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) )
-	)
-"
-
-RDEPEND="
-	${DEPEND}
-	app-arch/unzip
-	sys-apps/sed
-	virtual/awk
-	pdf? ( app-text/poppler )
-	postscript? ( app-text/pstotext )
-	msdoc? ( app-text/antiword )
-	msxls? ( app-text/catdoc )
-	msppt? ( app-text/catdoc )
-	wordperfect? ( app-text/libwpd:0.9 )
-	rtf? ( app-text/unrtf )
-	tex? ( dev-tex/detex )
-	dvi? ( virtual/tex-base )
-	djvu? ( >=app-text/djvu-3.5.15 )
-	exif? ( media-libs/exiftool )
-	chm? ( dev-python/pychm )
-	ics? ( dev-python/icalendar )
-	lyx? ( app-office/lyx )
-	sound? ( media-libs/mutagen )
-	xml? ( dev-libs/libxslt )
-	info? ( sys-apps/texinfo )
-	"
-
-REQUIRED_USE="^^ ( fam inotify ) session? ( || ( fam inotify ) )"
-
-pkg_pretend() {
-	if use inotify; then
-		CONFIG_CHECK="~INOTIFY_USER"
-		check_extra_config
-	fi
-}
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-
-	local i at_least_one_helper
-
-	at_least_one_helper=0
-	for i in $INDEX_HELPERS; do
-		if use $i; then
-			at_least_one_helper=1
-			break
-		fi
-	done
-	if [[ $at_least_one_helper -eq 0 ]]; then
-		ewarn
-		ewarn "You did not enable any of the optional file format flags."
-		ewarn "Recoll can read some file formats natively, but many of them"
-		ewarn "are optional since they require external helpers."
-		ewarn
-	fi
-}
-
-src_prepare() {
-	# remember configure.ac is b0rked. Fix it before using eautoreconf in the
-	# future
-	# eautoreconf
-
-	# do not strip binaries
-	sed -i -e "/STRIP/d" "${S}"/${PN}install.in \
-		|| die "Failed to fix the installation script"
-}
-
-src_configure() {
-	local qtconf
-
-	use qt4 && qtconf="QMAKEPATH=/usr/bin/qmake"
-
-	econf \
-		$(use_with spell aspell) \
-		$(use_enable xattr) \
-		$(use_with inotify) \
-		$(use_enable qt4 qtgui) \
-		$(use_enable camelcase) \
-		$(use_with fam) \
-		$(use_with inotify) \
-		$(use_enable session x11mon) \
-		${qtconf}
-}
-
-src_compile() {
-	# Do not let upstream people decide on our behalf
-	emake \
-		CC=$(tc-getCC) \
-		CXX=$(tc-getCXX) \
-		CFLAGS="${CFLAGS} ${LDFLAGS}" \
-		CXXFLAGS="${CXXFLAGS} ${LDFLAGS}"
-}
-
-src_install() {
-	# You probably wonder why I did not fix recollinstall in src_prepare.
-	# --prefix requires an absolute path but recollinstall requires prefix
-	# to be actually 'usr' because double // makes portage sad. And no, I am not
-	# gonna ask upstream to fix the build system
-	sed -i -e "/PREFIX/s:/usr:usr:" "${S}"/${PN}install || die
-	sed -i -e "/prefix/s:/usr:usr:" "${S}"/Makefile || die
-
-	emake DESTDIR="${D%/}" install
-	dodoc ChangeLog README
-	mv "${D}/usr/share/${PN}/doc" "${D}/usr/share/doc/${PF}/html"
-	dosym /usr/share/doc/${PF}/html /usr/share/${PN}/doc
-}
-
-pkg_postinst() {
-	elog
-	elog "Default configuration files located at"
-	elog "/usr/share/${PN}/examples. Either edit these files to match"
-	elog "your needs or copy them to ~/.recoll/ and edit these files"
-	elog "instead."
-	elog
-	if use xattr; then
-		elog "Use flag \"xattr\" enables support for fetching field values"
-		elog "from extended file attributes. You will also need to set up a"
-		elog "map from the attributes names to the Recoll field names"
-		elog "(see comment at the end of the fields configuration file."
-	fi
-}
--- a/app-misc/recoll/recoll-1.18.1.ebuild
+++ b/app-misc/recoll/recoll-1.18.1.ebuild
@ -1,178 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/recoll/recoll-1.18.1.ebuild,v 1.6 2014/05/17 07:32:01 ulm Exp $
-
-EAPI="4"
-
-PYTHON_DEPEND="2"
-inherit toolchain-funcs qt4-r2 linux-info python readme.gentoo
-
-DESCRIPTION="A personal full text search package"
-HOMEPAGE="http://www.lesbonscomptes.com/recoll/"
-SRC_URI="http://www.lesbonscomptes.com/recoll/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-INDEX_HELPERS="chm djvu dvi exif postscript ics info lyx msdoc msppt msxls pdf rtf sound tex wordperfect xml"
-IUSE="+spell inotify +qt4 +session camelcase xattr webkit fam ${INDEX_HELPERS}"
-
-DEPEND="
-	virtual/libiconv
-	>=dev-libs/xapian-1.0.12
-	sys-libs/zlib
-	spell? ( app-text/aspell )
-	!inotify? ( fam? ( virtual/fam ) )
-	qt4? ( dev-qt/qtcore:4[qt3support] )
-	webkit? ( dev-qt/qtwebkit:4 )
-	session? (
-		inotify? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE )
-		!inotify? ( fam? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) )
-	)
-"
-
-RDEPEND="
-	${DEPEND}
-	app-arch/unzip
-	sys-apps/sed
-	virtual/awk
-	pdf? ( app-text/poppler )
-	postscript? ( app-text/pstotext )
-	msdoc? ( app-text/antiword )
-	msxls? ( app-text/catdoc )
-	msppt? ( app-text/catdoc )
-	wordperfect? ( app-text/libwpd:0.9 )
-	rtf? ( app-text/unrtf )
-	tex? ( dev-tex/detex )
-	dvi? ( virtual/tex-base )
-	djvu? ( >=app-text/djvu-3.5.15 )
-	exif? ( media-libs/exiftool )
-	chm? ( dev-python/pychm )
-	ics? ( dev-python/icalendar )
-	lyx? ( app-office/lyx )
-	sound? ( media-libs/mutagen )
-	xml? ( dev-libs/libxslt )
-	info? ( sys-apps/texinfo )
-	"
-
-REQUIRED_USE="session? ( || ( fam inotify ) )"
-
-pkg_pretend() {
-	if use inotify; then
-		CONFIG_CHECK="~INOTIFY_USER"
-		check_extra_config
-	fi
-}
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-
-	local i at_least_one_helper
-
-	at_least_one_helper=0
-	for i in $INDEX_HELPERS; do
-		if use $i; then
-			at_least_one_helper=1
-			break
-		fi
-	done
-	if [[ $at_least_one_helper -eq 0 ]]; then
-		ewarn
-		ewarn "You did not enable any of the optional file format flags."
-		ewarn "Recoll can read some file formats natively, but many of them"
-		ewarn "are optional since they require external helpers."
-		ewarn
-	fi
-}
-
-src_prepare() {
-	use xattr && has_version "${CATEGORY}/${PN}:${SLOT}[-xattr]" && FORCE_PRINT_ELOG="yes"
-	! use xattr && has_version "${CATEGORY}/${PN}:${SLOT}[xattr]" && FORCE_PRINT_ELOG="yes"
-
-	DOC_CONTENTS="Default configuration files located at
-		/usr/share/${PN}/examples. Either edit these files to match
-		your needs or copy them to ~/.recoll/ and edit these files
-		instead."
-
-	use xattr && DOC_CONTENTS+="
-		Use flag \"xattr\" enables support for fetching field values
-		from extended file attributes. You will also need to set up a
-		map from the attributes names to the Recoll field names
-		(see comment at the end of the fields configuration file."
-
-	# remember configure.ac is b0rked. Fix it before using eautoreconf in the
-	# future
-	# eautoreconf
-
-	# do not strip binaries
-	sed -i -e "/STRIP/d" "${S}"/${PN}install.in \
-		|| die "Failed to fix the installation script"
-	# Drop all the QMAKE lines. We will do it ourselves
-	sed -i -e "/QMAKE/d" Makefile.in || die
-}
-
-src_configure() {
-	local qtconf
-
-	if use qt4 || use webkit; then
-		qtconf="QMAKEPATH=/usr/bin/qmake"
-	fi
-
-	econf \
-		$(use_with spell aspell) \
-		$(use_enable xattr) \
-		$(use_with inotify) \
-		$(use_enable qt4 qtgui) \
-		$(use_enable camelcase) \
-		$(use_with fam) \
-		$(use_with inotify) \
-		$(use_enable session x11mon) \
-		${qtconf}
-	if use qt4; then
-		cd qtgui && eqmake4 ${PN}.pro && cd ..
-	fi
-}
-
-src_compile() {
-	# Do not let upstream people decide on our behalf
-	sed -i "s:ar ru:$(tc-getAR) ru:" lib/Makefile || die
-
-	emake \
-		CC=$(tc-getCC) \
-		CXX=$(tc-getCXX) \
-		CFLAGS="${CFLAGS} ${LDFLAGS}" \
-		CXXFLAGS="${CXXFLAGS} ${LDFLAGS}"
-}
-
-src_install() {
-	# You probably wonder why I did not fix recollinstall in src_prepare.
-	# --prefix requires an absolute path but recollinstall requires prefix
-	# to be actually 'usr' because double // makes portage sad. And no, I am not
-	# gonna ask upstream to fix the build system
-	sed -i -e "/PREFIX/s:/usr:usr:" "${S}"/${PN}install || die
-	sed -i -e "/prefix/s:/usr:usr:" "${S}"/Makefile || die
-
-	emake DESTDIR="${D%/}" install
-	dodoc ChangeLog README
-	mv "${D}/usr/share/${PN}/doc" "${D}/usr/share/doc/${PF}/html"
-	dosym /usr/share/doc/${PF}/html /usr/share/${PN}/doc
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		elog
-		elog "1.18 introduces significant index formats"
-		elog "changes to support optional character case and diacritics"
-		elog "sensitivity, and it will be advisable to reset the index in"
-		elog "most cases. This will be best done by destroying the index"
-		elog "directory (rm -rf ~/.recoll/xapiandb). If 1.18 is not configured"
-		elog "for case and diacritics sensitivity, it is mostly compatible"
-		elog "with 1.17 indexes."
-		elog
-	fi
-}
--- a/app-misc/recoll/recoll-1.18.2.ebuild
+++ b/app-misc/recoll/recoll-1.18.2.ebuild
@ -1,178 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/recoll/recoll-1.18.2.ebuild,v 1.2 2014/05/17 07:32:01 ulm Exp $
-
-EAPI="4"
-
-PYTHON_DEPEND="2"
-inherit toolchain-funcs qt4-r2 linux-info python readme.gentoo
-
-DESCRIPTION="A personal full text search package"
-HOMEPAGE="http://www.lesbonscomptes.com/recoll/"
-SRC_URI="http://www.lesbonscomptes.com/recoll/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-INDEX_HELPERS="chm djvu dvi exif postscript ics info lyx msdoc msppt msxls pdf rtf sound tex wordperfect xml"
-IUSE="+spell inotify +qt4 +session camelcase xattr webkit fam ${INDEX_HELPERS}"
-
-DEPEND="
-	virtual/libiconv
-	>=dev-libs/xapian-1.0.12
-	sys-libs/zlib
-	spell? ( app-text/aspell )
-	!inotify? ( fam? ( virtual/fam ) )
-	qt4? ( dev-qt/qtcore:4[qt3support] )
-	webkit? ( dev-qt/qtwebkit:4 )
-	session? (
-		inotify? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE )
-		!inotify? ( fam? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) )
-	)
-"
-
-RDEPEND="
-	${DEPEND}
-	app-arch/unzip
-	sys-apps/sed
-	virtual/awk
-	pdf? ( app-text/poppler )
-	postscript? ( app-text/pstotext )
-	msdoc? ( app-text/antiword )
-	msxls? ( app-text/catdoc )
-	msppt? ( app-text/catdoc )
-	wordperfect? ( app-text/libwpd:0.9 )
-	rtf? ( app-text/unrtf )
-	tex? ( dev-tex/detex )
-	dvi? ( virtual/tex-base )
-	djvu? ( >=app-text/djvu-3.5.15 )
-	exif? ( media-libs/exiftool )
-	chm? ( dev-python/pychm )
-	ics? ( dev-python/icalendar )
-	lyx? ( app-office/lyx )
-	sound? ( media-libs/mutagen )
-	xml? ( dev-libs/libxslt )
-	info? ( sys-apps/texinfo )
-	"
-
-REQUIRED_USE="session? ( || ( fam inotify ) )"
-
-pkg_pretend() {
-	if use inotify; then
-		CONFIG_CHECK="~INOTIFY_USER"
-		check_extra_config
-	fi
-}
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-
-	local i at_least_one_helper
-
-	at_least_one_helper=0
-	for i in $INDEX_HELPERS; do
-		if use $i; then
-			at_least_one_helper=1
-			break
-		fi
-	done
-	if [[ $at_least_one_helper -eq 0 ]]; then
-		ewarn
-		ewarn "You did not enable any of the optional file format flags."
-		ewarn "Recoll can read some file formats natively, but many of them"
-		ewarn "are optional since they require external helpers."
-		ewarn
-	fi
-}
-
-src_prepare() {
-	use xattr && has_version "${CATEGORY}/${PN}:${SLOT}[-xattr]" && FORCE_PRINT_ELOG="yes"
-	! use xattr && has_version "${CATEGORY}/${PN}:${SLOT}[xattr]" && FORCE_PRINT_ELOG="yes"
-
-	DOC_CONTENTS="Default configuration files located at
-		/usr/share/${PN}/examples. Either edit these files to match
-		your needs or copy them to ~/.recoll/ and edit these files
-		instead."
-
-	use xattr && DOC_CONTENTS+="
-		Use flag \"xattr\" enables support for fetching field values
-		from extended file attributes. You will also need to set up a
-		map from the attributes names to the Recoll field names
-		(see comment at the end of the fields configuration file."
-
-	# remember configure.ac is b0rked. Fix it before using eautoreconf in the
-	# future
-	# eautoreconf
-
-	# do not strip binaries
-	sed -i -e "/STRIP/d" "${S}"/${PN}install.in \
-		|| die "Failed to fix the installation script"
-	# Drop all the QMAKE lines. We will do it ourselves
-	sed -i -e "/QMAKE/d" Makefile.in || die
-}
-
-src_configure() {
-	local qtconf
-
-	if use qt4 || use webkit; then
-		qtconf="QMAKEPATH=/usr/bin/qmake"
-	fi
-
-	econf \
-		$(use_with spell aspell) \
-		$(use_enable xattr) \
-		$(use_with inotify) \
-		$(use_enable qt4 qtgui) \
-		$(use_enable camelcase) \
-		$(use_with fam) \
-		$(use_with inotify) \
-		$(use_enable session x11mon) \
-		${qtconf}
-	if use qt4; then
-		cd qtgui && eqmake4 ${PN}.pro && cd ..
-	fi
-}
-
-src_compile() {
-	# Do not let upstream people decide on our behalf
-	sed -i "s:ar ru:$(tc-getAR) ru:" lib/Makefile || die
-
-	emake \
-		CC=$(tc-getCC) \
-		CXX=$(tc-getCXX) \
-		CFLAGS="${CFLAGS} ${LDFLAGS}" \
-		CXXFLAGS="${CXXFLAGS} ${LDFLAGS}"
-}
-
-src_install() {
-	# You probably wonder why I did not fix recollinstall in src_prepare.
-	# --prefix requires an absolute path but recollinstall requires prefix
-	# to be actually 'usr' because double // makes portage sad. And no, I am not
-	# gonna ask upstream to fix the build system
-	sed -i -e "/PREFIX/s:/usr:usr:" "${S}"/${PN}install || die
-	sed -i -e "/prefix/s:/usr:usr:" "${S}"/Makefile || die
-
-	emake DESTDIR="${D%/}" install
-	dodoc ChangeLog README
-	mv "${D}/usr/share/${PN}/doc" "${D}/usr/share/doc/${PF}/html"
-	dosym /usr/share/doc/${PF}/html /usr/share/${PN}/doc
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		elog
-		elog "1.18 introduces significant index formats"
-		elog "changes to support optional character case and diacritics"
-		elog "sensitivity, and it will be advisable to reset the index in"
-		elog "most cases. This will be best done by destroying the index"
-		elog "directory (rm -rf ~/.recoll/xapiandb). If 1.18 is not configured"
-		elog "for case and diacritics sensitivity, it is mostly compatible"
-		elog "with 1.17 indexes."
-		elog
-	fi
-}
--- a/app-misc/rlwrap/rlwrap-0.42.ebuild
+++ b/app-misc/rlwrap/rlwrap-0.42.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-misc/rlwrap/rlwrap-0.42.ebuild,v 1.4 2014/12/31 16:11:16 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/rlwrap/rlwrap-0.42.ebuild,v 1.5 2015/02/17 14:52:42 haubi Exp $

 EAPI=5

@ -10,7 +10,7 @@ SRC_URI="http://utopia.knoware.nl/~hlub/uck/rlwrap/${P}.tar.gz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~mips ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~mips ppc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug"

 RDEPEND="sys-libs/readline"
--- a/app-office/scribus/scribus-9999.ebuild
+++ b/app-office/scribus/scribus-9999.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-office/scribus/scribus-9999.ebuild,v 1.11 2015/01/28 08:49:52 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-9999.ebuild,v 1.12 2015/02/17 12:05:45 jlec Exp $

 EAPI=5

@ -65,7 +65,7 @@ COMMON_DEPEND="
 	graphicsmagick? ( media-gfx/graphicsmagick )
 	osg? ( dev-games/openscenegraph )
 	pdf? ( app-text/podofo )
-	poppler? ( >=app-text/poppler-0.19.0 )
+	poppler? ( >=app-text/poppler-0.19.0:= )
 	scripts? ( virtual/python-imaging[tk?,${PYTHON_USEDEP}] )
 	tk? ( virtual/python-imaging[tk?,${PYTHON_USEDEP}] )
 "
--- 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.7 2015/02/16 09:20:09 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.20.1-r4.ebuild,v 1.8 2015/02/17 08:11:46 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-libs/boehm-gc/boehm-gc-7.4.2.ebuild
+++ b/dev-libs/boehm-gc/boehm-gc-7.4.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/dev-libs/boehm-gc/boehm-gc-7.4.2.ebuild,v 1.1 2014/06/17 06:11:45 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/boehm-gc/boehm-gc-7.4.2.ebuild,v 1.2 2015/02/17 08:46:08 jer Exp $

 EAPI=5

@ -14,7 +14,7 @@ SRC_URI="http://www.hboehm.info/gc/gc_source/${MY_P}.tar.gz"

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

 DEPEND=">=dev-libs/libatomic_ops-7.4
--- a/dev-libs/c-blosc/c-blosc-1.3.2.ebuild
+++ b/dev-libs/c-blosc/c-blosc-1.3.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/dev-libs/c-blosc/c-blosc-1.3.2.ebuild,v 1.2 2014/02/10 19:56:15 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/c-blosc/c-blosc-1.3.2.ebuild,v 1.4 2015/02/17 13:25:38 jlec Exp $

 EAPI=5

--- a/dev-libs/c-blosc/metadata.xml
+++ b/dev-libs/c-blosc/metadata.xml
@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
-<longdescription lang='en'>
+  <herd>sci</herd>
+  <longdescription lang="en">
  Blosc is a compression library designed to transmit data to the
  processor cache faster than the traditional non-compressed memory fetch. 
  Compression ratios are not very high, but the decompression is very
  fast. Blosc is meant not only to reduce the size of large datasets on-disk
  or in-memory, but also to accelerate memory-bound computations.
 </longdescription>
-<use>
-  <flag name="lz4">Enable lz4 compression</flag>
-  <flag name="snappy">Enable snappy compression</flag>
-</use>
+  <use>
+    <flag name="lz4">Enable lz4 compression</flag>
+    <flag name="snappy">Enable snappy compression</flag>
+  </use>
 </pkgmetadata>
--- a/dev-libs/libatomic_ops/libatomic_ops-7.4.2.ebuild
+++ b/dev-libs/libatomic_ops/libatomic_ops-7.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-libs/libatomic_ops/libatomic_ops-7.4.2.ebuild,v 1.1 2015/02/13 19:17:33 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libatomic_ops/libatomic_ops-7.4.2.ebuild,v 1.2 2015/02/17 08:45:36 jer Exp $

 EAPI=5
 inherit autotools eutils
@ -12,7 +12,7 @@ SRC_URI="https://github.com/ivmai/${PN}/archive/${MY_P}.tar.gz"

 LICENSE="MIT boehm-gc GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""

 S=${WORKDIR}/${PN}-${MY_P}
--- a/dev-perl/ExtUtils-CChecker/ExtUtils-CChecker-0.90.0.ebuild
+++ b/dev-perl/ExtUtils-CChecker/ExtUtils-CChecker-0.90.0.ebuild
@ -0,0 +1,21 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/ExtUtils-CChecker/ExtUtils-CChecker-0.90.0.ebuild,v 1.1 2015/02/17 13:05:37 chainsaw Exp $
+
+EAPI=5
+MODULE_AUTHOR=PEVANS
+MODULE_VERSION=0.09
+
+inherit perl-module
+
+DESCRIPTION="Configure-time utilities for using C headers"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="virtual/perl-Module-Build
+	test? ( dev-perl/Test-Fatal
+	virtual/perl-Test-Simple )
+"
+RDEPEND="virtual/perl-ExtUtils-CBuilder"
+SRC_TEST="do"
--- a/dev-perl/ExtUtils-CChecker/Manifest
+++ b/dev-perl/ExtUtils-CChecker/Manifest
@ -0,0 +1 @@
+DIST ExtUtils-CChecker-0.09.tar.gz 21237 SHA256 ebf167e3f98b4b1ff8e7a5e98d084558b87d0b19442f5da33233ef6b2eb66ad7 SHA512 51068985b7c62af407a600dc665031966abf45775ac1e4ce97d49474af070df86622db47a1248aaa8f89e3544f4937665287162cf3f80cbc930bf56d57d8d6b3 WHIRLPOOL 827940320cf1acb1f3ea8d208fee43215227dedb5bda7ef068f32c5f64f966de55ab7e78aebd20701f5a0b704563685af8577fab535dfafd19ef5781b3d889ef
--- a/dev-perl/ExtUtils-CChecker/metadata.xml
+++ b/dev-perl/ExtUtils-CChecker/metadata.xml
@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>perl</herd>
+  <maintainer>
+    <email>chainsaw@gentoo.org</email>
+    <name>Tony Vroon</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="cpan">ExtUtils-CChecker</remote-id>
+    <remote-id type="cpan-module">ExtUtils::CChecker</remote-id>
+  </upstream>
+</pkgmetadata>
--- a/dev-perl/Socket-GetAddrInfo/Manifest
+++ b/dev-perl/Socket-GetAddrInfo/Manifest
@ -0,0 +1 @@
+DIST Socket-GetAddrInfo-0.22.tar.gz 90579 SHA256 097c4c02bfda4f3042fb2978f6e4ca5991202ef26ceb782bb76430a01812fcbe SHA512 3117ad5931dd116f45afa041b7aad4506382c4359b67e61564affba6f34fe14db5dbe0dc0a1bf4c0b680847bda58958604907ff0339d500728b44301cf1fe554 WHIRLPOOL c8aa552a9f3531fffccbd314cfd9eda90a5ae00c8785009e9d65042e0d19bb2101ffa48d2fcec38f04d11a26b90a8a89d679266c21b2ba303d4ba9a15d0c8a32
--- a/dev-perl/Socket-GetAddrInfo/Socket-GetAddrInfo-0.220.0.ebuild
+++ b/dev-perl/Socket-GetAddrInfo/Socket-GetAddrInfo-0.220.0.ebuild
@ -0,0 +1,26 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Socket-GetAddrInfo/Socket-GetAddrInfo-0.220.0.ebuild,v 1.1 2015/02/17 13:30:04 chainsaw Exp $
+
+EAPI=5
+MODULE_AUTHOR="PEVANS"
+MODULE_VERSION="0.22"
+
+inherit perl-module
+
+DESCRIPTION="Address-family independent name resolving functions"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND=">=dev-perl/ExtUtils-CChecker-0.60.0
+	virtual/perl-ExtUtils-CBuilder
+	virtual/perl-Module-Build
+	virtual/perl-Scalar-List-Utils
+	virtual/perl-XSLoader
+	test? ( virtual/perl-Test-Simple )
+"
+RDEPEND="virtual/perl-Exporter
+	 virtual/perl-Socket"
+PERL_RM_FILES=( t/99pod.t )
+SRC_TEST="do"
--- a/dev-perl/Socket-GetAddrInfo/metadata.xml
+++ b/dev-perl/Socket-GetAddrInfo/metadata.xml
@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>perl</herd>
+  <maintainer>
+    <email>chainsaw@gentoo.org</email>
+    <name>Tony Vroon</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="cpan">Socket-GetAddrInfo</remote-id>
+    <remote-id type="cpan-module">Socket::GetAddrInfo</remote-id>
+  </upstream>
+</pkgmetadata>
--- a/dev-python/Djblets/metadata.xml
+++ b/dev-python/Djblets/metadata.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>maintainer-wanted@gentoo.org</email>
-</maintainer>
+	<maintainer>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
 </pkgmetadata>
--- 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.12 2015/02/16 08:34:25 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.11.1.ebuild,v 1.13 2015/02/17 11:09:13 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/bcrypt/Manifest
+++ b/dev-python/bcrypt/Manifest
@ -1 +1,2 @@
 DIST bcrypt-1.0.2.tar.gz 39090 SHA256 03c9e8cab644dec13c94a61eccdd930c87d62363f871bfe2ee12421703f27e8b SHA512 cd27897378cf711c6dabc351e30aa063f216133af06a6f9ce63e7cc0f95e0b14cd58806cbf82ad410ca5d5a02adc43be5b76400ae353bf60520f57b76b1bf1a4 WHIRLPOOL 5c15dc34e56f6cfa64aaa30dc182837f1f7bba84906429d1ebee335d3c8d0ed146809bdf766c964e3f5d226082b79148e537b71e6a75fb5f0005178eadb31ef7
+DIST bcrypt-1.1.0.tar.gz 39505 SHA256 4b1986dcbe185c2d95b3b9aea34b5c372743ed826cd10b682eda8512855c11bd SHA512 c9a6445982b5a9a0983a3198b5b92192100fa37b3920e364513744d9af72e99e58599f798ee4d0ff21b6f5c19ecd493e9e7caef9967e543e691f372d605ded3e WHIRLPOOL 701804969199f8759a773e1f6dde6ec3931d3608f650bcf4261ece7b4ecd4cbea046051f4bf99c5b467d58123c447574f856c21133f8b0dd2a8714e9312e6ec3
--- a/dev-python/bcrypt/bcrypt-1.1.0.ebuild
+++ b/dev-python/bcrypt/bcrypt-1.1.0.ebuild
@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/bcrypt/bcrypt-1.1.0.ebuild,v 1.1 2015/02/17 11:14:53 jlec Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{2,3,4} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Modern password hashing for software and servers"
+HOMEPAGE="https://github.com/pyca/bcrypt/ https://pypi.python.org/pypi/bcrypt/"
+SRC_URI="
+	https://github.com/pyca/bcrypt/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+	"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		)"
+RDEPEND="
+	>=dev-python/cffi-0.8:=[${PYTHON_USEDEP}]
+	>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
+	!dev-python/py-bcrypt"
+
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_test() {
+	esetup.py test
+}
--- a/dev-python/bcrypt/metadata.xml
+++ b/dev-python/bcrypt/metadata.xml
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
-        <herd>openstack</herd>
+  <herd>python</herd>
+  <herd>openstack</herd>
 </pkgmetadata>
--- a/dev-python/blessings/Manifest
+++ b/dev-python/blessings/Manifest
@ -0,0 +1 @@
+DIST blessings-1.6.tar.gz 19974 SHA256 edc5713061f10966048bf6b40d9a514b381e0ba849c64e034c4ef6c1847d3007 SHA512 5d0fc365416bf2b36b6de72f6b8c01bf0ab8df4a0148f492c80056a9ebd5d569e9c01966481e0d70a25add16da2bc3e73be933226369abca533ce019f97479f2 WHIRLPOOL 44dc96c1da174465b5dc3dd38c4d7ccc17408d072d290819c52d33e7e249bbbf428c7ee217faf3ec6acbe1e620b5e0cb2627c4dc3f0162cb21a810ce50e8b1c6
--- a/dev-python/blessings/blessings-1.6.ebuild
+++ b/dev-python/blessings/blessings-1.6.ebuild
@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/blessings/blessings-1.6.ebuild,v 1.1 2015/02/17 12:36:20 jlec Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} )
+
+inherit distutils-r1
+
+DESCRIPTION="A thin, practical wrapper around terminal coloring, styling, and positioning"
+HOMEPAGE="https://github.com/erikrose/blessings https://pypi.python.org/pypi/blessings/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+DEPEND="dev-python/nose[${PYTHON_USEDEP}]"
+
+python_test() {
+	nosetests --verbosity=3 ${PN} || die
+}
--- a/dev-python/blessings/metadata.xml
+++ b/dev-python/blessings/metadata.xml
@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer>
+    <email>jlec@gentoo.org</email>
+    <name>Justin Lecher</name>
+  </maintainer>
+</pkgmetadata>
--- a/dev-python/bottleneck/Manifest
+++ b/dev-python/bottleneck/Manifest
@ -1,3 +1 @@
-DIST Bottleneck-0.6.0.tar.gz 3171952 SHA256 eddfdc0492e7b0d2749d4a8861503186446d09d73f3eeb3f064a80313ded2f65 SHA512 dfd477053953c36b6b1934c2ef6eb89a6adf1689ff92da76c2a0960f31432c175d972ac54157b899d882b2af2583dec43dcfd9e33bcc0e2c1de297f2425e2c9b WHIRLPOOL 95d02bc5ba2e331ddea05367dc260123d8ef5c359794bc73b0e7ef4e7ef9a37991fee44c4d8a20cf07a6a19695c9e64f1e2a8e55aab61f2ddd66fa947f4e4c51
-DIST Bottleneck-0.7.0.tar.gz 1634309 SHA256 8d7bc7eac458632603fc10c71f26c0f9f976293ff394f48efae6ecd4c79b21fc SHA512 6bc077997624da3d29f71a5fcc70fb5dcfe3afab02fefe6c75de1e4bc689886532c7c1ae5f4aec5d73b24d456d8d7b9409817cb6bb857accaf275a0b42f281f7 WHIRLPOOL fb3877339acd241f3e280c349aabafb4cccc987a2ad3a9c637930a51f71053e2bda9aa7ddecdc2533cd0f13987546e63a3437866b524cbf6bf057ba43a8a2880
 DIST Bottleneck-0.8.0.tar.gz 1634340 SHA256 f0a980510239f685ebaf4dbc8c9f0e55ac964312e0d11c551208c250d22cc64b SHA512 5b03ce2d0df9d177534d3f1fa02f147b12b23f5fbaa3b2685d1e8b86848c96c54832e0b0b6364479841742785c0b23bcccb51a0ac95675c72efc39693121dcaf WHIRLPOOL 873559617ad5114b953b9824da57bf7d393aa04372ad3c44307fecd875a076864d2509bed4b214372549db97a6c617f5471d1e723ff1a668a3240b7c6ed84a25
--- a/dev-python/bottleneck/bottleneck-0.6.0.ebuild
+++ b/dev-python/bottleneck/bottleneck-0.6.0.ebuild
@ -1,38 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/bottleneck/bottleneck-0.6.0.ebuild,v 1.3 2014/01/14 13:55:58 ago Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
-
-inherit distutils-r1
-
-MY_PN="Bottleneck"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Fast NumPy array functions written in Cython"
-HOMEPAGE="
-	https://pypi.python.org/pypi/Bottleneck
-	http://berkeleyanalytics.com/bottleneck
-	http://github.com/kwgoodman/bottleneck"
-SRC_URI="mirror://pypi/B/${MY_PN}/${MY_P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/cython[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}"/${MY_P}
-
-python_test() {
-	cd "${BUILD_DIR}" || die
-	${PYTHON} -c "import bottleneck;bottleneck.test(extra_argv=['--verbosity=3'])" || die
-}
--- a/dev-python/bottleneck/bottleneck-0.7.0.ebuild
+++ b/dev-python/bottleneck/bottleneck-0.7.0.ebuild
@ -1,43 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/bottleneck/bottleneck-0.7.0.ebuild,v 1.1 2014/01/12 10:03:27 jlec Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
-
-inherit distutils-r1
-
-MY_PN="Bottleneck"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Fast NumPy array functions written in Cython"
-HOMEPAGE="
-	https://pypi.python.org/pypi/Bottleneck
-	http://berkeleyanalytics.com/bottleneck
-	http://github.com/kwgoodman/bottleneck"
-SRC_URI="mirror://pypi/B/${MY_PN}/${MY_P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/cython[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}"/${MY_P}
-
-python_prepare_all() {
-	emake cfiles
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	cd "${BUILD_DIR}" || die
-	${PYTHON} -c "import bottleneck;bottleneck.test(extra_argv=['--verbosity=3'])" || die
-}
--- a/dev-python/bottleneck/metadata.xml
+++ b/dev-python/bottleneck/metadata.xml
@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-mathematics</herd>
-<longdescription>
+  <herd>sci-mathematics</herd>
+  <longdescription>
  Bottleneck is a collection of fast NumPy array functions written in
  Cython.
 </longdescription>
-<upstream>
-  <remote-id type="pypi">Bottleneck</remote-id>
-</upstream>
+  <upstream>
+    <remote-id type="pypi">Bottleneck</remote-id>
+  </upstream>
 </pkgmetadata>
--- a/dev-python/bpython/Manifest
+++ b/dev-python/bpython/Manifest
@ -1,2 +1,3 @@
 DIST bpython-0.13.1.tar.gz 156558 SHA256 ee208a60a54f902a8c827f4a80fda8a6235790d59cc1fc089943df50936accae SHA512 cb3f1e8d8df5eb9978956b3503ef98b1c39e80704792281be7e560ec0d648aefa6d979ab45a642ec369fc252e7fde399013aa1a4154ceb73465bc3d95bea4b19 WHIRLPOOL a5d00b92507d1970de95f20ee54723774432687b1f11637f3aa75f9e8979e93015034f37253bd947100436f8400cdbe2ba523b6517a7ba265950b3f20dc6f9db
 DIST bpython-0.13.2.tar.gz 158551 SHA256 a1870a78e44ed6ef54aa906c58234cb0d12011f2e9a49dc29bd5d9423abfbde2 SHA512 6bf74c9618bf92fc6ca23c9020b17219c64b16f159773624b67f87875c962857bde2dd4b03da621da7c8d50622739f95a880638c7c536f5f0dbf510c71f5a874 WHIRLPOOL 71da7518100bd73868ab53e1d13cb8831b0f6629713b993729948f38df52262537b8605f9304ff0edeca5e4f4d3435677c61e84b2d6fc54b2d66df74e756318c
+DIST bpython-0.14.tar.gz 184430 SHA256 f7c9fc80fc5a4eb6a345a67815e31957c0c65c1bbdfc68cf99267cdc81a3d35b SHA512 1c43af30902ac01385a4f9d0af1f7531f190dea9ee0d43725d5a23d881874184beca1df9fc8f94f21110d99ca07a851861c56976199e9306515e2b00ca07f1f7 WHIRLPOOL 21dc44b48a0fb31d0c125fc203f90fe7750e81599353a51c215672ed82218fc3b4f544cdb530d6447d099e4eaa5983ad52b8f48e1e83bcf4799dad190af797eb
--- a/dev-python/bpython/bpython-0.14.ebuild
+++ b/dev-python/bpython/bpython-0.14.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/bpython/bpython-0.14.ebuild,v 1.1 2015/02/17 13:39:19 jlec Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} )
+
+PYTHON_REQ_USE="ncurses"
+
+inherit distutils-r1
+
+DESCRIPTION="Syntax highlighting and autocompletion for the Python interpreter"
+HOMEPAGE="http://www.bpython-interpreter.org/ https://bitbucket.org/bobf/bpython/ http://pypi.python.org/pypi/bpython"
+SRC_URI="
+	http://www.bpython-interpreter.org/releases/${P}.tar.gz
+	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+	"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc gtk test"
+
+RDEPEND="
+	dev-python/curtsies[${PYTHON_USEDEP}]
+	dev-python/greenlet[${PYTHON_USEDEP}]
+	dev-python/jedi[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/six-1.4[${PYTHON_USEDEP}]
+	dev-python/urwid[${PYTHON_USEDEP}]
+	dev-python/watchdog[${PYTHON_USEDEP}]
+	gtk? (
+		dev-python/pygobject:2[$(python_gen_usedep python2_7)]
+		dev-python/pygtk[$(python_gen_usedep python2_7)]
+		)
+	"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/mock[${PYTHON_USEDEP}] )"
+
+DOCS=( AUTHORS CHANGELOG sample.theme light.theme )
+
+PATCHES=( "${FILESDIR}"/${PN}-desktop.patch )
+
+# Req'd for clean build by each impl
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_compile_all() {
+	if use doc; then
+		sphinx-build -b html -c doc/sphinx/source/ \
+			doc/sphinx/source/ doc/sphinx/source/html || die "docs build failed"
+	fi
+}
+
+python_install() {
+	distutils-r1_python_install
+	if ! use gtk; then
+		rm -f "${D}"usr/bin/bpython-gtk*
+		# delete_unneeded_modules() {
+		rm -f "${D}$(python_get_sitedir)/bpython/gtk_.py"
+	fi
+}
+
+python_test() {
+	pushd build/lib > /dev/null
+	# https://bitbucket.org/bobf/bpython/issue/289/test-failures-in-latest-release-py27-py33
+	sed -e s':test_enter:_&:' -i bpython/test/test_repl.py || die
+
+	"${PYTHON}" -m unittest discover || die
+	popd > /dev/null
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/sphinx/source/html/. )
+	distutils-r1_python_install_all
+}
--- a/dev-python/bpython/metadata.xml
+++ b/dev-python/bpython/metadata.xml
@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
-	<maintainer>
-		<email>grozin@gentoo.org</email>
-		<name>Andrey Grozin</name>
-	</maintainer>
-	<longdescription>Syntax highlighting and autocompletion
+  <herd>python</herd>
+  <maintainer>
+    <email>grozin@gentoo.org</email>
+    <name>Andrey Grozin</name>
+  </maintainer>
+  <longdescription>Syntax highlighting and autocompletion
 	  for the python interpreter
 	</longdescription>
 </pkgmetadata>
--- a/dev-python/curtsies/Manifest
+++ b/dev-python/curtsies/Manifest
@ -0,0 +1 @@
+DIST curtsies-0.1.18.tar.gz 44353 SHA256 477121f256eea2b71237492e2924f05b54e1f91815d042bf91d7112b71d4edd4 SHA512 02ae86b215dca10e779061485cb18ab8b6fefbdad10e2bcad3c24890b79f81d1aae0b84467a23ca1951ffaa336fc2fe9b5137c1a10a65fafe0a0b540cc0c819c WHIRLPOOL 801738c450c2fd9343e01260240ebd5ed74e951c03a918808c8c2c47e8ec46afe425f4d8978dea894d2cdf36bc2e3bd19e9de2ed12a62e5786eebeed87dd9800
--- a/dev-python/curtsies/curtsies-0.1.18.ebuild
+++ b/dev-python/curtsies/curtsies-0.1.18.ebuild
@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/curtsies/curtsies-0.1.18.ebuild,v 1.1 2015/02/17 13:26:45 jlec Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} )
+
+inherit distutils-r1
+
+DESCRIPTION="Curses-like terminal wrapper, with colored strings"
+HOMEPAGE="https://github.com/thomasballinger/curtsies"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	dev-python/blessings[${PYTHON_USEDEP}]
+	dev-python/wcwidth[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
--- a/dev-python/curtsies/metadata.xml
+++ b/dev-python/curtsies/metadata.xml
@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer>
+    <email>jlec@gentoo.org</email>
+    <name>Justin Lecher</name>
+  </maintainer>
+</pkgmetadata>
--- 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.5 2015/02/16 09:50:21 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cython/cython-0.21.1.ebuild,v 1.6 2015/02/17 14:36:56 jer 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/elasticsearch-curator/Manifest
+++ b/dev-python/elasticsearch-curator/Manifest
@ -0,0 +1,2 @@
+DIST elasticsearch-1.4.2.tar.gz 27734207 SHA256 31dd6c049745f7dac201f94852b778b0841d6869d358fd80d4c897d0bf73b53c SHA512 b82e644b0b81489ce0d4fc72ca0efa3545c55c4d947faec2537035d440be83bac0f794f1a2863d87649e36f87d250c1f4e46ae57053b50948f47f9ff2a3bf6b6 WHIRLPOOL ac40778a999bc92230547b1405f259b7d348983767a87c71e18ed9ef45367ebf0b5b0517ef57bd423fa47ce4387e982aa7ee4a4ec9b2be75a4771e8d737f0cc5
+DIST elasticsearch-curator-2.1.2.tar.gz 35706 SHA256 93185f57e4fcd84970b78936271c3ddcba69c54d9a799acafe7d16483134cce0 SHA512 4bc4f74ab7d710173f173d47ad5e8c8918267bbc888a2b1b301e799747f73375b159671940cf7d3cc62361adbb320bc3e772d149eb7ff227d4893788810946f1 WHIRLPOOL 156e92a0a5fa4797651d1c066b955304b082edcda815784c5ddb5a025c93f9b4f222f15e5d7ce74e4740bd1c3ab5e67fe21e651186e0062ff3f0e418b0390b09
--- a/dev-python/elasticsearch-curator/elasticsearch-curator-2.1.2.ebuild
+++ b/dev-python/elasticsearch-curator/elasticsearch-curator-2.1.2.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/elasticsearch-curator/elasticsearch-curator-2.1.2.ebuild,v 1.1 2015/02/17 14:13:27 idella4 Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+MY_PN="curator"
+ES_VERSION="1.4.2"
+
+inherit distutils-r1
+
+DESCRIPTION="Tending time-series indices in Elasticsearch"
+HOMEPAGE="https://github.com/elasticsearch/curator"
+SRC_URI="https://github.com/elasticsearch/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	test? ( https://download.elasticsearch.org/elasticsearch/elasticsearch/elasticsearch-${ES_VERSION}.tar.gz )"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND="
+	>=dev-python/elasticsearch-py-1.0.0[${PYTHON_USEDEP}]
+	<dev-python/elasticsearch-py-2.0.0[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND}
+		virtual/jre:1.7
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/nosexcover[${PYTHON_USEDEP}] )
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+python_test() {
+	ES="${WORKDIR}/elasticsearch-${ES_VERSION}"
+	ES_PORT="25123"
+	ES_LOG="${ES}/logs/elasticsearch.log"
+	PID="${ES}/elasticsearch.pid"
+
+	# run Elasticsearch instance on custom port
+	sed -i "s/#http.port: 9200/http.port: ${ES_PORT}/g" ${ES}/config/elasticsearch.yml
+	${ES}/bin/elasticsearch -d -p ${PID}
+
+	for i in `seq 10`; do
+		grep -q "started" ${ES_LOG} 2> /dev/null
+		if [ $? -eq 0 ]; then
+			einfo "Elasticsearch started"
+			eend 0
+			break
+		elif grep -q 'BindException\[Address already in use\]' "${ES_LOG}" 2>/dev/null; then
+			eend 1
+			eerror "Elasticsearch already running"
+			die "Cannot start Elasticsearch for tests"
+		else
+			einfo "Waiting for Elasticsearch"
+			eend 1
+			sleep 2
+			continue
+		fi
+	done
+
+	export TEST_ES_SERVER="localhost:${ES_PORT}"
+	esetup.py test || die "Tests failed on ${EPYTHON}"
+
+	pkill -F ${PID}
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
--- a/dev-python/elasticsearch-curator/metadata.xml
+++ b/dev-python/elasticsearch-curator/metadata.xml
@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>proxy-maintainers</herd>
+        <maintainer>
+                <email>idella4@gentoo.org</email>
+        </maintainer>
+        <maintainer>
+                <email>hydrapolic@gmail.com</email>
+                <name>Tomas Mozes</name>
+                <description>Proxy maintainer</description>
+        </maintainer>
+</pkgmetadata>
--- a/dev-python/ijson/Manifest
+++ b/dev-python/ijson/Manifest
@ -1,2 +1,3 @@
 DIST ijson-1.1.tar.gz 8415 SHA256 33d10eac83d6dd757e2861b4ce06b3467a828481d608017af3d0caeb023ba32a SHA512 aebb3e46688b785a18366230b9f94c1b36d44f0764d8603b7ae50a2426b53eddad883c5d1fbda8f52d655d789880f1a7329bc6d1383ed963e9835d7ec40bdfdf WHIRLPOOL 3921e6fa8f0f8a1b17aa234cdcdcf3fc0d3bb97fce78803b84502ac762f5526cc526ee5fc48d65ecf4e88cde90be71414ef4912bf95781070e5266b7b3809f7b
 DIST ijson-2.0.tar.gz 9560 SHA256 85bfc06b2bb492f205bc5dd9531ff0e64d2e18e03e64665934715d58331c1dd8 SHA512 8ea8b89766d3e3ccc3f0bf348ba9068cd80f24aa7648e7bfd2272e701430445f2ab81744280dce8dde9e18dd0582f0fde784aae61493479b4f5a44a5175d7fc7 WHIRLPOOL 495e023bc79b5ffe55e50975af3c6fb65993156b2a9a32e1b98b1891fc8235c739d854baf511625fba5b1806fcbef8944809e3de13e7feaaedfeb8489c6d7fe3
+DIST ijson-2.1.tar.gz 9859 SHA256 bc69a512399db0469f5faabe34f9f7ce21964d1993c6a6720cc4cea911fb8a45 SHA512 67773540c1d7df6aaaf22b064d0ea7660c8b69b4371a15ec9f46228f1ebbe604aa29b1d93821f62928b41841ecd411419d39c636aae7dddacffd2b8d881d865e WHIRLPOOL ede0bb85abad4023d06eeb036249ffeb2aaafb95774da9a280cb765e2ac0c5e40dfa3ca80a0f043616884391da97d95847ff727e4593ecc9c3db045606c1567b
--- a/dev-python/ijson/ijson-2.1.ebuild
+++ b/dev-python/ijson/ijson-2.1.ebuild
@ -0,0 +1,20 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ijson/ijson-2.1.ebuild,v 1.1 2015/02/17 07:10:41 radhermit Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit distutils-r1
+
+DESCRIPTION="Iterative JSON parser with a Pythonic interface"
+HOMEPAGE="https://github.com/isagalaev/ijson http://pypi.python.org/pypi/ijson/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-libs/yajl"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
--- a/dev-python/libasyncns-python/metadata.xml
+++ b/dev-python/libasyncns-python/metadata.xml
@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>hanno@gentoo.org</email></maintainer>
+  <maintainer>
+    <email>jlec@gentoo.org</email>
+  </maintainer>
 </pkgmetadata>
--- a/dev-python/pyclamav/pyclamav-0.4.1-r2.ebuild
+++ b/dev-python/pyclamav/pyclamav-0.4.1-r2.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-python/pyclamav/pyclamav-0.4.1-r2.ebuild,v 1.1 2015/02/17 08:50:08 idella4 Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python binding for libclamav"
+HOMEPAGE="http://xael.org/norman/python/pyclamav/ http://pypi.python.org/pypi/pyclamav"
+SRC_URI="http://xael.org/norman/python/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~x86"
+IUSE=""
+
+DEPEND=">=app-antivirus/clamav-0.90"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-clamav-0.95.patch )
+DOCS=( README.txt  example.py )
+
+src_install() {
+	distutils-r1_src_install
+
+	insinto /usr/share/doc/${PF}
+	doins example.py
+}
+
+pkg_postinst() {
+	elog "an example called example.py has been installed into /usr/share/doc/${PF}"
+}
--- a/dev-python/pytables/Manifest
+++ b/dev-python/pytables/Manifest
@ -1,3 +1 @@
-DIST tables-3.0.0.tar.gz 6191726 SHA256 53532a59c8f03c3c5ef3c73c04f5bfd8384d6a3d508683cb87fc17af4c71dfe1 SHA512 3486393e2bcf9b4a45787dae030a5399fbda90aba9d49cb6bd681a6fd4ed3d3fa84033f63c600e83e26cffb0f961025cf6e3479d3cf7e96877bc333ef12fad12 WHIRLPOOL 2376eaf0cc08cf3910c2449f2df6881d81a8bca8aaf0e10a41f54327665171b2985a91ceb9ac1e8e077c259ed882644ee7ab69ba6cfc924dd6e5e60fd4d062d1
-DIST tables-3.1.0.tar.gz 6705769 SHA256 92bd5052c61fef3d55505dcb1162150ea5e274b76c4e41633e8f78a9ad5f4dc1 SHA512 ffd7ae629352a2659ed6d66cac9f89441b5fb09efc2e78a57c24bcd1d1a2ffeddbf830553f1131faaee72168413c3397fe07be49094ae4a0cf404f71ac2b5b77 WHIRLPOOL 96c19b547eabe88e88b8df09000a8ab105f046187553d8be3f21dd357fcedfcf0d12eefa339ac7b49cd54b1591cccef35ce5fd5ff9bb1fb073d0496fd73bb728
 DIST tables-3.1.1.tar.gz 6715786 SHA256 39b9036376f1185599771c19276f13b5b9119d98f9108f58595745ded3fe2da3 SHA512 b5b2052dd81c4748c5e26c1f61f9f92891f48335b0a553f7602ab11c9029dd673d27b91e24cac0da21a81df0c26dbcd9a438214fa58af1ae831c5f04dfa212a6 WHIRLPOOL 86fd6dc9e12503fdbd23013b75f33a41eadbbac0e6dd5ac9a91476d073195077fc6b3d5ad24b1dd4b4c18ae7ed8abc8ea1708262e52240f4c2c3b1153f8c9e91
--- a/dev-python/pytables/metadata.xml
+++ b/dev-python/pytables/metadata.xml
@ -11,9 +11,6 @@
  from Pyrex sources, makes it a fast, yet extremely easy to use tool
  for interactively save and retrieve large amounts of data.
 </longdescription>
-  <use>
-    <flag name="contrib">Install user-contributed files</flag>
-  </use>
  <upstream>
    <remote-id type="pypi">tables</remote-id>
  </upstream>
--- a/dev-python/pytables/pytables-3.0.0.ebuild
+++ b/dev-python/pytables/pytables-3.0.0.ebuild
@ -1,65 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pytables/pytables-3.0.0.ebuild,v 1.4 2014/02/24 01:17:47 phajdan.jr Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
-
-MY_PN=tables
-MY_P=${MY_PN}-${PV}
-
-inherit distutils-r1
-
-DESCRIPTION="Hierarchical datasets for Python"
-HOMEPAGE="http://www.pytables.org/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-LICENSE="BSD"
-IUSE="doc contrib examples"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	sci-libs/hdf5:=
-	>=dev-python/numpy-1.6.0[${PYTHON_USEDEP}]
-	dev-python/numexpr[${PYTHON_USEDEP}]
-	dev-libs/lzo:2
-	app-arch/bzip2"
-DEPEND="${RDEPEND}
-	dev-python/cython[${PYTHON_USEDEP}]"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS=( ANNOUNCE.txt RELEASE_NOTES.txt THANKS )
-
-python_prepare_all() {
-	export HDF5_DIR="${EPREFIX}"/usr
-	sed -i -e "s:/usr:${EPREFIX}/usr:g" setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	cd "${BUILD_DIR}"/lib* || die
-	${EPYTHON} tables/tests/test_all.py || die
-}
-
-python_install_all() {
-	if use doc; then
-		HTML_DOCS=( doc/html/. )
-		DOCS+=( doc/scripts )
-	fi
-	distutils-r1_python_install_all
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-
-	if use contrib; then
-		insinto /usr/share/${PF}
-		doins -r contrib
-	fi
-}
--- a/dev-python/pytables/pytables-3.1.0.ebuild
+++ b/dev-python/pytables/pytables-3.1.0.ebuild
@ -1,66 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pytables/pytables-3.1.0.ebuild,v 1.1 2014/02/21 14:12:56 jlec Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
-
-MY_PN=tables
-MY_P=${MY_PN}-${PV}
-
-inherit distutils-r1
-
-DESCRIPTION="Hierarchical datasets for Python"
-HOMEPAGE="http://www.pytables.org/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-LICENSE="BSD"
-IUSE="doc contrib examples"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	sci-libs/hdf5:=
-	>=dev-python/numpy-1.6.0[${PYTHON_USEDEP}]
-	dev-python/numexpr[${PYTHON_USEDEP}]
-	dev-libs/lzo:2
-	app-arch/bzip2"
-DEPEND="${RDEPEND}
-	dev-python/cython[${PYTHON_USEDEP}]"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS=( ANNOUNCE.txt RELEASE_NOTES.txt THANKS )
-
-python_prepare_all() {
-	export HDF5_DIR="${EPREFIX}"/usr
-	sed -i -e "s:/usr:${EPREFIX}/usr:g" setup.py || die
-	rm -rf internal-complibs || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	cd "${BUILD_DIR}"/lib* || die
-	${EPYTHON} tables/tests/test_all.py || die
-}
-
-python_install_all() {
-	if use doc; then
-		HTML_DOCS=( doc/html/. )
-		DOCS+=( doc/scripts )
-	fi
-	distutils-r1_python_install_all
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-
-	if use contrib; then
-		insinto /usr/share/${PF}
-		doins -r contrib
-	fi
-}
--- a/dev-python/pytables/pytables-3.1.1.ebuild
+++ b/dev-python/pytables/pytables-3.1.1.ebuild
@ -1,72 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pytables/pytables-3.1.1.ebuild,v 1.4 2014/10/31 12:52:06 jlec Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} )
-
-MY_PN=tables
-MY_P=${MY_PN}-${PV}
-
-inherit distutils-r1
-
-DESCRIPTION="Hierarchical datasets for Python"
-HOMEPAGE="http://www.pytables.org/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-LICENSE="BSD"
-IUSE="doc examples"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	app-arch/bzip2:0=
-	dev-libs/c-blosc:0=
-	dev-libs/lzo:2=
-	<dev-python/numpy-1.9[${PYTHON_USEDEP}]
-	dev-python/numexpr[${PYTHON_USEDEP}]
-	sci-libs/hdf5:0="
-DEPEND="${RDEPEND}
-	>=dev-python/cython-0.14[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( ANNOUNCE.txt RELEASE_NOTES.txt THANKS )
-
-PATCHES=(
-	"${FILESDIR}"/${P}-cython-backport.patch
-	)
-
-python_prepare_all() {
-	export HDF5_DIR="${EPREFIX}"/usr
-	sed -i -e "s:/usr:${EPREFIX}/usr:g" setup.py || die
-	rm -r c-blosc/{blosc,internal-complibs} || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
-	distutils-r1_python_compile
-}
-
-python_test() {
-	cd "${BUILD_DIR}"/lib* || die
-	${EPYTHON} tables/tests/test_all.py || die
-}
-
-python_install_all() {
-	if use doc; then
-		HTML_DOCS=( doc/html/. )
-		DOCS+=( doc/scripts )
-	fi
-	distutils-r1_python_install_all
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-		doins -r contrib
-	fi
-}
--- a/dev-python/python-docs/python-docs-2.7.8.ebuild
+++ b/dev-python/python-docs/python-docs-2.7.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-python/python-docs/python-docs-2.7.8.ebuild,v 1.2 2015/02/16 13:55:32 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-docs/python-docs-2.7.8.ebuild,v 1.3 2015/02/17 07:43:02 jer Exp $

 EAPI="5"

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

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

 DEPEND=""
--- a/dev-python/pyzmq/pyzmq-14.5.0.ebuild
+++ b/dev-python/pyzmq/pyzmq-14.5.0.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/pyzmq/pyzmq-14.5.0.ebuild,v 1.2 2015/02/11 10:50:51 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyzmq/pyzmq-14.5.0.ebuild,v 1.3 2015/02/17 12:04:29 jlec Exp $

 EAPI=5

@ -22,7 +22,7 @@ REQUIRED_USE="test? ( green )"

 PY2_USEDEP=$(python_gen_usedep python2_7)
 RDEPEND="
-	>=net-libs/zeromq-4.0.5
+	>=net-libs/zeromq-4.0.5:=
 	dev-python/py[${PYTHON_USEDEP}]
 	dev-python/cffi[${PYTHON_USEDEP}]
 	green? ( dev-python/gevent[${PY2_USEDEP}] )"
--- a/dev-python/sh/Manifest
+++ b/dev-python/sh/Manifest
@ -1,3 +1,4 @@
 DIST sh-1.07.tar.gz 24554 SHA256 8eb743d1ccf03508022e5b5cd76063320cfe36f039a3625dce703a810a5f57e1 SHA512 922d674c0378fdc13b2934e345d9d0e63b1e9ad1e0fe140cfac981546b50fb5a66f6c423382a60a87c2acd44c625d1d4e6036587015cdbaa682b471678dde185 WHIRLPOOL f649a09433fcb4c7d1d79e6fa39fd137b288f6413c2dec0e092831d063c63dfbd344746a1e4c29ac476b46955989c4eeadce6c26f2a4011d28c696186a3b1587
 DIST sh-1.08.tar.gz 26310 SHA256 4b9700496659e1aa44bb2292ecb6c7d0c5d7763b184fd7eac37df0f2ded4bae8 SHA512 84c8c4f2f5e35ac329e892266e16a9ec23cf363456ba94f43488c0aad8a323ee5881287dea34d1b3b37431e0a6e52c989de0f9296a8eab8434ac22da5b88d8fa WHIRLPOOL 4a4daea1252d3a6b1de8bbeb7ed1831ab90942910c67b28b293133ca844b441376a03becd6ac41420b73d9c85b0aba882bc0e30441f7899e6fc67820bfbe4dd2
 DIST sh-1.09.tar.gz 26382 SHA256 f3d174e2ad25c39f28935bae672be51aa083063d3122405ceeb2a3e7a8239d45 SHA512 a4540a924ff8698c795a618ba8d5ef3dc0dca1880f2f6152393be204008059adda867deb7cc97db361a0011573e5dda6f4daef6cb60f637aa40a710915236771 WHIRLPOOL 9e83d6c231fc24a538544d7920c572f4f5aa3e98e5d82b6b4f478fe828e59ba511685643db31a626bec01751c227a881c93d6f828b35aa3aa7d2b5f5b0c92720
+DIST sh-1.11.tar.gz 36821 SHA256 590fb9b84abf8b1f560df92d73d87965f1e85c6b8330f8a5f6b336b36f0559a4 SHA512 ccaf178384b5a609c00bb44796a6bec088750414385f19b2d8ffcb93cc8f5ddb6bf82fb966d2bf519651f6efed54258a3c6542a9827d01e6be64af8cb8f86d3d WHIRLPOOL 9d13a3364ec467b492fb5818ae00e3a02f81aa779319382450df76a3041efb047dac82bd249cb51bf819664a5e7a8f9def3a672b8eb2edaa24f2a2aa80d66129
--- a/dev-python/sh/sh-1.11.ebuild
+++ b/dev-python/sh/sh-1.11.ebuild
@ -0,0 +1,26 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sh/sh-1.11.ebuild,v 1.1 2015/02/17 12:01:17 jlec Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=(python2_7 python3_{2,3,4} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python subprocess interface"
+HOMEPAGE="https://github.com/amoffat/sh"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}
+		dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	${PYTHON} test.py || die
+}
--- a/dev-python/sip/sip-4.16.2.ebuild
+++ b/dev-python/sip/sip-4.16.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/sip/sip-4.16.2.ebuild,v 1.11 2015/02/16 08:34:28 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/sip-4.16.2.ebuild,v 1.12 2015/02/17 11:09:15 ago Exp $

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

 # Sub-slot based on SIP_API_MAJOR_NR from siplib/sip.h.in
 SLOT="0/11"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug doc"

 DEPEND="${PYTHON_DEPS}"
--- a/dev-python/urwid/Manifest
+++ b/dev-python/urwid/Manifest
@ -1,2 +1,3 @@
 DIST urwid-1.2.1.tar.gz 578088 SHA256 9b9b5dabb7df6c0f12e84feed488f9a9ddd5c2d66d1b7c7c087055720b87c68c SHA512 8f67887007912e79d32e55caf9615db4d01e3eff0fc9fe056b89e1e0c2db132178b5640dc38d2dbbe59036f6842d8b5e7161bcd49526f1baec25992dd4427fd6 WHIRLPOOL 29cfb322cbfbfcccfc1ab4dbb72ed869157a856769674397b22b5bafc3b0155f4d8105b55bf0549a0e8999fce5390ced4c212e003f60d1558c1c006c1c350e4a
 DIST urwid-1.2.2.tar.gz 585025 SHA256 e122e2dee122314f5626945af4dbe15bf3de9f318c552a4c0b68c1c480852d92 SHA512 10d0271e52b28aff3350d3342cd9b1c8fab819f3619cce77286b2545b74dd967f0466e98dfbfef1189b3ab6b38392168367d75c768b0f5b8058666b0211706a5 WHIRLPOOL 69556a721d89f6a6b82664bf5eaa10a21c49d15f9b8e6e6be4ba31ce5e2317fd0ecebfa3d93b008f9bd93f10504161d93e1827d696a6c1baa09939ac628f027d
+DIST urwid-1.3.0.tar.gz 580922 SHA256 29f04fad3bf0a79c5491f7ebec2d50fa086e9d16359896c9204c6a92bc07aba2 SHA512 2743488f2815e6abff8bf2450b2a3d5756fa026587512cf29a3850be0e585d7c2dd4d50fda7bf1589de32eed93637ac0ee88f002de4b9bee0a72dc6574ef6103 WHIRLPOOL c276c26deb557b1c4b8f9f49f7f6c10e0e5a169bc3a1b9c3933a948c313897da4ebdb0520b7fc3d0a301cbc5743a1d79a20e112d852e74b50910db6ea1a4e99e
--- a/dev-python/urwid/metadata.xml
+++ b/dev-python/urwid/metadata.xml
@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>python</herd>
-<longdescription>
+  <herd>python</herd>
+  <longdescription>
 Urwid is a curses-based user interface library.  It includes many features
 useful for text console application developers including:

--- a/dev-python/urwid/urwid-1.3.0.ebuild
+++ b/dev-python/urwid/urwid-1.3.0.ebuild
@ -0,0 +1,57 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/urwid/urwid-1.3.0.ebuild,v 1.1 2015/02/17 12:26:54 jlec Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} )
+
+PYTHON_REQ_USE="ncurses"
+
+inherit distutils-r1
+
+DESCRIPTION="Curses-based user interface library for Python"
+HOMEPAGE="http://urwid.org/ http://pypi.python.org/pypi/urwid/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux"
+IUSE="doc examples test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/twisted-core )"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.1.0-sphinx.patch )
+
+python_compile_all() {
+	if use doc ; then
+		if [[ ${EPYTHON} == python3* ]] ; then
+			2to3 -nw --no-diffs docs/conf.py || die
+		fi
+		cd docs
+		sphinx-build . _build/html || die
+	fi
+}
+
+python_compile() {
+	if [[ ${EPYTHON} == python2* ]] ; then
+		local CFLAGS="${CFLAGS} -fno-strict-aliasing"
+		export CFLAGS
+	fi
+
+	distutils-r1_python_compile
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	use examples && local EXAMPLES=( examples/. )
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+
+	distutils-r1_python_install_all
+}
--- a/dev-python/watchdog/Manifest
+++ b/dev-python/watchdog/Manifest
@ -1,2 +1,3 @@
 DIST watchdog-0.8.1.tar.gz 154747 SHA256 d6ec6be582b244834a888c8ccc2d451816184ab104b5454b5e5cd7649e8f671c SHA512 d5915be2e2817c748c6d2ba91d8a4044938fa5665019ac7c2048e28493c0dba34189bef61cd642204f1bd62d81ef59767af5970f65543a0c981d8f31ab980856 WHIRLPOOL 94890aa9a0a19c49ce2358b694a61b456df270da3a16d5c5e91044a96e228026288c7dcb7d4597e5fddae601692f8b34cae5e2a29ad388bc08aaf86b3d59fcb8
 DIST watchdog-0.8.2.tar.gz 157936 SHA256 33a9ab3ce2e6b1aca4d2a50752231668d69bdba4ab096d9742195ccfbef1e023 SHA512 96f1fcd0d6898ce950c8768000be2f619c9a28c9d96cb1d7323f04371b065e50b38692179949255bb13fa4e3c72e6f656dbc02b4d7f77b7fb3aacdf08600cb71 WHIRLPOOL c2581e9dba65f8ffbe1fe8b21d873e0292aae6ba46012979b221b3d4ede8f74d4c2cc2efa8635e99180c3bce227f943cb5ef4fba3dd24f5dae5bfc150f643c1d
+DIST watchdog-0.8.3.tar.gz 83154 SHA256 7e65882adb7746039b6f3876ee174952f8eaaa34491ba34333ddf1fe35de4162 SHA512 61f1db886e8e9a6d78b569329f4d5944c296778a5a34f94fbf115a748fb4c3be422bf4d3cc828e22fcdcd380fdf9009f5bd91a8a5edc87089afc58297a0b946f WHIRLPOOL 54af63f60711afac83d79d8b2e67c8dd500eb73a9ea89d6341979406dce4942cec071141b6aaa98615eb7b097d82a915043cbbe8166589c805beab163e733480
--- a/dev-python/watchdog/watchdog-0.8.3.ebuild
+++ b/dev-python/watchdog/watchdog-0.8.3.ebuild
@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/watchdog/watchdog-0.8.3.ebuild,v 1.1 2015/02/17 13:39:15 jlec Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} pypy)
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="Python API and shell utilities to monitor file system events"
+HOMEPAGE="http://github.com/gorakhargosh/watchdog"
+SRC_URI="mirror://pypi/w/watchdog/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+CDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
+RDEPEND="${CDEPEND}
+	dev-python/argh[${PYTHON_USEDEP}]
+	dev-python/pathtools[${PYTHON_USEDEP}]"
+DEPEND="${CDEPEND}
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-cov[${PYTHON_USEDEP}]
+		>=dev-python/pytest-timeout-0.3[${PYTHON_USEDEP}]
+		)"
+
+python_test() {
+	esetup.py test
+}
+
+pkg_postinst() {
+	optfeature "Bash completion" dev-python/argcomplete
+}
--- a/dev-python/wcwidth/Manifest
+++ b/dev-python/wcwidth/Manifest
@ -0,0 +1 @@
+DIST wcwidth-0.1.4.tar.gz 19584 SHA256 906d3123045d77027b49fe912458e1a1e1d6ca1a51558a4bd9168d143b129d2b SHA512 3882d7a4309b868593586e7bc52ce5328504db2f37a4152d53a8b7b8632375866cc07900965d1dd9c84d22c4e2b5cb161b3091c6b3ce4a37d51aeca9c76fe36d WHIRLPOOL 432cff1f6e206c9daf35406d485436c9f7b9a3e7c48f14384f9804d69c6a39099bb9ca4ee99547504c4fa2db8f70259796019f008d1c678c6b73c7de9c09cf60
--- a/dev-python/wcwidth/metadata.xml
+++ b/dev-python/wcwidth/metadata.xml
@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer>
+    <email>jlec@gentoo.org</email>
+    <name>Justin Lecher</name>
+  </maintainer>
+</pkgmetadata>
--- a/dev-python/wcwidth/wcwidth-0.1.4.ebuild
+++ b/dev-python/wcwidth/wcwidth-0.1.4.ebuild
@ -0,0 +1,18 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/wcwidth/wcwidth-0.1.4.ebuild,v 1.1 2015/02/17 13:21:16 jlec Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} )
+
+inherit distutils-r1
+
+DESCRIPTION="Measures number of Terminal column cells of wide-character codes"
+HOMEPAGE="https://pypi.python.org/pypi/wcwidth/ https://github.com/jquast/wcwidth"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
--- a/dev-ruby/facter/Manifest
+++ b/dev-ruby/facter/Manifest
@ -1,5 +1,3 @@
 DIST facter-1.7.6.gem 203776 SHA256 592ab025a91011b80a82cdc1a105a3b84e85d17c65154ee97478f02f745da45d SHA512 81ae55625a732e149699f79df0bf0c6d6b666b1eefa553af309dab8538d7c71651efd293f67ff1f8f732ac16d6025a9c64b22cd42081f8005c0afea4a0f84065 WHIRLPOOL 5a3ff8a56efa4bab2bbed6814050d7710dc1c7c0d962ff155a325b0614c27ed9fb761e80c3a3428925025bcef66299cc7a3f5a9a0f820319bf0e337a1025dec0
 DIST facter-2.2.0.gem 238592 SHA256 1003ebd3f368577a498d5cc8d2b402a4d0403b6a8c5349c561c468d1a9bf859e SHA512 4da0a60a70b7ccbc69027d85cb08338170086edc7dad3b91f1f2450ea77524114ebbc20a54e923aec5b0812b07368f7b0e3fbae2a0cb46fb166a338a2ef9f808 WHIRLPOOL 305ba16196f0bd49f8bb66162aff41a1325ec1feefb9ec244bf99a57e8bda0876faa11cecdca233c844c6d46e75925a7665e42366774b6c96a028b91f24d4368
-DIST facter-2.3.0.gem 233984 SHA256 601f3ed2cdadbcbf7ee10b1269513848fd89b1e3e232580af6ad041a8e4cf9fe SHA512 d7ef09ed730341aa3b1b2adeb89ecd6fa822cd902902c32231af67d0c282e9c0973b81f176bbf89aa610241f48b0f09491b5385abaf07cff99a9d3f9203870ea WHIRLPOOL c21a5d619d424bd11455c8a80d23d2b1739a616ff1c1789f0387900ac19fe0c5d876e5718035d2342b225043526ced37149102c4f7a4e09735e0b64124fc63db
-DIST facter-2.4.0.gem 244224 SHA256 d822eeb894a769091ebfb01cbec5a07e8748c6463fe116adb6f305c60f3fdc7e SHA512 a8f4fc9e22e942e39a8ed1180648d49b69d258b59f018064f1b519327491432e4405bbd067ce3834a14408d11b44cff7f19326c3e2b78cbbee6c799d4da9cb76 WHIRLPOOL 1b13505eb528ca995e904ba4fa4e12fd4198f4f4242034cc417067be98e8ed9c17ff8721532c50b2ba36debc11a6226f0f3dc2df1a5afbfda752a0afe32ec954
 DIST facter-2.4.1.gem 236544 SHA256 4c8836066378d387c0561e4c3574865fa10d85d7474d472b049ecc7d5e4c67fa SHA512 5690f059961ba981d2e174f45ebdbb4e9b75aad3599cbc896f1c3d25f9b12c36500e09be70c36ebf27aed602c22d811604c344c7ccc71ecb200d4aeb78f28a4b WHIRLPOOL 1b6b4079b0449c646e06e9fd868b1de29a61facdacea956b032fbbef94e8c4c85594f50021b3f78a3668c5a0f6d29c448bd97c34fdb8a215de2ee74b164af6fd
--- a/dev-ruby/facter/facter-2.3.0.ebuild
+++ b/dev-ruby/facter/facter-2.3.0.ebuild
@ -1,65 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/facter/facter-2.3.0.ebuild,v 1.2 2014/12/26 09:56:55 graaff Exp $
-
-EAPI=5
-
-USE_RUBY="ruby19 ruby20 ruby21"
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-RUBY_FAKEGEM_BINWRAP="facter"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A cross-platform Ruby library for retrieving facts from operating systems"
-HOMEPAGE="http://www.puppetlabs.com/puppet/related-projects/facter/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="+dmi +pciutils +virt"
-#KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-
-CDEPEND="
-	app-emulation/virt-what
-	sys-apps/net-tools
-	sys-apps/lsb-release
-	dmi? ( sys-apps/dmidecode )
-	pciutils? ( sys-apps/pciutils )"
-
-RDEPEND+=" ${CDEPEND}"
-DEPEND+=" test? ( ${CDEPEND} )"
-
-#RUBY_PATCHES=( ${P}-fix-proc-self-status.patch )
-
-ruby_add_bdepend "test? ( >=dev-ruby/mocha-0.10.5:0.10 )"
-
-all_ruby_prepare() {
-	# Provide explicit path since /sbin is not in the default PATH on
-	# Gentoo.
-	sed -i -e 's:arp -an:/sbin/arp -an:' lib/facter/util/ec2.rb spec/unit/util/ec2_spec.rb || die
-
-	# Ensure the correct version of mocha is used without using bundler.
-	sed -i -e '1igem "mocha", "~>0.10.5"' spec/spec_helper.rb || die
-
-	# Avoid because tests try to access outside stuff, e.g. /sys/block
-	sed -i -e '/should load facts on the facter search path only once/,/^  end/ s:^:#:' spec/unit/util/loader_spec.rb || die
-
-	# Allow specs to work with newer rspec 2.x versions.
-	sed -i -e '1irequire "rspec-expectations"' spec/puppetlabs_spec/matchers.rb || die
-
-	# Avoid specs specific to macosx requiring cfpropertylist which is
-	# not available anymore.
-	rm spec/unit/util/macosx_spec.rb || die
-	sed -i -e '/macosx/ s:^:#:' \
-		-e '/on Darwin/,/^  end/ s:^:#:' spec/unit/virtual_spec.rb || die
-	sed -i -e '/Facter::Processors::Darwin/,/^end/ s:^:#:' spec/unit/processors/os_spec.rb || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	# Create the directory for custom facts.
-	keepdir /etc/facter/facts.d
-}
--- a/dev-ruby/facter/facter-2.4.1-r1.ebuild
+++ b/dev-ruby/facter/facter-2.4.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-ruby/facter/facter-2.4.0.ebuild,v 1.1 2015/01/28 06:45:53 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/facter/facter-2.4.1-r1.ebuild,v 1.1 2015/02/17 06:45:10 graaff Exp $

 EAPI=5

--- a/dev-ruby/facter/facter-2.4.1.ebuild
+++ b/dev-ruby/facter/facter-2.4.1.ebuild
@ -1,10 +1,10 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/facter/facter-2.4.1.ebuild,v 1.1 2015/02/11 07:51:54 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/facter/facter-2.4.1.ebuild,v 1.4 2015/02/17 08:44:02 jer Exp $

 EAPI=5

-USE_RUBY="ruby19 ruby20 ruby21"
+USE_RUBY="ruby19 ruby20"
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_RECIPE_TEST="rspec"
 RUBY_FAKEGEM_EXTRADOC="README.md"
@ -18,7 +18,7 @@ HOMEPAGE="http://www.puppetlabs.com/puppet/related-projects/facter/"
 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="+dmi +pciutils +virt"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 hppa ~ppc ~ppc64 ~sparc ~x86"

 CDEPEND="
 	app-emulation/virt-what
@ -30,7 +30,7 @@ CDEPEND="
 RDEPEND+=" ${CDEPEND}"
 DEPEND+=" test? ( ${CDEPEND} )"

-ruby_add_bdepend "test? ( dev-ruby/mocha:1.0 )"
+ruby_add_bdepend "test? ( dev-ruby/mocha:0.13 )"

 all_ruby_prepare() {
 	# Provide explicit path since /sbin is not in the default PATH on
@ -38,7 +38,7 @@ all_ruby_prepare() {
 	sed -i -e 's:arp -an:/sbin/arp -an:' lib/facter/util/ec2.rb spec/unit/util/ec2_spec.rb || die

 	# Ensure the correct version of mocha is used without using bundler.
-	sed -i -e '1igem "mocha", "~>1.0"' spec/spec_helper.rb || die
+	sed -i -e '1igem "mocha", "~>0.13"' spec/spec_helper.rb || die

 	# Avoid because tests try to access outside stuff, e.g. /sys/block
 	sed -i -e '/should load facts on the facter search path only once/,/^  end/ s:^:#:' spec/unit/util/loader_spec.rb || die
--- a/kde-base/akonadiconsole/akonadiconsole-4.14.3.ebuild
+++ b/kde-base/akonadiconsole/akonadiconsole-4.14.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/kde-base/akonadiconsole/akonadiconsole-4.14.3.ebuild,v 1.4 2015/02/16 08:31:51 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/akonadiconsole/akonadiconsole-4.14.3.ebuild,v 1.5 2015/02/17 11:06:46 ago Exp $

 EAPI=5

@ -8,7 +8,7 @@ KMNAME="kdepim"
 inherit kde4-meta

 DESCRIPTION="Akonadi developer console"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"

 DEPEND="
--- a/kde-base/akregator/akregator-4.14.3.ebuild
+++ b/kde-base/akregator/akregator-4.14.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/kde-base/akregator/akregator-4.14.3.ebuild,v 1.4 2015/02/16 08:31:49 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/akregator/akregator-4.14.3.ebuild,v 1.5 2015/02/17 11:06:43 ago Exp $

 EAPI=5

@ -10,7 +10,7 @@ inherit kde4-meta

 DESCRIPTION="KDE news feed aggregator"
 HOMEPAGE="http://www.kde.org/applications/internet/akregator"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"

 DEPEND="
--- a/kde-base/amor/amor-4.14.3.ebuild
+++ b/kde-base/amor/amor-4.14.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/kde-base/amor/amor-4.14.3.ebuild,v 1.4 2015/02/16 08:31:52 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/amor/amor-4.14.3.ebuild,v 1.5 2015/02/17 11:06:34 ago Exp $

 EAPI=5

@ -8,7 +8,7 @@ KDE_HANDBOOK="optional"
 inherit kde4-base

 DESCRIPTION="KDE: Amusing Misuse Of Resources - desktop-dwelling creature"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"

 DEPEND="x11-libs/libX11
--- a/kde-base/analitza/analitza-4.14.3.ebuild
+++ b/kde-base/analitza/analitza-4.14.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/kde-base/analitza/analitza-4.14.3.ebuild,v 1.4 2015/02/16 08:31:42 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/analitza/analitza-4.14.3.ebuild,v 1.5 2015/02/17 11:06:33 ago Exp $

 EAPI=5

@ -9,7 +9,7 @@ OPENGL_REQUIRED="optional"
 inherit kde4-base

 DESCRIPTION="KDE library for mathematical features"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug readline"

 DEPEND="
--- a/kde-base/ark/ark-4.14.3-r1.ebuild
+++ b/kde-base/ark/ark-4.14.3-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/kde-base/ark/ark-4.14.3-r1.ebuild,v 1.4 2015/02/16 08:31:53 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ark/ark-4.14.3-r1.ebuild,v 1.5 2015/02/17 11:06:37 ago Exp $

 EAPI=5

@ -10,7 +10,7 @@ inherit kde4-base
 DESCRIPTION="KDE Archiving tool"
 HOMEPAGE="http://www.kde.org/applications/utilities/ark
 http://utils.kde.org/projects/ark"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="+archive +bzip2 debug lzma"

 DEPEND="
--- a/kde-base/artikulate/artikulate-4.14.3.ebuild
+++ b/kde-base/artikulate/artikulate-4.14.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/kde-base/artikulate/artikulate-4.14.3.ebuild,v 1.4 2015/02/16 08:31:46 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/artikulate/artikulate-4.14.3.ebuild,v 1.5 2015/02/17 11:06:42 ago Exp $

 EAPI=5

@ -10,7 +10,7 @@ inherit kde4-base multilib

 DESCRIPTION="Language learning application that helps improving pronunciation skills"
 HOMEPAGE="http://edu.kde.org/applications/language/artikulate"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"

 DEPEND="
--- a/kde-base/attica/attica-4.14.3.ebuild
+++ b/kde-base/attica/attica-4.14.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/kde-base/attica/attica-4.14.3.ebuild,v 1.4 2015/02/16 08:31:47 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/attica/attica-4.14.3.ebuild,v 1.5 2015/02/17 11:06:35 ago Exp $

 EAPI=5

@ -8,7 +8,7 @@ KMNAME="kde-runtime"
 inherit kde4-meta

 DESCRIPTION="Open Collaboration Services provider management"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="debug"

 DEPEND="
--- a/kde-base/audiocd-kio/audiocd-kio-4.14.3.ebuild
+++ b/kde-base/audiocd-kio/audiocd-kio-4.14.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/kde-base/audiocd-kio/audiocd-kio-4.14.3.ebuild,v 1.4 2015/02/16 08:31:49 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/audiocd-kio/audiocd-kio-4.14.3.ebuild,v 1.5 2015/02/17 11:06:34 ago Exp $

 EAPI=5

@ -8,7 +8,7 @@ KDE_HANDBOOK="optional"
 inherit kde4-base

 DESCRIPTION="KDE kioslaves from the kdemultimedia package"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug flac vorbis"

 DEPEND="
--- a/kde-base/baloo-widgets/baloo-widgets-4.14.3.ebuild
+++ b/kde-base/baloo-widgets/baloo-widgets-4.14.3.ebuild
@ -1,13 +1,13 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/baloo-widgets/baloo-widgets-4.14.3.ebuild,v 1.4 2015/02/16 08:31:41 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/baloo-widgets/baloo-widgets-4.14.3.ebuild,v 1.5 2015/02/17 11:06:42 ago Exp $

 EAPI=5

 inherit kde4-base

 DESCRIPTION="Widget library for baloo"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"

 DEPEND="
--- a/kde-base/baloo/baloo-4.14.3.ebuild
+++ b/kde-base/baloo/baloo-4.14.3.ebuild
@ -1,13 +1,13 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/baloo/baloo-4.14.3.ebuild,v 1.4 2015/02/16 08:31:51 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/baloo/baloo-4.14.3.ebuild,v 1.5 2015/02/17 11:06:38 ago Exp $

 EAPI=5

 inherit kde4-base

 DESCRIPTION="Next generation of the Nepomuk project"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug minimal"

 DEPEND="
--- a/kde-base/blinken/blinken-4.14.3.ebuild
+++ b/kde-base/blinken/blinken-4.14.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/kde-base/blinken/blinken-4.14.3.ebuild,v 1.4 2015/02/16 08:31:43 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/blinken/blinken-4.14.3.ebuild,v 1.5 2015/02/17 11:06:47 ago Exp $

 EAPI=5

@ -10,7 +10,7 @@ inherit kde4-base
 DESCRIPTION="KDE version of the Simon Says game"
 HOMEPAGE="http://www.kde.org/applications/education/blinken
 http://edu.kde.org/blinken"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"

 src_install() {
--- a/kde-base/blogilo/blogilo-4.14.3.ebuild
+++ b/kde-base/blogilo/blogilo-4.14.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/kde-base/blogilo/blogilo-4.14.3.ebuild,v 1.4 2015/02/16 08:31:40 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/blogilo/blogilo-4.14.3.ebuild,v 1.5 2015/02/17 11:06:43 ago Exp $

 EAPI=5

@ -10,7 +10,7 @@ inherit kde4-meta

 DESCRIPTION="KDE Blogging Client"
 HOMEPAGE="http://www.kde.org/applications/internet/blogilo"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"

 DEPEND="
--- a/kde-base/bomber/bomber-4.14.3.ebuild
+++ b/kde-base/bomber/bomber-4.14.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/kde-base/bomber/bomber-4.14.3.ebuild,v 1.4 2015/02/16 08:31:46 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/bomber/bomber-4.14.3.ebuild,v 1.5 2015/02/17 11:06:38 ago Exp $

 EAPI=5

@ -9,7 +9,7 @@ inherit kde4-base

 DESCRIPTION="KDE arcade bombing game"
 HOMEPAGE="http://www.kde.org/applications/games/bomber/"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"

 DEPEND="$(add_kdebase_dep libkdegames)"
--- a/kde-base/bovo/bovo-4.14.3.ebuild
+++ b/kde-base/bovo/bovo-4.14.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/kde-base/bovo/bovo-4.14.3.ebuild,v 1.4 2015/02/16 08:31:47 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/bovo/bovo-4.14.3.ebuild,v 1.5 2015/02/17 11:06:35 ago Exp $

 EAPI=5

@ -9,7 +9,7 @@ inherit kde4-base

 DESCRIPTION="Five-in-a-row Board Game"
 HOMEPAGE="http://www.kde.org/applications/games/bovo/"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"

 DEPEND="$(add_kdebase_dep libkdegames)"
--- a/kde-base/calendarjanitor/calendarjanitor-4.14.3.ebuild
+++ b/kde-base/calendarjanitor/calendarjanitor-4.14.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/kde-base/calendarjanitor/calendarjanitor-4.14.3.ebuild,v 1.4 2015/02/16 08:31:52 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/calendarjanitor/calendarjanitor-4.14.3.ebuild,v 1.5 2015/02/17 11:06:44 ago Exp $

 EAPI=5

@ -11,7 +11,7 @@ inherit kde4-meta

 DESCRIPTION="A tool to scan calendar data for buggy instances"
 HOMEPAGE="http://www.kde.org/"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"

 DEPEND="
--- a/kde-base/cantor/cantor-4.14.3.ebuild
+++ b/kde-base/cantor/cantor-4.14.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/kde-base/cantor/cantor-4.14.3.ebuild,v 1.4 2015/02/16 08:31:46 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/cantor/cantor-4.14.3.ebuild,v 1.5 2015/02/17 11:06:39 ago Exp $

 EAPI=5

@ -10,7 +10,7 @@ inherit kde4-base python-single-r1

 DESCRIPTION="KDE4 interface for doing mathematics and scientific computing"
 HOMEPAGE="http://www.kde.org/applications/education/cantor http://edu.kde.org/cantor"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="analitza debug postscript python qalculate +R"

 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
--- a/kde-base/cervisia/cervisia-4.14.3.ebuild
+++ b/kde-base/cervisia/cervisia-4.14.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/kde-base/cervisia/cervisia-4.14.3.ebuild,v 1.4 2015/02/16 08:31:40 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/cervisia/cervisia-4.14.3.ebuild,v 1.5 2015/02/17 11:06:47 ago Exp $

 EAPI=5

@ -9,7 +9,7 @@ inherit kde4-base

 DESCRIPTION="Cervisia - A KDE CVS frontend"
 HOMEPAGE="http://www.kde.org/applications/development/cervisia"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"

 RDEPEND="
--- a/kde-base/dolphin-plugins/dolphin-plugins-4.14.3.ebuild
+++ b/kde-base/dolphin-plugins/dolphin-plugins-4.14.3.ebuild
@ -1,13 +1,13 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/dolphin-plugins/dolphin-plugins-4.14.3.ebuild,v 1.4 2015/02/16 08:31:46 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/dolphin-plugins/dolphin-plugins-4.14.3.ebuild,v 1.5 2015/02/17 11:06:37 ago Exp $

 EAPI=5

 inherit kde4-base

 DESCRIPTION="Extra Dolphin plugins"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug bazaar git mercurial subversion"

 DEPEND="
--- a/Show more
+++ b/Show more
				`@ -0,0 +1 @@`
				`DIST ExtUtils-CChecker-0.09.tar.gz 21237 SHA256 ebf167e3f98b4b1ff8e7a5e98d084558b87d0b19442f5da33233ef6b2eb66ad7 SHA512 51068985b7c62af407a600dc665031966abf45775ac1e4ce97d49474af070df86622db47a1248aaa8f89e3544f4937665287162cf3f80cbc930bf56d57d8d6b3 WHIRLPOOL 827940320cf1acb1f3ea8d208fee43215227dedb5bda7ef068f32c5f64f966de55ab7e78aebd20701f5a0b704563685af8577fab535dfafd19ef5781b3d889ef`
				`@ -0,0 +1 @@`
				`DIST Socket-GetAddrInfo-0.22.tar.gz 90579 SHA256 097c4c02bfda4f3042fb2978f6e4ca5991202ef26ceb782bb76430a01812fcbe SHA512 3117ad5931dd116f45afa041b7aad4506382c4359b67e61564affba6f34fe14db5dbe0dc0a1bf4c0b680847bda58958604907ff0339d500728b44301cf1fe554 WHIRLPOOL c8aa552a9f3531fffccbd314cfd9eda90a5ae00c8785009e9d65042e0d19bb2101ffa48d2fcec38f04d11a26b90a8a89d679266c21b2ba303d4ba9a15d0c8a32`
				`@ -0,0 +1 @@`
				`DIST blessings-1.6.tar.gz 19974 SHA256 edc5713061f10966048bf6b40d9a514b381e0ba849c64e034c4ef6c1847d3007 SHA512 5d0fc365416bf2b36b6de72f6b8c01bf0ab8df4a0148f492c80056a9ebd5d569e9c01966481e0d70a25add16da2bc3e73be933226369abca533ce019f97479f2 WHIRLPOOL 44dc96c1da174465b5dc3dd38c4d7ccc17408d072d290819c52d33e7e249bbbf428c7ee217faf3ec6acbe1e620b5e0cb2627c4dc3f0162cb21a810ce50e8b1c6`
				`@ -0,0 +1 @@`
				`DIST curtsies-0.1.18.tar.gz 44353 SHA256 477121f256eea2b71237492e2924f05b54e1f91815d042bf91d7112b71d4edd4 SHA512 02ae86b215dca10e779061485cb18ab8b6fefbdad10e2bcad3c24890b79f81d1aae0b84467a23ca1951ffaa336fc2fe9b5137c1a10a65fafe0a0b540cc0c819c WHIRLPOOL 801738c450c2fd9343e01260240ebd5ed74e951c03a918808c8c2c47e8ec46afe425f4d8978dea894d2cdf36bc2e3bd19e9de2ed12a62e5786eebeed87dd9800`
				`@ -0,0 +1 @@`
				`DIST wcwidth-0.1.4.tar.gz 19584 SHA256 906d3123045d77027b49fe912458e1a1e1d6ca1a51558a4bd9168d143b129d2b SHA512 3882d7a4309b868593586e7bc52ce5328504db2f37a4152d53a8b7b8632375866cc07900965d1dd9c84d22c4e2b5cb161b3091c6b3ce4a37d51aeca9c76fe36d WHIRLPOOL 432cff1f6e206c9daf35406d485436c9f7b9a3e7c48f14384f9804d69c6a39099bb9ca4ee99547504c4fa2db8f70259796019f008d1c678c6b73c7de9c09cf60`