279 changed files with 3808 additions and 3617 deletions
--- a/.dir-locals.el
+++ b/.dir-locals.el
@ -1,4 +0,0 @@
-;;; Directory Local Variables
-;;; For more information see (info "(emacs) Directory Variables")
-
-((nil . ((bug-reference-url-format . "https://bugs.gentoo.org/%s"))))
--- a/.drone.yml
+++ b/.drone.yml
@ -1,31 +1,12 @@
 kind: pipeline
-type: docker
-name: check all packages
-
-volumes:
- name: guru
-  temp: {}
+name: check

 steps:
- name: clone ::guru
-  image: docker:git
-  volumes:
-  - name: guru
-    path: /drone/guru
-  commands:
-  - git clone https://github.com/gentoo-mirror/guru.git /drone/guru
-
- name: pkgcheck
-  image: tastytea/pkgcheck
+- name: repoman
+  image: chaoslab/repoman
  pull: always
-  volumes:
-  - name: guru
-    path: /drone/guru
  commands:
-  - echo -e '[guru]\nlocation = /drone/guru' > /etc/portage/repos.conf/guru.conf
-  - pkgcheck --verbose scan --net
-    --checks='-ImlateCheck,-RedundantVersionCheck'
-    --keywords='-NonsolvableDepsInDev'
+  - repoman full --include-dev --xmlparse

 - name: notify
  image: drillster/drone-email
@ -33,7 +14,7 @@ steps:
  when:
    status: [ changed, failure ]
  settings:
-    host: mail.tzend.de
+    host: cryptoparty-celle.de
    from: drone@tzend.de
    username:
      from_secret: email_username
