diff --git a/app-editors/emacs-vcs/Manifest b/app-editors/emacs-vcs/Manifest
index c514690ebd02..1420975e88b8 100644
--- a/app-editors/emacs-vcs/Manifest
+++ b/app-editors/emacs-vcs/Manifest
@@ -1,4 +1,5 @@
 DIST emacs-24.4-patches-4.tar.xz 4652 SHA256 8b97fe775ed120df42e6f3afbe3ce503c0fedd8957caa759649323ac340f2922 SHA512 b8f8aea92472b5c074fc4cb2198b329e7b0496a70ba04d76eea4f420e398f3882b89d848020750659f60828217ea3155f4d53078edc8dc715b2946b8a239157a WHIRLPOOL e5e92ce3fba0e62ba3135e89ab8de9b6196f9a342048dbe679e06c3530a305311a1b300b72abdee50416d989cb55ca053ea1e0b259e63cc56260bfd58d43894a
 DIST emacs-24.4.90.tar.xz 39752368 SHA256 cec2204ec0134dfac9987dde3aff95e4a02538d4ce63e8d7c55b6a409aa04b36 SHA512 c7fe2ab40b1a28a97342753afb7fd5c24751ad51a144c723c6c1be517b81006b4641f1f4e833b8424ac00107992934f4e4520dd7aa92074e44ab98a148a17eed WHIRLPOOL b20c133381617f15ee2babca36164a104f18da0f38ae310db4cbc539fa988832a4b7d78acc0e023e4b8c92a877decbce44d45028c8b8ecee708c092dfe27e39d
+DIST emacs-24.4.91.tar.xz 39755240 SHA256 497631aafc470ba4b4c1a9f407319a3144d8dc11eb24b7b755a66d9f1f3b5add SHA512 2c885297591992583a6263babcb167563af0a6c1d0920d2e4b3fc9caa9888a55d9394e92f25bec717844a88294f48f9aafb385bba594a2da3ccff48a6bb8d555 WHIRLPOOL 1b7465d07565c636611b606ca84da56ddc9a0865bf5333c5793ebe12462c024a9b889e5f9763230fb37c076633917e99650bf28ed290ca5a26dd28f225d8a0e4
 DIST emacs-25.0.50_pre20150131.tar.xz 24719944 SHA256 fa21415c14d724c6cbd92ea8b76bfbc157757baf1446492b5f72062ff0017076 SHA512 85629851ba93d25050e0590b8c00ea9417e2c6839d306276ec3f02ce4d6bba14fe407f32eb07dcc2d42c79fade0678e9e5c098cf1562831a0a715373629a9d40 WHIRLPOOL e58589ac54577800e971232e814212b2954c93c42d701c137283590833420680968f71b46c6e087c4b3d900f96fb1c99edc6420ffbd336740e9b079e01e9ef4a
 DIST emacs-25.0.50_pre20150228.tar.xz 24749116 SHA256 8e442cbb27e0b39aee9ebcd981512870a7030ecdd4f7941c3ea43dfbb0635635 SHA512 a9f3f3fe5bb2d662c06317c630af40c48b47b33f5cfdbc2a3fa592ac27cb9b9e1c91524326def931b931fc4a35056bac45b7836e24e550088965783dad2c3188 WHIRLPOOL 9349f8f94873a2addc75af295852434a6609bc88f2acb9ef45b24947a8d5f2b058b2e3a0d461eb2ce34816b4895225fdbd939c4ed366608949ca13c354a74185
