Sync with portage [Wed Apr 1 14:46:54 MSK 2020].

4 years ago · 271c17f9a3
parent 1b86ebc05a
commit 271c17f9a3
332 changed files with 3935 additions and 695 deletions
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
--- a/app-admin/apache-tools/Manifest
+++ b/app-admin/apache-tools/Manifest
@ -1 +1,2 @@
 DIST httpd-2.4.41.tar.bz2 7072373 BLAKE2B 88a2390736209d5ef04bffcb867bc8d6019302885e6f3cc63d18123336d4d0657252105a3bfebf4e91b8daa02119d4a61f4c0a9702244858a3193ec6cf681c0f SHA512 350cc7dcd2c439e0590338fa6da3f44df44f9bb885c381e91f91b14c2f48597f6f0bbac0ea118a8a67eaa70ae7edbb769beace368643ed73f6daee44c307b335
+DIST httpd-2.4.43.tar.bz2 7155865 BLAKE2B cd85c7e25500f8f1b4bd6ac5f715718a61bf548dfaf36408a970d27bacbfce256e4dda255ba5b62f89e117c335d0568d6207c93e5fb0d2b1ee84dba4ce0d4bd7 SHA512 16cfeecc8f6fab6eca478065a384bdf1872f7ac42206b0bc2bcac6c0d9c576f392c07107201f39e0601dec1bbafcb33d66153544de4d87d79b9a52094d334b64
--- a/app-admin/apache-tools/apache-tools-2.4.43.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.43.ebuild
@ -0,0 +1,105 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit flag-o-matic eutils multilib toolchain-funcs
+
+DESCRIPTION="Useful Apache tools - htdigest, htpasswd, ab, htdbm"
+HOMEPAGE="https://httpd.apache.org/"
+SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
+IUSE="libressl ssl"
+RESTRICT="test"
+
+RDEPEND=">=dev-libs/apr-1.5.0:1=
+	dev-libs/apr-util:1=
+	dev-libs/expat
+	dev-libs/libpcre
+	kernel_linux? ( sys-apps/util-linux )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)"
+
+DEPEND="${RDEPEND}
+	sys-devel/libtool"
+
+S="${WORKDIR}/httpd-${PV}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.4.7-Makefile.patch" #459446
+)
+
+src_prepare() {
+	default
+
+	# This package really should upgrade to using pcre's .pc file.
+	cat <<-\EOF >"${T}"/pcre-config
+	#!/bin/bash
+	flags=()
+	for flag; do
+		if [[ ${flag} == "--version" ]]; then
+			flags+=( --modversion )
+		else
+			flags+=( "${flag}" )
+		fi
+	done
+	exec ${PKG_CONFIG} libpcre "${flags[@]}"
+	EOF
+	chmod a+x "${T}"/pcre-config || die
+}
+
+src_configure() {
+	# Brain dead check.
+	tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
+
+	tc-export PKG_CONFIG
+
+	local myeconfargs=(
+		--libexecdir="${EPREFIX}"/usr/$(get_libdir)/apache2/modules
+		--sbindir="${EPREFIX}"/usr/sbin
+		--with-perl="${EPREFIX}"/usr/bin/perl
+		--with-expat="${EPREFIX}"/usr
+		--with-z="${EPREFIX}"/usr
+		--with-apr="${SYSROOT}${EPREFIX}"/usr
+		--with-apr-util="${SYSROOT}${EPREFIX}"/usr
+		--with-pcre="${T}"/pcre-config
+		$(use_enable ssl)
+		$(usex ssl '--with-ssl="${EPREFIX}"/usr' '')
+	)
+	# econf overwrites the stuff from config.layout.
+	ac_cv_path_PKGCONFIG=${PKG_CONFIG} \
+	econf "${myeconfargs[@]}"
+	sed -i \
+		-e '/^LTFLAGS/s:--silent::' \
+		build/rules.mk build/config_vars.mk || die
+}
+
+src_compile() {
+	emake -C support
+}
+
+src_install() {
+	emake -C support DESTDIR="${D}" install
+	dodoc CHANGES
+	doman docs/man/{dbmmanage,htdigest,htpasswd,htdbm,ab,logresolve}.1 \
+		docs/man/{htcacheclean,rotatelogs}.8
+
+	# Providing compatiblity symlinks for #177697 (which we'll stop to install
+	# at some point).
+	pushd "${ED}"/usr/sbin >/dev/null || die
+	local i
+	for i in *; do
+		dosym ${i} /usr/sbin/${i}2
+	done
+	popd >/dev/null || die
+
+	# Provide a symlink for ab-ssl
+	if use ssl ; then
+		dosym ab /usr/bin/ab-ssl
+		dosym ab /usr/bin/ab2-ssl
+	fi
+}
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
--- a/app-editors/nano/Manifest
+++ b/app-editors/nano/Manifest
@ -1,2 +1,3 @@
 DIST nano-4.6.tar.gz 2970798 BLAKE2B d6dfc702d374d1cbcd61080c8e0082b7931dc8c593c97eb705d878d25487a78dc1ebcb8004f742f5ecc3af1b5a31abcf6577e87aba96fb95d16029ff55e7af58 SHA512 76fb43495ca1f88ee8864eee5d023b6cd86bc35fba00151b4c6af53ae06e6b3828379e7d52a16c7df0956e9e04602a86ff8e8a7c1997320507ca041195bf004b
+DIST nano-4.9.1.tar.gz 2995183 BLAKE2B a5e455d94e683bd3ae00c37bd4395465ded281e1cbf434a0035b2d816b53b6d24f3fc966c44c8da643122dc2920f8ddefb0d37574baafe947dd107e1ede7034d SHA512 155622092ee5a99dab30a6acd5cf35ecf087476aa48eabcdf7e1259af098483f84eef7569380fe7c47d4d69f63e61af10a3cc5c29c45f1242c17366c0f15835b
 DIST nano-4.9.tar.gz 3000427 BLAKE2B 37ed08fa6b902951687ef26a527e1a0da3199946c73bed5d9fd0464a76af643b55a0900e7c1a1237af31867a7231f1b383dad423e780408560fa8246b18e30a4 SHA512 abce064a5cb55f730e41a7a8fbd8b2f9626fc6834b30cd05d62fe73b7f284d8cd80f44c6b84bb5370b980f00d3a71cf8c33408628229c2ee3b8a1670fa5e953c
