Sync with portage [Wed Dec 17 15:47:09 MSK 2014].

2014-12-17 15:47:09 +03:00 · 2014-12-17 15:47:09 +03:00 · 4339c5364f
commit 4339c5364f
parent cd4e699b76
100 changed files with 1191 additions and 2224 deletions
--- a/app-crypt/gpgme/Manifest
+++ b/app-crypt/gpgme/Manifest
@ -2,3 +2,4 @@ DIST gpgme-1.3.2.tar.bz2 867738 SHA256 cfd235663f1d1adc97abb38dd5e6d093bb7e15558
 DIST gpgme-1.4.4.tar.bz2 958379 SHA256 3d594ed4040e11f66be2f48e8bbfc0a831f68321b5d8940d9fdafb1b30542948 SHA512 a54d95e76419acd5c0535f88e55e8c85cd661663d2a65a03d6e03bda5e6e745f45e2f0c891a6c65eeebbf5d7a0c8ee9085ce51aab98445c9cbcc393ec6ddbeb5 WHIRLPOOL 0e63c64b2ea6a089585da57ff50a0c60933569f3e94b2e46a546738f709c464bfc198e88ce954790a179aabd431ebe0166031f9d687d712abdb4b8b30f6b61bc
 DIST gpgme-1.5.1.tar.bz2 964623 SHA256 6c2f3af8ceeb303277d44ec0216d9a1271701f65b91d5942264cf7cefb4a11e3 SHA512 66162d8baf8ce3d7eeaba5aa9cd4efb2704a7a00ce3e0e08a78bdf29ce812e00240a373e7e134825326117fab5495fe42cdf3944eb76f89048e045bcc6e114ff WHIRLPOOL 8179c510758357aea5d3e8fe92871e66c92e448c49b7df1f386741607a9e0a2caf4e770d7daa15f9312d3aa9969cdb4b772be98a9d5f41ab492b109556c41103
 DIST gpgme-1.5.2.tar.bz2 968398 SHA256 1e98b0a0a16f0265e8ebe72ef11acd2272322f682188d3e5098770e7f204f1d4 SHA512 898c07d3e8c5cc310b1d7e679c6f719a13a78417a2dfc93604fab8b464e740eb542614b126364fdc90960b63f4c6f191c30bbc81cfe2818dc826c9fff89c2994 WHIRLPOOL ad62e28e902f43ce63118e84aa6300d75a99645b239f003857abfb8b2d3485e38765ab39b68b3d82f92773c04bdf545b401e7610bf41df69cfc7c6089e948907
+DIST gpgme-1.5.3.tar.bz2 968670 SHA256 0db040c5b07e69cfe9a0b4566c8e90151ebacfe122c97c452f11386654aefcc9 SHA512 c21879bf424372733eae3a06beb1a3aa33b5c4f1fbefcb0964206caccf7a09b17941c0547972762cfb4e8d010e903b3ce6a895697558def2449c529159933049 WHIRLPOOL 58ebea1346f06f312c0a5203414a050ae726f3725b9fbf20a100278bc02a2a369e41aa8ff42ab8ba99517e75b28a824ab4aa2cdf6e55b60b25314fe7230e4df7
--- a/app-crypt/gpgme/gpgme-1.5.3.ebuild
+++ b/app-crypt/gpgme/gpgme-1.5.3.ebuild
@ -0,0 +1,41 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gpgme/gpgme-1.5.3.ebuild,v 1.1 2014/12/17 00:56:07 radhermit Exp $
+
+EAPI="5"
+
+inherit eutils libtool
+
+DESCRIPTION="GnuPG Made Easy is a library for making GnuPG easier to use"
+HOMEPAGE="http://www.gnupg.org/related_software/gpgme"
+SRC_URI="mirror://gnupg/gpgme/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="1/11" # subslot = soname major version
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="common-lisp static-libs"
+
+DEPEND="app-crypt/gnupg
+	>=dev-libs/libassuan-2.0.2
+	>=dev-libs/libgpg-error-1.11"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.1.8-et_EE.patch
+	elibtoolize
+}
+
+src_configure() {
+	econf \
+		--includedir="${EPREFIX}/usr/include/gpgme" \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	prune_libtool_files
+
+	if ! use common-lisp; then
+		rm -fr "${ED}usr/share/common-lisp"
+	fi
+}
--- a/app-editors/xemacs/xemacs-21.5.31.ebuild
+++ b/app-editors/xemacs/xemacs-21.5.31.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs/xemacs-21.5.31.ebuild,v 1.13 2014/11/03 11:08:09 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs/xemacs-21.5.31.ebuild,v 1.14 2014/12/16 23:21:06 jer Exp $

 # Note: xemacs currently does not work with a hardened profile. If you
 # want to use xemacs on a hardened profile then compile with the
@ -8,7 +8,7 @@

 EAPI=4

-export WANT_AUTOCONF="2.5"
+WANT_AUTOCONF="2.5"
 inherit eutils flag-o-matic multilib

 DESCRIPTION="highly customizable open source text editor and application development system"
--- a/app-editors/xemacs/xemacs-21.5.33.ebuild
+++ b/app-editors/xemacs/xemacs-21.5.33.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs/xemacs-21.5.33.ebuild,v 1.3 2014/11/03 11:08:09 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs/xemacs-21.5.33.ebuild,v 1.4 2014/12/16 23:21:06 jer Exp $

 # Note: xemacs currently does not work with a hardened profile. If you
 # want to use xemacs on a hardened profile then compile with the
@ -8,7 +8,7 @@

 EAPI=4

-export WANT_AUTOCONF="2.5"
+WANT_AUTOCONF="2.5"
 inherit eutils flag-o-matic multilib

 DESCRIPTION="highly customizable open source text editor and application development system"
--- a/app-misc/mc/mc-4.8.13.ebuild
+++ b/app-misc/mc/mc-4.8.13.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/mc-4.8.13.ebuild,v 1.2 2014/11/01 15:55:26 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/mc-4.8.13.ebuild,v 1.3 2014/12/17 07:11:54 jer Exp $

 EAPI=5

@ -14,7 +14,7 @@ SRC_URI="http://www.midnight-commander.org/downloads/${MY_P}.tar.xz"

 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
 IUSE="+edit gpm mclib nls samba sftp +slang spell test X +xdg"

 REQUIRED_USE="spell? ( edit )"
--- a/app-mobilephone/heimdall/heimdall-9999.ebuild
+++ b/app-mobilephone/heimdall/heimdall-9999.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/heimdall/heimdall-9999.ebuild,v 1.6 2014/03/24 17:48:11 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/heimdall/heimdall-9999.ebuild,v 1.7 2014/12/17 09:07:29 polynomial-c Exp $

 EAPI=5

@ -30,7 +30,7 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig"

 src_prepare() {
-	rm -r libusbx-1.0 || die
+	rm -r libusb-1.0 || die
 	cd "${S}/heimdall" || die
 	edos2unix configure.ac Makefile.am || die
 	sed -i -e /sudo/d Makefile.am || die
--- a/dev-haskell/aws/Manifest
+++ b/dev-haskell/aws/Manifest
@ -0,0 +1 @@
+DIST aws-0.11.tar.gz 89165 SHA256 496dafa5f847a4401d8ec34c45e11e77ee558ea9dc09caef2680f7c2c8c907a7 SHA512 df0513d88f64ec9c604197838a55ebc3d716a393e9d3b5bb67f6f5debc3e7419c10db22a35ab070b9e4c0ca3c10c9b259d4a24da7bc67284ce9bf4414044827b WHIRLPOOL 78dc9bd0435ca17f4d70204872158b2b26bc4a7a9326eb6440f96395d0dc0d5d727c8d7a4db77658f1d3cdd0d76db94eba545818f9425a34dbeee179832fc6e5
--- a/dev-haskell/aws/aws-0.11.ebuild
+++ b/dev-haskell/aws/aws-0.11.ebuild
@ -0,0 +1,60 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/aws/aws-0.11.ebuild,v 1.1 2014/12/16 23:05:28 slyfox Exp $
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.4.9999
+
+CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Amazon Web Services (AWS) for Haskell"
+HOMEPAGE="http://github.com/aristidb/aws"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RESTRICT=test # needs AWS account
+
+RDEPEND=">=dev-haskell/aeson-0.6:=[profile?]
+	>=dev-haskell/attoparsec-0.11:=[profile?] <dev-haskell/attoparsec-0.13:=[profile?]
+	>=dev-haskell/base16-bytestring-0.1:=[profile?] <dev-haskell/base16-bytestring-0.2:=[profile?]
+	>=dev-haskell/base64-bytestring-1.0:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?]
+	>=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.4:=[profile?]
+	>=dev-haskell/byteable-0.1:=[profile?] <dev-haskell/byteable-0.2:=[profile?]
+	>=dev-haskell/case-insensitive-0.2:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?]
+	>=dev-haskell/cereal-0.3:=[profile?] <dev-haskell/cereal-0.5:=[profile?]
+	>=dev-haskell/conduit-1.1:=[profile?] <dev-haskell/conduit-1.3:=[profile?]
+	>=dev-haskell/conduit-extra-1.1:=[profile?] <dev-haskell/conduit-extra-1.2:=[profile?]
+	>=dev-haskell/cryptohash-0.11:=[profile?] <dev-haskell/cryptohash-0.12:=[profile?]
+	>=dev-haskell/data-default-0.5.3:=[profile?] <dev-haskell/data-default-0.6:=[profile?]
+	>=dev-haskell/http-conduit-2.1:=[profile?] <dev-haskell/http-conduit-2.2:=[profile?]
+	>=dev-haskell/http-types-0.7:=[profile?] <dev-haskell/http-types-0.9:=[profile?]
+	>=dev-haskell/lifted-base-0.1:=[profile?] <dev-haskell/lifted-base-0.3:=[profile?]
+	>=dev-haskell/monad-control-0.3:=[profile?]
+	>=dev-haskell/mtl-2:=[profile?] <dev-haskell/mtl-3:=[profile?]
+	>=dev-haskell/network-2:=[profile?] <dev-haskell/network-3:=[profile?]
+	>=dev-haskell/resourcet-1.1:=[profile?] <dev-haskell/resourcet-1.2:=[profile?]
+	>=dev-haskell/safe-0.3:=[profile?] <dev-haskell/safe-0.4:=[profile?]
+	>=dev-haskell/scientific-0.3:=[profile?]
+	>=dev-haskell/tagged-0.7:=[profile?] <dev-haskell/tagged-0.8:=[profile?]
+	>=dev-haskell/text-0.11:=[profile?]
+	>=dev-haskell/transformers-0.2.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
+	>=dev-haskell/unordered-containers-0.2:=[profile?]
+	>=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-0.4:=[profile?]
+	>=dev-haskell/vector-0.10:=[profile?]
+	>=dev-haskell/xml-conduit-1.2:=[profile?] <dev-haskell/xml-conduit-1.3:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flags=-examples
+}
--- a/dev-haskell/aws/metadata.xml
+++ b/dev-haskell/aws/metadata.xml
@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>haskell</herd>
+	<longdescription>
+		Bindings for Amazon Web Services (AWS), with the aim of supporting all AWS services. To see a high level overview of the library, see the README at &lt;https://github.com/aristidb/aws/blob/master/README.org&gt;.
+	</longdescription>
+</pkgmetadata>
--- a/dev-libs/libassuan/Manifest
+++ b/dev-libs/libassuan/Manifest
@ -1,3 +1,4 @@
 DIST libassuan-2.1.1.tar.bz2 538155 SHA256 23e2d67779b88e90d29fe1df6b157109f1c2a647d0f1b2a0f4295bb3c0b2039d SHA512 ab32da1fe8a5240866412214b26be54641efbdd67510c53bb40c46a051b4d03b81406ae2ff4dc2ef51e21a7278e3f1705fe12dca4bd4ebfef84e109dd86d599e WHIRLPOOL 3476c7a6032073f4276e9282b59878774726fcb1d76def51a92be76a75f5dca6ab8a621598e479557f1412e35d01d4fd83d5d2d9f1dc42bbb519e7dc0396de84
 DIST libassuan-2.1.2.tar.bz2 516026 SHA256 39f8a7c9349aaaf7ccd937b90660153ec4d2d4df2465018754e5bcae5b1db77b SHA512 a45b1db8521f547eafbf4ddeaa5b1a19dd47be32e1b02103b2c46c0c86291ba2c2124c25151311a90bb2837f8e42fce7b61d9316606b3b19dbabafc57549386b WHIRLPOOL 99928abc5379f0eddf3e3e0d9536969503b2284bdea0040964a8ed072469df61652b906cbaf597234462e565cb60bd2495d772feec34b7c3330bc1416aa710c9
 DIST libassuan-2.1.3.tar.bz2 516087 SHA256 fa2170b353c928eb59610e0700c34947f1890634ddf7bcf2366c9c88b4f51d1a SHA512 ff9f6bd3287139307d42cf6fa9445487bf159db9dde2205246eaba2539f6162b419fdd53863929037550b71c2c12f14a39b60086fa6648e532bab498eee935a6 WHIRLPOOL 15e334f6f8ff9a06c72e57f5b7e550765bef96f0bf129c6066d7e066ff727c71e9bf790478350f02c13b5456baa087cbc52924114f67fe236326d6e0149b0fa6
+DIST libassuan-2.2.0.tar.bz2 516800 SHA256 7df58ed70be4b694f77efd1f3b3f103c6311b6b71e04a370382f9fe8204f6ec6 SHA512 716aa957408d51f518f3efd7238af34daab7889e2c2a8ca9611ba0c60db086062c4533c047caab4d41ef20d3cc6a7185ff2e4f06c9113eb177a961f20e877d99 WHIRLPOOL 576a834fdecab1b5adce68819a866067e9b5b6b02d96ea7060875712df547d7dab33ffb94f168b994240df867b4fc2797b51301ccb89113919d0d6661289b50d
--- a/dev-libs/libassuan/libassuan-2.2.0.ebuild
+++ b/dev-libs/libassuan/libassuan-2.2.0.ebuild
@ -0,0 +1,38 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libassuan/libassuan-2.2.0.ebuild,v 1.1 2014/12/17 01:07:27 radhermit Exp $
+
+EAPI=5
+
+inherit libtool eutils
+
+DESCRIPTION="IPC library used by GnuPG and GPGME"
+HOMEPAGE="http://www.gnupg.org/related_software/libassuan/index.en.html"
+SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-3 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="static-libs"
+
+RDEPEND=">=dev-libs/libgpg-error-1.8"
+DEPEND="${RDEPEND}"
+
+DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
+
+src_prepare() {
+	default
+
+	# for Solaris .so
+	elibtoolize
+}
+
+src_configure() {
+	econf $(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	# ppl need to use libassuan-config for --cflags and --libs
+	prune_libtool_files
+}
--- a/dev-lua/lpeg/Manifest
+++ b/dev-lua/lpeg/Manifest
@ -1 +1,2 @@
+DIST lpeg-0.12.1.tar.gz 67519 SHA256 60c6752dd043034c01929b04dab377d139f53bc098710cf735be53dd603fa22a SHA512 8cd47e169ce97c2eb40b865b0ef975b7a8fc58de1bde504518d9396b2a12efd92e7b2cfa1ccca59dd6a0cc22444fd1915a09e0d17fe78ba2a59bc3748546f60c WHIRLPOOL 0053b5df6c71b4b99d32f00c16b6156d7c96b4298059a17b8233c253db874117afd8daf217e19f8688a809b6f19f2293bca855af0c10c916b9fa22b29d43ad4b
 DIST lpeg-0.12.tar.gz 66649 SHA256 efa545144cd219eee823af7624d90f78c2230677ba740b7151c5d0c303778b76 SHA512 bf8c4fe486f5e965b793d8526dd1fc5c8905c4b065a1abe52ec8e41ebbe48292315a7460dc56fb7a029b4673057f9da7e53854bb79bb54dd8a4378391efc24a2 WHIRLPOOL 3e131da888eff53fbfa6203ed363f34832c52fb0fafca9006dd1da956c89a76528dc9aaf255426a148497c55df74ccb72cf87e234f5c432c4e2c28a5dfd0a9a1
--- a/dev-lua/lpeg/files/lpeg-0.12.1-makefile.patch
+++ b/dev-lua/lpeg/files/lpeg-0.12.1-makefile.patch
@ -0,0 +1,37 @@
+--- lpeg-0.12.1/makefile
+++ lpeg-0.12.1/makefile
+@@ -1,7 +1,7 @@
+ LIBNAME = lpeg
+ LUADIR = ../lua/
+ 
+-COPT = -O2
+#COPT = -O2
+ # COPT = -DLPEG_DEBUG -g
+ 
+ CWARNS = -Wall -Wextra -pedantic \
+@@ -22,21 +22,21 @@
+ # -Wunreachable-code \
+ 
+ 
+-CFLAGS = $(CWARNS) $(COPT) -std=c99 -I$(LUADIR) -fPIC
+CFLAGS += $(CWARNS) $(COPT) -std=c99 -I$(LUADIR) -fPIC
+ CC = gcc
+ 
+ FILES = lpvm.o lpcap.o lptree.o lpcode.o lpprint.o
+ 
+ # For Linux
+ linux:
+-	make lpeg.so "DLLFLAGS = -shared -fPIC"
+	$(MAKE) lpeg.so "DLLFLAGS = -shared -fPIC"
+ 
+ # For Mac OS
+ macosx:
+-	make lpeg.so "DLLFLAGS = -bundle -undefined dynamic_lookup"
+	$(MAKE) lpeg.so "DLLFLAGS = -bundle -undefined dynamic_lookup"
+ 
+ lpeg.so: $(FILES)
+-	env $(CC) $(DLLFLAGS) $(FILES) -o lpeg.so
+	env $(CC) $(DLLFLAGS) $(LDFLAGS) $(FILES) -o lpeg.so
+ 
+ $(FILES): makefile
+ 
--- a/dev-lua/lpeg/lpeg-0.12.1.ebuild
+++ b/dev-lua/lpeg/lpeg-0.12.1.ebuild
@ -0,0 +1,42 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lua/lpeg/lpeg-0.12.1.ebuild,v 1.1 2014/12/17 01:25:11 radhermit Exp $
+
+EAPI=5
+
+inherit flag-o-matic toolchain-funcs eutils multilib
+
+DESCRIPTION="Parsing Expression Grammars for Lua"
+HOMEPAGE="http://www.inf.puc-rio.br/~roberto/lpeg/"
+SRC_URI="http://www.inf.puc-rio.br/~roberto/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~x86"
+IUSE="debug doc"
+
+RDEPEND=">=dev-lang/lua-5.1"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-makefile.patch
+	use debug && append-cflags -DLPEG_DEBUG
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_test() {
+	lua test.lua || die
+}
+
+src_install() {
+	exeinto "$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD lua)"
+	doexe lpeg.so
+
+	dodoc HISTORY
+
+	use doc && dohtml *
+}
--- a/dev-python/pystatgrab/pystatgrab-0.6.ebuild
+++ b/dev-python/pystatgrab/pystatgrab-0.6.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pystatgrab/pystatgrab-0.6.ebuild,v 1.1 2014/10/17 10:10:26 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pystatgrab/pystatgrab-0.6.ebuild,v 1.2 2014/12/17 05:47:57 idella4 Exp $

 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@ -16,7 +16,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~ia64 ~ppc ~x86"
 IUSE=""

-RDEPEND=">=sys-libs/libstatgrab-0.13"
+RDEPEND=">=sys-libs/libstatgrab-0.91"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"

--- a/dev-python/spyder/Manifest
+++ b/dev-python/spyder/Manifest
@ -1,3 +1,2 @@
-DIST spyder-2.2.1.zip 3495448 SHA256 8b5a23778f00b26e4c082360e3d83b60afe7b66e092ec618f10649d050658e55 SHA512 91d45e53154e859220e778473ed30e48859e45091bd6187b56c60890c52216a85b6e61a586dd5de97719a4387128af368437a48351523fd7deb1759d9a7d6587 WHIRLPOOL e1cd1dd0245571f827a7548f6acea7e3bedfdb3848cd1f3446db8b903cac62a4ca5fe99df649e2e9ae4bd70bffe3f4051c8edd56e2225ff4f576ede4e7cf1be5
-DIST spyder-2.2.5.zip 3543387 SHA256 e2ae6155d6f84a9bdee7b3a6eca4b72f3f5e6d775ad23e8d0e82e125342eacaf SHA512 a8c818a09e4638f898568ede811f7e844bcb0552fcc5aff4341fe5c89620982b7ccb28f7b75f488685db56ded1d2447a53bb2ef3da27a2af465097655468ff0d WHIRLPOOL 792f5ab800b0ff62a62e6e99079c7c4bdd4e1dda6ec4b4a0809cfe326356ffeeaac4a479a6da5a31f891a48efaa010f1a8924074c1c980d8b1415f8a99bf1128
 DIST spyder-2.3.1.zip 3721231 SHA256 986aa9307cfa551d93021452cbe0fc98e9785236b3af12692c179d0d931d4ebc SHA512 c422ac2945d63bec53c7e6e568b13b36fee25a77f2c41936b23cbcb4d4ec94a44128f5c0a21e12f39cd573cf51fc6335f9169c8bdaab14994025ab4959345954 WHIRLPOOL f79e3b5f24d1b14f8dcbfa268535eb82062d173c4e017894234607815895a4ebf08fc23eb9ee1f7db0c824c92a2f0f07c0b9a799d2655ddcc49c1e65b4600c11
+DIST spyder-2.3.2.zip 3724423 SHA256 f4f71ffe8590ffa8813622efb6705e52897552624726df317e0589ae121240bb SHA512 822f658344bca63d4582fc8e0a537af726ca5a8170a7f7240ff76b2911f17be5f579db6303ea1828f12ec63d0b83cfa45d54038c74eb962a3dedd96b3833bcd8 WHIRLPOOL 8bbf72aa5c60da42efa573dd937991a2c5ec8ddfd2aaa45800f9ac0fb2bdf69d5ef375d5a8feda305213777dc887873cff7a7a08d1612e735b83f4603e3320d8
--- a/dev-python/spyder/files/spyder-2.2.5-disable_sphinx_dependency.patch
+++ b/dev-python/spyder/files/spyder-2.2.5-disable_sphinx_dependency.patch
@ -1,70 +0,0 @@
--- setup.py.orig	2014-03-03 12:55:59.209248082 -0800
-+++ setup.py	2014-03-03 12:57:08.651709021 -0800
-@@ -81,51 +81,6 @@
-         else:
-             return
- 
-try:
-    from sphinx import setup_command
-
-    class MyBuild(build):
-        def has_doc(self):
-            setup_dir = os.path.dirname(os.path.abspath(__file__))
-            return os.path.isdir(os.path.join(setup_dir, 'doc'))
-        sub_commands = build.sub_commands + [('build_doc', has_doc)]
-    CMDCLASS['build'] = MyBuild
-    class MyBuildDoc(setup_command.BuildDoc):
-        def run(self):
-            build = self.get_finalized_command('build')
-            sys.path.insert(0, os.path.abspath(build.build_lib))
-            dirname = self.distribution.get_command_obj('build').build_purelib
-            self.builder_target_dir = osp.join(dirname, 'spyderlib', 'doc')
-
-            hhc_exe = get_html_help_exe()
-            self.builder = "html" if hhc_exe is None else "htmlhelp"
-
-            try:
-                setup_command.BuildDoc.run(self)
-            except UnicodeDecodeError:
-                print("ERROR: unable to build documentation because Sphinx "\
-                      "do not handle source path with non-ASCII characters. "\
-                      "Please try to move the source package to another "\
-                      "location (path with *only* ASCII characters).",
-                      file=sys.stderr)
-            sys.path.pop(0)
-            
-            # Building chm doc, if HTML Help Workshop is installed
-            if hhc_exe is not None:
-                fname = osp.join(self.builder_target_dir, 'Spyderdoc.chm')
-                subprocess.call('"%s" %s' % (hhc_exe, fname), shell=True)
-                if osp.isfile(fname):
-                    dest = osp.join(dirname, 'spyderlib')
-                    try:
-                        shutil.move(fname, dest)
-                    except shutil.Error:
-                        print("Unable to replace %s" % dest)
-                    shutil.rmtree(self.builder_target_dir)
-
-    CMDCLASS['build_doc'] = MyBuildDoc
-except ImportError:
-    print('WARNING: unable to build documentation because Sphinx '\
-          'is not installed', file=sys.stderr)
- 
- 
- NAME = 'spyder'
-@@ -191,7 +146,7 @@
-       package_data={LIBNAME: get_package_data(LIBNAME, EXTLIST),
-                     'spyderplugins':
-                     get_package_data('spyderplugins', EXTLIST)},
-      requires=["rope (>=0.9.2)", "sphinx (>=0.6.0)", "PyQt4 (>=4.4)"],
-+      requires=["rope (>=0.9.2)", "PyQt4 (>=4.4)"],
-       scripts=[osp.join('scripts', fname) for fname in SCRIPTS],
-       data_files=get_data_files(),
-       options={"bdist_wininst":
-@@ -212,5 +167,4 @@
-                    'Programming Language :: Python :: 2.7',
-                    'Development Status :: 5 - Production/Stable',
-                    'Topic :: Scientific/Engineering',
-                   'Topic :: Software Development :: Widget Sets'],
-      cmdclass=CMDCLASS)
-+                   'Topic :: Software Development :: Widget Sets'])
--- a/dev-python/spyder/spyder-2.2.1.ebuild
+++ b/dev-python/spyder/spyder-2.2.1.ebuild
@ -1,50 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/spyder/spyder-2.2.1.ebuild,v 1.1 2013/07/18 16:41:21 bicatali Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7} )
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="Python IDE with matlab-like features"
-HOMEPAGE="http://code.google.com/p/spyderlib/"
-SRC_URI="http://spyderlib.googlecode.com/files/${P}.zip"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc ipython matplotlib numpy pep8 +pyflakes pylint +rope scipy sphinx"
-
-RDEPEND="
-	|| ( dev-python/PyQt4[${PYTHON_USEDEP},svg,webkit]
-		 dev-python/pyside[${PYTHON_USEDEP},svg,webkit] )
-	ipython? ( dev-python/ipython[${PYTHON_USEDEP}] )
-	matplotlib? ( dev-python/matplotlib[${PYTHON_USEDEP}] )
-	numpy? ( dev-python/numpy[${PYTHON_USEDEP}] )
-	pep8? ( dev-python/pep8[${PYTHON_USEDEP}] )
-	pyflakes? ( >=dev-python/pyflakes-0.3[${PYTHON_USEDEP}] )
-	pylint? ( dev-python/pylint[${PYTHON_USEDEP}] )
-	rope? ( >=dev-python/rope-0.9.3[${PYTHON_USEDEP}] )
-	scipy? ( sci-libs/scipy[${PYTHON_USEDEP}] )
-	sphinx? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	doc? ( dev-python/sphinx )"
-
-PATCHES=( "${FILESDIR}"/${P}-disable_sphinx_dependency.patch )
-
-python_compile() {
-	if use doc; then
-		einfo "Generation of documentation"
-		PYTHONPATH="{BUILD_DIR}" \
-			sphinx-build doc doc_output || die "Generation of documentation failed"
-	fi
-}
-
-python_install_all() {
-	doicon spyderlib/images/spyder.svg
-	make_desktop_entry spyder Spyder spyder "Development;IDE"
-	use doc && dohtml -r doc_output/*
-}
--- a/dev-python/spyder/spyder-2.3.2.ebuild
+++ b/dev-python/spyder/spyder-2.3.2.ebuild
@ -1,45 +1,47 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/spyder/spyder-2.2.5.ebuild,v 1.1 2014/03/03 20:59:40 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/spyder/spyder-2.3.2.ebuild,v 1.1 2014/12/17 04:34:37 idella4 Exp $

 EAPI=5

-PYTHON_COMPAT=( python{2_6,2_7} )
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )

-inherit distutils-r1 eutils
+inherit distutils-r1

 DESCRIPTION="Python IDE with matlab-like features"
-HOMEPAGE="http://code.google.com/p/spyderlib/"
-SRC_URI="http://spyderlib.googlecode.com/files/${P}.zip"
+HOMEPAGE="http://code.google.com/p/spyderlib/ https://bitbucket.org/spyder-ide/spyderlib"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"

 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc ipython matplotlib numpy pep8 +pyflakes pylint +rope scipy sphinx"

+# rope requires no version bordering since all are >= miniumum version
 RDEPEND="
 	|| ( dev-python/PyQt4[${PYTHON_USEDEP},svg,webkit]
 		 dev-python/pyside[${PYTHON_USEDEP},svg,webkit] )
-	ipython? ( dev-python/ipython[${PYTHON_USEDEP}] )
+	ipython? ( dev-python/ipython[qt4,${PYTHON_USEDEP}] )
 	matplotlib? ( dev-python/matplotlib[${PYTHON_USEDEP}] )
 	numpy? ( dev-python/numpy[${PYTHON_USEDEP}] )
 	pep8? ( dev-python/pep8[${PYTHON_USEDEP}] )
-	pyflakes? ( >=dev-python/pyflakes-0.3[${PYTHON_USEDEP}] )
+	pyflakes? ( >=dev-python/pyflakes-0.5[${PYTHON_USEDEP}] )
 	pylint? ( dev-python/pylint[${PYTHON_USEDEP}] )
-	rope? ( >=dev-python/rope-0.9.3[${PYTHON_USEDEP}] )
+	rope? ( $(python_gen_cond_dep 'dev-python/rope[${PYTHON_USEDEP}]' python2_7) )
 	scipy? ( sci-libs/scipy[${PYTHON_USEDEP}] )
-	sphinx? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+	sphinx? ( >=dev-python/sphinx-0.6.0[${PYTHON_USEDEP}] )"
 DEPEND="${RDEPEND}
 	app-arch/unzip
-	doc? ( dev-python/sphinx )"
+	doc? ( >=dev-python/sphinx-0.6.0[${PYTHON_USEDEP}] )"

-PATCHES=( "${FILESDIR}"/${PN}-2.2.5-disable_sphinx_dependency.patch )
+# Courtesy of Arfrever
+PATCHES=( "${FILESDIR}"/${PN}-2.3.1-build.patch )

-python_compile() {
+python_compile_all() {
 	if use doc; then
 		einfo "Generation of documentation"
 		PYTHONPATH="{BUILD_DIR}" \
-			sphinx-build doc doc_output || die "Generation of documentation failed"
+			sphinx-build doc doc/html || die "Generation of documentation failed"
 	fi
 }

@ -47,5 +49,5 @@ python_install_all() {
 	distutils-r1_python_install_all
 	doicon spyderlib/images/spyder.svg
 	make_desktop_entry spyder Spyder spyder "Development;IDE"
-	use doc && dohtml -r doc_output/*
+	use doc && dohtml -r doc/html/
 }
--- a/dev-python/testtools/testtools-1.2.0.ebuild
+++ b/dev-python/testtools/testtools-1.2.0.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/testtools/testtools-1.2.0.ebuild,v 1.1 2014/12/16 11:41:25 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/testtools/testtools-1.2.0.ebuild,v 1.2 2014/12/16 23:04:46 idella4 Exp $

 EAPI=5

@ -25,21 +25,13 @@ RDEPEND="dev-python/mimeparse[${PYTHON_USEDEP}]
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( $(python_gen_cond_dep 'dev-python/twisted-core[${PYTHON_USEDEP}]' python2_7) )"
+	test? ( $(python_gen_cond_dep 'dev-python/twisted-core[${PYTHON_USEDEP}]' python2_7)
+		dev-python/unittest2[${PYTHON_USEDEP}] )"

 python_compile_all() {
 	use doc && emake -C doc html
 }

-python_prepare_all() {
-	# Take out failing tests
-	# https://bugs.launchpad.net/testtools/+bug/1380918
-#	sed -e 's:test_test_module:_&:' -e 's:test_test_suite:_&:' \
-#		-i testtools/tests/test_distutilscmd.py || die
-
-	distutils-r1_python_prepare_all
-}
-
 python_test() {
 	esetup.py test
 }
--- a/dev-ruby/dotenv/Manifest
+++ b/dev-ruby/dotenv/Manifest
@ -1 +1,2 @@
 DIST dotenv-0.11.1.gem 12800 SHA256 35e10cfb1b6ba008f5f1f45b15809c33c424b1fb1ab58d358847cf651af0e027 SHA512 c5bf943ece34f1b8f33ece12b9cfe5ccdbbca5378e2c1292691063fdd9f83d8123d09e772162d63e709142b20fd050cfdcad11ce096a8931367e123c7845005e WHIRLPOOL 924bbbd92efbfc193f24815eef0f23f61ca99140a00c67677decdd8371457d668e5451d2cad3cc58b4c5b427fbf845371ece49d6bcae198fb7939fc6367a5a6a
+DIST dotenv-1.0.2.gem 13824 SHA256 bc4eeb97154b96e2aba116a542df99a5a39eddca5cf110763c4a1054ca6edabc SHA512 a8ff090a9e79b6ff481ac7c51be02b8138026fff2c459609bb6057e75b34502e7a45d5941e8806a438f239fa8069a4e41fd2f345fb627874ab3bee17b5e30550 WHIRLPOOL d1a746030f3b771acfb03b08b02d9202429456f67db5177137bf0eec2d118cab08d3bd3058915f7f8689e143ccb475df888f40a67431b22524745e9a17a53823
--- a/dev-ruby/dotenv/dotenv-1.0.2.ebuild
+++ b/dev-ruby/dotenv/dotenv-1.0.2.ebuild
@ -0,0 +1,24 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/dotenv/dotenv-1.0.2.ebuild,v 1.1 2014/12/17 06:37:18 graaff Exp $
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21"
+
+RUBY_FAKEGEM_EXTRADOC="README.md Changelog.md"
+RUBY_FAKEGEM_RECIPE_TEST="rspec"
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Loads environment variables from .env into ENV"
+HOMEPAGE="https://github.com/bkeepers/dotenv"
+LICENSE="MIT"
+
+KEYWORDS="~amd64"
+SLOT="0"
+IUSE=""
+
+each_ruby_prepare() {
+	sed -i -e "s:ruby -v:${RUBY} -v:g" spec/dotenv/parser_spec.rb || die
+}
--- a/dev-ruby/rkelly-remix/rkelly-remix-0.0.6.ebuild
+++ b/dev-ruby/rkelly-remix/rkelly-remix-0.0.6.ebuild
@ -1,10 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rkelly-remix/rkelly-remix-0.0.6.ebuild,v 1.1 2014/04/11 02:31:21 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rkelly-remix/rkelly-remix-0.0.6.ebuild,v 1.2 2014/12/17 07:08:47 graaff Exp $

 EAPI=5

-USE_RUBY="ruby19"
+USE_RUBY="ruby19 ruby20 ruby21"

 RUBY_FAKEGEM_RECIPE_DOC="rdoc"

@ -16,7 +16,10 @@ LICENSE="MIT"

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

-ruby_add_bdepend "
-	dev-ruby/rdoc"
+ruby_add_bdepend "doc? ( dev-ruby/hoe dev-ruby/rdoc )"
+
+each_ruby_test() {
+	${RUBY} -S testrb -Ilib:. test/test_*.rb test/*/test_*.rb || die
+}
--- a/dev-vcs/git-annex/Manifest
+++ b/dev-vcs/git-annex/Manifest
@ -1,2 +1,3 @@
 DIST git-annex-5.20140927.tar.gz 4547006 SHA256 532b36a4a33909b9835a19888b1678251a0b99b1a1f82e94755bb5cc2e7af50b SHA512 7851b773a296efc3c4d3ae36ce240ca466b42d87d32f8635ae1dc8457064c20b2521c0fe3c123554e0d2e2e35346f03a3c25ae94f47f2a2d902a73629f0c6535 WHIRLPOOL bc30b2b7833f46a5633012f072a901142c2a6bc5fbca198c3d391fe336c2c88d3ae2491a439692fe32eb1b217d8a9c6b8baad931f462660b0c4a3cccb1ba44b0
 DIST git-annex-5.20141125.tar.gz 4580886 SHA256 ba26d0459d74d818b7ecc8153856ffccfcd7068dbea344334438a698dd689a66 SHA512 44feb1ecfe6c0f08c8c69b11efa9b81b5e420019321f27b825ae831c04e0e8ad307cea73e6c52ab1f73f2bebdd6476012e5eab1e823a9ded7d6c865e7fd24350 WHIRLPOOL 57ed46a1a8bd43fd12c05c2eee9da2bad529cde7ba424e7607858637e9394b280789edba5ae5c9e0547ad6d6a4ee48fd920c29cab87aacfebf4cf3b527aa58ce