diff --git a/app-editors/emacs-vcs/emacs-vcs-24.4.91.ebuild b/app-editors/emacs-vcs/emacs-vcs-24.4.91.ebuild
new file mode 100644
index 000000000000..fad7bf8b940c
--- /dev/null
+++ b/app-editors/emacs-vcs/emacs-vcs-24.4.91.ebuild
@@ -0,0 +1,364 @@
+# 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.91.ebuild,v 1.1 2015/03/08 18:28:07 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="emacs-24"
+	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
+		http://dev.gentoo.org/~ulm/emacs/emacs-24.4-patches-4.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}"
+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="24"
+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.5[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:0 )
+		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 "${WORKDIR}"/patch/04_all_games-sgid.patch
+	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=":gamestat" \
+		--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/{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
+}
diff --git a/app-emulation/wine/files/wine-1.7.38-gstreamer-v5-staging-post.patch b/app-emulation/wine/files/wine-1.7.38-gstreamer-v5-staging-post.patch
index 3e597baba24c..3d653993385c 100644
--- a/app-emulation/wine/files/wine-1.7.38-gstreamer-v5-staging-post.patch
+++ b/app-emulation/wine/files/wine-1.7.38-gstreamer-v5-staging-post.patch
@@ -1,8 +1,7 @@
-From 0f579172142d290dc48b9d466f9cd699987aacf3 Mon Sep 17 00:00:00 2001
+From 695c19cdd2fc24aaa7ed89976c4965b376707131 Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Wed, 25 Feb 2015 22:45:42 +0100
-Subject: [PATCH] ntdll: Fix race-condition when threads are killed during
- shutdown.
+Subject: ntdll: Fix race-condition when threads are killed during shutdown.
 
 When exit_thread is executed, nb_threads is decremented before the thread is
 fully shutdown. When another thread runs ExitProcess() this will cause a SIGQUIT