--- a/app-editors/nano/nano-4.9.1.ebuild
+++ b/app-editors/nano/nano-4.9.1.ebuild
@ -0,0 +1,80 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://git.sv.gnu.org/nano.git"
+	inherit git-r3 autotools
+else
+	MY_P="${PN}-${PV/_}"
+	SRC_URI="https://www.nano-editor.org/dist/v${PV:0:1}/${MY_P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="GNU GPL'd Pico clone with more functionality"
+HOMEPAGE="https://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Basics_Guide"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="debug justify +magic minimal ncurses nls slang +spell +split-usr static unicode"
+
+LIB_DEPEND=">=sys-libs/ncurses-5.9-r1:0=[unicode?]
+	sys-libs/ncurses:0=[static-libs(+)]
+	magic? ( sys-apps/file[static-libs(+)] )
+	nls? ( virtual/libintl )
+	!ncurses? ( slang? ( sys-libs/slang[static-libs(+)] ) )"
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
+DEPEND="${RDEPEND}
+	static? ( ${LIB_DEPEND} )"
+BDEPEND="
+	nls? ( sys-devel/gettext )
+	virtual/pkgconfig
+"
+src_prepare() {
+	default
+	if [[ ${PV} == "9999" ]] ; then
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	use static && append-ldflags -static
+	local myconf=(
+		--bindir="${EPREFIX}"/bin
+		--htmldir=/trash
+		$(use_enable !minimal color)
+		$(use_enable !minimal multibuffer)
+		$(use_enable !minimal nanorc)
+		$(use_enable magic libmagic)
+		$(use_enable spell speller)
+		$(use_enable justify)
+		$(use_enable debug)
+		$(use_enable nls)
+		$(use_enable unicode utf8)
+		$(use_enable minimal tiny)
+		$(usex ncurses --without-slang $(use_with slang))
+	)
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	# don't use "${ED}" here or things break (#654534)
+	rm -r "${D}"/trash || die
+
+	dodoc doc/sample.nanorc
+	docinto html
+	dodoc doc/faq.html
+	insinto /etc
+	newins doc/sample.nanorc nanorc
+	if ! use minimal ; then
+		# Enable colorization by default.
+		sed -i \
+			-e '/^# include /s:# *::' \
+			"${ED}"/etc/nanorc || die
+	fi
+
+	use split-usr && dosym ../../bin/nano /usr/bin/nano
+}
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
--- a/app-misc/datovka/Manifest
+++ b/app-misc/datovka/Manifest
@ -1,3 +1 @@
-DIST datovka-4.11.1.tar.xz 2583660 BLAKE2B 2d62e79c5be9d20e79d19bba43ce3d7fa8dd0b80e8bee6e63d04e63f6c878b84185b869fed1fc601f97350b499aa60041585693081e78bad5e0bc7e272aabcea SHA512 b36211b8830beb1f3a01b399303a1f2f87c77418975b007dac4b55613bdf54205eda0e7bac44d6c68e1102842eaa4231baaa46c31b99d5b6b145597f6a1366f9
-DIST datovka-4.13.1.tar.xz 2749936 BLAKE2B 7f713837e40ea9de170d5a009179ef89eafc4191d7fbdedf547c6d3ba3fbd273c279e381876f48f457e5b9abf01fa4830adb0eaa2077768ce43f5718e00f125b SHA512 94623c0befe9096396083162a1fb26ac53510a47e5305c4bdea65bc65e3af096847508ba2028d0089f39a0812700506818759e2e22c354fecf96a117745aefce
-DIST datovka-4.14.1.tar.xz 2798160 BLAKE2B 03f205840c81c12229d470c90c256d686728cc9c91feeb818af4c2ca914964b480003d9217302566eb902d4163b7035341ffbf0d1c7b3f524b7ae14eb45ab015 SHA512 0581680aef0165adc9c94a0b1270d3f4991a5ca3418996d9d8014541d5140aecb7f50d55cc057caafc28873713689d6c361a769dada86f48390f33ae093b46ea
+DIST datovka-4.15.0.tar.xz 2816380 BLAKE2B 4e7d74bfc95286f9b6af3e84cd1439ca22b9aa83735cdde76827d49957bc210105ef82d6c1cb2c6ab861cd38ef852d043bf1fc30c22264aedb22f598c6c78ab0 SHA512 c379c61e091b92db0a061bff943f0f95e8627b2806641e001de090fafe8407b9a1167697b0b009217c0999c4ec2f61cb2bf3d3a8f5b234ed823ec6b88b6232fb
--- a/app-misc/datovka/datovka-4.11.1.ebuild
+++ b/app-misc/datovka/datovka-4.11.1.ebuild
@ -1,54 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils qmake-utils
-
-DESCRIPTION="GUI to access the Czech data box e-government system"
-HOMEPAGE="https://www.datovka.cz/"
-SRC_URI="https://secure.nic.cz/files/datove_schranky/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# minimum Qt version required
-QT_PV="5.3.2:5"
-
-RDEPEND="
-	>=dev-libs/openssl-1.0.2:0=
-	>=dev-qt/qtcore-${QT_PV}
-	>=dev-qt/qtgui-${QT_PV}
-	>=dev-qt/qtnetwork-${QT_PV}
-	>=dev-qt/qtprintsupport-${QT_PV}
-	>=dev-qt/qtsql-${QT_PV}[sqlite]
-	>=dev-qt/qtsvg-${QT_PV}
-	>=dev-qt/qtwidgets-${QT_PV}
-	>=net-libs/libisds-0.10.8
-"
-DEPEND="
-	${RDEPEND}
-	>=dev-qt/linguist-tools-${QT_PV}
-"
-
-DOCS=( ChangeLog README )
-
-src_configure() {
-	lrelease datovka.pro || die
-	eqmake5 PREFIX="/usr" DISABLE_VERSION_NOTIFICATION=1 TEXT_FILES_INST_DIR="/usr/share/${PN}/"
-}
-
-src_install() {
-	emake install INSTALL_ROOT="${D}"
-	einstalldocs
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
--- a/app-misc/datovka/datovka-4.13.1.ebuild
+++ b/app-misc/datovka/datovka-4.13.1.ebuild
@ -1,55 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit qmake-utils xdg-utils
-
-DESCRIPTION="GUI to access the Czech data box e-government system"
-HOMEPAGE="https://www.datovka.cz/"
-SRC_URI="https://secure.nic.cz/files/datove_schranky/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# minimum Qt version required
-QT_PV="5.3.2:5"
-
-RDEPEND="
-	>=dev-libs/openssl-1.0.2:0=
-	>=dev-qt/qtcore-${QT_PV}
-	>=dev-qt/qtgui-${QT_PV}
-	>=dev-qt/qtnetwork-${QT_PV}
-	>=dev-qt/qtprintsupport-${QT_PV}
-	>=dev-qt/qtsql-${QT_PV}[sqlite]
-	>=dev-qt/qtsvg-${QT_PV}
-	>=dev-qt/qtwidgets-${QT_PV}
-	>=net-libs/libisds-0.10.8
-"
-DEPEND="
-	${RDEPEND}
-	>=dev-qt/linguist-tools-${QT_PV}
-	virtual/pkgconfig
-"
-
-DOCS=( ChangeLog README )
-
-src_configure() {
-	lrelease datovka.pro || die
-	eqmake5 PREFIX="/usr" DISABLE_VERSION_NOTIFICATION=1 TEXT_FILES_INST_DIR="/usr/share/${PN}/"
-}
-
-src_install() {
-	emake install INSTALL_ROOT="${D}"
-	einstalldocs
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
--- a/app-misc/datovka/datovka-4.15.0.ebuild
+++ b/app-misc/datovka/datovka-4.15.0.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7
@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""

 # minimum Qt version required
-QT_PV="5.3.2:5"
+QT_PV="5.14.0:5"

 RDEPEND="
 	>=dev-libs/openssl-1.0.2:0=
@ -33,7 +33,7 @@ DEPEND="
 	>=dev-qt/linguist-tools-${QT_PV}
 	virtual/pkgconfig
 "
-
+PATCHES=( "${FILESDIR}/${P}-appdata-to-metainfo.patch" )
 DOCS=( ChangeLog README )

 src_configure() {
--- a/app-misc/datovka/files/datovka-4.15.0-appdata-to-metainfo.patch
+++ b/app-misc/datovka/files/datovka-4.15.0-appdata-to-metainfo.patch
@ -0,0 +1,11 @@
+--- a/datovka.pro	2020-04-01 09:22:29.110403965 +0200
+++ b/datovka.pro	2020-04-01 09:24:11.984441796 +0200
+@@ -72,7 +72,7 @@
+ 	desktop.path = "$${DATADIR}/applications"
+ 	desktop.files += deployment/datovka.desktop
+ 
+-	appdata.path = "$${DATADIR}/appdata"
+	appdata.path = "$${DATADIR}/metainfo"
+ 	appdata.files += deployment/datovka.appdata.xml
+ 
+ 	icon16.path = "$${DATADIR}/icons/hicolor/16x16/apps"
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
--- a/dev-cpp/tbb/Manifest
+++ b/dev-cpp/tbb/Manifest
@ -1,4 +1,5 @@
 DIST tbb-2018.20180312.tar.gz 2911740 BLAKE2B 5c6dab4a892f3b61ed0b02ea36dc41bebd5b33a22bcc3d5f2960f21e134f2eb9bccf1466193a573489e12638c0bb0bccc2da83f699968ffd62417f2d0f093289 SHA512 7ac74e714122e25f7704630d3d52992dbea54d1e761b5e487251a771f401aa864f78b8ddf11d78f38758088df387abb6987f6a2db562c86cbb28ba8f33a25680
 DIST tbb-2019.8.tar.gz 2580540 BLAKE2B 1cddb0c8ade6f6363811b7f9b323a2bb7739a18114acd56e1b4a13f33904ddff8cb6aec9b4b0add995cd307ff7815f0b55ce33fa64b7dd92c0062fbaa13d0833 SHA512 924a8dde011452a2c46c5152942a9835e76fe5610e08b69eb0e985de3fb46bdb49f0f628d10fa7704428f6e61ec63f7002da5399d47da6ee6004fa236d346dc8
 DIST tbb-2020.1.tar.gz 2639115 BLAKE2B 058438351738eeab01c230ec10ff0a1dde77e5cc4fd77f292c31ee0320f41d079c8f90fc06f4640ffa375d5f0c0b5fbed13ac5a64a9cb9f1737cb66bc80442ea SHA512 79810c27c84bd3b3432bef471fa1c782f1f162a0d1038e88c03a77499cc7aeaa10d57317729fd23472e2d0f358395955f7570e8c679685a552a833eb45cf5f1d
+DIST tbb-2020.2.tar.gz 2637172 BLAKE2B 6b6e65732d3971f7374058513004ca3cfc3855b83c0a2dde59d50e08c26ff220470e31db86f4ab9f009c7e02e454a00a348730e63c829aa8d217320f7879cfc9 SHA512 6d7412fa6ce12d27736af3c8942c5ab5ea6945dd3ca93f309535c0dba3ff757d6507a5ffc3bcd73e6fdcda043cdedfa657631b25ae86fbf221d0f1d66a85b48f
 DIST tbb2017_20161128oss_src.tgz 2965854 BLAKE2B 8c5aed6d8477297922767803617346feebb712d1f4b2df6d71a86f039b5563afc666454985e68a528a812aaad40b5fd0562bb91d357c45156fec46e5389ec542 SHA512 3c48ce196d2d3557e86cea7ede9dea456bbaeb29dbed34210f99c6f380406403a6056ccfa3d5befe6b29c4f8a9ee58ca6da545249cf4ec4ec85b463e04e4518c
--- a/dev-cpp/tbb/tbb-2020.2.ebuild
+++ b/dev-cpp/tbb/tbb-2020.2.ebuild
@ -0,0 +1,151 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils flag-o-matic multilib-minimal multilib toolchain-funcs
+
+PV1="$(ver_cut 1)"
+PV2="$(ver_cut 2)"
+MY_PV="${PV1}_U${PV2}"
+
+DESCRIPTION="High level abstract threading library"
+HOMEPAGE="https://www.threadingbuildingblocks.org"
+SRC_URI="https://github.com/intel/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug examples"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+S="${WORKDIR}/oneTBB-${MY_PV}"
+
+DOCS=( CHANGES README README.md doc/Release_Notes.txt )
+
+PATCHES=( "${FILESDIR}"/${PN}-2020.1-makefile-debug.patch )
+
+src_prepare() {
+	default
+
+	find include -name \*.html -delete || die
+
+	# Give it a soname on FreeBSD
+	echo 'LIB_LINK_FLAGS += -Wl,-soname=$(BUILDING_LIBRARY)' >>	build/FreeBSD.gcc.inc
+	# Set proper versionning on FreeBSD
+	sed -i -e '/.DLL =/s/$/.1/' build/FreeBSD.inc || die
+
+	use debug || sed -i -e '/_debug/d' Makefile
+}
+
+multilib_src_configure() {
+	# pc files are for debian and fedora compatibility
+	# some deps use them
+	cat <<-EOF > ${PN}.pc.template
+		prefix=${EPREFIX}/usr
+		libdir=\${prefix}/$(get_libdir)
+		includedir=\${prefix}/include
+		Name: ${PN}
+		Description: ${DESCRIPTION}
+		Version: ${PV}
+		URL: ${HOMEPAGE}
+		Cflags: -I\${includedir}
+	EOF
+	cp ${PN}.pc.template ${PN}.pc || die
+	cat <<-EOF >> ${PN}.pc
+		Libs: -L\${libdir} -ltbb
+		Libs.private: -lm -lrt
+	EOF
+	cp ${PN}.pc.template ${PN}malloc.pc || die
+	cat <<-EOF >> ${PN}malloc.pc
+		Libs: -L\${libdir} -ltbbmalloc
+		Libs.private: -lm -lrt
+	EOF
+	cp ${PN}.pc.template ${PN}malloc_proxy.pc || die
+	cat <<-EOF >> ${PN}malloc_proxy.pc
+		Libs: -L\${libdir} -ltbbmalloc_proxy
+		Libs.private: -lrt
+		Requires: tbbmalloc
+	EOF
+}
+
+local_src_compile() {
+	cd "${S}"
+
+	local comp arch
+	local bt buildtypes
+
+	case ${MULTILIB_ABI_FLAG} in
+		abi_x86_64) arch=x86_64 ;;
+		abi_x86_32) arch=ia32 ;;
+#		abi_ppc_64) arch=ppc64 ;;
+#		abi_ppc_32) arch=ppc32 ;;
+	esac
+
+	case "$(tc-getCXX)" in
+		*clang*) comp="clang" ;;
+		*g++*) comp="gcc" ;;
+		*ic*c) comp="icc" ;;
+		*) die "compiler $(tc-getCXX) not supported by build system" ;;
+	esac
+
+	if use debug ; then
+		buildtypes="release debug"
+	else
+		buildtypes="release"
+	fi
+
+	for bt in ${buildtypes}; do
+		CXX="$(tc-getCXX)" \
+		CC="$(tc-getCC)" \
+		AS="$(tc-getAS)" \
+		arch=${arch} \
+		CPLUS_FLAGS="${CXXFLAGS}" \
+		emake compiler=${comp} work_dir="${BUILD_DIR}" tbb_root="${S}" cfg=${bt} $@
+	done
+}
+
+multilib_src_compile() {
+	local_src_compile tbb tbbmalloc
+}
+
+multilib_src_test() {
+	local_src_compile test
+}
+
+multilib_src_install() {
+	local bt
+	local buildtypes
+	if use debug ; then
+		buildtypes="release debug"
+	else
+		buildtypes="release"
+	fi
+	for bt in ${buildtypes}; do
+		cd "${BUILD_DIR}_${bt}" || die
+		local l
+		for l in $(find . -name lib\*$(get_libname \*)); do
+			dolib.so ${l}
+			local bl=$(basename ${l})
+			dosym ${bl} /usr/$(get_libdir)/${bl%%.*}$(get_libname)
+		done
+	done
+
+	cd "${BUILD_DIR}" || die
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins *.pc
+}
+
+multilib_src_install_all() {
+	doheader -r include/*
+
+	einstalldocs
+
+	if use examples ; then
+		insinto /usr/share/doc/${PF}/examples/build
+		doins build/*.inc
+		insinto /usr/share/doc/${PF}/examples
+		doins -r examples
+		docompress -x "/usr/share/doc/${PF}/examples"
+	fi
+}
--- a/dev-embedded/Manifest.gz
+++ b/dev-embedded/Manifest.gz
--- a/dev-embedded/dc-tool-ip/metadata.xml
+++ b/dev-embedded/dc-tool-ip/metadata.xml
@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>sh@gentoo.org</email>
-	</maintainer>
 	<maintainer type="project">
 		<email>embedded@gentoo.org</email>
 		<name>Embedded Gentoo</name>
--- a/dev-erlang/Manifest.gz
+++ b/dev-erlang/Manifest.gz
--- a/dev-erlang/cache_tab/Manifest
+++ b/dev-erlang/cache_tab/Manifest
@ -1,2 +1,3 @@
 DIST cache_tab-1.0.20.tar.gz 22903 BLAKE2B a083812091fccf085170db96a542e30caf924c09e6d55a35882e956b8660e2bdad9b9f428953cbb21e12c2dacb965713e9f2dd1f2772924cfdb190a436b55455 SHA512 5f2945c68b77dbce77c1e96c26e5d0d91e9d43df0228b4b49cd00335e272c81cc134ce465027cb14e9da6d92708c628dd841e676df0e7104f968506b3209266a
+DIST cache_tab-1.0.22.tar.gz 23158 BLAKE2B 38b6e357cdbe54abd1534a1b05610d60cb1f923db7eefca119ee2d7fb5fba25dcbf6d9506c8804fd5de55215520fc296af011999a86b125b88d53b756339480d SHA512 10ddbc5319ed4b826c3527e22f47e261edd910a984d7fb386a039621f3aac7121398095e7dd0c4acde0cfc922e6b7a469bb4981742598853169b6e447ee7f659
 DIST cache_tab-1.0.7.tar.gz 12827 BLAKE2B 57d669e67a980550fb4d671b22e69ff2ebd0482aef9d6163ff831390135c7ee1e83e87ed50fdb8e331402398a7cae2b081ac2861125c92cff6e9570c564b2c40 SHA512 9727a0103f47d63e5a07d630ebf45b86d1f1ca7ab5006f127a749fb633a8a6b73b00ed5ddde6f420073a96542d0e073a420020947775bdadef5257675137787b
--- a/dev-erlang/cache_tab/cache_tab-1.0.22.ebuild
+++ b/dev-erlang/cache_tab/cache_tab-1.0.22.ebuild
@ -0,0 +1,21 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit rebar
+
+DESCRIPTION="In-memory cache Erlang and Elixir library"
+HOMEPAGE="https://github.com/processone/cache_tab"
+SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+
+DEPEND=">=dev-lang/erlang-17.1
+	>=dev-erlang/p1_utils-1.0.18"
+RDEPEND="${DEPEND}"
+
+DOCS=( CHANGELOG.md README.md )
--- a/dev-erlang/eimp/Manifest
+++ b/dev-erlang/eimp/Manifest
@ -1,2 +1,3 @@
 DIST eimp-1.0.12.tar.gz 3476420 BLAKE2B 147b910aa65fd28a73799353df6ff653dc815c5fc4ad878e8611748d79bd19fbf453bb24604ecde8669d24bcba2ac843a0d127e26086f4c9cf889104d176372f SHA512 512570da35e398094bbe7c3eb68b769b6510dd8a52897f23a425600782463c3dd7d2fdca67bb97de1cb86d29cf3c50076e56fadd10a79bb466d56c7672f98795
+DIST eimp-1.0.14.tar.gz 3476416 BLAKE2B a2aa13cf128133cfb504b2879e02ab8b60ea617deaf12eca4bb7aa65063ecb092bc6284dd92084477aedbd7ca274c2a1ce92f0a7271cb1237fa1cd29ef8a19cc SHA512 4f5f8c8c54dfcb6df0cfbdd2ab67c940c701c0dfea11c5cf4c689458d514897ab32733e6d3f606e5f8aa111983dd6a6db950ed0b36c0607e712a27606d8f9ce4
 DIST eimp-1.0.9.tar.gz 3471343 BLAKE2B 672e14cda50917a431d5bb29ef127c6bdf026234a5aeb66777540cd59167b48cfa1f264fdd631ef09c33a5ec9817d6d13c9763eecc5b076431976700f3af0ea7 SHA512 a86bf4927cf1da8004f140861a86d358c953a4871af34aa4768877f2b0618918c5a95d557e8535ce1615e272bfc3c9f27275ad4e5f5365c91a4a381ac2463977
--- a/dev-erlang/eimp/eimp-1.0.14.ebuild
+++ b/dev-erlang/eimp/eimp-1.0.14.ebuild
@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit rebar
+
+DESCRIPTION="Erlang Image Manipulation Process"
+HOMEPAGE="https://github.com/processone/eimp"
+SRC_URI="https://github.com/processone/eimp/archive/${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=dev-lang/erlang-17.1
+	>=dev-erlang/p1_utils-1.0.18
+	media-libs/gd[png,jpeg,webp]"
+DEPEND="${RDEPEND}"
+
+DOCS=( CHANGELOG.md README.md )
+
+src_test() {
+	mkdir -p .eunit/priv/bin || die
+	cp priv/bin/eimp .eunit/priv/bin/ || die
+	rebar_src_test
+}
--- a/dev-erlang/epam/Manifest
+++ b/dev-erlang/epam/Manifest
@ -1,2 +1,3 @@
 DIST epam-1.0.2.tar.gz 43720 BLAKE2B 39a1056d068bdceb7ff640a498b0766aa59649228b03e03f9385bfc106f45aa210315162d4386907a1e9cbc8f177289adebf72f527a4eaf270cd62413f1daa13 SHA512 a3fdb379d8c25e56e51dcf1e683d289e9f3d19a537b1a55ca4c09185eb5731fe073a5bf0dd1449f09f8ee5b7d868b0e63f04473c1f3d1b97722dcd9832e4e030
 DIST epam-1.0.6.tar.gz 47494 BLAKE2B 8120e4f10222468ee2adf2f0ec9cffcaaea8c1fc92faf9889de0f970562631cb54cd9ba34d01994dcf657108c4232158d5617e4b9c884bc84e5eb383028b8e3f SHA512 2c316a46ac734be2c74a86e767b413fa8ff1b296622b85de4828fdd60c84e5b3962f8b76004fcb39ab43a345ec967e3f3db4ac6d0e7335dc982dbcf1edf02c4b
+DIST epam-1.0.7.tar.gz 47506 BLAKE2B 8ac8026623a653c4d0f897fb08044003c2426ca1309b1e57cbdb6f6ece4662fd15143293e1dae1f806cbc3d6cf028712701e2587750de15f44304ed7e28c17bd SHA512 ddfcb6a0ef955e6ef0fba2c98e25fbc8532c829b80c4150d0545bb9b5114773184af0adba49921cf6e2363a0224dedccd7bf81b5da292dda74f8966a8e73e1b2
--- a/dev-erlang/epam/epam-1.0.7.ebuild
+++ b/dev-erlang/epam/epam-1.0.7.ebuild
@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit rebar user
+
+DESCRIPTION="epam for ejabberd to help with PAM authentication support"
+HOMEPAGE="https://github.com/processone/epam"
+SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+DEPEND=">=dev-lang/erlang-17.1
+	sys-libs/pam"
+RDEPEND="${DEPEND}"
+
+DOCS=( CHANGELOG.md README.md )
+
+pkg_setup() {
+	enewgroup "${PN}"
+}
+
+src_install() {
+	rebar_src_install
+
+	local epam_path="$(get_erl_libs)/${P}/priv/bin/epam"
+	fowners root:"${PN}" "${epam_path}"
+	fperms 4750 "${epam_path}"
+}
--- a/dev-erlang/esip/Manifest
+++ b/dev-erlang/esip/Manifest
@ -1,3 +1,4 @@
 DIST esip-1.0.11.tar.gz 84816 BLAKE2B 8cf1f872496097965d40e6bb1e776318056735e12cf48e746a88861602c32edccdab902fb989305e804054a220aad26ae3931cc22d9d1b2282d6aeac0795df64 SHA512 b62f99b9a9e160e2303a28dab3133c15ce25eae067e3dc16d64c9d60640fd7d5b1b7f69742fc2b94bd6993402ef618454e771ef76dea1ccf24c9ee708f59771f
 DIST esip-1.0.26.tar.gz 85846 BLAKE2B 03d3ba5d9706794eaec99cfd074c8fda548fc0911ae8cdb11cb991c910955c47a69280b5cabb384cfbc48a580cc862ac54e3c795e641e417019313ebecb9795f SHA512 4bdbd94c1e6cd029603bbc4b5166f2793293ac0041c79a4c3672387f5217a998ab950cba0a6cbef70c2c5eca393b3f3a4917ec87ab4e5edc08b85cb46e7c667f
 DIST esip-1.0.30.tar.gz 89481 BLAKE2B e742b3800b2b729ea334e95dbeefae220c265f343eef095f25501fe000c7fbab3add33771a4a1fcb52a67dbfed8446580aed2d9e09c7de298ec8cd443312d709 SHA512 b8f727adfc3adf1dae175037783290d0bb951343dbe13245dfcd7ee90d408e90d7404f3625a3c300f24c246fc9dde6cdf736089b35f3091e5c549e6db8fd61ac
+DIST esip-1.0.32.tar.gz 89526 BLAKE2B 6a9752b3d82c9c7b36f3319fdb7868c3d796ce6290a8331be19fe8c356294e1afa2691f3f8cea3c0fd54b7400b2e0a75b2c0923f294ab503eb364b202f836ef8 SHA512 92ca51b1179bba0bb79c311553840f4a7ef07dba335122a3b6ac2e89e6a88d387be83c97a43908c4fa0e33d10ecc1e229428e3b7041f6fbd573b3b341d3c8921
--- a/dev-erlang/esip/esip-1.0.32.ebuild
+++ b/dev-erlang/esip/esip-1.0.32.ebuild
@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit rebar
+
+DESCRIPTION="ProcessOne SIP server component"
+HOMEPAGE="https://github.com/processone/esip"
+SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+
+DEPEND=">=dev-lang/erlang-17.1
+	>=dev-erlang/fast_tls-1.1.4
+	>=dev-erlang/stun-1.0.31
+	>=dev-erlang/p1_utils-1.0.18"
+RDEPEND="${DEPEND}"
+
+DOCS=( CHANGELOG.md README.md )
+
+src_prepare() {
+	rebar_src_prepare
+	rebar_fix_include_path stun
+
+	# ebin contains lonely .gitignore file asking for removal.
+	rm -r "${S}/ebin" || die
+}
--- a/dev-erlang/ezlib/Manifest
+++ b/dev-erlang/ezlib/Manifest
@ -1,2 +1,3 @@
 DIST ezlib-1.0.2.tar.gz 45369 BLAKE2B d2d23cf9fcd530a76ed4a386df15401cd9598e158f20cba3eff19332e25532fdaba8cae93e576f5756559e74f169f6a01f9d09c41e844d3af4a9d9d3cac15185 SHA512 90671fdf0bbc23a7f54da665dfb31a3ed2d92180ff5c58d872001481584e6c8b39cd84b3dc947f1efdae10792c2547218017381cbc7056070d22b140e941c9bb
 DIST ezlib-1.0.6.tar.gz 49136 BLAKE2B 596e3580a20d7b8174ded16656fd5f15b8558ffe16a1278e76a25dcff935c258b2df37fb5be0c4e78de566823c41c58941fffa95cdae8b02a21bf6ea5d6f5417 SHA512 6f2a459f773eeba9a7d1316a5c38c686b54c5c68bb3d90e38ac4698fb1140c2d1b961e981af5013711fbfd854f3b3f206a828b6eda9071fd437ccdf4871d8e39
+DIST ezlib-1.0.7.tar.gz 49143 BLAKE2B 51a1bd0972024dd6dc905266c375d7097fd3f9e45d00ca23d16f11d335b3511b29202db2c6a64e4d0727bd0c447205be857bc9291ea5e771e0fe081829bfc25b SHA512 25fdc429c8d1216756b9c048058c711176a3292670dcd9ee156038362b49b7d5f4be325a3f67da5f24e462f188429d2247e42eca12da806748298a9966494382
--- a/dev-erlang/ezlib/ezlib-1.0.7.ebuild
+++ b/dev-erlang/ezlib/ezlib-1.0.7.ebuild
@ -0,0 +1,21 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit rebar
+
+DESCRIPTION="Native zlib driver for Erlang and Elixir"
+HOMEPAGE="https://github.com/processone/ezlib"
+SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+
+DEPEND=">=dev-lang/erlang-17.1:=
+	sys-libs/zlib"
+RDEPEND="${DEPEND}"
+
+DOCS=( CHANGELOG.md README.md )
--- a/dev-erlang/fast_tls/Manifest
+++ b/dev-erlang/fast_tls/Manifest
@ -1,2 +1,3 @@
 DIST fast_tls-1.0.26.tar.gz 76348 BLAKE2B 3016d26724119a2b0b6e4ce9691ceeca7009ee758465f7d7203cab526c9cf588cefd859cb452d7f28877a2d3cf4eef26f9941bccb7aee4794006d9c0f4e8561e SHA512 3be4ed4a346c2d20f7a9d080a12e98fcf180c2f25df7a505a798ca8581aee74c4dc2f92b74c1a6866d6b13e65940cf0adfaff3cceccb0fe9fb3f375a3ebcfcd8
 DIST fast_tls-1.1.2.tar.gz 80657 BLAKE2B 44df81fca2e2a3dac8b4c9dac2506d313aea7d1a75a05b1cc1bd42e237c6ed951306e2acf7169538e3d0e68463fa8142f4d57776a8c86abdbd17f6973600f79e SHA512 79027ba6d80cb6b2bc0d6cd92d3889fa13e7ee746db20582517fc0ce36173b112805a94568a89d718166dfa4b41cd49bf8a6bc505979d4b25a389e87fdc3e4cb
+DIST fast_tls-1.1.4.tar.gz 80739 BLAKE2B dcfdf3f894d3d72d587a861a65f7c2c4ab2ec0f72accf274c385a5dab0622d4ab32e9acfee8ce29b9d2082112d496e93a770014e220dc974aadfe0344ab5ef6a SHA512 9bef899ce35d1022c3aaf894dea6e6b53a78fa266d58b07a77a01ad8f3658a5c3d8d2eea5284c4bbcce7726bf46760cec857eea2d11f7cdb4f08741d4dd1295c
--- a/dev-erlang/fast_tls/fast_tls-1.1.4.ebuild
+++ b/dev-erlang/fast_tls/fast_tls-1.1.4.ebuild
@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit rebar
+
+DESCRIPTION="TLS/SSL native driver for Erlang and Elixir"
+HOMEPAGE="https://github.com/processone/fast_tls"
+SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+IUSE="libressl"
+
+DEPEND=">=dev-erlang/p1_utils-1.0.18
+	>=dev-lang/erlang-17.1:=
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )"
+RDEPEND="${DEPEND}"
+
+DOCS=( CHANGELOG.md README.md )
--- a/dev-erlang/fast_xml/Manifest
+++ b/dev-erlang/fast_xml/Manifest
@ -1,3 +1,4 @@
 DIST fast_xml-1.1.22.tar.gz 92408 BLAKE2B efd6c69c4dcfe3c36162c0b47ee8b56561102fde130f8be503c767e40d66c0f698876ed384bd27aea41e18f6530bf712eeeca2ea497c4b1aafc630fe1b016981 SHA512 33c79cf34d6b0093cf98d11c5b68855d4201a6891786cc3caabd7dded81a04118638ce091cda1f1c86729ea8c8765214332cc34a361bbfb3c5958dbc2027a384
 DIST fast_xml-1.1.34.tar.gz 93530 BLAKE2B f4db5fd718f66e34b305d04ca7be5a72770ca9c749154c668072c6ef88eb545f3ff200d549fba6395eed46605ce384559dadda66b4281429b57706c579f4c47a SHA512 e2b29e1307c0513046de2ac8afe6c1a6ed8a8640b62451777233607a656517ac1b4d68f725b05712d3c254f68e76e49716b1e913c3d3c34222fe2a5a62fa378a
 DIST fast_xml-1.1.37.tar.gz 99004 BLAKE2B 946a7f4fd87aa65350bcb62e68ca571908a2299beb4823eb90cc9d4bc254dc1f9bac3bb1eb7c73b0419224e0ea56c3b56638537bae79264afc794d52429e3f2f SHA512 dc71f8687819d7d5200ccb0182b1b1076789e5810806a4ca6bee4273c68b68650ce1aa1ec08dbfea0a61aca7e9c48f25b2ec69d41d13384aeb22ed444572e67a
+DIST fast_xml-1.1.39.tar.gz 99045 BLAKE2B ccc620b125b77143ae54cbd591aeb808072b4b90b2d736837b53907997485926a98a0a7a2d3726b63755e6004a82c518e1592148b681b2a727e6d4c2efd6bca7 SHA512 f32d20854f3647c5bfcd3fa819a8a03b744c00911a96b025c2a859bf963ae741f86fb0525fcec2b6d3c829ff431965f7bfe2dfd0e35927993e6e92db6b89647c
--- a/dev-erlang/fast_xml/fast_xml-1.1.39.ebuild
+++ b/dev-erlang/fast_xml/fast_xml-1.1.39.ebuild
@ -0,0 +1,22 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit rebar
+
+DESCRIPTION="Fast Expat based Erlang XML parsing library"
+HOMEPAGE="https://github.com/processone/fast_xml"
+SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+
+DEPEND=">=dev-lang/erlang-17.1
+	>=dev-erlang/p1_utils-1.0.18
+	dev-libs/expat"
+RDEPEND="${DEPEND}"
+
+DOCS=( CHANGELOG.md README.md )
--- a/dev-erlang/fast_yaml/Manifest
+++ b/dev-erlang/fast_yaml/Manifest
@ -1,3 +1,4 @@
 DIST fast_yaml-1.0.20.tar.gz 54476 BLAKE2B 553b433a4cbfa859b25f39e74766047f490cd11d327f73e948237fd4321e7a9f160656cb312b60fc1379c8e35f3c613ad76dc0a44a2f73b8ca09ce61a8e036e7 SHA512 583c36caf0dd492518b631bc4882530a12f83bc1de952aa8b053f4c3fb828be65d127954a5277b320a0ef28cf8b8df6db88e76b323f2774af061a9e9bd88e061
 DIST fast_yaml-1.0.21.tar.gz 54489 BLAKE2B 77cb6e8ab8b7fcd53a627f9225ce0f0f1dd8a1eadeb1ddda68a4dd3578f685dff94fd011e99ecce2e527a0bb9dd887137b32f2592f9a910330bfd4da2b6a53fb SHA512 90a81d6fc72df178c4f432c473521921e8419c59c8d66c054b07b29f9e32fda1d548b3b9c3092fa017a97594df32d4e1154ac67fe4c930b8843bc5e5d5705c43
+DIST fast_yaml-1.0.24.tar.gz 59018 BLAKE2B 498c7901944a1b8086495a5c990ae33a8fc7695f4995eda777fa7ab719377fd2db265ae03e4cb3053b7cbbf833ea1e7317d565f3fa6d9dcd4c0d869d324f1be6 SHA512 62a0b3d31612c7ec632763feb13a57306e8ed9b3959c8b8514dc74a4e5632246243abbb04fe57bddb9e4d95a9463a798b4c7ac6f18a1cf9ec041751e551769be
 DIST fast_yaml-1.0.9.tar.gz 49696 BLAKE2B a8cbda580e9c2bacdf046f82dc579eb5160d130f9af6c93e05e5c3e4fd7f8f30c9d767cb150a30c2abbd3d8fb3c62fa7c76bab3addb5754d04b9303e6c5bd3e3 SHA512 dd826643d1c841218bae1ccb6ea3dc0c35c64c20720c47e90b3dfad3231c4944216729bf3d46f19b06cd2d54a9487336e39a9ef15201cc315ab10a7ee950bf6a
--- a/dev-erlang/fast_yaml/fast_yaml-1.0.24.ebuild
+++ b/dev-erlang/fast_yaml/fast_yaml-1.0.24.ebuild
@ -0,0 +1,22 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit rebar
+
+DESCRIPTION="Fast Yaml native library for Erlang and Elixir"
+HOMEPAGE="https://github.com/processone/fast_yaml"
+SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+
+DEPEND=">=dev-lang/erlang-18.0
+	>=dev-erlang/p1_utils-1.0.18
+	dev-libs/libyaml"
+RDEPEND="${DEPEND}"
+
+DOCS=( CHANGELOG.md README.md )
--- a/dev-erlang/jiffy/Manifest
+++ b/dev-erlang/jiffy/Manifest
@ -1,3 +1,4 @@
 DIST jiffy-0.14.11.tar.gz 1878494 BLAKE2B e0240c0dcd81e1e505c41197772ecf659c76b7f91f1435c5a2debe558d9aa30291a6bd564b13fa617f801150dc4386d2d5f53ee6d64b1a7f8a59ea1e2f320d57 SHA512 0530958c04ecd3c479b432d15aa5c8c86ce9e39a828bf4e48eaa096a2a9b9c593b9cf07836346bf82e27ffcbaa6e923bc298e856701460e44c9c62a7c888028e
 DIST jiffy-0.14.9.tar.gz 1878413 BLAKE2B 6df392a6849b012d6a635191fec90f116b729d2602342b85ff4e0585f5db7c1319bf2d622d74f1807476af879a117b8e7d7b45c1d834f81309d96f184cbe36dd SHA512 2c8e7b2ea95c69cb0c6a7d02e341591e6807d0d81577050bf6f884dc7af7335e909f01cf7017ea27fae922d9a50ca4709fe0603b5de282b58d71afe4e06f7813
 DIST jiffy-1.0.1.tar.gz 1820182 BLAKE2B f2a3482cd1a8c3b713237e6564493cc480caafb730a058c3be0b1bc71f30d24733b94deb0b895071f3ac5b63c6dff03a52440406362aacba271c5decd9eddcb8 SHA512 cbfa148833ceaab42a970a4894f781f02bb214fbb2d042ccd22c8e04b53e47b53be51abdcb30ed7b143f0b72deb6d20878ca23d518090707c43f2b36431f7087
+DIST jiffy-1.0.4.tar.gz 1819151 BLAKE2B 76486e228ca5e11b9f7828d0cfb34975d1a1f318187dc22b9497e4de0af906e3b88c86f43f82eb4e8963d33846a94e51d0762d2fa3eba78c9997942cdf3c7f7e SHA512 a1a09e625e99dd4c5e7812a03b390eec1ea90b444fe71ebfafd50ef07b36dc53d18cd01a970a6a102d89c2ddd68b2390ca4ab8eb9a296e4e7b87220422c7e127
--- a/dev-erlang/jiffy/jiffy-1.0.4.ebuild
+++ b/dev-erlang/jiffy/jiffy-1.0.4.ebuild
@ -0,0 +1,20 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit rebar
+
+DESCRIPTION="JSON NIFs for Erlang"
+HOMEPAGE="https://github.com/davisp/jiffy"
+SRC_URI="https://github.com/davisp/${PN}/archive/${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="MIT BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+
+DEPEND=">=dev-lang/erlang-17.1"
+RDEPEND="${DEPEND}"
+
+DOCS=( README.md )
--- a/dev-erlang/mqtree/Manifest
+++ b/dev-erlang/mqtree/Manifest
@ -1,2 +1,3 @@
 DIST mqtree-1.0.4.tar.gz 227872 BLAKE2B 756542c77cecd3da12917c43c5c1a36f54af0bc18b66d1571d1a7428378fcd3c643168c182c3215ab5f7890b8292ef89248424567f6aa608c074548b055e0774 SHA512 5033c89bfbaba34a357bfd8d7981c75c362f7e9d039ef6035aad66e3562f848ff047fbbd612b51dfde79a0f7233337afb4a47dac5df369fa1c5e14b5d5b1911f
 DIST mqtree-1.0.5.tar.gz 227940 BLAKE2B db8edddfb91b52bced394221ed3c3a91cc552f45165f78f1bc0177e80f54a97d9d8843037e59f8c5fdc70bbf04f7016276c3667da4bc54055e9ca2aa9ecbe9df SHA512 c624ffbd97bd0bb0076ca246ad9bcf0a443ea1334dc3b8f553c5559e6ee07d134ea275c3bd121dfddabed5ff9a90ee8dd21d1283663f8e4252fa4eeb105eba62
+DIST mqtree-1.0.7.tar.gz 227967 BLAKE2B 72cad70ab53038eed09ba4444f0c21c9767405aac4b573c60a6ae0ef84737c1da248189e4dc5b08f0f197ca0f6cfd66a51bed1867d6cba591a9aec8ce8298501 SHA512 efca5119bfbdaab5637855ff20016061fadeed6b9ebc6b3db03686b37daba1b36b1ddafe805c953eadc77f8cbde3c6c4943d1aa39ae4c9a96eed3f97f64ca37f
--- a/dev-erlang/mqtree/mqtree-1.0.7.ebuild
+++ b/dev-erlang/mqtree/mqtree-1.0.7.ebuild
@ -0,0 +1,21 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit rebar
+
+DESCRIPTION="Index tree for MQTT topic filters"
+HOMEPAGE="https://github.com/processone/mqtree"
+SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND=">=dev-lang/erlang-17.5
+	>=dev-erlang/p1_utils-1.0.18"
+RDEPEND="${DEPEND}"
+
+DOCS=( README.md )
--- a/dev-erlang/p1_acme/Manifest
+++ b/dev-erlang/p1_acme/Manifest
@ -0,0 +1 @@
+DIST p1_acme-1.0.5.tar.gz 220724 BLAKE2B 7f236f9e66dc982342c15c46ebe2a391f72384710b19e1007d1e9ff679a9701190650853b8e67c3a63abba5e6a4107ed921fdc25f5cce984a4333fab98449f37 SHA512 e21907c18311b98cc865cddd155291fae09f739b5429a42810ba93fae77abe3f4e3ecaf9accf0d42d38e21bb823987dea0c3175ea1b7f20b171afa06a932f9e1
--- a/dev-erlang/p1_acme/metadata.xml
+++ b/dev-erlang/p1_acme/metadata.xml
@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>ejabberd@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">processone/p1_acme</remote-id>
+	</upstream>
+</pkgmetadata>
--- a/dev-erlang/p1_acme/p1_acme-1.0.5.ebuild
+++ b/dev-erlang/p1_acme/p1_acme-1.0.5.ebuild
@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit rebar
+
+DESCRIPTION="ACME client library for Erlang"
+HOMEPAGE="https://github.com/processone/p1_acme"
+SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND=">=dev-lang/erlang-17.1
+	>=dev-erlang/jiffy-1.0.1
+	>=dev-erlang/yconf-1.0.4
+	>=dev-erlang/idna-6.0.0
+	>=dev-erlang/jose-1.9.0
+	>=dev-erlang/base64url-1.0"
+RDEPEND="${DEPEND}"
+
+DOCS=( CHANGELOG.md README.md )
+
+src_prepare() {
+	rebar_src_prepare
+	# otherwise it wants to fetch base64url from git
+	sed -ri 's/\+\+ \[\{base64url.*//' rebar.config.script
+}
--- a/dev-erlang/p1_mysql/Manifest
+++ b/dev-erlang/p1_mysql/Manifest
@ -1,2 +1,3 @@
 DIST p1_mysql-1.0.11.tar.gz 25958 BLAKE2B 6c94287fc584ed530d70e9609cc565c2c66a2b90b8bb47d85e370353e8e56dd9cb8e902406eaf330692f70c264f44977f22534e6805017a12accdcb5828a45e1 SHA512 2929b1e66aa887258b46f7dcda71f935230b9b7ea9fccf0baff2cda0782a5b7da26b9b396ed2bf3b16f07d397c88f5881ea93913a11e262be802654ac46dd9ed