+DIST git-annex-5.20141203.tar.gz 4611768 SHA256 d36d07fe592b27e7e4e363de3ddccb5cc4a8f189c30c58cfdb4524837473f105 SHA512 a16cc0d000cde3cc7ebad1a8eac17ba2d3efed2ac11090c1d8247a30c341fcb38bc32dccf6a8f6fe05c31fd22dc50ea2a292711a2edb43ab96275fd157030481 WHIRLPOOL a4c393e29d441b36ca56c88f1690235fc1939af0ad1834239d2a80896ae8e8cb0dc1586d87b4493803d0984dc5666550a69f1d03f44488cadcb1430f7e003225
--- a/dev-vcs/git-annex/git-annex-5.20141203.ebuild
+++ b/dev-vcs/git-annex/git-annex-5.20141203.ebuild
@ -0,0 +1,165 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-annex/git-annex-5.20141203.ebuild,v 1.1 2014/12/16 23:08:28 slyfox Exp $
+
+EAPI=5
+
+# ebuild generated by hackport 0.3.5
+
+CABAL_FEATURES="bin"
+inherit haskell-cabal
+
+DESCRIPTION="manage files with git, without checking their contents into git"
+HOMEPAGE="http://git-annex.branchable.com/"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+RESTRICT="test"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+IUSE="android androidsplice +assistant +cryptohash +dbus +dns doc +desktop-notify ekg +feed +inotify +pairing +production +quvi +s3 +tahoe +tdfa +testsuite +webapp +webapp-secure +webdav +xmpp"
+
+RDEPEND="dev-vcs/git
+"
+DEPEND="${RDEPEND}
+	dev-haskell/async
+	dev-haskell/bloomfilter
+	>=dev-haskell/cabal-1.8
+	dev-haskell/case-insensitive
+	dev-haskell/dataenc
+	dev-haskell/data-default
+	dev-haskell/dlist
+	dev-haskell/edit-distance
+	>=dev-haskell/exceptions-0.6
+	dev-haskell/hslogger
+	dev-haskell/http-conduit
+	dev-haskell/http-types
+	dev-haskell/ifelse
+	dev-haskell/json[generic]
+	dev-haskell/missingh
+	dev-haskell/monad-control
+	>=dev-haskell/mtl-2
+	>=dev-haskell/network-2.0
+	>=dev-haskell/quickcheck-2.1:2
+	dev-haskell/random
+	dev-haskell/safesemaphore
+	dev-haskell/sha
+	>=dev-haskell/stm-2.3
+	dev-haskell/text
+	dev-haskell/transformers
+	dev-haskell/unix-compat
+	dev-haskell/utf8-string
+	dev-haskell/uuid
+	>=dev-lang/ghc-7.4.1
+	android? ( dev-haskell/data-endian )
+	assistant? ( >=dev-haskell/stm-2.3
+			inotify? ( dev-haskell/hinotify ) )
+	cryptohash? ( >=dev-haskell/cryptohash-0.10.0 )
+	dbus? ( >=dev-haskell/dbus-0.10.3 )
+	dns? ( dev-haskell/dns )
+	ekg? ( dev-haskell/aeson
+		dev-haskell/ekg
+		dev-haskell/http-types )
+	feed? ( dev-haskell/feed )
+	pairing? ( dev-haskell/network-info
+			dev-haskell/network-multicast )
+	quvi? ( dev-haskell/aeson )
+	s3? ( >=dev-haskell/aws-0.9.2
+		dev-haskell/conduit
+		dev-haskell/conduit-extra
+		dev-haskell/resourcet )
+	tdfa? ( dev-haskell/regex-tdfa )
+	tahoe? ( dev-haskell/aeson )
+	testsuite? (
+			dev-haskell/crypto-api
+			>=dev-haskell/tasty-0.7
+			dev-haskell/tasty-hunit
+			dev-haskell/tasty-quickcheck
+			dev-haskell/tasty-rerun
+			>=dev-haskell/optparse-applicative-0.9.1
+			)
+	webapp? ( dev-haskell/blaze-builder
+			dev-haskell/aeson
+			dev-haskell/clientsession
+			dev-haskell/crypto-api
+			dev-haskell/hamlet
+			dev-haskell/http-types
+			dev-haskell/path-pieces
+			dev-haskell/transformers
+			dev-haskell/shakespeare
+			dev-haskell/wai
+			dev-haskell/wai-extra
+			dev-haskell/warp
+			dev-haskell/warp-tls
+			dev-haskell/yesod
+			dev-haskell/yesod-core
+			dev-haskell/yesod-default
+			dev-haskell/yesod-form
+			dev-haskell/yesod-static
+			webapp-secure? ( dev-haskell/warp-tls
+					dev-haskell/securemem
+					dev-haskell/byteable ) )
+	webdav? ( >=dev-haskell/dav-1.0
+			dev-haskell/http-client
+			dev-haskell/xml-conduit )
+	xmpp? ( >=dev-haskell/gnutls-0.1.4
+		dev-haskell/network-protocol-xmpp
+		dev-haskell/xml-types )
+		dev-lang/perl
+	doc? ( www-apps/ikiwiki net-misc/rsync )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag android android) \
+		$(cabal_flag androidsplice androidsplice) \
+		$(cabal_flag assistant assistant) \
+		$(cabal_flag cryptohash cryptohash) \
+		$(cabal_flag dbus dbus) \
+		$(cabal_flag desktop-notify desktop-notify) \
+		$(cabal_flag dns dns) \
+		$(cabal_flag ekg ekg) \
+		$(cabal_flag feed feed) \
+		$(cabal_flag inotify inotify) \
+		$(cabal_flag pairing pairing) \
+		$(cabal_flag production production) \
+		$(cabal_flag quvi quvi) \
+		$(cabal_flag s3 s3) \
+		$(cabal_flag tahoe tahoe) \
+		$(cabal_flag tdfa tdfa) \
+		$(cabal_flag testsuite testsuite) \
+		$(cabal_flag webapp webapp) \
+		$(cabal_flag webapp-secure webapp-secure) \
+		$(cabal_flag webdav webdav) \
+		$(cabal_flag xmpp xmpp)
+}
+
+src_compile() {
+	haskell-cabal_src_compile
+	use doc && emake docs
+}
+
+src_test() {
+	if use webapp; then
+		export GIT_CONFIG=${T}/temp-git-config
+		git config user.email "git@src_test"
+		git config user.name "Mr. ${P} The Test"
+
+		emake test
+	fi
+}
+
+src_install() {
+	haskell-cabal_src_install
+	dosym git-annex /usr/bin/git-annex-shell # standard make install does more, than needed
+
+	# install-mans wants ikiwiki. It returns 0 and builds the man pages without ikiwiki.
+	emake install-mans DESTDIR="${D}" PREFIX="${EPREFIX}/usr"
+	use doc && emake install-docs DESTDIR="${D}" PREFIX="${EPREFIX}/usr"
+	mv "${ED}"/usr/share/doc/{${PN},${PF}}
+	dodoc CHANGELOG README
+	if use webapp ; then
+		doicon "${FILESDIR}"/${PN}.xpm
+		make_desktop_entry "${PN} webapp" "git-annex" ${PN}.xpm "Office"
+	fi
+}
--- a/games-board/gtkatlantic/Manifest
+++ b/games-board/gtkatlantic/Manifest
@ -1 +1,2 @@
 DIST gtkatlantic-0.4.3.tar.bz2 748589 SHA256 5711eab90b831816da48b1d30f0f0d2b511bfaa6b057240977296f2c133184b1 SHA512 7d843783ee19e0e726e340a4497f4adec91d749461a400162b787676d2ab9fad136ae75578de9f5ce9008d05735951c4cafaf50ba651337ec4d6c0da66878bb2 WHIRLPOOL 84562688728a5bb4ddeec4de861753f6d3952c771f242ed98de358199aec8dd696d8eed9659ac61db463c7ac140dcae6ebccfa1f4a1c56ca78b0c8dcfe34d6c4
