diff --git a/app-admin/eselect-metasploit/eselect-metasploit-0.14.ebuild b/app-admin/eselect-metasploit/eselect-metasploit-0.14.ebuild
new file mode 100644
index 000000000000..8df96126cb3a
--- /dev/null
+++ b/app-admin/eselect-metasploit/eselect-metasploit-0.14.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-metasploit/eselect-metasploit-0.14.ebuild,v 1.1 2014/10/03 03:39:09 zerochaos Exp $
+
+EAPI=5
+
+inherit multilib
+
+DESCRIPTION="eselect module for metasploit"
+HOMEPAGE="http://www.pentoo.ch/"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND="app-admin/eselect
+	!<net-analyzer/metasploit-4.6"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}
+
+src_install() {
+	#force to use the outdated bundled version of metasm
+	doenvd "${FILESDIR}"/91metasploit
+
+	newinitd "${FILESDIR}"/msfrpcd.initd msfrpcd
+	newconfd "${FILESDIR}"/msfrpcd.confd msfrpcd
+
+	insinto /usr/share/eselect/modules
+	newins "${FILESDIR}/metasploit.eselect-0.13" metasploit.eselect
+
+	newbin "${FILESDIR}"/msfloader-${PV} msfloader
+}
+
+pkg_postinst() {
+	"${EROOT}"/usr/bin/eselect metasploit set --use-old 1
+	elog "To switch between installed slots, execute as root:"
+	elog " # eselect metasploit set [slot number]"
+}
diff --git a/app-admin/eselect-metasploit/files/msfloader-0.14 b/app-admin/eselect-metasploit/files/msfloader-0.14
new file mode 100644
index 000000000000..ab5f5d302294
--- /dev/null
+++ b/app-admin/eselect-metasploit/files/msfloader-0.14
@@ -0,0 +1,35 @@
+#!/bin/sh
+
+#todo:
+#add in optional auto starting/stopping of postgres
+
+#normally msf makes this dir, however, this script runs first
+if [ ! -d ~/.msf4 ]; then
+	mkdir ~/.msf4
+fi
+
+#we cannot control if msf* exits normally so always start with cleanup
+if [ -f ~/.msf4/Gemfile ]; then
+	rm ~/.msf4/Gemfile
+fi
+if ls -A ~/.msf4/*.gemspec > /dev/zero 2>&1; then
+	rm ~/.msf4/*.gemspec
+fi
+
+#fetch the latest Gemfile and gemspecsfrom the selected version of msf
+cp /usr/lib/metasploit/Gemfile ~/.msf4/
+cp /usr/lib/metasploit/*.gemspec ~/.msf4/
+
+#ensure Gemfile.lock is up to date
+BUNDLE_GEMFILE=~/.msf4/Gemfile MSF_ROOT=/usr/lib/metasploit bundle check > /dev/null 2>&1
+if [ "$?" != "0" ]; then
+	if [ -f ~/.msf4/Gemfile.lock ]; then
+		rm ~/.msf4/Gemfile.lock
+	else
+		echo "Something went wrong, please open a bug for metasploit on https://bugs.gentoo.org"
+	fi
+fi
+
+#ready to go
+BUNDLE_GEMFILE=~/.msf4/Gemfile MSF_ROOT=/usr/lib/metasploit bundle exec /usr/lib/metasploit/$(basename $0) "$@"
+#profit
diff --git a/app-admin/rsyslog/rsyslog-8.4.2.ebuild b/app-admin/rsyslog/rsyslog-8.4.2.ebuild
index 9c8e0d17a8a5..a84ffa25403b 100644
--- a/app-admin/rsyslog/rsyslog-8.4.2.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-8.4.2.ebuild,v 1.1 2014/10/02 15:03:24 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-8.4.2.ebuild,v 1.2 2014/10/02 21:04:38 jer Exp $
 
 EAPI=5
 AUTOTOOLS_AUTORECONF=1
@@ -15,7 +15,7 @@ SRC_URI="
 "
 
 LICENSE="GPL-3 LGPL-3 Apache-2.0"
-KEYWORDS="~amd64 ~arm ~hppa ~x86"
+KEYWORDS="~amd64 ~arm hppa ~x86"
 SLOT="0"
 IUSE="dbi debug doc elasticsearch +gcrypt jemalloc kerberos mongodb mysql normalize omudpspoof oracle postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd usertools zeromq"
 
diff --git a/app-benchmarks/wrk/Manifest b/app-benchmarks/wrk/Manifest
new file mode 100644
index 000000000000..b839b29b40f9
--- /dev/null
+++ b/app-benchmarks/wrk/Manifest
@@ -0,0 +1 @@
+DIST wrk-3.1.1.tar.gz 901059 SHA256 3a44bd7c9da2edb80d41105c99c113250330b54bb9c3f80008eb6b088e5842ba SHA512 ed7bfa0549ce10046e5f054b75befc458f50dd8fa59d5c23194ce63ce18a3c0dd2e966a1397bbd2c1dea7b9ad2f4a8a6b3a5a9676c5202d53fa9406da75b7e19 WHIRLPOOL 3bcea7bfd5f80bd382d5fc83898b7afa3a2da4b6ed4349ad183dd80368c6d0c5127516ccc5cd569344b61de7357d12df8d7272709ba3ee976107989ffe41ff6f
diff --git a/app-benchmarks/wrk/files/wrk-3.1.1-makefile.patch b/app-benchmarks/wrk/files/wrk-3.1.1-makefile.patch
new file mode 100644
index 000000000000..595c69ac1572
--- /dev/null
+++ b/app-benchmarks/wrk/files/wrk-3.1.1-makefile.patch
@@ -0,0 +1,54 @@
+diff --git i/Makefile w/Makefile
+index d956c6b..48be677 100644
+--- i/Makefile
++++ w/Makefile
+@@ -1,4 +1,4 @@
+-CFLAGS  := -std=c99 -Wall -O2 -D_REENTRANT
++CFLAGS  += -std=c99 -Wall -D_REENTRANT
+ LIBS    := -lpthread -lm -lcrypto -lssl
+ 
+ TARGET  := $(shell uname -s | tr '[A-Z]' '[a-z]' 2>/dev/null || echo unknown)
+@@ -23,38 +23,31 @@ BIN  := wrk
+ ODIR := obj
+ OBJ  := $(patsubst %.c,$(ODIR)/%.o,$(SRC)) $(ODIR)/bytecode.o
+ 
+-LDIR     = deps/luajit/src
+-LIBS    := -lluajit $(LIBS)
+-CFLAGS  += -I$(LDIR)
+-LDFLAGS += -L$(LDIR)
++LIBS    := $(shell pkg-config --libs luajit) $(LIBS)
++CFLAGS  += $(shell pkg-config --cflags luajit)
+ 
+ all: $(BIN)
+ 
+ clean:
+ 	$(RM) $(BIN) obj/*
+-	@$(MAKE) -C deps/luajit clean
+ 
+ $(BIN): $(OBJ)
+ 	@echo LINK $(BIN)
+-	@$(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
++	@$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
+ 
+-$(OBJ): config.h Makefile $(LDIR)/libluajit.a | $(ODIR)
++$(OBJ): config.h Makefile | $(ODIR)
+ 
+ $(ODIR):
+ 	@mkdir -p $@
+ 
+ $(ODIR)/bytecode.o: src/wrk.lua
+ 	@echo LUAJIT $<
+-	@$(SHELL) -c 'cd $(LDIR) && ./luajit -b $(CURDIR)/$< $(CURDIR)/$@'
++	@$(SHELL) -c 'luajit -b $(CURDIR)/$< $(CURDIR)/$@'
+ 
+ $(ODIR)/%.o : %.c
+ 	@echo CC $<
+ 	@$(CC) $(CFLAGS) -c -o $@ $<
+ 
+-$(LDIR)/libluajit.a:
+-	@echo Building LuaJIT...
+-	@$(MAKE) -C $(LDIR) BUILDMODE=static
+-
+ .PHONY: all clean
+ .SUFFIXES:
+ .SUFFIXES: .c .o .lua
diff --git a/app-benchmarks/wrk/metadata.xml b/app-benchmarks/wrk/metadata.xml
new file mode 100644
index 000000000000..b73d00b06fa4
--- /dev/null
+++ b/app-benchmarks/wrk/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>vikraman@gentoo.org</email>
+		<name>Vikraman Choudhury (vikraman)</name>
+	</maintainer>
+	<longdescription lang="en">
+		wrk is a modern HTTP benchmarking tool capable of generating
+		significant load when run on a single multi-core CPU. It combines a
+		multithreaded design with scalable event notification systems such as
+		epoll and kqueue.  An optional LuaJIT script can perform HTTP request
+		generation, response processing, and custom reporting.
+	</longdescription>
+</pkgmetadata>
diff --git a/app-benchmarks/wrk/wrk-3.1.1.ebuild b/app-benchmarks/wrk/wrk-3.1.1.ebuild
new file mode 100644
index 000000000000..d90dc8669bd8
--- /dev/null
+++ b/app-benchmarks/wrk/wrk-3.1.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/wrk/wrk-3.1.1.ebuild,v 1.1 2014/10/02 19:09:59 vikraman Exp $
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="A modern HTTP benchmarking tool"
+HOMEPAGE="https://github.com/wg/wrk"
+SRC_URI="https://github.com/wg/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE=""
+
+DEPEND="dev-libs/openssl >=dev-lang/luajit-2.0.2"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	rm -rf deps/luajit || die "failed to remove bundled luajit"
+	epatch "${FILESDIR}/${P}-makefile.patch"
+}
+
+src_compile() {
+	tc-export CC
+	emake || die
+}
+
+src_install() {
+	dobin wrk
+	dodoc README NOTICE
+	insinto /usr/share/${PN}
+	doins -r scripts
+}
diff --git a/dev-php/ffmpeg-php/ffmpeg-php-0.6.0-r3.ebuild b/dev-php/ffmpeg-php/ffmpeg-php-0.6.0-r3.ebuild
new file mode 100644
index 000000000000..ecf953810b0b
--- /dev/null
+++ b/dev-php/ffmpeg-php/ffmpeg-php-0.6.0-r3.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php/ffmpeg-php/ffmpeg-php-0.6.0-r3.ebuild,v 1.1 2014/10/02 20:42:18 grknight Exp $
+
+EAPI="5"
+
+PHP_EXT_NAME="ffmpeg"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+
+USE_PHP="php5-6 php5-5 php5-4"
+
+inherit php-ext-source-r2 eutils
+
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="PHP extension that provides access to movie info"
+HOMEPAGE="http://sourceforge.net/projects/ffmpeg-php/"
+SRC_URI="mirror://sourceforge/ffmpeg-php/${P}.tbz2"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="virtual/ffmpeg
+		dev-lang/php[gd]"
+RDEPEND="${DEPEND}"
+
+# The test breaks with the test movie, but it the same code works fine with
+# other movies
+
+RESTRICT="test"
+
+DOCS="CREDITS ChangeLog EXPERIMENTAL TODO"
+
+src_prepare() {
+	for slot in $(php_get_slots) ; do
+		cd "${WORKDIR}/${slot}"
+		epatch "${FILESDIR}/${P}-avutil50.patch"
+		epatch "${FILESDIR}/${P}-ffmpeg.patch"
+		epatch "${FILESDIR}/${P}-log.patch"
+		epatch "${FILESDIR}/${P}-php5-4.patch"
+		epatch "${FILESDIR}/${P}-ffincludes.patch"
+		epatch "${FILESDIR}/${P}-ffmpeg1.patch"
+		epatch "${FILESDIR}/${P}-api.patch"
+	done
+	php-ext-source-r2_src_prepare
+}
diff --git a/dev-php/ffmpeg-php/files/ffmpeg-php-0.6.0-api.patch b/dev-php/ffmpeg-php/files/ffmpeg-php-0.6.0-api.patch
new file mode 100644
index 000000000000..b5f753d2e966
--- /dev/null
+++ b/dev-php/ffmpeg-php/files/ffmpeg-php-0.6.0-api.patch
@@ -0,0 +1,74 @@
+diff --git a/ffmpeg_movie.c b/ffmpeg_movie.c
+index 0ce2c0f..6b77eb5 100644
+--- a/ffmpeg_movie.c
++++ b/ffmpeg_movie.c
+@@ -39,6 +39,7 @@
+ #include "ext/standard/info.h"
+ 
+ #include <libavcodec/avcodec.h>
++#include <libavcodec/version.h>
+ #include <libavformat/avformat.h>
+ #include <libavutil/pixfmt.h>
+ #include <libavutil/pixdesc.h>
+@@ -252,17 +257,17 @@ static int _php_open_movie_file(ff_movie_context *ffmovie_ctx,
+         char* filename)
+ {
+     if (ffmovie_ctx->fmt_ctx) {
+-        av_close_input_file(ffmovie_ctx->fmt_ctx);
++        avformat_close_input(&ffmovie_ctx->fmt_ctx);
+         ffmovie_ctx->fmt_ctx = NULL;
+     }
+     
+     /* open the file with generic libav function */
+     if (avformat_open_input(&ffmovie_ctx->fmt_ctx, filename, NULL, NULL) < 0) {
+         return 1;
+     }
+ 
+     /* decode the first frames to get the stream parameters. */
+-    av_find_stream_info(ffmovie_ctx->fmt_ctx);
++    avformat_find_stream_info(ffmovie_ctx->fmt_ctx, NULL);
+ 
+     return 0;
+ }
+@@ -416,7 +421,7 @@ static void _php_free_ffmpeg_movie(zend_rsrc_list_entry *rsrc TSRMLS_DC)
+         }
+     }
+ 
+-    av_close_input_file(ffmovie_ctx->fmt_ctx);
++    avformat_close_input(&ffmovie_ctx->fmt_ctx);
+ 
+     efree(ffmovie_ctx);
+ }
+@@ -440,7 +445,7 @@ static void _php_free_ffmpeg_pmovie(zend_rsrc_list_entry *rsrc TSRMLS_DC)
+         }
+     }
+ 
+-    av_close_input_file(ffmovie_ctx->fmt_ctx);
++    avformat_close_input(&ffmovie_ctx->fmt_ctx);
+ 
+     free(ffmovie_ctx);
+ }
+@@ -512,7 +517,7 @@ static AVCodecContext* _php_get_decoder_context(ff_movie_context *ffmovie_ctx,
+             GET_CODEC_PTR(ffmovie_ctx->fmt_ctx->streams[stream_index]->codec);
+ 
+        /* open the decoder */
+-        if (avcodec_open(ffmovie_ctx->codec_ctx[stream_index], decoder) < 0) {
++        if (avcodec_open2(ffmovie_ctx->codec_ctx[stream_index], decoder, NULL) < 0) {
+             zend_error(E_WARNING, "Could not open codec for %s", _php_get_filename(ffmovie_ctx));
+             return NULL;
+         }
+@@ -966,12 +967,14 @@ static const char* _php_get_codec_name(ff_movie_context *ffmovie_ctx, int type)
+     /* Copied from libavcodec/utils.c::avcodec_string */
+     if (p) {
+         codec_name = p->name;
++#ifdef FF_API_SUB_ID
+         if (decoder_ctx->codec_id == CODEC_ID_MP3) {
+             if (decoder_ctx->sub_id == 2)
+                 codec_name = "mp2";
+             else if (decoder_ctx->sub_id == 1)
+                 codec_name = "mp1";
+         }
++#endif
+     } else if (decoder_ctx->codec_id == CODEC_ID_MPEG2TS) {
+         /* fake mpeg2 transport stream codec (currently not registered) */
+         codec_name = "mpeg2ts";
diff --git a/dev-python/PyGithub/Manifest b/dev-python/PyGithub/Manifest
index 9afa3fc80b35..abf2d21f5a87 100644
--- a/dev-python/PyGithub/Manifest
+++ b/dev-python/PyGithub/Manifest
@@ -3,3 +3,4 @@ DIST PyGithub-1.23.0.tar.gz 2424183 SHA256 b78867c79033ccfe5fd39b1747d024e4db45e
 DIST PyGithub-1.24.0.tar.gz 2502485 SHA256 8658e30bfdea85cf1a4f045e41b28c2f622078bea2ca14ce710ea96d759c56f2 SHA512 7a7428970459d91045cf06065c634e6d607edfca6bc2d3e800bba75147d4ce45a8004cea7ecfb651dd4f10c03607b15758ee6c9d79c6c9c2e4cb61868f5fc314 WHIRLPOOL d5dbe7ef8534bc7942d015f3ec7878d902c367068dc4567ba3acd455f196e96be60f10a112212d02091f67eb5a5a6a1b37848580c905308bdafd23b1b46555ed
 DIST PyGithub-1.24.1.tar.gz 2509518 SHA256 31163c7ee75bfd3d0e6e292f846876622c203dbcb332330cdf676c40a4aeb294 SHA512 457be294804aa646572eae1ff7497c7c232c2c961a4c7ba778afd866585d1165f856d136084fcb8ce987e916779de6056edc0f26442e7e728dd66fcc383f45e4 WHIRLPOOL 935f7677e36db183f7494718060e86c7d0bfa8e35524b6cb216d7e6aae2f305c1afdebdbd579dc77c9b6373f7746d63da409ebd41ae02a7e73e631c741a0a8d5
 DIST PyGithub-1.25.0.tar.gz 2514171 SHA256 bea24a94b8450161efb258257342617617e5582b70419224ee0e436c6a410110 SHA512 02245bf3f75a6144d1632f1eb27b13e719042ed66eaf8540a966b75ec880322a062490d6c3cd0e65599af613add59862201964955f2ff0e3fee75ea46f1f35b1 WHIRLPOOL 5ed09fa21d633e4ca07c5c71870948c1ab90fccfb2caf73178af183b81cfcc45ca95ae4050e3c9ea39fffc9efbca559042d730a8ac2348952cfa49ea5bbcb9e6
+DIST PyGithub-1.25.1.tar.gz 2514716 SHA256 6c39a6077e08f2f266039c5184911fc30c7b90a42f875fe98d7cef52a7aa8afa SHA512 5e17de013465ec2452d0c3018d83c000e3cd90d3a9a0590e409769438321035140fccc2aa10468a116573b374552232dac69b96189ae3627f2399289fba77287 WHIRLPOOL a8aef2edad109edbe8b0ab3272ad39f235b90f425b18ec7ac5e822a9d05838f6514320e2fdc46195cf4a5dbb0141b044e0fc2a2ebbd5aa03ae87c68edcbbbbdd
diff --git a/dev-python/PyGithub/PyGithub-1.25.1.ebuild b/dev-python/PyGithub/PyGithub-1.25.1.ebuild
new file mode 100644
index 000000000000..aeb8532e77f7
--- /dev/null
+++ b/dev-python/PyGithub/PyGithub-1.25.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyGithub/PyGithub-1.25.1.ebuild,v 1.1 2014/10/03 02:41:50 radhermit Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python library to access the Github API v3"
+HOMEPAGE="https://github.com/jacquev6/PyGithub/"
+# Use github since pypi is missing test data
+SRC_URI="https://github.com/jacquev6/PyGithub/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/pygit2/Manifest b/dev-python/pygit2/Manifest
index 7acef517d7cc..1ec56b177883 100644
--- a/dev-python/pygit2/Manifest
+++ b/dev-python/pygit2/Manifest
@@ -3,3 +3,4 @@ DIST pygit2-0.20.3.tar.gz 141887 SHA256 2957db7d9616db910e9274051fbfe66a496b9101
 DIST pygit2-0.21.0.tar.gz 145394 SHA256 0900dd82e40b81238e04e48a4438ccfe83106b5ef714127bfb33c2d4a96f0562 SHA512 27634b0175e3573e59344a7450f05dda2307bd561e7afc19cbadce344b327e771ca8d7f0ee11ee6d9320eac6d9b9634c7febebb68ad36ee5508068dd801a2989 WHIRLPOOL 60c64291f9dbb3f047a90a615ce8f336062ed0bc2af83c7b3658328dcd2c464e6b6cea2bb5570a435f00d11e97fbab9cf329b083e1ecee96f3a4123fd769bcee
 DIST pygit2-0.21.1.tar.gz 412369 SHA256 0669584ccc0a66f55261174e869c9700004b5f60a568379a6b29346740196ead SHA512 75528759230b6e6e5e4c70125cacf34313705608bed8d1f5ce156e5dc68d7e9d4a18c90e3724d54777111f8ed9cd8fc93c66d0c57836a23ff4505fe463e73109 WHIRLPOOL 467610b8950d450e946f9215810a179c5ee51bbf25687fd193ab9b346d3bf849b85c406af8b12427e281a0fa80b58ae14b2f15725d744d2865f82dbd333080a7
 DIST pygit2-0.21.2.tar.gz 413064 SHA256 54649339d9bc623f46c1eba6f02561564c9c28a7078cb5bb670fdc63588eef8f SHA512 204015873cfc1718961ca9f66d282173af4ae848e8022b75cc6373e7a91d549aa982e4f4769babe0547aba7d0c11619f8ae732fe27e8c47982e6e506c2a8abb9 WHIRLPOOL be28b0326dbdf3efb5af62d32923813be1690aa30068f3ee69d0040b001ed420728c6c8f322f756b810dd33ce863eb10387281df666bcb5337a21bdfb2f54f26
+DIST pygit2-0.21.3.tar.gz 415152 SHA256 73385f589d9d25bb374f0b76c3b321a39f7077f2e6601a9d3312b3416dd0da79 SHA512 7f13d8fe390fd1d98361a59892aae1f926fb0714579daddee756b17d5333a911950646384fac021c21fa332e074127c2ac27a9a9959c21d03215f2a266e4e88a WHIRLPOOL d1a221c4db58524e11562b5530abf0f96bfc6628302f3a05b65a1ce2878d7c4b24b2be0c2aab0de1b9cdf85f6f3dc6dc166de5b40f3ee2ca428e9f0e3f43423a
diff --git a/dev-python/pygit2/pygit2-0.21.3.ebuild b/dev-python/pygit2/pygit2-0.21.3.ebuild
new file mode 100644
index 000000000000..36f1b69dbcc0
--- /dev/null
+++ b/dev-python/pygit2/pygit2-0.21.3.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygit2/pygit2-0.21.3.ebuild,v 1.1 2014/10/03 02:44:15 radhermit Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit distutils-r1 versionator
+
+DESCRIPTION="Python bindings for libgit2"
+HOMEPAGE="https://github.com/libgit2/pygit2"
+SRC_URI="https://github.com/libgit2/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	=dev-libs/libgit2-$(get_version_component_range 1-2)*
+	dev-python/cffi[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-qt/qtopengl/metadata.xml b/dev-qt/qtopengl/metadata.xml
index ef055b8ae728..3d51887466e1 100644
--- a/dev-qt/qtopengl/metadata.xml
+++ b/dev-qt/qtopengl/metadata.xml
@@ -7,6 +7,7 @@
 			contexts on the desktop</flag>
 		<flag name="exceptions">Add support for exceptions - like catching them
 			inside the event loop (recommended by upstream)</flag>
+		<flag name="gles2">Use OpenGL ES 2.0 instead of desktop OpenGL</flag>
 		<flag name="qt3support">Enable the Qt3Support libraries for Qt4</flag>
 	</use>
 	<upstream>
diff --git a/dev-qt/qtopengl/qtopengl-5.3.2.ebuild b/dev-qt/qtopengl/qtopengl-5.3.2-r1.ebuild
similarity index 75%
rename from dev-qt/qtopengl/qtopengl-5.3.2.ebuild
rename to dev-qt/qtopengl/qtopengl-5.3.2-r1.ebuild
index 6667439fe6b4..cfbe74f5ea52 100644
--- a/dev-qt/qtopengl/qtopengl-5.3.2.ebuild
+++ b/dev-qt/qtopengl/qtopengl-5.3.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtopengl/qtopengl-5.3.2.ebuild,v 1.1 2014/09/16 14:46:17 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtopengl/qtopengl-5.3.2-r1.ebuild,v 1.1 2014/10/03 00:53:01 pesa Exp $
 
 EAPI=5
 
@@ -17,12 +17,12 @@ else
 	KEYWORDS="~amd64 ~x86"
 fi
 
-IUSE=""
+IUSE="gles2"
 
 DEPEND="
 	~dev-qt/qtcore-${PV}[debug=]
-	~dev-qt/qtgui-${PV}[debug=,opengl]
-	~dev-qt/qtwidgets-${PV}[debug=]
+	~dev-qt/qtgui-${PV}[debug=,gles2=,opengl]
+	~dev-qt/qtwidgets-${PV}[debug=,gles2=,opengl]
 	virtual/opengl
 "
 RDEPEND="${DEPEND}"
@@ -33,7 +33,7 @@ QT5_TARGET_SUBDIRS=(
 
 src_configure() {
 	local myconf=(
-		-opengl
+		-opengl $(usex gles2 es2 desktop)
 	)
 	qt5-build_src_configure
 }
diff --git a/dev-util/buildbot-slave/buildbot-slave-0.8.9.ebuild b/dev-util/buildbot-slave/buildbot-slave-0.8.9.ebuild
index 9eb8ba1e558b..78293da2e3ad 100644
--- a/dev-util/buildbot-slave/buildbot-slave-0.8.9.ebuild
+++ b/dev-util/buildbot-slave/buildbot-slave-0.8.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/buildbot-slave/buildbot-slave-0.8.9.ebuild,v 1.3 2014/09/14 09:19:20 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/buildbot-slave/buildbot-slave-0.8.9.ebuild,v 1.4 2014/10/02 20:30:27 hwoarang Exp $
 
 EAPI="5"
 PYTHON_DEPEND="2"
@@ -20,7 +20,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-interix ~amd64-linux"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-interix ~amd64-linux"
 IUSE="test"
 
 RDEPEND="dev-python/setuptools
diff --git a/dev-util/buildbot/buildbot-0.8.9.ebuild b/dev-util/buildbot/buildbot-0.8.9.ebuild
index 612cc8cfc290..330c1fc2e194 100644
--- a/dev-util/buildbot/buildbot-0.8.9.ebuild
+++ b/dev-util/buildbot/buildbot-0.8.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/buildbot/buildbot-0.8.9.ebuild,v 1.3 2014/09/14 09:18:46 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/buildbot/buildbot-0.8.9.ebuild,v 1.4 2014/10/02 20:29:51 hwoarang Exp $
 
 EAPI="5"
 PYTHON_DEPEND="2"
@@ -20,7 +20,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-interix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
 IUSE="doc examples irc mail manhole test"
 
 # sqlite3 module of Python 2.5 is not supported.
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 91915dad8ca6..c09ba9e7e3c7 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Thu, 02 Oct 2014 19:07:08 +0000
+Fri, 03 Oct 2014 04:07:01 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 91915dad8ca6..c09ba9e7e3c7 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Thu, 02 Oct 2014 19:07:08 +0000
+Fri, 03 Oct 2014 04:07:01 +0000
diff --git a/metadata/md5-cache/app-admin/eselect-metasploit-0.14 b/metadata/md5-cache/app-admin/eselect-metasploit-0.14
new file mode 100644
index 000000000000..a2e1e254aa24
--- /dev/null
+++ b/metadata/md5-cache/app-admin/eselect-metasploit-0.14
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install postinst
+DEPEND=app-admin/eselect !<net-analyzer/metasploit-4.6
+DESCRIPTION=eselect module for metasploit
+EAPI=5
+HOMEPAGE=http://www.pentoo.ch/
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=app-admin/eselect !<net-analyzer/metasploit-4.6
+SLOT=0
+_eclasses_=multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0f1760274637a138b99bb649202ea402
+_md5_=7d3a595e148728d81eb40ff0de563465
diff --git a/metadata/md5-cache/app-admin/rsyslog-8.4.2 b/metadata/md5-cache/app-admin/rsyslog-8.4.2
index 4c9422b03e2c..b17a1856b063 100644
--- a/metadata/md5-cache/app-admin/rsyslog-8.4.2
+++ b/metadata/md5-cache/app-admin/rsyslog-8.4.2
@@ -4,11 +4,11 @@ DESCRIPTION=An enhanced multi-threaded syslogd with database support and more
 EAPI=5
 HOMEPAGE=http://www.rsyslog.com/
 IUSE=dbi debug doc elasticsearch +gcrypt jemalloc kerberos mongodb mysql normalize omudpspoof oracle postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd usertools zeromq
-KEYWORDS=~amd64 ~arm ~hppa ~x86
+KEYWORDS=~amd64 ~arm hppa ~x86
 LICENSE=GPL-3 LGPL-3 Apache-2.0
 RDEPEND=>=dev-libs/json-c-0.11:= >=dev-libs/libestr-0.1.9 >=dev-libs/liblogging-1.0.1:=[stdlog] >=sys-libs/zlib-1.2.5 dbi? ( >=dev-db/libdbi-0.8.3 ) elasticsearch? ( >=net-misc/curl-7.35.0 ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= ) jemalloc? ( >=dev-libs/jemalloc-3.3.1 ) kerberos? ( virtual/krb5 ) mongodb? ( >=dev-libs/libmongo-client-0.1.4 ) mysql? ( virtual/mysql ) normalize? ( >=dev-libs/libee-0.4.0 >=dev-libs/liblognorm-1.0.0:= ) omudpspoof? ( >=net-libs/libnet-1.1.6 ) oracle? ( >=dev-db/oracle-instantclient-basic-10.2 ) postgres? ( >=dev-db/postgresql-base-8.4.20 ) rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0 ) redis? ( >=dev-libs/hiredis-0.11.0 ) relp? ( >=dev-libs/librelp-1.2.5 ) rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] ) rfc5424hmac? ( >=dev-libs/openssl-0.9.8y ) snmp? ( >=net-analyzer/net-snmp-5.7.2 ) ssl? ( >=net-libs/gnutls-2.12.23 ) systemd? ( >=sys-apps/systemd-208 ) zeromq? ( >=net-libs/czmq-1.2.0 )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.rsyslog.com/files/download/rsyslog/rsyslog-8.4.2.tar.gz doc? ( http://www.rsyslog.com/files/download/rsyslog/rsyslog-doc-8.4.2.tar.gz )
 _eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	autotools-utils	3727db64c7b960903d5033280f108080	eutils	32548a82e42dc26e3312581476d2f20c	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=fddb8c71e96b0c16fdbfbf0efa60218a
+_md5_=80da63bcdac2cee53fc296b6b4c5fd53
diff --git a/metadata/md5-cache/app-benchmarks/wrk-3.1.1 b/metadata/md5-cache/app-benchmarks/wrk-3.1.1
new file mode 100644
index 000000000000..1bdc6d896e99
--- /dev/null
+++ b/metadata/md5-cache/app-benchmarks/wrk-3.1.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=dev-libs/openssl >=dev-lang/luajit-2.0.2
+DESCRIPTION=A modern HTTP benchmarking tool
+EAPI=5
+HOMEPAGE=https://github.com/wg/wrk
+KEYWORDS=~x86 ~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-libs/openssl >=dev-lang/luajit-2.0.2
+SLOT=0
+SRC_URI=https://github.com/wg/wrk/archive/3.1.1.tar.gz -> wrk-3.1.1.tar.gz
+_eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0f1760274637a138b99bb649202ea402
+_md5_=aa620c142199bfed0cb5eb40d6c12388
diff --git a/metadata/md5-cache/dev-php/ffmpeg-php-0.6.0-r3 b/metadata/md5-cache/dev-php/ffmpeg-php-0.6.0-r3
new file mode 100644
index 000000000000..d8c1b635b6d6
--- /dev/null
+++ b/metadata/md5-cache/dev-php/ffmpeg-php-0.6.0-r3
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare unpack
+DEPEND=virtual/ffmpeg dev-lang/php[gd] !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php5-5? ( dev-lang/php:5.5 ) php_targets_php5-4? ( dev-lang/php:5.4 )
+DESCRIPTION=PHP extension that provides access to movie info
+EAPI=5
+HOMEPAGE=http://sourceforge.net/projects/ffmpeg-php/
+IUSE=php_targets_php5-6 php_targets_php5-5 php_targets_php5-4
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=virtual/ffmpeg dev-lang/php[gd] php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php5-5? ( dev-lang/php:5.5 ) php_targets_php5-4? ( dev-lang/php:5.4 )
+REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php5-5 php_targets_php5-4 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://sourceforge/ffmpeg-php/ffmpeg-php-0.6.0.tbz2
+_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	32548a82e42dc26e3312581476d2f20c	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	php-ext-source-r2	39437168059a2166e012420b3ba12815	toolchain-funcs	0f1760274637a138b99bb649202ea402
+_md5_=bd75d770a43626c6a2ccefe5a90e3ba9
diff --git a/metadata/md5-cache/dev-python/PyGithub-1.25.1 b/metadata/md5-cache/dev-python/PyGithub-1.25.1
new file mode 100644
index 000000000000..a5483b710905
--- /dev/null
+++ b/metadata/md5-cache/dev-python/PyGithub-1.25.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
+DESCRIPTION=Python library to access the Github API v3
+EAPI=5
+HOMEPAGE=https://github.com/jacquev6/PyGithub/
+IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-3
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
+SLOT=0
+SRC_URI=https://github.com/jacquev6/PyGithub/archive/v1.25.1.tar.gz -> PyGithub-1.25.1.tar.gz
+_eclasses_=distutils-r1	90e7008a7d21e3b1597bea444bb85827	eutils	32548a82e42dc26e3312581476d2f20c	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	75e5c82b55dcb208a0a8f4ab8847e731	python-utils-r1	47dda904cf91c61f45b564d9f834fde1	toolchain-funcs	0f1760274637a138b99bb649202ea402
+_md5_=152f75e468b3503a944b61ca62590852
diff --git a/metadata/md5-cache/dev-python/pygit2-0.21.3 b/metadata/md5-cache/dev-python/pygit2-0.21.3
new file mode 100644
index 000000000000..613ee063d09d
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pygit2-0.21.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND==dev-libs/libgit2-0.21* dev-python/cffi[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
+DESCRIPTION=Python bindings for libgit2
+EAPI=5
+HOMEPAGE=https://github.com/libgit2/pygit2
+IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2-with-linking-exception
+RDEPEND==dev-libs/libgit2-0.21* dev-python/cffi[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
+SLOT=0
+SRC_URI=https://github.com/libgit2/pygit2/archive/v0.21.3.tar.gz -> pygit2-0.21.3.tar.gz
+_eclasses_=distutils-r1	90e7008a7d21e3b1597bea444bb85827	eutils	32548a82e42dc26e3312581476d2f20c	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	75e5c82b55dcb208a0a8f4ab8847e731	python-utils-r1	47dda904cf91c61f45b564d9f834fde1	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=aa0814a64d8f1a93158ca40407923008
diff --git a/metadata/md5-cache/dev-qt/qtopengl-5.3.2 b/metadata/md5-cache/dev-qt/qtopengl-5.3.2-r1
similarity index 62%
rename from metadata/md5-cache/dev-qt/qtopengl-5.3.2
rename to metadata/md5-cache/dev-qt/qtopengl-5.3.2-r1
index c280e3a8a314..e36108bebcfa 100644
--- a/metadata/md5-cache/dev-qt/qtopengl-5.3.2
+++ b/metadata/md5-cache/dev-qt/qtopengl-5.3.2-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.3.2[debug=] ~dev-qt/qtgui-5.3.2[debug=,opengl] ~dev-qt/qtwidgets-5.3.2[debug=] virtual/opengl test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.3.2[debug=] )
+DEPEND=~dev-qt/qtcore-5.3.2[debug=] ~dev-qt/qtgui-5.3.2[debug=,gles2=,opengl] ~dev-qt/qtwidgets-5.3.2[debug=,gles2=,opengl] virtual/opengl test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.3.2[debug=] )
 DESCRIPTION=OpenGL support library for the Qt5 framework
 EAPI=5
 HOMEPAGE=https://www.qt.io/ https://qt-project.org/
-IUSE=test debug test
+IUSE=gles2 test debug test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( LGPL-2.1 GPL-3 )
-RDEPEND=~dev-qt/qtcore-5.3.2[debug=] ~dev-qt/qtgui-5.3.2[debug=,opengl] ~dev-qt/qtwidgets-5.3.2[debug=] virtual/opengl
+RDEPEND=~dev-qt/qtcore-5.3.2[debug=] ~dev-qt/qtgui-5.3.2[debug=,gles2=,opengl] ~dev-qt/qtwidgets-5.3.2[debug=,gles2=,opengl] virtual/opengl
 RESTRICT=test
 SLOT=5
 SRC_URI=http://download.qt-project.org/archive/qt/5.3/5.3.2/submodules/qtbase-opensource-src-5.3.2.tar.xz
 _eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	qt5-build	34226ac1a1fe3815692b071c6a69e0af	toolchain-funcs	0f1760274637a138b99bb649202ea402	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=53bff37ac46c732f1d92c4ab8ff87fde
+_md5_=ec1044437c4fc7a4f11ec6d57452da96
diff --git a/metadata/md5-cache/dev-util/buildbot-0.8.9 b/metadata/md5-cache/dev-util/buildbot-0.8.9
index f7b72b9290aa..b33ec526756e 100644
--- a/metadata/md5-cache/dev-util/buildbot-0.8.9
+++ b/metadata/md5-cache/dev-util/buildbot-0.8.9
@@ -4,10 +4,10 @@ DESCRIPTION=BuildBot build automation system
 EAPI=5
 HOMEPAGE=http://trac.buildbot.net/ http://code.google.com/p/buildbot/ http://pypi.python.org/pypi/buildbot
 IUSE=doc examples irc mail manhole test
-KEYWORDS=~alpha ~amd64 arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-interix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris
 LICENSE=GPL-2
 RDEPEND=>=dev-python/jinja-2.1 || ( dev-lang/python:2.7 dev-lang/python:2.6 dev-python/simplejson ) || ( dev-lang/python:2.7[sqlite] dev-lang/python:2.6[sqlite] dev-python/pysqlite:2 ) >=dev-python/twisted-core-8.0.0 dev-python/twisted-web <dev-python/sqlalchemy-migrate-0.8 irc? ( dev-python/twisted-words ) mail? ( dev-python/twisted-mail ) manhole? ( dev-python/twisted-conch ) =dev-lang/python-2*
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot/buildbot-0.8.9.tar.gz
 _eclasses_=distutils	34e0f373c466bb0e97ba194735f1acf2	eutils	32548a82e42dc26e3312581476d2f20c	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	be9965681d83c3980660a2660ac95e95	readme.gentoo	106edea5533517715013de909a333abd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0f1760274637a138b99bb649202ea402	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=7c910b029e9d8971014c569215b33d1a
+_md5_=f342b204b73f00437f5754e2630b1a17
diff --git a/metadata/md5-cache/dev-util/buildbot-slave-0.8.9 b/metadata/md5-cache/dev-util/buildbot-slave-0.8.9
index c80ba72c9ea9..e5975dd2e5af 100644
--- a/metadata/md5-cache/dev-util/buildbot-slave-0.8.9
+++ b/metadata/md5-cache/dev-util/buildbot-slave-0.8.9
@@ -4,10 +4,10 @@ DESCRIPTION=BuildBot Slave Daemon
 EAPI=5
 HOMEPAGE=http://trac.buildbot.net/ http://code.google.com/p/buildbot/ http://pypi.python.org/pypi/buildbot-slave
 IUSE=test
-KEYWORDS=~alpha ~amd64 arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-interix ~amd64-linux
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-interix ~amd64-linux
 LICENSE=GPL-2
 RDEPEND=dev-python/setuptools dev-python/twisted-core !!<dev-util/buildbot-0.8.1 !<dev-util/buildbot-0.8.3 =dev-lang/python-2*
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-slave/buildbot-slave-0.8.9.tar.gz
 _eclasses_=distutils	34e0f373c466bb0e97ba194735f1acf2	eutils	32548a82e42dc26e3312581476d2f20c	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	be9965681d83c3980660a2660ac95e95	readme.gentoo	106edea5533517715013de909a333abd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0f1760274637a138b99bb649202ea402	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=3e903cb3cdc46570e9eafbc2d5f185ef
+_md5_=fd4e3a285f1f14de11aefdb177eb23b1
diff --git a/metadata/md5-cache/net-dns/djbdns-1.05-r30 b/metadata/md5-cache/net-dns/djbdns-1.05-r30
new file mode 100644
index 000000000000..720d59f1d937
--- /dev/null
+++ b/metadata/md5-cache/net-dns/djbdns-1.05-r30
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst preinst prepare unpack
+DESCRIPTION=Collection of DNS client/server software
+EAPI=5
+HOMEPAGE=http://cr.yp.to/djbdns.html
+IUSE=ipv6 selinux
+KEYWORDS=~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=public-domain
+RDEPEND=sys-apps/ucspi-tcp virtual/daemontools selinux? ( sec-policy/selinux-djbdns )
+SLOT=0
+SRC_URI=http://cr.yp.to/djbdns/djbdns-1.05.tar.gz http://smarden.org/pape/djb/manpages/djbdns-1.05-man.tar.gz ipv6? ( http://www.fefe.de/dns/djbdns-1.05-test27.diff.bz2 )
+_eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	0f1760274637a138b99bb649202ea402	user	f54e098dd38ba1c0847a13e685b87747
+_md5_=f4b397a2b04708769a1d2664e93ac845
diff --git a/metadata/md5-cache/net-misc/whois-5.1.5 b/metadata/md5-cache/net-misc/whois-5.1.5
index 6c19537bd6d8..dd4ff7e5f909 100644
--- a/metadata/md5-cache/net-misc/whois-5.1.5
+++ b/metadata/md5-cache/net-misc/whois-5.1.5
@@ -4,11 +4,11 @@ DESCRIPTION=improved Whois Client
 EAPI=4
 HOMEPAGE=http://www.linux.it/~md/software/
 IUSE=iconv idn nls
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=iconv? ( virtual/libiconv ) idn? ( net-dns/libidn ) nls? ( virtual/libintl )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://debian/pool/main/w/whois/whois_5.1.5.tar.xz
 _eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=894efac599d83db363893d1958c45184
+_md5_=0a611ea850d77bb554cb3f0253102263
diff --git a/metadata/md5-cache/net-p2p/qbittorrent-3.1.10 b/metadata/md5-cache/net-p2p/qbittorrent-3.1.10
new file mode 100644
index 000000000000..4dd0feda6593
--- /dev/null
+++ b/metadata/md5-cache/net-p2p/qbittorrent-3.1.10
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare unpack
+DEPEND=dev-libs/boost:= dev-qt/qtcore:4 >=dev-qt/qtsingleapplication-2.6.1_p20130904-r1[X?] >=net-libs/rb_libtorrent-0.16.10 dbus? ( dev-qt/qtdbus:4 ) X? ( dev-qt/qtgui:4 ) virtual/pkgconfig
+DESCRIPTION=BitTorrent client in C++ and Qt
+EAPI=5
+HOMEPAGE=http://www.qbittorrent.org/
+IUSE=dbus debug geoip +X python_targets_python2_7
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/boost:= dev-qt/qtcore:4 >=dev-qt/qtsingleapplication-2.6.1_p20130904-r1[X?] >=net-libs/rb_libtorrent-0.16.10 dbus? ( dev-qt/qtdbus:4 ) X? ( dev-qt/qtgui:4 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] geoip? ( dev-libs/geoip )
+SLOT=0
+SRC_URI=mirror://sourceforge/qbittorrent/qbittorrent-3.1.10.tar.xz
+_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	32548a82e42dc26e3312581476d2f20c	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	75e5c82b55dcb208a0a8f4ab8847e731	python-utils-r1	47dda904cf91c61f45b564d9f834fde1	qmake-utils	40136c5fe0002a0d3937e869ae4ee0e2	qt4-r2	b40473dafd07d7c5fe4aef1c1b902f39	toolchain-funcs	0f1760274637a138b99bb649202ea402
+_md5_=32cedd6a464c9202905ed1fcc359a5fa
diff --git a/metadata/md5-cache/net-p2p/qbittorrent-9999 b/metadata/md5-cache/net-p2p/qbittorrent-9999
index 0d52f0a665a9..958cde0c2745 100644
--- a/metadata/md5-cache/net-p2p/qbittorrent-9999
+++ b/metadata/md5-cache/net-p2p/qbittorrent-9999
@@ -8,4 +8,4 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/boost:= dev-qt/qtcore:4 >=dev-qt/qtsingleapplication-2.6.1_p20130904-r1[X?] >=net-libs/rb_libtorrent-0.16.10 dbus? ( dev-qt/qtdbus:4 ) X? ( dev-qt/qtgui:4 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] geoip? ( dev-libs/geoip )
 SLOT=0
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	32548a82e42dc26e3312581476d2f20c	git-r3	6ebae45064cb04482f3c702632dd9528	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	75e5c82b55dcb208a0a8f4ab8847e731	python-utils-r1	47dda904cf91c61f45b564d9f834fde1	qmake-utils	40136c5fe0002a0d3937e869ae4ee0e2	qt4-r2	b40473dafd07d7c5fe4aef1c1b902f39	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=5264452c580f9776d9042d4d71714a26
+_md5_=1b6616dddff1b6b9d2d23bc1ab15668b
diff --git a/metadata/md5-cache/sys-devel/gettext-0.19.2.1_rc1 b/metadata/md5-cache/sys-devel/gettext-0.19.2.1_rc1
new file mode 100644
index 000000000000..29d2326fa91e
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/gettext-0.19.2.1_rc1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup test
+DEPEND=>=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxml2 dev-libs/expat acl? ( virtual/acl ) ncurses? ( sys-libs/ncurses ) java? ( >=virtual/jdk-1.4 ) java? ( >=dev-java/java-config-2.1.9-r1 )
+DESCRIPTION=GNU locale utilities
+EAPI=4
+HOMEPAGE=http://www.gnu.org/software/gettext/
+IUSE=acl -cvs doc emacs git java nls +cxx ncurses openmp static-libs elibc_glibc elibc_FreeBSD java abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+LICENSE=GPL-3 LGPL-2
+PDEPEND=emacs? ( app-emacs/po-mode )
+RDEPEND=>=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxml2 dev-libs/expat acl? ( virtual/acl ) ncurses? ( sys-libs/ncurses ) java? ( >=virtual/jdk-1.4 ) !git? ( cvs? ( dev-vcs/cvs ) ) git? ( dev-vcs/git ) java? ( >=virtual/jre-1.4 ) abi_x86_32? ( !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] !<=app-emulation/emul-linux-x86-baselibs-20131008-r11 ) java? ( >=dev-java/java-config-2.1.9-r1 )
+SLOT=0
+SRC_URI=mirror://gnu-alpha/gettext/gettext-0.19.2.1-rc1.tar.xz
+_eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	libtool	52d0e17251d04645ffaa61bfdd858944	mono-env	59ca1177366cc9e14521d3501e9bb281	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	9eb4b5fb858228316d8bb32ada51f6a5	multilib-minimal	5bbdc77877c1aa3c6bd89ca3f9196d11	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=ced9b30fd16015c66c8235e630cb3696
diff --git a/metadata/md5-cache/sys-fs/udev-216 b/metadata/md5-cache/sys-fs/udev-216
index e0d91233da0e..401cc0622e49 100644
--- a/metadata/md5-cache/sys-fs/udev-216
+++ b/metadata/md5-cache/sys-fs/udev-216
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup test
-DEPEND=>=sys-apps/util-linux-2.20 acl? ( sys-apps/acl ) gudev? ( >=dev-libs/glib-2.34.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.38 ) kmod? ( >=sys-apps/kmod-16 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) !<sys-libs/glibc-2.11 !sys-apps/gentoo-systemd-integration !sys-apps/systemd abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r7 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) dev-util/gperf >=sys-apps/coreutils-8.16 sys-libs/libcap virtual/os-headers virtual/pkgconfig >=sys-devel/make-3.82-r4 >=sys-kernel/linux-headers-2.6.39 doc? ( >=dev-util/gtk-doc-1.18 ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool virtual/pkgconfig
+DEPEND=>=sys-apps/util-linux-2.20 acl? ( sys-apps/acl ) gudev? ( >=dev-libs/glib-2.34.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.38 ) kmod? ( >=sys-apps/kmod-16 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) !<sys-libs/glibc-2.11 !sys-apps/gentoo-systemd-integration !sys-apps/systemd abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r7 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) dev-util/gperf >=sys-apps/coreutils-8.16 sys-libs/libcap virtual/os-headers virtual/pkgconfig >=sys-devel/make-3.82-r4 >=sys-kernel/linux-headers-3.7 doc? ( >=dev-util/gtk-doc-1.18 ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool virtual/pkgconfig
 DESCRIPTION=Linux dynamic and persistent device naming support (aka userspace devfs)
 EAPI=5
 HOMEPAGE=http://www.freedesktop.org/wiki/Software/systemd
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://www.freedesktop.org/software/systemd/systemd-216.tar.xz http://dev.gentoo.org/~ssuominen/udev-216-patches-2.tar.xz http://dev.gentoo.org/~williamh/dist/udev-216-patches-2.tar.xz
 _eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	32548a82e42dc26e3312581476d2f20c	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	2b8c53f6065bdee2d757472215a3088f	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	9eb4b5fb858228316d8bb32ada51f6a5	multilib-minimal	5bbdc77877c1aa3c6bd89ca3f9196d11	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0f1760274637a138b99bb649202ea402	udev	da001465a2e939c93f7ae16947ce3438	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=53ad37fcb46544821907bbb17064b0e0
+_md5_=72ed1e724b2c206f22ea13757c4cb03a
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 670f90cd3cf2..e214907bd91d 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Thu, 02 Oct 2014 19:07:11 +0000
+Fri, 03 Oct 2014 04:07:04 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 1b2ff515a292..c5552157844d 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Thu Oct  2 19:07:08 UTC 2014
+Fri Oct  3 04:07:01 UTC 2014
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 00001b4a4793..bb7bb938779a 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Thu, 02 Oct 2014 19:30:01 +0000
+Fri, 03 Oct 2014 04:30:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 3d463107e580..45d276883b52 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1412276701 Thu 02 Oct 2014 07:05:01 PM UTC UTC
+1412309101 Fri 03 Oct 2014 04:05:01 AM UTC UTC
diff --git a/net-dns/djbdns/Manifest b/net-dns/djbdns/Manifest
index 43b09c47116f..91dd57c4e4ca 100644
--- a/net-dns/djbdns/Manifest
+++ b/net-dns/djbdns/Manifest
@@ -1,3 +1,4 @@
 DIST djbdns-1.05-man.tar.gz 17170 SHA256 ba1c58f14bc928908d8618230f400d73cfe2200ed800a272b63048e3e50be569 SHA512 98af7bd9033a2205fbbc0f23b7eab45b9756f6ceff5199a62952e19c89c9fe3c03495cb6f8621d388f883c40650309a1509095417df3f54af21a71350c4aa183 WHIRLPOOL b611e37e7422a4ae405fa15a4b9ff7eb8d0007d81310d044bc1982fe70dada1e4646cf22832e8e5320bae8d2e328eb87d59eb51c3d390f1089f30548053b839b
 DIST djbdns-1.05-test25.diff.bz2 20376 SHA256 28c88de08822894cf252e54ed3be9abfdf4f492644ff74a7c479340bdce051ea SHA512 41cca597dba971010b9844071e0349d3a4b25cc4b144e12721b0bc8250589fb374e40ece8908f1081762597048179b1177e88b9a5f97be0b47b63e3183e654bb WHIRLPOOL d531001511ead02f51558909b13e14734f013213e0f13ec7589876878928bd4057f917e004e8d37955c2965aeba5d92a9fc481f2f9ac48c08edaeb9bb9b821d9
+DIST djbdns-1.05-test27.diff.bz2 20695 SHA256 0de38133336016d5a9159d0fe1beaea809e2229820256af114cbf911f04f202a SHA512 e5acf26ff353ae20b6c2186140255bf0ae478a75a9946163d4474a003afbf8c2f47e61a12fc3ed4b9eff17ec8732e9d91bfbb10fb2762310b067180b6d471ba0 WHIRLPOOL 5c89691836a349553531816a8b4c5b6edc18c2c0a1cf8309b67344ad04c9575fbc5f9d79dcf156aeb692ccd7a6fbd2ce2838fb2fd7b85bd6cd0693a9f657e66e
 DIST djbdns-1.05.tar.gz 85648 SHA256 3ccd826a02f3cde39be088e1fc6aed9fd57756b8f970de5dc99fcd2d92536b48 SHA512 20f066402801d7bec183cb710a5bc51e41f1410024741e5803e26f68f2c13567e48eba793f233dfab903459c3335bc169e24b99d66a4c64e617e1f0779732fa9 WHIRLPOOL 0fb67d19fcbf1cf21debcedfd3456d9cb9160079631ae1995e94aa9db3969ae02927f215ee8a5f03b34a6523cb9e3abebabf23e08e95eb1efdb626eb8b10312f
diff --git a/net-dns/djbdns/djbdns-1.05-r30.ebuild b/net-dns/djbdns/djbdns-1.05-r30.ebuild
new file mode 100644
index 000000000000..c7b5fadf114c
--- /dev/null
+++ b/net-dns/djbdns/djbdns-1.05-r30.ebuild
@@ -0,0 +1,153 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/djbdns/djbdns-1.05-r30.ebuild,v 1.1 2014/10/02 22:22:16 mjo Exp $
+
+EAPI=5
+inherit eutils flag-o-matic readme.gentoo toolchain-funcs user
+
+DESCRIPTION="Collection of DNS client/server software"
+HOMEPAGE="http://cr.yp.to/djbdns.html"
+IPV6_PATCH="test27"
+
+SRC_URI="http://cr.yp.to/djbdns/${P}.tar.gz
+	http://smarden.org/pape/djb/manpages/${P}-man.tar.gz
+	ipv6? ( http://www.fefe.de/dns/${P}-${IPV6_PATCH}.diff.bz2 )"
+
+SLOT="0"
+LICENSE="public-domain"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="ipv6 selinux"
+
+DEPEND=""
+RDEPEND="sys-apps/ucspi-tcp
+	virtual/daemontools
+	selinux? ( sec-policy/selinux-djbdns )"
+
+src_unpack(){
+	# Unpack both djbdns and its man pages to separate directories.
+	default
+
+	# Now move the man pages under ${S} so that user patches can be
+	# applied to them as well in src_prepare().
+	mv "${PN}-man" "${P}/man" || die "failed to transplant man pages"
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}/headtail.patch" \
+		"${FILESDIR}/dnsroots.patch" \
+		"${FILESDIR}/dnstracesort.patch" \
+		"${FILESDIR}/string_length_255.patch" \
+		"${FILESDIR}/srv_record_support.patch"
+
+	# Fix CVE2009-0858
+	epatch "${FILESDIR}/CVE2009-0858_0001-check-response-domain-name-length.patch"
+
+	if use ipv6; then
+		elog 'At present dnstrace does NOT support IPv6. It will'\
+			 'be compiled without IPv6 support.'
+
+		# Create a separate copy of the source tree for dnstrace.
+		cp -pR "${S}" "${S}-noipv6" || die
+
+		# The big ipv6 patch.
+		epatch "${WORKDIR}/${P}-${IPV6_PATCH}.diff"
+
+		# Fix CVE2008-4392 (ipv6)
+		epatch \
+			"${FILESDIR}/CVE2008-4392_0001-dnscache-merge-similar-outgoing-queries-ipv6-test25.patch" \
+			"${FILESDIR}/CVE2008-4392_0002-dnscache-cache-soa-records-ipv6.patch" \
+			"${FILESDIR}/makefile-parallel-test25.patch"
+
+		cd "${S}-noipv6" || die
+	fi
+
+	# Fix CVE2008-4392 (no ipv6)
+	epatch \
+		"${FILESDIR}/CVE2008-4392_0001-dnscache-merge-similar-outgoing-queries.patch" \
+		"${FILESDIR}/CVE2008-4392_0002-dnscache-cache-soa-records.patch"
+
+	# Later versions of the ipv6 patch include this, but even if
+	# USE=ipv6, we're in the ${S}-noipv6 directory at this point.
+	epatch "${FILESDIR}/${PV}-errno.patch"
+
+	epatch_user
+}
+
+src_compile() {
+	echo "$(tc-getCC) ${CFLAGS}" > conf-cc || die
+	echo "$(tc-getCC) ${LDFLAGS}" > conf-ld || die
+	echo "/usr" > conf-home || die
+	emake
+
+	# If djbdns is compiled with IPv6 support, it breaks dnstrace.
+	# Therefore we must compile dnstrace separately without IPv6
+	# support.
+	if use ipv6; then
+		elog 'Compiling dnstrace without ipv6 support'
+		cp conf-cc conf-ld conf-home "${S}-noipv6/" || die
+		cd "${S}-noipv6" || die
+		emake dnstrace
+	fi
+}
+
+src_install() {
+	insinto /etc
+	doins dnsroots.global
+
+	into /usr
+	dobin *-conf dnscache tinydns walldns rbldns pickdns axfrdns \
+		*-get *-data *-edit dnsip dnsipq dnsname dnstxt dnsmx \
+		dnsfilter random-ip dnsqr dnsq dnstrace dnstracesort
+
+	if use ipv6; then
+		dobin dnsip6 dnsip6q "${S}-noipv6/dnstrace"
+	fi
+
+	dodoc CHANGES README
+
+	doman man/*.[158]
+
+	readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+	# The nofiles group is no longer provided by baselayout.
+	# Share it with qmail if possible.
+	enewgroup nofiles 200
+
+	enewuser dnscache -1 -1 -1 nofiles
+	enewuser dnslog -1 -1 -1 nofiles
+	enewuser tinydns -1 -1 -1 nofiles
+}
+
+DISABLE_AUTOFORMATTING=1
+DOC_CONTENTS='
+The dnscache-setup, tinydns-setup, and djbdns-setup programs have
+been removed to follow upstream more closely. To configure djbdns,
+please follow the instructions at,
+
+	http://cr.yp.to/djbdns.html
+
+Of particular interest are,
+
+	axfrdns : http://cr.yp.to/djbdns/axfrdns-conf.html
+	dnscache: http://cr.yp.to/djbdns/run-cache-x-home.html
+	tinydns : http://cr.yp.to/djbdns/run-server.html
+
+Portage has created users for axfrdns, dnscache, and tinydns; the
+commands to configure these programs are,
+
+	1. axfrdns-conf tinydns dnslog /var/axfrdns /var/tinydns $ip
+	2. dnscache-conf dnscache dnslog /var/dnscache $ip
+	3. tinydns-conf tinydns dnslog /var/tinydns $ip
+
+(replace $ip with the ip address on which the server will run).
+
+If you wish to configure rbldns or walldns, you will need to create
+those users yourself (although you should still use the "dnslog"
+user for the logs):
+
+	4. rbldns-conf $username dnslog /var/rbldns $ip $base
+	5. walldns-conf $username dnslog /var/walldns $ip
+'
diff --git a/net-dns/djbdns/files/srv_record_support.patch b/net-dns/djbdns/files/srv_record_support.patch
new file mode 100644
index 000000000000..736884208363
--- /dev/null
+++ b/net-dns/djbdns/files/srv_record_support.patch
@@ -0,0 +1,180 @@
+From: Michael Handler <handler@sub-rosa.com>
+To: dns@list.cr.yp.to
+Subject: tinydns-data SRV & axfr-get SRV/PTR patches
+Date: Thu, 14 Sep 2000 20:37:50 -0400
+
+Here's a combined patch that:
+
+a) adds a native SRV type to tinydns-data
+
+Sfqdn:ip:x:port:weight:priority:ttl:timestamp
+
+Standard rules for ip, x, ttl, and timestamp apply. Port, weight, and
+priority all range from 0-65535. Weight and priority are optional; they
+default to zero if not provided.
+
+Sconsole.zoinks.example.com:1.2.3.4:rack102-con1:2001:69:7:300:
+
+b) makes axfr-get decompose SRV and PTR records and write them out in
+native format, rather than opaque. Again, this is necessary because if the
+DNAME fields in the records reference the same zone as fqdn, they can have
+compression pointers that are bogus outside the context of that specific
+packet, and which can't be correctly loaded into data.cdb by tinydns-data.
+
+--michael
+
+Laurent G. Bercot <ska-djbdns@skarnet.org> updated it for
+djbdns-1.05. Documentation patch by Alex Efros.
+
+diff -rNU3 djbdns-1.05/axfr-get.c djbdns-1.05-srv/axfr-get.c
+--- djbdns-1.05/axfr-get.c	Sun Feb 11 22:11:45 2001
++++ djbdns-1.05/axfr-get.c	Thu Oct 18 14:46:56 2001
+@@ -209,6 +209,26 @@
+     if (!stralloc_cats(&line,".:")) return 0;
+     if (!stralloc_catulong0(&line,dist,0)) return 0;
+   }
++  else if (byte_equal(data,2,DNS_T_SRV)) {
++    uint16 dist, weight, port;
++    if (!stralloc_copys(&line,"S")) return 0;
++    if (!dns_domain_todot_cat(&line,d1)) return 0;
++    if (!stralloc_cats(&line,"::")) return 0;
++    pos = x_copy(buf,len,pos,data,2);
++    uint16_unpack_big(data,&dist);
++    pos = x_copy(buf,len,pos,data,2);
++    uint16_unpack_big(data,&weight);
++    pos = x_copy(buf,len,pos,data,2);
++    uint16_unpack_big(data,&port);
++    x_getname(buf,len,pos,&d1);
++    if (!dns_domain_todot_cat(&line,d1)) return 0;
++    if (!stralloc_cats(&line,".:")) return 0;
++    if (!stralloc_catulong0(&line,dist,0)) return 0;
++    if (!stralloc_cats(&line,":")) return 0;
++    if (!stralloc_catulong0(&line,weight,0)) return 0;
++    if (!stralloc_cats(&line,":")) return 0;
++    if (!stralloc_catulong0(&line,port,0)) return 0;
++  }
+   else if (byte_equal(data,2,DNS_T_A) && (dlen == 4)) {
+     char ipstr[IP4_FMT];
+     if (!stralloc_copys(&line,"+")) return 0;
+@@ -216,6 +236,14 @@
+     if (!stralloc_cats(&line,":")) return 0;
+     x_copy(buf,len,pos,data,4);
+     if (!stralloc_catb(&line,ipstr,ip4_fmt(ipstr,data))) return 0;
++  }
++  else if (byte_equal(data,2,DNS_T_PTR)) {
++    if (!stralloc_copys(&line,"^")) return 0;
++    if (!dns_domain_todot_cat(&line,d1)) return 0;
++    if (!stralloc_cats(&line,":")) return 0;
++    x_getname(buf,len,pos,&d1);
++    if (!dns_domain_todot_cat(&line,d1)) return 0;
++    if (!stralloc_cats(&line,".")) return 0;
+   }
+   else {
+     unsigned char ch;
+diff -rNU3 djbdns-1.05/dns.h djbdns-1.05-srv/dns.h
+--- djbdns-1.05/dns.h	Sun Feb 11 22:11:45 2001
++++ djbdns-1.05/dns.h	Thu Oct 18 14:46:56 2001
+@@ -20,6 +20,7 @@
+ #define DNS_T_SIG "\0\30"
+ #define DNS_T_KEY "\0\31"
+ #define DNS_T_AAAA "\0\34"
++#define DNS_T_SRV "\0\41"
+ #define DNS_T_AXFR "\0\374"
+ #define DNS_T_ANY "\0\377"
+ 
+diff -rNU3 djbdns-1.05/tinydns-data.c djbdns-1.05-srv/tinydns-data.c
+--- djbdns-1.05/tinydns-data.c	Sun Feb 11 22:11:45 2001
++++ djbdns-1.05/tinydns-data.c	Thu Oct 18 14:50:53 2001
+@@ -196,6 +196,7 @@
+   char type[2];
+   char soa[20];
+   char buf[4];
++  char srv[6];
+ 
+   umask(022);
+ 
+@@ -360,6 +361,43 @@
+ 	rr_start(DNS_T_MX,ttl,ttd,loc);
+ 	uint16_pack_big(buf,u);
+ 	rr_add(buf,2);
++	rr_addname(d2);
++	rr_finish(d1);
++
++	if (ip4_scan(f[1].s,ip)) {
++	  rr_start(DNS_T_A,ttl,ttd,loc);
++	  rr_add(ip,4);
++	  rr_finish(d2);
++	}
++	break;
++	
++      case 'S':
++	if (!dns_domain_fromdot(&d1,f[0].s,f[0].len)) nomem();
++	if (!stralloc_0(&f[6])) nomem();
++	if (!scan_ulong(f[6].s,&ttl)) ttl = TTL_POSITIVE;
++	ttdparse(&f[7],ttd);
++	locparse(&f[8],loc);
++
++	if (!stralloc_0(&f[1])) nomem();
++
++	if (byte_chr(f[2].s,f[2].len,'.') >= f[2].len) {
++	  if (!stralloc_cats(&f[2],".srv.")) nomem();
++	  if (!stralloc_catb(&f[2],f[0].s,f[0].len)) nomem();
++	}
++	if (!dns_domain_fromdot(&d2,f[2].s,f[2].len)) nomem();
++
++	if (!stralloc_0(&f[4])) nomem();
++	if (!scan_ulong(f[4].s,&u)) u = 0;
++	uint16_pack_big(srv,u);
++	if (!stralloc_0(&f[5])) nomem();
++	if (!scan_ulong(f[5].s,&u)) u = 0;
++	uint16_pack_big(srv + 2,u);
++	if (!stralloc_0(&f[3])) nomem();
++	if (!scan_ulong(f[3].s,&u)) nomem();
++	uint16_pack_big(srv + 4,u);
++
++	rr_start(DNS_T_SRV,ttl,ttd,loc);
++	rr_add(srv,6);
+ 	rr_addname(d2);
+ 	rr_finish(d1);
+ 
+--- djbdns-1.05/man/tinydns-data.8	2003-10-23 10:47:32.000000000 +0300
++++ djbdns-1.05/man/tinydns-data.8	2014-09-26 02:51:59.861716505 +0300
+@@ -487,6 +487,38 @@
+ .RI \ 072
+ is a colon.
+ 
++.RI S fqdn\fR:\fIip\fR:\fIx\fR:\fIport\fR:\fIweight\fR:\fIpriority\fR:\fIttl\fR:\fItimestamp\fR:\fIlo\fR
++
++SRV record for
++.IR fqdn .
++
++.B tinydns-data
++creates
++.IP
++an SRV record
++showing 
++.IR x\fR.srv.\fIfqdn\fR:\fIport\fR
++as a service for 
++.IR fqdn
++with given \fIweight\fR and \fIpriority\fR
++(\fIport\fR, \fIweight\fR and \fIpriority\fR must be in range 0-65535;
++\fIweight\fR and \fIpriority\fR are optional;
++they default to zero if not provided)
++and
++.P
++.IP
++an A record showing
++.I ip
++as the IP address
++of
++.IR x\fR.srv.\fIfqdn .
++.P
++
++If
++.I x
++contains a dot
++then it is treated specially; see above.
++
+ .RI ^ fqdn\fR:\fIp\fR:\fIttl\fR:\fItimestamp\fR:\fIlo\fR
+ 
+ PTR record for 
diff --git a/net-misc/whois/whois-5.1.5.ebuild b/net-misc/whois/whois-5.1.5.ebuild
index 51f93f8ca3de..f679f58fd781 100644
--- a/net-misc/whois/whois-5.1.5.ebuild
+++ b/net-misc/whois/whois-5.1.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/whois/whois-5.1.5.ebuild,v 1.1 2014/09/02 09:59:41 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/whois/whois-5.1.5.ebuild,v 1.2 2014/10/02 21:00:26 jer Exp $
 
 EAPI=4
 inherit eutils toolchain-funcs
@@ -12,7 +12,7 @@ SRC_URI="mirror://debian/pool/main/w/whois/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
 IUSE="iconv idn nls"
 RESTRICT="test" #59327
 
diff --git a/net-p2p/qbittorrent/Manifest b/net-p2p/qbittorrent/Manifest
index 19c3fef12cbd..fe316fb6bd1a 100644
--- a/net-p2p/qbittorrent/Manifest
+++ b/net-p2p/qbittorrent/Manifest
@@ -1,2 +1,3 @@
 DIST qbittorrent-3.0.11.tar.gz 5097233 SHA256 bce32693c265bb330776337da6e88be3e5e50cf218b2fa8c5cd6c515e7158480 SHA512 f0350ae3db9b56d4fde67b538a5599058191300b90ec1a3708aacf68f5353be63c11f9699a84844ee00186aab9963c7daa4f7d1ed862520682be69e9173590a6 WHIRLPOOL a24f23934970420136a9bd6cebeafdda7e283d5c1118c9d85bdac3485afbb43c684dd9f22c85c8dd3e135e08a72d2766de7e345566d8267db11964454452c29b
+DIST qbittorrent-3.1.10.tar.xz 2349684 SHA256 e65dc14abe71e034d49787fed7a8715b1b49a5e64172d3cb4abbe49042a41876 SHA512 44f4a88fa4f57a6385b2c6aa603a6198ff4e12e244bf7d56ffb0447eaa84e6cf590f5782b2471efa55af55587b0b60541adb51da7227b8e61478e4f85de8639d WHIRLPOOL 8408af649ea7541a91e6c48cc05da4eeb896c60a28fb48f8f9bef85f4a20af188cca7aacbdaab70f42ceaa8589c53b3ecfdedc77cf0c973e231283bbd4561a5e
 DIST qbittorrent-3.1.9.2.tar.xz 2231708 SHA256 b07ccdbe1ae079f781c62aff21d47183ae35a8d4e96f43f90503978d1830a361 SHA512 8437fb695fb720132d131e44727c28af46c651576d5321423142c190120c59cc6439f5df2e90486274956d253db657fcbd217a834e3ca53d7681919fee7a2504 WHIRLPOOL e4b00027a57fbce49a9ddcaf6e60fccfabb65393531620afa0416249148e9e17d43398a1016fcf04695d0fa7d0a7b970e5beee0a4ab4e6ff06e6f8c23c90154f
diff --git a/net-p2p/qbittorrent/qbittorrent-3.1.10.ebuild b/net-p2p/qbittorrent/qbittorrent-3.1.10.ebuild
new file mode 100644
index 000000000000..6234cc17539c
--- /dev/null
+++ b/net-p2p/qbittorrent/qbittorrent-3.1.10.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/qbittorrent-3.1.10.ebuild,v 1.1 2014/10/02 20:17:29 hwoarang Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit python-r1 qt4-r2
+
+DESCRIPTION="BitTorrent client in C++ and Qt"
+HOMEPAGE="http://www.qbittorrent.org/"
+MY_P=${P/_}
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+IUSE="dbus debug geoip +X"
+
+# geoip and python are runtime deps only (see INSTALL file)
+CDEPEND="
+	dev-libs/boost:=
+	dev-qt/qtcore:4
+	>=dev-qt/qtsingleapplication-2.6.1_p20130904-r1[X?]
+	>=net-libs/rb_libtorrent-0.16.10
+	dbus? ( dev-qt/qtdbus:4 )
+	X? ( dev-qt/qtgui:4 )
+"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+"
+RDEPEND="${CDEPEND}
+	${PYTHON_DEPS}
+	geoip? ( dev-libs/geoip )
+"
+
+S=${WORKDIR}/${MY_P}
+DOCS=(AUTHORS Changelog README.md TODO)
+
+src_configure() {
+	# Custom configure script, econf fails
+	local myconf=(
+		./configure
+		--prefix="${EPREFIX}/usr"
+		--with-libboost-inc="${EPREFIX}/usr/include/boost"
+		--with-qtsingleapplication=system
+		$(use dbus  || echo --disable-qt-dbus)
+		$(use debug && echo --enable-debug)
+		$(use geoip || echo --disable-geoip-database)
+		$(use X     || echo --disable-gui)
+	)
+
+	echo "${myconf[@]}"
+	"${myconf[@]}" || die "configure failed"
+	eqmake4
+}
diff --git a/net-p2p/qbittorrent/qbittorrent-9999.ebuild b/net-p2p/qbittorrent/qbittorrent-9999.ebuild
index ed46c12010d6..4bb6fdb65178 100644
--- a/net-p2p/qbittorrent/qbittorrent-9999.ebuild
+++ b/net-p2p/qbittorrent/qbittorrent-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/qbittorrent-9999.ebuild,v 1.16 2014/05/24 22:53:34 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/qbittorrent-9999.ebuild,v 1.17 2014/10/02 20:17:29 hwoarang Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -34,7 +34,7 @@ RDEPEND="${CDEPEND}
 	geoip? ( dev-libs/geoip )
 "
 
-DOCS=(AUTHORS Changelog README TODO)
+DOCS=(AUTHORS Changelog README.md TODO)
 
 src_configure() {
 	# Custom configure script, econf fails
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 2785fd85f225..f01d5e71b4f2 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -2289,6 +2289,7 @@ dev-qt/qtnetwork:connman - Enable ConnMan-based bearer plugin
 dev-qt/qtnetwork:networkmanager - Enable NetworkManager-based bearer plugin
 dev-qt/qtopengl:egl - Use EGL instead of default GLX to manage OpenGL contexts on the desktop
 dev-qt/qtopengl:exceptions - Add support for exceptions - like catching them inside the event loop (recommended by upstream)
+dev-qt/qtopengl:gles2 - Use OpenGL ES 2.0 instead of desktop OpenGL
 dev-qt/qtopengl:qt3support - Enable the Qt3Support libraries for Qt4
 dev-qt/qtopenvg:exceptions - Build with support for exceptions
 dev-qt/qtopenvg:qt3support - Enable the Qt3Support libraries for Qt4
diff --git a/sys-devel/gettext/Manifest b/sys-devel/gettext/Manifest
index 2764b3768746..e3b76f31c023 100644
--- a/sys-devel/gettext/Manifest
+++ b/sys-devel/gettext/Manifest
@@ -1,3 +1,4 @@
 DIST gettext-0.18.3.2.tar.gz 16189249 SHA256 d1a4e452d60eb407ab0305976529a45c18124bd518d976971ac6dc7aa8b4c5d7 SHA512 0cf8f2bb844b9d94f5e63a0f4bddc133e2388d103fd4189614d2fc157a94e27836ec399eb32ab69410e2214425676e6bc195bbf13238cc5ad32b454ec6e2b5ef WHIRLPOOL 0bb2e33788a12fbeaa4756aaa354a308424cdea5008d6b686bbd8601b7b7c513483d79f323904ebaf94e1fd67f65dfa7cb993ba5c5751e16a297b94b3307ae66
 DIST gettext-0.19.1.tar.gz 16885689 SHA256 287471d95bdf5feb48626247fdc530660e3d2906a57a141603893772240101c6 SHA512 be67f059f18babbdbb28b2087082be1e7595ecf70d8efc7468629b1b8650abc82d040ea5680596af158bd0d641255fe6930195b8a68797c42cf280b81dca072c WHIRLPOOL 521cdd488065d70c51ed313492d206ee8fce4ccd5b97e7175993401eca0538d5cf252b9c8d1e596b4133a70611c315f140213f040a65773ed48173e6ec414b58
+DIST gettext-0.19.2.1-rc1.tar.xz 6735320 SHA256 33ae93906ce31c59192ffc876cebdd3d971580e6f2792b746f04d5de070e6798 SHA512 01ac816b27f783bf973a868d549a1b16e7d7fdc46b600c5b843f09e6add729d68faf11af45b789c6ca61358e05319480fde581bb20cefa1d4a06f2013604113f WHIRLPOOL 77053a60f7a2a55d4fb5c5be31dd19aaf4e8a401901ba8768b1cd2923d0134c58d25a6b0e027e2f38b86c6b42e1ef32fbdeb51e1dc66e043d02fcfc61078c8d8
 DIST gettext-0.19.2.tar.gz 17141404 SHA256 0c48ae6ef6e0abcf6cd9cb9dcdc593d0e1a367e82259bbe113ce88ceea9249bb SHA512 540440b41025a68eed3e77530be77e1b0fc68ce74e56f0e8b724c843cc2f2fc968bbb7627006bbe4fa83b5042bd860136a67f63dcf22d5f79e0f60f4df2279e7 WHIRLPOOL efa858843c209a6c70c2e2c26991a7d8065e774d6f63c52e2606ce9806924781bd681e37b51f6086be4daa8672849027a1fb53563777ec69f848e1ba0a3e0aa9
diff --git a/sys-devel/gettext/gettext-0.19.2.1_rc1.ebuild b/sys-devel/gettext/gettext-0.19.2.1_rc1.ebuild
new file mode 100644
index 000000000000..4f56a7851737
--- /dev/null
+++ b/sys-devel/gettext/gettext-0.19.2.1_rc1.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/gettext-0.19.2.1_rc1.ebuild,v 1.1 2014/10/02 19:59:53 polynomial-c Exp $
+
+EAPI="4"
+
+inherit flag-o-matic eutils multilib toolchain-funcs mono-env libtool java-pkg-opt-2 multilib-minimal
+
+DESCRIPTION="GNU locale utilities"
+HOMEPAGE="http://www.gnu.org/software/gettext/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3 LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+IUSE="acl -cvs doc emacs git java nls +cxx ncurses openmp static-libs elibc_glibc"
+
+if [[ ${PV} =~ _rc ]] ; then
+	SRC_URI="mirror://gnu-alpha/${PN}/${P/_/-}.tar.xz"
+	KEYWORDS=""
+	S="${WORKDIR}/${P/_/-}"
+fi
+
+# only runtime goes multilib
+DEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
+	dev-libs/libxml2
+	dev-libs/expat
+	acl? ( virtual/acl )
+	ncurses? ( sys-libs/ncurses )
+	java? ( >=virtual/jdk-1.4 )"
+RDEPEND="${DEPEND}
+	!git? ( cvs? ( dev-vcs/cvs ) )
+	git? ( dev-vcs/git )
+	java? ( >=virtual/jre-1.4 )
+	abi_x86_32? (
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+		!<=app-emulation/emul-linux-x86-baselibs-20131008-r11
+	)"
+PDEPEND="emacs? ( app-emacs/po-mode )"
+
+MULTILIB_WRAPPED_HEADERS=(
+	# only installed for native ABI
+	/usr/include/gettext-po.h
+)
+
+src_prepare() {
+	java-pkg-opt-2_src_prepare
+	epunt_cxx
+	elibtoolize
+}
+
+multilib_src_configure() {
+	local myconf=(
+		# switches common to runtime and top-level
+		--cache-file="${BUILD_DIR}"/config.cache
+		--docdir="/usr/share/doc/${PF}"
+
+		$(use_enable cxx libasprintf)
+		$(use_enable java)
+		$(use_enable static-libs static)
+	)
+
+	# Build with --without-included-gettext (on glibc systems)
+	if use elibc_glibc ; then
+		myconf+=(
+			--without-included-gettext
+			$(use_enable nls)
+		)
+	else
+		myconf+=(
+			--with-included-gettext
+			--enable-nls
+		)
+	fi
+	use cxx || export CXX=$(tc-getCC)
+
+	# Should be able to drop this hack in next release. #333887
+	tc-is-cross-compiler && export gl_cv_func_working_acl_get_file=yes
+
+	local ECONF_SOURCE=${S}
+	if ! multilib_is_native_abi ; then
+		# for non-native ABIs, we build runtime only
+		ECONF_SOURCE+=/gettext-runtime
+	else
+		# remaining switches
+		myconf+=(
+			# Emacs support is now in a separate package
+			--without-emacs
+			--without-lispdir
+			# glib depends on us so avoid circular deps
+			--with-included-glib
+			# libcroco depends on glib which ... ^^^
+			--with-included-libcroco
+			# this will _disable_ libunistring (since it is not bundled),
+			# see bug #326477
+			--with-included-libunistring
+
+			$(use_enable acl)
+			$(use_enable ncurses curses)
+			$(use_enable openmp)
+			$(use_with git)
+			$(usex git --without-cvs $(use_with cvs))
+		)
+	fi
+
+	econf "${myconf[@]}"
+}
+
+multilib_src_install() {
+	default
+
+	if multilib_is_native_abi ; then
+		dosym msgfmt /usr/bin/gmsgfmt #43435
+		dobin gettext-tools/misc/gettextize
+
+		[[ ${USERLAND} == "BSD" ]] && gen_usr_ldscript -a intl
+	fi
+}
+
+multilib_src_install_all() {
+	use nls || rm -r "${D}"/usr/share/locale
+	use static-libs || prune_libtool_files --all
+
+	rm -f "${D}"/usr/share/locale/locale.alias "${D}"/usr/lib/charset.alias
+
+	if use java ; then
+		java-pkg_dojar "${D}"/usr/share/${PN}/*.jar
+		rm -f "${D}"/usr/share/${PN}/*.jar
+		rm -f "${D}"/usr/share/${PN}/*.class
+		if use doc ; then
+			java-pkg_dojavadoc "${D}"/usr/share/doc/${PF}/javadoc2
+			rm -rf "${D}"/usr/share/doc/${PF}/javadoc2
+		fi
+	fi
+
+	if use doc ; then
+		dohtml "${D}"/usr/share/doc/${PF}/*.html
+	else
+		rm -rf "${D}"/usr/share/doc/${PF}/{csharpdoc,examples,javadoc2,javadoc1}
+	fi
+	rm -f "${D}"/usr/share/doc/${PF}/*.html
+
+	dodoc AUTHORS ChangeLog NEWS README THANKS
+}
+
+pkg_preinst() {
+	# older gettext's sometimes installed libintl ...
+	# need to keep the linked version or the system
+	# could die (things like sed link against it :/)
+	preserve_old_lib /{,usr/}$(get_libdir)/libintl$(get_libname 7)
+
+	java-pkg-opt-2_pkg_preinst
+}
+
+pkg_postinst() {
+	preserve_old_lib_notify /{,usr/}$(get_libdir)/libintl$(get_libname 7)
+}
diff --git a/sys-fs/udev/udev-216.ebuild b/sys-fs/udev/udev-216.ebuild
index e4b5fa0a87ba..2d555d352d70 100644
--- a/sys-fs/udev/udev-216.ebuild
+++ b/sys-fs/udev/udev-216.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-216.ebuild,v 1.8 2014/09/21 10:28:37 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-216.ebuild,v 1.9 2014/10/02 22:38:30 robbat2 Exp $
 
 EAPI=5
 
@@ -51,7 +51,7 @@ DEPEND="${COMMON_DEPEND}
 	virtual/os-headers
 	virtual/pkgconfig
 	>=sys-devel/make-3.82-r4
-	>=sys-kernel/linux-headers-2.6.39
+	>=sys-kernel/linux-headers-3.7
 	doc? ( >=dev-util/gtk-doc-1.18 )"
 # Try with `emerge -C docbook-xml-dtd` to see the build failure without DTDs
 if [[ ${PV} = 9999* ]]; then