Sync with portage [Mon Jul 27 07:43:55 MSK 2015].

9 years ago · 2812a6ba43
parent 105694ef41
commit 2812a6ba43
89 changed files with 1099 additions and 243 deletions
--- a/app-emulation/vice/files/vice-2.4.20-xf86extensions.patch
+++ b/app-emulation/vice/files/vice-2.4.20-xf86extensions.patch
@ -0,0 +1,15 @@
+--- a/trunk/vice/src/arch/unix/x11/gnome/x11ui.c
+++ b/trunk/vice/src/arch/unix/x11/gnome/x11ui.c
+@@ -102,9 +102,10 @@
+ #include "ui-threads.h"
+ #endif
+ 
+-#ifdef USE_XF86_EXTENSIONS
+#if defined(USE_XF86_EXTENSIONS) || !defined(HAVE_VTE)
+ #include <gdk/gdkx.h>
+ #endif
+
+ #include "x11ui.h"
+ 
+ #ifdef DEBUG_X11UI
+
--- a/app-emulation/vice/vice-2.4.20.ebuild
+++ b/app-emulation/vice/vice-2.4.20.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vice/vice-2.4.20.ebuild,v 1.2 2015/06/15 07:38:33 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vice/vice-2.4.20.ebuild,v 1.3 2015/07/26 20:20:47 mr_bones_ Exp $

 EAPI=5
 inherit autotools eutils toolchain-funcs flag-o-matic games
@ -87,7 +87,8 @@ DEPEND="${RDEPEND}

 src_prepare() {
 	epatch \
-		"${FILESDIR}"/${P}-autotools.patch
+		"${FILESDIR}"/${P}-autotools.patch \
+		"${FILESDIR}"/${P}-xf86extensions.patch
 	sed -i \
 		-e 's/building//' \
 		doc/Makefile.am || die
--- a/app-i18n/poedit/Manifest
+++ b/app-i18n/poedit/Manifest
@ -1 +1,2 @@
 DIST poedit-1.5.5.tar.gz 2594758 SHA256 3c94c9825c11a2d1ce10e083ad246e8625469f358da4a5a2f6210170b970f949 SHA512 a3524e27681dbf97babef7bf3ec56d6b7cd736370f8ed86b53c717a5a2eb36245f9ed89fcd28b57bd4d6f5ff5fb98d6c1615baae0bf10be720dcfdafa57ad4f4 WHIRLPOOL 893795acc85183cede0313b9220179cafa17a92033e8472e48454475f4ecdf51a014dc7123e9396a38a98217c43666919e7a1dadf68ab2f401b920071cec3d23
+DIST poedit-1.8.3.tar.gz 2319253 SHA256 2a73c659506c31eac142ad5b070a2370a797f3e81813c915bdd75fac2dd21ec1 SHA512 c09faf18c9e58b2f4547e47d22a2237589eb4663985d0d3411e6f83691c34d075bff188fc14a9e245efe89d976377956d604c7f09d0329ddcd70383243f0f6b0 WHIRLPOOL 31b324c4c5b731836865c7bd464003b38406bf114f39354e9c6cb2bcfb65d5a3dead3e05ba780d2f0e13d504368d40e365f6372b6c9d5493814e063dd77a0bdf
--- a/app-i18n/poedit/metadata.xml
+++ b/app-i18n/poedit/metadata.xml
@ -3,6 +3,6 @@
 <pkgmetadata>
 	<herd>wxwidgets</herd>
 	<upstream>
-		<remote-id type="sourceforge">poedit</remote-id>
+		<remote-id type="github">vslavik/poedit</remote-id>
 	</upstream>
 </pkgmetadata>
--- a/app-i18n/poedit/poedit-1.8.3.ebuild
+++ b/app-i18n/poedit/poedit-1.8.3.ebuild
@ -0,0 +1,71 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/poedit/poedit-1.8.3.ebuild,v 1.1 2015/07/26 22:03:10 rhill Exp $
+
+EAPI=5
+WX_GTK_VER=3.0
+
+PLOCALES="af am an ar ast az be@latin be bg bn br bs ca ca@valencia ckb co cs da de el en_GB eo es et eu fa fi fr fur fy_NL ga gl he hi hr hu id is it ja ka kk ko ku ky lt lv mk mn mr ms nb ne nl nn oc pa pl pt_BR pt_PT ro ru sk sl sq sr sv ta tg th tr tt ug uk ur uz vi wa zh_CN zh_TW"
+
+inherit eutils fdo-mime flag-o-matic gnome2-utils l10n wxwidgets
+
+DESCRIPTION="GUI editor for gettext translations files"
+HOMEPAGE="https://poedit.net"
+SRC_URI="https://github.com/vslavik/${PN}/releases/download/v${PV}-oss/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# db/expat req for legacytm - remove in later version
+RDEPEND="
+	app-text/gtkspell:2
+	dev-cpp/lucene++
+	dev-libs/boost:=[nls]
+	dev-libs/expat
+	dev-libs/icu:=
+	||	(
+		=sys-libs/db-5*:=[cxx]
+		=sys-libs/db-4*:=[cxx]
+		)
+	x11-libs/gtk+:2
+	x11-libs/wxGTK:${WX_GTK_VER}[X]
+	"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	my_rm_loc() {
+		sed -i -e "/^POEDIT_LINGUAS = /s: ${1}::" locales/Makefile.in || die
+		rm "locales/${1}.mo" || die
+	}
+	l10n_find_plocales_changes 'locales' '' '.mo'
+	l10n_for_each_disabled_locale_do my_rm_loc
+
+	append-flags -Wno-deprecated-declarations
+}
+
+src_configure() {
+	econf --without-cpprest --without-cld2
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS NEWS README
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
--- a/dev-haskell/http-client/Manifest
+++ b/dev-haskell/http-client/Manifest
@ -1,6 +1,7 @@
 DIST http-client-0.2.0.3.tar.gz 29004 SHA256 90c4419c2a7316fa63c6561f3f5f53bc681c96e92e7ee2c8a390002292b3c037 SHA512 748ba3e652351a28c3471c5cca50510f6bf25092ca43277f44ffbe3497af462253e703c41d721e96647b34f4e874e45f1e717354b356151487a16358154c68e0 WHIRLPOOL 1174b704b80e978ca71258152cd904c0cc2ffe84817320f052429a45813c43a59e9bcca1c4fb0a6efbe94a7c9d9bff59d0792495115b9c12342a2ae62abd9707
 DIST http-client-0.2.2.2.tar.gz 29315 SHA256 91f642fbd612587ff088973e6aab6f59a8199d5068fdc9eb1bcea1b5f046c3de SHA512 c436a275848d4bac7d44f56b033303380f5b6433ab0064048c6e47977192bc81c2ae66b629af573e743274895797bfaf8ebd5c19c67c7583160508ba20e0597a WHIRLPOOL 0dd13cf62f79c56e5738dd5018dfdcae3fb18d4b9c49a1eda221a2ebac475ee4dcb03ee43524c0f9b844914bd005e98c2fb8996e2dc152c1926162490ca96dd1
 DIST http-client-0.3.3.2.tar.gz 33517 SHA256 67cecbfcbccf53c4a1287aed3f22a6cfc156640ace4f6ed004ce5166e0fd020b SHA512 7e05ab5f3c1a02092c1431f532a41cf032c791ea527ad84ee5d1e6ad9fb61decaa5b8e1f879099c47937c7c48a96961ee76d688fc42cb19878c6782922ece91e WHIRLPOOL be2de3b8215990e14b7711e0049541b619267d817fafb27c038c5f124a553f5e74959458d4609a74d3cc1650d7e18d8abf1a04ad57af1939e3ba29fc9d8cdfd4
+DIST http-client-0.4.18.1.tar.gz 75796 SHA256 69bba520e4719b5f2b1f2ce5bebea441d082691b76bef37c9fff410497ae156c SHA512 22b04e04edda5d0ae017acfd6b332acd9347d722245642f02caced4c60baa3b00d14e495c1b8f82e96e9c071acc045f0ab3f17b93706c95b81658a43489ac9f8 WHIRLPOOL 388790b6e17c7b3dd4e2cd002c21fdbd606e3e80d8e0c6d96cc1fcdd634e42a95d03bc761df66b7d03d9e7e6ec869f559c5859b44488a4501a3c154d2df42892
 DIST http-client-0.4.6.1.tar.gz 37585 SHA256 8bafa8802a587779992da08ff80941c42331d853227a20bca35ada590a989bfc SHA512 40d3691fb12fc9b3bfb82fcf2520c926dcd69d5cefd334587cc7a30dc1a917b16e2ea8816385bafd4053f5e49ac0c754d7ed0ac6c5e2c3825ddc706eff62a564 WHIRLPOOL 3c5f7691f15931090d2e462349258189b14b9aa72213987bf0b62eb1f72d85dee01c636cc295501c92a1564ab56b3fc62104f31ffc70f721785d1d089b088535
 DIST http-client-0.4.6.2.tar.gz 37570 SHA256 4c36772df657b5856f40c65ba0de0e1fc97aeff13d61d92f1f14b33a844d13ed SHA512 e1b766a9d4a840e2c6a490247c91ce5404fcc8c30d723a1ab6c6f2d5b168c27db3f00abf2f3c0a1287a4303238a20d70c504be2157c8bf791675b1e78c233b1c WHIRLPOOL 7c755961f96447d0ab6ba9ae79db2a55524d13ef00c995eb0f0b766da0f938d6cb4aaa31ca91d276e39085aa17f904fe2780cb5ca88454fd981becaa3a02f3f4
 DIST http-client-0.4.9.tar.gz 41797 SHA256 569155c371487885f2ad1982e5721af18799d827009d5212cbb004e343eb28b7 SHA512 353db3a1512e7a20fb376a120b94f4ab472bcda4bc84c149462410f13147ad685e0c20b3eeb2729812ddf5d925f18d21c6569134de88e5a323d2f7c926365ae9 WHIRLPOOL 5e4b7a1f78f39019f8e053450a0d25f30b07dada360353ffdd2de7ffa90d2f2cf257aaf161a9108abee44a09072aafe351aaed4c0e9db124f9bde8a3b9a51df5
--- a/dev-haskell/http-client/http-client-0.4.18.1.ebuild
+++ b/dev-haskell/http-client/http-client-0.4.18.1.ebuild
@ -0,0 +1,51 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/http-client/http-client-0.4.18.1.ebuild,v 1.1 2015/07/26 21:07:07 slyfox Exp $
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.5.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="An HTTP client engine, intended as a base layer for more user-friendly packages"
+HOMEPAGE="https://github.com/snoyberg/http-client"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+network-uri"
+
+RDEPEND=">=dev-haskell/base64-bytestring-1.0:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?]
+	>=dev-haskell/blaze-builder-0.3:=[profile?]
+	>=dev-haskell/case-insensitive-1.0:=[profile?]
+	dev-haskell/cookie:=[profile?]
+	dev-haskell/data-default-class:=[profile?]
+	>=dev-haskell/exceptions-0.4:=[profile?]
+	>=dev-haskell/http-types-0.8:=[profile?]
+	dev-haskell/mime-types:=[profile?]
+	dev-haskell/random:=[profile?]
+	>=dev-haskell/streaming-commons-0.1.0.2:=[profile?] <dev-haskell/streaming-commons-0.2:=[profile?]
+	>=dev-haskell/text-0.11:=[profile?]
+	dev-haskell/transformers:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+	network-uri? ( >=dev-haskell/network-2.6:=[profile?]
+			>=dev-haskell/network-uri-2.6:=[profile?] )
+	!network-uri? ( >=dev-haskell/network-2.3:=[profile?] <dev-haskell/network-2.6:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+	test? ( dev-haskell/async
+		dev-haskell/hspec
+		dev-haskell/monad-control
+		>=dev-haskell/streaming-commons-0.1.1
+		dev-haskell/zlib
+		!network-uri? ( dev-haskell/network-uri ) )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag network-uri network-uri)
+}
--- a/dev-libs/libnatspec/libnatspec-0.2.6-r1.ebuild
+++ b/dev-libs/libnatspec/libnatspec-0.2.6-r1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libnatspec/libnatspec-0.2.6-r1.ebuild,v 1.10 2015/07/03 10:10:21 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libnatspec/libnatspec-0.2.6-r1.ebuild,v 1.11 2015/07/26 21:40:53 mgorny Exp $

 EAPI=5

@ -27,6 +27,10 @@ DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )
 	python? ( dev-lang/tcl:0= )"

+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-iconv.patch
 	# regenerate to fix imcompatible readlink usage
--- a/dev-python/mock/mock-1.2.0.ebuild
+++ b/dev-python/mock/mock-1.2.0.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/mock/mock-1.2.0.ebuild,v 1.3 2015/07/26 14:52:45 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mock/mock-1.2.0.ebuild,v 1.5 2015/07/27 01:35:14 floppym Exp $

 EAPI=5
 PYTHON_COMPAT=( python2_7 python3_3 python3_4 pypy )
@ -22,7 +22,8 @@ DEPEND="
 	>=dev-python/pbr-1.3[${PYTHON_USEDEP}]
 	test? (
 		${CDEPEND}
-		$(python_gen_cond_dep '>=dev-python/unittest2-1.1.0[${PYTHON_USEDEP}]' 'python2_7' pypy)
+		dev-python/nose[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '>=dev-python/unittest2-1.1.0[${PYTHON_USEDEP}]' python{2_7,3_3} pypy)
 	)"
 RDEPEND="
 	${CDEPEND}
@ -30,8 +31,7 @@ RDEPEND="
 "

 python_test() {
-	# Taken from tox.ini
-	"${PYTHON}" -m unittest discover || die "Testing failed with ${EPYTHON}"
+	nosetests || die "tests fail under ${EPYTHON}"
 }

 python_install_all() {
--- a/dev-python/pbr/pbr-1.3.0.ebuild
+++ b/dev-python/pbr/pbr-1.3.0.ebuild
@ -1,10 +1,10 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pbr/pbr-1.3.0.ebuild,v 1.2 2015/07/26 15:30:18 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pbr/pbr-1.3.0.ebuild,v 1.4 2015/07/27 01:35:14 floppym Exp $

 EAPI=5

-PYTHON_COMPAT=( python2_7 python3_{3,4} pypy )
+PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )

 inherit distutils-r1

--- a/dev-python/testrepository/testrepository-0.0.18-r1.ebuild
+++ b/dev-python/testrepository/testrepository-0.0.18-r1.ebuild
@ -1,9 +1,9 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/testrepository/testrepository-0.0.18-r1.ebuild,v 1.12 2015/04/14 12:51:27 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/testrepository/testrepository-0.0.18-r1.ebuild,v 1.13 2015/07/27 01:13:42 idella4 Exp $

 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )

 inherit distutils-r1

@ -16,21 +16,24 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"

+RDEPEND=">=dev-python/subunit-0.0.10[${PYTHON_USEDEP}]
+		>=dev-python/testtools-0.9.30[${PYTHON_USEDEP}]
+		dev-python/fixtures[${PYTHON_USEDEP}]"
+#bzr is listed but presumably req'd for a live repo test run
+
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 		test? ( ${RDEPEND}
 			dev-python/testresources[${PYTHON_USEDEP}]
 			dev-python/testscenarios[${PYTHON_USEDEP}]
 			dev-python/pytz[${PYTHON_USEDEP}]
 		)"
-#bzr is listed but presumably req'd for a live repo test run
-RDEPEND=">=dev-python/subunit-0.0.10[${PYTHON_USEDEP}]
-		>=dev-python/testtools-0.9.30[${PYTHON_USEDEP}]
-		dev-python/fixtures[${PYTHON_USEDEP}]"

 # Required for test phase
 DISTUTILS_IN_SOURCE_BUILD=1

 python_test() {
-	"${PYTHON}" ./testr init || die
-	"${PYTHON}" setup.py testr --coverage || die "tests failed under ${EPYTHON}"
+	# some errors appear to have crept in the suite undert py3 since addition.
+	# Python2.7 now passes all.
+
+	esetup.py testr --coverage # || die "tests failed under ${EPYTHON}"
 }
--- a/dev-python/testrepository/testrepository-0.0.18.ebuild
+++ b/dev-python/testrepository/testrepository-0.0.18.ebuild
@ -1,36 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/testrepository/testrepository-0.0.18.ebuild,v 1.10 2015/04/08 08:05:22 mgorny Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3} )
-
-inherit distutils-r1
-
-DESCRIPTION="A repository of test results"
-HOMEPAGE="https://launchpad.net/testscenarios"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		test? ( ${RDEPEND}
-			dev-python/testresources[${PYTHON_USEDEP}]
-			dev-python/testscenarios[${PYTHON_USEDEP}]
-			dev-python/pytz[${PYTHON_USEDEP}]
-		)"
-#bzr is listed but presumably req'd for a live repo test run
-RDEPEND=">=dev-python/subunit-0.0.10[${PYTHON_USEDEP}]
-		>=dev-python/testtools-0.9.30[${PYTHON_USEDEP}]
-		dev-python/fixtures[${PYTHON_USEDEP}]"
-
-# Required for test phase
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_test() {
-	"${PYTHON}" ./testr init || die
-	"${PYTHON}" setup.py testr --coverage || die "tests failed under ${EPYTHON}"
-}
--- a/dev-python/testtools/testtools-1.8.0.ebuild
+++ b/dev-python/testtools/testtools-1.8.0.ebuild
@ -1,10 +1,10 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/testtools/testtools-1.8.0.ebuild,v 1.3 2015/07/26 15:41:11 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/testtools/testtools-1.8.0.ebuild,v 1.5 2015/07/27 01:35:14 floppym Exp $

 EAPI=5

-PYTHON_COMPAT=( python2_7 python3_{3,4} pypy )
+PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )

 inherit distutils-r1

--- a/dev-python/unittest2/unittest2-1.0.1-r1.ebuild
+++ b/dev-python/unittest2/unittest2-1.0.1-r1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/unittest2/unittest2-1.0.1-r1.ebuild,v 1.4 2015/07/26 14:57:41 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/unittest2/unittest2-1.0.1-r1.ebuild,v 1.6 2015/07/27 01:35:14 floppym Exp $

 EAPI=5
 PYTHON_COMPAT=( python2_7 python3_3 python3_4 pypy )
--- a/dev-python/unittest2/unittest2-1.1.0.ebuild
+++ b/dev-python/unittest2/unittest2-1.1.0.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/unittest2/unittest2-1.1.0.ebuild,v 1.3 2015/07/26 14:57:41 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/unittest2/unittest2-1.1.0.ebuild,v 1.5 2015/07/27 01:35:14 floppym Exp $

 EAPI=5
 PYTHON_COMPAT=( python2_7 python3_3 python3_4 pypy )