+DIST p1_mysql-1.0.14.tar.gz 26922 BLAKE2B 83b22c454a069fc14f7cfb82a7cb42eb4d43d3f560329159ddf503bbfe19a5f44ee7279489c5c0d028b63285c47d62e1416af24f70ad38927125de466c2b9414 SHA512 ab60ab6b43e3cca9e14e28075f1276cff02dc796a3074662c797ac2e46a38afb2726719de64bfd61e9a27b2d31665f33551d0680e137eb6167b9d32c8721e1e5
 DIST p1_mysql-1.0.2.tar.gz 19512 BLAKE2B 8cf7cded80d6ca1239019f3d1bbb7d4babbe0336a09b6c8ebb55e116eeb592e35a6f332ee6950c78ac6559a3850bdc1dbfa50ded2d30e008deb8e8d50b5c86d2 SHA512 ac0656b3134cfae47161a4643188784cf71e8ea19bbd5856e58d4f1d508a8771534975a631da51e7574e5adb3f64cdd250ab59ab7e9138fd5cb865e80522bd11
--- a/dev-erlang/p1_mysql/p1_mysql-1.0.14.ebuild
+++ b/dev-erlang/p1_mysql/p1_mysql-1.0.14.ebuild
@ -0,0 +1,20 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit rebar
+
+DESCRIPTION="Pure Erlang MySQL driver"
+HOMEPAGE="https://github.com/processone/p1_mysql"
+SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+
+DEPEND=">=dev-lang/erlang-17.1"
+RDEPEND="${DEPEND}"
+
+DOCS=( CHANGELOG.md README.md )
--- a/dev-erlang/p1_oauth2/Manifest
+++ b/dev-erlang/p1_oauth2/Manifest
@ -1,2 +1,3 @@
 DIST p1_oauth2-0.6.1.tar.gz 212804 BLAKE2B 571341aaa4d3a4bac6ac2f8f46d2e4b9caf5e00622a392635d79ff11b520a3cab71d360220c99a46035ce851974d975d69a71ac9b1be626c9b126941fc4a73cf SHA512 2509d48775579a26178fb5a082e628a8487c986b1b4d4abe974b653a1e0b7605bed934d59f6d62927582bdb95a53ba454816d326d99a77c5360928c4973ade4a
 DIST p1_oauth2-0.6.5.tar.gz 213847 BLAKE2B de1b9dc238efacf5682ad12b1b563fc311f1e0515673003286b31f42ebd33fb8dd9e384aed194047cd6ab38d4769ab128e8de5241004ce49f72d56ad9ca22d21 SHA512 5664aba423c85d90321533878b73e58b50d7ef3bc4183c8108c99e075ef4e75041eb28620de4dc14be23dfaac3623a858a9c8e191e54dae62eb9688ea0812312