@@ -18,33 +17,42 @@ fix the most critical one (messed up refcounting of threads) for now.
 [Alexandre Rostovtsev <tetromino@gentoo.org> : rebase to be applied after
  Maarten Lankhorst's "override pthreads to fix gstreamer v5" patch.]
 ---
- dlls/ntdll/thread.c | 6 ++++++
- 1 file changed, 6 insertions(+)
+ dlls/ntdll/thread.c | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
 
 diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c
-index 936cabe..98e679e 100755
+index 4f181dc..1bdbcbf 100755
 --- a/dlls/ntdll/thread.c
 +++ b/dlls/ntdll/thread.c
-@@ -459,6 +459,7 @@ static void exit_thread_common( int status )
- {
- #ifndef __linux__
+@@ -461,6 +461,7 @@ static void exit_thread_common( int status )
      static void *prev_teb;
-+    sigset_t sigset;
      TEB *teb;
  #endif
++    sigset_t sigset;
  
-@@ -495,6 +496,11 @@ static void exit_thread_common( int status )
-             signal_free_thread( teb );
-         }
+     if (status)  /* send the exit code to the server (0 is already the default) */
+     {
+@@ -473,7 +474,7 @@ static void exit_thread_common( int status )
+         SERVER_END_REQ;
      }
-+
+ 
+-    if (interlocked_xchg_add( &nb_threads, -1 ) <= 1)
++    if (interlocked_xchg_add( &nb_threads, 0 ) <= 1)
+     {
+         LdrShutdownProcess();
+         exit( status );
+@@ -499,6 +500,11 @@ static void exit_thread_common( int status )
+     reap_thread(NtCurrentTeb());
+ #endif
+ 
 +    sigemptyset( &sigset );
 +    sigaddset( &sigset, SIGQUIT );
 +    pthread_sigmask( SIG_BLOCK, &sigset, NULL );
 +    if (interlocked_xchg_add( &nb_threads, -1 ) <= 1) _exit( status );
- #else
-     reap_thread(NtCurrentTeb());
- #endif
++
+     close( ntdll_get_thread_data()->wait_fd[0] );
+     close( ntdll_get_thread_data()->wait_fd[1] );
+     close( ntdll_get_thread_data()->reply_fd );
 -- 
 2.3.1
 
diff --git a/games-sports/billardgl/Manifest b/games-sports/billardgl/Manifest
index 1b11463178b1..ec1c9217b98b 100644
--- a/games-sports/billardgl/Manifest
+++ b/games-sports/billardgl/Manifest
@@ -1,2 +1,2 @@
-DIST BillardGL-1.75.tar.gz 736295 RMD160 11586d3c887367e3137e2d498e9ff729156cf233 SHA1 b1e3c044a500cf1331ae392c861f8d8402f1806e SHA256 9b865b1254aa30125480ec7ea2ce00d91524db066a524b78492545782856df96
-DIST billardgl.png 3212 RMD160 5d8087ef1fc996a46004bcd06e9e1640d52d9cc9 SHA1 80f33f120baf84f72e61cb0f1139ccf2680f37de SHA256 a79b27cffca343ddb8f57cd6880acc6c60daf82959919868932a296f57be286e
+DIST BillardGL-1.75.tar.gz 736295 SHA256 9b865b1254aa30125480ec7ea2ce00d91524db066a524b78492545782856df96 SHA512 a81d50aa44f97f06fcafd32c3436709c302f86d37f915b2d63acd9c5d48eef22259858064ff56366c7c1cdff40e4a16ad84abe1b91a0daa408cb05ba728d1e88 WHIRLPOOL bb1a48bdcee58b76f959ae98068e0a215dab573ab1fe243d0e2ab4e76ce1a28430ab14d1d3d537982abd95cdeaa36bddae798d90a1504f226260454deb24bdd2
+DIST billardgl.png 3212 SHA256 a79b27cffca343ddb8f57cd6880acc6c60daf82959919868932a296f57be286e SHA512 d9606d8c6e6f9e2ce820a135aa32a8d3604b619a6ce6626fe742424074e48e71703919c5a1923d1ee6b38670ee70c757c328123d3f3c7f595a3c2fc704bd6f74 WHIRLPOOL 40baf57c751225571ee712912cdaac081a46554485cd8d89b83fd1612405ac65f3887cc9d9526c763a3fb1cceec7837668ac6c2e4dc33ea16b71f6b106035203
diff --git a/games-sports/billardgl/billardgl-1.75-r1.ebuild b/games-sports/billardgl/billardgl-1.75-r1.ebuild
index 3897c24da458..7165e5d1e5c1 100644
--- a/games-sports/billardgl/billardgl-1.75-r1.ebuild
+++ b/games-sports/billardgl/billardgl-1.75-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-sports/billardgl/billardgl-1.75-r1.ebuild,v 1.12 2010/09/16 17:01:13 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-sports/billardgl/billardgl-1.75-r1.ebuild,v 1.13 2015/03/08 19:17:38 tupone Exp $
 
-EAPI=2
+EAPI=5
 inherit eutils games
 
 DESCRIPTION="an OpenGL billards game"
@@ -20,6 +20,7 @@ DEPEND="x11-libs/libXi
 	virtual/opengl
 	virtual/glu
 	media-libs/freeglut"
+RDEPEND="${DEPEND}"
 
 S=${WORKDIR}/BillardGL-${PV}/src
 
@@ -44,9 +45,9 @@ src_prepare() {
 }
 
 src_install() {
-	newgamesbin BillardGL ${PN} || die "newgamesbin failed"
+	newgamesbin BillardGL ${PN}
 	insinto "${GAMES_DATADIR}"/${PN}
-	doins -r lang Texturen || die "doins failed"
+	doins -r lang Texturen
 	dodoc README
 	doicon "${DISTDIR}"/${PN}.png
 	make_desktop_entry ${PN} BillardGL
diff --git a/games-sports/foobillard/Manifest b/games-sports/foobillard/Manifest
index b66407822e80..5619a33f0b8f 100644
--- a/games-sports/foobillard/Manifest
+++ b/games-sports/foobillard/Manifest
@@ -1 +1 @@
-DIST foobillard-3.0a.tar.gz 1138477 RMD160 9d5a2d271ca270563592c5f6cf23533447c51483 SHA1 1caa51a201b55883640b5c5b1e9fde20fc71a095 SHA256 d05807077bdba32c4ca1d369344ac983675dc859cb7b192fca4196f23b89b137
+DIST foobillard-3.0a.tar.gz 1138477 SHA256 d05807077bdba32c4ca1d369344ac983675dc859cb7b192fca4196f23b89b137 SHA512 6ff85255384a83cb147a9682beefa021658ba34ad00ed7879bf7887fff248d41aeb34d2dbe39148ee10bffc53091ea5f168b4afeddac9b50d577bad7799d59b2 WHIRLPOOL 97e4ce788721c5327d7b1e7f42cb507c61af6b8e0e00208a728b107d8eb3bd89216810a607fab1e950c7045c9774d0aa4ce3ef95b31def953de0ce615bf590aa
diff --git a/games-sports/foobillard/foobillard-3.0a.ebuild b/games-sports/foobillard/foobillard-3.0a.ebuild
index d42c64728e3b..53d1f00d9a89 100644
--- a/games-sports/foobillard/foobillard-3.0a.ebuild
+++ b/games-sports/foobillard/foobillard-3.0a.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-sports/foobillard/foobillard-3.0a.ebuild,v 1.17 2011/10/13 14:45:07 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-sports/foobillard/foobillard-3.0a.ebuild,v 1.18 2015/03/08 19:24:26 tupone Exp $
 
-EAPI=2
+EAPI=5
 inherit eutils autotools games
 
 DESCRIPTION="8ball, 9ball, snooker and carambol game"
@@ -22,6 +22,7 @@ DEPEND="x11-libs/libXaw
 	media-libs/libpng
 	sdl? ( media-libs/libsdl )
 	!sdl? ( media-libs/freeglut )"
+RDEPEND="${DEPEND}"
 
 src_prepare() {
 	epatch \
@@ -29,6 +30,8 @@ src_prepare() {
 		"${FILESDIR}"/${P}-fbsd.patch \
 		"${FILESDIR}"/${P}-as-needed.patch \
 		"${FILESDIR}"/${P}-gl-clamp.patch
+	mv configure.{in,ac}
+	rm aclocal.m4
 
 	eautoreconf
 }
@@ -42,8 +45,7 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog README README.FONTS
+	default
 	doman foobillard.6
 	newicon data/full_symbol.png foobillard.png
 	make_desktop_entry foobillard Foobillard
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index d63abf26113f..4250a731e304 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Sun, 08 Mar 2015 17:36:51 +0000
+Sun, 08 Mar 2015 21:36:53 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 29918c574e07..4250a731e304 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Sun, 08 Mar 2015 17:36:52 +0000
+Sun, 08 Mar 2015 21:36:53 +0000
diff --git a/metadata/md5-cache/app-editors/emacs-vcs-24.4.91 b/metadata/md5-cache/app-editors/emacs-vcs-24.4.91
new file mode 100644
index 000000000000..83ef71606684
--- /dev/null
+++ b/metadata/md5-cache/app-editors/emacs-vcs-24.4.91
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=sys-libs/ncurses >=app-admin/eselect-emacs-1.16 >=app-emacs/emacs-common-gentoo-1.5[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:0 ) 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 ) ) ) ) ) virtual/pkgconfig gzip-el? ( app-arch/gzip ) pax_kernel? ( sys-apps/attr sys-apps/paxctl ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=The extensible, customizable, self-documenting real-time display editor
+EAPI=5
+HOMEPAGE=http://www.gnu.org/software/emacs/
+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
+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
+LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
+RDEPEND=sys-libs/ncurses >=app-admin/eselect-emacs-1.16 >=app-emacs/emacs-common-gentoo-1.5[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:0 ) 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 ) ) ) ) )
+REQUIRED_USE=?? ( aqua X )
+SLOT=24
+SRC_URI=http://dev.gentoo.org/~ulm/distfiles/emacs-24.4.91.tar.xz mirror://gnu-alpha/emacs/pretest/emacs-24.4.91.tar.xz http://dev.gentoo.org/~ulm/emacs/emacs-24.4-patches-4.tar.xz
+_eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	elisp-common	1aa23b3de5dae55456fa2071428eb5bf	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
+_md5_=e2e7081819d7419fc78b029b1272e62a
diff --git a/metadata/md5-cache/games-sports/billardgl-1.75-r1 b/metadata/md5-cache/games-sports/billardgl-1.75-r1
index d449daee029b..b09d17cc255e 100644
--- a/metadata/md5-cache/games-sports/billardgl-1.75-r1
+++ b/metadata/md5-cache/games-sports/billardgl-1.75-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
 DEPEND=x11-libs/libXi x11-libs/libXmu virtual/opengl virtual/glu media-libs/freeglut
 DESCRIPTION=an OpenGL billards game