--- a/dev-util/aruba/aruba-0.8.1.ebuild
+++ b/dev-util/aruba/aruba-0.8.1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/aruba/aruba-0.8.1.ebuild,v 1.3 2015/07/26 08:26:44 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/aruba/aruba-0.8.1.ebuild,v 1.4 2015/07/26 17:51:01 jer Exp $

 EAPI=5
 USE_RUBY="ruby19 ruby20 ruby21 ruby22"
@ -17,7 +17,7 @@ DESCRIPTION="Cucumber steps for driving out command line applications"
 HOMEPAGE="https://github.com/cucumber/aruba"
 LICENSE="MIT"

-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~x86"
 SLOT="0"
 IUSE=""

--- a/kde-apps/kdebase-runtime-meta/kdebase-runtime-meta-4.14.3.ebuild
+++ b/kde-apps/kdebase-runtime-meta/kdebase-runtime-meta-4.14.3.ebuild
@ -1,13 +1,13 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-apps/kdebase-runtime-meta/kdebase-runtime-meta-4.14.3.ebuild,v 1.2 2015/07/22 16:02:14 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-apps/kdebase-runtime-meta/kdebase-runtime-meta-4.14.3.ebuild,v 1.3 2015/07/26 21:34:23 mgorny Exp $

 EAPI=5
 inherit kde4-meta-pkg

 DESCRIPTION="Merge this to pull in all kdebase-runtime-derived packages"
 KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="+crash-reporter +handbook minimal nepomuk"
+IUSE="crash-reporter +handbook minimal nepomuk"

 RDEPEND="
 	$(add_kdeapps_dep kcmshell)
@ -44,6 +44,7 @@ RDEPEND="
 		$(add_kdebase_dep khelpcenter)
 		kde-plasma/khelpcenter:5[compat(+)]
 	) )
+	minimal? ( $(add_kdeapps_dep solid-runtime '-bluetooth') )
 	nepomuk? ( $(add_kdeapps_dep nepomuk) )
 	!minimal? (
 		$(add_kdeapps_dep attica)
@ -52,3 +53,4 @@ RDEPEND="
 		$(add_kdeapps_dep knetattach)
 	)
 "
+REQUIRED_USE="minimal? ( !crash-reporter )"
--- a/kde-base/kde-meta/kde-meta-4.14.3.ebuild
+++ b/kde-base/kde-meta/kde-meta-4.14.3.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-meta/kde-meta-4.14.3.ebuild,v 1.6 2015/06/04 18:39:13 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-meta/kde-meta-4.14.3.ebuild,v 1.7 2015/07/26 21:35:07 mgorny Exp $

 EAPI=5
 inherit kde4-meta-pkg
@ -31,3 +31,4 @@ RDEPEND="
 	)
 	!minimal? ( $(add_kdebase_dep kdeplasma-addons) )
 "
+REQUIRED_USE="minimal? ( !kdepim )"
--- a/media-gfx/fontforge/Manifest
+++ b/media-gfx/fontforge/Manifest
@ -1,5 +1,6 @@
 DIST cidmaps-20090121.tgz 314314 SHA256 1bf9c7eb8835e6ed94e62cb49f1141bc046c562849e52e6c3c7f1d7cfc95c7b3 SHA512 a85daeb16b6650179f54ff9e35915c4c7bb5e2efca0455262a271063849484dbba08c4b493c4ca08552365205995cad5c3770ba7b3cadb2e5c386626dc46636c WHIRLPOOL 0c840cf7f4d7f432597f68620231da34cff2dac5af1ba3200b57b63566f3b81b151ddf7cbaa84665f4b7c629bb8f100c72b8bade8634687e5c11110ed91ed821
 DIST fontforge-20150430.tar.gz 24531572 SHA256 430c6d02611c7ca948df743e9241994efe37eda25f81a94aeadd9b6dd286ff37 SHA512 e530a7e7cec569f9e9419ccf2805ac5bd41e05565b4c24fa6f6a8c6c3684d1d76868a9a19abba3ba92aa66bcca333949d37c8890f72a29c0072c8a3e912269e4 WHIRLPOOL b02912ed66149818da7e406300116465dae6f1c40032549ca820a9cfc7b33e862eeeb9cb1f366628423701e8e39e0a8ced3000a02ff2562f2c27eb5b70c805da
+DIST fontforge-20150612.tar.gz 125037727 SHA256 0f4ec68a648f7f845d54d1e87cf5fb246a16d528b74e9e1a9b815418510022d7 SHA512 01a38bdbb55ba3b2638b55caa2f768ba691fdfa730afd843df0cf62417db5465731ed968c5ab7c026622264e20c20fdfd8ec0ceb50da71039588797fe18393b8 WHIRLPOOL 6662bc52669153ba46e562fbcb287f5bff59eeeec7fe9afcd65918f892282650ab4be4f279fe6fab95f02f36caa753900693532ece439bee114e774e0da3f855
 DIST fontforge_full-20110222.tar.bz2 5126031 SHA256 8fa2818026f84bb7b8a77451d21cab7e9dea8aa904e5218afa158be6a320433e SHA512 af74ca482d8892c30e650bd377df16d44a11738c930625bcf9878d97ba8faaf67f2965dcf3c32b722120273d99dcdd042405bb6afeee1286f0cf18f916e4f12a WHIRLPOOL f6446b8b6d5d49d9bb421bf39a4a192f4622916eb68013a3317c78585d1ae05837478c5d2fa1bb2ebad9caa3455cf0db6e132f6e7ad07d3ae9f58b1b4ab7fd52
 DIST fontforge_full-20120731.tar.bz2 5725667 SHA256 e5cb9e9e64a99d1dfc549950741eb9b44c3162a4c62f71053905c1f2d024295f SHA512 34dca27983d64c9ae570e2c8f438b1ea373d22f5aeb23808d4b77e458950b568b460a2b011edfc3154f9e8dd06595d6f64296f8f63f46c404c3ff7ed6d9816d1 WHIRLPOOL e502dc79b1d46e5cce9372b593bef06083a853eeb2af47a909d093956cc867432e7b4600c799f73c7d08474d7e76fb18bed1b080440f3a21d27b703ac831bc15
 DIST fontforge_htdocs-20110221.tar.bz2 3129839 SHA256 7a81b9a30fa8f287e63abcfee568d7fcfd1a21c75c5c69effe95fe677d963fec SHA512 b91808cd5deb6472785f3353fe9856279ddb0887ae249eccd37cff8dbdf53065a8d6008dbf160dd6c5ba6cfecf37b9c4e63c5baa6332f4b4128d5e471d243236 WHIRLPOOL 7664b853e7dd0c9a36c50e84dbd332ff4c10232fa200e9ac42c97982993c7d23e06e235a0f88183a7e6a78f342789c0141fb396879b5e5fa0ccb9d4bd3b30d43
--- a/media-gfx/fontforge/fontforge-20150612.ebuild
+++ b/media-gfx/fontforge/fontforge-20150612.ebuild
@ -0,0 +1,128 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontforge/fontforge-20150612.ebuild,v 1.1 2015/07/26 18:44:31 floppym Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit autotools eutils fdo-mime python-single-r1
+
+DESCRIPTION="postscript font editor and converter"
+HOMEPAGE="http://fontforge.github.io/"
+SRC_URI="https://github.com/fontforge/fontforge/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="BSD GPL-3+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="cairo truetype-debugger gif gtk jpeg png +python readline tiff svg unicode X"
+
+REQUIRED_USE="
+	cairo? ( png )
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+RDEPEND="
+	dev-libs/libltdl:0
+	dev-libs/libxml2:2=
+	>=media-libs/freetype-2.3.7:2=
+	cairo? (
+		>=x11-libs/cairo-1.6:0=
+		x11-libs/pango:0=
+	)
+	gif? ( media-libs/giflib:0= )
+	jpeg? ( virtual/jpeg:0 )
+	png? ( media-libs/libpng:0= )
+	tiff? ( media-libs/tiff:0= )
+	truetype-debugger? ( >=media-libs/freetype-2.3.8:2[fontforge,-bindist(-)] )
+	gtk? ( x11-libs/gtk+:2= )
+	python? ( ${PYTHON_DEPS} )
+	readline? ( sys-libs/readline:0= )
+	unicode? ( media-libs/libuninameslist:0= )
+	X? (
+		x11-libs/libX11:0=
+		x11-libs/libXi:0=
+		x11-libs/libxkbui:0=
+		>=x11-libs/pango-1.10:0=[X]
+	)
+	!media-gfx/pfaedit
+"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig
+	X? ( x11-proto/inputproto )
+"
+
+# Needs keywording on many arches.
+#	zeromq? (
+#		>=net-libs/czmq-2.2.0:0=
+#		>=net-libs/zeromq-4.0.4:0=
+#	)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+gnulib_import() {
+	(
+		func_add_hook() { :; }
+		source bootstrap.conf
+		set -- "${S}/gnulib/gnulib-tool" --libtool --import ${gnulib_modules}
+		echo "$@"
+		"$@"
+	)
+}
+
+src_prepare() {
+	# Tarball comes with broken absolute symlinks
+	# https://github.com/fontforge/fontforge/issues/2439
+	find . -lname "/*" -delete || die
+	gnulib_import || die
+	epatch_user
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-static
+		$(use_enable truetype-debugger freetype-debugger "${EPREFIX}/usr/include/freetype2/internal4fontforge")
+		$(use_enable gtk gtk2-use)
+		$(use_enable python python-extension)
+		$(use_enable python python-scripting)
+		--enable-tile-path
+		--enable-gb12345
+		$(use_with cairo)
+		$(use_with gif giflib)
+		$(use_with jpeg libjpeg)
+		$(use_with png libpng)
+		$(use_with readline libreadline)
+		--without-libspiro
+		$(use_with tiff libtiff)
+		$(use_with unicode libuninameslist)
+		#$(use_with zeromq libzmq)
+		--without-libzmq
+		$(use_with X x)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	# Build system deps are broken
+	emake -C plugins
+	emake
+}
+
+src_install() {
+	default
+	prune_libtool_files
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
--- a/media-sound/abcm2ps/Manifest
+++ b/media-sound/abcm2ps/Manifest
@ -1,4 +1,4 @@
 DIST abcm2ps-6.6.22.tar.gz 298108 SHA256 be3dde653a349c8875dd1c98810c7a5263ddaaee9bc99085a41749c3e53ce560 SHA512 fb7e526e7036456df8f8826c9d552de1ff9b007cdf5b5a623ac164a346cad9af07d26ed081d8693ff549cfde37fc541a02eea2d8cb45f4902b66ac05ab96f939 WHIRLPOOL e7d82037462f60ec4c9f6a8411c109eaeebae09373169d5d3b751d789c2c221d88a7062a9b6750e25b8062f999ea213f0c3d031390ea750dcfe9868469424363
-DIST abcm2ps-8.3.4.tar.gz 234794 SHA256 1ca8a669218f4c62a58dc9947e01d27c2c64dcec37d1b0939a0ed4496de1cd3c SHA512 c8e5cd5649d1588f8ec235439f3b0709d6a7ccbec2bfccf241e6e1b5010b9241f314b0778d020caddcf18b1c728ad9b4946979dc83dcfaafd031ea6e71f4dac4 WHIRLPOOL 88179655f16a1a1a8cd3f65cc930871232e079c59e9c53ebd3a99da47fb74e815d2fdb8dbb39b9f3df53ea84eefac77fbcf82d76c0ebebb16fd960c049720574
 DIST abcm2ps-8.5.2.tar.gz 231017 SHA256 466446ef3007a3bbedf01667e647ba66fcdd81e3bc714bfe5b13a1c16f536c69 SHA512 605ad9eed7470ab89ce87cb0192d58cdfce6dd481b787f58c829c8cfed999fb11ffccbc1fe0ad325a311eabf40405f1ae676c7c64ce84db0ecaf9d58b509b293 WHIRLPOOL 06ad4b92557cd65fcf18b80a40aae36b688137793397cf9aef8e286b73af1218cedacfcbaff8e6e4bd29ab78aac158ef174dfc3eb7cbe00ae560a54cd169636e
+DIST abcm2ps-8.8.3.tar.gz 238617 SHA256 7a802a535ccb92e8ff0231ba70fdc9e522f9fbadf00d5a22c0a833853730db17 SHA512 61e6ebbf822a48d558e78e876ed123a7ed5125d858aae6de30b16906c3023509caaa52eeea9123c59fed3128d079965fe0bc95b2603c444bb4d01cfda22d24b3 WHIRLPOOL 5c14ee3c86714c94a65ffea4b6397e891c954f771523df028691d034f549d96d63324e3a7b2f09bd8856ccfd2567a8163d632864d0e9ae4ded1caa3e7c71fa5e
 DIST transpose_abc.pl 21045 SHA256 bd6960872bfbc9f71f183f36d533ea33b8cf62a6027b447f0b0b8adfa25a2848 SHA512 dc2623608a7b59d7e0c4d25160e69f696f170e9938dc3e035edbaf6f0163b4c6139892ec8734ea2aaba997507dcf32208562e898690600dc3c199046d4d151f3 WHIRLPOOL 81e327bbd76b40826adab06f7756c79c60289b21432b792c848db3ba1354528fa4f1a074cba890b6087cfac6e712427c6cbb2c9e6679c8ced22c362f6ec005f3
--- a/media-sound/abcm2ps/abcm2ps-8.8.3.ebuild
+++ b/media-sound/abcm2ps/abcm2ps-8.8.3.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/abcm2ps/abcm2ps-8.3.4.ebuild,v 1.1 2014/12/07 17:46:17 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/abcm2ps/abcm2ps-8.8.3.ebuild,v 1.1 2015/07/26 19:00:59 polynomial-c Exp $

 EAPI=5
 inherit toolchain-funcs
--- a/media-video/ffmpegthumbnailer/Manifest
+++ b/media-video/ffmpegthumbnailer/Manifest
@ -1 +1,2 @@
+DIST ffmpegthumbnailer-2.0.10.tar.bz2 2154028 SHA256 a3022c86aa3e704849e424147bd4a319867e18930d66a4a4c93c0baefdd1fc60 SHA512 1fcfcfe9457a3e3e70a749f3234f79d080fbbb40d4d1f65b84e1c46a7051c75368afaffb25a39b43f8e205ffdbc2e156e6fb5848514fce4a1a3f5222458c1b9d WHIRLPOOL fe60513d2a26db622d02f6f38f04009590337415aeb02b441757949e4402cdfeb33d37cb295720f8dd66ebae9dcfdba9304c88256ccda4800e015fa40650151b
 DIST ffmpegthumbnailer-2.0.8.tar.gz 367186 SHA256 2c8bbefa838d38ea42fc8ac78258cda36865d974c991624b14cffdb92a3bc68b SHA512 6062d4b8f5326bde96c8c6dceaac52e1fabcec93f0a0ee4be19e203050e6c80426a006076a27e4a12582e05daceebd37beef008154fdd92a87f365fdff68ca83 WHIRLPOOL 6b0bd942777515f690f212df5616dffc4fc1c6e0e0e5be67128b376347b18d75eb144d25e9f8ac841b41099703092af5784edc31f34d7dbf81b742d678233e79
--- a/media-video/ffmpegthumbnailer/ffmpegthumbnailer-2.0.10.ebuild
+++ b/media-video/ffmpegthumbnailer/ffmpegthumbnailer-2.0.10.ebuild
@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpegthumbnailer/ffmpegthumbnailer-2.0.10.ebuild,v 1.1 2015/07/26 21:30:52 mgorny Exp $
+
+EAPI=5
+
+inherit cmake-utils
+
+DESCRIPTION="Lightweight video thumbnailer that can be used by file managers"
+HOMEPAGE="https://github.com/dirkvdb/ffmpegthumbnailer"
+SRC_URI="https://github.com/dirkvdb/${PN}/releases/download/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="gnome gtk jpeg libav png test"
+
+RDEPEND="
+	gtk? ( dev-libs/glib:2= )
+	jpeg? ( virtual/jpeg:0= )
+	!libav? ( >=media-video/ffmpeg-2.7:0= )
+	libav? ( >=media-video/libav-11:0= )
+	png? ( media-libs/libpng:0= )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+REQUIRED_USE="gnome? ( gtk )"
+
+PATCHES=(
+	"${FILESDIR}/${P}-config-summary.patch"
+	"${FILESDIR}/${P}-installdirs.patch"
+	"${FILESDIR}/${P}-set-locale.patch"
+)
+
+DOCS=( AUTHORS ChangeLog README.md )
+
+src_prepare() {
+	rm -rf out* || die
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_GIO=$(usex gtk)
+		-DENABLE_TESTS=$(usex test)
+		-DENABLE_THUMBNAILER=$(usex gnome)
+		-DHAVE_JPEG=$(usex jpeg)
+		-DHAVE_PNG=$(usex png)
+	)
+	cmake-utils_src_configure
+}
--- a/media-video/ffmpegthumbnailer/files/ffmpegthumbnailer-2.0.10-config-summary.patch
+++ b/media-video/ffmpegthumbnailer/files/ffmpegthumbnailer-2.0.10-config-summary.patch
@ -0,0 +1,23 @@
+From 9c2a5fe997a6d8b00bef49eabb7bc49840882ec6 Mon Sep 17 00:00:00 2001
+From: Dirk Vanden Boer <dirk.vdb@gmail.com>
+Date: Wed, 29 Apr 2015 20:19:58 +0200
+Subject: [PATCH] Fixed configuration summary
+
+---
+ .travis.yml    | 1 +
+ CMakeLists.txt | 2 +-
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 22803d9..6b6e515 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -239,7 +239,7 @@ ELSE ()
+     MESSAGE(STATUS "register thumbnailer : disabled")
+ ENDIF ()
+ 
+-IF (ENABLE_UNITTEST)
+IF (ENABLE_TESTS)
+     MESSAGE(STATUS "unittests            : enabled")
+ ELSE ()
+     MESSAGE(STATUS "unittests            : disabled")
--- a/media-video/ffmpegthumbnailer/files/ffmpegthumbnailer-2.0.10-installdirs.patch
+++ b/media-video/ffmpegthumbnailer/files/ffmpegthumbnailer-2.0.10-installdirs.patch
@ -0,0 +1,47 @@
+From 621274d694dee1f8c92f5db99a5cff98e82c6bd4 Mon Sep 17 00:00:00 2001
+From: Dirk Vanden Boer <dirk.vdb@gmail.com>
+Date: Sat, 2 May 2015 09:33:34 +0200
+Subject: [PATCH] Use proper gnu installation dirs (Thanks to Vallimar)
+
+---
+ CMakeLists.txt | 15 ++++++++-------
+ ChangeLog      |  1 +
+ 2 files changed, 9 insertions(+), 7 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 6b6e515..badb7cf 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -25,6 +25,7 @@ ENDIF ()
+ 
+ PROJECT(${PACKAGE})
+ INCLUDE(CPack)
+INCLUDE(GNUInstallDirs)
+ 
+ SET(CMAKE_EXPORT_COMPILE_COMMANDS 1)
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+@@ -189,17 +190,17 @@ ELSE ()
+ ENDIF ()
+ 
+ INSTALL(TARGETS ffmpegthumbnailer ${STATIC_LIB} ${SHARED_LIB}
+-    LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
+-    RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
+-    ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
+-    PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_PREFIX}/include/libffmpegthumbnailer
+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/libffmpegthumbnailer
+ )
+ 
+-INSTALL(FILES man/ffmpegthumbnailer.1 DESTINATION ${CMAKE_INSTALL_PREFIX}/man/man1)
+-INSTALL(FILES ${CMAKE_BINARY_DIR}/libffmpegthumbnailer.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig)
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/man/ffmpegthumbnailer.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
+INSTALL(FILES ${CMAKE_BINARY_DIR}/libffmpegthumbnailer.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
+ 
+ IF (ENABLE_THUMBNAILER)
+-    INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/dist/ffmpegthumbnailer.thumbnailer DESTINATION ${CMAKE_INSTALL_PREFIX}/share/thumbnailers)
+    INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/dist/ffmpegthumbnailer.thumbnailer DESTINATION ${CMAKE_INSTALL_DATADIR}/thumbnailers)
+ ENDIF ()
+ 
+ CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/config.h.in ${CMAKE_BINARY_DIR}/config.h)
--- a/media-video/ffmpegthumbnailer/files/ffmpegthumbnailer-2.0.10-set-locale.patch
+++ b/media-video/ffmpegthumbnailer/files/ffmpegthumbnailer-2.0.10-set-locale.patch
@ -0,0 +1,46 @@
+From 718f1b1147fe7e9138e2d503ed151e589d643772 Mon Sep 17 00:00:00 2001
+From: Dirk Vanden Boer <dirk.vdb@gmail.com>
+Date: Sat, 18 Jul 2015 10:24:28 +0200
+Subject: [PATCH] Set locale to the user specified locale
+
+---
+ main.cpp            | 5 ++---
+ test/testrunner.cpp | 7 ++-----
+ 2 files changed, 4 insertions(+), 8 deletions(-)
+
+diff --git a/main.cpp b/main.cpp
+index 6cb6c55..7cb7089 100644
+--- a/main.cpp
+++ b/main.cpp
+@@ -54,10 +54,9 @@ int main(int argc, char** argv)
+     string  outputFile;
+     string  imageFormat;
+ 
+-    if (!setlocale(LC_CTYPE, "en_US.UTF-8"))
+    if (!std::setlocale(LC_CTYPE, ""))
+     {
+-        std::cerr << "Locale not specified. Check LANG, LC_CTYPE, LC_ALL" << std::endl;
+-        return 1;
+        std::cerr << "Failed to set locale" << std::endl;
+     }
+ 
+     while ((option = getopt (argc, argv, "i:o:s:t:q:c:afwhvp")) != -1)
+diff --git a/test/testrunner.cpp b/test/testrunner.cpp
+index 7023d25..20a4903 100644
+--- a/test/testrunner.cpp
+++ b/test/testrunner.cpp
+@@ -4,12 +4,9 @@
+ #include <gtest/gtest.h>
+ 
+ int main(int argc, char **argv) {
+-    std::cout << "Running ffmpegthumbnailer tests" << std::endl;
+-
+-    if (!setlocale(LC_CTYPE, "en_US.UTF-8"))
+    if (!std::setlocale(LC_CTYPE, ""))
+     {
+-        std::cerr << "Locale not specified. Check LANG, LC_CTYPE, LC_ALL" << std::endl;
+-        return 1;
+        std::cerr << "Failed to set locale" << std::endl;
+     }
+ 
+     testing::InitGoogleTest(&argc, argv);
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@ -1 +1 @@
-Sun, 26 Jul 2015 17:36:49 +0000
+Mon, 27 Jul 2015 04:06:52 +0000
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@ -1 +1 @@
-Sun, 26 Jul 2015 17:36:49 +0000
+Mon, 27 Jul 2015 04:06:53 +0000
--- a/metadata/md5-cache/app-emulation/vice-2.4.20
+++ b/metadata/md5-cache/app-emulation/vice-2.4.20
@ -11,4 +11,4 @@ REQUIRED_USE=?? ( gtk2 sdl )
 SLOT=0
 SRC_URI=mirror://sourceforge/vice-emu/releases/vice-2.4.20.tar.gz
 _eclasses_=autotools	2264f05fbbbaaf83d34ec81e72b38ffd	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	games	1ad3205dbf62a2c98249f2f59b0a2d39	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=c0fe916a50d02b8d850a6e6a40fe6b77
+_md5_=fbaffed50c0c13ab721fa3cf0ff7970a
--- a/metadata/md5-cache/app-i18n/poedit-1.8.3
+++ b/metadata/md5-cache/app-i18n/poedit-1.8.3
@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst postrm preinst prepare
+DEPEND=app-text/gtkspell:2 dev-cpp/lucene++ dev-libs/boost:=[nls] dev-libs/expat dev-libs/icu:= || ( =sys-libs/db-5*:=[cxx] =sys-libs/db-4*:=[cxx] ) x11-libs/gtk+:2 x11-libs/wxGTK:3.0[X] virtual/pkgconfig >=sys-apps/sed-4
+DESCRIPTION=GUI editor for gettext translations files
+EAPI=5
+HOMEPAGE=https://poedit.net
+IUSE=linguas_af linguas_am linguas_an linguas_ar linguas_ast linguas_az linguas_be@latin linguas_be linguas_bg linguas_bn linguas_br linguas_bs linguas_ca linguas_ca@valencia linguas_ckb linguas_co linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_eu linguas_fa linguas_fi linguas_fr linguas_fur linguas_fy_NL linguas_ga linguas_gl linguas_he linguas_hi linguas_hr linguas_hu linguas_id linguas_is linguas_it linguas_ja linguas_ka linguas_kk linguas_ko linguas_ku linguas_ky linguas_lt linguas_lv linguas_mk linguas_mn linguas_mr linguas_ms linguas_nb linguas_ne linguas_nl linguas_nn linguas_oc linguas_pa linguas_pl linguas_pt_BR linguas_pt_PT linguas_ro linguas_ru linguas_sk linguas_sl linguas_sq linguas_sr linguas_sv linguas_ta linguas_tg linguas_th linguas_tr linguas_tt linguas_ug linguas_uk linguas_ur linguas_uz linguas_vi linguas_wa linguas_zh_CN linguas_zh_TW
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=app-text/gtkspell:2 dev-cpp/lucene++ dev-libs/boost:=[nls] dev-libs/expat dev-libs/icu:= || ( =sys-libs/db-5*:=[cxx] =sys-libs/db-4*:=[cxx] ) x11-libs/gtk+:2 x11-libs/wxGTK:3.0[X]
+SLOT=0
+SRC_URI=https://github.com/vslavik/poedit/releases/download/v1.8.3-oss/poedit-1.8.3.tar.gz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	l10n	33bde4fb0cfd3a21a277b66bfd837e19	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	wxwidgets	6d6eec2685256d35511e7b6d5461bec9
+_md5_=42b084952e2e1f0d6545eab2c94600f1
--- a/metadata/md5-cache/dev-haskell/http-client-0.4.18.1
+++ b/metadata/md5-cache/dev-haskell/http-client-0.4.18.1
@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/base64-bytestring-1.0:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?] >=dev-haskell/blaze-builder-0.3:=[profile?] >=dev-haskell/case-insensitive-1.0:=[profile?] dev-haskell/cookie:=[profile?] dev-haskell/data-default-class:=[profile?] >=dev-haskell/exceptions-0.4:=[profile?] >=dev-haskell/http-types-0.8:=[profile?] dev-haskell/mime-types:=[profile?] dev-haskell/random:=[profile?] >=dev-haskell/streaming-commons-0.1.0.2:=[profile?] <dev-haskell/streaming-commons-0.2:=[profile?] >=dev-haskell/text-0.11:=[profile?] dev-haskell/transformers:=[profile?] >=dev-lang/ghc-7.4.1:= network-uri? ( >=dev-haskell/network-2.6:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] ) !network-uri? ( >=dev-haskell/network-2.3:=[profile?] <dev-haskell/network-2.6:=[profile?] ) >=dev-haskell/cabal-1.10 test? ( dev-haskell/async dev-haskell/hspec dev-haskell/monad-control >=dev-haskell/streaming-commons-0.1.1 dev-haskell/zlib !network-uri? ( dev-haskell/network-uri ) ) doc? ( dev-haskell/haddock ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
+DESCRIPTION=An HTTP client engine, intended as a base layer for more user-friendly packages
+EAPI=5
+HOMEPAGE=https://github.com/snoyberg/http-client
+IUSE=+network-uri doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/base64-bytestring-1.0:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?] >=dev-haskell/blaze-builder-0.3:=[profile?] >=dev-haskell/case-insensitive-1.0:=[profile?] dev-haskell/cookie:=[profile?] dev-haskell/data-default-class:=[profile?] >=dev-haskell/exceptions-0.4:=[profile?] >=dev-haskell/http-types-0.8:=[profile?] dev-haskell/mime-types:=[profile?] dev-haskell/random:=[profile?] >=dev-haskell/streaming-commons-0.1.0.2:=[profile?] <dev-haskell/streaming-commons-0.2:=[profile?] >=dev-haskell/text-0.11:=[profile?] dev-haskell/transformers:=[profile?] >=dev-lang/ghc-7.4.1:= network-uri? ( >=dev-haskell/network-2.6:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] ) !network-uri? ( >=dev-haskell/network-2.3:=[profile?] <dev-haskell/network-2.6:=[profile?] )
+SLOT=0/0.4.18.1
+SRC_URI=mirror://hackage/packages/archive/http-client/0.4.18.1/http-client-0.4.18.1.tar.gz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	ghc-package	48ae4e0fd75e1c8047c4b7f507d5debc	haskell-cabal	7ef7b3e7548c8c61352984737b22d3e3	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=e92cddff3baeee5a79c4bec8b4a1a786
--- a/metadata/md5-cache/dev-libs/libnatspec-0.2.6-r1
+++ b/metadata/md5-cache/dev-libs/libnatspec-0.2.6-r1
@ -11,4 +11,4 @@ REQUIRED_USE=python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/natspec/libnatspec-0.2.6.tar.bz2
 _eclasses_=autotools	2264f05fbbbaaf83d34ec81e72b38ffd	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	python-single-r1	351da1aa73960a282591217fb57c1bb8	python-utils-r1	df6eb914b4b2d70d9c5e7c9331437c52	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=ac518d6a01a1ea596c7ccf2e2b07296d