+DIST p1_oauth2-0.6.6.tar.gz 213866 BLAKE2B 2b7ff13697658c6ab31a2cab60100758d965ae0f3cbeb878539e42210e54e7cf33a458c645e432790f79ba3fa92ab35a5d6d6136edc14369ac6d8872e16d7f69 SHA512 9680bc96608bc486165d5f77cf6e92e5f9257e0dbea718c739563556c2b485f67152dcd99cbe228addd34b33b2dd6cc9eacc3827f269412f705acd14b2522952
--- a/dev-erlang/p1_oauth2/p1_oauth2-0.6.6.ebuild
+++ b/dev-erlang/p1_oauth2/p1_oauth2-0.6.6.ebuild
@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit rebar
+
+DESCRIPTION="Erlang OAuth 2.0 implementation"
+HOMEPAGE="https://github.com/processone/p1_oauth2"
+SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+IUSE="test"
+
+CDEPEND=">=dev-lang/erlang-17.1"
+DEPEND="${CDEPEND}
+	test? (
+		>=dev-erlang/meck-0.8.7
+		>=dev-erlang/proper-1.3
+	)"
+RDEPEND="${CDEPEND}"
+
+DOCS=( CHANGELOG.md README.md )
+
+src_prepare() {
+	rebar_src_prepare
+	rebar_remove_deps rebar.test.config
+}
+
+src_test() {
+	erebar -C rebar.test.config compile eunit
+}
--- a/dev-erlang/p1_pgsql/Manifest
+++ b/dev-erlang/p1_pgsql/Manifest
@ -1,3 +1,4 @@
 DIST p1_pgsql-1.1.2.tar.gz 19347 BLAKE2B fc8d052dd77037b20a99fc147c55392c4d731eef6f098b6b805c4441e44b7a16ce6dce44c88ac2fa325d47fbadfa11fdc9c75b1f2039112699c2ab1b1dc6af42 SHA512 e5ead1e41e5dd0b9ec1ff96e6d133b8a5eaea38f6eb343391f5a7cc9757c3255730b147a621a8d55f7e0be2798186aedba0af2434ed96a981fa8f19c4ba8927e
 DIST p1_pgsql-1.1.6.tar.gz 20545 BLAKE2B 17e5f2dc5f08ff830ae2b17a80950e45a0df7f939b8d42bf6a4a373c76818997c040b57f5db4cca3d0767d98c4684c0f61a610822d4c43c5138e61589cf57b8f SHA512 7bed2f44a134cdae1738c2a09257a406fe292a0f6bfb587eecb6597c1b4c6e9ea45d2ed6022ccc6a9a00fe008e4d99b2df4896ac2f0654e1daf7369a39dd60c9
 DIST p1_pgsql-1.1.8.tar.gz 24162 BLAKE2B cd65c347f6ae651cd9baa053ab12117948f55d9c10ac5541768cf3a36f1086f513c6059353f91564587ee17ef21d1772bdb220159f877a27db35b86e034601e6 SHA512 ab156cfc3da979802a619855783bc114f5a0d75625467cf144e63cdf22187c30dc8d66d541addc54e4402c95bebcfb3900b1883e29e741af398c83419f5b71c3
+DIST p1_pgsql-1.1.9.tar.gz 24175 BLAKE2B cab26e09e89fda82431cd29a3a09c9fd309868021bfad3d5110fd5b40ccd19c9b6eee40d77debb1cde86bc77f139123ce282305500774f5650ebf7c647bec532 SHA512 5a24bfdf13bf015d0a92cbba74dbe09122b900bed994495fbccd51616ee6fc3032fc571847813ef4631d2c6a947985302818c067d19a3ab50e190de6f0f2cf1b
--- a/dev-erlang/p1_pgsql/p1_pgsql-1.1.9.ebuild
+++ b/dev-erlang/p1_pgsql/p1_pgsql-1.1.9.ebuild
@ -0,0 +1,20 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit rebar
+
+DESCRIPTION="Pure Erlang PostgreSQL driver"
+HOMEPAGE="https://github.com/processone/p1_pgsql"
+SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="ErlPL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+
+DEPEND=">=dev-lang/erlang-17.1"
+RDEPEND="${DEPEND}"
+
+DOCS=( CHANGELOG.md README.md )
--- a/dev-erlang/pkix/Manifest
+++ b/dev-erlang/pkix/Manifest
@ -1,2 +1,3 @@
 DIST pkix-1.0.3.tar.gz 391302 BLAKE2B 8ff0403b6beed707afb8cca51c027d140f06273def0cff3588c9ee26673021d1fbb5b7397281c7daa27f076d61a222843251ab626661727f65255012846f9756 SHA512 b45c8fc74a1ef7d61818ba8a72bb141fa28796dadc36829f3456f1a87b5c263a5d708e4512cd91f54efd59dc14a47e31aa67ecb90c378f22fd42e77d6110320f
 DIST pkix-1.0.4.tar.gz 411737 BLAKE2B 5f675adc535a5463d2259c078a5445348bf9901224f78daff5b1b261796888d90f6707a3d6fd199fa611f347a560f8154d8c2122aeeacea6df776e8aec62708a SHA512 2c90bc13dc381f08b250db105eb09729005d1d191a1d6e69e2096f155f40460ebe47cb85a1b157782cb74c5e759b53010bc96fc831a7224f5a3aa30e46775b16
+DIST pkix-1.0.5.tar.gz 411755 BLAKE2B bd4b8cd87f1cabff7aa6923007aff9f586bb5e3e322978223a8533087ed2474816b578023a7269f37fb2afabafc4e2ce51606ba420c3b4cfea2e2b4e0f5c0af2 SHA512 b265f4ffb104404d38c9e6c5660e91a720d6b1a85339f82b40fae27727c4edbde585a1427682cf5ca59fe0be775fde26d74cbd4807f45b12b381736d2979595d
--- a/dev-erlang/pkix/pkix-1.0.5.ebuild
+++ b/dev-erlang/pkix/pkix-1.0.5.ebuild
@ -0,0 +1,20 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit rebar
+
+DESCRIPTION="PKIX certificates management library for Erlang"
+HOMEPAGE="https://github.com/processone/pkix"
+SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND=">=dev-lang/erlang-17.5"
+RDEPEND="${DEPEND}"
+
+DOCS=( README.md )
--- a/dev-erlang/stringprep/Manifest
+++ b/dev-erlang/stringprep/Manifest
@ -1,2 +1,3 @@
 DIST stringprep-1.0.17.tar.gz 98819 BLAKE2B c1db7be3bd3618c4c1a943080a39104342b11102b9e894e457ee6f7510696a4e160b3bd50fd945be9d8d7dda4bf9eb5e5517e59f7e69cffd9b71e1db9e022e4a SHA512 170d4c96882eebf4602f0a6c87764b6c10d6a063b832c4473df11741656ac03c7b7bbb7d176a991747364f7fb9487ed0cbdbf6792378daefd41672ed685e9dd8
+DIST stringprep-1.0.19.tar.gz 98841 BLAKE2B 6478699a8e784c1173a97d4329309c259bfb4376503a871277395ee160748fc32f5c207d98e645d9a1c153dca3e25b4d5fb3ca66a671b8afd709d8e8fd742438 SHA512 b4a41cb1e89d5c940468629404e351a2f0a3ea46ae4e78567ab137802d85adaac44d94eb69cec9c1f77adf2497d44b9fe5939008bdf4cdf0d0f895cb1bf68ecf
 DIST stringprep-1.0.8.tar.gz 95586 BLAKE2B 62fa68021c32dfc6d1d46473d9cc756cd5f0e2d3932f6f4dc78f71a1ba05e5124574a4b210d74ab555b2cc40f2c43b5eb6d0aac709a028f7cc6324189fde5ee9 SHA512 6680450a3e6226b088b06c79dd6ef1ca689ee8787b9f7eaa53ec073e9dcd70fac48ed2f5fb0b12871607092514db71f63b0617a938912a88a51d36518738a911
--- a/dev-erlang/stringprep/stringprep-1.0.19.ebuild
+++ b/dev-erlang/stringprep/stringprep-1.0.19.ebuild
@ -0,0 +1,21 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit rebar
+
+DESCRIPTION="Fast Stringprep implementation for Erlang and Elixir"
+HOMEPAGE="https://github.com/processone/stringprep"
+SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 tcltk"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+
+DEPEND=">=dev-lang/erlang-17.1
+	>=dev-erlang/p1_utils-1.0.18"
+RDEPEND="${DEPEND}"
+
+DOCS=( CHANGELOG.md README.md )
--- a/dev-erlang/stun/Manifest
+++ b/dev-erlang/stun/Manifest
@ -1,3 +1,4 @@
 DIST stun-1.0.10.tar.gz 28715 BLAKE2B ef8ba4d383df4374df065236b17d547d863bf8f323ce60779c772e7c8218872b0d460c513cc735001e7074c4defe0a36f3c0d41422d0bc9bb7f5139287f89c70 SHA512 9aba8c614af2f132c2a1cbeb96caa441934df389d24789f2d52b33b878f02a1b47602c95e717c7afd2a46ae85ceb70b4ba5c6eb96cd4fedf6ac56b0cd888ff74
 DIST stun-1.0.25.tar.gz 29332 BLAKE2B d234af437cbdd11116ed373c4ff4c5b67f80136d2c92e05a462138d3e31f6120363d0ad8af275eb753f4e724c1435fc4b5ec7399e30c25e7a6ad69c3e49d3ad9 SHA512 9c0eaa5cf21ca5305d6883f24d09a55fea2df261a1b32ab94770b9487c292f12ee3c55b101a4923a65407f0dd23149fef91bc35d2e754ab253c1c67adf584a3e
 DIST stun-1.0.29.tar.gz 32991 BLAKE2B bbd6b59fe314a674209dcf12ac07c0ae2a94b4683ecbe1156360b1f8536314eb4a52f9f72c81aa6df32cebb44cc0b1187890c8b4aab8e517435199e21974ae61 SHA512 aab6a57b508aa6c6a7e78dc24e92f851277f91eb22e2bc3ec1def47dec9e4b4592799e1948ba8b2dec505d965786e260f00349c236b7dd88ddaa935e42b7f5b8
+DIST stun-1.0.31.tar.gz 33025 BLAKE2B 54d04ade6fee3911a2c2d8412e2aca5825706d15e9614fe21e03ecc8f60ee95ede15f4f725e307c300cfcde882eaa70476cf260de3156465864251d8802559ff SHA512 d809ae52acf050b0b9dfbd7914d4de93bbc4f063f01ee22ebb8ee1b8eb0b23d29b63699139bdb9821178861f01e56648b8786d319d26ae690595575a8cea9c30
--- a/dev-erlang/stun/stun-1.0.31.ebuild
+++ b/dev-erlang/stun/stun-1.0.31.ebuild
@ -0,0 +1,22 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit rebar
+
+DESCRIPTION="STUN and TURN library for Erlang and Elixir"
+HOMEPAGE="https://github.com/processone/stun"
+SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+
+DEPEND=">=dev-lang/erlang-17.1
+	>=dev-erlang/fast_tls-1.1.4
+	>=dev-erlang/p1_utils-1.0.18"
+RDEPEND="${DEPEND}"
+
+DOCS=( CHANGELOG.md README.md )
--- a/dev-erlang/xmpp/Manifest
+++ b/dev-erlang/xmpp/Manifest
@ -1,3 +1,4 @@
 DIST xmpp-1.1.9.tar.gz 370926 BLAKE2B 908ce986831300a3f62609a6b95cdbab42028cbbbe1bffe30fbe9865956de2a86d791dc9c807295c50a4e1945e85f5e16f9e7d03ee4e1cf4e96638e7e6a63aff SHA512 13af5699966c8e9c0568356a3620ce6861549b0091e1889c957a91b4384ed24dd98a04422fcfed07470fc94ad9e49459e7942fc5aa9c5e5fd1a20f3efd5fdd1f
 DIST xmpp-1.2.5.tar.gz 459997 BLAKE2B 73157baa9b4616a76472f76f0e290efc1312b6ea6171edd09636562ee0a7b733bd82459dcb324ae8fc279d8a61b4dd0f2dfabb44013d921063abb1a0a4d859f4 SHA512 93aaec3a31e6b6ce2aebcdbf3e21ec78746f7ba40363f5e7186c184397af9dc3da33f8da40c732b1dfa8805683383a56b2407978e50a0e8652a09b55bb230f66
 DIST xmpp-1.4.2.tar.gz 479072 BLAKE2B fc6d6892c3d14662470dbca4b9fb10e7ec61f44ce2793694e629b3918fe761c32cd9666f15188a010e592d824144863a2d85d59cdf8e640e2a34f390500596f1 SHA512 1071bd4f424235ff680428169007beb7c660341d20e98ac740296cdb3ab5b2c746e94926a15c1192b7c0d53d62e4ee44987e66fa3da11bb120a2fec6aa746eef
+DIST xmpp-1.4.5.tar.gz 479170 BLAKE2B e216e1014c766eed5c2c10b7947754fd1f640957158c10c91721137e1583412910a63e37db4d7dde7f99a7447b50788af734c0a0b21009c149c061b6a7d859e8 SHA512 ceee5150fb5fc942b993bfc5beaa23c453cdc32cbb25bf9988dd096ee0b62adbc1b2abf3f69c847189e4fc14c0e08c3491f1a6f742e0937990c7462682b8646a
--- a/dev-erlang/xmpp/xmpp-1.4.5.ebuild
+++ b/dev-erlang/xmpp/xmpp-1.4.5.ebuild
@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit rebar
+
+DESCRIPTION="XMPP parsing and serialization library on top of Fast XML"
+HOMEPAGE="https://github.com/processone/xmpp"
+SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND=">=dev-lang/erlang-20.0
+	>=dev-erlang/ezlib-1.0.7
+	>=dev-erlang/fast_tls-1.1.4
+	>=dev-erlang/fast_xml-1.1.39
+	>=dev-erlang/p1_utils-1.0.18
+	>=dev-erlang/stringprep-1.0.19
+	>=dev-erlang/idna-6.0.0"
+DEPEND="${RDEPEND}"
+
+DOCS=( CHANGELOG.md README.md )
+
+src_prepare() {
+	rebar_src_prepare
+	rebar_fix_include_path fast_xml
+}
--- a/dev-erlang/yconf/Manifest
+++ b/dev-erlang/yconf/Manifest
@ -1 +1,2 @@
 DIST yconf-1.0.1.tar.gz 221704 BLAKE2B eec5ad6467af253c62523ebe431a7e117b5e76d1a0273792c5af4ac522ab10b3796910f11591a16e056ff368877c047d0ad9e47f63096a86de7a5d3ee9636ddf SHA512 c0b1a6e9534ee7d78963bd19df3f89622a719e2b5cc9c6299f4d39f08b5c8b8923f8697d57bd315e6cc0b41863adef2a8141f9d4e7d58bb0ade57c86f2835c1e
