Sync with portage [Sun Oct 23 17:30:26 MSK 2016].

8 years ago · 09a4d2a2ce
parent b03882fd4b
commit 09a4d2a2ce
1408 changed files with 4359 additions and 2527 deletions
--- a/app-admin/checksec/checksec-1.7.2.ebuild
+++ b/app-admin/checksec/checksec-1.7.2.ebuild
@ -13,7 +13,7 @@ SRC_URI="https://github.com/slimm609/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.g

 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~x86"
 IUSE=""

 S="${WORKDIR}"/${MY_PN}-${PV}
--- a/app-admin/checksec/checksec-1.7.3.ebuild
+++ b/app-admin/checksec/checksec-1.7.3.ebuild
@ -13,7 +13,7 @@ SRC_URI="https://github.com/slimm609/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.g

 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~x86"
 IUSE=""

 S="${WORKDIR}"/${MY_PN}-${PV}
--- a/app-admin/checksec/checksec-1.7.4.ebuild
+++ b/app-admin/checksec/checksec-1.7.4.ebuild
@ -13,7 +13,7 @@ SRC_URI="https://github.com/slimm609/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.g

 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~x86"
 IUSE=""

 S="${WORKDIR}"/${MY_PN}-${PV}
--- a/app-admin/monit/Manifest
+++ b/app-admin/monit/Manifest
@ -1,3 +1,3 @@
 DIST monit-5.17.1.tar.gz 1231823 SHA256 f71a22cfb6bd91ff46496e72e1d1b1021ecd651e7748131ce0f995cc37ff0b42 SHA512 e28534ce3a5a95eac70f05c34b5a8545a0eb925ac90f82f71bcea8f3568be45288ddbd196c2352a390820244143511ecf2e0de21cdcab1dd2f3e4788dad71015 WHIRLPOOL 9416020cecb49473299f0603448a79c0f3992bad995dbd78a282cf8440b9957edcefc419a56ed71f583efbce2d0ba50a338d2df5b736d9d32e0116ecc5bf5ef1
-DIST monit-5.18.tar.gz 1239752 SHA256 75ccb85fa2ac1f44c9c95c5a6b539a254b0a1d64e16a36ec9eeb867484a4fcaf SHA512 448f0d2cb0a18e6b4ead051918677414157f7feac5697888f667db4cf5411b922058a36fc57247c6b8ff9b6f23382305c8c69fc6ec1fcd247b01f4a8bccaa42c WHIRLPOOL 7eaa147be48aa8f38d3e11df6af65c68aa36f20bb868d619e573a13563a2f3e82efc170e5449785f93db1b56261a286422565455676f86e803612d10b8c87d24
 DIST monit-5.19.0.tar.gz 1260248 SHA256 befcd54365502bce4ffd6d1b0c345d5b689c9f7cb3a35a462ba7dcffcf6f62b8 SHA512 87bd21660c8ef1f1663abe24d5024c2f6d2d6a782a0a37432c5afff45d906ecf12d477569309a6be80c6bb855d04da5ac51818cdcc46542cdac2df88bad91517 WHIRLPOOL 0bd22cef1b42a31393af59284e5a3d08f6974fb6daf557f2dd27d31fecf0f8b1657d7050ce8cfea8d2c423a5a83f7dae8ec1af3f6eb7340abb16253d3d3e9b43
+DIST monit-5.20.0.tar.gz 1267991 SHA256 ebac395ec50c1ae64d568db1260bc049d0e0e624c00e79d7b1b9a59c2679b98d SHA512 653cba9d63fad42acf8c27ee9c050d047fc78e0b7e8cdb0f3d0a533d5b5e01ccf1b82d443cb6518d286547087a021e37a59cbffedbb3daf49ff8f95e8c64b884 WHIRLPOOL 28f9fcfa86c346fb390654e4730cc52ce30b794b2dc1e02a484079b55a8bcb50d78a71e2e856f1ce1e161dc99bcd6913b4db92ed0deab64e969c5c6a464c584d
--- a/app-admin/monit/monit-5.20.0.ebuild
+++ b/app-admin/monit/monit-5.20.0.ebuild
--- a/app-admin/stow/stow-2.2.2-r1.ebuild
+++ b/app-admin/stow/stow-2.2.2-r1.ebuild
@ -4,6 +4,8 @@

 EAPI=6

+inherit perl-functions
+
 DESCRIPTION="GNU Stow is a symlink farm manager"
 HOMEPAGE="https://www.gnu.org/software/stow/"
 SRC_URI="mirror://gnu/stow/${P}.tar.gz"
@ -18,4 +20,9 @@ DEPEND="dev-lang/perl
 		virtual/perl-Test-Harness
 		dev-perl/Test-Output
 	)"
-RDEPEND="dev-lang/perl"
+RDEPEND="dev-lang/perl:="
+
+src_configure() {
+	perl_set_version
+	econf "--with-pmdir=${VENDOR_LIB}"
+}
--- a/app-office/gnucash/gnucash-2.6.13-r1.ebuild
+++ b/app-office/gnucash/gnucash-2.6.13-r1.ebuild
@ -24,7 +24,7 @@ RDEPEND="
 	>=dev-libs/popt-1.5
 	>=dev-libs/libxml2-2.5.10:2
 	dev-libs/libxslt
-	>=dev-scheme/guile-2.0.0:12[deprecated,regex]
+	>=dev-scheme/guile-2.0.0:12=[deprecated,regex]
 	dev-scheme/guile-www
 	gnome-base/libgnomecanvas
 	>=net-libs/webkit-gtk-1.2:2
--- a/app-office/unoconv/unoconv-99999999.ebuild
+++ b/app-office/unoconv/unoconv-99999999.ebuild
@ -1,42 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=3
-
-PYTHON_DEPEND="2"
-EGIT_REPO_URI="https://github.com/dagwieers/unoconv.git"
-[[ ${PV} == 9999* ]] && SCM_ECLASS="git-2"
-inherit eutils python ${SCM_ECLASS}
-unset SCM_ECLASS
-
-DESCRIPTION="Convert between document formats supported by Libreoffice"
-HOMEPAGE="http://dag.wieers.com/home-made/unoconv/"
-[[ ${PV} == 9999* ]] || SRC_URI="http://dev.gentooexperimental.org/~scarabeus/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-[[ ${PV} == 9999* ]] || \
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	!app-text/odt2txt
-	virtual/ooo
-"
-
-pkg_setup() {
-	python_set_active_version 2
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/timeout.patch"
-	python_convert_shebangs -r 2 .
-}
-
-src_compile() { :; }
-
-src_install() {
-	emake docs-install install install-links DESTDIR="${D}" || die
-}
--- a/dev-db/mysql/mysql-5.6.34.ebuild
+++ b/dev-db/mysql/mysql-5.6.34.ebuild
@ -15,7 +15,7 @@ inherit mysql-multilib-r1
 IUSE="$IUSE"

 # REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"

 # When MY_EXTRAS is bumped, the index should be revised to exclude these.
 EPATCH_EXCLUDE=''
--- a/dev-lang/go/Manifest
+++ b/dev-lang/go/Manifest
@ -12,4 +12,3 @@ DIST go-solaris-amd64-bootstrap.tbz 48367195 SHA256 92ebdbf001f243a78a6c2d8ee30e
 DIST go1.6.3.src.tar.gz 12617426 SHA256 6326aeed5f86cf18f16d6dc831405614f855e2d416a91fd3fdc334f772345b00 SHA512 43e9b01220788112a185500bd53f091e7a0023a790092f428e2f40fc1a334dd148558b99d2a1c871b8cc79ad7d2d87a092b93eee7b5a27c2ee675c494de35306 WHIRLPOOL 0a22dc08b89ddfaccf1e871037e7ad6cdbf36f914de527011813d57a2d857478278202314b185e26aa905cb135d13cbea490d03337b42148c6fc2ef93a8cd9fe
 DIST go1.7.1.src.tar.gz 14098889 SHA256 2b843f133b81b7995f26d0cb64bbdbb9d0704b90c44df45f844d28881ad442d3 SHA512 eab2b44f44d05c62645756e05078c2a8b7e3c4d2413617a20a6659df22e4612bb2059cf4906ab81134421eb371903034c1b197bb5595c9af9901819b2b3330a3 WHIRLPOOL 0733985cece30858431f600af12f60c3ff2894a78f09900a64aac7d493d790679a75a7c878b461fc6548663cc0cd34481c6e62051fd55ea68e8fa1d3b19fcdb0
 DIST go1.7.3.src.tar.gz 14196345 SHA256 79430a0027a09b0b3ad57e214c4c1acfdd7af290961dd08d322818895af1ef44 SHA512 9289c7720a551725643be757df0b676b7ec3add73e5f01af5e3ac1d81e2b31a304aca6e86d395ddc06fc3982099814478b5ec693124a3327f79399db7bcd73eb WHIRLPOOL 17b4cb47bbec610516f6b5e4b9b0c504c4388deffeede7997072fff36ec8368882fe9615f11b408ffc4d5cee4fa5fb7f6fdd356d816c4c820f29a390e2cd7b74
-DIST go1.7.src.tar.gz 14091954 SHA256 72680c16ba0891fcf2ccf46d0f809e4ecf47bbf889f5d884ccb54c5e9a17e1c0 SHA512 a9cd1279927ca50e083dcf6d5a4bcb3bff6a156b3555608334a41be9613b5002dd71caafa472aae6210b01a6cdbd6aa6a55b8882a8e4bda68a5ffd10a3ae1d14 WHIRLPOOL 77121f84e04e7266f46934c9350f7fe216aa8376fb9ac06602a4b7bf16ed6b3595dbbffc7289b5223e47a9e52980f381183bdeddf34b858d21bb0918a94d7e4e
--- a/dev-lang/go/go-1.7.ebuild
+++ b/dev-lang/go/go-1.7.ebuild
@ -1,222 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-
-MY_PV=${PV/_/}
-
-inherit toolchain-funcs
-
-BOOTSTRAP_DIST="https://dev.gentoo.org/~williamh/dist"
-SRC_URI="!gccgo? (
-kernel_Darwin? (
-	x64-macos? ( ${BOOTSTRAP_DIST}/go-darwin-amd64-bootstrap.tbz )
-)
-kernel_FreeBSD? (
-amd64-fbsd? ( ${BOOTSTRAP_DIST}/go-freebsd-amd64-bootstrap.tbz )
-x86-fbsd? ( ${BOOTSTRAP_DIST}/go-freebsd-386-bootstrap-1.tbz )
-)
-kernel_linux? (
-	amd64? ( ${BOOTSTRAP_DIST}/go-linux-amd64-bootstrap.tbz )
-	arm? ( ${BOOTSTRAP_DIST}/go-linux-arm-bootstrap.tbz )
-	arm64? ( ${BOOTSTRAP_DIST}/go-linux-arm64-bootstrap.tbz )
-	ppc64? (
-		${BOOTSTRAP_DIST}/go-linux-ppc64-bootstrap.tbz
-		${BOOTSTRAP_DIST}/go-linux-ppc64le-bootstrap.tbz
-	)
-	s390? ( ${BOOTSTRAP_DIST}/go-linux-s390x-bootstrap.tbz )
-	x86? ( ${BOOTSTRAP_DIST}/go-linux-386-bootstrap-1.tbz )
-)
-kernel_SunOS? (
-	x64-solaris? ( ${BOOTSTRAP_DIST}/go-solaris-amd64-bootstrap.tbz )
-)
-)
-"
-
-if [[ ${PV} = 9999 ]]; then
-	EGIT_REPO_URI="git://github.com/golang/go.git"
-	inherit git-r3
-else
-	SRC_URI+="https://storage.googleapis.com/golang/go${MY_PV}.src.tar.gz"
-	case ${PV} in
-		*9999*|*_rc*) ;;
-		*)
-			KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x64-solaris"
-			;;
-	esac
-fi
-
-DESCRIPTION="A concurrent garbage collected and typesafe programming language"
-HOMEPAGE="http://www.golang.org"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-IUSE="gccgo"
-
-DEPEND="gccgo? ( >=sys-devel/gcc-5[go] )"
-RDEPEND="!<dev-go/go-tools-0_pre20150902"
-
-# These test data objects have writable/executable stacks.
-QA_EXECSTACK="usr/lib/go/src/debug/elf/testdata/*.obj"
-
-# Do not complain about CFLAGS, etc, since Go doesn't use them.
-QA_FLAGS_IGNORED='.*'
-
-REQUIRES_EXCLUDE="/usr/lib/go/src/debug/elf/testdata/*"
-
-# The tools in /usr/lib/go should not cause the multilib-strict check to fail.
-QA_MULTILIB_PATHS="usr/lib/go/pkg/tool/.*/.*"
-
-# The go language uses *.a files which are _NOT_ libraries and should not be
-# stripped. The test data objects should also be left alone and unstripped.
-STRIP_MASK="/usr/lib/go/pkg/*.a
-	/usr/lib/go/src/debug/elf/testdata/*
-	/usr/lib/go/src/debug/dwarf/testdata/*
-	/usr/lib/go/src/runtime/race/*.syso"
-
-if [[ ${PV} != 9999 ]]; then
-	S="${WORKDIR}"/go
-fi
-
-go_arch()
-{
-	# By chance most portage arch names match Go
-	local portage_arch=$(tc-arch $@)
-	case "${portage_arch}" in
-		x86)	echo 386;;
-		x64-*)	echo amd64;;
-		ppc64) [[ $(tc-endian $@) = big ]] && echo ppc64 || echo ppc64le ;;
-		s390) echo s390x ;;
-		*)		echo "${portage_arch}";;
-	esac
-}
-
-go_arm()
-{
-	case "${1:-${CHOST}}" in
-		armv5*)	echo 5;;
-		armv6*)	echo 6;;
-		armv7*)	echo 7;;
-		*)
-			die "unknown GOARM for ${1:-${CHOST}}"
-			;;
-	esac
-}
-
-go_os()
-{
-	case "${1:-${CHOST}}" in
-		*-linux*)	echo linux;;
-		*-darwin*)	echo darwin;;
-		*-freebsd*)	echo freebsd;;
-		*-netbsd*)	echo netbsd;;
-		*-openbsd*)	echo openbsd;;
-		*-solaris*)	echo solaris;;
-		*-cygwin*|*-interix*|*-winnt*)
-			echo windows
-			;;
-		*)
-			die "unknown GOOS for ${1:-${CHOST}}"
-			;;
-	esac
-}
-
-go_tuple()
-{
-	echo "$(go_os $@)_$(go_arch $@)"
-}
-
-go_cross_compile()
-{
-	[[ $(go_tuple ${CBUILD}) != $(go_tuple) ]]
-}
-
-pkg_pretend()
-{
-	# make.bash does not understand cross-compiling a cross-compiler
-	if [[ $(go_tuple) != $(go_tuple ${CTARGET}) ]]; then
-		die "CHOST CTARGET pair unsupported: CHOST=${CHOST} CTARGET=${CTARGET}"
-	fi
-}
-
-src_unpack()
-{
-	if [[ ${PV} = 9999 ]]; then
-		git-r3_src_unpack
-	fi
-	default
-}
-
-src_compile()
-{
-	export GOROOT_BOOTSTRAP="${WORKDIR}"/go-$(go_os)-$(go_arch)-bootstrap
-	if use gccgo; then
-		mkdir -p "${GOROOT_BOOTSTRAP}/bin" || die
-		local go_binary=$(gcc-config --get-bin-path)/go-5
-		[[ -x ${go_binary} ]] || go_binary=$(
-			find "${EPREFIX}"/usr/${CHOST}/gcc-bin/*/go-5 | sort -V | tail -n1)
-		[[ -x ${go_binary} ]] || die "go-5: command not found"
-		ln -s "${go_binary}" "${GOROOT_BOOTSTRAP}/bin/go" || die
-	fi
-	export GOROOT_FINAL="${EPREFIX}"/usr/lib/go
-	export GOROOT="$(pwd)"
-	export GOBIN="${GOROOT}/bin"
-
-	# Go's build script does not use BUILD/HOST/TARGET consistently. :(
-	export GOHOSTARCH=$(go_arch ${CBUILD})
-	export GOHOSTOS=$(go_os ${CBUILD})
-	export CC=$(tc-getBUILD_CC)
-
-	export GOARCH=$(go_arch)
-	export GOOS=$(go_os)
-	export CC_FOR_TARGET=$(tc-getCC)
-	export CXX_FOR_TARGET=$(tc-getCXX)
-	if [[ ${ARCH} == arm ]]; then
-		export GOARM=$(go_arm)
-	fi
-	elog "GOROOT_BOOTSTRAP is ${GOROOT_BOOTSTRAP}"
-
-	cd src
-	./make.bash || die "build failed"
-}
-
-src_test()
-{
-	go_cross_compile && return 0
-
-	cd src
-	PATH="${GOBIN}:${PATH}" \
-		./run.bash -no-rebuild || die "tests failed"
-}
-
-src_install()
-{
-	local bin_path f x
-
-	dodir /usr/lib/go
-	insinto /usr/lib/go
-
-	# There is a known issue which requires the source tree to be installed [1].
-	# Once this is fixed, we can consider using the doc use flag to control
-	# installing the doc and src directories.
-	# [1] https://golang.org/issue/2775
-	doins -r bin doc lib pkg src
-	fperms -R +x /usr/lib/go/bin /usr/lib/go/pkg/tool
-
-	cp -a misc "${D}"/usr/lib/go/misc
-
-	if go_cross_compile; then
-		bin_path="bin/$(go_tuple)"
-	else
-		bin_path=bin
-	fi
-	for x in ${bin_path}/*; do
-		f=${x##*/}
-		dosym ../lib/go/${bin_path}/${f} /usr/bin/${f}
-	done
-	dodoc AUTHORS CONTRIBUTORS PATENTS README.md
-}
--- a/dev-lang/perl/Manifest
+++ b/dev-lang/perl/Manifest
@ -9,3 +9,4 @@ DIST perl-5.22.2-patches-1.tar.xz 19920 SHA256 c128b4d1575f3bcf1952a1526b5725fab
 DIST perl-5.22.2.tar.bz2 13717881 SHA256 f2322b9b04fe0cdbca9fe755360da04892cb6483d44959457cfebc0bcddc8058 SHA512 1acb77ead47955ef6e8d84903e86cb584ee9415742fb99eb2f1f30772087e8ed0def5f643ce4ee7693df5a1dfe154b108aa85df232d81107f98820bb84a0d71a WHIRLPOOL bdfd1035728619abafeb679cdd3181269a91fad5c30f4995e91d5ae16cb65210ce2c4c47afe85eb192ebde88c0bbc4cd0ed77939acdfd09760b11b57eeace2a6
 DIST perl-5.24.0-patches-2.tar.xz 17760 SHA256 8f9ce8895b85d6195cfa10690a28a9b8dbac683cb159ed3f3103e7b5f2bbf18d SHA512 1159dd53d40641f71c301e4be95c8964e6787cdc446578e66e8c97238fc99558c98b1fbc9e89b2d38206364e598ff1544ca1291c14a422d95089f0eea8926cc2 WHIRLPOOL e18ecf63532609dc36c7252f03a1a4d28529b9804dbb9c0d70cc1418a243ff9168a621cadeee52f69919a70312c83232c0857f907f991886cfae870ed4590286
 DIST perl-5.24.0.tar.bz2 14155784 SHA256 62328a53d157e8153b33e137594155f6f8b64418f7f9238210feb809585290e0 SHA512 05ecc6774da475d14f426a850be7adf754fcb17a2fa85a67aeaf8ddb9c86ae8b1ee654e803ebae5ccdaa73ad3e35188e3254ac9452b47cd4f8ffe47e67d15f53 WHIRLPOOL 84c98ddb19a5c6d32f40b427ba1f82656f88cfe5b7d3f416fb92579436890af52299f05301a81692dfdae65594b1866081e1fee067623256d796855d87d532ad
