diff --git a/dev-libs/c-capnproto/Manifest b/dev-libs/c-capnproto/Manifest
new file mode 100644
index 000000000000..262db73365c3
--- /dev/null
+++ b/dev-libs/c-capnproto/Manifest
@@ -0,0 +1 @@
+DIST c-capnproto-0.1.tar.gz 64051 SHA256 34718b5e56972f3964b69fcc5eea254cfd76d133a1ccf63f84c9e5a5a0faeab9 SHA512 6d8c66061419edafa0e01220a4c0fd23feac1674bb73b6f34c0677edaef9118a87badcbf939390842caa6fa4eb9ed0bc9c8ff542641b563bf729339bff9df9bd WHIRLPOOL d4e6ce299c063dcc57a48afc4f4dcf5ea7fcb485d8e325be31ed37595cfd539a29532f59adb679d3185c1a5af281331a62d83567e9862af44d463784319d7135
diff --git a/dev-libs/c-capnproto/c-capnproto-0.1.ebuild b/dev-libs/c-capnproto/c-capnproto-0.1.ebuild
new file mode 100644
index 000000000000..23e6bcb674ef
--- /dev/null
+++ b/dev-libs/c-capnproto/c-capnproto-0.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF="yes"
+inherit autotools-utils
+
+DESCRIPTION="C library/compiler for the Cap'n Proto serialization/RPC protocol"
+HOMEPAGE="https://github.com/opensourcerouting/c-capnproto"
+SRC_URI="https://github.com/opensourcerouting/c-capnproto/archive/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${DEPEND}
+ test? ( dev-cpp/gtest )"
+S="${WORKDIR}/${PN}-${P}"
+PATCHES=(
+ "${FILESDIR}/gtest.patch"
+)
diff --git a/dev-libs/c-capnproto/files/gtest.patch b/dev-libs/c-capnproto/files/gtest.patch
new file mode 100644
index 000000000000..b094c5e6f219
--- /dev/null
+++ b/dev-libs/c-capnproto/files/gtest.patch
@@ -0,0 +1,41 @@
+Index: c-capnproto-c-capnproto-0.1/configure.ac
+===================================================================
+--- c-capnproto-c-capnproto-0.1.orig/configure.ac
++++ c-capnproto-c-capnproto-0.1/configure.ac
+@@ -35,8 +35,6 @@ AC_SUBST(WERROR)
+ # AC_MSG_ERROR([capnproto base package (0.5.2 or newer) not found])
+ #])
+
+-AC_CONFIG_SUBDIRS([gtest/googletest])
+-
+ AC_CONFIG_FILES([
+ Makefile
+ c-capnproto.pc
+Index: c-capnproto-c-capnproto-0.1/Makefile.am
+===================================================================
+--- c-capnproto-c-capnproto-0.1.orig/Makefile.am
++++ c-capnproto-c-capnproto-0.1/Makefile.am
+@@ -41,12 +41,6 @@ noinst_HEADERS += \
+ compiler/c++.capnp.h \
+ compiler/test.capnp.h
+
+-GTEST_LDADD = gtest/googletest/lib/libgtest.la
+-gtest/googletest/lib/libgtest.la:
+- make -C gtest/googletest lib/libgtest.la
+-GTEST_CPPFLAGS = -I${srcdir}/gtest/googletest/include
+-DIST_SUBDIRS = gtest/googletest
+-
+ check_PROGRAMS += \
+ capn-test
+ capn_test_SOURCES = \
+@@ -55,8 +49,8 @@ capn_test_SOURCES = \
+ compiler/test.capnp.c \
+ compiler/schema-test.cpp \
+ compiler/schema.capnp.c
+-capn_test_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_CPPFLAGS)
++capn_test_CPPFLAGS = $(AM_CPPFLAGS)
+ capn_test_CXXFLAGS = -std=gnu++11 -pthread
+-capn_test_LDADD = libcapnp_c.la $(GTEST_LDADD)
++capn_test_LDADD = libcapnp_c.la -lgtest
+ capn_test_LDFLAGS = -pthread
+ TESTS = capn-test
diff --git a/dev-libs/c-capnproto/metadata.xml b/dev-libs/c-capnproto/metadata.xml
new file mode 100644
index 000000000000..7a70bde8ce0e
--- /dev/null
+++ b/dev-libs/c-capnproto/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ aballier@gentoo.org
+ Alexis Ballier
+
+
diff --git a/kde-apps/kuiserver/kuiserver-15.12.3.ebuild b/kde-apps/kuiserver/kuiserver-15.12.3.ebuild
index 3316f13b197e..b72781fd1f1e 100644
--- a/kde-apps/kuiserver/kuiserver-15.12.3.ebuild
+++ b/kde-apps/kuiserver/kuiserver-15.12.3.ebuild
@@ -8,5 +8,5 @@ KMNAME="kde-runtime"
inherit kde4-meta
DESCRIPTION="KDE: Progress Info UI server"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE="debug"
diff --git a/media-libs/x264/Manifest b/media-libs/x264/Manifest
index c8c49eb3688f..cabb7bf4f135 100644
--- a/media-libs/x264/Manifest
+++ b/media-libs/x264/Manifest
@@ -1,3 +1,4 @@
DIST x264-snapshot-20140308-2245.tar.bz2 624712 SHA256 b179cb1e1d4f51418d292011a7494d5b62145571c05c22007f28d8fd89d2ebbe SHA512 42dc8183aa7af2bd4c360edc0349193cf69a119450880af0c1586e8f27490d7c6784c464b29c9f07ae972aaf661672ab4f2094a46a3d19b6df35be1f9d9a1629 WHIRLPOOL b1ac3341647d9d8d8ff6177f179ee8b5d6a49a38a48791748c24d5cd3c53858758785a0d21d42fbe373ec74465d947b69526a487da15fbca1a1f9aa50064288c
DIST x264-snapshot-20150820-2245.tar.bz2 718209 SHA256 0ea86849d1a9b0a5b88fe6e0281359d7f5675c68fb83f6397b3e02896ccd77e3 SHA512 6b85f96f7cc85e1e938dad06c01b777aaf866796fb1763a02b4b7fa9c44f70bf15fc1bef123f7b24bb2c58b23f7276d4eb2b8f99b2e4fef3c716ed7f66d66e44 WHIRLPOOL daf5a63dbe2cb77a496a3eec1b1687ef6c4a008328064c46bd0e90139d328a6ff4e7dbd17b8dad57c357717c0b665293c86883213b483e85d25a06ec93c81024
DIST x264-snapshot-20151011-2245.tar.bz2 725627 SHA256 80a4075ea12a81ec3b6c493e03529c5b7c1afb34c6e91d86bb078bc2ead2ccf0 SHA512 a326d724f5a28268a6dca2e75f39d10f0d9cd137e6477cb8c1be377a8c3fe9de384f74498f7c6b785377bb43024526e72ff8363b67a7e17717b176e5249df5e3 WHIRLPOOL 520dd79b2f3dfdd9e4629bd810fe8560205f4e3581d03854bd2aea35fbac565520cec336f214da688428c320bab3dea0d692a9cb816f9f53fc89520b54e200e3
+DIST x264-snapshot-20160523-2245.tar.bz2 729952 SHA256 1176c018e4896a440bf0b18ed76e3d92de7a7ce5b1e28a7efd5f6e54bf1d6860 SHA512 71cce21acec300842a8323ef8999e655520e2d47288fe983631e0d6fa180155badd9026d58057edebfd73b002f79c9c0011439e8ee9878b3bf0574e8a16fdff9 WHIRLPOOL fb844e07752a9e48ed2ccd75f34730528c60c22f9a17791c0e002f1c7d25224b814af288e6f6a9563da832bb2fc9a0fed6c92e60bb102e244ee0de24eee40b24
diff --git a/media-libs/x264/files/x264-0.0.20160523-cflags.patch b/media-libs/x264/files/x264-0.0.20160523-cflags.patch
new file mode 100644
index 000000000000..25b7e2edb39f
--- /dev/null
+++ b/media-libs/x264/files/x264-0.0.20160523-cflags.patch
@@ -0,0 +1,40 @@
+Index: x264-9999/configure
+===================================================================
+--- x264-9999.orig/configure
++++ x264-9999/configure
+@@ -667,8 +667,6 @@ case $host_cpu in
+ if [[ "$asm" == auto && "$CFLAGS" != *-mfpmath* ]]; then
+ CFLAGS="$CFLAGS -mfpmath=sse -msse -msse2"
+ fi
+- CFLAGS="-m32 $CFLAGS"
+- LDFLAGS="-m32 $LDFLAGS"
+ fi
+ if [ "$SYS" = MACOSX ]; then
+ ASFLAGS="$ASFLAGS -f macho32 -DPREFIX"
+@@ -687,13 +685,8 @@ case $host_cpu in
+ AS_EXT=".asm"
+ ASFLAGS="$ASFLAGS -DARCH_X86_64=1 -I\$(SRCPATH)/common/x86/"
+ stack_alignment=16
+- [ $compiler = GNU ] && CFLAGS="-m64 $CFLAGS" && LDFLAGS="-m64 $LDFLAGS"
+ if [ "$SYS" = MACOSX ]; then
+ ASFLAGS="$ASFLAGS -f macho64 -DPIC -DPREFIX"
+- if cc_check '' "-arch x86_64"; then
+- CFLAGS="$CFLAGS -arch x86_64"
+- LDFLAGS="$LDFLAGS -arch x86_64"
+- fi
+ elif [ "$SYS" = WINDOWS -o "$SYS" = CYGWIN ]; then
+ ASFLAGS="$ASFLAGS -f win64"
+ if [ $compiler = GNU ]; then
+@@ -1173,10 +1166,10 @@ if [ "$strip" = "yes" ]; then
+ fi
+
+ if [ "$debug" = "yes" ]; then
+- CFLAGS="-O1 -g $CFLAGS"
++ CFLAGS="$CFLAGS"
+ RCFLAGS="$RCFLAGS -DDEBUG"
+ else
+- CFLAGS="-O3 -ffast-math $CFLAGS"
++ CFLAGS="-ffast-math $CFLAGS"
+ fi
+
+ if cc_check '' -fno-tree-vectorize ; then
diff --git a/media-libs/x264/x264-0.0.20160523.ebuild b/media-libs/x264/x264-0.0.20160523.ebuild
new file mode 100644
index 000000000000..278f1fee4f8f
--- /dev/null
+++ b/media-libs/x264/x264-0.0.20160523.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit flag-o-matic multilib toolchain-funcs eutils multilib-minimal
+
+DESCRIPTION="A free library for encoding X264/AVC streams"
+HOMEPAGE="http://www.videolan.org/developers/x264.html"
+if [[ ${PV} == 9999 ]]; then
+ inherit git-2
+ EGIT_REPO_URI="git://git.videolan.org/x264.git"
+else
+ inherit versionator
+ MY_P="x264-snapshot-$(get_version_component_range 3)-2245"
+ SRC_URI="http://download.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2"
+ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+ S="${WORKDIR}/${MY_P}"
+fi
+
+SONAME="148"
+SLOT="0/${SONAME}"
+
+LICENSE="GPL-2"
+IUSE="10bit +interlaced opencl pic static-libs cpu_flags_x86_sse +threads"
+
+ASM_DEP=">=dev-lang/yasm-1.2.0"
+DEPEND="abi_x86_32? ( ${ASM_DEP} )
+ abi_x86_64? ( ${ASM_DEP} )
+ opencl? ( dev-lang/perl )"
+RDEPEND="opencl? ( >=virtual/opencl-0-r3[${MULTILIB_USEDEP}] )
+ abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r7
+ !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
+
+DOCS="AUTHORS doc/*.txt"
+
+src_prepare() {
+ # Initial support for x32 ABI, bug #420241
+ # Avoid messing too much with CFLAGS.
+ epatch "${FILESDIR}"/x264-0.0.20160523-cflags.patch
+}
+
+multilib_src_configure() {
+ tc-export CC
+ local asm_conf=""
+
+ if [[ ${ABI} == x86* ]] && use pic || [[ ${ABI} == "x32" ]]; then
+ asm_conf=" --disable-asm"
+ fi
+
+ # Upstream uses this, see the cflags patch
+ use cpu_flags_x86_sse && append-flags "-msse" "-mfpmath=sse"
+ append-flags "-ffast-math"
+
+ "${S}/configure" \
+ --prefix="${EPREFIX}"/usr \
+ --libdir="${EPREFIX}"/usr/$(get_libdir) \
+ --disable-cli \
+ --disable-avs \
+ --disable-lavf \
+ --disable-swscale \
+ --disable-ffms \
+ --disable-gpac \
+ --enable-pic \
+ --enable-shared \
+ --host="${CHOST}" \
+ $(usex 10bit "--bit-depth=10" "") \
+ $(usex interlaced "" "--disable-interlaced") \
+ $(usex opencl "" "--disable-opencl") \
+ $(usex static-libs "--enable-static" "") \
+ $(usex threads "" "--disable-thread") \
+ ${asm_conf} || die
+}
diff --git a/media-libs/x264/x264-9999.ebuild b/media-libs/x264/x264-9999.ebuild
index f097db63aed7..278f1fee4f8f 100644
--- a/media-libs/x264/x264-9999.ebuild
+++ b/media-libs/x264/x264-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -38,7 +38,7 @@ DOCS="AUTHORS doc/*.txt"
src_prepare() {
# Initial support for x32 ABI, bug #420241
# Avoid messing too much with CFLAGS.
- epatch "${FILESDIR}"/x264-0.0.20151011-cflags.patch
+ epatch "${FILESDIR}"/x264-0.0.20160523-cflags.patch
}
multilib_src_configure() {
diff --git a/media-video/x264-encoder/Manifest b/media-video/x264-encoder/Manifest
index 91c698a64ab8..7e88eb8a21aa 100644
--- a/media-video/x264-encoder/Manifest
+++ b/media-video/x264-encoder/Manifest
@@ -1,2 +1,3 @@
DIST x264-snapshot-20140308-2245.tar.bz2 624712 SHA256 b179cb1e1d4f51418d292011a7494d5b62145571c05c22007f28d8fd89d2ebbe SHA512 42dc8183aa7af2bd4c360edc0349193cf69a119450880af0c1586e8f27490d7c6784c464b29c9f07ae972aaf661672ab4f2094a46a3d19b6df35be1f9d9a1629 WHIRLPOOL b1ac3341647d9d8d8ff6177f179ee8b5d6a49a38a48791748c24d5cd3c53858758785a0d21d42fbe373ec74465d947b69526a487da15fbca1a1f9aa50064288c
DIST x264-snapshot-20151011-2245.tar.bz2 725627 SHA256 80a4075ea12a81ec3b6c493e03529c5b7c1afb34c6e91d86bb078bc2ead2ccf0 SHA512 a326d724f5a28268a6dca2e75f39d10f0d9cd137e6477cb8c1be377a8c3fe9de384f74498f7c6b785377bb43024526e72ff8363b67a7e17717b176e5249df5e3 WHIRLPOOL 520dd79b2f3dfdd9e4629bd810fe8560205f4e3581d03854bd2aea35fbac565520cec336f214da688428c320bab3dea0d692a9cb816f9f53fc89520b54e200e3
+DIST x264-snapshot-20160523-2245.tar.bz2 729952 SHA256 1176c018e4896a440bf0b18ed76e3d92de7a7ce5b1e28a7efd5f6e54bf1d6860 SHA512 71cce21acec300842a8323ef8999e655520e2d47288fe983631e0d6fa180155badd9026d58057edebfd73b002f79c9c0011439e8ee9878b3bf0574e8a16fdff9 WHIRLPOOL fb844e07752a9e48ed2ccd75f34730528c60c22f9a17791c0e002f1c7d25224b814af288e6f6a9563da832bb2fc9a0fed6c92e60bb102e244ee0de24eee40b24
diff --git a/media-video/x264-encoder/x264-encoder-0.0.20160523.ebuild b/media-video/x264-encoder/x264-encoder-0.0.20160523.ebuild
new file mode 100644
index 000000000000..02e46dd0df78
--- /dev/null
+++ b/media-video/x264-encoder/x264-encoder-0.0.20160523.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit flag-o-matic multilib toolchain-funcs eutils
+
+DESCRIPTION="A free commandline encoder for X264/AVC streams"
+HOMEPAGE="http://www.videolan.org/developers/x264.html"
+if [[ ${PV} == 9999 ]]; then
+ inherit git-2
+ EGIT_REPO_URI="git://git.videolan.org/x264.git"
+ SRC_URI=""
+else
+ inherit versionator
+ MY_P="x264-snapshot-$(get_version_component_range 3)-2245"
+ SRC_URI="http://download.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2"
+ KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+ S="${WORKDIR}/${MY_P}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="10bit avs custom-cflags ffmpeg ffmpegsource +interlaced mp4 +threads"
+
+REQUIRED_USE="ffmpegsource? ( ffmpeg )"
+
+RDEPEND="ffmpeg? ( virtual/ffmpeg )
+ ~media-libs/x264-${PV}[10bit=,interlaced=,threads=]
+ ffmpegsource? ( media-libs/ffmpegsource )
+ mp4? ( >=media-video/gpac-0.5.2 )"
+
+ASM_DEP=">=dev-lang/yasm-1.2.0"
+DEPEND="${RDEPEND}
+ amd64? ( ${ASM_DEP} )
+ x86? ( ${ASM_DEP} )
+ x86-fbsd? ( ${ASM_DEP} )
+ virtual/pkgconfig"
+
+src_prepare() {
+ epatch "${FILESDIR}/gpac.patch"
+}
+
+src_configure() {
+ tc-export CC
+
+ # let upstream pick the optimization level by default
+ use custom-cflags || filter-flags -O?
+
+ ./configure \
+ --prefix="${EPREFIX}"/usr \
+ --libdir="${EPREFIX}"/usr/$(get_libdir) \
+ --system-libx264 \
+ --host="${CHOST}" \
+ --disable-lsmash \
+ $(usex 10bit "--bit-depth=10" "") \
+ $(usex avs "" "--disable-avs") \
+ $(usex ffmpeg "" "--disable-lavf --disable-swscale") \
+ $(usex ffmpegsource "" "--disable-ffms") \
+ $(usex interlaced "" "--disable-interlaced") \
+ $(usex mp4 "" "--disable-gpac") \
+ $(usex threads "" "--disable-thread") || die
+
+ # this is a nasty workaround for bug #376925 for x264 that also applies
+ # here, needed because as upstream doesn't like us fiddling with their CFLAGS
+ if use custom-cflags; then
+ local cflags
+ cflags="$(grep "^CFLAGS=" config.mak | sed 's/CFLAGS=//')"
+ cflags="${cflags//$(get-flag O)/}"
+ cflags="${cflags//-O? /$(get-flag O) }"
+ cflags="${cflags//-g /}"
+ sed -i "s:^CFLAGS=.*:CFLAGS=${cflags//:/\\:}:" config.mak
+ fi
+}
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 41e90c73fd16..bb666223f676 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Tue, 24 May 2016 13:40:54 +0000
+Tue, 24 May 2016 14:40:44 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 41e90c73fd16..f891278d8819 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Tue, 24 May 2016 13:40:54 +0000
+Tue, 24 May 2016 14:40:45 +0000
diff --git a/metadata/md5-cache/dev-libs/c-capnproto-0.1 b/metadata/md5-cache/dev-libs/c-capnproto-0.1
new file mode 100644
index 000000000000..aa1dfaae3c9a
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/c-capnproto-0.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=test? ( dev-cpp/gtest ) !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=C library/compiler for the Cap'n Proto serialization/RPC protocol
+EAPI=5
+HOMEPAGE=https://github.com/opensourcerouting/c-capnproto
+IUSE=test
+KEYWORDS=~amd64
+LICENSE=MIT
+SLOT=0
+SRC_URI=https://github.com/opensourcerouting/c-capnproto/archive/c-capnproto-0.1.tar.gz
+_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c autotools-utils 419811142edf3516b0d0cf1a254d93cb eutils 792f83d5ec9536cb5ccef375469d8bde libtool 4890219c51da247200223277f993e054 multilib d062ae4ba2fc40a19c11de2ad89b6616 toolchain-funcs d513d423d449877e49d99af3f7af7acb
+_md5_=1a532fa232db9fc17dab29a3bc797bd0
diff --git a/metadata/md5-cache/kde-apps/kuiserver-15.12.3 b/metadata/md5-cache/kde-apps/kuiserver-15.12.3
index 2077da4324eb..91cb7f13c1a2 100644
--- a/metadata/md5-cache/kde-apps/kuiserver-15.12.3
+++ b/metadata/md5-cache/kde-apps/kuiserver-15.12.3
@@ -4,10 +4,10 @@ DESCRIPTION=KDE: Progress Info UI server
EAPI=6
HOMEPAGE=https://www.kde.org/
IUSE=debug aqua
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
LICENSE=GPL-2
RDEPEND=!kde-base/kuiserver:4 kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.14.3:4[aqua=]
SLOT=4/15.12
SRC_URI=mirror://kde/stable/applications/15.12.3/src/kde-runtime-15.12.3.tar.xz
_eclasses_=cmake-utils d6c1714cc58fd2168bf150f2a01f3801 eutils 792f83d5ec9536cb5ccef375469d8bde fdo-mime 92d07846ea8ea54172f8c0112a47ae3d flag-o-matic d270fa247153df66074f795fa42dba3e gnome2-utils c6dcdf3a2c22b578b16adb945dc85c35 kde4-base b4717e51c1794e3767ca15f9571c80a5 kde4-functions 88bc45dff8c885002aca6e4c0adbe541 kde4-meta cc1175ba18c9391fbc67922aecead7da multilib d062ae4ba2fc40a19c11de2ad89b6616 toolchain-funcs d513d423d449877e49d99af3f7af7acb versionator 99ae9d758cbe7cfed19170e7d48f5a9c virtualx 86c9305a59b3e0459e7fbef3a5f30b96 xdg-utils e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=df506de0d484d0e2b6c242f4d83f78a6
+_md5_=c10c15c498200dbe987901df74cf555c
diff --git a/metadata/md5-cache/media-libs/x264-0.0.20160523 b/metadata/md5-cache/media-libs/x264-0.0.20160523
new file mode 100644
index 000000000000..8a0c6aa6e504
--- /dev/null
+++ b/metadata/md5-cache/media-libs/x264-0.0.20160523
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=abi_x86_32? ( >=dev-lang/yasm-1.2.0 ) abi_x86_64? ( >=dev-lang/yasm-1.2.0 ) opencl? ( dev-lang/perl )
+DESCRIPTION=A free library for encoding X264/AVC streams
+EAPI=5
+HOMEPAGE=http://www.videolan.org/developers/x264.html
+IUSE=10bit +interlaced opencl pic static-libs cpu_flags_x86_sse +threads 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
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=GPL-2
+RDEPEND=opencl? ( >=virtual/opencl-0-r3[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(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r7 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
+SLOT=0/148
+SRC_URI=http://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-20160523-2245.tar.bz2
+_eclasses_=eutils 792f83d5ec9536cb5ccef375469d8bde flag-o-matic d270fa247153df66074f795fa42dba3e multibuild 742139c87a9fa3766f0c2b155e5522bf multilib d062ae4ba2fc40a19c11de2ad89b6616 multilib-build 8fe2e81aeb36cdf8a6cc5f50443879cc multilib-minimal 0224dee31c0f98405d572e14ad6dee65 toolchain-funcs d513d423d449877e49d99af3f7af7acb versionator 99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=d42d6ec5bbee6b13612e76c3b876adb8
diff --git a/metadata/md5-cache/media-libs/x264-9999 b/metadata/md5-cache/media-libs/x264-9999
index e25b4f336183..c6f69360dcc7 100644
--- a/metadata/md5-cache/media-libs/x264-9999
+++ b/metadata/md5-cache/media-libs/x264-9999
@@ -8,4 +8,4 @@ LICENSE=GPL-2
RDEPEND=opencl? ( >=virtual/opencl-0-r3[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(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r7 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
SLOT=0/148
_eclasses_=eutils 792f83d5ec9536cb5ccef375469d8bde flag-o-matic d270fa247153df66074f795fa42dba3e git-2 672c3929a162f221a53b4ccb4d25d8a2 multibuild 742139c87a9fa3766f0c2b155e5522bf multilib d062ae4ba2fc40a19c11de2ad89b6616 multilib-build 8fe2e81aeb36cdf8a6cc5f50443879cc multilib-minimal 0224dee31c0f98405d572e14ad6dee65 toolchain-funcs d513d423d449877e49d99af3f7af7acb
-_md5_=9d50a380592b426ab0fb14e3da55f31a
+_md5_=d42d6ec5bbee6b13612e76c3b876adb8
diff --git a/metadata/md5-cache/media-video/x264-encoder-0.0.20160523 b/metadata/md5-cache/media-video/x264-encoder-0.0.20160523
new file mode 100644
index 000000000000..f27d79852ea3
--- /dev/null
+++ b/metadata/md5-cache/media-video/x264-encoder-0.0.20160523
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure prepare
+DEPEND=ffmpeg? ( virtual/ffmpeg ) ~media-libs/x264-0.0.20160523[10bit=,interlaced=,threads=] ffmpegsource? ( media-libs/ffmpegsource ) mp4? ( >=media-video/gpac-0.5.2 ) amd64? ( >=dev-lang/yasm-1.2.0 ) x86? ( >=dev-lang/yasm-1.2.0 ) x86-fbsd? ( >=dev-lang/yasm-1.2.0 ) virtual/pkgconfig
+DESCRIPTION=A free commandline encoder for X264/AVC streams
+EAPI=5
+HOMEPAGE=http://www.videolan.org/developers/x264.html
+IUSE=10bit avs custom-cflags ffmpeg ffmpegsource +interlaced mp4 +threads
+KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=ffmpeg? ( virtual/ffmpeg ) ~media-libs/x264-0.0.20160523[10bit=,interlaced=,threads=] ffmpegsource? ( media-libs/ffmpegsource ) mp4? ( >=media-video/gpac-0.5.2 )
+REQUIRED_USE=ffmpegsource? ( ffmpeg )
+SLOT=0
+SRC_URI=http://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-20160523-2245.tar.bz2
+_eclasses_=eutils 792f83d5ec9536cb5ccef375469d8bde flag-o-matic d270fa247153df66074f795fa42dba3e multilib d062ae4ba2fc40a19c11de2ad89b6616 toolchain-funcs d513d423d449877e49d99af3f7af7acb versionator 99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=175ecaff7c2d8d6214d976712066e3b7
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.1.25 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.1.25
new file mode 100644
index 000000000000..5d06b0fca559
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.1.25
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources including the Gentoo patchset for the 4.1 kernel tree
+EAPI=5
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build kdbus
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 -hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2 freedist
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=4.1.25
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.1.tar.xz mirror://gentoo/genpatches-4.1-30.base.tar.xz mirror://gentoo/genpatches-4.1-30.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.1-30.experimental.tar.xz )
+_eclasses_=eutils 792f83d5ec9536cb5ccef375469d8bde kernel-2 f745fe70cd0e35af07412905687b9a7f multilib d062ae4ba2fc40a19c11de2ad89b6616 python-any-r1 8eb13cdf35f6e43c48107b911900b2cc python-utils-r1 13d5b02ea59b21da41c77c9294f3b7f7 toolchain-funcs d513d423d449877e49d99af3f7af7acb versionator 99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=f5b4d52b9e4040d5f209b2fedf1b5c7f
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 41e90c73fd16..f891278d8819 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Tue, 24 May 2016 13:40:54 +0000
+Tue, 24 May 2016 14:40:45 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index eab3b9237e1b..1c41f94f1375 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Tue May 24 13:39:59 UTC 2016
+Tue May 24 14:39:49 UTC 2016
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 55b0916aab52..f81057a2b712 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Tue, 24 May 2016 14:00:01 +0000
+Tue, 24 May 2016 15:00:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 1e03b0ed670d..8e7b183fb3fd 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1464097201 Tue 24 May 2016 01:40:01 PM UTC
+1464100801 Tue 24 May 2016 02:40:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 41e90c73fd16..bb666223f676 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Tue, 24 May 2016 13:40:54 +0000
+Tue, 24 May 2016 14:40:44 +0000
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index dc3dec4f0e53..3a9239bdc134 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -46,6 +46,9 @@ DIST genpatches-4.1-20.extras.tar.xz 16180 SHA256 8f44981c6574aedf1484c7e643cfa3
DIST genpatches-4.1-29.base.tar.xz 744040 SHA256 8a5980de83fb5c0e979bfc9ea098641f9b40b6e17b4fde471f3e28c96331b1c0 SHA512 dc0e9b2ed535e3808f855e3dc0548f312af29b2ba1af53a57f20285e7bd6b22108e144c5cb0df6de4627f5cb24f4038ab97abeba45105cfb7c59f3eb4511def1 WHIRLPOOL 24ae5b638e08a59b3369c24195ccdeb836c953f3b6f437f70ed5efdbd3366fd5837ef5662500faa3affcb5a13605f7de287fd51ce025677405eca68c5cf48c18
DIST genpatches-4.1-29.experimental.tar.xz 61644 SHA256 1b6c252f27e837c48a1a3a22221d407a44cfa9c04e62a4718170efae6d95fd6d SHA512 4c39df5c6e7df8f58fa1c98fea95733ff3a13ea1019172a8a8b525ab3034a778bdcaf81a24fcd67fbad5bf5da254d7498b37e49b8cc5fcbe26849b6ba16cf3a9 WHIRLPOOL 1b58e16723e527fa840f17a831584615b40c5222254ba0f21c5e9793693ac0d506d20f2be806e352dc82d61f5f4943d6eae3066cfb36b9b49b838bd8ed4a2439
DIST genpatches-4.1-29.extras.tar.xz 16276 SHA256 8bbfc785c2831243d8c7f03f16f2d87156aa02c45fbe21d9b9870fc56bec5c02 SHA512 a960f8fe88a7aefbe848d802130f5176562f37e8812be7283ed4972354680afb05af101612f045e1f99641fd43fa410142695718d5bcadca25d5a7749449246f WHIRLPOOL 4b1e9eb7b4b61d57c24e2a9103bae8b8817bd702d9f063aba9778921fc40e77ca61b322bbf4368f5d431f3c885b363cdbe09188230263527650d6c66bf698cbf
+DIST genpatches-4.1-30.base.tar.xz 763028 SHA256 d494c43c70e6fcfa25a9446b997ddaa47568a3fc9e4211fc415e480394b283d4 SHA512 4a3c0a828f08d79f4d22ebf39822924a893b23e7739437058a4c03fa71d4bffed55d190dfb384a77ab1332f98204bc30b91240b635762f76b6d4a2bff6db0bf7 WHIRLPOOL 2ac20f6f43724b55f31a9325e7932d763903fcb8cf8d3cf488a8ced1a329049a41c47f110de37bd19884a5ec44d049e0f05382600db775a3aaefdb4f0ac148af
+DIST genpatches-4.1-30.experimental.tar.xz 61632 SHA256 b53e6d7f5cefa19c339ea79af9e526fc3875f752b437db122a8711a97a4ad284 SHA512 45d294f4003bd17860dad3c87f79249e9b92f240e312fe852b2f5f86e12cfb936151851d5604b9afa6aeb0b9b3138cb12a08918e4cc980a6aabc89ee5b646bb9 WHIRLPOOL bc3a55091df5b2e8ec50af66d816ea3835b1c1383255b721cc974cb00b41b0e1d10130650923d2245c922310f6d63aced9cda387ba9e7f83ad23a5438b21c707
+DIST genpatches-4.1-30.extras.tar.xz 16276 SHA256 da205651b56c3ac23ee4e9f7fc98fe2ae8edc5605a4103763eb58d1fb866ca11 SHA512 a9e343ae4d44c9d7b7758ab9be8ab580c35e85b6ac4f8cbe2dc75fdd82bb1d38b85f6ee034015978b868e9413bdaec9e427a0c8f4bb066d741bd62c17a8f6a6b WHIRLPOOL 41282cc05eb89b3da6bb18425eb1eabd9d384a8e457e4feac3449393c91a56957807d657efd6d73a10ffe125b26b4362e17d2c85c540bff99d328d84ea225229
DIST genpatches-4.4-10.base.tar.xz 342516 SHA256 4de20ee2b1cb8c33d4a6c431cef4dc3ab4a3365ad2ca905ccc47bf29455da8d0 SHA512 ea4f51afb3f85af9ee3742d703360cdea2f585017268fa3cb16a2d86a3a2e6df0ee46a0d52cc550fb99cbba7e4973676bbd8dc6cbb2b265af842939d3fdbe109 WHIRLPOOL 28a0fef05bc1b91592244a69cf1fbc15257f62f7b2dacb31b556aa9cdb5cb4d25c1b0a83e2c3518f8d08162ed57bfe50f26e081a23403adc4a3c96c1151498f6
DIST genpatches-4.4-10.experimental.tar.xz 62612 SHA256 29ba528a6a7f0298607ed12b204ae31cc1c0a1a559e93383dc4ead57f58f52fa SHA512 e5205462b47dabec0b1798388d2aeace5bfa342e56e9857863ca445212ad627934365cd51c2c1cc5d1b38b6235b473b8e516f2eacce7e27c482d3f990f69e991 WHIRLPOOL 74952df3fe17878eb1d08d64f1c295ca59b8d22a8ae66bdff7aa4fca8c0615e693848ffd8090f01719741d25f19a706c08c6e7932f2e357b8981b1e91e608c78
DIST genpatches-4.4-10.extras.tar.xz 16280 SHA256 68c15831b7d7fff7e49d163fac43205b4749b01f0b8e03b0fe17d919a1c00a60 SHA512 1336406a10934fc76c7281e0dd4634fce0c102ee0d086f033618c974395eb71789b153b48dce25f9d8e654f84b01b8db0639d87b3254a7536dc6f9cfed7606be WHIRLPOOL 4a45e581557f7338d45e74bddd3fb0240f35bcae18b6ade28a066e1e91570632e7d0a0066c5e7b67035accc5580bf75e7db3136fd50bb18b4f2836d89fdbf0f7
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.1.25.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.1.25.ebuild
new file mode 100644
index 000000000000..3f234a5f9e56
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.1.25.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="30"
+K_DEBLOB_AVAILABLE="0"
+K_KDBUS_AVAILABLE="0"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 -hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+ kernel-2_pkg_postinst
+ einfo "For more info on this patchset, and how to report problems, see:"
+ einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+ kernel-2_pkg_postrm
+}