--- a/.editorconfig
+++ b/.editorconfig
@ -1,16 +0,0 @@
-# Configuration file for EditorConfig.
-# More information is available under <https://editorconfig.org/>.
-
-root = true
-
-[*]
-indent_style = tab
-indent_size = tab
-tab_width = 4
-end_of_line = lf
-charset = utf-8
-trim_trailing_whitespace = true
-insert_final_newline = true
-
-[*.yml]
-indent_style = space
--- a/.gitignore
+++ b/.gitignore
@ -1 +0,0 @@
-!/.dir-locals.el
--- a/.shellcheckrc
+++ b/.shellcheckrc
@ -1,13 +0,0 @@
-shell=bash
-
-# This disables some warnings for stuff that is normal in ebuilds. Less false
-# positives, but also less right positives.
-
-disable=SC2148          # missing shebang
-disable=SC2034          # unused variable
-disable=SC2115          # empty variable in path
-disable=SC2086,SC2206   # quote variables
-disable=SC2046          # quote $(foo)
-disable=SC2207          # Quote in arrays
-
-# vim: set ts=4 sw=4 et tw=80 ft=bash:
--- a/README.adoc
+++ b/README.adoc
@ -1,55 +0,0 @@
-= Portage repository “tastytea”
-:uri-portage: https://wiki.gentoo.org/wiki/Project:Portage
-:uri-gentoo: https://gentoo.org/
-:uri-eselect-repository: https://wiki.gentoo.org/wiki/Eselect/Repository
-:uri-layman: https://wiki.gentoo.org/wiki/Layman
-:uri-pgp-key: https://tastytea.de/tastytea.asc
-:uri-guru: https://wiki.gentoo.org/wiki/Project:GURU
-
-This is an unofficial repository for link:{uri-portage}[Portage],
-link:{uri-gentoo}[Gentoo]'s package manager. It depends on the
-link:{uri-guru}[GURU] repository.
-
-All ebuilds are marked as testing. All live-ebuilds have no keywords. I
-will delete ebuilds I no longer use.
-
-NOTE: Some ebuilds are a bit hacky, use at your own risk. 😊
-
-== Add this repository
-
-=== Using link:{uri-eselect-repository}[eselect-repository]
-
-[source,shell]
----
-eselect repository enable tastytea
----
-
-=== Using link:{uri-layman}[layman]
-
-[source,shell]
----
-layman -fa tastytea
----
-
-== Signing keys
-
-I use SSH to sign commits. Before 2022-01-19, I used PGP.
-
-Fingerprint: `SHA256:FBkvrOlhq5use1XEttyUGT4bUTDVA1ar9SgIc9P03cM`
-
-Public key: `ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPp7WPSOAZBNPuZ3LVlbE2KiOIxlVW4PGAHIx0b7EJKH`
-
-=== PGP
-
-Fingerprint: `D5B4 C43B 48A8 79F6 3529  36E6 5934 6E0E A35C 67E5`
-
-Public key: link:{uri-pgp-key}[]
-
-[source,shell]
----
-gpg --locate-keys tastytea@tastytea.de
----
-
-== Contact
-
-See https://tastytea.de/[].
--- a/README.md
+++ b/README.md
@ -0,0 +1,34 @@
+# Portage repository "tastytea"
+
+This is an unofficial repository for
+[Portage](https://wiki.gentoo.org/wiki/Project:Portage),
+[Gentoo](https://gentoo.org/)'s package manager.
+
+All ebuilds are marked as testing. All live-ebuilds have no keywords. I will
+delete ebuilds I no longer use.
+
+## Add this repository
+
+### Using [eselect-repository](https://wiki.gentoo.org/wiki/Eselect/Repository)
+
+```BASH
+eselect repository enable tastytea
+```
+
+### Using [layman](https://wiki.gentoo.org/wiki/Layman)
+
+```BASH
+layman -fa tastytea
+```
+
+## PGP key
+
+I use PGP to sign commits and manifests.
+
+Fingerprint: `D5B4 C43B 48A8 79F6 3529  36E6 5934 6E0E A35C 67E5`
+
+Public key: https://tastytea.de/tastytea.asc
+
+## Contact
+
+See https://tastytea.de/
--- a/acct-group/gotify/gotify-0.ebuild
+++ b/acct-group/gotify/gotify-0.ebuild
@ -1,8 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-ACCT_GROUP_ID=-1
--- a/acct-group/misskey/misskey-0.ebuild
+++ b/acct-group/misskey/misskey-0.ebuild
@ -1,11 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-DESCRIPTION="Group for Misskey"
-KEYWORDS="~amd64"
-
-ACCT_GROUP_ID=-1
--- a/acct-group/navidrome/metadata.xml
+++ b/acct-group/navidrome/metadata.xml
@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>gentoo@tastytea.de</email>
-		<name>tastytea</name>
-	</maintainer>
-</pkgmetadata>
--- a/acct-group/navidrome/navidrome-0.ebuild
+++ b/acct-group/navidrome/navidrome-0.ebuild
@ -1,11 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-DESCRIPTION="Group for Navidrome"
-KEYWORDS="~amd64"
-
-ACCT_GROUP_ID=-1
--- a/acct-user/gotify/gotify-0.ebuild
+++ b/acct-user/gotify/gotify-0.ebuild
@ -1,14 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-DESCRIPTION="User for www-servers/gotify-server{,-bin}"
-
-ACCT_USER_ID=-1
-ACCT_USER_HOME="/var/lib/gotify"
-ACCT_USER_GROUPS=( gotify )
-
-acct-user_add_deps
--- a/acct-user/misskey/misskey-0.ebuild
+++ b/acct-user/misskey/misskey-0.ebuild
@ -1,15 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-DESCRIPTION="User for Misskey"
-KEYWORDS="~amd64"
-
-ACCT_USER_ID=-1
-ACCT_USER_HOME="/opt/misskey"
-ACCT_USER_GROUPS=( ${PN} )
-
-acct-user_add_deps
--- a/acct-user/navidrome/metadata.xml
+++ b/acct-user/navidrome/metadata.xml
@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>gentoo@tastytea.de</email>
-		<name>tastytea</name>
-	</maintainer>
-</pkgmetadata>
--- a/acct-user/navidrome/navidrome-0.ebuild
+++ b/acct-user/navidrome/navidrome-0.ebuild
@ -1,15 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-user
-
-DESCRIPTION="User for Navidrome"
-KEYWORDS="~amd64"
-
-ACCT_USER_ID=-1
-ACCT_USER_HOME="/var/lib/navidrome"
-ACCT_USER_GROUPS=( ${PN} )
-
-acct-user_add_deps
--- a/app-emulation/dxvk/Manifest
+++ b/app-emulation/dxvk/Manifest
@ -0,0 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+DIST v1.0.3.tar.gz 598715 BLAKE2B 76bff0b62916867e232bd41d9bba324e98aebc37358ff369fe0e6a9b646db503848ccd7520b9ff9810aa751ce49cca979b9a6434fd115d1d524b49a032e059fb SHA512 cab516e9de7445edca65a174ea3c9a2d87c9e19927bc584c2cf01e83f17897f6133d0a55984c1784b1c33242493c1f69f18b13f2ad749deef980d378247b3462
+DIST v1.2.3.tar.gz 627504 BLAKE2B a148be0a709ef5ee22196da284b76caa855fe556a35b310ae2aba87ad38342aeeb6339cdf2e298f6da11204fb2edc3f4c90ccfad6f9f4a286cb5019cc4eb819c SHA512 bf53e38405fa8eb92e778f4dc49efbe2d559bbc58dd94f8414955fdeee47cc765d4332d7bfac43742c981a7e9524d295ee91accc7334069724d449a471d44a7f
+DIST v1.3.2.tar.gz 642995 BLAKE2B eee5f4c4373bf3a981c0c420f14e8d83c140611340ea2041bf0837f8f6fc8f156c06f7d31dd769b00be7d8632f062b2726f7712095e53c52493c59f3aa7f96ff SHA512 2fcbaeaeded72ac439cc9e653b94ca547b17b7f53000cfb721a8f14f290fa467db9ccb2d13bc30775c1a28081da1638a948921bf82f6425f4c7ab0e55007df48
+EBUILD dxvk-1.0.3-r1.ebuild 1871 BLAKE2B 48242bf651c2530c2da41c69bf5f125414e0b968bbe6d5c7d295666227fa1826016a6f4ed3feeddd368e2750b33cc0e8ee1f058a8cac9dfcbeb79038fb6681b9 SHA512 c03b609e04623c4d1584c7d356071ba142027ab1b048ecb4749c6157ecfeac5e3dd1021563c8cdaa2e7ca3e12ee499d6b1b7c4c7b255dc294277d01717827782
+EBUILD dxvk-1.2.3-r1.ebuild 2152 BLAKE2B 64e4dfbfc2c1d382b32367cddc214640e6f938842ec37eee79e414b12b48174a1c7dbd822582720f07a587e6321d513fd300753f7a3952c2d5bf4ebf42fa4c2b SHA512 eaff350eaa38b2f55c951cbc94e560cb9832f89d81cdb883b1f87dedd9dd18f6ecd45fea1845a634d0e7941e9e8cf7ff8b12dfefef29bfa22ef6b6f6c7139971
+EBUILD dxvk-1.3.2-r1.ebuild 2152 BLAKE2B 683e986a894951632d2dbb674f2e57e03b6553b2ce8e83ba8839b664490d3d6c6b3625e6d1f075ee50665edea9b484f228a8ff8355f05df051ec530276b097a0 SHA512 41d7833b998d3b1193f833ea33a3f813edabd687c3268371a6d2cde6f9d7ccac69d922699374ac80a3aadc5891a51e6eff5977568c28ed85c1d71e16260114a5
+EBUILD dxvk-9999-r2.ebuild 2152 BLAKE2B 64e4dfbfc2c1d382b32367cddc214640e6f938842ec37eee79e414b12b48174a1c7dbd822582720f07a587e6321d513fd300753f7a3952c2d5bf4ebf42fa4c2b SHA512 eaff350eaa38b2f55c951cbc94e560cb9832f89d81cdb883b1f87dedd9dd18f6ecd45fea1845a634d0e7941e9e8cf7ff8b12dfefef29bfa22ef6b6f6c7139971
+MISC metadata.xml 339 BLAKE2B 2c3c82d9b14bca7f4b3b2d01aadad24d534c74201952505d3d579d636c6053cb8fdc3a91c269d500876af972015d48756c7ea4b5cec089c4a7c5c4fbfdc63d70 SHA512 f2694f77e348ae5cc9053b7380b0efe41dc4a82a4fd100e2a8c87a15c11452400581145938ed80816a2c9ec86e5cd4444b99b713c2404efa7225a0e39025c7be
+-----BEGIN PGP SIGNATURE-----
+
+iHUEAREIAB0WIQQ1VSZoZMptf/RapufPw5SX8bJuBwUCXV7eGwAKCRDPw5SX8bJu
+B/LwAP45LLHs1U17oO6ltVINa46DF5/95DhOyd+bRcK0WTEG/gD+MoW47hahdpbw
+kjHnHsX8EqXtdibPJC10zAyNSmSoJVk=
+=84WF
+-----END PGP SIGNATURE-----
--- a/app-emulation/dxvk/dxvk-1.0.3-r1.ebuild
+++ b/app-emulation/dxvk/dxvk-1.0.3-r1.ebuild
@ -0,0 +1,87 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+MULTILIB_COMPAT=( abi_x86_{32,64} )
+inherit meson multilib-minimal ninja-utils
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+fi
+
+DESCRIPTION="Vulkan-based D3D11 and D3D10 implementation for Linux / Wine"
+HOMEPAGE="https://github.com/doitsujin/dxvk"
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/doitsujin/dxvk.git"
+else
+	SRC_URI="https://github.com/doitsujin/dxvk/archive/v${PV}.tar.gz"
+fi
+
+LICENSE="ZLIB"
+SLOT="0"
+if [[ "${PV}" == "9999" ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+COMMON_DEPEND="virtual/wine[${MULTILIB_USEDEP}]"
+DEPEND="
+	${COMMON_DEPEND}
+	dev-util/vulkan-headers
+	dev-util/glslang
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	media-libs/vulkan-loader
+"
+
+src_prepare() {
+	default
+	sed -i "s|^basedir=.*$|basedir=\"${EPREFIX}\"|" setup_dxvk.sh || die
+	sed -i 's|"x64"|"usr/lib64/dxvk"|' setup_dxvk.sh || die
+	sed -i 's|"x32"|"usr/lib/dxvk"|' setup_dxvk.sh || die
+
+	if ! use abi_x86_64; then
+		sed -i '|installFile "$win64_sys_path"|d' setup_dxvk.sh
+	fi
+
+	if ! use abi_x86_32; then
+		sed -i '|installFile "$win32_sys_path"|d' setup_dxvk.sh
+	fi
+}
+
+multilib_src_configure() {
+	local bit="${MULTILIB_ABI_FLAG:8:2}"
+	local libdir="lib"
+
+	if [[ "${bit}" == "64" ]]; then
+		libdir="lib64"
+	fi
+
+	local emesonargs=(
+		--libdir=${libdir}/dxvk
+		--bindir=${libdir}/dxvk/bin
+		--cross-file=../${P}/build-wine${bit}.txt
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	EMESON_SOURCE="${S}"
+	meson_src_compile
+}
+
+multilib_src_install() {
+	meson_src_install
+}
+
+multilib_src_install_all() {
+	dobin setup_dxvk.sh
+}
+
+pkg_postinst() {
+	elog "dxvk is installed, but not activated. You have to create DLL overrides"
+	elog "in order to make use of it. To do so, set WINEPREFIX and execute"
+	elog "setup_dxvk.sh install --symlink."
+}
--- a/app-emulation/dxvk/dxvk-1.2.3-r1.ebuild
+++ b/app-emulation/dxvk/dxvk-1.2.3-r1.ebuild
@ -0,0 +1,97 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+MULTILIB_COMPAT=( abi_x86_{32,64} )
+inherit meson multilib-minimal ninja-utils
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+fi
+
+DESCRIPTION="Vulkan-based D3D11 and D3D10 implementation for Linux / Wine"
+HOMEPAGE="https://github.com/doitsujin/dxvk"
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/doitsujin/dxvk.git"
+else
+	SRC_URI="https://github.com/doitsujin/dxvk/archive/v${PV}.tar.gz"
+fi
+
+LICENSE="ZLIB"
+SLOT="0"
+if [[ "${PV}" == "9999" ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
+IUSE="video_cards_nvidia"
+
+COMMON_DEPEND="virtual/wine[${MULTILIB_USEDEP}]"
+DEPEND="
+	${COMMON_DEPEND}
+	dev-util/vulkan-headers
+	dev-util/glslang
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	media-libs/vulkan-loader[${MULTILIB_USEDEP}]
+	|| (
+		>=app-emulation/wine-any-4.5
+		>=app-emulation/wine-d3d9-4.5
+		>=app-emulation/wine-staging-4.5
+		>=app-emulation/wine-vanilla-4.5
+	)
+	|| (
+		video_cards_nvidia? ( >=x11-drivers/nvidia-drivers-418.56 )
+		>=media-libs/mesa-19.1
+	)
+"
+
+src_prepare() {
+	default
+	sed -i "s|^basedir=.*$|basedir=\"${EPREFIX}\"|" setup_dxvk.sh || die
+	sed -i 's|"x64"|"usr/lib64/dxvk"|' setup_dxvk.sh || die
+	sed -i 's|"x32"|"usr/lib/dxvk"|' setup_dxvk.sh || die
+
+	if ! use abi_x86_64; then
+		sed -i '|installFile "$win64_sys_path"|d' setup_dxvk.sh
+	fi
+
+	if ! use abi_x86_32; then
+		sed -i '|installFile "$win32_sys_path"|d' setup_dxvk.sh
+	fi
+}
+
+multilib_src_configure() {
+	local bit="${MULTILIB_ABI_FLAG:8:2}"
+	local libdir="lib"
+
+	if [[ "${bit}" == "64" ]]; then
+		libdir="lib64"
+	fi
+
+	local emesonargs=(
+		--libdir=${libdir}/dxvk
+		--bindir=${libdir}/dxvk/bin
+		--cross-file=../${P}/build-wine${bit}.txt
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	EMESON_SOURCE="${S}"
+	meson_src_compile
+}
+
+multilib_src_install() {
+	meson_src_install
+}
+
+multilib_src_install_all() {
+	dobin setup_dxvk.sh
+}
+
+pkg_postinst() {
+	elog "dxvk is installed, but not activated. You have to create DLL overrides"
+	elog "in order to make use of it. To do so, set WINEPREFIX and execute"
+	elog "setup_dxvk.sh install --symlink."
+}
--- a/app-emulation/dxvk/dxvk-1.3.2-r1.ebuild
+++ b/app-emulation/dxvk/dxvk-1.3.2-r1.ebuild
@ -0,0 +1,97 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+MULTILIB_COMPAT=( abi_x86_{32,64} )
+inherit meson multilib-minimal ninja-utils
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+fi
+
+DESCRIPTION="Vulkan-based D3D11 and D3D10 implementation for Linux / Wine"
+HOMEPAGE="https://github.com/doitsujin/dxvk"
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/doitsujin/dxvk.git"
+else
+	SRC_URI="https://github.com/doitsujin/dxvk/archive/v${PV}.tar.gz"
+fi
+
+LICENSE="ZLIB"
+SLOT="0"
+if [[ "${PV}" == "9999" ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
+IUSE="video_cards_nvidia"
+
+COMMON_DEPEND="virtual/wine[${MULTILIB_USEDEP}]"
+DEPEND="
+	${COMMON_DEPEND}
+	dev-util/vulkan-headers
+	dev-util/glslang
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	media-libs/vulkan-loader[${MULTILIB_USEDEP}]
+	|| (
+		>=app-emulation/wine-any-4.5
+		>=app-emulation/wine-d3d9-4.5
+		>=app-emulation/wine-staging-4.5
+		>=app-emulation/wine-vanilla-4.5
+	)
+	|| (
+		video_cards_nvidia? ( >=x11-drivers/nvidia-drivers-418.74 )
+		>=media-libs/mesa-19.2
+	)
+"
+
+src_prepare() {
+	default
+	sed -i "s|^basedir=.*$|basedir=\"${EPREFIX}\"|" setup_dxvk.sh || die
+	sed -i 's|"x64"|"usr/lib64/dxvk"|' setup_dxvk.sh || die
+	sed -i 's|"x32"|"usr/lib/dxvk"|' setup_dxvk.sh || die
+
+	if ! use abi_x86_64; then
+		sed -i '|installFile "$win64_sys_path"|d' setup_dxvk.sh
+	fi
+
+	if ! use abi_x86_32; then
+		sed -i '|installFile "$win32_sys_path"|d' setup_dxvk.sh
+	fi
+}
+
+multilib_src_configure() {
+	local bit="${MULTILIB_ABI_FLAG:8:2}"
+	local libdir="lib"
+
+	if [[ "${bit}" == "64" ]]; then
+		libdir="lib64"
+	fi
+
+	local emesonargs=(
+		--libdir=${libdir}/dxvk
+		--bindir=${libdir}/dxvk/bin
+		--cross-file=../${P}/build-wine${bit}.txt
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	EMESON_SOURCE="${S}"
+	meson_src_compile
+}
+
+multilib_src_install() {
+	meson_src_install
+}
+
+multilib_src_install_all() {
+	dobin setup_dxvk.sh
+}
+
+pkg_postinst() {
+	elog "dxvk is installed, but not activated. You have to create DLL overrides"
+	elog "in order to make use of it. To do so, set WINEPREFIX and execute"
+	elog "setup_dxvk.sh install --symlink."
+}
--- a/app-emulation/dxvk/dxvk-9999-r2.ebuild
+++ b/app-emulation/dxvk/dxvk-9999-r2.ebuild
@ -0,0 +1,97 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+MULTILIB_COMPAT=( abi_x86_{32,64} )
+inherit meson multilib-minimal ninja-utils
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+fi
+
+DESCRIPTION="Vulkan-based D3D11 and D3D10 implementation for Linux / Wine"
+HOMEPAGE="https://github.com/doitsujin/dxvk"
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/doitsujin/dxvk.git"
+else
+	SRC_URI="https://github.com/doitsujin/dxvk/archive/v${PV}.tar.gz"
+fi
+
+LICENSE="ZLIB"
+SLOT="0"
+if [[ "${PV}" == "9999" ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
+IUSE="video_cards_nvidia"
+
+COMMON_DEPEND="virtual/wine[${MULTILIB_USEDEP}]"
+DEPEND="
+	${COMMON_DEPEND}
+	dev-util/vulkan-headers
+	dev-util/glslang
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	media-libs/vulkan-loader[${MULTILIB_USEDEP}]
+	|| (
+		>=app-emulation/wine-any-4.5
+		>=app-emulation/wine-d3d9-4.5
+		>=app-emulation/wine-staging-4.5
+		>=app-emulation/wine-vanilla-4.5
+	)
+	|| (
+		video_cards_nvidia? ( >=x11-drivers/nvidia-drivers-418.56 )
+		>=media-libs/mesa-19.1
+	)
+"
+
+src_prepare() {
+	default
+	sed -i "s|^basedir=.*$|basedir=\"${EPREFIX}\"|" setup_dxvk.sh || die
+	sed -i 's|"x64"|"usr/lib64/dxvk"|' setup_dxvk.sh || die
+	sed -i 's|"x32"|"usr/lib/dxvk"|' setup_dxvk.sh || die
+
+	if ! use abi_x86_64; then
+		sed -i '|installFile "$win64_sys_path"|d' setup_dxvk.sh
+	fi
+
+	if ! use abi_x86_32; then
+		sed -i '|installFile "$win32_sys_path"|d' setup_dxvk.sh
+	fi
+}
+
+multilib_src_configure() {
+	local bit="${MULTILIB_ABI_FLAG:8:2}"
+	local libdir="lib"
+
+	if [[ "${bit}" == "64" ]]; then
+		libdir="lib64"
+	fi
+
+	local emesonargs=(
+		--libdir=${libdir}/dxvk
+		--bindir=${libdir}/dxvk/bin
+		--cross-file=../${P}/build-wine${bit}.txt
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	EMESON_SOURCE="${S}"
+	meson_src_compile
+}
+
+multilib_src_install() {
+	meson_src_install
+}
+
+multilib_src_install_all() {
+	dobin setup_dxvk.sh
+}
+
+pkg_postinst() {
+	elog "dxvk is installed, but not activated. You have to create DLL overrides"
+	elog "in order to make use of it. To do so, set WINEPREFIX and execute"
+	elog "setup_dxvk.sh install --symlink."
+}
--- a/app-emulation/dxvk/metadata.xml
+++ b/app-emulation/dxvk/metadata.xml
@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>gentoo@tastytea.de</email>
+    <name>tastytea</name>
+  </maintainer>
+  <upstream>
+    <bugs-to>https://github.com/doitsujin/dxvk/issues</bugs-to>
+  </upstream>
+</pkgmetadata>
--- a/app-i18n/poedit/Manifest
+++ b/app-i18n/poedit/Manifest
@ -1,2 +0,0 @@
-DIST poedit-3.0.1.tar.gz 2962553 BLAKE2B 43dbef33dc134fac5bf2bde60201c6863700e65e88a799e043f8eb36d6e47c38e939d9962313c3066dcdf73d78bd680f649d92194ce2385b884a7d515cac4514 SHA512 2e6fb71af6e0e4b8ab49d334d0fe06928865061cd20d92fb118129c7b0763a0186c38525b162b5073793634d2511a1f68fbdac9c8cc6392ef1fd3aa7c9decf78
-DIST poedit-3.1.1.tar.gz 2982734 BLAKE2B d2f9fd8f3abb72fd9ff5fa6ec3dc194af515b3236a5cdefe81d8380e1fe5456c61d10749552d1b273f3ec1f354cf3a1573ea077849e2e6bc662e8b2d65254e2c SHA512 33d14f98e0ac322a44b9af16ab8e58ceaa59899dba61163f68711d855602d009bae716a684ae0adac21a0ec6d21601702328ef62800e2341173ba84ebd542c46
--- a/app-i18n/poedit/metadata.xml
+++ b/app-i18n/poedit/metadata.xml
@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>gentoo@tastytea.de</email>
-		<name>tastytea</name>
-	</maintainer>
-	<longdescription>
-		This program is a GUI frontend to the GNU gettext utilities
-		and a catalogs editor/source code parser.
-		It helps with translating applications into another language.
-	</longdescription>
-	<upstream>
-		<bugs-to>https://github.com/vslavik/poedit/issues</bugs-to>
-		<remote-id type="github">vslavik/poedit</remote-id>
-	</upstream>
-	<use>
-		<flag name="crowdin">Enable Crowdin (online translation platform) integration</flag>
-		<flag name="cld2">Better language autodetection and non-English source
-		languages via sci-libs/cld2</flag>
-	</use>
-</pkgmetadata>
--- a/app-i18n/poedit/poedit-3.0.1.ebuild
+++ b/app-i18n/poedit/poedit-3.0.1.ebuild
@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PLOCALES="af an ar az be be@latin bg bs ca ckb co cs da de el en_GB es et eu fa fi fr ga gl he hr hu hy id is it ja ka kab kk ko lt lv ms nb nl oc pa pl pt_BR pt_PT ro ru sk sl sq sr sv tg th tr uk uz vi zh_CN zh_TW"
-WX_GTK_VER=3.0-gtk3
-
-inherit plocale wxwidgets xdg
-
-DESCRIPTION="GUI gettext translations editor"
-HOMEPAGE="https://poedit.net"
-SRC_URI="https://github.com/vslavik/${PN}/releases/download/v${PV}-oss/${P}.tar.gz"
-IUSE="+cld2 +crowdin"
-
-KEYWORDS="~amd64"
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND="
-	app-text/gtkspell:3
-	x11-libs/gtk+:3
-	>=dev-cpp/lucene++-3.0.5
-	>=dev-libs/pugixml-1.9
-	dev-libs/boost:=[nls]
-	dev-libs/icu:=
-	>=x11-libs/wxGTK-3.0.4:${WX_GTK_VER}[X,webkit]
-	cld2? ( sci-libs/cld2 )
-	crowdin? (
-		dev-cpp/cpprest
-		app-crypt/libsecret
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	my_rm_loc() {
-		sed -i -e "/^POEDIT_LINGUAS = /s: ${1}::" locales/Makefile.in || die
-		rm "locales/${1}.mo" || die
-	}
-
-	plocale_find_changes 'locales' '' '.mo'
-	plocale_for_each_disabled_locale my_rm_loc
-
-	setup-wxwidgets
-	default
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_with cld2)
-		$(use_with crowdin cpprest)
-	)
-
-	econf "${myeconfargs[@]}"
-}
--- a/app-i18n/poedit/poedit-3.1.1.ebuild
+++ b/app-i18n/poedit/poedit-3.1.1.ebuild
@ -1,59 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PLOCALES="af an ar az be be@latin bg bs ca ckb co cs da de el en_GB es et eu fa fi fr ga gl he hr hu hy id is it ja ka kab kk ko lt lv ms nb nl oc pa pl pt_BR pt_PT ro ru sk sl sq sr sv tg th tr uk uz vi zh_CN zh_TW"
-WX_GTK_VER=3.0-gtk3
-
-inherit plocale wxwidgets xdg
-
-DESCRIPTION="GUI gettext translations editor"
-HOMEPAGE="https://poedit.net"
-SRC_URI="https://github.com/vslavik/${PN}/releases/download/v${PV}-oss/${P}.tar.gz"
-IUSE="+cld2 +crowdin"
-
-KEYWORDS="~amd64"
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND="
-	app-text/gtkspell:3
-	x11-libs/gtk+:3
-	>=dev-cpp/lucene++-3.0.5
-	>=dev-libs/pugixml-1.9
-	dev-libs/boost:=[nls]
-	dev-libs/icu:=
-	>=x11-libs/wxGTK-3.0.4:${WX_GTK_VER}[X,webkit]
-	cld2? ( sci-libs/cld2 )
-	crowdin? (
-		dev-cpp/cpprest
-		app-crypt/libsecret
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	my_rm_loc() {
-		sed -i -e "/^POEDIT_LINGUAS = /s: ${1}::" locales/Makefile.in || die
-		rm "locales/${1}.mo" || die
-	}
-
-	plocale_find_changes 'locales' '' '.mo'
-	plocale_for_each_disabled_locale my_rm_loc
-
-	setup-wxwidgets
-	default
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_with cld2)
-		$(use_with crowdin cpprest)
-	)
-
-	econf "${myeconfargs[@]}"
-}
--- a/app-misc/rdfind/Manifest
+++ b/app-misc/rdfind/Manifest
@ -0,0 +1,13 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+DIST 1.4.1.tar.gz 53708 BLAKE2B 18778fa65f9c5fda18a59e4021b6346bc5722c19a3796f2b4a85e5c8d919c5f8beeeb8fed572fcce0016e2939568f5e3dc3d3e567178a54ad9ac4e89a1ea77ff SHA512 00d34f46e8534074577a0cd32f71dd8da0b9a7c9a175a612a4a858693ca679de3b77fca1796b543ead796c806a693e97611c0a9fdc743229d317136b32ce89dc
+EBUILD rdfind-1.4.1.ebuild 591 BLAKE2B 85eb8f69f99985ce9c8e4ab9adc31e3f38ba103ab9953c9c5f05008e5404da33ff979f3119e586ad4e56989899b820f2cda57490cb2da59c7d99afca1f4d9b37 SHA512 a3bb2174e398bd9f5a01597c8733346e694fd0d4b86fa482bc65e3395afe998f7027f565ed1a04b25beb257a61a669174e17a05e5c9cdafd4be9d9a60d9bc6b0
+MISC metadata.xml 398 BLAKE2B 05a861f1451934e3c15627b535cecbad0b5c145afe2de13cbc2cc82a399a4c951253317e3da1ac2a9468eda10b338e4e40a55e0f572e94593c5ab9b467d96436 SHA512 db3208068659ba27a9ac58c56da7e63a91ff8342577fee62f453c11afd587734ddcff7920203501b94ce3319fdccf796a70032140ad3952cb66d330dd85551a4
+-----BEGIN PGP SIGNATURE-----
+
+iHUEAREIAB0WIQQ1VSZoZMptf/RapufPw5SX8bJuBwUCXKSuiQAKCRDPw5SX8bJu
+B0msAP97Y0UDa2zR/hdUwnoTaE2dEyMPO7/HvnFgE8EOcNK6ngEAhhyN+I+lMQCg
+ePt4LzAhGDJmi4mG99gGS66NVzyBbq4=
+=e1Qa
+-----END PGP SIGNATURE-----
--- a/app-misc/rdfind/metadata.xml
+++ b/app-misc/rdfind/metadata.xml
@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>gentoo@tastytea.de</email>
+    <name>tastytea</name>
+  </maintainer>
+  <upstream>
+    <bugs-to>https://github.com/pauldreik/rdfind/issues</bugs-to>
+    <doc>https://rdfind.pauldreik.se/rdfind.1.html</doc>
+  </upstream>
+</pkgmetadata>
--- a/app-misc/rdfind/rdfind-1.4.1.ebuild
+++ b/app-misc/rdfind/rdfind-1.4.1.ebuild
@ -0,0 +1,29 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Rdfind is a program that finds duplicate files."
+HOMEPAGE="https://github.com/pauldreik/rdfind"
+SRC_URI="https://github.com/pauldreik/rdfind/archive/releases/${PV}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND="dev-libs/nettle"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}-releases-${PV}"
+
+src_prepare() {
+	# NOTE: Commands are from bootstrap.sh.
+	eaclocal
+	eautoheader
+	eautomake --add-missing
+	eautoconf
+	default
+}
--- a/app-misc/todoman/Manifest
+++ b/app-misc/todoman/Manifest
@ -0,0 +1,12 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+EBUILD todoman-9999.ebuild 839 BLAKE2B 14a8d500e5fcbdfefea2f2422abdf84ff137b691c97eb7cfa1fba533b62e1b4bbc64f7034b3190623a56dc50696d40440f685e6e929107a7b932fde886a4c369 SHA512 00a455fb3e3d826c3a9b5a9ef59ea9dd73a4338fc57e88685b666156b8f6f07e96c679e8106de9b4a5575bb09d0ad2deb4e51aa679cd5eb98796e55f8872885c
+MISC metadata.xml 248 BLAKE2B 0f4a45d414249f9410a61d8545ba052db41e3d74516e34bff0ca5547cae55db7eefffb2c23d840c979bdea0b927da36f7a56441cbc6053291d65bd39af2421bd SHA512 0f6384333cf38e52e6a67db43f3a78723d2a0d3446da27e7972f15244d96ae41f0e428d937538d4fa52aa70dc9c92920672d4e237b481dbbdff1d9d8c325b33d
+-----BEGIN PGP SIGNATURE-----
+
+iHUEAREIAB0WIQQ1VSZoZMptf/RapufPw5SX8bJuBwUCW0zVPwAKCRDPw5SX8bJu
+B+goAQCC9zQCXxCKJ5/vHnMzrk8rEVgShegF8FTxz6d+jub3WQD/aGb+TGGP9sCE
+6wlP8wYuawaNV68CariROCAxz45ueSk=
+=Bxo1
+-----END PGP SIGNATURE-----
--- a/acct-group/gotify/metadata.xml
+++ b/acct-group/gotify/metadata.xml
@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
- <maintainer type="project">
-  <email>gentoo@tastytea.de</email>
-  <name>tastytea</name>
- </maintainer>
+  <maintainer type="person">
+    <email>gentoo@tastytea.de</email>
+    <name>tastytea</name>
+  </maintainer>
 </pkgmetadata>
--- a/app-misc/todoman/todoman-9999.ebuild
+++ b/app-misc/todoman/todoman-9999.ebuild
@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_4 python3_5 )
+
+inherit git-r3 distutils-r1
+
+DESCRIPTION="A simple CalDAV-based todo manager"
+HOMEPAGE="https://github.com/pimutils/todoman"
+EGIT_REPO_URI="https://github.com/pimutils/todoman.git"
+
+LICENSE="ISC"
+SLOT="0"
+
+DEPEND=""
+RDEPEND=">=dev-python/atomicwrites-1.1.5-r2
+	>=dev-python/configobj-5.0.5[${PYTHON_USEDEP}]
+	>=dev-python/vdirsyncer-0.14.0
+	>=dev-python/click-6.0
+	>=dev-python/click-log-0.1.3
+	>=dev-python/humanize-0.5.1
+	>=dev-python/icalendar-3.9.2
+	>=dev-python/parsedatetime-2.1
+	>=dev-python/python-dateutil-2.4.2-r1
+	>=dev-python/pyxdg-0.25-r1
+	>=dev-python/tabulate-0.7.7
+	>=dev-python/urwid-1.3.1"
+
+DOCS=( AUTHORS.rst CHANGELOG.rst README.rst misc/khard/khard.conf.example )
--- a/app-text/epubgrep/epubgrep-9999.ebuild
+++ b/app-text/epubgrep/epubgrep-9999.ebuild
@ -1,41 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake git-r3
-
-DESCRIPTION="Search tool for EPUB e-books"
-HOMEPAGE="https://schlomp.space/tastytea/epubgrep"
-EGIT_REPO_URI="https://schlomp.space/tastytea/epubgrep.git"
-
-LICENSE="AGPL-3"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/boost[nls]
-	app-arch/libarchive[bzip2,iconv,lzma,zlib(+)]
-	dev-libs/libfmt
-	dev-libs/pugixml
-"
-DEPEND="
-	${RDEPEND}
-	dev-cpp/nlohmann_json
-	dev-cpp/termcolor
-	test? ( dev-cpp/catch )
-"
-BDEPEND="
-	app-text/asciidoc
-	sys-devel/gettext
-"
-
-src_configure() {
-	local mycmakeargs=(
-		"-DWITH_TESTS=$(usex test)"
-		"-DFALLBACK_BUNDLED=NO"
-	)
-
-	cmake_src_configure
-}
--- a/app-text/epubgrep/metadata.xml
+++ b/app-text/epubgrep/metadata.xml
@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>gentoo@tastytea.de</email>
-		<name>tastytea</name>
-	</maintainer>
-	<upstream>
-		<maintainer>
-			<name>tastytea</name>
-			<email>tastytea@tastytea.de</email>
-		</maintainer>
-		<bugs-to>https://schlomp.space/tastytea/epubgrep/issues</bugs-to>
-	</upstream>
-</pkgmetadata>
--- a/dev-cpp/cpprest/Manifest
+++ b/dev-cpp/cpprest/Manifest
@ -1 +0,0 @@
-DIST cpprest-2.10.18.tar.gz 1747792 BLAKE2B c2ea22cb09c39cb3c1d0936ae896c79172b92b5c4db46d9204988ec0012d74e901bcc24232b6971faae8adc03a41e4563fcc2a6d4aade2a33cdc3a1c9e36fff0 SHA512 5f0699e7ba509e16d6a3000e6ac448f6dbc134b8e03de9ab174ba749ad7efa76cbfccb623b226d82f5dba35ef6292f0cdf121b5315d524a5a28454038d420fab
--- a/dev-cpp/cpprest/cpprest-2.10.18.ebuild
+++ b/dev-cpp/cpprest/cpprest-2.10.18.ebuild
@ -1,68 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="REST SDK using an asynchronous C++ API design"
-HOMEPAGE="https://github.com/Microsoft/cpprestsdk"
-SRC_URI="https://github.com/microsoft/cpprestsdk/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/cpprestsdk-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="brotli test +websockets"
-
-RDEPEND="
-	|| (
-		<dev-libs/boost-1.77.0[nls,threads]
-		>=dev-libs/boost-1.77.0[nls]
-	)
-	dev-libs/openssl
-	sys-libs/zlib
-	brotli? ( app-arch/brotli )
-	websockets? ( dev-cpp/websocketpp )
-"
-DEPEND="${RDEPEND}"
-
-RESTRICT="!test? ( test )"
-
-src_prepare() {
-	my_disable_tests() {
-		local my_cmake_file="${1}"
-		local -n my_tests="${2}"
-
-		for file in "${my_tests[@]}"; do
-			sed -i "/${file}/d" "Release/tests/${my_cmake_file}" || die
-		done
-	}
-
-	local -a my_http_client_tests=(
-		"authentication_tests.cpp"
-		"connections_and_errors.cpp"
-		"outside_tests.cpp"
-		"redirect_tests.cpp"
-	)
-	my_disable_tests "functional/http/client/CMakeLists.txt" my_http_client_tests
-
-	local -a my_websockets_tests=(
-		"authentication_tests.cpp"
-	)
-	my_disable_tests "functional/websockets/CMakeLists.txt" my_websockets_tests
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local -a mycmakeargs=(
-		"-DWERROR=OFF"
-		"-DBUILD_SAMPLES=OFF"
-		"-DCPPREST_EXCLUDE_WEBSOCKETS=$(usex websockets OFF ON)"
-		"-DBUILD_TESTS=$(usex test ON OFF)"
-		"-DCPPREST_EXCLUDE_BROTLI=$(usex brotli OFF ON)"
-	)
-
-	cmake_src_configure
-}
--- a/dev-cpp/cpprest/metadata.xml
+++ b/dev-cpp/cpprest/metadata.xml
@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>gentoo@tastytea.de</email>
-		<name>tastytea</name>
-	</maintainer>
-	<upstream>
-		<bugs-to>https://github.com/microsoft/cpprestsdk/issues</bugs-to>
-	</upstream>
-	<use>
-		<flag name="websockets">Support the WebSocket protocol</flag>
-		<flag name="brotli">Enable brotli compression/decompression support</flag>
-	</use>
-</pkgmetadata>
--- a/dev-cpp/curlpp/Manifest
+++ b/dev-cpp/curlpp/Manifest
@ -0,0 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX no_static_lib.patch 1714 BLAKE2B b149ef9929bc2d056a6ddc8f604450ddd55ef1d3ce3db9fa10ecbb4e762a9f3b8ab63798dd8db9c9be67d773dfb9d3b8e9b96e9087d8f692d2747c0a73c6a5e4 SHA512 5bae41182457e133390167ab7a76f17ddb68d7aab27340b51cee0c0955777c2a8409994ab28bf76a89e32ed0ee3ed34995cf18ecde03fc92f2444603e2fb27c9
+DIST curlpp-0.8.1.tar.gz 143017 BLAKE2B 7f3911499b42077c9f108b0355005744300383836a1c82dcba80207482b231527482fb17dcd78a7f288903e996afaf49a4478c7cb5c821bf597b26f4450a430b SHA512 a46b47150c0f0f1f0056e08966ce2fefa5e86fc729406e0220fbcf400da5409f05c87b636b13da3c4d4460c1177aedb494b9569bbcd9012326d4d5f59376397e
+EBUILD curlpp-0.8.1-r2.ebuild 941 BLAKE2B f944a70d530545fe8ccbb06568cdafd55ade74d957fc4658acf53660769c34f7331adac661caf6953fd63bc2ccb5d711b39c1d70fb91fdc7f304460e532c4db1 SHA512 5d9780a9a1639b93448acdc90a55de52559f1dbc0110c772e8007bbf705682eeed64eac7a092d8dbe916a28e86c50f5ce4c24ce2083b59b70fc371fd642ab610
+MISC metadata.xml 508 BLAKE2B 63706103fe7335d4a25491b6c0654b825e67011a9b8acc5dbeead8afe72521d674eda9f6fb5c692f09acefb645b836c9beaa2a65fd4d29eab542f63f8f072278 SHA512 fa93e958f0159e6afe5f35bf690d511faca1c6c162157a2c3106518974523b6bd8800478ce9c41a357392de3d933981e2d456b229078512e5c4797d784963a11
+-----BEGIN PGP SIGNATURE-----
+
+iHUEAREIAB0WIQQ1VSZoZMptf/RapufPw5SX8bJuBwUCXUW+JwAKCRDPw5SX8bJu
+B7o4AP9Xmyk3h9zAjJRDJzi2J8wUs+RxeeHORrTV32FRR/n9yAD/bJCycRPawijO
+K2guXJgSpnQHorUc+BBwIK+Tpm7HvfU=
+=zkSz
+-----END PGP SIGNATURE-----
--- a/dev-cpp/curlpp/curlpp-0.8.1-r2.ebuild
+++ b/dev-cpp/curlpp/curlpp-0.8.1-r2.ebuild
@ -0,0 +1,40 @@
+# Copyright 2018-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+DESCRIPTION="C++ wrapper for libcURL"
+HOMEPAGE="http://www.curlpp.org/"
+SRC_URI="https://github.com/jpbarrette/curlpp/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="doc examples static-libs"
+
+RDEPEND=">=net-misc/curl-7.58.0"
+DEPEND=">=dev-util/cmake-3.9.6
+	${RDEPEND}"
+
+src_prepare() {
+	cmake-utils_src_prepare
+	sed -i 's/@LDFLAGS@ //' extras/curlpp.pc.in || die
+	sed -i 's,@includedir@,${prefix}/@includedir@,' extras/curlpp.pc.in || die
+	sed -i 's,@libdir@,${prefix}/@libdir@,' extras/curlpp.pc.in || die
+	if ! use static-libs; then
+		eapply "${FILESDIR}/no_static_lib.patch"
+	fi
+}
+
+src_install() {
+	cmake-utils_src_install
+	dodoc Readme.md doc/AUTHORS doc/TODO
+	if use doc; then
+		dodoc doc/guide.pdf
+	fi
+	if use examples; then
+		dodoc -r examples/
+	fi
+}
--- a/dev-cpp/curlpp/files/no_static_lib.patch
+++ b/dev-cpp/curlpp/files/no_static_lib.patch
@ -0,0 +1,31 @@
+diff -u a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt	2018-11-19 04:28:50.106323417 +0100
+++ b/CMakeLists.txt	2018-11-19 04:30:26.045870468 +0100
+@@ -89,7 +89,6 @@
+ target_link_libraries(${PROJECT_NAME} ${CURL_LIBRARIES} ${CONAN_LIBS})
+ set_target_properties(${PROJECT_NAME} PROPERTIES SOVERSION 1 VERSION 1.0.0)
+ 
+-add_library(${PROJECT_NAME}_static STATIC ${HeaderFileList} ${SourceFileList})
+ 
+ # Make sure that on unix-platforms shared and static libraries have
+ # the same root name, but different suffixes.
+@@ -97,18 +96,15 @@
+ #  (solution taken from https://cmake.org/Wiki/CMake_FAQ#How_do_I_make_my_shared_and_static_libraries_have_the_same_root_name.2C_but_different_suffixes.3F)
+ # 
+ # Making shared and static libraries have the same root name, but different suffixes
+-SET_TARGET_PROPERTIES(${PROJECT_NAME}_static PROPERTIES OUTPUT_NAME ${PROJECT_NAME})
+ # Now the library target "curlpp_static" will be named "curlpp.lib" with MS tools.
+ # This conflicts with the "curlpp.lib" import library corresponding to "curlpp.dll",
+ # so we add a "lib" prefix (which is default on other platforms anyway):
+-SET_TARGET_PROPERTIES(${PROJECT_NAME}_static PROPERTIES PREFIX "lib")
+-target_link_libraries(${PROJECT_NAME}_static ${CURL_LIBRARIES} ${CONAN_LIBS})
+ 
+ # install headers
+ install(DIRECTORY include/utilspp/ DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/utilspp")
+ install(DIRECTORY include/curlpp/ DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/curlpp")
+ 
+-install(TARGETS ${PROJECT_NAME} ${PROJECT_NAME}_static
+install(TARGETS ${PROJECT_NAME}
+         RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+         LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+         ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
--- a/dev-cpp/curlpp/metadata.xml
+++ b/dev-cpp/curlpp/metadata.xml
@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>gentoo@tastytea.de</email>
+    <name>tastytea</name>
+  </maintainer>
+  <upstream>
+    <maintainer>
+        <name>Jean-Philippe Barrette-LaPierre</name>
+    </maintainer>
+    <doc>https://github.com/jpbarrette/curlpp/blob/master/doc/guide.pdf</doc>
+    <bugs-to>https://github.com/jpbarrette/curlpp/issues</bugs-to>
+  </upstream>
+</pkgmetadata>
--- a/dev-cpp/identiconpp/Manifest
+++ b/dev-cpp/identiconpp/Manifest
@ -1,2 +1,14 @@
-DIST identiconpp-0.7.1.tar.gz 25706 BLAKE2B 8ef559f7c993cc880cb8e2a4edbd42ff6c94cf5da6a0c4681e41ce0b77ed594d6657124acc70d0c2033cd2d7e4a93aff225aa7033edcd07fc952611c5610fa8b SHA512 f557db838c1d1a6bd73fc3f41cfca70d7cc6ed85be4e6d93c9bc558f6bcbd3c998d50fa0d1b1b88a851fdc8c2ab002ee2a47816f07ded610f0944b485d3a4bed
-DIST identiconpp-0.7.2.tar.gz 27429 BLAKE2B b0c39c6a6549a53fe2b1e2964cdec9840a05214731c09bb48b9a09cc8399a7410e8cb63d07ae1ab91d94806027ae333360428209e2663079ae02949dc66e2fe1 SHA512 c390eac14a65a57829e15cf0d6f1619d1bf6a96d00ee650f93520e150552f3c8c7f308547fd99b8a2ad279cef1f582ef00cff3eac53d48657b0083194597d106
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+DIST identiconpp-0.6.1.tar.gz 26726 BLAKE2B 3001c5aa9d42e8fc987f567f898f1b908f337704d058f444ff858820b5f2320bfebbb16d17a5600776771dc11547d36109f4235dcd92b677022212d5e4c23bf4 SHA512 b931eff10c86c9f8a410a05c9e1f4fe3f7aa11d2de9c590e072ec7fd63a8ac0557e0fac45eb6a3d52ad958bc7914a5ac64b1913f4b256763aa8a49540c4feeab
+EBUILD identiconpp-0.6.1.ebuild 1242 BLAKE2B 1bdbda66d66877cd9b2e927b62c82f99f0508c743c2af8ba49a854b6c0bf5491aad774e8af71b5b98ee3a6d69e5c516c81a7684bc73b1b2a5ec1a13930be6fce SHA512 74abf10e4874055ede270f6ed478600e10612a64f92a244019408e8372988ba3e5c1d4b319cd65c0e6acc121b9cb08aba64da9bccda1a84b64c18919ab83e009
+EBUILD identiconpp-9999.ebuild 1242 BLAKE2B 1bdbda66d66877cd9b2e927b62c82f99f0508c743c2af8ba49a854b6c0bf5491aad774e8af71b5b98ee3a6d69e5c516c81a7684bc73b1b2a5ec1a13930be6fce SHA512 74abf10e4874055ede270f6ed478600e10612a64f92a244019408e8372988ba3e5c1d4b319cd65c0e6acc121b9cb08aba64da9bccda1a84b64c18919ab83e009
+MISC metadata.xml 348 BLAKE2B 8ff6ffefd59c4f15ecdec44a37e865154539ee369cf25c64067b882d7c3313200d2b61428e6cff50a177aff14d333b7c4d5e044e6d42be6e14bd3130a42d0503 SHA512 e61b3034f2fb64b93786989607367ca698a07135cb23e00c75dcb38fa581bed192485a253057f4c553a2b637767a84a5084eeead60eeea6714b5f77b6d75dd93
+-----BEGIN PGP SIGNATURE-----
+
+iHUEAREIAB0WIQQ1VSZoZMptf/RapufPw5SX8bJuBwUCXUA+4wAKCRDPw5SX8bJu
+B7YrAP40MQ81yxagDxixBWE013SXe1p3cAgYLH9H7nxZZDWu6QD/ToWMeT34ahWw
+yGByzbK7LD8MFzDVjaJ3KmmwX4x1lrU=
+=4eu7
+-----END PGP SIGNATURE-----
--- a/dev-cpp/identiconpp/identiconpp-0.6.1.ebuild
+++ b/dev-cpp/identiconpp/identiconpp-0.6.1.ebuild
@ -1,64 +1,68 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7

-inherit cmake
+inherit cmake-utils

 if [[ "${PV}" == "9999" ]]; then
 	inherit git-r3
 fi

-DESCRIPTION="Library to generate identicons for C++."
+DESCRIPTION="Library to generate identicons."
 HOMEPAGE="https://schlomp.space/tastytea/identiconpp"
 if [[ "${PV}" == "9999" ]]; then
 	EGIT_REPO_URI="https://schlomp.space/tastytea/identiconpp.git"
 else
 	SRC_URI="https://schlomp.space/tastytea/identiconpp/archive/${PV}.tar.gz
 		-> ${P}.tar.gz"
-	S="${WORKDIR}/${PN}"
-	KEYWORDS="~amd64"
 fi

 LICENSE="GPL-3"
 SLOT="0"
+if [[ "${PV}" == "9999" ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
 IUSE="doc examples test"

-RESTRICT="!test? ( test )"
-
 RDEPEND="
-	media-gfx/imagemagick[png,cxx]
+	media-gfx/imagemagick[png]
 "
 DEPEND="
-	dev-build/cmake
+	dev-util/cmake
 	doc? ( app-doc/doxygen )
 	test? ( dev-cpp/catch )
 	${RDEPEND}
 "

+if [[ "${PV}" != "9999" ]]; then
+	S="${WORKDIR}/${PN}"
+fi
+
 src_prepare() {
+	cmake-utils_src_prepare
+
+	sed -i "s|\${CMAKE_INSTALL_DOCDIR}|\${CMAKE_INSTALL_DATAROOTDIR}/doc/${P}|" \
+		CMakeLists.txt || die "Modification of CMAKE_INSTALL_DOCDIR failed."
+
 	if use doc; then
 		HTML_DOCS="doc/html/*"
 	fi
 	if use examples; then
-		DOCS+=(examples/example.cpp)
+		DOCS+=(example.cpp example.c)
 	fi

 	if use test; then
 		mycmakeargs+=(-DWITH_TESTS=YES)
 	fi
-
-	cmake_src_prepare
 }

 src_compile() {
-	cmake_src_compile
+	cmake-utils_src_compile

 	if use doc; then
 		./build_doc.sh
 	fi
 }
-
-src_test() {
-	BUILD_DIR="${BUILD_DIR}/tests" cmake_src_test
-}
--- a/dev-cpp/identiconpp/identiconpp-0.7.2.ebuild
+++ b/dev-cpp/identiconpp/identiconpp-0.7.2.ebuild
@ -1,64 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-fi
-
-DESCRIPTION="Library to generate identicons for C++."
-HOMEPAGE="https://schlomp.space/tastytea/identiconpp"
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://schlomp.space/tastytea/identiconpp.git"
-else
-	SRC_URI="https://schlomp.space/tastytea/identiconpp/archive/${PV}.tar.gz
-		-> ${P}.tar.gz"
-	S="${WORKDIR}/${PN}"
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="doc examples test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	media-gfx/imagemagick[png,cxx]
-"
-DEPEND="
-	dev-build/cmake
-	doc? ( app-doc/doxygen )
-	test? ( dev-cpp/catch )
-	${RDEPEND}
-"
-
-src_prepare() {
-	if use doc; then
-		HTML_DOCS="doc/html/*"
-	fi
-	if use examples; then
-		DOCS+=(examples/example.cpp)
-	fi
-
-	if use test; then
-		mycmakeargs+=(-DWITH_TESTS=YES)
-	fi
-
-	cmake_src_prepare
-}
-
-src_compile() {
-	cmake_src_compile
-
-	if use doc; then
-		./build_doc.sh
-	fi
-}
-
-src_test() {
-	BUILD_DIR="${BUILD_DIR}/tests" cmake_src_test
-}
--- a/dev-cpp/identiconpp/identiconpp-9999.ebuild
+++ b/dev-cpp/identiconpp/identiconpp-9999.ebuild
@ -1,64 +1,68 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7

-inherit cmake
+inherit cmake-utils

 if [[ "${PV}" == "9999" ]]; then
 	inherit git-r3
 fi

-DESCRIPTION="Library to generate identicons for C++."
+DESCRIPTION="Library to generate identicons."
 HOMEPAGE="https://schlomp.space/tastytea/identiconpp"
 if [[ "${PV}" == "9999" ]]; then
 	EGIT_REPO_URI="https://schlomp.space/tastytea/identiconpp.git"
 else
 	SRC_URI="https://schlomp.space/tastytea/identiconpp/archive/${PV}.tar.gz
 		-> ${P}.tar.gz"
-	S="${WORKDIR}/${PN}"
-	KEYWORDS="~amd64"
 fi

 LICENSE="GPL-3"
 SLOT="0"
+if [[ "${PV}" == "9999" ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
 IUSE="doc examples test"

-RESTRICT="!test? ( test )"
-
 RDEPEND="
-	media-gfx/imagemagick[png,cxx]
+	media-gfx/imagemagick[png]
 "
 DEPEND="
-	dev-build/cmake
+	dev-util/cmake
 	doc? ( app-doc/doxygen )
 	test? ( dev-cpp/catch )
 	${RDEPEND}
 "

+if [[ "${PV}" != "9999" ]]; then
+	S="${WORKDIR}/${PN}"
+fi
+
 src_prepare() {
+	cmake-utils_src_prepare
+
+	sed -i "s|\${CMAKE_INSTALL_DOCDIR}|\${CMAKE_INSTALL_DATAROOTDIR}/doc/${P}|" \
+		CMakeLists.txt || die "Modification of CMAKE_INSTALL_DOCDIR failed."
+
 	if use doc; then
 		HTML_DOCS="doc/html/*"
 	fi
 	if use examples; then
-		DOCS+=(examples/example.cpp)
+		DOCS+=(example.cpp example.c)
 	fi

 	if use test; then
 		mycmakeargs+=(-DWITH_TESTS=YES)
 	fi
-
-	cmake_src_prepare
 }

 src_compile() {
-	cmake_src_compile
+	cmake-utils_src_compile

 	if use doc; then
 		./build_doc.sh
 	fi
 }
-
-src_test() {
-	BUILD_DIR="${BUILD_DIR}/tests" cmake_src_test
-}
--- a/dev-cpp/mastodon-cpp/Manifest
+++ b/dev-cpp/mastodon-cpp/Manifest
@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+DIST mastodon-cpp-0.106.0.tar.gz 68062 BLAKE2B 477f862bdcc8521c3b2ed814454760f63d7efd20e76a92faf70ddea8bb4d36bafefabb15d52c2c3bad65322296f8177c64c2c2aa0422c62fea57b100e1c62b2a SHA512 a55a8bd1b8d9d582b04c36dd6283cbdd5b18ab0bdc7983fdeee6bad4ed9319824edc6d5569646aa53689c5bb6c06ec00d8c656dd7ce177e9958ea3dc7b6a36d2
+DIST mastodon-cpp-0.30.2.tar.gz 57807 BLAKE2B 1ed18131d24fcd7b21e31834db4bdc3f99dbbd2396ab9f25d1a2dd46d5013ab8e5cee97f63dff2476c6888637483bb4315b46278715ad12046f8eb1cb940332b SHA512 4399e6eac4018e0d52e86d5bad5049b3a95f6974597c070f55dc70e62b443175038192f0165c49d4fcec5d0312080f525ab608fc267092b8b0f008c8c1b46ec2
+EBUILD mastodon-cpp-0.106.0.ebuild 1728 BLAKE2B 7fa80ef3cbd7dd44e548b56fa207291f9f1bd744635ad19c13348b45a46a57a7099b5d992268e520c43733411722dc5ea42facadb384751698764cba39e586f3 SHA512 d8a5059b126edc71286b0d5417289c61afcad20a91c0de66ede886baaf8ce9a2053d10651cb0cde6f4a80774dd914cecdb58827606935c2798058dd71b6909b4
+EBUILD mastodon-cpp-0.30.2-r1.ebuild 1178 BLAKE2B 2585cdffcc3a214660ce1574616632f6efee7c3bfc1048923bb2c9394058a42f1fa19d00468497fcbeb634f099cd0f513560aed7987116d8a736d6dc5b7017db SHA512 35cba0bd663b998aebd47ee60689d8f9f66ffffced025bd9ed7990cfa0182379bf1da80c5522e512daf2fac6b29a184a7c48577e02578f9ebd45149881eb0b10
+EBUILD mastodon-cpp-9999.ebuild 1728 BLAKE2B 7fa80ef3cbd7dd44e548b56fa207291f9f1bd744635ad19c13348b45a46a57a7099b5d992268e520c43733411722dc5ea42facadb384751698764cba39e586f3 SHA512 d8a5059b126edc71286b0d5417289c61afcad20a91c0de66ede886baaf8ce9a2053d10651cb0cde6f4a80774dd914cecdb58827606935c2798058dd71b6909b4
+MISC metadata.xml 529 BLAKE2B 0e315bbc4644309a5a843fca3e7c4dadda28982930c592e73201b174fc5626b45d0bcb96dfca7c1085fc059ef454957b728d139ad8a99cbddca5cda6dd431448 SHA512 85bd72c7fb3e173354877cd183a4869e733a90d200f95cf8ecf85a658f9229010298ae8e265cf3d309f022f0b242898da04249933aaca5c12c26eeec8beb71f6
+-----BEGIN PGP SIGNATURE-----
+
+iHUEAREIAB0WIQQ1VSZoZMptf/RapufPw5SX8bJuBwUCXVS6PQAKCRDPw5SX8bJu
+BxSPAP9E2xdRWxD1fOp6xZSSsXCFVrWVhBTT7coYe5tVCmAgZAEAgG+KTVIhOMrb
+38Qm5RR6+TMNsXggIgvnRC4BpIu5hP0=
+=cI71
+-----END PGP SIGNATURE-----
--- a/dev-cpp/mastodon-cpp/mastodon-cpp-0.106.0.ebuild
+++ b/dev-cpp/mastodon-cpp/mastodon-cpp-0.106.0.ebuild
@ -0,0 +1,85 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit cmake-utils
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+fi
+
+DESCRIPTION="mastodon-cpp is a C++ wrapper for the Mastodon API."
+HOMEPAGE="https://schlomp.space/tastytea/mastodon-cpp"
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://schlomp.space/tastytea/mastodon-cpp.git"
+else
+	SRC_URI="https://schlomp.space/tastytea/mastodon-cpp/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+if [[ "${PV}" == "9999" ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
+IUSE="doc examples minimal test"
+
+RDEPEND="
+	dev-cpp/curlpp
+	!minimal? ( dev-libs/jsoncpp )
+"
+DEPEND="
+	dev-util/cmake
+	doc? ( app-doc/doxygen )
+	test? ( dev-cpp/catch )
+	${RDEPEND}
+"
+
+if [[ "${PV}" != "9999" ]]; then
+	S="${WORKDIR}/${PN}"
+fi
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_DOC=NO
+		-DWITH_EXAMPLES=NO
+		-DWITH_EASY="$(usex minimal NO YES)"
+		-DWITH_TESTS="$(usex test)"
+	)
+	if use test; then
+		# Don't run tests that need a network connection.
+		mycmakeargs+=(-DEXTRA_TEST_ARGS="~[api]")
+	fi
+
+	cmake-utils_src_configure
+}
+
+# We can not let cmake handle the documentation, because it would end up in
+# doc/mastodon-cpp-${PROJECT_VERSION} instead of -9999
+src_compile() {
+	cmake-utils_src_compile
+
+	if use doc; then
+		./build_doc.sh
+	fi
+}
+
+src_install() {
+	if use doc; then
+		HTML_DOCS="doc/html/*"
+	fi
+
+	if use examples; then
+		docinto examples
+		for file in examples/*.cpp; do
+			dodoc ${file}
+		done
+	fi
+
+	cmake-utils_src_install
+}
+
+src_postinst() {
+	ewarn "This version of mastodon-cpp is considerably different from versions below 0.100.0."
+	ewarn "Upgrading will require extensive code changes."
+}
--- a/dev-cpp/mastodon-cpp/mastodon-cpp-0.30.2-r1.ebuild
+++ b/dev-cpp/mastodon-cpp/mastodon-cpp-0.30.2-r1.ebuild
@ -0,0 +1,62 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit cmake-utils
+
+DESCRIPTION="mastodon-cpp is a C++ wrapper for the Mastodon API."
+HOMEPAGE="https://schlomp.space/tastytea/mastodon-cpp"
+SRC_URI="https://schlomp.space/tastytea/mastodon-cpp/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc examples static-libs"
+RDEPEND="
+	>=dev-cpp/curlpp-0.8.1
+	>=dev-libs/jsoncpp-1.8.4
+"
+DEPEND="
+	>=dev-util/cmake-3.9.6
+	doc? ( >=app-doc/doxygen-1.8.14-r1 )
+	${RDEPEND}
+"
+
+S="${WORKDIR}/${PN}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_DOC=NO
+		-DWITH_EXAMPLES=NO
+		-DWITH_TESTS=NO
+	)
+	if use static-libs; then
+		mycmakeargs+=(-DWITH_STATIC=YES)
+	fi
+
+	cmake-utils_src_configure
+}
+
+# We won't let cmake handle the documentation, because it would install the
+# examples, no matter if we want them.
+src_compile() {
+	cmake-utils_src_compile
+
+	if use doc; then
+		./build_doc.sh
+	fi
+}
+
+src_install() {
+	if use doc; then
+		HTML_DOCS="doc/html/*"
+	fi
+
+	if use examples; then
+		docinto examples
+		for file in examples/*.cpp; do
+			dodoc "${file}"
+		done
+	fi
+
+	cmake-utils_src_install
+}
--- a/dev-cpp/mastodon-cpp/mastodon-cpp-9999.ebuild
+++ b/dev-cpp/mastodon-cpp/mastodon-cpp-9999.ebuild
@ -0,0 +1,85 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit cmake-utils
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+fi
+
+DESCRIPTION="mastodon-cpp is a C++ wrapper for the Mastodon API."
+HOMEPAGE="https://schlomp.space/tastytea/mastodon-cpp"
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://schlomp.space/tastytea/mastodon-cpp.git"
+else
+	SRC_URI="https://schlomp.space/tastytea/mastodon-cpp/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+if [[ "${PV}" == "9999" ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
+IUSE="doc examples minimal test"
+
+RDEPEND="
+	dev-cpp/curlpp
+	!minimal? ( dev-libs/jsoncpp )
+"
+DEPEND="
+	dev-util/cmake
+	doc? ( app-doc/doxygen )
+	test? ( dev-cpp/catch )
+	${RDEPEND}
+"
+
+if [[ "${PV}" != "9999" ]]; then
+	S="${WORKDIR}/${PN}"
+fi
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_DOC=NO
+		-DWITH_EXAMPLES=NO
+		-DWITH_EASY="$(usex minimal NO YES)"
+		-DWITH_TESTS="$(usex test)"
+	)
+	if use test; then
+		# Don't run tests that need a network connection.
+		mycmakeargs+=(-DEXTRA_TEST_ARGS="~[api]")
+	fi
+
+	cmake-utils_src_configure
+}
+
+# We can not let cmake handle the documentation, because it would end up in
+# doc/mastodon-cpp-${PROJECT_VERSION} instead of -9999
+src_compile() {
+	cmake-utils_src_compile
+
+	if use doc; then
+		./build_doc.sh
+	fi
+}
+
+src_install() {
+	if use doc; then
+		HTML_DOCS="doc/html/*"
+	fi
+
+	if use examples; then
+		docinto examples
+		for file in examples/*.cpp; do
+			dodoc ${file}
+		done
+	fi
+
+	cmake-utils_src_install
+}
+
+src_postinst() {
+	ewarn "This version of mastodon-cpp is considerably different from versions below 0.100.0."
+	ewarn "Upgrading will require extensive code changes."
+}
--- a/dev-cpp/mastodon-cpp/metadata.xml
+++ b/dev-cpp/mastodon-cpp/metadata.xml
@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>gentoo@tastytea.de</email>
+    <name>tastytea</name>
+  </maintainer>
+  <upstream>
+    <maintainer status="active">
+        <name>tastytea</name>
+        <email>tastytea@tastytea.de</email>
+    </maintainer>
+    <doc>https://doc.schlomp.space/mastodon-cpp/</doc>
+    <bugs-to>https://schlomp.space/tastytea/mastodon-cpp/issues</bugs-to>
+  </upstream>
+</pkgmetadata>
--- a/dev-cpp/restclient-cpp/Manifest
+++ b/dev-cpp/restclient-cpp/Manifest
@ -1,2 +0,0 @@
-DIST restclient-cpp-0.5.1.tar.gz 919070 BLAKE2B 773bd6cf1f566421ae7eb6b6514f9690bd1ab75a011ee26b2a86b3248b122ed10cd1f0dfb046f3cb0a3ae8bcca0d2df80093bc9e3c5218280ed561c568a61926 SHA512 d5e17a984af44f863bc7cdc7307c2b06cae9252f86c6c6c2377cdb317f61b6419d8e9aedc5e5ccdb08fd1ee13848ec3b9ef8067a8d26dcf438a5c8793b5a2ce3
-DIST restclient-cpp-0.5.2.tar.gz 920664 BLAKE2B 6cb4292fb9e437e0440ff7b53d1f00e157bce5e068a6d74c0380e4b7c7d71cf462d9a3fc30cd05a8788f1efe6cbd042610e41bbf7705389d5f7ec78918e70c64 SHA512 f6acc6a3d5cb852d6e507463d94d2f6192a941f0c26fef7c674e9ff7753cf5474522052a2065774050d01af5c6d2a3b86398f43cd2e4f5d03abcaac9a21ef4b7
--- a/dev-cpp/restclient-cpp/files/0.5.1-GNUInstallDirs.patch
+++ b/dev-cpp/restclient-cpp/files/0.5.1-GNUInstallDirs.patch
@ -1,28 +0,0 @@
---
- CMakeLists.txt | 11 ++++++-----
- 1 file changed, 6 insertions(+), 5 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 10b8db8..7ea8b63 100644
--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -80,11 +80,12 @@ target_link_libraries(restclient-cpp
-   PUBLIC Threads::Threads
- )
-
-set(INCLUDE_INSTALL_DIR "include/restclient-cpp" )
-set(CONFIG_INSTALL_DIR "lib/cmake/restclient-cpp" )
-set(RUNTIME_INSTALL_DIR "bin" )
-set(LIB_INSTALL_DIR "lib" )
-set(DATA_INSTALL_DIR "share/restclient-cpp" )
-+include(GNUInstallDirs)
-+set(INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_INCLUDEDIR}/restclient-cpp" )
-+set(CONFIG_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/restclient-cpp" )
-+set(RUNTIME_INSTALL_DIR "${CMAKE_INSTALL_BINDIR}" )
-+set(LIB_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}" )
-+set(DATA_INSTALL_DIR "${CMAKE_INSTALL_DATADIR}/restclient-cpp" )
-
- install(TARGETS restclient-cpp EXPORT restclient-cppTargets
-   PUBLIC_HEADER DESTINATION ${INCLUDE_INSTALL_DIR}
--
-2.24.1
--- a/dev-cpp/restclient-cpp/metadata.xml
+++ b/dev-cpp/restclient-cpp/metadata.xml
@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>gentoo@tastytea.de</email>
-		<name>tastytea</name>
-	</maintainer>
-	<upstream>
-		<doc>https://code.mrtazz.com/restclient-cpp/ref/index.html</doc>
-		<bugs-to>https://github.com/mrtazz/restclient-cpp/issues</bugs-to>
-	</upstream>
-</pkgmetadata>
--- a/dev-cpp/restclient-cpp/restclient-cpp-0.5.1-r1.ebuild
+++ b/dev-cpp/restclient-cpp/restclient-cpp-0.5.1-r1.ebuild
@ -1,23 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="C++ client for making HTTP/REST requests"
-HOMEPAGE="https://code.mrtazz.com/restclient-cpp/"
-SRC_URI="https://github.com/mrtazz/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="net-misc/curl"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PV}-GNUInstallDirs.patch"
-)
-
-RESTRICT="test"
--- a/dev-cpp/restclient-cpp/restclient-cpp-0.5.2.ebuild
+++ b/dev-cpp/restclient-cpp/restclient-cpp-0.5.2.ebuild
@ -1,27 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="C++ client for making HTTP/REST requests"
-HOMEPAGE="https://code.mrtazz.com/restclient-cpp/"
-SRC_URI="https://github.com/mrtazz/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="net-misc/curl"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	test? (
-		dev-libs/jsoncpp
-		dev-cpp/gtest
-	)
-"
-
-# TODO: Figure out how to compile and run the tests.
-RESTRICT="test"
--- a/dev-cpp/xdgcfg/Manifest
+++ b/dev-cpp/xdgcfg/Manifest
@ -0,0 +1,13 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+DIST 0.5.0.tar.gz 6365 BLAKE2B 45da1564a2ab5cd52c2b41f53000bf7d88757d175b29e2244c51a4440e4f6d7260c53c2ca9734eea18f3635240065908701b312d7ab1b40a42438994e67294c2 SHA512 8fde22a7b9a6a313b504469afe9015d5378e70c1872d919f976f1c12132d4dadf1e3411e29443718040adc433191319395358da1002fe638ca878440319f38b2
+EBUILD xdgcfg-0.5.0.ebuild 1020 BLAKE2B 27443e8240e64c58f3726aec74380767e9a99c5a4714a0c3232c8111e29351d24c9e1a8b5f1d7c8b8b86d22aedfb9674a90f5fbd447ced0f983e3c4a4ea63b3a SHA512 3a0d29b19125366a39dd69d6e03c481028e791aba65a47cb8958ca521b75156c467b15689000d643d67052aca577995994a72a056293d8db717c79adc3525ec7
+MISC metadata.xml 517 BLAKE2B 92b4f4a82d463c752b950c01cfab624fc5d5f0fd2d2ef396fe4536fea8a325e07b92b7a38d76dcb59d5deab719cb7f31fad737cb879a787d7c866463a75064ff SHA512 14e1823026bee1e15f1f2cbf066bcd229ce4e54c713835b00f48bf034e7994372cb769b552403b00999a4f2e0ebeb9a6b95e0e3e1e00a9efc2724ea3af9c0039
+-----BEGIN PGP SIGNATURE-----
+
+iHUEAREIAB0WIQQ1VSZoZMptf/RapufPw5SX8bJuBwUCXUQg/gAKCRDPw5SX8bJu
+BxPxAP4/nzlcRQRs7vgWn89L8MthHBu00r6MKMnMJorwpp8XWgD/RDB5b+IYOjdD
+ND8kqiLf8rU1i7ZvS3bJU7ulO5Tki4=
+=M56T
+-----END PGP SIGNATURE-----
--- a/dev-cpp/xdgcfg/metadata.xml
+++ b/dev-cpp/xdgcfg/metadata.xml
@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>gentoo@tastytea.de</email>
+    <name>tastytea</name>
+  </maintainer>
+  <upstream>
+    <maintainer status="active">
+        <name>tastytea</name>
+        <email>tastytea@tastytea.de</email>
+    </maintainer>
+    <doc>https://doc.schlomp.space/xdgcfg/</doc>
+    <bugs-to>https://schlomp.space/tastytea/xdgcfg/issues</bugs-to>
+  </upstream>
+</pkgmetadata>
--- a/dev-cpp/xdgcfg/xdgcfg-0.5.0.ebuild
+++ b/dev-cpp/xdgcfg/xdgcfg-0.5.0.ebuild
@ -0,0 +1,59 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+DESCRIPTION="Wrapper around libconfig that writes and reads files in XDG_CONFIG_HOME"
+HOMEPAGE="https://schlomp.space/tastytea/xdgcfg"
+SRC_URI="https://schlomp.space/tastytea/${PN}/archive/${PV}.tar.gz"
+
+LICENSE="CC0-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples test"
+
+RDEPEND="
+	dev-libs/libconfig[cxx]
+	dev-libs/libxdg-basedir
+"
+DEPEND="
+	${RDEPEND}
+	test? ( dev-cpp/catch )
+	doc? ( app-doc/doxygen )
+"
+
+S="${WORKDIR}/${PN}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_TESTS=$(usex test)
+	)
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+
+	if use doc; then
+		./build_doc.sh || die "Generation of HTML documentation failed."
+	fi
+}
+
+src_test() {
+	BUILD_DIR="${BUILD_DIR}/tests" cmake-utils_src_test
+}
+
+src_install() {
+	if use doc; then
+		HTML_DOCS="doc/html/*"
+	fi
+
+	cmake-utils_src_install
+
+	if use examples; then
+		dodoc examples/example.cpp
+	fi
+}
--- a/dev-go/getopt2/Manifest
+++ b/dev-go/getopt2/Manifest
@ -0,0 +1,12 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+EBUILD getopt2-9999.ebuild 335 BLAKE2B 13b58b8bd8666164c0ecd59679525ba304e25d34cb71dc950bf7698eb0195b0a12b2ffcc5e44b9349dcbf58ad7c7c8b946ea54d5ca00f4f59107a46f68636142 SHA512 bda508092f75b489ed6c1354342ee7bc1f756bfd0e52c1b874de76cd77cc45c08effade2690b86a6e62fa21ffa684d79ada66f50cc81dae8774a1358e3ff86ed
+MISC metadata.xml 398 BLAKE2B f79a543b698cfa994c1a09960a0a0913c82ca49b3f374aa0754127e0aa013572098ae569fa9027072bddebd8fde5d4289b07899f73c0ece85c18e9efe8f6403b SHA512 40ea99948983b56af3ec1df02f991827a7e2070eb0898bb5658e86979f54432292919cd4c6dd7bfa441ea6cb8c85dad254ee5da1e6afa657088f9b246e1adf5a
+-----BEGIN PGP SIGNATURE-----
+
+iHUEAREIAB0WIQQ1VSZoZMptf/RapufPw5SX8bJuBwUCW+WcSQAKCRDPw5SX8bJu
+B+GnAP9tyqX7sY5ZHiGSin/M0UqR1JvY5GQTd2EU9ARNU5NSRAD+P6AHjYIPaN11
+hGyL61HHhhYJKzSBXVqpO4Dnfg5EB5Q=
+=Xnbg
+-----END PGP SIGNATURE-----
--- a/dev-go/getopt2/getopt2-9999.ebuild
+++ b/dev-go/getopt2/getopt2-9999.ebuild
@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit golang-build golang-vcs
+
+DESCRIPTION="getopt style option parsing for Go"
+HOMEPAGE="https://github.com/pborman/getopt"
+EGO_PN="github.com/pborman/getopt/v2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS=""
+
+DEPEND="dev-lang/go"
--- a/dev-go/getopt2/metadata.xml
+++ b/dev-go/getopt2/metadata.xml
@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>gentoo@tastytea.de</email>
+    <name>tastytea</name>
+  </maintainer>
+  <upstream>
+    <doc>https://godoc.org/github.com/pborman/getopt</doc>
+    <bugs-to>https://github.com/pborman/getopt/issues</bugs-to>
+  </upstream>
+</pkgmetadata>
--- a/dev-go/go-xmpp/Manifest
+++ b/dev-go/go-xmpp/Manifest
@ -0,0 +1,12 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+EBUILD go-xmpp-9999.ebuild 311 BLAKE2B e21ee83cf8bd8a469f6fc7bd06583ea5b519ced442c6e843347f099cdb14516b78f0b5826e7d8830abcaba4ba53fd1a082e01daca18094cead3f13f594c6328c SHA512 3b581dcc26a7f32dc309174ea47d20bc4c6ca7da4d8ce128bb201c2ebc906b204d78c572e84d68a667a2f474b51091665f822b247cb6c31b47d7ced25ac7db27
+MISC metadata.xml 553 BLAKE2B 6c5d0c085d48458b4fbbcbf6fb8659a3d29b9b46be550eb549a4535f8b7e1bd60543d075cd5475748512fe50cf6e9b9b062394fc80e7f4dbc2e9a1a030b8dd34 SHA512 38512a400f9fc1e186b94ed7874c11124162e964dbe0bde6b443a0acd8429e7445ada5eb09a6a8370848da2a1817a9f0dde2905393f30d5e60a8fbb707f7a263
+-----BEGIN PGP SIGNATURE-----
+
+iHUEAREIAB0WIQQ1VSZoZMptf/RapufPw5SX8bJuBwUCW+WcYAAKCRDPw5SX8bJu
+B01vAPwIM3d0NE39JQv8PWpPZW9DaojjZiPv1IInoDG1Z4dmOQD+PIEozKI5mfsl
+/wT5MrHE1zx98WjprGQ65oNyhVtOv00=
+=9MXW
+-----END PGP SIGNATURE-----
--- a/dev-go/go-xmpp/go-xmpp-9999.ebuild
+++ b/dev-go/go-xmpp/go-xmpp-9999.ebuild
@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit golang-build golang-vcs
+
+DESCRIPTION="go xmpp library"
+HOMEPAGE="https://github.com/mattn/go-xmpp"
+EGO_PN="github.com/mattn/go-xmpp"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS=""
+
+DEPEND="dev-lang/go"
--- a/dev-go/go-xmpp/metadata.xml
+++ b/dev-go/go-xmpp/metadata.xml
@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <longdescription>
+    Package xmpp implements a simple Google Talk client using the XMPP protocol described in RFC 3920 and RFC 3921.
+  </longdescription>
+  <maintainer type="person">
+    <email>gentoo@tastytea.de</email>
+    <name>tastytea</name>
+  </maintainer>
+  <upstream>
+    <doc>https://godoc.org/github.com/mattn/go-xmpp</doc>
+    <bugs-to>https://github.com/mattn/go-xmpp/issues</bugs-to>
+  </upstream>
+</pkgmetadata>
--- a/dev-go/reader/Manifest
+++ b/dev-go/reader/Manifest
@ -0,0 +1,12 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+EBUILD reader-9999.ebuild 353 BLAKE2B 1b63db38385d080f9151c25ce9e84074c8bf0d2dfc99fae66e6bc4f7e8cca2fe81ff91910f59ca3d47547fecbcd1bb39e205002a8424d6fc92153c97f2d501f7 SHA512 43d3cc6236a264893e6d83d1867d5abb0a0ae7b02ebacabde09e8df914069b89ef888bd120a17cc0a5d3a18787311f5ddb17edcdc399ed5ad5ee4ae20cf38074
+MISC metadata.xml 398 BLAKE2B f746372cca42f5b786144dd6d418673fc445e517a1bb9243d51f4212bcf8e14254e411ab50cb8004be49150ca4fc0af2695e0dbc23f0b781ceaaedbb70c9ec34 SHA512 3fb68be2839b6b8ca1290eb402d0bbdb56e4eddce6bff955bf98bfbd9f0f41c6be632b2b74a6710de7f7e5abd946f10bd9c00aebbf8b8179d731ff7bab88f0b3
+-----BEGIN PGP SIGNATURE-----
+
+iHUEAREIAB0WIQQ1VSZoZMptf/RapufPw5SX8bJuBwUCW+WcYAAKCRDPw5SX8bJu
+B9rAAP90/nlcKKYBRKJnPD2oy4f8s4IDgAPOp6IhR8lz1y9+8AD+LEr64Ungt66d
+05xtRCIYrpBB/myNOmwhtvzeVECAlG4=
+=mhJz
+-----END PGP SIGNATURE-----
--- a/dev-go/reader/metadata.xml
+++ b/dev-go/reader/metadata.xml
@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>gentoo@tastytea.de</email>
+    <name>tastytea</name>
+  </maintainer>
+  <upstream>
+    <doc>https://godoc.org/github.com/mellium/reader</doc>
+    <bugs-to>https://github.com/mellium/reader/issues</bugs-to>
+  </upstream>
+</pkgmetadata>
--- a/dev-go/reader/reader-9999.ebuild
+++ b/dev-go/reader/reader-9999.ebuild
@ -0,0 +1,17 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit golang-build golang-vcs
+
+DESCRIPTION="Common operations performed with Go's io.Reader interface."
+HOMEPAGE="https://github.com/mellium/reader"
+EGO_PN="mellium.im/reader"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS=""
+
+DEPEND="
+	dev-lang/go
+"
--- a/dev-go/sasl/Manifest
+++ b/dev-go/sasl/Manifest
@ -0,0 +1,12 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+EBUILD sasl-9999.ebuild 382 BLAKE2B 09c9f225f48757620ef4696e40262d3e8d624519947a992ef6e69d08d9067601994cf532938dba50f0606707eeb9e2e9b377a2847de1fe7bbc91da77ca15ae4e SHA512 be0a504d2b59208e441260f044156c98b8fa0d4441d47bb7a917a20db51ec73e0e329ff75b04f2c809abeb5e8b5b1db16c0b378f86768079e3121fca663a186d
+MISC metadata.xml 551 BLAKE2B 7f3c1bf891fbc3921d613d9e5b51710802eb940ca81de3139688b748740f54fdd15793b064cfe729cb46d25e052a9dcc59174aef72c8386ef38366843f41c192 SHA512 ebee067b885a0398620e3573533f7d550d456d1323ab566947de211025d166260618c35869847ff7a73a2491e96eb6ed309d6e7d0eda3a49d451812b5df96767
+-----BEGIN PGP SIGNATURE-----
+
+iHUEAREIAB0WIQQ1VSZoZMptf/RapufPw5SX8bJuBwUCW+WcYAAKCRDPw5SX8bJu
+B7KDAP9zEekzj2+32xHD6tFYjQhuI4X2enveEJOoh6xKK6WXowEAhOplvY0EN38+
+9QJIKaPxB+UCBqn7mhq4k3ARL7pR9vI=
+=9KDp
+-----END PGP SIGNATURE-----
--- a/dev-go/sasl/metadata.xml
+++ b/dev-go/sasl/metadata.xml
@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <longdescription>
+    Package xmpp implements a simple Google Talk client using the XMPP protocol described in RFC 3920 and RFC 3921.
+  </longdescription>
+  <maintainer type="person">
+    <email>gentoo@tastytea.de</email>
+    <name>tastytea</name>
+  </maintainer>
+  <upstream>
+    <doc>https://godoc.org/github.com/mellium/sasl</doc>
+    <bugs-to>https://github.com/mellium/sasl/issues</bugs-to>
+  </upstream>
+</pkgmetadata>
--- a/dev-go/sasl/sasl-9999.ebuild
+++ b/dev-go/sasl/sasl-9999.ebuild
@ -0,0 +1,18 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit golang-build golang-vcs
+
+DESCRIPTION="An implementation of the Simple Authentication and Security Layer (SASL)."
+HOMEPAGE="https://github.com/mellium/sasl"
+EGO_PN="mellium.im/sasl"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS=""
+
+DEPEND="
+	dev-lang/go
+	dev-go/go-crypto
+"
--- a/dev-go/xmlstream/Manifest
+++ b/dev-go/xmlstream/Manifest
@ -0,0 +1,12 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+EBUILD xmlstream-9999.ebuild 361 BLAKE2B 599dbdedd7513971b7e44edc1dc3a0d699a35f885bd673ba8edd1b7bdca2f5df1af8e81a1fed6fa427da621aded16e3bf810f3ae541e550660632ebbb635012c SHA512 d49e858519234303829210db3868b5ccf391b4fdb594815b4192b06c9c6ee76946b58c16d0298c61e4d0beb5c1c3a715afc2994486e2d71c40566f6315b21651
+MISC metadata.xml 404 BLAKE2B 1d3381d14d54a67b72224165fb8952fa67aab26981bb7a01d775f5eceef2898839d75a8db7eea6a558f1d35f63320b5de25817e64fcaf194046a5cf7b4593b75 SHA512 05f62287fb7a85b0cbc44f65450fa35b69b269270f2c5c7844bf72887b09035a49350c419aaad6f39a5fda8bec25d1b5429d05393b4179ea83860c85d463bda2
+-----BEGIN PGP SIGNATURE-----
+
+iHUEAREIAB0WIQQ1VSZoZMptf/RapufPw5SX8bJuBwUCW+WcYQAKCRDPw5SX8bJu
+B7aOAQCCCp0ZcQ5GM7Lp3vNuYmubSy0EmWBV1UOFcp9bIY3zyQD/aGVgOGB5hP0m
+oQ5IOVXKzX9wvViXf5D6WG8bZDKbb2c=
+=Vo8k
+-----END PGP SIGNATURE-----
--- a/dev-go/xmlstream/metadata.xml
+++ b/dev-go/xmlstream/metadata.xml
@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>gentoo@tastytea.de</email>
+    <name>tastytea</name>
+  </maintainer>
+  <upstream>
+    <doc>https://godoc.org/github.com/mellium/xmlstream</doc>
+    <bugs-to>https://github.com/mellium/xmlstream/issues</bugs-to>
+  </upstream>
+</pkgmetadata>
--- a/dev-go/xmlstream/xmlstream-9999.ebuild
+++ b/dev-go/xmlstream/xmlstream-9999.ebuild
@ -0,0 +1,18 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit golang-build golang-vcs
+
+DESCRIPTION="A library for manipulating XML token streams."
+HOMEPAGE="https://github.com/mellium/xmlstream"
+EGO_PN="mellium.im/xmlstream"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS=""
+
+DEPEND="
+	dev-lang/go
+	dev-go/reader
+"
--- a/dev-go/xmpp/Manifest
+++ b/dev-go/xmpp/Manifest
@ -0,0 +1,12 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+EBUILD xmpp-9999.ebuild 412 BLAKE2B 076e99acea34cf17946fe737431898e34452b0dffc80c6af561c6cfec2f3e78f4ae3ba3862729a7fd043b1f7fb0248b980e8f4e863a527aba6b4f0f6eec67fd8 SHA512 45eb998dd18c16cad12d962c8e739ad7ff2f0ef995ea404d556fac9e0ccf03b84421655e2785fe60a843416a33668e63bcb32c7180d67db577475b883424c532
+MISC metadata.xml 394 BLAKE2B 2463cf8a74ec0df5a734d4008929476562b5d2f100cd6ce8f34c88aca6eb87b9c18d7b29d29cbcd49f4d71b0cb8b48390f502dde40cfb2bc79c515a541e566aa SHA512 a3528cd424e9d63a211df243ff09b2c1b08de512cea30c7f7d55edec982e618e5d2c231916a7a16a159b26c4b8b177a3558776d92530228201921ac5719d60dd
+-----BEGIN PGP SIGNATURE-----
+
+iHUEAREIAB0WIQQ1VSZoZMptf/RapufPw5SX8bJuBwUCW+WcYQAKCRDPw5SX8bJu
+B/vzAP40Qp6x4OnZJcrvCtAvOJa1jyXr/kclSz4bo+pIhXZAoAD+N7sy6KXR+Gvn
+eidsG3HVkJoFAXCfChFyYp4scoiqwyY=
+=elrV
+-----END PGP SIGNATURE-----
--- a/dev-go/xmpp/metadata.xml
+++ b/dev-go/xmpp/metadata.xml
@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>gentoo@tastytea.de</email>
+    <name>tastytea</name>
+  </maintainer>
+  <upstream>
+    <doc>https://godoc.org/github.com/mellium/xmpp</doc>
+    <bugs-to>https://github.com/mellium/xmpp/issues</bugs-to>
+  </upstream>
+</pkgmetadata>
--- a/dev-go/xmpp/xmpp-9999.ebuild
+++ b/dev-go/xmpp/xmpp-9999.ebuild
@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit golang-build golang-vcs
+
+DESCRIPTION="An implementation of the Extensible Messaging and Presence Protocol (XMPP)."
+HOMEPAGE="https://github.com/mellium/xmpp"
+EGO_PN="mellium.im/xmpp"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS=""
+
+DEPEND="
+	dev-lang/go
+	dev-go/go-net
+	dev-go/sasl
+	dev-go/xmlstream
+"
--- a/dev-lang/compilescript/Manifest
+++ b/dev-lang/compilescript/Manifest
@ -1,2 +1,15 @@
-DIST compilescript-0.4.1.tar.gz 18449 BLAKE2B 37f5f520ed4607cd282a574e57e99db998a329a8a72d666efc9c34a44ffdd8354364ac61d5ba60f4f9c83d7055dec2956ba15143cb93298c4a3fe740c5c32057 SHA512 c25791dc9d73e7cd09d09e928eec06dd4fece807473997c42d9fe7d680a321535673d7d54f818381c7957279689e3343a311837f122e4a8475d5d8a67316da36
-DIST xdgcfg-0.2.3.tar.gz 5588 BLAKE2B 99bf7a668fe7784aa1883b5ac67b11bfe899a07e8f3444e01a01695e8f7055dd949853fcef82991f6bdaf290525aa89e2eac787659b149e83878dee21c96b196 SHA512 302a5a1a740bfbfa3d6028e3d2b91f8074719171c5e1d82a4c647bbbc64d213f540eb11af114a2bcd863d86b6d5804d256d06f35bc81725fddb29697561b58ac
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+DIST compilescript-0.4.0.tar.gz 17675 BLAKE2B 941934eee92db147b016210a0a40d5a16a783de817f609a7fff078114cb93b04a5ece53a98f0f48dd1a0ecab8deeaa73eae359c03fd17f92a71616c04468d377 SHA512 633ccb65876b64ce680cd41a9de73c5b0d085d3118288ae642e75833aec268c9d5718f2698412c540cd13a630e6dbb1ebc7540eddbb04481efefb79895a65df8
+DIST xdgcfg-0.2.3.tar.gz 5601 BLAKE2B ad761229e6d049b14b89febdfe09b2fa16c04ad84d848bd0bf27939cd9c8cd46694a5c48b8b28e38f062cc41a067c1c79ad1eed38bbfbc99682b96bec30998d3 SHA512 bdb48ca1ba7319e307e1ee5b172e6a6d6dd05ac13c61d08a04f006f4eb5f0d8b0ed52916a410c52e817c95d3597897a8675a2bdab0fabe82db01593052772c7e
+EBUILD compilescript-0.4.0.ebuild 1044 BLAKE2B 9f0867e0d20ead0e4ab0110e99961e662bdac5f83a393513af0ed2e6c91b3f7224375beecf168dccadb1cd27bf2841f0b63710ea40d67e001416b9eee5849821 SHA512 df207fa4dae21263b8b529b6f94cfcbd7a1b3f40778577628af7d84080f92f3bd0303366190cf4207c525b6602696e0799cc18c77cc0c81cf5cbd7e96c868770
+EBUILD compilescript-9999.ebuild 1044 BLAKE2B 9f0867e0d20ead0e4ab0110e99961e662bdac5f83a393513af0ed2e6c91b3f7224375beecf168dccadb1cd27bf2841f0b63710ea40d67e001416b9eee5849821 SHA512 df207fa4dae21263b8b529b6f94cfcbd7a1b3f40778577628af7d84080f92f3bd0303366190cf4207c525b6602696e0799cc18c77cc0c81cf5cbd7e96c868770
+MISC metadata.xml 350 BLAKE2B d47e71ec73ca4df10f35231fd3916b1158a6413d880a2fcb8a56bb9b06caeb10005f1b8cf214b59941a324853f77a61c7f1be6a1d4fecb28a9375ce280f14872 SHA512 0e9ed6a9aca6c19565f27ffd9f67a1fed84eef982311ac243f7ccfe802e62c6e09eae19d0b1cc2d8b9601f95ba19e9f3b664ef19d62be6c184e597763d878123
+-----BEGIN PGP SIGNATURE-----
+
+iHUEAREIAB0WIQQ1VSZoZMptf/RapufPw5SX8bJuBwUCXH77RAAKCRDPw5SX8bJu
+B+LuAP4zrgB24DN6bGOW1ZsjiOQD8Ficc2yInk6y99Pcknke+wD+Jv+FVzJB5TqZ
+pkXyhdywhn274WctSO4I7RN3TV2HvMI=
+=jJ76
+-----END PGP SIGNATURE-----
--- a/dev-lang/compilescript/compilescript-0.4.0.ebuild
+++ b/dev-lang/compilescript/compilescript-0.4.0.ebuild
@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7

-inherit cmake
+inherit cmake-utils

 if [[ "${PV}" == "9999" ]]; then
 	inherit git-r3
@ -19,12 +19,15 @@ else
 		https://schlomp.space/tastytea/compilescript/archive/${PV}.tar.gz -> ${P}.tar.gz
 		https://schlomp.space/tastytea/xdgcfg/archive/${XDGCFG_PV}.tar.gz -> xdgcfg-${XDGCFG_PV}.tar.gz
 	"
-	S="${WORKDIR}/${PN}"
-	KEYWORDS="~amd64"
 fi

 LICENSE="GPL-3"
 SLOT="0"
+if [[ "${PV}" == "9999" ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
 IUSE=""

 RDEPEND="
@ -32,11 +35,15 @@ RDEPEND="
 	dev-libs/libxdg-basedir
 "
 DEPEND="
-	dev-build/cmake
+	dev-util/cmake
 	app-text/asciidoc
 	${RDEPEND}
 "

+if [[ "${PV}" != "9999" ]]; then
+	S="${WORKDIR}/${PN}"
+fi
+
 src_unpack() {
 	if [[ "${PV}" == "9999" ]]; then
 		git-r3_src_unpack
--- a/dev-lang/compilescript/compilescript-9999.ebuild
+++ b/dev-lang/compilescript/compilescript-9999.ebuild
@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7

-inherit cmake
+inherit cmake-utils

 if [[ "${PV}" == "9999" ]]; then
 	inherit git-r3
@ -19,12 +19,15 @@ else
 		https://schlomp.space/tastytea/compilescript/archive/${PV}.tar.gz -> ${P}.tar.gz
 		https://schlomp.space/tastytea/xdgcfg/archive/${XDGCFG_PV}.tar.gz -> xdgcfg-${XDGCFG_PV}.tar.gz
 	"
-	S="${WORKDIR}/${PN}"
-	KEYWORDS="~amd64"
 fi

 LICENSE="GPL-3"
 SLOT="0"
+if [[ "${PV}" == "9999" ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
 IUSE=""

 RDEPEND="
@ -32,11 +35,15 @@ RDEPEND="
 	dev-libs/libxdg-basedir
 "
 DEPEND="
-	dev-build/cmake
+	dev-util/cmake
 	app-text/asciidoc
 	${RDEPEND}
 "

+if [[ "${PV}" != "9999" ]]; then
+	S="${WORKDIR}/${PN}"
+fi
+
 src_unpack() {
 	if [[ "${PV}" == "9999" ]]; then
 		git-r3_src_unpack
--- a/dev-libs/granite/Manifest
+++ b/dev-libs/granite/Manifest
@ -0,0 +1,13 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+DIST 5.2.4.tar.gz 390145 BLAKE2B 30abee1669bf2211aa776a5ddf38b914bc95e466f2853f4e852b77947b666c06ce8ac77a47b22bce0cdbf8e6804935007b5cef700c49db302528b7bbb0063543 SHA512 3a52a92a49f887bb802754b99b7c9c3fd13c197c74da7c25f1fd4c03b76d916197079b813909d2cceb11cb10b26e9f64978563b95319d0c744c5b612c50ce306
+EBUILD granite-5.2.4.ebuild 1357 BLAKE2B 761f96a9d4162f0abc4396b06dfb4f56c65c5032e31cc5abe2cfcfbc7d47bc8f15ac1cb05a67d05acba03f8f26d7c15e4165a14b65ab5f13449925355ed3fede SHA512 75fe519086d651c19e72597a1f40dbf9475e502ff1c48a3c1d67539cc7248bceaf82285df0ec800318cd92c623f290c97707a2549477b23fbf4e1890cd2a3eef
+MISC metadata.xml 772 BLAKE2B 23c800121382b7027f641dd0785dca77f0514e614333169d963bb44ad6ba3bade6fd065799f41548cb3907c29408859640395786278accc9a56b50bb25ef59b0 SHA512 e7cb9fee7c76a1fbdc5e36de2a418030ea1fd742109063afd2c4286d271a616c50cdb802515eecec600276d78b226e7b21159712dd3c37e7a0f1ac677d68db75
+-----BEGIN PGP SIGNATURE-----
+
+iHUEAREIAB0WIQQ1VSZoZMptf/RapufPw5SX8bJuBwUCXSEFlAAKCRDPw5SX8bJu
+B66WAQCFt60kR1L59pn4qwVs0rZwAthtzoOzuOWkIG/tMsoUZwD/U5NC1vmSmvzT
+KF4nsLQeB9mLA5oQRftkK7DgdWUsR68=
+=8m5E
+-----END PGP SIGNATURE-----
--- a/dev-libs/granite/granite-5.2.4.ebuild
+++ b/dev-libs/granite/granite-5.2.4.ebuild
@ -0,0 +1,61 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson vala xdg-utils
+
+DESCRIPTION="Elementary OS library that extends Gtk+"
+HOMEPAGE="https://github.com/elementary/granite"
+SRC_URI="https://github.com/elementary/${PN}/archive/${PV}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="demo nls"
+
+RDEPEND="
+	dev-libs/glib:2
+	dev-libs/libgee:0.8[introspection]
+	x11-libs/gtk+:3[introspection]"
+DEPEND="
+	${RDEPEND}
+	dev-util/meson
+	dev-lang/vala
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+# NOTE: Did not get documentation to compile, revisit later.
+	# doc? (
+	# 		dev-lang/vala[valadoc]
+	# 		dev-util/gtk-doc
+	# )
+	# !doc? ( dev-lang/vala )
+
+src_prepare() {
+	vala_src_prepare
+	default
+}
+
+src_configure() {
+	# Disable building of the demo application.
+	use demo || sed -i "/^subdir('demo')$/d" meson.build || die
+
+	# Disable generation of the translations.
+	use nls || sed -i "/^subdir('po')$/d" meson.build || die
+
+	# # Use valadoc-$(vala_best_api_version) instead of valadoc.
+	# use doc && sed -i "s/find_program('valadoc')/find_program('valadoc-$(vala_best_api_version)')/" doc/meson.build || die
+
+	# local emesonargs=( $(meson_use doc documentation) )
+
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
--- a/dev-libs/granite/metadata.xml
+++ b/dev-libs/granite/metadata.xml
@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>gentoo@tastytea.de</email>
+    <name>tastytea</name>
+  </maintainer>
+  <longdescription lang="en">
+    Granite is a companion library for GTK+ and GLib. Among other things,
+    it provides complex widgets and convenience functions designed for
+    use in apps built for elementary OS.
+  </longdescription>
+  <use>
+    <flag name="demo">Build the Granite demo application (to present all available UI features provided by the library)</flag>
+  </use>
+  <upstream>
+    <remote-id type="github">elementary/granite</remote-id>
+    <doc>https://valadoc.org/granite/Granite.html</doc>
+  </upstream>
+</pkgmetadata>
--- a/dev-perl/Mail-GnuPG/Mail-GnuPG-0.23.ebuild
+++ b/dev-perl/Mail-GnuPG/Mail-GnuPG-0.23.ebuild
@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MODULE_AUTHOR="DDB"
-
-inherit perl-module
-
-DESCRIPTION="Process email with GPG"
-
-LICENSE="|| ( GPL-2 Artistic )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-SRC_URI="mirror://cpan/authors/id/D/DD/DDB/${PF}.tar.gz"
-
-RDEPEND="dev-perl/GnuPG-Interface
-	dev-perl/MIME-tools
-	virtual/perl-File-Temp
-	dev-perl/Email-Address
-"
-DEPEND="dev-perl/Module-Build
-	${RDEPEND}
-"
--- a/dev-perl/Mail-GnuPG/Manifest
+++ b/dev-perl/Mail-GnuPG/Manifest
@ -1 +0,0 @@
-DIST Mail-GnuPG-0.23.tar.gz 223605 BLAKE2B 74e0d6ccf2a27dd4cb1a8cc89f49d199478f0f2fdb1e2b282bb8ec9c4a7babb3733ecff686fca55abb778790c2967753d23eb1ff0523ac5b3d996e4ee6e9802f SHA512 58131f5989ff8f0355c30bccd0e848219e849ca56bcc506da16f049c056e0246b047ca25d9950067d1e051e881bdb9433b87147f1cb711c0af9a26a17dc6c138
--- a/dev-perl/Mail-GnuPG/metadata.xml
+++ b/dev-perl/Mail-GnuPG/metadata.xml
@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>gentoo@tastytea.de</email>
-		<name>tastytea</name>
-	</maintainer>
-	<upstream>
-		<bugs-to>https://rt.cpan.org/Public/Dist/Display.html?Name=Mail-GnuPG</bugs-to>
-	</upstream>
-</pkgmetadata>
--- a/dev-python/http_ece/Manifest
+++ b/dev-python/http_ece/Manifest
@ -0,0 +1,13 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+DIST v1.0.5.tar.gz 18915 BLAKE2B 3861d1f996b8ba42432d14c928880feb11be5b142a14ea92bd66d85ee41c4b13bc49bfdb17a94531315c720dd374c86bfefc5a40077adb3172d08eba5efcca8a SHA512 6516179ea7cb38e6118282b1fc230814df74a295196acfc6e1e82cd8f4060d517bedbb81903fb259d1eba6d270d52216670116729af16bbfab1bafdc22411c43
+EBUILD http_ece-1.0.5.ebuild 565 BLAKE2B 70a7ad0ca7f90cda0dffb108272624bd58045b068ee7eafe74a4ee8408208ac32f10851b34eb375d6cb9e5dde7d85179e1d4d4a2ed7362e8c991826d7dd5e6c8 SHA512 645e7b256ded535127d91849d3e26dfc691bb63686fc539fbc8980585503fe4023a189521fe93eb7187797c6dd3d886e8cbc0b273c1b78b003d4624386a80249
+MISC metadata.xml 365 BLAKE2B f9b846915aef6861b70fef804adf4a609028fd958a6636e8e0fc83f633c1d173eddb2c05dd8c530e2a808d553676a6fd9fcb55a3a0a77425cb4a5765f4755637 SHA512 0a6541d36e6a82941cf038c9939d0b02d61da3aadde727faf8cd1612a20f21ea5219fd227164c41a9d31dc28106046828a49f4e46619e31cc66f7bf27c7a33fb
+-----BEGIN PGP SIGNATURE-----
+
+iHUEAREIAB0WIQQ1VSZoZMptf/RapufPw5SX8bJuBwUCW/cL0gAKCRDPw5SX8bJu
+B/iHAP9ka4In+63JFEO+2KB6mQPSR9S9L/oiOFWuYqeqFcyUXQD/YbFlv9Ynz/iQ
+hVQZaJ6qdbQWs4ojqln3b4NxRBPnDqA=
+=zGJ1
+-----END PGP SIGNATURE-----
--- a/dev-python/http_ece/http_ece-1.0.5.ebuild
+++ b/dev-python/http_ece/http_ece-1.0.5.ebuild
@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_6 )
+
+inherit distutils-r1
+
+DESCRIPTION="A simple implementation of the encrypted content-encoding"
+HOMEPAGE="https://github.com/web-push-libs/encrypted-content-encoding"
+SRC_URI="https://github.com/web-push-libs/encrypted-content-encoding/archive/v${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-python/cryptography"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/encrypted-content-encoding-${PV}/python"
--- a/dev-python/http_ece/metadata.xml
+++ b/dev-python/http_ece/metadata.xml
@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>gentoo@tastytea.de</email>
+    <name>tastytea</name>
+  </maintainer>
+  <upstream>
+    <bugs-to>https://github.com/web-push-libs/encrypted-content-encoding/issues</bugs-to>
+  </upstream>
+</pkgmetadata>
--- a/dev-python/lsprotocol/Manifest
+++ b/dev-python/lsprotocol/Manifest
@ -1,2 +0,0 @@
-DIST lsprotocol-2023.0.0a1.tar.gz 68113 BLAKE2B 12f13204d35bc65ad6e25cbc91e535e6e85c4b4f6d990962bb2f5b644ace3c06344b821232528b2c65b61724d3ea1f51c58ae2cd9e240f8965e7217d2738b0a2 SHA512 d7c8dab273bfcaa2539dc73386fcff1a2389d04816369d8953443420dd0b725d646f9b4ac830e47de6ad3ce1fba27396447cd8be98e2e2e97c8273c1b42e72d3
-DIST lsprotocol-2023.0.1.tar.gz 69434 BLAKE2B 77ad18614d1e33681e12186c1198327371ec33bbf817ed3e98b5b60084c970190af83783cf1f96e2d9b6977a28359f91f8215d79d1c476fd6805693f7fa7518b SHA512 8844056332360ce966f4c2c650e1597fc798387dd8cc90a10446a8e30316e68a795b2cf6fc42b8ae098398fca135ba7fe0fda71ddaf685b6848a4f3562dbb3e4
--- a/dev-python/lsprotocol/lsprotocol-2023.0.0_alpha1.ebuild
+++ b/dev-python/lsprotocol/lsprotocol-2023.0.0_alpha1.ebuild
@ -1,15 +0,0 @@
-# Copyright 2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{10..11} )
-inherit distutils-r1 pypi
-
-DESCRIPTION="Python implementation of the Language Server Protocol"
-HOMEPAGE="https://pypi.org/project/lsprotocol/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
--- a/dev-python/lsprotocol/lsprotocol-2023.0.1.ebuild
+++ b/dev-python/lsprotocol/lsprotocol-2023.0.1.ebuild
@ -1,15 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{10..12} )
-inherit distutils-r1 pypi
-
-DESCRIPTION="Python implementation of the Language Server Protocol"
-HOMEPAGE="https://pypi.org/project/lsprotocol/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
--- a/dev-python/lsprotocol/metadata.xml
+++ b/dev-python/lsprotocol/metadata.xml
@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>gentoo@tastytea.de</email>
-		<name>tastytea</name>
-	</maintainer>
-	<stabilize-allarches />
-	<upstream>
-		<remote-id type="pypi">lsprotocol</remote-id>
-	</upstream>
-</pkgmetadata>
--- a/dev-python/pygls/Manifest
+++ b/dev-python/pygls/Manifest
@ -1,2 +0,0 @@
-DIST pygls-1.3.0.gh.tar.gz 198853 BLAKE2B 963ae743e0f868316516105db3a9b30530bc81a650d0e9ef98e7e240ee757482feae811345ce35558af3edc3d1d920bea317c98adf811eb97e66e9e4b620434b SHA512 208a0f2ece30d6fa0fdf9ce3b9d3eeb6bd835abf407223b0842b4589d3530152357098c2e43e937c7863df2b4ca966d32ac235f9ce223abd9afcc6bfb4d2c07a
-DIST pygls-1.3.1.gh.tar.gz 199111 BLAKE2B 8c6a3a371f3c42cf944a42d04b81f4676dd61e641a4746863d31826c7ed050a2e9dc39ff0eda9bd4e754dc0c777e15c1e1baae11cb764a93afd59abd1582fa96 SHA512 ef5d516d2da7e747fafd0a333157a964efcc7bcb424b2171451eb4f4084ada40ea2294cfa2322201b052a10f2958cbf2ea05748fbf7890bc4fbf6d82e154f9d4
--- a/dev-python/pygls/metadata.xml
+++ b/dev-python/pygls/metadata.xml
@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>gentoo@tastytea.de</email>
-		<name>Ronny (tastytea) Gutbrod</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="pypi">pygls</remote-id>
-		<remote-id type="github">openlawlibrary/pygls</remote-id>
-	</upstream>
-	<use>
-		<flag name="ws">websocket support</flag>
-	</use>
-</pkgmetadata>
--- a/dev-python/pygls/pygls-1.3.0.ebuild
+++ b/dev-python/pygls/pygls-1.3.0.ebuild
@ -1,38 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A pythonic generic language server"
-HOMEPAGE="
-	https://pygls.readthedocs.io/en/latest/
-	https://pypi.org/project/pygls/
-"
-# NOTE: pypi tarball is missing tests
-SRC_URI="https://github.com/openlawlibrary/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test ws"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/lsprotocol-2023.0.1[${PYTHON_USEDEP}]
-	ws? ( >=dev-python/websockets-11.0.3[${PYTHON_USEDEP}] )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/cattrs[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
--- a/dev-python/pygls/pygls-1.3.1.ebuild
+++ b/dev-python/pygls/pygls-1.3.1.ebuild
@ -1,38 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A pythonic generic language server"
-HOMEPAGE="
-	https://pygls.readthedocs.io/en/latest/
-	https://pypi.org/project/pygls/
-"
-# NOTE: pypi tarball is missing tests
-SRC_URI="https://github.com/openlawlibrary/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test ws"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/lsprotocol-2023.0.1[${PYTHON_USEDEP}]
-	ws? ( >=dev-python/websockets-11.0.3[${PYTHON_USEDEP}] )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/cattrs[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
--- a/dev-python/python-nbxmpp/Manifest
+++ b/dev-python/python-nbxmpp/Manifest
@ -0,0 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+DIST python-nbxmpp-0.6.10.tar.gz 1337256 BLAKE2B 2c885887dce4881b2871a9a1607378bcc6c18418275b6888f95891ec5f2f7d034c50c5af06e9363103ad68748b45b687b79bea908dac06fc44595ce6b3f921d6 SHA512 1e58b3faa6a9eeb0373a077f152c71c69ac56a8e3cd0ab66d1687bf891b529c6ab4cbe683357269c6dacd39b632761a63fbe2acaf1622fe4996e38c3881735b5
+DIST python-nbxmpp-0.6.9.tar.gz 1337067 BLAKE2B c53229603f8c76cfee8a8108119d91c85cb34757519f567403bc079da4518ce033356b0dff7ceaa4b62414209cdad06df615f97130523b2f1553c24314003ff2 SHA512 04dfe774881665e2a8d88b3b4dbd93db1cca90ef38c47af0b981c228ba6fde852a817507ca489ecdcd38a63d9942e39d78b656d0f06bbd7928eb6a26d404594e
+EBUILD python-nbxmpp-0.6.10.ebuild 528 BLAKE2B cd327f51df1aedfb2aca7e58b365e633755b52c334520fb34ffa5defcc2fb72681632a64ad0a3160e6f6f26c57dea24b6e34a565dc3c56e9691151fb43398b12 SHA512 e523da0488a21e0ba7b3efd328ace98f152934d4e505e226c39ba09c26a4e4725f369fc34a0af575790f1fbc1cb78aa81750fcf91bf3dd077b00d2b1106fb16c
+EBUILD python-nbxmpp-0.6.9.ebuild 528 BLAKE2B cd327f51df1aedfb2aca7e58b365e633755b52c334520fb34ffa5defcc2fb72681632a64ad0a3160e6f6f26c57dea24b6e34a565dc3c56e9691151fb43398b12 SHA512 e523da0488a21e0ba7b3efd328ace98f152934d4e505e226c39ba09c26a4e4725f369fc34a0af575790f1fbc1cb78aa81750fcf91bf3dd077b00d2b1106fb16c
+MISC metadata.xml 248 BLAKE2B 0f4a45d414249f9410a61d8545ba052db41e3d74516e34bff0ca5547cae55db7eefffb2c23d840c979bdea0b927da36f7a56441cbc6053291d65bd39af2421bd SHA512 0f6384333cf38e52e6a67db43f3a78723d2a0d3446da27e7972f15244d96ae41f0e428d937538d4fa52aa70dc9c92920672d4e237b481dbbdff1d9d8c325b33d
+-----BEGIN PGP SIGNATURE-----
+
+iHUEAREIAB0WIQQ1VSZoZMptf/RapufPw5SX8bJuBwUCXGsSkQAKCRDPw5SX8bJu
+By2NAP0eqHY8mh+sQQyncY1Mvv6Ho0oZJLLChYxuzQFRrFdragD/e96nFKNuBcQ3
+ltLxJAIpfX91wYpRkHi7znWe/QfcT7M=
+=mWA1
+-----END PGP SIGNATURE-----
--- a/dev-python/python-nbxmpp/metadata.xml
+++ b/dev-python/python-nbxmpp/metadata.xml
@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>gentoo@tastytea.de</email>
-		<name>tastytea</name>
-	</maintainer>
+  <maintainer type="person">
+    <email>gentoo@tastytea.de</email>
+    <name>tastytea</name>
+  </maintainer>
 </pkgmetadata>
--- a/dev-python/python-nbxmpp/python-nbxmpp-0.6.10.ebuild
+++ b/dev-python/python-nbxmpp/python-nbxmpp-0.6.10.ebuild
@ -0,0 +1,17 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="Python library to use Jabber/XMPP networks in a non-blocking way"
+HOMEPAGE="http://python-nbxmpp.gajim.org/"
+SRC_URI="https://dev.gajim.org/gajim/python-nbxmpp/repository/archive.tar.gz?ref=nbxmpp-${PV} -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
--- a/dev-python/python-nbxmpp/python-nbxmpp-0.6.9.ebuild
+++ b/dev-python/python-nbxmpp/python-nbxmpp-0.6.9.ebuild
@ -0,0 +1,17 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="Python library to use Jabber/XMPP networks in a non-blocking way"
+HOMEPAGE="http://python-nbxmpp.gajim.org/"
+SRC_URI="https://dev.gajim.org/gajim/python-nbxmpp/repository/archive.tar.gz?ref=nbxmpp-${PV} -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
--- a/dev-util/cmakelang/Manifest
+++ b/dev-util/cmakelang/Manifest
@ -1 +0,0 @@
-DIST cmakelang-0.6.13.tar.gz 1022629 BLAKE2B f62ce29e81a79f0301b1f04e70d95419486e3687e2e34d89e9d0343749026c73cbc6ae0d9e4f079abd1d68ac021108e9322805df38299c5666d06db5f135105d SHA512 eb7fde540860b6119d0bb528f22592fb4b507f9319aeda0999da10bcc89ee1348fd7d701fc49aa5dac7616e1577e436cbd73de94dbbab0cafdf28e1812612342
--- a/Show More
+++ b/Show More
				`@ -1 +0,0 @@`
				`DIST cpprest-2.10.18.tar.gz 1747792 BLAKE2B c2ea22cb09c39cb3c1d0936ae896c79172b92b5c4db46d9204988ec0012d74e901bcc24232b6971faae8adc03a41e4563fcc2a6d4aade2a33cdc3a1c9e36fff0 SHA512 5f0699e7ba509e16d6a3000e6ac448f6dbc134b8e03de9ab174ba749ad7efa76cbfccb623b226d82f5dba35ef6292f0cdf121b5315d524a5a28454038d420fab`
				`@ -1 +0,0 @@`
				`DIST Mail-GnuPG-0.23.tar.gz 223605 BLAKE2B 74e0d6ccf2a27dd4cb1a8cc89f49d199478f0f2fdb1e2b282bb8ec9c4a7babb3733ecff686fca55abb778790c2967753d23eb1ff0523ac5b3d996e4ee6e9802f SHA512 58131f5989ff8f0355c30bccd0e848219e849ca56bcc506da16f049c056e0246b047ca25d9950067d1e051e881bdb9433b87147f1cb711c0af9a26a17dc6c138`
				`@ -1 +0,0 @@`
				`DIST cmakelang-0.6.13.tar.gz 1022629 BLAKE2B f62ce29e81a79f0301b1f04e70d95419486e3687e2e34d89e9d0343749026c73cbc6ae0d9e4f079abd1d68ac021108e9322805df38299c5666d06db5f135105d SHA512 eb7fde540860b6119d0bb528f22592fb4b507f9319aeda0999da10bcc89ee1348fd7d701fc49aa5dac7616e1577e436cbd73de94dbbab0cafdf28e1812612342`