+DIST perl-cross-1.1.1.tar.gz 88283 SHA256 8ee72f39119b342f3b911266e5c965914a44a484fd18d9c444d106aca4dd7abc SHA512 8ad958d08d8e7ff2b80333959544aaf0e83a74f2e34c9e8aca543052d039c0f4b00cda694ee940874b192b0d83656a9f6854ebbf2c444b212ba9d4417c576591 WHIRLPOOL e6739ca8fc4dcafa14a20585d75931cf6b6a98fad9c732312d15507b29b926452668afc4f27f2b6c5bb6faa623fc506538a53ed9d303d21897f42d47c26e4924
--- a/dev-lang/perl/perl-5.24.0-r2.ebuild
+++ b/dev-lang/perl/perl-5.24.0-r2.ebuild
@ -0,0 +1,552 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit eutils alternatives flag-o-matic toolchain-funcs multilib multiprocessing
+
+PATCH_VER=2
+CROSS_VER=1.1.1
+
+PERL_OLDVERSEN=""
+MODULE_AUTHOR=RJBS
+
+SHORT_PV="${PV%.*}"
+MY_P="perl-${PV/_rc/-RC}"
+MY_PV="${PV%_rc*}"
+
+DESCRIPTION="Larry Wall's Practical Extraction and Report Language"
+
+SRC_URI="
+	mirror://cpan/src/5.0/${MY_P}.tar.bz2
+	mirror://cpan/authors/id/${MODULE_AUTHOR:0:1}/${MODULE_AUTHOR:0:2}/${MODULE_AUTHOR}/${MY_P}.tar.bz2
+	mirror://gentoo/${MY_P}-patches-${PATCH_VER}.tar.xz
+	https://dev.gentoo.org/~dilfridge/distfiles/${MY_P}-patches-${PATCH_VER}.tar.xz
+	https://github.com/arsv/perl-cross/releases/download/${CROSS_VER}/perl-cross-${CROSS_VER}.tar.gz
+"
+HOMEPAGE="http://www.perl.org/"
+
+LICENSE="|| ( Artistic GPL-1+ )"
+SLOT="0/${SHORT_PV}"
+KEYWORDS="~alpha ~amd64 ~amd64-fbsd ~amd64-linux ~arm ~arm64 ~hppa ~hppa-hpux ~ia64 ~ia64-hpux ~ia64-linux ~m68k ~m68k-mint ~mips ~ppc ~ppc64 ~ppc-aix ~ppc-macos ~s390 ~sh ~sparc ~sparc64-solaris ~sparc-solaris ~x64-freebsd ~x64-macos ~x64-solaris ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~x86-linux ~x86-macos ~x86-solaris"
+IUSE="berkdb debug doc gdbm ithreads"
+
+RDEPEND="
+	berkdb? ( sys-libs/db:= )
+	gdbm? ( >=sys-libs/gdbm-1.8.3 )
+	app-arch/bzip2
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}
+	!prefix? ( elibc_FreeBSD? ( sys-freebsd/freebsd-mk-defs ) )
+"
+PDEPEND="
+	>=app-admin/perl-cleaner-2.5
+	>=virtual/perl-File-Temp-0.230.400-r2
+	>=virtual/perl-Data-Dumper-2.154.0
+	virtual/perl-Test-Harness
+"
+# bug 390719, bug 523624
+# virtual/perl-Test-Harness is here for the bundled ExtUtils::MakeMaker
+
+S="${WORKDIR}/${MY_P}"
+
+dual_scripts() {
+	src_remove_dual      perl-core/Archive-Tar        2.40.0        ptar ptardiff ptargrep
+	src_remove_dual      perl-core/Digest-SHA         5.950.0       shasum
+	src_remove_dual      perl-core/CPAN               2.110.0       cpan
+	src_remove_dual      perl-core/Encode             2.800.0       enc2xs piconv
+	src_remove_dual      perl-core/ExtUtils-MakeMaker 7.100.100_rc  instmodsh
+	src_remove_dual      perl-core/ExtUtils-ParseXS   3.310.0       xsubpp
+	src_remove_dual      perl-core/IO-Compress        2.69.0        zipdetails
+	src_remove_dual      perl-core/JSON-PP            2.273.0       json_pp
+	src_remove_dual      perl-core/Module-CoreList    5.201.605.60  corelist
+	src_remove_dual      perl-core/Pod-Parser         1.630.0       pod2usage podchecker podselect
+	src_remove_dual      perl-core/Pod-Perldoc        3.250.200_rc  perldoc
+	src_remove_dual      perl-core/Test-Harness       3.360.0       prove
+	src_remove_dual      perl-core/podlators          4.70.0        pod2man pod2text
+	src_remove_dual_man  perl-core/podlators          4.70.0        /usr/share/man/man1/perlpodstyle.1
+}
+
+check_rebuild() {
+	# Fresh install
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		return 0;
+	# Major Upgrade
+	# doesn't matter if there's multiple copies, it still needs a rebuild
+	# if the string is anything other than "5.CURRENTMAJOR"
+	elif [[ "${REPLACING_VERSIONS%.*}" != "${PV%.*}" ]]; then
+		echo ""
+		ewarn "UPDATE THE PERL MODULES:"
+		ewarn "After updating dev-lang/perl the installed Perl modules"
+		ewarn "have to be re-installed. In most cases, this is done automatically"
+		ewarn "by the package manager, but subsequent steps are still recommended"
+		ewarn "to ensure system consistency."
+		ewarn
+		ewarn "You should start with a depclean to remove any unused perl dependencies"
+		ewarn "that may confuse portage in future. Regular depcleans are also encouraged"
+		ewarn "as part of your regular update cycle, as that will keep perl upgrades working."
+		ewarn "Recommended: emerge --depclean -va"
+		ewarn
+		ewarn "You should then call perl-cleaner to clean up any old files and trigger any"
+		ewarn "remaining rebuilds portage may have missed."
+		ewarn "Use: perl-cleaner --all"
+		return 0;
+
+	# Reinstall w/ USE Change
+	elif (   use ithreads && ! has_version dev-lang/perl[ithreads] ) || \
+	     ( ! use ithreads &&   has_version dev-lang/perl[ithreads] ) || \
+	     (   use debug    && ! has_version dev-lang/perl[debug]    ) || \
+	     ( ! use debug    &&   has_version dev-lang/perl[debug]    ) ; then
+		echo ""
+		ewarn "TOGGLED USE-FLAGS WARNING:"
+		ewarn "You changed one of the use-flags ithreads or debug."
+		ewarn "You must rebuild all perl-modules installed."
+		ewarn "Use: perl-cleaner --modules ; perl-cleaner --force --libperl"
+	fi
+}
+
+pkg_setup() {
+	case ${CHOST} in
+		*-freebsd*)   osname="freebsd" ;;
+		*-dragonfly*) osname="dragonfly" ;;
+		*-netbsd*)    osname="netbsd" ;;
+		*-openbsd*)   osname="openbsd" ;;
+		*-darwin*)    osname="darwin" ;;
+		*-interix*)   osname="interix" ;;
+		*-aix*)       osname="aix" ;;
+		*-cygwin*)    osname="cygwin" ;;
+		*)            osname="linux" ;;
+	esac
+
+	myarch="${CHOST%%-*}-${osname}"
+	if use debug ; then
+		myarch+="-debug"
+	fi
+	if use ithreads ; then
+		mythreading="-multi"
+		myarch+="-thread"
+	fi
+
+	LIBPERL="libperl$(get_libname ${MY_PV} )"
+	PRIV_LIB="/usr/$(get_libdir)/perl5/${MY_PV}"
+	ARCH_LIB="/usr/$(get_libdir)/perl5/${MY_PV}/${myarch}${mythreading}"
+	SITE_LIB="/usr/local/$(get_libdir)/perl5/${MY_PV}"
+	SITE_ARCH="/usr/local/$(get_libdir)/perl5/${MY_PV}/${myarch}${mythreading}"
+	VENDOR_LIB="/usr/$(get_libdir)/perl5/vendor_perl/${MY_PV}"
+	VENDOR_ARCH="/usr/$(get_libdir)/perl5/vendor_perl/${MY_PV}/${myarch}${mythreading}"
+
+	dual_scripts
+}
+
+src_remove_dual_file() {
+	local i pkg ver
+	pkg="$1"
+	ver="$2"
+	shift 2
+	case "${EBUILD_PHASE:-none}" in
+		postinst|postrm)
+			for i in "$@" ; do
+				alternatives_auto_makesym "${i}" "${i}-[0-9]*"
+			done
+			;;
+		setup)
+			for i in "$@" ; do
+				if [[ -f ${EROOT}${i} && ! -h ${EROOT}${i} ]] ; then
+					has_version ${pkg} && ewarn "You must reinstall ${pkg} !"
+					break
+				fi
+			done
+			;;
+		install)
+			for i in "$@" ; do
+				if ! [[ -f "${ED}"${i} ]] ; then
+					ewarn "${i} does not exist!"
+					continue
+				fi
+				mv "${ED}"${i}{,-${ver}-${P}} || die
+			done
+			;;
+	esac
+}
+
+src_remove_dual_man() {
+	local i pkg ver ff
+	pkg="$1"
+	ver="$2"
+	shift 2
+	case "${EBUILD_PHASE:-none}" in
+		postinst|postrm)
+			for i in "$@" ; do
+				ff=`echo "${EROOT}${i%.[0-9]}-${ver}-${P}${i#${i%.[0-9]}}"*`
+				ff=${ff##*${i#${i%.[0-9]}}}
+				alternatives_auto_makesym "${i}${ff}" "${i%.[0-9]}-[0-9]*"
+			done
+			;;
+		install)
+			for i in "$@" ; do
+				if ! [[ -f "${ED}"${i} ]] ; then
+					ewarn "${i} does not exist!"
+					continue
+				fi
+				mv "${ED}"${i} "${ED}"${i%.[0-9]}-${ver}-${P}${i#${i%.[0-9]}} || die
+			done
+			;;
+	esac
+}
+
+src_remove_dual() {
+	local i pkg ver
+	pkg="$1"
+	ver="$2"
+	shift 2
+	for i in "$@" ; do
+		src_remove_dual_file  "${pkg}" "${ver}" "/usr/bin/${i}"
+		src_remove_dual_man   "${pkg}" "${ver}" "/usr/share/man/man1/${i}.1"
+	done
+}
+
+src_prepare_update_patchlevel_h() {
+	# Copied and modified from debian:
+	# Copyright 2011 Niko Tyni
+	# This program is free software; you can redistribute it and/or modify
+	# it under the same terms as Perl itself.
+	local patchdir="${WORKDIR}/patches"
+	local prefix
+	local patchoutput="patchlevel-gentoo.h"
+
+	[[ -f ${patchdir}/series ]] || return 0
+
+while read patch
+do
+	patchname=$(echo $patch | sed 's/\.diff$//')
+	< $patchdir/$patch sed -e '/^Subject:/ { N; s/\n / / }' | sed -n -e '
+
+	# massage the patch headers
+	s|^Bug: .*https\?://rt\.perl\.org/.*id=\(.*\).*|[perl #\1]|; tprepend;
+	s|^Bug: .*https\?://rt\.cpan\.org/.*id=\(.*\).*|[rt.cpan.org #\1]|; tprepend;
+	s|^Bug-Gentoo: ||; tprepend;
+	s/^\(Subject\|Description\): //; tappend;
+	s|^Origin: .*http://perl5\.git\.perl\.org/perl\.git/commit\(diff\)\?/\(.......\).*|[\2]|; tprepend;
+
+	# post-process at the end of input
+	$ { x;
+		# include the version number in the patchlevel.h description (if available)
+		s/List packaged patches/&'" for ${PF}(#${PATCH_VER})"'/;
+
+		# escape any backslashes and double quotes
+		s|\\|\\\\|g; s|"|\\"|g;
+
+		# add a prefix
+		s|^|\t,"'"$prefix$patchname"' - |;
+		# newlines away
+		s/\n/ /g; s/  */ /g;
+		# add a suffix
+		s/ *$/"/; p
+	};
+	# stop all processing
+	d;
+	# label: append to the hold space
+	:append H; d;
+	# label: prepend to the hold space
+	:prepend x; H; d;
+	'
+done < "${WORKDIR}"/patches/series > "${S}/${patchoutput}"
+echo "${patchoutput}" >> "${S}/MANIFEST"
+}
+
+src_prepare() {
+	local patch
+	EPATCH_OPTS+=" -p1"
+	einfo "Applying patches from ${MY_P}-${PATCH_VER} ..."
+	while read patch ; do
+		EPATCH_SINGLE_MSG="  ${patch} ..."
+		epatch "${WORKDIR}"/patches/${patch}
+	done < "${WORKDIR}"/patches/series
+
+	src_prepare_update_patchlevel_h
+
+	if tc-is-cross-compiler; then
+		cp -a ../perl-cross-${CROSS_VER}/* . || die
+		touch cpan/CPANPLUS/lib/CPANPLUS.pm || die
+
+		sed -i \
+			-e 's/(15 + $CLEANUP)/(13 + $CLEANUP)/' \
+			cnf/diffs/perl5-${PV}/makemaker-test.patch || die
+
+		sed -i \
+			-e 's/MakeMaker\.pm .*/MakeMaker.pm effd272b3c9224af6fd0f6cae7183f33ec4b1106/' \
+			-e 's/MM_Unix\.pm .*/MM_Unix.pm 648f834524bcdef67c3b6bae28e8c1ef443d0fc1/' \
+			cnf/diffs/perl5-${PV}/customized.patch || die
+	fi
+
+	if ! tc-is-static-only ; then
+		ln -s ${LIBPERL} libperl$(get_libname ${SHORT_PV}) || die
+		ln -s ${LIBPERL} libperl$(get_libname ) || die
+	fi
+
+	if use gdbm; then
+		sed -i "s:INC => .*:INC => \"-I${EROOT}usr/include/gdbm\":g" \
+			ext/NDBM_File/Makefile.PL || die
+	fi
+
+	default
+}
+
+myconf() {
+	# the myconf array is declared in src_configure
+	myconf=( "${myconf[@]}" "$@" )
+}
+
+src_configure() {
+	declare -a myconf
+
+	export LC_ALL="C"
+	[[ ${COLUMNS:-1} -ge 1 ]] || unset COLUMNS # bug #394091
+
+	# some arches and -O do not mix :)
+	use ppc && replace-flags -O? -O1
+
+	# Perl has problems compiling with -Os in your flags with glibc
+	use elibc_uclibc || replace-flags "-Os" "-O2"
+
+	# This flag makes compiling crash in interesting ways
+	filter-flags "-malign-double"
+
+	# Fixes bug #97645
+	use ppc && filter-flags "-mpowerpc-gpopt"
+
+	# Fixes bug #143895 on gcc-4.1.1
+	filter-flags "-fsched2-use-superblocks"
+
+	use sparc && myconf -Ud_longdbl
+
+	export BUILD_BZIP2=0
+	export BZIP2_INCLUDE=${EROOT}/usr/include
+	export BZIP2_LIB=${EROOT}/usr/$(get_libdir)
+
+	export BUILD_ZLIB=False
+	export ZLIB_INCLUDE=${EROOT}/usr/include
+	export ZLIB_LIB=${EROOT}/usr/$(get_libdir)
+
+	# allow either gdbm to provide ndbm (in <gdbm/ndbm.h>) or db1
+	myndbm='U'
+	mygdbm='U'
+	mydb='U'
+	if use gdbm ; then
+		mygdbm='D'
+		myndbm='D'
+	fi
+	if use berkdb ; then
+		mydb='D'
+		has_version '=sys-libs/db-1*' && myndbm='D'
+	fi
+
+	myconf "-${myndbm}i_ndbm" "-${mygdbm}i_gdbm" "-${mydb}i_db"
+
+	if use alpha && [[ "$(tc-getCC)" = "ccc" ]] ; then
+		ewarn "Perl will not be built with berkdb support, use gcc if you needed it..."
+		myconf -Ui_db -Ui_ndbm
+	fi
+
+	use ithreads && myconf -Dusethreads
+
+	if use debug ; then
+		append-cflags "-g"
+		myconf -DDEBUGGING
+	elif [[ ${CFLAGS} == *-g* ]] ; then
+		myconf -DDEBUGGING=-g
+	else
+		myconf -DDEBUGGING=none
+	fi
+
+	if [[ -n ${PERL_OLDVERSEN} ]] ; then
+		local inclist=$(for v in ${PERL_OLDVERSEN}; do echo -n "${v}/${myarch}${mythreading} ${v} "; done )
+		myconf -Dinc_version_list="${inclist}"
+	fi
+
+	[[ ${ELIBC} == "FreeBSD" ]] && myconf "-Dlibc=/usr/$(get_libdir)/libc.a"
+
+	# Make sure we can do the final link #523730, need to set deployment
+	# target to override hardcoded 10.3 which breaks on modern OSX
+	[[ ${CHOST} == *-darwin* ]] && \
+		myconf "-Dld=env MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} $(tc-getCC)"
+
+	# Prefix: the host system needs not to follow Gentoo multilib stuff, and in
+	# Prefix itself we don't do multilib either, so make sure perl can find
+	# something compatible.
+	if use prefix ; then
+		# Set a hook to check for each detected library whether it actually works.
+		export libscheck="
+			( echo 'main(){}' > '${T}'/conftest.c &&
+			  $(tc-getCC) -o '${T}'/conftest '${T}'/conftest.c -l\$thislib >/dev/null 2>/dev/null
+			) || xxx=/dev/null"
+
+		# Use all host paths that might contain useful stuff, the hook above will filter out bad choices.
+		local paths="/lib/*-linux-gnu /usr/lib/*-linux-gnu /lib64 /lib/64 /usr/lib64 /usr/lib/64 /lib32 /usr/lib32 /lib /usr/lib"
+		myconf "-Dlibpth=${EPREFIX}/$(get_libdir) ${EPREFIX}/usr/$(get_libdir) ${paths}"
+	elif [[ $(get_libdir) != "lib" ]] ; then
+		# We need to use " and not ', as the written config.sh use ' ...
+		myconf "-Dlibpth=/usr/local/$(get_libdir) /$(get_libdir) /usr/$(get_libdir)"
+	fi
+
+	# don't try building ODBM, bug #354453
+	disabled_extensions="ODBM_File"
+
+	if ! use gdbm ; then
+		# workaround for bug #157774: don't try building GDBM related stuff with USE="-gdbm"
+		disabled_extensions="${disabled_extensions} GDBM_File NDBM_File"
+	fi
+
+	myconf -Dnoextensions="${disabled_extensions}"
+
+	[[ -n "${EXTRA_ECONF}" ]] && ewarn During Perl build, EXTRA_ECONF=${EXTRA_ECONF}
+	# allow fiddling via EXTRA_ECONF, bug 558070
+	eval "local -a EXTRA_ECONF=(${EXTRA_ECONF})"
+
+	myconf \
+		-Duseshrplib \
+		-Darchname="${myarch}" \
+		-Dcc="$(tc-getCC)" \
+		-Doptimize="${CFLAGS}" \
+		-Dldflags="${LDFLAGS}" \
+		-Dprefix="${EPREFIX}"'/usr' \
+		-Dsiteprefix="${EPREFIX}"'/usr/local' \
+		-Dvendorprefix="${EPREFIX}"'/usr' \
+		-Dscriptdir="${EPREFIX}"'/usr/bin' \
+		-Dprivlib="${EPREFIX}${PRIV_LIB}" \
+		-Darchlib="${EPREFIX}${ARCH_LIB}" \
+		-Dsitelib="${EPREFIX}${SITE_LIB}" \
+		-Dsitearch="${EPREFIX}${SITE_ARCH}" \
+		-Dvendorlib="${EPREFIX}${VENDOR_LIB}" \
+		-Dvendorarch="${EPREFIX}${VENDOR_ARCH}" \
+		-Dman1dir="${EPREFIX}"/usr/share/man/man1 \
+		-Dman3dir="${EPREFIX}"/usr/share/man/man3 \
+		-Dsiteman1dir="${EPREFIX}"/usr/local/man/man1 \
+		-Dsiteman3dir="${EPREFIX}"/usr/local/man/man3 \
+		-Dvendorman1dir="${EPREFIX}"/usr/share/man/man1 \
+		-Dvendorman3dir="${EPREFIX}"/usr/share/man/man3 \
+		-Dman1ext='1' \
+		-Dman3ext='3pm' \
+		-Dlibperl="${LIBPERL}" \
+		-Dlocincpth="${EPREFIX}"'/usr/include ' \
+		-Dglibpth="${EPREFIX}/$(get_libdir) ${EPREFIX}/usr/$(get_libdir)"' ' \
+		-Duselargefiles \
+		-Dd_semctl_semun \
+		-Dcf_by='Gentoo' \
+		-Dmyhostname='localhost' \
+		-Dperladmin='root@localhost' \
+		-Ud_csh \
+		-Dsh="${EPREFIX}"/bin/sh \
+		-Dtargetsh="${EPREFIX}"/bin/sh \
+		-Uusenm \
+		"${myconf[@]}" \
+		"${EXTRA_ECONF[@]}"
+
+	if tc-is-cross-compiler; then
+		./configure \
+			--target="${CHOST}" \
+			-Dinstallprefix='' \
+			-Dinstallusrbinperl='undef' \
+			-Dusevendorprefix='define' \
+			"${myconf[@]}" \
+			|| die "Unable to configure"
+	else
+		sh Configure \
+			-des \
+			-Dinstallprefix="${EPREFIX}"'/usr' \
+			-Dinstallusrbinperl='n' \
+			"${myconf[@]}" \
+			|| die "Unable to configure"
+	fi
+}
+
+src_test() {
+	export NO_GENTOO_NETWORK_TESTS=1;
+	if [[ ${EUID} == 0 ]] ; then
+		ewarn "Test fails with a sandbox error (#328793) if run as root. Skipping tests..."
+		return 0
+	fi
+	use elibc_uclibc && export MAKEOPTS+=" -j1"
+	TEST_JOBS="$(makeopts_jobs)" make test_harness || die "test failed"
+}
+
+src_install() {
+	local i
+	local coredir="${ARCH_LIB}/CORE"
+
+	emake DESTDIR="${D}" install
+
+	rm -f "${ED}/usr/bin/perl${MY_PV}"
+	ln -s perl "${ED}"/usr/bin/perl${MY_PV} || die
+
+	if ! tc-is-static-only ; then
+		dolib.so "${ED}"${coredir}/${LIBPERL}
+		rm -f "${ED}"${coredir}/${LIBPERL}
+		ln -sf ${LIBPERL} "${ED}"/usr/$(get_libdir)/libperl$(get_libname ${SHORT_PV}) || die
+		ln -sf ${LIBPERL} "${ED}"/usr/$(get_libdir)/libperl$(get_libname) || die
+		ln -sf ../../../../../$(get_libdir)/${LIBPERL} "${ED}"${coredir}/${LIBPERL} || die
+		ln -sf ../../../../../$(get_libdir)/${LIBPERL} "${ED}"${coredir}/libperl$(get_libname ${SHORT_PV}) || die
+		ln -sf ../../../../../$(get_libdir)/${LIBPERL} "${ED}"${coredir}/libperl$(get_libname) || die
+	fi
+
+	rm -rf "${ED}"/usr/share/man/man3 || die "Unable to remove module man pages"
+
+	# This removes ${D} from Config.pm
+	for i in $(find "${D}" -iname "Config.pm" ) ; do
+		einfo "Removing ${D} from ${i}..."
+		sed -i -e "s:${D}::" "${i}" || die "Sed failed"
+	done
+
+	dodoc Changes* README AUTHORS
+
+	if use doc ; then
+		# HTML Documentation
+		# We expect errors, warnings, and such with the following.
+
+		dodir /usr/share/doc/${PF}/html
+		LD_LIBRARY_PATH=. ./perl installhtml \
+			--podroot='.' \
+			--podpath='lib:ext:pod:vms' \
+			--recurse \
+			--htmldir="${ED}/usr/share/doc/${PF}/html"
+	fi
+
+	[[ -d ${ED}/usr/local ]] && rm -r "${ED}"/usr/local
+
+	dual_scripts
+}
+
+pkg_preinst() {
+	check_rebuild
+}
+
+pkg_postinst() {
+	dual_scripts
+
+	if [[ "${ROOT}" = "/" ]] ; then
+		local INC DIR file
+		INC=$(perl -e 'for $line (@INC) { next if $line eq "."; next if $line =~ m/'${SHORT_PV}'|etc|local|perl$/; print "$line\n" }')
+		einfo "Removing old .ph files"
+		for DIR in ${INC} ; do
+			if [[ -d "${DIR}" ]] ; then
+				for file in $(find "${DIR}" -name "*.ph" -type f ) ; do
+					rm -f "${file}"
+					einfo "<< ${file}"
+				done
+			fi
+		done
+		# Silently remove the now empty dirs
+		for DIR in ${INC} ; do
+			if [[ -d "${DIR}" ]] ; then
+				find "${DIR}" -depth -type d -print0 | xargs -0 -r rmdir &> /dev/null
+			fi
+		done
+
+	fi
+}
+
+pkg_postrm(){
+	dual_scripts
+}
--- a/dev-libs/botan/Manifest
+++ b/dev-libs/botan/Manifest
@ -1,2 +1,4 @@
 DIST Botan-1.10.12.tgz 2707397 SHA256 affc3a79919577943f896e64d3e4a4dcc4970c5bf80cc98c7f3a3144745eac27 SHA512 074ed9c89d715ada53a3366139da3f0f2fd7ee01941d301b0a9c1a897927ed88c0ade32f66768091664e6b652b7921b3b4c513106ee6ce1942dece3a25216bf5 WHIRLPOOL bfe7029e5ebf660434b14cd49e0c9f4612e9ee88ad50803edfa589754bede01dc39d71542b62eaaa0f7e85dbf623b4b11a90528bcb903c2333103685ce91401f