+_md5_=b4b03a5c0f3984c94c15bf2c1b936d5e
--- a/metadata/md5-cache/dev-python/mock-1.2.0
+++ b/metadata/md5-cache/dev-python/mock-1.2.0
@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/setuptools-17.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] >=dev-python/pbr-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] test? ( python_targets_python2_7? ( dev-python/funcsigs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-python/unittest2-1.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_pypy(-)?,-python_single_target_pypy(-)] ) python_targets_pypy? ( >=dev-python/unittest2-1.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_pypy(-)?,-python_single_target_pypy(-)] ) ) 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 ) python_targets_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
+DEPEND=>=dev-python/setuptools-17.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] >=dev-python/pbr-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] test? ( python_targets_python2_7? ( dev-python/funcsigs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] python_targets_python2_7? ( >=dev-python/unittest2-1.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_3(-)?,-python_single_target_python3_3(-),python_targets_pypy(-)?,-python_single_target_pypy(-)] ) python_targets_python3_3? ( >=dev-python/unittest2-1.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_3(-)?,-python_single_target_python3_3(-),python_targets_pypy(-)?,-python_single_target_pypy(-)] ) python_targets_pypy? ( >=dev-python/unittest2-1.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_3(-)?,-python_single_target_python3_3(-),python_targets_pypy(-)?,-python_single_target_pypy(-)] ) ) 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 ) python_targets_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 DESCRIPTION=Rolling backport of unittest.mock for all Pythons
 EAPI=5
 HOMEPAGE=https://github.com/testing-cabal/mock
@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/m/mock/mock-1.2.0.tar.gz
 _eclasses_=distutils-r1	715b22a21726d3fd76b17e007c5daf5f	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	23846c6ba39f6655e2027001eeed8e81	python-utils-r1	df6eb914b4b2d70d9c5e7c9331437c52	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=27ab6dc8195fd61144109ebe4e7ef08c
+_md5_=3526bc37734594fe5a71da9bfbd1495a
--- a/metadata/md5-cache/dev-python/pbr-1.3.0
+++ b/metadata/md5-cache/dev-python/pbr-1.3.0
@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/p/pbr/pbr-1.3.0.tar.gz
 _eclasses_=distutils-r1	715b22a21726d3fd76b17e007c5daf5f	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	23846c6ba39f6655e2027001eeed8e81	python-utils-r1	df6eb914b4b2d70d9c5e7c9331437c52	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=d0d41e2e44399b3de3e1f995b0ba2ea9
+_md5_=64b299063c3c7047510cdf280e45ad3c
--- a/metadata/md5-cache/dev-python/testrepository-0.0.18
+++ b/metadata/md5-cache/dev-python/testrepository-0.0.18
@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] test? ( dev-python/testresources[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] dev-python/testscenarios[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] ) 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 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)]
-DESCRIPTION=A repository of test results
-EAPI=5
-HOMEPAGE=https://launchpad.net/testscenarios
-IUSE=test python_targets_python2_7 python_targets_python3_3
-KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/subunit-0.0.10[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] >=dev-python/testtools-0.9.30[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] dev-python/fixtures[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] 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 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 )
-SLOT=0
-SRC_URI=mirror://pypi/t/testrepository/testrepository-0.0.18.tar.gz
-_eclasses_=distutils-r1	715b22a21726d3fd76b17e007c5daf5f	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	23846c6ba39f6655e2027001eeed8e81	python-utils-r1	df6eb914b4b2d70d9c5e7c9331437c52	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=91d5a18c9e0fc632a19f2e92a69e27a8
--- a/metadata/md5-cache/dev-python/testrepository-0.0.18-r1
+++ b/metadata/md5-cache/dev-python/testrepository-0.0.18-r1
@ -1,14 +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(-)] test? ( dev-python/testresources[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(-)] dev-python/testscenarios[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(-)] dev-python/pytz[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-2:=[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(-)]
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] test? ( >=dev-python/subunit-0.0.10[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] >=dev-python/testtools-0.9.30[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] dev-python/fixtures[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] dev-python/testresources[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] dev-python/testscenarios[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] ) 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 ) python_targets_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 DESCRIPTION=A repository of test results
 EAPI=5
 HOMEPAGE=https://launchpad.net/testscenarios
-IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
+IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
 KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
-RDEPEND=>=dev-python/subunit-0.0.10[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(-)] >=dev-python/testtools-0.9.30[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(-)] dev-python/fixtures[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-2:=[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 )
+RDEPEND=>=dev-python/subunit-0.0.10[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] >=dev-python/testtools-0.9.30[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] dev-python/fixtures[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] 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 ) python_targets_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/t/testrepository/testrepository-0.0.18.tar.gz
 _eclasses_=distutils-r1	715b22a21726d3fd76b17e007c5daf5f	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	23846c6ba39f6655e2027001eeed8e81	python-utils-r1	df6eb914b4b2d70d9c5e7c9331437c52	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=ca488fbbaca7c448c07a1c1d26252c3a
+_md5_=f7c3740d3e87da74a8909fbce72f3498
--- a/metadata/md5-cache/dev-python/testtools-1.8.0
+++ b/metadata/md5-cache/dev-python/testtools-1.8.0
@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/t/testtools/testtools-1.8.0.tar.gz
 _eclasses_=distutils-r1	715b22a21726d3fd76b17e007c5daf5f	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	23846c6ba39f6655e2027001eeed8e81	python-utils-r1	df6eb914b4b2d70d9c5e7c9331437c52	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=ea02da5e431c27e05b7d7f510da2d6c5
+_md5_=84db9ed05c7e3960643ffcbdc9f75f5c
--- a/metadata/md5-cache/dev-python/unittest2-1.0.1-r1
+++ b/metadata/md5-cache/dev-python/unittest2-1.0.1-r1
@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/u/unittest2/unittest2-1.0.1.tar.gz
 _eclasses_=distutils-r1	715b22a21726d3fd76b17e007c5daf5f	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	23846c6ba39f6655e2027001eeed8e81	python-utils-r1	df6eb914b4b2d70d9c5e7c9331437c52	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=b4ba69b3a246b6eebeeada737719e37f
+_md5_=7f2637d19d085412f38b1e78c76151a1
--- a/metadata/md5-cache/dev-python/unittest2-1.1.0
+++ b/metadata/md5-cache/dev-python/unittest2-1.1.0
@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/u/unittest2/unittest2-1.1.0.tar.gz
 _eclasses_=distutils-r1	715b22a21726d3fd76b17e007c5daf5f	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	23846c6ba39f6655e2027001eeed8e81	python-utils-r1	df6eb914b4b2d70d9c5e7c9331437c52	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=807680e5f95354a77935065ccc921b68
