Merge updates from master

2026-07-19 12:03:02 -04:00 · 2021-05-17 19:20:12 +00:00
parent 46d2cb2cec dd3a223e6a
commit 6b26162490
160 changed files with 2479 additions and 1645 deletions
--- a/acct-group/owncast/metadata.xml
+++ b/acct-group/owncast/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>creideiki+gentoo-guru@lysator.liu.se</email>
+		<name>Karl-Johan Karlsson</name>
+	</maintainer>
+</pkgmetadata>
--- a/acct-group/owncast/owncast-0.ebuild
+++ b/acct-group/owncast/owncast-0.ebuild
@@ -0,0 +1,11 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+DESCRIPTION="Group for media-video/owncast"
+ACCT_GROUP_ID=-1
--- a/acct-user/owncast/metadata.xml
+++ b/acct-user/owncast/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>creideiki+gentoo-guru@lysator.liu.se</email>
+		<name>Karl-Johan Karlsson</name>
+	</maintainer>
+</pkgmetadata>
--- a/acct-user/owncast/owncast-0.ebuild
+++ b/acct-user/owncast/owncast-0.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+DESCRIPTION="User for media-video/owncast"
+ACCT_USER_ID=-1
+ACCT_USER_GROUPS=( ${PN} )
+ACCT_USER_HOME=/var/lib/owncast
+ACCT_USER_HOME_PERMS=0755
+
+acct-user_add_deps
--- a/app-crypt/reop/reop-2.1.1.ebuild
+++ b/app-crypt/reop/reop-2.1.1.ebuild
@@ -3,6 +3,8 @@

 EAPI=7

+inherit toolchain-funcs
+
 DESCRIPTION="reasonable expectation of privacy"
 HOMEPAGE="https://flak.tedunangst.com/post/reop"
 SRC_URI="https://flak.tedunangst.com/files/${P}.tgz"