+DIST yconf-1.0.4.tar.gz 221839 BLAKE2B 7369f4e82e318d90733d3130de8061fa72958bc84d37f601b21cbb5ca7eff0b26c8efbc40477143ebb0146369db1cebd9a0f92b8ad1f11b5f103853ee97afe0a SHA512 f7f0f31cd90a129473bc3c6d63a8b22f7be8c8beb5c51112a72def870647d7e6563324eceae474b118a53b8b10a764b7213bb51180a7c24728cf5c8f2dd2766d
--- a/dev-erlang/yconf/yconf-1.0.4.ebuild
+++ b/dev-erlang/yconf/yconf-1.0.4.ebuild
@ -0,0 +1,21 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit rebar
+
+DESCRIPTION="YAML configuration processor"
+HOMEPAGE="https://github.com/processone/yconf"
+SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+
+DEPEND=">=dev-lang/erlang-17.1
+	>=dev-erlang/fast_yaml-1.0.24"
+RDEPEND="${DEPEND}"
+
+DOCS=( CHANGELOG.md )
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
--- a/dev-lang/mercury-extras/Manifest
+++ b/dev-lang/mercury-extras/Manifest
@ -1,4 +1,6 @@
 DIST mercury-extras-14.01.1-gentoo-patchset-4.tar.gz 4361 BLAKE2B a1939e4b76782cb01fc7ee5dcb1ccbb885e93992d0e6f540552eb987f405b3a70671527dfacb873323f6030bb6de2f6cdd23768dbc36e8b656d836e2890b7d8a SHA512 e30ac4e9c0592a1ea5253663bf351814e91977ea53892dca4d996b217aac959265563910cc21aa64ee12a93ea379cb8143730585c7d32390bcf05f2a1b0590d7
 DIST mercury-extras-20.01-gentoo-patchset-0.tar.gz 542 BLAKE2B 4f24f5af21cbd566eb72ce03d618d858f16d02a921b506c933342181ea057d98377077535571223c85b1f1fa5854e52005f67f40dd75bb392929faaad889eed1 SHA512 6a2eb1dbaac1f028c0ce5f0e21a8f24bd4ba9b068f1ea5d8554c5fb7376642797709f0aa93db336d2f015b6f815d0aa27c7d60720aab340ace180d49791bd852
+DIST mercury-extras-20.01.1-gentoo-patchset-0.tar.gz 732 BLAKE2B 32287e116b94b540ca0b710eac8921669ff9a56b5d8a812eba8443609ccfc8c937baaa53a0ae4704abdc78013d58eddd0dc5cda7c807d7a0b724ebda1dede723 SHA512 0d3ca2984eb054ec2add5e05fb49d4fa711b3c78038b4e9777c4767083fc3bae552a261677fed6f07c293d2fb1ebf632ba633eb64a3a8ab4880c6f6619a197ea
 DIST mercury-srcdist-14.01.1.tar.gz 52658945 BLAKE2B 6497921a0227b9a6fbcbabdd309ef3325f32dda14fc4ddb443368385b89be4011d677a24b30b3702147d1b782fe2597760ad66dd34503aa6aebaf79707466529 SHA512 a128ef0fd4955abadea32019ec59297ffe32537415f32e9e948cbc1c3439bb40eb09de77569690fb18dd7d6969a2b1141b3ae5baeb87f2627eaa65ad93add92c
+DIST mercury-srcdist-20.01.1.tar.gz 47088335 BLAKE2B 1e3285dadc3748934e801b8ac0316d3005fbe24c20c9ceb694e9fc316d820fdb89c659107b25ee474fd6ac50d661dd029af9ca5082016a3b0827dd640a54a707 SHA512 24ad0bbecee46ab6ff669d63d64096b37a0d010bb44978a1785eee2701a8b30a83eab229af97cbbb18bca55b5e89be9ba74fe126d1d430da1e1e909366dc5b90
 DIST mercury-srcdist-20.01.tar.gz 47103868 BLAKE2B 68be786e925bdf94dcba6c6a2a746a384da345ee33250785d8d2b9281815694a4525cdd694c26f58051c097f2a897291e640e2139729ccede9bd2e472077d8c9 SHA512 90e36faa375603e596b2dd692363528120fda62ae6d2e2b119cf76de1656dae4028aff00858a4bff3fdfb9b2210ea17db0aa516ce4283604c46a5935dd2cd4b7