-EAPI=2
+EAPI=5
 HOMEPAGE=http://www.billardgl.de/
 KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
@@ -9,4 +9,4 @@ RDEPEND=x11-libs/libXi x11-libs/libXmu virtual/opengl virtual/glu media-libs/fre
 SLOT=0
 SRC_URI=mirror://sourceforge/billardgl/BillardGL-1.75.tar.gz mirror://gentoo/billardgl.png
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	games	1ad3205dbf62a2c98249f2f59b0a2d39	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=1709d7725d1003261ecc43cedd1ac8a6
+_md5_=823402741d1a921ab965f07224c771b5
diff --git a/metadata/md5-cache/games-sports/foobillard-3.0a b/metadata/md5-cache/games-sports/foobillard-3.0a
index d83d1e3d3cb5..83680df36812 100644
--- a/metadata/md5-cache/games-sports/foobillard-3.0a
+++ b/metadata/md5-cache/games-sports/foobillard-3.0a
@@ -1,7 +1,7 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
 DEPEND=x11-libs/libXaw x11-libs/libXi virtual/opengl virtual/glu >=media-libs/freetype-2.0.9 media-libs/libpng sdl? ( media-libs/libsdl ) !sdl? ( media-libs/freeglut ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=8ball, 9ball, snooker and carambol game
-EAPI=2
+EAPI=5
 HOMEPAGE=http://foobillard.sourceforge.net/
 IUSE=sdl video_cards_nvidia
 KEYWORDS=amd64 ppc x86 ~x86-fbsd
@@ -10,4 +10,4 @@ RDEPEND=x11-libs/libXaw x11-libs/libXi virtual/opengl virtual/glu >=media-libs/f
 SLOT=0
 SRC_URI=mirror://gentoo/foobillard-3.0a.tar.gz
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	games	1ad3205dbf62a2c98249f2f59b0a2d39	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=312928c40c952269e7b0d0af855dec20
+_md5_=dbcfa668e19acc514b37dadca12bf227
diff --git a/metadata/md5-cache/net-libs/nodejs-0.12.0 b/metadata/md5-cache/net-libs/nodejs-0.12.0
index f0a79aff9b1d..0a0e5b825d6b 100644
--- a/metadata/md5-cache/net-libs/nodejs-0.12.0
+++ b/metadata/md5-cache/net-libs/nodejs-0.12.0
@@ -6,9 +6,9 @@ HOMEPAGE=http://nodejs.org/
 IUSE=+npm
 KEYWORDS=~amd64 ~arm ~x86 ~x64-macos
 LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
-RDEPEND=dev-libs/openssl[-bindist]
+RDEPEND=dev-libs/openssl[-bindist] >=net-libs/http-parser-2.3 =dev-libs/libuv-1.1.0
 RESTRICT=test
 SLOT=0
 SRC_URI=http://nodejs.org/dist/v0.12.0/node-v0.12.0.tar.gz
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=73351f733d10dd8c880696868965db70
+_md5_=b7bfb418d9f8e554cb522797fedbedb2
diff --git a/metadata/md5-cache/net-misc/pssh-2.2.2 b/metadata/md5-cache/net-misc/pssh-2.2.2
deleted file mode 100644
index 3f8ad6aa3968..000000000000
--- a/metadata/md5-cache/net-misc/pssh-2.2.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare
-DEPEND=net-misc/openssh !net-misc/putty dev-python/setuptools || ( =dev-lang/python-3.3* =dev-lang/python-3.2* =dev-lang/python-3.1* =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
-DESCRIPTION=This package provides parallel versions of the openssh tools
-EAPI=3
-HOMEPAGE=http://code.google.com/p/parallel-ssh/
-KEYWORDS=~amd64 ~ppc ~x86 ~x86-interix ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=net-misc/openssh !net-misc/putty || ( =dev-lang/python-3.3* =dev-lang/python-3.2* =dev-lang/python-3.1* =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://parallel-ssh.googlecode.com/files/pssh-2.2.2.tar.gz
-_eclasses_=distutils	92e738ea29389cb3f34778d7a349ac71	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	cd022f89fef846d083fc994b9e3d8c04	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=d0bfd2f8c7a29d63fad4b389d91f4288
diff --git a/metadata/md5-cache/net-misc/pssh-2.3.1 b/metadata/md5-cache/net-misc/pssh-2.3.1
deleted file mode 100644
index 6e6a0cc276e1..000000000000
--- a/metadata/md5-cache/net-misc/pssh-2.3.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare setup
-DEPEND=net-misc/openssh !net-misc/putty dev-python/setuptools || ( =dev-lang/python-3.3* =dev-lang/python-3.2* =dev-lang/python-3.1* =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
-DESCRIPTION=PSSH provides parallel versions of OpenSSH and related tools
-EAPI=4
-HOMEPAGE=http://code.google.com/p/parallel-ssh/
-KEYWORDS=~amd64 ~ppc ~x86 ~x86-interix ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=net-misc/openssh !net-misc/putty || ( =dev-lang/python-3.3* =dev-lang/python-3.2* =dev-lang/python-3.1* =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://parallel-ssh.googlecode.com/files/pssh-2.3.1.tar.gz
-_eclasses_=distutils	92e738ea29389cb3f34778d7a349ac71	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	cd022f89fef846d083fc994b9e3d8c04	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=c91527b5fead7801c2c715b9025db2dd
diff --git a/metadata/md5-cache/net-misc/pssh-2.3.1-r1 b/metadata/md5-cache/net-misc/pssh-2.3.1-r1
new file mode 100644
index 000000000000..e233755783d4
--- /dev/null
+++ b/metadata/md5-cache/net-misc/pssh-2.3.1-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=net-misc/openssh !net-misc/putty dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)]
+DESCRIPTION=PSSH provides parallel versions of OpenSSH and related tools
+EAPI=5
+HOMEPAGE=http://code.google.com/p/parallel-ssh/
+IUSE=python_targets_python2_7
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-interix ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=net-misc/openssh !net-misc/putty >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)]
+REQUIRED_USE=python_targets_python2_7
+RESTRICT=test
+SLOT=0
+SRC_URI=http://parallel-ssh.googlecode.com/files/pssh-2.3.1.tar.gz
+_eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	f782db6207752efeca1d59c016d8c813	python-utils-r1	e3288bc2e6e487674ce218b632701c9e	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
+_md5_=8a57fb06fac98626912a7468e98a72bd
diff --git a/metadata/md5-cache/sci-libs/cfitsio-3.360 b/metadata/md5-cache/sci-libs/cfitsio-3.360
index ae7ce74e8d64..35b885ddfac3 100644
--- a/metadata/md5-cache/sci-libs/cfitsio-3.360
+++ b/metadata/md5-cache/sci-libs/cfitsio-3.360
@@ -4,10 +4,10 @@ DESCRIPTION=C and Fortran library for manipulating FITS files
 EAPI=5
 HOMEPAGE=http://heasarc.gsfc.nasa.gov/docs/software/fitsio/fitsio.html
 IUSE=doc examples fortran static-libs +tools threads
-KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris
+KEYWORDS=~alpha amd64 ~hppa ~ppc ~ppc64 ~sparc x86 ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris
 LICENSE=MIT
 RDEPEND=sys-libs/zlib fortran? ( virtual/fortran )
 SLOT=0/1
 SRC_URI=http://dev.gentoo.org/~bicatali/distfiles/cfitsio-3.360.tar.gz
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	autotools-utils	3727db64c7b960903d5033280f108080	eutils	998e5931fb95b10a6a11ec796ada2759	fortran-2	db8710b355fc5598015c4bc3aad3bdb0	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	a3db8057ea0903a9ebea4e46aab28ff9
-_md5_=63f0ded19a200f4990fc891de551a134
+_md5_=79b2d6ba4457207f1fc53d5c573819c4
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 25df1cbb7f42..5a5abd67bd31 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Sun, 08 Mar 2015 17:36:55 +0000
+Sun, 08 Mar 2015 21:36:56 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 1a7dcf350b00..674622f99c33 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Sun Mar  8 17:36:51 UTC 2015
+Sun Mar  8 21:36:53 UTC 2015
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index df311dc84715..52814639a8c4 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sun, 08 Mar 2015 18:00:01 +0000
+Sun, 08 Mar 2015 22:00:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 1f8bfc71b20e..e6f320e41daa 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1425836101 Sun 08 Mar 2015 05:35:01 PM UTC UTC
+1425850501 Sun 08 Mar 2015 09:35:01 PM UTC UTC
diff --git a/net-libs/nodejs/nodejs-0.12.0.ebuild b/net-libs/nodejs/nodejs-0.12.0.ebuild
index 720176c30fa5..811a8b419276 100644
--- a/net-libs/nodejs/nodejs-0.12.0.ebuild
+++ b/net-libs/nodejs/nodejs-0.12.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/net-libs/nodejs/nodejs-0.12.0.ebuild,v 1.2 2015/02/15 03:05:05 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/nodejs/nodejs-0.12.0.ebuild,v 1.3 2015/03/08 18:54:10 xarthisius Exp $
 
 EAPI=5
 
@@ -20,11 +20,11 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86 ~x64-macos"
 IUSE="+npm"
 
-RDEPEND="dev-libs/openssl[-bindist]"
-DEPEND="${PYTHON_DEPS}
-	${RDEPEND}
+RDEPEND="dev-libs/openssl[-bindist]
 	>=net-libs/http-parser-2.3
 	=dev-libs/libuv-1.1.0"
+DEPEND="${PYTHON_DEPS}
+	${RDEPEND}"
 
 S=${WORKDIR}/node-v${PV}
 
diff --git a/net-misc/pssh/Manifest b/net-misc/pssh/Manifest
index 8fc58f3ad5f4..0d871a9d4b31 100644
--- a/net-misc/pssh/Manifest
+++ b/net-misc/pssh/Manifest
@@ -1,3 +1,2 @@
 DIST pssh-2.1.1.tar.gz 18366 SHA256 63c317f114abae8c29c8f8e99f329d2b4dc36790a4821aeb4ee924da58100ca2
-DIST pssh-2.2.2.tar.gz 21440 SHA256 9b2e7fa6ee1185d668ddb0e049a9f6f8a7bc07738c341c43be674fea6109a97a SHA512 22125988898bd93ae46588743540425f861921f4ef4e4884a88977074dc93fae9373384b8391ee0e11bb9bf1b528d1de52991d7946c28e9c8220fdbadf778616 WHIRLPOOL b446f4e05527f78f14ba10f540274990a3775964ad34c7cd58fda497c88c4b9b3e55163d94159b8ef8e0b28a551b7db1fb5dcd13e9b801b65cf916475db60bc5
 DIST pssh-2.3.1.tar.gz 23427 SHA256 539f8d8363b722712310f3296f189d1ae8c690898eca93627fc89a9cb311f6b4 SHA512 c39e1c2b0a3bc2bd736f1e7d2f402db6a128e81d6a80ce7e97f39e7fae93f7a20037b43b5725bed5ba911f54e36a9b65c509d858a53c696989b76b1322e7680f WHIRLPOOL ff5eb7c2d11b47d74793f44acc9091cc3f0707b7a70a1d0d4074d2d19a4d0cebe381b30d211a140ff9ebfa90f1cee566f0b9c42a354fef9a4f2099e5c1aee7c7
diff --git a/net-misc/pssh/pssh-2.2.2.ebuild b/net-misc/pssh/pssh-2.2.2.ebuild
deleted file mode 100644
index a22f72e21ae1..000000000000
--- a/net-misc/pssh/pssh-2.2.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/pssh/pssh-2.2.2.ebuild,v 1.4 2014/08/10 20:46:29 slyfox Exp $
-
-EAPI="3"
-PYTHON_DEPEND="*:2.5"
-inherit distutils
-
-DESCRIPTION="This package provides parallel versions of the openssh tools"
-HOMEPAGE="http://code.google.com/p/parallel-ssh/"
-SRC_URI="http://parallel-ssh.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-interix ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="net-misc/openssh
-	!net-misc/putty"
-DEPEND="${RDEPEND}
-	dev-python/setuptools"
-
-# Requires ssh access to run.
-RESTRICT="test"
-
-PYTHON_MODNAME=psshlib
-
-src_prepare() {
-	sed -i -e "s|man/man1'|share/&|g" setup.py || die
-}
diff --git a/net-misc/pssh/pssh-2.3.1.ebuild b/net-misc/pssh/pssh-2.3.1-r1.ebuild
similarity index 58%
rename from net-misc/pssh/pssh-2.3.1.ebuild
rename to net-misc/pssh/pssh-2.3.1-r1.ebuild
index c9b552aabda7..40b51f5f87bf 100644
--- a/net-misc/pssh/pssh-2.3.1.ebuild
+++ b/net-misc/pssh/pssh-2.3.1-r1.ebuild
@@ -1,11 +1,13 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/pssh/pssh-2.3.1.ebuild,v 1.1 2012/08/18 10:33:33 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/pssh/pssh-2.3.1-r1.ebuild,v 1.1 2015/03/08 20:20:50 xarthisius Exp $
 
-EAPI=4
+EAPI=5
 
-PYTHON_DEPEND="*:2.5"
-inherit distutils
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1
 
 DESCRIPTION="PSSH provides parallel versions of OpenSSH and related tools"
 HOMEPAGE="http://code.google.com/p/parallel-ssh/"
@@ -19,14 +21,16 @@ IUSE=""
 RDEPEND="net-misc/openssh
 	!net-misc/putty"
 DEPEND="${RDEPEND}
-	dev-python/setuptools"
+	dev-python/setuptools[${PYTHON_USEDEP}]"
 
 # Requires ssh access to run.
 RESTRICT="test"
 
-PYTHON_MODNAME=psshlib
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
 
-src_prepare() {
+python_prepare_all() {
 	sed -i -e "s|man/man1'|share/&|g" setup.py || die
-	distutils_src_prepare
+	distutils-r1_python_prepare_all
 }
diff --git a/sci-libs/cfitsio/Manifest b/sci-libs/cfitsio/Manifest
index ba12e74ad8fe..e033eb1fc68d 100644
--- a/sci-libs/cfitsio/Manifest
+++ b/sci-libs/cfitsio/Manifest
@@ -1,3 +1,3 @@
 DIST cfitsio-3.350.tar.gz 4091022 SHA256 3e6615cec267b47faf378079a2c5e41a68bc0584390cad10fa292fa530842ef1 SHA512 d2f632845cdbdc2badb52da78eb9709afc15a2e2c7a914f726dde5b24bbffeb9fadce5ec642e85366d4bac3e177ee3e596b2f953abc6f0a62a5c2ef0e3d1b520 WHIRLPOOL 865c24c2b22402c5c50c4f09e12166f424623bb756f6678952949e3fa2e01a3bef3e4f3cbb856ec946a62e16480e6ce9336f564e033657bf2049bcd32fbcdbb8
 DIST cfitsio-3.360.tar.gz 4104894 SHA256 b5fb209583c76a0bcc39808e55ebf2417b9c26114c59db1a3f49ea1ede5fa95d SHA512 158819b4a3a29c29a5f017283e2b20067420994e881d202dbf3ba199c9e564dc1e74f8be5ce84f78107126d2a8688cc55cc7ed284540ca647e44cdc3b0b02072 WHIRLPOOL 05589a27c6fa83a0240b26924954c1c6d25d985ad609dfbd37fccfe5758fd28efbd97a5ec289803053e2f53e053e51c017292845de1b4368bcd1725fa2eccdb7
-DIST cfitsio3140.tar.gz 2903379 SHA256 d45e253d513d8df331a0294d243460773c57f9045878c8b79efbc7427c873d96
+DIST cfitsio3140.tar.gz 2903379 SHA256 d45e253d513d8df331a0294d243460773c57f9045878c8b79efbc7427c873d96 SHA512 9c307a39968d141fc2a1bf63fb212f2466ed5fb860c1ec9a6017023bd7be3079682428f06b2fa4dc699d8e14b5bf2155b486340f82ece64c357b2cab6d51fca2 WHIRLPOOL 61e757e7eeca36c1ae436ac49a72ccae17f3c7f0fce2936acd4ca29ee999c577610d9869498caf24e2dc86a80894ca8503c2d1d3307a43c89f977f2aff47cd30
diff --git a/sci-libs/cfitsio/cfitsio-3.360.ebuild b/sci-libs/cfitsio/cfitsio-3.360.ebuild
index 3b9331e4757f..68a32129960e 100644
--- a/sci-libs/cfitsio/cfitsio-3.360.ebuild
+++ b/sci-libs/cfitsio/cfitsio-3.360.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/sci-libs/cfitsio/cfitsio-3.360.ebuild,v 1.2 2014/02/05 23:54:54 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/cfitsio/cfitsio-3.360.ebuild,v 1.3 2015/03/08 21:02:42 pacho Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="http://dev.gentoo.org/~bicatali/distfiles/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/1"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 ~sparc x86 ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
 IUSE="doc examples fortran static-libs +tools threads"
 
 RDEPEND="sys-libs/zlib"