+_md5_=3834934d713a38f745c28bc25e92399f
--- a/metadata/md5-cache/dev-util/aruba-0.8.1
+++ b/metadata/md5-cache/dev-util/aruba-0.8.1
@ -4,11 +4,11 @@ DESCRIPTION=Cucumber steps for driving out command line applications
 EAPI=5
 HOMEPAGE=https://github.com/cucumber/aruba
 IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test test
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=~amd64 ~arm ~hppa ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/childprocess-0.5.6[ruby_targets_ruby19] =dev-ruby/childprocess-0.5*[ruby_targets_ruby19] >=dev-ruby/contracts-0.9:0[ruby_targets_ruby19] >=dev-ruby/rspec-expectations-2.99:2[ruby_targets_ruby19] >=dev-util/cucumber-1.3.19[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/childprocess-0.5.6[ruby_targets_ruby20] =dev-ruby/childprocess-0.5*[ruby_targets_ruby20] >=dev-ruby/contracts-0.9:0[ruby_targets_ruby20] >=dev-ruby/rspec-expectations-2.99:2[ruby_targets_ruby20] >=dev-util/cucumber-1.3.19[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/childprocess-0.5.6[ruby_targets_ruby21] =dev-ruby/childprocess-0.5*[ruby_targets_ruby21] >=dev-ruby/contracts-0.9:0[ruby_targets_ruby21] >=dev-ruby/rspec-expectations-2.99:2[ruby_targets_ruby21] >=dev-util/cucumber-1.3.19[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/childprocess-0.5.6[ruby_targets_ruby22] =dev-ruby/childprocess-0.5*[ruby_targets_ruby22] >=dev-ruby/contracts-0.9:0[ruby_targets_ruby22] >=dev-ruby/rspec-expectations-2.99:2[ruby_targets_ruby22] >=dev-util/cucumber-1.3.19[ruby_targets_ruby22] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/aruba-0.8.1.gem
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	abeb792ba9affd97d226ab283bfd07a2	multilib	62927b3db3a589b0806255f3a002d5d3	ruby-fakegem	59aa129a3b9dc9e6225a0622860d2f54	ruby-ng	a1c75617b3482d513ad41d1aea8dbf8f	ruby-utils	a74e21a353442acf697b6c82e7df6df8	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=c4ed7857268d8650c786598ebc8fbf6b
+_md5_=3e2037260dcc6aed65dd116b8cc40159
--- a/metadata/md5-cache/kde-apps/kdebase-runtime-meta-4.14.3
+++ b/metadata/md5-cache/kde-apps/kdebase-runtime-meta-4.14.3
@ -2,10 +2,11 @@ DEFINED_PHASES=-
 DESCRIPTION=Merge this to pull in all kdebase-runtime-derived packages
 EAPI=5
 HOMEPAGE=http://www.kde.org/
-IUSE=+crash-reporter +handbook minimal nepomuk aqua
+IUSE=crash-reporter +handbook minimal nepomuk aqua
 KEYWORDS=amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=metapackage
-RDEPEND=>=kde-apps/kcmshell-4.14.3:4[aqua=] >=kde-apps/kdebase-data-4.14.3:4[aqua=] >=kde-apps/kdebase-desktoptheme-4.14.3:4[aqua=] >=kde-apps/kdebase-menu-4.14.3:4[aqua=] >=kde-apps/kdebase-menu-icons-4.14.3:4[aqua=] >=kde-apps/kdebugdialog-4.14.3:4[aqua=] >=kde-apps/kdesu-4.14.3:4[aqua=] >=kde-apps/kdontchangethehostname-4.14.3:4[aqua=] >=kde-apps/keditfiletype-4.14.3:4[aqua=] >=kde-apps/kfile-4.14.3:4[aqua=] >=kde-apps/kglobalaccel-4.14.3:4[aqua=] >=kde-apps/kiconfinder-4.14.3:4[aqua=] >=kde-apps/kimgio-4.14.3:4[aqua=] >=kde-apps/kioclient-4.14.3:4[aqua=] >=kde-apps/kmimetypefinder-4.14.3:4[aqua=] >=kde-apps/knewstuff-4.14.3:4[aqua=] >=kde-apps/knotify-4.14.3:4[aqua=] >=kde-apps/kpasswdserver-4.14.3:4[aqua=] >=kde-apps/kquitapp-4.14.3:4[aqua=] >=kde-apps/kstart-4.14.3:4[aqua=] >=kde-apps/ktimezoned-4.14.3:4[aqua=] >=kde-apps/ktraderclient-4.14.3:4[aqua=] >=kde-apps/kuiserver-4.14.3:4[aqua=] >=kde-apps/kurifilter-plugins-4.14.3:4[aqua=] >=kde-apps/kwalletd-4.14.3:4[aqua=] >=kde-apps/kwalletmanager-4.14.3:4[aqua=] >=kde-apps/plasma-runtime-4.14.3:4[aqua=] >=kde-apps/renamedlg-plugins-4.14.3:4[aqua=] >=kde-apps/solid-runtime-4.14.3:4[aqua=] crash-reporter? ( >=kde-apps/drkonqi-4.14.3:4[aqua=] ) handbook? ( || ( >=kde-base/khelpcenter-4.14.3:4[aqua=] kde-plasma/khelpcenter:5[compat(+)] ) ) nepomuk? ( >=kde-apps/nepomuk-4.14.3:4[aqua=] ) !minimal? ( >=kde-apps/attica-4.14.3:4[aqua=] >=kde-apps/kcontrol-4.14.3:4[aqua=] >=kde-apps/kdebase-kioslaves-4.14.3:4[aqua=] >=kde-apps/knetattach-4.14.3:4[aqua=] )
+RDEPEND=>=kde-apps/kcmshell-4.14.3:4[aqua=] >=kde-apps/kdebase-data-4.14.3:4[aqua=] >=kde-apps/kdebase-desktoptheme-4.14.3:4[aqua=] >=kde-apps/kdebase-menu-4.14.3:4[aqua=] >=kde-apps/kdebase-menu-icons-4.14.3:4[aqua=] >=kde-apps/kdebugdialog-4.14.3:4[aqua=] >=kde-apps/kdesu-4.14.3:4[aqua=] >=kde-apps/kdontchangethehostname-4.14.3:4[aqua=] >=kde-apps/keditfiletype-4.14.3:4[aqua=] >=kde-apps/kfile-4.14.3:4[aqua=] >=kde-apps/kglobalaccel-4.14.3:4[aqua=] >=kde-apps/kiconfinder-4.14.3:4[aqua=] >=kde-apps/kimgio-4.14.3:4[aqua=] >=kde-apps/kioclient-4.14.3:4[aqua=] >=kde-apps/kmimetypefinder-4.14.3:4[aqua=] >=kde-apps/knewstuff-4.14.3:4[aqua=] >=kde-apps/knotify-4.14.3:4[aqua=] >=kde-apps/kpasswdserver-4.14.3:4[aqua=] >=kde-apps/kquitapp-4.14.3:4[aqua=] >=kde-apps/kstart-4.14.3:4[aqua=] >=kde-apps/ktimezoned-4.14.3:4[aqua=] >=kde-apps/ktraderclient-4.14.3:4[aqua=] >=kde-apps/kuiserver-4.14.3:4[aqua=] >=kde-apps/kurifilter-plugins-4.14.3:4[aqua=] >=kde-apps/kwalletd-4.14.3:4[aqua=] >=kde-apps/kwalletmanager-4.14.3:4[aqua=] >=kde-apps/plasma-runtime-4.14.3:4[aqua=] >=kde-apps/renamedlg-plugins-4.14.3:4[aqua=] >=kde-apps/solid-runtime-4.14.3:4[aqua=] crash-reporter? ( >=kde-apps/drkonqi-4.14.3:4[aqua=] ) handbook? ( || ( >=kde-base/khelpcenter-4.14.3:4[aqua=] kde-plasma/khelpcenter:5[compat(+)] ) ) minimal? ( >=kde-apps/solid-runtime-4.14.3:4[aqua=,-bluetooth] ) nepomuk? ( >=kde-apps/nepomuk-4.14.3:4[aqua=] ) !minimal? ( >=kde-apps/attica-4.14.3:4[aqua=] >=kde-apps/kcontrol-4.14.3:4[aqua=] >=kde-apps/kdebase-kioslaves-4.14.3:4[aqua=] >=kde-apps/knetattach-4.14.3:4[aqua=] )
+REQUIRED_USE=minimal? ( !crash-reporter )
 SLOT=4
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kde4-functions	99e770658f27aaf2c8a5850af7598b18	kde4-meta-pkg	c803ab12295a2918961b64111d6682fa	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=d3f3f2cdd57f221f6ceb558ba797c50e
+_md5_=745500e85f9915e7d0f0394e6e6f17fb
--- a/metadata/md5-cache/kde-base/kde-meta-4.14.3
+++ b/metadata/md5-cache/kde-base/kde-meta-4.14.3
@ -6,6 +6,7 @@ IUSE=accessibility kdepim minimal nls sdk aqua
 KEYWORDS=amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=metapackage
 RDEPEND=>=kde-apps/kate-4.14.3:4[aqua=] >=kde-apps/kdeadmin-meta-4.14.3:4[aqua=] >=kde-apps/kdeartwork-meta-4.14.3:4[aqua=] >=kde-apps/kdebase-meta-4.14.3:4[aqua=] >=kde-apps/kdeedu-meta-4.14.3:4[aqua=] >=kde-apps/kdegames-meta-4.14.3:4[aqua=] >=kde-apps/kdegraphics-meta-4.14.3:4[aqua=] >=kde-apps/kdemultimedia-meta-4.14.3:4[aqua=] >=kde-apps/kdenetwork-meta-4.14.3:4[aqua=] >=kde-apps/kdetoys-meta-4.14.3:4[aqua=] >=kde-apps/kdeutils-meta-4.14.3:4[aqua=] accessibility? ( >=kde-apps/kdeaccessibility-meta-4.14.3:4[aqua=] ) kdepim? ( >=kde-base/kdepim-meta-4.4.11.1:4[aqua=] ) nls? ( >=kde-apps/kde4-l10n-4.14.3:4[aqua=] ) sdk? ( >=kde-base/kdebindings-meta-4.14.3:4[aqua=] >=kde-apps/kdesdk-meta-4.14.3:4[aqua=] >=kde-apps/kdewebdev-meta-4.14.3:4[aqua=] ) !minimal? ( >=kde-base/kdeplasma-addons-4.14.3:4[aqua=] )
+REQUIRED_USE=minimal? ( !kdepim )
 SLOT=4
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kde4-functions	99e770658f27aaf2c8a5850af7598b18	kde4-meta-pkg	c803ab12295a2918961b64111d6682fa	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=3e27c0aa4925d75eb0107018db0065ad
+_md5_=360b12e326d8506dc32cab6a618a2e7b
--- a/metadata/md5-cache/media-gfx/fontforge-20150612
+++ b/metadata/md5-cache/media-gfx/fontforge-20150612
@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup
+DEPEND=dev-libs/libltdl:0 dev-libs/libxml2:2= >=media-libs/freetype-2.3.7:2= cairo? ( >=x11-libs/cairo-1.6:0= x11-libs/pango:0= ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0 ) png? ( media-libs/libpng:0= ) tiff? ( media-libs/tiff:0= ) truetype-debugger? ( >=media-libs/freetype-2.3.8:2[fontforge,-bindist(-)] ) gtk? ( x11-libs/gtk+:2= ) python? ( python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python3_3(+)?,python_single_target_python3_4(+)?,python_single_target_python2_7(+)?] ) readline? ( sys-libs/readline:0= ) unicode? ( media-libs/libuninameslist:0= ) X? ( x11-libs/libX11:0= x11-libs/libXi:0= x11-libs/libxkbui:0= >=x11-libs/pango-1.10:0=[X] ) !media-gfx/pfaedit sys-devel/gettext virtual/pkgconfig X? ( x11-proto/inputproto ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=postscript font editor and converter
+EAPI=5
+HOMEPAGE=http://fontforge.github.io/
+IUSE=cairo truetype-debugger gif gtk jpeg png +python readline tiff svg unicode X python_targets_python3_3 python_targets_python3_4 python_targets_python2_7 python_single_target_python3_3 python_single_target_python3_4 python_single_target_python2_7
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+LICENSE=BSD GPL-3+
+RDEPEND=dev-libs/libltdl:0 dev-libs/libxml2:2= >=media-libs/freetype-2.3.7:2= cairo? ( >=x11-libs/cairo-1.6:0= x11-libs/pango:0= ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0 ) png? ( media-libs/libpng:0= ) tiff? ( media-libs/tiff:0= ) truetype-debugger? ( >=media-libs/freetype-2.3.8:2[fontforge,-bindist(-)] ) gtk? ( x11-libs/gtk+:2= ) python? ( python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python3_3(+)?,python_single_target_python3_4(+)?,python_single_target_python2_7(+)?] ) readline? ( sys-libs/readline:0= ) unicode? ( media-libs/libuninameslist:0= ) X? ( x11-libs/libX11:0= x11-libs/libXi:0= x11-libs/libxkbui:0= >=x11-libs/pango-1.10:0=[X] ) !media-gfx/pfaedit
+REQUIRED_USE=cairo? ( png ) python? ( ^^ ( python_single_target_python3_3 python_single_target_python3_4 python_single_target_python2_7 ) python_single_target_python3_3? ( python_targets_python3_3 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python2_7? ( python_targets_python2_7 ) )
+SLOT=0
+SRC_URI=https://github.com/fontforge/fontforge/releases/download/20150612/fontforge-20150612.tar.gz
+_eclasses_=autotools	2264f05fbbbaaf83d34ec81e72b38ffd	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	python-single-r1	351da1aa73960a282591217fb57c1bb8	python-utils-r1	df6eb914b4b2d70d9c5e7c9331437c52	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=addd2e86ccbd494b0dea6c264dd41759
--- a/metadata/md5-cache/media-sound/abcm2ps-8.8.3
+++ b/metadata/md5-cache/media-sound/abcm2ps-8.8.3
@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
 RDEPEND=pango? ( x11-libs/pango media-libs/freetype:2 )
 SLOT=0
-SRC_URI=http://moinejf.free.fr/abcm2ps-8.3.4.tar.gz http://moinejf.free.fr/transpose_abc.pl
+SRC_URI=http://moinejf.free.fr/abcm2ps-8.8.3.tar.gz http://moinejf.free.fr/transpose_abc.pl
 _eclasses_=multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=3f962d83d8534614f63db884f43f4566
+_md5_=25be690a51da83ac6f31c2112e4c63f7
--- a/metadata/md5-cache/media-video/ffmpegthumbnailer-2.0.10
+++ b/metadata/md5-cache/media-video/ffmpegthumbnailer-2.0.10
@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=gtk? ( dev-libs/glib:2= ) jpeg? ( virtual/jpeg:0= ) !libav? ( >=media-video/ffmpeg-2.7:0= ) libav? ( >=media-video/libav-11:0= ) png? ( media-libs/libpng:0= ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+DESCRIPTION=Lightweight video thumbnailer that can be used by file managers
+EAPI=5
+HOMEPAGE=https://github.com/dirkvdb/ffmpegthumbnailer
+IUSE=gnome gtk jpeg libav png test
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=gtk? ( dev-libs/glib:2= ) jpeg? ( virtual/jpeg:0= ) !libav? ( >=media-video/ffmpeg-2.7:0= ) libav? ( >=media-video/libav-11:0= ) png? ( media-libs/libpng:0= )
+REQUIRED_USE=gnome? ( gtk )
+SLOT=0
+SRC_URI=https://github.com/dirkvdb/ffmpegthumbnailer/releases/download/2.0.10/ffmpegthumbnailer-2.0.10.tar.bz2
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=6b5b663fa58b5f5a646ecf42842df082
--- a/metadata/md5-cache/net-misc/mosh-1.2.5
+++ b/metadata/md5-cache/net-misc/mosh-1.2.5
@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare unpack
+DEPEND=dev-libs/protobuf sys-libs/ncurses:5 virtual/ssh client? ( dev-lang/perl dev-perl/IO-Tty ) utempter? ( sys-libs/libutempter ) virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Mobile shell that supports roaming and intelligent local echo
+EAPI=4
+HOMEPAGE=http://mosh.mit.edu
+IUSE=+client examples +mosh-hardening +server ufw +utempter
+KEYWORDS=~amd64 ~arm ~mips ~ppc ~x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos
+LICENSE=GPL-3
+RDEPEND=dev-libs/protobuf sys-libs/ncurses:5 virtual/ssh client? ( dev-lang/perl dev-perl/IO-Tty ) utempter? ( sys-libs/libutempter )
+REQUIRED_USE=|| ( client server ) examples? ( client )
+SLOT=0
+SRC_URI=http://mosh.mit.edu/mosh-1.2.5.tar.gz
+_eclasses_=autotools	2264f05fbbbaaf83d34ec81e72b38ffd	bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66
+_md5_=d4d857ceb036fe4fa2c8a38c8818418b
--- a/metadata/md5-cache/net-misc/sks-1.1.5-r1
+++ b/metadata/md5-cache/net-misc/sks-1.1.5-r1
@ -10,4 +10,4 @@ RDEPEND=dev-lang/ocaml dev-ml/cryptokit sys-libs/db:4.8
 SLOT=0
 SRC_URI=http://bitbucket.org/skskeyserver/sks-keyserver/downloads/sks-1.1.5.tgz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	readme.gentoo	106edea5533517715013de909a333abd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=69663de327305860ac4ada47b7b7cb81
+_md5_=86f11960e9a1f2a81dc97d9848cbb897
--- a/metadata/md5-cache/net-misc/tlsdate-0.0.13
+++ b/metadata/md5-cache/net-misc/tlsdate-0.0.13
@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install preinst prepare unpack
+DEPEND=dev-libs/openssl dev-libs/libevent dbus? ( sys-apps/dbus ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Update local time over HTTPS
+EAPI=4
+HOMEPAGE=https://github.com/ioerror/tlsdate
+IUSE=dbus +seccomp static-libs
+KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~mips ~x86
+LICENSE=BSD
+RDEPEND=dev-libs/openssl dev-libs/libevent dbus? ( sys-apps/dbus )
+SLOT=0
+SRC_URI=https://github.com/ioerror/tlsdate/tarball/tlsdate-0.0.13 -> tlsdate-0.0.13.tar.gz
+_eclasses_=autotools	2264f05fbbbaaf83d34ec81e72b38ffd	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66
+_md5_=c571286587f90f1aaedcfa929eafbe53
--- a/metadata/md5-cache/net-misc/tor-0.2.6.10
+++ b/metadata/md5-cache/net-misc/tor-0.2.6.10
@ -1,13 +1,13 @@
 DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=dev-libs/openssl:= sys-libs/zlib dev-libs/libevent bufferevents? ( dev-libs/libevent[ssl] ) nat-pmp? ( net-libs/libnatpmp ) scrypt? ( app-crypt/libscrypt ) seccomp? ( sys-libs/libseccomp ) upnp? ( net-libs/miniupnpc ) virtual/pkgconfig
+DEPEND=dev-libs/openssl:= sys-libs/zlib dev-libs/libevent bufferevents? ( dev-libs/libevent[ssl] ) nat-pmp? ( net-libs/libnatpmp ) scrypt? ( app-crypt/libscrypt ) seccomp? ( sys-libs/libseccomp ) systemd? ( sys-apps/systemd ) upnp? ( net-libs/miniupnpc ) virtual/pkgconfig
 DESCRIPTION=Anonymizing overlay network for TCP
 EAPI=5
 HOMEPAGE=http://www.torproject.org/
 IUSE=-bufferevents nat-pmp scrypt seccomp selinux stats systemd tor-hardening transparent-proxy test upnp web
 KEYWORDS=amd64 arm ~mips ppc ppc64 ~sparc ~x86
 LICENSE=BSD GPL-2
-RDEPEND=dev-libs/openssl:= sys-libs/zlib dev-libs/libevent bufferevents? ( dev-libs/libevent[ssl] ) nat-pmp? ( net-libs/libnatpmp ) scrypt? ( app-crypt/libscrypt ) seccomp? ( sys-libs/libseccomp ) upnp? ( net-libs/miniupnpc ) selinux? ( sec-policy/selinux-tor )
+RDEPEND=dev-libs/openssl:= sys-libs/zlib dev-libs/libevent bufferevents? ( dev-libs/libevent[ssl] ) nat-pmp? ( net-libs/libnatpmp ) scrypt? ( app-crypt/libscrypt ) seccomp? ( sys-libs/libseccomp ) systemd? ( sys-apps/systemd ) upnp? ( net-libs/miniupnpc ) selinux? ( sec-policy/selinux-tor )
 SLOT=0
 SRC_URI=https://www.torproject.org/dist/tor-0.2.6.10.tar.gz https://archive.torproject.org/tor-package-archive/tor-0.2.6.10.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	readme.gentoo	106edea5533517715013de909a333abd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=dabbc728bcf3d5f23bcd611580f24028
+_md5_=be0e6aee61bd89fb19460376384cd709
--- a/metadata/md5-cache/sys-devel/binutils-2.25.1
+++ b/metadata/md5-cache/sys-devel/binutils-2.25.1
@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=sys-devel/gnuconfig >=sys-devel/binutils-config-3 zlib? ( sys-libs/zlib ) test? ( dev-util/dejagnu ) nls? ( sys-devel/gettext ) sys-devel/flex virtual/yacc
+DESCRIPTION=Tools necessary to build programs
+EAPI=4
+HOMEPAGE=http://sourceware.org/binutils/
+IUSE=cxx multislot multitarget nls static-libs test vanilla zlib
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd -sparc-fbsd ~x86-fbsd
+LICENSE=|| ( GPL-3 LGPL-3 )
+RDEPEND=>=sys-devel/binutils-config-3 zlib? ( sys-libs/zlib )
+SLOT=0
+SRC_URI=mirror://gnu/binutils/binutils-2.25.1.tar.bz2 mirror://gentoo/binutils-2.25.1-patches-1.0.tar.xz http://dev.gentoo.org/~vapier/dist/binutils-2.25.1-patches-1.0.tar.xz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	gnuconfig	00a0530e40148c254cebb925df0e87ef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-binutils	afe11d1a79501d13367f1d1423b3b1ab	toolchain-funcs	42408102d713fbad60ca21349865edb4	unpacker	f300a7ca9131b1024a79762e8edd3c52	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=3074203a9a27f92f585f4295ac451ce0
--- a/metadata/md5-cache/sys-kernel/git-sources-4.2_rc4
+++ b/metadata/md5-cache/sys-kernel/git-sources-4.2_rc4
@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
+DEPEND=>=sys-devel/patch-2.7.4 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=The very latest -git version of the Linux kernel
+EAPI=5
+HOMEPAGE=http://www.kernel.org
+IUSE=symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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.2_rc4
+SRC_URI=mirror://kernel/linux/kernel/v4.x/testing/patch-4.2-rc4.xz mirror://kernel/linux/kernel/v4.x/linux-4.1.tar.xz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	adcd0a7bbb205c648e9cde3dd32126dc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	4756de53ea4d40471a582e898815a5c8	python-utils-r1	df6eb914b4b2d70d9c5e7c9331437c52	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=295499a16feda1d576023cfeabf25f3d
--- a/metadata/md5-cache/sys-kernel/hardened-sources-3.14.48-r1
+++ b/metadata/md5-cache/sys-kernel/hardened-sources-3.14.48-r1
@ -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 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
+DESCRIPTION=Hardened kernel sources (kernel series 3.14)
+EAPI=5
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/
+IUSE=deblob symlink build deblob
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2 !deblob? ( freedist )
+RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=3.14.48-r1
+SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.14.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.14-gnu/deblob-3.14 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.14-gnu/deblob-check -> deblob-check-3.14 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-3.14.48-2.extras.tar.bz2 mirror://gentoo/genpatches-3.14-53.base.tar.xz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	adcd0a7bbb205c648e9cde3dd32126dc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	4756de53ea4d40471a582e898815a5c8	python-utils-r1	df6eb914b4b2d70d9c5e7c9331437c52	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=66ac1f22f59637aa105b07ad21a1524b
--- a/metadata/md5-cache/sys-kernel/hardened-sources-3.2.69-r12
+++ b/metadata/md5-cache/sys-kernel/hardened-sources-3.2.69-r12
@ -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 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
+DESCRIPTION=Hardened kernel sources (kernel series 3.2)
+EAPI=5
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/
+IUSE=deblob symlink build deblob
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2 !deblob? ( freedist )
+RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=3.2.69-r12
+SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.2.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.2-gnu/deblob-3.2 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.2-gnu/deblob-check -> deblob-check-3.2 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-3.2.69-13.extras.tar.bz2 mirror://gentoo/genpatches-3.2-16.base.tar.xz mirror://gentoo/genpatches-3.2-16.extras.tar.xz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	adcd0a7bbb205c648e9cde3dd32126dc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	4756de53ea4d40471a582e898815a5c8	python-utils-r1	df6eb914b4b2d70d9c5e7c9331437c52	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=2770c035b6a9efb6427ef3621dc1f457
--- a/metadata/md5-cache/sys-kernel/hardened-sources-4.1.3
+++ b/metadata/md5-cache/sys-kernel/hardened-sources-4.1.3
@ -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 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
+DESCRIPTION=Hardened kernel sources (kernel series 4.1)
+EAPI=5
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/
+IUSE=deblob symlink build deblob
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2 !deblob? ( freedist )
+RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=4.1.3
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.1.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.1-gnu/deblob-4.1 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.1-gnu/deblob-check -> deblob-check-4.1 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-4.1.3-1.extras.tar.bz2 mirror://gentoo/genpatches-4.1-7.base.tar.xz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	adcd0a7bbb205c648e9cde3dd32126dc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	4756de53ea4d40471a582e898815a5c8	python-utils-r1	df6eb914b4b2d70d9c5e7c9331437c52	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=33f0efbc6bc3141384d024c3105ee409
--- a/metadata/md5-cache/www-apps/nikola-7.2.0
+++ b/metadata/md5-cache/www-apps/nikola-7.2.0
@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/N/Nikola/nikola-7.2.0.tar.gz
 _eclasses_=distutils-r1	715b22a21726d3fd76b17e007c5daf5f	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	23846c6ba39f6655e2027001eeed8e81	python-utils-r1	df6eb914b4b2d70d9c5e7c9331437c52	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=a3a9678ceaaf2197cac8f1ec32df73ef
+_md5_=852bce0c8441880a07aea585b28c7077
--- a/metadata/md5-cache/www-apps/nikola-7.3.1
+++ b/metadata/md5-cache/www-apps/nikola-7.3.1
--- a/metadata/md5-cache/www-apps/nikola-7.5.1
+++ b/metadata/md5-cache/www-apps/nikola-7.5.1
--- a/metadata/md5-cache/www-apps/nikola-7.6.0
+++ b/metadata/md5-cache/www-apps/nikola-7.6.0
@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~yngwin/distfiles/a-study-in-scarlet.txt mirror://pypi/N/Nikola/nikola-7.6.0.tar.gz
 _eclasses_=distutils-r1	715b22a21726d3fd76b17e007c5daf5f	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	23846c6ba39f6655e2027001eeed8e81	python-utils-r1	df6eb914b4b2d70d9c5e7c9331437c52	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=4afc46121c9fe8891dec12e3d82f6c87
+_md5_=ec97ab87d3aa980dbb2190916156b18a
--- a/metadata/md5-cache/www-apps/nikola-7.6.1
+++ b/metadata/md5-cache/www-apps/nikola-7.6.1
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@ -1 +1 @@
-Sun, 26 Jul 2015 17:36:53 +0000
+Mon, 27 Jul 2015 04:06:56 +0000
--- a/metadata/timestamp
+++ b/metadata/timestamp
@ -1 +1 @@
-Sun Jul 26 17:36:49 UTC 2015
+Mon Jul 27 04:06:52 UTC 2015
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@ -1 +1 @@
-Sun, 26 Jul 2015 18:00:01 +0000
+Mon, 27 Jul 2015 04:30:01 +0000
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@ -1 +1 @@
-1437932102 Sun 26 Jul 2015 05:35:02 PM UTC
+1437969901 Mon 27 Jul 2015 04:05:01 AM UTC
--- a/net-misc/mosh/Manifest
+++ b/net-misc/mosh/Manifest
@ -1 +1,2 @@
 DIST mosh-1.2.4.tar.gz 283047 SHA256 e74d0d323226046e402dd469a176075fc2013b69b0e67cea49762c957175df46 SHA512 f7505faffdc8da734179b37339b554f83cbf5450b251cd2aa50d63cd6e4cbefa0da17a1c1b2a61858735ac9e5cee5841ed20e81e244380f5f9a02af1b87199cc WHIRLPOOL b7fe6c87deb139faa4c6542b8de8bb8356e00889a8fc5a9a4d9609312f1654720eda0bdf9db97f48ccf6f15e6b4b2cd9c8d5105e84177a7ce0d3d36923a15e34
+DIST mosh-1.2.5.tar.gz 308857 SHA256 1af809e5d747c333a852fbf7acdbf4d354dc4bbc2839e3afe5cf798190074be3 SHA512 6a5a42e5ed3f265bc8bee045340a59f604ab8f08b041573264f5679c29678e84d101537aa2d856923eee8d0a0f9c052dc81cfbfa50ce12bd0eeddc5c8f1fc3ae WHIRLPOOL df91c18f4f68250fbb91d79b3072f594adb829f46d4228c965082883ee71401d80efef06ceb4662686eda3bdccb43cede365a1cef4c099efe9c41f775b4fdd8c
--- a/net-misc/mosh/files/mosh-1.2.5-git-version.patch
+++ b/net-misc/mosh/files/mosh-1.2.5-git-version.patch
@ -0,0 +1,16 @@
+--- mosh-1.2.5/Makefile.am
+++ mosh-1.2.5/Makefile.am
+@@ -8,12 +8,7 @@
+ 
+ VERSION:
+ 	@echo @PACKAGE_STRING@ > VERSION.dist
+-	@set -e; if git describe --dirty --always > VERSION.git 2>&1 && \
+-		[ -z `git rev-parse --show-prefix` ]; then \
+-		if ! diff -q VERSION.git VERSION > /dev/null 2>&1; then \
+-			mv -f VERSION.git VERSION; \
+-		fi; \
+-	elif ! diff -q VERSION.dist VERSION > /dev/null 2>&1; then \
+	@set -e; if ! diff -q VERSION.dist VERSION > /dev/null 2>&1; then \
+ 		mv -f VERSION.dist VERSION; \
+ 	fi
+ 	@rm -f VERSION.dist VERSION.git
--- a/net-misc/mosh/mosh-1.2.5.ebuild
+++ b/net-misc/mosh/mosh-1.2.5.ebuild
@ -0,0 +1,61 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mosh/mosh-1.2.5.ebuild,v 1.1 2015/07/26 18:16:50 xmw Exp $
+
+EAPI=4
+
+inherit autotools bash-completion-r1 eutils vcs-snapshot
+
+DESCRIPTION="Mobile shell that supports roaming and intelligent local echo"
+HOMEPAGE="http://mosh.mit.edu"
+SRC_URI="http://mosh.mit.edu/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos"
+IUSE="+client examples +mosh-hardening +server ufw +utempter"
+REQUIRED_USE="|| ( client server )
+	examples? ( client )"
+
+RDEPEND="dev-libs/protobuf
+	sys-libs/ncurses:5
+	virtual/ssh
+	client? ( dev-lang/perl
+		dev-perl/IO-Tty )
+	utempter? ( sys-libs/libutempter )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	# avoid sandbox-violation calling git describe in Makefile
+	epatch "${FILESDIR}"/${P}-git-version.patch
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-completion \
+		$(use_enable client) \
+		$(use_enable server) \
+		$(use_enable examples) \
+		$(use_enable ufw) \
+		$(use_enable mosh-hardening hardening) \
+		$(use_with utempter)
+}
+
+src_compile() {
+	emake V=1
+}
+
+src_install() {
+	default
+
+	for myprog in $(find src/examples -type f -perm /0111) ; do
+		newbin ${myprog} ${PN}-$(basename ${myprog})
+		elog "${myprog} installed as ${PN}-$(basename ${myprog})"
+	done
+
+	# bug 477384
+	dobashcomp conf/bash-completion/completions/mosh
+}
--- a/net-misc/sks/files/sks-1.1.5-disable-warn-error-a.patch
+++ b/net-misc/sks/files/sks-1.1.5-disable-warn-error-a.patch
@ -0,0 +1,29 @@
+From 5142992b465e87181a4674ac614bf7d2fd7110c4 Mon Sep 17 00:00:00 2001
+From: Kristian Fiskerstrand <kristian.fiskerstrand@sumptuouscapital.com>
+Date: Sun, 26 Jul 2015 21:25:53 +0200
+Subject: [PATCH] (Makefile) Disable warn-error A
+
+warn-error A is set for development versions (tagged with +) upstream,
+however it is not intended to actually be fatal errors for released
+versions. We want to keep EdDSA support, i.e it is actually one
+commit past 1.1.5, so just disabling making warnings fatal.
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index 543c531..d4a1222 100644
+--- a/Makefile
+++ b/Makefile
+@@ -49,7 +49,7 @@ SKSVS=$(shell grep 'version_suffix = "+"' common.ml)
+ ifeq ($(strip $(SKSVS)),)
+ WARNERR=
+ else
+-WARNERR=-warn-error A
+WARNERR=
+ endif
+ 
+ CAMLP4=-pp $(CAMLP4O)
+-- 
+2.3.6
+
--- a/net-misc/sks/sks-1.1.5-r1.ebuild
+++ b/net-misc/sks/sks-1.1.5-r1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/sks/sks-1.1.5-r1.ebuild,v 1.1 2015/02/02 23:18:26 k_f Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/sks/sks-1.1.5-r1.ebuild,v 1.2 2015/07/26 19:32:50 k_f Exp $

 EAPI=5

@ -59,6 +59,7 @@ src_prepare() {
 		sks_build.sh || die

 	epatch "${FILESDIR}/${P}-eddsa.patch"
+	epatch "${FILESDIR}/${P}-disable-warn-error-a.patch"
 }

 src_compile() {
--- a/net-misc/tlsdate/Manifest
+++ b/net-misc/tlsdate/Manifest
@ -1,6 +1,7 @@
 DIST tlsdate-0.0.1.tar.gz 10062 SHA256 2bdf50aeae8508cff9badec020c2d8063e7686069e4a9a2809c075018c6ce5f7 SHA512 5169b8f2c399bb286f4983e73b2a095e17406b516cc1287016fa581277abd0e38d314972bff456af0162c1970b60909d05e7707ceeeb2be3432fb735a4a6bd69 WHIRLPOOL 2a1980c9d996977580fc7ba108655ea54fd890b132bf37264d2f1141f0eec0c8e82c1bec25186fd6ab5a88472ffe936541a780acb5719f99a766561ac862a7ec
 DIST tlsdate-0.0.11.tar.gz 263961 SHA256 7293689ce85973b5b10fee946f09cc35cb697a46d4e1c14bbc218a74d2c9a90f SHA512 a1c4ff0dbf4513a6dfc15f0d1bbbfe8702333a78b2b295947559b7569389527da4b6cf4e0f4ad9887fecdfab0f1b952522eeabe622a17db65d4f0f74cd1026f6 WHIRLPOOL f9f1b810734750bae0813981e4623c2ca2aab65455e5fd4af02d90a0f14422b9872af205291dcd917e313c8b247e10a19cc084593c59a0b18384ca50eb388d9f
 DIST tlsdate-0.0.12.tar.gz 264156 SHA256 15cf5a86258fa17afe15cc6ea0c87d94caeafe3d77827fea0f358bac734f13e9 SHA512 c16ab3c86514f905841c14ec7b6544ecd6b94af26f4468a7ab923fae8971b77e5c2995fff66979c9c5ada117bb546df7c44378790b8a7b854b028d8769cf4e66 WHIRLPOOL 30e8bdaf89cd1cc0ef225ab5cc5e18322948b929d16495d3dd2af10558fd9e472d1703a6152349d51804e4143d580fc5bdf80e7272cfe11b003999493a5683f8
+DIST tlsdate-0.0.13.tar.gz 264228 SHA256 482640a5efb8489f287da1018176fb1196adf7cb1b81ac0c7f2b419b43d44258 SHA512 9c4fd51439976a8541fdf1bb70afa5333b43b2e43b801a65b3b1ac3e4a437fd3021ef2aaeeb13fc1ba63ccd119f6eff4c10e3a5a28cf0cfd96bbc7a174dbb789 WHIRLPOOL db91755d4751e64ca6285c9f1492d1b82a06f97921a47168398377818407efe6a0fcb901ef93272f0ff66121893873bb360868207998d054c5a550734b05db06
 DIST tlsdate-0.0.4.tar.gz 198005 SHA256 46d6caf123240aff7fd9e162582578b961a556dba2fc6cc3f6dede5c7cd48e0d SHA512 a84e599a823a00d667f9025ffc1c3bd15cdb5a55a95fcec0634da4d2f1bb9ad9de7f6ea64475ab14179a281b797ecd9854b5e40f9890a59a6f56154e7dcd2830 WHIRLPOOL ef5636819469d781d3b64684bbdb6e19567982658c068f32e850ec38f050b449a3dc440fdc77882a24ce19587c2db1583ed223535d8f066c6e2a2152f9383061
 DIST tlsdate-0.0.5.tar.gz 205288 SHA256 00d988d004e207b19e9a4fb7090f111ea491b8a7e525690bfba6d4a13bb6af80 SHA512 ea3ed703076cfb94c3ce2e9670b9621ae620d2a87963948b62ec6d2dd37586bfee02dc921dde163964d508ed624336f426cc88d30ba440d691035f5df2872c2b WHIRLPOOL 4d0d6d0db20cbeaac27227aea65d1c186f1e6bd7f1593e9b44d351b0eb37e24d637c4518c4e66755fad7ad33a0e0b998cc3c63a0fd65f6ca2a1154879001857c
 DIST tlsdate-0.0.6.tar.gz 211400 SHA256 c1f8518216f3fcfb8b19a2caafea555098f907ec60c76f142e839fdede910d18 SHA512 03608e65421fb709a2b0014918f911b5261e5fdba401908e45d2986c87f69e45f6dc3b9d71df18bedce321e573574221849bc6e9f277cbdfcf8b20a536d978f9 WHIRLPOOL 39b2b4d84631007f59b18ca293f920ffeb9520cdfeba71003dcb1d89e0113feab55f1edc14d9c7ccafdf50a989a6eab6cfe0931577c4167076a65370d541ae64
--- a/net-misc/tlsdate/tlsdate-0.0.13.ebuild
+++ b/net-misc/tlsdate/tlsdate-0.0.13.ebuild
@ -0,0 +1,66 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tlsdate/tlsdate-0.0.13.ebuild,v 1.1 2015/07/27 02:59:28 vapier Exp $
+
+EAPI="4"
+
+inherit autotools vcs-snapshot user
+
+DESCRIPTION="Update local time over HTTPS"
+HOMEPAGE="https://github.com/ioerror/tlsdate"
+SRC_URI="https://github.com/ioerror/tlsdate/tarball/${P} -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~x86"
+IUSE="dbus +seccomp static-libs"
+
+DEPEND="dev-libs/openssl
+	dev-libs/libevent
+	dbus? ( sys-apps/dbus )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	# Use the system cert store rather than a custom one specific
+	# to the tlsdate package. #534394
+	sed -i \
+		-e 's:/tlsdate/ca-roots/tlsdate-ca-roots.conf:/ssl/certs/ca-certificates.crt:' \
+		Makefile.am || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-silent-rules \
+		$(use_enable dbus) \
+		$(use_enable seccomp seccomp-filter) \
+		--disable-hardened-checks \
+		--without-polarssl \
+		--with-unpriv-user=tlsdate \
+		--with-unpriv-group=tlsdate
+}
+
+src_install() {
+	default
+
+	# Use the system cert store; see src_prepare. #446426 #534394
+	rm "${ED}"/etc/tlsdate/ca-roots/tlsdate-ca-roots.conf || die
+	rmdir "${ED}"/etc/tlsdate/ca-roots || die
+
+	newinitd "${FILESDIR}"/tlsdated.rc tlsdated
+	newconfd "${FILESDIR}"/tlsdated.confd tlsdated
+	newinitd "${FILESDIR}"/tlsdate.rc tlsdate
+	newconfd "${FILESDIR}"/tlsdate.confd tlsdate
+
+	insinto /etc/dbus-1/system.d/
+	doins dbus/org.torproject.tlsdate.conf
+
+	use static-libs || \
+		find "${ED}"/usr '(' -name '*.la' -o -name '*.a' ')' -delete
+}
+
+pkg_preinst() {
+	enewgroup tlsdate 124
+	enewuser tlsdate 124 -1 /dev/null tlsdate
+}
--- a/net-misc/tor/tor-0.2.6.10.ebuild
+++ b/net-misc/tor/tor-0.2.6.10.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.2.6.10.ebuild,v 1.4 2015/07/25 12:30:28 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.2.6.10.ebuild,v 1.5 2015/07/26 23:32:39 blueness Exp $

 EAPI="5"

@ -26,6 +26,7 @@ DEPEND="dev-libs/openssl:=
 	nat-pmp? ( net-libs/libnatpmp )
 	scrypt? ( app-crypt/libscrypt )
 	seccomp? ( sys-libs/libseccomp )
+	systemd? ( sys-apps/systemd )
 	upnp? ( net-libs/miniupnpc )"
 RDEPEND="${DEPEND}
 	selinux? ( sec-policy/selinux-tor )"
--- a/profiles/desc/linguas.desc
+++ b/profiles/desc/linguas.desc
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/desc/linguas.desc,v 1.90 2015/05/20 05:04:42 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/desc/linguas.desc,v 1.91 2015/07/26 20:54:56 rhill Exp $

 # This file contains descriptions of LINGUAS USE_EXPAND flags.

@ -38,7 +38,9 @@ ca - Catalan locale
 ca@valencia - Catalan locale (Valencia)
 ca_ES - Catalan locale for Spain
 ca_XV - Asturian and Catalan locale (Valencia)
+ckb - Kurdish (Sorani)
 cmn - Chinese (Mandarin) locale
+co - Corsican 
 crh - Crimean Tatar (Crimean Turkish) locale
 cs - Czech locale
 cs_CZ - Czech locale for Czech Republic
@ -93,6 +95,7 @@ fo - Faroese locale
 fr - French locale
 fr_CA - French locale for Canada
 fr_FR - French locale for France
+fur - Friullian
 fy - Frisian locale
 fy_NL - Frisian language locale for the Netherlands
 ga - Irish locale
--- a/profiles/targets/desktop/kde/package.use
+++ b/profiles/targets/desktop/kde/package.use
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/targets/desktop/kde/package.use,v 1.9 2015/07/01 15:25:25 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/targets/desktop/kde/package.use,v 1.10 2015/07/26 21:36:03 mgorny Exp $

 # Required by kde-base/pykde4
 dev-python/PyQt4 script sql webkit
@ -25,3 +25,6 @@ dev-qt/qt-mobility multimedia

 # Required by app-office/libreoffice
 media-libs/phonon designer
+
+# Enable crash-reporter here instead of in ebuild
+kde-apps/kdebase-runtime-meta crash-reporter
--- a/profiles/targets/desktop/plasma/package.use
+++ b/profiles/targets/desktop/plasma/package.use
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/targets/desktop/plasma/package.use,v 1.9 2015/07/01 15:25:25 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/targets/desktop/plasma/package.use,v 1.10 2015/07/26 21:36:03 mgorny Exp $

 # Not required, but makes life easier with Qt; bug 457934
 app-arch/unzip natspec
@ -38,11 +38,12 @@ kde-apps/kde4-l10n minimal
 kde-apps/kdeartwork-meta minimal
 kde-apps/kdebase-kioslaves minimal
 kde-apps/kdebase-meta minimal
-kde-apps/kdebase-runtime-meta minimal
+kde-apps/kdebase-runtime-meta -crash-reporter minimal
 kde-apps/kdesu -handbook
+kde-apps/solid-runtime -bluetooth
 kde-base/baloo minimal
 kde-base/kactivities minimal
-kde-base/kde-meta minimal
+kde-base/kde-meta -kdepim minimal
 net-libs/libkpeople minimal
 sys-auth/polkit-kde-agent minimal

--- a/sys-devel/binutils/Manifest
+++ b/sys-devel/binutils/Manifest
@ -8,4 +8,6 @@ DIST binutils-2.24-patches-1.4.tar.xz 17488 SHA256 f018f140a52cddb1e4619b5caf4b4
 DIST binutils-2.24.tar.bz2 22716802 SHA256 e5e8c5be9664e7f7f96e0d09919110ab5ad597794f5b1809871177a0f0f14137 SHA512 5ec95ad47d49b12c4558a8db0ca2109d3ee1955e3776057f3330c4506f8f4d1cf5e505fbf8a16b98403a0fcdeaaf986fe0a22be6456247dbdace63ce1f776b12 WHIRLPOOL 619634dfdc73b8f6e9933b4642f5f9faf147c388a6d39283cd7639d83f3d7a601981cf49a787c43c17a942c563f24dc8dcc682138b5d3102a5650e1b9d15bd50
 DIST binutils-2.25-patches-1.1.tar.xz 11440 SHA256 fb357d6a6fcb348584f30236c5c541d946496472c6bbd45e72d2a60e1182fbce SHA512 a236973ebfd72a069fbb578206baef0d35e12fe7fd19dd5a8fe002088db86d15b149b3de3dfc88a7e58c39df1c354a1caf3e20efc757c080301fa29d083020d3 WHIRLPOOL 03f6f7217c38c856f475cbb561e538d6a8a4368f420295b914fa77d1fc8e05bb96e6678fcd5100290be5d3ab3859182e901387d8ff58014acee0e2a957e27e34
 DIST binutils-2.25-patches-1.2.tar.xz 16480 SHA256 c5a65aefaf561e592961d22cf88e57dd304a73d3643581414b5a7c14667eef30 SHA512 5a8072c57ce393a50de8770885d6740b8835d656e357a12caf67c4ffbfce228f9a53ea0861199a1a08e2ca724702d0e013f3a9787b15de21178e99263fc43292 WHIRLPOOL 691cf14bfb2c1bb144db29917dea791c18eeb192f61325ef3265fed6c4ad870e23485c3505f74a688158bf862d6539aa5f036400dcf14b9c05a09327ab871133
+DIST binutils-2.25.1-patches-1.0.tar.xz 16472 SHA256 51ae9e098d7cfd0ae6db4971939062d4051077b1d743263f2d4c621591303e14 SHA512 1743969d531d18e5d458a165f1b05b3c3253b062a8908b722e11ed82144598eef0983d8e1bb4f132ad80b534a0d6b37cc2ffa0575e1ec303219d1e43d5f30f26 WHIRLPOOL 1afcde32383213cce48116dc5161da535372d9104acfb9b3b893859f58800d0833dc3d041492250e4ec9d981a98c2af4fa9f07aba3ca1f1770d334199bf34855
+DIST binutils-2.25.1.tar.bz2 24163561 SHA256 b5b14added7d78a8d1ca70b5cb75fef57ce2197264f4f5835326b0df22ac9f22 SHA512 0b36dda0e6d32cd25613c0e64b56b28312515c54d6a159efd3db9a86717f114ab0a0a1f69d08975084d55713ebaeab64e4085c9b3d1c3fa86712869f80eb954d WHIRLPOOL daa804331ee880296c2fe29fd9b8a52cc695629d4bbe0b9889d96ffc54d330f00fac3f3cb12b3aaf6b7505521ef499c53760912cd7c9bb54f2d5e288224bd1eb
 DIST binutils-2.25.tar.bz2 24049133 SHA256 22defc65cfa3ef2a3395faaea75d6331c6e62ea5dfacfed3e2ec17b08c882923 SHA512 49438970642f379978aba988e3d2e7b63dab6fd0b46d91f4100f083e87a84d242089daca58572245fe620457a77bbbe2d78588ff3fb79314e500d1a39bf96f30 WHIRLPOOL 92f963d6ffe7d2378726cb080e893f8c58c8b6de030e78da488d8c3fd157e064a90b62d9bd2f305707758aa016a9e48f0953425828a2a0432ddee8ffae89585f
--- a/sys-devel/binutils/binutils-2.25.1.ebuild
+++ b/sys-devel/binutils/binutils-2.25.1.ebuild
@ -0,0 +1,11 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils/binutils-2.25.1.ebuild,v 1.1 2015/07/27 03:27:18 vapier Exp $
+
+EAPI="4"
+
+PATCHVER="1.0"
+ELF2FLT_VER=""
+inherit toolchain-binutils
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd -sparc-fbsd ~x86-fbsd"
--- a/sys-kernel/git-sources/Manifest
+++ b/sys-kernel/git-sources/Manifest
@ -1,3 +1,4 @@
 DIST linux-4.1.tar.xz 83017828 SHA256 caf51f085aac1e1cea4d00dbbf3093ead07b551fc07b31b2a989c05f8ea72d9f SHA512 168ef84a4e67619f9f53f3574e438542a5747f9b43443363cb83597fcdac9f40d201625c66e375a23226745eaada9176eb006ca023613cec089349e91751f3c0 WHIRLPOOL 85fcfdb67ea7f865272a85d3b4c3ec1f5a1267f4664bf073c562bb3875e9d96ad68486259d8866a9aced98c95de16840ec531d89745aec75b7315a64ebe650b8
 DIST patch-4.2-rc2.xz 7413044 SHA256 57be3181b43f2440fa223fc2651b933665b895b0ccaed65b43fed1fb1a7af7bc SHA512 6d7e276c469b5c4e7e4116879ca2fcbad53a00cb94416d1b1ec0f90e76b418cce71cf574db56ab4d787a367c457c5bc4cc3c41d5bdf6d822cf5ae18fcd6adab1 WHIRLPOOL e7f13df6879c65f72950a355593e5cfe3a3b12dd8ae7a5d8366c16b2d5b158f7747b1cff5b6212bd6a8d3df5657f0059c72e66c8d800d7e7a981c4ca7bc7cfbf
 DIST patch-4.2-rc3.xz 7487512 SHA256 b9915aba62e3efd7500887c38c4fd69faccb9b64a0d5d3d128618b923846f08e SHA512 ef721717d028ddd0522b07920c130838da8de665adf0e2f4a55b663a671b4bfdaa4d22e36718e024cdee57b8b672ef75b7896a6d7c3a974a31e99c4ada64e594 WHIRLPOOL d268ff86a69a4f1da5e2b3f42437cfc66c72e5b197641a3a9687c70b98ea9a035fddcaa759823eb8c286a4f8dd06a357959c91857eb22325b97fbfdf58ba97dc
+DIST patch-4.2-rc4.xz 7529356 SHA256 91ec7a4096cf6496b5ad5de01a06b6b14ffab616d4271b1301357927d06f9857 SHA512 6bad8b6349368c87d5c378df514fa4438c2691907a82f3fda770b85b1f2c6e5cf26e85718876ad56c2b69e1ebc9559bd80fb90875b4af4fe3382bf67500266a1 WHIRLPOOL 94094fb4ea61df0865c0eb5fd37092834c92acdffb72cf97143295ab9343e4f2eebeead92fbac00b0d6b2d31c90e951fc592987a902f97a52a8a959cfadcad9c
--- a/sys-kernel/git-sources/git-sources-4.2_rc4.ebuild
+++ b/sys-kernel/git-sources/git-sources-4.2_rc4.ebuild
@ -0,0 +1,39 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/git-sources/git-sources-4.2_rc4.ebuild,v 1.1 2015/07/26 20:52:49 mpagano Exp $
+
+EAPI="5"
+UNIPATCH_STRICTORDER="yes"
+K_NOUSENAME="yes"
+K_NOSETEXTRAVERSION="yes"
+K_NOUSEPR="yes"
+K_SECURITY_UNSUPPORTED="yes"
+K_BASE_VER="4.1"
+ETYPE="sources"
+CKV="${PVR/-r/-git}"
+
+# only use this if it's not an _rc/_pre release
+[ "${PV/_pre}" == "${PV}" ] && [ "${PV/_rc}" == "${PV}" ] && OKV="${PV}"
+inherit kernel-2
+detect_version
+
+DESCRIPTION="The very latest -git version of the Linux kernel"
+HOMEPAGE="http://www.kernel.org"
+SRC_URI="${KERNEL_URI}"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+K_EXTRAEINFO="This kernel is not supported by Gentoo due to its unstable and
+experimental nature. If you have any issues, try a matching vanilla-sources
+ebuild -- if the problem is not there, please contact the upstream kernel
+developers at http://bugzilla.kernel.org and on the linux-kernel mailing list to
+report the problem so it can be fixed in time for the next kernel release."
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	>=sys-devel/patch-2.7.4"
+
+pkg_postinst() {
+	postinst_sources
+}
--- a/sys-kernel/hardened-sources/Manifest
+++ b/sys-kernel/hardened-sources/Manifest
@ -2,26 +2,34 @@ DIST deblob-3.14 121249 SHA256 980400e0db952ccdb5a507f99444330af893ed0f8a7a05291
 DIST deblob-3.18 127087 SHA256 c720eabb3911f8dfa4398c4250853df4633018abebc01a509ee4a283c3e00941 SHA512 6fe33762ba19aad7ff891b7b805cc26f6e2926f5e40c92fa45bc7f31bdeb5c8fc42b97e5d37d71b9422da239c7c54abd25f1fa2fa1e5733c6053abbf4c9e9011 WHIRLPOOL c351a3ae15c59081fca69c1b5d9b9de10f024eb01f1426722a0d6ccb7caa34330be42897cd85cf19b22ff876352b0cec1c19707edc81c4cb01ad9c1df2e3d831
 DIST deblob-3.2 107195 SHA256 2e8a59bf7f18425652050a1b9f2fe2e8d1f09b50b33ee633771ac03943345e81 SHA512 8de24b5dade9256caf20215692f2e53e403f99d3d1e81b301263ae5f8ce667780a1df7917094155fb47210f22e7839e3d08e4f3a84c86ae6bf582227b938229d WHIRLPOOL f7abda0702c9b038ee82b462d1de30bd21b28d591058f417aa399581e93ba35638f476544e6acfb12760d672dab067916e4c68275c91f4c01d3bef7f685ed67b
 DIST deblob-4.0 129952 SHA256 c3d8e9a9728d5c1fc11b1112f5343b14e46a8cf2880e10399a840bc94b6e2ad3 SHA512 055205394487dbc0022f9531fb76d0be51ca3ec4e119232cc0972790d1532c680e1367eb36a9f40529f0ab1d76f64240b1e8a07cb02d3605d594c06e3547f1bb WHIRLPOOL db32b66231e552ac6e3651152eb2b3212ef0863842cd352bd2f1b1080b9ea5543f1f7ed0e7958a9f4b115559233dc1817560e896c789378ea7b68b527b721ca8
+DIST deblob-4.1 130695 SHA256 2888a5a3b5e8e9ec242e4d702582fa1d739a1274fcd94643a9fb3516a210a8a7 SHA512 b861b9b53f9295e5e993784031ce57cf8cddc418184ec00c28ed92c9e7660406e0ede581a93d0def36e7847b8e068c8ca6c4dfdd65c15cb174d6c5803c16214a WHIRLPOOL b90f55dd8702eb254968ed7689b50859833ed362e9aa1720ade96aa1f6f84e8f90f5d1eee034c8535e8bf767c0b5f8b0bc559219e8d81d4c6ed53bd5cfe5e65e
 DIST deblob-check-3.14 613905 SHA256 4c69ea1c225b1a84c41e75392dcaa94f77dd8e647aff3afe52f1ab16ac99c5e5 SHA512 4dd7e785727ce29d78f5f68431fcb6ea9dfda5221dc8e699f40d13e3c85411707b13c288d23f8baa6b3c47f5a67ac58da0a7f1a51c4d9fdda82a7428ead88cf4 WHIRLPOOL de1b67955662f072193f58b7e7dbd98c6680958c2d65632bfb831dc0681945a4d1c27abe978e6ee687ae8f48773eb71c2f9026f461377b28235e7f7e39832a67
 DIST deblob-check-3.18 654232 SHA256 30f22602b6ddf2cbccc16ef25fdc4d92755f3972e1c671d7cab8b9d6865eb155 SHA512 2cff9abef479a55dd6a0699371be8227ba63b18da1fb153d5df382e0a5e4f1b745b7de256a367a36efa9d12e2aad5622cc288efef009feebf81c108dbef4fe16 WHIRLPOOL e92927ad1565e80ce87e8bda372f8f7eb42bc0f47ad9b19fe5cf737903b2021fd6e3756e8d22b70f3037a46c254fec8b7285b37beb10795ccb4ca99d38876f8c
 DIST deblob-check-3.2 557345 SHA256 60d05db20e7b50919ca44487d05e8faa9cca830318bd8d96625f0f75b252eeed SHA512 6b857380d495261c4d356639157f99f3ca3412388fd3b1c72b566c3bb6453c5a22ab7716e3b24e64a9b63dab912b07baccccfd0fca806ac0e0620efeef777b6a WHIRLPOOL 877c2c9b813466f9aa5cfecdc9ab93247bd2cdead457c9e0bd97da49d042d0a52262f9b4f8e9c83e397b57c5bb5a8fe2b61bb5f44d5a178a579cc9fff990941a
 DIST deblob-check-4.0 670921 SHA256 042b511913187672d9a0512765e662ba5d4283812ebebf424f778eb08fa359bc SHA512 a27e3530cd3028041445cf8c5f49ad7827a7cf2b511de28851d2b09c28347cf2be667a7494bd698939c007fb77595699c1f61fb76249ae87658e1d12e855d2a1 WHIRLPOOL 953d8e6eed10971ed67a4573449b9a536ad693a2130153a6fc7cc9ea3e2daea21ca002c8df80126f7e318f75bec82c3f6e99fe43155817e2e2a52b5949dc5d2d
+DIST deblob-check-4.1 674781 SHA256 54aa33e23a31ead6f982b830be86003c306b88f0d0a9f96c7dc66fe7cd274acb SHA512 51fe9d70d723992aaf70f8bfcfcc12ecfedd7a039402ddae07858fb087693b00cd80d1e0e1a5053e049f2a2b8c58ed23e4598e2dae902c4999999c08bc2eeb33 WHIRLPOOL d2c22280e12863793f8e866b126be53ee10d564373addfe9399b2afe22dd7584513c050f334ea08e6d63dd27a1574f2754456bad9d0a42e8c8d9995eec27aed0
 DIST genpatches-3.14-39.base.tar.xz 823976 SHA256 cb3ae324d5587c1343680bd0edc42bca48b4c4068f0a34c69883e0f184b061df SHA512 69a750f76fcc866c0af2915343bc20d90ff3a8047d41ef343b83b1765be5a4f8cef14f20e9c5d15433b00b394088f8c84425693496e1351dcefa4c05ff5e47e8 WHIRLPOOL a30e74581ea8a9f5d79a6b3601303bdd651a2f347c372b26891904c9bb5359a31309d904e2d9462a739584c03d88358c238719f824b08a1bd672a012d6a15b06
 DIST genpatches-3.14-49.base.tar.xz 959560 SHA256 671097dec0eac493698a4bf773e96d2bfb6f5d460642f49f0117da2cb76e51b3 SHA512 2fb24dee399e2e574f19e1b0e88f7ce397101ed34236403a5c1e47a272f89e7bfbb399c136d4d53e8211f865c757b55402a76ef5678a8e5f6ceedced5dad2c62 WHIRLPOOL 050716ff15a0a844bde931cbd9b5110e25686b1adbcf2bb4b9ca88d37b3783957450fdb31c2087591a14f22fcd91f4f2008a417c86802948f44a76c8851c21f3
 DIST genpatches-3.14-52.base.tar.xz 984136 SHA256 01318999e36187e937f9108fb7b5642f05ffdf61946981cc2d3a35f2c84139ae SHA512 e691210e2ae8184e6cdbb7dd381dfa850189aa7adb58bb33f6f0c6f9cb35e04097b97ef7ec5a0806c70d4d6aa4fae39cd6fe74b04cac4aa117340bc93c785049 WHIRLPOOL f0ddafcdee7c2f7b90f2f94b859afed000d860d259fe059cb4916b1bb71ecf146c943d279ad8b00f6fcee33c0faca3fb2e0e5d9eaa69619dd1da487f2c25f583
+DIST genpatches-3.14-53.base.tar.xz 993468 SHA256 1787942a9d4aa6ee5b8e27c40320380c58e39c19179ea9114cae3f439551092d SHA512 7eeb1924211620ae9d656b05141d7b9de803c52631c1b230de349d6b867ad6bf19a468df96ff1a349362163ff28b7ddf776ac78ae5438f0f3b3701f11a5f3f10 WHIRLPOOL da3a93ba3542c33f7153f791b981ad10924220f4b5bf1e9ff450cec782ae75b87998588b03d6b53c9676559b7fbdd42d24764b74429d81798bba4e032fbf6463
 DIST genpatches-3.18-10.base.tar.xz 213444 SHA256 26876e79789ba2605fc8d6bbd2950fb53f7da8db726febb5636be453a0cbd36a SHA512 cb24ba1798a43fe71747b8332034ebe69c2b416b301913c2a12b02c2d826217453779a4a77fce8e943152f70d6cea34645effb903fa1301e02d6923581f7e3b5 WHIRLPOOL 6ee5eed82fe63d9d3fcd246d7eae7eb58b2d1a2ed8826c2d1effdb5ac54ef4314685eab28e6ed0f74c4cf3d57c1046c59cb14f702102288a45e7c5184ed7a2cd
 DIST genpatches-3.2-16.base.tar.xz 410332 SHA256 d3ad97b119c5b8cfd8e34f1cf118dc7d5bbe61fe908a5627f8ab6365517d7190 SHA512 6c917efbdd26dada3e68241c4d55833968e8ee7044ea7fa2edeffdd4d7eb0edac157057abb75da09ac6d2b5368d228ecd1c2ac6006a9d45b91dbb264eae33625 WHIRLPOOL 155a5b3297ec53a6bdb76e20c8c89d4f4c35ed2bb47e20281ce305bf9edd413e4d89168e250a699ace0561c151ef2f484c05e59013dbd971d43184c5f072a71a
 DIST genpatches-3.2-16.extras.tar.xz 16764 SHA256 c3f5adba6f1700c716354b91bc624115c6f5cae6f8fbdc51d07a76d4546bacaa SHA512 e3245c05f3385bb27852c00a39a898c91b3c0006e19c5db561f3e41f9bef7e97012ed29ddf9b0e2bd1ba1fa16590e516fb00ce754a84dd5c653c046b9f4e63f9 WHIRLPOOL 3c1ee6db88607ed91366067217d4a556fb5516ce8bee2859e97be7e214a05609e2d36ec27ec413154baa432a984f53cf69cfb94ae65ec4b8d2e9a86641d77a0b
 DIST genpatches-4.0-9.base.tar.xz 193344 SHA256 9d7c65367c1d2f24c6e4c8f8b4b9170a7ddeaa24d6563c5ba5dc41201a7b6e17 SHA512 646814e63b3b1d78adc172c6f8c0c2605cc9f368bb368be72e169049938617c5c6e738ddcfcbe1e10b58ccd3f9fa09984b03f70076ce0b15137f376594b9066a WHIRLPOOL 0eecbfe1b2b02f00edcab0c975b06bd69a5ff1032fe0c4249d79de555f92f2375d337b2417bddb566e9a1fc66859918b6cbfff6c2c73aea02818434213b0cda1
+DIST genpatches-4.1-7.base.tar.xz 59032 SHA256 9106e15001e0c286ef929d5e4505507ccdefb0aecdd094b73d57d587070d3288 SHA512 da1e3ef03874ab0fd3af811d6b72e791117dd7490ecbd8698e24e98424175c0ad7228182976fdadbc62a3ef69bf721f82d99cc1760417c4ba3401844fe3c8db4 WHIRLPOOL d3d3623112f118f98db870f48bc3181d6f510fdb4d916a88a832065a2e0df99c1bc5e04db6f7dd09c505f0253b76037965bbaa27103263dd95a713d0428db5ba
 DIST hardened-patches-3.14.35-1.extras.tar.bz2 869361 SHA256 c743b5951d08680567246533fef192a348ce6f4640580fc19471c05ce48f57fd SHA512 b5b7f9cc2b57d5f74ec5d71762593cbb6c7c1c1e65fe2577d8ca74d18b4331e97dfd9fa781670eddd209149a434db0da04e3b7ffc23350ac2d725db2355c5353 WHIRLPOOL 927ff1905bd7a55d6231891a5d3fc2b2701fcb836167f0da168529a34d4d64e3c6fcffe190827ec7572b68f61e310e4882bf883aba2f1d55781a8887d8be4c6b
 DIST hardened-patches-3.14.43-4.extras.tar.bz2 969523 SHA256 4aa9b820a1e302df33dfba574e609fe8ccd25143054124bcb7bb06ea19ca9f59 SHA512 52cf7cb51bec66d6732f391c2413a5ae7e748f1c4eea346737b885b4e1d937b0d8b5a0ce7cc0959526b774304f2372341bc4c2be583e77f854cc897c1bfb2480 WHIRLPOOL 8d7b1e965acfc68ae8b4d0d19168a1317ae0a0e4a1a75735ee9d54a356b3410312908ae83488cf1ddab238a5f63e5f36c7e286713b28e8ff820bf933b4b2904e
 DIST hardened-patches-3.14.48-1.extras.tar.bz2 997773 SHA256 e8be8af4006dde34d9174fa659c8cdccc836da340d17d6ccf0aced1f3ae4f1c8 SHA512 5c7f33594e5063f09d5d5cba75e0ca7d1d08d8cee8f104630ff376364fc340647a9a3d83107abc7d0775273a802b6f22b195df7df21fa0caa21ca070d1af075f WHIRLPOOL 3f050ba87cc7a44ec0c9e79f41f22ebc717e6fe4f822426371473dfbdac6327e600a855987b8af870f343cb41f9e437fc4427e1402e4677a46d7235b22507c09
+DIST hardened-patches-3.14.48-2.extras.tar.bz2 990225 SHA256 5732d8a2210e62e86df48db954b244bad051c12b9a60ab099b2bfba0423a5cbf SHA512 46417a9c349cf6aa2e63073a6b8023701754f967ca121603dfc167be72bc3f3809911c1b2284edbef6a2be372a98b9c9711801ad9ae51ca7df501b52933457d6 WHIRLPOOL f2a36553aa8745afe26d3cd18a923b169760aaa19c51b24f0c22c148b4474e321c48368a417067be86ec72973cb1f81f752c694393fb8ad1d841621aa273f74a
 DIST hardened-patches-3.18.9-1.extras.tar.bz2 896609 SHA256 8b587954838d063a97491cb0bd56bb82db1898f5a10b5a142a0b9175cec67610 SHA512 d24f4080ba0437939c296614659477aa3d535cb3f3c950cc2a695c3925c8a04cab543b1277e48ba05a6e58cd31762473ad5d2b54e9c5aaf5b1a1b46965a7166e WHIRLPOOL 73abf5b3c1c6b868b931357d11707b41a6d4bee8fd5e2d8306ee3830a0edd24f371159b8f8efbd2b1afbc21efb045e96b2994219d43ee7ab484116e86e136196
 DIST hardened-patches-3.2.68-1.extras.tar.bz2 2221390 SHA256 783fe31d10548f0d6e24c8613e97a63d7c35f4ba407239990ffdaf8ced9ba855 SHA512 3d232742b71c86359aed8f28198f9af0bc800197aed0ff5a14953dab0fdb0ce320a77d442f2109fbe3185512be3c7e12b4e3efe8cb432bfc3da4d7573e6a4197 WHIRLPOOL a4d495b49ef6c94d3290079b6c9209a82872ae24ba7405c57a2a8d5ac3a659d8cb388770491ff0666446134a75bb064917eee71d54a4d3ee35de4a0df7fc0e82
 DIST hardened-patches-3.2.69-11.extras.tar.bz2 2293649 SHA256 98b7cf52c368d3f54330f8a821bd83e9d1aa96025438640d5657e599191282be SHA512 6ae2fa4a0b1d89d84f166af6347aad7179eb6031efe6bd9fb6fcd96ac6a4f9597ccdc34661c0ac92b85b24818a2bb99eeac4c4728587853255c81c98969a8c58 WHIRLPOOL 997f47848a14a512e15d7b3635c1c924000dcd9ce8992aac312764bc065474beebf5de53561eb3a1b72feb4f6a176a4500dd054b32d5f4b35eee4e3a9c7824df
+DIST hardened-patches-3.2.69-13.extras.tar.bz2 2320523 SHA256 532536303b89962f4687de07715e2bcc0733858df56cccdef42915914bfbfa4d SHA512 d0ed3a9e8ffb936726b753ce43b1406162a16ea29703d8f34904878af1b687160c766bdb34225149188e585df440d57f46725c62ebda25a5c0d8316fc2f3509d WHIRLPOOL 38cd562c26f7a7d7550d5242a412421649aeb8d9a0fdf33a94a2a833a72b643acb67793c39ef50df7eca334eb24a2cec7413ce490b6cf05b146bc273759198cf
 DIST hardened-patches-3.2.69-5.extras.tar.bz2 2288972 SHA256 34714276b7f676a6e8318419b9e01af1064442da70bc1b28d349f8c0d7efc951 SHA512 02ba31182d16588ecf503abd37a34675e1b6e35ceed5653a15bd63f2ee4f38946c6c6603e9428d2a4d3d0d186b954d20f7a5e75f0feea952c76ab8f9739ad635 WHIRLPOOL a708cfb3c4a764f2399c21a9380ac278b65d0280c8b05118c8ecf99a937e91a84e89c40f273f486da6e04aefcac737ee8f4b412418845237f65c2774ba24baf4
 DIST hardened-patches-4.0.8-1.extras.tar.bz2 1366743 SHA256 765a06197afb4b7f268778b5ba2a6ca438b20bf900ca97cbc17b47570cf1dd0e SHA512 782a7883e055173a1cf6be76e8d99a56757f5576c09fb80c295e6bc926d7dd8e6fbfc4fd09c38e0e95d4f0317808b68a9fbb0e9b59a9a3f27b89f906f375e619 WHIRLPOOL ea95c5d29801759d2ed247885095c914ee07c4b800cb9a2f5f1c4b7b79347d2853ae56f64ad732c6aa8972a43e8993fdcfabf5e244d5994fa7998a382faebfe7
+DIST hardened-patches-4.1.3-1.extras.tar.bz2 1358773 SHA256 d144fb7bca7d1ab580b4558b3a0dbb7e3269f14e0de52446afacd68dbbdd474b SHA512 da679f0d6b35441a0a455b85bb445ca9d66e7a526a5e8fa08b5467fe5616f2967f45df45dbc6f0180cfc0d809ec34f3af862fa264bff8cef6240487d3073e7e6 WHIRLPOOL e950fe193a8c26abe61cf2f76480242680660eb954f96fc30268e5a58c2ac9c94a8c4672c5524d655e8cabf6f267430dd4f6371c8f52a8f62f48f5df39079f90
 DIST linux-3.14.tar.xz 78399152 SHA256 61558aa490855f42b6340d1a1596be47454909629327c49a5e4e10268065dffa SHA512 5730d83a7a81134c1e77c0bf89e42dee4f8251ad56c1ac2be20c59e26fdfaa7bea55f277e7af156b637f22e1584914a46089af85039177cb43485089c74ac26e WHIRLPOOL 5ad07b78c362ba0b21c50b4abb99407cae06bd08576f3fd8f36047b01409eba096263208020da3dcad4977eefc61d66502276754097bc127635df1d7a5817d41
 DIST linux-3.18.tar.xz 80934708 SHA256 becc413cc9e6d7f5cc52a3ce66d65c3725bc1d1cc1001f4ce6c32b69eb188cbd SHA512 2f0b72466e9bc538a675738aa416573d41bbbd7e3e2ffd5b5b127afde609ebc278cec5a3c37e73479607e957c13f1b4ed9782a3795e0dcc2cf8e550228594009 WHIRLPOOL 81634af631b7d30ccd1f4798f96f44d9aa0ba6609b73f2747eb6aebaf7a99487fb2dbd45767605186182533cb222bfd9236e8dd5e11a04fdb67c211e4e0a91d6
 DIST linux-3.2.tar.xz 65065516 SHA256 dd96ed02b53fb5d57762e4b1f573460909de472ca588f81ec6660e4a172e7ba7 SHA512 77e9a52d78d6c8e951df1e166023eebe5defc5ef3c45d3ac84b613137b3c2e55cee5693d828ebd06c5034bd89ea2a5f862f55824f2b7839c9ad7212c81e3ecb0 WHIRLPOOL 7cc68baac4441740e2171fbbc4195ee6c0351de099aadaee8cb3487f6d1f8b7e1d3144ee54ba38dbd24d6be431a1ea3b921ffce82ff84df21a98da7bc61c1d17
 DIST linux-4.0.tar.xz 82313052 SHA256 0f2f7d44979bc8f71c4fc5d3308c03499c26a824dd311fdf6eef4dee0d7d5991 SHA512 ce13d2c1c17908fd9a4aa42bb6348a0cb13dd22e560bd54c61b8bfdf62726d6095f130c59177a2fe4793b7dc399481bf10d3556d1d571616000f180304e5a995 WHIRLPOOL c481256e23dc82209942d4f2fc9a94aa7fc4c3c69b05eaa041a58ca4bdc5781274ec4c49d597ccf94b634d61418ec578d20a6569c6c7052b4d3cf33611c99001
+DIST linux-4.1.tar.xz 83017828 SHA256 caf51f085aac1e1cea4d00dbbf3093ead07b551fc07b31b2a989c05f8ea72d9f SHA512 168ef84a4e67619f9f53f3574e438542a5747f9b43443363cb83597fcdac9f40d201625c66e375a23226745eaada9176eb006ca023613cec089349e91751f3c0 WHIRLPOOL 85fcfdb67ea7f865272a85d3b4c3ec1f5a1267f4664bf073c562bb3875e9d96ad68486259d8866a9aced98c95de16840ec531d89745aec75b7315a64ebe650b8
--- a/sys-kernel/hardened-sources/hardened-sources-3.14.48-r1.ebuild
+++ b/sys-kernel/hardened-sources/hardened-sources-3.14.48-r1.ebuild
@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/hardened-sources-3.14.48-r1.ebuild,v 1.1 2015/07/27 01:33:48 blueness Exp $
+
+EAPI="5"
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base"
+K_GENPATCHES_VER="53"
+K_DEBLOB_AVAILABLE="1"
+
+inherit kernel-2
+detect_version
+
+HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-2"
+HGPV_URI="http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-${HGPV}.extras.tar.bz2"
+SRC_URI="${KERNEL_URI} ${HGPV_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+UNIPATCH_LIST="${DISTDIR}/hardened-patches-${HGPV}.extras.tar.bz2"
+UNIPATCH_EXCLUDE="
+	1500_XATTR_USER_PREFIX.patch
+	2900_dev-root-proc-mount-fix.patch"
+
+DESCRIPTION="Hardened kernel sources (kernel series ${KV_MAJOR}.${KV_MINOR})"
+HOMEPAGE="http://www.gentoo.org/proj/en/hardened/"
+IUSE="deblob"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND=">=sys-devel/gcc-4.5"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+
+	local GRADM_COMPAT="sys-apps/gradm-3.1*"
+
+	ewarn
+	ewarn "Users of grsecurity's RBAC system must ensure they are using"
+	ewarn "${GRADM_COMPAT}, which is compatible with ${PF}."
+	ewarn "It is strongly recommended that the following command is issued"
+	ewarn "prior to booting a ${PF} kernel for the first time:"
+	ewarn
+	ewarn "emerge -na =${GRADM_COMPAT}"
+	ewarn
+}
--- a/sys-kernel/hardened-sources/hardened-sources-3.2.69-r12.ebuild
+++ b/sys-kernel/hardened-sources/hardened-sources-3.2.69-r12.ebuild
@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/hardened-sources-3.2.69-r12.ebuild,v 1.1 2015/07/27 01:30:54 blueness Exp $
+
+EAPI="5"
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras"
+K_GENPATCHES_VER="16"
+K_DEBLOB_AVAILABLE="1"
+
+inherit kernel-2
+detect_version
+
+HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-13"
+HGPV_URI="http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-${HGPV}.extras.tar.bz2"
+SRC_URI="${KERNEL_URI} ${HGPV_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+UNIPATCH_LIST="${DISTDIR}/hardened-patches-${HGPV}.extras.tar.bz2"
+UNIPATCH_EXCLUDE="4200_fbcondecor-0.9.6.patch"
+
+DESCRIPTION="Hardened kernel sources (kernel series ${KV_MAJOR}.${KV_MINOR})"
+HOMEPAGE="http://www.gentoo.org/proj/en/hardened/"
+IUSE="deblob"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND=">=sys-devel/gcc-4.5"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+
+	local GRADM_COMPAT="sys-apps/gradm-3.1*"
+
+	ewarn
+	ewarn "Users of grsecurity's RBAC system must ensure they are using"
+	ewarn "${GRADM_COMPAT}, which is compatible with ${PF}."
+	ewarn "It is strongly recommended that the following command is issued"
+	ewarn "prior to booting a ${PF} kernel for the first time:"
+	ewarn
+	ewarn "emerge -na =${GRADM_COMPAT}"
+	ewarn
+}
--- a/sys-kernel/hardened-sources/hardened-sources-4.1.3.ebuild
+++ b/sys-kernel/hardened-sources/hardened-sources-4.1.3.ebuild
@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/hardened-sources-4.1.3.ebuild,v 1.1 2015/07/27 01:37:56 blueness Exp $
+
+EAPI="5"
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base"
+K_GENPATCHES_VER="7"
+K_DEBLOB_AVAILABLE="1"
+
+inherit kernel-2
+detect_version
+
+HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-1"
+HGPV_URI="http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-${HGPV}.extras.tar.bz2"
+SRC_URI="${KERNEL_URI} ${HGPV_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+UNIPATCH_LIST="${DISTDIR}/hardened-patches-${HGPV}.extras.tar.bz2"
+UNIPATCH_EXCLUDE="
+	1500_XATTR_USER_PREFIX.patch
+	2900_dev-root-proc-mount-fix.patch"
+
+DESCRIPTION="Hardened kernel sources (kernel series ${KV_MAJOR}.${KV_MINOR})"
+HOMEPAGE="http://www.gentoo.org/proj/en/hardened/"
+IUSE="deblob"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND=">=sys-devel/gcc-4.5"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+
+	local GRADM_COMPAT="sys-apps/gradm-3.1*"
+
+	ewarn
+	ewarn "Users of grsecurity's RBAC system must ensure they are using"
+	ewarn "${GRADM_COMPAT}, which is compatible with ${PF}."
+	ewarn "It is strongly recommended that the following command is issued"
+	ewarn "prior to booting a ${PF} kernel for the first time:"
+	ewarn
+	ewarn "emerge -na =${GRADM_COMPAT}"
+	ewarn
+}
--- a/www-apps/nikola/Manifest
+++ b/www-apps/nikola/Manifest
@ -1,5 +1,4 @@
 DIST a-study-in-scarlet.txt 122496 SHA256 633115482b8b6cca24332133f22ed3caa1b4b58361b604dbe26aaa943b7cb4ad SHA512 7958079a745ce6474b9006454ee99d9c848bc36372fc149265b4f2b82e562c961823b7716ec0e3285fce1e9363cf8e109190d6f0dc998801c568764ac82f8d19 WHIRLPOOL 0b03b0c6c89f9e23745e8cd1fb8f9faba3b382fc06d3481cfc72e50d386937d97452889a49ef9d298915431ecb5920b1374f1e7585aefd8fe893f13a69f66a9d
 DIST nikola-7.2.0.tar.gz 1843614 SHA256 05bf72f9894eaf83a61ebc1386ab61ffa1be1e4934265261e58487b371f8a926 SHA512 87a6f543793bc21453dc01b4662703edbfd887b775ea067a79bfcf0ac74e22e3034657ce24bdbaca5a05585a6e556295b6d5670ae085f8b31a057cf77d72d3eb WHIRLPOOL ad9794f705307393050727467ae8f4908e0e08134d78aebf9ff3aa0c12f35d2a6bffa7d8453a7c0ce1ba21b6591b3dcc493a0a52b5dd27971d67174ef24dbef6
-DIST nikola-7.3.1.tar.gz 2030543 SHA256 33c11ca186cd10b42ff9b2221cec56226d8bab4d14a0ac7c5c01edb57328bdd2 SHA512 a5c243cb8fdc3f9213979ea6a4213a9e89bdedc02ea382ca967e9a1175a99838488fb2f166e6b130726357bddb5c52ff863231321d95716e51a6ab6636378995 WHIRLPOOL 2b2f6093a0cb090f61fe08aea72ec3244bc96c4a6c9891fbf0b305b2da9f8022bdea1c6ee18b9804bbc2127e28593b3e95449f984a4ca488dd71a3da6edba7f7
-DIST nikola-7.5.1.tar.gz 2443370 SHA256 0ae2a179800051b871b06efe519345bb401f69d27630caf2a710901e305fd432 SHA512 f94e585b5a5d8a9a964eeca8ecb2a797b83d7fa4faa24f370812000601273a19a361677d7ab7b1ab244d76648dbcb65c17e53f3db52dfeb4bc6519567a585bab WHIRLPOOL aba22fca8e59907cceab0105e2cdd8bcae865b401c502eb8b17a44ff603e1b9ff5503ad9d5d97c74baaefbb1a707e97c1e87675fc3083970860dd26a6ccf4980
 DIST nikola-7.6.0.tar.gz 2457863 SHA256 b68d4f6511d5b1c38c9ab9030dd51ceb4a7357a08d5cb852f7e3a7503b9ddc36 SHA512 b13d9f733eb4e67bfa237788b67f01cb114c25ea064c44fa12c84e2dee2ddb25d0cac1b105b66cc8a42cf55f514a9567a1e62be8cdac72bd982dccc5c4ae4fff WHIRLPOOL c359faef51b50faa3cb12a7662c8e9a277a067c92183674cf10a715bf5a4ed6ee039d174be3567d1404588d5ef3fe449829b91287003182220d8dc3fc685e2bd
+DIST nikola-7.6.1.tgz 2290620 SHA256 7c11e3a91456787e5569c78d13641bc5831efc9d71b5a488c389c97bc8017c54 SHA512 8be2378f9c5e121c0923010bc92f9defdbc9f3ec57b4b7cc491a84ebbc5a3c987d8eaba7a7a5fae432350e38eb190bbfab11044dbe74f32eda6a063649267e89 WHIRLPOOL e4d634846d8063c710c127897e107fc17ed8c99e99bbfda621e656f3fe9fae7377a51119a7e383644e2ca3f4dea2efffcbdb034fb264dd55940d19ef80c3d04d
--- a/www-apps/nikola/nikola-7.2.0.ebuild
+++ b/www-apps/nikola/nikola-7.2.0.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/nikola/nikola-7.2.0.ebuild,v 1.4 2015/03/06 22:43:37 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/nikola/nikola-7.2.0.ebuild,v 1.5 2015/07/27 02:42:23 yngwin Exp $

 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
@ -13,7 +13,6 @@ MY_PN="Nikola"
 if [[ ${PV} == *9999* ]]; then
 	inherit git-2
 	EGIT_REPO_URI="git://github.com/ralsina/${PN}.git"
-	KEYWORDS=""
 else
 	SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${P}.tar.gz"
 	KEYWORDS="amd64"
--- a/www-apps/nikola/nikola-7.3.1.ebuild
+++ b/www-apps/nikola/nikola-7.3.1.ebuild
@ -1,62 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/nikola/nikola-7.3.1.ebuild,v 1.2 2015/06/17 04:47:02 yngwin Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-inherit distutils-r1
-
-DESCRIPTION="A static website and blog generator"
-HOMEPAGE="http://getnikola.com/"
-MY_PN="Nikola"
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-2
-	EGIT_REPO_URI="git://github.com/ralsina/${PN}.git"
-	KEYWORDS=""
-else
-	SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="MIT-with-advertising Apache-2.0" # Gutenberg
-SLOT="0"
-IUSE="assets charts hyphenation ipython jinja markdown"
-RESTRICT="test" # needs freezegun, coveralls, and phpserialize
-
-DEPEND=">=dev-python/docutils-0.12[${PYTHON_USEDEP}]" # needs rst2man to build manpage
-RDEPEND="${DEPEND}
-	>=dev-python/blinker-1.3[${PYTHON_USEDEP}]
-	<dev-python/doit-0.28.0[${PYTHON_USEDEP}]
-	>=dev-python/logbook-0.7.0[${PYTHON_USEDEP}]
-	>=dev-python/lxml-3.3.5[${PYTHON_USEDEP}]
-	>=dev-python/mako-1.0[${PYTHON_USEDEP}]
-	>=dev-python/natsort-3.5.2[${PYTHON_USEDEP}]
-	>=dev-python/pygments-1.6[${PYTHON_USEDEP}]
-	>=dev-python/PyRSS2Gen-1.1[${PYTHON_USEDEP}]
-	~dev-python/python-dateutil-2.4.1[${PYTHON_USEDEP}]
-	>=dev-python/setuptools-5.4.1[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/unidecode-0.04.16[${PYTHON_USEDEP}]
-	~dev-python/yapsy-1.10.423[${PYTHON_USEDEP}]
-	virtual/python-imaging[${PYTHON_USEDEP}]
-	assets? ( >=dev-python/webassets-0.10.1[${PYTHON_USEDEP}] )
-	charts? ( ~dev-python/pygal-1.7.0[${PYTHON_USEDEP}] )
-	hyphenation? ( >=dev-python/pyphen-0.9.1[${PYTHON_USEDEP}] )
-	ipython? ( >=dev-python/ipython-1.2.1[${PYTHON_USEDEP}] )
-	jinja? ( >=dev-python/jinja-2.7.2[${PYTHON_USEDEP}] )
-	markdown? ( >=dev-python/markdown-2.4.0[${PYTHON_USEDEP}] )"
-# more options as packages will be added:
-#	livereload? ( =dev-python/livereload-2.3.2[${PYTHON_USEDEP}] )
-#	micawber? ( >=dev-python/micawber-0.3.0[${PYTHON_USEDEP}] )
-#	typogrify? ( >=dev-python/typogrify-2.0.4[${PYTHON_USEDEP}] )
-
-src_install() {
-	distutils-r1_src_install
-
-	# hackish way to remove docs that ended up in the wrong place
-	rm -rf "${D}"/usr/share/doc/${PN}
-
-	dodoc AUTHORS.txt CHANGES.txt README.rst docs/*.txt
-	doman docs/man/*
-}
--- a/www-apps/nikola/nikola-7.6.0.ebuild
+++ b/www-apps/nikola/nikola-7.6.0.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/nikola/nikola-7.6.0.ebuild,v 1.1 2015/07/08 12:21:43 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/nikola/nikola-7.6.0.ebuild,v 1.3 2015/07/27 02:42:23 yngwin Exp $

 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
@ -14,7 +14,6 @@ MY_PN="Nikola"
 if [[ ${PV} == *9999* ]]; then
 	inherit git-2
 	EGIT_REPO_URI="git://github.com/ralsina/${PN}.git"
-	KEYWORDS=""
 else
 	SRC_URI+=" mirror://pypi/${MY_PN:0:1}/${MY_PN}/${P}.tar.gz"
 	KEYWORDS="~amd64"
--- a/www-apps/nikola/nikola-7.6.1.ebuild
+++ b/www-apps/nikola/nikola-7.6.1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/nikola/nikola-7.5.1.ebuild,v 1.1 2015/06/17 04:47:02 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/nikola/nikola-7.6.1.ebuild,v 1.2 2015/07/27 02:42:23 yngwin Exp $

 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
@ -8,26 +8,26 @@ inherit distutils-r1

 DESCRIPTION="A static website and blog generator"
 HOMEPAGE="http://getnikola.com/"
+SRC_URI="http://dev.gentoo.org/~yngwin/distfiles/a-study-in-scarlet.txt"
 MY_PN="Nikola"

 if [[ ${PV} == *9999* ]]; then
 	inherit git-2
 	EGIT_REPO_URI="git://github.com/ralsina/${PN}.git"
-	KEYWORDS=""
 else
-	SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${P}.tar.gz"
+	SRC_URI+=" mirror://pypi/${MY_PN:0:1}/${MY_PN}/${P}.tgz"
 	KEYWORDS="~amd64"
 fi

-LICENSE="MIT-with-advertising Apache-2.0" # Gutenberg
+LICENSE="MIT Apache-2.0 CC0-1.0 public-domain"
 SLOT="0"
-IUSE="assets charts hyphenation ipython jinja markdown"
-RESTRICT="test" # needs freezegun, coveralls, and phpserialize
+IUSE="assets charts ghpages hyphenation ipython jinja markdown watchdog webmedia websocket"
+RESTRICT="test" # needs coveralls

 DEPEND=">=dev-python/docutils-0.12[${PYTHON_USEDEP}]" # needs rst2man to build manpage
 RDEPEND="${DEPEND}
 	>=dev-python/blinker-1.3[${PYTHON_USEDEP}]
-	~dev-python/doit-0.28.0[${PYTHON_USEDEP}]
+	>=dev-python/doit-0.28.0[${PYTHON_USEDEP}]
 	>=dev-python/logbook-0.7.0[${PYTHON_USEDEP}]
 	>=dev-python/lxml-3.3.5[${PYTHON_USEDEP}]
 	>=dev-python/mako-1.0[${PYTHON_USEDEP}]
@ -38,18 +38,25 @@ RDEPEND="${DEPEND}
 	>=dev-python/setuptools-5.4.1[${PYTHON_USEDEP}]
 	>=dev-python/requests-2.2.0[${PYTHON_USEDEP}]
 	>=dev-python/unidecode-0.04.16[${PYTHON_USEDEP}]
-	~dev-python/yapsy-1.10.423[${PYTHON_USEDEP}]
+	>=dev-python/yapsy-1.11.223[${PYTHON_USEDEP}]
 	virtual/python-imaging[${PYTHON_USEDEP}]
 	assets? ( >=dev-python/webassets-0.10.1[${PYTHON_USEDEP}] )
 	charts? ( ~dev-python/pygal-1.7.0[${PYTHON_USEDEP}] )
+	ghpages? ( >=dev-python/ghp-import-0.4.1[${PYTHON_USEDEP}] )
 	hyphenation? ( >=dev-python/pyphen-0.9.1[${PYTHON_USEDEP}] )
-	ipython? ( >=dev-python/ipython-1.2.1[${PYTHON_USEDEP}] )
+	ipython? ( >=dev-python/ipython-2.0.0[notebook,${PYTHON_USEDEP}] )
 	jinja? ( >=dev-python/jinja-2.7.2[${PYTHON_USEDEP}] )
-	markdown? ( >=dev-python/markdown-2.4.0[${PYTHON_USEDEP}] )"
-# more options as packages will be added:
-#	livereload? ( =dev-python/livereload-2.3.2[${PYTHON_USEDEP}] )
-#	micawber? ( >=dev-python/micawber-0.3.0[${PYTHON_USEDEP}] )
-#	typogrify? ( >=dev-python/typogrify-2.0.4[${PYTHON_USEDEP}] )
+	markdown? ( >=dev-python/markdown-2.4.0[${PYTHON_USEDEP}] )
+	watchdog? ( ~dev-python/watchdog-0.8.3[${PYTHON_USEDEP}] )
+	webmedia? ( >=dev-python/micawber-0.3.0[${PYTHON_USEDEP}] )
+	websocket? ( ~dev-python/ws4py-0.3.4[${PYTHON_USEDEP}] )"
+#	typography? ( >=dev-python/typogrify-2.0.4[${PYTHON_USEDEP}] ) # needs smartypants
+
+src_prepare() {
+	# replace Gutenberg licensed version with our public domain version (bug #552372)
+	rm nikola/data/samplesite/stories/a-study-in-scarlet.txt || die
+	cp "${DISTDIR}"/a-study-in-scarlet.txt nikola/data/samplesite/stories/ || die
+}

 src_install() {
 	distutils-r1_src_install
@ -58,5 +65,5 @@ src_install() {
 	rm -rf "${D}"/usr/share/doc/${PN}

 	dodoc AUTHORS.txt CHANGES.txt README.rst docs/*.txt
-	doman docs/man/*
+	doman docs/man/${PN}.1.gz
 }
--- a/x11-wm/notion/metadata.xml
+++ b/x11-wm/notion/metadata.xml
@ -2,14 +2,15 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>proxy-maintainers</herd>
-<maintainer>
-	<email>little_hobbit@lavabit.com</email>
-</maintainer>
-<maintainer>
-	<email>xmw@gentoo.org</email>
-	<name>Michael Weber</name>
-</maintainer>
-<use>
-	<flag name="xrandr">Add support for xrandr</flag>
-</use>
+	<maintainer>
+		<email>moaxcp@gmail.com</email>
+		<name>John Mercier</name>
+	</maintainer>
+	<maintainer>
+		<email>xmw@gentoo.org</email>
+		<name>Michael Weber</name>
+	</maintainer>
+	<use>
+		<flag name="xrandr">Add support for xrandr</flag>
+	</use>
 </pkgmetadata>