Sync with portage [Wed Jul 18 11:50:52 MSK 2018].

6 years ago · 4532ac9413
parent 859118f528
commit 4532ac9413
1130 changed files with 3584 additions and 1741 deletions
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
--- a/app-admin/lastpass-cli/Manifest
+++ b/app-admin/lastpass-cli/Manifest
@ -1,7 +1,2 @@
-DIST lastpass-cli-1.0.0.tar.gz 92311 BLAKE2B a5351fb203ce3532572ac52fad5f6a6312c3378918b5100011fe4947c1fe7ca09d41e327e85b7a9d5c9ddd58ac29d3b790494570dda0d970a3c1c18bcc0ca5db SHA512 4709b3e4d6064c8c5cb593344e6417355d7df570240dce8eb77a19f3377ea38585280a9602cf8ab926c55c6afd84b297f261b0c8a40d355734d5cc542d46f610
-DIST lastpass-cli-1.1.2.tar.gz 102796 BLAKE2B 7c6a19698616e9a3ab6286b2eaaaed1b4a810cb35464c70f3930ed0903d5f63cce6f0d5bcbb3b07fb5ad846b58581a93aaf8d6d63a7246b7bb51985362fb856e SHA512 8115cb07cfca15ef402bdbd8ce943352e1534ddb781274e21cb0fafa4bcd9ab7abe4ddba57c4ebbce326f09cc9249f244607d16cac5597e61cf21c73417e7d9c
-DIST lastpass-cli-1.2.1.tar.gz 108780 BLAKE2B 82ebae9a6a707bb75025cf98b53bccd2403eb0a3855d7f6ca7c5fdbf55465f929df529100da7933ce73ab7ece35275e0ffd96e6463eb1ecbd81dcccca3b80047 SHA512 c7c9f20dbc083873b815834320828a30a1c488571efbfc5aea47c3bd2073819d713810c785855d4c0c208e1b95aa0e5fc550a0b6b5c0f787eca1f54589e18e62
-DIST lastpass-cli-1.2.2.tar.gz 110045 BLAKE2B 96fcfd8f6e974edb5bd8701e18e73b46c0bcbcc14c38debd50be922a25ece9397bb6b641d4f2ce3057e57af0114a263eaab03e86b74e61d89a745411051bb172 SHA512 7d211c7669fe2de3e3f34cf00025376fd39a7f96c8573a0eaff64f322daab03de21e25d5875d3286a794580ac75d330c7bfe1005b377afc2b13e4ded9d78012c
-DIST lastpass-cli-1.3.0.tar.gz 113969 BLAKE2B 5570567b17f043200f6b4eca72735d26d153a91cb4f0551a856532101ac610d2505bc90677735a8bbafe68f1a1b7ac0a026ac642a9f3786cceb7638ea29394fb SHA512 7a147e08ac4b8e4e895744f80c484db9da895f4439bccbc141fe17e480285c76479753c2b879c60258d740af39775a3fae225ad193b5e6379a1cae8862c2a3ae
 DIST lastpass-cli-1.3.1.tar.gz 114843 BLAKE2B 7983d4090092ef3443d8c502d157934fa2384426f0be22c796795cdf664be3ba396f64daa81cdf896cb6901d4063f93e54b62cda4349b14fa4d312a21c5bb76d SHA512 092d28dc459719e662fbb2c5e92e8cc75be108aa9d7b62569ee44cb34dd9588e78151fdc5ad114c30e8de21c0b8803edc41db9295548c7cbfe6e537c9a52aad2
 DIST lastpass-cli-man-1.3.1.tar.xz 5700 BLAKE2B 736ab71ad55cfcb657c727f3dc9dc15775dab1a0232d1ffc51b8794e49911531c96a841b4a5ac0b31f0516cd7aa54027ac7d0eb096816730cdfd192c04d99449 SHA512 e60807683ecd681b3937ef447d3e6a487d25418fe99f51ba99e54bf643c5254dd18427a03e7f035198ef34ff578bbb6116baf04eb554f54d85e7d059b6bfed7e
--- a/app-admin/lastpass-cli/lastpass-cli-1.0.0.ebuild
+++ b/app-admin/lastpass-cli/lastpass-cli-1.0.0.ebuild
@ -1,43 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit bash-completion-r1 toolchain-funcs
-
-DESCRIPTION="Interfaces with LastPass.com from the command line."
-HOMEPAGE="https://github.com/lastpass/lastpass-cli"
-SRC_URI="https://github.com/lastpass/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2+"
-KEYWORDS="amd64 x86"
-IUSE="libressl X +pinentry"
-
-RDEPEND="
-	X? ( || ( x11-misc/xclip x11-misc/xsel ) )
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	net-misc/curl
-	dev-libs/libxml2
-	pinentry? ( app-crypt/pinentry )
-"
-DEPEND="${RDEPEND}
-	app-text/asciidoc
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	# Do not include headers from /usr/local/include
-	sed -i -e 's:-I/usr/local/include::' Makefile || die
-	default
-	tc-export CC
-}
-
-src_compile() {
-	emake PREFIX="${EPREFIX}/usr" COMPDIR="$(get_bashcompdir)" all doc-man
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install install-doc
-}
--- a/app-admin/lastpass-cli/lastpass-cli-1.1.2.ebuild
+++ b/app-admin/lastpass-cli/lastpass-cli-1.1.2.ebuild
@ -1,44 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils bash-completion-r1
-
-DESCRIPTION="Interfaces with LastPass.com from the command line."
-HOMEPAGE="https://github.com/lastpass/lastpass-cli"
-SRC_URI="https://github.com/lastpass/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE="libressl X +pinentry"
-
-RDEPEND="
-	X? ( || ( x11-misc/xclip x11-misc/xsel ) )
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	net-misc/curl
-	dev-libs/libxml2
-	pinentry? ( app-crypt/pinentry )
-"
-DEPEND="${RDEPEND}
-	app-text/asciidoc
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBASH_COMPLETION_COMPLETIONSDIR="$(get_bashcompdir)"
-	)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile all doc-man
-}
-
-src_install() {
-	cmake-utils_src_install install install-doc
-}
--- a/app-admin/lastpass-cli/lastpass-cli-1.2.1.ebuild
+++ b/app-admin/lastpass-cli/lastpass-cli-1.2.1.ebuild
@ -1,57 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils bash-completion-r1
-
-DESCRIPTION="Interfaces with LastPass.com from the command line."
-HOMEPAGE="https://github.com/lastpass/lastpass-cli"
-SRC_URI="https://github.com/lastpass/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE="libressl X +pinentry test"
-
-RDEPEND="
-	X? ( || ( x11-misc/xclip x11-misc/xsel ) )
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	net-misc/curl
-	dev-libs/libxml2
-	pinentry? ( app-crypt/pinentry )
-"
-DEPEND="${RDEPEND}
-	app-text/asciidoc
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBASH_COMPLETION_COMPLETIONSDIR="$(get_bashcompdir)"
-	)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile all doc-man $(usex test lpass-test '')
-}
-
-src_install() {
-	cmake-utils_src_install install install-doc
-}
-
-src_test() {
-	local myctestargs=(
-		-j1 # Parallel tests fail
-	)
-
-	# The path to lpass-test is hardcoded to "${S}"/build/lpass-test
-	# which is incorrect for our out-of-source build
-	sed -e "s|TEST_LPASS=.*|TEST_LPASS=\"${BUILD_DIR}/lpass-test\"|" \
-		-i "${S}"/test/include.sh
-
-	cmake-utils_src_test
-}
--- a/app-admin/lastpass-cli/lastpass-cli-1.2.2.ebuild
+++ b/app-admin/lastpass-cli/lastpass-cli-1.2.2.ebuild
@ -1,57 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils bash-completion-r1
-
-DESCRIPTION="Interfaces with LastPass.com from the command line."
-HOMEPAGE="https://github.com/lastpass/lastpass-cli"
-SRC_URI="https://github.com/lastpass/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE="libressl X +pinentry test"
-
-RDEPEND="
-	X? ( || ( x11-misc/xclip x11-misc/xsel ) )
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	net-misc/curl
-	dev-libs/libxml2
-	pinentry? ( app-crypt/pinentry )
-"
-DEPEND="${RDEPEND}
-	app-text/asciidoc
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBASH_COMPLETION_COMPLETIONSDIR="$(get_bashcompdir)"
-	)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile all doc-man $(usex test lpass-test '')
-}
-
-src_install() {
-	cmake-utils_src_install install install-doc
-}
-
-src_test() {
-	local myctestargs=(
-		-j1 # Parallel tests fail
-	)
-
-	# The path to lpass-test is hardcoded to "${S}"/build/lpass-test
-	# which is incorrect for our out-of-source build
-	sed -e "s|TEST_LPASS=.*|TEST_LPASS=\"${BUILD_DIR}/lpass-test\"|" \
-		-i "${S}"/test/include.sh || die
-
-	cmake-utils_src_test
-}
--- a/app-admin/lastpass-cli/lastpass-cli-1.3.0.ebuild
+++ b/app-admin/lastpass-cli/lastpass-cli-1.3.0.ebuild
@ -1,57 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils bash-completion-r1
-
-DESCRIPTION="Interfaces with LastPass.com from the command line."
-HOMEPAGE="https://github.com/lastpass/lastpass-cli"
-SRC_URI="https://github.com/lastpass/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2+ GPL-2+-with-openssl-exception"
-KEYWORDS="~amd64 ~x86"
-IUSE="libressl X +pinentry test"
-
-RDEPEND="
-	X? ( || ( x11-misc/xclip x11-misc/xsel ) )
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	net-misc/curl
-	dev-libs/libxml2
-	pinentry? ( app-crypt/pinentry )
-"
-DEPEND="${RDEPEND}
-	app-text/asciidoc
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBASH_COMPLETION_COMPLETIONSDIR="$(get_bashcompdir)"
-	)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile all doc-man $(usex test lpass-test '')
-}
-
-src_install() {
-	cmake-utils_src_install install install-doc
-}
-
-src_test() {
-	local myctestargs=(
-		-j1 # Parallel tests fail
-	)
-
-	# The path to lpass-test is hardcoded to "${S}"/build/lpass-test
-	# which is incorrect for our out-of-source build
-	sed -e "s|TEST_LPASS=.*|TEST_LPASS=\"${BUILD_DIR}/lpass-test\"|" \
-		-i "${S}"/test/include.sh || die
-
-	cmake-utils_src_test
-}
--- a/app-admin/lastpass-cli/lastpass-cli-1.3.1-r1.ebuild
+++ b/app-admin/lastpass-cli/lastpass-cli-1.3.1-r1.ebuild
@ -12,7 +12,7 @@ SRC_URI="https://github.com/lastpass/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz

 SLOT="0"
 LICENSE="GPL-2+ GPL-2+-with-openssl-exception"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="libressl X +pinentry test"

 RDEPEND="