+DIST gtkatlantic-0.5.0.tar.bz2 782124 SHA256 065f649e37144a545936546c8655c5d66558415c259c4838c101ab1c733e0d86 SHA512 5aa332af2f17612caae0e396614ddfecbb1df4ad1f2c15a402efea5e96fde72cb0aefa87e690234382b82d03904e7235536434e455827b838a988c13eaa78bfe WHIRLPOOL 48e0e44ecedb02686414b1fdbfbf355b7e214c31edc1db70f90657489b19fb65d5a984c5814f31aab045e3c0837e3978e105a330510a42704c05995a1b3a1556
--- a/games-board/gtkatlantic/gtkatlantic-0.5.0.ebuild
+++ b/games-board/gtkatlantic/gtkatlantic-0.5.0.ebuild
@ -0,0 +1,44 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-board/gtkatlantic/gtkatlantic-0.5.0.ebuild,v 1.1 2014/12/17 00:43:33 mr_bones_ Exp $
+
+EAPI=5
+inherit eutils gnome2-utils games
+
+DESCRIPTION="Monopoly-like game that works with the monopd server"
+HOMEPAGE="http://gtkatlantic.gradator.net/"
+SRC_URI="http://download.tuxfamily.org/gtkatlantic/downloads/v0.5/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/gtk+:3
+	dev-libs/libxml2
+	media-libs/libpng:0"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_install() {
+	default
+	newicon data/icon32x32.xpm ${PN}.xpm
+	newicon -s 16 data/icon16x16.xpm ${PN}.xpm
+	newicon -s 32 data/icon32x32.xpm ${PN}.xpm
+	make_desktop_entry ${PN} GtkAtlantic
+	prepgamesdirs
+}
+
+pkg_preinst() {
+	games_pkg_preinst
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
--- a/games-puzzle/4stattack/4stattack-2.1.4.ebuild
+++ b/games-puzzle/4stattack/4stattack-2.1.4.ebuild
@ -1,7 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/4stattack/4stattack-2.1.4.ebuild,v 1.9 2007/03/15 14:07:57 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/4stattack/4stattack-2.1.4.ebuild,v 1.10 2014/12/17 00:06:08 mr_bones_ Exp $

+EAPI=5
 inherit eutils games

 DESCRIPTION="Connect-4 game, single or network multiplayer"
@ -13,14 +14,12 @@ SLOT="0"
 KEYWORDS="~amd64 hppa ppc x86"
 IUSE=""

+DEPEND=""
 RDEPEND="dev-python/pygame"

 S=${WORKDIR}/4stAttack-${PV}

-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
+src_prepare() {
 	# move the doc files aside so it's easier to install the game files
 	mv README.txt credits.txt changelog.txt ..
 	rm -f GPL version~
@ -32,7 +31,7 @@ src_unpack() {
 src_install() {
 	games_make_wrapper ${PN} "python ${PN}.py" "${GAMES_DATADIR}"/${PN}
 	insinto "${GAMES_DATADIR}"/${PN}
-	doins -r * || die "doins failed"
+	doins -r *
 	newicon kde/icons/48x48/forcedattack2.png ${PN}.png
 	make_desktop_entry ${PN} "4st Attack 2"
 	dodoc ../{README.txt,credits.txt,changelog.txt}
--- a/games-puzzle/4stattack/Manifest
+++ b/games-puzzle/4stattack/Manifest
@ -1 +1 @@
-DIST 4stAttack-2.1.4.tar.gz 1828247 RMD160 df5d420b5024e8634dac646247583179df533e44 SHA1 ecfe89054202b3c9fea9be4a03de72faaa406f6f SHA256 196c553fd3dbda8b2c2a07a9b0cbacf4f067712498f909d2823161e7d0b289e6
+DIST 4stAttack-2.1.4.tar.gz 1828247 SHA256 196c553fd3dbda8b2c2a07a9b0cbacf4f067712498f909d2823161e7d0b289e6 SHA512 4819c0915bfe47bb965ea39d49fa007fb18cfa965b15e5e72a4b0ac3be8a03c616d9438c8dedd960ee257e44b48f98f75ced6bed5bfc77f3366328c797b30f3c WHIRLPOOL 439d05b5208821d18b6976f055de32521283ee737832bf80c4eeea1f62bb334cc72b43b360b09f9cb0da42e8310e54e078ff097432e24ebd3c5ae74ddad1ac99
--- a/games-puzzle/gtetrinet/files/gtetrinet-0.7.11-format-security.patch
+++ b/games-puzzle/gtetrinet/files/gtetrinet-0.7.11-format-security.patch
@ -0,0 +1,16 @@
+Author: Jordi Mallach <jordi@debian.org>
+Description: Fix build when using -Werror=format-security, now default
+ on Debian.
+Status: committed-upstream
+
+--- gtetrinet-0.7.11.orig/src/tetrinet.c
+++ gtetrinet-0.7.11/src/tetrinet.c
+@@ -232,7 +232,7 @@
+             dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL,
+                                              GTK_MESSAGE_ERROR,
+                                              GTK_BUTTONS_OK,
+-                                             buf);
+                                             "%s", buf);
+             gtk_dialog_run (GTK_DIALOG(dialog));
+             gtk_widget_destroy (dialog);
+             g_free (data_utf8);
--- a/games-server/monopd/Manifest
+++ b/games-server/monopd/Manifest
@ -1 +1,2 @@
-DIST monopd-0.9.3.tar.bz2 110354 RMD160 ad698d7e4692f0b2446932f668d2eb9a2d8b3448 SHA1 244f6e0f2c8176fc57ab145c04aed3ed148e5976 SHA256 81fb6b267360b25d607da7846226c0976ed1df174d21e249b485ffc2feff5d77
+DIST monopd-0.9.3.tar.bz2 110354 SHA256 81fb6b267360b25d607da7846226c0976ed1df174d21e249b485ffc2feff5d77 SHA512 5b6072cb23164125e4768e60cb7fe71c31d81a53b2cb91ae7853e3bfe917dc3724a3755b901508a5c9b7ec70c6dcfcba370c945867cc5b222643e3fc84a835df WHIRLPOOL 9143d0d8e2cbb9ae04a6cd47beeb348a92f7f50b02d69a9fd0adde2e4ee111442270416a91af0cb93aca294d3810e5e8a17d5d45a1098271cd2648f801cf32cc
+DIST monopd-0.9.7.tar.gz 180318 SHA256 34aa975c8ee410f661622f91a63c4199e68a333123218b3e48300be1bc7afc30 SHA512 55b2e3b6f16f20fc1928d79eaecbdceaf9b9a8c9fe44b2cf8a8489347c728a006df78043235504e3931bb71b90e7493375fb2b71285447ad4a11dd434aa3133f WHIRLPOOL 14c47c95b64fafe07dc37ea61579ad42cf09c535f35b8f22d7dbdfa1dd04c529173e22c99287d2c748266ab00cdd82e28340d945924681849a1209911d6fcd16
--- a/games-server/monopd/files/monopd.in
+++ b/games-server/monopd/files/monopd.in
@ -0,0 +1,20 @@
+#!/sbin/runscript
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-server/monopd/files/monopd.in,v 1.1 2014/12/16 23:22:35 mr_bones_ Exp $
+
+depend() {
+    use net
+}
+
+start() {
+    ebegin "Starting monopd server"
+    start-stop-daemon --start -q -b --exec GENTOO_DIR/monopd
+    eend $?
+}
+
+stop() {
+    ebegin "Stopping monopd server"
+    start-stop-daemon --stop -q --exec GENTOO_DIR/monopd
+    eend $?
+}
--- a/games-server/monopd/monopd-0.9.7.ebuild
+++ b/games-server/monopd/monopd-0.9.7.ebuild
@ -0,0 +1,39 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-server/monopd/monopd-0.9.7.ebuild,v 1.1 2014/12/16 23:22:35 mr_bones_ Exp $
+
+EAPI=5
+inherit autotools eutils systemd games
+
+DESCRIPTION="server for atlantik games"
+HOMEPAGE="http://gtkatlantic.gradator.net/"
+SRC_URI="http://download.tuxfamily.org/gtkatlantic/monopd/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="systemd"
+
+RDEPEND="systemd? ( sys-apps/systemd )"
+DEPEND="${RDEPEND}
+	>=sys-libs/libmath++-0.0.3"
+
+src_prepare() {
+	sed "s:GENTOO_DIR:\"${GAMES_BINDIR}\":" \
+		"${FILESDIR}"/monopd.in > "${T}"/monopd || die
+	sed -i \
+		-e '/C_SUBST(CXXFLAGS/s/CFLAGS/CXXFLAGS/' \
+		configure.ac || die
+	eautoreconf
+}
+
+src_configure() {
+	egamesconf $(use_with systemd systemd-daemon)
+}
+
+src_install() {
+	default
+	doinitd "${T}"/monopd
+	systemd_dounit doc/systemd/monopd.s*
+	prepgamesdirs
+}
--- a/games-util/xgame/Manifest
+++ b/games-util/xgame/Manifest
@ -1 +1 @@
-DIST xgame-1.7.1.tar.gz 4657 RMD160 d7604c2a8b0d75badf89679f45a366482f758009 SHA1 5f6d01d515ab3d677e42e55ef7802908ac99f8bf SHA256 d02024a3934bcce53d07ffb29d62c02156783af50da2e8336eea2f4748dd7f49
+DIST xgame-1.7.1.tar.gz 4657 SHA256 d02024a3934bcce53d07ffb29d62c02156783af50da2e8336eea2f4748dd7f49 SHA512 1efe88dcac3ce6290220f60d664b3afa0e76901b9708502d954a3edca2ee73b3686af7639213067b2164990313db7eee66a404b9184440891a9f44a294008738 WHIRLPOOL af60bf8657c65be806e9be575d25ba5abc850ba5f157769741103a44fe05f1bbc1c9d33a85d8da7b5d36aaf9e7fd368ebab66fe960bf276c1d76074ec9e0a230
--- a/games-util/xgame/xgame-1.7.1.ebuild
+++ b/games-util/xgame/xgame-1.7.1.ebuild
@ -1,7 +1,8 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-util/xgame/xgame-1.7.1.ebuild,v 1.7 2006/01/03 23:11:59 metalgod Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-util/xgame/xgame-1.7.1.ebuild,v 1.8 2014/12/16 23:48:21 mr_bones_ Exp $

+EAPI=5
 inherit games

 DESCRIPTION="Run games in a separate X session"
@ -13,10 +14,11 @@ SLOT="0"
 KEYWORDS="~amd64 ppc x86"
 IUSE=""

+DEPEND=
 RDEPEND="dev-lang/perl"

 src_install() {
-	dogamesbin xgame || die "dogamesbin failed"
+	dogamesbin xgame
 	dodoc README
 	prepgamesdirs
 }
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@ -2,10 +2,5 @@ DIST ffmpeg-0.10.15.tar.bz2 5785998 SHA256 8b6dbf73c192d2217e6ded8e0dd560c678f36
 DIST ffmpeg-1.0.10.tar.bz2 6443581 SHA256 1dbde434c3b5c573d3b2ffc1babe3814f781c10c4bc66193a4132a44c9715176 SHA512 0fcc0541db6cdbf044dbb000a214194b0bfc67f4ac3e5c6efb2207c84bb11f6c6c3cf245ea67e1912256d1e1a98cf336a6f548d154393c36e266d92093006ff7 WHIRLPOOL 50c75a41747394aa2629cdfc6bd631e0207194c87ecdda120032f42e0d04327443fb13ea2b00ed52212da30992b01318846da0a0a594bac7d5757bccb525f32c
 DIST ffmpeg-1.2.10.tar.bz2 5972429 SHA256 d2c2538c40bb8d5e4af3403986f8d5158b5fcafdacebec57971919554aee8d0b SHA512 83262301c53cfe8f3d532f036a134edc4a39741951b4412de9d5b41d711e315658b505a23d2cb515b81ebcd7b877bb6dd2280c7141b19a6932ec18aed2175202 WHIRLPOOL f35308034e6c531f648923535072245f8469ca38076b427fb3d85daf7ea2b245aee872476371ae707e7ef0a431c09b2d0e8e02e275cb357d89b3dc4785f544ed
 DIST ffmpeg-1.2.6.tar.bz2 5970714 SHA256 29d454de3458cf327df246cc2a2ef0fa09cb88af7880f733525de12bde70999c SHA512 bc3aa640549e7f17f3a24a7d866a89ab23e9920c2d655a1a03bb4b85b8bdc33500bce3ba6fb570376453c158291a6f4bd2953f258d5a3f989cbdcb30e9a25ee4 WHIRLPOOL 6959a0e72b98dfb56381010f06f98d387a6389037d214f8d600d868d41baddd73417b5df7b00c8b160f6a59778c20c27708d2cc115dde76d6c94dcfbf307b51e
-DIST ffmpeg-1.2.9.tar.bz2 5973148 SHA256 5cdd912e13c8fe302937db811f63616193a046538bace1389a4989d423b59a0b SHA512 83e06514a4c27a0a5850da9af42b403ccadfefcf734b7492b563b6040c9176d4635536173c45458335b1e694bb427389054dd48e1f7a428824e8a5eb54eece0b WHIRLPOOL 8f04005d43a654d38477fca7f9d7abb42e4c0b83d86d8051495946d5ede02c3d3ef3f9c7fdf815843e5f1414e2619ccbd4faaf3f64b3622842a5997d6a41f3a0
-DIST ffmpeg-2.2.10.tar.bz2 7033420 SHA256 157b405f5c1077175326e6e5ae2e10e04a940a6110e744adc9add372651ca891 SHA512 6118b055c2fb9ce24ccfc3c76e62d16e309c35379d31965cd427de204bd31769d34beb2cd1dec7d704c8b25c7a3850ae253f1ed9bb34fb58a58505747b1e8feb WHIRLPOOL ba89e55d17704246225b0f276926e265889912ad80b309e499148dc041d623e63f8d26e347a798946b2e5cb36e54d9196916363c84e28df8ad590af6e1330c7b
 DIST ffmpeg-2.2.11.tar.bz2 7033561 SHA256 5938c460977ec3c09cacd9b98f78787948d6086eb30a65b43e09c2b8fb89541b SHA512 160fdf769922c05bf10e708fdf88777a14087cf771a03d2eb7d74b2bffe43b7a6fdbd9d7b6e5dd4676f107ca80b0bb9ab92efa8a131a35212c0d7ecb30e183e3 WHIRLPOOL 65a170a97351e6ee5fcc57da71d00d1645e03b52f2a5a99e5fafbe5089e50fc4495b02d99705205f8c6e197390b9ca8cfbc6d702412b447edbe204076fde43ee
-DIST ffmpeg-2.4.3.tar.bz2 7369986 SHA256 ca5c3e3c0e4f9e43b9dceafceb866acb1ea575cb9f2d94e0d959303e4fc4e602 SHA512 4e954bfdd683a4aec9773cc8404114ce7989ea311bce5b244a8478a7cbc59dafac622962ed80203ba5b4dff3721fb459d7cedb7c74c6c6093cf9d998e32e4540 WHIRLPOOL 41233ccfa22d09cbdfc53bfeba54acf4c2363e2e6de9ff0b034698f8e1ace1ffeabc6f8d579e00ec39fdd4fd2f68aec2f1f1f6773f2f91efb74ee39f8d22f59a
-DIST ffmpeg-2.4.4.tar.bz2 7369780 SHA256 9ad041c0201fb8b2605c5c5c0259c373c793c32cfc96f7315fca67e900494afc SHA512 18e4f020339e6c01388e663c5e66537de02df5fc935677481b14f9017810fa3734a3c5e0b0bf324ac4282212f391cb82b4c7d14dbfe9c9bb93ceb7d337fa7f11 WHIRLPOOL 69ededdb43e4adc65587c7a0c958d5d4a03e5599c4d16c1ff864b130962c1a94112f37d31e2fccd64db81213cc7a456d8484473c565f54249704f4acdb7ad9e6
 DIST ffmpeg-2.5.1.tar.bz2 7672133 SHA256 03cf50b2f9109548e466f144c960b37031ffc1b9fab96382b4b26b7607c7ef52 SHA512 09f77f501d67b3bda325c25dce8bd4a76b2a7acd54d1bee8e2e37a26f8d8fa46b6843bd77ec33b2ab5d50e573da98695e50c9082bd91c2220a9d6de37fa258b5 WHIRLPOOL 24399ed0a44429d585377d458f7833698751311bcbb7bd7f98197a2661e817d4fe9b37d87f602670fbbb108d51e94f43a880ea85519750f18aaf4957749f7dd0
-DIST ffmpeg-2.5.tar.bz2 7673841 SHA256 148cfd694b60245f9116f5932f3f60bb6dba47bcfef395cdda7a7d8ed48d57ac SHA512 4b1a1896b5b56fb675d774ac86f118d7b0c3eabe46baee9e45913af0330553feb3241bec98d6be55a6b667961a2ad84f3c3b1c8547b7365e8450454a48cc4e88 WHIRLPOOL 2403f73308f28e48c6318f09d2afe7dcc0c7ff2d7f93ac73701c5078234ab96d3a98907bf645d445d4454ad8ed308ea713d961c4fc351b63a9855cb5ba1f7d3e
--- a/media-video/ffmpeg/ffmpeg-1.2.9.ebuild
+++ b/media-video/ffmpeg/ffmpeg-1.2.9.ebuild
@ -1,342 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-1.2.9.ebuild,v 1.1 2014/10/08 08:04:11 aballier Exp $
-
-EAPI="4"
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-2"
-	EGIT_REPO_URI="git://source.ffmpeg.org/ffmpeg.git"
-fi
-
-inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs ${SCM}
-
-DESCRIPTION="Complete solution to record, convert and stream audio and video. Includes libavcodec"
-HOMEPAGE="http://ffmpeg.org/"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
-elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot
-	SRC_URI="mirror://gentoo/${P}.tar.bz2"
-else # Release
-	SRC_URI="http://ffmpeg.org/releases/${P/_/-}.tar.bz2"
-fi
-FFMPEG_REVISION="${PV#*_p}"
-
-LICENSE="GPL-2 amr? ( GPL-3 ) encode? ( aac? ( GPL-3 ) )"
-SLOT="0"
-if [ "${PV#9999}" = "${PV}" ] ; then
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
-fi
-IUSE="
-	aac aacplus alsa amr bindist bluray +bzip2 cdio celt
-	cpudetection debug doc +encode examples faac fdk flite fontconfig frei0r
-	gnutls gsm +hardcoded-tables +iconv iec61883 ieee1394 jack jpeg2k libass
-	libcaca libsoxr libv4l modplug mp3 +network openal openssl opus oss pic
-	pulseaudio rtmp schroedinger sdl speex static-libs test theora threads
-	truetype twolame v4l vaapi vdpau vorbis vpx X x264 xvid +zlib
-	"
-
-# String for CPU features in the useflag[:configure_option] form
-# if :configure_option isn't set, it will use 'useflag' as configure option
-CPU_FEATURES="3dnow:amd3dnow 3dnowext:amd3dnowext altivec avx mmx mmxext ssse3 vis neon"
-
-for i in ${CPU_FEATURES}; do
-	IUSE="${IUSE} ${i%:*}"
-done
-
-FFTOOLS="aviocat cws2fws ffescape ffeval fourcc2pixfmt graph2dot ismindex pktdumper qt-faststart trasher"
-
-for i in ${FFTOOLS}; do
-	IUSE="${IUSE} +fftools_$i"
-done
-
-RDEPEND="
-	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
-	amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] )
-	bluray? ( >=media-libs/libbluray-0.3.0-r1[${MULTILIB_USEDEP}] )
-	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
-	cdio? (
-		|| (
-			>=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}]
-			<dev-libs/libcdio-0.90[-minimal,${MULTILIB_USEDEP}]
-		)
-	)
-	celt? ( >=media-libs/celt-0.11.1-r1[${MULTILIB_USEDEP}] )
-	encode? (
-		aac? ( >=media-libs/vo-aacenc-0.1.3[${MULTILIB_USEDEP}] )
-		aacplus? ( >=media-libs/libaacplus-2.0.2-r1[${MULTILIB_USEDEP}] )
-		amr? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] )
-		faac? ( >=media-libs/faac-1.28-r3[${MULTILIB_USEDEP}] )
-		fdk? ( >=media-libs/fdk-aac-0.1.2[${MULTILIB_USEDEP}] )
-		mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] )
-		theora? (
-			>=media-libs/libtheora-1.1.1[${MULTILIB_USEDEP},encode]
-			>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
-		)
-		twolame? ( >=media-sound/twolame-0.3.13-r1[${MULTILIB_USEDEP}] )
-		x264? ( >=media-libs/x264-0.0.20130506[${MULTILIB_USEDEP}] )
-		xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] )
-	)
-	flite? ( >=app-accessibility/flite-1.4-r4[${MULTILIB_USEDEP}] )
-	fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
-	frei0r? ( media-plugins/frei0r-plugins )
-	gnutls? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}] )
-	gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] )
-	iconv? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] )
-	iec61883? (
-		>=media-libs/libiec61883-1.2.0-r1[${MULTILIB_USEDEP}]
-		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
-		>=sys-libs/libavc1394-0.5.4-r1[${MULTILIB_USEDEP}]
-	)
-	ieee1394? (
-		>=media-libs/libdc1394-2.2.1[${MULTILIB_USEDEP}]
-		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
-	)
-	jack? ( >=media-sound/jack-audio-connection-kit-0.121.3-r1[${MULTILIB_USEDEP}] )
-	jpeg2k? ( >=media-libs/openjpeg-1.5.0:0[${MULTILIB_USEDEP}] )
-	libass? ( >=media-libs/libass-0.10.2[${MULTILIB_USEDEP}] )
-	libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[${MULTILIB_USEDEP}] )
-	libsoxr? ( >=media-libs/soxr-0.1.0[${MULTILIB_USEDEP}] )
-	libv4l? ( >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}] )
-	modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] )
-	openal? ( >=media-libs/openal-1.15.1[${MULTILIB_USEDEP}] )
-	openssl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )
-	opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] )
-	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
-	rtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
-	sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,${MULTILIB_USEDEP}] )
-	schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}] )
-	speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
-	truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
-	vaapi? ( >=x11-libs/libva-1.2.1-r1[${MULTILIB_USEDEP}] )
-	vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] )
-	vorbis? (
-		>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
-		>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
-	)
-	vpx? ( >=media-libs/libvpx-1.2.0_pre20130625[${MULTILIB_USEDEP}] )
-	X? (
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
-	)
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-	!media-video/qt-faststart
-	!media-libs/libpostproc
-"
-
-DEPEND="${RDEPEND}
-	>=sys-devel/make-3.81
-	doc? ( app-text/texi2html )
-	fontconfig? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	gnutls? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	ieee1394? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	libv4l? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	mmx? ( dev-lang/yasm )
-	rtmp? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	schroedinger? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	test? ( net-misc/wget )
-	truetype? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	v4l? ( sys-kernel/linux-headers )
-"
-
-RDEPEND="${RDEPEND}
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3
-		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
-
-# faac is license-incompatible with ffmpeg
-REQUIRED_USE="bindist? ( encode? ( !faac !aacplus ) !openssl )
-	libv4l? ( v4l )
-	fftools_cws2fws? ( zlib )
-	test? ( encode )"
-
-S=${WORKDIR}/${P/_/-}
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/libavutil/avconfig.h
-)
-
-src_prepare() {
-	if [[ "${PV%_p*}" != "${PV}" ]] ; then # Snapshot
-		export revision=git-N-${FFMPEG_REVISION}
-	fi
-
-	epatch_user
-}
-
-multilib_src_configure() {
-	local myconf=( ${EXTRA_FFMPEG_CONF} )
-
-	# options to use as use_enable in the foo[:bar] form.
-	# This will feed configure with $(use_enable foo bar)
-	# or $(use_enable foo foo) if no :bar is set.
-	local ffuse=(
-		bzip2:bzlib cpudetection:runtime-cpudetect debug doc
-		gnutls hardcoded-tables iconv network openssl sdl:ffplay vaapi vdpau zlib
-	)
-	use openssl && myconf+=( --enable-nonfree )
-
-	# Encoders
-	if use encode
-	then
-		ffuse+=( aac:libvo-aacenc amr:libvo-amrwbenc mp3:libmp3lame fdk:libfdk-aac )
-		for i in aacplus faac theora twolame x264 xvid; do
-			ffuse+=( ${i}:lib${i} )
-		done
-
-		# Licensing.
-		if use aac || use amr ; then
-			myconf+=( --enable-version3 )
-		fi
-		if use aacplus || use faac || use fdk ; then
-			myconf+=( --enable-nonfree )
-		fi
-	else
-		myconf+=( --disable-encoders )
-	fi
-
-	# libavdevice options
-	ffuse+=( cdio:libcdio iec61883:libiec61883 ieee1394:libdc1394 libcaca openal )
-
-	# Indevs
-	use v4l || myconf+=( --disable-indev=v4l2 )
-	for i in alsa oss jack ; do
-		use ${i} || myconf+=( --disable-indev=${i} )
-	done
-	ffuse+=( libv4l:libv4l2 pulseaudio:libpulse X:x11grab )
-
-	# Outdevs
-	for i in alsa oss sdl ; do
-		use ${i} || myconf+=( --disable-outdev=${i} )
-	done
-
-	# libavfilter options
-	ffuse+=( flite:libflite frei0r fontconfig libass truetype:libfreetype )
-
-	# libswresample options
-	ffuse+=( libsoxr )
-
-	# Threads; we only support pthread for now but ffmpeg supports more
-	ffuse+=( threads:pthreads )
-
-	# Decoders
-	ffuse+=( amr:libopencore-amrwb amr:libopencore-amrnb jpeg2k:libopenjpeg )
-	use amr && myconf+=( --enable-version3 )
-	for i in bluray celt gsm modplug opus rtmp schroedinger speex vorbis vpx; do
-		ffuse+=( ${i}:lib${i} )
-	done
-
-	for i in "${ffuse[@]}" ; do
-		myconf+=( $(use_enable ${i%:*} ${i#*:}) )
-	done
-
-	# (temporarily) disable non-multilib deps
-	if ! multilib_is_native_abi; then
-		myconf+=( --disable-frei0r )
-	fi
-
-	# CPU features
-	for i in ${CPU_FEATURES}; do
-		use ${i%:*} || myconf+=( --disable-${i#*:} )
-	done
-	if use pic ; then
-		myconf+=( --enable-pic )
-		# disable asm code if PIC is required
-		# as the provided asm decidedly is not PIC for x86.
-		[[ ${ABI} == x86 ]] && myconf+=( --disable-asm )
-	fi
-	[[ ${ABI} == x32 ]] && myconf+=( --disable-asm ) #427004
-
-	# Try to get cpu type based on CFLAGS.
-	# Bug #172723
-	# We need to do this so that features of that CPU will be better used
-	# If they contain an unknown CPU it will not hurt since ffmpeg's configure
-	# will just ignore it.
-	for i in $(get-flag march) $(get-flag mcpu) $(get-flag mtune) ; do
-		[[ ${i} = native ]] && i="host" # bug #273421
-		myconf+=( --cpu=${i} )
-		break
-	done
-
-	# Mandatory configuration
-	myconf=(
-		--enable-gpl
-		--enable-postproc
-		--enable-avfilter
-		--enable-avresample
-		--disable-stripping
-		"${myconf[@]}"
-	)
-
-	# cross compile support
-	if tc-is-cross-compiler ; then
-		myconf+=( --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}- )
-		case ${CHOST} in
-			*freebsd*)
-				myconf+=( --target-os=freebsd )
-				;;
-			mingw32*)
-				myconf+=( --target-os=mingw32 )
-				;;
-			*linux*)
-				myconf+=( --target-os=linux )
-				;;
-		esac
-	fi
-
-	set -- "${S}/configure" \
-		--prefix="${EPREFIX}/usr" \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		--shlibdir="${EPREFIX}/usr/$(get_libdir)" \
-		--mandir="${EPREFIX}/usr/share/man" \
-		--enable-shared \
-		--cc="$(tc-getCC)" \
-		--cxx="$(tc-getCXX)" \
-		--ar="$(tc-getAR)" \
-		--optflags="${CFLAGS}" \
-		--extra-cflags="${CFLAGS}" \
-		--extra-cxxflags="${CXXFLAGS}" \
-		$(use_enable static-libs static) \
-		"${myconf[@]}"
-	echo "${@}"
-	"${@}" || die
-}
-
-multilib_src_compile() {
-	emake V=1
-
-	if multilib_is_native_abi; then
-		for i in ${FFTOOLS} ; do
-			if use fftools_${i} ; then
-				emake V=1 tools/${i}
-			fi
-		done
-	fi
-}
-
-multilib_src_install() {
-	emake V=1 DESTDIR="${D}" install install-man
-
-	if multilib_is_native_abi; then
-		for i in ${FFTOOLS} ; do
-			if use fftools_${i} ; then
-				dobin tools/${i}
-			fi
-		done
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc Changelog README CREDITS doc/*.txt doc/APIchanges doc/RELEASE_NOTES
-	use doc && dohtml -r doc/*
-	if use examples ; then
-		dodoc -r doc/examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
-
-multilib_src_test() {
-	LD_LIBRARY_PATH="${BUILD_DIR}/libpostproc:${BUILD_DIR}/libswscale:${BUILD_DIR}/libswresample:${BUILD_DIR}/libavcodec:${BUILD_DIR}/libavdevice:${BUILD_DIR}/libavfilter:${BUILD_DIR}/libavformat:${BUILD_DIR}/libavutil:${BUILD_DIR}/libavresample" \
-		emake V=1 fate
-}
--- a/media-video/ffmpeg/ffmpeg-2.2.10.ebuild
+++ b/media-video/ffmpeg/ffmpeg-2.2.10.ebuild
@ -1,378 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-2.2.10.ebuild,v 1.3 2014/11/04 09:48:43 aballier Exp $
-
-EAPI="5"
-
-# Subslot: libavutil major.libavcodec major.libavformat major
-# Since FFmpeg ships several libraries, subslot is kind of limited here.
-# Most consumers will use those three libraries, if a "less used" library
-# changes its soname, consumers will have to be rebuilt the old way
-# (preserve-libs).
-# If, for example, a package does not link to libavformat and only libavformat
-# changes its ABI then this package will be rebuilt needlessly. Hence, such a
-# package is free _not_ to := depend on FFmpeg but I would strongly encourage
-# doing so since such a case is unlikely.
-FFMPEG_SUBSLOT=52.55.55
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-2"
-	EGIT_REPO_URI="git://source.ffmpeg.org/ffmpeg.git"
-fi
-
-inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs ${SCM}
-
-DESCRIPTION="Complete solution to record, convert and stream audio and video. Includes libavcodec"
-HOMEPAGE="http://ffmpeg.org/"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
-elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot
-	SRC_URI="mirror://gentoo/${P}.tar.bz2"
-else # Release
-	SRC_URI="http://ffmpeg.org/releases/${P/_/-}.tar.bz2"
-fi
-FFMPEG_REVISION="${PV#*_p}"
-
-LICENSE="GPL-2 amr? ( GPL-3 ) encode? ( aac? ( GPL-3 ) )"
-SLOT="0/${FFMPEG_SUBSLOT}"
-if [ "${PV#9999}" = "${PV}" ] ; then
-	KEYWORDS="~amd64 ~arm ~hppa ~mips ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
-fi
-IUSE="
-	aac aacplus alsa amr amrenc bindist bluray +bzip2 cdio celt
-	cpudetection debug doc +encode examples faac fdk flite fontconfig frei0r
-	gme	gnutls gsm +hardcoded-tables +iconv iec61883 ieee1394 jack jpeg2k
-	ladspa libass libcaca libsoxr libv4l modplug mp3 +network openal opengl
-	openssl opus oss pic pulseaudio quvi rtmp schroedinger sdl speex ssh
-	static-libs test theora threads truetype twolame v4l vaapi vdpau vorbis vpx
-	wavpack webp X x264 x265 xvid +zlib zvbi
-	"
-
-ARM_CPU_FEATURES="armv5te armv6 armv6t2 neon armvfp:vfp"
-MIPS_CPU_FEATURES="mips32r2 mipsdspr1 mipsdspr2 mipsfpu"
-PPC_CPU_FEATURES="altivec"
-X86_CPU_FEATURES="3dnow:amd3dnow 3dnowext:amd3dnowext avx avx2 fma3 fma4 mmx mmxext sse sse2 sse3 ssse3 sse4 sse4_2:sse42"
-
-# String for CPU features in the useflag[:configure_option] form
-# if :configure_option isn't set, it will use 'useflag' as configure option
-CPU_FEATURES="
-	${ARM_CPU_FEATURES}
-	${MIPS_CPU_FEATURES}
-	${PPC_CPU_FEATURES}
-	${X86_CPU_FEATURES}
-"
-
-for i in ${CPU_FEATURES}; do
-	IUSE="${IUSE} ${i%:*}"
-done
-
-FFTOOLS="aviocat cws2fws ffescape ffeval ffhash fourcc2pixfmt graph2dot ismindex pktdumper qt-faststart trasher"
-
-for i in ${FFTOOLS}; do
-	IUSE="${IUSE} +fftools_$i"
-done
-
-RDEPEND="
-	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
-	amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] )
-	bluray? ( >=media-libs/libbluray-0.3.0-r1[${MULTILIB_USEDEP}] )
-	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
-	cdio? (
-		|| (
-			>=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}]
-			<dev-libs/libcdio-0.90[-minimal,${MULTILIB_USEDEP}]
-		)
-	)
-	celt? ( >=media-libs/celt-0.11.1-r1[${MULTILIB_USEDEP}] )
-	encode? (
-		aac? ( >=media-libs/vo-aacenc-0.1.3[${MULTILIB_USEDEP}] )
-		aacplus? ( >=media-libs/libaacplus-2.0.2-r1[${MULTILIB_USEDEP}] )
-		amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] )
-		faac? ( >=media-libs/faac-1.28-r3[${MULTILIB_USEDEP}] )
-		mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] )
-		theora? (
-			>=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}]
-			>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
-		)
-		twolame? ( >=media-sound/twolame-0.3.13-r1[${MULTILIB_USEDEP}] )
-		wavpack? ( >=media-sound/wavpack-4.60.1-r1[${MULTILIB_USEDEP}] )
-		webp? ( >=media-libs/libwebp-0.3.0[${MULTILIB_USEDEP}] )
-		x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] )
-		x265? ( >=media-libs/x265-0.8:=[${MULTILIB_USEDEP}] )
-		xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] )
-	)
-	fdk? ( >=media-libs/fdk-aac-0.1.3[${MULTILIB_USEDEP}] )
-	flite? ( >=app-accessibility/flite-1.4-r4[${MULTILIB_USEDEP}] )
-	fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
-	frei0r? ( media-plugins/frei0r-plugins )
-	gme? ( >=media-libs/game-music-emu-0.6.0[${MULTILIB_USEDEP}] )
-	gnutls? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}] )
-	gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] )
-	iconv? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] )
-	iec61883? (
-		>=media-libs/libiec61883-1.2.0-r1[${MULTILIB_USEDEP}]
-		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
-		>=sys-libs/libavc1394-0.5.4-r1[${MULTILIB_USEDEP}]
-	)
-	ieee1394? (
-		>=media-libs/libdc1394-2.2.1[${MULTILIB_USEDEP}]
-		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
-	)
-	jack? ( >=media-sound/jack-audio-connection-kit-0.121.3-r1[${MULTILIB_USEDEP}] )
-	jpeg2k? ( >=media-libs/openjpeg-1.5.0:0[${MULTILIB_USEDEP}] )
-	libass? ( >=media-libs/libass-0.10.2[${MULTILIB_USEDEP}] )
-	libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[${MULTILIB_USEDEP}] )
-	libsoxr? ( >=media-libs/soxr-0.1.0[${MULTILIB_USEDEP}] )
-	libv4l? ( >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}] )
-	modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] )
-	openal? ( >=media-libs/openal-1.15.1[${MULTILIB_USEDEP}] )
-	opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
-	openssl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )
-	opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] )
-	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
-	quvi? ( media-libs/libquvi:0.4 )
-	rtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
-	sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,${MULTILIB_USEDEP}] )
-	schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}] )
-	speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
-	ssh? ( >=net-libs/libssh-0.5.5[${MULTILIB_USEDEP}] )
-	truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
-	vaapi? ( >=x11-libs/libva-1.2.1-r1[${MULTILIB_USEDEP}] )
-	vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] )
-	vorbis? (
-		>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
-		>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
-	)
-	vpx? ( >=media-libs/libvpx-1.2.0_pre20130625[${MULTILIB_USEDEP}] )
-	X? (
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
-		>=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}]
-	)
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-	zvbi? ( >=media-libs/zvbi-0.2.35[${MULTILIB_USEDEP}] )
-	!media-video/qt-faststart
-	!media-libs/libpostproc
-"
-
-DEPEND="${RDEPEND}
-	>=sys-devel/make-3.81
-	doc? ( app-text/texi2html )
-	fontconfig? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	gnutls? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	ieee1394? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	ladspa? ( >=media-libs/ladspa-sdk-1.13-r2[${MULTILIB_USEDEP}] )
-	libv4l? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	mmx? ( >=dev-lang/yasm-1.2 )
-	rtmp? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	schroedinger? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	test? ( net-misc/wget sys-devel/bc )
-	truetype? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	v4l? ( sys-kernel/linux-headers )
-"
-
-RDEPEND="${RDEPEND}
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3
-		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
-
-# faac is license-incompatible with ffmpeg
-REQUIRED_USE="bindist? ( encode? ( !faac !aacplus ) !openssl )
-	libv4l? ( v4l )
-	fftools_cws2fws? ( zlib )
-	test? ( encode )"
-
-S=${WORKDIR}/${P/_/-}
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/libavutil/avconfig.h
-)
-
-src_prepare() {
-	if [[ "${PV%_p*}" != "${PV}" ]] ; then # Snapshot
-		export revision=git-N-${FFMPEG_REVISION}
-	fi
-	epatch "${FILESDIR}/ladspadl.patch"
-	epatch_user
-}
-
-multilib_src_configure() {
-	local myconf=( ${EXTRA_FFMPEG_CONF} )
-
-	# options to use as use_enable in the foo[:bar] form.
-	# This will feed configure with $(use_enable foo bar)
-	# or $(use_enable foo foo) if no :bar is set.
-	local ffuse=(
-		bzip2:bzlib cpudetection:runtime-cpudetect debug doc
-		gnutls hardcoded-tables iconv network openssl sdl:ffplay vaapi
-		vdpau zlib
-	)
-	use openssl && myconf+=( --enable-nonfree )
-
-	# Encoders
-	if use encode
-	then
-		ffuse+=( aac:libvo-aacenc amrenc:libvo-amrwbenc mp3:libmp3lame )
-		for i in aacplus faac theora twolame wavpack webp x264 x265 xvid; do
-			ffuse+=( ${i}:lib${i} )
-		done
-
-		# Licensing.
-		if use aac || use amrenc ; then
-			myconf+=( --enable-version3 )
-		fi
-		if use aacplus || use faac ; then
-			myconf+=( --enable-nonfree )
-		fi
-	else
-		myconf+=( --disable-encoders )
-	fi
-
-	# libavdevice options
-	ffuse+=( cdio:libcdio iec61883:libiec61883 ieee1394:libdc1394 libcaca openal opengl )
-
-	# Indevs
-	use v4l || myconf+=( --disable-indev=v4l2 --disable-outdev=v4l2 )
-	for i in alsa oss jack ; do
-		use ${i} || myconf+=( --disable-indev=${i} )
-	done
-	ffuse+=( libv4l:libv4l2 pulseaudio:libpulse X:x11grab )
-
-	# Outdevs
-	for i in alsa oss sdl ; do
-		use ${i} || myconf+=( --disable-outdev=${i} )
-	done
-
-	# libavfilter options
-	ffuse+=( flite:libflite frei0r fontconfig ladspa libass truetype:libfreetype )
-
-	# libswresample options
-	ffuse+=( libsoxr )
-
-	# Threads; we only support pthread for now but ffmpeg supports more
-	ffuse+=( threads:pthreads )
-
-	# Decoders
-	ffuse+=( amr:libopencore-amrwb amr:libopencore-amrnb fdk:libfdk-aac jpeg2k:libopenjpeg )
-	use amr && myconf+=( --enable-version3 )
-	for i in bluray celt gme gsm modplug opus quvi rtmp ssh schroedinger speex vorbis vpx zvbi; do
-		ffuse+=( ${i}:lib${i} )
-	done
-	use fdk && myconf+=( --enable-nonfree )
-
-	for i in "${ffuse[@]}" ; do
-		myconf+=( $(use_enable ${i%:*} ${i#*:}) )
-	done
-
-	# (temporarily) disable non-multilib deps
-	if ! multilib_is_native_abi; then
-		for i in frei0r libquvi; do
-			myconf+=( --disable-${i} )
-		done
-	fi
-
-	# CPU features
-	for i in ${CPU_FEATURES}; do
-		use ${i%:*} || myconf+=( --disable-${i#*:} )
-	done
-	if use pic ; then
-		myconf+=( --enable-pic )
-		# disable asm code if PIC is required
-		# as the provided asm decidedly is not PIC for x86.
-		[[ ${ABI} == x86 ]] && myconf+=( --disable-asm )
-	fi
-	[[ ${ABI} == x32 ]] && myconf+=( --disable-asm ) #427004
-
-	# Try to get cpu type based on CFLAGS.
-	# Bug #172723
-	# We need to do this so that features of that CPU will be better used
-	# If they contain an unknown CPU it will not hurt since ffmpeg's configure
-	# will just ignore it.
-	for i in $(get-flag mcpu) $(get-flag mtune) $(get-flag march) ; do
-		[[ ${i} = native ]] && i="host" # bug #273421
-		myconf+=( --cpu=${i} )
-		break
-	done
-
-	# Mandatory configuration
-	myconf=(
-		--enable-gpl
-		--enable-postproc
-		--enable-avfilter
-		--enable-avresample
-		--disable-stripping
-		"${myconf[@]}"
-	)
-
-	# cross compile support
-	if tc-is-cross-compiler ; then
-		myconf+=( --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}- )
-		case ${CHOST} in
-			*freebsd*)
-				myconf+=( --target-os=freebsd )
-				;;
-			mingw32*)
-				myconf+=( --target-os=mingw32 )
-				;;
-			*linux*)
-				myconf+=( --target-os=linux )
-				;;
-		esac
-	fi
-
-	set -- "${S}/configure" \
-		--prefix="${EPREFIX}/usr" \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		--shlibdir="${EPREFIX}/usr/$(get_libdir)" \
-		--mandir="${EPREFIX}/usr/share/man" \
-		--enable-shared \
-		--cc="$(tc-getCC)" \
-		--cxx="$(tc-getCXX)" \
-		--ar="$(tc-getAR)" \
-		--optflags="${CFLAGS}" \
-		--extra-cflags="${CFLAGS}" \
-		--extra-cxxflags="${CXXFLAGS}" \
-		$(use_enable static-libs static) \
-		"${myconf[@]}"
-	echo "${@}"
-	"${@}" || die
-}
-
-multilib_src_compile() {
-	emake V=1
-
-	if multilib_is_native_abi; then
-		for i in ${FFTOOLS} ; do
-			if use fftools_${i} ; then
-				emake V=1 tools/${i}
-			fi
-		done
-	fi
-}
-
-multilib_src_install() {
-	emake V=1 DESTDIR="${D}" install install-man
-
-	if multilib_is_native_abi; then
-		for i in ${FFTOOLS} ; do
-			if use fftools_${i} ; then
-				dobin tools/${i}
-			fi
-		done
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc Changelog README CREDITS doc/*.txt doc/APIchanges doc/RELEASE_NOTES
-	use doc && dohtml -r doc/*
-	if use examples ; then
-		dodoc -r doc/examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
-
-multilib_src_test() {
-	LD_LIBRARY_PATH="${BUILD_DIR}/libpostproc:${BUILD_DIR}/libswscale:${BUILD_DIR}/libswresample:${BUILD_DIR}/libavcodec:${BUILD_DIR}/libavdevice:${BUILD_DIR}/libavfilter:${BUILD_DIR}/libavformat:${BUILD_DIR}/libavutil:${BUILD_DIR}/libavresample" \
-		emake V=1 fate
-}
--- a/media-video/ffmpeg/ffmpeg-2.4.3.ebuild
+++ b/media-video/ffmpeg/ffmpeg-2.4.3.ebuild
@ -1,378 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-2.4.3.ebuild,v 1.3 2014/11/04 09:48:43 aballier Exp $
-
-EAPI="5"
-
-# Subslot: libavutil major.libavcodec major.libavformat major
-# Since FFmpeg ships several libraries, subslot is kind of limited here.
-# Most consumers will use those three libraries, if a "less used" library
-# changes its soname, consumers will have to be rebuilt the old way
-# (preserve-libs).
-# If, for example, a package does not link to libavformat and only libavformat
-# changes its ABI then this package will be rebuilt needlessly. Hence, such a
-# package is free _not_ to := depend on FFmpeg but I would strongly encourage
-# doing so since such a case is unlikely.
-FFMPEG_SUBSLOT=54.56.56
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-2"
-	EGIT_REPO_URI="git://source.ffmpeg.org/ffmpeg.git"
-fi
-
-inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs ${SCM}
-
-DESCRIPTION="Complete solution to record, convert and stream audio and video. Includes libavcodec"
-HOMEPAGE="http://ffmpeg.org/"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
-elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot
-	SRC_URI="mirror://gentoo/${P}.tar.bz2"
-else # Release
-	SRC_URI="http://ffmpeg.org/releases/${P/_/-}.tar.bz2"
-fi
-FFMPEG_REVISION="${PV#*_p}"
-
-LICENSE="GPL-2 amr? ( GPL-3 ) encode? ( aac? ( GPL-3 ) ) samba? ( GPL-3 )"
-SLOT="0/${FFMPEG_SUBSLOT}"
-if [ "${PV#9999}" = "${PV}" ] ; then
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
-fi
-IUSE="
-	aac aacplus alsa amr amrenc bindist bluray bs2b +bzip2 cdio celt
-	cpudetection debug doc +encode examples faac fdk flite fontconfig frei0r
-	fribidi gme	gnutls gsm +hardcoded-tables +iconv iec61883 ieee1394 jack
-	jpeg2k ladspa libass libcaca libsoxr libv4l lzma modplug mp3 +network
-	openal opengl openssl opus oss pic pulseaudio quvi rtmp samba schroedinger
-	sdl speex ssh static-libs test theora threads truetype twolame v4l vaapi
-	vdpau vorbis vpx wavpack webp X x264 x265 xvid +zlib zvbi
-	"
-
-ARM_CPU_FEATURES="armv5te armv6 armv6t2 neon armvfp:vfp"
-MIPS_CPU_FEATURES="mips32r2 mipsdspr1 mipsdspr2 mipsfpu"
-PPC_CPU_FEATURES="altivec"
-X86_CPU_FEATURES="3dnow:amd3dnow 3dnowext:amd3dnowext avx avx2 fma3 fma4 mmx mmxext sse sse2 sse3 ssse3 sse4 sse4_2:sse42 xop"
-
-# String for CPU features in the useflag[:configure_option] form
-# if :configure_option isn't set, it will use 'useflag' as configure option
-CPU_FEATURES="
-	${ARM_CPU_FEATURES}
-	${MIPS_CPU_FEATURES}
-	${PPC_CPU_FEATURES}
-	${X86_CPU_FEATURES}
-"
-
-for i in ${CPU_FEATURES}; do
-	IUSE="${IUSE} ${i%:*}"
-done
-
-FFTOOLS="aviocat cws2fws ffescape ffeval ffhash fourcc2pixfmt graph2dot ismindex pktdumper qt-faststart trasher"
-
-for i in ${FFTOOLS}; do
-	IUSE="${IUSE} +fftools_$i"
-done
-
-RDEPEND="
-	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
-	amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] )
-	bluray? ( >=media-libs/libbluray-0.3.0-r1[${MULTILIB_USEDEP}] )
-	bs2b? ( >=media-libs/libbs2b-3.1.0-r1[${MULTILIB_USEDEP}] )
-	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
-	cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] )
-	celt? ( >=media-libs/celt-0.11.1-r1[${MULTILIB_USEDEP}] )
-	encode? (
-		aac? ( >=media-libs/vo-aacenc-0.1.3[${MULTILIB_USEDEP}] )
-		aacplus? ( >=media-libs/libaacplus-2.0.2-r1[${MULTILIB_USEDEP}] )
-		amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] )
-		faac? ( >=media-libs/faac-1.28-r3[${MULTILIB_USEDEP}] )
-		mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] )
-		theora? (
-			>=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}]
-			>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
-		)
-		twolame? ( >=media-sound/twolame-0.3.13-r1[${MULTILIB_USEDEP}] )
-		wavpack? ( >=media-sound/wavpack-4.60.1-r1[${MULTILIB_USEDEP}] )
-		webp? ( >=media-libs/libwebp-0.3.0[${MULTILIB_USEDEP}] )
-		x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] )
-		x265? ( >=media-libs/x265-1.2:=[${MULTILIB_USEDEP}] )
-		xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] )
-	)
-	fdk? ( >=media-libs/fdk-aac-0.1.3[${MULTILIB_USEDEP}] )
-	flite? ( >=app-accessibility/flite-1.4-r4[${MULTILIB_USEDEP}] )
-	fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
-	frei0r? ( media-plugins/frei0r-plugins )
-	fribidi? ( >=dev-libs/fribidi-0.19.6[${MULTILIB_USEDEP}] )
-	gme? ( >=media-libs/game-music-emu-0.6.0[${MULTILIB_USEDEP}] )
-	gnutls? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}] )
-	gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] )
-	iconv? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] )
-	iec61883? (
-		>=media-libs/libiec61883-1.2.0-r1[${MULTILIB_USEDEP}]
-		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
-		>=sys-libs/libavc1394-0.5.4-r1[${MULTILIB_USEDEP}]
-	)
-	ieee1394? (
-		>=media-libs/libdc1394-2.2.1[${MULTILIB_USEDEP}]
-		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
-	)
-	jack? ( >=media-sound/jack-audio-connection-kit-0.121.3-r1[${MULTILIB_USEDEP}] )
-	jpeg2k? ( >=media-libs/openjpeg-1.5.0:0[${MULTILIB_USEDEP}] )
-	libass? ( >=media-libs/libass-0.10.2[${MULTILIB_USEDEP}] )
-	libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[${MULTILIB_USEDEP}] )
-	libsoxr? ( >=media-libs/soxr-0.1.0[${MULTILIB_USEDEP}] )
-	libv4l? ( >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}] )
-	lzma? ( >=app-arch/xz-utils-5.0.5-r1[${MULTILIB_USEDEP}] )
-	modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] )
-	openal? ( >=media-libs/openal-1.15.1[${MULTILIB_USEDEP}] )
-	opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
-	openssl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )
-	opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] )
-	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
-	quvi? ( media-libs/libquvi:0.4[${MULTILIB_USEDEP}] )
-	rtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
-	samba? ( >=net-fs/samba-3.6.23-r1[${MULTILIB_USEDEP}] )
-	schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}] )
-	sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,${MULTILIB_USEDEP}] )
-	speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
-	ssh? ( >=net-libs/libssh-0.5.5[${MULTILIB_USEDEP}] )
-	truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
-	vaapi? ( >=x11-libs/libva-1.2.1-r1[${MULTILIB_USEDEP}] )
-	vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] )
-	vorbis? (
-		>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
-		>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
-	)
-	vpx? ( >=media-libs/libvpx-1.2.0_pre20130625[${MULTILIB_USEDEP}] )
-	X? (
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
-		>=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}]
-	)
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-	zvbi? ( >=media-libs/zvbi-0.2.35[${MULTILIB_USEDEP}] )
-	!media-video/qt-faststart
-	!media-libs/libpostproc
-"
-
-DEPEND="${RDEPEND}
-	>=sys-devel/make-3.81
-	doc? ( app-text/texi2html )
-	fontconfig? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	gnutls? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	ieee1394? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	ladspa? ( >=media-libs/ladspa-sdk-1.13-r2[${MULTILIB_USEDEP}] )
-	libv4l? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	mmx? ( >=dev-lang/yasm-1.2 )
-	rtmp? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	schroedinger? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	test? ( net-misc/wget sys-devel/bc )
-	truetype? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	v4l? ( sys-kernel/linux-headers )
-"
-
-RDEPEND="${RDEPEND}
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3
-		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
-
-# faac is license-incompatible with ffmpeg
-REQUIRED_USE="bindist? ( encode? ( !faac !aacplus ) !openssl )
-	libv4l? ( v4l )
-	fftools_cws2fws? ( zlib )
-	test? ( encode )"
-
-S=${WORKDIR}/${P/_/-}
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/libavutil/avconfig.h
-)
-
-src_prepare() {
-	if [[ "${PV%_p*}" != "${PV}" ]] ; then # Snapshot
-		export revision=git-N-${FFMPEG_REVISION}
-	fi
-	epatch_user
-}
-
-multilib_src_configure() {
-	local myconf=( ${EXTRA_FFMPEG_CONF} )
-
-	# options to use as use_enable in the foo[:bar] form.
-	# This will feed configure with $(use_enable foo bar)
-	# or $(use_enable foo foo) if no :bar is set.
-	local ffuse=(
-		bzip2:bzlib cpudetection:runtime-cpudetect debug doc
-		gnutls hardcoded-tables iconv lzma network openssl samba:libsmbclient
-		sdl:ffplay vaapi vdpau X:xlib zlib
-	)
-	use openssl && myconf+=( --enable-nonfree )
-	use samba && myconf+=( --enable-version3 )
-
-	# Encoders
-	if use encode
-	then
-		ffuse+=( aac:libvo-aacenc amrenc:libvo-amrwbenc mp3:libmp3lame )
-		for i in aacplus faac theora twolame wavpack webp x264 x265 xvid; do
-			ffuse+=( ${i}:lib${i} )
-		done
-
-		# Licensing.
-		if use aac || use amrenc ; then
-			myconf+=( --enable-version3 )
-		fi
-		if use aacplus || use faac ; then
-			myconf+=( --enable-nonfree )
-		fi
-	else
-		myconf+=( --disable-encoders )
-	fi
-
-	# libavdevice options
-	ffuse+=( cdio:libcdio iec61883:libiec61883 ieee1394:libdc1394 libcaca openal opengl )
-
-	# Indevs
-	use v4l || myconf+=( --disable-indev=v4l2 --disable-outdev=v4l2 )
-	for i in alsa oss jack ; do
-		use ${i} || myconf+=( --disable-indev=${i} )
-	done
-	ffuse+=( libv4l:libv4l2 pulseaudio:libpulse X:x11grab )
-
-	# Outdevs
-	for i in alsa oss sdl ; do
-		use ${i} || myconf+=( --disable-outdev=${i} )
-	done
-
-	# libavfilter options
-	ffuse+=( bs2b:libbs2b flite:libflite frei0r fribidi:libfribidi fontconfig ladspa libass truetype:libfreetype )
-
-	# libswresample options
-	ffuse+=( libsoxr )
-
-	# Threads; we only support pthread for now but ffmpeg supports more
-	ffuse+=( threads:pthreads )
-
-	# Decoders
-	ffuse+=( amr:libopencore-amrwb amr:libopencore-amrnb fdk:libfdk-aac jpeg2k:libopenjpeg )
-	use amr && myconf+=( --enable-version3 )
-	for i in bluray celt gme gsm modplug opus quvi rtmp ssh schroedinger speex vorbis vpx zvbi; do
-		ffuse+=( ${i}:lib${i} )
-	done
-	use fdk && myconf+=( --enable-nonfree )
-
-	for i in "${ffuse[@]}" ; do
-		myconf+=( $(use_enable ${i%:*} ${i#*:}) )
-	done
-
-	# (temporarily) disable non-multilib deps
-	if ! multilib_is_native_abi; then
-		for i in frei0r ; do
-			myconf+=( --disable-${i} )
-		done
-	fi
-
-	# CPU features
-	for i in ${CPU_FEATURES}; do
-		use ${i%:*} || myconf+=( --disable-${i#*:} )
-	done
-	if use pic ; then
-		myconf+=( --enable-pic )
-		# disable asm code if PIC is required
-		# as the provided asm decidedly is not PIC for x86.
-		[[ ${ABI} == x86 ]] && myconf+=( --disable-asm )
-	fi
-	[[ ${ABI} == x32 ]] && myconf+=( --disable-asm ) #427004
-
-	# Try to get cpu type based on CFLAGS.
-	# Bug #172723
-	# We need to do this so that features of that CPU will be better used
-	# If they contain an unknown CPU it will not hurt since ffmpeg's configure
-	# will just ignore it.
-	for i in $(get-flag mcpu) $(get-flag mtune) $(get-flag march) ; do
-		[[ ${i} = native ]] && i="host" # bug #273421
-		myconf+=( --cpu=${i} )
-		break
-	done
-
-	# Mandatory configuration
-	myconf=(
-		--enable-gpl
-		--enable-postproc
-		--enable-avfilter
-		--enable-avresample
-		--disable-stripping
-		"${myconf[@]}"
-	)
-
-	# cross compile support
-	if tc-is-cross-compiler ; then
-		myconf+=( --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}- )
-		case ${CHOST} in
-			*freebsd*)
-				myconf+=( --target-os=freebsd )
-				;;
-			mingw32*)
-				myconf+=( --target-os=mingw32 )
-				;;
-			*linux*)
-				myconf+=( --target-os=linux )
-				;;
-		esac
-	fi
-
-	set -- "${S}/configure" \
-		--prefix="${EPREFIX}/usr" \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		--shlibdir="${EPREFIX}/usr/$(get_libdir)" \
-		--mandir="${EPREFIX}/usr/share/man" \
-		--enable-shared \
-		--cc="$(tc-getCC)" \
-		--cxx="$(tc-getCXX)" \
-		--ar="$(tc-getAR)" \
-		--optflags="${CFLAGS}" \
-		--extra-cflags="${CFLAGS}" \
-		--extra-cxxflags="${CXXFLAGS}" \
-		$(use_enable static-libs static) \
-		"${myconf[@]}"
-	echo "${@}"
-	"${@}" || die
-}
-
-multilib_src_compile() {
-	emake V=1
-
-	if multilib_is_native_abi; then
-		for i in ${FFTOOLS} ; do
-			if use fftools_${i} ; then
-				emake V=1 tools/${i}
-			fi
-		done
-	fi
-}
-
-multilib_src_install() {
-	emake V=1 DESTDIR="${D}" install install-man
-
-	if multilib_is_native_abi; then
-		for i in ${FFTOOLS} ; do
-			if use fftools_${i} ; then
-				dobin tools/${i}
-			fi
-		done
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc Changelog README.md CREDITS doc/*.txt doc/APIchanges
-	[ -f "RELEASE_NOTES" ] && dodoc "RELEASE_NOTES"
-	use doc && dohtml -r doc/*
-	if use examples ; then
-		dodoc -r doc/examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
-
-multilib_src_test() {
-	LD_LIBRARY_PATH="${BUILD_DIR}/libpostproc:${BUILD_DIR}/libswscale:${BUILD_DIR}/libswresample:${BUILD_DIR}/libavcodec:${BUILD_DIR}/libavdevice:${BUILD_DIR}/libavfilter:${BUILD_DIR}/libavformat:${BUILD_DIR}/libavutil:${BUILD_DIR}/libavresample" \
-		emake V=1 fate
-}
--- a/media-video/ffmpeg/ffmpeg-2.4.4.ebuild
+++ b/media-video/ffmpeg/ffmpeg-2.4.4.ebuild
@ -1,378 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-2.4.4.ebuild,v 1.1 2014/12/02 09:01:14 aballier Exp $
-
-EAPI="5"
-
-# Subslot: libavutil major.libavcodec major.libavformat major
-# Since FFmpeg ships several libraries, subslot is kind of limited here.
-# Most consumers will use those three libraries, if a "less used" library
-# changes its soname, consumers will have to be rebuilt the old way
-# (preserve-libs).
-# If, for example, a package does not link to libavformat and only libavformat
-# changes its ABI then this package will be rebuilt needlessly. Hence, such a
-# package is free _not_ to := depend on FFmpeg but I would strongly encourage
-# doing so since such a case is unlikely.
-FFMPEG_SUBSLOT=54.56.56
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-2"
-	EGIT_REPO_URI="git://source.ffmpeg.org/ffmpeg.git"
-fi
-
-inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs ${SCM}
-
-DESCRIPTION="Complete solution to record, convert and stream audio and video. Includes libavcodec"
-HOMEPAGE="http://ffmpeg.org/"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
-elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot
-	SRC_URI="mirror://gentoo/${P}.tar.bz2"
-else # Release
-	SRC_URI="http://ffmpeg.org/releases/${P/_/-}.tar.bz2"
-fi
-FFMPEG_REVISION="${PV#*_p}"
-
-LICENSE="GPL-2 amr? ( GPL-3 ) encode? ( aac? ( GPL-3 ) ) samba? ( GPL-3 )"
-SLOT="0/${FFMPEG_SUBSLOT}"
-if [ "${PV#9999}" = "${PV}" ] ; then
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
-fi
-IUSE="
-	aac aacplus alsa amr amrenc bindist bluray bs2b +bzip2 cdio celt
-	cpudetection debug doc +encode examples faac fdk flite fontconfig frei0r
-	fribidi gme	gnutls gsm +hardcoded-tables +iconv iec61883 ieee1394 jack
-	jpeg2k ladspa libass libcaca libsoxr libv4l lzma modplug mp3 +network
-	openal opengl openssl opus oss pic pulseaudio quvi rtmp samba schroedinger
-	sdl speex ssh static-libs test theora threads truetype twolame v4l vaapi
-	vdpau vorbis vpx wavpack webp X x264 x265 xvid +zlib zvbi
-	"
-
-ARM_CPU_FEATURES="armv5te armv6 armv6t2 neon armvfp:vfp"
-MIPS_CPU_FEATURES="mips32r2 mipsdspr1 mipsdspr2 mipsfpu"
-PPC_CPU_FEATURES="altivec"
-X86_CPU_FEATURES="3dnow:amd3dnow 3dnowext:amd3dnowext avx avx2 fma3 fma4 mmx mmxext sse sse2 sse3 ssse3 sse4 sse4_2:sse42 xop"
-
-# String for CPU features in the useflag[:configure_option] form
-# if :configure_option isn't set, it will use 'useflag' as configure option
-CPU_FEATURES="
-	${ARM_CPU_FEATURES}
-	${MIPS_CPU_FEATURES}
-	${PPC_CPU_FEATURES}
-	${X86_CPU_FEATURES}
-"
-
-for i in ${CPU_FEATURES}; do
-	IUSE="${IUSE} ${i%:*}"
-done
-
-FFTOOLS="aviocat cws2fws ffescape ffeval ffhash fourcc2pixfmt graph2dot ismindex pktdumper qt-faststart trasher"
-
-for i in ${FFTOOLS}; do
-	IUSE="${IUSE} +fftools_$i"
-done
-
-RDEPEND="
-	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
-	amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] )
-	bluray? ( >=media-libs/libbluray-0.3.0-r1[${MULTILIB_USEDEP}] )
-	bs2b? ( >=media-libs/libbs2b-3.1.0-r1[${MULTILIB_USEDEP}] )
-	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
-	cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] )
-	celt? ( >=media-libs/celt-0.11.1-r1[${MULTILIB_USEDEP}] )
-	encode? (
-		aac? ( >=media-libs/vo-aacenc-0.1.3[${MULTILIB_USEDEP}] )
-		aacplus? ( >=media-libs/libaacplus-2.0.2-r1[${MULTILIB_USEDEP}] )
-		amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] )
-		faac? ( >=media-libs/faac-1.28-r3[${MULTILIB_USEDEP}] )
-		mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] )
-		theora? (
-			>=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}]
-			>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
-		)
-		twolame? ( >=media-sound/twolame-0.3.13-r1[${MULTILIB_USEDEP}] )
-		wavpack? ( >=media-sound/wavpack-4.60.1-r1[${MULTILIB_USEDEP}] )
-		webp? ( >=media-libs/libwebp-0.3.0[${MULTILIB_USEDEP}] )
-		x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] )
-		x265? ( >=media-libs/x265-1.2:=[${MULTILIB_USEDEP}] )
-		xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] )
-	)
-	fdk? ( >=media-libs/fdk-aac-0.1.3[${MULTILIB_USEDEP}] )
-	flite? ( >=app-accessibility/flite-1.4-r4[${MULTILIB_USEDEP}] )
-	fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
-	frei0r? ( media-plugins/frei0r-plugins )
-	fribidi? ( >=dev-libs/fribidi-0.19.6[${MULTILIB_USEDEP}] )
-	gme? ( >=media-libs/game-music-emu-0.6.0[${MULTILIB_USEDEP}] )
-	gnutls? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}] )
-	gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] )
-	iconv? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] )
-	iec61883? (
-		>=media-libs/libiec61883-1.2.0-r1[${MULTILIB_USEDEP}]
-		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
-		>=sys-libs/libavc1394-0.5.4-r1[${MULTILIB_USEDEP}]
-	)
-	ieee1394? (
-		>=media-libs/libdc1394-2.2.1[${MULTILIB_USEDEP}]
-		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
-	)
-	jack? ( >=media-sound/jack-audio-connection-kit-0.121.3-r1[${MULTILIB_USEDEP}] )
-	jpeg2k? ( >=media-libs/openjpeg-1.5.0:0[${MULTILIB_USEDEP}] )
-	libass? ( >=media-libs/libass-0.10.2[${MULTILIB_USEDEP}] )
-	libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[${MULTILIB_USEDEP}] )
-	libsoxr? ( >=media-libs/soxr-0.1.0[${MULTILIB_USEDEP}] )
-	libv4l? ( >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}] )
-	lzma? ( >=app-arch/xz-utils-5.0.5-r1[${MULTILIB_USEDEP}] )
-	modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] )
-	openal? ( >=media-libs/openal-1.15.1[${MULTILIB_USEDEP}] )
-	opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
-	openssl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )
-	opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] )
-	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
-	quvi? ( media-libs/libquvi:0.4[${MULTILIB_USEDEP}] )
-	rtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
-	samba? ( >=net-fs/samba-3.6.23-r1[${MULTILIB_USEDEP}] )
-	schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}] )
-	sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,${MULTILIB_USEDEP}] )
-	speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
-	ssh? ( >=net-libs/libssh-0.5.5[${MULTILIB_USEDEP}] )
-	truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
-	vaapi? ( >=x11-libs/libva-1.2.1-r1[${MULTILIB_USEDEP}] )
-	vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] )
-	vorbis? (
-		>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
-		>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
-	)
-	vpx? ( >=media-libs/libvpx-1.2.0_pre20130625[${MULTILIB_USEDEP}] )
-	X? (
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
-		>=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}]
-	)
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-	zvbi? ( >=media-libs/zvbi-0.2.35[${MULTILIB_USEDEP}] )
-	!media-video/qt-faststart
-	!media-libs/libpostproc
-"
-
-DEPEND="${RDEPEND}
-	>=sys-devel/make-3.81
-	doc? ( app-text/texi2html )
-	fontconfig? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	gnutls? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	ieee1394? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	ladspa? ( >=media-libs/ladspa-sdk-1.13-r2[${MULTILIB_USEDEP}] )
-	libv4l? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	mmx? ( >=dev-lang/yasm-1.2 )
-	rtmp? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	schroedinger? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	test? ( net-misc/wget sys-devel/bc )
-	truetype? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	v4l? ( sys-kernel/linux-headers )
-"
-
-RDEPEND="${RDEPEND}
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3
-		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
-
-# faac is license-incompatible with ffmpeg
-REQUIRED_USE="bindist? ( encode? ( !faac !aacplus ) !openssl )
-	libv4l? ( v4l )
-	fftools_cws2fws? ( zlib )
-	test? ( encode )"
-
-S=${WORKDIR}/${P/_/-}
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/libavutil/avconfig.h
-)
-
-src_prepare() {
-	if [[ "${PV%_p*}" != "${PV}" ]] ; then # Snapshot
-		export revision=git-N-${FFMPEG_REVISION}
-	fi
-	epatch_user
-}
-
-multilib_src_configure() {
-	local myconf=( ${EXTRA_FFMPEG_CONF} )
-
-	# options to use as use_enable in the foo[:bar] form.
-	# This will feed configure with $(use_enable foo bar)
-	# or $(use_enable foo foo) if no :bar is set.
-	local ffuse=(
-		bzip2:bzlib cpudetection:runtime-cpudetect debug doc
-		gnutls hardcoded-tables iconv lzma network openssl samba:libsmbclient
-		sdl:ffplay vaapi vdpau X:xlib zlib
-	)
-	use openssl && myconf+=( --enable-nonfree )
-	use samba && myconf+=( --enable-version3 )
-
-	# Encoders
-	if use encode
-	then
-		ffuse+=( aac:libvo-aacenc amrenc:libvo-amrwbenc mp3:libmp3lame )
-		for i in aacplus faac theora twolame wavpack webp x264 x265 xvid; do
-			ffuse+=( ${i}:lib${i} )
-		done
-
-		# Licensing.
-		if use aac || use amrenc ; then
-			myconf+=( --enable-version3 )
-		fi
-		if use aacplus || use faac ; then
-			myconf+=( --enable-nonfree )
-		fi
-	else
-		myconf+=( --disable-encoders )
-	fi
-
-	# libavdevice options
-	ffuse+=( cdio:libcdio iec61883:libiec61883 ieee1394:libdc1394 libcaca openal opengl )
-
-	# Indevs
-	use v4l || myconf+=( --disable-indev=v4l2 --disable-outdev=v4l2 )
-	for i in alsa oss jack ; do
-		use ${i} || myconf+=( --disable-indev=${i} )
-	done
-	ffuse+=( libv4l:libv4l2 pulseaudio:libpulse X:x11grab )
-
-	# Outdevs
-	for i in alsa oss sdl ; do
-		use ${i} || myconf+=( --disable-outdev=${i} )
-	done
-
-	# libavfilter options
-	ffuse+=( bs2b:libbs2b flite:libflite frei0r fribidi:libfribidi fontconfig ladspa libass truetype:libfreetype )
-
-	# libswresample options
-	ffuse+=( libsoxr )
-
-	# Threads; we only support pthread for now but ffmpeg supports more
-	ffuse+=( threads:pthreads )
-
-	# Decoders
-	ffuse+=( amr:libopencore-amrwb amr:libopencore-amrnb fdk:libfdk-aac jpeg2k:libopenjpeg )
-	use amr && myconf+=( --enable-version3 )
-	for i in bluray celt gme gsm modplug opus quvi rtmp ssh schroedinger speex vorbis vpx zvbi; do
-		ffuse+=( ${i}:lib${i} )
-	done
-	use fdk && myconf+=( --enable-nonfree )
-
-	for i in "${ffuse[@]}" ; do
-		myconf+=( $(use_enable ${i%:*} ${i#*:}) )
-	done
-
-	# (temporarily) disable non-multilib deps
-	if ! multilib_is_native_abi; then
-		for i in frei0r ; do
-			myconf+=( --disable-${i} )
-		done
-	fi
-
-	# CPU features
-	for i in ${CPU_FEATURES}; do
-		use ${i%:*} || myconf+=( --disable-${i#*:} )
-	done
-	if use pic ; then
-		myconf+=( --enable-pic )
-		# disable asm code if PIC is required
-		# as the provided asm decidedly is not PIC for x86.
-		[[ ${ABI} == x86 ]] && myconf+=( --disable-asm )
-	fi
-	[[ ${ABI} == x32 ]] && myconf+=( --disable-asm ) #427004
-
-	# Try to get cpu type based on CFLAGS.
-	# Bug #172723
-	# We need to do this so that features of that CPU will be better used
-	# If they contain an unknown CPU it will not hurt since ffmpeg's configure
-	# will just ignore it.
-	for i in $(get-flag mcpu) $(get-flag mtune) $(get-flag march) ; do
-		[[ ${i} = native ]] && i="host" # bug #273421
-		myconf+=( --cpu=${i} )
-		break
-	done
-
-	# Mandatory configuration
-	myconf=(
-		--enable-gpl
-		--enable-postproc
-		--enable-avfilter
-		--enable-avresample
-		--disable-stripping
-		"${myconf[@]}"
-	)
-
-	# cross compile support
-	if tc-is-cross-compiler ; then
-		myconf+=( --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}- )
-		case ${CHOST} in
-			*freebsd*)
-				myconf+=( --target-os=freebsd )
-				;;
-			mingw32*)
-				myconf+=( --target-os=mingw32 )
-				;;
-			*linux*)
-				myconf+=( --target-os=linux )
-				;;
-		esac
-	fi
-
-	set -- "${S}/configure" \
-		--prefix="${EPREFIX}/usr" \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		--shlibdir="${EPREFIX}/usr/$(get_libdir)" \
-		--mandir="${EPREFIX}/usr/share/man" \
-		--enable-shared \
-		--cc="$(tc-getCC)" \
-		--cxx="$(tc-getCXX)" \
-		--ar="$(tc-getAR)" \
-		--optflags="${CFLAGS}" \
-		--extra-cflags="${CFLAGS}" \
-		--extra-cxxflags="${CXXFLAGS}" \
-		$(use_enable static-libs static) \
-		"${myconf[@]}"
-	echo "${@}"
-	"${@}" || die
-}
-
-multilib_src_compile() {
-	emake V=1
-
-	if multilib_is_native_abi; then
-		for i in ${FFTOOLS} ; do
-			if use fftools_${i} ; then
-				emake V=1 tools/${i}
-			fi
-		done
-	fi
-}
-
-multilib_src_install() {
-	emake V=1 DESTDIR="${D}" install install-man
-
-	if multilib_is_native_abi; then
-		for i in ${FFTOOLS} ; do
-			if use fftools_${i} ; then
-				dobin tools/${i}
-			fi
-		done
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc Changelog README.md CREDITS doc/*.txt doc/APIchanges
-	[ -f "RELEASE_NOTES" ] && dodoc "RELEASE_NOTES"
-	use doc && dohtml -r doc/*
-	if use examples ; then
-		dodoc -r doc/examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
-
-multilib_src_test() {
-	LD_LIBRARY_PATH="${BUILD_DIR}/libpostproc:${BUILD_DIR}/libswscale:${BUILD_DIR}/libswresample:${BUILD_DIR}/libavcodec:${BUILD_DIR}/libavdevice:${BUILD_DIR}/libavfilter:${BUILD_DIR}/libavformat:${BUILD_DIR}/libavutil:${BUILD_DIR}/libavresample" \
-		emake V=1 fate
-}
--- a/media-video/ffmpeg/ffmpeg-2.5.ebuild
+++ b/media-video/ffmpeg/ffmpeg-2.5.ebuild
@ -1,380 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-2.5.ebuild,v 1.2 2014/12/12 09:22:39 aballier Exp $
-
-EAPI="5"
-
-# Subslot: libavutil major.libavcodec major.libavformat major
-# Since FFmpeg ships several libraries, subslot is kind of limited here.
-# Most consumers will use those three libraries, if a "less used" library
-# changes its soname, consumers will have to be rebuilt the old way
-# (preserve-libs).
-# If, for example, a package does not link to libavformat and only libavformat
-# changes its ABI then this package will be rebuilt needlessly. Hence, such a
-# package is free _not_ to := depend on FFmpeg but I would strongly encourage
-# doing so since such a case is unlikely.
-FFMPEG_SUBSLOT=54.56.56
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-2"
-	EGIT_REPO_URI="git://source.ffmpeg.org/ffmpeg.git"
-fi
-
-inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs ${SCM}
-
-DESCRIPTION="Complete solution to record, convert and stream audio and video. Includes libavcodec"
-HOMEPAGE="http://ffmpeg.org/"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
-elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot
-	SRC_URI="mirror://gentoo/${P}.tar.bz2"
-else # Release
-	SRC_URI="http://ffmpeg.org/releases/${P/_/-}.tar.bz2"
-fi
-FFMPEG_REVISION="${PV#*_p}"
-
-LICENSE="GPL-2 amr? ( GPL-3 ) encode? ( aac? ( GPL-3 ) ) samba? ( GPL-3 )"
-SLOT="0/${FFMPEG_SUBSLOT}"
-if [ "${PV#9999}" = "${PV}" ] ; then
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
-fi
-IUSE="
-	aac aacplus alsa amr amrenc bindist bluray bs2b +bzip2 cdio celt
-	cpudetection debug doc +encode examples faac fdk flite fontconfig frei0r
-	fribidi gme	gnutls gsm +hardcoded-tables +iconv iec61883 ieee1394 jack
-	jpeg2k ladspa libass libcaca libsoxr libv4l lzma modplug mp3 +network
-	openal opengl openssl opus oss pic pulseaudio quvi rtmp samba schroedinger
-	sdl speex ssh static-libs test theora threads truetype twolame v4l vaapi
-	vdpau vorbis vpx wavpack webp X x264 x265 xcb xvid +zlib zvbi
-	"
-
-ARM_CPU_FEATURES="armv5te armv6 armv6t2 neon armvfp:vfp"
-MIPS_CPU_FEATURES="mips32r2 mipsdspr1 mipsdspr2 mipsfpu"
-PPC_CPU_FEATURES="altivec"
-X86_CPU_FEATURES="3dnow:amd3dnow 3dnowext:amd3dnowext avx avx2 fma3 fma4 mmx mmxext sse sse2 sse3 ssse3 sse4 sse4_2:sse42 xop"
-
-# String for CPU features in the useflag[:configure_option] form
-# if :configure_option isn't set, it will use 'useflag' as configure option
-CPU_FEATURES="
-	${ARM_CPU_FEATURES}
-	${MIPS_CPU_FEATURES}
-	${PPC_CPU_FEATURES}
-	${X86_CPU_FEATURES}
-"
-
-for i in ${CPU_FEATURES}; do
-	IUSE="${IUSE} ${i%:*}"
-done
-
-FFTOOLS="aviocat cws2fws ffescape ffeval ffhash fourcc2pixfmt graph2dot ismindex pktdumper qt-faststart trasher"
-
-for i in ${FFTOOLS}; do
-	IUSE="${IUSE} +fftools_$i"
-done
-
-RDEPEND="
-	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
-	amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] )
-	bluray? ( >=media-libs/libbluray-0.3.0-r1[${MULTILIB_USEDEP}] )
-	bs2b? ( >=media-libs/libbs2b-3.1.0-r1[${MULTILIB_USEDEP}] )
-	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
-	cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] )
-	celt? ( >=media-libs/celt-0.11.1-r1[${MULTILIB_USEDEP}] )
-	encode? (
-		aac? ( >=media-libs/vo-aacenc-0.1.3[${MULTILIB_USEDEP}] )
-		aacplus? ( >=media-libs/libaacplus-2.0.2-r1[${MULTILIB_USEDEP}] )
-		amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] )
-		faac? ( >=media-libs/faac-1.28-r3[${MULTILIB_USEDEP}] )
-		mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] )
-		theora? (
-			>=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}]
-			>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
-		)
-		twolame? ( >=media-sound/twolame-0.3.13-r1[${MULTILIB_USEDEP}] )
-		wavpack? ( >=media-sound/wavpack-4.60.1-r1[${MULTILIB_USEDEP}] )
-		webp? ( >=media-libs/libwebp-0.3.0[${MULTILIB_USEDEP}] )
-		x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] )
-		x265? ( >=media-libs/x265-1.2:=[${MULTILIB_USEDEP}] )
-		xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] )
-	)
-	fdk? ( >=media-libs/fdk-aac-0.1.3[${MULTILIB_USEDEP}] )
-	flite? ( >=app-accessibility/flite-1.4-r4[${MULTILIB_USEDEP}] )
-	fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
-	frei0r? ( media-plugins/frei0r-plugins )
-	fribidi? ( >=dev-libs/fribidi-0.19.6[${MULTILIB_USEDEP}] )
-	gme? ( >=media-libs/game-music-emu-0.6.0[${MULTILIB_USEDEP}] )
-	gnutls? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}] )
-	gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] )
-	iconv? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] )
-	iec61883? (
-		>=media-libs/libiec61883-1.2.0-r1[${MULTILIB_USEDEP}]
-		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
-		>=sys-libs/libavc1394-0.5.4-r1[${MULTILIB_USEDEP}]
-	)
-	ieee1394? (
-		>=media-libs/libdc1394-2.2.1[${MULTILIB_USEDEP}]
-		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
-	)
-	jack? ( >=media-sound/jack-audio-connection-kit-0.121.3-r1[${MULTILIB_USEDEP}] )
-	jpeg2k? ( >=media-libs/openjpeg-1.5.0:0[${MULTILIB_USEDEP}] )
-	libass? ( >=media-libs/libass-0.10.2[${MULTILIB_USEDEP}] )
-	libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[${MULTILIB_USEDEP}] )
-	libsoxr? ( >=media-libs/soxr-0.1.0[${MULTILIB_USEDEP}] )
-	libv4l? ( >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}] )
-	lzma? ( >=app-arch/xz-utils-5.0.5-r1[${MULTILIB_USEDEP}] )
-	modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] )
-	openal? ( >=media-libs/openal-1.15.1[${MULTILIB_USEDEP}] )
-	opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
-	openssl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )
-	opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] )
-	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
-	quvi? ( media-libs/libquvi:0.4[${MULTILIB_USEDEP}] )
-	rtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
-	samba? ( >=net-fs/samba-3.6.23-r1[${MULTILIB_USEDEP}] )
-	schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}] )
-	sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,${MULTILIB_USEDEP}] )
-	speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
-	ssh? ( >=net-libs/libssh-0.5.5[${MULTILIB_USEDEP}] )
-	truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
-	vaapi? ( >=x11-libs/libva-1.2.1-r1[${MULTILIB_USEDEP}] )
-	vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] )
-	vorbis? (
-		>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
-		>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
-	)
-	vpx? ( >=media-libs/libvpx-1.2.0_pre20130625[${MULTILIB_USEDEP}] )
-	X? (
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
-		>=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}]
-	)
-	xcb? ( x11-libs/libxcb[${MULTILIB_USEDEP}] )
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-	zvbi? ( >=media-libs/zvbi-0.2.35[${MULTILIB_USEDEP}] )
-	!media-video/qt-faststart
-	!media-libs/libpostproc
-"
-
-DEPEND="${RDEPEND}
-	>=sys-devel/make-3.81
-	doc? ( app-text/texi2html )
-	fontconfig? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	gnutls? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	ieee1394? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	ladspa? ( >=media-libs/ladspa-sdk-1.13-r2[${MULTILIB_USEDEP}] )
-	libv4l? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	mmx? ( >=dev-lang/yasm-1.2 )
-	rtmp? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	schroedinger? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	test? ( net-misc/wget sys-devel/bc )
-	truetype? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	v4l? ( sys-kernel/linux-headers )
-"
-
-RDEPEND="${RDEPEND}
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3
-		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
-
-# faac is license-incompatible with ffmpeg
-REQUIRED_USE="bindist? ( encode? ( !faac !aacplus ) !openssl )
-	libv4l? ( v4l )
-	fftools_cws2fws? ( zlib )
-	test? ( encode )"
-
-S=${WORKDIR}/${P/_/-}
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/libavutil/avconfig.h
-)
-
-src_prepare() {
-	if [[ "${PV%_p*}" != "${PV}" ]] ; then # Snapshot
-		export revision=git-N-${FFMPEG_REVISION}
-	fi
-	epatch "${FILESDIR}/samba.patch"
-	epatch_user
-}
-
-multilib_src_configure() {
-	local myconf=( ${EXTRA_FFMPEG_CONF} )
-
-	# options to use as use_enable in the foo[:bar] form.
-	# This will feed configure with $(use_enable foo bar)
-	# or $(use_enable foo foo) if no :bar is set.
-	local ffuse=(
-		bzip2:bzlib cpudetection:runtime-cpudetect debug doc
-		gnutls hardcoded-tables iconv lzma network openssl samba:libsmbclient
-		sdl:ffplay vaapi vdpau X:xlib xcb:libxcb xcb:libxcb-shm xcb:libxcb-xfixes zlib
-	)
-	use openssl && myconf+=( --enable-nonfree )
-	use samba && myconf+=( --enable-version3 )
-
-	# Encoders
-	if use encode
-	then
-		ffuse+=( aac:libvo-aacenc amrenc:libvo-amrwbenc mp3:libmp3lame )
-		for i in aacplus faac theora twolame wavpack webp x264 x265 xvid; do
-			ffuse+=( ${i}:lib${i} )
-		done
-
-		# Licensing.
-		if use aac || use amrenc ; then
-			myconf+=( --enable-version3 )
-		fi
-		if use aacplus || use faac ; then
-			myconf+=( --enable-nonfree )
-		fi
-	else
-		myconf+=( --disable-encoders )
-	fi
-
-	# libavdevice options
-	ffuse+=( cdio:libcdio iec61883:libiec61883 ieee1394:libdc1394 libcaca openal opengl )
-
-	# Indevs
-	use v4l || myconf+=( --disable-indev=v4l2 --disable-outdev=v4l2 )
-	for i in alsa oss jack ; do
-		use ${i} || myconf+=( --disable-indev=${i} )
-	done
-	ffuse+=( libv4l:libv4l2 pulseaudio:libpulse X:x11grab )
-
-	# Outdevs
-	for i in alsa oss sdl ; do
-		use ${i} || myconf+=( --disable-outdev=${i} )
-	done
-
-	# libavfilter options
-	ffuse+=( bs2b:libbs2b flite:libflite frei0r fribidi:libfribidi fontconfig ladspa libass truetype:libfreetype )
-
-	# libswresample options
-	ffuse+=( libsoxr )
-
-	# Threads; we only support pthread for now but ffmpeg supports more
-	ffuse+=( threads:pthreads )
-
-	# Decoders
-	ffuse+=( amr:libopencore-amrwb amr:libopencore-amrnb fdk:libfdk-aac jpeg2k:libopenjpeg )
-	use amr && myconf+=( --enable-version3 )
-	for i in bluray celt gme gsm modplug opus quvi rtmp ssh schroedinger speex vorbis vpx zvbi; do
-		ffuse+=( ${i}:lib${i} )
-	done
-	use fdk && myconf+=( --enable-nonfree )
-
-	for i in "${ffuse[@]}" ; do
-		myconf+=( $(use_enable ${i%:*} ${i#*:}) )
-	done
-
-	# (temporarily) disable non-multilib deps
-	if ! multilib_is_native_abi; then
-		for i in frei0r ; do
-			myconf+=( --disable-${i} )
-		done
-	fi
-
-	# CPU features
-	for i in ${CPU_FEATURES}; do
-		use ${i%:*} || myconf+=( --disable-${i#*:} )
-	done
-	if use pic ; then
-		myconf+=( --enable-pic )
-		# disable asm code if PIC is required
-		# as the provided asm decidedly is not PIC for x86.
-		[[ ${ABI} == x86 ]] && myconf+=( --disable-asm )
-	fi
-	[[ ${ABI} == x32 ]] && myconf+=( --disable-asm ) #427004
-
-	# Try to get cpu type based on CFLAGS.
-	# Bug #172723
-	# We need to do this so that features of that CPU will be better used
-	# If they contain an unknown CPU it will not hurt since ffmpeg's configure
-	# will just ignore it.
-	for i in $(get-flag mcpu) $(get-flag mtune) $(get-flag march) ; do
-		[[ ${i} = native ]] && i="host" # bug #273421
-		myconf+=( --cpu=${i} )
-		break
-	done
-
-	# Mandatory configuration
-	myconf=(
-		--enable-gpl
-		--enable-postproc
-		--enable-avfilter
-		--enable-avresample
-		--disable-stripping
-		"${myconf[@]}"
-	)
-
-	# cross compile support
-	if tc-is-cross-compiler ; then
-		myconf+=( --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}- )
-		case ${CHOST} in
-			*freebsd*)
-				myconf+=( --target-os=freebsd )
-				;;
-			mingw32*)
-				myconf+=( --target-os=mingw32 )
-				;;
-			*linux*)
-				myconf+=( --target-os=linux )
-				;;
-		esac
-	fi
-
-	set -- "${S}/configure" \
-		--prefix="${EPREFIX}/usr" \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		--shlibdir="${EPREFIX}/usr/$(get_libdir)" \
-		--mandir="${EPREFIX}/usr/share/man" \
-		--enable-shared \
-		--cc="$(tc-getCC)" \
-		--cxx="$(tc-getCXX)" \
-		--ar="$(tc-getAR)" \
-		--optflags="${CFLAGS}" \
-		--extra-cflags="${CFLAGS}" \
-		--extra-cxxflags="${CXXFLAGS}" \
-		$(use_enable static-libs static) \
-		"${myconf[@]}"
-	echo "${@}"
-	"${@}" || die
-}
-
-multilib_src_compile() {
-	emake V=1
-
-	if multilib_is_native_abi; then
-		for i in ${FFTOOLS} ; do
-			if use fftools_${i} ; then
-				emake V=1 tools/${i}
-			fi
-		done
-	fi
-}
-
-multilib_src_install() {
-	emake V=1 DESTDIR="${D}" install install-man
-
-	if multilib_is_native_abi; then
-		for i in ${FFTOOLS} ; do
-			if use fftools_${i} ; then
-				dobin tools/${i}
-			fi
-		done
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc Changelog README.md CREDITS doc/*.txt doc/APIchanges
-	[ -f "RELEASE_NOTES" ] && dodoc "RELEASE_NOTES"
-	use doc && dohtml -r doc/*
-	if use examples ; then
-		dodoc -r doc/examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
-
-multilib_src_test() {
-	LD_LIBRARY_PATH="${BUILD_DIR}/libpostproc:${BUILD_DIR}/libswscale:${BUILD_DIR}/libswresample:${BUILD_DIR}/libavcodec:${BUILD_DIR}/libavdevice:${BUILD_DIR}/libavfilter:${BUILD_DIR}/libavformat:${BUILD_DIR}/libavutil:${BUILD_DIR}/libavresample" \
-		emake V=1 fate
-}
--- a/media-video/ffmpeg/files/samba.patch
+++ b/media-video/ffmpeg/files/samba.patch
@ -1,26 +0,0 @@
-commit 754f4957d7a7e5be0df0e9de1d31aebeecdc4476
-Author: Moritz Barsnick <barsnick@gmx.net>
-Date:   Mon Dec 8 16:08:20 2014 +0100
-
-    configure: use use_pkg_config() instead of check_pkg_config() for libsmbclient
-    
-    This ensures that the CFLAGS and LDFLAGS are actually applied.
-    Fixes an incorrect change introduced with the clean-up in commit
-    cfcaf6b38e39ed6e788abb1a5a44f23660dce2f6.
-    
-    Reviewed-by: Nicolas George <george@nsup.org>
-    Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-
-diff --git a/configure b/configure
-index 40d5428..0933210 100755
--- a/configure
-+++ b/configure
-@@ -4887,7 +4887,7 @@ enabled libquvi           && require_pkg_config libquvi quvi/quvi.h quvi_init
- enabled librtmp           && require_pkg_config librtmp librtmp/rtmp.h RTMP_Socket
- enabled libschroedinger   && require_pkg_config schroedinger-1.0 schroedinger/schro.h schro_init
- enabled libshine          && require_pkg_config shine shine/layer3.h shine_encode_buffer
-enabled libsmbclient      && { check_pkg_config smbclient libsmbclient.h smbc_init ||
-+enabled libsmbclient      && { use_pkg_config smbclient libsmbclient.h smbc_init ||
-                                require smbclient libsmbclient.h smbc_init -lsmbclient; }
- enabled libsoxr           && require libsoxr soxr.h soxr_create -lsoxr
- enabled libssh            && require_pkg_config libssh libssh/sftp.h sftp_init
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@ -1 +1 @@
-Tue, 16 Dec 2014 21:07:03 +0000
+Wed, 17 Dec 2014 10:37:01 +0000
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@ -1 +1 @@
-Tue, 16 Dec 2014 21:07:03 +0000
+Wed, 17 Dec 2014 10:37:01 +0000
--- a/metadata/md5-cache/app-crypt/gpgme-1.5.3
+++ b/metadata/md5-cache/app-crypt/gpgme-1.5.3
@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=app-crypt/gnupg >=dev-libs/libassuan-2.0.2 >=dev-libs/libgpg-error-1.11
+DESCRIPTION=GnuPG Made Easy is a library for making GnuPG easier to use
+EAPI=5
+HOMEPAGE=http://www.gnupg.org/related_software/gpgme
+IUSE=common-lisp static-libs
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=app-crypt/gnupg >=dev-libs/libassuan-2.0.2 >=dev-libs/libgpg-error-1.11
+SLOT=1/11
+SRC_URI=mirror://gnupg/gpgme/gpgme-1.5.3.tar.bz2
+_eclasses_=eutils	6faef4c127028ccbba3a11400d24ae34	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
+_md5_=edf22c5251f87dfd3f147127b240f7f5
--- a/metadata/md5-cache/app-editors/xemacs-21.5.31
+++ b/metadata/md5-cache/app-editors/xemacs-21.5.31
@ -11,4 +11,4 @@ RDEPEND=berkdb? ( >=sys-libs/db-4 !!<sys-libs/db-4 ) gdbm? ( >=sys-libs/gdbm-1.8
 SLOT=0
 SRC_URI=http://ftp.xemacs.org/xemacs-21.5/xemacs-21.5.31.tar.gz http://www.malfunction.de/afterstep/files/NeXT_XEmacs.tar.gz
 _eclasses_=eutils	6faef4c127028ccbba3a11400d24ae34	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=ae326e7000e98dd31b1d0557509fae18
+_md5_=8715979544f2ac7a6dc602519e506dda
--- a/metadata/md5-cache/app-editors/xemacs-21.5.33
+++ b/metadata/md5-cache/app-editors/xemacs-21.5.33
@ -11,4 +11,4 @@ RDEPEND=berkdb? ( >=sys-libs/db-4 !!<sys-libs/db-4 ) gdbm? ( >=sys-libs/gdbm-1.8
 SLOT=0
 SRC_URI=http://ftp.xemacs.org/xemacs-21.5/xemacs-21.5.33.tar.gz http://www.malfunction.de/afterstep/files/NeXT_XEmacs.tar.gz
 _eclasses_=eutils	6faef4c127028ccbba3a11400d24ae34	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=859b7de4c5f508054cd9f451241563de
+_md5_=9a1b4de3ef472a4736a8a4869936b8a1
--- a/metadata/md5-cache/app-misc/mc-4.8.13
+++ b/metadata/md5-cache/app-misc/mc-4.8.13
@ -4,11 +4,11 @@ DESCRIPTION=GNU Midnight Commander is a text based file manager
 EAPI=5
 HOMEPAGE=http://www.midnight-commander.org
 IUSE=+edit gpm mclib nls samba sftp +slang spell test X +xdg
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris
 LICENSE=GPL-3
 RDEPEND=>=dev-libs/glib-2.8:2 gpm? ( sys-libs/gpm ) kernel_linux? ( sys-fs/e2fsprogs ) samba? ( net-fs/samba ) sftp? ( net-libs/libssh2 ) slang? ( >=sys-libs/slang-2 ) !slang? ( sys-libs/ncurses ) spell? ( app-text/aspell ) X? ( x11-libs/libX11 x11-libs/libICE x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM )
 REQUIRED_USE=spell? ( edit )
 SLOT=0
 SRC_URI=http://www.midnight-commander.org/downloads/mc-4.8.13.tar.xz
 _eclasses_=autotools	c118b9a8e93bfef124f2d7a2fe56a95e	eutils	6faef4c127028ccbba3a11400d24ae34	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=0494c6df51332b8b62066c2608c9c7c3
+_md5_=75b4abdab3c9ee764a64c756d531ebaa
--- a/metadata/md5-cache/app-mobilephone/heimdall-9999
+++ b/metadata/md5-cache/app-mobilephone/heimdall-9999
@ -8,4 +8,4 @@ LICENSE=MIT
 RDEPEND=>=dev-libs/libusb-1.0.18:1= qt4? ( dev-qt/qtcore:4= dev-qt/qtgui:4= )
 SLOT=0
 _eclasses_=autotools	c118b9a8e93bfef124f2d7a2fe56a95e	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	6faef4c127028ccbba3a11400d24ae34	git-2	e28f0d8a9b321431b1e699782851b827	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	qmake-utils	9e0174de733aecba0a7e66b2b01841d2	qt4-r2	7199e3db5b5908325487d379c6f67cf0	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	udev	da001465a2e939c93f7ae16947ce3438
-_md5_=9e16af2ed9197bc69c8169b1e0d30214
+_md5_=6625fb129c793f1fb498c241b151ffe7
--- a/metadata/md5-cache/dev-haskell/aws-0.11
+++ b/metadata/md5-cache/dev-haskell/aws-0.11
@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prerm setup test
+DEPEND=>=dev-haskell/aeson-0.6:=[profile?] >=dev-haskell/attoparsec-0.11:=[profile?] <dev-haskell/attoparsec-0.13:=[profile?] >=dev-haskell/base16-bytestring-0.1:=[profile?] <dev-haskell/base16-bytestring-0.2:=[profile?] >=dev-haskell/base64-bytestring-1.0:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?] >=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.4:=[profile?] >=dev-haskell/byteable-0.1:=[profile?] <dev-haskell/byteable-0.2:=[profile?] >=dev-haskell/case-insensitive-0.2:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?] >=dev-haskell/cereal-0.3:=[profile?] <dev-haskell/cereal-0.5:=[profile?] >=dev-haskell/conduit-1.1:=[profile?] <dev-haskell/conduit-1.3:=[profile?] >=dev-haskell/conduit-extra-1.1:=[profile?] <dev-haskell/conduit-extra-1.2:=[profile?] >=dev-haskell/cryptohash-0.11:=[profile?] <dev-haskell/cryptohash-0.12:=[profile?] >=dev-haskell/data-default-0.5.3:=[profile?] <dev-haskell/data-default-0.6:=[profile?] >=dev-haskell/http-conduit-2.1:=[profile?] <dev-haskell/http-conduit-2.2:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] <dev-haskell/http-types-0.9:=[profile?] >=dev-haskell/lifted-base-0.1:=[profile?] <dev-haskell/lifted-base-0.3:=[profile?] >=dev-haskell/monad-control-0.3:=[profile?] >=dev-haskell/mtl-2:=[profile?] <dev-haskell/mtl-3:=[profile?] >=dev-haskell/network-2:=[profile?] <dev-haskell/network-3:=[profile?] >=dev-haskell/resourcet-1.1:=[profile?] <dev-haskell/resourcet-1.2:=[profile?] >=dev-haskell/safe-0.3:=[profile?] <dev-haskell/safe-0.4:=[profile?] >=dev-haskell/scientific-0.3:=[profile?] >=dev-haskell/tagged-0.7:=[profile?] <dev-haskell/tagged-0.8:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] >=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-0.4:=[profile?] >=dev-haskell/vector-0.10:=[profile?] >=dev-haskell/xml-conduit-1.2:=[profile?] <dev-haskell/xml-conduit-1.3:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 doc? ( dev-haskell/haddock ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
+DESCRIPTION=Amazon Web Services (AWS) for Haskell
+EAPI=5
+HOMEPAGE=http://github.com/aristidb/aws
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/aeson-0.6:=[profile?] >=dev-haskell/attoparsec-0.11:=[profile?] <dev-haskell/attoparsec-0.13:=[profile?] >=dev-haskell/base16-bytestring-0.1:=[profile?] <dev-haskell/base16-bytestring-0.2:=[profile?] >=dev-haskell/base64-bytestring-1.0:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?] >=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.4:=[profile?] >=dev-haskell/byteable-0.1:=[profile?] <dev-haskell/byteable-0.2:=[profile?] >=dev-haskell/case-insensitive-0.2:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?] >=dev-haskell/cereal-0.3:=[profile?] <dev-haskell/cereal-0.5:=[profile?] >=dev-haskell/conduit-1.1:=[profile?] <dev-haskell/conduit-1.3:=[profile?] >=dev-haskell/conduit-extra-1.1:=[profile?] <dev-haskell/conduit-extra-1.2:=[profile?] >=dev-haskell/cryptohash-0.11:=[profile?] <dev-haskell/cryptohash-0.12:=[profile?] >=dev-haskell/data-default-0.5.3:=[profile?] <dev-haskell/data-default-0.6:=[profile?] >=dev-haskell/http-conduit-2.1:=[profile?] <dev-haskell/http-conduit-2.2:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] <dev-haskell/http-types-0.9:=[profile?] >=dev-haskell/lifted-base-0.1:=[profile?] <dev-haskell/lifted-base-0.3:=[profile?] >=dev-haskell/monad-control-0.3:=[profile?] >=dev-haskell/mtl-2:=[profile?] <dev-haskell/mtl-3:=[profile?] >=dev-haskell/network-2:=[profile?] <dev-haskell/network-3:=[profile?] >=dev-haskell/resourcet-1.1:=[profile?] <dev-haskell/resourcet-1.2:=[profile?] >=dev-haskell/safe-0.3:=[profile?] <dev-haskell/safe-0.4:=[profile?] >=dev-haskell/scientific-0.3:=[profile?] >=dev-haskell/tagged-0.7:=[profile?] <dev-haskell/tagged-0.8:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-haskell/transformers-0.2.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] >=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-0.4:=[profile?] >=dev-haskell/vector-0.10:=[profile?] >=dev-haskell/xml-conduit-1.2:=[profile?] <dev-haskell/xml-conduit-1.3:=[profile?] >=dev-lang/ghc-7.4.1:=
+RESTRICT=test
+SLOT=0/0.11
+SRC_URI=mirror://hackage/packages/archive/aws/0.11/aws-0.11.tar.gz
+_eclasses_=eutils	6faef4c127028ccbba3a11400d24ae34	ghc-package	9dd58db252d8252779bb74ed015196e3	haskell-cabal	b6154aeaa4dfbbc6d8a66d7f739c22d1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=d81c28353cdc231acd2ac5a682c369e4
--- a/metadata/md5-cache/dev-libs/libassuan-2.2.0
+++ b/metadata/md5-cache/dev-libs/libassuan-2.2.0
@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=>=dev-libs/libgpg-error-1.8
+DESCRIPTION=IPC library used by GnuPG and GPGME
+EAPI=5
+HOMEPAGE=http://www.gnupg.org/related_software/libassuan/index.en.html
+IUSE=static-libs
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-3 LGPL-2.1
+RDEPEND=>=dev-libs/libgpg-error-1.8
+SLOT=0
+SRC_URI=mirror://gnupg/libassuan/libassuan-2.2.0.tar.bz2
+_eclasses_=eutils	6faef4c127028ccbba3a11400d24ae34	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
+_md5_=5e6dd4245e7a0e73fbb508a830d8e4db
--- a/metadata/md5-cache/dev-lua/lpeg-0.12.1
+++ b/metadata/md5-cache/dev-lua/lpeg-0.12.1
@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare test
+DEPEND=>=dev-lang/lua-5.1 virtual/pkgconfig
+DESCRIPTION=Parsing Expression Grammars for Lua
+EAPI=5
+HOMEPAGE=http://www.inf.puc-rio.br/~roberto/lpeg/
+IUSE=debug doc
+KEYWORDS=~amd64 ~arm ~hppa ~mips ~x86
+LICENSE=MIT
+RDEPEND=>=dev-lang/lua-5.1
+SLOT=0
+SRC_URI=http://www.inf.puc-rio.br/~roberto/lpeg/lpeg-0.12.1.tar.gz
+_eclasses_=eutils	6faef4c127028ccbba3a11400d24ae34	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
+_md5_=c61e0044a6c2c548ce6a3a12566d05c1
--- a/metadata/md5-cache/dev-python/pystatgrab-0.6
+++ b/metadata/md5-cache/dev-python/pystatgrab-0.6
@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=sys-libs/libstatgrab-0.13 virtual/pkgconfig python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=>=sys-libs/libstatgrab-0.91 virtual/pkgconfig python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=pystatgrab is a set of Python bindings for the libstatgrab library
 EAPI=5
 HOMEPAGE=http://www.i-scream.org/pystatgrab/
 IUSE=python_targets_python2_7
 KEYWORDS=~amd64 ~ia64 ~ppc ~x86
 LICENSE=GPL-2
-RDEPEND=>=sys-libs/libstatgrab-0.13 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+RDEPEND=>=sys-libs/libstatgrab-0.91 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://www.mirrorservice.org/sites/ftp.i-scream.org/pub/i-scream/pystatgrab/pystatgrab-0.6.tar.gz
 _eclasses_=distutils-r1	14bf2faa8bf611e0b13aeedc24cefa6c	eutils	6faef4c127028ccbba3a11400d24ae34	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	a2dac9ffff107078f25147aac958a68f	python-utils-r1	d5328656d500f65898a5f51634722f61	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=83ceb53e8495a7be578824586f8c1aa9
+_md5_=2096eedddbc9577790270dca4bc206b3
--- a/metadata/md5-cache/dev-python/spyder-2.2.1
+++ b/metadata/md5-cache/dev-python/spyder-2.2.1
@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=|| ( dev-python/PyQt4[python_targets_python2_7(-)?,-python_single_target_python2_7(-),svg,webkit] dev-python/pyside[python_targets_python2_7(-)?,-python_single_target_python2_7(-),svg,webkit] ) ipython? ( dev-python/ipython[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) matplotlib? ( dev-python/matplotlib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) numpy? ( dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) pep8? ( dev-python/pep8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) pyflakes? ( >=dev-python/pyflakes-0.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) pylint? ( dev-python/pylint[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) rope? ( >=dev-python/rope-0.9.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) scipy? ( sci-libs/scipy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sphinx? ( dev-python/sphinx[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) app-arch/unzip doc? ( dev-python/sphinx ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Python IDE with matlab-like features
-EAPI=5
-HOMEPAGE=http://code.google.com/p/spyderlib/
-IUSE=doc ipython matplotlib numpy pep8 +pyflakes pylint +rope scipy sphinx python_targets_python2_7
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=|| ( dev-python/PyQt4[python_targets_python2_7(-)?,-python_single_target_python2_7(-),svg,webkit] dev-python/pyside[python_targets_python2_7(-)?,-python_single_target_python2_7(-),svg,webkit] ) ipython? ( dev-python/ipython[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) matplotlib? ( dev-python/matplotlib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) numpy? ( dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) pep8? ( dev-python/pep8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) pyflakes? ( >=dev-python/pyflakes-0.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) pylint? ( dev-python/pylint[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) rope? ( >=dev-python/rope-0.9.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) scipy? ( sci-libs/scipy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sphinx? ( dev-python/sphinx[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://spyderlib.googlecode.com/files/spyder-2.2.1.zip
-_eclasses_=distutils-r1	14bf2faa8bf611e0b13aeedc24cefa6c	eutils	6faef4c127028ccbba3a11400d24ae34	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	a2dac9ffff107078f25147aac958a68f	python-utils-r1	d5328656d500f65898a5f51634722f61	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=ecf81424ace9ed048afb78bb0215bbc2
--- a/metadata/md5-cache/dev-python/spyder-2.2.5
+++ b/metadata/md5-cache/dev-python/spyder-2.2.5
@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=|| ( dev-python/PyQt4[python_targets_python2_7(-)?,-python_single_target_python2_7(-),svg,webkit] dev-python/pyside[python_targets_python2_7(-)?,-python_single_target_python2_7(-),svg,webkit] ) ipython? ( dev-python/ipython[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) matplotlib? ( dev-python/matplotlib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) numpy? ( dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) pep8? ( dev-python/pep8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) pyflakes? ( >=dev-python/pyflakes-0.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) pylint? ( dev-python/pylint[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) rope? ( >=dev-python/rope-0.9.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) scipy? ( sci-libs/scipy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sphinx? ( dev-python/sphinx[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) app-arch/unzip doc? ( dev-python/sphinx ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Python IDE with matlab-like features
-EAPI=5
-HOMEPAGE=http://code.google.com/p/spyderlib/
-IUSE=doc ipython matplotlib numpy pep8 +pyflakes pylint +rope scipy sphinx python_targets_python2_7
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=|| ( dev-python/PyQt4[python_targets_python2_7(-)?,-python_single_target_python2_7(-),svg,webkit] dev-python/pyside[python_targets_python2_7(-)?,-python_single_target_python2_7(-),svg,webkit] ) ipython? ( dev-python/ipython[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) matplotlib? ( dev-python/matplotlib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) numpy? ( dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) pep8? ( dev-python/pep8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) pyflakes? ( >=dev-python/pyflakes-0.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) pylint? ( dev-python/pylint[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) rope? ( >=dev-python/rope-0.9.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) scipy? ( sci-libs/scipy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sphinx? ( dev-python/sphinx[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://spyderlib.googlecode.com/files/spyder-2.2.5.zip
-_eclasses_=distutils-r1	14bf2faa8bf611e0b13aeedc24cefa6c	eutils	6faef4c127028ccbba3a11400d24ae34	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	a2dac9ffff107078f25147aac958a68f	python-utils-r1	d5328656d500f65898a5f51634722f61	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=d41bd3ab9c85d5630bfe4ec6e6808c89
--- a/metadata/md5-cache/dev-python/spyder-2.3.2
+++ b/metadata/md5-cache/dev-python/spyder-2.3.2
@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=|| ( dev-python/PyQt4[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),svg,webkit] dev-python/pyside[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),svg,webkit] ) ipython? ( dev-python/ipython[qt4,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) matplotlib? ( dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) numpy? ( dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) pep8? ( dev-python/pep8[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) pyflakes? ( >=dev-python/pyflakes-0.5[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) pylint? ( dev-python/pylint[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) rope? ( python_targets_python2_7? ( dev-python/rope[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) scipy? ( sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) sphinx? ( >=dev-python/sphinx-0.6.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) app-arch/unzip doc? ( >=dev-python/sphinx-0.6.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
+DESCRIPTION=Python IDE with matlab-like features
+EAPI=5
+HOMEPAGE=http://code.google.com/p/spyderlib/ https://bitbucket.org/spyder-ide/spyderlib
+IUSE=doc ipython matplotlib numpy pep8 +pyflakes pylint +rope scipy sphinx python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=|| ( dev-python/PyQt4[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),svg,webkit] dev-python/pyside[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),svg,webkit] ) ipython? ( dev-python/ipython[qt4,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) matplotlib? ( dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) numpy? ( dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) pep8? ( dev-python/pep8[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) pyflakes? ( >=dev-python/pyflakes-0.5[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) pylint? ( dev-python/pylint[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) rope? ( python_targets_python2_7? ( dev-python/rope[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) scipy? ( sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) sphinx? ( >=dev-python/sphinx-0.6.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
+SLOT=0
+SRC_URI=mirror://pypi/s/spyder/spyder-2.3.2.zip
+_eclasses_=distutils-r1	14bf2faa8bf611e0b13aeedc24cefa6c	eutils	6faef4c127028ccbba3a11400d24ae34	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	a2dac9ffff107078f25147aac958a68f	python-utils-r1	d5328656d500f65898a5f51634722f61	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
+_md5_=d8bdad5ad8445e018a489e33fb9dceba
--- a/metadata/md5-cache/dev-python/testtools-1.2.0
+++ b/metadata/md5-cache/dev-python/testtools-1.2.0
@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/mimeparse[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] dev-python/extras[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] ) test? ( python_targets_python2_7? ( dev-python/twisted-core[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
+DEPEND=dev-python/mimeparse[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] dev-python/extras[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] ) test? ( python_targets_python2_7? ( dev-python/twisted-core[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/unittest2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 DESCRIPTION=Extensions to the Python unittest library
 EAPI=5
 HOMEPAGE=https://launchpad.net/testtools http://pypi.python.org/pypi/testtools
@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targe
 SLOT=0
 SRC_URI=http://launchpad.net/testtools/trunk/1.2.0/+download/testtools-1.2.0.tar.gz
 _eclasses_=distutils-r1	14bf2faa8bf611e0b13aeedc24cefa6c	eutils	6faef4c127028ccbba3a11400d24ae34	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	a2dac9ffff107078f25147aac958a68f	python-utils-r1	d5328656d500f65898a5f51634722f61	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=0c51ffd6cc670af04261a20d50505689
+_md5_=df4e9cbd7805200f8e117400229634b4
--- a/metadata/md5-cache/dev-ruby/dotenv-1.0.2
+++ b/metadata/md5-cache/dev-ruby/dotenv-1.0.2
@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) )
+DESCRIPTION=Loads environment variables from .env into ENV
+EAPI=5
+HOMEPAGE=https://github.com/bkeepers/dotenv
+IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 doc test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
+SLOT=0
+SRC_URI=mirror://rubygems/dotenv-1.0.2.gem
+_eclasses_=eutils	6faef4c127028ccbba3a11400d24ae34	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	22fc880fe95a3d6f9639d3b57f3ffb84	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=a6398a6bff848fccfa6a6a89d5d85485
--- a/metadata/md5-cache/dev-ruby/rkelly-remix-0.0.6
+++ b/metadata/md5-cache/dev-ruby/rkelly-remix-0.0.6
@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby19? ( dev-ruby/rdoc[ruby_targets_ruby19] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
+DEPEND=ruby_targets_ruby19? ( doc? ( dev-ruby/hoe[ruby_targets_ruby19] dev-ruby/rdoc[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/hoe[ruby_targets_ruby20] dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/hoe[ruby_targets_ruby21] dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) )
 DESCRIPTION=RKelly Remix is a fork of the RKelly JavaScript parser
 EAPI=5
 HOMEPAGE=https://github.com/nene/rkelly-remix
-IUSE=elibc_FreeBSD ruby_targets_ruby19 doc test test
+IUSE=doc elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 doc test test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 )
+RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/rkelly-remix-0.0.6.gem
 _eclasses_=eutils	6faef4c127028ccbba3a11400d24ae34	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	22fc880fe95a3d6f9639d3b57f3ffb84	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=94c13b7f6568aaed4e9cfdeaac75e1b3
+_md5_=22f2dcf27c506ad6eb083a0cf374e652
--- a/metadata/md5-cache/dev-vcs/git-annex-5.20141203
+++ b/metadata/md5-cache/dev-vcs/git-annex-5.20141203
@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prerm setup test
+DEPEND=dev-vcs/git dev-haskell/async dev-haskell/bloomfilter >=dev-haskell/cabal-1.8 dev-haskell/case-insensitive dev-haskell/dataenc dev-haskell/data-default dev-haskell/dlist dev-haskell/edit-distance >=dev-haskell/exceptions-0.6 dev-haskell/hslogger dev-haskell/http-conduit dev-haskell/http-types dev-haskell/ifelse dev-haskell/json[generic] dev-haskell/missingh dev-haskell/monad-control >=dev-haskell/mtl-2 >=dev-haskell/network-2.0 >=dev-haskell/quickcheck-2.1:2 dev-haskell/random dev-haskell/safesemaphore dev-haskell/sha >=dev-haskell/stm-2.3 dev-haskell/text dev-haskell/transformers dev-haskell/unix-compat dev-haskell/utf8-string dev-haskell/uuid >=dev-lang/ghc-7.4.1 android? ( dev-haskell/data-endian ) assistant? ( >=dev-haskell/stm-2.3 inotify? ( dev-haskell/hinotify ) ) cryptohash? ( >=dev-haskell/cryptohash-0.10.0 ) dbus? ( >=dev-haskell/dbus-0.10.3 ) dns? ( dev-haskell/dns ) ekg? ( dev-haskell/aeson dev-haskell/ekg dev-haskell/http-types ) feed? ( dev-haskell/feed ) pairing? ( dev-haskell/network-info dev-haskell/network-multicast ) quvi? ( dev-haskell/aeson ) s3? ( >=dev-haskell/aws-0.9.2 dev-haskell/conduit dev-haskell/conduit-extra dev-haskell/resourcet ) tdfa? ( dev-haskell/regex-tdfa ) tahoe? ( dev-haskell/aeson ) testsuite? ( dev-haskell/crypto-api >=dev-haskell/tasty-0.7 dev-haskell/tasty-hunit dev-haskell/tasty-quickcheck dev-haskell/tasty-rerun >=dev-haskell/optparse-applicative-0.9.1 ) webapp? ( dev-haskell/blaze-builder dev-haskell/aeson dev-haskell/clientsession dev-haskell/crypto-api dev-haskell/hamlet dev-haskell/http-types dev-haskell/path-pieces dev-haskell/transformers dev-haskell/shakespeare dev-haskell/wai dev-haskell/wai-extra dev-haskell/warp dev-haskell/warp-tls dev-haskell/yesod dev-haskell/yesod-core dev-haskell/yesod-default dev-haskell/yesod-form dev-haskell/yesod-static webapp-secure? ( dev-haskell/warp-tls dev-haskell/securemem dev-haskell/byteable ) ) webdav? ( >=dev-haskell/dav-1.0 dev-haskell/http-client dev-haskell/xml-conduit ) xmpp? ( >=dev-haskell/gnutls-0.1.4 dev-haskell/network-protocol-xmpp dev-haskell/xml-types ) dev-lang/perl doc? ( www-apps/ikiwiki net-misc/rsync ) >=dev-haskell/cabal-1.1.4
+DESCRIPTION=manage files with git, without checking their contents into git
+EAPI=5
+HOMEPAGE=http://git-annex.branchable.com/
+IUSE=android androidsplice +assistant +cryptohash +dbus +dns doc +desktop-notify ekg +feed +inotify +pairing +production +quvi +s3 +tahoe +tdfa +testsuite +webapp +webapp-secure +webdav +xmpp
+KEYWORDS=~amd64 ~x86 ~amd64-linux
+LICENSE=GPL-3
+RDEPEND=dev-vcs/git
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://hackage/packages/archive/git-annex/5.20141203/git-annex-5.20141203.tar.gz
+_eclasses_=eutils	6faef4c127028ccbba3a11400d24ae34	ghc-package	9dd58db252d8252779bb74ed015196e3	haskell-cabal	b6154aeaa4dfbbc6d8a66d7f739c22d1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=87a977217b909077141ead290cecd6bf
--- a/metadata/md5-cache/games-board/gtkatlantic-0.5.0
+++ b/metadata/md5-cache/games-board/gtkatlantic-0.5.0
@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
+DEPEND=x11-libs/gtk+:3 dev-libs/libxml2 media-libs/libpng:0 virtual/pkgconfig >=sys-apps/sed-4
+DESCRIPTION=Monopoly-like game that works with the monopd server
+EAPI=5
+HOMEPAGE=http://gtkatlantic.gradator.net/
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=x11-libs/gtk+:3 dev-libs/libxml2 media-libs/libpng:0 games-misc/games-envd
+SLOT=0
+SRC_URI=http://download.tuxfamily.org/gtkatlantic/downloads/v0.5/gtkatlantic-0.5.0.tar.bz2
+_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	6faef4c127028ccbba3a11400d24ae34	games	bc8839608d26ccd57ca4f2f01c67460f	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747
+_md5_=e59806d0f9f8c4d46878e4587582a944
--- a/metadata/md5-cache/games-puzzle/4stattack-2.1.4
+++ b/metadata/md5-cache/games-puzzle/4stattack-2.1.4
@ -1,5 +1,6 @@
-DEFINED_PHASES=compile install postinst preinst setup unpack
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
 DESCRIPTION=Connect-4 game, single or network multiplayer
+EAPI=5
 HOMEPAGE=http://forcedattack.sourceforge.net/
 KEYWORDS=~amd64 hppa ppc x86
 LICENSE=GPL-2
@ -7,4 +8,4 @@ RDEPEND=dev-python/pygame games-misc/games-envd
 SLOT=0
 SRC_URI=mirror://sourceforge/forcedattack/4stAttack-2.1.4.tar.gz
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	6faef4c127028ccbba3a11400d24ae34	games	bc8839608d26ccd57ca4f2f01c67460f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=b731faa4f5bc8a94f6f5de6457446bd5
+_md5_=986efa5635e03287622c0c5ce1ff3e0b
--- a/metadata/md5-cache/games-server/monopd-0.9.7
+++ b/metadata/md5-cache/games-server/monopd-0.9.7
@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=systemd? ( sys-apps/systemd ) >=sys-libs/libmath++-0.0.3 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DESCRIPTION=server for atlantik games
+EAPI=5
+HOMEPAGE=http://gtkatlantic.gradator.net/
+IUSE=systemd
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=systemd? ( sys-apps/systemd ) games-misc/games-envd
+SLOT=0
+SRC_URI=http://download.tuxfamily.org/gtkatlantic/monopd/monopd-0.9.7.tar.gz
+_eclasses_=autotools	c118b9a8e93bfef124f2d7a2fe56a95e	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	6faef4c127028ccbba3a11400d24ae34	games	bc8839608d26ccd57ca4f2f01c67460f	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747
+_md5_=3228bc13ee826a58db5a024d0bd29dff
--- a/metadata/md5-cache/games-util/xgame-1.7.1
+++ b/metadata/md5-cache/games-util/xgame-1.7.1
@ -1,5 +1,6 @@
-DEFINED_PHASES=compile install postinst preinst setup unpack
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
 DESCRIPTION=Run games in a separate X session
+EAPI=5
 HOMEPAGE=http://xgame.tlhiv.com/
 KEYWORDS=~amd64 ppc x86
 LICENSE=GPL-2
@ -7,4 +8,4 @@ RDEPEND=dev-lang/perl games-misc/games-envd
 SLOT=0
 SRC_URI=http://downloads.tlhiv.com/xgame/xgame-1.7.1.tar.gz
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	6faef4c127028ccbba3a11400d24ae34	games	bc8839608d26ccd57ca4f2f01c67460f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=b534d14cffe716e33dceb2a43d78b418
+_md5_=6b21afe997eea5ce5cf31fd5a774e5b3
--- a/metadata/md5-cache/media-video/ffmpeg-1.2.9
+++ b/metadata/md5-cache/media-video/ffmpeg-1.2.9
--- a/metadata/md5-cache/media-video/ffmpeg-2.2.10
+++ b/metadata/md5-cache/media-video/ffmpeg-2.2.10
--- a/metadata/md5-cache/media-video/ffmpeg-2.4.3
+++ b/metadata/md5-cache/media-video/ffmpeg-2.4.3
--- a/metadata/md5-cache/media-video/ffmpeg-2.4.4
+++ b/metadata/md5-cache/media-video/ffmpeg-2.4.4
--- a/metadata/md5-cache/media-video/ffmpeg-2.5
+++ b/metadata/md5-cache/media-video/ffmpeg-2.5
--- a/metadata/md5-cache/net-analyzer/aimsniff-0.9d
+++ b/metadata/md5-cache/net-analyzer/aimsniff-0.9d
@ -7,8 +7,7 @@ IUSE=samba mysql http http vhosts
 KEYWORDS=~amd64 ppc x86
 LICENSE=GPL-2
 RDEPEND=dev-lang/perl[gdbm] dev-perl/Net-Pcap dev-perl/NetPacket dev-perl/Unicode-String dev-perl/Proc-Daemon dev-perl/Proc-Simple dev-perl/DBI dev-perl/Unix-Syslog mysql? ( virtual/mysql dev-perl/DBD-mysql ) samba? ( net-fs/samba ) http? ( =www-servers/apache-2* ) >=app-admin/webapp-config-1.50.15
-RESTRICT=mirror
 SLOT=0.9d
 SRC_URI=mirror://sourceforge/aimsniff/aimsniff-0.9d.tar.gz http? ( mirror://sourceforge/aimsniff/was-0.1.2b.tar.gz )
 _eclasses_=depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	6faef4c127028ccbba3a11400d24ae34	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	webapp	25b9b1696f5e698711f47d45c3d45e3e
-_md5_=d9378b1c2ed57e893e1a8f4e778ec874
+_md5_=c61b0588c0c16472ea6fcb12060cc647
--- a/metadata/md5-cache/net-analyzer/ettercap-0.8.1-r1
+++ b/metadata/md5-cache/net-analyzer/ettercap-0.8.1-r1
@ -4,10 +4,10 @@ DESCRIPTION=A suite for man in the middle attacks
 EAPI=5
 HOMEPAGE=https://github.com/Ettercap/ettercap
 IUSE=gtk ipv6 ncurses +plugins
-KEYWORDS=~alpha ~amd64 ~arm ~sparc ~x86 ~x86-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
 LICENSE=GPL-2+
 RDEPEND=dev-libs/libbsd dev-libs/libpcre dev-libs/openssl net-libs/libnet:1.1 >=net-libs/libpcap-0.8.1 sys-libs/zlib gtk? ( >=dev-libs/atk-1.2.4 >=dev-libs/glib-2.2.2:2 media-libs/freetype x11-libs/cairo x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.2.2:2 >=x11-libs/pango-1.2.3 ) ncurses? ( >=sys-libs/ncurses-5.3 ) plugins? ( >=net-misc/curl-7.26.0 )
 SLOT=0
 SRC_URI=https://github.com/Ettercap/ettercap/archive/v0.8.1.tar.gz -> ettercap-0.8.1.tar.gz
 _eclasses_=cmake-utils	e2cc76ea65ae78da8e4696dad93f5d29	eutils	6faef4c127028ccbba3a11400d24ae34	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=29cd0b2d7cb2420ffcd6b92f9ec9c011
+_md5_=c25d5583d4365cbdbb80c3bf410bf676
--- a/metadata/md5-cache/net-analyzer/nagvis-1.6.6
+++ b/metadata/md5-cache/net-analyzer/nagvis-1.6.6
@ -1,7 +1,7 @@
 DEFINED_PHASES=install postinst prepare setup
 DEPEND=virtual/httpd-php apache2? ( =www-servers/apache-2* )
 DESCRIPTION=NagVis is a visualization addon for the well known network managment system Nagios
-EAPI=4
+EAPI=5
 HOMEPAGE=http://www.nagvis.org/
 IUSE=apache2 automap apache2
 KEYWORDS=~amd64 ~ppc ~x86
@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=|| ( net-analyzer/nagios net-analyzer/icinga ) automap? ( >=media-gfx/graphviz-2.14 ) apache2? ( dev-lang/php[apache2] ) net-analyzer/mk-livestatus dev-lang/php[gd,nls,json,session,pdo,sqlite,sockets,mysql,unicode,xml] virtual/httpd-php apache2? ( =www-servers/apache-2* )
 SLOT=0
 SRC_URI=mirror://sourceforge/nagvis/nagvis-1.6.6.tar.gz
-_eclasses_=confutils	2ab69b52fa6ea0c0669a47fb94b354b4	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	depend.php	df169a364e191b840b695604097e3c21	eutils	6faef4c127028ccbba3a11400d24ae34	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=535cc9c82915ec5b852aa93402ca2065
+_eclasses_=depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	depend.php	df169a364e191b840b695604097e3c21	eutils	6faef4c127028ccbba3a11400d24ae34	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
+_md5_=854143fa9ae785f96be369c67701ad5b
--- a/metadata/md5-cache/net-analyzer/nb-0.9.03
+++ b/metadata/md5-cache/net-analyzer/nb-0.9.03
@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=dev-lang/perl virtual/pkgconfig sys-apps/texinfo !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=dev-libs/libedit dev-lang/perl virtual/pkgconfig sys-apps/texinfo !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Nodebrain is a tool to monitor and do event correlation
 EAPI=5
 HOMEPAGE=http://nodebrain.sourceforge.net/
 IUSE=static-libs
 KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2 LGPL-2
-RDEPEND=!sys-boot/netboot !www-apps/nanoblogger
+LICENSE=MIT
+RDEPEND=dev-libs/libedit !sys-boot/netboot !www-apps/nanoblogger
 SLOT=0
-SRC_URI=mirror://sourceforge/nodebrain/nodebrain-0.8.16.tar.gz
+SRC_URI=mirror://sourceforge/nodebrain/nodebrain-0.9.03.tar.gz
 _eclasses_=autotools	c118b9a8e93bfef124f2d7a2fe56a95e	eutils	6faef4c127028ccbba3a11400d24ae34	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=ae51fbf07395d5132f375b18d4df1b62
+_md5_=51e03b3b47209ed2b51de474106742b6
--- a/metadata/md5-cache/net-fs/samba-3.6.24
+++ b/metadata/md5-cache/net-fs/samba-3.6.24
@ -4,7 +4,7 @@ DESCRIPTION=Library bits of the samba network filesystem
 EAPI=5
 HOMEPAGE=http://www.samba.org/
 IUSE=acl addns ads +aio avahi caps +client cluster cups debug dmapi doc examples fam ldap ldb +netapi pam quota +readline selinux +server +smbclient smbsharemodes swat syslog +winbind abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux
 LICENSE=GPL-3
 RDEPEND=dev-libs/popt >=sys-libs/talloc-2.0.8-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(-)?] >=sys-libs/tdb-1.2.13[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(-)?] >=sys-libs/tevent-0.9.19[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(-)?] >=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(-)?] ads? ( >=virtual/krb5-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(-)?] sys-fs/e2fsprogs client? ( sys-apps/keyutils ) ) avahi? ( net-dns/avahi[dbus] ) caps? ( >=sys-libs/libcap-2.22-r2[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(-)?] ) client? ( !net-fs/mount-cifs >=dev-libs/iniparser-3.1-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(-)?] ) cluster? ( >=dev-db/ctdb-1.13 ) cups? ( net-print/cups ) debug? ( dev-libs/dmalloc ) dmapi? ( sys-apps/dmapi ) fam? ( >=virtual/fam-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(-)?] ) ldap? ( >=net-nds/openldap-2.4.38-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(-)?] ) ldb? ( sys-libs/ldb ) pam? ( >=virtual/pam-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(-)?] winbind? ( >=dev-libs/iniparser-3.1-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(-)?] ) ) readline? ( >=sys-libs/readline-5.2 ) syslog? ( virtual/logger ) kernel_linux? ( ads? ( net-fs/cifs-utils[ads] ) client? ( net-fs/cifs-utils ) ) selinux? ( sec-policy/selinux-samba )
 REQUIRED_USE=ads? ( ldap ) swat? ( server )
@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://samba/stable/samba-3.6.24.tar.gz
 _eclasses_=eutils	6faef4c127028ccbba3a11400d24ae34	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=caa6427019b14f46c95ae81c29d8314b
+_md5_=c66b1e0b6ea16305b950380d49743eea
--- a/metadata/md5-cache/sys-apps/file-5.21
+++ b/metadata/md5-cache/sys-apps/file-5.21
@ -4,10 +4,10 @@ DESCRIPTION=identify a file's format by scanning binary data for patterns
 EAPI=4
 HOMEPAGE=http://www.darwinsys.com/file/
 IUSE=python static-libs zlib python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
 LICENSE=BSD-2
 RDEPEND=python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) dev-lang/python-exec:2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) zlib? ( >=sys-libs/zlib-1.2.8-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(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20131008-r21 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) python? ( !dev-python/python-magic )
 SLOT=0
 SRC_URI=ftp://ftp.astron.com/pub/file/file-5.21.tar.gz ftp://ftp.gw.com/mirrors/pub/unix/file/file-5.21.tar.gz
 _eclasses_=distutils-r1	14bf2faa8bf611e0b13aeedc24cefa6c	eutils	6faef4c127028ccbba3a11400d24ae34	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	a2dac9ffff107078f25147aac958a68f	python-utils-r1	d5328656d500f65898a5f51634722f61	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=d52872070a54f5dc8cc49daf8af3d1c1
+_md5_=a1955b8791041d2c71904a83872ad6bd
--- a/metadata/md5-cache/sys-kernel/aufs-sources-3.10.63
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-3.10.63
@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
+DESCRIPTION=Full sources including the Gentoo patchset for the 3.10 kernel tree and aufs3 support
+EAPI=5
+HOMEPAGE=http://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
+IUSE=deblob experimental module vanilla symlink build deblob
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 !deblob? ( freedist )
+PDEPEND=>=sys-fs/aufs-util-3.9 !build? ( virtual/dev-manager )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=3.10.63
+SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.10.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.10.N/deblob-3.10 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.10.N/deblob-check -> deblob-check-3.10 ) http://dev.gentoo.org/~jlec/distfiles/aufs-sources-3.10.x_p20141215.tar.xz !vanilla? ( mirror://gentoo/genpatches-3.10-70.base.tar.xz mirror://gentoo/genpatches-3.10-70.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.10-70.experimental.tar.xz ) )
+_eclasses_=eutils	6faef4c127028ccbba3a11400d24ae34	kernel-2	e0363401e3e385deca89bb9a22b528bb	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	d5328656d500f65898a5f51634722f61	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=69d805978a61249d90de02d3c02176b7
--- a/metadata/md5-cache/sys-kernel/aufs-sources-3.14.27
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-3.14.27
@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
+DESCRIPTION=Full sources including the Gentoo patchset for the 3.14 kernel tree and aufs3 support
+EAPI=5
+HOMEPAGE=http://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
+IUSE=deblob experimental module vanilla symlink build deblob
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 !deblob? ( freedist )
+PDEPEND=>=sys-fs/aufs-util-3.9 !build? ( virtual/dev-manager )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=3.14.27
+SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.14.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.14.N/deblob-3.14 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.14.N/deblob-check -> deblob-check-3.14 ) http://dev.gentoo.org/~jlec/distfiles/aufs-sources-3.14.21+_p20141215.tar.xz !vanilla? ( mirror://gentoo/genpatches-3.14-32.base.tar.xz mirror://gentoo/genpatches-3.14-32.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.14-32.experimental.tar.xz ) )
+_eclasses_=eutils	6faef4c127028ccbba3a11400d24ae34	kernel-2	e0363401e3e385deca89bb9a22b528bb	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	d5328656d500f65898a5f51634722f61	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=5b5e927359bd20677b0e0c9988a76f52
--- a/metadata/md5-cache/sys-kernel/aufs-sources-3.17.7
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-3.17.7
@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
+DESCRIPTION=Full sources including the Gentoo patchset for the 3.17 kernel tree and aufs3 support
+EAPI=5
+HOMEPAGE=http://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
+IUSE=deblob experimental module vanilla symlink build deblob
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 !deblob? ( freedist )
+PDEPEND=>=sys-fs/aufs-util-3.9 !build? ( virtual/dev-manager )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=3.17.7
+SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.17.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.17.N/deblob-3.17 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.17.N/deblob-check -> deblob-check-3.17 ) http://dev.gentoo.org/~jlec/distfiles/aufs-sources-3.17_p20141215.tar.xz !vanilla? ( mirror://gentoo/genpatches-3.17-10.base.tar.xz mirror://gentoo/genpatches-3.17-10.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.17-10.experimental.tar.xz ) )
+_eclasses_=eutils	6faef4c127028ccbba3a11400d24ae34	kernel-2	e0363401e3e385deca89bb9a22b528bb	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	d5328656d500f65898a5f51634722f61	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=5a4c4b5352df5e8e225594209faddb5d
--- a/metadata/md5-cache/sys-kernel/aufs-sources-3.18.1
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-3.18.1
@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
+DESCRIPTION=Full sources including the Gentoo patchset for the 3.18 kernel tree and aufs3 support
+EAPI=5
+HOMEPAGE=http://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
+IUSE=deblob experimental module vanilla symlink build deblob
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 !deblob? ( freedist )
+PDEPEND=>=sys-fs/aufs-util-3.9 !build? ( virtual/dev-manager )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=3.18.1
+SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.18.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.18.N/deblob-3.18 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.18.N/deblob-check -> deblob-check-3.18 ) http://dev.gentoo.org/~jlec/distfiles/aufs-sources-3.18_p20141215.tar.xz !vanilla? ( mirror://gentoo/genpatches-3.18-3.base.tar.xz mirror://gentoo/genpatches-3.18-3.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.18-3.experimental.tar.xz ) )
+_eclasses_=eutils	6faef4c127028ccbba3a11400d24ae34	kernel-2	e0363401e3e385deca89bb9a22b528bb	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	d5328656d500f65898a5f51634722f61	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=86892ab9b7ca44bab6d9577c3688db12
--- a/metadata/md5-cache/sys-process/at-3.1.16
+++ b/metadata/md5-cache/sys-process/at-3.1.16
@ -4,10 +4,10 @@ DESCRIPTION=Queues jobs for later execution
 EAPI=5
 HOMEPAGE=http://packages.qa.debian.org/a/at.html
 IUSE=pam selinux
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=virtual/mta virtual/logger selinux? ( sec-policy/selinux-at )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/a/at/at_3.1.16.orig.tar.gz
 _eclasses_=autotools	c118b9a8e93bfef124f2d7a2fe56a95e	eutils	6faef4c127028ccbba3a11400d24ae34	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=a2c01249d4dbdec2f2d01a8b04aafa3b
+_md5_=b7ae9ac99308767bb11f33f5e6a46009
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@ -1 +1 @@
-Tue, 16 Dec 2014 21:07:06 +0000
+Wed, 17 Dec 2014 10:37:04 +0000
--- a/metadata/timestamp
+++ b/metadata/timestamp
@ -1 +1 @@
-Tue Dec 16 21:07:03 UTC 2014
+Wed Dec 17 10:37:01 UTC 2014
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@ -1 +1 @@
-Tue, 16 Dec 2014 21:30:01 +0000
+Wed, 17 Dec 2014 11:00:01 +0000
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@ -1 +1 @@
-1418763901 Tue 16 Dec 2014 09:05:01 PM UTC UTC
+1418812501 Wed 17 Dec 2014 10:35:01 AM UTC UTC
--- a/net-analyzer/aimsniff/aimsniff-0.9d.ebuild
+++ b/net-analyzer/aimsniff/aimsniff-0.9d.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/aimsniff/aimsniff-0.9d.ebuild,v 1.1 2014/12/13 20:58:24 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/aimsniff/aimsniff-0.9d.ebuild,v 1.2 2014/12/16 23:12:55 jer Exp $

 EAPI=5

@ -35,8 +35,6 @@ RDEPEND="

 want_apache2 http

-RESTRICT="mirror"
-
 pkg_setup() {
 	depend.apache_pkg_setup http

--- a/net-analyzer/ettercap/ettercap-0.8.1-r1.ebuild
+++ b/net-analyzer/ettercap/ettercap-0.8.1-r1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ettercap/ettercap-0.8.1-r1.ebuild,v 1.4 2014/11/05 16:20:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ettercap/ettercap-0.8.1-r1.ebuild,v 1.5 2014/12/17 08:58:00 jer Exp $

 EAPI=5

@ -14,7 +14,7 @@ SRC_URI="https://github.com/Ettercap/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"

 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="gtk ipv6 ncurses +plugins"

 RDEPEND="dev-libs/libbsd
--- a/net-analyzer/nagvis/nagvis-1.6.6.ebuild
+++ b/net-analyzer/nagvis/nagvis-1.6.6.ebuild
@ -1,10 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagvis/nagvis-1.6.6.ebuild,v 1.4 2014/08/10 20:58:48 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagvis/nagvis-1.6.6.ebuild,v 1.5 2014/12/16 22:34:42 pacho Exp $

-EAPI=4
+EAPI=5

-inherit eutils confutils depend.php depend.apache
+inherit eutils depend.php depend.apache

 DESCRIPTION="NagVis is a visualization addon for the well known network managment system Nagios"
 HOMEPAGE="http://www.nagvis.org/"
@ -26,7 +26,6 @@ need_php_httpd
 want_apache2

 pkg_setup() {
-	confutils_require_built_with_all dev-lang/php gd nls json session pdo sqlite3 sockets mysql unicode xml
 	depend.apache_pkg_setup
 }

--- a/net-analyzer/nb/Manifest
+++ b/net-analyzer/nb/Manifest
@ -1,3 +1,3 @@
-DIST nodebrain-0.8.16.tar.gz 1709486 SHA256 91e97f44a0fd9b899ad1ae874617f339ec5586e00292eba28f9abed16b4afad1 SHA512 bbc1944ab734754008f0651b72fbcb10da40758ceceaae0f560257399ce2f9f4600d39dc2ce8fc09df11cfc14876b7b4c1f566654285163f2fa8ab369b79806d WHIRLPOOL 3cdd6be80cf44f62e81ad12a567c2d3a232b880a3c5fcc0fd4ceb9b715e1e0ebe14804ec58409bc18d7a825b3b2f718a304e5520b50a14c3e054d000e55dbd92
 DIST nodebrain-0.8.17.tar.gz 2362356 SHA256 5fe3ca1c49e85e3ccb0ec95765dd0b2f234072817f6bfadc0039993cbb9870cc SHA512 0e1daa504f473e36d276d025b856b2ca1aa104f684e3c8fb46239e47103b30eb8e053f7d6e7c9e4726d818e883bec06e29ecca7d6cd58baa07b12c42e67073e3 WHIRLPOOL 511569a0edce9659c979be5e93fa7a21782c026f458e224beb11c24db57c7bdfc8cd1f79f86b564d44bec41228ed2f09f8b3207f296cc7d4d14c4773b5c8e3ea
 DIST nodebrain-0.9.02.tar.gz 2421175 SHA256 986617d66cca72f01c325953a321e34f28cb80ed105d4ab0e8967e0a328fcf85 SHA512 08ed3e1bd8a8d49bca702ca3b8b1dd72ef9a4bb2dc7b495dd049b6927f4353af6599ad5f8c8135cc11f6ffc68355b79f8782ec0527af27248c755aeaceee51e7 WHIRLPOOL 5c72ebe99e6f7c85870516d6ff41bf700ac05375d4c8bae52b61870737374a4555632b5e7a1b11bfb3ae2ac33c2f44984d3feabc192437f95048a03a4901b558
+DIST nodebrain-0.9.03.tar.gz 2485735 SHA256 e9fce23525da8c6b3e553492b724eb2122faf22aed92ed45b15c6018eb643fef SHA512 bf81ef4be1518b72d8ef0cccf42747cfe2926ed6cecfde97c05c161c2f2d00525d07da2e24b1c05debb84fa6f35dca7d7dbbc3292471f41dd322ea80175fb96c WHIRLPOOL 0ae2c4f8085cbc725662ee758768a7684523350ebe59ab6f50f374c6b5d0b55588697f84bb395bf946eaa3546a052f08f4fa067532b42eafcf84a9a84baecd7c
--- a/net-analyzer/nb/metadata.xml
+++ b/net-analyzer/nb/metadata.xml
@ -2,5 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>netmon</herd>
-<longdescription>Nodebrain is a tool to monitor and do event correlation.</longdescription>
 </pkgmetadata>
--- a/net-analyzer/nb/nb-0.9.03.ebuild
+++ b/net-analyzer/nb/nb-0.9.03.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nb/nb-0.8.16.ebuild,v 1.1 2014/05/03 21:30:16 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nb/nb-0.9.03.ebuild,v 1.1 2014/12/17 07:21:06 jer Exp $

 EAPI=5
 inherit autotools eutils
@ -9,17 +9,20 @@ DESCRIPTION="Nodebrain is a tool to monitor and do event correlation"
 HOMEPAGE="http://nodebrain.sourceforge.net/"
 SRC_URI="mirror://sourceforge/nodebrain/nodebrain-${PV}.tar.gz"

-LICENSE="GPL-2 LGPL-2"
+LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="static-libs"

+CDEPEND="dev-libs/libedit"
 DEPEND="
+	${CDEPEND}
 	dev-lang/perl
 	virtual/pkgconfig
 	sys-apps/texinfo
 "
 RDEPEND="
+	${CDEPEND}
 	!sys-boot/netboot
 	!www-apps/nanoblogger
 "
--- a/net-fs/samba/samba-3.6.24.ebuild
+++ b/net-fs/samba/samba-3.6.24.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.6.24.ebuild,v 1.2 2014/11/02 12:33:27 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.6.24.ebuild,v 1.3 2014/12/17 06:22:15 jer Exp $

 EAPI=5

@ -14,7 +14,7 @@ HOMEPAGE="http://www.samba.org/"
 SRC_URI="mirror://samba/stable/${MY_P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
 IUSE="acl addns ads +aio avahi caps +client cluster cups debug dmapi doc examples fam
 	ldap ldb +netapi pam quota +readline selinux +server +smbclient smbsharemodes
 	swat syslog +winbind"
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@ -6587,7 +6587,6 @@ sci-physics/geant:vrml - Enable output of geant4 in vrml formats
 sci-physics/hepmc:cm - Build with cm instead of default mm for length units
 sci-physics/hepmc:gev - Build with GeV instead of default MeV for momentum units
 sci-physics/lammps:lammps-memalign - Enables the use of the posix_memalign() call instead of malloc() when large chunks or memory are allocated by LAMMPS
-sci-physics/lammps:lammps-package-voronoi - Voronoi tesselations
 sci-physics/lammps:package-dipole - point dipole particles
 sci-physics/lammps:package-meam - modified EAM potential
 sci-physics/lammps:package-rigid - rigid bodies
--- a/sci-physics/lammps/metadata.xml
+++ b/sci-physics/lammps/metadata.xml
@ -22,7 +22,6 @@
 		<flag name="package-dipole">point dipole particles</flag>
 		<flag name="package-meam">modified EAM potential</flag>
 		<flag name="package-rigid">rigid bodies</flag>
-		<flag name="lammps-package-voronoi">Voronoi tesselations</flag>
 	</use>
 	<herd>sci-physics</herd>
 	<maintainer>
--- a/sys-apps/file/file-5.21.ebuild
+++ b/sys-apps/file/file-5.21.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/file-5.21.ebuild,v 1.1 2014/12/12 05:43:17 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/file-5.21.ebuild,v 1.2 2014/12/17 06:17:26 jer Exp $

 EAPI="4"
 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} pypy2_0 )
@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz
 		ftp://ftp.gw.com/mirrors/pub/unix/file/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 fi

 DESCRIPTION="identify a file's format by scanning binary data for patterns"
--- a/sys-kernel/aufs-sources/Manifest
+++ b/sys-kernel/aufs-sources/Manifest
@ -1,14 +1,17 @@
 DIST aufs-sources-3.10.x_p20140602.tar.xz 155604 SHA256 2b9e1bc89ec2effdf5c21c887488c2dad4d6acfa2d9a07c6d4c45d3189c0c36c SHA512 7426cb73807f6fce58a6f6c766b4e25f1956c4e2098b23ab7cca09e6db271fb87189d59a8c9e1d7a7d4bdcef6d09883fabf9ff35e9493dfacf9cba9d83de86af WHIRLPOOL 7a9a77b25aa931dce3e7825838171a5d12f4eb478cb35b7e53676a677a3bc44e9b9daa3eb694ff00b03137c5e4a6687488d4eb5aeeeed3b25a51241bd6887019
 DIST aufs-sources-3.10.x_p20141110.tar.xz 159488 SHA256 e7b00f92e4742487bbe61a4da5fe6b6e66209dd2a1d6a800e46e9172aaa5316f SHA512 55e4bda94ae90cf79f561511e5700c0b7e6ede05a1af76a9deec451443f1c53cb8e6cf521c85474b62c7d78f6524b168756ad9aec8e183fbdbc5910c663c4b70 WHIRLPOOL 2eddbccc4f8c20ae3cc14909341723cd63800e67cf437db358a48ed8e31ec284f46ceaa7fc65b322c081000d70699e420372cdcb7b5f4fcffefa152b130f3826
 DIST aufs-sources-3.10.x_p20141208.tar.xz 163480 SHA256 6e23fcface57b4a7af2024d7b1255c64509cfcc1ae4b1928152385e4eaa6eed5 SHA512 a32fe949875b35d1c50defd36e9abc0ecdf2fdfc3801b95fb7ae7c10854403bbbd5400363a4a3592c5f74e23b3ba12b04e94988386644618fce93e527fd77bc9 WHIRLPOOL c4e2a480ae5a6f0b392cf0de374299ef098b9db730a0c62e77ce6761f804c7c253df96f2e072f114d9cfb1a3e946656d120806392bcce97a2def8c19d2a48e60
+DIST aufs-sources-3.10.x_p20141215.tar.xz 163500 SHA256 ce5f073a31d72fdd06f5306fdae55b72c3481e13620ee586edcc6a3077de1cc4 SHA512 423e608fa6c8dcf289857e642bf3bad7e9dc17f8db7077904a99057d974c0e68a4ed9d952e33c7a5ddc6853a82c0d7ceeb70ffd0c1fda33b42f3ae0720d80086 WHIRLPOOL 68b8a3ca87a08118adae725d1a418be89d22b5e92aeb01f40e4f4fc41950fe8db6eb9666619fb731e502f11f1621f5179a84dc74dff044abce4ad3c7364014e3
 DIST aufs-sources-3.12.31+_p20141215.tar.xz 164736 SHA256 1daaa4bfe305532f9a2ea3dede2ec784e306ef609aa53249d30c011f2c4ba62d SHA512 59f2f191b645429ba670cf6cca8b301234e0837372a29123d5820be7089ed85ef20265837210e79bcf5e682821e4e8734147b2189f9644f1d76a358c420efd53 WHIRLPOOL be4fe17f1a4aefc82233caf02a4fe743f6afcd33363f787f9b40917cc5d89b6c6e4daad99728a4cfa1df912178ebceb0088b7119cdf9fcd9a488f546700b72c6
 DIST aufs-sources-3.12.x_p20140602.tar.xz 156880 SHA256 2378a69936373decdc5c29e1c4509cdf32d5c24356ee9d23f5ea8f6defff6754 SHA512 77c4ba60cde1c2cdcf3197aec05d5ed4c1107c8e678c11d00678a694ddc1f606c7c5936ade796bc2cfd5e28b0e1ead35e4ae262be7b1ea8faa19732d20c7dfa5 WHIRLPOOL bfec48f34c6369f946e1ea4bed9eae13d2650a9c2343db05d3d18791ef47dd374760c1f9deff246190072915d82166e07f1530c40859cb37c5060a8b5fb9e203
 DIST aufs-sources-3.12.x_p20141013.tar.xz 160832 SHA256 bdff9e6d2647194ecfbad940a63eb47d710c16d9b0e31b7624556e1117f1bb34 SHA512 5811bd3ba07fde54f9ac2f8365de8a0e436ae7a035905c1327bb6afba3de5e5dcdbf4ceb651bcc5988939106e71198e8493764eebde3595a0aacd6fac81bfb5b WHIRLPOOL 1e061bd1bbd5cef0359b7fbc1dc5d175c730a233d8d60405eda1697d2830d655955a7f05296625183082700c46c5a70d1cbecfd1598b39d35659832fb831ca4f
 DIST aufs-sources-3.14.21+_p20141208.tar.xz 164704 SHA256 40949f552ee6a2a2f0869605416819113d9d4e62b76d0f28b75a6e53e9f2a1b5 SHA512 7a5cd4c7033bf99d60f2418e996a4637926eefbc2241b85299b8615b6d699b76bd1d8fd76300c5dadeea1091619eb25ec73c3a8191970fb70a676bd4e31d68fc WHIRLPOOL 0c273bcb5c48b255fcaf3881011d42af79d1113d792cc73242aeeac2b3876990c18cefd0250194822758dad72687e7f952c080df7fea2b3bca3841957403b5a1
+DIST aufs-sources-3.14.21+_p20141215.tar.xz 164748 SHA256 5930bd53351aaa7edf68ad6ef1dd63c52af94278c55e58e61479934cf4b79986 SHA512 f92f4867e7496c429bb63f6aba4dc8e57d071a96b5709212ccf698c989e28303d945efb23f347788aa5de2c61f31459b80109758e6bd4293339b0bd247c592ec WHIRLPOOL d872078861769ba141191aa1fd3a5b9e51b260f010ae61dc65d486a976e2d456edb3b25dcd7f4a171797fcf2fa4974e05263deef345a60eb7ddcd39d8aa628e0
 DIST aufs-sources-3.14_p20140728.tar.xz 159732 SHA256 711fd6a39c5e11758394c493cac3cce3f30f7c4b381cd4abf61fdc15cc5a86b7 SHA512 4a2e1836f0be4caa1bfa893b3ad69d4f28c42b605fb59916eec4368bbd9f877ed06dfbece80b22b9c57e2ac7fe57391ddf8412c3b6ca21e81e7196b4bed41f48 WHIRLPOOL 9b81331b658d322046262bec3c2324975df4f9b722a35617890abb04b3af5c7f2f1265719ad6ccb3874250d18c96f7b4b0123cedcff23203e5e74d8c10271add
 DIST aufs-sources-3.16_p20141020.tar.xz 160772 SHA256 32a694568e7f9376c88fa330ba31d9b8b6f82402f53aae1ce5464926375b09e8 SHA512 439c80a30d11e2f53d4822e34d30823d21a5eaab99fdd61ffe1af6080d99ccb220c64518c64c4846c302535753d15447863f5f26915e24df8fa8c0ac7ec872d7 WHIRLPOOL f2fe9d2eb30279783932c4718bf68f87b57a26e4b60319a09f62dd49dd29122313312d86dbfea06e0d6cc0da1c3a884bd518f78d8f46eb2e020a252d8b6298f1
 DIST aufs-sources-3.17_p20141110.tar.xz 160804 SHA256 b665d3708f595b52400603e780360e2c77faeabc2edab111cbd7a2d6278cd3e6 SHA512 209b9ca7bb613c33998f4a45da6ac8226044f2c538347be349059b742388ae195beee25ac354194becaaa0eb7b416d299b08e835aaf45457a277ee40d16f3c63 WHIRLPOOL 53fb060d3aeb099fb9993d289cc696d11eec31e0225b999df925c2b3da3fa37cc235fca12088c4b387932d7412cf3ab38e8a7f5519c1aa9c6f23fee54c7abb21
 DIST aufs-sources-3.17_p20141208.tar.xz 164724 SHA256 e9ed077b743e088407ce62d2206853d681707855d89588e550a6911a24e7ee0e SHA512 68cf0e09466053e2ebc175e6443be135d7a91edca25295c7d9d5a56c37281ce37205e89b15a7f508d6684a8d7d3a31cae345a6916892a060a309035efb9bf704 WHIRLPOOL caf2ca9abc58223b774129573e3e67e73b02fd8003890a068729237cd209df83deafa35ac8f69f8cc933cec2f562409f208cf570cc711ea666b0f2adde13a968
+DIST aufs-sources-3.17_p20141215.tar.xz 164844 SHA256 cb5a57fccb3e1db6b2f8d152eaf6b8153f7ce51cfd93904fd745c1e63d1ea559 SHA512 452c48cef283fbfcf5066ef44471330f14b18d3d7b7ff24d9ec39683e14d2f76401a66936640139f02f621a06304d9812629591c3671e2129fd608950e818e6c WHIRLPOOL c05a734bd06dabac6e1d76ecc7fba646ef61a1844e5bc82d4f2ab88c915f039a5b615b933e72f8b4fbac2bb263e908545c3673e3e9b4c7328605711e91b2ff07
 DIST aufs-sources-3.18_p20141215.tar.xz 164824 SHA256 572d099b3097c892e6f7b0478ed53e631253d67e5f77764a5d7395021400b730 SHA512 6865624d3096bcc866f778177016e6fa948502c466d4c628dac98cd1c6b2070415359eb7b391b39484b18a4d22ec70eeb4c6af17793035c9872cd692db6b6633 WHIRLPOOL 9ccfa5248d6cdae0045399df39462e08cf3b3f362c36ec7041b332bb370577807474c1b37d16ed74f6e1e85dd40e8c6dc8374d28cb702ab26b4891578e8bb579
 DIST deblob-3.10 117299 SHA256 d48cad04fab6a802b3a3e34955c8e35b539c2441f9a62522ec5a132c3a5ae684 SHA512 7b30f0f97ed97bf6b096d4a321b4b1e62f4b48f07972f2511870c3eaaf4f3877b0c6af2f30f6b985edf9c9c79267d40448b504c59016acfe06374630d1fdcba9 WHIRLPOOL 03a5963367cc6cb4f87e3d315ab61a8b3cb1fe577b20d7e2fb6ad83464075b3ed8176f543bb4c3b4e607d78cd55ef940f446bb75be09eb7496321930413ce2b9
 DIST deblob-3.12 120320 SHA256 1d767acd3f461bcaa7ebef744dce1ca3eefde1cd41fde4c69a449e2470ab8c0e SHA512 61073cb763e3e0c21a84c0ee888087fbbf37b667ce0efbbc6c2ebc46ccae8460553511e347cf23d3c3603eec64df738ad4552a1b527453c7d795b8f90c4cf678 WHIRLPOOL c64cc566944ac241149a2a517da069185830be5b8ee25168b2b6b942bcf24fe3f2c0fe487b51a5b7e73e2910af2cabd7167cd1497ab7272c865d1eb3e68e4efe
@ -31,6 +34,9 @@ DIST genpatches-3.10-68.extras.tar.xz 17828 SHA256 fcee428cabfa8abcd589adf933b9f
 DIST genpatches-3.10-69.base.tar.xz 1049428 SHA256 afbf4262960396a6f78bf77877e4887597625b8889414e63630b404eec0118d9 SHA512 d2d62806da8eaf101f236b50f0ec32fcb9bbb3da95480d9d440509a19a387694a5acc903362269a693ae71b8591ae272298b6b8151f30d5894e383304b7da1ad WHIRLPOOL 9112a1a8f31ff076bad5f34f40e70359922a84453f111392c0bd17776116454a04550a759490567ca7b158d0654ea47129c094b7c583154dfb931046dcf1a760
 DIST genpatches-3.10-69.experimental.tar.xz 48600 SHA256 4a4cdbed0de93639fda2b7993117ec0b00258c1bc7f731337550ee2aa4180eb4 SHA512 e8e6dd5e5563dfdd89fc921cde2b073a4ea34e13e6c33faae3acbadb009d821830e099e8c077cac400a92d7ee7ba2a6c8126dff656f48391311632ad4683e767 WHIRLPOOL f5fca67318260f91bafea6e29fc61ac8a0bd09165d0e9d62c9249de6195e5e1d2d2230cdd430415087b9e0df949e79db9aed9fcaffa581e390020286bec8480e
 DIST genpatches-3.10-69.extras.tar.xz 17820 SHA256 83cdb1617bace0dcf24b0d09f22a42c32a892b2086bc96c1b61a2fdb663c5ca8 SHA512 c1b028ad1d31da1c28501492f0ad7c641d8709c332985da847ad8521586be965c13ebcf77fe2de105a4190b2ebb0b70863cbbcef9eb5c6fb853da09d1914694f WHIRLPOOL 83f33d4915975d56e1703fcc0d8dbc98de17f403942008296daba20a2774813a9f02c9d37c7cce5e99d9e60fed872dd78df7d8a3c602b5267d6bc5208a372651
+DIST genpatches-3.10-70.base.tar.xz 1052868 SHA256 cff162044a6744a0d773f5cbfdc4f108828f50f8106fd39644044775521b4be9 SHA512 9bd26053d1b808f7eaa1bb2b2ab2f269014edab65dd57c3941e794a78e84f8da5b65047ade595b28e7a72707d77f4401e0fc5468cfe883d1ae1a8bcf17e523b6 WHIRLPOOL f3ff1cba0849f42e455543b7d3fe9ed4294d65845032e92b0365c057952df4f97e60777d7c968a6b2c94f58512917dba338caf956e54dbfad7fdf589647a884e
+DIST genpatches-3.10-70.experimental.tar.xz 48592 SHA256 0b73713c99338ac0187d490533e5f9798f541e92668c95bd9c9ab39017367851 SHA512 257c9adfa4cae488ce4fb018ca2b7ccbaa070a06c6bff56024a37fa07e6c8593a4e622e8984e05c2b0c5c58e4153af77fd34f12b3ec563fc97fc3531635055af WHIRLPOOL fc4e34814dfac5a6d7e1f150ee025bc478ce9d31c55d764955b997512a309583182b477b27a0cabccd7db26fa7d4f17af277fdbfba8b3b94dd1ae17d9040905e
+DIST genpatches-3.10-70.extras.tar.xz 17820 SHA256 565a289eb9858d71d51dec710e20802ad2234b9529d4c9e15c095bece5c59f42 SHA512 5c1c69b530cba6ca27d542b287737c2e906d2b934fd89723f0a3522f8c7bc50a0df63cc871aee2cafcaae5d231cda23aa84ebf6b2198c8f3e145a26fc0d9fd01 WHIRLPOOL d4d453c6cf4acd5ae08ffb4d8e03fbdbf8e7b046af6c7e6a94505ccd1284145fa41581b58236c903fe558f3244bce11013b5e9a66d7fc30f67891b358671c484
 DIST genpatches-3.12-23.base.tar.xz 597588 SHA256 086af7ecd2d6931d66d9022e706ee218ed5c99a226db847fe9178757c60ef678 SHA512 14b1fe4deb3ecc085e5d0cfadb394f4971c0c11d5bd5d872d4dd0c83b1ff1c20828f8fd8836fd1e4a2c0f3288483fd6fc5ea172ebc1f5e1de974bb31b45851be WHIRLPOOL 7d9dd7e5ca313a807c8266bf0335df41c88492c4b4b86cccc02cb3cfe92f33cf701e5c4539f0238c41e092b9e39f3db3603aae9fe8b012f84c59960ac06152e4
 DIST genpatches-3.12-23.experimental.tar.xz 46524 SHA256 5f45d38330f09f1c7ceda80656bc95dd876c3895bd2e05846f0ff684f9a43698 SHA512 a971771ba2b4cca8cfa194d28e6a8545e477f3503cc0cba5ebb226d13367a53043a3a1b39d7aae98535d988c307f286bb1f5ef3f8d87de81ca18c0e2347472ca WHIRLPOOL 2a3557df867362f05062c973bbced1eab6b4c0323701a10faac6ff7d2f4f2be6126f7b19a2acee8212b560d1d497729071e770d7cbcda546cb9757a2c433d822
 DIST genpatches-3.12-23.extras.tar.xz 18208 SHA256 90c72a193a96c276f1dcc4d3183fe4247a7909d28a951aee477e80bef187b2b3 SHA512 ffa04e3e320de74258c068243924213093596be763a9ef221a182a0056ace54ab77268a2987345912fe0e0e69e48a7e7a0c45291982005e3a49a3e6256a5301a WHIRLPOOL dcbb336a79870a204368695b81b339068f932881fb7bc816cffda8d5a3b36101593cb1ae91e23c9225f1ace92900a76417dcfb63fd09b7d61863f6c8dadd6797
@ -46,9 +52,15 @@ DIST genpatches-3.14-18.extras.tar.xz 18244 SHA256 8d4604a2737ecf6d50a150ddd044f
 DIST genpatches-3.14-31.base.tar.xz 705164 SHA256 3deeee4f0d2ea9a0e0e6a7a916846497bd85bfaeada61cf87c9f0cd132590242 SHA512 cc6c4d8ab3b10b31d5d9392596d903e4fb0e3a3574c6a5e14f2326ea33cfb371998436b08b5a352f3a0fabf1beb4e8288bda2169ff6952c4249e3272987ee910 WHIRLPOOL 35621b6856bfe9ee37fbfdb20ef85fd5cdafdf5cf35a5889b441e00589826827b6928d8512a4abc3dbb479d37a6904297422e49b9a1a6c63192e8ecdbd8385e6
 DIST genpatches-3.14-31.experimental.tar.xz 51208 SHA256 7179f92571fd8875258345b7d1de56941d20ea15b8bc82b64fc0a9fd4da891f5 SHA512 78f93d652aa838dac3e8ac6f2b61252153b7a96ee056cc9e1efacf1f100d5ae7f622f052daf50319bd34b828c4081ed1dda63709bc301bd694a2efb623c58249 WHIRLPOOL e4880a8aa0ffe84b80c4073100328357bd6430ee6f86b49b2e174ce117ad75a17c290a7250a5eb766d704a663f78a675daaf1a7052a634d6a6fe7d8b28f47e94
 DIST genpatches-3.14-31.extras.tar.xz 18236 SHA256 eca507723647492bafede4797d797a73aaf44fc4d0e7491570fdb0287b9ca920 SHA512 c26f8fb0a39ae88f40307d2944873816c3bcac1478e17cb34eb6f292f5cae451c1f29fe4110856da831d245ee22f1f3d76d91d4f68252945aa5f8a1c50426427 WHIRLPOOL 14119405ac8e6a85eea7935542913ae29eb40f09b634a6db4326012da625f3edaa01275cd07f17eda6b07765d5402c5e57575d0a8b91a217bf9babba3ade86d1
+DIST genpatches-3.14-32.base.tar.xz 711936 SHA256 1812e388236cbc08f59c4a6266dfd2a4d2444187d966148fd14f3a2f0e20cff7 SHA512 5f0048a825727a858f6b6b5a44531fcbc925f58a04417a5fc8fccfa346a652c59164ba83c5c73146e856ecb7fdb9925df5b62bbd4d85e1f82e3be491304feab6 WHIRLPOOL 2f6ceffc2e76e7c1421008e9015f654502807841309d2351827beef28d0e33710a751709489fa03a93b70542bbec75ac96aaed57d6b71daeaa7b56de85f336fb
+DIST genpatches-3.14-32.experimental.tar.xz 51212 SHA256 2007f6ce3174673e3c16fbe6afed3456522102708a7db7f9cfa1f3e138c7f729 SHA512 5417e71ec9197e9d1478134a17036c51291903165a8a34882e6c374f363260752e9863fc1c6c0ca1f7ba5e0b117d371721ad6e8876379e47a23006004f36a14f WHIRLPOOL 3577647cebb0f4a9375a4afb4e3a53f2fb17bcad7e6caeb20664c655157382bdd2793d6a44c69b34ef56aafbc84ba65dcccda0f751aa01fef4bda71f1238b442
+DIST genpatches-3.14-32.extras.tar.xz 18224 SHA256 2cedb98b61074f64ee2bd9d34df1d4ebb65c917b4d5c325010910b265250398f SHA512 e29c18502a01144ba2fb59b80f7398511787c203cb71ea2faff9c50ae194d3a216736a68510406c4378ea8945745e4e4b6b134df70c7f3dbca1ef4f2b263b0e7 WHIRLPOOL 584b0e0a126fdfa18d67628f05ee315f5cbe1e5be7dc17655a6246f0b6d5325e8f89e17ab4c19afc70acd065a9605ce81ba373b41bf1f6514396f817ac1c5f44
 DIST genpatches-3.16-9.base.tar.xz 296544 SHA256 03e5020fa5fe79a0bd4c7b4daeff240c327017ad81e6a9f2bc36dc1931971aa1 SHA512 f09db7553c2ba629193284efca527a0eefcca37eafa267c48f3f7b62bcb19d58ad072e9a65fc4b02dbe46b4feafc141eb1b60a859385b908f48c7c4f06f5aab4 WHIRLPOOL 6552bc17c2a412c80230780e5a4ba4e343e1a0861d42d1529bfe0b62d77d2b8b1d7cbb8281f40ea0c23043754606e815db2879754220d8fb5acfd1c092a0d616
 DIST genpatches-3.16-9.experimental.tar.xz 160196 SHA256 93d4794f12dbfea19199e9b4ada3465b0292207f3dd95e5adea70c26e7a9d6f1 SHA512 a1de0276fb449cd4599ccf7f7c82b04e01f7440e84dd3c859d8dd7be99e3fa2b425b3e19d3b40690df4df0a6f038207fe2b58fa42dff3f1af1208dd04c03e029 WHIRLPOOL fbd5c2fb5eb926a1059727a567f98e7b6c232a1ce6e71f81cf426a51685252306bf09896a5e6e7aca7c7cd387be6307a8ebee568fe520a27a59e736644d5c982
 DIST genpatches-3.16-9.extras.tar.xz 17668 SHA256 5cbe00bb8172111e21e799db42b4b0205ab486afc6eb3522ae492c0722ec16e1 SHA512 d62825ef81f5c18e48909678403bde31ffc730909873ce4fcf459d16dba74620d50940a9cf5b4ec78b81b8f2102539a2bee62198066468ae299c3cccb21a0eb3 WHIRLPOOL 0b8205fd9deb9db14ea9edc2f04b12189a1544dfbfe86a4bba7ab4542b4a565a2b5b188caa866a6c5627f2f6d083e71e85293d1f17977b81fdcd2db7a0af7350
+DIST genpatches-3.17-10.base.tar.xz 267104 SHA256 13aac5abe12473ee7da706c290683d9c1422d240aad5f12ac72eadc9d58ef3a7 SHA512 62218374c929f56085b1481f6726fd3b196e4f0fcf2a7ddcd48cffb2d919850cfe05514d786c31c30dbf9dce2ec590a55b09a4dc731f411dd8498d384b5b974b WHIRLPOOL 006fa4dd94aa155403c6f4e85b2cef5034fbd929bdf4c52ab64a712de93ab25a0ac0ad08bde51b5a21de834f37f016a0db0f1c598af455ed5db1364ff23d1498
+DIST genpatches-3.17-10.experimental.tar.xz 59948 SHA256 ffb533554c635199ac0a5460be9a6d2279ac62eaa6cd7889d6378911d2a36373 SHA512 b3fbb7bea9a2ab0802ca45f3147573c7329ffea86905479de1760ef973a8e5255d1f1968861b1d1592834187661fe1c36fc93da34fc255723e474d68f35f8d3f WHIRLPOOL ff3fd2efea5c449eb800d749daeedf2ea6c4a70d5b4f90ca18a2087b606e1ac16ecb87ba0ae9871b249b42be69433d3a24578713d606a5a32e08d193bd943cc6
+DIST genpatches-3.17-10.extras.tar.xz 16160 SHA256 d06aaaf8c3b6dcb5b26e98c10ef74298deb54b4eb568b7f166f1f74657ca9eab SHA512 0eaf570c95b0fff7ce06094e301bc2cd672e30717c5767330b4daf5a69f4c5243c82f5811ef3fdf739c4d737fb05c5053b9d6719ba4bdad7d941060992b88782 WHIRLPOOL 6a52af804ceea17d6e0706469287197ae29ea072031f7af9db96c223e3aea6951e1ba43e0d1de7176825b8b70583db1b0543718190a6315077d3e1fab2188968
 DIST genpatches-3.17-7.base.tar.xz 224836 SHA256 2c09c6ca8ed5df1f3e575f6fee9d5f2242608b24d980cdcb1ff576babaee676c SHA512 096a14ed9ba0a7b0cdc8bfc3e9d9df71bdb833c9df065d8ffed822519e77707d3db6bbeb60ba42406fadde5550a9c3181cdbb9e074cf6b28e09d2acdf5aad9c7 WHIRLPOOL a544e7b7be6d0ed73f3060ec77185d14e1d5e9e83805069818d25ee4b72267960f2e32fa6977dc1f2a11d0fba11cc28a828a9be576310d72c86c987b3235b8fc
 DIST genpatches-3.17-7.experimental.tar.xz 59940 SHA256 7c04ee99ad0aadce7e805bcbf3de3c45959428d3f4fff8c1028742f0d21a0f9c SHA512 7d4f124509c54413fefe6721ef147719da357425c9db0ce8f7ab5d8ca578f3955209e65d56e1447700923aa8ecd4c0563ee7ad899234f45bc1dc979bf61e6542 WHIRLPOOL 991b6b814652415080187c88a10b90ca8a7f46f28973b4ec3f465f8ce2def4264379fc980e0acbf08703c74d9c6134bc74921e9b961460d115e15e7807cb69dc
 DIST genpatches-3.17-7.extras.tar.xz 16156 SHA256 8c9e038c024cab108e1ea47692c5cd3538f57b69f9283a2c0c4219c49029271e SHA512 8c39b655704bea500252f08a555a07af7cfc21554f672accbe62fa46206deb25741f6f1878c31903beca20ba0d9cffe376a6ef127d0c321e99b654061ab9b446 WHIRLPOOL 25ea268ca91815b161927a68e4eda5762219b928f3bad903b3215a0156f460e06322eaca8a5e5ff8607a594d9bd5e3f06eb111bd4336493bf32d84b42fd76ef1
@ -58,6 +70,9 @@ DIST genpatches-3.17-9.extras.tar.xz 16160 SHA256 d23f013006f2aeecb92a1997c99125
 DIST genpatches-3.18-2.base.tar.xz 3472 SHA256 438312e5ce41f24af0828754fe8871e38f4c86592b3d2889d6c0685213763ae9 SHA512 f68a97af22768b8b08d2bf43f38ec667b23437d92f5c4a986f73a60faa749dc74ed9bea57ab3701f764f0b9280b370235d7ef61e93328f2a836ba5eda64a7149 WHIRLPOOL f7e4f882b65312e0a6cf4f5adf03cbbfc764d9ff8130ea3db21153cfc8f131196f67be41c437cbf7c3ca4a5f483e206a8e2294884197625930f50b21063dbf0e
 DIST genpatches-3.18-2.experimental.tar.xz 59956 SHA256 c12b9552384d06ebefd67c7b47b810022d2c2da7901c9d60914c2921450bf719 SHA512 20b7aca42216fa9293b51771148814177fe261ce232711cfe386f3f2dcc00a53a35f95d19f251aa0f740c16aa84fb2b75ab28cddde479d01d4d1a2d8cf36ae53 WHIRLPOOL 83dbb297e1073a1e168e5cf75291c63127aeb8c410a0f2e3e86779daeb9bbe4b17256c82886196062317913b2042a9e8abdea4b96da4316bc1c1d8859e3a8895
 DIST genpatches-3.18-2.extras.tar.xz 16168 SHA256 f216aba794a22809cb56cf8b67b8b443c04e5b7013a4365a7030a661dd969695 SHA512 af7d3ca8a15334fe9a8eb21648e11e07e6e42ddd37237130c1e9824532fabb46b35ef99d524c616015c8ffff76fd38c14fbffa0047f3e4ab3ab32b1bdcbe303b WHIRLPOOL ebe0a683ead509a6f68d2a6c16d3d266fe36252187e6aac0c5d0cf0abe7bd3b7c8daa7af0b38e73ceab0e8b8613a3491cc12dee8378fcbb48f2d9d542d6965c6
+DIST genpatches-3.18-3.base.tar.xz 14588 SHA256 034d42636eb163e9c629911bc0e6b346d70b1785c3b532aafb7839c2b3b2ea32 SHA512 e075f14ea7c7120b73029dc258d9f773dd9ef3ec794dccf320903b3b3e78e8357760918ac1bff9c05f81e4ddd8059ec5264a452e931dd6e388692a3e66fcdf48 WHIRLPOOL 09384ce24f0e0fe71ac36aada73af8746fedf4f44ff017e30210ea6b25b40932b3b26282ee78efbaa9939cea74a179a1fd3355e393f177bd7546676bbb4d6b4d
+DIST genpatches-3.18-3.experimental.tar.xz 59948 SHA256 5b716acd15db6b8f957fbc1e8fa874a1cc5eebe873ef8541c4a368251f2ca4d1 SHA512 d61307140b02be813de55a73aebd4717d90bfaa7b84d83ecd0103a6d25a00fd65b65c08e6cedfba1aa97c601ac5d71cd0be40c1b58cfeff34813704e2e02a731 WHIRLPOOL 6cbd4b0434b4413e1fe78847363d23a6e428b86480ddea195f109ecc46d031503da0c8f36f2b24df121b1aebf63eb121db6fc78a48b07b87fdb6fc71230138be
+DIST genpatches-3.18-3.extras.tar.xz 16164 SHA256 9986d209259d11d20f0ddb7856936a70c9b200f5ba0e5fd715b119fb34f4a546 SHA512 a9fb064169dde5187a73dd1d167c7cebfaa53bf3299ee85996a2d53dd8e1d6d38a428e3e31c2984676f6c4a23a54e2aefe68466a90a8610d5d29b18b2aade948 WHIRLPOOL 2063316ccc954cecd028f10025974db0038e473717113ddb77177a0fde055659b4988ecde858621fd8bf4eefabdf54d4a8540b98c10fb123e602e521cc2cb6f8
 DIST linux-3.10.tar.xz 73175088 SHA256 df27fa92d27a9c410bfe6c4a89f141638500d7eadcca5cce578954efc2ad3544 SHA512 5fb109fcbd59bf3dffc911b853894f0a84afa75151368f783a1252c5ff60c7a1504de216c0012be446df983e2dea400ad8eeed3ce04f24dc61d0ef76c174dc35 WHIRLPOOL e7c0ccc2231e430b831218fc66f1940d095d2d5447d391329c6a7373d4a1d16708f64778b32e4847802ee2dae4fcf7cb67a1238fd4eb204fd0c4bce2d8134053
 DIST linux-3.12.tar.xz 76384600 SHA256 2e120ec7fde19fa51dc6b6cc11c81860a0775defcad5a5bf910ed9a50e845a02 SHA512 4ba5797e0772726d05c9f2eee66dc6dc2a5033c749ef44764c805a83da739ed5d0c6443b76785e38fe1ef74cc7ade787e48144faed0cfcb6f124f05248c700ff WHIRLPOOL a40195f6b53ba3440cf90a44495f6a59670f750851d1518e2bdfe3b949f0e898d1df5d37e271c31c555087026ddb6cc2c9109b22b9639e3222735e6f650a1417
 DIST linux-3.14.tar.xz 78399152 SHA256 61558aa490855f42b6340d1a1596be47454909629327c49a5e4e10268065dffa SHA512 5730d83a7a81134c1e77c0bf89e42dee4f8251ad56c1ac2be20c59e26fdfaa7bea55f277e7af156b637f22e1584914a46089af85039177cb43485089c74ac26e WHIRLPOOL 5ad07b78c362ba0b21c50b4abb99407cae06bd08576f3fd8f36047b01409eba096263208020da3dcad4977eefc61d66502276754097bc127635df1d7a5817d41
--- a/sys-kernel/aufs-sources/aufs-sources-3.10.63.ebuild
+++ b/sys-kernel/aufs-sources/aufs-sources-3.10.63.ebuild
@ -0,0 +1,85 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/aufs-sources/aufs-sources-3.10.63.ebuild,v 1.1 2014/12/17 08:34:22 jlec Exp $
+
+EAPI=5
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="70"
+K_DEBLOB_AVAILABLE="1"
+UNIPATCH_STRICTORDER=1
+inherit kernel-2 eutils readme.gentoo
+detect_version
+detect_arch
+
+AUFS_VERSION=3.10.x_p20141215
+AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
+# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs3-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
+AUFS_URI="http://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
+
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
+IUSE="deblob experimental module vanilla"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree and aufs3 support"
+SRC_URI="
+	${KERNEL_URI}
+	${ARCH_URI}
+	${AUFS_URI}
+	!vanilla? ( ${GENPATCHES_URI} )
+	"
+
+PDEPEND=">=sys-fs/aufs-util-3.9"
+
+README_GENTOO_SUFFIX="-r1"
+
+src_unpack() {
+	if use vanilla; then
+		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
+		ewarn "You are using USE=vanilla"
+		ewarn "This will drop all support from the gentoo kernel security team"
+	fi
+
+	UNIPATCH_LIST="
+		"${WORKDIR}"/aufs3-kbuild.patch
+		"${WORKDIR}"/aufs3-base.patch
+		"${WORKDIR}"/aufs3-mmap.patch"
+
+	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs3-standalone.patch"
+
+	unpack ${AUFS_TARBALL}
+
+	einfo "Using aufs3 version: ${AUFS_VERSION}"
+
+	kernel-2_src_unpack
+}
+
+src_prepare() {
+	if ! use module; then
+		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
+	fi
+	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
+	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
+}
+
+src_install() {
+	kernel-2_src_install
+	dodoc "${WORKDIR}"/{aufs3-loopback,vfs-ino,tmpfs-idr}.patch
+	docompress -x /usr/share/doc/${PF}/{aufs3-loopback,vfs-ino,tmpfs-idr}.patch
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+	has_version sys-fs/aufs-util || \
+		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
+
+	readme.gentoo_pkg_postinst
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
--- a/sys-kernel/aufs-sources/aufs-sources-3.14.27.ebuild
+++ b/sys-kernel/aufs-sources/aufs-sources-3.14.27.ebuild
@ -0,0 +1,85 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/aufs-sources/aufs-sources-3.14.27.ebuild,v 1.1 2014/12/17 08:34:22 jlec Exp $
+
+EAPI=5
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="32"
+K_DEBLOB_AVAILABLE="1"
+UNIPATCH_STRICTORDER=1
+inherit kernel-2 eutils readme.gentoo
+detect_version
+detect_arch
+
+AUFS_VERSION=3.14.21+_p20141215
+AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
+# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs3-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
+AUFS_URI="http://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
+
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
+IUSE="deblob experimental module vanilla"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree and aufs3 support"
+SRC_URI="
+	${KERNEL_URI}
+	${ARCH_URI}
+	${AUFS_URI}
+	!vanilla? ( ${GENPATCHES_URI} )
+	"
+
+PDEPEND=">=sys-fs/aufs-util-3.9"
+
+README_GENTOO_SUFFIX="-r1"
+
+src_unpack() {
+	if use vanilla; then
+		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
+		ewarn "You are using USE=vanilla"
+		ewarn "This will drop all support from the gentoo kernel security team"
+	fi
+
+	UNIPATCH_LIST="
+		"${WORKDIR}"/aufs3-kbuild.patch
+		"${WORKDIR}"/aufs3-base.patch
+		"${WORKDIR}"/aufs3-mmap.patch"
+
+	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs3-standalone.patch"
+
+	unpack ${AUFS_TARBALL}
+
+	einfo "Using aufs3 version: ${AUFS_VERSION}"
+
+	kernel-2_src_unpack
+}
+
+src_prepare() {
+	if ! use module; then
+		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
+	fi
+	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
+	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
+}
+
+src_install() {
+	kernel-2_src_install
+	dodoc "${WORKDIR}"/{aufs3-loopback,vfs-ino,tmpfs-idr}.patch
+	docompress -x /usr/share/doc/${PF}/{aufs3-loopback,vfs-ino,tmpfs-idr}.patch
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+	has_version sys-fs/aufs-util || \
+		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
+
+	readme.gentoo_pkg_postinst
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
--- a/sys-kernel/aufs-sources/aufs-sources-3.17.7.ebuild
+++ b/sys-kernel/aufs-sources/aufs-sources-3.17.7.ebuild
@ -0,0 +1,85 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/aufs-sources/aufs-sources-3.17.7.ebuild,v 1.1 2014/12/17 08:34:22 jlec Exp $
+
+EAPI=5
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="10"
+K_DEBLOB_AVAILABLE="1"
+UNIPATCH_STRICTORDER=1
+inherit kernel-2 eutils readme.gentoo
+detect_version
+detect_arch
+
+AUFS_VERSION=3.17_p20141215
+AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
+# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs3-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
+AUFS_URI="http://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
+
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
+IUSE="deblob experimental module vanilla"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree and aufs3 support"
+SRC_URI="
+	${KERNEL_URI}
+	${ARCH_URI}
+	${AUFS_URI}
+	!vanilla? ( ${GENPATCHES_URI} )
+	"
+
+PDEPEND=">=sys-fs/aufs-util-3.9"
+
+README_GENTOO_SUFFIX="-r1"
+
+src_unpack() {
+	if use vanilla; then
+		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
+		ewarn "You are using USE=vanilla"
+		ewarn "This will drop all support from the gentoo kernel security team"
+	fi
+
+	UNIPATCH_LIST="
+		"${WORKDIR}"/aufs3-kbuild.patch
+		"${WORKDIR}"/aufs3-base.patch
+		"${WORKDIR}"/aufs3-mmap.patch"
+
+	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs3-standalone.patch"
+
+	unpack ${AUFS_TARBALL}
+
+	einfo "Using aufs3 version: ${AUFS_VERSION}"
+
+	kernel-2_src_unpack
+}
+
+src_prepare() {
+	if ! use module; then
+		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
+	fi
+	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
+	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
+}
+
+src_install() {
+	kernel-2_src_install
+	dodoc "${WORKDIR}"/{aufs3-loopback,vfs-ino,tmpfs-idr}.patch
+	docompress -x /usr/share/doc/${PF}/{aufs3-loopback,vfs-ino,tmpfs-idr}.patch
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+	has_version sys-fs/aufs-util || \
+		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
+
+	readme.gentoo_pkg_postinst
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
--- a/sys-kernel/aufs-sources/aufs-sources-3.18.1.ebuild
+++ b/sys-kernel/aufs-sources/aufs-sources-3.18.1.ebuild
@ -0,0 +1,85 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/aufs-sources/aufs-sources-3.18.1.ebuild,v 1.1 2014/12/17 08:34:22 jlec Exp $
+
+EAPI=5
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="3"
+K_DEBLOB_AVAILABLE="1"
+UNIPATCH_STRICTORDER=1
+inherit kernel-2 eutils readme.gentoo
+detect_version
+detect_arch
+
+AUFS_VERSION=3.18_p20141215
+AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
+# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs3-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
+AUFS_URI="http://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
+
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
+IUSE="deblob experimental module vanilla"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree and aufs3 support"
+SRC_URI="
+	${KERNEL_URI}
+	${ARCH_URI}
+	${AUFS_URI}
+	!vanilla? ( ${GENPATCHES_URI} )
+	"
+
+PDEPEND=">=sys-fs/aufs-util-3.9"
+
+README_GENTOO_SUFFIX="-r1"
+
+src_unpack() {
+	if use vanilla; then
+		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
+		ewarn "You are using USE=vanilla"
+		ewarn "This will drop all support from the gentoo kernel security team"
+	fi
+
+	UNIPATCH_LIST="
+		"${WORKDIR}"/aufs3-kbuild.patch
+		"${WORKDIR}"/aufs3-base.patch
+		"${WORKDIR}"/aufs3-mmap.patch"
+
+	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs3-standalone.patch"
+
+	unpack ${AUFS_TARBALL}
+
+	einfo "Using aufs3 version: ${AUFS_VERSION}"
+
+	kernel-2_src_unpack
+}
+
+src_prepare() {
+	if ! use module; then
+		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
+	fi
+	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
+	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
+}
+
+src_install() {
+	kernel-2_src_install
+	dodoc "${WORKDIR}"/{aufs3-loopback,vfs-ino,tmpfs-idr}.patch
+	docompress -x /usr/share/doc/${PF}/{aufs3-loopback,vfs-ino,tmpfs-idr}.patch
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+	has_version sys-fs/aufs-util || \
+		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
+
+	readme.gentoo_pkg_postinst
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
--- a/sys-process/at/at-3.1.16.ebuild
+++ b/sys-process/at/at-3.1.16.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/at/at-3.1.16.ebuild,v 1.2 2014/11/02 10:19:19 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/at/at-3.1.16.ebuild,v 1.3 2014/12/17 06:27:04 jer Exp $

 EAPI=5

@ -12,7 +12,7 @@ SRC_URI="mirror://debian/pool/main/a/at/${PN}_${PV}.orig.tar.gz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="pam selinux"

 DEPEND="virtual/mta
				`@ -0,0 +1 @@`
				`DIST aws-0.11.tar.gz 89165 SHA256 496dafa5f847a4401d8ec34c45e11e77ee558ea9dc09caef2680f7c2c8c907a7 SHA512 df0513d88f64ec9c604197838a55ebc3d716a393e9d3b5bb67f6f5debc3e7419c10db22a35ab070b9e4c0ca3c10c9b259d4a24da7bc67284ce9bf4414044827b WHIRLPOOL 78dc9bd0435ca17f4d70204872158b2b26bc4a7a9326eb6440f96395d0dc0d5d727c8d7a4db77658f1d3cdd0d76db94eba545818f9425a34dbeee179832fc6e5`