+DIST Botan-1.10.13.tgz 2710181 SHA256 23ec973d4b4a4fe04f490d409e08ac5638afe3aa09acd7f520daaff38ba19b90 SHA512 a09d2cb5dda21bf384b81675025f249abdfe232c95dc3383f0baebc2bf1603b2ed1e2aec9a81aae95df592ec2eeae8906c63474a6da42ad3701669a5d8f14656 WHIRLPOOL 4161d689205f02ed8b97bb371be47829d11dee744a024e24bb834264cfa6143c8a9fb7df969410975e4bf2b708063e3c05b6106c4dbe7f5566e3331ee5e901a9
 DIST Botan-1.11.29.tgz 3137027 SHA256 e604eca7f0a733f6ef23ddd9209d82589728a4befd48dff3532740130ebaeb94 SHA512 c6ad6cf3d68c3524b9532e9f52e74d89cc2abfd093f1a46a44efa94a87b0fa50278f11dc5953225160d090cf8ae1c372f54c23b5dffd1f3dae79e210195cfd72 WHIRLPOOL f97f0a013c5ed3c7ec7403b8ae584b7396b91a8fcf9181d7e53f17cbd172301c1c228378e58d851fd591f2be9584b18e3eba05e5c5709750a3cf6cc6538f1bc7
+DIST Botan-1.11.32.tgz 4036606 SHA256 b6b579a08adc4005f7d026120152460e8d4c8656293f7760d38c29b33d7e9c2c SHA512 c9ceff4d4d73c8de2198ac94cd5d585280bc17349f97a9007ba878e8682e7650a598962d68a61ed2e87174c0880b6d162e47744ff6df3e4e110b625672f93f1e WHIRLPOOL c932be4335dfa298ca7379bc00899ea4fc61b5fc2265712e0057b544c9ed4eb5e3f81f9f29e229a2929f292af4568f563579dd270b9764555654d45d57a3b713
--- a/dev-libs/botan/botan-1.10.13.ebuild
+++ b/dev-libs/botan/botan-1.10.13.ebuild
@ -0,0 +1,150 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit eutils multilib python-r1 toolchain-funcs
+
+MY_PN="Botan"
+MY_P="${MY_PN}-${PV}"
+DESCRIPTION="A C++ crypto library"
+HOMEPAGE="http://botan.randombit.net/"
+SRC_URI="http://botan.randombit.net/releases/${MY_P}.tgz"
+
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos"
+SLOT="0"
+LICENSE="BSD"
+IUSE="bindist doc python bzip2 gmp ssl static-libs threads zlib"
+
+S="${WORKDIR}/${MY_P}"
+
+RDEPEND="bzip2? ( >=app-arch/bzip2-1.0.5 )
+	zlib? ( >=sys-libs/zlib-1.2.3 )
+	python? ( ${PYTHON_DEPS} >=dev-libs/boost-1.48[python,${PYTHON_USEDEP}] )
+	gmp? ( >=dev-libs/gmp-4.2.2:* )
+	ssl? ( >=dev-libs/openssl-0.9.8g:*[bindist=] )"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx )"
+
+src_prepare() {
+	default
+
+	sed -e "s/-Wl,-soname,\$@ //" -i src/build-data/makefile/python.in || die "sed failed"
+	sed \
+		-e "/DOCDIR/d" \
+		-e "/^install:/s/ docs//" \
+		-i src/build-data/makefile/unix_shr.in || die "sed failed"
+
+	# Fix ImportError with Python 3.
+	sed -e "s/_botan/.&/" -i src/wrap/python/__init__.py || die "sed failed"
+
+	use python && python_copy_sources
+}
+
+src_configure() {
+	local disable_modules="proc_walk,unix_procs"
+	use threads || disable_modules+=",pthreads"
+	use bindist && disable_modules+=",ecdsa"
+	elog "Disabling modules: ${disable_modules}"
+
+	# Enable v9 instructions for sparc64
+	if [[ "${PROFILE_ARCH}" = "sparc64" ]]; then
+		CHOSTARCH="sparc32-v9"
+	else
+		CHOSTARCH="${CHOST%%-*}"
+	fi
+
+	local myos=
+	case ${CHOST} in
+		*-darwin*)   myos=darwin ;;
+		*)           myos=linux  ;;
+	esac
+
+	# foobared buildsystem, --prefix translates into DESTDIR, see also make
+	# install in src_install, we need the correct live-system prefix here on
+	# Darwin for a shared lib with correct install_name
+	./configure.py \
+		--prefix="${EPREFIX}/usr" \
+		--libdir=$(get_libdir) \
+		--docdir=share/doc \
+		--cc=gcc \
+		--os=${myos} \
+		--cpu=${CHOSTARCH} \
+		--with-endian="$(tc-endian)" \
+		--without-sphinx \
+		--with-tr1=system \
+		$(use_with bzip2) \
+		$(use_with gmp gnump) \
+		$(use_with python boost-python) \
+		$(use_with ssl openssl) \
+		$(use_with zlib) \
+		--disable-modules=${disable_modules} \
+		|| die "configure.py failed"
+}
+
+src_compile() {
+	emake CXX="$(tc-getCXX)" AR="$(tc-getAR) crs" LIB_OPT="${CXXFLAGS}" MACH_OPT=""
+
+	if use python; then
+		building() {
+			rm -fr build/python
+			ln -s "${BUILD_DIR}" build/python
+			cp Makefile.python build/python
+			sed -i \
+				-e "s/-lboost_python/-lboost_python-$(echo ${EPYTHON} | sed 's/python//')/" \
+				build/python/Makefile.python
+			emake -f build/python/Makefile.python \
+				CXX="$(tc-getCXX)" \
+				CFLAGS="${CXXFLAGS}" \
+				LDFLAGS="${LDFLAGS}" \
+				PYTHON_ROOT="/usr/$(get_libdir)" \
+				PYTHON_INC="-I$(python_get_includedir)"
+		}
+		python_foreach_impl building
+	fi
+
+	if use doc; then
+		einfo "Generation of documentation"
+		sphinx-build doc doc_output
+	fi
+}
+
+src_test() {
+	chmod -R ugo+rX "${S}"
+	emake CXX="$(tc-getCXX)" CHECK_OPT="${CXXFLAGS}" check
+	LD_LIBRARY_PATH="${S}" ./check --validate || die "Validation tests failed"
+}
+
+src_install() {
+	emake DESTDIR="${ED}usr" install
+
+	if ! use static-libs; then
+		rm "${ED}usr/$(get_libdir)/libbotan"*.a || die 'remove of static libs failed'
+	fi
+
+	# Add compatibility symlinks.
+	[[ -e "${ED}usr/bin/botan-config" ]] && die "Compatibility code no longer needed"
+	[[ -e "${ED}usr/$(get_libdir)/pkgconfig/botan.pc" ]] && die "Compatibility code no longer needed"
+	dosym botan-config-1.10 /usr/bin/botan-config
+	dosym botan-1.10.pc /usr/$(get_libdir)/pkgconfig/botan.pc
+
+	if use python; then
+		installation() {
+			rm -fr build/python
+			ln -s "${BUILD_DIR}" build/python
+			emake -f Makefile.python \
+				PYTHON_SITE_PACKAGE_DIR="${ED}$(python_get_sitedir)" \
+				install
+		}
+		python_foreach_impl installation
+	fi
+
+	if use doc; then
+		pushd doc_output > /dev/null
+		insinto /usr/share/doc/${PF}/html
+		doins -r [a-z]* _static
+		popd > /dev/null
+	fi
+}
--- a/dev-libs/botan/botan-1.11.32.ebuild
+++ b/dev-libs/botan/botan-1.11.32.ebuild
@ -0,0 +1,141 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit eutils multilib python-r1 toolchain-funcs
+
+MY_PN="Botan"
+MY_P="${MY_PN}-${PV}"
+DESCRIPTION="A C++ crypto library"
+HOMEPAGE="http://botan.randombit.net/"
+SRC_URI="http://botan.randombit.net/releases/${MY_P}.tgz"
+
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos"
+SLOT="0"
+LICENSE="BSD"
+IUSE="bindist doc boost python bzip2 libressl lzma sqlite ssl static-libs zlib test"
+
+S="${WORKDIR}/${MY_P}"
+
+REQUIRED_USE="python? ( boost )"
+
+RDEPEND="bzip2? ( >=app-arch/bzip2-1.0.5 )
+	zlib? ( >=sys-libs/zlib-1.2.3 )
+	boost? ( ${PYTHON_DEPS} >=dev-libs/boost-1.48[python?,${PYTHON_USEDEP}] )
+	lzma? ( app-arch/xz-utils )
+	sqlite? ( dev-db/sqlite:3 )
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-0.9.8g:0[bindist=] )
+		libressl? ( dev-libs/libressl )
+	)"
+DEPEND="${RDEPEND}
+	test? ( app-misc/datefudge )
+	doc? ( dev-python/sphinx )"
+
+PATCHES=(
+	"${FILESDIR}/${P}-urandom.patch"
+)
+
+pkg_pretend() {
+	# Botan 1.11 requires -std=c++11
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		[[ $(gcc-major-version) -lt 4 ]] || \
+		( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]] ) \
+		&& die "Sorry, but gcc 4.7 or higher is required."
+	fi
+}
+
+src_prepare() {
+	default
+	sed \
+		-e "/^install:/s/ docs//" \
+		-i src/build-data/makefile/gmake.in || die "sed failed"
+	use python && python_copy_sources
+}
+
+src_configure() {
+	local disable_modules=( proc_walk unix_procs )
+	use boost || disable_modules+=( "boost" )
+	use bindist && disable_modules+=( "ecdsa" )
+	use python || disable_modules+=( "ffi" )
+	elog "Disabling modules: ${disable_modules[@]}"
+
+	# Enable v9 instructions for sparc64
+	if [[ "${PROFILE_ARCH}" = "sparc64" ]]; then
+		CHOSTARCH="sparc32-v9"
+	else
+		CHOSTARCH="${CHOST%%-*}"
+	fi
+
+	local myos=
+	case ${CHOST} in
+		*-darwin*)   myos=darwin ;;
+		*)           myos=linux  ;;
+	esac
+
+	local pythonvers=()
+	if use python; then
+		append() {
+			pythonvers+=( ${EPYTHON/python/} )
+		}
+		python_foreach_impl append
+	fi
+
+	./configure.py \
+		--prefix="${EPREFIX}/usr" \
+		--destdir="${D}/${EPREFIX}/usr" \
+		--libdir=$(get_libdir) \
+		--docdir=share/doc \
+		--cc=gcc \
+		--os=${myos} \
+		--cpu=${CHOSTARCH} \
+		--with-endian="$(tc-endian)" \
+		--without-sphinx \
+		$(use_with bzip2) \
+		$(use_with lzma) \
+		$(use_with sqlite sqlite3) \
+		$(use_with ssl openssl) \
+		$(use_with zlib) \
+		$(use_with boost) \
+		--with-python-version=$(IFS=","; echo "${pythonvers[*]}" ) \
+		--disable-modules=$(IFS=","; echo "${disable_modules[*]}" ) \
+		|| die "configure.py failed"
+}
+
+src_compile() {
+	emake CXX="$(tc-getCXX) -pthread" AR="$(tc-getAR) crs" LIB_OPT="-c ${CXXFLAGS}"
+	if use doc; then
+		einfo "Generation of documentation"
+		sphinx-build doc doc_output
+	fi
+}
+
+src_test() {
+	LD_LIBRARY_PATH="${S}" datefudge "2016-10-01 00:00" ./botan-test || die "Validation tests failed"
+}
+
+src_install() {
+	emake install
+
+	if ! use static-libs; then
+		rm "${ED}usr/$(get_libdir)/libbotan"*.a || die 'remove of static libs failed'
+	fi
+
+	# Add compatibility symlinks.
+	[[ -e "${ED}usr/bin/botan-config" ]] && die "Compatibility code no longer needed"
+	[[ -e "${ED}usr/$(get_libdir)/pkgconfig/botan.pc" ]] && die "Compatibility code no longer needed"
+	dosym botan-config-1.11 /usr/bin/botan-config
+	dosym botan-1.11.pc /usr/$(get_libdir)/pkgconfig/botan.pc
+
+	use python && python_foreach_impl python_optimize
+
+	if use doc; then
+		pushd doc_output > /dev/null
+		insinto /usr/share/doc/${PF}/html
+		doins -r [a-z]* _static
+		popd > /dev/null
+	fi
+}
--- a/dev-libs/botan/files/botan-1.11.32-urandom.patch
+++ b/dev-libs/botan/files/botan-1.11.32-urandom.patch
@ -0,0 +1,26 @@
+diff --git a/src/lib/rng/system_rng/system_rng.cpp b/src/lib/rng/system_rng/system_rng.cpp
+index 135f4fa..3b44d5a 100644
+--- a/src/lib/rng/system_rng/system_rng.cpp
+++ b/src/lib/rng/system_rng/system_rng.cpp
+@@ -74,7 +74,7 @@ System_RNG_Impl::System_RNG_Impl()
+   #define O_NOCTTY 0
+ #endif
+ 
+-   m_fd = ::open(BOTAN_SYSTEM_RNG_DEVICE, O_RDWR | O_NOCTTY);
+   m_fd = ::open(BOTAN_SYSTEM_RNG_DEVICE, O_RDONLY | O_NOCTTY);
+    if(m_fd < 0)
+       throw Exception("System_RNG failed to open RNG device");
+ #endif
+diff --git a/src/tests/test_ffi.cpp b/src/tests/test_ffi.cpp
+index d481116..5b9f5fd 100644
+--- a/src/tests/test_ffi.cpp
+++ b/src/tests/test_ffi.cpp
+@@ -74,7 +74,7 @@ class FFI_Unit_Tests : public Test
+          if(TEST_FFI_OK(botan_rng_init, (&rng, "system")))
+             {
+             TEST_FFI_OK(botan_rng_get, (rng, outbuf.data(), outbuf.size()));
+-            TEST_FFI_OK(botan_rng_reseed, (rng, 256));
+            //TEST_FFI_OK(botan_rng_reseed, (rng, 256));
+             TEST_FFI_OK(botan_rng_destroy, (rng));
+             }
+ 
--- a/dev-libs/crypto++/crypto++-5.6.5.ebuild
+++ b/dev-libs/crypto++/crypto++-5.6.5.ebuild
@ -8,7 +8,7 @@ inherit flag-o-matic toolchain-funcs

 DESCRIPTION="C++ class library of cryptographic schemes"
 HOMEPAGE="http://cryptopp.com"
-SRC_URI="mirror://sourceforge/cryptopp/cryptopp${PV//.}.zip"
+SRC_URI="https://www.cryptopp.com/cryptopp${PV//.}.zip"

 LICENSE="Boost-1.0"
 SLOT="0/5.6" # subslot is so version
--- a/dev-perl/Date-Manip/Date-Manip-6.510.0.ebuild
+++ b/dev-perl/Date-Manip/Date-Manip-6.510.0.ebuild
@ -12,7 +12,7 @@ DESCRIPTION="Perl date manipulation routines"

 SLOT="0"
 KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
-IUSE="test"
+IUSE="elibc_musl test"

 RDEPEND="
 	virtual/perl-Carp
@ -21,6 +21,7 @@ RDEPEND="
 	virtual/perl-File-Spec
 	virtual/perl-IO
 	virtual/perl-Storable
+	elibc_musl? ( sys-libs/timezone-data )
 "
 DEPEND="${RDEPEND}
 	>=dev-perl/Module-Build-0.210.0
--- a/dev-perl/Date-Manip/Date-Manip-6.520.0.ebuild
+++ b/dev-perl/Date-Manip/Date-Manip-6.520.0.ebuild
@ -12,7 +12,7 @@ DESCRIPTION="Perl date manipulation routines"

 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
-IUSE="test"
+IUSE="elibc_musl test"

 RDEPEND="
 	virtual/perl-Carp
@ -21,6 +21,7 @@ RDEPEND="
 	virtual/perl-File-Spec
 	virtual/perl-IO
 	virtual/perl-Storable
+	elibc_musl? ( sys-libs/timezone-data )
 "
 DEPEND="${RDEPEND}
 	>=dev-perl/Module-Build-0.210.0
--- a/dev-perl/XML-SAX-Writer/Manifest
+++ b/dev-perl/XML-SAX-Writer/Manifest
@ -1,2 +1 @@
-DIST XML-SAX-Writer-0.54.tar.gz 21399 SHA256 a1b4d959aed8f8337523c4cef4b431e56e619c795dc6f99a868548952101cf3d SHA512 c7c7dcf157b872b2f4c4dbe4119945e31fe4ffc1eaf7df68e19b0e892cba5ff1ea0b4213199fdeca2747ca75169d14a3811a90c16915c40454b3ef22b754cf27 WHIRLPOOL 853411b4a32f7f973e46542b6aa4e52de926e0947f65e6884617739156fe81a13fe87ae7571dc44b13e93335c0c2a9e09c7efb8990580b3f63e18ac59d04b7c7
 DIST XML-SAX-Writer-0.56.tar.gz 21484 SHA256 d073f7a25072c8150317b86b99d07031316a15bffab99e63e5afe591c8217d03 SHA512 af792d43394133adef608a80fcbaa0e24098e9b0408daac91aefb43735d20a27fcb003c90c95d1e472d2b951b64d5ce81ca9e1da956973eed1856f8b111cc866 WHIRLPOOL 9bb10032f899b5a6286990046591d44be4a820ad32a650c51bf4191b8628cabe5d555ffef54824f641f86b1c8291a25186b0d33c3f2c8b241ed4b80e798a6692
--- a/dev-perl/XML-SAX-Writer/XML-SAX-Writer-0.540.0.ebuild
+++ b/dev-perl/XML-SAX-Writer/XML-SAX-Writer-0.540.0.ebuild
@ -1,23 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=PERIGRIN
-MODULE_VERSION=0.54
-inherit perl-module
-
-DESCRIPTION="SAX2 Writer"
-
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE=""
-
-RDEPEND="dev-perl/XML-Filter-BufferText
-	dev-perl/XML-SAX
-	>=dev-perl/XML-NamespaceSupport-1.04
-	>=dev-libs/libxml2-2.4.1"
-DEPEND="${RDEPEND}"
-
-SRC_TEST="do"
--- a/dev-perl/XML-SAX-Writer/XML-SAX-Writer-0.560.0.ebuild
+++ b/dev-perl/XML-SAX-Writer/XML-SAX-Writer-0.560.0.ebuild
@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="SAX2 Writer"

 SLOT="0"
-KEYWORDS="alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""

 RDEPEND="dev-perl/XML-Filter-BufferText
--- a/dev-python/aiohttp/Manifest
+++ b/dev-python/aiohttp/Manifest
@ -1,5 +1,4 @@
 DIST aiohttp-0.21.5.tar.gz 529005 SHA256 bac5c883721e0818e405597d2778f08a38cc097df01f574462de2cc4f8090559 SHA512 4958d7c58988a95fc5b1e94e4eb7247f59b55e5ba439391c7b072a7ec267491159e1c8c7c6f05e6f7f72e4de5c12784c8d437665c01e6d9fb1e87a3334c1d35c WHIRLPOOL 135368db11316c8f99f39bbf317f791e433a779f61e45070166bab12b4e97165d2c6e732e8da96a848b431c1f26de45e416009bca4e75456025187ea7a41e04e
-DIST aiohttp-1.0.1.tar.gz 498972 SHA256 f5133431d66ef8838f40d233b0fc9e4b9e69616560cbedb89317d551dcc42e41 SHA512 3744186d259563d21e5a7a3c5969f24178a442b1482a98d1d45e132dc4d889c55b9ff3da4394acbcca2dc9c7c78b7eb857cb2467c0faec54e11832db909760f6 WHIRLPOOL cbc31efafa28e17375fc795a053878ddc6978c36926e4ce250bb06ae39f332ed1f2e4ec255a19e334bc994cd5707c2ac1ade48c4089546e432c16b8527374daf
-DIST aiohttp-1.0.2.tar.gz 499266 SHA256 d104a8e762debc1acc3fe40dbc4f0da4cace5a797a93d59c618673b390d3947c SHA512 94004219b8809bad26df4119512faaad7ebbc7c961fea2488f333aa580a24691752154a688e9fe224be6aeb2b769c6f101a288fec66fdf66e619756ebe98258b WHIRLPOOL 7130e1ea90ef64af9bd128ae8c021e5ba2061c02b276aa81db0aabd326572ef3e68396c842cedec43d0f68ea33bce6128d3f2275909fdae3a942de90b7d3bfda
 DIST aiohttp-1.0.3.tar.gz 499693 SHA256 5ec0fdf17868bcabfef4effa3ce53c4cfa6108b481585bda88498f46435d5eaa SHA512 1fd915d04bf978826863c06a3a9ef5c23fd11c3b6a65b71828a7be4301e24421483717af6181319ba8461a22351decda4fb776765d18843e4ab1f436f5319d73 WHIRLPOOL 8e6b2503833c98d0d5e341275cc82a0a943e3f69b8b2a0c478c826775aff35b343af6d786b919d75f46a920e09b33eca3d24ba1bec316db82d16a1006cd71e0c
 DIST aiohttp-1.0.4.tar.gz 562803 SHA256 7e2d4282b2031ca2aaef35d4291743f37a8840821e8b3c6b491fcd903ad853c0 SHA512 437bed5e5f8729e8809411213cdb8f6a7de08879841c0cc89e88eec6de1883702903ecfb1b8e32ecf3701415fd6757545a0aafd44738681050425d5df44bef56 WHIRLPOOL 4ccb55b93fba2774ea65adcf3b5b00c3bc8bc72f05ac2a07bc84d50dbf07c34b4f3ee75265b800ef59aa9c7deb61e23c7662b3226f8aa0c40918c17295085568