@@ -15,7 +17,7 @@ DEPEND="dev-libs/libsodium:="
 RDEPEND="${DEPEND}"

 src_compile() {
-	emake CC="${CC:-cc}" CFLAGS="${CFLAGS}" LDFLAGS="-lsodium ${LDFLAGS}"
+	emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" LDFLAGS="-lsodium ${LDFLAGS}"
 }

 src_test() {
--- a/app-eselect/eselect-scheme/eselect-scheme-3.0.0.ebuild
+++ b/app-eselect/eselect-scheme/eselect-scheme-3.0.0.ebuild
--- a/app-eselect/eselect-scheme/files/scheme.eselect-2.0.0
+++ b/app-eselect/eselect-scheme/files/scheme.eselect-2.0.0
@@ -1,37 +0,0 @@
-#!/bin/sh
-
-
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-
-DESCRIPTION="Manages scheme implementations"
-MAINTAINER="xgqt@riseup.net"
-VERSION="2.0.0"
-
-SYMLINK_DESCRIPTION="default scheme implementations"
-SYMLINK_PATH="/usr/bin/scheme"
-SYMLINK_TARGETS=(
-    chezscheme                  # dev-scheme/chezscheme
-    chicken                     # dev-scheme/chicken
-    cyclone icyc                # dev-scheme/cyclone
-    elk                         # dev-scheme/elk
-    escm                        # dev-scheme/escm
-    gsi                         # dev-scheme/gambit
-    guile                       # dev-scheme/guile
-    gxi                         # dev-scheme/gerbil
-    jscheme                     # dev-scheme/jscheme
-    plt-r5rs racket             # dev-scheme/racket
-    scheme48                    # dev-scheme/scheme48
-    scm                         # dev-scheme/scm
-    stklos                      # dev-scheme/stklos
-    tinyscheme                  # dev-scheme/tinyscheme
-    ypsilon                     # dev-scheme/ypsilon
-)
-
-
-inherit bin-symlink
-
-do_unset() {
-    rm -f "${SYMLINK_PATH}"
-}
--- a/app-eselect/eselect-scheme/files/scheme.eselect-3.0.0
+++ b/app-eselect/eselect-scheme/files/scheme.eselect-3.0.0
@@ -0,0 +1,38 @@
+#!/bin/sh
+
+
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+
+DESCRIPTION="Manages scheme implementations"
+MAINTAINER="xgqt@riseup.net"
+VERSION="2.0.0"
+
+SYMLINK_DESCRIPTION="default scheme"
+SYMLINK_PATH="/usr/bin/scheme"
+SYMLINK_TARGETS=(
+    chezscheme                  # chezscheme
+    chicken csi                 # chicken
+    cyclone icyc                # cyclone
+    elk                         # elk
+    escm                        # escm
+    gosh                        # gauche
+    gsi                         # gambit
+    guile                       # guile
+    gxi                         # gerbil
+    jscheme                     # jscheme
+    plt-r5rs racket             # racket
+    scheme48                    # scheme48
+    scm                         # scm
+    stklos                      # stklos
+    tinyscheme                  # tinyscheme
+    ypsilon                     # ypsilon
+)
+
+
+inherit bin-symlink
+
+do_unset() {
+    rm -f "${SYMLINK_PATH}"
+}
--- a/app-misc/apidb/Manifest
+++ b/app-misc/apidb/Manifest
@@ -1,6 +1 @@
-DIST 4.3.0-beta.2.tar.gz 168416 BLAKE2B a3c6e948d0227c6bfc1e030111c0c31fe89ebc294f283246f3446d611ae4d4353534c9270dac40fb46b9189d8ea42ab0f10c2e2d783af8499442c207bd76e3dd SHA512 efc0733ea683a47a2e10e97a53ea6ed378aa152b191d7689529a9acfe0866c7aefec2987b9094c4874c4966ae5869a133a5b194de8e99af338282ff30f2586ad
-DIST 5.0.0-alpha.2.tar.gz 165464 BLAKE2B 92975743b28dbed779c9d3c86cb9636b321f18268e830e97fcd80f54f67bb29a70b1d8f5bd509b5f6c86f982b48d31b861aad5f1981f4304ad43eda254620283 SHA512 d184cc782494e655f154cd23486a3bf4385b07c0ce95032b940c614cb16cb575ffecdceab3e71e7d90cb198b68867b06666da65db0981e5b87c4ab7c703fa794
-DIST 5.0.0-alpha19.tar.gz 160561 BLAKE2B 52479e68742f62b8c98d9c9a31a261f6c887966bdf3e1820e3109af5a8164ba8294e4aecf806afb182a05750a6a548d855a492ee277051c494ef8897e2de3e73 SHA512 7008857aa20365d8b9f0c05a5e021e4071ae9af7c9208a4d33840b8e5118e5e1404cd005ec05a5a0d64bb3690d009a2f60af648dadc2bd14d806b6776828724b
-DIST 5.0.0-alpha20.tar.gz 160582 BLAKE2B cc50f784b67f0ab1564f4ea596864e65fa5c87f3729befd9a53ecf200f11f97ced901207bfd5313b814bc5b2d5df35ab62102606974e2b4f52e2bf80a09f9c9d SHA512 465f2938f4fe9d1f557bc5c81e0639259a0aecda3949e18055a08f56a0294400e14a9a5e7865f4b46305343aca2ce1d283b963e6b15b2acffcc9a5758b494a15
-DIST 5.0.0-alpha8.tar.gz 165674 BLAKE2B 10227665ddf1c2b17cacb4b52a4fb0ef06125066546cfc5ce919e2ce6bcba27dabdb471edee4a405f05208333fd6e719981d90384194dc6fab62791abc2eb671 SHA512 e1ef0a916b64ba116efad641b64446656a1e57c0e1c0d65cceafb59ec04deb142de1a11e625c4e8c214b36dcbf9adb4d413283d7a22f0a090098cebfc021e182
 DIST 5.8.0-beta.tar.gz 183120 BLAKE2B 82d6a2e40aab046b14c6256acca458765bc744144f57d8aeae5201f8e89d97c70d5dbc42fe89880ded8ea9ee9ff96e2f2a91f3da8e7b13fb52cd4ba75caedaf6 SHA512 07d9cb217922239ad79ec6632d28f87d986e69ec3fd5c5440dbae96514a10a66f043efa84031c6541c3b1dc8b6786b5265c9cdd98f8b4102c3e937934bad649a
--- a/app-misc/apidb/apidb-4.3.0_beta.ebuild
+++ b/app-misc/apidb/apidb-4.3.0_beta.ebuild
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-MYPV="${PV/_beta/-beta.2}"
-
-DESCRIPTION="API Generator for Database acces."
-HOMEPAGE="https://github.com/azaeldevel/apidb"
-SRC_URI="https://github.com/azaeldevel/${PN}/archive/${MYPV}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-BDEPEND="
-	dev-libs/libxml2
-	dev-libs/boost
-	sys-devel/bison
-	sys-devel/flex
-	x11-libs/gtk+
-	dev-libs/libtar
-	dev-db/mariadb
-	dev-libs/octetos-db-maria
-	media-gfx/imagemagick
-"
-
-S="${WORKDIR}/${PN}-${MYPV}"
-
-src_prepare() {
-	sed -i 's/lib/${LIBDIR}/' src/CMakeLists.txt || die
-	#sed -i 's/lib/${LIBDIR}/' src/mysql-reader-c++/CMakeLists.txt  || die
-	sed -i 's/lib/${LIBDIR}/' src/mariadb-reader-c++/CMakeLists.txt  || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(-DCMAKE_BUILD_TYPE=Debug -DAPIDB_VERSION_STAGE=betarelease -DAPIDB_MARIADB=Y -Wno-dev)
-	cmake_src_configure
-}
--- a/app-misc/apidb/apidb-5.0.0_alpha.ebuild
+++ b/app-misc/apidb/apidb-5.0.0_alpha.ebuild
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-MYPV="${PV/_alpha/-alpha}"
-MYPN="${PN}"
-MYP="${MYPN}-${MYPV}"
-
-DESCRIPTION="API Generator for Database acces."
-HOMEPAGE="https://github.com/azaeldevel/apidb"
-SRC_URI="https://github.com/azaeldevel/${PN}/archive/${MYPV}.2.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE="+mariadb postgresql"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-BDEPEND="
-	dev-libs/libxml2
-	dev-libs/boost
-	sys-devel/bison
-	sys-devel/flex
-	x11-libs/gtk+
-	dev-libs/libtar
-	mariadb? ( dev-libs/octetos-db-maria )
-	postgresql? ( dev-libs/octetos-db-postgresql )
-	media-gfx/imagemagick
-"
-
-S="${WORKDIR}/${PN}-${MYPV}.2"
-
-src_prepare() {
-	sed -i 's/lib/${LIBDIR}/' src/CMakeLists.txt || die
-	#sed -i 's/lib/${LIBDIR}/' src/mysql-reader-c++/CMakeLists.txt  || die
-	sed -i 's/lib/${LIBDIR}/' src/mariadb-reader-c++/CMakeLists.txt  || die
-	sed -i 's/lib/${LIBDIR}/' src/postgresql-reader-c++/CMakeLists.txt  || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(-DAPIDB_VERSION_STAGE=alpha -DPLATFORM=Gentoo -DCOMPONENT=FULL)
-	if use mariadb ;then
-		mycmakeargs+=(-DAPIDB_MARIADB=Y)
-	fi
-	if use postgresql ;then
-		mycmakeargs+=(-DAPIDB_POSTGRESQL=Y)
-	fi
-	cmake_src_configure
-}
--- a/app-misc/apidb/apidb-5.0.0_alpha19.ebuild
+++ b/app-misc/apidb/apidb-5.0.0_alpha19.ebuild
@@ -1,73 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-CMAKE_BINARY=cmake
-CMAKE_MAKEFILE_GENERATOR=emake
-
-inherit cmake
-
-MYPV="${PV/_alpha19/-alpha19}"
-MYPN="${PN}"
-MYP="${MYPN}-${MYPV}"
-
-DESCRIPTION="API Generator for Database acces."
-HOMEPAGE="https://github.com/azaeldevel/apidb"
-SRC_URI="https://github.com/azaeldevel/${PN}/archive/${MYPV}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE="+mariadb postgresql commands gtk +corelibs"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-BDEPEND="
-	dev-libs/libxml2
-	dev-libs/boost
-	sys-devel/bison
-	sys-devel/flex
-	gtk? ( x11-libs/gtk+ )
-	dev-libs/libtar
-	mariadb? ( dev-libs/octetos-db-maria )
-	postgresql? ( dev-libs/octetos-db-postgresql )
-	media-gfx/imagemagick
-"
-
-S="${WORKDIR}/${PN}-${MYPV}"
-
-src_prepare() {
-	sed -i 's/lib/${LIBDIR}/' src/CMakeLists.txt || die
-	sed -i 's/lib/${LIBDIR}/' src/mysql-reader-c++/CMakeLists.txt  || die
-	sed -i 's/lib/${LIBDIR}/' src/mariadb-reader-c++/CMakeLists.txt  || die
-	sed -i 's/lib/${LIBDIR}/' src/postgresql-reader-c++/CMakeLists.txt  || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	APIDBBUILD="CORE"
-	APIDBINSTALL=""
-	if use corelibs ;then
-		APIDBINSTALL="CORE"
-	fi
-	if use mariadb ;then
-		APIDBBUILD="$APIDBBUILD;MARIADB"
-		APIDBINSTALL="$APIDBINSTALL;DRIVERS"
-	fi
-	if use postgresql ;then
-		APIDBBUILD="$APIDBBUILD;POSTGRESQL"
-		APIDBINSTALL="$APIDBINSTALL;DRIVERS"
-	fi
-	if use commands ;then
-		APIDBINSTALL="$APIDBINSTALL;COMMANDS"
-	fi
-	if use gtk ;then
-		APIDBINSTALL="$APIDBINSTALL;GTK3"
-	fi
-	local mycmakeargs=(-DAPIDB_VERSION_STAGE=alpha -DPLATFORM=LINUX_GENTOO -DAPIDBBUILD=$APIDBBUILD -DAPIDBINSTALL=$APIDBINSTALL)
-	cmake_src_configure
-}
--- a/app-misc/apidb/apidb-5.0.0_alpha20.ebuild
+++ b/app-misc/apidb/apidb-5.0.0_alpha20.ebuild
@@ -1,74 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-CMAKE_BINARY=cmake
-CMAKE_MAKEFILE_GENERATOR=emake
-
-inherit cmake
-
-MYPV="${PV/_alpha20/-alpha20}"
-MYPN="${PN}"
-MYP="${MYPN}-${MYPV}"
-
-DESCRIPTION="API Generator for Database acces."
-HOMEPAGE="https://github.com/azaeldevel/apidb"
-SRC_URI="https://github.com/azaeldevel/${PN}/archive/${MYPV}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE="+mariadb postgresql commands gtk +corelibs"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-BDEPEND="
-	dev-libs/libxml2
-	dev-libs/boost
-	dev-libs/octetos-coreutils
-	sys-devel/bison
-	sys-devel/flex
-	gtk? ( x11-libs/gtk+ )
-	dev-libs/libtar
-	mariadb? ( dev-libs/octetos-db-maria )
-	postgresql? ( dev-libs/octetos-db-postgresql )
-	media-gfx/imagemagick
-"
-
-S="${WORKDIR}/${PN}-${MYPV}"
-
-src_prepare() {
-	sed -i 's/lib/${LIBDIR}/' src/CMakeLists.txt || die
-	sed -i 's/lib/${LIBDIR}/' src/mysql-reader-c++/CMakeLists.txt  || die
-	sed -i 's/lib/${LIBDIR}/' src/mariadb-reader-c++/CMakeLists.txt  || die
-	sed -i 's/lib/${LIBDIR}/' src/postgresql-reader-c++/CMakeLists.txt  || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	APIDBBUILD="CORE"
-	APIDBINSTALL=""
-	if use corelibs ;then
-		APIDBINSTALL="CORE"
-	fi
-	if use mariadb ;then
-		APIDBBUILD="$APIDBBUILD;MARIADB"
-		APIDBINSTALL="$APIDBINSTALL;DRIVERS"
-	fi
-	if use postgresql ;then
-		APIDBBUILD="$APIDBBUILD;POSTGRESQL"
-		APIDBINSTALL="$APIDBINSTALL;DRIVERS"
-	fi
-	if use commands ;then
-		APIDBINSTALL="$APIDBINSTALL;COMMANDS"
-	fi
-	if use gtk ;then
-		APIDBINSTALL="$APIDBINSTALL;GTK3"
-	fi
-	local mycmakeargs=(-DAPIDB_VERSION_STAGE=alpha -DPLATFORM=LINUX_GENTOO -DAPIDBBUILD=$APIDBBUILD -DAPIDBINSTALL=$APIDBINSTALL)
-	cmake_src_configure
-}
--- a/app-misc/apidb/apidb-5.0.0_alpha8.ebuild
+++ b/app-misc/apidb/apidb-5.0.0_alpha8.ebuild
@@ -1,73 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-CMAKE_BINARY=cmake
-CMAKE_MAKEFILE_GENERATOR=emake
-
-inherit cmake
-
-MYPV="${PV/_alpha8/-alpha8}"
-MYPN="${PN}"
-MYP="${MYPN}-${MYPV}"
-
-DESCRIPTION="API Generator for Database acces."
-HOMEPAGE="https://github.com/azaeldevel/apidb"
-SRC_URI="https://github.com/azaeldevel/${PN}/archive/${MYPV}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE="mariadb postgresql commands gui corelibs"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-BDEPEND="
-	dev-libs/libxml2
-	dev-libs/boost
-	sys-devel/bison
-	sys-devel/flex
-	gui? ( x11-libs/gtk+ )
-	dev-libs/libtar
-	mariadb? ( dev-libs/octetos-db-maria )
-	postgresql? ( dev-libs/octetos-db-postgresql )
-	media-gfx/imagemagick
-"
-
-S="${WORKDIR}/${PN}-${MYPV}"
-
-src_prepare() {
-	sed -i 's/lib/${LIBDIR}/' src/CMakeLists.txt || die
-	sed -i 's/lib/${LIBDIR}/' src/mysql-reader-c++/CMakeLists.txt  || die
-	sed -i 's/lib/${LIBDIR}/' src/mariadb-reader-c++/CMakeLists.txt  || die
-	sed -i 's/lib/${LIBDIR}/' src/postgresql-reader-c++/CMakeLists.txt  || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	APIDBBUILD="CORE"
-	APIDBINSTALL=""
-	if use corelibs ;then
-		APIDBINSTALL="CORE"
-	fi
-	if use mariadb ;then
-		APIDBBUILD="$APIDBBUILD;MARIADB"
-		APIDBINSTALL="$APIDBINSTALL;DRIVERS"
-	fi
-	if use postgresql ;then
-		APIDBBUILD="$APIDBBUILD;POSTGRESQL"
-		APIDBINSTALL="$APIDBINSTALL;DRIVERS"
-	fi
-	if use commands ;then
-		APIDBINSTALL="$APIDBINSTALL;COMMANDS"
-	fi
-	if use gui ;then
-		APIDBINSTALL="$APIDBINSTALL;GUI"
-	fi
-	local mycmakeargs=(-DAPIDB_VERSION_STAGE=alpha -DPLATFORM=GENTOO -DAPIDBBUILD=$APIDBBUILD -DAPIDBINSTALL=$APIDBINSTALL)
-	cmake_src_configure
-}
--- a/app-misc/apidb/apidb-5.8.0_beta.ebuild
+++ b/app-misc/apidb/apidb-5.8.0_beta.ebuild
@@ -13,7 +13,7 @@ MYPV="${PV/_beta/-beta}"
 MYPN="${PN}"
 MYP="${MYPN}-${MYPV}"

-DESCRIPTION="API Generator for Database acces."
+DESCRIPTION="API Generator for Database access"
 HOMEPAGE="https://github.com/azaeldevel/apidb"
 SRC_URI="https://github.com/azaeldevel/${PN}/archive/${MYPV}.tar.gz"

@@ -23,20 +23,21 @@ KEYWORDS="~amd64"

 IUSE="+mariadb postgresql commands gtk +corelibs"

-DEPEND=""
-RDEPEND="${DEPEND}"
-BDEPEND="
+RDEPEND="
 	dev-libs/libxml2
 	dev-libs/boost
 	dev-libs/octetos-coreutils
-	sys-devel/bison
-	sys-devel/flex
-	gtk? ( x11-libs/gtk+ )
+	dev-libs/octetos-db-abstract
+	gtk? ( x11-libs/gtk+:3 )
 	dev-libs/libtar
 	mariadb? ( dev-libs/octetos-db-maria )
 	postgresql? ( dev-libs/octetos-db-postgresql )
 	media-gfx/imagemagick
 "
+DEPEND="${RDEPEND}
+	sys-devel/bison
+	sys-devel/flex
+"

 S="${WORKDIR}/${PN}-${MYPV}"

--- a/app-misc/vrms-gentoo/Manifest
+++ b/app-misc/vrms-gentoo/Manifest
@@ -1,2 +1 @@
-DIST vrms-gentoo-0_pre20181120.tar.gz 9340 BLAKE2B 751df8ffbc0842ab535620aa706665827c780f03aac9a89729776c6f375889bd25dff9426a2875a58b8e02a61f380c4bfc82746eec0a0631cec92479aca97c21 SHA512 a3f9c48d83649f205290622a52455363e2bda58d431261dae648568b81b4b62baaa9de3363d569402ced7d1089e8e2fcff26d37942d0b71394226a32f02c8dd8
 DIST vrms-gentoo-0_pre20201102.tar.gz 9458 BLAKE2B a49342e5ef3afb0326c57b8c222b2874cc5f81a62da20edd68e23ea52c50cb2bdf0ef75f5c4779457a4c6ebdcbb0d5334b46cdff94ac6d50884037db13601043 SHA512 9c24eea49d5cc5e4afdfc4ea5467f4c89777499b6187e3b5495de90a87f88b78edf13c605edb98792b42cc36b7b5ba751dfb6ae3e62d92b48d9505de9af07246
--- a/app-misc/vrms-gentoo/vrms-gentoo-0_pre20181120.ebuild
+++ b/app-misc/vrms-gentoo/vrms-gentoo-0_pre20181120.ebuild
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-COMMIT="1d45e07cfa7ceed69fb7302cfd0f3e2d2453e115"
-
-SRC_URI="https://github.com/z411/vrms-gentoo/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-DESCRIPTION="vrms clone for Gentoo Linux"
-HOMEPAGE="https://github.com/z411/vrms-gentoo"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND=""
-RDEPEND="
-	dev-lang/perl
-"
-
-S="${WORKDIR}/${PN}-${COMMIT}"
-
-src_install() {
-	default
-
-	dobin "${PN}"
-}
--- a/app-misc/wego/Manifest
+++ b/app-misc/wego/Manifest
@@ -0,0 +1,4 @@
+DIST github.com-mattn-go-colorable-9fdad7c.tar.gz 5586 BLAKE2B 4f41090d5b803e62b3cf5ab2bab05bf726006c2ccf5fe3e1c5c9a5042375ec652d6bddd09465b1748f969b5c78615e030e72a43d299a953d4fecaf2e8eb993cc SHA512 f3f1893c535cd050bdf83e8d13d5fa5f12b58272a1a373dc17c68a0021a0bd9e72817b5784dd1276cd963bbef07424d47c877d809df787058d8c87194f70b582
+DIST github.com-mattn-go-runewidth-d037b52.tar.gz 5895 BLAKE2B 32e5b025abe0ac98eea8e35278b76f2f447f80f5110fd5f66628510fa0488095f94beab0a010c4f511df04c8a8f503315910acc22f0ba9438a324da3faeeea08 SHA512 0795a78dbf805bcf3fb9887a0bb5875c6b8579302d9207a536d5d00dc8a97a732ae95d274d3b26215d9f900299b01a5b0869561e215def6c8d35d9603b9da551
+DIST github.com-schachmat-ingo-fab41e4.tar.gz 3170 BLAKE2B e37843954694c9cf5ae0a7faf953a5483f06d85bc7521ac199a0db9e6ca052f38ffac74b9f4256a2692f3f3055f49274cb0d7e1ac96c3a892da3553963d6e2da SHA512 8aedc3e85666c228f44f563fbc0264a3cd17fc4dc25f243d92995aeeb493533439600d147eeb9e23d00f108e8002a8b9e0fb4be309353ddd08f1efdd9582b849
+DIST wego-2.0.tar.gz 11185 BLAKE2B 1bf8030a0801a80d5bd367be9a53f01c232ece40fb6f66e4dd06a72ed44e2cc1d6da27888b148c24264ed4eec460b4b9d8e4ff6e91d55e134f275b3978048ace SHA512 92073393f420f72367955b08ef64a90eadc5a72f79f9c42ee1886918923e5953da15dd9ffaefc14aa444cfe5db5f903d88ec080f9ca3490da29efe5734a200f8
--- a/app-misc/wego/metadata.xml
+++ b/app-misc/wego/metadata.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>lssndrbarbieri@gmail.com</email>
+		<name>Alessandro Barbieri</name>
+		<description>comaintainers welcome</description>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">schachmat/wego</remote-id>
+		<bugs-to>https://github.com/schachmat/wego/issues</bugs-to>
+	</upstream>
+	<longdescription lang="en">
+Features
+
+show forecast for 1 to 7 days
+nice ASCII art icons
+displayed info (metric or imperial units):
+temperature range (felt and measured)
+windspeed and direction
+viewing distance
+precipitation amount and probability
+ssl, so the NSA has a harder time learning where you live or plan to go
+multi language support
+config file for default location which can be overridden by commandline
+Automatic config management with ingo
+	</longdescription>
+</pkgmetadata>
--- a/app-misc/wego/wego-2.0.ebuild
+++ b/app-misc/wego/wego-2.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+GOLANG_PKG_IMPORTPATH="github.com/schachmat"
+GOLANG_PKG_HAVE_TEST=1
+GOLANG_PKG_USE_CGO=1
+
+GOLANG_PKG_DEPENDENCIES=(
+	"github.com/mattn/go-colorable:9fdad7c"
+	"github.com/mattn/go-runewidth:d037b52"
+	"github.com/schachmat/ingo:fab41e4"
+)
+
+inherit golang-single
+
+DESCRIPTION="Wego is a weather client for the terminal"
+
+LICENSE="BSD ISC"
+SLOT="0"
+KEYWORDS="~amd64"
+RESTRICT="!test? ( test )"
--- a/app-portage/portconf/portconf-9999.ebuild
+++ b/app-portage/portconf/portconf-9999.ebuild
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit git-r3
-
-DESCRIPTION="/etc/portage cleaner"
-HOMEPAGE="https://github.com/megabaks/portconf"
-EGIT_REPO_URI="https://github.com/megabaks/${PN}.git"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS=""
-
-IUSE=""
-
-DEPEND="
-	app-shells/bash:=
-	sys-apps/portage
-"
-RDEPEND="${DEPEND}
-	app-portage/eix
-	app-portage/portage-utils
-	sys-apps/gawk
-	|| ( app-text/agrep dev-libs/tre )
-"
-
-src_install() {
-	default
-
-	dobin portconf
-	insinto /etc
-	newins portconf.conf portconf.conf
-}
--- a/app-text/komikku/Manifest
+++ b/app-text/komikku/Manifest
@@ -1,3 +1,2 @@
-DIST komikku-0.24.0.tar.gz 1585185 BLAKE2B 5d41162c9cfb1ecdc5127d3dd71789ef6e9688c2ca0eb201964362eb8d8c74b0b85ecd05841eb70834cebefcabc269f1c0659944d9e47447055a9a2bc0a23373 SHA512 aaa98f6e4e736ca8185c734885f3b9ae741f5656d090ae9647c7c4eb0815f28801907044b2107df4a5d1d05a1a85c738c1220aa4434f8c7529d1f70644d82666
-DIST komikku-0.26.1.tar.gz 1614455 BLAKE2B ef58a7ac497f29c182788c3f827e83c8561ab5bf91598a051c1ca9784b5eafcd3573f1835572e67cd11e02043c902513e2ef86e68d2b33e310363967067ad955 SHA512 73409c51a44f333e3bb0e47e2480099f3a05a1e88dc3c8c96846c18caf7ee61d99e81fe5e47991bd93f76e36fccad73f4bcf406bd744a9fc6ca860b2feef4efc
 DIST komikku-0.27.0.tar.gz 1633581 BLAKE2B 828e5942995fa8cda4c90739595a132f9f755423637c26d309deb56545a68c751bfbbc8a5ae5bdcd6f233a6608d247a952039f331b56d06b4ea4e9bb264dc1d8 SHA512 6358442189416125d172b4f0408c86e52456994e3e451d125bd2253c4b41d9b4534f5b1d42128b0ed1d4c8559df0abea4287f243e74d4fdedb74ef4d2eb43ba9
+DIST komikku-0.28.1.tar.gz 1670259 BLAKE2B bcb89f644eca7b6e322442316234e5d39d9db6d32e31b09b170abac74168f17e39cc2a368fa624edde0e0b3aa3892768d3d6adddf5b649bdf7cf34c775730b98 SHA512 c9db5ce5944520802bccdf5ce906fa2f3dea2209ea7fd060e7349944320148350dbfd131acb9b88ffba8d6712d0fd849110345aca625ce2af97e20bd0817d343
--- a/app-text/komikku/komikku-0.24.0.ebuild
+++ b/app-text/komikku/komikku-0.24.0.ebuild
@@ -1,75 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="Komikku"
-MY_P="${MY_PN}-${PV}"
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit python-single-r1 meson gnome2-utils xdg
-
-DESCRIPTION="An online/offline manga reader for GNOME"
-HOMEPAGE="https://gitlab.com/valos/Komikku"
-SRC_URI="https://gitlab.com/valos/${MY_PN}/-/archive/v${PV}/${MY_PN}-v${PV}.tar.gz -> ${P}.tar.gz"
-
-RESTRICT="test"
-KEYWORDS="~amd64"
-LICENSE="GPL-3"
-SLOT="0"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="
-	>=gui-libs/libhandy-1.0.2
-	>=x11-libs/gtk+-3.24.10
-	$(python_gen_cond_dep '
-		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
-		dev-python/cloudscraper[${PYTHON_USEDEP}]
-		dev-python/dateparser[${PYTHON_USEDEP}]
-		dev-python/keyring[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/pure-protobuf[${PYTHON_USEDEP}]
-		dev-python/pygobject[${PYTHON_USEDEP}]
-		dev-python/python-magic[${PYTHON_USEDEP}]
-		dev-python/unidecode[${PYTHON_USEDEP}]
-	')
-"
-RDEPEND="
-	${PYTHON_DEPS}
-	${DEPEND}
-"
-
-S="${WORKDIR}/${MY_PN}-v${PV}"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_install() {
-	meson_src_install
-	python_optimize
-
-	# Dirty hack (python_doscript doesn't work)
-	echo "#!/usr/bin/${EPYTHON}
-	$(cat ${D}/usr/bin/${PN})" > "${D}/usr/bin/${PN}"
-}
-
-pkg_preinst() {
-	gnome2_schemas_savelist
-	xdg_pkg_preinst
-}
-
-pkg_postinst() {
-	gnome2_gconf_install
-	gnome2_schemas_update
-	xdg_pkg_postinst
-}
-
-pkg_postrm() {
-	gnome2_gconf_uninstall
-	gnome2_schemas_update
-	xdg_pkg_postrm
-}
--- a/app-text/komikku/komikku-0.28.1.ebuild
+++ b/app-text/komikku/komikku-0.28.1.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 MY_PN="Komikku"
 MY_P="${MY_PN}-${PV}"

-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )

 inherit python-single-r1 meson gnome2-utils xdg

--- a/app-text/komikku/metadata.xml
+++ b/app-text/komikku/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>xgqt@riseup.net</email>
-    <name>Maciej Barć</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="gitlab">valos/Komikku</remote-id>
-  </upstream>
+    <maintainer type="person">
+        <description>co-maintainers welcome</description>
+        <email>xgqt@riseup.net</email>
+        <name>Maciej Barć</name>
+    </maintainer>
+    <upstream>
+        <remote-id type="gitlab">valos/Komikku</remote-id>
+    </upstream>
 </pkgmetadata>
--- a/dev-R/R6/Manifest
+++ b/dev-R/R6/Manifest
@@ -1,2 +1 @@
-DIST R6_2.4.1.tar.gz 35536 BLAKE2B 0a2e7664d0b5911fe0f6c40bd80314ed6a100cbce9c9afe60a166e9fa0da773d16c0db545b28992b543d5a380c45bd977413026e422be13ca4706a4b0d7137e8 SHA512 bf165edf15f4fb3a4ad94b80bcf96f255b6889649b40c7f27af10841a55d81d02f8a42707fc08a5bcadfa94d77d67f4617739a75b3e7d99ba57bb9100dde98b0
 DIST R6_2.5.0.tar.gz 63361 BLAKE2B 52320699e5a10698345e741b7790d54bdcc252ed32e84e3468eaded7289c5b28a922df841d36e09d31a566d84ad083f1296d305141bae71279bcb0a578f553df SHA512 09cfd4c5bde6ff46ec64622e81e24e944f325e720f6a65d476faca045505954e66a6a0efe9abeb9c88646c8071cda1c0267e325a342f00ee1933694d4d3a22c7
--- a/dev-R/R6/R6-2.4.1.ebuild
+++ b/dev-R/R6/R6-2.4.1.ebuild
@@ -1,19 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit R-packages-guru
-
-DESCRIPTION='Encapsulated Classes with Reference Semantics'
-SRC_URI="mirror://cran/src/contrib/R6_2.4.1.tar.gz"
-LICENSE='MIT'
-HOMEPAGE="
-	https://r6.r-lib.org
-	https://github.com/r-lib/R6
-	https://cran.r-project.org/package=R6
-"
-IUSE="${IUSE-}"
-KEYWORDS="~amd64"
-DEPEND=">=dev-lang/R-3.0"
-RDEPEND="${DEPEND}"
--- a/dev-R/Rcpp/Manifest
+++ b/dev-R/Rcpp/Manifest
@@ -1,2 +1 @@
-DIST Rcpp_1.0.4.6.tar.gz 2751467 BLAKE2B 1df5a1ab26974a0d4ec2bf8708a0f81a7bc8e27a1d50deda50375a0086c8284e6521914581c8bf336359ae61ab1c3be2cd18e49040451c8921a54188f4c75da4 SHA512 d3099925cd897100fc510e6a0b7a4c4007ec92edf5c335d7d87f39aac35a6cd5da605c904527da802414992ca13302192625fde769ce62ab7542d5cb76f5c1df
 DIST Rcpp_1.0.6.tar.gz 2952876 BLAKE2B cb5b06a187389f1e7aac21623c318c0c0ad02812b49a841dc85680a82d2fbfb28ef040c2f5c9e25969a812d2d0479858969efe327235f12ab99cbf4d3bbfd7ce SHA512 eab225cfdd838e316824fe224e9822c01d09287251b89f3a83f03b5be294f6f3376f2cd2518f78a7bff57426247b62108dc7c60b89d78443172826fa24bf14cc
--- a/dev-R/Rcpp/Rcpp-1.0.4.6.ebuild
+++ b/dev-R/Rcpp/Rcpp-1.0.4.6.ebuild
@@ -1,18 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit R-packages-guru
-
-DESCRIPTION='Seamless R and C++ Integration'
-SRC_URI="mirror://cran/src/contrib/Rcpp_1.0.4.6.tar.gz"
-LICENSE='GPL-2+'
-HOMEPAGE="
-	http://www.rcpp.org
-	http://dirk.eddelbuettel.com/code/rcpp.html
-	https://github.com/RcppCore/Rcpp
-	https://cran.r-project.org/package=Rcpp
-"
-IUSE="${IUSE-}"
-KEYWORDS="~amd64"
--- a/dev-R/cli/Manifest
+++ b/dev-R/cli/Manifest
@@ -1,3 +1 @@
-DIST cli_2.0.2.tar.gz 116357 BLAKE2B a6eba3e12e63ea37dcd139c1e70d318f0478e6b3ce39c6172d85fe64d622366c58878c6d80da0afe52ce2823e156f5007c33576e937418f3460260528788a515 SHA512 c5a398a35bfbc43b618b97477ef97785c674c1aad03fcbf20786f1eab057cd5f21da430ffa69161d14a331b2e538d8dc75b6a3a2699db799b1441dce31d3761e
-DIST cli_2.3.1.tar.gz 134171 BLAKE2B d8de88269c28f0982814c03be70a5e2410e3c8e8f4db814592318c4c3c2002b727ed9aa02fe138db46e64f21e158bddadd15482bbb7ff31775faa9ff37e99ed3 SHA512 37cbe182ae855f06b75dcad589b9bb35d44b2ea3acb8ffdbcb2a0b704168d8a72c72daaa5d2ca98f2cd0dc2f2def7de43760552edaafa1e21929e313f93247c8
 DIST cli_2.5.0.tar.gz 158156 BLAKE2B 7d62691bfccc458956c5d0d7f28f44485025dcf6f4cdb7974037db63102c048fb867a46f9b25447ad4711fb0d1f40d44fe1adef7b7cd918b81fdb638b240a322 SHA512 de61ae17dd8d2b5557ac90c69ba6d31c477b0dc76cc28912c20102032e6ced0205c22e4b88828c511e029afd519e246e1956876590ad9ec715df9396c539b6d2
--- a/dev-R/cli/cli-2.0.2.ebuild
+++ b/dev-R/cli/cli-2.0.2.ebuild
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit R-packages-guru
-
-DESCRIPTION='Helpers for Developing Command Line Interfaces'
-HOMEPAGE="
-	https://github.com/r-lib/cli
-	https://cran.r-project.org/package=cli
-"
-SRC_URI="mirror://cran/src/contrib/cli_2.0.2.tar.gz"
-LICENSE='MIT'
-KEYWORDS="~amd64"
-IUSE="${IUSE-}"
-DEPEND="
-	dev-R/assertthat
-	>=dev-R/crayon-1.3.4
-	dev-R/fansi
-	dev-R/glue
-"
-RDEPEND="${DEPEND-}"
--- a/dev-R/cli/cli-2.3.1.ebuild
+++ b/dev-R/cli/cli-2.3.1.ebuild
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit R-packages-guru
-
-DESCRIPTION='Helpers for Developing Command Line Interfaces'
-HOMEPAGE="
-	https://github.com/r-lib/cli
-	https://cran.r-project.org/package=cli
-"
-SRC_URI="mirror://cran/src/contrib/${PN}_${PV}.tar.gz"
-LICENSE='MIT'
-KEYWORDS="~amd64"
-IUSE="${IUSE-}"
-DEPEND="
-	>=dev-lang/R-2.1.0
-	dev-R/assertthat
-	dev-R/glue
-"
-RDEPEND="${DEPEND-}"
--- a/dev-R/crayon/Manifest
+++ b/dev-R/crayon/Manifest
@@ -1,2 +1 @@
-DIST crayon_1.3.4.tar.gz 658694 BLAKE2B 6afaa0a7ee5bd2727ddf10d5a2a0741919e89531aa1ec1ce04373299d308df374979e097e986d122c83ee1b5cebbd92b3ae63147a8dd549211df3cf85844c842 SHA512 201e5e9b02cf10c4f098d07e0c982d3a4d8ee6c18dce666a4b74734c7b1d853af97d1aa4991470ddb89e4f3b5baa321f9fd4eabe1034f52b5ac10d051aa2eb18
 DIST crayon_1.4.1.tar.gz 35769 BLAKE2B a856389d0368b7bdd469ca62d1d986d800ceee60de80b4d218c1ad40b3ec4b5f1be7f0426f5d12d803d31d151cf2933e8be254b3aa44a002e9eb56f2fc2f8a9c SHA512 cb449c04c8ecf8e78d91a8deb0d0ebe2407e4c608f0d001448985aca0cf81f1a5371ea0e1c96cb598d947db4b3f5ad484c7b4f6457ff06cd9bfce3cbb45b483c
--- a/dev-R/crayon/crayon-1.3.4.ebuild
+++ b/dev-R/crayon/crayon-1.3.4.ebuild
@@ -1,16 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit R-packages-guru
-
-DESCRIPTION='Colored Terminal Output'
-HOMEPAGE="
-	https://github.com/r-lib/crayon
-	https://cran.r-project.org/package=crayon
-"
-SRC_URI="mirror://cran/src/contrib/crayon_1.3.4.tar.gz"
-LICENSE='MIT'
-KEYWORDS="~amd64"
-IUSE="${IUSE-}"
--- a/dev-R/digest/Manifest
+++ b/dev-R/digest/Manifest
@@ -1,2 +1 @@
-DIST digest_0.6.25.tar.gz 145642 BLAKE2B f7947399dde2e53820049f972b4e48f2685f65dbdb686ba05fa4e903aee87aee04767f8d247f1c537fe5c3cad2188f122e085fc11011152638649b94bbc5aba7 SHA512 5fb3683a3d20740aee0c98bdd52e60ebad3e7c7ca8db770d360aebf138b81f1623b70cdb382b2b32c5b7b59dbeef529cc2a75a7c5421c8be90c08c5a46bb1bc1
 DIST digest_0.6.27.tar.gz 164373 BLAKE2B 0583494459a04cb8a2c42429a7fa6248c9d0c93762c64732bcc96fb874defd64272fbb9af3c870b3653be8c0e1ec25c523adffa3b1af237af96cd0aba3e24a29 SHA512 e97f2232d2bbebb2f5daf8f240a37ac9fae6d7ab57fc96c693fdca5436d8b9d1984ada5bd6f11c9683ae9096eda87db02d292f2d111b06af6f878f34bc46c639
--- a/dev-R/digest/digest-0.6.25.ebuild
+++ b/dev-R/digest/digest-0.6.25.ebuild
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit R-packages-guru
-
-DESCRIPTION='Create Compact Hash Digests of R Objects'
-HOMEPAGE="
-	http://dirk.eddelbuettel.com/code/digest.html
-	https://github.com/eddelbuettel/digest
-"
-SRC_URI="mirror://cran/src/contrib/${PN}_${PV}.tar.gz"
-LICENSE='GPL-2+'
-KEYWORDS="~amd64"
-IUSE="${IUSE-}"
-RDEPEND=">=dev-lang/R-3.1.0"
-DEPEND="${RDEPEND}"
--- a/dev-R/dplyr/Manifest
+++ b/dev-R/dplyr/Manifest
@@ -1,3 +1 @@
-DIST dplyr_0.8.5.tar.gz 1378766 BLAKE2B 5093e178aa882913800d07c502aa3e3107d4152060e0070229091e483164493a94b1bc37f6f00d97641133b01301c013e81df38c8108954bce431447c298dd73 SHA512 08269e59c43aacc5959d516c1fed45d3dbbe0912aa92263ff8eda6454f216a739ea5989088852cf2ab60bf06fc8aea524557258df786e16b81f5f785cb627105
-DIST dplyr_1.0.5.tar.gz 949019 BLAKE2B bbe96dc33004e286662149e4787abedf510f052f791e66481f95201c10396aabc5d6c70c173507924192dc642e1ebc0b5ac9c402092101b70a200bdba0f79669 SHA512 13e505b73d7e9dc5664154d483fd677e4bc245123685a3817d64646e78eb2ccef9cc1080f23ba7d9dd7a58ee59c025e9ab449d48c095717f662c1adcc49a4282
 DIST dplyr_1.0.6.tar.gz 954401 BLAKE2B 02b5fd32ead06504ad69b074bdc0ed6d105d3655a16420aec6a0397e9a4ef77e7d0318af199ca98a333fcd3d3a6cbe37e55be651023fcc130d1affbc47a09aa5 SHA512 e09f5c3b5e215926f7c96eeb705e79db73eae147f557c386bc18e47f0407bac4c1c795c842aa1e152707ae3f2d7de21f8e9984ea9fc9a59addb1cb04a6f65d89
--- a/dev-R/dplyr/dplyr-0.8.5.ebuild
+++ b/dev-R/dplyr/dplyr-0.8.5.ebuild
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit R-packages-guru
-
-DESCRIPTION='A Grammar of Data Manipulation'
-SRC_URI="mirror://cran/src/contrib/dplyr_0.8.5.tar.gz"
-LICENSE='MIT'
-HOMEPAGE="
-	https://dplyr.tidyverse.org
-	https://github.com/tidyverse/dplyr
-	https://cran.r-project.org/package=dplyr
-"
-KEYWORDS="~amd64"
-IUSE="${IUSE-}"
-DEPEND="
-	dev-cpp/plog
-	dev-libs/boost
-	>=dev-lang/R-3.2.0
-	>=dev-R/assertthat-0.2.0
-	dev-R/ellipsis
-	>=dev-R/glue-1.3.0
-	>=dev-R/magrittr-1.5
-	dev-R/pkgconfig
-	dev-R/R6
-	>=dev-R/Rcpp-1.0.1
-	>=dev-R/rlang-0.4.0
-	>=dev-R/tibble-2.0.0
-	>=dev-R/tidyselect-0.2.5
-"
-RDEPEND="${DEPEND-}"
--- a/dev-R/dplyr/dplyr-1.0.5.ebuild
+++ b/dev-R/dplyr/dplyr-1.0.5.ebuild
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit R-packages-guru
-
-DESCRIPTION='A Grammar of Data Manipulation'
-SRC_URI="mirror://cran/src/contrib/${PN}_${PV}.tar.gz"
-LICENSE='MIT'
-HOMEPAGE="
-	https://dplyr.tidyverse.org
-	https://github.com/tidyverse/dplyr
-	https://cran.r-project.org/package=dplyr
-"
-KEYWORDS="~amd64"
-IUSE="${IUSE-}"
-DEPEND="
-	dev-cpp/plog
-	dev-libs/boost
-	>=dev-lang/R-3.3.0
-	dev-R/ellipsis
-	dev-R/generics
-	>=dev-R/glue-1.3.2
-	>=dev-R/lifecycle-1.0.0
-	>=dev-R/magrittr-1.5
-	dev-R/R6
-	>=dev-R/rlang-0.4.10
-	>=dev-R/tibble-2.1.3
-	>=dev-R/tidyselect-1.1.0
-	>=dev-R/vctrs-0.3.5
-"
-RDEPEND="${DEPEND-}"
--- a/dev-R/ellipsis/Manifest
+++ b/dev-R/ellipsis/Manifest
@@ -1,3 +1 @@
-DIST ellipsis_0.3.0.tar.gz 7371 BLAKE2B c7fe0e88a16bbf0a80f1c859804d781d8ae411856882d8629b5dbff4fa1d3c78e81759dd474f909e6c2c91e532086b705135561ee571edf1f095ff980aaf75a3 SHA512 85c92a10635bc8b71df2f44d83a8f9b915cb1e1de7969191e1b6fce216cdbb1d29e1abf1ce11c83455e0b177c74a7271d25646f53d7f4f39391e6f055958d3ea
-DIST ellipsis_0.3.1.tar.gz 7582 BLAKE2B aff80d5858fc6857a391e8fe8e324ab5995b366b7419d8d931d28ed6a176eb0105d8a61d368dde42a3244825eeabab8a0cbcce5c9f6ede7b0536b080300fe4a0 SHA512 a8752e3cc52e13ec9503eeb19956ab604a6d1588b892501a14493697dc829507b5cdd64a361de4469c37420c0ba85cde44ca7a24c5e016b9dfc817d5666fe328
 DIST ellipsis_0.3.2.tar.gz 8066 BLAKE2B 4dc77787aa019c720e96a6136a75b68a8ba94fd571cc2080c71188020f5c323712b23609c0cf22aba4eb2fcf75dd5d702c4c4ccfd442f15df6da8d9d7748260a SHA512 31017bd6d3dc54629d29d8743a9a582894b54bfe92362d4ed6959afd5383368aac19cd5b21a2a390b82e8130800aca035b501945527af964cce1fe8e420e5736
--- a/dev-R/ellipsis/ellipsis-0.3.0.ebuild
+++ b/dev-R/ellipsis/ellipsis-0.3.0.ebuild
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit R-packages-guru
-
-DESCRIPTION='Tools for Working with ...'
-HOMEPAGE="
-	https://ellipsis.r-lib.org
-	https://github.com/r-lib/ellipsis
-	https://cran.r-project.org/package=ellipsis
-"
-SRC_URI="mirror://cran/src/contrib/ellipsis_0.3.0.tar.gz"
-LICENSE='GPL-3'
-KEYWORDS="~amd64"
-IUSE="${IUSE-}"
-DEPEND="
-	>=dev-lang/R-3.2
-	>=dev-R/rlang-0.3.0
-"
-RDEPEND="${DEPEND}"
--- a/dev-R/ellipsis/ellipsis-0.3.1.ebuild
+++ b/dev-R/ellipsis/ellipsis-0.3.1.ebuild
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit R-packages-guru
-
-DESCRIPTION='Tools for Working with ...'
-HOMEPAGE="
-	https://ellipsis.r-lib.org
-	https://github.com/r-lib/ellipsis
-	https://cran.r-project.org/package=ellipsis
-"
-SRC_URI="mirror://cran/src/contrib/${PN}_${PV}.tar.gz"
-LICENSE='GPL-3'
-KEYWORDS="~amd64"
-IUSE="${IUSE-}"
-DEPEND="
-	>=dev-lang/R-3.2
-	>=dev-R/rlang-0.3.0
-"
-RDEPEND="${DEPEND}"
--- a/dev-R/fansi/Manifest
+++ b/dev-R/fansi/Manifest
@@ -1,2 +1 @@
-DIST fansi_0.4.1.tar.gz 270906 BLAKE2B fe8f8fdd9f99292c787deb3cef08b89afcbfc7c7b0a56ffe8f29877afd2fac46d7144c7acabe5d1a49c0ae40c0842a21464cec32c3b194b823798489cf6fa3b3 SHA512 01289228240f245f13d4f65f368bec183d779018038f0e4f5b4aa6379676f5eda10d32b9c8a5c373d1cfcadec449b6d3efe05f0e09161430263e08be7da58ffc
 DIST fansi_0.4.2.tar.gz 271435 BLAKE2B a15bae2ac0d7e8dff84e272a7de54653a38b818f7d51ccd7bca761344b085053ee7c612776b5d5785fc53d0e94e45f8faa3cb76c9bcd8c9d5e1e411df1e0c8a6 SHA512 5b6327e96e0febdb557fcad2a1ba7b91b229ab8d8fb22ff30ae24bd7850dee0b8bcdd66215df365873ed52e0d13736f7ad9219cc71de15ef25c6526fe84b3ce9
--- a/dev-R/fansi/fansi-0.4.1.ebuild
+++ b/dev-R/fansi/fansi-0.4.1.ebuild
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit R-packages-guru
-
-DESCRIPTION='ANSI Control Sequence Aware String Functions'
-HOMEPAGE="
-	https://github.com/brodieG/fansi
-	https://cran.r-project.org/package=fansi
-"
-SRC_URI="mirror://cran/src/contrib/fansi_0.4.1.tar.gz"
-LICENSE='GPL-2+'
-KEYWORDS="~amd64"
-IUSE="${IUSE-}"
-DEPEND=">=dev-lang/R-3.1.0"
-RDEPEND="${DEPEND}"
--- a/dev-R/glue/Manifest
+++ b/dev-R/glue/Manifest
@@ -1,3 +1 @@
-DIST glue_1.4.0.tar.gz 98619 BLAKE2B 3c79c8b0f7f47c38c7216d0f9c4136acaf701e2424e9cf4d5be64595a9c6912292270efe00b9806a12c3357c974f6714c8dac155b67b9e425de534d13bcca0f3 SHA512 f06fd0953644e6ac33cf86dbc40e45c7bd94df1b69f797cf0d71d2c8e2eb89ae75e7642a754d33c7d45669a8f1b34b19b5527b4fbb8542a518d9b6d25aafb4f0
-DIST glue_1.4.1.tar.gz 98581 BLAKE2B 1166630999a1e47a0de2899756ffd0eb37f2cab1fc99a1be5795c74e65d9ab5b15eb447ff97edeed0aceb0146feaf95cfc3a70b82d0f4542b2ce4e8e0dc2742c SHA512 b57153757814b47ca85b2f20ec8c64f2dd6647a3b463b4d31b371e78654c0a20f5fb5551c5918d10bc801e588e8c01c38662286922a9f053cf5c5b18982eea37
 DIST glue_1.4.2.tar.gz 99049 BLAKE2B 9526ad13f75c08ed1955220cec81a746edd665b46c6ba6b34e33aa3ef11df9f61df2146011b5eb188c2e08bbb9bcb6789f7e82138586af516b037a98f28690f5 SHA512 d4c43c95fedf881be2fbe0e406a282e9af30b741533b653cb3c84ead8952e971d94cb4b6a98df07551b17726630b426e6178296e1c146e6cf04e9a7bd6d0562c
--- a/dev-R/glue/glue-1.4.0.ebuild
+++ b/dev-R/glue/glue-1.4.0.ebuild
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit R-packages-guru
-
-DESCRIPTION='Interpreted String Literals'
-HOMEPAGE="
-	https://glue.tidyverse.org
-	https://github.com/tidyverse/glue
-	https://cran.r-project.org/package=glue
-"
-SRC_URI="mirror://cran/src/contrib/glue_1.4.0.tar.gz"
-LICENSE='MIT'
-KEYWORDS="~amd64"
-IUSE="${IUSE-}"
-DEPEND=">=dev-lang/R-3.1"
-RDEPEND="${DEPEND}"
--- a/dev-R/glue/glue-1.4.1.ebuild
+++ b/dev-R/glue/glue-1.4.1.ebuild
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit R-packages-guru
-
-DESCRIPTION='Interpreted String Literals'
-HOMEPAGE="
-	https://glue.tidyverse.org
-	https://github.com/tidyverse/glue
-	https://cran.r-project.org/package=glue
-"
-SRC_URI="mirror://cran/src/contrib/${PN}_${PV}.tar.gz"
-LICENSE='MIT'
-KEYWORDS="~amd64"
-IUSE="${IUSE-}"
-DEPEND=">=dev-lang/R-3.1"
-RDEPEND="${DEPEND}"
--- a/dev-R/lifecycle/Manifest
+++ b/dev-R/lifecycle/Manifest
@@ -1,2 +1 @@
-DIST lifecycle_0.2.0.tar.gz 164455 BLAKE2B 9b6899716625eee5e74200a84fec473b79d97c57bc17510259efd39e814b2ddbfd5bf92ce789b543bd42578e7496ce69d92d2386d10c61464d5af7fe2272a53f SHA512 f939b65a7eaaff543ffaf7284b07d551d2f851a1975a17116d7cdd3561dcf2e60d79561912f6e007a3d60c8a4e78727e74a96532f2555a5d6cc365a6f1e1dde5
 DIST lifecycle_1.0.0.tar.gz 83389 BLAKE2B bc331f7997ce33cc51fc6d5c04c3d7acd8bb0026adb893d667265050f517a121d7a639a1aafbbb21a1cf45cb6c2c256d32dc628798a3e72596c2881aef05d9fe SHA512 603e1889c41b970a10956aff5b547111bd0166de7c6721419d2ea1667ff36202803faa9a0913710993d15e4713227ae8d9801ab26b0f2e54b06d44838de495a4
--- a/dev-R/lifecycle/lifecycle-0.2.0.ebuild
+++ b/dev-R/lifecycle/lifecycle-0.2.0.ebuild
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit R-packages-guru
-
-DESCRIPTION='Manage the Life Cycle of your Package Functions'
-HOMEPAGE="
-	https://lifecycle.r-lib.org
-	https://github.com/r-lib/lifecycle
-	https://cran.r-project.org/package=lifecycle
-"
-SRC_URI="mirror://cran/src/contrib/lifecycle_0.2.0.tar.gz"
-LICENSE='GPL-3'
-KEYWORDS="~amd64"
-IUSE="${IUSE-}"
-DEPEND="
-	>=dev-lang/R-3.2
-	dev-R/glue
-	>=dev-R/rlang-0.4.0
-"
-RDEPEND="${DEPEND-}"
--- a/dev-R/magrittr/Manifest
+++ b/dev-R/magrittr/Manifest
@@ -1,2 +1 @@
-DIST magrittr_1.5.tar.gz 200504 BLAKE2B 6f68ca7449dd157688fea924800a0b9af9b6eb4c696b50e848fd3d97ec457ee488b9f524f756c5619c3293b343aab9547a6e784319e96e769446cf4d236f1cf4 SHA512 d1e66bab279a08f85405fedee0efea0dc4af058e76d8c0151c620825e01a8cf766bf89eaf24a64c67cadbad05c18f780006837ae0e9ded32c2637ed4df984279
 DIST magrittr_2.0.1.tar.gz 265580 BLAKE2B d524af6004741fe8d6bc0e3442d1c6f836b88937feac8352f49a12d6e58e954fd4e53e28e310629369168b94658cd7eac8b42701803bddb5041e9b7528b44b80 SHA512 aa27f64ba09494a5afbe0263ec379c4a73110de45f43c6265437192c01c33a0df6dce98bd0ace021b2f380be84c040c7177b00c396842b3415d137e9e01896d2
--- a/dev-R/magrittr/magrittr-1.5.ebuild
+++ b/dev-R/magrittr/magrittr-1.5.ebuild
@@ -1,13 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit R-packages-guru
-
-DESCRIPTION='A Forward-Pipe Operator for R'
-HOMEPAGE="https://cran.r-project.org/package=magrittr"
-SRC_URI="mirror://cran/src/contrib/magrittr_1.5.tar.gz"
-LICENSE='MIT'
-KEYWORDS="~amd64"
-IUSE="${IUSE-}"
--- a/dev-R/pillar/Manifest
+++ b/dev-R/pillar/Manifest
@@ -1,3 +1 @@
-DIST pillar_1.4.4.tar.gz 231021 BLAKE2B 21a5597f70f093ff50fe21f79e2903ee16efc724cdb2b99396d29e1857c8cf7c8700c5d3f440db95f692691b0df0e82ef3419d17777146c76dbd0c1418d9780d SHA512 e1b325908b6d79bbc5e944b4117a46016be88bc5a71ce8e5494a3a46a85039d6d216b1699014dcafbe2d4f3365130a65d0ef481f66b2e6ee9df49c1e8801aad4
-DIST pillar_1.5.1.tar.gz 1069450 BLAKE2B 31ef4984521be38e97912a3808341b3f03c4750aa974bfa680d43b969104dea1f818b76e5fb0e410e9da04deeee3553ace2cd40d3d8d964e390674ab4c923626 SHA512 a7dbcfa659506a10b03859d48ee3cabe1fea1874c82d0cecdf246f4a1de5aa4d24949ea5998d52fa172f296870960f572000c3f9784d1a073622f6f5d497befe
 DIST pillar_1.6.0.tar.gz 1100197 BLAKE2B dd835ed62e4ae4e5406d0474a3f92d34a46fefe009b40e05c787c33ec23a9a51679a57840ffe46086fe68b0eaafb21d5b6fef82098defcbcd0e886699f82f0f3 SHA512 5258235a3a7233794f498c8bc44484b844e530a0976b2754466b2caf296df9724d5ae149ea54910efa8ecda97a1cc8978dc91663ade14dd16d9844506b4cf066
--- a/dev-R/pillar/pillar-1.4.4.ebuild
+++ b/dev-R/pillar/pillar-1.4.4.ebuild
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit R-packages-guru
-
-DESCRIPTION='Coloured Formatting for Columns'
-HOMEPAGE="
-	https://github.com/r-lib/pillar
-	https://cran.r-project.org/package=pillar
-"
-SRC_URI="mirror://cran/src/contrib/pillar_1.4.4.tar.gz"
-LICENSE='GPL-3'
-KEYWORDS="~amd64"
-IUSE="${IUSE-}"
-DEPEND="
-	dev-R/cli
-	>=dev-R/crayon-1.3.4
-	dev-R/fansi
-	>=dev-R/rlang-0.3.0
-	>=dev-R/vctrs-0.2.0
-	>=dev-R/utf8-1.1.0
-"
-RDEPEND="${DEPEND-}"
--- a/dev-R/pillar/pillar-1.5.1.ebuild
+++ b/dev-R/pillar/pillar-1.5.1.ebuild
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit R-packages-guru
-
-DESCRIPTION='Coloured Formatting for Columns'
-HOMEPAGE="
-	https://github.com/r-lib/pillar
-	https://cran.r-project.org/package=pillar
-"
-SRC_URI="mirror://cran/src/contrib/${PN}_${PV}.tar.gz"
-LICENSE='GPL-3'
-KEYWORDS="~amd64"
-IUSE="${IUSE-}"
-DEPEND="
-	dev-R/cli
-	>=dev-R/crayon-1.3.4
-	dev-R/ellipsis
-	dev-R/fansi
-	dev-R/lifecycle
-	>=dev-R/rlang-0.3.0
-	>=dev-R/utf8-1.1.0
-	>=dev-R/vctrs-0.2.0
-"
-RDEPEND="${DEPEND-}"
--- a/dev-R/rlang/Manifest
+++ b/dev-R/rlang/Manifest
@@ -1,3 +1 @@
-DIST rlang_0.4.10.tar.gz 915685 BLAKE2B a5738147b9977a6ae041962d3dab46a52c88d593e3a7bacce587bc48291f4084459cb1d2fde403bd476ac0476a360bf7e5886481a5be680c0e36ed1fa0b61d3f SHA512 f251217a448c484941d34edf5cb0964ab34f552c303ad3793084c03e57e4b6024c32a810644d3b2ba9d3b989b850b676ed5a89376d14507bbd2365feb4c7db2d
 DIST rlang_0.4.11.tar.gz 861727 BLAKE2B ac6eea00435fb4f02a1857f2dcb46e83922bcfd7b26e4126bbc7ce7c7b7665d12d740fac5ab2d6e192b263792ec9bf9332785199c11f5e2e500827b842d20e85 SHA512 0448a104034a9f14dd735b1abfd3aa823abaad9a7ee96ca89393b15f2c54dd24f27712cb59e30393c3afeccb834471f3940259e864236212b3b4c797008d79b4
-DIST rlang_0.4.6.tar.gz 835198 BLAKE2B 3b6f2ce9250a0fc390e4664606b1a8a3d9f1d3e9fbf1c3691a97183e04f6c1c7b9b97e363e3225bf294eaa25362d2fea743afff9d57b325471898ea971938f1e SHA512 d128a49a098de75d672d9f7bada3234aa2a2bdced69fd680822b9d2320431f01ec95440a3925038aabd493c83834a8d1f53b6dadac66974ad0e13d0ab3f1aec1
--- a/dev-R/rlang/rlang-0.4.10.ebuild
+++ b/dev-R/rlang/rlang-0.4.10.ebuild
@@ -1,19 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit R-packages-guru
-
-DESCRIPTION='Functions for Base Types and Core R and Tidyverse Features'
-SRC_URI="mirror://cran/src/contrib/${PN}_${PV}.tar.gz"
-LICENSE='GPL-3'
-HOMEPAGE="
-	https://rlang.r-lib.org
-	https://github.com/r-lib/rlang
-	https://cran.r-project.org/package=rlang
-"
-KEYWORDS="~amd64"
-IUSE="${IUSE-}"
-DEPEND=">=dev-lang/R-3.3.0"
-RDEPEND="${DEPEND}"
--- a/dev-R/rlang/rlang-0.4.6.ebuild
+++ b/dev-R/rlang/rlang-0.4.6.ebuild
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit R-packages-guru
-
-DESCRIPTION='Functions for Base Types and Core R and Tidyverse Features'
-SRC_URI="mirror://cran/src/contrib/rlang_0.4.6.tar.gz"
-LICENSE='GPL-3'
-HOMEPAGE="
-	https://rlang.r-lib.org
-	https://github.com/r-lib/rlang
-	https://cran.r-project.org/package=rlang
-"
-KEYWORDS="~amd64"
-IUSE="${IUSE-}"
-DEPEND=">=dev-lang/R-3.2.0"
-RDEPEND="${DEPEND}"
--- a/dev-R/tibble/Manifest
+++ b/dev-R/tibble/Manifest
@@ -1,3 +1 @@
-DIST tibble_3.0.1.tar.gz 399191 BLAKE2B c1d1c0f79f46cf0e44939bc3a81ed45a18ce60083bd7459864bada8485b24c82edbb0d5c804cded19b37366600b0d440695b4c0561245e504a8c1f5b52ed78c4 SHA512 ad97383dd6468730c37a059881a27114fbdd10431be1354fc3899863d043e58303b123c95c6f5a729c353d9f3445ce317d6742696bd1fb940095034ea6b89037
-DIST tibble_3.1.0.tar.gz 686464 BLAKE2B 64aff86b65ad92a168fe1aade9c94c86d2a120bc9fb71d6c820748f00cbc917043dcbe28344a1a78f98ea681661c8d6d1f43889c65e13d50c1ad87975d6b6a2d SHA512 13c695f671e958569fd3fe452e898c7ffe461a15235c06a549e65e393c5c205a6bfe948219f0b4c3e5d33db7f59d4da65bb09b44fa377f00d285d4bb10d83c38
 DIST tibble_3.1.1.tar.gz 686855 BLAKE2B a5aba307844c7f228e6fe74a2a978934fc39abb274d2dcba17a988d88f085dda40f546da657c537a4e15d85e8010b06deb965d99067252ab519e748a7b441b19 SHA512 4ac7dbaffbec467bbea5ac0e6e5814140180e0011fea5151f5ec29401e951e775bb8637897dc500e5133e1cfcb455560bf72dc16471ba6d6cd03d67eae7f95a7
--- a/dev-R/tibble/tibble-3.0.1.ebuild
+++ b/dev-R/tibble/tibble-3.0.1.ebuild
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit R-packages-guru
-
-DESCRIPTION='Simple Data Frames'
-SRC_URI="mirror://cran/src/contrib/tibble_3.0.1.tar.gz"
-LICENSE='MIT'
-HOMEPAGE="
-	https://tibble.tidyverse.org
-	https://github.com/tidyverse/tibble
-	https://cran.r-project.org/package=tibble
-"
-IUSE="${IUSE-}"
-KEYWORDS="~amd64"
-DEPEND="
-	>=dev-lang/R-3.1.0
-	dev-R/cli
-	>=dev-R/crayon-1.3.4
-	>=dev-R/lifecycle-0.2.0
-	>=dev-R/ellipsis-0.2.0
-	>=dev-R/fansi-0.4.0
-	dev-R/magrittr
-	>=dev-R/pillar-1.4.3
-	dev-R/pkgconfig
-	>=dev-R/rlang-0.4.3
-	>=dev-R/vctrs-0.2.4
-"
-RDEPEND="${DEPEND-}"
--- a/dev-R/tibble/tibble-3.1.0.ebuild
+++ b/dev-R/tibble/tibble-3.1.0.ebuild
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit R-packages-guru
-
-DESCRIPTION='Simple Data Frames'
-SRC_URI="mirror://cran/src/contrib/${PN}_${PV}.tar.gz"
-LICENSE='MIT'
-HOMEPAGE="
-	https://tibble.tidyverse.org
-	https://github.com/tidyverse/tibble
-	https://cran.r-project.org/package=tibble
-"
-IUSE="${IUSE-}"
-KEYWORDS="~amd64"
-DEPEND="
-	>=dev-lang/R-3.1.0
-	dev-R/cli
-	>=dev-R/crayon-1.3.4
-	>=dev-R/lifecycle-0.2.0
-	>=dev-R/ellipsis-0.2.0
-	>=dev-R/fansi-0.4.0
-	dev-R/magrittr
-	>=dev-R/pillar-1.5.0
-	dev-R/pkgconfig
-	>=dev-R/rlang-0.4.3
-	>=dev-R/vctrs-0.3.2
-"
-RDEPEND="${DEPEND-}"
--- a/dev-R/tidyselect/Manifest
+++ b/dev-R/tidyselect/Manifest
@@ -1,3 +1 @@
-DIST tidyselect_1.0.0.tar.gz 151161 BLAKE2B 8ce7203ae34fcc71905f785038469f8659ade390c858a039e036f5905e8f32c6b3b8165869be7573b46917293acb0f2a3aa800d78283165955cf8d27bec0eed1 SHA512 53775f43d896f271c9d988e84ca4a744dfb591d1ac42e811cffd1691a4a85000481102b61636831650bcddb9a07d7202341cb367cf587c3291e255ecf6ad64ff
-DIST tidyselect_1.1.0.tar.gz 90842 BLAKE2B 459409194e73797f69bbcc43658ccf5ebf519fabfecfb732efaa896684c179e49473c1719e80b04547149eb818fb620c71e8a7bb7f62906cf6404bb5efef903c SHA512 827bd7f3d3dd4a1397323bec2fa26b871afb9cbf082a9281c01d4f06f6020afc46ca0bc4968b7dd5d82033c8c53fc43866b1bc31b6084fd6715d0eab093480e8
 DIST tidyselect_1.1.1.tar.gz 92088 BLAKE2B 8c0156b16afe73aa1413bcbd4ae4c947d923e8af138bebab47938d17c286b7e33af76f723336db06ccf5fb0810a47a730b1d14125dad537a024e77e78596475c SHA512 24ffe050938eb79c4ad4fa92d9f29a33b8f21d52b250702212d0c291e95bfddf877c29e7b2ac3d69a9ac3681c2b222358a2f284f4632c6a97a3b2bfec3b7c6a7
--- a/dev-R/tidyselect/tidyselect-1.0.0.ebuild
+++ b/dev-R/tidyselect/tidyselect-1.0.0.ebuild
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit R-packages-guru
-
-DESCRIPTION='Select from a Set of Strings'
-SRC_URI="mirror://cran/src/contrib/tidyselect_1.0.0.tar.gz"
-LICENSE='GPL-3'
-HOMEPAGE="
-	https://tidyselect.r-lib.org
-	https://github.com/r-lib/tidyselect
-	https://cran.r-project.org/package=tidyselect
-"
-IUSE="${IUSE-}"
-KEYWORDS="~amd64"
-DEPEND="
-	>=dev-lang/R-3.2
-	dev-R/ellipsis
-	>=dev-R/glue-1.3.0
-	>=dev-R/purrr-0.3.2
-	>=dev-R/rlang-0.4.3
-	>=dev-R/vctrs-0.2.2
-"
-RDEPEND="${DEPEND-}"
--- a/dev-R/tidyselect/tidyselect-1.1.0.ebuild
+++ b/dev-R/tidyselect/tidyselect-1.1.0.ebuild
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit R-packages-guru
-
-DESCRIPTION='Select from a Set of Strings'
-SRC_URI="mirror://cran/src/contrib/${PN}_${PV}.tar.gz"
-LICENSE='GPL-3'
-HOMEPAGE="
-	https://tidyselect.r-lib.org
-	https://github.com/r-lib/tidyselect
-	https://cran.r-project.org/package=tidyselect
-"
-IUSE="${IUSE-}"
-KEYWORDS="~amd64"
-DEPEND="
-	>=dev-lang/R-3.2
-	dev-R/ellipsis
-	>=dev-R/glue-1.3.0
-	>=dev-R/purrr-0.3.2
-	>=dev-R/rlang-0.4.6
-	>=dev-R/vctrs-0.2.2
-"
-RDEPEND="${DEPEND-}"
--- a/dev-R/utf8/Manifest
+++ b/dev-R/utf8/Manifest
@@ -1,2 +1 @@
-DIST utf8_1.1.4.tar.gz 218882 BLAKE2B 360e5010be9b4df755cf10b165e4de613aaa6e2420d28974522aafc7d99464cbf2c025b2a93a3319e3d4bb6dd85f998563ffa1780eacc1281aec9da49adc0fa5 SHA512 c45308500417e820285edaba54d5e6f3f2ab599dc388457a85cff0112b454ff09a9e18710762a93fc21239d84440ab844a1a7b134af6111a3cf0e3fa25ed95eb
 DIST utf8_1.2.1.tar.gz 239463 BLAKE2B 81f12769f360731a58c1d132e0edb0d33378b400e644514e49807c20584c16e177babed3d46552f833d2650a35064f7240777749a6059dc671b29afb906625d6 SHA512 c91b1000366c44cea0956100cb0c5681466b9f4fd4511c8b4ebf6fb5d14bd71a49b1e4cb082a776af49de05e51c3deb0ba688a9bd740e5e722d41dd9b1eab282
--- a/dev-R/utf8/utf8-1.1.4.ebuild
+++ b/dev-R/utf8/utf8-1.1.4.ebuild
@@ -1,16 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit R-packages-guru
-
-HOMEPAGE="
-	https://github.com/patperry/r-utf8
-	https://cran.r-project.org/package=utf8
-"
-DESCRIPTION='Unicode Text Processing'
-SRC_URI="mirror://cran/src/contrib/utf8_1.1.4.tar.gz"
-LICENSE='Apache-2.0'
-KEYWORDS="~amd64"
-IUSE="${IUSE-}"
--- a/dev-R/vctrs/Manifest
+++ b/dev-R/vctrs/Manifest
@@ -1,2 +1 @@
-DIST vctrs_0.3.7.tar.gz 782590 BLAKE2B fa7b4a1b2b1f9518750575ad506c990a989811a123af44fc0451f71f25bd92adabdb6ca433c3e070ab906b385964a79b74e11cdd0f3988229ef5e45bbec7ad81 SHA512 6474585edab12d58ca9abe612e71148d9d6d3f7f32250645e0ffc463fc3a9007ccbfe8c7b7a6a752dab7f382490a15889cbe0e433e2a4d51ec659c54b37681f7
 DIST vctrs_0.3.8.tar.gz 782608 BLAKE2B 7b8ee4ae7d8255394d0e79dc7aa5c9c5782dfd47f3390dd6c346081546e8cc2fe8d6fc455c7902c0c8d2b498105088c1967919120d82d2c0da8c9f93b9c3146f SHA512 f5162fa4641779fc7cd0f77efb1d83efc01af0ba13d910337531980e2fa93abe6ce03f23a9a51db4f506faf716cc3fac820b91abac3e3282bc9cb73038fc5787
--- a/dev-R/vctrs/vctrs-0.3.7.ebuild
+++ b/dev-R/vctrs/vctrs-0.3.7.ebuild
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit R-packages-guru
-
-DESCRIPTION='Vector Helpers'
-HOMEPAGE="
-	https://github.com/r-lib/vctrs
-	https://cran.r-project.org/package=vctrs
-"
-SRC_URI="mirror://cran/src/contrib/${PN}_${PV}.tar.gz"
-LICENSE='GPL-3'
-
-IUSE="${IUSE-}"
-KEYWORDS="~amd64"
-DEPEND="
-	>=dev-lang/R-3.3
-	>=dev-R/ellipsis-0.2.0
-	dev-R/glue
-	>=dev-R/rlang-0.4.10
-"
-RDEPEND="${DEPEND-}"
--- a/dev-lang/fbc-bootstrap/fbc-bootstrap-1.07.3.ebuild
+++ b/dev-lang/fbc-bootstrap/fbc-bootstrap-1.07.3.ebuild
@@ -3,6 +3,8 @@

 EAPI=7

+inherit toolchain-funcs
+
 DESCRIPTION="Bootstrap package for dev-lang/fbc"
 HOMEPAGE="https://www.freebasic.net"
 SRC_URI="https://github.com/freebasic/fbc/releases/download/${PV}/FreeBASIC-${PV}-source-bootstrap.tar.xz"
@@ -16,7 +18,8 @@ PATCHES=( "${FILESDIR}"/fbc-1.07.0-Pass-ltinfo-to-linker.patch )
 S="${WORKDIR}/FreeBASIC-${PV}-source-bootstrap"

 src_compile() {
-	emake bootstrap-minimal
+	emake bootstrap-minimal \
+		AR=$(tc-getAR) AS=$(tc-getAS) CC=$(tc-getCC) CFLAGS="${CFLAGS}" V=1
 }

 src_install() {
--- a/dev-lang/wren/wren-0.3.0.ebuild
+++ b/dev-lang/wren/wren-0.3.0.ebuild
@@ -43,10 +43,11 @@ EOF
 }

 src_compile() {
+	tc-export CC
 	cd projects/make
-	emake
+	emake verbose=1
 	cd "${WORKDIR}/wren-cli-${PV}/projects/make"
-	emake
+	emake verbose=1
 }

 python_test() {
--- a/dev-perl/GitLab-API-v4/GitLab-API-v4-0.26.ebuild
+++ b/dev-perl/GitLab-API-v4/GitLab-API-v4-0.26.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=BLUEFEET
+
+inherit perl-module
+
+DESCRIPTION="A complete GitLab API v4 client"
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+RDEPEND="
+	dev-perl/Const-Fast
+	dev-perl/HTTP-Tiny-Multipart
+	dev-perl/JSON
+	dev-perl/Log-Any
+	dev-perl/Moo
+	dev-perl/Path-Tiny
+	dev-perl/Type-Tiny
+	dev-perl/URI
+	dev-perl/namespace-clean
+	dev-perl/strictures
+	virtual/perl-Carp
+	virtual/perl-Exporter
+	virtual/perl-Getopt-Long
+	virtual/perl-HTTP-Tiny
+"
+DEPEND="
+	${RDEPEND}
+	test? (
+		dev-perl/Test2-Suite
+		virtual/perl-MIME-Base64
+	)
+"
+BDEPEND="dev-perl/Module-Build-Tiny"
--- a/dev-perl/GitLab-API-v4/Manifest
+++ b/dev-perl/GitLab-API-v4/Manifest
@@ -0,0 +1 @@
+DIST GitLab-API-v4-0.26.tar.gz 80446 BLAKE2B d316eaf1d6c00d53583346b2619d039ab7fd182f13b534b6d2b917abc0c25f8f542acc31af7b4a2ec3858347819d2d8012d4a41373ff89b65a35de2e28ec0615 SHA512 03ca9b2ef738e3567b3f5b809beb02baed8d792cac1ec3eebdeeebf8362e2d0eb43b15d353934587d364b8c32a530b66fd15d31e2eef1bc080c5059d3eaf23ab
--- a/dev-perl/GitLab-API-v4/metadata.xml
+++ b/dev-perl/GitLab-API-v4/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>lssndrbarbieri@gmail.com</email>
+		<name>Alessandro Barbieri</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="cpan">GitLab-API-v4</remote-id>
+		<remote-id type="cpan-module">GitLab::API::v4</remote-id>
+		<remote-id type="cpan-module">GitLab::API::v4::Config</remote-id>
+		<remote-id type="cpan-module">GitLab::API::v4::Constants</remote-id>
+		<remote-id type="cpan-module">GitLab::API::v4::Mock</remote-id>
+		<remote-id type="cpan-module">GitLab::API::v4::Mock::Engine</remote-id>
+		<remote-id type="cpan-module">GitLab::API::v4::Mock::RESTClient</remote-id>
+		<remote-id type="cpan-module">GitLab::API::v4::Paginator</remote-id>
+		<remote-id type="cpan-module">GitLab::API::v4::RESTClient</remote-id>
+		<remote-id type="cpan-module">GitLab::API::v4::WWWClient</remote-id>
+	</upstream>
+</pkgmetadata>
--- a/dev-perl/HTTP-Tiny-Multipart/HTTP-Tiny-Multipart-0.08.ebuild
+++ b/dev-perl/HTTP-Tiny-Multipart/HTTP-Tiny-Multipart-0.08.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=RENEEB
+
+inherit perl-module
+
+DESCRIPTION="Add post_multipart to HTTP::Tiny"
+LICENSE="Artistic-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	virtual/perl-Carp
+	virtual/perl-HTTP-Tiny
+	virtual/perl-MIME-Base64
+"
+DEPEND="
+	${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+"
--- a/dev-perl/HTTP-Tiny-Multipart/Manifest
+++ b/dev-perl/HTTP-Tiny-Multipart/Manifest
@@ -0,0 +1 @@
+DIST HTTP-Tiny-Multipart-0.08.tar.gz 9067 BLAKE2B d7c84d9c41a638f292f369f9e0ee2937ff9fce8ff76ba9f69777a5c8d27518405e79fbf776527090e4be9c29cfb33f6041eab3315d58cedf3394d9f37f2b9ff4 SHA512 e8a6452f4a23f359110b54987c2ff261446b1848ddc6f9ecdc37b711978c00d99ffc2ab8189f435d39d7c2d127253608b721f48e11969c8039c1bc9a69609720
--- a/dev-perl/HTTP-Tiny-Multipart/metadata.xml
+++ b/dev-perl/HTTP-Tiny-Multipart/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>lssndrbarbieri@gmail.com</email>
+		<name>Alessandro Barbieri</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="cpan">HTTP-Tiny-Multipart</remote-id>
+		<remote-id type="cpan-module">HTTP::Tiny::Multipart</remote-id>
+	</upstream>
+</pkgmetadata>
--- a/dev-perl/List-Compare/List-Compare-0.55.ebuild
+++ b/dev-perl/List-Compare/List-Compare-0.55.ebuild
@@ -18,6 +18,7 @@ DEPEND="
 	${RDEPEND}
 	virtual/perl-ExtUtils-MakeMaker
 	test? (
+		dev-perl/Capture-Tiny
 		dev-perl/IO-CaptureOutput
 		>=virtual/perl-Test-Simple-0.100.0
 	)
--- a/dev-python/atomiclong/atomiclong-9999.ebuild
+++ b/dev-python/atomiclong/atomiclong-9999.ebuild
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( pypy3 python3_7 )
-
-inherit distutils-r1
-
-SRC_URI=""
-EGIT_REPO_URI="https://github.com/dreid/${PN}.git"
-inherit git-r3
-
-DESCRIPTION="An AtomicLong type using CFFI."
-HOMEPAGE="https://github.com/dreid/atomiclong"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS=""
-
-RDEPEND="virtual/python-cffi[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
--- a/dev-python/cloudscraper/Manifest
+++ b/dev-python/cloudscraper/Manifest
@@ -1,3 +1,2 @@
-DIST cloudscraper-1.2.40.tar.gz 125216 BLAKE2B 7239d78d33ca80231ab3814a208da4c78ecfb1c1650e5ef9876517860107947bc849e688e19214d0636aff52eb02eeb750721e9fff7a4e164a5ce81eff2f7486 SHA512 f71d438acf4f0e423cb7d43a986871fab81122670cb1e353b264473c8b3446073c2fa7b39f1079fa85a398d7008c1d375e5417e2e9f74640b6bd52d07768f6bf
-DIST cloudscraper-1.2.46.tar.gz 109868 BLAKE2B 7cb081983c1bc6935bb1c2fb137e629eebec3e16b9726bf764901ec8cbe88fb061873e16bb4b4fb281669d8b50397f2572c87f6ff70c2d5feba46b12373a0e11 SHA512 81a1757d3bd9bf064f1925628638eb24a8370cafb6a0bbcd60535bd22da632918eff46aeeae959f5dc642438e9ffee837eda0478314adb337d9a0d3f0ce3c950
 DIST cloudscraper-1.2.56.tar.gz 110983 BLAKE2B cba3136ba1ec25ea077f21f46eed2fff5412bc31cdf967cadd0c40837fd4bc62b7c0df580a2955dcee63857bab86d7f5b6560ca3bd470192447da1449dbea493 SHA512 f1f0ff97542cd08afb065a50a6e9d48e4d50fe2e51a89d9b0501c5de51e3eef326544ffb76940e6bb4ba080a35f21808f191abd7d7868a57021e955fa420c514
+DIST cloudscraper-1.2.58.tar.gz 110992 BLAKE2B b3e002d559ebdbb07686d74fe9967776f832397758653c2d6fe8ba766239d5744608fe6f321a0284c1da02a1ddb8257d7ce1931bb5adf71096e4151dbb9cb2a2 SHA512 bab8a9b00e891d2e0b982200de1a9a8fd800f554bda02624a963d0de19388880c4abf2ee32944177853eb7cb14e67521b0591e8d9430d1789425e67de9f1d467
--- a/dev-python/cloudscraper/cloudscraper-1.2.46.ebuild
+++ b/dev-python/cloudscraper/cloudscraper-1.2.46.ebuild
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="A Python module to bypass Cloudflare's anti-bot page"
-HOMEPAGE="https://github.com/venomous/cloudscraper"
-SRC_URI="https://github.com/VeNoMouS/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="
-	test? (
-		dev-python/js2py[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-		net-libs/nodejs
-	)"
-RDEPEND="
-	>=dev-python/requests-2.9.2[${PYTHON_USEDEP}]
-	>=dev-python/requests-toolbelt-0.9.1[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
--- a/dev-python/cloudscraper/cloudscraper-1.2.58.ebuild
+++ b/dev-python/cloudscraper/cloudscraper-1.2.58.ebuild
@@ -3,7 +3,7 @@

 EAPI=7

-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )

 inherit distutils-r1

--- a/dev-python/pybeam/pybeam-0.7.ebuild
+++ b/dev-python/pybeam/pybeam-0.7.ebuild
@@ -18,5 +18,6 @@ SLOT="0"
 KEYWORDS="~amd64"

 RDEPEND="dev-python/construct[${PYTHON_USEDEP}]"
+DEPEND="test? ( dev-python/six[${PYTHON_USEDEP}] )"

 distutils_enable_tests unittest
--- a/dev-scheme/cyclone/cyclone-0.28.0.ebuild
+++ b/dev-scheme/cyclone/cyclone-0.28.0.ebuild
@@ -2,13 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2

 # Cyclone is a self-hosting Scheme to C compiler
-# cyclone-bootstrap is the Cyclone SOURCE transpired by it to C
+# cyclone-bootstrap is the Cyclone SOURCE transpiled by it to C

 EAPI=7

-inherit flag-o-matic
+inherit flag-o-matic toolchain-funcs

-DESCRIPTION="Scheme R7RS to C compiler"
+DESCRIPTION="R7RS Scheme to C compiler"
 HOMEPAGE="http://justinethier.github.io/cyclone/"

 if [[ "${PV}" == *9999* ]]; then
@@ -31,15 +31,27 @@ RDEPEND="
 "

 src_configure() {
-	append-cflags -fPIC -rdynamic -Iinclude
+	export CYC_GCC_OPT_FLAGS="${CFLAGS}"
+	append-cflags -fPIC -Iinclude
 	append-ldflags -L. -Wl,--export-dynamic
-	tc-export CC
+	tc-export AR CC RANLIB
 }

 src_test() {
 	emake test LDFLAGS=""
 }

+src_compile() {
+	local myopts=(
+		PREFIX="${EPREFIX}/usr"
+		CYC_GCC_OPT_FLAGS="${CYC_GCC_OPT_FLAGS}"
+		AR="$(tc-getAR)"
+		CC="$(tc-getCC)"
+		RANLIB="$(tc-getRANLIB)"
+	)
+	emake "${myopts[@]}"
+}
+
 src_install() {
 	einstalldocs

--- a/dev-scheme/cyclone/cyclone-9999.ebuild
+++ b/dev-scheme/cyclone/cyclone-9999.ebuild
@@ -2,13 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2

 # Cyclone is a self-hosting Scheme to C compiler
-# cyclone-bootstrap is the Cyclone SOURCE transpired by it to C
+# cyclone-bootstrap is the Cyclone SOURCE transpiled by it to C

 EAPI=7

-inherit flag-o-matic
+inherit flag-o-matic toolchain-funcs

-DESCRIPTION="Scheme R7RS to C compiler"
+DESCRIPTION="R7RS Scheme to C compiler"
 HOMEPAGE="http://justinethier.github.io/cyclone/"

 if [[ "${PV}" == *9999* ]]; then
@@ -31,15 +31,27 @@ RDEPEND="
 "

 src_configure() {
-	append-cflags -fPIC -rdynamic -Iinclude
+	export CYC_GCC_OPT_FLAGS="${CFLAGS}"
+	append-cflags -fPIC -Iinclude
 	append-ldflags -L. -Wl,--export-dynamic
-	tc-export CC
+	tc-export AR CC RANLIB
 }

 src_test() {
 	emake test LDFLAGS=""
 }

+src_compile() {
+	local myopts=(
+		PREFIX="${EPREFIX}/usr"
+		CYC_GCC_OPT_FLAGS="${CYC_GCC_OPT_FLAGS}"
+		AR="$(tc-getAR)"
+		CC="$(tc-getCC)"
+		RANLIB="$(tc-getRANLIB)"
+	)
+	emake "${myopts[@]}"
+}
+
 src_install() {
 	einstalldocs

--- a/dev-util/devscripts/Manifest
+++ b/dev-util/devscripts/Manifest
@@ -0,0 +1 @@
+DIST devscripts_2.21.2.tar.xz 980516 BLAKE2B 907f2f4e258a8396ad0a28eead1e2058b8e19be205f024ea80c0fbd9621d5ca4299844fe83d66cac7f653a917705d9c36eddb9d51454a7fbb9d7e2b52bc994ff SHA512 a6765d807dc0c2ef7a3d8c59e1262bfe7542c3ca52cda3c1910af253925cb105a9d1bf272c76a86f0b3cdda9c8a4e2d29a660437f73087dd70ee8a444bbedb01
--- a/dev-util/devscripts/devscripts-2.21.2.ebuild
+++ b/dev-util/devscripts/devscripts-2.21.2.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+DISTUTILS_OPTIONAL=true
+
+inherit distutils-r1
+
+DESCRIPTION="Scripts to make the life of a Debian Package maintainer easier"
+HOMEPAGE="https://salsa.debian.org/debian/devscripts"
+SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="python test"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+RESTRICT="!test? ( test )"
+
+CDEPEND="
+	dev-lang/perl:=
+	dev-perl/File-DesktopEntry
+	dev-perl/File-DirList
+	dev-perl/File-HomeDir
+	dev-perl/File-Touch
+	dev-perl/IPC-Run
+	dev-perl/Moo
+	dev-perl/libwww-perl
+	dev-util/distro-info
+	python? ( ${PYTHON_DEPS} )
+"
+DEPEND="
+	${CDEPEND}
+	app-shells/bash-completion
+	test? (
+		app-arch/zip
+		dev-perl/Git-Wrapper
+		dev-perl/GitLab-API-v4
+		dev-perl/List-Compare
+		dev-perl/Software-License
+		dev-perl/String-ShellQuote
+		dev-perl/UNIVERSAL-require
+		dev-python/flake8[${PYTHON_USEDEP}]
+		dev-python/pyftpdlib[${PYTHON_USEDEP}]
+		dev-python/python-debian[${PYTHON_USEDEP}]
+		dev-util/shunit2
+		dev-vcs/subversion
+		sys-libs/libfaketime
+		virtual/perl-DB_File
+	)
+"
+RDEPEND="
+	${CDEPEND}
+	app-arch/dpkg
+	app-crypt/gnupg
+	app-text/wdiff
+	dev-util/debhelper
+	dev-util/patchutils
+	sys-apps/fakeroot
+"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/distutils-r1.patch"
+	"${FILESDIR}/Remove-failing-tests.patch"
+	"${FILESDIR}/Replace-Debian-xsl-stylesheets-paths-with-Gentoos.patch"
+)
+
+DISTUTILS_S="${S}"/scripts
+
+src_prepare() {
+	default
+
+	# Avoid file collision with app-shells/bash-completion
+	rm "${DISTUTILS_S}"/bts.bash_completion || die
+}
+
+src_configure() {
+	default
+
+	if use python; then
+		pushd "${DISTUTILS_S}" > /dev/null || die
+		distutils-r1_src_configure
+		popd > /dev/null || die
+	fi
+}
+
+src_compile() {
+	default
+
+	if use python; then
+		pushd "${DISTUTILS_S}" > /dev/null || die
+		distutils-r1_src_compile
+		popd > /dev/null || die
+	fi
+}
+
+src_install() {
+	dodir /usr/bin
+	default
+
+	if use python; then
+		pushd "${DISTUTILS_S}" > /dev/null || die
+		distutils-r1_src_install
+		popd > /dev/null || die
+	fi
+}
+
+src_test() {
+	default
+
+	if use python; then
+		pushd "${DISTUTILS_S}" > /dev/null || die
+		distutils-r1_src_test
+		popd > /dev/null || die
+	fi
+}
--- a/dev-util/devscripts/files/Remove-failing-tests.patch
+++ b/dev-util/devscripts/files/Remove-failing-tests.patch
@@ -0,0 +1,22 @@
+--- a/test/Makefile
+++ b/test/Makefile
+@@ -3,14 +3,14 @@
+ 	perl \
+ 	annotate-output \
+ 	checkbashisms \
+-	dd-list \
+	 \
+ 	debchange \
+ 	debdiff \
+-	debrepro \
+	 \
+ 	debsign \
+ 	mergechanges \
+-	mk-origtargz \
+	 \
+-	package_lifecycle \
+	 \
+-	sadt \
+	 \
+ 	uscan \
+ 	uscan_ftp \
--- a/dev-util/devscripts/files/Replace-Debian-xsl-stylesheets-paths-with-Gentoos.patch
+++ b/dev-util/devscripts/files/Replace-Debian-xsl-stylesheets-paths-with-Gentoos.patch
@@ -0,0 +1,42 @@
+--- a/po4a/Makefile
+++ b/po4a/Makefile
+@@ -34,8 +34,8 @@
+ 	pod2man --utf8 --center=" " --release="$(DESC_$(dir $@))" $< > $@
+ %.1:: %.dbk translate
+ 	xsltproc --nonet \
+-	  /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl $<
+-	# /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/other.xsl
+	  /usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl $<
+	# /usr/share/sgml/docbook/xsl-stylesheets/manpages/other.xsl
+ 	# (which is imported by the above stylesheet) insists in writing the output
+ 	# to where it wants to.  we can only move the file ourselves.
+ 	# ($* → de/deb-reversion.de)
+--- a/scripts/deb-reversion.dbk
+++ b/scripts/deb-reversion.dbk
+@@ -5,13 +5,13 @@
+ <!--
+ 
+ Process this file with an XSLT processor: `xsltproc \
+--''-nonet /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/\
+-''-nonet /usr/share/sgml/docbook/xsl-stylesheets/\
+ manpages/docbook.xsl manpage.dbk'.  A manual page
+ <package>.<section> will be generated.  You may view the
+ manual page with: nroff -man <package>.<section> | less'.  A
+ typical entry in a Makefile or Makefile.am is:
+ 
+-DB2MAN=/usr/share/sgml/docbook/stylesheet/xsl/nwalsh/\
+DB2MAN=/usr/share/sgml/docbook/xsl-stylesheets/\
+ manpages/docbook.xsl
+ XP=xsltproc -''-nonet
+ 
+--- a/scripts/Makefile
+++ b/scripts/Makefile
+@@ -87,7 +87,7 @@
+ 	pod2man --utf8 --center=" " --release="Debian Utilities" $< > $@
+ %.1: %.dbk
+ 	xsltproc --nonet -o $@ \
+-	  /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl $<
+	  /usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl $<
+ 
+ # Syntax checker
+ test_sh: $(SH_CHECKS)
--- a/dev-util/devscripts/files/distutils-r1.patch
+++ b/dev-util/devscripts/files/distutils-r1.patch
@@ -0,0 +1,26 @@
+--- a/scripts/Makefile
+++ b/scripts/Makefile
+@@ -99,7 +99,6 @@
+ 	perl -I ../lib -c $<; \
+ 
+ test_py: $(VERSION_FILE)
+-	$(foreach python,$(shell py3versions -r ../debian/control),$(python) setup.py test$(\n))
+ 
+ debbisect.1: debbisect
+ 	help2man \
+@@ -131,7 +130,6 @@
+ 	cp $< $@
+ 
+ clean:
+-	python3 setup.py clean -a
+ 	find -name '*.pyc' -delete
+ 	find -name __pycache__ -delete
+ 	rm -rf devscripts.egg-info $(BC_BUILD_DIR) .pylint.d
+@@ -142,7 +140,6 @@
+ test: test_pl test_sh test_py
+ 
+ install: all
+-	python3 setup.py install --root="$(DESTDIR)" --no-compile --install-layout=deb
+ 	cp $(SCRIPTS) $(DESTDIR)$(BINDIR)
+ 	ln -sf edit-patch $(DESTDIR)$(BINDIR)/add-patch
+ 	install -d $(DESTDIR)$(COMPL_DIR)
--- a/dev-util/devscripts/metadata.xml
+++ b/dev-util/devscripts/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<description>comaintainers welcome</description>
+		<email>lssndrbarbieri@gmail.com</email>
+		<name>Alessandro Barbieri</name>
+	</maintainer>
+</pkgmetadata>
--- a/dev-util/rpmlint/Manifest
+++ b/dev-util/rpmlint/Manifest
@@ -0,0 +1 @@
+DIST rpmlint-1.11_p20210515.tar.gz 5670517 BLAKE2B b85727f45cf56a89d0b7a1394b72f627cde6704236851e548712c19389baced8dc86995fad0d5ee274e79e10cece553e4b2870b012d8063eef93d56c03f5ee5c SHA512 c8b40b93cfeb16b96588536948c84b0bbfed18b9e63668b68d8b7574e7bc90c5a15a7efc2b612ea4d4db470b156f5e29abee7acb69f3edb86d20482e499b0140
--- a/dev-util/rpmlint/files/no-coverage.patch
+++ b/dev-util/rpmlint/files/no-coverage.patch
@@ -0,0 +1,8 @@
+--- a/setup.cfg
+++ b/setup.cfg
+@@ -10,4 +10,4 @@
+ application-import-names = Testing
+ 
+ [tool:pytest]
+-addopts = -vv --cov=rpmlint -n auto --flake8
+addopts = -vv
--- a/dev-util/rpmlint/metadata.xml
+++ b/dev-util/rpmlint/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">
+		<description>comaintainers welcome</description>
+		<email>lssndrbarbieri@gmail.com</email>
+		<name>Alessandro Barbieri</name>
+	</maintainer>
+	<longdescription lang="en">
+		rpmlint is a tool for checking common errors in rpm packages. It can be
+		used to test individual packages and spec files before uploading or to
+		check an entire distribution. By default all applicable checks are
+		processed but specific checks can be performed by using command line
+		parameters.
+	</longdescription>
+	<upstream>
+		<bugs-to>https://github.com/rpm-software-management/rpmlint/issues</bugs-to>
+		<remote-id type="github">rpm-software-management/rpmlint</remote-id>
+	</upstream>
+</pkgmetadata>
--- a/dev-util/rpmlint/rpmlint-1.11_p20210515.ebuild
+++ b/dev-util/rpmlint/rpmlint-1.11_p20210515.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+COMMIT="af4cbdcc93267c065fbb7c7248d203977343523f"
+DISTUTILS_SINGLE_IMPL=1
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Tool for checking common errors in RPM packages"
+HOMEPAGE="https://github.com/rpm-software-management/rpmlint"
+SRC_URI="https://github.com/rpm-software-management/rpmlint/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${COMMIT}"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	app-arch/bzip2
+	app-arch/cpio
+	app-arch/gzip
+	app-arch/xz-utils
+	app-arch/zstd
+	sys-devel/binutils:*
+
+	$(python_gen_cond_dep '
+		app-arch/rpm[python,${PYTHON_SINGLE_USEDEP}]
+		dev-python/pybeam[${PYTHON_USEDEP}]
+		dev-python/pyxdg[${PYTHON_USEDEP}]
+		dev-python/toml[${PYTHON_USEDEP}]
+		dev-python/zstd[${PYTHON_USEDEP}]
+	')
+"
+DEPEND="
+	${RDEPEND}
+	test? (
+		app-shells/dash
+		dev-libs/appstream-glib
+		dev-util/desktop-file-utils
+		dev-util/devscripts
+		|| (
+			( app-text/hunspell[l10n_cs,l10n_en] app-text/enchant[hunspell] )
+			( app-text/aspell[l10n_cs,l10n_en] app-text/enchant[aspell] )
+		)
+
+		$(python_gen_cond_dep '
+			dev-python/pyenchant[${PYTHON_USEDEP}]
+			dev-python/pytest-xdist[${PYTHON_USEDEP}]
+			dev-python/python-magic[${PYTHON_USEDEP}]
+		')
+	)
+"
+
+PATCHES=( "${FILESDIR}/no-coverage.patch" )
+
+distutils_enable_tests pytest
+
+python_test() {
+	pytest -vv \
+			--deselect test/test_speccheck.py::test_check_invalid_url[spec/SpecCheck2] \
+			--deselect test/test_lint.py::test_run_installed_and_no_files \
+			--deselect test/test_lint.py::test_run_installed[packages0] \
+			--deselect test/test_ldd_parser.py::test_dependencies \
+	|| die
+}
--- a/dev-vcs/git-blame-someone-else/git-blame-someone-else-9999.ebuild
+++ b/dev-vcs/git-blame-someone-else/git-blame-someone-else-9999.ebuild
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit git-r3
-
-DESCRIPTION="Blame someone else for your bad code."
-HOMEPAGE="https://github.com/jayphelps/git-blame-someone-else"
-EGIT_REPO_URI="https://github.com/jayphelps/git-blame-someone-else.git"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS=""
-
-IUSE=""
-
-RDEPEND="
-	dev-vcs/git
-"
-DEPEND=""
-
-src_install() {
-	dobin "${PN}"
-	einstalldocs
-}
--- a/eclass/golang-common.eclass
+++ b/eclass/golang-common.eclass
--- a/eclass/golang-single.eclass
+++ b/eclass/golang-single.eclass
@@ -0,0 +1,180 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# @ECLASS: golang-single.eclass
+# @MAINTAINER:
+#
+# @AUTHOR:
+# Mauro Toffanin <toffanin.mauro@gmail.com>
+# @BLURB: An eclass for GoLang packages not installed inside GOPATH/GOBIN.
+# @DESCRIPTION:
+# This eclass allows to install arbitrary packages written in GoLang which
+# don't support being installed inside the Go environment.
+# This mostly includes traditional packages (C/C++/GUI) embedding tools written
+# in GoLang, and GoLang packages that need to be compiled with GCC instead of
+# the standard Go interpreter.
+#
+# @EXAMPLE:
+# Typical ebuild using golang-single.eclass:
+#
+# @CODE
+# EAPI=5
+#
+# GOLANG_PKG_IMPORTPATH="github.com/captObvious"
+# GOLANG_PKG_ARCHIVESUFFIX=".zip"
+# GOLANG_PKG_HAVE_TEST
+# inherit golang-single qt4-r2
+#
+# DESCRIPTION="Foo bar application"
+# HOMEPAGE="http://example.org/foo/"
+#
+# LICENSE="MIT"
+# KEYWORDS="~amd64 ~x86"
+# SLOT="0"
+# IUSE="doc qt4"
+#
+# CDEPEND="
+#   qt4? (
+#       dev-qt/qtcore:4
+#       dev-qt/qtgui:4
+#   )"
+# RDEPEND="${CDEPEND}
+#   !media-gfx/bar"
+# DEPEND="${CDEPEND}
+#   doc? ( app-doc/doxygen )"
+#
+# DOCS=(AUTHORS ChangeLog README "Read me.txt" TODO)
+#
+# PATCHES=(
+#   "${FILESDIR}/${P}-qt4.patch" # bug 123458
+#   "${FILESDIR}/${P}-as-needed.patch"
+# )
+#
+# src_install() {
+#   use doc && HTML_DOCS=("${BUILD_DIR}/apidocs/html/")
+#   autotools-utils_src_install
+#   if use examples; then
+#       dobin "${BUILD_DIR}"/foo_example{1,2,3} \\
+#           || die 'dobin examples failed'
+#   fi
+# }
+#
+# @CODE
+
+inherit golang-common
+
+EXPORT_FUNCTIONS src_prepare src_unpack src_configure src_compile src_install src_test
+
+if [[ -z ${_GOLANG_SINGLE_ECLASS} ]]; then
+_GOLANG_SINGLE_ECLASS=1
+
+# This eclass uses GOLANG_PKG_IMPORTPATH to populate SRC_URI.
+SRC_URI="${SRC_URI:="https://${GOLANG_PKG_IMPORTPATH}/${GOLANG_PKG_NAME}/archive/${GOLANG_PKG_ARCHIVEPREFIX}${GOLANG_PKG_VERSION}${GOLANG_PKG_ARCHIVESUFFIX} -> ${P}${GOLANG_PKG_ARCHIVESUFFIX}"}"
+
+# This eclass uses GOLANG_PKG_DEPENDENCIES associative array to populate SRC_URI
+# with the required snapshots of the supplied GoLang dependencies.
+if [[ ${#GOLANG_PKG_DEPENDENCIES[@]} -gt 0 ]]; then
+
+	for i in ${!GOLANG_PKG_DEPENDENCIES[@]} ; do
+
+		# Collects all the tokens of the dependency.
+		local -A DEPENDENCY=()
+		while read -d $'\n' key value; do
+			[[ -z ${key} ]] && continue
+			DEPENDENCY[$key]="${value}"
+		done <<-EOF
+			$( _factorize_dependency_entities "${GOLANG_PKG_DEPENDENCIES[$i]}" )
+		EOF
+
+		# Debug
+		debug-print "${FUNCNAME}: DEPENDENCY = ${GOLANG_PKG_DEPENDENCIES[$i]}"
+		debug-print "${FUNCNAME}: importpath = ${DEPENDENCY[importpath]}"
+		debug-print "${FUNCNAME}: revision   = ${DEPENDENCY[revision]}"
+
+		# Downloads the archive.
+		case ${DEPENDENCY[importpath]} in
+			github*)
+				SRC_URI+=" https://${DEPENDENCY[importpath]}/archive/${DEPENDENCY[revision]}${GOLANG_PKG_ARCHIVESUFFIX} -> ${DEPENDENCY[importpath]//\//-}-${DEPENDENCY[revision]}${GOLANG_PKG_ARCHIVESUFFIX}"
+				;;
+			bitbucket*)
+				SRC_URI+=" https://${DEPENDENCY[importpath]}/get/${DEPENDENCY[revision]}.zip -> ${DEPENDENCY[importpath]//\//-}-${DEPENDENCY[revision]}.zip"
+				;;
+			code.google*)
+				SRC_URI+=" https://${DEPENDENCY[project_name]}.googlecode.com/archive/${DEPENDENCY[revision]}.tar.gz -> ${DEPENDENCY[importpath]//\//-}-${DEPENDENCY[revision]}.tar.gz"
+				;;
+			*) die "This eclass doesn't support '${DEPENDENCY[importpath]}'" ;;
+		esac
+
+	done
+fi
+
+# @FUNCTION: golang-single_src_unpack
+# @DESCRIPTION:
+# Unpack the source archive.
+golang-single_src_unpack() {
+	debug-print-function ${FUNCNAME} "${@}"
+
+	default
+
+	# Creates S.
+	mkdir -p "${S%/*}" || die
+
+	# Moves main GoLang package from WORKDIR into GOPATH.
+	if [[ "${GOLANG_PKG_IMPORTPATH}" != "${GOLANG_PKG_IMPORTPATH_ALIAS}" ]]; then
+		local alias_abspath="${WORKDIR}/gopath/src/${GOLANG_PKG_IMPORTPATH_ALIAS}/${GOLANG_PKG_NAME}"
+		mkdir -p "${alias_abspath%/*}" || die
+		mv "${GOLANG_PKG_NAME}-${GOLANG_PKG_VERSION}" "${alias_abspath}"/ || die
+	else
+		mv "${GOLANG_PKG_NAME}-${GOLANG_PKG_VERSION}" "${S}"/ || die
+	fi
+}
+
+# @FUNCTION: golang-single_src_prepare
+# @DESCRIPTION:
+# Prepare source code.
+golang-single_src_prepare() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	# Sets up GoLang build environment.
+	golang_setup
+
+	golang-common_src_prepare
+}
+
+# @FUNCTION: golang-single_src_configure
+# @DESCRIPTION:
+# Configure the package.
+golang-single_src_configure() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	golang-common_src_configure
+}
+
+# @FUNCTION: golang-single_src_compile
+# @DESCRIPTION:
+# Compiles the package.
+golang-single_src_compile() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	golang-common_src_compile
+}
+
+# @FUNCTION: golang-single_src_install
+# @DESCRIPTION:
+# Installs binaries and documents from DOCS or HTML_DOCS arrays.
+golang-single_src_install() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	golang-common_src_install
+}
+
+# @FUNCTION: golang-single_src_test
+# @DESCRIPTION:
+# Runs the unit tests for the main package.
+golang-single_src_test() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	golang-common_src_test
+}
+
+fi
--- a/games-action/netrek-brmh/netrek-brmh-2.6.0.ebuild
+++ b/games-action/netrek-brmh/netrek-brmh-2.6.0.ebuild
@@ -29,7 +29,10 @@ BDEPEND="

 src_configure() {
 	xmkmf || die
-	emake depend || die
+	emake depend \
+		CC="$(tc-getCC)" \
+		CDEBUGFLAGS="${CFLAGS}" \
+		LOCAL_LDFLAGS="${LDFLAGS}"
 }

 src_compile() {
--- a/games-emulation/melonds/Manifest
+++ b/games-emulation/melonds/Manifest
@@ -1,2 +1 @@
-DIST melonDS-0.9.1.tar.gz 1311519 BLAKE2B 7d31f9de32799a28f9e179d05295fe7874f6d879ac63cebeaf7153f1cca553f816fd5fa2853d01b5ace1afe137f00fcd7b4526635ae9c8140ac348630225c745 SHA512 733a9f9352b7f61c76de761c7f632f5fca9c4ae2970a0235a7b5c0e6ca2ea550762472ff293f65ce29aaa63a610bb4f1a22b62e1957004606c2f85be60fbb8f2
 DIST melonDS-0.9.2.tar.gz 1330793 BLAKE2B e504dd2e1344a9680b9820f7f0308fa30decb16f40675df5649babef7ab3fae9528042fc2737a36bafdd28b9125f94a79d20e5a5e791d485feb9dc26b64b1432 SHA512 3d099af675acdcb91431aaaf95bc27c10fd432ebd29aa81c7eb4e65dfad9c20cb4fd5de086d2162cbe4a6b41f7e140880a5742b1ec34eef0511fff052aa1baaa
--- a/games-emulation/melonds/melonds-0.9.1.ebuild
+++ b/games-emulation/melonds/melonds-0.9.1.ebuild
@@ -1,55 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="melonDS"
-MY_P="${MY_PN}-${PV}"
-
-inherit xdg cmake
-
-DESCRIPTION="Nintendo DS emulator, sorta"
-HOMEPAGE="
-	http://melonds.kuribo64.net
-	https://github.com/Arisotura/melonDS
-"
-
-if [[ "${PV}" == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/Arisotura/${MY_PN}.git"
-else
-	SRC_URI="https://github.com/Arisotura/${MY_PN}/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
-	KEYWORDS="~amd64"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	media-libs/libsdl2[sound,video]
-	net-libs/gnutls
-	net-libs/libpcap
-	net-libs/libslirp
-	net-misc/curl
-	x11-libs/cairo
-"
-RDEPEND="
-	${DEPEND}
-"
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	elog "You need the following files in order to run melonDS:"
-	elog "- bios7.bin"
-	elog "- bios9.bin"
-	elog "- firmware.bin"
-	elog "- romlist.bin"
-	elog "Place them in ~/.config/melonDS"
-	elog "Those files can be found somewhere on the Internet ;-)"
-}
--- a/games-emulation/melonds/melonds-0.9.2.ebuild
+++ b/games-emulation/melonds/melonds-0.9.2.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 MY_PN="melonDS"
 MY_P="${MY_PN}-${PV}"

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

 DESCRIPTION="Nintendo DS emulator, sorta"
 HOMEPAGE="
@@ -23,26 +23,41 @@ else
 	S="${WORKDIR}/${MY_P}"
 fi

-LICENSE="GPL-3"
+IUSE="+jit +opengl"
+LICENSE="BSD-2 GPL-2 GPL-3 Unlicense"
 SLOT="0"

 DEPEND="
 	app-arch/libarchive
 	dev-qt/qtcore:5
-	dev-qt/qtdeclarative:5
 	dev-qt/qtgui:5
 	dev-qt/qtwidgets:5
-	media-libs/libepoxy
 	media-libs/libsdl2[sound,video]
-	net-libs/gnutls
-	net-libs/libpcap
 	net-libs/libslirp
-	net-misc/curl
-	x11-libs/cairo
-"
-RDEPEND="
-	${DEPEND}
+	net-libs/libpcap
+	opengl? ( media-libs/libepoxy )
 "
+RDEPEND="${DEPEND}"
+
+# used for JIT recompiler
+QA_EXECSTACK="usr/bin/melonDS"
+
+src_prepare() {
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_JIT=$(usex jit)
+		-DENABLE_OGLRENDERER=$(usex opengl)
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	tc-export AR
+	cmake_src_compile
+}

 pkg_postinst() {
 	xdg_pkg_postinst
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				`DIST GitLab-API-v4-0.26.tar.gz 80446 BLAKE2B d316eaf1d6c00d53583346b2619d039ab7fd182f13b534b6d2b917abc0c25f8f542acc31af7b4a2ec3858347819d2d8012d4a41373ff89b65a35de2e28ec0615 SHA512 03ca9b2ef738e3567b3f5b809beb02baed8d792cac1ec3eebdeeebf8362e2d0eb43b15d353934587d364b8c32a530b66fd15d31e2eef1bc080c5059d3eaf23ab`
				`@@ -0,0 +1 @@`
				`DIST HTTP-Tiny-Multipart-0.08.tar.gz 9067 BLAKE2B d7c84d9c41a638f292f369f9e0ee2937ff9fce8ff76ba9f69777a5c8d27518405e79fbf776527090e4be9c29cfb33f6041eab3315d58cedf3394d9f37f2b9ff4 SHA512 e8a6452f4a23f359110b54987c2ff261446b1848ddc6f9ecdc37b711978c00d99ffc2ab8189f435d39d7c2d127253608b721f48e11969c8039c1bc9a69609720`
				`@@ -0,0 +1 @@`
				`DIST devscripts_2.21.2.tar.xz 980516 BLAKE2B 907f2f4e258a8396ad0a28eead1e2058b8e19be205f024ea80c0fbd9621d5ca4299844fe83d66cac7f653a917705d9c36eddb9d51454a7fbb9d7e2b52bc994ff SHA512 a6765d807dc0c2ef7a3d8c59e1262bfe7542c3ca52cda3c1910af253925cb105a9d1bf272c76a86f0b3cdda9c8a4e2d29a660437f73087dd70ee8a444bbedb01`
				`@@ -0,0 +1 @@`
				`DIST rpmlint-1.11_p20210515.tar.gz 5670517 BLAKE2B b85727f45cf56a89d0b7a1394b72f627cde6704236851e548712c19389baced8dc86995fad0d5ee274e79e10cece553e4b2870b012d8063eef93d56c03f5ee5c SHA512 c8b40b93cfeb16b96588536948c84b0bbfed18b9e63668b68d8b7574e7bc90c5a15a7efc2b612ea4d4db470b156f5e29abee7acb69f3edb86d20482e499b0140`