--- a/app-admin/pass/pass-1.7.2-r1.ebuild
+++ b/app-admin/pass/pass-1.7.2-r1.ebuild
@ -0,0 +1,78 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit bash-completion-r1 elisp-common
+
+DESCRIPTION="Stores, retrieves, generates, and synchronizes passwords securely"
+HOMEPAGE="https://www.passwordstore.org/"
+SRC_URI="https://git.zx2c4.com/password-store/snapshot/password-store-${PV}.tar.xz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64"
+IUSE="+git X zsh-completion fish-completion emacs dmenu importers elibc_Darwin"
+
+RDEPEND="
+	app-crypt/gnupg
+	media-gfx/qrencode
+	>=app-text/tree-1.7.0
+	git? ( dev-vcs/git )
+	X? ( x11-misc/xclip )
+	elibc_Darwin? ( app-misc/getopt )
+	zsh-completion? ( app-shells/gentoo-zsh-completions )
+	fish-completion? ( app-shells/fish )
+	dmenu? ( x11-misc/dmenu x11-misc/xdotool )
+	emacs? ( virtual/emacs >=app-emacs/f-0.11.0 >=app-emacs/s-1.9.0 >=app-emacs/with-editor-2.5.11 )
+"
+
+S="${WORKDIR}/password-store-${PV}"
+
+src_prepare() {
+	default
+
+	use elibc_Darwin || return
+	# use coreutils'
+	sed -i -e 's/openssl base64/base64/g' src/platform/darwin.sh || die
+	# host getopt isn't cool, and we aren't brew (rip out brew reference)
+	sed -i -e '/^GETOPT=/s/=.*$/=getopt-long/' src/platform/darwin.sh || die
+	# make sure we can find "mount"
+	sed -i -e 's:mount -t:/sbin/mount -t:' src/platform/darwin.sh || die
+}
+
+src_compile() {
+	use emacs && elisp-compile contrib/emacs/*.el
+}
+
+src_install() {
+	emake install \
+		DESTDIR="${D}" \
+		PREFIX="${EPREFIX}/usr" \
+		BASHCOMPDIR="$(get_bashcompdir)" \
+		WITH_BASHCOMP=yes \
+		WITH_ZSHCOMP=$(usex zsh-completion) \
+		WITH_FISHCOMP=$(usex fish-completion)
+	use dmenu && dobin contrib/dmenu/passmenu
+	if use emacs; then
+		elisp-install ${PN} contrib/emacs/*.{el,elc}
+		elisp-site-file-install "${FILESDIR}/50${PN}-gentoo.el"
+	fi
+	if use importers; then
+		exeinto /usr/share/${PN}/importers
+		doexe contrib/importers/*
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+	if use importers; then
+		einfo "To import passwords from other password managers, you may use the"
+		einfo "various importer scripts found in:"
+		einfo "    ${EROOT%/}/usr/share/${PN}/importers/"
+	fi
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
--- a/app-admin/prelude-manager/Manifest
+++ b/app-admin/prelude-manager/Manifest
@ -1,3 +1,4 @@
 DIST prelude-manager-3.0.0.tar.gz 1286459 BLAKE2B 0909b0d7501909de51cd580b6ce22a66b1900a3b5b7376d3aeb4136bf41128ab766a025d69d33c414a9623dabb0de144e2f21190c3c3cccb9c067db359aab1bd SHA512 4c16a353495179265375686ce9592c8cd044b4255060b78286466bd25f9b38634233c95af058e1c0b81e1b574ec9ada5b2db92d6d1f5594dfcddce572fd0fd67
 DIST prelude-manager-3.1.0.tar.gz 1301799 BLAKE2B 938937d2752ad47630b36c3a546f2493a964fde01e3df694e4a9fbddfa1efc3ddc9d864f8c1169e8ae8f3b414c4cd1983bbbd015f192ee065e2531489a23ba8b SHA512 75df43f9db81d2b6bd87c649eda7bb30ee10510576473bea83cb5cce44f576e9d69d775b5d76dcea8841eee61730a97cdae51e6c8b3a426d2442c5183d0e0d10
 DIST prelude-manager-4.0.0.tar.gz 1353116 BLAKE2B 20aaa28797a67fd310807735bb08f0c21c3bd95950598a86c45144ee2474785aef0c7d569732c817509ae8ae52ffce5f43f3c071931f2960578681f91a8c9504 SHA512 793ed37c71eb4884cbbb49b11c7388ee291a35252255458ceadb4ce10d1392e8bad423f95e31bff4550a9cf1d04139e43729352554fd847048b6c8d14f813a8a
+DIST prelude-manager-4.1.1.tar.gz 1415847 BLAKE2B 7cea7209a680a38cf597a9678f3ac9a31b00187e4597e1aeed91bbe57a55981279e8399ee8c90a044e40873e595ca648736fa79090420d9bcd72b82588f7bb5e SHA512 4e9d09b56eb7ec55144caa06a04e458bf0462d8c0064a34aac5aa0fb96a30fbefe5a4956185b606ec58fc410e4cbcac8721e521b3396303b3bff88808042a966
--- a/app-admin/prelude-manager/prelude-manager-4.1.1.ebuild
+++ b/app-admin/prelude-manager/prelude-manager-4.1.1.ebuild
@ -0,0 +1,61 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools systemd
+
+DESCRIPTION="Bus communication for all Prelude modules"
+HOMEPAGE="https://www.prelude-siem.org"
+SRC_URI="https://www.prelude-siem.org/pkg/src/4.1.0/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="dbx geoip tcpwrapper xml"
+
+RDEPEND="net-libs/gnutls:=
+	~dev-libs/libprelude-4.1.0
+	dbx? ( ~dev-libs/libpreludedb-4.1.0 )
+	geoip? ( dev-libs/libmaxminddb )
+	tcpwrapper? ( sys-apps/tcp-wrappers )
+	xml? ( dev-libs/libxml2 )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.1.0-run.patch"
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		--localstatedir="${EPREFIX}/var"
+		$(use_with dbx libpreludedb-prefix)
+		$(use_enable geoip libmaxminddb)
+		$(use_with tcpwrapper libwrap)
+		$(usex xml '' '--without-xml-prefix')
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+
+	rm -rv "${ED%/}/run" || die "rm failed"
+	keepdir /var/spool/prelude-manager{,/failover,/scheduler}
+
+	find "${D}" -name '*.la' -delete || die
+
+	systemd_dounit "${FILESDIR}/${PN}.service"
+	systemd_newtmpfilesd "${FILESDIR}/${PN}.run" "${PN}.conf"
+
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+}
--- a/app-admin/qtpass/Manifest
+++ b/app-admin/qtpass/Manifest
@ -1,3 +1 @@
-DIST qtpass-1.2.1.tar.gz 361147 BLAKE2B f46ce4362d4d3e0c0b0a425e5a40cf013181b899d5b1a2efc03cc5c4a3eca2d3ce1cdca78fdb95e8fecae23ffe56c01dbe65c9d07e2fff48934e995a710aac40 SHA512 3621a46aab5db5a41e80aea10bc6baf662510bcb249a1f56d33492aa66c824d9f018164f2d6a70256a7b3d59a9b73c4c8459b5d3fbe19886a607f8f0dc7410c1
-DIST qtpass-1.2.2.tar.gz 366601 BLAKE2B 7b06926465e7d7cbb837cf87b47a89b114b9ae9c508aa558695744c84a00a58a8922155eda3f91a6350354668b381381be757db07f201798a2ee25685e034871 SHA512 cb480357b161573054b752af25f20757057de5c5b2e55619e3fa594c5d9b63c7036b72c0ae7735f8ec197ac8aa43b7fdfbc836b29fbe4c85de8dc5d93ce7bbd2
 DIST qtpass-1.2.3.tar.gz 369412 BLAKE2B 55e8f5e7967b264b20aa044979620631f319e2ff38edcc4e1390ab5d9f35e1e90ff8ff00c94cd35a9b5c05a5ccd8d8fdfc97214e9bd9f564bae1bd80efe0f224 SHA512 d6c3af5b92042a38afecb40689d41c08105dd2a39555f78ebc585a6db6dd65cd8fd6dc637542dd3b5b4ce18f1a852768ffa298b5a461a2d0e4ef4950c58d1649
--- a/app-admin/qtpass/qtpass-1.2.1.ebuild
+++ b/app-admin/qtpass/qtpass-1.2.1.ebuild
@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P="QtPass-${PV}"
-
-inherit qmake-utils desktop
-
-DESCRIPTION="multi-platform GUI for pass, the standard unix password manager"
-HOMEPAGE="https://qtpass.org/"
-SRC_URI="https://github.com/IJHack/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-DOCS=( FAQ.md README.md CONTRIBUTING.md )
-S="${WORKDIR}/${MY_P}"
-
-RDEPEND="app-admin/pass
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5[xcb]
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	net-misc/x11-ssh-askpass"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5"
-
-src_prepare() {
-	default
-
-	sed -i 's/SUBDIRS += src tests main/SUBDIRS += src main/' "${S}"/qtpass.pro || die
-	sed -i '/main\.depends = tests/d' "${S}"/qtpass.pro || die
-}
-src_configure() {
-	eqmake5 PREFIX="${D}"/usr
-}
-
-src_install() {
-	default
-
-	doman ${PN}.1
-
-	insinto /usr/share/applications
-	doins "${PN}.desktop"
-
-	newicon artwork/icon.svg "${PN}-icon.svg"
-}
--- a/app-admin/qtpass/qtpass-1.2.2.ebuild
+++ b/app-admin/qtpass/qtpass-1.2.2.ebuild
@ -1,58 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P="QtPass-${PV}"
-inherit desktop qmake-utils
-
-DESCRIPTION="multi-platform GUI for pass, the standard unix password manager"
-HOMEPAGE="https://qtpass.org/"
-SRC_URI="https://github.com/IJHack/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="app-admin/pass
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5[xcb]
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	net-misc/x11-ssh-askpass"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-	dev-qt/qtsvg:5
-	test? ( dev-qt/qttest:5 )"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( {CHANGELOG,CONTRIBUTING,FAQ,README}.md )
-
-src_prepare() {
-	default
-
-	if ! use test ; then
-		sed -i '/SUBDIRS += src /s/tests //' \
-			qtpass.pro || die "sed for qtpass.pro failed"
-	fi
-}
-
-src_configure() {
-	eqmake5 PREFIX="${D}"/usr
-}
-
-src_install() {
-	default
-
-	insinto /usr/share/"${PN}"/translations
-	doins localization/*.qm
-
-	doman "${PN}".1
-	insinto /usr/share/applications
-	doins "${PN}".desktop
-	newicon artwork/icon.png "${PN}"-icon.png
-	insinto /usr/share/appdata
-	doins qtpass.appdata.xml
-}
--- a/app-admin/qtpass/qtpass-1.2.3.ebuild
+++ b/app-admin/qtpass/qtpass-1.2.3.ebuild
@ -55,8 +55,7 @@ src_install() {
 	doins localization/*.qm

 	doman "${PN}".1
-	insinto /usr/share/applications
-	doins "${PN}".desktop
+	domenu "${PN}".desktop
 	newicon artwork/icon.png "${PN}"-icon.png
 	insinto /usr/share/appdata
 	doins qtpass.appdata.xml
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
--- a/app-crypt/certbot/Manifest
+++ b/app-crypt/certbot/Manifest
@ -1,3 +1,3 @@
 DIST certbot-0.24.0.tar.gz 1149694 BLAKE2B 7c57d59ced97de77e0f98eb11a2bba418ee81ba0eb4506ebc010cb0060c92820617ba2a3464dd398bfec6dc86f4c2dc8e22461d76ae51ccfbb97afab3bbb3681 SHA512 b067da7eea54deb72ff4b516382cbe480ffebcb378489a2b0c52955f7399401d936d8d6587d88473d6f4fa9e864de94514941bde9727a5babbf2d6211ea61b20
 DIST certbot-0.25.1.tar.gz 1160526 BLAKE2B 2dd2196c5986d5f5fe59f711589b6c3393d9c4183febb7048eab0b85e033f81d5c7ff12d7fea3aa69585308f5a4984143e431047fee73b42b16bd49e1cd2d14f SHA512 6395baa33acb4cf9e953294ddb07694ffa1e76424e12114db8df0f64fb3f1872c3145b02d853c139183b2b708d40d236f91d356eb9ecca447f577bd725fee6e5
-DIST certbot-0.26.0.tar.gz 1236499 BLAKE2B ea276f8b0fd4c7c6ce59acdcd3829d45d06ee31ac317bd846083da8ab105ae9357eaafd81992e1493c4965a95a70ee71f2d41875ca7e8c0613cbe44eeb3dffa5 SHA512 19f689d5b8724c6e7aa1539808b1b60913ad0f4a9272ebf6f40115028cef3cb49d9416239e104f125ed549c15e2a032935d0d2da1866548d0a177ef70608dce1
+DIST certbot-0.26.1.tar.gz 1237273 BLAKE2B d3e1582eac16c224a361d383266000c057a825fca996776b575c152e9d7b29c3ac719dccfd7a7dc4a6adb9070f7c3b4a2fbf0e59bd6d5bf74acdfd7487c5103a SHA512 e1eaca840f020135ad329c458b25f69b622de0e886c69fe64f098a6ea468e74e69e16625c5ea5c9465d220b1de01e40a45450dc5e2aded1c474508f65863396a
--- a/app-crypt/certbot/certbot-0.26.1.ebuild
+++ b/app-crypt/certbot/certbot-0.26.1.ebuild
--- a/app-crypt/yubikey-manager-qt/Manifest
+++ b/app-crypt/yubikey-manager-qt/Manifest
@ -1,2 +1,3 @@
 DIST yubikey-manager-qt-0.4.0.tar.gz 183566 BLAKE2B 2364d0d257ab5c05d0555aba4bb01ee1639a2c3a42b47173ae905945a6265b123985ad7d8fe50b0cfd38a1a0a588f3e1424aa46585ddbf50337ce2456899067e SHA512 12cef9636f06a92fdb3fce7cea5b97af3255b9cdd1b4feb4e184999eb77c17e465db927f56cd0e443a8ce8afc27b7e4be19ed07da7c41259f909ac4e98971de2
 DIST yubikey-manager-qt-0.5.1.tar 655360 BLAKE2B 6b109190750bd9675e32c836831a7e0ea286021303deffc64a351f2a127f5a5ee0190e3ca99abf0407bbb34a1a1c454f453fab464de2726f6cae539d5f865da1 SHA512 a8ceab5fd8d20eca2424d3f9a92ad12066e8fc26a7640df478965e5d9e2896fbc64885b26f599fcb2588f5b64d2f046af373f87e23ef266178ddf877e422ed36
+DIST yubikey-manager-qt-0.5.2.tar.gz 337194 BLAKE2B d6020116b9082671c039b521bbeebe7c1f0be022e233abbf8d6d788ea94e69e5f88aa3d6ec26a7b2edffa698327bb049e83ce54db2e0ba2ed1ad1dd536ab0961 SHA512 29265a10ae1dfe14dfdf4f1ba225516bf3bcbeb0115ca81696a4c5c506e957d6a99b0bb11a608e3175df99b8c04e8ae9250d5d42aab2b44b633d18fd2fc4c227
--- a/app-crypt/yubikey-manager-qt/yubikey-manager-qt-0.5.2.ebuild
+++ b/app-crypt/yubikey-manager-qt/yubikey-manager-qt-0.5.2.ebuild
@ -0,0 +1,56 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit eutils qmake-utils python-single-r1
+
+DESCRIPTION="Cross-platform application for configuring any YubiKey over all USB transports"
+HOMEPAGE="https://developers.yubico.com/yubikey-manager-qt https://github.com/Yubico/yubikey-manager-qt"
+SRC_URI="https://github.com/Yubico/yubikey-manager-qt/releases/download/${P}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="
+	>=app-crypt/yubikey-manager-0.7.0[${PYTHON_USEDEP}]
+	<app-crypt/yubikey-manager-0.8
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/pyotherside[${PYTHON_USEDEP}]
+	dev-qt/qtsingleapplication[qt5(+),X]
+	dev-qt/qtdeclarative:5
+	dev-qt/qtsvg:5
+	dev-qt/qtquickcontrols:5[widgets]
+	dev-qt/qtwidgets:5"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/"
+
+src_prepare() {
+	default
+
+	sed -i -e "s/ykman-cli//" ${PN}.pro || die
+	sed -e "/qtsingleapplication.pri/d" \
+		-e "/CONFIG += c++11/a CONFIG += qtsingleapplication" \
+		-i ykman-gui/ykman-gui.pro || die
+
+	# See: https://github.com/Yubico/yubikey-manager-qt/issues/54
+	echo "${PV}" > "${S}"/VERSION || die
+}
+
+src_configure() {
+	eqmake5
+}
+
+src_install() {
+	emake install INSTALL_ROOT="${D}"
+
+	domenu resources/ykman-gui.desktop
+	doicon -s 128 resources/icons/ykman.png
+	doicon -s scalable resources/icons/ykman.svg
+
+	einstalldocs
+}
--- a/app-crypt/yubikey-manager/Manifest
+++ b/app-crypt/yubikey-manager/Manifest
@ -4,3 +4,5 @@ DIST yubikey-manager-0.4.6.tar.gz 55065 BLAKE2B a0e8d85252836a6d99e68f637f423972
 DIST yubikey-manager-0.5.0.tar.gz 59672 BLAKE2B e5dbd32ba644e7b20f03c1511a4ff608c0e6dc93c115edd50077a9a41699411a5fd0eff3d62af1fb13545d977037510f696cbd27150e21308624bfc8613f8bcb SHA512 3a503ced29a557c5adafdd1bc6025a405962cabab7388c96e8f5582165bd33111adeb3b77c7c928cbac905fb085d53ddaefbb12169b54e62b7337c1989636a8a
 DIST yubikey-manager-0.6.0.tar.gz 77823 BLAKE2B 37d9a7e72135ba859521f209896c47423f3573b2f14a56956d145334124f7bf5a4259401a9e89e3f19b2e01a476b96a984e801a28a256815a7773baa44e71773 SHA512 fb49887f4646fe63874be9cb3510ef0d1f9b931ac5fb78f3cc82fb93ada94b36aa06fd91e2ee9d4ea868abedfc206dbedd02fa0c4385d5557d33e07e8099e761
 DIST yubikey-manager-0.7.0.tar.gz 83385 BLAKE2B cd0c440f8ce81549e52dd8e546d82678c19d95d2257c878b48d69719031317943bcca4ee713c03ca8f3fa1de4363df629b09b005955a1217adb2dc5ce89400aa SHA512 0fec23dafd2502a1508648fc96f1dcc873eaf3ad089f87b1afd94b35391513ad3a799985fcbc201c2fb4a3a3e473d24483c04a6862117d211c4cb6b294f74be0
+DIST yubikey-manager-0.7.1-test-files.tar.xz 9756 BLAKE2B 5a2e2a2a58d04c8f9954c1d13d0892b4f7392785d6e83e6948e720606318860b93e70862cee0ee7f987c14c3fa49bb7ff20cdf2a5bfc09c1f08681346428c003 SHA512 7543a9e9cfbe7f9ec02c98397f5cbd77cb307d79985a4b060176ee26605767e74d8b18d4c036ff90aed9a0232bb1382908c75e876a911c2ceb35a12666699b94
+DIST yubikey-manager-0.7.1.tar.gz 71834 BLAKE2B 45b0366531c8a158b3d8ebcfa8b76d608c14dba02224d4e4962c3757446829e3dff5f5e0d0ceda67caab7c67ad0510e037770c58a50552c2c6971136cb75c806 SHA512 3e9105f1c033f9314b90cf209eb52f7879fa1ea69e9ae6dac8de0b24d7d2ff6e45b6dd530917535fa645d6eea461f5b4f23bb8deb103ffc27d1f3483cfa681c7
--- a/app-crypt/yubikey-manager/yubikey-manager-0.7.1.ebuild
+++ b/app-crypt/yubikey-manager/yubikey-manager-0.7.1.ebuild
@ -0,0 +1,64 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+inherit readme.gentoo-r1 distutils-r1
+
+DESCRIPTION="Python library and command line tool for configuring a YubiKey"
+HOMEPAGE="https://developers.yubico.com/yubikey-manager/"
+SRC_URI="https://developers.yubico.com/${PN}/Releases/${P}.tar.gz
+	test? ( https://dev.gentoo.org/~gokturk/distfiles/app-crypt/${PN}/${PN}-0.7.1-test-files.tar.xz )"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RDEPEND="
+	dev-python/fido2[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/pyscard[${PYTHON_USEDEP}]
+	dev-python/pyusb[${PYTHON_USEDEP}]
+	dev-python/click[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/pyopenssl[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7)
+	sys-auth/ykpers
+"
+DEPEND="
+	test? (
+		${RDEPEND}
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' 'python2_7')
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.7.0-fix-tests.patch
+)
+
+python_test() {
+	touch "${S}"/test/__init__.py || die
+	cp -r "${WORKDIR}/files" "${S}"/test/ || die
+	esetup.py test
+}
+
+python_install_all() {
+	local DOC_CONTENTS
+
+	distutils-r1_python_install_all
+
+	DOC_CONTENTS="
+		The 'openpgp' command may require the package 'app-crypt/ccid'
+		to be installed on the system. Furthermore, make sure that pcscd
+		daemon is running and has correct access permissions to USB
+		devices.
+	"
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
--- a/app-emacs/f/Manifest
+++ b/app-emacs/f/Manifest
@ -1,2 +1,3 @@
 DIST f-0.18.2.tar.gz 18485 BLAKE2B 5b450b82eb31b23243a14308121380f53310de6b312c0b6c821b478d81019f20e0ca1765e267ed53a715aae626dabf743e978acfc9202559e14166fb5fda332f SHA512 5b11084dcc6afcc85ed0e187f6dd252c391fa43325be5b88b776171b3bc7076ea2bbd32b7c424deb70e035f6acd46acd86053547663502530832db2c50eba346
 DIST f-0.19.0.tar.gz 19477 BLAKE2B 47cfb8c876e11cae7eca61815085c4290f65f9d72a7c5d397d8b53f6d57421f46997786556074027de5405acbf38ddb42ecbb767c809763e84d880286e6942dc SHA512 694eca1872cb0a0da7f75f610e4101993a79a5e7601c3f72fd2c642b1a44f5eada24777313b5166d901d9d983c18b4d412b4c6f01c382ace7530bacaa3b67c56
+DIST f-0.20.0.tar.gz 19907 BLAKE2B 20b82a19b227d2e0863e540e75bc5094c0cf267eae00d699ff5b00fa574213d303135c246c454c92785080feae63ba6c529b115aeb1368774dd548852d94fb48 SHA512 0c44e63cd527a37bd5582d5a2a4cb2269d179930d7f41b378b9100ad5bb4518291b02197b1d55e1bf603bb5b1c12181b982d9b9a3f8fbd48860f6e86ea36c03e
--- a/app-emacs/f/f-0.20.0.ebuild
+++ b/app-emacs/f/f-0.20.0.ebuild
@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit elisp
+
+DESCRIPTION="Modern API for working with files and directories in Emacs"
+HOMEPAGE="https://github.com/rejeep/f.el"
+SRC_URI="https://github.com/rejeep/f.el/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+RESTRICT="test"
+
+RDEPEND="app-emacs/dash app-emacs/s"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/f.el-${PV}"
+SITEFILE="50${PN}-gentoo.el"
+DOCS="README.md"
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
--- a/app-emulation/reg/Manifest
+++ b/app-emulation/reg/Manifest
@ -1,3 +1,4 @@
 DIST reg-0.13.3.tar.gz 5396000 BLAKE2B c5fa658010cb5c1cc21d7edfc1b18fac8c65cf2bd3c6de213ab238aabcb1377096172b5484a92f18a04f9ef4c01124dcfcfd4e6eabaf9f9a9b272c6f1f1fc482 SHA512 aefe0e5d3b1a02d54e67a4c7892e6b6c7581793f9e45995933200125c275e38701ad25b772c4541714f72ad1b43865e484bd062e40edbb7ed5faf2a572c224a1
 DIST reg-0.13.4.tar.gz 5401627 BLAKE2B 278462ff66917833feb9a660b39f9826afe1b71f7a75dad07f3673bd5ba63496152aa70147649ddf9d2266cbad3903ba3a4bbe4a7def76a932ea45131bdda8c5 SHA512 f8a1a52824b64cc252a5cd4f6c18d8cf73c88170342f0bab61664f5cdb50295510182c3c15afdfa02c1eae8d299e347a78b47d171ca275c01ecfd9228323c872
 DIST reg-0.14.1.tar.gz 5401469 BLAKE2B 858c699b15e2222685e114d7c7619424dde6eb87cff08f79de621d5c0d35303b0e8f10981b5c0839633eebbb223658189369899f1a3e15bbdf1cf10dffcf88cf SHA512 2904b5da02cd5f0d98447aa86e36e13f96b1e0ef8f81f97d3fd801e3d477909c6d893db8af4e84591a4630633a698b8a21e673d5abbc169812ebd857615b8401
+DIST reg-0.15.4.tar.gz 4052737 BLAKE2B 34bc68d3cb161bbea02bfc0ed142cb764f2db64610ac7b2b92130cfc838cfa4fde4794da9fd2d38a9bb73e994cf386ac9f50beaa4435b88cf034a4f4d0b648cc SHA512 d5948b095c310c2697a2f7b80a342af6949e4cb66c521cdb370a6fbead7424d729057fe71952291ee1ed82717cd7bb29141f6a2f85c946e33fd96da1c17912dd
--- a/app-emulation/reg/reg-0.15.4.ebuild
+++ b/app-emulation/reg/reg-0.15.4.ebuild
@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit golang-build golang-vcs-snapshot
+
+EGO_PN="github.com/genuinetools/reg"
+GIT_COMMIT="8c930c585418564a4ce472fbbfccb8c5741c2520"
+ARCHIVE_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Docker registry v2 command line client"
+HOMEPAGE="https://github.com/genuinetools/reg"
+SRC_URI="${ARCHIVE_URI}"
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+RESTRICT="test"
+
+src_compile() {
+	pushd src/${EGO_PN} || die
+	GOPATH="${S}" go build -v -ldflags "-X ${EGO_PN}/version.GITCOMMIT=${GIT_COMMIT} -X ${EGO_PN}/version.VERSION=${PV}" -o "${S}"/bin/reg . || die
+	popd || die
+}
+
+src_install() {
+	dobin bin/*
+	dodoc src/${EGO_PN}/README.md
+	insinto /usr/share/${PN}
+	doins -r src/${EGO_PN}/server/*
+}
--- a/app-metrics/Manifest.gz
+++ b/app-metrics/Manifest.gz
--- a/app-metrics/node_exporter/Manifest
+++ b/app-metrics/node_exporter/Manifest
@ -1,3 +1,2 @@
 DIST node_exporter-0.15.2.tar.gz 1327204 BLAKE2B ee694771ed6d736fd4bb6a10f713f31becc930fb8225499d4b3a2a2cc7416c1816605cd8f4205dc37a2264af8d9f85e3519bc01844d252b6a70d4ee5f6308ece SHA512 b39ce0801a5bf5a2a70c4034659d047d70b3763af3f18925b65c2b5f72832e261362aaeb9ce4c68cb7bf52e790d3fc710a6c8550ad7876e89fd9f5a055200a52
 DIST node_exporter-0.16.0.tar.gz 1413131 BLAKE2B 7561ae8cc4994c6772816b72d6e3ea98934cb02eee7fab6c08a58ca853e492192defbadf25ea6f992fd044d23826241a4c0fb54c423b59394210803a5fa517e3 SHA512 59a2286024de76e7213e430ba77a366190d626d3b410c8dc960ad2bf68798e8ec3aeb851396673fb402eef15b2596f6835cf0197a53b9a3d1c0f8a1a81965fc7
-DIST node_exporter-0.16.0_rc3.tar.gz 1411536 BLAKE2B 24c38fb607d68718298df84db0e903d2a35d21d2edbe5e79c917cd2a32d76708a7e9f25750fd0c52c7eec4bbb90ee089dc60769e05f0265cb08c4a27dff20d96 SHA512 fc80738ba6bedd4a9a28374c6ea52c6471be14849b0120fd322397c179e0f0043bc616585d2b251a817bb7af8af16cc5a7f41de989943b9b87805dac4446a61f
--- a/app-metrics/node_exporter/node_exporter-0.16.0_rc3.ebuild
+++ b/app-metrics/node_exporter/node_exporter-0.16.0_rc3.ebuild
@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit user golang-build golang-vcs-snapshot
-
-EGO_PN="github.com/prometheus/node_exporter"
-EGIT_COMMIT="v${PV/_rc/-rc.}"
-NODE_EXPORTER_COMMIT="575d895"
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Prometheus exporter for machine metrics"
-HOMEPAGE="https://github.com/prometheus/node_exporter"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-util/promu"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_prepare() {
-	default
-	sed -i -e "s/{{.Revision}}/${NODE_EXPORTER_COMMIT}/" src/${EGO_PN}/.promu.yml || die
-}
-
-src_compile() {
-	pushd src/${EGO_PN} || die
-	mkdir -p bin || die
-	GOPATH="${S}" promu build -v --prefix node_exporter || die
-	popd || die
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin node_exporter/node_exporter
-	dodoc {README,CHANGELOG,CONTRIBUTING}.md
-	popd || die
-	keepdir /var/lib/node_exporter /var/log/node_exporter
-	fowners ${PN}:${PN} /var/lib/node_exporter /var/log/node_exporter
-	newinitd "${FILESDIR}"/${PN}-1.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-}
--- a/app-metrics/redis_exporter/Manifest
+++ b/app-metrics/redis_exporter/Manifest
@ -1 +1,2 @@
 DIST redis_exporter-0.15.0.tar.gz 1232990 BLAKE2B ade899ef0f21594d3bb59c379f44d941e2a42f06a5c2ba5b304cc0b8b83def12eb036e6011a7d88abe7d97104ae663cb025ca60287ec9aba7be93a734d84c959 SHA512 8892306500943ec18d8fa5110fc6f4954ec886fca4d0023cdc2134ee2498c6f39ab06bec8f998ecde796cc2053b66103146503b76a185db3da5cbab81ebd9f2a
+DIST redis_exporter-0.20.2.tar.gz 970030 BLAKE2B 55bee727f196fad642944a444220d9f71958d812f5f5f4d79a0c741cada25f29690ff4f185ec4028cf5216139e5351022a134fb1b0f2b5b45b384a831dbf1802 SHA512 eee4cc9de79ea256571c9650abae6b044fc78b7683abef544d5313dad5d46d3516c55e939c33f87849cc52ed2465797d20b606e386aa4fe187dd16d30354173e
--- a/app-metrics/redis_exporter/redis_exporter-0.20.2.ebuild
+++ b/app-metrics/redis_exporter/redis_exporter-0.20.2.ebuild
@ -0,0 +1,52 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit user golang-build golang-vcs-snapshot systemd
+
+EGO_PN="github.com/oliver006/redis_exporter"
+EGIT_COMMIT="3e15af27aac37e114b32a07f5e9dc0510f4cbfc4"
+ARCHIVE_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Prometheus Exporter for Redis Metrics. Supports Redis 2.x, 3.x and 4.x"
+HOMEPAGE="https://github.com/oliver006/redis_exporter"
+SRC_URI="${ARCHIVE_URI}"
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+src_prepare() {
+	default
+	sed -e "s|\(^[[:space:]]*VERSION[[:space:]]*=[[:space:]]*\).*|\1\"${PV}\"|" \
+		-e "s|\(^[[:space:]]*BUILD_DATE[[:space:]]*=[[:space:]]*\).*|\1\"$(LC_ALL=C date -u)\"|" \
+		-e "s|\(^[[:space:]]*COMMIT_SHA1[[:space:]]*=[[:space:]]*\).*|\1\"${EGIT_COMMIT}\"|" \
+		-i src/${EGO_PN}/main.go || die
+}
+
+src_compile() {
+	pushd src/${EGO_PN} || die
+	GOPATH="${S}" \
+		go install -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}"
+	popd || die
+}
+
+src_install() {
+	dobin bin/redis_exporter
+	dodoc src/${EGO_PN}/README.md
+	local dir
+	for dir in /var/{lib,log}/${PN}; do
+		keepdir "${dir}"
+		fowners ${PN}:${PN} "${dir}"
+	done
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+	systemd_dounit "${FILESDIR}/${PN}.service"
+}
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
--- a/app-misc/faq/Manifest
+++ b/app-misc/faq/Manifest
@ -1,16 +1,29 @@
 DIST faq-0.0.1.tar.gz 9916 BLAKE2B 1a585f56e72818978f5a79e0df3d59533a422127e8eacc79a05bb8704c0321b85c85e8cc9fd6eb633a1d5c39ea0b03d546d8da39462a94f369495ca0279a516d SHA512 38d5789dcf83042cc909424864e37d7adaf49bd3f2ab3da851005d528d3deb1e13ea37f68ba9245cf05e1fd1e45d1ab80c5d6d027ed785983d279cb8de05f718
+DIST faq-0.0.2.tar.gz 47842 BLAKE2B 7568da2ea59d6d2888116fa7cfb920d2c07fff56fcf8c0b7f568b6ed3545da8497ad72854d62041db8160b50004034524e928fe89bb4c9e02c426c722fcb887c SHA512 d9f33f1dfd2210a77ff9bfc4b08095a9d4689c81d1effda573a794272d5dc3461beca7294e3fe3652adb322e4b15ec11bd532f0a013a420ec82f7c6d782391c5
 DIST github.com-Azure-draft-53924464463d2474f410415f1310d2b95fb8965f.tar.gz 1417651 BLAKE2B 3d8743ac35e813116ca7c093878669b721a1af052e2a8e48daa48736132bbf85326a363638dc4f253f825a730e4325c6bd6f83fccb319c507cdfc82c2ba978a4 SHA512 464b6cb5250bf35b505c6c40c509c357a46b32b96cee4c06917b35fb66cb5f21841fd5c812079356565d5ca2045c5e51eec74106f0d4731e9096e8224286f68e
+DIST github.com-Azure-draft-fdc29c553a45600ac4f795f3485d4bb9a80c7862.tar.gz 1461279 BLAKE2B f15dd35c476dab9e8c8c8699a14ef1d26f208c29512917b3c16a75e36b9435f158f66505ba88d8820ad1c3b37cff06edf1b90f71b178b17f67705033f0f270d4 SHA512 5e4a526ff4f3a22d6e8e5a84592ba8b3c075ffb3867f9781a106f07f26b6ad7176e4bec2bb9829eb2dfbb45bf76569dc03ecb3eba1e71b119d3e70748eb1a4c5
 DIST github.com-BurntSushi-toml-b26d9c308763d68093482582cea63d69be07a0f0.tar.gz 41564 BLAKE2B 267579e3e2135626bfdce4524db2baf26a6dae14135421368c0f3cb21c41ec844cf42e127c4e0af7845b8caab4abd35c50ed5b0642fd713708e753ea54ee3100 SHA512 0a1ac02221645e06c60fdb5d162d1422fef791d101409c237a048a3d94708e3f1cf1e8e40bc390dc7cd6340f28514c2ae2d9c99a9ec2c3f969c7a8fbd5d0d232
+DIST github.com-alecthomas-chroma-d7b2ed20a4989ab604703f61f86523560f8a6a87.tar.gz 307488 BLAKE2B 1b4e373e2896fdf9126eb8f8f9b4c9137921d2067b13d14d91582fd83d44976f894f32fa1bd89750a04914fb6e14b37bea01ce7c893fc7b8b94093457855d809 SHA512 ba1e4eacd22006ee32bfd4ab4f56579d332d1fa8e3206e3670edf9270743cc87a8743f00deac30c2ac449b4eea0ab99dc14e829acde039d9cdb4593fd0dfc2c5
 DIST github.com-ashb-jqrepl-70de3caa122cf7c7a737f28b666ab0d541560598.tar.gz 14761 BLAKE2B fe636cf5425d2b717647404a012ff297d3c792e6ac11998004c3813e30768ba9dbee7b12aefbfd8793db398c7e24dad805e54207f689399bf9ce7f5632cfa7bc SHA512 f0f6529ad9561919fe5ffecb2acb2a432560a01b24292eb3b2746ba45491455f5e7bb023ceee0de1fdc147471e9733f3946a3bde599d2bf8122177626ea54424
+DIST github.com-cheekybits-is-68e9c0620927fb5427fda3708222d0edee89eae9.tar.gz 5848 BLAKE2B f3afe8bc17c2edf7cd334e8a54c34073772b26dd05268536eeccbcac2e210aac0159c6257aa02bb19b2cc76ddcec9b2b2b99db975535a900b44c8e42caee8227 SHA512 bbbfadfce1cdb7f8ea0fa7b319ed56df64630031aa85ca04e74b9da0d2eb8c6b5e02b5446ff4bbca11650592992cb4b2f63061686130e37089d2fa37a547de07
+DIST github.com-clbanning-mxj-32282164326064599d3a83e53adcb9b318d78d90.tar.gz 1089017 BLAKE2B 036c33acd4919dd228c90a5a7fc408244290ab38f66fa9875f60e4d8bfa8e5369ef9350b199b84b95ee74ea2803358313c3f8ac07110561f2892dd56435a7b65 SHA512 cc10b7f2eb440f7e553efd55adbfe024273ec85ed5447739919472123dba00638e1ce1683fe91927c2eabd53cfae9ead26e78a047002ffc56b638ab3f98c3e7f
 DIST github.com-clbanning-mxj-eb2e8a1ed220896d2b16890436447a0eae496fae.tar.gz 1071238 BLAKE2B 34a7cfe6e46fd80ee49c05c4efa6ba615ca516af34828dc291029d3f8efc83548204930a2487ed0fc86590f1443c8ca2b5574071189872ac9578739c1ecb6445 SHA512 742f9ff55eda7785cc733189018f487c2a7debcbc2d4446f8631b1e66457aa433319d9b5e81ed405ca54581a300d6e979367422eb7729d2cd9edde36717414b9
+DIST github.com-danwakefield-fnmatch-cbb64ac3d964b81592e64f957ad53df015803288.tar.gz 4952 BLAKE2B 92a7cfe2f3c07bdf2c61b445e35531150869dc181138d3438d7173ee38130d411a0de770ba40958471ea61d9aebe8881b51eb0ca9340deced89fd94df267e299 SHA512 5904008003ac80d34581dd1d33130fef27c6a523196aafef1231a2e63c5296cd30f8c3c517090b6b4c7ebb6a57d24bb0bff10cc40876e3fa1c9e74b65bc13154
+DIST github.com-dlclark-regexp2-7632a260cbaf5e7594fc1544a503456ecd0827f1.tar.gz 200360 BLAKE2B bbefca0280c0858669c45c8d63e66e77e07871507185ed777e96334eac22fc52ddd89a5dd0216ca12328d7a1b0b71dfca4e5ac75e75aebebdbda649818668e1d SHA512 b43d08612524b52a61179356ce3e67f170a7718349c89aaaf70ddc8e3e6de1bccd5df03f9caf596a48866b31fd8a9680400bbaf73408660e595e112de2b93736
 DIST github.com-ghodss-yaml-0ca9ea5df5451ffdf184b4428c902747c2c11cd7.tar.gz 11776 BLAKE2B bef19eeb755e2711ca293fa759ff98e39e17ef5679bef7b73592da7d44f1212dbe4812aafdfd63e585337623161074464a42f255873901e26091fd56f100b454 SHA512 a6848eeda7a6066b3df7582f681aa3382dc4e6d3c4579b4a13d8b31af317be56529a8ebf5c396b85490c0cddcfbe08872db8d747fedd212ff035678b9dfa9e0e
 DIST github.com-globalsign-mgo-baa28fcb8e7d5dfab92026c0920cb6c9ae72faa2.tar.gz 409146 BLAKE2B 4fe1d3812f0f695febbb42809cfffbce50a8602ed89b58d1dca53255520b4945f30aee0a97141e28ce554f97edbaea3121020aee66db1a29cecd59c463755bc2 SHA512 7caac9d229c9cdd9a32a2f3f3117790bf67391c2b25c1ff88cd4ad6f5b0157f68affc90f86733919f961b5551e6732eab307309ddcf25f517dc8023ce6c96e0f
+DIST github.com-globalsign-mgo-efe0945164a7e582241f37ae8983c075f8f2e870.tar.gz 416824 BLAKE2B 4b0f151d5ac226c31de9126ff911aab762df0e4915d12deaf243698dc13db45466f7071998921c275e66485ee69ac8b5db86ccfc3c471682e0de73ae6dfd9b13 SHA512 cc38bcbf6944176caadf886d2c4882f727fa9732972ccbc040355cf95ed0f452e047727a0690a57eb98cf10e290bb028218ee1af03ac13ceaea54ee58bbdee62
+DIST github.com-go-yaml-yaml-5420a8b6744d3b0345ab293f6fcba19c978f1183.tar.gz 70322 BLAKE2B e4284bbc1825c0e78cf2818091d2d25c581fd5da86d66eb8f91877b8a92f62400962391efb911ff33ffbe3db1de432a892dcc3670f96710fdb7c2cb191309697 SHA512 a5c4cbfc12e932f161c827537ad8366d8c003f40c3959c39bba9b6032e3d381516998a046429ef0980072b717dab0ab1df6b1ef24a43e66e1bf4bda176302b49
 DIST github.com-go-yaml-yaml-86f5ed62f8a0ee96bd888d2efdfd6d4fb100a4eb.tar.gz 70230 BLAKE2B 0d6d56ae3ab1a46a2b8cb7cd89141825358d33b76d8bdf7a18bd42bea42321c2d294cabc1fcaee3b3761a56654da261f83cfd54db0f734b1471ab29df985197a SHA512 ab1f058e9702238b968e21d03c2d5effb606f6446e2f0a3f6fbd71dcfd90bf1a390bde6d3097f5e9b087e79645138e21a792862cc83d119ce4e0da2510be775c
+DIST github.com-golang-crypto-1a580b3eff7814fc9b40602fd35256c63b50f491.tar.gz 1606221 BLAKE2B ffdb4c6152715f0157c1c4bdea1ff0abf549daa39373cdb30e78c4a9b9e73b238d287964a9a2335c18349821bfb187bf608169c08190d37eb363c8701eaab63c SHA512 ff8fee4616ce22a304b829e2991299214953b5cfdcdfd18e75ba60bf873e54395fa2c255f11e51837b27c576ac959eee766127d2a299e05842881a4103a10617
 DIST github.com-golang-crypto-88942b9c40a4c9d203b82b3731787b672d6e809b.tar.gz 1455583 BLAKE2B ceb0dbb22869d4e5a43a8674138f725de7514af12131da26152bfc723d8981356f056547c63b81193da2b0b9d4587a2941b05dcd921d27ed9cb5d9db3abdd971 SHA512 2c81f213f5d934af9b449d0bcb4b6ee2078b4db842933aa84b6dcaf893029f2bba3657fd3cab14749cff8d4cca6ee64dc7478d4c790f314bb12ebb8fed88d179
 DIST github.com-golang-sys-13d03a9a82fba647c21a0ef8fba44a795d0f0835.tar.gz 802725 BLAKE2B f826bcb2230bbeba10b138d3fae0191ee0dda49ade37dc3462adcf16ea890dd87d86aa9793ada59b86ee427da4f2b336fee1a2cda7f079bf50a6f7b70360cc48 SHA512 d4f82bd401b6a805c7d369fac26edb5153f0f9654a6d9fc9809a545c8a3de546329a36f4fe8aa5506bd2d3b4da27dcd56cc2bd5ea18f2c5a033d7fa5f3820251
+DIST github.com-golang-sys-7c87d13f8e835d2fb3a70a2912c811ed0c1d241b.tar.gz 857002 BLAKE2B 53fe56ca4674f48f18f8de03a1eef1f5e57f71a2fe8d2ae2f6e67fa106cf57c4042aafa783b7d3aa8044012a2cd527eea30881beca6c49738758dd961f7f3a3e SHA512 95451c906c1b797de586f4c3a313378a45fba0557fdc54d2373db2234093f7e7966a06757fb35e4ccd466e93260f867ff832b85b6b632f3c2d600c1ff06d21a4
 DIST github.com-inconshreveable-mousetrap-76626ae9c91c4f2a10f34cad8ce83ea42c93bb75.tar.gz 2292 BLAKE2B 5220adf6cf740368b1b3a238795791b422d600b0293e350bcb5cae4f3ea452865e14e6271ae5d475c717da2c96cea7e0b12a5d71228f7679f67868de50852f17 SHA512 287a52df6a3ac88a95aed19ea2c76524f9916d6c6713365f56d86e08bd4ac686d3e231aefd3361ccfbf8c9ff702c94b3cc9d200640f05149f1d885ff61164b55
 DIST github.com-jbrukh-bayesian-bf3f261f9a9c61145c60d47665b0518cc32c774f.tar.gz 9353 BLAKE2B df1e8457587b5d27f0cbfe5707da54a38c3ca4311586674d9e4bc85ad55dc222e570002a2388fbbbf239e559e4438aa063971665e436e234ffecb7888a7aff3a SHA512 e3ba5ce1e2a8e3b61e70b4c9f31c4215ec8ffb4a558e51f74efcace20b6bcf958f675ffc1125623e79da616aba2518a6e4623596e3a47abf3d841ca9d9833cf3
 DIST github.com-sirupsen-logrus-c155da19408a8799da419ed3eeb0cb5db0ad5dbc.tar.gz 28758 BLAKE2B e34b383cbbddcadd99692609c9c20f94182735fc9879c0391947d0bc540df05cae7570230103a75a1e031fe8e30d1a4796eb17c80b4fba4a6d79bb999932205f SHA512 8f4f0bc4f4cd02f26f1ab39857e0e8120feab8ae3bb44b570e5d269b0c716d4028b824b04ad3923dc3e5a82b64c757e462ff74c71875677fd4fd276bd5b40926
 DIST github.com-spf13-cobra-a1f051bc3eba734da4772d60e2d677f47cf93ef4.tar.gz 100895 BLAKE2B a4534b0ce3689db04d2f1fc4bdd982576f62e1f4622b81f305b9651bb455b14d4b4b145cc4da49a52289b2b7f32cd9e1406e950020fc7b3f87bb0fdba98db12f SHA512 b33bc0c32d25d099f44b3c7cf653ebbcdbec00d45aade37d38e9c5e0f15bcff36ea736b13583d5ba88e7728815ffa986c4dc01b082df5ac2bfbd8db2c7f7d333
+DIST github.com-spf13-cobra-ef82de70bb3f60c65fb8eebacbb2d122ef517385.tar.gz 101660 BLAKE2B c55d90b35107df52b9a5e8376f096267a0d96253dcdf01cfad27fa3e67d58e352472dc871ed0cae411f09600d7c2a1f244e03d8d62a1db609368a95f836aa933 SHA512 2897e8e2e837606e42daf0d3319669ed1c3ea03d3c9c07b784bfca38fe0b5fca6ac07e074608036af33f5127bb3f0a2a6606df79437c90363c11fc32185a068d
+DIST github.com-spf13-pflag-583c0c0531f06d5278b7d917446061adc344b5cd.tar.gz 43327 BLAKE2B cc00d2852d895265eb0b60454877da841fe123535009025c761761c61b4d937d6293f3bef765d2a8919d63d8324dcb6addf774837df26fb864cb72d88add2d03 SHA512 061b9895e3936e356f707385ed7d7e5172f94167a1fabc84e9a0a69df4f03e0eaf435a4ac0cb00f5077855987ab1d2c3b051846c0466485a7bc329a547dc3d3a
 DIST github.com-spf13-pflag-e57e3eeb33f795204c1ca35f56c44f83227c6e66.tar.gz 39045 BLAKE2B a933e0ae64f3bb344a7dffdf8f7ed73e4fba329a81794442ac3a8fa8904f29958bcc6b0f2af9848bc6c715b27abc5908d5ff16d23ea790899f71d2f5ff0ce6cb SHA512 c05ef1bc05cba471a55a11a2209fe4bdaaba491434a28b7f08d23528f4074b82a656b62972efdd49384dd49bde429d2d2c0e6ba311cae0d23f55b229b768dae8
 DIST github.com-zeebo-bencode-d522839ac797fc43269dae6a04a1f8be475a915d.tar.gz 13253 BLAKE2B 043d6824c2d0aeb69403610dc64b890d77a555483e92d54d0f70f630bc1b1326202118a8d2285335dea0605b582d640962a763eb4fe9cfee257a742a6da2141e SHA512 488aa86cbb20e0c1c0f22d053dd6e793f0d1e6faaa84c3e5da299e3714d493df2284ed74009002dfe8e33d06291d06791f74c257443ee6dc3ba84b871d59fec3
--- a/app-misc/faq/faq-0.0.2.ebuild
+++ b/app-misc/faq/faq-0.0.2.ebuild
@ -0,0 +1,56 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_PN="github.com/jzelinskie/faq"
+
+EGO_VENDOR=(
+	"github.com/alecthomas/chroma d7b2ed20a4989ab604703f61f86523560f8a6a87"
+	"github.com/Azure/draft fdc29c553a45600ac4f795f3485d4bb9a80c7862"
+	"github.com/BurntSushi/toml b26d9c308763d68093482582cea63d69be07a0f0"
+	"github.com/cheekybits/is 68e9c0620927fb5427fda3708222d0edee89eae9"
+	"github.com/clbanning/mxj 32282164326064599d3a83e53adcb9b318d78d90"
+	"github.com/danwakefield/fnmatch cbb64ac3d964b81592e64f957ad53df015803288"
+	"github.com/dlclark/regexp2 7632a260cbaf5e7594fc1544a503456ecd0827f1"
+	"github.com/ghodss/yaml 0ca9ea5df5451ffdf184b4428c902747c2c11cd7"
+	"github.com/globalsign/mgo efe0945164a7e582241f37ae8983c075f8f2e870"
+	"github.com/inconshreveable/mousetrap 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"
+	"github.com/jbrukh/bayesian bf3f261f9a9c61145c60d47665b0518cc32c774f"
+	"github.com/sirupsen/logrus c155da19408a8799da419ed3eeb0cb5db0ad5dbc"
+	"github.com/spf13/cobra ef82de70bb3f60c65fb8eebacbb2d122ef517385"
+	"github.com/spf13/pflag 583c0c0531f06d5278b7d917446061adc344b5cd"
+	"github.com/zeebo/bencode d522839ac797fc43269dae6a04a1f8be475a915d"
+	"golang.org/x/crypto 1a580b3eff7814fc9b40602fd35256c63b50f491 github.com/golang/crypto"
+	"golang.org/x/sys 7c87d13f8e835d2fb3a70a2912c811ed0c1d241b github.com/golang/sys"
+	"gopkg.in/yaml.v2 5420a8b6744d3b0345ab293f6fcba19c978f1183 github.com/go-yaml/yaml"
+)
+
+inherit golang-build golang-vcs-snapshot
+
+DESCRIPTION="Format agnostic jQ"
+HOMEPAGE="https://github.com/jzelinskie/faq"
+SRC_URI="https://github.com/jzelinskie/faq/archive/${PV}.tar.gz -> ${P}.tar.gz
+	${EGO_VENDOR_URI}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="dev-libs/oniguruma"
+
+RESTRICT="test"
+
+src_compile() {
+	pushd src/${EGO_PN} || die
+	GOPATH="${S}" go install -v "${EGO_PN}" || die
+	popd || die
+}
+
+src_install() {
+	dobin bin/${PN}
+	pushd src/${EGO_PN} || die
+	dodoc README.md docs/examples.md
+	popd || die
+}
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
--- a/app-portage/repoman/repoman-2.3.10.ebuild
+++ b/app-portage/repoman/repoman-2.3.10.ebuild
@ -3,7 +3,7 @@

 EAPI=6

-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
 PYTHON_REQ_USE='bzip2(+)'

 inherit distutils-r1
--- a/app-portage/repoman/repoman-9999.ebuild
+++ b/app-portage/repoman/repoman-9999.ebuild
@ -3,7 +3,7 @@

 EAPI=6

-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
 PYTHON_REQ_USE='bzip2(+)'

 inherit distutils-r1
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
--- a/dev-db/tokumx/files/tokumx-2.0.2-no-delete-null-pointer-checks.patch
+++ b/dev-db/tokumx/files/tokumx-2.0.2-no-delete-null-pointer-checks.patch
@ -0,0 +1,23 @@
+diff -uNr tokumx-enterprise-2.0.2.ORIG/CMakeLists.txt tokumx-enterprise-2.0.2/CMakeLists.txt
+--- tokumx-enterprise-2.0.2.ORIG/CMakeLists.txt	2018-07-17 16:20:18.712013701 +0100
+++ tokumx-enterprise-2.0.2/CMakeLists.txt	2018-07-17 16:22:06.063018495 +0100
+@@ -83,7 +83,7 @@
+ endmacro(set_cxxflags_if_supported)
+ 
+ set(CMAKE_C_FLAGS "-fPIC -fno-strict-aliasing -ggdb -Wall -Wsign-compare -Wno-unknown-pragmas -Winvalid-pch -pipe")
+-set(CMAKE_CXX_FLAGS "-fPIC -fno-strict-aliasing -ggdb")
+set(CMAKE_CXX_FLAGS "-fPIC -fno-strict-aliasing -fno-delete-null-pointer-checks -ggdb")
+ set_cxxflags_if_supported(
+   -Wall
+   -Wsign-compare
+diff -uNr tokumx-enterprise-2.0.2.ORIG/SConstruct tokumx-enterprise-2.0.2/SConstruct
+--- tokumx-enterprise-2.0.2.ORIG/SConstruct	2018-07-17 16:20:18.712013701 +0100
+++ tokumx-enterprise-2.0.2/SConstruct	2018-07-17 16:22:40.459020031 +0100
+@@ -702,6 +702,7 @@
+     # -Winvalid-pch Warn if a precompiled header (see Precompiled Headers) is found in the search path but can't be used.
+     env.Append( CCFLAGS=["-fPIC",
+                          "-fno-strict-aliasing",
+                         "-fno-delete-null-pointer-checks",
+                          "-ggdb",
+                          "-pthread",
+                          "-Wall",
--- a/dev-db/tokumx/tokumx-2.0.2-r2.ebuild
+++ b/dev-db/tokumx/tokumx-2.0.2-r2.ebuild
@ -43,6 +43,7 @@ src_prepare() {
 	eapply "${FILESDIR}/${P}-boost-57.patch"
 	eapply "${FILESDIR}/${P}-gcc-7.patch"
 	eapply "${FILESDIR}/${P}-undefined-reference.patch"
+	eapply "${FILESDIR}/${P}-no-delete-null-pointer-checks.patch"
 	cmake-utils_src_prepare
 }

--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
--- a/dev-libs/libprelude/Manifest
+++ b/dev-libs/libprelude/Manifest
@ -1,3 +1,4 @@
 DIST libprelude-3.0.0.tar.gz 2900153 BLAKE2B dd03b46a11b673252dc36701e4568c445fe1e3a61a79c92ce04ed6fefac804983ba03e39928038a67768d9e5e0542d74703c07254c0112d5a6906a7c37ae4403 SHA512 a1fd51aa3bb1b68759a00dd1636cb96379f0e954a66f4e39887ab20a5b4c191a0455dd6bd5f41b20ad94d06fff59af7f89b258f42e1c0dd4cfc99185a77d1797
 DIST libprelude-3.1.0.tar.gz 2949462 BLAKE2B 52764791766c54e2c1baa96231c6578f06219a6d1c48a97ad318fc8445fc64f90a63019654f7350d65ec4e0a336eef66bd449484321c590d1ee4596a6a386724 SHA512 f2878b19b4ba3cc74b0530f8741525ecf1425540d30356d182c4e0a797dbb5f4023792351bd059105dafc6b7818d4caa2e9c8b39be9a7039a89680244fcf1239
 DIST libprelude-4.0.0.tar.gz 2864402 BLAKE2B 2e51eb1af74b63140bc66a358b112a753c1a0fd86d6bb8bb43ccddca4cd396e34566168edca55a626a0b43ba56e676301f3792247c25f64c7a31430af3708311 SHA512 5d88e8f211b09cc3e43dbe299e935d8f11575ae3f1894059793966cd14a8e47177ef8963d45305e1a24f9efc4048520329b31681301a21815909bd38606c2ce7
+DIST libprelude-4.1.0.tar.gz 2852916 BLAKE2B a18babb24795d17d72eb1c0755f4b0330125c8b289af0b52753f6f69b5e820f0f972019b57eaded3abfc45c69bd75c0d120fe29982887e55d75f2c4c8b6486f7 SHA512 073307ca070794b47643e2ef2db4788fa92374735558b466441f0663f420cab45aecc7a1d99bb487ad23ebe602d5668369ffa6ab29fa3b0504356420ab3a7878
--- a/dev-libs/libprelude/libprelude-4.1.0.ebuild
+++ b/dev-libs/libprelude/libprelude-4.1.0.ebuild
@ -0,0 +1,92 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
+DISTUTILS_OPTIONAL=1
+
+inherit autotools distutils-r1 ruby-single
+
+DESCRIPTION="Prelude-SIEM Framework Library"
+HOMEPAGE="https://www.prelude-siem.org"
+SRC_URI="https://www.prelude-siem.org/pkg/src/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="lua perl python ruby"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="net-libs/gnutls:=
+	lua? ( dev-lang/lua:* )
+	perl? ( dev-lang/perl:= virtual/perl-ExtUtils-MakeMaker )
+	python? ( ${PYTHON_DEPS} )
+	ruby? ( ${RUBY_DEPS} )"
+
+DEPEND="${RDEPEND}
+	>=dev-lang/swig-3.0.11
+	dev-util/gtk-doc-am
+	sys-devel/flex
+	virtual/pkgconfig
+	virtual/yacc"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.0.0-fix-python-bindings.patch"
+)
+
+src_prepare() {
+	default
+
+	# Avoid null runpaths in Perl bindings.
+	sed -e 's/ LD_RUN_PATH=""//' -i "${S}/bindings/Makefile.am" || die "sed failed"
+
+	eautoreconf
+
+	if use python; then
+		cd bindings/python || die
+		distutils-r1_src_prepare
+	fi
+}
+
+src_configure() {
+	local myconf=(
+		--enable-easy-bindings
+		--with-swig
+		$(use_with lua)
+		$(use_with perl)
+		$(usex perl '--with-perl-installdirs=vendor' '')
+		$(use_with ruby)
+	)
+
+	if use python; then
+		python_setup
+		if python_is_python3; then
+			myconf+=(--without-python2 --with-python3="${EPYTHON}")
+		else
+			myconf+=(--without-python3 --with-python2="${EPYTHON}")
+		fi
+	else
+		myconf+=(--without-python2 --without-python3)
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	default
+	if use python; then
+		cd bindings/python || die
+		distutils-r1_src_compile
+	fi
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+	if use python; then
+		cd bindings/python || die
+		distutils-r1_src_install
+	fi
+}
--- a/dev-libs/libpreludedb/Manifest
+++ b/dev-libs/libpreludedb/Manifest
@ -1,3 +1,4 @@
 DIST libpreludedb-3.0.0.tar.gz 1269937 BLAKE2B 6f6bad7b9529b88bd03b224c1ea4066b9e806ff82960d1c2e336ebc5c345353a3b63224e0ea84407f159443b6ec53c1cb6bba8009d48dfb53a26bab96960467e SHA512 9d80e01be8cf028b8a843e68e45eeb84c561ff37e688fe5b8156e717f337b1db4d3de983f37a0544bf018238bec07580dce0c7208df005113efbba0aab34b981
 DIST libpreludedb-3.1.0.tar.gz 1291186 BLAKE2B 90b3b6264f0042b14e54abfc3068071419646076fc6cfa3dd84ba6c14797fb0ea88885edef47b8a5d0dc455468e6daaa8e795b621a4f9001d19d8edc33630a88 SHA512 dcb98eff2521979c2956bdd6f3b661c346c0f6748ef820a75d77c948e426a996de26c7fc6b6c2abddc93277db3820eb2f44b61c87feb86483e720cf9b0e0124c
 DIST libpreludedb-4.0.0.tar.gz 1325812 BLAKE2B 7a506f7cd7b51898e26201f2cc640b1f34227f9cf7c5c6e2385480f1fc0ad854b6d747293ab502b641cc65f1ee9ae4a8f225e6a1d4489bcaa59901c6342f1279 SHA512 13f5dbcfa6af965f2075d60c645ebb19cbd6b18807b26f4f13a7a05f1cf552996f9846e856728a4e1dc621efda693016e82623d4a3cbf74849b3e7114f19faca
+DIST libpreludedb-4.1.0.tar.gz 1333638 BLAKE2B 380a6d4ef8836555510f9f9882b6100417f2567520c421355fb7eec8d2cd7e2f3942c4cb90ea21fa1557327026edd5c1e35e338a79e06a21cfb2bd6813a289c2 SHA512 de1fa5106d7f34edb5a23e726c968de84bb8b10257587b6ee36276ed75ddc54f4f9539aecb7836e114eb3bfa90104dd3b5e097be0c3d12347dcbded94f293dc4
--- a/dev-libs/libpreludedb/libpreludedb-4.1.0.ebuild
+++ b/dev-libs/libpreludedb/libpreludedb-4.1.0.ebuild
@ -0,0 +1,89 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
+DISTUTILS_OPTIONAL=1
+
+inherit autotools distutils-r1 ruby-single
+
+DESCRIPTION="Framework to easy access to the Prelude database"
+HOMEPAGE="https://www.prelude-siem.org"
+SRC_URI="https://www.prelude-siem.org/pkg/src/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="mysql postgres python sqlite"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="~dev-libs/libprelude-${PV}
+	net-libs/gnutls:=
+	mysql? ( virtual/libmysqlclient )
+	postgres? ( dev-db/postgresql:* )
+	python? ( ${PYTHON_DEPS} )
+	sqlite? ( dev-db/sqlite:3 )"
+
+DEPEND="${RDEPEND}
+	>=dev-lang/swig-3.0.11
+	dev-util/gtk-doc-am
+	sys-devel/flex
+	virtual/pkgconfig
+	virtual/yacc"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.0.0-fix-python-bindings.patch"
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+
+	if use python; then
+		cd bindings/python || die
+		distutils-r1_src_prepare
+	fi
+}
+
+src_configure() {
+	local myconf=(
+		--enable-easy-bindings
+		--with-swig
+		$(use_with mysql)
+		$(use_with postgres postgresql)
+		$(use_with sqlite sqlite3)
+	)
+
+	if use python; then
+		python_setup
+		if python_is_python3; then
+			myconf+=(--without-python2 --with-python3="${EPYTHON}")
+		else
+			myconf+=(--without-python3 --with-python2="${EPYTHON}")
+		fi
+	else
+		myconf+=(--without-python2 --without-python3)
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	default
+	if use python; then
+		cd bindings/python || die
+		distutils-r1_src_compile
+	fi
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+	if use python; then
+		cd bindings/python || die
+		distutils-r1_src_install
+	fi
+}
--- a/dev-libs/nmeap/nmeap-0.3.ebuild
+++ b/dev-libs/nmeap/nmeap-0.3.ebuild
@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"

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

 DEPEND="doc? ( app-doc/doxygen )"
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
--- a/dev-python/django/Manifest
+++ b/dev-python/django/Manifest
@ -1,5 +1,5 @@
 DIST Django-1.10.7.tar.gz 7737654 BLAKE2B 54625d105eff94f64aa6d9e3afbad390a1d63e4d262e5ef8ec47c568438ad756eff1e59450d34139e6a3e3dab0eb2c16aa7fbe71b9a0379625e57ef8da45331c SHA512 2b16de21a1c966942f0d912bde4f5be7004f250e5ce3c56a5ac462f81f82e911da19fa0aeb9058670d663caecc1016ce4bcd93c1fa058675150caa33cfeb0e3b
-DIST Django-1.11.2.tar.gz 7865109 BLAKE2B 52b8e91ece9fc9d2541667320d7aeecd7101a16573141cf3f781153eaccbb0e6b0f90fbd4c4d90ae06e8b0e71c1cb4aff8f8eaedc1bef6afa13426d16744905a SHA512 0f1187fd03064b966241d6ed1a869d6f155af2598a7b9c8b2f902585265cb6df7236817e5f14907c362ce7420d08e881ff9461f14d673485be3b3e5c3d980e8e
+DIST Django-1.11.14.tar.gz 7850578 BLAKE2B b858ab51d40812979ec04cffc459ce137a5f5604d105e73c2fdf9e36b07fd5cf12a7f31d6f89607716220328313663f4e99dabfdf40f93b5c829efe533efbc51 SHA512 71dbbad22bf0675a5c9aa36bcf69d6de561cf041b744fa37b407cb021ef342c3245b8001025c0492ce20df664e37ed2d7a5ffdc397761065d088ddb0d9fbe6c8
 DIST Django-1.4.22.tar.gz 7802249 BLAKE2B daf3a23c4e863ec9e5ff538f4a0720036e035be0c871fb6342ef9b40b8bb7a3dff9a735a040f4c003bce815f10153f4cf31dfdc181cd69fe4db1ab217ea93d76 SHA512 03e833d95d8ffacf8cb753b8b8c15edc145830add322ad166c574a9a7428ed308082ffea7a73bcdb7315f489270fd84a38d1a8b12c090dfb9d68da5d281cef68
 DIST Django-1.5.12.tar.gz 8202839 BLAKE2B 9f177aa1e06b2d908448022ccd9986074abf66e58f4ab3315f5d3fb28cc45b77e23fc0c3933166e2720d1869b35a596d65350742a8015688f88c5358fa0e3484 SHA512 37736827618737c54e7b63f2376b915d8dc0cdaf1900a2f6c3c9e0edd69e50379f95e3b6a31c930efdca88793b6330e7226175af91951d8637e5db780bc9fd8d
 DIST Django-1.6.11.tar.gz 6764000 BLAKE2B 85ea8c37e0728405e0109504e81db92a0a4f31c908daa09fdcb73890df5724d7bea0a8c8322ee62b8b1ee07cf5a01078ba404140991799bc0acf1f31ca5003f5 SHA512 de6024b49e0344bf153f73ec344180fb701e415e4f9c330118821744d0e579436cc265724f7ef7213c9551847022ba9570312633f317b9003db533d06deb9829
--- a/dev-python/django/django-1.11.14.ebuild
+++ b/dev-python/django/django-1.11.14.ebuild
@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
 PYTHON_REQ_USE='sqlite?,threads(+)'
 WEBAPP_NO_AUTO_INSTALL="yes"

-inherit bash-completion-r1 distutils-r1 eutils versionator webapp
+inherit bash-completion-r1 distutils-r1 eutils eapi7-ver webapp

 MY_PN="Django"
 MY_P="${MY_PN}-${PV}"
@ -15,7 +15,7 @@ MY_P="${MY_PN}-${PV}"
 DESCRIPTION="High-level Python web framework"
 HOMEPAGE="https://www.djangoproject.com/ https://pypi.org/project/Django/"
 SRC_URI="
-	https://www.djangoproject.com/m/releases/$(get_version_component_range 1-2)/${MY_P}.tar.gz
+	https://www.djangoproject.com/m/releases/$(ver_cut 1-2)/${MY_P}.tar.gz
 	mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz
 	"

@ -39,6 +39,8 @@ DEPEND="${RDEPEND}
 		dev-python/numpy[$(python_gen_usedep 'python*')]
 		dev-python/pillow[${PYTHON_USEDEP}]
 		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		virtual/python-enum34[${PYTHON_USEDEP}]
 		)"

 S="${WORKDIR}/${MY_P}"
--- a/dev-python/django/metadata.xml
+++ b/dev-python/django/metadata.xml
@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+  <maintainer type="person">
+    <email>vdupras@gentoo.org</email>
+    <name>Virgil Dupras</name>
+  </maintainer>
  <maintainer type="project">
    <email>python@gentoo.org</email>
    <name>Python</name>
--- a/dev-python/h11/Manifest
+++ b/dev-python/h11/Manifest
@ -0,0 +1,2 @@
+DIST h11-0.7.0.zip 105979 BLAKE2B 46922a67a8496254845562e46432596cbc400e788adddc5df1b84583d16a090fbc1ac6a4dab1af9d05263abb33d2505627be1325ca9c3f6dd27dd3676ca99027 SHA512 abf9b8f7f12870804539049c3bfebbbe476e394636aed9967aa725d501fff983f28c7f14b4b882c17914d00fe3e74417ff8922128d0e4e07bf042a7db6d0b100
+DIST h11-0.8.1.tar.gz 94009 BLAKE2B 34c43874ba8d1e59f89d9d71a5eb8033583aefc6659f6cf645067267a68769f01864b997623ad175e263d4918e2e572e2af49f4ddf743608fc259ab7b4a51022 SHA512 3310dcd8552de4440ed9669fd37b3fc4d76073a9801decb705bceee3c1e98ff83470bd124ecf36e1ec3457ff2fb4da6f4fbf077daa810c28ab73044dfab709d4
--- a/dev-python/h11/h11-0.7.0.ebuild
+++ b/dev-python/h11/h11-0.7.0.ebuild
@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="A pure-Python implementation of HTTP/1.1 inspired by hyper-h2"
+HOMEPAGE="https://github.com/python-hyper/h11 https://pypi.python.org/pypi/h11"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+
+python_test() {
+	py.test -v || die "Testing failed"
+}
--- a/dev-python/h11/h11-0.8.1.ebuild
+++ b/dev-python/h11/h11-0.8.1.ebuild
@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="A pure-Python implementation of HTTP/1.1 inspired by hyper-h2"
+HOMEPAGE="https://github.com/python-hyper/h11 https://pypi.python.org/pypi/h11"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+
+python_test() {
+	py.test -v || die "Testing failed"
+}
--- a/dev-python/h11/metadata.xml
+++ b/dev-python/h11/metadata.xml
@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>oleksandr.trotsenko@gmail.com</email>
+		<name>Oleksandr Trotsenko</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+</pkgmetadata>
--- a/dev-python/more-itertools/more-itertools-4.2.0.ebuild
+++ b/dev-python/more-itertools/more-itertools-4.2.0.ebuild
@ -36,6 +36,8 @@ python_compile_all() {
 }

 python_test() {
+	# Avoid ImportMismatchError, see https://bugs.gentoo.org/661412
+	cd "${BUILD_DIR}/lib" || die
 	py.test --doctest-modules more_itertools \
 		|| die "tests fail with ${EPYTHON}"
 }
--- a/dev-python/pymediainfo/pymediainfo-2.3.0-r1.ebuild
+++ b/dev-python/pymediainfo/pymediainfo-2.3.0-r1.ebuild
@ -3,7 +3,7 @@

 EAPI=7

-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{4,5,6}} )
+PYTHON_COMPAT=( pypy{,3} python{2_7,3_{4,5,6,7}} )
 PYTHON_REQ_USE="xml(+)"

 inherit distutils-r1
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
--- a/dev-ruby/facter/Manifest
+++ b/dev-ruby/facter/Manifest
@ -1,4 +1,5 @@
 DIST facter-2.4.6.gem 246272 BLAKE2B 105a43b2697cde0a48d4fcf87e221cfcb348695f81722b8cfe2819a8f3fe19e575d22642a708c798648d05c71f54e7bf0281345320612a8fdb3b68fce993ec20 SHA512 a0a2bef37451ab96ed331c79171f77d89b6db430b083e6888a306fa5b57a72986b7f600cad3e09b5f4706e54736d1d32ea25525fe18a6108cc95f315da16664a
 DIST facter-3.11.1.tar.gz 384201 BLAKE2B 349493f0046239ed900cb22df6cac2f5c1f748503e057a68e9be34c2f24f134a280ab9292d7f4e754a5974818a1fd01bc55634905d84706b47686a9e7a1ccc39 SHA512 295c91817912fb43fe259ede4b51ecf4ae5efd500d64b2682c700583bfdf694a8849a4bd4cb3a16a8046d563f487225957a49b760cc03d8bf86ac8487e37a756
 DIST facter-3.11.2.tar.gz 384784 BLAKE2B f280772231a9105e5924cdb777411861a76a67c15b4d7f3cc73fb9c089752a4e5fa43c4d84b8525917fae71ae34c770925161cc94882e74a704d6609b1c1778a SHA512 aaeee7449813590ac8bc8d3b1b2a654e75bcdaabbb19f91f8b282f747e0f8af05ef71bc872b99c226f0db4d06b67549551f62c365853f5829c6b26c931c0b582
+DIST facter-3.11.3.tar.gz 384882 BLAKE2B ad6103df38efb6abd68d9f831e53dba2767401e129d55bb94adee4dc3f8bc48c7a969050cc52d395a196883d561317ccb72bfaba2775e003171fd6941935feb8 SHA512 6b2dbc5a0bc1c70739a4c0987311ef0891a27f64ed1b45a46cc20a37e6d1d24fda0481976fbf743f83f10d2014f6e0df0e2b5cc9eba19924e831652e1a8417ef
 DIST facter-3.9.2.tar.gz 380883 BLAKE2B d2804664e0499715230e5696c5a9ebae933f5b43dfb37154251d47763c2c7f78cfa8d1413dd836e5a0c76ed67300d066fa5bb390f17f85cd4cb7a444eaf0d133 SHA512 bc040826311bbff40f5a151ade315d9d47ef1e0f3faa570805e48ca55405265e66308230118b9cd59f701ecd76a7b0fd4d9200dd4ace838521223a162b105374
--- a/dev-ruby/facter/facter-3.11.3.ebuild
+++ b/dev-ruby/facter/facter-3.11.3.ebuild
@ -0,0 +1,105 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25"
+
+# git-r3 goes after ruby-ng so that it overrides src_unpack properly
+inherit cmake-utils eutils multilib ruby-ng
+
+DESCRIPTION="A cross-platform ruby library for retrieving facts from operating systems"
+HOMEPAGE="http://www.puppetlabs.com/puppet/related-projects/facter/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="debug test"
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/puppetlabs/facter.git"
+	EGIT_BRANCH="master"
+	S="${S}/${P}"
+else
+	[[ "${PV}" = *_rc* ]] || \
+	KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+	SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	S="${S}/all/${P}"
+fi
+
+BDEPEND="
+	>=sys-devel/gcc-4.8:*
+	dev-cpp/cpp-hocon"
+CDEPEND="
+	>=dev-libs/leatherman-1.0.0:=
+	dev-libs/openssl:*
+	sys-apps/util-linux
+	app-emulation/virt-what
+	net-misc/curl
+	>=dev-libs/boost-1.54:=[nls]
+	>=dev-cpp/yaml-cpp-0.5.1
+	!<app-admin/puppet-4.0.0"
+
+ruby_add_bdepend "test? ( dev-ruby/rake dev-ruby/rspec:2 dev-ruby/mocha:0.14 )"
+
+RDEPEND="${CDEPEND}"
+DEPEND="${BDEPEND}
+	${CDEPEND}"
+
+src_prepare() {
+	# Remove the code that installs facter.rb to the wrong directory.
+	sed -i '/install(.*facter\.rb/d' lib/CMakeLists.txt || die
+	sed -i '/install(.*facter\.jar/d' lib/CMakeLists.txt || die
+	# make it support multilib
+	sed -i "s/\ lib)/\ $(get_libdir))/g" lib/CMakeLists.txt || die
+	sed -i "s/lib\")/$(get_libdir)\")/g" CMakeLists.txt || die
+	# make the require work
+	sed -i 's/\${LIBFACTER_INSTALL_DESTINATION}\///g' lib/facter.rb.in || die
+	# be explicit about the version of rspec we test with and use the
+	# correct lib directory for tests
+	sed -i -e '/libfacter.*specs/ s/rspec/rspec-2/' \
+		-e '/libfacter.*specs/ s/lib64/lib/' CMakeLists.txt || die
+	# be more lenient for software versions for tests
+	sed -i -e '/rake/ s/~> 10.1.0/>= 10/' \
+		-e '/rspec/ s/2.11.0/2.11/' \
+		-e '/mocha/ s/0.10.5/0.14.0/' lib/Gemfile || die
+	# patches
+	default
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_VERBOSE_MAKEFILE=ON
+		-DCMAKE_BUILD_TYPE=None
+		-DCMAKE_INSTALL_PREFIX=/usr
+		-DBLKID_LIBRARY=/$(get_libdir)/libblkid.so.1
+	)
+	if use debug; then
+		mycmakeargs+=(
+		  -DCMAKE_BUILD_TYPE=Debug
+		)
+	fi
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+each_ruby_install() {
+	doruby "${BUILD_DIR}"/lib/facter.rb
+}
+
+src_test() {
+	cmake-utils_src_test
+}
+
+src_install() {
+	cmake-utils_src_install
+	ruby-ng_src_install
+
+	# need a variable file in env.d :(
+	diropts -m0755
+	dodir /etc/env.d
+	echo -n "FACTERDIR=/usr/$(get_libdir)" > "${D}/etc/env.d/00facterdir"
+	fperms 0644 /etc/env.d/00facterdir
+}
--- a/dev-ruby/ox/Manifest
+++ b/dev-ruby/ox/Manifest
@ -1,4 +1,3 @@
 DIST ox-2.8.2.tar.gz 193670 BLAKE2B 70e38754594a40ed35aa43aad32806d5c9eec7d3f60ee18a846a99f28b558173ea99b554f7f3a4f2b848686536d194035fd345ab33b9d7b5e12a246a472463d4 SHA512 18a887db70962a1dd1c6ea18461eca0efbcffdb231f934c3603e63537e9911e820465ce5e4ab86cbedd65b396a9a12b0ad7e60ea7ae687c4ebe8436e0c37988c
-DIST ox-2.9.0.tar.gz 197666 BLAKE2B 0bc211df2c3940c64df2b0e90991e828e7403c3a1f7eb885e9464659dd33930d881fdcb6443cf5b08b27f69388525c2da99d1bb686da66937f9b288ac21f7aaa SHA512 b681f3532f22e7111f693106728bcae19a7ed2eba058cfab62d73977281093cc64833460ff64fcfecc4f1bfc115c150d0712819345b0765c6dc4b4d0d67fd59c
-DIST ox-2.9.2.tar.gz 198295 BLAKE2B cc60a0382ebe3632296b9239b8e5101f3e5a08b434923982c54f453f4d95d37180dc938c6e577834721aada11d0d00bebc12776b04e28036ea067a3064e8eaa1 SHA512 4d77eea444fa6ce07e3b9d174745071fb1b7dd053e512255b9be73d6f528e590d614c86b4b61aa03163669bd5b637a60f7aef47f223e2dd719b2e5923712e95d
 DIST ox-2.9.3.tar.gz 198296 BLAKE2B 90f3e3b159caf8aede8233d49dc67a42bf9d5d7348769f50ad042fdb54e01f2672fb3f04d6062663e35cc1819389a16457905c80891846fca859334e0f6d0863 SHA512 fb342376c5d01029ee6ec18deb10561e7e4e123707bda7f1ab4c8782beee7493a7dd3f7745c179ec04d868c9787899715edd2f74b26ad4f769b14d1e6b54da1f
+DIST ox-2.9.4.tar.gz 198547 BLAKE2B 4a088fb9d8ff0aa89c6496f8d1228ca33445e34fd66476de288c4373401421b27fceced671d4754b23ddc4da0b49b1ddba1ce060c5468723a146e4d5d10b7a0f SHA512 babb1e4a88596553ddba79afeaa2bad0221e90e08cc0505c8297b61b6a1acb7c9e458ee71da420ee49378c4ac8d3b8545d1ab7e05710da556c452f3f7bb133f1
--- a/dev-ruby/ox/ox-2.9.0.ebuild
+++ b/dev-ruby/ox/ox-2.9.0.ebuild
@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby22 ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A fast XML parser and Object marshaller"
-HOMEPAGE="http://www.ohler.com/ox/ https://github.com/ohler55/ox"
-SRC_URI="https://github.com/ohler55/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="BSD"
-
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-SLOT="0"
-IUSE=""
-
-each_ruby_configure() {
-	${RUBY} -Cext/ox extconf.rb || die
-}
-
-each_ruby_compile() {
-	emake V=1 -Cext/ox
-	cp ext/ox/ox$(get_modname) lib/ox/ || die
-}
-
-each_ruby_test() {
-	${RUBY} test/tests.rb || die
-}
--- a/dev-ruby/ox/ox-2.9.4.ebuild
+++ b/dev-ruby/ox/ox-2.9.4.ebuild
--- a/dev-ruby/rack-protection/Manifest
+++ b/dev-ruby/rack-protection/Manifest
@ -1,5 +1,3 @@
-DIST rack-protection-1.5.3.gem 18432 BLAKE2B 96daf85f6b51b4a8c8992109ccb0821b9f713166965a6d1392f20a966e3502facc4294c0a824beaa395306e0ba3234902eef717ed839e3e3ca907deedf83370d SHA512 9f94f9f25197c3f8227f5c9c9fd2e896e35bfc08d4a20f4dded9c42772f348d16dceda6916429833b498b29c4dbba4dbb31b1a3cf90de597fb6df2de145d655a
-DIST rack-protection-2.0.0.gem 15872 BLAKE2B 706fba47a09565bc973a5dbae3369cb26d02839be92347bb153c5f12054ef605e8e025a0666cb0aa44aae316ba494fffdbb7bbc840dfefff9b3e0b0efd39817a SHA512 cce6a8a64c502e4cfec47ae3d76e71aef42b1eec5aa4802a6c443fcb7a8971a99ad9a5b34fea7ae878630faba10d4f5bde4d9a3eb66f63600fcaf02d9ecc0c2e
-DIST rack-protection-2.0.1.gem 15872 BLAKE2B bd2b17d21767f4f6772400168ddd53491693780b62359d526739580cca66b5b27d4f4c6f419a6ef695ffbef5ff9045bac683c78117765ff784fda136ec102090 SHA512 6dd525384a0027a1943741881168433c63dc2d18093833dffb3417f3f6ccc46d597435a880d297d07751db1c449f3e37942ae03e33d378dbc74caec38c5cf1df
+DIST rack-protection-1.5.5.gem 18432 BLAKE2B abda1313e7e0d04299a689c55241cd92d0f5ed2048395ab79f09ba271100a8dc99fbf5f924e3b3cbe28f318090144539eb0174cc1813d371d9f37df31ab04315 SHA512 c4066a50771247fc89d4ddee44ff87e40a24bad95e914ed2f72cbf9c45152e67e51d2ccc7d1725ade637296a080b06f304157a1a024613a97595b144e03e2e70
 DIST rack-protection-2.0.2.gem 16896 BLAKE2B b3ed6a399f93c359a305cef0893bb5056ac26e8d5f345761f497b5eb77aecc201cd388bc0fc021ed039f230bc2ca2348f7eec19aaaac3f2662500bd4c6496a93 SHA512 e74be8b079a1c436d80df2e6bf58dcaea089aceb58b8ec6c08d6ac78b5390bdb1b494d9155350dc7e2639e858209aac10757be54085a565b910e5e74ee882235
 DIST rack-protection-2.0.3.gem 16896 BLAKE2B e33cfc8290cf108f986bd625623411f63812aa79bc5354041e3d541a244bdc6f2ba30ebfab77cb2fe15c8a53e21e11adc6a54ab90a687147759d1b14b5e0be73 SHA512 396d1b45783e0b6782b479b6ba77c2eb23c2a6a2b695a631b7a4b9ace661471325d4d321a40ba7c8090964e68b5dd8f9c92c4843464e6d6ff178aecf9996f338
--- a/dev-ruby/rack-protection/rack-protection-1.5.3-r1.ebuild
+++ b/dev-ruby/rack-protection/rack-protection-1.5.3-r1.ebuild
@ -1,8 +1,8 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

-EAPI=5
-USE_RUBY="ruby22 ruby23 ruby24 ruby25"
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25"

 RUBY_FAKEGEM_RECIPE_TEST="rspec"
 RUBY_FAKEGEM_TASK_DOC=""
@ -10,13 +10,13 @@ RUBY_FAKEGEM_EXTRADOC="README.md"

 RUBY_FAKEGEM_GEMSPEC="rack-protection.gemspec"

-inherit ruby-fakegem eutils versionator
+inherit ruby-fakegem eapi7-ver

 DESCRIPTION="This gem protects against typical web attacks"
 HOMEPAGE="https://github.com/rkh/rack-protection"

 LICENSE="MIT"
-SLOT="$(get_version_component_range 1)"
+SLOT="$(ver_cut 1)"
 KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""

--- a/dev-ruby/rack-protection/rack-protection-2.0.0.ebuild
+++ b/dev-ruby/rack-protection/rack-protection-2.0.0.ebuild
@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
-
-# There are no specs in the gem and the source cannot be downloaded separately.
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem eutils versionator
-
-DESCRIPTION="This gem protects against typical web attacks"
-HOMEPAGE="https://github.com/rkh/rack-protection"
-
-LICENSE="MIT"
-SLOT="$(get_version_component_range 1)"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_rdepend "dev-ruby/rack:*"
-
-# ruby_add_bdepend "test? ( dev-ruby/rack-test )"
--- a/dev-ruby/rack-protection/rack-protection-2.0.1.ebuild
+++ b/dev-ruby/rack-protection/rack-protection-2.0.1.ebuild
@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby22 ruby23 ruby24"
-
-# There are no specs in the gem and the source cannot be downloaded separately.
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem eutils versionator
-
-DESCRIPTION="This gem protects against typical web attacks"
-HOMEPAGE="https://github.com/rkh/rack-protection"
-
-LICENSE="MIT"
-SLOT="$(get_version_component_range 1)"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_rdepend "dev-ruby/rack:*"
-
-# ruby_add_bdepend "test? ( dev-ruby/rack-test )"
--- a/dev-ruby/yard/Manifest
+++ b/dev-ruby/yard/Manifest
@ -1,2 +1,3 @@
 DIST yard-0.9.11-git.tgz 916355 BLAKE2B e9f27fe129cf93c51dbf83f4a7d5745d385252ba63c90f85223f2e9436c22a55aaba296f263072069d39e4beaca3e0830775a8be121c64cdc2a15afd3539a73f SHA512 375a4878e61888cf73aaa06e9300195ae48b9898d8cd639fa796a067e5fa0b89d6ef62d327a388ee83953e80177515f4d8c070042188e3a1e597f48b82b3a72e
 DIST yard-0.9.14-git.tgz 917830 BLAKE2B dd0d1d6dbc5aa9b549bd4c110f1abd57edc76b85e7c936bca8f7d35761d705ba86cd169c3c2b2141095dda68a8ab350b46bcbeb978d655addff78b110fbd2b71 SHA512 7974d431b2c1ef4830f225fd2012592405e7fb63546aeb52b74f4ad8b498926be979f3010bd315877bb4f738f6aa6c31f54b71832b461ebd3fa54fe1a1fccf5f
+DIST yard-0.9.15-git.tgz 918280 BLAKE2B f7ae54298cfb8d19e006ad5e18525c3e73e423894e37c3af1fbf555227c4f66bbbcdae781addf7ad30ac900d2af7458550558fe75d876d9fa4c0cd5a2a1a3668 SHA512 45e3a6e170c06c0f7e7ff508d33e87ed9922be3e8fca19d272553b84e678fa209c44460665b86e508145b147dbbc6d4664b95694dbcf91c421988b233e63dd40
--- a/dev-ruby/yard/yard-0.9.15.ebuild
+++ b/dev-ruby/yard/yard-0.9.15.ebuild
@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_TASK_DOC="yard"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_DOCDIR="doc docs"
+
+RUBY_FAKEGEM_EXTRAINSTALL="templates"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Documentation generation tool for the Ruby programming language"
+HOMEPAGE="https://yardoc.org/"
+
+# The gem lakes the gemspec file needed to pass tests.
+SRC_URI="https://github.com/lsegal/yard/archive/v${PV}.tar.gz -> ${P}-git.tgz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+ruby_add_bdepend "doc? ( || ( dev-ruby/maruku dev-ruby/rdiscount dev-ruby/bluecloth dev-ruby/kramdown ) )"
+
+ruby_add_bdepend "test? ( >=dev-ruby/ruby-gettext-2.3.8 dev-ruby/rack )"
+
+all_ruby_prepare() {
+	sed -i -e '/[Bb]undler/ s:^:#:' spec/spec_helper.rb || die
+
+	# Avoid specs that make assumptions on load ordering that are not
+	# true for us. This may be related to how we install in Gentoo. This
+	# also drops a test requirement on dev-ruby/rack.
+	rm -f spec/cli/server_spec.rb || die
+
+	# Avoid specs that only work with bundler
+	sed -i -e '/#initialize/,/^  end/ s:^:#:' spec/cli/yri_spec.rb || die
+
+	# Avoid redcarpet-specific spec that is not optional
+	sed -i -e '/autolinks URLs/askip "make redcarpet optional"' spec/templates/helpers/html_helper_spec.rb || die
+}
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
--- a/dev-util/bitrise/Manifest
+++ b/dev-util/bitrise/Manifest
@ -1 +1,2 @@
 DIST bitrise-1.16.1.tar.gz 3986520 BLAKE2B 2a38eb72abc2aee69b9494abe03434014531a5081e8d71e7883418d686dffd1de8d61b2dda8761a1d074392a4f84699a4cff36be4f6be8abf52ba705434b8283 SHA512 37d87a27f2d3c17df7c61eebb8ab50887c7f723901125af08a5833bd053c5706cf1a2d3310fa30a6ade3bec8292b30bc4ddfb3143ece8129c606fcbe5103ddd6
+DIST bitrise-1.19.0.tar.gz 4223634 BLAKE2B cb0822af15c1214d785f002617cd5c184e50a85c289d7ef5fe4fb429009495db26935aea9b9fbdb43514221d233a10347b52d01c0f839bb981da8437d61f79a1 SHA512 ef0ca59a907bf85ceadd2bccb7859e6b40146fd4983d51c84f82ba3ac36b47eeef41cbd342cfcbe516ed2ee678e66a4e07ef451cc36a7b6977fa6def9ac2a1e4
--- a/dev-util/bitrise/bitrise-1.19.0.ebuild
+++ b/dev-util/bitrise/bitrise-1.19.0.ebuild
@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit golang-build
+
+EGO_ON="github.com/bitrise-io"
+EGO_PN="${EGO_ON}/${PN}"
+
+DESCRIPTION="Run your Bitrise.io automations on any Mac or Linux machine"
+HOMEPAGE="https://www.bitrise.io/cli"
+SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc"
+
+RDEPEND=">=dev-util/envman-1.2.0
+>=dev-util/stepman-0.10.0"
+
+S="${WORKDIR}/src/${EGO_ON}/${PN}"
+
+src_unpack() {
+	unpack ${A}
+	mkdir -p "${WORKDIR}/src/${EGO_ON}" || die "Couldn't create project dir in GOPATH"
+	mv "${WORKDIR}/${P}" "${WORKDIR}/src/${EGO_ON}/bitrise" || die "Couldn't move sources to GOPATH"
+}
+
+src_compile() {
+	GOPATH="${WORKDIR}" go build -v -o bin/bitrise || die "Couldn't compile bitrise"
+}
+
+src_test() {
+	export PULL_REQUEST_ID=""
+	export INTEGRATION_TEST_BINARY_PATH="${S}/bin/bitrise"
+	GOPATH="${WORKDIR}" go test -v ./_tests/integration/... || die "Integration tests failed"
+}
+
+src_install() {
+	dobin bin/bitrise
+	dodoc README.md
+	use doc && dodoc -r _docs
+}
--- a/dev-util/bitrise/metadata.xml
+++ b/dev-util/bitrise/metadata.xml
@ -14,6 +14,6 @@
 		<bugs-to>https://github.com/bitrise-io/bitrise/issues</bugs-to>
 		<changelog>https://github.com/bitrise-io/bitrise/blob/master/CHANGELOG.md</changelog>
 		<doc>https://github.com/bitrise-io/bitrise/blob/master/README.md</doc>
-		<remote-id type="github">bitriseio/bitrise</remote-id>
+		<remote-id type="github">bitrise-io/bitrise</remote-id>
 	</upstream>
 </pkgmetadata>
--- a/dev-util/cutter/Manifest
+++ b/dev-util/cutter/Manifest
@ -1,2 +1,3 @@
 DIST cutter-1.0.tar.gz 614826 BLAKE2B 8f75343e57bf986d80dde3dc3ceb59675d28854744d8cc5fac783514e9c200595990d4860ee45db6544537d4f367df5b62a034e298bf273e44302edfa1647c84 SHA512 af6be59be7871d21d4f665e8ecb7f8224d99ccf7d62793e989ccd780ee521641c6ec0d941b46bb82770f5d44e5c0ef2efc29f9be303385e8e757e62a54bf53b1
 DIST cutter-1.4.tar.gz 1067162 BLAKE2B 2f7eceffcfb3c542695e03ec72de1c99451f8278e91f50abc2e87542efbd2cc73d5a52b0e5303b9cea751edf91bc71b63295edd5b32d1b2b9ed3a1443cfc92e7 SHA512 54caec67e57f2ff3908942c1ebd1e909c65204c6f31d0ec95e31f46e03364f309898006b93555ba81287c0d74faf407272226e5ec65b3148ecde8feec11ca3be
+DIST cutter-1.6.tar.gz 1083427 BLAKE2B d51b88f2b9dd2655ef58d7075086959ec3ed59ed4b21db81a792ee165deda523a4e59378c954d0f2aa5b0af25d67329ed2119c004edc402c9b593a3b230a6fd9 SHA512 83aaadfbaccdaa514606408868c050e22d0a80a749b98a9f6df929467a16e69b0d454b25ce1cf53e35ebbfb74e9b39e2bd390057488c9bb3992a442ca306c2f1
--- a/dev-util/cutter/cutter-1.6.ebuild
+++ b/dev-util/cutter/cutter-1.6.ebuild
@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit qmake-utils
+
+DESCRIPTION="A Qt and C++ GUI for radare2 reverse engineering framework"
+HOMEPAGE="https://www.radare.org"
+SRC_URI="https://github.com/radareorg/cutter/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="jupyter webengine"
+REQUIRED_USE="webengine? ( jupyter )"
+
+DEPEND="
+	>=dev-qt/qtcore-5.9.1:5
+	>=dev-qt/qtgui-5.9.1:5
+	>=dev-qt/qtsvg-5.9.1:5
+	>=dev-qt/qtwidgets-5.9.1:5
+	>=dev-util/radare2-2.7.0
+	jupyter? ( dev-python/jupyter )
+	webengine? ( >=dev-qt/qtwebengine-5.9.1:5[widgets] )
+"
+
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-python3-config.patch"
+)
+
+src_configure() {
+	local myqmakeargs=(
+		CUTTER_ENABLE_JUPYTER=$(usex jupyter true false)
+		CUTTER_ENABLE_QTWEBENGINE=$(usex webengine true false)
+		PREFIX=\'${EPREFIX}/usr\'
+	)
+
+	eqmake5 "${myqmakeargs[@]}" src
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+}
--- a/dev-util/cutter/files/cutter-1.6-python3-config.patch
+++ b/dev-util/cutter/files/cutter-1.6-python3-config.patch
@ -0,0 +1,20 @@
+--- a/src/Cutter.pro	2018-04-24 17:43:11.000000000 +0900
+++ b/src/Cutter.pro	2018-07-08 21:21:34.280748499 +0900
+@@ -74,11 +74,13 @@
+         LIBS += -F$$PYTHON_FRAMEWORK_DIR -framework Python
+         DEFINES += MACOS_PYTHON_FRAMEWORK_BUNDLED
+     } else {
+-        CONFIG += link_pkgconfig
+-        !packagesExist(python3) {
+-            error("ERROR: Python 3 could not be found. Make sure it is available to pkg-config.")
+        system(type python3-config) {
+            LIBS += $$system(python3-config --libs)
+            TMP = $$system(python3-config --includes)
+            INCLUDEPATH += $$replace(TMP, "-I", "")
+        } else {
+            error("ERROR: Python 3 could not be found. Make sure it is available to python3-config.")
+         }
+-        PKGCONFIG += python3
+     }
+ }
+
--- a/dev-util/envman/Manifest
+++ b/dev-util/envman/Manifest
@ -0,0 +1 @@
+DIST envman-1.2.0.tar.gz 2997860 BLAKE2B e49d3b421fb1ab226de4430e90d8c684bc3a2554205c6383a140c0832134eaba338797dca44668fc2473d248940b5499395ab3a6d3359382305fd8a719772257 SHA512 5245aea8c280a6d6022e8132216891f09abee707c0ed736bfe6b4882aa23880a771dce5371b8ba5fcdd41fa951606727e7582442d897058b25985cf9dd5a9d18
--- a/dev-util/envman/envman-1.2.0.ebuild
+++ b/dev-util/envman/envman-1.2.0.ebuild
@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit golang-build
+
+EGO_ON="github.com/bitrise-io"
+EGO_PN="${EGO_ON}/${PN}"
+
+DESCRIPTION="Environment variable manager for Bitrise CLI."
+HOMEPAGE="https://www.bitrise.io/cli"
+SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+S="${WORKDIR}/src/${EGO_ON}/${PN}"
+
+src_unpack() {
+	unpack ${A}
+	mkdir -p "${WORKDIR}/src/${EGO_ON}" || die "Couldn't create project dir in GOPATH"
+	mv "${WORKDIR}/${P}" "${WORKDIR}/src/${EGO_ON}/envman" || die "Couldn't move sources to GOPATH"
+}
+
+src_compile() {
+	GOPATH="${WORKDIR}" go build -v -o bin/envman || die "Couldn't compile envman"
+}
+
+src_test() {
+	GOPATH="${WORKDIR}" go test ./... || die "Tests failed"
+}
+
+src_install() {
+	dobin bin/envman
+	dodoc README.md
+}
--- a/dev-util/envman/metadata.xml
+++ b/dev-util/envman/metadata.xml
@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>karol.wrotniak@droidsonroids.pl</email>
+		<name>Karol Wrótniak</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription>Environment variable manager for Bitrise CLI. Part of the Bitrise Continuous Integration, Delivery and Automations Stack, with stepman and bitrise. For a nice &amp; quick intro you should check: https://www.bitrise.io/cli</longdescription>
+	<upstream>
+		<bugs-to>https://github.com/bitrise-io/envman/issues</bugs-to>
+		<changelog>https://github.com/bitrise-io/envman/blob/master/CHANGELOG.md</changelog>
+		<doc>https://github.com/bitrise-io/envman/blob/master/README.md</doc>
+		<remote-id type="github">bitriseio/envman</remote-id>
+	</upstream>
+</pkgmetadata>
--- a/dev-util/stepman/Manifest
+++ b/dev-util/stepman/Manifest
@ -0,0 +1 @@
+DIST stepman-0.10.0.tar.gz 3054342 BLAKE2B 8d1d6fc8b4b85c79d535c6162a8b7c5ba15042b6a8334286cdf7ad5d498ee20abecaa1bb9ce9ffe5406891271e23a2e2554bea0b52bbf08df23a2154fdcb4da8 SHA512 1437d5c997e62a9da3beb666a15ac665e18300fad3668ee3acdae30307027bbf16c0d95f649a9a62c6203f3e09f9ec83525a23b3789f09c3707ff1937a7affbe
--- a/dev-util/stepman/metadata.xml
+++ b/dev-util/stepman/metadata.xml
@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>karol.wrotniak@droidsonroids.pl</email>
+		<name>Karol Wrótniak</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+        <longdescription>Step collection manager for Bitrise CLI. Part of the Bitrise Continuous Integration, Delivery and Automations Stack, with envman and bitrise. For a nice &amp; quick intro you 
+should check: https://www.bitrise.io/cli</longdescription>
+	<upstream>
+		<bugs-to>https://github.com/bitrise-io/stepman/issues</bugs-to>
+		<changelog>https://github.com/bitrise-io/stepman/blob/master/CHANGELOG.md</changelog>
+		<doc>https://github.com/bitrise-io/stepman/blob/master/README.md</doc>
+		<remote-id type="github">bitrise-io/stepman</remote-id>
+	</upstream>
+</pkgmetadata>
--- a/dev-util/stepman/stepman-0.10.0.ebuild
+++ b/dev-util/stepman/stepman-0.10.0.ebuild
@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit golang-build
+
+EGO_ON="github.com/bitrise-io"
+EGO_PN="${EGO_ON}/${PN}"
+
+DESCRIPTION="Step collection manager for Bitrise CLI."
+HOMEPAGE="https://www.bitrise.io/cli"
+SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+S="${WORKDIR}/src/${EGO_ON}/${PN}"
+
+src_unpack() {
+	unpack ${A}
+	mkdir -p "${WORKDIR}/src/${EGO_ON}" || die "Couldn't create project dir in GOPATH"
+	mv "${WORKDIR}/${P}" "${WORKDIR}/src/${EGO_ON}/stepman" || die "Couldn't move sources to GOPATH"
+}
+
+src_compile() {
+	GOPATH="${WORKDIR}" go build -v -o bin/stepman || die "Couldn't compile stepman"
+}
+
+src_test() {
+	export INTEGRATION_TEST_BINARY_PATH="${S}/bin/stepman"
+	GOPATH="${WORKDIR}" go test -v ./_tests/integration/... || die "Integration tests failed"
+}
+
+src_install() {
+	dobin bin/stepman
+	dodoc README.md
+}
--- a/eclass/Manifest.gz
+++ b/eclass/Manifest.gz
--- a/eclass/linux-info.eclass
+++ b/eclass/linux-info.eclass
@ -554,7 +554,7 @@ get_version() {
 	# caught before this if they are.
 	if [[ -z ${OUTPUT_DIR} ]] ; then
 		# Try to locate a kernel that is most relevant for us.
-		for OUTPUT_DIR in "${SYSROOT}" "${ROOT%/}/" "" ; do
+		for OUTPUT_DIR in "${SYSROOT}" "${ROOT%/}" "" ; do
 			OUTPUT_DIR+="/lib/modules/${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}${KV_EXTRA}/build"
 			if [[ -e ${OUTPUT_DIR} ]] ; then
 				break
--- a/games-fps/Manifest.gz
+++ b/games-fps/Manifest.gz
--- a/games-fps/urbanterror-data/urbanterror-data-4.3.4.ebuild
+++ b/games-fps/urbanterror-data/urbanterror-data-4.3.4.ebuild
@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2

 EAPI="6"
-inherit check-reqs eutils
+
+inherit check-reqs

 ENGINE_PV=${PV}

@ -10,7 +11,7 @@ MY_PN=UrbanTerror
 MY_PV=43_full

 DESCRIPTION="Data files for UrbanTerror"
-HOMEPAGE="http://www.urbanterror.info"
+HOMEPAGE="https://www.urbanterror.info"

 # load the base image and save it as .0 file
 # use 43_full-2.zip as upstream fixed something back then
@ -46,7 +47,7 @@ src_prepare() {
 		MY_CTR=0
 		while [[ "${MY_CTR}" -lt "${PV/4.3./}" ]]; do
 			cp -dfpr \
-				"${WORKDIR}"/${MY_PN}-4.3.${MY_CTR}-to-4.3.$(( ${MY_CTR} + 1 ))/* "${S}"
+				"${WORKDIR}"/${MY_PN}-4.3.${MY_CTR}-to-4.3.$(( ${MY_CTR} + 1 ))/* "${S}" || die
 			MY_CTR=$(( ${MY_CTR} + 1 ))
 		done
 	fi
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@ -1,4 +1,4 @@
 DIST harfbuzz-1.7.6.tar.bz2 2586909 BLAKE2B 0ae5902b9fe00a4f05a5dc407d698195920454efff79be10f1d85af5430d8bde7df071ba226b978c860d1dd8778a8259f330ab633a1aaa416a4451888fa9ae6a SHA512 259656574b1ec2916ada951b759a591f45c11c5c639fa29831e06320312bf951f4f5ef6306f9ffc373abf0d40dbf944db918d4c54aca3bd7eab2c3a886db7a68
 DIST harfbuzz-1.8.1.tar.bz2 3804867 BLAKE2B 9687b35bbdb74a42c28764a7b026a46ff90640b84bc40702bdbfadc79bbe3c393de837d4cdbbb8798f28aa8c75687c4f07e1c79e98bf9bd506403d89b4baf6a5 SHA512 7ef27232b294883b0c7404c8412837acfba95f12677f226d764f87e22cd169fe037e7bf13a9309e78c9aa905225fb332b3a143a01b13308b05fcccaeddb0c931
-DIST harfbuzz-1.8.2.tar.bz2 3820498 BLAKE2B 7ed1509a7b54571e14d72fa097d19a56e27b3c0020243e51315ff783910319486e6c1af7cec88060c17ccf5788ff1b09f26ee4dbc879b009c983ede767e00316 SHA512 c88a3e9e55866608647318a1af7c5d848863cd894d635583b8a2d2a7a02eea875b7a5a4f0f38555d80f2e81628743e40710f5e6f9251bf629f1d15ac51103e5a
 DIST harfbuzz-1.8.3.tar.bz2 3828043 BLAKE2B 038a714480f10b05b2b31ba46667ce563598b43d122f64ab4adc6f267b2b99ea23ba92a1ae0df173be13f29da8960d55a5c5fdee25aa9fc4541a109c5e76946d SHA512 d3ec8f31ff51315fb35f6b5c69b3fbf29e1dff710fb11158801990fbeb99be5fce691f3c06df1c295a08bfb6c14021c511993b0d22ca96e76d8212ddfda198b6
+DIST harfbuzz-1.8.4.tar.bz2 3829479 BLAKE2B df4116945a00130b83198044665c4f0f0da497cf7d198a39632bbbe6b95327f8189dc7486262eb4d03b181c0151d89bea41223e092613c2f8fec9566eb6f9434 SHA512 8ec72b065b3f5d227b0af1486ab8019414bbdfaafce2f99d5a8bbf7d37a2709cadb545efcc46c5a5c44ce405966f01d8f3e8607f31907f8ed7ebe10150c9dcaf
--- a/media-libs/harfbuzz/harfbuzz-1.8.4.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-1.8.4.ebuild
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
--- a/media-sound/grip/Manifest
+++ b/media-sound/grip/Manifest
@ -1,6 +1,4 @@
 DIST grip-3.4.3.tar.gz 740870 BLAKE2B d6b703d4ba08bf976a53e70772977a6b0fd5cd231fc16bf6a387497ad6db8e0ba2226ebe05d77135e7ec55911af0d3cd6cb7608da1452083335f9f8f46cbc182 SHA512 e7690cfe375de525f7dde7cc4d64ac9577f702a58bbd2cc1aa318dba58b208a8affe9e8e07078d6a16ba1340b0bd17edce1c8cf750631c8d677a3bd2679bb361
-DIST grip-3.5.2.tar.gz 952153 BLAKE2B e82ccb50636e68ab9862d2004a4dbe59399372b76a835b33350e539a186fed516e7b4961fe930b3beb5168554324a5bebeee5ef03d1cb7731d7f9d7c1fd1feb9 SHA512 25fbc1aadfcbab57ae585afe0a6663d9640a3614c1b655abd238f272116eccf524e4de465784265cd1f12b48c4cdeb9fdd318f989052400a0bfc9855a5420421
-DIST grip-3.6.3.tar.gz 960255 BLAKE2B 9aad33c04e98f60e5f7871e36f2e4bf616a16486482e7363d165ae7d9fc5343a52583e490b9b9757d31b051e6e96165d35931370e2681d727db7abb0854db2d5 SHA512 f94c5dc24a1355a024833992d05a7c05d84367a004607c9d6c7aa6d4bc24dd93b11e0a061689eb521a8abe637472011a1a4c8e968c48ac8447457cffc4d2957d
 DIST grip-3.7.1.tar.gz 961428 BLAKE2B 0c31b549577a1bbde17936e8e243d6fa573c6ac0c6035ea303c983c6ac26a0f7ddef193cea74a4148655f2305db97b3e74476bfe763fcbe77c656e012b4fe07a SHA512 812c6d0715e18da78b8657722697cf7b39b345f2d94c5a3002c6a512ff0482d4e96b58910e0c2fd459ac707a24754c6c491e66eac7692c49ec69bb869079202c
-DIST grip-3.8.0.tar.gz 961876 BLAKE2B 72f2bc01868b25f3722ba32b357c728935fef39f82b1c546c7930dc736c6a6c763b00864f41cd5d334bd5209098e5067b036f2c24731128cb7d75ae26074c6dd SHA512 f7b727e5061711ed213638fc281eb399543a7bf0a89c7ad0ab48cdabdb93a8ce3f898bcee6bd0ddb99a04c1c39985935c173f1d908625045d7bbcef514dc93ba
 DIST grip-3.8.1.tar.gz 960857 BLAKE2B 0d1323961eeb9593fb4644a31369852f8d40582b7ba00af3b2255f443a354cca74f5d60c80b135d09bc514d8302807191e6c8f38bf080d5a6237859ccfc90178 SHA512 9e1ebdf6de523c4b818f2b35f976ea0ceb83f7769e3355a7a5af8ea831c34be21ad0dd2106c3ddb8f61d31fe3f32e745ab806fd6aa125a06beda3d2bf381428e
+DIST grip-3.9.0.tar.gz 968706 BLAKE2B 9d530b1e7c93239d4298a57a784eec38d98fe57e2c964018a04a8646ce5f1f4734b21103f31612bac4cc45c8c03eeca2080ba88d60a2cfe51d161ef61758639b SHA512 748821f59c90d7239bb711a4a7e1df4e9f2b67ff7bd5c635a2c49389efc7836cca6672cdd93e727f8b97c4e2221f895cc7b4110aa0d3419a5fbe56530ca1b1d0
--- a/media-sound/grip/grip-3.5.2.ebuild
+++ b/media-sound/grip/grip-3.5.2.ebuild
@ -1,52 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils flag-o-matic toolchain-funcs libtool
-
-DESCRIPTION="GTK+ based Audio CD Player/Ripper"
-HOMEPAGE="https://sourceforge.net/projects/grip/"
-SRC_URI="mirror://sourceforge/grip/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="vorbis"
-
-# lame and vorbis-tools are no real RDEPENDs. But without them
-# grip cannot convert ripped files to any format. So use them as
-# a sane default.
-RDEPEND="
-	gnome-base/libgnome
-	>=gnome-base/libgnomeui-2.2.0
-	>=media-libs/id3lib-3.8.3
-	media-sound/cdparanoia
-	media-sound/lame
-	net-misc/curl
-	>=x11-libs/gtk+-2.2:2
-	x11-libs/libX11
-	x11-libs/pango
-	x11-libs/vte:0
-	vorbis? ( media-sound/vorbis-tools )
-"
-# gnome-extra/yelp, see bug 416843
-DEPEND="
-	${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-
-	sed '/^Icon/s@grip\b@gripicon@' -i grip.desktop || die
-}
-
-src_configure() {
-	# Bug #69536
-	[[ $(tc-arch) == "x86" ]] && append-flags "-mno-sse"
-
-	strip-linguas be bg ca de en en_CA en_GB en_US es fi fr hu it ja nb nl pl_PL pt_BR ru sr vi zh_CN zh_HK zh_TW
-
-	econf
-}
--- a/media-sound/grip/grip-3.8.0.ebuild
+++ b/media-sound/grip/grip-3.8.0.ebuild
@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils flag-o-matic toolchain-funcs libtool
-
-DESCRIPTION="GTK+ based Audio CD Player/Ripper"
-HOMEPAGE="https://sourceforge.net/projects/grip/"
-SRC_URI="mirror://sourceforge/grip/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="vorbis"
-
-# lame and vorbis-tools are no real RDEPENDs. But without them
-# grip cannot convert ripped files to any format. So use them as
-# a sane default.
-RDEPEND="
-	gnome-base/libgnome
-	>=gnome-base/libgnomeui-2.2.0
-	>=media-libs/id3lib-3.8.3
-	media-sound/cdparanoia
-	media-sound/lame
-	net-misc/curl
-	>=x11-libs/gtk+-2.2:2
-	x11-libs/libX11
-	x11-libs/pango
-	x11-libs/vte:0
-	vorbis? ( media-sound/vorbis-tools )
-"
-# gnome-extra/yelp, see bug 416843
-DEPEND="
-	${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-
-	sed '/^Icon/s@grip\b@gripicon@' -i grip.desktop || die
-}
-
-src_configure() {
-	# Bug #69536
-	[[ $(tc-arch) == "x86" ]] && append-flags "-mno-sse"
-
-	strip-linguas be bg ca de en en_CA en_GB en_US es fi fr hu it ja nb nl pl_PL pt_BR ru sr vi zh_CN zh_HK zh_TW
-
-	econf
-}
--- a/media-sound/grip/grip-3.9.0.ebuild
+++ b/media-sound/grip/grip-3.9.0.ebuild
@ -1,8 +1,8 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

-EAPI=6
-inherit eutils flag-o-matic toolchain-funcs libtool
+EAPI=7
+inherit flag-o-matic toolchain-funcs libtool

 DESCRIPTION="GTK+ based Audio CD Player/Ripper"
 HOMEPAGE="https://sourceforge.net/projects/grip/"
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
--- a/media-video/super_demux/super_demux-0.3.ebuild
+++ b/media-video/super_demux/super_demux-0.3.ebuild
@ -1,11 +1,9 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

-EAPI="2"
+EAPI=7

-inherit eutils toolchain-funcs flag-o-matic
-
-IUSE=""
+inherit flag-o-matic toolchain-funcs

 DESCRIPTION="DVB transport stream TS to ES demultiplexer"
 HOMEPAGE="http://panteltje.com/panteltje/dvd/"
@ -15,13 +13,11 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"

-src_prepare() {
-	epatch "${FILESDIR}/${P}.diff"
-}
+PATCHES=( "${FILESDIR}/${P}.diff" )

 src_compile() {
-	append-flags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE	-D_LARGEFILE64_SOURCE
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "emake failed"
+	append-cflags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
 }

 src_install() {
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@ -1 +1 @@
-Tue, 17 Jul 2018 14:39:06 +0000
+Wed, 18 Jul 2018 08:08:41 +0000
--- a/Show More
+++ b/Show More
				`@ -0,0 +1 @@`
				`DIST envman-1.2.0.tar.gz 2997860 BLAKE2B e49d3b421fb1ab226de4430e90d8c684bc3a2554205c6383a140c0832134eaba338797dca44668fc2473d248940b5499395ab3a6d3359382305fd8a719772257 SHA512 5245aea8c280a6d6022e8132216891f09abee707c0ed736bfe6b4882aa23880a771dce5371b8ba5fcdd41fa951606727e7582442d897058b25985cf9dd5a9d18`
				`@ -0,0 +1 @@`
				`DIST stepman-0.10.0.tar.gz 3054342 BLAKE2B 8d1d6fc8b4b85c79d535c6162a8b7c5ba15042b6a8334286cdf7ad5d498ee20abecaa1bb9ce9ffe5406891271e23a2e2554bea0b52bbf08df23a2154fdcb4da8 SHA512 1437d5c997e62a9da3beb666a15ac665e18300fad3668ee3acdae30307027bbf16c0d95f649a9a62c6203f3e09f9ec83525a23b3789f09c3707ff1937a7affbe`