--- a/dev-lang/mercury-extras/mercury-extras-20.01.1.ebuild
+++ b/dev-lang/mercury-extras/mercury-extras-20.01.1.ebuild
@ -0,0 +1,317 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils multilib vcs-clean
+
+PATCHSET_VER="0"
+MY_P=mercury-srcdist-${PV}
+
+DESCRIPTION="Additional libraries and tools that are not part of the Mercury standard library"
+HOMEPAGE="http://www.mercurylang.org/index.html"
+SRC_URI="http://dl.mercurylang.org/release/${MY_P}.tar.gz
+	mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="cairo examples glut gmp iodbc ncurses odbc opengl ssl tk tommath X xml"
+REQUIRED_USE="?? ( odbc iodbc )"
+
+RDEPEND="
+	~dev-lang/mercury-${PV}
+	cairo? ( >=x11-libs/cairo-1.10.0 )
+	gmp? ( dev-libs/gmp:0 )
+	glut? ( media-libs/freeglut )
+	odbc? ( dev-db/unixODBC )
+	iodbc? ( dev-db/libiodbc )
+	tommath? ( dev-libs/libtommath )
+	ncurses? ( sys-libs/ncurses:= )
+	opengl? (
+		virtual/opengl
+		virtual/glu
+	)
+	tk? (
+		dev-lang/tcl:0
+		dev-lang/tk:0
+	)
+	X? ( x11-libs/libX11 )"
+
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}"/${MY_P}/extras
+
+mercury_pkgs() {
+	echo "
+		align_right/align_right:bin:
+		base64/mercury_base64:lib:
+		cgi/mercury_www:lib:
+		complex_numbers/complex_numbers:lib:
+		$(use ncurses && echo \
+			curs/curs:lib:ncurses,panel curses/mcurses:lib:ncurses)
+		dynamic_linking/dl:lib:
+		error/error:bin:
+		fixed/fixed:lib:
+		$(use gmp && echo gmp_int/gmp_int:lib:)
+		$(use tommath && echo mp_int/mp_int:lib:libtommath)
+		$(use X && echo graphics/easyx/easyx:lib:x11)
+		$(use cairo && echo graphics/mercury_cairo/mercury_cairo:lib:cairo)
+		$(use glut && echo graphics/mercury_glut/mercury_glut:lib:freeglut)
+		$(use opengl && echo graphics/mercury_opengl/mercury_opengl:lib:gl,glu)
+		$(use tk && echo graphics/mercury_tcltk/mercury_tcltk:lib:tk)
+		lex/lex:lib:
+		lex/regex:lib:
+		moose/moose:bin:
+		net/net:lib:
+		net/echo:bin:
+		$(use ssl && echo mopenssl/mopenssl:lib:openssl)
+		$(use odbc && echo odbc/odbc:lib:)
+		$(use iodbc && echo odbc/odbc:lib:libiodbc)
+		posix/posix:lib:
+		$(has_version dev-lang/mercury[trail] && echo \
+			references/global:lib: trailed_update/trailed_update:lib:)
+		show_ops/show_ops:bin:
+		solver_types/library/any:lib:
+		$(use xml && echo xml/xml:lib:)"
+}
+
+mercury_pkg_setup() {
+	mercury_pkg=${1%%:*}
+	mercury_pkg_dir=${mercury_pkg%/*}
+	mercury_pkg_name=${mercury_pkg##*/}
+
+	mercury_pkg_atts=${1#*:}
+	mercury_pkg_type=${mercury_pkg_atts%%:*}
+	mercury_pkg_deps=${mercury_pkg_atts#*:}
+
+	cd "${S}"/${mercury_pkg_dir} || die
+
+	echo ">> Preparing Mercury package: ${mercury_pkg}"
+
+	if ! test -f "${S}"/${mercury_pkg_dir}/gentoo.params; then
+		echo "LIBGRADES := \$(filter-out java,\$(LIBGRADES))" \
+			> "${S}"/${mercury_pkg_dir}/gentoo.params
+		echo "LIBGRADES := \$(filter-out erlang,\$(LIBGRADES))" \
+			>> "${S}"/${mercury_pkg_dir}/gentoo.params
+		echo "LIBGRADES := \$(filter-out csharp,\$(LIBGRADES))" \
+			>> "${S}"/${mercury_pkg_dir}/gentoo.params
+		echo "include gentoo.params" > "${S}"/${mercury_pkg_dir}/Mmakefile
+	fi
+
+	if test -n "$mercury_pkg_deps"; then
+		echo "EXTRA_CFLAGS += $(pkg-config --cflags ${mercury_pkg_deps/,/ })" \
+			>> "${S}"/${mercury_pkg_dir}/gentoo.params
+		echo "EXTRA_MLLIBS += $(pkg-config --libs ${mercury_pkg_deps/,/ })" \
+			>> "${S}"/${mercury_pkg_dir}/gentoo.params
+	fi
+
+	if test ${mercury_pkg_name} = dl; then
+		echo "EXTRA_MLLIBS = -ldl" >> "${S}"/${mercury_pkg_dir}/gentoo.params
+	elif test ${mercury_pkg_name} = gmp_int; then
+		echo "EXTRA_MLLIBS = -lgmp" >> "${S}"/${mercury_pkg_dir}/gentoo.params
+	elif test ${mercury_pkg_name} = mercury_tcltk; then
+		echo "EXTRA_CFLAGS += -DUSE_INTERP_RESULT" \
+			>> "${S}"/${mercury_pkg_dir}/gentoo.params
+	elif test ${mercury_pkg_name} = mopenssl; then
+		local net_libdir="${D}/usr/$(get_libdir)/mercury/extras/lib/\$(GRADE)"
+		echo "EXTRA_MLLIBS += -L${net_libdir} -L../net -lnet" \
+			>> "${S}"/${mercury_pkg_dir}/gentoo.params
+		echo "net%:" >> "${S}"/${mercury_pkg_dir}/gentoo.params
+		echo "	cp ../net/\$@ \$@" >> "${S}"/${mercury_pkg_dir}/gentoo.params
+	elif test ${mercury_pkg_name} = odbc && use odbc; then
+		echo "EXTRA_CFLAGS = -DMODBC_UNIX -DMODBC_MYSQL" \
+			>> "${S}"/${mercury_pkg_dir}/Mmakefile
+		echo "EXTRA_MLLIBS = -lodbc" >> "${S}"/${mercury_pkg_dir}/gentoo.params
+	elif test ${mercury_pkg_name} = odbc && use iodbc; then
+		echo "EXTRA_CFLAGS += -DMODBC_IODBC -DMODBC_MYSQL" \
+			>> "${S}"/${mercury_pkg_dir}/gentoo.params
+	fi
+}
+
+mercury_pkg_compile() {
+	mercury_pkg=${1%%:*}
+	mercury_pkg_dir=${mercury_pkg%/*}
+	mercury_pkg_name=${mercury_pkg##*/}
+
+	mercury_pkg_atts=${1#*:}
+	mercury_pkg_type=${mercury_pkg_atts%:*}
+
+	cd "${S}"/${mercury_pkg_dir} || die
+
+	echo ">> Compiling Mercury package: ${mercury_pkg}"
+
+	if test "${mercury_pkg_type}" = "bin"; then
+		mercury_mmc_target=${mercury_pkg_name}
+	else
+		mercury_mmc_target=lib${mercury_pkg_name}
+	fi
+
+	# Mercury dependency generation must be run single-threaded
+	mmc -f *.m || die "mmc -f .m failed"
+	mmake -j1 \
+		${mercury_pkg_name}.depend \
+		|| die "mmake ${mercury_pkg} depend failed"
+
+	# Compiling Mercury submodules is not thread-safe
+	mmake -j1 \
+		MLFLAGS=--no-strip \
+		CFLAGS="${CFLAGS}" \
+		LD_LIBFLAGS="${LDFLAGS} -L/usr/$(get_libdir)" \
+		${mercury_mmc_target} || die "mmake ${mercury_pkg} failed"
+
+}
+
+mercury_pkg_install() {
+	mercury_pkg=${1%%:*}
+	mercury_pkg_dir=${mercury_pkg%/*}
+	mercury_pkg_name=${mercury_pkg##*/}
+
+	mercury_pkg_atts=${1#*:}
+	mercury_pkg_type=${mercury_pkg_atts%:*}
+
+	cd "${S}"/${mercury_pkg_dir} || die
+
+	echo ">> Installing Mercury package: ${mercury_pkg}"
+
+	if test "${mercury_pkg_type}" = "bin"; then
+		into /usr/$(get_libdir)/mercury/extras
+		dobin ${mercury_pkg_name}
+	else
+		# Compiling Mercury submodules is not thread-safe
+		mmake -j1 \
+			MLFLAGS=--no-strip \
+			CFLAGS="${CFLAGS}" \
+			LD_LIBFLAGS="${LDFLAGS} -L/usr/$(get_libdir)" \
+			INSTALL_LIBDIR="${D}/usr/$(get_libdir)/mercury/extras" \
+			lib${mercury_pkg_name}.install || die "mmake ${mercury_pkg} failed"
+	fi
+}
+
+src_prepare() {
+	cd "${WORKDIR}"/${MY_P}
+	if [[ -d "${WORKDIR}"/${PV} ]] ; then
+		eapply "${WORKDIR}"/${PV}
+	fi
+	eapply_user
+
+	cd "${S}"
+	for mercury_pkg in $(mercury_pkgs); do
+		mercury_pkg_setup ${mercury_pkg}
+	done
+}
+
+src_compile() {
+	for mercury_pkg in $(mercury_pkgs); do
+		mercury_pkg_compile ${mercury_pkg}
+	done
+}
+
+src_install() {
+	for mercury_pkg in $(mercury_pkgs); do
+		mercury_pkg_install ${mercury_pkg}
+	done
+
+	cd "${S}"
+	dodoc README
+
+	if use examples; then
+		docinto samples/cgi
+		dodoc cgi/form_test.m
+
+		docinto samples/complex_numbers
+		dodoc complex_numbers/samples/*.m
+
+		if use ncurses; then
+			docinto samples/curs
+			dodoc curs/samples/*.m
+
+			docinto samples/curses
+			dodoc curses/sample/*.m
+		fi
+
+		docinto samples/dynamic_linking
+		dodoc dynamic_linking/{hello,dl_test}.m
+
+		docinto samples/gator
+		dodoc -r gator/*
+
+		if use gmp; then
+			docinto samples/gmp_int
+			dodoc gmp_int/gmp_int_test.m
+		fi
+
+		if use tommath; then
+			docinto samples/mp_int
+			dodoc mp_int/mp_int_test.m
+		fi
+
+		if use X; then
+			docinto samples/graphics
+			dodoc graphics/easyx/samples/*.m
+		fi
+
+		if use glut && use opengl; then
+			docinto samples/graphics
+			dodoc graphics/samples/gears/*.m
+			dodoc graphics/samples/maze/*.m
+		fi
+
+		if use tk; then
+			docinto samples/graphics
+			dodoc graphics/samples/calc/*.m
+		fi
+
+		if use opengl && use tk; then
+			docinto samples/graphics
+			dodoc graphics/samples/pent/*.m
+		fi
+
+		docinto samples/lex
+		dodoc lex/samples/*.m
+
+		docinto samples/log4m
+		dodoc log4m/*.m
+
+		docinto samples/monte
+		dodoc monte/*.m
+
+		docinto samples/moose
+		dodoc moose/samples/*
+
+		docinto samples/net
+		dodoc net/test_lookups.m
+
+		if use odbc || use iodbc; then
+			docinto samples/odbc
+			dodoc odbc/odbc_test.m
+		fi
+
+		docinto samples/posix
+		dodoc posix/samples/*.m
+
+		docinto samples/random
+		dodoc random/*.m
+
+		if has_version dev-lang/mercury[trail]; then
+			docinto samples/references
+			dodoc references/samples/*.m
+
+			docinto samples/trail
+			dodoc trail/*.m
+
+			docinto samples/trailed_update
+			dodoc trailed_update/samples/*.m
+		fi
+
+		if use xml; then
+			docinto samples/xml
+			dodoc xml/tryit.m
+			dodoc xml/samples/*
+			dodoc xml_stylesheets/*.xsl
+		fi
+
+		ecvs_clean
+	fi
+}
--- a/dev-lang/mercury/Manifest
+++ b/dev-lang/mercury/Manifest
@ -1,4 +1,6 @@
 DIST mercury-14.01.1-gentoo-patchset-5.tar.gz 5693 BLAKE2B 300de3254bc0d2f59493c0e2243b0d8786fccce714134a11ce510120b7d9f05ebe4835f084ec2db2ddaf2d405cbae65e86d809847079a7d63a6a68021d9d29e8 SHA512 3f9f1e2359f372e4f510b9a00c197978657b28d1308d12cba4d08a982877e2311d7fb6e626dad07d0fa09d24f97334575557cb49003508fdc7b32288c1ae8f2d
 DIST mercury-20.01-gentoo-patchset-0.tar.gz 3862 BLAKE2B 79ef6d30add63a5d419e3dd5b376fd9c1727038102db2bc0e8ccd8b71cdc1c80e721647f34764b0aa4fd6d58b9e38c9675f234714f381f94be572b9b64b478e1 SHA512 2835b4740453bcc358363f9eaa0264706125b5e5f7a38802d5f280ccd777d4c760124ed3a635f17ecc2ae772767e9fa5d61093c40094358a0a96a726a23ff08e
+DIST mercury-20.01.1-gentoo-patchset-0.tar.gz 3943 BLAKE2B 0fd149c622715bf191182bd93e264096327d7869e30aaa10bb19b70bec5563520026e2561cc6607c62801ed00ed6b5907bbae4be997869b9facb2f9d65ec0c7a SHA512 d866b35b6df14645ef60ff25497f9bbf0c2caeae2145bc0aef2adea0e651379c673c1815c717f1a51457d93cc67e9ae3dafe5d9fce1d4734bf1673e4cfcbd367
 DIST mercury-srcdist-14.01.1.tar.gz 52658945 BLAKE2B 6497921a0227b9a6fbcbabdd309ef3325f32dda14fc4ddb443368385b89be4011d677a24b30b3702147d1b782fe2597760ad66dd34503aa6aebaf79707466529 SHA512 a128ef0fd4955abadea32019ec59297ffe32537415f32e9e948cbc1c3439bb40eb09de77569690fb18dd7d6969a2b1141b3ae5baeb87f2627eaa65ad93add92c
+DIST mercury-srcdist-20.01.1.tar.gz 47088335 BLAKE2B 1e3285dadc3748934e801b8ac0316d3005fbe24c20c9ceb694e9fc316d820fdb89c659107b25ee474fd6ac50d661dd029af9ca5082016a3b0827dd640a54a707 SHA512 24ad0bbecee46ab6ff669d63d64096b37a0d010bb44978a1785eee2701a8b30a83eab229af97cbbb18bca55b5e89be9ba74fe126d1d430da1e1e909366dc5b90
 DIST mercury-srcdist-20.01.tar.gz 47103868 BLAKE2B 68be786e925bdf94dcba6c6a2a746a384da345ee33250785d8d2b9281815694a4525cdd694c26f58051c097f2a897291e640e2139729ccede9bd2e472077d8c9 SHA512 90e36faa375603e596b2dd692363528120fda62ae6d2e2b119cf76de1656dae4028aff00858a4bff3fdfb9b2210ea17db0aa516ce4283604c46a5935dd2cd4b7
--- a/dev-lang/mercury/mercury-20.01.1.ebuild
+++ b/dev-lang/mercury/mercury-20.01.1.ebuild
@ -0,0 +1,201 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools elisp-common eutils flag-o-matic java-pkg-opt-2 multilib vcs-clean xdg-utils
+
+PATCHSET_VER="0"
+MY_P=${PN}-srcdist-${PV}
+
+DESCRIPTION="Mercury is a modern general-purpose logic/functional programming language"
+HOMEPAGE="http://www.mercurylang.org/index.html"
+SRC_URI="http://dl.mercurylang.org/release/${MY_P}.tar.gz
+	mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="debug doc emacs erlang examples java mono profile readline threads trail"
+
+DEPEND="net-libs/libnsl:0=
+	readline? ( sys-libs/readline:= )
+	erlang? ( dev-lang/erlang )
+	java? ( >=virtual/jdk-1.6:= )
+	mono? ( dev-lang/mono )
+	doc? ( sys-apps/texinfo )"
+
+RDEPEND="${DEPEND}
+	emacs? ( >=app-editors/emacs-23.1:* )"
+
+S="${WORKDIR}"/${MY_P}
+
+SITEFILE=50${PN}-gentoo.el
+
+src_prepare() {
+	if [[ -d "${WORKDIR}"/${PV} ]] ; then
+		eapply "${WORKDIR}"/${PV}
+	fi
+	eapply_user
+
+	AT_M4DIR=m4 eautoreconf
+
+	xdg_environment_reset
+}
+
+src_configure() {
+	strip-flags
+
+	local myconf
+	myconf="--libdir=/usr/$(get_libdir) \
+		$(use_enable mono csharp-grade) \
+		$(use_enable erlang erlang-grade) \
+		$(use_enable java java-grade) \
+		$(use_enable debug debug-grades) \
+		$(use_enable profile prof-grades) \
+		$(use_enable threads par-grades) \
+		$(use_enable trail trail-grades) \
+		$(use_with readline)"
+
+	econf ${myconf}
+}
+
+src_compile() {
+	# Prepare mmake flags
+	echo "EXTRA_CFLAGS  = ${CFLAGS}"  >> Mmake.params
+	echo "EXTRA_LD_LIBFLAGS = ${LDFLAGS}" >> Mmake.params
+	echo "EXTRA_MLFLAGS = --no-strip" >> Mmake.params
+
+	echo "EXTRA_LD_LIBFLAGS += -Wl,-soname=libgc.so" >> boehm_gc/Mmake.boehm_gc.params
+	echo "EXTRA_LD_LIBFLAGS += -Wl,-soname=libmer_rt.so" >> runtime/Mmake.runtime.params
+	echo "EXTRA_LD_LIBFLAGS += -Wl,-soname=libmer_std.so" >> library/Mmake.library.params
+
+	# Build Mercury using bootstrap grade
+	emake \
+		PARALLEL="'${MAKEOPTS}'" \
+		TEXI2DVI="" PDFTEX=""
+
+	# We can now patch .m Mercury compiler files since we
+	# have just built mercury_compiler.
+	if [[ -d "${WORKDIR}"/${PV}-mmc ]] ; then
+		eapply "${WORKDIR}"/${PV}-mmc
+	fi
+
+	# Rebuild Mercury compiler using the just built mercury_compiler
+	emake \
+		PARALLEL="'${MAKEOPTS}'" \
+		MERCURY_COMPILER="${S}"/compiler/mercury_compile \
+		TEXI2DVI="" PDFTEX=""
+
+	# The default Mercury grade may not be the same as the bootstrap
+	# grade. Since src_test() is run before src_install() we compile
+	# the default grade now
+	emake \
+		PARALLEL="'${MAKEOPTS}'" \
+		MERCURY_COMPILER="${S}"/compiler/mercury_compile \
+		TEXI2DVI="" PDFTEX="" \
+		default_grade
+}
+
+src_test() {
+	TEST_GRADE=$(scripts/ml --print-grade)
+	if [ -d "${S}"/install_grade_dir.${TEST_GRADE} ] ; then
+		TWS="${S}"/install_grade_dir.${TEST_GRADE}
+		cp runtime/mer_rt.init "${TWS}"/runtime/
+		cp mdbcomp/mer_mdbcomp.init "${TWS}"/mdbcomp/
+		cp browser/mer_browser.init "${TWS}"/browser/
+	else
+		TWS="${S}"
+	fi
+
+	cd "${S}"/tests || die
+	sed -e "s:@WORKSPACE@:${TWS}:" \
+		< WS_FLAGS.ws \
+		> WS_FLAGS \
+		|| die "sed WORKSPACE failed"
+	sed -e "s:@WORKSPACE@:${TWS}:" \
+		< .mgnuc_copts.ws \
+		> .mgnuc_copts \
+		|| die "sed WORKSPACE failed"
+	find . -mindepth 1 -type d -exec cp .mgnuc_opts  {} \;
+	find . -mindepth 1 -type d -exec cp .mgnuc_copts {} \;
+
+	# Mercury tests must be run in C locale since Mercury output is
+	# compared to hard-coded warnings/errors
+	LC_ALL="C" \
+	PATH="${TWS}"/scripts:"${TWS}"/util:"${S}"/slice:"${PATH}" \
+	TERM="" \
+	WORKSPACE="${TWS}" \
+	WORKSPACE_FLAGS=yes \
+	MERCURY_COMPILER="${TWS}"/compiler/mercury_compile \
+	MMAKE_DIR="${TWS}"/scripts \
+	MERCURY_SUPPRESS_STACK_TRACE=yes \
+	GRADE=${TEST_GRADE} \
+		mmake || die "mmake test failed"
+}
+
+src_install() {
+	emake \
+		PARALLEL="'${MAKEOPTS}'" \
+		MERCURY_COMPILER="${S}"/compiler/mercury_compile \
+		TEXI2DVI="" PDFTEX="" \
+		DESTDIR="${D}" \
+		INSTALL_ELISP_DIR="${D}/${SITELISP}"/${PN} \
+		install
+
+	if use java; then
+		keepdir /usr/$(get_libdir)/mercury/modules/java
+	fi
+
+	if use mono; then
+		keepdir /usr/$(get_libdir)/mercury/modules/csharp
+	fi
+
+	if use emacs; then
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}" \
+			|| die "elisp-site-file-install failed"
+	fi
+
+	dodoc \
+		BUGS HISTORY LIMITATIONS NEWS README README.Linux \
+		README.Linux-Alpha README.Linux-m68k README.Linux-PPC \
+		RELEASE_NOTES VERSION || die
+
+	if use erlang; then
+		dodoc README.Erlang
+	fi
+
+	if use java; then
+		dodoc README.Java
+	fi
+
+	if use mono; then
+		dodoc README.CSharp
+	fi
+
+	if use examples; then
+		docinto /usr/share/doc/${PF}/samples
+		dodoc samples/{*.m,README,Mmakefile}
+		dodoc -r samples/c_interface \
+			samples/diff \
+			samples/muz \
+			samples/rot13 \
+			samples/solutions \
+			samples/solver_types
+
+		if use java; then
+			dodoc -r samples/java_interface
+		fi
+
+		ecvs_clean "${D}"/usr/share/doc/${PF}/samples
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
--- a/dev-libs/libjcat/files/libjcat-0.1.0-use_right_python.patch
+++ b/dev-libs/libjcat/files/libjcat-0.1.0-use_right_python.patch
@ -0,0 +1,29 @@
+By default generate-version-script.py uses /usr/bin/python3, whatever
+version that may be - which causes problems if the default python3
+installation is one either built without XML support or not included
+in PYTHON_TARGETS of dev-python/setuptools. Make sure the script is
+invoked using the same interpreter as meson itself, as that one is
+already guaranteed to provide both 'xml' and 'pkg_resources'.
+
+--- a/libjcat/meson.build
+++ b/libjcat/meson.build
+@@ -129,6 +129,11 @@
+     install : true,
+   )
+ 
+  # Make sure generate-version-script.py is invoked by the same python as meson,
+  # as that one must already have both XML support and setuptools.
+  python = import('python')
+  python_interpreter = python.find_installation()
+
+   # Verify the map file is correct -- note we can't actually use the generated
+   # file for two reasons:
+   #
+@@ -141,6 +146,7 @@
+     input: jcat_gir[0],
+     output: 'jcat.map',
+     command: [
+      python_interpreter,
+       join_paths(meson.source_root(), 'contrib', 'generate-version-script.py'),
+       'LIBJCAT',
+       '@INPUT@',
--- a/dev-libs/libjcat/libjcat-0.1.0.ebuild
+++ b/dev-libs/libjcat/libjcat-0.1.0.ebuild
@ -33,6 +33,7 @@ RESTRICT="!test? ( test )"

 PATCHES=(
 	"${FILESDIR}"/${PN}-0.1.0-disable_installed_tests.patch
+	"${FILESDIR}"/${PN}-0.1.0-use_right_python.patch
 )

 src_prepare() {
--- a/dev-libs/ncnn/ncnn-20200226.ebuild
+++ b/dev-libs/ncnn/ncnn-20200226.ebuild
@ -17,7 +17,8 @@ IUSE=""

 DEPEND="
 	dev-util/glslang
-	dev-util/vulkan-headers"
+	dev-util/vulkan-headers
+	media-libs/vulkan-loader"

 RDEPEND="${DEPEND}"
 BDEPEND=""
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
--- a/dev-ruby/idn-ruby/idn-ruby-0.1.0.ebuild
+++ b/dev-ruby/idn-ruby/idn-ruby-0.1.0.ebuild
@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"

 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_EXTRADOC="CHANGES README"
--- a/dev-ruby/puppet_forge/Manifest
+++ b/dev-ruby/puppet_forge/Manifest
@ -1,5 +1,2 @@
-DIST puppet_forge-2.2.9.gem 772608 BLAKE2B 15cad2cc183688262b96a35af46324a3264b8a615fa414bddb6b55587ac30f4fdcc64ddaa0f18b66571bde1a1eb17339bf1fad1630f3a06b6c1575cdbf1c9140 SHA512 753ad4b95db25c1ad284ceb802b03db9724f2a1c1f4522f252428f8ae7c6771361b6a38d070c2ce989bec9538471529cdd92c925501a0f8f4f1bb5e6d8ef3733
-DIST puppet_forge-2.3.0.gem 773632 BLAKE2B 6024eed4c7b62c19c04d4f45a03dd40fa14bf074a1c44c14c766527bc3f4937bd9ac553df14b432834fd3bafa8f680d8b677ccfe6b366b954336888cb9f25aff SHA512 7b14b006562874524c7a5045ae44fc7c3ac932aa32beb3751a6c18e3498401dc22294a81386d2ee25d5f8618efaa425b51798daec6f12193916c76dd28aafe85
-DIST puppet_forge-2.3.1.gem 772608 BLAKE2B a1ceb23ebcd21e600404f5be296c1df5792f01262e5ac85544be49faa10366b25702bf6f957320ac259609bc4832a5946bcff8a5a1dece45b9cc3d6e74aeab06 SHA512 420cf5feb7e1a29a59f81cfcff807f94f889ae3f21a8d4243956f8139e8fdf86514f8a00e96e210a40e8f0bcdde53f06b8f9ca06231012c11b04a9b6cb322f44
 DIST puppet_forge-2.3.2.gem 772608 BLAKE2B edbb92cbed4ad040a9c819d2728c4fee5c2beb2fbf9120f778d0315bc15032f970873974fef3532adff57e44a8671b9027615517761f46b0d1e0954d50522d7f SHA512 00805aee55823dfb57cda03c1ed60e8e1db218ca7c633ec0c7d8459fdcc9d747609c0c426d5544f86f33485e546dd82b115a98fad12897ab087ff119e5cc08be
 DIST puppet_forge-2.3.3.gem 772608 BLAKE2B 1bba9ce824019cefbcd4e28625c99855f68bc4d752f069bf84ff86c0f768dc8b795eaa95b76e340e273079dc2882abff91a2b44d0a6f280f541637261357508e SHA512 8e29d35b7175430a50d2da0b07ef3a9bd274df97f292e24c12a0d267257ff123df5380c0ba8c7124be21b4f4f0b2a11af0923e9fb5751683392c6d11ed6bf0e0
--- a/dev-ruby/puppet_forge/puppet_forge-2.2.9-r1.ebuild
+++ b/dev-ruby/puppet_forge/puppet_forge-2.2.9-r1.ebuild
@ -1,45 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md"
-
-RUBY_FAKEGEM_EXTRAINSTALL=locales
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Tools to access Forge API information on Modules, Users, and Releases"
-HOMEPAGE="https://github.com/puppetlabs/forge-ruby"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend "
-	>=dev-ruby/faraday-0.9.0:0
-	>=dev-ruby/faraday_middleware-0.9.0:0
-	>=dev-ruby/gettext-setup-0.11:0
-	dev-ruby/minitar
-	=dev-ruby/semantic_puppet-1*
-"
-
-all_ruby_prepare() {
-	# Avoid integration and user specs since they all require network access
-	rm -rf spec/integration spec/unit/forge/v3/user_spec.rb || die
-
-	# Fix overly restrictive dependencies
-	sed -i \
-		-e '/faraday/ s/0.14.0/0.99.0/' \
-		-e '/faraday_middleware/ s/0.13.0/0.99.0/' \
-		${RUBY_FAKEGEM_GEMSPEC} || die
-
-	sed -i -e 's/git ls-files -z/find . -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
--- a/dev-ruby/puppet_forge/puppet_forge-2.3.0.ebuild
+++ b/dev-ruby/puppet_forge/puppet_forge-2.3.0.ebuild
@ -1,45 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md"
-
-RUBY_FAKEGEM_EXTRAINSTALL=locales
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Tools to access Forge API information on Modules, Users, and Releases"
-HOMEPAGE="https://github.com/puppetlabs/forge-ruby"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend "
-	>=dev-ruby/faraday-0.9.0:0
-	>=dev-ruby/faraday_middleware-0.9.0:0
-	>=dev-ruby/gettext-setup-0.11:0
-	dev-ruby/minitar
-	=dev-ruby/semantic_puppet-1*
-"
-
-all_ruby_prepare() {
-	# Avoid integration and user specs since they all require network access
-	rm -rf spec/integration spec/unit/forge/v3/user_spec.rb || die
-
-	# Fix overly restrictive dependencies
-	sed -i \
-		-e '/faraday/ s/0.14.0/0.99.0/' \
-		-e '/faraday_middleware/ s/0.13.0/0.99.0/' \
-		${RUBY_FAKEGEM_GEMSPEC} || die
-
-	sed -i -e 's/git ls-files -z/find . -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
--- a/dev-ruby/puppet_forge/puppet_forge-2.3.1.ebuild
+++ b/dev-ruby/puppet_forge/puppet_forge-2.3.1.ebuild
@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md"
-
-RUBY_FAKEGEM_EXTRAINSTALL=locales
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Tools to access Forge API information on Modules, Users, and Releases"
-HOMEPAGE="https://github.com/puppetlabs/forge-ruby"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend "
-	>=dev-ruby/faraday-0.9.0:0
-	>=dev-ruby/faraday_middleware-0.9.0:0
-	>=dev-ruby/gettext-setup-0.11:0
-	dev-ruby/minitar
-	=dev-ruby/semantic_puppet-1*
-"
-
-all_ruby_prepare() {
-	# Avoid integration and user specs since they all require network access
-	rm -rf spec/integration spec/unit/forge/v3/user_spec.rb || die
-
-	# Fix overly restrictive dependencies
-	sed -i \
-		-e '/faraday/ s/0.15.0/0.99.0/' \
-		-e '/faraday_middleware/ s/0.13.0/0.99.0/' \
-		${RUBY_FAKEGEM_GEMSPEC} || die
-
-	sed -i -e 's/git ls-files -z/find . -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
--- a/dev-ruby/shoulda-context/shoulda-context-1.2.2.ebuild
+++ b/dev-ruby/shoulda-context/shoulda-context-1.2.2.ebuild
@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=5

-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"

 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_EXTRADOC="CONTRIBUTING.md README.md"
--- a/dev-ruby/twitter-text/Manifest
+++ b/dev-ruby/twitter-text/Manifest
@ -1,3 +1,4 @@
 DIST twitter-text-1.14.7.gem 48128 BLAKE2B c80b9cb894438ca427ab3ba864362bd3b1b58a852c4720178fdbffef7d42b276a62d6c39d2163fa875101210a72cebbe2e4aad5c080631f07efb3657da2668b5 SHA512 98addbf8efe7b9f2685f00827194dbb255b31512e8aa5c9dab22ec08b95ccebbcf53790dfc983e71b0644c687b4db98c5d30f74f15b925377403b4d5cf6e5194
 DIST twitter-text-2.1.0.gem 54784 BLAKE2B e0ee791f63d43f8ff8d87f5b4cca337761efac24417702ba5cc0fb50db3b622ef86a2d4ca1ce753272668df825fd92ac561a2cc528ae6435976d830d1ac9a329 SHA512 ac23e05f13a008d733a9417d47e633838584b548a41741a28ca399e1548344b39081b0c6677b7be9df1feb6ffcc491718ddfb5cd55cffb63d7bb680f1431907c
 DIST twitter-text-3.0.0.gem 58880 BLAKE2B daf80ac931ee68a9f0f84ae13433169c70147dd738039b95268e01da59c61717f1df067685df5923bb799b728d788316c3bc7cf1da5b5dc209c485220e8bc8aa SHA512 2afd07636e1cfe140ff26e52ec8a4c23b6116f7166a73e1af1fec283aff7549c06ff46ed51fd178acddd607c1f9c82eff1eee7cb3ce81eeb78a73305e14120ad
+DIST twitter-text-3.1.0.gem 59392 BLAKE2B 91f906db8d4cc17086b7bc421f1730646756aec9e041166e18d816da4b680282f312743c52e412e6595d7565c2c7faf0dd18fea815f3bbc53afa675a33ac3c66 SHA512 b0d5a876bd9c1d4788378ebd5029bed51db6a0c3a7cd2c97433eab3ec3655d7bc427c3873364a368c0a10216871c7373e762cfd57c4bdd69800adc95869aa03a
--- a/dev-ruby/twitter-text/twitter-text-3.1.0.ebuild
+++ b/dev-ruby/twitter-text/twitter-text-3.1.0.ebuild
@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_EXTRAINSTALL="config"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Text handling for Twitter"
+HOMEPAGE="https://github.com/twitter/twitter-text"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "
+	dev-ruby/idn-ruby
+	=dev-ruby/unf-0.1*
+"
+
+ruby_add_bdepend "test? ( >=dev-ruby/multi_json-1.3
+	>=dev-ruby/nokogiri-1.8.0 )"
+
+all_ruby_prepare() {
+	#sed -i -e 's/2.14.0/2.14/' twitter-text.gemspec || die
+	sed -i -e '/simplecov/,/end/ s:^:#:' spec/spec_helper.rb || die
+}
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
--- a/dev-util/diffoscope/Manifest
+++ b/dev-util/diffoscope/Manifest
@ -1 +1,2 @@
 DIST diffoscope-137.tar.gz 1557283 BLAKE2B d4b59174eec5919ade87fa04878c469a87bb31407c35eac9a21b13b36fd7b15ca0cb5cdf38dd25c1e964db1987579c74b595b4fd38d2f3e5a028f64176f73202 SHA512 6faa0675cd203e3320071dbf60a14110cb3674984bce9edab40e28b17769cb847179973fe55e0f9a78a3d6bf903e259c432225ae31e7e4f60ece252ac9cac20c
+DIST diffoscope-138.tar.gz 1567753 BLAKE2B 078a61eea53e0d0a66a862ac2c86889ddb95ddb8ccdb2b58b6a8b7e9ab1a3d5550511f73e7187a0539a974f257db6da79ad02b96e179952663f11e50cef23f12 SHA512 7dbc80d9135aba48e4f83b968e39f26e39f701b1ac1e6aaa2d9a6e18f24c1387b49d46067d2b2f2a76421752a8ac06d070cf660afb4a88db79f19339b327c485
--- a/dev-util/diffoscope/diffoscope-138.ebuild
+++ b/dev-util/diffoscope/diffoscope-138.ebuild
@ -0,0 +1,67 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1
+
+DESCRIPTION="Will try to get to the bottom of what makes files or directories different"
+HOMEPAGE="https://diffoscope.org/ https://pypi.org/project/diffoscope/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file
+find gettext gif gpg gzip haskell hex imagemagick iso java llvm
+mono opendocument pascal pdf postscript R rpm sqlite squashfs
+ssh tar tcpdump xz zip zstd"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/python-magic[${PYTHON_USEDEP}]
+	dev-python/libarchive-c[${PYTHON_USEDEP}]
+	dev-python/distro[${PYTHON_USEDEP}]
+	acl? ( sys-apps/acl )
+	binutils? ( sys-devel/binutils )
+	bzip2? ( app-arch/bzip2 )
+	libcaca? ( media-libs/libcaca )
+	colord? ( x11-misc/colord )
+	cpio? ( app-arch/cpio )
+	diff? ( sys-apps/diffutils )
+	docx? ( app-text/docx2txt )
+	dtc? ( sys-apps/dtc )
+	e2fsprogs? ( sys-fs/e2fsprogs )
+	file? ( sys-apps/file )
+	find? ( sys-apps/findutils )
+	gettext? ( sys-devel/gettext )
+	gif? ( media-libs/giflib )
+	gpg? ( app-crypt/gnupg )
+	gzip? ( app-arch/gzip )
+	haskell? ( dev-lang/ghc )
+	hex? ( app-editors/vim-core )
+	imagemagick? ( media-gfx/imagemagick )
+	iso? ( virtual/cdrtools )
+	java? ( virtual/jdk )
+	llvm? ( sys-devel/llvm )
+	mono? ( dev-lang/mono )
+	opendocument? ( app-text/odt2txt )
+	pascal? ( dev-lang/fpc )
+	pdf? (
+		app-text/pdftk
+		app-text/poppler
+		dev-python/PyPDF2[${PYTHON_USEDEP}]
+	)
+	postscript? ( app-text/ghostscript-gpl )
+	R? ( dev-lang/R )
+	rpm? ( app-arch/rpm )
+	sqlite? ( dev-db/sqlite:3 )
+	squashfs? ( sys-fs/squashfs-tools )
+	ssh? ( net-misc/openssh )
+	tar? ( app-arch/tar )
+	tcpdump? ( net-analyzer/tcpdump )
+	xz? ( app-arch/xz-utils )
+	zip? ( app-arch/unzip )
+	zstd? ( app-arch/zstd )
+"
--- a/eclass/Manifest.gz
+++ b/eclass/Manifest.gz
--- a/eclass/waf-utils.eclass
+++ b/eclass/waf-utils.eclass
@ -69,19 +69,23 @@ waf-utils_src_configure() {

 	[[ ${fail} ]] && die "Invalid use of waf-utils.eclass"

-	local libdir=()
-
 	# @ECLASS-VARIABLE: WAF_BINARY
 	# @DESCRIPTION:
 	# Eclass can use different waf executable. Usually it is located in "${S}/waf".
 	: ${WAF_BINARY:="${S}/waf"}

-	# @ECLASS-VARIABLE: NO_WAF_LIBDIR
-	# @DEFAULT_UNSET
-	# @DESCRIPTION:
-	# Variable specifying that you don't want to set the libdir for waf script.
-	# Some scripts does not allow setting it at all and die if they find it.
-	[[ -z ${NO_WAF_LIBDIR} ]] && libdir=(--libdir="${EPREFIX}/usr/$(get_libdir)")
+	local conf_args=()
+
+	local waf_help=$("${WAF_BINARY}" --help 2>/dev/null)
+	if [[ ${waf_help} == *--docdir* ]]; then
+		conf_args+=( --docdir="${EPREFIX}"/usr/share/doc/${PF} )
+	fi
+	if [[ ${waf_help} == *--htmldir* ]]; then
+		conf_args+=( --htmldir="${EPREFIX}"/usr/share/doc/${PF}/html )
+	fi
+	if [[ ${waf_help} == *--libdir* ]]; then
+		conf_args+=( --libdir="${EPREFIX}/usr/$(get_libdir)" )
+	fi

 	tc-export AR CC CPP CXX RANLIB

@ -91,7 +95,7 @@ waf-utils_src_configure() {
 		PKGCONFIG="$(tc-getPKG_CONFIG)"
 		"${WAF_BINARY}"
 		"--prefix=${EPREFIX}/usr"
-		"${libdir[@]}"
+		"${conf_args[@]}"
 		"${@}"
 		configure
 	)
--- a/games-fps/Manifest.gz
+++ b/games-fps/Manifest.gz
--- a/games-fps/ut2003/Manifest
+++ b/games-fps/ut2003/Manifest
@ -1 +1 @@
-DIST ut2003lnx_patch2225.tar.tar 10039316 BLAKE2B a15398eb2b66606f3e7b1382b01fda6b5d38982bc3fe7065184232eb18a8c85792147187951e810ecb6af738b5f5a15a2e56832d7e91fb21ab8956d699817f76 SHA512 3c44b6254b2b778bf2aca826c710f51db4ec0687c21f1c98e1070f3a9ad7e1a809e741a5b94e20a44c56c60a8b1e4a049788ff5f2a4d581c4eedf3dbbc0da86d
+DIST ut2003lnx_patch2225.tar.bz2 10039316 BLAKE2B a15398eb2b66606f3e7b1382b01fda6b5d38982bc3fe7065184232eb18a8c85792147187951e810ecb6af738b5f5a15a2e56832d7e91fb21ab8956d699817f76 SHA512 3c44b6254b2b778bf2aca826c710f51db4ec0687c21f1c98e1070f3a9ad7e1a809e741a5b94e20a44c56c60a8b1e4a049788ff5f2a4d581c4eedf3dbbc0da86d
--- a/games-fps/ut2003/files/ut2003-ded.confd
+++ b/games-fps/ut2003/files/ut2003-ded.confd
@ -0,0 +1,6 @@
+# User and group the server should run as.
+ut2003_ded_user="nobody"
+ut2003_ded_group="nobody"
+
+# Any extra options you want to pass to the server.
+ut2003_ded_opts="DM-Antalus"
--- a/games-fps/ut2003/files/ut2003-ded.initd
+++ b/games-fps/ut2003/files/ut2003-ded.initd
@ -0,0 +1,13 @@
+#!/sbin/openrc-run
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+pidfile="/var/run/${RC_SVCNAME}.pid"
+command_background="true"
+command_user="${ut2003_ded_user}:${ut2003_ded_group}"
+command="ut2003-ded"
+command_args="${ut2003_ded_opts}"
+
+depend() {
+	need net
+}
--- a/games-fps/ut2003/ut2003-2225-r4.ebuild
+++ b/games-fps/ut2003/ut2003-2225-r4.ebuild
@ -1,99 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils games
-
-DESCRIPTION="Sequel to the 1999 Game of the Year multi-player first-person shooter"
-HOMEPAGE="http://www.unrealtournament2003.com/"
-SRC_URI="ftp://ftp.infogrames.net/misc/ut2003/ut2003lnx_patch2225.tar.tar"
-
-LICENSE="ut2003"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="dedicated"
-RESTRICT="bindist strip"
-
-RDEPEND="
-	games-fps/ut2003-data
-	dedicated? ( games-server/ut2003-ded )
-	!dedicated? ( virtual/opengl[abi_x86_32(-)] )
-"
-DEPEND=""
-
-S=${WORKDIR}
-
-dir="${GAMES_PREFIX_OPT}/${PN}"
-Ddir="${D}/${dir}"
-
-src_unpack() {
-	unpack ut2003lnx_patch${PV}.tar.tar
-}
-
-src_install() {
-	insinto "${dir}"
-
-	games_make_wrapper ut2003 ./ut2003 "${dir}" "${dir}"
-	make_desktop_entry ut2003 "Unreal Tournament 2003" ut2003
-
-	# TODO: change this to use doexe/doins
-	# this brings our install up to the newest version
-	cp -r "${S}"/ut2003-lnx-2225/* "${Ddir}" || die
-
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-
-	# here is where we check for the existence of a cdkey...
-	# if we don't find one, we ask the user for it
-	if [[ -f "${dir}"/System/cdkey ]] ; then
-		elog "A cdkey file is already present in ${dir}/System"
-	else
-		ewarn "You MUST run this before playing the game:"
-		ewarn "emerge --config =${CATEGORY}/${PF}"
-		ewarn "That way you can (re)enter your cdkey."
-	fi
-	elog
-	elog "To play the game run:"
-	elog " ut2003"
-	ewarn
-	ewarn "If you are not installing for the first time and you plan on running"
-	ewarn "a server, you will probably need to edit your"
-	ewarn "~/.ut2003/System/UT2003.ini file and add a line that says"
-	ewarn "AccessControlClass=crashfix.iaccesscontrolini to your"
-	ewarn "[Engine.GameInfo] section to close a security issue."
-}
-
-pkg_postrm() {
-	ewarn "This package leaves a cdkey file in ${dir}/System that you need"
-	ewarn "to remove to completely get rid of this game's files."
-}
-
-pkg_config() {
-	ewarn "Your CD key is NOT checked for validity here."
-	ewarn "  Make sure you type it in correctly."
-	eerror "If you CTRL+C out of this, the game will not run!"
-	echo
-	einfo "CD key format is: XXXX-XXXX-XXXX-XXXX"
-	while true ; do
-		einfo "Please enter your CD key:"
-		read CDKEY1
-		einfo "Please re-enter your CD key:"
-		read CDKEY2
-		if [[ "${CDKEY1}" == "" ]] ; then
-			echo "You entered a blank CD key.  Try again."
-		else
-			if [[ "${CDKEY1}" == "${CDKEY2}" ]] ; then
-				echo "${CDKEY1}" | tr a-z A-Z > ${dir}/System/cdkey
-				einfo "Thank you!"
-				chown games:games "${dir}"/System/cdkey
-				break
-			else
-				eerror "Your CD key entries do not match.  Try again."
-			fi
-		fi
-	done
-}
--- a/games-fps/ut2003/ut2003-2225-r5.ebuild
+++ b/games-fps/ut2003/ut2003-2225-r5.ebuild
@ -0,0 +1,98 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop eutils
+
+DESCRIPTION="Sequel to the 1999 Game of the Year multi-player first-person shooter"
+HOMEPAGE="https://en.wikipedia.org/wiki/Unreal_Tournament_2003"
+SRC_URI="https://ftp.snt.utwente.nl/pub/games/UT2003/Patches/Linux/${PN}lnx_patch${PV}.tar.bz2"
+
+LICENSE="ut2003"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="dedicated"
+RESTRICT="bindist strip"
+
+RDEPEND="
+	!games-server/ut2003-ded
+	games-fps/ut2003-data
+	media-libs/libsdl[abi_x86_32]
+	sys-libs/glibc
+	virtual/opengl[abi_x86_32]
+"
+
+BDEPEND="app-admin/chrpath"
+
+S="${WORKDIR}/${PN}-lnx-${PV}"
+DIR="/opt/${PN}"
+
+QA_PREBUILT="*"
+
+src_prepare() {
+	default
+	chrpath -d System/{{ucc,${PN}}-bin,*.so} || die
+}
+
+src_install() {
+	insinto "${DIR}"
+	doins -r .
+	fperms +x "${DIR}"/System/{ucc,${PN}}-bin
+
+	make_wrapper ${PN} ./${PN}-bin "${DIR}"/System "${DIR}"/System
+	make_wrapper ${PN}-ded "./ucc-bin server" "${DIR}"/System "${DIR}"/System
+
+	make_desktop_entry ${PN} "Unreal Tournament 2003" applications-games
+
+	newconfd "${FILESDIR}"/${PN}-ded.confd ${PN}-ded
+	newinitd "${FILESDIR}"/${PN}-ded.initd ${PN}-ded
+}
+
+pkg_postinst() {
+	# Here is where we check for the existence of a cdkey.
+	# If we don't find one, we ask the user for it.
+	if [[ -f ${EROOT}${DIR}/System/cdkey ]] ; then
+		einfo "A cdkey file is already present in ${EPREFIX}${DIR}/System"
+	else
+		ewarn "You MUST run this before playing the game:"
+		ewarn "emerge --config =${CATEGORY}/${PF}"
+		ewarn "That way you can (re)enter your cdkey."
+	fi
+	ewarn
+	ewarn "If you are not installing for the first time and you plan on running"
+	ewarn "a server, you will probably need to edit your"
+	ewarn "~/.ut2003/System/UT2003.ini file and add a line that says"
+	ewarn "AccessControlClass=crashfix.iaccesscontrolini to your"
+	ewarn "[Engine.GameInfo] section to close a security issue."
+}
+
+pkg_postrm() {
+	ewarn "This package leaves a cdkey file in ${EROOT}${DIR}/System that you need"
+	ewarn "to remove to completely get rid of this game's files."
+}
+
+pkg_config() {
+	ewarn "Your CD key is NOT checked for validity here so"
+	ewarn "make sure you type it in correctly."
+	ewarn "If you CTRL+C out of this, the game will not run!"
+	echo
+	einfo "CD key format is: XXXX-XXXX-XXXX-XXXX"
+	while true ; do
+		einfo "Please enter your CD key:"
+		read CDKEY1
+		einfo "Please re-enter your CD key:"
+		read CDKEY2
+		if [[ -z ${CDKEY1} || -z ${CDKEY2} ]] ; then
+			echo "You entered a blank CD key. Try again."
+		else
+			if [[ ${CDKEY1} == ${CDKEY2} ]] ; then
+				echo "${CDKEY1^^}" > "${EROOT}${DIR}"/System/cdkey || die
+				einfo "Thank you!"
+				break
+			else
+				eerror "Your CD key entries do not match. Try again."
+			fi
+		fi
+	done
+}
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
--- a/media-libs/waffle/Manifest
+++ b/media-libs/waffle/Manifest
@ -1 +1,2 @@
 DIST waffle-1.6.0.tar.xz 224400 BLAKE2B 458add99b346bd75dc757243b9e7db6ac269fb2c1e488333d921c640e10efd182e51e8a5e0312d334593033936adf047fc2339d21e675654d89d66edfb8922b3 SHA512 c8796ab8adf968df2c5c88e2941c83955fe41e87eb2b75b6a5cc61b0d0c06eaa44df2f255f573a51816036dc8bc3ec63f3fb51ccfb7efbfe83cdd50b3f1be13f
+DIST waffle-1.6.1.tar.xz 227152 BLAKE2B 360782636809fa3716589e5c3f2d365ce2a916f3da4dde7ec271ce7e142f94160388f9ae12f1ef0ea79890f45eba9d6ef536e12861ee44cbd88282e3c4f01f52 SHA512 1d5839d517d1067efea163ffd76c05f32f30c3ef0f42dfa1b3a9830d4377829cce368d28889ec5a3be639a5e81db2fb4833d98eafc5ffa5e27578ff11977258f
--- a/media-libs/waffle/waffle-1.6.1.ebuild
+++ b/media-libs/waffle/waffle-1.6.1.ebuild
@ -0,0 +1,64 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/${PN}"
+	GIT_ECLASS="git-r3"
+else
+	SRC_URI="https://gitlab.freedesktop.org/mesa/${PN}/-/raw/website/files/release/${P}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+fi
+inherit meson multilib-minimal ${GIT_ECLASS}
+
+DESCRIPTION="Library that allows selection of GL API and of window system at runtime"
+HOMEPAGE="http://www.waffle-gl.org/ https://gitlab.freedesktop.org/mesa/waffle"
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="doc +egl +gbm wayland X"
+RESTRICT="test" # gl_basic tests don't work when run from portage
+
+RDEPEND="
+	>=media-libs/mesa-9.1.6[egl?,gbm?,${MULTILIB_USEDEP}]
+	>=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
+	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+	>=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
+	gbm? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP}] )
+	wayland? ( >=dev-libs/wayland-1.10[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	>=x11-base/xcb-proto-1.8-r3[${MULTILIB_USEDEP}]
+"
+BDEPEND="
+	dev-libs/libxslt
+	app-text/docbook-xml-dtd:4.2
+"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/wflinfo$(get_exeext)
+)
+
+multilib_src_configure() {
+	local emesonargs=(
+		$(meson_feature X glx)
+		$(meson_feature wayland)
+		$(meson_feature X x11_egl)
+		$(meson_feature gbm)
+		$(meson_feature egl surfaceless_egl)
+		-Dbuild-manpages=true
+		-Dbuild-tests=false
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_install() {
+	meson_src_install
+
+	! use doc && rm -rf "${D}"/usr/share/doc/waffle1
+}
--- a/media-libs/waffle/waffle-9999.ebuild
+++ b/media-libs/waffle/waffle-9999.ebuild
@ -7,7 +7,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/${PN}"
 	GIT_ECLASS="git-r3"
 else
-	SRC_URI="http://www.waffle-gl.org/files/release/${P}/${P}.tar.xz"
+	SRC_URI="https://gitlab.freedesktop.org/mesa/${PN}/-/raw/website/files/release/${P}/${P}.tar.xz"
 	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
 fi
 inherit meson multilib-minimal ${GIT_ECLASS}
@ -17,7 +17,7 @@ HOMEPAGE="http://www.waffle-gl.org/ https://gitlab.freedesktop.org/mesa/waffle"

 LICENSE="BSD-2"
 SLOT="0"
-IUSE="doc egl gbm wayland X"
+IUSE="doc +egl +gbm wayland X"
 RESTRICT="test" # gl_basic tests don't work when run from portage

 RDEPEND="
@ -26,25 +26,20 @@ RDEPEND="
 	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
 	>=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
 	gbm? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP}] )
-	wayland? ( >=dev-libs/wayland-1.0.6[${MULTILIB_USEDEP}] )
+	wayland? ( >=dev-libs/wayland-1.10[${MULTILIB_USEDEP}] )
 "
 DEPEND="${RDEPEND}
 	>=x11-base/xcb-proto-1.8-r3[${MULTILIB_USEDEP}]
-	doc? (
-		dev-libs/libxslt
-		app-text/docbook-xml-dtd:4.2
-	)
+"
+BDEPEND="
+	dev-libs/libxslt
+	app-text/docbook-xml-dtd:4.2
 "

 MULTILIB_CHOST_TOOLS=(
 	/usr/bin/wflinfo$(get_exeext)
 )

-src_unpack() {
-	default
-	[[ $PV = 9999* ]] && git-r3_src_unpack
-}
-
 multilib_src_configure() {
 	local emesonargs=(
 		$(meson_feature X glx)
@ -52,7 +47,7 @@ multilib_src_configure() {
 		$(meson_feature X x11_egl)
 		$(meson_feature gbm)
 		$(meson_feature egl surfaceless_egl)
-		$(meson_use doc build-manpages)
+		-Dbuild-manpages=true
 		-Dbuild-tests=false
 	)
 	meson_src_configure
@ -62,12 +57,8 @@ multilib_src_compile() {
 	meson_src_compile
 }

-multilib_src_test() {
-	meson_src_test
-}
-
 multilib_src_install() {
 	meson_src_install

-	rm -rf "${D}"/usr/share/doc/waffle1
+	! use doc && rm -rf "${D}"/usr/share/doc/waffle1
 }
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
--- a/media-sound/pulseaudio-modules-bt/metadata.xml
+++ b/media-sound/pulseaudio-modules-bt/metadata.xml
@ -1,10 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>zx2c4@gentoo.org</email>
-</maintainer>
-<maintainer type="person">
-	<email>pacho@gentoo.org</email>
-</maintainer>
+	<maintainer type="person">
+		<email>zx2c4@gentoo.org</email>
+	</maintainer>
+	<maintainer type="person">
+		<email>pacho@gentoo.org</email>
+	</maintainer>
+	<use>
+		<flag name="fdk">
+		AAC encoding support using media-libs/fdk-aac
+		</flag>
+		<flag name="ffmpeg">
+		APTX, APTX-HD encoding support
+		</flag>
+		<flag name="ldac">
+		LDAC encoding support, using media-libs/libldac
+		</flag>
+		<flag name="native-headset">
+		Build with native HSP (Headset Profile) headset for bluez 5
+		</flag>
+		<flag name="ofono-headset">
+		Build with oFono HFP (Hands Free Profile) headset for bluez 5, requires net-misc/ofono.
+		</flag>
+	</use>
 </pkgmetadata>
--- a/media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-1.3-r1.ebuild
+++ b/media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-1.3-r1.ebuild
@ -16,16 +16,16 @@ SRC_URI="
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE=""
+IUSE="fdk +ffmpeg +ldac +native-headset ofono-headset"

 DEPEND="
-	media-libs/fdk-aac:0=
-	virtual/ffmpeg
+	fdk? ( media-libs/fdk-aac:0= )
+	ffmpeg? ( virtual/ffmpeg )
 	media-libs/sbc
-	media-libs/libldac
+	ldac? ( media-libs/libldac )
 	>=net-wireless/bluez-5
 	>=sys-apps/dbus-1.0.0
-	>=net-misc/ofono-1.13
+	ofono-headset? ( >=net-misc/ofono-1.13 )
 	>=media-sound/pulseaudio-${PULSE_VER}[-bluetooth]
 "
 # Ordinarily media-libs/libldac should be in DEPEND too, but for now upstream repo is using a ldac submodule instead.
@ -53,6 +53,18 @@ load-module module-bluetooth-discover
 .endif
 "

+src_configure() {
+	local mycmakeargs=(
+		-DCODEC_AAC_FDK=$(usex fdk "ON" "OFF")
+		-DCODEC_APTX_FF=$(usex ffmpeg "ON" "OFF")
+		-DCODEC_APTX_HD_FF=$(usex ffmpeg "ON" "OFF")
+		-DCODEC_LDAC=$(usex ldac "ON" "OFF")
+		-DNATIVE_HEADSET=$(usex native-headset "ON" "OFF")
+		-DOFONO_HEADSET=$(usex ofono-headset "ON" "OFF")
+	)
+	cmake-utils_src_configure
+}
+
 src_prepare() {
 	cmake-utils_src_prepare

--- a/media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-9999.ebuild
+++ b/media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-9999.ebuild
@ -17,16 +17,16 @@ EGIT_OVERRIDE_COMMIT_PULSEAUDIO_PULSEAUDIO="v13.0"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS=""
-IUSE=""
+IUSE="fdk +ffmpeg +ldac +native-headset ofono-headset"

 DEPEND="
-	media-libs/fdk-aac:0=
-	virtual/ffmpeg
+	fdk? ( media-libs/fdk-aac:0= )
+	ffmpeg? ( virtual/ffmpeg )
 	media-libs/sbc
-	media-libs/libldac
+	ldac? ( media-libs/libldac )
 	>=net-wireless/bluez-5
 	>=sys-apps/dbus-1.0.0
-	>=net-misc/ofono-1.13
+	ofono-headset? ( >=net-misc/ofono-1.13 )
 	>=media-sound/pulseaudio-13[-bluetooth]
 "
 # Ordinarily media-libs/libldac should be in DEPEND too, but for now upstream repo is using a ldac submodule instead.
@ -55,6 +55,18 @@ load-module module-bluetooth-discover
 .endif
 "

+src_configure() {
+	local mycmakeargs=(
+		-DCODEC_AAC_FDK=$(usex fdk "ON" "OFF")
+		-DCODEC_APTX_FF=$(usex ffmpeg "ON" "OFF")
+		-DCODEC_APTX_HD_FF=$(usex ffmpeg "ON" "OFF")
+		-DCODEC_LDAC=$(usex ldac "ON" "OFF")
+		-DNATIVE_HEADSET=$(usex native-headset "ON" "OFF")
+		-DOFONO_HEADSET=$(usex ofono-headset "ON" "OFF")
+	)
+	cmake-utils_src_configure
+}
+
 src_install() {
 	cmake-utils_src_install
 	readme.gentoo_create_doc
--- a/media-sound/yoshimi/Manifest
+++ b/media-sound/yoshimi/Manifest
@ -1 +1 @@
-DIST yoshimi-1.5.10.2.tar.gz 9668476 BLAKE2B 1b443a51e952123abaf54b992902113533461064f2fc99032ac89f28a25ba4687176a97013ea118283e8ca2b7d92f44c105380e3d6cecb66560db7a0a8ef6532 SHA512 a39ba123f304e43d70833648ce224733794cb43c160fd2e6cf29bb4a782bea355c4bbfa1c33bf20c98a8c1f5d049788154aaf906a3daa56f288719a0b019139c
+DIST yoshimi-1.7.0.1.tar.gz 9987526 BLAKE2B e1793b0515fce39a62288f61fda0028c1683080c276b451f2cc67edd617ed2d25d408d3571ac56e8a7d6a4fd537719ba517b4faef969810520fc8af3aee013de SHA512 d403ca3f54a0c8eb27a1f4ea3bf90ab0fd8041b864259c94b0970b24b50b79fc84ea623af2981a1b00e65ebdd3f9ceeb0b5f04c64f62e5694aa55b31bb8390ce
--- a/media-sound/yoshimi/metadata.xml
+++ b/media-sound/yoshimi/metadata.xml
@ -1,6 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>denis7774@gmail.com</email>
+		<name>Reva Denis aka RarogCmex</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<maintainer type="project">
 		<email>sound@gentoo.org</email>
 		<name>Gentoo Sound project</name>
@ -11,4 +19,24 @@
 	<upstream>
 		<remote-id type="github">Yoshimi/yoshimi</remote-id>
 	</upstream>
+	<longdescription>
+	Yoshimi is a software audio synthesizer, originally forked from ZynAddSubFX
+	Features
+	Three separate engines
+	each with distinctive characteristics, can be used together or individually
+	Sixteen engine kits for the ultimate in multi-layering of engines, or for synthesized drum kits 
+	Vector Control
+	manage up to four independent sounds on any channel with faders or an X/Y midi joystick
+	Solo
+	step through up to 16 sounds seamlessly while playing in real time (including vector sounds)
+	Microtonal Tuning
+	Scala-compatible scales and keymaps
+	Extensive Midi-Learn
+	capture almost all internal controls and many switches with ordinary 7-bit values, or NRPNs, or even 7-bit NRPNs, then edit the responses
+	Command Line Access
+	headless operation and high accessibility, for those with sight- or motor control issues
+	Rich variations of tone and timbre
+	Yoshimi provides the means to ensure no two notes are ever identical - just like in the real world.
+	And much more...
+	</longdescription>
 </pkgmetadata>
--- a/media-sound/yoshimi/yoshimi-1.5.10.2.ebuild
+++ b/media-sound/yoshimi/yoshimi-1.5.10.2.ebuild
@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7

-inherit cmake xdg
+inherit cmake xdg flag-o-matic

 DESCRIPTION="Software synthesizer based on ZynAddSubFX"
 HOMEPAGE="https://yoshimi.github.io/"
@ -17,7 +17,7 @@ IUSE="+lv2"
 BDEPEND="virtual/pkgconfig"
 DEPEND="
 	>=dev-libs/mxml-2.5
-	>=media-libs/alsa-lib-1.0.17
+	media-libs/alsa-lib
 	media-libs/fontconfig
 	media-libs/libsndfile
 	sci-libs/fftw:3.0=
@ -33,19 +33,19 @@ RDEPEND="${DEPEND}"

 CMAKE_USE_DIR="${WORKDIR}/${P}/src"

-PATCHES=( "${FILESDIR}"/${P}-cxxflags.patch )
-
 DOCS=( Changelog README.txt )

 src_prepare() {
 	cmake_src_prepare
-	# respect doc dir
-	sed -e "s#/doc/yoshimi#/doc/${PF}#" -i src/CMakeLists.txt || die
+	append-cxxflags -lpthread
+	append-cppflags -lpthread
 }

 src_configure() {
-	local mycmakeargs=(
-		-DLV2Plugin=$(usex lv2)
-	)
+	local mycmakeargs=( -DLV2Plugin=$(usex lv2) )
 	cmake_src_configure
 }
+src_install() {
+	cmake_src_install
+	mv "${D}"/usr/share/doc/yoshimi "${D}"/usr/share/doc/${P}
+}
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@ -1 +1 @@
-Tue, 31 Mar 2020 20:08:59 +0000
+Wed, 01 Apr 2020 11:08:59 +0000
--- a/Show More
+++ b/Show More
				`@ -0,0 +1 @@`
				`DIST p1_acme-1.0.5.tar.gz 220724 BLAKE2B 7f236f9e66dc982342c15c46ebe2a391f72384710b19e1007d1e9ff679a9701190650853b8e67c3a63abba5e6a4107ed921fdc25f5cce984a4333fab98449f37 SHA512 e21907c18311b98cc865cddd155291fae09f739b5429a42810ba93fae77abe3f4e3ecaf9accf0d42d38e21bb823987dea0c3175ea1b7f20b171afa06a932f9e1`