Merge remote-tracking branch 'gnunet/master'

47 files changed, 3657 insertions, 237 deletions

diff --git a/app-emacs/company-mode/Manifest b/app-emacs/company-mode/Manifest
new file mode 100644
index 0000000..f3220a8
--- /dev/null
+++ b/app-emacs/company-mode/Manifest
@@ -0,0 +1,3 @@
+DIST company-mode-0.6.14.tar.gz 51776 SHA256 5472cd634bf09da4557f055d3615afdd5436f814f63923ad94ccbebe60ab5e08 SHA512 7b8c0b70dc9c010214e8671fd7393faa9d1dd0839f41d532eb93eda91c77b4c93f2145ad2d688011976bfbb45282f35b937f195499f29cda79147ec2815e94d9 WHIRLPOOL 1aeefc6e4a5d7e3696150c38187131811c88fd3e9478a401400a31a7f7f7e3aad42736cabb093398470f9b20041639143665bb9d7335e2ae40ccfab8d2ab91ce
+DIST company-mode-0.7.tar.gz 54670 SHA256 73d55d9288537800c23f5e9e5b6208dd5e36e29271dca1a6c3840ca20142a268 SHA512 375c8541a0c5b34fba37ea136c8549e6ec916c238bee8115f036d88f273d6bcb0c0f436a6193d3b4be6528945d8f85c605de8d340e903a9764f5ace664f8cf61 WHIRLPOOL 23e18a37be0a2c1f4c7ded455557a5503c8f25b910ce5c0f36d8b09a22bd4aa96a944b0363750fce6b111dc3854c896f1800ac4dad20f99c76d7e0c9829e6014
+DIST company-mode-0.9.7.tar.gz 84652 SHA256 4b1368a7660a35f3316490d8fad716a7adb8b99f4ccc45916a1d62e1d0d8d4a5 SHA512 18d5319a7a4509972c4734a7a703b3afae0ba11663eacddff9d998629d293231b3ad07e0be42b276ec2ac7cc4aaa75116b441b298493d61a5e0dee347062fd2a WHIRLPOOL 2e0d825193db62c76e0daff3e5f8ac18cf25cf958a5368ec779aac91dfb4e8086ce8e1d5d8de49c8261e59209804190832e4414306dbd2a1eef795b5911a4b37
diff --git a/app-emacs/company-mode/company-mode-0.6.14.ebuild b/app-emacs/company-mode/company-mode-0.6.14.ebuild
new file mode 100644
index 0000000..7b2e223
--- /dev/null
+++ b/app-emacs/company-mode/company-mode-0.6.14.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp
+
+DESCRIPTION="In-buffer completion front-end"
+HOMEPAGE="https://company-mode.github.com/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ropemacs"
+RESTRICT="test"
+
+# Note: company-mode supports many backends, and we refrain from including
+# them all in RDEPEND. Only depend on things that are needed at build time.
+DEPEND="ropemacs? ( app-emacs/pymacs )"
+RDEPEND="${DEPEND}
+        ropemacs? ( dev-python/ropemacs )"
+
+SITEFILE="50${PN}-gentoo.el"
+DOCS="README.md NEWS.md"
+
+src_prepare() {
+        # Disable backends that require extra dependencies, unless they are
+        # selected by the respective USE flag
+
+        elog "Removing pysmell backend"
+        rm company-pysmell.el || die
+
+        if ! use ropemacs; then
+                elog "Removing ropemacs backend, as requested by USE=-ropemacs"
+                rm company-ropemacs.el || die
+        fi
+}
diff --git a/app-emacs/company-mode/company-mode-0.7.ebuild b/app-emacs/company-mode/company-mode-0.7.ebuild
new file mode 100644
index 0000000..7b2e223
--- /dev/null
+++ b/app-emacs/company-mode/company-mode-0.7.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp
+
+DESCRIPTION="In-buffer completion front-end"
+HOMEPAGE="https://company-mode.github.com/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ropemacs"
+RESTRICT="test"
+
+# Note: company-mode supports many backends, and we refrain from including
+# them all in RDEPEND. Only depend on things that are needed at build time.
+DEPEND="ropemacs? ( app-emacs/pymacs )"
+RDEPEND="${DEPEND}
+        ropemacs? ( dev-python/ropemacs )"
+
+SITEFILE="50${PN}-gentoo.el"
+DOCS="README.md NEWS.md"
+
+src_prepare() {
+        # Disable backends that require extra dependencies, unless they are
+        # selected by the respective USE flag
+
+        elog "Removing pysmell backend"
+        rm company-pysmell.el || die
+
+        if ! use ropemacs; then
+                elog "Removing ropemacs backend, as requested by USE=-ropemacs"
+                rm company-ropemacs.el || die
+        fi
+}
diff --git a/app-emacs/company-mode/company-mode-0.9.7.ebuild b/app-emacs/company-mode/company-mode-0.9.7.ebuild
new file mode 100644
index 0000000..5ab5f81
--- /dev/null
+++ b/app-emacs/company-mode/company-mode-0.9.7.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp
+
+DESCRIPTION="In-buffer completion front-end"
+HOMEPAGE="https://company-mode.github.com/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="test"
+
+SITEFILE="50${PN}-gentoo.el"
+DOCS="README.md NEWS.md"
diff --git a/app-emacs/company-mode/files/50company-mode-gentoo.el b/app-emacs/company-mode/files/50company-mode-gentoo.el
new file mode 100644
index 0000000..cd85457
--- /dev/null
+++ b/app-emacs/company-mode/files/50company-mode-gentoo.el
@@ -0,0 +1,2 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'company-mode "company" nil t)
diff --git a/app-emacs/company-mode/metadata.xml b/app-emacs/company-mode/metadata.xml
new file mode 100644
index 0000000..166418c
--- /dev/null
+++ b/app-emacs/company-mode/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+  <email>gnu-emacs@gentoo.org</email>
+  <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+<use>
+  <flag name="ropemacs">Install backend for
+    <pkg>dev-python/ropemacs</pkg></flag>
+</use>
+<upstream>
+  <remote-id type="github">company-mode/company-mode</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/app-emacs/parinfer/parinfer-9999.ebuild b/app-emacs/parinfer/parinfer-9999.ebuild
new file mode 100644
index 0000000..21b219b
--- /dev/null
+++ b/app-emacs/parinfer/parinfer-9999.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp git-r3
+
+DESCRIPTION="Simpler Lisp editing"
+HOMEPAGE="https://github.com/DogLooksGood/parinfer-mode"
+
+EGIT_REPO_URI="https://github.com/DogLooksGood/parinfer-mode"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DOCS="README.md NEWS.md"
+
+pkg_postinst() {
+        elisp-site-regen
+}
+
+pkg_postrm() {
+        elisp-site-regen
+}
diff --git a/app-text/lowdown/Manifest b/app-text/lowdown/Manifest
new file mode 100644
index 0000000..6f88d4b
--- /dev/null
+++ b/app-text/lowdown/Manifest
@@ -0,0 +1 @@
+DIST lowdown-0.4.1.tar.gz 113713 SHA256 f822ae765b95426b6285a55d4ff032f6dcab4486a3357ab74f3d0604334371a0 SHA512 cabd879c474831c4846cb99f947dbe3ee58b8baa984955ccc04d36dc7b39a9e9f97a488464c501c9aa0bdeb26984c6341b34f1c25ed20392f15ef015a6a2da0a WHIRLPOOL 6473ae9731981ab2be251512f7c3137332ee1e55ec9c8d2363e6b7cbfe94baf6344b0b796c9c92a9c0c37f4bd8bb5b39b0210f2fee3974647812317aa21d8a75
diff --git a/app-text/lowdown/lowdown-0.4.1.ebuild b/app-text/lowdown/lowdown-0.4.1.ebuild
new file mode 100644
index 0000000..9a1c88f
--- /dev/null
+++ b/app-text/lowdown/lowdown-0.4.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 2018 ng0 <ng0@n0.is>
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit versionator toolchain-funcs
+MY_P="VERSION_"$(replace_all_version_separators "_")
+
+DESCRIPTION="simple markdown translator"
+
+HOMEPAGE="https://github.com/kristapsdz/lowdown"
+SRC_URI="https://github.com/kristapsdz/${PN}/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
+S=${WORKDIR}/${PN}-${MY_P}
+LICENSE="ISC" # Actually OpenBSD.
+SLOT="0"
+KEYWORDS="~*"
+IUSE=""
+DEPEND="sci-libs/openlibm"
+RDEPEND=""
+
+src_prepare(){
+        eapply_user
+}
+
+src_configure(){
+        ./configure PREFIX="${EPREFIX}/usr" MANDIR="${EPREFIX}/usr/share/man"
+        touch "Makefile.configure"
+}
+
+src_compile(){
+        emake
+}
diff --git a/app-text/ssg3/files/ssg3 b/app-text/ssg3/files/ssg3
new file mode 100644
index 0000000..ed7d43d
--- /dev/null
+++ b/app-text/ssg3/files/ssg3
@@ -0,0 +1,261 @@
+#!/bin/sh
+#
+# https://www.romanzolotarev.com/bin/ssg3
+# Copyright 2018 Roman Zolotarev <hi@romanzolotarev.com>
+#
+# Permission to use, copy, modify, and/or distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+#
+set -e
+
+main() {
+        test -n "$1" || usage
+        test -n "$2" || usage
+        test -n "$3" || usage
+        test -n "$4" || usage
+        test -d "$1" || no_dir "$1"
+        test -d "$2" || no_dir "$2"
+
+        src=$(readlink -f "$1")
+        dst=$(readlink -f "$2")
+
+
+        # files
+
+        title="$3"
+
+        head=$(
+        wrap_file "$src/_rss.html"
+        wrap_file "$src/_styles.css" '<style>' '</style>'
+        wrap_file "$src/_scripts.js" '<script>' '</script>'
+        )
+        header=$(wrap_file "$src/_header.html")
+        footer=$(wrap_file "$src/_footer.html")
+
+        list_dirs "$src" |
+        (cd "$src" && cpio -pdu "$dst")
+
+        fs=$(
+        if test -f "$dst/.files"
+        then list_affected_files "$src" "$dst/.files"
+        else list_files "$1"
+        fi
+        )
+
+        if test -n "$fs"
+        then
+                echo "$fs" | tee "$dst/.files"
+
+                if echo "$fs" | grep -q '\.md$'
+                then test -x "$(which lowdown)" || exit 3
+                fi
+                echo "$fs" | grep '\.md$' |
+                render_md_files "$src" "$dst" \
+                "$title" "$head" "$header" "$footer"
+
+                echo "$fs" | grep '\.html$' |
+                render_html_files "$src" "$dst" \
+                "$title" "$head" "$header" "$footer"
+
+                echo "$fs" | grep -Ev '\.md$|\.html$' |
+                (cd "$src" && cpio -pu "$dst")
+        fi
+
+        printf '[ssg] ' >&2
+        print_status 'file,' 'files,' "$fs" >&2
+
+
+        # sitemap
+
+        base_url="$4"
+        date=$(date +%Y-%m-%d)
+        urls=$(list_pages "$src")
+
+        if test -n "$urls"
+        then
+                echo "$urls" |
+                render_urls "$base_url" "$date" |
+                render_sitemap > "$dst/sitemap.xml"
+        fi
+
+        print_status 'url' 'urls' "$urls" >&2
+        echo >&2
+}
+
+
+wrap_file() {
+        if test -f "$1"
+        then echo "$2$(cat "$1")$3"
+        fi
+}
+
+
+print_status() {
+        if test -n "$3"
+        then echo "$3" | line_counter "$1" "$2"
+        else printf 'no %s ' "$2"
+        fi
+}
+
+
+line_counter() {
+        wc -l |
+        awk '{printf $1" "}($1=="1"){printf "'"$1"' "}($1>"1"){printf "'"$2"' "}'
+}
+
+
+usage() {
+        echo "usage: ${0##*/} src dst title base_url" >&2
+        exit 1
+}
+
+
+no_dir() {
+        echo "${0##*/}: $1: No such directory" >&2
+        exit 2
+}
+
+
+list_dirs() {
+        cd "$1" &&
+        find . -type d \
+        ! -name '.' ! -path '*/.*' ! -path '*/CVS/*' ! -path '*/_*'
+}
+
+
+list_files() {
+        cd "$1" &&
+        find . -type f \
+        ! -name '.' ! -path '*/.*' ! -path '*/CVS/*' ! -path '*/_*'
+}
+
+
+list_dependant_files () {
+        cd "$1" &&
+        find . -type f \
+        ! -name '.' ! -path '*/.*' ! -path '*/CVS/*' ! -path '*/_*' \
+        \( -name '*.html' -o -name '*.md' -o -name '*.css' -o -name '*.js' \)
+}
+
+
+list_newer_files() {
+        cd "$1" &&
+        find . -type f \
+        ! -name '.' ! -path '*/.*' ! -path '*/CVS/*' \
+        -newer "$2"
+}
+
+
+has_partials() {
+        grep -qE '^./_.*\.html$|^./_.*\.js$|^./_.*\.css$'
+}
+
+
+list_affected_files() {
+        fs=$(list_newer_files "$1" "$2")
+
+        if echo "$fs" | has_partials
+        then list_dependant_files "$1"
+        else echo "$fs"
+        fi
+}
+
+
+render_html_files() {
+        while read -r f
+        do render_html_file "$1" "$3" "$4" "$5" "$6" < "$1/$f" > "$2/$f"
+        done
+}
+
+
+render_md_files() {
+        while read -r f
+        do
+                lowdown \
+                -D html-skiphtml \
+                -D smarty \
+                -d metadata \
+                -d autolink < "$1/$f" |
+                render_html_file "$1" "$3" "$4" "$5" "$6" \
+                > "$2/${f%\.md}.html"
+        done
+}
+
+
+render_html_file() {
+        body=$(cat)
+        src="$1"
+        site_title="$2"
+        head="$3"
+        header="$4"
+        footer="$5"
+
+        echo "$body" | grep -iq '<html' &&
+        echo "$body" && return
+
+        title=$(echo "$body" | awk 'tolower($0)~/^<h1/{gsub(/<[^>]*>/,"",$0);print;exit}')
+        echo '<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="UTF-8">
+<meta name="generator" content="romanzolotarev.com/bin/ssg3">
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<link rel="icon" type="image/png" href="/favicon.png">
+<title>'"$(test -n "$title" && echo "$title - ")$site_title"'</title>
+'"$head"'
+</head>
+<body>
+'"$header"'
+'"$body"'
+'"$footer"'
+</body>
+</html>'
+}
+
+list_pages() {
+        cd "$1" && find . -type f ! -path '*/.*' ! -path '*/_*' \
+        \( -name '*.html' -o -name '*.md' \) |
+        sed 's#^./##;s#.md$#.html#;s#/index.html$#/#'
+}
+
+
+render_urls() {
+        while read -r url
+        do render_url "$1/$url" "$2"
+        done
+}
+
+
+render_url() {
+        url="$1"
+        date="$2"
+        echo '<url>
+<loc>'"$url"'</loc>
+<lastmod>'"$date"'</lastmod>
+<priority>1.0</priority>
+</url>'
+}
+
+
+render_sitemap() {
+        echo '<?xml version="1.0" encoding="UTF-8"?>
+<urlset
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://www.sitemaps.org/schemas/sitemap/0.9
+http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd"
+xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
+'"$(cat)"'
+</urlset>'
+}
+
+
+main "$@"
diff --git a/app-text/ssg3/ssg3-20181213.ebuild b/app-text/ssg3/ssg3-20181213.ebuild
new file mode 100644
index 0000000..3f8d6dc
--- /dev/null
+++ b/app-text/ssg3/ssg3-20181213.ebuild
@@ -0,0 +1,16 @@
+# Copyright 2018 ng0 <ng0@n0.is>
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="static site generation with sh, find, grep and lowdown"
+HOMEPAGE="https://www.romanzolotarev.com/ssg.html"
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="*"
+S="$WORKDIR"
+
+src_install() {
+        exeinto /usr/bin
+        doexe "${FILESDIR}"/ssg3
+}
diff --git a/dev-scheme/guile-git/Manifest b/dev-scheme/guile-git/Manifest
new file mode 100644
index 0000000..079c9d0
--- /dev/null
+++ b/dev-scheme/guile-git/Manifest
@@ -0,0 +1 @@
+DIST guile-git-0.0.20171110.tar.gz 269708 BLAKE2B 89095fcf666fdb4810e44155829413c3878c783d66d7b60416b9535f57edf27719515c22d9e15e07dbfe0976613fb5ca323ea0559b5a0533f1818b87d248db87 SHA512 b542c6ac30f596599ffa05074be7f71407a062ea3b23e80153894d13220f7935711abf74060bb0cea5e9c46b12492ee78c6914d4a15227bd393b3a833edf4fe9
diff --git a/dev-scheme/guile-git/guile-git-0.0.20171110.ebuild b/dev-scheme/guile-git/guile-git-0.0.20171110.ebuild
new file mode 100644
index 0000000..ac4a2d6
--- /dev/null
+++ b/dev-scheme/guile-git/guile-git-0.0.20171110.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Guile bindings of git"
+HOMEPAGE="https://gitlab.com/guile-git/guile-git"
+SRC_URI="https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+        >=dev-scheme/guile-2.0.11:=
+        dev-scheme/bytestructures
+        dev-libs/libgit2:=
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-scheme/guile-git/guile-git-0.1.ebuild b/dev-scheme/guile-git/guile-git-0.1.ebuild
new file mode 100644
index 0000000..cc0b838
--- /dev/null
+++ b/dev-scheme/guile-git/guile-git-0.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit git-r3
+
+DESCRIPTION="Guile bindings of git"
+HOMEPAGE="https://gitlab.com/guile-git/guile-git"
+EGIT_REPO_URI="https://gitlab.com/guile-git/guile-git"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+        >=dev-scheme/guile-2.0.11:=
+        dev-scheme/bytestructures
+        dev-libs/libgit2:=
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-scheme/guile-git/metadata.xml b/dev-scheme/guile-git/metadata.xml
new file mode 100644
index 0000000..2907abe
--- /dev/null
+++ b/dev-scheme/guile-git/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+        <email>slyfox@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/eclass/font-r1.eclass b/eclass/font-r1.eclass
new file mode 100644
index 0000000..c11f6b2
--- /dev/null
+++ b/eclass/font-r1.eclass
@@ -0,0 +1,230 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# @ECLASS: font-r1.eclass
+# @MAINTAINER:
+# fonts@gentoo.org
+# @BLURB: Eclass to make font installation uniform
+
+[[ ${EAPI} -lt 6 ]] && inherit eutils
+
+EXPORT_FUNCTIONS pkg_setup src_install pkg_postinst pkg_postrm
+
+# @ECLASS-VARIABLE: MY_FONT_TYPES
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# An array of font formats available for install.
+MY_FONT_TYPES=( ${MY_FONT_TYPES[@]:-} )
+MY_FONT_TYPES=( ${MY_FONT_TYPES[@]/#/font_types_} )
+MY_FONT_TYPES=( ${MY_FONT_TYPES[@]/font_types_+/+font_types_} )
+
+# @ECLASS-VARIABLE: MY_FONT_VARIANTS
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# An array of available font variants.
+MY_FONT_VARIANTS=( ${MY_FONT_VARIANTS[@]:-} )
+MY_FONT_VARIANTS=( ${MY_FONT_VARIANTS[@]/#/font_variants_} )
+MY_FONT_VARIANTS=( ${MY_FONT_VARIANTS[@]/font_variants_+/+font_variants_} )
+
+# @ECLASS-VARIABLE: MY_FONT_CHARS
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# An array of available character variations.
+MY_FONT_CHARS=( ${MY_FONT_CHARS[@]:-} )
+MY_FONT_CHARS=( ${MY_FONT_CHARS[@]/#/font_chars_} )
+MY_FONT_CHARS=( ${MY_FONT_CHARS[@]/font_chars_+/+font_chars_} )
+
+# @ECLASS-VARIABLE: FONT_SUFFIX
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# Space delimited list of font suffixes to install.
+FONT_SUFFIX=${FONT_SUFFIX:-}
+
+# @ECLASS-VARIABLE: FONT_S
+# @REQUIRED
+# @DESCRIPTION:
+# An array of directories containing the fonts, ${S} if unset.
+FONT_S=( ${FONT_S[@]:-.} )
+
+# @ECLASS-VARIABLE: FONT_PN
+# @DESCRIPTION:
+# Font name (ie. last part of FONTDIR).
+FONT_PN=${FONT_PN:-${PN}}
+
+# @ECLASS-VARIABLE: FONTDIR
+# @DESCRIPTION:
+# Full path to installation directory.
+FONTDIR=${FONTDIR:-/usr/share/fonts/${FONT_PN}}
+
+# @ECLASS-VARIABLE: FONT_CONF
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# Array containing fontconfig conf files to install.
+FONT_CONF=( "" )
+
+# @ECLASS-VARIABLE: DOCS
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# Space delimited list of docs to install.
+# We always install these:
+# COPYRIGHT README{,.txt} NEWS AUTHORS BUGS ChangeLog FONTLOG.txt
+DOCS=${DOCS:-}
+
+IUSE="
+X
+${MY_FONT_TYPES[@]}
+${MY_FONT_VARIANTS[@]}
+${MY_FONT_CHARS[@]}
+"
+[[ ${#MY_FONT_TYPES[@]} -ge 1 ]] && REQUIRED_USE="|| ( ${MY_FONT_TYPES[@]/+} )"
+
+DEPEND="
+        X? (
+                x11-apps/mkfontdir
+                media-fonts/encodings
+        )
+        sys-apps/findutils
+"
+RDEPEND=""
+RESTRICT+=" strip binchecks"
+
+# @FUNCTION: font-r1_xfont_config
+# @DESCRIPTION:
+# Generate Xorg font files (mkfontscale/mkfontdir).
+font-r1_xfont_config() {
+        local dir_name
+        if has X ${IUSE//+} && use X ; then
+                dir_name="${1:-${FONT_PN}}"
+                ebegin "Creating fonts.scale & fonts.dir in ${dir_name##*/}"
+                rm -f "${ED}${FONTDIR}/${1//${S}/}"/{fonts.{dir,scale},encodings.dir}
+                mkfontscale "${ED}${FONTDIR}/${1//${S}/}"
+                mkfontdir \
+                        -e ${EPREFIX}/usr/share/fonts/encodings \
+                        -e ${EPREFIX}/usr/share/fonts/encodings/large \
+                        "${ED}${FONTDIR}/${1//${S}/}"
+                eend $?
+                if [[ -e fonts.alias ]] ; then
+                        doins fonts.alias
+                fi
+        fi
+}
+
+# @FUNCTION: font-r1_fontconfig
+# @DESCRIPTION:
+# Install fontconfig conf files given in FONT_CONF.
+font-r1_fontconfig() {
+        local conffile
+        if [[ -n ${FONT_CONF[@]} ]]; then
+                insinto /etc/fonts/conf.avail/
+                for conffile in "${FONT_CONF[@]}"; do
+                        [[ -e ${conffile} ]] && doins ${conffile}
+                done
+        fi
+}
+
+# @FUNCTION: font-r1_pkg_setup
+# @DESCRIPTION:
+# The font pkg_setup function.
+# Collision protection and Prefix compat for eapi < 3.
+font-r1_pkg_setup() {
+        # Prefix compat
+        case ${EAPI:-0} in
+                0|1|2)
+                        if ! use prefix; then
+                                EPREFIX=
+                                ED=${D}
+                                EROOT=${ROOT}
+                                [[ ${EROOT} = */ ]] || EROOT+="/"
+                        fi
+                        ;;
+        esac
+
+        # make sure we get no collisions
+        # setup is not the nicest place, but preinst doesn't cut it
+        [[ -e "${EROOT}/${FONTDIR}/fonts.cache-1" ]] && rm -f "${EROOT}/${FONTDIR}/fonts.cache-1"
+
+        local _t
+        for _t in ${MY_FONT_TYPES[@]/*_}; do
+                use font_types_${_t} && FONT_SUFFIX+=" ${_t}"
+        done
+        FONT_SUFFIX=${FONT_SUFFIX:-ttf}
+}
+
+# @FUNCTION: font-r1_font_install
+# @DESCRIPTION:
+# The main font install function.
+font-r1_font_install() {
+        local _s
+
+        insinto "${FONTDIR}"
+
+        for _s in ${FONT_SUFFIX}; do
+                find "${FONT_S[@]}" -mindepth 1 -maxdepth 1 -! -size 0 -type f \
+                        -ipath "*.${_s}" -exec doins {} + 2>/dev/null
+
+                find "${ED}${FONTDIR}" -mindepth 1 -maxdepth 1 -! -size 0 -type f \
+                        -ipath "*.${_s}" -exec false {} + && die \
+                        "No ${_s} fonts were installed in ${FONTDIR}"
+        done
+}
+
+# @FUNCTION: font-r1_src_install
+# @DESCRIPTION:
+# The font src_install function.
+font-r1_src_install() {
+        font-r1_font_install
+        font-r1_xfont_config
+        font-r1_fontconfig
+
+        [[ "$(declare -p DOCS)" =~ "declare -a" ]] || DOCS=( ${DOCS} )
+        [[ -n ${DOCS} ]] && { dodoc "${DOCS[@]}" || die "docs installation failed" ; }
+
+        # install common docs
+        local commondoc
+        for commondoc in \
+                COPYRIGHT README{,.txt,.md} HISTORY NEWS AUTHORS{,.txt} BUGS TODO \
+                ChangeLog F{ont,ONT}L{og,OG}.txt CONTRIBUTORS{,.txt} relnotes.txt
+                do [[ -s ${commondoc} ]] && dodoc ${commondoc}
+        done
+}
+
+# @FUNCTION: font-r1_pkg_postinst
+# @DESCRIPTION:
+# The font pkg_postinst function.
+font-r1_pkg_postinst() {
+        if [[ -n ${FONT_CONF[@]} ]]; then
+                local conffile
+                echo
+                elog "The following fontconfig configuration files have been installed:"
+                elog
+                for conffile in "${FONT_CONF[@]}"; do
+                        if [[ -e ${EROOT}etc/fonts/conf.avail/$(basename ${conffile}) ]]; then
+                                elog "  $(basename ${conffile})"
+                        fi
+                done
+                elog
+                elog "Use \`eselect fontconfig\` to enable/disable them."
+                echo
+        fi
+
+        if has_version media-libs/fontconfig && [[ ${ROOT} == / ]]; then
+                ebegin "Updating fontconfig cache for ${FONT_PN}"
+                fc-cache -s "${EROOT}"usr/share/fonts/${FONT_PN}
+                eend $?
+        else
+                einfo "Skipping cache update (media-libs/fontconfig is not installed or ROOT != /)"
+        fi
+}
+
+# @FUNCTION: font-r1_pkg_postrm
+# @DESCRIPTION:
+# The font pkg_postrm function.
+font-r1_pkg_postrm() {
+        if has_version media-libs/fontconfig && [[ ${ROOT} == / ]]; then
+                ebegin "Updating fontconfig cache for ${FONT_PN}"
+                fc-cache -s "${EROOT}"usr/share/fonts/${FONT_PN}
+                eend $?
+        else
+                einfo "Skipping cache update (media-libs/fontconfig is not installed or ROOT != /)"
+        fi
+}
diff --git a/eclass/fontmake.eclass b/eclass/fontmake.eclass
new file mode 100644
index 0000000..4a7c94a
--- /dev/null
+++ b/eclass/fontmake.eclass
@@ -0,0 +1,97 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# @ECLASS: fontmake.eclass
+# @MAINTAINER:
+# 4nykey@gmail.com
+# @BLURB: An eclass to build fonts from sources using dev-util/fontmake
+
+# @VARIABLE: FONT_SRCDIR
+# @DESCRIPTION:
+# The path of a directory containing the sources, relative to ${S}.
+# 'sources' if unset
+FONT_SRCDIR=${FONT_SRCDIR:-sources}
+
+# @VARIABLE: FONTMAKE_EXTRA_ARGS
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# An array containing additional arguments for fontmake.
+
+# @VARIABLE: EMAKE_EXTRA_ARGS
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# An array containing additional arguments for emake.
+
+# @VARIABLE: FONTDIR_BIN
+# @DESCRIPTION:
+# An array containing paths relative to ${S}, where to search for prebuilt
+# fonts. By default: 'fonts fonts/otf fonts/ttf'
+FONTDIR_BIN=( ${FONTDIR_BIN[@]:-fonts fonts/otf fonts/ttf} )
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+IUSE="autohint +binary"
+MY_FONT_TYPES=( ${MY_FONT_TYPES[@]:-otf +ttf} )
+
+inherit python-any-r1 font-r1
+
+EXPORT_FUNCTIONS pkg_setup src_prepare src_compile
+
+MY_MK="9ef5512cdd3177cc8d4667bcf5a58346-7f9cf67"
+SRC_URI+="
+!binary? (
+        mirror://githubcl/gist/${MY_MK%-*}/tar.gz/${MY_MK#*-}
+        -> ${MY_MK}.tar.gz
+)
+"
+RESTRICT="primaryuri"
+
+DEPEND="
+!binary? (
+        ${PYTHON_DEPS}
+        $(python_gen_any_dep '
+                dev-util/fontmake[${PYTHON_USEDEP}]
+        ')
+        autohint? ( media-gfx/ttfautohint )
+)
+"
+
+fontmake_pkg_setup() {
+        if use binary; then
+                local _d
+                FONT_S=( "${FONTDIR_BIN[@]}" )
+                PATCHES=( )
+        else
+                FONT_S=( master_{o,t}tf autohinted/master_ttf )
+                python-any-r1_pkg_setup
+        fi
+        font-r1_pkg_setup
+}
+
+fontmake_src_prepare() {
+        default
+        use binary && return
+        unpack ${MY_MK}.tar.gz
+        local _g
+        find "${FONT_SRCDIR}" -name '* *.glyphs' -o -name '* *.designspace'| \
+                while read _g; do mv "${_g}" "${_g// }"; done
+}
+
+fontmake_src_compile() {
+        use binary && return
+
+        local myemakeargs=(
+                --no-builtin-rules
+                -f ${MY_MK}/Makefile
+                SRCDIR="${FONT_SRCDIR}"
+                "${EMAKE_EXTRA_ARGS[@]}"
+                $(in_iuse interpolate && usex interpolate '' 'INTERPOLATE=')
+                $(in_iuse clean-as-you-go && usex clean-as-you-go 'CLEAN=clean' '')
+        )
+        use autohint && FONTMAKE_EXTRA_ARGS+=( --autohint )
+        [[ "${#FONTMAKE_EXTRA_ARGS[@]}" -ge 1 ]] && \
+        myemakeargs+=(
+                FONTMAKE="fontmake ${FONTMAKE_EXTRA_ARGS[@]}"
+        )
+
+        emake "${myemakeargs[@]}" ${FONT_SUFFIX}
+}
diff --git a/eclass/git-r3.eclass b/eclass/git-r3.eclass
index e3e6717..a1ad0d2 100644
--- a/eclass/git-r3.eclass
+++ b/eclass/git-r3.eclass
@@ -1,44 +1,36 @@
-# Copyright 1999-2015 Gentoo Authors
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 # @ECLASS: git-r3.eclass
 # @MAINTAINER:
 # Michał Górny <mgorny@gentoo.org>
+# @SUPPORTED_EAPIS: 4 5 6 7
 # @BLURB: Eclass for fetching and unpacking git repositories.
 # @DESCRIPTION:
 # Third generation eclass for easing maintenance of live ebuilds using
 # git as remote repository.
-#
-# Patched by symlynX to allow for gits via Tor. Why Tor? Because
-# unlike HTTPS it provides end-to-end authenticity which is not
-# susceptible to man-in-the-middle attacks, so all gits should
-# migrate to Tor, cjdns or gnunet-vpn. But the latter two do
-# not need custom changes to this file to do their job.
-#
-# @FIXME: Should we automatically define EGIT_SOCKS="torsocks"
-#                 when we see that /etc/tor/torsocks.conf exists?
 
 case "${EAPI:-0}" in
-        0|1|2|3|4|5|6)
+        0|1|2|3)
+                die "Unsupported EAPI=${EAPI} (obsolete) for ${ECLASS}"
+                ;;
+        4|5|6|7)
                 ;;
         *)
                 die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}"
                 ;;
 esac
 
-if [[ ! ${_GIT_R3} ]]; then
-
-inherit eutils
-
-fi
-
 EXPORT_FUNCTIONS src_unpack
 
 if [[ ! ${_GIT_R3} ]]; then
 
 if [[ ! ${_INHERITED_BY_GIT_2} ]]; then
-        DEPEND=">=dev-vcs/git-1.8.2.1"
+        if [[ ${EAPI:-0} != [0123456] ]]; then
+                BDEPEND=">=dev-vcs/git-1.8.2.1[curl]"
+        else
+                DEPEND=">=dev-vcs/git-1.8.2.1[curl]"
+        fi
 fi
 
 # @ECLASS-VARIABLE: EGIT_CLONE_TYPE
@@ -121,18 +113,20 @@ fi
 # @ECLASS-VARIABLE: EGIT_REPO_URI
 # @REQUIRED
 # @DESCRIPTION:
-# URIs to the repository, e.g. git://foo, https://foo. If multiple URIs
-# are provided, the eclass will consider them as fallback URIs to try
-# if the first URI does not work. For supported URI syntaxes, read up
-# the manpage for git-clone(1).
+# URIs to the repository, e.g. https://foo. If multiple URIs are
+# provided, the eclass will consider the remaining URIs as fallbacks
+# to try if the first URI does not work. For supported URI syntaxes,
+# read the manpage for git-clone(1).
 #
-# It can be overriden via env using ${PN}_LIVE_REPO variable.
+# URIs should be using https:// whenever possible. http:// and git://
+# URIs are completely unsecured and their use (even if only as
+# a fallback) renders the ebuild completely vulnerable to MITM attacks.
 #
 # Can be a whitespace-separated list or an array.
 #
 # Example:
 # @CODE
-# EGIT_REPO_URI="git://a/b.git https://c/d.git"
+# EGIT_REPO_URI="https://a/b.git https://c/d.git"
 # @CODE
 
 # @ECLASS-VARIABLE: EVCS_OFFLINE
@@ -156,17 +150,28 @@ fi
 # @DESCRIPTION:
 # The branch name to check out. If unset, the upstream default (HEAD)
 # will be used.
-#
-# It can be overriden via env using ${PN}_LIVE_BRANCH variable.
 
 # @ECLASS-VARIABLE: EGIT_COMMIT
 # @DEFAULT_UNSET
 # @DESCRIPTION:
 # The tag name or commit identifier to check out. If unset, newest
-# commit from the branch will be used. If set, EGIT_BRANCH will
-# be ignored.
+# commit from the branch will be used. Note that if set to a commit
+# not on HEAD branch, EGIT_BRANCH needs to be set to a branch on which
+# the commit is available.
+
+# @ECLASS-VARIABLE: EGIT_COMMIT_DATE
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# Attempt to check out the repository state for the specified timestamp.
+# The date should be in format understood by 'git rev-list'. The commits
+# on EGIT_BRANCH will be considered.
 #
-# It can be overriden via env using ${PN}_LIVE_COMMIT variable.
+# The eclass will select the last commit with commit date preceding
+# the specified date. When merge commits are found, only first parents
+# will be considered in order to avoid switching into external branches
+# (assuming that merges are done correctly). In other words, each merge
+# will be considered alike a single commit with date corresponding
+# to the merge commit date.
 
 # @ECLASS-VARIABLE: EGIT_CHECKOUT_DIR
 # @DESCRIPTION:
@@ -174,6 +179,32 @@ fi
 #
 # EGIT_CHECKOUT_DIR=${WORKDIR}/${P}
 
+# @ECLASS-VARIABLE: EGIT_SUBMODULES
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# An array of inclusive and exclusive wildcards on submodule names,
+# stating which submodules are fetched and checked out. Exclusions
+# start with '-', and exclude previously matched submodules.
+#
+# If unset, all submodules are enabled. Empty list disables all
+# submodules. In order to use an exclude-only list, start the array
+# with '*'.
+#
+# Remember that wildcards need to be quoted in order to prevent filename
+# expansion.
+#
+# Examples:
+# @CODE
+# # Disable all submodules
+# EGIT_SUBMODULES=()
+#
+# # Include only foo and bar
+# EGIT_SUBMODULES=( foo bar )
+#
+# # Use all submodules except for test-* but include test-lib
+# EGIT_SUBMODULES=( '*' '-test-*' test-lib )
+# @CODE
+
 # @FUNCTION: _git-r3_env_setup
 # @INTERNAL
 # @DESCRIPTION:
@@ -214,24 +245,40 @@ _git-r3_env_setup() {
                         die "Invalid EGIT_MIN_CLONE_TYPE=${EGIT_MIN_CLONE_TYPE}"
         esac
 
+        if [[ ${EGIT_SUBMODULES[@]+1} && $(declare -p EGIT_SUBMODULES) != "declare -a"* ]]
+        then
+                die 'EGIT_SUBMODULES must be an array.'
+        fi
+
         local esc_pn livevar
         esc_pn=${PN//[-+]/_}
+        [[ ${esc_pn} == [0-9]* ]] && esc_pn=_${esc_pn}
 
+        # note: deprecated, use EGIT_OVERRIDE_* instead
         livevar=${esc_pn}_LIVE_REPO
-        EGIT_REPO_URI=${!livevar:-${EGIT_REPO_URI}}
+        EGIT_REPO_URI=${!livevar-${EGIT_REPO_URI}}
         [[ ${!livevar} ]] \
                 && ewarn "Using ${livevar}, no support will be provided"
 
         livevar=${esc_pn}_LIVE_BRANCH
-        EGIT_BRANCH=${!livevar:-${EGIT_BRANCH}}
+        EGIT_BRANCH=${!livevar-${EGIT_BRANCH}}
         [[ ${!livevar} ]] \
                 && ewarn "Using ${livevar}, no support will be provided"
 
         livevar=${esc_pn}_LIVE_COMMIT
-        EGIT_COMMIT=${!livevar:-${EGIT_COMMIT}}
+        EGIT_COMMIT=${!livevar-${EGIT_COMMIT}}
         [[ ${!livevar} ]] \
                 && ewarn "Using ${livevar}, no support will be provided"
 
+        livevar=${esc_pn}_LIVE_COMMIT_DATE
+        EGIT_COMMIT_DATE=${!livevar-${EGIT_COMMIT_DATE}}
+        [[ ${!livevar} ]] \
+                && ewarn "Using ${livevar}, no support will be provided"
+
+        if [[ ${EGIT_COMMIT} && ${EGIT_COMMIT_DATE} ]]; then
+                die "EGIT_COMMIT and EGIT_COMMIT_DATE can not be specified simultaneously"
+        fi
+
         # Migration helpers. Remove them when git-2 is removed.
 
         if [[ ${EGIT_SOURCEDIR} ]]; then
@@ -252,7 +299,8 @@ _git-r3_env_setup() {
         if [[ ${EGIT_HAS_SUBMODULES} ]]; then
                 eerror "EGIT_HAS_SUBMODULES has been removed. The eclass no longer needs"
                 eerror "to switch the clone type in order to support submodules and therefore"
-                eerror "submodules are detected and fetched automatically."
+                eerror "submodules are detected and fetched automatically. If you need to"
+                eerror "disable or filter submodules, see EGIT_SUBMODULES."
                 die "EGIT_HAS_SUBMODULES is no longer necessary."
         fi
 
@@ -305,7 +353,7 @@ _git-r3_set_gitdir() {
                 git/*) repo_name=${repo_name#git/};;
                 # gentoo.org
                 gitroot/*) repo_name=${repo_name#gitroot/};;
-                # google code, sourceforge
+                # sourceforge
                 p/*) repo_name=${repo_name#p/};;
                 # kernel.org
                 pub/scm/*) repo_name=${repo_name#pub/scm/};;
@@ -320,7 +368,7 @@ _git-r3_set_gitdir() {
 
         GIT_DIR=${EGIT3_STORE_DIR}/${repo_name}
 
-        if [[ ! -d ${EGIT3_STORE_DIR} ]]; then
+        if [[ ! -d ${EGIT3_STORE_DIR} && ! ${EVCS_OFFLINE} ]]; then
                 (
                         addwrite /
                         mkdir -p "${EGIT3_STORE_DIR}"
@@ -329,6 +377,14 @@ _git-r3_set_gitdir() {
 
         addwrite "${EGIT3_STORE_DIR}"
         if [[ ! -d ${GIT_DIR} ]]; then
+                if [[ ${EVCS_OFFLINE} ]]; then
+                        eerror "A clone of the following repository is required to proceed:"
+                        eerror "  ${1}"
+                        eerror "However, networking activity has been disabled using EVCS_OFFLINE and there"
+                        eerror "is no local clone available."
+                        die "No local clone of ${1}. Unable to proceed with EVCS_OFFLINE."
+                fi
+
                 local saved_umask
                 if [[ ${EVCS_UMASK} ]]; then
                         saved_umask=$(umask)
@@ -366,15 +422,36 @@ _git-r3_set_submodules() {
                 l=${l#submodule.}
                 local subname=${l%%.url=*}
 
+                # filter out on EGIT_SUBMODULES
+                if declare -p EGIT_SUBMODULES &>/dev/null; then
+                        local p l_res res=
+                        for p in "${EGIT_SUBMODULES[@]}"; do
+                                if [[ ${p} == -* ]]; then
+                                        p=${p#-}
+                                        l_res=
+                                else
+                                        l_res=1
+                                fi
+
+                                [[ ${subname} == ${p} ]] && res=${l_res}
+                        done
+
+                        if [[ ! ${res} ]]; then
+                                einfo "Skipping submodule \e[1m${subname}\e[22m"
+                                continue
+                        fi
+                fi
+
                 # skip modules that have 'update = none', bug #487262.
                 local upd=$(echo "${data}" | git config -f /dev/fd/0 \
                         submodule."${subname}".update)
                 [[ ${upd} == none ]] && continue
 
-                # https://github.com/git/git/blob/master/refs.c#L39
-                # for now, we just filter /. because of #572312
-                local enc_subname=${subname//\/.//_}
-                [[ ${enc_subname} == .* ]] && enc_subname=_${enc_subname#.}
+                # https://github.com/git/git/blob/master/refs.c#L31
+                # we are more restrictive than git itself but that should not
+                # cause any issues, #572312, #606950
+                # TODO: check escaped names for collisions
+                local enc_subname=${subname//[^a-zA-Z0-9-]/_}
 
                 submodules+=(
                         "${enc_subname}"
@@ -443,44 +520,8 @@ _git-r3_is_local_repo() {
         [[ ${uri} == file://* || ${uri} == /* ]]
 }
 
-# @FUNCTION: _git-r3_find_head
-# @USAGE: <head-ref>
-# @INTERNAL
-# @DESCRIPTION:
-# Given a ref to which remote HEAD was fetched, try to find
-# a branch matching the commit. Expects 'git show-ref'
-# or 'git ls-remote' output on stdin.
-_git-r3_find_head() {
-        debug-print-function ${FUNCNAME} "$@"
-
-        local head_ref=${1}
-        local head_hash=$(git rev-parse --verify "${1}" || die)
-        local matching_ref
-
-        # TODO: some transports support peeking at symbolic remote refs
-        # find a way to use that rather than guessing
-
-        # (based on guess_remote_head() in git-1.9.0/remote.c)
-        local h ref
-        while read h ref; do
-                # look for matching head
-                if [[ ${h} == ${head_hash} ]]; then
-                        # either take the first matching ref, or master if it is there
-                        if [[ ! ${matching_ref} || ${ref} == refs/heads/master ]]; then
-                                matching_ref=${ref}
-                        fi
-                fi
-        done
-
-        if [[ ! ${matching_ref} ]]; then
-                die "Unable to find a matching branch for remote HEAD (${head_hash})"
-        fi
-
-        echo "${matching_ref}"
-}
-
 # @FUNCTION: git-r3_fetch
-# @USAGE: [<repo-uri> [<remote-ref> [<local-id>]]]
+# @USAGE: [<repo-uri> [<remote-ref> [<local-id> [<commit-date>]]]]
 # @DESCRIPTION:
 # Fetch new commits to the local clone of repository.
 #
@@ -503,6 +544,9 @@ _git-r3_find_head() {
 # This default should be fine unless you are fetching multiple trees
 # from the same repository in the same ebuild.
 #
+# <commit-id> requests attempting to use repository state as of specific
+# date. For more details, see EGIT_COMMIT_DATE.
+#
 # The fetch operation will affect the EGIT_STORE only. It will not touch
 # the working copy, nor export any environment variables.
 # If the repository contains submodules, they will be fetched
@@ -510,8 +554,7 @@ _git-r3_find_head() {
 git-r3_fetch() {
         debug-print-function ${FUNCNAME} "$@"
 
-        [[ ${EVCS_OFFLINE} ]] && return
-
+        # process repos first since we create repo_name from it
         local repos
         if [[ ${1} ]]; then
                 repos=( ${1} )
@@ -521,16 +564,23 @@ git-r3_fetch() {
                 repos=( ${EGIT_REPO_URI} )
         fi
 
-        local branch=${EGIT_BRANCH:+refs/heads/${EGIT_BRANCH}}
-        local remote_ref=${2:-${EGIT_COMMIT:-${branch:-HEAD}}}
-        local local_id=${3:-${CATEGORY}/${PN}/${SLOT%/*}}
-        local local_ref=refs/git-r3/${local_id}/__main__
-
         [[ ${repos[@]} ]] || die "No URI provided and EGIT_REPO_URI unset"
 
+        local r
+        for r in "${repos[@]}"; do
+                if [[ ${r} == git:* || ${r} == http:* ]]; then
+                        ewarn "git-r3: ${r%%:*} protocol is completely unsecure and may render the ebuild"
+                        ewarn "easily susceptible to MITM attacks (even if used only as fallback). Please"
+                        ewarn "use https instead."
+                        ewarn "[URI: ${r}]"
+                fi
+        done
+
         local -x GIT_DIR
         _git-r3_set_gitdir "${repos[0]}"
 
+        einfo "Repository id: ${GIT_DIR##*/}"
+
         # prepend the local mirror if applicable
         if [[ ${EGIT_MIRROR_URI} ]]; then
                 repos=(
@@ -539,163 +589,188 @@ git-r3_fetch() {
                 )
         fi
 
+        # get the default values for the common variables and override them
+        local branch_name=${EGIT_BRANCH}
+        local commit_id=${2:-${EGIT_COMMIT}}
+        local commit_date=${4:-${EGIT_COMMIT_DATE}}
+
+        # support new override API for EAPI 6+
+        if ! has "${EAPI:-0}" 0 1 2 3 4 5; then
+                # get the name and do some more processing:
+                # 1) kill .git suffix,
+                # 2) underscore (remaining) non-variable characters,
+                # 3) add preceding underscore if it starts with a digit,
+                # 4) uppercase.
+                local override_name=${GIT_DIR##*/}
+                override_name=${override_name%.git}
+                override_name=${override_name//[^a-zA-Z0-9_]/_}
+                override_name=${override_name^^}
+
+                local varmap=(
+                        REPO:repos
+                        BRANCH:branch_name
+                        COMMIT:commit_id
+                        COMMIT_DATE:commit_date
+                )
+
+                local localvar livevar live_warn= override_vars=()
+                for localvar in "${varmap[@]}"; do
+                        livevar=EGIT_OVERRIDE_${localvar%:*}_${override_name}
+                        localvar=${localvar#*:}
+                        override_vars+=( "${livevar}" )
+
+                        if [[ -n ${!livevar} ]]; then
+                                [[ ${localvar} == repos ]] && repos=()
+                                live_warn=1
+                                ewarn "Using ${livevar}=${!livevar}"
+                                declare "${localvar}=${!livevar}"
+                        fi
+                done
+
+                if [[ ${live_warn} ]]; then
+                        ewarn "No support will be provided."
+                else
+                        einfo "To override fetched repository properties, use:"
+                        local x
+                        for x in "${override_vars[@]}"; do
+                                einfo "  ${x}"
+                        done
+                        einfo
+                fi
+        fi
+
+        # set final variables after applying overrides
+        local branch=${branch_name:+refs/heads/${branch_name}}
+        local remote_ref=${commit_id:-${branch:-HEAD}}
+        local local_id=${3:-${CATEGORY}/${PN}/${SLOT%/*}}
+        local local_ref=refs/git-r3/${local_id}/__main__
+
         # try to fetch from the remote
-        local r success saved_umask
+        local success saved_umask
         if [[ ${EVCS_UMASK} ]]; then
                 saved_umask=$(umask)
                 umask "${EVCS_UMASK}" || die "Bad options to umask: ${EVCS_UMASK}"
         fi
         for r in "${repos[@]}"; do
-                einfo "Fetching \e[1m${r}\e[22m ..."
-
-                if [[ ${r} == https?://* ]]; then
-                        # if we're not using git protocol, web proxy takes care of things
-                        EGIT_SOCKS = ""
-                elif [[ ! ${EGIT_SOCKS} ]] && [[ ${r} == git://*.onion/* ]]; then
-                        if ROOT=/ has_version 'net-proxy/torsocks'; then
-                                EGIT_SOCKS="torsocks"
-                        else
-                                die "Properly configured net-proxy/torsocks required to fetch git from onion."
-                        fi
-                fi
-
-                local fetch_command=( ${EGIT_SOCKS} git fetch "${r}" )
-                local clone_type=${EGIT_CLONE_TYPE}
+                if [[ ! ${EVCS_OFFLINE} ]]; then
+                        einfo "Fetching \e[1m${r}\e[22m ..."
 
-                if [[ ${r} == https://* ]] && ! ROOT=/ has_version 'dev-vcs/git[curl]'; then
-                        eerror "git-r3: fetching from https:// requested. In order to support https,"
-                        eerror "dev-vcs/git needs to be built with USE=curl. Example solution:"
-                        eerror
-                        eerror "        echo dev-vcs/git curl >> /etc/portage/package.use"
-                        eerror "        emerge -1v dev-vcs/git"
-                        die "dev-vcs/git built with USE=curl required."
-                fi
+                        local fetch_command=( git fetch "${r}" )
+                        local clone_type=${EGIT_CLONE_TYPE}
 
-                if [[ ${r} == https://code.google.com/* ]]; then
-                        # Google Code has special magic on top of git that:
-                        # 1) can't handle shallow clones at all,
-                        # 2) fetches duplicately when tags are pulled in with branch
-                        # so automatically switch to single+tags mode.
-                        if [[ ${clone_type} == shallow ]]; then
-                                einfo "  Google Code does not support shallow clones"
-                                einfo "  using \e[1mEGIT_CLONE_TYPE=single+tags\e[22m"
-                                clone_type=single+tags
-                        elif [[ ${clone_type} == single ]]; then
-                                einfo "  git-r3: Google Code does not send tags properly in 'single' mode"
-                                einfo "  using \e[1mEGIT_CLONE_TYPE=single+tags\e[22m"
-                                clone_type=single+tags
-                        fi
-                fi
-
-                if [[ ${clone_type} == mirror ]]; then
-                        fetch_command+=(
-                                --prune
-                                # mirror the remote branches as local branches
-                                "+refs/heads/*:refs/heads/*"
-                                # pull tags explicitly in order to prune them properly
-                                "+refs/tags/*:refs/tags/*"
-                                # notes in case something needs them
-                                "+refs/notes/*:refs/notes/*"
-                                # and HEAD in case we need the default branch
-                                # (we keep it in refs/git-r3 since otherwise --prune interferes)
-                                "+HEAD:refs/git-r3/HEAD"
-                        )
-                else # single or shallow
-                        local fetch_l fetch_r
-
-                        if [[ ${remote_ref} == HEAD ]]; then
-                                # HEAD
-                                fetch_l=HEAD
-                        elif [[ ${remote_ref} == refs/* ]]; then
-                                # regular branch, tag or some other explicit ref
-                                fetch_l=${remote_ref}
-                        else
-                                # tag or commit id...
-                                # let ls-remote figure it out
-                                local tagref=$(${EGIT_SOCKS} git ls-remote "${r}" "refs/tags/${remote_ref}")
-
-                                # if it was a tag, ls-remote obtained a hash
-                                if [[ ${tagref} ]]; then
-                                        # tag
-                                        fetch_l=refs/tags/${remote_ref}
+                        if [[ ${clone_type} == mirror ]]; then
+                                fetch_command+=(
+                                        --prune
+                                        # mirror the remote branches as local branches
+                                        "+refs/heads/*:refs/heads/*"
+                                        # pull tags explicitly in order to prune them properly
+                                        "+refs/tags/*:refs/tags/*"
+                                        # notes in case something needs them
+                                        "+refs/notes/*:refs/notes/*"
+                                        # and HEAD in case we need the default branch
+                                        # (we keep it in refs/git-r3 since otherwise --prune interferes)
+                                        "+HEAD:refs/git-r3/HEAD"
+                                )
+                        else # single or shallow
+                                local fetch_l fetch_r
+
+                                if [[ ${remote_ref} == HEAD ]]; then
+                                        # HEAD
+                                        fetch_l=HEAD
+                                elif [[ ${remote_ref} == refs/* ]]; then
+                                        # regular branch, tag or some other explicit ref
+                                        fetch_l=${remote_ref}
                                 else
-                                        # commit id
-                                        # so we need to fetch the whole branch
-                                        if [[ ${branch} ]]; then
-                                                fetch_l=${branch}
+                                        # tag or commit id...
+                                        # let ls-remote figure it out
+                                        local tagref=$(git ls-remote "${r}" "refs/tags/${remote_ref}")
+
+                                        # if it was a tag, ls-remote obtained a hash
+                                        if [[ ${tagref} ]]; then
+                                                # tag
+                                                fetch_l=refs/tags/${remote_ref}
                                         else
-                                                fetch_l=HEAD
-                                        fi
-
-                                        # fetching by commit in shallow mode? can't do.
-                                        if [[ ${clone_type} == shallow ]]; then
-                                                clone_type=single
+                                                # commit id
+                                                # so we need to fetch the whole branch
+                                                if [[ ${branch} ]]; then
+                                                        fetch_l=${branch}
+                                                else
+                                                        fetch_l=HEAD
+                                                fi
+
+                                                # fetching by commit in shallow mode? can't do.
+                                                if [[ ${clone_type} == shallow ]]; then
+                                                        clone_type=single
+                                                fi
                                         fi
                                 fi
-                        fi
 
-                        if [[ ${fetch_l} == HEAD ]]; then
-                                fetch_r=refs/git-r3/HEAD
-                        else
-                                fetch_r=${fetch_l}
-                        fi
+                                # checkout by date does not make sense in shallow mode
+                                if [[ ${commit_date} && ${clone_type} == shallow ]]; then
+                                        clone_type=single
+                                fi
 
-                        fetch_command+=(
-                                "+${fetch_l}:${fetch_r}"
-                        )
+                                if [[ ${fetch_l} == HEAD ]]; then
+                                        fetch_r=refs/git-r3/HEAD
+                                else
+                                        fetch_r=${fetch_l}
+                                fi
 
-                        if [[ ${clone_type} == single+tags ]]; then
                                 fetch_command+=(
-                                        # pull tags explicitly as requested
-                                        "+refs/tags/*:refs/tags/*"
+                                        "+${fetch_l}:${fetch_r}"
                                 )
-                        fi
-                fi
 
-                if [[ ${clone_type} == shallow ]]; then
-                        if _git-r3_is_local_repo; then
-                                # '--depth 1' causes sandbox violations with local repos
-                                # bug #491260
-                                clone_type=single
-                        elif [[ ! $(git rev-parse --quiet --verify "${fetch_r}") ]]
-                        then
-                                # use '--depth 1' when fetching a new branch
-                                fetch_command+=( --depth 1 )
+                                if [[ ${clone_type} == single+tags ]]; then
+                                        fetch_command+=(
+                                                # pull tags explicitly as requested
+                                                "+refs/tags/*:refs/tags/*"
+                                        )
+                                fi
                         fi
-                else # non-shallow mode
-                        if [[ -f ${GIT_DIR}/shallow ]]; then
-                                fetch_command+=( --unshallow )
+
+                        if [[ ${clone_type} == shallow ]]; then
+                                if _git-r3_is_local_repo; then
+                                        # '--depth 1' causes sandbox violations with local repos
+                                        # bug #491260
+                                        clone_type=single
+                                elif [[ ! $(git rev-parse --quiet --verify "${fetch_r}") ]]
+                                then
+                                        # use '--depth 1' when fetching a new branch
+                                        fetch_command+=( --depth 1 )
+                                fi
+                        else # non-shallow mode
+                                if [[ -f ${GIT_DIR}/shallow ]]; then
+                                        fetch_command+=( --unshallow )
+                                fi
                         fi
-                fi
 
-                set -- "${fetch_command[@]}"
-                echo "${@}" >&2
-                if "${@}"; then
-                        if [[ ${clone_type} == mirror ]]; then
-                                # find remote HEAD and update our HEAD properly
-                                git symbolic-ref HEAD \
-                                        "$(_git-r3_find_head refs/git-r3/HEAD \
-                                                < <(git show-ref --heads || die))" \
-                                                || die "Unable to update HEAD"
-                        else # single or shallow
-                                if [[ ${fetch_l} == HEAD ]]; then
-                                        # find out what branch we fetched as HEAD
-                                        local head_branch=$(_git-r3_find_head \
-                                                refs/git-r3/HEAD \
-                                                < <(${EGIT_SOCKS} git ls-remote --heads "${r}" || die))
-
-                                        # and move it to its regular place
-                                        git update-ref --no-deref "${head_branch}" \
-                                                refs/git-r3/HEAD \
-                                                || die "Unable to sync HEAD branch ${head_branch}"
-                                        git symbolic-ref HEAD "${head_branch}" \
+                        set -- "${fetch_command[@]}"
+                        echo "${@}" >&2
+                        "${@}" || continue
+
+                        if [[ ${clone_type} == mirror || ${fetch_l} == HEAD ]]; then
+                                # update our HEAD to match our remote HEAD ref
+                                git symbolic-ref HEAD refs/git-r3/HEAD \
                                                 || die "Unable to update HEAD"
-                                fi
                         fi
+                fi
 
-                        # now let's see what the user wants from us
+                # now let's see what the user wants from us
+                if [[ ${commit_date} ]]; then
+                        local dated_commit_id=$(
+                                git rev-list --first-parent --before="${commit_date}" \
+                                        -n 1 "${remote_ref}"
+                        )
+                        if [[ ${?} -ne 0 ]]; then
+                                die "Listing ${remote_ref} failed (wrong ref?)."
+                        elif [[ ! ${dated_commit_id} ]]; then
+                                die "Unable to find commit for date ${commit_date}."
+                        else
+                                set -- git update-ref --no-deref "${local_ref}" "${dated_commit_id}"
+                        fi
+                else
                         local full_remote_ref=$(
-                                ${EGIT_SOCKS} git rev-parse --verify --symbolic-full-name "${remote_ref}"
+                                git rev-parse --verify --symbolic-full-name "${remote_ref}"
                         )
 
                         if [[ ${full_remote_ref} ]]; then
@@ -706,24 +781,30 @@ git-r3_fetch() {
                                 # otherwise, we were likely given a commit id
                                 set -- git update-ref --no-deref "${local_ref}" "${remote_ref}"
                         fi
+                fi
 
-                        echo "${@}" >&2
-                        if ! "${@}"; then
+                echo "${@}" >&2
+                if ! "${@}"; then
+                        if [[ ${EVCS_OFFLINE} ]]; then
+                                eerror "A clone of the following repository is required to proceed:"
+                                eerror "  ${r}"
+                                eerror "However, networking activity has been disabled using EVCS_OFFLINE and the local"
+                                eerror "clone does not have requested ref:"
+                                eerror "  ${remote_ref}"
+                                die "Local clone of ${r} does not have requested ref: ${remote_ref}. Unable to proceed with EVCS_OFFLINE."
+                        else
                                 die "Referencing ${remote_ref} failed (wrong ref?)."
                         fi
-
-                        success=1
-                        break
                 fi
+
+                success=1
+                break
         done
         if [[ ${saved_umask} ]]; then
                 umask "${saved_umask}" || die
         fi
         [[ ${success} ]] || die "Unable to fetch from any of EGIT_REPO_URI"
 
-        # consistency check, in case we got man-in-the-middle't  --lynX
-        git fsck
-
         # submodules can reference commits in any branch
         # always use the 'mirror' mode to accomodate that, bug #503332
         local EGIT_CLONE_TYPE=mirror
@@ -732,7 +813,7 @@ git-r3_fetch() {
         if git cat-file -e "${local_ref}":.gitmodules &>/dev/null; then
                 local submodules
                 _git-r3_set_submodules \
-                        "$(${EGIT_SOCKS} git cat-file -p "${local_ref}":.gitmodules || die)"
+                        "$(git cat-file -p "${local_ref}":.gitmodules || die)"
 
                 while [[ ${submodules[@]} ]]; do
                         local subname=${submodules[0]}
@@ -744,7 +825,7 @@ git-r3_fetch() {
                         # note: git cat-file does not work for submodules
                         if [[ $(git ls-tree -d "${local_ref}" "${path}") ]]
                         then
-                                local commit=$(${EGIT_SOCKS} git rev-parse "${local_ref}:${path}" || die)
+                                local commit=$(git rev-parse "${local_ref}:${path}" || die)
 
                                 if [[ ! ${commit} ]]; then
                                         die "Unable to get commit id for submodule ${subname}"
@@ -762,7 +843,7 @@ git-r3_fetch() {
 }
 
 # @FUNCTION: git-r3_checkout
-# @USAGE: [<repo-uri> [<checkout-path> [<local-id>]]]
+# @USAGE: [<repo-uri> [<checkout-path> [<local-id> [<checkout-paths>...]]]]
 # @DESCRIPTION:
 # Check the previously fetched tree to the working copy.
 #
@@ -778,6 +859,12 @@ git-r3_fetch() {
 # <local-id> needs to specify the local identifier that was used
 # for respective git-r3_fetch.
 #
+# If <checkout-paths> are specified, then the specified paths are passed
+# to 'git checkout' to effect a partial checkout. Please note that such
+# checkout will not cause the repository to switch branches,
+# and submodules will be skipped at the moment. The submodules matching
+# those paths might be checked out in a future version of the eclass.
+#
 # The checkout operation will write to the working copy, and export
 # the repository state into the environment. If the repository contains
 # submodules, they will be checked out recursively.
@@ -795,6 +882,7 @@ git-r3_checkout() {
 
         local out_dir=${2:-${EGIT_CHECKOUT_DIR:-${WORKDIR}/${P}}}
         local local_id=${3:-${CATEGORY}/${PN}/${SLOT%/*}}
+        local checkout_paths=( "${@:4}" )
 
         local -x GIT_DIR
         _git-r3_set_gitdir "${repos[0]}"
@@ -802,11 +890,7 @@ git-r3_checkout() {
         einfo "Checking out \e[1m${repos[0]}\e[22m to \e[1m${out_dir}\e[22m ..."
 
         if ! git cat-file -e refs/git-r3/"${local_id}"/__main__; then
-                if [[ ${EVCS_OFFLINE} ]]; then
-                        die "No local clone of ${repos[0]}. Unable to work with EVCS_OFFLINE."
-                else
-                        die "Logic error: no local clone of ${repos[0]}. git-r3_fetch not used?"
-                fi
+                die "Logic error: no local clone of ${repos[0]}. git-r3_fetch not used?"
         fi
         local remote_ref=$(
                 git symbolic-ref --quiet refs/git-r3/"${local_id}"/__main__
@@ -829,9 +913,10 @@ git-r3_checkout() {
                 # setup 'alternates' to avoid copying objects
                 echo "${orig_repo}/objects" > "${GIT_DIR}"/objects/info/alternates || die
                 # now copy the refs
-                # [htn]* safely catches heads, tags, notes without complaining
-                # on non-existing ones, and omits internal 'git-r3' ref
-                cp -R "${orig_repo}"/refs/[htn]* "${GIT_DIR}"/refs/ || die
+                cp -R "${orig_repo}"/refs/* "${GIT_DIR}"/refs/ || die
+                if [[ -f ${orig_repo}/packed-refs ]]; then
+                        cp "${orig_repo}"/packed-refs "${GIT_DIR}"/packed-refs || die
+                fi
 
                 # (no need to copy HEAD, we will set it via checkout)
 
@@ -845,6 +930,9 @@ git-r3_checkout() {
                 else
                         set -- "${@}" "${new_commit_id}"
                 fi
+                if [[ ${checkout_paths[@]} ]]; then
+                        set -- "${@}" -- "${checkout_paths[@]}"
+                fi
                 echo "${@}" >&2
                 "${@}" || die "git checkout ${remote_ref:-${new_commit_id}} failed"
         }
@@ -867,8 +955,12 @@ git-r3_checkout() {
                         echo "   updating from commit:     ${old_commit_id}"
                         echo "   to commit:                ${new_commit_id}"
 
-                        git --no-pager diff --stat \
+                        set -- git --no-pager diff --stat \
                                 ${old_commit_id}..${new_commit_id}
+                        if [[ ${checkout_paths[@]} ]]; then
+                                set -- "${@}" -- "${checkout_paths[@]}"
+                        fi
+                        "${@}"
                 else
                         echo "   at the commit:            ${new_commit_id}"
                 fi
@@ -876,7 +968,7 @@ git-r3_checkout() {
         git update-ref --no-deref refs/git-r3/"${local_id}"/{__old__,__main__} || die
 
         # recursively checkout submodules
-        if [[ -f ${out_dir}/.gitmodules ]]; then
+        if [[ -f ${out_dir}/.gitmodules && ! ${checkout_paths} ]]; then
                 local submodules
                 _git-r3_set_submodules \
                         "$(<"${out_dir}"/.gitmodules)"
diff --git a/eclass/git-r3.tor.eclass b/eclass/git-r3.tor.eclass
new file mode 100644
index 0000000..e3e6717
--- /dev/null
+++ b/eclass/git-r3.tor.eclass
@@ -0,0 +1,1016 @@
+# Copyright 1999-2015 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# @ECLASS: git-r3.eclass
+# @MAINTAINER:
+# Michał Górny <mgorny@gentoo.org>
+# @BLURB: Eclass for fetching and unpacking git repositories.
+# @DESCRIPTION:
+# Third generation eclass for easing maintenance of live ebuilds using
+# git as remote repository.
+#
+# Patched by symlynX to allow for gits via Tor. Why Tor? Because
+# unlike HTTPS it provides end-to-end authenticity which is not
+# susceptible to man-in-the-middle attacks, so all gits should
+# migrate to Tor, cjdns or gnunet-vpn. But the latter two do
+# not need custom changes to this file to do their job.
+#
+# @FIXME: Should we automatically define EGIT_SOCKS="torsocks"
+#                 when we see that /etc/tor/torsocks.conf exists?
+
+case "${EAPI:-0}" in
+        0|1|2|3|4|5|6)
+                ;;
+        *)
+                die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}"
+                ;;
+esac
+
+if [[ ! ${_GIT_R3} ]]; then
+
+inherit eutils
+
+fi
+
+EXPORT_FUNCTIONS src_unpack
+
+if [[ ! ${_GIT_R3} ]]; then
+
+if [[ ! ${_INHERITED_BY_GIT_2} ]]; then
+        DEPEND=">=dev-vcs/git-1.8.2.1"
+fi
+
+# @ECLASS-VARIABLE: EGIT_CLONE_TYPE
+# @DESCRIPTION:
+# Type of clone that should be used against the remote repository.
+# This can be either of: 'mirror', 'single', 'shallow'.
+#
+# This is intended to be set by user in make.conf. Ebuilds are supposed
+# to set EGIT_MIN_CLONE_TYPE if necessary instead.
+#
+# The 'mirror' type clones all remote branches and tags with complete
+# history and all notes. EGIT_COMMIT can specify any commit hash.
+# Upstream-removed branches and tags are purged from the local clone
+# while fetching. This mode is suitable for cloning the local copy
+# for development or hosting a local git mirror. However, clones
+# of repositories with large diverged branches may quickly grow large.
+#
+# The 'single+tags' type clones the requested branch and all tags
+# in the repository. All notes are fetched as well. EGIT_COMMIT
+# can safely specify hashes throughout the current branch and all tags.
+# No purging of old references is done (if you often switch branches,
+# you may need to remove stale branches yourself). This mode is intended
+# mostly for use with broken git servers such as Google Code that fail
+# to fetch tags along with the branch in 'single' mode.
+#
+# The 'single' type clones only the requested branch or tag. Tags
+# referencing commits throughout the branch history are fetched as well,
+# and all notes. EGIT_COMMIT can safely specify only hashes
+# in the current branch. No purging of old references is done (if you
+# often switch branches, you may need to remove stale branches
+# yourself). This mode is suitable for general use.
+#
+# The 'shallow' type clones only the newest commit on requested branch
+# or tag. EGIT_COMMIT can only specify tags, and since the history is
+# unavailable calls like 'git describe' will not reference prior tags.
+# No purging of old references is done. This mode is intended mostly for
+# embedded systems with limited disk space.
+: ${EGIT_CLONE_TYPE:=single}
+
+# @ECLASS-VARIABLE: EGIT_MIN_CLONE_TYPE
+# @DESCRIPTION:
+# 'Minimum' clone type supported by the ebuild. Takes same values
+# as EGIT_CLONE_TYPE. When user sets a type that's 'lower' (that is,
+# later on the list) than EGIT_MIN_CLONE_TYPE, the eclass uses
+# EGIT_MIN_CLONE_TYPE instead.
+#
+# This variable is intended to be used by ebuilds only. Users are
+# supposed to set EGIT_CLONE_TYPE instead.
+#
+# A common case is to use 'single' whenever the build system requires
+# access to full branch history, or 'single+tags' when Google Code
+# or a similar remote is used that does not support shallow clones
+# and fetching tags along with commits. Please use sparingly, and to fix
+# fatal errors rather than 'non-pretty versions'.
+: ${EGIT_MIN_CLONE_TYPE:=shallow}
+
+# @ECLASS-VARIABLE: EGIT3_STORE_DIR
+# @DESCRIPTION:
+# Storage directory for git sources.
+#
+# This is intended to be set by user in make.conf. Ebuilds must not set
+# it.
+#
+# EGIT3_STORE_DIR=${DISTDIR}/git3-src
+
+# @ECLASS-VARIABLE: EGIT_MIRROR_URI
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# 'Top' URI to a local git mirror. If specified, the eclass will try
+# to fetch from the local mirror instead of using the remote repository.
+#
+# The mirror needs to follow EGIT3_STORE_DIR structure. The directory
+# created by eclass can be used for that purpose.
+#
+# Example:
+# @CODE
+# EGIT_MIRROR_URI="git://mirror.lan/"
+# @CODE
+
+# @ECLASS-VARIABLE: EGIT_REPO_URI
+# @REQUIRED
+# @DESCRIPTION:
+# URIs to the repository, e.g. git://foo, https://foo. If multiple URIs
+# are provided, the eclass will consider them as fallback URIs to try
+# if the first URI does not work. For supported URI syntaxes, read up
+# the manpage for git-clone(1).
+#
+# It can be overriden via env using ${PN}_LIVE_REPO variable.
+#
+# Can be a whitespace-separated list or an array.
+#
+# Example:
+# @CODE
+# EGIT_REPO_URI="git://a/b.git https://c/d.git"
+# @CODE
+
+# @ECLASS-VARIABLE: EVCS_OFFLINE
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# If non-empty, this variable prevents any online operations.
+
+# @ECLASS-VARIABLE: EVCS_UMASK
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# Set this variable to a custom umask. This is intended to be set by
+# users. By setting this to something like 002, it can make life easier
+# for people who do development as non-root (but are in the portage
+# group), and then switch over to building with FEATURES=userpriv.
+# Or vice-versa. Shouldn't be a security issue here as anyone who has
+# portage group write access already can screw the system over in more
+# creative ways.
+
+# @ECLASS-VARIABLE: EGIT_BRANCH
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# The branch name to check out. If unset, the upstream default (HEAD)
+# will be used.
+#
+# It can be overriden via env using ${PN}_LIVE_BRANCH variable.
+
+# @ECLASS-VARIABLE: EGIT_COMMIT
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# The tag name or commit identifier to check out. If unset, newest
+# commit from the branch will be used. If set, EGIT_BRANCH will
+# be ignored.
+#
+# It can be overriden via env using ${PN}_LIVE_COMMIT variable.
+
+# @ECLASS-VARIABLE: EGIT_CHECKOUT_DIR
+# @DESCRIPTION:
+# The directory to check the git sources out to.
+#
+# EGIT_CHECKOUT_DIR=${WORKDIR}/${P}
+
+# @FUNCTION: _git-r3_env_setup
+# @INTERNAL
+# @DESCRIPTION:
+# Set the eclass variables as necessary for operation. This can involve
+# setting EGIT_* to defaults or ${PN}_LIVE_* variables.
+_git-r3_env_setup() {
+        debug-print-function ${FUNCNAME} "$@"
+
+        # check the clone type
+        case "${EGIT_CLONE_TYPE}" in
+                mirror|single+tags|single|shallow)
+                        ;;
+                *)
+                        die "Invalid EGIT_CLONE_TYPE=${EGIT_CLONE_TYPE}"
+        esac
+        case "${EGIT_MIN_CLONE_TYPE}" in
+                shallow)
+                        ;;
+                single)
+                        if [[ ${EGIT_CLONE_TYPE} == shallow ]]; then
+                                einfo "git-r3: ebuild needs to be cloned in '\e[1msingle\e[22m' mode, adjusting"
+                                EGIT_CLONE_TYPE=single
+                        fi
+                        ;;
+                single+tags)
+                        if [[ ${EGIT_CLONE_TYPE} == shallow || ${EGIT_CLONE_TYPE} == single ]]; then
+                                einfo "git-r3: ebuild needs to be cloned in '\e[1msingle+tags\e[22m' mode, adjusting"
+                                EGIT_CLONE_TYPE=single+tags
+                        fi
+                        ;;
+                mirror)
+                        if [[ ${EGIT_CLONE_TYPE} != mirror ]]; then
+                                einfo "git-r3: ebuild needs to be cloned in '\e[1mmirror\e[22m' mode, adjusting"
+                                EGIT_CLONE_TYPE=mirror
+                        fi
+                        ;;
+                *)
+                        die "Invalid EGIT_MIN_CLONE_TYPE=${EGIT_MIN_CLONE_TYPE}"
+        esac
+
+        local esc_pn livevar
+        esc_pn=${PN//[-+]/_}
+
+        livevar=${esc_pn}_LIVE_REPO
+        EGIT_REPO_URI=${!livevar:-${EGIT_REPO_URI}}
+        [[ ${!livevar} ]] \
+                && ewarn "Using ${livevar}, no support will be provided"
+
+        livevar=${esc_pn}_LIVE_BRANCH
+        EGIT_BRANCH=${!livevar:-${EGIT_BRANCH}}
+        [[ ${!livevar} ]] \
+                && ewarn "Using ${livevar}, no support will be provided"
+
+        livevar=${esc_pn}_LIVE_COMMIT
+        EGIT_COMMIT=${!livevar:-${EGIT_COMMIT}}
+        [[ ${!livevar} ]] \
+                && ewarn "Using ${livevar}, no support will be provided"
+
+        # Migration helpers. Remove them when git-2 is removed.
+
+        if [[ ${EGIT_SOURCEDIR} ]]; then
+                eerror "EGIT_SOURCEDIR has been replaced by EGIT_CHECKOUT_DIR. While updating"
+                eerror "your ebuild, please check whether the variable is necessary at all"
+                eerror "since the default has been changed from \${S} to \${WORKDIR}/\${P}."
+                eerror "Therefore, proper setting of S may be sufficient."
+                die "EGIT_SOURCEDIR has been replaced by EGIT_CHECKOUT_DIR."
+        fi
+
+        if [[ ${EGIT_MASTER} ]]; then
+                eerror "EGIT_MASTER has been removed. Instead, the upstream default (HEAD)"
+                eerror "is used by the eclass. Please remove the assignment or use EGIT_BRANCH"
+                eerror "as necessary."
+                die "EGIT_MASTER has been removed."
+        fi
+
+        if [[ ${EGIT_HAS_SUBMODULES} ]]; then
+                eerror "EGIT_HAS_SUBMODULES has been removed. The eclass no longer needs"
+                eerror "to switch the clone type in order to support submodules and therefore"
+                eerror "submodules are detected and fetched automatically."
+                die "EGIT_HAS_SUBMODULES is no longer necessary."
+        fi
+
+        if [[ ${EGIT_PROJECT} ]]; then
+                eerror "EGIT_PROJECT has been removed. Instead, the eclass determines"
+                eerror "the local clone path using path in canonical EGIT_REPO_URI."
+                eerror "If the current algorithm causes issues for you, please report a bug."
+                die "EGIT_PROJECT is no longer necessary."
+        fi
+
+        if [[ ${EGIT_BOOTSTRAP} ]]; then
+                eerror "EGIT_BOOTSTRAP has been removed. Please create proper src_prepare()"
+                eerror "instead."
+                die "EGIT_BOOTSTRAP has been removed."
+        fi
+
+        if [[ ${EGIT_NOUNPACK} ]]; then
+                eerror "EGIT_NOUNPACK has been removed. The eclass no longer calls default"
+                eerror "unpack function. If necessary, please declare proper src_unpack()."
+                die "EGIT_NOUNPACK has been removed."
+        fi
+}
+
+# @FUNCTION: _git-r3_set_gitdir
+# @USAGE: <repo-uri>
+# @INTERNAL
+# @DESCRIPTION:
+# Obtain the local repository path and set it as GIT_DIR. Creates
+# a new repository if necessary.
+#
+# <repo-uri> may be used to compose the path. It should therefore be
+# a canonical URI to the repository.
+_git-r3_set_gitdir() {
+        debug-print-function ${FUNCNAME} "$@"
+
+        local repo_name=${1#*://*/}
+
+        # strip the trailing slash
+        repo_name=${repo_name%/}
+
+        # strip common prefixes to make paths more likely to match
+        # e.g. git://X/Y.git vs https://X/git/Y.git
+        # (but just one of the prefixes)
+        case "${repo_name}" in
+                # gnome.org... who else?
+                browse/*) repo_name=${repo_name#browse/};;
+                # cgit can proxy requests to git
+                cgit/*) repo_name=${repo_name#cgit/};;
+                # pretty common
+                git/*) repo_name=${repo_name#git/};;
+                # gentoo.org
+                gitroot/*) repo_name=${repo_name#gitroot/};;
+                # google code, sourceforge
+                p/*) repo_name=${repo_name#p/};;
+                # kernel.org
+                pub/scm/*) repo_name=${repo_name#pub/scm/};;
+        esac
+        # ensure a .git suffix, same reason
+        repo_name=${repo_name%.git}.git
+        # now replace all the slashes
+        repo_name=${repo_name//\//_}
+
+        local distdir=${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}
+        : ${EGIT3_STORE_DIR:=${distdir}/git3-src}
+
+        GIT_DIR=${EGIT3_STORE_DIR}/${repo_name}
+
+        if [[ ! -d ${EGIT3_STORE_DIR} ]]; then
+                (
+                        addwrite /
+                        mkdir -p "${EGIT3_STORE_DIR}"
+                ) || die "Unable to create ${EGIT3_STORE_DIR}"
+        fi
+
+        addwrite "${EGIT3_STORE_DIR}"
+        if [[ ! -d ${GIT_DIR} ]]; then
+                local saved_umask
+                if [[ ${EVCS_UMASK} ]]; then
+                        saved_umask=$(umask)
+                        umask "${EVCS_UMASK}" || die "Bad options to umask: ${EVCS_UMASK}"
+                fi
+                mkdir "${GIT_DIR}" || die
+                git init --bare || die
+                if [[ ${saved_umask} ]]; then
+                        umask "${saved_umask}" || die
+                fi
+        fi
+}
+
+# @FUNCTION: _git-r3_set_submodules
+# @USAGE: <file-contents>
+# @INTERNAL
+# @DESCRIPTION:
+# Parse .gitmodules contents passed as <file-contents>
+# as in "$(cat .gitmodules)"). Composes a 'submodules' array that
+# contains in order (name, URL, path) for each submodule.
+_git-r3_set_submodules() {
+        debug-print-function ${FUNCNAME} "$@"
+
+        local data=${1}
+
+        # ( name url path ... )
+        submodules=()
+
+        local l
+        while read l; do
+                # submodule.<path>.path=<path>
+                # submodule.<path>.url=<url>
+                [[ ${l} == submodule.*.url=* ]] || continue
+
+                l=${l#submodule.}
+                local subname=${l%%.url=*}
+
+                # skip modules that have 'update = none', bug #487262.
+                local upd=$(echo "${data}" | git config -f /dev/fd/0 \
+                        submodule."${subname}".update)
+                [[ ${upd} == none ]] && continue
+
+                # https://github.com/git/git/blob/master/refs.c#L39
+                # for now, we just filter /. because of #572312
+                local enc_subname=${subname//\/.//_}
+                [[ ${enc_subname} == .* ]] && enc_subname=_${enc_subname#.}
+
+                submodules+=(
+                        "${enc_subname}"
+                        "$(echo "${data}" | git config -f /dev/fd/0 \
+                                submodule."${subname}".url || die)"
+                        "$(echo "${data}" | git config -f /dev/fd/0 \
+                                submodule."${subname}".path || die)"
+                )
+        done < <(echo "${data}" | git config -f /dev/fd/0 -l || die)
+}
+
+# @FUNCTION: _git-r3_set_subrepos
+# @USAGE: <submodule-uri> <parent-repo-uri>...
+# @INTERNAL
+# @DESCRIPTION:
+# Create 'subrepos' array containing absolute (canonical) submodule URIs
+# for the given <submodule-uri>. If the URI is relative, URIs will be
+# constructed using all <parent-repo-uri>s. Otherwise, this single URI
+# will be placed in the array.
+_git-r3_set_subrepos() {
+        debug-print-function ${FUNCNAME} "$@"
+
+        local suburl=${1}
+        subrepos=( "${@:2}" )
+
+        if [[ ${suburl} == ./* || ${suburl} == ../* ]]; then
+                # drop all possible trailing slashes for consistency
+                subrepos=( "${subrepos[@]%%/}" )
+
+                while true; do
+                        if [[ ${suburl} == ./* ]]; then
+                                suburl=${suburl:2}
+                        elif [[ ${suburl} == ../* ]]; then
+                                suburl=${suburl:3}
+
+                                # XXX: correctness checking
+
+                                # drop the last path component
+                                subrepos=( "${subrepos[@]%/*}" )
+                                # and then the trailing slashes, again
+                                subrepos=( "${subrepos[@]%%/}" )
+                        else
+                                break
+                        fi
+                done
+
+                # append the preprocessed path to the preprocessed URIs
+                subrepos=( "${subrepos[@]/%//${suburl}}")
+        else
+                subrepos=( "${suburl}" )
+        fi
+}
+
+
+# @FUNCTION: _git-r3_is_local_repo
+# @USAGE: <repo-uri>
+# @INTERNAL
+# @DESCRIPTION:
+# Determine whether the given URI specifies a local (on-disk)
+# repository.
+_git-r3_is_local_repo() {
+        debug-print-function ${FUNCNAME} "$@"
+
+        local uri=${1}
+
+        [[ ${uri} == file://* || ${uri} == /* ]]
+}
+
+# @FUNCTION: _git-r3_find_head
+# @USAGE: <head-ref>
+# @INTERNAL
+# @DESCRIPTION:
+# Given a ref to which remote HEAD was fetched, try to find
+# a branch matching the commit. Expects 'git show-ref'
+# or 'git ls-remote' output on stdin.
+_git-r3_find_head() {
+        debug-print-function ${FUNCNAME} "$@"
+
+        local head_ref=${1}
+        local head_hash=$(git rev-parse --verify "${1}" || die)
+        local matching_ref
+
+        # TODO: some transports support peeking at symbolic remote refs
+        # find a way to use that rather than guessing
+
+        # (based on guess_remote_head() in git-1.9.0/remote.c)
+        local h ref
+        while read h ref; do
+                # look for matching head
+                if [[ ${h} == ${head_hash} ]]; then
+                        # either take the first matching ref, or master if it is there
+                        if [[ ! ${matching_ref} || ${ref} == refs/heads/master ]]; then
+                                matching_ref=${ref}
+                        fi
+                fi
+        done
+
+        if [[ ! ${matching_ref} ]]; then
+                die "Unable to find a matching branch for remote HEAD (${head_hash})"
+        fi
+
+        echo "${matching_ref}"
+}
+
+# @FUNCTION: git-r3_fetch
+# @USAGE: [<repo-uri> [<remote-ref> [<local-id>]]]
+# @DESCRIPTION:
+# Fetch new commits to the local clone of repository.
+#
+# <repo-uri> specifies the repository URIs to fetch from, as a space-
+# -separated list. The first URI will be used as repository group
+# identifier and therefore must be used consistently. When not
+# specified, defaults to ${EGIT_REPO_URI}.
+#
+# <remote-ref> specifies the remote ref or commit id to fetch.
+# It is preferred to use 'refs/heads/<branch-name>' for branches
+# and 'refs/tags/<tag-name>' for tags. Other options are 'HEAD'
+# for upstream default branch and hexadecimal commit SHA1. Defaults
+# to the first of EGIT_COMMIT, EGIT_BRANCH or literal 'HEAD' that
+# is set to a non-null value.
+#
+# <local-id> specifies the local branch identifier that will be used to
+# locally store the fetch result. It should be unique to multiple
+# fetches within the repository that can be performed at the same time
+# (including parallel merges). It defaults to ${CATEGORY}/${PN}/${SLOT%/*}.
+# This default should be fine unless you are fetching multiple trees
+# from the same repository in the same ebuild.
+#
+# The fetch operation will affect the EGIT_STORE only. It will not touch
+# the working copy, nor export any environment variables.
+# If the repository contains submodules, they will be fetched
+# recursively.
+git-r3_fetch() {
+        debug-print-function ${FUNCNAME} "$@"
+
+        [[ ${EVCS_OFFLINE} ]] && return
+
+        local repos
+        if [[ ${1} ]]; then
+                repos=( ${1} )
+        elif [[ $(declare -p EGIT_REPO_URI) == "declare -a"* ]]; then
+                repos=( "${EGIT_REPO_URI[@]}" )
+        else
+                repos=( ${EGIT_REPO_URI} )
+        fi
+
+        local branch=${EGIT_BRANCH:+refs/heads/${EGIT_BRANCH}}
+        local remote_ref=${2:-${EGIT_COMMIT:-${branch:-HEAD}}}
+        local local_id=${3:-${CATEGORY}/${PN}/${SLOT%/*}}
+        local local_ref=refs/git-r3/${local_id}/__main__
+
+        [[ ${repos[@]} ]] || die "No URI provided and EGIT_REPO_URI unset"
+
+        local -x GIT_DIR
+        _git-r3_set_gitdir "${repos[0]}"
+
+        # prepend the local mirror if applicable
+        if [[ ${EGIT_MIRROR_URI} ]]; then
+                repos=(
+                        "${EGIT_MIRROR_URI%/}/${GIT_DIR##*/}"
+                        "${repos[@]}"
+                )
+        fi
+
+        # try to fetch from the remote
+        local r success saved_umask
+        if [[ ${EVCS_UMASK} ]]; then
+                saved_umask=$(umask)
+                umask "${EVCS_UMASK}" || die "Bad options to umask: ${EVCS_UMASK}"
+        fi
+        for r in "${repos[@]}"; do
+                einfo "Fetching \e[1m${r}\e[22m ..."
+
+                if [[ ${r} == https?://* ]]; then
+                        # if we're not using git protocol, web proxy takes care of things
+                        EGIT_SOCKS = ""
+                elif [[ ! ${EGIT_SOCKS} ]] && [[ ${r} == git://*.onion/* ]]; then
+                        if ROOT=/ has_version 'net-proxy/torsocks'; then
+                                EGIT_SOCKS="torsocks"
+                        else
+                                die "Properly configured net-proxy/torsocks required to fetch git from onion."
+                        fi
+                fi
+
+                local fetch_command=( ${EGIT_SOCKS} git fetch "${r}" )
+                local clone_type=${EGIT_CLONE_TYPE}
+
+                if [[ ${r} == https://* ]] && ! ROOT=/ has_version 'dev-vcs/git[curl]'; then
+                        eerror "git-r3: fetching from https:// requested. In order to support https,"
+                        eerror "dev-vcs/git needs to be built with USE=curl. Example solution:"
+                        eerror
+                        eerror "        echo dev-vcs/git curl >> /etc/portage/package.use"
+                        eerror "        emerge -1v dev-vcs/git"
+                        die "dev-vcs/git built with USE=curl required."
+                fi
+
+                if [[ ${r} == https://code.google.com/* ]]; then
+                        # Google Code has special magic on top of git that:
+                        # 1) can't handle shallow clones at all,
+                        # 2) fetches duplicately when tags are pulled in with branch
+                        # so automatically switch to single+tags mode.
+                        if [[ ${clone_type} == shallow ]]; then
+                                einfo "  Google Code does not support shallow clones"
+                                einfo "  using \e[1mEGIT_CLONE_TYPE=single+tags\e[22m"
+                                clone_type=single+tags
+                        elif [[ ${clone_type} == single ]]; then
+                                einfo "  git-r3: Google Code does not send tags properly in 'single' mode"
+                                einfo "  using \e[1mEGIT_CLONE_TYPE=single+tags\e[22m"
+                                clone_type=single+tags
+                        fi
+                fi
+
+                if [[ ${clone_type} == mirror ]]; then
+                        fetch_command+=(
+                                --prune
+                                # mirror the remote branches as local branches
+                                "+refs/heads/*:refs/heads/*"
+                                # pull tags explicitly in order to prune them properly
+                                "+refs/tags/*:refs/tags/*"
+                                # notes in case something needs them
+                                "+refs/notes/*:refs/notes/*"
+                                # and HEAD in case we need the default branch
+                                # (we keep it in refs/git-r3 since otherwise --prune interferes)
+                                "+HEAD:refs/git-r3/HEAD"
+                        )
+                else # single or shallow
+                        local fetch_l fetch_r
+
+                        if [[ ${remote_ref} == HEAD ]]; then
+                                # HEAD
+                                fetch_l=HEAD
+                        elif [[ ${remote_ref} == refs/* ]]; then
+                                # regular branch, tag or some other explicit ref
+                                fetch_l=${remote_ref}
+                        else
+                                # tag or commit id...
+                                # let ls-remote figure it out
+                                local tagref=$(${EGIT_SOCKS} git ls-remote "${r}" "refs/tags/${remote_ref}")
+
+                                # if it was a tag, ls-remote obtained a hash
+                                if [[ ${tagref} ]]; then
+                                        # tag
+                                        fetch_l=refs/tags/${remote_ref}
+                                else
+                                        # commit id
+                                        # so we need to fetch the whole branch
+                                        if [[ ${branch} ]]; then
+                                                fetch_l=${branch}
+                                        else
+                                                fetch_l=HEAD
+                                        fi
+
+                                        # fetching by commit in shallow mode? can't do.
+                                        if [[ ${clone_type} == shallow ]]; then
+                                                clone_type=single
+                                        fi
+                                fi
+                        fi
+
+                        if [[ ${fetch_l} == HEAD ]]; then
+                                fetch_r=refs/git-r3/HEAD
+                        else
+                                fetch_r=${fetch_l}
+                        fi
+
+                        fetch_command+=(
+                                "+${fetch_l}:${fetch_r}"
+                        )
+
+                        if [[ ${clone_type} == single+tags ]]; then
+                                fetch_command+=(
+                                        # pull tags explicitly as requested
+                                        "+refs/tags/*:refs/tags/*"
+                                )
+                        fi
+                fi
+
+                if [[ ${clone_type} == shallow ]]; then
+                        if _git-r3_is_local_repo; then
+                                # '--depth 1' causes sandbox violations with local repos
+                                # bug #491260
+                                clone_type=single
+                        elif [[ ! $(git rev-parse --quiet --verify "${fetch_r}") ]]
+                        then
+                                # use '--depth 1' when fetching a new branch
+                                fetch_command+=( --depth 1 )
+                        fi
+                else # non-shallow mode
+                        if [[ -f ${GIT_DIR}/shallow ]]; then
+                                fetch_command+=( --unshallow )
+                        fi
+                fi
+
+                set -- "${fetch_command[@]}"
+                echo "${@}" >&2
+                if "${@}"; then
+                        if [[ ${clone_type} == mirror ]]; then
+                                # find remote HEAD and update our HEAD properly
+                                git symbolic-ref HEAD \
+                                        "$(_git-r3_find_head refs/git-r3/HEAD \
+                                                < <(git show-ref --heads || die))" \
+                                                || die "Unable to update HEAD"
+                        else # single or shallow
+                                if [[ ${fetch_l} == HEAD ]]; then
+                                        # find out what branch we fetched as HEAD
+                                        local head_branch=$(_git-r3_find_head \
+                                                refs/git-r3/HEAD \
+                                                < <(${EGIT_SOCKS} git ls-remote --heads "${r}" || die))
+
+                                        # and move it to its regular place
+                                        git update-ref --no-deref "${head_branch}" \
+                                                refs/git-r3/HEAD \
+                                                || die "Unable to sync HEAD branch ${head_branch}"
+                                        git symbolic-ref HEAD "${head_branch}" \
+                                                || die "Unable to update HEAD"
+                                fi
+                        fi
+
+                        # now let's see what the user wants from us
+                        local full_remote_ref=$(
+                                ${EGIT_SOCKS} git rev-parse --verify --symbolic-full-name "${remote_ref}"
+                        )
+
+                        if [[ ${full_remote_ref} ]]; then
+                                # when we are given a ref, create a symbolic ref
+                                # so that we preserve the actual argument
+                                set -- git symbolic-ref "${local_ref}" "${full_remote_ref}"
+                        else
+                                # otherwise, we were likely given a commit id
+                                set -- git update-ref --no-deref "${local_ref}" "${remote_ref}"
+                        fi
+
+                        echo "${@}" >&2
+                        if ! "${@}"; then
+                                die "Referencing ${remote_ref} failed (wrong ref?)."
+                        fi
+
+                        success=1
+                        break
+                fi
+        done
+        if [[ ${saved_umask} ]]; then
+                umask "${saved_umask}" || die
+        fi
+        [[ ${success} ]] || die "Unable to fetch from any of EGIT_REPO_URI"
+
+        # consistency check, in case we got man-in-the-middle't  --lynX
+        git fsck
+
+        # submodules can reference commits in any branch
+        # always use the 'mirror' mode to accomodate that, bug #503332
+        local EGIT_CLONE_TYPE=mirror
+
+        # recursively fetch submodules
+        if git cat-file -e "${local_ref}":.gitmodules &>/dev/null; then
+                local submodules
+                _git-r3_set_submodules \
+                        "$(${EGIT_SOCKS} git cat-file -p "${local_ref}":.gitmodules || die)"
+
+                while [[ ${submodules[@]} ]]; do
+                        local subname=${submodules[0]}
+                        local url=${submodules[1]}
+                        local path=${submodules[2]}
+
+                        # use only submodules for which path does exist
+                        # (this is in par with 'git submodule'), bug #551100
+                        # note: git cat-file does not work for submodules
+                        if [[ $(git ls-tree -d "${local_ref}" "${path}") ]]
+                        then
+                                local commit=$(${EGIT_SOCKS} git rev-parse "${local_ref}:${path}" || die)
+
+                                if [[ ! ${commit} ]]; then
+                                        die "Unable to get commit id for submodule ${subname}"
+                                fi
+
+                                local subrepos
+                                _git-r3_set_subrepos "${url}" "${repos[@]}"
+
+                                git-r3_fetch "${subrepos[*]}" "${commit}" "${local_id}/${subname}"
+                        fi
+
+                        submodules=( "${submodules[@]:3}" ) # shift
+                done
+        fi
+}
+
+# @FUNCTION: git-r3_checkout
+# @USAGE: [<repo-uri> [<checkout-path> [<local-id>]]]
+# @DESCRIPTION:
+# Check the previously fetched tree to the working copy.
+#
+# <repo-uri> specifies the repository URIs, as a space-separated list.
+# The first URI will be used as repository group identifier
+# and therefore must be used consistently with git-r3_fetch.
+# The remaining URIs are not used and therefore may be omitted.
+# When not specified, defaults to ${EGIT_REPO_URI}.
+#
+# <checkout-path> specifies the path to place the checkout. It defaults
+# to ${EGIT_CHECKOUT_DIR} if set, otherwise to ${WORKDIR}/${P}.
+#
+# <local-id> needs to specify the local identifier that was used
+# for respective git-r3_fetch.
+#
+# The checkout operation will write to the working copy, and export
+# the repository state into the environment. If the repository contains
+# submodules, they will be checked out recursively.
+git-r3_checkout() {
+        debug-print-function ${FUNCNAME} "$@"
+
+        local repos
+        if [[ ${1} ]]; then
+                repos=( ${1} )
+        elif [[ $(declare -p EGIT_REPO_URI) == "declare -a"* ]]; then
+                repos=( "${EGIT_REPO_URI[@]}" )
+        else
+                repos=( ${EGIT_REPO_URI} )
+        fi
+
+        local out_dir=${2:-${EGIT_CHECKOUT_DIR:-${WORKDIR}/${P}}}
+        local local_id=${3:-${CATEGORY}/${PN}/${SLOT%/*}}
+
+        local -x GIT_DIR
+        _git-r3_set_gitdir "${repos[0]}"
+
+        einfo "Checking out \e[1m${repos[0]}\e[22m to \e[1m${out_dir}\e[22m ..."
+
+        if ! git cat-file -e refs/git-r3/"${local_id}"/__main__; then
+                if [[ ${EVCS_OFFLINE} ]]; then
+                        die "No local clone of ${repos[0]}. Unable to work with EVCS_OFFLINE."
+                else
+                        die "Logic error: no local clone of ${repos[0]}. git-r3_fetch not used?"
+                fi
+        fi
+        local remote_ref=$(
+                git symbolic-ref --quiet refs/git-r3/"${local_id}"/__main__
+        )
+        local new_commit_id=$(
+                git rev-parse --verify refs/git-r3/"${local_id}"/__main__
+        )
+
+        git-r3_sub_checkout() {
+                local orig_repo=${GIT_DIR}
+                local -x GIT_DIR=${out_dir}/.git
+                local -x GIT_WORK_TREE=${out_dir}
+
+                mkdir -p "${out_dir}" || die
+
+                # use git init+fetch instead of clone since the latter doesn't like
+                # non-empty directories.
+
+                git init --quiet || die
+                # setup 'alternates' to avoid copying objects
+                echo "${orig_repo}/objects" > "${GIT_DIR}"/objects/info/alternates || die
+                # now copy the refs
+                # [htn]* safely catches heads, tags, notes without complaining
+                # on non-existing ones, and omits internal 'git-r3' ref
+                cp -R "${orig_repo}"/refs/[htn]* "${GIT_DIR}"/refs/ || die
+
+                # (no need to copy HEAD, we will set it via checkout)
+
+                if [[ -f ${orig_repo}/shallow ]]; then
+                        cp "${orig_repo}"/shallow "${GIT_DIR}"/ || die
+                fi
+
+                set -- git checkout --quiet
+                if [[ ${remote_ref} ]]; then
+                        set -- "${@}" "${remote_ref#refs/heads/}"
+                else
+                        set -- "${@}" "${new_commit_id}"
+                fi
+                echo "${@}" >&2
+                "${@}" || die "git checkout ${remote_ref:-${new_commit_id}} failed"
+        }
+        git-r3_sub_checkout
+        unset -f git-r3_sub_checkout
+
+        local old_commit_id=$(
+                git rev-parse --quiet --verify refs/git-r3/"${local_id}"/__old__
+        )
+        if [[ ! ${old_commit_id} ]]; then
+                echo "GIT NEW branch -->"
+                echo "   repository:               ${repos[0]}"
+                echo "   at the commit:            ${new_commit_id}"
+        else
+                # diff against previous revision
+                echo "GIT update -->"
+                echo "   repository:               ${repos[0]}"
+                # write out message based on the revisions
+                if [[ "${old_commit_id}" != "${new_commit_id}" ]]; then
+                        echo "   updating from commit:     ${old_commit_id}"
+                        echo "   to commit:                ${new_commit_id}"
+
+                        git --no-pager diff --stat \
+                                ${old_commit_id}..${new_commit_id}
+                else
+                        echo "   at the commit:            ${new_commit_id}"
+                fi
+        fi
+        git update-ref --no-deref refs/git-r3/"${local_id}"/{__old__,__main__} || die
+
+        # recursively checkout submodules
+        if [[ -f ${out_dir}/.gitmodules ]]; then
+                local submodules
+                _git-r3_set_submodules \
+                        "$(<"${out_dir}"/.gitmodules)"
+
+                while [[ ${submodules[@]} ]]; do
+                        local subname=${submodules[0]}
+                        local url=${submodules[1]}
+                        local path=${submodules[2]}
+
+                        # use only submodules for which path does exist
+                        # (this is in par with 'git submodule'), bug #551100
+                        if [[ -d ${out_dir}/${path} ]]; then
+                                local subrepos
+                                _git-r3_set_subrepos "${url}" "${repos[@]}"
+
+                                git-r3_checkout "${subrepos[*]}" "${out_dir}/${path}" \
+                                        "${local_id}/${subname}"
+                        fi
+
+                        submodules=( "${submodules[@]:3}" ) # shift
+                done
+        fi
+
+        # keep this *after* submodules
+        export EGIT_DIR=${GIT_DIR}
+        export EGIT_VERSION=${new_commit_id}
+}
+
+# @FUNCTION: git-r3_peek_remote_ref
+# @USAGE: [<repo-uri> [<remote-ref>]]
+# @DESCRIPTION:
+# Peek the reference in the remote repository and print the matching
+# (newest) commit SHA1.
+#
+# <repo-uri> specifies the repository URIs to fetch from, as a space-
+# -separated list. When not specified, defaults to ${EGIT_REPO_URI}.
+#
+# <remote-ref> specifies the remote ref to peek.  It is preferred to use
+# 'refs/heads/<branch-name>' for branches and 'refs/tags/<tag-name>'
+# for tags. Alternatively, 'HEAD' may be used for upstream default
+# branch. Defaults to the first of EGIT_COMMIT, EGIT_BRANCH or literal
+# 'HEAD' that is set to a non-null value.
+#
+# The operation will be done purely on the remote, without using local
+# storage. If commit SHA1 is provided as <remote-ref>, the function will
+# fail due to limitations of git protocol.
+#
+# On success, the function returns 0 and writes hexadecimal commit SHA1
+# to stdout. On failure, the function returns 1.
+git-r3_peek_remote_ref() {
+        debug-print-function ${FUNCNAME} "$@"
+
+        local repos
+        if [[ ${1} ]]; then
+                repos=( ${1} )
+        elif [[ $(declare -p EGIT_REPO_URI) == "declare -a"* ]]; then
+                repos=( "${EGIT_REPO_URI[@]}" )
+        else
+                repos=( ${EGIT_REPO_URI} )
+        fi
+
+        local branch=${EGIT_BRANCH:+refs/heads/${EGIT_BRANCH}}
+        local remote_ref=${2:-${EGIT_COMMIT:-${branch:-HEAD}}}
+
+        [[ ${repos[@]} ]] || die "No URI provided and EGIT_REPO_URI unset"
+
+        local r success
+        for r in "${repos[@]}"; do
+                einfo "Peeking \e[1m${remote_ref}\e[22m on \e[1m${r}\e[22m ..." >&2
+
+                local lookup_ref
+                if [[ ${remote_ref} == refs/* || ${remote_ref} == HEAD ]]
+                then
+                        lookup_ref=${remote_ref}
+                else
+                        # ls-remote by commit is going to fail anyway,
+                        # so we may as well pass refs/tags/ABCDEF...
+                        lookup_ref=refs/tags/${remote_ref}
+                fi
+
+                # split on whitespace
+                local ref=(
+                        $(git ls-remote "${r}" "${lookup_ref}")
+                )
+
+                if [[ ${ref[0]} ]]; then
+                        echo "${ref[0]}"
+                        return 0
+                fi
+        done
+
+        return 1
+}
+
+git-r3_src_fetch() {
+        debug-print-function ${FUNCNAME} "$@"
+
+        if [[ ! ${EGIT3_STORE_DIR} && ${EGIT_STORE_DIR} ]]; then
+                ewarn "You have set EGIT_STORE_DIR but not EGIT3_STORE_DIR. Please consider"
+                ewarn "setting EGIT3_STORE_DIR for git-r3.eclass. It is recommended to use"
+                ewarn "a different directory than EGIT_STORE_DIR to ease removing old clones"
+                ewarn "when git-2 eclass becomes deprecated."
+        fi
+
+        _git-r3_env_setup
+        git-r3_fetch
+}
+
+git-r3_src_unpack() {
+        debug-print-function ${FUNCNAME} "$@"
+
+        _git-r3_env_setup
+        git-r3_src_fetch
+        git-r3_checkout
+}
+
+# https://bugs.gentoo.org/show_bug.cgi?id=482666
+git-r3_pkg_needrebuild() {
+        debug-print-function ${FUNCNAME} "$@"
+
+        local new_commit_id=$(git-r3_peek_remote_ref)
+        [[ ${new_commit_id} && ${EGIT_VERSION} ]] || die "Lookup failed"
+
+        if [[ ${EGIT_VERSION} != ${new_commit_id} ]]; then
+                einfo "Update from \e[1m${EGIT_VERSION}\e[22m to \e[1m${new_commit_id}\e[22m"
+        else
+                einfo "Local and remote at \e[1m${EGIT_VERSION}\e[22m"
+        fi
+
+        [[ ${EGIT_VERSION} != ${new_commit_id} ]]
+}
+
+# 'export' locally until this gets into EAPI
+pkg_needrebuild() { git-r3_pkg_needrebuild; }
+
+_GIT_R3=1
+fi
diff --git a/media-fonts/unscii/Manifest b/media-fonts/unscii/Manifest
new file mode 100644
index 0000000..5e6ec93
--- /dev/null
+++ b/media-fonts/unscii/Manifest
@@ -0,0 +1,25 @@
+DIST unscii-1.1-src.tar.gz 1181933 BLAKE2B 7757bd6d2062fb6fbafce9dc244468936b93a064b78bad41881bdcef6298e023d3dc7d8d8abebd95eb592bd30f0c0b10847ae8c9a40527bb9b88d1a106c1eba5 SHA512 4b172c8bfce53c588c10affc5f9b044ab099b3d87a00059de256543f46a7978ebc4e9470a6886ef379024bf18f2ed96968b31bfd25a3ff3db44d03c80f6fb55a
+DIST unscii-16-full.otf 6242788 BLAKE2B 872ed7ecce66fe15fee84ddb39531672bf0927ceac1c216ba1e72817135a6f522e719af47ea56fb4746876784c5d9545f63987246598d849c29f886efcf20409 SHA512 0ddf040ab4a9e3e9e11ec12b9ce633de79812690d6f86fb67c1586d43e420de9ca743fa83701c23cebd3d8a27b62148869aef06f30ef3937b8d53d50958eca6c
+DIST unscii-16-full.pcf 5338168 BLAKE2B 2ae5be5c7ff44d51f9a47abe48256c430df2227f9a72d37749c43de50043f367018ab182487a664f80281e75a3c233b6a08f55f39c6f96553df4cd721926f5b1 SHA512 5af92a6791055dbe3aa8eca824d204b344ecd6cdbaf0f3c122f7af0a0db00fbbe5ed065f64bdc3773f8155c24558a000f4e6e6503d7c9771167f44a593f5240e
+DIST unscii-16-full.ttf 11587408 BLAKE2B 4dcff84878aedbe7dcdd69b8a9a2303078c4c1810416bbcaeb42c0b200d288d9eca3e80a82944c88d068ed1080a8960103da41fae8a0dbaf5d625d80c151ba2f SHA512 fc79e3f892705337a039436e1c8782c03e20fff9470c774983319fa0462a00eaae496c16a60826ce8bab44fc87b0cd01ebecf0ced0f49a0e89278cb7e86773ef
+DIST unscii-16.otf 101768 BLAKE2B d13b18e9fd239381ed0ad58420d47d279b7d595b69a6ba144b78347aaed98708b6244af09561e8cbade728729e266428f42cc996cd84228d54ba9aac2b16fb9a SHA512 53863b2b74ba66825cf5e43a053f609e67a444fdf6f07ac13be8efad426cab3502e030d4e35d416c99e03ee784c85b7565a8472cf6de591f33c157f71414d462
+DIST unscii-16.pcf 344608 BLAKE2B 3c4a8a232979105116d30372247e5f09be19402b3ad5338bf5e5561f5eda99c994fd0f035e6a8877d19d14fca67c840aa998b523f23d1505828a8de20afb7eba SHA512 5e739257ad79bbb9dea12393a690889888ded296a19c8017a5d3d4725c907c3773de647663d5037f87cc23795ee1b3a7d16318be40f43f3fc9cce11681daf328
+DIST unscii-16.ttf 188204 BLAKE2B d9d08c52c8858b0d9e940dc8ee1c8970353aa35dbbae7f8bce29b3e3a778a6945d24a6ed236021223648f93b1175990b0baa3462621507f63f5e8c309bfff6c2 SHA512 d51ed256b6397082412de2ea9c4cbb494c8689003a55436339464a42f5ff59bd8c621550f1ab22f06fc9a390d2928a36d4f5cbfd25040d071f9e4649a6f3f128
+DIST unscii-8-alt.otf 97444 BLAKE2B 8495a8791e4191704231e1f0df0c5a752f29b1bc65acc2b7e691d77a1a844a9003f4b9cc65aa01bdaad0f46402682c382ab9f5bef26d2747a67693d905c1827f SHA512 0837ac766bd7881887156e7b6726e88a3ad50809ee65f39512f784deaf6f7f60d3619bca0fe199a9247075a65d4d4f874f288f009754423c2df9b78a995f35f4
+DIST unscii-8-alt.pcf 265984 BLAKE2B 0c6d81ef9008b16d93cab62147c50ad83675491e0706e5d0d17ac4df1c6fecbc7b0225a2d5e38e9dfb7bb8689dfe905ceb18aec638c1acffb01216fd5d2dba10 SHA512 607bbaa16f22465435412511b8d68aa44be9836cbd85a15bab4a32104a5625da5a5cd726c44dde1f1d15065be63df9e920183409bbaf5b6918d3e401bda2f6c3
+DIST unscii-8-alt.ttf 176696 BLAKE2B 00b0f459fdbd50b5187c20e6d671d088726718b1eb7e9ac7eb5758264be05d8f26a3fe4765b72098241f0177c0bc8a23253d54c46a42ef5f6469a1259c35b3b2 SHA512 02466b8350afe708e401430885443e10757695ed273829407e3d1da2c51c839873d95763b62e6afd136352026010ef569cb25ff68137e01fad6dcc8e37d01250
+DIST unscii-8-fantasy.otf 97916 BLAKE2B 4322e418dc8e060126790e651a3c5471afb2ef61918b936bbc89ad3e7f353b4879e75d0db56b3e015910a88b6db577d059c3be6f48cb66061d09a74a75f00909 SHA512 97a75bfc8072d63ee5f4bbd603cf99d000214561bf8d4cf936b5b713ad422b29d9c951c8eab75d2a25e013dfa182bba3fa2da141d0fb8db7c2eece3dd965fba9
+DIST unscii-8-fantasy.pcf 265992 BLAKE2B a78348ff3a632a146caa6b0bc1694385f888a89a64289431f9782b584702ce8579864c303dcbdc4267e6a41a69e1736d10fd99c57b23e0b4ebba99bf8b37e633 SHA512 8687f97a4aadcebd7bee2b9e2d39487c4553a2f652a3be2423cc5fbe720307c48dfe095cc88e2d5580ed52dd657477e48e72f1a18dd549bbd300680e5aaff6d9
+DIST unscii-8-fantasy.ttf 176888 BLAKE2B 8d7fe68c0d62a70d710c867b1bbb6f913838fb3255c1f120fbf3af3c335620bf24916d8da06fcbad3b59351aad5f8887bb571b51a08786c0f061667b2f2f01ab SHA512 40acb8f42eeef15ee842215e7c93784f754140607abe0f0a571b8cdedac79f4202fad2359333938759f7ef05e359d307d311773a5bed047a6b776845465b57fa
+DIST unscii-8-mcr.otf 96864 BLAKE2B 9c3b582ce6e66f3cf7c54db1f0f7c4fe94572302d59d03e0cf4972c9ffcd4999b20769585b7ef360d740be7cdc96dac58942d8d5beb2bfb25e4715e638266457 SHA512 4d0216a2fe270ebf2241b7874dd0924028f7fffa80d270b9bcdab2352b9a537f7205e4d50c4423049a2fb54ad088a97593ecd286bd64ce8fb75ab7c911b00d3b
+DIST unscii-8-mcr.pcf 265984 BLAKE2B 0922c0280ce09e585d98149f08b6599ca6622ae01bd174fbab4188cef72035e251371af58d4c387d51321e555a9bdaa329c7174f3d8b916b220e7b135a8db9a5 SHA512 2b336140a6b6dc9af683aaa20fcbe93078664c3f394d04dd966a8be65923e9592333d2a9d5549bf2fd760cadd0922afbaa92c4e3e21596b5871516d192b45b3f
+DIST unscii-8-mcr.ttf 174044 BLAKE2B 3a8bf5ae0d6f748bca5a340a3282c6b6ccf918c8a8ad2349cf7ace25394314d4997d5f11fc6e4685b142a67479aac48d3be66742c94154e746a87009b57d6d5b SHA512 15458d2e0129604fc74828758131101b2a6894dd7d4240b297b5c65d28eaa9405543a99bc2aad108b568e3d49aaf71053467d5b34eb9319e678d22d0c074c59c
+DIST unscii-8-tall.otf 138388 BLAKE2B 46cc7e5db68fc45d0690e8140c1ca16d6fabbebe5a2e4fe367b5eb4b2de794e1616fe33674c599bf618fb47a5597522a8b9019d55b00f556b0bd34868a0cd274 SHA512 6a28ad2f80a93f7d11ac752665412c6c8466f556dab4255f345ca9c89a45e2ef9c19f89052bfab4686de47804054f06a10658370c1a3ac31e692b00ad3e90ed3
+DIST unscii-8-tall.pcf 354504 BLAKE2B a06f49bc82037b939c8d42b4818b8f311f001bd43f480c343dde9035b9baafbc97349b49cd6a394611b2723bede9c23639c806b0f915f96641ee84e30acd4846 SHA512 1627ffa4d73082cdda479ca571478f26270a89148df3dd38d7ea5ad500be2d9b435d6f7dfb930219b0c0089358399396d717f98c097f277fbf8d5510f49b2d09
+DIST unscii-8-tall.ttf 275252 BLAKE2B 602c53268768fdf965942a4d112f66aabf951626ecbb379609c0e4a8976ec6630c731472c46daa71f86447b2534b0684e9bb8773f44f0ff826aa2b2a77bd34a0 SHA512 c81ccbd352e801d17aa6855782ae4ea957ff7c5fd3b9c9ad4efc2d5dc79edb34c395b489b7ef0cd400b52cdfcd38e657ae2f8239fecc36051c479973290d642a
+DIST unscii-8-thin.otf 98588 BLAKE2B 34df80c0d4b459f5de964a63764d59460f1a07ee2be5cff8e90921eacf6b86990b2c0891b5168971438e2e730a9c63e112e11d55a5870d4838a6dd147958177e SHA512 7a819a0e91291686962c23ed6f15b30ffe3fb66bb349a0a16e1a9cb13d4b6f8c830fbc1c26f1a2eef264a99a25927608ab87260efebeb8cfe0e2dd222c75ded4
+DIST unscii-8-thin.pcf 265984 BLAKE2B 5a5a27b97177168880835ebac8689d89f1589eea524df7af55bfc58d64ec578c19354f039c7916d7c8592e9da3e01effced9fcf7fa7208f32ff3b230fa5cc4e0 SHA512 c936fa49fcd2a5aab7a6ffe6fc9972c78835bf0435185f95480720da760fbaf4fcdd2309a717e6ed2fa3748d3932d92fa5f54158889e1cfd8b1a162b0ae5f713
+DIST unscii-8-thin.ttf 177052 BLAKE2B 7193d03f55180e31435283090c87df39dcfd7d8c684e039913a14bb625abcf7d8f4642c4fa19ab9aeb88ed2e3f71a392982fd2a798ed4d8ef4e0964e48f04a8a SHA512 30765d99499a733cc3af27e2d106b53dc4e56714b4059d9d5d65950bd701c331c111067c5df584967d3500733ea418a0f4c8cce2f1eb00936dd6e7c9b084e020
+DIST unscii-8.otf 95984 BLAKE2B e0f564a77f3533dc894c0eb193ac260bf1e1a4551c4cef7e600086de056c1d37aa84849511c5b760d16a7d73f88e97d59dabd9986f7d5483bca5c5d6ee0d9276 SHA512 b8d0b1e82c47d6d84705cc376d2c83193f81145f5562dce473dd3826d5587a172cedb063dfe731428c66a186b94267631792ad5b6e3500481f4414981c7ef08f
+DIST unscii-8.pcf 265980 BLAKE2B 8d3485240348aa898365768cc9a7280f0423f5a00eecbd2bd8e39e7c7cad4d9bd5338be285e80633f79fd75fd125148db37ef92b977c0e85baaa2c5516ef4a31 SHA512 294e37a471d1951b1fbfa2fc3445858ed605452f63f7f87922421343a0639643fba21556087231c64682c161cd307d100120d78c9001cc8e5352db5a42b34a8a
+DIST unscii-8.ttf 175664 BLAKE2B a80daabb3c009b41c21019839a7695fcabb5750a25181200ac2dd53aae7734b38ee674eaae52b64731b24ecd43aa07a5d2f4b107aa47d19ef4c84495d725a050 SHA512 b8d441eed6eb365595f437341ac77b7829326daa90734396b487ae3219d6b19009caff8b4a8bdcae12b9a90477c59724c3bf57afd59bbfd8d3ed5f3d2dd50d5a
diff --git a/media-fonts/unscii/metadata.xml b/media-fonts/unscii/metadata.xml
new file mode 100644
index 0000000..e2617ab
--- /dev/null
+++ b/media-fonts/unscii/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+        <maintainer type="person">
+                <email>4nykey@gmail.com</email>
+        </maintainer>
+        <use>
+                <flag name="utils">Install bm2uns util to convert a bitmap image to unscii art</flag>
+        </use>
+</pkgmetadata>
diff --git a/media-fonts/unscii/unscii-1.1.ebuild b/media-fonts/unscii/unscii-1.1.ebuild
new file mode 100644
index 0000000..64b49b2
--- /dev/null
+++ b/media-fonts/unscii/unscii-1.1.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_FONT_TYPES=( otf +pcf ttf )
+MY_FONT_VARIANTS=( alt fantasy mcr tall thin )
+inherit toolchain-funcs font-r1
+
+DESCRIPTION="A bitmapped Unicode font based on classic system fonts"
+HOMEPAGE="http://pelulamu.net/${PN}/"
+SRC_URI="
+        ${HOMEPAGE}${P}-src.tar.gz
+        binary? (
+                unicode? (
+                        font_types_otf? ( ${HOMEPAGE}${PN}-16-full.otf )
+                        font_types_pcf? ( ${HOMEPAGE}${PN}-16-full.pcf )
+                        font_types_ttf? ( ${HOMEPAGE}${PN}-16-full.ttf )
+                )
+                !unicode? (
+                        font_types_otf? ( ${HOMEPAGE}${PN}-16.otf )
+                        font_types_pcf? ( ${HOMEPAGE}${PN}-16.pcf )
+                        font_types_ttf? ( ${HOMEPAGE}${PN}-16.ttf )
+                )
+                font_types_otf? (
+                        ${HOMEPAGE}${PN}-8.otf
+                        font_variants_alt? ( ${HOMEPAGE}${PN}-8-alt.otf )
+                        font_variants_fantasy? ( ${HOMEPAGE}${PN}-8-fantasy.otf )
+                        font_variants_mcr? ( ${HOMEPAGE}${PN}-8-mcr.otf )
+                        font_variants_tall? ( ${HOMEPAGE}${PN}-8-tall.otf )
+                        font_variants_thin? ( ${HOMEPAGE}${PN}-8-thin.otf )
+                )
+                font_types_pcf? (
+                        ${HOMEPAGE}${PN}-8.pcf
+                        font_variants_alt? ( ${HOMEPAGE}${PN}-8-alt.pcf )
+                        font_variants_fantasy? ( ${HOMEPAGE}${PN}-8-fantasy.pcf )
+                        font_variants_mcr? ( ${HOMEPAGE}${PN}-8-mcr.pcf )
+                        font_variants_tall? ( ${HOMEPAGE}${PN}-8-tall.pcf )
+                        font_variants_thin? ( ${HOMEPAGE}${PN}-8-thin.pcf )
+                )
+                font_types_ttf? (
+                        ${HOMEPAGE}${PN}-8.ttf
+                        font_variants_alt? ( ${HOMEPAGE}${PN}-8-alt.ttf )
+                        font_variants_fantasy? ( ${HOMEPAGE}${PN}-8-fantasy.ttf )
+                        font_variants_mcr? ( ${HOMEPAGE}${PN}-8-mcr.ttf )
+                        font_variants_tall? ( ${HOMEPAGE}${PN}-8-tall.ttf )
+                        font_variants_thin? ( ${HOMEPAGE}${PN}-8-thin.ttf )
+                )
+        )
+"
+RESTRICT="primaryuri"
+
+LICENSE="OFL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+binary unicode utils"
+
+RDEPEND="
+        utils? ( media-libs/sdl-image )
+"
+DEPEND="
+        ${RDEPEND}
+        !binary? (
+                dev-lang/perl
+                font_types_otf? ( media-gfx/fontforge )
+                font_types_ttf? ( media-gfx/fontforge )
+                font_types_pcf? ( x11-apps/bdftopcf )
+                unicode? (
+                        media-fonts/unifont[utils]
+                )
+        )
+        utils? ( dev-lang/perl )
+"
+S="${WORKDIR}/${P}-src"
+DOCS=( ${PN}.txt )
+
+src_unpack() {
+        unpack ${P}-src.tar.gz
+        use binary && cp -L "${DISTDIR}"/*.*f "${S}"
+}
+
+src_prepare() {
+        default
+        use binary && return
+        use unicode && cp "${EROOT}"usr/share/unifont/unifont.hex "${S}"
+        local _t='\<woff\>'
+        use font_types_otf || _t+='\|\<otf\>'
+        use font_types_ttf || _t+='\|\<ttf\>'
+        sed -e "/\(${_t}\)/d" -i makevecfonts.ff
+}
+
+src_compile() {
+        use utils && emake CC="$(tc-getCC) ${CFLAGS}" bm2uns
+        use binary && return
+        local _s _v _t=( )
+        for _s in ${FONT_SUFFIX}; do
+                _s=${_s/otf/ttf}
+                _t+=(
+                        ${PN}-8.${_s}
+                        ${PN}-16$(usex unicode '-full' '').${_s}
+                )
+                for _v in "${MY_FONT_VARIANTS[@]}"; do
+                        has ${_v} ${USE} && _t+=( ${PN}-8-${_v#font_variants_}.${_s} )
+                done
+        done
+        emake CC="$(tc-getCC) ${CFLAGS}" "${_t[@]}"
+}
+
+src_install() {
+        font-r1_src_install
+        use utils && dobin bm2uns
+}
diff --git a/net-im/gajim/Manifest b/net-im/gajim/Manifest
new file mode 100644
index 0000000..8055cbb
--- /dev/null
+++ b/net-im/gajim/Manifest
@@ -0,0 +1,3 @@
+DIST gajim-0.16.6.tar.bz2 4564505 BLAKE2B 0446d826afc782ceba4fe67d6c7173d60264ec1b5a227f0da62285ea1d083143b4895e4472c2df499de419f9a34c59d9afa1ac2348052defb100438782a3df46 SHA512 6c8c2a38429468a1e6f02aae730ff947c649960e8cc672457c1e1733ab2dad6534b1e5ac2e1c0c385e331a6ba817c6e67c1a27443632b9fd43e7ab76ad66c935
+DIST gajim-0.16.9.tar.bz2 4469275 BLAKE2B 451f09cde9d177932429b9ece900e09c58ac43b5f97cd64cf70e75d13f2261ab52ee35e02e8680c83a5d81d7574bca561532dd1327f1109b0cc872956b1a05f7 SHA512 d8ddae3826bbcd4458b016b3cf6b0472b41db4b9026b300b058d9cef403195e38423ff950fcbf6fed0cdbbb485a274905a9a5945028c4cbb24d1a38c72bf4cbb
+DIST gajim-1.0.3.tar.bz2 5964743 BLAKE2B af4bf2206a962eb68c4df09359fa3a0ccaca1e886d4fad67d9839f5fd4c1fd359c7ee7933d39d8c1ae7dcbde6b72548fef3564a467653064d4d37aa1db234c04 SHA512 a6d7f92a22a9dddc8a4b07eda0aae0b6fb4db57c73133ee19937f7e2a2a82c5351051d1f3627c94a44434276ed001b83d375f708f177962125af66cda8579ec8
diff --git a/net-im/gajim/files/0.16.6-0001-Add-config-option-to-activate-XEP-0146.patch b/net-im/gajim/files/0.16.6-0001-Add-config-option-to-activate-XEP-0146.patch
new file mode 100644
index 0000000..046c72c
--- /dev/null
+++ b/net-im/gajim/files/0.16.6-0001-Add-config-option-to-activate-XEP-0146.patch
@@ -0,0 +1,45 @@
+From 285392b27db7cb01b0566b4bda3920e6559b75e4 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Philipp=20H=C3=B6rist?= <forenjunkie@chello.at>
+Date: Fri, 26 May 2017 23:10:05 +0200
+Subject: [PATCH] Add config option to activate XEP-0146 commands
+
+Some of the Commands have security implications, thats why we disable them per default
+Fixes #8378
+---
+ src/common/commands.py | 7 ++++---
+ src/common/config.py   | 1 +
+ 2 files changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/src/common/commands.py b/src/common/commands.py
+index 40d700710..46d6947f8 100644
+--- a/src/common/commands.py
++++ b/src/common/commands.py
+@@ -345,9 +345,10 @@ class ConnectionCommands:
+     def __init__(self):
+         # a list of all commands exposed: node -> command class
+         self.__commands = {}
+-        for cmdobj in (ChangeStatusCommand, ForwardMessagesCommand,
+-        LeaveGroupchatsCommand, FwdMsgThenDisconnectCommand):
+-            self.__commands[cmdobj.commandnode] = cmdobj
++        if gajim.config.get('remote_commands'):
++            for cmdobj in (ChangeStatusCommand, ForwardMessagesCommand,
++            LeaveGroupchatsCommand, FwdMsgThenDisconnectCommand):
++                self.__commands[cmdobj.commandnode] = cmdobj
+ 
+         # a list of sessions; keys are tuples (jid, sessionid, node)
+         self.__sessions = {}
+diff --git a/src/common/config.py b/src/common/config.py
+index 3884d9e1d..7c1313fc4 100644
+--- a/src/common/config.py
++++ b/src/common/config.py
+@@ -313,6 +313,7 @@ class Config:
+             'ignore_incoming_attention': [opt_bool, False, _('If True, Gajim will ignore incoming attention requestd ("wizz").')],
+             'remember_opened_chat_controls': [ opt_bool, True, _('If enabled, Gajim will reopen chat windows that were opened last time Gajim was closed.')],
+             'positive_184_ack': [ opt_bool, False, _('If enabled, Gajim will show an icon to show that sent message has been received by your contact')],
++            'remote_commands': [opt_bool, False, _('If True, Gajim will execute XEP-0146 Commands.')],
+     }, {})
+ 
+     __options_per_key = {
+-- 
+2.12.2
+
diff --git a/net-im/gajim/files/disable-gspell-1.1.0.patch b/net-im/gajim/files/disable-gspell-1.1.0.patch
new file mode 100644
index 0000000..45c16a1
--- /dev/null
+++ b/net-im/gajim/files/disable-gspell-1.1.0.patch
@@ -0,0 +1,21 @@
+--- a/gajim/common/app.py       2018-11-06 23:57:20.088079001 +0100
++++ a/gajim/common/app.py       2018-11-06 23:58:36.638834033 +0100
+@@ -299,17 +299,7 @@
+         pass
+ 
+     # GSPELL
+-    try:
+-        gi.require_version('Gspell', '1')
+-        from gi.repository import Gspell
+-        langs = Gspell.language_get_available()
+-        for lang in langs:
+-            log('gajim').info('%s (%s) dict available',
+-                              lang.get_name(), lang.get_code())
+-        if langs:
+-            _dependencies['GSPELL'] = True
+-    except (ImportError, ValueError):
+-        pass
++    # [REMOVED BY EBUILD]
+ 
+     # Print results
+     for dep, val in _dependencies.items():
diff --git a/net-im/gajim/gajim-0.16.6-r1.ebuild b/net-im/gajim/gajim-0.16.6-r1.ebuild
new file mode 100644
index 0000000..8d50c46
--- /dev/null
+++ b/net-im/gajim/gajim-0.16.6-r1.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite,xml"
+
+AUTOTOOLS_AUTORECONF=true
+
+inherit autotools-utils python-r1 versionator
+
+MY_PV=${PV/_/-}
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Jabber client written in PyGTK"
+HOMEPAGE="https://www.gajim.org/"
+SRC_URI="
+        https://www.gajim.org/downloads/$(get_version_component_range 1-2)/${MY_P}.tar.bz2"
+#       test? ( https://dev.gentoo.org/~jlec/distfiles/${PN}-tests-${PV}.tar.xz )"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 arm x86 ~x86-fbsd"
+IUSE="crypt dbus gnome gnome-keyring kde idle jingle libnotify networkmanager nls spell +srv test X xhtml zeroconf"
+
+REQUIRED_USE="
+        ${PYTHON_REQUIRED_USE}
+        libnotify? ( dbus )
+        gnome? ( gnome-keyring )
+        zeroconf? ( dbus )"
+
+COMMON_DEPEND="
+        ${PYTHON_DEPS}
+        dev-python/pygtk:2[${PYTHON_USEDEP}]
+        x11-libs/gtk+:2"
+DEPEND="${COMMON_DEPEND}
+        >=dev-util/intltool-0.40.1
+        virtual/pkgconfig
+        >=sys-devel/gettext-0.17-r1"
+RDEPEND="${COMMON_DEPEND}
+        dev-python/pyasn1[${PYTHON_USEDEP}]
+        >=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
+        !>=dev-python/pyopenssl-17.4.0[${PYTHON_USEDEP}]
+        >=dev-python/python-nbxmpp-0.5.3[${PYTHON_USEDEP}]
+        crypt? (
+                app-crypt/gnupg
+                dev-python/pycrypto[${PYTHON_USEDEP}]
+                )
+        dbus? (
+                dev-python/dbus-python[${PYTHON_USEDEP}]
+                dev-libs/dbus-glib
+                libnotify? ( dev-python/notify-python[${PYTHON_USEDEP}] )
+                zeroconf? ( net-dns/avahi[dbus,gtk,python,${PYTHON_USEDEP}] )
+                )
+        gnome? (
+                dev-python/libgnome-python[${PYTHON_USEDEP}]
+                dev-python/egg-python[${PYTHON_USEDEP}]
+                )
+        gnome-keyring? ( dev-python/gnome-keyring-python[${PYTHON_USEDEP}] )
+        idle? ( x11-libs/libXScrnSaver )
+        jingle? ( net-libs/farstream:0.1[python,${PYTHON_USEDEP}] )
+        kde? ( kde-apps/kwalletmanager )
+        networkmanager? (
+                        dev-python/dbus-python[${PYTHON_USEDEP}]
+                        net-misc/networkmanager
+                )
+        spell? ( app-text/gtkspell:2 )
+        srv? (
+                || (
+                        dev-python/libasyncns-python[${PYTHON_USEDEP}]
+                        net-dns/bind-tools
+                        )
+                )
+        xhtml? ( dev-python/docutils[${PYTHON_USEDEP}] )"
+
+RESTRICT="test"
+
+PATCHES=(
+        "${FILESDIR}/${PV}-0001-Add-config-option-to-activate-XEP-0146.patch" )
+
+S="${WORKDIR}"/${MY_P}
+
+src_prepare() {
+        autotools-utils_src_prepare
+        python_copy_sources
+}
+
+src_configure() {
+        configuration() {
+                local myeconfargs=(
+                        $(use_enable nls)
+                        $(use_with X x)
+                        --docdir="/usr/share/doc/${PF}"
+                        --libdir="$(python_get_sitedir)"
+                        --enable-site-packages
+                )
+                run_in_build_dir autotools-utils_src_configure
+        }
+        python_foreach_impl configuration
+}
+
+src_compile() {
+        compilation() {
+                run_in_build_dir autotools-utils_src_compile
+        }
+        python_foreach_impl compilation
+}
+
+src_test() {
+        testing() {
+                run_in_build_dir ${PYTHON} test/runtests.py --verbose 3 || die
+        }
+        python_foreach_impl testing
+}
+
+src_install() {
+        installation() {
+                run_in_build_dir autotools-utils_src_install
+                python_optimize
+        }
+        python_foreach_impl installation
+
+        rm "${ED}/usr/share/doc/${PF}/README.html" || die
+        dohtml README.html
+}
diff --git a/net-im/gajim/gajim-0.16.9.ebuild b/net-im/gajim/gajim-0.16.9.ebuild
new file mode 100644
index 0000000..50310bd
--- /dev/null
+++ b/net-im/gajim/gajim-0.16.9.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite,xml"
+
+AUTOTOOLS_AUTORECONF=true
+
+inherit autotools-utils gnome2-utils python-r1 versionator xdg-utils
+
+MY_PV=${PV/_/-}
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Jabber client written in PyGTK"
+HOMEPAGE="https://www.gajim.org/"
+SRC_URI="
+        https://www.gajim.org/downloads/$(get_version_component_range 1-2)/${MY_P}.tar.bz2"
+#       test? ( https://dev.gentoo.org/~jlec/distfiles/${PN}-tests-${PV}.tar.xz )"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86 ~x86-fbsd"
+IUSE="crypt dbus gnome gnome-keyring idle jingle libnotify networkmanager nls spell +srv test X xhtml zeroconf"
+
+REQUIRED_USE="
+        ${PYTHON_REQUIRED_USE}
+        libnotify? ( dbus )
+        gnome? ( gnome-keyring )
+        zeroconf? ( dbus )"
+
+COMMON_DEPEND="
+        ${PYTHON_DEPS}
+        dev-python/pygtk:2[${PYTHON_USEDEP}]
+        x11-libs/gtk+:2"
+DEPEND="${COMMON_DEPEND}
+        >=dev-util/intltool-0.40.1
+        virtual/pkgconfig
+        >=sys-devel/gettext-0.17-r1"
+RDEPEND="${COMMON_DEPEND}
+        dev-python/pyasn1[${PYTHON_USEDEP}]
+        >=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
+        >=dev-python/python-nbxmpp-0.6.1[${PYTHON_USEDEP}]
+        crypt? ( >=dev-python/python-gnupg-0.4.0[${PYTHON_USEDEP}] )
+        dbus? (
+                dev-python/dbus-python[${PYTHON_USEDEP}]
+                dev-libs/dbus-glib
+                libnotify? ( dev-python/notify-python[${PYTHON_USEDEP}] )
+                zeroconf? ( net-dns/avahi[dbus,gtk,python,${PYTHON_USEDEP}] )
+                )
+        gnome? (
+                dev-python/libgnome-python[${PYTHON_USEDEP}]
+                dev-python/egg-python[${PYTHON_USEDEP}]
+                )
+        gnome-keyring? ( dev-python/gnome-keyring-python[${PYTHON_USEDEP}] )
+        idle? ( x11-libs/libXScrnSaver )
+        jingle? ( net-libs/farstream:0.1[python,${PYTHON_USEDEP}] )
+        networkmanager? (
+                        dev-python/dbus-python[${PYTHON_USEDEP}]
+                        net-misc/networkmanager
+                )
+        spell? ( app-text/gtkspell:2 )
+        srv? (
+                || (
+                        dev-python/libasyncns-python[${PYTHON_USEDEP}]
+                        net-dns/bind-tools
+                        )
+                )
+        xhtml? ( dev-python/docutils[${PYTHON_USEDEP}] )"
+
+RESTRICT="test"
+
+S="${WORKDIR}"/${MY_P}
+
+src_prepare() {
+        autotools-utils_src_prepare
+        python_copy_sources
+}
+
+src_configure() {
+        configuration() {
+                local myeconfargs=(
+                        $(use_enable nls)
+                        $(use_with X x)
+                        --docdir="/usr/share/doc/${PF}"
+                        --libdir="$(python_get_sitedir)"
+                        --enable-site-packages
+                )
+                run_in_build_dir autotools-utils_src_configure
+        }
+        python_foreach_impl configuration
+}
+
+src_compile() {
+        compilation() {
+                run_in_build_dir autotools-utils_src_compile
+        }
+        python_foreach_impl compilation
+}
+
+src_test() {
+        testing() {
+                run_in_build_dir ${PYTHON} test/runtests.py --verbose 3 || die
+        }
+        python_foreach_impl testing
+}
+
+src_install() {
+        installation() {
+                run_in_build_dir autotools-utils_src_install
+                python_optimize
+        }
+        python_foreach_impl installation
+}
+
+pkg_postinst() {
+        gnome2_icon_cache_update
+        xdg_desktop_database_update
+}
+
+pkg_postrm() {
+        gnome2_icon_cache_update
+        xdg_desktop_database_update
+}
diff --git a/net-im/gajim/gajim-1.0.3-r3.ebuild b/net-im/gajim/gajim-1.0.3-r3.ebuild
new file mode 100644
index 0000000..3f52531
--- /dev/null
+++ b/net-im/gajim/gajim-1.0.3-r3.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_REQ_USE="sqlite,xml"
+DISTUTILS_SINGLE_IMPL=1
+
+inherit gnome2-utils distutils-r1 versionator xdg-utils
+
+DESCRIPTION="Jabber client written in PyGTK"
+HOMEPAGE="https://www.gajim.org/"
+SRC_URI="https://www.gajim.org/downloads/$(get_version_component_range 1-2)/${P}.tar.bz2"
+#https://ftp.gajim.org/plugins_1/plugin_installer.zip -> ${P}-plugin_installer.zip"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="gpg +crypt remote idle jingle keyring networkmanager upnp geoclue spell +webp rst omemo"
+
+COMMON_DEPEND="
+        dev-libs/gobject-introspection[cairo,${PYTHON_USEDEP}]
+        x11-libs/gtk+:3[introspection]"
+DEPEND="${COMMON_DEPEND}
+        app-arch/unzip
+        >=dev-util/intltool-0.40.1
+        virtual/pkgconfig
+        >=sys-devel/gettext-0.17-r1"
+RDEPEND="${COMMON_DEPEND}
+        dev-python/pyasn1[${PYTHON_USEDEP}]
+        dev-python/pycairo[${PYTHON_USEDEP}]
+        dev-python/pygobject:3[${PYTHON_USEDEP}]
+        >=dev-python/python-nbxmpp-0.6.6[${PYTHON_USEDEP}]
+        dev-python/pyopenssl[${PYTHON_USEDEP}]
+        dev-python/idna[${PYTHON_USEDEP}]
+        dev-python/precis-i18n[${PYTHON_USEDEP}]
+        dev-python/pycurl[${PYTHON_USEDEP}]
+        crypt? ( dev-python/pycryptodome[${PYTHON_USEDEP}] )
+        gpg? ( >=dev-python/python-gnupg-0.4.0[${PYTHON_USEDEP}] )
+        idle? ( x11-libs/libXScrnSaver )
+        remote? (
+                >=dev-python/dbus-python-1.2.0[${PYTHON_USEDEP}]
+                dev-libs/dbus-glib
+        )
+        rst? ( dev-python/docutils[${PYTHON_USEDEP}] )
+        keyring? ( dev-python/keyring[${PYTHON_USEDEP}] )
+        jingle? (
+                net-libs/farstream:0.2[introspection]
+                media-libs/gstreamer:1.0[introspection]
+                media-libs/gst-plugins-base:1.0[introspection]
+                media-libs/gst-plugins-ugly:1.0
+        )
+        networkmanager? ( net-misc/networkmanager[introspection] )
+        upnp? ( net-libs/gupnp-igd[introspection] )
+        geoclue? ( app-misc/geoclue[introspection] )
+        spell? (
+                app-text/gspell[introspection]
+                app-text/hunspell
+        )
+        omemo? (
+                dev-python/python-axolotl[${PYTHON_USEDEP}]
+                dev-python/qrcode[${PYTHON_USEDEP}]
+        )
+        webp? ( dev-python/pillow[${PYTHON_USEDEP}] )
+"
+
+RESTRICT="test"
+
+src_prepare() {
+        ewarn "I will not update the Gajim ebuilds in the future since they are"
+        ewarn "available in the pzskc383 repo. Please use that instead."
+
+        default
+
+        use spell || eapply "${FILESDIR}/disable-gspell.patch"
+}
+
+pkg_postinst() {
+        gnome2_icon_cache_update
+        xdg_desktop_database_update
+}
+
+pkg_postrm() {
+        gnome2_icon_cache_update
+        xdg_desktop_database_update
+}
diff --git a/net-im/gajim/gajim-9999.ebuild b/net-im/gajim/gajim-9999.ebuild
new file mode 100644
index 0000000..47dcedf
--- /dev/null
+++ b/net-im/gajim/gajim-9999.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_REQ_USE="sqlite,xml"
+DISTUTILS_SINGLE_IMPL=1
+
+inherit git-r3 python-r1
+
+DESCRIPTION="Jabber client written in PyGTK"
+HOMEPAGE="http://www.gajim.org/"
+EGIT_REPO_URI="https://dev.gajim.org/gajim/gajim.git"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS=""
+IUSE="gpg +crypt remote idle jingle keyring networkmanager upnp geoclue spell +webp rst omemo"
+
+COMMON_DEPEND="
+                dev-libs/gobject-introspection[cairo,${PYTHON_USEDEP}]
+                x11-libs/gtk+:3[introspection]"
+DEPEND="${COMMON_DEPEND}
+                app-arch/unzip
+                >=dev-util/intltool-0.40.1
+                virtual/pkgconfig
+                >=sys-devel/gettext-0.17-r1"
+RDEPEND="${COMMON_DEPEND}
+                dev-python/pyasn1[${PYTHON_USEDEP}]
+                dev-python/pycairo[${PYTHON_USEDEP}]
+                dev-python/pygobject:3[${PYTHON_USEDEP}]
+                >=dev-python/python-nbxmpp-0.6.6[${PYTHON_USEDEP}]
+                dev-python/pyopenssl[${PYTHON_USEDEP}]
+                dev-python/idna[${PYTHON_USEDEP}]
+                dev-python/precis-i18n[${PYTHON_USEDEP}]
+                dev-python/pycurl[${PYTHON_USEDEP}]
+                crypt? ( dev-python/pycryptodome[${PYTHON_USEDEP}] )
+                gpg? ( >=dev-python/python-gnupg-0.4.0[${PYTHON_USEDEP}] )
+                idle? ( x11-libs/libXScrnSaver )
+                remote? (
+                                >=dev-python/dbus-python-1.2.0[${PYTHON_USEDEP}]
+                                dev-libs/dbus-glib
+                )
+                rst? ( dev-python/docutils[${PYTHON_USEDEP}] )
+                keyring? ( dev-python/keyring[${PYTHON_USEDEP}] )
+                jingle? (
+                                net-libs/farstream:0.2[introspection]
+                                media-libs/gstreamer:1.0[introspection]
+                                media-libs/gst-plugins-base:1.0[introspection]
+                                media-libs/gst-plugins-ugly:1.0
+                )
+                networkmanager? ( net-misc/networkmanager[introspection] )
+                upnp? ( net-libs/gupnp-igd[introspection] )
+                geoclue? ( app-misc/geoclue[introspection] )
+                spell? (
+                                app-text/gspell[introspection]
+                                app-text/hunspell
+                )
+                omemo? (
+                                dev-python/python-axolotl[${PYTHON_USEDEP}]
+                                dev-python/qrcode[${PYTHON_USEDEP}]
+                )
+                webp? ( dev-python/pillow[${PYTHON_USEDEP}] )
+"
+
+RESTRICT="test"
+
+src_prepare() {
+        autotools-utils_src_prepare
+        python_copy_sources
+}
+
+src_configure() {
+        configuration() {
+                local myeconfargs=(
+                        $(use_enable nls)
+                        $(use_with X x)
+                        --docdir="/usr/share/doc/${PF}"
+                        --libdir="$(python_get_sitedir)"
+                        --enable-site-packages
+                )
+                run_in_build_dir autotools-utils_src_configure
+        }
+        python_foreach_impl configuration
+}
+
+src_compile() {
+        compilation() {
+                run_in_build_dir autotools-utils_src_compile
+        }
+        python_foreach_impl compilation
+}
+
+src_test() {
+        testing() {
+                run_in_build_dir ${PYTHON} test/runtests.py --verbose 3 || die
+        }
+        python_foreach_impl testing
+}
+
+src_install() {
+        installation() {
+                run_in_build_dir autotools-utils_src_install
+                python_optimize
+        }
+        python_foreach_impl installation
+
+        rm "${ED}/usr/share/doc/${PF}/README.html" || die
+        dohtml README.html
+}
diff --git a/net-im/gajim/metadata.xml b/net-im/gajim/metadata.xml
new file mode 100644
index 0000000..4ed46fb
--- /dev/null
+++ b/net-im/gajim/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>aidecoe@gentoo.org</email>
+  </maintainer>
+  <longdescription>
+    A fully featured and easy to use GTK+ Jabber client written in PyGTK.
+  </longdescription>
+  <use>
+    <flag name="idle">Enable idle module</flag>
+    <flag name="srv">SRV capabilities</flag>
+    <flag name="xhtml">Enable XHTML support</flag>
+  </use>
+</pkgmetadata>
diff --git a/profiles/package.mask b/profiles/package.mask
index 8e891ab..850dcf3 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -25,3 +25,4 @@ net-im/cutegram
 
 # unfinished
 www-client/hardzilla
+=www-plugins/gnash-9999
diff --git a/www-plugins/gnash/Manifest b/www-plugins/gnash/Manifest
new file mode 100644
index 0000000..60e4956
--- /dev/null
+++ b/www-plugins/gnash/Manifest
@@ -0,0 +1,8 @@
+AUX gnash-0.8.10-amf-include.patch 1245 BLAKE2B f73c74329ae848e6dc1674d58179d5c04cb30dd7b4dcfe30b0e09ed350ad2ceabc7d5b1fde2866fc691f558cbe277bde3f594b6b5e11609b404998312a8b3d49 SHA512 46c2b9d4a57a1180626760ebcdbcbdc10c01fba4e01d8c45378ad26da3bf1181daaa54a2c88419452b6e691467c1ccb77374d8e926776b5f1b93ee2baa875986
+AUX gnash-0.8.10_p20150316-boost-1.60.patch 746 BLAKE2B cdb98c9424940aa5b2596bd94f037708211323f2fa1d371ba923d12f1279644e517bd4eccaa42528b13e452e915b8ebd7e6f032e8add1be7590a76e9a02f7599 SHA512 302946a47710978471837a8ddacd4be0eaf116cd6d1389f98155a939df774d61557eaafcec473cfdb37c06439b6f7cc5de8a5494fb880aa62669df5d951feb5d
+AUX gnash-0.8.9-external-dejagnu.patch 700 BLAKE2B c01f515259aa96076cf47f0f3a5553b405dae0ce997dc50310207189fc3aacd89a6f3158bb8ec47ff6a30072d872884f159c7e3c35176929639bb0222775887a SHA512 1b6714e0d44d3d43dcef53622cb6a8c153a1e336a99ef5ee13de1a092e54dc1b1c346e4468e9ea66035762195bd45b84dd185370bb726427472e5b5d6b470556
+AUX gnash-0.8.9-kde4-libdir.patch 498 BLAKE2B ae7d071ef8026e134415481b613c343fea78e038ba7568a6b05e319eaf7c02ec6a20502a7486e560beec30f05d50716ec468456f5a0fd5b88c94c64f71bc5c1a SHA512 df1a6faf5b3cae8a519b590ee3e26009b5a194a01f5dacc5b1862751118d1172f0babf85f7641d6b8e898d5013b6c11002c593df589c57312d842930ab964341
+AUX gnash-0.8.9-klash.patch 471 BLAKE2B 0006bfe83a78dd923766972b44138ceea36befaaf5e9b09560e2a06b0d902791a8d7645e32d357196264fc126c34d448585672647cf800085e07a48138fd5980 SHA512 4a57310522ac2323eee26bb027432b12606d91add6d528b31afd69e172c73aa9f80bafc7c0a84fed4214773f901b65ddea4a7de67865f82a2984ac1dfe274c4d
+DIST gnash-0.8.10_p20160329.tar.xz 4079572 BLAKE2B 4d5f4799add9d2e00a9b9322dc48be0b8b3c9f790dc5881d9fba6e4d9646537786f7644d3dbbf3bd259d1975062438af071eb2ab28c661de2b5510368c9d218e SHA512 e8956d6277dde29a22bfe5af4279b40f80dad5659961d042e0bb57505b084f3ef1b489cf6fdf06730a8f3e2f9fdb737d7b1bc015a0255a80b167b98e686aa245
+EBUILD gnash-0.8.10_p20160329-r667.ebuild 6514 BLAKE2B 1e9d5c14c5460a8416d820eed3c8c2562e6807a27c2f0c37427b96ddab12bddf8433ca0dfe833852946a6ceed3650dc16fc135a5cf1e7abf265365b8e805fea0 SHA512 a0d6a953779154e042a2e2480038ba32c9de4177e1837b16f616dd05766a483142ba4e19f867f1caaaf3b5950e0591d3af19f83d671bee196ac3c565be3012af
+MISC metadata.xml 1086 BLAKE2B d00c9a09b846c88412200030a6744cc2a0fad5cbbeabf054ef3fac4e658061355a2133b4ef374904d4553d8cd3cce9ae806da4d1e3dd2b0e4161f39db912cea4 SHA512 819c7c00ab2ed21cb5826f534fe8cc51394d41a67e038f9f0ca707061494af1954a242b8cf9f67c3952d20dc4f8eff47b759d8b8e197e0207e617c20786f6c73
diff --git a/www-plugins/gnash/files/gnash-0.8.10-amf-include.patch b/www-plugins/gnash/files/gnash-0.8.10-amf-include.patch
new file mode 100644
index 0000000..983fa6b
--- /dev/null
+++ b/www-plugins/gnash/files/gnash-0.8.10-amf-include.patch
@@ -0,0 +1,45 @@
+diff -ur a/cygnal/libnet/cque.h b/cygnal/libnet/cque.h
+--- a/cygnal/libnet/cque.h      2012-01-19 20:17:47.000000000 +0100
++++ b/cygnal/libnet/cque.h      2012-02-23 20:13:39.000000000 +0100
+@@ -25,8 +25,9 @@
+ #include <boost/thread/condition.hpp>
+ #include <deque>
+ 
++#include "../libamf/amf.h"
+ #include "getclocktime.hpp"
+-#include "buffer.h"
++#include "../libamf/buffer.h"
+ #include "network.h"
+ #include "dsodefs.h" //For DSOEXPORT.
+ 
+diff -ur a/cygnal/libnet/sshclient.h b/cygnal/libnet/sshclient.h
+--- a/cygnal/libnet/sshclient.h 2012-01-19 20:17:47.000000000 +0100
++++ b/cygnal/libnet/sshclient.h 2012-02-23 20:13:09.000000000 +0100
+@@ -32,9 +32,10 @@
+ #include <libssh/sftp.h>
+ }
+ 
++#include "../libamf/amf.h"
+ #include "cque.h"
+ #include "network.h"
+-#include "buffer.h"
++#include "../libamf/buffer.h"
+ 
+ namespace gnash
+ {
+diff -ur a/cygnal/libnet/sslclient.h b/cygnal/libnet/sslclient.h
+--- a/cygnal/libnet/sslclient.h 2012-01-19 20:17:47.000000000 +0100
++++ b/cygnal/libnet/sslclient.h 2012-02-23 20:13:21.000000000 +0100
+@@ -36,10 +36,11 @@
+ #include <openssl/err.h>
+ #endif
+ 
++#include "../libamf/amf.h"
+ #include "dsodefs.h"
+ #include "cque.h"
+ #include "network.h"
+-#include "buffer.h"
++#include "../libamf/buffer.h"
+ 
+ 
+ namespace gnash
diff --git a/www-plugins/gnash/files/gnash-0.8.10_p20150316-boost-1.60.patch b/www-plugins/gnash/files/gnash-0.8.10_p20150316-boost-1.60.patch
new file mode 100644
index 0000000..6671d36
--- /dev/null
+++ b/www-plugins/gnash/files/gnash-0.8.10_p20150316-boost-1.60.patch
@@ -0,0 +1,24 @@
+diff --git i/libbase/accumulator.h w/libbase/accumulator.h
+index 694cbd2..876c669 100644
+--- i/libbase/accumulator.h
++++ w/libbase/accumulator.h
+@@ -22,6 +22,7 @@
+ 
+ #include <boost/program_options/value_semantic.hpp>
+ #include <boost/any.hpp>
++#include <boost/version.hpp>
+ #include <functional>
+ #include <vector>
+ #include <string>
+@@ -61,6 +62,11 @@ public:
+     virtual unsigned min_tokens() const { return 0; }
+     virtual unsigned max_tokens() const { return 0; }
+ 
++#if BOOST_VERSION >= 105900
++    /// There are no tokens, so this is indifferent.
++    virtual bool adjacent_tokens_only() const { return false; }
++#endif
++
+     /// Accumulating from different sources is silly.
+     virtual bool is_composing() const { return false; }
+ 
diff --git a/www-plugins/gnash/files/gnash-0.8.9-external-dejagnu.patch b/www-plugins/gnash/files/gnash-0.8.9-external-dejagnu.patch
new file mode 100644
index 0000000..eaffda7
--- /dev/null
+++ b/www-plugins/gnash/files/gnash-0.8.9-external-dejagnu.patch
@@ -0,0 +1,24 @@
+diff -ur a/plugin/npapi/test.cpp b/plugin/npapi/test.cpp
+--- a/plugin/npapi/test.cpp     2011-03-13 17:47:36.000000000 +0100
++++ b/plugin/npapi/test.cpp     2011-03-20 23:52:20.369998096 +0100
+@@ -35,7 +35,7 @@
+ #include "npfunctions.h"
+ #endif
+ #include "pluginbase.h"
+-#include "dejagnu.h"
++#include <dejagnu.h>
+ #include "../../testsuite/check.h"
+ #include <regex.h>
+ 
+diff -ur a/testsuite/check.h b/testsuite/check.h
+--- a/testsuite/check.h 2011-02-26 19:11:08.000000000 +0100
++++ b/testsuite/check.h 2011-03-20 23:52:32.570998094 +0100
+@@ -29,7 +29,7 @@
+ 
+ #define HAVE_DEJAGNU_H 1 // we ship our own now...
+ #ifdef HAVE_DEJAGNU_H
+-#include "dejagnu.h"
++#include <dejagnu.h>
+ 
+ #define info(x) note x
+ 
diff --git a/www-plugins/gnash/files/gnash-0.8.9-kde4-libdir.patch b/www-plugins/gnash/files/gnash-0.8.9-kde4-libdir.patch
new file mode 100644
index 0000000..b327944
--- /dev/null
+++ b/www-plugins/gnash/files/gnash-0.8.9-kde4-libdir.patch
@@ -0,0 +1,12 @@
+diff -ur a/macros/kde4.m4 b/macros/kde4.m4
+--- a/macros/kde4.m4    2011-02-26 19:11:08.000000000 +0100
++++ b/macros/kde4.m4    2011-11-25 18:09:25.000000000 +0100
+@@ -198,7 +198,7 @@
+       if test -d ${KDE4_PREFIX}/lib64 -a -f /etc/redhat-release; then
+         KDE4_PLUGINDIR="${KDE4_PREFIX}/lib64/kde4"
+       else
+-        KDE4_PLUGINDIR="${KDE4_PREFIX}/lib/kde4"
++        KDE4_PLUGINDIR="${KDE4_PREFIX}/${acl_libdirstem}/kde4"
+       fi
+     fi
+     if test x"${with_kde4_servicesdir}" != x ; then 
diff --git a/www-plugins/gnash/files/gnash-0.8.9-klash.patch b/www-plugins/gnash/files/gnash-0.8.9-klash.patch
new file mode 100644
index 0000000..e6afec0
--- /dev/null
+++ b/www-plugins/gnash/files/gnash-0.8.9-klash.patch
@@ -0,0 +1,12 @@
+diff -ur a/macros/kde4.m4 b/macros/kde4.m4
+--- a/macros/kde4.m4    2011-02-26 19:11:08.000000000 +0100
++++ b/macros/kde4.m4    2011-03-21 00:04:38.845997945 +0100
+@@ -210,7 +210,7 @@
+       KDE4_CONFIGDIR="${KDE4_PREFIX}/share/kde4/config"
+     fi
+     if test x"${KDE4_APPSDATADIR}" = x ; then 
+-      KDE4_APPSDATADIR="${KDE4_PREFIX}/share/kde4/apps/klash"
++      KDE4_APPSDATADIR="${KDE4_PREFIX}/share/apps/klash"
+     fi
+ 
+   if test x"${ac_cv_path_kde4_incl}" != x ; then
diff --git a/www-plugins/gnash/gnash-0.8.10_p20160329-r667.ebuild b/www-plugins/gnash/gnash-0.8.10_p20160329-r667.ebuild
new file mode 100644
index 0000000..b1bef02
--- /dev/null
+++ b/www-plugins/gnash/gnash-0.8.10_p20160329-r667.ebuild
@@ -0,0 +1,259 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+AT_M4DIR="cygnal"
+# won't build with python-3, bug #392969
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools eutils multilib nsplugins python-any-r1 flag-o-matic xdg-utils
+
+DESCRIPTION="GNU Flash movie player that supports many SWF v7,8,9 features"
+HOMEPAGE="https://www.gnu.org/software/gnash/"
+
+if [[ ${PV} = 9999* ]]; then
+        SRC_URI=""
+        EGIT_REPO_URI="git://git.savannah.gnu.org/gnash.git"
+        inherit git-r3
+else
+# Release tarball is b0rked, upstream #35612
+        SRC_URI="mirror://gnu/${PN}/${PV}/${P}.tar.gz"
+        SRC_URI="mirror://gentoo/${P}.tar.xz"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 ppc ~ppc64 ~sparc x86"
+IUSE="X +agg cairo cygnal dbus directfb doc dump egl fbcon +ffmpeg libav libressl gnome gtk harden jemalloc lirc mysql +nls nsplugin opengl openvg python sdl +sdl-sound ssh ssl test vaapi"
+REQUIRED_USE="
+        dump? ( agg ffmpeg )
+        fbcon? ( agg )
+        nsplugin? ( gtk )
+        openvg? ( egl )
+        python? ( gtk )
+        vaapi? ( agg ffmpeg )
+        || ( agg cairo opengl openvg )
+        || ( dump fbcon gtk sdl )
+"
+
+RDEPEND=">=dev-libs/boost-1.41.0
+        dev-libs/expat
+        dev-libs/libxml2:2
+        virtual/jpeg:0
+        media-libs/libpng:0=
+        net-misc/curl
+        x11-libs/libX11
+        x11-libs/libXi
+        x11-libs/libXmu
+        x11-libs/libXt
+        media-libs/giflib:=
+        agg? ( x11-libs/agg )
+        cairo? ( x11-libs/cairo )
+        directfb? (
+                dev-libs/DirectFB
+        )
+        doc? (
+                >=app-text/docbook2X-0.8.8
+                app-text/docbook-sgml-utils
+        )
+        egl? (
+                media-libs/mesa[egl]
+        )
+        fbcon? (
+                x11-libs/tslib
+        )
+        ffmpeg? (
+                libav? ( media-video/libav:0=[vaapi?] )
+                !libav? ( media-video/ffmpeg:0=[vaapi?] )
+        )
+        gtk? (
+                x11-libs/gtk+:2
+                python? ( dev-python/pygtk:2 )
+        )
+        jemalloc? ( dev-libs/jemalloc )
+        opengl? (
+                virtual/glu
+                virtual/opengl
+                gtk? ( x11-libs/gtkglext )
+        )
+        openvg? (
+                media-libs/mesa[openvg]
+        )
+        sdl? ( media-libs/libsdl[X] )
+        sdl-sound? ( media-libs/libsdl )
+        >=media-libs/speex-1.2.0
+        media-libs/speexdsp
+        sys-libs/zlib
+        >=sys-devel/libtool-2.2
+        mysql? ( virtual/mysql )
+        lirc? ( app-misc/lirc )
+        dbus? ( sys-apps/dbus )
+        ssh? ( >=net-libs/libssh-0.4[server] )
+        ssl? (
+                libressl? ( dev-libs/libressl:0= )
+                !libressl? ( dev-libs/openssl:0= )
+        )
+        vaapi? ( x11-libs/libva[opengl?] )
+        "
+DEPEND="${RDEPEND}
+        virtual/pkgconfig
+        nls? ( sys-devel/gettext )
+        gnome? ( app-text/rarian )
+        nsplugin? ( net-misc/npapi-sdk )
+        test? ( dev-util/dejagnu )
+        ${PYTHON_DEPS}
+"
+# Tests hang with sandbox, bug #321017
+RESTRICT="test"
+
+pkg_setup() {
+        python-any-r1_pkg_setup
+
+        if use !ffmpeg; then
+                ewarn "You are trying to build Gnash without choosing a media handler."
+                ewarn "Sound and video playback will not work."
+        fi
+}
+
+src_unpack() {
+        default
+        # rename git snapshot directory to what portage expects
+        mv ${PN}-*/ ${P} || die
+}
+
+src_prepare() {
+        default
+
+        xdg_environment_reset # 591014
+
+        # Fix paths for klash, bug #339610
+        eapply "${FILESDIR}"/${PN}-0.8.9-klash.patch
+
+        # Use external dejagnu for tests, bug #321017
+        eapply "${FILESDIR}"/${PN}-0.8.9-external-dejagnu.patch
+
+        # Fix building on ppc64, bug #342535
+        use ppc64 && append-flags -mminimal-toc
+
+        # Fix kde multilib library path, bug #391283
+        eapply "${FILESDIR}"/${PN}-0.8.9-kde4-libdir.patch
+
+        # Fix libamf includes
+        eapply "${FILESDIR}"/${PN}-0.8.10-amf-include.patch
+
+        # Fix new adjacent_tokens_only() in >=boost-1.59 (bug 579142)
+        # See https://savannah.gnu.org/bugs/?46148
+        eapply "${FILESDIR}"/${PN}-0.8.10_p20150316-boost-1.60.patch
+
+        eautoreconf
+}
+src_configure() {
+        local device gui input media myconf myext renderers
+
+        # Set nsplugin install directory.
+        use nsplugin && myconf="${myconf} --with-npapi-plugindir=/usr/$(get_libdir)/gnash/npapi/"
+
+        # Set hardware acceleration.
+        use X && device+=",x11"
+        use directfb && device+=",directfb"
+        use egl && device+=",egl"
+        use fbcon && device+=",rawfb"
+        use vaapi && device+=",vaapi"
+        [[ "${device}x" == "x" ]] && device+=",none"
+
+        # Set rendering engine.
+        use agg && renderers+=",agg"
+        use cairo && renderers+=",cairo"
+        use opengl && renderers+=",opengl"
+        use openvg && renderers+=",openvg"
+
+        # Set media handler.
+        use ffmpeg || media+=",none"
+        use ffmpeg && media+=",ffmpeg"
+
+        # Set gui.
+        use dump && gui+=",dump"
+        use fbcon && gui+=",fb"
+        use gtk && gui+=",gtk"
+        use sdl && gui+=",sdl"
+
+        if use sdl-sound; then
+                myconf="${myconf} --enable-sound=sdl"
+        else
+                myconf="${myconf} --enable-sound=none"
+        fi
+
+        # Set extensions
+        use mysql && myext=",mysql"
+        use gtk && myext="${myext},gtk"
+        use lirc && myext="${myext},lirc"
+        use dbus && myext="${myext},dbus"
+
+        # Strip extra comma from gui, myext, hwaccel and renderers.
+        device=$( echo $device | sed -e 's/,//' )
+        gui=$( echo $gui | sed -e 's/^,//' )
+        myext=$( echo $myext | sed -e 's/,//' )
+        renderers=$( echo $renderers | sed -e 's/,//' )
+        media=$( echo $media | sed -e 's/,//' )
+
+        econf \
+                --disable-kparts3 \
+                --disable-kparts4 \
+                --without-gconf \
+                $(use_enable cygnal) \
+                $(use_enable cygnal cgibins) \
+                $(use_enable doc docbook) \
+                $(use_enable gnome ghelp) \
+                $(use_enable harden) \
+                $(use_enable jemalloc) \
+                $(use_enable nls) \
+                $(use_enable nsplugin npapi) \
+                $(use_enable python) \
+                $(use_enable ssh) \
+                $(use_enable ssl) \
+                $(use_enable test testsuite) \
+                --enable-gui=${gui} \
+                --enable-device=${device} \
+                --enable-extensions=${myext} \
+                --enable-renderer=${renderers} \
+                --enable-media=${media} \
+                ${myconf}
+}
+src_test() {
+        local log=testsuite-results.txt
+        cd testsuite
+        emake check || die "make check failed"
+        ./anaylse-results.sh > $log || die "results analyze failed"
+        cat $log
+}
+src_install() {
+        emake DESTDIR="${D}" install || die "emake install failed"
+
+        # Install nsplugin in directory set by --with-npapi-plugindir.
+        if use nsplugin; then
+                emake DESTDIR="${D}" install-plugin || die "install plugins failed"
+        fi
+
+        # Create a symlink in /usr/$(get_libdir)/nsbrowser/plugins to the nsplugin install directory.
+        use nsplugin && inst_plugin /usr/$(get_libdir)/gnash/npapi/libgnashplugin.so
+
+        # Remove eglinfo, bug #463654
+        if use egl; then
+                rm -f "${D}"/usr/bin/eglinfo || die
+        fi
+
+        einstalldocs
+}
+pkg_postinst() {
+        if use !gnome || use !ffmpeg ; then
+                ewarn ""
+                ewarn "Gnash was built without a media handler and or http handler !"
+                ewarn ""
+                ewarn "If you want Gnash to support video then you will need to"
+                ewarn "rebuild Gnash with the ffmpeg and gnome use flags set."
+                ewarn ""
+        fi
+        ewarn "${PN} is still in heavy development"
+        ewarn "Please first report bugs on upstream gnashdevs and deal with them"
+        ewarn "And then report a Gentoo bug to the maintainer"
+}
diff --git a/www-plugins/gnash/gnash-9999.ebuild b/www-plugins/gnash/gnash-9999.ebuild
new file mode 100644
index 0000000..b1bef02
--- /dev/null
+++ b/www-plugins/gnash/gnash-9999.ebuild
@@ -0,0 +1,259 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+AT_M4DIR="cygnal"
+# won't build with python-3, bug #392969
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools eutils multilib nsplugins python-any-r1 flag-o-matic xdg-utils
+
+DESCRIPTION="GNU Flash movie player that supports many SWF v7,8,9 features"
+HOMEPAGE="https://www.gnu.org/software/gnash/"
+
+if [[ ${PV} = 9999* ]]; then
+        SRC_URI=""
+        EGIT_REPO_URI="git://git.savannah.gnu.org/gnash.git"
+        inherit git-r3
+else
+# Release tarball is b0rked, upstream #35612
+        SRC_URI="mirror://gnu/${PN}/${PV}/${P}.tar.gz"
+        SRC_URI="mirror://gentoo/${P}.tar.xz"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 ppc ~ppc64 ~sparc x86"
+IUSE="X +agg cairo cygnal dbus directfb doc dump egl fbcon +ffmpeg libav libressl gnome gtk harden jemalloc lirc mysql +nls nsplugin opengl openvg python sdl +sdl-sound ssh ssl test vaapi"
+REQUIRED_USE="
+        dump? ( agg ffmpeg )
+        fbcon? ( agg )
+        nsplugin? ( gtk )
+        openvg? ( egl )
+        python? ( gtk )
+        vaapi? ( agg ffmpeg )
+        || ( agg cairo opengl openvg )
+        || ( dump fbcon gtk sdl )
+"
+
+RDEPEND=">=dev-libs/boost-1.41.0
+        dev-libs/expat
+        dev-libs/libxml2:2
+        virtual/jpeg:0
+        media-libs/libpng:0=
+        net-misc/curl
+        x11-libs/libX11
+        x11-libs/libXi
+        x11-libs/libXmu
+        x11-libs/libXt
+        media-libs/giflib:=
+        agg? ( x11-libs/agg )
+        cairo? ( x11-libs/cairo )
+        directfb? (
+                dev-libs/DirectFB
+        )
+        doc? (
+                >=app-text/docbook2X-0.8.8
+                app-text/docbook-sgml-utils
+        )
+        egl? (
+                media-libs/mesa[egl]
+        )
+        fbcon? (
+                x11-libs/tslib
+        )
+        ffmpeg? (
+                libav? ( media-video/libav:0=[vaapi?] )
+                !libav? ( media-video/ffmpeg:0=[vaapi?] )
+        )
+        gtk? (
+                x11-libs/gtk+:2
+                python? ( dev-python/pygtk:2 )
+        )
+        jemalloc? ( dev-libs/jemalloc )
+        opengl? (
+                virtual/glu
+                virtual/opengl
+                gtk? ( x11-libs/gtkglext )
+        )
+        openvg? (
+                media-libs/mesa[openvg]
+        )
+        sdl? ( media-libs/libsdl[X] )
+        sdl-sound? ( media-libs/libsdl )
+        >=media-libs/speex-1.2.0
+        media-libs/speexdsp
+        sys-libs/zlib
+        >=sys-devel/libtool-2.2
+        mysql? ( virtual/mysql )
+        lirc? ( app-misc/lirc )
+        dbus? ( sys-apps/dbus )
+        ssh? ( >=net-libs/libssh-0.4[server] )
+        ssl? (
+                libressl? ( dev-libs/libressl:0= )
+                !libressl? ( dev-libs/openssl:0= )
+        )
+        vaapi? ( x11-libs/libva[opengl?] )
+        "
+DEPEND="${RDEPEND}
+        virtual/pkgconfig
+        nls? ( sys-devel/gettext )
+        gnome? ( app-text/rarian )
+        nsplugin? ( net-misc/npapi-sdk )
+        test? ( dev-util/dejagnu )
+        ${PYTHON_DEPS}
+"
+# Tests hang with sandbox, bug #321017
+RESTRICT="test"
+
+pkg_setup() {
+        python-any-r1_pkg_setup
+
+        if use !ffmpeg; then
+                ewarn "You are trying to build Gnash without choosing a media handler."
+                ewarn "Sound and video playback will not work."
+        fi
+}
+
+src_unpack() {
+        default
+        # rename git snapshot directory to what portage expects
+        mv ${PN}-*/ ${P} || die
+}
+
+src_prepare() {
+        default
+
+        xdg_environment_reset # 591014
+
+        # Fix paths for klash, bug #339610
+        eapply "${FILESDIR}"/${PN}-0.8.9-klash.patch
+
+        # Use external dejagnu for tests, bug #321017
+        eapply "${FILESDIR}"/${PN}-0.8.9-external-dejagnu.patch
+
+        # Fix building on ppc64, bug #342535
+        use ppc64 && append-flags -mminimal-toc
+
+        # Fix kde multilib library path, bug #391283
+        eapply "${FILESDIR}"/${PN}-0.8.9-kde4-libdir.patch
+
+        # Fix libamf includes
+        eapply "${FILESDIR}"/${PN}-0.8.10-amf-include.patch
+
+        # Fix new adjacent_tokens_only() in >=boost-1.59 (bug 579142)
+        # See https://savannah.gnu.org/bugs/?46148
+        eapply "${FILESDIR}"/${PN}-0.8.10_p20150316-boost-1.60.patch
+
+        eautoreconf
+}
+src_configure() {
+        local device gui input media myconf myext renderers
+
+        # Set nsplugin install directory.
+        use nsplugin && myconf="${myconf} --with-npapi-plugindir=/usr/$(get_libdir)/gnash/npapi/"
+
+        # Set hardware acceleration.
+        use X && device+=",x11"
+        use directfb && device+=",directfb"
+        use egl && device+=",egl"
+        use fbcon && device+=",rawfb"
+        use vaapi && device+=",vaapi"
+        [[ "${device}x" == "x" ]] && device+=",none"
+
+        # Set rendering engine.
+        use agg && renderers+=",agg"
+        use cairo && renderers+=",cairo"
+        use opengl && renderers+=",opengl"
+        use openvg && renderers+=",openvg"
+
+        # Set media handler.
+        use ffmpeg || media+=",none"
+        use ffmpeg && media+=",ffmpeg"
+
+        # Set gui.
+        use dump && gui+=",dump"
+        use fbcon && gui+=",fb"
+        use gtk && gui+=",gtk"
+        use sdl && gui+=",sdl"
+
+        if use sdl-sound; then
+                myconf="${myconf} --enable-sound=sdl"
+        else
+                myconf="${myconf} --enable-sound=none"
+        fi
+
+        # Set extensions
+        use mysql && myext=",mysql"
+        use gtk && myext="${myext},gtk"
+        use lirc && myext="${myext},lirc"
+        use dbus && myext="${myext},dbus"
+
+        # Strip extra comma from gui, myext, hwaccel and renderers.
+        device=$( echo $device | sed -e 's/,//' )
+        gui=$( echo $gui | sed -e 's/^,//' )
+        myext=$( echo $myext | sed -e 's/,//' )
+        renderers=$( echo $renderers | sed -e 's/,//' )
+        media=$( echo $media | sed -e 's/,//' )
+
+        econf \
+                --disable-kparts3 \
+                --disable-kparts4 \
+                --without-gconf \
+                $(use_enable cygnal) \
+                $(use_enable cygnal cgibins) \
+                $(use_enable doc docbook) \
+                $(use_enable gnome ghelp) \
+                $(use_enable harden) \
+                $(use_enable jemalloc) \
+                $(use_enable nls) \
+                $(use_enable nsplugin npapi) \
+                $(use_enable python) \
+                $(use_enable ssh) \
+                $(use_enable ssl) \
+                $(use_enable test testsuite) \
+                --enable-gui=${gui} \
+                --enable-device=${device} \
+                --enable-extensions=${myext} \
+                --enable-renderer=${renderers} \
+                --enable-media=${media} \
+                ${myconf}
+}
+src_test() {
+        local log=testsuite-results.txt
+        cd testsuite
+        emake check || die "make check failed"
+        ./anaylse-results.sh > $log || die "results analyze failed"
+        cat $log
+}
+src_install() {
+        emake DESTDIR="${D}" install || die "emake install failed"
+
+        # Install nsplugin in directory set by --with-npapi-plugindir.
+        if use nsplugin; then
+                emake DESTDIR="${D}" install-plugin || die "install plugins failed"
+        fi
+
+        # Create a symlink in /usr/$(get_libdir)/nsbrowser/plugins to the nsplugin install directory.
+        use nsplugin && inst_plugin /usr/$(get_libdir)/gnash/npapi/libgnashplugin.so
+
+        # Remove eglinfo, bug #463654
+        if use egl; then
+                rm -f "${D}"/usr/bin/eglinfo || die
+        fi
+
+        einstalldocs
+}
+pkg_postinst() {
+        if use !gnome || use !ffmpeg ; then
+                ewarn ""
+                ewarn "Gnash was built without a media handler and or http handler !"
+                ewarn ""
+                ewarn "If you want Gnash to support video then you will need to"
+                ewarn "rebuild Gnash with the ffmpeg and gnome use flags set."
+                ewarn ""
+        fi
+        ewarn "${PN} is still in heavy development"
+        ewarn "Please first report bugs on upstream gnashdevs and deal with them"
+        ewarn "And then report a Gentoo bug to the maintainer"
+}
diff --git a/www-plugins/gnash/metadata.xml b/www-plugins/gnash/metadata.xml
new file mode 100644
index 0000000..7c3def3
--- /dev/null
+++ b/www-plugins/gnash/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+        <use>
+          <flag name="agg">Rendering based on the Anti-Grain Geometry Rendering Engine library</flag>
+          <flag name="cygnal">Enable building of the cygnal server</flag>
+          <flag name="dump">Enable dump output module for creating video from SWF</flag>
+          <flag name="egl">Enable EGL support for the OpenVG, OpenGL and X11 renderers</flag>
+          <flag name="gconf">Enable GConf configuration backend</flag>
+          <flag name="harden">Enable upstream recommended hardening build flags (may conflict with system ones)</flag>
+          <flag name="jemalloc">Use dev-libs/jemalloc for allocations</flag>
+          <flag name="openvg">Rendering based on the OpenVG graphics acceleration API</flag>
+          <flag name="sdl-sound">Enable SDL audio output for the standalone player</flag>
+          <flag name="ssh">Enable using SSH for network authentication in libnet</flag>
+          <flag name="ssl">Enable directly using OpenSSL in libnet (not needed for nsplugin ssl support)</flag>
+        </use>
+</pkgmetadata>
diff --git a/x11-plugins/lurch/Manifest b/x11-plugins/lurch/Manifest
new file mode 100644
index 0000000..7aa7fc6
--- /dev/null
+++ b/x11-plugins/lurch/Manifest
@@ -0,0 +1,9 @@
+DIST lurch-0.6.1-src.tar.gz 402942 BLAKE2B 8d73aa5c043c4784758cb80837120b18505c95f37fbe8b29dab17ba2fa33d58152dd93b1fbdf0d85c64cffd6d8583fe211d3f38537cdc3a237507b022d0615fa SHA512 a37de1f9bb9e4b65204d6c7405c2c51dc112d4be8cc9b2126512687f09419a543a63a6de944fcda43f84b2eeca3055b40a0087c8065bb8b39fdb9da6632b6a0a
+DIST lurch-0.6.5-src.tar.gz 426064 BLAKE2B e30ebea88016d89d938321b36dc34aa26938d7ad220f8f7c15257a93daf8b7945e83e6d0df6a2c18698aee005b379db8604a1012b4cfa5a761ba865012b83f5d SHA512 c0ff968935254e8cf7e039a843476fa5a4cc8d725c1eeb3e4f66932efada84232f03d6c7bbe3dc0466205a9554247fd1937e4ab4c9658c23ece6728b7277460f
+DIST lurch-0.6.6-src.tar.gz 414443 BLAKE2B d58898ba49776d87d47f9234d67b3268bc490f5f08896ab64f053b582985afef0e27c155951dc98dc93e9aea4496e511fe11e21dab58d49dc445dc10025eea91 SHA512 6fafcac75ab50090fde34163b34adc6ae38d8bf8386aebc555425e964d9daa52e020a0f2ad14739262bf4ede5e650e8faff9317a483ef78bafa731f6222bcc53
+DIST lurch-0.6.7-src.tar.gz 377646 BLAKE2B 0457f09743a1ba94f2a664c662f66d80918ceacdb2d5476d8609d2d9a057328d36a4ac3623ee02e14ffe61060b6797845318af6a8db1ca3b3d54b69ecb5ab1dd SHA512 c71a0049039eb2272f6fb7bf66a85d8b199f81bb0bdd4fb84c9c5526f7ae88b13614d9824a0887db5663aabed692c9e137de32db2599c1fd3e5c4309915b188f
+EBUILD lurch-0.6.1.ebuild 470 BLAKE2B 77d5834f941c8552d2cda078fe1872da28775bacfa92f76227b5ac5a13dc7805a3157ad0c91738f60fcd7ce68f9445046ed865ba60bc6fe8ebe6b0bd7d650428 SHA512 07567b8e5b628a0f218edcf8e78385de2c2d8acb4226c2d0350535e95e326d629603aba81a172e0ef6ed6f32668ccc10eb240272030074bf1eeed17c22ab3c2a
+EBUILD lurch-0.6.5.ebuild 484 BLAKE2B b7adea3d1d81b7e681ac8892d16a5a4dcb1b1f1fdb2f2455b0e9dcac0e21ec5316899521e35a0ae673d9e0140efa3fc1339a402dfb5bfd8b886de963970ee466 SHA512 00835d78b8db6011417ee3e55fc21a63b49ca5abd9b42c29bbe8575381dfeeef00f1418da554344da422f156c319ca4709160b17e4edd9ff164f1e76439f6c5f
+EBUILD lurch-0.6.6.ebuild 484 BLAKE2B b7adea3d1d81b7e681ac8892d16a5a4dcb1b1f1fdb2f2455b0e9dcac0e21ec5316899521e35a0ae673d9e0140efa3fc1339a402dfb5bfd8b886de963970ee466 SHA512 00835d78b8db6011417ee3e55fc21a63b49ca5abd9b42c29bbe8575381dfeeef00f1418da554344da422f156c319ca4709160b17e4edd9ff164f1e76439f6c5f
+EBUILD lurch-0.6.7.ebuild 481 BLAKE2B a5b65280bfd9b6d79a15c418be8613907dcd714c3aba84f6949892b2828f4b1032290e27d7b724a40b1bb0696d0ef7be44c543a06038cd2a93eaf23414f6ac62 SHA512 43303ee0102b5dce91f6e77aae98c07405cf9954dee7ffeb522acfb13a96695b73ed8b7da5739f1ab0c9a15ed5b5d118d9d5e6598c2d51cacaf3a109ade4a708
+MISC metadata.xml 339 BLAKE2B 42b5c728e007eafd30869ad171c888302f42e0ad32086fdb5046e9e9a11b161929339c4567df70b498c852d832b51aa9063c61635c4214cd597f650c1d4b3ce2 SHA512 b5b210e9f1232b0199a649ccbc02d3ffd2f88019cee02f341e1b2d3898fa7908a59c09e2d5f6e0a536abe725df16beb3c4e24b8109b60c005c3ba2ffe7127b0d
diff --git a/x11-plugins/lurch/lurch-0.6.1.ebuild b/x11-plugins/lurch/lurch-0.6.1.ebuild
new file mode 100644
index 0000000..a2b6392
--- /dev/null
+++ b/x11-plugins/lurch/lurch-0.6.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="OMEMO for libpurple - interoperable with other OMEMO clients"
+HOMEPAGE="https://github.com/gkdr/lurch"
+SRC_URI="https://github.com/gkdr/lurch/releases/download/v${PV}/lurch-${PV}-src.tar.gz"
+
+S="${WORKDIR}"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+net-im/pidgin
+dev-libs/libxml2
+dev-db/sqlite"
+
+RDEPEND="${DEPEND}"
diff --git a/x11-plugins/lurch/lurch-0.6.5.ebuild b/x11-plugins/lurch/lurch-0.6.5.ebuild
new file mode 100644
index 0000000..52021f5
--- /dev/null
+++ b/x11-plugins/lurch/lurch-0.6.5.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="OMEMO for libpurple - interoperable with other OMEMO clients"
+HOMEPAGE="https://github.com/gkdr/lurch"
+SRC_URI="https://github.com/gkdr/lurch/releases/download/v${PV}/lurch-${PV}-src.tar.gz"
+
+S="${WORKDIR}"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+net-im/pidgin
+dev-libs/libxml2
+dev-db/sqlite
+dev-libs/mxml"
+
+RDEPEND="${DEPEND}"
diff --git a/x11-plugins/lurch/lurch-0.6.6.ebuild b/x11-plugins/lurch/lurch-0.6.6.ebuild
new file mode 100644
index 0000000..52021f5
--- /dev/null
+++ b/x11-plugins/lurch/lurch-0.6.6.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="OMEMO for libpurple - interoperable with other OMEMO clients"
+HOMEPAGE="https://github.com/gkdr/lurch"
+SRC_URI="https://github.com/gkdr/lurch/releases/download/v${PV}/lurch-${PV}-src.tar.gz"
+
+S="${WORKDIR}"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+net-im/pidgin
+dev-libs/libxml2
+dev-db/sqlite
+dev-libs/mxml"
+
+RDEPEND="${DEPEND}"
diff --git a/x11-plugins/lurch/lurch-0.6.7.ebuild b/x11-plugins/lurch/lurch-0.6.7.ebuild
new file mode 100644
index 0000000..aa6dba1
--- /dev/null
+++ b/x11-plugins/lurch/lurch-0.6.7.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="OMEMO for libpurple - interoperable with other OMEMO clients"
+HOMEPAGE="https://github.com/gkdr/lurch"
+SRC_URI="https://github.com/gkdr/lurch/releases/download/v${PV}/lurch-${PV}-src.tar.gz"
+
+S="${WORKDIR}"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+net-im/pidgin
+dev-libs/libxml2
+dev-db/sqlite
+dev-libs/mxml"
+
+RDEPEND="${DEPEND}"
diff --git a/x11-plugins/lurch/lurch-9999.ebuild b/x11-plugins/lurch/lurch-9999.ebuild
new file mode 100644
index 0000000..1658951
--- /dev/null
+++ b/x11-plugins/lurch/lurch-9999.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit git-r3 eutils
+
+DESCRIPTION="OMEMO for libpurple - interoperable with other OMEMO clients"
+HOMEPAGE="https://github.com/gkdr/lurch"
+EGIT_REPO_URI="https://github.com/gkdr/lurch"
+EGIT_BRANCH="dev"
+
+# S="${WORKDIR}"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+        net-im/pidgin
+        dev-libs/libxml2
+        dev-db/sqlite
+        dev-libs/mxml"
+
+RDEPEND="${DEPEND}"
+
+src_compile() {
+        emake
+}
+
+src_install() {
+        emake DESTDIR="${D}" install || die "email install failed"
+}
diff --git a/x11-plugins/lurch/metadata.xml b/x11-plugins/lurch/metadata.xml
new file mode 100644
index 0000000..677f212
--- /dev/null
+++ b/x11-plugins/lurch/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>paul.michel@fem.tu-ilmenau.de</email>
+  </maintainer>
+  <longdescription>
+  OMEMO for libpurple - interoperable with other OMEMO clients. 
+  </longdescription>
+</pkgmetadata>