+DIST aiohttp-1.0.5.tar.gz 563623 SHA256 053a16d03672cb3055cfac06650d238f55205702207be4a3b40c42333df0ebeb SHA512 f6fe77729a54d817046f0cc952d8906524c2dfe6712dd1972d696680fe34310b6dba9a3b48b6e27c52d3fedd3fa0f541a7c1ac45488b3358e39e3768a01749d9 WHIRLPOOL 51c609bed1bad59e8c1761fa412ed36031da7b80dff03f5edffd84763044cdb570c49d7b9970d133c9b1b224cc293e73004b00447f5b242d91c8286cc21e87c9
--- a/dev-python/aiohttp/aiohttp-1.0.2.ebuild
+++ b/dev-python/aiohttp/aiohttp-1.0.2.ebuild
@ -1,59 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_4 python3_5 )
-
-inherit distutils-r1
-
-DESCRIPTION="http client/server for asyncio"
-HOMEPAGE="https://pypi.python.org/pypi/aiohttp"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-EGIT_REPO_URI="https://github.com/KeepSafe/aiohttp"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples test"
-
-CDEPEND="
-	dev-python/aiodns[${PYTHON_USEDEP}]
-	dev-python/async_timeout[${PYTHON_USEDEP}]
-	dev-python/chardet[${PYTHON_USEDEP}]
-	>=dev-python/multidict-2[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/cython[${PYTHON_USEDEP}]
-	doc? (
-		>=dev-python/alabaster-0.6.2[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-asyncio[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-newsfeed[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-spelling[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
-	test? (
-		${CDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		www-servers/gunicorn[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="${CDEPEND}"
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	PYTHONPATH="$(pwd):${PYTHONPATH}" ${PYTHON} -m pytest tests/ || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	use examples && local EXAMPLES=( examples/. )
-
-	distutils-r1_python_install_all
-}
--- a/dev-python/aiohttp/aiohttp-1.0.5.ebuild
+++ b/dev-python/aiohttp/aiohttp-1.0.5.ebuild
@ -6,23 +6,22 @@ EAPI="6"

 PYTHON_COMPAT=( python3_4 python3_5 )

-inherit distutils-r1
+inherit distutils-r1 vcs-snapshot

 DESCRIPTION="http client/server for asyncio"
 HOMEPAGE="https://pypi.python.org/pypi/aiohttp"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/KeepSafe/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 EGIT_REPO_URI="https://github.com/KeepSafe/aiohttp"

 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="doc examples test"
+IUSE="doc test"

 CDEPEND="
-	dev-python/aiodns[${PYTHON_USEDEP}]
 	dev-python/async_timeout[${PYTHON_USEDEP}]
 	dev-python/chardet[${PYTHON_USEDEP}]
-	>=dev-python/multidict-2[${PYTHON_USEDEP}]
+	>=dev-python/multidict-2.0[${PYTHON_USEDEP}]
 "
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
@ -38,6 +37,7 @@ DEPEND="
 		${CDEPEND}
 		dev-python/pytest[${PYTHON_USEDEP}]
 		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
 		www-servers/gunicorn[${PYTHON_USEDEP}]
 	)
 "
@ -48,12 +48,11 @@ python_compile_all() {
 }

 python_test() {
-	PYTHONPATH="$(pwd):${PYTHONPATH}" ${PYTHON} -m pytest tests/ || die "Tests failed under ${EPYTHON}"
+	PYTHONPATH="${PWD}:${PYTHONPATH}" ${PYTHON} -m pytest tests/ || die "Tests failed under ${EPYTHON}"
 }

 python_install_all() {
 	use doc && local HTML_DOCS=( docs/_build/html/. )
-	use examples && local EXAMPLES=( examples/. )

 	distutils-r1_python_install_all
 }
--- a/dev-python/aldryn-bootstrap3/Manifest
+++ b/dev-python/aldryn-bootstrap3/Manifest
@ -1,2 +1,3 @@
 DIST aldryn-bootstrap3-0.5.1.tar.gz 57146 SHA256 5b38798db7ef7134129e3282ece8efd83029b0556793955606456fc9086c8e18 SHA512 07e6dc1e1d72e7158276a333d6f446e060df47d2eaeb0098ccd82e1a9364a4c22673012dec7cab4ea80b943ec81e669ca6ca824ce3142e402e9fba6d3196acdd WHIRLPOOL eb8490baff93cc800791409ffc0a52a5e2f41bd596b156e65ab3a4d9d72dee8373e567e27a97f522f57b3e7a02651c7ed5261744af06edcd206db6fa18953103
 DIST aldryn-bootstrap3-1.0.7.tar.gz 743255 SHA256 19eb22c9d89fb46d490adf97cb9ddea0ef7c91ad501481063570e56e51947d21 SHA512 45ad41bde043fc490f7960fb77fdd140d99b949020056567de487d60d549a8e748e9d67de070c4fa3072a20b6f8786f5a785cf18eb74566467833fe336d48559 WHIRLPOOL ce53a735f9799c05a357cb0046a9613288c49bf2f1f530fc9546ec00551759769ad9ef4d3b48dd4da1e041646a4e501c4221a073a523da6389b24a01affaa182
+DIST aldryn-bootstrap3-1.1.2.tar.gz 727872 SHA256 60a067f3113381d945d239a82c3862a886cceaa9f523e789458392cc96378539 SHA512 f25a6f85267c4e006ab222e4f334bf745a7300d74f37a7afbd92960c68a3f97f95095e23e63037fe766dcb75a6d696cd5b30e0f8b10ba6a7a030627fbdebf6fb WHIRLPOOL 378d4550262f5b4585e3e09465ebf1b4357710244a64061965cc58bfc3ba4d56dbe29ec7f811895456710f906b48375750b2ed328557e18a47c22a08f0b1db17
--- a/dev-python/aldryn-bootstrap3/aldryn-bootstrap3-1.1.2.ebuild
+++ b/dev-python/aldryn-bootstrap3/aldryn-bootstrap3-1.1.2.ebuild
@ -0,0 +1,30 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+
+PYTHON_COMPAT=( python{2_{6,7},3_{3,4,5}} )
+
+inherit distutils-r1
+
+DESCRIPTION="django CMS plugins for bootstrap3 markup"
+HOMEPAGE="http://www.django-cms.org/en/addons/aldryn-bootstrap3/"
+SRC_URI="https://github.com/aldryn/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	>=dev-python/django-cms-3.1
+	>=dev-python/django-appconf-1.0.0
+	>=dev-python/django-filer-0.9.11
+	>=dev-python/django-durationfield-0.5.2
+"
+
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools
+"
--- a/dev-python/aldryn-common/Manifest
+++ b/dev-python/aldryn-common/Manifest
@ -1 +1,2 @@
 DIST aldryn-common-1.0.3.tar.gz 13780 SHA256 3af6e382841cd736d4c981b13a42a15af4b9d53c3e212c3d1bf8c35b6294cf39 SHA512 3caacfce73d40f0ab18d3a2ca4580cb7ae362dc3770aa17c5a52c1f5fbf8965cb22f44627998c39e77e7f4fee219a47773ff3b32f925ff7e295aa4ac0f70fe6e WHIRLPOOL 0d89b2ad8945b66c3ea6cb4a48a736063bebe945098fbc83f70861b2edc37c8d01134c024ba46972b0d0c8313178d5457d4e894e6bab2c82c3d34091e69d68a1
+DIST aldryn-common-1.0.4.tar.gz 13789 SHA256 3f7ce7d24dd76582879e0ad6b4c0365fe65212ef3e23cda2659e70a3934e84e2 SHA512 6c95cd0ec4ab19e2802fbb5d40a1644eb5c87c0aeae40eed5645cdedb3bde130201067b8c116d86bb68e24a3c6b4c321d7a7d99f3a312493b4c9d2fb4c3eddbb WHIRLPOOL 16cfdf6b4c3e2fbed784d46de6f65c51ce6ca3bc6ceb63725e09d475402f2ca64d9b25cb4d3bd1f8000b3af686d02dbab0af8a53caa85b9332a7f0a88f6b2955
--- a/dev-python/aldryn-common/aldryn-common-1.0.4.ebuild
+++ b/dev-python/aldryn-common/aldryn-common-1.0.4.ebuild
@ -0,0 +1,34 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+
+PYTHON_COMPAT=( python{2_7,3_{3,4,5}} )
+
+inherit distutils-r1
+
+DESCRIPTION="django CMS plugins with common utilities"
+HOMEPAGE="https://pypi.python.org/pypi/aldryn-common"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-python/aldryn-boilerplates
+	dev-python/six
+	>=dev-python/django-sortedm2m-1.2.2
+"
+
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools
+"
+
+src_prepare() {
+	sed -i 's/find_packages()/find_packages(exclude=["tests"])/g' "${S}/setup.py"
+	eapply_user
+}
--- a/dev-python/aldryn-search/Manifest
+++ b/dev-python/aldryn-search/Manifest
@ -1 +1,2 @@
 DIST aldryn-search-0.2.12.tar.gz 24111 SHA256 5d6b6db8cc38ee4fb0449615152ed24918647c6a8995fd4790ed2e8787068d99 SHA512 c94474fc8dbbc71c9282c27367bc37f44a014adb65c117fcb5a160eb7cda21b66dd02c42edb8249b843e4d05170cef6c8431312aa5afdba601f448f4f983e363 WHIRLPOOL 49ac739b5a5bdf47a5b038915790f7e86c68b52feb33db3cac8e9eb17c63e76c608e71f8a8fa87301cc58b02b88c7d998c8553d007499480655859adb8d143fe
+DIST aldryn-search-0.3.0.tar.gz 26548 SHA256 5476aed80763f1b95845aaa7d6f5aa3f8d0c35fa322bacb51703e5b43eb41648 SHA512 ce428ca844798c938964be4412ad87fc9f6c152f4d9bb711e23d0eea4d2c1cb9d2e2e0590648d2f29beb60273562c995f18a5c754107c61db3a19bc139f55c67 WHIRLPOOL 0ca1d2bc9cead929da0ba51ea93fdf1b8f668521b83eb5c9a9f4ccf148211415d5591773f975037b4d8a1cf528102078bb52ebfd5936f61b0a7df6d20f4ad0aa
--- a/dev-python/aldryn-search/aldryn-search-0.3.0.ebuild
+++ b/dev-python/aldryn-search/aldryn-search-0.3.0.ebuild
@ -0,0 +1,33 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_7,3_{3,4,5}} )
+
+inherit distutils-r1
+
+DESCRIPTION="An extension to django CMS to provide multilingual Haystack indexes"
+HOMEPAGE="https://pypi.python.org/pypi/aldryn-search"
+SRC_URI="https://github.com/aldryn/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-python/lxml
+	>=dev-python/django-1.4
+	dev-python/django-appconf
+	>=dev-python/django-cms-3.0
+	>=dev-python/django-haystack-2.0.0
+	dev-python/django-spurl
+	dev-python/django-standard-form
+	>=dev-python/aldryn-common-1.0.2
+"
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools
+"
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@ -1,3 +1,3 @@
-DIST botocore-1.4.56.tar.gz 2778136 SHA256 8cf6152b5af9df16bb7ba660d2bc7dc110911532fc253e052c2c26099d84ac8f SHA512 87b48221e7d1c9d77bd048f5d3a4b67660af1d3c3ebdbce0f517fd3f8fa5ae91cb45d3644d62b40ec85291f4e26f85dff6ddb2258d5a86cce26b82abee09421f WHIRLPOOL c336b5878d5656455b696a75eca28f4c65cc95af0ed79d6e7051908652cf6c935d65db2b9185dabf0df493c49d4478870463ff2a1e31cb33c45f05794cb86621
 DIST botocore-1.4.58.tar.gz 2906349 SHA256 a464bb803faffdd689c732768e472da8732b87795bc03ed4342a2ab99338e9f7 SHA512 717b02eef844ac192704c0eda2c2942358d714d92012dff59a38e0bb558ef3cfe6208f3892bb25b3752af96cc81ce057f4052783f60221e63bd087bba59a3dfb WHIRLPOOL bc7b077ca015103d12423f258f21eb42cdeecde311ec726268cb00a6ffd7126047efbdb5fac609f1ae77744465c9989b1d34f953b7d690657d5f8f5f83ccd38e
 DIST botocore-1.4.60.tar.gz 2908934 SHA256 b091e12a6bba367f147631d3fdc4891567d260f79a09bce8a76f15647da0a2bf SHA512 77fb9e20d54455e1a200ef53db64491383e361f318ce903350beb13ce81edc438dc75642afa3c6825a1c5d3d517bd456ce362a7c917a6c725b2fe3638007858f WHIRLPOOL 17dd5a81f8ac8da7b62cfa91b2c202c6360eac760ebb9ed85b8633f4b7cb740bd5178df126052e36b142e48f47f0c1e749e1ed8d2684238df19ac22de643096e
+DIST botocore-1.4.62.tar.gz 2912358 SHA256 9286305627019c6ecba580085046ed9ad5b26a4abdb095da1174258f39fdacff SHA512 bdef1da605541831592c25ccd99fb42e2bbf0a713cce650dcc8bfc04df816af88eaa56875fbb06d2f6efb8cf7b42cadc67cae566e892653e897d2e2625d5ea97 WHIRLPOOL 7486ba04ef97829456f0456a80d483a8c3dcfbfcc4f39659d1217ed649f2d2c180e7b37ed1c582d8347baf66d99b028dfa55824a305e21f783d99f8aabf95819
--- a/dev-python/botocore/botocore-1.4.62.ebuild
+++ b/dev-python/botocore/botocore-1.4.62.ebuild
--- a/dev-python/bottle/Manifest
+++ b/dev-python/bottle/Manifest
@ -1,3 +1,4 @@
+DIST bottle-0.12.10.tar.gz 69554 SHA256 1308133647adc2d266f0ba5fea6684ba955cbf5e8133590cf0314c8beb814ff4 SHA512 43d114017aecabcde0c81a20bdab20ef1f4a2aa194986b690de8bb5cc6978aa82e7bafecc21aefaf53c8a7f5495f96025f1193447d411e17fa08b04a6b0dd4be WHIRLPOOL 4d3e55cf953baf97ccc1c31d973a17e63ba8458606c7650484cc776b71f7bd721a152f7a90b6cb0acb3fabd73a06b76aad61639f80d828b45cc1cc1d21cb2326
 DIST bottle-0.12.7.tar.gz 69375 SHA256 e3ea2191f06ca51af45bf6ca41ed2d1b2d809ceda0876466879fe205be7b2073 SHA512 ef58c0ec3b09b237914a170aae59a577a59e579478cd5f1bcef9fe73a9d3a4776794263d6f7b60dd426629aec2987ee4c3f6b8fa0486a99879792c70e373fcbc WHIRLPOOL dc6a34f9819ed77b0b05c01c13efe553af37fc9c32cfe955d6199277a8e38992a0e4982b8e67b0aab12349f15434d094ec7674a7970c71e264e72f3b74c617f0
 DIST bottle-0.12.8.tar.gz 69414 SHA256 cd5d1755a85e533205ed8a2465badf38602227c5f171c3852e07724b28c050ac SHA512 85fbdac6f7ae804a74bc527bb47bcdb5cf653a0227efe36e81e25513b687dd4abc1f772ff7232bd914cb392dea07297154d80aa05b1216c1f796dbed0d5a9510 WHIRLPOOL 833f434683f18511560973a9b0defeaa048ec21d0c60d30c69b11fc12f0ea4511a693a532d227b4ef419c99e664ba26384a95111950bf2ec1128a5509d8a0259
 DIST bottle-0.12.9.tar.gz 69516 SHA256 fe0a24b59385596d02df7ae7845fe7d7135eea73799d03348aeb9f3771500051 SHA512 c11d3cb916a0912dcda953a25b9e3a4c6f8e68e31bbaba653f1cae0e12f6b6d827fcbc9d1dfbdb9af2e28276b0056a31fa863d3723a709911406f426d528840b WHIRLPOOL 03f2a43002110b7e2aaf3d477d249b804db20cc68a0c534a059e1c0937ed574c1b6f00fd5ffe43acd027425e9e40815269af617a769cce74e5ca5f25b25dc0e7
--- a/dev-python/bottle/bottle-0.12.10.ebuild
+++ b/dev-python/bottle/bottle-0.12.10.ebuild
@ -0,0 +1,48 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="A fast and simple micro-framework for small web-applications"
+HOMEPAGE="https://pypi.python.org/pypi/bottle http://bottlepy.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="test"
+
+DEPEND="test? ( dev-python/mako[$(python_gen_usedep 'python*')] )"
+RDEPEND=""
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.12.8-py3.5-backport.patch
+)
+
+python_prepare_all() {
+	sed -i -e '/scripts/d' setup.py || die
+
+	# Remove test file requring connection to network
+	rm ./test/test_server.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# A few odd fails in the suite under pypy
+	# https://github.com/bottlepy/bottle/issues/714
+	"${PYTHON}" test/testall.py || die "tests failed under ${EPYTHON}"
+}
+
+pkg_postinst() {
+	optfeature "Templating support" dev-python/mako
+	elog "Due to problems with bottle.py being in /usr/bin (see bug #474874)"
+	elog "we do as most other distros and do not install the script anymore."
+	elog "If you do want/have to call it directly rather than through your app,"
+	elog "please use the following instead:"
+	elog '  `python -m bottle`'
+}
--- a/dev-python/django-classy-tags/Manifest
+++ b/dev-python/django-classy-tags/Manifest
@ -1,3 +1,4 @@
 DIST django-classy-tags-0.6.2.tar.gz 18079 SHA256 9b8d6056b2aadc2e9e4f28df8c41f2c9546a3ef63785eadc33231d4487cc6212 SHA512 d8bc16e0c7da84284eeb76b5098deaada001ee6f191a729170fda6cf22436bfa4f387acacb19a11c9dd08728dcfe1b5003fb4873c7763cc7749865a6e7b5ac64 WHIRLPOOL e3146334c8f2dd9704810e7e4d2b41294fe9ec8e9e8ff0ddb52c05771b58213ca193cab68ca299a8165c47097d6cfbea4ea8a4528d8c34fd6116ed5342ff4771
 DIST django-classy-tags-0.7.1.tar.gz 17294 SHA256 ebffaeb1ade7fa354fb4feda4c11255335107bb0862dce0893b12a95262c5d81 SHA512 b83e15cc0ccdccafd3b6676981214ec7b4431cbbcc4ca6640e986fffff7a484aad1a0c24b6da15ca9618b6c06f073353f89ff3f3fec4956a294d7aeb1377f3dd WHIRLPOOL db49b2e5e046e7fd91c03d9b7310adc4f550c648c01552d30c71b4fed789aa20ed8a91460fbf0bce7502dce954381fe1e4790a08ba11bda76d40209a76a713d7
 DIST django-classy-tags-0.7.2.tar.gz 17630 SHA256 068506291979ca973f74eb5744359fb319d4aa891cd0081c59da09b0e50ea094 SHA512 2a216a3245302dc2176ae1dd4f5557fed6677e7baab9f059daf66270ee9d8a6b26ee270225e84edcbfd893054c15d65a11fac9f1babc18020c6f7a3ad5c25c4d WHIRLPOOL 680d64d13173dc0088a52d5f6b9b340ec142eadffd8bd45e8dbea3f26b155894ada3aaec1b7799c25fee095b80975a8b83275ccaa80a155fc28b0ad87eb7221c
+DIST django-classy-tags-0.8.0.tar.gz 17911 SHA256 792f9161d0e22d55b4fab6fc297bab8ab072ffaa3075b227613a6d8473624db8 SHA512 9e1b32773eb4f73dc08c82038a4b3a46c59a8c1db73d33f4d8738bd91e8a102a552bff39113e9be15d1365967c3dd1bcf2190663d1e11d8d8d71cdb520eab579 WHIRLPOOL a2448bb94fdf7ee0a54aa693d9b6c45cac115c2bba686e67db95d313ec7cce9a02a41f9c1d80068ea8f032532a8ff0dd2ead9ca3039d68bedce7b25985b7a18d
--- a/dev-python/django-classy-tags/django-classy-tags-0.8.0.ebuild
+++ b/dev-python/django-classy-tags/django-classy-tags-0.8.0.ebuild
@ -0,0 +1,24 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_7,3_{3,4,5}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Class based template tags for Django"
+HOMEPAGE="https://github.com/ojii/django-classy-tags https://pypi.python.org/pypi/django-classy-tags"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE=""
+
+RDEPEND=">=dev-python/django-1.6"
+
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools"
--- a/dev-python/django-cms/Manifest
+++ b/dev-python/django-cms/Manifest
@ -2,3 +2,4 @@ DIST django-cms-3.1.2.tar.gz 4031123 SHA256 b59c89b6f7c3a802e74fe16159eb663df4b4
 DIST django-cms-3.1.3.tar.gz 4035531 SHA256 f0b2122e33dfb9f52247365855712616d61b5efecc87eb8fe5bd5eb1399f982c SHA512 261f1321d5f47ce6931b4bf89a1f4e1183a6353793537c840e61ea9200169889f4712b6eea77a5e15e58b065b48a8911e1f643af487eeb93519ec8ff1b46310d WHIRLPOOL cfeaf1e47730effdf2312687a0213bf7341512b8d2a6e4ccd1f2a54981b28b3242c36af0ea3e7ce4635451ca9ff4dd548025500e5f68d359ea34ade346bceec2
 DIST django-cms-3.2.0.tar.gz 4705643 SHA256 599056dc41b2c30e1702dadd6f053d37f43f3ea1262fc165f2e6b3531bbf299d SHA512 c8ce43d3c335516a29eba4dc20bb611135b6971ea40a623f67d6248d58195819005bb2d58406cbc3fdb414f2303dff527b2f3d5dfa8610c90cce461bacd9e2bb WHIRLPOOL e15efb59a6a9193bf080d8458ed6c05779db92dc6d0f516244a95dbbf818904a39ae9dfc252b583eb5566e7c5bfff6e425da02d126aa526d065d49083716476f
 DIST django-cms-3.3.0.tar.gz 4860459 SHA256 45cd8b595f719308892e146c06958740103aa29349909a72f9cb2105dea7307f SHA512 88e2f395d094849c2be42830f1c469c5259204f60a446ea5bf4093c8858128375a036db0e948e528f0c1b4c8748c552a5f55b04e3f579f4985b650725ef735d2 WHIRLPOOL 2401e33f61859cf7678da1b13766aad935f93684beb5813074e188caa5451e3724f3fc84cc8a5bcc1efa04c0e67ba53c814b9f2f3832fe5958ba2a50d8cb0833
+DIST django-cms-3.4.1.tar.gz 5071816 SHA256 faa84e9951d8d7cd82664cebc0a3ed46ee33d0940ed940623d2f4bac4d6214e1 SHA512 ff767d8f644602a65d9427390d315b33872e6dcd94d06f7abe7778a5f893cc41d7574681f7558b0d4bfa56784d1eb7e4b0e4e570eb24b921c754083f946b99d0 WHIRLPOOL 3fa9305cb909341a1e78eea6dc0c2f6b6613c74a7ca1c7aa5499c71352215c747d6948ae1e9582199545e162eac99252f13af6b39d940a3b80bc9da13739e633
--- a/dev-python/django-cms/django-cms-3.4.1.ebuild
+++ b/dev-python/django-cms/django-cms-3.4.1.ebuild
@ -0,0 +1,43 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_7,3_{3,4,5}} )
+
+inherit distutils-r1
+
+DESCRIPTION="A Django application for managing hierarchical pages of content"
+HOMEPAGE="https://www.django-cms.org/"
+SRC_URI="https://github.com/divio/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="+admin-style +ckeditor file flash inherit link picture snippet teaser video"
+REQUIRED_USE="admin-style ckeditor"
+
+RDEPEND="
+	>=dev-python/django-1.8
+	admin-style? ( >=dev-python/djangocms-admin-style-1.0 )
+	file? ( dev-python/djangocms-file )
+	flash? ( dev-python/djangocms-flash )
+	inherit? ( dev-python/djangocms-inherit )
+	link? ( dev-python/djangocms-link )
+	picture? ( dev-python/djangocms-picture )
+	snippet? ( dev-python/djangocms-snippet )
+	teaser? ( dev-python/djangocms-teaser )
+	video? ( dev-python/djangocms-video )
+	>=dev-python/django-classy-tags-0.7
+	>=dev-python/django-formtools-1.0
+	>=dev-python/django-sekizai-0.7
+	ckeditor? ( >=dev-python/djangocms-text-ckeditor-3.2.0 )
+	>=dev-python/django-treebeard-4.0
+	dev-python/html5lib
+"
+
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools
+"
--- a/dev-python/django-sortedm2m/Manifest
+++ b/dev-python/django-sortedm2m/Manifest
@ -1 +1,2 @@
 DIST django-sortedm2m-1.3.0.tar.gz 35519 SHA256 df67db5a71a780bff61a7a659b84a63ddf1a30fb6ed83dac4968add4cb6c165c SHA512 e829ad54fcc2ef6475864d6085ee011e5146da1821095d8e9abddacf45f71890c8bdf86b028086170b6a3d5c9cdb576fb6029aa7be379eba6b87460c2d93ee3d WHIRLPOOL 445cd518509d7fe8ef11445424216feccb54e3d0374834a16c7002d40c0201c3c7ea2c30b906061447afad9e54fb6c6c04bdc3f54d1ca3c4c8572c0d5424ff7e
+DIST django-sortedm2m-1.3.2.tar.gz 36246 SHA256 e1a4fbf55149b75460a9a1c5cb90a3600af28ec465251a98cb1a59dd637d6be1 SHA512 3695cc0a565a6e1d47e3573dce1f8c860f78c8d11d248634a8ffd6534c621e7575b2333b7a83e6c521e6e737d7ffc67ce1bbcc8504542751d3cfb254b3d98584 WHIRLPOOL ff209e50167186fbafdf8dfa2e0493e22e3de7583a2858fb6dcd374dff65dbe8ba2f7739477824ab71d7d11074011a8761bd6e5f7c5a3db9ea7618b387e53d39
--- a/dev-python/django-sortedm2m/django-sortedm2m-1.3.2.ebuild
+++ b/dev-python/django-sortedm2m/django-sortedm2m-1.3.2.ebuild
@ -0,0 +1,24 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+
+PYTHON_COMPAT=( python{2_{6,7},3_{3,4}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Drop-in replacement for django's many to many field with sorted relations"
+HOMEPAGE="https://pypi.python.org/pypi/django-sortedm2m"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools
+"
--- a/dev-python/djangocms-admin-style/Manifest
+++ b/dev-python/djangocms-admin-style/Manifest
@ -1,3 +1,4 @@
 DIST djangocms-admin-style-0.2.8.tar.gz 101230 SHA256 aa4c278c10eb94bf48b60a9baedbc1c5dcd9fcdcc5b783d0d534186b28a8cb11 SHA512 79ffeb927c94a1753cf57210879e9115925f4a30edc1c94c312e431fe8f5aa49faba83c0ed3a307748f8c0f050f81bdeecec87fb5e4cf95ee88d3cea20f5fe0d WHIRLPOOL 0730910a6ed09cbf3069f59c6228afd16ded044871f5bf2f5e4ace786f0e1eb7cfb94422835c845eb06f77c9c414f52c08ddd4e5c3d3dcede68d4703b5e4f2e9
 DIST djangocms-admin-style-1.1.0.tar.gz 1518444 SHA256 91ca1968de015ad8019289e4c199a4e946d1cddf648f1e3b8fbb10dcd1b40f7a SHA512 bca5b7175f765fdf49592914f72ea855ec87848c133224166610f7a4d37cd0c11cad22497c2db079b9eeea478d0b001d7d39f82a4867392d82744d79a9e2195b WHIRLPOOL 339899ddecf9878ee1f405a5c986f5444b1fa4a1044ca17deeb9510d77e63b22ac0fdd9e0d2db94728e8136563e53b0c09149b7a906c6259955193b10ff14875
 DIST djangocms-admin-style-1.2.2.tar.gz 1511800 SHA256 c5496ea051ccb003f65ea1ac2900fb5cfa6ab34094e5af5415710334e7ce6a27 SHA512 4197ae0d968d6496e625afc0849ca027c9ab58aac831a6b83bf8d9e386737603129f72744db1162ea4b7197651514d63a4403a85b341a0b677c179452af50ad2 WHIRLPOOL bf2229d8d3c832937576e2c34e817039ccf13f666c17f1944b0d90cad81ebc76a386c8eeb3213c16add393425cc73939b258fc655214c5d1a828ddecc9a1e15a
+DIST djangocms-admin-style-1.2.5.tar.gz 1576515 SHA256 12b626f95c3a29cbf7566433887777fa803dae2808d3bbfb2a8f1886ecc10bb1 SHA512 1a628bf3a151774400c0b7d2dad34dedbfebae183a4ab4c09374085ea5d9379eba0ceb567a1f54e3f44302c6dcdfa125a76e2ee572e450bb1ecc1a6c447332cc WHIRLPOOL 346ca0975ca22fcecc4c95dc8756c3629160d31a9fd21f2e507831a9da56d068fe4d7e5a6c13a291dd78f81e4eafe884fbc9d716859f7f0e885412a5ce7ab09c
--- a/dev-python/djangocms-admin-style/djangocms-admin-style-1.2.5.ebuild
+++ b/dev-python/djangocms-admin-style/djangocms-admin-style-1.2.5.ebuild
@ -0,0 +1,25 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_7,3_{3,4,5}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Adds pretty CSS styles for the django CMS admin interface."
+HOMEPAGE="https://pypi.python.org/pypi/djangocms-admin-style"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools
+"
--- a/dev-python/djangocms-file/Manifest
+++ b/dev-python/djangocms-file/Manifest
@ -1,2 +1,3 @@
 DIST djangocms-file-0.1.tar.gz 22634 SHA256 4e947a67782745be0454601cdb8a43311815bfb38aefd542470d989655a203d8 SHA512 14d7210e7341eeca275cba1ef0ba5f2461d11ec5e6f352f03c1cf458270938edc55f6600d00db58c5f0cfafac0d0cc2c4319dd9fae77656112cd58fea0b39584 WHIRLPOOL deaacab576ea5f6046cae2460071cbd87a4d570ca6f53fb1075b54da24ab82277643eb70a82416d632772a4f9a3647e41a106ec3e308e8491456a042cb884fa5
 DIST djangocms-file-1.0.tar.gz 23315 SHA256 bf82bea135b2b5d3a98472d88d83fae76a9bb89c97bd2dc8927f7fd5ac5de528 SHA512 c051f4ddabf1b3fe62e72ca56a066c7ff89b4f6c5fe24ba1ed224a48f59ca23cb154da6e9001ded289fc4feb7334d6a8dd3948e0e0fb469ab144ea47358123d0 WHIRLPOOL 8f2be0abd70d6da22fd47cdbf6fac94211c677cbf97ed17e415516931375ecd48476464db7fafb36635ec6a863200b83af2482150029bd8f19ae647e343637d7
+DIST djangocms-file-2.0.1.tar.gz 66628 SHA256 3570896ffda998f3fa8b118ac9bf171d058f20af1086ef8aa075ba8f41978c73 SHA512 9b966955e958ae8c1a9962b65d45cc5a20c943d32bf13be67b443d5d084b6a982ee266e9894f1c1a68afc9a7e6f03acfedc98b6ecdaba050fc024b3e7fcc7921 WHIRLPOOL 02885d164b38b82c40be10652e5a375b04e44a2068b7e8c987b60436d3256f4cb573543409a5b421635ae4c4ef53f2b5194dc8aab2e044d82002bed50e246ec5
--- a/dev-python/djangocms-file/djangocms-file-2.0.1.ebuild
+++ b/dev-python/djangocms-file/djangocms-file-2.0.1.ebuild
@ -0,0 +1,29 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+
+PYTHON_COMPAT=( python{2_7,3_{3,4,5}} )
+
+inherit distutils-r1
+
+DESCRIPTION="File plugin for django CMS"
+HOMEPAGE="https://github.com/divio/djangocms-file"
+SRC_URI="https://github.com/divio/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools
+"
+
+src_prepare() {
+	sed -i 's/find_packages()/find_packages(exclude=["tests"])/g' "${S}/setup.py"
+	eapply_user
+}
--- a/dev-python/djangocms-inherit/Manifest
+++ b/dev-python/djangocms-inherit/Manifest
@ -1,2 +1,3 @@
 DIST djangocms-inherit-0.1.tar.gz 24859 SHA256 319bd002e90c11d1c8c33fb1fc4bf352fa8bba0f6ec8086874714be24efb1482 SHA512 5adc7bafb7eeec2376edf21b53fee48bf21833f8abbdcc52c00df1bd48d540673a3d4e9d887b5eed3320a6d7b095529f6a2363f031d1b3214377670feb493e66 WHIRLPOOL 453aa9f973f73a1abaf0785ac81a027aeb2e037836ee4486f4a9b8b18ceaac9c1500ced1541dc4bd1ed1b8465b16044186b756e108302c7f410ab2b7fb6cd98b
 DIST djangocms-inherit-0.2.1.tar.gz 24780 SHA256 59f4da2f307bd6515956753edf76da4eb47668993ec25b15478ff0989b75d858 SHA512 f42f783b00f5a241eb6bbdc704b987398833a4a6adf1affa7cd38674d8115f50d8103717e70f99046a672a4944607d49b7bf986dff6af05798a497d5c1504d60 WHIRLPOOL c2c2680fb16c5da592b0bb9c6c6bb906f279c05a942b18d699d3bb60f84bded7af9596b28e6e8d3e1155b0aeaa2a88cd43e756cfb2325da7c03d4056bd93c002
+DIST djangocms-inherit-0.2.2.tar.gz 24909 SHA256 fda204da550a7a877b7d61bdd86d87bfa69ea9bae6190f719e89e2e82ba80579 SHA512 f115568789b673a0ff05a3d9fac6ecaf1d7b85bb40fa6265239e0c7d3e68a64c8d163b71f2e75bec9fbb6fc7a70efbd6eb887fe027faf08c79e8052bb19fd466 WHIRLPOOL e1d9ff8218127bd7f18fad77384defec67fbf89a9f0a6d9597bc7e0bd6bc790c66ce14123dc01da53656f540bad989d25a116cf95ec9c48c80d168f3702ddab1
--- a/dev-python/djangocms-inherit/djangocms-inherit-0.2.2.ebuild
+++ b/dev-python/djangocms-inherit/djangocms-inherit-0.2.2.ebuild
@ -0,0 +1,24 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_{6,7},3_{3,4}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Inherit plugin for django CMS"
+HOMEPAGE="https://pypi.python.org/pypi/djangocms-inherit"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools
+"
--- a/dev-python/djangocms-link/Manifest
+++ b/dev-python/djangocms-link/Manifest
@ -1,2 +1,3 @@
 DIST djangocms-link-1.7.1.tar.gz 35693 SHA256 11cc0db313b147a2fb0390c9fe7c791f6245543866523997d9a11e33438d58db SHA512 5cae6517494a5b2a5f3bb8307c17d650f8dcc59c72278a2c526b807babf6994d339ce2045d9d75dd2f2419a4db3657dcf7b07dd4d73b6f9d186e9d521ba3a523 WHIRLPOOL 0221634aa97c6474bfcd6176c3a7b5225d80721506aa6fac7b28f50ca7f3b7131cc23ed097687e4ecd2d1d013cd6a43d7aab662db4067371a6f049ab39f378e6
 DIST djangocms-link-1.7.2.tar.gz 36033 SHA256 119981c6b5090eeb3a4c9337a5846e86c2709387f9ad9335f26beccbf64c4212 SHA512 ef043833cf8b336da884fc69281154f9ae7051cfbd52b5936e39951ab42794439e4b2641be5d89fcc74e354950ed584a4b2c84a4a3f951f872401c6aac23220c WHIRLPOOL 3fd8fa44fb4dc2564269d4765fe1d5a9346535b476399359c88df755e6280af9b73f17d7feac06b91cdc9d5e091c310a28d7a64ea21e569ac9256cf8ec147b40
+DIST djangocms-link-2.0.1.tar.gz 27343 SHA256 3707d821a8ae882561a1e68c802746efbc35f34be7bf5d613aac1c81101d4660 SHA512 827aa3f40b0a9d2249dab7ab9821a240d744ee9ccd29737b91db74e871bc32a9b2076fab6b0603b7acf0c34dc8f811c70e4bd7e65e2a27d888b8cea806b70b5b WHIRLPOOL 20a293821a3a1fd050f439e658ba22c2a1b0da2e94e894f3b6bfb1f422985bce4e17fc8b3c53e94bc1884d580293a1694cbb583d60e805c9d684600e5e646f5d
--- a/dev-python/djangocms-link/djangocms-link-2.0.1.ebuild
+++ b/dev-python/djangocms-link/djangocms-link-2.0.1.ebuild
@ -0,0 +1,31 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+
+PYTHON_COMPAT=( python{2_7,3_{3,4,5}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Link plugin for django CMS"
+HOMEPAGE="https://pypi.python.org/pypi/djangocms-link"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-python/django-select2
+"
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools
+"
+
+src_prepare() {
+	sed -i 's/find_packages()/find_packages(exclude=["tests"])/g' "${S}/setup.py"
+	eapply_user
+}
--- a/dev-python/djangocms-picture/Manifest
+++ b/dev-python/djangocms-picture/Manifest
@ -1,2 +1,3 @@
 DIST djangocms-picture-0.1.tar.gz 33969 SHA256 c9d553c712a062bb8997a2862f8349c545a481ee5bdbde16b8c7cbf35026cbd3 SHA512 ea925d873d32e2a1fdb789bf51758c3d7dacd295bbe217be4fb490b3cd26e452c17895c52713f6405edba83e6dead68596ed5c19d5bca22dff5f762e175e490c WHIRLPOOL 1a1feb08c3f5fda9a3775df4839335be1960a9bcf70ff75b79923197b9b6e09075a9744de9ec474bf1a74ab81e02e602b624728b0598089021857fb7a0cf55bc
 DIST djangocms-picture-1.0.0.tar.gz 35127 SHA256 38b40f36362114aa8978864c5c9afd13aa904c0d2f92f7a86f22b766ddf2d9ac SHA512 863c7f6d542b5a847627f509e61be90f192fa619d56aac08fa7c6bf1c462124d598d99915834ac746f08b0250477ca6cca69bde6bafb7169aced98757b2e838c WHIRLPOOL e923581fbd0c38cdec771a1fa45730ac0e735bd574166008a5e58197cb37a73bb9c6fb7ed35c4f8ff6fe55bb81bb07eb3f568ff7a85d462e931c3e19a59ec421
+DIST djangocms-picture-2.0.2.tar.gz 24425 SHA256 53de977b83e27173a1d9d582935c461cf9b4e8b7d360168d1d9a7ad81186771d SHA512 7ffa5748a4484e0f5c4d08715ff941e9830f42651c04d386bc443f7308f285af75a0215f0e28ba00d7de1b0f97585693f28ac117097788524e7ecf490a63ec58 WHIRLPOOL e58772dedc9be347cd07f667ad428c1138b348ee27004dd77a72bebe77e6738e2bbb2484b05be0d3d9a095c2b5c34514ee0f0d63ea18d892fb3c2fa42b7f4e21
--- a/dev-python/djangocms-picture/djangocms-picture-2.0.2.ebuild
+++ b/dev-python/djangocms-picture/djangocms-picture-2.0.2.ebuild
@ -0,0 +1,29 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+
+PYTHON_COMPAT=( python{2_7,3_{3,4,5}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Picture plugin for django CMS"
+HOMEPAGE="https://pypi.python.org/pypi/djangocms-picture"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools
+"
+
+src_prepare() {
+	sed -i 's/find_packages()/find_packages(exclude=["tests"])/g' "${S}/setup.py"
+	eapply_user
+}
--- a/dev-python/djangocms-snippet/Manifest
+++ b/dev-python/djangocms-snippet/Manifest
@ -1,2 +1,3 @@
 DIST djangocms-snippet-1.5.tar.gz 22818 SHA256 a9040a18481ec53db8e8d66142332ecae8adb5bac4d93cbdcac6f4b90945d5e0 SHA512 f911056eff97d66bca4c001ac33953d1146d818f3263f3641dc24aebeb650370a3a98bbdc2066a8b72705db20e3721ac08acd1f7cbe7196c22fbfbcd7506c079 WHIRLPOOL 7d620838ed949ff8c74e51d0203e89b7360b7fbdf1c20a493cfb71bc4d0ff866e965425f064e5310777a95b924ad2aae1dc448e2e7d0c0e1d67f08cca031fbbd
 DIST djangocms-snippet-1.8.1.tar.gz 26519 SHA256 c5351f4827342db04debb37e383d5680c2b0338800743483f12e87a4cb555659 SHA512 ebd35905e45f337258150e700c1b13fb9f47f5a3d70b83027bf2158f16a2445ccc3dbb49fc672e0d9fcd638bd4a0b51e9dcdb3ca6d84709e2698a1ce447f4910 WHIRLPOOL 99456bcbdb93f986216fb0e5e24dd80e06487b15bb8f5a9b0ac09336622d55ebfd469b3011f87c0e54b12df48d0139d3c28fba6bf62d64e33e4ec36c64de67ae
+DIST djangocms-snippet-1.9.1.tar.gz 22643 SHA256 46f8dbf22341e1333b13fb0c36a8d937fdf625f2c785577c131d836567f8ca28 SHA512 0aba41e926e2220d94266958b255fe1a8b00cb1215bc7678aacd3ad96db8349a1b472c7e9b56eead3a722cd27b953d269717e6de7383c45b5511028dcff6b1bf WHIRLPOOL 08c3964ceb40e1f4916bae053459292f7b5dbb8151d1ed99c99b6dfac704030051b526d6fef7f080a89a5f241695149f7ceb920b19b18938707a146575c97328
--- a/dev-python/djangocms-snippet/djangocms-snippet-1.9.1.ebuild
+++ b/dev-python/djangocms-snippet/djangocms-snippet-1.9.1.ebuild
@ -0,0 +1,29 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+
+PYTHON_COMPAT=( python{2_7,3_{3,4,5}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Snippet plugin for django CMS"
+HOMEPAGE="https://pypi.python.org/pypi/djangocms-snippet"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools
+"
+
+src_prepare() {
+	sed -i 's/find_packages()/find_packages(exclude=["tests"])/g' "${S}/setup.py"
+	eapply_user
+}
--- a/dev-python/djangocms-text-ckeditor/Manifest
+++ b/dev-python/djangocms-text-ckeditor/Manifest
@ -1,3 +1,4 @@
 DIST djangocms-text-ckeditor-2.6.0.tar.gz 1364155 SHA256 d0ef15a9058ba640cc7227348d1a32399539326bd6729eb5a792e876a07da51a SHA512 b246dcf706e2dcfccc5cdc6012adba30195824e69f761687a1b937f9e49c9efbae159c1d43611c9c51df2f575e91ce9a01eaf4d3229d502065dd9302b588482f WHIRLPOOL df644323d4c205ff107b0561c70b1935f160297fed2746d427bc315c9bc0f9b5acca00bb401bf0e6d1d9a90e533187348ccb0871aeedbc9b7ac0048d5f3048f9
 DIST djangocms-text-ckeditor-2.8.1.tar.gz 1378460 SHA256 96a88f620d3f908197fe3676220793abf9f4b0e2d919f79e3eb00d29e3ecac1d SHA512 70488f847f62cecf2d472567d4f45dbbea74dbe68d81da51dcfef22bc31ea8fbdb12b4097167520d35d47c61d924005aec4ab8a70107e1f57a03be370baf5067 WHIRLPOOL 58b24c26ac8016567f97c3a3e7ded16739d95c3adb665d493c63a1f6cbf97fab0623016db17e0e25340cb9ed4042074f3fc305ab13fba174f8b6f2d3c9e08d56
 DIST djangocms-text-ckeditor-3.0.0.tar.gz 1383982 SHA256 dbb38d04de754ca5ae3a0db65ba5ca2e0f4d42618304abeddba49d74ee57576d SHA512 6571b5923c69a6acf985fbb5a3a4131714fd65dd6655eb9e0bf26d5049cf6675cbc7a63bb230f5a002b7d941ce8f8520d263a96eb6a847226be58e57c1fced86 WHIRLPOOL 8448cbb2bcb0fa8ec4ed8eda7f987c6cf38f564e4580ad49d6a4d36b6e8cb3359609585f64d04b7b0019febc55d01e4748331dda6a26ef0aba0339dcceab1f59
+DIST djangocms-text-ckeditor-3.3.0.tar.gz 1611008 SHA256 f3bececc695ca6d35be6cd1c94eb98bb2b8aee45aef0db12607543a344647de3 SHA512 5d5c35be5127f175eebcb5978bb1135d03807e8affa7b942d48af61c849f5dd3e23937574afdda992e17608b5879738663f93b77f4d32faac04b1d007fcc78c2 WHIRLPOOL 92b10dae198d599b01ba8f917a55b8ff0f2250b86dc806892018f5b651ec3020b803a8c087b52bc4c8bb3385965e33569c3e6f50f6562e0cddb11dd062305658
--- a/dev-python/djangocms-text-ckeditor/djangocms-text-ckeditor-3.3.0.ebuild
+++ b/dev-python/djangocms-text-ckeditor/djangocms-text-ckeditor-3.3.0.ebuild
@ -0,0 +1,30 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+
+PYTHON_COMPAT=( python{2_7,3_{3,4,5}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Text Plugin for django CMS with CKEditor support"
+HOMEPAGE="https://pypi.python.org/pypi/djangocms-text-ckeditor/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools
+"
+
+src_prepare() {
+	sed -i 's/find_packages()/find_packages(exclude=["tests"])/g' "${S}/setup.py"
+	eapply_user
+}
--- a/dev-python/djangocms-video/Manifest
+++ b/dev-python/djangocms-video/Manifest
@ -1,2 +1,3 @@
 DIST djangocms-video-0.1.tar.gz 43680 SHA256 f9448651f4fad2136a03eafe5f64bf5d43a0ff96477d10287b35ecdb68187214 SHA512 0ec674e0b92c5a25ef48635eafc68b719a5d9c84d9d29fbb86ee09dedaa3701c20273b8e0fd3b735a23d087d85e5030c246cdc594ed64f9e0bfb5986b5342f2f WHIRLPOOL 051b7a9f359450c6a3a3b1ec161a7c1c5cd490f436b0d0a4bc4bce7a8de1a39ca29ad7503c806fec6119497edb91255d340c942d7c56167a069fb043f11df70d
 DIST djangocms-video-1.0.0.tar.gz 43664 SHA256 cae5d9b54305eb72c73692a177a63dcc86b8366cd6f170f1262139e25e564b4c SHA512 d8a0ab9ceaaafb09835c91389457d7dcc22ef36667ba92526135811e40b87490c67100a8bae762df5ba85c694b61f5162d8f02eb0817f97c60c0f7fcaae28baf WHIRLPOOL 0968e4325c5098e58eea111784dad1065cc2eda65ed7b4ebada6607a1556960c39d13714f4b2d138b5f4cae7860fcd44be8c7506737ce5b2ce0aee7dc5daad3c
+DIST djangocms-video-2.0.2.tar.gz 25416 SHA256 0bb08bbf067bffc227cd4349e9b67d52dccaf8d4397fcf96a08b68a577a0ca68 SHA512 d2ab6196a02c41f0995c5b4898f357dda215f7307675fe622b90c58cc14f0e3a8fe5a6e8da1df073bd9426d1186ba5f68de747797ac9b66ef98a32d46ba567e0 WHIRLPOOL 9035014d2d8608696badcead78837deac674f1d18c27ecf9c18ef717bf4eb42c768148e34d0657d10c63791a1fbe269c38f317aa14f3798e711b0c7857119b97
--- a/dev-python/djangocms-video/djangocms-video-2.0.2.ebuild
+++ b/dev-python/djangocms-video/djangocms-video-2.0.2.ebuild
@ -0,0 +1,29 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+
+PYTHON_COMPAT=( python{2_7,3_{3,4,5}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Video plugin for django CMS"
+HOMEPAGE="https://pypi.python.org/pypi/djangocms-video"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools
+"
+
+src_prepare() {
+	sed -i 's/find_packages()/find_packages(exclude=["tests"])/g' "${S}/setup.py"
+	eapply_user
+}
--- a/dev-ruby/bunny/Manifest
+++ b/dev-ruby/bunny/Manifest
@ -1,3 +1,4 @@
 DIST bunny-2.5.0.gem 188416 SHA256 bae146f653e4e9ef75fddf34577c572bfe829b83f2cca272c159db5d9e8648a9 SHA512 321ac85e5cfd0abe8111708ca149c779b5fc0694084b6e064c1fee90f7c9a4802e4dfa6cae0cc58d0ce9aaf3c59f736064267c9aeac3b8c795a1da5a434d8aff WHIRLPOOL 5c54e82654d649b559da5472fd0c462e991549b28b843a307afc8b87ce3ebb8f1df139a1ddc655cf9a706aaf584c48b2d653973a439f9be0fb2a913cc4016e36
 DIST bunny-2.5.1.gem 188928 SHA256 8a05fe5fe105545b2509fb941f069cd61904cf780374cc0aed7ab421893a1e59 SHA512 a1d1a13f50d97fcef065b7f30841be1f7a3215ac3fef743a01ab0b7cc0582512a7baa1511eff930352bed02c60abba6e4ab3802cc5dc89d032cfafc92e34ff36 WHIRLPOOL 638fcb51c73dd9933190c7a91cf73b290f52a36fcd8eb5f6ee4df9ddc2515b12122a4369959efd509cdd82dda1f98d132b1a6efbe9013244c7b800525c98bd16
 DIST bunny-2.6.0.gem 189952 SHA256 c86c112b0c8b015895fd4de5e0cb04204c0b0899bed9e43cc59f2d30a2160407 SHA512 d916be15c770ed1c77e480b8eafd4e19904a26dee78d6e70c88632e1dc9e369acaa13a173b493d6f8527b85b959c77e0ac919c0df429e92e1bd773b684e6ca7e WHIRLPOOL 86f6204a3eee19886659f152365eeb30c9f5a6565e200c5e6369d8c0af50f9f61e147932ab7fe70aaa993adf5e1cffd9b9472ca773611a404ea9403969319ef7
+DIST bunny-2.6.1.gem 189952 SHA256 8ad45ed5aa810693eacd2aca0550343ddf2b0c5ead651fa2081e55f2bba9048a SHA512 082c25a68e7c6a0fcf90879f4b7f9990b7f21b1b90609dfb17c569b382931d047de04f8a0932e20dc93bbc6fed8009d9d247bce1ff12d8d86698b591cc5c7fed WHIRLPOOL 0ed4387b8da5256b61b0edce48a9806a57305584eeaa7bfbb6e873a16626d1bd130396ba4961060cad499ddc703ff0311d5158241909b9b19ed5e782ac467547
--- a/dev-ruby/bunny/bunny-2.6.1.ebuild
+++ b/dev-ruby/bunny/bunny-2.6.1.ebuild
@ -0,0 +1,32 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+
+RUBY_FAKEGEM_TASK_DOC=""
+
+# Tests require a live AMQP server.
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_FAKEGEM_EXTRADOC="ChangeLog.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Another synchronous Ruby AMQP client"
+HOMEPAGE="https://github.com/celldee/bunny"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/amq-protocol-2.0.1:2"
+
+all_ruby_install() {
+	all_fakegem_install
+
+	insinto /usr/share/doc/${PF}
+	doins -r examples || die
+}
--- a/dev-ruby/mysql2/Manifest
+++ b/dev-ruby/mysql2/Manifest
@ -1,4 +1,3 @@
 DIST mysql2-0.3.20.gem 52224 SHA256 37166b21ca4b92a7af9bea566d78884b05391cfc14f786c18e7f264b422f0758 SHA512 65088e57b3693cb2b28cd37fc595de43edb85dba14421c1c43cd0c4e41efc0a8a39bd541213170af95e712998b44411a4212d9b96750207ed9d7292aa1e66c91 WHIRLPOOL 23e9852f3f9ee76e4463c4397b1e96288e2f8575030f33540c7c8cc8ca8fc106be2aec1c117dd008e4026872850731b4396babbbbeb971e8dacf523fe33387c9
-DIST mysql2-0.4.2.gem 72704 SHA256 0a12414109d6f1c328ed29a2157daff265eab81f1b3bce7794fcb4804fdaeb66 SHA512 d6883149dbd505c5d7f73c657a5fd2eebaeff9f78d411ac2fcb9bf78dc7f45866290067f20af2dd40a1851a26b09f1af404bc7aba3c60dd979475b7db81e2dae WHIRLPOOL 999b87d21acb6f8dfeb33770c27dc0b00d4576edc5e14311e543bca09be79bf56fe8d9aa93b881dca99ed5a21634c2bb1328cb0f0877ee7f0573013bb0688284
-DIST mysql2-0.4.3.gem 73728 SHA256 d81dca548bb36dde18ca187be7c7e497186f7881d24e9a58c53468976602989b SHA512 bd55bec7ae6eaa6e3f1aaffa990d9f6d19a98595a08b3eedcca3b1b38ef48181f241f651a5b20b1a8b4b55df6076d7addce9b8119e73ecc2bf384174b5f5a3e7 WHIRLPOOL d6533da63b6037638b7b54794791f6a1f3e1e6ecff6017b08acf8841348d75bee0c88a2f4ac9270d6746973a3fad2aa6465e8e76b3c6905aba2b2094ad3ca38d
 DIST mysql2-0.4.4.gem 73728 SHA256 2adf72de58581ddb17abe952f5c7843ee0caf3455ed20c82f9c41583ce3aa3ec SHA512 824f05266f65ebe5b9594a4955c439a931eab3eae2f948077e3fb53626d0402c6713a774b1939d44b8c06224c3f9f3d99299e512c734da0fdb2abe4ee654b7e4 WHIRLPOOL 3653f8d1aa9f1283792946f780bf05ab8b63cb8e157010fc7ef1af951f852b3d4e8426ea170f6da28adb13ea849e8b98c68df3333d93da388030bdd580504b93
+DIST mysql2-0.4.5.gem 76288 SHA256 9469673d09122537569a8a696136f69b8dd825fe8296df9af25c9b346e3709ce SHA512 e0be5579c811f50be698eb1f6ab209ba05c1583b217ed7ae562b4c37a123afcae8727d898591950acaf750a9b8a4394589dd05eab3c43571d4402d3956b6bae9 WHIRLPOOL 51668e27e13240e6d7cb29d7371d658879a4d0874696d21f87fc16d3981d0e6ff7a89c74172f0e44bfcba82d63d674ba6b468aab581f115a7ddf5fffb53cbb8a
--- a/dev-ruby/mysql2/mysql2-0.4.2.ebuild
+++ b/dev-ruby/mysql2/mysql2-0.4.2.ebuild
@ -1,35 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22"
-
-# Tests require a live MySQL database but should all pass.
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="A modern, simple and very fast Mysql library for Ruby - binding to libmysql"
-HOMEPAGE="https://github.com/brianmario/mysql2"
-
-LICENSE="MIT"
-SLOT="0.4"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="${DEPEND} virtual/libmysqlclient"
-RDEPEND="${RDEPEND} virtual/libmysqlclient:="
-
-each_ruby_configure() {
-	${RUBY} -Cext/mysql2 extconf.rb --with-mysql-config "${EPREFIX}/usr/bin/mysqlconfig" || die
-}
-
-each_ruby_compile() {
-	emake V=1 -Cext/mysql2
-	cp ext/mysql2/mysql2$(get_modname) lib/mysql2/ || die
-}
--- a/dev-ruby/mysql2/mysql2-0.4.5.ebuild
+++ b/dev-ruby/mysql2/mysql2-0.4.5.ebuild
--- a/eclass/git-r3.eclass
+++ b/eclass/git-r3.eclass
@ -253,6 +253,7 @@ _git-r3_env_setup() {

 	local esc_pn livevar
 	esc_pn=${PN//[-+]/_}
+	[[ ${esc_pn} == [0-9]* ]] && esc_pn=_${esc_pn}

 	livevar=${esc_pn}_LIVE_REPO
 	EGIT_REPO_URI=${!livevar-${EGIT_REPO_URI}}
--- a/games-action/minetest/metadata.xml
+++ b/games-action/minetest/metadata.xml
@ -1,15 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>maddin081591@gmail.com</email>
-		<name>Martin-Kevin Neumann</name>
-		<description>Proxy maintainer, CC him on bugs</description>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription lang="en">
 		Minetest is an infinite-world block sandbox game and a game
 		engine, inspired by InfiniMiner, Minecraft and the like. It has
--- a/games-action/minetest_game/metadata.xml
+++ b/games-action/minetest_game/metadata.xml
@ -1,15 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>maddin081591@gmail.com</email>
-		<name>Martin-Kevin Neumann</name>
-		<description>Proxy maintainer, CC him on bugs</description>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<bugs-to>https://github.com/minetest/minetest_game/issues</bugs-to>
 		<remote-id type="github">minetest/minetest_game</remote-id>
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@ -1 +1,2 @@
 DIST blender-2.72b.tar.gz 52018242 SHA256 4436c704afa28e2e5e7b28b2c06981806ddedab70565d40972e422c00644bf47 SHA512 9767797621e443ff9b6810d1713dda110f883c33626d40d7fe5dda676f549e3591516dc24b75feebd85823dd13437c34521ca752139cd31ddacf31ea6b14e124 WHIRLPOOL 3687255bc9f4195b25b66a75630676ee15e67cf10a058dca11b3472617b54aae2bebb1810cc16e19c58ca1c09b1ea8b70f72e30c05632ab0bae8910925a37a54
+DIST blender-2.78.tar.gz 44489809 SHA256 17863e1ccb3bfdcc932d37cf9e525318130064c756cfb92a9ab479780d3ed441 SHA512 9144ce28377271dafe973b59721da41b6e3954736c705e1540be8dba3124e4c32e5cce5fb3ef7158505d45401478d257720350b38fa8e8649cc35cbd28a2f978 WHIRLPOOL a1a70cb723a111d1ae5a33b274a0e23bbd9c1b0777f96c917da1b4854171a88b6abe64c0636613008de68e68200a1d387e940ee592ff87c225745c668508d896
--- a/media-gfx/blender/blender-2.78.ebuild
+++ b/media-gfx/blender/blender-2.78.ebuild
@ -0,0 +1,302 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python3_5 )
+
+inherit check-reqs cmake-utils fdo-mime flag-o-matic gnome2-utils \
+	pax-utils python-single-r1 toolchain-funcs versionator
+
+DESCRIPTION="3D Creation/Animation/Publishing System"
+HOMEPAGE="http://www.blender.org"
+
+SRC_URI="http://download.blender.org/source/${P}.tar.gz"
+
+# Blender can have letters in the version string,
+# so strip of the letter if it exists.
+MY_PV="$(get_version_component_range 1-2)"
+
+SLOT="0"
+LICENSE="|| ( GPL-2 BL )"
+KEYWORDS="~amd64 ~x86"
+IUSE="+boost +bullet +dds +elbeem +game-engine +openexr collada colorio \
+	cuda cycles debug doc ffmpeg fftw headless jack jemalloc jpeg2k libav \
+	llvm man ndof nls openal opencl openimageio openmp opensubdiv openvdb \
+	openvdb-compression player sdl sndfile test tiff valgrind"
+
+# OpenCL and nVidia performance is rubbish with Blender
+# If you have nVidia, use CUDA.
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	player? ( game-engine !headless )
+	cuda? ( cycles !opencl )
+	cycles? ( boost openexr tiff openimageio )
+	colorio? ( boost )
+	openvdb? ( boost )
+	opensubdiv? ( cuda )
+	nls? ( boost )
+	openal? ( boost )
+	opencl? ( cycles )
+	game-engine? ( boost )
+	?? ( ffmpeg libav )"
+
+# Since not using OpenCL with nVidia, depend on ATI binary
+# blobs as Cycles with OpenCL does not work with any open
+# source drivers.
+COMMON_DEPEND="
+	boost? ( >=dev-libs/boost-1.62:=[nls?,threads(+)] )
+	collada? ( >=media-libs/opencollada-1.6.18:= )
+	colorio? ( >=media-libs/opencolorio-1.0.9-r2 )
+	cuda? ( dev-util/nvidia-cuda-toolkit:= )
+	ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?] )
+	libav? ( >=media-video/libav-11.3:=[x264,mp3,encode,theora,jpeg2k?] )
+	fftw? ( sci-libs/fftw:3.0= )
+	!headless? (
+		x11-libs/libX11
+		x11-libs/libXi
+		x11-libs/libXxf86vm
+	)
+	jack? ( media-sound/jack-audio-connection-kit )
+	jemalloc? ( dev-libs/jemalloc:= )
+	jpeg2k? ( media-libs/openjpeg:0 )
+	llvm? ( sys-devel/llvm )
+	ndof? (
+		app-misc/spacenavd
+		dev-libs/libspnav
+	)
+	nls? ( virtual/libiconv )
+	openal? ( media-libs/openal )
+	openimageio? ( >=media-libs/openimageio-1.6.9 )
+	opencl? ( x11-drivers/ati-drivers:* )
+	openexr? (
+		>=media-libs/ilmbase-2.2.0:=
+		>=media-libs/openexr-2.2.0:=
+	)
+	opensubdiv? ( media-libs/opensubdiv[cuda=,opencl=] )
+	openvdb? (
+		media-gfx/openvdb[${PYTHON_USEDEP},openvdb-compression=]
+		dev-cpp/tbb
+	)
+	openvdb-compression? ( >=dev-libs/c-blosc-1.5.2 )
+	sdl? ( media-libs/libsdl2[sound,joystick] )
+	sndfile? ( media-libs/libsndfile )
+	tiff? ( media-libs/tiff:0 )
+	valgrind? ( dev-util/valgrind )"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-libs/lzo:2
+	>=dev-python/numpy-1.10.1[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	media-libs/freetype
+	media-libs/glew:*
+	media-libs/libpng:0=
+	media-libs/libsamplerate
+	sys-libs/zlib
+	virtual/glu
+	virtual/jpeg:0=
+	virtual/libintl
+	virtual/opengl
+	${COMMON_DEPEND}"
+
+DEPEND="${RDEPEND}
+	>=dev-cpp/eigen-3.2.8:3
+	doc? (
+		app-doc/doxygen[-nodot(-),dot(+),latex]
+		dev-python/sphinx[latex]
+	)
+	nls? ( sys-devel/gettext )
+	${COMMON_DEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-C++11-build-fix.patch
+	  "${FILESDIR}"/${PN}-fix-install-rules.patch )
+
+blender_check_requirements() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+
+	if use doc; then
+		CHECKREQS_DISK_BUILD="4G" check-reqs_pkg_pretend
+	fi
+}
+
+pkg_pretend() {
+	blender_check_requirements
+}
+
+pkg_setup() {
+	blender_check_requirements
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# we don't want static glew, but it's scattered across
+	# multiple files that differ from version to version
+	# !!!CHECK THIS SED ON EVERY VERSION BUMP!!!
+	local file
+	while IFS="" read -d $'\0' -r file ; do
+		sed -i -e '/-DGLEW_STATIC/d' "${file}" || die
+	done < <(find . -type f -name "CMakeLists.txt")
+
+	# Disable MS Windows help generation. The variable doesn't do what it
+	# it sounds like.
+	sed -e "s|GENERATE_HTMLHELP      = YES|GENERATE_HTMLHELP      = NO|" \
+	    -i doc/doxygen/Doxyfile || die
+}
+
+src_configure() {
+	# FIX: forcing '-funsigned-char' fixes an anti-aliasing issue with menu
+	# shadows, see bug #276338 for reference
+	append-flags -funsigned-char
+	append-lfs-flags
+
+	local mycmakeargs=(
+		-DPYTHON_VERSION="${EPYTHON/python/}"
+		-DPYTHON_LIBRARY="$(python_get_library_path)"
+		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
+		-DWITH_INSTALL_PORTABLE=OFF
+		-DWITH_PYTHON_INSTALL=OFF
+		-DWITH_PYTHON_INSTALL_NUMPY=OFF
+		-DWITH_STATIC_LIBS=OFF
+		-DWITH_SYSTEM_GLEW=ON
+		-DWITH_SYSTEM_OPENJPEG=ON
+		-DWITH_SYSTEM_EIGEN3=ON
+		-DWITH_SYSTEM_LZO=ON
+		-DWITH_C11=ON
+		-DWITH_CXX11=ON
+		-DWITH_BOOST=$(usex boost)
+		-DWITH_BULLET=$(usex bullet)
+		-DWITH_CODEC_FFMPEG=$(usex ffmpeg)
+		-DWITH_CODEC_SNDFILE=$(usex sndfile)
+		-DWITH_CUDA=$(usex cuda)
+		-DWITH_CYCLES_DEVICE_CUDA=$(usex cuda TRUE FALSE)
+		-DWITH_CYCLES=$(usex cycles)
+		-DWITH_CYCLES_OSL=OFF
+		-DWITH_LLVM=$(usex llvm)
+		-DWITH_FFTW3=$(usex fftw)
+		-DWITH_GAMEENGINE=$(usex game-engine)
+		-DWITH_HEADLESS=$(usex headless)
+		-DWITH_X11=$(usex !headless)
+		-DWITH_IMAGE_DDS=$(usex dds)
+		-DWITH_IMAGE_OPENEXR=$(usex openexr)
+		-DWITH_IMAGE_OPENJPEG=$(usex jpeg2k)
+		-DWITH_IMAGE_TIFF=$(usex tiff)
+		-DWITH_INPUT_NDOF=$(usex ndof)
+		-DWITH_INTERNATIONAL=$(usex nls)
+		-DWITH_JACK=$(usex jack)
+		-DWITH_MOD_FLUID=$(usex elbeem)
+		-DWITH_MOD_OCEANSIM=$(usex fftw)
+		-DWITH_OPENAL=$(usex openal)
+		-DWITH_OPENCL=$(usex opencl)
+		-DWITH_CYCLES_DEVICE_OPENCL=$(usex opencl TRUE FALSE)
+		-DWITH_OPENCOLORIO=$(usex colorio)
+		-DWITH_OPENCOLLADA=$(usex collada)
+		-DWITH_OPENIMAGEIO=$(usex openimageio)
+		-DWITH_OPENMP=$(usex openmp)
+		-DWITH_OPENSUBDIV=$(usex opensubdiv)
+		-DWITH_OPENVDB=$(usex openvdb)
+		-DWITH_OPENVDB_BLOSC=$(usex openvdb-compression)
+		-DWITH_PLAYER=$(usex player)
+		-DWITH_SDL=$(usex sdl)
+		-DWITH_CXX_GUARDEDALLOC=$(usex debug)
+		-DWITH_ASSERT_ABORT=$(usex debug)
+		-DWITH_GTESTS=$(usex test)
+		-DWITH_DOC_MANPAGE=$(usex man)
+		-DWITH_MEM_JEMALLOC=$(usex jemalloc)
+		-DWITH_MEM_VALGRIND=$(usex valgrind)
+	)
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+
+	if use doc; then
+		# Workaround for binary drivers.
+		local card
+		local cards=( /dev/ati/card* /dev/nvidia* )
+		for card in "${cards[@]}"; do addpredict "${card}"; done
+
+		einfo "Generating Blender C/C++ API docs ..."
+		cd "${CMAKE_USE_DIR}"/doc/doxygen || die
+		doxygen -u Doxyfile || die
+		doxygen || die "doxygen failed to build API docs."
+
+		cd "${CMAKE_USE_DIR}" || die
+		einfo "Generating (BPY) Blender Python API docs ..."
+		"${BUILD_DIR}"/bin/blender --background --python doc/python_api/sphinx_doc_gen.py -noaudio || die "sphinx failed."
+
+		cd "${CMAKE_USE_DIR}"/doc/python_api || die
+		sphinx-build sphinx-in BPY_API || die "sphinx failed."
+	fi
+}
+
+src_test() {
+	if use test; then
+		einfo "Running Blender Unit Tests ..."
+		cd "${BUILD_DIR}"/bin/tests || die
+		local f
+		for f in *_test; do
+			./"${f}" || die
+		done
+	fi
+}
+
+src_install() {
+	# Pax mark blender for hardened support.
+	pax-mark m "${CMAKE_BUILD_DIR}"/bin/blender
+
+	if use doc; then
+		docinto "html/API/python"
+		dodoc -r "${CMAKE_USE_DIR}"/doc/python_api/BPY_API/.
+
+		docinto "html/API/blender"
+		dodoc -r "${CMAKE_USE_DIR}"/doc/doxygen/html/.
+	fi
+
+	emake -C "${CMAKE_BUILD_DIR}" DESTDIR="${D}" install/fast
+
+	# fix doc installdir
+	docinto "html"
+	dodoc "${CMAKE_USE_DIR}"/release/text/readme.html
+	rm -r "${ED%/}"/usr/share/doc/blender || die
+
+	python_fix_shebang "${ED%/}/usr/bin/blender-thumbnailer.py"
+	python_optimize "${ED%/}/usr/share/blender/${MY_PV}/scripts"
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	elog
+	elog "Blender uses python integration. As such, may have some"
+	elog "inherit risks with running unknown python scripts."
+	elog
+	elog "It is recommended to change your blender temp directory"
+	elog "from /tmp to /home/user/tmp or another tmp file under your"
+	elog "home directory. This can be done by starting blender, then"
+	elog "dragging the main menu down do display all paths."
+	elog
+	ewarn
+	ewarn "This ebuild does not unbundle the massive amount of 3rd party"
+	ewarn "libraries which are shipped with blender. Note that"
+	ewarn "these have caused security issues in the past."
+	ewarn "If you are concerned about security, file a bug upstream:"
+	ewarn "  https://developer.blender.org/"
+	ewarn
+	gnome2_icon_cache_update
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	fdo-mime_desktop_database_update
+
+	ewarn ""
+	ewarn "You may want to remove the following directory."
+	ewarn "~/.config/${PN}/${MY_PV}/cache/"
+	ewarn "It may contain extra render kernels not tracked by portage"
+	ewarn ""
+}
--- a/media-gfx/blender/files/blender-2.78-C++11-build-fix.patch
+++ b/media-gfx/blender/files/blender-2.78-C++11-build-fix.patch
@ -0,0 +1,11 @@
+diff -purN a/source/blender/render/intern/raytrace/rayobject_rtbuild.cpp b/source/blender/render/intern/raytrace/rayobject_rtbuild.cpp
+--- a/source/blender/render/intern/raytrace/rayobject_rtbuild.cpp	2016-09-28 10:26:55.000000000 +0100
+++ b/source/blender/render/intern/raytrace/rayobject_rtbuild.cpp	2016-10-04 11:13:46.489404123 +0100
+@@ -34,6 +34,7 @@
+ #include <math.h>
+ #include <stdlib.h>
+ #include <algorithm>
+#include <cmath>
+ 
+ #include "rayobject_rtbuild.h"
+ 
--- a/media-gfx/blender/files/blender-fix-install-rules.patch
+++ b/media-gfx/blender/files/blender-fix-install-rules.patch
@ -0,0 +1,16 @@
+diff -purN a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
+--- a/source/creator/CMakeLists.txt	2016-09-28 10:26:55.000000000 +0100
+++ b/source/creator/CMakeLists.txt	2016-10-03 12:17:08.938928486 +0100
+@@ -328,12 +328,6 @@ endif()
+ # Install Targets (Generic, All Platforms)
+ 
+ 
+-# important to make a clean  install each time, else old scripts get loaded.
+-install(
+-	CODE
+-	"file(REMOVE_RECURSE ${TARGETDIR_VER})"
+-)
+-
+ if(WITH_PYTHON)
+ 	# install(CODE "message(\"copying blender scripts...\")")
+ 	
--- a/media-gfx/blender/metadata.xml
+++ b/media-gfx/blender/metadata.xml
@ -1,24 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer restrict="&gt;=media-gfx/blender-2.72b-r4" type="person">
+	<maintainer restrict="&gt;=media-gfx/blender-2.77" type="person">
 		<email>j.scruggs@gmail.com</email>
 		<name>Jonathan Scruggs</name>
-		<description>Proxy maintainer</description>
 	</maintainer>
-	<maintainer restrict="&gt;=media-gfx/blender-2.72b-r4" type="person">
+	<maintainer restrict="&gt;=media-gfx/blender-2.77" type="person">
 		<email>agrigo2001@yahoo.com.au</email>
 		<name>Adrian Grigo</name>
-		<description>Proxy maintainer</description>
-	</maintainer>
-	<maintainer type="project">
-		<email>graphics@gentoo.org</email>
-		<name>Gentoo Graphics Project</name>
 	</maintainer>
 	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>graphics@gentoo.org</email>
+		<name>Gentoo Graphics Project</name>
+	</maintainer>

 	<longdescription>
 		Blender, the open source software for 3D modeling, animation,
@ -26,13 +24,23 @@
 	</longdescription>

 	<use>
-		<flag name="game-engine" restrict="&gt;=media-gfx/blender-2.50">
-			Adds Game Engine support to Blender.
+		<flag name="boost">
+			Enable features depending on boost.
+		</flag>
+		<flag name="bullet">
+			Enable Bullet (Physics Engine).
 		</flag>
 		<flag name="collada">
 			Add support for Collada interchange format through
 			<pkg>media-libs/opencollada</pkg>.
 		</flag>
+		<flag name="colorio">
+			Enable OpenColorIO color management through
+			<pkg>media-libs/opencolorio</pkg>.
+		</flag>
+		<flag name="cuda">
+			Build cycles renderer with nVidia CUDA support.
+		</flag>
 		<flag name="cycles">
 			Build cycles renderer (requires <pkg>media-libs/openimageio</pkg> and
 			<pkg>dev-libs/boost</pkg>).
@ -40,32 +48,61 @@
 		<flag name="dds">
 			Adds DDS textures support to Blender.
 		</flag>
-		<flag name="player">
-			Build the Blender Player. THis requires the Game engine.
+		<flag name="doc">
+			Build C and Python API documentation directly from the source code.
 		</flag>
 		<flag name="elbeem">
 			Adds surface fluid simulation to Blender using El'Beem library.
 		</flag>
-		<flag name="doc">
-			Build C and Python API documentation directly from the source code.
+		<flag name="game-engine" restrict="&gt;=media-gfx/blender-2.50">
+			Adds Game Engine support to Blender.
 		</flag>
-		<flag name="redcode">
-			This flag add support for RED CODE camera digital format (5K HD
-			images *.r3d) - EXPERIMENTAL.
+		<flag name="headless" restrict="&gt;=media-gfx/blender-2.77">
+			Build without graphical support (renderfarm, server mode only).
 		</flag>
-		<flag name="boost">
-			Enable features depending on boost.
+		<flag name="jemalloc" restrict="&gt;=media-gfx/blender-2.77">
+			Use <pkg>dev-libs/jemalloc</pkg> for memory allocation.
 		</flag>
-		<flag name="bullet">
-			Enable Bullet (Physics Engine).
+		<flag name="llvm" restrict="&gt;=media-gfx/blender-2.77">
+			Enable features depending on llvm.
 		</flag>
-		<flag name="colorio">
-			Enable OpenColorIO color management.
+		<flag name="man" restrict="&gt;=media-gfx/blender-2.77">
+			Build and install man pages.
 		</flag>
 		<flag name="ndof">
 			Enable NDOF input devices (SpaceNavigator and friends).
 		</flag>
+		<flag name="opencl">
+			Build cycles renderer with OpenCL GPU enhancements.
+		</flag>
 		<flag name="openimageio">Enable OpenImageIO Support</flag>
-		<flag name="opennl">Enable use of Open Numerical Library</flag>
+		<flag name="opennl" restrict="&lt;=media-gfx/blender-2.73">
+			Enable use of Open Numerical Library
+		</flag>
+		<flag name="opensubdiv" restrict="&gt;=media-gfx/blender-2.77">
+			Add rendering support form OpenSubdiv from Dreamworks Animation
+			through <pkg>media-libs/opensubdiv</pkg>.
+		</flag>
+		<flag name="openvdb" restrict="&gt;=media-gfx/blender-2.77">
+			Add GPU preview rendering. Only works with nVidia cards.
+		</flag>
+		<flag name="openvdb-compression" restrict="&gt;=media-gfx/blender-2.77">
+			Support optional compression used by OpenVDB (requires
+			<pkg>media-gfx/openvdb</pkg>).
+		</flag>
+		<flag name="player">
+			Build the Blender Player. THis requires the Game engine.
+		</flag>
+		<flag name="redcode" restrict="&lt;=media-gfx/blender-2.73">
+			This flag add support for RED CODE camera digital format (5K HD
+			images *.r3d) - EXPERIMENTAL.
+		</flag>
+		<flag name="test" restrict="&gt;=media-gfx/blender-2.77">
+			Build the provided unit tests.
+		</flag>
+		<flag name="valgrind" restrict="&gt;=media-gfx/blender-2.77">
+			Add support for memory debugging using
+			<pkg>dev-util/valgrind</pkg>
+		</flag>
 	</use>
 </pkgmetadata>
--- a/media-gfx/openvdb/Manifest
+++ b/media-gfx/openvdb/Manifest
@ -0,0 +1 @@
+DIST openvdb-3.2.0.tar.gz 1368870 SHA256 d4b6eb63a2c1c62ca449399f3d7789638fde655c32a977b50717b727420a634b SHA512 df9a4895b219aae3b5a9616c34eb846d565877ff76648405691f0c903507f6faba94e8eba9173423b50cb5cef80f3ec500a9f70977cb7161701d39fd105abc91 WHIRLPOOL 3b76ba4998ac39405bbbdf0b1a80488234c5f25e8b0943d4520d9fa783384a111e48ff2120e942f5d9b3862e1f227ff89dcc633842e1290060afb1836785455f
--- a/media-gfx/openvdb/files/openvdb-3.2.0-build-fixes.patch
+++ b/media-gfx/openvdb/files/openvdb-3.2.0-build-fixes.patch
@ -0,0 +1,33 @@
+diff -purN a/doxygen-config b/doxygen-config
+--- a/doxygen-config	2016-08-10 16:59:33.000000000 +0100
+++ b/doxygen-config	2016-10-12 12:19:06.124785164 +0100
+@@ -2257,7 +2257,7 @@ DIRECTORY_GRAPH        = YES
+ # The default value is: png.
+ # This tag requires that the tag HAVE_DOT is set to YES.
+ 
+-DOT_IMAGE_FORMAT       = png
+DOT_IMAGE_FORMAT       = svg
+ 
+ # If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to
+ # enable generation of interactive SVG images that allow zooming and panning.
+diff -purN a/Makefile b/Makefile
+--- a/Makefile	2016-08-10 16:59:33.000000000 +0100
+++ b/Makefile	2016-10-12 12:18:32.434773635 +0100
+@@ -678,7 +678,7 @@ ALL_PRODUCTS := \
+ 	@echo "Building $@ because of $(call list_deps)"
+ 	$(CXX) -c $(CXXFLAGS) -fPIC -o $@ $<
+ 
+-all: lib python vdb_print vdb_render vdb_test depend
+all: lib python vdb_print vdb_render vdb_view vdb_test depend
+ 
+ $(OBJ_NAMES): %.o: %.cc
+ 	@echo "Building $@ because of $(call list_deps)"
+@@ -794,7 +794,7 @@ pydoc: $(PYTHON_MODULE) $(LIBOPENVDB_SON
+ 	echo "Created $${pydocdir}"; \
+ 	export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:$(CURDIR); \
+ 	export PYTHONPATH=${PYTHONPATH}:$(CURDIR); \
+-	    $(EPYDOC) --html -o $${pydocdir} $(PYTHON_MODULE_NAME) $(QUIET)
+	    $(EPYDOC) --html --html-dir $${pydocdir} $(PYTHON_MODULE_NAME) $(QUIET)
+ else
+ pydoc:
+ 	@echo "$@"': $$EPYDOC is undefined'
--- a/media-gfx/openvdb/files/openvdb-3.2.0-makefile-fixes.patch
+++ b/media-gfx/openvdb/files/openvdb-3.2.0-makefile-fixes.patch
@ -0,0 +1,93 @@
+diff --git a/Makefile b/Makefile
+index fba4fb6..0054f64 100644
+--- a/Makefile
+++ b/Makefile
+@@ -158,6 +158,9 @@ PYCONFIG_INCL_DIR := $(PYTHON_INCL_DIR)
+ # The directory containing libpython
+ PYTHON_LIB_DIR := $(HFS)/python/lib
+ PYTHON_LIB := -lpython$(PYTHON_VERSION)
+# The Directory to install the python module and includes to.
+PYTHON_INSTALL_INCL_DIR := $(DESTDIR)/python/include/python$(PYTHON_VERSION)
+PYTHON_INSTALL_LIB_DIR := $(DESTDIR)/python/lib/python$(PYTHON_VERSION)
+ # The directory containing libboost_python
+ BOOST_PYTHON_LIB_DIR := /rel/depot/third_party_build/boost/rhel6-1.46.1-0/lib
+ BOOST_PYTHON_LIB := -lboost_python-gcc41-mt-python26-1_46_1
+@@ -179,7 +182,6 @@ PYTHON_WRAP_ALL_GRID_TYPES := no
+ # (leave blank if Doxygen is unavailable)
+ DOXYGEN := doxygen
+ 
+-
+ #
+ # Ideally, users shouldn't need to change anything below this line.
+ #
+@@ -717,8 +719,13 @@ $(DOC_PDF): doxygen-config $(INCLUDE_NAMES) $(SRC_NAMES) $(DOC_FILES)
+ 	@echo "Generating documentation because of $(list_deps)"
+ 	echo -e 'OUTPUT_DIRECTORY=./doc\nGENERATE_LATEX=YES\nGENERATE_HTML=NO' \
+ 	    | cat doxygen-config - | $(DOXYGEN) - $(QUIET) \
+-	    && cd ./doc/latex && make refman.pdf $(QUIET) \
+	    && cd ./doc/latex && $(MAKE) refman.pdf $(QUIET) \
+ 	    && echo 'Created doc/latex/refman.pdf'
+	@#
+	    mkdir -p $(DESTDIR)/share/doc/openvdb/pdf; \
+	    echo "Created $(DESTDIR)/share/doc/openvdb/pdf"; \
+	    cp -r -f doc/latex/refman.pdf $(DESTDIR)/share/doc/openvdb/pdf/; \
+	    echo "Copied documentation to $(DESTDIR)/share/doc/openvdb/pdf/"; \
+ 
+ ifneq (,$(strip $(DOXYGEN)))
+ doc: $(DOC_INDEX)
+@@ -782,6 +789,22 @@ $(PYTHON_MODULE): $(LIBOPENVDB) $(PYTHON_OBJ_NAMES)
+ 	    -Wl,-rpath,$(BOOST_PYTHON_LIB_DIR) -L$(BOOST_PYTHON_LIB_DIR) $(BOOST_PYTHON_LIB) \
+ 	    $(LIBOPENVDB_RPATH) -L$(CURDIR) $(LIBOPENVDB) \
+ 	    $(LIBS_RPATH) $(CONCURRENT_MALLOC_LIB)
+	@echo "Installing the python module and includes"
+	@#
+	    mkdir -p $(PYTHON_INSTALL_INCL_DIR); \
+	    echo "Created $(PYTHON_INSTALL_INCL_DIR)"; \
+	    cp -f $(PYTHON_PUBLIC_INCLUDE_NAMES) $(PYTHON_INSTALL_INCL_DIR)/; \
+	    echo "Copied Python header files to $(PYTHON_INSTALL_INCL_DIR)"; \
+	    mkdir -p $(PYTHON_INSTALL_LIB_DIR); \
+	    echo "Created $(PYTHON_INSTALL_LIB_DIR)"; \
+	    cp -f $(PYTHON_MODULE) $(PYTHON_INSTALL_LIB_DIR)/; \
+	    pushd $(PYTHON_INSTALL_LIB_DIR) > /dev/null; \
+	    ln -f -s $(PYTHON_MODULE) $(PYTHON_SONAME); \
+	    popd > /dev/null; \
+	    echo "Copied Python module to $(PYTHON_INSTALL_LIB_DIR)"
+	@echo "Clean the Python modules so the next one will compile"
+	@#
+	    $(RM) $(PYTHON_OBJ_NAMES)
+ 
+ ifeq (yes,$(has_python))
+ ifneq (,$(strip $(EPYDOC)))
+@@ -833,7 +856,7 @@ test:
+ 	@echo "$@"': $$(CPPUNIT_INCL_DIR) is undefined'
+ endif
+ 
+-install: lib python vdb_print vdb_render vdb_view doc pydoc
+install: lib vdb_print vdb_render vdb_view doc pydoc
+ 	mkdir -p $(DESTDIR)/include/openvdb
+ 	@echo "Created $(DESTDIR)/include/openvdb"
+ 	pushd $(DESTDIR)/include/openvdb > /dev/null; \
+@@ -870,23 +893,6 @@ install: lib python vdb_print vdb_render vdb_view doc pydoc
+ 	    echo "Copied libopenvdb_viewer to $(DESTDIR)/lib/"; \
+ 	fi
+ 	@#
+-	if [ -f $(PYTHON_MODULE) ]; \
+-	then \
+-	    installdir=$(DESTDIR)/python/include/python$(PYTHON_VERSION); \
+-	    mkdir -p $${installdir}; \
+-	    echo "Created $${installdir}"; \
+-	    cp -f $(PYTHON_PUBLIC_INCLUDE_NAMES) $${installdir}/; \
+-	    echo "Copied Python header files to $${installdir}"; \
+-	    installdir=$(DESTDIR)/python/lib/python$(PYTHON_VERSION); \
+-	    mkdir -p $${installdir}; \
+-	    echo "Created $${installdir}"; \
+-	    cp -f $(PYTHON_MODULE) $${installdir}/; \
+-	    pushd $${installdir} > /dev/null; \
+-	    ln -f -s $(PYTHON_MODULE) $(PYTHON_SONAME); \
+-	    popd > /dev/null; \
+-	    echo "Copied Python module to $${installdir}"; \
+-	fi
+-	@#
+ 	mkdir -p $(DESTDIR)/bin
+ 	@echo "Created $(DESTDIR)/bin/"
+ 	cp -f vdb_print $(DESTDIR)/bin
--- a/media-gfx/openvdb/files/openvdb-3.2.0-numpy-fix.patch
+++ b/media-gfx/openvdb/files/openvdb-3.2.0-numpy-fix.patch
@ -0,0 +1,17 @@
+diff --git a/python/pyOpenVDBModule.cc b/openvdb/python/pyOpenVDBModule.cc
+index 508c787..dd069e0 100644
+--- a/python/pyOpenVDBModule.cc
+++ b/python/pyOpenVDBModule.cc
+@@ -592,8 +592,12 @@ BOOST_PYTHON_MODULE(PY_OPENVDB_MODULE_NAME)
+ 
+ #ifdef PY_OPENVDB_USE_NUMPY
+     // Initialize NumPy.
+#if PY_MAJOR_VERSION >= 3
+    if (_import_array()) { };
+#else
+     import_array();
+ #endif
+#endif
+ 
+     using namespace openvdb::OPENVDB_VERSION_NAME;
+ 
--- a/media-gfx/openvdb/metadata.xml
+++ b/media-gfx/openvdb/metadata.xml
@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer restrict="&gt;=media-gfx/openvdb-3.1.0" type="person">
+		<email>j.scruggs@gmail.com</email>
+		<name>Jonathan Scruggs</name>
+        </maintainer>
+	<maintainer restrict="&gt;=media-gfx/openvdb-3.1.0" type="person">
+		<email>agrigo2001@yahoo.com.au</email>
+		<name>Adrian Grigo</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription>
+		Libraries from Dreamworks Animation for the efficient manipulation 
+                of volumetric data used in big budget movies like 'Cloudy with a
+                Chance of Meatballs2' and 'How to Train Your Dragon 2'. 
+	</longdescription>
+	<use>
+		<flag name="openvdb-compression">
+			Adds enhanced compression to files through
+			<pkg>dev-libs/c-blosc</pkg>. Very useful so
+			enabled by dfault.
+		</flag>
+	</use>
+</pkgmetadata>
--- a/media-gfx/openvdb/openvdb-3.2.0.ebuild
+++ b/media-gfx/openvdb/openvdb-3.2.0.ebuild
@ -0,0 +1,158 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $id$
+
+EAPI="6"
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit eutils python-r1
+
+DESCRIPTION="Libs for the efficient manipulation of volumetric data"
+HOMEPAGE="http://www.openvdb.org"
+
+SRC_URI="https://github.com/dreamworksanimation/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+openvdb-compression doc python X"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="
+	sys-libs/zlib
+	>=dev-libs/boost-1.62:=[${PYTHON_USEDEP}]
+	media-libs/openexr
+	dev-util/cppunit
+	X? ( media-libs/glfw )
+	dev-libs/jemalloc
+	python? ( dev-python/numpy[${PYTHON_USEDEP}] )
+	openvdb-compression? ( >=dev-libs/c-blosc-1.5.0 )
+	dev-libs/log4cplus"
+
+RDEPEND="python? ( ${PYTHON_DEPS} )
+	 ${COMMON_DEPEND}"
+
+DEPEND="${RDEPEND}
+	dev-cpp/tbb
+	doc? (
+		app-doc/doxygen
+		python? ( dev-python/pdoc[${PYTHON_USEDEP}] )
+	)
+	${COMMON_DEPEND}"
+
+S="${WORKDIR}/${P}/${PN}"
+
+PATCHES=( "${FILESDIR}"/${P}-numpy-fix.patch
+	  "${FILESDIR}"/${P}-makefile-fixes.patch
+	  "${FILESDIR}"/${P}-build-fixes.patch )
+
+python_module_compile() {
+	mypythonargs=(
+		PYTHON_VERSION=${EPYTHON/python/}
+		PYTHON_INCL_DIR="$(python_get_includedir)"
+		PYCONFIG_INCL_DIR="$(python_get_includedir)"
+		PYTHON_LIB_DIR="$(python_get_library_path)"
+		PYTHON_LIB="$(python_get_LIBS)"
+		PYTHON_INSTALL_INCL_DIR="${D}$(python_get_includedir)"
+		PYTHON_INSTALL_LIB_DIR="${D}$(python_get_sitedir)"
+		NUMPY_INCL_DIR="$(python_get_sitedir)"/numpy/core/include/numpy
+		BOOST_PYTHON_LIB_DIR="${myprefixlibdir}"
+		BOOST_PYTHON_LIB=-lboost_python-${EPYTHON/python/}
+	)
+
+	einfo "Compiling module for ${EPYTHON}."
+	emake python "${myemakeargs[@]}" "${mypythonargs[@]}" EPYDOC=""
+
+	# This is so the correct version of pdoc is used
+	mypyscriptdir=$(python_get_scriptdir)
+}
+
+src_compile() {
+	# The build system is designed to compile and install all
+	# in one go, so doing each phase separately would be be
+	# impossible and the functions would all overlap anyways.
+	# Do nothing
+	return
+}
+
+src_install() {
+	local myprefix="${EPREFIX}"/usr
+	local myprefixlibdir="${myprefix}"/"$(get_libdir)"
+	local mypyscriptdir
+
+	# So individule targets can be called without duplication
+	# Common depends:
+	local myemakeargs=(
+		rpath=no shared=yes
+		LIBOPENVDB_RPATH=
+		DESTDIR="${D}"
+		HFS="${myprefix}"
+		HT="${myprefix}"
+		HDSO="${myprefixlibdir}"
+		CPPUNIT_INCL_DIR="${myprefix}"/include/cppunit
+		CPPUNIT_LIB_DIR="${myprefixlibdir}"
+		LOG4CPLUS_INCL_DIR="${myprefix}"/include/log4cplus
+		LOG4CPLUS_LIB_DIR="${myprefixlibdir}"
+	)
+
+	# Create python list here for use during install phase:
+	# - If python is used, then the last used module will trigger
+	#   document install phase. It's the same doc, so build once.
+	# - If no python used, then this will remail blanked out to
+	#   disable pydoc.
+	# - pydoc will be called if doc and python use flags are set.
+	local mypythonargs=(
+		PYTHON_VERSION=
+		PYTHON_INCL_DIR=
+		PYCONFIG_INCL_DIR=
+		PYTHON_LIB_DIR=
+		PYTHON_LIB=
+		PYTHON_INSTALL_INCL_DIR=
+		PYTHON_INSTALL_LIB_DIR=
+		NUMPY_INCL_DIR=
+		BOOST_PYTHON_LIB_DIR=
+		BOOST_PYTHON_LIB=
+	)
+
+	# Optional depends:
+	if use X; then
+		myemakeargs+=(
+			GLFW_INCL_DIR="${myprefixlibdir}"
+			GLFW_LIB_DIR="${myprefixlibdir}"
+		)
+	else
+		myemakeargs+=(
+			GLFW_INCL_DIR=
+			GLFW_LIB_DIR=
+			GLFW_LIB=
+			GLFW_MAJOR_VERSION=
+		)
+	fi
+
+	if use openvdb-compression; then
+		myemakeargs+=(
+			BLOSC_INCL_DIR="${myprefix}"/include
+			BLOSC_LIB_DIR="${myprefixlibdir}"
+		)
+	else
+		myemakeargs+=(
+			BLOSC_INCL_DIR=
+			BLOSC_LIB_DIR=
+		)
+	fi
+
+	use doc || myemakeargs+=( DOXYGEN= )
+
+	# Create python modules for each version selected
+	use python && python_foreach_impl python_module_compile
+
+	if use python && use doc; then
+		mypythonargs+=( EPYDOC="${mypyscriptdir}"/pdoc )
+	else
+		mypythonargs+=( EPYDOC="" )
+	fi
+
+	einfo "Compiling the main components."
+	emake install "${myemakeargs[@]}" "${mypythonargs[@]}"
+}
--- a/media-libs/opensubdiv/Manifest
+++ b/media-libs/opensubdiv/Manifest
@ -0,0 +1 @@
+DIST opensubdiv-3.1.0.tar.gz 18014579 SHA256 ff3f2cdeeaa8ac4abe83394b1fea27ea3ade8258aff86da5fdfba37415485aba SHA512 9b59cb4e5b124e222b67a48986251cff91bcdc2aee9f71c4b653ad7bb089e860c5954c251a91c0004fa5c28fc4524a0dcbf51d3ae51ea86ee7665ba05d8ec97f WHIRLPOOL 0765a01209781b237df9f51717d7e14dcde57b5e00e7cfaa81e02d6fd409bb2df3bc7c95f26b5ed20bb8cbd6c2b3aaa9ad28861198c25ffd3ec3c6b699a32444
--- a/media-libs/opensubdiv/files/opensubdiv-3.1.0-skip-osd-regression.patch
+++ b/media-libs/opensubdiv/files/opensubdiv-3.1.0-skip-osd-regression.patch
@ -0,0 +1,34 @@
+diff -purN a/regression/CMakeLists.txt b/regression/CMakeLists.txt
+--- a/regression/CMakeLists.txt	2016-03-25 22:15:29.000000000 +0000
+++ b/regression/CMakeLists.txt	2016-06-05 14:09:19.202849569 +0100
+@@ -32,30 +32,4 @@ if (NOT NO_REGRESSION)
+ 
+     add_subdirectory(far_perf)
+ 
+-    if(OPENGL_FOUND AND (GLEW_FOUND OR APPLE) AND GLFW_FOUND)
+-        add_subdirectory(osd_regression)
+-    else()
+-        set(MISSING "")
+-
+-        if (NOT OPENGL_FOUND)
+-            list(APPEND MISSING OpenGL)
+-        endif()
+-
+-        if (NOT GLEW_FOUND)
+-            list(APPEND MISSING glew)
+-        endif()
+-
+-        if (NOT GLFW_FOUND)
+-            list(APPEND MISSING glfw)
+-        endif()
+-
+-        message(WARNING
+-            "The following libraries could not be found : ${MISSING}.  "
+-            "The osd regression test will not be available.  "
+-            "If you have these libraries installed, please specify their "
+-            "path to cmake (through the GLEW_LOCATION and GLFW_LOCATION "
+-            "command line arguments or environment variables)."
+-        )
+-    endif()
+-
+ endif()
--- a/media-libs/opensubdiv/metadata.xml
+++ b/media-libs/opensubdiv/metadata.xml
@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer restrict="&gt;=media-libs/opensubdiv-3.0.5" type="person">
+		<email>j.scruggs@gmail.com</email>
+		<name>Jonathan Scruggs</name>
+        </maintainer>
+	<maintainer restrict="&gt;=media-libs/opensubdiv-3.0.5" type="person">
+		<email>agrigo2001@yahoo.com.au</email>
+		<name>Adrian Grigo</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription>
+		An Open-Source subdivision surface library.
+	</longdescription>
+	<use>
+		<flag name="ptex">
+			Adds support for faster per-face texture mapping through
+			<pkg>media-libs/ptex</pkg>.
+		</flag>
+		<flag name="cuda">
+			Enable NVIDIA CUDA Toolkit support through
+			<pkg>dev-util/nvidia-cuda-toolkit</pkg>.
+		</flag>
+		<flag name="tbb">
+			Enable multithreading with the Intel Threads Building Blocks through
+			<pkg>dev-cpp/tbb</pkg>.
+		</flag>
+		<flag name="opencl">
+			Enable OpenCL support through
+			<pkg>virtual/opencl</pkg>.
+		</flag>
+		<flag name="tutorials">
+		</flag>
+	</use>
+</pkgmetadata>
--- a/media-libs/opensubdiv/opensubdiv-3.1.0.ebuild
+++ b/media-libs/opensubdiv/opensubdiv-3.1.0.ebuild
@ -0,0 +1,62 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit cmake-utils toolchain-funcs versionator
+
+DESCRIPTION="An Open-Source subdivision surface library"
+HOMEPAGE="http://graphics.pixar.com/opensubdiv/"
+
+MY_PV="$(replace_all_version_separators '_')"
+
+SRC_URI="https://github.com/PixarAnimationStudios/OpenSubdiv/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0"
+IUSE="cuda doc examples opencl openmp ptex tbb test tutorials"
+
+# OpenCL does not work with Open Source drivers.
+RDEPEND="media-libs/glew:=
+	media-libs/glfw:=
+	opencl? ( x11-drivers/ati-drivers:* )
+	cuda? ( dev-util/nvidia-cuda-toolkit:* )
+	ptex? ( media-libs/ptex )"
+
+DEPEND="${RDEPEND}
+	tbb? ( dev-cpp/tbb )
+	doc? ( dev-python/docutils app-doc/doxygen )"
+
+KEYWORDS="~amd64 ~x86"
+
+S="${WORKDIR}"/OpenSubdiv-${MY_PV}
+
+PATCHES=( "${FILESDIR}"/${P}-skip-osd-regression.patch )
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DNO_MAYA=1
+		-DNO_CLEW=1
+		-DNO_DOC=$(usex !doc)
+		-DNO_TBB=$(usex !tbb)
+		-DNO_PTEX=$(usex !ptex)
+		-DNO_OMP=$(usex !openmp)
+		-DNO_OPENCL=$(usex !opencl)
+		-DNO_CUDA=$(usex !cuda)
+		-DNO_REGRESSION=$(usex !test)
+		-DNO_EXAMPLES=$(usex !examples)
+		-DNO_TUTORIALS=$(usex !tutorials)
+		-DGLEW_LOCATION="${EPREFIX}/usr/$(get_libdir)"
+		-DGLFW_LOCATION="${EPREFIX}/usr/$(get_libdir)"
+	)
+
+	cmake-utils_src_configure
+}
--- a/media-libs/ptex/Manifest
+++ b/media-libs/ptex/Manifest
@ -0,0 +1 @@
+DIST ptex-2.1.28.tar.gz 305327 SHA256 919af3cc56a7617079757bac5c0202f4375acf21861a3990e313739e56a6142c SHA512 ddce3c79f14d196e550c1e8a5b371482f88190cd667a2e2aa84601de1639f7cabb8571c1b3a49b48df46ce550d27088a00a67b1403c3bfec2ed73437c3dca3e8 WHIRLPOOL 996faad06ce8f016d24c8ec82e4422eab0e576976184bb27c24a3843eede53a3a2db5a6f572148c55bed3c6953dcdba30fa5d38e82fc1ea76e907bb5730fe5c7
--- a/media-libs/ptex/metadata.xml
+++ b/media-libs/ptex/metadata.xml
@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer restrict="&gt;=media-libs/ptex-2.1.10" type="person">
+		<email>j.scruggs@gmail.com</email>
+		<name>Jonathan Scruggs</name>
+	</maintainer>
+	<maintainer restrict="&gt;=media-libs/ptex-2.1.10" type="person">
+		<email>agrigo2001@yahoo.com.au</email>
+		<name>Adrian Grigo</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription>
+		Per-Face Texture Mapping for Production Rendering.
+	</longdescription>
+</pkgmetadata>
--- a/media-libs/ptex/ptex-2.1.28.ebuild
+++ b/media-libs/ptex/ptex-2.1.28.ebuild
@ -0,0 +1,23 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="Per-Face Texture Mapping for Production Rendering"
+HOMEPAGE="http://ptex.us/"
+SRC_URI="https://github.com/wdas/ptex/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+RDEPEND="sys-libs/zlib"
+DEPEND="${RDEPEND}
+	app-doc/doxygen"
+
+KEYWORDS="~amd64 ~x86"
+
+src_configure() {
+	local mycmakeargs=( -DCMAKE_INSTALL_DOCDIR="${EPREFIX}"/usr/share/doc/${PF}/html )
+	cmake-utils_src_configure
+}
--- a/media-sound/mixxx/mixxx-2.0.0-r3.ebuild
+++ b/media-sound/mixxx/mixxx-2.0.0-r3.ebuild
@ -6,7 +6,7 @@ EAPI=6

 inherit flag-o-matic scons-utils toolchain-funcs

-DESCRIPTION="A advanced Digital DJ tool based on Qt"
+DESCRIPTION="Advanced Digital DJ tool based on Qt"
 HOMEPAGE="http://www.mixxx.org/"
 SRC_URI="http://downloads.${PN}.org/${P}/${P}-src.tar.gz"

@ -17,14 +17,22 @@ SRC_URI+=" https://github.com/mixxxdj/mixxx/commit/869e07067b15e09bf7ef886a8772a
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="aac debug doc hid mp3 mp4 qt4 +qt5 shout wavpack ffmpeg"
-REQUIRED_USE="^^ ( qt4 qt5 )"
+IUSE="aac debug doc ffmpeg hid mp3 mp4 shout wavpack"

 # fails to compile system-fidlib. Add ">media-libs/fidlib-0.9.10-r1" once this
 # got fixed
 RDEPEND="dev-db/sqlite
-	virtual/libusb:1
 	dev-libs/protobuf
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtopengl:5
+	dev-qt/qtscript:5[scripttools]
+	dev-qt/qtsql:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
 	media-libs/chromaprint
 	media-libs/flac
 	media-libs/libid3tag
@ -37,6 +45,8 @@ RDEPEND="dev-db/sqlite
 	media-libs/rubberband
 	media-libs/taglib
 	media-libs/vamp-plugin-sdk
+	sci-libs/fftw:3.0=
+	virtual/libusb:1
 	virtual/opengl
 	x11-libs/libX11
 	aac? (
@ -46,37 +56,15 @@ RDEPEND="dev-db/sqlite
 	hid? ( dev-libs/hidapi )
 	mp3? ( media-libs/libmad )
 	mp4? ( media-libs/libmp4v2:= )
-	qt4? (
-		dev-qt/qtcore:4
-		dev-qt/qtgui:4
-		dev-qt/qtopengl:4
-		dev-qt/qtscript:4
-		dev-qt/qtsql:4
-		dev-qt/qtsvg:4
-	)
-	qt5? (
-		dev-qt/qtconcurrent:5
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtopengl:5
-		dev-qt/qtscript:5[scripttools]
-		dev-qt/qtsql:5
-		dev-qt/qtsvg:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtxml:5
-	)
 	shout? ( media-libs/libshout )
 	wavpack? ( media-sound/wavpack )
 	ffmpeg? ( media-video/ffmpeg:0= )"
 # media-libs/rubberband RDEPENDs on sci-libs/fftw:3.0
 DEPEND="${RDEPEND}
-	sci-libs/fftw:3.0
 	virtual/pkgconfig
-	qt5? (
-		dev-qt/qttest:5
-		dev-qt/qtxmlpatterns:5
-	)"
+	dev-qt/qttest:5
+	dev-qt/qtxmlpatterns:5
+"

 PATCHES=(
 	"${FILESDIR}"/${PN}-2.0.0-docs.patch
@ -92,17 +80,10 @@ src_prepare() {
 }

 src_configure() {
-	local myqtdir=qt5
 	local myoptimize=0

-	if use qt4 ; then
-		myqtdir="qt4"
-	fi
-
-	if use qt5 ; then
-		# Required for >=qt-5.7.0 (bug #590690)
-		append-cxxflags -std=c++11
-	fi
+	# Required for >=qt-5.7.0 (bug #590690)
+	append-cxxflags -std=c++11

 	# Try to get cpu type based on CFLAGS.
 	# Bug #591968
@ -115,7 +96,7 @@ src_configure() {

 	myesconsargs=(
 		prefix="${EPREFIX}/usr"
-		qtdir="${EPREFIX}/usr/$(get_libdir)/${myqtdir}"
+		qtdir="${EPREFIX}/usr/$(get_libdir)/qt5"
 		faad="$(usex aac 1 0)"
 		ffmpeg="$(usex ffmpeg 1 0)"
 		hid="$(usex hid 1 0)"
@ -124,7 +105,7 @@ src_configure() {
 		mad="$(usex mp3 1 0)"
 		optimize="${myoptimize}"
 		qdebug="$(usex debug 1 0)"
-		qt5="$(usex qt5 1 0)"
+		qt5=1
 		shoutcast="$(usex shout 1 0)"
 		vinylcontrol=1
 		wv="$(usex wavpack 1 0)"
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@ -1 +1 @@
-Sat, 22 Oct 2016 19:41:18 +0000
+Sun, 23 Oct 2016 13:40:30 +0000
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@ -1 +1 @@
-Sat, 22 Oct 2016 19:41:18 +0000
+Sun, 23 Oct 2016 13:40:31 +0000
--- a/metadata/md5-cache/app-accessibility/emacspeak-9999
+++ b/metadata/md5-cache/app-accessibility/emacspeak-9999
@ -7,5 +7,5 @@ IUSE=+espeak
 LICENSE=BSD GPL-2
 RDEPEND=espeak? ( app-accessibility/espeak ) >=dev-tcltk/tclx-8.4 >=virtual/emacs-24
 SLOT=0
-_eclasses_=elisp	7e36316fe822639d5a29fa10d5529eb9	elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	b83a2420b796f7c6eff682679d08fe25	git-r3	86ff3e88fc8a07b4f595afa27e416341	multilib	165fc17c38d1b11dac2008280dab6e80	readme.gentoo	df3fc8fdaf5a519e7d48c83e7592c95f	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
+_eclasses_=elisp	7e36316fe822639d5a29fa10d5529eb9	elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	b83a2420b796f7c6eff682679d08fe25	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	readme.gentoo	df3fc8fdaf5a519e7d48c83e7592c95f	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
 _md5_=02f12a3348d7d496984a08d0bab73a85
--- a/metadata/md5-cache/app-accessibility/espeakup-9999
+++ b/metadata/md5-cache/app-accessibility/espeakup-9999
@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/williamh/espeakup
 LICENSE=GPL-3
 RDEPEND=|| ( app-accessibility/espeak[portaudio] app-accessibility/espeak[pulseaudio] )
 SLOT=0
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	git-r3	86ff3e88fc8a07b4f595afa27e416341	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	git-r3	e928b84a9f6f1d9076d1d27687876dc6	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d53a40482d7e0404b61f288456b3b50e
--- a/metadata/md5-cache/app-admin/ansible-9999
+++ b/metadata/md5-cache/app-admin/ansible-9999
@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=keyczar? ( dev-python/keyczar[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/paramiko[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/jinja[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pycrypto-2.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/httplib2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/six[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] net-misc/sshpass virtual/ssh python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	git-r3	86ff3e88fc8a07b4f595afa27e416341	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=03509932e357e9bb835dcf81a20efc99
--- a/metadata/md5-cache/app-admin/checksec-1.7.2
+++ b/metadata/md5-cache/app-admin/checksec-1.7.2
@ -2,9 +2,9 @@ DEFINED_PHASES=install prepare
 DESCRIPTION=Tool to check properties of executables (e.g. ASLR/PIE, RELRO, PaX, Canaries)
 EAPI=5
 HOMEPAGE=https://github.com/slimm609/checksec.sh
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~mips ~ppc ~ppc64 ~x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://github.com/slimm609/checksec.sh/archive/1.7.2.tar.gz -> checksec-1.7.2.tar.gz
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=131c9b3f6c132c2866bc19710114f9eb
+_md5_=a22a7fbb455388ce5ea3121664b21add
--- a/metadata/md5-cache/app-admin/checksec-1.7.3
+++ b/metadata/md5-cache/app-admin/checksec-1.7.3
@ -2,9 +2,9 @@ DEFINED_PHASES=install prepare
 DESCRIPTION=Tool to check properties of executables (e.g. ASLR/PIE, RELRO, PaX, Canaries)
 EAPI=5
 HOMEPAGE=https://github.com/slimm609/checksec.sh
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~mips ~ppc ~ppc64 ~x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://github.com/slimm609/checksec.sh/archive/1.7.3.tar.gz -> checksec-1.7.3.tar.gz
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=754c8f3d67201518eb93daaa62d8c0de
+_md5_=a9a97b63fd345f8da164837c6c278801
--- a/metadata/md5-cache/app-admin/checksec-1.7.4
+++ b/metadata/md5-cache/app-admin/checksec-1.7.4
@ -2,9 +2,9 @@ DEFINED_PHASES=install prepare
 DESCRIPTION=Tool to check properties of executables (e.g. ASLR/PIE, RELRO, PaX, Canaries)
 EAPI=5
 HOMEPAGE=https://github.com/slimm609/checksec.sh
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~mips ~ppc ~ppc64 ~x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://github.com/slimm609/checksec.sh/archive/1.7.4.tar.gz -> checksec-1.7.4.tar.gz
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=160d6208a1e3dd513a320ee4b269b285
+_md5_=f22470378afdaafa730018c1b47b5cce
--- a/metadata/md5-cache/app-admin/diamond-9999
+++ b/metadata/md5-cache/app-admin/diamond-9999
@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=dev-python/configobj dev-python/setproctitle mongo? ( dev-python/pymongo ) mysql? ( dev-python/mysql-python ) snmp? ( dev-python/pysnmp ) redis? ( dev-python/redis-py ) !kernel_linux? ( >=dev-python/psutil-3 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	git-r3	86ff3e88fc8a07b4f595afa27e416341	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	prefix	99dcca42e6528d8fe3c214bf5731aaf2	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	prefix	99dcca42e6528d8fe3c214bf5731aaf2	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=955ca1af410fca5a0bd93323e3001969
--- a/metadata/md5-cache/app-admin/eclean-kernel-9999
+++ b/metadata/md5-cache/app-admin/eclean-kernel-9999
@ -5,5 +5,5 @@ EAPI=6
 HOMEPAGE=https://github.com/mgorny/eclean-kernel2
 LICENSE=BSD
 SLOT=0
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	git-r3	86ff3e88fc8a07b4f595afa27e416341	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	git-r3	e928b84a9f6f1d9076d1d27687876dc6	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
 _md5_=2195a914d7b2ea5788648a2067294b72
--- a/metadata/md5-cache/app-admin/elektra-9999
+++ b/metadata/md5-cache/app-admin/elektra-9999
@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/libltdl:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] augeas? ( app-admin/augeas ) dbus? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iconv? ( >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=virtual/jdk-1.8.0 ) qt5? ( >=dev-qt/qtdeclarative-5.3:5 >=dev-qt/qtgui-5.3:5 >=dev-qt/qttest-5.3:5 >=dev-qt/qtwidgets-5.3:5 ) uname? ( sys-apps/coreutils ) systemd? ( sys-apps/systemd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) yajl? ( >=dev-libs/yajl-1.0.11-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=dev-java/java-config-2.2.0-r3 )
 RESTRICT=test
 SLOT=0/9999
-_eclasses_=cmake-multilib	273c15f5a0a06438a38bb5c3e98fa2db	cmake-utils	f3d38665b0a86e08ba3a5473cdbfafd3	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	git-r3	86ff3e88fc8a07b4f595afa27e416341	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-multilib	273c15f5a0a06438a38bb5c3e98fa2db	cmake-utils	f3d38665b0a86e08ba3a5473cdbfafd3	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	git-r3	e928b84a9f6f1d9076d1d27687876dc6	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=47725ee8bedf0bd3ffa8660ba5faa240
--- a/metadata/md5-cache/app-admin/eselect-9999
+++ b/metadata/md5-cache/app-admin/eselect-9999
@ -8,5 +8,5 @@ LICENSE=GPL-2+ || ( GPL-2+ CC-BY-SA-2.5 )
 PDEPEND=emacs? ( app-emacs/eselect-mode ) vim-syntax? ( app-vim/eselect-syntax )
 RDEPEND=sys-apps/sed sys-apps/file sys-libs/ncurses
 SLOT=0
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	eutils	b83a2420b796f7c6eff682679d08fe25	git-r3	86ff3e88fc8a07b4f595afa27e416341	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	eutils	b83a2420b796f7c6eff682679d08fe25	git-r3	e928b84a9f6f1d9076d1d27687876dc6	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
 _md5_=43f1049e71971b535769ead5c5048018
--- a/metadata/md5-cache/app-admin/fleet-9999
+++ b/metadata/md5-cache/app-admin/fleet-9999
@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/coreos/fleet
 IUSE=doc examples test
 LICENSE=Apache-2.0
 SLOT=0
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	git-r3	86ff3e88fc8a07b4f595afa27e416341	multilib	165fc17c38d1b11dac2008280dab6e80	systemd	5b6ca8b2fc1307ca593223f327342c96	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	systemd	5b6ca8b2fc1307ca593223f327342c96	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
 _md5_=4bd8020fb60e6db45b45945795bea36a
--- a/metadata/md5-cache/app-admin/glance-2016.1.9999
+++ b/metadata/md5-cache/app-admin/glance-2016.1.9999
--- a/metadata/md5-cache/app-admin/glance-2016.2.9999
+++ b/metadata/md5-cache/app-admin/glance-2016.2.9999
--- a/Show More
+++ b/Show More
				`@ -0,0 +1 @@`
				`DIST openvdb-3.2.0.tar.gz 1368870 SHA256 d4b6eb63a2c1c62ca449399f3d7789638fde655c32a977b50717b727420a634b SHA512 df9a4895b219aae3b5a9616c34eb846d565877ff76648405691f0c903507f6faba94e8eba9173423b50cb5cef80f3ec500a9f70977cb7161701d39fd105abc91 WHIRLPOOL 3b76ba4998ac39405bbbdf0b1a80488234c5f25e8b0943d4520d9fa783384a111e48ff2120e942f5d9b3862e1f227ff89dcc633842e1290060afb1836785455f`
				`@ -0,0 +1 @@`
				`DIST opensubdiv-3.1.0.tar.gz 18014579 SHA256 ff3f2cdeeaa8ac4abe83394b1fea27ea3ade8258aff86da5fdfba37415485aba SHA512 9b59cb4e5b124e222b67a48986251cff91bcdc2aee9f71c4b653ad7bb089e860c5954c251a91c0004fa5c28fc4524a0dcbf51d3ae51ea86ee7665ba05d8ec97f WHIRLPOOL 0765a01209781b237df9f51717d7e14dcde57b5e00e7cfaa81e02d6fd409bb2df3bc7c95f26b5ed20bb8cbd6c2b3aaa9ad28861198c25ffd3ec3c6b699a32444`
				`@ -0,0 +1 @@`
				`DIST ptex-2.1.28.tar.gz 305327 SHA256 919af3cc56a7617079757bac5c0202f4375acf21861a3990e313739e56a6142c SHA512 ddce3c79f14d196e550c1e8a5b371482f88190cd667a2e2aa84601de1639f7cabb8571c1b3a49b48df46ce550d27088a00a67b1403c3bfec2ed73437c3dca3e8 WHIRLPOOL 996faad06ce8f016d24c8ec82e4422eab0e576976184bb27c24a3843eede53a3a2db5a6f572148c55bed3c6953dcdba30fa5d38e82fc1ea76e907bb5730fe5c7`